From 43400208e5301c0cfc763ea1b1a7dddb79c72802 Mon Sep 17 00:00:00 2001
From: oceangoing <1821478380@qq.com>
Date: Tue, 4 Apr 2023 16:38:44 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .codeStyle/eclipse-codestyle.xml              |  1196 +-
 .editorconfig                                 |    19 +
 README.md                                     |    12 +-
 db/lenos-mysql5.7.35.sql                      |  2504 ++-
 db/lenos-oracle.sql                           |  2504 ++-
 len-activiti/pom.xml                          |   156 +-
 .../com/len/actlistener/ActNodeListener.java  |    39 +-
 .../len/actlistener/ActStartNodeListener.java |    16 +-
 .../len/actlistener/LeaveListenerImpl.java    |    16 +-
 .../com/len/actlistener/ListenUserRole.java   |   282 +-
 .../com/len/config/ActPropertiesConfig.java   |    25 +-
 .../java/com/len/config/ActivitiConfig.java   |   177 +-
 .../len/controller/ActivitiController.java    |   760 +-
 .../len/controller/UserLeaveController.java   |   967 +-
 .../main/java/com/len/entity/ActAssignee.java |   288 +-
 .../java/com/len/entity/ActDeployment.java    |    33 +-
 .../main/java/com/len/entity/ActModel.java    |    59 +-
 .../main/java/com/len/entity/BaseTask.java    |   377 +-
 .../java/com/len/entity/LeaveOpinion.java     |    32 +-
 .../com/len/entity/ProcessDefinition.java     |    61 +-
 .../src/main/java/com/len/entity/Task.java    |    53 +-
 .../main/java/com/len/entity/UserLeave.java   |   198 +-
 .../com/len/mapper/ActAssigneeMapper.java     |     4 +-
 .../com/len/service/ActAssigneeService.java   |     6 +-
 .../com/len/service/UserLeaveService.java     |     2 +-
 .../service/impl/ActAssigneeServiceImpl.java  |    60 +-
 .../service/impl/UserLeaveServiceImpl.java    |    14 +-
 .../java/com/len/util/AnimatedGifEncoder.java |  2435 ++-
 .../main/java/com/len/util/AssigneeType.java  |     8 +-
 .../main/java/com/len/util/Base64Utils.java   |    33 +-
 .../activiti/FilterServletOutputStream.java   |    46 +-
 .../org/activiti/GenericResponseWrapper.java  |    82 +-
 .../org/activiti/JsonpCallbackFilter.java     |    75 +-
 .../image/HMProcessDiagramGenerator.java      |   114 +-
 .../impl/DefaultProcessDiagramCanvas.java     |  2581 ++-
 .../impl/DefaultProcessDiagramGenerator.java  |  2176 +-
 .../org/activiti/rest/ActivitiService.java    |   325 +-
 ...rocessDefinitionDiagramLayoutResource.java |   993 +-
 ...rocessDefinitionDiagramLayoutResource.java |    14 +-
 .../ProcessInstanceDiagramLayoutResource.java |    12 +-
 .../ProcessInstanceHighlightsResource.java    |   504 +-
 .../editor/main/StencilsetRestResource.java   |    29 +-
 .../model/ModelEditorJsonRestResource.java    |   140 +-
 .../editor/model/ModelSaveRestResource.java   |   198 +-
 .../activiti/rest/model/ActivitiProcess.java  |    24 +-
 len-activiti/src/main/resources/bpmn/demo.xml |   350 +-
 .../resources/ftl/act/activiti/shinePics.html |   182 +-
 .../resources/ftl/act/deploy/act-node.ftl     |   192 +-
 .../resources/ftl/act/leave/add-leave.ftl     |   261 +-
 .../resources/ftl/act/leave/leaveDetail.ftl   |   174 +-
 .../resources/ftl/act/leave/leaveList.ftl     |   323 +-
 .../ftl/act/leave/update-leave-readonly.ftl   |   248 +-
 .../resources/ftl/act/leave/update-leave.ftl  |   273 +-
 .../ftl/act/task/task-agent-iframe.ftl        |   139 +-
 .../resources/ftl/act/task/task-agent.ftl     |   193 +-
 .../main/resources/ftl/act/task/taskList.ftl  |   297 +-
 .../src/main/resources/ftl/actList.ftl        |   275 +-
 .../src/main/resources/ftl/actModelList.ftl   |   412 +-
 .../resources/mapper/ActAssigneeMapper.xml    |    57 +-
 .../main/resources/mapper/UserLeaveMapper.xml |    66 +-
 .../src/main/resources/plugin/activiti.js     |    52 +-
 .../resources/properties/activiti.properties  |     1 -
 .../static/diagram-viewer/index.html          |   237 +-
 .../static/diagram-viewer/js/ActivitiRest.js  |    44 +-
 .../static/diagram-viewer/js/ActivityImpl.js  |   196 +-
 .../static/diagram-viewer/js/Color.js         |  1189 +-
 .../diagram-viewer/js/LineBreakMeasurer.js    |   518 +-
 .../static/diagram-viewer/js/Polyline.js      |   259 +-
 .../diagram-viewer/js/ProcessDiagramCanvas.js |  2104 +-
 .../js/ProcessDiagramGenerator.js             |   919 +-
 .../js/jquery/jquery.asyncqueue.js            |   160 +-
 .../static/diagram-viewer/js/jquery/jquery.js | 14779 +++++++------
 .../js/jquery/jquery.progressbar.js           |   232 +-
 .../static/diagram-viewer/js/jstools.js       |    40 +-
 .../diagram-viewer/js/raphael_uncompressed.js | 11569 +++++-----
 .../static/diagram-viewer/js/textlayout.js    |   853 +-
 .../resources/static/diagram-viewer/style.css |   140 +-
 .../resources/static/editor-app/app-cfg.js    |     4 +-
 .../main/resources/static/editor-app/app.js   |   814 +-
 .../properties-assignment-controller.js       |   825 +-
 ...perties-condition-expression-controller.js |    60 +-
 .../properties-default-controllers.js         |   140 +-
 .../properties-event-listeners-controller.js  |   449 +-
 ...operties-execution-listeners-controller.js |   571 +-
 .../properties-fields-controller.js           |   315 +-
 .../properties-form-properties-controller.js  |   505 +-
 .../properties-in-parameters-controller.js    |   266 +-
 ...operties-message-definitions-controller.js |   213 +-
 .../properties-message-scope-controller.js    |    50 +-
 .../properties-multiinstance-controller.js    |    21 +-
 .../properties-out-parameters-controller.js   |   266 +-
 ...roperties-sequenceflow-order-controller.js |   208 +-
 ...roperties-signal-definitions-controller.js |   219 +-
 .../properties-signal-scope-controller.js     |    50 +-
 .../properties-task-listeners-controller.js   |   569 +-
 .../editor-app/configuration/properties.js    |   156 +-
 .../properties/assignment-candidateGroup.html |    20 +-
 .../assignment-display-template.html          |    14 +-
 .../properties/assignment-popup-popup.html    |    30 +-
 .../properties/assignment-popup.html          |   115 +-
 .../properties/assignment-write-template.html |     1 -
 .../properties/boolean-property-template.html |     5 +-
 ...condition-expression-display-template.html |     2 +-
 .../condition-expression-popup.html           |    53 +-
 .../condition-expression-write-template.html  |     1 -
 .../default-value-display-template.html       |     3 +-
 .../event-listeners-display-template.html     |     1 -
 .../properties/event-listeners-popup.html     |   289 +-
 .../event-listeners-write-template.html       |     1 -
 .../execution-listeners-display-template.html |     6 +-
 .../properties/execution-listeners-popup.html |   248 +-
 .../execution-listeners-write-template.html   |     1 -
 .../properties/feedback-popup.html            |    28 +-
 .../properties/fields-display-template.html   |     1 -
 .../properties/fields-popup.html              |   125 +-
 .../properties/fields-write-template.html     |     1 -
 .../form-properties-display-template.html     |     1 -
 .../properties/form-properties-popup.html     |   290 +-
 .../form-properties-write-template.html       |     1 -
 .../in-parameters-display-template.html       |     1 -
 .../properties/in-parameters-popup.html       |    96 +-
 .../in-parameters-write-template.html         |     1 -
 .../properties/message-definitions-popup.html |   104 +-
 .../message-property-write-template.html      |     7 +-
 ...multiinstance-property-write-template.html |    13 +-
 .../out-parameters-display-template.html      |     1 -
 .../properties/out-parameters-popup.html      |    96 +-
 .../out-parameters-write-template.html        |     1 -
 .../sequenceflow-order-display-template.html  |     1 -
 .../properties/sequenceflow-order-popup.html  |    74 +-
 .../sequenceflow-order-write-template.html    |     1 -
 .../signal-definitions-display-template.html  |     1 -
 .../properties/signal-definitions-popup.html  |   123 +-
 .../signal-definitions-write-template.html    |     1 -
 .../signal-property-write-template.html       |     7 +-
 .../string-property-write-mode-template.html  |    13 +-
 ...subprocess-reference-display-template.html |     1 -
 .../subprocess-reference-popup.html           |    78 +-
 .../subprocess-reference-write-template.html  |     1 -
 .../task-listeners-display-template.html      |     1 -
 .../properties/task-listeners-popup.html      |   204 +-
 .../task-listeners-write-template.html        |     1 -
 .../configuration/properties/text-popup.html  |    17 +-
 .../text-property-write-template.html         |     1 -
 .../configuration/toolbar-default-actions.js  |   808 +-
 .../editor-app/configuration/toolbar.js       |   306 +-
 .../editor-app/configuration/url-config.js    |    22 +-
 .../static/editor-app/css/style-common.css    |  1434 +-
 .../static/editor-app/css/style-editor.css    |    57 +-
 .../resources/static/editor-app/css/style.css |   162 +-
 .../static/editor-app/editor-config.js        |    14 +-
 .../static/editor-app/editor-controller.js    |    80 +-
 .../static/editor-app/editor-utils.js         |   220 +-
 .../resources/static/editor-app/editor.html   |   249 +-
 .../static/editor-app/editor/css/editor.css   |   155 +-
 .../editor-app/editor/i18n/translation_de.js  |   114 +-
 .../editor/i18n/translation_en_us.js          |   126 +-
 .../editor/i18n/translation_signavio_de.js    |    48 +-
 .../editor/i18n/translation_signavio_en_us.js |    50 +-
 .../static/editor-app/editor/oryx.debug.js    | 17726 ++++++++--------
 .../resources/static/editor-app/eventbus.js   |   222 +-
 .../fonts/activiti-admin-webfont.svg          |    98 +-
 .../fonts/glyphicons-halflings-regular.svg    |   633 +-
 .../static/editor-app/header-controller.js    |    20 +-
 .../resources/static/editor-app/i18n/en.json  |   541 +-
 .../angular-mocks_1.2.13/angular-mocks.js     |  4112 ++--
 .../angular-resource.js                       |  1063 +-
 .../angular-route_1.2.13/angular-route.js     |  1576 +-
 .../angular-sanitize.js                       |  1026 +-
 .../angular-translate-loader-static-files.js  |    50 +-
 .../angular-translate-storage-cookie.js       |    26 +-
 .../angular-translate.js                      |  1900 +-
 .../daterangepicker-bs3.css                   |   292 +-
 .../daterangepicker.js                        |  2039 +-
 .../bootstrap_3.1.1/css/bootstrap-theme.css   |   446 +-
 .../libs/bootstrap_3.1.1/css/bootstrap.css    |  7247 ++++---
 .../fonts/glyphicons-halflings-regular.svg    |   633 +-
 .../libs/bootstrap_3.1.1/js/bootstrap.js      |  2983 +--
 .../libs/es5-shim-15.3.4.5/CONTRIBUTORS.md    |    49 +-
 .../libs/es5-shim-15.3.4.5/README.md          |   140 +-
 .../libs/es5-shim-15.3.4.5/es5-sham.js        |   758 +-
 .../libs/es5-shim-15.3.4.5/es5-shim.js        |  2238 +-
 .../es5-shim-15.3.4.5/tests/helpers/h-kill.js |    68 +-
 .../tests/helpers/h-matchers.js               |    66 +-
 .../libs/es5-shim-15.3.4.5/tests/helpers/h.js |     4 +-
 .../libs/es5-shim-15.3.4.5/tests/index.html   |    18 +-
 .../es5-shim-15.3.4.5/tests/index.min.html    |    16 +-
 .../tests/lib/jasmine-html.js                 |   356 +-
 .../es5-shim-15.3.4.5/tests/lib/jasmine.css   |   134 +-
 .../es5-shim-15.3.4.5/tests/lib/jasmine.js    |  2842 ++-
 .../libs/es5-shim-15.3.4.5/tests/lib/json2.js |   357 +-
 .../es5-shim-15.3.4.5/tests/spec/s-array.js   |  2486 +--
 .../es5-shim-15.3.4.5/tests/spec/s-date.js    |   303 +-
 .../tests/spec/s-function.js                  |   286 +-
 .../es5-shim-15.3.4.5/tests/spec/s-number.js  |    22 +-
 .../es5-shim-15.3.4.5/tests/spec/s-object.js  |   346 +-
 .../es5-shim-15.3.4.5/tests/spec/s-string.js  |   396 +-
 .../libs/jquery.autogrow-textarea.js          |   105 +-
 .../editor-app/libs/jquery_1.11.0/jquery.js   | 15943 +++++++-------
 .../editor-app/libs/json3_3.2.6/lib/json3.js  |  1743 +-
 .../libs/pagination/tm.pagination.js          |   398 +-
 .../static/editor-app/libs/path_parser.js     |   173 +-
 .../static/editor-app/libs/prototype-1.5.1.js |  6015 +++---
 .../partials/root-stencil-item-template.html  |    18 +-
 .../partials/stencil-item-template.html       |    34 +-
 .../resources/static/editor-app/plugins.xml   |   108 +-
 .../editor-app/popups/icon-template.html      |     4 +-
 .../static/editor-app/popups/save-model.html  |    84 +-
 .../editor-app/popups/select-shape.html       |    36 +-
 .../editor-app/popups/unsaved-changes.html    |    45 +-
 .../editor-app/select-shape-controller.js     |   587 +-
 .../static/editor-app/stencil-controller.js   |  2612 ++-
 .../static/editor-app/toolbar-controller.js   |   328 +-
 .../src/main/resources/static/modeler.html    |    71 +-
 .../src/main/resources/stencilset.json        |  3745 ++--
 .../src/test/java/com/len/AppTest.java        |    48 +-
 .../src/test/java/com/len/JsonTest.java       |    43 +-
 len-blog/pom.xml                              |    53 +-
 .../main/java/com/len/config/CorsConfig.java  |    20 +-
 .../com/len/controller/ArticleController.java |   174 +-
 .../com/len/controller/AuthController.java    |   107 +-
 .../len/controller/BlogAdminController.java   |   237 +-
 .../controller/BlogCategoryController.java    |    30 +-
 .../com/len/controller/TagController.java     |    52 +-
 .../src/main/java/com/len/core/BlogRealm.java |   107 +-
 .../src/main/java/com/len/core/LenUser.java   |    26 +-
 .../core/MyBasicHttpAuthenticationFilter.java |    66 +-
 .../len/core/exception/CustomException.java   |    30 +-
 .../core/exception/UnauthorizedException.java |     6 +-
 .../java/com/len/entity/ArticleCategory.java  |    94 +-
 .../java/com/len/entity/ArticleDetail.java    |    46 +-
 .../main/java/com/len/entity/ArticleList.java |    38 +-
 .../main/java/com/len/entity/ArticleTag.java  |    68 +-
 .../main/java/com/len/entity/BlogArticle.java |    86 +-
 .../java/com/len/entity/BlogCategory.java     |   338 +-
 .../src/main/java/com/len/entity/BlogTag.java |   114 +-
 .../com/len/mapper/ArticleCategoryMapper.java |     4 +-
 .../com/len/mapper/BlogArticleMapper.java     |    12 +-
 .../src/main/java/com/len/model/Article.java  |    58 +-
 .../java/com/len/model/SimpleArticle.java     |     4 +-
 .../src/main/java/com/len/model/VArticle.java |     8 +-
 .../len/service/ArticleCategoryService.java   |     2 +-
 .../com/len/service/BlogArticleService.java   |    18 +-
 .../impl/ArticleCategoryServiceImpl.java      |    14 +-
 .../service/impl/ArticleTagServiceImpl.java   |     4 +-
 .../service/impl/BlogArticleServiceImpl.java  |   690 +-
 .../src/main/resources/ftl/articleList.ftl    |   592 +-
 .../mapper/ArticleCategoryMapper.xml          |    42 +-
 .../resources/mapper/ArticleTagMapper.xml     |    16 +-
 .../resources/mapper/BlogArticleMapper.xml    |   221 +-
 .../resources/mapper/BlogCategoryMapper.xml   |    30 +-
 .../main/resources/mapper/BlogTagMapper.xml   |    18 +-
 len-core/pom.xml                              |    74 +-
 .../java/com/len/base/BaseController.java     |   197 +-
 .../main/java/com/len/base/BaseEntity.java    |    13 +-
 .../main/java/com/len/base/BaseMapper.java    |     8 +-
 .../main/java/com/len/base/BaseService.java   |     6 +-
 .../main/java/com/len/base/CurrentMenu.java   |    71 +-
 .../main/java/com/len/base/CurrentRole.java   |    29 +-
 .../main/java/com/len/base/CurrentUser.java   |    73 +-
 .../com/len/base/handler/ExecuteContext.java  |     3 +-
 .../len/base/impl/AbstractServiceImpl.java    |    86 +-
 .../com/len/cache/CacheManagerFactory.java    |    67 +-
 .../com/len/cache/impl/config/LenProp.java    |    68 +-
 .../cache/impl/config/PropertiesConfig.java   |    24 +-
 .../main/java/com/len/enums/PanelEnum.java    |    12 +-
 .../exception/CustomErrorViewResolver.java    |    54 +-
 .../java/com/len/exception/LenException.java  |    24 +-
 .../com/len/exception/ServiceException.java   |    26 +-
 .../java/com/len/freemarker/LenInclude.java   |    68 +-
 .../src/main/java/com/len/menu/LoginType.java |    22 +-
 .../main/java/com/len/redis/RedisService.java |   137 +-
 .../java/com/len/socket/WebSocketService.java |   104 +-
 .../com/len/util/ApplicationContextUtil.java  |    28 +-
 .../src/main/java/com/len/util/BeanUtil.java  |    50 +-
 .../src/main/java/com/len/util/Checkbox.java  |    10 +-
 .../main/java/com/len/util/CommonUtil.java    |    28 +-
 .../main/java/com/len/util/ContextUtil.java   |    19 +-
 .../len/util/CustomUsernamePasswordToken.java |    23 +-
 .../src/main/java/com/len/util/FileUtil.java  |     2 +-
 .../src/main/java/com/len/util/IpUtil.java    |    32 +-
 .../src/main/java/com/len/util/JWTUtil.java   |   182 +-
 .../src/main/java/com/len/util/JdbcUtil.java  |    54 +-
 .../src/main/java/com/len/util/JsonUtil.java  |    78 +-
 .../src/main/java/com/len/util/JwtToken.java  |    66 +-
 .../main/java/com/len/util/LenResponse.java   |    88 +-
 .../main/java/com/len/util/LocalLocale.java   |    33 +-
 .../src/main/java/com/len/util/Md5Util.java   |    23 +-
 .../src/main/java/com/len/util/MsHelper.java  |    32 +-
 .../src/main/java/com/len/util/PageUtil.java  |   116 +-
 .../src/main/java/com/len/util/Principal.java |     8 +-
 .../src/main/java/com/len/util/ReType.java    |   103 +-
 .../main/java/com/len/util/SpringUtil.java    |    70 +-
 .../src/main/java/com/len/util/TreeUtil.java  |    32 +-
 .../main/java/com/len/util/UploadUtil.java    |   137 +-
 .../src/main/java/com/len/util/UuidUtil.java  |     6 +-
 .../java/com/len/util/VerifyCodeUtils.java    |   578 +-
 .../com/len/validator/ValidatorUtils.java     |    78 +-
 .../com/len/validator/group/AddGroup.java     |     3 +-
 .../java/com/len/validator/group/Group.java   |     3 +-
 .../com/len/validator/group/UpdateGroup.java  |     3 +-
 len-core/src/test/java/com/len/AppTest.java   |    48 +-
 len-sys/pom.xml                               |    52 +-
 .../len/controller/DashboardController.java   |   176 +-
 .../com/len/controller/ErrorController.java   |    22 +-
 .../com/len/controller/JobController.java     |   192 +-
 .../com/len/controller/LogController.java     |    76 +-
 .../com/len/controller/LoginController.java   |   259 +-
 .../com/len/controller/MenuController.java    |   137 +-
 .../com/len/controller/PersonController.java  |    56 +-
 .../com/len/controller/RoleController.java    |   165 +-
 .../com/len/controller/UserController.java    |   336 +-
 .../java/com/len/core/annotation/Log.java     |    33 +-
 .../com/len/core/annotation/LogAspect.java    |   159 +-
 .../len/core/filter/CustomAdvicFilter.java    |    14 +-
 .../com/len/core/filter/PermissionFilter.java |    34 +-
 .../len/core/filter/VerfityCodeFilter.java    |   146 +-
 .../com/len/core/filter/VerifyCodeUtils.java  |   601 +-
 .../core/init/job/DataSourceJobThread.java    |    83 +-
 .../com/len/core/init/job/JobExecuteImpl.java |    17 +-
 .../CustomServletContextListener.java         |    20 +-
 .../com/len/core/listener/LenospInit.java     |    26 +-
 .../core/quartz/CustomQuartz/DataSchdule.java |    74 +-
 .../core/quartz/CustomQuartz/JobDemo1.java    |    59 +-
 .../core/quartz/CustomQuartz/JobDemo2.java    |    40 +-
 .../core/quartz/CustomQuartz/JobDemo3.java    |    38 +-
 .../core/quartz/CustomQuartz/JobDemo4.java    |    38 +-
 .../core/quartz/CustomQuartz/JobDemo5.java    |    38 +-
 .../java/com/len/core/quartz/JobTask.java     |   190 +-
 .../com/len/core/quartz/MyJobFactory.java     |    21 +-
 .../len/core/quartz/MySchedulerListener.java  |    21 +-
 .../java/com/len/core/shiro/LoginRealm.java   |   122 +-
 .../java/com/len/core/shiro/Principal.java    |    58 +-
 .../shiro/RetryLimitCredentialsMatcher.java   |   133 +-
 .../src/main/java/com/len/entity/SysDept.java |    37 +-
 .../main/java/com/len/entity/SysEmployee.java |   153 +-
 .../src/main/java/com/len/entity/SysJob.java  |    58 +-
 .../src/main/java/com/len/entity/SysLog.java  |   227 +-
 .../src/main/java/com/len/entity/SysMenu.java |    96 +-
 .../main/java/com/len/entity/SysPanelOpt.java |    39 +-
 .../src/main/java/com/len/entity/SysRole.java |     8 +-
 .../main/java/com/len/entity/SysRoleMenu.java |    10 +-
 .../main/java/com/len/entity/SysRoleUser.java |    10 +-
 .../java/com/len/entity/SysShortcuts.java     |    25 +-
 .../src/main/java/com/len/entity/SysUser.java |    44 +-
 .../java/com/len/entity/SysUserDepart.java    |    22 +-
 .../java/com/len/mapper/SysMenuMapper.java    |    88 +-
 .../com/len/mapper/SysRoleMenuMapper.java     |    30 +-
 .../com/len/mapper/SysRoleUserMapper.java     |     6 +-
 .../java/com/len/mapper/SysUserMapper.java    |    33 +-
 .../com/len/service/DashboardService.java     |    36 +-
 .../main/java/com/len/service/JobService.java |    58 +-
 .../java/com/len/service/MenuService.java     |    84 +-
 .../java/com/len/service/RoleMenuService.java |     6 +-
 .../java/com/len/service/RoleService.java     |     6 +-
 .../java/com/len/service/SysUserService.java  |    78 +-
 .../service/impl/DashboardServiceImpl.java    |   131 +-
 .../len/service/impl/EmployeeServiceImpl.java |     3 +-
 .../com/len/service/impl/JobServiceImpl.java  |   108 +-
 .../com/len/service/impl/MenuServiceImpl.java |   478 +-
 .../len/service/impl/RoleMenuServiceImpl.java |    32 +-
 .../com/len/service/impl/RoleServiceImpl.java |   104 +-
 .../len/service/impl/RoleUserServiceImpl.java |     3 +-
 .../len/service/impl/SysUserServiceImpl.java  |   438 +-
 len-sys/src/main/resources/ftl/login.ftl      |   143 +-
 len-sys/src/main/resources/ftl/login2.html    |   265 +-
 .../src/main/resources/ftl/main/dashboard.ftl |    24 +-
 .../ftl/main/dashboard_static_copy.ftl        |   250 +-
 len-sys/src/main/resources/ftl/main/main.ftl  |   214 +-
 .../main/resources/ftl/system/base/bar.ftl    |    10 +-
 .../resources/ftl/system/base/blockInput.ftl  |    22 +-
 .../main/resources/ftl/system/base/btn.ftl    |     6 +-
 .../resources/ftl/system/base/formBtn.ftl     |    18 +-
 .../resources/ftl/system/base/formHead.ftl    |    12 +-
 .../resources/ftl/system/base/lineInput.ftl   |    26 +-
 .../resources/ftl/system/base/queryBox.ftl    |    10 +-
 .../main/resources/ftl/system/base/readme.md  |    16 +-
 .../main/resources/ftl/system/base/searth.ftl |     2 +-
 .../main/resources/ftl/system/base/upload.ftl |    56 +-
 .../main/resources/ftl/system/base/zoom.ftl   |    42 +-
 .../src/main/resources/ftl/system/job/add.ftl |   190 +-
 .../main/resources/ftl/system/job/jobList.ftl |   259 +-
 .../main/resources/ftl/system/job/update.ftl  |   191 +-
 .../main/resources/ftl/system/log/logList.ftl |   188 +-
 .../main/resources/ftl/system/menu/add.ftl    |   487 +-
 .../resources/ftl/system/menu/menuList.ftl    |   172 +-
 .../main/resources/ftl/system/menu/update.ftl |   486 +-
 .../main/resources/ftl/system/person/me.ftl   |   334 +-
 .../main/resources/ftl/system/role/add.ftl    |   204 +-
 .../resources/ftl/system/role/roleList.ftl    |   155 +-
 .../main/resources/ftl/system/role/update.ftl |   250 +-
 .../main/resources/ftl/system/user/add.ftl    |   370 +-
 .../main/resources/ftl/system/user/add2.ftl   |   340 +-
 .../ftl/system/user/resetPassword.ftl         |   159 +-
 .../main/resources/ftl/system/user/update.ftl |   312 +-
 .../resources/ftl/system/user/userList.ftl    |   208 +-
 .../resources/i18n/message_en_US.properties   |     5 +-
 .../resources/i18n/message_zh_CN.properties   |     3 -
 .../main/resources/mapper/SysDeptMapper.xml   |    22 +-
 .../resources/mapper/SysEmployeeMapper.xml    |    44 +-
 .../main/resources/mapper/SysJobMapper.xml    |    46 +-
 .../main/resources/mapper/SysLogMapper.xml    |    38 +-
 .../main/resources/mapper/SysMenuMapper.xml   |   152 +-
 .../main/resources/mapper/SysRoleMapper.xml   |    38 +-
 .../resources/mapper/SysRoleMenuMapper.xml    |    46 +-
 .../resources/mapper/SysRoleUserMapper.xml    |    46 +-
 .../main/resources/mapper/SysUserMapper.xml   |   262 +-
 .../main/resources/plugin/build/css/admin.css |   204 +-
 .../main/resources/plugin/build/css/app.css   |   356 +-
 .../plugin/build/css/themes/blue.css          |    66 +-
 .../plugin/build/css/themes/default.css       |     7 +-
 .../plugin/build/css/themes/orange.css        |    70 +-
 .../main/resources/plugin/build/js/admin.js   |    95 +-
 .../src/main/resources/plugin/build/js/app.js |   438 +-
 .../resources/plugin/build/js/dashboard.js    |   812 +-
 .../resources/plugin/build/js/kitconfig.js    |    12 +-
 .../resources/plugin/build/js/layrouter.js    |   162 +-
 .../main/resources/plugin/build/js/loader.js  |    62 +-
 .../main/resources/plugin/build/js/message.js |   106 +-
 .../main/resources/plugin/build/js/navbar.js  |   442 +-
 .../resources/plugin/build/js/nprogress.js    |   960 +-
 .../resources/plugin/build/js/onelevel.js     |   226 +-
 .../main/resources/plugin/build/js/pjax.js    |  1895 +-
 .../src/main/resources/plugin/build/js/spa.js |    76 +-
 .../src/main/resources/plugin/build/js/tab.js |   744 +-
 .../resources/plugin/build/js/treeselect.js   |   397 +-
 .../main/resources/plugin/build/js/utils.js   |   498 +-
 .../main/resources/plugin/build/js/ztree.js   |  7514 +++----
 .../src/main/resources/plugin/html/icon.html  |  1393 +-
 .../resources/plugin/layui/font/iconfont.svg  |   950 +-
 .../plugin/layui/modules/treeTable.js         |  4522 ++--
 .../src/main/resources/plugin/lenos/main.css  |   156 +-
 .../plugins/font-awesome/css/font-awesome.css |  2290 +-
 .../fonts/fontawesome-webfont.svg             |  4045 ++--
 .../plugin/plugins/sideshow/css/component.css |    18 +-
 .../plugin/plugins/sideshow/css/demo.css      |    30 +-
 .../fonts/codropsicons/codropsicons.svg       |    43 +-
 .../sideshow/fonts/codropsicons/license.txt   |     8 +-
 .../plugin/plugins/sideshow/js/demo-1.js      |   371 +-
 .../plugin/plugins/sideshow/js/demo-2.js      |   154 +-
 .../plugin/plugins/sideshow/js/demo-3.js      |   256 +-
 .../plugin/plugins/sideshow/js/demo-4.js      |   200 +-
 .../plugin/plugins/sideshow/js/rAF.js         |    46 +-
 .../plugin/plugins/sortable/Sortable.js       |  7573 +++----
 .../src/main/resources/plugin/tools/main.js   |    80 +-
 .../src/main/resources/plugin/tools/moment.js |  9105 ++++----
 .../src/main/resources/plugin/tools/tool.js   |   812 +-
 .../resources/plugin/tools/update-setting.js  |    12 +-
 .../resources/plugin/x-admin/css/font.css     |    26 +-
 .../resources/plugin/x-admin/css/xadmin.css   |   517 +-
 .../plugin/x-admin/fonts/iconfont.svg         |   932 +-
 .../resources/plugin/x-admin/js/xadmin.js     |   256 +-
 .../plugin/ztree/css/awesomeStyle/awesome.css |   547 +-
 .../ztree/css/awesomeStyle/awesome.less       |   557 +-
 .../ztree/css/metroStyle/metroStyle.css       |   441 +-
 .../ztree/css/zTreeStyle/zTreeStyle.css       |   430 +-
 .../plugin/ztree/js/jquery.ztree.all.js       |  6902 +++---
 .../plugin/ztree/js/jquery.ztree.core.js      |  3730 ++--
 .../plugin/ztree/js/jquery.ztree.excheck.js   |  1042 +-
 .../plugin/ztree/js/jquery.ztree.exedit.js    |  1987 +-
 .../plugin/ztree/js/jquery.ztree.exhide.js    |   521 +-
 len-sys/src/test/java/com/len/AppTest.java    |    48 +-
 len-web/pom.xml                               |   136 +-
 .../src/main/java/com/len/LenApplication.java |    14 +-
 .../java/com/len/config/BeanFactoryImpl.java  |    10 +-
 .../main/java/com/len/config/BeanName.java    |     8 +-
 .../java/com/len/config/FreeMarkerConfig.java |    94 +-
 .../com/len/config/FreemarkerShiroConfig.java |    14 +-
 .../main/java/com/len/config/LenFilter.java   |    93 +-
 .../main/java/com/len/config/LogConfig.java   |     8 +-
 .../com/len/config/MyBatisPlusConfig.java     |    37 +-
 .../config/MyModularRealmAuthenticator.java   |    54 +-
 .../java/com/len/config/PageHelperConfig.java |     2 +-
 .../main/java/com/len/config/ShiroConfig.java |   358 +-
 .../com/len/config/ShiroSessionManager.java   |    34 +-
 .../java/com/len/config/SocketConfig.java     |     8 +-
 .../java/com/len/config/SwaggerConfig.java    |    36 +-
 .../com/len/config/TransactionalConfig.java   |    70 +-
 .../java/com/len/config/WebMvcConfig.java     |    84 +-
 .../java/com/len/config/ZBeanFactory.java     |    26 +-
 len-web/src/main/java/test/ActivitiDemo.java  |   597 +-
 .../src/main/java/test/ActivitiGateWay.java   |   292 +-
 .../src/main/java/test/ActivitiVariable.java  |   204 +-
 len-web/src/main/java/test/BlogTest.java      |    68 +-
 len-web/src/main/java/test/BootTest.java      |    43 +-
 len-web/src/main/java/test/MybatisApp.java    |     8 +-
 .../main/len-web\350\257\264\346\230\216.md"  |   107 +-
 .../main/resources/application-mysql-dev.yml  |    62 +-
 .../main/resources/application-oracle-dev.yml |    68 +-
 .../src/main/resources/application-prod.yml   |    74 +-
 .../resources/application-sqlserver-dev.yml   |    64 +-
 .../src/main/resources/application-test.yml   |    70 +-
 .../resources/auto-config/mybatis-config.xml  |    94 +-
 .../src/main/resources/ehcache/ehcache.xml    |    38 +-
 len-web/src/main/resources/len.properties     |     4 -
 len-web/src/main/resources/log4j.properties   |     2 +-
 len-web/src/main/resources/quartz.properties  |    24 +-
 pom.xml                                       |   910 +-
 498 files changed, 124570 insertions(+), 116590 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.codeStyle/eclipse-codestyle.xml b/.codeStyle/eclipse-codestyle.xml
index b620a30..9a8dcc1 100644
--- a/.codeStyle/eclipse-codestyle.xml
+++ b/.codeStyle/eclipse-codestyle.xml
@@ -1,603 +1,603 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <profiles version="12">
-    <profile kind="CodeFormatterProfile" name="P3C-CodeStyle" version="13">
-        <!--可变参数的... Idea没有对应的配置项，强制insert-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-        <!--枚举值之间 Idea没有对应的配置项，强制insert-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=Java:SPACE_BEFORE_COMMA-->
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=Java:SPACE_BEFORE_COMMA
-        由于IDEA只有一个SPACE_BEFORE_COMMA选项，所以统一设置 insert_space_before_comma 为 do not insert
-        -->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments"
-          value="do not insert"/>
-
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations"
-          value="do not insert"/>
-        <!--insert_space_before_comma end-->
-
-        <!--org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=Java:SPACE_AFTER_COMMA_IN_TYPE_ARGUMENTS-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-        <!--IDEA只有一个配置项SPACE_AFTER_COMMA，insert_space_after_comma*统一设置成insert-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters"
-          value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations"
-          value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments"
-          value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference"
-          value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations"
-          value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments"
-          value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws"
-          value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters"
-          value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws"
-          value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments"
-          value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-        <!--insert_space_after_comma end-->
-
-
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=Java:SPACE_BEFORE_COLON-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-
-        <!--org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=Java:SPACE_AFTER_COLON-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-
-        <!--IDEA不支持配置，默认do not insert-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-        <!--这个在Eclipse也没有找到配置的地方-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="do not insert"/>
-
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_semicolon=Java:SPACE_BEFORE_SEMICOLON
-        程序导入的时候强制将SPACE_BEFORE_SEMICOLON设置为false
-        -->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-
-        <!--SPACE_AFTER_SEMICOLON=true-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
-
-        <!--IDEA不支持配置,do not insert-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant"
-          value="do not insert"/>
-        <setting
-          id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration"
-          value="do not insert"/>
-
-        <!--IDEA不支持，使用默认-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-
-        <!--org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=Java:<Programmatic>-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-
-        <!--IDEA不支持配置，使用如下值，两者对应-->
-        <setting
-          id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters"
-          value="do not insert"/>
-
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters"
-          value="insert"/>
-        <setting
-          id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference"
-          value="do not insert"/>
-
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments"
-          value="do not insert"/>
-        <setting
-          id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters"
-          value="do not insert"/>
-
-        <!--Java:SPACE_BEFORE_OPENING_ANGLE_BRACKET_IN_TYPE_PARAMETER-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters"
-          value="do not insert"/>
-        <!--org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=Java:SPACE_AFTER_CLOSING_ANGLE_BRACKET_IN_TYPE_ARGUMENT-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments"
-          value="do not insert"/>
-
-        <!--org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=Java:<Programmatic>-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-
-        <!--IDEA使用了对应的配置：Java:SPACE_WITHIN_ARRAY_INITIALIZER_BRACES，但感觉不太好，IDEA默认不插入，Eclipse也使用不插入-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer"
-          value="do not insert"/>
-
-        <!--use default insert-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return"
-          value="insert"/>
-
-        <!--use default do not insert -->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-
-
-        <!--use default insert-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration"
-          value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration"
-          value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration"
-          value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration"
-          value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw"
-          value="insert"/>
-
-
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=Java:SPACE_BEFORE_SWITCH_LBRACE-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=Java:SPACE_BEFORE_CLASS_LBRACE-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration"
-          value="insert"/>
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=Java:<Programmatic>-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=Java:SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer"
-          value="insert"/>
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=Java:SPACE_BEFORE_METHOD_LBRACE-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration"
-          value="insert"/>
-        <!--org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=Java:SPACE_AFTER_QUEST-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=Java:SPACE_BEFORE_QUEST-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=Java:SPACE_BEFORE_ANOTATION_PARAMETER_LIST-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation"
-          value="do not insert"/>
-
-        <!--use default do not insert-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-        <setting
-          id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression"
-          value="do not insert"/>
-
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference"
-          value="do not insert"/>
-
-
-        <!--下面两个对应IDEA中的一个配置Java:SPACE_AROUND_ASSIGNMENT_OPERATORS，使用insert-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=Java:SPACE_BEFORE_CATCH_PARENTHESES-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=Java:SPACE_BEFORE_METHOD_CALL_PARENTHESES-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation"
-          value="do not insert"/>
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=Java:SPACE_BEFORE_TRY_PARENTHESES-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
-
-        <!--下面两个对应IDEA中的一个配置Java:SPACE_AROUND_UNARY_OPERATOR，使用do not insert-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=Java:SPACE_BEFORE_IF_PARENTHESES-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=Java:SPACE_BEFORE_WHILE_PARENTHESES-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-
-        <!--org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=Java:SPACE_AFTER_TYPE_CAST-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="do not insert"/>
-
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=Java:SPACE_BEFORE_METHOD_PARENTHESES-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration"
-          value="do not insert"/>
-
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=Java:SPACE_BEFORE_FOR_PARENTHESES-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=Java:SPACE_BEFORE_SYNCHRONIZED_PARENTHESES-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-
-        <!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=Java:SPACE_BEFORE_SWITCH_PARENTHESES-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-
-        <!--下面两个对应IDEA中的一个配置Java:SPACE_AROUND_LAMBDA_ARROW，使用insert-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
-        <!--SPACE_WITHIN_EMPTY_ARRAY_INITIALIZER_BRACES-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer"
-          value="do not insert"/>
-
-        <!--Idea -> Wrapping And Braces -> Simple classes in one line -->
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="do not insert"/>
-        <!--Idea -> Wrapping And Braces -> Simple method in one line -->
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/>
-        <!--因为Idea不支持配置，所以设置为 Idea默认值-->
-
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant"
-          value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="insert"/>
-        <!--Idea可以通过Wrap Always实现 TODO-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
-        <!--Idea -> Wrapping And Braces -> Simple block in one line -> do not select -->
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-
-        <!--Idea -> Wrapping And Braces -> try statement -> catch.... (Java:CATCH_ON_NEW_LINE)-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement"
-          value="do not insert"/>
-        <!--org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=<Programmatic>-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-        <!--org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=Java:ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer"
-          value="do not insert"/>
-        <!--#org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=Java:ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer"
-          value="do not insert"/>
-        <!--org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=Java:ELSE_ON_NEW_LINE-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-        <!--org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=Java:WHILE_ON_NEW_LINE-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement"
-          value="do not insert"/>
-        <!--org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=Java:FINALLY_ON_NEW_LINE-->
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement"
-          value="do not insert"/>
-
-        <!--comment start-->
-        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
-        <!--ENABLE_JAVADOC_FORMATTING-->
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-        <!--org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=<Programmatic>-->
-        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-        <!--IDEA无对应设置，所以关闭对block comment的格式化 -->
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
-
-        <!--org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=Java:KEEP_FIRST_COLUMN_COMMENT-->
-        <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-        <!--org.eclipse.jdt.core.formatter.use_on_off_tags=FORMATTER_TAGS_ENABLED-->
-        <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
-        <!--org.eclipse.jdt.core.formatter.disabling_tag=FORMATTER_OFF_TAG-->
-        <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+	<profile kind="CodeFormatterProfile" name="P3C-CodeStyle" version="13">
+		<!--可变参数的... Idea没有对应的配置项，强制insert-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+		<!--枚举值之间 Idea没有对应的配置项，强制insert-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=Java:SPACE_BEFORE_COMMA-->
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=Java:SPACE_BEFORE_COMMA
+		由于IDEA只有一个SPACE_BEFORE_COMMA选项，所以统一设置 insert_space_before_comma 为 do not insert
+		-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments"
+				 value="do not insert"/>
+
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations"
+				 value="do not insert"/>
+		<!--insert_space_before_comma end-->
+
+		<!--org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=Java:SPACE_AFTER_COMMA_IN_TYPE_ARGUMENTS-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+		<!--IDEA只有一个配置项SPACE_AFTER_COMMA，insert_space_after_comma*统一设置成insert-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters"
+				 value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations"
+				 value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments"
+				 value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference"
+				 value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations"
+				 value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments"
+				 value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws"
+				 value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters"
+				 value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws"
+				 value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments"
+				 value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+		<!--insert_space_after_comma end-->
+
+
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=Java:SPACE_BEFORE_COLON-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+
+		<!--org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=Java:SPACE_AFTER_COLON-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+
+		<!--IDEA不支持配置，默认do not insert-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+		<!--这个在Eclipse也没有找到配置的地方-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="do not insert"/>
+
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_semicolon=Java:SPACE_BEFORE_SEMICOLON
+		程序导入的时候强制将SPACE_BEFORE_SEMICOLON设置为false
+		-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+
+		<!--SPACE_AFTER_SEMICOLON=true-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+
+		<!--IDEA不支持配置,do not insert-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant"
+				 value="do not insert"/>
+		<setting
+			id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration"
+			value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration"
+				 value="do not insert"/>
+
+		<!--IDEA不支持，使用默认-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+
+		<!--org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=Java:<Programmatic>-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+
+		<!--IDEA不支持配置，使用如下值，两者对应-->
+		<setting
+			id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference"
+			value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters"
+				 value="do not insert"/>
+
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters"
+				 value="insert"/>
+		<setting
+			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference"
+			value="do not insert"/>
+
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments"
+				 value="do not insert"/>
+		<setting
+			id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference"
+			value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters"
+				 value="do not insert"/>
+
+		<!--Java:SPACE_BEFORE_OPENING_ANGLE_BRACKET_IN_TYPE_PARAMETER-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters"
+				 value="do not insert"/>
+		<!--org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=Java:SPACE_AFTER_CLOSING_ANGLE_BRACKET_IN_TYPE_ARGUMENT-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments"
+				 value="do not insert"/>
+
+		<!--org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=Java:<Programmatic>-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+
+		<!--IDEA使用了对应的配置：Java:SPACE_WITHIN_ARRAY_INITIALIZER_BRACES，但感觉不太好，IDEA默认不插入，Eclipse也使用不插入-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer"
+				 value="do not insert"/>
+
+		<!--use default insert-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return"
+				 value="insert"/>
+
+		<!--use default do not insert -->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+
+
+		<!--use default insert-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration"
+				 value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration"
+				 value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration"
+				 value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration"
+				 value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw"
+				 value="insert"/>
+
+
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=Java:SPACE_BEFORE_SWITCH_LBRACE-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=Java:SPACE_BEFORE_CLASS_LBRACE-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration"
+				 value="insert"/>
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=Java:<Programmatic>-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=Java:SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer"
+				 value="insert"/>
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=Java:SPACE_BEFORE_METHOD_LBRACE-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration"
+				 value="insert"/>
+		<!--org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=Java:SPACE_AFTER_QUEST-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=Java:SPACE_BEFORE_QUEST-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=Java:SPACE_BEFORE_ANOTATION_PARAMETER_LIST-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation"
+				 value="do not insert"/>
+
+		<!--use default do not insert-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+		<setting
+			id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration"
+			value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression"
+				 value="do not insert"/>
+
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference"
+				 value="do not insert"/>
+
+
+		<!--下面两个对应IDEA中的一个配置Java:SPACE_AROUND_ASSIGNMENT_OPERATORS，使用insert-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=Java:SPACE_BEFORE_CATCH_PARENTHESES-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=Java:SPACE_BEFORE_METHOD_CALL_PARENTHESES-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation"
+				 value="do not insert"/>
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=Java:SPACE_BEFORE_TRY_PARENTHESES-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+
+		<!--下面两个对应IDEA中的一个配置Java:SPACE_AROUND_UNARY_OPERATOR，使用do not insert-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=Java:SPACE_BEFORE_IF_PARENTHESES-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=Java:SPACE_BEFORE_WHILE_PARENTHESES-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+
+		<!--org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=Java:SPACE_AFTER_TYPE_CAST-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="do not insert"/>
+
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=Java:SPACE_BEFORE_METHOD_PARENTHESES-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration"
+				 value="do not insert"/>
+
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=Java:SPACE_BEFORE_FOR_PARENTHESES-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=Java:SPACE_BEFORE_SYNCHRONIZED_PARENTHESES-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+
+		<!--org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=Java:SPACE_BEFORE_SWITCH_PARENTHESES-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+
+		<!--下面两个对应IDEA中的一个配置Java:SPACE_AROUND_LAMBDA_ARROW，使用insert-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+		<!--SPACE_WITHIN_EMPTY_ARRAY_INITIALIZER_BRACES-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer"
+				 value="do not insert"/>
+
+		<!--Idea -> Wrapping And Braces -> Simple classes in one line -->
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="do not insert"/>
+		<!--Idea -> Wrapping And Braces -> Simple method in one line -->
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/>
+		<!--因为Idea不支持配置，所以设置为 Idea默认值-->
+
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant"
+				 value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="insert"/>
+		<!--Idea可以通过Wrap Always实现 TODO-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+		<!--Idea -> Wrapping And Braces -> Simple block in one line -> do not select -->
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+
+		<!--Idea -> Wrapping And Braces -> try statement -> catch.... (Java:CATCH_ON_NEW_LINE)-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement"
+				 value="do not insert"/>
+		<!--org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=<Programmatic>-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+		<!--org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=Java:ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer"
+				 value="do not insert"/>
+		<!--#org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=Java:ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer"
+				 value="do not insert"/>
+		<!--org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=Java:ELSE_ON_NEW_LINE-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+		<!--org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=Java:WHILE_ON_NEW_LINE-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement"
+				 value="do not insert"/>
+		<!--org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=Java:FINALLY_ON_NEW_LINE-->
+		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement"
+				 value="do not insert"/>
+
+		<!--comment start-->
+		<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
+		<!--ENABLE_JAVADOC_FORMATTING-->
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+		<!--org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=<Programmatic>-->
+		<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+		<!--IDEA无对应设置，所以关闭对block comment的格式化 -->
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+
+		<!--org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=Java:KEEP_FIRST_COLUMN_COMMENT-->
+		<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+		<!--org.eclipse.jdt.core.formatter.use_on_off_tags=FORMATTER_TAGS_ENABLED-->
+		<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
+		<!--org.eclipse.jdt.core.formatter.disabling_tag=FORMATTER_OFF_TAG-->
+		<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
         <!--org.eclipse.jdt.core.formatter.enabling_tag=FORMATTER_ON_TAG-->
         <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
 
-        <!--下面的没有IDEA对应项，在代码里面对IDEA中使用默认值即可,LINE_COMMENT_AT_FIRST_COLUMN BLOCK_COMMENT_AT_FIRST_COLUMN设置为false-->
-        <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-
-        <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments"
-          value="false"/>
-
-
-        <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-
-        <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-        <!--和IDEA保持一致，注释换行-->
-        <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
-
-
-        <!--comment end-->
-
-        <!--org.eclipse.jdt.core.formatter.blank_lines_after_imports=Java:BLANK_LINES_AFTER_IMPORTS-->
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-        <!--org.eclipse.jdt.core.formatter.blank_lines_before_imports=Java:BLANK_LINES_BEFORE_IMPORTS-->
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-        <!--org.eclipse.jdt.core.formatter.blank_lines_after_package=Java:BLANK_LINES_AFTER_PACKAGE-->
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-        <!--org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=Java:BLANK_LINES_AROUND_CLASS-->
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-        <!--org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=Java:BLANK_LINES_BEFORE_METHOD_BODY-->
-        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-        <!--org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=Java:<Programmatic>-->
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-        <!--org.eclipse.jdt.core.formatter.blank_lines_before_field=Java:BLANK_LINES_AROUND_FIELD-->
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-        <!--org.eclipse.jdt.core.formatter.blank_lines_before_method=Java:BLANK_LINES_AROUND_METHOD-->
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-        <!--org.eclipse.jdt.core.formatter.blank_lines_before_package=Java:BLANK_LINES_BEFORE_PACKAGE-->
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-
-        <!--下面IDEA没有对应设置，使用对应值即可-->
-        <setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-
-        <!--org.eclipse.jdt.core.formatter.indentation.size=Java:IndentOptions:INDENT_SIZE-->
-        <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-        <!--org.eclipse.jdt.core.formatter.continuation_indentation=Java:IndentOptions:<Programmatic>-->
-        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="1"/>
-        <!--org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=Java:<Programmatic>-->
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-        <!--org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=Java:IndentOptions:SMART_TABS-->
-        <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-        <!--org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=Java:INDENT_CASE_FROM_SWITCH-->
-        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
-        <!--KEEP_INDENTS_ON_EMPTY_LINES-->
-        <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-        <!--org.eclipse.jdt.core.formatter.tabulation.size=Java:IndentOptions:<Programmatic>-->
-        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-        <!--Java:IndentOptions:<Programmatic>-->
-        <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-
-
-        <!--下面IDEA没有对应设置，使用对应值即可-->
-        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header"
-          value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="1"/>
-
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header"
-          value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header"
-          value="true"/>
-
-
-        <!--Java:<Programmatic>-->
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-
-        <!--下面没有对应的IDEA设置，Eclipse先使用对应值-->
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="16"/>
-
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-
-
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression"
-          value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="16"/>
-
-        <!--IDEA默认配置在同一行，Eclipse使用对应值即可-->
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration"
-          value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
-
-        <!--Java:BINARY_OPERATION_SIGN_ON_NEXT_LINE-->
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-
-        <!--ASSIGNMENT_WRAP 需要设置为 WRAP_AS_NEEDED  WRAP_AS_NEEDED . Add in jdt.core-3.12，it's not work in previous version -->
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
-
-        <!--IDEA无配置项，Eclipse使用对应值即可-->
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-
-        <!--org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=Java:KEEP_CONTROL_STATEMENT_IN_ONE_LINE-->
-        <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-        <!--org.eclipse.jdt.core.formatter.compact_else_if=Java:SPECIAL_ELSE_IF_TREATMENT-->
-        <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-        <!--Java:ALIGN_GROUP_FIELD_DECLARATIONS-->
-        <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-        <!--Java:<Programmatic>-->
-        <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
-
-        <!--统一为end_of_lint，IDEA默认一致-->
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration"
-          value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-
-
-        <!--        <setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
-                <setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
-                <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
-                        <setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-                                <setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-                                        <setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-                -->
-        <!--Java:KEEP_SIMPLE_BLOCKS_IN_ONE_LINE-->
-        <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-
-        <!--Java:CLASS_BRACE_STYLE，统一使用end_of_line TODO-->
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-
-        <!--org.eclipse.jdt.core.formatter.lineSplit=RIGHT_MARGIN-->
-        <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
-    </profile>
-</profiles>
\ No newline at end of file
+		<!--下面的没有IDEA对应项，在代码里面对IDEA中使用默认值即可,LINE_COMMENT_AT_FIRST_COLUMN BLOCK_COMMENT_AT_FIRST_COLUMN设置为false-->
+		<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+
+		<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments"
+				 value="false"/>
+
+
+		<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+
+		<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+		<!--和IDEA保持一致，注释换行-->
+		<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+
+
+		<!--comment end-->
+
+		<!--org.eclipse.jdt.core.formatter.blank_lines_after_imports=Java:BLANK_LINES_AFTER_IMPORTS-->
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+		<!--org.eclipse.jdt.core.formatter.blank_lines_before_imports=Java:BLANK_LINES_BEFORE_IMPORTS-->
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+		<!--org.eclipse.jdt.core.formatter.blank_lines_after_package=Java:BLANK_LINES_AFTER_PACKAGE-->
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+		<!--org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=Java:BLANK_LINES_AROUND_CLASS-->
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+		<!--org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=Java:BLANK_LINES_BEFORE_METHOD_BODY-->
+		<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+		<!--org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=Java:<Programmatic>-->
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+		<!--org.eclipse.jdt.core.formatter.blank_lines_before_field=Java:BLANK_LINES_AROUND_FIELD-->
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+		<!--org.eclipse.jdt.core.formatter.blank_lines_before_method=Java:BLANK_LINES_AROUND_METHOD-->
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+		<!--org.eclipse.jdt.core.formatter.blank_lines_before_package=Java:BLANK_LINES_BEFORE_PACKAGE-->
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+
+		<!--下面IDEA没有对应设置，使用对应值即可-->
+		<setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+
+		<!--org.eclipse.jdt.core.formatter.indentation.size=Java:IndentOptions:INDENT_SIZE-->
+		<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+		<!--org.eclipse.jdt.core.formatter.continuation_indentation=Java:IndentOptions:<Programmatic>-->
+		<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="1"/>
+		<!--org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=Java:<Programmatic>-->
+		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+		<!--org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=Java:IndentOptions:SMART_TABS-->
+		<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+		<!--org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=Java:INDENT_CASE_FROM_SWITCH-->
+		<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+		<!--KEEP_INDENTS_ON_EMPTY_LINES-->
+		<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+		<!--org.eclipse.jdt.core.formatter.tabulation.size=Java:IndentOptions:<Programmatic>-->
+		<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+		<!--Java:IndentOptions:<Programmatic>-->
+		<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+
+
+		<!--下面IDEA没有对应设置，使用对应值即可-->
+		<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header"
+				 value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="1"/>
+
+		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header"
+				 value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header"
+				 value="true"/>
+
+
+		<!--Java:<Programmatic>-->
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+
+		<!--下面没有对应的IDEA设置，Eclipse先使用对应值-->
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="16"/>
+
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+
+
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression"
+				 value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+		<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="16"/>
+
+		<!--IDEA默认配置在同一行，Eclipse使用对应值即可-->
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration"
+				 value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
+		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
+
+		<!--Java:BINARY_OPERATION_SIGN_ON_NEXT_LINE-->
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+
+		<!--ASSIGNMENT_WRAP 需要设置为 WRAP_AS_NEEDED  WRAP_AS_NEEDED . Add in jdt.core-3.12，it's not work in previous version -->
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
+
+		<!--IDEA无配置项，Eclipse使用对应值即可-->
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+		<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+
+		<!--org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=Java:KEEP_CONTROL_STATEMENT_IN_ONE_LINE-->
+		<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+		<!--org.eclipse.jdt.core.formatter.compact_else_if=Java:SPECIAL_ELSE_IF_TREATMENT-->
+		<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+		<!--Java:ALIGN_GROUP_FIELD_DECLARATIONS-->
+		<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+		<!--Java:<Programmatic>-->
+		<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+		<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+
+		<!--统一为end_of_lint，IDEA默认一致-->
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration"
+				 value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+
+
+		<!--        <setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
+				<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
+				<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
+						<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+								<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+										<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+				-->
+		<!--Java:KEEP_SIMPLE_BLOCKS_IN_ONE_LINE-->
+		<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+
+		<!--Java:CLASS_BRACE_STYLE，统一使用end_of_line TODO-->
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+
+		<!--org.eclipse.jdt.core.formatter.lineSplit=RIGHT_MARGIN-->
+		<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+	</profile>
+</profiles>
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..adf4cc5
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,19 @@
+# EditorConfig is awesome: https://EditorConfig.org
+root = true
+
+[*]
+indent_style = tab
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+
+[*.{json,yml}]
+indent_style = space
+indent_size = 2
+
+[*.md]
+insert_final_newline = false
+
+
+
+
diff --git a/README.md b/README.md
index ef2fa90..623d543 100644
--- a/README.md
+++ b/README.md
@@ -18,27 +18,37 @@
 </p>
 
 # 简介
+
 lenosp是一个基于spring boot的脚手架，并提供完善社区文档教程，中小企业可以用来快速迭代。
+
 # 体验
+
 [http://42.192.219.164:8081/login](http://42.192.219.164:8081/login)
 体验账户：admin，所有账户密码：123456
 测试环境，所有业务增删改不会持久化，默认显示成功
 
 # 架构
 
-
 # 模块
+
 ![输入图片说明](image/moduleimage.png)
+
 # 里程碑
+
 完善当前单体应用，趋于稳定，可供中小企业快速迭代。
 
 # 功能
+
 xxx
 
 # 关于我们
+
 本项目是郑州程序员组织成员开发迭代
+
 # 加入开源组织
+
 ![输入图片说明](image/image.png)
 
 # 社区
+
 文档地址：https://www.kancloud.cn/zhuxm/zzdevelop/3141950
\ No newline at end of file
diff --git a/db/lenos-mysql5.7.35.sql b/db/lenos-mysql5.7.35.sql
index 6f19d94..8a0ac0e 100644
--- a/db/lenos-mysql5.7.35.sql
+++ b/db/lenos-mysql5.7.35.sql
@@ -15,1362 +15,1992 @@
 */
 
 SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
+SET
+FOREIGN_KEY_CHECKS = 0;
 
 -- ----------------------------
 -- Table structure for act_assignee
 -- ----------------------------
 DROP TABLE IF EXISTS `act_assignee`;
-CREATE TABLE `act_assignee`  (
-  `id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `sid` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '节点id',
-  `assignee` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '办理人',
-  `role_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '候选组(角色)',
-  `assignee_type` int(11) NOT NULL COMMENT '办理人类型1办理人2候选人3组',
-  `activti_name` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '节点名称',
-  PRIMARY KEY (`id`) USING BTREE
+CREATE TABLE `act_assignee`
+(
+	`id`            varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+	`sid`           varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '节点id',
+	`assignee`      varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '办理人',
+	`role_id`       varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '候选组(角色)',
+	`assignee_type` int(11) NOT NULL COMMENT '办理人类型1办理人2候选人3组',
+	`activti_name`  varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '节点名称',
+	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for act_evt_log
 -- ----------------------------
 DROP TABLE IF EXISTS `act_evt_log`;
-CREATE TABLE `act_evt_log`  (
-  `LOG_NR_` bigint(20) NOT NULL AUTO_INCREMENT,
-  `TYPE_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PROC_DEF_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `EXECUTION_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TASK_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TIME_STAMP_` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
-  `USER_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `DATA_` longblob NULL,
-  `LOCK_OWNER_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `LOCK_TIME_` timestamp(3) NULL DEFAULT NULL,
-  `IS_PROCESSED_` tinyint(4) NULL DEFAULT 0,
-  PRIMARY KEY (`LOG_NR_`) USING BTREE
+CREATE TABLE `act_evt_log`
+(
+	`LOG_NR_`       bigint(20) NOT NULL AUTO_INCREMENT,
+	`TYPE_`         varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PROC_DEF_ID_`  varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`EXECUTION_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TASK_ID_`      varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TIME_STAMP_`   timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP (3),
+	`USER_ID_`      varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`DATA_`         longblob NULL,
+	`LOCK_OWNER_`   varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`LOCK_TIME_`    timestamp(3) NULL DEFAULT NULL,
+	`IS_PROCESSED_` tinyint(4) NULL DEFAULT 0,
+	PRIMARY KEY (`LOG_NR_`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for act_ge_bytearray
 -- ----------------------------
 DROP TABLE IF EXISTS `act_ge_bytearray`;
-CREATE TABLE `act_ge_bytearray`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `REV_` int(11) NULL DEFAULT NULL,
-  `NAME_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `DEPLOYMENT_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `BYTES_` longblob NULL,
-  `GENERATED_` tinyint(4) NULL DEFAULT NULL,
-  PRIMARY KEY (`ID_`) USING BTREE,
-  INDEX `ACT_FK_BYTEARR_DEPL`(`DEPLOYMENT_ID_`) USING BTREE,
-  CONSTRAINT `ACT_FK_BYTEARR_DEPL` FOREIGN KEY (`DEPLOYMENT_ID_`) REFERENCES `act_re_deployment` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
+CREATE TABLE `act_ge_bytearray`
+(
+	`ID_`            varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`REV_`           int(11) NULL DEFAULT NULL,
+	`NAME_`          varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`DEPLOYMENT_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`BYTES_`         longblob NULL,
+	`GENERATED_`     tinyint(4) NULL DEFAULT NULL,
+	PRIMARY KEY (`ID_`) USING BTREE,
+	INDEX            `ACT_FK_BYTEARR_DEPL`(`DEPLOYMENT_ID_`) USING BTREE,
+	CONSTRAINT `ACT_FK_BYTEARR_DEPL` FOREIGN KEY (`DEPLOYMENT_ID_`) REFERENCES `act_re_deployment` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of act_ge_bytearray
 -- ----------------------------
-INSERT INTO `act_ge_bytearray` VALUES ('142518', 20, 'source', NULL, 0x7B227265736F757263654964223A22313432353137222C2270726F70657274696573223A7B2270726F636573735F6964223A2270726F636573735F6C65617665222C226E616D65223A22E8AFB7E58187E6B581E7A88B222C22646F63756D656E746174696F6E223A22222C2270726F636573735F617574686F72223A22222C2270726F636573735F76657273696F6E223A22222C2270726F636573735F6E616D657370616365223A22687474703A2F2F7777772E61637469766974692E6F72672F70726F63657373646566222C22657865637574696F6E6C697374656E657273223A22222C226576656E746C697374656E657273223A22222C227369676E616C646566696E6974696F6E73223A22222C226D657373616765646566696E6974696F6E73223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D747275657D227D2C227374656E63696C223A7B226964223A2242504D4E4469616772616D227D2C226368696C64536861706573223A5B7B227265736F757263654964223A227369642D41343530344644322D303230342D343246352D393036312D344134323938324442343938222C2270726F70657274696573223A7B226F766572726964656964223A227374617274222C226E616D65223A227374617274222C22646F63756D656E746174696F6E223A22222C22657865637574696F6E6C697374656E657273223A22222C22696E69746961746F72223A22222C22666F726D6B6579646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22227D2C227374656E63696C223A7B226964223A2253746172744E6F6E654576656E74227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D30443235384332342D314631392D343233332D413937362D413044384342394441454143227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A36302C2279223A3235382E373033373033393938313833387D2C2275707065724C656674223A7B2278223A33302C2279223A3232382E373033373033393938313833387D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D34363841393635452D393339422D343733312D413232392D353137384436413042423834222C2270726F70657274696573223A7B226F766572726964656964223A227573657231222C226E616D65223A22E7BB8FE79086E5AEA1E689B9222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C22657865637574696F6E6C697374656E657273223A22222C226D756C7469696E7374616E63655F74797065223A224E6F6E65222C226D756C7469696E7374616E63655F63617264696E616C697479223A22222C226D756C7469696E7374616E63655F636F6C6C656374696F6E223A22222C226D756C7469696E7374616E63655F7661726961626C65223A22222C226D756C7469696E7374616E63655F636F6E646974696F6E223A22222C226973666F72636F6D70656E736174696F6E223A2266616C7365222C22757365727461736B61737369676E6D656E74223A7B2261737369676E6D656E74223A7B2261737369676E6565223A223062373632356665646161303565383566323832343836653163396339316239222C2263616E64696461746547726F757073223A5B7B2276616C7565223A226533343665393633363834383463386661376632313763653535306130313836222C226E616D6556616C7565223A22E589AFE7BB8FE79086222C222424686173684B6579223A2231494C227D5D7D7D2C22666F726D6B6579646566696E6974696F6E223A22222C2264756564617465646566696E6974696F6E223A22222C227072696F72697479646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22222C227461736B6C697374656E657273223A6E756C6C7D2C227374656E63696C223A7B226964223A22557365725461736B227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D30413541464638362D414541342D343231322D423146342D393237354134343036433244227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3231392E39393939393939393939393939342C2279223A3238332E373033373033393938313833387D2C2275707065724C656674223A7B2278223A3132302C2279223A3230332E373033373033393938313833387D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D30443235384332342D314631392D343233332D413937362D413044384342394441454143222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D34363841393635452D393339422D343733312D413232392D353137384436413042423834227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3131392E31393533313234393939393939372C2279223A3234332E373033373033393938313833387D2C2275707065724C656674223A7B2278223A36302E363438343337352C2279223A3234332E373033373033393938313833387D7D2C22646F636B657273223A5B7B2278223A31352C2279223A31342E3939393939393939393939393939367D2C7B2278223A34392E39393939393939393939393939372C2279223A34307D5D2C22746172676574223A7B227265736F757263654964223A227369642D34363841393635452D393339422D343733312D413232392D353137384436413042423834227D7D2C7B227265736F757263654964223A227369642D37363845453443392D333233432D343744422D423438302D344230323746333136433835222C2270726F70657274696573223A7B226F766572726964656964223A227573657232222C226E616D65223A22E4BABAE4BA8BE5AEA1E689B9222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C22657865637574696F6E6C697374656E657273223A22222C226D756C7469696E7374616E63655F74797065223A224E6F6E65222C226D756C7469696E7374616E63655F63617264696E616C697479223A22222C226D756C7469696E7374616E63655F636F6C6C656374696F6E223A22222C226D756C7469696E7374616E63655F7661726961626C65223A22222C226D756C7469696E7374616E63655F636F6E646974696F6E223A22222C226973666F72636F6D70656E736174696F6E223A2266616C7365222C22757365727461736B61737369676E6D656E74223A7B2261737369676E6D656E74223A7B2261737369676E6565223A223938623035316230333638316465363032383939336135643134616339336362227D7D2C22666F726D6B6579646566696E6974696F6E223A22222C2264756564617465646566696E6974696F6E223A22222C227072696F72697479646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22222C227461736B6C697374656E657273223A6E756C6C7D2C227374656E63696C223A7B226964223A22557365725461736B227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D33334642463234452D464537302D343730412D394442352D394231383831453133383437227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3631302E3039303838323633363434362C2279223A3238332E373033373033313034313134327D2C2275707065724C656674223A7B2278223A3531302E30393038383236333634343631372C2279223A3230332E37303337303331303431313432337D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C2273657175656E6365666C6F776F72646572223A22227D2C227374656E63696C223A7B226964223A224578636C757369766547617465776179227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D46423539344242452D383030352D344544432D423343382D393738314544323236433935227D2C7B227265736F757263654964223A227369642D34373638373538312D333535422D343335342D383433432D433330343233333238364146227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3735352E353435343431333138323233312C2279223A3236332E373033373033393938313833387D2C2275707065724C656674223A7B2278223A3731352E353435343431333138323233312C2279223A3232332E373033373033393938313833387D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D33334642463234452D464537302D343730412D394442352D394231383831453133383437222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3731352E313133303933303035303039392C2279223A3234342E31343432323136333535323135377D2C2275707065724C656674223A7B2278223A3631302E3537383039383232383233392C2279223A3234332E383437313639393931393532327D7D2C22646F636B657273223A5B7B2278223A34392E39393939393939393939393939352C2279223A33392E3939393939393939393939393938367D2C7B2278223A32302E352C2279223A32302E357D5D2C22746172676574223A7B227265736F757263654964223A227369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831227D7D2C7B227265736F757263654964223A227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C2273657175656E6365666C6F776F72646572223A22227D2C227374656E63696C223A7B226964223A224578636C757369766547617465776179227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D41453541454438342D303734362D343738372D393836462D364137393237433334433334227D2C7B227265736F757263654964223A227369642D35313046453036322D433042432D343643382D394231372D384133383037324132424336227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3431302E353435343431333138323233312C2279223A3236332E373033373033393938313833387D2C2275707065724C656674223A7B2278223A3337302E353435343431333138323233312C2279223A3232332E373033373033393938313833387D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D42324633433135342D434432322D343230412D424538422D363836444534373531423731222C2270726F70657274696573223A7B226F766572726964656964223A2275736572222C226E616D65223A22E8B083E695B4222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C22657865637574696F6E6C697374656E657273223A22222C226D756C7469696E7374616E63655F74797065223A224E6F6E65222C226D756C7469696E7374616E63655F63617264696E616C697479223A22222C226D756C7469696E7374616E63655F636F6C6C656374696F6E223A22222C226D756C7469696E7374616E63655F7661726961626C65223A22222C226D756C7469696E7374616E63655F636F6E646974696F6E223A22222C226973666F72636F6D70656E736174696F6E223A2266616C7365222C22757365727461736B61737369676E6D656E74223A22222C22666F726D6B6579646566696E6974696F6E223A22222C2264756564617465646566696E6974696F6E223A22222C227072696F72697479646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22222C227461736B6C697374656E657273223A6E756C6C7D2C227374656E63696C223A7B226964223A22557365725461736B227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D39394343413337462D413233352D343835332D383437322D444532333341443245443332227D2C7B227265736F757263654964223A227369642D30344339463239412D304242352D343639312D383034432D373634453445304132373136227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3434302E35343534343133313832323332352C2279223A3434382E373033373036363437323739327D2C2275707065724C656674223A7B2278223A3334302E3534353434313331383232332C2279223A3336382E373033373036363437323739327D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D46313234303339432D394237422D344134382D384531332D413635353335384246443345222C2270726F70657274696573223A7B226F766572726964656964223A22656E64222C226E616D65223A22656E64222C22646F63756D656E746174696F6E223A22222C22657865637574696F6E6C697374656E657273223A22227D2C227374656E63696C223A7B226964223A22456E644E6F6E654576656E74227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3930382E353435343431333138323233322C2279223A3235372E373033373033393938313833387D2C2275707065724C656674223A7B2278223A3838302E353435343431333138323233322C2279223A3232392E373033373033393938313833387D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D34373638373538312D333535422D343335342D383433432D433330343233333238364146222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E5908CE6848F222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D747275657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D46313234303339432D394237422D344134382D384531332D413635353335384246443345227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3837392E3932343335323534333835352C2279223A3234342E313431393535363839373437337D2C2275707065724C656674223A7B2278223A3735352E363139363535303932353931322C2279223A3234332E37343938323733303636323033327D7D2C22646F636B657273223A5B7B2278223A32302E352C2279223A32302E3530303030303030303030303030347D2C7B2278223A31342C2279223A31347D5D2C22746172676574223A7B227265736F757263654964223A227369642D46313234303339432D394237422D344134382D384531332D413635353335384246443345227D7D2C7B227265736F757263654964223A227369642D46423539344242452D383030352D344544432D423343382D393738314544323236433935222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E4B88DE5908CE6848F222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D66616C73657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365222C2273686F776469616D6F6E646D61726B6572223A66616C73657D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D42324633433135342D434432322D343230412D424538422D363836444534373531423731227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3733362E303435343431333138323233312C2279223A3430382E373033373036363437323739327D2C2275707065724C656674223A7B2278223A3434312E313234353432383830373233312C2279223A3236342E343831303438303538363234377D7D2C22646F636B657273223A5B7B2278223A32302E352C2279223A32302E3530303030303030303030303030347D2C7B2278223A3733362E303435343431333138323233312C2279223A3430382E373033373036363437323739327D2C7B2278223A39392C2279223A34302E3030303030303030303030303033367D5D2C22746172676574223A7B227265736F757263654964223A227369642D42324633433135342D434432322D343230412D424538422D363836444534373531423731227D7D2C7B227265736F757263654964223A227369642D39394343413337462D413233352D343835332D383437322D444532333341443245443332222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E9878DE696B0E794B3E8AFB7222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D747275657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365222C2273686F776469616D6F6E646D61726B6572223A66616C73657D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D34363841393635452D393339422D343733312D413232392D353137384436413042423834227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3334302E3534353434313331383232332C2279223A3430382E373033373036363437323739337D2C2275707065724C656674223A7B2278223A3136392E39393939393939393939393939372C2279223A3238342E363634363432313339373631367D7D2C22646F636B657273223A5B7B2278223A302E393939393939393939393939393939392C2279223A34302E30303030303030303030303030397D2C7B2278223A3136392E39393939393939393939393939372C2279223A3430382E373033373036363437323739337D2C7B2278223A34392E39393939393939393939393939372C2279223A34307D5D2C22746172676574223A7B227265736F757263654964223A227369642D34363841393635452D393339422D343733312D413232392D353137384436413042423834227D7D2C7B227265736F757263654964223A227369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C2273657175656E6365666C6F776F72646572223A22227D2C227374656E63696C223A7B226964223A224578636C757369766547617465776179227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D38344442433035362D303639312D343733452D383243462D443332354546373336413732227D2C7B227265736F757263654964223A227369642D30443039333043392D394241312D344636382D383545412D333834453136423430394130227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3330342E39393939393939393939393939342C2279223A3236332E373033373033393938313833387D2C2275707065724C656674223A7B2278223A3236342E39393939393939393939393939342C2279223A3232332E373033373033393938313833387D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D30344339463239412D304242352D343639312D383034432D373634453445304132373136222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E58F96E6B688E8AFB7E58187222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D66616C73657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365222C2273686F776469616D6F6E646D61726B6572223A66616C73657D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D46313234303339432D394237422D344134382D384531332D413635353335384246443345227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3839342E353435343431333138323233322C2279223A3439342E373033373036363437323739327D2C2275707065724C656674223A7B2278223A3339302E35343534343133313832323331342C2279223A3235382E343330323636363433303536327D7D2C22646F636B657273223A5B7B2278223A35302E3030303030303030303030303131342C2279223A37397D2C7B2278223A3339302E35343534343133313832323331342C2279223A3439342E373033373036363437323739327D2C7B2278223A3839342E353435343431333138323233322C2279223A3439342E373033373036363437323739327D2C7B2278223A31342C2279223A31347D5D2C22746172676574223A7B227265736F757263654964223A227369642D46313234303339432D394237422D344134382D384531332D413635353335384246443345227D7D2C7B227265736F757263654964223A227369642D30413541464638362D414541342D343231322D423146342D393237354134343036433244222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3236342E363438343436383730303037352C2279223A3234342E313133343337353334343137367D2C2275707065724C656674223A7B2278223A3232302E36323838393638373939393234352C2279223A3234332E39323238373637313139357D7D2C22646F636B657273223A5B7B2278223A34392E3939393939393939393939393938362C2279223A33392E3939393939393939393939393938367D2C7B2278223A32302E352C2279223A32302E357D5D2C22746172676574223A7B227265736F757263654964223A227369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733227D7D2C7B227265736F757263654964223A227369642D37463032463244352D413642412D343233342D413732342D334638393844323335413442222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365222C2273686F776469616D6F6E646D61726B6572223A66616C73657D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3339302E353435343431333138323233312C2279223A3232332E34303037363130373131373438387D2C2275707065724C656674223A7B2278223A3339302E353435343431333138323233312C2279223A3137322E363031353334383239363530357D7D2C22646F636B657273223A5B7B2278223A3230352E38303433363431303339333632382C2279223A3137312E303333383031323134313530327D2C7B2278223A32302C2279223A32307D5D2C22746172676574223A7B227265736F757263654964223A227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535227D7D2C7B227265736F757263654964223A227369642D30353145353938322D454646442D343337372D423137392D333730343841323346433232222C2270726F70657274696573223A7B226F766572726964656964223A226368696C64222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C22657865637574696F6E6C697374656E657273223A22222C226D756C7469696E7374616E63655F74797065223A224E6F6E65222C226D756C7469696E7374616E63655F63617264696E616C697479223A22222C226D756C7469696E7374616E63655F636F6C6C656374696F6E223A22222C226D756C7469696E7374616E63655F7661726961626C65223A22222C226D756C7469696E7374616E63655F636F6E646974696F6E223A22222C2269737472616E73616374696F6E223A2266616C7365227D2C227374656E63696C223A7B226964223A2253756250726F63657373227D2C226368696C64536861706573223A5B7B227265736F757263654964223A227369642D39443541314632382D393042372D343644322D414637462D353446464637383631343146222C2270726F70657274696573223A7B226F766572726964656964223A22737374617274222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22657865637574696F6E6C697374656E657273223A22222C22696E69746961746F72223A22222C22666F726D6B6579646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22227D2C227374656E63696C223A7B226964223A2253746172744E6F6E654576656E74227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D33453941414432332D343444412D344138352D383242442D443643383330413443343938227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A34382E3531383531383436343031303338342C2279223A3130312E30353130343034353136333330337D2C2275707065724C656674223A7B2278223A31382E3531383531383436343031303338342C2279223A37312E30353130343034353136333330337D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D32333041443633362D423038332D344132412D383446342D464445353430464443314333222C2270726F70657274696573223A7B226F766572726964656964223A22616C6C6D616E61676572222C226E616D65223A22E680BBE7BB8FE79086E5AEA1E689B9222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C22657865637574696F6E6C697374656E657273223A22222C226D756C7469696E7374616E63655F74797065223A224E6F6E65222C226D756C7469696E7374616E63655F63617264696E616C697479223A22222C226D756C7469696E7374616E63655F636F6C6C656374696F6E223A22222C226D756C7469696E7374616E63655F7661726961626C65223A22222C226D756C7469696E7374616E63655F636F6E646974696F6E223A22222C226973666F72636F6D70656E736174696F6E223A2266616C7365222C22757365727461736B61737369676E6D656E74223A7B2261737369676E6D656E74223A7B2261737369676E6565223A226438313861633661383663663161363464323138346266303639396436376138227D7D2C22666F726D6B6579646566696E6974696F6E223A22222C2264756564617465646566696E6974696F6E223A22222C227072696F72697479646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22222C227461736B6C697374656E657273223A6E756C6C7D2C227374656E63696C223A7B226964223A22557365725461736B227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D34454238313431392D314141372D343937452D413545452D453541454631374335453042227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3138392E39393939393939393939393939372C2279223A3132362E30353130343034353136333330337D2C2275707065724C656674223A7B2278223A38392E39393939393939393939393939372C2279223A34362E30353130343034353136333330337D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D31434331333342322D343442312D343833302D394335392D374433353634433933334641222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C2273657175656E6365666C6F776F72646572223A22227D2C227374656E63696C223A7B226964223A224578636C757369766547617465776179227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D41323335414337362D354242452D344133382D383243342D313045453831414638343635227D2C7B227265736F757263654964223A227369642D44413934353339452D463639342D343041312D424534412D424343433144394244313144227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3237352C2279223A3130362E30353130343034353136333330337D2C2275707065724C656674223A7B2278223A3233342E39393939393939393939393939372C2279223A36362E30353130343034353136333330337D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D46363844434341302D463741342D343444342D394534342D353641363832443837454341222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22657865637574696F6E6C697374656E657273223A22227D2C227374656E63696C223A7B226964223A22456E644E6F6E654576656E74227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3334382C2279223A3130302E30353130343034353136333330347D2C2275707065724C656674223A7B2278223A3332302C2279223A37322E30353130343034353136333330347D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D36393442374132412D393841442D343530442D383146452D313135424335363237354244222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22657865637574696F6E6C697374656E657273223A22227D2C227374656E63696C223A7B226964223A22456E644E6F6E654576656E74227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3236392C2279223A3136337D2C2275707065724C656674223A7B2278223A3234312C2279223A3133357D7D2C22646F636B657273223A5B5D7D5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D37463032463244352D413642412D343233342D413732342D334638393844323335413442227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3539362E333439383035343232313539342C2279223A3137322E31303230383039303332363630387D2C2275707065724C656674223A7B2278223A3138342E37343130373732313432383638362C2279223A312E34323130383534373135323032303034652D31347D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D33453941414432332D343444412D344138352D383242442D443643383330413443343938222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D32333041443633362D423038332D344132412D383446342D464445353430464443314333227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3237332E38323738383237343432393137342C2279223A38362E30353130343034353136333330347D2C2275707065724C656674223A7B2278223A3233342E323333353534303139323935382C2279223A38362E30353130343034353136333330347D7D2C22646F636B657273223A5B7B2278223A31352C2279223A31357D2C7B2278223A35302C2279223A34307D5D2C22746172676574223A7B227265736F757263654964223A227369642D32333041443633362D423038332D344132412D383446342D464445353430464443314333227D7D2C7B227265736F757263654964223A227369642D41453541454438342D303734362D343738372D393836462D364137393237433334433334222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E5908CE6848F222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D747275657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D37363845453443392D333233432D343744422D423438302D344230323746333136433835227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3530392E35363538353533373434373936372C2279223A3234342E3134363035383632333436327D2C2275707065724C656674223A7B2278223A3431302E3533343738323038383137322C2279223A3234332E383533313435353137393831367D7D2C22646F636B657273223A5B7B2278223A32302E352C2279223A32302E357D2C7B2278223A34392E39393939393939393939393939352C2279223A33392E3939393939393939393939393938367D5D2C22746172676574223A7B227265736F757263654964223A227369642D37363845453443392D333233432D343744422D423438302D344230323746333136433835227D7D2C7B227265736F757263654964223A227369642D41323335414337362D354242452D344133382D383243342D313045453831414638343635222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E5908CE6848F222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D747275657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D46363844434341302D463741342D343444342D394534342D353641363832443837454341227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3530342E32343839303939393834363832362C2279223A38362E34323734383336353430383030367D2C2275707065724C656674223A7B2278223A3435392E36333934393434333031303534362C2279223A38362E31343333343732343931383630327D7D2C22646F636B657273223A5B7B2278223A32302E3530303030303030303030303031342C2279223A32302E357D2C7B2278223A31342C2279223A31347D5D2C22746172676574223A7B227265736F757263654964223A227369642D46363844434341302D463741342D343444342D394534342D353641363832443837454341227D7D2C7B227265736F757263654964223A227369642D44413934353339452D463639342D343041312D424534412D424343433144394244313144222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E4B88DE5908CE6848F222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D66616C73657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D36393442374132412D393841442D343530442D383146452D313135424335363237354244227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3434302E30383436333334333233383532362C2279223A3133342E333339333232313439353833337D2C2275707065724C656674223A7B2278223A3433392E38353834353834393631383834362C2279223A3130362E303930353433323636373635397D7D2C22646F636B657273223A5B7B2278223A32302E3530303030303030303030303031342C2279223A32302E357D2C7B2278223A31342C2279223A31347D5D2C22746172676574223A7B227265736F757263654964223A227369642D36393442374132412D393841442D343530442D383146452D313135424335363237354244227D7D2C7B227265736F757263654964223A227369642D35313046453036322D433042432D343643382D394231372D384133383037324132424336222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E4B88DE5908CE6848F222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D66616C73657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D42324633433135342D434432322D343230412D424538422D363836444534373531423731227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3339302E39383338303830363836333436332C2279223A3336372E38363338363638373439393039357D2C2275707065724C656674223A7B2278223A3339302E36363935373435363738313135342C2279223A3236342E34383130343334333933333531377D7D2C22646F636B657273223A5B7B2278223A32302E352C2279223A32302E3530303030303030303030303030347D2C7B2278223A35302E3030303030303030303030303131342C2279223A34307D5D2C22746172676574223A7B227265736F757263654964223A227369642D42324633433135342D434432322D343230412D424538422D363836444534373531423731227D7D2C7B227265736F757263654964223A227369642D38344442433035362D303639312D343733452D383243462D443332354546373336413732222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E4B88DE5908CE6848F222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D66616C73657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3337302E363730303939393039323233372C2279223A3234342E31303931303034353732383030387D2C2275707065724C656674223A7B2278223A3330352E33373533343134303839393932352C2279223A3234332E37393833303735333930383735357D7D2C22646F636B657273223A5B7B2278223A32302E352C2279223A32302E357D2C7B2278223A32302C2279223A32307D5D2C22746172676574223A7B227265736F757263654964223A227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535227D7D2C7B227265736F757263654964223A227369642D30443039333043392D394241312D344636382D383545412D333834453136423430394130222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E5908CE6848F222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D747275657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365222C2273686F776469616D6F6E646D61726B6572223A66616C73657D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D30353145353938322D454646442D343337372D423137392D333730343841323346433232227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3238342E323935353338353539393932382C2279223A3232342E34393134393033323031333735337D2C2275707065724C656674223A7B2278223A3139332E35383236343937343733333034362C2279223A3137322E313532383934353937323330387D7D2C22646F636B657273223A5B7B2278223A32302E31363137303636333435343032382C2279223A312E323837353339313237343833333730337D2C7B2278223A362E3530383031393933353239333633372C2279223A3137302E38303635303532363235393035357D5D2C22746172676574223A7B227265736F757263654964223A227369642D30353145353938322D454646442D343337372D423137392D333730343841323346433232227D7D2C7B227265736F757263654964223A227369642D34454238313431392D314141372D343937452D413545452D453541454631374335453042222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D31434331333342322D343442312D343833302D394335392D374433353634433933334641227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3431392E333839353234303834323934342C2279223A38362E34363037373339383738363638347D2C2275707065724C656674223A7B2278223A3337352E333639393734303934323739332C2279223A38362E32373032313331363533393932347D7D2C22646F636B657273223A5B7B2278223A35302C2279223A34307D2C7B2278223A32302E3530303030303030303030303031342C2279223A32302E357D5D2C22746172676574223A7B227265736F757263654964223A227369642D31434331333342322D343442312D343833302D394335392D374433353634433933334641227D7D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A313230302C2279223A313035307D2C2275707065724C656674223A7B2278223A302C2279223A307D7D2C227374656E63696C736574223A7B2275726C223A227374656E63696C736574732F62706D6E322E302F62706D6E322E302E6A736F6E222C226E616D657370616365223A22687474703A2F2F6C656E6F73702E636E23227D2C227373657874656E73696F6E73223A5B5D7D, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('142519', 14, 'source-extra', NULL, 0x89504E470D0A1A0A0000000D49484452000003BF00000221080600000086FB0D1D000000206348524D00007A26000080840000FA00000080E8000075300000EA6000003A98000017709CBA513C0000000467414D410000B18E7CFB5193000000017352474200AECE1CE900000006624B474400FF00FF00FFA0BDA793000000097048597300000EC400000EC401952B0E1B000020004944415478DAECDD097854D5F9C7F17726FB4A080989088208B20B620444145454A854AD08844544C5B58A50A46E55B0EE555BFBB7D52A5A5141826241C50A8A821659944D0908B21804214080908410B2FECF7B3213424820099964327C3FCF739FC9EC933377EEBDBF7B368700A7A0952B575E565454342E3737B77B767676A3C2C24207A50200288FC3E190D0D0D08C9090901F9C4EE7DF3B77EE3C935201807AB83DA708702AF9F2CB2F3B040505CD34C1F7EC264D9A38A3A2A2A4418306620E66281C0040B90A0B0B25333353D2D3D365E7CE9D66175294626E4EECD9B3E7B7940E00107E01AFF3BFFFFDEFB70505051F9C79E69901CD9A35B367F20100A8AA6DDBB6C9962D5B0A222222EE3CEFBCF326532200503FF85104385582AFB978AF73E7CE41717171045F0040B5698BA1989818A709C1FDEFBCF3CE6D93274F5E4DA90000E117A873F3E6CD6B6B2E3EEBD2A54BA81EB0000070B2020303253A3ADAB975EBD67EC3860DFB70EAD4A9BB291500F06E7474C4A9708032F9ACB3CE0A22F802006A527878B898FD4BB0F10EA50100845FA04E7DF6D9675D9C4EE739CD9A35F3A7340000354DC790F0F3F36BF5F9E79FF7A0340080F00BD41987C331F0F4D34F2FA48F2F00C0539A366D1AEC743A8750120040F805EA8C9F9F5FBFE8E8E8284A0200E029515151FE26FCF6A7240080F00BD49982828273E8EB0B00F0A4888808C9CFCF6F4D490000E117A84B814E27AB3900C0830753C5FB1976360040F8050000000080F00B0000000000E1170000000000C22F0000000000845F0000000000E1170000000000C22F0000000000845F000000000008BF0000000000107E010000000020FC020000000040F8050000000080F00B0000000020FC020000000040F8050000000080F00B0000000000E1170000000000C22F0000000000845F000000000008BF0000000000107E0100000000845F000000000008BF0000000000107E010000000020FC020000000040F8050000000080F00B0000000000E1170000000000C22F0000000080F00B0000000000E1170000000000C22F0000000000845F000000000008BF0000000000107E0100000000A80C7F8A00404D397CF8B07CB7E53BC94ECB16E761CEADD5967CFF7C713472C8392DCE91D3224EA34000000008BF003C65EFBEBDB2227985EC8DD92B07CE3A2087430E5328B52430275022D32365F5CAD5B2AFCD3EE910DF814201000020FC02A8695AE3BB3A79B56C3D73AB6487675320B52C373857D2E2D3242B324B6483485C789CC484C75030000000A5D02E11C0494BD99A227B62F6107CEB584E688EEC6BBC4F92372553180000006550F30BE0A4EDDABD4BD25BA69FF07121BB43242C254CFC33FCA5C8AF4872E27224F3EC4C29F42FA4106B48465486C4FE144B410000009441CD2F8093969B937BC23EBE213B43A4C10F0D24E04080388A1CE2CC774AE8AFA1D2E8BB46E22870508835F55D04E78A338F4D3B000000E117409D08DF126E436F59FE59FE12921A420101000080F00BA09E6F68729DE29F5D712F8B808C000A09000000845F00F5DB099B35D3E517000000845F000000000008BF0000000000107E01D4AD82A00229721455787F6120ED9E01000040F805E0035B9A43A71D2AF72E3BDF6FE31CCA08000000845F00F5DF810E07A420A4E098DB33DA66485E833C0A08000000845F00BEEB8423410300000035C09F2200E06901990112B93E52FC0EF91D735FE44F91E2CC734A668B4C4EC701000080F00BA0FE711439246C6B98846F09AFB886B750247C73B804EF0A9603ED0E486E542E0507000000C22F80FA21E0408034D8D0C05E566A6394E52FD1CBA325FB8C6CC96895412D3000000008BF00BC3FF8C62C8FB1B5BA55E1AE29F6CFF6977D5DF65190000000A831D4AD00A871B68973E1493E1F3849D9D9D9140200002841CD2F801A971B9D2B3B2FDF4941A0CE7CFFFDF7F2CC33CFC8030F3C209D3B77A64000000035BF0000DFB27CF972F9BFFFFB3FE9DFBFBFFCF39FFF9475EBD651280000809A5F0080EFF8EAABAF64DAB4693266CC185BE3DBBE7D7B79E18517E4E1871F96962D5B7AF4BDD7AF5F2FFEFEFE76294F7A7ABAA4A6A64ABF7EFDCABDFF89279E90112346488B162D243F3FBFC2D7010000845F00C0296CD1A24536F86A536777D04D484890912347DA26D07FFEF39F253E3EDE63EFBF74E9521B70BB74E952729BBE5F70707049385EB162C551E177E1C285F6322B2B4BC2C3C3ED750DC89B376F96DB6FBFDD7E7E000040F80500C0FAF0C30F65EEDCB947055FB7DEBD7B8B9F9F9F3CF5D453F2C8238F486C6CACC73E8706DF3E7DFA9404DAB4B43449494991EDDBB74BD3A64D252C2CECA8C7BB1F7BE79D77CA2BAFBC229B366DB24DB5274F9E2C39393925CF030000845FC0EBA4E6EE93CFD3BF936F337E941FB3B7CA9EBC74C92ECC91206780C4044449FBD0E6D235BC8D0C88EE29F181D11418709266CD9A25F3E7CF978913275658B3DBAB572FC9CBCB93C71F7FDCE301D85D9B5B9ABB29B39B06DB3973E6484C4C8CBD7EE18517DAE769D8BDEAAAABECDF5A53FCEBAFBFDAFF8B26D00000107E01AFF1F9FEE53275F767F2EBE13DD23DB29D5CD5E80219D774B00DB8A1CE601B80F7E765CA4F87B6C9E28C6419B1FE717BDFA0D84BE49A46BD2840A01A66CE9C295F7FFDB54C9A34E98481F6924B2E916DDBB6D900FCE4934F4A444484473E93D6FE6A187707DBD5AB57CBB5D75E6B9B33BB6953E8EBAFBF5E9292926C736777EDAE865C0DC09F7CF289ADFD8D8A8AF268F9EDDBB7CF8E8CAD8B968D5ED760AE9F4FCBA759B366D2B1634739F7DC733DDA641C0000C22F500F68D87D74EB1BB6C6F7BEA689727183CEE2E7F03BE6711A80438382E5F4A058B924AAAB3C7CC648F9FAC0F7F2E2AFEF49D2EEF9F24CCB3BA4791007974065BDF6DA6BB69970556A72B5FFAF863B0DBF1A98DDFD716B8ABBEFAEF6ED7DFAE9A7ED6D6FBDF596DC7DF7DDE53E5E3F8B8662773F6177C0D4D7F164F0D5A0ABC15B6B97BB76ED2ADDBA7593C18307DBF70C0D0DB59F2B33335376ECD8214B962CB127195AB76E6D1FE3E981C3000020FC025E68CEBEC5F2D42FEFC8CDF157C94D71FDCB0DBDC7A34159977776CF93A13F3E26F7371B4E2D3050C9E0BB65CB161B7CAB5A837BDB6DB7D9E76B1F60ED23AC61AFA6681F5FADBD2D5DCB6B77B6C769B65CBA9FB09B06664F282828B0A177F1E2C572F5D557CBD8B163252020E098C7E949015DF4A4828E9A7DEBADB7CA82050BE4B9E79E93EEDDBB4B6262628D9F38000080F00B78A905E92BE5F9ED49F272AB3F4897F0D627F55A3734BE5212C2DBCA9D9B5E90C385793238F6120A182887F6DBD5397CB579AE4E5F54DDA6CB1A805F7AE92579F1C51765C28409E506C0EAD2BEBD5A233D65CA14DBF4594780D69AD4F2E8FD5AFBAABEF8E20B3B389706650D98354DCB4CFFDF56AD5AD9105B95D0AF0386F5EDDBD7F69D9E3D7BB6AD351F3F7EBC47FB4E030050D39C140150755AE3FBD82F53645A9B474E3AF8BAB50B6D6E5FEFE59DB3E4C3BD8B2864A09CE0ABE1EDF0E1C3D5AAF12DEB8E3BEEB0A15783A0BE764DD1A0AB4D9E478D1A2503060CB0AF5F7AB0ABD221596DDDBA55DAB66D2B43860CB101586B81753A249DF7D71D8C6B22F86A60D5E6CDDAF4BBBAB5DD5ADBABB5BE1A84B5E67CCF9E3DAC980000C22FE0ABB48FAF36757EB1E53DB6FF6E4DD2D77BA5D5787976DB34D992B383C2064A05CA175E78C136DBD59ADA9A6872ABC1D7DDEC57A717D2D7AE09DAE7576B48DDB47677F9F2E576202BBDCF1D7C1F7BEC315BCB1B141464FBFAEAC0525A9BAA35C53ADAB3F613D6FFF964E9FFA5270DAEB8E20A1BC66B82865F1D955A3F5F45B5DA0000781B9A3D0355F450CA64DBC7B7A66A7CCBD21AE03B9B5C2B0FFFFC9A4C6F378902C7292F3B3BDB0E50A50151FB9E6A58D580A873E39675FBEDB71FD37FB6A2C76AE08D8E8E967BEEB9479E79E6193BBAB2BEBE36F1ADD60ED5045977B82D4D0791D2D19C6FB8E10679F3CD374BC2EF79E79D6743A44E83A4B5B2A56978D6E7FDED6F7F3BE9F2D33EBEDAD4B9A6826FE900AC7D9CF5F5B5961B00006FE74711C0978D1C3972524D8E4CAAD3197D99BE429E6A719BF83B3CF7F3E91CD64ADEDE3D5742FD82A56DE8195E5FCE3AF0D09E26347FF4168D7736F6991179DDC157A7DCD166CA818181F676ADF9D5DB3232326CB82D2C2CB4B7AF5DBB567EFBDBDF8AD379A461D3F3CF3F7F54F35C7DDE75D75D279D3A752A09AD3ACFAE4E2FB471E3463BAD4FE9E757D639E79C639B2F974743F6E8D1A34BA63FD2F7D4C7EAFBE86D1AD84B2FEEEFCFFDFF56978EEAFCDE7BEFC99831636AB45FB39B86EA37DE78C396A5A7A765AA0FDBC177DE79E731B64000E0BD68F60C5481CEE3ABD3190539033CFE5E0F341B6EA740AA0DB366CDB2CD326BAAD9274E4D35BD1E6960D5BEBDCD9B372FB746D63D28944ED5E3A64D705F7EF9E592EB8B162D929F7EFAA9E4BAD6CC6A70BEF4D24B8F7A2D0D863AF2B3865F13607CA64CB556569B27D7E488D6A569590E1C3850A64D9BC60F0000E0F568F60C5492CEE3BBF570AA9D9AA836F48CEC248FA6FCDBF631AEE9BEC56569CD903B0068EDD5E5975F2E6DDAB4F19AA94CF6A6EC95C0B04089882D1EE068C5FB2BA4F979CD25A665CC318FCDD89521E93BD2E58C738FAE312FCC2F94ECF46C098F09AFD27B17E416885F60F9B5FC8BDF5A2CDD8776AFF07EF7635AF66829F16DE2E5D735BFCAE99D4EB7B7EFDBB64FA29B45FBD46FC4BD1E69D0D240AA4D77ABBB1E69F0D5019534E00E1A34A8C2A6C8DA6459477DD6DA536D826BCB7CF162B9E69A6BE4B4D34EB35306951ECC4A3FCB5D77DD556E2DA87E6E0DC08F3FFEB87DEE95575EE935651A1212629B4957A54C75902B1D304BFB357BD225975C623FA74EEFE49EA71800006F44B367F8B49A6CF63C6BEFD712E1172A97459D576B9F7F67EE5EF935374DBA869FEDD1F7F9E0830F8A036261A1ECDCB9D3D696CD9D3B57525252EC4177A3468D8EDB0FD2D3CD9E43A342E5F5E1AF4BE7DF7616FF407F59F8CA42E93EBCFCA96016BDB1481C0E87C49D1D27DF257D678370DACF69F2DFA7FE2B7987F34A42F1C17D0725E5DB14D9BB75AFECFC71A7FCFCEDCFB274EA527BDFBACFD649E6EE4CF965D52FF2E3FC1FE5AC9E67D9DBD37F4D97E0C823A163F7C6DD927B28571A366D58725BD9C72C7B779974BEBAF8734FB9698A240C4A10A79F535E1BF29A741FD6DD7ED69A5657CD9EDDEB9186CD5F7EF9C5AE475F7EF9A5FCFAEBAF366C9E683D72DBB163873CFBECB3B629F2E0C1838FDB045943A0F69F3D74E890ECDDBB578A8A8AECEDAB57AF9675EBD6D941A6DCB769D3639D4AE878D308858585D9FBFFFDEF7FDBA6C975DD7CDC5DA6FA3FBACB544784D6323A51997EF3CD37B6D9748F1E3D3CFA19F5FBD1ED466666A69C7DF6D972AAA2D93300783F6A7E814AFA36E347B9AAD105B5FA9EDD22DAC9F43D5FC8E8F801B5FEFFEA7432CB962DB38B860077AD93F687ACEE8040D5A12155C36FB7A1DD2420284036FE6FA35CF5F0557260E7011B3283C2824A1EABB5B45AF37BD9BD97C9FA05EB8B83A6BFD3D6B286350A930B6FBAF048C8890EB30139796EB274B9A68B048707DB00DCFEF2F6F2DDBEEFA4E505C5A167DDE7EB4A9EB362E60A896F1B2F0E677160CDDC93693F83FB319B166DB2AFABEFAF35CD1AB60BF30A256D4B9AFD3FA29A4495D4126B6076BF8E2FD340F4D5575FD94583AA06CB8484840AD7239DF647FBF85E7DF5D5951EA0496B797FF8E10769D7AE9D242727DBDBB41678FFFEFD257D817544650DB6DAD7F74434243FF4D043F2E8A38FDACFA8359BDE242B2BABA44CF5FFD2705B5E996A595C7041ED6CB3F47BFDECB3CF6A7C502D000008BF401DF8317BABDCD72CB156DFF3EC9066E67D53EAFC7FD75A277710D683EDF6EDDBDB26A17AE98941744AD3A6C26BE7AD953697B4B181B6A8B0487E4DFE55367EBD519A7569265D071EE9EFB974DA52B9F28F57DAE6CD8BDF5C2CCD3A3713FF207FF9E4F14FA4C3951D6C20D530ECD6E0B406E217E0671FA3A1B420AFC006D91DC93B6C4D6D79F475DCB45659436C930E4DECF5B8D671D2A84523FBB706DFCC5D99367C854485D8DB97BEB3D47E367D4FB7C9C326CBF09787DB80EFEBB43FAE3BB4E91CBD3A48D2C5175F5CB21EB983EFD0A143AB1C3875B4E1BFFEF5AFB6E9B20E92654F8694EA27ABC15B1F53D91337B1B1B1B609F49FFFFC67FB9AC7AB2DAE4B7A92CA5DA61AEE3B77EE5C52A65A9E3A276F6D68D2A4891D5C0B0000C22FE003F6E4A54B6C40ED8E66DA3020420EEECD909933677AD5C1F6AA55ABECE20E099EAC5DD2B07A5AFBD36C8D6C695A935ABAFF6ECA772936B86A88DCF4CD2619F4C220C93F9C2F5FBFF6B50CFCCB401B9A678C9B216DFAB4B18159AF6B18D6C09B919A216929693694EAFBE86B9FDDBBB8F966E99A5FADD19DF7DC3C1BBAD5AE0DBB243C3ADC86E07DBFEC939C8C1CE93BAEAFBD4F6BA4835A06D960ADB5C1FA180DBE9BBFD92CD16714F7F5D5D7BA72C295351E7CB566D09BD699F2688DB0F6CDD5C5AEEB0D1BDA75AB3AC157E908CE3A4AF2CA952B8F1AE04A454646DAD7D44058153AD0D61FFFF8471BAA75D0A9B8B838AF2ED383070F1E55A6DAA45EFB4ED7463F5C3D99A1DF290000845FC0076417E648A8B3760780D2F78B48CE970F967CE0BD2705CCC1F5B7DF7E2B2DFAB5F0C8EB6B48AD88BB49AB6A717E0BB979CACDB2E1AB0D72FE90F3252B2DCB2EFD1FE85FF298A12F0D95590FCDB2E1579B1CFFF8C58FB649B23647D6005A999A5FED3FAC81556913EB3697B6B14177CB922DB2F797BD4707BC3D99F6F597BFB75CCE4F3CDFBE47A7AB8AA7D739907A40125F4A94C090C01A2F330D7FEE9313F5853651D690AA73C7569736B95DB06081ED835A7ADDD01A609DFEA83A7470291DFC4AFBDAD637DAD759478B764FE9E4495AB3AE35FB0000107E011FA041B4B603B0BE5F66477F19D8E41A8FBE8F7B509D13D19A24F7E0416E5A1BA6FD0DD324CD239F4D436AD69E2C1B4A5337A4DA5193D5C1BD07E5F48EA71FF5D8ED6BB6DBD0AACD8CB5FF6F5078906D32AD7FFB07FBDBA6D2DABFD7AD63FF8E92B5374B5AF56A6503ACD6CC96AEF9D57EC01A608F0ADCF98525B5C13BD7ED94D006A1F6B5F5EFC8F8C892C76918D6C1B734F0260C4E3826E436886FE091E0AB74D0A1BA1CF0AA3AB4E6579B2B6BD3FAEA3631D626CD5A7B5C3AF82ABDADEC7A5B591B366CB08339697FF7BAA8F9AD4C99EAEF5297B2FFB79E04D0FED0B54183AFB78C0E0F0000E1173849DAE4599B3E370FAABDA93CF6E7654A58A348B9FED2EBEBEC00BB74E0D54BEDFFA835491A06B47FA1F6D59C3F7FBEC7C26F6CCBE2699E34446AB3620D99DAFC58A73ADAB3F9C808D35A433CFBE1D9B66FF0B9D79D5BD20F57BD3DFA6D19F9FAC8639A4E977EAE8EECDCF692B63628BB9B43EFDFBE5F0EEE3F2851A71F69EEAECDB0DDAF53BAE6578372E99A5F1D304B97997F3C7EF363AD9DAEEAF44B27A273D99E4C0D6A6D84DFF2D623779F5F0DC1D569FAFCE1871F96F4F72D4DFBACBFF2CA2B72DF7DF755E9F5F4F3FCE52F7F915B6EB9457AF6EC5927DB9DCAFC36DD4BD932D526DBB515D8B5C9B3367D060080F00BF88076A1CDEDA057B5197E7F3AB4CDBC6F8B5AFF5FB506CD3D58901E546B8D8E1E4C6BDF5E3DB8D683ECDAE01EE04AFBE416362DB4CD95577EB0D2DEA7FD6D359CEA3CBAC3FE31CCD6108FF9EF187BA9E15547856E7D51EB0A5F5B43AED6E06E5EBCD986081D195A03F0E1ECC3B27BD36E1BB6B5E638A441C851CFD39AE7F26A7E752E621D3DFA8421614FA6ED1F5C12B0566C3D6A102D5F76A2F548FBD83EF2C823767E5F559500AC53FF7CF2C927929B9B7BE44445A9E6CF3AF5918E7EDCB163C74ABD9E36E77FE6996764C4881175167CCBDD69FBFBDB305F99DFA696A706F8DAE8F3ABE5AFFDAE010020FC023EA05B643B599C912CFD1AD6DEA8AFDF66FE68A73BAA6D1A7CDDD3D2E8F4295DBB76F5F8A8CE65E564E6D8519AC7CE1D2B2B3E582105F9C561DC3DBAF3EA0F57CB75CF5C676B4E6D58D9BC473E7BE133898C8B9433BB9D59612DEF8EB53B6CAD704E568E0DB9EEE0ACCEEC7E667140DD9D696B6D75A02A7D7C695AEBEC56BAE6B72C6D429D7B3057F20EE515071513E2B7FFB05D56CF5E2D17DD7A917D7FA503616D5BBDAD64102D5F0CBC55598F3440E908CB1A807500A7CA4E9DF3AF7FFDCB3EBEF4FBEA929E9E5EB24EBFF4D24BF2EAABAF9EF8044566A67D7F9D63D8DBA639D2E05BD932D5A0AF0375D5C648D5DA5C5DA79A020080F00BF880CBA3CE9737523F9182A202F173D4CE3CB79FEF5F2E6FB579A8D6FE47AD35D211717BF7EE6D2F6BAB86B7DCD014112CE3BF1C6FFF3EEB82B3E4F3BF7D2EDF7FF47D49903CADDD69F6EFDE77F6B697B167C54ABF3FF62B996A68CD276B6C13650DB6DACFD75D5B9B9B9D2B118D23242236A224C86A1F5FED1BEC6E7EAC4D98B546D686F08C1C3B976F74B3E8634F12E415D8F0AA531C1D539651A17664670DE5EE707CCDE3D794D4F2F6BAA5972C9DBAD4F651D6E9927CC9C9AE473A82B8CEB3FBF8E38FDB66CC1A428F67CE9C39B6E6B1749F570D7E3AF54F4A4A8AADFDB4272B3232E4F5D75F97D1A34757F85AEE1A5F1D39DA9B826F75CA5483F1F4E9D3252F2FCFA327AFF4C482866C3D69010000E117F001F181D1B6C9F3D707BE974BA2BA7AFCFD1667AC91D88006727A50ACC7DF4BC385060EAD21AAED1ADECAD0409BF8F7C44A3DCECD3DAA7265680D6FB7A1DDAAFCB97A0CEF61E707AE887E86D29FA374F3E68A6AA6EBB39A5C8FF475DC4DA035BCE97CB5E5CDD1AB35BB1A7E4BD7FA6A9FE7DB6EBBCD7E86FBEFBFDF8E22ADC1577DFDF5D7D2AF5F3F69DAB4E931AFA5415B836FEBD6AD2B5DE3ECCD651A1D1D2D6DDBB6952FBFFCD2CECBED293AC2768B162D6AA57935000027C34911009537A2F115F2FCF6245BFBEB69FA3E898D6B67D0A2DFFDEE7776901C6F0CBEDEEC78C1F75454D3EB91BB06586B15274F9E5CD20FBDB4BFFFFDEF72E8D0A192EBFADE43860CB1832F69F3E061C3861D350AB106E9679F7DF698D7D1DB35F8EA28D9B7DE7A6BB941BB3E96A99E34F8E8A38FCA1D08AC26E828CF3A2897BE0F0000845FC0875CDE30411AFA47C89BBB3EF5E8FBBCB37B9E0439026440F405143A4E691A80274E9C689B2F970DC01A8A5353538F1AE44AE7E42D3DD2B5D6986A4DAED682BAE99CC23A3856E900A7A34C3769D244EEB8E30EAF09BE3541FB50EB805D3367CEF4C8EBCF9E3DDB96715D4CAD050000E117F0B067CFBC43FE9DFA89ACCEDAE891D7D711A55FD9315B9E3CF3B65AEB5B0C78B3A8A82879F4D1476DBFDE175F7CD106606DEEFCC20B2F940C68E576EFBDF71EF37CADFDDDB7EFC808DBFAFCA953A7DADBDC0361694DB137D5F8D624AD95DDB469937CFA69CD9EB4D3E6CE3A8A36B5BE0080FA823EBF4015691FDC87CEB841C66E7949A6B579A446FBE4FE7A788FDCB9E905B9BFD9706919DC84C2065C748027ED03AC8157C3EAEF7FFF7B3B98536568AD6F458FD551A2B5C9F38409137C32F82AFDBFC68E1D2B93264DB2D7FBF7EF5F23C157C3B4965BE966E5000078336A7E816A1810DD53C6341928C3373C5E6335C05AE3ABAF3734F632B9A6512F0A192843FBBD8E1F3FDE86D5E79E7BCE36573E19494949B6F657039CAFF777D713001A7E972C59226FBFFD76B5CB4E9FA7E5366FDE3C5B6EDA2C1D0000C22FE0E3AE8BE92DF7354D94DB363E27AFA7CE39A941B0B48FEF2D3F3D6303F5EDA75D43E102C709C05A8BA9CD947524E8EA86B869D3A6C9BA75EBEC6B9D2A03BD6900D6FED35A13AC271134C09637885879F4715ADB3B6EDC385BE61AA409BE0080FA8666CFC049D01AE073C35ACB4329936556DAD7B6B9F2C50D3A57FAF93A9DD1DF7E7DDFFC109D32B5ED233475062A1980EFB9E71E79EDB5D76C087BF8E1876D18AEAC59B366C99A356BEC734FB526BB1A7C870F37DBA98B2FB62700B4165707AC4A4848B0D33FE9B450DAC45C036E6666A61D504C6B8B57AD5A6507CFFAC31FFE600710030080F00B9C82B4CFEF5B6D1E92B9FB97C91BA99FC8A35BDFB001F8A2C8CE72766853890D88925067B06417E6C8FEBC4CD99CB343966424CBE7FB97DB797CDDCD9C19DC0AA81A9DCB5703B0865FED0F5C999A480DBE5A83A9A33B9FCA7D5535C83EF0C003B6D9F7CA952BE5ABAFBE92EDDBB7DB01C434F86AD9E809051D01BB63C78E72F5D557338F2F0080F00BA058BF86DDED929ABBCF06E18FF62E9235DBB6485A5EBA1C2ECC932067809D26A95D680BE916D1CE06E69A1C2C0B385503F0942953E4F1C71FB773021F2FA0CD9F3F5F3EFBEC33F9F39FFF5CA59A625FA64DA1756AA8D2D343010040F8055029F181D1322AAEBF5D0078DEA851A36C935DED035C5100D69ACD8F3EFAC8D676D2571500805313035E0100EA3DADB91C3C78B09D0F78CB962D47DDB77CF972DBBF558371F3E6CD292C000008BF0000D45FBD7AF5B28339697F5E1DC9592D5BB64CDE78E30D5BE34B9F5500004E6D347B0600F88CDEBD7B4B585898FCF5AF7F95B8B838D9B56B971DA1B865CB96140E0000A7386A7E01003E45A7ED39F7DC736DF367BD6CDFBE3D8502000008BF0000DFA3B5BEA52F01000008BF00009F939F9F6F2F030202280C000040F80500F8A68C8C0C7B1919194961000000C22F00C03715161616EFE49CECE6000000E1170000000040F80500A07E4A4F4FB7975151511406000020FC02007C535E5E9EBD64C02B000040F8050078B5ACAC2C993061C231B7A7A5A5C9A041832435359542020000845F0040FDB57AF56A090F0F97B3CE3AABA409B3DB942953E4F1C71F97F8F8F80A9F4FCD2F000028CB9F220000789B175E7841DE7CF34D69DBB6AD3CF9E493929C9C6CC370AB56ADE4C61B6F94EDDBB7CBA64D9B64C08001E53E3F3333D35E46444450980000C0A2E61700E075AEBAEA2A19376E9C6DDAAC7FDF7FFFFDF2DC73CF499B366D6C20EED1A3877CF3CD37153EBFA0A0C05EFAF9F95198000080F00B00F03E5AA3ABFD7A1F7EF8E172FBF53EFFFCF39293932341414114160000A8349A3D0300BCCAA2458B6C13E7E0E060E9D8B163C9ED7ADB575F7D25975D7659C914461F7EF8A124252555F85A63C68C39EAFAC08103E5FAEBAFA7900100380551F30B00F02AA3468DB2E1F6C1071F94F5EBD797DC1E131323C3870F973E7DFA88BFBFBF1C3E7C585AB46851A5D73EDE20590000C0B751F30B00F03A5ACBFBCA2BAFC8C2850B6D13686DE69C9292629B41CF983143F2F3F3E5CA2BAF94CE9D3BDB41ADDC035C1D8F3693EEDEBD3B850B0000E11700AA27242444427342253B389BC2A863813981E20870D4FBFF43C3AD9B065FBDAE41586B7F75B467BDD481AF544242822C58B040020303253737B7C2D7D426D44CF642C5FD00002000494441547D040000E11700AA2D363656CECE3C5B5607AFA630EA58C3030D25BA6174BDFF3FFAF5EB672FB3B2B264C4881147DDA761F89E7BEEB135BFDA7FF7820B2EB0E1B7A8A8E8B8AF79E9A597B282000040F80580EA6BDEBCB9ECFA76979C1579966C0EDA4C81D491E09C6089DB1D276D12DAF8CCFFD4B76FDF63FFCFE060DB24DA5D3BAC35C0DA47383D3DBDC2D7D15A61774D310000383531E0158093A67D293B74E8200D363690F3D3CE9726B94DCCC685CD4B6D093F1C2E6DF6B491B69BDA4AA7F69D243434D47702BD09BAE5D101AFDCF7695366EDFBAB2A9AD757E705F6A5720100005547CD2F801A111D1D2DDDBA7593CD9B374BD1A6226978A82185524BB456B361C38672D67967F944C09B33678E9DD2282C2CACE4B6A64D9BDAC05B9AD60AEBEDEAE28B2FB6CFA948D7AE5D5951000020FC0240CDD01AE0F6EDDB53103829AD5AB5B2CD98DDC1569B37EB28CFA507C15ABD7AB5EDF73B6BD62C7BBD4D9B3636F8676767977B7280F00B000008BF0000AFA2CD9935F8CE9E3D5BAEBDF65A7B5D9B2D97AEF9D581B0F436376DEE7CD14517C9BC79F3C4E9744A616161C97D5DBA74619467000040F8050078A73E7DFAD8CBA4A42459BB76ADFD7BD3A64DB6B65783AF4E7754DA39E79C63C36F593D7BF6A430010000E11700E09DB4E9B3D2797CEFBBEF3EFBF79429538E09BD6E3AE895F63DDFB76F5FC96D5A6BDCA953270A130000301C2B00C0BB68FFDEF8F8F82A3F4F9B3E970DBA5A1BCC28CF00004051F30B00F02A393939B6C676FBF6EDB6EFEFFAF5EB65E1C285F6BEEFBFFFDE36876ED1A245B9CF2D3BEAB3F60306000020FC0200BC7707E51AE0EAFAEBAFB74DA0F5BAD60A87878757F89CD6AD5B1F75DD3DFF2F000000E11700E055742467EDDBABB4D65769E02DDBD757AF77ECD8F1A8DB7454E7264D9AC88E1D3B24363696519E010000E11700E09DB496372D2DED9840AC8B9BCEF9ABC158C3AF0E70A5CDA175D9B66D5BC9730F1C382063C68C9166CD9AD9C79D7BEEB9D5EA4B0C000008BF0000D4B85EBD7AD9E54434E83EF7DC73360477EDDA55BA75EB2683070FB6E15907B9D2BEC3999999B61678C992253273E64CDB2C5A1FD3B2654B0A1A0000C22F0000754B6B76DD7D7ECB2A2828B073FF2E5EBC58AEBEFA6A193B766CB9CD9B75D02C5DB4F9B3F6FDBDF5D65B65C18205363077EFDE5D121313EDFD000080F00B0040AD9B306182FCFEF7BF3F6A44671DE86AD0A041D2BF7F7F5BA3DBAA552B1B62AB328D914E85D4B76F5F5BAB3C7BF66C993469928C1F3FDE86630000E0FB98E71700E055860F1F7ED475AD05BEE79E7BE40F7FF8830DC1DABC79E4C891D59EBF576B7BB5D65783F0534F3D257BF6ECA1D0010020FC020050BBB4CF6E69FFF8C73FE491471E9155AB56C915575C2103060CA891F7D1F07BD55557C90B2FBC606B93010000E11700803A919E9E6E43EA9A356B6C53E79A0ABEA50370972E5D6C1F62000040F80500A0D6E894460F3EF8A06CDAB449E6CC9923EBD6AD93FFFCE73F121717270B172E2C59B66FDF5E23EF77EDB5D7CAB265CB64EBD6AD143E00003E8C01AF00005E45E7E9EDDDBBB7DC79E79D929C9C2CE79F7FBE0DBE3A5D51695A2BDCB469D3937E3FED033C70E04099366D9A3CF4D0437C010000107E0100A81D23468C903BEEB843A64E9D6A03E937DF7C23CD9A35F3D8FB5D72C925F2DE7BEFD901B5E2E3E3F9020000F041347B0600789DF0F0707BA941546B8075A4E79494148FBD9F4E8394909020CB972FA7F0010020FC020050BBB4D9F3A5975E2A93274F96575F7DD54E7BE429DDBB77971F7FFC9142070080F00B0040EDD041AF940E42D5BC79733BFDD1C48913ED00589ED2A44913D9B66D1B850F0000E1170000CFEBD1A34749B3671DD42A3232D2FEAD0353E97D9EAAFD8D888890CCCC4CBE0000007C14035E0100BC8A865CB79C9C1C090D0D2DB9EEC9C1A8F47DF5FD0000806FA2E61700E0D541383B3BBB56DE4B836FE9E00D000008BF0000D40AEDEB9B9191512BEFA54D9EB5E933000020FC020050AB74B02B1DF4AA36ECD8B1C3A37309030000C22F0000E5EAD8B163ADCDBDBB6CD93269D7AE1D850E0000E1170080DAD5B56B5759B972A5E4E5E579F47D0A0A0A6CC84E4848A0D0010020FC020050BBA2A3A3A56DDBB6F2E5975F7AF47D162C58202D5AB4F0E868D2000080F00B004085121313E5A38F3EF2D8A8CF3ACAF3071F7C60DF070000107E0100A8133A0855CF9E3D65E6CC991E79FDD9B3674BF7EEDDA565CB9614360000845F0000EA8ED6CA6EDAB4493EFDF4D31A7D5D6DEEBC7AF56A6A7D010020FC020050F7FCFCFC64ECD8B136FCD65400D6E0ABAF357EFC78090E0EA690010020FC020050F774F0AB499326C992254BE4EDB7DFB67D75AB439F97949424F3E6CD93091326486C6C2C850B0000E1170000EF0AC013274EB435C15A63AB0156A729AA0C7D9CD6F68E1B37CE06600DD2045F00004E1DFE140100A03ED1E03B7CF870B9F8E28B65DAB469B6165707ACD2397A9B366D2A919191121A1A6A036E6666A6A4A6A6DADAE255AB56D9C1B3FEF0873F48EBD6AD2948000008BF804F395C585818E474D2C801F0351A641F78E001D9B76F9FAC5CB952BEFAEA2BD9BE7DBBA4A7A7DBE0ABFD78232222A4499326D2B16347B9FAEAAB99C7171E61F6337A5140490000E117A84BDFEDDFBFBF4DA3468D68DB08F8286D0ADDB76F5FBB0075213333B3C0E170FC4049008077A33A0CBE6EE1EEDDBBB7530C00004F494B4BDB5E5454F405250100845FA0CE9883910F5253534F3397F9940600C013B66FDFEE672E3EA0240080F00BD4992BAEB862754141C1EA8D1B372EA7340000356DCB962D9BF3F2F2365C7EF9E54B290D0020FC0275AAB0B070DC2FBFFCD272FFFEFD347F0600D4984CE3E79F7F6E60F63363290D00F07E7E14017CDDD4A953D36EBCF1C6D5A9A9A9BF8D8A8ACA0A090989A4540000271B7C972F5F9E51545474EB15575CB188120100C22FE015DE7EFBED2D23478E4CDEB163C7D0DCDCDCEF1A356AD4D4E170D0F2010050659B366D5AB176EDDA30F3E7AD7DFBF69D43890000E117F0BA003C62C4888F3233332FDBBA756BF8C18307576CD9B2C53179F2E406E63687CE071A1A1A2ACC098C53D99E3D7BE4D34F3F95D8D858090B0BA34000299EC7373D3D7DBBD977FC989C9C9CB76FDFBE1DE6B661D4F80240FDE2A008702AFAECB3CFBA381C8E81B366CD1A630E624A9A4107040448545494346EDCB8E45243B1DE0E9C0A56AE5C29AB56AD9273CF3D57BA76ED4A8100C574C680D5665968960F18DC0A0008BF40BD337CF8F01E0505054B4EF0B002B3AC3561799DB95C6696F54141414BA74C99924E09C2D72426264E321713CDF2585252D2244A040000F80A9A3DE394B666CD9AED1D3B767CCB04DBEBCDD58A06C2D276D07166E968967E6619919F9FFF8079DE1D1D3A74E8B576EDDA1994247C8559AFFB980B5DBE4A4E4E5E48890000005F41E7469CF2929292529C4EE705E6CF942A3E35DE84E66B294100000080F00BD40BD3A64DD339802FA96A0036C199AE0300000000E117A83FB406D8CFCFEFA2CA06E0A2A2A27C4A0D00000020FC02F58ED600BB02F0D6133D76C68C190C010D000000107E81FA1B80A578C09FE306E0C4C4C48F870C19D291120300000008BF40BDE46A02DDCBE1706C29E7EE22B364996580B9FF3B9D1A66D0A041E1941A00000040F805EA1DAD012E2A2ABACCFCF96B9960EC34C1B89DF973AE5982CD32D15CDF6842F07D7DFAF4F1A7E400000000C22F50AF680DB0B9E865966D6583B1B9AFBF148F10BDC82CF166792E3E3E7E8909C17D2839000000C0BBF85104C0F1252727A777ECD87196F9738409BC6165EE4B31CB9B9D3A75D2DAE1AE66696B96511D3A74E8626EDB6CEEDB4109A23E31EB7A1F29EEF3FE95597F175222000080F00B9C6201B873E7CED3D7AC599351C1FD2B131212DECCCFCFD766CFE7381C8E73CCE548132402CCEDAB8D1C4A11845F000000C22FE0F52A0ABE6E1A704D58F8BC5DBB766F9AF0DBCA2C3A12741F1388479B40516442F04AF318E60606E117000080F00BD47FEBD6ADCB5ABB76ED0C1322BE32577B98E50CB35C6142703F73DB466D2A4D2981F00B000040F8057C8286DC98989857C3C3C37F365713C4D51FD8848B1E9D3A755A61EE4FA39440F805000020FC02F55E4A4A4AA10910AB4DD87D478A4757D7BEC0EDCD32DADC16DEAE5DBB65EBD6ADCBA5A440F805000020FC02F59E0911D9DA1FB873E7CEEF1415159DE10AC0173B9DCE61266C1CD0804C2981F00B000040F8057C820E9A6502C5FBEDDBB75FE270387A9A9B5A9AE55A1338AE37B76D5CBB76ED164A09845F000000C22FE01334E4C6C4C4BC121E1EBEB3A8A8A89709C2679845A7464AE8D4A9D32AFA0383F00B000040F8057C82AB3FF0F2F3CF3FFFD5828202BD494786D641B1746AA48076EDDA2DA73F3008BF000000845FC027B8E607FEA253A74EEF9BABF1523C28561FFA0383F00B000040F8057C8E3675D6FEC0A5E6076E25DED31F38DE15887EE29B22FC020000107E01D44408B6F303474444EC97E2F9815B78417FE0A7CD72403F8B59B69B85E6D8845F000000C22F8093E3EA0FBC34212161727E7E7E94B9A98BD45D7FE08EAEF77FD62CEBCD72B1144FD5442D30E117000080F00BE0E4B9FA037F6202C93BE6AABF59BA99E5D25AEE0FFC86591E7705DE40B32C37CB2F6619609670B3ECE09B22FC020000107E019C341342D2CDF2E939E79CF371515191D6006B4D6C6DF407D666D73A14F57FCD926D962CB3F435CB3E5708769AE50A291EA42B996F8AF00B0000E0AD9C1401507FBCFBEEBBAB9392922E71381CBF33575334AB389DCECF1313135F193E7C78530FBCE5ED66F9872B043F679618B3CC318BBE978E4E9D2FC50373C5F0ED000000C09B51F30BD443C9C9C9EB1312125ECDCFCF2F282A2AEA62C2702F73795BC78E1D836AB03FF008B3AC90E2BEBD6F99E55E57C8EDE90ABD7F334BB4596E31CBFD6629E49BA9FFA8F9050000BE8A9A5FA09E9A32654A4E5252D224A7D3D9DA5C9D6A9660B34CF4F3F35B93989838EA245F5EFBF25E6596F9AE10AC035DA54A715367BDEF3257007ED82C8FB9FE76D35AE278D7DF7AE9CFB705000080BA46CD2F50CF252727679B6596AB3FB08ECCACFD6F4FB63FF03FCDF292144F6B146996196619EC0ABE774A7173E8AE523C12F49BAEE7685FE00CB36C72DDDECB157E2F768566D403D4FC0200005FE5A0084E0D0B162C689A979F77BFF8C9404781E3344AA4D6EC32CBAC82828217FAF5EBB7A936DE70C89021031C0E8706D716AE9B669A65425252524A155E4683EBA2726ED7F97EE7994543D1FFCC32488A6B84DD125C0159F5308BCE499C23C535D3A80712131327998B8966794C5B1650223EBE5F28C89B608E04AE77143A9A5022B5A3488A763BC4F19FDADC2F000008BFA78CCFBFFCFCCA7CC97F7F7FE3FD21071A1EF03F1C729842A92581398187635263BE6DB8B7614B1348EFE8DBB7EF9CDA78DF41830685FBFBFB3F5C545474B72B8CE698F77F313F3FFFC9F7DF7F3FAB06DEE20EB3E8FCC3CF94B95D6B819F74055F0DBDDA6C5A07CA5A6696E6667984B582F08BBA377FFEFCBEF98EFC99FBE2F60599FD4230FB855ADC2F1C0E2C88D915F343D49EA838A7C3797B6DED170000347BF6797A663FD791BB785BAB6D61E98DD29D050105144A2D2AF02FF0CF8CCA6C7E30F2E08F0DF634183A7CF8F08FA74E9DBACFD3EFAB035E2527277FD1B973E7774C00D641A9B446B697D3E91CDCA143879FD7AE5DFB53355E5643F4A552DC145A07BBD2E6CFA5FBFA8E35CB41296EF6ACFD7CB5B9F548B37C60968FCCB2CA1588E1C568F67C6AEC17F21C798B7E69FD4B84D92FF8B35FA8F5FD8233B341E669590DB276344C6B789DD92F7C541BFB050000035EF9BCF4D0F4A9FB1BEF0FCE0ECFA630EA9029FFEE99D1993F98F0F9786DBEEFB469D3B6272525DDE470382E322178B5B9A995F9FBE3C4C4C44F870C19D2B18A2FA735C617BA42EC936582ACD6020F94E2699174EAA314291E806BA1EB3E1D346B346B0250F7B282B25EDE17B72F8CFD42DD3A1476A8CDFE98FDBFD4F67E010008BFF059C187827B1C883A70E207168A04A6074AE0BE4071E6B35A78C2AED37669F0EC5317EF3D7DFAF4453366CC38D7BCFF0D525C33DBCFFCBDCA04E0C9559C1FF859B35C2EC573FDBA69FFE070D77DFA779AEBF616AEBFB59FF04C57580E664D00EA56406EC0A595D92F388A1C47F60BB9EC173C212D2EAD435DED1700E054C41424BEFE05E7F9079DA82F57D8D630094F092F39B829F22B92CCB332E560F38314600DCA0DC93DBBAE3F8309C153FBF4E99374DA69A73D5E5454749F39E81A5D505030223131F1D9E0E0E06774FAA413BC44966B71D33EBE3A17B03685BED22CE3CCF227B3682DB34E8FA4A3423FE80ABEFF602DF02E43860C79C0AC034F5770F744B35E4C2C731BFD807D805F9E5F5855F70B7AAAFC60B38392D93A538A1C4514624DED1782737534FD484A02006A07A7724F71C1A9C112F953E45167F51D050E7B5BC8CE100AC8072D5CB830DF84E0074DE86D67824F92B8E607CEC9C9593574E8D07E557CB99B5CA156FB00BBE7FBED6096D9AED7D5652EA5EEA53B00A77375551E6FD61746A63D45F70BDA3A480371D8CF6114100080F08BFA293435B4C2FB4276107E7DD9FBEFBFBFC984E0A14545451748F13CBC6DCDDF9F9A00FCF9B061C3BA54F1E56E35CBF566D1F0AC4DABB59F6F8A59DEA0A4BD97F9FEF5C4445A651E6BD68DF4A0A0A09994DA29BE5FE0A4280080F08BFACAEF60C5037EFB1FA255FCA960C68C194B939292CE77F5074E3521A76F6161E1778989896F0E1A3428BE922FA301EA5F52DC245A9BD13EECBA6D3C25ECDDCCF73DBB920F5D588966F1F0F5FD4236FB050000E117F5940E680228ED0F5C5050D05A8E345F1EE5E7E7F7F3D0A1439FD679832BF9328BA4B8DFEF0CD7756DF61C4EE97A75F89D51C987528BCF7E010000C22F00DFF0FEFBEF67E9804626F4B676F70736E1E801735D47861E5085975AEEBAFC9D1C3D4016BC4C6868A89EB0483DC1C3B242424216515A000080F08B7AEB78A37632A2E7A94BE7072ED31FD83D3FF0826AF40786177335653ED1A06433CDE3D2292DF60BEC170000845FD45B79E17915DE57105640019DE2CAF607364B9FC2C2C255DA1FB88AF303C3BBBD7582FB3FA188D82FB05F0000107E51AF65B5CE92FCD0FC636ED7DB32CFCCA4806095E90FAC3585A3CCF58D26043F376AD4A8284AA87E4B4D4D5DA4A33957B499080E0E9E4329B15F280C2C948CB33328200000E117F5931EE0E446E51E73BBDE96D7208F024289F2FA039BE5BE9C9C9C1F870E1D7A2D25547FE9DCCFE63B9D5AC1DD7319E599FD82BD3D3C5F0E373A4C01010008BFA8A72B40BE53020E061C737B406680BD0F28AB9CFEC0F1E6EF59DA1FD82C099450FD64BEC37915DC3583D239B5380A1CE5EE17740A24BF437E14100080F08BFA2738355862FF172B0107CA0FBF7A5FE88E50A6BD40F989A89CFEC066B1F3039BA5052554BFECDAB54B07BDDA5E2610A7070707CFA7744EA1FDC26EB35F5852FE7EC1EFB09F345EDC58C253C2D92F000008BFA81FF400267A75B4345CD3F0B8B5BB7A5F83B50D247A653467FB51A1F2FA039BE5C7214386FC8DFEC0F587367D361747055D87C3319F519E4F918301B3BDD77D42C3EF1B1E7F7B5F2812B131426296C6D893A40000107EE1B5C2B68549EC37B112B427A8D2CF09DC17686B02C2B6865180285779FD81CDE5D89C9C9C8D2604275242F5C65B65C2EF348AC4F785EC0EB1FB056D0D5459FE59FED268592389D81C412D300080F00BEF14B93ED2F6E7AA2A7D4EE44F9114208EAB9CFEC03126404D4F4C4CFC9F09C13DF431D4067BAFE0E0E0A5A5AF070505CDA5547C5FC44F11E2CCADFAE18086DEF02DE1E2CCE15002A82AF68500E117B520373AF7A416A032CAE90FDCCBFCBD64E8D0A15FE6E4E4EC3797FD2825EFE31AD579BDFBFAE1C387FB502ABE4F47F63F99FD42915F11850854C1E8D1A37FC3BE10A81BFE14C1A965EF797B2904D41AED0F3C68D0A0D97E7E7EF799AB0F1615155D72DA69A715ECDEBD7BE6B061C37ABDFBEEBBAB2925EF121414F47C7E7EFE6BAD5BB74EFBF1C71FB5D6FEF2A4A4A4E5948CEFDADF693F8500D492BBEEBAABE7A143876675EFDE7DDBD2A54BD9C602B58C9A5F001EA5FD819D4EA706E0C39D3A752AFCE31FFFE8376EDC381D29E77F4C8DE45D6EBCF1C6ABCCC52BB7DE7AAB73E2C4898D478C18F193C3E1983368D0A056940E009CFC36F6E0C1830BCD65E0D8B1639BB18D0508BF007CCCD0A143DB9A9DFBC251A346F93DF4D043CEF8F87839EFBCF3026FB9E516A7BFBFFF275E322D528C59EE2875BD8B59F460A445054B5BB31CAFB9DA9F5C8F53F5A25FD74D37DDD4BBA8A8E83F7A62A277EFDEF6B601030674EBD7AFDF4EF33DCD370767F11EFE085ADEE1C7B95F47633ADEC9927EAED750B46A02C036B666B7B17DCD12CF3616F51D2B2F008FD1601B1414F4C575D75D17D6B76FDFA3B637975E7A69A85E4E993265B1795CCFA4A4A4140F7D0C0D9F3AE2748EEB7A9A2BBC5E6896BF977ADC7AD7CE3FC7157EF5726905AFA9F79F6796B9650E0C74BAA08E660972BDA70E91DE548A47515EE8ADDFD36DB7DD76456161E147B7DF7E7B60E7CE9D8FBA6FE4C8915DD2D3D3D72C5EBCF85373707691D6E47BE863E84197BEF9BC0AEED7832E3D622CDD3C7080EBC445B0EBFE04D7F7A8DFEDB4328F058053791BDBCB2C6D6A601BBB896D2C08BF1ED46AE9F0A6457EF9D78648F0150552704E415161E342290C7138E4B0439CBB0BA560455191E31B47A15FD2A61ED3B6F39502DE137C838383BFF9CD6F7ED3F8B7BFFD6DB9DB1A0DC03939398EE9D3A72F328FEFE5A100ACF3D4FEABCC6DC3CDF2E40976DCA9AE305BFAB3B7708559DDD61C2CF3F8F9A55EFB4157E8BEC52C37B90E1CDCCFF32A37DC70C395870F1FFEF8EEBBEF0E484828FFA4FF9831633A656464FCB876EDDAE97DFAF4F99D6B4EE09A96EA2AA785E59CBCE8EB3A11D1B6CC7D735C976F9A659CEBEFA75D7FEBC90BADE5C8E2D708806DACB5816D2C08BF5EEAAC6543AF8D0E8878D8298ED63D1B7428BCA261B78667873493F8C0680975064B76614ED0FEBCCC663F1CDCEC98B36F71ABFF1DF8616CAB6F13378A38DED8D46DFA54BE5AA0EEE8140E0E8763C1E5975FDE78D0A041C7DDCE98701C92959515F6D1471F2D3101F8020FD600BB69D3AF6BA5F8ACF589C4B8C2B35B8A6B6951EA360D6C7DE448CDF257525CFBAB61F70BD77D7A4071BA591E73056AAFE01A78E5233D28EBDAB5EB711FFBE0830FB69B306142585151D12BE6E0EC4E0F1E9CF529E7B6B432FBABB265BE428A6B24F4BBFDC02C3D5C7F7730CB046F2A7300A70EB6B1A84BC3870F6F5A5858D8CFAC5357FAF9F97531974DCCF550A7D3996D8ED1F699BFBF370F9B9F9F9F3FE7FDF7DFDF44F8AD236D9724B6880A6E30C304DC0E7F3A6364D8C50D3A8B9FC3EF98C769000E0D0A96D383629BF68FEEA10799F2DF7D4B331FDDFAFAA3AD9725DE5EE85F70D3E6F34E9D2F12F0A6E06B36B2CB1212124E1F3C7870A5B631E67151070F1E3CF0C5175F2C3161F95CB3114EF5E0479C689629527CB65A9B81E999EB8AE6B3D5A0ABCDBEDC35B6BAF39F59EA80405C7FCF75056AFF528FCD7705E06BA4B8F637DD9BBE27AD8DD083B29B6FBE39F0440765CA7CA7F2C4134F9C317EFCF8DF989DA696E1231EFA680B75357295BDFB64C5C2320757EE321FE03A119125476AD6F35D65AE4DDA5FE71709806D6CC93EC99F6DACEF1B32644847B30E3D6DC26E9F76EDDAA5F6EEDD3BA655AB5651868486864A4E4E4E68666666E8B66DDB223FFFFCF3F66BD6AC7962D8B061DF9830FCF0A930F2B8570D78D579E5A81B420343D7DD1C7F55C2679D5E08BB24AA6BB9C1B722BF89EED176F9B9AFB7BEB5C96F839C05FE8B5A7D3B74043F01A0F698E01A6E36B88BCF3DF7DC16B7DE7A6B80EECC2BEBA69B6E6A70C10517840506067E3E74E8D0180F7D441D88EA55296EFAA51649F119EE57E4D881A9DCCDB92E731D18E872966BE75F5E388F721D1C9415E36DC1F7C61B6FBCCC7C4F5A1B11D8AB57AF4A3F4F779A4F3FFD7493B0B0B0DF272626DEE1C18F78951CA965EF20159FA88D71DDE77EACBBF95DDB52077600C036B6B876976DAC0FEBD3A78FBF596F9E0B0E0EFEDA1C479D3F65CA94F0471E79A4D5C5175F1CD5A44913BB7E2973BFC4C6C64AD7AE5D23EFBFFFFE33DF7AEBADB01B6EB8A1878ED1327CF8F07FEAB11CE1B7165CB7F6A15161CE90D7DF38FB81905BE37FEBAC4AE82D6B42D361E7BFDFFEF143FE4EBF675A2D1B3A9A9F03E079A3468D0A6ED4A8D182CE9D3BB7BEE38E3B02AB127CDD7EFFFBDF4774EBD6ED34A7D3B9C0031BDF075C3BEB4565C2E86CB37C63968FCBD9E9976DCAB54B8EDFBC6B75A9A09C24C535CC5ED502C57C37979A8B4FEFB9E79E4AD5461C93F0A3A2B476A2A1BFBFFF5FCDCEF55A0F7DCCAC52075B07E4E89AF6B2524B3DB6EC011A00B08D2D96C336D67769136763C985175E38F0E5975F6E78F5D557C705040454EAB97ABCD6AF5FBFC87FFDEB5F91975E7AE9B58181814BBC64260EDF0DBFFD92C7DFB52B2FFDB5F7DA3E16D825BC758DBC66E7B0B35ACCEBF0BC9FBF9FDF246A8001CF07DF90909005679C7146D7DB6FBFDDBF3AC1D76DCC98318D3A75EAD4343838788EBE6E0D7C3C3D6B3D568A9B7055341E80DEBEBC82E7EA08977D5C4B7329AE29AE28B0B5753DEE71291E4044FF5EE12DDFD3E8D1A37F73E8D0A1B9B7DD765B8503AF54864E57650ECE42CCC1D9DB43860C19E0818F5AB6CC2BA22731B4C65D77D2BA9DEFE17A0E5D5E00B08DADB96DAC368D1ECF36D67B83AFB95872EDB5D79E71F7DD779FE9AEE1AD2AAD11BEF9E69B9B0C1B362CCEAC7B0B7D3500D779F8EDB9FCB6B3F6E666BCF88FB3C6069C1E145BA3AF7D46705C7C52DB49790E91E7CF5E3EB42D3F0FC033C2C2C2E69D7EFAE9DDEEBBEF3EA76E3C4F96799DA873CE39A7635E5EDE7F6B20006B0DAEF64B5A7D82C78D2BE736AD7DD651A117BA9627A5FCE6617A5B8EEB2022C52C33E44873E939AE305CA7DB20AD8D30E5397BCC9831013D7BF63CE9D76BDEBCB97E4FA101010133CCC1598F1AFEB87F2F53E669153C2ED555E67A80A635FADDA5B8B6FD59296EE2DE945F2700B6B127BD8D4D73EDD7CE2BB58D7D4E8ECCAD8E3AA24D9D1D0EC7ACDFFDEE778103070E6C5C13AFF99BDFFC26D604E0483F3FBF39BED804BACE07BC0A0F8CF87C506C9F809AAAF12D4B6B8047C45DF1C5D4D47993CDD58BF89900356BECD8B1FF0D0909E9356EDC38A736B1494F4F973BEFBCF398C7FDDFFFFD9FED63E2969D9D2DB7DC72CB318FFBE73FFF29D1D1D1625EAFD1134F3CD171E3C68DEF9A8DFBE09318F932B5826D5F65B67FC16CBB950000200049444154EE50E5A607005AA3AB813CABD46BE9D40F3AB2F3615708D600FC82149F31EFE3FA7BBA59FAD7C577A4FDCF0E1D3AF4A9D6466833BC8ABEA3BFFDED6FB6C6E1A802A8E0B1FA3D9D73CE397EE3C78F0F7AFEF9E7E70E1D3AB4C7F4E9D3D7D7D0479E5BA6CC5BB94E449476B714F7BF3EEC7ACC6A3932D8580FD7090F2DF34BF89502601B5B23DBD84DA5B6B12FB08DAD7B4D9A3479B6478F1E3135157CDDFAF7EFDF30353535D71C7B3DAFE7767CA9CCEAB4E677C8BAC7EEF473385ADCD0F84A8FBECFA3678CBA2CC82F3086E6CF40CDBAEBAEBB6699C07BC5830F3EE87437B3D1FE4A575F7DF5518FD39DFD7BEFBD77D46DB366CD3AEA20C0E170E8C6D6065FA54DA7EFBFFFFE58B361BFD82C6FE8D9CD1AFCE8E12708BFF952FE20557A5BB259EE9523F31F2A9DDE48E7F94D72ED2426B90E1CC6BA0E1EF47983EAE23BD211478B8A8AFEAB536DB86B23F43B1A3B76AC4444441CF5D8975F7EF998E74F9E3CD97E376E0D1A3490912347967C4F5DBA74F1BBE5965B82CD7AF0F94936918A3F4E99EB7D7F2B73C096E3FA0EF4B6DB5D653EC275D9C275D26310BF52006C636B6C1B7B07DB58EFA1A33A878484DC64B4F0C4EB0F1D3A34CE1C8B0D1F366C5817C26F0D395878E891094D873A829C011E7FAFA7CEBC6DB7A3A8E8F6FAF605990DDD9F74C0831A3EF0074E9A09BC534DE0BDFA91471EF12BBB831F3C78B036852EB99E9A9A2A1B366C9075EBD6D9EBDBB66D93A54B97DADBDDF4F1FABCD2B409F5934F3ED9282E2EAE7F0D07E017A5E2E98D94F6019E5DC17D7AE6FB02B3AC2F1594E7B82ED7BB0E0C4A2FF35D8FABF50142CC0EB1BBBFBFFF47F7DE7B6F60D9FE67DDBB7797C68D1B4BE901317EF9E51759B06041C9F565CB96D9EFCC1CD895DCA607757DFBF63DEAB52EB9E492A06BAEB926E62447EA4E3A4E99EB7775BE599696BAED755799EB6D8F9429F37FB91E93C62F1500DB58B6B1BEC8AC0FCF5F7BEDB58EEAF6F13D113D0633EB5B9059C7FFEE4BE5E657576FFCFC2F49E7FF90BD69DCA3678C72381D9ECFE06D42CE68FECACE0F8B626E6E3F3BED8DE4F4FAF20575ECD8516B94124D3018D3A953A78E6639A47376998D656E659E3F72E4C8497B9AEC610BE1251AEF6C2CEFBCF3CE63B57D02C5AC37D13131319B5252520A6BE235274E9CF8567A7AFA88871E7AC8D9B061C363EE773A9DB6BFD292254B4A76EA7ADBC68D1BED4E5D9B40676464E85C73F6BEA0A020DB04BA65CB96C76EA4FCFCE4A28B2E0AFBFAEBAF9B9B0D7093E4E4E44F7D71DD30DF5391F9BD4FEAD0A1C3D8EAFCD6CBD281570A0A0A3E33E51AA80761E5D1E6799F7FFEB9E4E717B728378FB70762975F7EB9BDFEF4D34F4B56D691CCAE27391E7CF0415B335196F9ACFEBB77EF0E4E4D4DEDDFA54B97B757AF5E9DCF2FDEB3EB8A59469BA58959F69BDFC58ECA3EBFAEF60B2BDE5F21C191C112D220A4528FFF79D9CF92BA2155625B1EE92E51545874542D59698BDF5A2C4DDA3711A75FC5C714FA98809000098F09975FD7FC2A917191F6F67DDBF655FA73F9C27EE114FDDDD4E8BE906D2C6A685B3EC22CEDCDB2AB2ADB711DE4CA6C0B5FF8C31FFE107E32838C9E488B162DFC3EFAE8A3D8B3CF3EFB3DB3EEEEF38572AFB3DAC41DF97BC6F76ED0C57132531A55D5F9116D377D93917CBD66EFFAF64599155CFB0E8E3041628459C9D3CC0F668EB96D86090D0BA74C9992E30D9F31635786A4EF489733CE3DE3A8DB0BF30B253B3DDB1E6C5445416E81F805FA557800D37D68F70AEF773FA6658F9612DF26DE1EE49CDEE9F492839CE866D1A7D2F6F5710DA0717171D9AEF5E64DB3235EF4FEFBEF57AB26D204DF7F9B1DF00D8F3DF698A3741FDEB23A77EE2CCD9A3513739061AFEB0E5E77E8AFBEFAAAA4A5A5C9FEFDFB4B1EABCD9F2FBCF0C20A5F4BCF6A9AF78B32070523860C19B261C68C19FFF0D52FAB267EEBB7DD76DB15870F1FB603AF1C6FAA0DAD61B8EAAAABC4ECD82437B73863E7E5E5C9EBAFBF6EFF3E78F060C963030303B5F6E198FE6AA5DD7EFBEDA1999999EDD6AF5F3FBD4F9F3E834EA29F362A4707F4BA4F17B39E680D4C92D3E97CE3DD77DF5DED8D1FF6BB19DF49F419D1156E7FD7CE5B2B0EE791609BF25D4A49E0B5DBEE5FF6C98F5FFC28374FB9D96EFBD37F4D97A8D38F4CCF1D141A24BFACFA45CEEC7E66C96D651FB363ED0E39EFFAF3ECDF1FDCFF81FC7EF6EFED6BBD73EB3B32E6BF638E7A7FF8E6BED06CC332CCEFE523B35D9D56DD7D21DB58D4A056AEE50EB35E6A7338AD9D9F919A9ABAE878DF6F4141C1802E5DBA1C0C080808F6E487D3607DDE79E71D5EBC78F1B5F5313F7955F8DD99B3AFE7C8F82B6BF53D0744F70C5E9C91DCBB9E7F79FA43D0262FA3CC467C544E4E4E96F9B1CC341BF10F77EEDC39A72E3784DF257D278D5A3492669D9BD9839CB0E8307B20F1EDBBDF4AEB8B5BCB853715879B83FB0EDA30AA72B373EDF56DDF6F93F697B7973D9BF6D883A39CAC1C49DF9E2E978FBFBCDC03180E72AA15AAB45DCC60B3DE0C3607C89966BDF9D8DCF64E5542D55FFFFAD7A7376CD830EAD1471F3D6EF075BBFFFEFBE5DE7BEF2DD9E99B75F4A8A6CEF6BB0C0AD2E98D4EF85AFA7E7FF9CB5FA21E78E081C7CC67CF4F4A4AFA978F7F6505D5F9ADEB88A3E6A0ECE33BEFBC33A032734C0E1C3850BEFDF65BDB1CCF6E60F2F365F5EAD5B686420FD2DCB4FF59D966E9E5B9FBEEBB43264E9CD8CFEC905F369FF1368E6B6A459E6B5DB9BBB0B0F06EB39E6C37EBCC5C3DB837BF9385DEF221776FDA6D4F8456A4C3951DEC763C2D25CDB61409082A6E2E1A1C1E2C05F9051277769CF4BAA557C9E357CC5C21F16DE34BB6E5997B326DCDF2BACF8BBB576C5AB4C9EE872EBBF7327B1236EF709E14E6154ADA9634BBDF896A12557202B561D38604DF538756F7BB4F30EE7305E14A9F60641B0B0F1DA3159A7552CF7C68BFEA3BE2E3E3B70F193264AEB96DC6EEDDBB1796DDE70707070FE8D5AB57546D7CB68B2FBEB8E1AA55ABFA137E4FD2AFB96971ED429BD7EA7B768B68A767C99BFBD077A6CD76C2DD07C7E687923674E850ED5FF8566DD7086B2DADD6FCEA41C6FA05EB2561508238FD9DB69635AC515849F0557A30A20731C97393A5CB355DEC81CDCFDFFE6CC3EF77FBBE93961714377D751FC07090E3918DAC76D21D66D69B612654E5989DFF7FCC6DEF1F2F543DF6D86393D6AD5B77FF830F3EE868D2A449A5DEC7DD77E9D34F3FB5CD9FCD81B96DB2E86E0AEDEFEF6F6B7C2BFB7A7A70F0E4934F464F9830E119B3AEE74F9F3EFD751FFE9A4A376B28AACC6FDDDCD62F3B3BFBC3BBEEBAABC26678151C4C698DBE1C3A74C85E775FBA69CDFBADB7DE2A95695AA57D84CC6B053FF0C003379AE7A44D9E3CF9210E6B3C2EA0CC7E419BC38D3697A35D35C236089BDFCBDCBAFC90EE5640C7F3CBCAE280D0E6D236B625913AFD9CD3ED365EAFB7BEA8F53181D94DEFD7ED7B930EC5DB93B8D671F684AC3D3B60F60999BB32ED3628242AC4DEBEF49DA5F6F3F8051C59AF270F9B2CC35F1E2EA151A1AC55A78668397282F1A0F9BDBC7FBC138C6C63E129661D2CDB5FC36EC775898B8B4B77B5029BE6DEE79BBFCFD326C9B5F1D9F418CD7CBE4EBE52D675167EF7E76704C40644D5EE8AB53F37B2C9374511098989937CE4FB7396FAD114991F428CB948345713B52FE590214336EDD9533BFDBA964E5B2A57FEF14A7B20B1F8CDC5B6F6D73FC85F3E79FC137B70A2073D1A86DD1A9CD6C01E70E863349416E415D820BB237987F80796BF5AD6F7839C43BB0EC9CA952BB58F877BFDD32AD09C528134BFA0A020D5E974E69709AAA9E67B3DEA4486795C5A759B2D97B72F7507616D0E6676EEF3CCF57F970E55AFBCF2CAC4152B563CAAC1B7BC7EB9C7336CD83059B46891EDE3EB5A574BEE0B0909D19132ABF47A5A036C8278833FFDE94F7F3765999E949434D35B7E9083060D8A37072FC1C7D9B9C59BEFB33A4D941C27FAAD9B03221DC4EB6FE3C68D0BD026E755A1CDD3AFBCF24AF9F8E38F6D6DC4513B097F7FD1114CDBB76F5FE9D7D303B949932605DE7FFFFDE3478F1EFDEBEBAFBFFE4F5F3F70D1F9A8CD77115FC9839C4AAF07D558679C6582B0D608DB5A2EF37BD1D7ABB5FDC251DBACDC0239A3EB19929371E273B23BD7EF14FF607FDBDFD76EA02283EDBEA149C7A34F92E9C9CE79CFCD93665D9AD9EBBB36EC92F0E870BB7FD026D2FA5E7DC7150F1C14141624412D83EC3E474F94EA63749FB0F99BCDB6B591D2D7BA72C295B51A7C0FEF3D5C76BF5056BE6B1F50AD565DE5ED3F6AEA39665B9163F643A93EF4330E93232718F7997DE16752EA04A309BC3D0F1E3CF811DBD8FAE544FB650F6C834B3F375CF7D727FB3F94EE0EE5DEE7E7E6E6368A8C8CAC9532D4BEE8F9F9F991BEB24ED459F83D5478D811EA0CAED5F75CFECDB70D9B2CB3C790137DEDC7ED2867041073532B6D6AD3A25F0B8FBEB7F6CBD2E0AA070C9BBED924835E1824F987F3E5EBD7BE96817F1968FB6BCD183743DAF469235D0776B5D7350C6BE0CD48CDB04DDC34946ACDAFD6D29EDDFB6CFBBAA56B7E7DE12067EFF2BDB27DD5F60AD73F0D85DAD4AFBCDBCBD2B3C37A205BC65161DAA5AA2331469AF7D3A90B06B937B06DDBB65D60D6A3D166875FE5E0EBFEAC3A98D58B2FBE78D4FFA2ABECF5D75F6FCF6257950EA665C26FD0134F3CF1868E86AE07F4650E608EB7B3897705FE8AB6894D8FB3238B72ED84AAFB3BF5D86FDDEC085FBAFDF6DB1D553D2873D3EFE2CB2FBF2C3949E1A6FDD04C1957F9F5B496DE7C47818F3DF6D8DF870F1F7EB139E0FBF1380FD73357E1D52C92F0137CDF555D07AAF558F7E06D35BD1E9CE43AE3ACABFD42591BBEDA605BEFE8B65F5BEE44C44694FF0334A1B7E939C7FE04A39A46D9E79595F6739ADD962B6D7DA435C6BA0FD8B2648BECFD65EF518FD5E76B6BA0E5EF2D97F313CFB7DBFF4E571557661C483D20892F254A604860AD96CB9EA57B8EBB5FA8681F5085836F8F3DA782FD50853F11297FCEF59A7E4E4D3D3FBAF40946B30DDC69826FEC4D37DDE4CF36B6CAAAB2BDF5C4F34F769F5B27CF3DC1EBB6D293289E1AE5B92C3D4E33E13788F07B9234F86617E6486D06E06E17F5287869FBCC2213809FAC47DFD1C493F8716C4948486899E6E191E85B9CDFC20E40A20737E70F395FB2D2B2ECD2FF81FE258F19FAD25099F5D02C1B7EB5C9B10E5AA20721DA1C590F402A53F35BDF0F721A253492D81DB1B26AD52AF7A89E716536E8FEE63B8B373B5CFF4A6CF863CAD9919557EB745247B8BA81DDB061432B9D7FB753A7EAB778D11A5E0DF6A5CF78EBF5EA045FB7366DDAF8C5C4C414A6A6A60EF7A29D60792720AA727F9FEA7E36734096D7BB77EF6AAFD47A20AB351065E981597927652A7B92A269D3A6CE8D1B370E16DF579503ED13AD07A5D7B9F26AE1469DC4E7FCD9EC17CE4CABE5194A7E5AF8939C37E83C3BBAF2A237161DB57F284D4F82BA696DB1FBB69FBEFAC96EBB577EB0D2EE47DC344CBB4F94EE5CB753421B84DA00AD7F47C61FA9A8D0FD84BEAFEE0B1206271CB3FD6F10DFA0D6F7092AB6476CD9FDC2313F4D57CD53758FD7AA131C2AFB9CE00AF63B153DB63AFBA3B6DEF0E336DFC169663F5668B6B1D57E0DB6B175A6D2DB5B0F3C5F5BE81D6F633BAA9AEBE366B32E35CFCECEF6AF8D00AC2780CCFBE5FACA0A5167E1B7A17F44DE9EBCF480E641F1B5F7A60D02F6ECB8D091FFF5B8A449F5E50B4A4C4C9C58851FC301B383FCDCD52760AE36D3B9F9E69B8B6AE32067FB9AED36B46A33633D60090A0FB22377EADF7A20B2F1EB8DB67FAF5BC7FE1D256B6F96B4EAD5CA0658AD992D5DF3ABFD80CB9EE5AFEF0739217121D2A16B071D04CA23EB5F054D7B34247F57C9F527BFEC01969E403181F5CDAFBFFEFA61133683ABD2C7A9E400D604DE37DE78E398A65E7AFDBDF7DE936EDDBA552B04CF9F3F7FF5AE5DBB5AE8FA5EA6E6F7B83B9BE335E9D3A6E7E6BEED151EBD0507A79BDF55BA077FEF4595FCAE32CD679DE7FEAD9B1D60AF356BD6CCFCE28B2F8A2EBBECB26A9D9D2D3D1A6999F7B2F755662096B27EF8E187822D5BB6E49ACFF99F32DF51D9F748338FA96E33FE131D5C54691D28E73B4FF59611F54BAD27953E6032FF67966BBFF0B67BBF70CB2DB714D566F8D5EDFBDEAD7B4B5AEEE8767ECFE63D127BD69141F3747C885F7FF8F5A811FC7520441B1ACC6D7A9FBE8E8EE0AF2757DDB30768771A77602E7D5254F721A54F8AEA5812BACCFCE3F17B49947EEDDA10D428C8A3FB056F51956E01A57EA7C1AE0180AAA59CE7BF5989A7E9A04385E5EC0B77666666469A6DAC3FDBD82A7F0F556E7AEFEDDBE0DADE96BBB6E39F98658ABB19BE39BE4FCDC8C888AB8DF06BD67D9DAF3A93F07B925A069F96F963F6D6E8DA0CBF3F1CDCAC5FDC061FFBEDE838F93AEFE98C909090F99E3C30AFF047595824B31F9E2D6D2E6923E75E776E493F5CF5F6E8B765E4EB238F3A9B5FF6B93A6A73DB4BDADAA0EC6E0EBD7FFB7E39B8FFE051A337D7F7831C4FABA0EF55CAF19AA5990D6A81D998FAB97650FEE67ABAB99C5FFA048ADE3774E8D085FFFCE73FBF34212B40A762A88AB973E7DA0D6779F44060D6AC59556EF2B570E1C255FFFEF7BFCF30017A9009D0F3E5D470C87C3FFF35DF4D5239BFF5F9C3860DEB636E9BBF7FFFFE82EBAFBFBE4A7BC31D3B76C8BC79F38E9A6FD2EDC08103B6A95E42428254A5D9BB1E94FDE52F7FC9C9CFCF4F9C3163C61C416DCA718FF65C57FB85D2E63C3647AEF9F33525D7B505CF6B435E93DB66DC56D2FC59A73FD245074C8C8889B02752DD035E697369EDDAD220B741490B1E379DCAAEBC93A27B53F6DA81154F7850B727D3769D71DBBA62EB51E34BA066B8F62529D578EAFA1A0C1A15855FED1BAF676775E038A7F9DD38CBDB179A6D6C17B6B1A84507CC7AF81FA7D3F95E6A6AEAFCB203B0050606AEDDBA756BDCF1A6C6AA29BAFE9ADFC14F84DF93D434B8F1B2C519C9FDFB35EC5E6BEF3967DFE27D45225FF948E07DDF2C9F040707CFA9EB3362DA8CD93D759086D78DFFDB78CC889CA569C8D58395CD8B37DB66A43A32B406E0C3D987ED54185A63AB35C7210D4238C8A9797A563BCF947B902BF06AF0D5BDF1DCE39D40993E7DFA22B3E3EF3675EAD46F4CE00CD5119C2B233D3D5DFEF39FFF8809CD47D69752A33D6B28FEE28B2FEC88D095993AC9FE8EE7CC59F3EEBBEF9E615EA39F09BECB7D3DF09A45CFE27C74A2DFBACEED3A7CF8F02E1F7FFCF1E283070F168D183122ACB213DF6BCD7CE983327D9E7B746EFB210E1DB2F3523EF5D453957ABDD5ABFFBFBDFB00B3AABC1306FEDE9901860E22289648D058B145B1AC2968D4609A292A6349246ABE98982F9BB669BB0846779358369BFD8C4663023E6A04D144578D2524F6D8A2220A36C2824AA8024A9B19A67CEF3BF70C5E2733346760EE9DDFCFE7FF9C7BCF3D7766FCDFCB39E77FDE72A6D75F76D965354ECAB66EC11BFF6DDD143FB7DB3BC37161FDC5AF9FDE1D0E3BEDB0B0FDF0B7870CA682F7E3E33E1E2E3BFAB230FAFBA3C3C19F39B8E94266922E84A68BA2E978928E05E515E54D4571EA59D47CBFDF42693E88668517455B4AADC6B5AB6BC3BAB5F95BCBA49FF5FA8CD7C3F45BA7870F7EE9834DB7D76BDA67C582FBB5E9AFAD6FA5A664ADCB5A78D397A52C8B0D1E0BED63D90A9667E7F737C6FDF8631BDA8FC7F3ABA98F3FFEF851871F7E78878FC57DF4D147D7C5F3B55B15BFEFD23FF5DD7FE24F5EBFFE84FAC6FA509EDB2A33758747DF9AB96BB7FA7073317E50A94B735CDC575656D63CF3E08ACEF2B7A5EE6BF75E766FD358AEF71EF6DE365B79D37D7753AB703AC94845EE69979FB6FE9643CDF7EB5DB9786553AB6D9AA82A6DEF24A7DD956507FB555951B5C91750D281BFAAAA6ABF58703E150BE0EDD2CC951B73F5D557879A9A9AF5CFFBF7EF9FC6A686A79E7A2AC49387FC197B7575B8E28A2B9A6E03B131B1909E79F3CD37F78B07FC23A64E9D3ABB443FA3D5F1DF7BFAB7FEEBCDFDB77EC30D37BC3E76ECD803FEFCE73F3FB87CF9F2F79E77DE797DBA75EBB6B18B0961D1A245EFE88EB7CF3EFB345DA498397366D3C9597A2DB54EDC72CB2D4DF7ACDC90BFFDED6FB5975E7AE9BAF8BE93E249D9DD818E3C2EACCA8E0BBFE96CC78574B1F17F1FFBDFA67D6EDA9FB7948ADCD3AF3C3DCCFBEBBCA6DE3E856A56D784E9B74D0F77FDC75DE1DC5BCE6D5A978E2F1B937E4EDAAFA7D9FF5B4A85749AF4301DAF9A8F1B275E78E2FA0BA0E9FEC18F5DFF5853919DEE2440C9EB96CDE1B059C742FB583AC0FC187F48A74C0B172E9CDED6ED265B2A2F2FBF239E4BFD3CDD2B7A63DFC177230D517BE289271AE277F4778ADF77E98441874FAD7AE182B50FBEF96CCFA307BCBFC37FDF836F4E5F56DD50FDBF2F1F39796E917D46E3E20E726EDC29DFDC59C73CA4715BA3BF3B7AFDAD869EBBF3B9A62ECAA9B04DE37C9B5B6B6BD7D486BE43FA365DF56F2E64D3D8AF3436B8B9FB71EAC29C5A649B8AA2B7AA9B6E7191AEFA3BC9699713E574627CFFBBB9803279F2E4D48DFA905400C79DF48033CE38A3ACAD2BDF73E6CC09B366CD7AC758DF34B6F79C73CE09F3E6CD5B5FFCA6D7E7CF9F1F9E7DF6D9B0A15934AFBDF6DA57EEB9E79E748B9F4F946AE11BFFAD7F3E7E36EFEADF7AFA5C4F3EF9E47F9A3E7DFAD4F1E3C77FE0073FF8419F749B82D6A496F9D42DFD8D37DE1E36107F7FF8FAD7BFDE74303DF7DC73D75FBC58B66C59532BFD873EF4A1365BE95337BC4B2EB924DDB2EB6BF1BBE2A4AC0B1F17D27EFE804F1EB0C16D520FA1D67A0955F6AD0C479C714438FCB4C337EB9EEC479C7EC43BC60CB794BA4C17769B2EECF9D3D6455B1C0BED63E94047C773A98737B5E06D7921E64B5FFAD2E37FFEF39F3FB8298D115BEABEFBEE4B5DAC9F2FA5F3AEF26DF9CB3FF72F67F6BF79E97D47550D3E2694E5CA3AF47755BD3861D1EA86DA4B96FDEAF919C5F4013DFFFCF30FC6981177B25B748FBF2F7CE10B1396ECD4F1F7742CBC6550EA823C648F214D45F10E7BEDD0B44C91C66DB56CA94D134FEDBCFFCEEBB749EF6D7E3C74DFA1FFD0F5B9D9CEFBEDDC5448B725FD9CC34F7FBB4B7DFA7B0A8BF5742B8D14DD7B6DDD89AF862C1812AEBBEEBA0BB6E6EF1C3162441AD73B319E289F1D779637C4EFD38BF1FB54FD2EBE932BF6DA6BAF9B162C585015A3F7FBDFFFFE5C6B33554E9830E11DB77448B765F8CA57BE12D2F894F8FED48D66FD95F0B44C57C08F3FFEF8D05A319D15BEDDE349CB07E2017F56A91E05DFCDBFF542B366CDAA7DF6D9676FD87DF7DDDFF7D8638FED7DC8218774EBDDFB1F5BDF2EBBECB2A693B3E693AFF439A6DB711C70C0014DB392A67B08A68B12CDDDD4D367933EA7638E39A6B593B2DA8B2FBEB836EB867793731AC78576B818B459DB97959715E5E7B92D8E0B5D517B1E0BED6369A77DF9DCA8614BDFFFBEF7BDEFC93973E69CF5918F7CA4A2235A7F53CFBCD4CB203A29FE5B995F2A79DFA6478A0B867DF1BB9565DD574E5C745787FE9EAB16DEB660D9BA37E7EFB27AC164FFD44AE4AA4DF77249D844B158BCE8C61B6FBCBE3D5B88520B707D7DFDBE716738FBEAABAF6E683993F3B469D3DE71A53BDDEA284DE4B1EFBEF9D6955D77DD351C71C411EFB8475D1AF374E79D77FEC3EFBAF2CA2BFF3716BE69ECEBA1E9F7FA4437DDB5D75E7B563CF1BAF4FCF3CF5F9B26AC28F4D7BFFE352C5EBCB8A9ABDDFA93F02143C28927BE3D31513A014BB7D268965AEBD3E794AE04174A276FA935C2F833A02B1D0BED63D996E277E1F9EEDDBBFF362E6B3AE2E7FFFEF7BF6FE8D1A3C72D13274E7CBC94F2B6CD2F931EDFFFD0CFFC7AE11D8DD357BDD2213FFF8535F3EA7FFEFACDDD4359EE9CFB8FBEBFCE3F15681FA9EB576D6DED81F1A0FCF27FFFF77FD7A7712749BACADDF2D646E9607EFAE9EFBC1D6F9AE1B97022AC748531EEC09BBA7E358B85F5FC871F7E78493CE01F154F5A96CAFA167D4EE7C7CFE69BE3C68D5BF7CA2BAFACFF8C528B443A312B94BAE2B5F48D6F7CE31DCFD3095E1ACBDDFC3965DDF056C7CFFB734ECA00FB58FB58B69E9933677EF9B1C71E9B77D75DEDDB90982EC0DC7FFFFD7F5FB468D1974A2D67B9CEF0475CF8EAA46BA62D7FEAEC1BF61A1776EE31B8DD7EEEFC9A25E113B3BEBF6C55DDDA7F9E7DD88DD777C57F147FFCE31F1B671E32D3DEA193D8EFA9FDC271C71D972BA5FFA7934F3EB9CFC08103A7EDBAEBAE877CEF7BDF6B97AE37A9708E05F5C2A79F7EFAC58A8A8ACF74A6897C8AD599679EF9F174DB846F7DEB5BDD3734B67A7334CF381A4FFCC63829735CC071C13ED63E96ADEFF4D34FDFA5B2B2F2B9CF7DEE73034E38E18476297CA74E9DBA64F9F2E58795628FBB4E314066DC7BC69EF3D181237F77FA4B1786F66A017E61CDBC70E2AC1FBEB9AA6EF5255DB5F085AD21EE2057D5D6D68E9A3F7FFE133FFDE94FEB520BEEBB91DEFFE31FFFF88DACF03D41E1DB3EAEBDF6DA3BE389D9A77EFEF39FD7A6EE78EF566A8D4827655A2300EC63D976D2E457F1DC69FFDB6FBF7D4E3C675AB7A5E761E97D37DE7863432C785F2FD5C237E9340327FFF4B3DFDFF4F9EF7F69F0CFE6DF34B22C57963BB0F7EE5B3C09D6A44577D57C7BCEE5AB57D7AFFDC6ECC3A65CDE95FF4114CBC4265D45A94E6C9226DE193162C46F57AD5A75683CE8EF76D4514795A7C93C3657EA3A7DFEF9E72F9F3367CE23DDBA75FB74679DC9B658C593A9BFEDBBEFBEE9F60867F6E9D3A75B1A87BD859F77ED25975CD234F14A3C38FE41661D17705CC03E966DE7B9E79E7B2B7EE7AE880F87DF71C71DFBC673A8F2F7BEF7BDA1B509495B4ABDED1E78E08134B9555D2C7AEF5CB870E13137DD74D3E252CD55A79A35E8C1FFBAFD0F677FF7DC3F3CB272E667AF5F7C6FAF5D7B0C09BB55EEB8C9EFFFCB5BCF852FBF72D99BF72C7BFC859ADCBA8FBF3272F23427394E729CE46CBD02F8E9A79FFE6D3CF01FF8C8238FEC71E4914796A75B3A6CAA34FE3716BE6FC59DEE9DF3E7CF3FF5D65B6FADF58DE99003E4C23DF7DC73CAECD9B3CFACADADAD6C9E846C334EEED2F8B3DA748F4927658E0B382E601F4BE790668E7EFCF1C76FDD638F3D7E1FCFA38E8A05ECE0458B163555BFA9084E9186A6A516DE58E436DD92F2B6DB6E0BD75C734D5DFCBEBEBC7AF5EACF5E71C51517A7D9CC4B394F9D6ECADC07FFFBF6BFBF78C543171FFFED93EAFFB4FCA983AF58706BCF39D57F0F758D0DA1227E68DDCB2A42B75C4558D3501D16D72E0FD357CF0E9397FC29FC70EED5D5772E7BF4A5BFD72E397F87D5F3FFF9A9A3EE58EC9F81931C27395BDF534F3D3575FFFDF73FF0BEFBEEDB73E4C89165ADDDFEA1A5254B968471E3C6AD59B162C53DAFBEFAEA195B72CF3B365D3CB02DDB7DF7DD272D5EBCF80BF100D9FBA0830EDAA4ABC3E9561BF1A46C9DD608C7051C17B08FA5739A3973E6E2279E78E29723468CF84D4D4DCDB2E79F7F7ED0B469D379A9178A00002000494441547ADD72CB2D1553A74E2DBBF3CE3BEB1F7AE8A13571BB39CB962D9B180BE4B3264E9C78E1B3CF3EFB5A57C84FA79F60E14773AF3D78FEBAC5DF78A3F6AD7F7AB576D18E2BEBD7F45AD7505756912BAFEF555EB9B66F79AF97E366772F5AB3E4572F1EE936282D99D8A473E94A139B7CF9CB5FBEB6BCBCFCD458D4764BF7F66DCBCA952BC30F7FF8C3D5CB972FFF5D3C49384BE1BBF58C1D3B7640DFBE7DA7EF169D77DE79A1B2B2B2CD6DE7CC99537FFEF9E757BBD586E3028E0BD8C7527CAAAAAA9E8B8B11315E9E3C79F25E5D350F159DFD0F3C7FD899CFC4C599BEB2505CAEBAEAAA33BFFAD5AF3EF7A31FFDE8A27840EFD15A019C5A7C274C98B02616C03F8985EF4F14BE5B579A4C6CD4A8517BF4EEDDFB81F1E3C71FF9831FFC203760C0807FD82ECD387AE9A597563734349CEBA40CC03E96E23276ECD8CAEAEAEA11D9D33DD3F3AE3AAF4A99AF03D051AEB8E28A4BE3E2EBFFF66FFF5697C696149A376F5E6AF1AD59BB76ED77AEBBEEBA8B14BEDB46CAFB4F7EF293A37AF5EA75CFB871E31A172E5CF88ED75337BCECA4ECA41B6F34733E807D2CC52616BE47143EAFA9A919D55573A1F8053AD495575E79754545C53F5F78E185F5B366CD6A5AF7D24B2FA516DFFAF8F0DB13274EBC5296B6BDF8799C306CD8B09BCE3FFFFCD07CA1229B78A52E75C38B276577CB12807D2C45E9CC8D3C57FC02B497ABAEBAEA8ACACACA332EBBECB27593274F0EFFF99FFF59D3AD5BB773AEB9E69A5FC84EE7F19DEF7CA7EAC0030FFCAF8B2EBAA8F1FAEBAFAFBBF8E28BABD7AD5B3746373C00FB588ADA270A9F3434348C1E356A546BC35FBBC7F8B4E217E05DFAE52F7F39B967CF9E63D2B4FA8D8D8DA7FCEA57BF9A242B9DCFC30F3FFCF30103063C7CE79D7756A46E784ECA00DACFD7BEF6B56FBEFFFDEFFF45B68F3DCF3E968E76EAA9A77E202EB62F5C97CBE5060C193264542B9BF78DF12BC5EFB673D3367E3FD08E7EF18B5FFCBEB2B272602C7CFF47363AADB10B162CF8605CFE54373C80F6F7C8238FBC91968D8D8DEF950D3A406AD1DDB9B9CE8BDFB331AD6D140BE0312DDE33B4AB24A7B3A8CC3EA43505EB3ED5CA76BDB2E59A4DF8999FF2FD87CE25CD7E290B45A15A0A00A0A87C31C6B763BC18E380185F8F716C1BC5EF27B2599F4F8D4F2F8EF1788C618ADF8E978AD9DBB2BFA52646BAEF54BA1276458C1E31E667DBA5F52FC598939D94ED19E3E3319ECF5E6F8CF1CD18DF8BF1508CA5ADBC7F957F1300004089D923C6BFC4787F562BED3674E8D087E3729736B6DF71DEBC79A9A1F02731F68DB124C6E018B314BF1D6B748CD5E1EDC1D53B67CBAFC638ABE079C88AE2DAECF1B9217F65E38B05AFAF2CD8BEA195F7030000949AC363F48C31717D75BBE38E1BAC83BA77EF7E4E5CFC392B7C9BEBA792D6198ADF7475E1A8EC83BA37FB00DA92FAA69F1CE390ECC3BDA7C5EBBFF6BD070000BAA0BFC4F872F3933DF7DC33CDE1D16601DCAF5FBFC3CACACAEE686868E83209EA0C135EA53EE923624C8B717C8C17DAF890527FF5D4D2FB95ECF5B37CBF0100009AC6ECA65A2ACDD8BCEAB4D34EDB2397CBA59AA9B1AD37949797F7DF6EBBED3E121FF6C9561D50EA49EA0C2DBFBBC548B3DEDD90C503213F9E378DD5AD0BF9BEE7A9297E87182F87B7C7F0EEB7093FBBF0FD000000A568768C6FC5F86B8CA75E79E5952377DF7DF7B43EB7A137EDB7DF7E4B1F78E081BFC5870B62CC54FC76BCE1319E88F1688C41213FA1D57DD96B97C5782CC6E290EFF23C2EDBAE6FF601AFDDC8CF2E7CFF71C1845700004069BA2E8B5EC3870F7F3AB4B8BF6F6B860E1DDAB35FBF7EFBBCF5D65BA94EAA55FC76BC54E8A656DD34EB735D8BA48F8FF1EFD9E3B47EEFAC405E1EFE7140766B57355ABE1FA02B48B78EFB46C8CFE0D8727D9A5F21CD8CBF509A00DE95D4C276682BEB538FC3349FCDCB52C4B63066CC980372B9DC5E9BB8F9EE1FFBD8C70E983C79F2FD5D21379DE93EBF6DDDB7B765D1FAC666FE5C452FD0950C8B3137E46F7390C6F014F67849B33A5EA6F00578573E1CF2C3F47E5E702E5D963DFE8F906FD4699026B6952953A6A49EAFEF6818ACAAAA9A10F20D8317C442774257CD4D85AF07404949F73A4F13034E0FF9D6DFE6F9119E8A717D8C1D43FED672B74A15C016199B15BF8F64C5EE91D9FA3466F294186986DD6352912155A0F805A0E3DC12E36731EE8CF17056F026C342BEC537B5087F42F10BB0C52E09F90B8C9F8DF1CB183FCED60FCC960F6545B1E2173A9932290028197DB222F717A1F571686784FCE4172E7C026CB934FFCC41213F696B4B695E855D836ECFA0F805A0438D0DF96ECD6936FC34DEA7B2E0B583B2A277AE34016CB14BC3DB1710E7B4786D8F18D7C4784D9A40F10B40C7BA3C2B7A6F0CF996DF1D0B5E7B31E4BB3AD74913C016FB4E8C79213FDEB7A574E1F1CD90EFFEDC5DAAA0F3D1F5ADC4ADEBBEAEBEC7DA1EE5353D6B24631BEB5EDDFDADD0F6ACE6D05E52B7E62FC63822E45B2176C9D6A72ED197648F6F91A6AEABAE5B5D4D3C2EF4705CE814C785D0181A17CB44514AB7324ADD9ED3AD3A0765EB762E287E3F2D45A0F8652B5BD37BCDECFE2BFAEFB5B8A763EBB63668E9A0D71B1B1B67C8045B4175C1F2D8ECF1EB217F5B8EB46EB614755D6B7BAD9D118F0B231D17B6BD01CB062C88D5EF03325174FAB478BE3AE4C7F8A67DEBCA183D632C9226E87C747B2E71B57D6BCF19B0644063CFD53D25631BEA51DDA37EE0E281831A1A1AC6C9061DECE68293B334D3F3842CD238B4B931BE1CE35C69EABA1A7A369C3360F1807AC7856D2BB5FA0E5A30A8C271A128CD28D8CF3E1F6356C80F2D498F5397E8BD639C2C4DA0F8652B3B6DAFD31E5ED97FE5F777FDDBAE0D43160C693AD8B2754F6E062F1C5CB3FBACDD979785B273468F1EADC58D8ED63CA6F7E1565E5B15E35FC2DBB73FA20B3A69FF9366ACEDB7F6BC5D67EF5AEFB8B08D8ADE45831A86BF307C7979AEFC2CC7859228825B4AF32B4C951EE87C747BEE02C61C3CE6E29BA7DFFCC7DE2B7BFF66E092817B55ACAB28AACBFD4B972E0D4F3CF14418397264183C787051E5BEA1AC61556368FC73435DC3B78F1F7DBC131CB6A6151B786D95F4746D9F3BE47357DDF6E46DF7F779B3CFF503970EDCB7A2B6A297AC6C1DF565F5AB43597830AC0B5F3F76F4B18E0B008A5FDADB49079DF44C5C1C5C8C7F7B555555EA46B4DF6DB7DD367BCA9429EFF369429BD20457699295A51BD8268DF94DADC2AF4B57D776E2C8135F8A8B9132019B65688C9B3661BB2F857C576840F10B9B66ECD8B195D5D5D5FBA5C7B95C6E8FF47CD2A449D53203AD4AF7F54DDD9EE76E609B74FBA3DB43915E0C03D8C616C4F8CA46F6B3FD63BC12F263821BA40C14BFB04962E17B44E1F39A9A9A517171B7CC40AB5277E6E9CDFF7CB293B315E1EDD99F93BDB3133700B64C9AD1F99F62CC09F9199E9B677F4E73E9A4DB1AF688B1BBC21714BFB05972B9DC171B1B1BD73F8F8FCF56FCC246A5A277588CB131F6CAD6A52ED1A91B5EEA12AD2B1EC0BB736FC8DFE7F7C3317A6705F13931CE8CF186F440E764B6673AB5868686135AAC1A75F2C927F79119D868F19B3C16E38B59FC3A2B7A974A0F40BB49B7397A30C64352018A5FD862A79E7AEAE85C2E5738BD731ACBB87D7979F968D901000036876ECF745A0D0D0D1F8DC56FE1AAE62727C6B85986A04DBB64CB013126648F0F0CF9F1C0D3A507A0DD0C8CF1C790BF407F508C5B62FC8FB480E21736D9A851A3D277F39C16ABCBB3E5A7CDFA0C9BB46FBFBF45B1BB426A00DA4DBF6C1F7B905480E217B6D8D0A1438F686C6CFC87B1BD715D6D2E97EB53535393BA3EDF2A53F00FFBF4C293B0B64EC8D2ACD07F952E802D926E15377023FBD910F4B401C52F6C8A58E4FE9FD6D6C7C2B73C7BFD44C52FFC8374C12875BD1BB691EDB657FC026CB11931EA37B24D0F6902C52F6C54EAF21C8BDBD12DC6FB366B2E7E53D7E76F4E9A3449374E789B31BD001D6F8E14407132DB339DCE90214346B598E5B9A5B5F1F5016BD7AEFD806CC13FA894020000C52FC5F0A52C2B3B71239B343509C702F84CD98277F8468C235AAC4B5DA16F8CF133E90178D7C6C418D1CAFA4762DC273DA0F885CDF5858DBCDED4B2D5D8D8786C362B3490D7DA38F81FC7981DE35FA407E05D9B12634D8B75FF15E3F218474B0F287E61939D72CA29C786FCAD03362A757DDE61871D4E9235586F6E8BE7A362BC14635CC84F840540FB4AB33DDF11F23D6C00C52F6CBA58D01EBA99DBEF2D6BD0A61D43BE3502808EDBCF4E9306280EBA8CD2A94C9932E52771F193C27555555513E2627C8C0B264F9E3C41966083BE1CF2F7F11D1063618C0F64CBC296DF3474E045A902D82277C7F87C8C7401FEF16C59A82C3BC79E2155A0F805A0E33C1BE35F63A42104D7C478B3C5EBBD63AC8E3141AA00B6481A729526BEFA61C85F607CB345E1DB2DE85D098A5F003ADC6321DF7B62748CEFC5F86670EF5F80F6947AD7A48B8CA9575A1AEFFBCBD0FA84834027E3AA1440694ADDF23E19F2DDA047480740BB4BC349D285C67D629C2A1DA0F80560DB49AD135F09F9EE79DB4B07408748B794EB1B635FA900C52F005B4F9F56D6A55B1D7D426A00DAC5E056D65D1DF2B7970314BF006C258FB5B1FEE6A0F517A03D3CDEC6FA2BA4063A37135E019496A56DAC5F9505004097A4E517000000C52F000000287E01000040F10B0000008A5F00000050FC02000080E21700000014BF000000287E01000040F10B0000008A5F00000050FC02000080E21700000014BF000000A0F805000000C52F0000008A5F00000050FC02000080E21700000014BF000000A0F805000000C52F000000287E01000040F10B000080E21700000014BF000000A0F805000000C52F000000287E01000040F10B0000008A5F00000050FC020000A0F805000000C52F000000287E01000040F10B0000008A5F00000050FC02000080E21700000014BF000000287E01000040F10B0000008A5F00000050FC02000080E217000000DEA50A2900E89AC68C1973442E977BB48D97C75755558D2F5C3179F2E49CAC0100C54ACB2F40173565CA94C7E2E2C54DD9B6B1B171A18C01008A5F008A522C6AEFDEC44DEF902D0040F10B40512A2F2FBF7653B6CBE57237C81600A0F805A028FDF6B7BF9D1E17AF6F64B3E50B172E7C58B60000C52F0045ABB1B1F1E68DBC7ECBFDF7DF5F27530080E21780A295CBE56EDBE081A2ACEC1659020014BF0014B5AC4BF3ECD65E4BB33C2F58B0609A2C01008A5F008A5AD6A5B9AD599FEFD0E5190050FC02501272B9DC94365EFA93EC00008A5F004AC28D37DE98BA3E2F6DB17A79434383FBFB02008A5F004A4ACB42F7CEA953A7AE92160040F10B4029B9B6F0492E9733CB3300A0F805A0B45456563E56F8BC478F1EF7CB0A00A0F805A0A44C9A34A93A2E5E4C8F73B9DC9CF87C85AC0000A5A2420A00DAD77DF7DDB74B5D5DDDB71BCB1A4FCA35E47629A6BF7DE9D2A5E189279E08871C72C8F0B3CE3AABB198FEF6C6D0B8241772B7D4D7D75F367AF4E8D9BE890080E217A0834C9B36EDD8DAFADA1B960F595EB77CFBE53BD5F4AC29BAFF87DD3EBA5B589AFD574CBA57771F3C60D980CF0C5A38E8B3F17338FBD8638F35533500B09E6ECF00ED24B5F8D6E7EA7FFBEAFB5E1DB070D7854559F816B3DACADAB078A7C53BCCDD7BEE80FAC6FADFDC7DF7DD7BC80A00A0F8056867EBEAD67D6FD990653D56F75DDD5D36B69DB5BDD6765FBAD3D2CAD02DFC54360000C52F40FBEF514F59B1DD8A7E9BB269C59A8AD07D59F750B1CAE8938EF0E6C037FBE61A73C7C80400B0FEFC4B0A00DA47AE213764635D9DCBD7968701CF0F08DD57BCDD385CD7AB2EAC18B122ACEBBF4E12DB49EA025DD6583640260080665A7E01B65671DC980BDB4DDFEE1D856F925A81D3FAB23ABB640000C52F4091AB78ABA2CD6ECE65B565A1C7921E920400A0F80528F2E277CD86479A54AC3512050040F10B50E452B767000014BF000000A0F80528668DB9C60DBF1E1A25090040F10B50DCD6F5DDF0AD8CEAFBD44B120080E217A0B8D5F5A90BAB765FD5EA6B6B87AE0DD583AA25090040F10B50FCD60C5DD3FAFA9DD684C672DD9E010014BF0025A0C7F2D6EFE5DB63450FB34103007420379504D80ACA6ACBC2805903428F25AD17BF7DFED627F458DA23AC18B122D4F5AA93300080F63E1F9302808ED57341CF30F8D1C16D16BECDBABDD92D6CFF97ED43AFD77B6905060068675A7E013A48F9DAF2D07F56FFD063598F4D7E4F2A7AFBBFD03FF4FA7B2FADC00000ED48CB2F4007E9B5A0D76615BE85522B70CF853D251100A09D68F905E820F595F5A176BBDA77F57E000014BF009D5ABA7D510A0000B63DDD9E81CEA27B8CE363FC7B8C1DDAD85F7DBA8DF756C6D87B033FFBC8189FDDC0EB4363F46965FDA53E160080D2A0E517D8565241DA37C6BA181F8FB13AC6A331FE2BC69BAD14C6212B8EEF8EF1B91837C4F85A8CB9310E8FF14C8C17DBF85D036374DBC0DFB224C61D3146C7F860F6772523637C2CDB577E20C6777D6C00008A5F804D950ACCFE311AB2FD509AD2380D8E2DCB0ACEA362AC8AF1E36CFB0F65EFF95D8C7131DE08F9D6E1B4EDE559E1DAD20D593417B169F6A895D9F36FC7382DC6A2EC795DF6B393276354678F3F1FE30FD9EFFEA18F0D0040F10BB0391E8AB173C8B7B8A6A2B76F56D04E8B313C2B4097146C9FD6A716D8E742BE95F73F37E1779465856BB3BE05CF3F5F50F836FB6DC1E39343BE257AA7ECF72683632CF0D10100287E0136472A62F78FF1488C1121DFD29B1C1BE3E1F0766BEEAE21DFF23B332B5A53EBEDB9315E8DD13BC66E59C1FCC9901F2FFC46F6BE2105856BCB96DF1D0BFE8E3D427EBCF045314E08F9AED5CD85F73305DBFD20C605053F1F0000C52FC0463577794EE379BB153C4ECBC231BFAF85B7BB2FA72ECEDF0AF96ECAE9FD6362CC8B5195AD2FB4386CB8E5B7D9EC2C4E0FF996DD6B637C35E4C712DF9B6D73608CF13196FBD8000014BF009BEBA9AC202DECF63C28468F16DB1D9FEDAF8685FCA454A925776207FE5D6932AE6B0A9E9FAAF0050050FC026C8954ECEE13F25D930F0EF92EC9A9E537CDCCFC648B6DFF1CE31B21DF1A9BE2F1901F933B77033FBF70BC6ECB6ECF43DA784F1A277C40568C1F5EB07EA08F0B0040F10BB025FB9E1DB3A236DDEA6878560CA771BD7342BE5BF2BF166C9F5A5E532BF1B090BF9D519A99794A7867B7E696D26CCEF30B9E17767BBEBB95EDD3F8E13493F4BF677F5F5FFB4A0080D2512605C03690C6EC4E0DF9B1B669CCEE922CE665C56D2A7C8FCAB6ED9EC52305FBACF362BC27E45B8093C1ADFC8EF91BF8FD0DADAC4B935E4DCAFEB637B242B93916F9C800008A9BD60C606B1B9415B67505EBFA64056E7337E5D40AFBE1909F802A7555FE75C88FC31D16F2B7463A22C62505EF1FB191DF5916367EB1EFA0186B5AAC4BF712FE661BC53500008A5F8036A556D5FFD984EDA6B678FE68561CA722764A8BD73EB5919F756F56346F4861E17B76B64C2DBEDFF7910100143FDD9E8162D35A97E58D15B6B59BF93BEAA4B96B3BE594538EADAAAAFA37990080D2A1E517802E6FD4A8511543860C195556567662C8DF377AFBECA58B64070014BF001491FADAFAB0FCF5E561FBE1DB87C686C6A675B9B2DC3BB6A95E591D2AFB56BE63DD5FAEFD4BD8EFF8FD42FFA1FD9B9EFFE9E77F0A879D7658E83BB86FD117BC43870E3DA2B1B13175733F36C62EBE2500A0F805A0C895772F0F8F5EF76838F05307865DF6DF254C1C3B311C79E69161E63D33C3B091C342EFED7A87FB7E715F38EFD6F39AB69FFDC8ECB0DD7BB60B739F9C1BDEF781F785C76F783C0C3B6C5858F0C282D0BD57F750B3BA26CCB863461839666451E5E1D4534F1DDDD0D0F0D1F8706C2C7C0734AF8F8F1B73916F0A00287E012872479F77747873C19BA1ACA22CF4DFA97FD8F7B87DC3F37F78BE69995A8107ECB4BE160C7D87F40D7F7FFEEF61D5D25561D1CB8B42CDAA9AA6D6E37E3BF40BF367CC0F77FDF4AE70C2F74E08AB97AD6E2A9C3BABB163C756565757A719C2CF8C716CAC717729A871531378D313852F00287EA1B3185F5555250B745A4F3FFD74D3CD987A0CEAD169FFC6D5CB57879DF7DF79FDF319B7CF082B16AC686ADD1D346CD03BB67D63EE1B4D45726AFDDDE723FB8487AE79282C9EBD38ECF1813DC26E87ECD654280F3F7278A7FD7F5DBA7469183366CCCC58F8EEBB81CD3658F0C67DCE04DF6CA0BDCF67A40014BFE08041517BE69967C22E3BED1276F978E71B3ABA72C9CA30F789B9E181AB1E08675C794618B0F380B06AC9AAA6D6DE6E3DBA35B5E8CEFAE3AC771E20BA5784DA35B5E195075F092F3FF472D398DFBD8FD9BBE93D977FEAF270D2252775EACFE3C9279F4CADB9FBDAE700008A5F8AC52429A0181C7CF0C1E3C3119DF36F4B9353EDFFF1FDC38C3B673415BE499FC17D9AC6F0A6F5A96BF3019F3C20DCF0D51BD6BF67CF0FEF19EEFEE9DD61C7BD760CE515E561E14B0BC3C19F39383C32F191B0F747F66E1A037CDCB78FEBB4135F8D1C3932DC76DB6D2FC6877BBF8B1F73816F36E0FC0614BFB0554C9E3C796E5C4C90093ABBB3CF3E7BFCCC41338BE6EF4D05ED1D3FBAA36902AC07AF7A309CF1CB33D6BF965A8A5F9BFE5A38E6EBC78427273F19F6386A8FA696E0D43A7CE82987366D93667DBEFD82DBC327C67DA2691C7067B3FDF6DBA7FDC73E69CC6F4D4DCDA8C6C6C6D373B9DC0971396833F63FF63D00A0F805A058BDFACCAB61970377097FFBCBDF9A26BB4AB336F7D9BECFFAD7536B6E5AFFC29F5E681A0B9C667E9EF7D779615DCDBAA622384905F1EE47EEDE348B74673669D2A4EAB8B83B452A84D7AE5D9B6E6B74622C844F8FCB9EBE0D00D03594490140D791EEEF9B5A6B97BDBA2CECB4EF4E4DEB96BDB6ACCDEDD34457CFDFF57CD8EDD0DDC2CE07EC1CEAD7D587BADABAA642B8DF8EFD3A7DE1DB5A213C65CA943B627C69E1C285FD524B705ADDD8D8B8CAB703004A9B965F802EA4CFA03EE183E77C30FCF5A6BF86834E3C288CFEEEE8A631C0637E36A6CDF7A45B1CF5E89D9FC17A970376696A114E91A4EED19D75CCEFC6DC7FFFFD75E1ED16E1AFAC59B3E603656565A7C742F8D3B1281EE0DB02008A5F008AD4A7FFFDD34DB730DA6FF47E4DCF9B27BF7AEDD9D7C203573ED0D4BADB6CE63D339B66764EB73A4A637DDF5AF45653CB6FF3ACD0CDF7FFFDE4F84F167D5EB2AED1D3528C1A35EA4B43870EFD442C8247F8C60080E2178022D5F27EBEC97B0E7E4FF8FCD59F7FC7BAFD3E9A2F909B5B79BB8AAC45F8D62C00801261CC2F0000008A5F00000050FC02000080E21700000014BF000000A0F805000000C52F000000287E01000050FC02000080E21700000014BF000000A0F805000000C52F000000287E01000040F10B0000008A5F00000014BF000000A0F805000000C52F000000287E01000040F10B0000008A5F00000050FC02000080E217000000C52F000000287E01000040F10B0000008A5F00000050FC0214A186F286653DD6F690884EA07B75F7505F56BF52260000C52F403BAB2FAFBFA3FF8AFE0D32B1EDF55BD12F349635FE45260000C52F403BEBD9D0F35FB75BB4DDDA9EAB7B4AC636945A7D072D1CB4265793FB9A6C00008A5F807676F4D147BF5E16CA4E79CFECF7AC1DB260485311C6562E7A170D0AEF7DE9BDD515A1E2F3A3478F9E2D2B0040B30A2900683FC71F73FC1FEEBBEFBE3DFB2FEF7FED764BB63BAC7C5D799F62FAFB57AD5A155E7EF9E5B0E79E7B863E7D8AEA4F0F75E5756BEB2BEA9F0E8DE1ECE38E39EE25DF460040F10BD081520B705C7CA418FFF6AAAAAA097131FE99679EB960F2E4C9137C9A0040A9D0ED19000000C52F000000287E01000040F10B0000008A5F00000050FC02000080E21700000014BF0014182305004057532105002563B718BF8FD1903D1F15E3C1186363CC28D8EECA1853A40B0050FC02508CE6C53829C69C18C363AC8AF15C8CDAACF8FD718C33630C932A00A0ABD1ED19A0B4F4CA968517375F8CF1E518E363CC8FF1963401005D8D965F80D2F2468C81319664CFD345CE3D623C1563EF90EF1A3D22C6F352050074255A7E014ACBE8ACB8FD54F67C568CD9312ECA9EA7AED1C74A1300D0D568F905282D0F84FC98DFF9D9F3FBB3E52F0BB6B92646BFA0FB3300A0F805A00855C6B87913B65B1BE328E9020014BF0014A363627C2118CF0B00A0F80528618FC63820C6F4184363CC6D659B1E31BAC7787F8C6A29030014BF00149BE5213FE6F7A090EF023D2EC6E331FE476A0000C52F00A528B5EAFE6BB69F4F512725004057E6564700A56BD7ACE855F802008A5F29002829B7163CBE5F3A0000F2747B06282DDF09F949AFD6C47838C615318EC85EDB37C6ACE056470080E2178022B72EC68C18C3B3E797C6581CA367F6F8CC909F080B0040F10B4051FA63C8DFE2A8217BDEBB8DED2E942A0040F10B40B13A2EC66E31E6857CCBEF7829010050FC0294B2CA6C79748CFF1BF2333EA7D99F9F0EF996E143A5080050FC0250CC0687FCC456699CEFAFB3383EC6BD52030074556E7504505A5297E725D9E30905EBEFCD8AE04A290200BA222DBF00A557FC4E8BF1C31833633CD7E2F5749BA33411D61AA9020014BF0014ABDD0A1E5F1FE3F3520200A0DB334029BB5C0A000014BF00A5EE71290000C8D3ED19A0B4A47BFB5E1063DF182BDBD8E635690200BA1A2DBF00A565765600EF1963C71817B558EE1FA35A9A0080AE46CB2F4069B921DBB7A796DF19D9BA275B2C3F254D0080E2178062755D8C4362D4C5688871501BDBDD2B550080E2178062D57C5BA354F4BE251D00008A5F8052F5871857C41814E38E18EF8971708CE121DF2A9CE67A7823C607A50A0050FC0250AC3E16F2637AD3C45787C65823250000667B062835BBC59815E391906FFD9D18E3FFC4182835004057A6E517A0B4FC264655F678488C2FC6E81EE347314E0FF9C9B0DE0C6D4F860500A0F805A0D3FB48B63C2AC627633C15A336C6FFCB0A60DDA00100C52F002563518CEF173C9F2F250080E217805292BA3A5FD7C66BBF0BF9D9A0A76DE4678CAFAAAA924900280DE3A540F10B508A3E14E37B213FA9E10531A684FC58DFCF66AF4FDBC49FE3400900287E01E8B42E8C31277B9CEEEF7B578C7E311E282880DB3249FA00A06439CE03505252C15B912D2F0FF96ECEBBC6F863C8DFFE080000008ADEC742FE7EBFDD0BD6ED9C2D7F10A3528A0080AEA65C0A004A46EAD2DC27C61B315664456EEF2CBE13E399184FC7382FC6C3D20500287E0128462FC4F8708CB5317E18F2E37E0F8D918BB17B8CA531B68BF16A8CD7A40B00008062B55BB6BC365B0ECF967BC718283D004057A5E517A0B4A4F1BE7D43BEC577518C0342BE2BF490181F8DF1A81401000050EC46C618DC46CC971E0000004ADD7029000000000000000000000000000000000000000000000000000013EF7BBF00000088494441540000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000A068FD7FDE8CD9EF8E2563740000000049454E44AE426082, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('212511', 3, 'source', NULL, 0x7B227265736F757263654964223A22323132353130222C2270726F70657274696573223A7B2270726F636573735F6964223A2270726F63657373222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C2270726F636573735F617574686F72223A22222C2270726F636573735F76657273696F6E223A22222C2270726F636573735F6E616D657370616365223A22687474703A2F2F7777772E61637469766974692E6F72672F70726F63657373646566222C22657865637574696F6E6C697374656E657273223A22222C226576656E746C697374656E657273223A22222C227369676E616C646566696E6974696F6E73223A22222C226D657373616765646566696E6974696F6E73223A22227D2C227374656E63696C223A7B226964223A2242504D4E4469616772616D227D2C226368696C64536861706573223A5B7B227265736F757263654964223A227369642D41453336323135452D353838452D343946332D423734332D383330454243423330344130222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E5BC80E5A78B222C22646F63756D656E746174696F6E223A22222C22657865637574696F6E6C697374656E657273223A22222C22696E69746961746F72223A22222C22666F726D6B6579646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22227D2C227374656E63696C223A7B226964223A2253746172744E6F6E654576656E74227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D38323934394441432D433932442D344241422D393932342D314632373945353044424338227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A37392E32323232323232323232323232332C2279223A3131367D2C2275707065724C656674223A7B2278223A34392E32323232323232323232323232332C2279223A38367D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D39434334443631332D313435312D343133432D414638352D383046383839314244313934222C2270726F70657274696573223A7B226F766572726964656964223A226D616E616765222C226E616D65223A22E7BB8FE79086E5AEA1E689B9222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C22657865637574696F6E6C697374656E657273223A22222C226D756C7469696E7374616E63655F74797065223A224E6F6E65222C226D756C7469696E7374616E63655F63617264696E616C697479223A22222C226D756C7469696E7374616E63655F636F6C6C656374696F6E223A22222C226D756C7469696E7374616E63655F7661726961626C65223A22222C226D756C7469696E7374616E63655F636F6E646974696F6E223A22222C226973666F72636F6D70656E736174696F6E223A2266616C7365222C22757365727461736B61737369676E6D656E74223A22222C22666F726D6B6579646566696E6974696F6E223A22222C2264756564617465646566696E6974696F6E223A22222C227072696F72697479646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22222C227461736B6C697374656E657273223A7B227461736B4C697374656E657273223A5B7B226576656E74223A22637265617465222C22696D706C656D656E746174696F6E223A22636F6D2E6C656E2E6163746C697374656E65722E4163744E6F64654C697374656E6572222C22636C6173734E616D65223A22636F6D2E6C656E2E6163746C697374656E65722E4163744E6F64654C697374656E6572222C2265787072657373696F6E223A22222C2264656C656761746545787072657373696F6E223A22227D5D7D7D2C227374656E63696C223A7B226964223A22557365725461736B227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D43423837323236392D433930412D343839342D394538382D304538384238364543384446227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3238382E32323232323232323232323232332C2279223A3134307D2C2275707065724C656674223A7B2278223A3138382E32323232323232323232323232332C2279223A36307D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D38323934394441432D433932442D344241422D393932342D314632373945353044424338222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D39434334443631332D313435312D343133432D414638352D383046383839314244313934227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3138372E36303530353132333635343432382C2279223A3130302E39303833313534363834373331327D2C2275707065724C656674223A7B2278223A38302E31373533333037303739303031392C2279223A3130302E32393039303332383135323638387D7D2C22646F636B657273223A5B7B2278223A31352C2279223A31357D2C7B2278223A35302C2279223A34307D5D2C22746172676574223A7B227265736F757263654964223A227369642D39434334443631332D313435312D343133432D414638352D383046383839314244313934227D7D2C7B227265736F757263654964223A227369642D32323745363933372D423435362D343735432D424332332D453842383539374238354131222C2270726F70657274696573223A7B226F766572726964656964223A226872222C226E616D65223A22E4BABAE4BA8BE5AEA1E689B9222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C22657865637574696F6E6C697374656E657273223A22222C226D756C7469696E7374616E63655F74797065223A224E6F6E65222C226D756C7469696E7374616E63655F63617264696E616C697479223A22222C226D756C7469696E7374616E63655F636F6C6C656374696F6E223A22222C226D756C7469696E7374616E63655F7661726961626C65223A22222C226D756C7469696E7374616E63655F636F6E646974696F6E223A22222C226973666F72636F6D70656E736174696F6E223A2266616C7365222C22757365727461736B61737369676E6D656E74223A22222C22666F726D6B6579646566696E6974696F6E223A22222C2264756564617465646566696E6974696F6E223A22222C227072696F72697479646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22222C227461736B6C697374656E657273223A7B227461736B4C697374656E657273223A5B7B226576656E74223A22637265617465222C22696D706C656D656E746174696F6E223A22636F6D2E6C656E2E6163746C697374656E65722E4163744E6F64654C697374656E6572222C22636C6173734E616D65223A22636F6D2E6C656E2E6163746C697374656E65722E4163744E6F64654C697374656E6572222C2265787072657373696F6E223A22222C2264656C656761746545787072657373696F6E223A22227D5D7D7D2C227374656E63696C223A7B226964223A22557365725461736B227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D37363332463035442D343046342D343145362D383039352D323634444444333541324332227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3439372E32323232323232323232323232332C2279223A3134307D2C2275707065724C656674223A7B2278223A3339372E32323232323232323232323232332C2279223A36307D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D43423837323236392D433930412D343839342D394538382D304538384238364543384446222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D32323745363933372D423435362D343735432D424332332D453842383539374238354131227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3339362E34323134343039373232323232332C2279223A3130307D2C2275707065724C656674223A7B2278223A3238392E30323330303334373232323232332C2279223A3130307D7D2C22646F636B657273223A5B7B2278223A35302C2279223A34307D2C7B2278223A35302C2279223A34307D5D2C22746172676574223A7B227265736F757263654964223A227369642D32323745363933372D423435362D343735432D424332332D453842383539374238354131227D7D2C7B227265736F757263654964223A227369642D42383042363037442D363646352D343834422D383041312D373935334238444445363943222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E7BB93E69D9F222C22646F63756D656E746174696F6E223A22222C22657865637574696F6E6C697374656E657273223A22227D2C227374656E63696C223A7B226964223A22456E644E6F6E654576656E74227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3632382C2279223A3131347D2C2275707065724C656674223A7B2278223A3630302C2279223A38367D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D37363332463035442D343046342D343145362D383039352D323634444444333541324332222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D42383042363037442D363646352D343834422D383041312D373935334238444445363943227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3539392E393730343836313131313131312C2279223A3130307D2C2275707065724C656674223A7B2278223A3439372E37333433373439393939393939342C2279223A3130307D7D2C22646F636B657273223A5B7B2278223A35302C2279223A34307D2C7B2278223A31342C2279223A31347D5D2C22746172676574223A7B227265736F757263654964223A227369642D42383042363037442D363646352D343834422D383041312D373935334238444445363943227D7D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A313230302C2279223A313035307D2C2275707065724C656674223A7B2278223A302C2279223A307D7D2C227374656E63696C736574223A7B2275726C223A227374656E63696C736574732F62706D6E322E302F62706D6E322E302E6A736F6E222C226E616D657370616365223A22687474703A2F2F62336D6E2E6F72672F7374656E63696C7365742F62706D6E322E3023227D2C227373657874656E73696F6E73223A5B5D7D, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('212512', 2, 'source-extra', NULL, 0x89504E470D0A1A0A0000000D49484452000002A6000000BE0806000000E761CD40000000206348524D00007A26000080840000FA00000080E8000075300000EA6000003A98000017709CBA513C0000000467414D410000B18E7CFB5193000000017352474200AECE1CE900000006624B474400FF00FF00FFA0BDA793000000097048597300000EC400000EC401952B0E1B00001B104944415478DAEDDD097C54D5BDC0F1FF9D992C6C090442202C52A4802B8BA855A1202250B18A169B44C402DA67DD5ADBBEF7146D2D7EACFADADA576DA9FAEA82C56042D14FA90BE256A3E02E104411102112246058122021093373DFF9E7CE984B4C3090643299F97D3F9F6366EEDC593CDCFF9CFF3DE7DC33220000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000C4178B2A0044366FCEB9FAC081E3675556669E5A51715CE76030914A69EE978B15908E1DB797272595AE32B7EF1B39F2D667A8156208C41040620A34E2D34F677E7FEFDE11F36B6ABA77CFCC7C41BA76FD4852533F118FA786CA69264D4CF6EF3F5ECACA4E96929249C160D0F7597575CA65E3C75FBA86DA2186400C0124A680CBA64D33EFFAE28B0BE60C18906FF5EBF7AFDADE09B49EE2E28B65F3E619871213F7CF3CFBEC594F5223C4108821A03E2F5580786D5077EE1C3FE79453EEB43232969B06D5A6525A596AEA06E9D1E33D6F49C9F7BE3F6BD60FD7CF9FBF781DB5420C811802484C11D70A0B6F1B5D5A3AE6316D5075C8B1BE9A83A9B2FD93F1F2C5DAC952B27EACECDBF96DF1FAAA25B9CB2E2AAF991213CB242DED03EFB66D174EB9FCF259CFE4E6E67E49AD1043208680300F558078535595B948871E1B6A50FDD59DE4B3B77364EFB693C55FD3A176DBC17D3D656BE1F7654FF1A9545E0BE8DCB948060D9ADF2131B1F2116A83180231049098226EAD5A75D7797E7FD7DE3A1FAE21BB3E1F2187AABA34F8D88E0DDF15DB26645A42BF7E4B3C3EDFC1C12FBFFCF277A80D6208C41040628AB864DB093FCBCC5C6A357691C6C1F25E8D3E577B7FB437082DA34F9FE7F5CF0FA8096208C41040628AB8545DDDFD0C5DCEA6D14637E8FB8646999069296969ABBA793C3593A8096208C41040628AB85459D93BBDA1797188BC2E5D3E936030E1446A82180231049098222ED976828785BFA3E4CBA7F6DFC16265106208C41040620A3424A143F9911F4FAAA092006208008929D0FABAF75F2309C9FBBFB6DDB282923EF07DB13C7E2A09208600909802ADAF63D7ED92D66FEDD7B66B43DB7B68011504104300484C81C8F1D7247F6D5B3090585B00104300484C810834A61DA4F8C3EFC99EADC31B7C6CE31B3365DF97C75351003104A095F8A80240E4C0EE7E52BC664AA3BF58A3F4F7BF8B3EB854BAF72F945E43DE106F42351507104300484C8196113894243B379D23BB8B463479E1EFDD5B87CBFED26F49E689AF494AC6A7542288216208400B61281F714D7B78766D39EDA87F8DA6B6E767E5D423FEFC22400C114300484C81266BEEC518017F02950862881802D04218CA475C1B78663E9500104300A2043DA6000000203105000000484C01000040620A000000D4C7C54F0000006D60FAF4E97DFD7EFF54CBB2C69ABBFA9369BA7E5A6753AA4CD961DB76A179EC4DAFD79BBF70E1C26D24A631E68C85975FD6B928382BB95C4E4F2EB7527D07ED044F8D48D06BDB810E96BFBA8BECAC49B13F0874F3DDFDEA4D0BDF27640000404BCBC9C9996AFE5C1FF4FBBF6B12CF86D65C4B366580796C80F93B351008FC213B3BBBC0DC7F342F2F2F97C4B49D3BEF7739BFEF506A5F9FB022D8715F1F91D253450EF6B0A5C69C9304CDE1E0A9B12C5F952474D8257D53B65A7DBB6E084CBDF8869C2F2D4BEE59F297BCFB08210000D05C26B91C60D9F643B66D4FAADD60128DA330CE3C6F9C798D6B4CA23A6BF1E2C59B484CDB9931F3B2CF4BD9224FFB8AEDD46DA345CAF5BCA38159B59A9CD6684931FB0C14291E27925A64F7CC5C21FF3BF59AAC9F275404272ECE5DBC8190020000C7222B2B2BDB63DB0F042DAB5B789BD7B6E5E41D3BE4CC6DDB64D0AE5DD2B5AA4ABA54574B6562A29425274B51D7AEF25EBF7EB22A33530E79BDE1A78DF67ABDAB737272AE8DC5DED3984D4CCFFD5DD62369AB64F6CE5162ED1829477D999726B1A6583D575BFDFBBCE35B3BF5C69CFFA6F71400001C43527AA1C7B2728326170D27A4DFDBB041267EFAA9A457547C6DFF8E3535B52573DF3E397BEBD6DA24F5F9A143E585214324E0F4B276B66DFB09939C269BE4F49158AAAB98BC2A7FCC5FB39FE8F69975D5A68B4D523AAA79FF975F8E10D930CD4EF054D97FB8F867D9B7125E0000E02892D26C93942EB14349A9269BF72C5B26D30B0B1B4C4A1BA23DA9BABF3EAF5F79F957DB4D72FAB0494EAF20318D62E7DE9D3DAFC71A99BEFE872215BD5BE6352BD345D66789CF572173A75D95733561060000BE89CE2935D9E803E1A4744869A9CC7DF5D5C392CBA3A1CFD3E79FB273A73B397DD024A743494CA3D079F7649DDE7D9375EDE62962E97CD196A4AFF7E9259260F9EDFB63E900000000AD96643D129E53AA3DA5BF5CB1A2760E6973E810FF4D6FBEE94E6E7558FF6112D328D469A767E98E51B6A7A57A4AEBD39ED32FCE968E8712ED45841B0000688C2E091514394F6FEB9C524D269B9B94BA93D31BDF7AABF6754346C7CA907ECC24A613EFC899631DB2BBEB9CD0D6A4AF7FA8A31C1F6B733ADA8BECECEC5F69B08F1B378E1F87008821209A63E5FAF00DBDD0E95887EF1BA3AF77E1FAF55FDDB76DFB9A58A8F798F9624A2AB3FF73DB18B182DED67FAFADE3A5D3C0A5C19BCDCD5C4237E2EE34C127191919E5E64BE359CBB216FAFDFE158B172F3E108D1FB6A44464DB3691D34F3F7CBBDF2FB277AF487AFAD1BD9E394996C4C4861FFBDBDF4466CE6CFCF1F03EA3478B9C78A24861A1C8F0E1CEF6CF3F1739EE380EAE788AA15EBD7A556465652DF1783CB9D11C436E0B173AC76F538FD537DF14D9BF5F64F2E4BA6DC1A088C7430CE1A862A5CAB437AF9AF6665E5363457FD12918089CABB76BAFC0DFB8B1553EE06493F02E1D3C38BC94D4689DD39A9F9F5F4462DAC626FC317B846F8374AB5DA73402F61FA76BE27AFAC7C201D05E992F8854F3E70AF3A57185D7EBDD63FE2D9E31DB16252525153CFEF8E355D1F239172C10193850E4B4D3449E7842A47B77A7517CFC7191F1E3457EF21367BFDDBB4556AF766E57563AF757AE14B9E00211FD3E1B30C06960B76E15B9ED3667BFE26273C6DCAFEEBD3A751279FF7D9173CEA9DB567F9F0F3F14B9FC72E7F68D378ABCFAAAD308EBB6E5CB1B6FB011933A9998996E6268BA89A17D2686FE65EE3F196D31E4A631A4B1D05802F8DC73871FC36FBF5D978CAA22F36DBD6C99C8534F39C73D318426D25F619A6262658A3991AB34B1F2A2B9FF687272F2AB8DC54AE867466BB3C561252592A65FECAD40AFD61FB97DBBBC5B77904E33E55E12D3B6FE9FD823D7EF1B2056242726EC1D6CFBD30BDBFF011023D24C9969BE346656555555982F8DC5E60BE15F252525CF151414F8DBEA4369EFA6F698DE7CB3C84B2FE919B439567D4ECF4A8F1E7549A9D284F58413449E7D56E4B2CB44BA741179EB2D2731D52475CC1867BFA54BEB9EF3E49322279D54D710EA459AA9A975FB141438AFABEFAF3DB4E6FB4B0E1D12D9B44964D72E91BE7DEB7A86FAF7A7418D737AB9E80C1343334C0C55E5E4E4FCC3DCFF675BC7507D1B3638230D8DB9F0422791DCBCD9399E93939DED1A4F1A031A63D75D470CA1599D221DCD9F4BB49850A931EDCDF366DB82FAB162B68D0DDF3E430FCA56A4AFEF4A4CC792984681844A19BBFB84C8BE67D90049EBF1919C4F621A7DBD40E124B557AF5E7B4C036B5242F97B5BF4023DF698C86F7EE334A40F3DE4F49A262589DC7AABD3806A43E77345609F3EE6584E70F6D1C64E135B6D20D7AC697C68515F274CA70C68E378EAA9CEFDA1439DDE5AA50DEA8E1D4ECF51B76ECEF6471F753E9BBE67D8451799CAFABBB30FE2B777C8C4CF95E6EF952686B427F525FD7DEE68E8490D4F813912EDF15413273A31A1468C70924CBD7FEEB9C4105A8C7E335F62E2E5928C8C8C4AD3DE2C37F7EFD3583149EBF0F04E03F7EC69D50F31A0ACCC7D77787BAFD498484C13F7591995E97644DFF3600FF39F803DC27C69CF2536A3569AF9C2C8367FB3CD97842E72BCA9B4B434226FAC43889A546AE3F4FAEB220F3EE8346C7FFEB3C8BC794EE376CD35221326E8959BCE7D6D74B53766FB76A7C74793D1708FA9EEA7DC3DA6DA8B73E79D4EC2ABD6AD737A62B571D5214B9D673F678EF358E7CE2283063949AFF600E93EDAA0EA67D3A151A5AFF5EB5F47B6413D70E0801043514D7B52A799389AA63164FEAD3E8B540CD5A7276A3A57BB29D78F7CFCB1D35BAA31A1B417544FF0860D3B7CBFF61E43A5A59D64D5AA55C45014D09E54132793CCCD491A2BC6574949D7AAD63D9FABF7FA3D484CA380B7DAEE78A85384CFDC7588C8B67408F9378464BBF9E218F4DE7BEFD52682ADEDACB39C796CAFBC2232638636204EB9E38EBA7DB4B7E5A69B9CC454870075EE9B0E11EAF0A0366C4DE931D5FDB521543A6D407B89B401D5B96EDAB0BAE930A5EE9F9B2B72E595CE7B4C9DEA3CA6C9B07E9E8E1D23FB6FB2D1B92080186A3F8E8F540CD5A7B1A4C3EE7A02A7C7724646C3FB69423AA281D559B427D4B526794CC4D0EBAF7F4B563B93D389A1286C72C2375A6A89A8C6E8D251EE1020318D021EBF788389917D4F7D3FCBF925873B88BF883AE62F6093986E1E3E7CF8C0487D506D2F34A10C2799DAD8E9C5197A5B1BCF7FFFDB994F1AA643809ABC8E1BE7ECABBD31EE1E539D2757BF61D5463ADC8BBA76ADF35EFADA7A3B33B36E3F6D641F78C079FC8A2BBEDE78EABE914E4AD5E0C183B5612586A22F8602B66162C6573F86468D1A35B02D3EB426A63A4FBB572FE758BEA391A34663262CDC5EEB367DBE269E7979725862DD9E6368ECD82DB279F30C62A8EDDB1BBDBCCE532F568226846AB7ED4F4A6AD5E4B4F2F09E8BAAF65EE931919806BDE2F7D4882F92C9A9793FB1C5AE5E94BF682EB11B39D9D9D94D4E4CCD974299F972784597944A4A4A5AA6F3E366CF9E1D91391F3A34FF8B5F38BD2F59597573D694368ADA38BA1BD0FACFD57972FA5C6D58B5E1D4BF7A45BE26A9EE2B84758E6AF875DCBD3D9AC4BA7B7BF4E2292D37DC70E4CFAD89F1D12E61D51C9DCD87CDCFCF2786A220864CBCE8851B41132FFA4DEA357FDB3486DCF4244DA7B78487DC350EB4B3DD9CD77C452F2A0C9F0C86E9CA164AB7E963FA3ABAD493FB386FCF31949E5E2123478E949B6FBE99188A7C7BE34E463DF563A5AAAACA9CDAC8207DB0CC9CE9B466625A967C5827E92E12D368484C93A522A14252AB239898FAAA6A4F897613BA6D2BD4AB63B936E9FA72CB4C59D4A14387574C435AD6169F4B87E6C34BC76862F9DA6B5FBFE8C22D3C6CFFC61BCE73B4674893D38A0AE74A64EDA5D1C6B2FEDC355D4BB1A1DE1E6DC48736E18773B507D6DDF8BEFBEEE1178320E6699F62C0940EAEDED1A88821B75B6E11B9D77599A90EBD4F9922F2FCF37543FABA8494165D01A3674F2716C2173FE914009D2FAA71161E7A2786700CED8DDF15279E23C58A496A0BC389E9E6B4B4165F5CDFADA86B57F7DD4212D3281048904F3A96CA77AA2378D146A71DB2CDB2DBFF01D0DE859252FD7278CA94E79393939F8B863518B537E7AEBB447AF71639FBECC67B47754D44ED4DD5354A35019D3FBF6EC999F05A8ADAF0694F8D5E70A1FBBBE9C51B61EEDE9E867A9C0E985A3A7830743217747A90162F767A80F4FD9536E4DACB14EE9942CC4B7425A3511543613A64AF8BDE0F1A54B74D93D1BBEF1619354A64EE5C6754227CDC6B0C8417D1D72453AF98D784557B4DC3EB99124338C6F6C6D7D4583149ECEB667F5D5252DEEBD74FC66ED9D26A9FEB3DF7309AC8EB24A6D170B0F8E5D994AD72C6DEC1915BC9B4DB46DB7C4D59AF13AA6D76E6AA67A6051E8F27BC145459347D3E1D62D4A5A2C24BCD2C59E20C196A63A9F34AC33D34DA23AA8DAC967003A9C3943A17353C1CA8438ADA0BA3F4A45BAF306E688171BDA25F1BC5867A79C2AB0368C21C6E74B5072ADCB3A36B3BEA851B7AC5B15E240262A8ADE90999FE7293267D7A52569F2690FA0316EFBCE31CFB6E9A406AC278FBED222FBEE86CD393C46F420CA1A562C5E7F32D0904027FD29B6BCCC1B7A763C75659645F87F1576666EAF49AF0C8E15324A651A0C341EF026B53E0579F8F970E914A4DBB1659DD63E10068877E6DCE428BCC99EA53D1FAEB3461035D9788D41F3E3C126D847FF4A3A37FBFD9B38FFC538AFA19DC9FC33DDCD8588F2E88A1B6A2276B975E7AE47D747A4C435364525244AEBA4A64D6ACA35BF49E18424BC5CAC2850BB7E5E4E41498A47642C0B2E485C183657A61CB0FB22E1B3244FC5E6F38295D110BBF46191389A91E00D366E77C9C5A648F2A8FC0F5A2DD36DA1F5935529E9FBFA888B88D2C1374BFA5161A9698481D8018723BDA5F622286D0C2B1F257536A57A17EC12490DFDDB2A545E79A16A7A6CAB343877ED55B6A92E8FF8B89B88D950328E1A0DCD5FF356BBF045BFFBD06BC6CF93C96E721C216000034242F2F6F89F953A0B7B5D7F4BE73CEA95D3AAA25E81251F79F734E205877F1EF8A9292927C12D3283B00122BECB5BD3F90565DC9B6DF6BF61BDE6AD9152B070000006835B324B484D3F69414F9E3E8D1CD4E4E35293549AEFD454A8A37B4E980C94F7F5C5050E027318D32965FA6F77E47AA3A6FAF5DFEA4C575DE2145196B3C4363E900000000AD43E77CDAB67DA3B9599B336C484F97B9E79D573B0C7F2CF479B74F9810589B91F1D532892627B9362F2F6F7DACD49927D60E00EB90FD93414BACFD89FB5AF6B593CA65C790459260D9F2CB583A00000040EB59B468918EB0FE389C9C6ACFE99CC99365E1F0E1F517C76F94EE973F6C98DC3279B2BBA754570C98637292DC58AA2F5F2C1E00D9D9D9C9272D907B375E2A5D2A32A5D9D3D93B9758EB86FCC34E15BF3D2F6F517E2E610600009A2A3F3FFFF1ACAC2CBDB2FF41CBB2BAEA9CD3E7860EADBD286A5849899C515C2C03F7EC91AE5555B5BF12A5C3F59A8CEAE2F92BFBF695957DFA04ABBD5EED4C0CF794EA7AAA379A9CE7F158AB2B5F2C1F004317590F947C47766D3F53328FB16FD8DFFF6579B9E747F648B1E596FC183C00000040EB0B759CBD6312D387751929DDA609EAAACCCCDAF20DDC59CC0A9D5218ABA3B7BE583F00FABC633D9CB1DA0E6C99248965C74B46539F9FF689FDC680973D291EBFDDC51C00E3F2F219BE070000C72EB4CEE8F9263F9966728B6B4C823AEE2872B115A63CBA63C78EDC58BECEC5172F07C0B79FB1AE09786D39D05B8A779F2C29077ADA9DFC5D24239068F9BC35B2DB77400E74DE21C53DD64975972FAC4112D0B313FBFE583F00000040C4F313FD819EA7A64F9FDE37180C4E3309AAFE08F528537A99A2134F75D85FAFE6D755F9F557269F8A85C5F3E33E316DE80048DD169C9652AC0780A507803F54079D4CD15F402E730E003B6E0E000000D036F40782CC9FFB4205F192987200000000443F0F55000000101159A61CE7BAAF1D84BF6FC2F396C54BCE46620A00001019634CF9DC755FA714760CDD0E2F6FA9734C4F0B25B0E152634A3FD7FDBB4CE9168B15E48BE38363B029E9A6BCE9DA7653E8AC247C05FE99A69C250CFD030080E6196ECAFC50FE3138B42D68CA00532E30E574531E30A5D49495A184B532B45F852BA1D515866E8BD54A8AF5C454CF4CBA9832DE94BDA6AC0E9D89CC0EFDE3EFAFB7FFB07A49E845A1FD0000008E95F6868E3065A13843F7F798B233F49826A54B43C5ED5953FE18BA9D19DA4FCD34253B94D49298B633CB437FBB9B5262CA2BA6740E25AAEE03A04FE880E91BFA87D7B397BCD073BE30657228B17D97D8020000472939945CCE31E56953768B33DF543BC8B45774AA381D694FB89EF3A52B5799E1BA7D4AAC26A5F1909836E50CA626947CEA01A1BF675B60CAEDA1339AA75D6728DAFD7EA9D40DF303000034C53E531E136764767928FF7821B43D9C70A6D77B4ECF500EA2CFE96FCA2C717A59CF8AE58A8AE5C4F444530686CE2AC2FFA889A1B39601A17FEC8B4D992B4ECFE8845022AABDA96F859E5B2DCE1CD49AD0D9CD6E620B00001C835C53FE29CE34411DC1FD2F53DE0E3DA6B989F684DEE1DA5F87F1DF17A767756B281759EA7A0E89693BB32E54944E320E5FD4E41ECA770FE7A78712543D13F95DE8AC242394B04A28B965281F00001C8B4952F7C33E43433947380FD1DCA453BDFDFF6DCAFDA6FCC29479A6BC64CAFF88D3A14662DACE9D24DF7C65BDF6ACEA4F8269D7F9BE50325B2475F3542F21A60000C031E81E4A3035BFD02BEE5F09E515E1CEAFE47AFB6B67D9D5A6DC22CE352E4AAFD6FF9B38530034697D2494DC9298B633BACED7F626ECA7DDE73F15679DB0D389210000D042742AE022533E746DDB164A50556757EEA149ACF6A8DEE3DAB726F477B32953C419C52D89C58A8A87C4F43FC4199AFF267A76A2DDE87A65DC0DE20CE59F2DCE4551F152570000A0757C58EFFE7CD7ED03A6BCE64A6297D7DB7796EBB65EC51FB3F34C6339D9D2330E5D205FE76754B9B66BF2B9B181A4F42CD7D9C9BDE24C4ED649C7E1ABF00712530000A00D04E3E57F349613533DE358DAC076ED09FD73BD6D3A6FE3997ADBEADF9F475C000000B41E0F5580786259FE403098484544C3E97FEDBF831DA02688211043008929E2526262D9E6F2F213A88828505E3EA4C4A439ABA9096208C41040628AB864DBBEE7CBCA4E0952136D6FE7CEB1BA60740135410C811802484C1197AAAB53FF5E5C3CB5D2B6BD5446DBF297944CD60B149FA62A88211043008929E2D2C489130BFDFEE4F7B76EBDA49ADA683B1B365CB73C10482A3AFFFCF3DFA13688211043008929E296DF9F70DD679FCD3C585E7E02170DB4817DFBBEBDA9B878EA89C160F0E7D4063104620870632C067127373777D79557CE5EB973E7D8C9DDBAADE9909CBC8B13B48835A8833FFEE083BF249BAF9E6B274E9CB8821A2186400C0124A6887B0B162CD83C63C6D585DBB74FBCC8B67DC5DDBAADED6E593615D37A0EAC5BF7CBA5EBD7FF748836A813264C788E2A2186400C01F5595401E2D98B2FBE38D4E3F1FCC9EBAD19DEB3E71B9B32320AD2D3D2561FEFF1D4F013B4CD140C2696EFD933ECA39292F37797968E19120CFA8A75E871D2A4491F513BC410882180C41468C44B2FBD34DCB2AC1F989BE34C19654A32B5D26C7E530AC559CEE6692ED22086400C010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022E0FF0121C2023A02FEDB030000000049454E44AE426082, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('247534', 1, '请假流程.bpmn20.xml', '247533', 0x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A3C646566696E6974696F6E7320786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C2220786D6C6E733A7873693D22687474703A2F2F7777772E77332E6F72672F323030312F584D4C536368656D612D696E7374616E63652220786D6C6E733A7873643D22687474703A2F2F7777772E77332E6F72672F323030312F584D4C536368656D612220786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E2220786D6C6E733A62706D6E64693D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F44492220786D6C6E733A6F6D6764633D22687474703A2F2F7777772E6F6D672E6F72672F737065632F44442F32303130303532342F44432220786D6C6E733A6F6D6764693D22687474703A2F2F7777772E6F6D672E6F72672F737065632F44442F32303130303532342F44492220747970654C616E67756167653D22687474703A2F2F7777772E77332E6F72672F323030312F584D4C536368656D61222065787072657373696F6E4C616E67756167653D22687474703A2F2F7777772E77332E6F72672F313939392F585061746822207461726765744E616D6573706163653D22687474703A2F2F7777772E61637469766974692E6F72672F70726F63657373646566223E0A20203C70726F636573732069643D2270726F636573735F6C6561766522206E616D653D22E8AFB7E58187E6B581E7A88B2220697345786563757461626C653D2274727565223E0A202020203C73746172744576656E742069643D22737461727422206E616D653D227374617274223E3C2F73746172744576656E743E0A202020203C757365725461736B2069643D22757365723122206E616D653D22E7BB8FE79086E5AEA1E689B9223E0A2020202020203C657874656E73696F6E456C656D656E74733E0A20202020202020203C61637469766974693A7461736B4C697374656E6572206576656E743D226372656174652220636C6173733D22636F6D2E6C656E2E6163746C697374656E65722E4163744E6F64654C697374656E6572223E3C2F61637469766974693A7461736B4C697374656E65723E0A2020202020203C2F657874656E73696F6E456C656D656E74733E0A202020203C2F757365725461736B3E0A202020203C73657175656E6365466C6F772069643D227369642D30443235384332342D314631392D343233332D413937362D4130443843423944414541432220736F757263655265663D22737461727422207461726765745265663D227573657231223E3C2F73657175656E6365466C6F773E0A202020203C757365725461736B2069643D22757365723222206E616D653D22E4BABAE4BA8BE5AEA1E689B9223E0A2020202020203C657874656E73696F6E456C656D656E74733E0A20202020202020203C61637469766974693A7461736B4C697374656E6572206576656E743D226372656174652220636C6173733D22636F6D2E6C656E2E6163746C697374656E65722E4163744E6F64654C697374656E6572223E3C2F61637469766974693A7461736B4C697374656E65723E0A2020202020203C2F657874656E73696F6E456C656D656E74733E0A202020203C2F757365725461736B3E0A202020203C6578636C7573697665476174657761792069643D227369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831223E3C2F6578636C7573697665476174657761793E0A202020203C73657175656E6365466C6F772069643D227369642D33334642463234452D464537302D343730412D394442352D3942313838314531333834372220736F757263655265663D22757365723222207461726765745265663D227369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831223E3C2F73657175656E6365466C6F773E0A202020203C6578636C7573697665476174657761792069643D227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535223E3C2F6578636C7573697665476174657761793E0A202020203C757365725461736B2069643D227573657222206E616D653D22E8B083E695B4223E0A2020202020203C657874656E73696F6E456C656D656E74733E0A20202020202020203C61637469766974693A7461736B4C697374656E6572206576656E743D226372656174652220636C6173733D22636F6D2E6C656E2E6163746C697374656E65722E4C656176654C697374656E6572496D706C223E3C2F61637469766974693A7461736B4C697374656E65723E0A2020202020203C2F657874656E73696F6E456C656D656E74733E0A202020203C2F757365725461736B3E0A202020203C656E644576656E742069643D22656E6422206E616D653D22656E64223E3C2F656E644576656E743E0A202020203C73657175656E6365466C6F772069643D227369642D34373638373538312D333535422D343335342D383433432D43333034323333323836414622206E616D653D22E5908CE6848F2220736F757263655265663D227369642D35353636443037362D414234432D344134322D393938462D32353337373839463831383122207461726765745265663D22656E64223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D46423539344242452D383030352D344544432D423343382D39373831454432323643393522206E616D653D22E4B88DE5908CE6848F2220736F757263655265663D227369642D35353636443037362D414234432D344134322D393938462D32353337373839463831383122207461726765745265663D2275736572223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D66616C73657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D39394343413337462D413233352D343835332D383437322D44453233334144324544333222206E616D653D22E9878DE696B0E794B3E8AFB72220736F757263655265663D227573657222207461726765745265663D227573657231223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D35313046453036322D433042432D343643382D394231372D38413338303732413242433622206E616D653D22E4B88DE5908CE6848F2220736F757263655265663D227369642D42453337324431342D463530392D344544422D383745382D37423231303738333541453522207461726765745265663D2275736572223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D66616C73657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73756250726F636573732069643D226368696C6422206E616D653D2273756250726F63657373223E0A2020202020203C73746172744576656E742069643D22737374617274223E3C2F73746172744576656E743E0A2020202020203C757365725461736B2069643D22616C6C6D616E6167657222206E616D653D22E680BBE7BB8FE79086E5AEA1E689B9223E0A20202020202020203C657874656E73696F6E456C656D656E74733E0A202020202020202020203C61637469766974693A7461736B4C697374656E6572206576656E743D226372656174652220636C6173733D22636F6D2E6C656E2E6163746C697374656E65722E4163744E6F64654C697374656E6572223E3C2F61637469766974693A7461736B4C697374656E65723E0A20202020202020203C2F657874656E73696F6E456C656D656E74733E0A2020202020203C2F757365725461736B3E0A2020202020203C656E644576656E742069643D2273656E6422206E616D653D22656E64223E3C2F656E644576656E743E0A2020202020203C73657175656E6365466C6F772069643D227369642D46333946364639322D463330412D344630452D423946382D45304444454231313530363522206E616D653D22E5AEA1E6A0B82220736F757263655265663D22616C6C6D616E6167657222207461726765745265663D2273656E64223E0A20202020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A2020202020203C2F73657175656E6365466C6F773E0A2020202020203C73657175656E6365466C6F772069643D227369642D33453941414432332D343444412D344138352D383242442D4436433833304134433439382220736F757263655265663D2273737461727422207461726765745265663D22616C6C6D616E61676572223E3C2F73657175656E6365466C6F773E0A202020203C2F73756250726F636573733E0A202020203C73657175656E6365466C6F772069643D227369642D41453541454438342D303734362D343738372D393836462D36413739323743333443333422206E616D653D22E5908CE6848F2220736F757263655265663D227369642D42453337324431342D463530392D344544422D383745382D37423231303738333541453522207461726765745265663D227573657232223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C6578636C7573697665476174657761792069643D227369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733223E3C2F6578636C7573697665476174657761793E0A202020203C73657175656E6365466C6F772069643D227369642D30344339463239412D304242352D343639312D383034432D37363445344530413237313622206E616D653D22E58F96E6B688E8AFB7E581872220736F757263655265663D227573657222207461726765745265663D22656E64223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D66616C73657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D37463032463244352D413642412D343233342D413732342D3346383938443233354134422220736F757263655265663D226368696C6422207461726765745265663D227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535223E3C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D38344442433035362D303639312D343733452D383243462D44333235454637333641373222206E616D653D22E4B88DE5908CE6848F2220736F757263655265663D227369642D39353037343945412D344242362D343237362D423637412D44453033453334413035373322207461726765745265663D227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D30413541464638362D414541342D343231322D423146342D3932373541343430364332442220736F757263655265663D22757365723122207461726765745265663D227369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733223E3C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D30443039333043392D394241312D344636382D383545412D33383445313642343039413022206E616D653D22E5908CE6848F2220736F757263655265663D227369642D39353037343945412D344242362D343237362D423637412D44453033453334413035373322207461726765745265663D226368696C64223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A20203C2F70726F636573733E0A20203C62706D6E64693A42504D4E4469616772616D2069643D2242504D4E4469616772616D5F70726F636573735F6C65617665223E0A202020203C62706D6E64693A42504D4E506C616E652062706D6E456C656D656E743D2270726F636573735F6C65617665222069643D2242504D4E506C616E655F70726F636573735F6C65617665223E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227374617274222069643D2242504D4E53686170655F7374617274223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2233302E30222077696474683D2233302E302220783D2233302E302220793D223232382E37303337303339393831383338223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227573657231222069643D2242504D4E53686170655F7573657231223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2238302E30222077696474683D2239392E39393939393939393939393939342220783D223132302E302220793D223230332E37303337303339393831383338223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227573657232222069643D2242504D4E53686170655F7573657232223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2237392E3939393939393939393939393937222077696474683D2239392E39393939393939393939393938392220783D223531302E30393038383236333634343631372220793D223230332E3730333730333130343131343233223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831222069643D2242504D4E53686170655F7369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2234302E30222077696474683D2234302E302220783D223731352E353435343431333138323233312220793D223232332E37303337303339393831383338223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535222069643D2242504D4E53686170655F7369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2234302E30222077696474683D2234302E302220783D223337302E353435343431333138323233312220793D223232332E37303337303339393831383338223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D2275736572222069643D2242504D4E53686170655F75736572223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2238302E30222077696474683D223130302E30303030303030303030303032332220783D223334302E3534353434313331383232332220793D223336382E37303337303636343732373932223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D22656E64222069643D2242504D4E53686170655F656E64223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2232382E30222077696474683D2232382E302220783D223838302E353435343431333138323233322220793D223232392E37303337303339393831383338223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D226368696C64222069643D2242504D4E53686170655F6368696C64223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D223136312E3130323038303930333236363036222077696474683D223238342E36303837323832303738373235362220783D223234382E32343130373732313432383638362220793D22302E30223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D22737374617274222069643D2242504D4E53686170655F737374617274223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2233302E30222077696474683D2232392E39393939393939393939393939372220783D223236362E373539353935363738323937332220793D2237312E3035313034303435313633333033223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D22616C6C6D616E61676572222069643D2242504D4E53686170655F616C6C6D616E61676572223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2238302E30222077696474683D2239392E39393939393939393939393939372220783D223333382E32343130373732313432383638362220793D2234362E3035313034303435313633333033223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D2273656E64222069643D2242504D4E53686170655F73656E64223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2232382E30222077696474683D2232372E39393939393939393939393939372220783D223436352E302220793D2237322E3035313034303435313633333033223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733222069643D2242504D4E53686170655F7369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2234302E30222077696474683D2234302E302220783D223236342E39393939393939393939393939342220793D223232332E37303337303339393831383338223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D30344339463239412D304242352D343639312D383034432D373634453445304132373136222069643D2242504D4E456467655F7369642D30344339463239412D304242352D343639312D383034432D373634453445304132373136223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E35343534343133313832323331342220793D223434382E37303337303636343732373932223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E35343534343133313832323331342220793D223439342E37303337303636343732373932223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223839342E353435343431333138323233322220793D223439342E37303337303636343732373932223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223839342E353435343431333138323233322220793D223235372E37303337303339393831383338223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D38344442433035362D303639312D343733452D383243462D443332354546373336413732222069643D2242504D4E456467655F7369642D38344442433035362D303639312D343733452D383243462D443332354546373336413732223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223330342E353930383639353736373134332220793D223234342E3131323833343432313436393437223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223337302E363430313837323338373936332220793D223234332E373938343439393138373537223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D46333946364639322D463330412D344630452D423946382D453044444542313135303635222069643D2242504D4E456467655F7369642D46333946364639322D463330412D344630452D423946382D453044444542313135303635223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223433382E32343130373732313432383638362220793D2238362E3035313034303435313633333033223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223436352E302220793D2238362E3035313034303435313633333033223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D35313046453036322D433042432D343643382D394231372D384133383037324132424336222069643D2242504D4E456467655F7369642D35313046453036322D433042432D343643382D394231372D384133383037324132424336223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E393837353134343839383930352220793D223236332E32363136333038323635313634223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E36363730323138363333373736372220793D223336382E37303337303636343732373932223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D30443235384332342D314631392D343233332D413937362D413044384342394441454143222069643D2242504D4E456467655F7369642D30443235384332342D314631392D343233332D413937362D413044384342394441454143223E0A20202020202020203C6F6D6764693A776179706F696E7420783D2236302E302220793D223234332E37303337303339393831383338223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223132302E302220793D223234332E37303337303339393831383338223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D33334642463234452D464537302D343730412D394442352D394231383831453133383437222069643D2242504D4E456467655F7369642D33334642463234452D464537302D343730412D394442352D394231383831453133383437223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223631302E3039303838323633363434362220793D223234332E3834353738353439363831313337223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223731352E393838343436343031363631392220793D223234342E3134363730393038313632323632223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D34373638373538312D333535422D343335342D383433432D433330343233333238364146222069643D2242504D4E456467655F7369642D34373638373538312D333535422D343335342D383433432D433330343233333238364146223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223735352E313035353637393030353031362220793D223234342E3134333537373431353930353333223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223838302E3534353531303937373036392220793D223234332E3734373836373831363239343733223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D30443039333043392D394241312D344636382D383545412D333834453136423430394130222069643D2242504D4E456467655F7369642D30443039333043392D394241312D344636382D383545412D333834453136423430394130223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223238342E3637393931353936313034392220793D223232342E3032333738383033373133343735223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223235332E33343530333333323234383436352220793D223136312E3130323038303930333236363036223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D37463032463244352D413642412D343233342D413732342D334638393844323335413442222069643D2242504D4E456467655F7369642D37463032463244352D413642412D343233342D413732342D334638393844323335413442223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E35343534343133313832323331342220793D223136312E3130323038303930333236363036223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E353435343431333138323233312220793D223232332E37303337303339393831383338223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D39394343413337462D413233352D343835332D383437322D444532333341443245443332222069643D2242504D4E456467655F7369642D39394343413337462D413233352D343835332D383437322D444532333341443245443332223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223334302E3534353434313331383232332220793D223430382E37303337303636343732373933223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223136392E39393939393939393939393939372220793D223430382E37303337303636343732373933223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223136392E39393939393939393939393939372220793D223238332E37303337303339393831383338223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D46423539344242452D383030352D344544432D423343382D393738314544323236433935222069643D2242504D4E456467655F7369642D46423539344242452D383030352D344544432D423343382D393738314544323236433935223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223733362E303435343431333138323233312220793D223236332E32303337303339393831383338223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223733362E303435343431333138323233312220793D223430382E37303337303636343732373932223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223434302E35343534343133313832323332352220793D223430382E3730333730363634373237393236223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D41453541454438342D303734362D343738372D393836462D364137393237433334433334222069643D2242504D4E456467655F7369642D41453541454438342D303734362D343738372D393836462D364137393237433334433334223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223431302E31303138303630343037373735352220793D223234342E3134373333393237353632393338223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223531302E30393038383236333634343631372220793D223234332E3835313539323539373636343134223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D30413541464638362D414541342D343231322D423146342D393237354134343036433244222069643D2242504D4E456467655F7369642D30413541464638362D414541342D343231322D423146342D393237354134343036433244223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223231392E39393939393939393939393939342220793D223234332E393230313534323134363334223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223236352E343133303433343738323630382220793D223234342E31313637343734373634343437223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D33453941414432332D343444412D344138352D383242442D443643383330413443343938222069643D2242504D4E456467655F7369642D33453941414432332D343444412D344138352D383242442D443643383330413443343938223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223239362E373539353935363738323937332220793D2238362E3035313034303435313633333033223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223333382E32343130373732313432383638362220793D2238362E3035313034303435313633333033223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A202020203C2F62706D6E64693A42504D4E506C616E653E0A20203C2F62706D6E64693A42504D4E4469616772616D3E0A3C2F646566696E6974696F6E733E, 0);
-INSERT INTO `act_ge_bytearray` VALUES ('247535', 1, '请假流程.process_leave.png', '247533', 0x89504E470D0A1A0A0000000D4948445200000396000001F80806000000316A727D00004B3D4944415478DAEDDD09985C559D37E0282232A3830B88382AE038E0363A220CA2A3068619409045A8AEBED59DA4D982B208B20884C1B083AC437001648DC8221F46C8B048164242482420888160420264212121040890B0DEEF9C9ABA6DA5D3DDE9AE7477AABADEF779CE53D55DD5DDC9A97BCFF9FFEE3A6000D0AF5D71C5159BEFBFFFFE0F6FBDF5D6AF872F534DD3B49E6A5B6EB9E55B43860C993176ECD82F196D0100FAA961C3866DBADD76DBBDB6C71E7BA4D3A64D4B57AC589102F48437DF7C33FDCB5FFE92EEB7DF7EE917BEF085D7E3462CA32E00403FB4EFBEFB8E8FA112A037C57019C69BA9465D00807E68F3CD377F31EEA904E84D3366CC483FF5A94FAD34EA0200F44F0E7F05FAE4B0D801FF77DE250000FD315802F405C1120040B004102C0100E8FB60592A24D3C6C646553508968225008060597931F9894F7C62B5EF0F1E3CB83578AEBFFEFAE957BFFAD5F4B1C71E537D836009008060D9B56059FEDADB6FBF9D0E1B362C1DE0D05C102C0100E8BFC1F2FAEBAF4FB7D8628B74BDF5D66BDDD3181D74D041C5E73BEFBC73FAFAEBAFAFF25A564C1E76D861E9E73EF7B9E2F34B2EB9A4DD6079CC31C7B4FE5CF9EFB9E28A2B56F99D8B172F8EF7C36BFDDE11471C517C7FE6A5975E4A9B9B9B5B5F1F356A54EB6BF16777DB6DB7D6D7E2D76BFAFFADE93540B00400102CBB5714AE71AFE46F7FFBDBE2D70F3CF0C02A3F17C3E371C71DB7CAEFF8F8C73FDEFAFA17BEF085F4CF7FFE73BB7FF3F9E79F5FED7BF136293118B6FD770D1D3AB4F8F5B3CF3E5B0C956D436EF6F559679DD5E16BDDF9BF038225008060D945F3E7CF6F3D5C35EEB99B3B776EBBC1320B73E5C1B26DE8ECCA61B2D9EB1FFDE84757FBDEBFFDDBBFB57EDDDEEFDC7AEBADDBFD7D5FFFFAD75B4362DBB0D8D9FFAFB3D700C1120040B0AC40477BFBE25EC933CE38A3F8FCC1071F5C6D6F5F3C6CB5BBC172A38D366A77EF61BCE17A3CECB56D40CC0E837DE185178AAF8F1C39B2DD7F676C1D5D2CA8EDFFAFABAF018225008060D989DD77DFBD35987DEC631F4BAFBBEEBAD6D76288CC5E8BE7509687BDF818DF9B7D6FF6ECD9C5EF975F1576F9F2E5ABFCADF8F580367B16B3F328E3E1AFFBECB34FEBF78F3CF2C8E261B1E57B17070E1CB8DADF8B162D5A94EEB2CB2EADAF4D9C38B14BFFBFCE5E03044B0000C11240B0040040B004044B0000044B40B0040040B004102C0100044B00C1120000C112102C0100102C01C1120000C11240B00400102C01044B0000044B40B0040040B004044B0000044B40B034E4020008960082250000822520580200205802822500008225205802002058020896000008968060090080600908960000089680600900806009205802000896008225000082252058020020580282250000822580600900205802089600000896806009008060090896000008960082250080600920580200205802822500008265ED9A3B776E3A65CA9474DCB871E9983163B43E6C63C78E4D274E9C98CE9A35CB82285802002058D66EA89C346952BA78F1E2F4F5D75FD7D6415BB264493A61C28474E6CC991648C1120000C1B2F6C43D9542657584CBB8C718C1120000C1B2E6C43023D855478B87C6225802002058D69C1866843AC152B0142C0100044B7A3D58BEF2E2C274CEB4ABD3C7C69E566CF179FC9E4028580A960000089682E51A03CFF2650BD2E97F3839FDF3EDC7ADD2E2F7E26B42A1602958020020580A969DB6798FDDB65AA8CCDAFCC7460B8582A560090080602958761E7866DCF3D30E83657C4D28142C054B0000044BC1B2D3367DCC291D06CBF89A5028580A960000089682A56029580A9600000896F45EB08C5781ED2858C6D78442C152B0040040B0142C3B6DB326FFACC360195F130A054BC1120000C152B0ECB42D5DF0683AFDEEE1AB1F061BBE175F130A054BC1120000C152B05C637BEAC191AB05CBF83D8150B0142C0100102C05CB35879E952BD359F7FF72F5C360C3F7E26B42A1602958020020580A961DB6E5CB16A433275FD2E13996F1B5F81EC150B0142C0100102C05CBD5F6522E9C353EFDCB5DC33A0C95598BEF89EFB5F752B0142C0100102C05CB2EEDA5B4F752B0142C0100102CE9345876652F65677B2F8544C152B0040040B0ACF3605969A8CC9A9028580A9600000896CEB1D4044BC1120000C112C152B044B0040040B52B580A9608960000089682A526580A960000D449B09C33674E7AF5D557A7A79D765A7AC41147A443860C491B1B1BD3418306A5871D76587AE69967165F7FE69967044BAD6E82E5ECD9B3D38B2EBA283DF4D043D3E6E6E6344992E27A115B535353FAFDEF7F3F3DF7DC738BEF132C0100A8DB6079F3CD37A7279E78627AE49147A6975D76593A75EAD474C18205E98A152B8AAFC7C7C58B17A70F3DF4507AEDB5D7A6471D75543A7CF8F0E2CF09965A7F0D9637DC70437AD04107AD1224D7D40E3CF0C0F4CA2BAF142C0100A89F60F9C4134FA4C71D775C7AECB1C71643E35B6FBDD5E59F7DE49147D261C38615DB8C1933044BADDF04CBB85E1C7CF0C15D0E93EDB5FDF7DF3F7DF4D147054B0000FA77B01C397264B1781E3D7A74B702655B77DD7557F150C05B6EB945B0D46A3E58C643BD0B85C22A21311EEE7AF6D967A7E3C78F4FE7CE9D9BBEFCF2CBC5F7BEFAEAABC53DFB93274F2E1E2A1B0F192FFFB9B8A7B396F65E0A9600008265B7C41018CF179B3973668FFCBEA79F7EBA784E66AD1E1A2B580A96D16F7FFBDBD5CE9FBCEEBAEB8A878177C5B265CB8AEF8F3F571E307FF18B5F08960000F4AF6079CD35D7144365578BE5AE8ABFAF56C3A5602958C63D95E5A1F2E8A38F2EEE9DAC44FCB978887979B8AC853D978225008060D9E573C70E38E0801EDB53D9DE9ECB430E39A4E6CE2D132CEB3B58C6F5A27C2F63BC305576B86BA5E261B2F12ACAE587C53EFCF0C382250000B51F2CE32D436EBBEDB65E2D4EE33997C71F7FBC60A9D54CB02CBF504FDC53B9B6A1B23C5C96EFB98C17F4112C0100A8E960196F9D106F27F2C61B6FF47A811A83E5F5D75F2F586A551F2CE37A517E4E65A587BF7676586CF9DED06A3E2456B00400102CD7E8F0C30F2FDE52A42FC443614F38E104C152EB956019DFD753E27D2AB3D0172FBCD3DBE1B59AF75A0A9600008265A766CF9E5D3CDC6F6D6E2BD25D471D7554AF9DCBD99DD070F7DD770B96FD28583EFBECB3C5DB7BC410D859C0ECCA671FD78BEC823D71AFE2D2A54B7B65398C578B2DBF15493CA753B00400A0E68265BCC7DECF7FFEF33E2D5263E17FE9A597AED342392BE463C818376E9C6059C3C1325E7578C58A15AD5FAF5CB932BDE9A69BD2471E79A4E2CF3EAE17D9FBCE3DF7DC5E5D16FBF26F09960000F44AB08CB701993A756A9F16A9F1B0DB934E3AA92A8265D6E25EDBF6F6620996D51B2CDF7CF3CD4E6F8DF3D4534FA5BFFAD5AF8A17CAE9EE671F6FBB93BD3E61C2845E5D16E35ED6EC6FC52B270B960000D45CB01C326448BA70E1C23E2D526318887B8BAA295896EFC52A0F1982657506CB78D8EBDB6FBFBDC6CFF99D77DE295E8DF88E3BEEE8D667DFDCDCDCFAFD9EBE684F5B0B162C68FD5B854241B00400A0F682652C64CB0F23EC0BF1EFC5C2BD1A8365F95EAC7898A460595DC172F9F2E5E98B2FBED8EDCFFB85175E48AFBAEAAA6220EDCA675FFE754FDD62A423718F6AF9DF132C0100A8B960B9AE0AD93515F7D5D204CBEA69A3468D4A478C1851BCE04D2517C9893F5BC932D0D7EB8360090040CD05CB75B5C7325E69B31AF758C643837FFBDBDFB65E55B4378365BCF268F9EF8F9FE999679ED9EE7BE3219AF1F5B877EBF6DB6F4F070F1E9CDE7AEBADE9EEBBEF9EB6B4B4F4E8BF2BFE9DF3CF3F7F8DEF39F6D8638BCFE38572E2679A7D3FBB2A6B6FECB18C7D76CC31C7A4F7DF7F7F973FEBB8C7F1473FFA51FAFDEF7FBF78D5D5AE7CF6D91561EDB1142C010004CB2E88B73A5817E7581E78E08155152CDB06CABE3AC7327E8E53A64C29EE518BCFE3855C3A7ADF85175E580C215988CBBE7FE28927B67EBD68D1A274A79D762A86CE18F076D86187E2FF2F7E9D85D1912347A61B6EB861EBCFDC7BEFBDABBCBED9669BA5DFFCE6378BCF63BBE5965BD22DB7DC72B57FCF15575CD1FA3CFECEEC790C9ABD7D8E65BCFFE3E9A79FDEE9DECB787E65FCB7C4C3AEE3FBBBF3D93BC752B00400102CBB215EFD72E2C4897D7E55D8B8D7A91A8265DCDB17434747F73DECAD60397DFAF46260DB64934D8AE16D830D36287EFDF9CF7FBE1820DB1E029AFD3BE2E77EFCF1C7B73EDF679F7D56FBDD317CC6D7E29ECDEC7DF1FCC2F818C3630C9C9FFCE427570989E561307E1D435BF6F5FAEBAFDF1A5EE39556E3BF37BEE75BDFFA563150C6E7714F60F6B38F3EFA68F1F1E28B2FEED5ABC2C650396CD8B0F477BFFBDD6A17F2896170FFFDF74F4F38E184F4F9E79FEFF667EFAAB08225008060D90DF11E7AF1B0C7BE14834DFCBBEB52477B28FB2A58DE79E79DC5C0D6F6FB1B6DB451BAD75E7BB57E9D85B4183A0794ED9D8CCFE3EF8881303EBFE79E7B56DBA3180360F63C06D9F878FDF5D7172F60139FCF9B37AFF87ABC204EBC5051B68732BE76C00107149FC7E01AC3687B7B50CBF7586EBAE9A6AD87EBC6BD9B712F685FDDC7326E18F9F18F7F9CCE9933A7B837F7A73FFD69313476B4C1A42B9FBDFB580A960000826537C473D662A1FDD65B6FF559917AF8E18717F770D582751D2CE35EB9182EE3E1B2DB6CB34D3120C6F7C4AFB3F73CF3CC33C5C23FEED97CE9A5975AC3610C7E975C7249F1F9CD37DFDCE11ECB2C1CC6F7B40DA5F1DF19FF5E7BC132EEB17CF0C1075B0FE7CDBE1FFF665FDCC7B25C7CFD820B2E2886B3F8B8A60D065D592FB2B017CF075EBA7469AF2C5FF1F32D3FECB65AD70BC1120040B05CA378FFBE78385E5F8821E9073FF8415A2B7A3358C6CF305E502686BDECFCC6F8BDA38E3A6AB5C366E36B3134C620173FAB6CEF6276186DB6F730DB03197F4FDC839885BD6C2F65DC63195F9F356BD66A41F11BDFF8C66A7B2CE3F9966DF7A0C68BF6C4F75C7EF9E5ED86D2BE38C7B2B380D993EB4516F86218EF0DF150DCEC6FC44377AB95600900205876A9B88D45745FECB58CA1E4CA2BAFACFB60F9F8E38F175B16C64E3DF5D4E2F318F8E6CF9FBF5AE88B6DD2A449C5433DE339946B0A7103CAF63AC6809905C6189076D96597D50E6FED6AB08C17078A7BF306B439D4B63C586687EFB6FD7FF445B0ECADD017F75AF6F4457CE2EF8BBF37FB1BD5BC5E08960000826597C4ABB45E7BEDB5BD5A9CDE71C71DE9D0A1437B74AF522D06CB786E630C7BF1D0D61FFEF087C53D9159108BA12D1E221B837EDB9F8B812D5EF1B5A38BEE94B70F7DE843C5DF1FCF758CBF3F7B7FDC63D9D11ED4F642693C34330BC09D9D6319FF6DD961B1F1023F3168965FBDB6168365B65E64C1EFE8A38FEEB15B8FC48D03F10256E57B2BAB79BD102C010004CB2E890122DEEA208688DEF0F4D34F172FA8F2F0C30FA7B5A4A783653C576F40E9B62231FCC5F3EBCA5F2FBF6D47F9F993F16AB131B095DFC3327E7FDF7DF76D7D1E4364B63771ABADB62A1EFE1A836876FB9101A5732CB3E7F182406BDADBD9B6C5C368B3436DAFB9E69A55F6A8C620191F870F1FBEDA6D506A3558C6F5A2FC9E96F1FFB6B6E13286CA33CE38A3F577C6DF5FEDEB85600900205876D9D5575FDD2BF7B58CF7AD8C7BE06AE910D8DE3E1436BB8D4816CAE2B996F15613034A7BFF3AFA99AEEC058CC1AF3BEFEF4EB08C2DBB426DF9057BCA2F26D45B6D5D04CB6CBD28BFEF65DC7359E961B1F1E7CAF75456FB21B082250080605991CB2EBBACB8172D5E30A6A7F654C6C309CF3AEBACB416F566B0D46A235866EB4579188CE746C6F355E3555DBB7AF5D778CE66F93995B1D5CA7A21580200089615EDA18987E7C5431DD7E6823EA3478F2EEE018D4579AD122C05CB8EF65C660133DE7B72C28409C5BD91D961B2F170D7050B16140F791E316244F1963EE53F17D7AF5A5A2F044B0000C1B2E273CBE2E1ABF1A222F7DD775FB77E369E2F76C4114714AF2C5A6BE7540A96826557D68BB601B33B2DAE53B5B65E0896000082E55AF9F5AF7F5D2CA4E3E1B1F18223F7DC734FF1EAA5AFBDF65AF1F5780E5FBC05C51FFFF8C7F4E28B2F2E16CD3150C6BD31B574F557C152B0AC64BDE86EA0ACD5F542B00400102C7B44BCDAE805175C901E7AE8A1AB9D2716AF261B2F3C130F098C7B74FA13C152B0B45E08960000822582A56089600900806029586A82A5600900806029586A82A5600900806029586A82A56009008060896029582258020020580A9682258225000082A560A909968225000082A560A9099682250000822582A56089600900205822580A9608960000089682A526580A960000089682A526580A9600000896089682258225008060896029582258020020580A969A602958020020580A969A6029580200205822580A9608960000822582A56089600900806029586A82A5600900806029586A82A5600900806029586A82A560090080604925C68D1B27D4099682A5600900205852B9499326A58B172F16ECD6715BB4685131E4235802002058D69CD9B367A713264C489F7BEE39016F1D87CA9933675A20054B000004CBDA0D97E3C78F2F1E8AA9F57D132A054B0000044B40B0040040B004044B0000044B00C1120000C112102C0100102C01C1120000C112102C0100102C01044B0000044B40B0040040B004044B0000044B40B0040040B004102C0100044B00C1120000C112102C0100102C01C1120000C11240B00400102C01044B0000044B40B0040040B004044B0000044B40B0142C0100044B00C1120000C112102C0100102C01C1120000C112102C0100102C01044B0000044B40B0040040B004044B0000044B40B0040040B004102C0100044B00C1120000C112102C01005807C172C58A152A5EA057BDF9E69B822500407FB5E9A69B2E9A366D9AAA17E8553366CC4837D9649365465D00807EE8C31FFEF0B93BEFBCF32BCA5EA037EDB9E79EAF7DF4A31FFD99511700A07F7AFFFAEBAFFFF0F6DB6F3FFF81071E783D1EAE46EF58B972A54EA0EE0E7F9D3163C65B3BEEB8E3820D36D860761C6F0CB90000FD385C8676CABBDEF5AE2706FCDF39505A0FB6F7BFFFFDE90E3BEC10F7D8A4EBADB75EBFF97F353636FA7CB535B677BFFBDD31509E27540200400572B9DCFB9324393B04B015F97CFED5D08EEE4FFFBF52B0040000A0378410B947085E4FC5F0155BF8FAE5534E39E5DD82250000009D2A140AFF1A02D7A42C509605CBD1FDEDFF2A58020000F4A02449360E41EB9278D86BDB50596AA70B960000007414B006E6F3F9651D04CA6C8FE5E182250000001D4A92E4A010B41676142C1B1A1A76162C010000E8542E97FB58085B7776B0C7F28B82250000005D0D5CC3437BAB3C58C6D02958020000B046F1DE9521703DDDD0D0B06F78FC7529582EE9A7015AB0040000E885B015AF0C7B65D9D7FBC5C363054B000000D6A8A1A1E11B216CCD6F6969F960F9F7070E1CF81EC1120000804EEDB6DB6E1B84A03523B47DEAE5FF2C58020000F46CC83A33B49BEBECFF2C58020000F4847C3EFFE510B29E4B926453C1120000806EC9E572EB8580F560682DF5F67F172C0100007A4092243F0E01EB0FF5F87F172C010000D652A150F8E7788FCAD0B6102C010000E8AE772549726F08573FACD70E102C010000D62E547D3FB4FB4F39E594770B96000000744B5353D32742A85A9CCFE73F57E7E15AB0040000A830508D0EED64FD2058020000745B128440F5E7A14387AE2F580A96000000DD0D951B8730B530B46DF58660090000504990FA4D68E7E909C1120000A09210B57B68B372B9DC867A43B0040000E896A6A6A67F08216A6E6803F58660090000504980FA656897E909C1120000A0DB1A1A1ABE1502D4BC5C2EB791DE102C010000BAA5A5A5E57D213CCD0C6D4FBD215802000054129CCE09ED463D2158020000745B3E9FDF2604A745B95C6E13BD215802000074CBC08103DF1382E5C3499234EB0DC1120000A092C0342CB43BF48460090000D06DB95C6EEB10989684C74FE90DC1120000A0BBDE15C2D27DA11DA62B044B0000804A82D261A14D8A01536F0896000000DD120F7D2D1D02BBB5DE102C0100002A094977264972A29E102C0100002A094883E2ED45E26D46F48660090000D02D83060DFA6808488B42FB8ADE102C0100002A094737254972B69E102C0100580B699ABE67CE9C39374F9D3AF5ED71E3C6A563C68CD1FAB08D1D3B369D3871E2F3A1355B1AFB563E9FDF2B84A3BFB6B4B4BC4F6F08969817CC0B00B01662F13069D2A474F1E2C5E9EBAFBFAEAD83B664C992F4DE7BEF7D291413FB5922FB462E97DB2804A379A17D536F08969817CC0B00B096E21669C543551411AF8F1933668625B2CF42D1E5A1FD424F08969817CC0B00D003E2614E26F0EA68A18078D312D9FB1A1A1A760CA1E8993DF7DCF3037A43B0C4BC605E00801E10CFE73079574D01A150EF65B95C6EC310889E2C140ADFD11B8225E605F30200F47101F1CA8B0BD339D3AE4E1F1B7B5AB1C5E7F17B267E05442DC9E7F3E72749729D9E102C312F981700A08F0B88E5CB16A4D3FF7072FAE7DB8F5BA5C5EFC5D74CFE0A881A0995DB8530B43004CB8DF586608979C1BC00007D5C40CC7BECB6D58A87ACCD7F6CB4C95F0151F5860E1DBA7E08968F86D6A837044BCC0BE60500580705C48C7B7EDA6101115F33F92B206A20049D1CDA683D2158625E302F00C03A2A20A68F39A5C30222BE66F2574054B35C2EF7F910821687C77FD41B8225E605F302002820141074CB29A79CF2EE1080A624497288DE102C312F981700601D1610F16A7F1D1510F13593BF02A25AE5F3F92343009A109EBE4B6FAC55881C1D83E41ADA343D655E302F981700504074D8664DFE598705447CCDE4AF80A8D230B445684B72B9DC67F4C65AF7E5B6A1BDD959B00C217E0F3D655E302F981700504074D8962E78349D7EF7F0D50F770ADF8BAF99FC1510551A86EE0E61E7383DD163FD796727C172CAC08103DFA397CC0BE605F302000A884EDB530F8E5CAD8088DF33F12B20AA510894FB87B0F3602E975B4F6FF458B0DCB6A3609924C9DE7AC8BC605E302F00A080E8BCAD5C99CEBAFF97AB1FEE14BE175F33F92B20AA4908931F0B61E7B9102EBFAC377A3C5CB677AEE5347B2BCD0BE605F302000A884E27B5E5CB16A433275FD2E1B934F1B5F81E058002A25A8440F9FF922439434FF44AB05CED5C4BE7569A17CC0BE60500E8B88058B9325D386B7CFA97BB8675583C642DBE27BED7566A05441584CAEF85B03363B7DD76DB406FF45A1F8FB2B7D2BC605E302F00C01A0B88356D8DB6955A01518D0A85C28742D05910DAD7F546AF06CBAF959D5BB9AB1E312F9817CC0B00D06E01D195ADD19D6DA5560C2820D6C2072BFDC11072AE0AA167842EEC7D0D0D0D77C560696FA579C1BC605EA0BAE64280AA2A202A2D1EB2A61850405428EEFD4A4B8FDD0D3A3B87A0F3542E977BBFB5BAF73FA70F7FF8C3C53D96BAC2BC605E302F503D732140D515109A02621DD839B465A15D547AECF20561060D1AF4F721E4CC29140ABB58A3FBEE732A054B17EE312F68E605AA602E045040680A88BF4DA4D9041AB7D22EE9EA849ACFE72F4A92E45A6B73757F4E981734F302C6584001A12920FA6A225DD3F7DB86CA7821996773B9DC87ADCDD5FB39615ED0CC0B1863010584A680E82DBBAE61C2CC5E6FF73C931026DF9B24C963215CE6ACC9D5FB39615ED0CC0B1863A1263435357D221496870F1932E4B6E6E6E6A70B85C26BA54BE1AF0CCFE796EEB9766C7C9FDE52402820AA6E225DD344D9E1D6DA102A4F8DEBB7B5B8BA3F27CC0B9A7901632CD59BA1424EBA39B459A12D2F65A815F182887595A14251B9F7D0A143A71D72C8212F8E1831E285A953A7A60B162C4857AC589146F171F1E2C5E9942953E65D70C1057F09C1737EE89C7BC2CF355B9414100A88756AE76E6E7D5DEDFD6190FB97B03E2F6E6E6EDECC5A5CBD9F13E605CDBC803196EACB50A18D2905C8B48BAD7F66A8F01FDB2284C93F1E79E491AF3CF4D043E95B6FBD9576550899330E3CF0C099E1774CCAE5729FB16829201410EB6C22DDA3829F5B1E27D4B0EEAE17D6E107423BD01A5CBD9F932E342F68E6058CB15457860AEDCE6E84C9F65AFFC9502D2D2D830E38E080D76EBBEDB6B7BB1328DBFACD6F7EF34048DD8BECBD544028206A62225DE5E777DC71C72BC3C036CE1451DD9FD300876C991734F302C658AA423E9F0FA553E392F290D8D4D4949E7DF6D9E9F8F1E3D3B973E7A62FBFFC723127BDFAEAABC5A340274F9E9C5E74D145E9A04183DA86CBE5359FA1860D1BD6F2831FFCE0F5993367A63DE1C9279F7CAAB9B9797EE898831410266F0544AF5BD3C509BAE4EFFEEEEFF60ADEDE7CF3CD0F324D54EFE7D483BF07F382790163AC3196B50B957B8430F86679A0BCEEBAEB8AA70C76C5B265CB8AEF8F3F571E306B36431D73CC3187066F74B503BA6AD1A2450B4BE1B26EF75C2A2014107D3891F6C8A13B215CEE6E42ADFECF6980ADEAE605CDBC803196751D2A1BCB43E5D1471F5DDC3B5989F873C71D775CDB70595B196AE8D0A1FF74F0C107BFD1537B2ADBDB73593A2CF6B30A084D01D1E3DA5E6CE05DA10D293D7647DB9F7311039F13E605F302C658632C1D289D53D97AF8EBF0E1C35B0F77AD543C4CF6CC33CF6C7B586CED64A8638E3966CEE8D1A3D3DE74F5D5578F8D27A32A20340544AF4CA47B944D88578696961EBB3AA176F47326549F13E605F302C658632CED285DF9B5754FE5DA86CAF270D966CF656D64A8534F3DF507C71E7BEC3B6FBCF146DADB060F1E3CA31E0F8955402820FA68221D50DACA9A96B5AE4CA8E51369D60697BDEE3C139F13E605F302C658632CAB86CABDCBCFA9ACF4F0D7CE0E8B2D3FE7B22632D409279CF06CBCA5485FB8EFBEFBEEADC7BD960A0805442FE868826B6F62EC6C426DEFFD57B4F37EE799F89C302F981730C61A63F95BB06CDD5B192FBCD31B6EB8E186DAD96B79E38D376E77F8E187BFB336B715E9AEE6E6E6A7E3F1C80A084D01B1D613E9AEDD9820DB9B50BB3A91B69D501D0AE473C2BC605EC0184BDD6A6A6AFA4476C19EB85771E9D2A5BD929BE2D562DBDC8AA47A33D425975C72E315575C91F6A533CE38239E6B796C7FD95211DABF2B201410BDBD0C5530A1AD6942EDEE445AFEF797D4DBD65A9F13E605F302C65863AC653293CFE70FCFC2DEB9E79EDBABD929DEE7B22C58566F863AF5D453E74E9D3AB54F83E5F8F1E3EF0B9D32BA3F2C7465C73C8F090BD8D714100A88DE5A86DA4CA45D9DC83A9A50DF5DE144DA762B71DD4CA83E27CC0BE6058CB1C658CB64D9EB3767EF99306142AF66A7C993279707CBEACD50471C71C4EB0B172EECD36019FE5E3C14765E7F5AE8CADA9DED6DDD50402820D676191A50F9791DED4DA87F5D8B89746DFF3DFD7A5DF739615E302F608CA5FF2F93E1EB59D96B3D7DD19EB6162C5850FEEFA8DE0C3564C8907756AC58D1A7C1F2B5D75E7B3E74CA8A7EBAD0B56EDD285FF814100A88B55C86D676AB687B13EADA4CA46D27D45DEB7082F139615E302F608C35C6D6E93219EF2D997DAFA76E31D2D9AD47CAFE0D2BAABAD3D685F877FBF34257BE7523EE3E574028202A5D86F6DE7BEFB1A549EFA2B5FC53EF6E67EBEC5F4BDF5F1B17957ED707EB7182C95A2E971BFB918F7CC4E7444DCC0B715928140A5D7EFFADB7DE9A6EB5D556DDFAFDE79F7FFE1ADF73ECB1C7169FDF74D34D69DCC89D7D3F5E5D51B0B4DE980BA9F2B1BCB5F55576CA5AD5765A4B4B4BDAD77B2CC3DF7BB33B1F567F687D5D40DC7DF7DDC5C1326EE1B8FDF6DBE3FD438B85C1EEBBEF9EC6CFBCA70B945A2B206A6DF9F9F6B7BF9DBEF7BDEF4DD7626B68675B69BB73E3E80EB7D2D6DB3ADD59F339695D6DEB3258EEB4D34EEDBE16C7E7EDB7DFBED8B2B963B3CD362BB6F83CB6ABAEBAAAF83BE6CF9F5FFC997BEFBDB7F8FDF2F77FF39BDF6C7DFF2DB7DC926EB9E596ABFD1BE2C503B3E723478E6C7D1EE709F382662ED46AA5D9635972C41147BCD1D7E7582E5AB468613F3EC7326BD3F2F9FC1E03070E7C4F7C5F5F07CB38485E78E185C505310B71D9F74F3CF1C4D6AFC367512C2EE2C41F03DE0E3BEC50FCF797170871B2DF70C30D5B7FA63F1410B5B80C9526AEE5037AE7BC924A26D47A3FC7D2E7444DCD0B6DC7E44D36D9A4C3D7E3DC316BD6AC74975D76592D58DE7CF3CDE9673FFBD9D57E5FF9581EBF3EFDF4D35BBF5E7FFDF55BE79EA79E7AAAF87BE27BBEF5AD6F15E783F8FC89279E68FDD9471F7DB4F878F1C517DB6369BD31C65295CB64787CD239966D9C75D6594BFBFAAAB093274F9ED9DFAE0ADBC90038A0AF0B8851A346B5EE218D03E5F1C71FDFFA7C9F7DF669B78088AFC53D9BD9FBB2ADD1313CC6C0F9C94F7E5201B18E97A1B65B45D76222BD6240FB57C2EBCE845AB75785F539518BF342DB3D927159DA60830D3A7D5F0C901FF8C007560B961B6FBCF16A73C9F2E5CBD371E3C6B56E608CBFFF80030E283E8FEF8D73497BE1B67C83E3A69B6EDA7AB44DDC381937623A14D67A638CA55A974957856D4718D4EFE8EBFB589E77DE7953FBCB7D2CCB3EE4294992ECDDC100D867054416D2E25EC301657B27E3F33BEFBCB31808E3F37BEEB967B5093E1600D9F3E9D3A7171FAFBFFEFAF4D9679F2D3E9F376F9E02621D2E43156C1D5DD3BDB9BA7AE3E8B6B61D5087F7EEF23951ABF342DB3665CA94E272F4A10F7D6895235ADAB6B84131B6B6C1F24B5FFA52BB1B29E3EF8C61B4ED9C12E79E8D36DAA8DDF7C70D8E0F3EF860F179FC7765DFBFE4924B9C6369BD31C652D5CBA4FB58B6E38F7FFC63EE88238E48DF7AEBAD3E0B962D2D2D0B42A76CD14F16BACEB6A8F57901B16CD9B262B88C13F436DB6C530C887142CF26ECD89E79E699E2C019F76CBEF4D24BADE13006BF389967C5C1800EF6582A20D6CD32D4CDADA45DBDE1737727D4EC10A4BDEB7082F1395193F34247E757C60D8CF1796787C366CF63988C2DBB904FFCB9B6A1347EEF1BDFF8C66A1B1C6320DD6BAFBD56D9001ACFB98FEFB9FCF2CBDB9D53EAFD1409EB8D3196EA5F269B9A9A3E11DE53BC6E4C789E2E5DBAB4577253ACED070D1A541E2CAB3B439D7AEAA9AF3DF4D0437D122A1F7EF8E1A5A143EEABB785B32F0B881826E3641E43630C7271F779B67731B678F853B6F730DB031907D1B807319BD4B3BD94718F657C3D9E6BA380A83A1D6DADEDEA44DADD0935FB7B26529F1335362FB43D0C369EEE908DC1E79C73CE2AEF89A730ECB6DB6EC5D6DEC57B4E3EF9E4F4A8A38E6A3DBAA5BBF3423CB77FF6ECD9AB1D29533E2F6447DF641707322F608CA51AC55B8F64812FEE88E90D37DC704379A89C54F59D72F5D5579F7BDC71C7F5C95ECB430E39E4A9F021342B207A776B746C93264D2A1611D956E7CE425CF9041F03665618C495245EBCA1EDE1AD0A88AA11B7D6B63D1467C880EEDF9BABBD09757037B60AE373A20682E580D29128D9D78F3CF2C82A1754CBC2676CE557145FD33996D9112BEDCD29F19CFAC71F7F7C8DA748C4B9203BAA2586DB384F7476A8AE7901632C55102CF7CE425FDC6BD9D317F189BF2FFEDEB27B68D646863AE9A4935E1E3D7A74AF86CADFFFFEF7CFC6BD95DD3CCC4101B116E75B965F4EBEB36019CFB58987CEC6731DE39ECEECFD718F657BEF574054DD845A7E1183F289B13B377CEEE8E7DCF8D9E7443F981706747001B7B80131BE16E6E6550E7FCD0266769BA86C8360DC4BD9DE38DFD1C6CAB62D1E05931D2973CD35D7ACB24134DBA33A7CF8F0D5AE626E5EC0184B350AD9E69E2CF81D7DF4D13D76EB91381EC71D7FE57B2B6B26438D1A35EA3F0E39E4907766CE9CD92BA1F2E9A79F7EABB9B9F9F990B43FAB80E8BD969D3FF9F9CF7FBE18D8CAB738C7EFEFBBEFBEADCF6388CCF626C61B5FC7C35F6310CD6E3F926DD9CE9EC70B022920AA56DB4381DE55DACADADDCBA6B7FDB95D4DA43E276A7B5E88175E8B174C8BE7D577F49EB8B1308EC36DFF4D7143637635EF78718AEE84D88EE685D8B20BCC959F6F5F7E2D80BE6E82A531D618CB5A04CB2D425B9205C058D7AE6DB88CA1F2CC33CF2C0F95CB6B2E4385C2FF8A78219FC58B17F768A88CBFEF80030E585A8F87C0AEAB2DD3E55B9CD7F49E18FCBAF37E0544CD4CA83DB1F5D715EF7C4EF4B37941132C8DB1C6587A563E9F6FCC2EE493EDB9ACF4B0D8F8736DF654A6359BA1468E1C794B0C973DB5E7F2E9A79F4E0F3AE8A01743879FA08030792B206A664275C3679F13E605F302C658632C5D1402604B79B88CE746C6530DE2555DBB7AF5D778A19EF2732A63ABF90CF5AB5FFDEA67210CBE13CFB95C9B0BFADC71C71D2B870C19F262EC680584024201D167D6F6901D87FCF89C302F981730C61A63E9A6B8E732B465E5C13006C5782AC18409138A7B23B3C364E3E1AE0B162C28DEBD61C48811F1768CAB04CA78F86BBFC950975F7EF976279D74D2F371576CBC6A5C77C40BB3849F7B71F0E0C1D3EAF59C4A058402A24A26D4EE6E657571029F13E605F302C658632C158AE75C96DF86A4C236A95F66A80B2FBCF0BF8317E2E1B1F1AA9ED3A64D4B172E5C583C172F8A8FF11CCA183EE3EEDEC30E3B6CC5C1071F3C3D26EC7ABCFAAB0242015145BA7B088F437E7C4E9817CC0B18638DB1F44CC0DCAF1430DFEC4EA0AC8B0C75EDB5D77EE5BCF3CEBBF6E4934F9E3574E8D0E5CDCDCD6F9776EFBE75E081072E0FC1F3A1D0CE8C29DDA2A4805040D4DC84BA6D68CB07B8E1B3CF09F382790163AC31961E13B2D22742C03C2A64A49B437B2AB4156541725E68A3433B56864201A180A805BB9626CA5D3B797D8989D4E78479C1BC8031D6184BEF2B85C9D4D19D28201410B5A8A3ADB50EF9F139615E302F0896C658632C7D249FCF7F2D3B3C364912E7F1A2805040F48B09D544EA73C2BCA00996C658632C7D1B2C47951D0A3B4D8FA0805040D4FA847A9189D4E7847941332F18638DB1F49D1024B76D7B319F10342D7F28201410352B1E76910E7019759F13E605CDBC608C35C6D297C172743B57829DE65C4B14100A885AF6415D501B9F539C7474837941332F608CA5E643E5B61DDD7A244912178D4201A180805E9F882CAFE605CDBC803196DA5FD6EEECE4FE9553F4100A080504287A302F981730C64267CB59877B2B9D6B89024201018A1ECC0BE6058CB1D095E56C7467A1D215625140282040D18379C1BC803116BA65D0A0417F1F96BD57F4040A080504287A302F981730C6424572B9DCFBC3B2B75C4FA080504080A207F3827901632C5464CF3DF7FC4092242FEB0914100A0850F4605E302F608C858A343535FD4358F65ED21328201410A0E8C1BC605EC0180B15C9E5721B8565EF453D81024201018A1ECC0BE6058CB150919696960FE6F3F9657A0205840202143D9817CC0B1863A1228542E14361D97B414FA080504080A207F3827901632C542497CB7D382C7B4BF5040A080504287A302F981730C64245060F1EFC91B0EC3DAF275040282040D18379C1BC8031162A9224C9C661D95BA2275040282040D18379C1BC8031162A92CBE53609CBDE623D81024201018A1ED6DAB871E38CC9D5D1568479E14D4BA43116FA4A92249B86656F919E4001A18000450F6B6DE2C4890B172F5E6C5C5EC76DC18205378679618625D2180B7D2597CB7D2C2C7B0BF5040A080504287A586BE3C78FDF6BC284092F3EF7DC73AF199FD7CD86C638278C1D3BF699D0F6B3441A63A1AF3437376F1696BD67F5040A080504287AE811613CDA63CC9831D3E29114F1307DAD4F5BECF319E60463AC5E601D2C771F0F6D819E4001A18000450F8031162A92CBE5FE312C7BF3F50475ABA1A161670330287A008CB150B9A6A6A64F84656F9E9EA09E07DF49A1BDA32740D103608C858A97BB4F8636574F50AF2BC0C038F8C69624C9BFEB1150F4001863A1FB72B9DCA7C2B2F78C9EA05E07DE7BCA82E5183D028A1E00632C745FA150D83C2C7B4FEB09EA4E0892BB66A1D25E4B50F400186361AD96BB2D427B4A4F508F0BFFA4B6C132B4D17A06143D00C658E89E5C2EB76558F6E6E809EA6DC0DDAF9D50596C8542E15FF510287A008CB1D075A186FE7458F666EB09EA6DC0FD4B47C13249921BF410287A008CB1D075B95CEE3361D99BA527A81B2138EEDD51A8CC5A3E9FFFA29E02450F803116BAA65028FC7358F666EA09EA46088D0FAF29588676B39E02450F803116BA5C636F1596BDBFEA09EA5692241B879560899E00450F8031162A93CBE5B60E75F5137A82BA3568D0A08F8601F8393D018A1E00632C542684CACF86656F869EA06E3537376F16568267F504287A008CB150997C3EFFB9B0EC3DAE27A85BB95CEE1FC34A305F4F80A207C0180B15D7D49F4F92E4313D413D0FBE9F0C6DAE9E00450F8031162A1342E517C2B2375D4F50B70A85C2E66125785A4F80A207C0180B9589B7EB8BF78AD713D4AD5C2EB7655809E6E80950F4001863A1324D4D4DFF12C2E5A37A82BA1556807F0A03F0937A02143D00C658A84C92245F0ACBDE9FF50475AB5028FC73580966EA0950F4001863A132F97CFECB61D97B444F50B7DCCC15143D00C65858EBE5EE2BA1FD494F50B7DC7307143D00C65858EB9A7A9BB0EC3DA427A85B2E8D0C8A1E00632CAC9D42A1F0D5B0EC3DA827A85BAE60058A1E00632CACF572B76D68D3F40475CB89C6A0E80130C6C25AD7D4DB8565EF013D413D0FBE4E3406450F803116D642A150F8B7B0ECFD514F50CF2B81E3C141D103608C85B55BEEB60F6DAA9EA06ED96D0F8A1E00632CAC754DFDB5B0EC4DD113D4FB4A60EB0A287A008CB150A124497608CBDEFD7A827A1E7CBF1EDA643D018A1E00632CA8A9A1224992FC7B580926E90950F4001863A1320D0D0DDF08CBDE7D7A827A5E09BE15C2E5BD7A02143D00C658A878B9FB666813F504F5BC120C0CED1E3D018A1E00632C54C6CE1AEA5E5801760A03F0383D018A1E00632C545C537F3B2C7B13F40475ABA1A161E7B0228CD113A0E80130C642C5CB9DA300A96FF97CFEBFC24AF0073D018A1E00632C54A6A1A161C72449C6EB09EA565801760D03F09D7A02143D00C658A8B8A6767A19F5AD50287C279FCFDFAE2740D103608C858A97BBFF086DAC9EA06E8550B947580946EB0950F4001863A132AE5B82C1B7B171CFD06ED513A0E80130C6426542A8FCCFB0ECDDAD27A8E79560EF7C3E3F4A4F80A207C0180B9571414CAC04F9FCF7C24A708B9E00450F8031162A532814760975F55D7A827A1E7CF70BED663D018A1E00632C54C69D16B01224494358096ED213A0E80130C64265DC6901C1320803F0F57A02143D00C658A878B9DB3DB4FFD513D4AD7C3EDF14B2E5757A02143D00C658A8B8A6760B3FEA7EF01D14DA483D018A1E00632C54264992EF8670799B9EA09E5782216100BE464F80A207C0180B152F77EE0D4F7DCBE7F3FB877079959E00450F8031162AAEA9F70ACBDEEFF504F53CF81E18DA157A02143D00C658A84C92247B8770394A4F50CF83EFC1A15DAE2740D103608C858A97BB7D42FB9D9EA06E254972483E9FBF544F80A207C0180B9509F5F4F7C2B2778B9EA09E57821F8495E0177A02143D00C658A84C9224FB86BAFAFFE909EA79F03D2CB49FE90950F4001863A1E2E56EBFD06ED613D4AD24498EC8E7F323F404287A008CB15099504FE7425DFD5B3D413DAF04478695E07FF404287A008CB150F172970FED463D413DAF043F0AED423D018A1E00632C54269FCF37264972839EA06E8515E098B0229CAF2740D103608C858A6BEA242C7BD7EB09EA560895C785F5E05C3D018A1E00632C54BCDC1542FB8D9EA09E83E509612538474F80A207C0180B15D7D44D49925CA727A8E7C177586867EA0950F4001863A1322154368765EFD77A827A1E7CFF3BB4D3F504287A008CB150F1723728B4917A82BA95CFE77F9224C9A97A02143D00C658A8B8A61E1C6AEA6BF504F53CF89E12DA703D018A1E00632C542684CA2161D9BB464F50CF83EF69A19DAC2740D103608C858A97BB96D0AED613D4AD2449CEC8E7F327E90950F4001863A132A19EDE3FD4D557E909EA79F03D2BAC0427EA0950F4001863A1E2E5EE80D0AED413D4F34A704E68C7EB0950F4001863A13249921C94CFE77FA527A8E795E0DCB0121CA72740D103608C858A97BB8343BB5C4F50B742A83C3F84CB63F404287A008CB150F1723734B4CBF404F5BC125C18DA8FF404287A008CB1509924490EC9E7F397EA09EA7925F89FB0121CA92740D103608C858A97BBEF87F64B3D41DD0AA17244089747E80950F4001863A1E29AFA0761D9FB859EA09E07DF9F8576989E00450F8031162A9324C9A1215CFE5C4F50CF83EF2FE216163D018A1E00632C54BCDC1D1677D8E809EA7925B82C5EC54A4F80A207C0180B95C9E7F3878765EF123D413DAF04BF8A3774D513D06B05CEE858E4ACA14DD353008225B52B5EB3245EBB444F50CF83EF95A11DA027A0D7D6B16D437BB3B3601926A23DF4148060494D2F773F0CED623D413DAF045787D6A227A057D7B33B3B099653060E1CF81EBD04205852BBE2EDFBE26DFCF404752BAC00D7861561B09E805E2D72B6ED28588675706F3D04205852F3CBDD8F42BB504F50CF2BC1AF4361DBAC27A0D7D7B5F6CEB59C666F25806049EDCBE7F347879AFA023D413D0FBEBF09ADA027A0D7D7B5D5CEB5746E25806049FF1042E531615E3F5F4F50CF2BC10D612568D413D0FBC2BA36CADE4A00C1927EB9DC1D1BDA797A827A5E096E0AE1B2414F409F04CBAF959D5BB9AB1E01102CE93773FC71616E3F574F50CF83EFCDA1EDA727A0CFD6B9E2B996F656020896F41F2154FE3884CB9FEA09EA79F0BD25AC04DFD31354BB344DDF3367CE9C9BA74E9DFAF6B871E3D23163C6687DDCC68E1D9B4E9C38F1F9D05CF00B102C61D5E5EEF8D0CED113D4AD78CE97DB1D500B62A89C346952BA78F1E2F4F5D75FD7D6515BB264497AEFBDF7BE1442A6231D00C112FE56539F106AEAB3F504F53CF8DE1ADA9E7A826A17F7540A9555132E5F1F3366CC0C4B252058C2FF09A1F2C4B0EC9DA527A8E7C177B45B1E500BE2E1AF425DF5B4102CDFB454028225B42E77C3423B534F50B742A8BCBD50287C474F50EDE2397E025D55054B851B2058C2DF6AEA93922439434F50CF2BC15D6E7B407F0A96AFBCB8309D33EDEAF4B1B1A7155B7C1EBF270C0A96806009BDB8DC9D1CDA697A827A5E09EE0EC1F23FF504FD21582E5FB6209DFE8793D33FDF7EDC2A2D7E2FBE26100A96806009BD219FCFFF24D4D4A7EA09EA79F01D1BDA7FE809FA43B09CF7D86DAB85CAACCD7F6CB4402858028225F4D672373CB453F404752B4992F10D0D0D3BEA09FA43B09C71CF4F3B0C96F1358150B004044BE8A5E5EE94182EF504F5BC124C08E1F2DB7A82FE102CA78F39A5C360195F1308054B40B084DE100F838D87C3EA09EA79F09D18DA37F50482A5265802822554BCDC9D162FE0A327A8E795E0BE8686866FE809FA43B08C5781ED2858C6D70442C112102CA19796BBD343FB6F3D413DAF04F72749B2839EA03F04CB59937FD661B08CAF098482252058426F88F7B08CF7B2D413D4F3E03B35B4EDF504FD21582E5DF0683AFDEEE1AB1F061BBE175F1308054B40B0845E5AEECE0C6D989EA09E578207F2F9FC767A82FE102C637BEAC191AB05CBF83D6150B004044BE8C5E5EEAC24494ED413D4F34AF060A150F8AA9EA05F04CB952BD359F7FF72F5C360C3F7E26B02A160090896D01B42A83C3B9FCF9FA027A8E7C1F74FA17D454F50EBC172F9B205E9CCC99774788E657C2DBE4728142C01C1127A61B93B27B4E3F504F5BC123C92CFE7BFAC27A8D960B97265BA70D6F8F42F770DEB3054662DBE27BED7DE4BC112102CA1272549726EA8A98FD313D4ADB0023CDAD4D4F42F7A825A0C966BDA4B69EFA560090896D047CBDD79A11DAB27A8E795607A92245FD013D462B0ECCA5ECACEF65E0A8882252058424FC8E7F3E7879AFA183D413D0FBE8F8715E1737A825A0C969586CAAC098882252058424F08A1F28250531FAD27A8E7C1F7AF6125D84A4F508BC152132C01044BAA64B9BB30B41FE909EA79259895CBE53EA327102C35C112102CA132F97CFEA224498ED213D4F3E03BBB50287C5A4F20586A82252058426542A8FC9F102E8FD413D4F3E0FB54685BE809044B4DB004044BA878B9BB38B41FEA09EA7925782697CB7D4A4F20586A822520584265F2F9FC8824498ED013D4F3E03BAFA9A9E9137A02C152132C01C1122A5EEE2E09E1F2703D413DAF040B42FBB89E40B0D4044B40B0848A97BB9F8576989EA09E578285B95CEE637A02C152132C01C1122A93CFE77F9E24C9A17A827A1E7C9F1B3468D047F50482A5265802822554BCDCFD32B4EFEB09EA7925589224C9C67A02C152132C01C1122A93CFE72F0D35F5217A827A1E7C97E672B90FEB09044B4DB004044BA878B9BB2CB4A17A827ADEBAB2ACA5A5E5837A02C152132C01C1122A5EEE2E0FED603D413DAF042F353535FD839E40B0D4044B40B084CAE4F3F95F254972909EA09E07DFE5B95CEEFD7A826A3070E0C0F7089682258060490D2E77578476A09EA09E578257BFFBDDEFFE9D9E605D4B92A4391603A1ED27580A9600822535B6DC5D19DA017A827A5E0956B6B4B4BC4F4FB0AEE472B9CF1C7BECB1F73DF9E4938B9E7FFEF9B1871F7EF88361B9BCA4ED722958D65EB00C9FE3B6F97C7E94A51C102CE9EF9224B92ACC79FBEB09EA79F07D63E8D0A1EBEB09FA5A3CEC75D0A0413FB9E5965B9E7FEBADB756A47FB3ECF6DB6FBFBBB9B9796A0C9D8265ED05CB1828431B1DDA9B0A3C40B0A44E96BBAB436BD113D4F34AF05628DED7D313F4A52449FEFDA73FFDE99C175E78E1F9B4032FBFFCF213279C70C282ECD058C1B2FA8365DB4099354B3C20585207CBDD35A1BE19A227A8E795E09DF0F02E3D415F88B7B639EAA8A3AEFBD39FFED461A06CE3CDBBEFBE7BC1C1071F7CE95D77DD25D05569B0CCE7F35F8B87BCB60D9482252058522F42A8BC36CC8583F504753DF8C67019DADBA5A2F08D78DE65682BE2857D427B25AC282FC7DB92C47B5E86C717427B3EB425A13D17DAA2D09E0D2DEE599A17DADCD09E09EDA9D0E684F66468B342FB6BF83D4F84C7C7C3E363E1F12FE1F73D1A1E1F098F0F87C787428BE7D63D10DA1F439B12DAFDA1DD17DAA4F033F786C709E1717C781C171EC784C7BBC3CFDE151EEF0C8FB787C7FF0D8FB785C75B4B45EEEFC2E3FF0B8F37877653683786767D68BF09EDD7A18D8C83403C74211E171FAFE6152F151D6F701B1E2F0D8FBF088F3F8FE7FB85C711E13DFF131E2F0A8F1784C7F3C3E3B9E1F1A7E1F1ECF09EB3C2E319E1F1F4F0786A783C25BCF693F07872783C293C0E0B8F2784C7E3C3E371E1F1D8F0787478FC51783C323CFE303C1E1E1E0F0B8F3F088FDF8F37D98DF7438A57188B2783C7E3F6E396B03868C50BDD84C7A6F09884C7C6F0D0101E73E171DFF0F8BDF0B87778DC2B3C7E373CEE512814BE131E770B8FBB84C7FF6A6868D839FCCEFF088F3B86C781E1F15BE1F19BE1F11BE1F1EB312884C7EDC3E376A5F3E4B6098F5F098F5F0EBFF34BE1F18BE1F10BE1F173E1F1B3E171ABF0BBFF393CFE5378FC742E97DB323C6E1E1E3FD5D4D4F489F0F88FCDCDCD5B5F76D965E98A152BDE4ABBE9E5975F7EE997BFFC653A77EE5CA1AE8A8265477B28DBB678BE6C5806368C170A1B3468D0DFC72B51EFB9E79E1F88B73A0ACF378A2D6E7408CBCC87C2F30F0F1E3CF82361B9DA383CDF24B6F0331F0D5F6F1A9E7F2C2C479B85DFF9F1B84CC5652BB6F0F527E3B21697B9F07C8BD2F2F7E9D8E232190FA92E2D9F5B85E75B9796D9CFC516BEFE7C6959FE62F85DFF525ABEBF1C5BF8997F2D2DF7DB84E75F2DAD0BDB85E7FF165B691DF95AF8991DE27A13D79FB8373EAE4BA5F5E95BE1EB6F97D6B11DC3F39DE27A575AF7760E5FFF675C1FE37A199EEF5A5A47BF135B78CFEE71DD8DEB7078BE67697DDE3BB6F0F53EA5F57CDFB847BFB4EE3784E7F9D84A6342129E174AE344BC30D6A0D84AE3C79078B8561C53E2D812C7987889FCD84A63CED0F0FC90380EC5F1283C3F34B6D2F87478787E4469CC3A323C3F2A8E63A5B1ECE8F0F531A5F1EDB8F0FCC7A531EF84D8C2D72796C6C23826FE77697CFC4969AC1C1EC7CDD2F8795A692C8D63EA99A5765669AC3DA734EE9E1B9E9F175B693CBE203CBFB03446FF4F787E711CB7638B6378683F2B8DE7BF08ED97718C2F8DF3F186E69797C6FE7845C72B4BF3C1D5A5764D699E1819E78DF0FCBAD21C12E792EBC3D73794E6969BC2F3DFC6F926CE3BA5B9E796D23C14E7A3DF97E6A6DB4AEBCCE8D29C15E7AE3B4AF3589CCFFE506A7797E6B9B1A5392FCE7DF7C479B03417C63971629C1F4BF3E4E4D29C797F69FE9C5A9A4BE39C3AAD34BF3E546A7F2ACDBB8F84F6E7D25CFC97529B5E9AA31F0F6D4669DEFE6B68334B6D56695E9F5D9AE3E35CFF7469DE7FA65403C45A607EA92E88F5C1C2525B54AA1B16976A88584B2C2DD5152F946A8C1763BD51AA3B96C71AA4D4623DF25AA9368935CAEBA57AE5CD527BAB54C7BC638316EBB0A68EE3C4203D41BD7BD729A79CF2EE78CE5B3CDF72B7DD76DB201682591198158059E197157D59B197157A5981575EDC65455D56D065855C56C465C55B56B865455B56AC65855A56A065C55956946505595688654558567C658557567465C5565668B529B00E2C1556C5A22A2BA8B2422A2BA2B2E2292B9CB282292B96B222292B90B2E2282B8AB282282B84B222282B7EB2C2272B78B262A74D919315385961532C6AB262262B64B222262B5EB2C2252B58B262A5AC48C90A94AC30C98A926231921522590192151F658547567094171B5991F1ECF0E1C397CD9B37EF9DEE06CB65CB96A523468C28160BD51A2E972C59120B99F4E69B6F4E5F7DF5D574F3CD374F77DA69A734AC2FC576EBADB7165F6FFB73F17BE79C734E875F5779B0EC6A5B512A0A5F2D1589CBB30D56A542F2C5B20D574BCB365E2D2EB56C23D6C2B20D59F34BCB56F906ADA7CB366ACD2EB56CE3D6CCB20D5C334ACB6EB6A16B7AD9C6AE3F9796F36CA3D79FCA367C4D2BDBF8F5C7D23A926D049B9C6D082BAD4B13B30D62A575ACB851AC1414C6661BC7E2FA986D202BADA3B7671BCA4AEB6E716359697D1E956D342BADE7C50D67A540936D3CBBB134261437A295C6895F970A9E6C63DA35651BD4AECC36AA95C2D5E5651BD77E996D602B85B29F651BDAE298956D6C8BE358692C2B6E742B8D6FC50D6FA531EFEC6C035C692C2C6E842B8D8FA7661BE3E2B8996D902B8DA5C58D72B195C6D8E2C6B9D2B85BDC40175B693C2E6EA82B8DD1C58D7571DC2E8DDDC58D76A5F1BCB8E12E8EF1A5F05CDC80571AFB5B37E2C57921B66C635E69BE286ED02BCD2149B661AF34B71437EE95E69B7DB38D7CA579A8B8A1AF34371537F6C516E7AC6CA35F691E2B6EF88B2DCE6FD906C0D29C57DC0818E7C1D25C58DC18589A1F8B1B04E39C195BB661B0349716370E96E6D76DB28D84A579B7B8A1B034177F31DB60589AA38B1B0D4BF37671C3616CA5F9BC7503629CEBB38D88B1C51A20DB9818EB82581FC40D42B1C57A21D60D716351AC21622D113724C5BA22B65863C48D4CB1DE887547DC00156B90D8623D12374EC5DA24D628E1F97B63BD12EB96D8E2293DB18E19E0082CD6ED1ECBEBE218A12700FA48C889EF993C79F25D2B57AE7CBB2BA1F2FEFBEF5F70E08107BEF2939FFC247DFAE9A7AB3A6C3DF0C003E9669B6D16F7CA1603E2E38F3F5E7CBCE4924B5A4363F6DEEDB6DBAE356C5E75D555E9C61B6F9C3EF8E083C5AF77DF7DF7D6D7E2EFA8F643614B05F0948E82A5A51E80FEAE743443414F00F4B11B6EB861BFD9B367BFD651A07CF6D967579E7EFAE98BE35E8AB825BBD62EDE1343E1C891238B8F03070E4C274D9AB44AB09C356B563A6AD4A8D660B9C30E3BA4A3478F4EAFBBEEBAD69FBFE9A69B6AEAE23D71AF4B698F9D600940BD05CB781459A22700D68178A8530857F7AF58B1E2CD2C50BEF1C61BEFFCFEF7BF9FB7FFFEFB0F89873865EFADE660397FFEFCE21EC60D37DCB01820B36078E9A597B606C7B8D7B23C58C6F79F7CF2C9AD0174BDF5D64B43902E06B6C9932717BF1FC3672DDE6EA4B4077392600940BD88A721C4C3E3F504C03A74DA69A7B5C4301582D4E2CB2FBFBCDDF313AA7D8F6576F8EB2DB7DCD21A2CE31EC9B67B31B3E74F3DF55471EF64FCDE17BFF8C562D08CDF5FBA7469F17B219CD5EC7D2CCB26D9B807738A251C80FEAE749E7B5E4F00AC63E57B276B3158B60D93F1F9F5D75F5F0C8CF1BCCB458B16AD122CB7DF7EFBF4F6DB6F2F7E2FEEF1DC6AABAD8A87C25E73CD35AD17028A2DFE5CAD064B00A8A360192FA4D8A02700AA5CAD04CBE9D3A7A72FBDF452EB61B0D91EC8F8FD2C58CE9B37AF78E5D8183AE3A1A2F171CB2DB74C0F3DF4D0E2F3B8D733BE77DCB87135BDC71200EA45E9EAFC393D012058F648B08C81F2B39FFD6CEBC57AE20578E2633CF475409BDB8DC4C367A74C99527CCCAE021B1FE3F996D9457C044B00A87EA5FBA6EFA7270004CB1E0996F150D6F818F748C6C7679E7926BDFBEEBB573BC7B2FC671E79E49162A08CF7BEAC95ABDE0A9600F037F1DEC2F11EB67A0240B05CEBB67CF9F2F489279E281EF65AFEFDECFE94F1DE95EDDDC73286D1E1C38717EF6579D2492715BF9F05D478BEA5600900D5ADB1B1F196102EBFA7270004CB3EBF8A6C2DFFFB054B00582558FE2EB47DF4048060A909960050917C3E3F2A4992BDF5048060A90996005091C6C6C65B43DB534F0008969A60090015C9E7F3B72549F25D3D0120586A82250054A4B1B1717408977BE80900C152132C01A0D260F9BFA1EDAE2700044B4DB004808AE4F3F9DB0B85C277F4048060A90996005091C6C6C63B42B8DC4D4F0008969A6009009506CB3B9324D9554F0008969A60090015C9E7F377150A855DF4048060A90996005091C6C6C63F8470F95F7A0240B0D4044B00A83458DE9D24C97FEA0900C152132C01A02221548E696868D8594F0008969A60090015696C6C1C17C2E54E7A0240B0D4044B00A8480895E31B1A1A76D4130082A526580240451A1B1BEF096DA09E00102C35C112002A0D96139224F9B69E00102C35C112002A1242E5BD0D0D0DDFD2130082A526580240451A1B1B2786F64D3D0120586A822500541A2C272549F2EF7A0240B0D4044B00A83458DED7D0D0F00D3D0120586A822500541A2C2787F6753D0120586A822500541A2CEF4F9264073D0120586A822500541A2CA7E4F3F9AFE90900C152132C01A0D2603935B4EDF5048060A90996005069B07C209FCF6FA72700AADCB871E304BAEA692B42B07CD3520900ADC1725A68DBEA09802A3771E2C4858B172F16EAAAA02D58B0E0C6102C67582A01A035583E582814BEAA2700AADCF8F1E3F79A3061C28BCF3DF7DC6BC2DDBADB531943E5D8B1639F096D3F4B2500B406CB87F2F9FC367A02A0068430B3C7983163A6C5C330E3397EB5D8468D1A95D6EABFBDD4EF33844A00582D58FE29B4AFE809007ADD73CF3DB7EF881123D230F16CA13700A0FFC8E7F30F170A857FD51300F4AA344DDFF7C20B2F2C0BD2A14387FEAF1E0180FEA3B1B1F191102EBFAC2700E855F3E6CDFB755A72FFFDF72F4892646FBD0200FD2658FE39CCED5FD21300F49A575E79E5CB6FBFFDF63B699933CF3C735E4B4BCB07F50E00D4BE7C3EFF685353D3BFE809007ACDA2458BE6A46DBCF8E28B8BC20474B1DE0180DAD7D8D8F897102EBFA82700E81573E7CE3D39EDC0A851A316B9993200F48B60393D49922FE809007A5CC88E1F5BB972E51B1D05CB77DE79E7F51FFDE8478F0E1C38F03D7A0B006A5708958FE572B9CFEB09007ADCFCF9F3A7A46B3067CE9C7961323A4A6F0140ED6A6C6C9C11E6F3CFEA09007ADCE4C993D7942BD3152B564C089351DAD2D2F23E3D0600B52984CA2772B9DCD67A02801EF7939FFCE4B0CE0E858DB972D8B06137D9630900B5ADB1B1F1AFF97C7E2B3D0140AFB8F1C61BFFDA51AA7CF2C9272F0D13D114E7580240CD07CB998542E19FF50400BD2297CB7D2604C815ED5CB8677A5353D374578505807E112C67C5395F4F00D06BCE3BEFBC4B42907CBB3C585E71C51557E6F3F98BF40E00F48B60F96498D7FF494F00D06BE2A1AE77DD75D7E22C54BEF8E28BD7C72D9B2D2D2D1FD43B00D02F82E5EC42A1F0693D0140AF3AFCF0C3775AB66CD9CAD0D2A143878E4D92646FBD0200FD2658CEC9E5725BEA09007ADD65975D76E7881123D27C3E3F4A6F0040BF0A964F85B6859E00A0D7C5435FE33D2B9DDC0F00FD2E583E5D281436D71300F4D5C493EA0500E877F3FB33B95CEE537A0200C11200A8747E9F1BDA27F5040082250050E9FC3E3F97CBFDA39E0040B004002A9DDF1784F6713D0180600900543ABF3FDBDCDCBC999E0040B004002A9DDF17E672B98FE90900044B00A0D2F97D5192249BEA0900044B00A0D2F9FDB94183067D544F002058020095CEEF8B73B9DC267A0200C11200A8747E5F9224C9C67A0200C11200A8747E7F7EF0E0C11FD1130008960040A5F3FBD25C2EF7613D0180600900543ABFBF5028143EA42700102C01808AE4F3F9652D2D2D1FD4130008960040A5F3FB4B4D4D4DFFA02700102C01808A2449F2F29E7BEEF9013D0180600900543ABF2FCFE572EFD7130008960040A5F3FB2B83060DFA7B3D0180600900543ABFBFFADDEF7EF7EFF4040082250050E9FCFE5A2E97DB504F002058020095CEEF2B5A5A5ADEA72700102C01804AE7F795BBEDB6DB067A0200C11200A8747E7F3D97CBBD574F002058020095CEEF6F0C1D3A747D3D0180600900543ABFBF3970E0C0F7E80900044B00A0D2F9FDED534E39E5DD7A0200C11200A8747E7F273CBC4B4F0020580200E677006A63E2D1344DD334ADFF35550E00000000000000000000000000000000000000000000000000000000000000B04EFD7F52A9DA10FF9FDF790000000049454E44AE426082, 1);
-INSERT INTO `act_ge_bytearray` VALUES ('247539', 1, 'var-userLeave', NULL, 0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665000000000000000102000F4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000675736572496471007E00024C0008757365724E616D6571007E000278707372000E6A6176612E7574696C2E44617465686A81014B5974190300007870770800000163F9E00C007874002061346137343362666665393731316537623437323230316130363863363438327371007E0006770800000163FEF2E18C78737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000037371007E0006770800000163FF066800787400203266643739336364643964333432663862303335333063383566326233303533737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787400043230313874000CE6B58BE8AF95E8AFB7E581877070707071007E00087400037A786D, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('247541', 1, 'hist.var-userLeave', NULL, 0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665000000000000000102000F4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000675736572496471007E00024C0008757365724E616D6571007E000278707372000E6A6176612E7574696C2E44617465686A81014B5974190300007870770800000163F9E00C007874002061346137343362666665393731316537623437323230316130363863363438327371007E0006770800000163FEF2E18C78737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000037371007E0006770800000163FF066800787400203266643739336364643964333432663862303335333063383566326233303533737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787400043230313874000CE6B58BE8AF95E8AFB7E581877070707071007E00087400037A786D, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('247542', 1, 'hist.detail.var-userLeave', NULL, 0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665000000000000000102000F4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000675736572496471007E00024C0008757365724E616D6571007E000278707372000E6A6176612E7574696C2E44617465686A81014B5974190300007870770800000163F9E00C007874002061346137343362666665393731316537623437323230316130363863363438327371007E0006770800000163FEF2E18C78737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000037371007E0006770800000163FF066800787400203266643739336364643964333432663862303335333063383566326233303533737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787400043230313874000CE6B58BE8AF95E8AFB7E581877070707071007E00087400037A786D, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('247554', 1, 'var-userLeave', NULL, 0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665000000000000000102000F4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000675736572496471007E00024C0008757365724E616D6571007E000278707372000E6A6176612E7574696C2E44617465686A81014B5974190300007870770800000163F9E00C007874002061346137343362666665393731316537623437323230316130363863363438327371007E0006770800000163FEF7CF0278737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000037371007E0006770800000164042CC400787400203765393832666139393863303434386538306231353832346333303439633562737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787400043230313874000CE6B58BE8AF95E8AFB7E581877070707071007E00087400037A786D, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('247556', 1, 'hist.var-userLeave', NULL, 0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665000000000000000102000F4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000675736572496471007E00024C0008757365724E616D6571007E000278707372000E6A6176612E7574696C2E44617465686A81014B5974190300007870770800000163F9E00C007874002061346137343362666665393731316537623437323230316130363863363438327371007E0006770800000163FEF7CF0278737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000037371007E0006770800000164042CC400787400203765393832666139393863303434386538306231353832346333303439633562737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787400043230313874000CE6B58BE8AF95E8AFB7E581877070707071007E00087400037A786D, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('247557', 1, 'hist.detail.var-userLeave', NULL, 0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665000000000000000102000F4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000675736572496471007E00024C0008757365724E616D6571007E000278707372000E6A6176612E7574696C2E44617465686A81014B5974190300007870770800000163F9E00C007874002061346137343362666665393731316537623437323230316130363863363438327371007E0006770800000163FEF7CF0278737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000037371007E0006770800000164042CC400787400203765393832666139393863303434386538306231353832346333303439633562737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787400043230313874000CE6B58BE8AF95E8AFB7E581877070707071007E00087400037A786D, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('302553', 1, '请假流程.bpmn20.xml', '302552', 0x3C3F786D6C2076657273696F6E3D27312E302720656E636F64696E673D275554462D38273F3E0A3C646566696E6974696F6E7320786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C2220786D6C6E733A7873693D22687474703A2F2F7777772E77332E6F72672F323030312F584D4C536368656D612D696E7374616E63652220786D6C6E733A7873643D22687474703A2F2F7777772E77332E6F72672F323030312F584D4C536368656D612220786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E2220786D6C6E733A62706D6E64693D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F44492220786D6C6E733A6F6D6764633D22687474703A2F2F7777772E6F6D672E6F72672F737065632F44442F32303130303532342F44432220786D6C6E733A6F6D6764693D22687474703A2F2F7777772E6F6D672E6F72672F737065632F44442F32303130303532342F44492220747970654C616E67756167653D22687474703A2F2F7777772E77332E6F72672F323030312F584D4C536368656D61222065787072657373696F6E4C616E67756167653D22687474703A2F2F7777772E77332E6F72672F313939392F585061746822207461726765744E616D6573706163653D22687474703A2F2F7777772E61637469766974692E6F72672F70726F63657373646566223E0A20203C70726F636573732069643D2270726F636573735F6C6561766522206E616D653D22E8AFB7E58187E6B581E7A88B2220697345786563757461626C653D2274727565223E0A202020203C73746172744576656E742069643D22737461727422206E616D653D227374617274222F3E0A202020203C757365725461736B2069643D22757365723122206E616D653D22E7BB8FE79086E5AEA1E689B9222061637469766974693A61737369676E65653D223062373632356665646161303565383566323832343836653163396339316239222061637469766974693A63616E64696461746547726F7570733D226533343665393633363834383463386661376632313763653535306130313836222F3E0A202020203C73657175656E6365466C6F772069643D227369642D30443235384332342D314631392D343233332D413937362D4130443843423944414541432220736F757263655265663D22737461727422207461726765745265663D227573657231222F3E0A202020203C757365725461736B2069643D22757365723222206E616D653D22E4BABAE4BA8BE5AEA1E689B9222061637469766974693A61737369676E65653D223938623035316230333638316465363032383939336135643134616339336362222F3E0A202020203C6578636C7573697665476174657761792069643D227369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831222F3E0A202020203C73657175656E6365466C6F772069643D227369642D33334642463234452D464537302D343730412D394442352D3942313838314531333834372220736F757263655265663D22757365723222207461726765745265663D227369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831222F3E0A202020203C6578636C7573697665476174657761792069643D227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535222F3E0A202020203C757365725461736B2069643D227573657222206E616D653D22E8B083E695B4222F3E0A202020203C656E644576656E742069643D22656E6422206E616D653D22656E64222F3E0A202020203C73657175656E6365466C6F772069643D227369642D34373638373538312D333535422D343335342D383433432D43333034323333323836414622206E616D653D22E5908CE6848F2220736F757263655265663D227369642D35353636443037362D414234432D344134322D393938462D32353337373839463831383122207461726765745265663D22656E64223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D46423539344242452D383030352D344544432D423343382D39373831454432323643393522206E616D653D22E4B88DE5908CE6848F2220736F757263655265663D227369642D35353636443037362D414234432D344134322D393938462D32353337373839463831383122207461726765745265663D2275736572223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D66616C73657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D39394343413337462D413233352D343835332D383437322D44453233334144324544333222206E616D653D22E9878DE696B0E794B3E8AFB72220736F757263655265663D227573657222207461726765745265663D227573657231223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C6578636C7573697665476174657761792069643D227369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733222F3E0A202020203C73657175656E6365466C6F772069643D227369642D30344339463239412D304242352D343639312D383034432D37363445344530413237313622206E616D653D22E58F96E6B688E8AFB7E581872220736F757263655265663D227573657222207461726765745265663D22656E64223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D66616C73657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D30413541464638362D414541342D343231322D423146342D3932373541343430364332442220736F757263655265663D22757365723122207461726765745265663D227369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733222F3E0A202020203C73657175656E6365466C6F772069643D227369642D37463032463244352D413642412D343233342D413732342D3346383938443233354134422220736F757263655265663D226368696C6422207461726765745265663D227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535222F3E0A202020203C73756250726F636573732069643D226368696C6422206E616D653D2273756250726F63657373223E0A2020202020203C73746172744576656E742069643D22737374617274222F3E0A2020202020203C757365725461736B2069643D22616C6C6D616E6167657222206E616D653D22E680BBE7BB8FE79086E5AEA1E689B9222061637469766974693A61737369676E65653D226438313861633661383663663161363464323138346266303639396436376138222F3E0A2020202020203C6578636C7573697665476174657761792069643D227369642D31434331333342322D343442312D343833302D394335392D374433353634433933334641222F3E0A2020202020203C656E644576656E742069643D227369642D46363844434341302D463741342D343444342D394534342D353641363832443837454341222F3E0A2020202020203C656E644576656E742069643D227369642D36393442374132412D393841442D343530442D383146452D313135424335363237354244222F3E0A2020202020203C73657175656E6365466C6F772069643D227369642D33453941414432332D343444412D344138352D383242442D4436433833304134433439382220736F757263655265663D2273737461727422207461726765745265663D22616C6C6D616E61676572222F3E0A2020202020203C73657175656E6365466C6F772069643D227369642D41323335414337362D354242452D344133382D383243342D31304545383141463834363522206E616D653D22E5908CE6848F2220736F757263655265663D227369642D31434331333342322D343442312D343833302D394335392D37443335363443393333464122207461726765745265663D227369642D46363844434341302D463741342D343444342D394534342D353641363832443837454341223E0A20202020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A2020202020203C2F73657175656E6365466C6F773E0A2020202020203C73657175656E6365466C6F772069643D227369642D44413934353339452D463639342D343041312D424534412D42434343314439424431314422206E616D653D22E4B88DE5908CE6848F2220736F757263655265663D227369642D31434331333342322D343442312D343833302D394335392D37443335363443393333464122207461726765745265663D227369642D36393442374132412D393841442D343530442D383146452D313135424335363237354244223E0A20202020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D66616C73657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A2020202020203C2F73657175656E6365466C6F773E0A2020202020203C73657175656E6365466C6F772069643D227369642D34454238313431392D314141372D343937452D413545452D4535414546313743354530422220736F757263655265663D22616C6C6D616E6167657222207461726765745265663D227369642D31434331333342322D343442312D343833302D394335392D374433353634433933334641222F3E0A202020203C2F73756250726F636573733E0A202020203C73657175656E6365466C6F772069643D227369642D41453541454438342D303734362D343738372D393836462D36413739323743333443333422206E616D653D22E5908CE6848F2220736F757263655265663D227369642D42453337324431342D463530392D344544422D383745382D37423231303738333541453522207461726765745265663D227573657232223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D35313046453036322D433042432D343643382D394231372D38413338303732413242433622206E616D653D22E4B88DE5908CE6848F2220736F757263655265663D227369642D42453337324431342D463530392D344544422D383745382D37423231303738333541453522207461726765745265663D2275736572223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D66616C73657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D38344442433035362D303639312D343733452D383243462D44333235454637333641373222206E616D653D22E4B88DE5908CE6848F2220736F757263655265663D227369642D39353037343945412D344242362D343237362D423637412D44453033453334413035373322207461726765745265663D227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D66616C73657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D30443039333043392D394241312D344636382D383545412D33383445313642343039413022206E616D653D22E5908CE6848F2220736F757263655265663D227369642D39353037343945412D344242362D343237362D423637412D44453033453334413035373322207461726765745265663D226368696C64223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A20203C2F70726F636573733E0A20203C62706D6E64693A42504D4E4469616772616D2069643D2242504D4E4469616772616D5F70726F636573735F6C65617665223E0A202020203C62706D6E64693A42504D4E506C616E652062706D6E456C656D656E743D2270726F636573735F6C65617665222069643D2242504D4E506C616E655F70726F636573735F6C65617665223E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227374617274222069643D2242504D4E53686170655F7374617274223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2233302E30222077696474683D2233302E302220783D2233302E302220793D223232382E37303337303339393831383338222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227573657231222069643D2242504D4E53686170655F7573657231223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2238302E30222077696474683D2239392E39393939393939393939393939342220783D223132302E302220793D223230332E37303337303339393831383338222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227573657232222069643D2242504D4E53686170655F7573657232223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2237392E3939393939393939393939393937222077696474683D2239392E39393939393939393939393938392220783D223531302E30393038383236333634343631372220793D223230332E3730333730333130343131343233222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831222069643D2242504D4E53686170655F7369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2234302E30222077696474683D2234302E302220783D223731352E353435343431333138323233312220793D223232332E37303337303339393831383338222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535222069643D2242504D4E53686170655F7369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2234302E30222077696474683D2234302E302220783D223337302E353435343431333138323233312220793D223232332E37303337303339393831383338222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D2275736572222069643D2242504D4E53686170655F75736572223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2238302E30222077696474683D223130302E30303030303030303030303032332220783D223334302E3534353434313331383232332220793D223336382E37303337303636343732373932222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D22656E64222069643D2242504D4E53686170655F656E64223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2232382E30222077696474683D2232382E302220783D223838302E353435343431333138323233322220793D223232392E37303337303339393831383338222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733222069643D2242504D4E53686170655F7369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2234302E30222077696474683D2234302E302220783D223236342E39393939393939393939393939342220793D223232332E37303337303339393831383338222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D226368696C64222069643D2242504D4E53686170655F6368696C64223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D223137322E3130323038303930333236363038222077696474683D223431312E36303837323832303738373235362220783D223138342E37343130373732313432383638362220793D22312E34323130383534373135323032303034452D3134222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D22737374617274222069643D2242504D4E53686170655F737374617274223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2233302E30222077696474683D2233302E302220783D223230332E32353935393536373832393732352220793D2237312E3035313034303435313633333034222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D22616C6C6D616E61676572222069643D2242504D4E53686170655F616C6C6D616E61676572223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2238302E30222077696474683D2239392E39393939393939393939393939372220783D223237342E37343130373732313432383638362220793D2234362E3035313034303435313633333034222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227369642D31434331333342322D343442312D343833302D394335392D374433353634433933334641222069643D2242504D4E53686170655F7369642D31434331333342322D343442312D343833302D394335392D374433353634433933334641223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2234302E30222077696474683D2234302E302220783D223431392E37343130373732313432383638362220793D2236362E3035313034303435313633333034222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227369642D46363844434341302D463741342D343444342D394534342D353641363832443837454341222069643D2242504D4E53686170655F7369642D46363844434341302D463741342D343444342D394534342D353641363832443837454341223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2232382E30222077696474683D2232382E302220783D223530342E37343130373732313432383638362220793D2237322E3035313034303435313633333036222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227369642D36393442374132412D393841442D343530442D383146452D313135424335363237354244222069643D2242504D4E53686170655F7369642D36393442374132412D393841442D343530442D383146452D313135424335363237354244223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2232382E303030303030303030303030303134222077696474683D2232382E302220783D223432352E37343130373732313432383638362220793D223133352E30222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D30344339463239412D304242352D343639312D383034432D373634453445304132373136222069643D2242504D4E456467655F7369642D30344339463239412D304242352D343639312D383034432D373634453445304132373136223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E35343534343133313832323331342220793D223434382E37303337303636343732373932222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E35343534343133313832323331342220793D223439342E37303337303636343732373932222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223839342E353435343431333138323233322220793D223439342E37303337303636343732373932222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223839342E353435343431333138323233322220793D223235372E37303337303339393831383338222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D38344442433035362D303639312D343733452D383243462D443332354546373336413732222069643D2242504D4E456467655F7369642D38344442433035362D303639312D343733452D383243462D443332354546373336413732223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223330342E353930383639353736373134332220793D223234342E3131323833343432313436393437222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223337302E363430313837323338373936332220793D223234332E373938343439393138373537222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D41323335414337362D354242452D344133382D383243342D313045453831414638343635222069643D2242504D4E456467655F7369642D41323335414337362D354242452D344133382D383243342D313045453831414638343635223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223435392E333632383732303836303831372220793D2238362E3432393234353537393833383138222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223530342E373431333631313932383236322220793D2238362E3134303231303631373337343835222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D35313046453036322D433042432D343643382D394231372D384133383037324132424336222069643D2242504D4E456467655F7369642D35313046453036322D433042432D343643382D394231372D384133383037324132424336223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E393837353134343839383930352220793D223236332E32363136333038323635313634222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E36363730323138363333373736372220793D223336382E37303337303636343732373932222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D30443235384332342D314631392D343233332D413937362D413044384342394441454143222069643D2242504D4E456467655F7369642D30443235384332342D314631392D343233332D413937362D413044384342394441454143223E0A20202020202020203C6F6D6764693A776179706F696E7420783D2236302E302220793D223234332E37303337303339393831383338222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223132302E302220793D223234332E37303337303339393831383338222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D34454238313431392D314141372D343937452D413545452D453541454631374335453042222069643D2242504D4E456467655F7369642D34454238313431392D314141372D343937452D413545452D453541454631374335453042223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223337342E37343130373732313432383638362220793D2238362E3236373439303636383038333235222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223432302E31353431323036393235343737342220793D2238362E3436343038333932393839333932222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D33334642463234452D464537302D343730412D394442352D394231383831453133383437222069643D2242504D4E456467655F7369642D33334642463234452D464537302D343730412D394442352D394231383831453133383437223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223631302E3039303838323633363434362220793D223234332E3834353738353439363831313337222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223731352E393838343436343031363631392220793D223234342E3134363730393038313632323632222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D34373638373538312D333535422D343335342D383433432D433330343233333238364146222069643D2242504D4E456467655F7369642D34373638373538312D333535422D343335342D383433432D433330343233333238364146223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223735352E313035353637393030353031362220793D223234342E3134333537373431353930353333222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223838302E3534353531303937373036392220793D223234332E3734373836373831363239343733222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D44413934353339452D463639342D343041312D424534412D424343433144394244313144222069643D2242504D4E456467655F7369642D44413934353339452D463639342D343041312D424534412D424343433144394244313144223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223434302E303837373235313633333532342220793D223130352E3730343339323530323536373534222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223433392E383533313635313630393039322220793D223133352E3030303434383731313033393938222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D30443039333043392D394241312D344636382D383545412D333834453136423430394130222069643D2242504D4E456467655F7369642D30443039333043392D394241312D344636382D383545412D333834453136423430394130223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223238342E32343236393939353539333433372220793D223232342E34363130303430343232343934222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223139332E34393435373938303736303230372220793D223137322E3130323038303930333236363038222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D37463032463244352D413642412D343233342D413732342D334638393844323335413442222069643D2242504D4E456467655F7369642D37463032463244352D413642412D343233342D413732342D334638393844323335413442223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E35343534343133313832323331342220793D223137322E3130323038303930333236363038222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E353435343431333138323233312220793D223232332E3730333730333939383138333738222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D39394343413337462D413233352D343835332D383437322D444532333341443245443332222069643D2242504D4E456467655F7369642D39394343413337462D413233352D343835332D383437322D444532333341443245443332223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223334302E3534353434313331383232332220793D223430382E37303337303636343732373933222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223136392E39393939393939393939393939372220793D223430382E37303337303636343732373933222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223136392E39393939393939393939393939372220793D223238332E37303337303339393831383338222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D46423539344242452D383030352D344544432D423343382D393738314544323236433935222069643D2242504D4E456467655F7369642D46423539344242452D383030352D344544432D423343382D393738314544323236433935223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223733362E303435343431333138323233312220793D223236332E32303337303339393831383338222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223733362E303435343431333138323233312220793D223430382E37303337303636343732373932222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223434302E35343534343133313832323332352220793D223430382E3730333730363634373237393236222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D41453541454438342D303734362D343738372D393836462D364137393237433334433334222069643D2242504D4E456467655F7369642D41453541454438342D303734362D343738372D393836462D364137393237433334433334223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223431302E31303138303630343037373735352220793D223234342E3134373333393237353632393338222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223531302E30393038383236333634343631372220793D223234332E3835313539323539373636343134222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D30413541464638362D414541342D343231322D423146342D393237354134343036433244222069643D2242504D4E456467655F7369642D30413541464638362D414541342D343231322D423146342D393237354134343036433244223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223231392E39393939393939393939393939342220793D223234332E393230313534323134363334222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223236352E343133303433343738323630382220793D223234342E31313637343734373634343437222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D33453941414432332D343444412D344138352D383242442D443643383330413443343938222069643D2242504D4E456467655F7369642D33453941414432332D343444412D344138352D383242442D443643383330413443343938223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223233332E32353935393536373832393732352220793D2238362E3035313034303435313633333034222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223237342E37343130373732313432383638362220793D2238362E3035313034303435313633333034222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A202020203C2F62706D6E64693A42504D4E506C616E653E0A20203C2F62706D6E64693A42504D4E4469616772616D3E0A3C2F646566696E6974696F6E733E, 0);
-INSERT INTO `act_ge_bytearray` VALUES ('302554', 1, '请假流程.process_leave.png', '302552', 0x89504E470D0A1A0A0000000D4948445200000396000001F80806000000316A727D000062194944415478DAECDD097C54D5FDFF7F5CEBBFF5E752BF55DBAAB5D65A977EADD6B57611BFB5162B5AA424933B4920ECC862485804110822A8280209680111152C8A451414902433804650401417108CB2C85264515C5204BDFFF3B9B967B8339949662699C9CCDCD7D3C779CC649604CFDC39E7BCEF39F7DE162D80CC77FCB5D75E3BFBDC73CFFD5ADD3729140A8542698A72D65967FDF7861B6E582CFD0C5D2D0000191E2ACF38E38C8D37DD74D3772B57AE346B6A6A4C00001AEBE0C183E63BEFBC63B66BD7CE3CEDB4D33E215C020090C18E3BEEB87B6EBCF1C6830C81000089D2B66DDB43279D74D2787A5D00003237586E90994A00001265DDBA75E6F1C71FBF9D5E170080CCC5F257004042C9B2D816B5C75D0200804C0D960000241AC112000082250000044B0000D03CC1D21E48983939398CAA0080600900000896F10F26CE38E38C3A8FB76FDF3E103C8F39E618F3B2CB2E33DF7BEF3D465F0040B004000004CBE882A5F3B96FBFFDD6BCF3CE3BCD162CCD050082250000C8DC60F9AF7FFDCB3CFBECB3CDA38E3A2A30D328BA74E962DDBFFEFAEBCD03070E043DA70713BD7AF5322FB8E002EB7E595959D860D9AF5FBFC0FB9CBFE7D1471F0DFA9DBB76ED32FFF18F7F041EEBD3A78FF57AEDF3CF3F37F3F2F202CFCF9D3B37F09CBCF7C61B6F0C3C273F37F4FFD7D07300008225000004CBD806050DCE4ACE9E3DDBFAF98D37DE087A9F84C701030604FD8E9FFCE42781E72FBAE822F3EDB7DF0EFB3777EFDE5DE731B94C8A04C3D07F57B76EDDAC9FB76FDF6E85CAD090AB7F1E3D7A74C4E762F97F0700102C0100205846E9934F3E092C579599BB2D5BB6840D963ACC39836568E80CF7BE480391534F3DB5CE63575E7965E0E770BFF357BFFA55D8DF77CD35D70442626858ACEFFFAFBEE70000044B00000896718834DB27B392F7DC738F757FD5AA557566FB64D96AACC1F2C4134F0C3B7B2817DC9665AFA101512F83DDBB77AFF5FC934F3E19F6DF2925D2C98242FFFFA27D0E0040B004008060598F9B6EBA2910CC4E3FFD7473E6CC9981E72444EAE7E4184A67D8935B79AD7EACBABADA7ADC7956D82FBEF822E86FC9CFA1338BFA384A59FE7AEBADB7061E2F2C2CB496C53A67175BB66C59E7EF899D3B779A7FFDEB5F03CF2D5BB62CAAFFBFFA9E0300102C01002058020040B0040000044B0000C1120000102C0100044B000040B004008060090000C112000082250000205802000896000080600900205802000082250000044B000008960000102C010000C1120040B0040000044B0000C1120000102C0100044B000040B0040080600900000896000082250000205802000896000080600900205802000082250000044B000040B00400102C010000C1120040B0040000044B0000C1120000102C01002058020040B004008060090000089600008225000020580200089600008060090000C112000082250000044B000040B00400102C010000C1120040B0040000044B0000C19260090000C11200008225000020580200089600008060999E0EAAFFE67C38C79C5F35DF5C5CB1D82C2F2FA724B1489D2F5CBAD07C7FC3FB6C8C00C1120000102CD39384CA05CB169853374F35C7EF1D4F69863279EB64F365FFCBE6860D1BD82001822500002058A61F99A92454A646B8ACACAC648304089600008060997E642926C12E358A2C8D0540B004000004CBB42361865047B004089600008060898407CB29DBC79A152B869A2BCB075945EECB630442822540B0040000044B826514A1F24173F5A281E6DB2F0D082AF2983C4728245802044B000040B02458D65BE6BD35A24EA8D465FE5B77130A099600C1120000102C0996F5079EE5958323064B798E5048B00408960000806049B0ACB7AC5C7C47C46029CF110A099600C1120000102C0996044B822540B0040000044B243058960F8A1C2CD5738442822540B0040000044B8265BD65D9B2211183A53C4728245802044B000040B02458D65B6654DF67AE7AB9EE7258794C9E2314122C01822500002058122C1B0E3D2B86D50996F21881906009102C010000C19260D960E099B067BCB9E4D5BBEA044B794C9E2314122C01822500002058122C239629DB1F6CF0184B790DC1906009102C010000C1926059679672CE7BF7986B160E8C182A7591D7C86B99BD245802044B000040B0245846354BC9EC25C11220580200008225EA0D96D1CC52D6377B4948245836C6A64D9BA804102C010000C132DD8365BCA152174222C1325E23478EB406F9720B102C010000C1328D83258560D91CEEBFFF7EF388238E302FBDF452EB76D8B0617C4141B0040000044B82258560195BA8D46152662C8F3CF248C22508960000806049B0A4102C630F950D3D0E102C010000C1926049215806C8CC647DE1513FCF31972058020080B409969B376F3667CE9C698E1E3DDAECD3A78F59505060E6E4E498F9F9F966CF9E3DCDE1C3879B53A74E353FFEF86382258560D944A1B2A1D0C8CC6578D5D5D5E6B871E3ACB6292F2FCF340CC36AAFA4E4E6E69A3D7AF430C78C1963BD0E044B0000089649307FFE7CB3A4A4C4ECDBB7AF3979F26473C58A15E6B66DDBCC9A9A1AEB79B9DDB56B97B97AF56AF389279EB05E77C71D77984F3EF924C19242B06CC4F2D7686722637D7D269B356B96D9A54B9740888CA674EEDCD99C366D1A099260090000C13211366CD86005CA01030658A1F1D0A14351BFF7ADB7DE32EFBCF34E2B64AE5DBB9660492158C6182A639D81747BB85CBF7EBDD9B56BD798026568E9D8B1635AB757044B00009072C172EEDCB9D6523199AD8C2550865AB4689135D84BD7D94B8225C1321D42A5DB97C54E9F3E3D68A9AB5EEE7AEFBDF79A3E9FCFDCB2658BB97FFF7EEBB55F7DF595B5E2A2AAAACA5A2A2B4BF99DEF93DFC3EC25C11200008265138529398652662C9BC2A64D9BCC5EBD7A998F3EFA28C19242B08CA0A113F524FBF7A48BD9B367D70994722CB82CCF8FC6BE7DFBACD7CBFB9CBFE7E1871F2651122C01002058C66BCE9C3956A88C7650162DF97D72120D99592058520896E1C360532D6375CBCCA5B427CE30585C5C6CCD4EC643DE27CBFE9DBF8F994B8225000004CB387CF0C10766F7EEDD9B6CA632DCCC65A74E9DCC356BD6102C2904CB9010A843E5B7DF7E6B9D7C466E6311FABE4C3FE6528EA9742E7F95B352EBE5AEF19265B2A3468D0A5A169B4EED15C1120000A444B01C326488754C6522C9319772EC26C19242B0AC3BB328A1F0BCF3CEB306F2721B6DB88CF4BE4C0E97CE33BFCA4C656343A5335C3A672EE5843E044B8225000004CB283DFFFCF3D660EA9B6FBE49F820A5A8A8286D9698112C0996C90A953A2CD983F8A8C3A53354EAD2AD5BB73ACB6C336959AC5C52C4794C65BCCB5FEB5B16EB3CE6D2ED4B6209960000102CA376D75D775997144906399DFF6DB7DD46B0A4B83658460A7BE142627DE132DAD767DA3197CED94A39F14EA2C3ABDB672D09960000102CA3F2F1C71F5B27EC69CC65456225CB61E518A9E61E9C2E5EBC986049B04CE836142954465A9E1A6D588C3584A6CBB2D886EAB4BABA3A68B672CF9E3D09F977C8D9629D972269EEF68A60090000523E58CA6540927D2990C71E7BCC1C33664CB30E96F4805106B2959595044B826542B6A178C25D43A131D650E9FCFB471E79644ACF5C3654A772ED49FD9A44B721C9FC5B044B000090F6C1B2A4A4C45CB1624552072AB2EC562E3F920A03585DBA76ED5A67A6846049B06CEC3614EF72D448E1F1E0C1837185CA8696E1A64B9D4ABBA19F5BB2644942FF2D55555581BF2567CC265802000082653DE478C71D3B762475A022D7B5CCCBCB4BA901AC73A6440F64099604CBC66E43F184CAFAC2E5B1C71E1B77A86CECBF2715EA54DA0DFD58539FB427D4B66DDB027FCBEBF5122C010000C1B23EEDDBB7376B6A6A923A5091BF27D7884BC501AC73A6846049B06CEC3624A531212E5CB86C4CA88C75596EAAD5A9B334D5254622914B8F38FF1EC1120000102C1B18C8A5FA00B2B90AC132F582653A6C37BAB46DDBD61A94FFEA57BF6AD4774596BF86CE54CACFF278635C7AE9A5D6EF4AA73A4D76D02358122C010020584649CE7CC88CE5E1D2A1430773F6ECD9E6810307121A2C4BDE29317BCFEF1DF8593ED39B87DF1CF6B5BD5EE8653DFFD0AE87CC1E737A98577AAF34BB3DD3CDBCA8D545E655B95735E9BF4BFECEADA36E6DF0357F2EFCB375BFD3139DCC71BBC7051EEF30AD83EB672C9DDB5043678165C632B63A65C69260090000523458CA49299AE3184BB954402A0D609D61404BF48CA57C8EFD7CFDCC31DBC658F78B2B8B23BEAEEDBD6DAD60A9439C7EFC86FE37047E1EFDD168F3BC6BCFB342A704BC9F5FF973F3B27697593FEB30DA7E6A7BF398E38E09BCA7EFCB7D839E3FF1F413CD5F5CF30BEBBE942E4F75314F39FB943AFF1EEF246FE0BEFC4E7D5F82A65B8365B86D88632C6BF52DF599031F596A8E98FE5AC432FFB56AEB755D074D8858A71C6349B0040000291A2C070E1C98F4B3C22E5FBEBCD9CFB2A8078C050505D6C5D043C3402283E5909543ACC076FC8F8EB7C2DBD1DF3BDAFAF9F4F34FB702A4F3B55D67750DCC6CCAE7FE97E2BF04EEFFE6E6DFD4F9DD123EE53999D9D4AFCB7D24D7BA95F02881F3E4334E0E0A89CE30283FB71EDA3AF0F351C71C1508AF23DE1B61FD7BE535E7FEE15C2B50CAFDA16F0E0DBC77F0EB83ADDB760FB4734DB0AC6F1B8A778630D3CE0A2B81F1B197DE89EA753D4A1E0BAAD39D7BBF32074F5E6695821EFD382B2CC1120000A462B02C2B2B33A74E9D9AD481CAA449939AFDBA7091669792112C7BCEED6905B6D0C78F3BE138F3E2D617077ED6214D42A7737652EECBEF904028F70B1716D699519400A8EF4B9095DB82E905E6A80F4759F7477E30D27A7EECCEB1E6ED2FDD1E98A194E7AECEBFDABA2FC155C268B81954E78CE509A79E1058AE2BB39B320BEA8619CB68B6A178660A13751DCB279F7CB2D9AE632981F1AD8DFF3117BCFE719D59CA992FBF673DBF7EF3EEDA99CD092FD6A953FDFFD66D7019D7B12458020080540C96D5D5D5668F1E3DCC43870E256DA0D2B1634773FDFAF5293FA06AEE60294B64255CCA72D9332F39D30A88F21AF959BFE6EE75775B033F99D97C60C703817028C12F6B6C9675BFF38CCE11672C753894D7848652F977CADF0B172C65C672E02B0303CB79F5E3F237DDB214361E0DCD18461B1A630D973AD40E1A34A859FEBF75B03C70E06083AF1B3AEDD5C0CF4BDEDC6C963CF69A552484DEFEE03CD330BC56D893E5F47BF6EC49C8BF77DFBE7DD6F1E73A58A6437B45B0040000CD1A2C459F3E7DCCD5AB57276590F2C61B6F58C1321D243258CA67F8872E7FB0C29E3EBE511EBBAED7757596CDCA73121A25C8C971987A76512FA3D5B3877A06527E8FCC20EAB0A7672965C6529E1FF6F6B03A41F19CABCFA9336329C75B86CEA0CA497BE4354699113694BAE918CB78459AB98C352C46FBFAE60E953A30CEF6AD0FDC1FFCCF6541C7554E7B716DD860596307D1E232BF39C87E4FFBAE7D02816FE6CC9909F9F7CA325CFD37D2A5BD2258020080660F9632882A2C2C4CCAACA51CAB346DDA345707CBBB56DD65151DC66E1A7293755F02DF3D1BEEA913FAA41495175927EE9163281B0A71CE594709983A30CA6CE505D75F5067796BB4C1524E0E2467B36D11B2D4D6192CF5F2DDD0FF0F8265DD99CBD065A95DBA748979796BB870D9AD5BB7A867489B2B58FE7BC90741CFE9E32F438365B8F73B439FCC5A36F5497CE4F7C9EFD57F235DDA2B8225000068F660691DBBA406A32FBCF042420728322094BDFFD11E939689C1528E6D94B0274B5B5BDED6D29A89D4414C429B2C91BDA6C33575DE27814DCEF81AE9A43BCEF2FD93BE6FFD7E39D6517EBF7EBDCC58469A410D174AE5A43C3A00D7778CA5FCDBF4B25839C18F044DE7D96B0996F52F8BD527F47186C4584EC813E97DA97449918682E553E5EB1A0C96FD27F9AD194E6BD6B24BAF40F02B2E2E6EB24B8FC82546060C1810345B992EED15C1120000A444B0946388E44C8C1B366C48C8E0E4A38F3EB26601D6AC59933603AAA60E96F76FBD3F705911097F57E45C11F4BCF3B21DCEE327E56CB112D89CD7B094C72FF9FB2581FB1222F56CE2A9E79E6A2D7F9520AA2F3FD2C23EC652DF9713023534DB195A6419AD5E6A9B3F393F68465582A4DCDE38F8C63A9741215846BF2C5642A1ECE489F51222A1EF6BECF533131D2CFB4D5A12B414564EEA134BB01C5CF6A269E41E3E0672F8F0E18D0E97122A478D1A15F89D72ADDD746AAF08960000202582A5983E7DBAB51C4FAE33D99476EEDC699D0823DD969425F23A9672B21D1DCAE458CBDF77FA7D60F62FD27BA2990594E017CBEB63099652F4196A9D27EC719E4C285125538365B870998865B6A9162C9F5BB631E8B97FBEF076BDC1B272F516EBB223424268F1C425567BE5BC8EA8CC5CC6BB2C56DEE79CA964092CC11200008265234D9E3CD9ECD4A993F9C1071F34C9EFDBB871A3152A478F1E9D7603AA44064B0AC13211E1B2A9436A22826543AF0B0D96CF541C0EA4231F7F2D70FFAEA9AF5AED554E8E1174CCA59CD047CEEA1A0D799D2CD1771E5329251DDB2B8225000048A960A9672EF3F2F2CC7FFFFBDF8D3AA18F0CD8BC5EAF35F84B47044B8265323576F96AAA2D7F0D0D8C53E7BD1DF6B9CFBF3A600E7C64A9351329AF9BF8DCE1E5A79B77EEB71E7B7FD39EA06331777F5E1358F6DB7DD894A070A903A65C7B72C99225D66CA45E262BCB5DB76DDB6656555599A5A5A5D6F27FE7FB64F96BBAB657044B00009072C152C831975DBB76B5CEE2BA6AD5AA98DEBB62C50AEB782F39F1453A1FA344B024583657B88C75C631954ED41329583E5DB92EE2F3727D4B798D94D0F7C9352CAD1D5E0BDE09BC46CAE819CBCD11D3ABACFBABDF7EC75AC6EF0C89B196746FAF08960000202583A53663C60C6BC0267BF6EFBBEF3EF395575E313FF9E413B3A6A6C67AFEEBAFBF3677ECD861CD003CF8E08366FBF6EDAD019AECF54FF7B329122C0996E9B02C365597BF3607DD5EC51A2833A1BD2258020080940E965A7575B53976EC58B367CF9E758E4792E5AE32B3294BCF64A63353102C0996A91E2E9F7CF249EB7583060D2201B9BCBD2258020080B408966E44B02458A6C2B2D848CB5BF5D95F099520580200008225C19242B08C79E692E5AF20580200008225C19242B08C3B5C122A41B0040000044B822585601977B8BCF4D24B099520580200008225C19242B08C8F1C5329DF7D39010D40B0040000044B8225856019974D9B36112C41B0040000044B82258560D938044B102C010000C19260492158122C41B0040000044B8225856049B004C1120000102C41B02458122C0182250000044B102C0996044B80600900000896044B0AC1926009822500002058122C29044B8225089600008060098225C1926009102C01002058826049B0245802044B000040B02458520896044B102C010000C19260492158122C41B0040000044B102C0996044B8060090000C112044B8225C11220580200008225C19242B0245882600900000896044B0AC13211C1B262E52673C4F42ABBBC6695F9AF55078AF3B1BEA53EB3A8D41FF43BE4B1818F2C0DBC2E5CD1EF7D70D6CA7AFF3D2BDEDD6EBD6EE7DEAFF87008960000806089508B2B1613EA089629192C6B0E1C0CFB9C04BCFE939634F83BE4758FBDF44E54AF1B3AEDD5A0C724400E9EBCCC2ACE007AD7D4576BEF97F9AC9F41B0040000044B280B972D34A76E9E4AB06BE6327BD36CB3B2B2920DB281A5B095ABB758816EC99B9BA30A8C6F6DFC8FB9E0F58FEBCC52CE7CF93DEBF9F59B775BB7231F7FADCEFBBFFDF6DBC0EFF9E70B6F5BF73FDCBAD7FA79F11B9B825E03822500002058BADAC6EA8DE6CBFE970997CD1C2A2B2A2BCC0D1B36B8721BECDEBDBB1524EB2B1D3A74300F1C386885BA6897A4EA607920C2CC67A4194B09AD258FBD66153D3B59A45EA3672D6569AE5E8E2B3F1797F9694808960000806089EAEA6AD3E7F3594B3129C92F3253E9D65029962D5BD660B09C3D7B7660E650CF34F69FE437EF7BEAF57A03E36CDFFAC0FDC1FF0C5ED63AEDC5B56183A55E822B817190FD9ED019CF221536CBFEFD268D07C1120000102C01A48AAE5DBB460C95050505E6538BDFB102608D3D6B39755EEDD254098EF2F3FB9BF634182CFFBDE483A0E7F4F197E18EB10C7D7FB8E7E4F84B102C010000C112401ACC5A8E7A648E15E4F67D511308753A580A39DE511E7BE05F6FC4142C9F2A5FD760B0945951E719689D339EF7CE5CC10747B0040000044B00A924DCB19685E3CBCD810F2FA913F89CC152CC78F9DD3A3397A1C1B2DFA42541C1504EEA43B004C11200008225800C9DB5340CAF15DE463D32376CE00B0D96424ED453DF8CE573CB36063DA7CFF41A2958CA1968F549822484164F3C1C70E5ECB09FECFA920F8D60090000089600524D8F1E3D42CE047B206CB0D4A1B03EF51D2319FABAD060F94CC5E140AA2F45A2AF63293EFFEA8039EFD50FADC70898044B000040B0049042E40CB93A583EF7DC731183E023CFBF1555600C37B3A983E1C047965A3391F2BA89CFAD093CB779E7FEC0B25AE7B198BB3FAF09BAB6A5044A799FDC07C1120000102C01A4107DAC65B8D9CA5867229FAE5C17F179E7753143DF27D7B014D317BC13788D94D133965BD7B194FB124EE577481005C1120000102C013413B986EAB871E3CC9E3D7B9A797979A661188119CBDCDC5C6B69EC983163ACD701044B000040B00410306BD62CB34B972E112F3112AE74EEDCD99C366D1A9507822500002058026EB67EFD7AB36BD7AE3105CAD0D2B1634773EDDAB5542608960000806009B8CDF4E9D38396BAEAE5AEF7DE7BAFE9F3F9CC2D5BB698FBF7D71EAFF8D5575F99DBB66D33ABAAAAACA5B2F9F9F941EF93DFC3EC2508960000806009B8C8ECD9B3EB04CA9933679ABB76ED8AEAFDFBF6EDB35E2FEF73FE9E871F7E98CA05C1120000102C0137CC543AC3607171B1353B190F79DF800103827E1F33972058020000822590C1E4984AE7F2D7E1C3870796BBC64B96C98E1A352A6859EC9A356BA86C102C010000C112C844CE33BFCA4C656343A5335C3A672EE5843E00C1120000102C810C239714711E5319EFF2D748E4F7398FB964492C0896000080600964F06CA59C7827D1E195594B102C010000C112C820D5D5D541B3957BF6EC49C8DF91B3C53A2F4522C77402044B000040B00432805C7B5287BD3163C664CCDF02C1120000102C012449CF9E3D03616FC9922509FD5B55555581BFD5BD7B772A1F044B000040B00432415E5E5E20EC35F5497B426DDBB62DF0B7BC5E2F950F8225000020580299C079EDCAA6BAC4482472E911FDB7A400044B000040B0043240B2831EC112044B000040B00498B164C612044B000040B0047018C75882600900000896001A85B3C282600900000896001A85EB5882600900000896001AA5BABA3A10F6727373CD3D7BF624E4EFECDBB7CFCCCFCF0FFCADF5EBD753F9205802000082259029BA74E912087C3367CE4CC8DF98356B56E06F74ECD8914A07C1120000102C814CE20C7D326BD9D427F191DF27BF57FF8D69D3A651E92058020000822590693A77EE1C087EC5C5C54D76E911B9C4C880010382662B0F1C3840858360090000089640A691631E9DD7B41C3E7C78A3C3A584CA51A346057EA7FCFE356BD650D92058020000822590A9A64F9F1E08817AE632DE65B1F23EE74C254B6041B0040000044BC025264F9E1C1406E5D84839A18F9CD5351AF23A3966D3794CA594D1A34753B920580200008225E0D6994B1D30E5DA934B962CB16623F5325959EEBA6DDB36B3AAAACA2C2D2D350B0A0A82DE27CB5F25AC02044B000040B0045C468EB9745E86249E2227EAE1984A102C010000C11270B9193366C41C302550CA2C25677F05C1120000102C01045457579B63C78E357BF6EC59E7F849AFD76B76EFDEDD5A2A2B339D00C1120000102C0100044B000040B00400102C010000C1120000822500006E0A963535358C7800000973F0E0418225000099EC88238E78F7F5D75FFF8A610F002051DE7FFFFDFF1E75D4511FD1EB020090B94A2EBCF0C2F719F6000012E5D24B2F7D57F537F7D2E5020090B98E5765E5CF7EF6B355555555DB65B91200008D25FDC9DAB56B3FF9F5AF7FBD46F533EBECFE0600006478B82CB13B7E9342A1345CE41A90D40385527F39E288233E54B70F102A01000050AFACACACE355C87A4095831E8FE72B757BBB1BFEBFED6009000000008857CB962D8F360CA3AF0A585B2564D9658F7AEA08822500000000A0A150D54E95771C815297675C5407044B0000000088555656D6B92A50CD0F132875E94FB00400000000846518469E1C47594FA8945240B00400000000D417A66409ECC79182A5C7E3B99A600900000000A8574141C1499196C3CA1962099600000000806883D50C550E3882658DCBFEFF099600000000102FFB243E9FCAD257C330CAED60B99260090000000068504949C9912A542D53E576FD980A98EAC79CE9044B00000000408354882C9460A9EE1EE17CBC65CB9647132C0100000000F5722C81FD85DBEB82600900000000310AB70496600900000000885AA425B0044B00000000408358024BB00400000080B8B104966009000000008DC21258822500000000C48D25B0044B00000000881B4B60099600000000D0282C8125580200000040DC58024BB00400000080B8B104966009000000008DC21258822500000000C48D25B0044B00000000881B4B60099600000000D0282C8125580200000040DC58024BB00400000080B8B104966009000000008DC21258822500000000C48D25B0044B000000348112B3E4E899EB673E3BEFB579DF2EAE586C969797539258A4CE172E59B87BB17F711E5B6392B77D96C0122C41BF40BF000040D390C1C382650BCCA99BA79AE3F78EA7344399BC75B2B968C9A2CF2B2A2ADAB145264FE812D8BEA53EB3B0D4B7BC7082EFA948A56F99BF8DF5BA09BE87EAFBDD85E37D57C9EBFA942EFB11C112F40B14FA050040C6933DD20C1E9ABF4CD932E5407979F93AB6C8E408B704D60E960DCE5ECAEB5479DEF99804C8BE65BEA5529C01B46FA97F817DFF4B553E2358827E8142BF0000C848B2E4860E3C358A1A401C648B4CBC484B60AD6039BEE2E2C289FED6A1B39445137CDDE4F9E28915E7C96DD184CA19E17EEFE180EABF43EE178DAB38A7F6F5FE56CED7102C41BF40A15F00006414399E83CE3B6506100CD49320D2596075B02C29997D6C7DEF0F9DB12C9E50715D51A97FB6147B76727F51A96F6F60D96C59E52CEB7E6016D3B7956009FA050AFD0200C095038829DBC79A152B869A2BCB075945EECB6374FC0C20D2497D6781B542DF84CA7C4778F4072F6BADEC1B2E58964CF71F673FBE4D05CAAA70C7651696FA76A8E0393293EA926049BF40BF40BF0000404C038829DB1F34572F1A68BEFDD280A0228FC97374FE0C20D241436781AD1B2C2B0DE773FAF8CB70C75886BE3FCC739FC9F197044BD02F50E8170000AE1D40CC7B6B449DC1832EF3DFBA9BCE9F01445A88B40436EA6059E6EFDC60B02CAD5C6BCD50863993AC0A96930996A05FA0D02F00005C3B80585E3938E200429EA3F3670091EAEA5B021B3958FAD6075D6264A2BF35C1926049BF40BF40BF0000409C0388958BEF88388090E7E8FC1940A4B28696C0460A9685657E8FF3397DA6D748C1B2A8D47FBDBE6EA584501524AB03CFC9D961C72DFB31C112F40B14FA050000030806100C20D250434B60C305CB065F17122C8B26F83BE8E7F4A548F4752CE57ECF49FEE3D5CF6DADC7322460122CE917E817E8170000886D00513E28F200423D47E7CF00225545B304362458F60FF79C04C3A252DF2A6B26D25AD6EA1FAE9F2B9EB4F44C79AC5F99FF7CE7B198B73DFCCAC9CE6B5B4AA094F7C9FD340C91F32548365056B2C5D12FD02FD02F00001840442CCB960D89388090E7E8FC1940A4A26897C03A8365515965C7C8BF6FF6B1F66CA559E77DA5FED972BFB0B4B2B77E8D7526D8D2CAA9D6752CD5CF124EE57748104DC36079B92A07EB0B962ABCB766ABA35FA05FA05F0000308088586654DF67AE7AB9EEB227794C9EA3F36700918AA25D028BA8C3E5C27A82E5F2962D5B1E4D2DD12FD02FD02F00001840D4DFB9AD18566700218FD1F133804845B12C8145D4C1F2F248C1D2308C36D410FD02FD02FD0200800144BD65C29EF1E69257EFAA338090C7E4393A7F0610A924D625B088295C863BD67225B395F40BF40BF40B00000610F5766A53B63FD8E0B134F21A06000C2052054B60131A2CEB1C6BC9B195F40BF40BF40B0000441C40C81EE739EFDD63AE593830E2E04117798DBC96BDD40C209A1B4B609312DCE7325B49BF40BF40BF00004083038886F646B3979A01442A62096CD282E5D58E632B5B5123F40BF40BF40B0000841D4044B337BABEBDD40C06184034C2498D083C2C814D92ECECEC45122C99ADA45FA05FA05F406AF585009052038878070FBA30186000112799FD32EDDB98B00436B99FD30F7FF8436BC692AAA05FA05FA05F40EAF48500907203080A03886670BD2AFB541967DF467D421896C036CFE764074B4EDC43BF40A15F400AF48500C00082C200E27047AA3B50D94BFB69B41D2A4B60D3E37302FD02857E01B4B100184050184024AB236DE8F1202C814D8FCF09F40B14FA05D0C60260004161009128AD1AE830F5F3618F3361096C7A7C4EA05FA0D02F803616480BB9B9B967783C9EDE1D3A7498979797B7C9EBF57E6D9F0AFFBFEAFE16FB9A6BFDE575D4160308061029D79136D45146DC5BCB12D8F4F89C40BF40A15F006D2C523743A9B1D4B3AA6C54E50B3B43D5A8F2B1AB329461186DBA75EBB6B27BF7EE9F959696EE5DB16285B96DDB36B3A6A6C61472BB6BD72E73F9F2E55BC78E1DFB8E0A9E9FA8CAF1ABF7E5B12931806000D1ACAE8F71EF6B9DD7B304363D3E27D02F50E817401B8BD4CB50AA94DB01D28CB264668652FF6367AB30F97A6161E197AB57AF360F1D3A64464B85CC759D3B77DEA07EC72B323065D36200C100A2D93AD2D671BCEF0BE95059029B1E9F135548BF40A15F006D2C522B43A9B230863019AE644E862A2828C8EFD4A9D3D7F3E6CDFB36964019EAA9A79E7A43A5EE9DCC5E3280600091161D69D0FBAFBDF6DA292C814DFDCFA9054BB6E81728F40BA08D454AF0783C39B2D2CB1912737373CD7BEFBDD7F4F97CE6962D5BCCFDFBF75B39E9ABAFBEB2568156555599E3C68D33F3F3F343C3E517699FA1EEBCF3CE82DB6EBBEDC0860D1BCCA6F0E1871F7E9C9797F789AA982E0C20E8BC1940245C43272788CAF7BFFFFDBFDF72CB2DDF9E75D6595DE92652F7736AC2DF03FA05FA05D0C6D2C6A271A1B2B50A83079D8172E6CC99D62183D1D8B76F9FF57A799F3360A66D86EAD7AF5F4FE59B682B205A3B77EEDC61874BD7CE5C3280600091C48EB44996EEA87079131D6AEA7F4E2DD8AB4EBF40A15F006D2C9A3B54E63843657171B1353B190F79DF80010342C3657A65A86EDDBAFDA26BD7AEDF34D54C65B8994B7B59ECF90C20280C209A5CE8C90664F96A8716B12F630D7D1F2731E07302FD02FD026863696311817D4C6560F9EBF0E1C303CB5DE325CB64478D1A15BA2C367D3254BF7EFD3E9A3F7FBE9948D3A74FAF908351194050184024A4236DEDE810A7A962DAB7D176A891DE4787CAE704FA05FA05D0C6D2C6220CFBCCAF8199CAC6864A67B80C99B94C8F0C3562C488DBFAF7EFFFDD37DF7C63265AFBF6EDD7B971492C0308061049EA485BD87B594D4789A6437576A4BAB4773CCF71267C4EA05FA05F006D2C6D2C8243651BE73195F12E7FAD6F59ACF398CBB4C85083060DDA2E97144986575F7D75A91B672D194030804880481D5CB88EB1BE0E35DCEB1F0DF37A8E33E17302FD02FD026863696371385806662BE5C43B89306BD6ACF499B57CFAE9A7AFE8DDBBF7778DB9AC48ACF2F2F236C97A6406101406108DEE485BC5D04186EB50A3ED48433B549602F139817E817E01B4B170ADDCDCDC33F4097B645671CF9E3D09C94D72B6D8904B91A46E862A2B2B7BFAD1471F3593E99E7BEE91632DFB67CA9E0A55FEC000820144A2B7A1383AB4863AD4583B52E7DFFFD46D7B6BF99C40BF40BF00DA58DA58B649CDE3F1F4D6616FCC983109CD4E729D4B47B04CDD0C3562C4882D2B56AC486AB0F4F97CAFAA4A999F091B9D63CD73B9DAC0AE6600C1002251DB5048471A6D4716A9433D32CE8E34742FB16B3A543E27D02FD02F80369636966DD2F1FCB3FA354B962C496876AAAAAA7206CBD4CD507DFAF439B063C78EA4064BF5F76429ECD64CDAE81C6561B8BD1B0C20184034761B6A11FF711DE13AD40F1AD19136F6DF93D1DF753E27D02FD02F80361699BF4DAA9F37EAE79AFAA43DA1B66DDBE6FC77A46E86EAD0A1C377353535490D965F7FFDF56E55293519BAD105F66E38373E06100C201AB90D3576AF68B80EB5311D696887DACA851D0C9F13E817E817401B4B1BEBD26D52AE2DA91F6BAA4B8CD477E911C7BFA126A52BAD39C8DFCDE48DCEB97743A6CF1940308088771B6AD3A64D85DDE98D6BE49F3A32CCDED90FECC71B639CFDBB4E726307A34B565656C529A79CC2E784B4E817645BB83CFBF2A85FDFED996EE6A9E79E1AD3EFBF75D4AD0DBEE6CF857FB6EE777AA293396EF7B8C0E31DA6752058F2BDA12F44AAB7E58192ACECA44BCA565A41418199EC194BF5F70EC6F261654249F600A2D70BBDACC6F2A15D0F993DE6F430AFF45E690D0C2E6A75917955EE554D3E4049B70144BA6D3FD75E7BAD79ECB1C79A8DD81B5ADF5EDA582E1C1D712FADDBBED3F5153E274AB4A53983E579D79E17F639699FCFBEFC6CABE8BEE3C4D34FB48ADC9792FB48AEF53BEED9708FF59EBE2FF7B51E77BEFE17D7FC22F0FA2E4F75314F39FB943AFF06EF246FE07EFBA9ED03F7A59FA05FA0D01752D2A5306369EBD3A7CF37C93EC672E7CE9D3B32F8184B5D567A3C9ED62D5BB63C5A5E97EC60298D64DB7BDB5AC1528738FDF80DFD6F08FC3CFAA3D1D6E0423A7E09783FBFF2E7E665ED2E0B1A2048677FCC71C704DE9309038874DC86EC8EEB8B168939AE249E0ED5EDC758F23921ADFA85D036F9F81F1D1FF179E93B86BD3DCCBCE0FA0BEA04CBCE333A9BA79D775A9DDFE76CCBE5E7D6435B077E3EEA98A3027DCF88F74658BF475E73EE1FCEB5FA03B93FF4CDA181F70E7E7DB075DBEE8176CC58F2BDA18D454A6E93EAF6438EB10C317AF4E83DC93E2B6C5555D5864C3B2B6C3D0D608B640F20BACEEA6AF69EDF3BD041FFA5F82F81FBBFB9F937610710F29CCC6CEAD7E9BDD1121E25709E7CC6C90C209A791B0ADD2BDA888EF4D116E1CF84174B879AB267C22B2AADBCA1B0AC72965526F89E92D2B7CCDF4697A0C74A7DA62AFF71BE5F1E2B2CF52DD7AFD3A5FBD029A62E1D7A0E92F799A5CFAD7DBEBECFE9AABFB62F94D7F5295DF6233EA7C488F479398BFEACD5FD87EAFB5D85E37D5745F979A55DBF103A2329DBD2D1DF3BBADED74980FCDEF1DFAB132C7F70CA0FEAF42563778E356F7FE9F6C00E46F9FD57E75F6DDD97D74A5F122EDC3A77389E70EA0981D536B273527662B214D6D58378FA42DAE5266B9713B14D7256D8301E7DF4D105C9BE8EE5030F3CB02253AE63E9F890971B86D126420398B401840E69326BD8C2313B29F77BCEED690542B95FB8B0B04E072F03007D7FC8CA21D66DC1F40273D487A3ACFB233F18C900A219B7A138F68E36746DAE682F1C1DEAF216297CEDAE92E9FEE3227574AABC1B6587787B439F93FDFB9E77BE463ABEBE65BEA5523A0EFF57E52F2FB9F6CBDAD7F917D89DA8FCFC199F53930F606E8FE675F57D5EC13B1BEAFDBCD2AE5F082DFD7CFDACEDE8FB277D3F68454B68911D8A524283E54F7FFDD3B03B29E5774A180DED53A4EF39EE84E3C2BE5E76380E7C65A0755FFE5DFAF1ACB1591C63E9DE60495F48BBDCE4ED7222B649AE6319C6EBAFBF9ED5A74F1FF3D0A143490B96050505DB54A59C9D210D617D7BD4923E8018B36D8C152EA5833EF39233AD80281DBAEEB0A5DCBDEE6EABE19499CD07763C10088712FCA433D783831611662C194034CF3614E35ED2682FF81C6B87AA9720B549A7EF6951A9FF7AE9988A27545C17558738BEE2E2C289FED6417B58873CB87196AF7AA2F57B26569C27B745132A67D409B6252547EADFD3EEF6095297FBCEBBA46597DAD7FB5B395FC3E7D4440398309F970C408A26F8BAC5F2791596FAEFB0B6977115E744F8BCD2B25F88747CA5EC6094FBF52D87D5F7254C4AD127F291F785865279EC9CABCFA9B3C35102E9C5AD2F0EDA012AC7DCCB6B8C32236C9FE2F643245C1A2CE90B699713D62E27629BCCCDCD3D43BDC63A6F8CBA6FEED9B32721B969DFBE7D667E7EBE3358A676861A3162C4D7AB57AF4E4AA85CB366CD1E5521AFBAED4B96CC01848449E9CC25344A902BAE2C0ECC2E4A91E54F7AF650CF404A232A3388BA53D7B394326329CFCBB1360C20524EA4BDB5D176A4B176A8FAEFA555475A5232FB587BAF68544B69748728EF8B654FAB84561560674BB1F7AAEE2F2AF5EDBD216FD070796DC1F0994B034B726BDFBB95CFA9E906304DF5790596679555CE0AF379A56DBF10BA0C560E77D06DF02D77DF12F41A3984E1C21B2EB44AB893F7B4BAA395795DAFEB02AB5B62ED17E4D8FE92774AEAAC9471F60B7AF58D3E3910FD02E80B699793D12EC74A2E3DA203DFCC993313929D66CD9AE50C95AFA4FC06307DFAF43103060C48CAAC65F7EEDD3F561F421EC132B17BA3A5149517598308BDD7B9BE10E7ECE02560EA8181CC56CAC91B4297B732804819B2E72E74294E8716B15F9B2B5C87DA3E86BDC2A9DDC195FAEF08EC212DAB7C5FDD7FB8DE8E6E4265BEA3D3F3072FC7A9EC1BAE43D44B70D563DB544758E5DC4BDB71D853BE5F5E7AEDE7BDC72EDAAB3ACC917C4E4DFBF936F5E7A5DF5F58EADBE1F8BCD2BA5F70B6DDCEF67CD0F241412754D3E1538AF38CE20D1D63A957AC84EB53E498FABB56DDD5E02112D217E8552D126EA59FA86FA92EFD02E80B6997532058B6D1A14F662D9BFA243EF2FBE4F73AAEA1991E196AC89021FBE7CF9F9FD050F9FCF3CF6F97D9CA189739102C1B71BCA5F374F2F5054B39D64696CECAB18E32D3A95F2F3396E15ECF0022E53A54E7490C9C1D632C177C8EF4BEB4BDF07351596547E9B8A4B3B23B3AEBB804E9F0E4E77E65FEF31BEE102B8DE0905A7BDC48B8634342DF1FFA39DD36E6C5EFBA8F7EEE1D3EA7440E609AECF392E73E93E37C32A55F6811E1046EB203519EFBE59F7E19B4FC55074C7D9928BD43506629C3B5F391765686165905A357CAE44FCE0FDA21AA67546F1C7C639DB398D32F80BE907639D1ED723C54B6F1EBE0575C5CDC64971E914B8CC8C49F73B6326D32D4DCB973FFDCBD7BF7EF366CD8909050B969D3A643797979BB55D23EDF8D5FB2640D20F4F193A79F7FBA15D89C7B9CE5F14BFE7E49E0BE84483D9B2817BE96E5AF1244F5E547F49E6D7D5F4E08C4002265852E053AC2DECB1AEB69D343DFD72A5D3B52E9C86A97BF2E38C1D151050E7897E334ECC7C6C7D42196F93B37D8219656AE759E81D6B9A7F62FDE0107F89C92388069E4E7A5063093D3BD5F9013AFC909D3E4B8FA48AF919D85D20EEB338AEB223B1AF5D9BCDBDCD326A6101BA95F90A24F30E73CDEDE792E80641782257D216D2CED722382E5D9AA7CAA03E0F0E1C31B1D2E25548E1A35CA192ABF48BB0CF5F8E38F3F2A27F2D9B56B5793864AF97D9D3A75DAE3C625B0CDB567DAB9C7B9A1D748F08BE5F50C20D2A6436D8ABDBF6979C63B396B5C51A96F55988E2EE84C6A4565953D42672EC32CE1591F746AF489FED68DE9103B0C7DF2453EA7440E609AF6F3CA8460492158BA3C5CD2C6D22E279CC7E3C9D127F2D13397F12E8B95F785CC549A699BA19E7CF2C939122E9B6AE672D3A64D66972E5D3E53153EC8CD5F3206100C20D2AC434DCB0B3EEB13F5C812D8081D5D9D5374CB0906EAEB100BCBFC9EA03DADF619EA22758872065A7D9220E93C5507581D784ECE6A376ED98FDDFE3925720093A0CF8B7E817E01F4857041BBDC182A001638C3A51C1B2927F491B3BA467BF65739518FF3984A29699FA1A64E9D3A5185C1EFE498CBC69CD067C18205FFEDD0A1C36752D16EFF923180600091448D5DB293914B7E9C9D59B41D6283AF0BE9108B26F83BE8E7F429D4F5F5B7E47ECF49FEE3D5CF6DE5B19F9D7FA597CFA969073089FCBC123190A15FA05F007D21ED726AB5CB8D253397AAEC730643098A729DCB254B9658B3917A99AC2C77DDB66D9B59555565969696CAE5188302A52C7FCD980C3565CA942B860C19B25BA662DF7AEBAD9802E5DAB56B650AF7B3F6EDDBAF74EB31950C201840A448871AEB5ED68C3D39416D47E71B1C658718F6E2C3D2A1C9125B6B0FAAB51CC73F5C3F573C69E9997A59ADF31892DB1E7EE564E735B9A42394F7C97D3EA7261BC024EBF3A25FA05F007D2132B85D6E0A72CCA5F332247196573232433DF4D04377297B6579ECA38F3E6AAE5CB9D2DCB16387595353638548B9956328257CCA746FAF5EBD6ABA76EDFAAE246C379EFD95010403881412EB129E8C5EF213CB1ED4704B6935E77531EBBCAFD43F5BEE179656F6D6AFB1CE60575A39D5BAFE96FA593A55F91DD281F23935CDE79AE4CF8B7E817E01F485C8D076B98903663B3B601E8C2550BA22433DF1C413973EF0C0034F0C1D3A7463B76EDDBEC8CBCBFBD69EDE3DD4B973E72F54F05CADCA2849E97CA51840308048BB0EF57255BE68C1059FF99C40BF40BF00DA58DA5834199595CE5001B3AFCA48CFAAF2B12A358E20B95595F9AAF42743810104038874D0CAEE285BD5F3FCA774A47C4EA05FA05F006D2C6D2C12CF0E9326AB3BC1008201443A8AB4B796253F7C4EA05FA05F2058D2C6D2C622493C1ECFD57A79AC61181CC70B06100C2032A243A523E57302FD028560491B4B1B8BE406CBB98EA5B02BA9113080600091EE1DEA383A523E27D02F50E81768636963913C2A485E1E7A321F1534D9FEC000820144DA926517FA5217E07302FD02FD02FD026D2C909C60393FCC99605772AC25184030804867275105E9F13949A74335D02F50E817401B8BB40F959747BAF48861189C340A0C2018400009EF88D85EE91728F40BA08D45FA6F6B0BEBB97EE5726A080C201840000C7A40BF40BF00DA58A0BEED2CE26C25C75A820104030880410FE817E817401B0B44B39DCDAF2F54728658308060000130E801FD02FD0268638198E4E7E7FF406D7B5F52136000C1000260D003FA05FA05D0C60271C9CACA3A5E6D7B5F50136000C1000260D003FA05FA05D0C60271B9E5965BFE9F6118FBA909308060000130E801FD02FD02686381B8E4E6E69EA0B6BDCFA909308060000130E801FD02FD02686381B86465659DA8B6BDCFA809308060000130E801FD02FD02686381B81414149CE4F178F651136000C1000260D003FA05FA05D0C60271F17ABD27AB6D6F2F350106100C2000063DA05FA05F006D2C1097ACACAC1FAA6D6F0F350106100C2000063DA05FA05F006D2C1097F6EDDB9FA2B6BDDDD404184030800018F4807E817E01B4B1405C0CC3F81FB5ED7D4A4D800104030880410FE817E817401B0BC4252B2BEB476ADBDB454D800104030880410F1A6D71C562DAE4D42835AA5F38C816491B0B248B6118A7A96D6F27350106100C2000063D68B4054B17EC98BA792AED723397C73E7CEC69D52FAC638BA48D0592252B2BEB74B5EDEDA026C000820104C0A0078D56EE2BFFFBCBFE973F537DC3D7B4CFCDB3A3D1EA132ACA37575454B4638BA48D0592252F2FEFC76ADBDB4E4D800104030880410F9A846A8F5A979797AF949514B24C9F92D42275BE8E3E8136965A40336C773F51651B350106100C2000063D00401B0BC4252B2BEBA76ADBFB849A806B6567675F4F030C30E80100DA58207EB9B9B967A86D6F2B35013737BEAFA8F21D350130E80100DA5820EEEDEE4C55B6501370EB17A0A534BE520CC3F803350230E80100DA58207659595967A96D6F333501B736BC7E47B02CA74600063D00401B0BC4CEEBF5FE4C6D7B9BA809B88E0A92AD74A864D61260D00300B4B140A3B6BBB355F9989A801B37FE574283A52AF3A91980410F00D0C602B1C9CACAFAB9DAF63EA226E0B606B75D98506915AFD77B09350430E80100DA58207A6A0C7D8EDAF6AAA909B8ADC17D2752B0340C6316350430E80100DA58207A595959E7AA6D6F233501D750C1B14DA450A98BC7E3F935350530E80100DA58203A5EAFF7976ADBDB404DC03554685CD350B054E5596A0A60D00300B4B140D463ECF3D4B6F7013501D7320CE37FD497E0536A0260D00300B4B1407CB2B2B27EA5C6D5EBA909B8567E7EFEA9AA01FE0F350130E80100DA58203E2A549EAFB6BD75D4045C2B2F2FEFC7EA4BB09D9A0018F400006D2C101F8FC77381DAF6DEA726E05A5959593F555F824FA80980410F00D0C602718FA92F340CE33D6A026E6E7CCF54650B350130E80100DA58203E2A545EA4B6BD77A909B896D7EBFD99FA126CA22600063D00401B0BC4472ED727D78AA726E05A5959593F575F828FA80980410F00D0C602F1C9CDCDFD5F152ED75213702DF505F8856A803FA42600063D00401B0BC4C7308C8BD5B6F7363501D7F27ABDBF545F820DD404C0A00700686381F8783C9EDFA86DEF2D6A02AEC5C55C01063D00401B0B347ABBBB549537A909B816D7DC0118F400006D2CD0E831F56FD5B6B79A9A806B716A6480410F00D0C6028DE3F57A2F53DBDE2A6A02AEC519AC00063D00401B0B347ABBBB5C9595D4045C8B038D01063D00401B0B347A4C7D85DAF6DEA026E0E6C697038D01063D00401B0B3482D7EBBD526D7BAF531370F39780F5E000831E00A08D051AB7DD5DA5CA0A6A02AEC5B43DC0A00700686381468FA9AF56DBDE726A026EFF12B0770560D00300B4B1409C0CC3F89DDAF65EA326E0E6C6F71A55AAA80980410F00D0C6028CA981B81886F107F52578859A0018F400006D2C109FECECECDFAB6DEF556A026EFE12FC4985CBA5D404C0A00700686381B8B7BB3FAAB28C9A809BBF042D55F1531300831E00A08D05E2C3640D5C4F7D01FE4F35C095D404C0A00700686381B8C7D4D7AA6D6F093501D7CACECEBE5E7D11CAA90980410F00D0C602716F77AC0284BB793C9E1BD497E0656A0248EEA0A7A8B4F286C2B2CA595699E07B4A4ADF327F1B5D821E2BF599AAFCC7F93BE4B1C252DF72FDBA7045BF57DD7FA8BE7F4FE178DF55F2BA3EA5CB7EC4A703806009C42E3B3BFB3AC3307CD4045C4B7D015AA906782135012477D05332DD7F5CB8E7EC10F96E43BFC30E96B747F33A559E773E2601B26F996FA994E0F0EA5F60DFFF5295CFF8A400102C81A8C7D41C5E0677F37ABD7FF3783C2F511340F30F7A8A4AFDD74BC02B9E50715D54C1727CC5C58513FDAD4367298B26F8BA59BF6762C579725B34A17246E8FB4B4A4A8E3C1C50FD77587F7F5CC539B5AFF7B772BE060008964083DBDD9F55A9A026E05A2A54B6565F82F9D404D0BC839E9292D9C7DAB38B512D49D5C152DED7D0EB9C3396125A55809D2DC59E9DDC5F54EADB1B58365B56392BB024B7F6BD5BF9C400102C81FA71DE12D0F8E6E4DCA2CA0BD404D0BC831E3D731898692CAB7C5FDD7FB8DEC038A132DF111EFDC1CB5A2BFB860B967A09AE7A6C9B0A9455E18ECB2C2CF5ED50C173249F14008225101D152AFFA2B6BDC5D404DCFC2568E3F178E6521340F30D7A8ACA2A3B4A0094D06707C6FE56F853C1517EEE57E63FBFE16059690487D4DAE32FC31D6319FAFE30CF7D26C75FF24901205802D1E18498E04BE0F1B4555F8239D404D03C831E0984B5CB5F179CE0087CFD03A17382BF95FDD8F898826599BF7383C1B2B472ADF30CB441339E65BEC97C520008964074BC5EEF5FD5B87A1135013737BEED5479969A00923FE891B3AF1695FA5685098CFD9D8F159555F6089DB90CB314767DD0254626FA5B132C01102C81E4E04A0BE04B6018D9EA4BF00C350124F37BE7B54ED2234B60C306BE906029E4443D615E17089685657E8FF3397DA6D748C152CE40AB4F1224215405C9EAC0737276D871CB7ECC270580600944872B2D8001AEA21AE07F5113406A0C7A9CA1B03EF51D2359E77521C1B26882BF837E4E5F8A445FC752EEF79CE43F5EFDDCD67A8C800980600944B3DDDDA4CA8BD4045CCBE3F1E4AA6C39939A00522758F69DE01B1C65B0EC1FEE390986B2C4D69A89B496B5FA87EBE78A272D3D532FAB751E8B79DBC3AF9CECBCB6A5044A799FDCE7130340B0041A1C5373093FB8BEF1CD57E5496A0248A56019DD4C64B8A5B49AF3BA9875DE57EA9F2DF70B4B2B7BEBD75867822DAD9C6A5DC752FD2CE1547E8704513E3100044BA07E8661DCACC2E53C6A026EFE1274500DF0E3D404C0A00700686381B8B73BAE0D0F77F3783C1D55B87C8C9A0018F400006D2C10F798FAEF6ADB7B9E9A809B1BDFCEAA3C4A4D000C7A00803616888F61186D54B89C4B4DC0CD8D6F5755A6501300831E00A08D05E2DEEE6E55E5396A02AE651846778FC7F34F6A0260D00300B4B1407CD478BAADDAF6E6501370F397E036F52578989A0018F400006D2C101FC330FEA1C6D5FFA626E0E6C6B7972A13A90980410F00D0C602716F77ED5479969A806B1986D1C7E3F194521300831E00A08D05E2A3C6D3596A5C3D9B9A809BBF0485EA4B309E9A0018F400006D2C10F776E751E5696A026EFE1214A9F210350130E80100DA58203E1E8F27C7308C59D4045C4B7D01FAA92FC283D404C0A00700686381B8C7D486DAF6FE454DC0B554A81CA0BE0763A80980410F00D0C602716F775E559EA226E0E66039487D09EEA32600063D00401B0BC43DA6CE350C632635013737BE77AA328A9A0018F400006D2C101F152AF3D4B637839A809B1BDFBB5419494D000C7A00803616887BBBCB57E5496A02AEE5F17886198631829A0018F400006D2C10F798BABD1A533F414DC0CD8D6F892AC3A90980410F00D0C602F151A1B283DAF61EA726E0E6C6F76E5586521300831E00A08D05E2DEEE0A54994E4DC0B50CC3B8C7E3F10CA12600063D00401B0BC4478DA73BAA71F563D404DCDCF88E565F82C1D404C0A00700686381B8B7BB4EAA4CA326E0E62FC17DAADC414D000C7A00803616888F61185D3C1ECF546A026EFE128C515F8201D404C0A00700686381B8B7BBAEAA4CA126E05A2A543EA8C2653F6A0260D00300B4B140DCDB5D375526531370F397E021558AA80980410F00D0C602F1310CA3BBC7E3F9273501377F09C6AB2F4121350130E80100DA5820EEEDAE872A8F5013702D152A4B55B8EC434D000C7A00803616887B4C7D9BDAF61EA626E0E6C677A22ABDA80980410F00D0C602F1310CA3A70A9793A809B8B9F17D58F6B0501300831E00A08D05E2DEEE7AC9840D3501377F0926CB59ACA80980410F00D0C602F1F1783CBDD5B657464DC0CD5F82A97241576A0248D80067BE0C721A282BA929002058227DC9394BE4DC25D404DCDCF84E53A513350124EC3B76B92A07EB0B96AA236A4D4D0100C11269BDDDDDAECA046A026EFE124C57A5809A0012FA3D5B584FB05CDEB265CBA3A925002058227DC9E5FBE4327ED4045C4B7D019E505F84F6D40490D041CEE59182A5FA0EB6A18600806089B4DFEE8A5479889A809BBF0433D4C0368F9A0012FE5D0B77ACE54A662B01806089F4E7F1788AD5987A2C35013737BE4FA9E2A52680847FD7EA1C6BC9B1950040B0446650A1B29FEAD71FA426E0E62FC12CF525C8A12680C453DFB5B9CC560200C11219B9DDF557E5016A026EFE123CA3C2653635012425585EED38B6B215350200044B644C1F3F40F5ED63A809B8B9F17D569576D40490B4EF9C75AC25B3950040B044E650A172A00A97F753137073E33B477D09DA521348752566C9D133D7CF7C76DE6BF3BE5D5CB1D82C2F2FA724B948BD2F5CB270F762FF624EF805806009046F7777A8721F3501D79263BEB8DC01D28184CA05CB169853374F35C7EF1D4F69A63279EB6473D192459F575454B0D20100C112383CA61EA4C6D4F752137073E3FB822AB750134875325349A84C8D3265CB9403E5E5E5EBD82A01102C815A2A540E56DBDE686A026E6E7CE773C903A403598649A84B9DA282E541B64A00044B20B0DDDDA9CA286A02AEA542E54B5EAFF76FD404529D1CE347A04BA960C9C00D00C112383CA61E6218C63DD404DCFC2558C4650F9049C172CAF6B166C58AA1E6CAF2415691FBF218619060098060092470BB1BAACADDD404DCFC2558AC82E55FA8096442B09CB2FD4173F5A281E6DB2F0D082AF2983C472024580220580289E0F17886A931F5086A026E6E7C2B54F93335814C0896F3DE1A512754EA32FFADBB0984044B00044B2051DBDD70554AA809B8966118BEECECECEBA8096442B05C5E393862B094E70884044B00044B2041DB5D89844B6A026EFE122C51E1F25A6A0299102C572EBE2362B094E70884044B00044B20116419AC2C87A526E0E6C677992A7FA42640B0A4102C01102C81B8B7BBBBE5043ED404DCFC2578353B3BFBF7D404322258960F8A1C2CD5730442822500822590A0ED6EA42A77511370F397E035C3307E474D201382E5B2654322064B798E4048B00440B0041241AE6129D7B2A426E0E6C677852A575113C8846039A3FA3E73D5CB7597C3CA63F21C819060098060092468BB1BA5CA9DD404DCFC2578C3E3F15C414D201382A51578560CAB132CE531C220C11200C11248E07637DA308CC1D404DCFC2558E5F57A2FA3269009C172C29EF1E69257EFAA132CE531798E4048B00440B004124185CA7B3D1ECF206A026E6E7CDF54E5526A02E91E2CA76C7FB0C1632CE535844282250082259080EDEE3E55EEA026E0E62FC15B1E8FE737D404D23558CA4CE49CF7EE31D72C1C183154EA22AF91D7327B49B00440B0049A92611863D4987A003501D7525F80B5B9B9B9FF4B4D201D836543B394CC5E122C01102C81246D770FA8D29F9A809BBF04EF1A8671113581740C96D1CC52D6377B49402458022058024DC1E3F13CA8C6D4FDA809B8B9F17D5F7D112EA026908EC132DE50A90B019160098060093405152AC7AA31753135013737BE1FA82FC179D404D231585208960040B0448A6C770FA952444DC0CD5F828D595959E752132058520896000896407C3C1ECF38C330FA52137073E35BEDF57ACFA12640B0A4102C01102C81F8A850395E85CB426A026E6E7C3F56E56C6A02044B0AC11200C112887BBB9BA0CAEDD404DCFC25D89C9595751635018225856009806009C4C7E3F1941A86D1879A809B1BDFADB9B9B9675013205852089600089640DCDB5D990A97BDA909B8F94BB04D959F5013205852089600089640DCDBDD44557A511370F39760475656D6E9D4040896148225008225101F8FC733C9308C9ED404DCDCF8FE273F3FFF546A02044B0AC11200C112887BBB7B44951ED404DCFC25F8D4308CFFA12640B0A4102C01102C81F8783C9E7FAA3175776A026E6E7CF7646565FD909A00C19242B00440B004E2DEEE26ABD28D9A809BF7AEEC2B282838899A00C19242B00440B004E2DEEEA6A8D2959A809BBF049FE7E6E69E404D806049215802205802F1F1783C530DC3E8424DC0CD8DEF17595959C7531348052D5BB63C9A6049B004008225D270BB7B5495CED404DCFC25F8EAE69B6FFE3E3581E66618469E0C06546947B024580200C11269B6DD4D53A5133501377F09FE5B5050701C3581E6929595756EFFFEFD5FFDF0C30F77EEDEBDBBA277EFDEABD4765916BA5D122CD32F58AACFF1728FC73397AD1C00C11299CE308CC7549FD7919A809B1BDF6FBA75EB760C3581649365AFF9F9F9C3E6CC99B3FBD0A14335E661FB5E7AE9A5C57979792B2474122CD32F584AA05465BE2A0719E0012058C225DBDD74550AA809B8F94B70480DDE8FA226904C8661FCE1FEFBEFFF68EFDEBDBBCD08F6EFDFBF7ED0A041DBF4D2588265EA07CBD040A90B5B3C0082255CB0DD3DAEC6371DA809B8F94BF09DBA39829A4032C8A56DFAF6ED3BF3CD37DF8C1828431C5CBC78F1B6AE5DBBFE73D1A24504BA140D961E8FE76A59F21A1A280996000896700B152A9F507D617B6A02AE6E7C255CAAF2AD3D28FC468EBB54A5464EECA3CA97EA8BB25F2E4B22D7BC54B77B55D9ADCAA7AAFC47959DAA6C57456696B6AAB24595CDAA7CACCA47AA7CA8CA46553E50BF67BDBA7D5FDDBEA76EDF51BF6FADBA7D4BDDAE51B7AB559163EBDE50E5755596ABF29A2AAFAAF28A7ACF5275BB44DDFAD46DA5BA2D57B78BD57B17A9DB85EAF62575FBA2BA9DA76E5FB007B9CFA9DB7FABDB6755794695A755F9972A4FA932439527A51190A50BB22E5ECEE625A78A960BDCAADB7FAADB87D5ED2439DE4FDD96AAD78C57B7E3D4ED5875FBA0BA1DA36EEF57B7F7AAD78C56B7F7A8DB91EA7684BA2D51CF0D53B743D5ED10757BA7BA1DA46EEF50B703D46D7F755BAC6E8BD46DA1BABD5DDDF656B7BDD4ED6DEAB6875C6457AE872467189383C165DDBEEC0993464B4E74A36E73D5ADA16E73D44DB6BACD52B7FF50B76DD56D1B75FB77757BB3BA6DEDF57AFFA66E6F54B77F55B7376467675FAF7EE79FD5ED75EAB6A5BAFD93BAFDA3BAFDBDBABD468282BABD4ADD5E611F27F75B757BA9BAFD8DFA9D17ABDB5FABDB8BD4ED05EAF67C757B9EFADDBF54B7BF50B7E7646565FD5CDDFE4CDD9E959B9B7B86BAFD695E5EDEAF264F9E6CD6D4D41C3263B47FFFFECF1F79E411F3BEF5F711EA522858469AA10C2D72BCACDA06FE3F3951587E7EFE0FE44CD4B7DC72CBFF934B1DA9FB274A919D0E6A9B3959DDFF61FBF6ED4F51DBD5FFA8FB3F92A2DE73AAFAF93475FF74B51DFD58FDCE9FC83625DB9614F5F399B2ADC936A7EE9F6D6F7FE748916D529654DBDBE779EAFEAFEC6DF60229EAE70BED6DF9D7EA77FDAFBD7DFF468A7ACF25F676FF5B75FF32FBBB7085BA7FA514FB3B72B57ACFEFE47B23DF1F998D97EF92FD7DFA93FAF95AFB3B769DBAFF7FF2BDB3BF7BD7AB9FFF22DF47F95EAAFBADECEFE8DFA4A8D7DC24DF5DF90EABFBB7D8DFE73652D4CFB7DADFF37FC88CBEFDDDCF56F73D52EC36C150F7BD763B2127C6CA9762B71F1D64B996B429D2B6481B23A7C89762B739DDD4FDEED20E497BA4EEF79462B74FBDD5FD3E769B55A8EEF79576CC6ECB8AD5CFFDECF66D80BA3FD06EF30649513F0FB6DB426913EFB2DBC761765B395CDA4DBBFDBCDB6E4BA54D1D6597D1765B7B9FDDEE8E51F71F9062B7C763D5FD87EC367ABCBA3F41DA6D29D286AB32D16ECF1F56E51169E3ED765E2E683EC56EFBE58C8ED3ECFE60BA5D1EB7FB8927A5DF50F767DA7D88F425FF523FCFB2FB9667D4FDD9D2DF48BF63F73D73EC7E48FAA3E7EDBE699EFD9D996FF759D2772DB0FB31E9CF5EB6CB62BB9FABB0FB3CE9FBFCD20FDA7DA1F489CBA47FB4FBC92ABBCF7CCDEE3F57D87DA9F4A92BEDFE75B55DDEB4FBDDB75479DBEE8BDFB1CBBB761FFDBE2AEBEC7EFB035536D865A3DDAF57DB7DBCF4F59BEC7E7FB33D0690B1C027F6B840C6073BECB2D31E37ECB2C7103296D8638F2BF6DA638CCF64BC618F3BBE9031885D643CF2B53D369131CA017BBC72D02E87EC71CC77ECD042338EA9A59DC8A726E076479494941C29C7BCC9F19637DE78E3F76420A807817A00A8077E7AD0A7077B7AA0A70778CEC19D1ED4E9019D1EC8E9419C1EBCE9819B1EB4E9C19A1EA8E9019A1E9CE941991E90E981981E84E9C1971E78E941971E6CE98156C800ABB33DB0B206557A40A507527A10A5074F7AE0A4074C7AB0A407497A80A407477A50A407447A20A407417AF0A3073E7AC0A3073B21831C3DC0D1031B6B50A307337A20A307317AF0A2072E7AC0A2072B8E418A1EA0E881891E945883113D10D103103DF8700C3CF480C339D8D0838CEDC3870FDFB775EBD6EF620D96FBF6ED334B4B4BADC142AA86CBFB36DF270319B3F38CCEE643BB1E327F78D60FCDF3AE3DCFBCD27BA555BA3DD3CD7A3EF47DF2D82D77DF12F1E7140F96D1961A7B50F8953D48FC42EFB0B207929F39765CED71ECBCDA6517BD136B876347D627F6B6E5DCA1B5C9B153ABDA2E7AE7D606C70EAE75F6B6AB7774BDEBD8D9F5B6BD9DEB9D5E6F3A767CAD74ECFC7ADDFE8EE89D60557A4798FD5D5AA67788D9DF316BA7981D142AF4CE31F93EEA1D64F677F425BDA3CCFEEE5A3BCBECEFF35CBDD3CCFE9E5B3BCEEC40A3779E3D6DB709D64E34BB9D98610F78F4CEB4C71D3BD4A6E99D6A76B89AE2D8B9F688DEC16687B2897A479BB4597A679BB463765B66ED74B3DB376BC79BDDE6DDAB77C0D96DA1B513CE6E1F47E89D71D26EEA1D72765B6AED949362B7B1D6CE39BBDDB576D049B1DB636B479DDD465B3BEBA4DDB6DB6E6BA79DDD9E5B3BEEA48DB7C3B3B503CF6EFB033BF1A45F90A277E6D9FD85B543CFEE430CBD63CFEE5BAC9D7B767FF30FBD93CFEE87AC1D7D76DF64EDEC93227D96DEE967F763D68E3F29D2BFE91D80769F67ED04947ED0EE0BAD9D8176FF68ED10943E538ADE3168F7A5D6CE41BB7FFDADDE4968F7BBD68E42BB2FFEB5DE6168F7D1D64E43BBDFB6761C4AB1FBF3C00E44E9EBF54E44293206D03B13655C20E303D9212445C60B326E909D45328690B184EC48927185141963C84E26196FC8B8437640C918448A8C4764E7948C4D648CA2EE1F2BE31519B74891437A641CD382155868DE19CB99D246501340924907D0AFCC7F7EDF327F1B5586F72DF599AABC1BE9F545E32ACE91D7C87B02BF63BA3F70D6D0BE65BEDFDBBF635A437F5B5E5738C1F75043AF2B9CE86F1DEEF19E93FCC75BBFA3AC328B4F32762A271E5D5555B5E8BFFFFDEFB7D184CAD75E7B6D5BE7CE9DBF1C366C9879EFBA7B533A6C0D583AC03CF1F413CD71BBC75901F1AE557759B75963B302A151BFF6ACDF9E15089BB98FE49A3F38E507E6C057065A3F5FD4EAA2C073F23B527D29AC3D005E1E2958B2D5038D57545A7983EA7766596582EF2929761F6A95A0C76AFBC3FFD4E9FB4A7DCBF5EBC215FDDE86FAC8C2F1BEABE4757D4A97FD884F06A865AF66F052134082158EAF38AD4F69C585B74FF05DA63AA3B685657E8F744A45A5BE31CE8068EF710CB05FFFBCEEEC8A26F8BAA9DBAF5579BDA8D47FBDDD013E553CC1F7B7A2872A7F5A52E23F3A9A60D97782AFB8E1D7F9736B3BCE0527149556FC51FDED7FD7FE3B2A0DBBD37EDED181BFCEA71C9B59B366B5ABAEAEFE3A52A0DCBE7DFB7F478E1CB94B6629644F76BA9DBC474261FBA9EDADDB5FFEE9976651795150B01CF6F630B3EBACAE8160F9F32B7F6E767FB6BBD9615A87C0FB3B3DD129AD4EDE23B32EF68C1DC1126862CEBEB24E9F56CF8ED99060797B547DA4EADF9C8F4980EC5BE65B2A2538BCFA17D8F7BF54E5333E25B83C58CA2A32839A0012A86892FF5CD5E12C9212668FEA8B819F2754E6EBB0793868FA8F2E9AE06F253396D6EF52F7E535DD26CFFFBE7ADDB5A1B39875FE76ED6B16E93DBC81805AEAAB72FCDDFEEAB16FEA74E2EA6F174FAC38AFF6FEEC6325BC3A83A50AC79DD5FDBED67D159CF9A463274B9DE6CE9DFB5A4D4DCD411D28BFF9E69BEF9E7FFEF9AD1D3B76EC204B9CF46B533958DEB3E11E6B86F198E38EB102A40E8639A53981E028B396CE6029AF6F7547AB40003DF2A823CDD6435B9BBDE7F7368B2B8BADC7257CA6E3E546EC19CC5708964082FB577B076BF1848AEBA20A96E32B2E96D538A1B394F64E5B53FABCDA9DB89533EAF689B53B7E6B03AAFF0EEBEFDBAB89A46F76BE067023390C4196C75313400249400B3793581B2C2B1BDCB32321D27AED38FF2556075656D9431EB796D2AA9F655633D27B0B4B7D3B0A4B2BDFACF3771D339676D8FCBAC1FF0F7B6F7160296C84A5B288DDDD77DF5D505555656EDCB871D7942953C21E9F90EA33967AF96B97A7BA0482A5CC4886CE62EAFB23DE1B61CD4ECA633FBEF0C756D094C7EFDF7ABFF5D86FDBFE366DAF63E9E864650673395B389088BE75F6B1F60EDAA896A4EA6029EF6BE875CE194B09AD2AC0CE9662F797FB8B4A7D7B03CB66CB2A670596E4D6BE772B9F0EDCC83ECEDD434D0049A03A9B4F55792574C6D2DA5B5A56D9517E76767812E46489A9F5BCA31393A5B4B5B38EB57B6AADD95039BEA4B4B2B73D1B796DE06FD6CE821E52B7E323CE585A4B78FCF3F47B6449ADFD6FEAA16723F512A0704B618BCA7C3DAD9F2756FC8E4F397ECED9C9740C96A16152EE174C2FB002A31C7739FAA3D141C1F2ECCBCF367BCCE9613D26339EA79E7BAAB514367F727EE0444052E47DE91A2C0124B44FB5660E03338D6595EFABFB0FD71B18559FE8088FFEE0FEB8B26FB860A977AAAAC7B6E9BE3374C65376E2AA3E79249F0A5C1E2CE5448AD9D40490A44E5085B3EA903D9B2F068263A97F41E87B824ED0E3E8148515F8A4439DB4F44CDD4986F99B9B5579AB6EE75A67C632E8D8106B4FB0FD6F94632C6B7F56FF76158C9D274B501DF15AD98BCBA79B78E9122C87AC1C623EB0E381C032583D03298FEB6039F28391D6996325745ED6EE32EBF694B34F31FFD4ED4FD67D99F594D7DEFED2ED693D63092031023B636B77C04ADFD8DFEACFEC434AC21D225237581E5E31E43CFE32DC3196E1FAE090E73E939DAF7C327033FBECFC9CD811485AB074063A47C7661DBF58EAFB32F43DB26C47661303338DD62C62ED718D72863CB9ED35B1E294A60E968EC74D99C13CFCEF0D0EBFF66BFEC3A74BB0741E5779DA79A7054ED62327E0915B59FADA22E47223B27CB69FAF9F75ABCF022BB772BCA53E890FC11240701F56BB6A46767A3A025FFF40E8B4CF45202B75620A9665FECE0D06CBD2CAB5CE33D006CD7896F926F3E9C0CDECEBA6B7A326806405CB883396FE91FAA43CCEF7C88900FA8E5BF6E3D08ECF19FCACD7440896F65EDD6FEA5B0A2BB3A5A1C761460E96F2FF50DBA9EA633399B124583A83A52C65955B999194DBBBD7DD6DF67AA1579D632C9DEF19B47C901528E5DA97E972D65B8225D02CFDE897AACF5A152630F60FE9FB7A84CE5C86590ABB3EE81223F679030896407CE4DAC2720D5B6A02485EB0FC7D482765ED319599C94827E1B1CF38D7A1760F6DC585FA843DCE33C8D63363B9BFCE2C63C88CA55C4A24DCC97B74672927EBD167A0959312102C099691CAD89D63CDA16F0EB596BD3A1FD7D7A7946B5786BB8EA584D11B07DF685DCBF2AF03FF6A3DAE03AA1C6F49B004DC4D9FA847769686ED5B4382A5EE57C3BC2E102CE5B25FCEE7F4995E23054B39AF813E49908450D9511C784ECE0E6BEF0406DC2A2727678E0A976DA90920D1A17262C5EF5427F69C55225D6EA4F6E769211DE315FAA43EB581D2FFEBDAE5B1F67258FB3224F67B2BA30EB8D15CC7F2F0BF69BF3E13AC5CCB32CC6BB6F109132CE3398B6C3AFFFB0996408AF4AF8E50D870DF17FE18C93AAF0B0996B273573FA72F45E23C3CC4EE23DBD69EC19D8009D706CBE754B9959A0012ACF69223C1D7B78A74B911BD1CF6B6875F39F9F05959F512D6CA1B0E77A4872FF41C69C6B231C152CF92AABF3D3CB413951306D9C7787EC98C25C1D28D856009A44EB0547DDAE0288365FF70CFD92B73565933918E7E4FF7777A59ADF39014E9A39DD7B6944029EF93FB7C2A70238FC733D7308C36D4049020766755157A8AF2C3B381FE79218F3DA167269D41547ED6CB52EDF7E5D60DA9BE89D176C27AEF6B7D64C94F6199EF96A0F7D94B6F45E178DF55CEEB6A826049B004D03CC132BA99C8704B6935E77531EBBCCFDE81AA2FEB6597CFFA96564EB5AE6369F7CFF23B2488F2A9C08D7272725E50E5166A0248A0862EC60C102C09960000A4338FC733CF308C9BA9090020585208960000C425272767BE0A97ADA9090020585208960000C41B2C5F54E5266A02000896148225000071F1783C2F79BDDEBF51130040B0A4102C0100884B4E4ECE02152E6FA4260080604921580200106FB05C6818462B6A02000896148225000071F1783C8BBC5EEF5FA9090020585208960000C4252727E765152E6FA0260080604921580200106FB05C6C18C65FA8090020585208960000C44585CAF2ECECECEBA9090020585208960000C4252727A75285CBFFA32600806049215802001017152A7DD9D9D9D751130040B0A4102C0100884B4E4E8E5F9596D40400102C29044B0000E20D964B0CC3B8969A0000822585600900405C54A85C9A9D9DFD276A02000896148225000071C9C9C959A6CA1FA9090020585208960000C41B2C5F310CE30FD40400102C29044B0000E20D96AF666767FF9E9A000082258560090040BCC1B24A956BA8090020585208960000C41B2C5F330CE377D40400102C29044B0000E20D96CB3D1ECFD5D40400102C29044B0000E20D962B54B98A9A000082258560090040BCC1F20D8FC77305350100296E71C562025DEA941A152C0FB25502001008962B55B99C9A008014B760E9821D53374F25D4A54079ECC3C79E56C1721D5B2500008160B9CAEBF55E464D00408A2BF795FFFD65FFCB9FA970F935E1AEF9662AFFFFF6EE36468ABB8E03782488A8B5A156A4B5A9ADB5D6A6565A35A6698CF1348D29A610129DECC371B889C9455B28B7D437C5946C62782349E9EE1E8D2410638C8AC4E4FA82B424ECED5A1A20C6A78AD807A56839D0A3553815E15A03EBCCEECEB2777060266CCD6D3E9FE49F9DDDDB79E037243FBEFC67E61AA1B2B2FBD54AA5F2157F2B01A01D2C7F954AA53EA91200B34018661ED8BD7BF72FA2CB30A37BFC66E3181919A9CFD6636FD5FD45A112002E0896BF0EC727540280AE3B7EFCF8974BA5523D6C3C37AB0600F48E542AF59B6C367BB74A00D055F57A7DFE8913274E86EA8383833B5504007A473A9D7E3E0C9777A904005D353636F6837ACBBE7DFB8E653299E5AA02003D132C7F1BF6F6C52A0140D79C3A75EAAEB367CF9EAB77D8B061C3582E975BA03A0030FBA552A903FDFDFD1F570900BA667C7CFC707D9A898989F1B0011555070066BF743AFDBB305CDEA9120074C59123471EABCF60646464DC2F5306809E0896073399CCC75402802B2ECC8ED74D4E4EBE3953B03C77EEDC1BF97CFE405F5FDF5CD50280D92B0C95BF0F82E00E9500E08A3B7AF4E8FEFA651C3E7C782C6C4643AA0500B3573A9D7E31ECE7B7AB040057DCDEBD7B2F972BEB67CE9CF959D88CEAB95C6EBE8A01C0EC1486CA978220F8A84A0070C5AD5FBFFEA14B5D0A1BE5CA75EBD6FDC48C2500CC6EE974FAE5542A759B4A00D015DBB76F7F79A65479E8D0A1EF868D68BF7B2C0160D607CB3F64B3D98FA804005D1104C1AD61803C739107F71CECEFEF3FE8A9B000D013C1F28F51CF570900BA66E3C68DE530489EED0C965BB76EDD964AA536A90E00F444B03C14F6F50FAB04005D135DEABA6BD7AED7E250393131F1A3E87F3673B9DC02D501809E0896AF64B3D95B540280AE5AB56AD5174E9E3C39198EFAE0E0602593C92C571500E89960793808820FA904005DB765CB96674AA5523D954A8DA80600F454B0FC53386E560900BA2EBAF435FA9D956EEE07809E0B967FCE66B337A904006F55E3A9AB0200F45C7F7F3508820FAA040082250090B4BF1F09C78D2A018060090024EDEF478320B8412500102C0180A4FDFD58383EA0120008960040D2FEFE97152B565CAF120008960040D2FEFED72008AE530900044B0020697F1FCF64328B540200C1120048DADF8F0F0C0CBC5F2500102C0180A4FDFDB5200816AA040082250090B4BFBF9EC964DEA7120008960040D2FEFEB7952B575EAB120008960040D2FEFEF72008DEAB120008960040D2FE7E229BCD5EA312000896004022A954EA642E975BA0120008960040D2FEFE8FFEFEFEAB550200C11200482493C9FC73D9B265EF510900044B0020697FFF57100457A9040082250090B4BF9F1A181878B74A002058020049FBFBBF972E5DFA2E950040B0040092F6F7D34110BC532500102C0180A4FDFD4C2E979BAF120008960040D2FE3EB964C99277A8040082250090B4BFBF1104C13C950040B0040092F6F737070707DFAE120008960040D2FEFE9FBEBEBEB92A018060090024EDEF670B85C21C950040B0040092F6F773E1CBDB540200C11200D0DF01981D8DC7300CC3308CDE1BFE95030000000000C07985426DEE50B9B63C1E6B8AD51F36964BD5C9A1F2E80BFFCB36D63C51591C6DA7B9BDC29CCE87B384DBA9E74BB56F47CB8F946BB75FB0EE70ED818B6DF3C1CDB5ABA275D79447834BED3BFE4EF8FA7A389E6C1D7BFDE162F553E1EBCED6FBB1700C3BDB0000005D0B9785399D21AE15C67647A12F0A9AF18843DBDA62E5F3D382E5A2E8F3706C8BC35E1C4A1BCBC3957BD76E7EF6C6E6E7D5C7A606C35A7FF4F9EAD2D357E74B95CFE68BD59F36F7339A696DF3A978BFE1F8F9C58265B8CDCF34026CB13AD80E9B4F54EF89C269FB3BA56ACD99060000E8A256F87ABE15E24EE74BB51D71E0CC6FAADCD20C90D57B9A3390D5CF4D5F3FFCFE7D0F0D57AE5D5DDAB3B050D831AF19EE2A8B5B3396F735835FEDFE0B436D6DEEDAE1CA6DCDE51DF3D616AB5FEA0C966BCAB5AF85CB43ADED2DEA5C7775A972473394EE59D8F879A9FA703B58B6963BFE6C3B9D650000802E07CB30C4A51ACBCD7079AC1DCA36D5EE6E04CBD2E8AAE812D9F3A1B03027BFB976EBD48039FAC530D4ED0FBFF7FD8E99C697E2E5301C7EFA52C751F85E6D7EF4DABE1476864B653B02E3A98EE5B1F63E872BF70E95ABCF761CC33667190000E0FF142CF3C5DA57DBDF29561F9FB25E7174209E358C66365BF7365E1008E359CC6826B211401F1FBD21DA4FBE3CFAF57836B21904E33038F552D87CB9FA601C18A3F5DB97D6761C673C4BB9A65C5D1607DFC6BE8AB5FBA7CF76020000D0856039FD52D8E8F36F3CF9DC35EDE0D7113EA7AF1B5F8E3AB469CFF59DB394F1BD99AD07ECB4673FDB61B335A318DD63D97C5F7D257CFF5CE70385C29079203E9EA9C73B9A892E956DBF2F561FED7870CF531DF7674EE44BD5EF38CB0000005D0E96179BB1EC089D13D1ECE44CEBC7C1320EA2D14C64E7CFDBF75D4E7BCA6B1C2CA319CCF3FBAA3D7D91EF1C8FDF3F323C7A53637FADD0D83EFE69F755C6F76E364367ED5BCE320000C05B1B2C1B612C7A204FF4B4D5F8E9AB975A3F0C9EDF6C2F97475FB8DC8CE5CCC1325A7FCAAF3E393D7DC6B263DD89F3FBAF3E9A2F557F19EEEBC7D1BD9CD1A5B951B86CCE62D6EE74967BDF7F01C2B8EC92D1A67BA30000000049454E44AE426082, 1);
-INSERT INTO `act_ge_bytearray` VALUES ('302558', 1, 'var-baseTask', NULL, 0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665B811E59153A6CD0702000C4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E000178720017636F6D2E6C656E2E656E746974792E426173655461736BA48CBC2F51BC802602000D4C0008637265617465427971007E00024C000A6372656174654461746571007E00014C0002696471007E00024C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C000B7375626D697474696D657371007E00034C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000775726C7061746871007E00024C000675736572496471007E00024C0008757365724E616D6571007E000278707070707400043230313874000331313170707070707400352F6C656176652F726561644F6E6C794C656176652F343332303730666331663532633063633137376164393031613561616338643174002035393436613938356637333363353766316162373136383966376236616565617400087A68616E6773616E7372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDB8E2400787070737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000037371007E000C77080000017FE5DADC00787400203433323037306663316635326330636331373761643930316135616163386431737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787070707070, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('302560', 1, 'hist.var-baseTask', NULL, 0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665B811E59153A6CD0702000C4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E000178720017636F6D2E6C656E2E656E746974792E426173655461736BA48CBC2F51BC802602000D4C0008637265617465427971007E00024C000A6372656174654461746571007E00014C0002696471007E00024C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C000B7375626D697474696D657371007E00034C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000775726C7061746871007E00024C000675736572496471007E00024C0008757365724E616D6571007E000278707070707400043230313874000331313170707070707400352F6C656176652F726561644F6E6C794C656176652F343332303730666331663532633063633137376164393031613561616338643174002035393436613938356637333363353766316162373136383966376236616565617400087A68616E6773616E7372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDB8E2400787070737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000037371007E000C77080000017FE5DADC00787400203433323037306663316635326330636331373761643930316135616163386431737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787070707070, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('302561', 1, 'hist.detail.var-baseTask', NULL, 0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665B811E59153A6CD0702000C4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E000178720017636F6D2E6C656E2E656E746974792E426173655461736BA48CBC2F51BC802602000D4C0008637265617465427971007E00024C000A6372656174654461746571007E00014C0002696471007E00024C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C000B7375626D697474696D657371007E00034C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000775726C7061746871007E00024C000675736572496471007E00024C0008757365724E616D6571007E000278707070707400043230313874000331313170707070707400352F6C656176652F726561644F6E6C794C656176652F343332303730666331663532633063633137376164393031613561616338643174002035393436613938356637333363353766316162373136383966376236616565617400087A68616E6773616E7372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDB8E2400787070737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000037371007E000C77080000017FE5DADC00787400203433323037306663316635326330636331373761643930316135616163386431737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787070707070, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('302573', 2, 'var-leaveOpinionList', NULL, 0xACED0005737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A657870000000027704000000027372001B636F6D2E6C656E2E656E746974792E4C656176654F70696E696F6E1956BF801DDE60870200065A0004666C61674C000A63726561746554696D657400104C6A6176612F7574696C2F446174653B4C00046F7049647400124C6A6176612F6C616E672F537472696E673B4C00066F704E616D6571007E00044C00076F70696E696F6E71007E00044C00067461736B496471007E00047870017372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDDEED97B787400203062373632356665646161303565383566323832343836653163396339316239707400033131317400063330323536367371007E0002017371007E000677080000017FDDEFA3BB7874002064383138616336613836636631613634643231383462663036393964363761387074000331313174000633303235383478, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('302575', 2, 'hist.var-leaveOpinionList', NULL, 0xACED0005737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A657870000000027704000000027372001B636F6D2E6C656E2E656E746974792E4C656176654F70696E696F6E1956BF801DDE60870200065A0004666C61674C000A63726561746554696D657400104C6A6176612F7574696C2F446174653B4C00046F7049647400124C6A6176612F6C616E672F537472696E673B4C00066F704E616D6571007E00044C00076F70696E696F6E71007E00044C00067461736B496471007E00047870017372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDDEED97B787400203062373632356665646161303565383566323832343836653163396339316239707400033131317400063330323536367371007E0002017371007E000677080000017FDDEFA3BB7874002064383138616336613836636631613634643231383462663036393964363761387074000331313174000633303235383478, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('302576', 1, 'hist.detail.var-leaveOpinionList', NULL, 0xACED0005737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A657870000000017704000000017372001B636F6D2E6C656E2E656E746974792E4C656176654F70696E696F6E1956BF801DDE60870200065A0004666C61674C000A63726561746554696D657400104C6A6176612F7574696C2F446174653B4C00046F7049647400124C6A6176612F6C616E672F537472696E673B4C00066F704E616D6571007E00044C00076F70696E696F6E71007E00044C00067461736B496471007E00047870017372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDDEED97B7874002030623736323566656461613035653835663238323438366531633963393162397074000331313174000633303235363678, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('302588', 1, 'hist.detail.var-leaveOpinionList', NULL, 0xACED0005737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A657870000000027704000000027372001B636F6D2E6C656E2E656E746974792E4C656176654F70696E696F6E1956BF801DDE60870200065A0004666C61674C000A63726561746554696D657400104C6A6176612F7574696C2F446174653B4C00046F7049647400124C6A6176612F6C616E672F537472696E673B4C00066F704E616D6571007E00044C00076F70696E696F6E71007E00044C00067461736B496471007E00047870017372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDDEED97B787400203062373632356665646161303565383566323832343836653163396339316239707400033131317400063330323536367371007E0002017371007E000677080000017FDDEFA3BB7874002064383138616336613836636631613634643231383462663036393964363761387074000331313174000633303235383478, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('302598', 2, 'source', NULL, 0x7B227265736F757263654964223A22333032353937222C2270726F70657274696573223A7B2270726F636573735F6964223A2270726F63657373222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C2270726F636573735F617574686F72223A22222C2270726F636573735F76657273696F6E223A22222C2270726F636573735F6E616D657370616365223A22687474703A2F2F6C656E6F73702E636E222C22657865637574696F6E6C697374656E657273223A22222C226576656E746C697374656E657273223A22222C227369676E616C646566696E6974696F6E73223A22222C226D657373616765646566696E6974696F6E73223A22227D2C227374656E63696C223A7B226964223A2242504D4E4469616772616D227D2C226368696C64536861706573223A5B7B227265736F757263654964223A227369642D33304636324437352D353136352D344532322D383433412D394441393335424135303331222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22657865637574696F6E6C697374656E657273223A22222C22696E69746961746F72223A22222C22666F726D6B6579646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22227D2C227374656E63696C223A7B226964223A2253746172744E6F6E654576656E74227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D32333931423338312D323736372D344134332D383237442D374333353037394145303745227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3137352E352C2279223A3134317D2C2275707065724C656674223A7B2278223A3134352E352C2279223A3131317D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D39363143373036422D413744312D343941312D394332382D414135433233433430364243222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C22657865637574696F6E6C697374656E657273223A22222C226D756C7469696E7374616E63655F74797065223A224E6F6E65222C226D756C7469696E7374616E63655F63617264696E616C697479223A22222C226D756C7469696E7374616E63655F636F6C6C656374696F6E223A22222C226D756C7469696E7374616E63655F7661726961626C65223A22222C226D756C7469696E7374616E63655F636F6E646974696F6E223A22222C226973666F72636F6D70656E736174696F6E223A2266616C7365222C22757365727461736B61737369676E6D656E74223A22222C22666F726D6B6579646566696E6974696F6E223A22222C2264756564617465646566696E6974696F6E223A22222C227072696F72697479646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22222C227461736B6C697374656E657273223A22227D2C227374656E63696C223A7B226964223A22557365725461736B227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D36463636323645392D383144342D343845392D394345332D433632464434433932454230227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3338352C2279223A3135357D2C2275707065724C656674223A7B2278223A3238352C2279223A37357D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D32333931423338312D323736372D344134332D383237442D374333353037394145303745222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D39363143373036422D413744312D343941312D394332382D414135433233433430364243227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3238342E393233383535393435353934382C2279223A3132352E303334373433383734303737367D2C2275707065724C656674223A7B2278223A3137352E38313234373231373934303531382C2279223A3131382E313536363632333735393232347D7D2C22646F636B657273223A5B7B2278223A31352C2279223A31357D2C7B2278223A35302C2279223A34307D5D2C22746172676574223A7B227265736F757263654964223A227369642D39363143373036422D413744312D343941312D394332382D414135433233433430364243227D7D2C7B227265736F757263654964223A227369642D35383442353134362D373630372D343239362D393143342D383746384646323636333436222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22657865637574696F6E6C697374656E657273223A22227D2C227374656E63696C223A7B226964223A22456E644E6F6E654576656E74227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3539382C2279223A3132397D2C2275707065724C656674223A7B2278223A3537302C2279223A3130317D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D36463636323645392D383144342D343845392D394345332D433632464434433932454230222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D35383442353134362D373630372D343239362D393143342D383746384646323636333436227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3536392E333832383132352C2279223A3131357D2C2275707065724C656674223A7B2278223A3338352E36303534363837352C2279223A3131357D7D2C22646F636B657273223A5B7B2278223A35302C2279223A34307D2C7B2278223A31342C2279223A31347D5D2C22746172676574223A7B227265736F757263654964223A227369642D35383442353134362D373630372D343239362D393143342D383746384646323636333436227D7D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A313230302C2279223A313035307D2C2275707065724C656674223A7B2278223A302C2279223A307D7D2C227374656E63696C736574223A7B2275726C223A227374656E63696C736574732F62706D6E322E302F62706D6E322E302E6A736F6E222C226E616D657370616365223A22687474703A2F2F6C656E6F73702E636E23227D2C227373657874656E73696F6E73223A5B5D7D, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('302601', 1, 'var-baseTask', NULL, 0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665B811E59153A6CD0702000C4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E000178720017636F6D2E6C656E2E656E746974792E426173655461736BA48CBC2F51BC802602000D4C0008637265617465427971007E00024C000A6372656174654461746571007E00014C0002696471007E00024C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C000B7375626D697474696D657371007E00034C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000775726C7061746871007E00024C000675736572496471007E00024C0008757365724E616D6571007E000278707070707400043230313874000332323270707070707400352F6C656176652F726561644F6E6C794C656176652F376538303465376562376162386633353461663133316362626336326336383374002035393436613938356637333363353766316162373136383966376236616565617400087A68616E6773616E7372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDB8E2400787070737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000057371007E000C77080000017FF0279400787400203765383034653765623761623866333534616631333163626263363263363833737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787070707070, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('302603', 1, 'hist.var-baseTask', NULL, 0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665B811E59153A6CD0702000C4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E000178720017636F6D2E6C656E2E656E746974792E426173655461736BA48CBC2F51BC802602000D4C0008637265617465427971007E00024C000A6372656174654461746571007E00014C0002696471007E00024C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C000B7375626D697474696D657371007E00034C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000775726C7061746871007E00024C000675736572496471007E00024C0008757365724E616D6571007E000278707070707400043230313874000332323270707070707400352F6C656176652F726561644F6E6C794C656176652F376538303465376562376162386633353461663133316362626336326336383374002035393436613938356637333363353766316162373136383966376236616565617400087A68616E6773616E7372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDB8E2400787070737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000057371007E000C77080000017FF0279400787400203765383034653765623761623866333534616631333163626263363263363833737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787070707070, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('302604', 1, 'hist.detail.var-baseTask', NULL, 0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665B811E59153A6CD0702000C4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E000178720017636F6D2E6C656E2E656E746974792E426173655461736BA48CBC2F51BC802602000D4C0008637265617465427971007E00024C000A6372656174654461746571007E00014C0002696471007E00024C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C000B7375626D697474696D657371007E00034C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000775726C7061746871007E00024C000675736572496471007E00024C0008757365724E616D6571007E000278707070707400043230313874000332323270707070707400352F6C656176652F726561644F6E6C794C656176652F376538303465376562376162386633353461663133316362626336326336383374002035393436613938356637333363353766316162373136383966376236616565617400087A68616E6773616E7372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDB8E2400787070737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000057371007E000C77080000017FF0279400787400203765383034653765623761623866333534616631333163626263363263363833737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787070707070, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('302616', 1, 'var-leaveOpinionList', NULL, 0xACED0005737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A657870000000017704000000017372001B636F6D2E6C656E2E656E746974792E4C656176654F70696E696F6E1956BF801DDE60870200065A0004666C61674C000A63726561746554696D657400104C6A6176612F7574696C2F446174653B4C00046F7049647400124C6A6176612F6C616E672F537472696E673B4C00066F704E616D6571007E00044C00076F70696E696F6E71007E00044C00067461736B496471007E00047870017372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDDFADF437874002030623736323566656461613035653835663238323438366531633963393162397074000333333374000633303236303978, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('302618', 1, 'hist.var-leaveOpinionList', NULL, 0xACED0005737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A657870000000017704000000017372001B636F6D2E6C656E2E656E746974792E4C656176654F70696E696F6E1956BF801DDE60870200065A0004666C61674C000A63726561746554696D657400104C6A6176612F7574696C2F446174653B4C00046F7049647400124C6A6176612F6C616E672F537472696E673B4C00066F704E616D6571007E00044C00076F70696E696F6E71007E00044C00067461736B496471007E00047870017372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDDFADF437874002030623736323566656461613035653835663238323438366531633963393162397074000333333374000633303236303978, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('302619', 1, 'hist.detail.var-leaveOpinionList', NULL, 0xACED0005737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A657870000000017704000000017372001B636F6D2E6C656E2E656E746974792E4C656176654F70696E696F6E1956BF801DDE60870200065A0004666C61674C000A63726561746554696D657400104C6A6176612F7574696C2F446174653B4C00046F7049647400124C6A6176612F6C616E672F537472696E673B4C00066F704E616D6571007E00044C00076F70696E696F6E71007E00044C00067461736B496471007E00047870017372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDDFADF437874002030623736323566656461613035653835663238323438366531633963393162397074000333333374000633303236303978, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('302630', 1, 'source', NULL, 0x7B227265736F757263654964223A2263616E766173222C227374656E63696C736574223A7B226E616D657370616365223A22687474703A2F2F6C656E6F73702E636E23227D2C226964223A2263616E766173227D, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('302632', 1, 'source', NULL, 0x7B227265736F757263654964223A2263616E766173222C227374656E63696C736574223A7B226E616D657370616365223A22687474703A2F2F6C656E6F73702E636E23227D2C226964223A2263616E766173227D, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('302633', 1, 'source-extra', NULL, 0x89504E470D0A1A0A0000000D4948445200000288000000CD08060000003B43814C000000206348524D00007A26000080840000FA00000080E8000075300000EA6000003A98000017709CBA513C0000000467414D410000B18E7CFB5193000000017352474200AECE1CE900000006624B474400FF00FF00FFA0BDA793000000097048597300000EC400000EC401952B0E1B000011F04944415478DAEDDD0B7454F59D07F09BC924194208E115E3A22B56A4BADAB55A1F548F055F80407B5C2B25984A715DDB7A56DAD5FA586B7DD5F6D45D75ABDBDD565B151FA841E8FAA8D64715A85B05179422281110C16208C86308904C1E33D97B69E8491110C883103E9F73AE776632B933FE90BFDFFBFFFFEFFF060100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005D44961200FBC203CB1EF87A8F648F9F146C2EE81FAF8B6B8B3A486376637D2637F34AF6E6ECEF8C183162A98A000222D0293C52F1C87D7DAAFA5C92EC970C36166D0CEABAD5294A07C94DE50685C9C2A0EFAABED5F1A678D9D9679FFDACAA00DBCB5602A023453D87C51F15DFBAF2332B83649F6490CE492B4A074AC7D3414D414DB0B9E7E6BCA2B545C3CA2E2C7B72F2E4C9EB55066829A60440478A8695A39EC328A4B0EFA4F253C1BAE275D5B158EC56D500B6175702A02345730E971FB47CD70DD3E67850B8B430C85D9F1B64356505754575C1A6819B82869E0D0AD88636F4DDD0BFEFEABE435502D89E1E44A063CF4AEBE259BB9A731885C33E6FF609F23ECE0BB2D25941900982BCF5795B5FCBD998A3806DA83E519F17EE4A54021010814EAD60794110ABFF64D31485C5E867000888C0016657BD8451EF22000222708089E61CEECDCF001010010010100100101081034EBADBCE17CECEE46614084040040E345B0EDDB2C320988967822D03B628108080081C6852C5A920D537B5C3D76B8B6B15084040040EC886A9F1934D53769D5BC7030888C001275EF3E7BBA824D6243EF1B3BC7579419F397DB6BE070001113800E457E66F0D80D1FD97772637991BF49DDD37E8BEA2BB351101DAF3845D09807DDA08D5C483C28AC2AD3D84BB23BAE55EE1E2C220B13611540FAA0E1A7A342822401BD38308EC53518FE0EE86C396A29EC6BEFFD75701010444A0AB897A04F79A651101DA852166609F5A75CE2A4500E864F420020020200200202002002020020020200200D06AAE6206000E68AFBFFEFA3F2C5DBAF4E2952B579EB67AF5EA1E1B376ECC49A552415E5E5E537E7E7E436161E187E1FEC5850B17DE3575EAD4A50222004017D4D4D4149F356BD68DD3A74FBFE2BEFBEE2B38E18413822143860403060C088A8A8A823010066148CCDAB469536E6565E5C0F0BD030B0A0A2EBBE28A2B962493C96F4C9A34E90D011100A08BD8B061C37161287C69DEBC79C55FF9CA57826BAEB926C8C9C9F9C4FB1289C4D6AD5FBF7EC171C71D175C7AE9A5B11933667C76EAD4A97FB8FCF2CBA7AD5EBDFAD2F0F1E6AE58237310018003C61B6FBC31E68E3BEE989B9B9B5B7CFBEDB707C3870FDF6138DC91ECECECE0ECB3CF0EEEBEFBEEF8E0C183CFEBD1A3C7FCD2D2D201022200C07E1C0E1F79E491F230DCC5C78F1FBF7518796F44BD8A65656589281C868F5FEB8A2151400400BABC6858F999679E796CF8F0E1B1D1A347B7C931CF39E79CD8B871E37AE5E6E6BE3066CC9802011100603F115D90326DDAB497060D1A146FAB70B8CDB061C3BA9D79E6997DF3F2F2FE5D400400D84FCC9E3DFB96B7DF7EBBF8820B2E6897E38F1D3BB64F3C1EFFFA85175EF879011100A09D959696FE60DCB871E70D1D3A74AF575E79E59557BE336AD4A8BD9E73F869A239895FFBDAD7EAC3877708880000EDEFD6A6A6A6274B4A4A9263C78E9D1C86C5117B32DF2F5A047BD9B26505679E7966BB7EC961C386F5C9CACA3A31FC6E03BB42D1AD834887995CF5D2590B6A975D5E99FA78F087756BFAAC6FAC8ED766EAB2F2623941AF7861E380C4411B8A737ACF39A5E0EFFE73EC4167BEA86200B4D03D0C606561582CCBCECEAE2E2D2D7D3A7CFE585E5EDECC071F7C30B5B35F5ABC78F1A5D122D8BBBB94CDDE8A96C039EAA8A33E7CE79D77CE0BBA404FA28048BBFBD6E23BAF5ADB90BC7ED2EADF169D52787470E141E70483BA1D1A94E4F60EF26389A026930A36346C8A2FAEFD53BFD7AB178EFC65D53323CF7FE7FA4DBD730AEFBA6FD0B537AA2000DB290CB78BC2B078512A346EDCB827C2E74FAE5AB5EAD999336736B67C63F8DAE033CE38A343BED4B061C3BA870171888008BB7059C5ED7FBF2ABDFEF90FEB561D7CF521E3B2BED4F3B8203B2BFB13EF8B42627E5E22E89FD72F38A3E884E0FABF1D1FBCBA717E8FBB3E7AE286910BAEBA6C407EC9C89F1F71D51C15ED1CA2F940E1AE229D4EBFD055EF2000EC571261501C1FEEC7979494443D8B2F656565DDBFAD67B1B2B2B2E0B0C30EEB902F127E4E34C9F1D8AE5054019176F1CD25B7DFF4D6E6A537FE53C9E8D8C5079DBBC360B82B51988CB647D6BCD8F7BF2B9F9CFDED2577DC76CF91575DAFB29DC2AD5B1B8F783C3376ECD877C286F87FC2A7331389C4EC5D0DF3D0F9D4ADAB0BDE7AEBAD28F4DFAC1A741151CFE2056160BC20954A45FF6DBF5F5D5D9D535858D8211FDEB367CF9270D7254E9C0544DADC75CBEEF9C16B9B16DE74CFC0EF657DBEE0C8561DEBA2E2E1C1890547C5BEBDF48EEB2E5B7C678F5F0CFADE7754B873081BE058180E3F173E8CB69B9A8779DE085F7F36168BBD1C9EB52FDC7EA887CEE5E3D91F072BE7AD8C1EDEA41A745147D4D5D5B5DBD5CBDB8BAE660E758905B30544DAD49845375CF9874D0B6F79FCB337664543C66DE1E8FCC382C7C2E38D7BEF87FF3C76D1CD95538EBEF93695DE77CACBCBB3C2B3F2A61DB58D61388CE6DE0CC96432414949C986F07D33C2E7BFC9CECE7EF9D1471F5DA97A9D4BBFC1FD827E95FD8279F3E6DDA21A7462BB7302930EDB9FA6F0A4F5AF724DF87C593C1E1F50535313EB8890585B5BFB51B8EB2920420BA7CEFDE611CB6BAB6EFBE59157C7DA2A1C6E131DEFDE8157C5BEF1DE8F7F387CE195CFBF78EC7FCC57F14EAF57B89D1F6DE9743A1AEA49878F1755565606C11714A733C8EB93171C73C231C1B5D75E7BB36AD059856DC70E03629807A3118A4C180273C37D76B88F5E4B86FB97C3EDD1BCBCBC17A2692F975F7E79AABABA3AAF2302623299DC18EE1A044468A15B4EFEF317179F95D3DA61E59D897A1227F6FF6ACEA455CF3D1D3E1DA0E2ED63C2840989542A551236B42561239BD87E1FBEE5A0BD3C743411F5D879F3E60503BEEC8F0FD82BD162D4D1C966B716BD85D19CBF17C26D4AB76EDD5E0E4361B2E52F1416162E5BB162C5D1252525EDFEE5162C58B0283AF71210A1D997E64D2CCBC9CAFE4C3467B03D45C79FB2E6954386CC9F78D9EF8FFBD92F547EC7C68C1953929D9D9DD855C80BF745D1F3F071F4FC2FFB686277243A1BDFD17E0F4543D12D7FB1E2F8E38F3F6A43B0C11F12B037725B84C269E1F65C229178765717C885A1F1B773E7CE3DFA94534E69F72FF7FCF3CF47DD94D30544D8F637363BE7966B0EBD303B5AF4BABD7DFF6F2FCABE71F9FDD7850FBB7440DC55C88BC5623D5B3EDF3EE46D3BC6AE425EF87B3BFBE8A8A1AD6ADE52E1EF5485EFDDB6AF6B7EFDD36ADFD8DCBE441FB830FCBD7BC3467A7274667FC92597340988C01E9F6D3635453D8333C3F6EFA1E6256C92BBF37B15151577E5E4E4FC4B434343767B2E969D4EA7575455559D14EEBBC4C5940222AD367076D9213599DA43A365693AC2A9859F0B1A9B322547CD2A1D50F1C5F2E5FB63C06B3154BB7DB06BB9DF69C8DB16EE7611F2AA5A04BD1D86BCE6B93A7F793D6CD45253A74EADDA9D7FB7D2D2D21D05C4C6F038B1E8EAE6E6B6E5854C2673E79A356B66BA9A1968851BC2B66579229198B6374B694517C85D79E5958BA64F9F7EECF0E1ED37CA3569D2A437C3EF5918B6A34B0544081DDCAD68FC909E9F8FEFE95A87AD716EEF53729E5EFFDAC5413B2ECF3161C284A2542A55149EAD168541A7287CA96FB815B445C0DB4D3B0D79E1F7D9B85DE8DBE390D7866AC22D1A568987DF2B0A9DF785DFE3DEAED24802FB567979F98F5A7B8C6432F9F5279F7C72CEE9A79F9ED31E17ABD4D6D62E0E03E869615B3CBAABD45D40A4D57283F8974F2BFC5CAC233FF3E41E4707CF6F7863D4A705C49DF5E2853F3A24DCF29A876B0BB61BA68DD6B0EABB6D2E5EB4644B4B6D11F05A0CD56EFF7A2A3C4BAEDACF169C8E5ADBBF1A46F6B702E84C1E78E081F913274E7C74CA9429632FBEF8E26E6D7CF8E4F5D75FFF5AD8066E09C3EC5C01119AAD6FDCF499E80AE38E54940C63E9CCF5C7949696DE1E85B9F02F665174D145D0DCCBD762FF57A16EFB70D772B87607A249D06B9B8762A3D0B3367AAD0B06BCD6308C0CEC17162C5870694D4DCDC9C5C5C5478C1A35AAADAE346EBCF3CE3B1FAAACAC8CD67F3DBD2BD54B40A4D55299FAA27E39451DFA9915731606FD66A5A31EBFAB7614FC5A58BB2DE8B508777FE9C50BF7D1E2CDA9743A5D153EDEBC0F8769F7375787757ACA3032B0BF884E62FBF7EF3FFC89279E9813B6FF3D468F1EDDBD95874C46E170EEDCB96785FFEFF87257BB37BD8048AB353435E6E6C7121DFA99434EFB5270CFAAA783BF9915DC103E5DB92DF46D0B8389442269A8B3FD949797DFA10AC0FE26BA60A5ACACECA45FFFFAD7CF5556561E3C7EFCF87ECDB7C7DB23D19CC3685839EA398CC261D8262EEF6AB5121069FD7F4459F1BA9A4C2AAF2343625149EF60F5A9B18657BFFBD88FFC0900B0272171E8D0A15FA8AFAFFFB759B366FDE3F9E79FDF3072E4C87ED9D99F7EA165B494CDC30F3F3CE777BFFBDDE9D19CC36858B9ABF51C0A88B499BCAC9C0D1F37244B0ECB2BE9B0CFDCD0B029C8C98A57AB3E007BAA79CEF4F7C68E1D3BE9B1C71EBBBDBCBC7CC8A04183169F75D65985871F7E786EAF5EBD0ECACFCF8FD7D6D6AE4E2693EBDE7DF7DD779E7DF6D982AAAAAAE3A3F9EE61303C6FCA9429B3BB728D04445AAD29C8CC7DB766F9B96140ECB0756E16D7FE29FC67D65BAA0FC0DE0A43DEC270776E5959D921151515A3172D5A343C0C80C7067F5E8122BAD0319AA7581B6E3DC2ED956811EC0365EEB58048AB6D694ABDF84AF2CD53CFED35B877477DE6AB1BE7276B33752FA93E00AD150D3B87BB7B9A37423125A0B5B2D2F1A76624E7C5D24DE90EFBCCE7D6CFCAE4A4B7DE8713001010E96C960E7E74654DBAEE8FD3936F75C89CC0FFDD387FF39674ED92CE7C9B3D00101039E03564D277DFB0FCFE9A8EE845FCFEF25F6EAC6F4AFF97AA0380804827F6FE298F3FB5BEB1FABDBB2BA7AD68CFCFB967D5532B3FAEDFB0E2902DABCA551D0004443AB9EC74D3845FADFA4DF7B736BDD72E6B42BD53B3BCE6EE8FA6259A62C12533CF705B37001010E9F4A239810D41E3C46F2CFEC99695756BEADAF2D8D1F1C655DCBCB9B12973C5E2131FAF506D001010D94FBC7FD294F2BA4CDDBF8E5878F586B99B2AD6B5C531176EF9605D74BCDA74EAA74B4F7E7CB22A038080C87E66C9C9E50FA69AEAAEB8B0E287C18F3F7CF88FADB970E5A71F4D79FBABEFFE205D9FA9BF6EE9C9536E535D00687F16CAA65D443D8947CD2A9D3D69F50BBF9AF2F1F4F77F72F8B752A37A7FF198DDFDFD979373165FF3C1BD0D9B1BB6546765678D5D7262B96165001010D9DF35AF5378CEC039A5177CF7FD9F7DEBEA0F7EDEEBB8EE03579CDF6748E2841E47161F9CDBA7283F96E85E93496D595B9FDCF076CD07EB9F5AFB6AF5ECEA770FABCFD4AF09B282FBFBD7544D76410A00088874314B4F2A8FEE78326DE0ECB243E66E7EEF82B9D515A7356505BDB28260DBBD9BB7ED3F6C0A82DF47774859D2BC08F612E5030001912E1C14076FBDD7E55DCD1B00D049B94805000001110000011100000111000001110000011100000111000001118076905202404004F6B9744E3A95579BA7109D40A226313FDC55A904202002FB54434EC30B3D933D332AB1EF1DFCA7832B9A9A9A66AA04202002FB54417DC1C4DE55BD3775DBD24D31F6A1FCEAFC5F75DBD4EDAC4C2673836A00DBCB5602A0233DF4D043D513C64F985BB4AE6864BC31BEA63EB7BE5B3A27EDBEF01D2395A849BCD9FF83FE2F1557168F88C562970D1B366CB6B200DBCB5202605F983163C621E974FAD6F0E1D0A6A6A6012AD261AAA261E5A8E770C488114B9503000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E854FE1F5EFD99B91416FC3A0000000049454E44AE426082, NULL);
-INSERT INTO `act_ge_bytearray` VALUES ('302635', 1, 'source', NULL, 0x7B227265736F757263654964223A2263616E766173222C227374656E63696C736574223A7B226E616D657370616365223A22687474703A2F2F6C656E6F73702E636E23227D2C226964223A2263616E766173227D, NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('142518', 20, 'source', NULL,
+		0x7B227265736F757263654964223A22313432353137222C2270726F70657274696573223A7B2270726F636573735F6964223A2270726F636573735F6C65617665222C226E616D65223A22E8AFB7E58187E6B581E7A88B222C22646F63756D656E746174696F6E223A22222C2270726F636573735F617574686F72223A22222C2270726F636573735F76657273696F6E223A22222C2270726F636573735F6E616D657370616365223A22687474703A2F2F7777772E61637469766974692E6F72672F70726F63657373646566222C22657865637574696F6E6C697374656E657273223A22222C226576656E746C697374656E657273223A22222C227369676E616C646566696E6974696F6E73223A22222C226D657373616765646566696E6974696F6E73223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D747275657D227D2C227374656E63696C223A7B226964223A2242504D4E4469616772616D227D2C226368696C64536861706573223A5B7B227265736F757263654964223A227369642D41343530344644322D303230342D343246352D393036312D344134323938324442343938222C2270726F70657274696573223A7B226F766572726964656964223A227374617274222C226E616D65223A227374617274222C22646F63756D656E746174696F6E223A22222C22657865637574696F6E6C697374656E657273223A22222C22696E69746961746F72223A22222C22666F726D6B6579646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22227D2C227374656E63696C223A7B226964223A2253746172744E6F6E654576656E74227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D30443235384332342D314631392D343233332D413937362D413044384342394441454143227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A36302C2279223A3235382E373033373033393938313833387D2C2275707065724C656674223A7B2278223A33302C2279223A3232382E373033373033393938313833387D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D34363841393635452D393339422D343733312D413232392D353137384436413042423834222C2270726F70657274696573223A7B226F766572726964656964223A227573657231222C226E616D65223A22E7BB8FE79086E5AEA1E689B9222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C22657865637574696F6E6C697374656E657273223A22222C226D756C7469696E7374616E63655F74797065223A224E6F6E65222C226D756C7469696E7374616E63655F63617264696E616C697479223A22222C226D756C7469696E7374616E63655F636F6C6C656374696F6E223A22222C226D756C7469696E7374616E63655F7661726961626C65223A22222C226D756C7469696E7374616E63655F636F6E646974696F6E223A22222C226973666F72636F6D70656E736174696F6E223A2266616C7365222C22757365727461736B61737369676E6D656E74223A7B2261737369676E6D656E74223A7B2261737369676E6565223A223062373632356665646161303565383566323832343836653163396339316239222C2263616E64696461746547726F757073223A5B7B2276616C7565223A226533343665393633363834383463386661376632313763653535306130313836222C226E616D6556616C7565223A22E589AFE7BB8FE79086222C222424686173684B6579223A2231494C227D5D7D7D2C22666F726D6B6579646566696E6974696F6E223A22222C2264756564617465646566696E6974696F6E223A22222C227072696F72697479646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22222C227461736B6C697374656E657273223A6E756C6C7D2C227374656E63696C223A7B226964223A22557365725461736B227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D30413541464638362D414541342D343231322D423146342D393237354134343036433244227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3231392E39393939393939393939393939342C2279223A3238332E373033373033393938313833387D2C2275707065724C656674223A7B2278223A3132302C2279223A3230332E373033373033393938313833387D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D30443235384332342D314631392D343233332D413937362D413044384342394441454143222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D34363841393635452D393339422D343733312D413232392D353137384436413042423834227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3131392E31393533313234393939393939372C2279223A3234332E373033373033393938313833387D2C2275707065724C656674223A7B2278223A36302E363438343337352C2279223A3234332E373033373033393938313833387D7D2C22646F636B657273223A5B7B2278223A31352C2279223A31342E3939393939393939393939393939367D2C7B2278223A34392E39393939393939393939393939372C2279223A34307D5D2C22746172676574223A7B227265736F757263654964223A227369642D34363841393635452D393339422D343733312D413232392D353137384436413042423834227D7D2C7B227265736F757263654964223A227369642D37363845453443392D333233432D343744422D423438302D344230323746333136433835222C2270726F70657274696573223A7B226F766572726964656964223A227573657232222C226E616D65223A22E4BABAE4BA8BE5AEA1E689B9222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C22657865637574696F6E6C697374656E657273223A22222C226D756C7469696E7374616E63655F74797065223A224E6F6E65222C226D756C7469696E7374616E63655F63617264696E616C697479223A22222C226D756C7469696E7374616E63655F636F6C6C656374696F6E223A22222C226D756C7469696E7374616E63655F7661726961626C65223A22222C226D756C7469696E7374616E63655F636F6E646974696F6E223A22222C226973666F72636F6D70656E736174696F6E223A2266616C7365222C22757365727461736B61737369676E6D656E74223A7B2261737369676E6D656E74223A7B2261737369676E6565223A223938623035316230333638316465363032383939336135643134616339336362227D7D2C22666F726D6B6579646566696E6974696F6E223A22222C2264756564617465646566696E6974696F6E223A22222C227072696F72697479646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22222C227461736B6C697374656E657273223A6E756C6C7D2C227374656E63696C223A7B226964223A22557365725461736B227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D33334642463234452D464537302D343730412D394442352D394231383831453133383437227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3631302E3039303838323633363434362C2279223A3238332E373033373033313034313134327D2C2275707065724C656674223A7B2278223A3531302E30393038383236333634343631372C2279223A3230332E37303337303331303431313432337D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C2273657175656E6365666C6F776F72646572223A22227D2C227374656E63696C223A7B226964223A224578636C757369766547617465776179227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D46423539344242452D383030352D344544432D423343382D393738314544323236433935227D2C7B227265736F757263654964223A227369642D34373638373538312D333535422D343335342D383433432D433330343233333238364146227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3735352E353435343431333138323233312C2279223A3236332E373033373033393938313833387D2C2275707065724C656674223A7B2278223A3731352E353435343431333138323233312C2279223A3232332E373033373033393938313833387D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D33334642463234452D464537302D343730412D394442352D394231383831453133383437222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3731352E313133303933303035303039392C2279223A3234342E31343432323136333535323135377D2C2275707065724C656674223A7B2278223A3631302E3537383039383232383233392C2279223A3234332E383437313639393931393532327D7D2C22646F636B657273223A5B7B2278223A34392E39393939393939393939393939352C2279223A33392E3939393939393939393939393938367D2C7B2278223A32302E352C2279223A32302E357D5D2C22746172676574223A7B227265736F757263654964223A227369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831227D7D2C7B227265736F757263654964223A227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C2273657175656E6365666C6F776F72646572223A22227D2C227374656E63696C223A7B226964223A224578636C757369766547617465776179227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D41453541454438342D303734362D343738372D393836462D364137393237433334433334227D2C7B227265736F757263654964223A227369642D35313046453036322D433042432D343643382D394231372D384133383037324132424336227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3431302E353435343431333138323233312C2279223A3236332E373033373033393938313833387D2C2275707065724C656674223A7B2278223A3337302E353435343431333138323233312C2279223A3232332E373033373033393938313833387D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D42324633433135342D434432322D343230412D424538422D363836444534373531423731222C2270726F70657274696573223A7B226F766572726964656964223A2275736572222C226E616D65223A22E8B083E695B4222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C22657865637574696F6E6C697374656E657273223A22222C226D756C7469696E7374616E63655F74797065223A224E6F6E65222C226D756C7469696E7374616E63655F63617264696E616C697479223A22222C226D756C7469696E7374616E63655F636F6C6C656374696F6E223A22222C226D756C7469696E7374616E63655F7661726961626C65223A22222C226D756C7469696E7374616E63655F636F6E646974696F6E223A22222C226973666F72636F6D70656E736174696F6E223A2266616C7365222C22757365727461736B61737369676E6D656E74223A22222C22666F726D6B6579646566696E6974696F6E223A22222C2264756564617465646566696E6974696F6E223A22222C227072696F72697479646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22222C227461736B6C697374656E657273223A6E756C6C7D2C227374656E63696C223A7B226964223A22557365725461736B227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D39394343413337462D413233352D343835332D383437322D444532333341443245443332227D2C7B227265736F757263654964223A227369642D30344339463239412D304242352D343639312D383034432D373634453445304132373136227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3434302E35343534343133313832323332352C2279223A3434382E373033373036363437323739327D2C2275707065724C656674223A7B2278223A3334302E3534353434313331383232332C2279223A3336382E373033373036363437323739327D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D46313234303339432D394237422D344134382D384531332D413635353335384246443345222C2270726F70657274696573223A7B226F766572726964656964223A22656E64222C226E616D65223A22656E64222C22646F63756D656E746174696F6E223A22222C22657865637574696F6E6C697374656E657273223A22227D2C227374656E63696C223A7B226964223A22456E644E6F6E654576656E74227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3930382E353435343431333138323233322C2279223A3235372E373033373033393938313833387D2C2275707065724C656674223A7B2278223A3838302E353435343431333138323233322C2279223A3232392E373033373033393938313833387D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D34373638373538312D333535422D343335342D383433432D433330343233333238364146222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E5908CE6848F222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D747275657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D46313234303339432D394237422D344134382D384531332D413635353335384246443345227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3837392E3932343335323534333835352C2279223A3234342E313431393535363839373437337D2C2275707065724C656674223A7B2278223A3735352E363139363535303932353931322C2279223A3234332E37343938323733303636323033327D7D2C22646F636B657273223A5B7B2278223A32302E352C2279223A32302E3530303030303030303030303030347D2C7B2278223A31342C2279223A31347D5D2C22746172676574223A7B227265736F757263654964223A227369642D46313234303339432D394237422D344134382D384531332D413635353335384246443345227D7D2C7B227265736F757263654964223A227369642D46423539344242452D383030352D344544432D423343382D393738314544323236433935222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E4B88DE5908CE6848F222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D66616C73657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365222C2273686F776469616D6F6E646D61726B6572223A66616C73657D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D42324633433135342D434432322D343230412D424538422D363836444534373531423731227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3733362E303435343431333138323233312C2279223A3430382E373033373036363437323739327D2C2275707065724C656674223A7B2278223A3434312E313234353432383830373233312C2279223A3236342E343831303438303538363234377D7D2C22646F636B657273223A5B7B2278223A32302E352C2279223A32302E3530303030303030303030303030347D2C7B2278223A3733362E303435343431333138323233312C2279223A3430382E373033373036363437323739327D2C7B2278223A39392C2279223A34302E3030303030303030303030303033367D5D2C22746172676574223A7B227265736F757263654964223A227369642D42324633433135342D434432322D343230412D424538422D363836444534373531423731227D7D2C7B227265736F757263654964223A227369642D39394343413337462D413233352D343835332D383437322D444532333341443245443332222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E9878DE696B0E794B3E8AFB7222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D747275657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365222C2273686F776469616D6F6E646D61726B6572223A66616C73657D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D34363841393635452D393339422D343733312D413232392D353137384436413042423834227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3334302E3534353434313331383232332C2279223A3430382E373033373036363437323739337D2C2275707065724C656674223A7B2278223A3136392E39393939393939393939393939372C2279223A3238342E363634363432313339373631367D7D2C22646F636B657273223A5B7B2278223A302E393939393939393939393939393939392C2279223A34302E30303030303030303030303030397D2C7B2278223A3136392E39393939393939393939393939372C2279223A3430382E373033373036363437323739337D2C7B2278223A34392E39393939393939393939393939372C2279223A34307D5D2C22746172676574223A7B227265736F757263654964223A227369642D34363841393635452D393339422D343733312D413232392D353137384436413042423834227D7D2C7B227265736F757263654964223A227369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C2273657175656E6365666C6F776F72646572223A22227D2C227374656E63696C223A7B226964223A224578636C757369766547617465776179227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D38344442433035362D303639312D343733452D383243462D443332354546373336413732227D2C7B227265736F757263654964223A227369642D30443039333043392D394241312D344636382D383545412D333834453136423430394130227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3330342E39393939393939393939393939342C2279223A3236332E373033373033393938313833387D2C2275707065724C656674223A7B2278223A3236342E39393939393939393939393939342C2279223A3232332E373033373033393938313833387D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D30344339463239412D304242352D343639312D383034432D373634453445304132373136222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E58F96E6B688E8AFB7E58187222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D66616C73657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365222C2273686F776469616D6F6E646D61726B6572223A66616C73657D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D46313234303339432D394237422D344134382D384531332D413635353335384246443345227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3839342E353435343431333138323233322C2279223A3439342E373033373036363437323739327D2C2275707065724C656674223A7B2278223A3339302E35343534343133313832323331342C2279223A3235382E343330323636363433303536327D7D2C22646F636B657273223A5B7B2278223A35302E3030303030303030303030303131342C2279223A37397D2C7B2278223A3339302E35343534343133313832323331342C2279223A3439342E373033373036363437323739327D2C7B2278223A3839342E353435343431333138323233322C2279223A3439342E373033373036363437323739327D2C7B2278223A31342C2279223A31347D5D2C22746172676574223A7B227265736F757263654964223A227369642D46313234303339432D394237422D344134382D384531332D413635353335384246443345227D7D2C7B227265736F757263654964223A227369642D30413541464638362D414541342D343231322D423146342D393237354134343036433244222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3236342E363438343436383730303037352C2279223A3234342E313133343337353334343137367D2C2275707065724C656674223A7B2278223A3232302E36323838393638373939393234352C2279223A3234332E39323238373637313139357D7D2C22646F636B657273223A5B7B2278223A34392E3939393939393939393939393938362C2279223A33392E3939393939393939393939393938367D2C7B2278223A32302E352C2279223A32302E357D5D2C22746172676574223A7B227265736F757263654964223A227369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733227D7D2C7B227265736F757263654964223A227369642D37463032463244352D413642412D343233342D413732342D334638393844323335413442222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365222C2273686F776469616D6F6E646D61726B6572223A66616C73657D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3339302E353435343431333138323233312C2279223A3232332E34303037363130373131373438387D2C2275707065724C656674223A7B2278223A3339302E353435343431333138323233312C2279223A3137322E363031353334383239363530357D7D2C22646F636B657273223A5B7B2278223A3230352E38303433363431303339333632382C2279223A3137312E303333383031323134313530327D2C7B2278223A32302C2279223A32307D5D2C22746172676574223A7B227265736F757263654964223A227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535227D7D2C7B227265736F757263654964223A227369642D30353145353938322D454646442D343337372D423137392D333730343841323346433232222C2270726F70657274696573223A7B226F766572726964656964223A226368696C64222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C22657865637574696F6E6C697374656E657273223A22222C226D756C7469696E7374616E63655F74797065223A224E6F6E65222C226D756C7469696E7374616E63655F63617264696E616C697479223A22222C226D756C7469696E7374616E63655F636F6C6C656374696F6E223A22222C226D756C7469696E7374616E63655F7661726961626C65223A22222C226D756C7469696E7374616E63655F636F6E646974696F6E223A22222C2269737472616E73616374696F6E223A2266616C7365227D2C227374656E63696C223A7B226964223A2253756250726F63657373227D2C226368696C64536861706573223A5B7B227265736F757263654964223A227369642D39443541314632382D393042372D343644322D414637462D353446464637383631343146222C2270726F70657274696573223A7B226F766572726964656964223A22737374617274222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22657865637574696F6E6C697374656E657273223A22222C22696E69746961746F72223A22222C22666F726D6B6579646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22227D2C227374656E63696C223A7B226964223A2253746172744E6F6E654576656E74227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D33453941414432332D343444412D344138352D383242442D443643383330413443343938227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A34382E3531383531383436343031303338342C2279223A3130312E30353130343034353136333330337D2C2275707065724C656674223A7B2278223A31382E3531383531383436343031303338342C2279223A37312E30353130343034353136333330337D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D32333041443633362D423038332D344132412D383446342D464445353430464443314333222C2270726F70657274696573223A7B226F766572726964656964223A22616C6C6D616E61676572222C226E616D65223A22E680BBE7BB8FE79086E5AEA1E689B9222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C22657865637574696F6E6C697374656E657273223A22222C226D756C7469696E7374616E63655F74797065223A224E6F6E65222C226D756C7469696E7374616E63655F63617264696E616C697479223A22222C226D756C7469696E7374616E63655F636F6C6C656374696F6E223A22222C226D756C7469696E7374616E63655F7661726961626C65223A22222C226D756C7469696E7374616E63655F636F6E646974696F6E223A22222C226973666F72636F6D70656E736174696F6E223A2266616C7365222C22757365727461736B61737369676E6D656E74223A7B2261737369676E6D656E74223A7B2261737369676E6565223A226438313861633661383663663161363464323138346266303639396436376138227D7D2C22666F726D6B6579646566696E6974696F6E223A22222C2264756564617465646566696E6974696F6E223A22222C227072696F72697479646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22222C227461736B6C697374656E657273223A6E756C6C7D2C227374656E63696C223A7B226964223A22557365725461736B227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D34454238313431392D314141372D343937452D413545452D453541454631374335453042227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3138392E39393939393939393939393939372C2279223A3132362E30353130343034353136333330337D2C2275707065724C656674223A7B2278223A38392E39393939393939393939393939372C2279223A34362E30353130343034353136333330337D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D31434331333342322D343442312D343833302D394335392D374433353634433933334641222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C2273657175656E6365666C6F776F72646572223A22227D2C227374656E63696C223A7B226964223A224578636C757369766547617465776179227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D41323335414337362D354242452D344133382D383243342D313045453831414638343635227D2C7B227265736F757263654964223A227369642D44413934353339452D463639342D343041312D424534412D424343433144394244313144227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3237352C2279223A3130362E30353130343034353136333330337D2C2275707065724C656674223A7B2278223A3233342E39393939393939393939393939372C2279223A36362E30353130343034353136333330337D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D46363844434341302D463741342D343444342D394534342D353641363832443837454341222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22657865637574696F6E6C697374656E657273223A22227D2C227374656E63696C223A7B226964223A22456E644E6F6E654576656E74227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3334382C2279223A3130302E30353130343034353136333330347D2C2275707065724C656674223A7B2278223A3332302C2279223A37322E30353130343034353136333330347D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D36393442374132412D393841442D343530442D383146452D313135424335363237354244222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22657865637574696F6E6C697374656E657273223A22227D2C227374656E63696C223A7B226964223A22456E644E6F6E654576656E74227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3236392C2279223A3136337D2C2275707065724C656674223A7B2278223A3234312C2279223A3133357D7D2C22646F636B657273223A5B5D7D5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D37463032463244352D413642412D343233342D413732342D334638393844323335413442227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3539362E333439383035343232313539342C2279223A3137322E31303230383039303332363630387D2C2275707065724C656674223A7B2278223A3138342E37343130373732313432383638362C2279223A312E34323130383534373135323032303034652D31347D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D33453941414432332D343444412D344138352D383242442D443643383330413443343938222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D32333041443633362D423038332D344132412D383446342D464445353430464443314333227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3237332E38323738383237343432393137342C2279223A38362E30353130343034353136333330347D2C2275707065724C656674223A7B2278223A3233342E323333353534303139323935382C2279223A38362E30353130343034353136333330347D7D2C22646F636B657273223A5B7B2278223A31352C2279223A31357D2C7B2278223A35302C2279223A34307D5D2C22746172676574223A7B227265736F757263654964223A227369642D32333041443633362D423038332D344132412D383446342D464445353430464443314333227D7D2C7B227265736F757263654964223A227369642D41453541454438342D303734362D343738372D393836462D364137393237433334433334222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E5908CE6848F222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D747275657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D37363845453443392D333233432D343744422D423438302D344230323746333136433835227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3530392E35363538353533373434373936372C2279223A3234342E3134363035383632333436327D2C2275707065724C656674223A7B2278223A3431302E3533343738323038383137322C2279223A3234332E383533313435353137393831367D7D2C22646F636B657273223A5B7B2278223A32302E352C2279223A32302E357D2C7B2278223A34392E39393939393939393939393939352C2279223A33392E3939393939393939393939393938367D5D2C22746172676574223A7B227265736F757263654964223A227369642D37363845453443392D333233432D343744422D423438302D344230323746333136433835227D7D2C7B227265736F757263654964223A227369642D41323335414337362D354242452D344133382D383243342D313045453831414638343635222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E5908CE6848F222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D747275657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D46363844434341302D463741342D343444342D394534342D353641363832443837454341227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3530342E32343839303939393834363832362C2279223A38362E34323734383336353430383030367D2C2275707065724C656674223A7B2278223A3435392E36333934393434333031303534362C2279223A38362E31343333343732343931383630327D7D2C22646F636B657273223A5B7B2278223A32302E3530303030303030303030303031342C2279223A32302E357D2C7B2278223A31342C2279223A31347D5D2C22746172676574223A7B227265736F757263654964223A227369642D46363844434341302D463741342D343444342D394534342D353641363832443837454341227D7D2C7B227265736F757263654964223A227369642D44413934353339452D463639342D343041312D424534412D424343433144394244313144222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E4B88DE5908CE6848F222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D66616C73657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D36393442374132412D393841442D343530442D383146452D313135424335363237354244227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3434302E30383436333334333233383532362C2279223A3133342E333339333232313439353833337D2C2275707065724C656674223A7B2278223A3433392E38353834353834393631383834362C2279223A3130362E303930353433323636373635397D7D2C22646F636B657273223A5B7B2278223A32302E3530303030303030303030303031342C2279223A32302E357D2C7B2278223A31342C2279223A31347D5D2C22746172676574223A7B227265736F757263654964223A227369642D36393442374132412D393841442D343530442D383146452D313135424335363237354244227D7D2C7B227265736F757263654964223A227369642D35313046453036322D433042432D343643382D394231372D384133383037324132424336222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E4B88DE5908CE6848F222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D66616C73657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D42324633433135342D434432322D343230412D424538422D363836444534373531423731227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3339302E39383338303830363836333436332C2279223A3336372E38363338363638373439393039357D2C2275707065724C656674223A7B2278223A3339302E36363935373435363738313135342C2279223A3236342E34383130343334333933333531377D7D2C22646F636B657273223A5B7B2278223A32302E352C2279223A32302E3530303030303030303030303030347D2C7B2278223A35302E3030303030303030303030303131342C2279223A34307D5D2C22746172676574223A7B227265736F757263654964223A227369642D42324633433135342D434432322D343230412D424538422D363836444534373531423731227D7D2C7B227265736F757263654964223A227369642D38344442433035362D303639312D343733452D383243462D443332354546373336413732222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E4B88DE5908CE6848F222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D66616C73657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3337302E363730303939393039323233372C2279223A3234342E31303931303034353732383030387D2C2275707065724C656674223A7B2278223A3330352E33373533343134303839393932352C2279223A3234332E37393833303735333930383735357D7D2C22646F636B657273223A5B7B2278223A32302E352C2279223A32302E357D2C7B2278223A32302C2279223A32307D5D2C22746172676574223A7B227265736F757263654964223A227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535227D7D2C7B227265736F757263654964223A227369642D30443039333043392D394241312D344636382D383545412D333834453136423430394130222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E5908CE6848F222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22247B666C61673D3D747275657D222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365222C2273686F776469616D6F6E646D61726B6572223A66616C73657D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D30353145353938322D454646442D343337372D423137392D333730343841323346433232227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3238342E323935353338353539393932382C2279223A3232342E34393134393033323031333735337D2C2275707065724C656674223A7B2278223A3139332E35383236343937343733333034362C2279223A3137322E313532383934353937323330387D7D2C22646F636B657273223A5B7B2278223A32302E31363137303636333435343032382C2279223A312E323837353339313237343833333730337D2C7B2278223A362E3530383031393933353239333633372C2279223A3137302E38303635303532363235393035357D5D2C22746172676574223A7B227265736F757263654964223A227369642D30353145353938322D454646442D343337372D423137392D333730343841323346433232227D7D2C7B227265736F757263654964223A227369642D34454238313431392D314141372D343937452D413545452D453541454631374335453042222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D31434331333342322D343442312D343833302D394335392D374433353634433933334641227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3431392E333839353234303834323934342C2279223A38362E34363037373339383738363638347D2C2275707065724C656674223A7B2278223A3337352E333639393734303934323739332C2279223A38362E32373032313331363533393932347D7D2C22646F636B657273223A5B7B2278223A35302C2279223A34307D2C7B2278223A32302E3530303030303030303030303031342C2279223A32302E357D5D2C22746172676574223A7B227265736F757263654964223A227369642D31434331333342322D343442312D343833302D394335392D374433353634433933334641227D7D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A313230302C2279223A313035307D2C2275707065724C656674223A7B2278223A302C2279223A307D7D2C227374656E63696C736574223A7B2275726C223A227374656E63696C736574732F62706D6E322E302F62706D6E322E302E6A736F6E222C226E616D657370616365223A22687474703A2F2F6C656E6F73702E636E23227D2C227373657874656E73696F6E73223A5B5D7D,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('142519', 14, 'source-extra', NULL,
+		0x89504E470D0A1A0A0000000D49484452000003BF00000221080600000086FB0D1D000000206348524D00007A26000080840000FA00000080E8000075300000EA6000003A98000017709CBA513C0000000467414D410000B18E7CFB5193000000017352474200AECE1CE900000006624B474400FF00FF00FFA0BDA793000000097048597300000EC400000EC401952B0E1B000020004944415478DAECDD097854D5F9C7F17726FB4A080989088208B20B620444145454A854AD08844544C5B58A50A46E55B0EE555BFBB7D52A5A5141826241C50A8A821659944D0908B21804214080908410B2FECF7B3213424820099964327C3FCF739FC9EC933377EEBDBF7B368700A7A0952B575E565454342E3737B77B767676A3C2C24207A50200288FC3E190D0D0D08C9090901F9C4EE7DF3B77EE3C935201807AB83DA708702AF9F2CB2F3B040505CD34C1F7EC264D9A38A3A2A2A4418306620E66281C0040B90A0B0B25333353D2D3D365E7CE9D66175294626E4EECD9B3E7B7940E00107E01AFF3BFFFFDEFB70505051F9C79E69901CD9A35B367F20100A8AA6DDBB6C9962D5B0A222222EE3CEFBCF326532200503FF85104385582AFB978AF73E7CE41717171045F0040B5698BA1989818A709C1FDEFBCF3CE6D93274F5E4DA90000E117A873F3E6CD6B6B2E3EEBD2A54BA81EB0000070B2020303253A3ADAB975EBD67EC3860DFB70EAD4A9BB291500F06E7474C4A9708032F9ACB3CE0A22F802006A527878B898FD4BB0F10EA50100845FA04E7DF6D9675D9C4EE739CD9A35F3A7340000354DC790F0F3F36BF5F9E79FF7A0340080F00BD41987C331F0F4D34F2FA48F2F00C0539A366D1AEC743A8750120040F805EA8C9F9F5FBFE8E8E8284A0200E029515151FE26FCF6A7240080F00BD49982828273E8EB0B00F0A4888808C9CFCF6F4D490000E117A84B814E27AB3900C0830753C5FB1976360040F8050000000080F00B0000000000E1170000000000C22F0000000000845F0000000000E1170000000000C22F0000000000845F000000000008BF0000000000107E010000000020FC020000000040F8050000000080F00B0000000020FC020000000040F8050000000080F00B0000000000E1170000000000C22F0000000000845F000000000008BF0000000000107E0100000000845F000000000008BF0000000000107E010000000020FC020000000040F8050000000080F00B0000000000E1170000000000C22F0000000080F00B0000000000E1170000000000C22F0000000000845F000000000008BF0000000000107E0100000000A80C7F8A00404D397CF8B07CB7E53BC94ECB16E761CEADD5967CFF7C713472C8392DCE91D3224EA34000000008BF003C65EFBEBDB2227985EC8DD92B07CE3A2087430E5328B52430275022D32365F5CAD5B2AFCD3EE910DF814201000020FC02A8695AE3BB3A79B56C3D73AB6487675320B52C373857D2E2D3242B324B6483485C789CC484C75030000000A5D02E11C0494BD99A227B62F6107CEB584E688EEC6BBC4F92372553180000006550F30BE0A4EDDABD4BD25BA69FF07121BB43242C254CFC33FCA5C8AF4872E27224F3EC4C29F42FA4106B48465486C4FE144B410000009441CD2F8093969B937BC23EBE213B43A4C10F0D24E04080388A1CE2CC774AE8AFA1D2E8BB46E22870508835F55D04E78A338F4D3B000000E117409D08DF126E436F59FE59FE12921A420101000080F00BA09E6F68729DE29F5D712F8B808C000A09000000845F00F5DB099B35D3E517000000845F000000000008BF0000000000107E01D4AD82A00229721455787F6120ED9E01000040F805E0035B9A43A71D2AF72E3BDF6FE31CCA08000000845F00F5DF810E07A420A4E098DB33DA66485E833C0A08000000845F00BEEB8423410300000035C09F2200E06901990112B93E52FC0EF91D735FE44F91E2CC734A668B4C4EC701000080F00BA0FE711439246C6B98846F09AFB886B750247C73B804EF0A9603ED0E486E542E0507000000C22F80FA21E0408034D8D0C05E566A6394E52FD1CBA325FB8C6CC96895412D3000000008BF00BC3FF8C62C8FB1B5BA55E1AE29F6CFF6977D5DF65190000000A831D4AD00A871B68973E1493E1F3849D9D9D9140200002841CD2F801A971B9D2B3B2FDF4941A0CE7CFFFDF7F2CC33CFC8030F3C209D3B77A64000000035BF0000DFB27CF972F9BFFFFB3FE9DFBFBFFCF39FFF9475EBD651280000809A5F0080EFF8EAABAF64DAB4693266CC185BE3DBBE7D7B79E18517E4E1871F96962D5B7AF4BDD7AF5F2FFEFEFE76294F7A7ABAA4A6A64ABF7EFDCABDFF89279E90112346488B162D243F3FBFC2D7010000845F00C0296CD1A24536F86A536777D04D484890912347DA26D07FFEF39F253E3EDE63EFBF74E9521B70BB74E952729BBE5F70707049385EB162C551E177E1C285F6322B2B4BC2C3C3ED750DC89B376F96DB6FBFDD7E7E000040F80500C0FAF0C30F65EEDCB947055FB7DEBD7B8B9F9F9F3CF5D453F2C8238F486C6CACC73E8706DF3E7DFA9404DAB4B43449494991EDDBB74BD3A64D252C2CECA8C7BB1F7BE79D77CA2BAFBC229B366DB24DB5274F9E2C39393925CF030000845FC0EBA4E6EE93CFD3BF936F337E941FB3B7CA9EBC74C92ECC91206780C4044449FBD0E6D235BC8D0C88EE29F181D11418709266CD9A25F3E7CF978913275658B3DBAB572FC9CBCB93C71F7FDCE301D85D9B5B9ABB29B39B06DB3973E6484C4C8CBD7EE18517DAE769D8BDEAAAABECDF5A53FCEBAFBFDAFF8B26D00000107E01AFF1F9FEE53275F767F2EBE13DD23DB29D5CD5E80219D774B00DB8A1CE601B80F7E765CA4F87B6C9E28C6419B1FE717BDFA0D84BE49A46BD2840A01A66CE9C295F7FFDB54C9A34E98481F6924B2E916DDBB6D900FCE4934F4A444484473E93D6FE6A187707DBD5AB57CBB5D75E6B9B33BB6953E8EBAFBF5E9292926C736777EDAE865C0DC09F7CF289ADFD8D8A8AF268F9EDDBB7CF8E8CAD8B968D5ED760AE9F4FCBA759B366D2B1634739F7DC733DDA641C0000C22F500F68D87D74EB1BB6C6F7BEA689727183CEE2E7F03BE6711A80438382E5F4A058B924AAAB3C7CC648F9FAC0F7F2E2AFEF49D2EEF9F24CCB3BA4791007974065BDF6DA6BB69970556A72B5FFAF863B0DBF1A98DDFD716B8ABBEFAEF6ED7DFAE9A7ED6D6FBDF596DC7DF7DDE53E5E3F8B8662773F6177C0D4D7F164F0D5A0ABC15B6B97BB76ED2ADDBA7593C18307DBF70C0D0DB59F2B33335376ECD8214B962CB127195AB76E6D1FE3E981C3000020FC025E68CEBEC5F2D42FEFC8CDF157C94D71FDCB0DBDC7A34159977776CF93A13F3E26F7371B4E2D3050C9E0BB65CB161B7CAB5A837BDB6DB7D9E76B1F60ED23AC61AFA6681F5FADBD2D5DCB6B77B6C769B65CBA9FB09B06664F282828B0A177F1E2C572F5D557CBD8B163252020E098C7E949015DF4A4828E9A7DEBADB7CA82050BE4B9E79E93EEDDBB4B6262628D9F38000080F00B78A905E92BE5F9ED49F272AB3F4897F0D627F55A3734BE5212C2DBCA9D9B5E90C385793238F6120A182887F6DBD5397CB579AE4E5F54DDA6CB1A805F7AE92579F1C51765C28409E506C0EAD2BEBD5A233D65CA14DBF4594780D69AD4F2E8FD5AFBAABEF8E20B3B389706650D98354DCB4CFFDF56AD5AD9105B95D0AF0386F5EDDBD7F69D9E3D7BB6AD351F3F7EBC47FB4E030050D39C140150755AE3FBD82F53645A9B474E3AF8BAB50B6D6E5FEFE59DB3E4C3BD8B2864A09CE0ABE1EDF0E1C3D5AAF12DEB8E3BEEB0A15783A0BE764DD1A0AB4D9E478D1A2503060CB0AF5F7AB0ABD221596DDDBA55DAB66D2B43860CB101586B81753A249DF7D71D8C6B22F86A60D5E6CDDAF4BBBAB5DD5ADBABB5BE1A84B5E67CCF9E3DAC980000C22FE0ABB48FAF36757EB1E53DB6FF6E4DD2D77BA5D5787976DB34D992B383C2064A05CA175E78C136DBD59ADA9A6872ABC1D7DDEC57A717D2D7AE09DAE7576B48DDB47677F9F2E576202BBDCF1D7C1F7BEC315BCB1B141464FBFAEAC0525A9BAA35C53ADAB3F613D6FFF964E9FFA5270DAEB8E20A1BC66B82865F1D955A3F5F45B5DA0000781B9A3D0355F450CA64DBC7B7A66A7CCBD21AE03B9B5C2B0FFFFC9A4C6F378902C7292F3B3BDB0E50A50151FB9E6A58D580A873E39675FBEDB71FD37FB6A2C76AE08D8E8E967BEEB9479E79E6193BBAB2BEBE36F1ADD60ED5045977B82D4D0791D2D19C6FB8E10679F3CD374BC2EF79E79D6743A44E83A4B5B2A56978D6E7FDED6F7F3BE9F2D33EBEDAD4B9A6826FE900AC7D9CF5F5B5961B00006FE74711C0978D1C3972524D8E4CAAD3197D99BE429E6A719BF83B3CF7F3E91CD64ADEDE3D5742FD82A56DE8195E5FCE3AF0D09E26347FF4168D7736F6991179DDC157A7DCD166CA818181F676ADF9D5DB3232326CB82D2C2CB4B7AF5DBB567EFBDBDF8AD379A461D3F3CF3F7F54F35C7DDE75D75D279D3A752A09AD3ACFAE4E2FB471E3463BAD4FE9E757D639E79C639B2F974743F6E8D1A34BA63FD2F7D4C7EAFBE86D1AD84B2FEEEFCFFDFF56978EEAFCDE7BEFC99831636AB45FB39B86EA37DE78C396A5A7A765AA0FDBC177DE79E731B64000E0BD68F60C5481CEE3ABD3190539033CFE5E0F341B6EA740AA0DB366CDB2CD326BAAD9274E4D35BD1E6960D5BEBDCD9B372FB746D63D28944ED5E3A64D705F7EF9E592EB8B162D929F7EFAA9E4BAD6CC6A70BEF4D24B8F7A2D0D863AF2B3865F13607CA64CB556569B27D7E488D6A569590E1C3850A64D9BC60F0000E0F568F60C5492CEE3BBF570AA9D9AA836F48CEC248FA6FCDBF631AEE9BEC56569CD903B0068EDD5E5975F2E6DDAB4F19AA94CF6A6EC95C0B04089882D1EE068C5FB2BA4F979CD25A665CC318FCDD89521E93BD2E58C738FAE312FCC2F94ECF46C098F09AFD27B17E416885F60F9B5FC8BDF5A2CDD8776AFF07EF7635AF66829F16DE2E5D735BFCAE99D4EB7B7EFDBB64FA29B45FBD46FC4BD1E69D0D240AA4D77ABBB1E69F0D5019534E00E1A34A8C2A6C8DA6459477DD6DA536D826BCB7CF162B9E69A6BE4B4D34EB35306951ECC4A3FCB5D77DD556E2DA87E6E0DC08F3FFEB87DEE95575EE935651A1212629B4957A54C75902B1D304BFB357BD225975C623FA74EEFE49EA71800006F44B367F8B49A6CF63C6BEFD712E1172A97459D576B9F7F67EE5EF935374DBA869FEDD1F7F9E0830F8A036261A1ECDCB9D3D696CD9D3B57525252EC4177A3468D8EDB0FD2D3CD9E43A342E5F5E1AF4BE7DF7616FF407F59F8CA42E93EBCFCA96016BDB1481C0E87C49D1D27DF257D678370DACF69F2DFA7FE2B7987F34A42F1C17D0725E5DB14D9BB75AFECFC71A7FCFCEDCFB274EA527BDFBACFD649E6EE4CF965D52FF2E3FC1FE5AC9E67D9DBD37F4D97E0C823A163F7C6DD927B28571A366D58725BD9C72C7B779974BEBAF8734FB9698A240C4A10A79F535E1BF29A741FD6DD7ED69A5657CD9EDDEB9186CD5F7EF9C5AE475F7EF9A5FCFAEBAF366C9E683D72DBB163873CFBECB3B629F2E0C1838FDB045943A0F69F3D74E890ECDDBB578A8A8AECEDAB57AF9675EBD6D941A6DCB769D3639D4AE878D308858585D9FBFFFDEF7FDBA6C975DD7CDC5DA6FA3FBACB544784D6323A51997EF3CD37B6D9748F1E3D3CFA19F5FBD1ED466666A69C7DF6D972AAA2D93300783F6A7E814AFA36E347B9AAD105B5FA9EDD22DAC9F43D5FC8E8F801B5FEFFEA7432CB962DB38B860077AD93F687ACEE8040D5A12155C36FB7A1DD2420284036FE6FA35CF5F0557260E7011B3283C2824A1EABB5B45AF37BD9BD97C9FA05EB8B83A6BFD3D6B286350A930B6FBAF048C8890EB30139796EB274B9A68B048707DB00DCFEF2F6F2DDBEEFA4E505C5A167DDE7EB4A9EB362E60A896F1B2F0E677160CDDC93693F83FB319B166DB2AFABEFAF35CD1AB60BF30A256D4B9AFD3FA29A4495D4126B6076BF8E2FD340F4D5575FD94583AA06CB8484840AD7239DF647FBF85E7DF5D5951EA0496B797FF8E10769D7AE9D242727DBDBB41678FFFEFD257D817544650DB6DAD7F74434243FF4D043F2E8A38FDACFA8359BDE242B2BABA44CF5FFD2705B5E996A595C7041ED6CB3F47BFDECB3CF6A7C502D000008BF401DF8317BABDCD72CB156DFF3EC9066E67D53EAFC7FD75A277710D683EDF6EDDBDB26A17AE98941744AD3A6C26BE7AD953697B4B181B6A8B0487E4DFE55367EBD519A7569265D071EE9EFB974DA52B9F28F57DAE6CD8BDF5C2CCD3A3713FF207FF9E4F14FA4C3951D6C20D530ECD6E0B406E217E0671FA3A1B420AFC006D91DC93B6C4D6D79F475DCB45659436C930E4DECF5B8D671D2A84523FBB706DFCC5D99367C854485D8DB97BEB3D47E367D4FB7C9C326CBF09787DB80EFEBB43FAE3BB4E91CBD3A48D2C5175F5CB21EB983EFD0A143AB1C3875B4E1BFFEF5AFB6E9B20E92654F8694EA27ABC15B1F53D91337B1B1B1B609F49FFFFC67FB9AC7AB2DAE4B7A92CA5DA61AEE3B77EE5C52A65A9E3A276F6D68D2A4891D5C0B0000C22FE003F6E4A54B6C40ED8E66DA3020420EEECD909933677AD5C1F6AA55ABECE20E099EAC5DD2B07A5AFBD36C8D6C695A935ABAFF6ECA772936B86A88DCF4CD2619F4C220C93F9C2F5FBFF6B50CFCCB401B9A678C9B216DFAB4B18159AF6B18D6C09B919A216929693694EAFBE86B9FDDBBB8F966E99A5FADD19DF7DC3C1BBAD5AE0DBB243C3ADC86E07DBFEC939C8C1CE93BAEAFBD4F6BA4835A06D960ADB5C1FA180DBE9BBFD92CD16714F7F5D5D7BA72C295351E7CB566D09BD699F2688DB0F6CDD5C5AEEB0D1BDA75AB3AC157E908CE3A4AF2CA952B8F1AE04A454646DAD7D44058153AD0D61FFFF8471BAA75D0A9B8B838AF2ED383070F1E55A6DAA45EFB4ED7463F5C3D99A1DF290000845FC0076417E648A8B3760780D2F78B48CE970F967CE0BD2705CCC1F5B7DF7E2B2DFAB5F0C8EB6B48AD88BB49AB6A717E0BB979CACDB2E1AB0D72FE90F3252B2DCB2EFD1FE85FF298A12F0D95590FCDB2E1579B1CFFF8C58FB649B23647D6005A999A5FED3FAC81556913EB3697B6B14177CB922DB2F797BD4707BC3D99F6F597BFB75CCE4F3CDFBE47A7AB8AA7D739907A40125F4A94C090C01A2F330D7FEE9313F5853651D690AA73C7569736B95DB06081ED835A7ADDD01A609DFEA83A7470291DFC4AFBDAD637DAD759478B764FE9E4495AB3AE35FB0000107E011FA041B4B603B0BE5F66477F19D8E41A8FBE8F7B509D13D19A24F7E0416E5A1BA6FD0DD324CD239F4D436AD69E2C1B4A5337A4DA5193D5C1BD07E5F48EA71FF5D8ED6BB6DBD0AACD8CB5FF6F5078906D32AD7FFB07FBDBA6D2DABFD7AD63FF8E92B5374B5AF56A6503ACD6CC96AEF9D57EC01A608F0ADCF98525B5C13BD7ED94D006A1F6B5F5EFC8F8C892C76918D6C1B734F0260C4E3826E436886FE091E0AB74D0A1BA1CF0AA3AB4E6579B2B6BD3FAEA3631D626CD5A7B5C3AF82ABDADEC7A5B591B366CB08339697FF7BAA8F9AD4C99EAEF5297B2FFB79E04D0FED0B54183AFB78C0E0F0000E1173849DAE4599B3E370FAABDA93CF6E7654A58A348B9FED2EBEBEC00BB74E0D54BEDFFA835491A06B47FA1F6D59C3F7FBEC7C26F6CCBE2699E34446AB3620D99DAFC58A73ADAB3F9C808D35A433CFBE1D9B66FF0B9D79D5BD20F57BD3DFA6D19F9FAC8639A4E977EAE8EECDCF692B63628BB9B43EFDFBE5F0EEE3F2851A71F69EEAECDB0DDAF53BAE6578372E99A5F1D304B97997F3C7EF363AD9DAEEAF44B27A273D99E4C0D6A6D84DFF2D623779F5F0DC1D569FAFCE1871F96F4F72D4DFBACBFF2CA2B72DF7DF755E9F5F4F3FCE52F7F915B6EB9457AF6EC5927DB9DCAFC36DD4BD932D526DBB515D8B5C9B3367D060080F00BF88076A1CDEDA057B5197E7F3AB4CDBC6F8B5AFF5FB506CD3D58901E546B8D8E1E4C6BDF5E3DB8D683ECDAE01EE04AFBE416362DB4CD95577EB0D2DEA7FD6D359CEA3CBAC3FE31CCD6108FF9EF187BA9E15547856E7D51EB0A5F5B43AED6E06E5EBCD986081D195A03F0E1ECC3B27BD36E1BB6B5E638A441C851CFD39AE7F26A7E752E621D3DFA8421614FA6ED1F5C12B0566C3D6A102D5F76A2F548FBD83EF2C823767E5F559500AC53FF7CF2C927929B9B7BE44445A9E6CF3AF5918E7EDCB163C74ABD9E36E77FE6996764C4881175167CCBDD69FBFBDB305F99DFA696A706F8DAE8F3ABE5AFFDAE010020FC023EA05B643B599C912CFD1AD6DEA8AFDF66FE68A73BAA6D1A7CDDD3D2E8F4295DBB76F5F8A8CE65E564E6D8519AC7CE1D2B2B3E582105F9C561DC3DBAF3EA0F57CB75CF5C676B4E6D58D9BC473E7BE133898C8B9433BB9D59612DEF8EB53B6CAD704E568E0DB9EEE0ACCEEC7E667140DD9D696B6D75A02A7D7C695AEBEC56BAE6B72C6D429D7B3057F20EE515071513E2B7FFB05D56CF5E2D17DD7A917D7FA503616D5BBDAD64102D5F0CBC55598F3440E908CB1A807500A7CA4E9DF3AF7FFDCB3EBEF4FBEA929E9E5EB24EBFF4D24BF2EAABAF9EF8044566A67D7F9D63D8DBA639D2E05BD932D5A0AF0375D5C648D5DA5C5DA79A020080F00BF880CBA3CE9737523F9182A202F173D4CE3CB79FEF5F2E6FB579A8D6FE47AD35D211717BF7EE6D2F6BAB86B7DCD014112CE3BF1C6FFF3EEB82B3E4F3BF7D2EDF7FF47D49903CADDD69F6EFDE77F6B697B167C54ABF3FF62B996A68CD276B6C13650DB6DACFD75D5B9B9B9D2B118D23242236A224C86A1F5FED1BEC6E7EAC4D98B546D686F08C1C3B976F74B3E8634F12E415D8F0AA531C1D539651A17664670DE5EE707CCDE3D794D4F2F6BAA5972C9DBAD4F651D6E9927CC9C9AE473A82B8CEB3FBF8E38FDB66CC1A428F67CE9C39B6E6B1749F570D7E3AF54F4A4A8AADFDB4272B3232E4F5D75F97D1A34757F85AEE1A5F1D39DA9B826F75CA5483F1F4E9D3252F2FCFA327AFF4C482866C3D69010000E117F001F181D1B6C9F3D707BE974BA2BA7AFCFD1667AC91D88006727A50ACC7DF4BC385060EAD21AAED1ADECAD0409BF8F7C44A3DCECD3DAA7265680D6FB7A1DDAAFCB97A0CEF61E707AE887E86D29FA374F3E68A6AA6EBB39A5C8FF475DC4DA035BCE97CB5E5CDD1AB35BB1A7E4BD7FA6A9FE7DB6EBBCD7E86FBEFBFDF8E22ADC1577DFDF5D7D2AF5F3F69DAB4E931AFA5415B836FEBD6AD2B5DE3ECCD651A1D1D2D6DDBB6952FBFFCD2CECBED293AC2768B162D6AA57935000027C34911009537A2F115F2FCF6245BFBEB69FA3E898D6B67D0A2DFFDEE7776901C6F0CBEDEEC78C1F75454D3EB91BB06586B15274F9E5CD20FBDB4BFFFFDEF72E8D0A192EBFADE43860CB1832F69F3E061C3861D350AB106E9679F7DF698D7D1DB35F8EA28D9B7DE7A6BB941BB3E96A99E34F8E8A38FCA1D08AC26E828CF3A2897BE0F0000845FC0875CDE30411AFA47C89BBB3EF5E8FBBCB37B9E0439026440F405143A4E691A80274E9C689B2F970DC01A8A5353538F1AE44AE7E42D3DD2B5D6986A4DAED682BAE99CC23A3856E900A7A34C3769D244EEB8E30EAF09BE3541FB50EB805D3367CEF4C8EBCF9E3DDB96715D4CAD050000E117F0B067CFBC43FE9DFA89ACCEDAE891D7D711A55FD9315B9E3CF3B65AEB5B0C78B3A8A82879F4D1476DBFDE175F7CD106606DEEFCC20B2F940C68E576EFBDF71EF37CADFDDDB7EFC808DBFAFCA953A7DADBDC0361694DB137D5F8D624AD95DDB469937CFA69CD9EB4D3E6CE3A8A36B5BE0080FA823EBF4015691FDC87CEB841C66E7949A6B579A446FBE4FE7A788FDCB9E905B9BFD9706919DC84C2065C748027ED03AC8157C3EAEF7FFF7B3B98536568AD6F458FD551A2B5C9F38409137C32F82AFDBFC68E1D2B93264DB2D7FBF7EF5F23C157C3B4965BE966E5000078336A7E816A1810DD53C6341928C3373C5E6335C05AE3ABAF3734F632B9A6512F0A192843FBBD8E1F3FDE86D5E79E7BCE36573E19494949B6F657039CAFF777D713001A7E972C59226FBFFD76B5CB4E9FA7E5366FDE3C5B6EDA2C1D0000C22FE0E3AE8BE92DF7354D94DB363E27AFA7CE39A941B0B48FEF2D3F3D6303F5EDA75D43E102C709C05A8BA9CD947524E8EA86B869D3A6C9BA75EBEC6B9D2A03BD6900D6FED35A13AC271134C09637885879F4715ADB3B6EDC385BE61AA409BE0080FA8666CFC049D01AE073C35ACB4329936556DAD7B6B9F2C50D3A57FAF93A9DD1DF7E7DDFFC109D32B5ED233475062A1980EFB9E71E79EDB5D76C087BF8E1876D18AEAC59B366C99A356BEC734FB526BB1A7C870F37DBA98B2FB62700B4165707AC4A4848B0D33FE9B450DAC45C036E6666A61D504C6B8B57AD5A6507CFFAC31FFE600710030080F00B9C82B4CFEF5B6D1E92B9FB97C91BA99FC8A35BDFB001F8A2C8CE72766853890D88925067B06417E6C8FEBC4CD99CB343966424CBE7FB97DB797CDDCD9C19DC0AA81A9DCB5703B0865FED0F5C999A480DBE5A83A9A33B9FCA7D5535C83EF0C003B6D9F7CA952BE5ABAFBE92EDDBB7DB01C434F86AD9E809051D01BB63C78E72F5D557338F2F0080F00BA058BF86DDED929ABBCF06E18FF62E9235DBB6485A5EBA1C2ECC932067809D26A95D680BE916D1CE06E69A1C2C0B385503F0942953E4F1C71FB773021F2FA0CD9F3F5F3EFBEC33F9F39FFF5CA59A625FA64DA1756AA8D2D343010040F8055029F181D1322AAEBF5D0078DEA851A36C935DED035C5100D69ACD8F3EFAC8D676D2571500805313035E0100EA3DADB91C3C78B09D0F78CB962D47DDB77CF972DBBF558371F3E6CD292C000008BF0000D45FBD7AF5B28339697F5E1DC9592D5BB64CDE78E30D5BE34B9F5500004E6D347B0600F88CDEBD7B4B585898FCF5AF7F95B8B838D9B56B971DA1B865CB96140E0000A7386A7E01003E45A7ED39F7DC736DF367BD6CDFBE3D8502000008BF0000DFA3B5BEA52F01000008BF00009F939F9F6F2F030202280C000040F80500F8A68C8C0C7B1919194961000000C22F00C03715161616EFE49CECE6000000E1170000000040F80500A07E4A4F4FB7975151511406000020FC02007C535E5E9EBD64C02B000040F8050078B5ACAC2C993061C231B7A7A5A5C9A041832435359542020000845F0040FDB57AF56A090F0F97B3CE3AABA409B3DB942953E4F1C71F97F8F8F80A9F4FCD2F000028CB9F220000789B175E7841DE7CF34D69DBB6AD3CF9E493929C9C6CC370AB56ADE4C61B6F94EDDBB7CBA64D9B64C08001E53E3F3333D35E46444450980000C0A2E61700E075AEBAEA2A19376E9C6DDAAC7FDF7FFFFDF2DC73CF499B366D6C20EED1A3877CF3CD37153EBFA0A0C05EFAF9F95198000080F00B00F03E5AA3ABFD7A1F7EF8E172FBF53EFFFCF39293932341414114160000A8349A3D0300BCCAA2458B6C13E7E0E060E9D8B163C9ED7ADB575F7D25975D7659C914461F7EF8A124252555F85A63C68C39EAFAC08103E5FAEBAFA7900100380551F30B00F02AA3468DB2E1F6C1071F94F5EBD797DC1E131323C3870F973E7DFA88BFBFBF1C3E7C585AB46851A5D73EDE20590000C0B751F30B00F03A5ACBFBCA2BAFC8C2850B6D13686DE69C9292629B41CF983143F2F3F3E5CA2BAF94CE9D3BDB41ADDC035C1D8F3693EEDEBD3B850B0000E11700AA27242444427342253B389BC2A863813981E20870D4FBFF43C3AD9B065FBDAE41586B7F75B467BDD481AF544242822C58B040020303253737B7C2D7D426D44CF642C5FD00002000494441547D040000E11700AA2D363656CECE3C5B5607AFA630EA58C3030D25BA6174BDFF3FFAF5EB672FB3B2B264C4881147DDA761F89E7BEEB135BFDA7FF7820B2EB0E1B7A8A8E8B8AF79E9A597B282000040F80580EA6BDEBCB9ECFA76979C1579966C0EDA4C81D491E09C6089DB1D276D12DAF8CCFFD4B76FDF63FFCFE060DB24DA5D3BAC35C0DA47383D3DBDC2D7D15A61774D310000383531E0158093A67D293B74E8200D363690F3D3CE9726B94DCCC685CD4B6D093F1C2E6DF6B491B69BDA4AA7F69D243434D47702BD09BAE5D101AFDCF7695366EDFBAB2A9AD757E705F6A5720100005547CD2F801A111D1D2DDDBA7593CD9B374BD1A6226978A82185524BB456B361C38672D67967F944C09B33678E9DD2282C2CACE4B6A64D9BDAC05B9AD60AEBEDEAE28B2FB6CFA948D7AE5D5951000020FC0240CDD01AE0F6EDDB53103829AD5AB5B2CD98DDC1569B37EB28CFA507C15ABD7AB5EDF73B6BD62C7BBD4D9B3636F8676767977B7280F00B000008BF0000AFA2CD9935F8CE9E3D5BAEBDF65A7B5D9B2D97AEF9D581B0F436376DEE7CD14517C9BC79F3C4E9744A616161C97D5DBA74619467000040F8050078A73E7DFAD8CBA4A42459BB76ADFD7BD3A64DB6B65783AF4E7754DA39E79C63C36F593D7BF6A430010000E11700E09DB4E9B3D2797CEFBBEF3EFBF79429538E09BD6E3AE895F63DDFB76F5FC96D5A6BDCA953270A130000301C2B00C0BB68FFDEF8F8F82A3F4F9B3E970DBA5A1BCC28CF00004051F30B00F02A393939B6C676FBF6EDB6EFEFFAF5EB65E1C285F6BEEFBFFFDE36876ED1A245B9CF2D3BEAB3F60306000020FC0200BC7707E51AE0EAFAEBAFB74DA0F5BAD60A87878757F89CD6AD5B1F75DD3DFF2F000000E11700E055742467EDDBABB4D65769E02DDBD757AF77ECD8F1A8DB7454E7264D9AC88E1D3B24363696519E010000E11700E09DB496372D2DED9840AC8B9BCEF9ABC158C3AF0E70A5CDA175D9B66D5BC9730F1C382063C68C9166CD9AD9C79D7BEEB9D5EA4B0C000008BF0000D4B85EBD7AD9E54434E83EF7DC73360477EDDA55BA75EB2683070FB6E15907B9D2BEC3999999B61678C992253273E64CDB2C5A1FD3B2654B0A1A0000C22F0000754B6B76DD7D7ECB2A2828B073FF2E5EBC58AEBEFA6A193B766CB9CD9B75D02C5DB4F9B3F6FDBDF5D65B65C18205363077EFDE5D121313EDFD000080F00B0040AD9B306182FCFEF7BF3F6A44671DE86AD0A041D2BF7F7F5BA3DBAA552B1B62AB328D914E85D4B76F5F5BAB3C7BF66C993469928C1F3FDE86630000E0FB98E71700E055860F1F7ED475AD05BEE79E7BE40F7FF8830DC1DABC79E4C891D59EBF576B7BB5D65783F0534F3D257BF6ECA1D0010020FC020050BBB4CF6E69FFF8C73FE491471E9155AB56C915575C2103060CA891F7D1F07BD55557C90B2FBC606B93010000E11700803A919E9E6E43EA9A356B6C53E79A0ABEA50370972E5D6C1F62000040F80500A0D6E894460F3EF8A06CDAB449E6CC9923EBD6AD93FFFCE73F121717270B172E2C59B66FDF5E23EF77EDB5D7CAB265CB64EBD6AD143E00003E8C01AF00005E45E7E9EDDDBBB7DC79E79D929C9C2CE79F7FBE0DBE3A5D51695A2BDCB469D3937E3FED033C70E04099366D9A3CF4D0437C010000107E0100A81D23468C903BEEB843A64E9D6A03E937DF7C23CD9A35F3D8FB5D72C925F2DE7BEFD901B5E2E3E3F9020000F041347B0600789DF0F0707BA941546B8075A4E79494148FBD9F4E8394909020CB972FA7F0010020FC020050BBB4D9F3A5975E2A93274F96575F7DD54E7BE429DDBB77971F7FFC9142070080F00B0040EDD041AF940E42D5BC79733BFDD1C48913ED00589ED2A44913D9B66D1B850F0000E1170000CFEBD1A34749B3671DD42A3232D2FEAD0353E97D9EAAFD8D888890CCCC4CBE0000007C14035E0100BC8A865CB79C9C1C090D0D2DB9EEC9C1A8F47DF5FD0000806FA2E61700E0D541383B3BBB56DE4B836FE9E00D000008BF0000D40AEDEB9B9191512BEFA54D9EB5E933000020FC020050AB74B02B1DF4AA36ECD8B1C3A37309030000C22F0000E5EAD8B163ADCDBDBB6CD93269D7AE1D850E0000E1170080DAD5B56B5759B972A5E4E5E579F47D0A0A0A6CC84E4848A0D0010020FC020050BBA2A3A3A56DDBB6F2E5975F7AF47D162C58202D5AB4F0E868D2000080F00B004085121313E5A38F3EF2D8A8CF3ACAF3071F7C60DF070000107E0100A8133A0855CF9E3D65E6CC991E79FDD9B3674BF7EEDDA565CB9614360000845F0000EA8ED6CA6EDAB4493EFDF4D31A7D5D6DEEBC7AF56A6A7D010020FC020050F7FCFCFC64ECD8B136FCD65400D6E0ABAF357EFC78090E0EA690010020FC020050F774F0AB499326C992254BE4EDB7DFB67D75AB439F97949424F3E6CD93091326486C6C2C850B0000E1170000EF0AC013274EB435C15A63AB0156A729AA0C7D9CD6F68E1B37CE06600DD2045F00004E1DFE140100A03ED1E03B7CF870B9F8E28B65DAB469B6165707ACD2397A9B366D2A919191121A1A6A036E6666A6A4A6A6DADAE255AB56D9C1B3FEF0873F48EBD6AD2948000008BF804F395C585818E474D2C801F0351A641F78E001D9B76F9FAC5CB952BEFAEA2BD9BE7DBBA4A7A7DBE0ABFD78232222A4499326D2B16347B9FAEAAB99C7171E61F6337A5140490000E117A84BDFEDDFBFBF4DA3468D68DB08F8286D0ADDB76F5FBB0075213333B3C0E170FC4049008077A33A0CBE6EE1EEDDBBB7530C00004F494B4BDB5E5454F405250100845FA0CE9883910F5253534F3397F9940600C013B66FDFEE672E3EA0240080F00BD4992BAEB862754141C1EA8D1B372EA7340000356DCB962D9BF3F2F2365C7EF9E54B290D0020FC0275AAB0B070DC2FBFFCD272FFFEFD347F0600D4984CE3E79F7F6E60F63363290D00F07E7E14017CDDD4A953D36EBCF1C6D5A9A9A9BF8D8A8ACA0A090989A4540000271B7C972F5F9E51545474EB15575CB188120100C22FE015DE7EFBED2D23478E4CDEB163C7D0DCDCDCEF1A356AD4D4E170D0F2010050659B366D5AB176EDDA30F3E7AD7DFBF69D43890000E117F0BA003C62C4888F3233332FDBBA756BF8C18307576CD9B2C53179F2E406E63687CE071A1A1A2ACC098C53D99E3D7BE4D34F3F95D8D858090B0BA34000299EC7373D3D7DBBD977FC989C9C9CB76FDFBE1DE6B661D4F80240FDE2A008702AFAECB3CFBA381C8E81B366CD1A630E624A9A4107040448545494346EDCB8E45243B1DE0E9C0A56AE5C29AB56AD9273CF3D57BA76ED4A8100C574C680D5665968960F18DC0A0008BF40BD337CF8F01E0505054B4EF0B002B3AC3561799DB95C6696F54141414BA74C99924E09C2D72426264E321713CDF2585252D2244A040000F80A9A3DE394B666CD9AED1D3B767CCB04DBEBCDD58A06C2D276D07166E968967E6619919F9FFF8079DE1D1D3A74E8B576EDDA1994247C8559AFFB980B5DBE4A4E4E5E48890000005F41E7469CF2929292529C4EE705E6CF942A3E35DE84E66B294100000080F00BD40BD3A64DD339802FA96A0036C199AE0300000000E117A83FB406D8CFCFEFA2CA06E0A2A2A27C4A0D00000020FC02F58ED600BB02F0D6133D76C68C190C010D000000107E81FA1B80A578C09FE306E0C4C4C48F870C19D291120300000008BF40BDE46A02DDCBE1706C29E7EE22B364996580B9FF3B9D1A66D0A041E1941A00000040F805EA1DAD012E2A2ABACCFCF96B9960EC34C1B89DF973AE5982CD32D15CDF6842F07D7DFAF4F1A7E400000000C22F50AF680DB0B9E865966D6583B1B9AFBF148F10BDC82CF166792E3E3E7E8909C17D2839000000C0BBF85104C0F1252727A777ECD87196F9738409BC6165EE4B31CB9B9D3A75D2DAE1AE66696B96511D3A74E8626EDB6CEEDB4109A23E31EB7A1F29EEF3FE95597F175222000080F00B9C6201B873E7CED3D7AC599351C1FD2B131212DECCCFCFD766CFE7381C8E73CCE548132402CCEDAB8D1C4A11845F000000C22FE0F52A0ABE6E1A704D58F8BC5DBB766F9AF0DBCA2C3A12741F1388479B40516442F04AF318E60606E117000080F00BD47FEBD6ADCB5ABB76ED0C1322BE32577B98E50CB35C6142703F73DB466D2A4D2981F00B000040F8057C8286DC98989857C3C3C37F365713C4D51FD8848B1E9D3A755A61EE4FA39440F805000020FC02F55E4A4A4AA10910AB4DD87D478A4757D7BEC0EDCD32DADC16DEAE5DBB65EBD6ADCBA5A440F805000020FC02F59E0911D9DA1FB873E7CEEF1415159DE10AC0173B9DCE61266C1CD0804C2981F00B000040F8057C820E9A6502C5FBEDDBB75FE270387A9A9B5A9AE55A1338AE37B76D5CBB76ED164A09845F000000C22FE01334E4C6C4C4BC121E1EBEB3A8A8A89709C2679845A7464AE8D4A9D32AFA0383F00B000040F8057C82AB3FF0F2F3CF3FFFD5828202BD494786D641B1746AA48076EDDA2DA73F3008BF000000845FC027B8E607FEA253A74EEF9BABF1523C28561FFA0383F00B000040F8057C8E3675D6FEC0A5E6076E25DED31F38DE15887EE29B22FC020000107E01D44408B6F303474444EC97E2F9815B78417FE0A7CD72403F8B59B69B85E6D8845F000000C22F8093E3EA0FBC34212161727E7E7E94B9A98BD45D7FE08EAEF77FD62CEBCD72B1144FD5442D30E117000080F00BE0E4B9FA037F6202C93BE6AABF59BA99E5D25AEE0FFC86591E7705DE40B32C37CB2F6619609670B3ECE09B22FC020000107E019C341342D2CDF2E939E79CF371515191D6006B4D6C6DF407D666D73A14F57FCD926D962CB3F435CB3E5708769AE50A291EA42B996F8AF00B0000E0AD9C1401507FBCFBEEBBAB9392922E71381CBF33575334AB389DCECF1313135F193E7C78530FBCE5ED66F9872B043F679618B3CC318BBE978E4E9D2FC50373C5F0ED000000C09B51F30BD443C9C9C9EB1312125ECDCFCF2F282A2AEA62C2702F73795BC78E1D836AB03FF008B3AC90E2BEBD6F99E55E57C8EDE90ABD7F334BB4596E31CBFD6629E49BA9FFA8F9050000BE8A9A5FA09E9A32654A4E5252D224A7D3D9DA5C9D6A9660B34CF4F3F35B93989838EA245F5EFBF25E6596F9AE10AC035DA54A715367BDEF3257007ED82C8FB9FE76D35AE278D7DF7AE9CFB705000080BA46CD2F50CF252727679B6596AB3FB08ECCACFD6F4FB63FF03FCDF292144F6B146996196619EC0ABE774A7173E8AE523C12F49BAEE7685FE00CB36C72DDDECB157E2F768566D403D4FC0200005FE5A0084E0D0B162C689A979F77BFF8C9404781E3344AA4D6EC32CBAC82828217FAF5EBB7A936DE70C89021031C0E8706D716AE9B669A65425252524A155E4683EBA2726ED7F97EE7994543D1FFCC32488A6B84DD125C0159F5308BCE499C23C535D3A80712131327998B8966794C5B1650223EBE5F28C89B608E04AE77143A9A5022B5A3488A763BC4F19FDADC2F000008BFA78CCFBFFCFCCA7CC97F7F7FE3FD21071A1EF03F1C729842A92581398187635263BE6DB8B7614B1348EFE8DBB7EF9CDA78DF41830685FBFBFB3F5C545474B72B8CE698F77F313F3FFFC9F7DF7F3FAB06DEE20EB3E8FCC3CF94B95D6B819F74055F0DBDDA6C5A07CA5A6696E6667984B582F08BBA377FFEFCBEF98EFC99FBE2F60599FD4230FB855ADC2F1C0E2C88D915F343D49EA838A7C3797B6DED170000347BF6797A663FD791BB785BAB6D61E98DD29D050105144A2D2AF02FF0CF8CCA6C7E30F2E08F0DF634183A7CF8F08FA74E9DBACFD3EFAB035E2527277FD1B973E7774C00D641A9B446B697D3E91CDCA143879FD7AE5DFB53355E5643F4A552DC145A07BBD2E6CFA5FBFA8E35CB41296EF6ACFD7CB5B9F548B37C60968FCCB2CA1588E1C568F67C6AEC17F21C798B7E69FD4B84D92FF8B35FA8F5FD8233B341E669590DB276344C6B789DD92F7C541BFB050000035EF9BCF4D0F4A9FB1BEF0FCE0ECFA630EA9029FFEE99D1993F98F0F9786DBEEFB469D3B6272525DDE470382E322178B5B9A995F9FBE3C4C4C44F870C19D2B18A2FA735C617BA42EC936582ACD6020F94E2699174EAA314291E806BA1EB3E1D346B346B0250F7B282B25EDE17B72F8CFD42DD3A1476A8CDFE98FDBFD4F67E010008BFF059C187827B1C883A70E207168A04A6074AE0BE4071E6B35A78C2AED37669F0EC5317EF3D7DFAF4453366CC38D7BCFF0D525C33DBCFFCBDCA04E0C9559C1FF859B35C2EC573FDBA69FFE070D77DFA779AEBF616AEBFB59FF04C57580E664D00EA56406EC0A595D92F388A1C47F60BB9EC173C212D2EAD435DED1700E054C41424BEFE05E7F9079DA82F57D8D630094F092F39B829F22B92CCB332E560F38314600DCA0DC93DBBAE3F8309C153FBF4E99374DA69A73D5E5454749F39E81A5D505030223131F1D9E0E0E06774FAA413BC44966B71D33EBE3A17B03685BED22CE3CCF227B3682DB34E8FA4A3423FE80ABEFF602DF02E43860C79C0AC034F5770F744B35E4C2C731BFD807D805F9E5F5855F70B7AAAFC60B38392D93A538A1C4514624DED1782737534FD484A02006A07A7724F71C1A9C112F953E45167F51D050E7B5BC8CE100AC8072D5CB830DF84E0074DE86D67824F92B8E607CEC9C9593574E8D07E557CB99B5CA156FB00BBE7FBED6096D9AED7D5652EA5EEA53B00A77375551E6FD61746A63D45F70BDA3A480371D8CF6114100080F08BFA293435B4C2FB4276107E7DD9FBEFBFBFC984E0A14545451748F13CBC6DCDDF9F9A00FCF9B061C3BA54F1E56E35CBF566D1F0AC4DABB59F6F8A59DEA0A4BD97F9FEF5C4445A651E6BD68DF4A0A0A09994DA29BE5FE0A4280080F08BFACAEF60C5037EFB1FA255FCA960C68C194B939292CE77F5074E3521A76F6161E1778989896F0E1A3428BE922FA301EA5F52DC245A9BD13EECBA6D3C25ECDDCCF73DBB920F5D588966F1F0F5FD4236FB050000E117F5940E680228ED0F5C5050D05A8E345F1EE5E7E7F7F3D0A1439FD679832BF9328BA4B8DFEF0CD7756DF61C4EE97A75F89D51C987528BCF7E010000C22F00DFF0FEFBEF67E9804626F4B676F70736E1E801735D47861E5085975AEEBAFC9D1C3D4016BC4C6868A89EB0483DC1C3B242424216515A000080F08B7AEB78A37632A2E7A94BE7072ED31FD83D3FF0826AF40786177335653ED1A06433CDE3D2292DF60BEC170000845FD45B79E17915DE57105640019DE2CAF607364B9FC2C2C255DA1FB88AF303C3BBBD7582FB3FA188D82FB05F0000107E51AF65B5CE92FCD0FC636ED7DB32CFCCA4806095E90FAC3585A3CCF58D26043F376AD4A8284AA87E4B4D4D5DA4A33957B499080E0E9E4329B15F280C2C948CB33328200000E117F5931EE0E446E51E73BBDE96D7208F024289F2FA039BE5BE9C9C9C1F870E1D7A2D25547FE9DCCFE63B9D5AC1DD7319E599FD82BD3D3C5F0E373A4C01010008BFA8A72B40BE53020E061C737B406680BD0F28AB9CFEC0F1E6EF59DA1FD82C099450FD64BEC37915DC3583D239B5380A1CE5EE17740A24BF437E14100080F08BFA2738355862FF172B0107CA0FBF7A5FE88E50A6BD40F989A89CFEC066B1F3039BA5052554BFECDAB54B07BDDA5E2610A7070707CFA7744EA1FDC26EB35F5852FE7EC1EFB09F345EDC58C253C2D92F000008BFA81FF400267A75B4345CD3F0B8B5BB7A5F83B50D247A653467FB51A1F2FA039BE5C7214386FC8DFEC0F587367D361747055D87C3319F519E4F918301B3BDD77D42C3EF1B1E7F7B5F2812B131426296C6D893A40000107EE1B5C2B68549EC37B112B427A8D2CF09DC17686B02C2B6865180285779FD81CDE5D89C9C9C8D2604275242F5C65B65C2EF348AC4F785EC0EB1FB056D0D5459FE59FED268592389D81C412D300080F00BEF14B93ED2F6E7AA2A7D4EE44F9114208EAB9CFEC03126404D4F4C4CFC9F09C13DF431D4067BAFE0E0E0A5A5AF070505CDA5547C5FC44F11E2CCADFAE18086DEF02DE1E2CCE15002A82AF68500E117B520373AF7A416A032CAE90FDCCBFCBD64E8D0A15FE6E4E4EC3797FD2825EFE31AD579BDFBFAE1C387FB502ABE4F47F63F99FD42915F11850854C1E8D1A37FC3BE10A81BFE14C1A965EF797B2904D41AED0F3C68D0A0D97E7E7EF799AB0F1615155D72DA69A715ECDEBD7BE6B061C37ABDFBEEBBAB2925EF121414F47C7E7EFE6BAD5BB74EFBF1C71FB5D6FEF2A4A4A4E5948CEFDADF693F8500D492BBEEBAABE7A143876675EFDE7DDBD2A54BD9C602B58C9A5F001EA5FD819D4EA706E0C39D3A752AFCE31FFFE8376EDC381D29E77F4C8DE45D6EBCF1C6ABCCC52BB7DE7AAB73E2C4898D478C18F193C3E1983368D0A056940E009CFC36F6E0C1830BCD65E0D8B1639BB18D0508BF007CCCD0A143DB9A9DFBC251A346F93DF4D043CEF8F87839EFBCF3026FB9E516A7BFBFFF275E322D528C59EE2875BD8B59F460A445054B5BB31CAFB9DA9F5C8F53F5A25FD74D37DDD4BBA8A8E83F7A62A277EFDEF6B601030674EBD7AFDF4EF33DCD370767F11EFE085ADEE1C7B95F47633ADEC9927EAED750B46A02C036B666B7B17DCD12CF3616F51D2B2F008FD1601B1414F4C575D75D17D6B76FDFA3B637975E7A69A85E4E993265B1795CCFA4A4A4140F7D0C0D9F3AE2748EEB7A9A2BBC5E6896BF977ADC7AD7CE3FC7157EF5726905AFA9F79F6796B9650E0C74BAA08E660972BDA70E91DE548A47515EE8ADDFD36DB7DD76456161E147B7DF7E7B60E7CE9D8FBA6FE4C8915DD2D3D3D72C5EBCF85373707691D6E47BE863E84197BEF9BC0AEED7832E3D622CDD3C7080EBC445B0EBFE04D7F7A8DFEDB4328F058053791BDBCB2C6D6A601BBB896D2C08BF1ED46AE9F0A6457EF9D78648F0150552704E415161E342290C7138E4B0439CBB0BA560455191E31B47A15FD2A61ED3B6F39502DE137C838383BFF9CD6F7ED3F8B7BFFD6DB9DB1A0DC03939398EE9D3A72F328FEFE5A100ACF3D4FEABCC6DC3CDF2E40976DCA9AE305BFAB3B7708559DDD61C2CF3F8F9A55EFB4157E8BEC52C37B90E1CDCCFF32A37DC70C395870F1FFEF8EEBBEF0E484828FFA4FF9831633A656464FCB876EDDAE97DFAF4F99D6B4EE09A96EA2AA785E59CBCE8EB3A11D1B6CC7D735C976F9A659CEBEFA75D7FEBC90BADE5C8E2D708806DACB5816D2C08BF5EEAAC6543AF8D0E8878D8298ED63D1B7428BCA261B78667873493F8C0680975064B76614ED0FEBCCC663F1CDCEC98B36F71ABFF1DF8616CAB6F13378A38DED8D46DFA54BE5AA0EEE8140E0E8763C1E5975FDE78D0A041C7DDCE98701C92959515F6D1471F2D3101F8020FD600BB69D3AF6BA5F8ACF589C4B8C2B35B8A6B6951EA360D6C7DE448CDF257525CFBAB61F70BD77D7A4071BA591E73056AAFE01A78E5233D28EBDAB5EB711FFBE0830FB69B306142585151D12BE6E0EC4E0F1E9CF529E7B6B432FBABB265BE428A6B24F4BBFDC02C3D5C7F7730CB046F2A7300A70EB6B1A84BC3870F6F5A5858D8CFAC5357FAF9F97531974DCCF550A7D3996D8ED1F699BFBF370F9B9F9F9F3FE7FDF7DFDF44F8AD236D9724B6880A6E30C304DC0E7F3A6364D8C50D3A8B9FC3EF98C769000E0D0A96D383629BF68FEEA10799F2DF7D4B331FDDFAFAA3AD9725DE5EE85F70D3E6F34E9D2F12F0A6E06B36B2CB1212124E1F3C7870A5B631E67151070F1E3CF0C5175F2C3161F95CB3114EF5E0479C689629527CB65A9B81E999EB8AE6B3D5A0ABCDBEDC35B6BAF39F59EA80405C7FCF75056AFF528FCD7705E06BA4B8F637DD9BBE27AD8DD083B29B6FBE39F0440765CA7CA7F2C4134F9C317EFCF8DF989DA696E1231EFA680B75357295BDFB64C5C2320757EE321FE03A119125476AD6F35D65AE4DDA5FE71709806D6CC93EC99F6DACEF1B32644847B30E3D6DC26E9F76EDDAA5F6EEDD3BA655AB5651868486864A4E4E4E68666666E8B66DDB223FFFFCF3F66BD6AC7962D8B061DF9830FCF0A930F2B8570D78D579E5A81B420343D7DD1C7F55C2679D5E08BB24AA6BB9C1B722BF89EED176F9B9AFB7BEB5C96F839C05FE8B5A7D3B74043F01A0F698E01A6E36B88BCF3DF7DC16B7DE7A6B80EECC2BEBA69B6E6A70C10517840506067E3E74E8D0180F7D441D88EA55296EFAA51649F119EE57E4D881A9DCCDB92E731D18E872966BE75F5E388F721D1C9415E36DC1F7C61B6FBCCC7C4F5A1B11D8AB57AF4A3F4F779A4F3FFD7493B0B0B0DF272626DEE1C18F78951CA965EF20159FA88D71DDE77EACBBF95DDB52077600C036B6B876976DAC0FEBD3A78FBF596F9E0B0E0EFEDA1C479D3F65CA94F0471E79A4D5C5175F1CD5A44913BB7E2973BFC4C6C64AD7AE5D23EFBFFFFE33DF7AEBADB01B6EB8A1878ED1327CF8F07FEAB11CE1B7165CB7F6A15161CE90D7DF38FB81905BE37FEBAC4AE82D6B42D361E7BFDFFEF143FE4EBF675A2D1B3A9A9F03E079A3468D0A6ED4A8D182CE9D3BB7BEE38E3B02AB127CDD7EFFFBDF4774EBD6ED34A7D3B9C0031BDF075C3BEB4565C2E86CB37C63968FCBD9E9976DCAB54B8EDFBC6B75A9A09C24C535CC5ED502C57C37979A8B4FEFB9E79E4AD5461C93F0A3A2B476A2A1BFBFFF5FCDCEF55A0F7DCCAC52075B07E4E89AF6B2524B3DB6EC011A00B08D2D96C336D67769136763C985175E38F0E5975F6E78F5D557C705040454EAB97ABCD6AF5FBFC87FFDEB5F91975E7AE9B58181814BBC64260EDF0DBFFD92C7DFB52B2FFDB5F7DA3E16D825BC758DBC66E7B0B35ACCEBF0BC9FBF9FDF246A8001CF07DF90909005679C7146D7DB6FBFDDBF3AC1D76DCC98318D3A75EAD4343838788EBE6E0D7C3C3D6B3D568A9B7055341E80DEBEBC82E7EA08977D5C4B7329AE29AE28B0B5753DEE71291E4044FF5EE12DDFD3E8D1A37F73E8D0A1B9B7DD765B8503AF54864E57650ECE42CCC1D9DB43860C19E0818F5AB6CC2BA22731B4C65D77D2BA9DEFE17A0E5D5E00B08DADB96DAC368D1ECF36D67B83AFB95872EDB5D79E71F7DD779FE9AEE1AD2AAD11BEF9E69B9B0C1B362CCEAC7B0B7D3500D779F8EDB9FCB6B3F6E666BCF88FB3C6069C1E145BA3AF7D46705C7C52DB49790E91E7CF5E3EB42D3F0FC033C2C2C2E69D7EFAE9DDEEBBEF3EA76E3C4F96799DA873CE39A7635E5EDE7F6B20006B0DAEF64B5A7D82C78D2BE736AD7DD651A117BA9627A5FCE6617A5B8EEB2022C52C33E44873E939AE305CA7DB20AD8D30E5397BCC9831013D7BF63CE9D76BDEBCB97E4FA101010133CCC1598F1AFEB87F2F53E669153C2ED555E67A80A635FADDA5B8B6FD59296EE2DE945F2700B6B127BD8D4D73EDD7CE2BB58D7D4E8ECCAD8E3AA24D9D1D0EC7ACDFFDEE778103070E6C5C13AFF99BDFFC26D604E0483F3FBF39BED804BACE07BC0A0F8CF87C506C9F809AAAF12D4B6B8047C45DF1C5D4D47993CDD58BF89900356BECD8B1FF0D0909E9356EDC38A736B1494F4F973BEFBCF398C7FDDFFFFD9FED63E2969D9D2DB7DC72CB318FFBE73FFF29D1D1D1625EAFD1134F3CD171E3C68DEF9A8DFBE09318F932B5826D5F65B67FC16CBB950000200049444154EE50E5A607005AA3AB813CABD46BE9D40F3AB2F3615708D600FC82149F31EFE3FA7BBA59FAD7C577A4FDCF0E1D3AF4A9D6466833BC8ABEA3BFFDED6FB6C6E1A802A8E0B1FA3D9D73CE397EE3C78F0F7AFEF9E7E70E1D3AB4C7F4E9D3D7D7D0479E5BA6CC5BB94E449476B714F7BF3EEC7ACC6A3932D8580FD7090F2DF34BF89502601B5B23DBD84DA5B6B12FB08DAD7B4D9A3479B6478F1E3135157CDDFAF7EFDF30353535D71C7B3DAFE7767CA9CCEAB4E677C8BAC7EEF473385ADCD0F84A8FBECFA3678CBA2CC82F3086E6CF40CDBAEBAEBB6699C07BC5830F3EE87437B3D1FE4A575F7DF5518FD39DFD7BEFBD77D46DB366CD3AEA20C0E170E8C6D6065FA54DA7EFBFFFFE58B361BFD82C6FE8D9CD1AFCE8E12708BFF952FE20557A5BB259EE9523F31F2A9DDE48E7F94D72ED2426B90E1CC6BA0E1EF47983EAE23BD211478B8A8AFEAB536DB86B23F43B1A3B76AC4444441CF5D8975F7EF998E74F9E3CD97E376E0D1A3490912347967C4F5DBA74F1BBE5965B82CD7AF0F94936918A3F4E99EB7D7F2B73C096E3FA0EF4B6DB5D653EC275D9C275D26310BF52006C636B6C1B7B07DB58EFA1A33A878484DC64B4F0C4EB0F1D3A34CE1C8B0D1F366C5817C26F0D395878E891094D873A829C011E7FAFA7CEBC6DB7A3A8E8F6FAF605990DDD9F74C0831A3EF0074E9A09BC534DE0BDFA91471EF12BBB831F3C78B036852EB99E9A9A2A1B366C9075EBD6D9EBDBB66D93A54B97DADBDDF4F1FABCD2B409F5934F3ED9282E2EAE7F0D07E017A5E2E98D94F6019E5DC17D7AE6FB02B3AC2F1594E7B82ED7BB0E0C4A2FF35D8FABF50142CC0EB1BBBFBFFF47F7DE7B6F60D9FE67DDBB7797C68D1B4BE901317EF9E51759B06041C9F565CB96D9EFCC1CD895DCA607757DFBF63DEAB52EB9E492A06BAEB926E62447EA4E3A4E99EB7775BE599696BAED755799EB6D8F9429F37FB91E93C62F1500DB58B6B1BEC8AC0FCF5F7BEDB58EEAF6F13D113D0633EB5B9059C7FFEE4BE5E657576FFCFC2F49E7FF90BD69DCA3678C72381D9ECFE06D42CE68FECACE0F8B626E6E3F3BED8DE4F4FAF20575ECD8516B94124D3018D3A953A78E6639A47376998D656E659E3F72E4C8497B9AEC610BE1251AEF6C2CEFBCF3CE63B57D02C5AC37D13131319B5252520A6BE235274E9CF8567A7AFA88871E7AC8D9B061C363EE773A9DB6BFD292254B4A76EA7ADBC68D1BED4E5D9B40676464E85C73F6BEA0A020DB04BA65CB96C76EA4FCFCE4A28B2E0AFBFAEBAF9B9B0D7093E4E4E44F7D71DD30DF5391F9BD4FEAD0A1C3D8EAFCD6CBD281570A0A0A3E33E51AA80761E5D1E6799F7FFEB9E4E717B728378FB70762975F7EB9BDFEF4D34F4B56D691CCAE27391E7CF0415B335196F9ACFEBB77EF0E4E4D4DEDDFA54B97B757AF5E9DCF2FDEB3EB8A59469BA58959F69BDFC58ECA3EBFAEF60B2BDE5F21C191C112D220A4528FFF79D9CF92BA2155625B1EE92E51545874542D59698BDF5A2C4DDA3711A75FC5C714FA98809000098F09975FD7FC2A917191F6F67DDBF655FA73F9C27EE114FDDDD4E8BE906D2C6A685B3EC22CEDCDB2AB2ADB711DE4CA6C0B5FF8C31FFE107E32838C9E488B162DFC3EFAE8A3D8B3CF3EFB3DB3EEEEF38572AFB3DAC41DF97BC6F76ED0C57132531A55D5F9116D377D93917CBD66EFFAF64599155CFB0E8E3041628459C9D3CC0F668EB96D86090D0BA74C9992E30D9F31635786A4EF489733CE3DE3A8DB0BF30B253B3DDB1E6C5445416E81F805FA557800D37D68F70AEF773FA6658F9612DF26DE1EE49CDEE9F492839CE866D1A7D2F6F5710DA0717171D9AEF5E64DB3235EF4FEFBEF57AB26D204DF7F9B1DF00D8F3DF698A3741FDEB23A77EE2CCD9A3513739061AFEB0E5E77E8AFBEFAAAA4A5A5C9FEFDFB4B1EABCD9F2FBCF0C20A5F4BCF6A9AF78B32070523860C19B261C68C19FFF0D52FAB267EEBB7DD76DB15870F1FB603AF1C6FAA0DAD61B8EAAAABC4ECD82437B73863E7E5E5C9EBAFBF6EFF3E78F060C963030303B5F6E198FE6AA5DD7EFBEDA1999999EDD6AF5F3FBD4F9F3E834EA29F362A4707F4BA4F17B39E680D4C92D3E97CE3DD77DF5DED8D1FF6BB19DF49F419D1156E7FD7CE5B2B0EE791609BF25D4A49E0B5DBEE5FF6C98F5FFC28374FB9D96EFBD37F4D97A8D38F4CCF1D141A24BFACFA45CEEC7E66C96D651FB363ED0E39EFFAF3ECDF1FDCFF81FC7EF6EFED6BBD73EB3B32E6BF638E7A7FF8E6BED06CC332CCEFE523B35D9D56DD7D21DB58D4A056AEE50EB35E6A7338AD9D9F919A9ABAE878DF6F4141C1802E5DBA1C0C080808F6E487D3607DDE79E71D5EBC78F1B5F5313F7955F8DD99B3AFE7C8F82B6BF53D0744F70C5E9C91DCBB9E7F79FA43D0262FA3CC467C544E4E4E96F9B1CC341BF10F77EEDC39A72E3784DF257D278D5A3492669D9BD9839CB0E8307B20F1EDBBDF4AEB8B5BCB853715879B83FB0EDA30AA72B373EDF56DDF6F93F697B7973D9BF6D883A39CAC1C49DF9E2E978FBFBCDC03180E72AA15AAB45DCC60B3DE0C3607C89966BDF9D8DCF64E5542D55FFFFAD7A7376CD830EAD1471F3D6EF075BBFFFEFBE5DE7BEF2DD9E99B75F4A8A6CEF6BB0C0AD2E98D4EF85AFA7E7FF9CB5FA21E78E081C7CC67CF4F4A4AFA978F7F6505D5F9ADEB88A3E6A0ECE33BEFBC33A032734C0E1C3850BEFDF65BDB1CCF6E60F2F365F5EAD5B686420FD2DCB4FF59D966E9E5B9FBEEBB43264E9CD8CFEC905F369FF1368E6B6A459E6B5DB9BBB0B0F06EB39E6C37EBCC5C3DB837BF9385DEF221776FDA6D4F8456A4C3951DEC763C2D25CDB61409082A6E2E1A1C1E2C05F9051277769CF4BAA557C9E357CC5C21F16DE34BB6E5997B326DCDF2BACF8BBB576C5AB4C9EE872EBBF7327B1236EF709E14E6154ADA9634BBDF896A12557202B561D38604DF538756F7BB4F30EE7305E14A9F60641B0B0F1DA3159A7552CF7C68BFEA3BE2E3E3B70F193264AEB96DC6EEDDBB1796DDE70707070FE8D5AB57546D7CB68B2FBEB8E1AA55ABFA137E4FD2AFB96971ED429BD7EA7B768B68A767C99BFBD077A6CD76C2DD07C7E687923674E850ED5FF8566DD7086B2DADD6FCEA41C6FA05EB2561508238FD9DB69635AC515849F0557A30A20731C97393A5CB355DEC81CDCFDFFE6CC3EF77FBBE93961714377D751FC07090E3918DAC76D21D66D69B612654E5989DFF7FCC6DEF1F2F543DF6D86393D6AD5B77FF830F3EE868D2A449A5DEC7DD77E9D34F3FB5CD9FCD81B96DB2E86E0AEDEFEF6F6B7C2BFB7A7A70F0E4934F464F9830E119B3AEE74F9F3EFD751FFE9A4A376B28AACC6FDDDCD62F3B3BFBC3BBEEBAABC26678151C4C698DBE1C3A74C85E775FBA69CDFBADB7DE2A95695AA57D84CC6B053FF0C003379AE7A44D9E3CF9210E6B3C2EA0CC7E419BC38D3697A35D35C236089BDFCBDCBAFC90EE5640C7F3CBCAE280D0E6D236B625913AFD9CD3ED365EAFB7BEA8F53181D94DEFD7ED7B930EC5DB93B8D671F684AC3D3B60F60999BB32ED3628242AC4DEBEF49DA5F6F3F8051C59AF270F9B2CC35F1E2EA151A1AC55A78668397282F1A0F9BDBC7FBC138C6C63E129661D2CDB5FC36EC775898B8B4B77B5029BE6DEE79BBFCFD326C9B5F1D9F418CD7CBE4EBE52D675167EF7E76704C40644D5EE8AB53F37B2C9374511098989937CE4FB7396FAD114991F428CB948345713B52FE590214336EDD9533BFDBA964E5B2A57FEF14A7B20B1F8CDC5B6F6D73FC85F3E79FC137B70A2073D1A86DD1A9CD6C01E70E863349416E415D820BB237987F80796BF5AD6F7839C43BB0EC9CA952BB58F877BFDD32AD09C528134BFA0A020D5E974E69709AAA9E67B3DEA4486795C5A759B2D97B72F7507616D0E6676EEF3CCF57F970E55AFBCF2CAC4152B563CAAC1B7BC7EB9C7336CD83059B46891EDE3EB5A574BEE0B0909D19132ABF47A5A036C8278833FFDE94F7F3765999E949434D35B7E9083060D8A37072FC1C7D9B9C59BEFB33A4D941C27FAAD9B03221DC4EB6FE3C68D0BD026E755A1CDD3AFBCF24AF9F8E38F6D6DC4513B097F7FD1114CDBB76F5FE9D7D303B949932605DE7FFFFDE3478F1EFDEBEBAFBFFE4F5F3F70D1F9A8CD77115FC9839C4AAF07D558679C6582B0D608DB5A2EF37BD1D7ABB5FDC251DBACDC0239A3EB19929371E273B23BD7EF14FF607FDBDFD76EA02283EDBEA149C7A34F92E9C9CE79CFCD93665D9AD9EBBB36EC92F0E870BB7FD026D2FA5E7DC7150F1C14141624412D83EC3E474F94EA63749FB0F99BCDB6B591D2D7BA72C295B51A7C0FEF3D5C76BF5056BE6B1F50AD565DE5ED3F6AEA39665B9163F643A93EF4330E93232718F7997DE16752EA04A309BC3D0F1E3CF811DBD8FAE544FB650F6C834B3F375CF7D727FB3F94EE0EE5DEE7E7E6E6368A8C8CAC9532D4BEE8F9F9F991BEB24ED459F83D5478D811EA0CAED5F75CFECDB70D9B2CB3C790137DEDC7ED2867041073532B6D6AD3A25F0B8FBEB7F6CBD2E0AA070C9BBED924835E1824F987F3E5EBD7BE96817F1968FB6BCD183743DAF469235D0776B5D7350C6BE0CD48CDB04DDC34946ACDAFD6D29EDDFB6CFBBAA56B7E7DE12067EFF2BDB27DD5F60AD73F0D85DAD4AFBCDBCBD2B3C37A205BC65161DAA5AA2331469AF7D3A90B06B937B06DDBB65D60D6A3D166875FE5E0EBFEAC3A98D58B2FBE78D4FFA2ABECF5D75F6FCF6257950EA665C26FD0134F3CF1868E86AE07F4650E608EB7B3897705FE8AB6894D8FB3238B72ED84AAFB3BF5D86FDDEC085FBAFDF6DB1D553D2873D3EFE2CB2FBF2C3949E1A6FDD04C1957F9F5B496DE7C47818F3DF6D8DF870F1F7EB139E0FBF1380FD73357E1D52C92F0137CDF555D07AAF558F7E06D35BD1E9CE43AE3ACABFD42591BBEDA605BEFE8B65F5BEE44C44694FF0334A1B7E939C7FE04A39A46D9E79595F6739ADD962B6D7DA435C6BA0FD8B2648BECFD65EF518FD5E76B6BA0E5EF2D97F313CFB7DBFF4E571557661C483D20892F254A604860AD96CB9EA57B8EBB5FA8681F5085836F8F3DA782FD50853F11297FCEF59A7E4E4D3D3FBAF40946B30DDC69826FEC4D37DDE4CF36B6CAAAB2BDF5C4F34F769F5B27CF3DC1EBB6D293289E1AE5B92C3D4E33E13788F07B9234F86617E6486D06E06E17F5287869FBCC2213809FAC47DFD1C493F8716C4948486899E6E191E85B9CDFC20E40A20737E70F395FB2D2B2ECD2FF81FE258F19FAD25099F5D02C1B7EB5C9B10E5AA20721DA1C590F402A53F35BDF0F721A253492D81DB1B26AD52AF7A89E716536E8FEE63B8B373B5CFF4A6CF863CAD9919557EB745247B8BA81DDB061432B9D7FB753A7EAB778D11A5E0DF6A5CF78EBF5EA045FB7366DDAF8C5C4C414A6A6A60EF7A29D60792720AA727F9FEA7E36734096D7BB77EF6AAFD47A20AB351065E981597927652A7B92A269D3A6CE8D1B370E16DF579503ED13AD07A5D7B9F26AE1469DC4E7FCD9EC17CE4CABE5194A7E5AF8939C37E83C3BBAF2A237161DB57F284D4F82BA696DB1FBB69FBEFAC96EBB577EB0D2EE47DC344CBB4F94EE5CB753421B84DA00AD7F47C61FA9A8D0FD84BEAFEE0B1206271CB3FD6F10DFA0D6F7092AB6476CD9FDC2313F4D57CD53758FD7AA131C2AFB9CE00AF63B153DB63AFBA3B6DEF0E336DFC169663F5668B6B1D57E0DB6B175A6D2DB5B0F3C5F5BE81D6F633BAA9AEBE366B32E35CFCECEF6AF8D00AC2780CCFBE5FACA0A5167E1B7A17F44DE9EBCF480E641F1B5F7A60D02F6ECB8D091FFF5B8A449F5E50B4A4C4C9C58851FC301B383FCDCD52760AE36D3B9F9E69B8B6AE32067FB9AED36B46A33633D60090A0FB22377EADF7A20B2F1EB8DB67FAF5BC7FE1D256B6F96B4EAD5CA0658AD992D5DF3ABFD80CB9EE5AFEF0739217121D2A16B071D04CA23EB5F054D7B34247F57C9F527BFEC01969E403181F5CDAFBFFEFA61133683ABD2C7A9E400D604DE37DE78E398A65E7AFDBDF7DE936EDDBA552B04CF9F3F7FF5AE5DBB5AE8FA5EA6E6F7B83B9BE335E9D3A6E7E6BEED151EBD0507A79BDF55BA077FEF4595FCAE32CD679DE7FEAD9B1D60AF356BD6CCFCE28B2F8A2EBBECB26A9D9D2D3D1A6999F7B2F755662096B27EF8E187822D5BB6E49ACFF99F32DF51D9F748338FA96E33FE131D5C54691D28E73B4FF59611F54BAD27953E6032FF67966BBFF0B67BBF70CB2DB714D566F8D5EDFBDEAD7B4B5AEEE8767ECFE63D127BD69141F3747C885F7FF8F5A811FC7520441B1ACC6D7A9FBE8E8EE0AF2757DDB30768771A77602E7D5254F721A54F8AEA5812BACCFCE3F17B49947EEDDA10D428C8A3FB056F51956E01A57EA7C1AE0180AAA59CE7BF5989A7E9A04385E5EC0B77666666469A6DAC3FDBD82A7F0F556E7AEFEDDBE0DADE96BBB6E39F98658ABB19BE39BE4FCDC8C888AB8DF06BD67D9DAF3A93F07B925A069F96F963F6D6E8DA0CBF3F1CDCAC5FDC061FFBEDE838F93AEFE98C909090F99E3C30AFF047595824B31F9E2D6D2E6923E75E776E493F5CF5F6E8B765E4EB238F3A9B5FF6B93A6A73DB4BDADAA0EC6E0EBD7FFB7E39B8FFE051A337D7F7831C4FABA0EF55CAF19AA5990D6A81D998FAB97650FEE67ABAB99C5FFA048ADE3774E8D085FFFCE73FBF34212B40A762A88AB973E7DA0D6779F44060D6AC59556EF2B570E1C255FFFEF7BFCF30017A9009D0F3E5D470C87C3FFF35DF4D5239BFF5F9C3860DEB636E9BBF7FFFFE82EBAFBFBE4A7BC31D3B76C8BC79F38E9A6FD2EDC08103B6A95E42428254A5D9BB1E94FDE52F7FC9C9CFCF4F9C3163C61C416DCA718FF65C57FB85D2E63C3647AEF9F33525D7B505CF6B435E93DB66DC56D2FC59A73FD245074C8C8889B02752DD035E697369EDDAD220B741490B1E379DCAAEBC93A27B53F6DA81154F7850B727D3769D71DBBA62EB51E34BA066B8F62529D578EAFA1A0C1A15855FED1BAF676775E038A7F9DD38CBDB179A6D6C17B6B1A84507CC7AF81FA7D3F95E6A6AEAFCB203B0050606AEDDBA756BDCF1A6C6AA29BAFE9ADFC14F84DF93D434B8F1B2C519C9FDFB35EC5E6BEF3967DFE27D45225FF948E07DDF2C9F040707CFA9EB3362DA8CD93D759086D78DFFDB78CC889CA569C8D58395CD8B37DB66A43A32B406E0C3D987ED54185A63AB35C7210D4238C8A9797A563BCF947B902BF06AF0D5BDF1DCE39D40993E7DFA22B3E3EF3675EAD46F4CE00CD5119C2B233D3D5DFEF39FFF8809CD47D69752A33D6B28FEE28B2FEC88D095993AC9FE8EE7CC59F3EEBBEF9E615EA39F09BECB7D3DF09A45CFE27C74A2DFBACEED3A7CF8F02E1F7FFCF1E283070F168D183122ACB213DF6BCD7CE983327D9E7B746EFB210E1DB2F3523EF5D453957ABDD5ABFFBFBDFB00B3AABC1306FEDE9901860E22289648D058B145B1AC2968D4609A292A6349246ABE98982F9BB669BB0846779358369BFD8C4663023E6A04D144578D2524F6D8A2220A36C2824AA8024A9B19A67CEF3BF70C5E2733346760EE9DDFCFE7FF9C7BCF3D7766FCDFCB39E77FDE72A6D75F76D965354ECAB66EC11BFF6DDD143FB7DB3BC37161FDC5AF9FDE1D0E3BEDB0B0FDF0B7870CA682F7E3E33E1E2E3BFAB230FAFBA3C3C19F39B8E94266922E84A68BA2E978928E05E515E54D4571EA59D47CBFDF42693E88668517455B4AADC6B5AB6BC3BAB5F95BCBA49FF5FA8CD7C3F45BA7870F7EE9834DB7D76BDA67C582FBB5E9AFAD6FA5A664ADCB5A78D397A52C8B0D1E0BED63D90A9667E7F737C6FDF8631BDA8FC7F3ABA98F3FFEF851871F7E78878FC57DF4D147D7C5F3B55B15BFEFD23FF5DD7FE24F5EBFFE84FAC6FA509EDB2A33758747DF9AB96BB7FA7073317E50A94B735CDC575656D63CF3E08ACEF2B7A5EE6BF75E766FD358AEF71EF6DE365B79D37D7753AB703AC94845EE69979FB6FE9643CDF7EB5DB9786553AB6D9AA82A6DEF24A7DD956507FB555951B5C91750D281BFAAAA6ABF58703E150BE0EDD2CC951B73F5D557879A9A9AF5CFFBF7EF9FC6A686A79E7A2AC49387FC197B7575B8E28A2B9A6E03B131B1909E79F3CD37F78B07FC23A64E9D3ABB443FA3D5F1DF7BFAB7FEEBCDFDB77EC30D37BC3E76ECD803FEFCE73F3FB87CF9F2F79E77DE797DBA75EBB6B18B0961D1A245EFE88EB7CF3EFB345DA498397366D3C9597A2DB54EDC72CB2D4DF7ACDC90BFFDED6FB5975E7AE9BAF8BE93E249D9DD818E3C2EACCA8E0BBFE96CC78574B1F17F1FFBDFA67D6EDA9FB7948ADCD3AF3C3DCCFBEBBCA6DE3E856A56D784E9B74D0F77FDC75DE1DC5BCE6D5A978E2F1B937E4EDAAFA7D9FF5B4A85749AF4301DAF9A8F1B275E78E2FA0BA0E9FEC18F5DFF5853919DEE2440C9EB96CDE1B059C742FB583AC0FC187F48A74C0B172E9CDED6ED265B2A2F2FBF239E4BFD3CDD2B7A63DFC177230D517BE289271AE277F4778ADF77E98441874FAD7AE182B50FBEF96CCFA307BCBFC37FDF836F4E5F56DD50FDBF2F1F39796E917D46E3E20E726EDC29DFDC59C73CA4715BA3BF3B7AFDAD869EBBF3B9A62ECAA9B04DE37C9B5B6B6BD7D486BE43FA365DF56F2E64D3D8AF3436B8B9FB71EAC29C5A649B8AA2B7AA9B6E7191AEFA3BC9699713E574627CFFBBB9803279F2E4D48DFA905400C79DF48033CE38A3ACAD2BDF73E6CC09B366CD7AC758DF34B6F79C73CE09F3E6CD5B5FFCA6D7E7CF9F1F9E7DF6D9B0A15934AFBDF6DA57EEB9E79E748B9F4F946AE11BFFAD7F3E7E36EFEADF7AFA5C4F3EF9E47F9A3E7DFAD4F1E3C77FE0073FF8419F749B82D6A496F9D42DFD8D37DE1E36107F7FF8FAD7BFDE74303DF7DC73D75FBC58B66C59532BFD873EF4A1365BE95337BC4B2EB924DDB2EB6BF1BBE2A4AC0B1F17D27EFE804F1EB0C16D520FA1D67A0955F6AD0C479C714438FCB4C337EB9EEC479C7EC43BC60CB794BA4C17769B2EECF9D3D6455B1C0BED63E94047C773A98737B5E06D7921E64B5FFAD2E37FFEF39F3FB8298D115BEABEFBEE4B5DAC9F2FA5F3AEF26DF9CB3FF72F67F6BF79E97D47550D3E2694E5CA3AF47755BD3861D1EA86DA4B96FDEAF919C5F4013DFFFCF30FC6981177B25B748FBF2F7CE10B1396ECD4F1F7742CBC6550EA823C648F214D45F10E7BEDD0B44C91C66DB56CA94D134FEDBCFFCEEBB749EF6D7E3C74DFA1FFD0F5B9D9CEFBEDDC5448B725FD9CC34F7FBB4B7DFA7B0A8BF5742B8D14DD7B6DDD89AF862C1812AEBBEEBA0BB6E6EF1C3162441AD73B319E289F1D779637C4EFD38BF1FB54FD2EBE932BF6DA6BAF9B162C585015A3F7FBDFFFFE5C6B33554E9830E11DB77448B765F8CA57BE12D2F894F8FED48D66FD95F0B44C57C08F3FFEF8D05A319D15BEDDE349CB07E2017F56A91E05DFCDBFF542B366CDAA7DF6D9676FD87DF7DDDFF7D8638FED7DC8218774EBDDFB1F5BDF2EBBECB2A693B3E693AFF439A6DB711C70C0014DB392A67B08A68B12CDDDD4D367933EA7638E39A6B593B2DA8B2FBEB836EB867793731AC78576B818B459DB97959715E5E7B92D8E0B5D517B1E0BED6369A77DF9DCA8614BDFFFBEF7BDEFC93973E69CF5918F7CA4A2235A7F53CFBCD4CB203A29FE5B995F2A79DFA6478A0B867DF1BB9565DD574E5C745787FE9EAB16DEB660D9BA37E7EFB27AC164FFD44AE4AA4DF77249D844B158BCE8C61B6FBCBE3D5B88520B707D7DFDBE716738FBEAABAF6E683993F3B469D3DE71A53BDDEA284DE4B1EFBEF9D6955D77DD351C71C411EFB8475D1AF374E79D77FEC3EFBAF2CA2BFF3716BE69ECEBA1E9F7FA4437DDB5D75E7B563CF1BAF4FCF3CF5F9B26AC28F4D7BFFE352C5EBCB8A9ABDDFA93F02143C28927BE3D31513A014BB7D268965AEBD3E794AE04174A276FA935C2F833A02B1D0BED63D996E277E1F9EEDDBBFF362E6B3AE2E7FFFEF7BF6FE8D1A3C72D13274E7CBC94F2B6CD2F931EDFFFD0CFFC7AE11D8DD357BDD2213FFF8535F3EA7FFEFACDDD4359EE9CFB8FBEBFCE3F15681FA9EB576D6DED81F1A0FCF27FFFF77FD7A7712749BACADDF2D646E9607EFAE9EFBC1D6F9AE1B97022AC748531EEC09BBA7E358B85F5FC871F7E78493CE01F154F5A96CAFA167D4EE7C7CFE69BE3C68D5BF7CA2BAFACFF8C528B443A312B94BAE2B5F48D6F7CE31DCFD3095E1ACBDDFC3965DDF056C7CFFB734ECA00FB58FB58B69E9933677EF9B1C71E9B77D75DEDDB90982EC0DC7FFFFD7F5FB468D1974A2D67B9CEF0475CF8EAA46BA62D7FEAEC1BF61A1776EE31B8DD7EEEFC9A25E113B3BEBF6C55DDDA7F9E7DD88DD777C57F147FFCE31F1B671E32D3DEA193D8EFA9FDC271C71D972BA5FFA7934F3EB9CFC08103A7EDBAEBAE877CEF7BDF6B97AE37A9708E05F5C2A79F7EFAC58A8A8ACF74A6897C8AD599679EF9F174DB846F7DEB5BDD3734B67A7334CF381A4FFCC63829735CC071C13ED63E96ADEFF4D34FDFA5B2B2F2B9CF7DEE73034E38E18476297CA74E9DBA64F9F2E58795628FBB4E314066DC7BC69EF3D181237F77FA4B1786F66A017E61CDBC70E2AC1FBEB9AA6EF5255DB5F085AD21EE2057D5D6D68E9A3F7FFE133FFDE94FEB520BEEBB91DEFFE31FFFF88DACF03D41E1DB3EAEBDF6DA3BE389D9A77EFEF39FD7A6EE78EF566A8D4827655A2300EC63D976D2E457F1DC69FFDB6FBF7D4E3C675AB7A5E761E97D37DE7863432C785F2FD5C237E9340327FFF4B3DFDFF4F9EF7F69F0CFE6DF34B22C57963BB0F7EE5B3C09D6A44577D57C7BCEE5AB57D7AFFDC6ECC3A65CDE95FF4114CBC4265D45A94E6C9226DE193162C46F57AD5A75683CE8EF76D4514795A7C93C3657EA3A7DFEF9E72F9F3367CE23DDBA75FB74679DC9B658C593A9BFEDBBEFBEE9F60867F6E9D3A75B1A87BD859F77ED25975CD234F14A3C38FE41661D17705CC03E966DE7B9E79E7B2B7EE7AE880F87DF71C71DFBC673A8F2F7BEF7BDA1B509495B4ABDED1E78E08134B9555D2C7AEF5CB870E13137DD74D3E252CD55A79A35E8C1FFBAFD0F677FF7DC3F3CB272E667AF5F7C6FAF5D7B0C09BB55EEB8C9EFFFCB5BCF852FBF72D99BF72C7BFC859ADCBA8FBF3272F23427394E729CE46CBD02F8E9A79FFE6D3CF01FF8C8238FEC71E4914796A75B3A6CAA34FE3716BE6FC59DEE9DF3E7CF3FF5D65B6FADF58DE99003E4C23DF7DC73CAECD9B3CFACADADAD6C9E846C334EEED2F8B3DA748F4927658E0B382E601F4BE790668E7EFCF1C76FDD638F3D7E1FCFA38E8A05ECE0458B163555BFA9084E9186A6A516DE58E436DD92F2B6DB6E0BD75C734D5DFCBEBEBC7AF5EACF5E71C51517A7D9CC4B394F9D6ECADC07FFFBF6BFBF78C543171FFFED93EAFFB4FCA983AF58706BCF39D57F0F758D0DA1227E68DDCB2A42B75C4558D3501D16D72E0FD357CF0E9397FC29FC70EED5D5772E7BF4A5BFD72E397F87D5F3FFF9A9A3EE58EC9F81931C27395BDF534F3D3575FFFDF73FF0BEFBEEDB73E4C89165ADDDFEA1A5254B968471E3C6AD59B162C53DAFBEFAEA195B72CF3B365D3CB02DDB7DF7DD272D5EBCF80BF100D9FBA0830EDAA4ABC3E9561BF1A46C9DD608C7051C17B08FA5739A3973E6E2279E78E29723468CF84D4D4DCDB2E79F7F7ED0B469D379A9178A00002000494441547ADD72CB2D1553A74E2DBBF3CE3BEB1F7AE8A13571BB39CB962D9B180BE4B3264E9C78E1B3CF3EFB5A57C84FA79F60E14773AF3D78FEBAC5DF78A3F6AD7F7AB576D18E2BEBD7F45AD7505756912BAFEF555EB9B66F79AF97E366772F5AB3E4572F1EE936282D99D8A473E94A139B7CF9CB5FBEB6BCBCFCD458D4764BF7F66DCBCA952BC30F7FF8C3D5CB972FFF5D3C49384BE1BBF58C1D3B7640DFBE7DA7EF169D77DE79A1B2B2B2CD6DE7CC99537FFEF9E757BBD586E3028E0BD8C7527CAAAAAA9E8B8B11315E9E3C79F25E5D350F159DFD0F3C7FD899CFC4C599BEB2505CAEBAEAAA33BFFAD5AF3EF7A31FFDE8A27840EFD15A019C5A7C274C98B02616C03F8985EF4F14BE5B579A4C6CD4A8517BF4EEDDFB81F1E3C71FF9831FFC203760C0807FD82ECD387AE9A597563734349CEBA40CC03E96E23276ECD8CAEAEAEA11D9D33DD3F3AE3AAF4A99AF03D051AEB8E28A4BE3E2EBFFF66FFF5697C696149A376F5E6AF1AD59BB76ED77AEBBEEBA8B14BEDB46CAFB4F7EF293A37AF5EA75CFB871E31A172E5CF88ED75337BCECA4ECA41B6F34733E807D2CC52616BE47143EAFA9A919D55573A1F8053AD495575E79754545C53F5F78E185F5B366CD6A5AF7D24B2FA516DFFAF8F0DB13274EBC5296B6BDF8799C306CD8B09BCE3FFFFCD07CA1229B78A52E75C38B276577CB12807D2C45E9CC8D3C57FC02B497ABAEBAEA8ACACACA332EBBECB27593274F0EFFF99FFF59D3AD5BB773AEB9E69A5FC84EE7F19DEF7CA7EAC0030FFCAF8B2EBAA8F1FAEBAFAFBBF8E28BABD7AD5B3746373C00FB588ADA270A9F3434348C1E356A546BC35FBBC7F8B4E217E05DFAE52F7F39B967CF9E63D2B4FA8D8D8DA7FCEA57BF9A242B9DCFC30F3FFCF30103063C7CE79D7756A46E784ECA00DACFD7BEF6B56FBEFFFDEFFF45B68F3DCF3E968E76EAA9A77E202EB62F5C97CBE5060C193264542B9BF78DF12BC5EFB673D3367E3FD08E7EF18B5FFCBEB2B272602C7CFF47363AADB10B162CF8605CFE54373C80F6F7C8238FBC91968D8D8DEF950D3A406AD1DDB9B9CE8BDFB331AD6D140BE0312DDE33B4AB24A7B3A8CC3EA43505EB3ED5CA76BDB2E59A4DF8999FF2FD87CE25CD7E290B45A15A0A00A0A87C31C6B763BC18E380185F8F716C1BC5EF27B2599F4F8D4F2F8EF1788C618ADF8E978AD9DBB2BFA52646BAEF54BA1276458C1E31E667DBA5F52FC598939D94ED19E3E3319ECF5E6F8CF1CD18DF8BF1508CA5ADBC7F957F1300004089D923C6BFC4787F562BED3674E8D087E3729736B6DF71DEBC79A9A1F02731F68DB124C6E018B314BF1D6B748CD5E1EDC1D53B67CBAFC638ABE079C88AE2DAECF1B9217F65E38B05AFAF2CD8BEA195F7030000949AC363F48C31717D75BBE38E1BAC83BA77EF7E4E5CFC392B7C9BEBA792D6198ADF7475E1A8EC83BA37FB00DA92FAA69F1CE390ECC3BDA7C5EBBFF6BD070000BAA0BFC4F872F3933DF7DC33CDE1D16601DCAF5FBFC3CACACAEE686868E83209EA0C135EA53EE923624C8B717C8C17DAF890527FF5D4D2FB95ECF5B37CBF0100009AC6ECA65A2ACDD8BCEAB4D34EDB2397CBA59AA9B1AD37949797F7DF6EBBED3E121FF6C9561D50EA49EA0C2DBFBBC548B3DEDD90C503213F9E378DD5AD0BF9BEE7A9297E87182F87B7C7F0EEB7093FBBF0FD000000A568768C6FC5F86B8CA75E79E5952377DF7DF7B43EB7A137EDB7DF7E4B1F78E081BFC5870B62CC54FC76BCE1319E88F1688C41213FA1D57DD96B97C5782CC6E290EFF23C2EDBAE6FF601AFDDC8CF2E7CFF71C1845700004069BA2E8B5EC3870F7F3AB4B8BF6F6B860E1DDAB35FBF7EFBBCF5D65BA94EAA55FC76BC54E8A656DD34EB735D8BA48F8FF1EFD9E3B47EEFAC405E1EFE7140766B57355ABE1FA02B48B78EFB46C8CFE0D8727D9A5F21CD8CBF509A00DE95D4C276682BEB538FC3349FCDCB52C4B63066CC980372B9DC5E9BB8F9EE1FFBD8C70E983C79F2FD5D21379DE93EBF6DDDB7B765D1FAC666FE5C452FD0950C8B3137E46F7390C6F014F67849B33A5EA6F00578573E1CF2C3F47E5E702E5D963DFE8F906FD4699026B6952953A6A49EAFEF6818ACAAAA9A10F20D8317C442774257CD4D85AF07404949F73A4F13034E0FF9D6DFE6F9119E8A717D8C1D43FED672B74A15C016199B15BF8F64C5EE91D9FA3466F294186986DD6352912155A0F805A0E3DC12E36731EE8CF17056F026C342BEC537B5087F42F10BB0C52E09F90B8C9F8DF1CB183FCED60FCC960F6545B1E2173A9932290028197DB222F717A1F571686784FCE4172E7C026CB934FFCC41213F696B4B695E855D836ECFA0F805A0438D0DF96ECD6936FC34DEA7B2E0B583B2A277AE34016CB14BC3DB1710E7B4786D8F18D7C4784D9A40F10B40C7BA3C2B7A6F0CF996DF1D0B5E7B31E4BB3AD74913C016FB4E8C79213FDEB7A574E1F1CD90EFFEDC5DAAA0F3D1F5ADC4ADEBBEAEBEC7DA1EE5353D6B24631BEB5EDDFDADD0F6ACE6D05E52B7E62FC63822E45B2176C9D6A72ED197648F6F91A6AEABAE5B5D4D3C2EF4705CE814C785D0181A17CB44514AB7324ADD9ED3AD3A0765EB762E287E3F2D45A0F8652B5BD37BCDECFE2BFAEFB5B8A763EBB63668E9A0D71B1B1B67C8045B4175C1F2D8ECF1EB217F5B8EB46EB614755D6B7BAD9D118F0B231D17B6BD01CB062C88D5EF03325174FAB478BE3AE4C7F8A67DEBCA183D632C9226E87C747B2E71B57D6BCF19B0644063CFD53D25631BEA51DDA37EE0E281831A1A1AC6C9061DECE68293B334D3F3842CD238B4B931BE1CE35C69EABA1A7A369C3360F1807AC7856D2BB5FA0E5A30A8C271A128CD28D8CF3E1F6356C80F2D498F5397E8BD639C2C4DA0F8652B3B6DAFD31E5ED97FE5F777FDDBAE0D43160C693AD8B2754F6E062F1C5CB3FBACDD979785B273468F1EADC58D8ED63CA6F7E1565E5B15E35FC2DBB73FA20B3A69FF9366ACEDB7F6BC5D67EF5AEFB8B08D8ADE45831A86BF307C7979AEFC2CC7859228825B4AF32B4C951EE87C747BEE02C61C3CE6E29BA7DFFCC7DE2B7BFF66E092817B55ACAB28AACBFD4B972E0D4F3CF14418397264183C787051E5BEA1AC61556368FC73435DC3B78F1F7DBC131CB6A6151B786D95F4746D9F3BE47357DDF6E46DF7F779B3CFF503970EDCB7A2B6A297AC6C1DF565F5AB43597830AC0B5F3F76F4B18E0B008A5FDADB49079DF44C5C1C5C8C7F7B555555EA46B4DF6DB7DD367BCA9429EFF369429BD20457699295A51BD8268DF94DADC2AF4B57D776E2C8135F8A8B9132019B65688C9B3661BB2F857C576840F10B9B66ECD8B195D5D5D5FBA5C7B95C6E8FF47CD2A449D53203AD4AF7F54DDD9EE76E609B74FBA3DB43915E0C03D8C616C4F8CA46F6B3FD63BC12F263821BA40C14BFB04962E17B44E1F39A9A9A517171B7CC40AB5277E6E9CDFF7CB293B315E1EDD99F93BDB3133700B64C9AD1F99F62CC09F9199E9B677F4E73E9A4DB1AF688B1BBC21714BFB05972B9DC171B1B1BD73F8F8FCF56FCC246A5A277588CB131F6CAD6A52ED1A91B5EEA12AD2B1EC0BB736FC8DFE7F7C3317A6705F13931CE8CF186F440E764B6673AB5868686135AAC1A75F2C927F79119D868F19B3C16E38B59FC3A2B7A974A0F40BB49B7397A30C64352018A5FD862A79E7AEAE85C2E5738BD731ACBB87D7979F968D901000036876ECF745A0D0D0D1F8DC56FE1AAE62727C6B85986A04DBB64CB013126648F0F0CF9F1C0D3A507A0DD0C8CF1C790BF407F508C5B62FC8FB480E21736D9A851A3D277F39C16ABCBB3E5A7CDFA0C9BB46FBFBF45B1BB426A00DA4DBF6C1F7B905480E217B6D8D0A1438F686C6CFC87B1BD715D6D2E97EB53535393BA3EDF2A53F00FFBF4C293B0B64EC8D2ACD07F952E802D926E15377023FBD910F4B401C52F6C8A58E4FE9FD6D6C7C2B73C7BFD44C52FFC8374C12875BD1BB691EDB657FC026CB11931EA37B24D0F6902C52F6C54EAF21C8BDBD12DC6FB366B2E7E53D7E76F4E9A3449374E789B31BD001D6F8E14407132DB339DCE90214346B598E5B9A5B5F1F5016BD7AEFD806CC13FA894020000C52FC5F0A52C2B3B71239B343509C702F84CD98277F8468C235AAC4B5DA16F8CF133E90178D7C6C418D1CAFA4762DC273DA0F885CDF5858DBCDED4B2D5D8D8786C362B3490D7DA38F81FC7981DE35FA407E05D9B12634D8B75FF15E3F218474B0F287E61939D72CA29C786FCAD03362A757DDE61871D4E9235586F6E8BE7A362BC14635CC84F840540FB4AB33DDF11F23D6C00C52F6CBA58D01EBA99DBEF2D6BD0A61D43BE3502808EDBCF4E9306280EBA8CD2A94C9932E52771F193C27555555513E2627C8C0B264F9E3C41966083BE1CF2F7F11D1063618C0F64CBC296DF3474E045A902D82277C7F87C8C7401FEF16C59A82C3BC79E2155A0F805A0E33C1BE35F63A42104D7C478B3C5EBBD63AC8E3141AA00B6481A729526BEFA61C85F607CB345E1DB2DE85D098A5F003ADC6321DF7B62748CEFC5F86670EF5F80F6947AD7A48B8CA9575A1AEFFBCBD0FA84834027E3AA1440694ADDF23E19F2DDA047480740BB4BC349D285C67D629C2A1DA0F80560DB49AD135F09F9EE79DB4B07408748B794EB1B635FA900C52F005B4F9F56D6A55B1D7D426A00DAC5E056D65D1DF2B7970314BF006C258FB5B1FEE6A0F517A03D3CDEC6FA2BA4063A37135E019496A56DAC5F9505004097A4E517000000C52F000000287E01000040F10B0000008A5F00000050FC02000080E21700000014BF000000287E01000040F10B0000008A5F00000050FC02000080E21700000014BF000000A0F805000000C52F0000008A5F00000050FC02000080E21700000014BF000000A0F805000000C52F000000287E01000040F10B000080E21700000014BF000000A0F805000000C52F000000287E01000040F10B0000008A5F00000050FC020000A0F805000000C52F000000287E01000040F10B0000008A5F00000050FC02000080E21700000014BF000000287E01000040F10B0000008A5F00000050FC02000080E217000000DEA50A2900E89AC68C1973442E977BB48D97C75755558D2F5C3179F2E49CAC0100C54ACB2F40173565CA94C7E2E2C54DD9B6B1B171A18C01008A5F008A522C6AEFDEC44DEF902D0040F10B40512A2F2FBF7653B6CBE57237C81600A0F805A028FDF6B7BF9D1E17AF6F64B3E50B172E7C58B60000C52F0045ABB1B1F1E68DBC7ECBFDF7DF5F27530080E21780A295CBE56EDBE081A2ACEC1659020014BF0014B5AC4BF3ECD65E4BB33C2F58B0609A2C01008A5F008A5AD6A5B9AD599FEFD0E5190050FC02501272B9DC94365EFA93EC00008A5F004AC28D37DE98BA3E2F6DB17A79434383FBFB02008A5F004A4ACB42F7CEA953A7AE92160040F10B4029B9B6F0492E9733CB3300A0F805A0B45456563E56F8BC478F1EF7CB0A00A0F805A0A44C9A34A93A2E5E4C8F73B9DC9CF87C85AC0000A5A2420A00DAD77DF7DDB74B5D5DDDB71BCB1A4FCA35E47629A6BF7DE9D2A5E189279E08871C72C8F0B3CE3AABB198FEF6C6D0B8241772B7D4D7D75F367AF4E8D9BE890080E217A0834C9B36EDD8DAFADA1B960F595EB77CFBE53BD5F4AC29BAFF87DD3EBA5B589AFD574CBA57771F3C60D980CF0C5A38E8B3F17338FBD8638F35533500B09E6ECF00ED24B5F8D6E7EA7FFBEAFB5E1DB070D7854559F816B3DACADAB078A7C53BCCDD7BEE80FAC6FADFDC7DF7DD7BC80A00A0F8056867EBEAD67D6FD990653D56F75DDD5D36B69DB5BDD6765FBAD3D2CAD02DFC54360000C52F40FBEF514F59B1DD8A7E9BB269C59A8AD07D59F750B1CAE8938EF0E6C037FBE61A73C7C80400B0FEFC4B0A00DA47AE213764635D9DCBD7968701CF0F08DD57BCDD385CD7AB2EAC18B122ACEBBF4E12DB49EA025DD6583640260080665A7E01B65671DC980BDB4DDFEE1D856F925A81D3FAB23ABB640000C52F4091AB78ABA2CD6ECE65B565A1C7921E920400A0F80528F2E277CD86479A54AC3512050040F10B50E452B767000014BF000000A0F80528668DB9C60DBF1E1A25090040F10B50DCD6F5DDF0AD8CEAFBD44B120080E217A0B8D5F5A90BAB765FD5EA6B6B87AE0DD583AA25090040F10B50FCD60C5DD3FAFA9DD684C672DD9E010014BF0025A0C7F2D6EFE5DB63450FB34103007420379504D80ACA6ACBC2805903428F25AD17BF7DFED627F458DA23AC18B122D4F5AA93300080F63E1F9302808ED57341CF30F8D1C16D16BECDBABDD92D6CFF97ED43AFD77B6905060068675A7E013A48F9DAF2D07F56FFD063598F4D7E4F2A7AFBBFD03FF4FA7B2FADC00000ED48CB2F4007E9B5A0D76615BE85522B70CF853D251100A09D68F905E820F595F5A176BBDA77F57E000014BF009D5ABA7D510A0000B63DDD9E81CEA27B8CE363FC7B8C1DDAD85F7DBA8DF756C6D87B033FFBC8189FDDC0EB4363F46965FDA53E160080D2A0E517D8565241DA37C6BA181F8FB13AC6A331FE2BC69BAD14C6212B8EEF8EF1B91837C4F85A8CB9310E8FF14C8C17DBF85D036374DBC0DFB224C61D3146C7F860F6772523637C2CDB577E20C6777D6C00008A5F804D950ACCFE311AB2FD509AD2380D8E2DCB0ACEA362AC8AF1E36CFB0F65EFF95D8C7131DE08F9D6E1B4EDE559E1DAD20D593417B169F6A895D9F36FC7382DC6A2EC795DF6B393276354678F3F1FE30FD9EFFEA18F0D0040F10BB0391E8AB173C8B7B8A6A2B76F56D04E8B313C2B4097146C9FD6A716D8E742BE95F73F37E1779465856BB3BE05CF3F5F50F836FB6DC1E39343BE257AA7ECF72683632CF0D10100287E0136472A62F78FF1488C1121DFD29B1C1BE3E1F0766BEEAE21DFF23B332B5A53EBEDB9315E8DD13BC66E59C1FCC9901F2FFC46F6BE2105856BCB96DF1D0BFE8E3D427EBCF045314E08F9AED5CD85F73305DBFD20C605053F1F0000C52FC0463577794EE379BB153C4ECBC231BFAF85B7BB2FA72ECEDF0AF96ECAE9FD6362CC8B5195AD2FB4386CB8E5B7D9EC2C4E0FF996DD6B637C35E4C712DF9B6D73608CF13196FBD8000014BF009BEBA9AC202DECF63C28468F16DB1D9FEDAF8685FCA454A925776207FE5D6932AE6B0A9E9FAAF0050050FC026C8954ECEE13F25D930F0EF92EC9A9E537CDCCFC648B6DFF1CE31B21DF1A9BE2F1901F933B77033FBF70BC6ECB6ECF43DA784F1A277C40568C1F5EB07EA08F0B0040F10BB025FB9E1DB3A236DDEA6878560CA771BD7342BE5BF2BF166C9F5A5E532BF1B090BF9D519A99794A7867B7E696D26CCEF30B9E17767BBEBB95EDD3F8E13493F4BF677F5F5FFB4A0080D2512605C03690C6EC4E0DF9B1B669CCEE922CE665C56D2A7C8FCAB6ED9EC52305FBACF362BC27E45B8093C1ADFC8EF91BF8FD0DADAC4B935E4DCAFEB637B242B93916F9C800008A9BD60C606B1B9415B67505EBFA64056E7337E5D40AFBE1909F802A7555FE75C88FC31D16F2B7463A22C62505EF1FB191DF5916367EB1EFA0186B5AAC4BF712FE661BC53500008A5F8036A556D5FFD984EDA6B678FE68561CA722764A8BD73EB5919F756F56346F4861E17B76B64C2DBEDFF7910100143FDD9E8162D35A97E58D15B6B59BF93BEAA4B96B3BE594538EADAAAAFA37990080D2A1E517802E6FD4A8511543860C195556567662C8DF377AFBECA58B64070014BF001491FADAFAB0FCF5E561FBE1DB87C686C6A675B9B2DC3BB6A95E591D2AFB56BE63DD5FAEFD4BD8EFF8FD42FFA1FD9B9EFFE9E77F0A879D7658E83BB86FD117BC43870E3DA2B1B13175733F36C62EBE2500A0F805A0C895772F0F8F5EF76838F05307865DF6DF254C1C3B311C79E69161E63D33C3B091C342EFED7A87FB7E715F38EFD6F39AB69FFDC8ECB0DD7BB60B739F9C1BDEF781F785C76F783C0C3B6C5858F0C282D0BD57F750B3BA26CCB863461839666451E5E1D4534F1DDDD0D0F0D1F8706C2C7C0734AF8F8F1B73916F0A00287E012872479F77747873C19BA1ACA22CF4DFA97FD8F7B87DC3F37F78BE69995A8107ECB4BE160C7D87F40D7F7FFEEF61D5D25561D1CB8B42CDAA9AA6D6E37E3BF40BF367CC0F77FDF4AE70C2F74E08AB97AD6E2A9C3BABB163C756565757A719C2CF8C716CAC717729A871531378D313852F00287EA1B3185F5555250B745A4F3FFD74D3CD987A0CEAD169FFC6D5CB57879DF7DF79FDF319B7CF082B16AC686ADD1D346CD03BB67D63EE1B4D45726AFDDDE723FB8487AE79282C9EBD38ECF1813DC26E87ECD654280F3F7278A7FD7F5DBA7469183366CCCC58F8EEBB81CD3658F0C67DCE04DF6CA0BDCF67A40014BFE08041517BE69967C22E3BED1276F978E71B3ABA72C9CA30F789B9E181AB1E08675C794618B0F380B06AC9AAA6D6DE6E3DBA35B5E8CEFAE3AC771E20BA5784DA35B5E195075F092F3FF472D398DFBD8FD9BBE93D977FEAF270D2252775EACFE3C9279F4CADB9FBDAE700008A5F8AC52429A0181C7CF0C1E3C3119DF36F4B9353EDFFF1FDC38C3B673415BE499FC17D9AC6F0A6F5A96BF3019F3C20DCF0D51BD6BF67CF0FEF19EEFEE9DD61C7BD760CE515E561E14B0BC3C19F39383C32F191B0F747F66E1A037CDCB78FEBB4135F8D1C3932DC76DB6D2FC6877BBF8B1F73816F36E0FC0614BFB0554C9E3C796E5C4C90093ABBB3CF3E7BFCCC41338BE6EF4D05ED1D3FBAA36902AC07AF7A309CF1CB33D6BF965A8A5F9BFE5A38E6EBC78427273F19F6386A8FA696E0D43A7CE82987366D93667DBEFD82DBC327C67DA2691C7067B3FDF6DBA7FDC73E69CC6F4D4DCDA8C6C6C6D373B9DC0971396833F63FF63D00A0F805A058BDFACCAB61970377097FFBCBDF9A26BB4AB336F7D9BECFFAD7536B6E5AFFC29F5E681A0B9C667E9EF7D779615DCDBAA622384905F1EE47EEDE348B74673669D2A4EAB8B83B452A84D7AE5D9B6E6B74622C844F8FCB9EBE0D00D03594490140D791EEEF9B5A6B97BDBA2CECB4EF4E4DEB96BDB6ACCDEDD34457CFDFF57CD8EDD0DDC2CE07EC1CEAD7D587BADABAA642B8DF8EFD3A7DE1DB5A213C65CA943B627C69E1C285FD524B705ADDD8D8B8CAB703004A9B965F802EA4CFA03EE183E77C30FCF5A6BF86834E3C288CFEEEE8A631C0637E36A6CDF7A45B1CF5E89D9FC17A970376696A114E91A4EED19D75CCEFC6DC7FFFFD75E1ED16E1AFAC59B3E603656565A7C742F8D3B1281EE0DB02008A5F008AD4A7FFFDD34DB730DA6FF47E4DCF9B27BF7AEDD9D7C203573ED0D4BADB6CE63D339B66764EB73A4A637DDF5AF45653CB6FF3ACD0CDF7FFFDE4F84F167D5EB2AED1D3528C1A35EA4B43870EFD442C8247F8C60080E2178022D5F27EBEC97B0E7E4FF8FCD59F7FC7BAFD3E9A2F909B5B79BB8AAC45F8D62C00801261CC2F0000008A5F00000050FC02000080E21700000014BF000000A0F805000000C52F000000287E01000050FC02000080E21700000014BF000000A0F805000000C52F000000287E01000040F10B0000008A5F00000014BF000000A0F805000000C52F000000287E01000040F10B0000008A5F00000050FC02000080E217000000C52F000000287E01000040F10B0000008A5F00000050FC0214A186F286653DD6F690884EA07B75F7505F56BF52260000C52F403BAB2FAFBFA3FF8AFE0D32B1EDF55BD12F349635FE45260000C52F403BEBD9D0F35FB75BB4DDDA9EAB7B4AC636945A7D072D1CB4265793FB9A6C00008A5F807676F4D147BF5E16CA4E79CFECF7AC1DB260485311C6562E7A170D0AEF7DE9BDD515A1E2F3A3478F9E2D2B0040B30A2900683FC71F73FC1FEEBBEFBE3DFB2FEF7FED764BB63BAC7C5D799F62FAFB57AD5A155E7EF9E5B0E79E7B863E7D8AEA4F0F75E5756BEB2BEA9F0E8DE1ECE38E39EE25DF460040F10BD081520B705C7CA418FFF6AAAAAA097131FE99679EB960F2E4C9137C9A0040A9D0ED19000000C52F000000287E01000040F10B0000008A5F00000050FC02000080E21700000014BF0014182305004057532105002563B718BF8FD1903D1F15E3C1186363CC28D8EECA1853A40B0050FC02508CE6C53829C69C18C363AC8AF15C8CDAACF8FD718C33630C932A00A0ABD1ED19A0B4F4CA968517375F8CF1E518E363CC8FF1963401005D8D965F80D2F2468C81319664CFD345CE3D623C1563EF90EF1A3D22C6F352050074255A7E014ACBE8ACB8FD54F67C568CD9312ECA9EA7AED1C74A1300D0D568F905282D0F84FC98DFF9D9F3FBB3E52F0BB6B92646BFA0FB3300A0F805A00855C6B87913B65B1BE328E9020014BF0014A363627C2118CF0B00A0F80528618FC63820C6F4184363CC6D659B1E31BAC7787F8C6A29030014BF00149BE5213FE6F7A090EF023D2EC6E331FE476A0000C52F00A528B5EAFE6BB69F4F512725004057E6564700A56BD7ACE855F802008A5F29002829B7163CBE5F3A0000F2747B06282DDF09F949AFD6C47838C615318EC85EDB37C6ACE056470080E2178022B72EC68C18C3B3E797C6581CA367F6F8CC909F080B0040F10B4051FA63C8DFE2A8217BDEBB8DED2E942A0040F10B40B13A2EC66E31E6857CCBEF7829010050FC0294B2CA6C79748CFF1BF2333EA7D99F9F0EF996E143A5080050FC0250CC0687FCC456699CEFAFB3383EC6BD52030074556E7504505A5297E725D9E30905EBEFCD8AE04A290200BA222DBF00A557FC4E8BF1C31833633CD7E2F5749BA33411D61AA9020014BF0014ABDD0A1E5F1FE3F3520200A0DB334029BB5C0A000014BF00A5EE71290000C8D3ED19A0B4A47BFB5E1063DF182BDBD8E635690200BA1A2DBF00A565765600EF1963C71817B558EE1FA35A9A0080AE46CB2F4069B921DBB7A796DF19D9BA275B2C3F254D0080E2178062755D8C4362D4C5688871501BDBDD2B550080E2178062D57C5BA354F4BE251D00008A5F8052F5871857C41814E38E18EF8971708CE121DF2A9CE67A7823C607A50A0050FC0250AC3E16F2637AD3C45787C65823250000667B062835BBC59815E391906FFD9D18E3FFC4182835004057A6E517A0B4FC264655F678488C2FC6E81EE347314E0FF9C9B0DE0C6D4F860500A0F805A0D3FB48B63C2AC627633C15A336C6FFCB0A60DDA00100C52F002563518CEF173C9F2F250080E217805292BA3A5FD7C66BBF0BF9D9A0A76DE4678CAFAAAA924900280DE3A540F10B508A3E14E37B213FA9E10531A684FC58DFCF66AF4FDBC49FE3400900287E01E8B42E8C31277B9CEEEF7B578C7E311E282880DB3249FA00A06439CE03505252C15B912D2F0FF96ECEBBC6F863C8DFFE080000008ADEC742FE7EBFDD0BD6ED9C2D7F10A3528A0080AEA65C0A004A46EAD2DC27C61B315664456EEF2CBE13E399184FC7382FC6C3D20500287E0128462FC4F8708CB5317E18F2E37E0F8D918BB17B8CA531B68BF16A8CD7A40B00008062B55BB6BC365B0ECF967BC718283D004057A5E517A0B4A4F1BE7D43BEC577518C0342BE2BF490181F8DF1A81401000050EC46C618DC46CC971E0000004ADD7029000000000000000000000000000000000000000000000000000013EF7BBF00000088494441540000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000A068FD7FDE8CD9EF8E2563740000000049454E44AE426082,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('212511', 3, 'source', NULL,
+		0x7B227265736F757263654964223A22323132353130222C2270726F70657274696573223A7B2270726F636573735F6964223A2270726F63657373222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C2270726F636573735F617574686F72223A22222C2270726F636573735F76657273696F6E223A22222C2270726F636573735F6E616D657370616365223A22687474703A2F2F7777772E61637469766974692E6F72672F70726F63657373646566222C22657865637574696F6E6C697374656E657273223A22222C226576656E746C697374656E657273223A22222C227369676E616C646566696E6974696F6E73223A22222C226D657373616765646566696E6974696F6E73223A22227D2C227374656E63696C223A7B226964223A2242504D4E4469616772616D227D2C226368696C64536861706573223A5B7B227265736F757263654964223A227369642D41453336323135452D353838452D343946332D423734332D383330454243423330344130222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E5BC80E5A78B222C22646F63756D656E746174696F6E223A22222C22657865637574696F6E6C697374656E657273223A22222C22696E69746961746F72223A22222C22666F726D6B6579646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22227D2C227374656E63696C223A7B226964223A2253746172744E6F6E654576656E74227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D38323934394441432D433932442D344241422D393932342D314632373945353044424338227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A37392E32323232323232323232323232332C2279223A3131367D2C2275707065724C656674223A7B2278223A34392E32323232323232323232323232332C2279223A38367D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D39434334443631332D313435312D343133432D414638352D383046383839314244313934222C2270726F70657274696573223A7B226F766572726964656964223A226D616E616765222C226E616D65223A22E7BB8FE79086E5AEA1E689B9222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C22657865637574696F6E6C697374656E657273223A22222C226D756C7469696E7374616E63655F74797065223A224E6F6E65222C226D756C7469696E7374616E63655F63617264696E616C697479223A22222C226D756C7469696E7374616E63655F636F6C6C656374696F6E223A22222C226D756C7469696E7374616E63655F7661726961626C65223A22222C226D756C7469696E7374616E63655F636F6E646974696F6E223A22222C226973666F72636F6D70656E736174696F6E223A2266616C7365222C22757365727461736B61737369676E6D656E74223A22222C22666F726D6B6579646566696E6974696F6E223A22222C2264756564617465646566696E6974696F6E223A22222C227072696F72697479646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22222C227461736B6C697374656E657273223A7B227461736B4C697374656E657273223A5B7B226576656E74223A22637265617465222C22696D706C656D656E746174696F6E223A22636F6D2E6C656E2E6163746C697374656E65722E4163744E6F64654C697374656E6572222C22636C6173734E616D65223A22636F6D2E6C656E2E6163746C697374656E65722E4163744E6F64654C697374656E6572222C2265787072657373696F6E223A22222C2264656C656761746545787072657373696F6E223A22227D5D7D7D2C227374656E63696C223A7B226964223A22557365725461736B227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D43423837323236392D433930412D343839342D394538382D304538384238364543384446227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3238382E32323232323232323232323232332C2279223A3134307D2C2275707065724C656674223A7B2278223A3138382E32323232323232323232323232332C2279223A36307D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D38323934394441432D433932442D344241422D393932342D314632373945353044424338222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D39434334443631332D313435312D343133432D414638352D383046383839314244313934227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3138372E36303530353132333635343432382C2279223A3130302E39303833313534363834373331327D2C2275707065724C656674223A7B2278223A38302E31373533333037303739303031392C2279223A3130302E32393039303332383135323638387D7D2C22646F636B657273223A5B7B2278223A31352C2279223A31357D2C7B2278223A35302C2279223A34307D5D2C22746172676574223A7B227265736F757263654964223A227369642D39434334443631332D313435312D343133432D414638352D383046383839314244313934227D7D2C7B227265736F757263654964223A227369642D32323745363933372D423435362D343735432D424332332D453842383539374238354131222C2270726F70657274696573223A7B226F766572726964656964223A226872222C226E616D65223A22E4BABAE4BA8BE5AEA1E689B9222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C22657865637574696F6E6C697374656E657273223A22222C226D756C7469696E7374616E63655F74797065223A224E6F6E65222C226D756C7469696E7374616E63655F63617264696E616C697479223A22222C226D756C7469696E7374616E63655F636F6C6C656374696F6E223A22222C226D756C7469696E7374616E63655F7661726961626C65223A22222C226D756C7469696E7374616E63655F636F6E646974696F6E223A22222C226973666F72636F6D70656E736174696F6E223A2266616C7365222C22757365727461736B61737369676E6D656E74223A22222C22666F726D6B6579646566696E6974696F6E223A22222C2264756564617465646566696E6974696F6E223A22222C227072696F72697479646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22222C227461736B6C697374656E657273223A7B227461736B4C697374656E657273223A5B7B226576656E74223A22637265617465222C22696D706C656D656E746174696F6E223A22636F6D2E6C656E2E6163746C697374656E65722E4163744E6F64654C697374656E6572222C22636C6173734E616D65223A22636F6D2E6C656E2E6163746C697374656E65722E4163744E6F64654C697374656E6572222C2265787072657373696F6E223A22222C2264656C656761746545787072657373696F6E223A22227D5D7D7D2C227374656E63696C223A7B226964223A22557365725461736B227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D37363332463035442D343046342D343145362D383039352D323634444444333541324332227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3439372E32323232323232323232323232332C2279223A3134307D2C2275707065724C656674223A7B2278223A3339372E32323232323232323232323232332C2279223A36307D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D43423837323236392D433930412D343839342D394538382D304538384238364543384446222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D32323745363933372D423435362D343735432D424332332D453842383539374238354131227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3339362E34323134343039373232323232332C2279223A3130307D2C2275707065724C656674223A7B2278223A3238392E30323330303334373232323232332C2279223A3130307D7D2C22646F636B657273223A5B7B2278223A35302C2279223A34307D2C7B2278223A35302C2279223A34307D5D2C22746172676574223A7B227265736F757263654964223A227369642D32323745363933372D423435362D343735432D424332332D453842383539374238354131227D7D2C7B227265736F757263654964223A227369642D42383042363037442D363646352D343834422D383041312D373935334238444445363943222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22E7BB93E69D9F222C22646F63756D656E746174696F6E223A22222C22657865637574696F6E6C697374656E657273223A22227D2C227374656E63696C223A7B226964223A22456E644E6F6E654576656E74227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3632382C2279223A3131347D2C2275707065724C656674223A7B2278223A3630302C2279223A38367D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D37363332463035442D343046342D343145362D383039352D323634444444333541324332222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D42383042363037442D363646352D343834422D383041312D373935334238444445363943227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3539392E393730343836313131313131312C2279223A3130307D2C2275707065724C656674223A7B2278223A3439372E37333433373439393939393939342C2279223A3130307D7D2C22646F636B657273223A5B7B2278223A35302C2279223A34307D2C7B2278223A31342C2279223A31347D5D2C22746172676574223A7B227265736F757263654964223A227369642D42383042363037442D363646352D343834422D383041312D373935334238444445363943227D7D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A313230302C2279223A313035307D2C2275707065724C656674223A7B2278223A302C2279223A307D7D2C227374656E63696C736574223A7B2275726C223A227374656E63696C736574732F62706D6E322E302F62706D6E322E302E6A736F6E222C226E616D657370616365223A22687474703A2F2F62336D6E2E6F72672F7374656E63696C7365742F62706D6E322E3023227D2C227373657874656E73696F6E73223A5B5D7D,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('212512', 2, 'source-extra', NULL,
+		0x89504E470D0A1A0A0000000D49484452000002A6000000BE0806000000E761CD40000000206348524D00007A26000080840000FA00000080E8000075300000EA6000003A98000017709CBA513C0000000467414D410000B18E7CFB5193000000017352474200AECE1CE900000006624B474400FF00FF00FFA0BDA793000000097048597300000EC400000EC401952B0E1B00001B104944415478DAEDDD097C54D5BDC0F1FF9D992C6C090442202C52A4802B8BA855A1202250B18A169B44C402DA67DD5ADBBEF7146D2D7EACFADADA576DA9FAEA82C56042D14FA90BE256A3E02E104411102112246058122021093373DFF9E7CE984B4C3090643299F97D3F9F6366EEDC593CDCFF9CFF3DE7DC33220000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000C4178B2A0044366FCEB9FAC081E3675556669E5A51715CE76030914A69EE978B15908E1DB797272595AE32B7EF1B39F2D667A8156208C41040620A34E2D34F677E7FEFDE11F36B6ABA77CFCC7C41BA76FD4852533F118FA786CA69264D4CF6EF3F5ECACA4E96929249C160D0F7597575CA65E3C75FBA86DA2186400C0124A680CBA64D33EFFAE28B0BE60C18906FF5EBF7AFDADE09B49EE2E28B65F3E619871213F7CF3CFBEC594F5223C4108821A03E2F5580786D5077EE1C3FE79453EEB43232969B06D5A6525A596AEA06E9D1E33D6F49C9F7BE3F6BD60FD7CF9FBF781DB5420C811802484C11D70A0B6F1B5D5A3AE6316D5075C8B1BE9A83A9B2FD93F1F2C5DAC952B27EACECDBF96DF1FAAA25B9CB2E2AAF991213CB242DED03EFB66D174EB9FCF259CFE4E6E67E49AD1043208680300F558078535595B948871E1B6A50FDD59DE4B3B77364EFB693C55FD3A176DBC17D3D656BE1F7654FF1A9545E0BE8DCB948060D9ADF2131B1F2116A83180231049098226EAD5A75D7797E7FD7DE3A1FAE21BB3E1F2187AABA34F8D88E0DDF15DB26645A42BF7E4B3C3EDFC1C12FBFFCF277A80D6208C41040628AB864DB093FCBCC5C6A357691C6C1F25E8D3E577B7FB437082DA34F9FE7F5CF0FA8096208C41040628AB8545DDDFD0C5DCEA6D14637E8FB8646999069296969ABBA793C3593A8096208C41040628AB85459D93BBDA1797188BC2E5D3E936030E1446A82180231049098222ED976828785BFA3E4CBA7F6DFC16265106208C41040620A3424A143F9911F4FAAA092006208008929D0FABAF75F2309C9FBBFB6DDB282923EF07DB13C7E2A09208600909802ADAF63D7ED92D66FEDD7B66B43DB7B68011504104300484C81C8F1D7247F6D5B3090585B00104300484C810834A61DA4F8C3EFC99EADC31B7C6CE31B3365DF97C75351003104A095F8A80240E4C0EE7E52BC664AA3BF58A3F4F7BF8B3EB854BAF72F945E43DE106F42351507104300484C8196113894243B379D23BB8B463479E1EFDD5B87CBFED26F49E689AF494AC6A7542288216208400B61281F714D7B78766D39EDA87F8DA6B6E767E5D423FEFC22400C114300484C81266BEEC518017F02950862881802D04218CA475C1B78663E9500104300A2043DA6000000203105000000484C01000040620A000000D4C7C54F0000006D60FAF4E97DFD7EFF54CBB2C69ABBFA9369BA7E5A6753AA4CD961DB76A179EC4DAFD79BBF70E1C26D24A631E68C85975FD6B928382BB95C4E4F2EB7527D07ED044F8D48D06BDB810E96BFBA8BECAC49B13F0874F3DDFDEA4D0BDF27640000404BCBC9C9996AFE5C1FF4FBBF6B12CF86D65C4B366580796C80F93B351008FC213B3BBBC0DC7F342F2F2F97C4B49D3BEF7739BFEF506A5F9FB022D8715F1F91D253450EF6B0A5C69C9304CDE1E0A9B12C5F952474D8257D53B65A7DBB6E084CBDF8869C2F2D4BEE59F297BCFB08210000D05C26B91C60D9F643B66D4FAADD60128DA330CE3C6F9C798D6B4CA23A6BF1E2C59B484CDB9931F3B2CF4BD9224FFB8AEDD46DA345CAF5BCA38159B59A9CD6684931FB0C14291E27925A64F7CC5C21FF3BF59AAC9F275404272ECE5DBC8190020000C7222B2B2BDB63DB0F042DAB5B789BD7B6E5E41D3BE4CC6DDB64D0AE5DD2B5AA4ABA54574B6562A29425274B51D7AEF25EBF7EB22A33530E79BDE1A78DF67ABDAB737272AE8DC5DED3984D4CCFFD5DD62369AB64F6CE5162ED1829477D999726B1A6583D575BFDFBBCE35B3BF5C69CFFA6F71400001C43527AA1C7B2728326170D27A4DFDBB041267EFAA9A457547C6DFF8E3535B52573DF3E397BEBD6DA24F5F9A143E585214324E0F4B276B66DFB09939C269BE4F49158AAAB98BC2A7FCC5FB39FE8F69975D5A68B4D523AAA79FF975F8E10D930CD4EF054D97FB8F867D9B7125E0000E02892D26C93942EB14349A9269BF72C5B26D30B0B1B4C4A1BA23DA9BABF3EAF5F79F957DB4D72FAB0494EAF20318D62E7DE9D3DAFC71A99BEFE872215BD5BE6352BD345D66789CF572173A75D95733561060000BE89CE2935D9E803E1A4744869A9CC7DF5D5C392CBA3A1CFD3E79FB273A73B397DD024A743494CA3D079F7649DDE7D9375EDE62962E97CD196A4AFF7E9259260F9EDFB63E900000000AD96643D129E53AA3DA5BF5CB1A2760E6973E810FF4D6FBEE94E6E7558FF6112D328D469A767E98E51B6A7A57A4AEBD39ED32FCE968E8712ED45841B0000688C2E091514394F6FEB9C524D269B9B94BA93D31BDF7AABF6754346C7CA907ECC24A613EFC899631DB2BBEB9CD0D6A4AF7FA8A31C1F6B733ADA8BECECEC5F69B08F1B378E1F87008821209A63E5FAF00DBDD0E95887EF1BA3AF77E1FAF55FDDB76DFB9A58A8F798F9624A2AB3FF73DB18B182DED67FAFADE3A5D3C0A5C19BCDCD5C4237E2EE34C127191919E5E64BE359CBB216FAFDFE158B172F3E108D1FB6A44464DB3691D34F3F7CBBDF2FB277AF487AFAD1BD9E394996C4C4861FFBDBDF4466CE6CFCF1F03EA3478B9C78A24861A1C8F0E1CEF6CF3F1739EE380EAE788AA15EBD7A556465652DF1783CB9D11C436E0B173AC76F538FD537DF14D9BF5F64F2E4BA6DC1A088C7430CE1A862A5CAB437AF9AF6665E5363457FD12918089CABB76BAFC0DFB8B1553EE06493F02E1D3C38BC94D4689DD39A9F9F5F4462DAC626FC317B846F8374AB5DA73402F61FA76BE27AFAC7C201D05E992F8854F3E70AF3A57185D7EBDD63FE2D9E31DB16252525153CFEF8E355D1F239172C10193850E4B4D3449E7842A47B77A7517CFC7191F1E3457EF21367BFDDBB4556AF766E57563AF757AE14B9E00211FD3E1B30C06960B76E15B9ED3667BFE26273C6DCAFEEBD3A751279FF7D9173CEA9DB567F9F0F3F14B9FC72E7F68D378ABCFAAAD308EBB6E5CB1B6FB011933A9998996E6268BA89A17D2686FE65EE3F196D31E4A631A4B1D05802F8DC73871FC36FBF5D978CAA22F36DBD6C99C8534F39C73D318426D25F619A6262658A3991AB34B1F2A2B9FF687272F2AB8DC54AE867466BB3C561252592A65FECAD40AFD61FB97DBBBC5B77904E33E55E12D3B6FE9FD823D7EF1B2056242726EC1D6CFBD30BDBFF011023D24C9969BE346656555555982F8DC5E60BE15F252525CF151414F8DBEA4369EFA6F698DE7CB3C84B2FE919B439567D4ECF4A8F1E7549A9D284F58413449E7D56E4B2CB44BA741179EB2D2731D52475CC1867BFA54BEB9EF3E49322279D54D710EA459AA9A975FB141438AFABEFAF3DB4E6FB4B0E1D12D9B44964D72E91BE7DEB7A86FAF7A7418D737AB9E80C1343334C0C55E5E4E4FCC3DCFF675BC7507D1B3638230D8DB9F0422791DCBCD9399E93939DED1A4F1A031A63D75D470CA1599D221DCD9F4BB49850A931EDCDF366DB82FAB162B68D0DDF3E430FCA56A4AFEF4A4CC792984681844A19BBFB84C8BE67D90049EBF1919C4F621A7DBD40E124B557AF5E7B4C036B5242F97B5BF4023DF698C86F7EE334A40F3DE4F49A262589DC7AABD3806A43E77345609F3EE6584E70F6D1C64E135B6D20D7AC697C68515F274CA70C68E378EAA9CEFDA1439DDE5AA50DEA8E1D4ECF51B76ECEF6471F753E9BBE67D8451799CAFABBB30FE2B777C8C4CF95E6EF952686B427F525FD7DEE68E8490D4F813912EDF15413273A31A1468C70924CBD7FEEB9C4105A8C7E335F62E2E5928C8C8C4AD3DE2C37F7EFD3583149EBF0F04E03F7EC69D50F31A0ACCC7D77787BAFD498484C13F7591995E97644DFF3600FF39F803DC27C69CF2536A3569AF9C2C8367FB3CD97842E72BCA9B4B434226FAC43889A546AE3F4FAEB220F3EE8346C7FFEB3C8BC794EE376CD35221326E8959BCE7D6D74B53766FB76A7C74793D1708FA9EEA7DC3DA6DA8B73E79D4EC2ABD6AD737A62B571D5214B9D673F678EF358E7CE2283063949AFF600E93EDAA0EA67D3A151A5AFF5EB5F47B6413D70E0801043514D7B52A799389AA63164FEAD3E8B540CD5A7276A3A57BB29D78F7CFCB1D35BAA31A1B417544FF0860D3B7CBFF61E43A5A59D64D5AA55C45014D09E54132793CCCD491A2BC6574949D7AAD63D9FABF7FA3D484CA380B7DAEE78A85384CFDC7588C8B67408F9378464BBF9E218F4DE7BEFD52682ADEDACB39C796CAFBC2232638636204EB9E38EBA7DB4B7E5A69B9CC454870075EE9B0E11EAF0A0366C4DE931D5FDB521543A6D407B89B401D5B96EDAB0BAE930A5EE9F9B2B72E595CE7B4C9DEA3CA6C9B07E9E8E1D23FB6FB2D1B92080186A3F8E8F540CD5A7B1A4C3EE7A02A7C7724646C3FB69423AA281D559B427D4B526794CC4D0EBAF7F4B563B93D389A1286C72C2375A6A89A8C6E8D251EE1020318D021EBF788389917D4F7D3FCBF925873B88BF883AE62F6093986E1E3E7CF8C0487D506D2F34A10C2799DAD8E9C5197A5B1BCF7FFFDB994F1AA643809ABC8E1BE7ECABBD31EE1E539D2757BF61D5463ADC8BBA76ADF35EFADA7A3B33B36E3F6D641F78C079FC8A2BBEDE78EABE914E4AD5E0C183B5612586A22F8602B66162C6573F86468D1A35B02D3EB426A63A4FBB572FE758BEA391A34663262CDC5EEB367DBE269E7979725862DD9E6368ECD82DB279F30C62A8EDDB1BBDBCCE532F568226846AB7ED4F4A6AD5E4B4F2F09E8BAAF65EE931919806BDE2F7D4882F92C9A9793FB1C5AE5E94BF682EB11B39D9D9D94D4E4CCD974299F972784597944A4A4A5AA6F3E366CF9E1D91391F3A34FF8B5F38BD2F59597573D694368ADA38BA1BD0FACFD57972FA5C6D58B5E1D4BF7A45BE26A9EE2B84758E6AF875DCBD3D9AC4BA7B7BF4E2292D37DC70E4CFAD89F1D12E61D51C9DCD87CDCFCF2786A220864CBCE8851B41132FFA4DEA357FDB3486DCF4244DA7B78487DC350EB4B3DD9CD77C452F2A0C9F0C86E9CA164AB7E963FA3ABAD493FB386FCF31949E5E2123478E949B6FBE99188A7C7BE34E463DF563A5AAAACA9CDAC8207DB0CC9CE9B466625A967C5827E92E12D368484C93A522A14252AB239898FAAA6A4F897613BA6D2BD4AB63B936E9FA72CB4C59D4A14387574C435AD6169F4B87E6C34BC76862F9DA6B5FBFE8C22D3C6CFFC61BCE73B4674893D38A0AE74A64EDA5D1C6B2FEDC355D4BB1A1DE1E6DC48736E18773B507D6DDF8BEFBEEE1178320E6699F62C0940EAEDED1A88821B75B6E11B9D77599A90EBD4F9922F2FCF37543FABA8494165D01A3674F2716C2173FE914009D2FAA71161E7A2786700CED8DDF15279E23C58A496A0BC389E9E6B4B4165F5CDFADA86B57F7DD4212D3281048904F3A96CA77AA2378D146A71DB2CDB2DBFF01D0DE859252FD7278CA94E79393939F8B863518B537E7AEBB447AF71639FBECC67B47754D44ED4DD5354A35019D3FBF6EC999F05A8ADAF0694F8D5E70A1FBBBE9C51B61EEDE9E867A9C0E985A3A7830743217747A90162F767A80F4FD9536E4DACB14EE9942CC4B7425A3511543613A64AF8BDE0F1A54B74D93D1BBEF1619354A64EE5C6754227CDC6B0C8417D1D72453AF98D784557B4DC3EB99124338C6F6C6D7D4583149ECEB667F5D5252DEEBD74FC66ED9D26A9FEB3DF7309AC8EB24A6D170B0F8E5D994AD72C6DEC1915BC9B4DB46DB7C4D59AF13AA6D76E6AA67A6051E8F27BC145459347D3E1D62D4A5A2C24BCD2C59E20C196A63A9F34AC33D34DA23AA8DAC967003A9C3943A17353C1CA8438ADA0BA3F4A45BAF306E688171BDA25F1BC5867A79C2AB0368C21C6E74B5072ADCB3A36B3BEA851B7AC5B15E240262A8ADE90999FE7293267D7A52569F2690FA0316EFBCE31CFB6E9A406AC278FBED222FBEE86CD393C46F420CA1A562C5E7F32D0904027FD29B6BCCC1B7A763C75659645F87F1576666EAF49AF0C8E15324A651A0C341EF026B53E0579F8F970E914A4DBB1659DD63E10068877E6DCE428BCC99EA53D1FAEB3461035D9788D41F3E3C126D847FF4A3A37FBFD9B38FFC538AFA19DC9FC33DDCD8588F2E88A1B6A2276B975E7AE47D747A4C435364525244AEBA4A64D6ACA35BF49E18424BC5CAC2850BB7E5E4E41498A47642C0B2E485C183657A61CB0FB22E1B3244FC5E6F38295D110BBF46191389A91E00D366E77C9C5A648F2A8FC0F5A2DD36DA1F5935529E9FBFA888B88D2C1374BFA5161A9698481D8018723BDA5F622286D0C2B1F257536A57A17EC12490DFDDB2A545E79A16A7A6CAB343877ED55B6A92E8FF8B89B88D950328E1A0DCD5FF356BBF045BFFBD06BC6CF93C96E721C216000034242F2F6F89F953A0B7B5D7F4BE73CEA95D3AAA25E81251F79F734E205877F1EF8A9292927C12D3283B00122BECB5BD3F90565DC9B6DF6BF61BDE6AD9152B070000006835B324B484D3F69414F9E3E8D1CD4E4E35293549AEFD454A8A37B4E980C94F7F5C5050E027318D32965FA6F77E47AA3A6FAF5DFEA4C575DE2145196B3C4363E900000000AD43E77CDAB67DA3B9599B336C484F97B9E79D573B0C7F2CF479B74F9810589B91F1D532892627B9362F2F6F7DACD49927D60E00EB90FD93414BACFD89FB5AF6B593CA65C790459260D9F2CB583A00000040EB59B468918EB0FE389C9C6ACFE99CC99365E1F0E1F517C76F94EE973F6C98DC3279B2BBA754570C98637292DC58AA2F5F2C1E00D9D9D9C9272D907B375E2A5D2A32A5D9D3D93B9758EB86FCC34E15BF3D2F6F517E2E610600009A2A3F3FFFF1ACAC2CBDB2FF41CBB2BAEA9CD3E7860EADBD286A5849899C515C2C03F7EC91AE5555B5BF12A5C3F59A8CEAE2F92BFBF695957DFA04ABBD5EED4C0CF794EA7AAA379A9CE7F158AB2B5F2C1F004317590F947C47766D3F53328FB16FD8DFFF6579B9E747F648B1E596FC183C00000040EB0B759CBD6312D387751929DDA609EAAACCCCDAF20DDC59CC0A9D5218ABA3B7BE583F00FABC633D9CB1DA0E6C99248965C74B46539F9FF689FDC680973D291EBFDDC51C00E3F2F219BE070000C72EB4CEE8F9263F9966728B6B4C823AEE2872B115A63CBA63C78EDC58BECEC5172F07C0B79FB1AE09786D39D05B8A779F2C29077ADA9DFC5D24239068F9BC35B2DB77400E74DE21C53DD64975972FAC4112D0B313FBFE583F00000040C4F313FD819EA7A64F9FDE37180C4E3309AAFE08F528537A99A2134F75D85FAFE6D755F9F557269F8A85C5F3E33E316DE80048DD169C9652AC0780A507803F54079D4CD15F402E730E003B6E0E000000D036F40782CC9FFB4205F192987200000000443F0F55000000101159A61CE7BAAF1D84BF6FC2F396C54BCE46620A00001019634CF9DC755FA714760CDD0E2F6FA9734C4F0B25B0E152634A3FD7FDBB4CE9168B15E48BE38363B029E9A6BCE9DA7653E8AC247C05FE99A69C250CFD030080E6196ECAFC50FE3138B42D68CA00532E30E574531E30A5D49495A184B532B45F852BA1D515866E8BD54A8AF5C454CF4CBA9832DE94BDA6AC0E9D89CC0EFDE3EFAFB7FFB07A49E845A1FD0000008E95F6868E3065A13843F7F798B233F49826A54B43C5ED5953FE18BA9D19DA4FCD34253B94D49298B633CB437FBB9B5262CA2BA6740E25AAEE03A04FE880E91BFA87D7B397BCD073BE30657228B17D97D8020000472939945CCE31E56953768B33DF543BC8B45774AA381D694FB89EF3A52B5799E1BA7D4AAC26A5F1909836E50CA626947CEA01A1BF675B60CAEDA1339AA75D6728DAFD7EA9D40DF303000034C53E531E136764767928FF7821B43D9C70A6D77B4ECF500EA2CFE96FCA2C717A59CF8AE58A8AE5C4F444530686CE2AC2FFA889A1B39601A17FEC8B4D992B4ECFE8845022AABDA96F859E5B2DCE1CD49AD0D9CD6E620B00001C835C53FE29CE34411DC1FD2F53DE0E3DA6B989F684DEE1DA5F87F1DF17A767756B281759EA7A0E89693BB32E54944E320E5FD4E41ECA770FE7A78712543D13F95DE8AC242394B04A28B965281F00001C8B4952F7C33E43433947380FD1DCA453BDFDFF6DCAFDA6FCC29479A6BC64CAFF88D3A14662DACE9D24DF7C65BDF6ACEA4F8269D7F9BE50325B2475F3542F21A60000C031E81E4A3035BFD02BEE5F09E515E1CEAFE47AFB6B67D9D5A6DC22CE352E4AAFD6FF9B38530034697D2494DC9298B633BACED7F626ECA7DDE73F15679DB0D389210000D042742AE022533E746DDB164A50556757EEA149ACF6A8DEE3DAB726F477B32953C419C52D89C58A8A87C4F43FC4199AFF267A76A2DDE87A65DC0DE20CE59F2DCE4551F152570000A0757C58EFFE7CD7ED03A6BCE64A6297D7DB7796EBB65EC51FB3F34C6339D9D2330E5D205FE76754B9B66BF2B9B181A4F42CD7D9C9BDE24C4ED649C7E1ABF00712530000A00D04E3E57F349613533DE358DAC076ED09FD73BD6D3A6FE3997ADBEADF9F475C000000B41E0F5580786259FE403098484544C3E97FEDBF831DA02688211043008929E2526262D9E6F2F213A88828505E3EA4C4A439ABA9096208C41040628AB864DBBEE7CBCA4E0952136D6FE7CEB1BA60740135410C811802484C1197AAAB53FF5E5C3CB5D2B6BD5446DBF297944CD60B149FA62A88211043008929E2D2C489130BFDFEE4F7B76EBDA49ADA683B1B365CB73C10482A3AFFFCF3DFA13688211043008929E296DF9F70DD679FCD3C585E7E02170DB4817DFBBEBDA9B878EA89C160F0E7D4063104620870632C067127373777D79557CE5EB973E7D8C9DDBAADE9909CBC8B13B48835A8833FFEE083BF249BAF9E6B274E9CB8821A2186400C0124A6887B0B162CD83C63C6D585DBB74FBCC8B67DC5DDBAADED6E593615D37A0EAC5BF7CBA5EBD7FF748836A813264C788E2A2186400C01F5595401E2D98B2FBE38D4E3F1FCC9EBAD19DEB3E71B9B32320AD2D3D2561FEFF1D4F013B4CD140C2696EFD933ECA39292F37797968E19120CFA8A75E871D2A4491F513BC410882180C41468C44B2FBD34DCB2AC1F989BE34C19654A32B5D26C7E530AC559CEE6692ED22086400C010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022E0FF0121C2023A02FEDB030000000049454E44AE426082,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('247534', 1, '请假流程.bpmn20.xml', '247533',
+		0x3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E0A3C646566696E6974696F6E7320786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C2220786D6C6E733A7873693D22687474703A2F2F7777772E77332E6F72672F323030312F584D4C536368656D612D696E7374616E63652220786D6C6E733A7873643D22687474703A2F2F7777772E77332E6F72672F323030312F584D4C536368656D612220786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E2220786D6C6E733A62706D6E64693D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F44492220786D6C6E733A6F6D6764633D22687474703A2F2F7777772E6F6D672E6F72672F737065632F44442F32303130303532342F44432220786D6C6E733A6F6D6764693D22687474703A2F2F7777772E6F6D672E6F72672F737065632F44442F32303130303532342F44492220747970654C616E67756167653D22687474703A2F2F7777772E77332E6F72672F323030312F584D4C536368656D61222065787072657373696F6E4C616E67756167653D22687474703A2F2F7777772E77332E6F72672F313939392F585061746822207461726765744E616D6573706163653D22687474703A2F2F7777772E61637469766974692E6F72672F70726F63657373646566223E0A20203C70726F636573732069643D2270726F636573735F6C6561766522206E616D653D22E8AFB7E58187E6B581E7A88B2220697345786563757461626C653D2274727565223E0A202020203C73746172744576656E742069643D22737461727422206E616D653D227374617274223E3C2F73746172744576656E743E0A202020203C757365725461736B2069643D22757365723122206E616D653D22E7BB8FE79086E5AEA1E689B9223E0A2020202020203C657874656E73696F6E456C656D656E74733E0A20202020202020203C61637469766974693A7461736B4C697374656E6572206576656E743D226372656174652220636C6173733D22636F6D2E6C656E2E6163746C697374656E65722E4163744E6F64654C697374656E6572223E3C2F61637469766974693A7461736B4C697374656E65723E0A2020202020203C2F657874656E73696F6E456C656D656E74733E0A202020203C2F757365725461736B3E0A202020203C73657175656E6365466C6F772069643D227369642D30443235384332342D314631392D343233332D413937362D4130443843423944414541432220736F757263655265663D22737461727422207461726765745265663D227573657231223E3C2F73657175656E6365466C6F773E0A202020203C757365725461736B2069643D22757365723222206E616D653D22E4BABAE4BA8BE5AEA1E689B9223E0A2020202020203C657874656E73696F6E456C656D656E74733E0A20202020202020203C61637469766974693A7461736B4C697374656E6572206576656E743D226372656174652220636C6173733D22636F6D2E6C656E2E6163746C697374656E65722E4163744E6F64654C697374656E6572223E3C2F61637469766974693A7461736B4C697374656E65723E0A2020202020203C2F657874656E73696F6E456C656D656E74733E0A202020203C2F757365725461736B3E0A202020203C6578636C7573697665476174657761792069643D227369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831223E3C2F6578636C7573697665476174657761793E0A202020203C73657175656E6365466C6F772069643D227369642D33334642463234452D464537302D343730412D394442352D3942313838314531333834372220736F757263655265663D22757365723222207461726765745265663D227369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831223E3C2F73657175656E6365466C6F773E0A202020203C6578636C7573697665476174657761792069643D227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535223E3C2F6578636C7573697665476174657761793E0A202020203C757365725461736B2069643D227573657222206E616D653D22E8B083E695B4223E0A2020202020203C657874656E73696F6E456C656D656E74733E0A20202020202020203C61637469766974693A7461736B4C697374656E6572206576656E743D226372656174652220636C6173733D22636F6D2E6C656E2E6163746C697374656E65722E4C656176654C697374656E6572496D706C223E3C2F61637469766974693A7461736B4C697374656E65723E0A2020202020203C2F657874656E73696F6E456C656D656E74733E0A202020203C2F757365725461736B3E0A202020203C656E644576656E742069643D22656E6422206E616D653D22656E64223E3C2F656E644576656E743E0A202020203C73657175656E6365466C6F772069643D227369642D34373638373538312D333535422D343335342D383433432D43333034323333323836414622206E616D653D22E5908CE6848F2220736F757263655265663D227369642D35353636443037362D414234432D344134322D393938462D32353337373839463831383122207461726765745265663D22656E64223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D46423539344242452D383030352D344544432D423343382D39373831454432323643393522206E616D653D22E4B88DE5908CE6848F2220736F757263655265663D227369642D35353636443037362D414234432D344134322D393938462D32353337373839463831383122207461726765745265663D2275736572223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D66616C73657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D39394343413337462D413233352D343835332D383437322D44453233334144324544333222206E616D653D22E9878DE696B0E794B3E8AFB72220736F757263655265663D227573657222207461726765745265663D227573657231223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D35313046453036322D433042432D343643382D394231372D38413338303732413242433622206E616D653D22E4B88DE5908CE6848F2220736F757263655265663D227369642D42453337324431342D463530392D344544422D383745382D37423231303738333541453522207461726765745265663D2275736572223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D66616C73657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73756250726F636573732069643D226368696C6422206E616D653D2273756250726F63657373223E0A2020202020203C73746172744576656E742069643D22737374617274223E3C2F73746172744576656E743E0A2020202020203C757365725461736B2069643D22616C6C6D616E6167657222206E616D653D22E680BBE7BB8FE79086E5AEA1E689B9223E0A20202020202020203C657874656E73696F6E456C656D656E74733E0A202020202020202020203C61637469766974693A7461736B4C697374656E6572206576656E743D226372656174652220636C6173733D22636F6D2E6C656E2E6163746C697374656E65722E4163744E6F64654C697374656E6572223E3C2F61637469766974693A7461736B4C697374656E65723E0A20202020202020203C2F657874656E73696F6E456C656D656E74733E0A2020202020203C2F757365725461736B3E0A2020202020203C656E644576656E742069643D2273656E6422206E616D653D22656E64223E3C2F656E644576656E743E0A2020202020203C73657175656E6365466C6F772069643D227369642D46333946364639322D463330412D344630452D423946382D45304444454231313530363522206E616D653D22E5AEA1E6A0B82220736F757263655265663D22616C6C6D616E6167657222207461726765745265663D2273656E64223E0A20202020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A2020202020203C2F73657175656E6365466C6F773E0A2020202020203C73657175656E6365466C6F772069643D227369642D33453941414432332D343444412D344138352D383242442D4436433833304134433439382220736F757263655265663D2273737461727422207461726765745265663D22616C6C6D616E61676572223E3C2F73657175656E6365466C6F773E0A202020203C2F73756250726F636573733E0A202020203C73657175656E6365466C6F772069643D227369642D41453541454438342D303734362D343738372D393836462D36413739323743333443333422206E616D653D22E5908CE6848F2220736F757263655265663D227369642D42453337324431342D463530392D344544422D383745382D37423231303738333541453522207461726765745265663D227573657232223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C6578636C7573697665476174657761792069643D227369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733223E3C2F6578636C7573697665476174657761793E0A202020203C73657175656E6365466C6F772069643D227369642D30344339463239412D304242352D343639312D383034432D37363445344530413237313622206E616D653D22E58F96E6B688E8AFB7E581872220736F757263655265663D227573657222207461726765745265663D22656E64223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D66616C73657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D37463032463244352D413642412D343233342D413732342D3346383938443233354134422220736F757263655265663D226368696C6422207461726765745265663D227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535223E3C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D38344442433035362D303639312D343733452D383243462D44333235454637333641373222206E616D653D22E4B88DE5908CE6848F2220736F757263655265663D227369642D39353037343945412D344242362D343237362D423637412D44453033453334413035373322207461726765745265663D227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D30413541464638362D414541342D343231322D423146342D3932373541343430364332442220736F757263655265663D22757365723122207461726765745265663D227369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733223E3C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D30443039333043392D394241312D344636382D383545412D33383445313642343039413022206E616D653D22E5908CE6848F2220736F757263655265663D227369642D39353037343945412D344242362D343237362D423637412D44453033453334413035373322207461726765745265663D226368696C64223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A20203C2F70726F636573733E0A20203C62706D6E64693A42504D4E4469616772616D2069643D2242504D4E4469616772616D5F70726F636573735F6C65617665223E0A202020203C62706D6E64693A42504D4E506C616E652062706D6E456C656D656E743D2270726F636573735F6C65617665222069643D2242504D4E506C616E655F70726F636573735F6C65617665223E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227374617274222069643D2242504D4E53686170655F7374617274223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2233302E30222077696474683D2233302E302220783D2233302E302220793D223232382E37303337303339393831383338223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227573657231222069643D2242504D4E53686170655F7573657231223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2238302E30222077696474683D2239392E39393939393939393939393939342220783D223132302E302220793D223230332E37303337303339393831383338223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227573657232222069643D2242504D4E53686170655F7573657232223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2237392E3939393939393939393939393937222077696474683D2239392E39393939393939393939393938392220783D223531302E30393038383236333634343631372220793D223230332E3730333730333130343131343233223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831222069643D2242504D4E53686170655F7369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2234302E30222077696474683D2234302E302220783D223731352E353435343431333138323233312220793D223232332E37303337303339393831383338223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535222069643D2242504D4E53686170655F7369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2234302E30222077696474683D2234302E302220783D223337302E353435343431333138323233312220793D223232332E37303337303339393831383338223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D2275736572222069643D2242504D4E53686170655F75736572223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2238302E30222077696474683D223130302E30303030303030303030303032332220783D223334302E3534353434313331383232332220793D223336382E37303337303636343732373932223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D22656E64222069643D2242504D4E53686170655F656E64223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2232382E30222077696474683D2232382E302220783D223838302E353435343431333138323233322220793D223232392E37303337303339393831383338223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D226368696C64222069643D2242504D4E53686170655F6368696C64223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D223136312E3130323038303930333236363036222077696474683D223238342E36303837323832303738373235362220783D223234382E32343130373732313432383638362220793D22302E30223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D22737374617274222069643D2242504D4E53686170655F737374617274223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2233302E30222077696474683D2232392E39393939393939393939393939372220783D223236362E373539353935363738323937332220793D2237312E3035313034303435313633333033223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D22616C6C6D616E61676572222069643D2242504D4E53686170655F616C6C6D616E61676572223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2238302E30222077696474683D2239392E39393939393939393939393939372220783D223333382E32343130373732313432383638362220793D2234362E3035313034303435313633333033223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D2273656E64222069643D2242504D4E53686170655F73656E64223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2232382E30222077696474683D2232372E39393939393939393939393939372220783D223436352E302220793D2237322E3035313034303435313633333033223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733222069643D2242504D4E53686170655F7369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2234302E30222077696474683D2234302E302220783D223236342E39393939393939393939393939342220793D223232332E37303337303339393831383338223E3C2F6F6D6764633A426F756E64733E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D30344339463239412D304242352D343639312D383034432D373634453445304132373136222069643D2242504D4E456467655F7369642D30344339463239412D304242352D343639312D383034432D373634453445304132373136223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E35343534343133313832323331342220793D223434382E37303337303636343732373932223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E35343534343133313832323331342220793D223439342E37303337303636343732373932223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223839342E353435343431333138323233322220793D223439342E37303337303636343732373932223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223839342E353435343431333138323233322220793D223235372E37303337303339393831383338223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D38344442433035362D303639312D343733452D383243462D443332354546373336413732222069643D2242504D4E456467655F7369642D38344442433035362D303639312D343733452D383243462D443332354546373336413732223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223330342E353930383639353736373134332220793D223234342E3131323833343432313436393437223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223337302E363430313837323338373936332220793D223234332E373938343439393138373537223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D46333946364639322D463330412D344630452D423946382D453044444542313135303635222069643D2242504D4E456467655F7369642D46333946364639322D463330412D344630452D423946382D453044444542313135303635223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223433382E32343130373732313432383638362220793D2238362E3035313034303435313633333033223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223436352E302220793D2238362E3035313034303435313633333033223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D35313046453036322D433042432D343643382D394231372D384133383037324132424336222069643D2242504D4E456467655F7369642D35313046453036322D433042432D343643382D394231372D384133383037324132424336223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E393837353134343839383930352220793D223236332E32363136333038323635313634223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E36363730323138363333373736372220793D223336382E37303337303636343732373932223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D30443235384332342D314631392D343233332D413937362D413044384342394441454143222069643D2242504D4E456467655F7369642D30443235384332342D314631392D343233332D413937362D413044384342394441454143223E0A20202020202020203C6F6D6764693A776179706F696E7420783D2236302E302220793D223234332E37303337303339393831383338223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223132302E302220793D223234332E37303337303339393831383338223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D33334642463234452D464537302D343730412D394442352D394231383831453133383437222069643D2242504D4E456467655F7369642D33334642463234452D464537302D343730412D394442352D394231383831453133383437223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223631302E3039303838323633363434362220793D223234332E3834353738353439363831313337223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223731352E393838343436343031363631392220793D223234342E3134363730393038313632323632223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D34373638373538312D333535422D343335342D383433432D433330343233333238364146222069643D2242504D4E456467655F7369642D34373638373538312D333535422D343335342D383433432D433330343233333238364146223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223735352E313035353637393030353031362220793D223234342E3134333537373431353930353333223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223838302E3534353531303937373036392220793D223234332E3734373836373831363239343733223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D30443039333043392D394241312D344636382D383545412D333834453136423430394130222069643D2242504D4E456467655F7369642D30443039333043392D394241312D344636382D383545412D333834453136423430394130223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223238342E3637393931353936313034392220793D223232342E3032333738383033373133343735223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223235332E33343530333333323234383436352220793D223136312E3130323038303930333236363036223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D37463032463244352D413642412D343233342D413732342D334638393844323335413442222069643D2242504D4E456467655F7369642D37463032463244352D413642412D343233342D413732342D334638393844323335413442223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E35343534343133313832323331342220793D223136312E3130323038303930333236363036223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E353435343431333138323233312220793D223232332E37303337303339393831383338223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D39394343413337462D413233352D343835332D383437322D444532333341443245443332222069643D2242504D4E456467655F7369642D39394343413337462D413233352D343835332D383437322D444532333341443245443332223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223334302E3534353434313331383232332220793D223430382E37303337303636343732373933223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223136392E39393939393939393939393939372220793D223430382E37303337303636343732373933223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223136392E39393939393939393939393939372220793D223238332E37303337303339393831383338223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D46423539344242452D383030352D344544432D423343382D393738314544323236433935222069643D2242504D4E456467655F7369642D46423539344242452D383030352D344544432D423343382D393738314544323236433935223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223733362E303435343431333138323233312220793D223236332E32303337303339393831383338223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223733362E303435343431333138323233312220793D223430382E37303337303636343732373932223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223434302E35343534343133313832323332352220793D223430382E3730333730363634373237393236223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D41453541454438342D303734362D343738372D393836462D364137393237433334433334222069643D2242504D4E456467655F7369642D41453541454438342D303734362D343738372D393836462D364137393237433334433334223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223431302E31303138303630343037373735352220793D223234342E3134373333393237353632393338223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223531302E30393038383236333634343631372220793D223234332E3835313539323539373636343134223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D30413541464638362D414541342D343231322D423146342D393237354134343036433244222069643D2242504D4E456467655F7369642D30413541464638362D414541342D343231322D423146342D393237354134343036433244223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223231392E39393939393939393939393939342220793D223234332E393230313534323134363334223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223236352E343133303433343738323630382220793D223234342E31313637343734373634343437223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D33453941414432332D343444412D344138352D383242442D443643383330413443343938222069643D2242504D4E456467655F7369642D33453941414432332D343444412D344138352D383242442D443643383330413443343938223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223239362E373539353935363738323937332220793D2238362E3035313034303435313633333033223E3C2F6F6D6764693A776179706F696E743E0A20202020202020203C6F6D6764693A776179706F696E7420783D223333382E32343130373732313432383638362220793D2238362E3035313034303435313633333033223E3C2F6F6D6764693A776179706F696E743E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A202020203C2F62706D6E64693A42504D4E506C616E653E0A20203C2F62706D6E64693A42504D4E4469616772616D3E0A3C2F646566696E6974696F6E733E,
+		0);
+INSERT INTO `act_ge_bytearray`
+VALUES ('247535', 1, '请假流程.process_leave.png', '247533',
+		0x89504E470D0A1A0A0000000D4948445200000396000001F80806000000316A727D00004B3D4944415478DAEDDD09985C559D37E0282232A3830B88382AE038E0363A220CA2A3068619409045A8AEBED59DA4D982B208B20884C1B083AC437001648DC8221F46C8B048164242482420888160420264212121040890B0DEEF9C9ABA6DA5D3DDE9AE7477AABADEF779CE53D55DD5DDC9A97BCFF9FFEE3A6000D0AF5D71C5159BEFBFFFFE0F6FBDF5D6AF872F534DD3B49E6A5B6EB9E55B43860C993176ECD82F196D0100FAA961C3866DBADD76DBBDB6C71E7BA4D3A64D4B57AC589102F48437DF7C33FDCB5FFE92EEB7DF7EE917BEF085D7E3462CA32E00403FB4EFBEFB8E8FA112A037C57019C69BA9465D00807E68F3CD377F31EEA904E84D3366CC483FF5A94FAD34EA0200F44F0E7F05FAE4B0D801FF77DE250000FD315802F405C1120040B004102C0100E8FB60592A24D3C6C646553508968225008060597931F9894F7C62B5EF0F1E3CB83578AEBFFEFAE957BFFAD5F4B1C71E537D836009008060D9B56059FEDADB6FBF9D0E1B362C1DE0D05C102C0100E8BFC1F2FAEBAF4FB7D8628B74BDF5D66BDDD3181D74D041C5E73BEFBC73FAFAEBAFAFF25A564C1E76D861E9E73EF7B9E2F34B2EB9A4DD6079CC31C7B4FE5CF9EFB9E28A2B56F99D8B172F8EF7C36BFDDE11471C517C7FE6A5975E4A9B9B9B5B5F1F356A54EB6BF16777DB6DB7D6D7E2D76BFAFFADE93540B00400102CBB5714AE71AFE46F7FFBDBE2D70F3CF0C02A3F17C3E371C71DB7CAEFF8F8C73FDEFAFA17BEF085F4CF7FFE73BB7FF3F9E79F5FED7BF136293118B6FD770D1D3AB4F8F5B3CF3E5B0C956D436EF6F559679DD5E16BDDF9BF038225008060D945F3E7CF6F3D5C35EEB99B3B776EBBC1320B73E5C1B26DE8ECCA61B2D9EB1FFDE84757FBDEBFFDDBBFB57EDDDEEFDC7AEBADDBFD7D5FFFFAD75B4362DBB0D8D9FFAFB3D700C1120040B0AC40477BFBE25EC933CE38A3F8FCC1071F5C6D6F5F3C6CB5BBC172A38D366A77EF61BCE17A3CECB56D40CC0E837DE185178AAF8F1C39B2DD7F676C1D5D2CA8EDFFAFABAF018225008060D989DD77DFBD35987DEC631F4BAFBBEEBAD6D76288CC5E8BE7509687BDF818DF9B7D6FF6ECD9C5EF975F1576F9F2E5ABFCADF8F580367B16B3F328E3E1AFFBECB34FEBF78F3CF2C8E261B1E57B17070E1CB8DADF8B162D5A94EEB2CB2EADAF4D9C38B14BFFBFCE5E03044B0000C11240B0040040B004044B0000044B40B0040040B004102C0100044B00C1120000C112102C0100102C01C1120000C11240B00400102C01044B0000044B40B0040040B004044B0000044B40B034E4020008960082250000822520580200205802822500008225205802002058020896000008968060090080600908960000089680600900806009205802000896008225000082252058020020580282250000822580600900205802089600000896806009008060090896000008960082250080600920580200205802822500008265ED9A3B776E3A65CA9474DCB871E9983163B43E6C63C78E4D274E9C98CE9A35CB82285802002058D66EA89C346952BA78F1E2F4F5D75FD7D6415BB264493A61C28474E6CC991648C1120000C1B2F6C43D9542657584CBB8C718C1120000C1B2E6C43023D855478B87C6225802002058D69C1866843AC152B0142C0100044B7A3D58BEF2E2C274CEB4ABD3C7C69E566CF179FC9E4028580A960000089682E51A03CFF2650BD2E97F3839FDF3EDC7ADD2E2F7E26B42A1602958020020580A969DB6798FDDB65AA8CCDAFCC7460B8582A560090080602958761E7866DCF3D30E83657C4D28142C054B0000044BC1B2D3367DCC291D06CBF89A5028580A960000089682A56029580A9600000896F45EB08C5781ED2858C6D78442C152B0040040B0142C3B6DB326FFACC360195F130A054BC1120000C152B0ECB42D5DF0683AFDEEE1AB1F061BBE175F130A054BC1120000C152B05C637BEAC191AB05CBF83D8150B0142C0100102C05CB35879E952BD359F7FF72F5C360C3F7E26B42A1602958020020580A961DB6E5CB16A433275FD2E13996F1B5F81EC150B0142C0100102C05CBD5F6522E9C353EFDCB5DC33A0C95598BEF89EFB5F752B0142C0100102C05CB2EEDA5B4F752B0142C0100102CE9345876652F65677B2F8544C152B0040040B0ACF3605969A8CC9A9028580A9600000896CEB1D4044BC1120000C112C152B044B0040040B52B580A9608960000089682A526580A960000D449B09C33674E7AF5D557A7A79D765A7AC41147A443860C491B1B1BD3418306A5871D76587AE69967165F7FE69967044BAD6E82E5ECD9B3D38B2EBA283DF4D043D3E6E6E6344992E27A115B535353FAFDEF7F3F3DF7DC738BEF132C0100A8DB6079F3CD37A7279E78627AE49147A6975D76593A75EAD474C18205E98A152B8AAFC7C7C58B17A70F3DF4507AEDB5D7A6471D75543A7CF8F0E2CF09965A7F0D9637DC70437AD04107AD1224D7D40E3CF0C0F4CA2BAF142C0100A89F60F9C4134FA4C71D775C7AECB1C71643E35B6FBDD5E59F7DE49147D261C38615DB8C1933044BADDF04CBB85E1C7CF0C15D0E93EDB5FDF7DF3F7DF4D147054B0000FA77B01C397264B1781E3D7A74B702655B77DD7557F150C05B6EB945B0D46A3E58C643BD0B85C22A21311EEE7AF6D967A7E3C78F4FE7CE9D9BBEFCF2CBC5F7BEFAEAABC53DFB93274F2E1E2A1B0F192FFFB9B8A7B396F65E0A9600008265B7C41018CF179B3973668FFCBEA79F7EBA784E66AD1E1A2B580A96D16F7FFBDBD5CE9FBCEEBAEB8A878177C5B265CB8AEF8F3F571E307FF18B5F08960000F4AF6079CD35D7144365578BE5AE8ABFAF56C3A5602958C63D95E5A1F2E8A38F2EEE9DAC44FCB978887979B8AC853D978225008060D9E573C70E38E0801EDB53D9DE9ECB430E39A4E6CE2D132CEB3B58C6F5A27C2F63BC305576B86BA5E261B2F12ACAE587C53EFCF0C382250000B51F2CE32D436EBBEDB65E2D4EE33997C71F7FBC60A9D54CB02CBF504FDC53B9B6A1B23C5C96EFB98C17F4112C0100A8E960196F9D106F27F2C61B6FF47A811A83E5F5D75F2F586A551F2CE37A517E4E65A587BF7676586CF9DED06A3E2456B00400102CD7E8F0C30F2FDE52A42FC443614F38E104C152EB956019DFD753E27D2AB3D0172FBCD3DBE1B59AF75A0A9600008265A766CF9E5D3CDC6F6D6E2BD25D471D7554AF9DCBD99DD070F7DD770B96FD28583EFBECB3C5DB7BC410D859C0ECCA671FD78BEC823D71AFE2D2A54B7B65398C578B2DBF15493CA753B00400A0E68265BCC7DECF7FFEF33E2D5263E17FE9A597AED342392BE463C818376E9C6059C3C1325E7578C58A15AD5FAF5CB932BDE9A69BD2471E79A4E2CF3EAE17D9FBCE3DF7DC5E5D16FBF26F09960000F44AB08CB701993A756A9F16A9F1B0DB934E3AA92A8265D6E25EDBF6F6620996D51B2CDF7CF3CD4E6F8DF3D4534FA5BFFAD5AF8A17CAE9EE671F6FBB93BD3E61C2845E5D16E35ED6EC6FC52B270B960000D45CB01C326448BA70E1C23E2D526318887B8BAA295896EFC52A0F1982657506CB78D8EBDB6FBFBDC6CFF99D77DE295E8DF88E3BEEE8D667DFDCDCDCFAFD9EBE684F5B0B162C68FD5B854241B00400A0F682652C64CB0F23EC0BF1EFC5C2BD1A8365F95EAC7898A460595DC172F9F2E5E98B2FBED8EDCFFB85175E48AFBAEAAA6220EDCA675FFE754FDD62A423718F6AF9DF132C0100A8B960B9AE0AD93515F7D5D204CBEA69A3468D4A478C1851BCE04D2517C9893F5BC932D0D7EB8360090040CD05CB75B5C7325E69B31AF758C643837FFBDBDFB65E55B4378365BCF268F9EF8F9FE999679ED9EE7BE3219AF1F5B877EBF6DB6F4F070F1E9CDE7AEBADE9EEBBEF9EB6B4B4F4E8BF2BFE9DF3CF3F7F8DEF39F6D8638BCFE38572E2679A7D3FBB2A6B6FECB18C7D76CC31C7A4F7DF7F7F973FEBB8C7F1473FFA51FAFDEF7FBF78D5D5AE7CF6D91561EDB1142C010004CB2E88B73A5817E7581E78E08155152CDB06CABE3AC7327E8E53A64C29EE518BCFE3855C3A7ADF85175E580C215988CBBE7FE28927B67EBD68D1A274A79D762A86CE18F076D86187E2FF2F7E9D85D1912347A61B6EB861EBCFDC7BEFBDABBCBED9669BA5DFFCE6378BCF63BBE5965BD22DB7DC72B57FCF15575CD1FA3CFECEEC790C9ABD7D8E65BCFFE3E9A79FDEE9DECB787E65FCB7C4C3AEE3FBBBF3D93BC752B00400102CBB215EFD72E2C4897D7E55D8B8D7A91A8265DCDB17434747F73DECAD60397DFAF46260DB64934D8AE16D830D36287EFDF9CF7FBE1820DB1E029AFD3BE2E77EFCF1C7B73EDF679F7D56FBDD317CC6D7E29ECDEC7DF1FCC2F818C3630C9C9FFCE427570989E561307E1D435BF6F5FAEBAFDF1A5EE39556E3BF37BEE75BDFFA563150C6E7714F60F6B38F3EFA68F1F1E28B2FEED5ABC2C650396CD8B0F477BFFBDD6A17F2896170FFFDF74F4F38E184F4F9E79FEFF667EFAAB08225008060D90DF11E7AF1B0C7BE14834DFCBBEB52477B28FB2A58DE79E79DC5C0D6F6FB1B6DB451BAD75E7BB57E9D85B4183A0794ED9D8CCFE3EF8881303EBFE79E7B56DBA3180360F63C06D9F878FDF5D7172F60139FCF9B37AFF87ABC204EBC5051B68732BE76C00107149FC7E01AC3687B7B50CBF7586EBAE9A6AD87EBC6BD9B712F685FDDC7326E18F9F18F7F9CCE9933A7B837F7A73FFD69313476B4C1A42B9FBDFB580A960000826537C473D662A1FDD65B6FF559917AF8E18717F770D582751D2CE35EB9182EE3E1B2DB6CB34D3120C6F7C4AFB3F73CF3CC33C5C23FEED97CE9A5975AC3610C7E975C7249F1F9CD37DFDCE11ECB2C1CC6F7B40DA5F1DF19FF5E7BC132EEB17CF0C1075B0FE7CDBE1FFF665FDCC7B25C7CFD820B2E2886B3F8B8A60D065D592FB2B017CF075EBA7469AF2C5FF1F32D3FECB65AD70BC1120040B05CA378FFBE78385E5F8821E9073FF8415A2B7A3358C6CF305E502686BDECFCC6F8BDA38E3A6AB5C366E36B3134C620173FAB6CEF6276186DB6F730DB03197F4FDC839885BD6C2F65DC63195F9F356BD66A41F11BDFF8C66A7B2CE3F9966DF7A0C68BF6C4F75C7EF9E5ED86D2BE38C7B2B380D993EB4516F86218EF0DF150DCEC6FC44377AB95600900205876A9B88D45745FECB58CA1E4CA2BAFACFB60F9F8E38F175B16C64E3DF5D4E2F318F8E6CF9FBF5AE88B6DD2A449C5433DE339946B0A7103CAF63AC6809905C6189076D96597D50E6FED6AB08C17078A7BF306B439D4B63C586687EFB6FD7FF445B0ECADD017F75AF6F4457CE2EF8BBF37FB1BD5BC5E08960000826597C4ABB45E7BEDB5BD5A9CDE71C71DE9D0A1437B74AF522D06CB786E630C7BF1D0D61FFEF087C53D9159108BA12D1E221B837EDB9F8B812D5EF1B5A38BEE94B70F7DE843C5DF1FCF758CBF3F7B7FDC63D9D11ED4F642693C34330BC09D9D6319FF6DD961B1F1023F3168965FBDB6168365B65E64C1EFE8A38FEEB15B8FC48D03F10256E57B2BAB79BD102C010004CB2E890122DEEA208688DEF0F4D34F172FA8F2F0C30FA7B5A4A783653C576F40E9B62231FCC5F3EBCA5F2FBF6D47F9F993F16AB131B095DFC3327E7FDF7DF76D7D1E4364B63771ABADB62A1EFE1A836876FB9101A5732CB3E7F182406BDADBD9B6C5C368B3436DAFB9E69A55F6A8C620191F870F1FBEDA6D506A3558C6F5A2FC9E96F1FFB6B6E13286CA33CE38A3F577C6DF5FEDEB85600900205876D9D5575FDD2BF7B58CF7AD8C7BE06AE910D8DE3E1436BB8D4816CAE2B996F15613034A7BFF3AFA99AEEC058CC1AF3BEFEF4EB08C2DBB426DF9057BCA2F26D45B6D5D04CB6CBD28BFEF65DC7359E961B1F1E7CAF75456FB21B082250080605991CB2EBBACB8172D5E30A6A7F654C6C309CF3AEBACB416F566B0D46A235866EB4579188CE746C6F355E3555DBB7AF5D778CE66F93995B1D5CA7A21580200089615EDA18987E7C5431DD7E6823EA3478F2EEE018D4579AD122C05CB8EF65C660133DE7B72C28409C5BD91D961B2F170D7050B16140F791E316244F1963EE53F17D7AF5A5A2F044B0000C1B2E273CBE2E1ABF1A222F7DD775FB77E369E2F76C4114714AF2C5A6BE7540A96826557D68BB601B33B2DAE53B5B65E0896000082E55AF9F5AF7F5D2CA4E3E1B1F18223F7DC734FF1EAA5AFBDF65AF1F5780E5FBC05C51FFFF8C7F4E28B2F2E16CD3150C6BD31B574F557C152B0AC64BDE86EA0ACD5F542B00400102C7B44BCDAE805175C901E7AE8A1AB9D2716AF261B2F3C130F098C7B74FA13C152B0B45E08960000822582A56089600900806029586A82A5600900806029586A82A5600900806029586A82A56009008060896029582258020020580A9682258225000082A560A909968225000082A560A9099682250000822582A56089600900205822580A9608960000089682A526580A960000089682A526580A9600000896089682258225008060896029582258020020580A969A602958020020580A969A6029580200205822580A9608960000822582A56089600900806029586A82A5600900806029586A82A5600900806029586A82A560090080604925C68D1B27D4099682A5600900205852B9499326A58B172F16ECD6715BB4685131E4235802002058D69CD9B367A713264C489F7BEE39016F1D87CA9933675A20054B000004CBDA0D97E3C78F2F1E8AA9F57D132A054B0000044B40B0040040B004044B0000044B00C1120000C112102C0100102C01C1120000C112102C0100102C01044B0000044B40B0040040B004044B0000044B40B0040040B004102C0100044B00C1120000C112102C0100102C01C1120000C11240B00400102C01044B0000044B40B0040040B004044B0000044B40B0142C0100044B00C1120000C112102C0100102C01C1120000C112102C0100102C01044B0000044B40B0040040B004044B0000044B40B0040040B004102C0100044B00C1120000C112102C01005807C172C58A152A5EA057BDF9E69B822500407FB5E9A69B2E9A366D9AAA17E8553366CC4837D9649365465D00807EE8C31FFEF0B93BEFBCF32BCA5EA037EDB9E79EAF7DF4A31FFD99511700A07F7AFFFAEBAFFFF0F6DB6F3FFF81071E783D1EAE46EF58B972A54EA0EE0E7F9D3163C65B3BEEB8E3820D36D860761C6F0CB90000FD385C8676CABBDEF5AE2706FCDF39505A0FB6F7BFFFFDE90E3BEC10F7D8A4EBADB75EBFF97F353636FA7CB535B677BFFBDD31509E27540200400572B9DCFB9324393B04B015F97CFED5D08EEE4FFFBF52B0040000A0378410B947085E4FC5F0155BF8FAE5534E39E5DD82250000009D2A140AFF1A02D7A42C509605CBD1FDEDFF2A58020000F4A02449360E41EB9278D86BDB50596AA70B960000007414B006E6F3F9651D04CA6C8FE5E182250000001D4A92E4A010B41676142C1B1A1A76162C010000E8542E97FB58085B7776B0C7F28B82250000005D0D5CC3437BAB3C58C6D02958020000B046F1DE9521703DDDD0D0B06F78FC7529582EE9A7015AB0040000E885B015AF0C7B65D9D7FBC5C363054B000000D6A8A1A1E11B216CCD6F6969F960F9F7070E1CF81EC1120000804EEDB6DB6E1B84A03523B47DEAE5FF2C58020000F46CC83A33B49BEBECFF2C58020000F4847C3EFFE510B29E4B926453C1120000806EC9E572EB8580F560682DF5F67F172C0100007A4092243F0E01EB0FF5F87F172C010000D652A150F8E7788FCAD0B6102C010000E8AE772549726F08573FACD70E102C010000D62E547D3FB4FB4F39E594770B96000000744B5353D32742A85A9CCFE73F57E7E15AB0040000A830508D0EED64FD2058020000745B128440F5E7A14387AE2F580A96000000DD0D951B8730B530B46DF58660090000504990FA4D68E7E909C1120000A09210B57B68B372B9DC867A43B0040000E896A6A6A67F08216A6E6803F58660090000504980FA656897E909C1120000A0DB1A1A1ABE1502D4BC5C2EB791DE102C010000BAA5A5A5E57D213CCD0C6D4FBD215802000054129CCE09ED463D2158020000745B3E9FDF2604A745B95C6E13BD215802000074CBC08103DF1382E5C3499234EB0DC1120000A092C0342CB43BF48460090000D06DB95C6EEB10989684C74FE90DC1120000A0BBDE15C2D27DA11DA62B044B0000804A82D261A14D8A01536F0896000000DD120F7D2D1D02BBB5DE102C0100002A094977264972A29E102C0100002A094883E2ED45E26D46F48660090000D02D83060DFA6808488B42FB8ADE102C0100002A094737254972B69E102C0100580B699ABE67CE9C39374F9D3AF5ED71E3C6A563C68CD1FAB08D1D3B369D3871E2F3A1355B1AFB563E9FDF2B84A3BFB6B4B4BC4F6F08969817CC0B00B01662F13069D2A474F1E2C5E9EBAFBFAEAD83B664C992F4DE7BEF7D291413FB5922FB462E97DB2804A379A17D536F08969817CC0B00B096E21669C543551411AF8F1933668625B2CF42D1E5A1FD424F08969817CC0B00D003E2614E26F0EA68A18078D312D9FB1A1A1A760CA1E8993DF7DCF3037A43B0C4BC605E00801E10CFE73079574D01A150EF65B95C6EC310889E2C140ADFD11B8225E605F30200F47101F1CA8B0BD339D3AE4E1F1B7B5AB1C5E7F17B267E05442DC9E7F3E72749729D9E102C312F981700A08F0B88E5CB16A4D3FF7072FAE7DB8F5BA5C5EFC5D74CFE0A881A0995DB8530B43004CB8DF586608979C1BC00007D5C40CC7BECB6D58A87ACCD7F6CB4C95F0151F5860E1DBA7E08968F86D6A837044BCC0BE60500580705C48C7B7EDA6101115F33F92B206A20049D1CDA683D2158625E302F00C03A2A20A68F39A5C30222BE66F2574054B35C2EF7F910821687C77FD41B8225E605F302002820141074CB29A79CF2EE1080A624497288DE102C312F981700601D1610F16A7F1D1510F13593BF02A25AE5F3F92343009A109EBE4B6FAC55881C1D83E41ADA343D655E302F981700504074D8664DFE598705447CCDE4AF80A8D230B445684B72B9DC67F4C65AF7E5B6A1BDD959B00C217E0F3D655E302F981700504074D8962E78349D7EF7F0D50F770ADF8BAF99FC1510551A86EE0E61E7383DD163FD796727C172CAC08103DFA397CC0BE605F302000A884EDB530F8E5CAD8088DF33F12B20AA510894FB87B0F3602E975B4F6FF458B0DCB6A3609924C9DE7AC8BC605E302F00A080E8BCAD5C99CEBAFF97AB1FEE14BE175F33F92B20AA4908931F0B61E7B9102EBFAC377A3C5CB677AEE5347B2BCD0BE605F302000A884E27B5E5CB16A433275FD2E1B934F1B5F81E058002A25A8440F9FF922439434FF44AB05CED5C4BE7569A17CC0BE60500E8B88058B9325D386B7CFA97BB8675583C642DBE27BED7566A05441584CAEF85B03363B7DD76DB406FF45A1F8FB2B7D2BC605E302F00C01A0B88356D8DB6955A01518D0A85C28742D05910DAD7F546AF06CBAF959D5BB9AB1E312F9817CC0B00D06E01D195ADD19D6DA5560C2820D6C2072BFDC11072AE0AA167842EEC7D0D0D0D77C560696FA579C1BC605EA0BAE64280AA2A202A2D1EB2A61850405428EEFD4A4B8FDD0D3A3B87A0F3542E977BBFB5BAF73FA70F7FF8C3C53D96BAC2BC605E302F503D732140D515109A02621DD839B465A15D547AECF20561060D1AF4F721E4CC29140ABB58A3FBEE732A054B17EE312F68E605AA602E045040680A88BF4DA4D9041AB7D22EE9EA849ACFE72F4A92E45A6B73757F4E981734F302C6584001A12920FA6A225DD3F7DB86CA7821996773B9DC87ADCDD5FB39615ED0CC0B1863010584A680E82DBBAE61C2CC5E6FF73C931026DF9B24C963215CE6ACC9D5FB39615ED0CC0B1863A1263435357D221496870F1932E4B6E6E6E6A70B85C26BA54BE1AF0CCFE796EEB9766C7C9FDE52402820AA6E225DD344D9E1D6DA102A4F8DEBB7B5B8BA3F27CC0B9A7901632CD59BA1424EBA39B459A12D2F65A815F182887595A14251B9F7D0A143A71D72C8212F8E1831E285A953A7A60B162C4857AC589146F171F1E2C5E9942953E65D70C1057F09C1737EE89C7BC2CF355B9414100A88756AE76E6E7D5DEDFD6190FB97B03E2F6E6E6EDECC5A5CBD9F13E605CDBC803196EACB50A18D2905C8B48BAD7F66A8F01FDB2284C93F1E79E491AF3CF4D043E95B6FBD9576550899330E3CF0C099E1774CCAE5729FB16829201410EB6C22DDA3829F5B1E27D4B0EEAE17D6E107423BD01A5CBD9F932E342F68E6058CB15457860AEDCE6E84C9F65AFFC9502D2D2D830E38E080D76EBBEDB6B7BB1328DBFACD6F7EF34048DD8BECBD544028206A62225DE5E777DC71C72BC3C036CE1451DD9FD300876C991734F302C658AA423E9F0FA553E392F290D8D4D4949E7DF6D9E9F8F1E3D3B973E7A62FBFFC723127BDFAEAABC5A340274F9E9C5E74D145E9A04183DA86CBE5359FA1860D1BD6F2831FFCE0F5993367A63DE1C9279F7CAAB9B9797EE898831410266F0544AF5BD3C509BAE4EFFEEEEFF60ADEDE7CF3CD0F324D54EFE7D483BF07F382790163AC3196B50B957B8430F86679A0BCEEBAEB8AA70C76C5B265CB8AEF8F3F571E306B36431D73CC3187066F74B503BA6AD1A2450B4BE1B26EF75C2A2014107D3891F6C8A13B215CEE6E42ADFECF6980ADEAE605CDBC803196751D2A1BCB43E5D1471F5DDC3B5989F873C71D775CDB70595B196AE8D0A1FF74F0C107BFD1537B2ADBDB73593A2CF6B30A084D01D1E3DA5E6CE05DA10D293D7647DB9F7311039F13E605F302C658632C1D289D53D97AF8EBF0E1C35B0F77AD543C4CF6CC33CF6C7B586CED64A8638E3966CEE8D1A3D3DE74F5D5578F8D27A32A20340544AF4CA47B944D88578696961EBB3AA176F47326549F13E605F302C658632CED285DF9B5754FE5DA86CAF270D966CF656D64A8534F3DF507C71E7BEC3B6FBCF146DADB060F1E3CA31E0F8955402820FA68221D50DACA9A96B5AE4CA8E51369D60697BDEE3C139F13E605F302C658632CAB86CABDCBCFA9ACF4F0D7CE0E8B2D3FE7B22632D409279CF06CBCA5485FB8EFBEFBEEADC7BD960A0805442FE868826B6F62EC6C426DEFFD57B4F37EE799F89C302F981730C61A63F95BB06CDD5B192FBCD31B6EB8E186DAD96B79E38D376E77F8E187BFB336B715E9AEE6E6E6A7E3F1C80A084D01B1D613E9AEDD9820DB9B50BB3A91B69D501D0AE473C2BC605EC0184BDD6A6A6AFA4476C19EB85771E9D2A5BD929BE2D562DBDC8AA47A33D425975C72E315575C91F6A533CE38239E6B796C7FD95211DABF2B201410BDBD0C5530A1AD6942EDEE445AFEF797D4DBD65A9F13E605F302C65863AC653293CFE70FCFC2DEB9E79EDBABD929DEE7B22C58566F863AF5D453E74E9D3AB54F83E5F8F1E3EF0B9D32BA3F2C7465C73C8F090BD8D714100A88DE5A86DA4CA45D9DC83A9A50DF5DE144DA762B71DD4CA83E27CC0BE6058CB1C658CB64D9EB3767EF99306142AF66A7C993279707CBEACD50471C71C4EB0B172EECD36019FE5E3C14765E7F5AE8CADA9DED6DDD50402820D676191A50F9791DED4DA87F5D8B89746DFF3DFD7A5DF739615E302F608CA5FF2F93E1EB59D96B3D7DD19EB6162C5850FEEFA8DE0C3564C8907756AC58D1A7C1F2B5D75E7B3E74CA8A7EBAD0B56EDD285FF814100A88B55C86D676AB687B13EADA4CA46D27D45DEB7082F139615E302F608C35C6D6E93219EF2D997DAFA76E31D2D9AD47CAFE0D2BAABAD3D685F877FBF34257BE7523EE3E574028202A5D86F6DE7BEFB1A549EFA2B5FC53EF6E67EBEC5F4BDF5F1B17957ED707EB7182C95A2E971BFB918F7CC4E7444DCC0B715928140A5D7EFFADB7DE9A6EB5D556DDFAFDE79F7FFE1ADF73ECB1C7169FDF74D34D69DCC89D7D3F5E5D51B0B4DE980BA9F2B1BCB5F55576CA5AD5765A4B4B4BDAD77B2CC3DF7BB33B1F567F687D5D40DC7DF7DDC5C1326EE1B8FDF6DBE3FD438B85C1EEBBEF9EC6CFBCA70B945A2B206A6DF9F9F6B7BF9DBEF7BDEF4DD7626B68675B69BB73E3E80EB7D2D6DB3ADD59F339695D6DEB3258EEB4D34EEDBE16C7E7EDB7DFBED8B2B963B3CD362BB6F83CB6ABAEBAAAF83BE6CF9F5FFC997BEFBDB7F8FDF2F77FF39BDF6C7DFF2DB7DC926EB9E596ABFD1BE2C503B3E723478E6C7D1EE709F382662ED46AA5D9635972C41147BCD1D7E7582E5AB468613F3EC7326BD3F2F9FC1E03070E7C4F7C5F5F07CB38485E78E185C505310B71D9F74F3CF1C4D6AFC367512C2EE2C41F03DE0E3BEC50FCF797170871B2DF70C30D5B7FA63F1410B5B80C9526AEE5037AE7BC924A26D47A3FC7D2E7444DCD0B6DC7E44D36D9A4C3D7E3DC316BD6AC74975D76592D58DE7CF3CDE9673FFBD9D57E5FF9581EBF3EFDF4D35BBF5E7FFDF55BE79EA79E7AAAF87BE27BBEF5AD6F15E783F8FC89279E68FDD9471F7DB4F878F1C517DB6369BD31C65295CB64787CD239966D9C75D6594BFBFAAAB093274F9ED9DFAE0ADBC90038A0AF0B8851A346B5EE218D03E5F1C71FDFFA7C9F7DF669B78088AFC53D9BD9FBB2ADD1313CC6C0F9C94F7E5201B18E97A1B65B45D76222BD6240FB57C2EBCE845AB75785F539518BF342DB3D927159DA60830D3A7D5F0C901FF8C007560B961B6FBCF16A73C9F2E5CBD371E3C6B56E608CBFFF80030E283E8FEF8D73497BE1B67C83E3A69B6EDA7AB44DDC381937623A14D67A638CA55A974957856D4718D4EFE8EBFB589E77DE7953FBCB7D2CCB3EE4294992ECDDC100D867054416D2E25EC301657B27E3F33BEFBCB31808E3F37BEEB967B5093E1600D9F3E9D3A7171FAFBFFEFAF4D9679F2D3E9F376F9E02621D2E43156C1D5DD3BDB9BA7AE3E8B6B61D5087F7EEF23951ABF342DB3665CA94E272F4A10F7D6895235ADAB6B84131B6B6C1F24B5FFA52BB1B29E3EF8C61B4ED9C12E79E8D36DAA8DDF7C70D8E0F3EF860F179FC7765DFBFE4924B9C6369BD31C652D5CBA4FB58B6E38F7FFC63EE88238E48DF7AEBAD3E0B962D2D2D0B42A76CD14F16BACEB6A8F57901B16CD9B262B88C13F436DB6C530C887142CF26ECD89E79E699E2C019F76CBEF4D24BADE13006BF389967C5C1800EF6582A20D6CD32D4CDADA45DBDE1737727D4EC10A4BDEB7082F1395193F34247E757C60D8CF1796787C366CF63988C2DBB904FFCB9B6A1347EEF1BDFF8C66A1B1C6320DD6BAFBD56D9001ACFB98FEFB9FCF2CBDB9D53EAFD1409EB8D3196EA5F269B9A9A3E11DE53BC6E4C789E2E5DBAB4577253ACED070D1A541E2CAB3B439D7AEAA9AF3DF4D0437D122A1F7EF8E1A5A143EEABB785B32F0B881826E3641E43630C7271F779B67731B678F853B6F730DB031907D1B807319BD4B3BD94718F657C3D9E6BA380A83A1D6DADEDEA44DADD0935FB7B26529F1335362FB43D0C369EEE908DC1E79C73CE2AEF89A730ECB6DB6EC5D6DEC57B4E3EF9E4F4A8A38E6A3DBAA5BBF3423CB77FF6ECD9AB1D29533E2F6447DF641707322F608CA51AC55B8F64812FEE88E90D37DC704379A89C54F59D72F5D5579F7BDC71C7F5C95ECB430E39E4A9F021342B207A776B746C93264D2A1611D956E7CE425CF9041F03665618C495245EBCA1EDE1AD0A88AA11B7D6B63D1467C880EEDF9BABBD09757037B60AE373A20682E580D29128D9D78F3CF2C82A1754CBC2676CE557145FD33996D9112BEDCD29F19CFAC71F7F7C8DA748C4B9203BAA2586DB384F7476A8AE7901632C55102CF7CE425FDC6BD9D317F189BF2FFEDEB27B68D646863AE9A4935E1E3D7A74AF86CADFFFFEF7CFC6BD95DD3CCC4101B116E75B965F4EBEB36019CFB58987CEC6731DE39ECEECFD718F657BEF574054DD845A7E1183F289B13B377CEEE8E7DCF8D9E7443F981706747001B7B80131BE16E6E6550E7FCD0266769BA86C8360DC4BD9DE38DFD1C6CAB62D1E05931D2973CD35D7ACB24134DBA33A7CF8F0D5AE626E5EC0184B350AD9E69E2CF81D7DF4D13D76EB91381EC71D7FE57B2B6B26438D1A35EA3F0E39E4907766CE9CD92BA1F2E9A79F7EABB9B9F9F990B43FAB80E8BD969D3FF9F9CF7FBE18D8CAB738C7EFEFBBEFBEADCF6388CCF626C61B5FC7C35F6310CD6E3F926DD9CE9EC70B022920AA56DB4381DE55DACADADDCBA6B7FDB95D4DA43E276A7B5E88175E8B174C8BE7D577F49EB8B1308EC36DFF4D7143637635EF78718AEE84D88EE685D8B20BCC959F6F5F7E2D80BE6E82A531D618CB5A04CB2D425B9205C058D7AE6DB88CA1F2CC33CF2C0F95CB6B2E4385C2FF8A78219FC58B17F768A88CBFEF80030E585A8F87C0AEAB2DD3E55B9CD7F49E18FCBAF37E0544CD4CA83DB1F5D715EF7C4EF4B37941132C8DB1C6587A563E9F6FCC2EE493EDB9ACF4B0D8F8736DF654A6359BA1468E1C794B0C973DB5E7F2E9A79F4E0F3AE8A01743879FA08030792B206A664275C3679F13E605F302C658632C5D1402604B79B88CE746C6530DE2555DBB7AF5D778A19EF2732A63ABF90CF5AB5FFDEA67210CBE13CFB95C9B0BFADC71C71D2B870C19F262EC680584024201D167D6F6901D87FCF89C302F981730C61A63E9A6B8E732B465E5C13006C5782AC18409138A7B23B3C364E3E1AE0B162C28DEBD61C48811F1768CAB04CA78F86BBFC950975F7EF976279D74D2F371576CBC6A5C77C40BB3849F7B71F0E0C1D3EAF59C4A058402A24A26D4EE6E657571029F13E605F302C658632C158AE75C96DF86A4C236A95F66A80B2FBCF0BF8317E2E1B1F1AA9ED3A64D4B172E5C583C172F8A8FF11CCA183EE3EEDEC30E3B6CC5C1071F3C3D26EC7ABCFAAB0242015145BA7B088F437E7C4E9817CC0B18638DB1F44CC0DCAF1430DFEC4EA0AC8B0C75EDB5D77EE5BCF3CEBBF6E4934F9E3574E8D0E5CDCDCD6F9776EFBE75E081072E0FC1F3A1D0CE8C29DDA2A4805040D4DC84BA6D68CB07B8E1B3CF09F382790163AC31961E13B2D22742C03C2A64A49B437B2AB4156541725E68A3433B56864201A180A805BB9626CA5D3B797D8989D4E78479C1BC8031D6184BEF2B85C9D4D19D28201410B5A8A3ADB50EF9F139615E302F0896C658632C7D249FCF7F2D3B3C364912E7F1A2805040F48B09D544EA73C2BCA00996C658632C7D1B2C47951D0A3B4D8FA0805040D4FA847A9189D4E7847941332F18638DB1F49D1024B76D7B319F10342D7F28201410352B1E76910E7019759F13E605CDBC608C35C6D297C172743B57829DE65C4B14100A885AF6415D501B9F539C7474837941332F608CA5E643E5B61DDD7A244912178D4201A180805E9F882CAFE605CDBC803196DA5FD6EEECE4FE9553F4100A080504287A302F981730C64267CB59877B2B9D6B89024201018A1ECC0BE6058CB1D095E56C7467A1D215625140282040D18379C1BC803116BA65D0A0417F1F96BD57F4040A080504287A302F981730C6424572B9DCFBC3B2B75C4FA080504080A207F3827901632C5464CF3DF7FC4092242FEB0914100A0850F4605E302F608C858A343535FD4358F65ED21328201410A0E8C1BC605EC0180B15C9E5721B8565EF453D81024201018A1ECC0BE6058CB150919696960FE6F3F9657A0205840202143D9817CC0B1863A1228542E14361D97B414FA080504080A207F3827901632C542497CB7D382C7B4BF5040A080504287A302F981730C64245060F1EFC91B0EC3DAF275040282040D18379C1BC8031162A9224C9C661D95BA2275040282040D18379C1BC8031162A92CBE53609CBDE623D81024201018A1ED6DAB871E38CC9D5D1568479E14D4BA43116FA4A92249B86656F919E4001A18000450F6B6DE2C4890B172F5E6C5C5EC76DC18205378679618625D2180B7D2597CB7D2C2C7B0BF5040A080504287A586BE3C78FDF6BC284092F3EF7DC73AF199FD7CD86C638278C1D3BF699D0F6B3441A63A1AF3437376F1696BD67F5040A080504287AE811613CDA63CC9831D3E29114F1307DAD4F5BECF319E60463AC5E601D2C771F0F6D819E4001A18000450F8031162A92CBE5FE312C7BF3F50475ABA1A161670330287A008CB150B9A6A6A64F84656F9E9EA09E07DF49A1BDA32740D103608C858A97BB4F8636574F50AF2BC0C038F8C69624C9BFEB1150F4001863A1FB72B9DCA7C2B2F78C9EA05E07DE7BCA82E5183D028A1E00632C745FA150D83C2C7B4FEB09EA4E0892BB66A1D25E4B50F400186361AD96BB2D427B4A4F508F0BFFA4B6C132B4D17A06143D00C658E89E5C2EB76558F6E6E809EA6DC0DDAF9D50596C8542E15FF510287A008CB1D075A186FE7458F666EB09EA6DC0FD4B47C13249921BF410287A008CB1D075B95CEE3361D99BA527A81B2138EEDD51A8CC5A3E9FFFA29E02450F803116BAA65028FC7358F666EA09EA46088D0FAF29588676B39E02450F803116BA5C636F1596BDBFEA09EA5692241B879560899E00450F8031162A93CBE5B60E75F5137A82BA3568D0A08F8601F8393D018A1E00632C542684CACF86656F869EA06E3537376F16568267F504287A008CB150997C3EFFB9B0EC3DAE27A85BB95CEE1FC34A305F4F80A207C0180B15D7D49F4F92E4313D413D0FBE9F0C6DAE9E00450F8031162A1342E517C2B2375D4F50B70A85C2E66125785A4F80A207C0180B9589B7EB8BF78AD713D4AD5C2EB7655809E6E80950F4001863A1324D4D4DFF12C2E5A37A82BA1556807F0A03F0937A02143D00C658A84C92245F0ACBDE9FF50475AB5028FC73580966EA0950F4001863A132F97CFECB61D97B444F50B7DCCC15143D00C65858EBE5EE2BA1FD494F50B7DC7307143D00C65858EB9A7A9BB0EC3DA427A85B2E8D0C8A1E00632CAC9D42A1F0D5B0EC3DA827A85BAE60058A1E00632CACF572B76D68D3F40475CB89C6A0E80130C6C25AD7D4DB8565EF013D413D0FBE4E3406450F803116D642A150F8B7B0ECFD514F50CF2B81E3C141D103608C85B55BEEB60F6DAA9EA06ED96D0F8A1E00632CAC754DFDB5B0EC4DD113D4FB4A60EB0A287A008CB150A124497608CBDEFD7A827A1E7CBF1EDA643D018A1E00632CA8A9A1224992FC7B580926E90950F4001863A1320D0D0DDF08CBDE7D7A827A5E09BE15C2E5BD7A02143D00C658A878B9FB666813F504F5BC120C0CED1E3D018A1E00632C54C6CE1AEA5E5801760A03F0383D018A1E00632C545C537F3B2C7B13F40475ABA1A161E7B0228CD113A0E80130C642C5CB9DA300A96FF97CFEBFC24AF0073D018A1E00632C54A6A1A161C72449C6EB09EA565801760D03F09D7A02143D00C658A8B8A6767A19F5AD50287C279FCFDFAE2740D103608C858A97BBFF086DAC9EA06E8550B947580946EB0950F4001863A132AE5B82C1B7B171CFD06ED513A0E80130C6426542A8FCCFB0ECDDAD27A8E79560EF7C3E3F4A4F80A207C0180B9571414CAC04F9FCF7C24A708B9E00450F8031162A532814760975F55D7A827A1E7CF70BED663D018A1E00632C54C69D16B01224494358096ED213A0E80130C64265DC6901C1320803F0F57A02143D00C658A878B9DB3DB4FFD513D4AD7C3EDF14B2E5757A02143D00C658A8B8A6760B3FEA7EF01D14DA483D018A1E00632C54264992EF8670799B9EA09E5782216100BE464F80A207C0180B152F77EE0D4F7DCBE7F3FB877079959E00450F8031162AAEA9F70ACBDEEFF504F53CF81E18DA157A02143D00C658A84C92247B8770394A4F50CF83EFC1A15DAE2740D103608C858A97BB7D42FB9D9EA06E254972483E9FBF544F80A207C0180B9509F5F4F7C2B2778B9EA09E57821F8495E0177A02143D00C658A84C9224FB86BAFAFFE909EA79F03D2CB49FE90950F4001863A1E2E56EBFD06ED613D4AD24498EC8E7F323F404287A008CB15099504FE7425DFD5B3D413DAF04478695E07FF404287A008CB150F172970FED463D413DAF043F0AED423D018A1E00632C54269FCF37264972839EA06E8515E098B0229CAF2740D103608C858A6BEA242C7BD7EB09EA560895C785F5E05C3D018A1E00632C54BCDC1542FB8D9EA09E83E509612538474F80A207C0180B15D7D44D49925CA727A8E7C177586867EA0950F4001863A1322154368765EFD77A827A1E7CFF3BB4D3F504287A008CB150F1723728B4917A82BA95CFE77F9224C9A97A02143D00C658A8B8A61E1C6AEA6BF504F53CF89E12DA703D018A1E00632C542684CA2161D9BB464F50CF83EF69A19DAC2740D103608C858A97BB96D0AED613D4AD2449CEC8E7F327E90950F4001863A132A19EDE3FD4D557E909EA79F03D2BAC0427EA0950F4001863A1E2E5EE80D0AED413D4F34A704E68C7EB0950F4001863A13249921C94CFE77FA527A8E795E0DCB0121CA72740D103608C858A97BB8343BB5C4F50B742A83C3F84CB63F404287A008CB150F1723734B4CBF404F5BC125C18DA8FF404287A008CB1509924490EC9E7F397EA09EA7925F89FB0121CA92740D103608C858A97BBEF87F64B3D41DD0AA17244089747E80950F4001863A1E29AFA0761D9FB859EA09E07DF9F8576989E00450F8031162A9324C9A1215CFE5C4F50CF83EF2FE216163D018A1E00632C54BCDC1D1677D8E809EA7925B82C5EC54A4F80A207C0180B95C9E7F3878765EF123D413DAF04BF8A3774D513D06B05CEE858E4ACA14DD353008225B52B5EB3245EBB444F50CF83EF95A11DA027A0D7D6B16D437BB3B3601926A23DF4148060494D2F773F0CED623D413DAF045787D6A227A057D7B33B3B099653060E1CF81EBD04205852BBE2EDFBE26DFCF404752BAC00D7861561B09E805E2D72B6ED28588675706F3D04205852F3CBDD8F42BB504F50CF2BC1AF4361DBAC27A0D7D7B5F6CEB59C666F25806049EDCBE7F347879AFA023D413D0FBEBF09ADA027A0D7D7B5D5CEB5746E25806049FF1042E531615E3F5F4F50CF2BC10D612568D413D0FBC2BA36CADE4A00C1927EB9DC1D1BDA797A827A5E096E0AE1B2414F409F04CBAF959D5BB9AB1E01102CE93773FC71616E3F574F50CF83EFCDA1EDA727A0CFD6B9E2B996F656020896F41F2154FE3884CB9FEA09EA79F0BD25AC04DFD31354BB344DDF3367CE9C9BA74E9DFAF6B871E3D23163C6687DDCC68E1D9B4E9C38F1F9D05CF00B102C61D5E5EEF8D0CED113D4AD78CE97DB1D500B62A89C346952BA78F1E2F4F5D75FD7D6515BB264497AEFBDF7BE1442A6231D00C112FE56539F106AEAB3F504F53CF8DE1ADA9E7A826A17F7540A9555132E5F1F3366CC0C4B252058C2FF09A1F2C4B0EC9DA527A8E7C177B45B1E500BE2E1AF425DF5B4102CDFB454028225B42E77C3423B534F50B742A8BCBD50287C474F50EDE2397E025D55054B851B2058C2DF6AEA93922439434F50CF2BC15D6E7B407F0A96AFBCB8309D33EDEAF4B1B1A7155B7C1EBF270C0A96806009BDB8DC9D1CDA697A827A5E09EE0EC1F23FF504FD21582E5FB6209DFE8793D33FDF7EDC2A2D7E2FBE26100A96806009BD219FCFFF24D4D4A7EA09EA79F01D1BDA7FE809FA43B09CF7D86DAB85CAACCD7F6CB4402858028225F4D672373CB453F404752B4992F10D0D0D3BEA09FA43B09C71CF4F3B0C96F1358150B004044BE8A5E5EE94182EF504F5BC124C08E1F2DB7A82FE102CA78F39A5C360195F1308054B40B084DE100F838D87C3EA09EA79F09D18DA37F50482A5265802822554BCDC9D162FE0A327A8E795E0BE8686866FE809FA43B08C5781ED2858C6D70442C112102CA19796BBD343FB6F3D413DAF04F72749B2839EA03F04CB59937FD661B08CAF098482252058426F88F7B08CF7B2D413D4F3E03B35B4EDF504FD21582E5DF0683AFDEEE1AB1F061BBE175F1308054B40B0845E5AEECE0C6D989EA09E578207F2F9FC767A82FE102C637BEAC191AB05CBF83D6150B004044BE8C5E5EEAC24494ED413D4F34AF060A150F8AA9EA05F04CB952BD359F7FF72F5C360C3F7E26B02A160090896D01B42A83C3B9FCF9FA027A8E7C1F74FA17D454F50EBC172F9B205E9CCC99774788E657C2DBE4728142C01C1127A61B93B27B4E3F504F5BC123C92CFE7BFAC27A8D960B97265BA70D6F8F42F770DEB3054662DBE27BED7DE4BC112102CA1272549726EA8A98FD313D4ADB0023CDAD4D4F42F7A825A0C966BDA4B69EFA560090896D047CBDD79A11DAB27A8E795607A92245FD013D462B0ECCA5ECACEF65E0A8882252058424FC8E7F3E7879AFA183D413D0FBE8F8715E1737A825A0C969586CAAC098882252058424F08A1F28250531FAD27A8E7C1F7AF6125D84A4F508BC152132C01044BAA64B9BB30B41FE909EA79259895CBE53EA327102C35C112102CA132F97CFEA224498ED213D4F3E03BBB50287C5A4F20586A82252058426542A8FC9F102E8FD413D4F3E0FB54685BE809044B4DB004044BA878B9BB38B41FEA09EA7925782697CB7D4A4F20586A822520584265F2F9FC8824498ED013D4F3E03BAFA9A9E9137A02C152132C01C1122A5EEE2E09E1F2703D413DAF040B42FBB89E40B0D4044B40B0848A97BB9F8576989EA09E578285B95CEE637A02C152132C01C1122A93CFE77F9E24C9A17A827A1E7C9F1B3468D047F50482A5265802822554BCDCFD32B4EFEB09EA7925589224C9C67A02C152132C01C1122A93CFE72F0D35F5217A827A1E7C97E672B90FEB09044B4DB004044BA878B9BB2CB4A17A827ADEBAB2ACA5A5E5837A02C152132C01C1122A5EEE2E0FED603D413DAF042F353535FD839E40B0D4044B40B084CAE4F3F95F254972909EA09E07DFE5B95CEEFD7A826A3070E0C0F7089682258060490D2E77578476A09EA09E578257BFFBDDEFFE9D9E605D4B92A4391603A1ED27580A9600822535B6DC5D19DA017A827A5E0956B6B4B4BC4F4FB0AEE472B9CF1C7BECB1F73DF9E4938B9E7FFEF9B1871F7EF88361B9BCA4ED722958D65EB00C9FE3B6F97C7E94A51C102CE9EF9224B92ACC79FBEB09EA79F07D63E8D0A1EBEB09FA5A3CEC75D0A0413FB9E5965B9E7FEBADB756A47FB3ECF6DB6FBFBBB9B9796A0C9D8265ED05CB1828431B1DDA9B0A3C40B0A44E96BBAB436BD113D4F34AF05628DED7D313F4A52449FEFDA73FFDE99C175E78E1F9B4032FBFFCF213279C70C282ECD058C1B2FA8365DB4099354B3C20585207CBDD35A1BE19A227A8E795E09DF0F02E3D415F88B7B639EAA8A3AEFBD39FFED461A06CE3CDBBEFBE7BC1C1071F7CE95D77DD25D05569B0CCE7F35F8B87BCB60D9482252058522F42A8BC36CC8583F504753DF8C67019DADBA5A2F08D78DE65682BE2857D427B25AC282FC7DB92C47B5E86C717427B3EB425A13D17DAA2D09E0D2DEE599A17DADCD09E09EDA9D0E684F66468B342FB6BF83D4F84C7C7C3E363E1F12FE1F73D1A1E1F098F0F87C787428BE7D63D10DA1F439B12DAFDA1DD17DAA4F033F786C709E1717C781C171EC784C7BBC3CFDE151EEF0C8FB787C7FF0D8FB785C75B4B45EEEFC2E3FF0B8F37877653683786767D68BF09EDD7A18D8C83403C74211E171FAFE6152F151D6F701B1E2F0D8FBF088F3F8FE7FB85C711E13DFF131E2F0A8F1784C7F3C3E3B9E1F1A7E1F1ECF09EB3C2E319E1F1F4F0786A783C25BCF693F07872783C293C0E0B8F2784C7E3C3E371E1F1D8F0787478FC51783C323CFE303C1E1E1E0F0B8F3F088FDF8F37D98DF7438A57188B2783C7E3F6E396B03868C50BDD84C7A6F09884C7C6F0D0101E73E171DFF0F8BDF0B87778DC2B3C7E373CEE512814BE131E770B8FBB84C7FF6A6868D839FCCEFF088F3B86C781E1F15BE1F19BE1F11BE1F1EB312884C7EDC3E376A5F3E4B6098F5F098F5F0EBFF34BE1F18BE1F10BE1F173E1F1B3E171ABF0BBFF393CFE5378FC742E97DB323C6E1E1E3FD5D4D4F489F0F88FCDCDCD5B5F76D965E98A152BDE4ABBE9E5975F7EE997BFFC653A77EE5CA1AE8A8265477B28DBB678BE6C5806368C170A1B3468D0DFC72B51EFB9E79E1F88B73A0ACF378A2D6E7408CBCC87C2F30F0F1E3CF82361B9DA383CDF24B6F0331F0D5F6F1A9E7F2C2C479B85DFF9F1B84CC5652BB6F0F527E3B21697B9F07C8BD2F2F7E9D8E232190FA92E2D9F5B85E75B9796D9CFC516BEFE7C6959FE62F85DFF525ABEBF1C5BF8997F2D2DF7DB84E75F2DAD0BDB85E7FF165B691DF95AF8991DE27A13D79FB8373EAE4BA5F5E95BE1EB6F97D6B11DC3F39DE27A575AF7760E5FFF675C1FE37A199EEF5A5A47BF135B78CFEE71DD8DEB7078BE67697DDE3BB6F0F53EA5F57CDFB847BFB4EE3784E7F9D84A6342129E174AE344BC30D6A0D84AE3C79078B8561C53E2D812C7987889FCD84A63CED0F0FC90380EC5F1283C3F34B6D2F87478787E4469CC3A323C3F2A8E63A5B1ECE8F0F531A5F1EDB8F0FCC7A531EF84D8C2D72796C6C23826FE77697CFC4969AC1C1EC7CDD2F8795A692C8D63EA99A5765669AC3DA734EE9E1B9E9F175B693CBE203CBFB03446FF4F787E711CB7638B6378683F2B8DE7BF08ED97718C2F8DF3F186E69797C6FE7845C72B4BF3C1D5A5764D699E1819E78DF0FCBAD21C12E792EBC3D73794E6969BC2F3DFC6F926CE3BA5B9E796D23C14E7A3DF97E6A6DB4AEBCCE8D29C15E7AE3B4AF3589CCFFE506A7797E6B9B1A5392FCE7DF7C479B03417C63971629C1F4BF3E4E4D29C797F69FE9C5A9A4BE39C3AAD34BF3E546A7F2ACDBB8F84F6E7D25CFC97529B5E9AA31F0F6D4669DEFE6B68334B6D56695E9F5D9AE3E35CFF7469DE7FA65403C45A607EA92E88F5C1C2525B54AA1B16976A88584B2C2DD5152F946A8C1763BD51AA3B96C71AA4D4623DF25AA9368935CAEBA57AE5CD527BAB54C7BC638316EBB0A68EE3C4203D41BD7BD729A79CF2EE78CE5B3CDF72B7DD76DB201682591198158059E197157D59B197157A5981575EDC65455D56D065855C56C465C55B56B865455B56AC65855A56A065C55956946505595688654558567C658557567465C5565668B529B00E2C1556C5A22A2BA8B2422A2BA2B2E2292B9CB282292B96B222292B90B2E2282B8AB282282B84B222282B7EB2C2272B78B262A74D919315385961532C6AB262262B64B222262B5EB2C2252B58B262A5AC48C90A94AC30C98A926231921522590192151F658547567094171B5991F1ECF0E1C397CD9B37EF9DEE06CB65CB96A523468C28160BD51A2E972C59120B99F4E69B6F4E5F7DF5D574F3CD374F77DA69A734AC2FC576EBADB7165F6FFB73F17BE79C734E875F5779B0EC6A5B512A0A5F2D1589CBB30D56A542F2C5B20D574BCB365E2D2EB56C23D6C2B20D59F34BCB56F906ADA7CB366ACD2EB56CE3D6CCB20D5C334ACB6EB6A16B7AD9C6AE3F9796F36CA3D79FCA367C4D2BDBF8F5C7D23A926D049B9C6D082BAD4B13B30D62A575ACB851AC1414C6661BC7E2FA986D202BADA3B7671BCA4AEB6E716359697D1E956D342BADE7C50D67A540936D3CBBB134261437A295C6895F970A9E6C63DA35651BD4AECC36AA95C2D5E5651BD77E996D602B85B29F651BDAE298956D6C8BE358692C2B6E742B8D6FC50D6FA531EFEC6C035C692C2C6E842B8D8FA7661BE3E2B8996D902B8DA5C58D72B195C6D8E2C6B9D2B85BDC40175B693C2E6EA82B8DD1C58D7571DC2E8DDDC58D76A5F1BCB8E12E8EF1A5F05CDC80571AFB5B37E2C57921B66C635E69BE286ED02BCD2149B661AF34B71437EE95E69B7DB38D7CA579A8B8A1AF34371537F6C516E7AC6CA35F691E2B6EF88B2DCE6FD906C0D29C57DC0818E7C1D25C58DC18589A1F8B1B04E39C195BB661B0349716370E96E6D76DB28D84A579B7B8A1B034177F31DB60589AA38B1B0D4BF37671C3616CA5F9BC7503629CEBB38D88B1C51A20DB9818EB82581FC40D42B1C57A21D60D716351AC21622D113724C5BA22B65863C48D4CB1DE887547DC00156B90D8623D12374EC5DA24D628E1F97B63BD12EB96D8E2293DB18E19E0082CD6ED1ECBEBE218A12700FA48C889EF993C79F25D2B57AE7CBB2BA1F2FEFBEF5F70E08107BEF2939FFC247DFAE9A7AB3A6C3DF0C003E9669B6D16F7CA1603E2E38F3F5E7CBCE4924B5A4363F6DEEDB6DBAE356C5E75D555E9C61B6F9C3EF8E083C5AF77DF7DF7D6D7E2EFA8F643614B05F0948E82A5A51E80FEAE743443414F00F4B11B6EB861BFD9B367BFD651A07CF6D967579E7EFAE98BE35E8AB825BBD62EDE1343E1C891238B8F03070E4C274D9AB44AB09C356B563A6AD4A8D660B9C30E3BA4A3478F4EAFBBEEBAD69FBFE9A69B6AEAE23D71AF4B698F9D600940BD05CB781459A22700D68178A8530857F7AF58B1E2CD2C50BEF1C61BEFFCFEF7BF9FB7FFFEFB0F89873865EFADE660397FFEFCE21EC60D37DCB01820B36078E9A597B606C7B8D7B23C58C6F79F7CF2C9AD0174BDF5D64B43902E06B6C9932717BF1FC3672DDE6EA4B4077392600940BD88A721C4C3E3F504C03A74DA69A7B5C4301582D4E2CB2FBFBCDDF313AA7D8F6576F8EB2DB7DCD21A2CE31EC9B67B31B3E74F3DF55471EF64FCDE17BFF8C562D08CDF5FBA7469F17B219CD5EC7D2CCB26D9B807738A251C80FEAE749E7B5E4F00AC63E57B276B3158B60D93F1F9F5D75F5F0C8CF1BCCB458B16AD122CB7DF7EFBF4F6DB6F2F7E2FEEF1DC6AABAD8A87C25E73CD35AD17028A2DFE5CAD064B00A8A360192FA4D8A02700AA5CAD04CBE9D3A7A72FBDF452EB61B0D91EC8F8FD2C58CE9B37AF78E5D8183AE3A1A2F171CB2DB74C0F3DF4D0E2F3B8D733BE77DCB87135BDC71200EA45E9EAFC393D012058F648B08C81F2B39FFD6CEBC57AE20578E2633CF475409BDB8DC4C367A74C99527CCCAE021B1FE3F996D9457C044B00A87EA5FBA6EFA7270004CB1E0996F150D6F818F748C6C7679E7926BDFBEEBB573BC7B2FC671E79E49162A08CF7BEAC95ABDE0A9600F037F1DEC2F11EB67A0240B05CEBB67CF9F2F489279E281EF65AFEFDECFE94F1DE95EDDDC73286D1E1C38717EF6579D2492715BF9F05D478BEA5600900D5ADB1B1F196102EBFA7270004CB3EBF8A6C2DFFFB054B00582558FE2EB47DF4048060A909960050917C3E3F2A4992BDF5048060A90996005091C6C6C65B43DB534F0008969A60090015C9E7F3B72549F25D3D0120586A82250054A4B1B1717408977BE80900C152132C01A0D260F9BFA1EDAE2700044B4DB004808AE4F3F9DB0B85C277F4048060A90996005091C6C6C63B42B8DC4D4F0008969A6009009506CB3B9324D9554F0008969A60090015C9E7F377150A855DF4048060A90996005091C6C6C63F8470F95F7A0240B0D4044B00A83458DE9D24C97FEA0900C152132C01A02221548E696868D8594F0008969A60090015696C6C1C17C2E54E7A0240B0D4044B00A8480895E31B1A1A76D4130082A526580240451A1B1BEF096DA09E00102C35C112002A0D96139224F9B69E00102C35C112002A1242E5BD0D0D0DDFD2130082A526580240451A1B1B2786F64D3D0120586A822500541A2C272549F2EF7A0240B0D4044B00A83458DED7D0D0F00D3D0120586A822500541A2C2787F6753D0120586A822500541A2CEF4F9264073D0120586A822500541A2CA7E4F3F9AFE90900C152132C01A0D2603935B4EDF5048060A90996005069B07C209FCF6FA72700AADCB871E304BAEA692B42B07CD3520900ADC1725A68DBEA09802A3771E2C4858B172F16EAAAA02D58B0E0C6102C67582A01A035583E582814BEAA2700AADCF8F1E3F79A3061C28BCF3DF7DC6BC2DDBADB531943E5D8B1639F096D3F4B2500B406CB87F2F9FC367A02A0068430B3C7983163A6C5C330E3397EB5D8468D1A95D6EABFBDD4EF33844A00582D58FE29B4AFE809007ADD73CF3DB7EF881123D230F16CA13700A0FFC8E7F30F170A857FD51300F4AA344DDFF7C20B2F2C0BD2A14387FEAF1E0180FEA3B1B1F191102EBFAC2700E855F3E6CDFB755A72FFFDF72F4892646FBD0200FD2658FE39CCED5FD21300F49A575E79E5CB6FBFFDF63B699933CF3C735E4B4BCB07F50E00D4BE7C3EFF685353D3BFE809007ACDA2458BE6A46DBCF8E28B8BC20474B1DE0180DAD7D8D8F897102EBFA82700E81573E7CE3D39EDC0A851A316B9993200F48B60393D49922FE809007A5CC88E1F5BB972E51B1D05CB77DE79E7F51FFDE8478F0E1C38F03D7A0B006A5708958FE572B9CFEB09007ADCFCF9F3A7A46B3067CE9C7961323A4A6F0140ED6A6C6C9C11E6F3CFEA09007ADCE4C993D7942BD3152B564C089351DAD2D2F23E3D0600B52984CA2772B9DCD67A02801EF7939FFCE4B0CE0E858DB972D8B06137D9630900B5ADB1B1F1AFF97C7E2B3D0140AFB8F1C61BFFDA51AA7CF2C9272F0D13D114E7580240CD07CB998542E19FF50400BD2297CB7D2604C815ED5CB8677A5353D374578505807E112C67C5395F4F00D06BCE3BEFBC4B42907CBB3C585E71C51557E6F3F98BF40E00F48B60F96498D7FF494F00D06BE2A1AE77DD75D7E22C54BEF8E28BD7C72D9B2D2D2D1FD43B00D02F82E5EC42A1F0693D0140AF3AFCF0C3775AB66CD9CAD0D2A143878E4D92646FBD0200FD2658CEC9E5725BEA09007ADD65975D76E7881123D27C3E3F4A6F0040BF0A964F85B6859E00A0D7C5435FE33D2B9DDC0F00FD2E583E5D281436D71300F4D5C493EA0500E877F3FB33B95CEE537A0200C11200A8747E9F1BDA27F5040082250050E9FC3E3F97CBFDA39E0040B004002A9DDF1784F6713D0180600900543ABF3FDBDCDCBC999E0040B004002A9DDF17E672B98FE90900044B00A0D2F97D5192249BEA0900044B00A0D2F9FDB94183067D544F002058020095CEEF8B73B9DC267A0200C11200A8747E5F9224C9C67A0200C11200A8747E7F7EF0E0C11FD1130008960040A5F3FBD25C2EF7613D0180600900543ABFBF5028143EA42700102C01808AE4F3F9652D2D2D1FD4130008960040A5F3FB4B4D4D4DFFA02700102C01808A2449F2F29E7BEEF9013D0180600900543ABF2FCFE572EFD7130008960040A5F3FB2B83060DFA7B3D0180600900543ABFBFFADDEF7EF7EFF4040082250050E9FCFE5A2E97DB504F002058020095CEEF2B5A5A5ADEA72700102C01804AE7F795BBEDB6DB067A0200C11200A8747E7F3D97CBBD574F002058020095CEEF6F0C1D3A747D3D0180600900543ABFBF3970E0C0F7E80900044B00A0D2F9FDED534E39E5DD7A0200C11200A8747E7F273CBC4B4F0020580200E677006A63E2D1344DD334ADFF35550E00000000000000000000000000000000000000000000000000000000000000B04EFD7F52A9DA10FF9FDF790000000049454E44AE426082,
+		1);
+INSERT INTO `act_ge_bytearray`
+VALUES ('247539', 1, 'var-userLeave', NULL,
+		0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665000000000000000102000F4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000675736572496471007E00024C0008757365724E616D6571007E000278707372000E6A6176612E7574696C2E44617465686A81014B5974190300007870770800000163F9E00C007874002061346137343362666665393731316537623437323230316130363863363438327371007E0006770800000163FEF2E18C78737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000037371007E0006770800000163FF066800787400203266643739336364643964333432663862303335333063383566326233303533737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787400043230313874000CE6B58BE8AF95E8AFB7E581877070707071007E00087400037A786D,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('247541', 1, 'hist.var-userLeave', NULL,
+		0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665000000000000000102000F4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000675736572496471007E00024C0008757365724E616D6571007E000278707372000E6A6176612E7574696C2E44617465686A81014B5974190300007870770800000163F9E00C007874002061346137343362666665393731316537623437323230316130363863363438327371007E0006770800000163FEF2E18C78737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000037371007E0006770800000163FF066800787400203266643739336364643964333432663862303335333063383566326233303533737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787400043230313874000CE6B58BE8AF95E8AFB7E581877070707071007E00087400037A786D,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('247542', 1, 'hist.detail.var-userLeave', NULL,
+		0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665000000000000000102000F4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000675736572496471007E00024C0008757365724E616D6571007E000278707372000E6A6176612E7574696C2E44617465686A81014B5974190300007870770800000163F9E00C007874002061346137343362666665393731316537623437323230316130363863363438327371007E0006770800000163FEF2E18C78737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000037371007E0006770800000163FF066800787400203266643739336364643964333432663862303335333063383566326233303533737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787400043230313874000CE6B58BE8AF95E8AFB7E581877070707071007E00087400037A786D,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('247554', 1, 'var-userLeave', NULL,
+		0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665000000000000000102000F4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000675736572496471007E00024C0008757365724E616D6571007E000278707372000E6A6176612E7574696C2E44617465686A81014B5974190300007870770800000163F9E00C007874002061346137343362666665393731316537623437323230316130363863363438327371007E0006770800000163FEF7CF0278737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000037371007E0006770800000164042CC400787400203765393832666139393863303434386538306231353832346333303439633562737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787400043230313874000CE6B58BE8AF95E8AFB7E581877070707071007E00087400037A786D,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('247556', 1, 'hist.var-userLeave', NULL,
+		0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665000000000000000102000F4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000675736572496471007E00024C0008757365724E616D6571007E000278707372000E6A6176612E7574696C2E44617465686A81014B5974190300007870770800000163F9E00C007874002061346137343362666665393731316537623437323230316130363863363438327371007E0006770800000163FEF7CF0278737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000037371007E0006770800000164042CC400787400203765393832666139393863303434386538306231353832346333303439633562737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787400043230313874000CE6B58BE8AF95E8AFB7E581877070707071007E00087400037A786D,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('247557', 1, 'hist.detail.var-userLeave', NULL,
+		0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665000000000000000102000F4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000675736572496471007E00024C0008757365724E616D6571007E000278707372000E6A6176612E7574696C2E44617465686A81014B5974190300007870770800000163F9E00C007874002061346137343362666665393731316537623437323230316130363863363438327371007E0006770800000163FEF7CF0278737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000037371007E0006770800000164042CC400787400203765393832666139393863303434386538306231353832346333303439633562737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787400043230313874000CE6B58BE8AF95E8AFB7E581877070707071007E00087400037A786D,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302553', 1, '请假流程.bpmn20.xml', '302552',
+		0x3C3F786D6C2076657273696F6E3D27312E302720656E636F64696E673D275554462D38273F3E0A3C646566696E6974696F6E7320786D6C6E733D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F4D4F44454C2220786D6C6E733A7873693D22687474703A2F2F7777772E77332E6F72672F323030312F584D4C536368656D612D696E7374616E63652220786D6C6E733A7873643D22687474703A2F2F7777772E77332E6F72672F323030312F584D4C536368656D612220786D6C6E733A61637469766974693D22687474703A2F2F61637469766974692E6F72672F62706D6E2220786D6C6E733A62706D6E64693D22687474703A2F2F7777772E6F6D672E6F72672F737065632F42504D4E2F32303130303532342F44492220786D6C6E733A6F6D6764633D22687474703A2F2F7777772E6F6D672E6F72672F737065632F44442F32303130303532342F44432220786D6C6E733A6F6D6764693D22687474703A2F2F7777772E6F6D672E6F72672F737065632F44442F32303130303532342F44492220747970654C616E67756167653D22687474703A2F2F7777772E77332E6F72672F323030312F584D4C536368656D61222065787072657373696F6E4C616E67756167653D22687474703A2F2F7777772E77332E6F72672F313939392F585061746822207461726765744E616D6573706163653D22687474703A2F2F7777772E61637469766974692E6F72672F70726F63657373646566223E0A20203C70726F636573732069643D2270726F636573735F6C6561766522206E616D653D22E8AFB7E58187E6B581E7A88B2220697345786563757461626C653D2274727565223E0A202020203C73746172744576656E742069643D22737461727422206E616D653D227374617274222F3E0A202020203C757365725461736B2069643D22757365723122206E616D653D22E7BB8FE79086E5AEA1E689B9222061637469766974693A61737369676E65653D223062373632356665646161303565383566323832343836653163396339316239222061637469766974693A63616E64696461746547726F7570733D226533343665393633363834383463386661376632313763653535306130313836222F3E0A202020203C73657175656E6365466C6F772069643D227369642D30443235384332342D314631392D343233332D413937362D4130443843423944414541432220736F757263655265663D22737461727422207461726765745265663D227573657231222F3E0A202020203C757365725461736B2069643D22757365723222206E616D653D22E4BABAE4BA8BE5AEA1E689B9222061637469766974693A61737369676E65653D223938623035316230333638316465363032383939336135643134616339336362222F3E0A202020203C6578636C7573697665476174657761792069643D227369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831222F3E0A202020203C73657175656E6365466C6F772069643D227369642D33334642463234452D464537302D343730412D394442352D3942313838314531333834372220736F757263655265663D22757365723222207461726765745265663D227369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831222F3E0A202020203C6578636C7573697665476174657761792069643D227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535222F3E0A202020203C757365725461736B2069643D227573657222206E616D653D22E8B083E695B4222F3E0A202020203C656E644576656E742069643D22656E6422206E616D653D22656E64222F3E0A202020203C73657175656E6365466C6F772069643D227369642D34373638373538312D333535422D343335342D383433432D43333034323333323836414622206E616D653D22E5908CE6848F2220736F757263655265663D227369642D35353636443037362D414234432D344134322D393938462D32353337373839463831383122207461726765745265663D22656E64223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D46423539344242452D383030352D344544432D423343382D39373831454432323643393522206E616D653D22E4B88DE5908CE6848F2220736F757263655265663D227369642D35353636443037362D414234432D344134322D393938462D32353337373839463831383122207461726765745265663D2275736572223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D66616C73657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D39394343413337462D413233352D343835332D383437322D44453233334144324544333222206E616D653D22E9878DE696B0E794B3E8AFB72220736F757263655265663D227573657222207461726765745265663D227573657231223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C6578636C7573697665476174657761792069643D227369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733222F3E0A202020203C73657175656E6365466C6F772069643D227369642D30344339463239412D304242352D343639312D383034432D37363445344530413237313622206E616D653D22E58F96E6B688E8AFB7E581872220736F757263655265663D227573657222207461726765745265663D22656E64223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D66616C73657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D30413541464638362D414541342D343231322D423146342D3932373541343430364332442220736F757263655265663D22757365723122207461726765745265663D227369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733222F3E0A202020203C73657175656E6365466C6F772069643D227369642D37463032463244352D413642412D343233342D413732342D3346383938443233354134422220736F757263655265663D226368696C6422207461726765745265663D227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535222F3E0A202020203C73756250726F636573732069643D226368696C6422206E616D653D2273756250726F63657373223E0A2020202020203C73746172744576656E742069643D22737374617274222F3E0A2020202020203C757365725461736B2069643D22616C6C6D616E6167657222206E616D653D22E680BBE7BB8FE79086E5AEA1E689B9222061637469766974693A61737369676E65653D226438313861633661383663663161363464323138346266303639396436376138222F3E0A2020202020203C6578636C7573697665476174657761792069643D227369642D31434331333342322D343442312D343833302D394335392D374433353634433933334641222F3E0A2020202020203C656E644576656E742069643D227369642D46363844434341302D463741342D343444342D394534342D353641363832443837454341222F3E0A2020202020203C656E644576656E742069643D227369642D36393442374132412D393841442D343530442D383146452D313135424335363237354244222F3E0A2020202020203C73657175656E6365466C6F772069643D227369642D33453941414432332D343444412D344138352D383242442D4436433833304134433439382220736F757263655265663D2273737461727422207461726765745265663D22616C6C6D616E61676572222F3E0A2020202020203C73657175656E6365466C6F772069643D227369642D41323335414337362D354242452D344133382D383243342D31304545383141463834363522206E616D653D22E5908CE6848F2220736F757263655265663D227369642D31434331333342322D343442312D343833302D394335392D37443335363443393333464122207461726765745265663D227369642D46363844434341302D463741342D343444342D394534342D353641363832443837454341223E0A20202020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A2020202020203C2F73657175656E6365466C6F773E0A2020202020203C73657175656E6365466C6F772069643D227369642D44413934353339452D463639342D343041312D424534412D42434343314439424431314422206E616D653D22E4B88DE5908CE6848F2220736F757263655265663D227369642D31434331333342322D343442312D343833302D394335392D37443335363443393333464122207461726765745265663D227369642D36393442374132412D393841442D343530442D383146452D313135424335363237354244223E0A20202020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D66616C73657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A2020202020203C2F73657175656E6365466C6F773E0A2020202020203C73657175656E6365466C6F772069643D227369642D34454238313431392D314141372D343937452D413545452D4535414546313743354530422220736F757263655265663D22616C6C6D616E6167657222207461726765745265663D227369642D31434331333342322D343442312D343833302D394335392D374433353634433933334641222F3E0A202020203C2F73756250726F636573733E0A202020203C73657175656E6365466C6F772069643D227369642D41453541454438342D303734362D343738372D393836462D36413739323743333443333422206E616D653D22E5908CE6848F2220736F757263655265663D227369642D42453337324431342D463530392D344544422D383745382D37423231303738333541453522207461726765745265663D227573657232223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D35313046453036322D433042432D343643382D394231372D38413338303732413242433622206E616D653D22E4B88DE5908CE6848F2220736F757263655265663D227369642D42453337324431342D463530392D344544422D383745382D37423231303738333541453522207461726765745265663D2275736572223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D66616C73657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D38344442433035362D303639312D343733452D383243462D44333235454637333641373222206E616D653D22E4B88DE5908CE6848F2220736F757263655265663D227369642D39353037343945412D344242362D343237362D423637412D44453033453334413035373322207461726765745265663D227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D66616C73657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A202020203C73657175656E6365466C6F772069643D227369642D30443039333043392D394241312D344636382D383545412D33383445313642343039413022206E616D653D22E5908CE6848F2220736F757263655265663D227369642D39353037343945412D344242362D343237362D423637412D44453033453334413035373322207461726765745265663D226368696C64223E0A2020202020203C636F6E646974696F6E45787072657373696F6E207873693A747970653D2274466F726D616C45787072657373696F6E223E3C215B43444154415B247B666C61673D3D747275657D5D5D3E3C2F636F6E646974696F6E45787072657373696F6E3E0A202020203C2F73657175656E6365466C6F773E0A20203C2F70726F636573733E0A20203C62706D6E64693A42504D4E4469616772616D2069643D2242504D4E4469616772616D5F70726F636573735F6C65617665223E0A202020203C62706D6E64693A42504D4E506C616E652062706D6E456C656D656E743D2270726F636573735F6C65617665222069643D2242504D4E506C616E655F70726F636573735F6C65617665223E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227374617274222069643D2242504D4E53686170655F7374617274223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2233302E30222077696474683D2233302E302220783D2233302E302220793D223232382E37303337303339393831383338222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227573657231222069643D2242504D4E53686170655F7573657231223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2238302E30222077696474683D2239392E39393939393939393939393939342220783D223132302E302220793D223230332E37303337303339393831383338222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227573657232222069643D2242504D4E53686170655F7573657232223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2237392E3939393939393939393939393937222077696474683D2239392E39393939393939393939393938392220783D223531302E30393038383236333634343631372220793D223230332E3730333730333130343131343233222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831222069643D2242504D4E53686170655F7369642D35353636443037362D414234432D344134322D393938462D323533373738394638313831223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2234302E30222077696474683D2234302E302220783D223731352E353435343431333138323233312220793D223232332E37303337303339393831383338222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535222069643D2242504D4E53686170655F7369642D42453337324431342D463530392D344544422D383745382D374232313037383335414535223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2234302E30222077696474683D2234302E302220783D223337302E353435343431333138323233312220793D223232332E37303337303339393831383338222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D2275736572222069643D2242504D4E53686170655F75736572223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2238302E30222077696474683D223130302E30303030303030303030303032332220783D223334302E3534353434313331383232332220793D223336382E37303337303636343732373932222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D22656E64222069643D2242504D4E53686170655F656E64223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2232382E30222077696474683D2232382E302220783D223838302E353435343431333138323233322220793D223232392E37303337303339393831383338222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733222069643D2242504D4E53686170655F7369642D39353037343945412D344242362D343237362D423637412D444530334533344130353733223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2234302E30222077696474683D2234302E302220783D223236342E39393939393939393939393939342220793D223232332E37303337303339393831383338222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D226368696C64222069643D2242504D4E53686170655F6368696C64223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D223137322E3130323038303930333236363038222077696474683D223431312E36303837323832303738373235362220783D223138342E37343130373732313432383638362220793D22312E34323130383534373135323032303034452D3134222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D22737374617274222069643D2242504D4E53686170655F737374617274223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2233302E30222077696474683D2233302E302220783D223230332E32353935393536373832393732352220793D2237312E3035313034303435313633333034222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D22616C6C6D616E61676572222069643D2242504D4E53686170655F616C6C6D616E61676572223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2238302E30222077696474683D2239392E39393939393939393939393939372220783D223237342E37343130373732313432383638362220793D2234362E3035313034303435313633333034222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227369642D31434331333342322D343442312D343833302D394335392D374433353634433933334641222069643D2242504D4E53686170655F7369642D31434331333342322D343442312D343833302D394335392D374433353634433933334641223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2234302E30222077696474683D2234302E302220783D223431392E37343130373732313432383638362220793D2236362E3035313034303435313633333034222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227369642D46363844434341302D463741342D343444342D394534342D353641363832443837454341222069643D2242504D4E53686170655F7369642D46363844434341302D463741342D343444342D394534342D353641363832443837454341223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2232382E30222077696474683D2232382E302220783D223530342E37343130373732313432383638362220793D2237322E3035313034303435313633333036222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E53686170652062706D6E456C656D656E743D227369642D36393442374132412D393841442D343530442D383146452D313135424335363237354244222069643D2242504D4E53686170655F7369642D36393442374132412D393841442D343530442D383146452D313135424335363237354244223E0A20202020202020203C6F6D6764633A426F756E6473206865696768743D2232382E303030303030303030303030303134222077696474683D2232382E302220783D223432352E37343130373732313432383638362220793D223133352E30222F3E0A2020202020203C2F62706D6E64693A42504D4E53686170653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D30344339463239412D304242352D343639312D383034432D373634453445304132373136222069643D2242504D4E456467655F7369642D30344339463239412D304242352D343639312D383034432D373634453445304132373136223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E35343534343133313832323331342220793D223434382E37303337303636343732373932222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E35343534343133313832323331342220793D223439342E37303337303636343732373932222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223839342E353435343431333138323233322220793D223439342E37303337303636343732373932222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223839342E353435343431333138323233322220793D223235372E37303337303339393831383338222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D38344442433035362D303639312D343733452D383243462D443332354546373336413732222069643D2242504D4E456467655F7369642D38344442433035362D303639312D343733452D383243462D443332354546373336413732223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223330342E353930383639353736373134332220793D223234342E3131323833343432313436393437222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223337302E363430313837323338373936332220793D223234332E373938343439393138373537222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D41323335414337362D354242452D344133382D383243342D313045453831414638343635222069643D2242504D4E456467655F7369642D41323335414337362D354242452D344133382D383243342D313045453831414638343635223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223435392E333632383732303836303831372220793D2238362E3432393234353537393833383138222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223530342E373431333631313932383236322220793D2238362E3134303231303631373337343835222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D35313046453036322D433042432D343643382D394231372D384133383037324132424336222069643D2242504D4E456467655F7369642D35313046453036322D433042432D343643382D394231372D384133383037324132424336223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E393837353134343839383930352220793D223236332E32363136333038323635313634222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E36363730323138363333373736372220793D223336382E37303337303636343732373932222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D30443235384332342D314631392D343233332D413937362D413044384342394441454143222069643D2242504D4E456467655F7369642D30443235384332342D314631392D343233332D413937362D413044384342394441454143223E0A20202020202020203C6F6D6764693A776179706F696E7420783D2236302E302220793D223234332E37303337303339393831383338222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223132302E302220793D223234332E37303337303339393831383338222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D34454238313431392D314141372D343937452D413545452D453541454631374335453042222069643D2242504D4E456467655F7369642D34454238313431392D314141372D343937452D413545452D453541454631374335453042223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223337342E37343130373732313432383638362220793D2238362E3236373439303636383038333235222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223432302E31353431323036393235343737342220793D2238362E3436343038333932393839333932222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D33334642463234452D464537302D343730412D394442352D394231383831453133383437222069643D2242504D4E456467655F7369642D33334642463234452D464537302D343730412D394442352D394231383831453133383437223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223631302E3039303838323633363434362220793D223234332E3834353738353439363831313337222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223731352E393838343436343031363631392220793D223234342E3134363730393038313632323632222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D34373638373538312D333535422D343335342D383433432D433330343233333238364146222069643D2242504D4E456467655F7369642D34373638373538312D333535422D343335342D383433432D433330343233333238364146223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223735352E313035353637393030353031362220793D223234342E3134333537373431353930353333222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223838302E3534353531303937373036392220793D223234332E3734373836373831363239343733222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D44413934353339452D463639342D343041312D424534412D424343433144394244313144222069643D2242504D4E456467655F7369642D44413934353339452D463639342D343041312D424534412D424343433144394244313144223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223434302E303837373235313633333532342220793D223130352E3730343339323530323536373534222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223433392E383533313635313630393039322220793D223133352E3030303434383731313033393938222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D30443039333043392D394241312D344636382D383545412D333834453136423430394130222069643D2242504D4E456467655F7369642D30443039333043392D394241312D344636382D383545412D333834453136423430394130223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223238342E32343236393939353539333433372220793D223232342E34363130303430343232343934222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223139332E34393435373938303736303230372220793D223137322E3130323038303930333236363038222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D37463032463244352D413642412D343233342D413732342D334638393844323335413442222069643D2242504D4E456467655F7369642D37463032463244352D413642412D343233342D413732342D334638393844323335413442223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E35343534343133313832323331342220793D223137322E3130323038303930333236363038222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223339302E353435343431333138323233312220793D223232332E3730333730333939383138333738222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D39394343413337462D413233352D343835332D383437322D444532333341443245443332222069643D2242504D4E456467655F7369642D39394343413337462D413233352D343835332D383437322D444532333341443245443332223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223334302E3534353434313331383232332220793D223430382E37303337303636343732373933222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223136392E39393939393939393939393939372220793D223430382E37303337303636343732373933222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223136392E39393939393939393939393939372220793D223238332E37303337303339393831383338222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D46423539344242452D383030352D344544432D423343382D393738314544323236433935222069643D2242504D4E456467655F7369642D46423539344242452D383030352D344544432D423343382D393738314544323236433935223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223733362E303435343431333138323233312220793D223236332E32303337303339393831383338222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223733362E303435343431333138323233312220793D223430382E37303337303636343732373932222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223434302E35343534343133313832323332352220793D223430382E3730333730363634373237393236222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D41453541454438342D303734362D343738372D393836462D364137393237433334433334222069643D2242504D4E456467655F7369642D41453541454438342D303734362D343738372D393836462D364137393237433334433334223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223431302E31303138303630343037373735352220793D223234342E3134373333393237353632393338222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223531302E30393038383236333634343631372220793D223234332E3835313539323539373636343134222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D30413541464638362D414541342D343231322D423146342D393237354134343036433244222069643D2242504D4E456467655F7369642D30413541464638362D414541342D343231322D423146342D393237354134343036433244223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223231392E39393939393939393939393939342220793D223234332E393230313534323134363334222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223236352E343133303433343738323630382220793D223234342E31313637343734373634343437222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A2020202020203C62706D6E64693A42504D4E456467652062706D6E456C656D656E743D227369642D33453941414432332D343444412D344138352D383242442D443643383330413443343938222069643D2242504D4E456467655F7369642D33453941414432332D343444412D344138352D383242442D443643383330413443343938223E0A20202020202020203C6F6D6764693A776179706F696E7420783D223233332E32353935393536373832393732352220793D2238362E3035313034303435313633333034222F3E0A20202020202020203C6F6D6764693A776179706F696E7420783D223237342E37343130373732313432383638362220793D2238362E3035313034303435313633333034222F3E0A2020202020203C2F62706D6E64693A42504D4E456467653E0A202020203C2F62706D6E64693A42504D4E506C616E653E0A20203C2F62706D6E64693A42504D4E4469616772616D3E0A3C2F646566696E6974696F6E733E,
+		0);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302554', 1, '请假流程.process_leave.png', '302552',
+		0x89504E470D0A1A0A0000000D4948445200000396000001F80806000000316A727D000062194944415478DAECDD097C54D5FDFF7F5CEBBFF5E752BF55DBAAB5D65A977EADD6B57611BFB5162B5AA424933B4920ECC862485804110822A8280209680111152C8A451414902433804650401417108CB2C85264515C5204BDFFF3B9B967B8339949662699C9CCDCD7D3C779CC649604CFDC39E7BCEF39F7DE162D80CC77FCB5D75E3BFBDC73CFFD5ADD3729140A8542698A72D65967FDF7861B6E582CFD0C5D2D0000191E2ACF38E38C8D37DD74D3772B57AE346B6A6A4C00001AEBE0C183E63BEFBC63B66BD7CE3CEDB4D33E215C020090C18E3BEEB87B6EBCF1C6830C81000089D2B66DDB43279D74D2787A5D00003237586E90994A00001265DDBA75E6F1C71FBF9D5E170080CCC5F257004042C9B2D816B5C75D0200804C0D960000241AC112000082250000044B0000D03CC1D21E48983939398CAA0080600900000896F10F26CE38E38C3A8FB76FDF3E103C8F39E618F3B2CB2E33DF7BEF3D465F0040B004000004CBE882A5F3B96FBFFDD6BCF3CE3BCD162CCD050082250000C8DC60F9AF7FFDCB3CFBECB3CDA38E3A2A30D328BA74E962DDBFFEFAEBCD03070E043DA70713BD7AF5322FB8E002EB7E595959D860D9AF5FBFC0FB9CBFE7D1471F0DFA9DBB76ED32FFF18F7F041EEBD3A78FF57AEDF3CF3F37F3F2F202CFCF9D3B37F09CBCF7C61B6F0C3C273F37F4FFD7D07300008225000004CBD806050DCE4ACE9E3DDBFAF98D37DE087A9F84C701030604FD8E9FFCE42781E72FBAE822F3EDB7DF0EFB3777EFDE5DE731B94C8A04C3D07F57B76EDDAC9FB76FDF6E85CAD090AB7F1E3D7A74C4E762F97F0700102C0100205846E9934F3E092C579599BB2D5BB6840D963ACC39836568E80CF7BE480391534F3DB5CE63575E7965E0E770BFF357BFFA55D8DF77CD35D70442626858ACEFFFAFBEE70000044B00000896718834DB27B392F7DC738F757FD5AA557566FB64D96AACC1F2C4134F0C3B7B2817DC9665AFA101512F83DDBB77AFF5FC934F3E19F6DF2925D2C98242FFFFA27D0E0040B004008060598F9B6EBA2910CC4E3FFD7473E6CC9981E72444EAE7E4184A67D8935B79AD7EACBABADA7ADC7956D82FBEF822E86FC9CFA1338BFA384A59FE7AEBADB7061E2F2C2CB496C53A67175BB66C59E7EF899D3B779A7FFDEB5F03CF2D5BB62CAAFFBFFA9E0300102C01002058020040B0040000044B0000C1120000102C0100044B000040B004008060090000C112000082250000205802000896000080600900205802000082250000044B000008960000102C010000C1120040B0040000044B0000C1120000102C0100044B000040B0040080600900000896000082250000205802000896000080600900205802000082250000044B000040B00400102C010000C1120040B0040000044B0000C1120000102C01002058020040B004008060090000089600008225000020580200089600008060090000C112000082250000044B000040B00400102C010000C1120040B0040000044B0000C19260090000C11200008225000020580200089600008060999E0EAAFFE67C38C79C5F35DF5C5CB1D82C2F2FA724B1489D2F5CBAD07C7FC3FB6C8C00C1120000102CD39384CA05CB169853374F35C7EF1D4F69863279EB64F365FFCBE6860D1BD82001822500002058A61F99A92454A646B8ACACAC648304089600008060997E642926C12E358A2C8D0540B004000004CBB42361865047B004089600008060898407CB29DBC79A152B869A2BCB075945EECB630442822540B0040000044B826514A1F24173F5A281E6DB2F0D082AF2983C4728245802044B000040B02458D65BE6BD35A24EA8D465FE5B77130A099600C1120000102C0996F5079EE5958323064B798E5048B00408960000806049B0ACB7AC5C7C47C46029CF110A099600C1120000102C0996044B822540B0040000044B243058960F8A1C2CD5738442822540B0040000044B8265BD65D9B2211183A53C4728245802044B000040B02458D65B6654DF67AE7AB9EE7258794C9E2314122C01822500002058122C1B0E3D2B86D50996F21881906009102C010000C19260D960E099B067BCB9E4D5BBEA044B794C9E2314122C01822500002058122C239629DB1F6CF0184B790DC1906009102C010000C1926059679672CE7BF7986B160E8C182A7591D7C86B99BD245802044B000040B0245846354BC9EC25C11220580200008225EA0D96D1CC52D6377B4948245836C6A64D9BA804102C010000C132DD8365BCA152174222C1325E23478EB406F9720B102C010000C1328D83258560D91CEEBFFF7EF388238E302FBDF452EB76D8B0617C4141B0040000044B82258560195BA8D46152662C8F3CF248C22508960000806049B0A4102C630F950D3D0E102C010000C1926049215806C8CC647DE1513FCF31972058020080B409969B376F3667CE9C698E1E3DDAECD3A78F59505060E6E4E498F9F9F966CF9E3DCDE1C3879B53A74E353FFEF86382258560D944A1B2A1D0C8CC6578D5D5D5E6B871E3ACB6292F2FCF340CC36AAFA4E4E6E69A3D7AF430C78C1963BD0E044B0000089649307FFE7CB3A4A4C4ECDBB7AF3979F26473C58A15E6B66DDBCC9A9A1AEB79B9DDB56B97B97AF56AF389279EB05E77C71D77984F3EF924C19242B06CC4F2D7686722637D7D269B356B96D9A54B9740888CA674EEDCD99C366D1A099260090000C13211366CD86005CA01030658A1F1D0A14351BFF7ADB7DE32EFBCF34E2B64AE5DBB9660492158C6182A639D81747BB85CBF7EBDD9B56BD798026568E9D8B1635AB757044B00009072C172EEDCB9D6523199AD8C2550865AB4689135D84BD7D94B8225C1321D42A5DB97C54E9F3E3D68A9AB5EEE7AEFBDF79A3E9FCFDCB2658BB97FFF7EEBB55F7DF595B5E2A2AAAACA5A2A2B4BF99DEF93DFC3EC25C11200008265138529398652662C9BC2A64D9BCC5EBD7A998F3EFA28C19242B08CA0A113F524FBF7A48BD9B367D70994722CB82CCF8FC6BE7DFBACD7CBFB9CBFE7E1871F2651122C01002058C66BCE9C3956A88C7650162DF97D72120D99592058520896E1C360532D6375CBCCA5B427CE30585C5C6CCD4EC643DE27CBFE9DBF8F994B8225000004CB387CF0C10766F7EEDD9B6CA632DCCC65A74E9DCC356BD6102C2904CB9010A843E5B7DF7E6B9D7C466E6311FABE4C3FE6528EA9742E7F95B352EBE5AEF19265B2A3468D0A5A169B4EED15C1120000A444B01C326488754C6522C9319772EC26C19242B0AC3BB328A1F0BCF3CEB306F2721B6DB88CF4BE4C0E97CE33BFCA4C656343A5335C3A672EE5843E044B8225000004CB283DFFFCF3D660EA9B6FBE49F820A5A8A8286D9698112C0996C90A953A2CD983F8A8C3A53354EAD2AD5BB73ACB6C336959AC5C52C4794C65BCCB5FEB5B16EB3CE6D2ED4B6209960000102CA376D75D775997144906399DFF6DB7DD46B0A4B83658460A7BE142627DE132DAD767DA3197CED94A39F14EA2C3ABDB672D09960000102CA3F2F1C71F5B27EC69CC65456225CB61E518A9E61E9C2E5EBC986049B04CE836142954465A9E1A6D588C3584A6CBB2D886EAB4BABA3A68B672CF9E3D09F977C8D9629D972269EEF68A60090000523E58CA6540927D2990C71E7BCC1C33664CB30E96F4805106B2959595044B826542B6A178C25D43A131D650E9FCFB471E79644ACF5C3654A772ED49FD9A44B721C9FC5B044B000090F6C1B2A4A4C45CB1624552072AB2EC562E3F920A03585DBA76ED5A67A6846049B06CEC3614EF72D448E1F1E0C1837185CA8696E1A64B9D4ABBA19F5BB2644942FF2D55555581BF2567CC265802000082653DE478C71D3B762475A022D7B5CCCBCB4BA901AC73A6440F64099604CBC66E43F184CAFAC2E5B1C71E1B77A86CECBF2715EA54DA0DFD58539FB427D4B66DDB027FCBEBF5122C010000C1B23EEDDBB7376B6A6A923A5091BF27D7884BC501AC73A6846049B06CEC3624A531212E5CB86C4CA88C75596EAAD5A9B334D5254622914B8F38FF1EC1120000102C1B18C8A5FA00B2B90AC132F582653A6C37BAB46DDBD61A94FFEA57BF6AD4774596BF86CE54CACFF278635C7AE9A5D6EF4AA73A4D76D02358122C010020584649CE7CC88CE5E1D2A1430773F6ECD9E6810307121A2C4BDE29317BCFEF1DF8593ED39B87DF1CF6B5BD5EE8653DFFD0AE87CC1E737A98577AAF34BB3DD3CDBCA8D545E655B95735E9BF4BFECEADA36E6DF0357F2EFCB375BFD3139DCC71BBC7051EEF30AD83EB672C9DDB5043678165C632B63A65C69260090000523458CA49299AE3184BB954402A0D609D61404BF48CA57C8EFD7CFDCC31DBC658F78B2B8B23BEAEEDBD6DAD60A9439C7EFC86FE37047E1EFDD168F3BC6BCFB342A704BC9F5FF973F3B27697593FEB30DA7E6A7BF398E38E09BCA7EFCB7D839E3FF1F413CD5F5CF30BEBBE942E4F75314F39FB943AFF1EEF246FE0BEFC4E7D5F82A65B8365B86D88632C6BF52DF599031F596A8E98FE5AC432FFB56AEB755D074D8858A71C6349B0040000291A2C070E1C98F4B3C22E5FBEBCD9CFB2A8078C050505D6C5D043C3402283E5909543ACC076FC8F8EB7C2DBD1DF3BDAFAF9F4F34FB702A4F3B55D67750DCC6CCAE7FE97E2BF04EEFFE6E6DFD4F9DD123EE53999D9D4AFCB7D24D7BA95F02881F3E4334E0E0A89CE30283FB71EDA3AF0F351C71C1508AF23DE1B61FD7BE535E7FEE15C2B50CAFDA16F0E0DBC77F0EB83ADDB760FB4734DB0AC6F1B8A778630D3CE0A2B81F1B197DE89EA753D4A1E0BAAD39D7BBF32074F5E6695821EFD382B2CC1120000A462B02C2B2B33A74E9D9AD481CAA449939AFDBA7091669792112C7BCEED6905B6D0C78F3BE138F3E2D617077ED6214D42A7737652EECBEF904028F70B1716D699519400A8EF4B9095DB82E905E6A80F4759F7477E30D27A7EECCEB1E6ED2FDD1E98A194E7AECEBFDABA2FC155C268B81954E78CE509A79E1058AE2BB39B320BEA8619CB68B6A178660A13751DCB279F7CB2D9AE632981F1AD8DFF3117BCFE719D59CA992FBF673DBF7EF3EEDA99CD092FD6A953FDFFD66D7019D7B12458020080540C96D5D5D5668F1E3DCC43870E256DA0D2B1634773FDFAF5293FA06AEE60294B64255CCA72D9332F39D30A88F21AF959BFE6EE75775B033F99D97C60C703817028C12F6B6C9675BFF38CCE11672C753894D7848652F977CADF0B172C65C672E02B0303CB79F5E3F237DDB214361E0DCD18461B1A630D973AD40E1A34A859FEBF75B03C70E06083AF1B3AEDD5C0CF4BDEDC6C963CF69A552484DEFEE03CD330BC56D893E5F47BF6EC49C8BF77DFBE7DD6F1E73A58A6437B45B0040000CD1A2C459F3E7DCCD5AB57276590F2C61B6F58C1321D243258CA67F8872E7FB0C29E3EBE511EBBAED7757596CDCA73121A25C8C971987A76512FA3D5B3877A06527E8FCC20EAB0A7672965C6529E1FF6F6B03A41F19CABCFA9336329C75B86CEA0CA497BE4354699113694BAE918CB78459AB98C352C46FBFAE60E953A30CEF6AD0FDC1FFCCF6541C7554E7B716DD860596307D1E232BF39C87E4FFBAE7D02816FE6CC9909F9F7CA325CFD37D2A5BD2258020080660F9632882A2C2C4CCAACA51CAB346DDA345707CBBB56DD65151DC66E1A7293755F02DF3D1BEEA913FAA41495175927EE9163281B0A71CE594709983A30CA6CE505D75F5067796BB4C1524E0E2467B36D11B2D4D6192CF5F2DDD0FF0F8265DD99CBD065A95DBA748979796BB870D9AD5BB7A867489B2B58FE7BC90741CFE9E32F438365B8F73B439FCC5A36F5497CE4F7C9EFD57F235DDA2B8225000068F660691DBBA406A32FBCF042420728322094BDFFD11E939689C1528E6D94B0274B5B5BDED6D29A89D4414C429B2C91BDA6C33575DE27814DCEF81AE9A43BCEF2FD93BE6FFD7E39D6517EBF7EBDCC58469A410D174AE5A43C3A00D7778CA5FCDBF4B25839C18F044DE7D96B0996F52F8BD527F47186C4584EC813E97DA97449918682E553E5EB1A0C96FD27F9AD194E6BD6B24BAF40F02B2E2E6EB24B8FC82546060C1810345B992EED15C1120000A444B0946388E44C8C1B366C48C8E0E4A38F3EB26601D6AC59933603AAA60E96F76FBD3F705911097F57E45C11F4BCF3B21DCEE327E56CB112D89CD7B094C72FF9FB2581FB1222F56CE2A9E79E6A2D7F9520AA2F3FD2C23EC652DF9713023534DB195A6419AD5E6A9B3F393F68465582A4DCDE38F8C63A9741215846BF2C5642A1ECE489F51222A1EF6BECF533131D2CFB4D5A12B414564EEA134BB01C5CF6A269E41E3E0672F8F0E18D0E97122A478D1A15F89D72ADDD746AAF08960000202582A5983E7DBAB51C4FAE33D99476EEDC699D0823DD969425F23A9672B21D1DCAE458CBDF77FA7D60F62FD27BA2990594E017CBEB63099652F4196A9D27EC719E4C285125538365B870998865B6A9162C9F5BB631E8B97FBEF076BDC1B272F516EBB223424268F1C425567BE5BC8EA8CC5CC6BB2C56DEE79CA964092CC11200008265234D9E3CD9ECD4A993F9C1071F34C9EFDBB871A3152A478F1E9D7603AA44064B0AC13211E1B2A9436A22826543AF0B0D96CF541C0EA4231F7F2D70FFAEA9AF5AED554E8E1174CCA59CD047CEEA1A0D799D2CD1771E5329251DDB2B8225000048A960A9672EF3F2F2CC7FFFFBDF8D3AA18F0CD8BC5EAF35F84B47044B8265323576F96AAA2D7F0D0D8C53E7BD1DF6B9CFBF3A600E7C64A9351329AF9BF8DCE1E5A79B77EEB71E7B7FD39EA06331777F5E1358F6DB7DD894A070A903A65C7B72C99225D66CA45E262BCB5DB76DDB6656555599A5A5A5D6F27FE7FB64F96BBAB657044B00009072C152C831975DBB76B5CEE2BA6AD5AA98DEBB62C50AEB782F39F1453A1FA344B024583657B88C75C631954ED41329583E5DB92EE2F3727D4B798D94D0F7C9352CAD1D5E0BDE09BC46CAE819CBCD11D3ABACFBABDF7EC75AC6EF0C89B196746FAF08960000202583A53663C60C6BC0267BF6EFBBEF3EF395575E313FF9E413B3A6A6C67AFEEBAFBF3677ECD861CD003CF8E08366FBF6EDAD019AECF54FF7B329122C0996E9B02C365597BF3607DD5EC51A2833A1BD2258020080940E965A7575B53976EC58B367CF9E758E4792E5AE32B3294BCF64A63353102C0996A91E2E9F7CF249EB7583060D2201B9BCBD2258020080B408966E44B02458A6C2B2D848CB5BF5D95F099520580200008225C19242B08C79E692E5AF20580200008225C19242B08C3B5C122A41B0040000044B822585601977B8BCF4D24B099520580200008225C19242B08C8F1C5329DF7D39010D40B0040000044B8225856019974D9B36112C41B0040000044B82258560D938044B102C010000C19260492158122C41B0040000044B8225856049B004C1120000102C41B02458122C0182250000044B102C0996044B80600900000896044B0AC1926009822500002058122C29044B8225089600008060098225C1926009102C01002058826049B0245802044B000040B02458520896044B102C010000C19260492158122C41B0040000044B102C0996044B8060090000C112044B8225C11220580200008225C19242B0245882600900000896044B0AC13211C1B262E52673C4F42ABBBC6695F9AF55078AF3B1BEA53EB3A8D41FF43BE4B1818F2C0DBC2E5CD1EF7D70D6CA7AFF3D2BDEDD6EBD6EE7DEAFF87008960000806089508B2B1613EA089629192C6B0E1C0CFB9C04BCFE939634F83BE4758FBDF44E54AF1B3AEDD5A0C724400E9EBCCC2ACE007AD7D4576BEF97F9AC9F41B0040000044B280B972D34A76E9E4AB06BE6327BD36CB3B2B2920DB281A5B095ABB758816EC99B9BA30A8C6F6DFC8FB9E0F58FEBCC52CE7CF93DEBF9F59B775BB7231F7FADCEFBBFFDF6DBC0EFF9E70B6F5BF73FDCBAD7FA79F11B9B825E03822500002058BADAC6EA8DE6CBFE970997CD1C2A2B2A2BCC0D1B36B8721BECDEBDBB1524EB2B1D3A74300F1C386885BA6897A4EA607920C2CC67A4194B09AD258FBD66153D3B59A45EA3672D6569AE5E8E2B3F1797F9694808960000806089EAEA6AD3E7F3594B3129C92F3253E9D65029962D5BD660B09C3D7B7660E650CF34F69FE437EF7BEAF57A03E36CDFFAC0FDC1FF0C5ED63AEDC5B56183A55E822B817190FD9ED019CF221536CBFEFD268D07C1120000102C01A48AAE5DBB460C95050505E6538BDFB102608D3D6B39755EEDD254098EF2F3FB9BF634182CFFBDE483A0E7F4F197E18EB10C7D7FB8E7E4F84B102C010000C112401ACC5A8E7A648E15E4F67D511308753A580A39DE511E7BE05F6FC4142C9F2A5FD760B0945951E719689D339EF7CE5CC10747B0040000044B00A924DCB19685E3CBCD810F2FA913F89CC152CC78F9DD3A3397A1C1B2DFA42541C1504EEA43B004C11200008225800C9DB5340CAF15DE463D32376CE00B0D96424ED453DF8CE573CB36063DA7CFF41A2958CA1968F549822484164F3C1C70E5ECB09FECFA920F8D60090000089600524D8F1E3D42CE047B206CB0D4A1B03EF51D2319FABAD060F94CC5E140AA2F45A2AF63293EFFEA8039EFD50FADC70898044B000040B0049042E40CB93A583EF7DC731183E023CFBF1555600C37B3A983E1C047965A3391F2BA89CFAD093CB779E7FEC0B25AE7B198BB3FAF09BAB6A5044A799FDC07C1120000102C01A4107DAC65B8D9CA5867229FAE5C17F179E7753143DF27D7B014D317BC13788D94D133965BD7B194FB124EE577481005C1120000102C013413B986EAB871E3CC9E3D7B9A797979A661188119CBDCDC5C6B69EC983163ACD701044B000040B00410306BD62CB34B972E112F3112AE74EEDCD99C366D1A9507822500002058026EB67EFD7AB36BD7AE3105CAD0D2B1634773EDDAB5542608960000806009B8CDF4E9D38396BAEAE5AEF7DE7BAFE9F3F9CC2D5BB698FBF7D71EAFF8D5575F99DBB66D33ABAAAAACA5B2F9F9F941EF93DFC3EC2508960000806009B8C8ECD9B3EB04CA9933679ABB76ED8AEAFDFBF6EDB35E2FEF73FE9E871F7E98CA05C1120000102C0137CC543AC3607171B1353B190F79DF800103827E1F33972058020000822590C1E4984AE7F2D7E1C3870796BBC64B96C98E1A352A6859EC9A356BA86C102C010000C112C844CE33BFCA4C656343A5335C3A672EE5843E00C1120000102C810C239714711E5319EFF2D748E4F7398FB964492C0896000080600964F06CA59C7827D1E195594B102C010000C112C820D5D5D541B3957BF6EC49C8DF91B3C53A2F4522C77402044B000040B00432805C7B5287BD3163C664CCDF02C1120000102C012449CF9E3D03616FC9922509FD5B55555581BFD5BD7B772A1F044B000040B00432415E5E5E20EC35F5497B426DDBB62DF0B7BC5E2F950F8225000020580299C079EDCAA6BAC4482472E911FDB7A400044B000040B0043240B2831EC112044B000040B00498B164C612044B000040B0047018C75882600900000896001A85B3C282600900000896001A85EB5882600900000896001AA5BABA3A10F6727373CD3D7BF624E4EFECDBB7CFCCCFCF0FFCADF5EBD753F9205802000082259029BA74E912087C3367CE4CC8DF98356B56E06F74ECD8914A07C1120000102C814CE20C7D326BD9D427F191DF27BF57FF8D69D3A651E92058020000822590693A77EE1C087EC5C5C54D76E911B9C4C880010382662B0F1C3840858360090000089640A691631E9DD7B41C3E7C78A3C3A584CA51A346057EA7FCFE356BD650D92058020000822590A9A64F9F1E08817AE632DE65B1F23EE74C254B6041B0040000044BC025264F9E1C1406E5D84839A18F9CD5351AF23A3966D3794CA594D1A34753B920580200008225E0D6994B1D30E5DA934B962CB16623F5325959EEBA6DDB36B3AAAACA2C2D2D350B0A0A82DE27CB5F25AC02044B000040B0045C468EB9745E86249E2227EAE1984A102C010000C11270B9193366C41C302550CA2C25677F05C1120000102C01045457579B63C78E357BF6EC59E7F849AFD76B76EFDEDD5A2A2B339D00C1120000102C0100044B000040B00400102C010000C1120000822500006E0A963535358C7800000973F0E0418225000099EC88238E78F7F5D75FFF8A610F002051DE7FFFFDFF1E75D4511FD1EB020090B94A2EBCF0C2F719F6000012E5D24B2F7D57F537F7D2E5020090B98E5765E5CF7EF6B355555555DB65B91200008D25FDC9DAB56B3FF9F5AF7FBD46F533EBECFE0600006478B82CB13B7E9342A1345CE41A90D40385527F39E288233E54B70F102A01000050AFACACACE355C87A4095831E8FE72B757BBB1BFEBFED6009000000008857CB962D8F360CA3AF0A585B2564D9658F7AEA08822500000000A0A150D54E95771C815297675C5407044B0000000088555656D6B92A50CD0F132875E94FB00400000000846518469E1C47594FA8945240B00400000000D417A66409ECC79182A5C7E3B99A600900000000A8574141C1499196C3CA1962099600000000806883D50C550E3882658DCBFEFF099600000000102FFB243E9FCAD257C330CAED60B99260090000000068504949C9912A542D53E576FD980A98EAC79CE9044B00000000408354882C9460A9EE1EE17CBC65CB9647132C0100000000F5722C81FD85DBEB82600900000000310AB70496600900000000885AA425B0044B00000000408358024BB00400000080B8B104966009000000008DC21258822500000000C48D25B0044B00000000881B4B60099600000000D0282C8125580200000040DC58024BB00400000080B8B104966009000000008DC21258822500000000C48D25B0044B00000000881B4B60099600000000D0282C8125580200000040DC58024BB00400000080B8B104966009000000008DC21258822500000000C48D25B0044B000000348112B3E4E899EB673E3BEFB579DF2EAE586C969797539258A4CE172E59B87BB17F711E5B6392B77D96C0122C41BF40BF000040D390C1C382650BCCA99BA79AE3F78EA7344399BC75B2B968C9A2CF2B2A2ADAB145264FE812D8BEA53EB3B0D4B7BC7082EFA948A56F99BF8DF5BA09BE87EAFBDD85E37D57C9EBFA942EFB11C112F40B14FA050040C6933DD20C1E9ABF4CD932E5407979F93AB6C8E408B704D60E960DCE5ECAEB5479DEF99804C8BE65BEA5529C01B46FA97F817DFF4B553E2358827E8142BF0000C848B2E4860E3C358A1A401C648B4CBC484B60AD6039BEE2E2C289FED6A1B39445137CDDE4F9E28915E7C96DD184CA19E17EEFE180EABF43EE178DAB38A7F6F5FE56CED7102C41BF40A15F00006414399E83CE3B6506100CD49320D2596075B02C29997D6C7DEF0F9DB12C9E50715D51A97FB6147B76727F51A96F6F60D96C59E52CEB7E6016D3B7956009FA050AFD0200C095038829DBC79A152B869A2BCB075945EECB6374FC0C20D2497D6781B542DF84CA7C4778F4072F6BADEC1B2E58964CF71F673FBE4D05CAAA70C7651696FA76A8E0393293EA926049BF40BF40BF0000404C038829DB1F34572F1A68BEFDD280A0228FC97374FE0C20D241436781AD1B2C2B0DE773FAF8CB70C75886BE3FCC739FC9F197044BD02F50E8170000AE1D40CC7B6B449DC1832EF3DFBA9BCE9F01445A88B40436EA6059E6EFDC60B02CAD5C6BCD50863993AC0A96930996A05FA0D02F00005C3B80585E3938E200429EA3F3670091EAEA5B021B3958FAD6075D6264A2BF35C1926049BF40BF40BF0000409C0388958BEF88388090E7E8FC1940A4B28696C0460A9685657E8FF3397DA6D748C1B2A8D47FBDBE6EA584501524AB03CFC9D961C72DFB31C112F40B14FA050000030806100C20D250434B60C305CB065F17122C8B26F83BE8E7F4A548F4752CE57ECF49FEE3D5CF6DADC7322460122CE917E817E8170000886D00513E28F200423D47E7CF00225545B304362458F60FF79C04C3A252DF2A6B26D25AD6EA1FAE9F2B9EB4F44C79AC5F99FF7CE7B198B73DFCCAC9CE6B5B4AA094F7C9FD340C91F32548365056B2C5D12FD02FD02F00001840442CCB960D89388090E7E8FC1940A4A26897C03A8365515965C7C8BF6FF6B1F66CA559E77DA5FED972BFB0B4B2B77E8D7526D8D2CAA9D6752CD5CF124EE57748104DC36079B92A07EB0B962ABCB766ABA35FA05FA05F0000308088586654DF67AE7AB9EEB227794C9EA3F36700918AA25D028BA8C3E5C27A82E5F2962D5B1E4D2DD12FD02FD02F00001840D4DFB9AD18566700218FD1F133804845B12C8145D4C1F2F248C1D2308C36D410FD02FD02FD0200800144BD65C29EF1E69257EFAA338090C7E4393A7F0610A924D625B088295C863BD67225B395F40BF40BF40B00000610F5766A53B63FD8E0B134F21A06000C2052054B60131A2CEB1C6BC9B195F40BF40BF40B0000441C40C81EE739EFDD63AE593830E2E04117798DBC96BDD40C209A1B4B609312DCE7325B49BF40BF40BF00004083038886F646B3979A01442A62096CD282E5D58E632B5B5123F40BF40BF40B0000841D4044B337BABEBDD40C06184034C2498D083C2C814D92ECECEC45122C99ADA45FA05FA05F406AF585009052038878070FBA30186000112799FD32EDDB98B00436B99FD30F7FF8436BC692AAA05FA05FA05F40EAF48500907203080A03886670BD2AFB541967DF467D421896C036CFE764074B4EDC43BF40A15F400AF48500C00082C200E27047AA3B50D94BFB69B41D2A4B60D3E37302FD02857E01B4B100184050184024AB236DE8F1202C814D8FCF09F40B14FA05D0C60260004161009128AD1AE830F5F3618F3361096C7A7C4EA05FA0D02F803616480BB9B9B967783C9EDE1D3A7498979797B7C9EBF57E6D9F0AFFBFEAFE16FB9A6BFDE575D4160308061029D79136D45146DC5BCB12D8F4F89C40BF40A15F006D2C523743A9B1D4B3AA6C54E50B3B43D5A8F2B1AB329461186DBA75EBB6B27BF7EE9F959696EE5DB16285B96DDB36B3A6A6C61472BB6BD72E73F9F2E55BC78E1DFB8E0A9E9FA8CAF1ABF7E5B12931806000D1ACAE8F71EF6B9DD7B304363D3E27D02F50E817401B8BD4CB50AA94DB01D28CB264668652FF6367AB30F97A6161E197AB57AF360F1D3A64464B85CC759D3B77DEA07EC72B323065D36200C100A2D93AD2D671BCEF0BE95059029B1E9F135548BF40A15F006D2C522B43A9B230863019AE644E862A2828C8EFD4A9D3D7F3E6CDFB36964019EAA9A79E7A43A5EE9DCC5E3280600091161D69D0FBAFBDF6DA292C814DFDCFA9054BB6E81728F40BA08D454AF0783C39B2D2CB1912737373CD7BEFBDD7F4F97CE6962D5BCCFDFBF75B39E9ABAFBEB2568156555599E3C68D33F3F3F343C3E517699FA1EEBCF3CE82DB6EBBEDC0860D1BCCA6F0E1871F7E9C9797F789AA982E0C20E8BC1940245C43272788CAF7BFFFFDBFDF72CB2DDF9E75D6595DE92652F7736AC2DF03FA05FA05D0C6D2C6A271A1B2B50A83079D8172E6CC99D62183D1D8B76F9FF57A799F3360A66D86EAD7AF5F4FE59B682B205A3B77EEDC61874BD7CE5C3280600091C48EB44996EEA87079131D6AEA7F4E2DD8AB4EBF40A15F006D2C9A3B54E63843657171B1353B190F79DF80010342C3657A65A86EDDBAFDA26BD7AEDF34D54C65B8994B7B59ECF90C20280C209A5CE8C90664F96A8716B12F630D7D1F2731E07302FD02FD026863696311817D4C6560F9EBF0E1C303CB5DE325CB64478D1A15BA2C367D3254BF7EFD3E9A3F7FBE9948D3A74FAF908351194050184024A4236DEDE810A7A962DAB7D176A891DE4787CAE704FA05FA05D0C6D2C6220CFBCCAF8199CAC6864A67B80C99B94C8F0C3562C488DBFAF7EFFFDD37DF7C63265AFBF6EDD7B971492C0308061049EA485BD87B594D4789A6437576A4BAB4773CCF71267C4EA05FA05F006D2C6D2C8243651BE73195F12E7FAD6F59ACF398CBB4C85083060DDA2E97144986575F7D75A91B672D194030804880481D5CB88EB1BE0E35DCEB1F0DF37A8E33E17302FD02FD026863696371385806662BE5C43B89306BD6ACF499B57CFAE9A7AFE8DDBBF7778DB9AC48ACF2F2F236C97A6406101406108DEE485BC5D04186EB50A3ED48433B549602F139817E817E01B4B170ADDCDCDC33F4097B645671CF9E3D09C94D72B6D8904B91A46E862A2B2B7BFAD1471F3593E99E7BEE91632DFB67CA9E0A55FEC000820144A2B7A1383AB4863AD4583B52E7DFFFD46D7B6BF99C40BF40BF00DA58DA58B649CDE3F1F4D6616FCC983109CD4E729D4B47B04CDD0C3562C4882D2B56AC486AB0F4F97CAFAA4A999F091B9D63CD73B9DAC0AE6600C1002251DB5048471A6D4716A9433D32CE8E34742FB16B3A543E27D02FD02F80369636966DD2F1FCB3FA354B962C496876AAAAAA7206CBD4CD507DFAF439B063C78EA4064BF5F76429ECD64CDAE81C6561B8BD1B0C20184034761B6A11FF711DE13AD40F1AD19136F6DF93D1DF753E27D02FD02F80361699BF4DAA9F37EAE79AFAA43DA1B66DDBE6FC77A46E86EAD0A1C377353535490D965F7FFDF56E55293519BAD105F66E38373E06100C201AB90D3576AF68B80EB5311D696887DACA851D0C9F13E817E817401B4B1BEBD26D52AE2DA91F6BAA4B8CD477E911C7BFA126A52BAD39C8DFCDE48DCEB97743A6CF1940308088771B6AD3A64D85DDE98D6BE49F3A32CCDED90FECC71B639CFDBB4E726307A34B565656C529A79CC2E784B4E817645BB83CFBF2A85FDFED996EE6A9E79E1AD3EFBF75D4AD0DBEE6CF857FB6EE777AA293396EF7B8C0E31DA6752058F2BDA12F44AAB7E58192ACECA44BCA565A41418199EC194BF5F70EC6F261654249F600A2D70BBDACC6F2A15D0F993DE6F430AFF45E690D0C2E6A75917955EE554D3E4049B70144BA6D3FD75E7BAD79ECB1C79A8DD81B5ADF5EDA582E1C1D712FADDBBED3F5153E274AB4A53983E579D79E17F639699FCFBEFC6CABE8BEE3C4D34FB48ADC9792FB48AEF53BEED9708FF59EBE2FF7B51E77BEFE17D7FC22F0FA2E4F75314F39FB943AFF06EF246FE07EFBA9ED03F7A59FA05FA0D01752D2A5306369EBD3A7CF37C93EC672E7CE9D3B32F8184B5D567A3C9ED62D5BB63C5A5E97EC60298D64DB7BDB5AC1528738FDF80DFD6F08FC3CFAA3D1D6E0423A7E09783FBFF2E7E665ED2E0B1A2048677FCC71C704DE9309038874DC86EC8EEB8B168939AE249E0ED5EDC758F23921ADFA85D036F9F81F1D1FF179E93B86BD3DCCBCE0FA0BEA04CBCE333A9BA79D775A9DDFE76CCBE5E7D6435B077E3EEA98A3027DCF88F74658BF475E73EE1FCEB5FA03B93FF4CDA181F70E7E7DB075DBEE8176CC58F2BDA18D454A6E93EAF6438EB10C317AF4E83DC93E2B6C5555D5864C3B2B6C3D0D608B640F20BACEEA6AF69EDF3BD041FFA5F82F81FBBFB9F937610710F29CCC6CEAD7E9BDD1121E25709E7CC6C90C209A791B0ADD2BDA888EF4D116E1CF84174B879AB267C22B2AADBCA1B0AC72965526F89E92D2B7CCDF4697A0C74A7DA62AFF71BE5F1E2B2CF52DD7AFD3A5FBD029A62E1D7A0E92F799A5CFAD7DBEBECFE9AABFB62F94D7F5295DF6233EA7C488F479398BFEACD5FD87EAFB5D85E37D5745F979A55DBF103A2329DBD2D1DF3BBADED74980FCDEF1DFAB132C7F70CA0FEAF42563778E356F7FE9F6C00E46F9FD57E75F6DDD97D74A5F122EDC3A77389E70EA0981D536B273527662B214D6D58378FA42DAE5266B9713B14D7256D8301E7DF4D105C9BE8EE5030F3CB02253AE63E9F890971B86D126420398B401840E69326BD8C2313B29F77BCEED690542B95FB8B0B04E072F03007D7FC8CA21D66DC1F40273D487A3ACFB233F18C900A219B7A138F68E36746DAE682F1C1DEAF216297CEDAE92E9FEE3227574AABC1B6587787B439F93FDFB9E77BE463ABEBE65BEA5523A0EFF57E52F2FB9F6CBDAD7F917D89DA8FCFC199F53930F606E8FE675F57D5EC13B1BEAFDBCD2AE5F082DFD7CFDACEDE8FB277D3F68454B68911D8A524283E54F7FFDD3B03B29E5774A180DED53A4EF39EE84E3C2BE5E76380E7C65A0755FFE5DFAF1ACB1591C63E9DE60495F48BBDCE4ED7222B649AE6319C6EBAFBF9ED5A74F1FF3D0A143490B96050505DB54A59C9D210D617D7BD4923E8018B36D8C152EA5833EF39233AD80281DBAEEB0A5DCBDEE6EABE19499CD07763C10088712FCA433D783831611662C194034CF3614E35ED2682FF81C6B87AA9720B549A7EF6951A9FF7AE9988A27545C17558738BEE2E2C289FED6417B58873CB87196AF7AA2F57B26569C27B745132A67D409B6252547EADFD3EEF6095297FBCEBBA46597DAD7FB5B395FC3E7D4440398309F970C408A26F8BAC5F2791596FAEFB0B6977115E744F8BCD2B25F88747CA5EC6094FBF52D87D5F7254C4AD127F291F785865279EC9CABCFA9B3C35102E9C5AD2F0EDA012AC7DCCB6B8C32236C9FE2F643245C1A2CE90B699713D62E27629BCCCDCD3D43BDC63A6F8CBA6FEED9B32721B969DFBE7D667E7EBE3358A676861A3162C4D7AB57AF4E4AA85CB366CD1E5521AFBAED4B96CC01848449E9CC25344A902BAE2C0ECC2E4A91E54F7AF650CF404A232A3388BA53D7B394326329CFCBB1360C20524EA4BDB5D176A4B176A8FAEFA555475A5232FB587BAF68544B69748728EF8B654FAB84561560674BB1F7AAEE2F2AF5EDBD216FD070796DC1F0994B034B726BDFBB95CFA9E906304DF5790596679555CE0AF379A56DBF10BA0C560E77D06DF02D77DF12F41A3984E1C21B2EB44AB893F7B4BAA395795DAFEB02AB5B62ED17E4D8FE92774AEAAC9471F60B7AF58D3E3910FD02E80B699793D12EC74A2E3DA203DFCC993313929D66CD9AE50C95AFA4FC06307DFAF43103060C48CAAC65F7EEDD3F561F421EC132B17BA3A5149517598308BDD7B9BE10E7ECE02560EA8181CC56CAC91B4297B732804819B2E72E74294E8716B15F9B2B5C87DA3E86BDC2A9DDC195FAEF08EC212DAB7C5FDD7FB8DE8E6E4265BEA3D3F3072FC7A9EC1BAE43D44B70D563DB544758E5DC4BDB71D853BE5F5E7AEDE7BDC72EDAAB3ACC917C4E4DFBF936F5E7A5DF5F58EADBE1F8BCD2BA5F70B6DDCEF67CD0F241412754D3E1538AF38CE20D1D63A957AC84EB53E498FABB56DDD5E02112D217E8552D126EA59FA86FA92EFD02E80B6997532058B6D1A14F662D9BFA243EF2FBE4F73AAEA1991E196AC89021FBE7CF9F9FD050F9FCF3CF6F97D9CA189739102C1B71BCA5F374F2F5054B39D64696CECAB18E32D3A95F2F3396E15ECF0022E53A54E7490C9C1D632C177C8EF4BEB4BDF07351596547E9B8A4B3B23B3AEBB804E9F0E4E77E65FEF31BEE102B8DE0905A7BDC48B8634342DF1FFA39DD36E6C5EFBA8F7EEE1D3EA7440E609AECF392E73E93E37C32A55F6811E1046EB203519EFBE59F7E19B4FC55074C7D9928BD43506629C3B5F391765686165905A357CAE44FCE0FDA21AA67546F1C7C639DB398D32F80BE907639D1ED723C54B6F1EBE0575C5CDC64971E914B8CC8C49F73B6326D32D4DCB973FFDCBD7BF7EF366CD8909050B969D3A643797979BB55D23EDF8D5FB2640D20F4F193A79F7FBA15D89C7B9CE5F14BFE7E49E0BE84483D9B2817BE96E5AF1244F5E547F49E6D7D5F4E08C4002265852E053AC2DECB1AEB69D343DFD72A5D3B52E9C86A97BF2E38C1D151050E7897E334ECC7C6C7D42196F93B37D8219656AE759E81D6B9A7F62FDE0107F89C92388069E4E7A5063093D3BD5F9013AFC909D3E4B8FA48AF919D85D20EEB338AEB223B1AF5D9BCDBDCD326A6101BA95F90A24F30E73CDEDE792E80641782257D216D2CED722382E5D9AA7CAA03E0F0E1C31B1D2E25548E1A35CA192ABF48BB0CF5F8E38F3F2A27F2D9B56B5793864AF97D9D3A75DAE3C625B0CDB567DAB9C7B9A1D748F08BE5F50C20D2A6436D8ABDBF6979C63B396B5C51A96F55988E2EE84C6A4565953D42672EC32CE1591F746AF489FED68DE9103B0C7DF2453EA7440E609AF6F3CA8460492158BA3C5CD2C6D22E279CC7E3C9D127F2D13397F12E8B95F785CC549A699BA19E7CF2C939122E9B6AE672D3A64D66972E5D3E53153EC8CD5F3206100C20D2AC434DCB0B3EEB13F5C812D8081D5D9D5374CB0906EAEB100BCBFC9EA03DADF619EA22758872065A7D9220E93C5507581D784ECE6A376ED98FDDFE3925720093A0CF8B7E817E01F4857041BBDC182A001638C3A51C1B2927F491B3BA467BF65739518FF3984A29699FA1A64E9D3A5185C1EFE498CBC69CD067C18205FFEDD0A1C36752D16EFF923180600091448D5DB293914B7E9C9D59B41D6283AF0BE9108B26F83BE8E7F429D4F5F5B7E47ECF49FEE3D5CF6DE5B19F9D7FA597CFA969073089FCBC123190A15FA05F007D21ED726AB5CB8D253397AAEC730643098A729DCB254B9658B3917A99AC2C77DDB66D9B59555565969696CAE5188302A52C7FCD980C3565CA942B860C19B25BA662DF7AEBAD9802E5DAB56B650AF7B3F6EDDBAF74EB31950C201840A448871AEB5ED68C3D39416D47E71B1C658718F6E2C3D2A1C9125B6B0FAAB51CC73F5C3F573C69E9997A59ADF31892DB1E7EE564E735B9A42394F7C97D3EA7261BC024EBF3A25FA05F007D2132B85D6E0A72CCA5F332247196573232433DF4D04377297B6579ECA38F3E6AAE5CB9D2DCB16387595353638548B9956328257CCA746FAF5EBD6ABA76EDFAAE246C379EFD95010403881412EB129E8C5EF213CB1ED4704B6935E77531EBBCAFD43F5BEE179656F6D6AFB1CE60575A39D5BAFE96FA593A55F91DD281F23935CDE79AE4CF8B7E817E01F485C8D076B98903663B3B601E8C2550BA22433DF1C413973EF0C0034F0C1D3A7463B76EDDBEC8CBCBFBD69EDE3DD4B973E72F54F05CADCA2849E97CA51840308048BB0EF57255BE68C1059FF99C40BF40BF00DA58DA5834199595CE5001B3AFCA48CFAAF2B12A358E20B95595F9AAF42743810104038874D0CAEE285BD5F3FCA774A47C4EA05FA05F006D2C6D2C12CF0E9326AB3BC1008201443A8AB4B796253F7C4EA05FA05F2058D2C6D2C622493C1ECFD57A79AC61181CC70B06100C2032A243A523E57302FD028560491B4B1B8BE406CBB98EA5B02BA9113080600091EE1DEA383A523E27D02F50E81768636963913C2A485E1E7A321F1534D9FEC000820144DA926517FA5217E07302FD02FD02FD026D2C909C60393FCC99605772AC25184030804867275105E9F13949A74335D02F50E817401B8BB40F959747BAF48861189C340A0C2018400009EF88D85EE91728F40BA08D45FA6F6B0BEBB97EE5726A080C201840000C7A40BF40BF00DA58A0BEED2CE26C25C75A820104030880410FE817E817401B0B44B39DCDAF2F54728658308060000130E801FD02FD0268638198E4E7E7FF406D7B5F52136000C1000260D003FA05FA05D0C60271C9CACA3A5E6D7B5F50136000C1000260D003FA05FA05D0C60271B9E5965BFE9F6118FBA909308060000130E801FD02FD02686381B8E4E6E69EA0B6BDCFA909308060000130E801FD02FD02686381B86465659DA8B6BDCFA809308060000130E801FD02FD02686381B81414149CE4F178F651136000C1000260D003FA05FA05D0C60271F17ABD27AB6D6F2F350106100C2000063DA05FA05F006D2C1097ACACAC1FAA6D6F0F350106100C2000063DA05FA05F006D2C1097F6EDDB9FA2B6BDDDD404184030800018F4807E817E01B4B1405C0CC3F81FB5ED7D4A4D800104030880410FE817E817401B0BC4252B2BEB476ADBDB454D800104030880410F1A6D71C562DAE4D42835AA5F38C816491B0B248B6118A7A96D6F27350106100C2000063D68B4054B17EC98BA792AED723397C73E7CEC69D52FAC638BA48D0592252B2BEB74B5EDEDA026C000820104C0A0078D56EE2BFFFBCBFE973F537DC3D7B4CFCDB3A3D1EA132ACA37575454B4638BA48D0592252F2FEFC76ADBDB4E4D800104030880410F9A846A8F5A979797AF949514B24C9F92D42275BE8E3E8136965A40336C773F51651B350106100C2000063D00401B0BC4252B2BEBA76ADBFB849A806B6567675F4F030C30E80100DA58207EB9B9B967A86D6F2B35013737BEAFA8F21D350130E80100DA5820EEEDEE4C55B6501370EB17A0A534BE520CC3F803350230E80100DA58207659595967A96D6F333501B736BC7E47B02CA74600063D00401B0BC4CEEBF5FE4C6D7B9BA809B88E0A92AD74A864D61260D00300B4B140A3B6BBB355F9989A801B37FE574283A52AF3A91980410F00D0C602B1C9CACAFAB9DAF63EA226E0B606B75D98506915AFD77B09350430E80100DA58207A6A0C7D8EDAF6AAA909B8ADC17D2752B0340C6316350430E80100DA58207A595959E7AA6D6F233501D750C1B14DA450A98BC7E3F935350530E80100DA58203A5EAFF7976ADBDB404DC03554685CD350B054E5596A0A60D00300B4B140D463ECF3D4B6F7013501D7320CE37FD497E0536A0260D00300B4B1407CB2B2B27EA5C6D5EBA909B8567E7EFEA9AA01FE0F350130E80100DA58203E2A549EAFB6BD75D4045C2B2F2FEFC7EA4BB09D9A0018F400006D2C101F8FC77381DAF6DEA726E05A5959593F555F824FA80980410F00D0C602718FA92F340CE33D6A026E6E7CCF54650B350130E80100DA58203E2A545EA4B6BD77A909B896D7EBFD99FA126CA22600063D00401B0BC4472ED727D78AA726E05A5959593F575F828FA80980410F00D0C602F1C9CDCDFD5F152ED75213702DF505F8856A803FA42600063D00401B0BC4C7308C8BD5B6F7363501D7F27ABDBF545F820DD404C0A00700686381F8783C9EDFA86DEF2D6A02AEC5C55C01063D00401B0B347ABBBB549537A909B816D7DC0118F400006D2CD0E831F56FD5B6B79A9A806B716A6480410F00D0C6028DE3F57A2F53DBDE2A6A02AEC519AC00063D00401B0B347ABBBB5C9595D4045C8B038D01063D00401B0B347A4C7D85DAF6DEA026E0E6C697038D01063D00401B0B3482D7EBBD526D7BAF531370F39780F5E000831E00A08D051AB7DD5DA5CA0A6A02AEC5B43DC0A00700686381468FA9AF56DBDE726A026EFF12B0770560D00300B4B1409C0CC3F89DDAF65EA326E0E6C6F71A55AAA80980410F00D0C6028CA981B81886F107F52578859A0018F400006D2C109FECECECDFAB6DEF556A026EFE12FC4985CBA5D404C0A00700686381B8B7BB3FAAB28C9A809BBF042D55F1531300831E00A08D05E2C3640D5C4F7D01FE4F35C095D404C0A00700686381B8C7D4D7AA6D6F093501D7CACECEBE5E7D11CAA90980410F00D0C602716F77AC0284BB793C9E1BD497E0656A0248EEA0A7A8B4F286C2B2CA595699E07B4A4ADF327F1B5D821E2BF599AAFCC7F93BE4B1C252DF72FDBA7045BF57DD7FA8BE7F4FE178DF55F2BA3EA5CB7EC4A703806009C42E3B3BFB3AC3307CD4045C4B7D015AA906782135012477D05332DD7F5CB8E7EC10F96E43BFC30E96B747F33A559E773E2601B26F996FA994E0F0EA5F60DFFF5295CFF8A400102C81A8C7D41C5E0677F37ABD7FF3783C2F511340F30F7A8A4AFDD74BC02B9E50715D54C1727CC5C58513FDAD4367298B26F8BA59BF6762C579725B34A17246E8FB4B4A4A8E3C1C50FD77587F7F5CC539B5AFF7B772BE060008964083DBDD9F55A9A026E05A2A54B6565F82F9D404D0BC839E9292D9C7DAB38B512D49D5C152DED7D0EB9C3396125A55809D2DC59E9DDC5F54EADB1B58365B56392BB024B7F6BD5BF9C400102C81FA71DE12D0F8E6E4DCA2CA0BD404D0BC831E3D731898692CAB7C5FDD7FB8DEC038A132DF111EFDC1CB5A2BFB860B967A09AE7A6C9B0A9455E18ECB2C2CF5ED50C173249F14008225101D152AFFA2B6BDC5D404DCFC2568E3F178E6521340F30D7A8ACA2A3B4A0094D06707C6FE56F853C1517EEE57E63FBFE16059690487D4DAE32FC31D6319FAFE30CF7D26C75FF24901205802D1E18498E04BE0F1B4555F8239D404D03C831E0984B5CB5F179CE0087CFD03A17382BF95FDD8F898826599BF7383C1B2B472ADF30CB441339E65BEC97C520008964074BC5EEF5FD5B87A1135013737BEED5479969A00923FE891B3AF1695FA5685098CFD9D8F159555F6089DB90CB314767DD0254626FA5B132C01102C81E4E04A0BE04B6018D9EA4BF00C350124F37BE7B54ED2234B60C306BE906029E4443D615E17089685657E8FF3397DA6D748C152CE40AB4F1224215405C9EAC0737276D871CB7ECC270580600944872B2D8001AEA21AE07F5113406A0C7A9CA1B03EF51D2359E77521C1B26882BF837E4E5F8A445FC752EEF79CE43F5EFDDCD67A8C800980600944B3DDDDA4CA8BD4045CCBE3F1E4AA6C39939A00522758F69DE01B1C65B0EC1FEE390986B2C4D69A89B496B5FA87EBE78A272D3D532FAB751E8B79DBC3AF9CECBCB6A5044A799FDCE7130340B0041A1C5373093FB8BEF1CD57E5496A0248A56019DD4C64B8A5B49AF3BA9875DE57EA9F2DF70B4B2B7BEBD75867822DAD9C6A5DC752FD2CE1547E8704513E3100044BA07E8661DCACC2E53C6A026EFE1274500DF0E3D404C0A00700686381B8B73BAE0D0F77F3783C1D55B87C8C9A0018F400006D2C10F798FAEF6ADB7B9E9A809B1BDFCEAA3C4A4D000C7A00803616888F61186D54B89C4B4DC0CD8D6F5755A6501300831E00A08D05E2DEEE6E55E5396A02AE651846778FC7F34F6A0260D00300B4B1407CD478BAADDAF6E6501370F397E036F52578989A0018F400006D2C101FC330FEA1C6D5FFA626E0E6C6B7972A13A90980410F00D0C602716F77ED5479969A806B1986D1C7E3F194521300831E00A08D05E2A3C6D3596A5C3D9B9A809BBF0485EA4B309E9A0018F400006D2C10F776E751E5696A026EFE1214A9F210350130E80100DA58203E1E8F27C7308C59D4045C4B7D01FAA92FC283D404C0A00700686381B8C7D486DAF6FE454DC0B554A81CA0BE0763A80980410F00D0C602716F775E559EA226E0E66039487D09EEA32600063D00401B0BC43DA6CE350C632635013737BE77AA328A9A0018F400006D2C101F152AF3D4B637839A809B1BDFBB5419494D000C7A00803616887BBBCB57E5496A02AEE5F17886198631829A0018F400006D2C10F798BABD1A533F414DC0CD8D6F892AC3A90980410F00D0C602F151A1B283DAF61EA726E0E6C6F76E5586521300831E00A08D05E2DEEE0A54994E4DC0B50CC3B8C7E3F10CA12600063D00401B0BC4478DA73BAA71F563D404DCDCF88E565F82C1D404C0A00700686381B8B7BB4EAA4CA326E0E62FC17DAADC414D000C7A00803616888F61185D3C1ECF546A026EFE128C515F8201D404C0A00700686381B8B7BBAEAA4CA126E05A2A543EA8C2653F6A0260D00300B4B140DCDB5D375526531370F397E021558AA80980410F00D0C602F1310CA3BBC7E3F9273501377F09C6AB2F4121350130E80100DA5820EEEDAE872A8F5013702D152A4B55B8EC434D000C7A00803616887B4C7D9BDAF61EA626E0E6C677A22ABDA80980410F00D0C602F1310CA3A70A9793A809B8B9F17D58F6B0501300831E00A08D05E2DEEE7AC9840D3501377F0926CB59ACA80980410F00D0C602F1F1783CBDD5B657464DC0CD5F82A97241576A0248D80067BE0C721A282BA929002058227DC9394BE4DC25D404DCDCF84E53A513350124EC3B76B92A07EB0B96AA236A4D4D0100C11269BDDDDDAECA046A026EFE124C57A5809A0012FA3D5B584FB05CDEB265CBA3A925002058227DC9E5FBE4327ED4045C4B7D019E505F84F6D40490D041CEE59182A5FA0EB6A18600806089B4DFEE8A5479889A809BBF0433D4C0368F9A0012FE5D0B77ACE54A662B01806089F4E7F1788AD5987A2C35013737BE4FA9E2A52680847FD7EA1C6BC9B1950040B0446650A1B29FEAD71FA426E0E62FC12CF525C8A12680C453DFB5B9CC560200C11219B9DDF557E5016A026EFE123CA3C2653635012425585EED38B6B215350200044B644C1F3F40F5ED63A809B8B9F17D569576D40490B4EF9C75AC25B3950040B044E650A172A00A97F753137073E33B477D09DA521348752566C9D133D7CF7C76DE6BF3BE5D5CB1D82C2F2FA724B948BD2F5CB270F762FF624EF805806009046F7777A8721F3501D79263BEB8DC01D28184CA05CB169853374F35C7EF1D4F69A63279EB6473D192459F575454B0D20100C112383CA61EA4C6D4F752137073E3FB822AB750134875325349A84C8D3265CB9403E5E5E5EBD82A01102C815A2A540E56DBDE686A026E6E7CE773C903A403598649A84B9DA282E541B64A00044B20B0DDDDA9CA286A02AEA542E54B5EAFF76FD404529D1CE347A04BA960C9C00D00C112383CA61E6218C63DD404DCFC2558C4650F9049C172CAF6B166C58AA1E6CAF2415691FBF218619060098060092470BB1BAACADDD404DCFC2558AC82E55FA8096442B09CB2FD4173F5A281E6DB2F0D082AF2983C472024580220580289E0F17886A931F5086A026E6E7C2B54F93335814C0896F3DE1A512754EA32FFADBB0984044B00044B2051DBDD70554AA809B8966118BEECECECEBA8096442B05C5E393862B094E70884044B00044B2041DB5D89844B6A026EFE122C51E1F25A6A0299102C572EBE2362B094E70884044B00044B20116419AC2C87A526E0E6C677992A7FA42640B0A4102C01102C81B8B7BBBBE5043ED404DCFC2578353B3BFBF7D404322258960F8A1C2CD5730442822500822590A0ED6EA42A77511370F397E035C3307E474D201382E5B2654322064B798E4048B00440B0041241AE6129D7B2A426E0E6C677852A575113C8846039A3FA3E73D5CB7597C3CA63F21C819060098060092468BB1BA5CA9DD404DCFC2578C3E3F15C414D201382A51578560CAB132CE531C220C11200C11248E07637DA308CC1D404DCFC2558E5F57A2FA3269009C172C29EF1E69257EFAA132CE531798E4048B00440B004124185CA7B3D1ECF206A026E6E7CDF54E5526A02E91E2CA76C7FB0C1632CE535844282250082259080EDEE3E55EEA026E0E62FC15B1E8FE737D404D23558CA4CE49CF7EE31D72C1C183154EA22AF91D7327B49B00440B0049A92611863D4987A003501D7525F80B5B9B9B9FF4B4D201D836543B394CC5E122C01102C81246D770FA8D29F9A809BBF04EF1A8671113581740C96D1CC52D6377B49402458022058024DC1E3F13CA8C6D4FDA809B8B9F17D5F7D112EA026908EC132DE50A90B019160098060093405152AC7AA31753135013737BE1FA82FC179D404D231585208960040B0448A6C770FA952444DC0CD5F828D595959E752132058520896000896407C3C1ECF38C330FA52137073E35BEDF57ACFA12640B0A4102C01102C81F8A850395E85CB426A026E6E7C3F56E56C6A02044B0AC11200C112887BBB9BA0CAEDD404DCFC25D89C9595751635018225856009806009C4C7E3F1941A86D1879A809B1BDFADB9B9B9675013205852089600089640DCDB5D990A97BDA909B8F94BB04D959F5013205852089600089640DCDBDD44557A511370F39760475656D6E9D4040896148225008225101F8FC733C9308C9ED404DCDCF8FE273F3FFF546A02044B0AC11200C112887BBB7B44951ED404DCFC25F8D4308CFFA12640B0A4102C01102C81F8783C9E7FAA3175776A026E6E7CF7646565FD909A00C19242B00440B004E2DEEE26ABD28D9A809BF7AEEC2B282838899A00C19242B00440B004E2DEEEA6A8D2959A809BBF049FE7E6E69E404D806049215802205802F1F1783C530DC3E8424DC0CD8DEF17595959C7531348052D5BB63C9A6049B004008225D270BB7B5495CED404DCFC25F8EAE69B6FFE3E3581E66618469E0C06546947B024580200C11269B6DD4D53A5133501377F09FE5B5050701C3581E6929595756EFFFEFD5FFDF0C30F77EEDEBDBBA277EFDEABD4765916BA5D122CD32F58AACFF1728FC73397AD1C00C11299CE308CC7549FD7919A809B1BDF6FBA75EB760C3581649365AFF9F9F9C3E6CC99B3FBD0A14335E661FB5E7AE9A5C57979792B2474122CD32F584AA05465BE2A0719E0012058C225DBDD74550AA809B8F94B70480DDE8FA226904C8661FCE1FEFBEFFF68EFDEBDBBCD08F6EFDFBF7ED0A041DBF4D2588265EA07CBD040A90B5B3C0082255CB0DD3DAEC6371DA809B8F94BF09DBA39829A4032C8A56DFAF6ED3BF3CD37DF8C1828431C5CBC78F1B6AE5DBBFE73D1A24504BA140D961E8FE76A59F21A1A280996000896700B152A9F507D617B6A02AE6E7C255CAAF2AD3D28FC468EBB54A5464EECA3CA97EA8BB25F2E4B22D7BC54B77B55D9ADCAA7AAFC47959DAA6C57456696B6AAB24595CDAA7CACCA47AA7CA8CA46553E50BF67BDBA7D5FDDBEA76EDF51BF6FADBA7D4BDDAE51B7AB559163EBDE50E5755596ABF29A2AAFAAF28A7ACF5275BB44DDFAD46DA5BA2D57B78BD57B17A9DB85EAF62575FBA2BA9DA76E5FB007B9CFA9DB7FABDB6755794695A755F9972A4FA932439527A51190A50BB22E5ECEE625A78A960BDCAADB7FAADB87D5ED2439DE4FDD96AAD78C57B7E3D4ED5875FBA0BA1DA36EEF57B7F7AAD78C56B7F7A8DB91EA7684BA2D51CF0D53B743D5ED10757BA7BA1DA46EEF50B703D46D7F755BAC6E8BD46DA1BABD5DDDF656B7BDD4ED6DEAB6875C6457AE872467189383C165DDBEEC0993464B4E74A36E73D5ADA16E73D44DB6BACD52B7FF50B76DD56D1B75FB77757BB3BA6DEDF57AFFA66E6F54B77F55B7376467675FAF7EE79FD5ED75EAB6A5BAFD93BAFDA3BAFDBDBABD468282BABD4ADD5E611F27F75B757BA9BAFD8DFA9D17ABDB5FABDB8BD4ED05EAF67C757B9EFADDBF54B7BF50B7E7646565FD5CDDFE4CDD9E959B9B7B86BAFD695E5EDEAF264F9E6CD6D4D41C3263B47FFFFECF1F79E411F3BEF5F711EA522858469AA10C2D72BCACDA06FE3F3951587E7EFE0FE44CD4B7DC72CBFF934B1DA9FB274A919D0E6A9B3959DDFF61FBF6ED4F51DBD5FFA8FB3F92A2DE73AAFAF93475FF74B51DFD58FDCE9FC83625DB9614F5F399B2ADC936A7EE9F6D6F7FE748916D529654DBDBE779EAFEAFEC6DF60229EAE70BED6DF9D7EA77FDAFBD7DFF468A7ACF25F676FF5B75FF32FBBB7085BA7FA514FB3B72B57ACFEFE47B23DF1F998D97EF92FD7DFA93FAF95AFB3B769DBAFF7FF2BDB3BF7BD7AB9FFF22DF47F95EAAFBADECEFE8DFA4A8D7DC24DF5DF90EABFBB7D8DFE73652D4CFB7DADFF37FC88CBEFDDDCF56F73D52EC36C150F7BD763B2127C6CA9762B71F1D64B996B429D2B6481B23A7C89762B739DDD4FDEED20E497BA4EEF79462B74FBDD5FD3E769B55A8EEF79576CC6ECB8AD5CFFDECF66D80BA3FD06EF30649513F0FB6DB426913EFB2DBC761765B395CDA4DBBFDBCDB6E4BA54D1D6597D1765B7B9FDDEE8E51F71F9062B7C763D5FD87EC367ABCBA3F41DA6D29D286AB32D16ECF1F56E51169E3ED765E2E683EC56EFBE58C8ED3ECFE60BA5D1EB7FB8927A5DF50F767DA7D88F425FF523FCFB2FB9667D4FDD9D2DF48BF63F73D73EC7E48FAA3E7EDBE699EFD9D996FF759D2772DB0FB31E9CF5EB6CB62BB9FABB0FB3CE9FBFCD20FDA7DA1F489CBA47FB4FBC92ABBCF7CCDEE3F57D87DA9F4A92BEDFE75B55DDEB4FBDDB75479DBEE8BDFB1CBBB761FFDBE2AEBEC7EFB035536D865A3DDAF57DB7DBCF4F59BEC7E7FB33D0690B1C027F6B840C6073BECB2D31E37ECB2C7103296D8638F2BF6DA638CCF64BC618F3BBE9031885D643CF2B53D369131CA017BBC72D02E87EC71CC77ECD042338EA9A59DC8A726E076479494941C29C7BCC9F19637DE78E3F76420A807817A00A8077E7AD0A7077B7AA0A70778CEC19D1ED4E9019D1EC8E9419C1EBCE9819B1EB4E9C19A1EA8E9019A1E9CE941991E90E981981E84E9C1971E78E941971E6CE98156C800ABB33DB0B206557A40A507527A10A5074F7AE0A4074C7AB0A407497A80A407477A50A407447A20A407417AF0A3073E7AC0A3073B21831C3DC0D1031B6B50A307337A20A307317AF0A2072E7AC0A2072B8E418A1EA0E881891E945883113D10D103103DF8700C3CF480C339D8D0838CEDC3870FDFB775EBD6EF620D96FBF6ED334B4B4BADC142AA86CBFB36DF270319B3F38CCEE643BB1E327F78D60FCDF3AE3DCFBCD27BA555BA3DD3CD7A3EF47DF2D82D77DF12F1E7140F96D1961A7B50F8953D48FC42EFB0B207929F39765CED71ECBCDA6517BD136B876347D627F6B6E5DCA1B5C9B153ABDA2E7AE7D606C70EAE75F6B6AB7774BDEBD8D9F5B6BD9DEB9D5E6F3A767CAD74ECFC7ADDFE8EE89D60557A4798FD5D5AA67788D9DF316BA7981D142AF4CE31F93EEA1D64F677F425BDA3CCFEEE5A3BCBECEFF35CBDD3CCFE9E5B3BCEEC40A3779E3D6DB709D64E34BB9D98610F78F4CEB4C71D3BD4A6E99D6A76B89AE2D8B9F688DEC16687B2897A479BB4597A679BB463765B66ED74B3DB376BC79BDDE6DDAB77C0D96DA1B513CE6E1F47E89D71D26EEA1D72765B6AED949362B7B1D6CE39BBDDB576D049B1DB636B479DDD465B3BEBA4DDB6DB6E6BA79DDD9E5B3BEEA48DB7C3B3B503CF6EFB033BF1A45F90A277E6D9FD85B543CFEE430CBD63CFEE5BAC9D7B767FF30FBD93CFEE87AC1D7D76DF64EDEC93227D96DEE967F763D68E3F29D2BFE91D80769F67ED04947ED0EE0BAD9D8176FF68ED10943E538ADE3168F7A5D6CE41BB7FFDADDE4968F7BBD68E42BB2FFEB5DE6168F7D1D64E43BBDFB6761C4AB1FBF3C00E44E9EBF54E44293206D03B13655C20E303D9212445C60B326E909D45328690B184EC48927185141963C84E26196FC8B8437640C918448A8C4764E7948C4D648CA2EE1F2BE31519B74891437A641CD382155868DE19CB99D246501340924907D0AFCC7F7EDF327F1B5586F72DF599AABC1BE9F545E32ACE91D7C87B02BF63BA3F70D6D0BE65BEDFDBBF635A437F5B5E5738C1F75043AF2B9CE86F1DEEF19E93FCC75BBFA3AC328B4F32762A271E5D5555B5E8BFFFFDEFB7D184CAD75E7B6D5BE7CE9DBF1C366C9879EFBA7B533A6C0D583AC03CF1F413CD71BBC75901F1AE557759B75963B302A151BFF6ACDF9E15089BB98FE49A3F38E507E6C057065A3F5FD4EAA2C073F23B527D29AC3D005E1E2958B2D5038D57545A7983EA7766596582EF2929761F6A95A0C76AFBC3FFD4E9FB4A7DCBF5EBC215FDDE86FAC8C2F1BEABE4757D4A97FD884F06A865AF66F052134082158EAF38AD4F69C585B74FF05DA63AA3B685657E8F744A45A5BE31CE8068EF710CB05FFFBCEEEC8A26F8BAA9DBAF5579BDA8D47FBDDD013E553CC1F7B7A2872A7F5A52E23F3A9A60D97782AFB8E1D7F9736B3BCE0527149556FC51FDED7FD7FE3B2A0DBBD37EDED181BFCEA71C9B59B366B5ABAEAEFE3A52A0DCBE7DFB7F478E1CB94B6629644F76BA9DBC474261FBA9EDADDB5FFEE9976651795150B01CF6F630B3EBACAE8160F9F32B7F6E767FB6BBD9615A87C0FB3B3DD129AD4EDE23B32EF68C1DC1126862CEBEB24E9F56CF8ED99060797B547DA4EADF9C8F4980EC5BE65B2A2538BCFA17D8F7BF54E5333E25B83C58CA2A32839A0012A86892FF5CD5E12C9212668FEA8B819F2754E6EBB0793868FA8F2E9AE06F253396D6EF52F7E535DD26CFFFBE7ADDB5A1B39875FE76ED6B16E93DBC81805AEAAB72FCDDFEEAB16FEA74E2EA6F174FAC38AFF6FEEC6325BC3A83A50AC79DD5FDBED67D159CF9A463274B9DE6CE9DFB5A4D4DCD411D28BFF9E69BEF9E7FFEF9AD1D3B76EC204B9CF46B533958DEB3E11E6B86F198E38EB102A40E8639A53981E028B396CE6029AF6F7547AB40003DF2A823CDD6435B9BBDE7F7368B2B8BADC7257CA6E3E546EC19CC5708964082FB577B076BF1848AEBA20A96E32B2E96D538A1B394F64E5B53FABCDA9DB89533EAF689B53B7E6B03AAFF0EEBEFDBAB89A46F76BE067023390C4196C75313400249400B3793581B2C2B1BDCB32321D27AED38FF2556075656D9431EB796D2AA9F655633D27B0B4B7D3B0A4B2BDFACF3771D339676D8FCBAC1FF0F7B6F7160296C84A5B288DDDD77DF5D505555656EDCB871D7942953C21E9F90EA33967AF96B97A7BA0482A5CC4886CE62EAFB23DE1B61CD4ECA633FBEF0C756D094C7EFDF7ABFF5D86FDBFE366DAF63E9E864650673395B389088BE75F6B1F60EDAA896A4EA6029EF6BE875CE194B09AD2AC0CE9662F797FB8B4A7D7B03CB66CB2A670596E4D6BE772B9F0EDCC83ECEDD434D0049A03A9B4F55792574C6D2DA5B5A56D9517E76767812E46489A9F5BCA31393A5B4B5B38EB57B6AADD95039BEA4B4B2B73D1B796DE06FD6CE821E52B7E323CE585A4B78FCF3F47B6449ADFD6FEAA16723F512A0704B618BCA7C3DAD9F2756FC8E4F397ECED9C9740C96A16152EE174C2FB002A31C7739FAA3D141C1F2ECCBCF367BCCE9613D26339EA79E7BAAB514367F727EE0444052E47DE91A2C0124B44FB5660E03338D6595EFABFB0FD71B18559FE8088FFEE0FEB8B26FB860A977AAAAC7B6E9BE3374C65376E2AA3E79249F0A5C1E2CE5448AD9D40490A44E5085B3EA903D9B2F068263A97F41E87B824ED0E3E8148515F8A4439DB4F44CDD4986F99B9B5579AB6EE75A67C632E8D8106B4FB0FD6F94632C6B7F56FF76158C9D274B501DF15AD98BCBA79B78E9122C87AC1C623EB0E381C032583D03298FEB6039F28391D6996325745ED6EE32EBF694B34F31FFD4ED4FD67D99F594D7DEFED2ED693D63092031023B636B77C04ADFD8DFEACFEC434AC21D225237581E5E31E43CFE32DC3196E1FAE090E73E939DAF7C327033FBECFC9CD811485AB074063A47C7661DBF58EAFB32F43DB26C47661303338DD62C62ED718D72863CB9ED35B1E294A60E968EC74D99C13CFCEF0D0EBFF66BFEC3A74BB0741E5779DA79A7054ED62327E0915B59FADA22E47223B27CB69FAF9F75ABCF022BB772BCA53E890FC11240701F56BB6A46767A3A025FFF40E8B4CF45202B75620A9665FECE0D06CBD2CAB5CE33D006CD7896F926F3E9C0CDECEBA6B7A326806405CB883396FE91FAA43CCEF7C88900FA8E5BF6E3D08ECF19FCACD7440896F65EDD6FEA5B0A2BB3A5A1C761460E96F2FF50DBA9EA633399B124583A83A52C65955B999194DBBBD7DD6DF67AA1579D632C9DEF19B47C901528E5DA97E972D65B8225D02CFDE897AACF5A152630F60FE9FB7A84CE5C86590ABB3EE81223F679030896407CE4DAC2720D5B6A02485EB0FC7D482765ED319599C94827E1B1CF38D7A1760F6DC585FA843DCE33C8D63363B9BFCE2C63C88CA55C4A24DCC97B74672927EBD167A0959312102C099691CAD89D63CDA16F0EB596BD3A1FD7D7A7946B5786BB8EA584D11B07DF685DCBF2AF03FF6A3DAE03AA1C6F49B004DC4D9FA847769686ED5B4382A5EE57C3BC2E102CE5B25FCEE7F4995E23054B39AF813E49908450D9511C784ECE0E6BEF0406DC2A2727678E0A976DA90920D1A17262C5EF5427F69C55225D6EA4F6E769211DE315FAA43EB581D2FFEBDAE5B1F67258FB3224F67B2BA30EB8D15CC7F2F0BF69BF3E13AC5CCB32CC6BB6F109132CE3398B6C3AFFFB0996408AF4AF8E50D870DF17FE18C93AAF0B0996B273573FA72F45E23C3CC4EE23DBD69EC19D8009D706CBE754B9959A0012ACF69223C1D7B78A74B911BD1CF6B6875F39F9F05959F512D6CA1B0E77A4872FF41C69C6B231C152CF92AABF3D3CB413951306D9C7787EC98C25C1D28D856009A44EB0547DDAE0288365FF70CFD92B73565933918E7E4FF7777A59ADF39014E9A39DD7B6944029EF93FB7C2A70238FC733D7308C36D4049020766755157A8AF2C3B381FE79218F3DA167269D41547ED6CB52EDF7E5D60DA9BE89D176C27AEF6B7D64C94F6199EF96A0F7D94B6F45E178DF55CEEB6A826049B004D03CC132BA99C8704B6935E77531EBBCCFDE81AA2FEB6597CFFA96564EB5AE6369F7CFF23B2488F2A9C08D7272725E50E5166A0248A0862EC60C102C09960000A4338FC733CF308C9BA9090020585208960000C425272767BE0A97ADA9090020585208960000C41B2C5F54E5266A02000896148225000071F1783C2F79BDDEBF51130040B0A4102C0100884B4E4ECE02152E6FA4260080604921580200106FB05C6818462B6A02000896148225000071F1783C8BBC5EEF5FA9090020585208960000C4252727E765152E6FA0260080604921580200106FB05C6C18C65FA8090020585208960000C44585CAF2ECECECEBA9090020585208960000C4252727A75285CBFFA32600806049215802001017152A7DD9D9D9D751130040B0A4102C0100884B4E4E8E5F9596D40400102C29044B0000E20D964B0CC3B8969A0000822585600900405C54A85C9A9D9DFD276A02000896148225000071C9C9C959A6CA1FA9090020585208960000C41B2C5F310CE30FD40400102C29044B0000E20D96AF666767FF9E9A000082258560090040BCC1B24A956BA8090020585208960000C41B2C5F330CE377D40400102C29044B0000E20D96CB3D1ECFD5D40400102C29044B0000E20D962B54B98A9A000082258560090040BCC1F20D8FC77305350100296E71C562025DEA941A152C0FB25502001008962B55B99C9A008014B760E9821D53374F25D4A54079ECC3C79E56C1721D5B2500008160B9CAEBF55E464D00408A2BF795FFFD65FFCB9FA970F935E1AEF9662AFFFFF6EE36468ABB8E03782488A8B5A156A4B5A9ADB5D6A6565A35A6698CF1348D29A610129DECC371B889C9455B28B7D437C5946C62782349E9EE1E8D2410638C8AC4E4FA82B424ECED5A1A20C6A78AD807A56839D0A3553815E15A03EBCCEECEB2777060266CCD6D3E9FE49F9DDDDB79E037243FBEFC67E61AA1B2B2FBD54AA5F2157F2B01A01D2C7F954AA53EA91200B34018661ED8BD7BF72FA2CB30A37BFC66E3181919A9CFD6636FD5FD45A112002E0896BF0EC727540280AE3B7EFCF8974BA5523D6C3C37AB0600F48E542AF59B6C367BB74A00D055F57A7DFE8913274E86EA8383833B5504007A473A9D7E3E0C9777A904005D353636F6837ACBBE7DFB8E653299E5AA02003D132C7F1BF6F6C52A0140D79C3A75EAAEB367CF9EAB77D8B061C3582E975BA03A0030FBA552A903FDFDFD1F570900BA667C7CFC707D9A898989F1B0011555070066BF743AFDBB305CDEA9120074C59123471EABCF60646464DC2F5306809E0896073399CCC75402802B2ECC8ED74D4E4EBE3953B03C77EEDC1BF97CFE405F5FDF5CD50280D92B0C95BF0F82E00E9500E08A3B7AF4E8FEFA651C3E7C782C6C4643AA0500B3573A9D7E31ECE7B7AB040057DCDEBD7B2F972BEB67CE9CF959D88CEAB95C6EBE8A01C0EC1486CA978220F8A84A0070C5AD5FBFFEA14B5D0A1BE5CA75EBD6FDC48C2500CC6EE974FAE5542A759B4A00D015DBB76F7F79A65479E8D0A1EF868D68BF7B2C0160D607CB3F64B3D98FA804005D1104C1AD61803C739107F71CECEFEF3FE8A9B000D013C1F28F51CF570900BA66E3C68DE530489EED0C965BB76EDD964AA536A90E00F444B03C14F6F50FAB04005D135DEABA6BD7AED7E250393131F1A3E87F3673B9DC02D501809E0896AF64B3D95B540280AE5AB56AD5174E9E3C39198EFAE0E0602593C92C571500E89960793808820FA904005DB765CB96674AA5523D954A8DA80600F454B0FC53386E560900BA2EBAF435FA9D956EEE07809E0B967FCE66B337A904006F55E3A9AB0200F45C7F7F3508820FAA040082250090B4BF1F09C78D2A018060090024EDEF478320B8412500102C0180A4FDFD58383EA0120008960040D2FEFE97152B565CAF120008960040D2FEFED72008AE530900044B0020697F1FCF64328B540200C1120048DADF8F0F0C0CBC5F2500102C0180A4FDFDB5200816AA040082250090B4BFBF9EC964DEA7120008960040D2FEFEB7952B575EAB120008960040D2FEFEF72008DEAB120008960040D2FE7E229BCD5EA312000896004022A954EA642E975BA0120008960040D2FEFE8FFEFEFEAB550200C11200482493C9FC73D9B265EF510900044B0020697FFF57100457A9040082250090B4BF9F1A181878B74A002058020049FBFBBF972E5DFA2E950040B0040092F6F7D34110BC532500102C0180A4FDFD4C2E979BAF120008960040D2FE3EB964C99277A8040082250090B4BFBF1104C13C950040B0040092F6F737070707DFAE120008960040D2FEFE9FBEBEBEB92A018060090024EDEF670B85C21C950040B0040092F6F773E1CBDB540200C11200D0DF01981D8DC7300CC3308CDE1BFE95030000000000C07985426DEE50B9B63C1E6B8AD51F36964BD5C9A1F2E80BFFCB36D63C51591C6DA7B9BDC29CCE87B384DBA9E74BB56F47CB8F946BB75FB0EE70ED818B6DF3C1CDB5ABA275D79447834BED3BFE4EF8FA7A389E6C1D7BFDE162F553E1EBCED6FBB1700C3BDB0000005D0B9785399D21AE15C67647A12F0A9AF18843DBDA62E5F3D382E5A2E8F3706C8BC35E1C4A1BCBC3957BD76E7EF6C6E6E7D5C7A606C35A7FF4F9EAD2D357E74B95CFE68BD59F36F7339A696DF3A978BFE1F8F9C58265B8CDCF34026CB13AD80E9B4F54EF89C269FB3BA56ACD99060000E8A256F87ABE15E24EE74BB51D71E0CC6FAADCD20C90D57B9A3390D5CF4D5F3FFCFE7D0F0D57AE5D5DDAB3B050D831AF19EE2A8B5B3396F735835FEDFE0B436D6DEEDAE1CA6DCDE51DF3D616AB5FEA0C966BCAB5AF85CB43ADED2DEA5C7775A972473394EE59D8F879A9FA703B58B6963BFE6C3B9D650000802E07CB30C4A51ACBCD7079AC1DCA36D5EE6E04CBD2E8AAE812D9F3A1B03027BFB976EBD48039FAC530D4ED0FBFF7FD8E99C697E2E5301C7EFA52C751F85E6D7EF4DABE1476864B653B02E3A98EE5B1F63E872BF70E95ABCF761CC33667190000E0FF142CF3C5DA57DBDF29561F9FB25E7174209E358C66365BF7365E1008E359CC6826B211401F1FBD21DA4FBE3CFAF57836B21904E33038F552D87CB9FA601C18A3F5DB97D6761C673C4BB9A65C5D1607DFC6BE8AB5FBA7CF76020000D0856039FD52D8E8F36F3CF9DC35EDE0D7113EA7AF1B5F8E3AB469CFF59DB394F1BD99AD07ECB4673FDB61B335A318DD63D97C5F7D257CFF5CE70385C29079203E9EA9C73B9A892E956DBF2F561FED7870CF531DF7674EE44BD5EF38CB0000005D0E96179BB1EC089D13D1ECE44CEBC7C1320EA2D14C64E7CFDBF75D4E7BCA6B1C2CA319CCF3FBAA3D7D91EF1C8FDF3F323C7A53637FADD0D83EFE69F755C6F76E364367ED5BCE320000C05B1B2C1B612C7A204FF4B4D5F8E9AB975A3F0C9EDF6C2F97475FB8DC8CE5CCC1325A7FCAAF3E393D7DC6B263DD89F3FBAF3E9A2F557F19EEEBC7D1BD9CD1A5B951B86CCE62D6EE74967BDF7F01C2B8EC92D1A67BA30000000049454E44AE426082,
+		1);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302558', 1, 'var-baseTask', NULL,
+		0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665B811E59153A6CD0702000C4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E000178720017636F6D2E6C656E2E656E746974792E426173655461736BA48CBC2F51BC802602000D4C0008637265617465427971007E00024C000A6372656174654461746571007E00014C0002696471007E00024C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C000B7375626D697474696D657371007E00034C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000775726C7061746871007E00024C000675736572496471007E00024C0008757365724E616D6571007E000278707070707400043230313874000331313170707070707400352F6C656176652F726561644F6E6C794C656176652F343332303730666331663532633063633137376164393031613561616338643174002035393436613938356637333363353766316162373136383966376236616565617400087A68616E6773616E7372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDB8E2400787070737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000037371007E000C77080000017FE5DADC00787400203433323037306663316635326330636331373761643930316135616163386431737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787070707070,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302560', 1, 'hist.var-baseTask', NULL,
+		0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665B811E59153A6CD0702000C4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E000178720017636F6D2E6C656E2E656E746974792E426173655461736BA48CBC2F51BC802602000D4C0008637265617465427971007E00024C000A6372656174654461746571007E00014C0002696471007E00024C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C000B7375626D697474696D657371007E00034C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000775726C7061746871007E00024C000675736572496471007E00024C0008757365724E616D6571007E000278707070707400043230313874000331313170707070707400352F6C656176652F726561644F6E6C794C656176652F343332303730666331663532633063633137376164393031613561616338643174002035393436613938356637333363353766316162373136383966376236616565617400087A68616E6773616E7372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDB8E2400787070737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000037371007E000C77080000017FE5DADC00787400203433323037306663316635326330636331373761643930316135616163386431737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787070707070,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302561', 1, 'hist.detail.var-baseTask', NULL,
+		0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665B811E59153A6CD0702000C4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E000178720017636F6D2E6C656E2E656E746974792E426173655461736BA48CBC2F51BC802602000D4C0008637265617465427971007E00024C000A6372656174654461746571007E00014C0002696471007E00024C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C000B7375626D697474696D657371007E00034C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000775726C7061746871007E00024C000675736572496471007E00024C0008757365724E616D6571007E000278707070707400043230313874000331313170707070707400352F6C656176652F726561644F6E6C794C656176652F343332303730666331663532633063633137376164393031613561616338643174002035393436613938356637333363353766316162373136383966376236616565617400087A68616E6773616E7372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDB8E2400787070737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000037371007E000C77080000017FE5DADC00787400203433323037306663316635326330636331373761643930316135616163386431737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787070707070,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302573', 2, 'var-leaveOpinionList', NULL,
+		0xACED0005737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A657870000000027704000000027372001B636F6D2E6C656E2E656E746974792E4C656176654F70696E696F6E1956BF801DDE60870200065A0004666C61674C000A63726561746554696D657400104C6A6176612F7574696C2F446174653B4C00046F7049647400124C6A6176612F6C616E672F537472696E673B4C00066F704E616D6571007E00044C00076F70696E696F6E71007E00044C00067461736B496471007E00047870017372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDDEED97B787400203062373632356665646161303565383566323832343836653163396339316239707400033131317400063330323536367371007E0002017371007E000677080000017FDDEFA3BB7874002064383138616336613836636631613634643231383462663036393964363761387074000331313174000633303235383478,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302575', 2, 'hist.var-leaveOpinionList', NULL,
+		0xACED0005737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A657870000000027704000000027372001B636F6D2E6C656E2E656E746974792E4C656176654F70696E696F6E1956BF801DDE60870200065A0004666C61674C000A63726561746554696D657400104C6A6176612F7574696C2F446174653B4C00046F7049647400124C6A6176612F6C616E672F537472696E673B4C00066F704E616D6571007E00044C00076F70696E696F6E71007E00044C00067461736B496471007E00047870017372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDDEED97B787400203062373632356665646161303565383566323832343836653163396339316239707400033131317400063330323536367371007E0002017371007E000677080000017FDDEFA3BB7874002064383138616336613836636631613634643231383462663036393964363761387074000331313174000633303235383478,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302576', 1, 'hist.detail.var-leaveOpinionList', NULL,
+		0xACED0005737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A657870000000017704000000017372001B636F6D2E6C656E2E656E746974792E4C656176654F70696E696F6E1956BF801DDE60870200065A0004666C61674C000A63726561746554696D657400104C6A6176612F7574696C2F446174653B4C00046F7049647400124C6A6176612F6C616E672F537472696E673B4C00066F704E616D6571007E00044C00076F70696E696F6E71007E00044C00067461736B496471007E00047870017372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDDEED97B7874002030623736323566656461613035653835663238323438366531633963393162397074000331313174000633303235363678,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302588', 1, 'hist.detail.var-leaveOpinionList', NULL,
+		0xACED0005737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A657870000000027704000000027372001B636F6D2E6C656E2E656E746974792E4C656176654F70696E696F6E1956BF801DDE60870200065A0004666C61674C000A63726561746554696D657400104C6A6176612F7574696C2F446174653B4C00046F7049647400124C6A6176612F6C616E672F537472696E673B4C00066F704E616D6571007E00044C00076F70696E696F6E71007E00044C00067461736B496471007E00047870017372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDDEED97B787400203062373632356665646161303565383566323832343836653163396339316239707400033131317400063330323536367371007E0002017371007E000677080000017FDDEFA3BB7874002064383138616336613836636631613634643231383462663036393964363761387074000331313174000633303235383478,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302598', 2, 'source', NULL,
+		0x7B227265736F757263654964223A22333032353937222C2270726F70657274696573223A7B2270726F636573735F6964223A2270726F63657373222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C2270726F636573735F617574686F72223A22222C2270726F636573735F76657273696F6E223A22222C2270726F636573735F6E616D657370616365223A22687474703A2F2F6C656E6F73702E636E222C22657865637574696F6E6C697374656E657273223A22222C226576656E746C697374656E657273223A22222C227369676E616C646566696E6974696F6E73223A22222C226D657373616765646566696E6974696F6E73223A22227D2C227374656E63696C223A7B226964223A2242504D4E4469616772616D227D2C226368696C64536861706573223A5B7B227265736F757263654964223A227369642D33304636324437352D353136352D344532322D383433412D394441393335424135303331222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22657865637574696F6E6C697374656E657273223A22222C22696E69746961746F72223A22222C22666F726D6B6579646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22227D2C227374656E63696C223A7B226964223A2253746172744E6F6E654576656E74227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D32333931423338312D323736372D344134332D383237442D374333353037394145303745227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3137352E352C2279223A3134317D2C2275707065724C656674223A7B2278223A3134352E352C2279223A3131317D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D39363143373036422D413744312D343941312D394332382D414135433233433430364243222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C226173796E6368726F6E6F7573646566696E6974696F6E223A2266616C7365222C226578636C7573697665646566696E6974696F6E223A2266616C7365222C22657865637574696F6E6C697374656E657273223A22222C226D756C7469696E7374616E63655F74797065223A224E6F6E65222C226D756C7469696E7374616E63655F63617264696E616C697479223A22222C226D756C7469696E7374616E63655F636F6C6C656374696F6E223A22222C226D756C7469696E7374616E63655F7661726961626C65223A22222C226D756C7469696E7374616E63655F636F6E646974696F6E223A22222C226973666F72636F6D70656E736174696F6E223A2266616C7365222C22757365727461736B61737369676E6D656E74223A22222C22666F726D6B6579646566696E6974696F6E223A22222C2264756564617465646566696E6974696F6E223A22222C227072696F72697479646566696E6974696F6E223A22222C22666F726D70726F70657274696573223A22222C227461736B6C697374656E657273223A22227D2C227374656E63696C223A7B226964223A22557365725461736B227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D36463636323645392D383144342D343845392D394345332D433632464434433932454230227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3338352C2279223A3135357D2C2275707065724C656674223A7B2278223A3238352C2279223A37357D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D32333931423338312D323736372D344134332D383237442D374333353037394145303745222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D39363143373036422D413744312D343941312D394332382D414135433233433430364243227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3238342E393233383535393435353934382C2279223A3132352E303334373433383734303737367D2C2275707065724C656674223A7B2278223A3137352E38313234373231373934303531382C2279223A3131382E313536363632333735393232347D7D2C22646F636B657273223A5B7B2278223A31352C2279223A31357D2C7B2278223A35302C2279223A34307D5D2C22746172676574223A7B227265736F757263654964223A227369642D39363143373036422D413744312D343941312D394332382D414135433233433430364243227D7D2C7B227265736F757263654964223A227369642D35383442353134362D373630372D343239362D393143342D383746384646323636333436222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22657865637574696F6E6C697374656E657273223A22227D2C227374656E63696C223A7B226964223A22456E644E6F6E654576656E74227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3539382C2279223A3132397D2C2275707065724C656674223A7B2278223A3537302C2279223A3130317D7D2C22646F636B657273223A5B5D7D2C7B227265736F757263654964223A227369642D36463636323645392D383144342D343845392D394345332D433632464434433932454230222C2270726F70657274696573223A7B226F766572726964656964223A22222C226E616D65223A22222C22646F63756D656E746174696F6E223A22222C22636F6E646974696F6E73657175656E6365666C6F77223A22222C22657865637574696F6E6C697374656E657273223A22222C2264656661756C74666C6F77223A2266616C7365227D2C227374656E63696C223A7B226964223A2253657175656E6365466C6F77227D2C226368696C64536861706573223A5B5D2C226F7574676F696E67223A5B7B227265736F757263654964223A227369642D35383442353134362D373630372D343239362D393143342D383746384646323636333436227D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A3536392E333832383132352C2279223A3131357D2C2275707065724C656674223A7B2278223A3338352E36303534363837352C2279223A3131357D7D2C22646F636B657273223A5B7B2278223A35302C2279223A34307D2C7B2278223A31342C2279223A31347D5D2C22746172676574223A7B227265736F757263654964223A227369642D35383442353134362D373630372D343239362D393143342D383746384646323636333436227D7D5D2C22626F756E6473223A7B226C6F7765725269676874223A7B2278223A313230302C2279223A313035307D2C2275707065724C656674223A7B2278223A302C2279223A307D7D2C227374656E63696C736574223A7B2275726C223A227374656E63696C736574732F62706D6E322E302F62706D6E322E302E6A736F6E222C226E616D657370616365223A22687474703A2F2F6C656E6F73702E636E23227D2C227373657874656E73696F6E73223A5B5D7D,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302601', 1, 'var-baseTask', NULL,
+		0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665B811E59153A6CD0702000C4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E000178720017636F6D2E6C656E2E656E746974792E426173655461736BA48CBC2F51BC802602000D4C0008637265617465427971007E00024C000A6372656174654461746571007E00014C0002696471007E00024C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C000B7375626D697474696D657371007E00034C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000775726C7061746871007E00024C000675736572496471007E00024C0008757365724E616D6571007E000278707070707400043230313874000332323270707070707400352F6C656176652F726561644F6E6C794C656176652F376538303465376562376162386633353461663133316362626336326336383374002035393436613938356637333363353766316162373136383966376236616565617400087A68616E6773616E7372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDB8E2400787070737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000057371007E000C77080000017FF0279400787400203765383034653765623761623866333534616631333163626263363263363833737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787070707070,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302603', 1, 'hist.var-baseTask', NULL,
+		0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665B811E59153A6CD0702000C4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E000178720017636F6D2E6C656E2E656E746974792E426173655461736BA48CBC2F51BC802602000D4C0008637265617465427971007E00024C000A6372656174654461746571007E00014C0002696471007E00024C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C000B7375626D697474696D657371007E00034C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000775726C7061746871007E00024C000675736572496471007E00024C0008757365724E616D6571007E000278707070707400043230313874000332323270707070707400352F6C656176652F726561644F6E6C794C656176652F376538303465376562376162386633353461663133316362626336326336383374002035393436613938356637333363353766316162373136383966376236616565617400087A68616E6773616E7372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDB8E2400787070737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000057371007E000C77080000017FF0279400787400203765383034653765623761623866333534616631333163626263363263363833737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787070707070,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302604', 1, 'hist.detail.var-baseTask', NULL,
+		0xACED000573720018636F6D2E6C656E2E656E746974792E557365724C65617665B811E59153A6CD0702000C4C0009626567696E54696D657400104C6A6176612F7574696C2F446174653B4C000863726561746542797400124C6A6176612F6C616E672F537472696E673B4C000A6372656174654461746571007E00014C0004646179737400134C6A6176612F6C616E672F496E74656765723B4C0007656E6454696D6571007E00014C0002696471007E00024C000B6F70696E696F6E4C6973747400104C6A6176612F7574696C2F4C6973743B4C001170726F63657373496E7374616E6365496471007E00024C000673746174757371007E00024C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E000178720017636F6D2E6C656E2E656E746974792E426173655461736BA48CBC2F51BC802602000D4C0008637265617465427971007E00024C000A6372656174654461746571007E00014C0002696471007E00024C001170726F63657373496E7374616E6365496471007E00024C0006726561736F6E71007E00024C000673746174757371007E00024C000B7375626D697474696D657371007E00034C00087461736B4E616D6571007E00024C0008757064617465427971007E00024C000A7570646174654461746571007E00014C000775726C7061746871007E00024C000675736572496471007E00024C0008757365724E616D6571007E000278707070707400043230313874000332323270707070707400352F6C656176652F726561644F6E6C794C656176652F376538303465376562376162386633353461663133316362626336326336383374002035393436613938356637333363353766316162373136383966376236616565617400087A68616E6773616E7372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDB8E2400787070737200116A6176612E6C616E672E496E746567657212E2A0A4F781873802000149000576616C7565787200106A6176612E6C616E672E4E756D62657286AC951D0B94E08B0200007870000000057371007E000C77080000017FF0279400787400203765383034653765623761623866333534616631333163626263363263363833737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A65787000000000770400000000787070707070,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302616', 1, 'var-leaveOpinionList', NULL,
+		0xACED0005737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A657870000000017704000000017372001B636F6D2E6C656E2E656E746974792E4C656176654F70696E696F6E1956BF801DDE60870200065A0004666C61674C000A63726561746554696D657400104C6A6176612F7574696C2F446174653B4C00046F7049647400124C6A6176612F6C616E672F537472696E673B4C00066F704E616D6571007E00044C00076F70696E696F6E71007E00044C00067461736B496471007E00047870017372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDDFADF437874002030623736323566656461613035653835663238323438366531633963393162397074000333333374000633303236303978,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302618', 1, 'hist.var-leaveOpinionList', NULL,
+		0xACED0005737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A657870000000017704000000017372001B636F6D2E6C656E2E656E746974792E4C656176654F70696E696F6E1956BF801DDE60870200065A0004666C61674C000A63726561746554696D657400104C6A6176612F7574696C2F446174653B4C00046F7049647400124C6A6176612F6C616E672F537472696E673B4C00066F704E616D6571007E00044C00076F70696E696F6E71007E00044C00067461736B496471007E00047870017372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDDFADF437874002030623736323566656461613035653835663238323438366531633963393162397074000333333374000633303236303978,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302619', 1, 'hist.detail.var-leaveOpinionList', NULL,
+		0xACED0005737200136A6176612E7574696C2E41727261794C6973747881D21D99C7619D03000149000473697A657870000000017704000000017372001B636F6D2E6C656E2E656E746974792E4C656176654F70696E696F6E1956BF801DDE60870200065A0004666C61674C000A63726561746554696D657400104C6A6176612F7574696C2F446174653B4C00046F7049647400124C6A6176612F6C616E672F537472696E673B4C00066F704E616D6571007E00044C00076F70696E696F6E71007E00044C00067461736B496471007E00047870017372000E6A6176612E7574696C2E44617465686A81014B597419030000787077080000017FDDFADF437874002030623736323566656461613035653835663238323438366531633963393162397074000333333374000633303236303978,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302630', 1, 'source', NULL,
+		0x7B227265736F757263654964223A2263616E766173222C227374656E63696C736574223A7B226E616D657370616365223A22687474703A2F2F6C656E6F73702E636E23227D2C226964223A2263616E766173227D,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302632', 1, 'source', NULL,
+		0x7B227265736F757263654964223A2263616E766173222C227374656E63696C736574223A7B226E616D657370616365223A22687474703A2F2F6C656E6F73702E636E23227D2C226964223A2263616E766173227D,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302633', 1, 'source-extra', NULL,
+		0x89504E470D0A1A0A0000000D4948445200000288000000CD08060000003B43814C000000206348524D00007A26000080840000FA00000080E8000075300000EA6000003A98000017709CBA513C0000000467414D410000B18E7CFB5193000000017352474200AECE1CE900000006624B474400FF00FF00FFA0BDA793000000097048597300000EC400000EC401952B0E1B000011F04944415478DAEDDD0B7454F59D07F09BC924194208E115E3A22B56A4BADAB55A1F548F055F80407B5C2B25984A715DDB7A56DAD5FA586B7DD5F6D45D75ABDBDD565B151FA841E8FAA8D64715A85B05179422281110C16208C86308904C1E33D97B69E8491110C883103E9F73AE776632B933FE90BFDFFBFFFFEFFF060100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005D44961200FBC203CB1EF87A8F648F9F146C2EE81FAF8B6B8B3A486376637D2637F34AF6E6ECEF8C183162A98A000222D0293C52F1C87D7DAAFA5C92EC970C36166D0CEABAD5294A07C94DE50685C9C2A0EFAABED5F1A678D9D9679FFDACAA00DBCB5602A023453D87C51F15DFBAF2332B83649F6490CE492B4A074AC7D3414D414DB0B9E7E6BCA2B545C3CA2E2C7B72F2E4C9EB55066829A60440478A8695A39EC328A4B0EFA4F253C1BAE275D5B158EC56D500B6175702A02345730E971FB47CD70DD3E67850B8B430C85D9F1B64356505754575C1A6819B82869E0D0AD88636F4DDD0BFEFEABE435502D89E1E44A063CF4AEBE259BB9A731885C33E6FF609F23ECE0BB2D25941900982BCF5795B5FCBD998A3806DA83E519F17EE4A54021010814EAD60794110ABFF64D31485C5E867000888C0016657BD8451EF22000222708089E61CEECDCF001010010010100100101081034EBADBCE17CECEE46614084040040E345B0EDDB2C320988967822D03B628108080081C6852C5A920D537B5C3D76B8B6B15084040040EC886A9F1934D53769D5BC7030888C001275EF3E7BBA824D6243EF1B3BC7579419F397DB6BE070001113800E457E66F0D80D1FD97772637991BF49DDD37E8BEA2BB351101DAF3845D09807DDA08D5C483C28AC2AD3D84BB23BAE55EE1E2C220B13611540FAA0E1A7A342822401BD38308EC53518FE0EE86C396A29EC6BEFFD75701010444A0AB897A04F79A651101DA852166609F5A75CE2A4500E864F420020020200200202002002020020020200200D06AAE6206000E68AFBFFEFA3F2C5DBAF4E2952B579EB67AF5EA1E1B376ECC49A552415E5E5E537E7E7E436161E187E1FEC5850B17DE3575EAD4A50222004017D4D4D4149F356BD68DD3A74FBFE2BEFBEE2B38E18413822143860403060C088A8A8A823010066148CCDAB469536E6565E5C0F0BD030B0A0A2EBBE28A2B962493C96F4C9A34E90D011100A08BD8B061C37161287C69DEBC79C55FF9CA57826BAEB926C8C9C9F9C4FB1289C4D6AD5FBF7EC171C71D175C7AE9A5B11933667C76EAD4A97FB8FCF2CBA7AD5EBDFAD2F0F1E6AE58237310018003C61B6FBC31E68E3BEE989B9B9B5B7CFBEDB707C3870FDF6138DC91ECECECE0ECB3CF0EEEBEFBEEF8E0C183CFEBD1A3C7FCD2D2D201022200C07E1C0E1F79E491F230DCC5C78F1FBF7518796F44BD8A65656589281C868F5FEB8A2151400400BABC6858F999679E796CF8F0E1B1D1A347B7C931CF39E79CD8B871E37AE5E6E6BE3066CC9802011100603F115D90326DDAB497060D1A146FAB70B8CDB061C3BA9D79E6997DF3F2F2FE5D400400D84FCC9E3DFB96B7DF7EBBF8820B2E6897E38F1D3BB64F3C1EFFFA85175EF879011100A09D959696FE60DCB871E70D1D3A74AF575E79E59557BE336AD4A8BD9E73F869A239895FFBDAD7EAC3877708880000EDEFD6A6A6A6274B4A4A9263C78E9D1C86C5117B32DF2F5A047BD9B26505679E7966BB7EC961C386F5C9CACA3A31FC6E03BB42D1AD834887995CF5D2590B6A975D5E99FA78F087756BFAAC6FAC8ED766EAB2F2623941AF7861E380C4411B8A737ACF39A5E0EFFE73EC4167BEA86200B4D03D0C606561582CCBCECEAE2E2D2D7D3A7CFE585E5EDECC071F7C30B5B35F5ABC78F1A5D122D8BBBB94CDDE8A96C039EAA8A33E7CE79D77CE0BBA404FA28048BBFBD6E23BAF5ADB90BC7ED2EADF169D52787470E141E70483BA1D1A94E4F60EF26389A026930A36346C8A2FAEFD53BFD7AB178EFC65D53323CF7FE7FA4DBD730AEFBA6FD0B537AA2000DB290CB78BC2B078512A346EDCB827C2E74FAE5AB5EAD999336736B67C63F8DAE033CE38A343BED4B061C3BA870171888008BB7059C5ED7FBF2ABDFEF90FEB561D7CF521E3B2BED4F3B8203B2BFB13EF8B42627E5E22E89FD72F38A3E884E0FABF1D1FBCBA717E8FBB3E7AE286910BAEBA6C407EC9C89F1F71D51C15ED1CA2F940E1AE229D4EBFD055EF2000EC571261501C1FEEC7979494443D8B2F656565DDBFAD67B1B2B2B2E0B0C30EEB902F127E4E34C9F1D8AE5054019176F1CD25B7DFF4D6E6A537FE53C9E8D8C5079DBBC360B82B51988CB647D6BCD8F7BF2B9F9CFDED2577DC76CF91575DAFB29DC2AD5B1B8F783C3376ECD877C286F87FC2A7331389C4EC5D0DF3D0F9D4ADAB0BDE7AEBAD28F4DFAC1A741151CFE2056160BC20954A45FF6DBF5F5D5D9D535858D8211FDEB367CF9270D7254E9C0544DADC75CBEEF9C16B9B16DE74CFC0EF657DBEE0C8561DEBA2E2E1C1890547C5BEBDF48EEB2E5B7C678F5F0CFADE7754B873081BE058180E3F173E8CB69B9A8779DE085F7F36168BBD1C9EB52FDC7EA887CEE5E3D91F072BE7AD8C1EDEA41A745147D4D5D5B5DBD5CBDB8BAE660E758905B30544DAD49845375CF9874D0B6F79FCB337664543C66DE1E8FCC382C7C2E38D7BEF87FF3C76D1CD95538EBEF93695DE77CACBCBB3C2B3F2A61DB58D61388CE6DE0CC96432414949C986F07D33C2E7BFC9CECE7EF9D1471F5DA97A9D4BBFC1FD827E95FD8279F3E6DDA21A7462BB7302930EDB9FA6F0A4F5AF724DF87C593C1E1F50535313EB8890585B5BFB51B8EB2920420BA7CEFDE611CB6BAB6EFBE59157C7DA2A1C6E131DEFDE8157C5BEF1DE8F7F387CE195CFBF78EC7FCC57F14EAF57B89D1F6DE9743A1AEA49878F1755565606C11714A733C8EB93171C73C231C1B5D75E7BB36AD059856DC70E03629807A3118A4C180273C37D76B88F5E4B86FB97C3EDD1BCBCBC17A2692F975F7E79AABABA3AAF2302623299DC18EE1A044468A15B4EFEF317179F95D3DA61E59D897A1227F6FF6ACEA455CF3D1D3E1DA0E2ED63C2840989542A551236B42561239BD87E1FBEE5A0BD3C743411F5D879F3E60503BEEC8F0FD82BD162D4D1C966B716BD85D19CBF17C26D4AB76EDD5E0E4361B2E52F1416162E5BB162C5D1252525EDFEE5162C58B0283AF71210A1D997E64D2CCBC9CAFE4C3467B03D45C79FB2E6954386CC9F78D9EF8FFBD92F547EC7C68C1953929D9D9DD855C80BF745D1F3F071F4FC2FFB686277243A1BDFD17E0F4543D12D7FB1E2F8E38F3F6A43B0C11F12B037725B84C269E1F65C229178765717C885A1F1B773E7CE3DFA94534E69F72FF7FCF3CF47DD94D30544D8F637363BE7966B0EBD303B5AF4BABD7DFF6F2FCABE71F9FDD7850FBB7440DC55C88BC5623D5B3EDF3EE46D3BC6AE425EF87B3BFBE8A8A1AD6ADE52E1EF5485EFDDB6AF6B7EFDD36ADFD8DCBE441FB830FCBD7BC3467A7274667FC92597340988C01E9F6D3635453D8333C3F6EFA1E6256C92BBF37B15151577E5E4E4FC4B434343767B2E969D4EA7575455559D14EEBBC4C5940222AD367076D9213599DA43A365693AC2A9859F0B1A9B322547CD2A1D50F1C5F2E5FB63C06B3154BB7DB06BB9DF69C8DB16EE7611F2AA5A04BD1D86BCE6B93A7F793D6CD45253A74EADDA9D7FB7D2D2D21D05C4C6F038B1E8EAE6E6B6E5854C2673E79A356B66BA9A1968851BC2B66579229198B6374B694517C85D79E5958BA64F9F7EECF0E1ED37CA3569D2A437C3EF5918B6A34B0544081DDCAD68FC909E9F8FEFE95A87AD716EEF53729E5EFFDAC5413B2ECF3161C284A2542A55149EAD168541A7287CA96FB815B445C0DB4D3B0D79E1F7D9B85DE8DBE390D7866AC22D1A568987DF2B0A9DF785DFE3DEAED24802FB567979F98F5A7B8C6432F9F5279F7C72CEE9A79F9ED31E17ABD4D6D62E0E03E869615B3CBAABD45D40A4D57283F8974F2BFC5CAC233FF3E41E4707CF6F7863D4A705C49DF5E2853F3A24DCF29A876B0BB61BA68DD6B0EABB6D2E5EB4644B4B6D11F05A0CD56EFF7A2A3C4BAEDACF169C8E5ADBBF1A46F6B702E84C1E78E081F913274E7C74CA9429632FBEF8E26E6D7CF8E4F5D75FFF5AD8066E09C3EC5C01119AAD6FDCF499E80AE38E54940C63E9CCF5C7949696DE1E85B9F02F665174D145D0DCCBD762FF57A16EFB70D772B87607A249D06B9B8762A3D0B3367AAD0B06BCD6308C0CEC17162C5870694D4DCDC9C5C5C5478C1A35AAADAE346EBCF3CE3B1FAAACAC8CD67F3DBD2BD54B40A4D55299FAA27E39451DFA9915731606FD66A5A31EBFAB7614FC5A58BB2DE8B508777FE9C50BF7D1E2CDA9743A5D153EDEBC0F8769F7375787757ACA3032B0BF884E62FBF7EF3FFC89279E9813B6FF3D468F1EDDBD95874C46E170EEDCB96785FFEFF87257BB37BD8048AB353435E6E6C7121DFA99434EFB5270CFAAA783BF9915DC103E5DB92DF46D0B8389442269A8B3FD949797DFA10AC0FE26BA60A5ACACECA45FFFFAD7CF5556561E3C7EFCF87ECDB7C7DB23D19CC3685839EA398CC261D8262EEF6AB5121069FD7F4459F1BA9A4C2AAF2343625149EF60F5A9B18657BFFBD88FFC0900B0272171E8D0A15FA8AFAFFFB759B366FDE3F9E79FDF3072E4C87ED9D99F7EA165B494CDC30F3F3CE777BFFBDDE9D19CC36858B9ABF51C0A88B499BCAC9C0D1F37244B0ECB2BE9B0CFDCD0B029C8C98A57AB3E007BAA79CEF4F7C68E1D3BE9B1C71EBBBDBCBC7CC8A04183169F75D65985871F7E786EAF5EBD0ECACFCF8FD7D6D6AE4E2693EBDE7DF7DD779E7DF6D982AAAAAAE3A3F9EE61303C6FCA9429B3BB728D04445AAD29C8CC7DB766F9B96140ECB0756E16D7FE29FC67D65BAA0FC0DE0A43DEC270776E5959D921151515A3172D5A343C0C80C7067F5E8122BAD0319AA7581B6E3DC2ED956811EC0365EEB58048AB6D694ABDF84AF2CD53CFED35B877477DE6AB1BE7276B33752FA93E00AD150D3B87BB7B9A37423125A0B5B2D2F1A76624E7C5D24DE90EFBCCE7D6CFCAE4A4B7DE8713001010E96C960E7E74654DBAEE8FD3936F75C89CC0FFDD387FF39674ED92CE7C9B3D00101039E03564D277DFB0FCFE9A8EE845FCFEF25F6EAC6F4AFF97AA0380804827F6FE298F3FB5BEB1FABDBB2BA7AD68CFCFB967D5532B3FAEDFB0E2902DABCA551D0004443AB9EC74D3845FADFA4DF7B736BDD72E6B42BD53B3BCE6EE8FA6259A62C12533CF705B37001010E9F4A239810D41E3C46F2CFEC99695756BEADAF2D8D1F1C655DCBCB9B12973C5E2131FAF506D001010D94FBC7FD294F2BA4CDDBF8E5878F586B99B2AD6B5C531176EF9605D74BCDA74EAA74B4F7E7CB22A038080C87E66C9C9E50FA69AEAAEB8B0E287C18F3F7CF88FADB970E5A71F4D79FBABEFFE205D9FA9BF6EE9C9536E535D00687F16CAA65D443D8947CD2A9D3D69F50BBF9AF2F1F4F77F72F8B752A37A7FF198DDFDFD979373165FF3C1BD0D9B1BB6546765678D5D7262B96165001010D9DF35AF5378CEC039A5177CF7FD9F7DEBEA0F7EDEEBB8EE03579CDF6748E2841E47161F9CDBA7283F96E85E93496D595B9FDCF076CD07EB9F5AFB6AF5ECEA770FABCFD4AF09B282FBFBD7544D76410A00088874314B4F2A8FEE78326DE0ECB243E66E7EEF82B9D515A7356505BDB28260DBBD9BB7ED3F6C0A82DF47774859D2BC08F612E5030001912E1C14076FBDD7E55DCD1B00D049B94805000001110000011100000111000001110000011100000111000001118076905202404004F6B9744E3A95579BA7109D40A226313FDC55A904202002FB54434EC30B3D933D332AB1EF1DFCA7832B9A9A9A66AA04202002FB54417DC1C4DE55BD3775DBD24D31F6A1FCEAFC5F75DBD4EDAC4C2673836A00DBCB5602A0233DF4D043D513C64F985BB4AE6864BC31BEA63EB7BE5B3A27EDBEF01D2395A849BCD9FF83FE2F1557168F88C562970D1B366CB6B200DBCB5202605F983163C621E974FAD6F0E1D0A6A6A6012AD261AAA261E5A8E770C488114B9503000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E854FE1F5EFD99B91416FC3A0000000049454E44AE426082,
+		NULL);
+INSERT INTO `act_ge_bytearray`
+VALUES ('302635', 1, 'source', NULL,
+		0x7B227265736F757263654964223A2263616E766173222C227374656E63696C736574223A7B226E616D657370616365223A22687474703A2F2F6C656E6F73702E636E23227D2C226964223A2263616E766173227D,
+		NULL);
 
 -- ----------------------------
 -- Table structure for act_ge_property
 -- ----------------------------
 DROP TABLE IF EXISTS `act_ge_property`;
-CREATE TABLE `act_ge_property`  (
-  `NAME_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `VALUE_` varchar(300) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `REV_` int(11) NULL DEFAULT NULL,
-  PRIMARY KEY (`NAME_`) USING BTREE
+CREATE TABLE `act_ge_property`
+(
+	`NAME_`  varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`VALUE_` varchar(300) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`REV_`   int(11) NULL DEFAULT NULL,
+	PRIMARY KEY (`NAME_`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of act_ge_property
 -- ----------------------------
-INSERT INTO `act_ge_property` VALUES ('next.dbid', '305001', 123);
-INSERT INTO `act_ge_property` VALUES ('schema.history', 'create(5.22.0.0)', 1);
-INSERT INTO `act_ge_property` VALUES ('schema.version', '5.22.0.0', 1);
+INSERT INTO `act_ge_property`
+VALUES ('next.dbid', '305001', 123);
+INSERT INTO `act_ge_property`
+VALUES ('schema.history', 'create(5.22.0.0)', 1);
+INSERT INTO `act_ge_property`
+VALUES ('schema.version', '5.22.0.0', 1);
 
 -- ----------------------------
 -- Table structure for act_hi_actinst
 -- ----------------------------
 DROP TABLE IF EXISTS `act_hi_actinst`;
-CREATE TABLE `act_hi_actinst`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `PROC_DEF_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `EXECUTION_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `ACT_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `TASK_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `CALL_PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `ACT_NAME_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `ACT_TYPE_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `ASSIGNEE_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `START_TIME_` datetime(3) NOT NULL,
-  `END_TIME_` datetime(3) NULL DEFAULT NULL,
-  `DURATION_` bigint(20) NULL DEFAULT NULL,
-  `TENANT_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
-  PRIMARY KEY (`ID_`) USING BTREE,
-  INDEX `ACT_IDX_HI_ACT_INST_START`(`START_TIME_`) USING BTREE,
-  INDEX `ACT_IDX_HI_ACT_INST_END`(`END_TIME_`) USING BTREE,
-  INDEX `ACT_IDX_HI_ACT_INST_PROCINST`(`PROC_INST_ID_`, `ACT_ID_`) USING BTREE,
-  INDEX `ACT_IDX_HI_ACT_INST_EXEC`(`EXECUTION_ID_`, `ACT_ID_`) USING BTREE
+CREATE TABLE `act_hi_actinst`
+(
+	`ID_`                varchar(64) CHARACTER SET utf8 COLLATE utf8_bin  NOT NULL,
+	`PROC_DEF_ID_`       varchar(64) CHARACTER SET utf8 COLLATE utf8_bin  NOT NULL,
+	`PROC_INST_ID_`      varchar(64) CHARACTER SET utf8 COLLATE utf8_bin  NOT NULL,
+	`EXECUTION_ID_`      varchar(64) CHARACTER SET utf8 COLLATE utf8_bin  NOT NULL,
+	`ACT_ID_`            varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`TASK_ID_`           varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`CALL_PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`ACT_NAME_`          varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`ACT_TYPE_`          varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`ASSIGNEE_`          varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`START_TIME_`        datetime(3) NOT NULL,
+	`END_TIME_`          datetime(3) NULL DEFAULT NULL,
+	`DURATION_`          bigint(20) NULL DEFAULT NULL,
+	`TENANT_ID_`         varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
+	PRIMARY KEY (`ID_`) USING BTREE,
+	INDEX                `ACT_IDX_HI_ACT_INST_START`(`START_TIME_`) USING BTREE,
+	INDEX                `ACT_IDX_HI_ACT_INST_END`(`END_TIME_`) USING BTREE,
+	INDEX                `ACT_IDX_HI_ACT_INST_PROCINST`(`PROC_INST_ID_`, `ACT_ID_`) USING BTREE,
+	INDEX                `ACT_IDX_HI_ACT_INST_EXEC`(`EXECUTION_ID_`, `ACT_ID_`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of act_hi_actinst
 -- ----------------------------
-INSERT INTO `act_hi_actinst` VALUES ('247553', 'process_leave:1:247536', '247552', '247552', 'start', NULL, NULL, 'start', 'startEvent', NULL, '2018-06-14 23:44:03.000', '2018-06-14 23:44:03.000', 1, '');
-INSERT INTO `act_hi_actinst` VALUES ('247559', 'process_leave:1:247536', '247552', '247552', 'user1', '247560', NULL, '经理审批', 'userTask', NULL, '2018-06-14 23:44:03.000', NULL, NULL, '');
-INSERT INTO `act_hi_actinst` VALUES ('302557', 'process_leave:1:302555', '302556', '302556', 'start', NULL, NULL, 'start', 'startEvent', NULL, '2022-03-31 10:59:17.000', '2022-03-31 10:59:17.000', 10, '');
-INSERT INTO `act_hi_actinst` VALUES ('302565', 'process_leave:1:302555', '302556', '302556', 'user1', '302566', NULL, '经理审批', 'userTask', '0b7625fedaa05e85f282486e1c9c91b9', '2022-03-31 10:59:17.000', '2022-03-31 11:04:52.000', 335536, '');
-INSERT INTO `act_hi_actinst` VALUES ('302579', 'process_leave:1:302555', '302556', '302556', 'sid-950749EA-4BB6-4276-B67A-DE03E34A0573', NULL, NULL, NULL, 'exclusiveGateway', NULL, '2022-03-31 11:04:52.000', '2022-03-31 11:04:52.000', 43, '');
-INSERT INTO `act_hi_actinst` VALUES ('302581', 'process_leave:1:302555', '302556', '302580', 'child', NULL, NULL, 'subProcess', 'subProcess', NULL, '2022-03-31 11:04:52.000', '2022-03-31 11:05:44.000', 52313, '');
-INSERT INTO `act_hi_actinst` VALUES ('302582', 'process_leave:1:302555', '302556', '302580', 'sstart', NULL, NULL, NULL, 'startEvent', NULL, '2022-03-31 11:04:52.000', '2022-03-31 11:04:52.000', 31, '');
-INSERT INTO `act_hi_actinst` VALUES ('302583', 'process_leave:1:302555', '302556', '302580', 'allmanager', '302584', NULL, '总经理审批', 'userTask', 'd818ac6a86cf1a64d2184bf0699d67a8', '2022-03-31 11:04:52.000', '2022-03-31 11:05:44.000', 52298, '');
-INSERT INTO `act_hi_actinst` VALUES ('302591', 'process_leave:1:302555', '302556', '302580', 'sid-1CC133B2-44B1-4830-9C59-7D3564C933FA', NULL, NULL, NULL, 'exclusiveGateway', NULL, '2022-03-31 11:05:44.000', '2022-03-31 11:05:44.000', 0, '');
-INSERT INTO `act_hi_actinst` VALUES ('302592', 'process_leave:1:302555', '302556', '302580', 'sid-F68DCCA0-F7A4-44D4-9E44-56A682D87ECA', NULL, NULL, NULL, 'endEvent', NULL, '2022-03-31 11:05:44.000', '2022-03-31 11:05:44.000', 0, '');
-INSERT INTO `act_hi_actinst` VALUES ('302593', 'process_leave:1:302555', '302556', '302556', 'sid-BE372D14-F509-4EDB-87E8-7B2107835AE5', NULL, NULL, NULL, 'exclusiveGateway', NULL, '2022-03-31 11:05:44.000', '2022-03-31 11:05:44.000', 0, '');
-INSERT INTO `act_hi_actinst` VALUES ('302594', 'process_leave:1:302555', '302556', '302556', 'user2', '302595', NULL, '人事审批', 'userTask', '98b051b03681de6028993a5d14ac93cb', '2022-03-31 11:05:44.000', NULL, NULL, '');
-INSERT INTO `act_hi_actinst` VALUES ('302600', 'process_leave:1:302555', '302599', '302599', 'start', NULL, NULL, 'start', 'startEvent', NULL, '2022-03-31 11:16:00.000', '2022-03-31 11:16:00.000', 8, '');
-INSERT INTO `act_hi_actinst` VALUES ('302608', 'process_leave:1:302555', '302599', '302599', 'user1', '302609', NULL, '经理审批', 'userTask', '0b7625fedaa05e85f282486e1c9c91b9', '2022-03-31 11:16:00.000', '2022-03-31 11:18:00.000', 120357, '');
-INSERT INTO `act_hi_actinst` VALUES ('302622', 'process_leave:1:302555', '302599', '302599', 'sid-950749EA-4BB6-4276-B67A-DE03E34A0573', NULL, NULL, NULL, 'exclusiveGateway', NULL, '2022-03-31 11:18:00.000', '2022-03-31 11:18:00.000', 0, '');
-INSERT INTO `act_hi_actinst` VALUES ('302624', 'process_leave:1:302555', '302599', '302623', 'child', NULL, NULL, 'subProcess', 'subProcess', NULL, '2022-03-31 11:18:00.000', NULL, NULL, '');
-INSERT INTO `act_hi_actinst` VALUES ('302625', 'process_leave:1:302555', '302599', '302623', 'sstart', NULL, NULL, NULL, 'startEvent', NULL, '2022-03-31 11:18:00.000', '2022-03-31 11:18:00.000', 9, '');
-INSERT INTO `act_hi_actinst` VALUES ('302626', 'process_leave:1:302555', '302599', '302623', 'allmanager', '302627', NULL, '总经理审批', 'userTask', 'd818ac6a86cf1a64d2184bf0699d67a8', '2022-03-31 11:18:00.000', NULL, NULL, '');
+INSERT INTO `act_hi_actinst`
+VALUES ('247553', 'process_leave:1:247536', '247552', '247552', 'start', NULL, NULL, 'start', 'startEvent', NULL,
+		'2018-06-14 23:44:03.000', '2018-06-14 23:44:03.000', 1, '');
+INSERT INTO `act_hi_actinst`
+VALUES ('247559', 'process_leave:1:247536', '247552', '247552', 'user1', '247560', NULL, '经理审批', 'userTask', NULL,
+		'2018-06-14 23:44:03.000', NULL, NULL, '');
+INSERT INTO `act_hi_actinst`
+VALUES ('302557', 'process_leave:1:302555', '302556', '302556', 'start', NULL, NULL, 'start', 'startEvent', NULL,
+		'2022-03-31 10:59:17.000', '2022-03-31 10:59:17.000', 10, '');
+INSERT INTO `act_hi_actinst`
+VALUES ('302565', 'process_leave:1:302555', '302556', '302556', 'user1', '302566', NULL, '经理审批', 'userTask',
+		'0b7625fedaa05e85f282486e1c9c91b9', '2022-03-31 10:59:17.000', '2022-03-31 11:04:52.000', 335536, '');
+INSERT INTO `act_hi_actinst`
+VALUES ('302579', 'process_leave:1:302555', '302556', '302556', 'sid-950749EA-4BB6-4276-B67A-DE03E34A0573', NULL, NULL,
+		NULL, 'exclusiveGateway', NULL, '2022-03-31 11:04:52.000', '2022-03-31 11:04:52.000', 43, '');
+INSERT INTO `act_hi_actinst`
+VALUES ('302581', 'process_leave:1:302555', '302556', '302580', 'child', NULL, NULL, 'subProcess', 'subProcess', NULL,
+		'2022-03-31 11:04:52.000', '2022-03-31 11:05:44.000', 52313, '');
+INSERT INTO `act_hi_actinst`
+VALUES ('302582', 'process_leave:1:302555', '302556', '302580', 'sstart', NULL, NULL, NULL, 'startEvent', NULL,
+		'2022-03-31 11:04:52.000', '2022-03-31 11:04:52.000', 31, '');
+INSERT INTO `act_hi_actinst`
+VALUES ('302583', 'process_leave:1:302555', '302556', '302580', 'allmanager', '302584', NULL, '总经理审批', 'userTask',
+		'd818ac6a86cf1a64d2184bf0699d67a8', '2022-03-31 11:04:52.000', '2022-03-31 11:05:44.000', 52298, '');
+INSERT INTO `act_hi_actinst`
+VALUES ('302591', 'process_leave:1:302555', '302556', '302580', 'sid-1CC133B2-44B1-4830-9C59-7D3564C933FA', NULL, NULL,
+		NULL, 'exclusiveGateway', NULL, '2022-03-31 11:05:44.000', '2022-03-31 11:05:44.000', 0, '');
+INSERT INTO `act_hi_actinst`
+VALUES ('302592', 'process_leave:1:302555', '302556', '302580', 'sid-F68DCCA0-F7A4-44D4-9E44-56A682D87ECA', NULL, NULL,
+		NULL, 'endEvent', NULL, '2022-03-31 11:05:44.000', '2022-03-31 11:05:44.000', 0, '');
+INSERT INTO `act_hi_actinst`
+VALUES ('302593', 'process_leave:1:302555', '302556', '302556', 'sid-BE372D14-F509-4EDB-87E8-7B2107835AE5', NULL, NULL,
+		NULL, 'exclusiveGateway', NULL, '2022-03-31 11:05:44.000', '2022-03-31 11:05:44.000', 0, '');
+INSERT INTO `act_hi_actinst`
+VALUES ('302594', 'process_leave:1:302555', '302556', '302556', 'user2', '302595', NULL, '人事审批', 'userTask',
+		'98b051b03681de6028993a5d14ac93cb', '2022-03-31 11:05:44.000', NULL, NULL, '');
+INSERT INTO `act_hi_actinst`
+VALUES ('302600', 'process_leave:1:302555', '302599', '302599', 'start', NULL, NULL, 'start', 'startEvent', NULL,
+		'2022-03-31 11:16:00.000', '2022-03-31 11:16:00.000', 8, '');
+INSERT INTO `act_hi_actinst`
+VALUES ('302608', 'process_leave:1:302555', '302599', '302599', 'user1', '302609', NULL, '经理审批', 'userTask',
+		'0b7625fedaa05e85f282486e1c9c91b9', '2022-03-31 11:16:00.000', '2022-03-31 11:18:00.000', 120357, '');
+INSERT INTO `act_hi_actinst`
+VALUES ('302622', 'process_leave:1:302555', '302599', '302599', 'sid-950749EA-4BB6-4276-B67A-DE03E34A0573', NULL, NULL,
+		NULL, 'exclusiveGateway', NULL, '2022-03-31 11:18:00.000', '2022-03-31 11:18:00.000', 0, '');
+INSERT INTO `act_hi_actinst`
+VALUES ('302624', 'process_leave:1:302555', '302599', '302623', 'child', NULL, NULL, 'subProcess', 'subProcess', NULL,
+		'2022-03-31 11:18:00.000', NULL, NULL, '');
+INSERT INTO `act_hi_actinst`
+VALUES ('302625', 'process_leave:1:302555', '302599', '302623', 'sstart', NULL, NULL, NULL, 'startEvent', NULL,
+		'2022-03-31 11:18:00.000', '2022-03-31 11:18:00.000', 9, '');
+INSERT INTO `act_hi_actinst`
+VALUES ('302626', 'process_leave:1:302555', '302599', '302623', 'allmanager', '302627', NULL, '总经理审批', 'userTask',
+		'd818ac6a86cf1a64d2184bf0699d67a8', '2022-03-31 11:18:00.000', NULL, NULL, '');
 
 -- ----------------------------
 -- Table structure for act_hi_attachment
 -- ----------------------------
 DROP TABLE IF EXISTS `act_hi_attachment`;
-CREATE TABLE `act_hi_attachment`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `REV_` int(11) NULL DEFAULT NULL,
-  `USER_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `NAME_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `DESCRIPTION_` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TYPE_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TASK_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `URL_` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `CONTENT_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TIME_` datetime(3) NULL DEFAULT NULL,
-  PRIMARY KEY (`ID_`) USING BTREE
+CREATE TABLE `act_hi_attachment`
+(
+	`ID_`           varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`REV_`          int(11) NULL DEFAULT NULL,
+	`USER_ID_`      varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`NAME_`         varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`DESCRIPTION_`  varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TYPE_`         varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TASK_ID_`      varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`URL_`          varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`CONTENT_ID_`   varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TIME_`         datetime(3) NULL DEFAULT NULL,
+	PRIMARY KEY (`ID_`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for act_hi_comment
 -- ----------------------------
 DROP TABLE IF EXISTS `act_hi_comment`;
-CREATE TABLE `act_hi_comment`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `TYPE_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TIME_` datetime(3) NOT NULL,
-  `USER_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TASK_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `ACTION_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `MESSAGE_` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `FULL_MSG_` longblob NULL,
-  PRIMARY KEY (`ID_`) USING BTREE
+CREATE TABLE `act_hi_comment`
+(
+	`ID_`           varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`TYPE_`         varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TIME_`         datetime(3) NOT NULL,
+	`USER_ID_`      varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TASK_ID_`      varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`ACTION_`       varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`MESSAGE_`      varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`FULL_MSG_`     longblob NULL,
+	PRIMARY KEY (`ID_`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for act_hi_detail
 -- ----------------------------
 DROP TABLE IF EXISTS `act_hi_detail`;
-CREATE TABLE `act_hi_detail`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `TYPE_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `EXECUTION_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TASK_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `ACT_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `NAME_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `VAR_TYPE_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `REV_` int(11) NULL DEFAULT NULL,
-  `TIME_` datetime(3) NOT NULL,
-  `BYTEARRAY_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `DOUBLE_` double NULL DEFAULT NULL,
-  `LONG_` bigint(20) NULL DEFAULT NULL,
-  `TEXT_` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TEXT2_` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  PRIMARY KEY (`ID_`) USING BTREE,
-  INDEX `ACT_IDX_HI_DETAIL_PROC_INST`(`PROC_INST_ID_`) USING BTREE,
-  INDEX `ACT_IDX_HI_DETAIL_ACT_INST`(`ACT_INST_ID_`) USING BTREE,
-  INDEX `ACT_IDX_HI_DETAIL_TIME`(`TIME_`) USING BTREE,
-  INDEX `ACT_IDX_HI_DETAIL_NAME`(`NAME_`) USING BTREE,
-  INDEX `ACT_IDX_HI_DETAIL_TASK_ID`(`TASK_ID_`) USING BTREE
+CREATE TABLE `act_hi_detail`
+(
+	`ID_`           varchar(64) CHARACTER SET utf8 COLLATE utf8_bin  NOT NULL,
+	`TYPE_`         varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`EXECUTION_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TASK_ID_`      varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`ACT_INST_ID_`  varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`NAME_`         varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`VAR_TYPE_`     varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`REV_`          int(11) NULL DEFAULT NULL,
+	`TIME_`         datetime(3) NOT NULL,
+	`BYTEARRAY_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`DOUBLE_`       double NULL DEFAULT NULL,
+	`LONG_`         bigint(20) NULL DEFAULT NULL,
+	`TEXT_`         varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TEXT2_`        varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	PRIMARY KEY (`ID_`) USING BTREE,
+	INDEX           `ACT_IDX_HI_DETAIL_PROC_INST`(`PROC_INST_ID_`) USING BTREE,
+	INDEX           `ACT_IDX_HI_DETAIL_ACT_INST`(`ACT_INST_ID_`) USING BTREE,
+	INDEX           `ACT_IDX_HI_DETAIL_TIME`(`TIME_`) USING BTREE,
+	INDEX           `ACT_IDX_HI_DETAIL_NAME`(`NAME_`) USING BTREE,
+	INDEX           `ACT_IDX_HI_DETAIL_TASK_ID`(`TASK_ID_`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of act_hi_detail
 -- ----------------------------
-INSERT INTO `act_hi_detail` VALUES ('247558', 'VariableUpdate', '247552', '247552', NULL, '247553', 'userLeave', 'serializable', 0, '2018-06-14 23:44:03.000', '247557', NULL, NULL, NULL, NULL);
-INSERT INTO `act_hi_detail` VALUES ('302562', 'VariableUpdate', '302556', '302556', NULL, '302557', 'baseTask', 'serializable', 0, '2022-03-31 10:59:17.000', '302561', NULL, NULL, NULL, NULL);
-INSERT INTO `act_hi_detail` VALUES ('302564', 'VariableUpdate', '302556', '302556', NULL, '302557', 'day', 'integer', 0, '2022-03-31 10:59:17.000', NULL, NULL, 3, '3', NULL);
-INSERT INTO `act_hi_detail` VALUES ('302570', 'VariableUpdate', '302556', '302556', NULL, '302565', 'flag', 'boolean', 0, '2022-03-31 11:04:52.000', NULL, NULL, 1, NULL, NULL);
-INSERT INTO `act_hi_detail` VALUES ('302572', 'VariableUpdate', '302556', '302556', NULL, '302565', 'needfinish', 'integer', 0, '2022-03-31 11:04:52.000', NULL, NULL, 1, '1', NULL);
-INSERT INTO `act_hi_detail` VALUES ('302577', 'VariableUpdate', '302556', '302556', NULL, '302565', 'leaveOpinionList', 'serializable', 0, '2022-03-31 11:04:52.000', '302576', NULL, NULL, NULL, NULL);
-INSERT INTO `act_hi_detail` VALUES ('302578', 'VariableUpdate', '302556', '302556', NULL, '302565', 'day', 'integer', 1, '2022-03-31 11:04:52.000', NULL, NULL, 3, '3', NULL);
-INSERT INTO `act_hi_detail` VALUES ('302586', 'VariableUpdate', '302556', '302556', NULL, '302583', 'flag', 'boolean', 1, '2022-03-31 11:05:44.000', NULL, NULL, 1, NULL, NULL);
-INSERT INTO `act_hi_detail` VALUES ('302587', 'VariableUpdate', '302556', '302556', NULL, '302583', 'needfinish', 'integer', 1, '2022-03-31 11:05:44.000', NULL, NULL, 1, '1', NULL);
-INSERT INTO `act_hi_detail` VALUES ('302589', 'VariableUpdate', '302556', '302556', NULL, '302583', 'leaveOpinionList', 'serializable', 1, '2022-03-31 11:05:44.000', '302588', NULL, NULL, NULL, NULL);
-INSERT INTO `act_hi_detail` VALUES ('302590', 'VariableUpdate', '302556', '302556', NULL, '302583', 'day', 'integer', 1, '2022-03-31 11:05:44.000', NULL, NULL, 3, '3', NULL);
-INSERT INTO `act_hi_detail` VALUES ('302605', 'VariableUpdate', '302599', '302599', NULL, '302600', 'baseTask', 'serializable', 0, '2022-03-31 11:16:00.000', '302604', NULL, NULL, NULL, NULL);
-INSERT INTO `act_hi_detail` VALUES ('302607', 'VariableUpdate', '302599', '302599', NULL, '302600', 'day', 'integer', 0, '2022-03-31 11:16:00.000', NULL, NULL, 5, '5', NULL);
-INSERT INTO `act_hi_detail` VALUES ('302613', 'VariableUpdate', '302599', '302599', NULL, '302608', 'flag', 'boolean', 0, '2022-03-31 11:18:00.000', NULL, NULL, 1, NULL, NULL);
-INSERT INTO `act_hi_detail` VALUES ('302615', 'VariableUpdate', '302599', '302599', NULL, '302608', 'needfinish', 'integer', 0, '2022-03-31 11:18:00.000', NULL, NULL, 1, '1', NULL);
-INSERT INTO `act_hi_detail` VALUES ('302620', 'VariableUpdate', '302599', '302599', NULL, '302608', 'leaveOpinionList', 'serializable', 0, '2022-03-31 11:18:00.000', '302619', NULL, NULL, NULL, NULL);
-INSERT INTO `act_hi_detail` VALUES ('302621', 'VariableUpdate', '302599', '302599', NULL, '302608', 'day', 'integer', 1, '2022-03-31 11:18:00.000', NULL, NULL, 5, '5', NULL);
+INSERT INTO `act_hi_detail`
+VALUES ('247558', 'VariableUpdate', '247552', '247552', NULL, '247553', 'userLeave', 'serializable', 0,
+		'2018-06-14 23:44:03.000', '247557', NULL, NULL, NULL, NULL);
+INSERT INTO `act_hi_detail`
+VALUES ('302562', 'VariableUpdate', '302556', '302556', NULL, '302557', 'baseTask', 'serializable', 0,
+		'2022-03-31 10:59:17.000', '302561', NULL, NULL, NULL, NULL);
+INSERT INTO `act_hi_detail`
+VALUES ('302564', 'VariableUpdate', '302556', '302556', NULL, '302557', 'day', 'integer', 0, '2022-03-31 10:59:17.000',
+		NULL, NULL, 3, '3', NULL);
+INSERT INTO `act_hi_detail`
+VALUES ('302570', 'VariableUpdate', '302556', '302556', NULL, '302565', 'flag', 'boolean', 0, '2022-03-31 11:04:52.000',
+		NULL, NULL, 1, NULL, NULL);
+INSERT INTO `act_hi_detail`
+VALUES ('302572', 'VariableUpdate', '302556', '302556', NULL, '302565', 'needfinish', 'integer', 0,
+		'2022-03-31 11:04:52.000', NULL, NULL, 1, '1', NULL);
+INSERT INTO `act_hi_detail`
+VALUES ('302577', 'VariableUpdate', '302556', '302556', NULL, '302565', 'leaveOpinionList', 'serializable', 0,
+		'2022-03-31 11:04:52.000', '302576', NULL, NULL, NULL, NULL);
+INSERT INTO `act_hi_detail`
+VALUES ('302578', 'VariableUpdate', '302556', '302556', NULL, '302565', 'day', 'integer', 1, '2022-03-31 11:04:52.000',
+		NULL, NULL, 3, '3', NULL);
+INSERT INTO `act_hi_detail`
+VALUES ('302586', 'VariableUpdate', '302556', '302556', NULL, '302583', 'flag', 'boolean', 1, '2022-03-31 11:05:44.000',
+		NULL, NULL, 1, NULL, NULL);
+INSERT INTO `act_hi_detail`
+VALUES ('302587', 'VariableUpdate', '302556', '302556', NULL, '302583', 'needfinish', 'integer', 1,
+		'2022-03-31 11:05:44.000', NULL, NULL, 1, '1', NULL);
+INSERT INTO `act_hi_detail`
+VALUES ('302589', 'VariableUpdate', '302556', '302556', NULL, '302583', 'leaveOpinionList', 'serializable', 1,
+		'2022-03-31 11:05:44.000', '302588', NULL, NULL, NULL, NULL);
+INSERT INTO `act_hi_detail`
+VALUES ('302590', 'VariableUpdate', '302556', '302556', NULL, '302583', 'day', 'integer', 1, '2022-03-31 11:05:44.000',
+		NULL, NULL, 3, '3', NULL);
+INSERT INTO `act_hi_detail`
+VALUES ('302605', 'VariableUpdate', '302599', '302599', NULL, '302600', 'baseTask', 'serializable', 0,
+		'2022-03-31 11:16:00.000', '302604', NULL, NULL, NULL, NULL);
+INSERT INTO `act_hi_detail`
+VALUES ('302607', 'VariableUpdate', '302599', '302599', NULL, '302600', 'day', 'integer', 0, '2022-03-31 11:16:00.000',
+		NULL, NULL, 5, '5', NULL);
+INSERT INTO `act_hi_detail`
+VALUES ('302613', 'VariableUpdate', '302599', '302599', NULL, '302608', 'flag', 'boolean', 0, '2022-03-31 11:18:00.000',
+		NULL, NULL, 1, NULL, NULL);
+INSERT INTO `act_hi_detail`
+VALUES ('302615', 'VariableUpdate', '302599', '302599', NULL, '302608', 'needfinish', 'integer', 0,
+		'2022-03-31 11:18:00.000', NULL, NULL, 1, '1', NULL);
+INSERT INTO `act_hi_detail`
+VALUES ('302620', 'VariableUpdate', '302599', '302599', NULL, '302608', 'leaveOpinionList', 'serializable', 0,
+		'2022-03-31 11:18:00.000', '302619', NULL, NULL, NULL, NULL);
+INSERT INTO `act_hi_detail`
+VALUES ('302621', 'VariableUpdate', '302599', '302599', NULL, '302608', 'day', 'integer', 1, '2022-03-31 11:18:00.000',
+		NULL, NULL, 5, '5', NULL);
 
 -- ----------------------------
 -- Table structure for act_hi_identitylink
 -- ----------------------------
 DROP TABLE IF EXISTS `act_hi_identitylink`;
-CREATE TABLE `act_hi_identitylink`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `GROUP_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TYPE_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `USER_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TASK_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  PRIMARY KEY (`ID_`) USING BTREE,
-  INDEX `ACT_IDX_HI_IDENT_LNK_USER`(`USER_ID_`) USING BTREE,
-  INDEX `ACT_IDX_HI_IDENT_LNK_TASK`(`TASK_ID_`) USING BTREE,
-  INDEX `ACT_IDX_HI_IDENT_LNK_PROCINST`(`PROC_INST_ID_`) USING BTREE
+CREATE TABLE `act_hi_identitylink`
+(
+	`ID_`           varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`GROUP_ID_`     varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TYPE_`         varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`USER_ID_`      varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TASK_ID_`      varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	PRIMARY KEY (`ID_`) USING BTREE,
+	INDEX           `ACT_IDX_HI_IDENT_LNK_USER`(`USER_ID_`) USING BTREE,
+	INDEX           `ACT_IDX_HI_IDENT_LNK_TASK`(`TASK_ID_`) USING BTREE,
+	INDEX           `ACT_IDX_HI_IDENT_LNK_PROCINST`(`PROC_INST_ID_`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of act_hi_identitylink
 -- ----------------------------
-INSERT INTO `act_hi_identitylink` VALUES ('302567', NULL, 'participant', '0b7625fedaa05e85f282486e1c9c91b9', NULL, '302556');
-INSERT INTO `act_hi_identitylink` VALUES ('302568', 'e346e96368484c8fa7f217ce550a0186', 'candidate', NULL, '302566', NULL);
-INSERT INTO `act_hi_identitylink` VALUES ('302585', NULL, 'participant', 'd818ac6a86cf1a64d2184bf0699d67a8', NULL, '302556');
-INSERT INTO `act_hi_identitylink` VALUES ('302596', NULL, 'participant', '98b051b03681de6028993a5d14ac93cb', NULL, '302556');
-INSERT INTO `act_hi_identitylink` VALUES ('302610', NULL, 'participant', '0b7625fedaa05e85f282486e1c9c91b9', NULL, '302599');
-INSERT INTO `act_hi_identitylink` VALUES ('302611', 'e346e96368484c8fa7f217ce550a0186', 'candidate', NULL, '302609', NULL);
-INSERT INTO `act_hi_identitylink` VALUES ('302628', NULL, 'participant', 'd818ac6a86cf1a64d2184bf0699d67a8', NULL, '302599');
+INSERT INTO `act_hi_identitylink`
+VALUES ('302567', NULL, 'participant', '0b7625fedaa05e85f282486e1c9c91b9', NULL, '302556');
+INSERT INTO `act_hi_identitylink`
+VALUES ('302568', 'e346e96368484c8fa7f217ce550a0186', 'candidate', NULL, '302566', NULL);
+INSERT INTO `act_hi_identitylink`
+VALUES ('302585', NULL, 'participant', 'd818ac6a86cf1a64d2184bf0699d67a8', NULL, '302556');
+INSERT INTO `act_hi_identitylink`
+VALUES ('302596', NULL, 'participant', '98b051b03681de6028993a5d14ac93cb', NULL, '302556');
+INSERT INTO `act_hi_identitylink`
+VALUES ('302610', NULL, 'participant', '0b7625fedaa05e85f282486e1c9c91b9', NULL, '302599');
+INSERT INTO `act_hi_identitylink`
+VALUES ('302611', 'e346e96368484c8fa7f217ce550a0186', 'candidate', NULL, '302609', NULL);
+INSERT INTO `act_hi_identitylink`
+VALUES ('302628', NULL, 'participant', 'd818ac6a86cf1a64d2184bf0699d67a8', NULL, '302599');
 
 -- ----------------------------
 -- Table structure for act_hi_procinst
 -- ----------------------------
 DROP TABLE IF EXISTS `act_hi_procinst`;
-CREATE TABLE `act_hi_procinst`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `BUSINESS_KEY_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PROC_DEF_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `START_TIME_` datetime(3) NOT NULL,
-  `END_TIME_` datetime(3) NULL DEFAULT NULL,
-  `DURATION_` bigint(20) NULL DEFAULT NULL,
-  `START_USER_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `START_ACT_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `END_ACT_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `SUPER_PROCESS_INSTANCE_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `DELETE_REASON_` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TENANT_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
-  `NAME_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  PRIMARY KEY (`ID_`) USING BTREE,
-  UNIQUE INDEX `PROC_INST_ID_`(`PROC_INST_ID_`) USING BTREE,
-  INDEX `ACT_IDX_HI_PRO_INST_END`(`END_TIME_`) USING BTREE,
-  INDEX `ACT_IDX_HI_PRO_I_BUSKEY`(`BUSINESS_KEY_`) USING BTREE
+CREATE TABLE `act_hi_procinst`
+(
+	`ID_`                        varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`PROC_INST_ID_`              varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`BUSINESS_KEY_`              varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PROC_DEF_ID_`               varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`START_TIME_`                datetime(3) NOT NULL,
+	`END_TIME_`                  datetime(3) NULL DEFAULT NULL,
+	`DURATION_`                  bigint(20) NULL DEFAULT NULL,
+	`START_USER_ID_`             varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`START_ACT_ID_`              varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`END_ACT_ID_`                varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`SUPER_PROCESS_INSTANCE_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`DELETE_REASON_`             varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TENANT_ID_`                 varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
+	`NAME_`                      varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	PRIMARY KEY (`ID_`) USING BTREE,
+	UNIQUE INDEX `PROC_INST_ID_`(`PROC_INST_ID_`) USING BTREE,
+	INDEX                        `ACT_IDX_HI_PRO_INST_END`(`END_TIME_`) USING BTREE,
+	INDEX                        `ACT_IDX_HI_PRO_I_BUSKEY`(`BUSINESS_KEY_`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of act_hi_procinst
 -- ----------------------------
-INSERT INTO `act_hi_procinst` VALUES ('247552', '247552', NULL, 'process_leave:1:247536', '2018-06-14 23:44:03.000', NULL, NULL, NULL, 'start', NULL, NULL, NULL, '', NULL);
-INSERT INTO `act_hi_procinst` VALUES ('302556', '302556', NULL, 'process_leave:1:302555', '2022-03-31 10:59:17.000', NULL, NULL, NULL, 'start', NULL, NULL, NULL, '', NULL);
-INSERT INTO `act_hi_procinst` VALUES ('302599', '302599', NULL, 'process_leave:1:302555', '2022-03-31 11:16:00.000', NULL, NULL, NULL, 'start', NULL, NULL, NULL, '', NULL);
+INSERT INTO `act_hi_procinst`
+VALUES ('247552', '247552', NULL, 'process_leave:1:247536', '2018-06-14 23:44:03.000', NULL, NULL, NULL, 'start', NULL,
+		NULL, NULL, '', NULL);
+INSERT INTO `act_hi_procinst`
+VALUES ('302556', '302556', NULL, 'process_leave:1:302555', '2022-03-31 10:59:17.000', NULL, NULL, NULL, 'start', NULL,
+		NULL, NULL, '', NULL);
+INSERT INTO `act_hi_procinst`
+VALUES ('302599', '302599', NULL, 'process_leave:1:302555', '2022-03-31 11:16:00.000', NULL, NULL, NULL, 'start', NULL,
+		NULL, NULL, '', NULL);
 
 -- ----------------------------
 -- Table structure for act_hi_taskinst
 -- ----------------------------
 DROP TABLE IF EXISTS `act_hi_taskinst`;
-CREATE TABLE `act_hi_taskinst`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `PROC_DEF_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TASK_DEF_KEY_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `EXECUTION_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `NAME_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PARENT_TASK_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `DESCRIPTION_` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `OWNER_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `ASSIGNEE_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `START_TIME_` datetime(3) NOT NULL,
-  `CLAIM_TIME_` datetime(3) NULL DEFAULT NULL,
-  `END_TIME_` datetime(3) NULL DEFAULT NULL,
-  `DURATION_` bigint(20) NULL DEFAULT NULL,
-  `DELETE_REASON_` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PRIORITY_` int(11) NULL DEFAULT NULL,
-  `DUE_DATE_` datetime(3) NULL DEFAULT NULL,
-  `FORM_KEY_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `CATEGORY_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TENANT_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
-  PRIMARY KEY (`ID_`) USING BTREE,
-  INDEX `ACT_IDX_HI_TASK_INST_PROCINST`(`PROC_INST_ID_`) USING BTREE
+CREATE TABLE `act_hi_taskinst`
+(
+	`ID_`             varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`PROC_DEF_ID_`    varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TASK_DEF_KEY_`   varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PROC_INST_ID_`   varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`EXECUTION_ID_`   varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`NAME_`           varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PARENT_TASK_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`DESCRIPTION_`    varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`OWNER_`          varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`ASSIGNEE_`       varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`START_TIME_`     datetime(3) NOT NULL,
+	`CLAIM_TIME_`     datetime(3) NULL DEFAULT NULL,
+	`END_TIME_`       datetime(3) NULL DEFAULT NULL,
+	`DURATION_`       bigint(20) NULL DEFAULT NULL,
+	`DELETE_REASON_`  varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PRIORITY_`       int(11) NULL DEFAULT NULL,
+	`DUE_DATE_`       datetime(3) NULL DEFAULT NULL,
+	`FORM_KEY_`       varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`CATEGORY_`       varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TENANT_ID_`      varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
+	PRIMARY KEY (`ID_`) USING BTREE,
+	INDEX             `ACT_IDX_HI_TASK_INST_PROCINST`(`PROC_INST_ID_`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of act_hi_taskinst
 -- ----------------------------
-INSERT INTO `act_hi_taskinst` VALUES ('247560', 'process_leave:1:247536', 'user1', '247552', '247552', '经理审批', NULL, NULL, NULL, NULL, '2018-06-14 23:44:03.000', NULL, NULL, NULL, NULL, 50, NULL, NULL, NULL, '');
-INSERT INTO `act_hi_taskinst` VALUES ('302566', 'process_leave:1:302555', 'user1', '302556', '302556', '经理审批', NULL, NULL, NULL, '0b7625fedaa05e85f282486e1c9c91b9', '2022-03-31 10:59:17.000', NULL, '2022-03-31 11:04:52.000', 335519, 'completed', 50, NULL, NULL, NULL, '');
-INSERT INTO `act_hi_taskinst` VALUES ('302584', 'process_leave:1:302555', 'allmanager', '302556', '302580', '总经理审批', NULL, NULL, NULL, 'd818ac6a86cf1a64d2184bf0699d67a8', '2022-03-31 11:04:52.000', NULL, '2022-03-31 11:05:44.000', 52287, 'completed', 50, NULL, NULL, NULL, '');
-INSERT INTO `act_hi_taskinst` VALUES ('302595', 'process_leave:1:302555', 'user2', '302556', '302556', '人事审批', NULL, NULL, NULL, '98b051b03681de6028993a5d14ac93cb', '2022-03-31 11:05:44.000', NULL, NULL, NULL, NULL, 50, NULL, NULL, NULL, '');
-INSERT INTO `act_hi_taskinst` VALUES ('302609', 'process_leave:1:302555', 'user1', '302599', '302599', '经理审批', NULL, NULL, NULL, '0b7625fedaa05e85f282486e1c9c91b9', '2022-03-31 11:16:00.000', NULL, '2022-03-31 11:18:00.000', 120347, 'completed', 50, NULL, NULL, NULL, '');
-INSERT INTO `act_hi_taskinst` VALUES ('302627', 'process_leave:1:302555', 'allmanager', '302599', '302623', '总经理审批', NULL, NULL, NULL, 'd818ac6a86cf1a64d2184bf0699d67a8', '2022-03-31 11:18:00.000', NULL, NULL, NULL, NULL, 50, NULL, NULL, NULL, '');
+INSERT INTO `act_hi_taskinst`
+VALUES ('247560', 'process_leave:1:247536', 'user1', '247552', '247552', '经理审批', NULL, NULL, NULL, NULL,
+		'2018-06-14 23:44:03.000', NULL, NULL, NULL, NULL, 50, NULL, NULL, NULL, '');
+INSERT INTO `act_hi_taskinst`
+VALUES ('302566', 'process_leave:1:302555', 'user1', '302556', '302556', '经理审批', NULL, NULL, NULL,
+		'0b7625fedaa05e85f282486e1c9c91b9', '2022-03-31 10:59:17.000', NULL, '2022-03-31 11:04:52.000', 335519,
+		'completed', 50, NULL, NULL, NULL, '');
+INSERT INTO `act_hi_taskinst`
+VALUES ('302584', 'process_leave:1:302555', 'allmanager', '302556', '302580', '总经理审批', NULL, NULL, NULL,
+		'd818ac6a86cf1a64d2184bf0699d67a8', '2022-03-31 11:04:52.000', NULL, '2022-03-31 11:05:44.000', 52287,
+		'completed', 50, NULL, NULL, NULL, '');
+INSERT INTO `act_hi_taskinst`
+VALUES ('302595', 'process_leave:1:302555', 'user2', '302556', '302556', '人事审批', NULL, NULL, NULL,
+		'98b051b03681de6028993a5d14ac93cb', '2022-03-31 11:05:44.000', NULL, NULL, NULL, NULL, 50, NULL, NULL, NULL,
+		'');
+INSERT INTO `act_hi_taskinst`
+VALUES ('302609', 'process_leave:1:302555', 'user1', '302599', '302599', '经理审批', NULL, NULL, NULL,
+		'0b7625fedaa05e85f282486e1c9c91b9', '2022-03-31 11:16:00.000', NULL, '2022-03-31 11:18:00.000', 120347,
+		'completed', 50, NULL, NULL, NULL, '');
+INSERT INTO `act_hi_taskinst`
+VALUES ('302627', 'process_leave:1:302555', 'allmanager', '302599', '302623', '总经理审批', NULL, NULL, NULL,
+		'd818ac6a86cf1a64d2184bf0699d67a8', '2022-03-31 11:18:00.000', NULL, NULL, NULL, NULL, 50, NULL, NULL, NULL,
+		'');
 
 -- ----------------------------
 -- Table structure for act_hi_varinst
 -- ----------------------------
 DROP TABLE IF EXISTS `act_hi_varinst`;
-CREATE TABLE `act_hi_varinst`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `EXECUTION_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TASK_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `NAME_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `VAR_TYPE_` varchar(100) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `REV_` int(11) NULL DEFAULT NULL,
-  `BYTEARRAY_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `DOUBLE_` double NULL DEFAULT NULL,
-  `LONG_` bigint(20) NULL DEFAULT NULL,
-  `TEXT_` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TEXT2_` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `CREATE_TIME_` datetime(3) NULL DEFAULT NULL,
-  `LAST_UPDATED_TIME_` datetime(3) NULL DEFAULT NULL,
-  PRIMARY KEY (`ID_`) USING BTREE,
-  INDEX `ACT_IDX_HI_PROCVAR_PROC_INST`(`PROC_INST_ID_`) USING BTREE,
-  INDEX `ACT_IDX_HI_PROCVAR_NAME_TYPE`(`NAME_`, `VAR_TYPE_`) USING BTREE,
-  INDEX `ACT_IDX_HI_PROCVAR_TASK_ID`(`TASK_ID_`) USING BTREE
+CREATE TABLE `act_hi_varinst`
+(
+	`ID_`                varchar(64) CHARACTER SET utf8 COLLATE utf8_bin  NOT NULL,
+	`PROC_INST_ID_`      varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`EXECUTION_ID_`      varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TASK_ID_`           varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`NAME_`              varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`VAR_TYPE_`          varchar(100) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`REV_`               int(11) NULL DEFAULT NULL,
+	`BYTEARRAY_ID_`      varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`DOUBLE_`            double NULL DEFAULT NULL,
+	`LONG_`              bigint(20) NULL DEFAULT NULL,
+	`TEXT_`              varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TEXT2_`             varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`CREATE_TIME_`       datetime(3) NULL DEFAULT NULL,
+	`LAST_UPDATED_TIME_` datetime(3) NULL DEFAULT NULL,
+	PRIMARY KEY (`ID_`) USING BTREE,
+	INDEX                `ACT_IDX_HI_PROCVAR_PROC_INST`(`PROC_INST_ID_`) USING BTREE,
+	INDEX                `ACT_IDX_HI_PROCVAR_NAME_TYPE`(`NAME_`, `VAR_TYPE_`) USING BTREE,
+	INDEX                `ACT_IDX_HI_PROCVAR_TASK_ID`(`TASK_ID_`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of act_hi_varinst
 -- ----------------------------
-INSERT INTO `act_hi_varinst` VALUES ('247555', '247552', '247552', NULL, 'userLeave', 'serializable', 0, '247556', NULL, NULL, NULL, NULL, '2018-06-14 23:44:03.000', '2018-06-14 23:44:03.000');
-INSERT INTO `act_hi_varinst` VALUES ('302559', '302556', '302556', NULL, 'baseTask', 'serializable', 0, '302560', NULL, NULL, NULL, NULL, '2022-03-31 10:59:17.000', '2022-03-31 10:59:17.000');
-INSERT INTO `act_hi_varinst` VALUES ('302563', '302556', '302556', NULL, 'day', 'integer', 2, NULL, NULL, 3, '3', NULL, '2022-03-31 10:59:17.000', '2022-03-31 11:05:44.000');
-INSERT INTO `act_hi_varinst` VALUES ('302569', '302556', '302556', NULL, 'flag', 'boolean', 1, NULL, NULL, 1, NULL, NULL, '2022-03-31 11:04:52.000', '2022-03-31 11:05:44.000');
-INSERT INTO `act_hi_varinst` VALUES ('302571', '302556', '302556', NULL, 'needfinish', 'integer', 1, NULL, NULL, 1, '1', NULL, '2022-03-31 11:04:52.000', '2022-03-31 11:05:44.000');
-INSERT INTO `act_hi_varinst` VALUES ('302574', '302556', '302556', NULL, 'leaveOpinionList', 'serializable', 1, '302575', NULL, NULL, NULL, NULL, '2022-03-31 11:04:52.000', '2022-03-31 11:05:44.000');
-INSERT INTO `act_hi_varinst` VALUES ('302602', '302599', '302599', NULL, 'baseTask', 'serializable', 0, '302603', NULL, NULL, NULL, NULL, '2022-03-31 11:16:00.000', '2022-03-31 11:16:00.000');
-INSERT INTO `act_hi_varinst` VALUES ('302606', '302599', '302599', NULL, 'day', 'integer', 1, NULL, NULL, 5, '5', NULL, '2022-03-31 11:16:00.000', '2022-03-31 11:18:00.000');
-INSERT INTO `act_hi_varinst` VALUES ('302612', '302599', '302599', NULL, 'flag', 'boolean', 0, NULL, NULL, 1, NULL, NULL, '2022-03-31 11:18:00.000', '2022-03-31 11:18:00.000');
-INSERT INTO `act_hi_varinst` VALUES ('302614', '302599', '302599', NULL, 'needfinish', 'integer', 0, NULL, NULL, 1, '1', NULL, '2022-03-31 11:18:00.000', '2022-03-31 11:18:00.000');
-INSERT INTO `act_hi_varinst` VALUES ('302617', '302599', '302599', NULL, 'leaveOpinionList', 'serializable', 0, '302618', NULL, NULL, NULL, NULL, '2022-03-31 11:18:00.000', '2022-03-31 11:18:00.000');
+INSERT INTO `act_hi_varinst`
+VALUES ('247555', '247552', '247552', NULL, 'userLeave', 'serializable', 0, '247556', NULL, NULL, NULL, NULL,
+		'2018-06-14 23:44:03.000', '2018-06-14 23:44:03.000');
+INSERT INTO `act_hi_varinst`
+VALUES ('302559', '302556', '302556', NULL, 'baseTask', 'serializable', 0, '302560', NULL, NULL, NULL, NULL,
+		'2022-03-31 10:59:17.000', '2022-03-31 10:59:17.000');
+INSERT INTO `act_hi_varinst`
+VALUES ('302563', '302556', '302556', NULL, 'day', 'integer', 2, NULL, NULL, 3, '3', NULL, '2022-03-31 10:59:17.000',
+		'2022-03-31 11:05:44.000');
+INSERT INTO `act_hi_varinst`
+VALUES ('302569', '302556', '302556', NULL, 'flag', 'boolean', 1, NULL, NULL, 1, NULL, NULL, '2022-03-31 11:04:52.000',
+		'2022-03-31 11:05:44.000');
+INSERT INTO `act_hi_varinst`
+VALUES ('302571', '302556', '302556', NULL, 'needfinish', 'integer', 1, NULL, NULL, 1, '1', NULL,
+		'2022-03-31 11:04:52.000', '2022-03-31 11:05:44.000');
+INSERT INTO `act_hi_varinst`
+VALUES ('302574', '302556', '302556', NULL, 'leaveOpinionList', 'serializable', 1, '302575', NULL, NULL, NULL, NULL,
+		'2022-03-31 11:04:52.000', '2022-03-31 11:05:44.000');
+INSERT INTO `act_hi_varinst`
+VALUES ('302602', '302599', '302599', NULL, 'baseTask', 'serializable', 0, '302603', NULL, NULL, NULL, NULL,
+		'2022-03-31 11:16:00.000', '2022-03-31 11:16:00.000');
+INSERT INTO `act_hi_varinst`
+VALUES ('302606', '302599', '302599', NULL, 'day', 'integer', 1, NULL, NULL, 5, '5', NULL, '2022-03-31 11:16:00.000',
+		'2022-03-31 11:18:00.000');
+INSERT INTO `act_hi_varinst`
+VALUES ('302612', '302599', '302599', NULL, 'flag', 'boolean', 0, NULL, NULL, 1, NULL, NULL, '2022-03-31 11:18:00.000',
+		'2022-03-31 11:18:00.000');
+INSERT INTO `act_hi_varinst`
+VALUES ('302614', '302599', '302599', NULL, 'needfinish', 'integer', 0, NULL, NULL, 1, '1', NULL,
+		'2022-03-31 11:18:00.000', '2022-03-31 11:18:00.000');
+INSERT INTO `act_hi_varinst`
+VALUES ('302617', '302599', '302599', NULL, 'leaveOpinionList', 'serializable', 0, '302618', NULL, NULL, NULL, NULL,
+		'2022-03-31 11:18:00.000', '2022-03-31 11:18:00.000');
 
 -- ----------------------------
 -- Table structure for act_id_group
 -- ----------------------------
 DROP TABLE IF EXISTS `act_id_group`;
-CREATE TABLE `act_id_group`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `REV_` int(11) NULL DEFAULT NULL,
-  `NAME_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TYPE_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  PRIMARY KEY (`ID_`) USING BTREE
+CREATE TABLE `act_id_group`
+(
+	`ID_`   varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`REV_`  int(11) NULL DEFAULT NULL,
+	`NAME_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TYPE_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	PRIMARY KEY (`ID_`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of act_id_group
 -- ----------------------------
-INSERT INTO `act_id_group` VALUES ('023366f3457511e8bcf1309c2315f9aa', 1, 'hr', NULL);
-INSERT INTO `act_id_group` VALUES ('0ea934e5e55411e7b983201a068c6482', 1, 'manage', NULL);
-INSERT INTO `act_id_group` VALUES ('2619a672e53811e7b983201a068c6482', 1, 'admin', NULL);
-INSERT INTO `act_id_group` VALUES ('4bb891d8caf84cc6ba27e515e80ac40d', 1, 'blogAdmin', NULL);
-INSERT INTO `act_id_group` VALUES ('dcb0f642fe9611e7b472201a068c6482', 1, 'dev', NULL);
-INSERT INTO `act_id_group` VALUES ('e346e96368484c8fa7f217ce550a0186', 1, 'DeputyManager', NULL);
+INSERT INTO `act_id_group`
+VALUES ('023366f3457511e8bcf1309c2315f9aa', 1, 'hr', NULL);
+INSERT INTO `act_id_group`
+VALUES ('0ea934e5e55411e7b983201a068c6482', 1, 'manage', NULL);
+INSERT INTO `act_id_group`
+VALUES ('2619a672e53811e7b983201a068c6482', 1, 'admin', NULL);
+INSERT INTO `act_id_group`
+VALUES ('4bb891d8caf84cc6ba27e515e80ac40d', 1, 'blogAdmin', NULL);
+INSERT INTO `act_id_group`
+VALUES ('dcb0f642fe9611e7b472201a068c6482', 1, 'dev', NULL);
+INSERT INTO `act_id_group`
+VALUES ('e346e96368484c8fa7f217ce550a0186', 1, 'DeputyManager', NULL);
 
 -- ----------------------------
 -- Table structure for act_id_info
 -- ----------------------------
 DROP TABLE IF EXISTS `act_id_info`;
-CREATE TABLE `act_id_info`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `REV_` int(11) NULL DEFAULT NULL,
-  `USER_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TYPE_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `KEY_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `VALUE_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PASSWORD_` longblob NULL,
-  `PARENT_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  PRIMARY KEY (`ID_`) USING BTREE
+CREATE TABLE `act_id_info`
+(
+	`ID_`        varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`REV_`       int(11) NULL DEFAULT NULL,
+	`USER_ID_`   varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TYPE_`      varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`KEY_`       varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`VALUE_`     varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PASSWORD_`  longblob NULL,
+	`PARENT_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	PRIMARY KEY (`ID_`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for act_id_membership
 -- ----------------------------
 DROP TABLE IF EXISTS `act_id_membership`;
-CREATE TABLE `act_id_membership`  (
-  `USER_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `GROUP_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  PRIMARY KEY (`USER_ID_`, `GROUP_ID_`) USING BTREE,
-  INDEX `ACT_FK_MEMB_GROUP`(`GROUP_ID_`) USING BTREE,
-  CONSTRAINT `ACT_FK_MEMB_GROUP` FOREIGN KEY (`GROUP_ID_`) REFERENCES `act_id_group` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
-  CONSTRAINT `ACT_FK_MEMB_USER` FOREIGN KEY (`USER_ID_`) REFERENCES `act_id_user` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
+CREATE TABLE `act_id_membership`
+(
+	`USER_ID_`  varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`GROUP_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	PRIMARY KEY (`USER_ID_`, `GROUP_ID_`) USING BTREE,
+	INDEX       `ACT_FK_MEMB_GROUP`(`GROUP_ID_`) USING BTREE,
+	CONSTRAINT `ACT_FK_MEMB_GROUP` FOREIGN KEY (`GROUP_ID_`) REFERENCES `act_id_group` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+	CONSTRAINT `ACT_FK_MEMB_USER` FOREIGN KEY (`USER_ID_`) REFERENCES `act_id_user` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of act_id_membership
 -- ----------------------------
-INSERT INTO `act_id_membership` VALUES ('98b051b03681de6028993a5d14ac93cb', '023366f3457511e8bcf1309c2315f9aa');
-INSERT INTO `act_id_membership` VALUES ('d818ac6a86cf1a64d2184bf0699d67a8', '0ea934e5e55411e7b983201a068c6482');
-INSERT INTO `act_id_membership` VALUES ('acfc0e9232f54732a5d9ffe9071bf572', '2619a672e53811e7b983201a068c6482');
-INSERT INTO `act_id_membership` VALUES ('acfc0e9232f54732a5d9ffe9071bf572', '4bb891d8caf84cc6ba27e515e80ac40d');
-INSERT INTO `act_id_membership` VALUES ('5946a985f733c57f1ab71689f7b6aeea', 'dcb0f642fe9611e7b472201a068c6482');
-INSERT INTO `act_id_membership` VALUES ('0b7625fedaa05e85f282486e1c9c91b9', 'e346e96368484c8fa7f217ce550a0186');
+INSERT INTO `act_id_membership`
+VALUES ('98b051b03681de6028993a5d14ac93cb', '023366f3457511e8bcf1309c2315f9aa');
+INSERT INTO `act_id_membership`
+VALUES ('d818ac6a86cf1a64d2184bf0699d67a8', '0ea934e5e55411e7b983201a068c6482');
+INSERT INTO `act_id_membership`
+VALUES ('acfc0e9232f54732a5d9ffe9071bf572', '2619a672e53811e7b983201a068c6482');
+INSERT INTO `act_id_membership`
+VALUES ('acfc0e9232f54732a5d9ffe9071bf572', '4bb891d8caf84cc6ba27e515e80ac40d');
+INSERT INTO `act_id_membership`
+VALUES ('5946a985f733c57f1ab71689f7b6aeea', 'dcb0f642fe9611e7b472201a068c6482');
+INSERT INTO `act_id_membership`
+VALUES ('0b7625fedaa05e85f282486e1c9c91b9', 'e346e96368484c8fa7f217ce550a0186');
 
 -- ----------------------------
 -- Table structure for act_id_user
 -- ----------------------------
 DROP TABLE IF EXISTS `act_id_user`;
-CREATE TABLE `act_id_user`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `REV_` int(11) NULL DEFAULT NULL,
-  `FIRST_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `LAST_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `EMAIL_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PWD_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PICTURE_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  PRIMARY KEY (`ID_`) USING BTREE
+CREATE TABLE `act_id_user`
+(
+	`ID_`         varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`REV_`        int(11) NULL DEFAULT NULL,
+	`FIRST_`      varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`LAST_`       varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`EMAIL_`      varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PWD_`        varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PICTURE_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	PRIMARY KEY (`ID_`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of act_id_user
 -- ----------------------------
-INSERT INTO `act_id_user` VALUES ('0b7625fedaa05e85f282486e1c9c91b9', 1, NULL, NULL, '11@qq.com', NULL, NULL);
-INSERT INTO `act_id_user` VALUES ('5946a985f733c57f1ab71689f7b6aeea', 1, NULL, NULL, '11@qq.com', NULL, NULL);
-INSERT INTO `act_id_user` VALUES ('98b051b03681de6028993a5d14ac93cb', 1, NULL, NULL, '11@qq.com', NULL, NULL);
-INSERT INTO `act_id_user` VALUES ('acfc0e9232f54732a5d9ffe9071bf572', 1, NULL, NULL, '', NULL, NULL);
-INSERT INTO `act_id_user` VALUES ('d818ac6a86cf1a64d2184bf0699d67a8', 1, NULL, NULL, '11@qq.com', NULL, NULL);
+INSERT INTO `act_id_user`
+VALUES ('0b7625fedaa05e85f282486e1c9c91b9', 1, NULL, NULL, '11@qq.com', NULL, NULL);
+INSERT INTO `act_id_user`
+VALUES ('5946a985f733c57f1ab71689f7b6aeea', 1, NULL, NULL, '11@qq.com', NULL, NULL);
+INSERT INTO `act_id_user`
+VALUES ('98b051b03681de6028993a5d14ac93cb', 1, NULL, NULL, '11@qq.com', NULL, NULL);
+INSERT INTO `act_id_user`
+VALUES ('acfc0e9232f54732a5d9ffe9071bf572', 1, NULL, NULL, '', NULL, NULL);
+INSERT INTO `act_id_user`
+VALUES ('d818ac6a86cf1a64d2184bf0699d67a8', 1, NULL, NULL, '11@qq.com', NULL, NULL);
 
 -- ----------------------------
 -- Table structure for act_procdef_info
 -- ----------------------------
 DROP TABLE IF EXISTS `act_procdef_info`;
-CREATE TABLE `act_procdef_info`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `PROC_DEF_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `REV_` int(11) NULL DEFAULT NULL,
-  `INFO_JSON_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  PRIMARY KEY (`ID_`) USING BTREE,
-  UNIQUE INDEX `ACT_UNIQ_INFO_PROCDEF`(`PROC_DEF_ID_`) USING BTREE,
-  INDEX `ACT_IDX_INFO_PROCDEF`(`PROC_DEF_ID_`) USING BTREE,
-  INDEX `ACT_FK_INFO_JSON_BA`(`INFO_JSON_ID_`) USING BTREE,
-  CONSTRAINT `ACT_FK_INFO_JSON_BA` FOREIGN KEY (`INFO_JSON_ID_`) REFERENCES `act_ge_bytearray` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
-  CONSTRAINT `ACT_FK_INFO_PROCDEF` FOREIGN KEY (`PROC_DEF_ID_`) REFERENCES `act_re_procdef` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
+CREATE TABLE `act_procdef_info`
+(
+	`ID_`           varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`PROC_DEF_ID_`  varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`REV_`          int(11) NULL DEFAULT NULL,
+	`INFO_JSON_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	PRIMARY KEY (`ID_`) USING BTREE,
+	UNIQUE INDEX `ACT_UNIQ_INFO_PROCDEF`(`PROC_DEF_ID_`) USING BTREE,
+	INDEX           `ACT_IDX_INFO_PROCDEF`(`PROC_DEF_ID_`) USING BTREE,
+	INDEX           `ACT_FK_INFO_JSON_BA`(`INFO_JSON_ID_`) USING BTREE,
+	CONSTRAINT `ACT_FK_INFO_JSON_BA` FOREIGN KEY (`INFO_JSON_ID_`) REFERENCES `act_ge_bytearray` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+	CONSTRAINT `ACT_FK_INFO_PROCDEF` FOREIGN KEY (`PROC_DEF_ID_`) REFERENCES `act_re_procdef` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for act_re_deployment
 -- ----------------------------
 DROP TABLE IF EXISTS `act_re_deployment`;
-CREATE TABLE `act_re_deployment`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `NAME_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `CATEGORY_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TENANT_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
-  `DEPLOY_TIME_` timestamp(3) NULL DEFAULT NULL,
-  PRIMARY KEY (`ID_`) USING BTREE
+CREATE TABLE `act_re_deployment`
+(
+	`ID_`          varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`NAME_`        varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`CATEGORY_`    varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TENANT_ID_`   varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
+	`DEPLOY_TIME_` timestamp(3) NULL DEFAULT NULL,
+	PRIMARY KEY (`ID_`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of act_re_deployment
 -- ----------------------------
-INSERT INTO `act_re_deployment` VALUES ('247533', '请假流程', NULL, '', '2018-06-14 23:37:51.000');
-INSERT INTO `act_re_deployment` VALUES ('302552', '请假流程', NULL, '', '2022-03-31 10:58:53.000');
+INSERT INTO `act_re_deployment`
+VALUES ('247533', '请假流程', NULL, '', '2018-06-14 23:37:51.000');
+INSERT INTO `act_re_deployment`
+VALUES ('302552', '请假流程', NULL, '', '2022-03-31 10:58:53.000');
 
 -- ----------------------------
 -- Table structure for act_re_model
 -- ----------------------------
 DROP TABLE IF EXISTS `act_re_model`;
-CREATE TABLE `act_re_model`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `REV_` int(11) NULL DEFAULT NULL,
-  `NAME_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `KEY_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `CATEGORY_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `CREATE_TIME_` timestamp(3) NULL DEFAULT NULL,
-  `LAST_UPDATE_TIME_` timestamp(3) NULL DEFAULT NULL,
-  `VERSION_` int(11) NULL DEFAULT NULL,
-  `META_INFO_` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `DEPLOYMENT_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `EDITOR_SOURCE_VALUE_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `EDITOR_SOURCE_EXTRA_VALUE_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TENANT_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
-  PRIMARY KEY (`ID_`) USING BTREE,
-  INDEX `ACT_FK_MODEL_SOURCE`(`EDITOR_SOURCE_VALUE_ID_`) USING BTREE,
-  INDEX `ACT_FK_MODEL_SOURCE_EXTRA`(`EDITOR_SOURCE_EXTRA_VALUE_ID_`) USING BTREE,
-  INDEX `ACT_FK_MODEL_DEPLOYMENT`(`DEPLOYMENT_ID_`) USING BTREE,
-  CONSTRAINT `ACT_FK_MODEL_DEPLOYMENT` FOREIGN KEY (`DEPLOYMENT_ID_`) REFERENCES `act_re_deployment` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
-  CONSTRAINT `ACT_FK_MODEL_SOURCE` FOREIGN KEY (`EDITOR_SOURCE_VALUE_ID_`) REFERENCES `act_ge_bytearray` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
-  CONSTRAINT `ACT_FK_MODEL_SOURCE_EXTRA` FOREIGN KEY (`EDITOR_SOURCE_EXTRA_VALUE_ID_`) REFERENCES `act_ge_bytearray` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
+CREATE TABLE `act_re_model`
+(
+	`ID_`                           varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`REV_`                          int(11) NULL DEFAULT NULL,
+	`NAME_`                         varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`KEY_`                          varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`CATEGORY_`                     varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`CREATE_TIME_`                  timestamp(3) NULL DEFAULT NULL,
+	`LAST_UPDATE_TIME_`             timestamp(3) NULL DEFAULT NULL,
+	`VERSION_`                      int(11) NULL DEFAULT NULL,
+	`META_INFO_`                    varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`DEPLOYMENT_ID_`                varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`EDITOR_SOURCE_VALUE_ID_`       varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`EDITOR_SOURCE_EXTRA_VALUE_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TENANT_ID_`                    varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
+	PRIMARY KEY (`ID_`) USING BTREE,
+	INDEX                           `ACT_FK_MODEL_SOURCE`(`EDITOR_SOURCE_VALUE_ID_`) USING BTREE,
+	INDEX                           `ACT_FK_MODEL_SOURCE_EXTRA`(`EDITOR_SOURCE_EXTRA_VALUE_ID_`) USING BTREE,
+	INDEX                           `ACT_FK_MODEL_DEPLOYMENT`(`DEPLOYMENT_ID_`) USING BTREE,
+	CONSTRAINT `ACT_FK_MODEL_DEPLOYMENT` FOREIGN KEY (`DEPLOYMENT_ID_`) REFERENCES `act_re_deployment` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+	CONSTRAINT `ACT_FK_MODEL_SOURCE` FOREIGN KEY (`EDITOR_SOURCE_VALUE_ID_`) REFERENCES `act_ge_bytearray` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+	CONSTRAINT `ACT_FK_MODEL_SOURCE_EXTRA` FOREIGN KEY (`EDITOR_SOURCE_EXTRA_VALUE_ID_`) REFERENCES `act_ge_bytearray` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of act_re_model
 -- ----------------------------
-INSERT INTO `act_re_model` VALUES ('142517', 75, '请假流程', 'processKey', NULL, '2018-01-25 17:21:39.000', '2022-03-31 10:58:54.000', 1, '{\"name\":\"请假流程\",\"description\":\"\"}', '302552', '142518', '142519', '');
-INSERT INTO `act_re_model` VALUES ('212510', 11, '测试流程', 'processKey', NULL, '2018-04-27 19:57:22.000', '2018-12-11 23:10:00.000', 1, '{\"name\":\"测试流程\",\"description\":\"\"}', NULL, '212511', '212512', '');
-INSERT INTO `act_re_model` VALUES ('302597', 4, '新建流程', 'processKey', NULL, '2022-03-31 11:08:57.000', '2022-03-31 11:32:34.000', 1, '{\"name\":\"新建流程\",\"description\":\"\"}', NULL, '302598', '302633', '');
-INSERT INTO `act_re_model` VALUES ('302629', 2, '新建流程', 'processKey', NULL, '2022-03-31 11:25:58.000', '2022-03-31 11:25:58.000', 1, '{\"name\":\"新建流程\",\"description\":\"\",\"revision\":1}', NULL, '302630', NULL, '');
-INSERT INTO `act_re_model` VALUES ('302631', 2, '新建流程', 'processKey', NULL, '2022-03-31 11:31:43.000', '2022-03-31 11:31:43.000', 1, '{\"name\":\"新建流程\",\"description\":\"\",\"revision\":1}', NULL, '302632', NULL, '');
-INSERT INTO `act_re_model` VALUES ('302634', 2, '新建流程', 'processKey', NULL, '2022-03-31 11:39:26.000', '2022-03-31 11:39:26.000', 1, '{\"name\":\"新建流程\",\"description\":\"\",\"revision\":1}', NULL, '302635', NULL, '');
+INSERT INTO `act_re_model`
+VALUES ('142517', 75, '请假流程', 'processKey', NULL, '2018-01-25 17:21:39.000', '2022-03-31 10:58:54.000', 1,
+		'{\"name\":\"请假流程\",\"description\":\"\"}', '302552', '142518', '142519', '');
+INSERT INTO `act_re_model`
+VALUES ('212510', 11, '测试流程', 'processKey', NULL, '2018-04-27 19:57:22.000', '2018-12-11 23:10:00.000', 1,
+		'{\"name\":\"测试流程\",\"description\":\"\"}', NULL, '212511', '212512', '');
+INSERT INTO `act_re_model`
+VALUES ('302597', 4, '新建流程', 'processKey', NULL, '2022-03-31 11:08:57.000', '2022-03-31 11:32:34.000', 1,
+		'{\"name\":\"新建流程\",\"description\":\"\"}', NULL, '302598', '302633', '');
+INSERT INTO `act_re_model`
+VALUES ('302629', 2, '新建流程', 'processKey', NULL, '2022-03-31 11:25:58.000', '2022-03-31 11:25:58.000', 1,
+		'{\"name\":\"新建流程\",\"description\":\"\",\"revision\":1}', NULL, '302630', NULL, '');
+INSERT INTO `act_re_model`
+VALUES ('302631', 2, '新建流程', 'processKey', NULL, '2022-03-31 11:31:43.000', '2022-03-31 11:31:43.000', 1,
+		'{\"name\":\"新建流程\",\"description\":\"\",\"revision\":1}', NULL, '302632', NULL, '');
+INSERT INTO `act_re_model`
+VALUES ('302634', 2, '新建流程', 'processKey', NULL, '2022-03-31 11:39:26.000', '2022-03-31 11:39:26.000', 1,
+		'{\"name\":\"新建流程\",\"description\":\"\",\"revision\":1}', NULL, '302635', NULL, '');
 
 -- ----------------------------
 -- Table structure for act_re_procdef
 -- ----------------------------
 DROP TABLE IF EXISTS `act_re_procdef`;
-CREATE TABLE `act_re_procdef`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `REV_` int(11) NULL DEFAULT NULL,
-  `CATEGORY_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `NAME_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `KEY_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `VERSION_` int(11) NOT NULL,
-  `DEPLOYMENT_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `RESOURCE_NAME_` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `DGRM_RESOURCE_NAME_` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `DESCRIPTION_` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `HAS_START_FORM_KEY_` tinyint(4) NULL DEFAULT NULL,
-  `HAS_GRAPHICAL_NOTATION_` tinyint(4) NULL DEFAULT NULL,
-  `SUSPENSION_STATE_` int(11) NULL DEFAULT NULL,
-  `TENANT_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
-  PRIMARY KEY (`ID_`) USING BTREE,
-  UNIQUE INDEX `ACT_UNIQ_PROCDEF`(`KEY_`, `VERSION_`, `TENANT_ID_`) USING BTREE
+CREATE TABLE `act_re_procdef`
+(
+	`ID_`                     varchar(64) CHARACTER SET utf8 COLLATE utf8_bin  NOT NULL,
+	`REV_`                    int(11) NULL DEFAULT NULL,
+	`CATEGORY_`               varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`NAME_`                   varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`KEY_`                    varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`VERSION_`                int(11) NOT NULL,
+	`DEPLOYMENT_ID_`          varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`RESOURCE_NAME_`          varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`DGRM_RESOURCE_NAME_`     varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`DESCRIPTION_`            varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`HAS_START_FORM_KEY_`     tinyint(4) NULL DEFAULT NULL,
+	`HAS_GRAPHICAL_NOTATION_` tinyint(4) NULL DEFAULT NULL,
+	`SUSPENSION_STATE_`       int(11) NULL DEFAULT NULL,
+	`TENANT_ID_`              varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
+	PRIMARY KEY (`ID_`) USING BTREE,
+	UNIQUE INDEX `ACT_UNIQ_PROCDEF`(`KEY_`, `VERSION_`, `TENANT_ID_`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of act_re_procdef
 -- ----------------------------
-INSERT INTO `act_re_procdef` VALUES ('process_leave:1:302555', 1, 'http://www.activiti.org/processdef', '请假流程', 'process_leave', 1, '302552', '请假流程.bpmn20.xml', '请假流程.process_leave.png', NULL, 0, 1, 1, '');
+INSERT INTO `act_re_procdef`
+VALUES ('process_leave:1:302555', 1, 'http://www.activiti.org/processdef', '请假流程', 'process_leave', 1, '302552',
+		'请假流程.bpmn20.xml', '请假流程.process_leave.png', NULL, 0, 1, 1, '');
 
 -- ----------------------------
 -- Table structure for act_ru_event_subscr
 -- ----------------------------
 DROP TABLE IF EXISTS `act_ru_event_subscr`;
-CREATE TABLE `act_ru_event_subscr`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `REV_` int(11) NULL DEFAULT NULL,
-  `EVENT_TYPE_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `EVENT_NAME_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `EXECUTION_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `ACTIVITY_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `CONFIGURATION_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `CREATED_` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
-  `PROC_DEF_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TENANT_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
-  PRIMARY KEY (`ID_`) USING BTREE,
-  INDEX `ACT_IDX_EVENT_SUBSCR_CONFIG_`(`CONFIGURATION_`) USING BTREE,
-  INDEX `ACT_FK_EVENT_EXEC`(`EXECUTION_ID_`) USING BTREE,
-  CONSTRAINT `ACT_FK_EVENT_EXEC` FOREIGN KEY (`EXECUTION_ID_`) REFERENCES `act_ru_execution` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
+CREATE TABLE `act_ru_event_subscr`
+(
+	`ID_`            varchar(64) CHARACTER SET utf8 COLLATE utf8_bin  NOT NULL,
+	`REV_`           int(11) NULL DEFAULT NULL,
+	`EVENT_TYPE_`    varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`EVENT_NAME_`    varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`EXECUTION_ID_`  varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PROC_INST_ID_`  varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`ACTIVITY_ID_`   varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`CONFIGURATION_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`CREATED_`       timestamp(3)                                     NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+	`PROC_DEF_ID_`   varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TENANT_ID_`     varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
+	PRIMARY KEY (`ID_`) USING BTREE,
+	INDEX            `ACT_IDX_EVENT_SUBSCR_CONFIG_`(`CONFIGURATION_`) USING BTREE,
+	INDEX            `ACT_FK_EVENT_EXEC`(`EXECUTION_ID_`) USING BTREE,
+	CONSTRAINT `ACT_FK_EVENT_EXEC` FOREIGN KEY (`EXECUTION_ID_`) REFERENCES `act_ru_execution` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for act_ru_execution
 -- ----------------------------
 DROP TABLE IF EXISTS `act_ru_execution`;
-CREATE TABLE `act_ru_execution`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `REV_` int(11) NULL DEFAULT NULL,
-  `PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `BUSINESS_KEY_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PARENT_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PROC_DEF_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `SUPER_EXEC_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `ACT_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `IS_ACTIVE_` tinyint(4) NULL DEFAULT NULL,
-  `IS_CONCURRENT_` tinyint(4) NULL DEFAULT NULL,
-  `IS_SCOPE_` tinyint(4) NULL DEFAULT NULL,
-  `IS_EVENT_SCOPE_` tinyint(4) NULL DEFAULT NULL,
-  `SUSPENSION_STATE_` int(11) NULL DEFAULT NULL,
-  `CACHED_ENT_STATE_` int(11) NULL DEFAULT NULL,
-  `TENANT_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
-  `NAME_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `LOCK_TIME_` timestamp(3) NULL DEFAULT NULL,
-  PRIMARY KEY (`ID_`) USING BTREE,
-  INDEX `ACT_IDX_EXEC_BUSKEY`(`BUSINESS_KEY_`) USING BTREE,
-  INDEX `ACT_FK_EXE_PROCINST`(`PROC_INST_ID_`) USING BTREE,
-  INDEX `ACT_FK_EXE_PARENT`(`PARENT_ID_`) USING BTREE,
-  INDEX `ACT_FK_EXE_SUPER`(`SUPER_EXEC_`) USING BTREE,
-  INDEX `ACT_FK_EXE_PROCDEF`(`PROC_DEF_ID_`) USING BTREE,
-  CONSTRAINT `ACT_FK_EXE_PARENT` FOREIGN KEY (`PARENT_ID_`) REFERENCES `act_ru_execution` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
-  CONSTRAINT `ACT_FK_EXE_PROCDEF` FOREIGN KEY (`PROC_DEF_ID_`) REFERENCES `act_re_procdef` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
-  CONSTRAINT `ACT_FK_EXE_PROCINST` FOREIGN KEY (`PROC_INST_ID_`) REFERENCES `act_ru_execution` (`ID_`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `ACT_FK_EXE_SUPER` FOREIGN KEY (`SUPER_EXEC_`) REFERENCES `act_ru_execution` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
+CREATE TABLE `act_ru_execution`
+(
+	`ID_`               varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`REV_`              int(11) NULL DEFAULT NULL,
+	`PROC_INST_ID_`     varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`BUSINESS_KEY_`     varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PARENT_ID_`        varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PROC_DEF_ID_`      varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`SUPER_EXEC_`       varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`ACT_ID_`           varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`IS_ACTIVE_`        tinyint(4) NULL DEFAULT NULL,
+	`IS_CONCURRENT_`    tinyint(4) NULL DEFAULT NULL,
+	`IS_SCOPE_`         tinyint(4) NULL DEFAULT NULL,
+	`IS_EVENT_SCOPE_`   tinyint(4) NULL DEFAULT NULL,
+	`SUSPENSION_STATE_` int(11) NULL DEFAULT NULL,
+	`CACHED_ENT_STATE_` int(11) NULL DEFAULT NULL,
+	`TENANT_ID_`        varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
+	`NAME_`             varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`LOCK_TIME_`        timestamp(3) NULL DEFAULT NULL,
+	PRIMARY KEY (`ID_`) USING BTREE,
+	INDEX               `ACT_IDX_EXEC_BUSKEY`(`BUSINESS_KEY_`) USING BTREE,
+	INDEX               `ACT_FK_EXE_PROCINST`(`PROC_INST_ID_`) USING BTREE,
+	INDEX               `ACT_FK_EXE_PARENT`(`PARENT_ID_`) USING BTREE,
+	INDEX               `ACT_FK_EXE_SUPER`(`SUPER_EXEC_`) USING BTREE,
+	INDEX               `ACT_FK_EXE_PROCDEF`(`PROC_DEF_ID_`) USING BTREE,
+	CONSTRAINT `ACT_FK_EXE_PARENT` FOREIGN KEY (`PARENT_ID_`) REFERENCES `act_ru_execution` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+	CONSTRAINT `ACT_FK_EXE_PROCDEF` FOREIGN KEY (`PROC_DEF_ID_`) REFERENCES `act_re_procdef` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+	CONSTRAINT `ACT_FK_EXE_PROCINST` FOREIGN KEY (`PROC_INST_ID_`) REFERENCES `act_ru_execution` (`ID_`) ON DELETE CASCADE ON UPDATE CASCADE,
+	CONSTRAINT `ACT_FK_EXE_SUPER` FOREIGN KEY (`SUPER_EXEC_`) REFERENCES `act_ru_execution` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of act_ru_execution
 -- ----------------------------
-INSERT INTO `act_ru_execution` VALUES ('302556', 3, '302556', NULL, NULL, 'process_leave:1:302555', NULL, 'user2', 1, 0, 1, 0, 1, 2, '', NULL, NULL);
-INSERT INTO `act_ru_execution` VALUES ('302599', 2, '302599', NULL, NULL, 'process_leave:1:302555', NULL, NULL, 0, 0, 1, 0, 1, 0, '', NULL, NULL);
-INSERT INTO `act_ru_execution` VALUES ('302623', 1, '302599', NULL, '302599', 'process_leave:1:302555', NULL, 'allmanager', 1, 0, 1, 0, 1, 2, '', NULL, NULL);
+INSERT INTO `act_ru_execution`
+VALUES ('302556', 3, '302556', NULL, NULL, 'process_leave:1:302555', NULL, 'user2', 1, 0, 1, 0, 1, 2, '', NULL, NULL);
+INSERT INTO `act_ru_execution`
+VALUES ('302599', 2, '302599', NULL, NULL, 'process_leave:1:302555', NULL, NULL, 0, 0, 1, 0, 1, 0, '', NULL, NULL);
+INSERT INTO `act_ru_execution`
+VALUES ('302623', 1, '302599', NULL, '302599', 'process_leave:1:302555', NULL, 'allmanager', 1, 0, 1, 0, 1, 2, '', NULL,
+		NULL);
 
 -- ----------------------------
 -- Table structure for act_ru_identitylink
 -- ----------------------------
 DROP TABLE IF EXISTS `act_ru_identitylink`;
-CREATE TABLE `act_ru_identitylink`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `REV_` int(11) NULL DEFAULT NULL,
-  `GROUP_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TYPE_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `USER_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TASK_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PROC_DEF_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  PRIMARY KEY (`ID_`) USING BTREE,
-  INDEX `ACT_IDX_IDENT_LNK_USER`(`USER_ID_`) USING BTREE,
-  INDEX `ACT_IDX_IDENT_LNK_GROUP`(`GROUP_ID_`) USING BTREE,
-  INDEX `ACT_IDX_ATHRZ_PROCEDEF`(`PROC_DEF_ID_`) USING BTREE,
-  INDEX `ACT_FK_TSKASS_TASK`(`TASK_ID_`) USING BTREE,
-  INDEX `ACT_FK_IDL_PROCINST`(`PROC_INST_ID_`) USING BTREE,
-  CONSTRAINT `ACT_FK_ATHRZ_PROCEDEF` FOREIGN KEY (`PROC_DEF_ID_`) REFERENCES `act_re_procdef` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
-  CONSTRAINT `ACT_FK_IDL_PROCINST` FOREIGN KEY (`PROC_INST_ID_`) REFERENCES `act_ru_execution` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
-  CONSTRAINT `ACT_FK_TSKASS_TASK` FOREIGN KEY (`TASK_ID_`) REFERENCES `act_ru_task` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
+CREATE TABLE `act_ru_identitylink`
+(
+	`ID_`           varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`REV_`          int(11) NULL DEFAULT NULL,
+	`GROUP_ID_`     varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TYPE_`         varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`USER_ID_`      varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TASK_ID_`      varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PROC_DEF_ID_`  varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	PRIMARY KEY (`ID_`) USING BTREE,
+	INDEX           `ACT_IDX_IDENT_LNK_USER`(`USER_ID_`) USING BTREE,
+	INDEX           `ACT_IDX_IDENT_LNK_GROUP`(`GROUP_ID_`) USING BTREE,
+	INDEX           `ACT_IDX_ATHRZ_PROCEDEF`(`PROC_DEF_ID_`) USING BTREE,
+	INDEX           `ACT_FK_TSKASS_TASK`(`TASK_ID_`) USING BTREE,
+	INDEX           `ACT_FK_IDL_PROCINST`(`PROC_INST_ID_`) USING BTREE,
+	CONSTRAINT `ACT_FK_ATHRZ_PROCEDEF` FOREIGN KEY (`PROC_DEF_ID_`) REFERENCES `act_re_procdef` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+	CONSTRAINT `ACT_FK_IDL_PROCINST` FOREIGN KEY (`PROC_INST_ID_`) REFERENCES `act_ru_execution` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+	CONSTRAINT `ACT_FK_TSKASS_TASK` FOREIGN KEY (`TASK_ID_`) REFERENCES `act_ru_task` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of act_ru_identitylink
 -- ----------------------------
-INSERT INTO `act_ru_identitylink` VALUES ('302567', 1, NULL, 'participant', '0b7625fedaa05e85f282486e1c9c91b9', NULL, '302556', NULL);
-INSERT INTO `act_ru_identitylink` VALUES ('302585', 1, NULL, 'participant', 'd818ac6a86cf1a64d2184bf0699d67a8', NULL, '302556', NULL);
-INSERT INTO `act_ru_identitylink` VALUES ('302596', 1, NULL, 'participant', '98b051b03681de6028993a5d14ac93cb', NULL, '302556', NULL);
-INSERT INTO `act_ru_identitylink` VALUES ('302610', 1, NULL, 'participant', '0b7625fedaa05e85f282486e1c9c91b9', NULL, '302599', NULL);
-INSERT INTO `act_ru_identitylink` VALUES ('302628', 1, NULL, 'participant', 'd818ac6a86cf1a64d2184bf0699d67a8', NULL, '302599', NULL);
+INSERT INTO `act_ru_identitylink`
+VALUES ('302567', 1, NULL, 'participant', '0b7625fedaa05e85f282486e1c9c91b9', NULL, '302556', NULL);
+INSERT INTO `act_ru_identitylink`
+VALUES ('302585', 1, NULL, 'participant', 'd818ac6a86cf1a64d2184bf0699d67a8', NULL, '302556', NULL);
+INSERT INTO `act_ru_identitylink`
+VALUES ('302596', 1, NULL, 'participant', '98b051b03681de6028993a5d14ac93cb', NULL, '302556', NULL);
+INSERT INTO `act_ru_identitylink`
+VALUES ('302610', 1, NULL, 'participant', '0b7625fedaa05e85f282486e1c9c91b9', NULL, '302599', NULL);
+INSERT INTO `act_ru_identitylink`
+VALUES ('302628', 1, NULL, 'participant', 'd818ac6a86cf1a64d2184bf0699d67a8', NULL, '302599', NULL);
 
 -- ----------------------------
 -- Table structure for act_ru_job
 -- ----------------------------
 DROP TABLE IF EXISTS `act_ru_job`;
-CREATE TABLE `act_ru_job`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `REV_` int(11) NULL DEFAULT NULL,
-  `TYPE_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `LOCK_EXP_TIME_` timestamp(3) NULL DEFAULT NULL,
-  `LOCK_OWNER_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `EXCLUSIVE_` tinyint(1) NULL DEFAULT NULL,
-  `EXECUTION_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PROCESS_INSTANCE_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PROC_DEF_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `RETRIES_` int(11) NULL DEFAULT NULL,
-  `EXCEPTION_STACK_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `EXCEPTION_MSG_` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `DUEDATE_` timestamp(3) NULL DEFAULT NULL,
-  `REPEAT_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `HANDLER_TYPE_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `HANDLER_CFG_` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TENANT_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
-  PRIMARY KEY (`ID_`) USING BTREE,
-  INDEX `ACT_FK_JOB_EXCEPTION`(`EXCEPTION_STACK_ID_`) USING BTREE,
-  CONSTRAINT `ACT_FK_JOB_EXCEPTION` FOREIGN KEY (`EXCEPTION_STACK_ID_`) REFERENCES `act_ge_bytearray` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
+CREATE TABLE `act_ru_job`
+(
+	`ID_`                  varchar(64) CHARACTER SET utf8 COLLATE utf8_bin  NOT NULL,
+	`REV_`                 int(11) NULL DEFAULT NULL,
+	`TYPE_`                varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`LOCK_EXP_TIME_`       timestamp(3) NULL DEFAULT NULL,
+	`LOCK_OWNER_`          varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`EXCLUSIVE_`           tinyint(1) NULL DEFAULT NULL,
+	`EXECUTION_ID_`        varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PROCESS_INSTANCE_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PROC_DEF_ID_`         varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`RETRIES_`             int(11) NULL DEFAULT NULL,
+	`EXCEPTION_STACK_ID_`  varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`EXCEPTION_MSG_`       varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`DUEDATE_`             timestamp(3) NULL DEFAULT NULL,
+	`REPEAT_`              varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`HANDLER_TYPE_`        varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`HANDLER_CFG_`         varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TENANT_ID_`           varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
+	PRIMARY KEY (`ID_`) USING BTREE,
+	INDEX                  `ACT_FK_JOB_EXCEPTION`(`EXCEPTION_STACK_ID_`) USING BTREE,
+	CONSTRAINT `ACT_FK_JOB_EXCEPTION` FOREIGN KEY (`EXCEPTION_STACK_ID_`) REFERENCES `act_ge_bytearray` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for act_ru_task
 -- ----------------------------
 DROP TABLE IF EXISTS `act_ru_task`;
-CREATE TABLE `act_ru_task`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `REV_` int(11) NULL DEFAULT NULL,
-  `EXECUTION_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PROC_DEF_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `NAME_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PARENT_TASK_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `DESCRIPTION_` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TASK_DEF_KEY_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `OWNER_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `ASSIGNEE_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `DELEGATION_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PRIORITY_` int(11) NULL DEFAULT NULL,
-  `CREATE_TIME_` timestamp(3) NULL DEFAULT NULL,
-  `DUE_DATE_` datetime(3) NULL DEFAULT NULL,
-  `CATEGORY_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `SUSPENSION_STATE_` int(11) NULL DEFAULT NULL,
-  `TENANT_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
-  `FORM_KEY_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  PRIMARY KEY (`ID_`) USING BTREE,
-  INDEX `ACT_IDX_TASK_CREATE`(`CREATE_TIME_`) USING BTREE,
-  INDEX `ACT_FK_TASK_EXE`(`EXECUTION_ID_`) USING BTREE,
-  INDEX `ACT_FK_TASK_PROCINST`(`PROC_INST_ID_`) USING BTREE,
-  INDEX `ACT_FK_TASK_PROCDEF`(`PROC_DEF_ID_`) USING BTREE,
-  CONSTRAINT `ACT_FK_TASK_EXE` FOREIGN KEY (`EXECUTION_ID_`) REFERENCES `act_ru_execution` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
-  CONSTRAINT `ACT_FK_TASK_PROCDEF` FOREIGN KEY (`PROC_DEF_ID_`) REFERENCES `act_re_procdef` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
-  CONSTRAINT `ACT_FK_TASK_PROCINST` FOREIGN KEY (`PROC_INST_ID_`) REFERENCES `act_ru_execution` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
+CREATE TABLE `act_ru_task`
+(
+	`ID_`               varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`REV_`              int(11) NULL DEFAULT NULL,
+	`EXECUTION_ID_`     varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PROC_INST_ID_`     varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PROC_DEF_ID_`      varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`NAME_`             varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PARENT_TASK_ID_`   varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`DESCRIPTION_`      varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TASK_DEF_KEY_`     varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`OWNER_`            varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`ASSIGNEE_`         varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`DELEGATION_`       varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PRIORITY_`         int(11) NULL DEFAULT NULL,
+	`CREATE_TIME_`      timestamp(3) NULL DEFAULT NULL,
+	`DUE_DATE_`         datetime(3) NULL DEFAULT NULL,
+	`CATEGORY_`         varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`SUSPENSION_STATE_` int(11) NULL DEFAULT NULL,
+	`TENANT_ID_`        varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
+	`FORM_KEY_`         varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	PRIMARY KEY (`ID_`) USING BTREE,
+	INDEX               `ACT_IDX_TASK_CREATE`(`CREATE_TIME_`) USING BTREE,
+	INDEX               `ACT_FK_TASK_EXE`(`EXECUTION_ID_`) USING BTREE,
+	INDEX               `ACT_FK_TASK_PROCINST`(`PROC_INST_ID_`) USING BTREE,
+	INDEX               `ACT_FK_TASK_PROCDEF`(`PROC_DEF_ID_`) USING BTREE,
+	CONSTRAINT `ACT_FK_TASK_EXE` FOREIGN KEY (`EXECUTION_ID_`) REFERENCES `act_ru_execution` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+	CONSTRAINT `ACT_FK_TASK_PROCDEF` FOREIGN KEY (`PROC_DEF_ID_`) REFERENCES `act_re_procdef` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+	CONSTRAINT `ACT_FK_TASK_PROCINST` FOREIGN KEY (`PROC_INST_ID_`) REFERENCES `act_ru_execution` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of act_ru_task
 -- ----------------------------
-INSERT INTO `act_ru_task` VALUES ('302595', 1, '302556', '302556', 'process_leave:1:302555', '人事审批', NULL, NULL, 'user2', NULL, '98b051b03681de6028993a5d14ac93cb', NULL, 50, '2022-03-31 11:05:44.000', NULL, NULL, 1, '', NULL);
-INSERT INTO `act_ru_task` VALUES ('302627', 1, '302623', '302599', 'process_leave:1:302555', '总经理审批', NULL, NULL, 'allmanager', NULL, 'd818ac6a86cf1a64d2184bf0699d67a8', NULL, 50, '2022-03-31 11:18:00.000', NULL, NULL, 1, '', NULL);
+INSERT INTO `act_ru_task`
+VALUES ('302595', 1, '302556', '302556', 'process_leave:1:302555', '人事审批', NULL, NULL, 'user2', NULL,
+		'98b051b03681de6028993a5d14ac93cb', NULL, 50, '2022-03-31 11:05:44.000', NULL, NULL, 1, '', NULL);
+INSERT INTO `act_ru_task`
+VALUES ('302627', 1, '302623', '302599', 'process_leave:1:302555', '总经理审批', NULL, NULL, 'allmanager', NULL,
+		'd818ac6a86cf1a64d2184bf0699d67a8', NULL, 50, '2022-03-31 11:18:00.000', NULL, NULL, 1, '', NULL);
 
 -- ----------------------------
 -- Table structure for act_ru_variable
 -- ----------------------------
 DROP TABLE IF EXISTS `act_ru_variable`;
-CREATE TABLE `act_ru_variable`  (
-  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `REV_` int(11) NULL DEFAULT NULL,
-  `TYPE_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `NAME_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
-  `EXECUTION_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TASK_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `BYTEARRAY_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `DOUBLE_` double NULL DEFAULT NULL,
-  `LONG_` bigint(20) NULL DEFAULT NULL,
-  `TEXT_` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  `TEXT2_` varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
-  PRIMARY KEY (`ID_`) USING BTREE,
-  INDEX `ACT_IDX_VARIABLE_TASK_ID`(`TASK_ID_`) USING BTREE,
-  INDEX `ACT_FK_VAR_EXE`(`EXECUTION_ID_`) USING BTREE,
-  INDEX `ACT_FK_VAR_PROCINST`(`PROC_INST_ID_`) USING BTREE,
-  INDEX `ACT_FK_VAR_BYTEARRAY`(`BYTEARRAY_ID_`) USING BTREE,
-  CONSTRAINT `ACT_FK_VAR_BYTEARRAY` FOREIGN KEY (`BYTEARRAY_ID_`) REFERENCES `act_ge_bytearray` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
-  CONSTRAINT `ACT_FK_VAR_EXE` FOREIGN KEY (`EXECUTION_ID_`) REFERENCES `act_ru_execution` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
-  CONSTRAINT `ACT_FK_VAR_PROCINST` FOREIGN KEY (`PROC_INST_ID_`) REFERENCES `act_ru_execution` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
+CREATE TABLE `act_ru_variable`
+(
+	`ID_`           varchar(64) CHARACTER SET utf8 COLLATE utf8_bin  NOT NULL,
+	`REV_`          int(11) NULL DEFAULT NULL,
+	`TYPE_`         varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`NAME_`         varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+	`EXECUTION_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TASK_ID_`      varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`BYTEARRAY_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`DOUBLE_`       double NULL DEFAULT NULL,
+	`LONG_`         bigint(20) NULL DEFAULT NULL,
+	`TEXT_`         varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	`TEXT2_`        varchar(4000) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+	PRIMARY KEY (`ID_`) USING BTREE,
+	INDEX           `ACT_IDX_VARIABLE_TASK_ID`(`TASK_ID_`) USING BTREE,
+	INDEX           `ACT_FK_VAR_EXE`(`EXECUTION_ID_`) USING BTREE,
+	INDEX           `ACT_FK_VAR_PROCINST`(`PROC_INST_ID_`) USING BTREE,
+	INDEX           `ACT_FK_VAR_BYTEARRAY`(`BYTEARRAY_ID_`) USING BTREE,
+	CONSTRAINT `ACT_FK_VAR_BYTEARRAY` FOREIGN KEY (`BYTEARRAY_ID_`) REFERENCES `act_ge_bytearray` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+	CONSTRAINT `ACT_FK_VAR_EXE` FOREIGN KEY (`EXECUTION_ID_`) REFERENCES `act_ru_execution` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT,
+	CONSTRAINT `ACT_FK_VAR_PROCINST` FOREIGN KEY (`PROC_INST_ID_`) REFERENCES `act_ru_execution` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of act_ru_variable
 -- ----------------------------
-INSERT INTO `act_ru_variable` VALUES ('302559', 1, 'serializable', 'baseTask', '302556', '302556', NULL, '302558', NULL, NULL, NULL, NULL);
-INSERT INTO `act_ru_variable` VALUES ('302563', 1, 'integer', 'day', '302556', '302556', NULL, NULL, NULL, 3, '3', NULL);
-INSERT INTO `act_ru_variable` VALUES ('302569', 1, 'boolean', 'flag', '302556', '302556', NULL, NULL, NULL, 1, NULL, NULL);
-INSERT INTO `act_ru_variable` VALUES ('302571', 1, 'integer', 'needfinish', '302556', '302556', NULL, NULL, NULL, 1, '1', NULL);
-INSERT INTO `act_ru_variable` VALUES ('302574', 1, 'serializable', 'leaveOpinionList', '302556', '302556', NULL, '302573', NULL, NULL, NULL, NULL);
-INSERT INTO `act_ru_variable` VALUES ('302602', 1, 'serializable', 'baseTask', '302599', '302599', NULL, '302601', NULL, NULL, NULL, NULL);
-INSERT INTO `act_ru_variable` VALUES ('302606', 1, 'integer', 'day', '302599', '302599', NULL, NULL, NULL, 5, '5', NULL);
-INSERT INTO `act_ru_variable` VALUES ('302612', 1, 'boolean', 'flag', '302599', '302599', NULL, NULL, NULL, 1, NULL, NULL);
-INSERT INTO `act_ru_variable` VALUES ('302614', 1, 'integer', 'needfinish', '302599', '302599', NULL, NULL, NULL, 1, '1', NULL);
-INSERT INTO `act_ru_variable` VALUES ('302617', 1, 'serializable', 'leaveOpinionList', '302599', '302599', NULL, '302616', NULL, NULL, NULL, NULL);
+INSERT INTO `act_ru_variable`
+VALUES ('302559', 1, 'serializable', 'baseTask', '302556', '302556', NULL, '302558', NULL, NULL, NULL, NULL);
+INSERT INTO `act_ru_variable`
+VALUES ('302563', 1, 'integer', 'day', '302556', '302556', NULL, NULL, NULL, 3, '3', NULL);
+INSERT INTO `act_ru_variable`
+VALUES ('302569', 1, 'boolean', 'flag', '302556', '302556', NULL, NULL, NULL, 1, NULL, NULL);
+INSERT INTO `act_ru_variable`
+VALUES ('302571', 1, 'integer', 'needfinish', '302556', '302556', NULL, NULL, NULL, 1, '1', NULL);
+INSERT INTO `act_ru_variable`
+VALUES ('302574', 1, 'serializable', 'leaveOpinionList', '302556', '302556', NULL, '302573', NULL, NULL, NULL, NULL);
+INSERT INTO `act_ru_variable`
+VALUES ('302602', 1, 'serializable', 'baseTask', '302599', '302599', NULL, '302601', NULL, NULL, NULL, NULL);
+INSERT INTO `act_ru_variable`
+VALUES ('302606', 1, 'integer', 'day', '302599', '302599', NULL, NULL, NULL, 5, '5', NULL);
+INSERT INTO `act_ru_variable`
+VALUES ('302612', 1, 'boolean', 'flag', '302599', '302599', NULL, NULL, NULL, 1, NULL, NULL);
+INSERT INTO `act_ru_variable`
+VALUES ('302614', 1, 'integer', 'needfinish', '302599', '302599', NULL, NULL, NULL, 1, '1', NULL);
+INSERT INTO `act_ru_variable`
+VALUES ('302617', 1, 'serializable', 'leaveOpinionList', '302599', '302599', NULL, '302616', NULL, NULL, NULL, NULL);
 
 -- ----------------------------
 -- Table structure for base
 -- ----------------------------
 DROP TABLE IF EXISTS `base`;
-CREATE TABLE `base`  (
-  `id` int(11) NOT NULL,
-  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
+CREATE TABLE `base`
+(
+	`id`   int(11) NOT NULL,
+	`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
+	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of base
 -- ----------------------------
-INSERT INTO `base` VALUES (1, '22');
+INSERT INTO `base`
+VALUES (1, '22');
 
 -- ----------------------------
 -- Table structure for blog_article
 -- ----------------------------
 DROP TABLE IF EXISTS `blog_article`;
-CREATE TABLE `blog_article`  (
-  `id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'code',
-  `title` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '标题',
-  `first_img` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '列表缩略图',
-  `content` text CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '文章内容',
-  `read_number` int(11) NOT NULL DEFAULT 0 COMMENT '阅读次数',
-  `top_num` int(11) NULL DEFAULT 0 COMMENT '次序(置顶功能)',
-  `create_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `create_date` datetime(0) NULL DEFAULT NULL,
-  `update_date` datetime(0) NULL DEFAULT NULL,
-  `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '0正常1删除',
-  PRIMARY KEY (`id`) USING BTREE
+CREATE TABLE `blog_article`
+(
+	`id`          varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci  NOT NULL,
+	`code`        varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT 'code',
+	`title`       varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '标题',
+	`first_img`   varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '列表缩略图',
+	`content`     text CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '文章内容',
+	`read_number` int(11) NOT NULL DEFAULT 0 COMMENT '阅读次数',
+	`top_num`     int(11) NULL DEFAULT 0 COMMENT '次序(置顶功能)',
+	`create_by`   varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci  NOT NULL,
+	`update_by`   varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`create_date` datetime(0) NULL DEFAULT NULL,
+	`update_date` datetime(0) NULL DEFAULT NULL,
+	`del_flag`    tinyint(4) NOT NULL DEFAULT 0 COMMENT '0正常1删除',
+	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of blog_article
 -- ----------------------------
-INSERT INTO `blog_article` VALUES ('3887934708c54f49bc5a566f77e2a759', '76249265', 'hello，world', 'http://localhost:8081/img/77e5338a-217c-4b07-a3fd-63f20411dfcb.png', '<p>你好，世界</p><p class=\"ql-align-center\">&lt;img src=\"http://localhost:8081/img/1b805822-4d00-4695-acdd-90f68af6150e.jpg\"&gt;</p><p>\n</p><p><br></p><p class=\"ql-align-center\"><img src=\"http://localhost:8081/img/77e5338a-217c-4b07-a3fd-63f20411dfcb.png\"></p><p class=\"ql-align-center\"><img src=\"http://localhost:8081/img/d899b4da-8ceb-4a9b-bbc5-68b36146c9d6.png\"></p><p>&lt;img src=\"http://localhost:8081/img/1b805822-4d00-4695-acdd-90f68af6150e.jpg\"&gt;</p><p><img src=\"http://localhost:8081/img/9d45bdb0-9ac6-4853-b3d5-6ff9f3a21590.png\"></p><p><img src=\"http://localhost:8081/img/369f4fab-b26a-4ab5-9c35-4ee203f19fa5.png\"></p><p>\n</p><pre class=\"ql-syntax\" spellcheck=\"false\">JsonUtil json = new JsonUtil();\nList&lt;BlogCategory&gt; categories = categoryService.selectAll();\ncategories.sort(Comparator.comparing(BlogCategory::getSequence));\njson.setData(categories);\nreturn json;\n</pre>', 16, 0, 'acfc0e9232f54732a5d9ffe9071bf572', 'a4a743bffe9711e7b472201a068c6482', '2018-10-14 17:47:41', '2018-11-25 17:35:00', 0);
-INSERT INTO `blog_article` VALUES ('6e3fbd29b226452984428883d6e7a8a2', '53165934', '测试添加', 'http://localhost:8081/img/536ac5c8-ee9a-4826-9977-be8983622e00.png', '<p class=\"ql-align-center\"><strong><em>内容啦啦啦啦啦</em></strong><img src=\"http://localhost:8081/img/536ac5c8-ee9a-4826-9977-be8983622e00.png\"></p><p class=\"ql-align-center\"><br></p>', 15, 0, 'acfc0e9232f54732a5d9ffe9071bf572', 'a4a743bffe9711e7b472201a068c6482', '2018-11-19 22:57:25', '2018-11-25 18:55:34', 0);
-INSERT INTO `blog_article` VALUES ('89f445cbe3334a458a4126741170d1e1', 'ASDFG2', 'java基础1', NULL, 'Java基础知识', 130, 1, 'acfc0e9232f54732a5d9ffe9071bf572', NULL, '2018-10-01 11:24:59', NULL, 0);
-INSERT INTO `blog_article` VALUES ('89f445cbe3334a458a4126751170d1e1', 'ASDFG1', 'java基础2', NULL, 'Java基础知识', 127, 1, 'acfc0e9232f54732a5d9ffe9071bf572', NULL, '2018-10-01 11:23:59', NULL, 0);
-INSERT INTO `blog_article` VALUES ('89f445cbe3334a458a412691170d1e12', 'xcbbg', 'java基础3', NULL, '<p>Java基础知识</p>', 124, 0, 'acfc0e9232f54732a5d9ffe9071bf572', 'a4a743bffe9711e7b472201a068c6482', '2018-10-01 11:22:59', '2018-11-25 22:16:19', 0);
-INSERT INTO `blog_article` VALUES ('89f445cbe3334a458a4126951170d1e1', 'ASDFGC', 'java基础4', NULL, 'Java基础知识', 124, 1, 'acfc0e9232f54732a5d9ffe9071bf572', NULL, '2018-10-01 11:21:59', NULL, 0);
-INSERT INTO `blog_article` VALUES ('a9455e9f36bc4f33ba01412a64d87d6a', '26873592', '记一次spring boot 功能模块化 freemarker只能识别一个resources目录下前端展示模板问题', 'https://static.oschina.net/uploads/space/2018/0116/183901_IMPm_3312115.png', '<p>今天开发个人开源框架，完善了系统模块后，集成工作流功能模块，在新的resources下面新建freemarker前端页面(ftl页面)，然后正常开发到展示流程表的时候，后台报错情景重新：<strong>Could not resolve view with name \'/actList\' in servlet with name \'dispatcherServlet\'&nbsp;</strong></p><p><img src=\"https://static.oschina.net/uploads/space/2018/0116/183901_IMPm_3312115.png\" height=\"263\" width=\"793\"></p><p>当时我就想是不是映射地址出错了，检查多次后发现也没错，怎么spring mvc就映射不到呢，而且是相同的的地址路径(模块不一样)，和其他模块resources一致的路径，然后我系统模块是完全没问题的，我感觉应该是freemarker配置的问题，然后各种尝试，各种检查，各种查阅资料，发现，的确是freemarker的问题，我少配置了一项freemarker配置：<strong>FreeMarkerConfigurationFactory</strong>类下的属性：<strong>preferFileSystemAccess，&lt;---对就是它，</strong>我们来看源码发现默认是<strong>true</strong></p><pre class=\"ql-syntax\" spellcheck=\"false\">public class FreeMarkerConfigurationFactory {\n\n	protected final Log logger = LogFactory.getLog(getClass());\n\n	private Resource configLocation;\n\n	private Properties freemarkerSettings;\n\n	private Map&lt;String, Object&gt; freemarkerVariables;\n\n	private String defaultEncoding;\n\n	private final List&lt;TemplateLoader&gt; templateLoaders = new ArrayList&lt;TemplateLoader&gt;();\n\n	private List&lt;TemplateLoader&gt; preTemplateLoaders;\n\n	private List&lt;TemplateLoader&gt; postTemplateLoaders;\n\n	private String[] templateLoaderPaths;\n\n	private ResourceLoader resourceLoader = new DefaultResourceLoader();\n\n	private boolean preferFileSystemAccess = true;\n</pre><p>那么他是干嘛用的呢，我们看官方介绍是介绍：</p><p>Set whether to prefer file system access for template loading. File system access enables hot detection of template changes.</p><p>If this is enabled, FreeMarkerConfigurationFactory will try to resolve the specified \"templateLoaderPath\" as file system resource (which will work for expanded class path resources and ServletContext resources too).</p><p>Default is \"true\". Turn this off to always load via SpringTemplateLoader (i.e. as stream, without hot detection of template changes), which might be necessary if some of your templates reside in an expanded classes directory while others reside in jar files.</p><p>我们随便翻一下：第一句的意思是是否以更喜欢方式来访问模板</p><p>如果启用就以templateLoaderPath设置的路径来加载，默认为true，设置为false的话就以SpringTemplateLoader方式访问，那么就是流的方式访问，这可能是必要的,如果你的一些模板驻留在一个扩展的类而其他人驻留在jar文件的目录。</p><p>意思就是 如果你的文件在jar包文件目录下，就有必要设置为false，我们是多模块的，最终只运行一个模块，其他模块都是以jar包来加载的，我们要加载jar包里面的文件目录，必须要把这个属性设置为false才行，debug源码看看，先上配置文件：</p><pre class=\"ql-syntax\" spellcheck=\"false\">@Bean\n  public FreeMarkerConfigurer freemarkerConfig() throws IOException, TemplateException {\n    FreeMarkerConfigurationFactory factory = new FreeMarkerConfigurationFactory();\n    factory.setTemplateLoaderPath(\"classpath:/ftl/\");\n    factory.setDefaultEncoding(\"UTF-8\");\n    factory.setPreferFileSystemAccess(true);\n    FreeMarkerConfigurer result = new FreeMarkerConfigurer();\n    freemarker.template.Configuration configuration = factory.createConfiguration();\n    configuration.setClassicCompatible(true);\n    result.setConfiguration(configuration);\n    Properties settings = new Properties();\n    settings.put(\"template_update_delay\", \"0\");\n    settings.put(\"default_encoding\", \"UTF-8\");\n    settings.put(\"number_format\", \"0.######\");\n    settings.put(\"classic_compatible\", true);\n    settings.put(\"template_exception_handler\", \"ignore\");\n    result.setFreemarkerSettings(settings);\n    return result;\n  }\n</pre><p><strong>FreeMarkerConfigurationFactory</strong></p><p><img src=\"https://static.oschina.net/uploads/space/2018/0116/190228_Oq2F_3312115.png\" height=\"255\" width=\"1260\"></p><p>返回<img src=\"https://static.oschina.net/uploads/space/2018/0116/190505_StVf_3312115.png\" height=\"56\" width=\"781\"></p><p>最终返回：</p><p><img src=\"https://static.oschina.net/uploads/space/2018/0116/191335_abkt_3312115.png\" height=\"190\" width=\"1162\"></p><p>看到没，是单个模块的绝对路径ftl文件夹。</p><p>看图我们可以明确知道为true的话，加载的是设置的setTemplateLoaderPath的路径 也就是我其中一个模块下的ftl路径，所以<strong>其他模块下ftl路径是加载不出来的</strong>，也就<strong>是spring mvc 映射不到的原因。</strong></p><p>我们试试 将<strong>isPreferFileSystemAccess</strong>设置为<strong>false：</strong></p><p><img src=\"https://static.oschina.net/uploads/space/2018/0116/190741_z84S_3312115.png\" height=\"460\" width=\"947\"></p><p>最终我们跟到这里：</p><p><img src=\"https://static.oschina.net/uploads/space/2018/0116/191129_wHTf_3312115.png\" height=\"353\" width=\"952\"></p><p>发现路径是/ftl/而不是之前的绝对路径，然后set进spring对freemarker的配置对象中。</p><p>好的，我们通过分析源码我们可以知道，多模块下，我们<strong>设置为false，spring才能以相对路径来访问我们的模板文件夹</strong>，问题解决。</p>', 17, 1, 'acfc0e9232f54732a5d9ffe9071bf572', 'a4a743bffe9711e7b472201a068c6482', '2018-11-25 13:48:54', '2018-11-25 22:12:53', 0);
-INSERT INTO `blog_article` VALUES ('fd27b3ed7d344395b7766f596bf6fd06', '36152428', 'spring boot 2.0 集成shiro注意事项', NULL, '<p><span style=\"color: rgb(61, 70, 77);\">spring boot 2.0 全面拥抱java8，在安全验证上面 很大程度的简化了配置项，用shiro就要把security关闭， security 默认是开启的，在boot1.x版本可以通过配置项</span></p><pre class=\"ql-syntax\" spellcheck=\"false\">security:\n  basic:\n    enabled: false\nmanagement:\n  security:\n    enabled: false\n</pre><p>来禁用的，但是2.0由于安全和歧义，security相关配置项去除了，那么集成shiro就没效果。</p><p>通过在启动主方法添加注解：</p><pre class=\"ql-syntax\" spellcheck=\"false\">@EnableAutoConfiguration(exclude = {\n        org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class\n})\n</pre><p><span style=\"color: rgb(61, 70, 77);\">来禁止security自动启动配置，达到shiro集成效果，具体shiro集成和boot 1.x相同，具体可参考我之前集成shiro的博文：</span><a href=\"https://my.oschina.net/u/3312115/blog/1600830\" target=\"_blank\" style=\"color: rgb(30, 112, 191); background-color: rgb(255, 255, 255);\">https://my.oschina.net/u/3312115/blog/1600830</a></p><p><br></p><p>当spring boot为2.0 后 spring 默认升级到5.0以上，spring mvc对静态资源拦截的自定义方案：继承</p><p><br></p><p>WebMvcConfigurerAdapter 实现 addResourceHandlers 已经过时</p><p>，用继承：WebMvcConfigurationSupport 来替代即可，这里有一点要特别注意的，就是 有且只能继承一次WebMvcConfigurationSupport 多次会出现部分失效问题。</p><p><br></p>', 21, 1, 'acfc0e9232f54732a5d9ffe9071bf572', 'a4a743bffe9711e7b472201a068c6482', '2018-11-19 21:39:09', '2018-11-25 19:45:42', 0);
+INSERT INTO `blog_article`
+VALUES ('3887934708c54f49bc5a566f77e2a759', '76249265', 'hello，world',
+		'http://localhost:8081/img/77e5338a-217c-4b07-a3fd-63f20411dfcb.png',
+		'<p>你好，世界</p><p class=\"ql-align-center\">&lt;img src=\"http://localhost:8081/img/1b805822-4d00-4695-acdd-90f68af6150e.jpg\"&gt;</p><p>\n</p><p><br></p><p class=\"ql-align-center\"><img src=\"http://localhost:8081/img/77e5338a-217c-4b07-a3fd-63f20411dfcb.png\"></p><p class=\"ql-align-center\"><img src=\"http://localhost:8081/img/d899b4da-8ceb-4a9b-bbc5-68b36146c9d6.png\"></p><p>&lt;img src=\"http://localhost:8081/img/1b805822-4d00-4695-acdd-90f68af6150e.jpg\"&gt;</p><p><img src=\"http://localhost:8081/img/9d45bdb0-9ac6-4853-b3d5-6ff9f3a21590.png\"></p><p><img src=\"http://localhost:8081/img/369f4fab-b26a-4ab5-9c35-4ee203f19fa5.png\"></p><p>\n</p><pre class=\"ql-syntax\" spellcheck=\"false\">JsonUtil json = new JsonUtil();\nList&lt;BlogCategory&gt; categories = categoryService.selectAll();\ncategories.sort(Comparator.comparing(BlogCategory::getSequence));\njson.setData(categories);\nreturn json;\n</pre>',
+		16, 0, 'acfc0e9232f54732a5d9ffe9071bf572', 'a4a743bffe9711e7b472201a068c6482', '2018-10-14 17:47:41',
+		'2018-11-25 17:35:00', 0);
+INSERT INTO `blog_article`
+VALUES ('6e3fbd29b226452984428883d6e7a8a2', '53165934', '测试添加',
+		'http://localhost:8081/img/536ac5c8-ee9a-4826-9977-be8983622e00.png',
+		'<p class=\"ql-align-center\"><strong><em>内容啦啦啦啦啦</em></strong><img src=\"http://localhost:8081/img/536ac5c8-ee9a-4826-9977-be8983622e00.png\"></p><p class=\"ql-align-center\"><br></p>',
+		15, 0, 'acfc0e9232f54732a5d9ffe9071bf572', 'a4a743bffe9711e7b472201a068c6482', '2018-11-19 22:57:25',
+		'2018-11-25 18:55:34', 0);
+INSERT INTO `blog_article`
+VALUES ('89f445cbe3334a458a4126741170d1e1', 'ASDFG2', 'java基础1', NULL, 'Java基础知识', 130, 1,
+		'acfc0e9232f54732a5d9ffe9071bf572', NULL, '2018-10-01 11:24:59', NULL, 0);
+INSERT INTO `blog_article`
+VALUES ('89f445cbe3334a458a4126751170d1e1', 'ASDFG1', 'java基础2', NULL, 'Java基础知识', 127, 1,
+		'acfc0e9232f54732a5d9ffe9071bf572', NULL, '2018-10-01 11:23:59', NULL, 0);
+INSERT INTO `blog_article`
+VALUES ('89f445cbe3334a458a412691170d1e12', 'xcbbg', 'java基础3', NULL, '<p>Java基础知识</p>', 124, 0,
+		'acfc0e9232f54732a5d9ffe9071bf572', 'a4a743bffe9711e7b472201a068c6482', '2018-10-01 11:22:59',
+		'2018-11-25 22:16:19', 0);
+INSERT INTO `blog_article`
+VALUES ('89f445cbe3334a458a4126951170d1e1', 'ASDFGC', 'java基础4', NULL, 'Java基础知识', 124, 1,
+		'acfc0e9232f54732a5d9ffe9071bf572', NULL, '2018-10-01 11:21:59', NULL, 0);
+INSERT INTO `blog_article`
+VALUES ('a9455e9f36bc4f33ba01412a64d87d6a', '26873592',
+		'记一次spring boot 功能模块化 freemarker只能识别一个resources目录下前端展示模板问题',
+		'https://static.oschina.net/uploads/space/2018/0116/183901_IMPm_3312115.png',
+		'<p>今天开发个人开源框架，完善了系统模块后，集成工作流功能模块，在新的resources下面新建freemarker前端页面(ftl页面)，然后正常开发到展示流程表的时候，后台报错情景重新：<strong>Could not resolve view with name \' /
+		actList\' in servlet with name \'dispatcherServlet\'&nbsp;</strong></p><p><img src=\"https://static.oschina.net/uploads/space/2018/0116/183901_IMPm_3312115.png\" height=\"263\" width=\"793\"></p><p>当时我就想是不是映射地址出错了，检查多次后发现也没错，怎么spring mvc就映射不到呢，而且是相同的的地址路径(模块不一样)，和其他模块resources一致的路径，然后我系统模块是完全没问题的，我感觉应该是freemarker配置的问题，然后各种尝试，各种检查，各种查阅资料，发现，的确是freemarker的问题，我少配置了一项freemarker配置：<strong>FreeMarkerConfigurationFactory</strong>类下的属性：<strong>preferFileSystemAccess，&lt;---对就是它，</strong>我们来看源码发现默认是<strong>true</strong></p><pre class=\"ql-syntax\" spellcheck=\"false\">public class FreeMarkerConfigurationFactory {\n\n	protected final Log logger = LogFactory.getLog(getClass());\n\n	private Resource configLocation;\n\n	private Properties freemarkerSettings;\n\n	private Map&lt;String, Object&gt; freemarkerVariables;\n\n	private String defaultEncoding;\n\n	private final List&lt;TemplateLoader&gt; templateLoaders = new ArrayList&lt;TemplateLoader&gt;();\n\n	private List&lt;TemplateLoader&gt; preTemplateLoaders;\n\n	private List&lt;TemplateLoader&gt; postTemplateLoaders;\n\n	private String[] templateLoaderPaths;\n\n	private ResourceLoader resourceLoader = new DefaultResourceLoader();\n\n	private boolean preferFileSystemAccess = true;\n</pre><p>那么他是干嘛用的呢，我们看官方介绍是介绍：</p><p>Set whether to prefer file system access for template loading. File system access enables hot detection of template changes.</p><p>If this is enabled, FreeMarkerConfigurationFactory will try to resolve the specified \"templateLoaderPath\" as file system resource (which will work for expanded class path resources and ServletContext resources too).</p><p>Default is \"true\". Turn this off to always load via SpringTemplateLoader (i.e. as stream, without hot detection of template changes), which might be necessary if some of your templates reside in an expanded classes directory while others reside in jar files.</p><p>我们随便翻一下：第一句的意思是是否以更喜欢方式来访问模板</p><p>如果启用就以templateLoaderPath设置的路径来加载，默认为true，设置为false的话就以SpringTemplateLoader方式访问，那么就是流的方式访问，这可能是必要的,如果你的一些模板驻留在一个扩展的类而其他人驻留在jar文件的目录。</p><p>意思就是 如果你的文件在jar包文件目录下，就有必要设置为false，我们是多模块的，最终只运行一个模块，其他模块都是以jar包来加载的，我们要加载jar包里面的文件目录，必须要把这个属性设置为false才行，debug源码看看，先上配置文件：</p><pre class=\"ql-syntax\" spellcheck=\"false\">@Bean\n  public FreeMarkerConfigurer freemarkerConfig() throws IOException, TemplateException {\n    FreeMarkerConfigurationFactory factory = new FreeMarkerConfigurationFactory();\n    factory.setTemplateLoaderPath(\"classpath:/ftl/\");\n    factory.setDefaultEncoding(\"UTF-8\");\n    factory.setPreferFileSystemAccess(true);\n    FreeMarkerConfigurer result = new FreeMarkerConfigurer();\n    freemarker.template.Configuration configuration = factory.createConfiguration();\n    configuration.setClassicCompatible(true);\n    result.setConfiguration(configuration);\n    Properties settings = new Properties();\n    settings.put(\"template_update_delay\", \"0\");\n    settings.put(\"default_encoding\", \"UTF-8\");\n    settings.put(\"number_format\", \"0.######\");\n    settings.put(\"classic_compatible\", true);\n    settings.put(\"template_exception_handler\", \"ignore\");\n    result.setFreemarkerSettings(settings);\n    return result;\n  }\n</pre><p><strong>FreeMarkerConfigurationFactory</strong></p><p><img src=\"https://static.oschina.net/uploads/space/2018/0116/190228_Oq2F_3312115.png\" height=\"255\" width=\"1260\"></p><p>返回<img src=\"https://static.oschina.net/uploads/space/2018/0116/190505_StVf_3312115.png\" height=\"56\" width=\"781\"></p><p>最终返回：</p><p><img src=\"https://static.oschina.net/uploads/space/2018/0116/191335_abkt_3312115.png\" height=\"190\" width=\"1162\"></p><p>看到没，是单个模块的绝对路径ftl文件夹。</p><p>看图我们可以明确知道为true的话，加载的是设置的setTemplateLoaderPath的路径 也就是我其中一个模块下的ftl路径，所以<strong>其他模块下ftl路径是加载不出来的</strong>，也就<strong>是spring mvc 映射不到的原因。</strong></p><p>我们试试 将<strong>isPreferFileSystemAccess</strong>设置为<strong>false：</strong></p><p><img src=\"https://static.oschina.net/uploads/space/2018/0116/190741_z84S_3312115.png\" height=\"460\" width=\"947\"></p><p>最终我们跟到这里：</p><p><img src=\"https://static.oschina.net/uploads/space/2018/0116/191129_wHTf_3312115.png\" height=\"353\" width=\"952\"></p><p>发现路径是/ftl/而不是之前的绝对路径，然后set进spring对freemarker的配置对象中。</p><p>好的，我们通过分析源码我们可以知道，多模块下，我们<strong>设置为false，spring才能以相对路径来访问我们的模板文件夹</strong>，问题解决。</p>',
+		17, 1, 'acfc0e9232f54732a5d9ffe9071bf572', 'a4a743bffe9711e7b472201a068c6482', '2018-11-25 13:48:54',
+		'2018-11-25 22:12:53', 0);
+INSERT INTO `blog_article`
+VALUES ('fd27b3ed7d344395b7766f596bf6fd06', '36152428', 'spring boot 2.0 集成shiro注意事项', NULL,
+		'<p><span style=\"color: rgb(61, 70, 77);\">spring boot 2.0 全面拥抱java8，在安全验证上面 很大程度的简化了配置项，用shiro就要把security关闭， security 默认是开启的，在boot1.x版本可以通过配置项</span></p><pre class=\"ql-syntax\" spellcheck=\"false\">security:\n  basic:\n    enabled: false\nmanagement:\n  security:\n    enabled: false\n</pre><p>来禁用的，但是2.0由于安全和歧义，security相关配置项去除了，那么集成shiro就没效果。</p><p>通过在启动主方法添加注解：</p><pre class=\"ql-syntax\" spellcheck=\"false\">@EnableAutoConfiguration(exclude = {\n        org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class\n})\n</pre><p><span style=\"color: rgb(61, 70, 77);\">来禁止security自动启动配置，达到shiro集成效果，具体shiro集成和boot 1.x相同，具体可参考我之前集成shiro的博文：</span><a href=\"https://my.oschina.net/u/3312115/blog/1600830\" target=\"_blank\" style=\"color: rgb(30, 112, 191); background-color: rgb(255, 255, 255);\">https://my.oschina.net/u/3312115/blog/1600830</a></p><p><br></p><p>当spring boot为2.0 后 spring 默认升级到5.0以上，spring mvc对静态资源拦截的自定义方案：继承</p><p><br></p><p>WebMvcConfigurerAdapter 实现 addResourceHandlers 已经过时</p><p>，用继承：WebMvcConfigurationSupport 来替代即可，这里有一点要特别注意的，就是 有且只能继承一次WebMvcConfigurationSupport 多次会出现部分失效问题。</p><p><br></p>',
+		21, 1, 'acfc0e9232f54732a5d9ffe9071bf572', 'a4a743bffe9711e7b472201a068c6482', '2018-11-19 21:39:09',
+		'2018-11-25 19:45:42', 0);
 
 -- ----------------------------
 -- Table structure for blog_article_category
 -- ----------------------------
 DROP TABLE IF EXISTS `blog_article_category`;
-CREATE TABLE `blog_article_category`  (
-  `id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `article_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '文章id',
-  `category_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '标签id',
-  PRIMARY KEY (`id`) USING BTREE
+CREATE TABLE `blog_article_category`
+(
+	`id`          varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+	`article_id`  varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '文章id',
+	`category_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '标签id',
+	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '文章标签表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of blog_article_category
 -- ----------------------------
-INSERT INTO `blog_article_category` VALUES ('0037884871fa483db71e4158a18b0af9', '3887934708c54f49bc5a566f77e2a759', '3d4da698fc914ed0b956e86b58f93166');
-INSERT INTO `blog_article_category` VALUES ('2e2c8578a05b4048a9365e9a1b5ff726', '89f445cbe3334a458a412691170d1e12', '3956852574b6490ba6198f35b1c00aee');
-INSERT INTO `blog_article_category` VALUES ('68eeaf5f10a24ed195c042dbc6e25df7', 'a9455e9f36bc4f33ba01412a64d87d6a', '3956852574b6490ba6198f35b1c00aee');
-INSERT INTO `blog_article_category` VALUES ('7659e8a4b97144269775983f886ce25e', '3887934708c54f49bc5a566f77e2a759', '3956852574b6490ba6198f35b1c00aee');
-INSERT INTO `blog_article_category` VALUES ('db7a1ca9b5d04a618f98e65c6c5555db', '6e3fbd29b226452984428883d6e7a8a2', '3956852574b6490ba6198f35b1c00aee');
-INSERT INTO `blog_article_category` VALUES ('e6c27fd837244cefb43b2b2aca276f1f', '3887934708c54f49bc5a566f77e2a759', '2b7c729789de4c03a23fff8311b9eaf4');
-INSERT INTO `blog_article_category` VALUES ('fe7c34ffcf8c4af9922b4438e695c742', 'fd27b3ed7d344395b7766f596bf6fd06', '3956852574b6490ba6198f35b1c00aee');
+INSERT INTO `blog_article_category`
+VALUES ('0037884871fa483db71e4158a18b0af9', '3887934708c54f49bc5a566f77e2a759', '3d4da698fc914ed0b956e86b58f93166');
+INSERT INTO `blog_article_category`
+VALUES ('2e2c8578a05b4048a9365e9a1b5ff726', '89f445cbe3334a458a412691170d1e12', '3956852574b6490ba6198f35b1c00aee');
+INSERT INTO `blog_article_category`
+VALUES ('68eeaf5f10a24ed195c042dbc6e25df7', 'a9455e9f36bc4f33ba01412a64d87d6a', '3956852574b6490ba6198f35b1c00aee');
+INSERT INTO `blog_article_category`
+VALUES ('7659e8a4b97144269775983f886ce25e', '3887934708c54f49bc5a566f77e2a759', '3956852574b6490ba6198f35b1c00aee');
+INSERT INTO `blog_article_category`
+VALUES ('db7a1ca9b5d04a618f98e65c6c5555db', '6e3fbd29b226452984428883d6e7a8a2', '3956852574b6490ba6198f35b1c00aee');
+INSERT INTO `blog_article_category`
+VALUES ('e6c27fd837244cefb43b2b2aca276f1f', '3887934708c54f49bc5a566f77e2a759', '2b7c729789de4c03a23fff8311b9eaf4');
+INSERT INTO `blog_article_category`
+VALUES ('fe7c34ffcf8c4af9922b4438e695c742', 'fd27b3ed7d344395b7766f596bf6fd06', '3956852574b6490ba6198f35b1c00aee');
 
 -- ----------------------------
 -- Table structure for blog_article_tag
 -- ----------------------------
 DROP TABLE IF EXISTS `blog_article_tag`;
-CREATE TABLE `blog_article_tag`  (
-  `article_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `tag_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  PRIMARY KEY (`article_id`, `tag_id`) USING BTREE
+CREATE TABLE `blog_article_tag`
+(
+	`article_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+	`tag_id`     varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+	PRIMARY KEY (`article_id`, `tag_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of blog_article_tag
 -- ----------------------------
-INSERT INTO `blog_article_tag` VALUES ('3887934708c54f49bc5a566f77e2a759', 'eeba8137d0cc42249a8c1db9b2830e8a');
-INSERT INTO `blog_article_tag` VALUES ('6e3fbd29b226452984428883d6e7a8a2', '0596836fc90540d1a497cd7bfae306e4');
-INSERT INTO `blog_article_tag` VALUES ('6e3fbd29b226452984428883d6e7a8a2', '1f44f472a64f4ebe9782b2b868e2caf2');
-INSERT INTO `blog_article_tag` VALUES ('89f445cbe3334a458a412691170d1e12', 'eeba8137d0cc42249a8c1db9b2830e8a');
-INSERT INTO `blog_article_tag` VALUES ('a9455e9f36bc4f33ba01412a64d87d6a', 'eba6d766a88b4a108d4189c08f86e7a6');
-INSERT INTO `blog_article_tag` VALUES ('fd27b3ed7d344395b7766f596bf6fd06', '0596836fc90540d1a497cd7bfae306e4');
-INSERT INTO `blog_article_tag` VALUES ('fd27b3ed7d344395b7766f596bf6fd06', 'eba6d766a88b4a108d4189c08f86e7a6');
+INSERT INTO `blog_article_tag`
+VALUES ('3887934708c54f49bc5a566f77e2a759', 'eeba8137d0cc42249a8c1db9b2830e8a');
+INSERT INTO `blog_article_tag`
+VALUES ('6e3fbd29b226452984428883d6e7a8a2', '0596836fc90540d1a497cd7bfae306e4');
+INSERT INTO `blog_article_tag`
+VALUES ('6e3fbd29b226452984428883d6e7a8a2', '1f44f472a64f4ebe9782b2b868e2caf2');
+INSERT INTO `blog_article_tag`
+VALUES ('89f445cbe3334a458a412691170d1e12', 'eeba8137d0cc42249a8c1db9b2830e8a');
+INSERT INTO `blog_article_tag`
+VALUES ('a9455e9f36bc4f33ba01412a64d87d6a', 'eba6d766a88b4a108d4189c08f86e7a6');
+INSERT INTO `blog_article_tag`
+VALUES ('fd27b3ed7d344395b7766f596bf6fd06', '0596836fc90540d1a497cd7bfae306e4');
+INSERT INTO `blog_article_tag`
+VALUES ('fd27b3ed7d344395b7766f596bf6fd06', 'eba6d766a88b4a108d4189c08f86e7a6');
 
 -- ----------------------------
 -- Table structure for blog_category
 -- ----------------------------
 DROP TABLE IF EXISTS `blog_category`;
-CREATE TABLE `blog_category`  (
-  `id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `sequence` tinyint(2) NOT NULL DEFAULT 0,
-  `code` varchar(16) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '搜索code',
-  `name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '类别名称',
-  `parent_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '0' COMMENT '上层id(目前最多两次层)',
-  `create_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `create_date` datetime(0) NULL DEFAULT NULL,
-  `update_date` datetime(0) NULL DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
+CREATE TABLE `blog_category`
+(
+	`id`          varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+	`sequence`    tinyint(2) NOT NULL DEFAULT 0,
+	`code`        varchar(16) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '搜索code',
+	`name`        varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '类别名称',
+	`parent_id`   varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '0' COMMENT '上层id(目前最多两次层)',
+	`create_by`   varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`update_by`   varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`create_date` datetime(0) NULL DEFAULT NULL,
+	`update_date` datetime(0) NULL DEFAULT NULL,
+	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '类别表(顶部展示)' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of blog_category
 -- ----------------------------
-INSERT INTO `blog_category` VALUES ('2b7c729789de4c03a23fff8311b9eaf4', 3, '架构', '架构', '0', 'zxm', NULL, '2018-10-12 22:30:18', NULL);
-INSERT INTO `blog_category` VALUES ('3956852574b6490ba6198f35b1c00aee', 1, 'Java', 'Java', '0', 'zxm', NULL, '2018-10-12 22:30:18', NULL);
-INSERT INTO `blog_category` VALUES ('3d4da698fc914ed0b956e86b58f93166', 2, 'Linux', 'Linux', '0', 'zxm', NULL, '2018-10-12 22:30:18', NULL);
-INSERT INTO `blog_category` VALUES ('7de23cc796ac4e6887ef1de6ca331bd8', 4, '其他', '其他', '0', 'zxm', NULL, '2018-10-12 22:30:18', NULL);
+INSERT INTO `blog_category`
+VALUES ('2b7c729789de4c03a23fff8311b9eaf4', 3, '架构', '架构', '0', 'zxm', NULL, '2018-10-12 22:30:18', NULL);
+INSERT INTO `blog_category`
+VALUES ('3956852574b6490ba6198f35b1c00aee', 1, 'Java', 'Java', '0', 'zxm', NULL, '2018-10-12 22:30:18', NULL);
+INSERT INTO `blog_category`
+VALUES ('3d4da698fc914ed0b956e86b58f93166', 2, 'Linux', 'Linux', '0', 'zxm', NULL, '2018-10-12 22:30:18', NULL);
+INSERT INTO `blog_category`
+VALUES ('7de23cc796ac4e6887ef1de6ca331bd8', 4, '其他', '其他', '0', 'zxm', NULL, '2018-10-12 22:30:18', NULL);
 
 -- ----------------------------
 -- Table structure for blog_tag
 -- ----------------------------
 DROP TABLE IF EXISTS `blog_tag`;
-CREATE TABLE `blog_tag`  (
-  `id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `tag_code` varchar(16) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '标签code',
-  `tag_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '标签name',
-  PRIMARY KEY (`id`) USING BTREE
+CREATE TABLE `blog_tag`
+(
+	`id`       varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci  NOT NULL,
+	`tag_code` varchar(16) CHARACTER SET utf8 COLLATE utf8_general_ci  NOT NULL COMMENT '标签code',
+	`tag_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '标签name',
+	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of blog_tag
 -- ----------------------------
-INSERT INTO `blog_tag` VALUES ('0596836fc90540d1a497cd7bfae306e4', 'shiro', 'shiro');
-INSERT INTO `blog_tag` VALUES ('1f44f472a64f4ebe9782b2b868e2caf2', 'spring', 'spring');
-INSERT INTO `blog_tag` VALUES ('32297dbf97d44462bfa8b2f868704660', 'mybatis', 'mybatis');
-INSERT INTO `blog_tag` VALUES ('483af3b2db5743e99a9cde0f81559b43', 'spring cloud', 'spring cloud');
-INSERT INTO `blog_tag` VALUES ('4e4aa6cd7fea4a70a9e31083c1109090', 'sql', 'sql');
-INSERT INTO `blog_tag` VALUES ('56a9dc14db164453a0baa30d3193367c', '22', '22');
-INSERT INTO `blog_tag` VALUES ('75cae88b2f9f451392bfc06928a7c58d', 'centos7', 'centos7');
-INSERT INTO `blog_tag` VALUES ('7b470a9a121b42dc995e876fb532660e', 'linux', 'linux');
-INSERT INTO `blog_tag` VALUES ('7e467f2922a34a0b91afd908676f0ef5', 'spring security', 'spring security');
-INSERT INTO `blog_tag` VALUES ('8f41425ce8794fa8a0affa17beb13f11', 'redis', 'redis');
-INSERT INTO `blog_tag` VALUES ('d4e6b7774db343ff8575b1790a615aa2', 'git', 'git');
-INSERT INTO `blog_tag` VALUES ('da34c84e702341d68e6ea6d004508e67', 'vue', 'vue');
-INSERT INTO `blog_tag` VALUES ('e4ca0a14f2724de8bf71ad0ac8988c57', 'quartz', 'quartz');
-INSERT INTO `blog_tag` VALUES ('eba6d766a88b4a108d4189c08f86e7a6', 'spring boot', 'spring boot');
-INSERT INTO `blog_tag` VALUES ('eeba8137d0cc42249a8c1db9b2830e8a', 'java', 'java');
-INSERT INTO `blog_tag` VALUES ('f4ebc211eb3242739d6007e030c54ae5', 'oauth2.0', 'oauth2.0');
+INSERT INTO `blog_tag`
+VALUES ('0596836fc90540d1a497cd7bfae306e4', 'shiro', 'shiro');
+INSERT INTO `blog_tag`
+VALUES ('1f44f472a64f4ebe9782b2b868e2caf2', 'spring', 'spring');
+INSERT INTO `blog_tag`
+VALUES ('32297dbf97d44462bfa8b2f868704660', 'mybatis', 'mybatis');
+INSERT INTO `blog_tag`
+VALUES ('483af3b2db5743e99a9cde0f81559b43', 'spring cloud', 'spring cloud');
+INSERT INTO `blog_tag`
+VALUES ('4e4aa6cd7fea4a70a9e31083c1109090', 'sql', 'sql');
+INSERT INTO `blog_tag`
+VALUES ('56a9dc14db164453a0baa30d3193367c', '22', '22');
+INSERT INTO `blog_tag`
+VALUES ('75cae88b2f9f451392bfc06928a7c58d', 'centos7', 'centos7');
+INSERT INTO `blog_tag`
+VALUES ('7b470a9a121b42dc995e876fb532660e', 'linux', 'linux');
+INSERT INTO `blog_tag`
+VALUES ('7e467f2922a34a0b91afd908676f0ef5', 'spring security', 'spring security');
+INSERT INTO `blog_tag`
+VALUES ('8f41425ce8794fa8a0affa17beb13f11', 'redis', 'redis');
+INSERT INTO `blog_tag`
+VALUES ('d4e6b7774db343ff8575b1790a615aa2', 'git', 'git');
+INSERT INTO `blog_tag`
+VALUES ('da34c84e702341d68e6ea6d004508e67', 'vue', 'vue');
+INSERT INTO `blog_tag`
+VALUES ('e4ca0a14f2724de8bf71ad0ac8988c57', 'quartz', 'quartz');
+INSERT INTO `blog_tag`
+VALUES ('eba6d766a88b4a108d4189c08f86e7a6', 'spring boot', 'spring boot');
+INSERT INTO `blog_tag`
+VALUES ('eeba8137d0cc42249a8c1db9b2830e8a', 'java', 'java');
+INSERT INTO `blog_tag`
+VALUES ('f4ebc211eb3242739d6007e030c54ae5', 'oauth2.0', 'oauth2.0');
 
 -- ----------------------------
 -- Table structure for sys_dept
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_dept`;
-CREATE TABLE `sys_dept`  (
-  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
-  `dept_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '编码',
-  `dept_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
-  `dept_pid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '0',
-  `dept_desc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
-  `create_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `create_date` datetime(0) NULL DEFAULT NULL,
-  `update_date` datetime(0) NULL DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
+CREATE TABLE `sys_dept`
+(
+	`id`          varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci  NOT NULL,
+	`dept_code`   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci  NOT NULL COMMENT '编码',
+	`dept_name`   varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+	`dept_pid`    varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci  NOT NULL DEFAULT '0',
+	`dept_desc`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
+	`create_by`   varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`update_by`   varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`create_date` datetime(0) NULL DEFAULT NULL,
+	`update_date` datetime(0) NULL DEFAULT NULL,
+	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for sys_dict_item
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_dict_item`;
-CREATE TABLE `sys_dict_item`  (
-  `id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `sequence` int(11) NOT NULL COMMENT '序号',
-  `value` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '值',
-  `description` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '描述',
-  `type_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字典id外检',
-  `create_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `create_date` datetime(0) NULL DEFAULT NULL,
-  `update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `update_date` datetime(0) NULL DEFAULT NULL,
-  `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '0' COMMENT '删除标识',
-  PRIMARY KEY (`id`) USING BTREE
+CREATE TABLE `sys_dict_item`
+(
+	`id`          varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci  NOT NULL,
+	`sequence`    int(11) NOT NULL COMMENT '序号',
+	`value`       varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '值',
+	`description` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '描述',
+	`type_id`     varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci  NOT NULL COMMENT '字典id外检',
+	`create_by`   varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`create_date` datetime(0) NULL DEFAULT NULL,
+	`update_by`   varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`update_date` datetime(0) NULL DEFAULT NULL,
+	`del_flag`    char(1) CHARACTER SET utf8 COLLATE utf8_general_ci      NOT NULL DEFAULT '0' COMMENT '删除标识',
+	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '字典子表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for sys_dict_type
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_dict_type`;
-CREATE TABLE `sys_dict_type`  (
-  `id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `code` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '编码',
-  `del_flag` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '0' COMMENT '删除标识',
-  `text` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字典名称',
-  `create_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `create_date` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0),
-  `update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `update_date` datetime(0) NULL DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
+CREATE TABLE `sys_dict_type`
+(
+	`id`          varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci  NOT NULL,
+	`code`        varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '编码',
+	`del_flag`    char(1) CHARACTER SET utf8 COLLATE utf8_general_ci      NOT NULL DEFAULT '0' COMMENT '删除标识',
+	`text`        varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '字典名称',
+	`create_by`   varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`create_date` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP (0),
+	`update_by`   varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`update_date` datetime(0) NULL DEFAULT NULL,
+	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '字典主表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for sys_employee
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_employee`;
-CREATE TABLE `sys_employee`  (
-  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键',
-  `employee_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '员工编号',
-  `employee_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '员工姓名',
-  `employee_gender` int(1) NULL DEFAULT NULL COMMENT '性别 0无 1 男 2 女',
-  `employee_birthday` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '生日',
-  `employee_deptcodes` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '部门',
-  `employee_mobile1` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '公司工作电话',
-  `employee_mobile2` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '私人电话',
-  `employee_mail1` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '公司邮箱',
-  `employee_mail2` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '个人邮箱',
-  `employee_wechat` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '个人微信',
-  `employee_qq` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '个人QQ',
-  `employee_photo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '头像',
-  `employee_ssn` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '社保号',
-  `employee_min` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '医保号',
-  `create_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `create_date` datetime(0) NULL DEFAULT NULL,
-  `update_date` datetime(0) NULL DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
+CREATE TABLE `sys_employee`
+(
+	`id`                 varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci  NOT NULL COMMENT '主键',
+	`employee_code`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '员工编号',
+	`employee_name`      varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '员工姓名',
+	`employee_gender`    int(1) NULL DEFAULT NULL COMMENT '性别 0无 1 男 2 女',
+	`employee_birthday`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '生日',
+	`employee_deptcodes` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '部门',
+	`employee_mobile1`   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '公司工作电话',
+	`employee_mobile2`   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '私人电话',
+	`employee_mail1`     varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '公司邮箱',
+	`employee_mail2`     varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '个人邮箱',
+	`employee_wechat`    varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '个人微信',
+	`employee_qq`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '个人QQ',
+	`employee_photo`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '头像',
+	`employee_ssn`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '社保号',
+	`employee_min`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '医保号',
+	`create_by`          varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`update_by`          varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`create_date`        datetime(0) NULL DEFAULT NULL,
+	`update_date`        datetime(0) NULL DEFAULT NULL,
+	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for sys_job
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_job`;
-CREATE TABLE `sys_job`  (
-  `id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `job_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '描述任务',
-  `cron` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '任务表达式',
-  `status` tinyint(1) NOT NULL COMMENT '状态:0未启动false/1启动true',
-  `clazz_path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '任务执行方法',
-  `job_desc` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '其他描述',
-  `create_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `create_date` datetime(0) NULL DEFAULT NULL,
-  `update_by` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `update_date` datetime(0) NULL DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
+CREATE TABLE `sys_job`
+(
+	`id`          varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci  NOT NULL,
+	`job_name`    varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '描述任务',
+	`cron`        varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '任务表达式',
+	`status`      tinyint(1) NOT NULL COMMENT '状态:0未启动false/1启动true',
+	`clazz_path`  varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '任务执行方法',
+	`job_desc`    varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '其他描述',
+	`create_by`   varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`create_date` datetime(0) NULL DEFAULT NULL,
+	`update_by`   varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`update_date` datetime(0) NULL DEFAULT NULL,
+	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_job
 -- ----------------------------
-INSERT INTO `sys_job` VALUES ('55147ebdf2f611e7a4fe201a068c6482', '测试定时demo1', '0/5 * * * * ?', 0, 'com.len.core.quartz.CustomQuartz.JobDemo1', '测试定时demo1', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-07 12:30:00', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-07-14 13:29:55');
-INSERT INTO `sys_job` VALUES ('ab648a22f38d11e7aca0201a068c6482', '任务demo2', '0 0/1 * * * ?', 0, 'com.len.core.quartz.CustomQuartz.JobDemo2', '任务demo2', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-07 17:32:36', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-07-07 17:07:45');
+INSERT INTO `sys_job`
+VALUES ('55147ebdf2f611e7a4fe201a068c6482', '测试定时demo1', '0/5 * * * * ?', 0,
+		'com.len.core.quartz.CustomQuartz.JobDemo1', '测试定时demo1', 'acfc0e9232f54732a5d9ffe9071bf572',
+		'2018-01-07 12:30:00', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-07-14 13:29:55');
+INSERT INTO `sys_job`
+VALUES ('ab648a22f38d11e7aca0201a068c6482', '任务demo2', '0 0/1 * * * ?', 0,
+		'com.len.core.quartz.CustomQuartz.JobDemo2', '任务demo2', 'acfc0e9232f54732a5d9ffe9071bf572',
+		'2018-01-07 17:32:36', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-07-07 17:07:45');
 
 -- ----------------------------
 -- Table structure for sys_log
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_log`;
-CREATE TABLE `sys_log`  (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `user_name` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `text` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `param` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
-  `create_time` datetime(0) NULL DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
+CREATE TABLE `sys_log`
+(
+	`id`          int(11) NOT NULL AUTO_INCREMENT,
+	`user_name`   varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`ip`          varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`type`        varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`text`        varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`param`       text CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
+	`create_time` datetime(0) NULL DEFAULT NULL,
+	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 109 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_log
 -- ----------------------------
-INSERT INTO `sys_log` VALUES (65, 'admin', '0:0:0:0:0:0:0:1', 'UPDATE', '更新用户', '[参数1:{\"age\":24,\"email\":\"\",\"id\":\"acfc0e9232f54732a5d9ffe9071bf572\",\"photo\":\"ca842e83-6331-4516-b769-8888f297b657.jpeg\",\"realName\":\"管理员\"}]', '2022-03-06 22:12:40');
-INSERT INTO `sys_log` VALUES (66, 'admin', '0:0:0:0:0:0:0:1', 'UPDATE', '更新用户', '[参数1:{\"age\":24,\"email\":\"\",\"id\":\"acfc0e9232f54732a5d9ffe9071bf572\",\"photo\":\"a88e6ae3-af87-490e-8f3e-6a92156dc95f.jpeg\",\"realName\":\"管理员\"}]', '2022-03-06 22:13:34');
-INSERT INTO `sys_log` VALUES (67, 'admin', '0:0:0:0:0:0:0:1', 'UPDATE', '更新用户', '[参数1:{\"age\":24,\"email\":\"\",\"id\":\"acfc0e9232f54732a5d9ffe9071bf572\",\"photo\":\"a88e6ae3-af87-490e-8f3e-6a92156dc95f.jpeg\"}][参数2:[\"2619a672e53811e7b983201a068c6482\",\"4bb891d8caf84cc6ba27e515e80ac40d\"]]', '2022-03-26 21:30:47');
-INSERT INTO `sys_log` VALUES (104, 'admin', '0:0:0:0:0:0:0:1', 'ATHOR', '添加用户', '[参数1:{\"age\":20,\"email\":\"11@qq.com\",\"id\":\"d818ac6a86cf1a64d2184bf0699d67a8\",\"password\":\"6a333668613ef7946f4462866f537fb5\",\"photo\":\"\",\"username\":\"jingli\"}][参数2:[\"0ea934e5e55411e7b983201a068c6482\"]]', '2022-03-31 10:54:36');
-INSERT INTO `sys_log` VALUES (105, 'admin', '0:0:0:0:0:0:0:1', 'ATHOR', '添加用户', '[参数1:{\"age\":20,\"email\":\"11@qq.com\",\"id\":\"98b051b03681de6028993a5d14ac93cb\",\"password\":\"bce07289deffa09011e644813e6d86a4\",\"photo\":\"\",\"username\":\"hr\"}][参数2:[\"023366f3457511e8bcf1309c2315f9aa\"]]', '2022-03-31 10:55:54');
-INSERT INTO `sys_log` VALUES (106, 'admin', '0:0:0:0:0:0:0:1', 'ATHOR', '添加用户', '[参数1:{\"age\":20,\"email\":\"11@qq.com\",\"id\":\"5946a985f733c57f1ab71689f7b6aeea\",\"password\":\"a07e4c18324811b0d0ec17a89e0f855b\",\"photo\":\"\",\"username\":\"zhangsan\"}][参数2:[\"dcb0f642fe9611e7b472201a068c6482\"]]', '2022-03-31 10:56:46');
-INSERT INTO `sys_log` VALUES (107, 'admin', '0:0:0:0:0:0:0:1', 'ATHOR', '添加用户', '[参数1:{\"age\":20,\"email\":\"11@qq.com\",\"id\":\"0b7625fedaa05e85f282486e1c9c91b9\",\"password\":\"40d400f384b4996fd6ab30dab720ef1e\",\"photo\":\"\",\"username\":\"jingli1\"}][参数2:[\"e346e96368484c8fa7f217ce550a0186\"]]', '2022-03-31 10:57:48');
-INSERT INTO `sys_log` VALUES (108, 'admin', '0:0:0:0:0:0:0:1', 'SELECT', '展示菜单', NULL, '2022-06-23 18:03:21');
+INSERT INTO `sys_log`
+VALUES (65, 'admin', '0:0:0:0:0:0:0:1', 'UPDATE', '更新用户',
+		'[参数1:{\"age\":24,\"email\":\"\",\"id\":\"acfc0e9232f54732a5d9ffe9071bf572\",\"photo\":\"ca842e83-6331-4516-b769-8888f297b657.jpeg\",\"realName\":\"管理员\"}]',
+		'2022-03-06 22:12:40');
+INSERT INTO `sys_log`
+VALUES (66, 'admin', '0:0:0:0:0:0:0:1', 'UPDATE', '更新用户',
+		'[参数1:{\"age\":24,\"email\":\"\",\"id\":\"acfc0e9232f54732a5d9ffe9071bf572\",\"photo\":\"a88e6ae3-af87-490e-8f3e-6a92156dc95f.jpeg\",\"realName\":\"管理员\"}]',
+		'2022-03-06 22:13:34');
+INSERT INTO `sys_log`
+VALUES (67, 'admin', '0:0:0:0:0:0:0:1', 'UPDATE', '更新用户',
+		'[参数1:{\"age\":24,\"email\":\"\",\"id\":\"acfc0e9232f54732a5d9ffe9071bf572\",\"photo\":\"a88e6ae3-af87-490e-8f3e-6a92156dc95f.jpeg\"}][参数2:[\"2619a672e53811e7b983201a068c6482\",\"4bb891d8caf84cc6ba27e515e80ac40d\"]]',
+		'2022-03-26 21:30:47');
+INSERT INTO `sys_log`
+VALUES (104, 'admin', '0:0:0:0:0:0:0:1', 'ATHOR', '添加用户',
+		'[参数1:{\"age\":20,\"email\":\"11@qq.com\",\"id\":\"d818ac6a86cf1a64d2184bf0699d67a8\",\"password\":\"6a333668613ef7946f4462866f537fb5\",\"photo\":\"\",\"username\":\"jingli\"}][参数2:[\"0ea934e5e55411e7b983201a068c6482\"]]',
+		'2022-03-31 10:54:36');
+INSERT INTO `sys_log`
+VALUES (105, 'admin', '0:0:0:0:0:0:0:1', 'ATHOR', '添加用户',
+		'[参数1:{\"age\":20,\"email\":\"11@qq.com\",\"id\":\"98b051b03681de6028993a5d14ac93cb\",\"password\":\"bce07289deffa09011e644813e6d86a4\",\"photo\":\"\",\"username\":\"hr\"}][参数2:[\"023366f3457511e8bcf1309c2315f9aa\"]]',
+		'2022-03-31 10:55:54');
+INSERT INTO `sys_log`
+VALUES (106, 'admin', '0:0:0:0:0:0:0:1', 'ATHOR', '添加用户',
+		'[参数1:{\"age\":20,\"email\":\"11@qq.com\",\"id\":\"5946a985f733c57f1ab71689f7b6aeea\",\"password\":\"a07e4c18324811b0d0ec17a89e0f855b\",\"photo\":\"\",\"username\":\"zhangsan\"}][参数2:[\"dcb0f642fe9611e7b472201a068c6482\"]]',
+		'2022-03-31 10:56:46');
+INSERT INTO `sys_log`
+VALUES (107, 'admin', '0:0:0:0:0:0:0:1', 'ATHOR', '添加用户',
+		'[参数1:{\"age\":20,\"email\":\"11@qq.com\",\"id\":\"0b7625fedaa05e85f282486e1c9c91b9\",\"password\":\"40d400f384b4996fd6ab30dab720ef1e\",\"photo\":\"\",\"username\":\"jingli1\"}][参数2:[\"e346e96368484c8fa7f217ce550a0186\"]]',
+		'2022-03-31 10:57:48');
+INSERT INTO `sys_log`
+VALUES (108, 'admin', '0:0:0:0:0:0:0:1', 'SELECT', '展示菜单', NULL, '2022-06-23 18:03:21');
 
 -- ----------------------------
 -- Table structure for sys_menu
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_menu`;
-CREATE TABLE `sys_menu`  (
-  `id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `code` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `p_id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `router` varchar(16) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `url` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `order_num` int(4) NULL DEFAULT NULL COMMENT '排序字段',
-  `icon` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图标',
-  `create_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `create_date` datetime(0) NULL DEFAULT NULL,
-  `update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `update_date` datetime(0) NULL DEFAULT NULL,
-  `permission` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '权限',
-  `menu_type` tinyint(4) NOT NULL DEFAULT 0 COMMENT '1栏目2菜单',
-  PRIMARY KEY (`id`) USING BTREE
+CREATE TABLE `sys_menu`
+(
+	`id`          varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci  NOT NULL,
+	`code`        varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci  NOT NULL,
+	`name`        varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+	`p_id`        varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`router`      varchar(16) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`url`         varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`order_num`   int(4) NULL DEFAULT NULL COMMENT '排序字段',
+	`icon`        varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '图标',
+	`create_by`   varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`create_date` datetime(0) NULL DEFAULT NULL,
+	`update_by`   varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`update_date` datetime(0) NULL DEFAULT NULL,
+	`permission`  varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '权限',
+	`menu_type`   tinyint(4) NOT NULL DEFAULT 0 COMMENT '1栏目2菜单',
+	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_menu
 -- ----------------------------
-INSERT INTO `sys_menu` VALUES ('0e6c8d4cf09511e78a57201a068c6482', '1010', '删除', 'cff61424dfb311e7b555201a068c6482', '', NULL, 3, '', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-03 22:47:44', NULL, NULL, 'role:del', 1);
-INSERT INTO `sys_menu` VALUES ('18bf8d5df09511e78a57201a068c6482', '1777', '新增', '3873ccc2dfda11e7b555201a068c6482', '', NULL, 1, '', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-03 22:48:01', NULL, NULL, 'nemu:add', 1);
-INSERT INTO `sys_menu` VALUES ('28661300f9d411e7a009201a068c6482', '9610', '流程管理', 'e06da471f90311e780aa201a068c6482', 'bpmn', '/act/goAct', 2, '&#xe630;', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-15 17:12:06', NULL, NULL, 'act:deployment', 0);
-INSERT INTO `sys_menu` VALUES ('2b56410cf09411e78a57201a068c6482', '4736', '新增', 'cff61424dfb311e7b555201a068c6482', '', NULL, 1, '', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-03 22:41:23', NULL, NULL, 'role:add', 1);
-INSERT INTO `sys_menu` VALUES ('3873ccc2dfda11e7b555201a068c6482', '8484', '菜单管理', 'cfda8029dfb311e7b555201a068c6482', 'menu', 'menu/showMenu', 1, '', NULL, '2017-12-14 14:02:50', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-04-23 19:43:54', 'menu:show', 0);
-INSERT INTO `sys_menu` VALUES ('433089a6eb0111e782d5201a068c6482', '3804', '编辑', 'cfe54921dfb311e7b555201a068c6482', '', '', NULL, '1', 'acfc0e9232f54732a5d9ffe9071bf572', '2017-12-27 20:27:11', NULL, NULL, 'user:update', 1);
-INSERT INTO `sys_menu` VALUES ('4d603831fe9b11e7b472201a068c6482', '2286', '待办任务', 'e06da471f90311e780aa201a068c6482', '', '/leave/showTask', 5, '&#xe6af;', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-21 19:07:43', NULL, NULL, 'task:show', 0);
-INSERT INTO `sys_menu` VALUES ('5ae3d4e9f38e11e7aca0201a068c6482', '2030', '新增', 'e9a13e55f35911e7aca0201a068c6482', '', NULL, 1, '', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-07 17:37:30', NULL, NULL, 'job:add', 1);
-INSERT INTO `sys_menu` VALUES ('6315968bf37111e7aca0201a068c6482', '4120', '停止', 'e9a13e55f35911e7aca0201a068c6482', '', NULL, 4, '', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-07 14:10:09', NULL, NULL, 'job:end', 1);
-INSERT INTO `sys_menu` VALUES ('63da4415fc6211e7a781201a068c6482', '3793', '模型列表', 'e06da471f90311e780aa201a068c6482', 'temp', '/act/goActModel', 3, '&#xe60a;', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-18 23:15:17', NULL, NULL, 'act', 0);
-INSERT INTO `sys_menu` VALUES ('6931fd22f09611e78a57201a068c6482', '8953', '删除', 'b441914cee0811e7a60d201a068c6482', '', NULL, 1, '', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-03 22:57:26', NULL, NULL, 'control:del', 1);
-INSERT INTO `sys_menu` VALUES ('69f3f59cf38e11e7aca0201a068c6482', '6022', '编辑', 'e9a13e55f35911e7aca0201a068c6482', '', NULL, 2, '', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-07 17:37:56', NULL, NULL, 'job:update', 1);
-INSERT INTO `sys_menu` VALUES ('6dc13c6eec5f11e7a472201a068c6482', '3060', '系统日志', 'a1ca6642ec5e11e7a472201a068c6482', 'log', 'log/showLog', 1, '&#xe60a;', 'acfc0e9232f54732a5d9ffe9071bf572', '2017-12-29 14:43:46', NULL, '2017-12-29 14:43:46', 'log:show', 0);
-INSERT INTO `sys_menu` VALUES ('788d8e34f38e11e7aca0201a068c6482', '7543', '删除', 'e9a13e55f35911e7aca0201a068c6482', '', NULL, 5, '', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-07 17:38:20', NULL, NULL, 'job:del', 1);
-INSERT INTO `sys_menu` VALUES ('7967e098ee0611e7a60d201a068c6482', '6033', '接口api', 'a1ca6642ec5e11e7a472201a068c6482', 'api', 'swagger-ui.html', 2, '&#xe64e;', 'acfc0e9232f54732a5d9ffe9071bf572', '2017-12-31 16:42:04', NULL, NULL, NULL, 0);
-INSERT INTO `sys_menu` VALUES ('873f30b0f38e11e7aca0201a068c6482', '5879', '查看', 'e9a13e55f35911e7aca0201a068c6482', '', NULL, 6, '', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-07 17:38:45', NULL, NULL, 'job:select', 1);
-INSERT INTO `sys_menu` VALUES ('88b8e5d1f38911e7aca0201a068c6482', '9952', '查看', 'cff61424dfb311e7b555201a068c6482', '', NULL, 4, '', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-07 17:03:00', NULL, NULL, 'role:select', 1);
-INSERT INTO `sys_menu` VALUES ('8a6c8bfa7f804eac810c5790cad9a62a', '0141', '删除', '3873ccc2dfda11e7b555201a068c6482', '', NULL, 2, NULL, 'acfc0e9232f54732a5d9ffe9071bf572', '2018-06-20 21:55:55', NULL, NULL, 'menu:del', 1);
-INSERT INTO `sys_menu` VALUES ('a1ca6642ec5e11e7a472201a068c6482', '8970', '系统监控', NULL, '', NULL, 2, '&#xe62c;', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-03 10:56:14', NULL, '2018-01-03 10:56:14', NULL, 0);
-INSERT INTO `sys_menu` VALUES ('b441914cee0811e7a60d201a068c6482', '4299', '系统监控', 'a1ca6642ec5e11e7a472201a068c6482', 'control', 'druid/index.html', 3, '&#xe628;', 'acfc0e9232f54732a5d9ffe9071bf572', '2017-12-31 16:58:01', NULL, NULL, NULL, 0);
-INSERT INTO `sys_menu` VALUES ('b7839f59fe8811e7b472201a068c6482', '9021', '请假流程', 'e06da471f90311e780aa201a068c6482', 'leave', '/leave/showLeave', 4, '&#xe650;', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-21 16:54:40', NULL, NULL, 'leave:show', 0);
-INSERT INTO `sys_menu` VALUES ('cfda8029dfb311e7b555201a068c6482', '1862', '系统管理', NULL, '', NULL, 1, '&#xe614;', NULL, '2018-01-03 10:56:13', NULL, '2018-01-03 10:56:13', NULL, 0);
-INSERT INTO `sys_menu` VALUES ('cfe54921dfb311e7b555201a068c6482', '2643', '用户管理', 'cfda8029dfb311e7b555201a068c6482', 'user', '/user/showUser', 2, '&#xe6af;', NULL, '2017-12-29 14:40:34', NULL, '2017-12-29 14:40:34', 'user:show', 0);
-INSERT INTO `sys_menu` VALUES ('cfe54921dfb311e7b555201a068c6483', '0337', '增加', 'cfe54921dfb311e7b555201a068c6482', '', NULL, 1, NULL, NULL, NULL, NULL, NULL, 'user:select', 1);
-INSERT INTO `sys_menu` VALUES ('cff61424dfb311e7b555201a068c6482', '5303', '角色管理', 'cfda8029dfb311e7b555201a068c6482', 'role', '/role/showRole', 3, '&#xe613;', NULL, '2017-12-29 14:40:36', NULL, '2017-12-29 14:40:36', 'role:show', 0);
-INSERT INTO `sys_menu` VALUES ('e06da471f90311e780aa201a068c6482', '3371', '工作流程管理', NULL, '', NULL, 3, '&#xe628;', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-14 16:21:10', NULL, NULL, NULL, 0);
-INSERT INTO `sys_menu` VALUES ('e3b11497eb9e11e7928d201a068c6482', '8792', '删除', 'cfe54921dfb311e7b555201a068c6482', '', '', NULL, '', 'acfc0e9232f54732a5d9ffe9071bf572', '2017-12-28 15:17:07', NULL, '2017-12-28 15:17:07', 'user:del', 1);
-INSERT INTO `sys_menu` VALUES ('e9a13e55f35911e7aca0201a068c6482', '9437', '定时任务', 'a1ca6642ec5e11e7a472201a068c6482', 'job', '/job/showJob', 3, '&#xe756;', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-07 11:22:06', NULL, NULL, 'job:show', 0);
-INSERT INTO `sys_menu` VALUES ('ecda560cf36f11e7aca0201a068c6482', '4908', '启动', 'e9a13e55f35911e7aca0201a068c6482', '', NULL, 3, '', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-07 13:59:41', NULL, NULL, 'job:start', 1);
-INSERT INTO `sys_menu` VALUES ('f23f6a6bf09511e78a57201a068c6482', '2812', '修改密码', 'cfe54921dfb311e7b555201a068c6482', '', NULL, 4, '', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-03 22:54:06', NULL, NULL, 'user:repass', 1);
-INSERT INTO `sys_menu` VALUES ('ff015ea5f09411e78a57201a068c6482', '3643', '编辑', 'cff61424dfb311e7b555201a068c6482', '', NULL, 2, '', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-03 22:47:18', NULL, NULL, 'role:update', 1);
+INSERT INTO `sys_menu`
+VALUES ('0e6c8d4cf09511e78a57201a068c6482', '1010', '删除', 'cff61424dfb311e7b555201a068c6482', '', NULL, 3, '',
+		'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-03 22:47:44', NULL, NULL, 'role:del', 1);
+INSERT INTO `sys_menu`
+VALUES ('18bf8d5df09511e78a57201a068c6482', '1777', '新增', '3873ccc2dfda11e7b555201a068c6482', '', NULL, 1, '',
+		'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-03 22:48:01', NULL, NULL, 'nemu:add', 1);
+INSERT INTO `sys_menu`
+VALUES ('28661300f9d411e7a009201a068c6482', '9610', '流程管理', 'e06da471f90311e780aa201a068c6482', 'bpmn',
+		'/act/goAct', 2, '&#xe630;', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-15 17:12:06', NULL, NULL,
+		'act:deployment', 0);
+INSERT INTO `sys_menu`
+VALUES ('2b56410cf09411e78a57201a068c6482', '4736', '新增', 'cff61424dfb311e7b555201a068c6482', '', NULL, 1, '',
+		'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-03 22:41:23', NULL, NULL, 'role:add', 1);
+INSERT INTO `sys_menu`
+VALUES ('3873ccc2dfda11e7b555201a068c6482', '8484', '菜单管理', 'cfda8029dfb311e7b555201a068c6482', 'menu',
+		'menu/showMenu', 1, '', NULL, '2017-12-14 14:02:50', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-04-23 19:43:54',
+		'menu:show', 0);
+INSERT INTO `sys_menu`
+VALUES ('433089a6eb0111e782d5201a068c6482', '3804', '编辑', 'cfe54921dfb311e7b555201a068c6482', '', '', NULL, '1',
+		'acfc0e9232f54732a5d9ffe9071bf572', '2017-12-27 20:27:11', NULL, NULL, 'user:update', 1);
+INSERT INTO `sys_menu`
+VALUES ('4d603831fe9b11e7b472201a068c6482', '2286', '待办任务', 'e06da471f90311e780aa201a068c6482', '',
+		'/leave/showTask', 5, '&#xe6af;', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-21 19:07:43', NULL, NULL,
+		'task:show', 0);
+INSERT INTO `sys_menu`
+VALUES ('5ae3d4e9f38e11e7aca0201a068c6482', '2030', '新增', 'e9a13e55f35911e7aca0201a068c6482', '', NULL, 1, '',
+		'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-07 17:37:30', NULL, NULL, 'job:add', 1);
+INSERT INTO `sys_menu`
+VALUES ('6315968bf37111e7aca0201a068c6482', '4120', '停止', 'e9a13e55f35911e7aca0201a068c6482', '', NULL, 4, '',
+		'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-07 14:10:09', NULL, NULL, 'job:end', 1);
+INSERT INTO `sys_menu`
+VALUES ('63da4415fc6211e7a781201a068c6482', '3793', '模型列表', 'e06da471f90311e780aa201a068c6482', 'temp',
+		'/act/goActModel', 3, '&#xe60a;', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-18 23:15:17', NULL, NULL, 'act',
+		0);
+INSERT INTO `sys_menu`
+VALUES ('6931fd22f09611e78a57201a068c6482', '8953', '删除', 'b441914cee0811e7a60d201a068c6482', '', NULL, 1, '',
+		'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-03 22:57:26', NULL, NULL, 'control:del', 1);
+INSERT INTO `sys_menu`
+VALUES ('69f3f59cf38e11e7aca0201a068c6482', '6022', '编辑', 'e9a13e55f35911e7aca0201a068c6482', '', NULL, 2, '',
+		'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-07 17:37:56', NULL, NULL, 'job:update', 1);
+INSERT INTO `sys_menu`
+VALUES ('6dc13c6eec5f11e7a472201a068c6482', '3060', '系统日志', 'a1ca6642ec5e11e7a472201a068c6482', 'log',
+		'log/showLog', 1, '&#xe60a;', 'acfc0e9232f54732a5d9ffe9071bf572', '2017-12-29 14:43:46', NULL,
+		'2017-12-29 14:43:46', 'log:show', 0);
+INSERT INTO `sys_menu`
+VALUES ('788d8e34f38e11e7aca0201a068c6482', '7543', '删除', 'e9a13e55f35911e7aca0201a068c6482', '', NULL, 5, '',
+		'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-07 17:38:20', NULL, NULL, 'job:del', 1);
+INSERT INTO `sys_menu`
+VALUES ('7967e098ee0611e7a60d201a068c6482', '6033', '接口api', 'a1ca6642ec5e11e7a472201a068c6482', 'api',
+		'swagger-ui.html', 2, '&#xe64e;', 'acfc0e9232f54732a5d9ffe9071bf572', '2017-12-31 16:42:04', NULL, NULL, NULL,
+		0);
+INSERT INTO `sys_menu`
+VALUES ('873f30b0f38e11e7aca0201a068c6482', '5879', '查看', 'e9a13e55f35911e7aca0201a068c6482', '', NULL, 6, '',
+		'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-07 17:38:45', NULL, NULL, 'job:select', 1);
+INSERT INTO `sys_menu`
+VALUES ('88b8e5d1f38911e7aca0201a068c6482', '9952', '查看', 'cff61424dfb311e7b555201a068c6482', '', NULL, 4, '',
+		'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-07 17:03:00', NULL, NULL, 'role:select', 1);
+INSERT INTO `sys_menu`
+VALUES ('8a6c8bfa7f804eac810c5790cad9a62a', '0141', '删除', '3873ccc2dfda11e7b555201a068c6482', '', NULL, 2, NULL,
+		'acfc0e9232f54732a5d9ffe9071bf572', '2018-06-20 21:55:55', NULL, NULL, 'menu:del', 1);
+INSERT INTO `sys_menu`
+VALUES ('a1ca6642ec5e11e7a472201a068c6482', '8970', '系统监控', NULL, '', NULL, 2, '&#xe62c;',
+		'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-03 10:56:14', NULL, '2018-01-03 10:56:14', NULL, 0);
+INSERT INTO `sys_menu`
+VALUES ('b441914cee0811e7a60d201a068c6482', '4299', '系统监控', 'a1ca6642ec5e11e7a472201a068c6482', 'control',
+		'druid/index.html', 3, '&#xe628;', 'acfc0e9232f54732a5d9ffe9071bf572', '2017-12-31 16:58:01', NULL, NULL, NULL,
+		0);
+INSERT INTO `sys_menu`
+VALUES ('b7839f59fe8811e7b472201a068c6482', '9021', '请假流程', 'e06da471f90311e780aa201a068c6482', 'leave',
+		'/leave/showLeave', 4, '&#xe650;', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-21 16:54:40', NULL, NULL,
+		'leave:show', 0);
+INSERT INTO `sys_menu`
+VALUES ('cfda8029dfb311e7b555201a068c6482', '1862', '系统管理', NULL, '', NULL, 1, '&#xe614;', NULL,
+		'2018-01-03 10:56:13', NULL, '2018-01-03 10:56:13', NULL, 0);
+INSERT INTO `sys_menu`
+VALUES ('cfe54921dfb311e7b555201a068c6482', '2643', '用户管理', 'cfda8029dfb311e7b555201a068c6482', 'user',
+		'/user/showUser', 2, '&#xe6af;', NULL, '2017-12-29 14:40:34', NULL, '2017-12-29 14:40:34', 'user:show', 0);
+INSERT INTO `sys_menu`
+VALUES ('cfe54921dfb311e7b555201a068c6483', '0337', '增加', 'cfe54921dfb311e7b555201a068c6482', '', NULL, 1, NULL, NULL,
+		NULL, NULL, NULL, 'user:select', 1);
+INSERT INTO `sys_menu`
+VALUES ('cff61424dfb311e7b555201a068c6482', '5303', '角色管理', 'cfda8029dfb311e7b555201a068c6482', 'role',
+		'/role/showRole', 3, '&#xe613;', NULL, '2017-12-29 14:40:36', NULL, '2017-12-29 14:40:36', 'role:show', 0);
+INSERT INTO `sys_menu`
+VALUES ('e06da471f90311e780aa201a068c6482', '3371', '工作流程管理', NULL, '', NULL, 3, '&#xe628;',
+		'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-14 16:21:10', NULL, NULL, NULL, 0);
+INSERT INTO `sys_menu`
+VALUES ('e3b11497eb9e11e7928d201a068c6482', '8792', '删除', 'cfe54921dfb311e7b555201a068c6482', '', '', NULL, '',
+		'acfc0e9232f54732a5d9ffe9071bf572', '2017-12-28 15:17:07', NULL, '2017-12-28 15:17:07', 'user:del', 1);
+INSERT INTO `sys_menu`
+VALUES ('e9a13e55f35911e7aca0201a068c6482', '9437', '定时任务', 'a1ca6642ec5e11e7a472201a068c6482', 'job',
+		'/job/showJob', 3, '&#xe756;', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-07 11:22:06', NULL, NULL,
+		'job:show', 0);
+INSERT INTO `sys_menu`
+VALUES ('ecda560cf36f11e7aca0201a068c6482', '4908', '启动', 'e9a13e55f35911e7aca0201a068c6482', '', NULL, 3, '',
+		'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-07 13:59:41', NULL, NULL, 'job:start', 1);
+INSERT INTO `sys_menu`
+VALUES ('f23f6a6bf09511e78a57201a068c6482', '2812', '修改密码', 'cfe54921dfb311e7b555201a068c6482', '', NULL, 4, '',
+		'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-03 22:54:06', NULL, NULL, 'user:repass', 1);
+INSERT INTO `sys_menu`
+VALUES ('ff015ea5f09411e78a57201a068c6482', '3643', '编辑', 'cff61424dfb311e7b555201a068c6482', '', NULL, 2, '',
+		'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-03 22:47:18', NULL, NULL, 'role:update', 1);
 
 -- ----------------------------
 -- Table structure for sys_panelopt
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_panelopt`;
-CREATE TABLE `sys_panelopt`  (
-  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
-  `panelopt_column` int(4) NOT NULL COMMENT '菜单顺序',
-  `panelopt_index` int(4) NOT NULL COMMENT '行',
-  `panelopt_code` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '列',
-  `panelopt_userid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
-  `create_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `create_date` datetime(0) NULL DEFAULT NULL,
-  `update_date` datetime(0) NULL DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
+CREATE TABLE `sys_panelopt`
+(
+	`id`              varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+	`panelopt_column` int(4) NOT NULL COMMENT '菜单顺序',
+	`panelopt_index`  int(4) NOT NULL COMMENT '行',
+	`panelopt_code`   varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '列',
+	`panelopt_userid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+	`create_by`       varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`update_by`       varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`create_date`     datetime(0) NULL DEFAULT NULL,
+	`update_date`     datetime(0) NULL DEFAULT NULL,
+	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_panelopt
 -- ----------------------------
-INSERT INTO `sys_panelopt` VALUES ('4ce6ed8e7724d5eca359fe4000678ec4', 1, 1, 'BACKLOG', 'acfc0e9232f54732a5d9ffe9071bf572', NULL, NULL, NULL, NULL);
-INSERT INTO `sys_panelopt` VALUES ('6a11703827eb95735368f587350d4822', 2, 0, 'DYNAMIC', 'acfc0e9232f54732a5d9ffe9071bf572', NULL, NULL, NULL, NULL);
-INSERT INTO `sys_panelopt` VALUES ('f42c77353ce806e5b5a788b508f76c88', 1, 0, 'SHORTCUTS', 'acfc0e9232f54732a5d9ffe9071bf572', NULL, NULL, NULL, NULL);
+INSERT INTO `sys_panelopt`
+VALUES ('4ce6ed8e7724d5eca359fe4000678ec4', 1, 1, 'BACKLOG', 'acfc0e9232f54732a5d9ffe9071bf572', NULL, NULL, NULL,
+		NULL);
+INSERT INTO `sys_panelopt`
+VALUES ('6a11703827eb95735368f587350d4822', 2, 0, 'DYNAMIC', 'acfc0e9232f54732a5d9ffe9071bf572', NULL, NULL, NULL,
+		NULL);
+INSERT INTO `sys_panelopt`
+VALUES ('f42c77353ce806e5b5a788b508f76c88', 1, 0, 'SHORTCUTS', 'acfc0e9232f54732a5d9ffe9071bf572', NULL, NULL, NULL,
+		NULL);
 
 -- ----------------------------
 -- Table structure for sys_role
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_role`;
-CREATE TABLE `sys_role`  (
-  `id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `role_name` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `create_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `create_date` datetime(0) NULL DEFAULT NULL,
-  `update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `update_date` datetime(0) NULL DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
+CREATE TABLE `sys_role`
+(
+	`id`          varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+	`role_name`   varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`remark`      varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`create_by`   varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`create_date` datetime(0) NULL DEFAULT NULL,
+	`update_by`   varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`update_date` datetime(0) NULL DEFAULT NULL,
+	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_role
 -- ----------------------------
-INSERT INTO `sys_role` VALUES ('023366f3457511e8bcf1309c2315f9aa', 'hr', '人事', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-04-21 23:02:16', NULL, NULL);
-INSERT INTO `sys_role` VALUES ('0ea934e5e55411e7b983201a068c6482', 'manage', '经理', 'acfc0e9232f54732a5d9ffe9071bf572', '2017-12-20 15:04:44', NULL, '2018-01-02 11:41:43');
-INSERT INTO `sys_role` VALUES ('2619a672e53811e7b983201a068c6482', 'admin', '管理员', 'acfc0e9232f54732a5d9ffe9071bf572', '2017-12-20 11:44:57', NULL, '2018-01-02 11:38:37');
-INSERT INTO `sys_role` VALUES ('4bb891d8caf84cc6ba27e515e80ac40d', 'blogAdmin', '博客管理员', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-10-01 10:21:10', NULL, NULL);
-INSERT INTO `sys_role` VALUES ('dcb0f642fe9611e7b472201a068c6482', 'dev', '开发', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-21 18:35:56', NULL, NULL);
-INSERT INTO `sys_role` VALUES ('e346e96368484c8fa7f217ce550a0186', 'DeputyManager', '副经理', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-06-14 23:21:36', NULL, NULL);
+INSERT INTO `sys_role`
+VALUES ('023366f3457511e8bcf1309c2315f9aa', 'hr', '人事', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-04-21 23:02:16',
+		NULL, NULL);
+INSERT INTO `sys_role`
+VALUES ('0ea934e5e55411e7b983201a068c6482', 'manage', '经理', 'acfc0e9232f54732a5d9ffe9071bf572', '2017-12-20 15:04:44',
+		NULL, '2018-01-02 11:41:43');
+INSERT INTO `sys_role`
+VALUES ('2619a672e53811e7b983201a068c6482', 'admin', '管理员', 'acfc0e9232f54732a5d9ffe9071bf572',
+		'2017-12-20 11:44:57', NULL, '2018-01-02 11:38:37');
+INSERT INTO `sys_role`
+VALUES ('4bb891d8caf84cc6ba27e515e80ac40d', 'blogAdmin', '博客管理员', 'acfc0e9232f54732a5d9ffe9071bf572',
+		'2018-10-01 10:21:10', NULL, NULL);
+INSERT INTO `sys_role`
+VALUES ('dcb0f642fe9611e7b472201a068c6482', 'dev', '开发', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-21 18:35:56',
+		NULL, NULL);
+INSERT INTO `sys_role`
+VALUES ('e346e96368484c8fa7f217ce550a0186', 'DeputyManager', '副经理', 'acfc0e9232f54732a5d9ffe9071bf572',
+		'2018-06-14 23:21:36', NULL, NULL);
 
 -- ----------------------------
 -- Table structure for sys_role_menu
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_role_menu`;
-CREATE TABLE `sys_role_menu`  (
-  `role_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `menu_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  PRIMARY KEY (`role_id`, `menu_id`) USING BTREE
+CREATE TABLE `sys_role_menu`
+(
+	`role_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+	`menu_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+	PRIMARY KEY (`role_id`, `menu_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_role_menu
 -- ----------------------------
-INSERT INTO `sys_role_menu` VALUES ('023366f3457511e8bcf1309c2315f9aa', '433089a6eb0111e782d5201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('023366f3457511e8bcf1309c2315f9aa', '4d603831fe9b11e7b472201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('023366f3457511e8bcf1309c2315f9aa', 'b7839f59fe8811e7b472201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('023366f3457511e8bcf1309c2315f9aa', 'cfda8029dfb311e7b555201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('023366f3457511e8bcf1309c2315f9aa', 'cfe54921dfb311e7b555201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('023366f3457511e8bcf1309c2315f9aa', 'cfe54921dfb311e7b555201a068c6483');
-INSERT INTO `sys_role_menu` VALUES ('023366f3457511e8bcf1309c2315f9aa', 'e06da471f90311e780aa201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('023366f3457511e8bcf1309c2315f9aa', 'e3b11497eb9e11e7928d201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('023366f3457511e8bcf1309c2315f9aa', 'f23f6a6bf09511e78a57201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('0ea934e5e55411e7b983201a068c6482', '433089a6eb0111e782d5201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('0ea934e5e55411e7b983201a068c6482', '4d603831fe9b11e7b472201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('0ea934e5e55411e7b983201a068c6482', '6931fd22f09611e78a57201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('0ea934e5e55411e7b983201a068c6482', '6dc13c6eec5f11e7a472201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('0ea934e5e55411e7b983201a068c6482', 'a1ca6642ec5e11e7a472201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('0ea934e5e55411e7b983201a068c6482', 'b7839f59fe8811e7b472201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('0ea934e5e55411e7b983201a068c6482', 'cfda8029dfb311e7b555201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('0ea934e5e55411e7b983201a068c6482', 'cfe54921dfb311e7b555201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('0ea934e5e55411e7b983201a068c6482', 'e06da471f90311e780aa201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', '0e6c8d4cf09511e78a57201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', '18bf8d5df09511e78a57201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', '28661300f9d411e7a009201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', '2b56410cf09411e78a57201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', '3873ccc2dfda11e7b555201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', '433089a6eb0111e782d5201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', '4d603831fe9b11e7b472201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', '5ae3d4e9f38e11e7aca0201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', '6315968bf37111e7aca0201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', '63da4415fc6211e7a781201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', '6931fd22f09611e78a57201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', '69f3f59cf38e11e7aca0201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', '6dc13c6eec5f11e7a472201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', '788d8e34f38e11e7aca0201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', '7967e098ee0611e7a60d201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', '873f30b0f38e11e7aca0201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', '88b8e5d1f38911e7aca0201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', 'a1ca6642ec5e11e7a472201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', 'b441914cee0811e7a60d201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', 'b7839f59fe8811e7b472201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', 'cfda8029dfb311e7b555201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', 'cfe54921dfb311e7b555201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', 'cfe54921dfb311e7b555201a068c6483');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', 'cff61424dfb311e7b555201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', 'e06da471f90311e780aa201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', 'e3b11497eb9e11e7928d201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', 'e9a13e55f35911e7aca0201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', 'ecda560cf36f11e7aca0201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', 'f23f6a6bf09511e78a57201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('2619a672e53811e7b983201a068c6482', 'ff015ea5f09411e78a57201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('35f7934d335e4641b7887e4b3b1885a5', '18bf8d5df09511e78a57201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('35f7934d335e4641b7887e4b3b1885a5', '3873ccc2dfda11e7b555201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('35f7934d335e4641b7887e4b3b1885a5', 'cfda8029dfb311e7b555201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('a56219ffeb7d11e7928d201a068c6482', '433089a6eb0111e782d5201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('a56219ffeb7d11e7928d201a068c6482', 'cfda8029dfb311e7b555201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('a56219ffeb7d11e7928d201a068c6482', 'cfe54921dfb311e7b555201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('dcb0f642fe9611e7b472201a068c6482', '4d603831fe9b11e7b472201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('dcb0f642fe9611e7b472201a068c6482', '5ae3d4e9f38e11e7aca0201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('dcb0f642fe9611e7b472201a068c6482', '6315968bf37111e7aca0201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('dcb0f642fe9611e7b472201a068c6482', '69f3f59cf38e11e7aca0201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('dcb0f642fe9611e7b472201a068c6482', '788d8e34f38e11e7aca0201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('dcb0f642fe9611e7b472201a068c6482', '873f30b0f38e11e7aca0201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('dcb0f642fe9611e7b472201a068c6482', 'a1ca6642ec5e11e7a472201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('dcb0f642fe9611e7b472201a068c6482', 'b7839f59fe8811e7b472201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('dcb0f642fe9611e7b472201a068c6482', 'e06da471f90311e780aa201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('dcb0f642fe9611e7b472201a068c6482', 'e9a13e55f35911e7aca0201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('dcb0f642fe9611e7b472201a068c6482', 'ecda560cf36f11e7aca0201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('e346e96368484c8fa7f217ce550a0186', '4d603831fe9b11e7b472201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('e346e96368484c8fa7f217ce550a0186', 'b7839f59fe8811e7b472201a068c6482');
-INSERT INTO `sys_role_menu` VALUES ('e346e96368484c8fa7f217ce550a0186', 'e06da471f90311e780aa201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('023366f3457511e8bcf1309c2315f9aa', '433089a6eb0111e782d5201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('023366f3457511e8bcf1309c2315f9aa', '4d603831fe9b11e7b472201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('023366f3457511e8bcf1309c2315f9aa', 'b7839f59fe8811e7b472201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('023366f3457511e8bcf1309c2315f9aa', 'cfda8029dfb311e7b555201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('023366f3457511e8bcf1309c2315f9aa', 'cfe54921dfb311e7b555201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('023366f3457511e8bcf1309c2315f9aa', 'cfe54921dfb311e7b555201a068c6483');
+INSERT INTO `sys_role_menu`
+VALUES ('023366f3457511e8bcf1309c2315f9aa', 'e06da471f90311e780aa201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('023366f3457511e8bcf1309c2315f9aa', 'e3b11497eb9e11e7928d201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('023366f3457511e8bcf1309c2315f9aa', 'f23f6a6bf09511e78a57201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('0ea934e5e55411e7b983201a068c6482', '433089a6eb0111e782d5201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('0ea934e5e55411e7b983201a068c6482', '4d603831fe9b11e7b472201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('0ea934e5e55411e7b983201a068c6482', '6931fd22f09611e78a57201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('0ea934e5e55411e7b983201a068c6482', '6dc13c6eec5f11e7a472201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('0ea934e5e55411e7b983201a068c6482', 'a1ca6642ec5e11e7a472201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('0ea934e5e55411e7b983201a068c6482', 'b7839f59fe8811e7b472201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('0ea934e5e55411e7b983201a068c6482', 'cfda8029dfb311e7b555201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('0ea934e5e55411e7b983201a068c6482', 'cfe54921dfb311e7b555201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('0ea934e5e55411e7b983201a068c6482', 'e06da471f90311e780aa201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', '0e6c8d4cf09511e78a57201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', '18bf8d5df09511e78a57201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', '28661300f9d411e7a009201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', '2b56410cf09411e78a57201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', '3873ccc2dfda11e7b555201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', '433089a6eb0111e782d5201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', '4d603831fe9b11e7b472201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', '5ae3d4e9f38e11e7aca0201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', '6315968bf37111e7aca0201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', '63da4415fc6211e7a781201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', '6931fd22f09611e78a57201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', '69f3f59cf38e11e7aca0201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', '6dc13c6eec5f11e7a472201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', '788d8e34f38e11e7aca0201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', '7967e098ee0611e7a60d201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', '873f30b0f38e11e7aca0201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', '88b8e5d1f38911e7aca0201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', 'a1ca6642ec5e11e7a472201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', 'b441914cee0811e7a60d201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', 'b7839f59fe8811e7b472201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', 'cfda8029dfb311e7b555201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', 'cfe54921dfb311e7b555201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', 'cfe54921dfb311e7b555201a068c6483');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', 'cff61424dfb311e7b555201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', 'e06da471f90311e780aa201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', 'e3b11497eb9e11e7928d201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', 'e9a13e55f35911e7aca0201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', 'ecda560cf36f11e7aca0201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', 'f23f6a6bf09511e78a57201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('2619a672e53811e7b983201a068c6482', 'ff015ea5f09411e78a57201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('35f7934d335e4641b7887e4b3b1885a5', '18bf8d5df09511e78a57201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('35f7934d335e4641b7887e4b3b1885a5', '3873ccc2dfda11e7b555201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('35f7934d335e4641b7887e4b3b1885a5', 'cfda8029dfb311e7b555201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('a56219ffeb7d11e7928d201a068c6482', '433089a6eb0111e782d5201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('a56219ffeb7d11e7928d201a068c6482', 'cfda8029dfb311e7b555201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('a56219ffeb7d11e7928d201a068c6482', 'cfe54921dfb311e7b555201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('dcb0f642fe9611e7b472201a068c6482', '4d603831fe9b11e7b472201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('dcb0f642fe9611e7b472201a068c6482', '5ae3d4e9f38e11e7aca0201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('dcb0f642fe9611e7b472201a068c6482', '6315968bf37111e7aca0201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('dcb0f642fe9611e7b472201a068c6482', '69f3f59cf38e11e7aca0201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('dcb0f642fe9611e7b472201a068c6482', '788d8e34f38e11e7aca0201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('dcb0f642fe9611e7b472201a068c6482', '873f30b0f38e11e7aca0201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('dcb0f642fe9611e7b472201a068c6482', 'a1ca6642ec5e11e7a472201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('dcb0f642fe9611e7b472201a068c6482', 'b7839f59fe8811e7b472201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('dcb0f642fe9611e7b472201a068c6482', 'e06da471f90311e780aa201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('dcb0f642fe9611e7b472201a068c6482', 'e9a13e55f35911e7aca0201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('dcb0f642fe9611e7b472201a068c6482', 'ecda560cf36f11e7aca0201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('e346e96368484c8fa7f217ce550a0186', '4d603831fe9b11e7b472201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('e346e96368484c8fa7f217ce550a0186', 'b7839f59fe8811e7b472201a068c6482');
+INSERT INTO `sys_role_menu`
+VALUES ('e346e96368484c8fa7f217ce550a0186', 'e06da471f90311e780aa201a068c6482');
 
 -- ----------------------------
 -- Table structure for sys_role_user
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_role_user`;
-CREATE TABLE `sys_role_user`  (
-  `user_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `role_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  PRIMARY KEY (`user_id`, `role_id`) USING BTREE
+CREATE TABLE `sys_role_user`
+(
+	`user_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+	`role_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+	PRIMARY KEY (`user_id`, `role_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_role_user
 -- ----------------------------
-INSERT INTO `sys_role_user` VALUES ('0b7625fedaa05e85f282486e1c9c91b9', 'e346e96368484c8fa7f217ce550a0186');
-INSERT INTO `sys_role_user` VALUES ('5946a985f733c57f1ab71689f7b6aeea', 'dcb0f642fe9611e7b472201a068c6482');
-INSERT INTO `sys_role_user` VALUES ('98b051b03681de6028993a5d14ac93cb', '023366f3457511e8bcf1309c2315f9aa');
-INSERT INTO `sys_role_user` VALUES ('acfc0e9232f54732a5d9ffe9071bf572', '2619a672e53811e7b983201a068c6482');
-INSERT INTO `sys_role_user` VALUES ('acfc0e9232f54732a5d9ffe9071bf572', '4bb891d8caf84cc6ba27e515e80ac40d');
-INSERT INTO `sys_role_user` VALUES ('d818ac6a86cf1a64d2184bf0699d67a8', '0ea934e5e55411e7b983201a068c6482');
+INSERT INTO `sys_role_user`
+VALUES ('0b7625fedaa05e85f282486e1c9c91b9', 'e346e96368484c8fa7f217ce550a0186');
+INSERT INTO `sys_role_user`
+VALUES ('5946a985f733c57f1ab71689f7b6aeea', 'dcb0f642fe9611e7b472201a068c6482');
+INSERT INTO `sys_role_user`
+VALUES ('98b051b03681de6028993a5d14ac93cb', '023366f3457511e8bcf1309c2315f9aa');
+INSERT INTO `sys_role_user`
+VALUES ('acfc0e9232f54732a5d9ffe9071bf572', '2619a672e53811e7b983201a068c6482');
+INSERT INTO `sys_role_user`
+VALUES ('acfc0e9232f54732a5d9ffe9071bf572', '4bb891d8caf84cc6ba27e515e80ac40d');
+INSERT INTO `sys_role_user`
+VALUES ('d818ac6a86cf1a64d2184bf0699d67a8', '0ea934e5e55411e7b983201a068c6482');
 
 -- ----------------------------
 -- Table structure for sys_shortcuts
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_shortcuts`;
-CREATE TABLE `sys_shortcuts`  (
-  `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
-  `shortcuts_num` int(4) NOT NULL COMMENT '序号',
-  `shortcuts_userid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '用户id',
-  `shortcuts_menuid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '菜单id',
-  `create_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `create_date` datetime(0) NULL DEFAULT NULL,
-  `update_date` datetime(0) NULL DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
+CREATE TABLE `sys_shortcuts`
+(
+	`id`               varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+	`shortcuts_num`    int(4) NOT NULL COMMENT '序号',
+	`shortcuts_userid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '用户id',
+	`shortcuts_menuid` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '菜单id',
+	`create_by`        varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`update_by`        varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`create_date`      datetime(0) NULL DEFAULT NULL,
+	`update_date`      datetime(0) NULL DEFAULT NULL,
+	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_shortcuts
 -- ----------------------------
-INSERT INTO `sys_shortcuts` VALUES ('326c6c7b1cbd4aadbd9f562b15f30f3e', 5, 'acfc0e9232f54732a5d9ffe9071bf572', 'e9a13e55f35911e7aca0201a068c6482', 'acfc0e9232f54732a5d9ffe9071bf572', NULL, '2022-04-30 22:22:10', NULL);
-INSERT INTO `sys_shortcuts` VALUES ('468edda3053f49879fcb5b4b124c6362', 5, 'acfc0e9232f54732a5d9ffe9071bf572', '6dc13c6eec5f11e7a472201a068c6482', 'acfc0e9232f54732a5d9ffe9071bf572', NULL, '2022-07-20 18:10:26', NULL);
-INSERT INTO `sys_shortcuts` VALUES ('63131105465041b4ac01c3e2ad72e48e', 1, 'acfc0e9232f54732a5d9ffe9071bf572', '3873ccc2dfda11e7b555201a068c6482', 'acfc0e9232f54732a5d9ffe9071bf572', NULL, '2022-04-17 23:09:37', NULL);
-INSERT INTO `sys_shortcuts` VALUES ('a3c5d6a90a2146d9b19a6119581157c5', 2, 'acfc0e9232f54732a5d9ffe9071bf572', 'cfe54921dfb311e7b555201a068c6482', 'acfc0e9232f54732a5d9ffe9071bf572', NULL, '2022-05-03 09:14:22', NULL);
-INSERT INTO `sys_shortcuts` VALUES ('bf1bbfc705bb46bfb3f2c247a8e799eb', 0, 'acfc0e9232f54732a5d9ffe9071bf572', '7967e098ee0611e7a60d201a068c6482', 'acfc0e9232f54732a5d9ffe9071bf572', NULL, '2022-05-02 23:52:20', NULL);
-INSERT INTO `sys_shortcuts` VALUES ('ca68ff4350b74fb0b339d464f2b10423', 3, 'acfc0e9232f54732a5d9ffe9071bf572', 'b441914cee0811e7a60d201a068c6482', 'acfc0e9232f54732a5d9ffe9071bf572', NULL, '2022-05-03 09:14:10', NULL);
+INSERT INTO `sys_shortcuts`
+VALUES ('326c6c7b1cbd4aadbd9f562b15f30f3e', 5, 'acfc0e9232f54732a5d9ffe9071bf572', 'e9a13e55f35911e7aca0201a068c6482',
+		'acfc0e9232f54732a5d9ffe9071bf572', NULL, '2022-04-30 22:22:10', NULL);
+INSERT INTO `sys_shortcuts`
+VALUES ('468edda3053f49879fcb5b4b124c6362', 5, 'acfc0e9232f54732a5d9ffe9071bf572', '6dc13c6eec5f11e7a472201a068c6482',
+		'acfc0e9232f54732a5d9ffe9071bf572', NULL, '2022-07-20 18:10:26', NULL);
+INSERT INTO `sys_shortcuts`
+VALUES ('63131105465041b4ac01c3e2ad72e48e', 1, 'acfc0e9232f54732a5d9ffe9071bf572', '3873ccc2dfda11e7b555201a068c6482',
+		'acfc0e9232f54732a5d9ffe9071bf572', NULL, '2022-04-17 23:09:37', NULL);
+INSERT INTO `sys_shortcuts`
+VALUES ('a3c5d6a90a2146d9b19a6119581157c5', 2, 'acfc0e9232f54732a5d9ffe9071bf572', 'cfe54921dfb311e7b555201a068c6482',
+		'acfc0e9232f54732a5d9ffe9071bf572', NULL, '2022-05-03 09:14:22', NULL);
+INSERT INTO `sys_shortcuts`
+VALUES ('bf1bbfc705bb46bfb3f2c247a8e799eb', 0, 'acfc0e9232f54732a5d9ffe9071bf572', '7967e098ee0611e7a60d201a068c6482',
+		'acfc0e9232f54732a5d9ffe9071bf572', NULL, '2022-05-02 23:52:20', NULL);
+INSERT INTO `sys_shortcuts`
+VALUES ('ca68ff4350b74fb0b339d464f2b10423', 3, 'acfc0e9232f54732a5d9ffe9071bf572', 'b441914cee0811e7a60d201a068c6482',
+		'acfc0e9232f54732a5d9ffe9071bf572', NULL, '2022-05-03 09:14:10', NULL);
 
 -- ----------------------------
 -- Table structure for sys_user
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_user`;
-CREATE TABLE `sys_user`  (
-  `id` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `username` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `password` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `age` int(4) NULL DEFAULT NULL,
-  `email` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `photo` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `real_name` varchar(18) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `user_empid` varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '员工id',
-  `create_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `create_date` datetime(0) NULL DEFAULT NULL,
-  `update_date` datetime(0) NULL DEFAULT NULL,
-  `del_flag` tinyint(4) NOT NULL DEFAULT 0 COMMENT '0可用1封禁',
-  PRIMARY KEY (`id`) USING BTREE
+CREATE TABLE `sys_user`
+(
+	`id`          varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci  NOT NULL,
+	`username`    varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci  NOT NULL,
+	`password`    varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+	`age`         int(4) NULL DEFAULT NULL,
+	`email`       varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`photo`       varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`real_name`   varchar(18) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`user_empid`  varchar(36) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '员工id',
+	`create_by`   varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`update_by`   varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`create_date` datetime(0) NULL DEFAULT NULL,
+	`update_date` datetime(0) NULL DEFAULT NULL,
+	`del_flag`    tinyint(4) NOT NULL DEFAULT 0 COMMENT '0可用1封禁',
+	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_user
 -- ----------------------------
-INSERT INTO `sys_user` VALUES ('0b7625fedaa05e85f282486e1c9c91b9', 'jingli1', '40d400f384b4996fd6ab30dab720ef1e', 20, '11@qq.com', '', NULL, NULL, NULL, NULL, NULL, NULL, 0);
-INSERT INTO `sys_user` VALUES ('5946a985f733c57f1ab71689f7b6aeea', 'zhangsan', 'a07e4c18324811b0d0ec17a89e0f855b', 20, '11@qq.com', '', NULL, NULL, NULL, NULL, NULL, NULL, 0);
-INSERT INTO `sys_user` VALUES ('98b051b03681de6028993a5d14ac93cb', 'hr', 'bce07289deffa09011e644813e6d86a4', 20, '11@qq.com', '', NULL, NULL, NULL, NULL, NULL, NULL, 0);
-INSERT INTO `sys_user` VALUES ('acfc0e9232f54732a5d9ffe9071bf572', 'admin', 'e0b141de1c8091be350d3fc80de66528', 24, '', 'a88e6ae3-af87-490e-8f3e-6a92156dc95f.jpeg', '管理员', NULL, NULL, 'acfc0e9232f54732a5d9ffe9071bf572', '2017-12-20 16:34:06', '2018-10-01 10:21:19', 0);
-INSERT INTO `sys_user` VALUES ('c7f1a7d7018311e8a1a2201a068c6482', '666', 'c6953f608430df414ea52e8c01b81a45', 24, '', '', '666', NULL, 'acfc0e9232f54732a5d9ffe9071bf572', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-25 11:56:54', '2018-06-14 23:18:51', 1);
-INSERT INTO `sys_user` VALUES ('d818ac6a86cf1a64d2184bf0699d67a8', 'jingli', '6a333668613ef7946f4462866f537fb5', 20, '11@qq.com', '', NULL, NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_user`
+VALUES ('0b7625fedaa05e85f282486e1c9c91b9', 'jingli1', '40d400f384b4996fd6ab30dab720ef1e', 20, '11@qq.com', '', NULL,
+		NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_user`
+VALUES ('5946a985f733c57f1ab71689f7b6aeea', 'zhangsan', 'a07e4c18324811b0d0ec17a89e0f855b', 20, '11@qq.com', '', NULL,
+		NULL, NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_user`
+VALUES ('98b051b03681de6028993a5d14ac93cb', 'hr', 'bce07289deffa09011e644813e6d86a4', 20, '11@qq.com', '', NULL, NULL,
+		NULL, NULL, NULL, NULL, 0);
+INSERT INTO `sys_user`
+VALUES ('acfc0e9232f54732a5d9ffe9071bf572', 'admin', 'e0b141de1c8091be350d3fc80de66528', 24, '',
+		'a88e6ae3-af87-490e-8f3e-6a92156dc95f.jpeg', '管理员', NULL, NULL, 'acfc0e9232f54732a5d9ffe9071bf572',
+		'2017-12-20 16:34:06', '2018-10-01 10:21:19', 0);
+INSERT INTO `sys_user`
+VALUES ('c7f1a7d7018311e8a1a2201a068c6482', '666', 'c6953f608430df414ea52e8c01b81a45', 24, '', '', '666', NULL,
+		'acfc0e9232f54732a5d9ffe9071bf572', 'acfc0e9232f54732a5d9ffe9071bf572', '2018-01-25 11:56:54',
+		'2018-06-14 23:18:51', 1);
+INSERT INTO `sys_user`
+VALUES ('d818ac6a86cf1a64d2184bf0699d67a8', 'jingli', '6a333668613ef7946f4462866f537fb5', 20, '11@qq.com', '', NULL,
+		NULL, NULL, NULL, NULL, NULL, 0);
 
 -- ----------------------------
 -- Table structure for test
 -- ----------------------------
 DROP TABLE IF EXISTS `test`;
-CREATE TABLE `test`  (
-  `id` int(11) NOT NULL,
-  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
+CREATE TABLE `test`
+(
+	`id`   int(11) NOT NULL,
+	`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL,
+	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of test
 -- ----------------------------
-INSERT INTO `test` VALUES (1, '22');
+INSERT INTO `test`
+VALUES (1, '22');
 
 -- ----------------------------
 -- Table structure for user_leave
 -- ----------------------------
 DROP TABLE IF EXISTS `user_leave`;
-CREATE TABLE `user_leave`  (
-  `id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `user_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-  `user_name` varchar(18) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `begin_time` datetime(0) NULL DEFAULT NULL,
-  `end_time` datetime(0) NULL DEFAULT NULL,
-  `reason` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `days` int(11) NULL DEFAULT NULL,
-  `process_instance_Id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `status` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `create_date` datetime(0) NULL DEFAULT NULL,
-  `create_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `update_date` datetime(0) NULL DEFAULT NULL,
-  `update_by` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `task_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `urlpath` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
-  `submittimes` int(10) NULL DEFAULT 1,
-  PRIMARY KEY (`id`) USING BTREE
+CREATE TABLE `user_leave`
+(
+	`id`                  varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+	`user_id`             varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+	`user_name`           varchar(18) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`begin_time`          datetime(0) NULL DEFAULT NULL,
+	`end_time`            datetime(0) NULL DEFAULT NULL,
+	`reason`              varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`days`                int(11) NULL DEFAULT NULL,
+	`process_instance_Id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`status`              varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`create_date`         datetime(0) NULL DEFAULT NULL,
+	`create_by`           varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`update_date`         datetime(0) NULL DEFAULT NULL,
+	`update_by`           varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`task_name`           varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`urlpath`             varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL,
+	`submittimes`         int(10) NULL DEFAULT 1,
+	PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of user_leave
 -- ----------------------------
-INSERT INTO `user_leave` VALUES ('432070fc1f52c0cc177ad901a5aac8d1', '5946a985f733c57f1ab71689f7b6aeea', 'zhangsan', '2022-03-31 00:00:00', '2022-04-02 00:00:00', '111', 3, '302556', NULL, NULL, NULL, NULL, NULL, NULL, '/leave/readOnlyLeave/432070fc1f52c0cc177ad901a5aac8d1', 1);
-INSERT INTO `user_leave` VALUES ('7d5b418cc0b1cecdc7545261ba6b0b18', 'acfc0e9232f54732a5d9ffe9071bf572', 'admin', '2022-03-31 00:00:00', '2022-04-01 00:00:00', '111', 2, '302527', NULL, NULL, NULL, NULL, NULL, NULL, '/leave/readOnlyLeave/7d5b418cc0b1cecdc7545261ba6b0b18', 1);
-INSERT INTO `user_leave` VALUES ('7e804e7eb7ab8f354af131cbbc62c683', '5946a985f733c57f1ab71689f7b6aeea', 'zhangsan', '2022-03-31 00:00:00', '2022-04-04 00:00:00', '222', 5, '302599', NULL, NULL, NULL, NULL, NULL, NULL, '/leave/readOnlyLeave/7e804e7eb7ab8f354af131cbbc62c683', 1);
-INSERT INTO `user_leave` VALUES ('89f445cbe3334a458a412691170d1e11', 'a4a743bffe9711e7b472201a068c6482', 'zxm', '2018-07-19 00:00:00', '2018-07-25 00:00:00', '2222', 3, '277535', NULL, NULL, NULL, NULL, NULL, NULL, '/leave/readOnlyLeave/89f445cbe3334a458a412691170d1e11', 1);
-INSERT INTO `user_leave` VALUES ('9b691eafc3521b8a316815f7a3a98b8f', 'acfc0e9232f54732a5d9ffe9071bf572', 'admin', '2022-03-31 00:00:00', '2022-04-01 00:00:00', '111', 2, '302514', NULL, NULL, NULL, NULL, NULL, NULL, '/leave/readOnlyLeave/9b691eafc3521b8a316815f7a3a98b8f', 1);
-INSERT INTO `user_leave` VALUES ('be7055719798461d93c3aa635c309bdc', 'a4a743bffe9711e7b472201a068c6482', 'zxm', '2018-07-14 00:00:00', '2018-07-17 00:00:00', '111', 3, '277505', NULL, NULL, NULL, NULL, NULL, NULL, '/leave/readOnlyLeave/be7055719798461d93c3aa635c309bdc', 1);
-INSERT INTO `user_leave` VALUES ('f77b8a76443318fa2a7b39f820bd56f9', 'acfc0e9232f54732a5d9ffe9071bf572', 'admin', '2022-03-31 00:00:00', '2022-04-01 00:00:00', '111', 2, '302501', NULL, NULL, NULL, NULL, NULL, NULL, '/leave/readOnlyLeave/f77b8a76443318fa2a7b39f820bd56f9', 1);
-
-SET FOREIGN_KEY_CHECKS = 1;
+INSERT INTO `user_leave`
+VALUES ('432070fc1f52c0cc177ad901a5aac8d1', '5946a985f733c57f1ab71689f7b6aeea', 'zhangsan', '2022-03-31 00:00:00',
+		'2022-04-02 00:00:00', '111', 3, '302556', NULL, NULL, NULL, NULL, NULL, NULL,
+		'/leave/readOnlyLeave/432070fc1f52c0cc177ad901a5aac8d1', 1);
+INSERT INTO `user_leave`
+VALUES ('7d5b418cc0b1cecdc7545261ba6b0b18', 'acfc0e9232f54732a5d9ffe9071bf572', 'admin', '2022-03-31 00:00:00',
+		'2022-04-01 00:00:00', '111', 2, '302527', NULL, NULL, NULL, NULL, NULL, NULL,
+		'/leave/readOnlyLeave/7d5b418cc0b1cecdc7545261ba6b0b18', 1);
+INSERT INTO `user_leave`
+VALUES ('7e804e7eb7ab8f354af131cbbc62c683', '5946a985f733c57f1ab71689f7b6aeea', 'zhangsan', '2022-03-31 00:00:00',
+		'2022-04-04 00:00:00', '222', 5, '302599', NULL, NULL, NULL, NULL, NULL, NULL,
+		'/leave/readOnlyLeave/7e804e7eb7ab8f354af131cbbc62c683', 1);
+INSERT INTO `user_leave`
+VALUES ('89f445cbe3334a458a412691170d1e11', 'a4a743bffe9711e7b472201a068c6482', 'zxm', '2018-07-19 00:00:00',
+		'2018-07-25 00:00:00', '2222', 3, '277535', NULL, NULL, NULL, NULL, NULL, NULL,
+		'/leave/readOnlyLeave/89f445cbe3334a458a412691170d1e11', 1);
+INSERT INTO `user_leave`
+VALUES ('9b691eafc3521b8a316815f7a3a98b8f', 'acfc0e9232f54732a5d9ffe9071bf572', 'admin', '2022-03-31 00:00:00',
+		'2022-04-01 00:00:00', '111', 2, '302514', NULL, NULL, NULL, NULL, NULL, NULL,
+		'/leave/readOnlyLeave/9b691eafc3521b8a316815f7a3a98b8f', 1);
+INSERT INTO `user_leave`
+VALUES ('be7055719798461d93c3aa635c309bdc', 'a4a743bffe9711e7b472201a068c6482', 'zxm', '2018-07-14 00:00:00',
+		'2018-07-17 00:00:00', '111', 3, '277505', NULL, NULL, NULL, NULL, NULL, NULL,
+		'/leave/readOnlyLeave/be7055719798461d93c3aa635c309bdc', 1);
+INSERT INTO `user_leave`
+VALUES ('f77b8a76443318fa2a7b39f820bd56f9', 'acfc0e9232f54732a5d9ffe9071bf572', 'admin', '2022-03-31 00:00:00',
+		'2022-04-01 00:00:00', '111', 2, '302501', NULL, NULL, NULL, NULL, NULL, NULL,
+		'/leave/readOnlyLeave/f77b8a76443318fa2a7b39f820bd56f9', 1);
+
+SET
+FOREIGN_KEY_CHECKS = 1;
diff --git a/db/lenos-oracle.sql b/db/lenos-oracle.sql
index 3dd20bf..c569841 100644
--- a/db/lenos-oracle.sql
+++ b/db/lenos-oracle.sql
@@ -19,18 +19,17 @@ Date: 2019-02-27 22:47:09
 -- Table structure for ACT_ASSIGNEE
 -- ----------------------------
 DROP TABLE "LEN"."ACT_ASSIGNEE";
-CREATE TABLE "LEN"."ACT_ASSIGNEE" (
-"ID" NVARCHAR2(32) NOT NULL ,
-"SID" NVARCHAR2(32) NOT NULL ,
-"ASSIGNEE" NVARCHAR2(64) NULL ,
-"ROLE_ID" NVARCHAR2(32) NULL ,
-"ASSIGNEE_TYPE" NUMBER(11) NOT NULL ,
-"ACTIVTI_NAME" NVARCHAR2(128) NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_ASSIGNEE"
+(
+	"ID"            NVARCHAR2(32) NOT NULL,
+	"SID"           NVARCHAR2(32) NOT NULL,
+	"ASSIGNEE"      NVARCHAR2(64) NULL,
+	"ROLE_ID"       NVARCHAR2(32) NULL,
+	"ASSIGNEE_TYPE" NUMBER(11) NOT NULL,
+	"ACTIVTI_NAME"  NVARCHAR2(128) NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -41,24 +40,23 @@ NOCACHE
 -- Table structure for ACT_EVT_LOG
 -- ----------------------------
 DROP TABLE "LEN"."ACT_EVT_LOG";
-CREATE TABLE "LEN"."ACT_EVT_LOG" (
-"LOG_NR_" NUMBER(19) NOT NULL ,
-"TYPE_" NVARCHAR2(64) NULL ,
-"PROC_DEF_ID_" NVARCHAR2(64) NULL ,
-"PROC_INST_ID_" NVARCHAR2(64) NULL ,
-"EXECUTION_ID_" NVARCHAR2(64) NULL ,
-"TASK_ID_" NVARCHAR2(64) NULL ,
-"TIME_STAMP_" TIMESTAMP(6)  NOT NULL ,
-"USER_ID_" NVARCHAR2(255) NULL ,
-"DATA_" BLOB NULL ,
-"LOCK_OWNER_" NVARCHAR2(255) NULL ,
-"LOCK_TIME_" TIMESTAMP(6)  NULL ,
-"IS_PROCESSED_" NUMBER(3) DEFAULT 0  NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_EVT_LOG"
+(
+	"LOG_NR_"       NUMBER(19) NOT NULL,
+	"TYPE_"         NVARCHAR2(64) NULL,
+	"PROC_DEF_ID_"  NVARCHAR2(64) NULL,
+	"PROC_INST_ID_" NVARCHAR2(64) NULL,
+	"EXECUTION_ID_" NVARCHAR2(64) NULL,
+	"TASK_ID_"      NVARCHAR2(64) NULL,
+	"TIME_STAMP_"   TIMESTAMP(6) NOT NULL,
+	"USER_ID_"      NVARCHAR2(255) NULL,
+	"DATA_"         BLOB NULL,
+	"LOCK_OWNER_"   NVARCHAR2(255) NULL,
+	"LOCK_TIME_"    TIMESTAMP(6) NULL,
+	"IS_PROCESSED_" NUMBER(3) DEFAULT 0 NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -69,18 +67,17 @@ NOCACHE
 -- Table structure for ACT_GE_BYTEARRAY
 -- ----------------------------
 DROP TABLE "LEN"."ACT_GE_BYTEARRAY";
-CREATE TABLE "LEN"."ACT_GE_BYTEARRAY" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"REV_" NUMBER NULL ,
-"NAME_" NVARCHAR2(255) NULL ,
-"DEPLOYMENT_ID_" NVARCHAR2(64) NULL ,
-"BYTES_" BLOB NULL ,
-"GENERATED_" NUMBER(1) NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_GE_BYTEARRAY"
+(
+	"ID_"            NVARCHAR2(64) NOT NULL,
+	"REV_"           NUMBER NULL,
+	"NAME_"          NVARCHAR2(255) NULL,
+	"DEPLOYMENT_ID_" NVARCHAR2(64) NULL,
+	"BYTES_"         BLOB NULL,
+	"GENERATED_"     NUMBER(1) NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -91,48 +88,49 @@ NOCACHE
 -- Table structure for ACT_GE_PROPERTY
 -- ----------------------------
 DROP TABLE "LEN"."ACT_GE_PROPERTY";
-CREATE TABLE "LEN"."ACT_GE_PROPERTY" (
-"NAME_" NVARCHAR2(64) NOT NULL ,
-"VALUE_" NVARCHAR2(300) NULL ,
-"REV_" NUMBER NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_GE_PROPERTY"
+(
+	"NAME_"  NVARCHAR2(64) NOT NULL,
+	"VALUE_" NVARCHAR2(300) NULL,
+	"REV_"   NUMBER NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
 -- Records of ACT_GE_PROPERTY
 -- ----------------------------
-INSERT INTO "LEN"."ACT_GE_PROPERTY" VALUES ('schema.version', '5.22.0.0', '1');
-INSERT INTO "LEN"."ACT_GE_PROPERTY" VALUES ('schema.history', 'create(5.22.0.0)', '1');
-INSERT INTO "LEN"."ACT_GE_PROPERTY" VALUES ('next.dbid', '1', '1');
+INSERT INTO "LEN"."ACT_GE_PROPERTY"
+VALUES ('schema.version', '5.22.0.0', '1');
+INSERT INTO "LEN"."ACT_GE_PROPERTY"
+VALUES ('schema.history', 'create(5.22.0.0)', '1');
+INSERT INTO "LEN"."ACT_GE_PROPERTY"
+VALUES ('next.dbid', '1', '1');
 
 -- ----------------------------
 -- Table structure for ACT_HI_ACTINST
 -- ----------------------------
 DROP TABLE "LEN"."ACT_HI_ACTINST";
-CREATE TABLE "LEN"."ACT_HI_ACTINST" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"PROC_DEF_ID_" NVARCHAR2(64) NOT NULL ,
-"PROC_INST_ID_" NVARCHAR2(64) NOT NULL ,
-"EXECUTION_ID_" NVARCHAR2(64) NOT NULL ,
-"ACT_ID_" NVARCHAR2(255) NOT NULL ,
-"TASK_ID_" NVARCHAR2(64) NULL ,
-"CALL_PROC_INST_ID_" NVARCHAR2(64) NULL ,
-"ACT_NAME_" NVARCHAR2(255) NULL ,
-"ACT_TYPE_" NVARCHAR2(255) NOT NULL ,
-"ASSIGNEE_" NVARCHAR2(255) NULL ,
-"START_TIME_" TIMESTAMP(6)  NOT NULL ,
-"END_TIME_" TIMESTAMP(6)  NULL ,
-"DURATION_" NUMBER(19) NULL ,
-"TENANT_ID_" NVARCHAR2(255) DEFAULT ''  NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_HI_ACTINST"
+(
+	"ID_"                NVARCHAR2(64) NOT NULL,
+	"PROC_DEF_ID_"       NVARCHAR2(64) NOT NULL,
+	"PROC_INST_ID_"      NVARCHAR2(64) NOT NULL,
+	"EXECUTION_ID_"      NVARCHAR2(64) NOT NULL,
+	"ACT_ID_"            NVARCHAR2(255) NOT NULL,
+	"TASK_ID_"           NVARCHAR2(64) NULL,
+	"CALL_PROC_INST_ID_" NVARCHAR2(64) NULL,
+	"ACT_NAME_"          NVARCHAR2(255) NULL,
+	"ACT_TYPE_"          NVARCHAR2(255) NOT NULL,
+	"ASSIGNEE_"          NVARCHAR2(255) NULL,
+	"START_TIME_"        TIMESTAMP(6) NOT NULL,
+	"END_TIME_"          TIMESTAMP(6) NULL,
+	"DURATION_"          NUMBER(19) NULL,
+	"TENANT_ID_"         NVARCHAR2(255) DEFAULT '' NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -143,23 +141,22 @@ NOCACHE
 -- Table structure for ACT_HI_ATTACHMENT
 -- ----------------------------
 DROP TABLE "LEN"."ACT_HI_ATTACHMENT";
-CREATE TABLE "LEN"."ACT_HI_ATTACHMENT" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"REV_" NUMBER NULL ,
-"USER_ID_" NVARCHAR2(255) NULL ,
-"NAME_" NVARCHAR2(255) NULL ,
-"DESCRIPTION_" NVARCHAR2(2000) NULL ,
-"TYPE_" NVARCHAR2(255) NULL ,
-"TASK_ID_" NVARCHAR2(64) NULL ,
-"PROC_INST_ID_" NVARCHAR2(64) NULL ,
-"URL_" NVARCHAR2(2000) NULL ,
-"CONTENT_ID_" NVARCHAR2(64) NULL ,
-"TIME_" TIMESTAMP(6)  NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_HI_ATTACHMENT"
+(
+	"ID_"           NVARCHAR2(64) NOT NULL,
+	"REV_"          NUMBER NULL,
+	"USER_ID_"      NVARCHAR2(255) NULL,
+	"NAME_"         NVARCHAR2(255) NULL,
+	"DESCRIPTION_"  NVARCHAR2(2000) NULL,
+	"TYPE_"         NVARCHAR2(255) NULL,
+	"TASK_ID_"      NVARCHAR2(64) NULL,
+	"PROC_INST_ID_" NVARCHAR2(64) NULL,
+	"URL_"          NVARCHAR2(2000) NULL,
+	"CONTENT_ID_"   NVARCHAR2(64) NULL,
+	"TIME_"         TIMESTAMP(6) NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -170,21 +167,20 @@ NOCACHE
 -- Table structure for ACT_HI_COMMENT
 -- ----------------------------
 DROP TABLE "LEN"."ACT_HI_COMMENT";
-CREATE TABLE "LEN"."ACT_HI_COMMENT" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"TYPE_" NVARCHAR2(255) NULL ,
-"TIME_" TIMESTAMP(6)  NOT NULL ,
-"USER_ID_" NVARCHAR2(255) NULL ,
-"TASK_ID_" NVARCHAR2(64) NULL ,
-"PROC_INST_ID_" NVARCHAR2(64) NULL ,
-"ACTION_" NVARCHAR2(255) NULL ,
-"MESSAGE_" NVARCHAR2(2000) NULL ,
-"FULL_MSG_" BLOB NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_HI_COMMENT"
+(
+	"ID_"           NVARCHAR2(64) NOT NULL,
+	"TYPE_"         NVARCHAR2(255) NULL,
+	"TIME_"         TIMESTAMP(6) NOT NULL,
+	"USER_ID_"      NVARCHAR2(255) NULL,
+	"TASK_ID_"      NVARCHAR2(64) NULL,
+	"PROC_INST_ID_" NVARCHAR2(64) NULL,
+	"ACTION_"       NVARCHAR2(255) NULL,
+	"MESSAGE_"      NVARCHAR2(2000) NULL,
+	"FULL_MSG_"     BLOB NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -195,27 +191,26 @@ NOCACHE
 -- Table structure for ACT_HI_DETAIL
 -- ----------------------------
 DROP TABLE "LEN"."ACT_HI_DETAIL";
-CREATE TABLE "LEN"."ACT_HI_DETAIL" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"TYPE_" NVARCHAR2(255) NOT NULL ,
-"PROC_INST_ID_" NVARCHAR2(64) NULL ,
-"EXECUTION_ID_" NVARCHAR2(64) NULL ,
-"TASK_ID_" NVARCHAR2(64) NULL ,
-"ACT_INST_ID_" NVARCHAR2(64) NULL ,
-"NAME_" NVARCHAR2(255) NOT NULL ,
-"VAR_TYPE_" NVARCHAR2(64) NULL ,
-"REV_" NUMBER NULL ,
-"TIME_" TIMESTAMP(6)  NOT NULL ,
-"BYTEARRAY_ID_" NVARCHAR2(64) NULL ,
-"DOUBLE_" NUMBER NULL ,
-"LONG_" NUMBER(19) NULL ,
-"TEXT_" NVARCHAR2(2000) NULL ,
-"TEXT2_" NVARCHAR2(2000) NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_HI_DETAIL"
+(
+	"ID_"           NVARCHAR2(64) NOT NULL,
+	"TYPE_"         NVARCHAR2(255) NOT NULL,
+	"PROC_INST_ID_" NVARCHAR2(64) NULL,
+	"EXECUTION_ID_" NVARCHAR2(64) NULL,
+	"TASK_ID_"      NVARCHAR2(64) NULL,
+	"ACT_INST_ID_"  NVARCHAR2(64) NULL,
+	"NAME_"         NVARCHAR2(255) NOT NULL,
+	"VAR_TYPE_"     NVARCHAR2(64) NULL,
+	"REV_"          NUMBER NULL,
+	"TIME_"         TIMESTAMP(6) NOT NULL,
+	"BYTEARRAY_ID_" NVARCHAR2(64) NULL,
+	"DOUBLE_"       NUMBER NULL,
+	"LONG_"         NUMBER(19) NULL,
+	"TEXT_"         NVARCHAR2(2000) NULL,
+	"TEXT2_"        NVARCHAR2(2000) NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -226,18 +221,17 @@ NOCACHE
 -- Table structure for ACT_HI_IDENTITYLINK
 -- ----------------------------
 DROP TABLE "LEN"."ACT_HI_IDENTITYLINK";
-CREATE TABLE "LEN"."ACT_HI_IDENTITYLINK" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"GROUP_ID_" NVARCHAR2(255) NULL ,
-"TYPE_" NVARCHAR2(255) NULL ,
-"USER_ID_" NVARCHAR2(255) NULL ,
-"TASK_ID_" NVARCHAR2(64) NULL ,
-"PROC_INST_ID_" NVARCHAR2(64) NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_HI_IDENTITYLINK"
+(
+	"ID_"           NVARCHAR2(64) NOT NULL,
+	"GROUP_ID_"     NVARCHAR2(255) NULL,
+	"TYPE_"         NVARCHAR2(255) NULL,
+	"USER_ID_"      NVARCHAR2(255) NULL,
+	"TASK_ID_"      NVARCHAR2(64) NULL,
+	"PROC_INST_ID_" NVARCHAR2(64) NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -248,26 +242,25 @@ NOCACHE
 -- Table structure for ACT_HI_PROCINST
 -- ----------------------------
 DROP TABLE "LEN"."ACT_HI_PROCINST";
-CREATE TABLE "LEN"."ACT_HI_PROCINST" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"PROC_INST_ID_" NVARCHAR2(64) NOT NULL ,
-"BUSINESS_KEY_" NVARCHAR2(255) NULL ,
-"PROC_DEF_ID_" NVARCHAR2(64) NOT NULL ,
-"START_TIME_" TIMESTAMP(6)  NOT NULL ,
-"END_TIME_" TIMESTAMP(6)  NULL ,
-"DURATION_" NUMBER(19) NULL ,
-"START_USER_ID_" NVARCHAR2(255) NULL ,
-"START_ACT_ID_" NVARCHAR2(255) NULL ,
-"END_ACT_ID_" NVARCHAR2(255) NULL ,
-"SUPER_PROCESS_INSTANCE_ID_" NVARCHAR2(64) NULL ,
-"DELETE_REASON_" NVARCHAR2(2000) NULL ,
-"TENANT_ID_" NVARCHAR2(255) DEFAULT ''  NULL ,
-"NAME_" NVARCHAR2(255) NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_HI_PROCINST"
+(
+	"ID_"                        NVARCHAR2(64) NOT NULL,
+	"PROC_INST_ID_"              NVARCHAR2(64) NOT NULL,
+	"BUSINESS_KEY_"              NVARCHAR2(255) NULL,
+	"PROC_DEF_ID_"               NVARCHAR2(64) NOT NULL,
+	"START_TIME_"                TIMESTAMP(6) NOT NULL,
+	"END_TIME_"                  TIMESTAMP(6) NULL,
+	"DURATION_"                  NUMBER(19) NULL,
+	"START_USER_ID_"             NVARCHAR2(255) NULL,
+	"START_ACT_ID_"              NVARCHAR2(255) NULL,
+	"END_ACT_ID_"                NVARCHAR2(255) NULL,
+	"SUPER_PROCESS_INSTANCE_ID_" NVARCHAR2(64) NULL,
+	"DELETE_REASON_"             NVARCHAR2(2000) NULL,
+	"TENANT_ID_"                 NVARCHAR2(255) DEFAULT '' NULL,
+	"NAME_"                      NVARCHAR2(255) NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -278,32 +271,31 @@ NOCACHE
 -- Table structure for ACT_HI_TASKINST
 -- ----------------------------
 DROP TABLE "LEN"."ACT_HI_TASKINST";
-CREATE TABLE "LEN"."ACT_HI_TASKINST" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"PROC_DEF_ID_" NVARCHAR2(64) NULL ,
-"TASK_DEF_KEY_" NVARCHAR2(255) NULL ,
-"PROC_INST_ID_" NVARCHAR2(64) NULL ,
-"EXECUTION_ID_" NVARCHAR2(64) NULL ,
-"PARENT_TASK_ID_" NVARCHAR2(64) NULL ,
-"NAME_" NVARCHAR2(255) NULL ,
-"DESCRIPTION_" NVARCHAR2(2000) NULL ,
-"OWNER_" NVARCHAR2(255) NULL ,
-"ASSIGNEE_" NVARCHAR2(255) NULL ,
-"START_TIME_" TIMESTAMP(6)  NOT NULL ,
-"CLAIM_TIME_" TIMESTAMP(6)  NULL ,
-"END_TIME_" TIMESTAMP(6)  NULL ,
-"DURATION_" NUMBER(19) NULL ,
-"DELETE_REASON_" NVARCHAR2(2000) NULL ,
-"PRIORITY_" NUMBER NULL ,
-"DUE_DATE_" TIMESTAMP(6)  NULL ,
-"FORM_KEY_" NVARCHAR2(255) NULL ,
-"CATEGORY_" NVARCHAR2(255) NULL ,
-"TENANT_ID_" NVARCHAR2(255) DEFAULT ''  NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_HI_TASKINST"
+(
+	"ID_"             NVARCHAR2(64) NOT NULL,
+	"PROC_DEF_ID_"    NVARCHAR2(64) NULL,
+	"TASK_DEF_KEY_"   NVARCHAR2(255) NULL,
+	"PROC_INST_ID_"   NVARCHAR2(64) NULL,
+	"EXECUTION_ID_"   NVARCHAR2(64) NULL,
+	"PARENT_TASK_ID_" NVARCHAR2(64) NULL,
+	"NAME_"           NVARCHAR2(255) NULL,
+	"DESCRIPTION_"    NVARCHAR2(2000) NULL,
+	"OWNER_"          NVARCHAR2(255) NULL,
+	"ASSIGNEE_"       NVARCHAR2(255) NULL,
+	"START_TIME_"     TIMESTAMP(6) NOT NULL,
+	"CLAIM_TIME_"     TIMESTAMP(6) NULL,
+	"END_TIME_"       TIMESTAMP(6) NULL,
+	"DURATION_"       NUMBER(19) NULL,
+	"DELETE_REASON_"  NVARCHAR2(2000) NULL,
+	"PRIORITY_"       NUMBER NULL,
+	"DUE_DATE_"       TIMESTAMP(6) NULL,
+	"FORM_KEY_"       NVARCHAR2(255) NULL,
+	"CATEGORY_"       NVARCHAR2(255) NULL,
+	"TENANT_ID_"      NVARCHAR2(255) DEFAULT '' NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -314,26 +306,25 @@ NOCACHE
 -- Table structure for ACT_HI_VARINST
 -- ----------------------------
 DROP TABLE "LEN"."ACT_HI_VARINST";
-CREATE TABLE "LEN"."ACT_HI_VARINST" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"PROC_INST_ID_" NVARCHAR2(64) NULL ,
-"EXECUTION_ID_" NVARCHAR2(64) NULL ,
-"TASK_ID_" NVARCHAR2(64) NULL ,
-"NAME_" NVARCHAR2(255) NOT NULL ,
-"VAR_TYPE_" NVARCHAR2(100) NULL ,
-"REV_" NUMBER NULL ,
-"BYTEARRAY_ID_" NVARCHAR2(64) NULL ,
-"DOUBLE_" NUMBER NULL ,
-"LONG_" NUMBER(19) NULL ,
-"TEXT_" NVARCHAR2(2000) NULL ,
-"TEXT2_" NVARCHAR2(2000) NULL ,
-"CREATE_TIME_" TIMESTAMP(6)  NULL ,
-"LAST_UPDATED_TIME_" TIMESTAMP(6)  NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_HI_VARINST"
+(
+	"ID_"                NVARCHAR2(64) NOT NULL,
+	"PROC_INST_ID_"      NVARCHAR2(64) NULL,
+	"EXECUTION_ID_"      NVARCHAR2(64) NULL,
+	"TASK_ID_"           NVARCHAR2(64) NULL,
+	"NAME_"              NVARCHAR2(255) NOT NULL,
+	"VAR_TYPE_"          NVARCHAR2(100) NULL,
+	"REV_"               NUMBER NULL,
+	"BYTEARRAY_ID_"      NVARCHAR2(64) NULL,
+	"DOUBLE_"            NUMBER NULL,
+	"LONG_"              NUMBER(19) NULL,
+	"TEXT_"              NVARCHAR2(2000) NULL,
+	"TEXT2_"             NVARCHAR2(2000) NULL,
+	"CREATE_TIME_"       TIMESTAMP(6) NULL,
+	"LAST_UPDATED_TIME_" TIMESTAMP(6) NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -344,16 +335,15 @@ NOCACHE
 -- Table structure for ACT_ID_GROUP
 -- ----------------------------
 DROP TABLE "LEN"."ACT_ID_GROUP";
-CREATE TABLE "LEN"."ACT_ID_GROUP" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"REV_" NUMBER NULL ,
-"NAME_" NVARCHAR2(255) NULL ,
-"TYPE_" NVARCHAR2(255) NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_ID_GROUP"
+(
+	"ID_"   NVARCHAR2(64) NOT NULL,
+	"REV_"  NUMBER NULL,
+	"NAME_" NVARCHAR2(255) NULL,
+	"TYPE_" NVARCHAR2(255) NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -364,20 +354,19 @@ NOCACHE
 -- Table structure for ACT_ID_INFO
 -- ----------------------------
 DROP TABLE "LEN"."ACT_ID_INFO";
-CREATE TABLE "LEN"."ACT_ID_INFO" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"REV_" NUMBER NULL ,
-"USER_ID_" NVARCHAR2(64) NULL ,
-"TYPE_" NVARCHAR2(64) NULL ,
-"KEY_" NVARCHAR2(255) NULL ,
-"VALUE_" NVARCHAR2(255) NULL ,
-"PASSWORD_" BLOB NULL ,
-"PARENT_ID_" NVARCHAR2(255) NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_ID_INFO"
+(
+	"ID_"        NVARCHAR2(64) NOT NULL,
+	"REV_"       NUMBER NULL,
+	"USER_ID_"   NVARCHAR2(64) NULL,
+	"TYPE_"      NVARCHAR2(64) NULL,
+	"KEY_"       NVARCHAR2(255) NULL,
+	"VALUE_"     NVARCHAR2(255) NULL,
+	"PASSWORD_"  BLOB NULL,
+	"PARENT_ID_" NVARCHAR2(255) NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -388,14 +377,13 @@ NOCACHE
 -- Table structure for ACT_ID_MEMBERSHIP
 -- ----------------------------
 DROP TABLE "LEN"."ACT_ID_MEMBERSHIP";
-CREATE TABLE "LEN"."ACT_ID_MEMBERSHIP" (
-"USER_ID_" NVARCHAR2(64) NOT NULL ,
-"GROUP_ID_" NVARCHAR2(64) NOT NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_ID_MEMBERSHIP"
+(
+	"USER_ID_"  NVARCHAR2(64) NOT NULL,
+	"GROUP_ID_" NVARCHAR2(64) NOT NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -406,19 +394,18 @@ NOCACHE
 -- Table structure for ACT_ID_USER
 -- ----------------------------
 DROP TABLE "LEN"."ACT_ID_USER";
-CREATE TABLE "LEN"."ACT_ID_USER" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"REV_" NUMBER NULL ,
-"FIRST_" NVARCHAR2(255) NULL ,
-"LAST_" NVARCHAR2(255) NULL ,
-"EMAIL_" NVARCHAR2(255) NULL ,
-"PWD_" NVARCHAR2(255) NULL ,
-"PICTURE_ID_" NVARCHAR2(64) NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_ID_USER"
+(
+	"ID_"         NVARCHAR2(64) NOT NULL,
+	"REV_"        NUMBER NULL,
+	"FIRST_"      NVARCHAR2(255) NULL,
+	"LAST_"       NVARCHAR2(255) NULL,
+	"EMAIL_"      NVARCHAR2(255) NULL,
+	"PWD_"        NVARCHAR2(255) NULL,
+	"PICTURE_ID_" NVARCHAR2(64) NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -429,16 +416,15 @@ NOCACHE
 -- Table structure for ACT_PROCDEF_INFO
 -- ----------------------------
 DROP TABLE "LEN"."ACT_PROCDEF_INFO";
-CREATE TABLE "LEN"."ACT_PROCDEF_INFO" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"PROC_DEF_ID_" NVARCHAR2(64) NOT NULL ,
-"REV_" NUMBER NULL ,
-"INFO_JSON_ID_" NVARCHAR2(64) NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_PROCDEF_INFO"
+(
+	"ID_"           NVARCHAR2(64) NOT NULL,
+	"PROC_DEF_ID_"  NVARCHAR2(64) NOT NULL,
+	"REV_"          NUMBER NULL,
+	"INFO_JSON_ID_" NVARCHAR2(64) NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -449,17 +435,16 @@ NOCACHE
 -- Table structure for ACT_RE_DEPLOYMENT
 -- ----------------------------
 DROP TABLE "LEN"."ACT_RE_DEPLOYMENT";
-CREATE TABLE "LEN"."ACT_RE_DEPLOYMENT" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"NAME_" NVARCHAR2(255) NULL ,
-"CATEGORY_" NVARCHAR2(255) NULL ,
-"TENANT_ID_" NVARCHAR2(255) DEFAULT ''  NULL ,
-"DEPLOY_TIME_" TIMESTAMP(6)  NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_RE_DEPLOYMENT"
+(
+	"ID_"          NVARCHAR2(64) NOT NULL,
+	"NAME_"        NVARCHAR2(255) NULL,
+	"CATEGORY_"    NVARCHAR2(255) NULL,
+	"TENANT_ID_"   NVARCHAR2(255) DEFAULT '' NULL,
+	"DEPLOY_TIME_" TIMESTAMP(6) NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -470,25 +455,24 @@ NOCACHE
 -- Table structure for ACT_RE_MODEL
 -- ----------------------------
 DROP TABLE "LEN"."ACT_RE_MODEL";
-CREATE TABLE "LEN"."ACT_RE_MODEL" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"REV_" NUMBER NULL ,
-"NAME_" NVARCHAR2(255) NULL ,
-"KEY_" NVARCHAR2(255) NULL ,
-"CATEGORY_" NVARCHAR2(255) NULL ,
-"CREATE_TIME_" TIMESTAMP(6)  NULL ,
-"LAST_UPDATE_TIME_" TIMESTAMP(6)  NULL ,
-"VERSION_" NUMBER NULL ,
-"META_INFO_" NVARCHAR2(2000) NULL ,
-"DEPLOYMENT_ID_" NVARCHAR2(64) NULL ,
-"EDITOR_SOURCE_VALUE_ID_" NVARCHAR2(64) NULL ,
-"EDITOR_SOURCE_EXTRA_VALUE_ID_" NVARCHAR2(64) NULL ,
-"TENANT_ID_" NVARCHAR2(255) DEFAULT ''  NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_RE_MODEL"
+(
+	"ID_"                           NVARCHAR2(64) NOT NULL,
+	"REV_"                          NUMBER NULL,
+	"NAME_"                         NVARCHAR2(255) NULL,
+	"KEY_"                          NVARCHAR2(255) NULL,
+	"CATEGORY_"                     NVARCHAR2(255) NULL,
+	"CREATE_TIME_"                  TIMESTAMP(6) NULL,
+	"LAST_UPDATE_TIME_"             TIMESTAMP(6) NULL,
+	"VERSION_"                      NUMBER NULL,
+	"META_INFO_"                    NVARCHAR2(2000) NULL,
+	"DEPLOYMENT_ID_"                NVARCHAR2(64) NULL,
+	"EDITOR_SOURCE_VALUE_ID_"       NVARCHAR2(64) NULL,
+	"EDITOR_SOURCE_EXTRA_VALUE_ID_" NVARCHAR2(64) NULL,
+	"TENANT_ID_"                    NVARCHAR2(255) DEFAULT '' NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -499,26 +483,25 @@ NOCACHE
 -- Table structure for ACT_RE_PROCDEF
 -- ----------------------------
 DROP TABLE "LEN"."ACT_RE_PROCDEF";
-CREATE TABLE "LEN"."ACT_RE_PROCDEF" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"REV_" NUMBER NULL ,
-"CATEGORY_" NVARCHAR2(255) NULL ,
-"NAME_" NVARCHAR2(255) NULL ,
-"KEY_" NVARCHAR2(255) NOT NULL ,
-"VERSION_" NUMBER NOT NULL ,
-"DEPLOYMENT_ID_" NVARCHAR2(64) NULL ,
-"RESOURCE_NAME_" NVARCHAR2(2000) NULL ,
-"DGRM_RESOURCE_NAME_" VARCHAR2(4000 BYTE) NULL ,
-"DESCRIPTION_" NVARCHAR2(2000) NULL ,
-"HAS_START_FORM_KEY_" NUMBER(1) NULL ,
-"HAS_GRAPHICAL_NOTATION_" NUMBER(1) NULL ,
-"SUSPENSION_STATE_" NUMBER NULL ,
-"TENANT_ID_" NVARCHAR2(255) DEFAULT ''  NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_RE_PROCDEF"
+(
+	"ID_"                     NVARCHAR2(64) NOT NULL,
+	"REV_"                    NUMBER NULL,
+	"CATEGORY_"               NVARCHAR2(255) NULL,
+	"NAME_"                   NVARCHAR2(255) NULL,
+	"KEY_"                    NVARCHAR2(255) NOT NULL,
+	"VERSION_"                NUMBER NOT NULL,
+	"DEPLOYMENT_ID_"          NVARCHAR2(64) NULL,
+	"RESOURCE_NAME_"          NVARCHAR2(2000) NULL,
+	"DGRM_RESOURCE_NAME_"     VARCHAR2(4000 BYTE) NULL,
+	"DESCRIPTION_"            NVARCHAR2(2000) NULL,
+	"HAS_START_FORM_KEY_"     NUMBER(1) NULL,
+	"HAS_GRAPHICAL_NOTATION_" NUMBER(1) NULL,
+	"SUSPENSION_STATE_"       NUMBER NULL,
+	"TENANT_ID_"              NVARCHAR2(255) DEFAULT '' NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -529,23 +512,22 @@ NOCACHE
 -- Table structure for ACT_RU_EVENT_SUBSCR
 -- ----------------------------
 DROP TABLE "LEN"."ACT_RU_EVENT_SUBSCR";
-CREATE TABLE "LEN"."ACT_RU_EVENT_SUBSCR" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"REV_" NUMBER NULL ,
-"EVENT_TYPE_" NVARCHAR2(255) NOT NULL ,
-"EVENT_NAME_" NVARCHAR2(255) NULL ,
-"EXECUTION_ID_" NVARCHAR2(64) NULL ,
-"PROC_INST_ID_" NVARCHAR2(64) NULL ,
-"ACTIVITY_ID_" NVARCHAR2(64) NULL ,
-"CONFIGURATION_" NVARCHAR2(255) NULL ,
-"CREATED_" TIMESTAMP(6)  NOT NULL ,
-"PROC_DEF_ID_" NVARCHAR2(64) NULL ,
-"TENANT_ID_" NVARCHAR2(255) DEFAULT ''  NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_RU_EVENT_SUBSCR"
+(
+	"ID_"            NVARCHAR2(64) NOT NULL,
+	"REV_"           NUMBER NULL,
+	"EVENT_TYPE_"    NVARCHAR2(255) NOT NULL,
+	"EVENT_NAME_"    NVARCHAR2(255) NULL,
+	"EXECUTION_ID_"  NVARCHAR2(64) NULL,
+	"PROC_INST_ID_"  NVARCHAR2(64) NULL,
+	"ACTIVITY_ID_"   NVARCHAR2(64) NULL,
+	"CONFIGURATION_" NVARCHAR2(255) NULL,
+	"CREATED_"       TIMESTAMP(6) NOT NULL,
+	"PROC_DEF_ID_"   NVARCHAR2(64) NULL,
+	"TENANT_ID_"     NVARCHAR2(255) DEFAULT '' NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -556,29 +538,28 @@ NOCACHE
 -- Table structure for ACT_RU_EXECUTION
 -- ----------------------------
 DROP TABLE "LEN"."ACT_RU_EXECUTION";
-CREATE TABLE "LEN"."ACT_RU_EXECUTION" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"REV_" NUMBER NULL ,
-"PROC_INST_ID_" NVARCHAR2(64) NULL ,
-"BUSINESS_KEY_" NVARCHAR2(255) NULL ,
-"PARENT_ID_" NVARCHAR2(64) NULL ,
-"PROC_DEF_ID_" NVARCHAR2(64) NULL ,
-"SUPER_EXEC_" NVARCHAR2(64) NULL ,
-"ACT_ID_" NVARCHAR2(255) NULL ,
-"IS_ACTIVE_" NUMBER(1) NULL ,
-"IS_CONCURRENT_" NUMBER(1) NULL ,
-"IS_SCOPE_" NUMBER(1) NULL ,
-"IS_EVENT_SCOPE_" NUMBER(1) NULL ,
-"SUSPENSION_STATE_" NUMBER NULL ,
-"CACHED_ENT_STATE_" NUMBER NULL ,
-"TENANT_ID_" NVARCHAR2(255) DEFAULT ''  NULL ,
-"NAME_" NVARCHAR2(255) NULL ,
-"LOCK_TIME_" TIMESTAMP(6)  NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_RU_EXECUTION"
+(
+	"ID_"               NVARCHAR2(64) NOT NULL,
+	"REV_"              NUMBER NULL,
+	"PROC_INST_ID_"     NVARCHAR2(64) NULL,
+	"BUSINESS_KEY_"     NVARCHAR2(255) NULL,
+	"PARENT_ID_"        NVARCHAR2(64) NULL,
+	"PROC_DEF_ID_"      NVARCHAR2(64) NULL,
+	"SUPER_EXEC_"       NVARCHAR2(64) NULL,
+	"ACT_ID_"           NVARCHAR2(255) NULL,
+	"IS_ACTIVE_"        NUMBER(1) NULL,
+	"IS_CONCURRENT_"    NUMBER(1) NULL,
+	"IS_SCOPE_"         NUMBER(1) NULL,
+	"IS_EVENT_SCOPE_"   NUMBER(1) NULL,
+	"SUSPENSION_STATE_" NUMBER NULL,
+	"CACHED_ENT_STATE_" NUMBER NULL,
+	"TENANT_ID_"        NVARCHAR2(255) DEFAULT '' NULL,
+	"NAME_"             NVARCHAR2(255) NULL,
+	"LOCK_TIME_"        TIMESTAMP(6) NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -589,20 +570,19 @@ NOCACHE
 -- Table structure for ACT_RU_IDENTITYLINK
 -- ----------------------------
 DROP TABLE "LEN"."ACT_RU_IDENTITYLINK";
-CREATE TABLE "LEN"."ACT_RU_IDENTITYLINK" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"REV_" NUMBER NULL ,
-"GROUP_ID_" NVARCHAR2(255) NULL ,
-"TYPE_" NVARCHAR2(255) NULL ,
-"USER_ID_" NVARCHAR2(255) NULL ,
-"TASK_ID_" NVARCHAR2(64) NULL ,
-"PROC_INST_ID_" NVARCHAR2(64) NULL ,
-"PROC_DEF_ID_" NVARCHAR2(64) NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_RU_IDENTITYLINK"
+(
+	"ID_"           NVARCHAR2(64) NOT NULL,
+	"REV_"          NUMBER NULL,
+	"GROUP_ID_"     NVARCHAR2(255) NULL,
+	"TYPE_"         NVARCHAR2(255) NULL,
+	"USER_ID_"      NVARCHAR2(255) NULL,
+	"TASK_ID_"      NVARCHAR2(64) NULL,
+	"PROC_INST_ID_" NVARCHAR2(64) NULL,
+	"PROC_DEF_ID_"  NVARCHAR2(64) NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -613,29 +593,28 @@ NOCACHE
 -- Table structure for ACT_RU_JOB
 -- ----------------------------
 DROP TABLE "LEN"."ACT_RU_JOB";
-CREATE TABLE "LEN"."ACT_RU_JOB" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"REV_" NUMBER NULL ,
-"TYPE_" NVARCHAR2(255) NOT NULL ,
-"LOCK_EXP_TIME_" TIMESTAMP(6)  NULL ,
-"LOCK_OWNER_" NVARCHAR2(255) NULL ,
-"EXCLUSIVE_" NUMBER(1) NULL ,
-"EXECUTION_ID_" NVARCHAR2(64) NULL ,
-"PROCESS_INSTANCE_ID_" NVARCHAR2(64) NULL ,
-"PROC_DEF_ID_" NVARCHAR2(64) NULL ,
-"RETRIES_" NUMBER NULL ,
-"EXCEPTION_STACK_ID_" NVARCHAR2(64) NULL ,
-"EXCEPTION_MSG_" NVARCHAR2(2000) NULL ,
-"DUEDATE_" TIMESTAMP(6)  NULL ,
-"REPEAT_" NVARCHAR2(255) NULL ,
-"HANDLER_TYPE_" NVARCHAR2(255) NULL ,
-"HANDLER_CFG_" NVARCHAR2(2000) NULL ,
-"TENANT_ID_" NVARCHAR2(255) DEFAULT ''  NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_RU_JOB"
+(
+	"ID_"                  NVARCHAR2(64) NOT NULL,
+	"REV_"                 NUMBER NULL,
+	"TYPE_"                NVARCHAR2(255) NOT NULL,
+	"LOCK_EXP_TIME_"       TIMESTAMP(6) NULL,
+	"LOCK_OWNER_"          NVARCHAR2(255) NULL,
+	"EXCLUSIVE_"           NUMBER(1) NULL,
+	"EXECUTION_ID_"        NVARCHAR2(64) NULL,
+	"PROCESS_INSTANCE_ID_" NVARCHAR2(64) NULL,
+	"PROC_DEF_ID_"         NVARCHAR2(64) NULL,
+	"RETRIES_"             NUMBER NULL,
+	"EXCEPTION_STACK_ID_"  NVARCHAR2(64) NULL,
+	"EXCEPTION_MSG_"       NVARCHAR2(2000) NULL,
+	"DUEDATE_"             TIMESTAMP(6) NULL,
+	"REPEAT_"              NVARCHAR2(255) NULL,
+	"HANDLER_TYPE_"        NVARCHAR2(255) NULL,
+	"HANDLER_CFG_"         NVARCHAR2(2000) NULL,
+	"TENANT_ID_"           NVARCHAR2(255) DEFAULT '' NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -646,31 +625,30 @@ NOCACHE
 -- Table structure for ACT_RU_TASK
 -- ----------------------------
 DROP TABLE "LEN"."ACT_RU_TASK";
-CREATE TABLE "LEN"."ACT_RU_TASK" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"REV_" NUMBER NULL ,
-"EXECUTION_ID_" NVARCHAR2(64) NULL ,
-"PROC_INST_ID_" NVARCHAR2(64) NULL ,
-"PROC_DEF_ID_" NVARCHAR2(64) NULL ,
-"NAME_" NVARCHAR2(255) NULL ,
-"PARENT_TASK_ID_" NVARCHAR2(64) NULL ,
-"DESCRIPTION_" NVARCHAR2(2000) NULL ,
-"TASK_DEF_KEY_" NVARCHAR2(255) NULL ,
-"OWNER_" NVARCHAR2(255) NULL ,
-"ASSIGNEE_" NVARCHAR2(255) NULL ,
-"DELEGATION_" NVARCHAR2(64) NULL ,
-"PRIORITY_" NUMBER NULL ,
-"CREATE_TIME_" TIMESTAMP(6)  NULL ,
-"DUE_DATE_" TIMESTAMP(6)  NULL ,
-"CATEGORY_" NVARCHAR2(255) NULL ,
-"SUSPENSION_STATE_" NUMBER NULL ,
-"TENANT_ID_" NVARCHAR2(255) DEFAULT ''  NULL ,
-"FORM_KEY_" NVARCHAR2(255) NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_RU_TASK"
+(
+	"ID_"               NVARCHAR2(64) NOT NULL,
+	"REV_"              NUMBER NULL,
+	"EXECUTION_ID_"     NVARCHAR2(64) NULL,
+	"PROC_INST_ID_"     NVARCHAR2(64) NULL,
+	"PROC_DEF_ID_"      NVARCHAR2(64) NULL,
+	"NAME_"             NVARCHAR2(255) NULL,
+	"PARENT_TASK_ID_"   NVARCHAR2(64) NULL,
+	"DESCRIPTION_"      NVARCHAR2(2000) NULL,
+	"TASK_DEF_KEY_"     NVARCHAR2(255) NULL,
+	"OWNER_"            NVARCHAR2(255) NULL,
+	"ASSIGNEE_"         NVARCHAR2(255) NULL,
+	"DELEGATION_"       NVARCHAR2(64) NULL,
+	"PRIORITY_"         NUMBER NULL,
+	"CREATE_TIME_"      TIMESTAMP(6) NULL,
+	"DUE_DATE_"         TIMESTAMP(6) NULL,
+	"CATEGORY_"         NVARCHAR2(255) NULL,
+	"SUSPENSION_STATE_" NUMBER NULL,
+	"TENANT_ID_"        NVARCHAR2(255) DEFAULT '' NULL,
+	"FORM_KEY_"         NVARCHAR2(255) NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -681,24 +659,23 @@ NOCACHE
 -- Table structure for ACT_RU_VARIABLE
 -- ----------------------------
 DROP TABLE "LEN"."ACT_RU_VARIABLE";
-CREATE TABLE "LEN"."ACT_RU_VARIABLE" (
-"ID_" NVARCHAR2(64) NOT NULL ,
-"REV_" NUMBER NULL ,
-"TYPE_" NVARCHAR2(255) NOT NULL ,
-"NAME_" NVARCHAR2(255) NOT NULL ,
-"EXECUTION_ID_" NVARCHAR2(64) NULL ,
-"PROC_INST_ID_" NVARCHAR2(64) NULL ,
-"TASK_ID_" NVARCHAR2(64) NULL ,
-"BYTEARRAY_ID_" NVARCHAR2(64) NULL ,
-"DOUBLE_" NUMBER NULL ,
-"LONG_" NUMBER(19) NULL ,
-"TEXT_" NVARCHAR2(2000) NULL ,
-"TEXT2_" NVARCHAR2(2000) NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."ACT_RU_VARIABLE"
+(
+	"ID_"           NVARCHAR2(64) NOT NULL,
+	"REV_"          NUMBER NULL,
+	"TYPE_"         NVARCHAR2(255) NOT NULL,
+	"NAME_"         NVARCHAR2(255) NOT NULL,
+	"EXECUTION_ID_" NVARCHAR2(64) NULL,
+	"PROC_INST_ID_" NVARCHAR2(64) NULL,
+	"TASK_ID_"      NVARCHAR2(64) NULL,
+	"BYTEARRAY_ID_" NVARCHAR2(64) NULL,
+	"DOUBLE_"       NUMBER NULL,
+	"LONG_"         NUMBER(19) NULL,
+	"TEXT_"         NVARCHAR2(2000) NULL,
+	"TEXT2_"        NVARCHAR2(2000) NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -709,209 +686,287 @@ NOCACHE
 -- Table structure for BLOG_ARTICLE
 -- ----------------------------
 DROP TABLE "LEN"."BLOG_ARTICLE";
-CREATE TABLE "LEN"."BLOG_ARTICLE" (
-"ID" NVARCHAR2(32) NOT NULL ,
-"CODE" NVARCHAR2(255) NOT NULL ,
-"TITLE" NVARCHAR2(255) NOT NULL ,
-"FIRST_IMG" NVARCHAR2(255) NULL ,
-"CONTENT" NCLOB NOT NULL ,
-"READ_NUMBER" NUMBER(11) NOT NULL ,
-"TOP_NUM" NUMBER(11) NULL ,
-"CREATE_BY" NVARCHAR2(32) NOT NULL ,
-"UPDATE_BY" NVARCHAR2(32) NULL ,
-"CREATE_DATE" DATE NULL ,
-"UPDATE_DATE" DATE NULL ,
-"DEL_FLAG" NUMBER(4) NOT NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."BLOG_ARTICLE"
+(
+	"ID"          NVARCHAR2(32) NOT NULL,
+	"CODE"        NVARCHAR2(255) NOT NULL,
+	"TITLE"       NVARCHAR2(255) NOT NULL,
+	"FIRST_IMG"   NVARCHAR2(255) NULL,
+	"CONTENT"     NCLOB NOT NULL,
+	"READ_NUMBER" NUMBER(11) NOT NULL,
+	"TOP_NUM"     NUMBER(11) NULL,
+	"CREATE_BY"   NVARCHAR2(32) NOT NULL,
+	"UPDATE_BY"   NVARCHAR2(32) NULL,
+	"CREATE_DATE" DATE NULL,
+	"UPDATE_DATE" DATE NULL,
+	"DEL_FLAG"    NUMBER(4) NOT NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
-COMMENT ON COLUMN "LEN"."BLOG_ARTICLE"."CODE" IS 'code';
-COMMENT ON COLUMN "LEN"."BLOG_ARTICLE"."TITLE" IS '标题';
-COMMENT ON COLUMN "LEN"."BLOG_ARTICLE"."FIRST_IMG" IS '列表缩略图';
-COMMENT ON COLUMN "LEN"."BLOG_ARTICLE"."CONTENT" IS '文章内容';
-COMMENT ON COLUMN "LEN"."BLOG_ARTICLE"."READ_NUMBER" IS '阅读次数';
-COMMENT ON COLUMN "LEN"."BLOG_ARTICLE"."TOP_NUM" IS '次序(置顶功能)';
-COMMENT ON COLUMN "LEN"."BLOG_ARTICLE"."DEL_FLAG" IS '0正常1删除';
+COMMENT
+ON COLUMN "LEN"."BLOG_ARTICLE"."CODE" IS 'code';
+COMMENT
+ON COLUMN "LEN"."BLOG_ARTICLE"."TITLE" IS '标题';
+COMMENT
+ON COLUMN "LEN"."BLOG_ARTICLE"."FIRST_IMG" IS '列表缩略图';
+COMMENT
+ON COLUMN "LEN"."BLOG_ARTICLE"."CONTENT" IS '文章内容';
+COMMENT
+ON COLUMN "LEN"."BLOG_ARTICLE"."READ_NUMBER" IS '阅读次数';
+COMMENT
+ON COLUMN "LEN"."BLOG_ARTICLE"."TOP_NUM" IS '次序(置顶功能)';
+COMMENT
+ON COLUMN "LEN"."BLOG_ARTICLE"."DEL_FLAG" IS '0正常1删除';
 
 -- ----------------------------
 -- Records of BLOG_ARTICLE
 -- ----------------------------
-INSERT INTO "LEN"."BLOG_ARTICLE" VALUES ('3887934708c54f49bc5a566f77e2a759', '76249265', 'hello，world', 'http://localhost:8081/img/77e5338a-217c-4b07-a3fd-63f20411dfcb.png', '<p>你好，世界</p><p class="ql-align-center">&lt;img src="http://localhost:8081/img/1b805822-4d00-4695-acdd-90f68af6150e.jpg"&gt;</p><p>
+INSERT INTO "LEN"."BLOG_ARTICLE"
+VALUES ('3887934708c54f49bc5a566f77e2a759', '76249265', 'hello，world',
+		'http://localhost:8081/img/77e5338a-217c-4b07-a3fd-63f20411dfcb.png', '<p>你好，世界</p><p class="ql-align-center">&lt;img src="http://localhost:8081/img/1b805822-4d00-4695-acdd-90f68af6150e.jpg"&gt;</p><p>
 </p><p><br></p><p class="ql-align-center"><img src="http://localhost:8081/img/77e5338a-217c-4b07-a3fd-63f20411dfcb.png"></p><p class="ql-align-center"><img src="http://localhost:8081/img/d899b4da-8ceb-4a9b-bbc5-68b36146c9d6.png"></p><p>&lt;img src="http://localhost:8081/img/1b805822-4d00-4695-acdd-90f68af6150e.jpg"&gt;</p><p><img src="http://localhost:8081/img/9d45bdb0-9ac6-4853-b3d5-6ff9f3a21590.png"></p><p><img src="http://localhost:8081/img/369f4fab-b26a-4ab5-9c35-4ee203f19fa5.png"></p><p>
 </p><pre class="ql-syntax" spellcheck="false">JsonUtil json = new JsonUtil();
 List&lt;BlogCategory&gt; categories = categoryService.selectAll();
 categories.sort(Comparator.comparing(BlogCategory::getSequence));
 json.setData(categories);
 return json;
-</pre>', '16', '0', 'acfc0e9232f54732a5d9ffe9071bf572', 'a4a743bffe9711e7b472201a068c6482', TO_DATE('2018-10-14 17:47:41', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2018-11-25 17:35:00', 'YYYY-MM-DD HH24:MI:SS'), '0');
-INSERT INTO "LEN"."BLOG_ARTICLE" VALUES ('3887934708c54f49bc5a566f77e2a759', '76249265', 'hello，world', 'http://localhost:8081/img/77e5338a-217c-4b07-a3fd-63f20411dfcb.png', '<p>你好，世界</p><p class="ql-align-center">&lt;img src="http://localhost:8081/img/1b805822-4d00-4695-acdd-90f68af6150e.jpg"&gt;</p><p>
+</pre>', '16', '0', 'acfc0e9232f54732a5d9ffe9071bf572', 'a4a743bffe9711e7b472201a068c6482',
+		TO_DATE('2018-10-14 17:47:41', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2018-11-25 17:35:00', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "LEN"."BLOG_ARTICLE"
+VALUES ('3887934708c54f49bc5a566f77e2a759', '76249265', 'hello，world',
+		'http://localhost:8081/img/77e5338a-217c-4b07-a3fd-63f20411dfcb.png', '<p>你好，世界</p><p class="ql-align-center">&lt;img src="http://localhost:8081/img/1b805822-4d00-4695-acdd-90f68af6150e.jpg"&gt;</p><p>
 </p><p><br></p><p class="ql-align-center"><img src="http://localhost:8081/img/77e5338a-217c-4b07-a3fd-63f20411dfcb.png"></p><p class="ql-align-center"><img src="http://localhost:8081/img/d899b4da-8ceb-4a9b-bbc5-68b36146c9d6.png"></p><p>&lt;img src="http://localhost:8081/img/1b805822-4d00-4695-acdd-90f68af6150e.jpg"&gt;</p><p><img src="http://localhost:8081/img/9d45bdb0-9ac6-4853-b3d5-6ff9f3a21590.png"></p><p><img src="http://localhost:8081/img/369f4fab-b26a-4ab5-9c35-4ee203f19fa5.png"></p><p>
 </p><pre class="ql-syntax" spellcheck="false">JsonUtil json = new JsonUtil();
 List&lt;BlogCategory&gt; categories = categoryService.selectAll();
 categories.sort(Comparator.comparing(BlogCategory::getSequence));
 json.setData(categories);
 return json;
-</pre>', '16', '0', 'acfc0e9232f54732a5d9ffe9071bf572', 'a4a743bffe9711e7b472201a068c6482', TO_DATE('2018-10-14 17:47:41', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2018-11-25 17:35:00', 'YYYY-MM-DD HH24:MI:SS'), '0');
-INSERT INTO "LEN"."BLOG_ARTICLE" VALUES ('6e3fbd29b226452984428883d6e7a8a2', '53165934', '测试添加', 'http://localhost:8081/img/536ac5c8-ee9a-4826-9977-be8983622e00.png', '<p class="ql-align-center"><strong><em>内容啦啦啦啦啦</em></strong><img src="http://localhost:8081/img/536ac5c8-ee9a-4826-9977-be8983622e00.png"></p><p class="ql-align-center"><br></p>', '15', '0', 'acfc0e9232f54732a5d9ffe9071bf572', 'a4a743bffe9711e7b472201a068c6482', TO_DATE('2018-11-19 22:57:25', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2018-11-25 18:55:34', 'YYYY-MM-DD HH24:MI:SS'), '0');
-INSERT INTO "LEN"."BLOG_ARTICLE" VALUES ('89f445cbe3334a458a4126741170d1e1', 'ASDFG2', 'java基础1', null, 'Java基础知识', '130', '1', 'acfc0e9232f54732a5d9ffe9071bf572', null, TO_DATE('2018-10-01 11:24:59', 'YYYY-MM-DD HH24:MI:SS'), null, '0');
-INSERT INTO "LEN"."BLOG_ARTICLE" VALUES ('89f445cbe3334a458a4126751170d1e1', 'ASDFG1', 'java基础2', null, 'Java基础知识', '127', '1', 'acfc0e9232f54732a5d9ffe9071bf572', null, TO_DATE('2018-10-01 11:23:59', 'YYYY-MM-DD HH24:MI:SS'), null, '0');
-INSERT INTO "LEN"."BLOG_ARTICLE" VALUES ('89f445cbe3334a458a412691170d1e12', 'xcbbg', 'java基础3', null, '<p>Java基础知识</p>', '124', '0', 'acfc0e9232f54732a5d9ffe9071bf572', 'a4a743bffe9711e7b472201a068c6482', TO_DATE('2018-10-01 11:22:59', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2018-11-25 22:16:19', 'YYYY-MM-DD HH24:MI:SS'), '0');
-INSERT INTO "LEN"."BLOG_ARTICLE" VALUES ('89f445cbe3334a458a4126951170d1e1', 'ASDFGC', 'java基础4', null, 'Java基础知识', '124', '1', 'acfc0e9232f54732a5d9ffe9071bf572', null, TO_DATE('2018-10-01 11:21:59', 'YYYY-MM-DD HH24:MI:SS'), null, '0');
+</pre>', '16', '0', 'acfc0e9232f54732a5d9ffe9071bf572', 'a4a743bffe9711e7b472201a068c6482',
+		TO_DATE('2018-10-14 17:47:41', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2018-11-25 17:35:00', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "LEN"."BLOG_ARTICLE"
+VALUES ('6e3fbd29b226452984428883d6e7a8a2', '53165934', '测试添加',
+		'http://localhost:8081/img/536ac5c8-ee9a-4826-9977-be8983622e00.png',
+		'<p class="ql-align-center"><strong><em>内容啦啦啦啦啦</em></strong><img src="http://localhost:8081/img/536ac5c8-ee9a-4826-9977-be8983622e00.png"></p><p class="ql-align-center"><br></p>',
+		'15', '0', 'acfc0e9232f54732a5d9ffe9071bf572', 'a4a743bffe9711e7b472201a068c6482',
+		TO_DATE('2018-11-19 22:57:25', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2018-11-25 18:55:34', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "LEN"."BLOG_ARTICLE"
+VALUES ('89f445cbe3334a458a4126741170d1e1', 'ASDFG2', 'java基础1', null, 'Java基础知识', '130', '1',
+		'acfc0e9232f54732a5d9ffe9071bf572', null, TO_DATE('2018-10-01 11:24:59', 'YYYY-MM-DD HH24:MI:SS'), null, '0');
+INSERT INTO "LEN"."BLOG_ARTICLE"
+VALUES ('89f445cbe3334a458a4126751170d1e1', 'ASDFG1', 'java基础2', null, 'Java基础知识', '127', '1',
+		'acfc0e9232f54732a5d9ffe9071bf572', null, TO_DATE('2018-10-01 11:23:59', 'YYYY-MM-DD HH24:MI:SS'), null, '0');
+INSERT INTO "LEN"."BLOG_ARTICLE"
+VALUES ('89f445cbe3334a458a412691170d1e12', 'xcbbg', 'java基础3', null, '<p>Java基础知识</p>', '124', '0',
+		'acfc0e9232f54732a5d9ffe9071bf572', 'a4a743bffe9711e7b472201a068c6482',
+		TO_DATE('2018-10-01 11:22:59', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2018-11-25 22:16:19', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "LEN"."BLOG_ARTICLE"
+VALUES ('89f445cbe3334a458a4126951170d1e1', 'ASDFGC', 'java基础4', null, 'Java基础知识', '124', '1',
+		'acfc0e9232f54732a5d9ffe9071bf572', null, TO_DATE('2018-10-01 11:21:59', 'YYYY-MM-DD HH24:MI:SS'), null, '0');
 
 -- ----------------------------
 -- Table structure for BLOG_ARTICLE_CATEGORY
 -- ----------------------------
 DROP TABLE "LEN"."BLOG_ARTICLE_CATEGORY";
-CREATE TABLE "LEN"."BLOG_ARTICLE_CATEGORY" (
-"ID" NVARCHAR2(32) NOT NULL ,
-"ARTICLE_ID" NVARCHAR2(32) NOT NULL ,
-"CATEGORY_ID" NVARCHAR2(32) NOT NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."BLOG_ARTICLE_CATEGORY"
+(
+	"ID"          NVARCHAR2(32) NOT NULL,
+	"ARTICLE_ID"  NVARCHAR2(32) NOT NULL,
+	"CATEGORY_ID" NVARCHAR2(32) NOT NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
-COMMENT ON TABLE "LEN"."BLOG_ARTICLE_CATEGORY" IS '文章标签表';
-COMMENT ON COLUMN "LEN"."BLOG_ARTICLE_CATEGORY"."ARTICLE_ID" IS '文章id';
-COMMENT ON COLUMN "LEN"."BLOG_ARTICLE_CATEGORY"."CATEGORY_ID" IS '标签id';
+COMMENT
+ON TABLE "LEN"."BLOG_ARTICLE_CATEGORY" IS '文章标签表';
+COMMENT
+ON COLUMN "LEN"."BLOG_ARTICLE_CATEGORY"."ARTICLE_ID" IS '文章id';
+COMMENT
+ON COLUMN "LEN"."BLOG_ARTICLE_CATEGORY"."CATEGORY_ID" IS '标签id';
 
 -- ----------------------------
 -- Records of BLOG_ARTICLE_CATEGORY
 -- ----------------------------
-INSERT INTO "LEN"."BLOG_ARTICLE_CATEGORY" VALUES ('0037884871fa483db71e4158a18b0af9', '3887934708c54f49bc5a566f77e2a759', '3d4da698fc914ed0b956e86b58f93166');
-INSERT INTO "LEN"."BLOG_ARTICLE_CATEGORY" VALUES ('2e2c8578a05b4048a9365e9a1b5ff726', '89f445cbe3334a458a412691170d1e12', '3956852574b6490ba6198f35b1c00aee');
-INSERT INTO "LEN"."BLOG_ARTICLE_CATEGORY" VALUES ('68eeaf5f10a24ed195c042dbc6e25df7', 'a9455e9f36bc4f33ba01412a64d87d6a', '3956852574b6490ba6198f35b1c00aee');
-INSERT INTO "LEN"."BLOG_ARTICLE_CATEGORY" VALUES ('7659e8a4b97144269775983f886ce25e', '3887934708c54f49bc5a566f77e2a759', '3956852574b6490ba6198f35b1c00aee');
-INSERT INTO "LEN"."BLOG_ARTICLE_CATEGORY" VALUES ('db7a1ca9b5d04a618f98e65c6c5555db', '6e3fbd29b226452984428883d6e7a8a2', '3956852574b6490ba6198f35b1c00aee');
-INSERT INTO "LEN"."BLOG_ARTICLE_CATEGORY" VALUES ('e6c27fd837244cefb43b2b2aca276f1f', '3887934708c54f49bc5a566f77e2a759', '2b7c729789de4c03a23fff8311b9eaf4');
-INSERT INTO "LEN"."BLOG_ARTICLE_CATEGORY" VALUES ('fe7c34ffcf8c4af9922b4438e695c742', 'fd27b3ed7d344395b7766f596bf6fd06', '3956852574b6490ba6198f35b1c00aee');
+INSERT INTO "LEN"."BLOG_ARTICLE_CATEGORY"
+VALUES ('0037884871fa483db71e4158a18b0af9', '3887934708c54f49bc5a566f77e2a759', '3d4da698fc914ed0b956e86b58f93166');
+INSERT INTO "LEN"."BLOG_ARTICLE_CATEGORY"
+VALUES ('2e2c8578a05b4048a9365e9a1b5ff726', '89f445cbe3334a458a412691170d1e12', '3956852574b6490ba6198f35b1c00aee');
+INSERT INTO "LEN"."BLOG_ARTICLE_CATEGORY"
+VALUES ('68eeaf5f10a24ed195c042dbc6e25df7', 'a9455e9f36bc4f33ba01412a64d87d6a', '3956852574b6490ba6198f35b1c00aee');
+INSERT INTO "LEN"."BLOG_ARTICLE_CATEGORY"
+VALUES ('7659e8a4b97144269775983f886ce25e', '3887934708c54f49bc5a566f77e2a759', '3956852574b6490ba6198f35b1c00aee');
+INSERT INTO "LEN"."BLOG_ARTICLE_CATEGORY"
+VALUES ('db7a1ca9b5d04a618f98e65c6c5555db', '6e3fbd29b226452984428883d6e7a8a2', '3956852574b6490ba6198f35b1c00aee');
+INSERT INTO "LEN"."BLOG_ARTICLE_CATEGORY"
+VALUES ('e6c27fd837244cefb43b2b2aca276f1f', '3887934708c54f49bc5a566f77e2a759', '2b7c729789de4c03a23fff8311b9eaf4');
+INSERT INTO "LEN"."BLOG_ARTICLE_CATEGORY"
+VALUES ('fe7c34ffcf8c4af9922b4438e695c742', 'fd27b3ed7d344395b7766f596bf6fd06', '3956852574b6490ba6198f35b1c00aee');
 
 -- ----------------------------
 -- Table structure for BLOG_ARTICLE_TAG
 -- ----------------------------
 DROP TABLE "LEN"."BLOG_ARTICLE_TAG";
-CREATE TABLE "LEN"."BLOG_ARTICLE_TAG" (
-"ARTICLE_ID" NVARCHAR2(32) NOT NULL ,
-"TAG_ID" NVARCHAR2(32) NOT NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."BLOG_ARTICLE_TAG"
+(
+	"ARTICLE_ID" NVARCHAR2(32) NOT NULL,
+	"TAG_ID"     NVARCHAR2(32) NOT NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
 -- Records of BLOG_ARTICLE_TAG
 -- ----------------------------
-INSERT INTO "LEN"."BLOG_ARTICLE_TAG" VALUES ('3887934708c54f49bc5a566f77e2a759', 'eeba8137d0cc42249a8c1db9b2830e8a');
-INSERT INTO "LEN"."BLOG_ARTICLE_TAG" VALUES ('6e3fbd29b226452984428883d6e7a8a2', '0596836fc90540d1a497cd7bfae306e4');
-INSERT INTO "LEN"."BLOG_ARTICLE_TAG" VALUES ('6e3fbd29b226452984428883d6e7a8a2', '1f44f472a64f4ebe9782b2b868e2caf2');
-INSERT INTO "LEN"."BLOG_ARTICLE_TAG" VALUES ('89f445cbe3334a458a412691170d1e12', 'eeba8137d0cc42249a8c1db9b2830e8a');
-INSERT INTO "LEN"."BLOG_ARTICLE_TAG" VALUES ('a9455e9f36bc4f33ba01412a64d87d6a', 'eba6d766a88b4a108d4189c08f86e7a6');
-INSERT INTO "LEN"."BLOG_ARTICLE_TAG" VALUES ('fd27b3ed7d344395b7766f596bf6fd06', '0596836fc90540d1a497cd7bfae306e4');
-INSERT INTO "LEN"."BLOG_ARTICLE_TAG" VALUES ('fd27b3ed7d344395b7766f596bf6fd06', 'eba6d766a88b4a108d4189c08f86e7a6');
+INSERT INTO "LEN"."BLOG_ARTICLE_TAG"
+VALUES ('3887934708c54f49bc5a566f77e2a759', 'eeba8137d0cc42249a8c1db9b2830e8a');
+INSERT INTO "LEN"."BLOG_ARTICLE_TAG"
+VALUES ('6e3fbd29b226452984428883d6e7a8a2', '0596836fc90540d1a497cd7bfae306e4');
+INSERT INTO "LEN"."BLOG_ARTICLE_TAG"
+VALUES ('6e3fbd29b226452984428883d6e7a8a2', '1f44f472a64f4ebe9782b2b868e2caf2');
+INSERT INTO "LEN"."BLOG_ARTICLE_TAG"
+VALUES ('89f445cbe3334a458a412691170d1e12', 'eeba8137d0cc42249a8c1db9b2830e8a');
+INSERT INTO "LEN"."BLOG_ARTICLE_TAG"
+VALUES ('a9455e9f36bc4f33ba01412a64d87d6a', 'eba6d766a88b4a108d4189c08f86e7a6');
+INSERT INTO "LEN"."BLOG_ARTICLE_TAG"
+VALUES ('fd27b3ed7d344395b7766f596bf6fd06', '0596836fc90540d1a497cd7bfae306e4');
+INSERT INTO "LEN"."BLOG_ARTICLE_TAG"
+VALUES ('fd27b3ed7d344395b7766f596bf6fd06', 'eba6d766a88b4a108d4189c08f86e7a6');
 
 -- ----------------------------
 -- Table structure for BLOG_CATEGORY
 -- ----------------------------
 DROP TABLE "LEN"."BLOG_CATEGORY";
-CREATE TABLE "LEN"."BLOG_CATEGORY" (
-"ID" NVARCHAR2(32) NOT NULL ,
-"SEQUENCE" NUMBER(4) NOT NULL ,
-"CODE" NVARCHAR2(16) NOT NULL ,
-"NAME" NVARCHAR2(64) NOT NULL ,
-"PARENT_ID" NVARCHAR2(32) NOT NULL ,
-"CREATE_BY" NVARCHAR2(32) NULL ,
-"UPDATE_BY" NVARCHAR2(32) NULL ,
-"CREATE_DATE" DATE NULL ,
-"UPDATE_DATE" DATE NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."BLOG_CATEGORY"
+(
+	"ID"          NVARCHAR2(32) NOT NULL,
+	"SEQUENCE"    NUMBER(4) NOT NULL,
+	"CODE"        NVARCHAR2(16) NOT NULL,
+	"NAME"        NVARCHAR2(64) NOT NULL,
+	"PARENT_ID"   NVARCHAR2(32) NOT NULL,
+	"CREATE_BY"   NVARCHAR2(32) NULL,
+	"UPDATE_BY"   NVARCHAR2(32) NULL,
+	"CREATE_DATE" DATE NULL,
+	"UPDATE_DATE" DATE NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
-COMMENT ON TABLE "LEN"."BLOG_CATEGORY" IS '类别表(顶部展示)';
-COMMENT ON COLUMN "LEN"."BLOG_CATEGORY"."CODE" IS '搜索code';
-COMMENT ON COLUMN "LEN"."BLOG_CATEGORY"."NAME" IS '类别名称';
-COMMENT ON COLUMN "LEN"."BLOG_CATEGORY"."PARENT_ID" IS '上层id(目前最多两次层)';
+COMMENT
+ON TABLE "LEN"."BLOG_CATEGORY" IS '类别表(顶部展示)';
+COMMENT
+ON COLUMN "LEN"."BLOG_CATEGORY"."CODE" IS '搜索code';
+COMMENT
+ON COLUMN "LEN"."BLOG_CATEGORY"."NAME" IS '类别名称';
+COMMENT
+ON COLUMN "LEN"."BLOG_CATEGORY"."PARENT_ID" IS '上层id(目前最多两次层)';
 
 -- ----------------------------
 -- Records of BLOG_CATEGORY
 -- ----------------------------
-INSERT INTO "LEN"."BLOG_CATEGORY" VALUES ('2b7c729789de4c03a23fff8311b9eaf4', '3', '架构', '架构', '0', 'zxm', null, TO_DATE('2018-10-12 22:30:18', 'YYYY-MM-DD HH24:MI:SS'), null);
-INSERT INTO "LEN"."BLOG_CATEGORY" VALUES ('3956852574b6490ba6198f35b1c00aee', '1', 'Java', 'Java', '0', 'zxm', null, TO_DATE('2018-10-12 22:30:18', 'YYYY-MM-DD HH24:MI:SS'), null);
-INSERT INTO "LEN"."BLOG_CATEGORY" VALUES ('3d4da698fc914ed0b956e86b58f93166', '2', 'Linux', 'Linux', '0', 'zxm', null, TO_DATE('2018-10-12 22:30:18', 'YYYY-MM-DD HH24:MI:SS'), null);
-INSERT INTO "LEN"."BLOG_CATEGORY" VALUES ('7de23cc796ac4e6887ef1de6ca331bd8', '4', '其他', '其他', '0', 'zxm', null, TO_DATE('2018-10-12 22:30:18', 'YYYY-MM-DD HH24:MI:SS'), null);
+INSERT INTO "LEN"."BLOG_CATEGORY"
+VALUES ('2b7c729789de4c03a23fff8311b9eaf4', '3', '架构', '架构', '0', 'zxm', null,
+		TO_DATE('2018-10-12 22:30:18', 'YYYY-MM-DD HH24:MI:SS'), null);
+INSERT INTO "LEN"."BLOG_CATEGORY"
+VALUES ('3956852574b6490ba6198f35b1c00aee', '1', 'Java', 'Java', '0', 'zxm', null,
+		TO_DATE('2018-10-12 22:30:18', 'YYYY-MM-DD HH24:MI:SS'), null);
+INSERT INTO "LEN"."BLOG_CATEGORY"
+VALUES ('3d4da698fc914ed0b956e86b58f93166', '2', 'Linux', 'Linux', '0', 'zxm', null,
+		TO_DATE('2018-10-12 22:30:18', 'YYYY-MM-DD HH24:MI:SS'), null);
+INSERT INTO "LEN"."BLOG_CATEGORY"
+VALUES ('7de23cc796ac4e6887ef1de6ca331bd8', '4', '其他', '其他', '0', 'zxm', null,
+		TO_DATE('2018-10-12 22:30:18', 'YYYY-MM-DD HH24:MI:SS'), null);
 
 -- ----------------------------
 -- Table structure for BLOG_TAG
 -- ----------------------------
 DROP TABLE "LEN"."BLOG_TAG";
-CREATE TABLE "LEN"."BLOG_TAG" (
-"ID" NVARCHAR2(32) NOT NULL ,
-"TAG_CODE" NVARCHAR2(16) NOT NULL ,
-"TAG_NAME" NVARCHAR2(255) NOT NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."BLOG_TAG"
+(
+	"ID"       NVARCHAR2(32) NOT NULL,
+	"TAG_CODE" NVARCHAR2(16) NOT NULL,
+	"TAG_NAME" NVARCHAR2(255) NOT NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
-COMMENT ON COLUMN "LEN"."BLOG_TAG"."TAG_CODE" IS '标签code';
-COMMENT ON COLUMN "LEN"."BLOG_TAG"."TAG_NAME" IS '标签name';
+COMMENT
+ON COLUMN "LEN"."BLOG_TAG"."TAG_CODE" IS '标签code';
+COMMENT
+ON COLUMN "LEN"."BLOG_TAG"."TAG_NAME" IS '标签name';
 
 -- ----------------------------
 -- Records of BLOG_TAG
 -- ----------------------------
-INSERT INTO "LEN"."BLOG_TAG" VALUES ('0596836fc90540d1a497cd7bfae306e4', 'shiro', 'shiro');
-INSERT INTO "LEN"."BLOG_TAG" VALUES ('1f44f472a64f4ebe9782b2b868e2caf2', 'spring', 'spring');
-INSERT INTO "LEN"."BLOG_TAG" VALUES ('32297dbf97d44462bfa8b2f868704660', 'mybatis', 'mybatis');
-INSERT INTO "LEN"."BLOG_TAG" VALUES ('483af3b2db5743e99a9cde0f81559b43', 'spring cloud', 'spring cloud');
-INSERT INTO "LEN"."BLOG_TAG" VALUES ('4e4aa6cd7fea4a70a9e31083c1109090', 'sql', 'sql');
-INSERT INTO "LEN"."BLOG_TAG" VALUES ('56a9dc14db164453a0baa30d3193367c', '22', '22');
-INSERT INTO "LEN"."BLOG_TAG" VALUES ('75cae88b2f9f451392bfc06928a7c58d', 'centos7', 'centos7');
-INSERT INTO "LEN"."BLOG_TAG" VALUES ('7b470a9a121b42dc995e876fb532660e', 'linux', 'linux');
-INSERT INTO "LEN"."BLOG_TAG" VALUES ('7e467f2922a34a0b91afd908676f0ef5', 'spring security', 'spring security');
-INSERT INTO "LEN"."BLOG_TAG" VALUES ('8f41425ce8794fa8a0affa17beb13f11', 'redis', 'redis');
-INSERT INTO "LEN"."BLOG_TAG" VALUES ('d4e6b7774db343ff8575b1790a615aa2', 'git', 'git');
-INSERT INTO "LEN"."BLOG_TAG" VALUES ('da34c84e702341d68e6ea6d004508e67', 'vue', 'vue');
-INSERT INTO "LEN"."BLOG_TAG" VALUES ('e4ca0a14f2724de8bf71ad0ac8988c57', 'quartz', 'quartz');
-INSERT INTO "LEN"."BLOG_TAG" VALUES ('eba6d766a88b4a108d4189c08f86e7a6', 'spring boot', 'spring boot');
-INSERT INTO "LEN"."BLOG_TAG" VALUES ('eeba8137d0cc42249a8c1db9b2830e8a', 'java', 'java');
-INSERT INTO "LEN"."BLOG_TAG" VALUES ('f4ebc211eb3242739d6007e030c54ae5', 'oauth2.0', 'oauth2.0');
+INSERT INTO "LEN"."BLOG_TAG"
+VALUES ('0596836fc90540d1a497cd7bfae306e4', 'shiro', 'shiro');
+INSERT INTO "LEN"."BLOG_TAG"
+VALUES ('1f44f472a64f4ebe9782b2b868e2caf2', 'spring', 'spring');
+INSERT INTO "LEN"."BLOG_TAG"
+VALUES ('32297dbf97d44462bfa8b2f868704660', 'mybatis', 'mybatis');
+INSERT INTO "LEN"."BLOG_TAG"
+VALUES ('483af3b2db5743e99a9cde0f81559b43', 'spring cloud', 'spring cloud');
+INSERT INTO "LEN"."BLOG_TAG"
+VALUES ('4e4aa6cd7fea4a70a9e31083c1109090', 'sql', 'sql');
+INSERT INTO "LEN"."BLOG_TAG"
+VALUES ('56a9dc14db164453a0baa30d3193367c', '22', '22');
+INSERT INTO "LEN"."BLOG_TAG"
+VALUES ('75cae88b2f9f451392bfc06928a7c58d', 'centos7', 'centos7');
+INSERT INTO "LEN"."BLOG_TAG"
+VALUES ('7b470a9a121b42dc995e876fb532660e', 'linux', 'linux');
+INSERT INTO "LEN"."BLOG_TAG"
+VALUES ('7e467f2922a34a0b91afd908676f0ef5', 'spring security', 'spring security');
+INSERT INTO "LEN"."BLOG_TAG"
+VALUES ('8f41425ce8794fa8a0affa17beb13f11', 'redis', 'redis');
+INSERT INTO "LEN"."BLOG_TAG"
+VALUES ('d4e6b7774db343ff8575b1790a615aa2', 'git', 'git');
+INSERT INTO "LEN"."BLOG_TAG"
+VALUES ('da34c84e702341d68e6ea6d004508e67', 'vue', 'vue');
+INSERT INTO "LEN"."BLOG_TAG"
+VALUES ('e4ca0a14f2724de8bf71ad0ac8988c57', 'quartz', 'quartz');
+INSERT INTO "LEN"."BLOG_TAG"
+VALUES ('eba6d766a88b4a108d4189c08f86e7a6', 'spring boot', 'spring boot');
+INSERT INTO "LEN"."BLOG_TAG"
+VALUES ('eeba8137d0cc42249a8c1db9b2830e8a', 'java', 'java');
+INSERT INTO "LEN"."BLOG_TAG"
+VALUES ('f4ebc211eb3242739d6007e030c54ae5', 'oauth2.0', 'oauth2.0');
 
 -- ----------------------------
 -- Table structure for SYS_DICT_ITEM
 -- ----------------------------
 DROP TABLE "LEN"."SYS_DICT_ITEM";
-CREATE TABLE "LEN"."SYS_DICT_ITEM" (
-"ID" NVARCHAR2(32) NOT NULL ,
-"SEQUENCE" NUMBER(11) NOT NULL ,
-"VALUE" NVARCHAR2(100) NOT NULL ,
-"DESCRIPTION" NVARCHAR2(100) NOT NULL ,
-"TYPE_ID" NVARCHAR2(32) NOT NULL ,
-"CREATE_BY" NVARCHAR2(32) NULL ,
-"CREATE_DATE" DATE NULL ,
-"UPDATE_BY" NVARCHAR2(32) NULL ,
-"UPDATE_DATE" DATE NULL ,
-"DEL_FLAG" NCHAR(1) NOT NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."SYS_DICT_ITEM"
+(
+	"ID"          NVARCHAR2(32) NOT NULL,
+	"SEQUENCE"    NUMBER(11) NOT NULL,
+	"VALUE"       NVARCHAR2(100) NOT NULL,
+	"DESCRIPTION" NVARCHAR2(100) NOT NULL,
+	"TYPE_ID"     NVARCHAR2(32) NOT NULL,
+	"CREATE_BY"   NVARCHAR2(32) NULL,
+	"CREATE_DATE" DATE NULL,
+	"UPDATE_BY"   NVARCHAR2(32) NULL,
+	"UPDATE_DATE" DATE NULL,
+	"DEL_FLAG"    NCHAR(1) NOT NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
-COMMENT ON TABLE "LEN"."SYS_DICT_ITEM" IS '字典子表';
-COMMENT ON COLUMN "LEN"."SYS_DICT_ITEM"."SEQUENCE" IS '序号';
-COMMENT ON COLUMN "LEN"."SYS_DICT_ITEM"."VALUE" IS '值';
-COMMENT ON COLUMN "LEN"."SYS_DICT_ITEM"."DESCRIPTION" IS '描述';
-COMMENT ON COLUMN "LEN"."SYS_DICT_ITEM"."TYPE_ID" IS '字典id外检';
-COMMENT ON COLUMN "LEN"."SYS_DICT_ITEM"."DEL_FLAG" IS '删除标识';
+COMMENT
+ON TABLE "LEN"."SYS_DICT_ITEM" IS '字典子表';
+COMMENT
+ON COLUMN "LEN"."SYS_DICT_ITEM"."SEQUENCE" IS '序号';
+COMMENT
+ON COLUMN "LEN"."SYS_DICT_ITEM"."VALUE" IS '值';
+COMMENT
+ON COLUMN "LEN"."SYS_DICT_ITEM"."DESCRIPTION" IS '描述';
+COMMENT
+ON COLUMN "LEN"."SYS_DICT_ITEM"."TYPE_ID" IS '字典id外检';
+COMMENT
+ON COLUMN "LEN"."SYS_DICT_ITEM"."DEL_FLAG" IS '删除标识';
 
 -- ----------------------------
 -- Records of SYS_DICT_ITEM
@@ -921,25 +976,28 @@ COMMENT ON COLUMN "LEN"."SYS_DICT_ITEM"."DEL_FLAG" IS '删除标识';
 -- Table structure for SYS_DICT_TYPE
 -- ----------------------------
 DROP TABLE "LEN"."SYS_DICT_TYPE";
-CREATE TABLE "LEN"."SYS_DICT_TYPE" (
-"ID" NVARCHAR2(32) NOT NULL ,
-"CODE" NVARCHAR2(255) NOT NULL ,
-"DEL_FLAG" NCHAR(1) NOT NULL ,
-"TEXT" NVARCHAR2(255) NOT NULL ,
-"CREATE_BY" NVARCHAR2(32) NULL ,
-"CREATE_DATE" DATE NULL ,
-"UPDATE_BY" NVARCHAR2(32) NULL ,
-"UPDATE_DATE" DATE NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."SYS_DICT_TYPE"
+(
+	"ID"          NVARCHAR2(32) NOT NULL,
+	"CODE"        NVARCHAR2(255) NOT NULL,
+	"DEL_FLAG"    NCHAR(1) NOT NULL,
+	"TEXT"        NVARCHAR2(255) NOT NULL,
+	"CREATE_BY"   NVARCHAR2(32) NULL,
+	"CREATE_DATE" DATE NULL,
+	"UPDATE_BY"   NVARCHAR2(32) NULL,
+	"UPDATE_DATE" DATE NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
-COMMENT ON TABLE "LEN"."SYS_DICT_TYPE" IS '字典主表';
-COMMENT ON COLUMN "LEN"."SYS_DICT_TYPE"."CODE" IS '编码';
-COMMENT ON COLUMN "LEN"."SYS_DICT_TYPE"."DEL_FLAG" IS '删除标识';
-COMMENT ON COLUMN "LEN"."SYS_DICT_TYPE"."TEXT" IS '字典名称';
+COMMENT
+ON TABLE "LEN"."SYS_DICT_TYPE" IS '字典主表';
+COMMENT
+ON COLUMN "LEN"."SYS_DICT_TYPE"."CODE" IS '编码';
+COMMENT
+ON COLUMN "LEN"."SYS_DICT_TYPE"."DEL_FLAG" IS '删除标识';
+COMMENT
+ON COLUMN "LEN"."SYS_DICT_TYPE"."TEXT" IS '字典名称';
 
 -- ----------------------------
 -- Records of SYS_DICT_TYPE
@@ -949,52 +1007,63 @@ COMMENT ON COLUMN "LEN"."SYS_DICT_TYPE"."TEXT" IS '字典名称';
 -- Table structure for SYS_JOB
 -- ----------------------------
 DROP TABLE "LEN"."SYS_JOB";
-CREATE TABLE "LEN"."SYS_JOB" (
-"ID" NVARCHAR2(32) NOT NULL ,
-"JOB_NAME" NVARCHAR2(255) NOT NULL ,
-"CRON" NVARCHAR2(255) NOT NULL ,
-"STATUS" NUMBER(4) NOT NULL ,
-"CLAZZ_PATH" NVARCHAR2(255) NOT NULL ,
-"JOB_DESC" NVARCHAR2(255) NULL ,
-"CREATE_BY" NVARCHAR2(255) NULL ,
-"CREATE_DATE" DATE NULL ,
-"UPDATE_BY" NVARCHAR2(255) NULL ,
-"UPDATE_DATE" DATE NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."SYS_JOB"
+(
+	"ID"          NVARCHAR2(32) NOT NULL,
+	"JOB_NAME"    NVARCHAR2(255) NOT NULL,
+	"CRON"        NVARCHAR2(255) NOT NULL,
+	"STATUS"      NUMBER(4) NOT NULL,
+	"CLAZZ_PATH"  NVARCHAR2(255) NOT NULL,
+	"JOB_DESC"    NVARCHAR2(255) NULL,
+	"CREATE_BY"   NVARCHAR2(255) NULL,
+	"CREATE_DATE" DATE NULL,
+	"UPDATE_BY"   NVARCHAR2(255) NULL,
+	"UPDATE_DATE" DATE NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
-COMMENT ON COLUMN "LEN"."SYS_JOB"."JOB_NAME" IS '描述任务';
-COMMENT ON COLUMN "LEN"."SYS_JOB"."CRON" IS '任务表达式';
-COMMENT ON COLUMN "LEN"."SYS_JOB"."STATUS" IS '状态:0未启动false/1启动true';
-COMMENT ON COLUMN "LEN"."SYS_JOB"."CLAZZ_PATH" IS '任务执行方法';
-COMMENT ON COLUMN "LEN"."SYS_JOB"."JOB_DESC" IS '其他描述';
+COMMENT
+ON COLUMN "LEN"."SYS_JOB"."JOB_NAME" IS '描述任务';
+COMMENT
+ON COLUMN "LEN"."SYS_JOB"."CRON" IS '任务表达式';
+COMMENT
+ON COLUMN "LEN"."SYS_JOB"."STATUS" IS '状态:0未启动false/1启动true';
+COMMENT
+ON COLUMN "LEN"."SYS_JOB"."CLAZZ_PATH" IS '任务执行方法';
+COMMENT
+ON COLUMN "LEN"."SYS_JOB"."JOB_DESC" IS '其他描述';
 
 -- ----------------------------
 -- Records of SYS_JOB
 -- ----------------------------
-INSERT INTO "LEN"."SYS_JOB" VALUES ('55147ebdf2f611e7a4fe201a068c6482', '测试定时demo1', '0/5 * * * * ?', '0', 'com.len.core.quartz.CustomQuartz.JobDemo1', '测试定时demo1', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-07 12:30:00', 'YYYY-MM-DD HH24:MI:SS'), 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-07-14 13:29:55', 'YYYY-MM-DD HH24:MI:SS'));
-INSERT INTO "LEN"."SYS_JOB" VALUES ('ab648a22f38d11e7aca0201a068c6482', '任务demo2', '0 0/1 * * * ?', '0', 'com.len.core.quartz.CustomQuartz.JobDemo2', '任务demo2', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-07 17:32:36', 'YYYY-MM-DD HH24:MI:SS'), 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-07-07 17:07:45', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "LEN"."SYS_JOB"
+VALUES ('55147ebdf2f611e7a4fe201a068c6482', '测试定时demo1', '0/5 * * * * ?', '0',
+		'com.len.core.quartz.CustomQuartz.JobDemo1', '测试定时demo1', 'acfc0e9232f54732a5d9ffe9071bf572',
+		TO_DATE('2018-01-07 12:30:00', 'YYYY-MM-DD HH24:MI:SS'), 'acfc0e9232f54732a5d9ffe9071bf572',
+		TO_DATE('2018-07-14 13:29:55', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "LEN"."SYS_JOB"
+VALUES ('ab648a22f38d11e7aca0201a068c6482', '任务demo2', '0 0/1 * * * ?', '0',
+		'com.len.core.quartz.CustomQuartz.JobDemo2', '任务demo2', 'acfc0e9232f54732a5d9ffe9071bf572',
+		TO_DATE('2018-01-07 17:32:36', 'YYYY-MM-DD HH24:MI:SS'), 'acfc0e9232f54732a5d9ffe9071bf572',
+		TO_DATE('2018-07-07 17:07:45', 'YYYY-MM-DD HH24:MI:SS'));
 
 -- ----------------------------
 -- Table structure for SYS_LOG
 -- ----------------------------
 DROP TABLE "LEN"."SYS_LOG";
-CREATE TABLE "LEN"."SYS_LOG" (
-"ID" NUMBER(11) NOT NULL ,
-"USER_NAME" NVARCHAR2(32) NULL ,
-"IP" NVARCHAR2(255) NULL ,
-"TYPE" NVARCHAR2(255) NULL ,
-"TEXT" NVARCHAR2(255) NULL ,
-"PARAM" NCLOB NULL ,
-"CREATE_TIME" DATE NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."SYS_LOG"
+(
+	"ID"          NUMBER(11) NOT NULL,
+	"USER_NAME"   NVARCHAR2(32) NULL,
+	"IP"          NVARCHAR2(255) NULL,
+	"TYPE"        NVARCHAR2(255) NULL,
+	"TEXT"        NVARCHAR2(255) NULL,
+	"PARAM"       NCLOB NULL,
+	"CREATE_TIME" DATE NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
@@ -1005,299 +1074,553 @@ NOCACHE
 -- Table structure for SYS_MENU
 -- ----------------------------
 DROP TABLE "LEN"."SYS_MENU";
-CREATE TABLE "LEN"."SYS_MENU" (
-"ID" NVARCHAR2(36) NOT NULL ,
-"NAME" NVARCHAR2(255) NOT NULL ,
-"P_ID" NVARCHAR2(36) NULL ,
-"URL" NVARCHAR2(255) NULL ,
-"ORDER_NUM" NUMBER(11) NULL ,
-"ICON" NVARCHAR2(255) NULL ,
-"CREATE_BY" NVARCHAR2(32) NULL ,
-"CREATE_DATE" DATE NULL ,
-"UPDATE_BY" NVARCHAR2(32) NULL ,
-"UPDATE_DATE" DATE NULL ,
-"PERMISSION" NVARCHAR2(255) NULL ,
-"MENU_TYPE" NUMBER(4) NOT NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."SYS_MENU"
+(
+	"ID"          NVARCHAR2(36) NOT NULL,
+	"NAME"        NVARCHAR2(255) NOT NULL,
+	"P_ID"        NVARCHAR2(36) NULL,
+	"URL"         NVARCHAR2(255) NULL,
+	"ORDER_NUM"   NUMBER(11) NULL,
+	"ICON"        NVARCHAR2(255) NULL,
+	"CREATE_BY"   NVARCHAR2(32) NULL,
+	"CREATE_DATE" DATE NULL,
+	"UPDATE_BY"   NVARCHAR2(32) NULL,
+	"UPDATE_DATE" DATE NULL,
+	"PERMISSION"  NVARCHAR2(255) NULL,
+	"MENU_TYPE"   NUMBER(4) NOT NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
-COMMENT ON COLUMN "LEN"."SYS_MENU"."ORDER_NUM" IS '排序字段';
-COMMENT ON COLUMN "LEN"."SYS_MENU"."ICON" IS '图标';
-COMMENT ON COLUMN "LEN"."SYS_MENU"."PERMISSION" IS '权限';
-COMMENT ON COLUMN "LEN"."SYS_MENU"."MENU_TYPE" IS '1栏目2菜单';
+COMMENT
+ON COLUMN "LEN"."SYS_MENU"."ORDER_NUM" IS '排序字段';
+COMMENT
+ON COLUMN "LEN"."SYS_MENU"."ICON" IS '图标';
+COMMENT
+ON COLUMN "LEN"."SYS_MENU"."PERMISSION" IS '权限';
+COMMENT
+ON COLUMN "LEN"."SYS_MENU"."MENU_TYPE" IS '1栏目2菜单';
 
 -- ----------------------------
 -- Records of SYS_MENU
 -- ----------------------------
-INSERT INTO "LEN"."SYS_MENU" VALUES ('0e6c8d4cf09511e78a57201a068c6482', '删除', 'cff61424dfb311e7b555201a068c6482', null, '3', null, 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-03 22:47:44', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'role:del', '1');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('18bf8d5df09511e78a57201a068c6482', '新增', '3873ccc2dfda11e7b555201a068c6482', null, '1', null, 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-03 22:48:01', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'nemu:add', '1');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('28661300f9d411e7a009201a068c6482', '流程管理', 'e06da471f90311e780aa201a068c6482', '/act/goAct', '2', '&#xe630;', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-15 17:12:06', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'act:deployment', '0');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('2b56410cf09411e78a57201a068c6482', '新增', 'cff61424dfb311e7b555201a068c6482', null, '1', null, 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-03 22:41:23', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'role:add', '1');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('3873ccc2dfda11e7b555201a068c6482', '菜单管理', 'cfda8029dfb311e7b555201a068c6482', 'menu/showMenu', '1', '', null, TO_DATE('2017-12-14 14:02:50', 'YYYY-MM-DD HH24:MI:SS'), 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-04-23 19:43:54', 'YYYY-MM-DD HH24:MI:SS'), 'menu:show', '0');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('433089a6eb0111e782d5201a068c6482', '编辑', 'cfe54921dfb311e7b555201a068c6482', null, null, '1', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2017-12-27 20:27:11', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'user:update', '1');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('4d603831fe9b11e7b472201a068c6482', '待办任务', 'e06da471f90311e780aa201a068c6482', '/leave/showTask', '5', '&#xe6af;', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-21 19:07:43', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'task:show', '0');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('5ae3d4e9f38e11e7aca0201a068c6482', '新增', 'e9a13e55f35911e7aca0201a068c6482', null, '1', null, 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-07 17:37:30', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'job:add', '1');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('6315968bf37111e7aca0201a068c6482', '停止', 'e9a13e55f35911e7aca0201a068c6482', null, '4', null, 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-07 14:10:09', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'job:end', '1');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('63da4415fc6211e7a781201a068c6482', '模型列表', 'e06da471f90311e780aa201a068c6482', '/act/goActModel', '3', '&#xe60a;', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-18 23:15:17', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'act', '0');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('6931fd22f09611e78a57201a068c6482', '删除', 'b441914cee0811e7a60d201a068c6482', null, '1', null, 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-03 22:57:26', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'control:del', '1');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('69f3f59cf38e11e7aca0201a068c6482', '编辑', 'e9a13e55f35911e7aca0201a068c6482', null, '2', null, 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-07 17:37:56', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'job:update', '1');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('6dc13c6eec5f11e7a472201a068c6482', '系统日志', 'a1ca6642ec5e11e7a472201a068c6482', 'log/showLog', '1', '&#xe60a;', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2017-12-29 14:43:46', 'YYYY-MM-DD HH24:MI:SS'), null, TO_DATE('2017-12-29 14:43:46', 'YYYY-MM-DD HH24:MI:SS'), 'log:show', '0');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('788d8e34f38e11e7aca0201a068c6482', '删除', 'e9a13e55f35911e7aca0201a068c6482', null, '5', null, 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-07 17:38:20', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'job:del', '1');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('7967e098ee0611e7a60d201a068c6482', '接口api', 'a1ca6642ec5e11e7a472201a068c6482', 'swagger-ui.html', '2', '&#xe64e;', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2017-12-31 16:42:04', 'YYYY-MM-DD HH24:MI:SS'), null, null, null, '0');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('873f30b0f38e11e7aca0201a068c6482', '查看', 'e9a13e55f35911e7aca0201a068c6482', null, '6', null, 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-07 17:38:45', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'job:select', '1');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('88b8e5d1f38911e7aca0201a068c6482', '查看', 'cff61424dfb311e7b555201a068c6482', null, '4', null, 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-07 17:03:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'role:select', '1');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('8a6c8bfa7f804eac810c5790cad9a62a', '删除', '3873ccc2dfda11e7b555201a068c6482', null, '2', null, 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-06-20 21:55:55', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'menu:del', '1');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('a1ca6642ec5e11e7a472201a068c6482', '系统监控', null, null, '2', '&#xe62c;', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-03 10:56:14', 'YYYY-MM-DD HH24:MI:SS'), null, TO_DATE('2018-01-03 10:56:14', 'YYYY-MM-DD HH24:MI:SS'), null, '0');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('b441914cee0811e7a60d201a068c6482', '系统监控', 'a1ca6642ec5e11e7a472201a068c6482', 'druid/index.html', '3', '&#xe628;', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2017-12-31 16:58:01', 'YYYY-MM-DD HH24:MI:SS'), null, null, null, '0');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('b7839f59fe8811e7b472201a068c6482', '请假流程', 'e06da471f90311e780aa201a068c6482', '/leave/showLeave', '4', '&#xe650;', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-21 16:54:40', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'leave:show', '0');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('cfda8029dfb311e7b555201a068c6482', '系统管理', null, null, '1', '&#xe614;', null, TO_DATE('2018-01-03 10:56:13', 'YYYY-MM-DD HH24:MI:SS'), null, TO_DATE('2018-01-03 10:56:13', 'YYYY-MM-DD HH24:MI:SS'), null, '0');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('cfe54921dfb311e7b555201a068c6482', '用户管理', 'cfda8029dfb311e7b555201a068c6482', '/user/showUser', '2', '&#xe6af;', null, TO_DATE('2017-12-29 14:40:34', 'YYYY-MM-DD HH24:MI:SS'), null, TO_DATE('2017-12-29 14:40:34', 'YYYY-MM-DD HH24:MI:SS'), 'user:show', '0');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('cfe54921dfb311e7b555201a068c6483', '增加', 'cfe54921dfb311e7b555201a068c6482', null, '1', null, null, null, null, null, 'user:select', '1');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('cff61424dfb311e7b555201a068c6482', '角色管理', 'cfda8029dfb311e7b555201a068c6482', '/role/showRole', '3', '&#xe613;', null, TO_DATE('2017-12-29 14:40:36', 'YYYY-MM-DD HH24:MI:SS'), null, TO_DATE('2017-12-29 14:40:36', 'YYYY-MM-DD HH24:MI:SS'), 'role:show', '0');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('e06da471f90311e780aa201a068c6482', '工作流程管理', null, null, '3', '&#xe628;', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-14 16:21:10', 'YYYY-MM-DD HH24:MI:SS'), null, null, null, '0');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('e3b11497eb9e11e7928d201a068c6482', '删除', 'cfe54921dfb311e7b555201a068c6482', null, null, null, 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2017-12-28 15:17:07', 'YYYY-MM-DD HH24:MI:SS'), null, TO_DATE('2017-12-28 15:17:07', 'YYYY-MM-DD HH24:MI:SS'), 'user:del', '1');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('e9a13e55f35911e7aca0201a068c6482', '定时任务', 'a1ca6642ec5e11e7a472201a068c6482', '/job/showJob', '3', '&#xe756;', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-07 11:22:06', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'job:show', '0');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('ecda560cf36f11e7aca0201a068c6482', '启动', 'e9a13e55f35911e7aca0201a068c6482', null, '3', null, 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-07 13:59:41', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'job:start', '1');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('f23f6a6bf09511e78a57201a068c6482', '修改密码', 'cfe54921dfb311e7b555201a068c6482', null, '4', null, 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-03 22:54:06', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'user:repass', '1');
-INSERT INTO "LEN"."SYS_MENU" VALUES ('ff015ea5f09411e78a57201a068c6482', '编辑', 'cff61424dfb311e7b555201a068c6482', null, '2', null, 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-03 22:47:18', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'role:update', '1');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('0e6c8d4cf09511e78a57201a068c6482', '删除', 'cff61424dfb311e7b555201a068c6482', null, '3', null,
+		'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-03 22:47:44', 'YYYY-MM-DD HH24:MI:SS'), null, null,
+		'role:del', '1');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('18bf8d5df09511e78a57201a068c6482', '新增', '3873ccc2dfda11e7b555201a068c6482', null, '1', null,
+		'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-03 22:48:01', 'YYYY-MM-DD HH24:MI:SS'), null, null,
+		'nemu:add', '1');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('28661300f9d411e7a009201a068c6482', '流程管理', 'e06da471f90311e780aa201a068c6482', '/act/goAct', '2',
+		'&#xe630;', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-15 17:12:06', 'YYYY-MM-DD HH24:MI:SS'), null,
+		null, 'act:deployment', '0');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('2b56410cf09411e78a57201a068c6482', '新增', 'cff61424dfb311e7b555201a068c6482', null, '1', null,
+		'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-03 22:41:23', 'YYYY-MM-DD HH24:MI:SS'), null, null,
+		'role:add', '1');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('3873ccc2dfda11e7b555201a068c6482', '菜单管理', 'cfda8029dfb311e7b555201a068c6482', 'menu/showMenu', '1', '',
+		null, TO_DATE('2017-12-14 14:02:50', 'YYYY-MM-DD HH24:MI:SS'), 'acfc0e9232f54732a5d9ffe9071bf572',
+		TO_DATE('2018-04-23 19:43:54', 'YYYY-MM-DD HH24:MI:SS'), 'menu:show', '0');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('433089a6eb0111e782d5201a068c6482', '编辑', 'cfe54921dfb311e7b555201a068c6482', null, null, '1',
+		'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2017-12-27 20:27:11', 'YYYY-MM-DD HH24:MI:SS'), null, null,
+		'user:update', '1');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('4d603831fe9b11e7b472201a068c6482', '待办任务', 'e06da471f90311e780aa201a068c6482', '/leave/showTask', '5',
+		'&#xe6af;', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-21 19:07:43', 'YYYY-MM-DD HH24:MI:SS'), null,
+		null, 'task:show', '0');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('5ae3d4e9f38e11e7aca0201a068c6482', '新增', 'e9a13e55f35911e7aca0201a068c6482', null, '1', null,
+		'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-07 17:37:30', 'YYYY-MM-DD HH24:MI:SS'), null, null,
+		'job:add', '1');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('6315968bf37111e7aca0201a068c6482', '停止', 'e9a13e55f35911e7aca0201a068c6482', null, '4', null,
+		'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-07 14:10:09', 'YYYY-MM-DD HH24:MI:SS'), null, null,
+		'job:end', '1');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('63da4415fc6211e7a781201a068c6482', '模型列表', 'e06da471f90311e780aa201a068c6482', '/act/goActModel', '3',
+		'&#xe60a;', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-18 23:15:17', 'YYYY-MM-DD HH24:MI:SS'), null,
+		null, 'act', '0');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('6931fd22f09611e78a57201a068c6482', '删除', 'b441914cee0811e7a60d201a068c6482', null, '1', null,
+		'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-03 22:57:26', 'YYYY-MM-DD HH24:MI:SS'), null, null,
+		'control:del', '1');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('69f3f59cf38e11e7aca0201a068c6482', '编辑', 'e9a13e55f35911e7aca0201a068c6482', null, '2', null,
+		'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-07 17:37:56', 'YYYY-MM-DD HH24:MI:SS'), null, null,
+		'job:update', '1');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('6dc13c6eec5f11e7a472201a068c6482', '系统日志', 'a1ca6642ec5e11e7a472201a068c6482', 'log/showLog', '1',
+		'&#xe60a;', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2017-12-29 14:43:46', 'YYYY-MM-DD HH24:MI:SS'), null,
+		TO_DATE('2017-12-29 14:43:46', 'YYYY-MM-DD HH24:MI:SS'), 'log:show', '0');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('788d8e34f38e11e7aca0201a068c6482', '删除', 'e9a13e55f35911e7aca0201a068c6482', null, '5', null,
+		'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-07 17:38:20', 'YYYY-MM-DD HH24:MI:SS'), null, null,
+		'job:del', '1');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('7967e098ee0611e7a60d201a068c6482', '接口api', 'a1ca6642ec5e11e7a472201a068c6482', 'swagger-ui.html', '2',
+		'&#xe64e;', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2017-12-31 16:42:04', 'YYYY-MM-DD HH24:MI:SS'), null,
+		null, null, '0');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('873f30b0f38e11e7aca0201a068c6482', '查看', 'e9a13e55f35911e7aca0201a068c6482', null, '6', null,
+		'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-07 17:38:45', 'YYYY-MM-DD HH24:MI:SS'), null, null,
+		'job:select', '1');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('88b8e5d1f38911e7aca0201a068c6482', '查看', 'cff61424dfb311e7b555201a068c6482', null, '4', null,
+		'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-07 17:03:00', 'YYYY-MM-DD HH24:MI:SS'), null, null,
+		'role:select', '1');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('8a6c8bfa7f804eac810c5790cad9a62a', '删除', '3873ccc2dfda11e7b555201a068c6482', null, '2', null,
+		'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-06-20 21:55:55', 'YYYY-MM-DD HH24:MI:SS'), null, null,
+		'menu:del', '1');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('a1ca6642ec5e11e7a472201a068c6482', '系统监控', null, null, '2', '&#xe62c;', 'acfc0e9232f54732a5d9ffe9071bf572',
+		TO_DATE('2018-01-03 10:56:14', 'YYYY-MM-DD HH24:MI:SS'), null,
+		TO_DATE('2018-01-03 10:56:14', 'YYYY-MM-DD HH24:MI:SS'), null, '0');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('b441914cee0811e7a60d201a068c6482', '系统监控', 'a1ca6642ec5e11e7a472201a068c6482', 'druid/index.html', '3',
+		'&#xe628;', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2017-12-31 16:58:01', 'YYYY-MM-DD HH24:MI:SS'), null,
+		null, null, '0');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('b7839f59fe8811e7b472201a068c6482', '请假流程', 'e06da471f90311e780aa201a068c6482', '/leave/showLeave', '4',
+		'&#xe650;', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-21 16:54:40', 'YYYY-MM-DD HH24:MI:SS'), null,
+		null, 'leave:show', '0');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('cfda8029dfb311e7b555201a068c6482', '系统管理', null, null, '1', '&#xe614;', null,
+		TO_DATE('2018-01-03 10:56:13', 'YYYY-MM-DD HH24:MI:SS'), null,
+		TO_DATE('2018-01-03 10:56:13', 'YYYY-MM-DD HH24:MI:SS'), null, '0');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('cfe54921dfb311e7b555201a068c6482', '用户管理', 'cfda8029dfb311e7b555201a068c6482', '/user/showUser', '2',
+		'&#xe6af;', null, TO_DATE('2017-12-29 14:40:34', 'YYYY-MM-DD HH24:MI:SS'), null,
+		TO_DATE('2017-12-29 14:40:34', 'YYYY-MM-DD HH24:MI:SS'), 'user:show', '0');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('cfe54921dfb311e7b555201a068c6483', '增加', 'cfe54921dfb311e7b555201a068c6482', null, '1', null, null, null,
+		null, null, 'user:select', '1');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('cff61424dfb311e7b555201a068c6482', '角色管理', 'cfda8029dfb311e7b555201a068c6482', '/role/showRole', '3',
+		'&#xe613;', null, TO_DATE('2017-12-29 14:40:36', 'YYYY-MM-DD HH24:MI:SS'), null,
+		TO_DATE('2017-12-29 14:40:36', 'YYYY-MM-DD HH24:MI:SS'), 'role:show', '0');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('e06da471f90311e780aa201a068c6482', '工作流程管理', null, null, '3', '&#xe628;',
+		'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-14 16:21:10', 'YYYY-MM-DD HH24:MI:SS'), null, null, null,
+		'0');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('e3b11497eb9e11e7928d201a068c6482', '删除', 'cfe54921dfb311e7b555201a068c6482', null, null, null,
+		'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2017-12-28 15:17:07', 'YYYY-MM-DD HH24:MI:SS'), null,
+		TO_DATE('2017-12-28 15:17:07', 'YYYY-MM-DD HH24:MI:SS'), 'user:del', '1');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('e9a13e55f35911e7aca0201a068c6482', '定时任务', 'a1ca6642ec5e11e7a472201a068c6482', '/job/showJob', '3',
+		'&#xe756;', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-07 11:22:06', 'YYYY-MM-DD HH24:MI:SS'), null,
+		null, 'job:show', '0');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('ecda560cf36f11e7aca0201a068c6482', '启动', 'e9a13e55f35911e7aca0201a068c6482', null, '3', null,
+		'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-07 13:59:41', 'YYYY-MM-DD HH24:MI:SS'), null, null,
+		'job:start', '1');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('f23f6a6bf09511e78a57201a068c6482', '修改密码', 'cfe54921dfb311e7b555201a068c6482', null, '4', null,
+		'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-03 22:54:06', 'YYYY-MM-DD HH24:MI:SS'), null, null,
+		'user:repass', '1');
+INSERT INTO "LEN"."SYS_MENU"
+VALUES ('ff015ea5f09411e78a57201a068c6482', '编辑', 'cff61424dfb311e7b555201a068c6482', null, '2', null,
+		'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-03 22:47:18', 'YYYY-MM-DD HH24:MI:SS'), null, null,
+		'role:update', '1');
 
 -- ----------------------------
 -- Table structure for SYS_ROLE
 -- ----------------------------
 DROP TABLE "LEN"."SYS_ROLE";
-CREATE TABLE "LEN"."SYS_ROLE" (
-"ID" NVARCHAR2(32) NOT NULL ,
-"ROLE_NAME" NVARCHAR2(128) NULL ,
-"REMARK" NVARCHAR2(255) NULL ,
-"CREATE_BY" NVARCHAR2(32) NULL ,
-"CREATE_DATE" DATE NULL ,
-"UPDATE_BY" NVARCHAR2(32) NULL ,
-"UPDATE_DATE" DATE NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."SYS_ROLE"
+(
+	"ID"          NVARCHAR2(32) NOT NULL,
+	"ROLE_NAME"   NVARCHAR2(128) NULL,
+	"REMARK"      NVARCHAR2(255) NULL,
+	"CREATE_BY"   NVARCHAR2(32) NULL,
+	"CREATE_DATE" DATE NULL,
+	"UPDATE_BY"   NVARCHAR2(32) NULL,
+	"UPDATE_DATE" DATE NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
 -- Records of SYS_ROLE
 -- ----------------------------
-INSERT INTO "LEN"."SYS_ROLE" VALUES ('023366f3457511e8bcf1309c2315f9aa', 'hr', '人事', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-04-21 23:02:16', 'YYYY-MM-DD HH24:MI:SS'), null, null);
-INSERT INTO "LEN"."SYS_ROLE" VALUES ('0ea934e5e55411e7b983201a068c6482', 'manage', '经理', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2017-12-20 15:04:44', 'YYYY-MM-DD HH24:MI:SS'), null, TO_DATE('2018-01-02 11:41:43', 'YYYY-MM-DD HH24:MI:SS'));
-INSERT INTO "LEN"."SYS_ROLE" VALUES ('2619a672e53811e7b983201a068c6482', 'admin', '管理员', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2017-12-20 11:44:57', 'YYYY-MM-DD HH24:MI:SS'), null, TO_DATE('2018-01-02 11:38:37', 'YYYY-MM-DD HH24:MI:SS'));
-INSERT INTO "LEN"."SYS_ROLE" VALUES ('4bb891d8caf84cc6ba27e515e80ac40d', 'blogAdmin', '博客管理员', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-10-01 10:21:10', 'YYYY-MM-DD HH24:MI:SS'), null, null);
-INSERT INTO "LEN"."SYS_ROLE" VALUES ('dcb0f642fe9611e7b472201a068c6482', 'dev', '开发', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-21 18:35:56', 'YYYY-MM-DD HH24:MI:SS'), null, null);
-INSERT INTO "LEN"."SYS_ROLE" VALUES ('e346e96368484c8fa7f217ce550a0186', 'DeputyManager', '副经理', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-06-14 23:21:36', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "LEN"."SYS_ROLE"
+VALUES ('023366f3457511e8bcf1309c2315f9aa', 'hr', '人事', 'acfc0e9232f54732a5d9ffe9071bf572',
+		TO_DATE('2018-04-21 23:02:16', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "LEN"."SYS_ROLE"
+VALUES ('0ea934e5e55411e7b983201a068c6482', 'manage', '经理', 'acfc0e9232f54732a5d9ffe9071bf572',
+		TO_DATE('2017-12-20 15:04:44', 'YYYY-MM-DD HH24:MI:SS'), null,
+		TO_DATE('2018-01-02 11:41:43', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "LEN"."SYS_ROLE"
+VALUES ('2619a672e53811e7b983201a068c6482', 'admin', '管理员', 'acfc0e9232f54732a5d9ffe9071bf572',
+		TO_DATE('2017-12-20 11:44:57', 'YYYY-MM-DD HH24:MI:SS'), null,
+		TO_DATE('2018-01-02 11:38:37', 'YYYY-MM-DD HH24:MI:SS'));
+INSERT INTO "LEN"."SYS_ROLE"
+VALUES ('4bb891d8caf84cc6ba27e515e80ac40d', 'blogAdmin', '博客管理员', 'acfc0e9232f54732a5d9ffe9071bf572',
+		TO_DATE('2018-10-01 10:21:10', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "LEN"."SYS_ROLE"
+VALUES ('dcb0f642fe9611e7b472201a068c6482', 'dev', '开发', 'acfc0e9232f54732a5d9ffe9071bf572',
+		TO_DATE('2018-01-21 18:35:56', 'YYYY-MM-DD HH24:MI:SS'), null, null);
+INSERT INTO "LEN"."SYS_ROLE"
+VALUES ('e346e96368484c8fa7f217ce550a0186', 'DeputyManager', '副经理', 'acfc0e9232f54732a5d9ffe9071bf572',
+		TO_DATE('2018-06-14 23:21:36', 'YYYY-MM-DD HH24:MI:SS'), null, null);
 
 -- ----------------------------
 -- Table structure for SYS_ROLE_MENU
 -- ----------------------------
 DROP TABLE "LEN"."SYS_ROLE_MENU";
-CREATE TABLE "LEN"."SYS_ROLE_MENU" (
-"ROLE_ID" NVARCHAR2(32) NOT NULL ,
-"MENU_ID" NVARCHAR2(32) NOT NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."SYS_ROLE_MENU"
+(
+	"ROLE_ID" NVARCHAR2(32) NOT NULL,
+	"MENU_ID" NVARCHAR2(32) NOT NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
 -- Records of SYS_ROLE_MENU
 -- ----------------------------
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('023366f3457511e8bcf1309c2315f9aa', '433089a6eb0111e782d5201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('023366f3457511e8bcf1309c2315f9aa', '4d603831fe9b11e7b472201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('023366f3457511e8bcf1309c2315f9aa', 'b7839f59fe8811e7b472201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('023366f3457511e8bcf1309c2315f9aa', 'cfda8029dfb311e7b555201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('023366f3457511e8bcf1309c2315f9aa', 'cfe54921dfb311e7b555201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('023366f3457511e8bcf1309c2315f9aa', 'cfe54921dfb311e7b555201a068c6483');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('023366f3457511e8bcf1309c2315f9aa', 'e06da471f90311e780aa201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('023366f3457511e8bcf1309c2315f9aa', 'e3b11497eb9e11e7928d201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('023366f3457511e8bcf1309c2315f9aa', 'f23f6a6bf09511e78a57201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('0ea934e5e55411e7b983201a068c6482', '433089a6eb0111e782d5201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('0ea934e5e55411e7b983201a068c6482', '4d603831fe9b11e7b472201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('0ea934e5e55411e7b983201a068c6482', '6931fd22f09611e78a57201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('0ea934e5e55411e7b983201a068c6482', '6dc13c6eec5f11e7a472201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('0ea934e5e55411e7b983201a068c6482', 'a1ca6642ec5e11e7a472201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('0ea934e5e55411e7b983201a068c6482', 'b7839f59fe8811e7b472201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('0ea934e5e55411e7b983201a068c6482', 'cfda8029dfb311e7b555201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('0ea934e5e55411e7b983201a068c6482', 'cfe54921dfb311e7b555201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('0ea934e5e55411e7b983201a068c6482', 'e06da471f90311e780aa201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', '0e6c8d4cf09511e78a57201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', '18bf8d5df09511e78a57201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', '28661300f9d411e7a009201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', '2b56410cf09411e78a57201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', '3873ccc2dfda11e7b555201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', '433089a6eb0111e782d5201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', '4d603831fe9b11e7b472201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', '5ae3d4e9f38e11e7aca0201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', '6315968bf37111e7aca0201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', '63da4415fc6211e7a781201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', '6931fd22f09611e78a57201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', '69f3f59cf38e11e7aca0201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', '6dc13c6eec5f11e7a472201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', '788d8e34f38e11e7aca0201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', '7967e098ee0611e7a60d201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', '873f30b0f38e11e7aca0201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', '88b8e5d1f38911e7aca0201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', 'a1ca6642ec5e11e7a472201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', 'b441914cee0811e7a60d201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', 'b7839f59fe8811e7b472201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', 'cfda8029dfb311e7b555201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', 'cfe54921dfb311e7b555201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', 'cfe54921dfb311e7b555201a068c6483');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', 'cff61424dfb311e7b555201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', 'e06da471f90311e780aa201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', 'e3b11497eb9e11e7928d201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', 'e9a13e55f35911e7aca0201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', 'ecda560cf36f11e7aca0201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', 'f23f6a6bf09511e78a57201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('2619a672e53811e7b983201a068c6482', 'ff015ea5f09411e78a57201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('35f7934d335e4641b7887e4b3b1885a5', '18bf8d5df09511e78a57201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('35f7934d335e4641b7887e4b3b1885a5', '3873ccc2dfda11e7b555201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('35f7934d335e4641b7887e4b3b1885a5', 'cfda8029dfb311e7b555201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('a56219ffeb7d11e7928d201a068c6482', '433089a6eb0111e782d5201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('a56219ffeb7d11e7928d201a068c6482', 'cfda8029dfb311e7b555201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('a56219ffeb7d11e7928d201a068c6482', 'cfe54921dfb311e7b555201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('dcb0f642fe9611e7b472201a068c6482', '4d603831fe9b11e7b472201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('dcb0f642fe9611e7b472201a068c6482', '5ae3d4e9f38e11e7aca0201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('dcb0f642fe9611e7b472201a068c6482', '6315968bf37111e7aca0201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('dcb0f642fe9611e7b472201a068c6482', '69f3f59cf38e11e7aca0201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('dcb0f642fe9611e7b472201a068c6482', '788d8e34f38e11e7aca0201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('dcb0f642fe9611e7b472201a068c6482', '873f30b0f38e11e7aca0201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('dcb0f642fe9611e7b472201a068c6482', 'a1ca6642ec5e11e7a472201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('dcb0f642fe9611e7b472201a068c6482', 'b7839f59fe8811e7b472201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('dcb0f642fe9611e7b472201a068c6482', 'e06da471f90311e780aa201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('dcb0f642fe9611e7b472201a068c6482', 'e9a13e55f35911e7aca0201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('dcb0f642fe9611e7b472201a068c6482', 'ecda560cf36f11e7aca0201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('e346e96368484c8fa7f217ce550a0186', '4d603831fe9b11e7b472201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('e346e96368484c8fa7f217ce550a0186', 'b7839f59fe8811e7b472201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_MENU" VALUES ('e346e96368484c8fa7f217ce550a0186', 'e06da471f90311e780aa201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('023366f3457511e8bcf1309c2315f9aa', '433089a6eb0111e782d5201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('023366f3457511e8bcf1309c2315f9aa', '4d603831fe9b11e7b472201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('023366f3457511e8bcf1309c2315f9aa', 'b7839f59fe8811e7b472201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('023366f3457511e8bcf1309c2315f9aa', 'cfda8029dfb311e7b555201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('023366f3457511e8bcf1309c2315f9aa', 'cfe54921dfb311e7b555201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('023366f3457511e8bcf1309c2315f9aa', 'cfe54921dfb311e7b555201a068c6483');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('023366f3457511e8bcf1309c2315f9aa', 'e06da471f90311e780aa201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('023366f3457511e8bcf1309c2315f9aa', 'e3b11497eb9e11e7928d201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('023366f3457511e8bcf1309c2315f9aa', 'f23f6a6bf09511e78a57201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('0ea934e5e55411e7b983201a068c6482', '433089a6eb0111e782d5201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('0ea934e5e55411e7b983201a068c6482', '4d603831fe9b11e7b472201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('0ea934e5e55411e7b983201a068c6482', '6931fd22f09611e78a57201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('0ea934e5e55411e7b983201a068c6482', '6dc13c6eec5f11e7a472201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('0ea934e5e55411e7b983201a068c6482', 'a1ca6642ec5e11e7a472201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('0ea934e5e55411e7b983201a068c6482', 'b7839f59fe8811e7b472201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('0ea934e5e55411e7b983201a068c6482', 'cfda8029dfb311e7b555201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('0ea934e5e55411e7b983201a068c6482', 'cfe54921dfb311e7b555201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('0ea934e5e55411e7b983201a068c6482', 'e06da471f90311e780aa201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', '0e6c8d4cf09511e78a57201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', '18bf8d5df09511e78a57201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', '28661300f9d411e7a009201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', '2b56410cf09411e78a57201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', '3873ccc2dfda11e7b555201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', '433089a6eb0111e782d5201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', '4d603831fe9b11e7b472201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', '5ae3d4e9f38e11e7aca0201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', '6315968bf37111e7aca0201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', '63da4415fc6211e7a781201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', '6931fd22f09611e78a57201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', '69f3f59cf38e11e7aca0201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', '6dc13c6eec5f11e7a472201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', '788d8e34f38e11e7aca0201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', '7967e098ee0611e7a60d201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', '873f30b0f38e11e7aca0201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', '88b8e5d1f38911e7aca0201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', 'a1ca6642ec5e11e7a472201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', 'b441914cee0811e7a60d201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', 'b7839f59fe8811e7b472201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', 'cfda8029dfb311e7b555201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', 'cfe54921dfb311e7b555201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', 'cfe54921dfb311e7b555201a068c6483');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', 'cff61424dfb311e7b555201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', 'e06da471f90311e780aa201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', 'e3b11497eb9e11e7928d201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', 'e9a13e55f35911e7aca0201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', 'ecda560cf36f11e7aca0201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', 'f23f6a6bf09511e78a57201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('2619a672e53811e7b983201a068c6482', 'ff015ea5f09411e78a57201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('35f7934d335e4641b7887e4b3b1885a5', '18bf8d5df09511e78a57201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('35f7934d335e4641b7887e4b3b1885a5', '3873ccc2dfda11e7b555201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('35f7934d335e4641b7887e4b3b1885a5', 'cfda8029dfb311e7b555201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('a56219ffeb7d11e7928d201a068c6482', '433089a6eb0111e782d5201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('a56219ffeb7d11e7928d201a068c6482', 'cfda8029dfb311e7b555201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('a56219ffeb7d11e7928d201a068c6482', 'cfe54921dfb311e7b555201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('dcb0f642fe9611e7b472201a068c6482', '4d603831fe9b11e7b472201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('dcb0f642fe9611e7b472201a068c6482', '5ae3d4e9f38e11e7aca0201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('dcb0f642fe9611e7b472201a068c6482', '6315968bf37111e7aca0201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('dcb0f642fe9611e7b472201a068c6482', '69f3f59cf38e11e7aca0201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('dcb0f642fe9611e7b472201a068c6482', '788d8e34f38e11e7aca0201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('dcb0f642fe9611e7b472201a068c6482', '873f30b0f38e11e7aca0201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('dcb0f642fe9611e7b472201a068c6482', 'a1ca6642ec5e11e7a472201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('dcb0f642fe9611e7b472201a068c6482', 'b7839f59fe8811e7b472201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('dcb0f642fe9611e7b472201a068c6482', 'e06da471f90311e780aa201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('dcb0f642fe9611e7b472201a068c6482', 'e9a13e55f35911e7aca0201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('dcb0f642fe9611e7b472201a068c6482', 'ecda560cf36f11e7aca0201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('e346e96368484c8fa7f217ce550a0186', '4d603831fe9b11e7b472201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('e346e96368484c8fa7f217ce550a0186', 'b7839f59fe8811e7b472201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_MENU"
+VALUES ('e346e96368484c8fa7f217ce550a0186', 'e06da471f90311e780aa201a068c6482');
 
 -- ----------------------------
 -- Table structure for SYS_ROLE_USER
 -- ----------------------------
 DROP TABLE "LEN"."SYS_ROLE_USER";
-CREATE TABLE "LEN"."SYS_ROLE_USER" (
-"USER_ID" NVARCHAR2(32) NOT NULL ,
-"ROLE_ID" NVARCHAR2(32) NOT NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."SYS_ROLE_USER"
+(
+	"USER_ID" NVARCHAR2(32) NOT NULL,
+	"ROLE_ID" NVARCHAR2(32) NOT NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
 -- Records of SYS_ROLE_USER
 -- ----------------------------
-INSERT INTO "LEN"."SYS_ROLE_USER" VALUES ('1ec421975ffe45229b48d4b9d712ff4f', 'dcb0f642fe9611e7b472201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_USER" VALUES ('2211fec3e17c11e795ed201a068c6482', '0ea934e5e55411e7b983201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_USER" VALUES ('3c14c2f8316741e9aaeb29d78d03e958', 'dcb0f642fe9611e7b472201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_USER" VALUES ('a4a743bffe9711e7b472201a068c6482', '4bb891d8caf84cc6ba27e515e80ac40d');
-INSERT INTO "LEN"."SYS_ROLE_USER" VALUES ('a4a743bffe9711e7b472201a068c6482', 'dcb0f642fe9611e7b472201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_USER" VALUES ('acfc0e9232f54732a5d9ffe9071bf572', '2619a672e53811e7b983201a068c6482');
-INSERT INTO "LEN"."SYS_ROLE_USER" VALUES ('acfc0e9232f54732a5d9ffe9071bf572', '4bb891d8caf84cc6ba27e515e80ac40d');
-INSERT INTO "LEN"."SYS_ROLE_USER" VALUES ('d555ffd6b51f4df7a18e2ef4eece1bed', 'e346e96368484c8fa7f217ce550a0186');
-INSERT INTO "LEN"."SYS_ROLE_USER" VALUES ('fb483b76457811e8bcf1309c2315f9aa', '023366f3457511e8bcf1309c2315f9aa');
+INSERT INTO "LEN"."SYS_ROLE_USER"
+VALUES ('1ec421975ffe45229b48d4b9d712ff4f', 'dcb0f642fe9611e7b472201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_USER"
+VALUES ('2211fec3e17c11e795ed201a068c6482', '0ea934e5e55411e7b983201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_USER"
+VALUES ('3c14c2f8316741e9aaeb29d78d03e958', 'dcb0f642fe9611e7b472201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_USER"
+VALUES ('a4a743bffe9711e7b472201a068c6482', '4bb891d8caf84cc6ba27e515e80ac40d');
+INSERT INTO "LEN"."SYS_ROLE_USER"
+VALUES ('a4a743bffe9711e7b472201a068c6482', 'dcb0f642fe9611e7b472201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_USER"
+VALUES ('acfc0e9232f54732a5d9ffe9071bf572', '2619a672e53811e7b983201a068c6482');
+INSERT INTO "LEN"."SYS_ROLE_USER"
+VALUES ('acfc0e9232f54732a5d9ffe9071bf572', '4bb891d8caf84cc6ba27e515e80ac40d');
+INSERT INTO "LEN"."SYS_ROLE_USER"
+VALUES ('d555ffd6b51f4df7a18e2ef4eece1bed', 'e346e96368484c8fa7f217ce550a0186');
+INSERT INTO "LEN"."SYS_ROLE_USER"
+VALUES ('fb483b76457811e8bcf1309c2315f9aa', '023366f3457511e8bcf1309c2315f9aa');
 
 -- ----------------------------
 -- Table structure for SYS_USER
 -- ----------------------------
 DROP TABLE "LEN"."SYS_USER";
-CREATE TABLE "LEN"."SYS_USER" (
-"ID" NVARCHAR2(36) NOT NULL ,
-"USERNAME" NVARCHAR2(64) NOT NULL ,
-"PASSWORD" NVARCHAR2(128) NOT NULL ,
-"AGE" NUMBER(11) NULL ,
-"EMAIL" NVARCHAR2(128) NULL ,
-"PHOTO" NVARCHAR2(255) NULL ,
-"REAL_NAME" NVARCHAR2(18) NULL ,
-"CREATE_BY" NVARCHAR2(32) NULL ,
-"UPDATE_BY" NVARCHAR2(32) NULL ,
-"CREATE_DATE" DATE NULL ,
-"UPDATE_DATE" DATE NULL ,
-"DEL_FLAG" NUMBER(4) NOT NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."SYS_USER"
+(
+	"ID"          NVARCHAR2(36) NOT NULL,
+	"USERNAME"    NVARCHAR2(64) NOT NULL,
+	"PASSWORD"    NVARCHAR2(128) NOT NULL,
+	"AGE"         NUMBER(11) NULL,
+	"EMAIL"       NVARCHAR2(128) NULL,
+	"PHOTO"       NVARCHAR2(255) NULL,
+	"REAL_NAME"   NVARCHAR2(18) NULL,
+	"CREATE_BY"   NVARCHAR2(32) NULL,
+	"UPDATE_BY"   NVARCHAR2(32) NULL,
+	"CREATE_DATE" DATE NULL,
+	"UPDATE_DATE" DATE NULL,
+	"DEL_FLAG"    NUMBER(4) NOT NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
-COMMENT ON COLUMN "LEN"."SYS_USER"."DEL_FLAG" IS '0可用1封禁';
+COMMENT
+ON COLUMN "LEN"."SYS_USER"."DEL_FLAG" IS '0可用1封禁';
 
 -- ----------------------------
 -- Records of SYS_USER
 -- ----------------------------
-INSERT INTO "LEN"."SYS_USER" VALUES ('1ec421975ffe45229b48d4b9d712ff4f', '33333', '533add1dc96c02469d50ca0ffdcb493a', '26', null, null, '33', 'acfc0e9232f54732a5d9ffe9071bf572', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-08-20 23:52:47', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2018-12-11 22:57:16', 'YYYY-MM-DD HH24:MI:SS'), '0');
-INSERT INTO "LEN"."SYS_USER" VALUES ('2211fec3e17c11e795ed201a068c6482', 'tom', '11ac200620f90acd1fdae53716fd3de2', '41', 'lenospmiller@gmail.com', 'bd214483-7c5e-49d6-862d-de97e9de50b5.jpeg', 'Tom Curise', null, 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-03 15:49:48', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2018-06-19 21:15:49', 'YYYY-MM-DD HH24:MI:SS'), '0');
-INSERT INTO "LEN"."SYS_USER" VALUES ('2bf2d2db774247b99f27efb1dda29c34', '12', '123456', '10', '2345', null, '123', null, null, null, null, '0');
-INSERT INTO "LEN"."SYS_USER" VALUES ('3c14c2f8316741e9aaeb29d78d03e958', '22222', '2b8aae82f069cc838dfe8afc945f8045', '222', null, null, '222', 'acfc0e9232f54732a5d9ffe9071bf572', null, TO_DATE('2018-08-19 22:00:27', 'YYYY-MM-DD HH24:MI:SS'), null, '0');
-INSERT INTO "LEN"."SYS_USER" VALUES ('a4a743bffe9711e7b472201a068c6482', 'zxm', 'f8880ebbdbc37a936245657fa9084198', '25', '1544040976@qq.com', '662d5a3b-56aa-4bbb-bd47-194e24db1d60.jpeg', 'zxm', 'acfc0e9232f54732a5d9ffe9071bf572', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-21 18:41:32', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2019-02-17 15:09:41', 'YYYY-MM-DD HH24:MI:SS'), '0');
-INSERT INTO "LEN"."SYS_USER" VALUES ('acfc0e9232f54732a5d9ffe9071bf572', 'admin', 'e0b141de1c8091be350d3fc80de66528', '24', null, '2d4c37c3-c106-4288-9c0d-e7fe1b8adc72.jpeg', '管理员', null, 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2017-12-20 16:34:06', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2018-10-01 10:21:19', 'YYYY-MM-DD HH24:MI:SS'), '0');
-INSERT INTO "LEN"."SYS_USER" VALUES ('b50d049022124b04b73605caae5ecb3b', '12', '123456', '10', '2345', null, '123', null, null, null, null, '0');
-INSERT INTO "LEN"."SYS_USER" VALUES ('c7f1a7d7018311e8a1a2201a068c6482', '666', 'c6953f608430df414ea52e8c01b81a45', '24', null, null, '666', 'acfc0e9232f54732a5d9ffe9071bf572', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-25 11:56:54', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2018-06-14 23:18:51', 'YYYY-MM-DD HH24:MI:SS'), '1');
-INSERT INTO "LEN"."SYS_USER" VALUES ('d555ffd6b51f4df7a18e2ef4eece1bed', 'wangwu', 'b162011c014942eac61c478a7bfc386d', '25', null, null, '王五', 'acfc0e9232f54732a5d9ffe9071bf572', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-06-14 23:21:17', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2018-06-19 23:09:12', 'YYYY-MM-DD HH24:MI:SS'), '0');
-INSERT INTO "LEN"."SYS_USER" VALUES ('fb483b76457811e8bcf1309c2315f9aa', 'lisi', 'f497935e5f47325399d595ef31b25e47', '20', null, null, '李四', 'acfc0e9232f54732a5d9ffe9071bf572', 'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-04-21 23:30:43', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2018-06-14 23:21:50', 'YYYY-MM-DD HH24:MI:SS'), '0');
-INSERT INTO "LEN"."SYS_USER" VALUES ('fbb427b4e2764260a337f074744bc55a', '12', '123456', '10', '2345', null, '123', null, null, null, null, '0');
+INSERT INTO "LEN"."SYS_USER"
+VALUES ('1ec421975ffe45229b48d4b9d712ff4f', '33333', '533add1dc96c02469d50ca0ffdcb493a', '26', null, null, '33',
+		'acfc0e9232f54732a5d9ffe9071bf572', 'acfc0e9232f54732a5d9ffe9071bf572',
+		TO_DATE('2018-08-20 23:52:47', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2018-12-11 22:57:16', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "LEN"."SYS_USER"
+VALUES ('2211fec3e17c11e795ed201a068c6482', 'tom', '11ac200620f90acd1fdae53716fd3de2', '41', 'lenospmiller@gmail.com',
+		'bd214483-7c5e-49d6-862d-de97e9de50b5.jpeg', 'Tom Curise', null, 'acfc0e9232f54732a5d9ffe9071bf572',
+		TO_DATE('2018-01-03 15:49:48', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2018-06-19 21:15:49', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "LEN"."SYS_USER"
+VALUES ('2bf2d2db774247b99f27efb1dda29c34', '12', '123456', '10', '2345', null, '123', null, null, null, null, '0');
+INSERT INTO "LEN"."SYS_USER"
+VALUES ('3c14c2f8316741e9aaeb29d78d03e958', '22222', '2b8aae82f069cc838dfe8afc945f8045', '222', null, null, '222',
+		'acfc0e9232f54732a5d9ffe9071bf572', null, TO_DATE('2018-08-19 22:00:27', 'YYYY-MM-DD HH24:MI:SS'), null, '0');
+INSERT INTO "LEN"."SYS_USER"
+VALUES ('a4a743bffe9711e7b472201a068c6482', 'zxm', 'f8880ebbdbc37a936245657fa9084198', '25', '1544040976@qq.com',
+		'662d5a3b-56aa-4bbb-bd47-194e24db1d60.jpeg', 'zxm', 'acfc0e9232f54732a5d9ffe9071bf572',
+		'acfc0e9232f54732a5d9ffe9071bf572', TO_DATE('2018-01-21 18:41:32', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2019-02-17 15:09:41', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "LEN"."SYS_USER"
+VALUES ('acfc0e9232f54732a5d9ffe9071bf572', 'admin', 'e0b141de1c8091be350d3fc80de66528', '24', null,
+		'2d4c37c3-c106-4288-9c0d-e7fe1b8adc72.jpeg', '管理员', null, 'acfc0e9232f54732a5d9ffe9071bf572',
+		TO_DATE('2017-12-20 16:34:06', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2018-10-01 10:21:19', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "LEN"."SYS_USER"
+VALUES ('b50d049022124b04b73605caae5ecb3b', '12', '123456', '10', '2345', null, '123', null, null, null, null, '0');
+INSERT INTO "LEN"."SYS_USER"
+VALUES ('c7f1a7d7018311e8a1a2201a068c6482', '666', 'c6953f608430df414ea52e8c01b81a45', '24', null, null, '666',
+		'acfc0e9232f54732a5d9ffe9071bf572', 'acfc0e9232f54732a5d9ffe9071bf572',
+		TO_DATE('2018-01-25 11:56:54', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2018-06-14 23:18:51', 'YYYY-MM-DD HH24:MI:SS'), '1');
+INSERT INTO "LEN"."SYS_USER"
+VALUES ('d555ffd6b51f4df7a18e2ef4eece1bed', 'wangwu', 'b162011c014942eac61c478a7bfc386d', '25', null, null, '王五',
+		'acfc0e9232f54732a5d9ffe9071bf572', 'acfc0e9232f54732a5d9ffe9071bf572',
+		TO_DATE('2018-06-14 23:21:17', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2018-06-19 23:09:12', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "LEN"."SYS_USER"
+VALUES ('fb483b76457811e8bcf1309c2315f9aa', 'lisi', 'f497935e5f47325399d595ef31b25e47', '20', null, null, '李四',
+		'acfc0e9232f54732a5d9ffe9071bf572', 'acfc0e9232f54732a5d9ffe9071bf572',
+		TO_DATE('2018-04-21 23:30:43', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2018-06-14 23:21:50', 'YYYY-MM-DD HH24:MI:SS'), '0');
+INSERT INTO "LEN"."SYS_USER"
+VALUES ('fbb427b4e2764260a337f074744bc55a', '12', '123456', '10', '2345', null, '123', null, null, null, null, '0');
 
 -- ----------------------------
 -- Table structure for USER_LEAVE
 -- ----------------------------
 DROP TABLE "LEN"."USER_LEAVE";
-CREATE TABLE "LEN"."USER_LEAVE" (
-"ID" NVARCHAR2(32) NOT NULL ,
-"USER_ID" NVARCHAR2(32) NOT NULL ,
-"USER_NAME" NVARCHAR2(18) NULL ,
-"BEGIN_TIME" DATE NULL ,
-"END_TIME" DATE NULL ,
-"REASON" NVARCHAR2(255) NULL ,
-"DAYS" NUMBER(11) NULL ,
-"PROCESS_INSTANCE_ID" NVARCHAR2(32) NULL ,
-"STATUS" NVARCHAR2(64) NULL ,
-"CREATE_DATE" DATE NULL ,
-"CREATE_BY" NVARCHAR2(32) NULL ,
-"UPDATE_DATE" DATE NULL ,
-"UPDATE_BY" NVARCHAR2(32) NULL ,
-"TASK_NAME" NVARCHAR2(255) NULL ,
-"URLPATH" NVARCHAR2(255) NULL ,
-"SUBMITTIMES" NUMBER(11) NULL 
-)
-LOGGING
+CREATE TABLE "LEN"."USER_LEAVE"
+(
+	"ID"                  NVARCHAR2(32) NOT NULL,
+	"USER_ID"             NVARCHAR2(32) NOT NULL,
+	"USER_NAME"           NVARCHAR2(18) NULL,
+	"BEGIN_TIME"          DATE NULL,
+	"END_TIME"            DATE NULL,
+	"REASON"              NVARCHAR2(255) NULL,
+	"DAYS"                NUMBER(11) NULL,
+	"PROCESS_INSTANCE_ID" NVARCHAR2(32) NULL,
+	"STATUS"              NVARCHAR2(64) NULL,
+	"CREATE_DATE"         DATE NULL,
+	"CREATE_BY"           NVARCHAR2(32) NULL,
+	"UPDATE_DATE"         DATE NULL,
+	"UPDATE_BY"           NVARCHAR2(32) NULL,
+	"TASK_NAME"           NVARCHAR2(255) NULL,
+	"URLPATH"             NVARCHAR2(255) NULL,
+	"SUBMITTIMES"         NUMBER(11) NULL
+) LOGGING
 NOCOMPRESS
 NOCACHE
-
 ;
 
 -- ----------------------------
 -- Records of USER_LEAVE
 -- ----------------------------
-INSERT INTO "LEN"."USER_LEAVE" VALUES ('25e601c9ba9a43d38dcee96ef7ec2066', 'a4a743bffe9711e7b472201a068c6482', 'zxm', TO_DATE('2019-02-17 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2019-02-18 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '请假11111122', '3', '2617', null, null, null, null, null, null, '/leave/readOnlyLeave/25e601c9ba9a43d38dcee96ef7ec2066', '1');
-INSERT INTO "LEN"."USER_LEAVE" VALUES ('34ef7e4ff58044c6b6ed3d303968e2d4', 'a4a743bffe9711e7b472201a068c6482', 'zxm', TO_DATE('2019-02-17 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2019-02-18 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '请假1234', '3', '2641', null, null, null, null, null, null, '/leave/readOnlyLeave/34ef7e4ff58044c6b6ed3d303968e2d4', '1');
-INSERT INTO "LEN"."USER_LEAVE" VALUES ('4d5cc5e5bd5642569a4b0b9509597f11', 'a4a743bffe9711e7b472201a068c6482', 'zxm', TO_DATE('2019-02-17 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2019-02-18 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '请假1111', '3', '2678', null, null, null, null, null, null, '/leave/readOnlyLeave/4d5cc5e5bd5642569a4b0b9509597f11', '1');
-INSERT INTO "LEN"."USER_LEAVE" VALUES ('5da09b45283b4720b0026e41a318df56', 'a4a743bffe9711e7b472201a068c6482', 'zxm', TO_DATE('2019-02-17 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2019-02-18 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '请假11111', '3', '2589', null, null, null, null, null, null, '/leave/readOnlyLeave/5da09b45283b4720b0026e41a318df56', '1');
-INSERT INTO "LEN"."USER_LEAVE" VALUES ('870c3774dacb4640935824398bad686a', 'a4a743bffe9711e7b472201a068c6482', 'zxm', TO_DATE('2019-02-17 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2019-02-18 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '123', '3', '2665', null, null, null, null, null, null, '/leave/readOnlyLeave/870c3774dacb4640935824398bad686a', '1');
-INSERT INTO "LEN"."USER_LEAVE" VALUES ('89f445cbe3334a458a412691170d1e11', 'a4a743bffe9711e7b472201a068c6482', 'zxm', TO_DATE('2018-07-19 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2018-07-25 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '2222', '3', '277535', null, null, null, null, null, null, '/leave/readOnlyLeave/89f445cbe3334a458a412691170d1e11', '1');
-INSERT INTO "LEN"."USER_LEAVE" VALUES ('96d24b30e2c04c3b8da030dd2c066cc9', 'a4a743bffe9711e7b472201a068c6482', 'zxm', TO_DATE('2019-02-17 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2019-02-18 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '轻机枪111', '3', '2576', null, null, null, null, null, null, '/leave/readOnlyLeave/96d24b30e2c04c3b8da030dd2c066cc9', '1');
-INSERT INTO "LEN"."USER_LEAVE" VALUES ('b43d3d08bbb445ec9ba9ce10eac1985d', 'acfc0e9232f54732a5d9ffe9071bf572', 'admin', TO_DATE('2019-02-16 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2019-02-17 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '111', '3', '302501', null, null, null, null, null, null, '/leave/readOnlyLeave/b43d3d08bbb445ec9ba9ce10eac1985d', '1');
-INSERT INTO "LEN"."USER_LEAVE" VALUES ('be7055719798461d93c3aa635c309bdc', 'a4a743bffe9711e7b472201a068c6482', 'zxm', TO_DATE('2018-07-14 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2018-07-17 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '111', '3', '277505', null, null, null, null, null, null, '/leave/readOnlyLeave/be7055719798461d93c3aa635c309bdc', '1');
-INSERT INTO "LEN"."USER_LEAVE" VALUES ('caeae3400ee14e96a3b7c27359258111', 'a4a743bffe9711e7b472201a068c6482', 'zxm', TO_DATE('2019-02-17 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), TO_DATE('2019-02-19 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '阿斯蒂芬', '3', '2691', null, null, null, null, null, null, '/leave/readOnlyLeave/caeae3400ee14e96a3b7c27359258111', '1');
+INSERT INTO "LEN"."USER_LEAVE"
+VALUES ('25e601c9ba9a43d38dcee96ef7ec2066', 'a4a743bffe9711e7b472201a068c6482', 'zxm',
+		TO_DATE('2019-02-17 00:00:00', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2019-02-18 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '请假11111122', '3', '2617', null, null, null, null,
+		null, null, '/leave/readOnlyLeave/25e601c9ba9a43d38dcee96ef7ec2066', '1');
+INSERT INTO "LEN"."USER_LEAVE"
+VALUES ('34ef7e4ff58044c6b6ed3d303968e2d4', 'a4a743bffe9711e7b472201a068c6482', 'zxm',
+		TO_DATE('2019-02-17 00:00:00', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2019-02-18 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '请假1234', '3', '2641', null, null, null, null, null,
+		null, '/leave/readOnlyLeave/34ef7e4ff58044c6b6ed3d303968e2d4', '1');
+INSERT INTO "LEN"."USER_LEAVE"
+VALUES ('4d5cc5e5bd5642569a4b0b9509597f11', 'a4a743bffe9711e7b472201a068c6482', 'zxm',
+		TO_DATE('2019-02-17 00:00:00', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2019-02-18 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '请假1111', '3', '2678', null, null, null, null, null,
+		null, '/leave/readOnlyLeave/4d5cc5e5bd5642569a4b0b9509597f11', '1');
+INSERT INTO "LEN"."USER_LEAVE"
+VALUES ('5da09b45283b4720b0026e41a318df56', 'a4a743bffe9711e7b472201a068c6482', 'zxm',
+		TO_DATE('2019-02-17 00:00:00', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2019-02-18 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '请假11111', '3', '2589', null, null, null, null, null,
+		null, '/leave/readOnlyLeave/5da09b45283b4720b0026e41a318df56', '1');
+INSERT INTO "LEN"."USER_LEAVE"
+VALUES ('870c3774dacb4640935824398bad686a', 'a4a743bffe9711e7b472201a068c6482', 'zxm',
+		TO_DATE('2019-02-17 00:00:00', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2019-02-18 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '123', '3', '2665', null, null, null, null, null, null,
+		'/leave/readOnlyLeave/870c3774dacb4640935824398bad686a', '1');
+INSERT INTO "LEN"."USER_LEAVE"
+VALUES ('89f445cbe3334a458a412691170d1e11', 'a4a743bffe9711e7b472201a068c6482', 'zxm',
+		TO_DATE('2018-07-19 00:00:00', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2018-07-25 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '2222', '3', '277535', null, null, null, null, null,
+		null, '/leave/readOnlyLeave/89f445cbe3334a458a412691170d1e11', '1');
+INSERT INTO "LEN"."USER_LEAVE"
+VALUES ('96d24b30e2c04c3b8da030dd2c066cc9', 'a4a743bffe9711e7b472201a068c6482', 'zxm',
+		TO_DATE('2019-02-17 00:00:00', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2019-02-18 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '轻机枪111', '3', '2576', null, null, null, null, null,
+		null, '/leave/readOnlyLeave/96d24b30e2c04c3b8da030dd2c066cc9', '1');
+INSERT INTO "LEN"."USER_LEAVE"
+VALUES ('b43d3d08bbb445ec9ba9ce10eac1985d', 'acfc0e9232f54732a5d9ffe9071bf572', 'admin',
+		TO_DATE('2019-02-16 00:00:00', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2019-02-17 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '111', '3', '302501', null, null, null, null, null,
+		null, '/leave/readOnlyLeave/b43d3d08bbb445ec9ba9ce10eac1985d', '1');
+INSERT INTO "LEN"."USER_LEAVE"
+VALUES ('be7055719798461d93c3aa635c309bdc', 'a4a743bffe9711e7b472201a068c6482', 'zxm',
+		TO_DATE('2018-07-14 00:00:00', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2018-07-17 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '111', '3', '277505', null, null, null, null, null,
+		null, '/leave/readOnlyLeave/be7055719798461d93c3aa635c309bdc', '1');
+INSERT INTO "LEN"."USER_LEAVE"
+VALUES ('caeae3400ee14e96a3b7c27359258111', 'a4a743bffe9711e7b472201a068c6482', 'zxm',
+		TO_DATE('2019-02-17 00:00:00', 'YYYY-MM-DD HH24:MI:SS'),
+		TO_DATE('2019-02-19 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), '阿斯蒂芬', '3', '2691', null, null, null, null, null,
+		null, '/leave/readOnlyLeave/caeae3400ee14e96a3b7c27359258111', '1');
 
 -- ----------------------------
 -- Sequence structure for ACT_EVT_LOG_SEQ
 -- ----------------------------
 DROP SEQUENCE "LEN"."ACT_EVT_LOG_SEQ";
 CREATE SEQUENCE "LEN"."ACT_EVT_LOG_SEQ"
- INCREMENT BY 1
- MINVALUE 1
- MAXVALUE 9999999999999999999999999999
- START WITH 1
- CACHE 20;
+	INCREMENT BY 1
+	MINVALUE 1
+	MAXVALUE 9999999999999999999999999999
+	START WITH 1 CACHE 20;
 
 -- ----------------------------
 -- Indexes structure for table ACT_ASSIGNEE
@@ -1306,14 +1629,18 @@ CREATE SEQUENCE "LEN"."ACT_EVT_LOG_SEQ"
 -- ----------------------------
 -- Checks structure for table ACT_ASSIGNEE
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_ASSIGNEE" ADD CHECK ("ID" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_ASSIGNEE" ADD CHECK ("SID" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_ASSIGNEE" ADD CHECK ("ASSIGNEE_TYPE" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_ASSIGNEE"
+	ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_ASSIGNEE"
+	ADD CHECK ("SID" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_ASSIGNEE"
+	ADD CHECK ("ASSIGNEE_TYPE" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table ACT_ASSIGNEE
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_ASSIGNEE" ADD PRIMARY KEY ("ID");
+ALTER TABLE "LEN"."ACT_ASSIGNEE"
+	ADD PRIMARY KEY ("ID");
 
 -- ----------------------------
 -- Indexes structure for table ACT_EVT_LOG
@@ -1322,30 +1649,33 @@ ALTER TABLE "LEN"."ACT_ASSIGNEE" ADD PRIMARY KEY ("ID");
 -- ----------------------------
 -- Checks structure for table ACT_EVT_LOG
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_EVT_LOG" ADD CHECK ("TIME_STAMP_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_EVT_LOG"
+	ADD CHECK ("TIME_STAMP_" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table ACT_EVT_LOG
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_EVT_LOG" ADD PRIMARY KEY ("LOG_NR_");
+ALTER TABLE "LEN"."ACT_EVT_LOG"
+	ADD PRIMARY KEY ("LOG_NR_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_GE_BYTEARRAY
 -- ----------------------------
 CREATE INDEX "LEN"."ACT_IDX_BYTEAR_DEPL"
-ON "LEN"."ACT_GE_BYTEARRAY" ("DEPLOYMENT_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_GE_BYTEARRAY" ("DEPLOYMENT_ID_" ASC) LOGGING
 VISIBLE;
 
 -- ----------------------------
 -- Checks structure for table ACT_GE_BYTEARRAY
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_GE_BYTEARRAY" ADD CHECK (GENERATED_ IN (1,0));
+ALTER TABLE "LEN"."ACT_GE_BYTEARRAY"
+	ADD CHECK (GENERATED_ IN (1, 0));
 
 -- ----------------------------
 -- Primary Key structure for table ACT_GE_BYTEARRAY
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_GE_BYTEARRAY" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_GE_BYTEARRAY"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_GE_PROPERTY
@@ -1354,43 +1684,48 @@ ALTER TABLE "LEN"."ACT_GE_BYTEARRAY" ADD PRIMARY KEY ("ID_");
 -- ----------------------------
 -- Primary Key structure for table ACT_GE_PROPERTY
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_GE_PROPERTY" ADD PRIMARY KEY ("NAME_");
+ALTER TABLE "LEN"."ACT_GE_PROPERTY"
+	ADD PRIMARY KEY ("NAME_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_HI_ACTINST
 -- ----------------------------
 CREATE INDEX "LEN"."ACT_IDX_HI_ACT_INST_END"
-ON "LEN"."ACT_HI_ACTINST" ("END_TIME_" ASC)
-LOGGING
+	ON "LEN"."ACT_HI_ACTINST" ("END_TIME_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_HI_ACT_INST_EXEC"
-ON "LEN"."ACT_HI_ACTINST" ("EXECUTION_ID_" ASC, "ACT_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_HI_ACTINST" ("EXECUTION_ID_" ASC, "ACT_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_HI_ACT_INST_PROCINST"
-ON "LEN"."ACT_HI_ACTINST" ("PROC_INST_ID_" ASC, "ACT_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_HI_ACTINST" ("PROC_INST_ID_" ASC, "ACT_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_HI_ACT_INST_START"
-ON "LEN"."ACT_HI_ACTINST" ("START_TIME_" ASC)
-LOGGING
+	ON "LEN"."ACT_HI_ACTINST" ("START_TIME_" ASC) LOGGING
 VISIBLE;
 
 -- ----------------------------
 -- Checks structure for table ACT_HI_ACTINST
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_HI_ACTINST" ADD CHECK ("ID_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_HI_ACTINST" ADD CHECK ("PROC_DEF_ID_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_HI_ACTINST" ADD CHECK ("PROC_INST_ID_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_HI_ACTINST" ADD CHECK ("EXECUTION_ID_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_HI_ACTINST" ADD CHECK ("ACT_ID_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_HI_ACTINST" ADD CHECK ("ACT_TYPE_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_HI_ACTINST" ADD CHECK ("START_TIME_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_ACTINST"
+	ADD CHECK ("ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_ACTINST"
+	ADD CHECK ("PROC_DEF_ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_ACTINST"
+	ADD CHECK ("PROC_INST_ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_ACTINST"
+	ADD CHECK ("EXECUTION_ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_ACTINST"
+	ADD CHECK ("ACT_ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_ACTINST"
+	ADD CHECK ("ACT_TYPE_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_ACTINST"
+	ADD CHECK ("START_TIME_" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table ACT_HI_ACTINST
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_HI_ACTINST" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_HI_ACTINST"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_HI_ATTACHMENT
@@ -1399,12 +1734,14 @@ ALTER TABLE "LEN"."ACT_HI_ACTINST" ADD PRIMARY KEY ("ID_");
 -- ----------------------------
 -- Checks structure for table ACT_HI_ATTACHMENT
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_HI_ATTACHMENT" ADD CHECK ("ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_ATTACHMENT"
+	ADD CHECK ("ID_" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table ACT_HI_ATTACHMENT
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_HI_ATTACHMENT" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_HI_ATTACHMENT"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_HI_COMMENT
@@ -1413,147 +1750,154 @@ ALTER TABLE "LEN"."ACT_HI_ATTACHMENT" ADD PRIMARY KEY ("ID_");
 -- ----------------------------
 -- Checks structure for table ACT_HI_COMMENT
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_HI_COMMENT" ADD CHECK ("ID_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_HI_COMMENT" ADD CHECK ("TIME_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_COMMENT"
+	ADD CHECK ("ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_COMMENT"
+	ADD CHECK ("TIME_" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table ACT_HI_COMMENT
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_HI_COMMENT" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_HI_COMMENT"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_HI_DETAIL
 -- ----------------------------
 CREATE INDEX "LEN"."ACT_IDX_HI_DETAIL_ACT_INST"
-ON "LEN"."ACT_HI_DETAIL" ("ACT_INST_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_HI_DETAIL" ("ACT_INST_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_HI_DETAIL_NAME"
-ON "LEN"."ACT_HI_DETAIL" ("NAME_" ASC)
-LOGGING
+	ON "LEN"."ACT_HI_DETAIL" ("NAME_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_HI_DETAIL_PROC_INST"
-ON "LEN"."ACT_HI_DETAIL" ("PROC_INST_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_HI_DETAIL" ("PROC_INST_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_HI_DETAIL_TASK_ID"
-ON "LEN"."ACT_HI_DETAIL" ("TASK_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_HI_DETAIL" ("TASK_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_HI_DETAIL_TIME"
-ON "LEN"."ACT_HI_DETAIL" ("TIME_" ASC)
-LOGGING
+	ON "LEN"."ACT_HI_DETAIL" ("TIME_" ASC) LOGGING
 VISIBLE;
 
 -- ----------------------------
 -- Checks structure for table ACT_HI_DETAIL
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_HI_DETAIL" ADD CHECK ("ID_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_HI_DETAIL" ADD CHECK ("TYPE_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_HI_DETAIL" ADD CHECK ("NAME_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_HI_DETAIL" ADD CHECK ("TIME_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_DETAIL"
+	ADD CHECK ("ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_DETAIL"
+	ADD CHECK ("TYPE_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_DETAIL"
+	ADD CHECK ("NAME_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_DETAIL"
+	ADD CHECK ("TIME_" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table ACT_HI_DETAIL
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_HI_DETAIL" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_HI_DETAIL"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_HI_IDENTITYLINK
 -- ----------------------------
 CREATE INDEX "LEN"."ACT_IDX_HI_IDENT_LNK_PROCINST"
-ON "LEN"."ACT_HI_IDENTITYLINK" ("PROC_INST_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_HI_IDENTITYLINK" ("PROC_INST_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_HI_IDENT_LNK_TASK"
-ON "LEN"."ACT_HI_IDENTITYLINK" ("TASK_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_HI_IDENTITYLINK" ("TASK_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_HI_IDENT_LNK_USER"
-ON "LEN"."ACT_HI_IDENTITYLINK" ("USER_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_HI_IDENTITYLINK" ("USER_ID_" ASC) LOGGING
 VISIBLE;
 
 -- ----------------------------
 -- Primary Key structure for table ACT_HI_IDENTITYLINK
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_HI_IDENTITYLINK" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_HI_IDENTITYLINK"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_HI_PROCINST
 -- ----------------------------
 CREATE INDEX "LEN"."ACT_IDX_HI_PRO_INST_END"
-ON "LEN"."ACT_HI_PROCINST" ("END_TIME_" ASC)
-LOGGING
+	ON "LEN"."ACT_HI_PROCINST" ("END_TIME_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_HI_PRO_I_BUSKEY"
-ON "LEN"."ACT_HI_PROCINST" ("BUSINESS_KEY_" ASC)
-LOGGING
+	ON "LEN"."ACT_HI_PROCINST" ("BUSINESS_KEY_" ASC) LOGGING
 VISIBLE;
 
 -- ----------------------------
 -- Uniques structure for table ACT_HI_PROCINST
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_HI_PROCINST" ADD UNIQUE ("PROC_INST_ID_");
+ALTER TABLE "LEN"."ACT_HI_PROCINST"
+	ADD UNIQUE ("PROC_INST_ID_");
 
 -- ----------------------------
 -- Checks structure for table ACT_HI_PROCINST
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_HI_PROCINST" ADD CHECK ("ID_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_HI_PROCINST" ADD CHECK ("PROC_INST_ID_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_HI_PROCINST" ADD CHECK ("PROC_DEF_ID_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_HI_PROCINST" ADD CHECK ("START_TIME_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_PROCINST"
+	ADD CHECK ("ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_PROCINST"
+	ADD CHECK ("PROC_INST_ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_PROCINST"
+	ADD CHECK ("PROC_DEF_ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_PROCINST"
+	ADD CHECK ("START_TIME_" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table ACT_HI_PROCINST
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_HI_PROCINST" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_HI_PROCINST"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_HI_TASKINST
 -- ----------------------------
 CREATE INDEX "LEN"."ACT_IDX_HI_TASK_INST_PROCINST"
-ON "LEN"."ACT_HI_TASKINST" ("PROC_INST_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_HI_TASKINST" ("PROC_INST_ID_" ASC) LOGGING
 VISIBLE;
 
 -- ----------------------------
 -- Checks structure for table ACT_HI_TASKINST
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_HI_TASKINST" ADD CHECK ("ID_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_HI_TASKINST" ADD CHECK ("START_TIME_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_TASKINST"
+	ADD CHECK ("ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_TASKINST"
+	ADD CHECK ("START_TIME_" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table ACT_HI_TASKINST
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_HI_TASKINST" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_HI_TASKINST"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_HI_VARINST
 -- ----------------------------
 CREATE INDEX "LEN"."ACT_IDX_HI_PROCVAR_NAME_TYPE"
-ON "LEN"."ACT_HI_VARINST" ("NAME_" ASC, "VAR_TYPE_" ASC)
-LOGGING
+	ON "LEN"."ACT_HI_VARINST" ("NAME_" ASC, "VAR_TYPE_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_HI_PROCVAR_PROC_INST"
-ON "LEN"."ACT_HI_VARINST" ("PROC_INST_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_HI_VARINST" ("PROC_INST_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_HI_PROCVAR_TASK_ID"
-ON "LEN"."ACT_HI_VARINST" ("TASK_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_HI_VARINST" ("TASK_ID_" ASC) LOGGING
 VISIBLE;
 
 -- ----------------------------
 -- Checks structure for table ACT_HI_VARINST
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_HI_VARINST" ADD CHECK ("ID_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_HI_VARINST" ADD CHECK ("NAME_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_VARINST"
+	ADD CHECK ("ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_HI_VARINST"
+	ADD CHECK ("NAME_" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table ACT_HI_VARINST
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_HI_VARINST" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_HI_VARINST"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_ID_GROUP
@@ -1562,7 +1906,8 @@ ALTER TABLE "LEN"."ACT_HI_VARINST" ADD PRIMARY KEY ("ID_");
 -- ----------------------------
 -- Primary Key structure for table ACT_ID_GROUP
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_ID_GROUP" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_ID_GROUP"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_ID_INFO
@@ -1571,24 +1916,24 @@ ALTER TABLE "LEN"."ACT_ID_GROUP" ADD PRIMARY KEY ("ID_");
 -- ----------------------------
 -- Primary Key structure for table ACT_ID_INFO
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_ID_INFO" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_ID_INFO"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_ID_MEMBERSHIP
 -- ----------------------------
 CREATE INDEX "LEN"."ACT_IDX_MEMB_GROUP"
-ON "LEN"."ACT_ID_MEMBERSHIP" ("GROUP_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_ID_MEMBERSHIP" ("GROUP_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_MEMB_USER"
-ON "LEN"."ACT_ID_MEMBERSHIP" ("USER_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_ID_MEMBERSHIP" ("USER_ID_" ASC) LOGGING
 VISIBLE;
 
 -- ----------------------------
 -- Primary Key structure for table ACT_ID_MEMBERSHIP
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_ID_MEMBERSHIP" ADD PRIMARY KEY ("USER_ID_", "GROUP_ID_");
+ALTER TABLE "LEN"."ACT_ID_MEMBERSHIP"
+	ADD PRIMARY KEY ("USER_ID_", "GROUP_ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_ID_USER
@@ -1597,35 +1942,38 @@ ALTER TABLE "LEN"."ACT_ID_MEMBERSHIP" ADD PRIMARY KEY ("USER_ID_", "GROUP_ID_");
 -- ----------------------------
 -- Primary Key structure for table ACT_ID_USER
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_ID_USER" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_ID_USER"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_PROCDEF_INFO
 -- ----------------------------
 CREATE INDEX "LEN"."ACT_IDX_PROCDEF_INFO_JSON"
-ON "LEN"."ACT_PROCDEF_INFO" ("INFO_JSON_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_PROCDEF_INFO" ("INFO_JSON_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_PROCDEF_INFO_PROC"
-ON "LEN"."ACT_PROCDEF_INFO" ("PROC_DEF_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_PROCDEF_INFO" ("PROC_DEF_ID_" ASC) LOGGING
 VISIBLE;
 
 -- ----------------------------
 -- Uniques structure for table ACT_PROCDEF_INFO
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_PROCDEF_INFO" ADD UNIQUE ("PROC_DEF_ID_");
+ALTER TABLE "LEN"."ACT_PROCDEF_INFO"
+	ADD UNIQUE ("PROC_DEF_ID_");
 
 -- ----------------------------
 -- Checks structure for table ACT_PROCDEF_INFO
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_PROCDEF_INFO" ADD CHECK ("ID_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_PROCDEF_INFO" ADD CHECK ("PROC_DEF_ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_PROCDEF_INFO"
+	ADD CHECK ("ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_PROCDEF_INFO"
+	ADD CHECK ("PROC_DEF_ID_" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table ACT_PROCDEF_INFO
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_PROCDEF_INFO" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_PROCDEF_INFO"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_RE_DEPLOYMENT
@@ -1634,33 +1982,33 @@ ALTER TABLE "LEN"."ACT_PROCDEF_INFO" ADD PRIMARY KEY ("ID_");
 -- ----------------------------
 -- Primary Key structure for table ACT_RE_DEPLOYMENT
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RE_DEPLOYMENT" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_RE_DEPLOYMENT"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_RE_MODEL
 -- ----------------------------
 CREATE INDEX "LEN"."ACT_IDX_MODEL_DEPLOYMENT"
-ON "LEN"."ACT_RE_MODEL" ("DEPLOYMENT_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RE_MODEL" ("DEPLOYMENT_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_MODEL_SOURCE"
-ON "LEN"."ACT_RE_MODEL" ("EDITOR_SOURCE_VALUE_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RE_MODEL" ("EDITOR_SOURCE_VALUE_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_MODEL_SOURCE_EXTRA"
-ON "LEN"."ACT_RE_MODEL" ("EDITOR_SOURCE_EXTRA_VALUE_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RE_MODEL" ("EDITOR_SOURCE_EXTRA_VALUE_ID_" ASC) LOGGING
 VISIBLE;
 
 -- ----------------------------
 -- Checks structure for table ACT_RE_MODEL
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RE_MODEL" ADD CHECK ("ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_RE_MODEL"
+	ADD CHECK ("ID_" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table ACT_RE_MODEL
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RE_MODEL" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_RE_MODEL"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_RE_PROCDEF
@@ -1669,199 +2017,211 @@ ALTER TABLE "LEN"."ACT_RE_MODEL" ADD PRIMARY KEY ("ID_");
 -- ----------------------------
 -- Uniques structure for table ACT_RE_PROCDEF
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RE_PROCDEF" ADD UNIQUE ("KEY_", "VERSION_", "TENANT_ID_");
+ALTER TABLE "LEN"."ACT_RE_PROCDEF"
+	ADD UNIQUE ("KEY_", "VERSION_", "TENANT_ID_");
 
 -- ----------------------------
 -- Checks structure for table ACT_RE_PROCDEF
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RE_PROCDEF" ADD CHECK ("ID_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_RE_PROCDEF" ADD CHECK ("KEY_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_RE_PROCDEF" ADD CHECK ("VERSION_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_RE_PROCDEF" ADD CHECK (HAS_START_FORM_KEY_ IN (1,0));
-ALTER TABLE "LEN"."ACT_RE_PROCDEF" ADD CHECK (HAS_GRAPHICAL_NOTATION_ IN (1,0));
+ALTER TABLE "LEN"."ACT_RE_PROCDEF"
+	ADD CHECK ("ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_RE_PROCDEF"
+	ADD CHECK ("KEY_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_RE_PROCDEF"
+	ADD CHECK ("VERSION_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_RE_PROCDEF"
+	ADD CHECK (HAS_START_FORM_KEY_ IN (1, 0));
+ALTER TABLE "LEN"."ACT_RE_PROCDEF"
+	ADD CHECK (HAS_GRAPHICAL_NOTATION_ IN (1, 0));
 
 -- ----------------------------
 -- Primary Key structure for table ACT_RE_PROCDEF
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RE_PROCDEF" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_RE_PROCDEF"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_RU_EVENT_SUBSCR
 -- ----------------------------
 CREATE INDEX "LEN"."ACT_IDX_EVENT_SUBSCR"
-ON "LEN"."ACT_RU_EVENT_SUBSCR" ("EXECUTION_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_EVENT_SUBSCR" ("EXECUTION_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_EVENT_SUBSCR_CONFIG_"
-ON "LEN"."ACT_RU_EVENT_SUBSCR" ("CONFIGURATION_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_EVENT_SUBSCR" ("CONFIGURATION_" ASC) LOGGING
 VISIBLE;
 
 -- ----------------------------
 -- Checks structure for table ACT_RU_EVENT_SUBSCR
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RU_EVENT_SUBSCR" ADD CHECK ("ID_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_RU_EVENT_SUBSCR" ADD CHECK ("EVENT_TYPE_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_RU_EVENT_SUBSCR" ADD CHECK ("CREATED_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_RU_EVENT_SUBSCR"
+	ADD CHECK ("ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_RU_EVENT_SUBSCR"
+	ADD CHECK ("EVENT_TYPE_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_RU_EVENT_SUBSCR"
+	ADD CHECK ("CREATED_" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table ACT_RU_EVENT_SUBSCR
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RU_EVENT_SUBSCR" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_RU_EVENT_SUBSCR"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_RU_EXECUTION
 -- ----------------------------
 CREATE INDEX "LEN"."ACT_IDX_EXEC_BUSKEY"
-ON "LEN"."ACT_RU_EXECUTION" ("BUSINESS_KEY_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_EXECUTION" ("BUSINESS_KEY_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_EXE_PARENT"
-ON "LEN"."ACT_RU_EXECUTION" ("PARENT_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_EXECUTION" ("PARENT_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_EXE_PROCDEF"
-ON "LEN"."ACT_RU_EXECUTION" ("PROC_DEF_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_EXECUTION" ("PROC_DEF_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_EXE_PROCINST"
-ON "LEN"."ACT_RU_EXECUTION" ("PROC_INST_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_EXECUTION" ("PROC_INST_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_EXE_SUPER"
-ON "LEN"."ACT_RU_EXECUTION" ("SUPER_EXEC_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_EXECUTION" ("SUPER_EXEC_" ASC) LOGGING
 VISIBLE;
 
 -- ----------------------------
 -- Checks structure for table ACT_RU_EXECUTION
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RU_EXECUTION" ADD CHECK (IS_ACTIVE_ IN (1,0));
-ALTER TABLE "LEN"."ACT_RU_EXECUTION" ADD CHECK (IS_CONCURRENT_ IN (1,0));
-ALTER TABLE "LEN"."ACT_RU_EXECUTION" ADD CHECK (IS_SCOPE_ IN (1,0));
-ALTER TABLE "LEN"."ACT_RU_EXECUTION" ADD CHECK (IS_EVENT_SCOPE_ IN (1,0));
+ALTER TABLE "LEN"."ACT_RU_EXECUTION"
+	ADD CHECK (IS_ACTIVE_ IN (1, 0));
+ALTER TABLE "LEN"."ACT_RU_EXECUTION"
+	ADD CHECK (IS_CONCURRENT_ IN (1, 0));
+ALTER TABLE "LEN"."ACT_RU_EXECUTION"
+	ADD CHECK (IS_SCOPE_ IN (1, 0));
+ALTER TABLE "LEN"."ACT_RU_EXECUTION"
+	ADD CHECK (IS_EVENT_SCOPE_ IN (1, 0));
 
 -- ----------------------------
 -- Primary Key structure for table ACT_RU_EXECUTION
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RU_EXECUTION" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_RU_EXECUTION"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_RU_IDENTITYLINK
 -- ----------------------------
 CREATE INDEX "LEN"."ACT_IDX_ATHRZ_PROCEDEF"
-ON "LEN"."ACT_RU_IDENTITYLINK" ("PROC_DEF_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_IDENTITYLINK" ("PROC_DEF_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_IDENT_LNK_GROUP"
-ON "LEN"."ACT_RU_IDENTITYLINK" ("GROUP_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_IDENTITYLINK" ("GROUP_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_IDENT_LNK_USER"
-ON "LEN"."ACT_RU_IDENTITYLINK" ("USER_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_IDENTITYLINK" ("USER_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_IDL_PROCINST"
-ON "LEN"."ACT_RU_IDENTITYLINK" ("PROC_INST_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_IDENTITYLINK" ("PROC_INST_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_TSKASS_TASK"
-ON "LEN"."ACT_RU_IDENTITYLINK" ("TASK_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_IDENTITYLINK" ("TASK_ID_" ASC) LOGGING
 VISIBLE;
 
 -- ----------------------------
 -- Primary Key structure for table ACT_RU_IDENTITYLINK
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RU_IDENTITYLINK" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_RU_IDENTITYLINK"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_RU_JOB
 -- ----------------------------
 CREATE INDEX "LEN"."ACT_IDX_JOB_EXCEPTION"
-ON "LEN"."ACT_RU_JOB" ("EXCEPTION_STACK_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_JOB" ("EXCEPTION_STACK_ID_" ASC) LOGGING
 VISIBLE;
 
 -- ----------------------------
 -- Checks structure for table ACT_RU_JOB
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RU_JOB" ADD CHECK ("ID_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_RU_JOB" ADD CHECK ("TYPE_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_RU_JOB" ADD CHECK (EXCLUSIVE_ IN (1,0));
+ALTER TABLE "LEN"."ACT_RU_JOB"
+	ADD CHECK ("ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_RU_JOB"
+	ADD CHECK ("TYPE_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_RU_JOB"
+	ADD CHECK (EXCLUSIVE_ IN (1, 0));
 
 -- ----------------------------
 -- Primary Key structure for table ACT_RU_JOB
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RU_JOB" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_RU_JOB"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_RU_TASK
 -- ----------------------------
 CREATE INDEX "LEN"."ACT_IDX_TASK_CREATE"
-ON "LEN"."ACT_RU_TASK" ("CREATE_TIME_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_TASK" ("CREATE_TIME_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_TASK_EXEC"
-ON "LEN"."ACT_RU_TASK" ("EXECUTION_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_TASK" ("EXECUTION_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_TASK_PROCDEF"
-ON "LEN"."ACT_RU_TASK" ("PROC_DEF_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_TASK" ("PROC_DEF_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_TASK_PROCINST"
-ON "LEN"."ACT_RU_TASK" ("PROC_INST_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_TASK" ("PROC_INST_ID_" ASC) LOGGING
 VISIBLE;
 
 -- ----------------------------
 -- Primary Key structure for table ACT_RU_TASK
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RU_TASK" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_RU_TASK"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Indexes structure for table ACT_RU_VARIABLE
 -- ----------------------------
 CREATE INDEX "LEN"."ACT_IDX_VARIABLE_TASK_ID"
-ON "LEN"."ACT_RU_VARIABLE" ("TASK_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_VARIABLE" ("TASK_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_VAR_BYTEARRAY"
-ON "LEN"."ACT_RU_VARIABLE" ("BYTEARRAY_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_VARIABLE" ("BYTEARRAY_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_VAR_EXE"
-ON "LEN"."ACT_RU_VARIABLE" ("EXECUTION_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_VARIABLE" ("EXECUTION_ID_" ASC) LOGGING
 VISIBLE;
 CREATE INDEX "LEN"."ACT_IDX_VAR_PROCINST"
-ON "LEN"."ACT_RU_VARIABLE" ("PROC_INST_ID_" ASC)
-LOGGING
+	ON "LEN"."ACT_RU_VARIABLE" ("PROC_INST_ID_" ASC) LOGGING
 VISIBLE;
 
 -- ----------------------------
 -- Checks structure for table ACT_RU_VARIABLE
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RU_VARIABLE" ADD CHECK ("ID_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_RU_VARIABLE" ADD CHECK ("TYPE_" IS NOT NULL);
-ALTER TABLE "LEN"."ACT_RU_VARIABLE" ADD CHECK ("NAME_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_RU_VARIABLE"
+	ADD CHECK ("ID_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_RU_VARIABLE"
+	ADD CHECK ("TYPE_" IS NOT NULL);
+ALTER TABLE "LEN"."ACT_RU_VARIABLE"
+	ADD CHECK ("NAME_" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table ACT_RU_VARIABLE
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RU_VARIABLE" ADD PRIMARY KEY ("ID_");
+ALTER TABLE "LEN"."ACT_RU_VARIABLE"
+	ADD PRIMARY KEY ("ID_");
 
 -- ----------------------------
 -- Checks structure for table BLOG_ARTICLE
 -- ----------------------------
-ALTER TABLE "LEN"."BLOG_ARTICLE" ADD CHECK ("ID" IS NOT NULL);
-ALTER TABLE "LEN"."BLOG_ARTICLE" ADD CHECK ("CODE" IS NOT NULL);
-ALTER TABLE "LEN"."BLOG_ARTICLE" ADD CHECK ("TITLE" IS NOT NULL);
-ALTER TABLE "LEN"."BLOG_ARTICLE" ADD CHECK ("CONTENT" IS NOT NULL);
-ALTER TABLE "LEN"."BLOG_ARTICLE" ADD CHECK ("READ_NUMBER" IS NOT NULL);
-ALTER TABLE "LEN"."BLOG_ARTICLE" ADD CHECK ("CREATE_BY" IS NOT NULL);
-ALTER TABLE "LEN"."BLOG_ARTICLE" ADD CHECK ("DEL_FLAG" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_ARTICLE"
+	ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_ARTICLE"
+	ADD CHECK ("CODE" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_ARTICLE"
+	ADD CHECK ("TITLE" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_ARTICLE"
+	ADD CHECK ("CONTENT" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_ARTICLE"
+	ADD CHECK ("READ_NUMBER" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_ARTICLE"
+	ADD CHECK ("CREATE_BY" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_ARTICLE"
+	ADD CHECK ("DEL_FLAG" IS NOT NULL);
 
 -- ----------------------------
 -- Indexes structure for table BLOG_ARTICLE_CATEGORY
@@ -1870,14 +2230,18 @@ ALTER TABLE "LEN"."BLOG_ARTICLE" ADD CHECK ("DEL_FLAG" IS NOT NULL);
 -- ----------------------------
 -- Checks structure for table BLOG_ARTICLE_CATEGORY
 -- ----------------------------
-ALTER TABLE "LEN"."BLOG_ARTICLE_CATEGORY" ADD CHECK ("ID" IS NOT NULL);
-ALTER TABLE "LEN"."BLOG_ARTICLE_CATEGORY" ADD CHECK ("ARTICLE_ID" IS NOT NULL);
-ALTER TABLE "LEN"."BLOG_ARTICLE_CATEGORY" ADD CHECK ("CATEGORY_ID" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_ARTICLE_CATEGORY"
+	ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_ARTICLE_CATEGORY"
+	ADD CHECK ("ARTICLE_ID" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_ARTICLE_CATEGORY"
+	ADD CHECK ("CATEGORY_ID" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table BLOG_ARTICLE_CATEGORY
 -- ----------------------------
-ALTER TABLE "LEN"."BLOG_ARTICLE_CATEGORY" ADD PRIMARY KEY ("ID");
+ALTER TABLE "LEN"."BLOG_ARTICLE_CATEGORY"
+	ADD PRIMARY KEY ("ID");
 
 -- ----------------------------
 -- Indexes structure for table BLOG_ARTICLE_TAG
@@ -1886,13 +2250,16 @@ ALTER TABLE "LEN"."BLOG_ARTICLE_CATEGORY" ADD PRIMARY KEY ("ID");
 -- ----------------------------
 -- Checks structure for table BLOG_ARTICLE_TAG
 -- ----------------------------
-ALTER TABLE "LEN"."BLOG_ARTICLE_TAG" ADD CHECK ("ARTICLE_ID" IS NOT NULL);
-ALTER TABLE "LEN"."BLOG_ARTICLE_TAG" ADD CHECK ("TAG_ID" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_ARTICLE_TAG"
+	ADD CHECK ("ARTICLE_ID" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_ARTICLE_TAG"
+	ADD CHECK ("TAG_ID" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table BLOG_ARTICLE_TAG
 -- ----------------------------
-ALTER TABLE "LEN"."BLOG_ARTICLE_TAG" ADD PRIMARY KEY ("ARTICLE_ID", "TAG_ID");
+ALTER TABLE "LEN"."BLOG_ARTICLE_TAG"
+	ADD PRIMARY KEY ("ARTICLE_ID", "TAG_ID");
 
 -- ----------------------------
 -- Indexes structure for table BLOG_CATEGORY
@@ -1901,16 +2268,22 @@ ALTER TABLE "LEN"."BLOG_ARTICLE_TAG" ADD PRIMARY KEY ("ARTICLE_ID", "TAG_ID");
 -- ----------------------------
 -- Checks structure for table BLOG_CATEGORY
 -- ----------------------------
-ALTER TABLE "LEN"."BLOG_CATEGORY" ADD CHECK ("ID" IS NOT NULL);
-ALTER TABLE "LEN"."BLOG_CATEGORY" ADD CHECK ("SEQUENCE" IS NOT NULL);
-ALTER TABLE "LEN"."BLOG_CATEGORY" ADD CHECK ("CODE" IS NOT NULL);
-ALTER TABLE "LEN"."BLOG_CATEGORY" ADD CHECK ("NAME" IS NOT NULL);
-ALTER TABLE "LEN"."BLOG_CATEGORY" ADD CHECK ("PARENT_ID" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_CATEGORY"
+	ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_CATEGORY"
+	ADD CHECK ("SEQUENCE" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_CATEGORY"
+	ADD CHECK ("CODE" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_CATEGORY"
+	ADD CHECK ("NAME" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_CATEGORY"
+	ADD CHECK ("PARENT_ID" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table BLOG_CATEGORY
 -- ----------------------------
-ALTER TABLE "LEN"."BLOG_CATEGORY" ADD PRIMARY KEY ("ID");
+ALTER TABLE "LEN"."BLOG_CATEGORY"
+	ADD PRIMARY KEY ("ID");
 
 -- ----------------------------
 -- Indexes structure for table BLOG_TAG
@@ -1919,14 +2292,18 @@ ALTER TABLE "LEN"."BLOG_CATEGORY" ADD PRIMARY KEY ("ID");
 -- ----------------------------
 -- Checks structure for table BLOG_TAG
 -- ----------------------------
-ALTER TABLE "LEN"."BLOG_TAG" ADD CHECK ("ID" IS NOT NULL);
-ALTER TABLE "LEN"."BLOG_TAG" ADD CHECK ("TAG_CODE" IS NOT NULL);
-ALTER TABLE "LEN"."BLOG_TAG" ADD CHECK ("TAG_NAME" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_TAG"
+	ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_TAG"
+	ADD CHECK ("TAG_CODE" IS NOT NULL);
+ALTER TABLE "LEN"."BLOG_TAG"
+	ADD CHECK ("TAG_NAME" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table BLOG_TAG
 -- ----------------------------
-ALTER TABLE "LEN"."BLOG_TAG" ADD PRIMARY KEY ("ID");
+ALTER TABLE "LEN"."BLOG_TAG"
+	ADD PRIMARY KEY ("ID");
 
 -- ----------------------------
 -- Indexes structure for table SYS_DICT_ITEM
@@ -1935,17 +2312,24 @@ ALTER TABLE "LEN"."BLOG_TAG" ADD PRIMARY KEY ("ID");
 -- ----------------------------
 -- Checks structure for table SYS_DICT_ITEM
 -- ----------------------------
-ALTER TABLE "LEN"."SYS_DICT_ITEM" ADD CHECK ("ID" IS NOT NULL);
-ALTER TABLE "LEN"."SYS_DICT_ITEM" ADD CHECK ("SEQUENCE" IS NOT NULL);
-ALTER TABLE "LEN"."SYS_DICT_ITEM" ADD CHECK ("VALUE" IS NOT NULL);
-ALTER TABLE "LEN"."SYS_DICT_ITEM" ADD CHECK ("DESCRIPTION" IS NOT NULL);
-ALTER TABLE "LEN"."SYS_DICT_ITEM" ADD CHECK ("TYPE_ID" IS NOT NULL);
-ALTER TABLE "LEN"."SYS_DICT_ITEM" ADD CHECK ("DEL_FLAG" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_DICT_ITEM"
+	ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_DICT_ITEM"
+	ADD CHECK ("SEQUENCE" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_DICT_ITEM"
+	ADD CHECK ("VALUE" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_DICT_ITEM"
+	ADD CHECK ("DESCRIPTION" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_DICT_ITEM"
+	ADD CHECK ("TYPE_ID" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_DICT_ITEM"
+	ADD CHECK ("DEL_FLAG" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table SYS_DICT_ITEM
 -- ----------------------------
-ALTER TABLE "LEN"."SYS_DICT_ITEM" ADD PRIMARY KEY ("ID");
+ALTER TABLE "LEN"."SYS_DICT_ITEM"
+	ADD PRIMARY KEY ("ID");
 
 -- ----------------------------
 -- Indexes structure for table SYS_DICT_TYPE
@@ -1954,15 +2338,20 @@ ALTER TABLE "LEN"."SYS_DICT_ITEM" ADD PRIMARY KEY ("ID");
 -- ----------------------------
 -- Checks structure for table SYS_DICT_TYPE
 -- ----------------------------
-ALTER TABLE "LEN"."SYS_DICT_TYPE" ADD CHECK ("ID" IS NOT NULL);
-ALTER TABLE "LEN"."SYS_DICT_TYPE" ADD CHECK ("CODE" IS NOT NULL);
-ALTER TABLE "LEN"."SYS_DICT_TYPE" ADD CHECK ("DEL_FLAG" IS NOT NULL);
-ALTER TABLE "LEN"."SYS_DICT_TYPE" ADD CHECK ("TEXT" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_DICT_TYPE"
+	ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_DICT_TYPE"
+	ADD CHECK ("CODE" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_DICT_TYPE"
+	ADD CHECK ("DEL_FLAG" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_DICT_TYPE"
+	ADD CHECK ("TEXT" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table SYS_DICT_TYPE
 -- ----------------------------
-ALTER TABLE "LEN"."SYS_DICT_TYPE" ADD PRIMARY KEY ("ID");
+ALTER TABLE "LEN"."SYS_DICT_TYPE"
+	ADD PRIMARY KEY ("ID");
 
 -- ----------------------------
 -- Indexes structure for table SYS_JOB
@@ -1971,16 +2360,22 @@ ALTER TABLE "LEN"."SYS_DICT_TYPE" ADD PRIMARY KEY ("ID");
 -- ----------------------------
 -- Checks structure for table SYS_JOB
 -- ----------------------------
-ALTER TABLE "LEN"."SYS_JOB" ADD CHECK ("ID" IS NOT NULL);
-ALTER TABLE "LEN"."SYS_JOB" ADD CHECK ("JOB_NAME" IS NOT NULL);
-ALTER TABLE "LEN"."SYS_JOB" ADD CHECK ("CRON" IS NOT NULL);
-ALTER TABLE "LEN"."SYS_JOB" ADD CHECK ("STATUS" IS NOT NULL);
-ALTER TABLE "LEN"."SYS_JOB" ADD CHECK ("CLAZZ_PATH" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_JOB"
+	ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_JOB"
+	ADD CHECK ("JOB_NAME" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_JOB"
+	ADD CHECK ("CRON" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_JOB"
+	ADD CHECK ("STATUS" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_JOB"
+	ADD CHECK ("CLAZZ_PATH" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table SYS_JOB
 -- ----------------------------
-ALTER TABLE "LEN"."SYS_JOB" ADD PRIMARY KEY ("ID");
+ALTER TABLE "LEN"."SYS_JOB"
+	ADD PRIMARY KEY ("ID");
 
 -- ----------------------------
 -- Indexes structure for table SYS_LOG
@@ -1989,12 +2384,14 @@ ALTER TABLE "LEN"."SYS_JOB" ADD PRIMARY KEY ("ID");
 -- ----------------------------
 -- Checks structure for table SYS_LOG
 -- ----------------------------
-ALTER TABLE "LEN"."SYS_LOG" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_LOG"
+	ADD CHECK ("ID" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table SYS_LOG
 -- ----------------------------
-ALTER TABLE "LEN"."SYS_LOG" ADD PRIMARY KEY ("ID");
+ALTER TABLE "LEN"."SYS_LOG"
+	ADD PRIMARY KEY ("ID");
 
 -- ----------------------------
 -- Indexes structure for table SYS_MENU
@@ -2003,14 +2400,18 @@ ALTER TABLE "LEN"."SYS_LOG" ADD PRIMARY KEY ("ID");
 -- ----------------------------
 -- Checks structure for table SYS_MENU
 -- ----------------------------
-ALTER TABLE "LEN"."SYS_MENU" ADD CHECK ("ID" IS NOT NULL);
-ALTER TABLE "LEN"."SYS_MENU" ADD CHECK ("NAME" IS NOT NULL);
-ALTER TABLE "LEN"."SYS_MENU" ADD CHECK ("MENU_TYPE" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_MENU"
+	ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_MENU"
+	ADD CHECK ("NAME" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_MENU"
+	ADD CHECK ("MENU_TYPE" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table SYS_MENU
 -- ----------------------------
-ALTER TABLE "LEN"."SYS_MENU" ADD PRIMARY KEY ("ID");
+ALTER TABLE "LEN"."SYS_MENU"
+	ADD PRIMARY KEY ("ID");
 
 -- ----------------------------
 -- Indexes structure for table SYS_ROLE
@@ -2019,12 +2420,14 @@ ALTER TABLE "LEN"."SYS_MENU" ADD PRIMARY KEY ("ID");
 -- ----------------------------
 -- Checks structure for table SYS_ROLE
 -- ----------------------------
-ALTER TABLE "LEN"."SYS_ROLE" ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_ROLE"
+	ADD CHECK ("ID" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table SYS_ROLE
 -- ----------------------------
-ALTER TABLE "LEN"."SYS_ROLE" ADD PRIMARY KEY ("ID");
+ALTER TABLE "LEN"."SYS_ROLE"
+	ADD PRIMARY KEY ("ID");
 
 -- ----------------------------
 -- Indexes structure for table SYS_ROLE_MENU
@@ -2033,13 +2436,16 @@ ALTER TABLE "LEN"."SYS_ROLE" ADD PRIMARY KEY ("ID");
 -- ----------------------------
 -- Checks structure for table SYS_ROLE_MENU
 -- ----------------------------
-ALTER TABLE "LEN"."SYS_ROLE_MENU" ADD CHECK ("ROLE_ID" IS NOT NULL);
-ALTER TABLE "LEN"."SYS_ROLE_MENU" ADD CHECK ("MENU_ID" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_ROLE_MENU"
+	ADD CHECK ("ROLE_ID" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_ROLE_MENU"
+	ADD CHECK ("MENU_ID" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table SYS_ROLE_MENU
 -- ----------------------------
-ALTER TABLE "LEN"."SYS_ROLE_MENU" ADD PRIMARY KEY ("ROLE_ID", "MENU_ID");
+ALTER TABLE "LEN"."SYS_ROLE_MENU"
+	ADD PRIMARY KEY ("ROLE_ID", "MENU_ID");
 
 -- ----------------------------
 -- Indexes structure for table SYS_ROLE_USER
@@ -2048,13 +2454,16 @@ ALTER TABLE "LEN"."SYS_ROLE_MENU" ADD PRIMARY KEY ("ROLE_ID", "MENU_ID");
 -- ----------------------------
 -- Checks structure for table SYS_ROLE_USER
 -- ----------------------------
-ALTER TABLE "LEN"."SYS_ROLE_USER" ADD CHECK ("USER_ID" IS NOT NULL);
-ALTER TABLE "LEN"."SYS_ROLE_USER" ADD CHECK ("ROLE_ID" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_ROLE_USER"
+	ADD CHECK ("USER_ID" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_ROLE_USER"
+	ADD CHECK ("ROLE_ID" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table SYS_ROLE_USER
 -- ----------------------------
-ALTER TABLE "LEN"."SYS_ROLE_USER" ADD PRIMARY KEY ("USER_ID", "ROLE_ID");
+ALTER TABLE "LEN"."SYS_ROLE_USER"
+	ADD PRIMARY KEY ("USER_ID", "ROLE_ID");
 
 -- ----------------------------
 -- Indexes structure for table SYS_USER
@@ -2063,15 +2472,20 @@ ALTER TABLE "LEN"."SYS_ROLE_USER" ADD PRIMARY KEY ("USER_ID", "ROLE_ID");
 -- ----------------------------
 -- Checks structure for table SYS_USER
 -- ----------------------------
-ALTER TABLE "LEN"."SYS_USER" ADD CHECK ("ID" IS NOT NULL);
-ALTER TABLE "LEN"."SYS_USER" ADD CHECK ("USERNAME" IS NOT NULL);
-ALTER TABLE "LEN"."SYS_USER" ADD CHECK ("PASSWORD" IS NOT NULL);
-ALTER TABLE "LEN"."SYS_USER" ADD CHECK ("DEL_FLAG" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_USER"
+	ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_USER"
+	ADD CHECK ("USERNAME" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_USER"
+	ADD CHECK ("PASSWORD" IS NOT NULL);
+ALTER TABLE "LEN"."SYS_USER"
+	ADD CHECK ("DEL_FLAG" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table SYS_USER
 -- ----------------------------
-ALTER TABLE "LEN"."SYS_USER" ADD PRIMARY KEY ("ID");
+ALTER TABLE "LEN"."SYS_USER"
+	ADD PRIMARY KEY ("ID");
 
 -- ----------------------------
 -- Indexes structure for table USER_LEAVE
@@ -2080,73 +2494,99 @@ ALTER TABLE "LEN"."SYS_USER" ADD PRIMARY KEY ("ID");
 -- ----------------------------
 -- Checks structure for table USER_LEAVE
 -- ----------------------------
-ALTER TABLE "LEN"."USER_LEAVE" ADD CHECK ("ID" IS NOT NULL);
-ALTER TABLE "LEN"."USER_LEAVE" ADD CHECK ("USER_ID" IS NOT NULL);
+ALTER TABLE "LEN"."USER_LEAVE"
+	ADD CHECK ("ID" IS NOT NULL);
+ALTER TABLE "LEN"."USER_LEAVE"
+	ADD CHECK ("USER_ID" IS NOT NULL);
 
 -- ----------------------------
 -- Primary Key structure for table USER_LEAVE
 -- ----------------------------
-ALTER TABLE "LEN"."USER_LEAVE" ADD PRIMARY KEY ("ID");
+ALTER TABLE "LEN"."USER_LEAVE"
+	ADD PRIMARY KEY ("ID");
 
 -- ----------------------------
 -- Foreign Key structure for table "LEN"."ACT_GE_BYTEARRAY"
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_GE_BYTEARRAY" ADD FOREIGN KEY ("DEPLOYMENT_ID_") REFERENCES "LEN"."ACT_RE_DEPLOYMENT" ("ID_");
+ALTER TABLE "LEN"."ACT_GE_BYTEARRAY"
+	ADD FOREIGN KEY ("DEPLOYMENT_ID_") REFERENCES "LEN"."ACT_RE_DEPLOYMENT" ("ID_");
 
 -- ----------------------------
 -- Foreign Key structure for table "LEN"."ACT_ID_MEMBERSHIP"
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_ID_MEMBERSHIP" ADD FOREIGN KEY ("GROUP_ID_") REFERENCES "LEN"."ACT_ID_GROUP" ("ID_");
-ALTER TABLE "LEN"."ACT_ID_MEMBERSHIP" ADD FOREIGN KEY ("USER_ID_") REFERENCES "LEN"."ACT_ID_USER" ("ID_");
+ALTER TABLE "LEN"."ACT_ID_MEMBERSHIP"
+	ADD FOREIGN KEY ("GROUP_ID_") REFERENCES "LEN"."ACT_ID_GROUP" ("ID_");
+ALTER TABLE "LEN"."ACT_ID_MEMBERSHIP"
+	ADD FOREIGN KEY ("USER_ID_") REFERENCES "LEN"."ACT_ID_USER" ("ID_");
 
 -- ----------------------------
 -- Foreign Key structure for table "LEN"."ACT_PROCDEF_INFO"
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_PROCDEF_INFO" ADD FOREIGN KEY ("INFO_JSON_ID_") REFERENCES "LEN"."ACT_GE_BYTEARRAY" ("ID_");
-ALTER TABLE "LEN"."ACT_PROCDEF_INFO" ADD FOREIGN KEY ("PROC_DEF_ID_") REFERENCES "LEN"."ACT_RE_PROCDEF" ("ID_");
+ALTER TABLE "LEN"."ACT_PROCDEF_INFO"
+	ADD FOREIGN KEY ("INFO_JSON_ID_") REFERENCES "LEN"."ACT_GE_BYTEARRAY" ("ID_");
+ALTER TABLE "LEN"."ACT_PROCDEF_INFO"
+	ADD FOREIGN KEY ("PROC_DEF_ID_") REFERENCES "LEN"."ACT_RE_PROCDEF" ("ID_");
 
 -- ----------------------------
 -- Foreign Key structure for table "LEN"."ACT_RE_MODEL"
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RE_MODEL" ADD FOREIGN KEY ("DEPLOYMENT_ID_") REFERENCES "LEN"."ACT_RE_DEPLOYMENT" ("ID_");
-ALTER TABLE "LEN"."ACT_RE_MODEL" ADD FOREIGN KEY ("EDITOR_SOURCE_VALUE_ID_") REFERENCES "LEN"."ACT_GE_BYTEARRAY" ("ID_");
-ALTER TABLE "LEN"."ACT_RE_MODEL" ADD FOREIGN KEY ("EDITOR_SOURCE_EXTRA_VALUE_ID_") REFERENCES "LEN"."ACT_GE_BYTEARRAY" ("ID_");
+ALTER TABLE "LEN"."ACT_RE_MODEL"
+	ADD FOREIGN KEY ("DEPLOYMENT_ID_") REFERENCES "LEN"."ACT_RE_DEPLOYMENT" ("ID_");
+ALTER TABLE "LEN"."ACT_RE_MODEL"
+	ADD FOREIGN KEY ("EDITOR_SOURCE_VALUE_ID_") REFERENCES "LEN"."ACT_GE_BYTEARRAY" ("ID_");
+ALTER TABLE "LEN"."ACT_RE_MODEL"
+	ADD FOREIGN KEY ("EDITOR_SOURCE_EXTRA_VALUE_ID_") REFERENCES "LEN"."ACT_GE_BYTEARRAY" ("ID_");
 
 -- ----------------------------
 -- Foreign Key structure for table "LEN"."ACT_RU_EVENT_SUBSCR"
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RU_EVENT_SUBSCR" ADD FOREIGN KEY ("EXECUTION_ID_") REFERENCES "LEN"."ACT_RU_EXECUTION" ("ID_");
+ALTER TABLE "LEN"."ACT_RU_EVENT_SUBSCR"
+	ADD FOREIGN KEY ("EXECUTION_ID_") REFERENCES "LEN"."ACT_RU_EXECUTION" ("ID_");
 
 -- ----------------------------
 -- Foreign Key structure for table "LEN"."ACT_RU_EXECUTION"
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RU_EXECUTION" ADD FOREIGN KEY ("PARENT_ID_") REFERENCES "LEN"."ACT_RU_EXECUTION" ("ID_");
-ALTER TABLE "LEN"."ACT_RU_EXECUTION" ADD FOREIGN KEY ("PROC_DEF_ID_") REFERENCES "LEN"."ACT_RE_PROCDEF" ("ID_");
-ALTER TABLE "LEN"."ACT_RU_EXECUTION" ADD FOREIGN KEY ("PROC_INST_ID_") REFERENCES "LEN"."ACT_RU_EXECUTION" ("ID_");
-ALTER TABLE "LEN"."ACT_RU_EXECUTION" ADD FOREIGN KEY ("SUPER_EXEC_") REFERENCES "LEN"."ACT_RU_EXECUTION" ("ID_");
+ALTER TABLE "LEN"."ACT_RU_EXECUTION"
+	ADD FOREIGN KEY ("PARENT_ID_") REFERENCES "LEN"."ACT_RU_EXECUTION" ("ID_");
+ALTER TABLE "LEN"."ACT_RU_EXECUTION"
+	ADD FOREIGN KEY ("PROC_DEF_ID_") REFERENCES "LEN"."ACT_RE_PROCDEF" ("ID_");
+ALTER TABLE "LEN"."ACT_RU_EXECUTION"
+	ADD FOREIGN KEY ("PROC_INST_ID_") REFERENCES "LEN"."ACT_RU_EXECUTION" ("ID_");
+ALTER TABLE "LEN"."ACT_RU_EXECUTION"
+	ADD FOREIGN KEY ("SUPER_EXEC_") REFERENCES "LEN"."ACT_RU_EXECUTION" ("ID_");
 
 -- ----------------------------
 -- Foreign Key structure for table "LEN"."ACT_RU_IDENTITYLINK"
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RU_IDENTITYLINK" ADD FOREIGN KEY ("PROC_DEF_ID_") REFERENCES "LEN"."ACT_RE_PROCDEF" ("ID_");
-ALTER TABLE "LEN"."ACT_RU_IDENTITYLINK" ADD FOREIGN KEY ("PROC_INST_ID_") REFERENCES "LEN"."ACT_RU_EXECUTION" ("ID_");
-ALTER TABLE "LEN"."ACT_RU_IDENTITYLINK" ADD FOREIGN KEY ("TASK_ID_") REFERENCES "LEN"."ACT_RU_TASK" ("ID_");
+ALTER TABLE "LEN"."ACT_RU_IDENTITYLINK"
+	ADD FOREIGN KEY ("PROC_DEF_ID_") REFERENCES "LEN"."ACT_RE_PROCDEF" ("ID_");
+ALTER TABLE "LEN"."ACT_RU_IDENTITYLINK"
+	ADD FOREIGN KEY ("PROC_INST_ID_") REFERENCES "LEN"."ACT_RU_EXECUTION" ("ID_");
+ALTER TABLE "LEN"."ACT_RU_IDENTITYLINK"
+	ADD FOREIGN KEY ("TASK_ID_") REFERENCES "LEN"."ACT_RU_TASK" ("ID_");
 
 -- ----------------------------
 -- Foreign Key structure for table "LEN"."ACT_RU_JOB"
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RU_JOB" ADD FOREIGN KEY ("EXCEPTION_STACK_ID_") REFERENCES "LEN"."ACT_GE_BYTEARRAY" ("ID_");
+ALTER TABLE "LEN"."ACT_RU_JOB"
+	ADD FOREIGN KEY ("EXCEPTION_STACK_ID_") REFERENCES "LEN"."ACT_GE_BYTEARRAY" ("ID_");
 
 -- ----------------------------
 -- Foreign Key structure for table "LEN"."ACT_RU_TASK"
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RU_TASK" ADD FOREIGN KEY ("EXECUTION_ID_") REFERENCES "LEN"."ACT_RU_EXECUTION" ("ID_");
-ALTER TABLE "LEN"."ACT_RU_TASK" ADD FOREIGN KEY ("PROC_DEF_ID_") REFERENCES "LEN"."ACT_RE_PROCDEF" ("ID_");
-ALTER TABLE "LEN"."ACT_RU_TASK" ADD FOREIGN KEY ("PROC_INST_ID_") REFERENCES "LEN"."ACT_RU_EXECUTION" ("ID_");
+ALTER TABLE "LEN"."ACT_RU_TASK"
+	ADD FOREIGN KEY ("EXECUTION_ID_") REFERENCES "LEN"."ACT_RU_EXECUTION" ("ID_");
+ALTER TABLE "LEN"."ACT_RU_TASK"
+	ADD FOREIGN KEY ("PROC_DEF_ID_") REFERENCES "LEN"."ACT_RE_PROCDEF" ("ID_");
+ALTER TABLE "LEN"."ACT_RU_TASK"
+	ADD FOREIGN KEY ("PROC_INST_ID_") REFERENCES "LEN"."ACT_RU_EXECUTION" ("ID_");
 
 -- ----------------------------
 -- Foreign Key structure for table "LEN"."ACT_RU_VARIABLE"
 -- ----------------------------
-ALTER TABLE "LEN"."ACT_RU_VARIABLE" ADD FOREIGN KEY ("BYTEARRAY_ID_") REFERENCES "LEN"."ACT_GE_BYTEARRAY" ("ID_");
-ALTER TABLE "LEN"."ACT_RU_VARIABLE" ADD FOREIGN KEY ("EXECUTION_ID_") REFERENCES "LEN"."ACT_RU_EXECUTION" ("ID_");
-ALTER TABLE "LEN"."ACT_RU_VARIABLE" ADD FOREIGN KEY ("PROC_INST_ID_") REFERENCES "LEN"."ACT_RU_EXECUTION" ("ID_");
+ALTER TABLE "LEN"."ACT_RU_VARIABLE"
+	ADD FOREIGN KEY ("BYTEARRAY_ID_") REFERENCES "LEN"."ACT_GE_BYTEARRAY" ("ID_");
+ALTER TABLE "LEN"."ACT_RU_VARIABLE"
+	ADD FOREIGN KEY ("EXECUTION_ID_") REFERENCES "LEN"."ACT_RU_EXECUTION" ("ID_");
+ALTER TABLE "LEN"."ACT_RU_VARIABLE"
+	ADD FOREIGN KEY ("PROC_INST_ID_") REFERENCES "LEN"."ACT_RU_EXECUTION" ("ID_");
diff --git a/len-activiti/pom.xml b/len-activiti/pom.xml
index ad9c854..c8a4af9 100644
--- a/len-activiti/pom.xml
+++ b/len-activiti/pom.xml
@@ -1,89 +1,89 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <artifactId>lenosp</artifactId>
-    <groupId>com.len</groupId>
-    <version>lenosp-2.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<artifactId>lenosp</artifactId>
+		<groupId>com.len</groupId>
+		<version>lenosp-2.0-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
 
-  <artifactId>len-activiti</artifactId>
+	<artifactId>len-activiti</artifactId>
 
-  <name>len-activiti</name>
-  <url>http://maven.apache.org</url>
- <!-- <packaging>war</packaging>-->
+	<name>len-activiti</name>
+	<url>http://maven.apache.org</url>
+	<!-- <packaging>war</packaging>-->
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <activiti.version>5.22.0</activiti.version>
-  </properties>
-  <dependencies>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<activiti.version>5.22.0</activiti.version>
+	</properties>
+	<dependencies>
 
-   <!-- actviti begin-->
-    <dependency>
-      <groupId>org.activiti</groupId>
-      <artifactId>activiti-engine</artifactId>
-      <version>${activiti.version}</version>
-    </dependency>
+		<!-- actviti begin-->
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-engine</artifactId>
+			<version>${activiti.version}</version>
+		</dependency>
 
-    <dependency>
-      <groupId>org.activiti</groupId>
-      <artifactId>activiti-spring</artifactId>
-      <version>${activiti.version}</version>
-    </dependency>
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-spring</artifactId>
+			<version>${activiti.version}</version>
+		</dependency>
 
-    <dependency>
-      <groupId>org.activiti</groupId>
-      <artifactId>activiti-modeler</artifactId>
-      <version>${activiti.version}</version>
-    </dependency>
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-modeler</artifactId>
+			<version>${activiti.version}</version>
+		</dependency>
 
-    <dependency>
-      <groupId>org.activiti</groupId>
-      <artifactId>activiti-diagram-rest</artifactId>
-      <version>${activiti.version}</version>
-    </dependency>
-    <!-- actviti end-->
+		<dependency>
+			<groupId>org.activiti</groupId>
+			<artifactId>activiti-diagram-rest</artifactId>
+			<version>${activiti.version}</version>
+		</dependency>
+		<!-- actviti end-->
 
-    <!--activti 正在开发中-->
-    <dependency>
-      <groupId>com.len</groupId>
-      <artifactId>len-sys</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-    </dependency>
-  </dependencies>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>com.len</groupId>
-        <artifactId>len-sys</artifactId>
-        <version>lenosp-2.0-SNAPSHOT</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
+		<!--activti 正在开发中-->
+		<dependency>
+			<groupId>com.len</groupId>
+			<artifactId>len-sys</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+		</dependency>
+	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>com.len</groupId>
+				<artifactId>len-sys</artifactId>
+				<version>lenosp-2.0-SNAPSHOT</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/java</directory>
-        <includes>
-          <include>**/*.xml</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>**.*</include>
-          <include>**/*.*</include>
-          <include>**/*/*.*</include>
-        </includes>
-      </resource>
-    </resources>
-  </build>
+	<build>
+		<resources>
+			<resource>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**/*.xml</include>
+				</includes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>**.*</include>
+					<include>**/*.*</include>
+					<include>**/*/*.*</include>
+				</includes>
+			</resource>
+		</resources>
+	</build>
 
 </project>
diff --git a/len-activiti/src/main/java/com/len/actlistener/ActNodeListener.java b/len-activiti/src/main/java/com/len/actlistener/ActNodeListener.java
index 155ca87..6b0b746 100644
--- a/len-activiti/src/main/java/com/len/actlistener/ActNodeListener.java
+++ b/len-activiti/src/main/java/com/len/actlistener/ActNodeListener.java
@@ -21,12 +21,11 @@ import com.len.service.ActAssigneeService;
 import com.len.service.impl.ActAssigneeServiceImpl;
 import com.len.util.AssigneeType;
 import com.len.util.SpringUtil;
-
-import java.util.List;
-
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 
+import java.util.List;
+
 /**
  * @author zhuxiaomeng
  * @date 2018/1/20.
@@ -36,21 +35,21 @@ import org.activiti.engine.delegate.TaskListener;
  */
 public class ActNodeListener implements TaskListener {
 
-    @Override
-    public void notify(DelegateTask delegateTask) {
-        //KEY
-        String nodeId = delegateTask.getTaskDefinitionKey();
-        ActAssigneeService actAssigneeService = SpringUtil.getBean(ActAssigneeServiceImpl.class);
-        List<ActAssignee> assigneeList = actAssigneeService.list(new QueryWrapper<>(new ActAssignee(nodeId)));
-        for (ActAssignee assignee : assigneeList) {
-            switch (assignee.getAssigneeType()) {
-                case AssigneeType.GROUP_TYPE:
-                    delegateTask.addCandidateGroup(assignee.getRoleId());
-                    break;
-                case AssigneeType.USER_TYPE:
-                    delegateTask.addCandidateUser(assignee.getAssignee());
-                    break;
-            }
-        }
-    }
+	@Override
+	public void notify(DelegateTask delegateTask) {
+		//KEY
+		String nodeId = delegateTask.getTaskDefinitionKey();
+		ActAssigneeService actAssigneeService = SpringUtil.getBean(ActAssigneeServiceImpl.class);
+		List<ActAssignee> assigneeList = actAssigneeService.list(new QueryWrapper<>(new ActAssignee(nodeId)));
+		for (ActAssignee assignee : assigneeList) {
+			switch (assignee.getAssigneeType()) {
+				case AssigneeType.GROUP_TYPE:
+					delegateTask.addCandidateGroup(assignee.getRoleId());
+					break;
+				case AssigneeType.USER_TYPE:
+					delegateTask.addCandidateUser(assignee.getAssignee());
+					break;
+			}
+		}
+	}
 }
diff --git a/len-activiti/src/main/java/com/len/actlistener/ActStartNodeListener.java b/len-activiti/src/main/java/com/len/actlistener/ActStartNodeListener.java
index ab993a0..c19eead 100644
--- a/len-activiti/src/main/java/com/len/actlistener/ActStartNodeListener.java
+++ b/len-activiti/src/main/java/com/len/actlistener/ActStartNodeListener.java
@@ -30,15 +30,15 @@ import java.util.Map;
  */
 public class ActStartNodeListener implements TaskListener {
 
-    @Override
-    public void notify(DelegateTask delegateTask) {
-        //KEY
-        String nodeId = delegateTask.getTaskDefinitionKey();
+	@Override
+	public void notify(DelegateTask delegateTask) {
+		//KEY
+		String nodeId = delegateTask.getTaskDefinitionKey();
 
-        Map<String, Object> variables = delegateTask.getVariables();
-        BaseTask baseTask = (BaseTask) variables.get("baseTask");
+		Map<String, Object> variables = delegateTask.getVariables();
+		BaseTask baseTask = (BaseTask) variables.get("baseTask");
 
-        delegateTask.setAssignee(baseTask.getUserId());
+		delegateTask.setAssignee(baseTask.getUserId());
 
-    }
+	}
 }
diff --git a/len-activiti/src/main/java/com/len/actlistener/LeaveListenerImpl.java b/len-activiti/src/main/java/com/len/actlistener/LeaveListenerImpl.java
index ebac5f5..c0cd013 100644
--- a/len-activiti/src/main/java/com/len/actlistener/LeaveListenerImpl.java
+++ b/len-activiti/src/main/java/com/len/actlistener/LeaveListenerImpl.java
@@ -29,12 +29,12 @@ import java.util.Map;
  */
 public class LeaveListenerImpl extends ActNodeListener {
 
-    @Override
-    public void notify(DelegateTask delegateTask) {
-        super.notify(delegateTask);
-        String taskId = delegateTask.getId();
-        Map<String, Object> map = delegateTask.getVariables();
-        UserLeave userLeave = (UserLeave) map.get("userLeave");
-        delegateTask.addCandidateUser(userLeave.getUserId());
-    }
+	@Override
+	public void notify(DelegateTask delegateTask) {
+		super.notify(delegateTask);
+		String taskId = delegateTask.getId();
+		Map<String, Object> map = delegateTask.getVariables();
+		UserLeave userLeave = (UserLeave) map.get("userLeave");
+		delegateTask.addCandidateUser(userLeave.getUserId());
+	}
 }
diff --git a/len-activiti/src/main/java/com/len/actlistener/ListenUserRole.java b/len-activiti/src/main/java/com/len/actlistener/ListenUserRole.java
index 8d9145f..1d06c5d 100644
--- a/len-activiti/src/main/java/com/len/actlistener/ListenUserRole.java
+++ b/len-activiti/src/main/java/com/len/actlistener/ListenUserRole.java
@@ -46,146 +46,146 @@ import java.util.List;
 @Component
 public class ListenUserRole {
 
-    @Autowired
-    IdentityService identityService;
-
-    @Autowired
-    SysUserService userService;
-
-    /**********************用户处理begin***************************/
-    /**
-     * 明确切入方法的参数
-     *
-     * @param joinPoint
-     */
-    @Around("execution(com.len.util.LenResponse com.len.controller.UserController.updateUser(*,String[]))")
-    public Object listenerUserUpdate(ProceedingJoinPoint joinPoint) throws Throwable {
-        Object o = new Object();
-        //更新前拿到用户-角色数据
-        SysRoleUser sysRoleUser = new SysRoleUser();
-        Object[] args = joinPoint.getArgs();
-        sysRoleUser.setUserId(((SysUser) args[0]).getId());
-        List<SysRoleUser> keyList = userService.selectByCondition(sysRoleUser);
-        List<String> strings = new ArrayList<>();
-        keyList.forEach(sysRoleUser1 -> strings.add(sysRoleUser1.getRoleId()));
-        o = joinPoint.proceed(joinPoint.getArgs());
-        LenResponse jsonUtil = (LenResponse) o;
-        if (jsonUtil.isFlag()) {
-            changeUser(args, strings);
-        }
-        return o;
-    }
-
-    /**
-     * 新增用户监听 同步工作流用户表 环绕注解能得到 插入用户id 啊哈哈
-     *
-     * @param joinPoint
-     */
-    @Around("execution(com.len.util.LenResponse com.len.controller.UserController.addUser(*,String[]))")
-    public Object listenerUserInsert(ProceedingJoinPoint joinPoint) throws Throwable {
-        Object o = joinPoint.proceed(joinPoint.getArgs());
-        Object[] args = joinPoint.getArgs();
-        if (args.length == 2) {
-            LenResponse jsonUtil = (LenResponse) o;
-            if (jsonUtil.isFlag()) {
-                changeUser(args, Arrays.asList((String[]) args[1]));
-            }
-        }
-        return o;
-    }
-
-    @Around("execution(com.len.util.LenResponse com.len.controller.UserController.del(..))")
-    public Object listenDelUser(ProceedingJoinPoint point) throws Throwable {
-        Object o = point.proceed(point.getArgs());
-        LenResponse util = (LenResponse) o;
-        if (util.isFlag()) {
-            Object[] args = point.getArgs();
-            identityService.deleteUser((String) args[0]);
-        }
-        return o;
-    }
-
-
-    /**
-     * 保存进 activiti 用户 角色 用户角色中间表
-     *
-     * @param obj
-     */
-    private void changeUser(Object[] obj, List<String> strings) {
-        SysUser user = (SysUser) obj[0];
-        identityService.deleteUser(user.getId());
-        User au = new UserEntity();
-        au.setId(user.getId());
+	@Autowired
+	IdentityService identityService;
+
+	@Autowired
+	SysUserService userService;
+
+	/**********************用户处理begin***************************/
+	/**
+	 * 明确切入方法的参数
+	 *
+	 * @param joinPoint
+	 */
+	@Around("execution(com.len.util.LenResponse com.len.controller.UserController.updateUser(*,String[]))")
+	public Object listenerUserUpdate(ProceedingJoinPoint joinPoint) throws Throwable {
+		Object o = new Object();
+		//更新前拿到用户-角色数据
+		SysRoleUser sysRoleUser = new SysRoleUser();
+		Object[] args = joinPoint.getArgs();
+		sysRoleUser.setUserId(((SysUser) args[0]).getId());
+		List<SysRoleUser> keyList = userService.selectByCondition(sysRoleUser);
+		List<String> strings = new ArrayList<>();
+		keyList.forEach(sysRoleUser1 -> strings.add(sysRoleUser1.getRoleId()));
+		o = joinPoint.proceed(joinPoint.getArgs());
+		LenResponse jsonUtil = (LenResponse) o;
+		if (jsonUtil.isFlag()) {
+			changeUser(args, strings);
+		}
+		return o;
+	}
+
+	/**
+	 * 新增用户监听 同步工作流用户表 环绕注解能得到 插入用户id 啊哈哈
+	 *
+	 * @param joinPoint
+	 */
+	@Around("execution(com.len.util.LenResponse com.len.controller.UserController.addUser(*,String[]))")
+	public Object listenerUserInsert(ProceedingJoinPoint joinPoint) throws Throwable {
+		Object o = joinPoint.proceed(joinPoint.getArgs());
+		Object[] args = joinPoint.getArgs();
+		if (args.length == 2) {
+			LenResponse jsonUtil = (LenResponse) o;
+			if (jsonUtil.isFlag()) {
+				changeUser(args, Arrays.asList((String[]) args[1]));
+			}
+		}
+		return o;
+	}
+
+	@Around("execution(com.len.util.LenResponse com.len.controller.UserController.del(..))")
+	public Object listenDelUser(ProceedingJoinPoint point) throws Throwable {
+		Object o = point.proceed(point.getArgs());
+		LenResponse util = (LenResponse) o;
+		if (util.isFlag()) {
+			Object[] args = point.getArgs();
+			identityService.deleteUser((String) args[0]);
+		}
+		return o;
+	}
+
+
+	/**
+	 * 保存进 activiti 用户 角色 用户角色中间表
+	 *
+	 * @param obj
+	 */
+	private void changeUser(Object[] obj, List<String> strings) {
+		SysUser user = (SysUser) obj[0];
+		identityService.deleteUser(user.getId());
+		User au = new UserEntity();
+		au.setId(user.getId());
 //        au.setFirstName(user.getRealName());
-        au.setEmail(user.getEmail());
-        identityService.saveUser(au);
-
-        //删除用户-组关联
-        for (String roleId : strings) {
-            identityService.deleteMembership(user.getId(), roleId);
-        }
-        //再次关联
-        if (!strings.isEmpty()) {
-            for (String roleId : strings) {
-                identityService.createMembership(user.getId(), roleId);
-            }
-        }
-    }
-
-    /**********************用户处理end***************************/
-
-
-    /**********************角色处理begin***************************/
-    @Around("execution(com.len.util.LenResponse com.len.controller.RoleController.addRole(*,String[]))")
-    public Object listenRoleInsert(ProceedingJoinPoint joinPoint) throws Throwable {
-        Object o = joinPoint.proceed(joinPoint.getArgs());
-        LenResponse j = (LenResponse) o;
-        if (j.isFlag()) {
-            Object[] args = joinPoint.getArgs();
-            if (args.length == 2) {
-                changeRole(args);
-            }
-        }
-        return o;
-    }
-
-    @Around("execution(com.len.util.LenResponse com.len.controller.RoleController.updateUser(*,String[]))")
-    public Object listenRoleUpdate(ProceedingJoinPoint joinPoint) throws Throwable {
-        Object o = joinPoint.proceed(joinPoint.getArgs());
-        Object[] args = joinPoint.getArgs();
-        if (args.length == 2) {
-            if (((LenResponse) o).isFlag()) {
-                changeRole(args);
-            }
-        }
-
-        return o;
-    }
-
-    @Around("execution(com.len.util.LenResponse com.len.controller.RoleController.del(..))")
-    public Object listenDelRole(ProceedingJoinPoint point) throws Throwable {
-        Object o = point.proceed(point.getArgs());
-        LenResponse util = (LenResponse) o;
-        if (util.isFlag()) {
-            Object[] args = point.getArgs();
-            identityService.deleteGroup((String) args[0]);
-        }
-        return o;
-    }
-
-    /**
-     * 更新进组
-     *
-     * @param obj
-     */
-    public void changeRole(Object[] obj) {
-        SysRole role = (SysRole) obj[0];
-        identityService.deleteGroup(role.getId());
-        Group group = new GroupEntity();
-        group.setId(role.getId());
-        group.setName(role.getRoleName());
-        identityService.saveGroup(group);
-    }
-
-    /**********************角色处理end***************************/
+		au.setEmail(user.getEmail());
+		identityService.saveUser(au);
+
+		//删除用户-组关联
+		for (String roleId : strings) {
+			identityService.deleteMembership(user.getId(), roleId);
+		}
+		//再次关联
+		if (!strings.isEmpty()) {
+			for (String roleId : strings) {
+				identityService.createMembership(user.getId(), roleId);
+			}
+		}
+	}
+
+	/**********************用户处理end***************************/
+
+
+	/**********************角色处理begin***************************/
+	@Around("execution(com.len.util.LenResponse com.len.controller.RoleController.addRole(*,String[]))")
+	public Object listenRoleInsert(ProceedingJoinPoint joinPoint) throws Throwable {
+		Object o = joinPoint.proceed(joinPoint.getArgs());
+		LenResponse j = (LenResponse) o;
+		if (j.isFlag()) {
+			Object[] args = joinPoint.getArgs();
+			if (args.length == 2) {
+				changeRole(args);
+			}
+		}
+		return o;
+	}
+
+	@Around("execution(com.len.util.LenResponse com.len.controller.RoleController.updateUser(*,String[]))")
+	public Object listenRoleUpdate(ProceedingJoinPoint joinPoint) throws Throwable {
+		Object o = joinPoint.proceed(joinPoint.getArgs());
+		Object[] args = joinPoint.getArgs();
+		if (args.length == 2) {
+			if (((LenResponse) o).isFlag()) {
+				changeRole(args);
+			}
+		}
+
+		return o;
+	}
+
+	@Around("execution(com.len.util.LenResponse com.len.controller.RoleController.del(..))")
+	public Object listenDelRole(ProceedingJoinPoint point) throws Throwable {
+		Object o = point.proceed(point.getArgs());
+		LenResponse util = (LenResponse) o;
+		if (util.isFlag()) {
+			Object[] args = point.getArgs();
+			identityService.deleteGroup((String) args[0]);
+		}
+		return o;
+	}
+
+	/**
+	 * 更新进组
+	 *
+	 * @param obj
+	 */
+	public void changeRole(Object[] obj) {
+		SysRole role = (SysRole) obj[0];
+		identityService.deleteGroup(role.getId());
+		Group group = new GroupEntity();
+		group.setId(role.getId());
+		group.setName(role.getRoleName());
+		identityService.saveGroup(group);
+	}
+
+	/**********************角色处理end***************************/
 }
diff --git a/len-activiti/src/main/java/com/len/config/ActPropertiesConfig.java b/len-activiti/src/main/java/com/len/config/ActPropertiesConfig.java
index cdd1ed6..018d8d0 100644
--- a/len-activiti/src/main/java/com/len/config/ActPropertiesConfig.java
+++ b/len-activiti/src/main/java/com/len/config/ActPropertiesConfig.java
@@ -21,26 +21,25 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
 /**
- *
  * 可以自定义一些配置类
  */
 @Configuration
 @PropertySource("classpath:properties\\activiti.properties")
 public class ActPropertiesConfig {
 
-  @Value("${modelId}")
-  private String modelId;
+	@Value("${modelId}")
+	private String modelId;
 
-  public String getModelId() {
-    return modelId;
-  }
+	public String getModelId() {
+		return modelId;
+	}
 
-  public void setModelId(String modelId) {
-    this.modelId = modelId;
-  }
+	public void setModelId(String modelId) {
+		this.modelId = modelId;
+	}
 
-  @Bean
-  public ActPropertiesConfig getActPropertiesConfig(){
-    return new ActPropertiesConfig();
-  }
+	@Bean
+	public ActPropertiesConfig getActPropertiesConfig() {
+		return new ActPropertiesConfig();
+	}
 }
diff --git a/len-activiti/src/main/java/com/len/config/ActivitiConfig.java b/len-activiti/src/main/java/com/len/config/ActivitiConfig.java
index bc37a6d..b823f92 100644
--- a/len-activiti/src/main/java/com/len/config/ActivitiConfig.java
+++ b/len-activiti/src/main/java/com/len/config/ActivitiConfig.java
@@ -1,21 +1,8 @@
 package com.len.config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-
-import javax.sql.DataSource;
-
-import org.activiti.engine.DynamicBpmnService;
-import org.activiti.engine.FormService;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.IdentityService;
-import org.activiti.engine.ManagementService;
-import org.activiti.engine.ProcessEngine;
-import org.activiti.engine.ProcessEngineConfiguration;
-import org.activiti.engine.RepositoryService;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.TaskService;
+import org.activiti.engine.*;
 import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
-import org.activiti.image.HMProcessDiagramGenerator;
 import org.activiti.image.impl.DefaultProcessDiagramGenerator;
 import org.activiti.spring.ProcessEngineFactoryBean;
 import org.activiti.spring.SpringProcessEngineConfiguration;
@@ -23,8 +10,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+import javax.sql.DataSource;
 
 /**
  * Created by liuruijie on 2017/2/20.
@@ -33,83 +20,83 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 @Configuration
 public class ActivitiConfig {
 
-    @Value("${dataType}")
-    private String dataType;
-
-    /**
-     * spring 集成 activiti
-     */
-    @Bean
-    public ProcessEngineConfiguration processEngineConfiguration(DataSource dataSource, PlatformTransactionManager transactionManager) {
-        SpringProcessEngineConfiguration processEngineConfiguration = new SpringProcessEngineConfiguration();
-        processEngineConfiguration.setDataSource(dataSource);
-        //表不存在创建表
-        processEngineConfiguration.setDatabaseSchemaUpdate("true");
-        //指定数据库
-        processEngineConfiguration.setDatabaseType(dataType);
-        processEngineConfiguration.setTransactionManager(transactionManager);
-        //历史变量
-        processEngineConfiguration.setHistory("full");
-        //指定字体
-        processEngineConfiguration.setActivityFontName("宋体");
-        processEngineConfiguration.setAnnotationFontName("宋体");
-        processEngineConfiguration.setLabelFontName("宋体");
-
-        processEngineConfiguration.setProcessDiagramGenerator(new DefaultProcessDiagramGenerator());
-
-        return processEngineConfiguration;
-    }
-
-    //流程引擎，与spring整合使用factoryBean
-    @Bean
-    public ProcessEngineFactoryBean processEngine(ProcessEngineConfiguration processEngineConfiguration) {
-        ProcessEngineFactoryBean processEngineFactoryBean = new ProcessEngineFactoryBean();
-        processEngineFactoryBean.setProcessEngineConfiguration((ProcessEngineConfigurationImpl) processEngineConfiguration);
-        return processEngineFactoryBean;
-    }
-
-    @Bean
-    public RepositoryService repositoryService(ProcessEngine processEngine) {
-        return processEngine.getRepositoryService();
-    }
-
-    @Bean
-    public RuntimeService runtimeService(ProcessEngine processEngine) {
-        return processEngine.getRuntimeService();
-    }
-
-    @Bean
-    public TaskService taskService(ProcessEngine processEngine) {
-        return processEngine.getTaskService();
-    }
-
-    @Bean
-    public HistoryService historyService(ProcessEngine processEngine) {
-        return processEngine.getHistoryService();
-    }
-
-    @Bean
-    public FormService formService(ProcessEngine processEngine) {
-        return processEngine.getFormService();
-    }
-
-    @Bean
-    public IdentityService identityService(ProcessEngine processEngine) {
-        return processEngine.getIdentityService();
-    }
-
-    @Bean
-    public ManagementService managementService(ProcessEngine processEngine) {
-        return processEngine.getManagementService();
-    }
-
-    @Bean
-    public DynamicBpmnService dynamicBpmnService(ProcessEngine processEngine) {
-        return processEngine.getDynamicBpmnService();
-    }
-
-    @Bean
-    public ObjectMapper objectMapper() {
-        return new ObjectMapper();
-    }
+	@Value("${dataType}")
+	private String dataType;
+
+	/**
+	 * spring 集成 activiti
+	 */
+	@Bean
+	public ProcessEngineConfiguration processEngineConfiguration(DataSource dataSource, PlatformTransactionManager transactionManager) {
+		SpringProcessEngineConfiguration processEngineConfiguration = new SpringProcessEngineConfiguration();
+		processEngineConfiguration.setDataSource(dataSource);
+		//表不存在创建表
+		processEngineConfiguration.setDatabaseSchemaUpdate("true");
+		//指定数据库
+		processEngineConfiguration.setDatabaseType(dataType);
+		processEngineConfiguration.setTransactionManager(transactionManager);
+		//历史变量
+		processEngineConfiguration.setHistory("full");
+		//指定字体
+		processEngineConfiguration.setActivityFontName("宋体");
+		processEngineConfiguration.setAnnotationFontName("宋体");
+		processEngineConfiguration.setLabelFontName("宋体");
+
+		processEngineConfiguration.setProcessDiagramGenerator(new DefaultProcessDiagramGenerator());
+
+		return processEngineConfiguration;
+	}
+
+	//流程引擎，与spring整合使用factoryBean
+	@Bean
+	public ProcessEngineFactoryBean processEngine(ProcessEngineConfiguration processEngineConfiguration) {
+		ProcessEngineFactoryBean processEngineFactoryBean = new ProcessEngineFactoryBean();
+		processEngineFactoryBean.setProcessEngineConfiguration((ProcessEngineConfigurationImpl) processEngineConfiguration);
+		return processEngineFactoryBean;
+	}
+
+	@Bean
+	public RepositoryService repositoryService(ProcessEngine processEngine) {
+		return processEngine.getRepositoryService();
+	}
+
+	@Bean
+	public RuntimeService runtimeService(ProcessEngine processEngine) {
+		return processEngine.getRuntimeService();
+	}
+
+	@Bean
+	public TaskService taskService(ProcessEngine processEngine) {
+		return processEngine.getTaskService();
+	}
+
+	@Bean
+	public HistoryService historyService(ProcessEngine processEngine) {
+		return processEngine.getHistoryService();
+	}
+
+	@Bean
+	public FormService formService(ProcessEngine processEngine) {
+		return processEngine.getFormService();
+	}
+
+	@Bean
+	public IdentityService identityService(ProcessEngine processEngine) {
+		return processEngine.getIdentityService();
+	}
+
+	@Bean
+	public ManagementService managementService(ProcessEngine processEngine) {
+		return processEngine.getManagementService();
+	}
+
+	@Bean
+	public DynamicBpmnService dynamicBpmnService(ProcessEngine processEngine) {
+		return processEngine.getDynamicBpmnService();
+	}
+
+	@Bean
+	public ObjectMapper objectMapper() {
+		return new ObjectMapper();
+	}
 }
diff --git a/len-activiti/src/main/java/com/len/controller/ActivitiController.java b/len-activiti/src/main/java/com/len/controller/ActivitiController.java
index 70b477e..9c12baa 100644
--- a/len-activiti/src/main/java/com/len/controller/ActivitiController.java
+++ b/len-activiti/src/main/java/com/len/controller/ActivitiController.java
@@ -74,394 +74,382 @@ import java.util.*;
 @RequestMapping(value = "/act")
 public class ActivitiController extends BaseController {
 
-    @Autowired
-    private RepositoryService repositoryService;
-
-    @Autowired
-    private ObjectMapper objectMapper;
-
-    @Autowired
-    private IdentityService identityService;
-
-    @Autowired
-    private SysUserService userService;
-
-    @Autowired
-    private RoleService roleService;
-
-    @Autowired
-    private RoleUserService roleUserService;
-
-    @Autowired
-    private ActAssigneeService actAssigneeService;
-
-    @Autowired
-    ActivitiService activitiService;
-
-
-    /**
-     * 同步用户 角色 用户角色到activiti表中
-     */
-    @PostMapping(value = "syncdata")
-    @ResponseBody
-    public LenResponse syncdata() {
-        LenResponse j = new LenResponse();
-        try {
-            List<SysUser> userList = userService.list();
-            User au;
-            for (SysUser user : userList) {
-                au = new UserEntity();
-                au.setId(user.getId());
+	@Autowired
+	ActivitiService activitiService;
+	@Autowired
+	ActPropertiesConfig actPropertiesConfig;
+	@Autowired
+	private RepositoryService repositoryService;
+	@Autowired
+	private ObjectMapper objectMapper;
+	@Autowired
+	private IdentityService identityService;
+	@Autowired
+	private SysUserService userService;
+	@Autowired
+	private RoleService roleService;
+	@Autowired
+	private RoleUserService roleUserService;
+	@Autowired
+	private ActAssigneeService actAssigneeService;
+
+	/**
+	 * 同步用户 角色 用户角色到activiti表中
+	 */
+	@PostMapping(value = "syncdata")
+	@ResponseBody
+	public LenResponse syncdata() {
+		LenResponse j = new LenResponse();
+		try {
+			List<SysUser> userList = userService.list();
+			User au;
+			for (SysUser user : userList) {
+				au = new UserEntity();
+				au.setId(user.getId());
 //                au.setFirstName(user.getRealName());
-                au.setEmail(user.getEmail());
-                identityService.deleteUser(au.getId());
-                identityService.saveUser(au);
-            }
-            List<SysRole> sysRoleList = roleService.list();
-            Group group;
-            for (SysRole role : sysRoleList) {
-                group = new GroupEntity();
-                group.setId(role.getId());
-                group.setName(role.getRoleName());
-                identityService.deleteGroup(group.getId());
-                identityService.saveGroup(group);
-            }
-            List<SysRoleUser> roleUserList = roleUserService.list();
-
-            for (SysRoleUser sysRoleUser : roleUserList) {
-                identityService.deleteMembership(sysRoleUser.getUserId(), sysRoleUser.getRoleId());
-                identityService.createMembership(sysRoleUser.getUserId(), sysRoleUser.getRoleId());
-            }
-            j.setMsg("同步成功");
-        } catch (LenException e) {
-            j.setFlag(false);
-            j.setMsg("同步失败");
-            e.printStackTrace();
-        }
-        return j;
-    }
-
-
-    @GetMapping(value = "goActiviti")
-    public String goActiviti() throws UnsupportedEncodingException {
-        Model model = repositoryService.newModel();
-
-        String name = "新建流程";
-        String description = "";
-        int revision = 1;
-        String key = "processKey";
-
-        ObjectNode modelNode = objectMapper.createObjectNode();
-        modelNode.put(ModelDataJsonConstants.MODEL_NAME, name);
-        modelNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, description);
-        modelNode.put(ModelDataJsonConstants.MODEL_REVISION, revision);
-
-        model.setName(name);
-        model.setKey(key);
-        model.setMetaInfo(modelNode.toString());
-
-        repositoryService.saveModel(model);
-        String id = model.getId();
-
-        //完善ModelEditorSource
-        JSONObject editor = new JSONObject();
-        editor.put("id", "canvas");
-        editor.put("resourceId", "canvas");
-        JSONObject stencil = new JSONObject();
-        stencil.put("namespace", "http://lenosp.cn#");
-        editor.put("stencilset", stencil);
-        repositoryService.addModelEditorSource(id, editor.toString().getBytes(StandardCharsets.UTF_8));
-        return "redirect:/static/modeler.html?modelId=" + id;
-    }
-
-    @GetMapping("actUpdate/{id}")
-    public String actUpdate(@PathVariable String id) {
-        return "redirect:/static/modeler.html?modelId=" + id;
-    }
-
-    @GetMapping(value = "goAct")
-    public String goAct(org.springframework.ui.Model model) {
-        return "/actList";
-    }
-
-    /**
-     * 部署列表
-     */
-    @GetMapping(value = "showAct")
-    @ResponseBody
-    public ReType showAct(org.springframework.ui.Model model, ProcessDefinition definition,
-                          String page, String limit) {
-        ProcessDefinitionQuery processDefinitionQuery = repositoryService
-                .createProcessDefinitionQuery();
-        List<org.activiti.engine.repository.ProcessDefinition> processDefinitionList = null;
-        if (definition != null) {
-            if (!StringUtils.isEmpty(definition.getDeploymentId())) {
-                processDefinitionQuery.deploymentId(definition.getDeploymentId());
-            }
-            if (!StringUtils.isEmpty(definition.getName())) {
-                processDefinitionQuery.processDefinitionNameLike("%" + definition.getName() + "%");
-
-            }
-        }
-        processDefinitionList = processDefinitionQuery.listPage(Integer.valueOf(limit) * (Integer.valueOf(page) - 1), Integer.valueOf(limit));
-        long count = repositoryService.createProcessDefinitionQuery().count();
+				au.setEmail(user.getEmail());
+				identityService.deleteUser(au.getId());
+				identityService.saveUser(au);
+			}
+			List<SysRole> sysRoleList = roleService.list();
+			Group group;
+			for (SysRole role : sysRoleList) {
+				group = new GroupEntity();
+				group.setId(role.getId());
+				group.setName(role.getRoleName());
+				identityService.deleteGroup(group.getId());
+				identityService.saveGroup(group);
+			}
+			List<SysRoleUser> roleUserList = roleUserService.list();
+
+			for (SysRoleUser sysRoleUser : roleUserList) {
+				identityService.deleteMembership(sysRoleUser.getUserId(), sysRoleUser.getRoleId());
+				identityService.createMembership(sysRoleUser.getUserId(), sysRoleUser.getRoleId());
+			}
+			j.setMsg("同步成功");
+		} catch (LenException e) {
+			j.setFlag(false);
+			j.setMsg("同步失败");
+			e.printStackTrace();
+		}
+		return j;
+	}
+
+	@GetMapping(value = "goActiviti")
+	public String goActiviti() throws UnsupportedEncodingException {
+		Model model = repositoryService.newModel();
+
+		String name = "新建流程";
+		String description = "";
+		int revision = 1;
+		String key = "processKey";
+
+		ObjectNode modelNode = objectMapper.createObjectNode();
+		modelNode.put(ModelDataJsonConstants.MODEL_NAME, name);
+		modelNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, description);
+		modelNode.put(ModelDataJsonConstants.MODEL_REVISION, revision);
+
+		model.setName(name);
+		model.setKey(key);
+		model.setMetaInfo(modelNode.toString());
+
+		repositoryService.saveModel(model);
+		String id = model.getId();
+
+		//完善ModelEditorSource
+		JSONObject editor = new JSONObject();
+		editor.put("id", "canvas");
+		editor.put("resourceId", "canvas");
+		JSONObject stencil = new JSONObject();
+		stencil.put("namespace", "http://lenosp.cn#");
+		editor.put("stencilset", stencil);
+		repositoryService.addModelEditorSource(id, editor.toString().getBytes(StandardCharsets.UTF_8));
+		return "redirect:/static/modeler.html?modelId=" + id;
+	}
+
+	@GetMapping("actUpdate/{id}")
+	public String actUpdate(@PathVariable String id) {
+		return "redirect:/static/modeler.html?modelId=" + id;
+	}
+
+	@GetMapping(value = "goAct")
+	public String goAct(org.springframework.ui.Model model) {
+		return "/actList";
+	}
+
+	/**
+	 * 部署列表
+	 */
+	@GetMapping(value = "showAct")
+	@ResponseBody
+	public ReType showAct(org.springframework.ui.Model model, ProcessDefinition definition,
+						  String page, String limit) {
+		ProcessDefinitionQuery processDefinitionQuery = repositoryService
+			.createProcessDefinitionQuery();
+		List<org.activiti.engine.repository.ProcessDefinition> processDefinitionList = null;
+		if (definition != null) {
+			if (!StringUtils.isEmpty(definition.getDeploymentId())) {
+				processDefinitionQuery.deploymentId(definition.getDeploymentId());
+			}
+			if (!StringUtils.isEmpty(definition.getName())) {
+				processDefinitionQuery.processDefinitionNameLike("%" + definition.getName() + "%");
+
+			}
+		}
+		processDefinitionList = processDefinitionQuery.listPage(Integer.valueOf(limit) * (Integer.valueOf(page) - 1), Integer.valueOf(limit));
+		long count = repositoryService.createProcessDefinitionQuery().count();
 //        long count = repositoryService.createDeploymentQuery().count();
-        List<ProcessDefinition> list = new ArrayList<>();
-        processDefinitionList
-                .forEach(processDefinition -> list.add(new ProcessDefinition(processDefinition)));
-        return new ReType(count, list);
-    }
-
-
-    @GetMapping(value = "goActModel")
-    public String goActModel(org.springframework.ui.Model model) {
-        return "/actModelList";
-    }
-
-    /**
-     * 模型列表
-     */
-    @GetMapping(value = "showAm")
-    @ResponseBody
-    public ReType showModel(org.springframework.ui.Model model, ActModel actModel, String page,
-                            String limit) {
-        ModelQuery modelQuery = repositoryService.createModelQuery();
-        if (actModel != null) {
-            if (!StringUtils.isEmpty(actModel.getKey())) {
-                modelQuery.modelKey(actModel.getKey());
-            }
-            if (!StringUtils.isEmpty(actModel.getName())) {
-                modelQuery.modelNameLike("%" + actModel.getName() + "%");
-            }
-        }
-        List<Model> models = modelQuery
-                .listPage(Integer.valueOf(limit) * (Integer.valueOf(page) - 1), Integer.valueOf(limit));
-        long count = repositoryService.createModelQuery().count();
-        List<ActModel> list = new ArrayList<>();
-        models.forEach(mo -> list.add(new ActModel(mo)));
-        return new ReType(count, list);
-    }
-
-    /**
-     * 发布流程
-     */
-    @PostMapping(value = "open")
-    @ResponseBody
-    public LenResponse open(String id) {
-        String msg = "发布成功";
-        LenResponse j = new LenResponse();
-        try {
-            Model modelData = repositoryService.getModel(id);
-            byte[] bytes = repositoryService.getModelEditorSource(modelData.getId());
-
-            if (bytes == null) {
-                return LenResponse.error("模型为空");
-            }
-            JsonNode modelNode = null;
-            modelNode = new ObjectMapper().readTree(bytes);
-            BpmnModel model = new BpmnJsonConverter().convertToBpmnModel(modelNode);
-            if (model.getProcesses().size() == 0) {
-                return LenResponse.error("数据不符合要求");
-            }
-            byte[] bpmnBytes = new BpmnXMLConverter().convertToXML(model);
-            //发布流程
-            String processName = modelData.getName() + ".bpmn20.xml";
-            String convertToXML = new String(bpmnBytes);
-
-            System.out.println(convertToXML);
-            Deployment deployment = repositoryService.createDeployment()
-                    .name(modelData.getName())
-                    .addString(processName, new String(bpmnBytes, "UTF-8"))
-                    .deploy();
-            modelData.setDeploymentId(deployment.getId());
-            repositoryService.saveModel(modelData);
-        } catch (LenException e) {
-            msg = "发布数失败";
-            j.setFlag(false);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        j.setMsg(msg);
-        return j;
-    }
-
-
-    /**
-     * 根据流程部署id获取节点并且传到前端
-     *
-     * @param deploymentId 部署id
-     * @param model
-     * @return
-     */
-    @GetMapping("goAssignee/{deploymentId}")
-    public String goAssignee(@PathVariable("deploymentId") String deploymentId,
-                             org.springframework.ui.Model model) {
-        /**根据流程实例id查询出所有流程节点*/
-        List<ActivityImpl> activityList = actAssigneeService.getActivityList(deploymentId);
-        /**角色和节点关系封装成list*/
-        List<SysRole> roleList = roleService.list();
-        Checkbox checkbox = null;
-        Map<String, Object> map = null;
-        List<Map<String, Object>> mapList = new ArrayList<>();
-        List<ActAssignee> assigneeList = null;
-        List<Checkbox> checkboxList = null;
-        for (ActivityImpl activiti : activityList) {
-            map = new HashMap<>();
-            String name = (String) activiti.getProperty("name");
-            if (StringUtils.isEmpty(name) || "start".equals(name) || "end".equals(name)) {
-                continue;
-            }
-            //节点id 、name、节点目前关联的角色 封装成进map
-            String nodeId = activiti.getId();
-            assigneeList = actAssigneeService.list(new QueryWrapper<>(new ActAssignee(nodeId)));
-            List<String> strings = new ArrayList<>();
-            assigneeList.forEach(actAssignee1 -> strings.add(actAssignee1.getRoleId()));
-            map.put("id", nodeId);
-            map.put("name", name);
-            checkboxList = new ArrayList<>();
-            for (SysRole role : roleList) {
-                checkbox = new Checkbox();
-                checkbox.setId(role.getId());
-                checkbox.setName(role.getRoleName());
-                if (strings.contains(role.getId())) {
-                    checkbox.setCheck(true);
-                }
-                checkboxList.add(checkbox);
-            }
-            map.put("boxJson", checkboxList);
-            mapList.add(map);
-        }
-        model.addAttribute("actList", mapList);
-
-        return "act/deploy/act-node";
-    }
-
-    /**
-     * 节点更新配置办理者(人/组)
-     *
-     * @param request
-     * @return
-     */
-    @PostMapping("goAssignee/updateNode")
-    @ResponseBody
-    public LenResponse updateNode(HttpServletRequest request) {
-        LenResponse j = new LenResponse();
-
-        Map<String, String[]> map = request.getParameterMap();
-        List<ActAssignee> assigneeList = new ArrayList<>();
-        ActAssignee assignee = null;
-        for (Map.Entry<String, String[]> entry : map.entrySet()) {
-            assignee = new ActAssignee();
-            int sub = entry.getKey().lastIndexOf("_");
-            String nodeId = entry.getKey().substring(0, sub);
-            nodeId = nodeId.substring(nodeId.lastIndexOf("_") + 1, nodeId.length());
-            String nodeName = entry.getKey().substring(entry.getKey().lastIndexOf("_") + 1, entry.getKey().length());
-            //更新进list
-            assignee.setAssigneeType(3);
-            assignee.setRoleId(entry.getValue()[0]);
-            assignee.setSid(nodeId);
-            assignee.setActivtiName(nodeName);
-            //先清除
-            actAssigneeService.deleteByNodeId(nodeId);
-            assigneeList.add(assignee);
-        }
-        //后添加 在map循环里添加 多角色会导致添加了的再次被删除 so 要拿出来
-        for (ActAssignee actAssignee : assigneeList) {
-            actAssigneeService.save(actAssignee);
-        }
-        j.setMsg("更新成功");
-        return j;
-    }
-
-    /**
-     * 删除流程定义 级联 删除 流程节点绑定信息
-     *
-     * @param model
-     * @param id
-     * @return
-     */
-    @PostMapping("delDeploy")
-    @ResponseBody
-    public LenResponse delDeploy(org.springframework.ui.Model model, String id) {
-        LenResponse j = new LenResponse();
-        try {
-            List<ActivityImpl> activityList = actAssigneeService.getActivityList(id);
-            for (ActivityImpl activity : activityList) {
-                String nodeId = activity.getId();
-                if (StringUtils.isEmpty(nodeId) || "start".equals(nodeId) || "end".equals(nodeId)) {
-                    continue;
-                }
-                /**接触节点和代办关联*/
-                actAssigneeService.deleteByNodeId(nodeId);
-            }
-            repositoryService.deleteDeployment(id, true);
-            j.setMsg("删除成功");
-        } catch (LenException e) {
-            j.setMsg("删除失败");
-            j.setFlag(false);
-            e.printStackTrace();
-        }
-        return j;
-    }
-
-    @Autowired
-    ActPropertiesConfig actPropertiesConfig;
-
-    @GetMapping("shinePics/{processInstanceId}")
-    public String shinePics(org.springframework.ui.Model model, @PathVariable String processInstanceId) {
-        model.addAttribute("processInstanceId", processInstanceId);
-        return "/act/activiti/shinePics";
-    }
-
-    @GetMapping("getShineProcImage")
-    @ResponseBody
-    public JSONObject getShineProcImage(HttpServletRequest request, HttpServletResponse resp, String processInstanceId)
-            throws IOException {
-        JSONObject result = new JSONObject();
-        JSONArray shineProImages = new JSONArray();
-        InputStream imageStream = activitiService.generateStream(processInstanceId, true);
-        if (imageStream != null) {
-            String imageCurrentNode = Base64Utils.ioToBase64(imageStream);
-            if (StringUtils.isNotBlank(imageCurrentNode)) {
-                shineProImages.add(imageCurrentNode);
-            }
-        }
-        InputStream imageNoCurrentStream = activitiService.generateStream(processInstanceId, false);
-        if (imageNoCurrentStream != null) {
-            String imageNoCurrentNode = Base64Utils.ioToBase64(imageNoCurrentStream);
-            if (StringUtils.isNotBlank(imageNoCurrentNode)) {
-                shineProImages.add(imageNoCurrentNode);
-            }
-        }
-
-        List<ActivitiProcess> taskSqu = activitiService.getTaskSqu(processInstanceId);
-
-
-        result.put("id", UUID.randomUUID().toString());
-        result.put("errorNo", 0);
-        result.put("images", shineProImages);
-        result.put("taskSqu", taskSqu);
-        return result;
-    }
-
-    @PostMapping("delModel")
-    @ResponseBody
-    public LenResponse delModel(String id) {
-        String modelId = actPropertiesConfig.getModelId();
-        if (id.equals(modelId)) {
-            return LenResponse.error("演示禁止删除");
-        }
-        LenResponse j = new LenResponse();
-        try {
-            repositoryService.deleteModel(id);
-            j.setMsg("删除成功");
-        } catch (LenException e) {
-            j.setMsg("删除失败");
-            j.setFlag(false);
-            e.printStackTrace();
-        }
-        return j;
-    }
+		List<ProcessDefinition> list = new ArrayList<>();
+		processDefinitionList
+			.forEach(processDefinition -> list.add(new ProcessDefinition(processDefinition)));
+		return new ReType(count, list);
+	}
+
+	@GetMapping(value = "goActModel")
+	public String goActModel(org.springframework.ui.Model model) {
+		return "/actModelList";
+	}
+
+	/**
+	 * 模型列表
+	 */
+	@GetMapping(value = "showAm")
+	@ResponseBody
+	public ReType showModel(org.springframework.ui.Model model, ActModel actModel, String page,
+							String limit) {
+		ModelQuery modelQuery = repositoryService.createModelQuery();
+		if (actModel != null) {
+			if (!StringUtils.isEmpty(actModel.getKey())) {
+				modelQuery.modelKey(actModel.getKey());
+			}
+			if (!StringUtils.isEmpty(actModel.getName())) {
+				modelQuery.modelNameLike("%" + actModel.getName() + "%");
+			}
+		}
+		List<Model> models = modelQuery
+			.listPage(Integer.valueOf(limit) * (Integer.valueOf(page) - 1), Integer.valueOf(limit));
+		long count = repositoryService.createModelQuery().count();
+		List<ActModel> list = new ArrayList<>();
+		models.forEach(mo -> list.add(new ActModel(mo)));
+		return new ReType(count, list);
+	}
+
+	/**
+	 * 发布流程
+	 */
+	@PostMapping(value = "open")
+	@ResponseBody
+	public LenResponse open(String id) {
+		String msg = "发布成功";
+		LenResponse j = new LenResponse();
+		try {
+			Model modelData = repositoryService.getModel(id);
+			byte[] bytes = repositoryService.getModelEditorSource(modelData.getId());
+
+			if (bytes == null) {
+				return LenResponse.error("模型为空");
+			}
+			JsonNode modelNode = null;
+			modelNode = new ObjectMapper().readTree(bytes);
+			BpmnModel model = new BpmnJsonConverter().convertToBpmnModel(modelNode);
+			if (model.getProcesses().size() == 0) {
+				return LenResponse.error("数据不符合要求");
+			}
+			byte[] bpmnBytes = new BpmnXMLConverter().convertToXML(model);
+			//发布流程
+			String processName = modelData.getName() + ".bpmn20.xml";
+			String convertToXML = new String(bpmnBytes);
+
+			System.out.println(convertToXML);
+			Deployment deployment = repositoryService.createDeployment()
+				.name(modelData.getName())
+				.addString(processName, new String(bpmnBytes, "UTF-8"))
+				.deploy();
+			modelData.setDeploymentId(deployment.getId());
+			repositoryService.saveModel(modelData);
+		} catch (LenException e) {
+			msg = "发布数失败";
+			j.setFlag(false);
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		j.setMsg(msg);
+		return j;
+	}
+
+	/**
+	 * 根据流程部署id获取节点并且传到前端
+	 *
+	 * @param deploymentId 部署id
+	 * @param model
+	 * @return
+	 */
+	@GetMapping("goAssignee/{deploymentId}")
+	public String goAssignee(@PathVariable("deploymentId") String deploymentId,
+							 org.springframework.ui.Model model) {
+		/**根据流程实例id查询出所有流程节点*/
+		List<ActivityImpl> activityList = actAssigneeService.getActivityList(deploymentId);
+		/**角色和节点关系封装成list*/
+		List<SysRole> roleList = roleService.list();
+		Checkbox checkbox = null;
+		Map<String, Object> map = null;
+		List<Map<String, Object>> mapList = new ArrayList<>();
+		List<ActAssignee> assigneeList = null;
+		List<Checkbox> checkboxList = null;
+		for (ActivityImpl activiti : activityList) {
+			map = new HashMap<>();
+			String name = (String) activiti.getProperty("name");
+			if (StringUtils.isEmpty(name) || "start".equals(name) || "end".equals(name)) {
+				continue;
+			}
+			//节点id 、name、节点目前关联的角色 封装成进map
+			String nodeId = activiti.getId();
+			assigneeList = actAssigneeService.list(new QueryWrapper<>(new ActAssignee(nodeId)));
+			List<String> strings = new ArrayList<>();
+			assigneeList.forEach(actAssignee1 -> strings.add(actAssignee1.getRoleId()));
+			map.put("id", nodeId);
+			map.put("name", name);
+			checkboxList = new ArrayList<>();
+			for (SysRole role : roleList) {
+				checkbox = new Checkbox();
+				checkbox.setId(role.getId());
+				checkbox.setName(role.getRoleName());
+				if (strings.contains(role.getId())) {
+					checkbox.setCheck(true);
+				}
+				checkboxList.add(checkbox);
+			}
+			map.put("boxJson", checkboxList);
+			mapList.add(map);
+		}
+		model.addAttribute("actList", mapList);
+
+		return "act/deploy/act-node";
+	}
+
+	/**
+	 * 节点更新配置办理者(人/组)
+	 *
+	 * @param request
+	 * @return
+	 */
+	@PostMapping("goAssignee/updateNode")
+	@ResponseBody
+	public LenResponse updateNode(HttpServletRequest request) {
+		LenResponse j = new LenResponse();
+
+		Map<String, String[]> map = request.getParameterMap();
+		List<ActAssignee> assigneeList = new ArrayList<>();
+		ActAssignee assignee = null;
+		for (Map.Entry<String, String[]> entry : map.entrySet()) {
+			assignee = new ActAssignee();
+			int sub = entry.getKey().lastIndexOf("_");
+			String nodeId = entry.getKey().substring(0, sub);
+			nodeId = nodeId.substring(nodeId.lastIndexOf("_") + 1, nodeId.length());
+			String nodeName = entry.getKey().substring(entry.getKey().lastIndexOf("_") + 1, entry.getKey().length());
+			//更新进list
+			assignee.setAssigneeType(3);
+			assignee.setRoleId(entry.getValue()[0]);
+			assignee.setSid(nodeId);
+			assignee.setActivtiName(nodeName);
+			//先清除
+			actAssigneeService.deleteByNodeId(nodeId);
+			assigneeList.add(assignee);
+		}
+		//后添加 在map循环里添加 多角色会导致添加了的再次被删除 so 要拿出来
+		for (ActAssignee actAssignee : assigneeList) {
+			actAssigneeService.save(actAssignee);
+		}
+		j.setMsg("更新成功");
+		return j;
+	}
+
+	/**
+	 * 删除流程定义 级联 删除 流程节点绑定信息
+	 *
+	 * @param model
+	 * @param id
+	 * @return
+	 */
+	@PostMapping("delDeploy")
+	@ResponseBody
+	public LenResponse delDeploy(org.springframework.ui.Model model, String id) {
+		LenResponse j = new LenResponse();
+		try {
+			List<ActivityImpl> activityList = actAssigneeService.getActivityList(id);
+			for (ActivityImpl activity : activityList) {
+				String nodeId = activity.getId();
+				if (StringUtils.isEmpty(nodeId) || "start".equals(nodeId) || "end".equals(nodeId)) {
+					continue;
+				}
+				/**接触节点和代办关联*/
+				actAssigneeService.deleteByNodeId(nodeId);
+			}
+			repositoryService.deleteDeployment(id, true);
+			j.setMsg("删除成功");
+		} catch (LenException e) {
+			j.setMsg("删除失败");
+			j.setFlag(false);
+			e.printStackTrace();
+		}
+		return j;
+	}
+
+	@GetMapping("shinePics/{processInstanceId}")
+	public String shinePics(org.springframework.ui.Model model, @PathVariable String processInstanceId) {
+		model.addAttribute("processInstanceId", processInstanceId);
+		return "/act/activiti/shinePics";
+	}
+
+	@GetMapping("getShineProcImage")
+	@ResponseBody
+	public JSONObject getShineProcImage(HttpServletRequest request, HttpServletResponse resp, String processInstanceId)
+		throws IOException {
+		JSONObject result = new JSONObject();
+		JSONArray shineProImages = new JSONArray();
+		InputStream imageStream = activitiService.generateStream(processInstanceId, true);
+		if (imageStream != null) {
+			String imageCurrentNode = Base64Utils.ioToBase64(imageStream);
+			if (StringUtils.isNotBlank(imageCurrentNode)) {
+				shineProImages.add(imageCurrentNode);
+			}
+		}
+		InputStream imageNoCurrentStream = activitiService.generateStream(processInstanceId, false);
+		if (imageNoCurrentStream != null) {
+			String imageNoCurrentNode = Base64Utils.ioToBase64(imageNoCurrentStream);
+			if (StringUtils.isNotBlank(imageNoCurrentNode)) {
+				shineProImages.add(imageNoCurrentNode);
+			}
+		}
+
+		List<ActivitiProcess> taskSqu = activitiService.getTaskSqu(processInstanceId);
+
+
+		result.put("id", UUID.randomUUID().toString());
+		result.put("errorNo", 0);
+		result.put("images", shineProImages);
+		result.put("taskSqu", taskSqu);
+		return result;
+	}
+
+	@PostMapping("delModel")
+	@ResponseBody
+	public LenResponse delModel(String id) {
+		String modelId = actPropertiesConfig.getModelId();
+		if (id.equals(modelId)) {
+			return LenResponse.error("演示禁止删除");
+		}
+		LenResponse j = new LenResponse();
+		try {
+			repositoryService.deleteModel(id);
+			j.setMsg("删除成功");
+		} catch (LenException e) {
+			j.setMsg("删除失败");
+			j.setFlag(false);
+			e.printStackTrace();
+		}
+		return j;
+	}
 
 
 }
diff --git a/len-activiti/src/main/java/com/len/controller/UserLeaveController.java b/len-activiti/src/main/java/com/len/controller/UserLeaveController.java
index 25a92cd..d572f36 100644
--- a/len-activiti/src/main/java/com/len/controller/UserLeaveController.java
+++ b/len-activiti/src/main/java/com/len/controller/UserLeaveController.java
@@ -61,8 +61,8 @@ import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 
 /**
  * @author zhuxiaomeng
@@ -75,498 +75,493 @@ import java.util.List;
 @RequestMapping("/leave")
 public class UserLeaveController extends BaseController {
 
-    @Autowired
-    UserLeaveService leaveService;
-
-    @Autowired
-    RuntimeService runtimeService;
-
-    @Autowired
-    TaskService taskService;
-
-    @Autowired
-    IdentityService identityService;
-
-    @Autowired
-    RepositoryService repositoryService;
-
-    @Autowired
-    ProcessEngineFactoryBean processEngine;
-
-    @Autowired
-    ProcessEngineConfiguration processEngineConfiguration;
-
-    @Autowired
-    RoleUserService roleUserService;
-
-    private String leaveOpinionList = "leaveOpinionList";
-
-
-    @GetMapping(value = "showMain")
-    public String showMain(Model model) {
-        return "/dashboard/dashboard";
-    }
-
-
-    @GetMapping(value = "showMain2")
-    public String showMain2(Model model) {
-        return "/dashboard/dashboard2";
-    }
-
-    @GetMapping(value = "showLeave")
-    public String showUser(Model model) {
-        return "/act/leave/leaveList";
-    }
-
-    @GetMapping(value = "showLeaveList")
-    @ResponseBody
-    public ReType showLeaveList(UserLeave userLeave, String page, String limit) {
-        String userId = CommonUtil.getUser().getId();
-        userLeave.setUserId(userId);
-        List<UserLeave> tList = null;
-        Page<UserLeave> tPage = PageHelper.startPage(Integer.valueOf(page), Integer.valueOf(limit));
-        try {
-            tList = leaveService.selectListByPage(userLeave);
-            for (UserLeave leave : tList) {
-                ProcessInstance instance = runtimeService.createProcessInstanceQuery()
-                        .processInstanceId(leave.getProcessInstanceId()).singleResult();
-                //保证运行ing
-                if (instance != null) {
-                    Task task = this.taskService.createTaskQuery().processInstanceId(leave.getProcessInstanceId()).singleResult();
-                    leave.setTaskName(task.getName());
-                }
-            }
-        } catch (LenException e) {
-            e.printStackTrace();
-        }
-        return new ReType(tPage.getTotal(), tList);
-    }
-
-    /**
-     * 根据 执行对象id获取审批信息
-     *
-     * @param model
-     * @param processId
-     * @return
-     */
-    @GetMapping("leaveDetail")
-    public String leaveDetail(Model model, String processId) {
-        ProcessInstance instance = runtimeService.createProcessInstanceQuery()
-                .processInstanceId(processId).singleResult();
-        //保证运行ing
-        List<LeaveOpinion> leaveList = null;
-        if (instance != null) {
-            Task task = this.taskService.createTaskQuery().processInstanceId(processId).singleResult();
-            Map<String, Object> variables = taskService.getVariables(task.getId());
-            Object o = variables.get(leaveOpinionList);
-            if (o != null) {
-                /*获取历史审核信息*/
-                leaveList = (List<LeaveOpinion>) o;
-            }
-        } else {
-            leaveList = new ArrayList<>();
-            List<HistoricDetail> list = historyService.createHistoricDetailQuery().
-                    processInstanceId(processId).list();
-            HistoricVariableUpdate variable = null;
-            for (HistoricDetail historicDetail : list) {
-                variable = (HistoricVariableUpdate) historicDetail;
-                if (leaveOpinionList.equals(variable.getVariableName())) {
-                    leaveList.clear();
-                    leaveList.addAll((List<LeaveOpinion>) variable.getValue());
-                }
-            }
-        }
-        model.addAttribute("leaveDetail", JSON.toJSONString(leaveList));
-        return "/act/leave/leaveDetail";
-    }
-
-    @GetMapping("addLeave")
-    public String addLeave() {
-        return "/act/leave/add-leave";
-    }
-
-    @GetMapping("updateLeave/{taskId}")
-    public String updateLeave(Model model, @PathVariable String taskId) {
-        Map<String, Object> variables = taskService.getVariables(taskId);
-        BaseTask baseTask = (BaseTask) variables.get("baseTask");
-        UserLeave leave = leaveService.getById(baseTask.getId());
-        model.addAttribute("leave", leave);
-        model.addAttribute("taskId", taskId);
-        return "/act/leave/update-leave";
-    }
-
-    @PostMapping("updateLeave/updateLeave/{taskId}/{id}/{flag}")
-    @ResponseBody
-    public LenResponse updateLeave(UserLeave leave, @PathVariable String taskId, @PathVariable String id, @PathVariable boolean flag) {
-        LenResponse j = new LenResponse();
-        try {
-            UserLeave oldLeave = leaveService.getById(leave.getId());
-            BeanUtil.copyNotNullBean(leave, oldLeave);
-            QueryWrapper<UserLeave> userLeaveQueryWrapper = new QueryWrapper<>(oldLeave);
-            leaveService.update(userLeaveQueryWrapper);
-
-            Map<String, Object> variables = taskService.getVariables(taskId);
-            Map<String, Object> map = new HashMap<>();
-            if (flag) {
-                map.put("flag", true);
-            } else {
-                map.put("flag", false);
-            }
-            taskService.complete(taskId, map);
-            j.setMsg("保存成功");
-        } catch (LenException e) {
-            j.setMsg("保存失败");
-            j.setFlag(false);
-            e.printStackTrace();
-        }
-        return j;
-    }
-
-
-    @PostMapping("addLeave")
-    @ResponseBody
-    public LenResponse addLeave(UserLeave userLeave) {
-        LenResponse j = new LenResponse();
-        if (userLeave == null) {
-            return LenResponse.error("获取数据失败");
-        }
-        long beginTime = userLeave.getBeginTime().getTime();
-        long endTime = userLeave.getEndTime().getTime();
-        int days = 1;
-        if (endTime != beginTime) {
-            days += (int) ((endTime - beginTime) / (1000 * 60 * 60 * 24));
-        }
-        if (days <= 0) {
-            return LenResponse.error("时间输入有误");
-        }
-
-        userLeave.setDays(days);
-        CurrentUser user = CommonUtil.getUser();
-        userLeave.setUserId(user.getId());
-        userLeave.setUserName(user.getUsername());
-        userLeave.setProcessInstanceId("2018");
-        leaveService.save(userLeave);
-        Map<String, Object> map = new HashMap<>();
-        userLeave.setUrlpath("/leave/readOnlyLeave/" + userLeave.getId());
-        map.put("baseTask", userLeave);
-        map.put("day", days);
-        ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("process_leave", map);
-        userLeave.setProcessInstanceId(processInstance.getId());
-        userLeave.setUrlpath("/leave/readOnlyLeave/" + userLeave.getId());
-        leaveService.updateById(userLeave);
-        j.setMsg("请假申请成功");
-        return j;
-    }
-
-    @GetMapping("readOnlyLeave/{billId}")
-    public String readOnlyLeave(Model model, @PathVariable String billId) {
-        UserLeave leave = leaveService.getById(billId);
-        model.addAttribute("leave", leave);
-        return "/act/leave/update-leave-readonly";
-    }
-
-    /**
-     * ---------我的任务---------
-     */
-    @GetMapping(value = "showTask")
-    public String showTask(Model model) {
-        return "/act/task/taskList";
-    }
-
-    @GetMapping(value = "showTaskList")
-    @ResponseBody
-    public String showTaskList(Model model, com.len.entity.Task task, String page, String limit) {
-        CurrentUser user = CommonUtil.getUser();
-        SysRoleUser sysRoleUser = new SysRoleUser();
-        sysRoleUser.setUserId(user.getId());
-        QueryWrapper<SysRoleUser> queryWrapper = new QueryWrapper<>(sysRoleUser);
-        List<SysRoleUser> userRoles = roleUserService.list(queryWrapper);
-        List<String> roleString = new ArrayList<>();
-        for (SysRoleUser sru : userRoles) {
-            roleString.add(sru.getRoleId());
-        }
-        List<Task> taskList = taskService.createTaskQuery().taskCandidateUser(user.getId()).list();
-        List<Task> assigneeList = taskService.createTaskQuery().taskAssignee(user.getId()).list();
-        List<Task> candidateGroup = taskService.createTaskQuery().taskCandidateGroupIn(roleString).list();
-        taskList.addAll(assigneeList);
-        taskList.addAll(candidateGroup);
-        int count = taskList.size();
-        Integer index = (Integer.valueOf(page) - 1) * Integer.valueOf(limit);
-        taskList = taskList.subList(index, taskList.size() > index + 10 ? index + 10 : taskList.size());
-
-        List<com.len.entity.Task> tasks = new ArrayList<>();
-        Map<String, Object> map;
-        com.len.entity.Task taskEntity;
-
-        Map<String, Map<String, Object>> mapMap = new HashMap<>();
-        Map<String, Object> objectMap;
-        Set<String> taskSet = new HashSet<String>();
-        for (Task task1 : taskList) {
-            objectMap = new HashMap<>();
-            String taskId = task1.getId();
-            if (taskSet.contains(taskId)) {
-                continue;
-            }
-
-            map = taskService.getVariables(taskId);
-            BaseTask userLeave = (BaseTask) map.get("baseTask");
-
-            taskEntity = new com.len.entity.Task(task1);
-            taskEntity.setUserName(userLeave.getUserName());
-            taskEntity.setReason(userLeave.getReason());
-            taskEntity.setUrlpath(userLeave.getUrlpath());
-            /*如果是自己*/
-            if (user.getId().equals(userLeave.getUserId())) {
-                if (map.get("flag") != null) {
-                    if (!(boolean) map.get("flag")) {
-                        objectMap.put("flag", true);
-                    } else {
-                        objectMap.put("flag", false);
-                    }
-                } else {
-                    objectMap.put("flag", true);
-                }
-            } else {
-                objectMap.put("flag", false);
-            }
-            mapMap.put(taskEntity.getId(), objectMap);
-            tasks.add(taskEntity);
-            taskSet.add(taskId);
-        }
-        return ReType.jsonStrng(count, tasks, mapMap, "id");
-    }
-
-    @GetMapping("agent/{id}")
-    public String agent(Model model, @PathVariable("id") String taskId) {
-        Map<String, Object> variables = taskService.getVariables(taskId);
-        BaseTask baseTask = (BaseTask) variables.get("baseTask");
+	@Autowired
+	UserLeaveService leaveService;
+
+	@Autowired
+	RuntimeService runtimeService;
+
+	@Autowired
+	TaskService taskService;
+
+	@Autowired
+	IdentityService identityService;
+
+	@Autowired
+	RepositoryService repositoryService;
+
+	@Autowired
+	ProcessEngineFactoryBean processEngine;
+
+	@Autowired
+	ProcessEngineConfiguration processEngineConfiguration;
+
+	@Autowired
+	RoleUserService roleUserService;
+	@Autowired
+	HistoryService historyService;
+	private String leaveOpinionList = "leaveOpinionList";
+
+	@GetMapping(value = "showMain")
+	public String showMain(Model model) {
+		return "/dashboard/dashboard";
+	}
+
+	@GetMapping(value = "showMain2")
+	public String showMain2(Model model) {
+		return "/dashboard/dashboard2";
+	}
+
+	@GetMapping(value = "showLeave")
+	public String showUser(Model model) {
+		return "/act/leave/leaveList";
+	}
+
+	@GetMapping(value = "showLeaveList")
+	@ResponseBody
+	public ReType showLeaveList(UserLeave userLeave, String page, String limit) {
+		String userId = CommonUtil.getUser().getId();
+		userLeave.setUserId(userId);
+		List<UserLeave> tList = null;
+		Page<UserLeave> tPage = PageHelper.startPage(Integer.valueOf(page), Integer.valueOf(limit));
+		try {
+			tList = leaveService.selectListByPage(userLeave);
+			for (UserLeave leave : tList) {
+				ProcessInstance instance = runtimeService.createProcessInstanceQuery()
+					.processInstanceId(leave.getProcessInstanceId()).singleResult();
+				//保证运行ing
+				if (instance != null) {
+					Task task = this.taskService.createTaskQuery().processInstanceId(leave.getProcessInstanceId()).singleResult();
+					leave.setTaskName(task.getName());
+				}
+			}
+		} catch (LenException e) {
+			e.printStackTrace();
+		}
+		return new ReType(tPage.getTotal(), tList);
+	}
+
+	/**
+	 * 根据 执行对象id获取审批信息
+	 *
+	 * @param model
+	 * @param processId
+	 * @return
+	 */
+	@GetMapping("leaveDetail")
+	public String leaveDetail(Model model, String processId) {
+		ProcessInstance instance = runtimeService.createProcessInstanceQuery()
+			.processInstanceId(processId).singleResult();
+		//保证运行ing
+		List<LeaveOpinion> leaveList = null;
+		if (instance != null) {
+			Task task = this.taskService.createTaskQuery().processInstanceId(processId).singleResult();
+			Map<String, Object> variables = taskService.getVariables(task.getId());
+			Object o = variables.get(leaveOpinionList);
+			if (o != null) {
+				/*获取历史审核信息*/
+				leaveList = (List<LeaveOpinion>) o;
+			}
+		} else {
+			leaveList = new ArrayList<>();
+			List<HistoricDetail> list = historyService.createHistoricDetailQuery().
+				processInstanceId(processId).list();
+			HistoricVariableUpdate variable = null;
+			for (HistoricDetail historicDetail : list) {
+				variable = (HistoricVariableUpdate) historicDetail;
+				if (leaveOpinionList.equals(variable.getVariableName())) {
+					leaveList.clear();
+					leaveList.addAll((List<LeaveOpinion>) variable.getValue());
+				}
+			}
+		}
+		model.addAttribute("leaveDetail", JSON.toJSONString(leaveList));
+		return "/act/leave/leaveDetail";
+	}
+
+	@GetMapping("addLeave")
+	public String addLeave() {
+		return "/act/leave/add-leave";
+	}
+
+	@GetMapping("updateLeave/{taskId}")
+	public String updateLeave(Model model, @PathVariable String taskId) {
+		Map<String, Object> variables = taskService.getVariables(taskId);
+		BaseTask baseTask = (BaseTask) variables.get("baseTask");
+		UserLeave leave = leaveService.getById(baseTask.getId());
+		model.addAttribute("leave", leave);
+		model.addAttribute("taskId", taskId);
+		return "/act/leave/update-leave";
+	}
+
+	@PostMapping("updateLeave/updateLeave/{taskId}/{id}/{flag}")
+	@ResponseBody
+	public LenResponse updateLeave(UserLeave leave, @PathVariable String taskId, @PathVariable String id, @PathVariable boolean flag) {
+		LenResponse j = new LenResponse();
+		try {
+			UserLeave oldLeave = leaveService.getById(leave.getId());
+			BeanUtil.copyNotNullBean(leave, oldLeave);
+			QueryWrapper<UserLeave> userLeaveQueryWrapper = new QueryWrapper<>(oldLeave);
+			leaveService.update(userLeaveQueryWrapper);
+
+			Map<String, Object> variables = taskService.getVariables(taskId);
+			Map<String, Object> map = new HashMap<>();
+			if (flag) {
+				map.put("flag", true);
+			} else {
+				map.put("flag", false);
+			}
+			taskService.complete(taskId, map);
+			j.setMsg("保存成功");
+		} catch (LenException e) {
+			j.setMsg("保存失败");
+			j.setFlag(false);
+			e.printStackTrace();
+		}
+		return j;
+	}
+
+	@PostMapping("addLeave")
+	@ResponseBody
+	public LenResponse addLeave(UserLeave userLeave) {
+		LenResponse j = new LenResponse();
+		if (userLeave == null) {
+			return LenResponse.error("获取数据失败");
+		}
+		long beginTime = userLeave.getBeginTime().getTime();
+		long endTime = userLeave.getEndTime().getTime();
+		int days = 1;
+		if (endTime != beginTime) {
+			days += (int) ((endTime - beginTime) / (1000 * 60 * 60 * 24));
+		}
+		if (days <= 0) {
+			return LenResponse.error("时间输入有误");
+		}
+
+		userLeave.setDays(days);
+		CurrentUser user = CommonUtil.getUser();
+		userLeave.setUserId(user.getId());
+		userLeave.setUserName(user.getUsername());
+		userLeave.setProcessInstanceId("2018");
+		leaveService.save(userLeave);
+		Map<String, Object> map = new HashMap<>();
+		userLeave.setUrlpath("/leave/readOnlyLeave/" + userLeave.getId());
+		map.put("baseTask", userLeave);
+		map.put("day", days);
+		ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("process_leave", map);
+		userLeave.setProcessInstanceId(processInstance.getId());
+		userLeave.setUrlpath("/leave/readOnlyLeave/" + userLeave.getId());
+		leaveService.updateById(userLeave);
+		j.setMsg("请假申请成功");
+		return j;
+	}
+
+	@GetMapping("readOnlyLeave/{billId}")
+	public String readOnlyLeave(Model model, @PathVariable String billId) {
+		UserLeave leave = leaveService.getById(billId);
+		model.addAttribute("leave", leave);
+		return "/act/leave/update-leave-readonly";
+	}
+
+	/**
+	 * ---------我的任务---------
+	 */
+	@GetMapping(value = "showTask")
+	public String showTask(Model model) {
+		return "/act/task/taskList";
+	}
+
+	@GetMapping(value = "showTaskList")
+	@ResponseBody
+	public String showTaskList(Model model, com.len.entity.Task task, String page, String limit) {
+		CurrentUser user = CommonUtil.getUser();
+		SysRoleUser sysRoleUser = new SysRoleUser();
+		sysRoleUser.setUserId(user.getId());
+		QueryWrapper<SysRoleUser> queryWrapper = new QueryWrapper<>(sysRoleUser);
+		List<SysRoleUser> userRoles = roleUserService.list(queryWrapper);
+		List<String> roleString = new ArrayList<>();
+		for (SysRoleUser sru : userRoles) {
+			roleString.add(sru.getRoleId());
+		}
+		List<Task> taskList = taskService.createTaskQuery().taskCandidateUser(user.getId()).list();
+		List<Task> assigneeList = taskService.createTaskQuery().taskAssignee(user.getId()).list();
+		List<Task> candidateGroup = taskService.createTaskQuery().taskCandidateGroupIn(roleString).list();
+		taskList.addAll(assigneeList);
+		taskList.addAll(candidateGroup);
+		int count = taskList.size();
+		Integer index = (Integer.valueOf(page) - 1) * Integer.valueOf(limit);
+		taskList = taskList.subList(index, taskList.size() > index + 10 ? index + 10 : taskList.size());
+
+		List<com.len.entity.Task> tasks = new ArrayList<>();
+		Map<String, Object> map;
+		com.len.entity.Task taskEntity;
+
+		Map<String, Map<String, Object>> mapMap = new HashMap<>();
+		Map<String, Object> objectMap;
+		Set<String> taskSet = new HashSet<String>();
+		for (Task task1 : taskList) {
+			objectMap = new HashMap<>();
+			String taskId = task1.getId();
+			if (taskSet.contains(taskId)) {
+				continue;
+			}
+
+			map = taskService.getVariables(taskId);
+			BaseTask userLeave = (BaseTask) map.get("baseTask");
+
+			taskEntity = new com.len.entity.Task(task1);
+			taskEntity.setUserName(userLeave.getUserName());
+			taskEntity.setReason(userLeave.getReason());
+			taskEntity.setUrlpath(userLeave.getUrlpath());
+			/*如果是自己*/
+			if (user.getId().equals(userLeave.getUserId())) {
+				if (map.get("flag") != null) {
+					if (!(boolean) map.get("flag")) {
+						objectMap.put("flag", true);
+					} else {
+						objectMap.put("flag", false);
+					}
+				} else {
+					objectMap.put("flag", true);
+				}
+			} else {
+				objectMap.put("flag", false);
+			}
+			mapMap.put(taskEntity.getId(), objectMap);
+			tasks.add(taskEntity);
+			taskSet.add(taskId);
+		}
+		return ReType.jsonStrng(count, tasks, mapMap, "id");
+	}
+
+	@GetMapping("agent/{id}")
+	public String agent(Model model, @PathVariable("id") String taskId) {
+		Map<String, Object> variables = taskService.getVariables(taskId);
+		BaseTask baseTask = (BaseTask) variables.get("baseTask");
 //        UserLeave userLeave = leaveService.selectByPrimaryKey(baseTask.getId());
-        model.addAttribute("leaveUrl", baseTask.getUrlpath());
-        model.addAttribute("taskId", taskId);
-        return "/act/task/task-agent-iframe";
-    }
-
-    @PostMapping("agent/complete")
-    @ResponseBody
-    public LenResponse complete(LeaveOpinion op, HttpServletRequest request) {
-        Map<String, Object> variables = taskService.getVariables(op.getTaskId());
-
-        CurrentUser user = Principal.getCurrentUse();
-        op.setCreateTime(new Date());
-        op.setOpId(user.getId());
-        op.setOpName(user.getRealName());
-        LenResponse j = new LenResponse();
-        Map<String, Object> map = new HashMap<>();
-        map.put("flag", op.isFlag());
-
-        //判断节点是否已经拒绝过一次了
-        Object needend = variables.get("needend");
-        if (needend != null && (boolean) needend && (!op.isFlag())) {
-            map.put("needfinish", -1); //结束
-        } else {
-            if (op.isFlag()) {
-                map.put("needfinish", 1);//通过下一个节点
-            } else {
-                map.put("needfinish", 0);//不通过
-            }
-        }
-        //审批信息叠加
-        List<LeaveOpinion> leaveList = new ArrayList<>();
-        Object o = variables.get(leaveOpinionList);
-        if (o != null) {
-            leaveList = (List<LeaveOpinion>) o;
-        }
-        leaveList.add(op);
-        UserLeave userLeave=(UserLeave)variables.get("baseTask");
-        map.put("day",userLeave.getDays());
-        map.put(leaveOpinionList, leaveList);
-        j.setMsg("审核成功" + (op.isFlag() ? "<font style='color:green'>[通过]</font>" : "<font style='color:red'>[未通过]</font>"));
-        taskService.complete(op.getTaskId(), map);
-        return j;
-    }
-
-    @Autowired
-    HistoryService historyService;
-
-    /**
-     * 追踪图片成图
-     * 增加历史流程
-     *
-     * @param request
-     * @param resp
-     * @param processInstanceId
-     * @throws IOException
-     */
-    @GetMapping("getProcImage")
-    public void getProcImage(HttpServletRequest request, HttpServletResponse resp, String processInstanceId)
-            throws IOException {
-        InputStream imageStream = generateStream(request, resp, processInstanceId, true);
-        if (imageStream == null) {
-            return;
-        }
-        InputStream imageNoCurrentStream = generateStream(request, resp, processInstanceId, false);
-        if (imageNoCurrentStream == null) {
-            return;
-        }
-
-        AnimatedGifEncoder e = new AnimatedGifEncoder();
-        e.setTransparent(Color.BLACK);
-        e.setRepeat(0);
-        e.setQuality(19);
-        e.start(resp.getOutputStream());
-
-        BufferedImage current = ImageIO.read(imageStream); // 读入需要播放的jpg文件
-        e.addFrame(current);  //添加到帧中
-
-        e.setDelay(200); //设置播放的延迟时间
-        BufferedImage nocurrent = ImageIO.read(imageNoCurrentStream); // 读入需要播放的jpg文件
-        e.addFrame(nocurrent);  //添加到帧中
-
-        e.finish();
+		model.addAttribute("leaveUrl", baseTask.getUrlpath());
+		model.addAttribute("taskId", taskId);
+		return "/act/task/task-agent-iframe";
+	}
+
+	@PostMapping("agent/complete")
+	@ResponseBody
+	public LenResponse complete(LeaveOpinion op, HttpServletRequest request) {
+		Map<String, Object> variables = taskService.getVariables(op.getTaskId());
+
+		CurrentUser user = Principal.getCurrentUse();
+		op.setCreateTime(new Date());
+		op.setOpId(user.getId());
+		op.setOpName(user.getRealName());
+		LenResponse j = new LenResponse();
+		Map<String, Object> map = new HashMap<>();
+		map.put("flag", op.isFlag());
+
+		//判断节点是否已经拒绝过一次了
+		Object needend = variables.get("needend");
+		if (needend != null && (boolean) needend && (!op.isFlag())) {
+			map.put("needfinish", -1); //结束
+		} else {
+			if (op.isFlag()) {
+				map.put("needfinish", 1);//通过下一个节点
+			} else {
+				map.put("needfinish", 0);//不通过
+			}
+		}
+		//审批信息叠加
+		List<LeaveOpinion> leaveList = new ArrayList<>();
+		Object o = variables.get(leaveOpinionList);
+		if (o != null) {
+			leaveList = (List<LeaveOpinion>) o;
+		}
+		leaveList.add(op);
+		UserLeave userLeave = (UserLeave) variables.get("baseTask");
+		map.put("day", userLeave.getDays());
+		map.put(leaveOpinionList, leaveList);
+		j.setMsg("审核成功" + (op.isFlag() ? "<font style='color:green'>[通过]</font>" : "<font style='color:red'>[未通过]</font>"));
+		taskService.complete(op.getTaskId(), map);
+		return j;
+	}
+
+	/**
+	 * 追踪图片成图
+	 * 增加历史流程
+	 *
+	 * @param request
+	 * @param resp
+	 * @param processInstanceId
+	 * @throws IOException
+	 */
+	@GetMapping("getProcImage")
+	public void getProcImage(HttpServletRequest request, HttpServletResponse resp, String processInstanceId)
+		throws IOException {
+		InputStream imageStream = generateStream(request, resp, processInstanceId, true);
+		if (imageStream == null) {
+			return;
+		}
+		InputStream imageNoCurrentStream = generateStream(request, resp, processInstanceId, false);
+		if (imageNoCurrentStream == null) {
+			return;
+		}
+
+		AnimatedGifEncoder e = new AnimatedGifEncoder();
+		e.setTransparent(Color.BLACK);
+		e.setRepeat(0);
+		e.setQuality(19);
+		e.start(resp.getOutputStream());
+
+		BufferedImage current = ImageIO.read(imageStream); // 读入需要播放的jpg文件
+		e.addFrame(current);  //添加到帧中
+
+		e.setDelay(200); //设置播放的延迟时间
+		BufferedImage nocurrent = ImageIO.read(imageNoCurrentStream); // 读入需要播放的jpg文件
+		e.addFrame(nocurrent);  //添加到帧中
+
+		e.finish();
 
 //        byte[] b = new byte[1024];
 //        int len;
 //        while ((len = imageStream.read(b, 0, 1024)) != -1) {
 //            resp.getOutputStream().write(b, 0, len);
 //        }
-    }
-
-    //只读图片页面
-    @GetMapping("shinePics/{processInstanceId}")
-    public String shinePics(Model model, @PathVariable String processInstanceId) {
-        model.addAttribute("processInstanceId", processInstanceId);
-        return "/act/leave/shinePics";
-    }
-
-    @GetMapping("getShineProcImage")
-    @ResponseBody
-    public String getShineProcImage(HttpServletRequest request, HttpServletResponse resp, String processInstanceId)
-            throws IOException {
-        JSONObject result = new JSONObject();
-        JSONArray shineProImages = new JSONArray();
-        BASE64Encoder encoder = new BASE64Encoder();
-        InputStream imageStream = generateStream(request, resp, processInstanceId, true);
-        if (imageStream != null) {
-            String imageCurrentNode = Base64Utils.ioToBase64(imageStream);
-            if (StringUtils.isNotBlank(imageCurrentNode)) {
-                shineProImages.add(imageCurrentNode);
-            }
-        }
-        InputStream imageNoCurrentStream = generateStream(request, resp, processInstanceId, false);
-        if (imageNoCurrentStream != null) {
-            String imageNoCurrentNode = Base64Utils.ioToBase64(imageNoCurrentStream);
-            if (StringUtils.isNotBlank(imageNoCurrentNode)) {
-                shineProImages.add(imageNoCurrentNode);
-            }
-        }
-        result.put("id", UUID.randomUUID().toString());
-        result.put("errorNo", 0);
-        result.put("images", shineProImages);
-        return result.toJSONString();
-    }
-
-
-    public InputStream generateStream(HttpServletRequest request, HttpServletResponse resp, String processInstanceId, boolean needCurrent) {
-        ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
-        HistoricProcessInstance historicProcessInstance =
-                historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
-        String processDefinitionId = null;
-        List<String> executedActivityIdList = new ArrayList<String>();
-        List<String> currentActivityIdList = new ArrayList<>();
-        List<HistoricActivityInstance> historicActivityInstanceList = new ArrayList<>();
-        if (processInstance != null) {
-            processDefinitionId = processInstance.getProcessDefinitionId();
-            if (needCurrent) {
-                currentActivityIdList = this.runtimeService.getActiveActivityIds(processInstance.getId());
-            }
-        }
-        if (historicProcessInstance != null) {
-            processDefinitionId = historicProcessInstance.getProcessDefinitionId();
-            historicActivityInstanceList =
-                    historyService.createHistoricActivityInstanceQuery().processInstanceId(processInstanceId).orderByHistoricActivityInstanceId().asc().list();
-            for (HistoricActivityInstance activityInstance : historicActivityInstanceList) {
-                executedActivityIdList.add(activityInstance.getActivityId());
-            }
-        }
-
-        if (StringUtils.isEmpty(processDefinitionId) || executedActivityIdList.isEmpty()) {
-            return null;
-        }
-
-        //高亮线路id集合
-        ProcessDefinitionEntity definitionEntity = (ProcessDefinitionEntity) repositoryService.getProcessDefinition(processDefinitionId);
-        List<String> highLightedFlows = getHighLightedFlows(definitionEntity, historicActivityInstanceList);
-
-        BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinitionId);
-        //List<String> activeActivityIds = runtimeService.getActiveActivityIds(processInstanceId);
-        processEngineConfiguration = processEngine.getProcessEngineConfiguration();
-        Context.setProcessEngineConfiguration((ProcessEngineConfigurationImpl) processEngineConfiguration);
-        HMProcessDiagramGenerator diagramGenerator = (HMProcessDiagramGenerator) processEngineConfiguration.getProcessDiagramGenerator();
-        //List<String> activeIds = this.runtimeService.getActiveActivityIds(processInstance.getId());
-
-        InputStream imageStream = diagramGenerator.generateDiagram(
-                bpmnModel, "png",
-                executedActivityIdList, highLightedFlows,
-                processEngine.getProcessEngineConfiguration().getActivityFontName(),
-                processEngine.getProcessEngineConfiguration().getLabelFontName(),
-                "宋体",
-                null, 1.0, currentActivityIdList);
-
-        return imageStream;
-    }
-
-    /**
-     * 获取需要高亮的线
-     *
-     * @param processDefinitionEntity
-     * @param historicActivityInstances
-     * @return
-     */
-    private List<String> getHighLightedFlows(
-            ProcessDefinitionEntity processDefinitionEntity,
-            List<HistoricActivityInstance> historicActivityInstances) {
-
-        List<String> highFlows = new ArrayList<String>();// 用以保存高亮的线flowId
-        for (int i = 0; i < historicActivityInstances.size() - 1; i++) {// 对历史流程节点进行遍历
-            ActivityImpl activityImpl = processDefinitionEntity
-                    .findActivity(historicActivityInstances.get(i)
-                            .getActivityId());// 得到节点定义的详细信息
-            List<ActivityImpl> sameStartTimeNodes = new ArrayList<ActivityImpl>();// 用以保存后需开始时间相同的节点
-            ActivityImpl sameActivityImpl1 = processDefinitionEntity
-                    .findActivity(historicActivityInstances.get(i + 1)
-                            .getActivityId());
-            // 将后面第一个节点放在时间相同节点的集合里
-            sameStartTimeNodes.add(sameActivityImpl1);
-            for (int j = i + 1; j < historicActivityInstances.size() - 1; j++) {
-                HistoricActivityInstance activityImpl1 = historicActivityInstances
-                        .get(j);// 后续第一个节点
-                HistoricActivityInstance activityImpl2 = historicActivityInstances
-                        .get(j + 1);// 后续第二个节点
-                if (activityImpl1.getStartTime().equals(
-                        activityImpl2.getStartTime())) {
-                    // 如果第一个节点和第二个节点开始时间相同保存
-                    ActivityImpl sameActivityImpl2 = processDefinitionEntity
-                            .findActivity(activityImpl2.getActivityId());
-                    sameStartTimeNodes.add(sameActivityImpl2);
-                } else {
-                    // 有不相同跳出循环
-                    break;
-                }
-            }
-            List<PvmTransition> pvmTransitions = activityImpl
-                    .getOutgoingTransitions();// 取出节点的所有出去的线
-            for (PvmTransition pvmTransition : pvmTransitions) {
-                // 对所有的线进行遍历
-                ActivityImpl pvmActivityImpl = (ActivityImpl) pvmTransition
-                        .getDestination();
-                // 如果取出的线的目标节点存在时间相同的节点里，保存该线的id，进行高亮显示
-                if (sameStartTimeNodes.contains(pvmActivityImpl)) {
-                    highFlows.add(pvmTransition.getId());
-                }
-            }
-        }
-        return highFlows;
-    }
+	}
+
+	//只读图片页面
+	@GetMapping("shinePics/{processInstanceId}")
+	public String shinePics(Model model, @PathVariable String processInstanceId) {
+		model.addAttribute("processInstanceId", processInstanceId);
+		return "/act/leave/shinePics";
+	}
+
+	@GetMapping("getShineProcImage")
+	@ResponseBody
+	public String getShineProcImage(HttpServletRequest request, HttpServletResponse resp, String processInstanceId)
+		throws IOException {
+		JSONObject result = new JSONObject();
+		JSONArray shineProImages = new JSONArray();
+		BASE64Encoder encoder = new BASE64Encoder();
+		InputStream imageStream = generateStream(request, resp, processInstanceId, true);
+		if (imageStream != null) {
+			String imageCurrentNode = Base64Utils.ioToBase64(imageStream);
+			if (StringUtils.isNotBlank(imageCurrentNode)) {
+				shineProImages.add(imageCurrentNode);
+			}
+		}
+		InputStream imageNoCurrentStream = generateStream(request, resp, processInstanceId, false);
+		if (imageNoCurrentStream != null) {
+			String imageNoCurrentNode = Base64Utils.ioToBase64(imageNoCurrentStream);
+			if (StringUtils.isNotBlank(imageNoCurrentNode)) {
+				shineProImages.add(imageNoCurrentNode);
+			}
+		}
+		result.put("id", UUID.randomUUID().toString());
+		result.put("errorNo", 0);
+		result.put("images", shineProImages);
+		return result.toJSONString();
+	}
+
+
+	public InputStream generateStream(HttpServletRequest request, HttpServletResponse resp, String processInstanceId, boolean needCurrent) {
+		ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+		HistoricProcessInstance historicProcessInstance =
+			historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+		String processDefinitionId = null;
+		List<String> executedActivityIdList = new ArrayList<String>();
+		List<String> currentActivityIdList = new ArrayList<>();
+		List<HistoricActivityInstance> historicActivityInstanceList = new ArrayList<>();
+		if (processInstance != null) {
+			processDefinitionId = processInstance.getProcessDefinitionId();
+			if (needCurrent) {
+				currentActivityIdList = this.runtimeService.getActiveActivityIds(processInstance.getId());
+			}
+		}
+		if (historicProcessInstance != null) {
+			processDefinitionId = historicProcessInstance.getProcessDefinitionId();
+			historicActivityInstanceList =
+				historyService.createHistoricActivityInstanceQuery().processInstanceId(processInstanceId).orderByHistoricActivityInstanceId().asc().list();
+			for (HistoricActivityInstance activityInstance : historicActivityInstanceList) {
+				executedActivityIdList.add(activityInstance.getActivityId());
+			}
+		}
+
+		if (StringUtils.isEmpty(processDefinitionId) || executedActivityIdList.isEmpty()) {
+			return null;
+		}
+
+		//高亮线路id集合
+		ProcessDefinitionEntity definitionEntity = (ProcessDefinitionEntity) repositoryService.getProcessDefinition(processDefinitionId);
+		List<String> highLightedFlows = getHighLightedFlows(definitionEntity, historicActivityInstanceList);
+
+		BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinitionId);
+		//List<String> activeActivityIds = runtimeService.getActiveActivityIds(processInstanceId);
+		processEngineConfiguration = processEngine.getProcessEngineConfiguration();
+		Context.setProcessEngineConfiguration((ProcessEngineConfigurationImpl) processEngineConfiguration);
+		HMProcessDiagramGenerator diagramGenerator = (HMProcessDiagramGenerator) processEngineConfiguration.getProcessDiagramGenerator();
+		//List<String> activeIds = this.runtimeService.getActiveActivityIds(processInstance.getId());
+
+		InputStream imageStream = diagramGenerator.generateDiagram(
+			bpmnModel, "png",
+			executedActivityIdList, highLightedFlows,
+			processEngine.getProcessEngineConfiguration().getActivityFontName(),
+			processEngine.getProcessEngineConfiguration().getLabelFontName(),
+			"宋体",
+			null, 1.0, currentActivityIdList);
+
+		return imageStream;
+	}
+
+	/**
+	 * 获取需要高亮的线
+	 *
+	 * @param processDefinitionEntity
+	 * @param historicActivityInstances
+	 * @return
+	 */
+	private List<String> getHighLightedFlows(
+		ProcessDefinitionEntity processDefinitionEntity,
+		List<HistoricActivityInstance> historicActivityInstances) {
+
+		List<String> highFlows = new ArrayList<String>();// 用以保存高亮的线flowId
+		for (int i = 0; i < historicActivityInstances.size() - 1; i++) {// 对历史流程节点进行遍历
+			ActivityImpl activityImpl = processDefinitionEntity
+				.findActivity(historicActivityInstances.get(i)
+					.getActivityId());// 得到节点定义的详细信息
+			List<ActivityImpl> sameStartTimeNodes = new ArrayList<ActivityImpl>();// 用以保存后需开始时间相同的节点
+			ActivityImpl sameActivityImpl1 = processDefinitionEntity
+				.findActivity(historicActivityInstances.get(i + 1)
+					.getActivityId());
+			// 将后面第一个节点放在时间相同节点的集合里
+			sameStartTimeNodes.add(sameActivityImpl1);
+			for (int j = i + 1; j < historicActivityInstances.size() - 1; j++) {
+				HistoricActivityInstance activityImpl1 = historicActivityInstances
+					.get(j);// 后续第一个节点
+				HistoricActivityInstance activityImpl2 = historicActivityInstances
+					.get(j + 1);// 后续第二个节点
+				if (activityImpl1.getStartTime().equals(
+					activityImpl2.getStartTime())) {
+					// 如果第一个节点和第二个节点开始时间相同保存
+					ActivityImpl sameActivityImpl2 = processDefinitionEntity
+						.findActivity(activityImpl2.getActivityId());
+					sameStartTimeNodes.add(sameActivityImpl2);
+				} else {
+					// 有不相同跳出循环
+					break;
+				}
+			}
+			List<PvmTransition> pvmTransitions = activityImpl
+				.getOutgoingTransitions();// 取出节点的所有出去的线
+			for (PvmTransition pvmTransition : pvmTransitions) {
+				// 对所有的线进行遍历
+				ActivityImpl pvmActivityImpl = (ActivityImpl) pvmTransition
+					.getDestination();
+				// 如果取出的线的目标节点存在时间相同的节点里，保存该线的id，进行高亮显示
+				if (sameStartTimeNodes.contains(pvmActivityImpl)) {
+					highFlows.add(pvmTransition.getId());
+				}
+			}
+		}
+		return highFlows;
+	}
 
 
 }
diff --git a/len-activiti/src/main/java/com/len/entity/ActAssignee.java b/len-activiti/src/main/java/com/len/entity/ActAssignee.java
index b841f36..761c70e 100644
--- a/len-activiti/src/main/java/com/len/entity/ActAssignee.java
+++ b/len-activiti/src/main/java/com/len/entity/ActAssignee.java
@@ -8,147 +8,147 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 @TableName(value = "act_assignee")
 public class ActAssignee {
-    @TableId(value = "id", type = IdType.UUID)
-    private String id;
-
-    /**
-     * 节点id
-     */
-    @TableField(value = "sid")
-    private String sid;
-
-    /**
-     * 办理人
-     */
-    @TableField(value = "assignee")
-    private String assignee;
-
-    /**
-     * 候选组(角色)
-     */
-    @TableField(value = "role_id")
-    private String roleId;
-
-    /**
-     * 办理人类型1办理人2候选人3组
-     */
-    @TableField(value = "assignee_type")
-    private Integer assigneeType;
-
-    /**
-     * 节点名称
-     */
-    @TableField(value = "activti_name")
-    private String activtiName;
-
-    /**
-     * @return id
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
-    /**
-     * 获取节点id
-     *
-     * @return sid - 节点id
-     */
-    public String getSid() {
-        return sid;
-    }
-
-    /**
-     * 设置节点id
-     *
-     * @param sid 节点id
-     */
-    public void setSid(String sid) {
-        this.sid = sid == null ? null : sid.trim();
-    }
-
-    /**
-     * 获取办理人
-     *
-     * @return assignee - 办理人
-     */
-    public String getAssignee() {
-        return assignee;
-    }
-
-    /**
-     * 设置办理人
-     *
-     * @param assignee 办理人
-     */
-    public void setAssignee(String assignee) {
-        this.assignee = assignee == null ? null : assignee.trim();
-    }
-
-    /**
-     * 获取候选组(角色)
-     *
-     * @return role_id - 候选组(角色)
-     */
-    public String getRoleId() {
-        return roleId;
-    }
-
-    /**
-     * 设置候选组(角色)
-     *
-     * @param roleId 候选组(角色)
-     */
-    public void setRoleId(String roleId) {
-        this.roleId = roleId == null ? null : roleId.trim();
-    }
-
-    /**
-     * 获取办理人类型1办理人2候选人3组
-     *
-     * @return assignee_type - 办理人类型1办理人2候选人3组
-     */
-    public Integer getAssigneeType() {
-        return assigneeType;
-    }
-
-    /**
-     * 设置办理人类型1办理人2候选人3组
-     *
-     * @param assigneeType 办理人类型1办理人2候选人3组
-     */
-    public void setAssigneeType(Integer assigneeType) {
-        this.assigneeType = assigneeType;
-    }
-
-    /**
-     * 获取节点名称
-     *
-     * @return activti_name - 节点名称
-     */
-    public String getActivtiName() {
-        return activtiName;
-    }
-
-    /**
-     * 设置节点名称
-     *
-     * @param activtiName 节点名称
-     */
-    public void setActivtiName(String activtiName) {
-        this.activtiName = activtiName == null ? null : activtiName.trim();
-    }
-
-    public ActAssignee() {
-    }
-
-    public ActAssignee(String sid) {
-        this.sid = sid;
-    }
-}
\ No newline at end of file
+	@TableId(value = "id", type = IdType.UUID)
+	private String id;
+
+	/**
+	 * 节点id
+	 */
+	@TableField(value = "sid")
+	private String sid;
+
+	/**
+	 * 办理人
+	 */
+	@TableField(value = "assignee")
+	private String assignee;
+
+	/**
+	 * 候选组(角色)
+	 */
+	@TableField(value = "role_id")
+	private String roleId;
+
+	/**
+	 * 办理人类型1办理人2候选人3组
+	 */
+	@TableField(value = "assignee_type")
+	private Integer assigneeType;
+
+	/**
+	 * 节点名称
+	 */
+	@TableField(value = "activti_name")
+	private String activtiName;
+
+	public ActAssignee() {
+	}
+
+	public ActAssignee(String sid) {
+		this.sid = sid;
+	}
+
+	/**
+	 * @return id
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * @param id
+	 */
+	public void setId(String id) {
+		this.id = id == null ? null : id.trim();
+	}
+
+	/**
+	 * 获取节点id
+	 *
+	 * @return sid - 节点id
+	 */
+	public String getSid() {
+		return sid;
+	}
+
+	/**
+	 * 设置节点id
+	 *
+	 * @param sid 节点id
+	 */
+	public void setSid(String sid) {
+		this.sid = sid == null ? null : sid.trim();
+	}
+
+	/**
+	 * 获取办理人
+	 *
+	 * @return assignee - 办理人
+	 */
+	public String getAssignee() {
+		return assignee;
+	}
+
+	/**
+	 * 设置办理人
+	 *
+	 * @param assignee 办理人
+	 */
+	public void setAssignee(String assignee) {
+		this.assignee = assignee == null ? null : assignee.trim();
+	}
+
+	/**
+	 * 获取候选组(角色)
+	 *
+	 * @return role_id - 候选组(角色)
+	 */
+	public String getRoleId() {
+		return roleId;
+	}
+
+	/**
+	 * 设置候选组(角色)
+	 *
+	 * @param roleId 候选组(角色)
+	 */
+	public void setRoleId(String roleId) {
+		this.roleId = roleId == null ? null : roleId.trim();
+	}
+
+	/**
+	 * 获取办理人类型1办理人2候选人3组
+	 *
+	 * @return assignee_type - 办理人类型1办理人2候选人3组
+	 */
+	public Integer getAssigneeType() {
+		return assigneeType;
+	}
+
+	/**
+	 * 设置办理人类型1办理人2候选人3组
+	 *
+	 * @param assigneeType 办理人类型1办理人2候选人3组
+	 */
+	public void setAssigneeType(Integer assigneeType) {
+		this.assigneeType = assigneeType;
+	}
+
+	/**
+	 * 获取节点名称
+	 *
+	 * @return activti_name - 节点名称
+	 */
+	public String getActivtiName() {
+		return activtiName;
+	}
+
+	/**
+	 * 设置节点名称
+	 *
+	 * @param activtiName 节点名称
+	 */
+	public void setActivtiName(String activtiName) {
+		this.activtiName = activtiName == null ? null : activtiName.trim();
+	}
+}
diff --git a/len-activiti/src/main/java/com/len/entity/ActDeployment.java b/len-activiti/src/main/java/com/len/entity/ActDeployment.java
index 39df8d3..bf34fc7 100644
--- a/len-activiti/src/main/java/com/len/entity/ActDeployment.java
+++ b/len-activiti/src/main/java/com/len/entity/ActDeployment.java
@@ -15,12 +15,13 @@
  */
 package com.len.entity;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 import org.activiti.engine.repository.Deployment;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * @author zhuxiaomeng
  * @date 2018/1/15.
@@ -30,20 +31,20 @@ import org.activiti.engine.repository.Deployment;
 @Getter
 @Setter
 public class ActDeployment implements Serializable {
-  private String id;
-  private String name;
-  private Date deploymentTime;
-  private String category;
-  private String tenantId;
+	private String id;
+	private String name;
+	private Date deploymentTime;
+	private String category;
+	private String tenantId;
 
-  public ActDeployment() {
-  }
+	public ActDeployment() {
+	}
 
-  public ActDeployment(Deployment deployment) {
-    this.id = deployment.getId();
-    this.name = deployment.getName();
-    this.deploymentTime = deployment.getDeploymentTime();
-    this.category = deployment.getCategory();
-    this.tenantId = deployment.getTenantId();
-  }
+	public ActDeployment(Deployment deployment) {
+		this.id = deployment.getId();
+		this.name = deployment.getName();
+		this.deploymentTime = deployment.getDeploymentTime();
+		this.category = deployment.getCategory();
+		this.tenantId = deployment.getTenantId();
+	}
 }
diff --git a/len-activiti/src/main/java/com/len/entity/ActModel.java b/len-activiti/src/main/java/com/len/entity/ActModel.java
index 479b4c5..0bce234 100644
--- a/len-activiti/src/main/java/com/len/entity/ActModel.java
+++ b/len-activiti/src/main/java/com/len/entity/ActModel.java
@@ -15,14 +15,11 @@
  */
 package com.len.entity;
 
-import java.util.Date;
-
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
 import org.activiti.engine.repository.Model;
 
+import java.util.Date;
+
 /**
  * @author zhuxiaomeng
  * @date 2018/1/18.
@@ -32,33 +29,33 @@ import org.activiti.engine.repository.Model;
 @Data
 public class ActModel {
 
-  private String id;
-  private String name;
-  private String key;
-  private String category;
-  private Date createTime;
-  private Date lastUpdateTime;
-  private Integer version;
-  private String metaInfo;
-  private String deploymentId;
-  private String tenantId;
-  private boolean hasEditorSource;
+	private String id;
+	private String name;
+	private String key;
+	private String category;
+	private Date createTime;
+	private Date lastUpdateTime;
+	private Integer version;
+	private String metaInfo;
+	private String deploymentId;
+	private String tenantId;
+	private boolean hasEditorSource;
 
 
-  public ActModel() {
-  }
+	public ActModel() {
+	}
 
-  public ActModel(Model model) {
-    this.id = model.getId();
-    this.name = model.getName();
-    this.key = model.getKey();
-    this.category = model.getCategory();
-    this.createTime = model.getCreateTime();
-    this.lastUpdateTime = model.getLastUpdateTime();
-    this.version = model.getVersion();
-    this.metaInfo = model.getMetaInfo();
-    this.deploymentId = model.getDeploymentId();
-    this.tenantId = model.getTenantId();
-    this.hasEditorSource = model.hasEditorSource();
-  }
+	public ActModel(Model model) {
+		this.id = model.getId();
+		this.name = model.getName();
+		this.key = model.getKey();
+		this.category = model.getCategory();
+		this.createTime = model.getCreateTime();
+		this.lastUpdateTime = model.getLastUpdateTime();
+		this.version = model.getVersion();
+		this.metaInfo = model.getMetaInfo();
+		this.deploymentId = model.getDeploymentId();
+		this.tenantId = model.getTenantId();
+		this.hasEditorSource = model.hasEditorSource();
+	}
 }
diff --git a/len-activiti/src/main/java/com/len/entity/BaseTask.java b/len-activiti/src/main/java/com/len/entity/BaseTask.java
index 76769ff..35110f1 100644
--- a/len-activiti/src/main/java/com/len/entity/BaseTask.java
+++ b/len-activiti/src/main/java/com/len/entity/BaseTask.java
@@ -8,202 +8,183 @@ import java.util.Date;
  */
 public abstract class BaseTask implements Serializable {
 
-    protected String id;
-
-    /**
-     * @return id
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
-
-    protected String userId;
-
-    protected String userName;
-
-
-    protected String processInstanceId;
-
-    protected String status;
-
-    protected Date createDate;
-
-    protected String createBy;
-
-    protected Date updateDate;
-
-    protected String updateBy;
-
-
-    protected String reason;
-
-
-    //***实时节点信息
-    protected String taskName;
-
-
-    private String urlpath;
-
-
-    private Integer submittimes;
-
-
-    /**
-     * @return user_id
-     */
-    public String getUserId() {
-        return userId;
-    }
-
-    /**
-     * @param userId
-     */
-    public void setUserId(String userId) {
-        this.userId = userId == null ? null : userId.trim();
-    }
-
-    /**
-     * @return user_name
-     */
-    public String getUserName() {
-        return userName;
-    }
-
-    /**
-     * @param userName
-     */
-    public void setUserName(String userName) {
-        this.userName = userName == null ? null : userName.trim();
-    }
-
-
-    /**
-     * @return reason
-     */
-    public String getReason() {
-        return reason;
-    }
-
-    /**
-     * @param reason
-     */
-    public void setReason(String reason) {
-        this.reason = reason == null ? null : reason.trim();
-    }
-
-    /**
-     * @return process_instance_Id
-     */
-    public String getProcessInstanceId() {
-        return processInstanceId;
-    }
-
-    /**
-     * @param processInstanceId
-     */
-    public void setProcessInstanceId(String processInstanceId) {
-        this.processInstanceId = processInstanceId == null ? null : processInstanceId.trim();
-    }
-
-    /**
-     * @return status
-     */
-    public String getStatus() {
-        return status;
-    }
-
-    /**
-     * @param status
-     */
-    public void setStatus(String status) {
-        this.status = status == null ? null : status.trim();
-    }
-
-    /**
-     * @return create_date
-     */
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    /**
-     * @param createDate
-     */
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    /**
-     * @return create_by
-     */
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    /**
-     * @param createBy
-     */
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy == null ? null : createBy.trim();
-    }
-
-    /**
-     * @return update_date
-     */
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    /**
-     * @param updateDate
-     */
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-
-    /**
-     * @return update_by
-     */
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    /**
-     * @param updateBy
-     */
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy == null ? null : updateBy.trim();
-    }
-
-    public String getTaskName() {
-        return taskName;
-    }
-
-    public void setTaskName(String taskName) {
-        this.taskName = taskName;
-    }
-
-    public String getUrlpath() {
-        return urlpath;
-    }
-
-    public void setUrlpath(String urlpath) {
-        this.urlpath = urlpath;
-    }
-
-    public Integer getSubmittimes() {
-        return submittimes;
-    }
-
-    public void setSubmittimes(Integer submittimes) {
-        this.submittimes = submittimes;
-    }
+	protected String id;
+	protected String userId;
+	protected String userName;
+	protected String processInstanceId;
+	protected String status;
+	protected Date createDate;
+	protected String createBy;
+	protected Date updateDate;
+	protected String updateBy;
+	protected String reason;
+	//***实时节点信息
+	protected String taskName;
+	private String urlpath;
+	private Integer submittimes;
+
+	/**
+	 * @return id
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * @param id
+	 */
+	public void setId(String id) {
+		this.id = id == null ? null : id.trim();
+	}
+
+	/**
+	 * @return user_id
+	 */
+	public String getUserId() {
+		return userId;
+	}
+
+	/**
+	 * @param userId
+	 */
+	public void setUserId(String userId) {
+		this.userId = userId == null ? null : userId.trim();
+	}
+
+	/**
+	 * @return user_name
+	 */
+	public String getUserName() {
+		return userName;
+	}
+
+	/**
+	 * @param userName
+	 */
+	public void setUserName(String userName) {
+		this.userName = userName == null ? null : userName.trim();
+	}
+
+
+	/**
+	 * @return reason
+	 */
+	public String getReason() {
+		return reason;
+	}
+
+	/**
+	 * @param reason
+	 */
+	public void setReason(String reason) {
+		this.reason = reason == null ? null : reason.trim();
+	}
+
+	/**
+	 * @return process_instance_Id
+	 */
+	public String getProcessInstanceId() {
+		return processInstanceId;
+	}
+
+	/**
+	 * @param processInstanceId
+	 */
+	public void setProcessInstanceId(String processInstanceId) {
+		this.processInstanceId = processInstanceId == null ? null : processInstanceId.trim();
+	}
+
+	/**
+	 * @return status
+	 */
+	public String getStatus() {
+		return status;
+	}
+
+	/**
+	 * @param status
+	 */
+	public void setStatus(String status) {
+		this.status = status == null ? null : status.trim();
+	}
+
+	/**
+	 * @return create_date
+	 */
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	/**
+	 * @param createDate
+	 */
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	/**
+	 * @return create_by
+	 */
+	public String getCreateBy() {
+		return createBy;
+	}
+
+	/**
+	 * @param createBy
+	 */
+	public void setCreateBy(String createBy) {
+		this.createBy = createBy == null ? null : createBy.trim();
+	}
+
+	/**
+	 * @return update_date
+	 */
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+
+	/**
+	 * @param updateDate
+	 */
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+
+	/**
+	 * @return update_by
+	 */
+	public String getUpdateBy() {
+		return updateBy;
+	}
+
+	/**
+	 * @param updateBy
+	 */
+	public void setUpdateBy(String updateBy) {
+		this.updateBy = updateBy == null ? null : updateBy.trim();
+	}
+
+	public String getTaskName() {
+		return taskName;
+	}
+
+	public void setTaskName(String taskName) {
+		this.taskName = taskName;
+	}
+
+	public String getUrlpath() {
+		return urlpath;
+	}
+
+	public void setUrlpath(String urlpath) {
+		this.urlpath = urlpath;
+	}
+
+	public Integer getSubmittimes() {
+		return submittimes;
+	}
+
+	public void setSubmittimes(Integer submittimes) {
+		this.submittimes = submittimes;
+	}
 }
diff --git a/len-activiti/src/main/java/com/len/entity/LeaveOpinion.java b/len-activiti/src/main/java/com/len/entity/LeaveOpinion.java
index 454af09..bbdbbf1 100644
--- a/len-activiti/src/main/java/com/len/entity/LeaveOpinion.java
+++ b/len-activiti/src/main/java/com/len/entity/LeaveOpinion.java
@@ -15,30 +15,30 @@
  */
 package com.len.entity;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
- *
  * 请假流程 审批信息
  */
 @Getter
 @Setter
-public class LeaveOpinion implements Serializable{
+public class LeaveOpinion implements Serializable {
 
-  //审批人id
-  private String opId;
-  //审批人姓名
-  private String opName;
-  //审批意见
-  private String opinion;
-  //审批时间
-  private Date createTime;
-  //是否通过
-  private boolean flag;
-  //流程id
-  private String taskId;
+	//审批人id
+	private String opId;
+	//审批人姓名
+	private String opName;
+	//审批意见
+	private String opinion;
+	//审批时间
+	private Date createTime;
+	//是否通过
+	private boolean flag;
+	//流程id
+	private String taskId;
 
 }
diff --git a/len-activiti/src/main/java/com/len/entity/ProcessDefinition.java b/len-activiti/src/main/java/com/len/entity/ProcessDefinition.java
index 00cdec5..af7be78 100644
--- a/len-activiti/src/main/java/com/len/entity/ProcessDefinition.java
+++ b/len-activiti/src/main/java/com/len/entity/ProcessDefinition.java
@@ -29,36 +29,37 @@ import lombok.ToString;
 @Setter
 @ToString
 public class ProcessDefinition {
-  private String id;
-  private String category;
-  private String name;
-  private String key;
-  private String description;
-  private int version;
-  private String resourceName;
-  private String deploymentId;
-  private String diagramResourceName;
-  private boolean hasStartFormKey;
-  private boolean hasGraphicalNotation;
-  private boolean isSuspended;
-  private String tenantId;
+	private String id;
+	private String category;
+	private String name;
+	private String key;
+	private String description;
+	private int version;
+	private String resourceName;
+	private String deploymentId;
+	private String diagramResourceName;
+	private boolean hasStartFormKey;
+	private boolean hasGraphicalNotation;
+	private boolean isSuspended;
+	private String tenantId;
 
-  public ProcessDefinition() {
-  }
-  public ProcessDefinition(org.activiti.engine.repository.ProcessDefinition p) {
-    this.id=p.getId();
-    this.category=p.getCategory();
-    this.name=p.getName();
-    this.key=p.getKey();
-    this.description=p.getDescription();
-    this.version=p.getVersion();
-    this.resourceName=p.getResourceName();
-    this.deploymentId=p.getDeploymentId();
-    this.diagramResourceName=p.getDiagramResourceName();
-    this.hasStartFormKey=p.hasStartFormKey();
-    this.hasGraphicalNotation=p.hasGraphicalNotation();
-    this.isSuspended=p.isSuspended();
-    this.tenantId=p.getTenantId();
+	public ProcessDefinition() {
+	}
 
-  }
+	public ProcessDefinition(org.activiti.engine.repository.ProcessDefinition p) {
+		this.id = p.getId();
+		this.category = p.getCategory();
+		this.name = p.getName();
+		this.key = p.getKey();
+		this.description = p.getDescription();
+		this.version = p.getVersion();
+		this.resourceName = p.getResourceName();
+		this.deploymentId = p.getDeploymentId();
+		this.diagramResourceName = p.getDiagramResourceName();
+		this.hasStartFormKey = p.hasStartFormKey();
+		this.hasGraphicalNotation = p.hasGraphicalNotation();
+		this.isSuspended = p.isSuspended();
+		this.tenantId = p.getTenantId();
+
+	}
 }
diff --git a/len-activiti/src/main/java/com/len/entity/Task.java b/len-activiti/src/main/java/com/len/entity/Task.java
index 4bea8f9..1b15ec8 100644
--- a/len-activiti/src/main/java/com/len/entity/Task.java
+++ b/len-activiti/src/main/java/com/len/entity/Task.java
@@ -15,16 +15,17 @@
  */
 package com.len.entity;
 
-import java.util.Date;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
+import java.util.Date;
+
 /**
  * @author zhuxiaomeng
  * @date 2018/1/21.
  * @email lenospmiller@gmail.com
- *
+ * <p>
  * 流程任务
  */
 
@@ -32,28 +33,30 @@ import lombok.ToString;
 @Setter
 @ToString
 public class Task {
-  private String id;
-  private String name;
-  private Date createTime;
-  private String assignee;
-  private String processInstanceId;//流程实例id
-  private String processDefinitionId;//流程定义id
-  private String description;
-  private String category;
+	private String id;
+	private String name;
+	private Date createTime;
+	private String assignee;
+	private String processInstanceId;//流程实例id
+	private String processDefinitionId;//流程定义id
+	private String description;
+	private String category;
+
+	private String userName;
+	private String reason;
+	private String urlpath;
+
+	public Task() {
+	}
 
-  private String userName;
-  private String reason;
-  private String urlpath;
-  public Task() {
-  }
-  public Task(org.activiti.engine.task.Task t) {
-    this.id=t.getId();
-    this.name=t.getName();
-    this.createTime=t.getCreateTime();
-    this.assignee=t.getAssignee();
-    this.processInstanceId=t.getProcessInstanceId();
-    this.processDefinitionId=t.getProcessDefinitionId();
-    this.description=t.getDescription();
-    this.category=t.getCategory();
-  }
+	public Task(org.activiti.engine.task.Task t) {
+		this.id = t.getId();
+		this.name = t.getName();
+		this.createTime = t.getCreateTime();
+		this.assignee = t.getAssignee();
+		this.processInstanceId = t.getProcessInstanceId();
+		this.processDefinitionId = t.getProcessDefinitionId();
+		this.description = t.getDescription();
+		this.category = t.getCategory();
+	}
 }
diff --git a/len-activiti/src/main/java/com/len/entity/UserLeave.java b/len-activiti/src/main/java/com/len/entity/UserLeave.java
index 276e40e..31399eb 100644
--- a/len-activiti/src/main/java/com/len/entity/UserLeave.java
+++ b/len-activiti/src/main/java/com/len/entity/UserLeave.java
@@ -12,109 +12,95 @@ import java.util.List;
 @TableName(value = "user_leave")
 public class UserLeave extends BaseTask {
 
-    @TableId(value = "id", type = IdType.UUID)
-    protected String id;
-
-    /**
-     * @return id
-     */
-    @Override
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    @Override
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
-    private Integer days;
-
-    @TableField(value = "begin_time")
-    private Date beginTime;
-
-    @TableField(value = "end_time")
-    private Date endTime;
-
-    @TableField(value = "process_instance_Id")
-    private String processInstanceId;
-
-    private String status;
-
-    @TableField(value = "create_date")
-    private Date createDate;
-
-    @TableField(value = "create_by")
-    private String createBy;
-
-    @TableField(value = "update_date")
-    private Date updateDate;
-
-    @TableField(value = "update_by")
-    private String updateBy;
-
-    //***实时节点信息
-    @TableField(exist = false)
-    private String taskName;
-
-
-
-    //请假单审核信息
-    @TableField(exist = false)
-    private List<LeaveOpinion> opinionList=new ArrayList<>();
-
-    public void leaveOpAdd(LeaveOpinion leaveOpinion){
-        this.opinionList.add(leaveOpinion);
-    }
-    public void leaveOpAddAll(List<LeaveOpinion> leaveOpinionList){
-        this.opinionList.addAll(leaveOpinionList);
-    }
-
-    public List<LeaveOpinion> getOpinionList() {
-        return opinionList;
-    }
-
-    public void setOpinionList(List<LeaveOpinion> opinionList) {
-        this.opinionList = opinionList;
-    }
-
-
-
-    /**
-     * @return days
-     */
-    public Integer getDays() {
-        return days;
-    }
-
-    /**
-     * @param days
-     */
-    public void setDays(Integer days) {
-        this.days = days;
-    }
-
-
-
-    public Date getBeginTime() {
-        return beginTime;
-    }
-
-
-    public void setBeginTime(Date beginTime) {
-        this.beginTime = beginTime;
-    }
-
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-}
\ No newline at end of file
+	@TableId(value = "id", type = IdType.UUID)
+	protected String id;
+	private Integer days;
+	@TableField(value = "begin_time")
+	private Date beginTime;
+	@TableField(value = "end_time")
+	private Date endTime;
+	@TableField(value = "process_instance_Id")
+	private String processInstanceId;
+	private String status;
+	@TableField(value = "create_date")
+	private Date createDate;
+	@TableField(value = "create_by")
+	private String createBy;
+	@TableField(value = "update_date")
+	private Date updateDate;
+	@TableField(value = "update_by")
+	private String updateBy;
+	//***实时节点信息
+	@TableField(exist = false)
+	private String taskName;
+	//请假单审核信息
+	@TableField(exist = false)
+	private List<LeaveOpinion> opinionList = new ArrayList<>();
+
+	/**
+	 * @return id
+	 */
+	@Override
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * @param id
+	 */
+	@Override
+	public void setId(String id) {
+		this.id = id == null ? null : id.trim();
+	}
+
+	public void leaveOpAdd(LeaveOpinion leaveOpinion) {
+		this.opinionList.add(leaveOpinion);
+	}
+
+	public void leaveOpAddAll(List<LeaveOpinion> leaveOpinionList) {
+		this.opinionList.addAll(leaveOpinionList);
+	}
+
+	public List<LeaveOpinion> getOpinionList() {
+		return opinionList;
+	}
+
+	public void setOpinionList(List<LeaveOpinion> opinionList) {
+		this.opinionList = opinionList;
+	}
+
+
+	/**
+	 * @return days
+	 */
+	public Integer getDays() {
+		return days;
+	}
+
+	/**
+	 * @param days
+	 */
+	public void setDays(Integer days) {
+		this.days = days;
+	}
+
+
+	public Date getBeginTime() {
+		return beginTime;
+	}
+
+
+	public void setBeginTime(Date beginTime) {
+		this.beginTime = beginTime;
+	}
+
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+}
diff --git a/len-activiti/src/main/java/com/len/mapper/ActAssigneeMapper.java b/len-activiti/src/main/java/com/len/mapper/ActAssigneeMapper.java
index 39590bd..7ad143e 100644
--- a/len-activiti/src/main/java/com/len/mapper/ActAssigneeMapper.java
+++ b/len-activiti/src/main/java/com/len/mapper/ActAssigneeMapper.java
@@ -4,5 +4,5 @@ import com.len.base.BaseMapper;
 import com.len.entity.ActAssignee;
 
 public interface ActAssigneeMapper extends BaseMapper<ActAssignee> {
-    int deleteByNodeId(String nodeId);
-}
\ No newline at end of file
+	int deleteByNodeId(String nodeId);
+}
diff --git a/len-activiti/src/main/java/com/len/service/ActAssigneeService.java b/len-activiti/src/main/java/com/len/service/ActAssigneeService.java
index 6ec20ce..d58e809 100644
--- a/len-activiti/src/main/java/com/len/service/ActAssigneeService.java
+++ b/len-activiti/src/main/java/com/len/service/ActAssigneeService.java
@@ -12,10 +12,10 @@ import java.util.List;
  * @email lenospmiller@gmail.com
  */
 public interface ActAssigneeService extends BaseService<ActAssignee> {
-  int deleteByNodeId(String nodeId);
+	int deleteByNodeId(String nodeId);
 
-  public List<ActivityImpl> getActivityList(String deploymentId);
+	public List<ActivityImpl> getActivityList(String deploymentId);
 
-  public  List<ActivityImpl> selectAllActivity(List<ActivityImpl> activities);
+	public List<ActivityImpl> selectAllActivity(List<ActivityImpl> activities);
 
 }
diff --git a/len-activiti/src/main/java/com/len/service/UserLeaveService.java b/len-activiti/src/main/java/com/len/service/UserLeaveService.java
index cc174b4..ba5d4bd 100644
--- a/len-activiti/src/main/java/com/len/service/UserLeaveService.java
+++ b/len-activiti/src/main/java/com/len/service/UserLeaveService.java
@@ -12,5 +12,5 @@ import java.util.List;
  */
 public interface UserLeaveService extends BaseService<UserLeave> {
 
-    public List<UserLeave> selectListByPage(UserLeave record);
+	public List<UserLeave> selectListByPage(UserLeave record);
 }
diff --git a/len-activiti/src/main/java/com/len/service/impl/ActAssigneeServiceImpl.java b/len-activiti/src/main/java/com/len/service/impl/ActAssigneeServiceImpl.java
index 6ba629a..8eb216c 100644
--- a/len-activiti/src/main/java/com/len/service/impl/ActAssigneeServiceImpl.java
+++ b/len-activiti/src/main/java/com/len/service/impl/ActAssigneeServiceImpl.java
@@ -25,40 +25,40 @@ import java.util.List;
  */
 @Service
 public class ActAssigneeServiceImpl extends BaseServiceImpl<ActAssigneeMapper, ActAssignee> implements
-        ActAssigneeService {
+	ActAssigneeService {
 
-    @Autowired
-    ActAssigneeMapper actAssigneeMapper;
+	@Autowired
+	ActAssigneeMapper actAssigneeMapper;
 
-    @Autowired
-    private RepositoryService repositoryService;
+	@Autowired
+	private RepositoryService repositoryService;
 
-    @Override
-    public int deleteByNodeId(String nodeId) {
-        return actAssigneeMapper.deleteByNodeId(nodeId);
-    }
+	@Override
+	public int deleteByNodeId(String nodeId) {
+		return actAssigneeMapper.deleteByNodeId(nodeId);
+	}
 
-    @Override
-    public List<ActivityImpl> getActivityList(String deploymentId) {
-        org.activiti.engine.repository.ProcessDefinition processDefinition = repositoryService
-                .createProcessDefinitionQuery().deploymentId(deploymentId).singleResult();
-        ProcessDefinitionEntity processDefinitionEntity = (ProcessDefinitionEntity) ((RepositoryServiceImpl) repositoryService)
-                .getDeployedProcessDefinition(processDefinition.getId());
-        InputStream inputStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), processDefinition.getResourceName());
-        BpmnModel bm = new BpmnXMLConverter().convertToBpmnModel(new InputStreamSource(inputStream), false, true);
-        return selectAllActivity(processDefinitionEntity.getActivities());
+	@Override
+	public List<ActivityImpl> getActivityList(String deploymentId) {
+		org.activiti.engine.repository.ProcessDefinition processDefinition = repositoryService
+			.createProcessDefinitionQuery().deploymentId(deploymentId).singleResult();
+		ProcessDefinitionEntity processDefinitionEntity = (ProcessDefinitionEntity) ((RepositoryServiceImpl) repositoryService)
+			.getDeployedProcessDefinition(processDefinition.getId());
+		InputStream inputStream = repositoryService.getResourceAsStream(processDefinition.getDeploymentId(), processDefinition.getResourceName());
+		BpmnModel bm = new BpmnXMLConverter().convertToBpmnModel(new InputStreamSource(inputStream), false, true);
+		return selectAllActivity(processDefinitionEntity.getActivities());
 
-    }
+	}
 
-    @Override
-    public List<ActivityImpl> selectAllActivity(List<ActivityImpl> activities) {
-        List<ActivityImpl> list = new ArrayList<>(activities);
-        for (ActivityImpl activity : activities) {
-            List<ActivityImpl> childActivities = activity.getActivities();
-            if (!childActivities.isEmpty()) {
-                list.addAll(selectAllActivity(childActivities));
-            }
-        }
-        return list;
-    }
+	@Override
+	public List<ActivityImpl> selectAllActivity(List<ActivityImpl> activities) {
+		List<ActivityImpl> list = new ArrayList<>(activities);
+		for (ActivityImpl activity : activities) {
+			List<ActivityImpl> childActivities = activity.getActivities();
+			if (!childActivities.isEmpty()) {
+				list.addAll(selectAllActivity(childActivities));
+			}
+		}
+		return list;
+	}
 }
diff --git a/len-activiti/src/main/java/com/len/service/impl/UserLeaveServiceImpl.java b/len-activiti/src/main/java/com/len/service/impl/UserLeaveServiceImpl.java
index fdf6eda..83e7148 100644
--- a/len-activiti/src/main/java/com/len/service/impl/UserLeaveServiceImpl.java
+++ b/len-activiti/src/main/java/com/len/service/impl/UserLeaveServiceImpl.java
@@ -16,13 +16,13 @@ import java.util.List;
  */
 @Service
 public class UserLeaveServiceImpl extends BaseServiceImpl<UserLeaveMapper, UserLeave> implements
-        UserLeaveService {
+	UserLeaveService {
 
-    @Autowired
-    UserLeaveMapper userLeaveMapper;
+	@Autowired
+	UserLeaveMapper userLeaveMapper;
 
-    @Override
-    public List<UserLeave> selectListByPage(UserLeave record) {
-        return userLeaveMapper.selectListByPage(record);
-    }
+	@Override
+	public List<UserLeave> selectListByPage(UserLeave record) {
+		return userLeaveMapper.selectListByPage(record);
+	}
 }
diff --git a/len-activiti/src/main/java/com/len/util/AnimatedGifEncoder.java b/len-activiti/src/main/java/com/len/util/AnimatedGifEncoder.java
index 62fef8a..69bb76e 100644
--- a/len-activiti/src/main/java/com/len/util/AnimatedGifEncoder.java
+++ b/len-activiti/src/main/java/com/len/util/AnimatedGifEncoder.java
@@ -1,18 +1,17 @@
 package com.len.util;
 
-import java.awt.Color;
-import java.awt.Graphics2D;
+import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferByte;
 import java.io.BufferedOutputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
- 
+
 /**
  * Class AnimatedGifEncoder - Encodes a GIF file consisting of one or more
  * frames.
- * 
+ *
  * <pre>
  *  Example:
  *     AnimatedGifEncoder e = new AnimatedGifEncoder();
@@ -22,786 +21,750 @@ import java.io.OutputStream;
  *     e.addFrame(image2);
  *     e.finish();
  * </pre>
- * 
+ * <p>
  * No copyright asserted on the source code of this class. May be used for any
  * purpose, however, refer to the Unisys LZW patent for restrictions on use of
  * the associated LZWEncoder class. Please forward any corrections to
  * kweiner@fmsware.com.
- * 
+ *
  * @author Kevin Weiner, FM Software
  * @version 1.03 November 2003
- * 
  */
- 
+
 public class AnimatedGifEncoder {
- 
-  protected int width; // image size
- 
-  protected int height;
- 
-  protected Color transparent = null; // transparent color if given
- 
-  protected int transIndex; // transparent index in color table
- 
-  protected int repeat = -1; // no repeat
- 
-  protected int delay = 0; // frame delay (hundredths)
- 
-  protected boolean started = false; // ready to output frames
- 
-  protected OutputStream out;
- 
-  protected BufferedImage image; // current frame
- 
-  protected byte[] pixels; // BGR byte array from frame
- 
-  protected byte[] indexedPixels; // converted frame indexed to palette
- 
-  protected int colorDepth; // number of bit planes
- 
-  protected byte[] colorTab; // RGB palette
- 
-  protected boolean[] usedEntry = new boolean[256]; // active palette entries
- 
-  protected int palSize = 7; // color table size (bits-1)
- 
-  protected int dispose = -1; // disposal code (-1 = use default)
- 
-  protected boolean closeStream = false; // close stream when finished
- 
-  protected boolean firstFrame = true;
- 
-  protected boolean sizeSet = false; // if false, get size from first frame
- 
-  protected int sample = 10; // default sample interval for quantizer
- 
-  /**
-   * Sets the delay time between each frame, or changes it for subsequent frames
-   * (applies to last frame added).
-   * 
-   * @param ms
-   *          int delay time in milliseconds
-   */
-  public void setDelay(int ms) {
-    delay = Math.round(ms / 10.0f);
-  }
- 
-  /**
-   * Sets the GIF frame disposal code for the last added frame and any
-   * subsequent frames. Default is 0 if no transparent color has been set,
-   * otherwise 2.
-   * 
-   * @param code
-   *          int disposal code.
-   */
-  public void setDispose(int code) {
-    if (code >= 0) {
-      dispose = code;
-    }
-  }
- 
-  /**
-   * Sets the number of times the set of GIF frames should be played. Default is
-   * 1; 0 means play indefinitely. Must be invoked before the first image is
-   * added.
-   * 
-   * @param iter
-   *          int number of iterations.
-   * @return
-   */
-  public void setRepeat(int iter) {
-    if (iter >= 0) {
-      repeat = iter;
-    }
-  }
- 
-  /**
-   * Sets the transparent color for the last added frame and any subsequent
-   * frames. Since all colors are subject to modification in the quantization
-   * process, the color in the final palette for each frame closest to the given
-   * color becomes the transparent color for that frame. May be set to null to
-   * indicate no transparent color.
-   * 
-   * @param c
-   *          Color to be treated as transparent on display.
-   */
-  public void setTransparent(Color c) {
-    transparent = c;
-  }
- 
-  /**
-   * Adds next GIF frame. The frame is not written immediately, but is actually
-   * deferred until the next frame is received so that timing data can be
-   * inserted. Invoking <code>finish()</code> flushes all frames. If
-   * <code>setSize</code> was not invoked, the size of the first image is used
-   * for all subsequent frames.
-   * 
-   * @param im
-   *          BufferedImage containing frame to write.
-   * @return true if successful.
-   */
-  public boolean addFrame(BufferedImage im) {
-    if ((im == null) || !started) {
-      return false;
-    }
-    boolean ok = true;
-    try {
-      if (!sizeSet) {
-        // use first frame's size
-        setSize(im.getWidth(), im.getHeight());
-      }
-      image = im;
-      getImagePixels(); // convert to correct format if necessary
-      analyzePixels(); // build color table & map pixels
-      if (firstFrame) {
-        writeLSD(); // logical screen descriptior
-        writePalette(); // global color table
-        if (repeat >= 0) {
-          // use NS app extension to indicate reps
-          writeNetscapeExt();
-        }
-      }
-      writeGraphicCtrlExt(); // write graphic control extension
-      writeImageDesc(); // image descriptor
-      if (!firstFrame) {
-        writePalette(); // local color table
-      }
-      writePixels(); // encode and write pixel data
-      firstFrame = false;
-    } catch (IOException e) {
-      ok = false;
-    }
- 
-    return ok;
-  }
- 
-  /**
-   * Flushes any pending data and closes output file. If writing to an
-   * OutputStream, the stream is not closed.
-   */
-  public boolean finish() {
-    if (!started)
-      return false;
-    boolean ok = true;
-    started = false;
-    try {
-      out.write(0x3b); // gif trailer
-      out.flush();
-      if (closeStream) {
-        out.close();
-      }
-    } catch (IOException e) {
-      ok = false;
-    }
- 
-    // reset for subsequent use
-    transIndex = 0;
-    out = null;
-    image = null;
-    pixels = null;
-    indexedPixels = null;
-    colorTab = null;
-    closeStream = false;
-    firstFrame = true;
- 
-    return ok;
-  }
- 
-  /**
-   * Sets frame rate in frames per second. Equivalent to
-   * <code>setDelay(1000/fps)</code>.
-   * 
-   * @param fps
-   *          float frame rate (frames per second)
-   */
-  public void setFrameRate(float fps) {
-    if (fps != 0f) {
-      delay = Math.round(100f / fps);
-    }
-  }
- 
-  /**
-   * Sets quality of color quantization (conversion of images to the maximum 256
-   * colors allowed by the GIF specification). Lower values (minimum = 1)
-   * produce better colors, but slow processing significantly. 10 is the
-   * default, and produces good color mapping at reasonable speeds. Values
-   * greater than 20 do not yield significant improvements in speed.
-   * 
-   * @param quality
-   *          int greater than 0.
-   * @return
-   */
-  public void setQuality(int quality) {
-    if (quality < 1)
-      quality = 1;
-    sample = quality;
-  }
- 
-  /**
-   * Sets the GIF frame size. The default size is the size of the first frame
-   * added if this method is not invoked.
-   * 
-   * @param w
-   *          int frame width.
-   * @param h
-   *          int frame width.
-   */
-  public void setSize(int w, int h) {
-    if (started && !firstFrame)
-      return;
-    width = w;
-    height = h;
-    if (width < 1)
-      width = 320;
-    if (height < 1)
-      height = 240;
-    sizeSet = true;
-  }
- 
-  /**
-   * Initiates GIF file creation on the given stream. The stream is not closed
-   * automatically.
-   * 
-   * @param os
-   *          OutputStream on which GIF images are written.
-   * @return false if initial write failed.
-   */
-  public boolean start(OutputStream os) {
-    if (os == null)
-      return false;
-    boolean ok = true;
-    closeStream = false;
-    out = os;
-    try {
-      writeString("GIF89a"); // header
-    } catch (IOException e) {
-      ok = false;
-    }
-    return started = ok;
-  }
- 
-  /**
-   * Initiates writing of a GIF file with the specified name.
-   * 
-   * @param file
-   *          String containing output file name.
-   * @return false if open or initial write failed.
-   */
-  public boolean start(String file) {
-    boolean ok = true;
-    try {
-      out = new BufferedOutputStream(new FileOutputStream(file));
-      ok = start(out);
-      closeStream = true;
-    } catch (IOException e) {
-      ok = false;
-    }
-    return started = ok;
-  }
- 
-  /**
-   * Analyzes image colors and creates color map.
-   */
-  protected void analyzePixels() {
-    int len = pixels.length;
-    int nPix = len / 3;
-    indexedPixels = new byte[nPix];
-    NeuQuant nq = new NeuQuant(pixels, len, sample);
-    // initialize quantizer
-    colorTab = nq.process(); // create reduced palette
-    // convert map from BGR to RGB
-    for (int i = 0; i < colorTab.length; i += 3) {
-      byte temp = colorTab[i];
-      colorTab[i] = colorTab[i + 2];
-      colorTab[i + 2] = temp;
-      usedEntry[i / 3] = false;
-    }
-    // map image pixels to new palette
-    int k = 0;
-    for (int i = 0; i < nPix; i++) {
-      int index = nq.map(pixels[k++] & 0xff, pixels[k++] & 0xff, pixels[k++] & 0xff);
-      usedEntry[index] = true;
-      indexedPixels[i] = (byte) index;
-    }
-    pixels = null;
-    colorDepth = 8;
-    palSize = 7;
-    // get closest match to transparent color if specified
-    if (transparent != null) {
-      transIndex = findClosest(transparent);
-    }
-  }
- 
-  /**
-   * Returns index of palette color closest to c
-   * 
-   */
-  protected int findClosest(Color c) {
-    if (colorTab == null)
-      return -1;
-    int r = c.getRed();
-    int g = c.getGreen();
-    int b = c.getBlue();
-    int minpos = 0;
-    int dmin = 256 * 256 * 256;
-    int len = colorTab.length;
-    for (int i = 0; i < len;) {
-      int dr = r - (colorTab[i++] & 0xff);
-      int dg = g - (colorTab[i++] & 0xff);
-      int db = b - (colorTab[i] & 0xff);
-      int d = dr * dr + dg * dg + db * db;
-      int index = i / 3;
-      if (usedEntry[index] && (d < dmin)) {
-        dmin = d;
-        minpos = index;
-      }
-      i++;
-    }
-    return minpos;
-  }
- 
-  /**
-   * Extracts image pixels into byte array "pixels"
-   */
-  protected void getImagePixels() {
-    int w = image.getWidth();
-    int h = image.getHeight();
-    int type = image.getType();
-    if ((w != width) || (h != height) || (type != BufferedImage.TYPE_3BYTE_BGR)) {
-      // create new image with right size/format
-      BufferedImage temp = new BufferedImage(width, height, BufferedImage.TYPE_3BYTE_BGR);
-      Graphics2D g = temp.createGraphics();
-      g.drawImage(image, 0, 0, null);
-      image = temp;
-    }
-    pixels = ((DataBufferByte) image.getRaster().getDataBuffer()).getData();
-  }
- 
-  /**
-   * Writes Graphic Control Extension
-   */
-  protected void writeGraphicCtrlExt() throws IOException {
-    out.write(0x21); // extension introducer
-    out.write(0xf9); // GCE label
-    out.write(4); // data block size
-    int transp, disp;
-    if (transparent == null) {
-      transp = 0;
-      disp = 0; // dispose = no action
-    } else {
-      transp = 1;
-      disp = 2; // force clear if using transparent color
-    }
-    if (dispose >= 0) {
-      disp = dispose & 7; // user override
-    }
-    disp <<= 2;
- 
-    // packed fields
-    out.write(0 | // 1:3 reserved
-        disp | // 4:6 disposal
-        0 | // 7 user input - 0 = none
-        transp); // 8 transparency flag
- 
-    writeShort(delay); // delay x 1/100 sec
-    out.write(transIndex); // transparent color index
-    out.write(0); // block terminator
-  }
- 
-  /**
-   * Writes Image Descriptor
-   */
-  protected void writeImageDesc() throws IOException {
-    out.write(0x2c); // image separator
-    writeShort(0); // image position x,y = 0,0
-    writeShort(0);
-    writeShort(width); // image size
-    writeShort(height);
-    // packed fields
-    if (firstFrame) {
-      // no LCT - GCT is used for first (or only) frame
-      out.write(0);
-    } else {
-      // specify normal LCT
-      out.write(0x80 | // 1 local color table 1=yes
-          0 | // 2 interlace - 0=no
-          0 | // 3 sorted - 0=no
-          0 | // 4-5 reserved
-          palSize); // 6-8 size of color table
-    }
-  }
- 
-  /**
-   * Writes Logical Screen Descriptor
-   */
-  protected void writeLSD() throws IOException {
-    // logical screen size
-    writeShort(width);
-    writeShort(height);
-    // packed fields
-    out.write((0x80 | // 1 : global color table flag = 1 (gct used)
-        0x70 | // 2-4 : color resolution = 7
-        0x00 | // 5 : gct sort flag = 0
-        palSize)); // 6-8 : gct size
- 
-    out.write(0); // background color index
-    out.write(0); // pixel aspect ratio - assume 1:1
-  }
- 
-  /**
-   * Writes Netscape application extension to define repeat count.
-   */
-  protected void writeNetscapeExt() throws IOException {
-    out.write(0x21); // extension introducer
-    out.write(0xff); // app extension label
-    out.write(11); // block size
-    writeString("NETSCAPE" + "2.0"); // app id + auth code
-    out.write(3); // sub-block size
-    out.write(1); // loop sub-block id
-    writeShort(repeat); // loop count (extra iterations, 0=repeat forever)
-    out.write(0); // block terminator
-  }
- 
-  /**
-   * Writes color table
-   */
-  protected void writePalette() throws IOException {
-    out.write(colorTab, 0, colorTab.length);
-    int n = (3 * 256) - colorTab.length;
-    for (int i = 0; i < n; i++) {
-      out.write(0);
-    }
-  }
- 
-  /**
-   * Encodes and writes pixel data
-   */
-  protected void writePixels() throws IOException {
-    LZWEncoder encoder = new LZWEncoder(width, height, indexedPixels, colorDepth);
-    encoder.encode(out);
-  }
- 
-  /**
-   * Write 16-bit value to output stream, LSB first
-   */
-  protected void writeShort(int value) throws IOException {
-    out.write(value & 0xff);
-    out.write((value >> 8) & 0xff);
-  }
- 
-  /**
-   * Writes string to output stream
-   */
-  protected void writeString(String s) throws IOException {
-    for (int i = 0; i < s.length(); i++) {
-      out.write((byte) s.charAt(i));
-    }
-  }
+
+	protected int width; // image size
+
+	protected int height;
+
+	protected Color transparent = null; // transparent color if given
+
+	protected int transIndex; // transparent index in color table
+
+	protected int repeat = -1; // no repeat
+
+	protected int delay = 0; // frame delay (hundredths)
+
+	protected boolean started = false; // ready to output frames
+
+	protected OutputStream out;
+
+	protected BufferedImage image; // current frame
+
+	protected byte[] pixels; // BGR byte array from frame
+
+	protected byte[] indexedPixels; // converted frame indexed to palette
+
+	protected int colorDepth; // number of bit planes
+
+	protected byte[] colorTab; // RGB palette
+
+	protected boolean[] usedEntry = new boolean[256]; // active palette entries
+
+	protected int palSize = 7; // color table size (bits-1)
+
+	protected int dispose = -1; // disposal code (-1 = use default)
+
+	protected boolean closeStream = false; // close stream when finished
+
+	protected boolean firstFrame = true;
+
+	protected boolean sizeSet = false; // if false, get size from first frame
+
+	protected int sample = 10; // default sample interval for quantizer
+
+	/**
+	 * Sets the delay time between each frame, or changes it for subsequent frames
+	 * (applies to last frame added).
+	 *
+	 * @param ms int delay time in milliseconds
+	 */
+	public void setDelay(int ms) {
+		delay = Math.round(ms / 10.0f);
+	}
+
+	/**
+	 * Sets the GIF frame disposal code for the last added frame and any
+	 * subsequent frames. Default is 0 if no transparent color has been set,
+	 * otherwise 2.
+	 *
+	 * @param code int disposal code.
+	 */
+	public void setDispose(int code) {
+		if (code >= 0) {
+			dispose = code;
+		}
+	}
+
+	/**
+	 * Sets the number of times the set of GIF frames should be played. Default is
+	 * 1; 0 means play indefinitely. Must be invoked before the first image is
+	 * added.
+	 *
+	 * @param iter int number of iterations.
+	 * @return
+	 */
+	public void setRepeat(int iter) {
+		if (iter >= 0) {
+			repeat = iter;
+		}
+	}
+
+	/**
+	 * Sets the transparent color for the last added frame and any subsequent
+	 * frames. Since all colors are subject to modification in the quantization
+	 * process, the color in the final palette for each frame closest to the given
+	 * color becomes the transparent color for that frame. May be set to null to
+	 * indicate no transparent color.
+	 *
+	 * @param c Color to be treated as transparent on display.
+	 */
+	public void setTransparent(Color c) {
+		transparent = c;
+	}
+
+	/**
+	 * Adds next GIF frame. The frame is not written immediately, but is actually
+	 * deferred until the next frame is received so that timing data can be
+	 * inserted. Invoking <code>finish()</code> flushes all frames. If
+	 * <code>setSize</code> was not invoked, the size of the first image is used
+	 * for all subsequent frames.
+	 *
+	 * @param im BufferedImage containing frame to write.
+	 * @return true if successful.
+	 */
+	public boolean addFrame(BufferedImage im) {
+		if ((im == null) || !started) {
+			return false;
+		}
+		boolean ok = true;
+		try {
+			if (!sizeSet) {
+				// use first frame's size
+				setSize(im.getWidth(), im.getHeight());
+			}
+			image = im;
+			getImagePixels(); // convert to correct format if necessary
+			analyzePixels(); // build color table & map pixels
+			if (firstFrame) {
+				writeLSD(); // logical screen descriptior
+				writePalette(); // global color table
+				if (repeat >= 0) {
+					// use NS app extension to indicate reps
+					writeNetscapeExt();
+				}
+			}
+			writeGraphicCtrlExt(); // write graphic control extension
+			writeImageDesc(); // image descriptor
+			if (!firstFrame) {
+				writePalette(); // local color table
+			}
+			writePixels(); // encode and write pixel data
+			firstFrame = false;
+		} catch (IOException e) {
+			ok = false;
+		}
+
+		return ok;
+	}
+
+	/**
+	 * Flushes any pending data and closes output file. If writing to an
+	 * OutputStream, the stream is not closed.
+	 */
+	public boolean finish() {
+		if (!started)
+			return false;
+		boolean ok = true;
+		started = false;
+		try {
+			out.write(0x3b); // gif trailer
+			out.flush();
+			if (closeStream) {
+				out.close();
+			}
+		} catch (IOException e) {
+			ok = false;
+		}
+
+		// reset for subsequent use
+		transIndex = 0;
+		out = null;
+		image = null;
+		pixels = null;
+		indexedPixels = null;
+		colorTab = null;
+		closeStream = false;
+		firstFrame = true;
+
+		return ok;
+	}
+
+	/**
+	 * Sets frame rate in frames per second. Equivalent to
+	 * <code>setDelay(1000/fps)</code>.
+	 *
+	 * @param fps float frame rate (frames per second)
+	 */
+	public void setFrameRate(float fps) {
+		if (fps != 0f) {
+			delay = Math.round(100f / fps);
+		}
+	}
+
+	/**
+	 * Sets quality of color quantization (conversion of images to the maximum 256
+	 * colors allowed by the GIF specification). Lower values (minimum = 1)
+	 * produce better colors, but slow processing significantly. 10 is the
+	 * default, and produces good color mapping at reasonable speeds. Values
+	 * greater than 20 do not yield significant improvements in speed.
+	 *
+	 * @param quality int greater than 0.
+	 * @return
+	 */
+	public void setQuality(int quality) {
+		if (quality < 1)
+			quality = 1;
+		sample = quality;
+	}
+
+	/**
+	 * Sets the GIF frame size. The default size is the size of the first frame
+	 * added if this method is not invoked.
+	 *
+	 * @param w int frame width.
+	 * @param h int frame width.
+	 */
+	public void setSize(int w, int h) {
+		if (started && !firstFrame)
+			return;
+		width = w;
+		height = h;
+		if (width < 1)
+			width = 320;
+		if (height < 1)
+			height = 240;
+		sizeSet = true;
+	}
+
+	/**
+	 * Initiates GIF file creation on the given stream. The stream is not closed
+	 * automatically.
+	 *
+	 * @param os OutputStream on which GIF images are written.
+	 * @return false if initial write failed.
+	 */
+	public boolean start(OutputStream os) {
+		if (os == null)
+			return false;
+		boolean ok = true;
+		closeStream = false;
+		out = os;
+		try {
+			writeString("GIF89a"); // header
+		} catch (IOException e) {
+			ok = false;
+		}
+		return started = ok;
+	}
+
+	/**
+	 * Initiates writing of a GIF file with the specified name.
+	 *
+	 * @param file String containing output file name.
+	 * @return false if open or initial write failed.
+	 */
+	public boolean start(String file) {
+		boolean ok = true;
+		try {
+			out = new BufferedOutputStream(new FileOutputStream(file));
+			ok = start(out);
+			closeStream = true;
+		} catch (IOException e) {
+			ok = false;
+		}
+		return started = ok;
+	}
+
+	/**
+	 * Analyzes image colors and creates color map.
+	 */
+	protected void analyzePixels() {
+		int len = pixels.length;
+		int nPix = len / 3;
+		indexedPixels = new byte[nPix];
+		NeuQuant nq = new NeuQuant(pixels, len, sample);
+		// initialize quantizer
+		colorTab = nq.process(); // create reduced palette
+		// convert map from BGR to RGB
+		for (int i = 0; i < colorTab.length; i += 3) {
+			byte temp = colorTab[i];
+			colorTab[i] = colorTab[i + 2];
+			colorTab[i + 2] = temp;
+			usedEntry[i / 3] = false;
+		}
+		// map image pixels to new palette
+		int k = 0;
+		for (int i = 0; i < nPix; i++) {
+			int index = nq.map(pixels[k++] & 0xff, pixels[k++] & 0xff, pixels[k++] & 0xff);
+			usedEntry[index] = true;
+			indexedPixels[i] = (byte) index;
+		}
+		pixels = null;
+		colorDepth = 8;
+		palSize = 7;
+		// get closest match to transparent color if specified
+		if (transparent != null) {
+			transIndex = findClosest(transparent);
+		}
+	}
+
+	/**
+	 * Returns index of palette color closest to c
+	 */
+	protected int findClosest(Color c) {
+		if (colorTab == null)
+			return -1;
+		int r = c.getRed();
+		int g = c.getGreen();
+		int b = c.getBlue();
+		int minpos = 0;
+		int dmin = 256 * 256 * 256;
+		int len = colorTab.length;
+		for (int i = 0; i < len; ) {
+			int dr = r - (colorTab[i++] & 0xff);
+			int dg = g - (colorTab[i++] & 0xff);
+			int db = b - (colorTab[i] & 0xff);
+			int d = dr * dr + dg * dg + db * db;
+			int index = i / 3;
+			if (usedEntry[index] && (d < dmin)) {
+				dmin = d;
+				minpos = index;
+			}
+			i++;
+		}
+		return minpos;
+	}
+
+	/**
+	 * Extracts image pixels into byte array "pixels"
+	 */
+	protected void getImagePixels() {
+		int w = image.getWidth();
+		int h = image.getHeight();
+		int type = image.getType();
+		if ((w != width) || (h != height) || (type != BufferedImage.TYPE_3BYTE_BGR)) {
+			// create new image with right size/format
+			BufferedImage temp = new BufferedImage(width, height, BufferedImage.TYPE_3BYTE_BGR);
+			Graphics2D g = temp.createGraphics();
+			g.drawImage(image, 0, 0, null);
+			image = temp;
+		}
+		pixels = ((DataBufferByte) image.getRaster().getDataBuffer()).getData();
+	}
+
+	/**
+	 * Writes Graphic Control Extension
+	 */
+	protected void writeGraphicCtrlExt() throws IOException {
+		out.write(0x21); // extension introducer
+		out.write(0xf9); // GCE label
+		out.write(4); // data block size
+		int transp, disp;
+		if (transparent == null) {
+			transp = 0;
+			disp = 0; // dispose = no action
+		} else {
+			transp = 1;
+			disp = 2; // force clear if using transparent color
+		}
+		if (dispose >= 0) {
+			disp = dispose & 7; // user override
+		}
+		disp <<= 2;
+
+		// packed fields
+		out.write(0 | // 1:3 reserved
+			disp | // 4:6 disposal
+			0 | // 7 user input - 0 = none
+			transp); // 8 transparency flag
+
+		writeShort(delay); // delay x 1/100 sec
+		out.write(transIndex); // transparent color index
+		out.write(0); // block terminator
+	}
+
+	/**
+	 * Writes Image Descriptor
+	 */
+	protected void writeImageDesc() throws IOException {
+		out.write(0x2c); // image separator
+		writeShort(0); // image position x,y = 0,0
+		writeShort(0);
+		writeShort(width); // image size
+		writeShort(height);
+		// packed fields
+		if (firstFrame) {
+			// no LCT - GCT is used for first (or only) frame
+			out.write(0);
+		} else {
+			// specify normal LCT
+			out.write(0x80 | // 1 local color table 1=yes
+				0 | // 2 interlace - 0=no
+				0 | // 3 sorted - 0=no
+				0 | // 4-5 reserved
+				palSize); // 6-8 size of color table
+		}
+	}
+
+	/**
+	 * Writes Logical Screen Descriptor
+	 */
+	protected void writeLSD() throws IOException {
+		// logical screen size
+		writeShort(width);
+		writeShort(height);
+		// packed fields
+		out.write((0x80 | // 1 : global color table flag = 1 (gct used)
+			0x70 | // 2-4 : color resolution = 7
+			0x00 | // 5 : gct sort flag = 0
+			palSize)); // 6-8 : gct size
+
+		out.write(0); // background color index
+		out.write(0); // pixel aspect ratio - assume 1:1
+	}
+
+	/**
+	 * Writes Netscape application extension to define repeat count.
+	 */
+	protected void writeNetscapeExt() throws IOException {
+		out.write(0x21); // extension introducer
+		out.write(0xff); // app extension label
+		out.write(11); // block size
+		writeString("NETSCAPE" + "2.0"); // app id + auth code
+		out.write(3); // sub-block size
+		out.write(1); // loop sub-block id
+		writeShort(repeat); // loop count (extra iterations, 0=repeat forever)
+		out.write(0); // block terminator
+	}
+
+	/**
+	 * Writes color table
+	 */
+	protected void writePalette() throws IOException {
+		out.write(colorTab, 0, colorTab.length);
+		int n = (3 * 256) - colorTab.length;
+		for (int i = 0; i < n; i++) {
+			out.write(0);
+		}
+	}
+
+	/**
+	 * Encodes and writes pixel data
+	 */
+	protected void writePixels() throws IOException {
+		LZWEncoder encoder = new LZWEncoder(width, height, indexedPixels, colorDepth);
+		encoder.encode(out);
+	}
+
+	/**
+	 * Write 16-bit value to output stream, LSB first
+	 */
+	protected void writeShort(int value) throws IOException {
+		out.write(value & 0xff);
+		out.write((value >> 8) & 0xff);
+	}
+
+	/**
+	 * Writes string to output stream
+	 */
+	protected void writeString(String s) throws IOException {
+		for (int i = 0; i < s.length(); i++) {
+			out.write((byte) s.charAt(i));
+		}
+	}
 }
- 
-// 
+
+//
 // Adapted from Jef Poskanzer's Java port by way of J. M. G. Elliott.
 // K Weiner 12/00
- 
+
 class LZWEncoder {
- 
-  private static final int EOF = -1;
- 
-  private int imgW, imgH;
- 
-  private byte[] pixAry;
- 
-  private int initCodeSize;
- 
-  private int remaining;
- 
-  private int curPixel;
- 
-  // GIFCOMPR.C - GIF Image compression routines
-  //
-  // Lempel-Ziv compression based on 'compress'. GIF modifications by
-  // David Rowley (mgardi@watdcsu.waterloo.edu)
- 
-  // General DEFINEs
- 
-  static final int BITS = 12;
- 
-  static final int HSIZE = 5003; // 80% occupancy
- 
-  // GIF Image compression - modified 'compress'
-  //
-  // Based on: compress.c - File compression ala IEEE Computer, June 1984.
-  //
-  // By Authors: Spencer W. Thomas (decvax!harpo!utah-cs!utah-gr!thomas)
-  // Jim McKie (decvax!mcvax!jim)
-  // Steve Davies (decvax!vax135!petsd!peora!srd)
-  // Ken Turkowski (decvax!decwrl!turtlevax!ken)
-  // James A. Woods (decvax!ihnp4!ames!jaw)
-  // Joe Orost (decvax!vax135!petsd!joe)
- 
-  int n_bits; // number of bits/code
- 
-  int maxbits = BITS; // user settable max # bits/code
- 
-  int maxcode; // maximum code, given n_bits
- 
-  int maxmaxcode = 1 << BITS; // should NEVER generate this code
- 
-  int[] htab = new int[HSIZE];
- 
-  int[] codetab = new int[HSIZE];
- 
-  int hsize = HSIZE; // for dynamic table sizing
- 
-  int free_ent = 0; // first unused entry
- 
-  // block compression parameters -- after all codes are used up,
-  // and compression rate changes, start over.
-  boolean clear_flg = false;
- 
-  // Algorithm: use open addressing double hashing (no chaining) on the
-  // prefix code / next character combination. We do a variant of Knuth's
-  // algorithm D (vol. 3, sec. 6.4) along with G. Knott's relatively-prime
-  // secondary probe. Here, the modular division first probe is gives way
-  // to a faster exclusive-or manipulation. Also do block compression with
-  // an adaptive reset, whereby the code table is cleared when the compression
-  // ratio decreases, but after the table fills. The variable-length output
-  // codes are re-sized at this point, and a special CLEAR code is generated
-  // for the decompressor. Late addition: construct the table according to
-  // file size for noticeable speed improvement on small files. Please direct
-  // questions about this implementation to ames!jaw.
- 
-  int g_init_bits;
- 
-  int ClearCode;
- 
-  int EOFCode;
- 
-  // output
-  //
-  // Output the given code.
-  // Inputs:
-  // code: A n_bits-bit integer. If == -1, then EOF. This assumes
-  // that n_bits =< wordsize - 1.
-  // Outputs:
-  // Outputs code to the file.
-  // Assumptions:
-  // Chars are 8 bits long.
-  // Algorithm:
-  // Maintain a BITS character long buffer (so that 8 codes will
-  // fit in it exactly). Use the VAX insv instruction to insert each
-  // code in turn. When the buffer fills up empty it and start over.
- 
-  int cur_accum = 0;
- 
-  int cur_bits = 0;
- 
-  int masks[] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F, 0x00FF, 0x01FF,
-      0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF };
- 
-  // Number of characters so far in this 'packet'
-  int a_count;
- 
-  // Define the storage for the packet accumulator
-  byte[] accum = new byte[256];
- 
-  // ----------------------------------------------------------------------------
-  LZWEncoder(int width, int height, byte[] pixels, int color_depth) {
-    imgW = width;
-    imgH = height;
-    pixAry = pixels;
-    initCodeSize = Math.max(2, color_depth);
-  }
- 
-  // Add a character to the end of the current packet, and if it is 254
-  // characters, flush the packet to disk.
-  void char_out(byte c, OutputStream outs) throws IOException {
-    accum[a_count++] = c;
-    if (a_count >= 254)
-      flush_char(outs);
-  }
- 
-  // Clear out the hash table
- 
-  // table clear for block compress
-  void cl_block(OutputStream outs) throws IOException {
-    cl_hash(hsize);
-    free_ent = ClearCode + 2;
-    clear_flg = true;
- 
-    output(ClearCode, outs);
-  }
- 
-  // reset code table
-  void cl_hash(int hsize) {
-    for (int i = 0; i < hsize; ++i)
-      htab[i] = -1;
-  }
- 
-  void compress(int init_bits, OutputStream outs) throws IOException {
-    int fcode;
-    int i /* = 0 */;
-    int c;
-    int ent;
-    int disp;
-    int hsize_reg;
-    int hshift;
- 
-    // Set up the globals: g_init_bits - initial number of bits
-    g_init_bits = init_bits;
- 
-    // Set up the necessary values
-    clear_flg = false;
-    n_bits = g_init_bits;
-    maxcode = MAXCODE(n_bits);
- 
-    ClearCode = 1 << (init_bits - 1);
-    EOFCode = ClearCode + 1;
-    free_ent = ClearCode + 2;
- 
-    a_count = 0; // clear packet
- 
-    ent = nextPixel();
- 
-    hshift = 0;
-    for (fcode = hsize; fcode < 65536; fcode *= 2)
-      ++hshift;
-    hshift = 8 - hshift; // set hash code range bound
- 
-    hsize_reg = hsize;
-    cl_hash(hsize_reg); // clear hash table
- 
-    output(ClearCode, outs);
- 
-    outer_loop: while ((c = nextPixel()) != EOF) {
-      fcode = (c << maxbits) + ent;
-      i = (c << hshift) ^ ent; // xor hashing
- 
-      if (htab[i] == fcode) {
-        ent = codetab[i];
-        continue;
-      } else if (htab[i] >= 0) // non-empty slot
-      {
-        disp = hsize_reg - i; // secondary hash (after G. Knott)
-        if (i == 0)
-          disp = 1;
-        do {
-          if ((i -= disp) < 0)
-            i += hsize_reg;
- 
-          if (htab[i] == fcode) {
-            ent = codetab[i];
-            continue outer_loop;
-          }
-        } while (htab[i] >= 0);
-      }
-      output(ent, outs);
-      ent = c;
-      if (free_ent < maxmaxcode) {
-        codetab[i] = free_ent++; // code -> hashtable
-        htab[i] = fcode;
-      } else
-        cl_block(outs);
-    }
-    // Put out the final code.
-    output(ent, outs);
-    output(EOFCode, outs);
-  }
- 
-  // ----------------------------------------------------------------------------
-  void encode(OutputStream os) throws IOException {
-    os.write(initCodeSize); // write "initial code size" byte
- 
-    remaining = imgW * imgH; // reset navigation variables
-    curPixel = 0;
- 
-    compress(initCodeSize + 1, os); // compress and write the pixel data
- 
-    os.write(0); // write block terminator
-  }
- 
-  // Flush the packet to disk, and reset the accumulator
-  void flush_char(OutputStream outs) throws IOException {
-    if (a_count > 0) {
-      outs.write(a_count);
-      outs.write(accum, 0, a_count);
-      a_count = 0;
-    }
-  }
- 
-  final int MAXCODE(int n_bits) {
-    return (1 << n_bits) - 1;
-  }
- 
-  // ----------------------------------------------------------------------------
-  // Return the next pixel from the image
-  // ----------------------------------------------------------------------------
-  private int nextPixel() {
-    if (remaining == 0)
-      return EOF;
- 
-    --remaining;
- 
-    byte pix = pixAry[curPixel++];
- 
-    return pix & 0xff;
-  }
- 
-  void output(int code, OutputStream outs) throws IOException {
-    cur_accum &= masks[cur_bits];
- 
-    if (cur_bits > 0)
-      cur_accum |= (code << cur_bits);
-    else
-      cur_accum = code;
- 
-    cur_bits += n_bits;
- 
-    while (cur_bits >= 8) {
-      char_out((byte) (cur_accum & 0xff), outs);
-      cur_accum >>= 8;
-      cur_bits -= 8;
-    }
- 
-    // If the next entry is going to be too big for the code size,
-    // then increase it, if possible.
-    if (free_ent > maxcode || clear_flg) {
-      if (clear_flg) {
-        maxcode = MAXCODE(n_bits = g_init_bits);
-        clear_flg = false;
-      } else {
-        ++n_bits;
-        if (n_bits == maxbits)
-          maxcode = maxmaxcode;
-        else
-          maxcode = MAXCODE(n_bits);
-      }
-    }
- 
-    if (code == EOFCode) {
-      // At EOF, write the rest of the buffer.
-      while (cur_bits > 0) {
-        char_out((byte) (cur_accum & 0xff), outs);
-        cur_accum >>= 8;
-        cur_bits -= 8;
-      }
- 
-      flush_char(outs);
-    }
-  }
+
+	static final int BITS = 12;
+	static final int HSIZE = 5003; // 80% occupancy
+	private static final int EOF = -1;
+	int n_bits; // number of bits/code
+	int maxbits = BITS; // user settable max # bits/code
+	int maxcode; // maximum code, given n_bits
+
+	// GIFCOMPR.C - GIF Image compression routines
+	//
+	// Lempel-Ziv compression based on 'compress'. GIF modifications by
+	// David Rowley (mgardi@watdcsu.waterloo.edu)
+
+	// General DEFINEs
+	int maxmaxcode = 1 << BITS; // should NEVER generate this code
+	int[] htab = new int[HSIZE];
+
+	// GIF Image compression - modified 'compress'
+	//
+	// Based on: compress.c - File compression ala IEEE Computer, June 1984.
+	//
+	// By Authors: Spencer W. Thomas (decvax!harpo!utah-cs!utah-gr!thomas)
+	// Jim McKie (decvax!mcvax!jim)
+	// Steve Davies (decvax!vax135!petsd!peora!srd)
+	// Ken Turkowski (decvax!decwrl!turtlevax!ken)
+	// James A. Woods (decvax!ihnp4!ames!jaw)
+	// Joe Orost (decvax!vax135!petsd!joe)
+	int[] codetab = new int[HSIZE];
+	int hsize = HSIZE; // for dynamic table sizing
+	int free_ent = 0; // first unused entry
+	// block compression parameters -- after all codes are used up,
+	// and compression rate changes, start over.
+	boolean clear_flg = false;
+	int g_init_bits;
+	int ClearCode;
+	int EOFCode;
+	int cur_accum = 0;
+	int cur_bits = 0;
+
+	// Algorithm: use open addressing double hashing (no chaining) on the
+	// prefix code / next character combination. We do a variant of Knuth's
+	// algorithm D (vol. 3, sec. 6.4) along with G. Knott's relatively-prime
+	// secondary probe. Here, the modular division first probe is gives way
+	// to a faster exclusive-or manipulation. Also do block compression with
+	// an adaptive reset, whereby the code table is cleared when the compression
+	// ratio decreases, but after the table fills. The variable-length output
+	// codes are re-sized at this point, and a special CLEAR code is generated
+	// for the decompressor. Late addition: construct the table according to
+	// file size for noticeable speed improvement on small files. Please direct
+	// questions about this implementation to ames!jaw.
+	int masks[] = {0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F, 0x00FF, 0x01FF,
+		0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF};
+	// Number of characters so far in this 'packet'
+	int a_count;
+	// Define the storage for the packet accumulator
+	byte[] accum = new byte[256];
+
+	// output
+	//
+	// Output the given code.
+	// Inputs:
+	// code: A n_bits-bit integer. If == -1, then EOF. This assumes
+	// that n_bits =< wordsize - 1.
+	// Outputs:
+	// Outputs code to the file.
+	// Assumptions:
+	// Chars are 8 bits long.
+	// Algorithm:
+	// Maintain a BITS character long buffer (so that 8 codes will
+	// fit in it exactly). Use the VAX insv instruction to insert each
+	// code in turn. When the buffer fills up empty it and start over.
+	private int imgW, imgH;
+	private byte[] pixAry;
+	private int initCodeSize;
+	private int remaining;
+	private int curPixel;
+
+	// ----------------------------------------------------------------------------
+	LZWEncoder(int width, int height, byte[] pixels, int color_depth) {
+		imgW = width;
+		imgH = height;
+		pixAry = pixels;
+		initCodeSize = Math.max(2, color_depth);
+	}
+
+	// Add a character to the end of the current packet, and if it is 254
+	// characters, flush the packet to disk.
+	void char_out(byte c, OutputStream outs) throws IOException {
+		accum[a_count++] = c;
+		if (a_count >= 254)
+			flush_char(outs);
+	}
+
+	// Clear out the hash table
+
+	// table clear for block compress
+	void cl_block(OutputStream outs) throws IOException {
+		cl_hash(hsize);
+		free_ent = ClearCode + 2;
+		clear_flg = true;
+
+		output(ClearCode, outs);
+	}
+
+	// reset code table
+	void cl_hash(int hsize) {
+		for (int i = 0; i < hsize; ++i)
+			htab[i] = -1;
+	}
+
+	void compress(int init_bits, OutputStream outs) throws IOException {
+		int fcode;
+		int i /* = 0 */;
+		int c;
+		int ent;
+		int disp;
+		int hsize_reg;
+		int hshift;
+
+		// Set up the globals: g_init_bits - initial number of bits
+		g_init_bits = init_bits;
+
+		// Set up the necessary values
+		clear_flg = false;
+		n_bits = g_init_bits;
+		maxcode = MAXCODE(n_bits);
+
+		ClearCode = 1 << (init_bits - 1);
+		EOFCode = ClearCode + 1;
+		free_ent = ClearCode + 2;
+
+		a_count = 0; // clear packet
+
+		ent = nextPixel();
+
+		hshift = 0;
+		for (fcode = hsize; fcode < 65536; fcode *= 2)
+			++hshift;
+		hshift = 8 - hshift; // set hash code range bound
+
+		hsize_reg = hsize;
+		cl_hash(hsize_reg); // clear hash table
+
+		output(ClearCode, outs);
+
+		outer_loop:
+		while ((c = nextPixel()) != EOF) {
+			fcode = (c << maxbits) + ent;
+			i = (c << hshift) ^ ent; // xor hashing
+
+			if (htab[i] == fcode) {
+				ent = codetab[i];
+				continue;
+			} else if (htab[i] >= 0) // non-empty slot
+			{
+				disp = hsize_reg - i; // secondary hash (after G. Knott)
+				if (i == 0)
+					disp = 1;
+				do {
+					if ((i -= disp) < 0)
+						i += hsize_reg;
+
+					if (htab[i] == fcode) {
+						ent = codetab[i];
+						continue outer_loop;
+					}
+				} while (htab[i] >= 0);
+			}
+			output(ent, outs);
+			ent = c;
+			if (free_ent < maxmaxcode) {
+				codetab[i] = free_ent++; // code -> hashtable
+				htab[i] = fcode;
+			} else
+				cl_block(outs);
+		}
+		// Put out the final code.
+		output(ent, outs);
+		output(EOFCode, outs);
+	}
+
+	// ----------------------------------------------------------------------------
+	void encode(OutputStream os) throws IOException {
+		os.write(initCodeSize); // write "initial code size" byte
+
+		remaining = imgW * imgH; // reset navigation variables
+		curPixel = 0;
+
+		compress(initCodeSize + 1, os); // compress and write the pixel data
+
+		os.write(0); // write block terminator
+	}
+
+	// Flush the packet to disk, and reset the accumulator
+	void flush_char(OutputStream outs) throws IOException {
+		if (a_count > 0) {
+			outs.write(a_count);
+			outs.write(accum, 0, a_count);
+			a_count = 0;
+		}
+	}
+
+	final int MAXCODE(int n_bits) {
+		return (1 << n_bits) - 1;
+	}
+
+	// ----------------------------------------------------------------------------
+	// Return the next pixel from the image
+	// ----------------------------------------------------------------------------
+	private int nextPixel() {
+		if (remaining == 0)
+			return EOF;
+
+		--remaining;
+
+		byte pix = pixAry[curPixel++];
+
+		return pix & 0xff;
+	}
+
+	void output(int code, OutputStream outs) throws IOException {
+		cur_accum &= masks[cur_bits];
+
+		if (cur_bits > 0)
+			cur_accum |= (code << cur_bits);
+		else
+			cur_accum = code;
+
+		cur_bits += n_bits;
+
+		while (cur_bits >= 8) {
+			char_out((byte) (cur_accum & 0xff), outs);
+			cur_accum >>= 8;
+			cur_bits -= 8;
+		}
+
+		// If the next entry is going to be too big for the code size,
+		// then increase it, if possible.
+		if (free_ent > maxcode || clear_flg) {
+			if (clear_flg) {
+				maxcode = MAXCODE(n_bits = g_init_bits);
+				clear_flg = false;
+			} else {
+				++n_bits;
+				if (n_bits == maxbits)
+					maxcode = maxmaxcode;
+				else
+					maxcode = MAXCODE(n_bits);
+			}
+		}
+
+		if (code == EOFCode) {
+			// At EOF, write the rest of the buffer.
+			while (cur_bits > 0) {
+				char_out((byte) (cur_accum & 0xff), outs);
+				cur_accum >>= 8;
+				cur_bits -= 8;
+			}
+
+			flush_char(outs);
+		}
+	}
 }
- 
+
 /*
  * NeuQuant Neural-Net Quantization Algorithm
  * ------------------------------------------
- * 
+ *
  * Copyright (c) 1994 Anthony Dekker
- * 
+ *
  * NEUQUANT Neural-Net quantization algorithm by Anthony Dekker, 1994. See
  * "Kohonen neural networks for optimal colour quantization" in "Network:
  * Computation in Neural Systems" Vol. 5 (1994) pp 351-367. for a discussion of
  * the algorithm.
- * 
+ *
  * Any party obtaining a copy of these files from the author, directly or
  * indirectly, is granted, free of charge, a full and unrestricted irrevocable,
  * world-wide, paid up, royalty-free, nonexclusive right and license to deal in
@@ -811,484 +774,472 @@ class LZWEncoder {
  * receive copies from any such party to do so, with the only requirement being
  * that this copyright notice remain intact.
  */
- 
+
 // Ported to Java 12/00 K Weiner
 class NeuQuant {
- 
-  protected static final int netsize = 256; /* number of colours used */
- 
-  /* four primes near 500 - assume no image has a length so large */
-  /* that it is divisible by all four primes */
-  protected static final int prime1 = 499;
- 
-  protected static final int prime2 = 491;
- 
-  protected static final int prime3 = 487;
- 
-  protected static final int prime4 = 503;
- 
-  protected static final int minpicturebytes = (3 * prime4);
- 
-  /* minimum size for input image */
- 
-  /*
-   * Program Skeleton ---------------- [select samplefac in range 1..30] [read
-   * image from input file] pic = (unsigned char*) malloc(3*width*height);
-   * initnet(pic,3*width*height,samplefac); learn(); unbiasnet(); [write output
-   * image header, using writecolourmap(f)] inxbuild(); write output image using
-   * inxsearch(b,g,r)
-   */
- 
-  /*
-   * Network Definitions -------------------
-   */
- 
-  protected static final int maxnetpos = (netsize - 1);
- 
-  protected static final int netbiasshift = 4; /* bias for colour values */
- 
-  protected static final int ncycles = 100; /* no. of learning cycles */
- 
-  /* defs for freq and bias */
-  protected static final int intbiasshift = 16; /* bias for fractions */
- 
-  protected static final int intbias = (((int) 1) << intbiasshift);
- 
-  protected static final int gammashift = 10; /* gamma = 1024 */
- 
-  protected static final int gamma = (((int) 1) << gammashift);
- 
-  protected static final int betashift = 10;
- 
-  protected static final int beta = (intbias >> betashift); /* beta = 1/1024 */
- 
-  protected static final int betagamma = (intbias << (gammashift - betashift));
- 
-  /* defs for decreasing radius factor */
-  protected static final int initrad = (netsize >> 3); /*
-                                                         * for 256 cols, radius
-                                                         * starts
-                                                         */
- 
-  protected static final int radiusbiasshift = 6; /* at 32.0 biased by 6 bits */
- 
-  protected static final int radiusbias = (((int) 1) << radiusbiasshift);
- 
-  protected static final int initradius = (initrad * radiusbias); /*
-                                                                   * and
-                                                                   * decreases
-                                                                   * by a
-                                                                   */
- 
-  protected static final int radiusdec = 30; /* factor of 1/30 each cycle */
- 
-  /* defs for decreasing alpha factor */
-  protected static final int alphabiasshift = 10; /* alpha starts at 1.0 */
- 
-  protected static final int initalpha = (((int) 1) << alphabiasshift);
- 
-  protected int alphadec; /* biased by 10 bits */
- 
-  /* radbias and alpharadbias used for radpower calculation */
-  protected static final int radbiasshift = 8;
- 
-  protected static final int radbias = (((int) 1) << radbiasshift);
- 
-  protected static final int alpharadbshift = (alphabiasshift + radbiasshift);
- 
-  protected static final int alpharadbias = (((int) 1) << alpharadbshift);
- 
-  /*
-   * Types and Global Variables --------------------------
-   */
- 
-  protected byte[] thepicture; /* the input image itself */
- 
-  protected int lengthcount; /* lengthcount = H*W*3 */
- 
-  protected int samplefac; /* sampling factor 1..30 */
- 
-  // typedef int pixel[4]; /* BGRc */
-  protected int[][] network; /* the network itself - [netsize][4] */
- 
-  protected int[] netindex = new int[256];
- 
-  /* for network lookup - really 256 */
- 
-  protected int[] bias = new int[netsize];
- 
-  /* bias and freq arrays for learning */
-  protected int[] freq = new int[netsize];
- 
-  protected int[] radpower = new int[initrad];
- 
-  /* radpower for precomputation */
- 
-  /*
-   * Initialise network in range (0,0,0) to (255,255,255) and set parameters
-   * -----------------------------------------------------------------------
-   */
-  public NeuQuant(byte[] thepic, int len, int sample) {
- 
-    int i;
-    int[] p;
- 
-    thepicture = thepic;
-    lengthcount = len;
-    samplefac = sample;
- 
-    network = new int[netsize][];
-    for (i = 0; i < netsize; i++) {
-      network[i] = new int[4];
-      p = network[i];
-      p[0] = p[1] = p[2] = (i << (netbiasshift + 8)) / netsize;
-      freq[i] = intbias / netsize; /* 1/netsize */
-      bias[i] = 0;
-    }
-  }
- 
-  public byte[] colorMap() {
-    byte[] map = new byte[3 * netsize];
-    int[] index = new int[netsize];
-    for (int i = 0; i < netsize; i++)
-      index[network[i][3]] = i;
-    int k = 0;
-    for (int i = 0; i < netsize; i++) {
-      int j = index[i];
-      map[k++] = (byte) (network[j][0]);
-      map[k++] = (byte) (network[j][1]);
-      map[k++] = (byte) (network[j][2]);
-    }
-    return map;
-  }
- 
-  /*
-   * Insertion sort of network and building of netindex[0..255] (to do after
-   * unbias)
-   * -------------------------------------------------------------------------------
-   */
-  public void inxbuild() {
- 
-    int i, j, smallpos, smallval;
-    int[] p;
-    int[] q;
-    int previouscol, startpos;
- 
-    previouscol = 0;
-    startpos = 0;
-    for (i = 0; i < netsize; i++) {
-      p = network[i];
-      smallpos = i;
-      smallval = p[1]; /* index on g */
-      /* find smallest in i..netsize-1 */
-      for (j = i + 1; j < netsize; j++) {
-        q = network[j];
-        if (q[1] < smallval) { /* index on g */
-          smallpos = j;
-          smallval = q[1]; /* index on g */
-        }
-      }
-      q = network[smallpos];
-      /* swap p (i) and q (smallpos) entries */
-      if (i != smallpos) {
-        j = q[0];
-        q[0] = p[0];
-        p[0] = j;
-        j = q[1];
-        q[1] = p[1];
-        p[1] = j;
-        j = q[2];
-        q[2] = p[2];
-        p[2] = j;
-        j = q[3];
-        q[3] = p[3];
-        p[3] = j;
-      }
-      /* smallval entry is now in position i */
-      if (smallval != previouscol) {
-        netindex[previouscol] = (startpos + i) >> 1;
-        for (j = previouscol + 1; j < smallval; j++)
-          netindex[j] = i;
-        previouscol = smallval;
-        startpos = i;
-      }
-    }
-    netindex[previouscol] = (startpos + maxnetpos) >> 1;
-    for (j = previouscol + 1; j < 256; j++)
-      netindex[j] = maxnetpos; /* really 256 */
-  }
- 
-  /*
-   * Main Learning Loop ------------------
-   */
-  public void learn() {
- 
-    int i, j, b, g, r;
-    int radius, rad, alpha, step, delta, samplepixels;
-    byte[] p;
-    int pix, lim;
- 
-    if (lengthcount < minpicturebytes)
-      samplefac = 1;
-    alphadec = 30 + ((samplefac - 1) / 3);
-    p = thepicture;
-    pix = 0;
-    lim = lengthcount;
-    samplepixels = lengthcount / (3 * samplefac);
-    delta = samplepixels / ncycles;
-    alpha = initalpha;
-    radius = initradius;
- 
-    rad = radius >> radiusbiasshift;
-    if (rad <= 1)
-      rad = 0;
-    for (i = 0; i < rad; i++)
-      radpower[i] = alpha * (((rad * rad - i * i) * radbias) / (rad * rad));
- 
-    // fprintf(stderr,"beginning 1D learning: initial radius=%d\n", rad);
- 
-    if (lengthcount < minpicturebytes)
-      step = 3;
-    else if ((lengthcount % prime1) != 0)
-      step = 3 * prime1;
-    else {
-      if ((lengthcount % prime2) != 0)
-        step = 3 * prime2;
-      else {
-        if ((lengthcount % prime3) != 0)
-          step = 3 * prime3;
-        else
-          step = 3 * prime4;
-      }
-    }
- 
-    i = 0;
-    while (i < samplepixels) {
-      b = (p[pix + 0] & 0xff) << netbiasshift;
-      g = (p[pix + 1] & 0xff) << netbiasshift;
-      r = (p[pix + 2] & 0xff) << netbiasshift;
-      j = contest(b, g, r);
- 
-      altersingle(alpha, j, b, g, r);
-      if (rad != 0)
-        alterneigh(rad, j, b, g, r); /* alter neighbours */
- 
-      pix += step;
-      if (pix >= lim)
-        pix -= lengthcount;
- 
-      i++;
-      if (delta == 0)
-        delta = 1;
-      if (i % delta == 0) {
-        alpha -= alpha / alphadec;
-        radius -= radius / radiusdec;
-        rad = radius >> radiusbiasshift;
-        if (rad <= 1)
-          rad = 0;
-        for (j = 0; j < rad; j++)
-          radpower[j] = alpha * (((rad * rad - j * j) * radbias) / (rad * rad));
-      }
-    }
-    // fprintf(stderr,"finished 1D learning: final alpha=%f
-    // !\n",((float)alpha)/initalpha);
-  }
- 
-  /*
-   * Search for BGR values 0..255 (after net is unbiased) and return colour
-   * index
-   * ----------------------------------------------------------------------------
-   */
-  public int map(int b, int g, int r) {
- 
-    int i, j, dist, a, bestd;
-    int[] p;
-    int best;
- 
-    bestd = 1000; /* biggest possible dist is 256*3 */
-    best = -1;
-    i = netindex[g]; /* index on g */
-    j = i - 1; /* start at netindex[g] and work outwards */
- 
-    while ((i < netsize) || (j >= 0)) {
-      if (i < netsize) {
-        p = network[i];
-        dist = p[1] - g; /* inx key */
-        if (dist >= bestd)
-          i = netsize; /* stop iter */
-        else {
-          i++;
-          if (dist < 0)
-            dist = -dist;
-          a = p[0] - b;
-          if (a < 0)
-            a = -a;
-          dist += a;
-          if (dist < bestd) {
-            a = p[2] - r;
-            if (a < 0)
-              a = -a;
-            dist += a;
-            if (dist < bestd) {
-              bestd = dist;
-              best = p[3];
-            }
-          }
-        }
-      }
-      if (j >= 0) {
-        p = network[j];
-        dist = g - p[1]; /* inx key - reverse dif */
-        if (dist >= bestd)
-          j = -1; /* stop iter */
-        else {
-          j--;
-          if (dist < 0)
-            dist = -dist;
-          a = p[0] - b;
-          if (a < 0)
-            a = -a;
-          dist += a;
-          if (dist < bestd) {
-            a = p[2] - r;
-            if (a < 0)
-              a = -a;
-            dist += a;
-            if (dist < bestd) {
-              bestd = dist;
-              best = p[3];
-            }
-          }
-        }
-      }
-    }
-    return (best);
-  }
- 
-  public byte[] process() {
-    learn();
-    unbiasnet();
-    inxbuild();
-    return colorMap();
-  }
- 
-  /*
-   * Unbias network to give byte values 0..255 and record position i to prepare
-   * for sort
-   * -----------------------------------------------------------------------------------
-   */
-  public void unbiasnet() {
-    for (int i = 0; i < netsize; i++) {
-      network[i][0] >>= netbiasshift;
-      network[i][1] >>= netbiasshift;
-      network[i][2] >>= netbiasshift;
-      network[i][3] = i; /* record colour no */
-    }
-  }
- 
-  /*
-   * Move adjacent neurons by precomputed alpha*(1-((i-j)^2/[r]^2)) in
-   * radpower[|i-j|]
-   * ---------------------------------------------------------------------------------
-   */
-  protected void alterneigh(int rad, int i, int b, int g, int r) {
- 
-    int j, k, lo, hi, a, m;
-    int[] p;
- 
-    lo = i - rad;
-    if (lo < -1)
-      lo = -1;
-    hi = i + rad;
-    if (hi > netsize)
-      hi = netsize;
- 
-    j = i + 1;
-    k = i - 1;
-    m = 1;
-    while ((j < hi) || (k > lo)) {
-      a = radpower[m++];
-      if (j < hi) {
-        p = network[j++];
-        try {
-          p[0] -= (a * (p[0] - b)) / alpharadbias;
-          p[1] -= (a * (p[1] - g)) / alpharadbias;
-          p[2] -= (a * (p[2] - r)) / alpharadbias;
-        } catch (Exception e) {
-        } // prevents 1.3 miscompilation
-      }
-      if (k > lo) {
-        p = network[k--];
-        try {
-          p[0] -= (a * (p[0] - b)) / alpharadbias;
-          p[1] -= (a * (p[1] - g)) / alpharadbias;
-          p[2] -= (a * (p[2] - r)) / alpharadbias;
-        } catch (Exception e) {
-        }
-      }
-    }
-  }
- 
-  /*
-   * Move neuron i towards biased (b,g,r) by factor alpha
-   * ----------------------------------------------------
-   */
-  protected void altersingle(int alpha, int i, int b, int g, int r) {
- 
-    /* alter hit neuron */
-    int[] n = network[i];
-    n[0] -= (alpha * (n[0] - b)) / initalpha;
-    n[1] -= (alpha * (n[1] - g)) / initalpha;
-    n[2] -= (alpha * (n[2] - r)) / initalpha;
-  }
- 
-  /*
-   * Search for biased BGR values ----------------------------
-   */
-  protected int contest(int b, int g, int r) {
- 
-    /* finds closest neuron (min dist) and updates freq */
-    /* finds best neuron (min dist-bias) and returns position */
-    /* for frequently chosen neurons, freq[i] is high and bias[i] is negative */
-    /* bias[i] = gamma*((1/netsize)-freq[i]) */
- 
-    int i, dist, a, biasdist, betafreq;
-    int bestpos, bestbiaspos, bestd, bestbiasd;
-    int[] n;
- 
-    bestd = ~(((int) 1) << 31);
-    bestbiasd = bestd;
-    bestpos = -1;
-    bestbiaspos = bestpos;
- 
-    for (i = 0; i < netsize; i++) {
-      n = network[i];
-      dist = n[0] - b;
-      if (dist < 0)
-        dist = -dist;
-      a = n[1] - g;
-      if (a < 0)
-        a = -a;
-      dist += a;
-      a = n[2] - r;
-      if (a < 0)
-        a = -a;
-      dist += a;
-      if (dist < bestd) {
-        bestd = dist;
-        bestpos = i;
-      }
-      biasdist = dist - ((bias[i]) >> (intbiasshift - netbiasshift));
-      if (biasdist < bestbiasd) {
-        bestbiasd = biasdist;
-        bestbiaspos = i;
-      }
-      betafreq = (freq[i] >> betashift);
-      freq[i] -= betafreq;
-      bias[i] += (betafreq << gammashift);
-    }
-    freq[bestpos] += beta;
-    bias[bestpos] -= betagamma;
-    return (bestbiaspos);
-  }
-}
\ No newline at end of file
+
+	protected static final int netsize = 256; /* number of colours used */
+
+	/* four primes near 500 - assume no image has a length so large */
+	/* that it is divisible by all four primes */
+	protected static final int prime1 = 499;
+
+	protected static final int prime2 = 491;
+
+	protected static final int prime3 = 487;
+
+	protected static final int prime4 = 503;
+
+	protected static final int minpicturebytes = (3 * prime4);
+
+	/* minimum size for input image */
+
+	/*
+	 * Program Skeleton ---------------- [select samplefac in range 1..30] [read
+	 * image from input file] pic = (unsigned char*) malloc(3*width*height);
+	 * initnet(pic,3*width*height,samplefac); learn(); unbiasnet(); [write output
+	 * image header, using writecolourmap(f)] inxbuild(); write output image using
+	 * inxsearch(b,g,r)
+	 */
+
+	/*
+	 * Network Definitions -------------------
+	 */
+
+	protected static final int maxnetpos = (netsize - 1);
+
+	protected static final int netbiasshift = 4; /* bias for colour values */
+
+	protected static final int ncycles = 100; /* no. of learning cycles */
+
+	/* defs for freq and bias */
+	protected static final int intbiasshift = 16; /* bias for fractions */
+
+	protected static final int intbias = (((int) 1) << intbiasshift);
+	protected static final int gammashift = 10; /* gamma = 1024 */
+	protected static final int gamma = (((int) 1) << gammashift);
+	protected static final int betashift = 10;
+	protected static final int beta = (intbias >> betashift); /* beta = 1/1024 */
+	protected static final int betagamma = (intbias << (gammashift - betashift));
+	/* defs for decreasing radius factor */
+	protected static final int initrad = (netsize >> 3); /*
+	 * for 256 cols, radius
+	 * starts
+	 */
+
+	protected static final int radiusbiasshift = 6; /* at 32.0 biased by 6 bits */
+
+	protected static final int radiusbias = (((int) 1) << radiusbiasshift);
+
+	protected static final int initradius = (initrad * radiusbias); /*
+	 * and
+	 * decreases
+	 * by a
+	 */
+
+	protected static final int radiusdec = 30; /* factor of 1/30 each cycle */
+
+	/* defs for decreasing alpha factor */
+	protected static final int alphabiasshift = 10; /* alpha starts at 1.0 */
+
+	protected static final int initalpha = (((int) 1) << alphabiasshift);
+	/* radbias and alpharadbias used for radpower calculation */
+	protected static final int radbiasshift = 8;
+	protected static final int radbias = (((int) 1) << radbiasshift);
+	protected static final int alpharadbshift = (alphabiasshift + radbiasshift);
+	protected static final int alpharadbias = (((int) 1) << alpharadbshift);
+	protected int alphadec; /* biased by 10 bits */
+
+	/*
+	 * Types and Global Variables --------------------------
+	 */
+	protected byte[] thepicture; /* the input image itself */
+
+	protected int lengthcount; /* lengthcount = H*W*3 */
+
+	protected int samplefac; /* sampling factor 1..30 */
+
+	// typedef int pixel[4]; /* BGRc */
+	protected int[][] network; /* the network itself - [netsize][4] */
+
+	protected int[] netindex = new int[256];
+
+	/* for network lookup - really 256 */
+
+	protected int[] bias = new int[netsize];
+
+	/* bias and freq arrays for learning */
+	protected int[] freq = new int[netsize];
+
+	protected int[] radpower = new int[initrad];
+
+	/* radpower for precomputation */
+
+	/*
+	 * Initialise network in range (0,0,0) to (255,255,255) and set parameters
+	 * -----------------------------------------------------------------------
+	 */
+	public NeuQuant(byte[] thepic, int len, int sample) {
+
+		int i;
+		int[] p;
+
+		thepicture = thepic;
+		lengthcount = len;
+		samplefac = sample;
+
+		network = new int[netsize][];
+		for (i = 0; i < netsize; i++) {
+			network[i] = new int[4];
+			p = network[i];
+			p[0] = p[1] = p[2] = (i << (netbiasshift + 8)) / netsize;
+			freq[i] = intbias / netsize; /* 1/netsize */
+			bias[i] = 0;
+		}
+	}
+
+	public byte[] colorMap() {
+		byte[] map = new byte[3 * netsize];
+		int[] index = new int[netsize];
+		for (int i = 0; i < netsize; i++)
+			index[network[i][3]] = i;
+		int k = 0;
+		for (int i = 0; i < netsize; i++) {
+			int j = index[i];
+			map[k++] = (byte) (network[j][0]);
+			map[k++] = (byte) (network[j][1]);
+			map[k++] = (byte) (network[j][2]);
+		}
+		return map;
+	}
+
+	/*
+	 * Insertion sort of network and building of netindex[0..255] (to do after
+	 * unbias)
+	 * -------------------------------------------------------------------------------
+	 */
+	public void inxbuild() {
+
+		int i, j, smallpos, smallval;
+		int[] p;
+		int[] q;
+		int previouscol, startpos;
+
+		previouscol = 0;
+		startpos = 0;
+		for (i = 0; i < netsize; i++) {
+			p = network[i];
+			smallpos = i;
+			smallval = p[1]; /* index on g */
+			/* find smallest in i..netsize-1 */
+			for (j = i + 1; j < netsize; j++) {
+				q = network[j];
+				if (q[1] < smallval) { /* index on g */
+					smallpos = j;
+					smallval = q[1]; /* index on g */
+				}
+			}
+			q = network[smallpos];
+			/* swap p (i) and q (smallpos) entries */
+			if (i != smallpos) {
+				j = q[0];
+				q[0] = p[0];
+				p[0] = j;
+				j = q[1];
+				q[1] = p[1];
+				p[1] = j;
+				j = q[2];
+				q[2] = p[2];
+				p[2] = j;
+				j = q[3];
+				q[3] = p[3];
+				p[3] = j;
+			}
+			/* smallval entry is now in position i */
+			if (smallval != previouscol) {
+				netindex[previouscol] = (startpos + i) >> 1;
+				for (j = previouscol + 1; j < smallval; j++)
+					netindex[j] = i;
+				previouscol = smallval;
+				startpos = i;
+			}
+		}
+		netindex[previouscol] = (startpos + maxnetpos) >> 1;
+		for (j = previouscol + 1; j < 256; j++)
+			netindex[j] = maxnetpos; /* really 256 */
+	}
+
+	/*
+	 * Main Learning Loop ------------------
+	 */
+	public void learn() {
+
+		int i, j, b, g, r;
+		int radius, rad, alpha, step, delta, samplepixels;
+		byte[] p;
+		int pix, lim;
+
+		if (lengthcount < minpicturebytes)
+			samplefac = 1;
+		alphadec = 30 + ((samplefac - 1) / 3);
+		p = thepicture;
+		pix = 0;
+		lim = lengthcount;
+		samplepixels = lengthcount / (3 * samplefac);
+		delta = samplepixels / ncycles;
+		alpha = initalpha;
+		radius = initradius;
+
+		rad = radius >> radiusbiasshift;
+		if (rad <= 1)
+			rad = 0;
+		for (i = 0; i < rad; i++)
+			radpower[i] = alpha * (((rad * rad - i * i) * radbias) / (rad * rad));
+
+		// fprintf(stderr,"beginning 1D learning: initial radius=%d\n", rad);
+
+		if (lengthcount < minpicturebytes)
+			step = 3;
+		else if ((lengthcount % prime1) != 0)
+			step = 3 * prime1;
+		else {
+			if ((lengthcount % prime2) != 0)
+				step = 3 * prime2;
+			else {
+				if ((lengthcount % prime3) != 0)
+					step = 3 * prime3;
+				else
+					step = 3 * prime4;
+			}
+		}
+
+		i = 0;
+		while (i < samplepixels) {
+			b = (p[pix + 0] & 0xff) << netbiasshift;
+			g = (p[pix + 1] & 0xff) << netbiasshift;
+			r = (p[pix + 2] & 0xff) << netbiasshift;
+			j = contest(b, g, r);
+
+			altersingle(alpha, j, b, g, r);
+			if (rad != 0)
+				alterneigh(rad, j, b, g, r); /* alter neighbours */
+
+			pix += step;
+			if (pix >= lim)
+				pix -= lengthcount;
+
+			i++;
+			if (delta == 0)
+				delta = 1;
+			if (i % delta == 0) {
+				alpha -= alpha / alphadec;
+				radius -= radius / radiusdec;
+				rad = radius >> radiusbiasshift;
+				if (rad <= 1)
+					rad = 0;
+				for (j = 0; j < rad; j++)
+					radpower[j] = alpha * (((rad * rad - j * j) * radbias) / (rad * rad));
+			}
+		}
+		// fprintf(stderr,"finished 1D learning: final alpha=%f
+		// !\n",((float)alpha)/initalpha);
+	}
+
+	/*
+	 * Search for BGR values 0..255 (after net is unbiased) and return colour
+	 * index
+	 * ----------------------------------------------------------------------------
+	 */
+	public int map(int b, int g, int r) {
+
+		int i, j, dist, a, bestd;
+		int[] p;
+		int best;
+
+		bestd = 1000; /* biggest possible dist is 256*3 */
+		best = -1;
+		i = netindex[g]; /* index on g */
+		j = i - 1; /* start at netindex[g] and work outwards */
+
+		while ((i < netsize) || (j >= 0)) {
+			if (i < netsize) {
+				p = network[i];
+				dist = p[1] - g; /* inx key */
+				if (dist >= bestd)
+					i = netsize; /* stop iter */
+				else {
+					i++;
+					if (dist < 0)
+						dist = -dist;
+					a = p[0] - b;
+					if (a < 0)
+						a = -a;
+					dist += a;
+					if (dist < bestd) {
+						a = p[2] - r;
+						if (a < 0)
+							a = -a;
+						dist += a;
+						if (dist < bestd) {
+							bestd = dist;
+							best = p[3];
+						}
+					}
+				}
+			}
+			if (j >= 0) {
+				p = network[j];
+				dist = g - p[1]; /* inx key - reverse dif */
+				if (dist >= bestd)
+					j = -1; /* stop iter */
+				else {
+					j--;
+					if (dist < 0)
+						dist = -dist;
+					a = p[0] - b;
+					if (a < 0)
+						a = -a;
+					dist += a;
+					if (dist < bestd) {
+						a = p[2] - r;
+						if (a < 0)
+							a = -a;
+						dist += a;
+						if (dist < bestd) {
+							bestd = dist;
+							best = p[3];
+						}
+					}
+				}
+			}
+		}
+		return (best);
+	}
+
+	public byte[] process() {
+		learn();
+		unbiasnet();
+		inxbuild();
+		return colorMap();
+	}
+
+	/*
+	 * Unbias network to give byte values 0..255 and record position i to prepare
+	 * for sort
+	 * -----------------------------------------------------------------------------------
+	 */
+	public void unbiasnet() {
+		for (int i = 0; i < netsize; i++) {
+			network[i][0] >>= netbiasshift;
+			network[i][1] >>= netbiasshift;
+			network[i][2] >>= netbiasshift;
+			network[i][3] = i; /* record colour no */
+		}
+	}
+
+	/*
+	 * Move adjacent neurons by precomputed alpha*(1-((i-j)^2/[r]^2)) in
+	 * radpower[|i-j|]
+	 * ---------------------------------------------------------------------------------
+	 */
+	protected void alterneigh(int rad, int i, int b, int g, int r) {
+
+		int j, k, lo, hi, a, m;
+		int[] p;
+
+		lo = i - rad;
+		if (lo < -1)
+			lo = -1;
+		hi = i + rad;
+		if (hi > netsize)
+			hi = netsize;
+
+		j = i + 1;
+		k = i - 1;
+		m = 1;
+		while ((j < hi) || (k > lo)) {
+			a = radpower[m++];
+			if (j < hi) {
+				p = network[j++];
+				try {
+					p[0] -= (a * (p[0] - b)) / alpharadbias;
+					p[1] -= (a * (p[1] - g)) / alpharadbias;
+					p[2] -= (a * (p[2] - r)) / alpharadbias;
+				} catch (Exception e) {
+				} // prevents 1.3 miscompilation
+			}
+			if (k > lo) {
+				p = network[k--];
+				try {
+					p[0] -= (a * (p[0] - b)) / alpharadbias;
+					p[1] -= (a * (p[1] - g)) / alpharadbias;
+					p[2] -= (a * (p[2] - r)) / alpharadbias;
+				} catch (Exception e) {
+				}
+			}
+		}
+	}
+
+	/*
+	 * Move neuron i towards biased (b,g,r) by factor alpha
+	 * ----------------------------------------------------
+	 */
+	protected void altersingle(int alpha, int i, int b, int g, int r) {
+
+		/* alter hit neuron */
+		int[] n = network[i];
+		n[0] -= (alpha * (n[0] - b)) / initalpha;
+		n[1] -= (alpha * (n[1] - g)) / initalpha;
+		n[2] -= (alpha * (n[2] - r)) / initalpha;
+	}
+
+	/*
+	 * Search for biased BGR values ----------------------------
+	 */
+	protected int contest(int b, int g, int r) {
+
+		/* finds closest neuron (min dist) and updates freq */
+		/* finds best neuron (min dist-bias) and returns position */
+		/* for frequently chosen neurons, freq[i] is high and bias[i] is negative */
+		/* bias[i] = gamma*((1/netsize)-freq[i]) */
+
+		int i, dist, a, biasdist, betafreq;
+		int bestpos, bestbiaspos, bestd, bestbiasd;
+		int[] n;
+
+		bestd = ~(((int) 1) << 31);
+		bestbiasd = bestd;
+		bestpos = -1;
+		bestbiaspos = bestpos;
+
+		for (i = 0; i < netsize; i++) {
+			n = network[i];
+			dist = n[0] - b;
+			if (dist < 0)
+				dist = -dist;
+			a = n[1] - g;
+			if (a < 0)
+				a = -a;
+			dist += a;
+			a = n[2] - r;
+			if (a < 0)
+				a = -a;
+			dist += a;
+			if (dist < bestd) {
+				bestd = dist;
+				bestpos = i;
+			}
+			biasdist = dist - ((bias[i]) >> (intbiasshift - netbiasshift));
+			if (biasdist < bestbiasd) {
+				bestbiasd = biasdist;
+				bestbiaspos = i;
+			}
+			betafreq = (freq[i] >> betashift);
+			freq[i] -= betafreq;
+			bias[i] += (betafreq << gammashift);
+		}
+		freq[bestpos] += beta;
+		bias[bestpos] -= betagamma;
+		return (bestbiaspos);
+	}
+}
diff --git a/len-activiti/src/main/java/com/len/util/AssigneeType.java b/len-activiti/src/main/java/com/len/util/AssigneeType.java
index 4c25070..349c938 100644
--- a/len-activiti/src/main/java/com/len/util/AssigneeType.java
+++ b/len-activiti/src/main/java/com/len/util/AssigneeType.java
@@ -4,11 +4,11 @@ package com.len.util;
  * @author zhuxiaomeng
  * @date 2018/1/24.
  * @email lenospmiller@gmail.com
- *
+ * <p>
  * 工作流节点绑定类型
  */
 public class AssigneeType {
-  public static final int USER_TYPE=1;
-  public static final int USER_S_TYPE=2;
-  public static final int GROUP_TYPE=3;
+	public static final int USER_TYPE = 1;
+	public static final int USER_S_TYPE = 2;
+	public static final int GROUP_TYPE = 3;
 }
diff --git a/len-activiti/src/main/java/com/len/util/Base64Utils.java b/len-activiti/src/main/java/com/len/util/Base64Utils.java
index 0787b47..dfd5f4b 100644
--- a/len-activiti/src/main/java/com/len/util/Base64Utils.java
+++ b/len-activiti/src/main/java/com/len/util/Base64Utils.java
@@ -1,11 +1,8 @@
 package com.len.util;
 
 import org.apache.log4j.Logger;
-import sun.misc.BASE64Decoder;
 import sun.misc.BASE64Encoder;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -13,20 +10,20 @@ import java.io.InputStream;
  * Created by user on 2018/7/12.
  */
 public class Base64Utils {
-    private static Logger logger = Logger.getLogger(Base64Utils.class);
-    private static BASE64Encoder encoder = new BASE64Encoder();
+	private static Logger logger = Logger.getLogger(Base64Utils.class);
+	private static BASE64Encoder encoder = new BASE64Encoder();
 
-    public static String ioToBase64(InputStream in) throws IOException {
-        String strBase64 = null;
-        try {
-            byte[] bytes = new byte[in.available()];
-            // 将文件中的内容读入到数组中
-            in.read(bytes);
-            strBase64 = encoder.encode(bytes);      //将字节流数组转换为字符串
-            in.close();
-        } catch (IOException ioe) {
-            logger.error("图片转64编码异常",ioe);
-        }
-        return strBase64;
-    }
+	public static String ioToBase64(InputStream in) throws IOException {
+		String strBase64 = null;
+		try {
+			byte[] bytes = new byte[in.available()];
+			// 将文件中的内容读入到数组中
+			in.read(bytes);
+			strBase64 = encoder.encode(bytes);      //将字节流数组转换为字符串
+			in.close();
+		} catch (IOException ioe) {
+			logger.error("图片转64编码异常", ioe);
+		}
+		return strBase64;
+	}
 }
diff --git a/len-activiti/src/main/java/org/activiti/FilterServletOutputStream.java b/len-activiti/src/main/java/org/activiti/FilterServletOutputStream.java
index a9227a5..d2f8c8f 100644
--- a/len-activiti/src/main/java/org/activiti/FilterServletOutputStream.java
+++ b/len-activiti/src/main/java/org/activiti/FilterServletOutputStream.java
@@ -1,37 +1,37 @@
 package org.activiti;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.WriteListener;
 
 public class FilterServletOutputStream extends ServletOutputStream {
 
-    private DataOutputStream stream;
-    private WriteListener writeListener;
+	private DataOutputStream stream;
+	private WriteListener writeListener;
 
-    public FilterServletOutputStream(OutputStream output) {
-        stream = new DataOutputStream(output);
-    }
+	public FilterServletOutputStream(OutputStream output) {
+		stream = new DataOutputStream(output);
+	}
 
-    public void write(int b) throws IOException {
-        stream.write(b);
-    }
+	public void write(int b) throws IOException {
+		stream.write(b);
+	}
 
-    public void write(byte[] b) throws IOException {
-        stream.write(b);
-    }
+	public void write(byte[] b) throws IOException {
+		stream.write(b);
+	}
 
-    public void write(byte[] b, int off, int len) throws IOException {
-        stream.write(b, off, len);
-    }
+	public void write(byte[] b, int off, int len) throws IOException {
+		stream.write(b, off, len);
+	}
 
-    public void setWriteListener(WriteListener writeListener) {
-        this.writeListener = writeListener;
-    }
+	public void setWriteListener(WriteListener writeListener) {
+		this.writeListener = writeListener;
+	}
 
-    public boolean isReady() {
-        return true;
-    }
-}
\ No newline at end of file
+	public boolean isReady() {
+		return true;
+	}
+}
diff --git a/len-activiti/src/main/java/org/activiti/GenericResponseWrapper.java b/len-activiti/src/main/java/org/activiti/GenericResponseWrapper.java
index 99133b8..2c54b15 100644
--- a/len-activiti/src/main/java/org/activiti/GenericResponseWrapper.java
+++ b/len-activiti/src/main/java/org/activiti/GenericResponseWrapper.java
@@ -1,48 +1,48 @@
 package org.activiti;
 
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintWriter;
 
 public class GenericResponseWrapper extends HttpServletResponseWrapper {
-    private ByteArrayOutputStream output;
-    private int contentLength;
-    private String contentType;
-
-    public GenericResponseWrapper(HttpServletResponse response) {
-        super(response);
-        output = new ByteArrayOutputStream();
-    }
-
-    public byte[] getData() {
-        return output.toByteArray();
-    }
-
-    public ServletOutputStream getOutputStream() {
-        return new FilterServletOutputStream(output);
-    }
-
-    public PrintWriter getWriter() {
-        return new PrintWriter(getOutputStream(), true);
-    }
-
-    public void setContentLength(int length) {
-        this.contentLength = length;
-        super.setContentLength(length);
-    }
-
-    public int getContentLength() {
-        return contentLength;
-    }
-
-    public void setContentType(String type) {
-        this.contentType = type;
-        super.setContentType(type);
-    }
-
-    public String getContentType() {
-        return contentType;
-    }
-} 
+	private ByteArrayOutputStream output;
+	private int contentLength;
+	private String contentType;
+
+	public GenericResponseWrapper(HttpServletResponse response) {
+		super(response);
+		output = new ByteArrayOutputStream();
+	}
+
+	public byte[] getData() {
+		return output.toByteArray();
+	}
+
+	public ServletOutputStream getOutputStream() {
+		return new FilterServletOutputStream(output);
+	}
+
+	public PrintWriter getWriter() {
+		return new PrintWriter(getOutputStream(), true);
+	}
+
+	public int getContentLength() {
+		return contentLength;
+	}
+
+	public void setContentLength(int length) {
+		this.contentLength = length;
+		super.setContentLength(length);
+	}
+
+	public String getContentType() {
+		return contentType;
+	}
+
+	public void setContentType(String type) {
+		this.contentType = type;
+		super.setContentType(type);
+	}
+}
diff --git a/len-activiti/src/main/java/org/activiti/JsonpCallbackFilter.java b/len-activiti/src/main/java/org/activiti/JsonpCallbackFilter.java
index cff0c49..1e6d01c 100644
--- a/len-activiti/src/main/java/org/activiti/JsonpCallbackFilter.java
+++ b/len-activiti/src/main/java/org/activiti/JsonpCallbackFilter.java
@@ -1,65 +1,58 @@
 package org.activiti;
 
+import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.*;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Map;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.annotation.WebFilter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import lombok.extern.slf4j.Slf4j;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 @WebFilter("/service/*")
 @Slf4j
 public class JsonpCallbackFilter implements Filter {
 
-    public void init(FilterConfig fConfig) throws ServletException {
-    }
+	public void init(FilterConfig fConfig) throws ServletException {
+	}
 
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-        HttpServletRequest httpRequest = (HttpServletRequest) request;
-        HttpServletResponse httpResponse = (HttpServletResponse) response;
+	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+		HttpServletRequest httpRequest = (HttpServletRequest) request;
+		HttpServletResponse httpResponse = (HttpServletResponse) response;
 
-        Map<String, String[]> parms = httpRequest.getParameterMap();
+		Map<String, String[]> parms = httpRequest.getParameterMap();
 
-        if (parms.containsKey("callback")) {
-            if (log.isDebugEnabled())
-                log.debug("Wrapping response with JSONP callback '" + parms.get("callback")[0] + "'");
+		if (parms.containsKey("callback")) {
+			if (log.isDebugEnabled())
+				log.debug("Wrapping response with JSONP callback '" + parms.get("callback")[0] + "'");
 
-            OutputStream out = httpResponse.getOutputStream();
+			OutputStream out = httpResponse.getOutputStream();
 
-            GenericResponseWrapper wrapper = new GenericResponseWrapper(httpResponse);
+			GenericResponseWrapper wrapper = new GenericResponseWrapper(httpResponse);
 
-            chain.doFilter(request, wrapper);
+			chain.doFilter(request, wrapper);
 
-            //handles the content-size truncation
-            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-            outputStream.write(new String(parms.get("callback")[0] + "(").getBytes());
-            outputStream.write(wrapper.getData());
-            outputStream.write(new String(");").getBytes());
-            byte jsonpResponse[] = outputStream.toByteArray();
+			//handles the content-size truncation
+			ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+			outputStream.write(new String(parms.get("callback")[0] + "(").getBytes());
+			outputStream.write(wrapper.getData());
+			outputStream.write(new String(");").getBytes());
+			byte jsonpResponse[] = outputStream.toByteArray();
 
-            wrapper.setContentType("text/javascript;charset=UTF-8");
-            wrapper.setContentLength(jsonpResponse.length);
+			wrapper.setContentType("text/javascript;charset=UTF-8");
+			wrapper.setContentLength(jsonpResponse.length);
 
-            out.write(jsonpResponse);
+			out.write(jsonpResponse);
 
-            out.close();
+			out.close();
 
-        } else {
-            chain.doFilter(request, response);
-        }
-    }
+		} else {
+			chain.doFilter(request, response);
+		}
+	}
 
-    public void destroy() {
-    }
+	public void destroy() {
+	}
 }
diff --git a/len-activiti/src/main/java/org/activiti/image/HMProcessDiagramGenerator.java b/len-activiti/src/main/java/org/activiti/image/HMProcessDiagramGenerator.java
index 72121b3..da9875e 100644
--- a/len-activiti/src/main/java/org/activiti/image/HMProcessDiagramGenerator.java
+++ b/len-activiti/src/main/java/org/activiti/image/HMProcessDiagramGenerator.java
@@ -1,9 +1,9 @@
 /* Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -12,69 +12,71 @@
  */
 package org.activiti.image;
 
+import org.activiti.bpmn.model.BpmnModel;
+
 import java.awt.image.BufferedImage;
 import java.io.InputStream;
 import java.util.List;
 
-import org.activiti.bpmn.model.BpmnModel;
-
 /**
  * This interface declares methods to generate process diagram
  *
  * @author martin.grofcik
  * @author Tijs Rademakers
  */
-public interface HMProcessDiagramGenerator extends ProcessDiagramGenerator{
-  
-  /**
-   * Generates a diagram of the given process definition, using the
-   * diagram interchange information of the process.
-   * @param bpmnModel bpmn model to get diagram for
-   * @param imageType type of the image to generate.
-   * @param highLightedActivities activities to highlight
-   * @param highLightedFlows flows to highlight
-   * @param activityFontName override the default activity font
-   * @param labelFontName override the default label font
-   * @param annotationFontName override the default annotation font
-   * @param customClassLoader provide a custom classloader for retrieving icon images
-   */
-  public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities, List<String> highLightedFlows, 
-      String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor);
-
-
-  public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities, List<String> highLightedFlows,
-                                     String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor,List<String> currentHighlightdActivities);
-
-  /**
-   * Generates a diagram of the given process definition, using the
-   * diagram interchange information of the process.
-   * @param bpmnModel bpmn model to get diagram for
-   * @param imageType type of the image to generate.
-   * @param highLightedActivities activities to highlight
-   * @param highLightedFlows flows to highlight
-   */
-  public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities, List<String> highLightedFlows);
-  
-  public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities, 
-      List<String> highLightedFlows, double scaleFactor);
-
-  public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities);
-  
-  public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities, double scaleFactor);
-  
-  public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader);
-  
-  public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, String activityFontName, 
-      String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor);
-
-  public InputStream generatePngDiagram(BpmnModel bpmnModel);
-  
-  public InputStream generatePngDiagram(BpmnModel bpmnModel, double scaleFactor);
-
-  public InputStream generateJpgDiagram(BpmnModel bpmnModel);
-  
-  public InputStream generateJpgDiagram(BpmnModel bpmnModel, double scaleFactor);
-  
-  public BufferedImage generatePngImage(BpmnModel bpmnModel, double scaleFactor);
+public interface HMProcessDiagramGenerator extends ProcessDiagramGenerator {
+
+	/**
+	 * Generates a diagram of the given process definition, using the
+	 * diagram interchange information of the process.
+	 *
+	 * @param bpmnModel             bpmn model to get diagram for
+	 * @param imageType             type of the image to generate.
+	 * @param highLightedActivities activities to highlight
+	 * @param highLightedFlows      flows to highlight
+	 * @param activityFontName      override the default activity font
+	 * @param labelFontName         override the default label font
+	 * @param annotationFontName    override the default annotation font
+	 * @param customClassLoader     provide a custom classloader for retrieving icon images
+	 */
+	public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities, List<String> highLightedFlows,
+									   String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor);
+
+
+	public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities, List<String> highLightedFlows,
+									   String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor, List<String> currentHighlightdActivities);
+
+	/**
+	 * Generates a diagram of the given process definition, using the
+	 * diagram interchange information of the process.
+	 *
+	 * @param bpmnModel             bpmn model to get diagram for
+	 * @param imageType             type of the image to generate.
+	 * @param highLightedActivities activities to highlight
+	 * @param highLightedFlows      flows to highlight
+	 */
+	public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities, List<String> highLightedFlows);
+
+	public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities,
+									   List<String> highLightedFlows, double scaleFactor);
+
+	public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities);
+
+	public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities, double scaleFactor);
+
+	public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader);
+
+	public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, String activityFontName,
+									   String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor);
+
+	public InputStream generatePngDiagram(BpmnModel bpmnModel);
+
+	public InputStream generatePngDiagram(BpmnModel bpmnModel, double scaleFactor);
+
+	public InputStream generateJpgDiagram(BpmnModel bpmnModel);
+
+	public InputStream generateJpgDiagram(BpmnModel bpmnModel, double scaleFactor);
+
+	public BufferedImage generatePngImage(BpmnModel bpmnModel, double scaleFactor);
 
 }
diff --git a/len-activiti/src/main/java/org/activiti/image/impl/DefaultProcessDiagramCanvas.java b/len-activiti/src/main/java/org/activiti/image/impl/DefaultProcessDiagramCanvas.java
index a97f60e..c2a2c80 100644
--- a/len-activiti/src/main/java/org/activiti/image/impl/DefaultProcessDiagramCanvas.java
+++ b/len-activiti/src/main/java/org/activiti/image/impl/DefaultProcessDiagramCanvas.java
@@ -13,29 +13,20 @@
 
 package org.activiti.image.impl;
 
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.Point;
-import java.awt.Polygon;
-import java.awt.Rectangle;
-import java.awt.RenderingHints;
-import java.awt.Shape;
-import java.awt.Stroke;
+import org.activiti.bpmn.model.AssociationDirection;
+import org.activiti.bpmn.model.GraphicInfo;
+import org.activiti.image.exception.ActivitiImageException;
+import org.activiti.image.util.ReflectUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
 import java.awt.font.FontRenderContext;
 import java.awt.font.LineBreakMeasurer;
 import java.awt.font.TextAttribute;
 import java.awt.font.TextLayout;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Ellipse2D;
-import java.awt.geom.Line2D;
-import java.awt.geom.Path2D;
-import java.awt.geom.PathIterator;
-import java.awt.geom.Rectangle2D;
-import java.awt.geom.RoundRectangle2D;
+import java.awt.geom.*;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -46,1306 +37,1288 @@ import java.text.AttributedString;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.imageio.ImageIO;
-
-import org.activiti.bpmn.model.AssociationDirection;
-import org.activiti.bpmn.model.GraphicInfo;
-import org.activiti.image.exception.ActivitiImageException;
-import org.activiti.image.util.ReflectUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
  * Represents a canvas on which BPMN 2.0 constructs can be drawn.
- *
+ * <p>
  * Some of the icons used are licensed under a Creative Commons Attribution 2.5
  * License, see http://www.famfamfam.com/lab/icons/silk/
  *
- * @see org.activiti.engine.impl.bpmn.diagram.DefaultProcessDiagramGenerator
  * @author Joram Barrez
+ * @see org.activiti.engine.impl.bpmn.diagram.DefaultProcessDiagramGenerator
  */
 public class DefaultProcessDiagramCanvas {
 
-  protected static final Logger LOGGER = LoggerFactory.getLogger(DefaultProcessDiagramCanvas.class);
-  public enum SHAPE_TYPE {Rectangle, Rhombus, Ellipse}
-
-  // Predefined sized
-  protected static final int ARROW_WIDTH = 5;
-  protected static final int CONDITIONAL_INDICATOR_WIDTH = 16;
-  protected static final int DEFAULT_INDICATOR_WIDTH = 10;
-  protected static final int MARKER_WIDTH = 12;
-  protected static final int FONT_SIZE = 11;
-  protected static final int FONT_SPACING = 2;
-  protected static final int TEXT_PADDING = 3;
-  protected static final int ANNOTATION_TEXT_PADDING = 7;
-  protected static final int LINE_HEIGHT = FONT_SIZE + FONT_SPACING;
-
-
-  // Colors
-  protected static Color TASK_BOX_COLOR = new Color(249, 249, 249);
-  protected static Color SUBPROCESS_BOX_COLOR = new Color(255, 255, 255);
-  protected static Color EVENT_COLOR = new Color(255, 255, 255);
-  protected static Color CONNECTION_COLOR = new Color(88, 88, 88);
-  protected static Color CONDITIONAL_INDICATOR_COLOR = new Color(255, 255, 255);
-  protected static Color HIGHLIGHT_COLOR = Color.GREEN;
-  protected static Color LABEL_COLOR = new Color(112, 146, 190);
-  protected static Color TASK_BORDER_COLOR = new Color(187, 187, 187);
-  protected static Color EVENT_BORDER_COLOR = new Color(88, 88, 88);
-  protected static Color SUBPROCESS_BORDER_COLOR = new Color(0, 0, 0);
-
-  // Fonts
-  protected static Font LABEL_FONT = null;
-  protected static Font ANNOTATION_FONT = null;
-
-  // Strokes
-  protected static Stroke THICK_TASK_BORDER_STROKE = new BasicStroke(3.0f);
-  protected static Stroke GATEWAY_TYPE_STROKE = new BasicStroke(3.0f);
-  protected static Stroke END_EVENT_STROKE = new BasicStroke(3.0f);
-  protected static Stroke MULTI_INSTANCE_STROKE = new BasicStroke(1.3f);
-  protected static Stroke EVENT_SUBPROCESS_STROKE = new BasicStroke(1.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 1.0f,  new float[] { 1.0f }, 0.0f);
-  protected static Stroke NON_INTERRUPTING_EVENT_STROKE = new BasicStroke(1.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 1.0f,  new float[] { 4.0f, 3.0f }, 0.0f);
-  protected static Stroke HIGHLIGHT_FLOW_STROKE = new BasicStroke(1.3f);
-  protected static Stroke ANNOTATION_STROKE = new BasicStroke(2.0f);
-  protected static Stroke ASSOCIATION_STROKE = new BasicStroke(2.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 1.0f,  new float[] { 2.0f, 2.0f }, 0.0f);
-
-  // icons
-  protected static int ICON_PADDING = 5;
-  protected static BufferedImage USERTASK_IMAGE;
-  protected static BufferedImage SCRIPTTASK_IMAGE;
-  protected static BufferedImage SERVICETASK_IMAGE;
-  protected static BufferedImage RECEIVETASK_IMAGE;
-  protected static BufferedImage SENDTASK_IMAGE;
-  protected static BufferedImage MANUALTASK_IMAGE;
-  protected static BufferedImage BUSINESS_RULE_TASK_IMAGE;
-  protected static BufferedImage SHELL_TASK_IMAGE;
-  protected static BufferedImage MULE_TASK_IMAGE;
-  protected static BufferedImage CAMEL_TASK_IMAGE;
-
-  protected static BufferedImage TIMER_IMAGE;
-  protected static BufferedImage COMPENSATE_THROW_IMAGE;
-  protected static BufferedImage COMPENSATE_CATCH_IMAGE;
-  protected static BufferedImage ERROR_THROW_IMAGE;
-  protected static BufferedImage ERROR_CATCH_IMAGE;
-  protected static BufferedImage MESSAGE_THROW_IMAGE;
-  protected static BufferedImage MESSAGE_CATCH_IMAGE;
-  protected static BufferedImage SIGNAL_CATCH_IMAGE;
-  protected static BufferedImage SIGNAL_THROW_IMAGE;
-
-  protected int canvasWidth = -1;
-  protected int canvasHeight = -1;
-  protected int minX = -1;
-  protected int minY = -1;
-  protected BufferedImage processDiagram;
-  protected Graphics2D g;
-  protected FontMetrics fontMetrics;
-  protected boolean closed;
-  protected ClassLoader customClassLoader;
-  protected String activityFontName = "Arial";
-  protected String labelFontName = "Arial";
-  protected String annotationFontName = "Arial";
-
-  /**
-   * Creates an empty canvas with given width and height.
-   *
-   * Allows to specify minimal boundaries on the left and upper side of the
-   * canvas. This is useful for diagrams that have white space there.
-   * Everything beneath these minimum values will be cropped.
-   * It's also possible to pass a specific font name and a class loader for the icon images.
-   *
-   */
-  public DefaultProcessDiagramCanvas(int width, int height, int minX, int minY, String imageType,
-      String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader) {
-
-    this.canvasWidth = width;
-    this.canvasHeight = height;
-    this.minX = minX;
-    this.minY = minY;
-    if (activityFontName != null) {
-      this.activityFontName = activityFontName;
-    }
-    if (labelFontName != null) {
-      this.labelFontName = labelFontName;
-    }
-    if (annotationFontName != null) {
-        this.annotationFontName = annotationFontName;
-    }
-    this.customClassLoader = customClassLoader;
-
-    initialize(imageType);
-  }
-
-  /**
-   * Creates an empty canvas with given width and height.
-   *
-   * Allows to specify minimal boundaries on the left and upper side of the
-   * canvas. This is useful for diagrams that have white space there (eg
-   * Signavio). Everything beneath these minimum values will be cropped.
-   *
-   * @param minX
-   *          Hint that will be used when generating the image. Parts that fall
-   *          below minX on the horizontal scale will be cropped.
-   * @param minY
-   *          Hint that will be used when generating the image. Parts that fall
-   *          below minX on the horizontal scale will be cropped.
-   */
-  public DefaultProcessDiagramCanvas(int width, int height, int minX, int minY, String imageType) {
-    this.canvasWidth = width;
-    this.canvasHeight = height;
-    this.minX = minX;
-    this.minY = minY;
-
-    initialize(imageType);
-  }
-
-  public void initialize(String imageType) {
-    if ("png".equalsIgnoreCase(imageType)) {
-      this.processDiagram = new BufferedImage(canvasWidth, canvasHeight, BufferedImage.TYPE_INT_ARGB);
-    } else {
-      this.processDiagram = new BufferedImage(canvasWidth, canvasHeight, BufferedImage.TYPE_INT_RGB);
-    }
-
-    this.g = processDiagram.createGraphics();
-    if ("png".equalsIgnoreCase(imageType) == false) {
-      this.g.setBackground(new Color(255, 255, 255, 0));
-      this.g.clearRect(0, 0, canvasWidth, canvasHeight);
-    }
-
-    g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-    g.setPaint(Color.black);
-
-    Font font = new Font(activityFontName, Font.BOLD, FONT_SIZE);
-    g.setFont(font);
-    this.fontMetrics = g.getFontMetrics();
-
-    LABEL_FONT = new Font(labelFontName, Font.BOLD, 14);
-    ANNOTATION_FONT = new Font(annotationFontName, Font.PLAIN, FONT_SIZE);
-
-    try {
-      USERTASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/userTask.png", customClassLoader));
-      SCRIPTTASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/scriptTask.png", customClassLoader));
-      SERVICETASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/serviceTask.png", customClassLoader));
-      RECEIVETASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/receiveTask.png", customClassLoader));
-      SENDTASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/sendTask.png", customClassLoader));
-      MANUALTASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/manualTask.png", customClassLoader));
-      BUSINESS_RULE_TASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/businessRuleTask.png", customClassLoader));
-      SHELL_TASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/shellTask.png", customClassLoader));
-      CAMEL_TASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/camelTask.png", customClassLoader));
-      MULE_TASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/muleTask.png", customClassLoader));
-
-      TIMER_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/timer.png", customClassLoader));
-      COMPENSATE_THROW_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/compensate-throw.png", customClassLoader));
-      COMPENSATE_CATCH_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/compensate.png", customClassLoader));
-      ERROR_THROW_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/error-throw.png", customClassLoader));
-      ERROR_CATCH_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/error.png", customClassLoader));
-      MESSAGE_THROW_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/message-throw.png", customClassLoader));
-      MESSAGE_CATCH_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/message.png", customClassLoader));
-      SIGNAL_THROW_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/signal-throw.png", customClassLoader));
-      SIGNAL_CATCH_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/signal.png", customClassLoader));
-    } catch (IOException e) {
-      LOGGER.warn("Could not load image for process diagram creation: {}", e.getMessage());
-    }
-  }
-
-  /**
-   * Generates an image of what currently is drawn on the canvas.
-   *
-   * Throws an {@link ActivitiException} when {@link #close()} is already
-   * called.
-   */
-  public InputStream generateImage(String imageType) {
-    if (closed) {
-      throw new ActivitiImageException("ProcessDiagramGenerator already closed");
-    }
-
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    try {
-      ImageIO.write(processDiagram, imageType, out);
-
-    } catch (IOException e) {
-      throw new ActivitiImageException("Error while generating process image", e);
-    } finally {
-      try {
-        if (out != null) {
-          out.close();
-        }
-      } catch(IOException ignore) {
-        // Exception is silently ignored
-      }
-    }
-    return new ByteArrayInputStream(out.toByteArray());
-  }
-
-  /**
-   * Generates an image of what currently is drawn on the canvas.
-   *
-   * Throws an {@link ActivitiException} when {@link #close()} is already
-   * called.
-   */
-  public BufferedImage generateBufferedImage(String imageType) {
-    if (closed) {
-      throw new ActivitiImageException("ProcessDiagramGenerator already closed");
-    }
-
-    // Try to remove white space
-    minX = (minX <= 5) ? 5 : minX;
-    minY = (minY <= 5) ? 5 : minY;
-    BufferedImage imageToSerialize = processDiagram;
-    if (minX >= 0 && minY >= 0) {
-      imageToSerialize = processDiagram.getSubimage(minX - 5, minY - 5, canvasWidth - minX + 5, canvasHeight - minY + 5);
-    }
-    return imageToSerialize;
-  }
-
-  /**
-   * Closes the canvas which dissallows further drawing and releases graphical
-   * resources.
-   */
-  public void close() {
-    g.dispose();
-    closed = true;
-  }
-
-  public void drawNoneStartEvent(GraphicInfo graphicInfo) {
-    drawStartEvent(graphicInfo, null, 1.0);
-  }
-
-  public void drawTimerStartEvent(GraphicInfo graphicInfo, double scaleFactor) {
-    drawStartEvent(graphicInfo, TIMER_IMAGE, scaleFactor);
-  }
-
-  public void drawSignalStartEvent(GraphicInfo graphicInfo, double scaleFactor) {
-    drawStartEvent(graphicInfo, SIGNAL_CATCH_IMAGE, scaleFactor);
-  }
-
-  public void drawMessageStartEvent(GraphicInfo graphicInfo, double scaleFactor) {
-    drawStartEvent(graphicInfo, MESSAGE_CATCH_IMAGE, scaleFactor);
-  }
-
-  public void drawStartEvent(GraphicInfo graphicInfo, BufferedImage image, double scaleFactor) {
-    Paint originalPaint = g.getPaint();
-    g.setPaint(EVENT_COLOR);
+	protected static final Logger LOGGER = LoggerFactory.getLogger(DefaultProcessDiagramCanvas.class);
+	// Predefined sized
+	protected static final int ARROW_WIDTH = 5;
+	protected static final int CONDITIONAL_INDICATOR_WIDTH = 16;
+	protected static final int DEFAULT_INDICATOR_WIDTH = 10;
+	protected static final int MARKER_WIDTH = 12;
+	protected static final int FONT_SIZE = 11;
+	protected static final int FONT_SPACING = 2;
+	protected static final int TEXT_PADDING = 3;
+	protected static final int ANNOTATION_TEXT_PADDING = 7;
+	protected static final int LINE_HEIGHT = FONT_SIZE + FONT_SPACING;
+	// Colors
+	protected static Color TASK_BOX_COLOR = new Color(249, 249, 249);
+	protected static Color SUBPROCESS_BOX_COLOR = new Color(255, 255, 255);
+	protected static Color EVENT_COLOR = new Color(255, 255, 255);
+	protected static Color CONNECTION_COLOR = new Color(88, 88, 88);
+	protected static Color CONDITIONAL_INDICATOR_COLOR = new Color(255, 255, 255);
+	protected static Color HIGHLIGHT_COLOR = Color.GREEN;
+	protected static Color LABEL_COLOR = new Color(112, 146, 190);
+	protected static Color TASK_BORDER_COLOR = new Color(187, 187, 187);
+	protected static Color EVENT_BORDER_COLOR = new Color(88, 88, 88);
+	protected static Color SUBPROCESS_BORDER_COLOR = new Color(0, 0, 0);
+	// Fonts
+	protected static Font LABEL_FONT = null;
+	protected static Font ANNOTATION_FONT = null;
+	// Strokes
+	protected static Stroke THICK_TASK_BORDER_STROKE = new BasicStroke(3.0f);
+	protected static Stroke GATEWAY_TYPE_STROKE = new BasicStroke(3.0f);
+	protected static Stroke END_EVENT_STROKE = new BasicStroke(3.0f);
+	protected static Stroke MULTI_INSTANCE_STROKE = new BasicStroke(1.3f);
+	protected static Stroke EVENT_SUBPROCESS_STROKE = new BasicStroke(1.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 1.0f, new float[]{1.0f}, 0.0f);
+	protected static Stroke NON_INTERRUPTING_EVENT_STROKE = new BasicStroke(1.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 1.0f, new float[]{4.0f, 3.0f}, 0.0f);
+	protected static Stroke HIGHLIGHT_FLOW_STROKE = new BasicStroke(1.3f);
+	protected static Stroke ANNOTATION_STROKE = new BasicStroke(2.0f);
+	protected static Stroke ASSOCIATION_STROKE = new BasicStroke(2.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 1.0f, new float[]{2.0f, 2.0f}, 0.0f);
+	// icons
+	protected static int ICON_PADDING = 5;
+	protected static BufferedImage USERTASK_IMAGE;
+	protected static BufferedImage SCRIPTTASK_IMAGE;
+	protected static BufferedImage SERVICETASK_IMAGE;
+	protected static BufferedImage RECEIVETASK_IMAGE;
+	protected static BufferedImage SENDTASK_IMAGE;
+	protected static BufferedImage MANUALTASK_IMAGE;
+	protected static BufferedImage BUSINESS_RULE_TASK_IMAGE;
+	protected static BufferedImage SHELL_TASK_IMAGE;
+	protected static BufferedImage MULE_TASK_IMAGE;
+	protected static BufferedImage CAMEL_TASK_IMAGE;
+	protected static BufferedImage TIMER_IMAGE;
+	protected static BufferedImage COMPENSATE_THROW_IMAGE;
+	protected static BufferedImage COMPENSATE_CATCH_IMAGE;
+	protected static BufferedImage ERROR_THROW_IMAGE;
+	protected static BufferedImage ERROR_CATCH_IMAGE;
+	protected static BufferedImage MESSAGE_THROW_IMAGE;
+	protected static BufferedImage MESSAGE_CATCH_IMAGE;
+	protected static BufferedImage SIGNAL_CATCH_IMAGE;
+	protected static BufferedImage SIGNAL_THROW_IMAGE;
+	protected int canvasWidth = -1;
+	protected int canvasHeight = -1;
+	protected int minX = -1;
+	protected int minY = -1;
+	protected BufferedImage processDiagram;
+	protected Graphics2D g;
+	protected FontMetrics fontMetrics;
+	protected boolean closed;
+	protected ClassLoader customClassLoader;
+	protected String activityFontName = "Arial";
+	protected String labelFontName = "Arial";
+	protected String annotationFontName = "Arial";
+
+	/**
+	 * Creates an empty canvas with given width and height.
+	 * <p>
+	 * Allows to specify minimal boundaries on the left and upper side of the
+	 * canvas. This is useful for diagrams that have white space there.
+	 * Everything beneath these minimum values will be cropped.
+	 * It's also possible to pass a specific font name and a class loader for the icon images.
+	 */
+	public DefaultProcessDiagramCanvas(int width, int height, int minX, int minY, String imageType,
+									   String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader) {
+
+		this.canvasWidth = width;
+		this.canvasHeight = height;
+		this.minX = minX;
+		this.minY = minY;
+		if (activityFontName != null) {
+			this.activityFontName = activityFontName;
+		}
+		if (labelFontName != null) {
+			this.labelFontName = labelFontName;
+		}
+		if (annotationFontName != null) {
+			this.annotationFontName = annotationFontName;
+		}
+		this.customClassLoader = customClassLoader;
+
+		initialize(imageType);
+	}
+
+	/**
+	 * Creates an empty canvas with given width and height.
+	 * <p>
+	 * Allows to specify minimal boundaries on the left and upper side of the
+	 * canvas. This is useful for diagrams that have white space there (eg
+	 * Signavio). Everything beneath these minimum values will be cropped.
+	 *
+	 * @param minX Hint that will be used when generating the image. Parts that fall
+	 *             below minX on the horizontal scale will be cropped.
+	 * @param minY Hint that will be used when generating the image. Parts that fall
+	 *             below minX on the horizontal scale will be cropped.
+	 */
+	public DefaultProcessDiagramCanvas(int width, int height, int minX, int minY, String imageType) {
+		this.canvasWidth = width;
+		this.canvasHeight = height;
+		this.minX = minX;
+		this.minY = minY;
+
+		initialize(imageType);
+	}
+
+	/**
+	 * This method creates shape by type and coordinates.
+	 *
+	 * @param shapeType
+	 * @param graphicInfo
+	 * @return Shape
+	 */
+	private static Shape createShape(SHAPE_TYPE shapeType, GraphicInfo graphicInfo) {
+		if (SHAPE_TYPE.Rectangle.equals(shapeType)) {
+			// source is rectangle
+			return new Rectangle2D.Double(graphicInfo.getX(), graphicInfo.getY(), graphicInfo.getWidth(), graphicInfo.getHeight());
+		} else if (SHAPE_TYPE.Rhombus.equals(shapeType)) {
+			// source is rhombus
+			Path2D.Double rhombus = new Path2D.Double();
+			rhombus.moveTo(graphicInfo.getX(), graphicInfo.getY() + graphicInfo.getHeight() / 2);
+			rhombus.lineTo(graphicInfo.getX() + graphicInfo.getWidth() / 2, graphicInfo.getY() + graphicInfo.getHeight());
+			rhombus.lineTo(graphicInfo.getX() + graphicInfo.getWidth(), graphicInfo.getY() + graphicInfo.getHeight() / 2);
+			rhombus.lineTo(graphicInfo.getX() + graphicInfo.getWidth() / 2, graphicInfo.getY());
+			rhombus.lineTo(graphicInfo.getX(), graphicInfo.getY() + graphicInfo.getHeight() / 2);
+			rhombus.closePath();
+			return rhombus;
+		} else if (SHAPE_TYPE.Ellipse.equals(shapeType)) {
+			// source is ellipse
+			return new Ellipse2D.Double(graphicInfo.getX(), graphicInfo.getY(), graphicInfo.getWidth(), graphicInfo.getHeight());
+		} else {
+			// unknown source element, just do not correct coordinates
+		}
+		return null;
+	}
+
+	/**
+	 * This method returns intersection point of shape border and line.
+	 *
+	 * @param shape
+	 * @param line
+	 * @return Point
+	 */
+	private static Point getIntersection(Shape shape, Line2D.Double line) {
+		if (shape instanceof Ellipse2D) {
+			return getEllipseIntersection(shape, line);
+		} else if (shape instanceof Rectangle2D || shape instanceof Path2D) {
+			return getShapeIntersection(shape, line);
+		} else {
+			// something strange
+			return null;
+		}
+	}
+
+	/**
+	 * This method calculates ellipse intersection with line
+	 *
+	 * @param shape Bounds of this shape used to calculate parameters of inscribed into this bounds ellipse.
+	 * @param line
+	 * @return Intersection point
+	 */
+	private static Point getEllipseIntersection(Shape shape, Line2D.Double line) {
+		double angle = Math.atan2(line.y2 - line.y1, line.x2 - line.x1);
+		double x = shape.getBounds2D().getWidth() / 2 * Math.cos(angle) + shape.getBounds2D().getCenterX();
+		double y = shape.getBounds2D().getHeight() / 2 * Math.sin(angle) + shape.getBounds2D().getCenterY();
+		Point p = new Point();
+		p.setLocation(x, y);
+		return p;
+	}
+
+	/**
+	 * This method calculates shape intersection with line.
+	 *
+	 * @param shape
+	 * @param line
+	 * @return Intersection point
+	 */
+	private static Point getShapeIntersection(Shape shape, Line2D.Double line) {
+		PathIterator it = shape.getPathIterator(null);
+		double[] coords = new double[6];
+		double[] pos = new double[2];
+		Line2D.Double l = new Line2D.Double();
+		while (!it.isDone()) {
+			int type = it.currentSegment(coords);
+			switch (type) {
+				case PathIterator.SEG_MOVETO:
+					pos[0] = coords[0];
+					pos[1] = coords[1];
+					break;
+				case PathIterator.SEG_LINETO:
+					l = new Line2D.Double(pos[0], pos[1], coords[0], coords[1]);
+					if (line.intersectsLine(l)) {
+						return getLinesIntersection(line, l);
+					}
+					pos[0] = coords[0];
+					pos[1] = coords[1];
+					break;
+				case PathIterator.SEG_CLOSE:
+					break;
+				default:
+					// whatever
+			}
+			it.next();
+		}
+		return null;
+	}
+
+	/**
+	 * This method calculates intersections of two lines.
+	 *
+	 * @param a Line 1
+	 * @param b Line 2
+	 * @return Intersection point
+	 */
+	private static Point getLinesIntersection(Line2D a, Line2D b) {
+		double d = (a.getX1() - a.getX2()) * (b.getY2() - b.getY1()) - (a.getY1() - a.getY2()) * (b.getX2() - b.getX1());
+		double da = (a.getX1() - b.getX1()) * (b.getY2() - b.getY1()) - (a.getY1() - b.getY1()) * (b.getX2() - b.getX1());
+		// double db = (a.getX1()-a.getX2())*(a.getY1()-b.getY1()) - (a.getY1()-a.getY2())*(a.getX1()-b.getX1());
+		double ta = da / d;
+		// double tb = db/d;
+		Point p = new Point();
+		p.setLocation(a.getX1() + ta * (a.getX2() - a.getX1()), a.getY1() + ta * (a.getY2() - a.getY1()));
+		return p;
+	}
+
+	public void initialize(String imageType) {
+		if ("png".equalsIgnoreCase(imageType)) {
+			this.processDiagram = new BufferedImage(canvasWidth, canvasHeight, BufferedImage.TYPE_INT_ARGB);
+		} else {
+			this.processDiagram = new BufferedImage(canvasWidth, canvasHeight, BufferedImage.TYPE_INT_RGB);
+		}
+
+		this.g = processDiagram.createGraphics();
+		if ("png".equalsIgnoreCase(imageType) == false) {
+			this.g.setBackground(new Color(255, 255, 255, 0));
+			this.g.clearRect(0, 0, canvasWidth, canvasHeight);
+		}
+
+		g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+		g.setPaint(Color.black);
+
+		Font font = new Font(activityFontName, Font.BOLD, FONT_SIZE);
+		g.setFont(font);
+		this.fontMetrics = g.getFontMetrics();
+
+		LABEL_FONT = new Font(labelFontName, Font.BOLD, 14);
+		ANNOTATION_FONT = new Font(annotationFontName, Font.PLAIN, FONT_SIZE);
+
+		try {
+			USERTASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/userTask.png", customClassLoader));
+			SCRIPTTASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/scriptTask.png", customClassLoader));
+			SERVICETASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/serviceTask.png", customClassLoader));
+			RECEIVETASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/receiveTask.png", customClassLoader));
+			SENDTASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/sendTask.png", customClassLoader));
+			MANUALTASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/manualTask.png", customClassLoader));
+			BUSINESS_RULE_TASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/businessRuleTask.png", customClassLoader));
+			SHELL_TASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/shellTask.png", customClassLoader));
+			CAMEL_TASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/camelTask.png", customClassLoader));
+			MULE_TASK_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/muleTask.png", customClassLoader));
+
+			TIMER_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/timer.png", customClassLoader));
+			COMPENSATE_THROW_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/compensate-throw.png", customClassLoader));
+			COMPENSATE_CATCH_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/compensate.png", customClassLoader));
+			ERROR_THROW_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/error-throw.png", customClassLoader));
+			ERROR_CATCH_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/error.png", customClassLoader));
+			MESSAGE_THROW_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/message-throw.png", customClassLoader));
+			MESSAGE_CATCH_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/message.png", customClassLoader));
+			SIGNAL_THROW_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/signal-throw.png", customClassLoader));
+			SIGNAL_CATCH_IMAGE = ImageIO.read(ReflectUtil.getResource("org/activiti/icons/signal.png", customClassLoader));
+		} catch (IOException e) {
+			LOGGER.warn("Could not load image for process diagram creation: {}", e.getMessage());
+		}
+	}
+
+	/**
+	 * Generates an image of what currently is drawn on the canvas.
+	 * <p>
+	 * Throws an {@link ActivitiException} when {@link #close()} is already
+	 * called.
+	 */
+	public InputStream generateImage(String imageType) {
+		if (closed) {
+			throw new ActivitiImageException("ProcessDiagramGenerator already closed");
+		}
+
+		ByteArrayOutputStream out = new ByteArrayOutputStream();
+		try {
+			ImageIO.write(processDiagram, imageType, out);
+
+		} catch (IOException e) {
+			throw new ActivitiImageException("Error while generating process image", e);
+		} finally {
+			try {
+				if (out != null) {
+					out.close();
+				}
+			} catch (IOException ignore) {
+				// Exception is silently ignored
+			}
+		}
+		return new ByteArrayInputStream(out.toByteArray());
+	}
+
+	/**
+	 * Generates an image of what currently is drawn on the canvas.
+	 * <p>
+	 * Throws an {@link ActivitiException} when {@link #close()} is already
+	 * called.
+	 */
+	public BufferedImage generateBufferedImage(String imageType) {
+		if (closed) {
+			throw new ActivitiImageException("ProcessDiagramGenerator already closed");
+		}
+
+		// Try to remove white space
+		minX = (minX <= 5) ? 5 : minX;
+		minY = (minY <= 5) ? 5 : minY;
+		BufferedImage imageToSerialize = processDiagram;
+		if (minX >= 0 && minY >= 0) {
+			imageToSerialize = processDiagram.getSubimage(minX - 5, minY - 5, canvasWidth - minX + 5, canvasHeight - minY + 5);
+		}
+		return imageToSerialize;
+	}
+
+	/**
+	 * Closes the canvas which dissallows further drawing and releases graphical
+	 * resources.
+	 */
+	public void close() {
+		g.dispose();
+		closed = true;
+	}
+
+	public void drawNoneStartEvent(GraphicInfo graphicInfo) {
+		drawStartEvent(graphicInfo, null, 1.0);
+	}
+
+	public void drawTimerStartEvent(GraphicInfo graphicInfo, double scaleFactor) {
+		drawStartEvent(graphicInfo, TIMER_IMAGE, scaleFactor);
+	}
+
+	public void drawSignalStartEvent(GraphicInfo graphicInfo, double scaleFactor) {
+		drawStartEvent(graphicInfo, SIGNAL_CATCH_IMAGE, scaleFactor);
+	}
+
+	public void drawMessageStartEvent(GraphicInfo graphicInfo, double scaleFactor) {
+		drawStartEvent(graphicInfo, MESSAGE_CATCH_IMAGE, scaleFactor);
+	}
+
+	public void drawStartEvent(GraphicInfo graphicInfo, BufferedImage image, double scaleFactor) {
+		Paint originalPaint = g.getPaint();
+		g.setPaint(EVENT_COLOR);
 //    g.setPaint(new Color(36,202,88));
-    Ellipse2D circle = new Ellipse2D.Double(graphicInfo.getX(), graphicInfo.getY(),
-        graphicInfo.getWidth(), graphicInfo.getHeight());
-    g.fill(circle);
-    g.setPaint(EVENT_BORDER_COLOR);
-    g.draw(circle);
-    g.setPaint(originalPaint);
-    if (image != null) {
-      // calculate coordinates to center image
-      int imageX = (int) Math.round(graphicInfo.getX() + (graphicInfo.getWidth() / 2) - (image.getWidth() / 2 * scaleFactor));
-      int imageY = (int) Math.round(graphicInfo.getY() + (graphicInfo.getHeight() / 2) - (image.getHeight() / 2 * scaleFactor));
-      g.drawImage(image, imageX, imageY,
-          (int) (image.getWidth() / scaleFactor), (int) (image.getHeight() / scaleFactor), null);
-    }
-
-  }
-
-  public void drawNoneEndEvent(GraphicInfo graphicInfo, double scaleFactor) {
-    Paint originalPaint = g.getPaint();
-    Stroke originalStroke = g.getStroke();
-    g.setPaint(new Color(255,255,255));
-    Ellipse2D circle = new Ellipse2D.Double(graphicInfo.getX(), graphicInfo.getY(),
-        graphicInfo.getWidth(), graphicInfo.getHeight());
-    g.fill(circle);
-    g.setPaint(EVENT_BORDER_COLOR);
-    if (scaleFactor == 1.0) {
-      g.setStroke(END_EVENT_STROKE);
-    } else {
-      g.setStroke(new BasicStroke(2.0f));
-    }
-    g.draw(circle);
-    g.setStroke(originalStroke);
-    g.setPaint(originalPaint);
-  }
-
-  public void drawErrorEndEvent(String name, GraphicInfo graphicInfo, double scaleFactor) {
-    drawErrorEndEvent(graphicInfo, scaleFactor);
-    if (scaleFactor == 1.0) {
-      drawLabel(name, graphicInfo);
-    }
-  }
-
-  public void drawErrorEndEvent(GraphicInfo graphicInfo, double scaleFactor) {
-    drawNoneEndEvent(graphicInfo, scaleFactor);
-    g.drawImage(ERROR_THROW_IMAGE, (int) (graphicInfo.getX() + (graphicInfo.getWidth() / 4)),
-        (int) (graphicInfo.getY() + (graphicInfo.getHeight() / 4)),
-        (int) (ERROR_THROW_IMAGE.getWidth() / scaleFactor),
-        (int) (ERROR_THROW_IMAGE.getHeight() / scaleFactor), null);
-  }
-
-  public void drawErrorStartEvent(GraphicInfo graphicInfo, double scaleFactor) {
-    drawNoneStartEvent(graphicInfo);
-    g.drawImage(ERROR_CATCH_IMAGE, (int) (graphicInfo.getX() + (graphicInfo.getWidth() / 4)),
-        (int) (graphicInfo.getY() + (graphicInfo.getHeight() / 4)),
-        (int) (ERROR_CATCH_IMAGE.getWidth() / scaleFactor),
-        (int) (ERROR_CATCH_IMAGE.getHeight() / scaleFactor), null);
-  }
-
-  public void drawCatchingEvent(GraphicInfo graphicInfo, boolean isInterrupting,
-      BufferedImage image, String eventType, double scaleFactor) {
-
-    // event circles
-    Ellipse2D outerCircle = new Ellipse2D.Double(graphicInfo.getX(), graphicInfo.getY(),
-        graphicInfo.getWidth(), graphicInfo.getHeight());
-    int innerCircleSize = (int) (4 / scaleFactor);
-    if (innerCircleSize == 0) {
-      innerCircleSize = 1;
-    }
-    int innerCircleX = (int) graphicInfo.getX() + innerCircleSize;
-    int innerCircleY = (int) graphicInfo.getY() + innerCircleSize;
-    int innerCircleWidth = (int) graphicInfo.getWidth() - (2 * innerCircleSize);
-    int innerCircleHeight = (int) graphicInfo.getHeight() - (2 * innerCircleSize);
-    Ellipse2D innerCircle = new Ellipse2D.Double(innerCircleX, innerCircleY, innerCircleWidth, innerCircleHeight);
-
-    Paint originalPaint = g.getPaint();
-    Stroke originalStroke = g.getStroke();
-    g.setPaint(EVENT_COLOR);
-    g.fill(outerCircle);
-
-    g.setPaint(EVENT_BORDER_COLOR);
-    if (isInterrupting == false)
-      g.setStroke(NON_INTERRUPTING_EVENT_STROKE);
-    g.draw(outerCircle);
-    g.setStroke(originalStroke);
-    g.setPaint(originalPaint);
-    g.draw(innerCircle);
-
-    if (image != null) {
-      // calculate coordinates to center image
-      int imageX = (int) (graphicInfo.getX() + (graphicInfo.getWidth() / 2) - (image.getWidth() / 2 * scaleFactor));
-      int imageY = (int) (graphicInfo.getY() + (graphicInfo.getHeight() / 2) - (image.getHeight() / 2 * scaleFactor));
-      if (scaleFactor == 1.0 && "timer".equals(eventType)) {
-        // move image one pixel to center timer image
-        imageX++;
-        imageY++;
-      }
-      g.drawImage(image, imageX, imageY, (int) (image.getWidth() / scaleFactor),
-          (int) (image.getHeight() / scaleFactor), null);
-    }
-  }
-
-  public void drawCatchingCompensateEvent(String name, GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
-    drawCatchingCompensateEvent(graphicInfo, isInterrupting, scaleFactor);
-    drawLabel(name, graphicInfo);
-  }
-
-  public void drawCatchingCompensateEvent(GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
-    drawCatchingEvent(graphicInfo, isInterrupting, COMPENSATE_CATCH_IMAGE, "compensate", scaleFactor);
-  }
-
-  public void drawCatchingTimerEvent(String name, GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
-    drawCatchingTimerEvent(graphicInfo, isInterrupting, scaleFactor);
-    drawLabel(name, graphicInfo);
-  }
-
-  public void drawCatchingTimerEvent(GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
-    drawCatchingEvent(graphicInfo, isInterrupting, TIMER_IMAGE, "timer", scaleFactor);
-  }
-
-  public void drawCatchingErrorEvent(String name, GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
-    drawCatchingErrorEvent(graphicInfo, isInterrupting, scaleFactor);
-    drawLabel(name, graphicInfo);
-  }
-
-  public void drawCatchingErrorEvent(GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
-    drawCatchingEvent(graphicInfo, isInterrupting, ERROR_CATCH_IMAGE, "error", scaleFactor);
-  }
-
-  public void drawCatchingSignalEvent(String name, GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
-    drawCatchingSignalEvent(graphicInfo, isInterrupting, scaleFactor);
-    drawLabel(name, graphicInfo);
-  }
-
-  public void drawCatchingSignalEvent(GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
-    drawCatchingEvent(graphicInfo, isInterrupting, SIGNAL_CATCH_IMAGE, "signal", scaleFactor);
-  }
-
-  public void drawCatchingMessageEvent(GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
-    drawCatchingEvent(graphicInfo, isInterrupting, MESSAGE_CATCH_IMAGE, "message", scaleFactor);
-  }
-
-  public void drawCatchingMessageEvent(String name, GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
-    drawCatchingEvent(graphicInfo, isInterrupting, MESSAGE_CATCH_IMAGE, "message", scaleFactor);
-    drawLabel(name, graphicInfo);
-  }
-
-  public void drawThrowingCompensateEvent(GraphicInfo graphicInfo, double scaleFactor) {
-    drawCatchingEvent(graphicInfo, true, COMPENSATE_THROW_IMAGE, "compensate", scaleFactor);
-  }
-
-  public void drawThrowingSignalEvent(GraphicInfo graphicInfo, double scaleFactor) {
-    drawCatchingEvent(graphicInfo, true, SIGNAL_THROW_IMAGE, "signal", scaleFactor);
-  }
-
-  public void drawThrowingNoneEvent(GraphicInfo graphicInfo, double scaleFactor) {
-    drawCatchingEvent(graphicInfo, true, null, "none", scaleFactor);
-  }
-
-  public void drawSequenceflow(int srcX, int srcY, int targetX, int targetY, boolean conditional, double scaleFactor) {
-    drawSequenceflow(srcX, srcY, targetX, targetY, conditional, false, scaleFactor);
-  }
-
-  public void drawSequenceflow(int srcX, int srcY, int targetX, int targetY, boolean conditional, boolean highLighted, double scaleFactor) {
-    Paint originalPaint = g.getPaint();
-    if (highLighted)
-      g.setPaint(HIGHLIGHT_COLOR);
-
-    Line2D.Double line = new Line2D.Double(srcX, srcY, targetX, targetY);
-    g.draw(line);
-    drawArrowHead(line, scaleFactor);
-
-    if (conditional) {
-      drawConditionalSequenceFlowIndicator(line, scaleFactor);
-    }
-
-    if (highLighted)
-      g.setPaint(originalPaint);
-  }
-
-  public void drawAssociation(int[] xPoints, int[] yPoints, AssociationDirection associationDirection, boolean highLighted, double scaleFactor) {
-    boolean conditional = false, isDefault = false;
-    drawConnection(xPoints, yPoints, conditional, isDefault, "association", associationDirection, highLighted, scaleFactor);
-  }
-
-  public void drawSequenceflow(int[] xPoints, int[] yPoints, boolean conditional, boolean isDefault, boolean highLighted, double scaleFactor) {
-	  drawConnection(xPoints, yPoints, conditional, isDefault, "sequenceFlow", AssociationDirection.ONE, highLighted, scaleFactor);
-  }
-
-  public void drawConnection(int[] xPoints, int[] yPoints, boolean conditional, boolean isDefault, String connectionType,
-      AssociationDirection associationDirection, boolean highLighted, double scaleFactor) {
-
-    Paint originalPaint = g.getPaint();
-    Stroke originalStroke = g.getStroke();
-
-    g.setPaint(CONNECTION_COLOR);
-    if (connectionType.equals("association")) {
-      g.setStroke(ASSOCIATION_STROKE);
-    } else if (highLighted) {
-      g.setPaint(HIGHLIGHT_COLOR);
-      g.setStroke(HIGHLIGHT_FLOW_STROKE);
-    }
-
-    for (int i=1; i<xPoints.length; i++) {
-      Integer sourceX = xPoints[i - 1];
-      Integer sourceY = yPoints[i - 1];
-      Integer targetX = xPoints[i];
-      Integer targetY = yPoints[i];
-      Line2D.Double line = new Line2D.Double(sourceX, sourceY, targetX, targetY);
-      g.draw(line);
-    }
-
-    if (isDefault){
-      Line2D.Double line = new Line2D.Double(xPoints[0], yPoints[0], xPoints[1], yPoints[1]);
-      drawDefaultSequenceFlowIndicator(line, scaleFactor);
-    }
-
-    if (conditional) {
-      Line2D.Double line = new Line2D.Double(xPoints[0], yPoints[0], xPoints[1], yPoints[1]);
-      drawConditionalSequenceFlowIndicator(line, scaleFactor);
-    }
-
-    if (associationDirection.equals(AssociationDirection.ONE) || associationDirection.equals(AssociationDirection.BOTH)) {
-      Line2D.Double line = new Line2D.Double(xPoints[xPoints.length-2], yPoints[xPoints.length-2], xPoints[xPoints.length-1], yPoints[xPoints.length-1]);
-      drawArrowHead(line, scaleFactor);
-    }
-    if (associationDirection.equals(AssociationDirection.BOTH)) {
-      Line2D.Double line = new Line2D.Double(xPoints[1], yPoints[1], xPoints[0], yPoints[0]);
-      drawArrowHead(line, scaleFactor);
-    }
-    g.setPaint(originalPaint);
-    g.setStroke(originalStroke);
-  }
-
-  public void drawSequenceflowWithoutArrow(int srcX, int srcY, int targetX, int targetY, boolean conditional, double scaleFactor) {
-    drawSequenceflowWithoutArrow(srcX, srcY, targetX, targetY, conditional, false, scaleFactor);
-  }
-
-  public void drawSequenceflowWithoutArrow(int srcX, int srcY, int targetX, int targetY, boolean conditional, boolean highLighted, double scaleFactor) {
-    Paint originalPaint = g.getPaint();
-    if (highLighted)
-      g.setPaint(HIGHLIGHT_COLOR);
-
-    Line2D.Double line = new Line2D.Double(srcX, srcY, targetX, targetY);
-    g.draw(line);
-
-    if (conditional) {
-      drawConditionalSequenceFlowIndicator(line, scaleFactor);
-    }
-
-    if (highLighted)
-      g.setPaint(originalPaint);
-  }
-
-  public void drawArrowHead(Line2D.Double line, double scaleFactor) {
-    int doubleArrowWidth = (int) (2 * ARROW_WIDTH / scaleFactor);
-    if (doubleArrowWidth == 0) {
-      doubleArrowWidth = 2;
-    }
-    Polygon arrowHead = new Polygon();
-    arrowHead.addPoint(0, 0);
-    int arrowHeadPoint = (int) (-ARROW_WIDTH / scaleFactor);
-    if (arrowHeadPoint == 0) {
-      arrowHeadPoint = -1;
-    }
-    arrowHead.addPoint(arrowHeadPoint, -doubleArrowWidth);
-    arrowHeadPoint = (int) (ARROW_WIDTH / scaleFactor);
-    if (arrowHeadPoint == 0) {
-      arrowHeadPoint = 1;
-    }
-    arrowHead.addPoint(arrowHeadPoint, -doubleArrowWidth);
-
-    AffineTransform transformation = new AffineTransform();
-    transformation.setToIdentity();
-    double angle = Math.atan2(line.y2 - line.y1, line.x2 - line.x1);
-    transformation.translate(line.x2, line.y2);
-    transformation.rotate((angle - Math.PI / 2d));
-
-    AffineTransform originalTransformation = g.getTransform();
-    g.setTransform(transformation);
-    g.fill(arrowHead);
-    g.setTransform(originalTransformation);
-  }
-
-  public void drawDefaultSequenceFlowIndicator(Line2D.Double line, double scaleFactor) {
-    double length = DEFAULT_INDICATOR_WIDTH / scaleFactor, halfOfLength = length/2, f = 8;
-    Line2D.Double defaultIndicator = new Line2D.Double(-halfOfLength, 0, halfOfLength, 0);
-
-    double angle = Math.atan2(line.y2 - line.y1, line.x2 - line.x1);
-    double dx = f * Math.cos(angle), dy = f * Math.sin(angle),
-	       x1 = line.x1 + dx, y1 = line.y1 + dy;
-
-    AffineTransform transformation = new AffineTransform();
-    transformation.setToIdentity();
-    transformation.translate(x1, y1);
-    transformation.rotate((angle - 3 * Math.PI / 4));
-
-    AffineTransform originalTransformation = g.getTransform();
-    g.setTransform(transformation);
-    g.draw(defaultIndicator);
-
-    g.setTransform(originalTransformation);
-  }
-
-  public void drawConditionalSequenceFlowIndicator(Line2D.Double line, double scaleFactor) {
-    if (scaleFactor > 1.0) return;
-    int horizontal = (int) (CONDITIONAL_INDICATOR_WIDTH * 0.7);
-    int halfOfHorizontal = horizontal / 2;
-    int halfOfVertical = CONDITIONAL_INDICATOR_WIDTH / 2;
-
-    Polygon conditionalIndicator = new Polygon();
-    conditionalIndicator.addPoint(0, 0);
-    conditionalIndicator.addPoint(-halfOfHorizontal, halfOfVertical);
-    conditionalIndicator.addPoint(0, CONDITIONAL_INDICATOR_WIDTH);
-    conditionalIndicator.addPoint(halfOfHorizontal, halfOfVertical);
-
-    AffineTransform transformation = new AffineTransform();
-    transformation.setToIdentity();
-    double angle = Math.atan2(line.y2 - line.y1, line.x2 - line.x1);
-    transformation.translate(line.x1, line.y1);
-    transformation.rotate((angle - Math.PI / 2d));
-
-    AffineTransform originalTransformation = g.getTransform();
-    g.setTransform(transformation);
-    g.draw(conditionalIndicator);
-
-    Paint originalPaint = g.getPaint();
-    g.setPaint(CONDITIONAL_INDICATOR_COLOR);
-    g.fill(conditionalIndicator);
-
-    g.setPaint(originalPaint);
-    g.setTransform(originalTransformation);
-  }
-
-  public void drawTask(BufferedImage icon, String name, GraphicInfo graphicInfo, double scaleFactor) {
-    drawTask(name, graphicInfo);
-    g.drawImage(icon, (int) (graphicInfo.getX() + ICON_PADDING / scaleFactor),
-        (int) (graphicInfo.getY() + ICON_PADDING / scaleFactor),
-        (int) (icon.getWidth() / scaleFactor), (int) (icon.getHeight() / scaleFactor), null);
-  }
-
-  public void drawTask(String name, GraphicInfo graphicInfo) {
-    drawTask(name, graphicInfo, false);
-  }
-
-  public void drawPoolOrLane(String name, GraphicInfo graphicInfo) {
-    int x = (int) graphicInfo.getX();
-    int y = (int) graphicInfo.getY();
-    int width = (int) graphicInfo.getWidth();
-    int height = (int) graphicInfo.getHeight();
-    g.drawRect(x, y, width, height);
-
-    // Add the name as text, vertical
-    if(name != null && name.length() > 0) {
-      // Include some padding
-      int availableTextSpace = height - 6;
-
-      // Create rotation for derived font
-      AffineTransform transformation = new AffineTransform();
-      transformation.setToIdentity();
-      transformation.rotate(270 * Math.PI/180);
-
-      Font currentFont = g.getFont();
-      Font theDerivedFont = currentFont.deriveFont(transformation);
-      g.setFont(theDerivedFont);
-
-      String truncated = fitTextToWidth(name, availableTextSpace);
-      int realWidth = fontMetrics.stringWidth(truncated);
-
-      g.drawString(truncated, x + 2 + fontMetrics.getHeight(), 3 + y + availableTextSpace - (availableTextSpace - realWidth) / 2);
-      g.setFont(currentFont);
-    }
-  }
-
-  protected void drawTask(String name, GraphicInfo graphicInfo, boolean thickBorder) {
-    Paint originalPaint = g.getPaint();
-    int x = (int) graphicInfo.getX();
-    int y = (int) graphicInfo.getY();
-    int width = (int) graphicInfo.getWidth();
-    int height = (int) graphicInfo.getHeight();
-
-    // Create a new gradient paint for every task box, gradient depends on x and y and is not relative
+		Ellipse2D circle = new Ellipse2D.Double(graphicInfo.getX(), graphicInfo.getY(),
+			graphicInfo.getWidth(), graphicInfo.getHeight());
+		g.fill(circle);
+		g.setPaint(EVENT_BORDER_COLOR);
+		g.draw(circle);
+		g.setPaint(originalPaint);
+		if (image != null) {
+			// calculate coordinates to center image
+			int imageX = (int) Math.round(graphicInfo.getX() + (graphicInfo.getWidth() / 2) - (image.getWidth() / 2 * scaleFactor));
+			int imageY = (int) Math.round(graphicInfo.getY() + (graphicInfo.getHeight() / 2) - (image.getHeight() / 2 * scaleFactor));
+			g.drawImage(image, imageX, imageY,
+				(int) (image.getWidth() / scaleFactor), (int) (image.getHeight() / scaleFactor), null);
+		}
+
+	}
+
+	public void drawNoneEndEvent(GraphicInfo graphicInfo, double scaleFactor) {
+		Paint originalPaint = g.getPaint();
+		Stroke originalStroke = g.getStroke();
+		g.setPaint(new Color(255, 255, 255));
+		Ellipse2D circle = new Ellipse2D.Double(graphicInfo.getX(), graphicInfo.getY(),
+			graphicInfo.getWidth(), graphicInfo.getHeight());
+		g.fill(circle);
+		g.setPaint(EVENT_BORDER_COLOR);
+		if (scaleFactor == 1.0) {
+			g.setStroke(END_EVENT_STROKE);
+		} else {
+			g.setStroke(new BasicStroke(2.0f));
+		}
+		g.draw(circle);
+		g.setStroke(originalStroke);
+		g.setPaint(originalPaint);
+	}
+
+	public void drawErrorEndEvent(String name, GraphicInfo graphicInfo, double scaleFactor) {
+		drawErrorEndEvent(graphicInfo, scaleFactor);
+		if (scaleFactor == 1.0) {
+			drawLabel(name, graphicInfo);
+		}
+	}
+
+	public void drawErrorEndEvent(GraphicInfo graphicInfo, double scaleFactor) {
+		drawNoneEndEvent(graphicInfo, scaleFactor);
+		g.drawImage(ERROR_THROW_IMAGE, (int) (graphicInfo.getX() + (graphicInfo.getWidth() / 4)),
+			(int) (graphicInfo.getY() + (graphicInfo.getHeight() / 4)),
+			(int) (ERROR_THROW_IMAGE.getWidth() / scaleFactor),
+			(int) (ERROR_THROW_IMAGE.getHeight() / scaleFactor), null);
+	}
+
+	public void drawErrorStartEvent(GraphicInfo graphicInfo, double scaleFactor) {
+		drawNoneStartEvent(graphicInfo);
+		g.drawImage(ERROR_CATCH_IMAGE, (int) (graphicInfo.getX() + (graphicInfo.getWidth() / 4)),
+			(int) (graphicInfo.getY() + (graphicInfo.getHeight() / 4)),
+			(int) (ERROR_CATCH_IMAGE.getWidth() / scaleFactor),
+			(int) (ERROR_CATCH_IMAGE.getHeight() / scaleFactor), null);
+	}
+
+	public void drawCatchingEvent(GraphicInfo graphicInfo, boolean isInterrupting,
+								  BufferedImage image, String eventType, double scaleFactor) {
+
+		// event circles
+		Ellipse2D outerCircle = new Ellipse2D.Double(graphicInfo.getX(), graphicInfo.getY(),
+			graphicInfo.getWidth(), graphicInfo.getHeight());
+		int innerCircleSize = (int) (4 / scaleFactor);
+		if (innerCircleSize == 0) {
+			innerCircleSize = 1;
+		}
+		int innerCircleX = (int) graphicInfo.getX() + innerCircleSize;
+		int innerCircleY = (int) graphicInfo.getY() + innerCircleSize;
+		int innerCircleWidth = (int) graphicInfo.getWidth() - (2 * innerCircleSize);
+		int innerCircleHeight = (int) graphicInfo.getHeight() - (2 * innerCircleSize);
+		Ellipse2D innerCircle = new Ellipse2D.Double(innerCircleX, innerCircleY, innerCircleWidth, innerCircleHeight);
+
+		Paint originalPaint = g.getPaint();
+		Stroke originalStroke = g.getStroke();
+		g.setPaint(EVENT_COLOR);
+		g.fill(outerCircle);
+
+		g.setPaint(EVENT_BORDER_COLOR);
+		if (isInterrupting == false)
+			g.setStroke(NON_INTERRUPTING_EVENT_STROKE);
+		g.draw(outerCircle);
+		g.setStroke(originalStroke);
+		g.setPaint(originalPaint);
+		g.draw(innerCircle);
+
+		if (image != null) {
+			// calculate coordinates to center image
+			int imageX = (int) (graphicInfo.getX() + (graphicInfo.getWidth() / 2) - (image.getWidth() / 2 * scaleFactor));
+			int imageY = (int) (graphicInfo.getY() + (graphicInfo.getHeight() / 2) - (image.getHeight() / 2 * scaleFactor));
+			if (scaleFactor == 1.0 && "timer".equals(eventType)) {
+				// move image one pixel to center timer image
+				imageX++;
+				imageY++;
+			}
+			g.drawImage(image, imageX, imageY, (int) (image.getWidth() / scaleFactor),
+				(int) (image.getHeight() / scaleFactor), null);
+		}
+	}
+
+	public void drawCatchingCompensateEvent(String name, GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
+		drawCatchingCompensateEvent(graphicInfo, isInterrupting, scaleFactor);
+		drawLabel(name, graphicInfo);
+	}
+
+	public void drawCatchingCompensateEvent(GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
+		drawCatchingEvent(graphicInfo, isInterrupting, COMPENSATE_CATCH_IMAGE, "compensate", scaleFactor);
+	}
+
+	public void drawCatchingTimerEvent(String name, GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
+		drawCatchingTimerEvent(graphicInfo, isInterrupting, scaleFactor);
+		drawLabel(name, graphicInfo);
+	}
+
+	public void drawCatchingTimerEvent(GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
+		drawCatchingEvent(graphicInfo, isInterrupting, TIMER_IMAGE, "timer", scaleFactor);
+	}
+
+	public void drawCatchingErrorEvent(String name, GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
+		drawCatchingErrorEvent(graphicInfo, isInterrupting, scaleFactor);
+		drawLabel(name, graphicInfo);
+	}
+
+	public void drawCatchingErrorEvent(GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
+		drawCatchingEvent(graphicInfo, isInterrupting, ERROR_CATCH_IMAGE, "error", scaleFactor);
+	}
+
+	public void drawCatchingSignalEvent(String name, GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
+		drawCatchingSignalEvent(graphicInfo, isInterrupting, scaleFactor);
+		drawLabel(name, graphicInfo);
+	}
+
+	public void drawCatchingSignalEvent(GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
+		drawCatchingEvent(graphicInfo, isInterrupting, SIGNAL_CATCH_IMAGE, "signal", scaleFactor);
+	}
+
+	public void drawCatchingMessageEvent(GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
+		drawCatchingEvent(graphicInfo, isInterrupting, MESSAGE_CATCH_IMAGE, "message", scaleFactor);
+	}
+
+	public void drawCatchingMessageEvent(String name, GraphicInfo graphicInfo, boolean isInterrupting, double scaleFactor) {
+		drawCatchingEvent(graphicInfo, isInterrupting, MESSAGE_CATCH_IMAGE, "message", scaleFactor);
+		drawLabel(name, graphicInfo);
+	}
+
+	public void drawThrowingCompensateEvent(GraphicInfo graphicInfo, double scaleFactor) {
+		drawCatchingEvent(graphicInfo, true, COMPENSATE_THROW_IMAGE, "compensate", scaleFactor);
+	}
+
+	public void drawThrowingSignalEvent(GraphicInfo graphicInfo, double scaleFactor) {
+		drawCatchingEvent(graphicInfo, true, SIGNAL_THROW_IMAGE, "signal", scaleFactor);
+	}
+
+	public void drawThrowingNoneEvent(GraphicInfo graphicInfo, double scaleFactor) {
+		drawCatchingEvent(graphicInfo, true, null, "none", scaleFactor);
+	}
+
+	public void drawSequenceflow(int srcX, int srcY, int targetX, int targetY, boolean conditional, double scaleFactor) {
+		drawSequenceflow(srcX, srcY, targetX, targetY, conditional, false, scaleFactor);
+	}
+
+	public void drawSequenceflow(int srcX, int srcY, int targetX, int targetY, boolean conditional, boolean highLighted, double scaleFactor) {
+		Paint originalPaint = g.getPaint();
+		if (highLighted)
+			g.setPaint(HIGHLIGHT_COLOR);
+
+		Line2D.Double line = new Line2D.Double(srcX, srcY, targetX, targetY);
+		g.draw(line);
+		drawArrowHead(line, scaleFactor);
+
+		if (conditional) {
+			drawConditionalSequenceFlowIndicator(line, scaleFactor);
+		}
+
+		if (highLighted)
+			g.setPaint(originalPaint);
+	}
+
+	public void drawAssociation(int[] xPoints, int[] yPoints, AssociationDirection associationDirection, boolean highLighted, double scaleFactor) {
+		boolean conditional = false, isDefault = false;
+		drawConnection(xPoints, yPoints, conditional, isDefault, "association", associationDirection, highLighted, scaleFactor);
+	}
+
+	public void drawSequenceflow(int[] xPoints, int[] yPoints, boolean conditional, boolean isDefault, boolean highLighted, double scaleFactor) {
+		drawConnection(xPoints, yPoints, conditional, isDefault, "sequenceFlow", AssociationDirection.ONE, highLighted, scaleFactor);
+	}
+
+	public void drawConnection(int[] xPoints, int[] yPoints, boolean conditional, boolean isDefault, String connectionType,
+							   AssociationDirection associationDirection, boolean highLighted, double scaleFactor) {
+
+		Paint originalPaint = g.getPaint();
+		Stroke originalStroke = g.getStroke();
+
+		g.setPaint(CONNECTION_COLOR);
+		if (connectionType.equals("association")) {
+			g.setStroke(ASSOCIATION_STROKE);
+		} else if (highLighted) {
+			g.setPaint(HIGHLIGHT_COLOR);
+			g.setStroke(HIGHLIGHT_FLOW_STROKE);
+		}
+
+		for (int i = 1; i < xPoints.length; i++) {
+			Integer sourceX = xPoints[i - 1];
+			Integer sourceY = yPoints[i - 1];
+			Integer targetX = xPoints[i];
+			Integer targetY = yPoints[i];
+			Line2D.Double line = new Line2D.Double(sourceX, sourceY, targetX, targetY);
+			g.draw(line);
+		}
+
+		if (isDefault) {
+			Line2D.Double line = new Line2D.Double(xPoints[0], yPoints[0], xPoints[1], yPoints[1]);
+			drawDefaultSequenceFlowIndicator(line, scaleFactor);
+		}
+
+		if (conditional) {
+			Line2D.Double line = new Line2D.Double(xPoints[0], yPoints[0], xPoints[1], yPoints[1]);
+			drawConditionalSequenceFlowIndicator(line, scaleFactor);
+		}
+
+		if (associationDirection.equals(AssociationDirection.ONE) || associationDirection.equals(AssociationDirection.BOTH)) {
+			Line2D.Double line = new Line2D.Double(xPoints[xPoints.length - 2], yPoints[xPoints.length - 2], xPoints[xPoints.length - 1], yPoints[xPoints.length - 1]);
+			drawArrowHead(line, scaleFactor);
+		}
+		if (associationDirection.equals(AssociationDirection.BOTH)) {
+			Line2D.Double line = new Line2D.Double(xPoints[1], yPoints[1], xPoints[0], yPoints[0]);
+			drawArrowHead(line, scaleFactor);
+		}
+		g.setPaint(originalPaint);
+		g.setStroke(originalStroke);
+	}
+
+	public void drawSequenceflowWithoutArrow(int srcX, int srcY, int targetX, int targetY, boolean conditional, double scaleFactor) {
+		drawSequenceflowWithoutArrow(srcX, srcY, targetX, targetY, conditional, false, scaleFactor);
+	}
+
+	public void drawSequenceflowWithoutArrow(int srcX, int srcY, int targetX, int targetY, boolean conditional, boolean highLighted, double scaleFactor) {
+		Paint originalPaint = g.getPaint();
+		if (highLighted)
+			g.setPaint(HIGHLIGHT_COLOR);
+
+		Line2D.Double line = new Line2D.Double(srcX, srcY, targetX, targetY);
+		g.draw(line);
+
+		if (conditional) {
+			drawConditionalSequenceFlowIndicator(line, scaleFactor);
+		}
+
+		if (highLighted)
+			g.setPaint(originalPaint);
+	}
+
+	public void drawArrowHead(Line2D.Double line, double scaleFactor) {
+		int doubleArrowWidth = (int) (2 * ARROW_WIDTH / scaleFactor);
+		if (doubleArrowWidth == 0) {
+			doubleArrowWidth = 2;
+		}
+		Polygon arrowHead = new Polygon();
+		arrowHead.addPoint(0, 0);
+		int arrowHeadPoint = (int) (-ARROW_WIDTH / scaleFactor);
+		if (arrowHeadPoint == 0) {
+			arrowHeadPoint = -1;
+		}
+		arrowHead.addPoint(arrowHeadPoint, -doubleArrowWidth);
+		arrowHeadPoint = (int) (ARROW_WIDTH / scaleFactor);
+		if (arrowHeadPoint == 0) {
+			arrowHeadPoint = 1;
+		}
+		arrowHead.addPoint(arrowHeadPoint, -doubleArrowWidth);
+
+		AffineTransform transformation = new AffineTransform();
+		transformation.setToIdentity();
+		double angle = Math.atan2(line.y2 - line.y1, line.x2 - line.x1);
+		transformation.translate(line.x2, line.y2);
+		transformation.rotate((angle - Math.PI / 2d));
+
+		AffineTransform originalTransformation = g.getTransform();
+		g.setTransform(transformation);
+		g.fill(arrowHead);
+		g.setTransform(originalTransformation);
+	}
+
+	public void drawDefaultSequenceFlowIndicator(Line2D.Double line, double scaleFactor) {
+		double length = DEFAULT_INDICATOR_WIDTH / scaleFactor, halfOfLength = length / 2, f = 8;
+		Line2D.Double defaultIndicator = new Line2D.Double(-halfOfLength, 0, halfOfLength, 0);
+
+		double angle = Math.atan2(line.y2 - line.y1, line.x2 - line.x1);
+		double dx = f * Math.cos(angle), dy = f * Math.sin(angle),
+			x1 = line.x1 + dx, y1 = line.y1 + dy;
+
+		AffineTransform transformation = new AffineTransform();
+		transformation.setToIdentity();
+		transformation.translate(x1, y1);
+		transformation.rotate((angle - 3 * Math.PI / 4));
+
+		AffineTransform originalTransformation = g.getTransform();
+		g.setTransform(transformation);
+		g.draw(defaultIndicator);
+
+		g.setTransform(originalTransformation);
+	}
+
+	public void drawConditionalSequenceFlowIndicator(Line2D.Double line, double scaleFactor) {
+		if (scaleFactor > 1.0) return;
+		int horizontal = (int) (CONDITIONAL_INDICATOR_WIDTH * 0.7);
+		int halfOfHorizontal = horizontal / 2;
+		int halfOfVertical = CONDITIONAL_INDICATOR_WIDTH / 2;
+
+		Polygon conditionalIndicator = new Polygon();
+		conditionalIndicator.addPoint(0, 0);
+		conditionalIndicator.addPoint(-halfOfHorizontal, halfOfVertical);
+		conditionalIndicator.addPoint(0, CONDITIONAL_INDICATOR_WIDTH);
+		conditionalIndicator.addPoint(halfOfHorizontal, halfOfVertical);
+
+		AffineTransform transformation = new AffineTransform();
+		transformation.setToIdentity();
+		double angle = Math.atan2(line.y2 - line.y1, line.x2 - line.x1);
+		transformation.translate(line.x1, line.y1);
+		transformation.rotate((angle - Math.PI / 2d));
+
+		AffineTransform originalTransformation = g.getTransform();
+		g.setTransform(transformation);
+		g.draw(conditionalIndicator);
+
+		Paint originalPaint = g.getPaint();
+		g.setPaint(CONDITIONAL_INDICATOR_COLOR);
+		g.fill(conditionalIndicator);
+
+		g.setPaint(originalPaint);
+		g.setTransform(originalTransformation);
+	}
+
+	public void drawTask(BufferedImage icon, String name, GraphicInfo graphicInfo, double scaleFactor) {
+		drawTask(name, graphicInfo);
+		g.drawImage(icon, (int) (graphicInfo.getX() + ICON_PADDING / scaleFactor),
+			(int) (graphicInfo.getY() + ICON_PADDING / scaleFactor),
+			(int) (icon.getWidth() / scaleFactor), (int) (icon.getHeight() / scaleFactor), null);
+	}
+
+	public void drawTask(String name, GraphicInfo graphicInfo) {
+		drawTask(name, graphicInfo, false);
+	}
+
+	public void drawPoolOrLane(String name, GraphicInfo graphicInfo) {
+		int x = (int) graphicInfo.getX();
+		int y = (int) graphicInfo.getY();
+		int width = (int) graphicInfo.getWidth();
+		int height = (int) graphicInfo.getHeight();
+		g.drawRect(x, y, width, height);
+
+		// Add the name as text, vertical
+		if (name != null && name.length() > 0) {
+			// Include some padding
+			int availableTextSpace = height - 6;
+
+			// Create rotation for derived font
+			AffineTransform transformation = new AffineTransform();
+			transformation.setToIdentity();
+			transformation.rotate(270 * Math.PI / 180);
+
+			Font currentFont = g.getFont();
+			Font theDerivedFont = currentFont.deriveFont(transformation);
+			g.setFont(theDerivedFont);
+
+			String truncated = fitTextToWidth(name, availableTextSpace);
+			int realWidth = fontMetrics.stringWidth(truncated);
+
+			g.drawString(truncated, x + 2 + fontMetrics.getHeight(), 3 + y + availableTextSpace - (availableTextSpace - realWidth) / 2);
+			g.setFont(currentFont);
+		}
+	}
+
+	protected void drawTask(String name, GraphicInfo graphicInfo, boolean thickBorder) {
+		Paint originalPaint = g.getPaint();
+		int x = (int) graphicInfo.getX();
+		int y = (int) graphicInfo.getY();
+		int width = (int) graphicInfo.getWidth();
+		int height = (int) graphicInfo.getHeight();
+
+		// Create a new gradient paint for every task box, gradient depends on x and y and is not relative
 //    g.setPaint(TASK_BOX_COLOR);
-    g.setPaint(new Color(144,238,144));
-    int arcR = 6;
-    if (thickBorder)
-    	arcR = 3;
-
-    // shape
-    RoundRectangle2D rect = new RoundRectangle2D.Double(x, y, width, height, arcR, arcR);
-    g.fill(rect);
-    g.setPaint(TASK_BORDER_COLOR);
-
-    if (thickBorder) {
-      Stroke originalStroke = g.getStroke();
-      g.setStroke(THICK_TASK_BORDER_STROKE);
-      g.draw(rect);
-      g.setStroke(originalStroke);
-    } else {
-      g.draw(rect);
-    }
-
-    g.setPaint(originalPaint);
-    // text
-    if (name != null && name.length() > 0) {
-      int boxWidth = width - (2 * TEXT_PADDING);
-      int boxHeight = height - 16 - ICON_PADDING - ICON_PADDING - MARKER_WIDTH - 2 - 2;
-      int boxX = x + width/2 - boxWidth/2;
-      int boxY = y + height/2 - boxHeight/2 + ICON_PADDING + ICON_PADDING - 2 - 2;
-
-      drawMultilineCentredText(name, boxX, boxY, boxWidth, boxHeight);
-    }
-  }
-
-  protected void drawMultilineCentredText(String text, int x, int y, int boxWidth, int boxHeight) {
-    drawMultilineText(text, x, y, boxWidth, boxHeight, true);
-  }
-
-  protected void drawMultilineAnnotationText(String text, int x, int y, int boxWidth, int boxHeight) {
-	  drawMultilineText(text, x, y, boxWidth, boxHeight, false);
-  }
-
-  protected void drawMultilineText(String text, int x, int y, int boxWidth, int boxHeight, boolean centered) {
-    // Create an attributed string based in input text
-    AttributedString attributedString = new AttributedString(text);
-    attributedString.addAttribute(TextAttribute.FONT, g.getFont());
-    attributedString.addAttribute(TextAttribute.FOREGROUND, Color.black);
-
-    AttributedCharacterIterator characterIterator = attributedString.getIterator();
-
-    int currentHeight = 0;
-    // Prepare a list of lines of text we'll be drawing
-    List<TextLayout> layouts = new ArrayList<TextLayout>();
-    String lastLine = null;
-
-    LineBreakMeasurer measurer = new LineBreakMeasurer(characterIterator, g.getFontRenderContext());
-
-    TextLayout layout = null;
-    while (measurer.getPosition() < characterIterator.getEndIndex() && currentHeight <= boxHeight) {
-
-      int previousPosition = measurer.getPosition();
-
-      // Request next layout
-      layout = measurer.nextLayout(boxWidth);
-
-      int height = ((Float)(layout.getDescent() + layout.getAscent() + layout.getLeading())).intValue();
-
-      if(currentHeight + height > boxHeight) {
-        // The line we're about to add should NOT be added anymore, append three dots to previous one instead
-        // to indicate more text is truncated
-        if (!layouts.isEmpty()) {
-          layouts.remove(layouts.size() - 1);
-
-          if(lastLine.length() >= 4) {
-            lastLine = lastLine.substring(0, lastLine.length() - 4) + "...";
-          }
-          layouts.add(new TextLayout(lastLine, g.getFont(), g.getFontRenderContext()));
-        }
-        break;
-      } else {
-        layouts.add(layout);
-        lastLine = text.substring(previousPosition, measurer.getPosition());
-        currentHeight += height;
-      }
-    }
-
-
-    int currentY = y + (centered ? ((boxHeight - currentHeight) /2) : 0);
-    int currentX = 0;
-
-    // Actually draw the lines
-    for(TextLayout textLayout : layouts) {
-
-      currentY += textLayout.getAscent();
-      currentX = x + (centered ? ((boxWidth - ((Double)textLayout.getBounds().getWidth()).intValue()) /2) : 0);
-
-      textLayout.draw(g, currentX, currentY);
-      currentY += textLayout.getDescent() + textLayout.getLeading();
-    }
-
-  }
-
-
-  protected String fitTextToWidth(String original, int width) {
-    String text = original;
-
-    // remove length for "..."
-    int maxWidth = width - 10;
-
-    while (fontMetrics.stringWidth(text + "...") > maxWidth && text.length() > 0) {
-      text = text.substring(0, text.length() - 1);
-    }
-
-    if (!text.equals(original)) {
-      text = text + "...";
-    }
-
-    return text;
-  }
-
-  public void drawUserTask(String name, GraphicInfo graphicInfo, double scaleFactor) {
-    drawTask(USERTASK_IMAGE, name, graphicInfo, scaleFactor);
-  }
-
-  public void drawScriptTask(String name, GraphicInfo graphicInfo, double scaleFactor) {
-    drawTask(SCRIPTTASK_IMAGE, name, graphicInfo, scaleFactor);
-  }
-
-  public void drawServiceTask(String name, GraphicInfo graphicInfo, double scaleFactor) {
-    drawTask(SERVICETASK_IMAGE, name, graphicInfo, scaleFactor);
-  }
-
-  public void drawReceiveTask(String name, GraphicInfo graphicInfo, double scaleFactor) {
-    drawTask(RECEIVETASK_IMAGE, name, graphicInfo, scaleFactor);
-  }
-
-  public void drawSendTask(String name, GraphicInfo graphicInfo, double scaleFactor) {
-    drawTask(SENDTASK_IMAGE, name, graphicInfo, scaleFactor);
-  }
-
-  public void drawManualTask(String name, GraphicInfo graphicInfo, double scaleFactor) {
-    drawTask(MANUALTASK_IMAGE, name, graphicInfo, scaleFactor);
-  }
-
-  public void drawBusinessRuleTask(String name, GraphicInfo graphicInfo, double scaleFactor) {
-    drawTask(BUSINESS_RULE_TASK_IMAGE, name, graphicInfo, scaleFactor);
-  }
-
-  public void drawCamelTask(String name, GraphicInfo graphicInfo, double scaleFactor) {
-    drawTask(CAMEL_TASK_IMAGE, name, graphicInfo, scaleFactor);
-  }
-
-  public void drawMuleTask(String name, GraphicInfo graphicInfo, double scaleFactor) {
-    drawTask(MULE_TASK_IMAGE, name, graphicInfo, scaleFactor);
-  }
-
-  public void drawExpandedSubProcess(String name, GraphicInfo graphicInfo, Boolean isTriggeredByEvent, double scaleFactor) {
-    RoundRectangle2D rect = new RoundRectangle2D.Double(graphicInfo.getX(), graphicInfo.getY(),
-        graphicInfo.getWidth(), graphicInfo.getHeight(), 8, 8);
-
-    // Use different stroke (dashed)
-    if (isTriggeredByEvent) {
-      Stroke originalStroke = g.getStroke();
-      g.setStroke(EVENT_SUBPROCESS_STROKE);
-      g.draw(rect);
-      g.setStroke(originalStroke);
-    } else {
-      Paint originalPaint = g.getPaint();
-      g.setPaint(SUBPROCESS_BOX_COLOR);
-      g.fill(rect);
-      g.setPaint(SUBPROCESS_BORDER_COLOR);
-      g.draw(rect);
-      g.setPaint(originalPaint);
-    }
-
-    if (scaleFactor == 1.0 && name != null && !name.isEmpty()) {
-      String text = fitTextToWidth(name, (int) graphicInfo.getWidth());
-      g.drawString(text, (int) graphicInfo.getX() + 10, (int) graphicInfo.getY() + 15);
-    }
-  }
-
-  public void drawCollapsedSubProcess(String name, GraphicInfo graphicInfo, Boolean isTriggeredByEvent) {
-    drawCollapsedTask(name, graphicInfo, false);
-  }
-
-  public void drawCollapsedCallActivity(String name, GraphicInfo graphicInfo) {
-    drawCollapsedTask(name, graphicInfo, true);
-  }
-
-  protected void drawCollapsedTask(String name, GraphicInfo graphicInfo, boolean thickBorder) {
-    // The collapsed marker is now visualized separately
-    drawTask(name, graphicInfo, thickBorder);
-  }
-
-  public void drawCollapsedMarker(int x, int y, int width, int height) {
-    // rectangle
-    int rectangleWidth = MARKER_WIDTH;
-    int rectangleHeight = MARKER_WIDTH;
-    Rectangle rect = new Rectangle(x + (width - rectangleWidth) / 2, y + height - rectangleHeight - 3, rectangleWidth, rectangleHeight);
-    g.draw(rect);
-
-    // plus inside rectangle
-    Line2D.Double line = new Line2D.Double(rect.getCenterX(), rect.getY() + 2, rect.getCenterX(), rect.getMaxY() - 2);
-    g.draw(line);
-    line = new Line2D.Double(rect.getMinX() + 2, rect.getCenterY(), rect.getMaxX() - 2, rect.getCenterY());
-    g.draw(line);
-  }
-
-  public void drawActivityMarkers(int x, int y, int width, int height, boolean multiInstanceSequential, boolean multiInstanceParallel, boolean collapsed) {
-    if (collapsed) {
-      if (!multiInstanceSequential && !multiInstanceParallel) {
-        drawCollapsedMarker(x, y, width, height);
-      } else {
-        drawCollapsedMarker(x - MARKER_WIDTH / 2 - 2, y, width, height);
-        if (multiInstanceSequential) {
-          drawMultiInstanceMarker(true, x + MARKER_WIDTH / 2 + 2, y, width, height);
-        } else {
-          drawMultiInstanceMarker(false, x + MARKER_WIDTH / 2 + 2, y, width, height);
-        }
-      }
-    } else {
-      if (multiInstanceSequential) {
-        drawMultiInstanceMarker(true, x, y, width, height);
-      } else if (multiInstanceParallel) {
-        drawMultiInstanceMarker(false, x, y, width, height);
-      }
-    }
-  }
-
-  public void drawGateway(GraphicInfo graphicInfo) {
-    Polygon rhombus = new Polygon();
-    int x = (int) graphicInfo.getX();
-    int y = (int) graphicInfo.getY();
-    int width = (int) graphicInfo.getWidth();
-    int height = (int) graphicInfo.getHeight();
-
-    rhombus.addPoint(x, y + (height / 2));
-    rhombus.addPoint(x + (width / 2), y + height);
-    rhombus.addPoint(x + width, y + (height / 2));
-    rhombus.addPoint(x + (width / 2), y);
-    g.draw(rhombus);
-  }
-
-  public void drawParallelGateway(GraphicInfo graphicInfo, double scaleFactor) {
-    // rhombus
-    drawGateway(graphicInfo);
-    int x = (int) graphicInfo.getX();
-    int y = (int) graphicInfo.getY();
-    int width = (int) graphicInfo.getWidth();
-    int height = (int) graphicInfo.getHeight();
-
-    if (scaleFactor == 1.0) {
-      // plus inside rhombus
-      Stroke orginalStroke = g.getStroke();
-      g.setStroke(GATEWAY_TYPE_STROKE);
-      Line2D.Double line = new Line2D.Double(x + 10, y + height / 2, x + width - 10, y + height / 2); // horizontal
-      g.draw(line);
-      line = new Line2D.Double(x + width / 2, y + height - 10, x + width / 2, y + 10); // vertical
-      g.draw(line);
-      g.setStroke(orginalStroke);
-    }
-  }
-
-  public void drawExclusiveGateway(GraphicInfo graphicInfo, double scaleFactor) {
-    // rhombus
-    drawGateway(graphicInfo);
-    int x = (int) graphicInfo.getX();
-    int y = (int) graphicInfo.getY();
-    int width = (int) graphicInfo.getWidth();
-    int height = (int) graphicInfo.getHeight();
-
-    int quarterWidth = width / 4;
-    int quarterHeight = height / 4;
-
-    if (scaleFactor == 1.0) {
-      // X inside rhombus
-      Stroke orginalStroke = g.getStroke();
-      g.setStroke(GATEWAY_TYPE_STROKE);
-      Line2D.Double line = new Line2D.Double(x + quarterWidth + 3, y + quarterHeight + 3, x + 3 * quarterWidth - 3, y + 3 * quarterHeight - 3);
-      g.draw(line);
-      line = new Line2D.Double(x + quarterWidth + 3, y + 3 * quarterHeight - 3, x + 3 * quarterWidth - 3, y + quarterHeight + 3);
-      g.draw(line);
-      g.setStroke(orginalStroke);
-    }
-  }
-
-  public void drawInclusiveGateway(GraphicInfo graphicInfo, double scaleFactor) {
-    // rhombus
-    drawGateway(graphicInfo);
-    int x = (int) graphicInfo.getX();
-    int y = (int) graphicInfo.getY();
-    int width = (int) graphicInfo.getWidth();
-    int height = (int) graphicInfo.getHeight();
-
-    int diameter = width / 2;
-
-    if (scaleFactor == 1.0) {
-      // circle inside rhombus
-      Stroke orginalStroke = g.getStroke();
-      g.setStroke(GATEWAY_TYPE_STROKE);
-      Ellipse2D.Double circle = new Ellipse2D.Double(((width - diameter) / 2) + x, ((height - diameter) / 2) + y, diameter, diameter);
-      g.draw(circle);
-      g.setStroke(orginalStroke);
-    }
-  }
-
-  public void drawEventBasedGateway(GraphicInfo graphicInfo, double scaleFactor) {
-    // rhombus
-    drawGateway(graphicInfo);
-
-    if (scaleFactor == 1.0) {
-      int x = (int) graphicInfo.getX();
-      int y = (int) graphicInfo.getY();
-      int width = (int) graphicInfo.getWidth();
-      int height = (int) graphicInfo.getHeight();
-
-      double scale = .6;
-
-      GraphicInfo eventInfo = new GraphicInfo();
-      eventInfo.setX(x + width*(1-scale)/2);
-      eventInfo.setY(y + height*(1-scale)/2);
-      eventInfo.setWidth(width*scale);
-      eventInfo.setHeight(height*scale);
-      drawCatchingEvent(eventInfo, true, null, "eventGateway", scaleFactor);
-
-      double r = width / 6.;
-
-      // create pentagon (coords with respect to center)
-      int topX = (int)(.95 * r); // top right corner
-      int topY = (int)(-.31 * r);
-      int bottomX = (int)(.59 * r); // bottom right corner
-      int bottomY = (int)(.81 * r);
-
-      int[] xPoints = new int[]{ 0, topX, bottomX, -bottomX, -topX };
-      int[] yPoints = new int[]{ -(int)r, topY, bottomY, bottomY, topY };
-      Polygon pentagon = new Polygon(xPoints, yPoints, 5);
-      pentagon.translate(x+width/2, y+width/2);
-
-      // draw
-      g.drawPolygon(pentagon);
-    }
-  }
-
-  public void drawMultiInstanceMarker(boolean sequential, int x, int y, int width, int height) {
-    int rectangleWidth = MARKER_WIDTH;
-    int rectangleHeight = MARKER_WIDTH;
-    int lineX = x + (width - rectangleWidth) / 2;
-    int lineY = y + height - rectangleHeight - 3;
-
-    Stroke orginalStroke = g.getStroke();
-    g.setStroke(MULTI_INSTANCE_STROKE);
-
-    if (sequential) {
-      g.draw(new Line2D.Double(lineX, lineY, lineX + rectangleWidth, lineY));
-      g.draw(new Line2D.Double(lineX, lineY + rectangleHeight / 2, lineX + rectangleWidth, lineY + rectangleHeight / 2));
-      g.draw(new Line2D.Double(lineX, lineY + rectangleHeight, lineX + rectangleWidth, lineY + rectangleHeight));
-    } else {
-      g.draw(new Line2D.Double(lineX, lineY, lineX, lineY + rectangleHeight));
-      g.draw(new Line2D.Double(lineX + rectangleWidth / 2, lineY, lineX + rectangleWidth / 2, lineY + rectangleHeight));
-      g.draw(new Line2D.Double(lineX + rectangleWidth, lineY, lineX + rectangleWidth, lineY + rectangleHeight));
-    }
-
-    g.setStroke(orginalStroke);
-  }
-
-  public void drawHighLight(int x, int y, int width, int height) {
-    Paint originalPaint = g.getPaint();
-    Stroke originalStroke = g.getStroke();
-
-    g.setPaint(HIGHLIGHT_COLOR);
+		g.setPaint(new Color(144, 238, 144));
+		int arcR = 6;
+		if (thickBorder)
+			arcR = 3;
+
+		// shape
+		RoundRectangle2D rect = new RoundRectangle2D.Double(x, y, width, height, arcR, arcR);
+		g.fill(rect);
+		g.setPaint(TASK_BORDER_COLOR);
+
+		if (thickBorder) {
+			Stroke originalStroke = g.getStroke();
+			g.setStroke(THICK_TASK_BORDER_STROKE);
+			g.draw(rect);
+			g.setStroke(originalStroke);
+		} else {
+			g.draw(rect);
+		}
+
+		g.setPaint(originalPaint);
+		// text
+		if (name != null && name.length() > 0) {
+			int boxWidth = width - (2 * TEXT_PADDING);
+			int boxHeight = height - 16 - ICON_PADDING - ICON_PADDING - MARKER_WIDTH - 2 - 2;
+			int boxX = x + width / 2 - boxWidth / 2;
+			int boxY = y + height / 2 - boxHeight / 2 + ICON_PADDING + ICON_PADDING - 2 - 2;
+
+			drawMultilineCentredText(name, boxX, boxY, boxWidth, boxHeight);
+		}
+	}
+
+	protected void drawMultilineCentredText(String text, int x, int y, int boxWidth, int boxHeight) {
+		drawMultilineText(text, x, y, boxWidth, boxHeight, true);
+	}
+
+	protected void drawMultilineAnnotationText(String text, int x, int y, int boxWidth, int boxHeight) {
+		drawMultilineText(text, x, y, boxWidth, boxHeight, false);
+	}
+
+	protected void drawMultilineText(String text, int x, int y, int boxWidth, int boxHeight, boolean centered) {
+		// Create an attributed string based in input text
+		AttributedString attributedString = new AttributedString(text);
+		attributedString.addAttribute(TextAttribute.FONT, g.getFont());
+		attributedString.addAttribute(TextAttribute.FOREGROUND, Color.black);
+
+		AttributedCharacterIterator characterIterator = attributedString.getIterator();
+
+		int currentHeight = 0;
+		// Prepare a list of lines of text we'll be drawing
+		List<TextLayout> layouts = new ArrayList<TextLayout>();
+		String lastLine = null;
+
+		LineBreakMeasurer measurer = new LineBreakMeasurer(characterIterator, g.getFontRenderContext());
+
+		TextLayout layout = null;
+		while (measurer.getPosition() < characterIterator.getEndIndex() && currentHeight <= boxHeight) {
+
+			int previousPosition = measurer.getPosition();
+
+			// Request next layout
+			layout = measurer.nextLayout(boxWidth);
+
+			int height = ((Float) (layout.getDescent() + layout.getAscent() + layout.getLeading())).intValue();
+
+			if (currentHeight + height > boxHeight) {
+				// The line we're about to add should NOT be added anymore, append three dots to previous one instead
+				// to indicate more text is truncated
+				if (!layouts.isEmpty()) {
+					layouts.remove(layouts.size() - 1);
+
+					if (lastLine.length() >= 4) {
+						lastLine = lastLine.substring(0, lastLine.length() - 4) + "...";
+					}
+					layouts.add(new TextLayout(lastLine, g.getFont(), g.getFontRenderContext()));
+				}
+				break;
+			} else {
+				layouts.add(layout);
+				lastLine = text.substring(previousPosition, measurer.getPosition());
+				currentHeight += height;
+			}
+		}
+
+
+		int currentY = y + (centered ? ((boxHeight - currentHeight) / 2) : 0);
+		int currentX = 0;
+
+		// Actually draw the lines
+		for (TextLayout textLayout : layouts) {
+
+			currentY += textLayout.getAscent();
+			currentX = x + (centered ? ((boxWidth - ((Double) textLayout.getBounds().getWidth()).intValue()) / 2) : 0);
+
+			textLayout.draw(g, currentX, currentY);
+			currentY += textLayout.getDescent() + textLayout.getLeading();
+		}
+
+	}
+
+	protected String fitTextToWidth(String original, int width) {
+		String text = original;
+
+		// remove length for "..."
+		int maxWidth = width - 10;
+
+		while (fontMetrics.stringWidth(text + "...") > maxWidth && text.length() > 0) {
+			text = text.substring(0, text.length() - 1);
+		}
+
+		if (!text.equals(original)) {
+			text = text + "...";
+		}
+
+		return text;
+	}
+
+	public void drawUserTask(String name, GraphicInfo graphicInfo, double scaleFactor) {
+		drawTask(USERTASK_IMAGE, name, graphicInfo, scaleFactor);
+	}
+
+	public void drawScriptTask(String name, GraphicInfo graphicInfo, double scaleFactor) {
+		drawTask(SCRIPTTASK_IMAGE, name, graphicInfo, scaleFactor);
+	}
+
+	public void drawServiceTask(String name, GraphicInfo graphicInfo, double scaleFactor) {
+		drawTask(SERVICETASK_IMAGE, name, graphicInfo, scaleFactor);
+	}
+
+	public void drawReceiveTask(String name, GraphicInfo graphicInfo, double scaleFactor) {
+		drawTask(RECEIVETASK_IMAGE, name, graphicInfo, scaleFactor);
+	}
+
+	public void drawSendTask(String name, GraphicInfo graphicInfo, double scaleFactor) {
+		drawTask(SENDTASK_IMAGE, name, graphicInfo, scaleFactor);
+	}
+
+	public void drawManualTask(String name, GraphicInfo graphicInfo, double scaleFactor) {
+		drawTask(MANUALTASK_IMAGE, name, graphicInfo, scaleFactor);
+	}
+
+	public void drawBusinessRuleTask(String name, GraphicInfo graphicInfo, double scaleFactor) {
+		drawTask(BUSINESS_RULE_TASK_IMAGE, name, graphicInfo, scaleFactor);
+	}
+
+	public void drawCamelTask(String name, GraphicInfo graphicInfo, double scaleFactor) {
+		drawTask(CAMEL_TASK_IMAGE, name, graphicInfo, scaleFactor);
+	}
+
+	public void drawMuleTask(String name, GraphicInfo graphicInfo, double scaleFactor) {
+		drawTask(MULE_TASK_IMAGE, name, graphicInfo, scaleFactor);
+	}
+
+	public void drawExpandedSubProcess(String name, GraphicInfo graphicInfo, Boolean isTriggeredByEvent, double scaleFactor) {
+		RoundRectangle2D rect = new RoundRectangle2D.Double(graphicInfo.getX(), graphicInfo.getY(),
+			graphicInfo.getWidth(), graphicInfo.getHeight(), 8, 8);
+
+		// Use different stroke (dashed)
+		if (isTriggeredByEvent) {
+			Stroke originalStroke = g.getStroke();
+			g.setStroke(EVENT_SUBPROCESS_STROKE);
+			g.draw(rect);
+			g.setStroke(originalStroke);
+		} else {
+			Paint originalPaint = g.getPaint();
+			g.setPaint(SUBPROCESS_BOX_COLOR);
+			g.fill(rect);
+			g.setPaint(SUBPROCESS_BORDER_COLOR);
+			g.draw(rect);
+			g.setPaint(originalPaint);
+		}
+
+		if (scaleFactor == 1.0 && name != null && !name.isEmpty()) {
+			String text = fitTextToWidth(name, (int) graphicInfo.getWidth());
+			g.drawString(text, (int) graphicInfo.getX() + 10, (int) graphicInfo.getY() + 15);
+		}
+	}
+
+	public void drawCollapsedSubProcess(String name, GraphicInfo graphicInfo, Boolean isTriggeredByEvent) {
+		drawCollapsedTask(name, graphicInfo, false);
+	}
+
+	public void drawCollapsedCallActivity(String name, GraphicInfo graphicInfo) {
+		drawCollapsedTask(name, graphicInfo, true);
+	}
+
+	protected void drawCollapsedTask(String name, GraphicInfo graphicInfo, boolean thickBorder) {
+		// The collapsed marker is now visualized separately
+		drawTask(name, graphicInfo, thickBorder);
+	}
+
+	public void drawCollapsedMarker(int x, int y, int width, int height) {
+		// rectangle
+		int rectangleWidth = MARKER_WIDTH;
+		int rectangleHeight = MARKER_WIDTH;
+		Rectangle rect = new Rectangle(x + (width - rectangleWidth) / 2, y + height - rectangleHeight - 3, rectangleWidth, rectangleHeight);
+		g.draw(rect);
+
+		// plus inside rectangle
+		Line2D.Double line = new Line2D.Double(rect.getCenterX(), rect.getY() + 2, rect.getCenterX(), rect.getMaxY() - 2);
+		g.draw(line);
+		line = new Line2D.Double(rect.getMinX() + 2, rect.getCenterY(), rect.getMaxX() - 2, rect.getCenterY());
+		g.draw(line);
+	}
+
+	public void drawActivityMarkers(int x, int y, int width, int height, boolean multiInstanceSequential, boolean multiInstanceParallel, boolean collapsed) {
+		if (collapsed) {
+			if (!multiInstanceSequential && !multiInstanceParallel) {
+				drawCollapsedMarker(x, y, width, height);
+			} else {
+				drawCollapsedMarker(x - MARKER_WIDTH / 2 - 2, y, width, height);
+				if (multiInstanceSequential) {
+					drawMultiInstanceMarker(true, x + MARKER_WIDTH / 2 + 2, y, width, height);
+				} else {
+					drawMultiInstanceMarker(false, x + MARKER_WIDTH / 2 + 2, y, width, height);
+				}
+			}
+		} else {
+			if (multiInstanceSequential) {
+				drawMultiInstanceMarker(true, x, y, width, height);
+			} else if (multiInstanceParallel) {
+				drawMultiInstanceMarker(false, x, y, width, height);
+			}
+		}
+	}
+
+	public void drawGateway(GraphicInfo graphicInfo) {
+		Polygon rhombus = new Polygon();
+		int x = (int) graphicInfo.getX();
+		int y = (int) graphicInfo.getY();
+		int width = (int) graphicInfo.getWidth();
+		int height = (int) graphicInfo.getHeight();
+
+		rhombus.addPoint(x, y + (height / 2));
+		rhombus.addPoint(x + (width / 2), y + height);
+		rhombus.addPoint(x + width, y + (height / 2));
+		rhombus.addPoint(x + (width / 2), y);
+		g.draw(rhombus);
+	}
+
+	public void drawParallelGateway(GraphicInfo graphicInfo, double scaleFactor) {
+		// rhombus
+		drawGateway(graphicInfo);
+		int x = (int) graphicInfo.getX();
+		int y = (int) graphicInfo.getY();
+		int width = (int) graphicInfo.getWidth();
+		int height = (int) graphicInfo.getHeight();
+
+		if (scaleFactor == 1.0) {
+			// plus inside rhombus
+			Stroke orginalStroke = g.getStroke();
+			g.setStroke(GATEWAY_TYPE_STROKE);
+			Line2D.Double line = new Line2D.Double(x + 10, y + height / 2, x + width - 10, y + height / 2); // horizontal
+			g.draw(line);
+			line = new Line2D.Double(x + width / 2, y + height - 10, x + width / 2, y + 10); // vertical
+			g.draw(line);
+			g.setStroke(orginalStroke);
+		}
+	}
+
+	public void drawExclusiveGateway(GraphicInfo graphicInfo, double scaleFactor) {
+		// rhombus
+		drawGateway(graphicInfo);
+		int x = (int) graphicInfo.getX();
+		int y = (int) graphicInfo.getY();
+		int width = (int) graphicInfo.getWidth();
+		int height = (int) graphicInfo.getHeight();
+
+		int quarterWidth = width / 4;
+		int quarterHeight = height / 4;
+
+		if (scaleFactor == 1.0) {
+			// X inside rhombus
+			Stroke orginalStroke = g.getStroke();
+			g.setStroke(GATEWAY_TYPE_STROKE);
+			Line2D.Double line = new Line2D.Double(x + quarterWidth + 3, y + quarterHeight + 3, x + 3 * quarterWidth - 3, y + 3 * quarterHeight - 3);
+			g.draw(line);
+			line = new Line2D.Double(x + quarterWidth + 3, y + 3 * quarterHeight - 3, x + 3 * quarterWidth - 3, y + quarterHeight + 3);
+			g.draw(line);
+			g.setStroke(orginalStroke);
+		}
+	}
+
+	public void drawInclusiveGateway(GraphicInfo graphicInfo, double scaleFactor) {
+		// rhombus
+		drawGateway(graphicInfo);
+		int x = (int) graphicInfo.getX();
+		int y = (int) graphicInfo.getY();
+		int width = (int) graphicInfo.getWidth();
+		int height = (int) graphicInfo.getHeight();
+
+		int diameter = width / 2;
+
+		if (scaleFactor == 1.0) {
+			// circle inside rhombus
+			Stroke orginalStroke = g.getStroke();
+			g.setStroke(GATEWAY_TYPE_STROKE);
+			Ellipse2D.Double circle = new Ellipse2D.Double(((width - diameter) / 2) + x, ((height - diameter) / 2) + y, diameter, diameter);
+			g.draw(circle);
+			g.setStroke(orginalStroke);
+		}
+	}
+
+	public void drawEventBasedGateway(GraphicInfo graphicInfo, double scaleFactor) {
+		// rhombus
+		drawGateway(graphicInfo);
+
+		if (scaleFactor == 1.0) {
+			int x = (int) graphicInfo.getX();
+			int y = (int) graphicInfo.getY();
+			int width = (int) graphicInfo.getWidth();
+			int height = (int) graphicInfo.getHeight();
+
+			double scale = .6;
+
+			GraphicInfo eventInfo = new GraphicInfo();
+			eventInfo.setX(x + width * (1 - scale) / 2);
+			eventInfo.setY(y + height * (1 - scale) / 2);
+			eventInfo.setWidth(width * scale);
+			eventInfo.setHeight(height * scale);
+			drawCatchingEvent(eventInfo, true, null, "eventGateway", scaleFactor);
+
+			double r = width / 6.;
+
+			// create pentagon (coords with respect to center)
+			int topX = (int) (.95 * r); // top right corner
+			int topY = (int) (-.31 * r);
+			int bottomX = (int) (.59 * r); // bottom right corner
+			int bottomY = (int) (.81 * r);
+
+			int[] xPoints = new int[]{0, topX, bottomX, -bottomX, -topX};
+			int[] yPoints = new int[]{-(int) r, topY, bottomY, bottomY, topY};
+			Polygon pentagon = new Polygon(xPoints, yPoints, 5);
+			pentagon.translate(x + width / 2, y + width / 2);
+
+			// draw
+			g.drawPolygon(pentagon);
+		}
+	}
+
+	public void drawMultiInstanceMarker(boolean sequential, int x, int y, int width, int height) {
+		int rectangleWidth = MARKER_WIDTH;
+		int rectangleHeight = MARKER_WIDTH;
+		int lineX = x + (width - rectangleWidth) / 2;
+		int lineY = y + height - rectangleHeight - 3;
+
+		Stroke orginalStroke = g.getStroke();
+		g.setStroke(MULTI_INSTANCE_STROKE);
+
+		if (sequential) {
+			g.draw(new Line2D.Double(lineX, lineY, lineX + rectangleWidth, lineY));
+			g.draw(new Line2D.Double(lineX, lineY + rectangleHeight / 2, lineX + rectangleWidth, lineY + rectangleHeight / 2));
+			g.draw(new Line2D.Double(lineX, lineY + rectangleHeight, lineX + rectangleWidth, lineY + rectangleHeight));
+		} else {
+			g.draw(new Line2D.Double(lineX, lineY, lineX, lineY + rectangleHeight));
+			g.draw(new Line2D.Double(lineX + rectangleWidth / 2, lineY, lineX + rectangleWidth / 2, lineY + rectangleHeight));
+			g.draw(new Line2D.Double(lineX + rectangleWidth, lineY, lineX + rectangleWidth, lineY + rectangleHeight));
+		}
+
+		g.setStroke(orginalStroke);
+	}
+
+	public void drawHighLight(int x, int y, int width, int height) {
+		Paint originalPaint = g.getPaint();
+		Stroke originalStroke = g.getStroke();
+
+		g.setPaint(HIGHLIGHT_COLOR);
 //    g.setPaint(Color.GREEN);
-    g.setStroke(THICK_TASK_BORDER_STROKE);
-
-    RoundRectangle2D rect = new RoundRectangle2D.Double(x, y, width, height, 20, 20);
-    g.draw(rect);
+		g.setStroke(THICK_TASK_BORDER_STROKE);
 
-    g.setPaint(originalPaint);
-    g.setStroke(originalStroke);
-  }
+		RoundRectangle2D rect = new RoundRectangle2D.Double(x, y, width, height, 20, 20);
+		g.draw(rect);
 
+		g.setPaint(originalPaint);
+		g.setStroke(originalStroke);
+	}
 
-  public void drawHighLight(int x, int y, int width, int height,Color color) {
-    Paint originalPaint = g.getPaint();
-    Stroke originalStroke = g.getStroke();
+	public void drawHighLight(int x, int y, int width, int height, Color color) {
+		Paint originalPaint = g.getPaint();
+		Stroke originalStroke = g.getStroke();
 
-    g.setPaint(color);
+		g.setPaint(color);
 //    g.setPaint(Color.GREEN);
-    g.setStroke(THICK_TASK_BORDER_STROKE);
-
-    RoundRectangle2D rect = new RoundRectangle2D.Double(x, y, width, height, 20, 20);
-    g.draw(rect);
-
-    g.setPaint(originalPaint);
-    g.setStroke(originalStroke);
-  }
-
-  public void drawTextAnnotation(String text, GraphicInfo graphicInfo) {
-    int x = (int) graphicInfo.getX();
-    int y = (int) graphicInfo.getY();
-    int width = (int) graphicInfo.getWidth();
-    int height = (int) graphicInfo.getHeight();
-
-	  Font originalFont = g.getFont();
-	  Stroke originalStroke = g.getStroke();
-
-	  g.setFont(ANNOTATION_FONT);
-
-	  Path2D path = new Path2D.Double();
-	  x += .5;
-	  int lineLength = 18;
-	  path.moveTo(x + lineLength, y);
-	  path.lineTo(x, y);
-	  path.lineTo(x, y + height);
-	  path.lineTo(x + lineLength, y + height);
-
-	  path.lineTo(x + lineLength, y + height -1);
-	  path.lineTo(x + 1, y + height -1);
-	  path.lineTo(x + 1, y + 1);
-	  path.lineTo(x + lineLength, y + 1);
-	  path.closePath();
-
-	  g.draw(path);
-
-	  int boxWidth = width - (2 * ANNOTATION_TEXT_PADDING);
-    int boxHeight = height - (2 * ANNOTATION_TEXT_PADDING);
-    int boxX = x + width/2 - boxWidth/2;
-    int boxY = y + height/2 - boxHeight/2;
-
-    if (text != null && text.isEmpty() == false) {
-      drawMultilineAnnotationText(text, boxX, boxY, boxWidth, boxHeight);
-    }
-
-	  // restore originals
-    g.setFont(originalFont);
-    g.setStroke(originalStroke);
-  }
-
-  public void drawLabel(String text, GraphicInfo graphicInfo){
-	  drawLabel(text, graphicInfo, true);
-  }
-  public void drawLabel(String text, GraphicInfo graphicInfo, boolean centered){
-	float interline = 1.0f;
-
-    // text
-    if (text != null && text.length()>0) {
-      Paint originalPaint = g.getPaint();
-      Font originalFont = g.getFont();
-
-      g.setPaint(LABEL_COLOR);
-      g.setFont(LABEL_FONT);
-
-      int wrapWidth = 100;
-      int textY = (int) graphicInfo.getY();
-
-      // TODO: use drawMultilineText()
-      AttributedString as = new AttributedString(text);
-      as.addAttribute(TextAttribute.FOREGROUND, g.getPaint());
-      as.addAttribute(TextAttribute.FONT, g.getFont());
-      AttributedCharacterIterator aci = as.getIterator();
-      FontRenderContext frc = new FontRenderContext(null, true, false);
-      LineBreakMeasurer lbm = new LineBreakMeasurer(aci, frc);
-
-      while (lbm.getPosition() < text.length()) {
-    	  TextLayout tl = lbm.nextLayout(wrapWidth);
-    	  textY += tl.getAscent();
-    	  Rectangle2D bb = tl.getBounds();
-    	  double tX = graphicInfo.getX();
-    	  if (centered) {
-    	  	tX += (int) (graphicInfo.getWidth() / 2 - bb.getWidth() / 2);
-    	  }
-    	  tl.draw(g, (float) tX, textY);
-    	  textY += tl.getDescent() + tl.getLeading() + (interline - 1.0f) * tl.getAscent();
-      }
-
-      // restore originals
-      g.setFont(originalFont);
-      g.setPaint(originalPaint);
-    }
-  }
-
-  /**
-   * This method makes coordinates of connection flow better.
-   * @param sourceShapeType
-   * @param targetShapeType
-   * @param sourceGraphicInfo
-   * @param targetGraphicInfo
-   * @param graphicInfoList
-   *
-   */
-  public List<GraphicInfo> connectionPerfectionizer(SHAPE_TYPE sourceShapeType, SHAPE_TYPE targetShapeType, GraphicInfo sourceGraphicInfo, GraphicInfo targetGraphicInfo, List<GraphicInfo> graphicInfoList) {
-    Shape shapeFirst = createShape(sourceShapeType, sourceGraphicInfo);
-    Shape shapeLast = createShape(targetShapeType, targetGraphicInfo);
-
-    if (graphicInfoList != null && graphicInfoList.size() > 0) {
-      GraphicInfo graphicInfoFirst = graphicInfoList.get(0);
-      GraphicInfo graphicInfoLast = graphicInfoList.get(graphicInfoList.size()-1);
-      if (shapeFirst != null) {
-        graphicInfoFirst.setX(shapeFirst.getBounds2D().getCenterX());
-        graphicInfoFirst.setY(shapeFirst.getBounds2D().getCenterY());
-      }
-      if (shapeLast != null) {
-        graphicInfoLast.setX(shapeLast.getBounds2D().getCenterX());
-        graphicInfoLast.setY(shapeLast.getBounds2D().getCenterY());
-      }
-
-      Point p = null;
-
-      if (shapeFirst != null) {
-        Line2D.Double lineFirst = new Line2D.Double(graphicInfoFirst.getX(), graphicInfoFirst.getY(), graphicInfoList.get(1).getX(), graphicInfoList.get(1).getY());
-        p = getIntersection(shapeFirst, lineFirst);
-        if (p != null) {
-          graphicInfoFirst.setX(p.getX());
-          graphicInfoFirst.setY(p.getY());
-        }
-      }
-
-      if (shapeLast != null) {
-        Line2D.Double lineLast = new Line2D.Double(graphicInfoLast.getX(), graphicInfoLast.getY(), graphicInfoList.get(graphicInfoList.size()-2).getX(), graphicInfoList.get(graphicInfoList.size()-2).getY());
-        p = getIntersection(shapeLast, lineLast);
-        if (p != null) {
-          graphicInfoLast.setX(p.getX());
-          graphicInfoLast.setY(p.getY());
-        }
-      }
-    }
-
-    return graphicInfoList;
-  }
-
-  /**
-   * This method creates shape by type and coordinates.
-   * @param shapeType
-   * @param graphicInfo
-   * @return Shape
-   */
-  private static Shape createShape(SHAPE_TYPE shapeType, GraphicInfo graphicInfo) {
-    if (SHAPE_TYPE.Rectangle.equals(shapeType)) {
-      // source is rectangle
-      return new Rectangle2D.Double(graphicInfo.getX(), graphicInfo.getY(), graphicInfo.getWidth(), graphicInfo.getHeight());
-    } else if (SHAPE_TYPE.Rhombus.equals(shapeType)) {
-      // source is rhombus
-      Path2D.Double rhombus = new Path2D.Double();
-      rhombus.moveTo(graphicInfo.getX(), graphicInfo.getY() + graphicInfo.getHeight() / 2);
-      rhombus.lineTo(graphicInfo.getX() + graphicInfo.getWidth() / 2, graphicInfo.getY() + graphicInfo.getHeight());
-      rhombus.lineTo(graphicInfo.getX() + graphicInfo.getWidth(), graphicInfo.getY() + graphicInfo.getHeight() / 2);
-      rhombus.lineTo(graphicInfo.getX() + graphicInfo.getWidth() / 2, graphicInfo.getY());
-      rhombus.lineTo(graphicInfo.getX(), graphicInfo.getY() + graphicInfo.getHeight() / 2);
-      rhombus.closePath();
-      return rhombus;
-    } else if (SHAPE_TYPE.Ellipse.equals(shapeType)) {
-      // source is ellipse
-      return new Ellipse2D.Double(graphicInfo.getX(), graphicInfo.getY(), graphicInfo.getWidth(), graphicInfo.getHeight());
-    } else {
-      // unknown source element, just do not correct coordinates
-    }
-    return null;
-  }
-
-  /**
-   * This method returns intersection point of shape border and line.
-   *
-   * @param shape
-   * @param line
-   * @return Point
-   */
-  private static Point getIntersection(Shape shape, Line2D.Double line) {
-    if (shape instanceof Ellipse2D) {
-      return getEllipseIntersection(shape, line);
-    } else if (shape instanceof Rectangle2D || shape instanceof Path2D) {
-      return getShapeIntersection(shape, line);
-    } else {
-      // something strange
-      return null;
-    }
-  }
-
-    /**
-     * This method calculates ellipse intersection with line
-     * @param shape
-     *                  Bounds of this shape used to calculate parameters of inscribed into this bounds ellipse.
-     * @param line
-     * @return Intersection point
-     */
-  private static Point getEllipseIntersection(Shape shape, Line2D.Double line) {
-    double angle = Math.atan2(line.y2 - line.y1, line.x2 - line.x1);
-    double x = shape.getBounds2D().getWidth()/2 * Math.cos(angle) + shape.getBounds2D().getCenterX();
-    double y = shape.getBounds2D().getHeight()/2 * Math.sin(angle) + shape.getBounds2D().getCenterY();
-    Point p = new Point();
-    p.setLocation(x, y);
-    return p;
-  }
-
-  /**
-   * This method calculates shape intersection with line.
-   *
-   * @param shape
-   * @param line
-   * @return Intersection point
-   */
-  private static Point getShapeIntersection(Shape shape, Line2D.Double line) {
-    PathIterator it = shape.getPathIterator(null);
-    double[] coords = new double[6];
-    double[] pos = new double[2];
-    Line2D.Double l = new Line2D.Double();
-    while (!it.isDone()) {
-      int type = it.currentSegment(coords);
-      switch (type) {
-      case PathIterator.SEG_MOVETO:
-        pos[0] = coords[0];
-        pos[1] = coords[1];
-        break;
-      case PathIterator.SEG_LINETO:
-        l = new Line2D.Double(pos[0], pos[1], coords[0], coords[1]);
-        if (line.intersectsLine(l)) {
-          return getLinesIntersection(line, l);
-        }
-        pos[0] = coords[0];
-        pos[1] = coords[1];
-        break;
-      case PathIterator.SEG_CLOSE:
-        break;
-      default:
-        // whatever
-      }
-      it.next();
-    }
-    return null;
-  }
-
-  /**
-   * This method calculates intersections of two lines.
-   * @param a Line 1
-   * @param b Line 2
-   * @return Intersection point
-   */
-  private static Point getLinesIntersection(Line2D a, Line2D b) {
-    double d  = (a.getX1()-a.getX2())*(b.getY2()-b.getY1()) - (a.getY1()-a.getY2())*(b.getX2()-b.getX1());
-    double da = (a.getX1()-b.getX1())*(b.getY2()-b.getY1()) - (a.getY1()-b.getY1())*(b.getX2()-b.getX1());
-    // double db = (a.getX1()-a.getX2())*(a.getY1()-b.getY1()) - (a.getY1()-a.getY2())*(a.getX1()-b.getX1());
-    double ta = da/d;
-    // double tb = db/d;
-    Point p = new Point();
-    p.setLocation(a.getX1()+ta*(a.getX2()-a.getX1()), a.getY1()+ta*(a.getY2()-a.getY1()));
-    return p;
-  }
+		g.setStroke(THICK_TASK_BORDER_STROKE);
+
+		RoundRectangle2D rect = new RoundRectangle2D.Double(x, y, width, height, 20, 20);
+		g.draw(rect);
+
+		g.setPaint(originalPaint);
+		g.setStroke(originalStroke);
+	}
+
+	public void drawTextAnnotation(String text, GraphicInfo graphicInfo) {
+		int x = (int) graphicInfo.getX();
+		int y = (int) graphicInfo.getY();
+		int width = (int) graphicInfo.getWidth();
+		int height = (int) graphicInfo.getHeight();
+
+		Font originalFont = g.getFont();
+		Stroke originalStroke = g.getStroke();
+
+		g.setFont(ANNOTATION_FONT);
+
+		Path2D path = new Path2D.Double();
+		x += .5;
+		int lineLength = 18;
+		path.moveTo(x + lineLength, y);
+		path.lineTo(x, y);
+		path.lineTo(x, y + height);
+		path.lineTo(x + lineLength, y + height);
+
+		path.lineTo(x + lineLength, y + height - 1);
+		path.lineTo(x + 1, y + height - 1);
+		path.lineTo(x + 1, y + 1);
+		path.lineTo(x + lineLength, y + 1);
+		path.closePath();
+
+		g.draw(path);
+
+		int boxWidth = width - (2 * ANNOTATION_TEXT_PADDING);
+		int boxHeight = height - (2 * ANNOTATION_TEXT_PADDING);
+		int boxX = x + width / 2 - boxWidth / 2;
+		int boxY = y + height / 2 - boxHeight / 2;
+
+		if (text != null && text.isEmpty() == false) {
+			drawMultilineAnnotationText(text, boxX, boxY, boxWidth, boxHeight);
+		}
+
+		// restore originals
+		g.setFont(originalFont);
+		g.setStroke(originalStroke);
+	}
+
+	public void drawLabel(String text, GraphicInfo graphicInfo) {
+		drawLabel(text, graphicInfo, true);
+	}
+
+	public void drawLabel(String text, GraphicInfo graphicInfo, boolean centered) {
+		float interline = 1.0f;
+
+		// text
+		if (text != null && text.length() > 0) {
+			Paint originalPaint = g.getPaint();
+			Font originalFont = g.getFont();
+
+			g.setPaint(LABEL_COLOR);
+			g.setFont(LABEL_FONT);
+
+			int wrapWidth = 100;
+			int textY = (int) graphicInfo.getY();
+
+			// TODO: use drawMultilineText()
+			AttributedString as = new AttributedString(text);
+			as.addAttribute(TextAttribute.FOREGROUND, g.getPaint());
+			as.addAttribute(TextAttribute.FONT, g.getFont());
+			AttributedCharacterIterator aci = as.getIterator();
+			FontRenderContext frc = new FontRenderContext(null, true, false);
+			LineBreakMeasurer lbm = new LineBreakMeasurer(aci, frc);
+
+			while (lbm.getPosition() < text.length()) {
+				TextLayout tl = lbm.nextLayout(wrapWidth);
+				textY += tl.getAscent();
+				Rectangle2D bb = tl.getBounds();
+				double tX = graphicInfo.getX();
+				if (centered) {
+					tX += (int) (graphicInfo.getWidth() / 2 - bb.getWidth() / 2);
+				}
+				tl.draw(g, (float) tX, textY);
+				textY += tl.getDescent() + tl.getLeading() + (interline - 1.0f) * tl.getAscent();
+			}
+
+			// restore originals
+			g.setFont(originalFont);
+			g.setPaint(originalPaint);
+		}
+	}
+
+	/**
+	 * This method makes coordinates of connection flow better.
+	 *
+	 * @param sourceShapeType
+	 * @param targetShapeType
+	 * @param sourceGraphicInfo
+	 * @param targetGraphicInfo
+	 * @param graphicInfoList
+	 */
+	public List<GraphicInfo> connectionPerfectionizer(SHAPE_TYPE sourceShapeType, SHAPE_TYPE targetShapeType, GraphicInfo sourceGraphicInfo, GraphicInfo targetGraphicInfo, List<GraphicInfo> graphicInfoList) {
+		Shape shapeFirst = createShape(sourceShapeType, sourceGraphicInfo);
+		Shape shapeLast = createShape(targetShapeType, targetGraphicInfo);
+
+		if (graphicInfoList != null && graphicInfoList.size() > 0) {
+			GraphicInfo graphicInfoFirst = graphicInfoList.get(0);
+			GraphicInfo graphicInfoLast = graphicInfoList.get(graphicInfoList.size() - 1);
+			if (shapeFirst != null) {
+				graphicInfoFirst.setX(shapeFirst.getBounds2D().getCenterX());
+				graphicInfoFirst.setY(shapeFirst.getBounds2D().getCenterY());
+			}
+			if (shapeLast != null) {
+				graphicInfoLast.setX(shapeLast.getBounds2D().getCenterX());
+				graphicInfoLast.setY(shapeLast.getBounds2D().getCenterY());
+			}
+
+			Point p = null;
+
+			if (shapeFirst != null) {
+				Line2D.Double lineFirst = new Line2D.Double(graphicInfoFirst.getX(), graphicInfoFirst.getY(), graphicInfoList.get(1).getX(), graphicInfoList.get(1).getY());
+				p = getIntersection(shapeFirst, lineFirst);
+				if (p != null) {
+					graphicInfoFirst.setX(p.getX());
+					graphicInfoFirst.setY(p.getY());
+				}
+			}
+
+			if (shapeLast != null) {
+				Line2D.Double lineLast = new Line2D.Double(graphicInfoLast.getX(), graphicInfoLast.getY(), graphicInfoList.get(graphicInfoList.size() - 2).getX(), graphicInfoList.get(graphicInfoList.size() - 2).getY());
+				p = getIntersection(shapeLast, lineLast);
+				if (p != null) {
+					graphicInfoLast.setX(p.getX());
+					graphicInfoLast.setY(p.getY());
+				}
+			}
+		}
+
+		return graphicInfoList;
+	}
+
+	public enum SHAPE_TYPE {Rectangle, Rhombus, Ellipse}
 }
diff --git a/len-activiti/src/main/java/org/activiti/image/impl/DefaultProcessDiagramGenerator.java b/len-activiti/src/main/java/org/activiti/image/impl/DefaultProcessDiagramGenerator.java
index c4a72ab..ebbc987 100644
--- a/len-activiti/src/main/java/org/activiti/image/impl/DefaultProcessDiagramGenerator.java
+++ b/len-activiti/src/main/java/org/activiti/image/impl/DefaultProcessDiagramGenerator.java
@@ -1,9 +1,9 @@
 /* Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -13,1133 +13,1084 @@
 
 package org.activiti.image.impl;
 
+import org.activiti.bpmn.model.Event;
+import org.activiti.bpmn.model.Process;
+import org.activiti.bpmn.model.*;
+import org.activiti.image.HMProcessDiagramGenerator;
+
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-
-import org.activiti.bpmn.model.Activity;
-import org.activiti.bpmn.model.Artifact;
-import org.activiti.bpmn.model.Association;
-import org.activiti.bpmn.model.AssociationDirection;
-import org.activiti.bpmn.model.BaseElement;
-import org.activiti.bpmn.model.BoundaryEvent;
-import org.activiti.bpmn.model.BpmnModel;
-import org.activiti.bpmn.model.BusinessRuleTask;
-import org.activiti.bpmn.model.CallActivity;
-import org.activiti.bpmn.model.CompensateEventDefinition;
-import org.activiti.bpmn.model.EndEvent;
-import org.activiti.bpmn.model.ErrorEventDefinition;
-import org.activiti.bpmn.model.Event;
-import org.activiti.bpmn.model.EventDefinition;
-import org.activiti.bpmn.model.EventGateway;
-import org.activiti.bpmn.model.EventSubProcess;
-import org.activiti.bpmn.model.ExclusiveGateway;
-import org.activiti.bpmn.model.FlowElement;
-import org.activiti.bpmn.model.FlowElementsContainer;
-import org.activiti.bpmn.model.FlowNode;
-import org.activiti.bpmn.model.Gateway;
-import org.activiti.bpmn.model.GraphicInfo;
-import org.activiti.bpmn.model.InclusiveGateway;
-import org.activiti.bpmn.model.IntermediateCatchEvent;
-import org.activiti.bpmn.model.Lane;
-import org.activiti.bpmn.model.ManualTask;
-import org.activiti.bpmn.model.MessageEventDefinition;
-import org.activiti.bpmn.model.MultiInstanceLoopCharacteristics;
-import org.activiti.bpmn.model.ParallelGateway;
-import org.activiti.bpmn.model.Pool;
-import org.activiti.bpmn.model.Process;
-import org.activiti.bpmn.model.ReceiveTask;
-import org.activiti.bpmn.model.ScriptTask;
-import org.activiti.bpmn.model.SendTask;
-import org.activiti.bpmn.model.SequenceFlow;
-import org.activiti.bpmn.model.ServiceTask;
-import org.activiti.bpmn.model.SignalEventDefinition;
-import org.activiti.bpmn.model.StartEvent;
-import org.activiti.bpmn.model.SubProcess;
-import org.activiti.bpmn.model.Task;
-import org.activiti.bpmn.model.TextAnnotation;
-import org.activiti.bpmn.model.ThrowEvent;
-import org.activiti.bpmn.model.TimerEventDefinition;
-import org.activiti.bpmn.model.UserTask;
-import org.activiti.image.HMProcessDiagramGenerator;
-import org.activiti.image.ProcessDiagramGenerator;
+import java.util.*;
 
 /**
  * Class to generate an image based the diagram interchange information in a
  * BPMN 2.0 process.
- * 
+ *
  * @author Joram Barrez
  * @author Tijs Rademakers
  */
 public class DefaultProcessDiagramGenerator implements HMProcessDiagramGenerator {
 
-  protected Map<Class<? extends BaseElement>, ActivityDrawInstruction> activityDrawInstructions = new HashMap<Class<? extends BaseElement>, ActivityDrawInstruction>();
-  protected Map<Class<? extends BaseElement>, ArtifactDrawInstruction> artifactDrawInstructions = new HashMap<Class<? extends BaseElement>, ArtifactDrawInstruction>();
-  
-  public DefaultProcessDiagramGenerator() {
-    this(1.0);
-  }
-  
-  // The instructions on how to draw a certain construct is
-  // created statically and stored in a map for performance.
-  public DefaultProcessDiagramGenerator(final double scaleFactor) {
-    // start event
-    activityDrawInstructions.put(StartEvent.class, new ActivityDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        StartEvent startEvent = (StartEvent) flowNode;
-        if (startEvent.getEventDefinitions() != null && !startEvent.getEventDefinitions().isEmpty()) {
-          EventDefinition eventDefinition = startEvent.getEventDefinitions().get(0);
-          if (eventDefinition instanceof TimerEventDefinition) {
-            processDiagramCanvas.drawTimerStartEvent(graphicInfo, scaleFactor);
-          } else if (eventDefinition instanceof ErrorEventDefinition) {
-            processDiagramCanvas.drawErrorStartEvent(graphicInfo, scaleFactor);
-          } else if (eventDefinition instanceof SignalEventDefinition) {
-            processDiagramCanvas.drawSignalStartEvent(graphicInfo, scaleFactor);
-          } else if (eventDefinition instanceof MessageEventDefinition) {
-            processDiagramCanvas.drawMessageStartEvent(graphicInfo, scaleFactor);
-          } else {
-            processDiagramCanvas.drawNoneStartEvent(graphicInfo);
-          }
-        } else {
-          processDiagramCanvas.drawNoneStartEvent(graphicInfo);
-        }
-      }
-    });
-
-    // signal catch
-    activityDrawInstructions.put(IntermediateCatchEvent.class, new ActivityDrawInstruction() {
-      
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        IntermediateCatchEvent intermediateCatchEvent = (IntermediateCatchEvent) flowNode;
-        if (intermediateCatchEvent.getEventDefinitions() != null && !intermediateCatchEvent.getEventDefinitions()
-                                                                                           .isEmpty()) {
-          if (intermediateCatchEvent.getEventDefinitions().get(0) instanceof SignalEventDefinition) {
-            processDiagramCanvas.drawCatchingSignalEvent(flowNode.getName(), graphicInfo, true, scaleFactor);
-          } else if (intermediateCatchEvent.getEventDefinitions().get(0) instanceof TimerEventDefinition) {
-            processDiagramCanvas.drawCatchingTimerEvent(flowNode.getName(), graphicInfo, true, scaleFactor);
-          } else if (intermediateCatchEvent.getEventDefinitions().get(0) instanceof MessageEventDefinition) {
-            processDiagramCanvas.drawCatchingMessageEvent(flowNode.getName(), graphicInfo, true, scaleFactor);  
-          }
-        }
-      }
-    });
-    
-    // signal throw
-    activityDrawInstructions.put(ThrowEvent.class, new ActivityDrawInstruction() {
-      
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        ThrowEvent throwEvent = (ThrowEvent) flowNode;
-        if (throwEvent.getEventDefinitions() != null && !throwEvent.getEventDefinitions().isEmpty()) {
-          if (throwEvent.getEventDefinitions().get(0) instanceof SignalEventDefinition) {
-            processDiagramCanvas.drawThrowingSignalEvent(graphicInfo, scaleFactor);
-          } else if (throwEvent.getEventDefinitions().get(0) instanceof CompensateEventDefinition) {
-            processDiagramCanvas.drawThrowingCompensateEvent(graphicInfo, scaleFactor);
-          } else {
-            processDiagramCanvas.drawThrowingNoneEvent(graphicInfo, scaleFactor);
-          }
-        } else {
-          processDiagramCanvas.drawThrowingNoneEvent(graphicInfo, scaleFactor);
-        }
-      }
-    });
-    
-    // end event
-    activityDrawInstructions.put(EndEvent.class, new ActivityDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        EndEvent endEvent = (EndEvent) flowNode;
-        if (endEvent.getEventDefinitions() != null && !endEvent.getEventDefinitions().isEmpty()) {
-          if (endEvent.getEventDefinitions().get(0) instanceof ErrorEventDefinition) {
-            processDiagramCanvas.drawErrorEndEvent(flowNode.getName(), graphicInfo, scaleFactor);
-          } else {
-            processDiagramCanvas.drawNoneEndEvent(graphicInfo, scaleFactor);
-          }
-        } else {
-          processDiagramCanvas.drawNoneEndEvent(graphicInfo, scaleFactor);
-        }
-      }
-    });
-
-    // task
-    activityDrawInstructions.put(Task.class, new ActivityDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        processDiagramCanvas.drawTask(flowNode.getName(), graphicInfo);
-      }
-    });
-
-    // user task
-    activityDrawInstructions.put(UserTask.class, new ActivityDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        processDiagramCanvas.drawUserTask(flowNode.getName(), graphicInfo, scaleFactor);
-      }
-    });
-
-    // script task
-    activityDrawInstructions.put(ScriptTask.class, new ActivityDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        processDiagramCanvas.drawScriptTask(flowNode.getName(), graphicInfo, scaleFactor);
-      }
-    });
-
-    // service task
-    activityDrawInstructions.put(ServiceTask.class, new ActivityDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        ServiceTask serviceTask = (ServiceTask) flowNode;
-        if ("camel".equalsIgnoreCase(serviceTask.getType())) {
-          processDiagramCanvas.drawCamelTask(serviceTask.getName(), graphicInfo, scaleFactor);
-        } else if ("mule".equalsIgnoreCase(serviceTask.getType())) {
-          processDiagramCanvas.drawMuleTask(serviceTask.getName(), graphicInfo, scaleFactor);
-        } else {
-          processDiagramCanvas.drawServiceTask(serviceTask.getName(), graphicInfo, scaleFactor);
-        }
-      }
-    });
-
-    // receive task
-    activityDrawInstructions.put(ReceiveTask.class, new ActivityDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        processDiagramCanvas.drawReceiveTask(flowNode.getName(), graphicInfo, scaleFactor);
-      }
-    });
-
-    // send task
-    activityDrawInstructions.put(SendTask.class, new ActivityDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        processDiagramCanvas.drawSendTask(flowNode.getName(), graphicInfo, scaleFactor);
-      }
-    });
-
-    // manual task
-    activityDrawInstructions.put(ManualTask.class, new ActivityDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        processDiagramCanvas.drawManualTask(flowNode.getName(), graphicInfo, scaleFactor);
-      }
-    });
-    
-    // businessRuleTask task
-    activityDrawInstructions.put(BusinessRuleTask.class, new ActivityDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        processDiagramCanvas.drawBusinessRuleTask(flowNode.getName(), graphicInfo, scaleFactor);
-      }
-    });
-
-    // exclusive gateway
-    activityDrawInstructions.put(ExclusiveGateway.class, new ActivityDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        processDiagramCanvas.drawExclusiveGateway(graphicInfo, scaleFactor);
-      }
-    });
-
-    // inclusive gateway
-    activityDrawInstructions.put(InclusiveGateway.class, new ActivityDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        processDiagramCanvas.drawInclusiveGateway(graphicInfo, scaleFactor);
-      }
-    });
-
-    // parallel gateway
-    activityDrawInstructions.put(ParallelGateway.class, new ActivityDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        processDiagramCanvas.drawParallelGateway(graphicInfo, scaleFactor);
-      }
-    });
-    
-    // event based gateway
-    activityDrawInstructions.put(EventGateway.class, new ActivityDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        processDiagramCanvas.drawEventBasedGateway(graphicInfo, scaleFactor);
-      }
-    });
-    
-
-    // Boundary timer
-    activityDrawInstructions.put(BoundaryEvent.class, new ActivityDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        BoundaryEvent boundaryEvent = (BoundaryEvent) flowNode;
-        if (boundaryEvent.getEventDefinitions() != null && !boundaryEvent.getEventDefinitions().isEmpty()) {
-          if (boundaryEvent.getEventDefinitions().get(0) instanceof TimerEventDefinition) {
-            
-            processDiagramCanvas.drawCatchingTimerEvent(flowNode.getName(), graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor);
-            
-          } else if (boundaryEvent.getEventDefinitions().get(0) instanceof ErrorEventDefinition) {
-            
-            processDiagramCanvas.drawCatchingErrorEvent(graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor);
-            
-          } else if (boundaryEvent.getEventDefinitions().get(0) instanceof SignalEventDefinition) {
-            processDiagramCanvas.drawCatchingSignalEvent(flowNode.getName(), graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor);
-
-          } else if (boundaryEvent.getEventDefinitions().get(0) instanceof MessageEventDefinition) {
-            processDiagramCanvas.drawCatchingMessageEvent(flowNode.getName(), graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor);  
-
-          } else if (boundaryEvent.getEventDefinitions().get(0) instanceof CompensateEventDefinition) {
-            processDiagramCanvas.drawCatchingCompensateEvent(graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor);
-          }
-        }
-        
-      }
-    });
-
-    // subprocess
-    activityDrawInstructions.put(SubProcess.class, new ActivityDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        if (graphicInfo.getExpanded() != null && !graphicInfo.getExpanded()) {
-          processDiagramCanvas.drawCollapsedSubProcess(flowNode.getName(), graphicInfo, false);
-        } else {
-          processDiagramCanvas.drawExpandedSubProcess(flowNode.getName(), graphicInfo, false, scaleFactor);
-        }
-      }
-    });
-    
-    // Event subprocess
-    activityDrawInstructions.put(EventSubProcess.class, new ActivityDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        if (graphicInfo.getExpanded() != null && !graphicInfo.getExpanded()) {
-          processDiagramCanvas.drawCollapsedSubProcess(flowNode.getName(), graphicInfo, true);
-        } else {
-          processDiagramCanvas.drawExpandedSubProcess(flowNode.getName(), graphicInfo, true, scaleFactor);
-        }
-      }
-    });
-
-    // call activity
-    activityDrawInstructions.put(CallActivity.class, new ActivityDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-        processDiagramCanvas.drawCollapsedCallActivity(flowNode.getName(), graphicInfo);
-      }
-    });
-
-    // text annotation
-    artifactDrawInstructions.put(TextAnnotation.class, new ArtifactDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, Artifact artifact) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(artifact.getId());
-        TextAnnotation textAnnotation = (TextAnnotation) artifact;
-        processDiagramCanvas.drawTextAnnotation(textAnnotation.getText(), graphicInfo);
-      }
-    });
-    
-    // association
-    artifactDrawInstructions.put(Association.class, new ArtifactDrawInstruction() {
-
-      public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, Artifact artifact) {
-        Association association = (Association) artifact;
-        String sourceRef = association.getSourceRef();
-        String targetRef = association.getTargetRef();
-        
-        // source and target can be instance of FlowElement or Artifact
-        BaseElement sourceElement = bpmnModel.getFlowElement(sourceRef);
-        BaseElement targetElement = bpmnModel.getFlowElement(targetRef);
-        if (sourceElement == null) {
-            sourceElement = bpmnModel.getArtifact(sourceRef);
-        }
-        if (targetElement == null) {
-            targetElement = bpmnModel.getArtifact(targetRef);
-        }
-        List<GraphicInfo> graphicInfoList = bpmnModel.getFlowLocationGraphicInfo(artifact.getId());
-        graphicInfoList = connectionPerfectionizer(processDiagramCanvas, bpmnModel, sourceElement, targetElement, graphicInfoList);
-        int xPoints[]= new int[graphicInfoList.size()];
-        int yPoints[]= new int[graphicInfoList.size()];
-        for (int i=1; i<graphicInfoList.size(); i++) {
-            GraphicInfo graphicInfo = graphicInfoList.get(i);
-            GraphicInfo previousGraphicInfo = graphicInfoList.get(i-1);
-            
-            if (i == 1) {
-              xPoints[0] = (int) previousGraphicInfo.getX();
-              yPoints[0] = (int) previousGraphicInfo.getY();
-            }
-            xPoints[i] = (int) graphicInfo.getX();
-            yPoints[i] = (int) graphicInfo.getY();
-        }
-
-        AssociationDirection associationDirection = association.getAssociationDirection();
-        processDiagramCanvas.drawAssociation(xPoints, yPoints, associationDirection, false, scaleFactor);
-      }
-    });
-  }
-
-  public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities, List<String> highLightedFlows,
-      String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor) {
-    
-    return generateProcessDiagram(bpmnModel, imageType, highLightedActivities, highLightedFlows, 
-        activityFontName, labelFontName, annotationFontName, customClassLoader, scaleFactor).generateImage(imageType);
-  }
-
-  public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities, List<String> highLightedFlows,
-                                     String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor,
-                                     List<String> highLightedCurrentActivities) {
-
-    return generateProcessDiagram(bpmnModel, imageType, highLightedActivities, highLightedFlows,
-            activityFontName, labelFontName, annotationFontName, customClassLoader, scaleFactor,highLightedCurrentActivities).generateImage(imageType);
-  }
-  
-  public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities, List<String> highLightedFlows) {
-    return generateDiagram(bpmnModel, imageType, highLightedActivities, highLightedFlows, null, null, null, null, 1.0);
-  }
-  
-  public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, 
-      List<String> highLightedActivities, List<String> highLightedFlows, double scaleFactor) {
-    return generateDiagram(bpmnModel, imageType, highLightedActivities, highLightedFlows, null, null, null, null, scaleFactor);
-  }
-  
-  public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities) {
-    return generateDiagram(bpmnModel, imageType, highLightedActivities, Collections.<String>emptyList());
-  }
-  
-  public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities, double scaleFactor) {
-    return generateDiagram(bpmnModel, imageType, highLightedActivities, Collections.<String>emptyList(), scaleFactor);
-  }
-  
-  public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader) {
-    return generateDiagram(bpmnModel, imageType, Collections.<String>emptyList(), Collections.<String>emptyList(), 
-        activityFontName, labelFontName, annotationFontName, customClassLoader, 1.0);
-  }
-  
-  public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, String activityFontName, 
-      String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor) {
-    
-    return generateDiagram(bpmnModel, imageType, Collections.<String>emptyList(), Collections.<String>emptyList(), 
-        activityFontName, labelFontName, annotationFontName, customClassLoader, scaleFactor);
-  }
-
-  public InputStream generatePngDiagram(BpmnModel bpmnModel) {
-    return generatePngDiagram(bpmnModel, 1.0);
-  }
-  
-  public InputStream generatePngDiagram(BpmnModel bpmnModel, double scaleFactor) {
-    return generateDiagram(bpmnModel, "png", Collections.<String>emptyList(), Collections.<String>emptyList(), scaleFactor);
-  }
-
-  public InputStream generateJpgDiagram(BpmnModel bpmnModel) {
-    return generateJpgDiagram(bpmnModel, 1.0);
-  }
-  
-  public InputStream generateJpgDiagram(BpmnModel bpmnModel, double scaleFactor) {
-    return generateDiagram(bpmnModel, "jpg", Collections.<String>emptyList(), Collections.<String>emptyList());
-  }
-  
-  public BufferedImage generateImage(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities, List<String> highLightedFlows,
-      String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor) {
-    
-    return generateProcessDiagram(bpmnModel, imageType, highLightedActivities, highLightedFlows, 
-        activityFontName, labelFontName, annotationFontName, customClassLoader, scaleFactor).generateBufferedImage(imageType);
-  }
-  
-  public BufferedImage generateImage(BpmnModel bpmnModel, String imageType, 
-      List<String> highLightedActivities, List<String> highLightedFlows, double scaleFactor) {
-    
-    return generateImage(bpmnModel, imageType, highLightedActivities, highLightedFlows, null, null, null, null, scaleFactor);
-  }
-  
-  public BufferedImage generatePngImage(BpmnModel bpmnModel, double scaleFactor) {
-    return generateImage(bpmnModel, "png", Collections.<String>emptyList(), Collections.<String>emptyList(), scaleFactor);
-  }
-
-  protected DefaultProcessDiagramCanvas generateProcessDiagram(BpmnModel bpmnModel, String imageType, 
-      List<String> highLightedActivities, List<String> highLightedFlows,
-      String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor) {
-  	
-  	prepareBpmnModel(bpmnModel);
-    
-    DefaultProcessDiagramCanvas processDiagramCanvas = initProcessDiagramCanvas(bpmnModel, imageType, activityFontName, labelFontName, annotationFontName, customClassLoader);
-    
-    // Draw pool shape, if process is participant in collaboration
-    for (Pool pool : bpmnModel.getPools()) {
-      GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(pool.getId());
-      processDiagramCanvas.drawPoolOrLane(pool.getName(), graphicInfo);
-    }
-    
-    // Draw lanes
-    for (Process process : bpmnModel.getProcesses()) {
-      for (Lane lane : process.getLanes()) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(lane.getId());
-        processDiagramCanvas.drawPoolOrLane(lane.getName(), graphicInfo);
-      }
-    }
-    
-    // Draw activities and their sequence-flows
-    for (Process process: bpmnModel.getProcesses()) {
-      for (FlowNode flowNode : process.findFlowElementsOfType(FlowNode.class)) {
-        drawActivity(processDiagramCanvas, bpmnModel, flowNode, highLightedActivities, highLightedFlows, scaleFactor);
-      }
-    }
-    
-    // Draw artifacts
-    for (Process process : bpmnModel.getProcesses()) {
-      
-      for (Artifact artifact : process.getArtifacts()) {
-        drawArtifact(processDiagramCanvas, bpmnModel, artifact);
-      }
-      
-      List<SubProcess> subProcesses = process.findFlowElementsOfType(SubProcess.class, true);
-      if (subProcesses != null) {
-        for (SubProcess subProcess : subProcesses) {
-          for (Artifact subProcessArtifact : subProcess.getArtifacts()) {
-            drawArtifact(processDiagramCanvas, bpmnModel, subProcessArtifact);
-          }
-        }
-      }
-    }
-    
-    return processDiagramCanvas;
-  }
-
-
-  protected DefaultProcessDiagramCanvas generateProcessDiagram(BpmnModel bpmnModel, String imageType,
-                                                               List<String> highLightedActivities, List<String> highLightedFlows,
-                                                               String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor,
-                                                               List<String> highCurrentLightedActivities) {
-
-    prepareBpmnModel(bpmnModel);
-
-    DefaultProcessDiagramCanvas processDiagramCanvas = initProcessDiagramCanvas(bpmnModel, imageType, activityFontName, labelFontName, annotationFontName, customClassLoader);
-
-    // Draw pool shape, if process is participant in collaboration
-    for (Pool pool : bpmnModel.getPools()) {
-      GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(pool.getId());
-      processDiagramCanvas.drawPoolOrLane(pool.getName(), graphicInfo);
-    }
-
-    // Draw lanes
-    for (Process process : bpmnModel.getProcesses()) {
-      for (Lane lane : process.getLanes()) {
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(lane.getId());
-        processDiagramCanvas.drawPoolOrLane(lane.getName(), graphicInfo);
-      }
-    }
-
-    // Draw activities and their sequence-flows
-    for (Process process: bpmnModel.getProcesses()) {
-      for (FlowNode flowNode : process.findFlowElementsOfType(FlowNode.class)) {
-        drawActivity(processDiagramCanvas, bpmnModel, flowNode, highLightedActivities, highLightedFlows, scaleFactor,highCurrentLightedActivities);
-      }
-    }
-
-    // Draw artifacts
-    for (Process process : bpmnModel.getProcesses()) {
-
-      for (Artifact artifact : process.getArtifacts()) {
-        drawArtifact(processDiagramCanvas, bpmnModel, artifact);
-      }
-
-      List<SubProcess> subProcesses = process.findFlowElementsOfType(SubProcess.class, true);
-      if (subProcesses != null) {
-        for (SubProcess subProcess : subProcesses) {
-          for (Artifact subProcessArtifact : subProcess.getArtifacts()) {
-            drawArtifact(processDiagramCanvas, bpmnModel, subProcessArtifact);
-          }
-        }
-      }
-    }
-
-    return processDiagramCanvas;
-  }
-
-  protected void prepareBpmnModel(BpmnModel bpmnModel) {
-  
-  	// Need to make sure all elements have positive x and y. 
-  	// Check all graphicInfo and update the elements accordingly
-  	
-  	List<GraphicInfo> allGraphicInfos = new ArrayList<GraphicInfo>();
-  	if (bpmnModel.getLocationMap() != null) {
-  		allGraphicInfos.addAll(bpmnModel.getLocationMap().values());
-  	}
-  	if (bpmnModel.getLabelLocationMap() != null) {
-  		allGraphicInfos.addAll(bpmnModel.getLabelLocationMap().values());
-  	}
-  	if (bpmnModel.getFlowLocationMap() != null) {
-  		for (List<GraphicInfo> flowGraphicInfos : bpmnModel.getFlowLocationMap().values()) {
-  			allGraphicInfos.addAll(flowGraphicInfos);
-  		}
-  	}
-  	
-  	if (allGraphicInfos.size() > 0) {
-  		
-  		boolean needsTranslationX = false;
-  		boolean needsTranslationY = false;
-  		
-  		double lowestX = 0.0;
-  		double lowestY = 0.0;
-  		
-  		// Collect lowest x and y
-  		for (GraphicInfo graphicInfo : allGraphicInfos) {
-  			
-  			double x = graphicInfo.getX();
-  			double y = graphicInfo.getY();
-  			
-  			if (x < lowestX) {
-  				needsTranslationX = true;
-  				lowestX = x;
-  			}
-  			if (y < lowestY) {
-  				needsTranslationY = true;
-  				lowestY = y;
-  			}
-  			
-  		}
-  		
-  		// Update all graphicInfo objects
-  		if (needsTranslationX || needsTranslationY) {
-  			
-  			double translationX = Math.abs(lowestX);
-  			double translationY = Math.abs(lowestY);
-  			
-  			for (GraphicInfo graphicInfo : allGraphicInfos) {
-  				if (needsTranslationX) {
-  					graphicInfo.setX(graphicInfo.getX() + translationX);
-  				}
-  				if(needsTranslationY) {
-  					graphicInfo.setY(graphicInfo.getY() + translationY);
-  				}
-  			}
-  		}
-
-  	}
-  	
-  }
-
-  protected void drawActivity(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel,
-                              FlowNode flowNode, List<String> highLightedActivities, List<String> highLightedFlows, double scaleFactor) {
-
-    ActivityDrawInstruction drawInstruction = activityDrawInstructions.get(flowNode.getClass());
-    if (drawInstruction != null) {
-
-      drawInstruction.draw(processDiagramCanvas, bpmnModel, flowNode);
-
-      // Gather info on the multi instance marker
-      boolean multiInstanceSequential = false, multiInstanceParallel = false, collapsed = false;
-      if (flowNode instanceof Activity) {
-        Activity activity = (Activity) flowNode;
-        MultiInstanceLoopCharacteristics multiInstanceLoopCharacteristics = activity.getLoopCharacteristics();
-        if (multiInstanceLoopCharacteristics != null) {
-          multiInstanceSequential = multiInstanceLoopCharacteristics.isSequential();
-          multiInstanceParallel = !multiInstanceSequential;
-        }
-      }
-
-      // Gather info on the collapsed marker
-      GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-      if (flowNode instanceof SubProcess) {
-        collapsed = graphicInfo.getExpanded() != null && !graphicInfo.getExpanded();
-      } else if (flowNode instanceof CallActivity) {
-        collapsed = true;
-      }
-
-      if (scaleFactor == 1.0) {
-        // Actually draw the markers
-        processDiagramCanvas.drawActivityMarkers((int) graphicInfo.getX(), (int) graphicInfo.getY(),(int) graphicInfo.getWidth(), (int) graphicInfo.getHeight(),
-                multiInstanceSequential, multiInstanceParallel, collapsed);
-      }
-
-      // Draw highlighted activities
-      if (highLightedActivities.contains(flowNode.getId())) {
-        drawHighLight(processDiagramCanvas, bpmnModel.getGraphicInfo(flowNode.getId()));
-      }
-
-    }
-
-    // Outgoing transitions of activity
-    for (SequenceFlow sequenceFlow : flowNode.getOutgoingFlows()) {
-      boolean highLighted = (highLightedFlows.contains(sequenceFlow.getId()));
-      String defaultFlow = null;
-      if (flowNode instanceof Activity) {
-        defaultFlow = ((Activity) flowNode).getDefaultFlow();
-      } else if (flowNode instanceof Gateway) {
-        defaultFlow = ((Gateway) flowNode).getDefaultFlow();
-      }
-
-      boolean isDefault = false;
-      if (defaultFlow != null && defaultFlow.equalsIgnoreCase(sequenceFlow.getId())) {
-        isDefault = true;
-      }
-      boolean drawConditionalIndicator = sequenceFlow.getConditionExpression() != null && !(flowNode instanceof Gateway);
-
-      String sourceRef = sequenceFlow.getSourceRef();
-      String targetRef = sequenceFlow.getTargetRef();
-      FlowElement sourceElement = bpmnModel.getFlowElement(sourceRef);
-      FlowElement targetElement = bpmnModel.getFlowElement(targetRef);
-      List<GraphicInfo> graphicInfoList = bpmnModel.getFlowLocationGraphicInfo(sequenceFlow.getId());
-      if (graphicInfoList != null && graphicInfoList.size() > 0) {
-        graphicInfoList = connectionPerfectionizer(processDiagramCanvas, bpmnModel, sourceElement, targetElement, graphicInfoList);
-        int xPoints[]= new int[graphicInfoList.size()];
-        int yPoints[]= new int[graphicInfoList.size()];
-
-        for (int i=1; i<graphicInfoList.size(); i++) {
-          GraphicInfo graphicInfo = graphicInfoList.get(i);
-          GraphicInfo previousGraphicInfo = graphicInfoList.get(i-1);
-
-          if (i == 1) {
-            xPoints[0] = (int) previousGraphicInfo.getX();
-            yPoints[0] = (int) previousGraphicInfo.getY();
-          }
-          xPoints[i] = (int) graphicInfo.getX();
-          yPoints[i] = (int) graphicInfo.getY();
-
-        }
-
-        processDiagramCanvas.drawSequenceflow(xPoints, yPoints, drawConditionalIndicator, isDefault, highLighted, scaleFactor);
-
-        // Draw sequenceflow label
-        GraphicInfo labelGraphicInfo = bpmnModel.getLabelGraphicInfo(sequenceFlow.getId());
-        if (labelGraphicInfo != null) {
-          processDiagramCanvas.drawLabel(sequenceFlow.getName(), labelGraphicInfo, false);
-        }else
-        {
-          GraphicInfo lineCenter = getLineCenter(graphicInfoList);
-          processDiagramCanvas.drawLabel(sequenceFlow.getName(), lineCenter, false);
-        }
-      }
-    }
-
-    // Nested elements
-    if (flowNode instanceof FlowElementsContainer) {
-      for (FlowElement nestedFlowElement : ((FlowElementsContainer) flowNode).getFlowElements()) {
-        if (nestedFlowElement instanceof FlowNode) {
-          drawActivity(processDiagramCanvas, bpmnModel, (FlowNode) nestedFlowElement,
-                  highLightedActivities, highLightedFlows, scaleFactor);
-        }
-      }
-    }
-  }
-
-
-  protected void drawActivity(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, 
-      FlowNode flowNode, List<String> highLightedActivities, List<String> highLightedFlows, double scaleFactor, List<String> highLightedExecutedActivities) {
-    
-    ActivityDrawInstruction drawInstruction = activityDrawInstructions.get(flowNode.getClass());
-    if (drawInstruction != null) {
-      
-      drawInstruction.draw(processDiagramCanvas, bpmnModel, flowNode);
-
-      // Gather info on the multi instance marker
-      boolean multiInstanceSequential = false, multiInstanceParallel = false, collapsed = false;
-      if (flowNode instanceof Activity) {
-        Activity activity = (Activity) flowNode;
-        MultiInstanceLoopCharacteristics multiInstanceLoopCharacteristics = activity.getLoopCharacteristics();
-        if (multiInstanceLoopCharacteristics != null) {
-          multiInstanceSequential = multiInstanceLoopCharacteristics.isSequential();
-          multiInstanceParallel = !multiInstanceSequential;
-        }
-      }
-
-      // Gather info on the collapsed marker
-      GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId()); 
-      if (flowNode instanceof SubProcess) {
-        collapsed = graphicInfo.getExpanded() != null && !graphicInfo.getExpanded();
-      } else if (flowNode instanceof CallActivity) {
-        collapsed = true;
-      }
-
-      if (scaleFactor == 1.0) {
-        // Actually draw the markers
-        processDiagramCanvas.drawActivityMarkers((int) graphicInfo.getX(), (int) graphicInfo.getY(),(int) graphicInfo.getWidth(), (int) graphicInfo.getHeight(), 
-                multiInstanceSequential, multiInstanceParallel, collapsed);
-      }
-
-      // Draw highlighted activities
-      if (highLightedActivities.contains(flowNode.getId())) {
-        drawHighLight(processDiagramCanvas, bpmnModel.getGraphicInfo(flowNode.getId()));
-      }
-
-      if (highLightedExecutedActivities.contains(flowNode.getId())) {
-        processDiagramCanvas.HIGHLIGHT_COLOR = Color.RED;
-        drawColorHighLight(processDiagramCanvas, bpmnModel.getGraphicInfo(flowNode.getId()),Color.RED);
-        processDiagramCanvas.HIGHLIGHT_COLOR = Color.GREEN;
-      }
-
-    }
-    
-    // Outgoing transitions of activity
-    for (SequenceFlow sequenceFlow : flowNode.getOutgoingFlows()) {
-      boolean highLighted = (highLightedFlows.contains(sequenceFlow.getId()));
-      String defaultFlow = null;
-      if (flowNode instanceof Activity) {
-        defaultFlow = ((Activity) flowNode).getDefaultFlow();
-      } else if (flowNode instanceof Gateway) {
-        defaultFlow = ((Gateway) flowNode).getDefaultFlow();
-      }
-      
-      boolean isDefault = false;
-      if (defaultFlow != null && defaultFlow.equalsIgnoreCase(sequenceFlow.getId())) {
-        isDefault = true;
-      }
-      boolean drawConditionalIndicator = sequenceFlow.getConditionExpression() != null && !(flowNode instanceof Gateway);
-      
-      String sourceRef = sequenceFlow.getSourceRef();
-      String targetRef = sequenceFlow.getTargetRef();
-      FlowElement sourceElement = bpmnModel.getFlowElement(sourceRef);
-      FlowElement targetElement = bpmnModel.getFlowElement(targetRef);
-      List<GraphicInfo> graphicInfoList = bpmnModel.getFlowLocationGraphicInfo(sequenceFlow.getId());
-      if (graphicInfoList != null && graphicInfoList.size() > 0) {
-        graphicInfoList = connectionPerfectionizer(processDiagramCanvas, bpmnModel, sourceElement, targetElement, graphicInfoList);
-        int xPoints[]= new int[graphicInfoList.size()];
-        int yPoints[]= new int[graphicInfoList.size()];
-        
-        for (int i=1; i<graphicInfoList.size(); i++) {
-          GraphicInfo graphicInfo = graphicInfoList.get(i);
-          GraphicInfo previousGraphicInfo = graphicInfoList.get(i-1);
-          
-          if (i == 1) {
-            xPoints[0] = (int) previousGraphicInfo.getX();
-            yPoints[0] = (int) previousGraphicInfo.getY();
-          }
-          xPoints[i] = (int) graphicInfo.getX();
-          yPoints[i] = (int) graphicInfo.getY();
-          
-        }
-  
-        processDiagramCanvas.drawSequenceflow(xPoints, yPoints, drawConditionalIndicator, isDefault, highLighted, scaleFactor);
-  
-        // Draw sequenceflow label
-        GraphicInfo labelGraphicInfo = bpmnModel.getLabelGraphicInfo(sequenceFlow.getId());
-        if (labelGraphicInfo != null) {
-          processDiagramCanvas.drawLabel(sequenceFlow.getName(), labelGraphicInfo, false);
-        }else
-        {
-          GraphicInfo lineCenter = getLineCenter(graphicInfoList);
-          processDiagramCanvas.drawLabel(sequenceFlow.getName(), lineCenter, false);
-        }
-      }
-    }
-
-    // Nested elements
-    if (flowNode instanceof FlowElementsContainer) {
-      for (FlowElement nestedFlowElement : ((FlowElementsContainer) flowNode).getFlowElements()) {
-        if (nestedFlowElement instanceof FlowNode) {
-          drawActivity(processDiagramCanvas, bpmnModel, (FlowNode) nestedFlowElement, 
-              highLightedActivities, highLightedFlows, scaleFactor,highLightedExecutedActivities);
-        }
-      }
-    }
-  }
-  
-  /**
-   * This method makes coordinates of connection flow better.
-   * @param processDiagramCanvas
-   * @param bpmnModel
-   * @param sourceElement
-   * @param targetElement
-   * @param graphicInfoList
-   * @return
-   */
-  protected static List<GraphicInfo> connectionPerfectionizer(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, BaseElement sourceElement, BaseElement targetElement, List<GraphicInfo> graphicInfoList) {
-    GraphicInfo sourceGraphicInfo = bpmnModel.getGraphicInfo(sourceElement.getId());
-    GraphicInfo targetGraphicInfo = bpmnModel.getGraphicInfo(targetElement.getId());
-    
-    DefaultProcessDiagramCanvas.SHAPE_TYPE sourceShapeType = getShapeType(sourceElement);
-    DefaultProcessDiagramCanvas.SHAPE_TYPE targetShapeType = getShapeType(targetElement);
-    
-    return processDiagramCanvas.connectionPerfectionizer(sourceShapeType, targetShapeType, sourceGraphicInfo, targetGraphicInfo, graphicInfoList);
-  }
-
-  /**
-   * This method returns shape type of base element.<br>
-   * Each element can be presented as rectangle, rhombus, or ellipse.
-   * @param baseElement
-   * @return DefaultProcessDiagramCanvas.SHAPE_TYPE
-   */
-  protected static DefaultProcessDiagramCanvas.SHAPE_TYPE getShapeType(BaseElement baseElement) {
-    if (baseElement instanceof Task || baseElement instanceof Activity || baseElement instanceof TextAnnotation) {
-        return DefaultProcessDiagramCanvas.SHAPE_TYPE.Rectangle;
-    } else if (baseElement instanceof Gateway) {
-        return DefaultProcessDiagramCanvas.SHAPE_TYPE.Rhombus;
-    } else if (baseElement instanceof Event) {
-        return DefaultProcessDiagramCanvas.SHAPE_TYPE.Ellipse;
-    } else {
-        // unknown source element, just do not correct coordinates
-    }
-    return null;
-  }
-  
-  protected static GraphicInfo getLineCenter(List<GraphicInfo> graphicInfoList) {
-    GraphicInfo gi = new GraphicInfo();
-    
-    int xPoints[]= new int[graphicInfoList.size()];
-    int yPoints[]= new int[graphicInfoList.size()];
-    
-    double length = 0;
-    double[] lengths = new double[graphicInfoList.size()];
-    lengths[0] = 0;
-    double m;
-    for (int i=1; i<graphicInfoList.size(); i++) {
-        GraphicInfo graphicInfo = graphicInfoList.get(i);
-        GraphicInfo previousGraphicInfo = graphicInfoList.get(i-1);
-        
-        if (i == 1) {
-          xPoints[0] = (int) previousGraphicInfo.getX();
-          yPoints[0] = (int) previousGraphicInfo.getY();
-        }
-        xPoints[i] = (int) graphicInfo.getX();
-        yPoints[i] = (int) graphicInfo.getY();
-        
-        length += Math.sqrt(
-      		  		Math.pow((int) graphicInfo.getX() - (int) previousGraphicInfo.getX(), 2) + 
-      		  		Math.pow((int) graphicInfo.getY() - (int) previousGraphicInfo.getY(), 2)
-      		  	);
-        lengths[i] = length;
-      }
-      m = length / 2;
-      int p1 = 0, p2 = 1;
-      for (int i = 1; i < lengths.length; i++) {
+	protected Map<Class<? extends BaseElement>, ActivityDrawInstruction> activityDrawInstructions = new HashMap<Class<? extends BaseElement>, ActivityDrawInstruction>();
+	protected Map<Class<? extends BaseElement>, ArtifactDrawInstruction> artifactDrawInstructions = new HashMap<Class<? extends BaseElement>, ArtifactDrawInstruction>();
+
+	public DefaultProcessDiagramGenerator() {
+		this(1.0);
+	}
+
+	// The instructions on how to draw a certain construct is
+	// created statically and stored in a map for performance.
+	public DefaultProcessDiagramGenerator(final double scaleFactor) {
+		// start event
+		activityDrawInstructions.put(StartEvent.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				StartEvent startEvent = (StartEvent) flowNode;
+				if (startEvent.getEventDefinitions() != null && !startEvent.getEventDefinitions().isEmpty()) {
+					EventDefinition eventDefinition = startEvent.getEventDefinitions().get(0);
+					if (eventDefinition instanceof TimerEventDefinition) {
+						processDiagramCanvas.drawTimerStartEvent(graphicInfo, scaleFactor);
+					} else if (eventDefinition instanceof ErrorEventDefinition) {
+						processDiagramCanvas.drawErrorStartEvent(graphicInfo, scaleFactor);
+					} else if (eventDefinition instanceof SignalEventDefinition) {
+						processDiagramCanvas.drawSignalStartEvent(graphicInfo, scaleFactor);
+					} else if (eventDefinition instanceof MessageEventDefinition) {
+						processDiagramCanvas.drawMessageStartEvent(graphicInfo, scaleFactor);
+					} else {
+						processDiagramCanvas.drawNoneStartEvent(graphicInfo);
+					}
+				} else {
+					processDiagramCanvas.drawNoneStartEvent(graphicInfo);
+				}
+			}
+		});
+
+		// signal catch
+		activityDrawInstructions.put(IntermediateCatchEvent.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				IntermediateCatchEvent intermediateCatchEvent = (IntermediateCatchEvent) flowNode;
+				if (intermediateCatchEvent.getEventDefinitions() != null && !intermediateCatchEvent.getEventDefinitions()
+					.isEmpty()) {
+					if (intermediateCatchEvent.getEventDefinitions().get(0) instanceof SignalEventDefinition) {
+						processDiagramCanvas.drawCatchingSignalEvent(flowNode.getName(), graphicInfo, true, scaleFactor);
+					} else if (intermediateCatchEvent.getEventDefinitions().get(0) instanceof TimerEventDefinition) {
+						processDiagramCanvas.drawCatchingTimerEvent(flowNode.getName(), graphicInfo, true, scaleFactor);
+					} else if (intermediateCatchEvent.getEventDefinitions().get(0) instanceof MessageEventDefinition) {
+						processDiagramCanvas.drawCatchingMessageEvent(flowNode.getName(), graphicInfo, true, scaleFactor);
+					}
+				}
+			}
+		});
+
+		// signal throw
+		activityDrawInstructions.put(ThrowEvent.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				ThrowEvent throwEvent = (ThrowEvent) flowNode;
+				if (throwEvent.getEventDefinitions() != null && !throwEvent.getEventDefinitions().isEmpty()) {
+					if (throwEvent.getEventDefinitions().get(0) instanceof SignalEventDefinition) {
+						processDiagramCanvas.drawThrowingSignalEvent(graphicInfo, scaleFactor);
+					} else if (throwEvent.getEventDefinitions().get(0) instanceof CompensateEventDefinition) {
+						processDiagramCanvas.drawThrowingCompensateEvent(graphicInfo, scaleFactor);
+					} else {
+						processDiagramCanvas.drawThrowingNoneEvent(graphicInfo, scaleFactor);
+					}
+				} else {
+					processDiagramCanvas.drawThrowingNoneEvent(graphicInfo, scaleFactor);
+				}
+			}
+		});
+
+		// end event
+		activityDrawInstructions.put(EndEvent.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				EndEvent endEvent = (EndEvent) flowNode;
+				if (endEvent.getEventDefinitions() != null && !endEvent.getEventDefinitions().isEmpty()) {
+					if (endEvent.getEventDefinitions().get(0) instanceof ErrorEventDefinition) {
+						processDiagramCanvas.drawErrorEndEvent(flowNode.getName(), graphicInfo, scaleFactor);
+					} else {
+						processDiagramCanvas.drawNoneEndEvent(graphicInfo, scaleFactor);
+					}
+				} else {
+					processDiagramCanvas.drawNoneEndEvent(graphicInfo, scaleFactor);
+				}
+			}
+		});
+
+		// task
+		activityDrawInstructions.put(Task.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				processDiagramCanvas.drawTask(flowNode.getName(), graphicInfo);
+			}
+		});
+
+		// user task
+		activityDrawInstructions.put(UserTask.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				processDiagramCanvas.drawUserTask(flowNode.getName(), graphicInfo, scaleFactor);
+			}
+		});
+
+		// script task
+		activityDrawInstructions.put(ScriptTask.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				processDiagramCanvas.drawScriptTask(flowNode.getName(), graphicInfo, scaleFactor);
+			}
+		});
+
+		// service task
+		activityDrawInstructions.put(ServiceTask.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				ServiceTask serviceTask = (ServiceTask) flowNode;
+				if ("camel".equalsIgnoreCase(serviceTask.getType())) {
+					processDiagramCanvas.drawCamelTask(serviceTask.getName(), graphicInfo, scaleFactor);
+				} else if ("mule".equalsIgnoreCase(serviceTask.getType())) {
+					processDiagramCanvas.drawMuleTask(serviceTask.getName(), graphicInfo, scaleFactor);
+				} else {
+					processDiagramCanvas.drawServiceTask(serviceTask.getName(), graphicInfo, scaleFactor);
+				}
+			}
+		});
+
+		// receive task
+		activityDrawInstructions.put(ReceiveTask.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				processDiagramCanvas.drawReceiveTask(flowNode.getName(), graphicInfo, scaleFactor);
+			}
+		});
+
+		// send task
+		activityDrawInstructions.put(SendTask.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				processDiagramCanvas.drawSendTask(flowNode.getName(), graphicInfo, scaleFactor);
+			}
+		});
+
+		// manual task
+		activityDrawInstructions.put(ManualTask.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				processDiagramCanvas.drawManualTask(flowNode.getName(), graphicInfo, scaleFactor);
+			}
+		});
+
+		// businessRuleTask task
+		activityDrawInstructions.put(BusinessRuleTask.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				processDiagramCanvas.drawBusinessRuleTask(flowNode.getName(), graphicInfo, scaleFactor);
+			}
+		});
+
+		// exclusive gateway
+		activityDrawInstructions.put(ExclusiveGateway.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				processDiagramCanvas.drawExclusiveGateway(graphicInfo, scaleFactor);
+			}
+		});
+
+		// inclusive gateway
+		activityDrawInstructions.put(InclusiveGateway.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				processDiagramCanvas.drawInclusiveGateway(graphicInfo, scaleFactor);
+			}
+		});
+
+		// parallel gateway
+		activityDrawInstructions.put(ParallelGateway.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				processDiagramCanvas.drawParallelGateway(graphicInfo, scaleFactor);
+			}
+		});
+
+		// event based gateway
+		activityDrawInstructions.put(EventGateway.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				processDiagramCanvas.drawEventBasedGateway(graphicInfo, scaleFactor);
+			}
+		});
+
+
+		// Boundary timer
+		activityDrawInstructions.put(BoundaryEvent.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				BoundaryEvent boundaryEvent = (BoundaryEvent) flowNode;
+				if (boundaryEvent.getEventDefinitions() != null && !boundaryEvent.getEventDefinitions().isEmpty()) {
+					if (boundaryEvent.getEventDefinitions().get(0) instanceof TimerEventDefinition) {
+
+						processDiagramCanvas.drawCatchingTimerEvent(flowNode.getName(), graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor);
+
+					} else if (boundaryEvent.getEventDefinitions().get(0) instanceof ErrorEventDefinition) {
+
+						processDiagramCanvas.drawCatchingErrorEvent(graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor);
+
+					} else if (boundaryEvent.getEventDefinitions().get(0) instanceof SignalEventDefinition) {
+						processDiagramCanvas.drawCatchingSignalEvent(flowNode.getName(), graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor);
+
+					} else if (boundaryEvent.getEventDefinitions().get(0) instanceof MessageEventDefinition) {
+						processDiagramCanvas.drawCatchingMessageEvent(flowNode.getName(), graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor);
+
+					} else if (boundaryEvent.getEventDefinitions().get(0) instanceof CompensateEventDefinition) {
+						processDiagramCanvas.drawCatchingCompensateEvent(graphicInfo, boundaryEvent.isCancelActivity(), scaleFactor);
+					}
+				}
+
+			}
+		});
+
+		// subprocess
+		activityDrawInstructions.put(SubProcess.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				if (graphicInfo.getExpanded() != null && !graphicInfo.getExpanded()) {
+					processDiagramCanvas.drawCollapsedSubProcess(flowNode.getName(), graphicInfo, false);
+				} else {
+					processDiagramCanvas.drawExpandedSubProcess(flowNode.getName(), graphicInfo, false, scaleFactor);
+				}
+			}
+		});
+
+		// Event subprocess
+		activityDrawInstructions.put(EventSubProcess.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				if (graphicInfo.getExpanded() != null && !graphicInfo.getExpanded()) {
+					processDiagramCanvas.drawCollapsedSubProcess(flowNode.getName(), graphicInfo, true);
+				} else {
+					processDiagramCanvas.drawExpandedSubProcess(flowNode.getName(), graphicInfo, true, scaleFactor);
+				}
+			}
+		});
+
+		// call activity
+		activityDrawInstructions.put(CallActivity.class, new ActivityDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+				processDiagramCanvas.drawCollapsedCallActivity(flowNode.getName(), graphicInfo);
+			}
+		});
+
+		// text annotation
+		artifactDrawInstructions.put(TextAnnotation.class, new ArtifactDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, Artifact artifact) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(artifact.getId());
+				TextAnnotation textAnnotation = (TextAnnotation) artifact;
+				processDiagramCanvas.drawTextAnnotation(textAnnotation.getText(), graphicInfo);
+			}
+		});
+
+		// association
+		artifactDrawInstructions.put(Association.class, new ArtifactDrawInstruction() {
+
+			public void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, Artifact artifact) {
+				Association association = (Association) artifact;
+				String sourceRef = association.getSourceRef();
+				String targetRef = association.getTargetRef();
+
+				// source and target can be instance of FlowElement or Artifact
+				BaseElement sourceElement = bpmnModel.getFlowElement(sourceRef);
+				BaseElement targetElement = bpmnModel.getFlowElement(targetRef);
+				if (sourceElement == null) {
+					sourceElement = bpmnModel.getArtifact(sourceRef);
+				}
+				if (targetElement == null) {
+					targetElement = bpmnModel.getArtifact(targetRef);
+				}
+				List<GraphicInfo> graphicInfoList = bpmnModel.getFlowLocationGraphicInfo(artifact.getId());
+				graphicInfoList = connectionPerfectionizer(processDiagramCanvas, bpmnModel, sourceElement, targetElement, graphicInfoList);
+				int xPoints[] = new int[graphicInfoList.size()];
+				int yPoints[] = new int[graphicInfoList.size()];
+				for (int i = 1; i < graphicInfoList.size(); i++) {
+					GraphicInfo graphicInfo = graphicInfoList.get(i);
+					GraphicInfo previousGraphicInfo = graphicInfoList.get(i - 1);
+
+					if (i == 1) {
+						xPoints[0] = (int) previousGraphicInfo.getX();
+						yPoints[0] = (int) previousGraphicInfo.getY();
+					}
+					xPoints[i] = (int) graphicInfo.getX();
+					yPoints[i] = (int) graphicInfo.getY();
+				}
+
+				AssociationDirection associationDirection = association.getAssociationDirection();
+				processDiagramCanvas.drawAssociation(xPoints, yPoints, associationDirection, false, scaleFactor);
+			}
+		});
+	}
+
+	/**
+	 * This method makes coordinates of connection flow better.
+	 *
+	 * @param processDiagramCanvas
+	 * @param bpmnModel
+	 * @param sourceElement
+	 * @param targetElement
+	 * @param graphicInfoList
+	 * @return
+	 */
+	protected static List<GraphicInfo> connectionPerfectionizer(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, BaseElement sourceElement, BaseElement targetElement, List<GraphicInfo> graphicInfoList) {
+		GraphicInfo sourceGraphicInfo = bpmnModel.getGraphicInfo(sourceElement.getId());
+		GraphicInfo targetGraphicInfo = bpmnModel.getGraphicInfo(targetElement.getId());
+
+		DefaultProcessDiagramCanvas.SHAPE_TYPE sourceShapeType = getShapeType(sourceElement);
+		DefaultProcessDiagramCanvas.SHAPE_TYPE targetShapeType = getShapeType(targetElement);
+
+		return processDiagramCanvas.connectionPerfectionizer(sourceShapeType, targetShapeType, sourceGraphicInfo, targetGraphicInfo, graphicInfoList);
+	}
+
+	/**
+	 * This method returns shape type of base element.<br>
+	 * Each element can be presented as rectangle, rhombus, or ellipse.
+	 *
+	 * @param baseElement
+	 * @return DefaultProcessDiagramCanvas.SHAPE_TYPE
+	 */
+	protected static DefaultProcessDiagramCanvas.SHAPE_TYPE getShapeType(BaseElement baseElement) {
+		if (baseElement instanceof Task || baseElement instanceof Activity || baseElement instanceof TextAnnotation) {
+			return DefaultProcessDiagramCanvas.SHAPE_TYPE.Rectangle;
+		} else if (baseElement instanceof Gateway) {
+			return DefaultProcessDiagramCanvas.SHAPE_TYPE.Rhombus;
+		} else if (baseElement instanceof Event) {
+			return DefaultProcessDiagramCanvas.SHAPE_TYPE.Ellipse;
+		} else {
+			// unknown source element, just do not correct coordinates
+		}
+		return null;
+	}
+
+	protected static GraphicInfo getLineCenter(List<GraphicInfo> graphicInfoList) {
+		GraphicInfo gi = new GraphicInfo();
+
+		int xPoints[] = new int[graphicInfoList.size()];
+		int yPoints[] = new int[graphicInfoList.size()];
+
+		double length = 0;
+		double[] lengths = new double[graphicInfoList.size()];
+		lengths[0] = 0;
+		double m;
+		for (int i = 1; i < graphicInfoList.size(); i++) {
+			GraphicInfo graphicInfo = graphicInfoList.get(i);
+			GraphicInfo previousGraphicInfo = graphicInfoList.get(i - 1);
+
+			if (i == 1) {
+				xPoints[0] = (int) previousGraphicInfo.getX();
+				yPoints[0] = (int) previousGraphicInfo.getY();
+			}
+			xPoints[i] = (int) graphicInfo.getX();
+			yPoints[i] = (int) graphicInfo.getY();
+
+			length += Math.sqrt(
+				Math.pow((int) graphicInfo.getX() - (int) previousGraphicInfo.getX(), 2) +
+					Math.pow((int) graphicInfo.getY() - (int) previousGraphicInfo.getY(), 2)
+			);
+			lengths[i] = length;
+		}
+		m = length / 2;
+		int p1 = 0, p2 = 1;
+		for (int i = 1; i < lengths.length; i++) {
 			double len = lengths[i];
-			p1 = i-1;
+			p1 = i - 1;
 			p2 = i;
 			if (len > m) {
 				break;
 			}
 		}
-      
-      GraphicInfo graphicInfo1 = graphicInfoList.get(p1);
-      GraphicInfo graphicInfo2 = graphicInfoList.get(p2);
-      
-      double AB = (int)graphicInfo2.getX() - (int)graphicInfo1.getX();
-      double OA = (int)graphicInfo2.getY() - (int)graphicInfo1.getY();
-      double OB = lengths[p2] - lengths[p1];
-      double ob =  m - lengths[p1];
-      double ab =  AB * ob / OB;
-      double oa =  OA * ob / OB;
-      
-      double mx = graphicInfo1.getX() + ab;
-      double my = graphicInfo1.getY() + oa;
-      
-      gi.setX(mx);
-      gi.setY(my);
-    return gi;
-  }
-  
-  protected void drawArtifact(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, Artifact artifact) {
-    ArtifactDrawInstruction drawInstruction = artifactDrawInstructions.get(artifact.getClass());
-    if (drawInstruction != null) {
-      drawInstruction.draw(processDiagramCanvas, bpmnModel, artifact);
-    }
-  }
-
-  private static void drawHighLight(DefaultProcessDiagramCanvas processDiagramCanvas, GraphicInfo graphicInfo) {
-    processDiagramCanvas.drawHighLight((int) graphicInfo.getX(), (int) graphicInfo.getY(), (int) graphicInfo.getWidth(), (int) graphicInfo.getHeight());
-
-  }
-
-
-  private static void drawColorHighLight(DefaultProcessDiagramCanvas processDiagramCanvas, GraphicInfo graphicInfo,Color color) {
-    processDiagramCanvas.drawHighLight((int) graphicInfo.getX(), (int) graphicInfo.getY(), (int) graphicInfo.getWidth(), (int) graphicInfo.getHeight(),color);
-
-  }
-
-  protected static DefaultProcessDiagramCanvas initProcessDiagramCanvas(BpmnModel bpmnModel, String imageType,
-      String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader) {
-    
-    // We need to calculate maximum values to know how big the image will be in its entirety
-    double minX = Double.MAX_VALUE;
-    double maxX = 0;
-    double minY = Double.MAX_VALUE;
-    double maxY = 0;
-
-    for (Pool pool : bpmnModel.getPools()) {
-      GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(pool.getId());
-      minX = graphicInfo.getX();
-      maxX = graphicInfo.getX() + graphicInfo.getWidth();
-      minY = graphicInfo.getY();
-      maxY = graphicInfo.getY() + graphicInfo.getHeight();
-    }
-    
-    List<FlowNode> flowNodes = gatherAllFlowNodes(bpmnModel);
-    for (FlowNode flowNode : flowNodes) {
-
-      GraphicInfo flowNodeGraphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
-      
-      // width
-      if (flowNodeGraphicInfo.getX() + flowNodeGraphicInfo.getWidth() > maxX) {
-        maxX = flowNodeGraphicInfo.getX() + flowNodeGraphicInfo.getWidth();
-      }
-      if (flowNodeGraphicInfo.getX() < minX) {
-        minX = flowNodeGraphicInfo.getX();
-      }
-      // height
-      if (flowNodeGraphicInfo.getY() + flowNodeGraphicInfo.getHeight() > maxY) {
-        maxY = flowNodeGraphicInfo.getY() + flowNodeGraphicInfo.getHeight();
-      }
-      if (flowNodeGraphicInfo.getY() < minY) {
-        minY = flowNodeGraphicInfo.getY();
-      }
-
-      for (SequenceFlow sequenceFlow : flowNode.getOutgoingFlows()) {
-        List<GraphicInfo> graphicInfoList = bpmnModel.getFlowLocationGraphicInfo(sequenceFlow.getId());
-        if (graphicInfoList != null) {
-          for (GraphicInfo graphicInfo : graphicInfoList) {
-            // width
-            if (graphicInfo.getX() > maxX) {
-              maxX = graphicInfo.getX();
-            }
-            if (graphicInfo.getX() < minX) {
-              minX = graphicInfo.getX();
-            }
-            // height
-            if (graphicInfo.getY() > maxY) {
-              maxY = graphicInfo.getY();
-            }
-            if (graphicInfo.getY()< minY) {
-              minY = graphicInfo.getY();
-            }
-          }
-        }
-      }
-    }
-    
-    List<Artifact> artifacts = gatherAllArtifacts(bpmnModel);
-    for (Artifact artifact : artifacts) {
-
-      GraphicInfo artifactGraphicInfo = bpmnModel.getGraphicInfo(artifact.getId());
-      
-      if (artifactGraphicInfo != null) {
-	      // width
-	      if (artifactGraphicInfo.getX() + artifactGraphicInfo.getWidth() > maxX) {
-	        maxX = artifactGraphicInfo.getX() + artifactGraphicInfo.getWidth();
-	      }
-	      if (artifactGraphicInfo.getX() < minX) {
-	        minX = artifactGraphicInfo.getX();
-	      }
-	      // height
-	      if (artifactGraphicInfo.getY() + artifactGraphicInfo.getHeight() > maxY) {
-	        maxY = artifactGraphicInfo.getY() + artifactGraphicInfo.getHeight();
-	      }
-	      if (artifactGraphicInfo.getY() < minY) {
-	        minY = artifactGraphicInfo.getY();
-	      }
-      }
-
-      List<GraphicInfo> graphicInfoList = bpmnModel.getFlowLocationGraphicInfo(artifact.getId());
-      if (graphicInfoList != null) {
-	      for (GraphicInfo graphicInfo : graphicInfoList) {
-	          // width
-	          if (graphicInfo.getX() > maxX) {
-	            maxX = graphicInfo.getX();
-	          }
-	          if (graphicInfo.getX() < minX) {
-	            minX = graphicInfo.getX();
-	          }
-	          // height
-	          if (graphicInfo.getY() > maxY) {
-	            maxY = graphicInfo.getY();
-	          }
-	          if (graphicInfo.getY()< minY) {
-	            minY = graphicInfo.getY();
-	          }
-	      }
-      }
-    }
-    
-    int nrOfLanes = 0;
-    for (Process process : bpmnModel.getProcesses()) {
-      for (Lane l : process.getLanes()) {
-        
-        nrOfLanes++;
-        
-        GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(l.getId());
-        // // width
-        if (graphicInfo.getX() + graphicInfo.getWidth() > maxX) {
-          maxX = graphicInfo.getX() + graphicInfo.getWidth();
-        }
-        if (graphicInfo.getX() < minX) {
-          minX = graphicInfo.getX();
-        }
-        // height
-        if (graphicInfo.getY() + graphicInfo.getHeight() > maxY) {
-          maxY = graphicInfo.getY() + graphicInfo.getHeight();
-        }
-        if (graphicInfo.getY() < minY) {
-          minY = graphicInfo.getY();
-        }
-      }
-    }
-    
-    // Special case, see https://activiti.atlassian.net/browse/ACT-1431
-    if (flowNodes.isEmpty() && bpmnModel.getPools().isEmpty() && nrOfLanes == 0) {
-      // Nothing to show
-      minX = 0;
-      minY = 0;
-    }
-    
-    return new DefaultProcessDiagramCanvas((int) maxX + 10,(int) maxY + 10, (int) minX, (int) minY, 
-        imageType, activityFontName, labelFontName, annotationFontName, customClassLoader);
-  }
-
-
-  protected static List<Artifact> gatherAllArtifacts(BpmnModel bpmnModel) {
-    List<Artifact> artifacts = new ArrayList<Artifact>();
-    for (Process process : bpmnModel.getProcesses()) {
-    	artifacts.addAll(process.getArtifacts());
-    }
-    return artifacts;
-  }
-  
-  protected static List<FlowNode> gatherAllFlowNodes(BpmnModel bpmnModel) {
-    List<FlowNode> flowNodes = new ArrayList<FlowNode>();
-    for (Process process : bpmnModel.getProcesses()) {
-      flowNodes.addAll(gatherAllFlowNodes(process));
-    }
-    return flowNodes;
-  }
-  
-  protected static List<FlowNode> gatherAllFlowNodes(FlowElementsContainer flowElementsContainer) {
-    List<FlowNode> flowNodes = new ArrayList<FlowNode>();
-    for (FlowElement flowElement : flowElementsContainer.getFlowElements()) {
-      if (flowElement instanceof FlowNode) {
-        flowNodes.add((FlowNode) flowElement);
-      }
-      if (flowElement instanceof FlowElementsContainer) {
-        flowNodes.addAll(gatherAllFlowNodes((FlowElementsContainer) flowElement));
-      }
-    }
-    return flowNodes;
-  }
-  
-  public Map<Class<? extends BaseElement>, ActivityDrawInstruction> getActivityDrawInstructions() {
+
+		GraphicInfo graphicInfo1 = graphicInfoList.get(p1);
+		GraphicInfo graphicInfo2 = graphicInfoList.get(p2);
+
+		double AB = (int) graphicInfo2.getX() - (int) graphicInfo1.getX();
+		double OA = (int) graphicInfo2.getY() - (int) graphicInfo1.getY();
+		double OB = lengths[p2] - lengths[p1];
+		double ob = m - lengths[p1];
+		double ab = AB * ob / OB;
+		double oa = OA * ob / OB;
+
+		double mx = graphicInfo1.getX() + ab;
+		double my = graphicInfo1.getY() + oa;
+
+		gi.setX(mx);
+		gi.setY(my);
+		return gi;
+	}
+
+	private static void drawHighLight(DefaultProcessDiagramCanvas processDiagramCanvas, GraphicInfo graphicInfo) {
+		processDiagramCanvas.drawHighLight((int) graphicInfo.getX(), (int) graphicInfo.getY(), (int) graphicInfo.getWidth(), (int) graphicInfo.getHeight());
+
+	}
+
+	private static void drawColorHighLight(DefaultProcessDiagramCanvas processDiagramCanvas, GraphicInfo graphicInfo, Color color) {
+		processDiagramCanvas.drawHighLight((int) graphicInfo.getX(), (int) graphicInfo.getY(), (int) graphicInfo.getWidth(), (int) graphicInfo.getHeight(), color);
+
+	}
+
+	protected static DefaultProcessDiagramCanvas initProcessDiagramCanvas(BpmnModel bpmnModel, String imageType,
+																		  String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader) {
+
+		// We need to calculate maximum values to know how big the image will be in its entirety
+		double minX = Double.MAX_VALUE;
+		double maxX = 0;
+		double minY = Double.MAX_VALUE;
+		double maxY = 0;
+
+		for (Pool pool : bpmnModel.getPools()) {
+			GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(pool.getId());
+			minX = graphicInfo.getX();
+			maxX = graphicInfo.getX() + graphicInfo.getWidth();
+			minY = graphicInfo.getY();
+			maxY = graphicInfo.getY() + graphicInfo.getHeight();
+		}
+
+		List<FlowNode> flowNodes = gatherAllFlowNodes(bpmnModel);
+		for (FlowNode flowNode : flowNodes) {
+
+			GraphicInfo flowNodeGraphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+
+			// width
+			if (flowNodeGraphicInfo.getX() + flowNodeGraphicInfo.getWidth() > maxX) {
+				maxX = flowNodeGraphicInfo.getX() + flowNodeGraphicInfo.getWidth();
+			}
+			if (flowNodeGraphicInfo.getX() < minX) {
+				minX = flowNodeGraphicInfo.getX();
+			}
+			// height
+			if (flowNodeGraphicInfo.getY() + flowNodeGraphicInfo.getHeight() > maxY) {
+				maxY = flowNodeGraphicInfo.getY() + flowNodeGraphicInfo.getHeight();
+			}
+			if (flowNodeGraphicInfo.getY() < minY) {
+				minY = flowNodeGraphicInfo.getY();
+			}
+
+			for (SequenceFlow sequenceFlow : flowNode.getOutgoingFlows()) {
+				List<GraphicInfo> graphicInfoList = bpmnModel.getFlowLocationGraphicInfo(sequenceFlow.getId());
+				if (graphicInfoList != null) {
+					for (GraphicInfo graphicInfo : graphicInfoList) {
+						// width
+						if (graphicInfo.getX() > maxX) {
+							maxX = graphicInfo.getX();
+						}
+						if (graphicInfo.getX() < minX) {
+							minX = graphicInfo.getX();
+						}
+						// height
+						if (graphicInfo.getY() > maxY) {
+							maxY = graphicInfo.getY();
+						}
+						if (graphicInfo.getY() < minY) {
+							minY = graphicInfo.getY();
+						}
+					}
+				}
+			}
+		}
+
+		List<Artifact> artifacts = gatherAllArtifacts(bpmnModel);
+		for (Artifact artifact : artifacts) {
+
+			GraphicInfo artifactGraphicInfo = bpmnModel.getGraphicInfo(artifact.getId());
+
+			if (artifactGraphicInfo != null) {
+				// width
+				if (artifactGraphicInfo.getX() + artifactGraphicInfo.getWidth() > maxX) {
+					maxX = artifactGraphicInfo.getX() + artifactGraphicInfo.getWidth();
+				}
+				if (artifactGraphicInfo.getX() < minX) {
+					minX = artifactGraphicInfo.getX();
+				}
+				// height
+				if (artifactGraphicInfo.getY() + artifactGraphicInfo.getHeight() > maxY) {
+					maxY = artifactGraphicInfo.getY() + artifactGraphicInfo.getHeight();
+				}
+				if (artifactGraphicInfo.getY() < minY) {
+					minY = artifactGraphicInfo.getY();
+				}
+			}
+
+			List<GraphicInfo> graphicInfoList = bpmnModel.getFlowLocationGraphicInfo(artifact.getId());
+			if (graphicInfoList != null) {
+				for (GraphicInfo graphicInfo : graphicInfoList) {
+					// width
+					if (graphicInfo.getX() > maxX) {
+						maxX = graphicInfo.getX();
+					}
+					if (graphicInfo.getX() < minX) {
+						minX = graphicInfo.getX();
+					}
+					// height
+					if (graphicInfo.getY() > maxY) {
+						maxY = graphicInfo.getY();
+					}
+					if (graphicInfo.getY() < minY) {
+						minY = graphicInfo.getY();
+					}
+				}
+			}
+		}
+
+		int nrOfLanes = 0;
+		for (Process process : bpmnModel.getProcesses()) {
+			for (Lane l : process.getLanes()) {
+
+				nrOfLanes++;
+
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(l.getId());
+				// // width
+				if (graphicInfo.getX() + graphicInfo.getWidth() > maxX) {
+					maxX = graphicInfo.getX() + graphicInfo.getWidth();
+				}
+				if (graphicInfo.getX() < minX) {
+					minX = graphicInfo.getX();
+				}
+				// height
+				if (graphicInfo.getY() + graphicInfo.getHeight() > maxY) {
+					maxY = graphicInfo.getY() + graphicInfo.getHeight();
+				}
+				if (graphicInfo.getY() < minY) {
+					minY = graphicInfo.getY();
+				}
+			}
+		}
+
+		// Special case, see https://activiti.atlassian.net/browse/ACT-1431
+		if (flowNodes.isEmpty() && bpmnModel.getPools().isEmpty() && nrOfLanes == 0) {
+			// Nothing to show
+			minX = 0;
+			minY = 0;
+		}
+
+		return new DefaultProcessDiagramCanvas((int) maxX + 10, (int) maxY + 10, (int) minX, (int) minY,
+			imageType, activityFontName, labelFontName, annotationFontName, customClassLoader);
+	}
+
+	protected static List<Artifact> gatherAllArtifacts(BpmnModel bpmnModel) {
+		List<Artifact> artifacts = new ArrayList<Artifact>();
+		for (Process process : bpmnModel.getProcesses()) {
+			artifacts.addAll(process.getArtifacts());
+		}
+		return artifacts;
+	}
+
+	protected static List<FlowNode> gatherAllFlowNodes(BpmnModel bpmnModel) {
+		List<FlowNode> flowNodes = new ArrayList<FlowNode>();
+		for (Process process : bpmnModel.getProcesses()) {
+			flowNodes.addAll(gatherAllFlowNodes(process));
+		}
+		return flowNodes;
+	}
+
+	protected static List<FlowNode> gatherAllFlowNodes(FlowElementsContainer flowElementsContainer) {
+		List<FlowNode> flowNodes = new ArrayList<FlowNode>();
+		for (FlowElement flowElement : flowElementsContainer.getFlowElements()) {
+			if (flowElement instanceof FlowNode) {
+				flowNodes.add((FlowNode) flowElement);
+			}
+			if (flowElement instanceof FlowElementsContainer) {
+				flowNodes.addAll(gatherAllFlowNodes((FlowElementsContainer) flowElement));
+			}
+		}
+		return flowNodes;
+	}
+
+	public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities, List<String> highLightedFlows,
+									   String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor) {
+
+		return generateProcessDiagram(bpmnModel, imageType, highLightedActivities, highLightedFlows,
+			activityFontName, labelFontName, annotationFontName, customClassLoader, scaleFactor).generateImage(imageType);
+	}
+
+	public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities, List<String> highLightedFlows,
+									   String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor,
+									   List<String> highLightedCurrentActivities) {
+
+		return generateProcessDiagram(bpmnModel, imageType, highLightedActivities, highLightedFlows,
+			activityFontName, labelFontName, annotationFontName, customClassLoader, scaleFactor, highLightedCurrentActivities).generateImage(imageType);
+	}
+
+	public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities, List<String> highLightedFlows) {
+		return generateDiagram(bpmnModel, imageType, highLightedActivities, highLightedFlows, null, null, null, null, 1.0);
+	}
+
+	public InputStream generateDiagram(BpmnModel bpmnModel, String imageType,
+									   List<String> highLightedActivities, List<String> highLightedFlows, double scaleFactor) {
+		return generateDiagram(bpmnModel, imageType, highLightedActivities, highLightedFlows, null, null, null, null, scaleFactor);
+	}
+
+	public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities) {
+		return generateDiagram(bpmnModel, imageType, highLightedActivities, Collections.<String>emptyList());
+	}
+
+	public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities, double scaleFactor) {
+		return generateDiagram(bpmnModel, imageType, highLightedActivities, Collections.<String>emptyList(), scaleFactor);
+	}
+
+	public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader) {
+		return generateDiagram(bpmnModel, imageType, Collections.<String>emptyList(), Collections.<String>emptyList(),
+			activityFontName, labelFontName, annotationFontName, customClassLoader, 1.0);
+	}
+
+	public InputStream generateDiagram(BpmnModel bpmnModel, String imageType, String activityFontName,
+									   String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor) {
+
+		return generateDiagram(bpmnModel, imageType, Collections.<String>emptyList(), Collections.<String>emptyList(),
+			activityFontName, labelFontName, annotationFontName, customClassLoader, scaleFactor);
+	}
+
+	public InputStream generatePngDiagram(BpmnModel bpmnModel) {
+		return generatePngDiagram(bpmnModel, 1.0);
+	}
+
+	public InputStream generatePngDiagram(BpmnModel bpmnModel, double scaleFactor) {
+		return generateDiagram(bpmnModel, "png", Collections.<String>emptyList(), Collections.<String>emptyList(), scaleFactor);
+	}
+
+	public InputStream generateJpgDiagram(BpmnModel bpmnModel) {
+		return generateJpgDiagram(bpmnModel, 1.0);
+	}
+
+	public InputStream generateJpgDiagram(BpmnModel bpmnModel, double scaleFactor) {
+		return generateDiagram(bpmnModel, "jpg", Collections.<String>emptyList(), Collections.<String>emptyList());
+	}
+
+	public BufferedImage generateImage(BpmnModel bpmnModel, String imageType, List<String> highLightedActivities, List<String> highLightedFlows,
+									   String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor) {
+
+		return generateProcessDiagram(bpmnModel, imageType, highLightedActivities, highLightedFlows,
+			activityFontName, labelFontName, annotationFontName, customClassLoader, scaleFactor).generateBufferedImage(imageType);
+	}
+
+	public BufferedImage generateImage(BpmnModel bpmnModel, String imageType,
+									   List<String> highLightedActivities, List<String> highLightedFlows, double scaleFactor) {
+
+		return generateImage(bpmnModel, imageType, highLightedActivities, highLightedFlows, null, null, null, null, scaleFactor);
+	}
+
+	public BufferedImage generatePngImage(BpmnModel bpmnModel, double scaleFactor) {
+		return generateImage(bpmnModel, "png", Collections.<String>emptyList(), Collections.<String>emptyList(), scaleFactor);
+	}
+
+	protected DefaultProcessDiagramCanvas generateProcessDiagram(BpmnModel bpmnModel, String imageType,
+																 List<String> highLightedActivities, List<String> highLightedFlows,
+																 String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor) {
+
+		prepareBpmnModel(bpmnModel);
+
+		DefaultProcessDiagramCanvas processDiagramCanvas = initProcessDiagramCanvas(bpmnModel, imageType, activityFontName, labelFontName, annotationFontName, customClassLoader);
+
+		// Draw pool shape, if process is participant in collaboration
+		for (Pool pool : bpmnModel.getPools()) {
+			GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(pool.getId());
+			processDiagramCanvas.drawPoolOrLane(pool.getName(), graphicInfo);
+		}
+
+		// Draw lanes
+		for (Process process : bpmnModel.getProcesses()) {
+			for (Lane lane : process.getLanes()) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(lane.getId());
+				processDiagramCanvas.drawPoolOrLane(lane.getName(), graphicInfo);
+			}
+		}
+
+		// Draw activities and their sequence-flows
+		for (Process process : bpmnModel.getProcesses()) {
+			for (FlowNode flowNode : process.findFlowElementsOfType(FlowNode.class)) {
+				drawActivity(processDiagramCanvas, bpmnModel, flowNode, highLightedActivities, highLightedFlows, scaleFactor);
+			}
+		}
+
+		// Draw artifacts
+		for (Process process : bpmnModel.getProcesses()) {
+
+			for (Artifact artifact : process.getArtifacts()) {
+				drawArtifact(processDiagramCanvas, bpmnModel, artifact);
+			}
+
+			List<SubProcess> subProcesses = process.findFlowElementsOfType(SubProcess.class, true);
+			if (subProcesses != null) {
+				for (SubProcess subProcess : subProcesses) {
+					for (Artifact subProcessArtifact : subProcess.getArtifacts()) {
+						drawArtifact(processDiagramCanvas, bpmnModel, subProcessArtifact);
+					}
+				}
+			}
+		}
+
+		return processDiagramCanvas;
+	}
+
+	protected DefaultProcessDiagramCanvas generateProcessDiagram(BpmnModel bpmnModel, String imageType,
+																 List<String> highLightedActivities, List<String> highLightedFlows,
+																 String activityFontName, String labelFontName, String annotationFontName, ClassLoader customClassLoader, double scaleFactor,
+																 List<String> highCurrentLightedActivities) {
+
+		prepareBpmnModel(bpmnModel);
+
+		DefaultProcessDiagramCanvas processDiagramCanvas = initProcessDiagramCanvas(bpmnModel, imageType, activityFontName, labelFontName, annotationFontName, customClassLoader);
+
+		// Draw pool shape, if process is participant in collaboration
+		for (Pool pool : bpmnModel.getPools()) {
+			GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(pool.getId());
+			processDiagramCanvas.drawPoolOrLane(pool.getName(), graphicInfo);
+		}
+
+		// Draw lanes
+		for (Process process : bpmnModel.getProcesses()) {
+			for (Lane lane : process.getLanes()) {
+				GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(lane.getId());
+				processDiagramCanvas.drawPoolOrLane(lane.getName(), graphicInfo);
+			}
+		}
+
+		// Draw activities and their sequence-flows
+		for (Process process : bpmnModel.getProcesses()) {
+			for (FlowNode flowNode : process.findFlowElementsOfType(FlowNode.class)) {
+				drawActivity(processDiagramCanvas, bpmnModel, flowNode, highLightedActivities, highLightedFlows, scaleFactor, highCurrentLightedActivities);
+			}
+		}
+
+		// Draw artifacts
+		for (Process process : bpmnModel.getProcesses()) {
+
+			for (Artifact artifact : process.getArtifacts()) {
+				drawArtifact(processDiagramCanvas, bpmnModel, artifact);
+			}
+
+			List<SubProcess> subProcesses = process.findFlowElementsOfType(SubProcess.class, true);
+			if (subProcesses != null) {
+				for (SubProcess subProcess : subProcesses) {
+					for (Artifact subProcessArtifact : subProcess.getArtifacts()) {
+						drawArtifact(processDiagramCanvas, bpmnModel, subProcessArtifact);
+					}
+				}
+			}
+		}
+
+		return processDiagramCanvas;
+	}
+
+	protected void prepareBpmnModel(BpmnModel bpmnModel) {
+
+		// Need to make sure all elements have positive x and y.
+		// Check all graphicInfo and update the elements accordingly
+
+		List<GraphicInfo> allGraphicInfos = new ArrayList<GraphicInfo>();
+		if (bpmnModel.getLocationMap() != null) {
+			allGraphicInfos.addAll(bpmnModel.getLocationMap().values());
+		}
+		if (bpmnModel.getLabelLocationMap() != null) {
+			allGraphicInfos.addAll(bpmnModel.getLabelLocationMap().values());
+		}
+		if (bpmnModel.getFlowLocationMap() != null) {
+			for (List<GraphicInfo> flowGraphicInfos : bpmnModel.getFlowLocationMap().values()) {
+				allGraphicInfos.addAll(flowGraphicInfos);
+			}
+		}
+
+		if (allGraphicInfos.size() > 0) {
+
+			boolean needsTranslationX = false;
+			boolean needsTranslationY = false;
+
+			double lowestX = 0.0;
+			double lowestY = 0.0;
+
+			// Collect lowest x and y
+			for (GraphicInfo graphicInfo : allGraphicInfos) {
+
+				double x = graphicInfo.getX();
+				double y = graphicInfo.getY();
+
+				if (x < lowestX) {
+					needsTranslationX = true;
+					lowestX = x;
+				}
+				if (y < lowestY) {
+					needsTranslationY = true;
+					lowestY = y;
+				}
+
+			}
+
+			// Update all graphicInfo objects
+			if (needsTranslationX || needsTranslationY) {
+
+				double translationX = Math.abs(lowestX);
+				double translationY = Math.abs(lowestY);
+
+				for (GraphicInfo graphicInfo : allGraphicInfos) {
+					if (needsTranslationX) {
+						graphicInfo.setX(graphicInfo.getX() + translationX);
+					}
+					if (needsTranslationY) {
+						graphicInfo.setY(graphicInfo.getY() + translationY);
+					}
+				}
+			}
+
+		}
+
+	}
+
+	protected void drawActivity(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel,
+								FlowNode flowNode, List<String> highLightedActivities, List<String> highLightedFlows, double scaleFactor) {
+
+		ActivityDrawInstruction drawInstruction = activityDrawInstructions.get(flowNode.getClass());
+		if (drawInstruction != null) {
+
+			drawInstruction.draw(processDiagramCanvas, bpmnModel, flowNode);
+
+			// Gather info on the multi instance marker
+			boolean multiInstanceSequential = false, multiInstanceParallel = false, collapsed = false;
+			if (flowNode instanceof Activity) {
+				Activity activity = (Activity) flowNode;
+				MultiInstanceLoopCharacteristics multiInstanceLoopCharacteristics = activity.getLoopCharacteristics();
+				if (multiInstanceLoopCharacteristics != null) {
+					multiInstanceSequential = multiInstanceLoopCharacteristics.isSequential();
+					multiInstanceParallel = !multiInstanceSequential;
+				}
+			}
+
+			// Gather info on the collapsed marker
+			GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+			if (flowNode instanceof SubProcess) {
+				collapsed = graphicInfo.getExpanded() != null && !graphicInfo.getExpanded();
+			} else if (flowNode instanceof CallActivity) {
+				collapsed = true;
+			}
+
+			if (scaleFactor == 1.0) {
+				// Actually draw the markers
+				processDiagramCanvas.drawActivityMarkers((int) graphicInfo.getX(), (int) graphicInfo.getY(), (int) graphicInfo.getWidth(), (int) graphicInfo.getHeight(),
+					multiInstanceSequential, multiInstanceParallel, collapsed);
+			}
+
+			// Draw highlighted activities
+			if (highLightedActivities.contains(flowNode.getId())) {
+				drawHighLight(processDiagramCanvas, bpmnModel.getGraphicInfo(flowNode.getId()));
+			}
+
+		}
+
+		// Outgoing transitions of activity
+		for (SequenceFlow sequenceFlow : flowNode.getOutgoingFlows()) {
+			boolean highLighted = (highLightedFlows.contains(sequenceFlow.getId()));
+			String defaultFlow = null;
+			if (flowNode instanceof Activity) {
+				defaultFlow = ((Activity) flowNode).getDefaultFlow();
+			} else if (flowNode instanceof Gateway) {
+				defaultFlow = ((Gateway) flowNode).getDefaultFlow();
+			}
+
+			boolean isDefault = false;
+			if (defaultFlow != null && defaultFlow.equalsIgnoreCase(sequenceFlow.getId())) {
+				isDefault = true;
+			}
+			boolean drawConditionalIndicator = sequenceFlow.getConditionExpression() != null && !(flowNode instanceof Gateway);
+
+			String sourceRef = sequenceFlow.getSourceRef();
+			String targetRef = sequenceFlow.getTargetRef();
+			FlowElement sourceElement = bpmnModel.getFlowElement(sourceRef);
+			FlowElement targetElement = bpmnModel.getFlowElement(targetRef);
+			List<GraphicInfo> graphicInfoList = bpmnModel.getFlowLocationGraphicInfo(sequenceFlow.getId());
+			if (graphicInfoList != null && graphicInfoList.size() > 0) {
+				graphicInfoList = connectionPerfectionizer(processDiagramCanvas, bpmnModel, sourceElement, targetElement, graphicInfoList);
+				int xPoints[] = new int[graphicInfoList.size()];
+				int yPoints[] = new int[graphicInfoList.size()];
+
+				for (int i = 1; i < graphicInfoList.size(); i++) {
+					GraphicInfo graphicInfo = graphicInfoList.get(i);
+					GraphicInfo previousGraphicInfo = graphicInfoList.get(i - 1);
+
+					if (i == 1) {
+						xPoints[0] = (int) previousGraphicInfo.getX();
+						yPoints[0] = (int) previousGraphicInfo.getY();
+					}
+					xPoints[i] = (int) graphicInfo.getX();
+					yPoints[i] = (int) graphicInfo.getY();
+
+				}
+
+				processDiagramCanvas.drawSequenceflow(xPoints, yPoints, drawConditionalIndicator, isDefault, highLighted, scaleFactor);
+
+				// Draw sequenceflow label
+				GraphicInfo labelGraphicInfo = bpmnModel.getLabelGraphicInfo(sequenceFlow.getId());
+				if (labelGraphicInfo != null) {
+					processDiagramCanvas.drawLabel(sequenceFlow.getName(), labelGraphicInfo, false);
+				} else {
+					GraphicInfo lineCenter = getLineCenter(graphicInfoList);
+					processDiagramCanvas.drawLabel(sequenceFlow.getName(), lineCenter, false);
+				}
+			}
+		}
+
+		// Nested elements
+		if (flowNode instanceof FlowElementsContainer) {
+			for (FlowElement nestedFlowElement : ((FlowElementsContainer) flowNode).getFlowElements()) {
+				if (nestedFlowElement instanceof FlowNode) {
+					drawActivity(processDiagramCanvas, bpmnModel, (FlowNode) nestedFlowElement,
+						highLightedActivities, highLightedFlows, scaleFactor);
+				}
+			}
+		}
+	}
+
+	protected void drawActivity(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel,
+								FlowNode flowNode, List<String> highLightedActivities, List<String> highLightedFlows, double scaleFactor, List<String> highLightedExecutedActivities) {
+
+		ActivityDrawInstruction drawInstruction = activityDrawInstructions.get(flowNode.getClass());
+		if (drawInstruction != null) {
+
+			drawInstruction.draw(processDiagramCanvas, bpmnModel, flowNode);
+
+			// Gather info on the multi instance marker
+			boolean multiInstanceSequential = false, multiInstanceParallel = false, collapsed = false;
+			if (flowNode instanceof Activity) {
+				Activity activity = (Activity) flowNode;
+				MultiInstanceLoopCharacteristics multiInstanceLoopCharacteristics = activity.getLoopCharacteristics();
+				if (multiInstanceLoopCharacteristics != null) {
+					multiInstanceSequential = multiInstanceLoopCharacteristics.isSequential();
+					multiInstanceParallel = !multiInstanceSequential;
+				}
+			}
+
+			// Gather info on the collapsed marker
+			GraphicInfo graphicInfo = bpmnModel.getGraphicInfo(flowNode.getId());
+			if (flowNode instanceof SubProcess) {
+				collapsed = graphicInfo.getExpanded() != null && !graphicInfo.getExpanded();
+			} else if (flowNode instanceof CallActivity) {
+				collapsed = true;
+			}
+
+			if (scaleFactor == 1.0) {
+				// Actually draw the markers
+				processDiagramCanvas.drawActivityMarkers((int) graphicInfo.getX(), (int) graphicInfo.getY(), (int) graphicInfo.getWidth(), (int) graphicInfo.getHeight(),
+					multiInstanceSequential, multiInstanceParallel, collapsed);
+			}
+
+			// Draw highlighted activities
+			if (highLightedActivities.contains(flowNode.getId())) {
+				drawHighLight(processDiagramCanvas, bpmnModel.getGraphicInfo(flowNode.getId()));
+			}
+
+			if (highLightedExecutedActivities.contains(flowNode.getId())) {
+				processDiagramCanvas.HIGHLIGHT_COLOR = Color.RED;
+				drawColorHighLight(processDiagramCanvas, bpmnModel.getGraphicInfo(flowNode.getId()), Color.RED);
+				processDiagramCanvas.HIGHLIGHT_COLOR = Color.GREEN;
+			}
+
+		}
+
+		// Outgoing transitions of activity
+		for (SequenceFlow sequenceFlow : flowNode.getOutgoingFlows()) {
+			boolean highLighted = (highLightedFlows.contains(sequenceFlow.getId()));
+			String defaultFlow = null;
+			if (flowNode instanceof Activity) {
+				defaultFlow = ((Activity) flowNode).getDefaultFlow();
+			} else if (flowNode instanceof Gateway) {
+				defaultFlow = ((Gateway) flowNode).getDefaultFlow();
+			}
+
+			boolean isDefault = false;
+			if (defaultFlow != null && defaultFlow.equalsIgnoreCase(sequenceFlow.getId())) {
+				isDefault = true;
+			}
+			boolean drawConditionalIndicator = sequenceFlow.getConditionExpression() != null && !(flowNode instanceof Gateway);
+
+			String sourceRef = sequenceFlow.getSourceRef();
+			String targetRef = sequenceFlow.getTargetRef();
+			FlowElement sourceElement = bpmnModel.getFlowElement(sourceRef);
+			FlowElement targetElement = bpmnModel.getFlowElement(targetRef);
+			List<GraphicInfo> graphicInfoList = bpmnModel.getFlowLocationGraphicInfo(sequenceFlow.getId());
+			if (graphicInfoList != null && graphicInfoList.size() > 0) {
+				graphicInfoList = connectionPerfectionizer(processDiagramCanvas, bpmnModel, sourceElement, targetElement, graphicInfoList);
+				int xPoints[] = new int[graphicInfoList.size()];
+				int yPoints[] = new int[graphicInfoList.size()];
+
+				for (int i = 1; i < graphicInfoList.size(); i++) {
+					GraphicInfo graphicInfo = graphicInfoList.get(i);
+					GraphicInfo previousGraphicInfo = graphicInfoList.get(i - 1);
+
+					if (i == 1) {
+						xPoints[0] = (int) previousGraphicInfo.getX();
+						yPoints[0] = (int) previousGraphicInfo.getY();
+					}
+					xPoints[i] = (int) graphicInfo.getX();
+					yPoints[i] = (int) graphicInfo.getY();
+
+				}
+
+				processDiagramCanvas.drawSequenceflow(xPoints, yPoints, drawConditionalIndicator, isDefault, highLighted, scaleFactor);
+
+				// Draw sequenceflow label
+				GraphicInfo labelGraphicInfo = bpmnModel.getLabelGraphicInfo(sequenceFlow.getId());
+				if (labelGraphicInfo != null) {
+					processDiagramCanvas.drawLabel(sequenceFlow.getName(), labelGraphicInfo, false);
+				} else {
+					GraphicInfo lineCenter = getLineCenter(graphicInfoList);
+					processDiagramCanvas.drawLabel(sequenceFlow.getName(), lineCenter, false);
+				}
+			}
+		}
+
+		// Nested elements
+		if (flowNode instanceof FlowElementsContainer) {
+			for (FlowElement nestedFlowElement : ((FlowElementsContainer) flowNode).getFlowElements()) {
+				if (nestedFlowElement instanceof FlowNode) {
+					drawActivity(processDiagramCanvas, bpmnModel, (FlowNode) nestedFlowElement,
+						highLightedActivities, highLightedFlows, scaleFactor, highLightedExecutedActivities);
+				}
+			}
+		}
+	}
+
+	protected void drawArtifact(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, Artifact artifact) {
+		ArtifactDrawInstruction drawInstruction = artifactDrawInstructions.get(artifact.getClass());
+		if (drawInstruction != null) {
+			drawInstruction.draw(processDiagramCanvas, bpmnModel, artifact);
+		}
+	}
+
+	public Map<Class<? extends BaseElement>, ActivityDrawInstruction> getActivityDrawInstructions() {
 		return activityDrawInstructions;
 	}
 
 	public void setActivityDrawInstructions(
-	    Map<Class<? extends BaseElement>, ActivityDrawInstruction> activityDrawInstructions) {
+		Map<Class<? extends BaseElement>, ActivityDrawInstruction> activityDrawInstructions) {
 		this.activityDrawInstructions = activityDrawInstructions;
 	}
 
@@ -1148,17 +1099,16 @@ public class DefaultProcessDiagramGenerator implements HMProcessDiagramGenerator
 	}
 
 	public void setArtifactDrawInstructions(
-	    Map<Class<? extends BaseElement>, ArtifactDrawInstruction> artifactDrawInstructions) {
+		Map<Class<? extends BaseElement>, ArtifactDrawInstruction> artifactDrawInstructions) {
 		this.artifactDrawInstructions = artifactDrawInstructions;
 	}
 
 
-
 	protected interface ActivityDrawInstruction {
-    void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode);
-  }
+		void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, FlowNode flowNode);
+	}
 
-  protected interface ArtifactDrawInstruction {
-    void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, Artifact artifact);
-  }
+	protected interface ArtifactDrawInstruction {
+		void draw(DefaultProcessDiagramCanvas processDiagramCanvas, BpmnModel bpmnModel, Artifact artifact);
+	}
 }
diff --git a/len-activiti/src/main/java/org/activiti/rest/ActivitiService.java b/len-activiti/src/main/java/org/activiti/rest/ActivitiService.java
index 2c9cab0..5c9f399 100644
--- a/len-activiti/src/main/java/org/activiti/rest/ActivitiService.java
+++ b/len-activiti/src/main/java/org/activiti/rest/ActivitiService.java
@@ -36,170 +36,163 @@ import java.util.stream.Collectors;
 @Service
 public class ActivitiService {
 
-    @Autowired
-    RuntimeService runtimeService;
-
-    @Autowired
-    TaskService taskService;
-
-    @Autowired
-    IdentityService identityService;
-
-    @Autowired
-    RepositoryService repositoryService;
-
-    @Autowired
-    ProcessEngineFactoryBean processEngine;
-
-    @Autowired
-    ProcessEngineConfiguration processEngineConfiguration;
-
-    @Autowired
-    HistoryService historyService;
-
-    static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-hh mm:ss");
-
-    /**
-     * 获取需要高亮的线
-     *
-     * @param processDefinitionEntity
-     * @param historicActivityInstances
-     * @return
-     */
-    private List<String> getHighLightedFlows(
-            ProcessDefinitionEntity processDefinitionEntity,
-            List<HistoricActivityInstance> historicActivityInstances) {
-
-        List<String> highFlows = new ArrayList<String>();
-
-        for (int i = 0; i < historicActivityInstances.size() - 1; i++) {
-            ActivityImpl activityImpl = processDefinitionEntity
-                    .findActivity(historicActivityInstances.get(i)
-                            .getActivityId());
-            List<ActivityImpl> sameStartTimeNodes = new ArrayList<ActivityImpl>();
-            ActivityImpl sameActivityImpl1 = processDefinitionEntity
-                    .findActivity(historicActivityInstances.get(i + 1)
-                            .getActivityId());
-            sameStartTimeNodes.add(sameActivityImpl1);
-
-            for (int j = i + 1; j < historicActivityInstances.size() - 1; j++) {
-                HistoricActivityInstance activityImpl1 = historicActivityInstances
-                        .get(j);
-                HistoricActivityInstance activityImpl2 = historicActivityInstances
-                        .get(j + 1);
-
-                if (activityImpl1.getStartTime().equals(
-                        activityImpl2.getStartTime())) {
-
-                    ActivityImpl sameActivityImpl2 = processDefinitionEntity
-                            .findActivity(activityImpl2.getActivityId());
-                    sameStartTimeNodes.add(sameActivityImpl2);
-
-                } else {
-                    break;
-                }
-            }
-            List<PvmTransition> pvmTransitions = activityImpl
-                    .getOutgoingTransitions();
-            for (PvmTransition pvmTransition : pvmTransitions) {
-                ActivityImpl pvmActivityImpl = (ActivityImpl) pvmTransition
-                        .getDestination();
-                if (sameStartTimeNodes.contains(pvmActivityImpl)) {
-                    Map<String, Object> properties = pvmActivityImpl.getProperties();
-                    System.out.println(properties);
-                    highFlows.add(pvmTransition.getId());
-                }
-            }
-        }
-        return highFlows;
-    }
-
-    public List<ActivitiProcess> getTaskSqu(String processInstanceId) {
-        List<HistoricTaskInstance> list = historyService.createHistoricTaskInstanceQuery().processInstanceId(processInstanceId)
-                .list();
-        List<ActivitiProcess> activitiProcesses = new ArrayList<>();
-
-        list.forEach(s -> {
-            String assignee = s.getAssignee();
-            ActivitiProcess activitiProcess = new ActivitiProcess();
-            //组
-            List<HistoricIdentityLink> historicIdentityLinksForTask = historyService.getHistoricIdentityLinksForTask(s.getId());
-            List<String> groupName = new ArrayList<>();
-            historicIdentityLinksForTask.forEach(hist -> {
-                if(!StringUtils.isEmpty(hist.getGroupId())){
-                    List<Group> groupList = identityService.createGroupQuery().groupId(hist.getGroupId()).list();
-                    if (groupList.size() > 0) {
-                        List<String> groupNames = groupList.stream().map(Group::getName).collect(Collectors.toList());
-                        groupName.addAll(groupNames);
-                    }
-                }
-            });
-            activitiProcess.setGroupNames(groupName);
-            if (!StringUtils.isEmpty(assignee)) {
-                activitiProcess.setUserId(assignee);
-                User user = identityService.createUserQuery().userId(assignee).singleResult();
-                if(user!=null){
-                    activitiProcess.setUserName(user.getFirstName());
-                }
-                activitiProcess.setSid(s.getTaskDefinitionKey());
-            }
-
-            activitiProcess.setTaskName(s.getName());
-            if(s.getEndTime()!=null){
-                activitiProcess.setTime(simpleDateFormat.format(s.getEndTime()));
-            }
-            activitiProcesses.add(activitiProcess);
-        });
-        return activitiProcesses;
-    }
-
-    public InputStream generateStream(String processInstanceId, boolean needCurrent) {
-        ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
-        HistoricProcessInstance historicProcessInstance =
-                historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
-        String processDefinitionId = null;
-        List<String> executedActivityIdList = new ArrayList<String>();
-        List<String> currentActivityIdList = new ArrayList<>();
-        List<HistoricActivityInstance> historicActivityInstanceList = new ArrayList<>();
-        if (processInstance != null) {
-            processDefinitionId = processInstance.getProcessDefinitionId();
-            if (needCurrent) {
-                currentActivityIdList = this.runtimeService.getActiveActivityIds(processInstance.getId());
-            }
-        }
-        if (historicProcessInstance != null) {
-            processDefinitionId = historicProcessInstance.getProcessDefinitionId();
-            historicActivityInstanceList =
-                    historyService.createHistoricActivityInstanceQuery().finished().processInstanceId(processInstanceId).orderByHistoricActivityInstanceId().asc().list();
-            for (HistoricActivityInstance activityInstance : historicActivityInstanceList) {
-                executedActivityIdList.add(activityInstance.getActivityId());
-            }
-        }
-
-        if (StringUtils.isEmpty(processDefinitionId) || executedActivityIdList.isEmpty()) {
-            return null;
-        }
-
-
-        //高亮线路id集合
-        ProcessDefinitionEntity definitionEntity = (ProcessDefinitionEntity) repositoryService.getProcessDefinition(processDefinitionId);
-        List<String> highLightedFlows = getHighLightedFlows(definitionEntity, historicActivityInstanceList);
-
-        BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinitionId);
-        //List<String> activeActivityIds = runtimeService.getActiveActivityIds(processInstanceId);
-        processEngineConfiguration = processEngine.getProcessEngineConfiguration();
-        Context.setProcessEngineConfiguration((ProcessEngineConfigurationImpl) processEngineConfiguration);
-        HMProcessDiagramGenerator diagramGenerator = (HMProcessDiagramGenerator) processEngineConfiguration.getProcessDiagramGenerator();
-        //List<String> activeIds = this.runtimeService.getActiveActivityIds(processInstance.getId());
-
-        InputStream imageStream = diagramGenerator.generateDiagram(
-                bpmnModel, "png",
-                executedActivityIdList, highLightedFlows,
-                processEngine.getProcessEngineConfiguration().getActivityFontName(),
-                processEngine.getProcessEngineConfiguration().getLabelFontName(),
-                "宋体",
-                null, 1.0, currentActivityIdList);
-
-        return imageStream;
-    }
+	static SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-hh mm:ss");
+	@Autowired
+	RuntimeService runtimeService;
+	@Autowired
+	TaskService taskService;
+	@Autowired
+	IdentityService identityService;
+	@Autowired
+	RepositoryService repositoryService;
+	@Autowired
+	ProcessEngineFactoryBean processEngine;
+	@Autowired
+	ProcessEngineConfiguration processEngineConfiguration;
+	@Autowired
+	HistoryService historyService;
+
+	/**
+	 * 获取需要高亮的线
+	 *
+	 * @param processDefinitionEntity
+	 * @param historicActivityInstances
+	 * @return
+	 */
+	private List<String> getHighLightedFlows(
+		ProcessDefinitionEntity processDefinitionEntity,
+		List<HistoricActivityInstance> historicActivityInstances) {
+
+		List<String> highFlows = new ArrayList<String>();
+
+		for (int i = 0; i < historicActivityInstances.size() - 1; i++) {
+			ActivityImpl activityImpl = processDefinitionEntity
+				.findActivity(historicActivityInstances.get(i)
+					.getActivityId());
+			List<ActivityImpl> sameStartTimeNodes = new ArrayList<ActivityImpl>();
+			ActivityImpl sameActivityImpl1 = processDefinitionEntity
+				.findActivity(historicActivityInstances.get(i + 1)
+					.getActivityId());
+			sameStartTimeNodes.add(sameActivityImpl1);
+
+			for (int j = i + 1; j < historicActivityInstances.size() - 1; j++) {
+				HistoricActivityInstance activityImpl1 = historicActivityInstances
+					.get(j);
+				HistoricActivityInstance activityImpl2 = historicActivityInstances
+					.get(j + 1);
+
+				if (activityImpl1.getStartTime().equals(
+					activityImpl2.getStartTime())) {
+
+					ActivityImpl sameActivityImpl2 = processDefinitionEntity
+						.findActivity(activityImpl2.getActivityId());
+					sameStartTimeNodes.add(sameActivityImpl2);
+
+				} else {
+					break;
+				}
+			}
+			List<PvmTransition> pvmTransitions = activityImpl
+				.getOutgoingTransitions();
+			for (PvmTransition pvmTransition : pvmTransitions) {
+				ActivityImpl pvmActivityImpl = (ActivityImpl) pvmTransition
+					.getDestination();
+				if (sameStartTimeNodes.contains(pvmActivityImpl)) {
+					Map<String, Object> properties = pvmActivityImpl.getProperties();
+					System.out.println(properties);
+					highFlows.add(pvmTransition.getId());
+				}
+			}
+		}
+		return highFlows;
+	}
+
+	public List<ActivitiProcess> getTaskSqu(String processInstanceId) {
+		List<HistoricTaskInstance> list = historyService.createHistoricTaskInstanceQuery().processInstanceId(processInstanceId)
+			.list();
+		List<ActivitiProcess> activitiProcesses = new ArrayList<>();
+
+		list.forEach(s -> {
+			String assignee = s.getAssignee();
+			ActivitiProcess activitiProcess = new ActivitiProcess();
+			//组
+			List<HistoricIdentityLink> historicIdentityLinksForTask = historyService.getHistoricIdentityLinksForTask(s.getId());
+			List<String> groupName = new ArrayList<>();
+			historicIdentityLinksForTask.forEach(hist -> {
+				if (!StringUtils.isEmpty(hist.getGroupId())) {
+					List<Group> groupList = identityService.createGroupQuery().groupId(hist.getGroupId()).list();
+					if (groupList.size() > 0) {
+						List<String> groupNames = groupList.stream().map(Group::getName).collect(Collectors.toList());
+						groupName.addAll(groupNames);
+					}
+				}
+			});
+			activitiProcess.setGroupNames(groupName);
+			if (!StringUtils.isEmpty(assignee)) {
+				activitiProcess.setUserId(assignee);
+				User user = identityService.createUserQuery().userId(assignee).singleResult();
+				if (user != null) {
+					activitiProcess.setUserName(user.getFirstName());
+				}
+				activitiProcess.setSid(s.getTaskDefinitionKey());
+			}
+
+			activitiProcess.setTaskName(s.getName());
+			if (s.getEndTime() != null) {
+				activitiProcess.setTime(simpleDateFormat.format(s.getEndTime()));
+			}
+			activitiProcesses.add(activitiProcess);
+		});
+		return activitiProcesses;
+	}
+
+	public InputStream generateStream(String processInstanceId, boolean needCurrent) {
+		ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+		HistoricProcessInstance historicProcessInstance =
+			historyService.createHistoricProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+		String processDefinitionId = null;
+		List<String> executedActivityIdList = new ArrayList<String>();
+		List<String> currentActivityIdList = new ArrayList<>();
+		List<HistoricActivityInstance> historicActivityInstanceList = new ArrayList<>();
+		if (processInstance != null) {
+			processDefinitionId = processInstance.getProcessDefinitionId();
+			if (needCurrent) {
+				currentActivityIdList = this.runtimeService.getActiveActivityIds(processInstance.getId());
+			}
+		}
+		if (historicProcessInstance != null) {
+			processDefinitionId = historicProcessInstance.getProcessDefinitionId();
+			historicActivityInstanceList =
+				historyService.createHistoricActivityInstanceQuery().finished().processInstanceId(processInstanceId).orderByHistoricActivityInstanceId().asc().list();
+			for (HistoricActivityInstance activityInstance : historicActivityInstanceList) {
+				executedActivityIdList.add(activityInstance.getActivityId());
+			}
+		}
+
+		if (StringUtils.isEmpty(processDefinitionId) || executedActivityIdList.isEmpty()) {
+			return null;
+		}
+
+
+		//高亮线路id集合
+		ProcessDefinitionEntity definitionEntity = (ProcessDefinitionEntity) repositoryService.getProcessDefinition(processDefinitionId);
+		List<String> highLightedFlows = getHighLightedFlows(definitionEntity, historicActivityInstanceList);
+
+		BpmnModel bpmnModel = repositoryService.getBpmnModel(processDefinitionId);
+		//List<String> activeActivityIds = runtimeService.getActiveActivityIds(processInstanceId);
+		processEngineConfiguration = processEngine.getProcessEngineConfiguration();
+		Context.setProcessEngineConfiguration((ProcessEngineConfigurationImpl) processEngineConfiguration);
+		HMProcessDiagramGenerator diagramGenerator = (HMProcessDiagramGenerator) processEngineConfiguration.getProcessDiagramGenerator();
+		//List<String> activeIds = this.runtimeService.getActiveActivityIds(processInstance.getId());
+
+		InputStream imageStream = diagramGenerator.generateDiagram(
+			bpmnModel, "png",
+			executedActivityIdList, highLightedFlows,
+			processEngine.getProcessEngineConfiguration().getActivityFontName(),
+			processEngine.getProcessEngineConfiguration().getLabelFontName(),
+			"宋体",
+			null, 1.0, currentActivityIdList);
+
+		return imageStream;
+	}
 }
diff --git a/len-activiti/src/main/java/org/activiti/rest/diagram/services/BaseProcessDefinitionDiagramLayoutResource.java b/len-activiti/src/main/java/org/activiti/rest/diagram/services/BaseProcessDefinitionDiagramLayoutResource.java
index 9aa28a3..6172c35 100644
--- a/len-activiti/src/main/java/org/activiti/rest/diagram/services/BaseProcessDefinitionDiagramLayoutResource.java
+++ b/len-activiti/src/main/java/org/activiti/rest/diagram/services/BaseProcessDefinitionDiagramLayoutResource.java
@@ -1,502 +1,491 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.activiti.rest.diagram.services;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.activiti.engine.ActivitiException;
-import org.activiti.engine.ActivitiObjectNotFoundException;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.RepositoryService;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.history.HistoricActivityInstance;
-import org.activiti.engine.impl.bpmn.behavior.BoundaryEventActivityBehavior;
-import org.activiti.engine.impl.bpmn.behavior.CallActivityBehavior;
-import org.activiti.engine.impl.bpmn.parser.BpmnParse;
-import org.activiti.engine.impl.bpmn.parser.ErrorEventDefinition;
-import org.activiti.engine.impl.bpmn.parser.EventSubscriptionDeclaration;
-import org.activiti.engine.impl.jobexecutor.TimerDeclarationImpl;
-import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
-import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
-import org.activiti.engine.impl.pvm.PvmTransition;
-import org.activiti.engine.impl.pvm.delegate.ActivityBehavior;
-import org.activiti.engine.impl.pvm.process.ActivityImpl;
-import org.activiti.engine.impl.pvm.process.Lane;
-import org.activiti.engine.impl.pvm.process.LaneSet;
-import org.activiti.engine.impl.pvm.process.ParticipantProcess;
-import org.activiti.engine.impl.pvm.process.TransitionImpl;
-import org.activiti.engine.repository.ProcessDefinition;
-import org.activiti.engine.runtime.Execution;
-import org.activiti.engine.runtime.ProcessInstance;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class BaseProcessDefinitionDiagramLayoutResource {
-
-  @Autowired
-  private RuntimeService runtimeService;
-  
-  @Autowired
-  private RepositoryService repositoryService;
-  
-  @Autowired
-  private HistoryService historyService;
-  
-  public ObjectNode getDiagramNode(String processInstanceId, String processDefinitionId) {
-    
-    List<String> highLightedFlows = Collections.<String> emptyList();
-    List<String> highLightedActivities = Collections.<String> emptyList();
-
-    Map<String, ObjectNode> subProcessInstanceMap = new HashMap<String, ObjectNode>();
-    
-    ProcessInstance processInstance = null;
-    if (processInstanceId != null) {
-      processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
-      if (processInstance == null) {
-        throw new ActivitiObjectNotFoundException("Process instance could not be found");
-      }
-      processDefinitionId = processInstance.getProcessDefinitionId();
-
-      List<ProcessInstance> subProcessInstances = runtimeService
-          .createProcessInstanceQuery()
-          .superProcessInstanceId(processInstanceId).list();
-      
-      for (ProcessInstance subProcessInstance : subProcessInstances) {
-        String subDefId = subProcessInstance.getProcessDefinitionId();
-
-        String superExecutionId = ((ExecutionEntity) subProcessInstance)
-            .getSuperExecutionId();
-        ProcessDefinitionEntity subDef = (ProcessDefinitionEntity) repositoryService.getProcessDefinition(subDefId);
-
-        ObjectNode processInstanceJSON = new ObjectMapper().createObjectNode();
-        processInstanceJSON.put("processInstanceId", subProcessInstance.getId());
-        processInstanceJSON.put("superExecutionId", superExecutionId);
-        processInstanceJSON.put("processDefinitionId", subDef.getId());
-        processInstanceJSON.put("processDefinitionKey", subDef.getKey());
-        processInstanceJSON.put("processDefinitionName", subDef.getName());
-
-        subProcessInstanceMap.put(superExecutionId, processInstanceJSON);
-      }
-    }
-
-    if (processDefinitionId == null) {
-      throw new ActivitiObjectNotFoundException("No process definition id provided");
-    }
-
-    ProcessDefinitionEntity processDefinition = (ProcessDefinitionEntity) repositoryService.getProcessDefinition(processDefinitionId);
-
-    if (processDefinition == null) {
-      throw new ActivitiException("Process definition " + processDefinitionId + " could not be found");
-    }
-
-    ObjectNode responseJSON = new ObjectMapper().createObjectNode();
-
-    // Process definition
-    JsonNode pdrJSON = getProcessDefinitionResponse(processDefinition);
-
-    if (pdrJSON != null) {
-      responseJSON.set("processDefinition", pdrJSON);
-    }
-
-    // Highlighted activities
-    if (processInstance != null) {
-      ArrayNode activityArray = new ObjectMapper().createArrayNode();
-      ArrayNode flowsArray = new ObjectMapper().createArrayNode();
-
-      highLightedActivities = runtimeService.getActiveActivityIds(processInstanceId);
-      highLightedFlows = getHighLightedFlows(processInstanceId, processDefinition);
-
-      for (String activityName : highLightedActivities) {
-        activityArray.add(activityName);
-      }
-
-      for (String flow : highLightedFlows)
-        flowsArray.add(flow);
-
-      responseJSON.set("highLightedActivities", activityArray);
-      responseJSON.set("highLightedFlows", flowsArray);
-    }
-
-    // Pool shape, if process is participant in collaboration
-    if (processDefinition.getParticipantProcess() != null) {
-      ParticipantProcess pProc = processDefinition.getParticipantProcess();
-
-      ObjectNode participantProcessJSON = new ObjectMapper().createObjectNode();
-      participantProcessJSON.put("id", pProc.getId());
-      if (StringUtils.isNotEmpty(pProc.getName())) {
-        participantProcessJSON.put("name", pProc.getName());
-      } else {
-        participantProcessJSON.put("name", "");
-      }
-      participantProcessJSON.put("x", pProc.getX());
-      participantProcessJSON.put("y", pProc.getY());
-      participantProcessJSON.put("width", pProc.getWidth());
-      participantProcessJSON.put("height", pProc.getHeight());
-
-      responseJSON.set("participantProcess", participantProcessJSON);
-    }
-
-    // Draw lanes
-
-    if (processDefinition.getLaneSets() != null && !processDefinition.getLaneSets().isEmpty()) {
-      ArrayNode laneSetArray = new ObjectMapper().createArrayNode();
-      for (LaneSet laneSet : processDefinition.getLaneSets()) {
-        ArrayNode laneArray = new ObjectMapper().createArrayNode();
-        if (laneSet.getLanes() != null && !laneSet.getLanes().isEmpty()) {
-          for (Lane lane : laneSet.getLanes()) {
-            ObjectNode laneJSON = new ObjectMapper().createObjectNode();
-            laneJSON.put("id", lane.getId());
-            if (StringUtils.isNotEmpty(lane.getName())) {
-              laneJSON.put("name", lane.getName());
-            } else {
-              laneJSON.put("name", "");
-            }
-            laneJSON.put("x", lane.getX());
-            laneJSON.put("y", lane.getY());
-            laneJSON.put("width", lane.getWidth());
-            laneJSON.put("height", lane.getHeight());
-
-            List<String> flowNodeIds = lane.getFlowNodeIds();
-            ArrayNode flowNodeIdsArray = new ObjectMapper().createArrayNode();
-            for (String flowNodeId : flowNodeIds) {
-              flowNodeIdsArray.add(flowNodeId);
-            }
-            laneJSON.set("flowNodeIds", flowNodeIdsArray);
-
-            laneArray.add(laneJSON);
-          }
-        }
-        ObjectNode laneSetJSON = new ObjectMapper().createObjectNode();
-        laneSetJSON.put("id", laneSet.getId());
-        if (StringUtils.isNotEmpty(laneSet.getName())) {
-          laneSetJSON.put("name", laneSet.getName());
-        } else {
-          laneSetJSON.put("name", "");
-        }
-        laneSetJSON.set("lanes", laneArray);
-
-        laneSetArray.add(laneSetJSON);
-      }
-
-      if (laneSetArray.size() > 0)
-        responseJSON.set("laneSets", laneSetArray);
-    }
-
-    ArrayNode sequenceFlowArray = new ObjectMapper().createArrayNode();
-    ArrayNode activityArray = new ObjectMapper().createArrayNode();
-
-    // Activities and their sequence-flows
-
-    for (ActivityImpl activity : processDefinition.getActivities()) {
-      getActivity(processInstanceId, activity, activityArray, sequenceFlowArray, 
-          processInstance, highLightedFlows, subProcessInstanceMap);
-    }
-
-    responseJSON.set("activities", activityArray);
-    responseJSON.set("sequenceFlows", sequenceFlowArray);
-
-    return responseJSON;
-  }
-
-  private List<String> getHighLightedFlows(String processInstanceId, ProcessDefinitionEntity processDefinition) {
-    
-    List<String> highLightedFlows = new ArrayList<String>();
-    List<HistoricActivityInstance> historicActivityInstances = historyService
-        .createHistoricActivityInstanceQuery()
-        .processInstanceId(processInstanceId)
-        .orderByHistoricActivityInstanceStartTime().asc().list();
-    
-    List<String> historicActivityInstanceList = new ArrayList<String>();
-    for (HistoricActivityInstance hai : historicActivityInstances) {
-      historicActivityInstanceList.add(hai.getActivityId());
-    }
-
-    // add current activities to list
-    List<String> highLightedActivities = runtimeService.getActiveActivityIds(processInstanceId);
-    historicActivityInstanceList.addAll(highLightedActivities);
-
-    // activities and their sequence-flows
-    for (ActivityImpl activity : processDefinition.getActivities()) {
-      int index = historicActivityInstanceList.indexOf(activity.getId());
-
-      if (index >= 0 && index + 1 < historicActivityInstanceList.size()) {
-        List<PvmTransition> pvmTransitionList = activity
-            .getOutgoingTransitions();
-        for (PvmTransition pvmTransition : pvmTransitionList) {
-          String destinationFlowId = pvmTransition.getDestination().getId();
-          if (destinationFlowId.equals(historicActivityInstanceList.get(index + 1))) {
-            highLightedFlows.add(pvmTransition.getId());
-          }
-        }
-      }
-    }
-    return highLightedFlows;
-  }
-
-  private void getActivity(String processInstanceId, ActivityImpl activity, ArrayNode activityArray,
-                           ArrayNode sequenceFlowArray, ProcessInstance processInstance, List<String> highLightedFlows,
-                           Map<String, ObjectNode> subProcessInstanceMap) {
-
-    ObjectNode activityJSON = new ObjectMapper().createObjectNode();
-
-    // Gather info on the multi instance marker
-    String multiInstance = (String) activity.getProperty("multiInstance");
-    if (multiInstance != null) {
-      if (!"sequential".equals(multiInstance)) {
-        multiInstance = "parallel";
-      }
-    }
-
-    ActivityBehavior activityBehavior = activity.getActivityBehavior();
-    // Gather info on the collapsed marker
-    Boolean collapsed = (activityBehavior instanceof CallActivityBehavior);
-    Boolean expanded = (Boolean) activity.getProperty(BpmnParse.PROPERTYNAME_ISEXPANDED);
-    if (expanded != null) {
-      collapsed = !expanded;
-    }
-
-    Boolean isInterrupting = null;
-    if (activityBehavior instanceof BoundaryEventActivityBehavior) {
-      isInterrupting = ((BoundaryEventActivityBehavior) activityBehavior).isInterrupting();
-    }
-
-    // Outgoing transitions of activity
-    for (PvmTransition sequenceFlow : activity.getOutgoingTransitions()) {
-      String flowName = (String) sequenceFlow.getProperty("name");
-      boolean isHighLighted = (highLightedFlows.contains(sequenceFlow.getId()));
-      boolean isConditional = sequenceFlow.getProperty(BpmnParse.PROPERTYNAME_CONDITION) != null && 
-          !((String) activity.getProperty("type")).toLowerCase().contains("gateway");
-      boolean isDefault = sequenceFlow.getId().equals(activity.getProperty("default"))
-          && ((String) activity.getProperty("type")).toLowerCase().contains("gateway");
-
-      List<Integer> waypoints = ((TransitionImpl) sequenceFlow).getWaypoints();
-      ArrayNode xPointArray = new ObjectMapper().createArrayNode();
-      ArrayNode yPointArray = new ObjectMapper().createArrayNode();
-      for (int i = 0; i < waypoints.size(); i += 2) { // waypoints.size()
-                                                      // minimally 4: x1, y1,
-                                                      // x2, y2
-        xPointArray.add(waypoints.get(i));
-        yPointArray.add(waypoints.get(i + 1));
-      }
-
-      ObjectNode flowJSON = new ObjectMapper().createObjectNode();
-      flowJSON.put("id", sequenceFlow.getId());
-      flowJSON.put("name", flowName);
-      flowJSON.put("flow", "(" + sequenceFlow.getSource().getId() + ")--"
-          + sequenceFlow.getId() + "-->("
-          + sequenceFlow.getDestination().getId() + ")");
-
-      if (isConditional)
-        flowJSON.put("isConditional", isConditional);
-      if (isDefault)
-        flowJSON.put("isDefault", isDefault);
-      if (isHighLighted)
-        flowJSON.put("isHighLighted", isHighLighted);
-      
-      flowJSON.set("xPointArray", xPointArray);
-      flowJSON.set("yPointArray", yPointArray);
-
-      sequenceFlowArray.add(flowJSON);
-    }
-
-    // Nested activities (boundary events)
-    ArrayNode nestedActivityArray = new ObjectMapper().createArrayNode();
-    for (ActivityImpl nestedActivity : activity.getActivities()) {
-      nestedActivityArray.add(nestedActivity.getId());
-    }
-
-    Map<String, Object> properties = activity.getProperties();
-    ObjectNode propertiesJSON = new ObjectMapper().createObjectNode();
-    for (String key : properties.keySet()) {
-      Object prop = properties.get(key);
-      if (prop instanceof String)
-        propertiesJSON.put(key, (String) properties.get(key));
-      else if (prop instanceof Integer)
-        propertiesJSON.put(key, (Integer) properties.get(key));
-      else if (prop instanceof Boolean)
-        propertiesJSON.put(key, (Boolean) properties.get(key));
-      else if ("initial".equals(key)) {
-        ActivityImpl act = (ActivityImpl) properties.get(key);
-        propertiesJSON.put(key, act.getId());
-      } else if ("timerDeclarations".equals(key)) {
-        ArrayList<TimerDeclarationImpl> timerDeclarations = (ArrayList<TimerDeclarationImpl>) properties.get(key);
-        ArrayNode timerDeclarationArray = new ObjectMapper().createArrayNode();
-
-        if (timerDeclarations != null)
-          for (TimerDeclarationImpl timerDeclaration : timerDeclarations) {
-            ObjectNode timerDeclarationJSON = new ObjectMapper().createObjectNode();
-
-            timerDeclarationJSON.put("isExclusive", timerDeclaration.isExclusive());
-            if (timerDeclaration.getRepeat() != null)
-              timerDeclarationJSON.put("repeat", timerDeclaration.getRepeat());
-            
-            timerDeclarationJSON.put("retries", String.valueOf(timerDeclaration.getRetries()));
-            timerDeclarationJSON.put("type", timerDeclaration.getJobHandlerType());
-            timerDeclarationJSON.put("configuration", timerDeclaration.getJobHandlerConfiguration());
-            //timerDeclarationJSON.put("expression", timerDeclaration.getDescription());
-            
-            timerDeclarationArray.add(timerDeclarationJSON);
-          }
-        if (timerDeclarationArray.size() > 0)
-          propertiesJSON.set(key, timerDeclarationArray);
-        // TODO: implement getting description
-      } else if ("eventDefinitions".equals(key)) {
-        ArrayList<EventSubscriptionDeclaration> eventDefinitions = (ArrayList<EventSubscriptionDeclaration>) properties.get(key);
-        ArrayNode eventDefinitionsArray = new ObjectMapper().createArrayNode();
-
-        if (eventDefinitions != null) {
-          for (EventSubscriptionDeclaration eventDefinition : eventDefinitions) {
-            ObjectNode eventDefinitionJSON = new ObjectMapper().createObjectNode();
-
-            if (eventDefinition.getActivityId() != null)
-              eventDefinitionJSON.put("activityId",eventDefinition.getActivityId());
-            
-            eventDefinitionJSON.put("eventName", eventDefinition.getEventName());
-            eventDefinitionJSON.put("eventType", eventDefinition.getEventType());
-            eventDefinitionJSON.put("isAsync", eventDefinition.isAsync());
-            eventDefinitionJSON.put("isStartEvent", eventDefinition.isStartEvent());
-            eventDefinitionsArray.add(eventDefinitionJSON);
-          }
-        }
-
-        if (eventDefinitionsArray.size() > 0)
-          propertiesJSON.set(key, eventDefinitionsArray);
-        
-      // TODO: implement it
-      } else if ("errorEventDefinitions".equals(key)) {
-        ArrayList<ErrorEventDefinition> errorEventDefinitions = (ArrayList<ErrorEventDefinition>) properties.get(key);
-        ArrayNode errorEventDefinitionsArray = new ObjectMapper().createArrayNode();
-
-        if (errorEventDefinitions != null) {
-          for (ErrorEventDefinition errorEventDefinition : errorEventDefinitions) {
-            ObjectNode errorEventDefinitionJSON = new ObjectMapper().createObjectNode();
-
-            if (errorEventDefinition.getErrorCode() != null)
-              errorEventDefinitionJSON.put("errorCode", errorEventDefinition.getErrorCode());
-            else
-              errorEventDefinitionJSON.putNull("errorCode");
-            
-            errorEventDefinitionJSON.put("handlerActivityId",
-            errorEventDefinition.getHandlerActivityId());
-
-            errorEventDefinitionsArray.add(errorEventDefinitionJSON);
-          }
-        }
-
-        if (errorEventDefinitionsArray.size() > 0)
-          propertiesJSON.set(key, errorEventDefinitionsArray);
-      }
-
-    }
-
-    if ("callActivity".equals(properties.get("type"))) {
-      CallActivityBehavior callActivityBehavior = null;
-
-      if (activityBehavior instanceof CallActivityBehavior) {
-        callActivityBehavior = (CallActivityBehavior) activityBehavior;
-      }
-
-      if (callActivityBehavior != null) {
-        propertiesJSON.put("processDefinitonKey", callActivityBehavior.getProcessDefinitonKey());
-
-        // get processDefinitonId from execution or get last processDefinitonId
-        // by key
-        ArrayNode processInstanceArray = new ObjectMapper().createArrayNode();
-        if (processInstance != null) {
-          List<Execution> executionList = runtimeService.createExecutionQuery()
-              .processInstanceId(processInstanceId)
-              .activityId(activity.getId()).list();
-          if (!executionList.isEmpty()) {
-            for (Execution execution : executionList) {
-              ObjectNode processInstanceJSON = subProcessInstanceMap.get(execution.getId());
-              processInstanceArray.add(processInstanceJSON);
-            }
-          }
-        }
-
-        // If active activities nas no instance of this callActivity then add
-        // last definition
-        if (processInstanceArray.size() == 0 && StringUtils.isNotEmpty(callActivityBehavior.getProcessDefinitonKey())) {
-          // Get last definition by key
-          ProcessDefinition lastProcessDefinition = repositoryService
-              .createProcessDefinitionQuery()
-              .processDefinitionKey(callActivityBehavior.getProcessDefinitonKey())
-              .latestVersion().singleResult();
-
-          // TODO: unuseful fields there are processDefinitionName, processDefinitionKey
-          if (lastProcessDefinition != null) {
-            ObjectNode processInstanceJSON = new ObjectMapper().createObjectNode();
-            processInstanceJSON.put("processDefinitionId", lastProcessDefinition.getId());
-            processInstanceJSON.put("processDefinitionKey", lastProcessDefinition.getKey());
-            processInstanceJSON.put("processDefinitionName", lastProcessDefinition.getName());
-            processInstanceArray.add(processInstanceJSON);
-          }
-        }
-
-        if (processInstanceArray.size() > 0) {
-          propertiesJSON.set("processDefinitons", processInstanceArray);
-        }
-      }
-    }
-
-    activityJSON.put("activityId", activity.getId());
-    activityJSON.set("properties", propertiesJSON);
-    if (multiInstance != null)
-      activityJSON.put("multiInstance", multiInstance);
-    if (collapsed)
-      activityJSON.put("collapsed", collapsed);
-    if (nestedActivityArray.size() > 0)
-      activityJSON.set("nestedActivities", nestedActivityArray);
-    if (isInterrupting != null)
-      activityJSON.put("isInterrupting", isInterrupting);
-    
-    activityJSON.put("x", activity.getX());
-    activityJSON.put("y", activity.getY());
-    activityJSON.put("width", activity.getWidth());
-    activityJSON.put("height", activity.getHeight());
-
-    activityArray.add(activityJSON);
-
-    // Nested activities (boundary events)
-    for (ActivityImpl nestedActivity : activity.getActivities()) {
-      getActivity(processInstanceId, nestedActivity, activityArray, sequenceFlowArray, 
-          processInstance, highLightedFlows, subProcessInstanceMap);
-    }
-  }
-
-  private JsonNode getProcessDefinitionResponse(ProcessDefinitionEntity processDefinition) {
-    ObjectMapper mapper = new ObjectMapper();
-    ObjectNode pdrJSON = mapper.createObjectNode();
-    pdrJSON.put("id", processDefinition.getId());
-    pdrJSON.put("name", processDefinition.getName());
-    pdrJSON.put("key", processDefinition.getKey());
-    pdrJSON.put("version", processDefinition.getVersion());
-    pdrJSON.put("deploymentId", processDefinition.getDeploymentId());
-    pdrJSON.put("isGraphicNotationDefined", isGraphicNotationDefined(processDefinition));
-    return pdrJSON;
-  }
-
-  private boolean isGraphicNotationDefined(ProcessDefinitionEntity processDefinition) {
-    return ((ProcessDefinitionEntity) repositoryService
-        .getProcessDefinition(processDefinition.getId()))
-        .isGraphicalNotationDefined();
-  }
-}
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.activiti.rest.diagram.services;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.activiti.engine.*;
+import org.activiti.engine.history.HistoricActivityInstance;
+import org.activiti.engine.impl.bpmn.behavior.BoundaryEventActivityBehavior;
+import org.activiti.engine.impl.bpmn.behavior.CallActivityBehavior;
+import org.activiti.engine.impl.bpmn.parser.BpmnParse;
+import org.activiti.engine.impl.bpmn.parser.ErrorEventDefinition;
+import org.activiti.engine.impl.bpmn.parser.EventSubscriptionDeclaration;
+import org.activiti.engine.impl.jobexecutor.TimerDeclarationImpl;
+import org.activiti.engine.impl.persistence.entity.ExecutionEntity;
+import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
+import org.activiti.engine.impl.pvm.PvmTransition;
+import org.activiti.engine.impl.pvm.delegate.ActivityBehavior;
+import org.activiti.engine.impl.pvm.process.*;
+import org.activiti.engine.repository.ProcessDefinition;
+import org.activiti.engine.runtime.Execution;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.*;
+
+public class BaseProcessDefinitionDiagramLayoutResource {
+
+	@Autowired
+	private RuntimeService runtimeService;
+
+	@Autowired
+	private RepositoryService repositoryService;
+
+	@Autowired
+	private HistoryService historyService;
+
+	public ObjectNode getDiagramNode(String processInstanceId, String processDefinitionId) {
+
+		List<String> highLightedFlows = Collections.<String>emptyList();
+		List<String> highLightedActivities = Collections.<String>emptyList();
+
+		Map<String, ObjectNode> subProcessInstanceMap = new HashMap<String, ObjectNode>();
+
+		ProcessInstance processInstance = null;
+		if (processInstanceId != null) {
+			processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+			if (processInstance == null) {
+				throw new ActivitiObjectNotFoundException("Process instance could not be found");
+			}
+			processDefinitionId = processInstance.getProcessDefinitionId();
+
+			List<ProcessInstance> subProcessInstances = runtimeService
+				.createProcessInstanceQuery()
+				.superProcessInstanceId(processInstanceId).list();
+
+			for (ProcessInstance subProcessInstance : subProcessInstances) {
+				String subDefId = subProcessInstance.getProcessDefinitionId();
+
+				String superExecutionId = ((ExecutionEntity) subProcessInstance)
+					.getSuperExecutionId();
+				ProcessDefinitionEntity subDef = (ProcessDefinitionEntity) repositoryService.getProcessDefinition(subDefId);
+
+				ObjectNode processInstanceJSON = new ObjectMapper().createObjectNode();
+				processInstanceJSON.put("processInstanceId", subProcessInstance.getId());
+				processInstanceJSON.put("superExecutionId", superExecutionId);
+				processInstanceJSON.put("processDefinitionId", subDef.getId());
+				processInstanceJSON.put("processDefinitionKey", subDef.getKey());
+				processInstanceJSON.put("processDefinitionName", subDef.getName());
+
+				subProcessInstanceMap.put(superExecutionId, processInstanceJSON);
+			}
+		}
+
+		if (processDefinitionId == null) {
+			throw new ActivitiObjectNotFoundException("No process definition id provided");
+		}
+
+		ProcessDefinitionEntity processDefinition = (ProcessDefinitionEntity) repositoryService.getProcessDefinition(processDefinitionId);
+
+		if (processDefinition == null) {
+			throw new ActivitiException("Process definition " + processDefinitionId + " could not be found");
+		}
+
+		ObjectNode responseJSON = new ObjectMapper().createObjectNode();
+
+		// Process definition
+		JsonNode pdrJSON = getProcessDefinitionResponse(processDefinition);
+
+		if (pdrJSON != null) {
+			responseJSON.set("processDefinition", pdrJSON);
+		}
+
+		// Highlighted activities
+		if (processInstance != null) {
+			ArrayNode activityArray = new ObjectMapper().createArrayNode();
+			ArrayNode flowsArray = new ObjectMapper().createArrayNode();
+
+			highLightedActivities = runtimeService.getActiveActivityIds(processInstanceId);
+			highLightedFlows = getHighLightedFlows(processInstanceId, processDefinition);
+
+			for (String activityName : highLightedActivities) {
+				activityArray.add(activityName);
+			}
+
+			for (String flow : highLightedFlows)
+				flowsArray.add(flow);
+
+			responseJSON.set("highLightedActivities", activityArray);
+			responseJSON.set("highLightedFlows", flowsArray);
+		}
+
+		// Pool shape, if process is participant in collaboration
+		if (processDefinition.getParticipantProcess() != null) {
+			ParticipantProcess pProc = processDefinition.getParticipantProcess();
+
+			ObjectNode participantProcessJSON = new ObjectMapper().createObjectNode();
+			participantProcessJSON.put("id", pProc.getId());
+			if (StringUtils.isNotEmpty(pProc.getName())) {
+				participantProcessJSON.put("name", pProc.getName());
+			} else {
+				participantProcessJSON.put("name", "");
+			}
+			participantProcessJSON.put("x", pProc.getX());
+			participantProcessJSON.put("y", pProc.getY());
+			participantProcessJSON.put("width", pProc.getWidth());
+			participantProcessJSON.put("height", pProc.getHeight());
+
+			responseJSON.set("participantProcess", participantProcessJSON);
+		}
+
+		// Draw lanes
+
+		if (processDefinition.getLaneSets() != null && !processDefinition.getLaneSets().isEmpty()) {
+			ArrayNode laneSetArray = new ObjectMapper().createArrayNode();
+			for (LaneSet laneSet : processDefinition.getLaneSets()) {
+				ArrayNode laneArray = new ObjectMapper().createArrayNode();
+				if (laneSet.getLanes() != null && !laneSet.getLanes().isEmpty()) {
+					for (Lane lane : laneSet.getLanes()) {
+						ObjectNode laneJSON = new ObjectMapper().createObjectNode();
+						laneJSON.put("id", lane.getId());
+						if (StringUtils.isNotEmpty(lane.getName())) {
+							laneJSON.put("name", lane.getName());
+						} else {
+							laneJSON.put("name", "");
+						}
+						laneJSON.put("x", lane.getX());
+						laneJSON.put("y", lane.getY());
+						laneJSON.put("width", lane.getWidth());
+						laneJSON.put("height", lane.getHeight());
+
+						List<String> flowNodeIds = lane.getFlowNodeIds();
+						ArrayNode flowNodeIdsArray = new ObjectMapper().createArrayNode();
+						for (String flowNodeId : flowNodeIds) {
+							flowNodeIdsArray.add(flowNodeId);
+						}
+						laneJSON.set("flowNodeIds", flowNodeIdsArray);
+
+						laneArray.add(laneJSON);
+					}
+				}
+				ObjectNode laneSetJSON = new ObjectMapper().createObjectNode();
+				laneSetJSON.put("id", laneSet.getId());
+				if (StringUtils.isNotEmpty(laneSet.getName())) {
+					laneSetJSON.put("name", laneSet.getName());
+				} else {
+					laneSetJSON.put("name", "");
+				}
+				laneSetJSON.set("lanes", laneArray);
+
+				laneSetArray.add(laneSetJSON);
+			}
+
+			if (laneSetArray.size() > 0)
+				responseJSON.set("laneSets", laneSetArray);
+		}
+
+		ArrayNode sequenceFlowArray = new ObjectMapper().createArrayNode();
+		ArrayNode activityArray = new ObjectMapper().createArrayNode();
+
+		// Activities and their sequence-flows
+
+		for (ActivityImpl activity : processDefinition.getActivities()) {
+			getActivity(processInstanceId, activity, activityArray, sequenceFlowArray,
+				processInstance, highLightedFlows, subProcessInstanceMap);
+		}
+
+		responseJSON.set("activities", activityArray);
+		responseJSON.set("sequenceFlows", sequenceFlowArray);
+
+		return responseJSON;
+	}
+
+	private List<String> getHighLightedFlows(String processInstanceId, ProcessDefinitionEntity processDefinition) {
+
+		List<String> highLightedFlows = new ArrayList<String>();
+		List<HistoricActivityInstance> historicActivityInstances = historyService
+			.createHistoricActivityInstanceQuery()
+			.processInstanceId(processInstanceId)
+			.orderByHistoricActivityInstanceStartTime().asc().list();
+
+		List<String> historicActivityInstanceList = new ArrayList<String>();
+		for (HistoricActivityInstance hai : historicActivityInstances) {
+			historicActivityInstanceList.add(hai.getActivityId());
+		}
+
+		// add current activities to list
+		List<String> highLightedActivities = runtimeService.getActiveActivityIds(processInstanceId);
+		historicActivityInstanceList.addAll(highLightedActivities);
+
+		// activities and their sequence-flows
+		for (ActivityImpl activity : processDefinition.getActivities()) {
+			int index = historicActivityInstanceList.indexOf(activity.getId());
+
+			if (index >= 0 && index + 1 < historicActivityInstanceList.size()) {
+				List<PvmTransition> pvmTransitionList = activity
+					.getOutgoingTransitions();
+				for (PvmTransition pvmTransition : pvmTransitionList) {
+					String destinationFlowId = pvmTransition.getDestination().getId();
+					if (destinationFlowId.equals(historicActivityInstanceList.get(index + 1))) {
+						highLightedFlows.add(pvmTransition.getId());
+					}
+				}
+			}
+		}
+		return highLightedFlows;
+	}
+
+	private void getActivity(String processInstanceId, ActivityImpl activity, ArrayNode activityArray,
+							 ArrayNode sequenceFlowArray, ProcessInstance processInstance, List<String> highLightedFlows,
+							 Map<String, ObjectNode> subProcessInstanceMap) {
+
+		ObjectNode activityJSON = new ObjectMapper().createObjectNode();
+
+		// Gather info on the multi instance marker
+		String multiInstance = (String) activity.getProperty("multiInstance");
+		if (multiInstance != null) {
+			if (!"sequential".equals(multiInstance)) {
+				multiInstance = "parallel";
+			}
+		}
+
+		ActivityBehavior activityBehavior = activity.getActivityBehavior();
+		// Gather info on the collapsed marker
+		Boolean collapsed = (activityBehavior instanceof CallActivityBehavior);
+		Boolean expanded = (Boolean) activity.getProperty(BpmnParse.PROPERTYNAME_ISEXPANDED);
+		if (expanded != null) {
+			collapsed = !expanded;
+		}
+
+		Boolean isInterrupting = null;
+		if (activityBehavior instanceof BoundaryEventActivityBehavior) {
+			isInterrupting = ((BoundaryEventActivityBehavior) activityBehavior).isInterrupting();
+		}
+
+		// Outgoing transitions of activity
+		for (PvmTransition sequenceFlow : activity.getOutgoingTransitions()) {
+			String flowName = (String) sequenceFlow.getProperty("name");
+			boolean isHighLighted = (highLightedFlows.contains(sequenceFlow.getId()));
+			boolean isConditional = sequenceFlow.getProperty(BpmnParse.PROPERTYNAME_CONDITION) != null &&
+				!((String) activity.getProperty("type")).toLowerCase().contains("gateway");
+			boolean isDefault = sequenceFlow.getId().equals(activity.getProperty("default"))
+				&& ((String) activity.getProperty("type")).toLowerCase().contains("gateway");
+
+			List<Integer> waypoints = ((TransitionImpl) sequenceFlow).getWaypoints();
+			ArrayNode xPointArray = new ObjectMapper().createArrayNode();
+			ArrayNode yPointArray = new ObjectMapper().createArrayNode();
+			for (int i = 0; i < waypoints.size(); i += 2) { // waypoints.size()
+				// minimally 4: x1, y1,
+				// x2, y2
+				xPointArray.add(waypoints.get(i));
+				yPointArray.add(waypoints.get(i + 1));
+			}
+
+			ObjectNode flowJSON = new ObjectMapper().createObjectNode();
+			flowJSON.put("id", sequenceFlow.getId());
+			flowJSON.put("name", flowName);
+			flowJSON.put("flow", "(" + sequenceFlow.getSource().getId() + ")--"
+				+ sequenceFlow.getId() + "-->("
+				+ sequenceFlow.getDestination().getId() + ")");
+
+			if (isConditional)
+				flowJSON.put("isConditional", isConditional);
+			if (isDefault)
+				flowJSON.put("isDefault", isDefault);
+			if (isHighLighted)
+				flowJSON.put("isHighLighted", isHighLighted);
+
+			flowJSON.set("xPointArray", xPointArray);
+			flowJSON.set("yPointArray", yPointArray);
+
+			sequenceFlowArray.add(flowJSON);
+		}
+
+		// Nested activities (boundary events)
+		ArrayNode nestedActivityArray = new ObjectMapper().createArrayNode();
+		for (ActivityImpl nestedActivity : activity.getActivities()) {
+			nestedActivityArray.add(nestedActivity.getId());
+		}
+
+		Map<String, Object> properties = activity.getProperties();
+		ObjectNode propertiesJSON = new ObjectMapper().createObjectNode();
+		for (String key : properties.keySet()) {
+			Object prop = properties.get(key);
+			if (prop instanceof String)
+				propertiesJSON.put(key, (String) properties.get(key));
+			else if (prop instanceof Integer)
+				propertiesJSON.put(key, (Integer) properties.get(key));
+			else if (prop instanceof Boolean)
+				propertiesJSON.put(key, (Boolean) properties.get(key));
+			else if ("initial".equals(key)) {
+				ActivityImpl act = (ActivityImpl) properties.get(key);
+				propertiesJSON.put(key, act.getId());
+			} else if ("timerDeclarations".equals(key)) {
+				ArrayList<TimerDeclarationImpl> timerDeclarations = (ArrayList<TimerDeclarationImpl>) properties.get(key);
+				ArrayNode timerDeclarationArray = new ObjectMapper().createArrayNode();
+
+				if (timerDeclarations != null)
+					for (TimerDeclarationImpl timerDeclaration : timerDeclarations) {
+						ObjectNode timerDeclarationJSON = new ObjectMapper().createObjectNode();
+
+						timerDeclarationJSON.put("isExclusive", timerDeclaration.isExclusive());
+						if (timerDeclaration.getRepeat() != null)
+							timerDeclarationJSON.put("repeat", timerDeclaration.getRepeat());
+
+						timerDeclarationJSON.put("retries", String.valueOf(timerDeclaration.getRetries()));
+						timerDeclarationJSON.put("type", timerDeclaration.getJobHandlerType());
+						timerDeclarationJSON.put("configuration", timerDeclaration.getJobHandlerConfiguration());
+						//timerDeclarationJSON.put("expression", timerDeclaration.getDescription());
+
+						timerDeclarationArray.add(timerDeclarationJSON);
+					}
+				if (timerDeclarationArray.size() > 0)
+					propertiesJSON.set(key, timerDeclarationArray);
+				// TODO: implement getting description
+			} else if ("eventDefinitions".equals(key)) {
+				ArrayList<EventSubscriptionDeclaration> eventDefinitions = (ArrayList<EventSubscriptionDeclaration>) properties.get(key);
+				ArrayNode eventDefinitionsArray = new ObjectMapper().createArrayNode();
+
+				if (eventDefinitions != null) {
+					for (EventSubscriptionDeclaration eventDefinition : eventDefinitions) {
+						ObjectNode eventDefinitionJSON = new ObjectMapper().createObjectNode();
+
+						if (eventDefinition.getActivityId() != null)
+							eventDefinitionJSON.put("activityId", eventDefinition.getActivityId());
+
+						eventDefinitionJSON.put("eventName", eventDefinition.getEventName());
+						eventDefinitionJSON.put("eventType", eventDefinition.getEventType());
+						eventDefinitionJSON.put("isAsync", eventDefinition.isAsync());
+						eventDefinitionJSON.put("isStartEvent", eventDefinition.isStartEvent());
+						eventDefinitionsArray.add(eventDefinitionJSON);
+					}
+				}
+
+				if (eventDefinitionsArray.size() > 0)
+					propertiesJSON.set(key, eventDefinitionsArray);
+
+				// TODO: implement it
+			} else if ("errorEventDefinitions".equals(key)) {
+				ArrayList<ErrorEventDefinition> errorEventDefinitions = (ArrayList<ErrorEventDefinition>) properties.get(key);
+				ArrayNode errorEventDefinitionsArray = new ObjectMapper().createArrayNode();
+
+				if (errorEventDefinitions != null) {
+					for (ErrorEventDefinition errorEventDefinition : errorEventDefinitions) {
+						ObjectNode errorEventDefinitionJSON = new ObjectMapper().createObjectNode();
+
+						if (errorEventDefinition.getErrorCode() != null)
+							errorEventDefinitionJSON.put("errorCode", errorEventDefinition.getErrorCode());
+						else
+							errorEventDefinitionJSON.putNull("errorCode");
+
+						errorEventDefinitionJSON.put("handlerActivityId",
+							errorEventDefinition.getHandlerActivityId());
+
+						errorEventDefinitionsArray.add(errorEventDefinitionJSON);
+					}
+				}
+
+				if (errorEventDefinitionsArray.size() > 0)
+					propertiesJSON.set(key, errorEventDefinitionsArray);
+			}
+
+		}
+
+		if ("callActivity".equals(properties.get("type"))) {
+			CallActivityBehavior callActivityBehavior = null;
+
+			if (activityBehavior instanceof CallActivityBehavior) {
+				callActivityBehavior = (CallActivityBehavior) activityBehavior;
+			}
+
+			if (callActivityBehavior != null) {
+				propertiesJSON.put("processDefinitonKey", callActivityBehavior.getProcessDefinitonKey());
+
+				// get processDefinitonId from execution or get last processDefinitonId
+				// by key
+				ArrayNode processInstanceArray = new ObjectMapper().createArrayNode();
+				if (processInstance != null) {
+					List<Execution> executionList = runtimeService.createExecutionQuery()
+						.processInstanceId(processInstanceId)
+						.activityId(activity.getId()).list();
+					if (!executionList.isEmpty()) {
+						for (Execution execution : executionList) {
+							ObjectNode processInstanceJSON = subProcessInstanceMap.get(execution.getId());
+							processInstanceArray.add(processInstanceJSON);
+						}
+					}
+				}
+
+				// If active activities nas no instance of this callActivity then add
+				// last definition
+				if (processInstanceArray.size() == 0 && StringUtils.isNotEmpty(callActivityBehavior.getProcessDefinitonKey())) {
+					// Get last definition by key
+					ProcessDefinition lastProcessDefinition = repositoryService
+						.createProcessDefinitionQuery()
+						.processDefinitionKey(callActivityBehavior.getProcessDefinitonKey())
+						.latestVersion().singleResult();
+
+					// TODO: unuseful fields there are processDefinitionName, processDefinitionKey
+					if (lastProcessDefinition != null) {
+						ObjectNode processInstanceJSON = new ObjectMapper().createObjectNode();
+						processInstanceJSON.put("processDefinitionId", lastProcessDefinition.getId());
+						processInstanceJSON.put("processDefinitionKey", lastProcessDefinition.getKey());
+						processInstanceJSON.put("processDefinitionName", lastProcessDefinition.getName());
+						processInstanceArray.add(processInstanceJSON);
+					}
+				}
+
+				if (processInstanceArray.size() > 0) {
+					propertiesJSON.set("processDefinitons", processInstanceArray);
+				}
+			}
+		}
+
+		activityJSON.put("activityId", activity.getId());
+		activityJSON.set("properties", propertiesJSON);
+		if (multiInstance != null)
+			activityJSON.put("multiInstance", multiInstance);
+		if (collapsed)
+			activityJSON.put("collapsed", collapsed);
+		if (nestedActivityArray.size() > 0)
+			activityJSON.set("nestedActivities", nestedActivityArray);
+		if (isInterrupting != null)
+			activityJSON.put("isInterrupting", isInterrupting);
+
+		activityJSON.put("x", activity.getX());
+		activityJSON.put("y", activity.getY());
+		activityJSON.put("width", activity.getWidth());
+		activityJSON.put("height", activity.getHeight());
+
+		activityArray.add(activityJSON);
+
+		// Nested activities (boundary events)
+		for (ActivityImpl nestedActivity : activity.getActivities()) {
+			getActivity(processInstanceId, nestedActivity, activityArray, sequenceFlowArray,
+				processInstance, highLightedFlows, subProcessInstanceMap);
+		}
+	}
+
+	private JsonNode getProcessDefinitionResponse(ProcessDefinitionEntity processDefinition) {
+		ObjectMapper mapper = new ObjectMapper();
+		ObjectNode pdrJSON = mapper.createObjectNode();
+		pdrJSON.put("id", processDefinition.getId());
+		pdrJSON.put("name", processDefinition.getName());
+		pdrJSON.put("key", processDefinition.getKey());
+		pdrJSON.put("version", processDefinition.getVersion());
+		pdrJSON.put("deploymentId", processDefinition.getDeploymentId());
+		pdrJSON.put("isGraphicNotationDefined", isGraphicNotationDefined(processDefinition));
+		return pdrJSON;
+	}
+
+	private boolean isGraphicNotationDefined(ProcessDefinitionEntity processDefinition) {
+		return ((ProcessDefinitionEntity) repositoryService
+			.getProcessDefinition(processDefinition.getId()))
+			.isGraphicalNotationDefined();
+	}
+}
diff --git a/len-activiti/src/main/java/org/activiti/rest/diagram/services/ProcessDefinitionDiagramLayoutResource.java b/len-activiti/src/main/java/org/activiti/rest/diagram/services/ProcessDefinitionDiagramLayoutResource.java
index e800b42..14b281f 100644
--- a/len-activiti/src/main/java/org/activiti/rest/diagram/services/ProcessDefinitionDiagramLayoutResource.java
+++ b/len-activiti/src/main/java/org/activiti/rest/diagram/services/ProcessDefinitionDiagramLayoutResource.java
@@ -1,9 +1,9 @@
 /* Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,10 +21,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 public class ProcessDefinitionDiagramLayoutResource extends
-    BaseProcessDefinitionDiagramLayoutResource {
+	BaseProcessDefinitionDiagramLayoutResource {
 
-  @RequestMapping(value="/process-definition/{processDefinitionId}/diagram-layout", method = RequestMethod.GET, produces = "application/json")
-  public ObjectNode getDiagram(@PathVariable String processDefinitionId) {
-    return getDiagramNode(null, processDefinitionId);
-  }
+	@RequestMapping(value = "/process-definition/{processDefinitionId}/diagram-layout", method = RequestMethod.GET, produces = "application/json")
+	public ObjectNode getDiagram(@PathVariable String processDefinitionId) {
+		return getDiagramNode(null, processDefinitionId);
+	}
 }
diff --git a/len-activiti/src/main/java/org/activiti/rest/diagram/services/ProcessInstanceDiagramLayoutResource.java b/len-activiti/src/main/java/org/activiti/rest/diagram/services/ProcessInstanceDiagramLayoutResource.java
index a3a0915..4b1d15f 100644
--- a/len-activiti/src/main/java/org/activiti/rest/diagram/services/ProcessInstanceDiagramLayoutResource.java
+++ b/len-activiti/src/main/java/org/activiti/rest/diagram/services/ProcessInstanceDiagramLayoutResource.java
@@ -1,9 +1,9 @@
 /* Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,8 +22,8 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class ProcessInstanceDiagramLayoutResource extends BaseProcessDefinitionDiagramLayoutResource {
 
-  @RequestMapping(value="/process-instance/{processInstanceId}/diagram-layout", method = RequestMethod.GET, produces = "application/json")
-  public ObjectNode getDiagram(@PathVariable String processInstanceId) {
-    return getDiagramNode(processInstanceId, null);
-  }
+	@RequestMapping(value = "/process-instance/{processInstanceId}/diagram-layout", method = RequestMethod.GET, produces = "application/json")
+	public ObjectNode getDiagram(@PathVariable String processInstanceId) {
+		return getDiagramNode(processInstanceId, null);
+	}
 }
diff --git a/len-activiti/src/main/java/org/activiti/rest/diagram/services/ProcessInstanceHighlightsResource.java b/len-activiti/src/main/java/org/activiti/rest/diagram/services/ProcessInstanceHighlightsResource.java
index 387991d..0f92679 100644
--- a/len-activiti/src/main/java/org/activiti/rest/diagram/services/ProcessInstanceHighlightsResource.java
+++ b/len-activiti/src/main/java/org/activiti/rest/diagram/services/ProcessInstanceHighlightsResource.java
@@ -1,255 +1,249 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.activiti.rest.diagram.services;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.RepositoryService;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.history.HistoricActivityInstance;
-import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
-import org.activiti.engine.impl.pvm.PvmTransition;
-import org.activiti.engine.impl.pvm.process.ActivityImpl;
-import org.activiti.engine.runtime.ProcessInstance;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class ProcessInstanceHighlightsResource {
-
-  @Autowired
-	private RuntimeService runtimeService;
-  
-  @Autowired
-	private RepositoryService repositoryService;
-  
-  @Autowired
-	private HistoryService historyService;
-  
-	protected ObjectMapper objectMapper = new ObjectMapper();
-
-	@RequestMapping(value="/process-instance/{processInstanceId}/highlights", method = RequestMethod.GET, produces = "application/json")
-	public ObjectNode getHighlighted(@PathVariable String processInstanceId) {
-		
-	  ObjectNode responseJSON = objectMapper.createObjectNode();
-		
-		responseJSON.put("processInstanceId", processInstanceId);
-		
-		ArrayNode activitiesArray = objectMapper.createArrayNode();
-		ArrayNode flowsArray = objectMapper.createArrayNode();
-		
-		try {
-			ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
-			ProcessDefinitionEntity processDefinition = (ProcessDefinitionEntity) repositoryService.getProcessDefinition(processInstance.getProcessDefinitionId());
-			
-			responseJSON.put("processDefinitionId", processInstance.getProcessDefinitionId());
-			
-			List<String> highLightedActivities = runtimeService.getActiveActivityIds(processInstanceId);
-			List<String> highLightedFlows = getHighLightedFlows(processDefinition, processInstanceId);
-			
-			for (String activityId : highLightedActivities) {
-				activitiesArray.add(activityId);
-			}
-			
-			for (String flow : highLightedFlows) {
-				flowsArray.add(flow);
-			}
-			
-		} catch (Exception e) {
-		  e.printStackTrace();
-		}
-		
-		responseJSON.set("activities", activitiesArray);
-		responseJSON.set("flows", flowsArray);
-		
-		return responseJSON;
-	}
-	
-	
-	/**
-	 * getHighLightedFlows
-	 * 
-	 * @param processDefinition
-	 * @param processInstanceId
-	 * @return
-	 */
-	private List<String> getHighLightedFlows(ProcessDefinitionEntity processDefinition, String processInstanceId) {
-	    
-    List<String> highLightedFlows = new ArrayList<String>();
-    
-    List<HistoricActivityInstance> historicActivityInstances = historyService.createHistoricActivityInstanceQuery()
-        .processInstanceId(processInstanceId)
-        //order by startime asc is not correct. use default order is correct.
-        //.orderByHistoricActivityInstanceStartTime().asc()/*.orderByActivityId().asc()*/
-        .list();
-      
-    LinkedList<HistoricActivityInstance> hisActInstList = new LinkedList<HistoricActivityInstance>();
-    hisActInstList.addAll(historicActivityInstances);
-      
-    getHighlightedFlows(processDefinition.getActivities(), hisActInstList, highLightedFlows);
-    
-    return highLightedFlows;
-	}
-	
-	/**
-	 * getHighlightedFlows
-	 * 
-	 * code logic: 
-	 * 1. Loop all activities by id asc order;
-	 * 2. Check each activity's outgoing transitions and eventBoundery outgoing transitions, if outgoing transitions's destination.id is in other executed activityIds, add this transition to highLightedFlows List;
-	 * 3. But if activity is not a parallelGateway or inclusiveGateway, only choose the earliest flow.
-	 * 
-	 * @param activityList
-	 * @param hisActInstList
-	 * @param highLightedFlows
-	 */
-	private void getHighlightedFlows(List<ActivityImpl> activityList, LinkedList<HistoricActivityInstance> hisActInstList, List<String> highLightedFlows){
-	    
-    //check out startEvents in activityList
-    List<ActivityImpl> startEventActList = new ArrayList<ActivityImpl>();
-    Map<String, ActivityImpl> activityMap = new HashMap<String, ActivityImpl>(activityList.size());
-    for(ActivityImpl activity : activityList){
-        
-      activityMap.put(activity.getId(), activity);
-      
-      String actType = (String) activity.getProperty("type");
-      if (actType != null && actType.toLowerCase().indexOf("startevent") >= 0){
-        startEventActList.add(activity);
-      }
-    }
-  
-    //These codes is used to avoid a bug: 
-    //ACT-1728 If the process instance was started by a callActivity, it will be not have the startEvent activity in ACT_HI_ACTINST table 
-    //Code logic:
-    //Check the first activity if it is a startEvent, if not check out the startEvent's highlight outgoing flow.
-    HistoricActivityInstance firstHistActInst = hisActInstList.getFirst();
-    String firstActType = (String) firstHistActInst.getActivityType();
-    if (firstActType != null && firstActType.toLowerCase().indexOf("startevent") < 0){
-      PvmTransition startTrans = getStartTransaction(startEventActList, firstHistActInst);
-      if (startTrans != null){
-        highLightedFlows.add(startTrans.getId());
-      }
-    } 
-      
-    while (!hisActInstList.isEmpty()) {
-      HistoricActivityInstance histActInst = hisActInstList.removeFirst();
-      ActivityImpl activity = activityMap.get(histActInst.getActivityId());
-      if (activity != null) {
-        boolean isParallel = false;
-        String type = histActInst.getActivityType();
-        if ("parallelGateway".equals(type) || "inclusiveGateway".equals(type)){
-          isParallel = true;
-        } else if ("subProcess".equals(histActInst.getActivityType())){
-          getHighlightedFlows(activity.getActivities(), hisActInstList, highLightedFlows);
-        }
-        
-        List<PvmTransition> allOutgoingTrans = new ArrayList<PvmTransition>();
-        allOutgoingTrans.addAll(activity.getOutgoingTransitions());
-        allOutgoingTrans.addAll(getBoundaryEventOutgoingTransitions(activity));
-        List<String> activityHighLightedFlowIds = getHighlightedFlows(allOutgoingTrans, hisActInstList, isParallel);
-        highLightedFlows.addAll(activityHighLightedFlowIds);
-      }
-    }
-	}
-	
-	/**
-	 * Check out the outgoing transition connected to firstActInst from startEventActList
-	 * 
-	 * @param startEventActList
-	 * @param firstActInst
-	 * @return
-	 */
-	private PvmTransition getStartTransaction(List<ActivityImpl> startEventActList, HistoricActivityInstance firstActInst){
-    for (ActivityImpl startEventAct: startEventActList) {
-      for (PvmTransition trans : startEventAct.getOutgoingTransitions()) {
-        if (trans.getDestination().getId().equals(firstActInst.getActivityId())) {
-          return trans;
-        }
-      }
-    }
-    return null;
-	}
-	
-	/**
-	 * getBoundaryEventOutgoingTransitions
-	 * 
-	 * @param activity
-	 * @return
-	 */
-	private List<PvmTransition> getBoundaryEventOutgoingTransitions(ActivityImpl activity){
-    List<PvmTransition> boundaryTrans = new ArrayList<PvmTransition>();
-    for(ActivityImpl subActivity : activity.getActivities()){
-      String type = (String)subActivity.getProperty("type");
-      if(type!=null && type.toLowerCase().indexOf("boundary")>=0){
-        boundaryTrans.addAll(subActivity.getOutgoingTransitions());
-      }
-    }
-    return boundaryTrans;
-	}
-	
-	/**
-	 * find out single activity's highlighted flowIds
-	 * 
-	 * @param activity
-	 * @param hisActInstList
-	 * @param isExclusive if true only return one flowId(Such as exclusiveGateway, BoundaryEvent On Task)
-	 * @return
-	 */
-	private List<String> getHighlightedFlows(List<PvmTransition> pvmTransitionList, LinkedList<HistoricActivityInstance> hisActInstList, boolean isParallel){
-	    
-    List<String> highLightedFlowIds = new ArrayList<String>();
-	    
-    PvmTransition earliestTrans = null;
-    HistoricActivityInstance earliestHisActInst = null;
-    
-    for (PvmTransition pvmTransition : pvmTransitionList) {
-                        
-      String destActId = pvmTransition.getDestination().getId();
-      HistoricActivityInstance destHisActInst = findHisActInst(hisActInstList, destActId);
-      if (destHisActInst != null) {
-        if (isParallel) {
-          highLightedFlowIds.add(pvmTransition.getId());
-        } else if (earliestHisActInst == null || (earliestHisActInst.getId().compareTo(destHisActInst.getId()) > 0)) {
-          earliestTrans = pvmTransition;
-          earliestHisActInst = destHisActInst;
-        }
-      }
-    }
-    
-    if ((!isParallel) && earliestTrans!=null){
-      highLightedFlowIds.add(earliestTrans.getId());
-    }
-    
-    return highLightedFlowIds;
-	}
-	
-	private HistoricActivityInstance findHisActInst(LinkedList<HistoricActivityInstance> hisActInstList, String actId){
-    for (HistoricActivityInstance hisActInst : hisActInstList){
-      if (hisActInst.getActivityId().equals(actId)){
-        return hisActInst;
-      }
-    }
-    return null;
-	}
-}
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.activiti.rest.diagram.services;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.activiti.engine.HistoryService;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.RuntimeService;
+import org.activiti.engine.history.HistoricActivityInstance;
+import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
+import org.activiti.engine.impl.pvm.PvmTransition;
+import org.activiti.engine.impl.pvm.process.ActivityImpl;
+import org.activiti.engine.runtime.ProcessInstance;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+
+@RestController
+public class ProcessInstanceHighlightsResource {
+
+	protected ObjectMapper objectMapper = new ObjectMapper();
+	@Autowired
+	private RuntimeService runtimeService;
+	@Autowired
+	private RepositoryService repositoryService;
+	@Autowired
+	private HistoryService historyService;
+
+	@RequestMapping(value = "/process-instance/{processInstanceId}/highlights", method = RequestMethod.GET, produces = "application/json")
+	public ObjectNode getHighlighted(@PathVariable String processInstanceId) {
+
+		ObjectNode responseJSON = objectMapper.createObjectNode();
+
+		responseJSON.put("processInstanceId", processInstanceId);
+
+		ArrayNode activitiesArray = objectMapper.createArrayNode();
+		ArrayNode flowsArray = objectMapper.createArrayNode();
+
+		try {
+			ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+			ProcessDefinitionEntity processDefinition = (ProcessDefinitionEntity) repositoryService.getProcessDefinition(processInstance.getProcessDefinitionId());
+
+			responseJSON.put("processDefinitionId", processInstance.getProcessDefinitionId());
+
+			List<String> highLightedActivities = runtimeService.getActiveActivityIds(processInstanceId);
+			List<String> highLightedFlows = getHighLightedFlows(processDefinition, processInstanceId);
+
+			for (String activityId : highLightedActivities) {
+				activitiesArray.add(activityId);
+			}
+
+			for (String flow : highLightedFlows) {
+				flowsArray.add(flow);
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		responseJSON.set("activities", activitiesArray);
+		responseJSON.set("flows", flowsArray);
+
+		return responseJSON;
+	}
+
+
+	/**
+	 * getHighLightedFlows
+	 *
+	 * @param processDefinition
+	 * @param processInstanceId
+	 * @return
+	 */
+	private List<String> getHighLightedFlows(ProcessDefinitionEntity processDefinition, String processInstanceId) {
+
+		List<String> highLightedFlows = new ArrayList<String>();
+
+		List<HistoricActivityInstance> historicActivityInstances = historyService.createHistoricActivityInstanceQuery()
+			.processInstanceId(processInstanceId)
+			//order by startime asc is not correct. use default order is correct.
+			//.orderByHistoricActivityInstanceStartTime().asc()/*.orderByActivityId().asc()*/
+			.list();
+
+		LinkedList<HistoricActivityInstance> hisActInstList = new LinkedList<HistoricActivityInstance>();
+		hisActInstList.addAll(historicActivityInstances);
+
+		getHighlightedFlows(processDefinition.getActivities(), hisActInstList, highLightedFlows);
+
+		return highLightedFlows;
+	}
+
+	/**
+	 * getHighlightedFlows
+	 * <p>
+	 * code logic:
+	 * 1. Loop all activities by id asc order;
+	 * 2. Check each activity's outgoing transitions and eventBoundery outgoing transitions, if outgoing transitions's destination.id is in other executed activityIds, add this transition to highLightedFlows List;
+	 * 3. But if activity is not a parallelGateway or inclusiveGateway, only choose the earliest flow.
+	 *
+	 * @param activityList
+	 * @param hisActInstList
+	 * @param highLightedFlows
+	 */
+	private void getHighlightedFlows(List<ActivityImpl> activityList, LinkedList<HistoricActivityInstance> hisActInstList, List<String> highLightedFlows) {
+
+		//check out startEvents in activityList
+		List<ActivityImpl> startEventActList = new ArrayList<ActivityImpl>();
+		Map<String, ActivityImpl> activityMap = new HashMap<String, ActivityImpl>(activityList.size());
+		for (ActivityImpl activity : activityList) {
+
+			activityMap.put(activity.getId(), activity);
+
+			String actType = (String) activity.getProperty("type");
+			if (actType != null && actType.toLowerCase().indexOf("startevent") >= 0) {
+				startEventActList.add(activity);
+			}
+		}
+
+		//These codes is used to avoid a bug:
+		//ACT-1728 If the process instance was started by a callActivity, it will be not have the startEvent activity in ACT_HI_ACTINST table
+		//Code logic:
+		//Check the first activity if it is a startEvent, if not check out the startEvent's highlight outgoing flow.
+		HistoricActivityInstance firstHistActInst = hisActInstList.getFirst();
+		String firstActType = (String) firstHistActInst.getActivityType();
+		if (firstActType != null && firstActType.toLowerCase().indexOf("startevent") < 0) {
+			PvmTransition startTrans = getStartTransaction(startEventActList, firstHistActInst);
+			if (startTrans != null) {
+				highLightedFlows.add(startTrans.getId());
+			}
+		}
+
+		while (!hisActInstList.isEmpty()) {
+			HistoricActivityInstance histActInst = hisActInstList.removeFirst();
+			ActivityImpl activity = activityMap.get(histActInst.getActivityId());
+			if (activity != null) {
+				boolean isParallel = false;
+				String type = histActInst.getActivityType();
+				if ("parallelGateway".equals(type) || "inclusiveGateway".equals(type)) {
+					isParallel = true;
+				} else if ("subProcess".equals(histActInst.getActivityType())) {
+					getHighlightedFlows(activity.getActivities(), hisActInstList, highLightedFlows);
+				}
+
+				List<PvmTransition> allOutgoingTrans = new ArrayList<PvmTransition>();
+				allOutgoingTrans.addAll(activity.getOutgoingTransitions());
+				allOutgoingTrans.addAll(getBoundaryEventOutgoingTransitions(activity));
+				List<String> activityHighLightedFlowIds = getHighlightedFlows(allOutgoingTrans, hisActInstList, isParallel);
+				highLightedFlows.addAll(activityHighLightedFlowIds);
+			}
+		}
+	}
+
+	/**
+	 * Check out the outgoing transition connected to firstActInst from startEventActList
+	 *
+	 * @param startEventActList
+	 * @param firstActInst
+	 * @return
+	 */
+	private PvmTransition getStartTransaction(List<ActivityImpl> startEventActList, HistoricActivityInstance firstActInst) {
+		for (ActivityImpl startEventAct : startEventActList) {
+			for (PvmTransition trans : startEventAct.getOutgoingTransitions()) {
+				if (trans.getDestination().getId().equals(firstActInst.getActivityId())) {
+					return trans;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * getBoundaryEventOutgoingTransitions
+	 *
+	 * @param activity
+	 * @return
+	 */
+	private List<PvmTransition> getBoundaryEventOutgoingTransitions(ActivityImpl activity) {
+		List<PvmTransition> boundaryTrans = new ArrayList<PvmTransition>();
+		for (ActivityImpl subActivity : activity.getActivities()) {
+			String type = (String) subActivity.getProperty("type");
+			if (type != null && type.toLowerCase().indexOf("boundary") >= 0) {
+				boundaryTrans.addAll(subActivity.getOutgoingTransitions());
+			}
+		}
+		return boundaryTrans;
+	}
+
+	/**
+	 * find out single activity's highlighted flowIds
+	 *
+	 * @param activity
+	 * @param hisActInstList
+	 * @param isExclusive    if true only return one flowId(Such as exclusiveGateway, BoundaryEvent On Task)
+	 * @return
+	 */
+	private List<String> getHighlightedFlows(List<PvmTransition> pvmTransitionList, LinkedList<HistoricActivityInstance> hisActInstList, boolean isParallel) {
+
+		List<String> highLightedFlowIds = new ArrayList<String>();
+
+		PvmTransition earliestTrans = null;
+		HistoricActivityInstance earliestHisActInst = null;
+
+		for (PvmTransition pvmTransition : pvmTransitionList) {
+
+			String destActId = pvmTransition.getDestination().getId();
+			HistoricActivityInstance destHisActInst = findHisActInst(hisActInstList, destActId);
+			if (destHisActInst != null) {
+				if (isParallel) {
+					highLightedFlowIds.add(pvmTransition.getId());
+				} else if (earliestHisActInst == null || (earliestHisActInst.getId().compareTo(destHisActInst.getId()) > 0)) {
+					earliestTrans = pvmTransition;
+					earliestHisActInst = destHisActInst;
+				}
+			}
+		}
+
+		if ((!isParallel) && earliestTrans != null) {
+			highLightedFlowIds.add(earliestTrans.getId());
+		}
+
+		return highLightedFlowIds;
+	}
+
+	private HistoricActivityInstance findHisActInst(LinkedList<HistoricActivityInstance> hisActInstList, String actId) {
+		for (HistoricActivityInstance hisActInst : hisActInstList) {
+			if (hisActInst.getActivityId().equals(actId)) {
+				return hisActInst;
+			}
+		}
+		return null;
+	}
+}
diff --git a/len-activiti/src/main/java/org/activiti/rest/editor/main/StencilsetRestResource.java b/len-activiti/src/main/java/org/activiti/rest/editor/main/StencilsetRestResource.java
index 80cd9d4..ae9ed73 100644
--- a/len-activiti/src/main/java/org/activiti/rest/editor/main/StencilsetRestResource.java
+++ b/len-activiti/src/main/java/org/activiti/rest/editor/main/StencilsetRestResource.java
@@ -1,9 +1,9 @@
 /* Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -12,7 +12,6 @@
  */
 package org.activiti.rest.editor.main;
 
-import java.io.InputStream;
 import org.activiti.engine.ActivitiException;
 import org.apache.commons.io.IOUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,21 +19,23 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.io.InputStream;
+
 /**
  * @author Tijs Rademakers
  */
 @RestController
 @RequestMapping("/service")
 public class StencilsetRestResource {
-  
-  @RequestMapping(value="/editor/stencilset", method = RequestMethod.GET, produces = "application/json;charset=utf-8")
-  public @ResponseBody
-  String getStencilset() {
-    InputStream stencilsetStream = this.getClass().getClassLoader().getResourceAsStream("stencilset.json");
-    try {
-      return IOUtils.toString(stencilsetStream, "utf-8");
-    } catch (Exception e) {
-      throw new ActivitiException("Error while loading stencil set", e);
-    }
-  }
+
+	@RequestMapping(value = "/editor/stencilset", method = RequestMethod.GET, produces = "application/json;charset=utf-8")
+	public @ResponseBody
+	String getStencilset() {
+		InputStream stencilsetStream = this.getClass().getClassLoader().getResourceAsStream("stencilset.json");
+		try {
+			return IOUtils.toString(stencilsetStream, "utf-8");
+		} catch (Exception e) {
+			throw new ActivitiException("Error while loading stencil set", e);
+		}
+	}
 }
diff --git a/len-activiti/src/main/java/org/activiti/rest/editor/model/ModelEditorJsonRestResource.java b/len-activiti/src/main/java/org/activiti/rest/editor/model/ModelEditorJsonRestResource.java
index 98648b5..9b4a5a0 100644
--- a/len-activiti/src/main/java/org/activiti/rest/editor/model/ModelEditorJsonRestResource.java
+++ b/len-activiti/src/main/java/org/activiti/rest/editor/model/ModelEditorJsonRestResource.java
@@ -1,71 +1,69 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.activiti.rest.editor.model;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import lombok.extern.slf4j.Slf4j;
-import org.activiti.editor.constants.ModelDataJsonConstants;
-import org.activiti.engine.ActivitiException;
-import org.activiti.engine.RepositoryService;
-import org.activiti.engine.repository.Model;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author Tijs Rademakers
- */
-@RestController
-@RequestMapping("/service")
-@Slf4j
-public class ModelEditorJsonRestResource implements ModelDataJsonConstants {
-  
-  @Autowired
-  private RepositoryService repositoryService;
-  
-  @Autowired
-  private ObjectMapper objectMapper;
-  
-  @RequestMapping(value="/model/{modelId}/json", method = RequestMethod.GET, produces = "application/json")
-  public ObjectNode getEditorJson(@PathVariable String modelId) {
-    ObjectNode modelNode = null;
-    
-    Model model = repositoryService.getModel(modelId);
-      
-    if (model != null) {
-      try {
-        if (StringUtils.isNotEmpty(model.getMetaInfo())) {
-          modelNode = (ObjectNode) objectMapper.readTree(model.getMetaInfo());
-        } else {
-          modelNode = objectMapper.createObjectNode();
-          modelNode.put(MODEL_NAME, model.getName());
-        }
-        modelNode.put(MODEL_ID, model.getId());
-        ObjectNode editorJsonNode = (ObjectNode) objectMapper.readTree(
-            new String(repositoryService.getModelEditorSource(model.getId()), "utf-8"));
-        modelNode.set("model", editorJsonNode);
-        
-      } catch (Exception e) {
-        log.error("Error creating model JSON", e);
-        throw new ActivitiException("Error creating model JSON", e);
-      }
-    }
-    return modelNode;
-  }
-}
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.activiti.rest.editor.model;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import lombok.extern.slf4j.Slf4j;
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.repository.Model;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author Tijs Rademakers
+ */
+@RestController
+@RequestMapping("/service")
+@Slf4j
+public class ModelEditorJsonRestResource implements ModelDataJsonConstants {
+
+	@Autowired
+	private RepositoryService repositoryService;
+
+	@Autowired
+	private ObjectMapper objectMapper;
+
+	@RequestMapping(value = "/model/{modelId}/json", method = RequestMethod.GET, produces = "application/json")
+	public ObjectNode getEditorJson(@PathVariable String modelId) {
+		ObjectNode modelNode = null;
+
+		Model model = repositoryService.getModel(modelId);
+
+		if (model != null) {
+			try {
+				if (StringUtils.isNotEmpty(model.getMetaInfo())) {
+					modelNode = (ObjectNode) objectMapper.readTree(model.getMetaInfo());
+				} else {
+					modelNode = objectMapper.createObjectNode();
+					modelNode.put(MODEL_NAME, model.getName());
+				}
+				modelNode.put(MODEL_ID, model.getId());
+				ObjectNode editorJsonNode = (ObjectNode) objectMapper.readTree(
+					new String(repositoryService.getModelEditorSource(model.getId()), "utf-8"));
+				modelNode.set("model", editorJsonNode);
+
+			} catch (Exception e) {
+				log.error("Error creating model JSON", e);
+				throw new ActivitiException("Error creating model JSON", e);
+			}
+		}
+		return modelNode;
+	}
+}
diff --git a/len-activiti/src/main/java/org/activiti/rest/editor/model/ModelSaveRestResource.java b/len-activiti/src/main/java/org/activiti/rest/editor/model/ModelSaveRestResource.java
index 9d71be3..dc778f7 100644
--- a/len-activiti/src/main/java/org/activiti/rest/editor/model/ModelSaveRestResource.java
+++ b/len-activiti/src/main/java/org/activiti/rest/editor/model/ModelSaveRestResource.java
@@ -1,103 +1,95 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.activiti.rest.editor.model;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import lombok.extern.slf4j.Slf4j;
-import org.activiti.editor.constants.ModelDataJsonConstants;
-import org.activiti.engine.ActivitiException;
-import org.activiti.engine.RepositoryService;
-import org.activiti.engine.repository.Model;
-import org.apache.batik.transcoder.TranscoderInput;
-import org.apache.batik.transcoder.TranscoderOutput;
-import org.apache.batik.transcoder.image.PNGTranscoder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-
-/**
- * @author Tijs Rademakers
- */
-@RestController
-@RequestMapping("/service")
-@Slf4j
-public class ModelSaveRestResource implements ModelDataJsonConstants {
-
-  @Autowired
-  private RepositoryService repositoryService;
-
-  
-  @PostMapping(value="/model/{modelId}/save")
-  @ResponseStatus(value = HttpStatus.OK)
-  public void saveModel(@PathVariable String modelId
-          , String name, String description
-          , String json_xml, String svg_xml,HttpServletRequest request, HttpServletResponse response) {
-    try {
-      Map<String, String[]> map= request.getParameterMap();
-      JSONObject jsonObject=new JSONObject();
-      //全跑到key了，可取方案
-      for(Map.Entry<String,String[]> entry:map.entrySet()){
-        String data=entry.getKey()+"="+(entry.getValue()[0]);
-        jsonObject= JSON.parseObject(data);
-      }
-      name= (String) jsonObject.get("name");
-      description= (String) jsonObject.get("description");
-      json_xml= (String) jsonObject.get("json_xml");
-      svg_xml= (String) jsonObject.get("svg_xml");
-      
-      Model model = repositoryService.getModel(modelId);
-      JSONObject object=new JSONObject();
-      object.put(MODEL_NAME, name);
-      object.put(MODEL_DESCRIPTION, description);
-      model.setMetaInfo(object.toString());
-      model.setName(name);
-      repositoryService.saveModel(model);
-      
-      repositoryService.addModelEditorSource(model.getId(), json_xml.getBytes("utf-8"));
-      
-      InputStream svgStream = new ByteArrayInputStream(svg_xml.getBytes("utf-8"));
-      TranscoderInput input = new TranscoderInput(svgStream);
-      
-      PNGTranscoder transcoder = new PNGTranscoder();
-      // Setup output
-      ByteArrayOutputStream outStream = new ByteArrayOutputStream();
-      TranscoderOutput output = new TranscoderOutput(outStream);
-      
-      // Do the transformation
-      transcoder.transcode(input, output);
-      final byte[] result = outStream.toByteArray();
-      repositoryService.addModelEditorSourceExtra(model.getId(), result);
-      outStream.close();
-      
-    } catch (Exception e) {
-      log.error("Error saving model", e);
-      throw new ActivitiException("Error saving model", e);
-    }
-  }
-}
+/* Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.activiti.rest.editor.model;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.activiti.editor.constants.ModelDataJsonConstants;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.RepositoryService;
+import org.activiti.engine.repository.Model;
+import org.apache.batik.transcoder.TranscoderInput;
+import org.apache.batik.transcoder.TranscoderOutput;
+import org.apache.batik.transcoder.image.PNGTranscoder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.util.Map;
+
+/**
+ * @author Tijs Rademakers
+ */
+@RestController
+@RequestMapping("/service")
+@Slf4j
+public class ModelSaveRestResource implements ModelDataJsonConstants {
+
+	@Autowired
+	private RepositoryService repositoryService;
+
+
+	@PostMapping(value = "/model/{modelId}/save")
+	@ResponseStatus(value = HttpStatus.OK)
+	public void saveModel(@PathVariable String modelId
+		, String name, String description
+		, String json_xml, String svg_xml, HttpServletRequest request, HttpServletResponse response) {
+		try {
+			Map<String, String[]> map = request.getParameterMap();
+			JSONObject jsonObject = new JSONObject();
+			//全跑到key了，可取方案
+			for (Map.Entry<String, String[]> entry : map.entrySet()) {
+				String data = entry.getKey() + "=" + (entry.getValue()[0]);
+				jsonObject = JSON.parseObject(data);
+			}
+			name = (String) jsonObject.get("name");
+			description = (String) jsonObject.get("description");
+			json_xml = (String) jsonObject.get("json_xml");
+			svg_xml = (String) jsonObject.get("svg_xml");
+
+			Model model = repositoryService.getModel(modelId);
+			JSONObject object = new JSONObject();
+			object.put(MODEL_NAME, name);
+			object.put(MODEL_DESCRIPTION, description);
+			model.setMetaInfo(object.toString());
+			model.setName(name);
+			repositoryService.saveModel(model);
+
+			repositoryService.addModelEditorSource(model.getId(), json_xml.getBytes("utf-8"));
+
+			InputStream svgStream = new ByteArrayInputStream(svg_xml.getBytes("utf-8"));
+			TranscoderInput input = new TranscoderInput(svgStream);
+
+			PNGTranscoder transcoder = new PNGTranscoder();
+			// Setup output
+			ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+			TranscoderOutput output = new TranscoderOutput(outStream);
+
+			// Do the transformation
+			transcoder.transcode(input, output);
+			final byte[] result = outStream.toByteArray();
+			repositoryService.addModelEditorSourceExtra(model.getId(), result);
+			outStream.close();
+
+		} catch (Exception e) {
+			log.error("Error saving model", e);
+			throw new ActivitiException("Error saving model", e);
+		}
+	}
+}
diff --git a/len-activiti/src/main/java/org/activiti/rest/model/ActivitiProcess.java b/len-activiti/src/main/java/org/activiti/rest/model/ActivitiProcess.java
index a239d0c..ea02064 100644
--- a/len-activiti/src/main/java/org/activiti/rest/model/ActivitiProcess.java
+++ b/len-activiti/src/main/java/org/activiti/rest/model/ActivitiProcess.java
@@ -15,21 +15,21 @@ import java.util.List;
 @ApiModel("流程顺序")
 public class ActivitiProcess {
 
-    @ApiModelProperty("流程活动名称")
-    String taskName;
+	@ApiModelProperty("流程活动名称")
+	String taskName;
 
-    @ApiModelProperty("用户id")
-    String userId;
+	@ApiModelProperty("用户id")
+	String userId;
 
-    @ApiModelProperty("用户名")
-    String userName;
+	@ApiModelProperty("用户名")
+	String userName;
 
-    @ApiModelProperty("组")
-    List<String> groupNames;
+	@ApiModelProperty("组")
+	List<String> groupNames;
 
-    @ApiModelProperty("流程线id")
-    String sid;
+	@ApiModelProperty("流程线id")
+	String sid;
 
-    @ApiModelProperty("审批时间")
-    String time;
+	@ApiModelProperty("审批时间")
+	String time;
 }
diff --git a/len-activiti/src/main/resources/bpmn/demo.xml b/len-activiti/src/main/resources/bpmn/demo.xml
index 60b94f3..cb95f0d 100644
--- a/len-activiti/src/main/resources/bpmn/demo.xml
+++ b/len-activiti/src/main/resources/bpmn/demo.xml
@@ -1,168 +1,196 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://activiti.org/bpmn20" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath" id="definitions" name="" targetNamespace="http://activiti.org/bpmn20" typeLanguage="http://www.w3.org/2001/XMLSchema">
-  <process id="vacationRequest" isClosed="false" name="Vacation request" processType="None">
-    <startEvent activiti:initiator="employeeName" id="request">
-      <extensionElements>
-        <activiti:formProperty id="numberOfDays" name="Number of days" required="true" type="long" value="1"/>
-        <activiti:formProperty datePattern="dd-MM-yyyy hh:mm" id="startDate" name="First day of holiday (dd-MM-yyy)" required="true" type="date"/>
-        <activiti:formProperty id="vacationMotivation" name="Motivation" type="string"/>
-      </extensionElements>
-    </startEvent>
-    <sequenceFlow id="flow1" sourceRef="request" targetRef="handleRequest"/>
-    <userTask activiti:exclusive="true" id="handleRequest" name="Handle vacation request">
-      <documentation id="handleRequest_D_1"><![CDATA[
+<definitions xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
+			 xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI"
+			 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			 xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+			 expressionLanguage="http://www.w3.org/1999/XPath" id="definitions" name=""
+			 targetNamespace="http://activiti.org/bpmn20" typeLanguage="http://www.w3.org/2001/XMLSchema">
+	<process id="vacationRequest" isClosed="false" name="Vacation request" processType="None">
+		<startEvent activiti:initiator="employeeName" id="request">
+			<extensionElements>
+				<activiti:formProperty id="numberOfDays" name="Number of days" required="true" type="long" value="1"/>
+				<activiti:formProperty datePattern="dd-MM-yyyy hh:mm" id="startDate"
+									   name="First day of holiday (dd-MM-yyy)" required="true" type="date"/>
+				<activiti:formProperty id="vacationMotivation" name="Motivation" type="string"/>
+			</extensionElements>
+		</startEvent>
+		<sequenceFlow id="flow1" sourceRef="request" targetRef="handleRequest"/>
+		<userTask activiti:exclusive="true" id="handleRequest" name="Handle vacation request">
+			<documentation id="handleRequest_D_1"><![CDATA[
         ${employeeName} would like to take ${numberOfDays} day(s) of vacation (Motivation: ${vacationMotivation}).
       ]]></documentation>
-      <extensionElements>
-        <activiti:formProperty id="vacationApproved" name="Do you approve this vacation" required="true" type="enum">
-          <activiti:value id="true" name="Approve"/>
-          <activiti:value id="false" name="Reject"/>
-        </activiti:formProperty>
-        <activiti:formProperty id="managerMotivation" name="Motivation" type="string"/>
-      </extensionElements>
-    </userTask>
-    <sequenceFlow id="flow2" sourceRef="handleRequest" targetRef="requestApprovedDecision"/>
-    <exclusiveGateway gatewayDirection="Unspecified" id="requestApprovedDecision" name="Request approved?"/>
-    <sequenceFlow id="flow3" sourceRef="requestApprovedDecision" targetRef="sendApprovalMail">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${vacationApproved == 'true'}]]></conditionExpression>
-    </sequenceFlow>
-    <task activiti:exclusive="true" id="sendApprovalMail" name="Send confirmation e-mail"/>
-    <sequenceFlow id="flow4" sourceRef="sendApprovalMail" targetRef="theEnd1"/>
-    <endEvent id="theEnd1"/>
-    <sequenceFlow id="flow5" sourceRef="requestApprovedDecision" targetRef="adjustVacationRequestTask">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${vacationApproved == 'false'}]]></conditionExpression>
-    </sequenceFlow>
-    <userTask activiti:exclusive="true" id="adjustVacationRequestTask" name="Adjust vacation request">
-      <documentation id="adjustVacationRequestTask_D_1"><![CDATA[
+			<extensionElements>
+				<activiti:formProperty id="vacationApproved" name="Do you approve this vacation" required="true"
+									   type="enum">
+					<activiti:value id="true" name="Approve"/>
+					<activiti:value id="false" name="Reject"/>
+				</activiti:formProperty>
+				<activiti:formProperty id="managerMotivation" name="Motivation" type="string"/>
+			</extensionElements>
+		</userTask>
+		<sequenceFlow id="flow2" sourceRef="handleRequest" targetRef="requestApprovedDecision"/>
+		<exclusiveGateway gatewayDirection="Unspecified" id="requestApprovedDecision" name="Request approved?"/>
+		<sequenceFlow id="flow3" sourceRef="requestApprovedDecision" targetRef="sendApprovalMail">
+			<conditionExpression xsi:type="tFormalExpression">
+				<![CDATA[${vacationApproved == 'true'}]]></conditionExpression>
+		</sequenceFlow>
+		<task activiti:exclusive="true" id="sendApprovalMail" name="Send confirmation e-mail"/>
+		<sequenceFlow id="flow4" sourceRef="sendApprovalMail" targetRef="theEnd1"/>
+		<endEvent id="theEnd1"/>
+		<sequenceFlow id="flow5" sourceRef="requestApprovedDecision" targetRef="adjustVacationRequestTask">
+			<conditionExpression xsi:type="tFormalExpression">
+				<![CDATA[${vacationApproved == 'false'}]]></conditionExpression>
+		</sequenceFlow>
+		<userTask activiti:exclusive="true" id="adjustVacationRequestTask" name="Adjust vacation request">
+			<documentation id="adjustVacationRequestTask_D_1"><![CDATA[
         Your manager has disapproved your vacation request for ${numberOfDays} days.
         Reason: ${managerMotivation}
       ]]></documentation>
-      <extensionElements>
-        <activiti:formProperty id="numberOfDays" name="Number of days" required="true" type="long" value="${numberOfDays}"/>
-        <activiti:formProperty datePattern="dd-MM-yyyy hh:mm" id="startDate" name="First day of holiday (dd-MM-yyy)" required="true" type="date" value="${startDate}"/>
-        <activiti:formProperty id="vacationMotivation" name="Motivation" type="string" value="${vacationMotivation}"/>
-        <activiti:formProperty id="resendRequest" name="Resend vacation request to manager?" required="true" type="enum">
-          <activiti:value id="true" name="Yes"/>
-          <activiti:value id="false" name="No"/>
-        </activiti:formProperty>
-      </extensionElements>
-    </userTask>
-    <sequenceFlow id="flow6" sourceRef="adjustVacationRequestTask" targetRef="resendRequestDecision"/>
-    <exclusiveGateway gatewayDirection="Unspecified" id="resendRequestDecision" name="Resend request?"/>
-    <sequenceFlow id="flow7" sourceRef="resendRequestDecision" targetRef="handleRequest">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${resendRequest == 'true'}]]></conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="flow8" sourceRef="resendRequestDecision" targetRef="theEnd2">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${resendRequest == 'false'}]]></conditionExpression>
-    </sequenceFlow>
-    <endEvent id="theEnd2"/>
-  </process>
-  <bpmndi:BPMNDiagram documentation="background=#FFFFFF;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
-    <bpmndi:BPMNPlane bpmnElement="vacationRequest">
-      <bpmndi:BPMNShape bpmnElement="theEnd2" id="Shape-theEnd2">
-        <dc:Bounds height="32.0" width="32.0" x="586.0" y="247.5"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="resendRequestDecision" id="Shape-resendRequestDecision" isMarkerVisible="false">
-        <dc:Bounds height="32.0" width="32.0" x="494.0" y="247.5"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="adjustVacationRequestTask" id="Shape-adjustVacationRequestTask">
-        <dc:Bounds height="55.0" width="85.0" x="349.0" y="236.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="theEnd1" id="Shape-theEnd1">
-        <dc:Bounds height="32.0" width="32.0" x="494.0" y="152.5"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="sendApprovalMail" id="Shape-sendApprovalMail">
-        <dc:Bounds height="55.0" width="85.0" x="349.0" y="141.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="requestApprovedDecision" id="Shape-requestApprovedDecision" isMarkerVisible="false">
-        <dc:Bounds height="32.0" width="32.0" x="257.0" y="200.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="handleRequest" id="Shape-handleRequest">
-        <dc:Bounds height="55.0" width="85.0" x="112.0" y="188.5"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="request" id="Shape-request">
-        <dc:Bounds height="32.0" width="32.0" x="20.0" y="200.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1" sourceElement="request" targetElement="handleRequest">
-        <di:waypoint x="52.0" y="216.0"/>
-        <di:waypoint x="112.0" y="216.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2" sourceElement="handleRequest" targetElement="requestApprovedDecision">
-        <di:waypoint x="197.0" y="216.0"/>
-        <di:waypoint x="257.0" y="216.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow3" id="BPMNEdge_flow3" sourceElement="requestApprovedDecision" targetElement="sendApprovalMail">
-        <di:waypoint x="289.0" y="216.0"/>
-        <di:waypoint x="349.0" y="168.5"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow4" id="BPMNEdge_flow4" sourceElement="sendApprovalMail" targetElement="theEnd1">
-        <di:waypoint x="434.0" y="168.5"/>
-        <di:waypoint x="494.0078144082805" y="168.5"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow5" id="BPMNEdge_flow5" sourceElement="requestApprovedDecision" targetElement="adjustVacationRequestTask">
-        <di:waypoint x="289.0" y="216.0"/>
-        <di:waypoint x="349.0" y="263.5"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6" sourceElement="adjustVacationRequestTask" targetElement="resendRequestDecision">
-        <di:waypoint x="434.0" y="263.5"/>
-        <di:waypoint x="494.5" y="263.5"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow7" id="BPMNEdge_flow7" sourceElement="resendRequestDecision" targetElement="handleRequest">
-        <di:waypoint x="494.5" y="263.5"/>
-        <di:waypoint x="197.0" y="216.0"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow8" id="BPMNEdge_flow8" sourceElement="resendRequestDecision" targetElement="theEnd2">
-        <di:waypoint x="525.5" y="263.5"/>
-        <di:waypoint x="586.0078144082805" y="263.5"/>
-        <bpmndi:BPMNLabel>
-          <dc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-    </bpmndi:BPMNPlane>
-  </bpmndi:BPMNDiagram>
+			<extensionElements>
+				<activiti:formProperty id="numberOfDays" name="Number of days" required="true" type="long"
+									   value="${numberOfDays}"/>
+				<activiti:formProperty datePattern="dd-MM-yyyy hh:mm" id="startDate"
+									   name="First day of holiday (dd-MM-yyy)" required="true" type="date"
+									   value="${startDate}"/>
+				<activiti:formProperty id="vacationMotivation" name="Motivation" type="string"
+									   value="${vacationMotivation}"/>
+				<activiti:formProperty id="resendRequest" name="Resend vacation request to manager?" required="true"
+									   type="enum">
+					<activiti:value id="true" name="Yes"/>
+					<activiti:value id="false" name="No"/>
+				</activiti:formProperty>
+			</extensionElements>
+		</userTask>
+		<sequenceFlow id="flow6" sourceRef="adjustVacationRequestTask" targetRef="resendRequestDecision"/>
+		<exclusiveGateway gatewayDirection="Unspecified" id="resendRequestDecision" name="Resend request?"/>
+		<sequenceFlow id="flow7" sourceRef="resendRequestDecision" targetRef="handleRequest">
+			<conditionExpression xsi:type="tFormalExpression">
+				<![CDATA[${resendRequest == 'true'}]]></conditionExpression>
+		</sequenceFlow>
+		<sequenceFlow id="flow8" sourceRef="resendRequestDecision" targetRef="theEnd2">
+			<conditionExpression xsi:type="tFormalExpression">
+				<![CDATA[${resendRequest == 'false'}]]></conditionExpression>
+		</sequenceFlow>
+		<endEvent id="theEnd2"/>
+	</process>
+	<bpmndi:BPMNDiagram
+		documentation="background=#FFFFFF;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0"
+		id="Diagram-_1" name="New Diagram">
+		<bpmndi:BPMNPlane bpmnElement="vacationRequest">
+			<bpmndi:BPMNShape bpmnElement="theEnd2" id="Shape-theEnd2">
+				<dc:Bounds height="32.0" width="32.0" x="586.0" y="247.5"/>
+				<bpmndi:BPMNLabel>
+					<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+				</bpmndi:BPMNLabel>
+			</bpmndi:BPMNShape>
+			<bpmndi:BPMNShape bpmnElement="resendRequestDecision" id="Shape-resendRequestDecision"
+							  isMarkerVisible="false">
+				<dc:Bounds height="32.0" width="32.0" x="494.0" y="247.5"/>
+				<bpmndi:BPMNLabel>
+					<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+				</bpmndi:BPMNLabel>
+			</bpmndi:BPMNShape>
+			<bpmndi:BPMNShape bpmnElement="adjustVacationRequestTask" id="Shape-adjustVacationRequestTask">
+				<dc:Bounds height="55.0" width="85.0" x="349.0" y="236.0"/>
+				<bpmndi:BPMNLabel>
+					<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
+				</bpmndi:BPMNLabel>
+			</bpmndi:BPMNShape>
+			<bpmndi:BPMNShape bpmnElement="theEnd1" id="Shape-theEnd1">
+				<dc:Bounds height="32.0" width="32.0" x="494.0" y="152.5"/>
+				<bpmndi:BPMNLabel>
+					<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+				</bpmndi:BPMNLabel>
+			</bpmndi:BPMNShape>
+			<bpmndi:BPMNShape bpmnElement="sendApprovalMail" id="Shape-sendApprovalMail">
+				<dc:Bounds height="55.0" width="85.0" x="349.0" y="141.0"/>
+				<bpmndi:BPMNLabel>
+					<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
+				</bpmndi:BPMNLabel>
+			</bpmndi:BPMNShape>
+			<bpmndi:BPMNShape bpmnElement="requestApprovedDecision" id="Shape-requestApprovedDecision"
+							  isMarkerVisible="false">
+				<dc:Bounds height="32.0" width="32.0" x="257.0" y="200.0"/>
+				<bpmndi:BPMNLabel>
+					<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+				</bpmndi:BPMNLabel>
+			</bpmndi:BPMNShape>
+			<bpmndi:BPMNShape bpmnElement="handleRequest" id="Shape-handleRequest">
+				<dc:Bounds height="55.0" width="85.0" x="112.0" y="188.5"/>
+				<bpmndi:BPMNLabel>
+					<dc:Bounds height="55.0" width="85.0" x="0.0" y="0.0"/>
+				</bpmndi:BPMNLabel>
+			</bpmndi:BPMNShape>
+			<bpmndi:BPMNShape bpmnElement="request" id="Shape-request">
+				<dc:Bounds height="32.0" width="32.0" x="20.0" y="200.0"/>
+				<bpmndi:BPMNLabel>
+					<dc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
+				</bpmndi:BPMNLabel>
+			</bpmndi:BPMNShape>
+			<bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1" sourceElement="request"
+							 targetElement="handleRequest">
+				<di:waypoint x="52.0" y="216.0"/>
+				<di:waypoint x="112.0" y="216.0"/>
+				<bpmndi:BPMNLabel>
+					<dc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
+				</bpmndi:BPMNLabel>
+			</bpmndi:BPMNEdge>
+			<bpmndi:BPMNEdge bpmnElement="flow2" id="BPMNEdge_flow2" sourceElement="handleRequest"
+							 targetElement="requestApprovedDecision">
+				<di:waypoint x="197.0" y="216.0"/>
+				<di:waypoint x="257.0" y="216.0"/>
+				<bpmndi:BPMNLabel>
+					<dc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
+				</bpmndi:BPMNLabel>
+			</bpmndi:BPMNEdge>
+			<bpmndi:BPMNEdge bpmnElement="flow3" id="BPMNEdge_flow3" sourceElement="requestApprovedDecision"
+							 targetElement="sendApprovalMail">
+				<di:waypoint x="289.0" y="216.0"/>
+				<di:waypoint x="349.0" y="168.5"/>
+				<bpmndi:BPMNLabel>
+					<dc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
+				</bpmndi:BPMNLabel>
+			</bpmndi:BPMNEdge>
+			<bpmndi:BPMNEdge bpmnElement="flow4" id="BPMNEdge_flow4" sourceElement="sendApprovalMail"
+							 targetElement="theEnd1">
+				<di:waypoint x="434.0" y="168.5"/>
+				<di:waypoint x="494.0078144082805" y="168.5"/>
+				<bpmndi:BPMNLabel>
+					<dc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
+				</bpmndi:BPMNLabel>
+			</bpmndi:BPMNEdge>
+			<bpmndi:BPMNEdge bpmnElement="flow5" id="BPMNEdge_flow5" sourceElement="requestApprovedDecision"
+							 targetElement="adjustVacationRequestTask">
+				<di:waypoint x="289.0" y="216.0"/>
+				<di:waypoint x="349.0" y="263.5"/>
+				<bpmndi:BPMNLabel>
+					<dc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
+				</bpmndi:BPMNLabel>
+			</bpmndi:BPMNEdge>
+			<bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6" sourceElement="adjustVacationRequestTask"
+							 targetElement="resendRequestDecision">
+				<di:waypoint x="434.0" y="263.5"/>
+				<di:waypoint x="494.5" y="263.5"/>
+				<bpmndi:BPMNLabel>
+					<dc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
+				</bpmndi:BPMNLabel>
+			</bpmndi:BPMNEdge>
+			<bpmndi:BPMNEdge bpmnElement="flow7" id="BPMNEdge_flow7" sourceElement="resendRequestDecision"
+							 targetElement="handleRequest">
+				<di:waypoint x="494.5" y="263.5"/>
+				<di:waypoint x="197.0" y="216.0"/>
+				<bpmndi:BPMNLabel>
+					<dc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
+				</bpmndi:BPMNLabel>
+			</bpmndi:BPMNEdge>
+			<bpmndi:BPMNEdge bpmnElement="flow8" id="BPMNEdge_flow8" sourceElement="resendRequestDecision"
+							 targetElement="theEnd2">
+				<di:waypoint x="525.5" y="263.5"/>
+				<di:waypoint x="586.0078144082805" y="263.5"/>
+				<bpmndi:BPMNLabel>
+					<dc:Bounds height="-1.0" width="-1.0" x="-1.0" y="-1.0"/>
+				</bpmndi:BPMNLabel>
+			</bpmndi:BPMNEdge>
+		</bpmndi:BPMNPlane>
+	</bpmndi:BPMNDiagram>
 </definitions>
diff --git a/len-activiti/src/main/resources/ftl/act/activiti/shinePics.html b/len-activiti/src/main/resources/ftl/act/activiti/shinePics.html
index e198750..8c92894 100644
--- a/len-activiti/src/main/resources/ftl/act/activiti/shinePics.html
+++ b/len-activiti/src/main/resources/ftl/act/activiti/shinePics.html
@@ -1,116 +1,118 @@
 <html>
 
 <head>
-    <meta charset="UTF-8">
-    <title>流程图</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-          content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi"/>
-    <link rel="stylesheet" href="/plugin/layui/css/layui.css">
-    <link rel="stylesheet" href="/plugin/ztree/css/metroStyle/metroStyle.css">
-    <script type="text/javascript" src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
-    <script type="text/javascript" src="/plugin/layui/layui.all.js" charset="utf-8"></script>
-    <script type="text/javascript" src="/plugin/tools/tool.js" charset="utf-8"></script>
+	<meta charset="UTF-8">
+	<title>流程图</title>
+	<meta content="webkit" name="renderer">
+	<meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+	<meta content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi"
+		  name="viewport"/>
+	<link href="/plugin/layui/css/layui.css" rel="stylesheet">
+	<link href="/plugin/ztree/css/metroStyle/metroStyle.css" rel="stylesheet">
+	<script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js" type="text/javascript"></script>
+	<script charset="utf-8" src="/plugin/layui/layui.all.js" type="text/javascript"></script>
+	<script charset="utf-8" src="/plugin/tools/tool.js" type="text/javascript"></script>
 </head>
 <style>
-    .tab-2{margin-left: 40%}
+	.tab-2 {
+		margin-left: 40%
+	}
 </style>
 <body>
 <div class="x-body">
-    <div class="layui-tab">
-        <ul class="layui-tab-title">
-            <li class="layui-this">流程图</li>
-            <li>流程审批</li>
-        </ul>
-        <div class="layui-tab-content">
-            <div class="layui-tab-item layui-show">
-                    <div id="image" style="width:100%;height:100%;overflow: auto;">
-                        <div class="layui-form-item">
-                            <image id="showImages1" style="display: none;"></image>
-                            <image id="showImages2"></image>
-                        </div>
-            </div>
-        </div>
-            <div class="layui-tab-item tab-2">
-                <ul class="layui-timeline">
+	<div class="layui-tab">
+		<ul class="layui-tab-title">
+			<li class="layui-this">流程图</li>
+			<li>流程审批</li>
+		</ul>
+		<div class="layui-tab-content">
+			<div class="layui-tab-item layui-show">
+				<div id="image" style="width:100%;height:100%;overflow: auto;">
+					<div class="layui-form-item">
+						<image id="showImages1" style="display: none;"></image>
+						<image id="showImages2"></image>
+					</div>
+				</div>
+			</div>
+			<div class="layui-tab-item tab-2">
+				<ul class="layui-timeline">
 
-                </ul>
-            </div>
-    </div>
+				</ul>
+			</div>
+		</div>
 
-</div>
-<script>
-    var countNum = 0;
-    layui.use(['form', 'layer','element'], function () {
-        $ = layui.jquery;
-        layer.load(1);
-        $.getJSON('${re.contextPath}/act/getShineProcImage?processInstanceId=${processInstanceId}', function (json) {
-            let result = json.images;
-            let task=json.taskSqu;
-            if(typeof task!=='undefined'){
-                showTask(task);
-            }
-            let imgObj1 = document.getElementById("showImages1")
-            imgObj1.src = "data:image/png;base64," + result[0];
-            let imgObj2 = document.getElementById("showImages2")
-            imgObj2.src = "data:image/png;base64," + result[1];
-            window.setInterval(function () {
-                if (countNum === 0) {
-                    $("#showImages1").show();
-                    $("#showImages2").hide();
-                } else {
-                    $("#showImages1").hide();
-                    $("#showImages2").show();
-                }
-                countNum++;
-                if (countNum === 2) {
-                    countNum = 0;
-                }
-            }, 1000);
-            layer.closeAll('loading');
-        });
+	</div>
+	<script>
+		var countNum = 0;
+		layui.use(['form', 'layer', 'element'], function () {
+			$ = layui.jquery;
+			layer.load(1);
+			$.getJSON('${re.contextPath}/act/getShineProcImage?processInstanceId=${processInstanceId}', function (json) {
+				let result = json.images;
+				let task = json.taskSqu;
+				if (typeof task !== 'undefined') {
+					showTask(task);
+				}
+				let imgObj1 = document.getElementById("showImages1")
+				imgObj1.src = "data:image/png;base64," + result[0];
+				let imgObj2 = document.getElementById("showImages2")
+				imgObj2.src = "data:image/png;base64," + result[1];
+				window.setInterval(function () {
+					if (countNum === 0) {
+						$("#showImages1").show();
+						$("#showImages2").hide();
+					} else {
+						$("#showImages1").hide();
+						$("#showImages2").show();
+					}
+					countNum++;
+					if (countNum === 2) {
+						countNum = 0;
+					}
+				}, 1000);
+				layer.closeAll('loading');
+			});
 
-    });
+		});
 
-    function showTask(task){
-        let msg=``;
-        for(let i=0;i<task.length;i++){
-            let t=task[i];
-            msg+= `<li class="layui-timeline-item">
+		function showTask(task) {
+			let msg = ``;
+			for (let i = 0; i < task.length; i++) {
+				let t = task[i];
+				msg += `<li class="layui-timeline-item">
                         <i class="layui-icon layui-timeline-axis">&#xe63f;</i>
                         <br/>
                         <i class="layui-icon layui-timeline-axis">&#xe61a;</i>
                         <div class="layui-timeline-content layui-text">
                             <h3 class="layui-timeline-title">`;
-            msg+=t.taskName;
-            msg+=`</h3>
+				msg += t.taskName;
+				msg += `</h3>
                             <p>
                                 <br>审批人：`;
-            if(t.userName!==null){
-                msg+=t.userName;
-            }
-            msg+=`<br>审批组：`;
-            if(t.groupNames){
-                t.groupNames.forEach(function(v,index){
-                    msg+=v;
-                    msg+=(index===t.groupNames.length-1?'':'/');
-                });
-            }
-            msg+=`
+				if (t.userName !== null) {
+					msg += t.userName;
+				}
+				msg += `<br>审批组：`;
+				if (t.groupNames) {
+					t.groupNames.forEach(function (v, index) {
+						msg += v;
+						msg += (index === t.groupNames.length - 1 ? '' : '/');
+					});
+				}
+				msg += `
                                 <br>审批时间：`;
-            if(t.time!==null) {
-                msg += t.time;
-            }
-            msg+=`
+				if (t.time !== null) {
+					msg += t.time;
+				}
+				msg += `
                             </p>
                         </div>
                     </li>`
-        }
-        let line=document.getElementsByClassName('layui-timeline')[0];
-        line.innerHTML=msg;
-    }
-</script>
+			}
+			let line = document.getElementsByClassName('layui-timeline')[0];
+			line.innerHTML = msg;
+		}
+	</script>
 </body>
 
 
diff --git a/len-activiti/src/main/resources/ftl/act/deploy/act-node.ftl b/len-activiti/src/main/resources/ftl/act/deploy/act-node.ftl
index 1290523..2d90c5c 100644
--- a/len-activiti/src/main/resources/ftl/act/deploy/act-node.ftl
+++ b/len-activiti/src/main/resources/ftl/act/deploy/act-node.ftl
@@ -2,108 +2,112 @@
 <html>
 
 <head>
-  <meta charset="UTF-8">
-  <title>流程节点分配</title>
-  <meta name="renderer" content="webkit">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport" content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi" />
-  <link rel="stylesheet" href="${re.contextPath}/plugin/layui/css/layui.css">
-  <link rel="stylesheet" href="${re.contextPath}/plugin/ztree/css/metroStyle/metroStyle.css">
-    <script type="text/javascript" src="${re.contextPath}/plugin/jquery/jquery-3.2.1.min.js"></script>
-  <script type="text/javascript" src="${re.contextPath}/plugin/layui/layui.all.js" charset="utf-8"></script>
-  <script type="text/javascript" src="${re.contextPath}/plugin/tools/tool.js" charset="utf-8"></script>
+	<meta charset="UTF-8">
+	<title>流程节点分配</title>
+	<meta name="renderer" content="webkit">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<meta name="viewport"
+		  content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi"/>
+	<link rel="stylesheet" href="${re.contextPath}/plugin/layui/css/layui.css">
+	<link rel="stylesheet" href="${re.contextPath}/plugin/ztree/css/metroStyle/metroStyle.css">
+	<script type="text/javascript" src="${re.contextPath}/plugin/jquery/jquery-3.2.1.min.js"></script>
+	<script type="text/javascript" src="${re.contextPath}/plugin/layui/layui.all.js" charset="utf-8"></script>
+	<script type="text/javascript" src="${re.contextPath}/plugin/tools/tool.js" charset="utf-8"></script>
 </head>
 
 <body>
 <div class="x-body">
-  <form class="layui-form layui-form-pane" style="margin-left: 20px;">
-    <div style="width:100%;height:400px;overflow: auto;">
-      <div class="layui-tab">
-        <ul class="layui-tab-title">
-        <#list actList as act>
-            <li <#if act_index==0>class="layui-this"</#if>><i class="layui-icon">&#xe715;</i>${act.name}</li>
-        </#list>
-        </ul>
-        <div class="layui-tab-content">
-          <#list actList as act>
-            <div class="layui-tab-item <#if act_index==0>layui-show</#if>">
-             <div style="display: none" name="id">${act.id}</div>
-              <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                <legend style="font-size:16px;">分配角色</legend>
-              </fieldset>
-                <div class="layui-form-item">
-                  <div class="layui-input-block" style="margin-left: 0px;">
-                    <#list act.boxJson as json>
-                      <input type="checkbox" name="${act_index}_${json_index}_role_${act.id}_${act.name}"
-                             title="${json.name}" lay-filter="check" value="${json.id}" <#if json.check?string=='true'>checked</#if>>
+	<form class="layui-form layui-form-pane" style="margin-left: 20px;">
+		<div style="width:100%;height:400px;overflow: auto;">
+			<div class="layui-tab">
+				<ul class="layui-tab-title">
+                    <#list actList as act>
+						<li <#if act_index==0>class="layui-this"</#if>><i class="layui-icon">&#xe715;</i>${act.name}
+						</li>
                     </#list>
-                  </div>
-                </div>
-              <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                <legend style="font-size:16px;">分配成员</legend>
-              </fieldset>
-              <div class="layui-form-item">
-                开发中..ing
-              </div>
-            </div>
-          </#list>
-        </div>
-      </div>
-  <div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
+				</ul>
+				<div class="layui-tab-content">
+                    <#list actList as act>
+						<div class="layui-tab-item <#if act_index==0>layui-show</#if>">
+							<div style="display: none" name="id">${act.id}</div>
+							<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+								<legend style="font-size:16px;">分配角色</legend>
+							</fieldset>
+							<div class="layui-form-item">
+								<div class="layui-input-block" style="margin-left: 0px;">
+                                    <#list act.boxJson as json>
+										<input type="checkbox"
+											   name="${act_index}_${json_index}_role_${act.id}_${act.name}"
+											   title="${json.name}" lay-filter="check" value="${json.id}"
+                                               <#if json.check?string=='true'>checked</#if>>
+                                    </#list>
+								</div>
+							</div>
+							<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+								<legend style="font-size:16px;">分配成员</legend>
+							</fieldset>
+							<div class="layui-form-item">
+								开发中..ing
+							</div>
+						</div>
+                    </#list>
+				</div>
+			</div>
+			<div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
   position: fixed;bottom: 1px;margin-left:-20px;">
-    <div class="layui-form-item" style=" float: right;margin-right: 30px;margin-top: 8px">
-      <button  class="layui-btn layui-btn-normal" lay-filter="add" lay-submit>
-        确定
-      </button>
-      <button  class="layui-btn layui-btn-primary"   data-type="close">
-        取消
-      </button>
-    </div>
-  </div>
-    </div>
-  </form>
+				<div class="layui-form-item" style=" float: right;margin-right: 30px;margin-top: 8px">
+					<button class="layui-btn layui-btn-normal" lay-filter="add" lay-submit>
+						确定
+					</button>
+					<button class="layui-btn layui-btn-primary" data-type="close">
+						取消
+					</button>
+				</div>
+			</div>
+		</div>
+	</form>
 </div>
 <script>
-  layui.use(['form','layer'], function(){
-    $ = layui.jquery;
-    var form = layui.form
-        ,layer = layui.layer;
-    var $ = layui.$, active = {
-      close: function () {
-        var index = parent.layer.getFrameIndex(window.name);
-        parent.layer.close(index);
-      }
-    };
-    $('.layui-form-item .layui-btn').on('click', function () {
-      var type = $(this).data('type');
-      active[type] ? active[type].call(this) : '';
-    });
-    //监听提交
-    form.on('submit(add)', function(data){
-      $.ajax({
-        url:'updateNode',
-        type:'post',
-        data:data.field,
-        success:function(d){
-            var index = parent.layer.getFrameIndex(window.name);
-            if(d.flag){
-              parent.layer.close(index);
-              window.parent.layui.table.reload('actList');
-              window.top.layer.msg(d.msg,{icon:6,offset: 'rb',area:['120px','80px'],anim:2});
-            }else{
-              layer.msg(d.msg,{icon:5});
-            }
-        },error:function(){
-          layer.alert("请求失败", {icon: 6},function () {
-            var index = parent.layer.getFrameIndex(window.name);
-            parent.layer.close(index);
-          });
-        }
-      });
-      return false;
-    });
-    form.render();
-  });
+	layui.use(['form', 'layer'], function () {
+		$ = layui.jquery;
+		var form = layui.form
+			, layer = layui.layer;
+		var $ = layui.$, active = {
+			close: function () {
+				var index = parent.layer.getFrameIndex(window.name);
+				parent.layer.close(index);
+			}
+		};
+		$('.layui-form-item .layui-btn').on('click', function () {
+			var type = $(this).data('type');
+			active[type] ? active[type].call(this) : '';
+		});
+		//监听提交
+		form.on('submit(add)', function (data) {
+			$.ajax({
+				url: 'updateNode',
+				type: 'post',
+				data: data.field,
+				success: function (d) {
+					var index = parent.layer.getFrameIndex(window.name);
+					if (d.flag) {
+						parent.layer.close(index);
+						window.parent.layui.table.reload('actList');
+						window.top.layer.msg(d.msg, {icon: 6, offset: 'rb', area: ['120px', '80px'], anim: 2});
+					} else {
+						layer.msg(d.msg, {icon: 5});
+					}
+				}, error: function () {
+					layer.alert("请求失败", {icon: 6}, function () {
+						var index = parent.layer.getFrameIndex(window.name);
+						parent.layer.close(index);
+					});
+				}
+			});
+			return false;
+		});
+		form.render();
+	});
 </script>
 </body>
 
diff --git a/len-activiti/src/main/resources/ftl/act/leave/add-leave.ftl b/len-activiti/src/main/resources/ftl/act/leave/add-leave.ftl
index 91c6a8f..dff2942 100644
--- a/len-activiti/src/main/resources/ftl/act/leave/add-leave.ftl
+++ b/len-activiti/src/main/resources/ftl/act/leave/add-leave.ftl
@@ -1,147 +1,146 @@
-
 <!DOCTYPE html>
 <html>
 
 <head>
-    <meta charset="UTF-8">
-    <title>新建请假</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-          content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi"/>
-    <link rel="stylesheet" href="${re.contextPath}/plugin/layui/css/layui.css">
-    <link rel="stylesheet" href="${re.contextPath}/plugin/ztree/css/metroStyle/metroStyle.css">
-    <script type="text/javascript" src="${re.contextPath}/plugin/jquery/jquery-3.2.1.min.js"></script>
-    <script type="text/javascript" src="${re.contextPath}/plugin/layui/layui.all.js" charset="utf-8"></script>
-    <script type="text/javascript" src="${re.contextPath}/plugin/tools/tool.js" charset="utf-8"></script>
+	<meta charset="UTF-8">
+	<title>新建请假</title>
+	<meta name="renderer" content="webkit">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<meta name="viewport"
+		  content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi"/>
+	<link rel="stylesheet" href="${re.contextPath}/plugin/layui/css/layui.css">
+	<link rel="stylesheet" href="${re.contextPath}/plugin/ztree/css/metroStyle/metroStyle.css">
+	<script type="text/javascript" src="${re.contextPath}/plugin/jquery/jquery-3.2.1.min.js"></script>
+	<script type="text/javascript" src="${re.contextPath}/plugin/layui/layui.all.js" charset="utf-8"></script>
+	<script type="text/javascript" src="${re.contextPath}/plugin/tools/tool.js" charset="utf-8"></script>
 </head>
 
 <body>
 <div class="x-body">
-    <form class="layui-form layui-form-pane" style="margin-left: 20px;">
-        <div style="width:100%;height:400px;overflow: auto;">
-            <div class="layui-form-item">
-                <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                    <legend style="font-size:16px;">请假信息</legend>
-                </fieldset>
-            </div>
-            <div class="layui-form-item">
-                <label for="beginTime" class="layui-form-label">
-                    <span class="x-red">*</span>开始时间
-                </label>
-                <div class="layui-input-inline">
-                    <input type="text" id="beginTime" name="beginTime" lay-verify="beginTime" placeholder="yyyy-MM-dd"
-                           autocomplete="off" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label for="endTime" class="layui-form-label">
-                        <span class="x-red">*</span>结束时间
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="endTime" name="endTime" lay-verify="endTime" placeholder="yyyy-MM-dd"
-                               autocomplete="off" class="layui-input">
-                    </div>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                    <legend style="font-size:16px;">原因</legend>
-                </fieldset>
-            </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label for="reason" class="layui-form-label">
-                        <span class="x-red">*</span>请假原因
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="reason" style="width: 300px;" name="reason" lay-verify="reason"
-                               autocomplete="off" class="layui-input">
-                    </div>
-                </div>
-            </div>
-            <div style="height: 60px"></div>
-        </div>
-        <div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
+	<form class="layui-form layui-form-pane" style="margin-left: 20px;">
+		<div style="width:100%;height:400px;overflow: auto;">
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">请假信息</legend>
+				</fieldset>
+			</div>
+			<div class="layui-form-item">
+				<label for="beginTime" class="layui-form-label">
+					<span class="x-red">*</span>开始时间
+				</label>
+				<div class="layui-input-inline">
+					<input type="text" id="beginTime" name="beginTime" lay-verify="beginTime" placeholder="yyyy-MM-dd"
+						   autocomplete="off" class="layui-input">
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label for="endTime" class="layui-form-label">
+						<span class="x-red">*</span>结束时间
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" id="endTime" name="endTime" lay-verify="endTime" placeholder="yyyy-MM-dd"
+							   autocomplete="off" class="layui-input">
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">原因</legend>
+				</fieldset>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label for="reason" class="layui-form-label">
+						<span class="x-red">*</span>请假原因
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" id="reason" style="width: 300px;" name="reason" lay-verify="reason"
+							   autocomplete="off" class="layui-input">
+					</div>
+				</div>
+			</div>
+			<div style="height: 60px"></div>
+		</div>
+		<div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
   position: fixed;bottom: 1px;margin-left:-20px;">
-            <div class="layui-form-item" style=" float: right;margin-right: 30px;margin-top: 8px">
+			<div class="layui-form-item" style=" float: right;margin-right: 30px;margin-top: 8px">
 
-                <button class="layui-btn layui-btn-normal" lay-filter="add" lay-submit>
-                    申请
-                </button>
-                <button class="layui-btn layui-btn-primary" data-type="close">
-                    取消
-                </button>
-            </div>
-        </div>
-    </form>
+				<button class="layui-btn layui-btn-normal" lay-filter="add" lay-submit>
+					申请
+				</button>
+				<button class="layui-btn layui-btn-primary" data-type="close">
+					取消
+				</button>
+			</div>
+		</div>
+	</form>
 </div>
 <script>
-    layui.use(['form', 'layer'], function () {
-        $ = layui.jquery;
-        var form = layui.form
-                , laydate = layui.laydate;
-        var d = new Date();
-        var day = d.getFullYear() + "-" + (parseInt(d.getMonth()) + 1) + '-' + d.getDate();
-        console.log(day);
-        var $ = layui.$, active = {
-            close: function () {
-                var index = parent.layer.getFrameIndex(window.name);
-                parent.layer.close(index);
-            }
-        }
-        $('.layui-form-item .layui-btn').on('click', function () {
-            var type = $(this).data('type');
-            active[type] ? active[type].call(this) : '';
-        });
-        var a = laydate.render({
-            elem: '#beginTime',
-            min: day,
-            done: function (value, date, endDate) {
-                b.config.min = {
-                    year: date.year,
-                    month: date.month - 1,
-                    date: date.date,
-                    hours: date.hours,
-                    minutes: date.minutes,
-                    seconds: date.seconds
-                }
-            }
-        });
-        var b = laydate.render({
-            elem: '#endTime',
-            min: '2018-01-20'
-        });
+	layui.use(['form', 'layer'], function () {
+		$ = layui.jquery;
+		var form = layui.form
+			, laydate = layui.laydate;
+		var d = new Date();
+		var day = d.getFullYear() + "-" + (parseInt(d.getMonth()) + 1) + '-' + d.getDate();
+		console.log(day);
+		var $ = layui.$, active = {
+			close: function () {
+				var index = parent.layer.getFrameIndex(window.name);
+				parent.layer.close(index);
+			}
+		}
+		$('.layui-form-item .layui-btn').on('click', function () {
+			var type = $(this).data('type');
+			active[type] ? active[type].call(this) : '';
+		});
+		var a = laydate.render({
+			elem: '#beginTime',
+			min: day,
+			done: function (value, date, endDate) {
+				b.config.min = {
+					year: date.year,
+					month: date.month - 1,
+					date: date.date,
+					hours: date.hours,
+					minutes: date.minutes,
+					seconds: date.seconds
+				}
+			}
+		});
+		var b = laydate.render({
+			elem: '#endTime',
+			min: '2018-01-20'
+		});
 
-        //自定义验证规则
-        form.verify({
-            beginTime: function (value) {
-                if (value.trim() == "") {
-                    return "开始时间不能为空";
-                }
-            },
-            endTime: function (value) {
-                if (value.trim() == "") {
-                    return "结束时间不能为空";
-                }
-            },
-            reason: function (value) {
-                if (value.trim() == "") {
-                    return "请填写请假原因";
-                }
-            }
-        });
-        form.on('submit(close)', function (data) {
-            var index = parent.layer.getFrameIndex(window.name);
-            parent.layer.close(index);
-        })
-        //监听提交
-        form.on('submit(add)', function (data) {
-            Len.layerAjax('addLeave', data.field, 'leaveList');
-            return false;
-        });
-    });
+		//自定义验证规则
+		form.verify({
+			beginTime: function (value) {
+				if (value.trim() == "") {
+					return "开始时间不能为空";
+				}
+			},
+			endTime: function (value) {
+				if (value.trim() == "") {
+					return "结束时间不能为空";
+				}
+			},
+			reason: function (value) {
+				if (value.trim() == "") {
+					return "请填写请假原因";
+				}
+			}
+		});
+		form.on('submit(close)', function (data) {
+			var index = parent.layer.getFrameIndex(window.name);
+			parent.layer.close(index);
+		})
+		//监听提交
+		form.on('submit(add)', function (data) {
+			Len.layerAjax('addLeave', data.field, 'leaveList');
+			return false;
+		});
+	});
 </script>
 </body>
 
diff --git a/len-activiti/src/main/resources/ftl/act/leave/leaveDetail.ftl b/len-activiti/src/main/resources/ftl/act/leave/leaveDetail.ftl
index 7cf8523..24542fb 100644
--- a/len-activiti/src/main/resources/ftl/act/leave/leaveDetail.ftl
+++ b/len-activiti/src/main/resources/ftl/act/leave/leaveDetail.ftl
@@ -1,107 +1,107 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta charset="UTF-8">
-  <title>请假审批详情</title>
-  <meta name="renderer" content="webkit">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport"
-        content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi"/>
-  <link rel="stylesheet" href="${re.contextPath}/plugin/layui/css/layui.css">
-    <script type="text/javascript" src="${re.contextPath}/plugin/jquery/jquery-3.2.1.min.js"></script>
-  <script type="text/javascript" src="${re.contextPath}/plugin/layui/layui.all.js"
-          charset="utf-8"></script>
-  <script type="text/javascript" src="${re.contextPath}/plugin/tools/tool.js" charset="utf-8"></script>
-  <style>
-    .layui-input {
-      height: 30px;
-      width: 120px;
-    }
+	<meta charset="UTF-8">
+	<title>请假审批详情</title>
+	<meta name="renderer" content="webkit">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<meta name="viewport"
+		  content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi"/>
+	<link rel="stylesheet" href="${re.contextPath}/plugin/layui/css/layui.css">
+	<script type="text/javascript" src="${re.contextPath}/plugin/jquery/jquery-3.2.1.min.js"></script>
+	<script type="text/javascript" src="${re.contextPath}/plugin/layui/layui.all.js"
+			charset="utf-8"></script>
+	<script type="text/javascript" src="${re.contextPath}/plugin/tools/tool.js" charset="utf-8"></script>
+	<style>
+		.layui-input {
+			height: 30px;
+			width: 120px;
+		}
 
-    .x-nav {
-      padding: 0 20px;
-      position: relative;
-      z-index: 99;
-      border-bottom: 1px solid #e5e5e5;
-      height: 32px;
-      overflow: hidden;
-    }
-  </style>
+		.x-nav {
+			padding: 0 20px;
+			position: relative;
+			z-index: 99;
+			border-bottom: 1px solid #e5e5e5;
+			height: 32px;
+			overflow: hidden;
+		}
+	</style>
 </head>
 
 <body>
 
 <table id="leaveDetail" class="layui-hide" lay-filter="leave"></table>
 <script type="text/html" id="flag">
-  {{# if(d.flag){ }}
-  <span class="layui-badge layui-bg-green">通过</span>
+	{{# if(d.flag){ }}
+	<span class="layui-badge layui-bg-green">通过</span>
 
-  {{# }else{ }}
-  <span class="layui-badge">未通过</span>
-  {{#  } }}
+	{{# }else{ }}
+	<span class="layui-badge">未通过</span>
+	{{#  } }}
 </script>
 <script>
-  layui.laytpl.toDateString = function(d, format){
-    var date = new Date(d || new Date())
-        ,ymd = [
-      this.digit(date.getFullYear(), 4)
-      ,this.digit(date.getMonth() + 1)
-      ,this.digit(date.getDate())
-    ]
-        ,hms = [
-      this.digit(date.getHours())
-      ,this.digit(date.getMinutes())
-      ,this.digit(date.getSeconds())
-    ];
+	layui.laytpl.toDateString = function (d, format) {
+		var date = new Date(d || new Date())
+			, ymd = [
+			this.digit(date.getFullYear(), 4)
+			, this.digit(date.getMonth() + 1)
+			, this.digit(date.getDate())
+		]
+			, hms = [
+			this.digit(date.getHours())
+			, this.digit(date.getMinutes())
+			, this.digit(date.getSeconds())
+		];
 
-    format = format || 'yyyy-MM-dd HH:mm:ss';
+		format = format || 'yyyy-MM-dd HH:mm:ss';
 
-    return format.replace(/yyyy/g, ymd[0])
-    .replace(/MM/g, ymd[1])
-    .replace(/dd/g, ymd[2])
-    .replace(/HH/g, hms[0])
-    .replace(/mm/g, hms[1])
-    .replace(/ss/g, hms[2]);
-  };
+		return format.replace(/yyyy/g, ymd[0])
+			.replace(/MM/g, ymd[1])
+			.replace(/dd/g, ymd[2])
+			.replace(/HH/g, hms[0])
+			.replace(/mm/g, hms[1])
+			.replace(/ss/g, hms[2]);
+	};
 
-  //数字前置补零
-  layui.laytpl.digit = function(num, length, end){
-    var str = '';
-    num = String(num);
-    length = length || 2;
-    for(var i = num.length; i < length; i++){
-      str += '0';
-    }
-    return num < Math.pow(10, length) ? str + (num|0) : num;
-  };
+	//数字前置补零
+	layui.laytpl.digit = function (num, length, end) {
+		var str = '';
+		num = String(num);
+		length = length || 2;
+		for (var i = num.length; i < length; i++) {
+			str += '0';
+		}
+		return num < Math.pow(10, length) ? str + (num | 0) : num;
+	};
 
-  layui.use('table', function () {
-    var table = layui.table;
-    //方法级渲染
-    var arr=[];
-    if(${leaveDetail}){
-      arr=${leaveDetail};
-    }
-    table.render({
-      id: 'leaveDetail',
-      elem: '#leaveDetail'
-      , data:arr
-      , cols: [[
-        {field: 'taskId', title: '任务编码', width: '20%'}
-        ,{field: 'opName', title: '审批人', width: '20%'}
-        , {field: 'opinion', title: '审批信息', width: '30%'}
-        , {
-          field: 'createTime',
-          title: '审批时间',
-          width: '20%',
-          templet: '<div>{{ layui.laytpl.toDateString(d.beginTime,"yyyy-MM-dd") }}</div>'
-        }
-        , {field: 'flag', title: '是否通过', width: '10%',templet:'#flag'}
-      ]]
-      , page: false
-      , height: 'full-160'
-    });
-  });
+	layui.use('table', function () {
+		var table = layui.table;
+		//方法级渲染
+		var arr = [];
+		if (${leaveDetail}) {
+			arr = ${leaveDetail};
+		}
+		table.render({
+			id: 'leaveDetail',
+			elem: '#leaveDetail'
+			, data: arr
+			, cols: [[
+				{field: 'taskId', title: '任务编码', width: '20%'}
+				, {field: 'opName', title: '审批人', width: '20%'}
+				, {field: 'opinion', title: '审批信息', width: '30%'}
+				, {
+					field: 'createTime',
+					title: '审批时间',
+					width: '20%',
+					templet: '<div>{{ layui.laytpl.toDateString(d.beginTime,"yyyy-MM-dd") }}</div>'
+				}
+				, {field: 'flag', title: '是否通过', width: '10%', templet: '#flag'}
+			]]
+			, page: false
+			, height: 'full-160'
+		});
+	});
 </script>
 </body>
 
diff --git a/len-activiti/src/main/resources/ftl/act/leave/leaveList.ftl b/len-activiti/src/main/resources/ftl/act/leave/leaveList.ftl
index f0fcffe..c936c27 100644
--- a/len-activiti/src/main/resources/ftl/act/leave/leaveList.ftl
+++ b/len-activiti/src/main/resources/ftl/act/leave/leaveList.ftl
@@ -6,13 +6,13 @@
 
 <#--按钮-->
 <div class="layui-col-md12 len-button">
-    <div class="layui-btn-group">
+	<div class="layui-btn-group">
         <#include "/system/base/searth.ftl">
 
-        <button class="layui-btn layui-btn-normal layui-btn-sm" data-type="createLeave">
-            <i class="layui-icon">&#xe640;</i>新建请假
-        </button>
-    </div>
+		<button class="layui-btn layui-btn-normal layui-btn-sm" data-type="createLeave">
+			<i class="layui-icon">&#xe640;</i>新建请假
+		</button>
+	</div>
 </div>
 
 <#--表格-->
@@ -21,172 +21,171 @@
 
 <#--表格toolbar-->
 <script type="text/html" id="toolBar">
-    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="getProcImage">
-        <i class="layui-icon">&#xe640;</i>查看流程图</a>
-    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="leaveDetail">
-        <i class="layui-icon">&#xe640;</i>查看详情</a>
+	<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="getProcImage">
+		<i class="layui-icon">&#xe640;</i>查看流程图</a>
+	<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="leaveDetail">
+		<i class="layui-icon">&#xe640;</i>查看详情</a>
 </script>
 
 
-
 <script type="text/html" id="status">
-    {{#if(typeof(d.taskName)!='undefined'){}}
-    <div>${d.taskName}</div>
-    {{# }else{}}
-    结束
-    {{# }}}
+	{{#if(typeof(d.taskName)!='undefined'){}}
+	<div>${d.taskName}</div>
+	{{# }else{}}
+	结束
+	{{# }}}
 </script>
 
 
 <script src="${re.contextPath}/plugin/activiti.js"></script>
 <script>
-    layui.laytpl.toDateString = function (d, format) {
-        var date = new Date(d || new Date())
-            , ymd = [
-            this.digit(date.getFullYear(), 4)
-            , this.digit(date.getMonth() + 1)
-            , this.digit(date.getDate())
-        ]
-            , hms = [
-            this.digit(date.getHours())
-            , this.digit(date.getMinutes())
-            , this.digit(date.getSeconds())
-        ];
-
-        format = format || 'yyyy-MM-dd HH:mm:ss';
-
-        return format.replace(/yyyy/g, ymd[0])
-            .replace(/MM/g, ymd[1])
-            .replace(/dd/g, ymd[2])
-            .replace(/HH/g, hms[0])
-            .replace(/mm/g, hms[1])
-            .replace(/ss/g, hms[2]);
-    };
-
-    //数字前置补零
-    layui.laytpl.digit = function (num, length, end) {
-        var str = '';
-        num = String(num);
-        length = length || 2;
-        for (var i = num.length; i < length; i++) {
-            str += '0';
-        }
-        return num < Math.pow(10, length) ? str + (num | 0) : num;
-    };
-
-    document.onkeydown = function (e) { // 回车提交表单
-        var theEvent = window.event || e;
-        var code = theEvent.keyCode || theEvent.which;
-        if (code == 13) {
-            $(".select .select-on").click();
-        }
-    }
-
-    layui.use('table', function () {
-       var table = layui.table;
-        //方法级渲染
-        table.render({
-            id: 'leaveList',
-            elem: '#leaveList'
-            , url: 'leave/showLeaveList'
-            , parseData: function (res) {
-                return {
-                    "code": res.code,
-                    "msg": res.msg,
-                    "count": res.count,
-                    "data": res.data
-                };
-            }
-            , cols: [[
-                {checkbox: true, fixed: true, width: '5%'}
-                , {field: 'userName', title: '申请人', width: '10%', sort: true}
-                , {
-                    field: 'beginTime',
-                    title: '开始时间',
-                    width: '10%',
-                    sort: true,
-                    templet: '<div>{{ layui.laytpl.toDateString(d.beginTime,"yyyy-MM-dd") }}</div>'
-                }
-                , {
-                    field: 'endTime',
-                    title: '结束时间',
-                    width: '10%',
-                    sort: true,
-                    templet: '<div>{{ layui.laytpl.toDateString(d.endTime,"yyyy-MM-dd") }}</div>'
-                }
-                , {field: 'taskName', title: '状态', width: '10%', templet: '#status'}
-                , {field: 'reason', title: '原因', width: '10%', sort: true}
-                , {field: 'days', title: '天数', width: '10%', sort: true}
-                , {field: 'processInstanceId', title: '流程定义id', width: '10%', sort: true}
-                , {field: 'text', title: '操作', width: '20%', toolbar: '#toolBar'}
-
-            ]]
-            , page: true
-            , height: 'full-100'
-        });
-
-        var $ = layui.$, active = {
-            select: function () {
-                var beginTime = $('#beginTime').val();
-                var endTime = $('#endTime').val();
-                table.reload('leaveList', {
-                    where: {
-                        beginTime: beginTime,
-                        endTime: endTime
-                    }
-                });
-            }
-            , createLeave: function () {
-                add("申请请假", '/leave/addLeave', 700, 450);
-            }
-            , reload: function () {
-                $('#beginTime').val('');
-                $('#endTime').val('');
-                table.reload('leaveList', {
-                    where: {
-                        beginTime: null,
-                        endTime: null
-                    }
-                });
-            }
-        };
-        //监听工具条
-        table.on('tool(leave)', function (obj) {
-            var data = obj.data;
-            if (obj.event === 'start') {
-                start(data.key);
-            } else if (obj.event === 'getProcImage') {
-                activiti.img(data.processInstanceId);
-            } else if (obj.event === 'leaveDetail') {
-                window.top.layer.open({
-                    id: 'leave-detail',
-                    type: 2,
-                    area: ['880px', '400px'],
-                    fix: false,
-                    maxmin: true,
-                    shadeClose: false,
-                    shade: 0.4,
-                    title: '审核详情',
-                    content: "/leave/leaveDetail?processId=" + data.processInstanceId
-                });
-            }
-        });
-        Len.eleClick(active, '.len-form-item .layui-btn,.layui-col-md12 .layui-btn');
-    });
-
-    function add(title, url, w, h) {
-        window.top.layer.open({
-            id: 'leave-add',
-            type: 2,
-            area: [w + 'px', h + 'px'],
-            fix: false,
-            maxmin: true,
-            shadeClose: false,
-            shade: 0.4,
-            title: title,
-            content: url
-        });
-    }
+	layui.laytpl.toDateString = function (d, format) {
+		var date = new Date(d || new Date())
+			, ymd = [
+			this.digit(date.getFullYear(), 4)
+			, this.digit(date.getMonth() + 1)
+			, this.digit(date.getDate())
+		]
+			, hms = [
+			this.digit(date.getHours())
+			, this.digit(date.getMinutes())
+			, this.digit(date.getSeconds())
+		];
+
+		format = format || 'yyyy-MM-dd HH:mm:ss';
+
+		return format.replace(/yyyy/g, ymd[0])
+			.replace(/MM/g, ymd[1])
+			.replace(/dd/g, ymd[2])
+			.replace(/HH/g, hms[0])
+			.replace(/mm/g, hms[1])
+			.replace(/ss/g, hms[2]);
+	};
+
+	//数字前置补零
+	layui.laytpl.digit = function (num, length, end) {
+		var str = '';
+		num = String(num);
+		length = length || 2;
+		for (var i = num.length; i < length; i++) {
+			str += '0';
+		}
+		return num < Math.pow(10, length) ? str + (num | 0) : num;
+	};
+
+	document.onkeydown = function (e) { // 回车提交表单
+		var theEvent = window.event || e;
+		var code = theEvent.keyCode || theEvent.which;
+		if (code == 13) {
+			$(".select .select-on").click();
+		}
+	}
+
+	layui.use('table', function () {
+		var table = layui.table;
+		//方法级渲染
+		table.render({
+			id: 'leaveList',
+			elem: '#leaveList'
+			, url: 'leave/showLeaveList'
+			, parseData: function (res) {
+				return {
+					"code": res.code,
+					"msg": res.msg,
+					"count": res.count,
+					"data": res.data
+				};
+			}
+			, cols: [[
+				{checkbox: true, fixed: true, width: '5%'}
+				, {field: 'userName', title: '申请人', width: '10%', sort: true}
+				, {
+					field: 'beginTime',
+					title: '开始时间',
+					width: '10%',
+					sort: true,
+					templet: '<div>{{ layui.laytpl.toDateString(d.beginTime,"yyyy-MM-dd") }}</div>'
+				}
+				, {
+					field: 'endTime',
+					title: '结束时间',
+					width: '10%',
+					sort: true,
+					templet: '<div>{{ layui.laytpl.toDateString(d.endTime,"yyyy-MM-dd") }}</div>'
+				}
+				, {field: 'taskName', title: '状态', width: '10%', templet: '#status'}
+				, {field: 'reason', title: '原因', width: '10%', sort: true}
+				, {field: 'days', title: '天数', width: '10%', sort: true}
+				, {field: 'processInstanceId', title: '流程定义id', width: '10%', sort: true}
+				, {field: 'text', title: '操作', width: '20%', toolbar: '#toolBar'}
+
+			]]
+			, page: true
+			, height: 'full-100'
+		});
+
+		var $ = layui.$, active = {
+			select: function () {
+				var beginTime = $('#beginTime').val();
+				var endTime = $('#endTime').val();
+				table.reload('leaveList', {
+					where: {
+						beginTime: beginTime,
+						endTime: endTime
+					}
+				});
+			}
+			, createLeave: function () {
+				add("申请请假", '/leave/addLeave', 700, 450);
+			}
+			, reload: function () {
+				$('#beginTime').val('');
+				$('#endTime').val('');
+				table.reload('leaveList', {
+					where: {
+						beginTime: null,
+						endTime: null
+					}
+				});
+			}
+		};
+		//监听工具条
+		table.on('tool(leave)', function (obj) {
+			var data = obj.data;
+			if (obj.event === 'start') {
+				start(data.key);
+			} else if (obj.event === 'getProcImage') {
+				activiti.img(data.processInstanceId);
+			} else if (obj.event === 'leaveDetail') {
+				window.top.layer.open({
+					id: 'leave-detail',
+					type: 2,
+					area: ['880px', '400px'],
+					fix: false,
+					maxmin: true,
+					shadeClose: false,
+					shade: 0.4,
+					title: '审核详情',
+					content: "/leave/leaveDetail?processId=" + data.processInstanceId
+				});
+			}
+		});
+		Len.eleClick(active, '.len-form-item .layui-btn,.layui-col-md12 .layui-btn');
+	});
+
+	function add(title, url, w, h) {
+		window.top.layer.open({
+			id: 'leave-add',
+			type: 2,
+			area: [w + 'px', h + 'px'],
+			fix: false,
+			maxmin: true,
+			shadeClose: false,
+			shade: 0.4,
+			title: title,
+			content: url
+		});
+	}
 
 </script>
 </body>
diff --git a/len-activiti/src/main/resources/ftl/act/leave/update-leave-readonly.ftl b/len-activiti/src/main/resources/ftl/act/leave/update-leave-readonly.ftl
index 0967821..ed2fcb4 100644
--- a/len-activiti/src/main/resources/ftl/act/leave/update-leave-readonly.ftl
+++ b/len-activiti/src/main/resources/ftl/act/leave/update-leave-readonly.ftl
@@ -8,135 +8,141 @@ To change this template use File | Settings | File Templates.-->
 <html>
 
 <head>
-  <meta charset="UTF-8">
-  <title>编辑请假</title>
-  <meta name="renderer" content="webkit">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport" content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi" />
-  <link rel="stylesheet" href="${re.contextPath}/plugin/layui/css/layui.css">
-  <link rel="stylesheet" href="${re.contextPath}/plugin/ztree/css/metroStyle/metroStyle.css">
-  <script type="text/javascript" src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
-  <script type="text/javascript" src="${re.contextPath}/plugin/layui/layui.all.js" charset="utf-8"></script>
-  <script type="text/javascript" src="${re.contextPath}/plugin/tools/tool.js" charset="utf-8"></script>
+	<meta charset="UTF-8">
+	<title>编辑请假</title>
+	<meta name="renderer" content="webkit">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<meta name="viewport"
+		  content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi"/>
+	<link rel="stylesheet" href="${re.contextPath}/plugin/layui/css/layui.css">
+	<link rel="stylesheet" href="${re.contextPath}/plugin/ztree/css/metroStyle/metroStyle.css">
+	<script type="text/javascript" src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${re.contextPath}/plugin/layui/layui.all.js" charset="utf-8"></script>
+	<script type="text/javascript" src="${re.contextPath}/plugin/tools/tool.js" charset="utf-8"></script>
 </head>
 
 <body>
 <div class="x-body">
-  <form class="layui-form layui-form-pane" style="margin-left: 20px;">
-    <div style="width:100%;height:400px;overflow: auto;">
-    <div class="layui-form-item">
-      <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-        <legend style="font-size:16px;">请假信息</legend>
-      </fieldset>
-    </div>
-    <div class="layui-form-item">
-      <label for="beginTime" class="layui-form-label">
-        <span class="x-red">*</span>开始时间
-      </label>
-      <div class="layui-input-inline">
-        <input name="id" type="hidden" value="${leave.id}">
-        <input type="text"  id="beginTime" readonly disabled  value="${leave.beginTime?string("yyyy-MM-dd")}" name="beginTime"  lay-verify="beginTime"  placeholder="yyyy-MM-dd"
-               autocomplete="off" class="layui-input">
-      </div>
-    </div>
-    <div class="layui-form-item">
-    <div class="layui-inline">
-      <label for="endTime" class="layui-form-label">
-        <span class="x-red">*</span>结束时间
-      </label>
-      <div class="layui-input-inline">
-        <input type="text" id="endTime" readonly disabled value="${leave.endTime?string("yyyy-MM-dd")}" name="endTime" lay-verify="endTime"  placeholder="yyyy-MM-dd"  autocomplete="off" class="layui-input">
-      </div>
-    </div>
-    </div>
-      <div class="layui-form-item">
-        <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-          <legend style="font-size:16px;">原因</legend>
-        </fieldset>
-      </div>
-      <div class="layui-form-item">
-    <div class="layui-inline">
-      <label for="reason" class="layui-form-label">
-        <span class="x-red">*</span>请假原因
-      </label>
-      <div class="layui-input-inline">
-        <input type="text" readonly disabled  id="reason" value="${leave.reason}" style="width: 300px;" name="reason" lay-verify="reason"  autocomplete="off" class="layui-input">
-      </div>
-    </div>
-    </div>
-      <div style="height: 60px"></div>
-    </div>
+	<form class="layui-form layui-form-pane" style="margin-left: 20px;">
+		<div style="width:100%;height:400px;overflow: auto;">
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">请假信息</legend>
+				</fieldset>
+			</div>
+			<div class="layui-form-item">
+				<label for="beginTime" class="layui-form-label">
+					<span class="x-red">*</span>开始时间
+				</label>
+				<div class="layui-input-inline">
+					<input name="id" type="hidden" value="${leave.id}">
+					<input type="text" id="beginTime" readonly disabled value="${leave.beginTime?string("yyyy-MM-dd")}"
+						   name="beginTime" lay-verify="beginTime" placeholder="yyyy-MM-dd"
+						   autocomplete="off" class="layui-input">
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label for="endTime" class="layui-form-label">
+						<span class="x-red">*</span>结束时间
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" id="endTime" readonly disabled value="${leave.endTime?string("yyyy-MM-dd")}"
+							   name="endTime" lay-verify="endTime" placeholder="yyyy-MM-dd" autocomplete="off"
+							   class="layui-input">
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">原因</legend>
+				</fieldset>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label for="reason" class="layui-form-label">
+						<span class="x-red">*</span>请假原因
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" readonly disabled id="reason" value="${leave.reason}" style="width: 300px;"
+							   name="reason" lay-verify="reason" autocomplete="off" class="layui-input">
+					</div>
+				</div>
+			</div>
+			<div style="height: 60px"></div>
+		</div>
 
-  </form>
+	</form>
 </div>
 <script>
-  layui.use(['form','layer'], function(){
-    $ = layui.jquery;
-    var form = layui.form
-        ,layer = layui.layer
-    ,laydate = layui.laydate;
-    var d = new Date();
-    var day=d.getFullYear()+"-"+(parseInt(d.getMonth())+1)+'-'+d.getDate();
-    var $ = layui.$, active = {
-      close: function () {
-        var index = parent.layer.getFrameIndex(window.name);
-        parent.layer.close(index);
-      }
-    }
-    $('.layui-form-item .layui-btn').on('click', function () {
-      var type = $(this).data('type');
-      active[type] ? active[type].call(this) : '';
-    });
-    var a = laydate.render({
-      elem: '#beginTime',
-      min:day,
-      done: function(value, date, endDate) {
-        b.config.min = {
-          year: date.year,
-          month: date.month - 1,
-          date: date.date,
-          hours: date.hours,
-          minutes: date.minutes,
-          seconds: date.seconds
-        }
-      }
-    });
-    var b = laydate.render({
-      elem: '#endTime',
-      min: '2018-01-20'
-    });
+	layui.use(['form', 'layer'], function () {
+		$ = layui.jquery;
+		var form = layui.form
+			, layer = layui.layer
+			, laydate = layui.laydate;
+		var d = new Date();
+		var day = d.getFullYear() + "-" + (parseInt(d.getMonth()) + 1) + '-' + d.getDate();
+		var $ = layui.$, active = {
+			close: function () {
+				var index = parent.layer.getFrameIndex(window.name);
+				parent.layer.close(index);
+			}
+		}
+		$('.layui-form-item .layui-btn').on('click', function () {
+			var type = $(this).data('type');
+			active[type] ? active[type].call(this) : '';
+		});
+		var a = laydate.render({
+			elem: '#beginTime',
+			min: day,
+			done: function (value, date, endDate) {
+				b.config.min = {
+					year: date.year,
+					month: date.month - 1,
+					date: date.date,
+					hours: date.hours,
+					minutes: date.minutes,
+					seconds: date.seconds
+				}
+			}
+		});
+		var b = laydate.render({
+			elem: '#endTime',
+			min: '2018-01-20'
+		});
 
-    //自定义验证规则
-    form.verify({
-      beginTime: function(value){
-        if(value.trim()==""){
-          return "开始时间不能为空";
-        }
-      },
-      endTime:function(value) {
-        if (value.trim() == "") {
-          return "结束时间不能为空";
-        }
-      },
-      reason:function(value){
-        if(value.trim()==""){
-          return "请填写请假原因";
-        }
-      }
-    });
-   form.on('submit(close)',function (data) {
-     var index = parent.layer.getFrameIndex(window.name);
-     parent.layer.close(index);
-   })
-    //监听提交
-    form.on('submit(add)', function(data){
-      Len.layerAjax('updateLeave/${taskId}/${leave.id}/true',data.field,'taskList');
-      return false;
-    }); form.on('submit(closeLeave)', function(data){
-      Len.layerAjax('updateLeave/${taskId}/${leave.id}/false',data.field,'taskList');
-      return false;
-    });
-  });
+		//自定义验证规则
+		form.verify({
+			beginTime: function (value) {
+				if (value.trim() == "") {
+					return "开始时间不能为空";
+				}
+			},
+			endTime: function (value) {
+				if (value.trim() == "") {
+					return "结束时间不能为空";
+				}
+			},
+			reason: function (value) {
+				if (value.trim() == "") {
+					return "请填写请假原因";
+				}
+			}
+		});
+		form.on('submit(close)', function (data) {
+			var index = parent.layer.getFrameIndex(window.name);
+			parent.layer.close(index);
+		})
+		//监听提交
+		form.on('submit(add)', function (data) {
+			Len.layerAjax('updateLeave/${taskId}/${leave.id}/true', data.field, 'taskList');
+			return false;
+		});
+		form.on('submit(closeLeave)', function (data) {
+			Len.layerAjax('updateLeave/${taskId}/${leave.id}/false', data.field, 'taskList');
+			return false;
+		});
+	});
 </script>
 </body>
 
diff --git a/len-activiti/src/main/resources/ftl/act/leave/update-leave.ftl b/len-activiti/src/main/resources/ftl/act/leave/update-leave.ftl
index 0b865a0..52d4e13 100644
--- a/len-activiti/src/main/resources/ftl/act/leave/update-leave.ftl
+++ b/len-activiti/src/main/resources/ftl/act/leave/update-leave.ftl
@@ -8,149 +8,154 @@ To change this template use File | Settings | File Templates.-->
 <html>
 
 <head>
-  <meta charset="UTF-8">
-  <title>编辑请假</title>
-  <meta name="renderer" content="webkit">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport" content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi" />
-  <link rel="stylesheet" href="${re.contextPath}/plugin/layui/css/layui.css">
-  <link rel="stylesheet" href="${re.contextPath}/plugin/ztree/css/metroStyle/metroStyle.css">
-  <script type="text/javascript" src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
-  <script type="text/javascript" src="${re.contextPath}/plugin/layui/layui.all.js" charset="utf-8"></script>
-  <script type="text/javascript" src="${re.contextPath}/plugin/tools/tool.js" charset="utf-8"></script>
+	<meta charset="UTF-8">
+	<title>编辑请假</title>
+	<meta name="renderer" content="webkit">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<meta name="viewport"
+		  content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi"/>
+	<link rel="stylesheet" href="${re.contextPath}/plugin/layui/css/layui.css">
+	<link rel="stylesheet" href="${re.contextPath}/plugin/ztree/css/metroStyle/metroStyle.css">
+	<script type="text/javascript" src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
+	<script type="text/javascript" src="${re.contextPath}/plugin/layui/layui.all.js" charset="utf-8"></script>
+	<script type="text/javascript" src="${re.contextPath}/plugin/tools/tool.js" charset="utf-8"></script>
 </head>
 
 <body>
 <div class="x-body">
-  <form class="layui-form layui-form-pane" style="margin-left: 20px;">
-    <div style="width:100%;height:400px;overflow: auto;">
-    <div class="layui-form-item">
-      <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-        <legend style="font-size:16px;">请假信息</legend>
-      </fieldset>
-    </div>
-    <div class="layui-form-item">
-      <label for="beginTime" class="layui-form-label">
-        <span class="x-red">*</span>开始时间
-      </label>
-      <div class="layui-input-inline">
-        <input name="id" type="hidden" value="${leave.id}">
-        <input type="text"  id="beginTime" value="${leave.beginTime?string("yyyy-MM-dd")}" name="beginTime"  lay-verify="beginTime"  placeholder="yyyy-MM-dd"
-               autocomplete="off" class="layui-input">
-      </div>
-    </div>
-    <div class="layui-form-item">
-    <div class="layui-inline">
-      <label for="endTime" class="layui-form-label">
-        <span class="x-red">*</span>结束时间
-      </label>
-      <div class="layui-input-inline">
-        <input type="text" id="endTime" value="${leave.endTime?string("yyyy-MM-dd")}" name="endTime" lay-verify="endTime"  placeholder="yyyy-MM-dd"  autocomplete="off" class="layui-input">
-      </div>
-    </div>
-    </div>
-      <div class="layui-form-item">
-        <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-          <legend style="font-size:16px;">原因</legend>
-        </fieldset>
-      </div>
-      <div class="layui-form-item">
-    <div class="layui-inline">
-      <label for="reason" class="layui-form-label">
-        <span class="x-red">*</span>请假原因
-      </label>
-      <div class="layui-input-inline">
-        <input type="text" id="reason" value="${leave.reason}" style="width: 300px;" name="reason" lay-verify="reason"  autocomplete="off" class="layui-input">
-      </div>
-    </div>
-    </div>
-      <div style="height: 60px"></div>
-    </div>
-  <div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
+	<form class="layui-form layui-form-pane" style="margin-left: 20px;">
+		<div style="width:100%;height:400px;overflow: auto;">
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">请假信息</legend>
+				</fieldset>
+			</div>
+			<div class="layui-form-item">
+				<label for="beginTime" class="layui-form-label">
+					<span class="x-red">*</span>开始时间
+				</label>
+				<div class="layui-input-inline">
+					<input name="id" type="hidden" value="${leave.id}">
+					<input type="text" id="beginTime" value="${leave.beginTime?string("yyyy-MM-dd")}" name="beginTime"
+						   lay-verify="beginTime" placeholder="yyyy-MM-dd"
+						   autocomplete="off" class="layui-input">
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label for="endTime" class="layui-form-label">
+						<span class="x-red">*</span>结束时间
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" id="endTime" value="${leave.endTime?string("yyyy-MM-dd")}" name="endTime"
+							   lay-verify="endTime" placeholder="yyyy-MM-dd" autocomplete="off" class="layui-input">
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">原因</legend>
+				</fieldset>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label for="reason" class="layui-form-label">
+						<span class="x-red">*</span>请假原因
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" id="reason" value="${leave.reason}" style="width: 300px;" name="reason"
+							   lay-verify="reason" autocomplete="off" class="layui-input">
+					</div>
+				</div>
+			</div>
+			<div style="height: 60px"></div>
+		</div>
+		<div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
   position: fixed;bottom: 1px;margin-left:-20px;">
-    <div class="layui-form-item" style=" float: right;margin-right: 30px;margin-top: 8px">
+			<div class="layui-form-item" style=" float: right;margin-right: 30px;margin-top: 8px">
 
-      <button  class="layui-btn layui-btn-normal" lay-filter="add" lay-submit>
-        重新提交
-      </button>
-      <button  class="layui-btn layui-btn-normal" lay-filter="closeLeave" lay-submit>
-        取消请假
-      </button>
-      <button  class="layui-btn layui-btn-primary"   data-type="close">
-        关闭
-      </button>
-    </div>
-  </div>
-  </form>
+				<button class="layui-btn layui-btn-normal" lay-filter="add" lay-submit>
+					重新提交
+				</button>
+				<button class="layui-btn layui-btn-normal" lay-filter="closeLeave" lay-submit>
+					取消请假
+				</button>
+				<button class="layui-btn layui-btn-primary" data-type="close">
+					关闭
+				</button>
+			</div>
+		</div>
+	</form>
 </div>
 <script>
-  layui.use(['form','layer'], function(){
-    $ = layui.jquery;
-    var form = layui.form
-        ,layer = layui.layer
-    ,laydate = layui.laydate;
-    var d = new Date();
-    var day=d.getFullYear()+"-"+(parseInt(d.getMonth())+1)+'-'+d.getDate();
-    var $ = layui.$, active = {
-      close: function () {
-        var index = parent.layer.getFrameIndex(window.name);
-        parent.layer.close(index);
-      }
-    }
-    $('.layui-form-item .layui-btn').on('click', function () {
-      var type = $(this).data('type');
-      active[type] ? active[type].call(this) : '';
-    });
-    var a = laydate.render({
-      elem: '#beginTime',
-      min:day,
-      done: function(value, date, endDate) {
-        b.config.min = {
-          year: date.year,
-          month: date.month - 1,
-          date: date.date,
-          hours: date.hours,
-          minutes: date.minutes,
-          seconds: date.seconds
-        }
-      }
-    });
-    var b = laydate.render({
-      elem: '#endTime',
-      min: '2018-01-20'
-    });
+	layui.use(['form', 'layer'], function () {
+		$ = layui.jquery;
+		var form = layui.form
+			, layer = layui.layer
+			, laydate = layui.laydate;
+		var d = new Date();
+		var day = d.getFullYear() + "-" + (parseInt(d.getMonth()) + 1) + '-' + d.getDate();
+		var $ = layui.$, active = {
+			close: function () {
+				var index = parent.layer.getFrameIndex(window.name);
+				parent.layer.close(index);
+			}
+		}
+		$('.layui-form-item .layui-btn').on('click', function () {
+			var type = $(this).data('type');
+			active[type] ? active[type].call(this) : '';
+		});
+		var a = laydate.render({
+			elem: '#beginTime',
+			min: day,
+			done: function (value, date, endDate) {
+				b.config.min = {
+					year: date.year,
+					month: date.month - 1,
+					date: date.date,
+					hours: date.hours,
+					minutes: date.minutes,
+					seconds: date.seconds
+				}
+			}
+		});
+		var b = laydate.render({
+			elem: '#endTime',
+			min: '2018-01-20'
+		});
 
-    //自定义验证规则
-    form.verify({
-      beginTime: function(value){
-        if(value.trim()==""){
-          return "开始时间不能为空";
-        }
-      },
-      endTime:function(value) {
-        if (value.trim() == "") {
-          return "结束时间不能为空";
-        }
-      },
-      reason:function(value){
-        if(value.trim()==""){
-          return "请填写请假原因";
-        }
-      }
-    });
-   form.on('submit(close)',function (data) {
-     var index = parent.layer.getFrameIndex(window.name);
-     parent.layer.close(index);
-   })
-    //监听提交
-    form.on('submit(add)', function(data){
-      Len.layerAjax('updateLeave/${taskId}/${leave.id}/true',data.field,'taskList');
-      return false;
-    }); form.on('submit(closeLeave)', function(data){
-      Len.layerAjax('updateLeave/${taskId}/${leave.id}/false',data.field,'taskList');
-      return false;
-    });
-  });
+		//自定义验证规则
+		form.verify({
+			beginTime: function (value) {
+				if (value.trim() == "") {
+					return "开始时间不能为空";
+				}
+			},
+			endTime: function (value) {
+				if (value.trim() == "") {
+					return "结束时间不能为空";
+				}
+			},
+			reason: function (value) {
+				if (value.trim() == "") {
+					return "请填写请假原因";
+				}
+			}
+		});
+		form.on('submit(close)', function (data) {
+			var index = parent.layer.getFrameIndex(window.name);
+			parent.layer.close(index);
+		})
+		//监听提交
+		form.on('submit(add)', function (data) {
+			Len.layerAjax('updateLeave/${taskId}/${leave.id}/true', data.field, 'taskList');
+			return false;
+		});
+		form.on('submit(closeLeave)', function (data) {
+			Len.layerAjax('updateLeave/${taskId}/${leave.id}/false', data.field, 'taskList');
+			return false;
+		});
+	});
 </script>
 </body>
 
diff --git a/len-activiti/src/main/resources/ftl/act/task/task-agent-iframe.ftl b/len-activiti/src/main/resources/ftl/act/task/task-agent-iframe.ftl
index dad93bd..3eaa3cc 100644
--- a/len-activiti/src/main/resources/ftl/act/task/task-agent-iframe.ftl
+++ b/len-activiti/src/main/resources/ftl/act/task/task-agent-iframe.ftl
@@ -2,87 +2,90 @@
 <html>
 
 <head>
-  <meta charset="UTF-8">
-  <title>办理任务</title>
-  <meta name="renderer" content="webkit">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport" content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi" />
-  <link rel="stylesheet" href="${re.contextPath}/plugin/layui/css/layui.css">
-  <link rel="stylesheet" href="${re.contextPath}/plugin/ztree/css/metroStyle/metroStyle.css">
-    <script type="text/javascript" src="${re.contextPath}/plugin/jquery/jquery-3.2.1.min.js"></script>
-  <script type="text/javascript" src="${re.contextPath}/plugin/layui/layui.all.js" charset="utf-8"></script>
-  <script type="text/javascript" src="${re.contextPath}/plugin/tools/tool.js" charset="utf-8"></script>
+	<meta charset="UTF-8">
+	<title>办理任务</title>
+	<meta name="renderer" content="webkit">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<meta name="viewport"
+		  content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi"/>
+	<link rel="stylesheet" href="${re.contextPath}/plugin/layui/css/layui.css">
+	<link rel="stylesheet" href="${re.contextPath}/plugin/ztree/css/metroStyle/metroStyle.css">
+	<script type="text/javascript" src="${re.contextPath}/plugin/jquery/jquery-3.2.1.min.js"></script>
+	<script type="text/javascript" src="${re.contextPath}/plugin/layui/layui.all.js" charset="utf-8"></script>
+	<script type="text/javascript" src="${re.contextPath}/plugin/tools/tool.js" charset="utf-8"></script>
 </head>
 
 <body>
 <div class="x-body">
 
-    <div style="width:100%; height:220px;overflow: hidden;">
-        <iframe style="width:100%;height:100%;border: none;" src="${leaveUrl}"></iframe>
-    </div>
+	<div style="width:100%; height:220px;overflow: hidden;">
+		<iframe style="width:100%;height:100%;border: none;" src="${leaveUrl}"></iframe>
+	</div>
 
-  <form class="layui-form layui-form-pane" style="margin-left: 20px;">
-    <div style="width:98%;height:80px;">
-        <input type="hidden" name="taskId" value="${taskId}">
-        <div class="layui-form-item layui-form-text">
-          <label class="layui-form-label">审批意见</label>
-          <div class="layui-input-block">
-            <textarea name="opinion" id="opinion" lay-verify="opinion"  class="layui-textarea" style="min-height: 30px;height: 100px"></textarea>
-          </div>
-        </div>
-    </div>
-  <div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
+	<form class="layui-form layui-form-pane" style="margin-left: 20px;">
+		<div style="width:98%;height:80px;">
+			<input type="hidden" name="taskId" value="${taskId}">
+			<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">审批意见</label>
+				<div class="layui-input-block">
+                    <textarea name="opinion" id="opinion" lay-verify="opinion" class="layui-textarea"
+							  style="min-height: 30px;height: 100px"></textarea>
+				</div>
+			</div>
+		</div>
+		<div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
   position: fixed;bottom: 1px;margin-left:-20px;">
-    <div class="layui-form-item" style=" float: right;margin-right: 10px;margin-top: 8px">
-      <input name="flag" type="hidden">
-      <button  class="layui-btn layui-btn-normal" lay-filter="ok" lay-submit>
-        通过
-      </button><button  class="layui-btn layui-btn-normal" lay-filter="no" lay-submit>
-        不通过
-      </button>
-      <button  class="layui-btn layui-btn-primary" data-type="close">
-        取消
-      </button>
-    </div>
-  </div>
-  </form>
+			<div class="layui-form-item" style=" float: right;margin-right: 10px;margin-top: 8px">
+				<input name="flag" type="hidden">
+				<button class="layui-btn layui-btn-normal" lay-filter="ok" lay-submit>
+					通过
+				</button>
+				<button class="layui-btn layui-btn-normal" lay-filter="no" lay-submit>
+					不通过
+				</button>
+				<button class="layui-btn layui-btn-primary" data-type="close">
+					取消
+				</button>
+			</div>
+		</div>
+	</form>
 </div>
 <script>
-  layui.use(['form','layer'], function(){
-    $ = layui.jquery;
-    var form = layui.form
-        ,layer = layui.layer;
+	layui.use(['form', 'layer'], function () {
+		$ = layui.jquery;
+		var form = layui.form
+			, layer = layui.layer;
 
 
-    //自定义验证规则
-    form.verify({
-      opinion: function(value){
-        if(value.trim()==""){
-          return "审核信息不能为空";
-        }
-      }
-    });
-    var $ = layui.$, active = {
-      close: function () {
-        var index = parent.layer.getFrameIndex(window.name);
-        parent.layer.close(index);
-      }
-    }
-    Len.eleClick(active,'.layui-form-item .layui-btn');
+		//自定义验证规则
+		form.verify({
+			opinion: function (value) {
+				if (value.trim() == "") {
+					return "审核信息不能为空";
+				}
+			}
+		});
+		var $ = layui.$, active = {
+			close: function () {
+				var index = parent.layer.getFrameIndex(window.name);
+				parent.layer.close(index);
+			}
+		}
+		Len.eleClick(active, '.layui-form-item .layui-btn');
 
-    form.on('submit(no)',function(data){
-      data.field.flag=false;
-      Len.layerAjax('complete',data.field,'taskList');
-      return false;
-    });
+		form.on('submit(no)', function (data) {
+			data.field.flag = false;
+			Len.layerAjax('complete', data.field, 'taskList');
+			return false;
+		});
 
-    form.on('submit(ok)', function(data){
-      data.field.flag=true;
-      Len.layerAjax('complete',data.field,'taskList');
-      return false;
-    });
-    form.render();
-  });
+		form.on('submit(ok)', function (data) {
+			data.field.flag = true;
+			Len.layerAjax('complete', data.field, 'taskList');
+			return false;
+		});
+		form.render();
+	});
 </script>
 </body>
 
diff --git a/len-activiti/src/main/resources/ftl/act/task/task-agent.ftl b/len-activiti/src/main/resources/ftl/act/task/task-agent.ftl
index 5c3883d..a9042f6 100644
--- a/len-activiti/src/main/resources/ftl/act/task/task-agent.ftl
+++ b/len-activiti/src/main/resources/ftl/act/task/task-agent.ftl
@@ -1,113 +1,116 @@
-
 <!DOCTYPE html>
 <html>
 
 <head>
-  <meta charset="UTF-8">
-  <title>办理任务</title>
-  <meta name="renderer" content="webkit">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport" content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi" />
-  <link rel="stylesheet" href="${re.contextPath}/plugin/layui/css/layui.css">
-  <link rel="stylesheet" href="${re.contextPath}/plugin/ztree/css/metroStyle/metroStyle.css">
-    <script type="text/javascript" src="${re.contextPath}/plugin/jquery/jquery-3.2.1.min.js"></script>
-  <script type="text/javascript" src="${re.contextPath}/plugin/layui/layui.all.js" charset="utf-8"></script>
-  <script type="text/javascript" src="${re.contextPath}/plugin/tools/tool.js" charset="utf-8"></script>
+	<meta charset="UTF-8">
+	<title>办理任务</title>
+	<meta name="renderer" content="webkit">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<meta name="viewport"
+		  content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi"/>
+	<link rel="stylesheet" href="${re.contextPath}/plugin/layui/css/layui.css">
+	<link rel="stylesheet" href="${re.contextPath}/plugin/ztree/css/metroStyle/metroStyle.css">
+	<script type="text/javascript" src="${re.contextPath}/plugin/jquery/jquery-3.2.1.min.js"></script>
+	<script type="text/javascript" src="${re.contextPath}/plugin/layui/layui.all.js" charset="utf-8"></script>
+	<script type="text/javascript" src="${re.contextPath}/plugin/tools/tool.js" charset="utf-8"></script>
 </head>
 
 <body>
 <div class="x-body">
-  <form class="layui-form layui-form-pane" style="margin-left: 20px;">
-    <div <#--style="width:98%;height:450px;overflow: auto;"-->>
-    <div class="layui-form-item">
-      <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-        <legend style="font-size:16px;">请假信息</legend>
-      </fieldset>
-    </div>
-    <div class="layui-form-item">
-      <div class="layui-inline">
-      <label for="beginTime" class="layui-form-label">
-        开始时间
-      </label>
-      <div class="layui-input-inline">
-        <input type="hidden" name="taskId" value="${taskId}">
-        <input type="text"  id="beginTime" readonly value="${leave.beginTime?string("yyyy-MM-dd")}"   class="layui-input">
-      </div>
-      </div>
-      <div class="layui-inline">
-      <label for="endTime" class="layui-form-label">
-        结束时间
-      </label>
-      <div class="layui-input-inline">
-        <input type="text" id="endTime" readonly value="${leave.endTime?string("yyyy-MM-dd")}"  class="layui-input">
-      </div>
-    </div>
-    </div>
-     <div class="layui-form-item layui-form-text">
-        <label class="layui-form-label">原因</label>
-        <div class="layui-input-block">
-          <textarea   class="layui-textarea">${leave.reason}</textarea>
-        </div>
-      </div>
-        <div class="layui-form-item layui-form-text">
-          <label class="layui-form-label">审批意见</label>
-          <div class="layui-input-block">
-            <textarea name="opinion" id="opinion" lay-verify="opinion"  class="layui-textarea"></textarea>
-          </div>
-        </div>
-    </div>
-  <div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
+	<form class="layui-form layui-form-pane" style="margin-left: 20px;">
+		<div <#--style="width:98%;height:450px;overflow: auto;"-->>
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">请假信息</legend>
+				</fieldset>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label for="beginTime" class="layui-form-label">
+						开始时间
+					</label>
+					<div class="layui-input-inline">
+						<input type="hidden" name="taskId" value="${taskId}">
+						<input type="text" id="beginTime" readonly value="${leave.beginTime?string("yyyy-MM-dd")}"
+							   class="layui-input">
+					</div>
+				</div>
+				<div class="layui-inline">
+					<label for="endTime" class="layui-form-label">
+						结束时间
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" id="endTime" readonly value="${leave.endTime?string("yyyy-MM-dd")}"
+							   class="layui-input">
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">原因</label>
+				<div class="layui-input-block">
+					<textarea class="layui-textarea">${leave.reason}</textarea>
+				</div>
+			</div>
+			<div class="layui-form-item layui-form-text">
+				<label class="layui-form-label">审批意见</label>
+				<div class="layui-input-block">
+					<textarea name="opinion" id="opinion" lay-verify="opinion" class="layui-textarea"></textarea>
+				</div>
+			</div>
+		</div>
+		<div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
   position: fixed;bottom: 1px;margin-left:-20px;">
-    <div class="layui-form-item" style=" float: right;margin-right: 10px;margin-top: 8px">
-      <input name="flag" type="hidden">
-      <button  class="layui-btn layui-btn-normal" lay-filter="ok" lay-submit>
-        通过
-      </button><button  class="layui-btn layui-btn-normal" lay-filter="no" lay-submit>
-        不通过
-      </button>
-      <button  class="layui-btn layui-btn-primary" data-type="close">
-        取消
-      </button>
-    </div>
-  </div>
-  </form>
+			<div class="layui-form-item" style=" float: right;margin-right: 10px;margin-top: 8px">
+				<input name="flag" type="hidden">
+				<button class="layui-btn layui-btn-normal" lay-filter="ok" lay-submit>
+					通过
+				</button>
+				<button class="layui-btn layui-btn-normal" lay-filter="no" lay-submit>
+					不通过
+				</button>
+				<button class="layui-btn layui-btn-primary" data-type="close">
+					取消
+				</button>
+			</div>
+		</div>
+	</form>
 </div>
 <script>
-  layui.use(['form','layer'], function(){
-    $ = layui.jquery;
-    var form = layui.form
-        ,layer = layui.layer;
+	layui.use(['form', 'layer'], function () {
+		$ = layui.jquery;
+		var form = layui.form
+			, layer = layui.layer;
 
 
-    //自定义验证规则
-    form.verify({
-      opinion: function(value){
-        if(value.trim()==""){
-          return "审核信息不能为空";
-        }
-      }
-    });
-    var $ = layui.$, active = {
-      close: function () {
-        var index = parent.layer.getFrameIndex(window.name);
-        parent.layer.close(index);
-      }
-    }
-    Len.eleClick(active,'.layui-form-item .layui-btn');
+		//自定义验证规则
+		form.verify({
+			opinion: function (value) {
+				if (value.trim() == "") {
+					return "审核信息不能为空";
+				}
+			}
+		});
+		var $ = layui.$, active = {
+			close: function () {
+				var index = parent.layer.getFrameIndex(window.name);
+				parent.layer.close(index);
+			}
+		}
+		Len.eleClick(active, '.layui-form-item .layui-btn');
 
-    form.on('submit(no)',function(data){
-      data.field.flag=false;
-      Len.layerAjax('complete',data.field,'taskList');
-      return false;
-    });
+		form.on('submit(no)', function (data) {
+			data.field.flag = false;
+			Len.layerAjax('complete', data.field, 'taskList');
+			return false;
+		});
 
-    form.on('submit(ok)', function(data){
-      data.field.flag=true;
-      Len.layerAjax('complete',data.field,'taskList');
-      return false;
-    });
-    form.render();
-  });
+		form.on('submit(ok)', function (data) {
+			data.field.flag = true;
+			Len.layerAjax('complete', data.field, 'taskList');
+			return false;
+		});
+		form.render();
+	});
 </script>
 </body>
 
diff --git a/len-activiti/src/main/resources/ftl/act/task/taskList.ftl b/len-activiti/src/main/resources/ftl/act/task/taskList.ftl
index 47bfb9f..29e5ac6 100644
--- a/len-activiti/src/main/resources/ftl/act/task/taskList.ftl
+++ b/len-activiti/src/main/resources/ftl/act/task/taskList.ftl
@@ -1,175 +1,180 @@
-
 <!DOCTYPE html>
 <html>
 <head>
-  <meta charset="UTF-8">
-  <title>我的任务</title>
-<#include "/system/base/formHead.ftl">
+	<meta charset="UTF-8">
+	<title>我的任务</title>
+    <#include "/system/base/formHead.ftl">
 </head>
 
 <body>
 <div class="lenos-search">
-  <div class="search-select">
-    操作用户：
-    <span class="layui-inline">
+	<div class="search-select">
+		操作用户：
+		<span class="layui-inline">
       <input class="layui-input" height="20px" id="userName" autocomplete="off">
     </span>
-    操作类型：
-    <span class="layui-inline">
+		操作类型：
+		<span class="layui-inline">
       <input class="layui-input" height="20px" id="type" autocomplete="off">
     </span>
-  </div>
-    <div class="len-form-item">
-        <button type="button" class="layui-btn layui-btn-normal layui-btn layui-btn-sm" data-type="select">查询</button>
-        <button type="button" class="layui-btn layui-btn-normal layui-btn layui-btn-sm" data-type="reload">重置</button>
-    </div>
+	</div>
+	<div class="len-form-item">
+		<button type="button" class="layui-btn layui-btn-normal layui-btn layui-btn-sm" data-type="select">查询</button>
+		<button type="button" class="layui-btn layui-btn-normal layui-btn layui-btn-sm" data-type="reload">重置</button>
+	</div>
 </div>
 
 <table id="taskList" width="100%" lay-filter="task"></table>
 <script type="text/html" id="taskToolBar">
-  {{# if(d.flag){ }}
-  <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="update"><i class="layui-icon">&#xe640;</i>编辑</a>
-  {{# }else{ }}
-  <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="handle"><i class="layui-icon">&#xe640;</i>办理</a>
-  {{# } }}
-  <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="leaveDetail"><i class="layui-icon">&#xe640;</i>查看详情</a>
+	{{# if(d.flag){ }}
+	<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="update"><i class="layui-icon">&#xe640;</i>编辑</a>
+	{{# }else{ }}
+	<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="handle"><i class="layui-icon">&#xe640;</i>办理</a>
+	{{# } }}
+	<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="leaveDetail"><i class="layui-icon">&#xe640;</i>查看详情</a>
 </script>
 <script>
-  layui.laytpl.toDateString = function(d, format){
-    var date = new Date(d || new Date())
-        ,ymd = [
-      this.digit(date.getFullYear(), 4)
-      ,this.digit(date.getMonth() + 1)
-      ,this.digit(date.getDate())
-    ]
-        ,hms = [
-      this.digit(date.getHours())
-      ,this.digit(date.getMinutes())
-      ,this.digit(date.getSeconds())
-    ];
+	layui.laytpl.toDateString = function (d, format) {
+		var date = new Date(d || new Date())
+			, ymd = [
+			this.digit(date.getFullYear(), 4)
+			, this.digit(date.getMonth() + 1)
+			, this.digit(date.getDate())
+		]
+			, hms = [
+			this.digit(date.getHours())
+			, this.digit(date.getMinutes())
+			, this.digit(date.getSeconds())
+		];
 
-    format = format || 'yyyy-MM-dd HH:mm:ss';
+		format = format || 'yyyy-MM-dd HH:mm:ss';
 
-    return format.replace(/yyyy/g, ymd[0])
-    .replace(/MM/g, ymd[1])
-    .replace(/dd/g, ymd[2])
-    .replace(/HH/g, hms[0])
-    .replace(/mm/g, hms[1])
-    .replace(/ss/g, hms[2]);
-  };
+		return format.replace(/yyyy/g, ymd[0])
+			.replace(/MM/g, ymd[1])
+			.replace(/dd/g, ymd[2])
+			.replace(/HH/g, hms[0])
+			.replace(/mm/g, hms[1])
+			.replace(/ss/g, hms[2]);
+	};
 
-  //数字前置补零
-  layui.laytpl.digit = function(num, length, end){
-    var str = '';
-    num = String(num);
-    length = length || 2;
-    for(var i = num.length; i < length; i++){
-      str += '0';
-    }
-    return num < Math.pow(10, length) ? str + (num|0) : num;
-  };
+	//数字前置补零
+	layui.laytpl.digit = function (num, length, end) {
+		var str = '';
+		num = String(num);
+		length = length || 2;
+		for (var i = num.length; i < length; i++) {
+			str += '0';
+		}
+		return num < Math.pow(10, length) ? str + (num | 0) : num;
+	};
 
-  document.onkeydown = function (e) { // 回车提交表单
-    var theEvent = window.event || e;
-    var code = theEvent.keyCode || theEvent.which;
-    if (code == 13) {
-      $(".select .select-on").click();
-    }
-  }
+	document.onkeydown = function (e) { // 回车提交表单
+		var theEvent = window.event || e;
+		var code = theEvent.keyCode || theEvent.which;
+		if (code == 13) {
+			$(".select .select-on").click();
+		}
+	}
 
-  layui.use('table', function () {
-      table = layui.table;
-    //方法级渲染
-    table.render({
-      id: 'taskList',
-      elem: '#taskList'
-      , url: 'leave/showTaskList'
-        ,parseData: function(res){
-            return {
-                "code": res.code,
-                "msg": res.msg,
-                "count": res.count,
-                "data": res.data
-            };
-        }
-      , cols: [[
-          {checkbox: true, fixed: true, width: '5%'}
-        , {field: 'id', title: '任务编码', width: '10%', sort: true}
-        , {field: 'userName', title: '申请人', width: '10%', sort: true}
-        , {field: 'reason', title: '原因', width: '15%', sort: true}
-        , {field: 'name', title: '任务名称', width: '10%', sort: true}
-        , {field: 'createTime', title: '创建时间', width: '10%', sort: true,templet: '<div>{{ layui.laytpl.toDateString(d.createTime,"yyyy-MM-dd") }}</div>'}
-        , {field: 'assignee', title: '委派人', width: '10%', sort: true}
-        , {field: 'processInstanceId', title: '流程实例ID', width: '15%', sort: true}
-        , {fixed: 'right', title: '操作', width: '25%', toolbar:'#taskToolBar'}
+	layui.use('table', function () {
+		table = layui.table;
+		//方法级渲染
+		table.render({
+			id: 'taskList',
+			elem: '#taskList'
+			, url: 'leave/showTaskList'
+			, parseData: function (res) {
+				return {
+					"code": res.code,
+					"msg": res.msg,
+					"count": res.count,
+					"data": res.data
+				};
+			}
+			, cols: [[
+				{checkbox: true, fixed: true, width: '5%'}
+				, {field: 'id', title: '任务编码', width: '10%', sort: true}
+				, {field: 'userName', title: '申请人', width: '10%', sort: true}
+				, {field: 'reason', title: '原因', width: '15%', sort: true}
+				, {field: 'name', title: '任务名称', width: '10%', sort: true}
+				, {
+					field: 'createTime',
+					title: '创建时间',
+					width: '10%',
+					sort: true,
+					templet: '<div>{{ layui.laytpl.toDateString(d.createTime,"yyyy-MM-dd") }}</div>'
+				}
+				, {field: 'assignee', title: '委派人', width: '10%', sort: true}
+				, {field: 'processInstanceId', title: '流程实例ID', width: '15%', sort: true}
+				, {fixed: 'right', title: '操作', width: '25%', toolbar: '#taskToolBar'}
 
-      ]]
-      , page: true
-      ,  height: 'full-46'
-    });
+			]]
+			, page: true
+			, height: 'full-46'
+		});
 
-    var $ = layui.$, active = {
-      select: function () {
-        var userName = $('#userName').val();
-        var type = $('#type').val();
-        table.reload('taskList', {
-          where: {
-              userName: userName
-          }
-        });
-      }
-      ,del:function(){
-          var checkStatus = table.checkStatus('taskList')
-                  , data = checkStatus.data;
-          if (data.length ==0) {
-              layer.msg('请选择要删除的数据', {icon: 5});
-              return false;
-          }
-          var ids=[];
-          for(item in data){
-              ids.push(data[item].id);
-          }
-          del(ids);
-        }
-      ,reload:function(){
-        $('#userName').val('');
-       $('#type').val('');
-        table.reload('taskList', {
-          where: {
-              userName: null,
-              type: null
-          }
-        });
-      },
-    };
-    //监听工具条
-      table.on('tool(task)', function (obj) {
-      var data = obj.data;
-      if (obj.event === 'handle') {
-        Len.popup('/leave/agent/'+data.id,'审批',700,500,'办理','task-agent');
-      }else if(obj.event === 'update'){
-        Len.popup('${re.contextPath}/leave/updateLeave/'+data.id,700,500,'编辑','task-update');
-      }else if(obj.event==='leaveDetail'){
-          window.top.layer.open({
-              id: 'leave-detail',
-              type: 2,
-              area: [ '880px', '400px'],
-              fix: false,
-              maxmin: true,
-              shadeClose: false,
-              shade: 0.4,
-              title: '审核详情',
-              content: "/leave/leaveDetail?processId="+data.processInstanceId
-          });
-      }
-    });
+		var $ = layui.$, active = {
+			select: function () {
+				var userName = $('#userName').val();
+				var type = $('#type').val();
+				table.reload('taskList', {
+					where: {
+						userName: userName
+					}
+				});
+			}
+			, del: function () {
+				var checkStatus = table.checkStatus('taskList')
+					, data = checkStatus.data;
+				if (data.length == 0) {
+					layer.msg('请选择要删除的数据', {icon: 5});
+					return false;
+				}
+				var ids = [];
+				for (item in data) {
+					ids.push(data[item].id);
+				}
+				del(ids);
+			}
+			, reload: function () {
+				$('#userName').val('');
+				$('#type').val('');
+				table.reload('taskList', {
+					where: {
+						userName: null,
+						type: null
+					}
+				});
+			},
+		};
+		//监听工具条
+		table.on('tool(task)', function (obj) {
+			var data = obj.data;
+			if (obj.event === 'handle') {
+				Len.popup('/leave/agent/' + data.id, '审批', 700, 500, '办理', 'task-agent');
+			} else if (obj.event === 'update') {
+				Len.popup('${re.contextPath}/leave/updateLeave/' + data.id, 700, 500, '编辑', 'task-update');
+			} else if (obj.event === 'leaveDetail') {
+				window.top.layer.open({
+					id: 'leave-detail',
+					type: 2,
+					area: ['880px', '400px'],
+					fix: false,
+					maxmin: true,
+					shadeClose: false,
+					shade: 0.4,
+					title: '审核详情',
+					content: "/leave/leaveDetail?processId=" + data.processInstanceId
+				});
+			}
+		});
 
-    $('.len-form-item .layui-btn,.select .layui-btn').on('click', function () {
-      var type = $(this).data('type');
-      active[type] ? active[type].call(this) : '';
-    });
+		$('.len-form-item .layui-btn,.select .layui-btn').on('click', function () {
+			var type = $(this).data('type');
+			active[type] ? active[type].call(this) : '';
+		});
 
-  });
+	});
 </script>
 </body>
 
diff --git a/len-activiti/src/main/resources/ftl/actList.ftl b/len-activiti/src/main/resources/ftl/actList.ftl
index 0b38f93..640a7ee 100644
--- a/len-activiti/src/main/resources/ftl/actList.ftl
+++ b/len-activiti/src/main/resources/ftl/actList.ftl
@@ -1,163 +1,162 @@
-
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="UTF-8">
-    <title>流程部署</title>
-<#include "/system/base/head.ftl">
+	<meta charset="UTF-8">
+	<title>流程部署</title>
+    <#include "/system/base/head.ftl">
 </head>
 
 <body>
 <div class="lenos-search">
-    <div class="search-select">
-        部署id：
-        <span class="layui-inline">
+	<div class="search-select">
+		部署id：
+		<span class="layui-inline">
       <input class="layui-input" height="20px" id="deploymentId" autocomplete="off">
     </span>
-        流程名称：
-        <span class="layui-inline">
+		流程名称：
+		<span class="layui-inline">
       <input class="layui-input" height="20px" id="name" autocomplete="off">
     </span>
-    </div>
+	</div>
 
 </div>
 <div class="layui-col-md12 len-button">
-    <div class="layui-btn-group">
+	<div class="layui-btn-group">
         <#include "/system/base/searth.ftl">
 
-<@shiro.hasPermission name="control:del">
-</@shiro.hasPermission>
-    </div>
+        <@shiro.hasPermission name="control:del">
+        </@shiro.hasPermission>
+	</div>
 </div>
 
 <table id="actList" width="100%" lay-filter="act"></table>
 <script type="text/html" id="actListToolBar">
-    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon">&#xe640;</i>删除</a>
+	<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon">&#xe640;</i>删除</a>
 </script>
 <script>
-    layui.laytpl.toDateString = function (d, format) {
-        var date = new Date(d || new Date())
-                , ymd = [
-            this.digit(date.getFullYear(), 4)
-            , this.digit(date.getMonth() + 1)
-            , this.digit(date.getDate())
-        ]
-                , hms = [
-            this.digit(date.getHours())
-            , this.digit(date.getMinutes())
-            , this.digit(date.getSeconds())
-        ];
-
-        format = format || 'yyyy-MM-dd HH:mm:ss';
-
-        return format.replace(/yyyy/g, ymd[0])
-                .replace(/MM/g, ymd[1])
-                .replace(/dd/g, ymd[2])
-                .replace(/HH/g, hms[0])
-                .replace(/mm/g, hms[1])
-                .replace(/ss/g, hms[2]);
-    };
-
-    //数字前置补零
-    layui.laytpl.digit = function (num, length, end) {
-        var str = '';
-        num = String(num);
-        length = length || 2;
-        for (var i = num.length; i < length; i++) {
-            str += '0';
-        }
-        return num < Math.pow(10, length) ? str + (num | 0) : num;
-    };
-
-    document.onkeydown = function (e) { // 回车提交表单
-        var theEvent = window.event || e;
-        var code = theEvent.keyCode || theEvent.which;
-        if (code == 13) {
-            $(".select .select-on").click();
-        }
-    }
-
-    layui.use('table', function () {
-        table = layui.table;
-        //方法级渲染
-        table.render({
-            id: 'actList',
-            elem: '#actList'
-            , url: 'act/showAct'
-            , cols: [[
-                {checkbox: true, fixed: true, width: '5%'}
-                , {field: 'id', title: '编号', width: '15%', sort: true}
-                , {field: 'name', title: '流程名称', width: '10%', sort: true}
-                , {field: 'key', title: 'key', width: '12%', sort: true}
-                , {field: 'deploymentId', title: '部署id', width: '5%', sort: true}
-                , {field: 'diagramResourceName', title: '流程图资源', width: '15%', sort: true}
-                , {field: 'category', title: '版本', width: '15%', sort: true}
-                , {field: 'resourceName', title: '资源名称', width: '10%', sort: true}
-                , {field: 'text', title: '操作', width: '10%', toolbar: '#actListToolBar'}
-
-            ]]
-            , page: true
-            , height: 'full-100'
-        });
-
-        var $ = layui.$, active = {
-            select: function () {
-                var deploymentId = $('#deploymentId').val();
-                var name = $('#name').val();
-                table.reload('actList', {
-                    where: {
-                        deploymentId: deploymentId,
-                        name: name
-                    }
-                });
-            }
-            , reload: function () {
-                $('#deploymentId').val('');
-                $('#name').val('');
-                table.reload('actList', {
-                    where: {
-                        deploymentId: null,
-                        name: null
-                    }
-                });
-            }
-        };
-        //监听工具条
-        table.on('tool(act)', function (obj) {
-            var data = obj.data;
-            if (obj.event === 'del') {
-                layer.confirm('将会删除正在执行的流程,确定删除？', {
-                    btn: ['确定', '取消'] //按钮
-                }, function () {
-                    del(data.deploymentId);
-                }, function () {
-                });
-            }
-        });
-
-        $('.len-form-item .layui-btn,.layui-col-md12 .layui-btn').on('click', function () {
-            var type = $(this).data('type');
-            active[type] ? active[type].call(this) : '';
-        });
-
-    });
-
-    function del(id) {
-        $.ajax({
-            url: "act/delDeploy",
-            type: "post",
-            data: {id: id},
-            dataType: "json", traditional: true,
-            success: function (d) {
-                if (d.flag) {
-                    layer.msg(d.msg, {icon: 6});
-                    layui.table.reload('actList');
-                } else {
-                    layer.msg(d.msg, {icon: 5});
-                }
-            }
-        });
-    }
+	layui.laytpl.toDateString = function (d, format) {
+		var date = new Date(d || new Date())
+			, ymd = [
+			this.digit(date.getFullYear(), 4)
+			, this.digit(date.getMonth() + 1)
+			, this.digit(date.getDate())
+		]
+			, hms = [
+			this.digit(date.getHours())
+			, this.digit(date.getMinutes())
+			, this.digit(date.getSeconds())
+		];
+
+		format = format || 'yyyy-MM-dd HH:mm:ss';
+
+		return format.replace(/yyyy/g, ymd[0])
+			.replace(/MM/g, ymd[1])
+			.replace(/dd/g, ymd[2])
+			.replace(/HH/g, hms[0])
+			.replace(/mm/g, hms[1])
+			.replace(/ss/g, hms[2]);
+	};
+
+	//数字前置补零
+	layui.laytpl.digit = function (num, length, end) {
+		var str = '';
+		num = String(num);
+		length = length || 2;
+		for (var i = num.length; i < length; i++) {
+			str += '0';
+		}
+		return num < Math.pow(10, length) ? str + (num | 0) : num;
+	};
+
+	document.onkeydown = function (e) { // 回车提交表单
+		var theEvent = window.event || e;
+		var code = theEvent.keyCode || theEvent.which;
+		if (code == 13) {
+			$(".select .select-on").click();
+		}
+	}
+
+	layui.use('table', function () {
+		table = layui.table;
+		//方法级渲染
+		table.render({
+			id: 'actList',
+			elem: '#actList'
+			, url: 'act/showAct'
+			, cols: [[
+				{checkbox: true, fixed: true, width: '5%'}
+				, {field: 'id', title: '编号', width: '15%', sort: true}
+				, {field: 'name', title: '流程名称', width: '10%', sort: true}
+				, {field: 'key', title: 'key', width: '12%', sort: true}
+				, {field: 'deploymentId', title: '部署id', width: '5%', sort: true}
+				, {field: 'diagramResourceName', title: '流程图资源', width: '15%', sort: true}
+				, {field: 'category', title: '版本', width: '15%', sort: true}
+				, {field: 'resourceName', title: '资源名称', width: '10%', sort: true}
+				, {field: 'text', title: '操作', width: '10%', toolbar: '#actListToolBar'}
+
+			]]
+			, page: true
+			, height: 'full-100'
+		});
+
+		var $ = layui.$, active = {
+			select: function () {
+				var deploymentId = $('#deploymentId').val();
+				var name = $('#name').val();
+				table.reload('actList', {
+					where: {
+						deploymentId: deploymentId,
+						name: name
+					}
+				});
+			}
+			, reload: function () {
+				$('#deploymentId').val('');
+				$('#name').val('');
+				table.reload('actList', {
+					where: {
+						deploymentId: null,
+						name: null
+					}
+				});
+			}
+		};
+		//监听工具条
+		table.on('tool(act)', function (obj) {
+			var data = obj.data;
+			if (obj.event === 'del') {
+				layer.confirm('将会删除正在执行的流程,确定删除？', {
+					btn: ['确定', '取消'] //按钮
+				}, function () {
+					del(data.deploymentId);
+				}, function () {
+				});
+			}
+		});
+
+		$('.len-form-item .layui-btn,.layui-col-md12 .layui-btn').on('click', function () {
+			var type = $(this).data('type');
+			active[type] ? active[type].call(this) : '';
+		});
+
+	});
+
+	function del(id) {
+		$.ajax({
+			url: "act/delDeploy",
+			type: "post",
+			data: {id: id},
+			dataType: "json", traditional: true,
+			success: function (d) {
+				if (d.flag) {
+					layer.msg(d.msg, {icon: 6});
+					layui.table.reload('actList');
+				} else {
+					layer.msg(d.msg, {icon: 5});
+				}
+			}
+		});
+	}
 
 
 </script>
diff --git a/len-activiti/src/main/resources/ftl/actModelList.ftl b/len-activiti/src/main/resources/ftl/actModelList.ftl
index e1ae8fe..910ee13 100644
--- a/len-activiti/src/main/resources/ftl/actModelList.ftl
+++ b/len-activiti/src/main/resources/ftl/actModelList.ftl
@@ -1,232 +1,232 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="UTF-8">
-    <title>模型列表</title>
-<#include "/system/base/head.ftl">
+	<meta charset="UTF-8">
+	<title>模型列表</title>
+    <#include "/system/base/head.ftl">
 </head>
 
 <body>
 <div class="lenos-search">
-    <div class="search-select">
-        模型名称：
-        <span class="layui-inline">
+	<div class="search-select">
+		模型名称：
+		<span class="layui-inline">
       <input class="layui-input" height="20px" id="name" autocomplete="off">
     </span>
-        key：
-        <span class="layui-inline">
+		key：
+		<span class="layui-inline">
       <input class="layui-input" height="20px" id="key" autocomplete="off">
     </span>
-    </div>
+	</div>
 
 </div>
 <div class="layui-col-md12 len-button">
-    <div class="layui-btn-group">
+	<div class="layui-btn-group">
         <#include "/system/base/searth.ftl">
         <@shiro.hasPermission name="control:del">
-            <button class="layui-btn layui-btn-normal layui-btn-sm" data-type="syncdata">
-                <i class="layui-icon">&#xe618;</i>同步数据
-            </button>
+			<button class="layui-btn layui-btn-normal layui-btn-sm" data-type="syncdata">
+				<i class="layui-icon">&#xe618;</i>同步数据
+			</button>
         </@shiro.hasPermission>
-        <button class="layui-btn layui-btn-normal layui-btn-sm" id="processGroup" data-type="add">
-            <i class="layui-icon">&#xe642;</i>新建流程
-        </button>
-    </div>
+		<button class="layui-btn layui-btn-normal layui-btn-sm" id="processGroup" data-type="add">
+			<i class="layui-icon">&#xe642;</i>新建流程
+		</button>
+	</div>
 </div>
 
 <table id="actModelList" width="100%" lay-filter="act"></table>
 <script type="text/html" id="modelToolBar">
-<#--    <shiro.hasPermission name="control:del">-->
-        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="update"><i class="layui-icon">&#xe640;</i>编辑</a>
-        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="open"><i class="layui-icon">&#xe640;</i>发布</a>
-        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon">&#xe640;</i>删除</a>
-<#--    </shiro.hasPermission>-->
+    <#--    <shiro.hasPermission name="control:del">-->
+	<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="update"><i class="layui-icon">&#xe640;</i>编辑</a>
+	<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="open"><i class="layui-icon">&#xe640;</i>发布</a>
+	<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"><i class="layui-icon">&#xe640;</i>删除</a>
+    <#--    </shiro.hasPermission>-->
 </script>
 <script>
-    layui.laytpl.toDateString = function (d, format) {
-        var date = new Date(d || new Date())
-                , ymd = [
-            this.digit(date.getFullYear(), 4)
-            , this.digit(date.getMonth() + 1)
-            , this.digit(date.getDate())
-        ]
-                , hms = [
-            this.digit(date.getHours())
-            , this.digit(date.getMinutes())
-            , this.digit(date.getSeconds())
-        ];
-
-        format = format || 'yyyy-MM-dd HH:mm:ss';
-
-        return format.replace(/yyyy/g, ymd[0])
-                .replace(/MM/g, ymd[1])
-                .replace(/dd/g, ymd[2])
-                .replace(/HH/g, hms[0])
-                .replace(/mm/g, hms[1])
-                .replace(/ss/g, hms[2]);
-    };
-    $('#processGroup').on('mouseover', function () {
-        layer.tips('设置流程节点的代办人/候选人/候选组，目前只开发到组', this, {time: 2000});
-    });
-    //数字前置补零
-    layui.laytpl.digit = function (num, length, end) {
-        var str = '';
-        num = String(num);
-        length = length || 2;
-        for (var i = num.length; i < length; i++) {
-            str += '0';
-        }
-        return num < Math.pow(10, length) ? str + (num | 0) : num;
-    };
-
-    document.onkeydown = function (e) { // 回车提交表单
-        var theEvent = window.event || e;
-        var code = theEvent.keyCode || theEvent.which;
-        if (code == 13) {
-            $(".select .select-on").click();
-        }
-    }
-
-    layui.use('table', function () {
-        table = layui.table;
-        //方法级渲染
-        table.render({
-            id: 'actModelList',
-            elem: '#actModelList'
-            , url: 'act/showAm'
-            , cols: [[
-                {checkbox: true, fixed: true, width: '5%'}
-                , {field: 'id', title: '编号', width: '10%', sort: true}
-                , {field: 'name', title: '流程名称', width: '10%', sort: true}
-                , {field: 'key', title: 'key', width: '10%', sort: true}
-                , {field: 'version', title: '版本', width: '10%', sort: true}
-                , {
-                    field: 'createTime',
-                    title: '创建时间',
-                    width: '20%',
-                    templet: '<div>{{ layui.laytpl.toDateString(d.createTime,"yyyy-MM-dd HH:mm:ss") }}</div>'
-                }
-                , {field: 'text', title: '操作', width: '20%', toolbar: '#modelToolBar'}
-
-            ]]
-            , page: true
-            , height: 'full-100'
-        });
-
-        var $ = layui.$, active = {
-            select: function () {
-                var name = $('#name').val();
-                var key = $('#key').val();
-                table.reload('actModelList', {
-                    where: {
-                        name: name,
-                        key: key
-                    }
-                });
-            },
-            syncdata: function () {
-                syncdata();
-            }
-            , reload: function () {
-                $('#name').val('');
-                $('#key').val('');
-                table.reload('actModelList', {
-                    where: {
-                        name: null,
-                        key: null
-                    }
-                });
-            }, add: function () {
-                var index = window.top.layer.open({
-                    id: 'act-add',
-                    type: 2,
-                    area: [$(window).width()+'px',$(window).height()+'px'],
-                    fix: false,
-                    maxmin: true,
-                    shadeClose: false,
-                    shade: 0.4,
-                    title: '添加流程',
-                    content: '/act/goActiviti'
-                });
-                layer.full(index);
-            }
-        };
-        //监听工具条
-        table.on('tool(act)', function (obj) {
-            var data = obj.data;
-            if (obj.event === 'open') {
-                open(data.id);
-            } else if (obj.event === 'update') {
-                var index = window.top.layer.open({
-                    id: 'act-update',
-                    type: 2,
-                    area: [$(window).width()+'px',$(window).height()+'px'],
-                    fix: false,
-                    maxmin: true,
-                    shadeClose: false,
-                    shade: 0.4,
-                    title: '编辑流程',
-                    content: '/act/actUpdate/' + data.id
-                });
-            } else if (obj.event === 'del') {
-                layer.confirm('确定删除[' + data.name + ']?', {
-                    btn: ['确定', '取消'] //按钮
-                }, function () {
-                    del(data.id);
-                }, function () {
-                });
-            }
-        });
-
-        $('.len-form-item .layui-btn,.layui-col-md12 .layui-btn').on('click', function () {
-            var type = $(this).data('type');
-            active[type] ? active[type].call(this) : '';
-        });
-
-    });
-
-    function del(id) {
-        $.ajax({
-            url: "act/delModel",
-            type: "post",
-            data: {id: id},
-            dataType: "json", traditional: true,
-            success: function (d) {
-                if (d.flag) {
-                    layer.msg(d.msg, {icon: 6});
-                    layui.table.reload('actModelList');
-                } else {
-                    layer.msg(d.msg, {icon: 5});
-                }
-            }
-        });
-    }
-
-    function syncdata() {
-       var index= layer.load(2);
-        $.ajax({
-            url: "act/syncdata",
-            type: "post",
-            dataType: "json", traditional: true,
-            success: function (data) {
-                layer.close(index)
-                layer.msg(data.msg, {icon: 6});
-            }
-        });
-    }
-
-    function open(id) {
-        $.ajax({
-            url: "act/open",
-            type: "post",
-            data: {id: id},
-            dataType: "json", traditional: true,
-            success: function d(data) {
-                layer.msg(data.msg, {icon: 6});
-                layui.table.reload('actModelList');
-            }
-        });
-    }
+	layui.laytpl.toDateString = function (d, format) {
+		var date = new Date(d || new Date())
+			, ymd = [
+			this.digit(date.getFullYear(), 4)
+			, this.digit(date.getMonth() + 1)
+			, this.digit(date.getDate())
+		]
+			, hms = [
+			this.digit(date.getHours())
+			, this.digit(date.getMinutes())
+			, this.digit(date.getSeconds())
+		];
+
+		format = format || 'yyyy-MM-dd HH:mm:ss';
+
+		return format.replace(/yyyy/g, ymd[0])
+			.replace(/MM/g, ymd[1])
+			.replace(/dd/g, ymd[2])
+			.replace(/HH/g, hms[0])
+			.replace(/mm/g, hms[1])
+			.replace(/ss/g, hms[2]);
+	};
+	$('#processGroup').on('mouseover', function () {
+		layer.tips('设置流程节点的代办人/候选人/候选组，目前只开发到组', this, {time: 2000});
+	});
+	//数字前置补零
+	layui.laytpl.digit = function (num, length, end) {
+		var str = '';
+		num = String(num);
+		length = length || 2;
+		for (var i = num.length; i < length; i++) {
+			str += '0';
+		}
+		return num < Math.pow(10, length) ? str + (num | 0) : num;
+	};
+
+	document.onkeydown = function (e) { // 回车提交表单
+		var theEvent = window.event || e;
+		var code = theEvent.keyCode || theEvent.which;
+		if (code == 13) {
+			$(".select .select-on").click();
+		}
+	}
+
+	layui.use('table', function () {
+		table = layui.table;
+		//方法级渲染
+		table.render({
+			id: 'actModelList',
+			elem: '#actModelList'
+			, url: 'act/showAm'
+			, cols: [[
+				{checkbox: true, fixed: true, width: '5%'}
+				, {field: 'id', title: '编号', width: '10%', sort: true}
+				, {field: 'name', title: '流程名称', width: '10%', sort: true}
+				, {field: 'key', title: 'key', width: '10%', sort: true}
+				, {field: 'version', title: '版本', width: '10%', sort: true}
+				, {
+					field: 'createTime',
+					title: '创建时间',
+					width: '20%',
+					templet: '<div>{{ layui.laytpl.toDateString(d.createTime,"yyyy-MM-dd HH:mm:ss") }}</div>'
+				}
+				, {field: 'text', title: '操作', width: '20%', toolbar: '#modelToolBar'}
+
+			]]
+			, page: true
+			, height: 'full-100'
+		});
+
+		var $ = layui.$, active = {
+			select: function () {
+				var name = $('#name').val();
+				var key = $('#key').val();
+				table.reload('actModelList', {
+					where: {
+						name: name,
+						key: key
+					}
+				});
+			},
+			syncdata: function () {
+				syncdata();
+			}
+			, reload: function () {
+				$('#name').val('');
+				$('#key').val('');
+				table.reload('actModelList', {
+					where: {
+						name: null,
+						key: null
+					}
+				});
+			}, add: function () {
+				var index = window.top.layer.open({
+					id: 'act-add',
+					type: 2,
+					area: [$(window).width() + 'px', $(window).height() + 'px'],
+					fix: false,
+					maxmin: true,
+					shadeClose: false,
+					shade: 0.4,
+					title: '添加流程',
+					content: '/act/goActiviti'
+				});
+				layer.full(index);
+			}
+		};
+		//监听工具条
+		table.on('tool(act)', function (obj) {
+			var data = obj.data;
+			if (obj.event === 'open') {
+				open(data.id);
+			} else if (obj.event === 'update') {
+				var index = window.top.layer.open({
+					id: 'act-update',
+					type: 2,
+					area: [$(window).width() + 'px', $(window).height() + 'px'],
+					fix: false,
+					maxmin: true,
+					shadeClose: false,
+					shade: 0.4,
+					title: '编辑流程',
+					content: '/act/actUpdate/' + data.id
+				});
+			} else if (obj.event === 'del') {
+				layer.confirm('确定删除[' + data.name + ']?', {
+					btn: ['确定', '取消'] //按钮
+				}, function () {
+					del(data.id);
+				}, function () {
+				});
+			}
+		});
+
+		$('.len-form-item .layui-btn,.layui-col-md12 .layui-btn').on('click', function () {
+			var type = $(this).data('type');
+			active[type] ? active[type].call(this) : '';
+		});
+
+	});
+
+	function del(id) {
+		$.ajax({
+			url: "act/delModel",
+			type: "post",
+			data: {id: id},
+			dataType: "json", traditional: true,
+			success: function (d) {
+				if (d.flag) {
+					layer.msg(d.msg, {icon: 6});
+					layui.table.reload('actModelList');
+				} else {
+					layer.msg(d.msg, {icon: 5});
+				}
+			}
+		});
+	}
+
+	function syncdata() {
+		var index = layer.load(2);
+		$.ajax({
+			url: "act/syncdata",
+			type: "post",
+			dataType: "json", traditional: true,
+			success: function (data) {
+				layer.close(index)
+				layer.msg(data.msg, {icon: 6});
+			}
+		});
+	}
+
+	function open(id) {
+		$.ajax({
+			url: "act/open",
+			type: "post",
+			data: {id: id},
+			dataType: "json", traditional: true,
+			success: function d(data) {
+				layer.msg(data.msg, {icon: 6});
+				layui.table.reload('actModelList');
+			}
+		});
+	}
 
 </script>
 </body>
diff --git a/len-activiti/src/main/resources/mapper/ActAssigneeMapper.xml b/len-activiti/src/main/resources/mapper/ActAssigneeMapper.xml
index 50a3ce1..6430c38 100644
--- a/len-activiti/src/main/resources/mapper/ActAssigneeMapper.xml
+++ b/len-activiti/src/main/resources/mapper/ActAssigneeMapper.xml
@@ -1,31 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.len.mapper.ActAssigneeMapper">
-  <resultMap id="BaseResultMap" type="com.len.entity.ActAssignee">
-    <!--
-      WARNING - @mbg.generated
-    -->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="sid" jdbcType="VARCHAR" property="sid" />
-    <result column="assignee" jdbcType="VARCHAR" property="assignee" />
-    <result column="role_id" jdbcType="VARCHAR" property="roleId" />
-    <result column="assignee_type" jdbcType="INTEGER" property="assigneeType" />
-    <result column="activti_name" jdbcType="VARCHAR" property="activtiName" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    id, sid, assignee, role_id, assignee_type, activti_name
-  </sql>
-  <select id="selectListByPage" parameterType="com.len.entity.ActAssignee" resultMap="BaseResultMap">
-    SELECT <include refid="Base_Column_List"/>
-    from act_assignee
-    <where>
-      <if test="sid!=null and sid!=''"> and sid = #{sid}</if>
-      <if test="roleId!=null and roleId!=''"> and role_id = #{roleId}</if>
-    </where>
-  </select>
+	<resultMap id="BaseResultMap" type="com.len.entity.ActAssignee">
+		<!--
+		  WARNING - @mbg.generated
+		-->
+		<id column="id" jdbcType="VARCHAR" property="id"/>
+		<result column="sid" jdbcType="VARCHAR" property="sid"/>
+		<result column="assignee" jdbcType="VARCHAR" property="assignee"/>
+		<result column="role_id" jdbcType="VARCHAR" property="roleId"/>
+		<result column="assignee_type" jdbcType="INTEGER" property="assigneeType"/>
+		<result column="activti_name" jdbcType="VARCHAR" property="activtiName"/>
+	</resultMap>
+	<sql id="Base_Column_List">
+		id
+		, sid, assignee, role_id, assignee_type, activti_name
+	</sql>
+	<select id="selectListByPage" parameterType="com.len.entity.ActAssignee" resultMap="BaseResultMap">
+		SELECT
+		<include refid="Base_Column_List"/>
+		from act_assignee
+		<where>
+			<if test="sid!=null and sid!=''">and sid = #{sid}</if>
+			<if test="roleId!=null and roleId!=''">and role_id = #{roleId}</if>
+		</where>
+	</select>
 
-  <delete id="deleteByNodeId" parameterType="java.lang.String">
-    delete from act_assignee
-    where sid = #{sid,jdbcType=VARCHAR}
-  </delete>
-</mapper>
\ No newline at end of file
+	<delete id="deleteByNodeId" parameterType="java.lang.String">
+		delete
+		from act_assignee
+		where sid = #{sid,jdbcType=VARCHAR}
+	</delete>
+</mapper>
diff --git a/len-activiti/src/main/resources/mapper/UserLeaveMapper.xml b/len-activiti/src/main/resources/mapper/UserLeaveMapper.xml
index d6a1a8e..5650b6e 100644
--- a/len-activiti/src/main/resources/mapper/UserLeaveMapper.xml
+++ b/len-activiti/src/main/resources/mapper/UserLeaveMapper.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.len.mapper.UserLeaveMapper">
-  <resultMap id="BaseResultMap" type="com.len.entity.UserLeave">
-    <!--
-      WARNING - @mbg.generated
-    -->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="user_id" jdbcType="VARCHAR" property="userId" />
-    <result column="user_name" jdbcType="VARCHAR" property="userName" />
-    <result column="begin_time" jdbcType="TIMESTAMP" property="beginTime" />
-    <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
-    <result column="reason" jdbcType="VARCHAR" property="reason" />
-    <result column="days" jdbcType="INTEGER" property="days" />
-    <result column="process_instance_Id" jdbcType="VARCHAR" property="processInstanceId" />
-    <result column="status" jdbcType="VARCHAR" property="status" />
-    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
-    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
-    <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
-    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
-  </resultMap>
+	<resultMap id="BaseResultMap" type="com.len.entity.UserLeave">
+		<!--
+		  WARNING - @mbg.generated
+		-->
+		<id column="id" jdbcType="VARCHAR" property="id"/>
+		<result column="user_id" jdbcType="VARCHAR" property="userId"/>
+		<result column="user_name" jdbcType="VARCHAR" property="userName"/>
+		<result column="begin_time" jdbcType="TIMESTAMP" property="beginTime"/>
+		<result column="end_time" jdbcType="TIMESTAMP" property="endTime"/>
+		<result column="reason" jdbcType="VARCHAR" property="reason"/>
+		<result column="days" jdbcType="INTEGER" property="days"/>
+		<result column="process_instance_Id" jdbcType="VARCHAR" property="processInstanceId"/>
+		<result column="status" jdbcType="VARCHAR" property="status"/>
+		<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
+		<result column="create_by" jdbcType="VARCHAR" property="createBy"/>
+		<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
+		<result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+	</resultMap>
 
-  <select id="selectListByPage" parameterType="com.len.entity.UserLeave" resultMap="BaseResultMap">
-    SELECT *
-    from user_leave
-    <where>
-      <if test="userId!=null and userId!=''">and user_id=#{userId}</if>
-      <if test="beginTime!=null">
-        <![CDATA[   and DATE_FORMAT(begin_time, '%Y-%m-%d')>=  DATE_FORMAT(#{beginTime}, '%Y-%m-%d')   ]]>
-      </if>
-      <if test="endTime!=null">
-        <![CDATA[  and DATE_FORMAT(end_time, '%Y-%m-%d') <= DATE_FORMAT(#{endTime}, '%Y-%m-%d')    ]]>
-      </if>
-    </where>
-    order by create_date desc
-  </select>
-</mapper>
\ No newline at end of file
+	<select id="selectListByPage" parameterType="com.len.entity.UserLeave" resultMap="BaseResultMap">
+		SELECT *
+		from user_leave
+		<where>
+			<if test="userId!=null and userId!=''">and user_id=#{userId}</if>
+			<if test="beginTime!=null">
+				<![CDATA[   and DATE_FORMAT(begin_time, '%Y-%m-%d')>=  DATE_FORMAT(#{beginTime}, '%Y-%m-%d')   ]]>
+			</if>
+			<if test="endTime!=null">
+				<![CDATA[  and DATE_FORMAT(end_time, '%Y-%m-%d') <= DATE_FORMAT(#{endTime}, '%Y-%m-%d')    ]]>
+			</if>
+		</where>
+		order by create_date desc
+	</select>
+</mapper>
diff --git a/len-activiti/src/main/resources/plugin/activiti.js b/len-activiti/src/main/resources/plugin/activiti.js
index aa0038c..2aba670 100644
--- a/len-activiti/src/main/resources/plugin/activiti.js
+++ b/len-activiti/src/main/resources/plugin/activiti.js
@@ -1,29 +1,29 @@
 var activiti = {
 
-    /**
-     *
-     * @param processInstanceId 流程实例ID
-     * @param w 宽
-     * @param h 高
-     */
-    img: function (processInstanceId, w, h) {
-        if (typeof w==='undefined') {
-            w = $(window).width();
-        }
-        if (typeof h==='undefined') {
-            h = $(window).height();
-        }
-        window.parent.layer.open({
-            id: Math.floor(Math.random() * 1000),
-            type: 2,
-            area: [w + 'px', h + 'px'],
-            fix: false,
-            maxmin: true,
-            shadeClose: false,
-            shade: 0.4,
-            title: '流程图',
-            content: '/act/shinePics/' + processInstanceId
-        });
-    }
+	/**
+	 *
+	 * @param processInstanceId 流程实例ID
+	 * @param w 宽
+	 * @param h 高
+	 */
+	img: function (processInstanceId, w, h) {
+		if (typeof w === 'undefined') {
+			w = $(window).width();
+		}
+		if (typeof h === 'undefined') {
+			h = $(window).height();
+		}
+		window.parent.layer.open({
+			id: Math.floor(Math.random() * 1000),
+			type: 2,
+			area: [w + 'px', h + 'px'],
+			fix: false,
+			maxmin: true,
+			shadeClose: false,
+			shade: 0.4,
+			title: '流程图',
+			content: '/act/shinePics/' + processInstanceId
+		});
+	}
 
-};
\ No newline at end of file
+};
diff --git a/len-activiti/src/main/resources/properties/activiti.properties b/len-activiti/src/main/resources/properties/activiti.properties
index 6e60425..727aff0 100644
--- a/len-activiti/src/main/resources/properties/activiti.properties
+++ b/len-activiti/src/main/resources/properties/activiti.properties
@@ -1,3 +1,2 @@
-
 # 演示模型禁止删除
 modelId=142517
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/diagram-viewer/index.html b/len-activiti/src/main/resources/static/diagram-viewer/index.html
index 66a8c4f..e6cf384 100644
--- a/len-activiti/src/main/resources/static/diagram-viewer/index.html
+++ b/len-activiti/src/main/resources/static/diagram-viewer/index.html
@@ -1,128 +1,129 @@
 <html>
 <head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  
-  <link rel="stylesheet" href="style.css" type="text/css" media="screen">
-  <script src="js/jstools.js" type="text/javascript" charset="utf-8"></script>
-  <script src="js/raphael.js" type="text/javascript" charset="utf-8"></script>
-  
-  <script src="js/jquery/jquery.js" type="text/javascript" charset="utf-8"></script>
-  <script src="js/jquery/jquery.progressbar.js" type="text/javascript" charset="utf-8"></script>
-  <script src="js/jquery/jquery.asyncqueue.js" type="text/javascript" charset="utf-8"></script>
-  
-  <script src="js/Color.js" type="text/javascript" charset="utf-8"></script>
-  <script src="js/Polyline.js" type="text/javascript" charset="utf-8"></script>
-  <script src="js/ActivityImpl.js" type="text/javascript" charset="utf-8"></script>
-  <script src="js/ActivitiRest.js" type="text/javascript" charset="utf-8"></script>
-  <script src="js/LineBreakMeasurer.js" type="text/javascript" charset="utf-8"></script>
-  <script src="js/ProcessDiagramGenerator.js" type="text/javascript" charset="utf-8"></script>
-  <script src="js/ProcessDiagramCanvas.js" type="text/javascript" charset="utf-8"></script>
-  
-  <style type="text/css" media="screen">
-    
-  </style>
+	<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+
+	<link href="style.css" media="screen" rel="stylesheet" type="text/css">
+	<script charset="utf-8" src="js/jstools.js" type="text/javascript"></script>
+	<script charset="utf-8" src="js/raphael.js" type="text/javascript"></script>
+
+	<script charset="utf-8" src="js/jquery/jquery.js" type="text/javascript"></script>
+	<script charset="utf-8" src="js/jquery/jquery.progressbar.js" type="text/javascript"></script>
+	<script charset="utf-8" src="js/jquery/jquery.asyncqueue.js" type="text/javascript"></script>
+
+	<script charset="utf-8" src="js/Color.js" type="text/javascript"></script>
+	<script charset="utf-8" src="js/Polyline.js" type="text/javascript"></script>
+	<script charset="utf-8" src="js/ActivityImpl.js" type="text/javascript"></script>
+	<script charset="utf-8" src="js/ActivitiRest.js" type="text/javascript"></script>
+	<script charset="utf-8" src="js/LineBreakMeasurer.js" type="text/javascript"></script>
+	<script charset="utf-8" src="js/ProcessDiagramGenerator.js" type="text/javascript"></script>
+	<script charset="utf-8" src="js/ProcessDiagramCanvas.js" type="text/javascript"></script>
+
+	<style media="screen" type="text/css">
+
+	</style>
 </head>
 <body>
 <div class="wrapper">
-  <div id="pb1"></div>
-  <div id="overlayBox" >
-    <div id="diagramBreadCrumbs" class="diagramBreadCrumbs" onmousedown="return false" onselectstart="return false"></div>
-    <div id="diagramHolder" class="diagramHolder"></div>
-    <div class="diagram-info" id="diagramInfo"></div>
-  </div>
+	<div id="pb1"></div>
+	<div id="overlayBox">
+		<div class="diagramBreadCrumbs" id="diagramBreadCrumbs" onmousedown="return false"
+			 onselectstart="return false"></div>
+		<div class="diagramHolder" id="diagramHolder"></div>
+		<div class="diagram-info" id="diagramInfo"></div>
+	</div>
 </div>
 <script language='javascript'>
-var DiagramGenerator = {};
-var pb1;
-$(document).ready(function(){
-  var query_string = {};
-  var query = window.location.search.substring(1);
-  var vars = query.split("&");
-  for (var i=0;i<vars.length;i++) {
-    var pair = vars[i].split("=");
-    query_string[pair[0]] = pair[1];
-  } 
-  
-  var processDefinitionId = query_string["processDefinitionId"];
-  var processInstanceId = query_string["processInstanceId"];
-  
-  console.log("Initialize progress bar");
-  
-  pb1 = new $.ProgressBar({
-    boundingBox: '#pb1',
-    label: 'Progressbar!',
-    on: {
-      complete: function() {
-        console.log("Progress Bar COMPLETE");
-        this.set('label', 'complete!');
-        if (processInstanceId) {
-          ProcessDiagramGenerator.drawHighLights(processInstanceId);
-        }
-      },
-      valueChange: function(e) {
-        this.set('label', e.newVal + '%');
-      }
-    },
-    value: 0
-  });
-  console.log("Progress bar inited");
-  
-  ProcessDiagramGenerator.options = {
-    diagramBreadCrumbsId: "diagramBreadCrumbs",
-    diagramHolderId: "diagramHolder",
-    diagramInfoId: "diagramInfo",
-    on: {
-      click: function(canvas, element, contextObject){
-        var mouseEvent = this;
-        console.log("[CLICK] mouseEvent: %o, canvas: %o, clicked element: %o, contextObject: %o", mouseEvent, canvas, element, contextObject);
-
-        if (contextObject.getProperty("type") == "callActivity") {
-          var processDefinitonKey = contextObject.getProperty("processDefinitonKey");
-          var processDefinitons = contextObject.getProperty("processDefinitons");
-          var processDefiniton = processDefinitons[0];
-          console.log("Load callActivity '" + processDefiniton.processDefinitionKey + "', contextObject: ", contextObject);
-
-          // Load processDefinition
-        ProcessDiagramGenerator.drawDiagram(processDefiniton.processDefinitionId);
-        }
-      },
-      rightClick: function(canvas, element, contextObject){
-        var mouseEvent = this;
-        console.log("[RIGHTCLICK] mouseEvent: %o, canvas: %o, clicked element: %o, contextObject: %o", mouseEvent, canvas, element, contextObject);
-      },
-      over: function(canvas, element, contextObject){
-        var mouseEvent = this;
-        //console.log("[OVER] mouseEvent: %o, canvas: %o, clicked element: %o, contextObject: %o", mouseEvent, canvas, element, contextObject);
-
-        // TODO: show tooltip-window with contextObject info
-        ProcessDiagramGenerator.showActivityInfo(contextObject);
-      },
-      out: function(canvas, element, contextObject){
-        var mouseEvent = this;
-        //console.log("[OUT] mouseEvent: %o, canvas: %o, clicked element: %o, contextObject: %o", mouseEvent, canvas, element, contextObject);
-
-        ProcessDiagramGenerator.hideInfo();
-      }
-    }
-  };
-  
-  var baseUrl = window.document.location.protocol + "//" + window.document.location.host + "/";
-  var shortenedUrl = window.document.location.href.replace(baseUrl, "");
-  baseUrl = baseUrl + shortenedUrl.substring(0, shortenedUrl.indexOf("/"));
-  
-  ActivitiRest.options = {
-    processInstanceHighLightsUrl: baseUrl + "/service/process-instance/{processInstanceId}/highlights?callback=?",
-    processDefinitionUrl: baseUrl + "/service/process-definition/{processDefinitionId}/diagram-layout?callback=?",
-    processDefinitionByKeyUrl: baseUrl + "/service/process-definition/{processDefinitionKey}/diagram-layout?callback=?"
-  };
-  
-  if (processDefinitionId) {
-    ProcessDiagramGenerator.drawDiagram(processDefinitionId);
-    
-  } else {
-    alert("processDefinitionId parameter is required");
-  }
-});
+	var DiagramGenerator = {};
+	var pb1;
+	$(document).ready(function () {
+		var query_string = {};
+		var query = window.location.search.substring(1);
+		var vars = query.split("&");
+		for (var i = 0; i < vars.length; i++) {
+			var pair = vars[i].split("=");
+			query_string[pair[0]] = pair[1];
+		}
+
+		var processDefinitionId = query_string["processDefinitionId"];
+		var processInstanceId = query_string["processInstanceId"];
+
+		console.log("Initialize progress bar");
+
+		pb1 = new $.ProgressBar({
+			boundingBox: '#pb1',
+			label: 'Progressbar!',
+			on: {
+				complete: function () {
+					console.log("Progress Bar COMPLETE");
+					this.set('label', 'complete!');
+					if (processInstanceId) {
+						ProcessDiagramGenerator.drawHighLights(processInstanceId);
+					}
+				},
+				valueChange: function (e) {
+					this.set('label', e.newVal + '%');
+				}
+			},
+			value: 0
+		});
+		console.log("Progress bar inited");
+
+		ProcessDiagramGenerator.options = {
+			diagramBreadCrumbsId: "diagramBreadCrumbs",
+			diagramHolderId: "diagramHolder",
+			diagramInfoId: "diagramInfo",
+			on: {
+				click: function (canvas, element, contextObject) {
+					var mouseEvent = this;
+					console.log("[CLICK] mouseEvent: %o, canvas: %o, clicked element: %o, contextObject: %o", mouseEvent, canvas, element, contextObject);
+
+					if (contextObject.getProperty("type") == "callActivity") {
+						var processDefinitonKey = contextObject.getProperty("processDefinitonKey");
+						var processDefinitons = contextObject.getProperty("processDefinitons");
+						var processDefiniton = processDefinitons[0];
+						console.log("Load callActivity '" + processDefiniton.processDefinitionKey + "', contextObject: ", contextObject);
+
+						// Load processDefinition
+						ProcessDiagramGenerator.drawDiagram(processDefiniton.processDefinitionId);
+					}
+				},
+				rightClick: function (canvas, element, contextObject) {
+					var mouseEvent = this;
+					console.log("[RIGHTCLICK] mouseEvent: %o, canvas: %o, clicked element: %o, contextObject: %o", mouseEvent, canvas, element, contextObject);
+				},
+				over: function (canvas, element, contextObject) {
+					var mouseEvent = this;
+					//console.log("[OVER] mouseEvent: %o, canvas: %o, clicked element: %o, contextObject: %o", mouseEvent, canvas, element, contextObject);
+
+					// TODO: show tooltip-window with contextObject info
+					ProcessDiagramGenerator.showActivityInfo(contextObject);
+				},
+				out: function (canvas, element, contextObject) {
+					var mouseEvent = this;
+					//console.log("[OUT] mouseEvent: %o, canvas: %o, clicked element: %o, contextObject: %o", mouseEvent, canvas, element, contextObject);
+
+					ProcessDiagramGenerator.hideInfo();
+				}
+			}
+		};
+
+		var baseUrl = window.document.location.protocol + "//" + window.document.location.host + "/";
+		var shortenedUrl = window.document.location.href.replace(baseUrl, "");
+		baseUrl = baseUrl + shortenedUrl.substring(0, shortenedUrl.indexOf("/"));
+
+		ActivitiRest.options = {
+			processInstanceHighLightsUrl: baseUrl + "/service/process-instance/{processInstanceId}/highlights?callback=?",
+			processDefinitionUrl: baseUrl + "/service/process-definition/{processDefinitionId}/diagram-layout?callback=?",
+			processDefinitionByKeyUrl: baseUrl + "/service/process-definition/{processDefinitionKey}/diagram-layout?callback=?"
+		};
+
+		if (processDefinitionId) {
+			ProcessDiagramGenerator.drawDiagram(processDefinitionId);
+
+		} else {
+			alert("processDefinitionId parameter is required");
+		}
+	});
 
 
 </script>
diff --git a/len-activiti/src/main/resources/static/diagram-viewer/js/ActivitiRest.js b/len-activiti/src/main/resources/static/diagram-viewer/js/ActivitiRest.js
index 1afd90e..69a0499 100644
--- a/len-activiti/src/main/resources/static/diagram-viewer/js/ActivitiRest.js
+++ b/len-activiti/src/main/resources/static/diagram-viewer/js/ActivitiRest.js
@@ -1,37 +1,37 @@
 var ActivitiRest = {
 	options: {},
-	getProcessDefinitionByKey: function(processDefinitionKey, callback) {
+	getProcessDefinitionByKey: function (processDefinitionKey, callback) {
 		var url = Lang.sub(this.options.processDefinitionByKeyUrl, {processDefinitionKey: processDefinitionKey});
-		
+
 		$.ajax({
 			url: url,
 			dataType: 'jsonp',
 			cache: false,
 			async: true,
-			success: function(data, textStatus) {
+			success: function (data, textStatus) {
 				var processDefinition = data;
 				if (!processDefinition) {
 					console.error("Process definition '" + processDefinitionKey + "' not found");
 				} else {
-				  callback.apply({processDefinitionId: processDefinition.id});
+					callback.apply({processDefinitionId: processDefinition.id});
 				}
 			}
-		}).done(function(data, textStatus) {
+		}).done(function (data, textStatus) {
 			console.log("ajax done");
-		}).fail(function(jqXHR, textStatus, error){
-			console.error('Get diagram layout['+processDefinitionKey+'] failure: ', textStatus, 'error: ', error, jqXHR);
+		}).fail(function (jqXHR, textStatus, error) {
+			console.error('Get diagram layout[' + processDefinitionKey + '] failure: ', textStatus, 'error: ', error, jqXHR);
 		});
 	},
-	
-	getProcessDefinition: function(processDefinitionId, callback) {
+
+	getProcessDefinition: function (processDefinitionId, callback) {
 		var url = Lang.sub(this.options.processDefinitionUrl, {processDefinitionId: processDefinitionId});
-		
+
 		$.ajax({
 			url: url,
 			dataType: 'jsonp',
 			cache: false,
 			async: true,
-			success: function(data, textStatus) {
+			success: function (data, textStatus) {
 				var processDefinitionDiagramLayout = data;
 				if (!processDefinitionDiagramLayout) {
 					console.error("Process definition diagram layout '" + processDefinitionId + "' not found");
@@ -40,22 +40,22 @@ var ActivitiRest = {
 					callback.apply({processDefinitionDiagramLayout: processDefinitionDiagramLayout});
 				}
 			}
-		}).done(function(data, textStatus) {
+		}).done(function (data, textStatus) {
 			console.log("ajax done");
-		}).fail(function(jqXHR, textStatus, error){
-			console.log('Get diagram layout['+processDefinitionId+'] failure: ', textStatus, jqXHR);
+		}).fail(function (jqXHR, textStatus, error) {
+			console.log('Get diagram layout[' + processDefinitionId + '] failure: ', textStatus, jqXHR);
 		});
 	},
-	
-	getHighLights: function(processInstanceId, callback) {
+
+	getHighLights: function (processInstanceId, callback) {
 		var url = Lang.sub(this.options.processInstanceHighLightsUrl, {processInstanceId: processInstanceId});
-		
+
 		$.ajax({
 			url: url,
 			dataType: 'jsonp',
 			cache: false,
 			async: true,
-			success: function(data, textStatus) {
+			success: function (data, textStatus) {
 				console.log("ajax returned data");
 				var highLights = data;
 				if (!highLights) {
@@ -65,10 +65,10 @@ var ActivitiRest = {
 					callback.apply({highLights: highLights});
 				}
 			}
-		}).done(function(data, textStatus) {
+		}).done(function (data, textStatus) {
 			console.log("ajax done");
-		}).fail(function(jqXHR, textStatus, error){
-		  console.log('Get HighLights['+processInstanceId+'] failure: ', textStatus, jqXHR);
+		}).fail(function (jqXHR, textStatus, error) {
+			console.log('Get HighLights[' + processInstanceId + '] failure: ', textStatus, jqXHR);
 		});
 	}
-};
\ No newline at end of file
+};
diff --git a/len-activiti/src/main/resources/static/diagram-viewer/js/ActivityImpl.js b/len-activiti/src/main/resources/static/diagram-viewer/js/ActivityImpl.js
index f310211..4df63e0 100644
--- a/len-activiti/src/main/resources/static/diagram-viewer/js/ActivityImpl.js
+++ b/len-activiti/src/main/resources/static/diagram-viewer/js/ActivityImpl.js
@@ -1 +1,195 @@
-/**
 * 
 * @author Tom Baeyens
 * @author (Javascript) Dmitry Farafonov
 */
 
var ActivityImpl = function(activityJson){
	this.outgoingTransitions = [];
	this.outgoingTransitions = [];
	this.incomingTransitions = [];
	this.activityBehavior = null;
	this.parent = null;
	this.isScope = false;
	this.isAsync = false;
	this.isExclusive = false;
	this.x = -1;
	this.y = -1;
	this.width = -1;
	this.height = -1;
	this.properties = {};
	
	//console.log("activityJson: ", activityJson);
	
	if (activityJson != undefined) {
		this.setId(activityJson.activityId);
				
		for (var propertyName in activityJson.properties) {
			this.setProperty(propertyName, activityJson.properties[propertyName]);
		}
		//this.setProperty("name", activityJson.activityName);
		//this.setProperty("type", activityJson.activityType);
		this.setX(activityJson.x);
		this.setY(activityJson.y);
		this.setWidth(activityJson.width);
		this.setHeight(activityJson.height);
		
		if (activityJson.multiInstance)
			this.setProperty("multiInstance", activityJson.multiInstance);
		if (activityJson.collapsed) {
			this.setProperty("collapsed", activityJson.collapsed);
		}
		if (activityJson.isInterrupting != undefined)
			this.setProperty("isInterrupting", activityJson.isInterrupting);
	}
};

ActivityImpl.prototype = {
	outgoingTransitions: [],
	outgoingTransitions: [],
	incomingTransitions: [],
	activityBehavior: null,
	parent: null,
	isScope: false,
	isAsync: false,
	isExclusive: false,
	
	id: null,
	
	properties: {},
	
	// Graphical information
	x: -1,
	y: -1,
	width: -1,
	height: -1,
	
	setId: function(id){
		this.id = id;
	},
	
	getId: function(){
		return this.id;
	},
	
	
	setProperty: function(name, value){
		this.properties[name] = value;
	},
	getProperty: function(name){
		return this.properties[name];
	},
	
	createOutgoingTransition: function(transitionId){
	
	},
	
	toString: function(id) {
		return "Activity("+id+")";
	},
	
	getParentActivity: function(){
	/*
		if (parent instanceof ActivityImpl) {
79       return (ActivityImpl) parent;
80     }
81     return null;
	*/
	return this.parent;
	},
	
	// restricted setters ///////////////////////////////////////////////////////
	
	setOutgoingTransitions: function(outgoingTransitions){
		this.outgoingTransitions = outgoingTransitions;
	},
	
	setParent: function(parent){
		this.parent = parent;
	},
	
	setIncomingTransitions: function(incomingTransitions){
		this.incomingTransitions = incomingTransitions;
	},
	
	// getters and setters //////////////////////////////////////////////////////
	
	getOutgoingTransitions: function(){
		return this.outgoingTransitions;
	},
	
	getActivityBehavior: function(){
		return this.activityBehavior;
	},
	
	setActivityBehavior: function(activityBehavior){
		this.activityBehavior = activityBehavior;
	},
	
	getParent: function(){
		return this.parent;
	},
	
	getIncomingTransitions: function(){
		return this.incomingTransitions;
	},
	
	isScope: function(){
		return this.isScope;
	},
	
	setScope: function(isScope){
		this.isScope = isScope;
	},
	
	getX: function(){
		return this.x;
	},
	
	setX: function(x){
		this.x = x;
	},
	
	getY: function(){
		return this.y;
	},
	
	setY: function(y){
		this.y = y;
	},
	
	getWidth: function(){
		return this.width;
	},
	
	setWidth: function(width){
		this.width = width;
	},
	
	getHeight: function(){
		return this.height;
	},
	
	setHeight: function(height){
		this.height = height;
	},
	
  isAsync: function() {
    return this.isAsync;
  },
  
  setAsync: function(isAsync) {
    this.isAsync = isAsync;
  },
  
  isExclusive: function() {
    return this.isExclusive;
  },
    
  setExclusive: function(isExclusive) {
    this.isExclusive = isExclusive;
  },
	
	vvoid: function(){}
};
\ No newline at end of file
+/**
+ *
+ * @author Tom Baeyens
+ * @author (Javascript) Dmitry Farafonov
+ */
+
+var ActivityImpl = function (activityJson) {
+	this.outgoingTransitions = [];
+	this.outgoingTransitions = [];
+	this.incomingTransitions = [];
+	this.activityBehavior = null;
+	this.parent = null;
+	this.isScope = false;
+	this.isAsync = false;
+	this.isExclusive = false;
+	this.x = -1;
+	this.y = -1;
+	this.width = -1;
+	this.height = -1;
+	this.properties = {};
+
+	//console.log("activityJson: ", activityJson);
+
+	if (activityJson != undefined) {
+		this.setId(activityJson.activityId);
+
+		for (var propertyName in activityJson.properties) {
+			this.setProperty(propertyName, activityJson.properties[propertyName]);
+		}
+		//this.setProperty("name", activityJson.activityName);
+		//this.setProperty("type", activityJson.activityType);
+		this.setX(activityJson.x);
+		this.setY(activityJson.y);
+		this.setWidth(activityJson.width);
+		this.setHeight(activityJson.height);
+
+		if (activityJson.multiInstance)
+			this.setProperty("multiInstance", activityJson.multiInstance);
+		if (activityJson.collapsed) {
+			this.setProperty("collapsed", activityJson.collapsed);
+		}
+		if (activityJson.isInterrupting != undefined)
+			this.setProperty("isInterrupting", activityJson.isInterrupting);
+	}
+};
+
+ActivityImpl.prototype = {
+	outgoingTransitions: [],
+	outgoingTransitions: [],
+	incomingTransitions: [],
+	activityBehavior: null,
+	parent: null,
+	isScope: false,
+	isAsync: false,
+	isExclusive: false,
+
+	id: null,
+
+	properties: {},
+
+	// Graphical information
+	x: -1,
+	y: -1,
+	width: -1,
+	height: -1,
+
+	setId: function (id) {
+		this.id = id;
+	},
+
+	getId: function () {
+		return this.id;
+	},
+
+
+	setProperty: function (name, value) {
+		this.properties[name] = value;
+	},
+	getProperty: function (name) {
+		return this.properties[name];
+	},
+
+	createOutgoingTransition: function (transitionId) {
+
+	},
+
+	toString: function (id) {
+		return "Activity(" + id + ")";
+	},
+
+	getParentActivity: function () {
+		/*
+			if (parent instanceof ActivityImpl) {
+	79       return (ActivityImpl) parent;
+	80     }
+	81     return null;
+		*/
+		return this.parent;
+	},
+
+	// restricted setters ///////////////////////////////////////////////////////
+
+	setOutgoingTransitions: function (outgoingTransitions) {
+		this.outgoingTransitions = outgoingTransitions;
+	},
+
+	setParent: function (parent) {
+		this.parent = parent;
+	},
+
+	setIncomingTransitions: function (incomingTransitions) {
+		this.incomingTransitions = incomingTransitions;
+	},
+
+	// getters and setters //////////////////////////////////////////////////////
+
+	getOutgoingTransitions: function () {
+		return this.outgoingTransitions;
+	},
+
+	getActivityBehavior: function () {
+		return this.activityBehavior;
+	},
+
+	setActivityBehavior: function (activityBehavior) {
+		this.activityBehavior = activityBehavior;
+	},
+
+	getParent: function () {
+		return this.parent;
+	},
+
+	getIncomingTransitions: function () {
+		return this.incomingTransitions;
+	},
+
+	isScope: function () {
+		return this.isScope;
+	},
+
+	setScope: function (isScope) {
+		this.isScope = isScope;
+	},
+
+	getX: function () {
+		return this.x;
+	},
+
+	setX: function (x) {
+		this.x = x;
+	},
+
+	getY: function () {
+		return this.y;
+	},
+
+	setY: function (y) {
+		this.y = y;
+	},
+
+	getWidth: function () {
+		return this.width;
+	},
+
+	setWidth: function (width) {
+		this.width = width;
+	},
+
+	getHeight: function () {
+		return this.height;
+	},
+
+	setHeight: function (height) {
+		this.height = height;
+	},
+
+	isAsync: function () {
+		return this.isAsync;
+	},
+
+	setAsync: function (isAsync) {
+		this.isAsync = isAsync;
+	},
+
+	isExclusive: function () {
+		return this.isExclusive;
+	},
+
+	setExclusive: function (isExclusive) {
+		this.isExclusive = isExclusive;
+	},
+
+	vvoid: function () {
+	}
+};
diff --git a/len-activiti/src/main/resources/static/diagram-viewer/js/Color.js b/len-activiti/src/main/resources/static/diagram-viewer/js/Color.js
index e57027e..21260df 100644
--- a/len-activiti/src/main/resources/static/diagram-viewer/js/Color.js
+++ b/len-activiti/src/main/resources/static/diagram-viewer/js/Color.js
@@ -1,603 +1,602 @@
 /**
  * Web color table
- * 
+ *
  * @author Dmitry Farafonov
  */
 
 var Color = {
-   /**
-   * The color white.  In the default sRGB space.
-   */
-  white     : Raphael.getRGB("rgb(255,255,255)"),
-  
-  /**
-   * The color white.  In the default sRGB space.
-   */
-  WHITE : this.white,
-  
-  /**
-   * The color light gray.  In the default sRGB space.
-   */
-  lightGray : Raphael.getRGB("rgb(192, 192, 192)"),
-  
-  /**
-   * The color light gray.  In the default sRGB space.
-   */
-  LIGHT_GRAY : this.lightGray,
-  
-  /**
-   * The color gray.  In the default sRGB space.
-   */
-  gray : Raphael.getRGB("rgb(128, 128, 128)"),
-  
-  /**
-   * The color gray.  In the default sRGB space.
-   */
-  GRAY : this.gray,
-  
-  /**
-   * The color dark gray.  In the default sRGB space.
-   */
-  darkGray : Raphael.getRGB("rgb(64, 64, 64)"),
-  
-  /**
-   * The color dark gray.  In the default sRGB space.
-   */
-  DARK_GRAY : this.darkGray,
-  
-  /**
-   * The color black.  In the default sRGB space.
-   */
-  black : Raphael.getRGB("rgb(0, 0, 0)"),
-  
-  /**
-   * The color black.  In the default sRGB space.
-   */
-  BLACK : this.black,
-  
-  /**
-   * The color red.  In the default sRGB space.
-   */
-  red : Raphael.getRGB("rgb(255, 0, 0)"),
-  
-  /**
-   * The color red.  In the default sRGB space.
-   */
-  RED : this.red,
-  
-  /**
-   * The color pink.  In the default sRGB space.
-   */
-  pink : Raphael.getRGB("rgb(255, 175, 175)"),
-  
-  /**
-   * The color pink.  In the default sRGB space.
-   */
-  PINK : this.pink,
-  
-  /**
-   * The color orange.  In the default sRGB space.
-   */
-  orange : Raphael.getRGB("rgb(255, 200, 0)"),
-  
-  /**
-   * The color orange.  In the default sRGB space.
-   */
-  ORANGE : this.orange,
-  
-  /**
-   * The color yellow.  In the default sRGB space.
-   */
-  yellow : Raphael.getRGB("rgb(255, 255, 0)"),
-  
-  /**
-   * The color yellow.  In the default sRGB space.
-   */
-  YELLOW : this.yellow,
-  
-  /**
-   * The color green.  In the default sRGB space.
-   */
-  green : Raphael.getRGB("rgb(0, 255, 0)"),
-  
-  /**
-   * The color green.  In the default sRGB space.
-   */
-  GREEN : this.green,
-  
-  /**
-   * The color magenta.  In the default sRGB space.
-   */
-  magenta : Raphael.getRGB("rgb(255, 0, 255)"),
-  
-  /**
-   * The color magenta.  In the default sRGB space.
-   */
-  MAGENTA : this.magenta,
-  
-  /**
-   * The color cyan.  In the default sRGB space.
-   */
-  cyan : Raphael.getRGB("rgb(0, 255, 255)"),
-  
-  /**
-   * The color cyan.  In the default sRGB space.
-   */
-  CYAN : this.cyan,
-  
-  /**
-   * The color blue.  In the default sRGB space.
-   */
-  blue : Raphael.getRGB("rgb(0, 0, 255)"),
-  
-  /**
-   * The color blue.  In the default sRGB space.
-   */
-  BLUE : this.blue,
-  
-  /************************************************************************/
+	/**
+	 * The color white.  In the default sRGB space.
+	 */
+	white: Raphael.getRGB("rgb(255,255,255)"),
 
-  // http://www.stm.dp.ua/web-design/color-html.php
-  
-	Snow			:   Raphael.getRGB("#FFFAFA	"),  // 	255 250 250
-	GhostWhite		:   Raphael.getRGB("#F8F8FF	"),  // 	248 248 255
-	WhiteSmoke		:   Raphael.getRGB("#F5F5F5	"),  // 	245 245 245
-	Gainsboro		:   Raphael.getRGB("#DCDCDC	"),  // 	220 220 220
-	FloralWhite		:   Raphael.getRGB("#FFFAF0	"),  // 	255 250 240
-	OldLace			:   Raphael.getRGB("#FDF5E6	"),  // 	253 245 230
-	Linen			:   Raphael.getRGB("#FAF0E6	"),  // 	250 240 230
-	AntiqueWhite	:   Raphael.getRGB("#FAEBD7	"),  // 	250 235 215
-	PapayaWhip		:   Raphael.getRGB("#FFEFD5	"),  // 	255 239 213
-	BlanchedAlmond	:   Raphael.getRGB("#FFEBCD	"),  // 	255 235 205
-	Bisque			:   Raphael.getRGB("#FFE4C4	"),  // 	255 228 196
-	PeachPuff		:   Raphael.getRGB("#FFDAB9	"),  // 	255 218 185
-	NavajoWhite		:   Raphael.getRGB("#FFDEAD	"),  // 	255 222 173
-	Moccasin		:   Raphael.getRGB("#FFE4B5	"),  // 	255 228 181
-	Cornsilk		:   Raphael.getRGB("#FFF8DC	"),  // 	255 248 220
-	Ivory			:   Raphael.getRGB("#FFFFF0	"),  // 	255 255 240
-	LemonChiffon	:   Raphael.getRGB("#FFFACD	"),  // 	255 250 205
-	Seashell		:   Raphael.getRGB("#FFF5EE	"),  // 	255 245 238
-	Honeydew		:   Raphael.getRGB("#F0FFF0	"),  // 	240 255 240
-	MintCream		:   Raphael.getRGB("#F5FFFA	"),  // 	245 255 250
-	Azure			:   Raphael.getRGB("#F0FFFF	"),  // 	240 255 255
-	AliceBlue		:   Raphael.getRGB("#F0F8FF	"),  // 	240 248 255
-	lavender		:   Raphael.getRGB("#E6E6FA	"),  // 	230 230 250
-	LavenderBlush	:   Raphael.getRGB("#FFF0F5	"),  // 	255 240 245
-	MistyRose		:   Raphael.getRGB("#FFE4E1	"),  // 	255 228 225
-	White			:   Raphael.getRGB("#FFFFFF	"),  // 	255 255 255
-	Black			:   Raphael.getRGB("#000000	"),  // 	0 0 0
-	DarkSlateGray	:   Raphael.getRGB("#2F4F4F	"),  // 	47 79 79
-	DimGrey			:   Raphael.getRGB("#696969	"),  // 	105 105 105
-	SlateGrey		:   Raphael.getRGB("#708090	"),  // 	112 128 144
-	LightSlateGray	:   Raphael.getRGB("#778899	"),  // 	119 136 153
-	Grey			:   Raphael.getRGB("#BEBEBE	"),  // 	190 190 190
-	LightGray		:   Raphael.getRGB("#D3D3D3	"),  // 	211 211 211
-	MidnightBlue	:   Raphael.getRGB("#191970	"),  // 	25 25 112
-	NavyBlue		:   Raphael.getRGB("#000080	"),  // 	0 0 128
-	CornflowerBlue	:   Raphael.getRGB("#6495ED	"),  // 	100 149 237
-	DarkSlateBlue	:   Raphael.getRGB("#483D8B	"),  // 	72 61 139
-	SlateBlue		:   Raphael.getRGB("#6A5ACD	"),  // 	106 90 205
-	MediumSlateBlue	:   Raphael.getRGB("#7B68EE	"),  // 	123 104 238
-	LightSlateBlue	:   Raphael.getRGB("#8470FF	"),  // 	132 112 255
-	MediumBlue		:   Raphael.getRGB("#0000CD	"),  // 	0 0 205
-	RoyalBlue		:   Raphael.getRGB("#4169E1	"),  // 	65 105 225
-	Blue			:   Raphael.getRGB("#0000FF	"),  // 	0 0 255
-	DodgerBlue		:   Raphael.getRGB("#1E90FF	"),  // 	30 144 255
-	DeepSkyBlue		:   Raphael.getRGB("#00BFFF	"),  // 	0 191 255
-	SkyBlue			:   Raphael.getRGB("#87CEEB	"),  // 	135 206 235
-	LightSkyBlue	:   Raphael.getRGB("#87CEFA	"),  // 	135 206 250
-	SteelBlue		:   Raphael.getRGB("#4682B4	"),  // 	70 130 180
-	LightSteelBlue	:   Raphael.getRGB("#B0C4DE	"),  // 	176 196 222
-	LightBlue		:   Raphael.getRGB("#ADD8E6	"),  // 	173 216 230
-	PowderBlue		:   Raphael.getRGB("#B0E0E6	"),  // 	176 224 230
-	PaleTurquoise	:   Raphael.getRGB("#AFEEEE	"),  // 	175 238 238
-	DarkTurquoise	:   Raphael.getRGB("#00CED1	"),  // 	0 206 209
-	MediumTurquoise	:   Raphael.getRGB("#48D1CC	"),  // 	72 209 204
-	Turquoise		:   Raphael.getRGB("#40E0D0	"),  // 	64 224 208
-	Cyan			:   Raphael.getRGB("#00FFFF	"),  // 	0 255 255
-	LightCyan		:   Raphael.getRGB("#E0FFFF	"),  // 	224 255 255
-	CadetBlue		:   Raphael.getRGB("#5F9EA0	"),  // 	95 158 160
-	MediumAquamarine:   Raphael.getRGB("#66CDAA	"),  // 	102 205 170
-	Aquamarine		:   Raphael.getRGB("#7FFFD4	"),  // 	127 255 212
-	DarkGreen		:   Raphael.getRGB("#006400	"),  // 	0 100 0
-	DarkOliveGreen	:   Raphael.getRGB("#556B2F	"),  // 	85 107 47
-	DarkSeaGreen	:   Raphael.getRGB("#8FBC8F	"),  // 	143 188 143
-	SeaGreen		:   Raphael.getRGB("#2E8B57	"),  // 	46 139 87
-	MediumSeaGreen	:   Raphael.getRGB("#3CB371	"),  // 	60 179 113
-	LightSeaGreen	:   Raphael.getRGB("#20B2AA	"),  // 	32 178 170
-	PaleGreen		:   Raphael.getRGB("#98FB98	"),  // 	152 251 152
-	SpringGreen		:   Raphael.getRGB("#00FF7F	"),  // 	0 255 127
-	LawnGreen		:   Raphael.getRGB("#7CFC00	"),  // 	124 252 0
-	Green			:   Raphael.getRGB("#00FF00	"),  // 	0 255 0
-	Chartreuse		:   Raphael.getRGB("#7FFF00	"),  // 	127 255 0
-	MedSpringGreen	:   Raphael.getRGB("#00FA9A	"),  // 	0 250 154
-	GreenYellow		:   Raphael.getRGB("#ADFF2F	"),  // 	173 255 47
-	LimeGreen		:   Raphael.getRGB("#32CD32	"),  // 	50 205 50
-	YellowGreen		:   Raphael.getRGB("#9ACD32	"),  // 	154 205 50
-	ForestGreen		:   Raphael.getRGB("#228B22	"),  // 	34 139 34
-	OliveDrab		:   Raphael.getRGB("#6B8E23	"),  // 	107 142 35
-	DarkKhaki		:   Raphael.getRGB("#BDB76B	"),  // 	189 183 107
-	PaleGoldenrod	:   Raphael.getRGB("#EEE8AA	"),  // 	238 232 170
-	LtGoldenrodYello:   Raphael.getRGB("#FAFAD2	"),  // 	250 250 210
-	LightYellow		:   Raphael.getRGB("#FFFFE0	"),  // 	255 255 224
-	Yellow			:   Raphael.getRGB("#FFFF00	"),  // 	255 255 0
-	Gold			:   Raphael.getRGB("#FFD700	"),  // 	255 215 0
-	LightGoldenrod	:   Raphael.getRGB("#EEDD82	"),  // 	238 221 130
-	goldenrod		:   Raphael.getRGB("#DAA520	"),  // 	218 165 32
-	DarkGoldenrod	:   Raphael.getRGB("#B8860B	"),  // 	184 134 11
-	RosyBrown		:   Raphael.getRGB("#BC8F8F	"),  // 	188 143 143
-	IndianRed		:   Raphael.getRGB("#CD5C5C	"),  // 	205 92 92
-	SaddleBrown		:   Raphael.getRGB("#8B4513	"),  // 	139 69 19
-	Sienna			:   Raphael.getRGB("#A0522D	"),  // 	160 82 45
-	Peru			:   Raphael.getRGB("#CD853F	"),  // 	205 133 63
-	Burlywood		:   Raphael.getRGB("#DEB887	"),  // 	222 184 135
-	Beige			:   Raphael.getRGB("#F5F5DC	"),  // 	245 245 220
-	Wheat			:   Raphael.getRGB("#F5DEB3	"),  // 	245 222 179
-	SandyBrown		:   Raphael.getRGB("#F4A460	"),  // 	244 164 96
-	Tan				:   Raphael.getRGB("#D2B48C	"),  // 	210 180 140
-	Chocolate		:   Raphael.getRGB("#D2691E	"),  // 	210 105 30
-	Firebrick		:   Raphael.getRGB("#B22222	"),  // 	178 34 34
-	Brown			:   Raphael.getRGB("#A52A2A	"),  // 	165 42 42
-	DarkSalmon		:   Raphael.getRGB("#E9967A	"),  // 	233 150 122
-	Salmon			:   Raphael.getRGB("#FA8072	"),  // 	250 128 114
-	LightSalmon		:   Raphael.getRGB("#FFA07A	"),  // 	255 160 122
-	Orange			:   Raphael.getRGB("#FFA500	"),  // 	255 165 0
-	DarkOrange		:   Raphael.getRGB("#FF8C00	"),  // 	255 140 0
-	Coral			:   Raphael.getRGB("#FF7F50	"),  // 	255 127 80
-	LightCoral		:   Raphael.getRGB("#F08080	"),  // 	240 128 128
-	Tomato			:   Raphael.getRGB("#FF6347	"),  // 	255 99 71
-	OrangeRed		:   Raphael.getRGB("#FF4500	"),  // 	255 69 0
-	Red				:   Raphael.getRGB("#FF0000	"),  // 	255 0 0
-	HotPink			:   Raphael.getRGB("#FF69B4	"),  // 	255 105 180
-	DeepPink		:   Raphael.getRGB("#FF1493	"),  // 	255 20 147
-	Pink			:   Raphael.getRGB("#FFC0CB	"),  // 	255 192 203
-	LightPink		:   Raphael.getRGB("#FFB6C1	"),  // 	255 182 193
-	PaleVioletRed	:   Raphael.getRGB("#DB7093	"),  // 	219 112 147
-	Maroon			:   Raphael.getRGB("#B03060	"),  // 	176 48 96
-	MediumVioletRed	:   Raphael.getRGB("#C71585	"),  // 	199 21 133
-	VioletRed		:   Raphael.getRGB("#D02090	"),  // 	208 32 144
-	Magenta			:   Raphael.getRGB("#FF00FF	"),  // 	255 0 255
-	Violet			:   Raphael.getRGB("#EE82EE	"),  // 	238 130 238
-	Plum			:   Raphael.getRGB("#DDA0DD	"),  // 	221 160 221
-	Orchid			:   Raphael.getRGB("#DA70D6	"),  // 	218 112 214
-	MediumOrchid	:   Raphael.getRGB("#BA55D3	"),  // 	186 85 211
-	DarkOrchid		:   Raphael.getRGB("#9932CC	"),  // 	153 50 204
-	DarkViolet		:   Raphael.getRGB("#9400D3	"),  // 	148 0 211
-	BlueViolet		:   Raphael.getRGB("#8A2BE2	"),  // 	138 43 226
-	Purple			:   Raphael.getRGB("#A020F0	"),  // 	160 32 240
-	MediumPurple	:   Raphael.getRGB("#9370DB	"),  // 	147 112 219
-	Thistle			:   Raphael.getRGB("#D8BFD8	"),  // 	216 191 216
-	Snow1			:   Raphael.getRGB("#FFFAFA	"),  // 	255 250 250
-	Snow2			:   Raphael.getRGB("#EEE9E9	"),  // 	238 233 233
-	Snow3			:   Raphael.getRGB("#CDC9C9	"),  // 	205 201 201
-	Snow4			:   Raphael.getRGB("#8B8989	"),  // 	139 137 137
-	Seashell1		:   Raphael.getRGB("#FFF5EE	"),  // 	255 245 238
-	Seashell2		:   Raphael.getRGB("#EEE5DE	"),  // 	238 229 222
-	Seashell3		:   Raphael.getRGB("#CDC5BF	"),  // 	205 197 191
-	Seashell4		:   Raphael.getRGB("#8B8682	"),  // 	139 134 130
-	AntiqueWhite1	:   Raphael.getRGB("#FFEFDB	"),  // 	255 239 219
-	AntiqueWhite2	:   Raphael.getRGB("#EEDFCC	"),  // 	238 223 204
-	AntiqueWhite3	:   Raphael.getRGB("#CDC0B0	"),  // 	205 192 176
-	AntiqueWhite4	:   Raphael.getRGB("#8B8378	"),  // 	139 131 120
-	Bisque1			:   Raphael.getRGB("#FFE4C4	"),  // 	255 228 196
-	Bisque2			:   Raphael.getRGB("#EED5B7	"),  // 	238 213 183
-	Bisque3			:   Raphael.getRGB("#CDB79E	"),  // 	205 183 158
-	Bisque4			:   Raphael.getRGB("#8B7D6B	"),  // 	139 125 107
-	PeachPuff1		:   Raphael.getRGB("#FFDAB9	"),  // 	255 218 185
-	PeachPuff2		:   Raphael.getRGB("#EECBAD	"),  // 	238 203 173
-	PeachPuff3		:   Raphael.getRGB("#CDAF95	"),  // 	205 175 149
-	PeachPuff4		:   Raphael.getRGB("#8B7765	"),  // 	139 119 101
-	NavajoWhite1	:   Raphael.getRGB("#FFDEAD	"),  // 	255 222 173
-	NavajoWhite2	:   Raphael.getRGB("#EECFA1	"),  // 	238 207 161
-	NavajoWhite3	:   Raphael.getRGB("#CDB38B	"),  // 	205 179 139
-	NavajoWhite4	:   Raphael.getRGB("#8B795E	"),  // 	139 121 94
-	LemonChiffon1	:   Raphael.getRGB("#FFFACD	"),  // 	255 250 205
-	LemonChiffon2	:   Raphael.getRGB("#EEE9BF	"),  // 	238 233 191
-	LemonChiffon3	:   Raphael.getRGB("#CDC9A5	"),  // 	205 201 165
-	LemonChiffon4	:   Raphael.getRGB("#8B8970	"),  // 	139 137 112
-	Cornsilk1		:   Raphael.getRGB("#FFF8DC	"),  // 	255 248 220
-	Cornsilk2		:   Raphael.getRGB("#EEE8CD	"),  // 	238 232 205
-	Cornsilk3		:   Raphael.getRGB("#CDC8B1	"),  // 	205 200 177
-	Cornsilk4		:   Raphael.getRGB("#8B8878	"),  // 	139 136 120
-	Ivory1			:   Raphael.getRGB("#FFFFF0	"),  // 	255 255 240
-	Ivory2			:   Raphael.getRGB("#EEEEE0	"),  // 	238 238 224
-	Ivory3			:   Raphael.getRGB("#CDCDC1	"),  // 	205 205 193
-	Ivory4			:   Raphael.getRGB("#8B8B83	"),  // 	139 139 131
-	Honeydew1		:   Raphael.getRGB("#F0FFF0	"),  // 	240 255 240
-	Honeydew2		:   Raphael.getRGB("#E0EEE0	"),  // 	224 238 224
-	Honeydew3		:   Raphael.getRGB("#C1CDC1	"),  // 	193 205 193
-	Honeydew4		:   Raphael.getRGB("#838B83	"),  // 	131 139 131
-	LavenderBlush1	:   Raphael.getRGB("#FFF0F5	"),  // 	255 240 245
-	LavenderBlush2	:   Raphael.getRGB("#EEE0E5	"),  // 	238 224 229
-	LavenderBlush3	:   Raphael.getRGB("#CDC1C5	"),  // 	205 193 197
-	LavenderBlush4	:   Raphael.getRGB("#8B8386	"),  // 	139 131 134
-	MistyRose1		:   Raphael.getRGB("#FFE4E1	"),  // 	255 228 225
-	MistyRose2		:   Raphael.getRGB("#EED5D2	"),  // 	238 213 210
-	MistyRose3		:   Raphael.getRGB("#CDB7B5	"),  // 	205 183 181
-	MistyRose4		:   Raphael.getRGB("#8B7D7B	"),  // 	139 125 123
-	Azure1			:   Raphael.getRGB("#F0FFFF	"),  // 	240 255 255
-	Azure2			:   Raphael.getRGB("#E0EEEE	"),  // 	224 238 238
-	Azure3			:   Raphael.getRGB("#C1CDCD	"),  // 	193 205 205
-	Azure4			:   Raphael.getRGB("#838B8B	"),  // 	131 139 139
-	SlateBlue1		:   Raphael.getRGB("#836FFF	"),  // 	131 111 255
-	SlateBlue2		:   Raphael.getRGB("#7A67EE	"),  // 	122 103 238
-	SlateBlue3		:   Raphael.getRGB("#6959CD	"),  // 	105 89 205
-	SlateBlue4		:   Raphael.getRGB("#473C8B	"),  // 	71 60 139
-	RoyalBlue1		:   Raphael.getRGB("#4876FF	"),  // 	72 118 255
-	RoyalBlue2		:   Raphael.getRGB("#436EEE	"),  // 	67 110 238
-	RoyalBlue3		:   Raphael.getRGB("#3A5FCD	"),  // 	58 95 205
-	RoyalBlue4		:   Raphael.getRGB("#27408B	"),  // 	39 64 139
-	Blue1			:   Raphael.getRGB("#0000FF	"),  // 	0 0 255
-	Blue2			:   Raphael.getRGB("#0000EE	"),  // 	0 0 238
-	Blue3			:   Raphael.getRGB("#0000CD	"),  // 	0 0 205
-	Blue4			:   Raphael.getRGB("#00008B	"),  // 	0 0 139
-	DodgerBlue1		:   Raphael.getRGB("#1E90FF	"),  // 	30 144 255
-	DodgerBlue2		:   Raphael.getRGB("#1C86EE	"),  // 	28 134 238
-	DodgerBlue3		:   Raphael.getRGB("#1874CD	"),  // 	24 116 205
-	DodgerBlue4		:   Raphael.getRGB("#104E8B	"),  // 	16 78 139
-	SteelBlue1		:   Raphael.getRGB("#63B8FF	"),  // 	99 184 255
-	SteelBlue2		:   Raphael.getRGB("#5CACEE	"),  // 	92 172 238
-	SteelBlue3		:   Raphael.getRGB("#4F94CD	"),  // 	79 148 205
-	SteelBlue4		:   Raphael.getRGB("#36648B	"),  // 	54 100 139
-	DeepSkyBlue1	:   Raphael.getRGB("#00BFFF	"),  // 	0 191 255
-	DeepSkyBlue2	:   Raphael.getRGB("#00B2EE	"),  // 	0 178 238
-	DeepSkyBlue3	:   Raphael.getRGB("#009ACD	"),  // 	0 154 205
-	DeepSkyBlue4	:   Raphael.getRGB("#00688B	"),  // 	0 104 139
-	SkyBlue1		:   Raphael.getRGB("#87CEFF	"),  // 	135 206 255
-	SkyBlue2		:   Raphael.getRGB("#7EC0EE	"),  // 	126 192 238
-	SkyBlue3		:   Raphael.getRGB("#6CA6CD	"),  // 	108 166 205
-	SkyBlue4		:   Raphael.getRGB("#4A708B	"),  // 	74 112 139
-	LightSkyBlue1	:   Raphael.getRGB("#B0E2FF	"),  // 	176 226 255
-	LightSkyBlue2	:   Raphael.getRGB("#A4D3EE	"),  // 	164 211 238
-	LightSkyBlue3	:   Raphael.getRGB("#8DB6CD	"),  // 	141 182 205
-	LightSkyBlue4	:   Raphael.getRGB("#607B8B	"),  // 	96 123 139
-	SlateGray1		:   Raphael.getRGB("#C6E2FF	"),  // 	198 226 255
-	SlateGray2		:   Raphael.getRGB("#B9D3EE	"),  // 	185 211 238
-	SlateGray3		:   Raphael.getRGB("#9FB6CD	"),  // 	159 182 205
-	SlateGray4		:   Raphael.getRGB("#6C7B8B	"),  // 	108 123 139
-	LightSteelBlue1	:   Raphael.getRGB("#CAE1FF	"),  // 	202 225 255
-	LightSteelBlue2	:   Raphael.getRGB("#BCD2EE	"),  // 	188 210 238
-	LightSteelBlue3	:   Raphael.getRGB("#A2B5CD	"),  // 	162 181 205
-	LightSteelBlue4	:   Raphael.getRGB("#6E7B8B	"),  // 	110 123 139
-	LightBlue1		:   Raphael.getRGB("#BFEFFF	"),  // 	191 239 255
-	LightBlue2		:   Raphael.getRGB("#B2DFEE	"),  // 	178 223 238
-	LightBlue3		:   Raphael.getRGB("#9AC0CD	"),  // 	154 192 205
-	LightBlue4		:   Raphael.getRGB("#68838B	"),  // 	104 131 139
-	LightCyan1		:   Raphael.getRGB("#E0FFFF	"),  // 	224 255 255
-	LightCyan2		:   Raphael.getRGB("#D1EEEE	"),  // 	209 238 238
-	LightCyan3		:   Raphael.getRGB("#B4CDCD	"),  // 	180 205 205
-	LightCyan4		:   Raphael.getRGB("#7A8B8B	"),  // 	122 139 139
-	PaleTurquoise1	:   Raphael.getRGB("#BBFFFF	"),  // 	187 255 255
-	PaleTurquoise2	:   Raphael.getRGB("#AEEEEE	"),  // 	174 238 238
-	PaleTurquoise3	:   Raphael.getRGB("#96CDCD	"),  // 	150 205 205
-	PaleTurquoise4	:   Raphael.getRGB("#668B8B	"),  // 	102 139 139
-	CadetBlue1		:   Raphael.getRGB("#98F5FF	"),  // 	152 245 255
-	CadetBlue2		:   Raphael.getRGB("#8EE5EE	"),  // 	142 229 238
-	CadetBlue3		:   Raphael.getRGB("#7AC5CD	"),  // 	122 197 205
-	CadetBlue4		:   Raphael.getRGB("#53868B	"),  // 	83 134 139
-	Turquoise1		:   Raphael.getRGB("#00F5FF	"),  // 	0 245 255
-	Turquoise2		:   Raphael.getRGB("#00E5EE	"),  // 	0 229 238
-	Turquoise3		:   Raphael.getRGB("#00C5CD	"),  // 	0 197 205
-	Turquoise4		:   Raphael.getRGB("#00868B	"),  // 	0 134 139
-	Cyan1			:   Raphael.getRGB("#00FFFF	"),  // 	0 255 255
-	Cyan2			:   Raphael.getRGB("#00EEEE	"),  // 	0 238 238
-	Cyan3			:   Raphael.getRGB("#00CDCD	"),  // 	0 205 205
-	Cyan4			:   Raphael.getRGB("#008B8B	"),  // 	0 139 139
-	DarkSlateGray1	:   Raphael.getRGB("#97FFFF	"),  // 	151 255 255
-	DarkSlateGray2	:   Raphael.getRGB("#8DEEEE	"),  // 	141 238 238
-	DarkSlateGray3	:   Raphael.getRGB("#79CDCD	"),  // 	121 205 205
-	DarkSlateGray4	:   Raphael.getRGB("#528B8B	"),  // 	82 139 139
-	Aquamarine1		:   Raphael.getRGB("#7FFFD4	"),  // 	127 255 212
-	Aquamarine2		:   Raphael.getRGB("#76EEC6	"),  // 	118 238 198
-	Aquamarine3		:   Raphael.getRGB("#66CDAA	"),  // 	102 205 170
-	Aquamarine4		:   Raphael.getRGB("#458B74	"),  // 	69 139 116
-	DarkSeaGreen1	:   Raphael.getRGB("#C1FFC1	"),  // 	193 255 193
-	DarkSeaGreen2	:   Raphael.getRGB("#B4EEB4	"),  // 	180 238 180
-	DarkSeaGreen3	:   Raphael.getRGB("#9BCD9B	"),  // 	155 205 155
-	DarkSeaGreen4	:   Raphael.getRGB("#698B69	"),  // 	105 139 105
-	SeaGreen1		:   Raphael.getRGB("#54FF9F	"),  // 	84 255 159
-	SeaGreen2		:   Raphael.getRGB("#4EEE94	"),  // 	78 238 148
-	SeaGreen3		:   Raphael.getRGB("#43CD80	"),  // 	67 205 128
-	SeaGreen4		:   Raphael.getRGB("#2E8B57	"),  // 	46 139 87
-	PaleGreen1		:   Raphael.getRGB("#9AFF9A	"),  // 	154 255 154
-	PaleGreen2		:   Raphael.getRGB("#90EE90	"),  // 	144 238 144
-	PaleGreen3		:   Raphael.getRGB("#7CCD7C	"),  // 	124 205 124
-	PaleGreen4		:   Raphael.getRGB("#548B54	"),  // 	84 139 84
-	SpringGreen1	:   Raphael.getRGB("#00FF7F	"),  // 	0 255 127
-	SpringGreen2	:   Raphael.getRGB("#00EE76	"),  // 	0 238 118
-	SpringGreen3	:   Raphael.getRGB("#00CD66	"),  // 	0 205 102
-	SpringGreen4	:   Raphael.getRGB("#008B45	"),  // 	0 139 69
-	Green1			:   Raphael.getRGB("#00FF00	"),  // 	0 255 0
-	Green2			:   Raphael.getRGB("#00EE00	"),  // 	0 238 0
-	Green3			:   Raphael.getRGB("#00CD00	"),  // 	0 205 0
-	Green4			:   Raphael.getRGB("#008B00	"),  // 	0 139 0
-	Chartreuse1		:   Raphael.getRGB("#7FFF00	"),  // 	127 255 0
-	Chartreuse2		:   Raphael.getRGB("#76EE00	"),  // 	118 238 0
-	Chartreuse3		:   Raphael.getRGB("#66CD00	"),  // 	102 205 0
-	Chartreuse4		:   Raphael.getRGB("#458B00	"),  // 	69 139 0
-	OliveDrab1		:   Raphael.getRGB("#C0FF3E	"),  // 	192 255 62
-	OliveDrab2		:   Raphael.getRGB("#B3EE3A	"),  // 	179 238 58
-	OliveDrab3		:   Raphael.getRGB("#9ACD32	"),  // 	154 205 50
-	OliveDrab4		:   Raphael.getRGB("#698B22	"),  // 	105 139 34
-	DarkOliveGreen1	:   Raphael.getRGB("#CAFF70	"),  // 	202 255 112
-	DarkOliveGreen2	:   Raphael.getRGB("#BCEE68	"),  // 	188 238 104
-	DarkOliveGreen3	:   Raphael.getRGB("#A2CD5A	"),  // 	162 205 90
-	DarkOliveGreen4	:   Raphael.getRGB("#6E8B3D	"),  // 	110 139 61
-	Khaki1			:   Raphael.getRGB("#FFF68F	"),  // 	255 246 143
-	Khaki2			:   Raphael.getRGB("#EEE685	"),  // 	238 230 133
-	Khaki3			:   Raphael.getRGB("#CDC673	"),  // 	205 198 115
-	Khaki4			:   Raphael.getRGB("#8B864E	"),  // 	139 134 78
-	LightGoldenrod1	:   Raphael.getRGB("#FFEC8B	"),  // 	255 236 139
-	LightGoldenrod2	:   Raphael.getRGB("#EEDC82	"),  // 	238 220 130
-	LightGoldenrod3	:   Raphael.getRGB("#CDBE70	"),  // 	205 190 112
-	LightGoldenrod4	:   Raphael.getRGB("#8B814C	"),  // 	139 129 76
-	LightYellow1	:   Raphael.getRGB("#FFFFE0	"),  // 	255 255 224
-	LightYellow2	:   Raphael.getRGB("#EEEED1	"),  // 	238 238 209
-	LightYellow3	:   Raphael.getRGB("#CDCDB4	"),  // 	205 205 180
-	LightYellow4	:   Raphael.getRGB("#8B8B7A	"),  // 	139 139 122
-	Yellow1			:   Raphael.getRGB("#FFFF00	"),  // 	255 255 0
-	Yellow2			:   Raphael.getRGB("#EEEE00	"),  // 	238 238 0
-	Yellow3			:   Raphael.getRGB("#CDCD00	"),  // 	205 205 0
-	Yellow4			:   Raphael.getRGB("#8B8B00	"),  // 	139 139 0
-	Gold1			:   Raphael.getRGB("#FFD700	"),  // 	255 215 0
-	Gold2			:   Raphael.getRGB("#EEC900	"),  // 	238 201 0
-	Gold3			:   Raphael.getRGB("#CDAD00	"),  // 	205 173 0
-	Gold4			:   Raphael.getRGB("#8B7500	"),  // 	139 117 0
-	Goldenrod1		:   Raphael.getRGB("#FFC125	"),  // 	255 193 37
-	Goldenrod2		:   Raphael.getRGB("#EEB422	"),  // 	238 180 34
-	Goldenrod3		:   Raphael.getRGB("#CD9B1D	"),  // 	205 155 29
-	Goldenrod4		:   Raphael.getRGB("#8B6914	"),  // 	139 105 20
-	DarkGoldenrod1	:   Raphael.getRGB("#FFB90F	"),  // 	255 185 15
-	DarkGoldenrod2	:   Raphael.getRGB("#EEAD0E	"),  // 	238 173 14
-	DarkGoldenrod3	:   Raphael.getRGB("#CD950C	"),  // 	205 149 12
-	DarkGoldenrod4	:   Raphael.getRGB("#8B658B	"),  // 	139 101 8
-	RosyBrown1		:   Raphael.getRGB("#FFC1C1	"),  // 	255 193 193
-	RosyBrown2		:   Raphael.getRGB("#EEB4B4	"),  // 	238 180 180
-	RosyBrown3		:   Raphael.getRGB("#CD9B9B	"),  // 	205 155 155
-	RosyBrown4		:   Raphael.getRGB("#8B6969	"),  // 	139 105 105
-	IndianRed1		:   Raphael.getRGB("#FF6A6A	"),  // 	255 106 106
-	IndianRed2		:   Raphael.getRGB("#EE6363	"),  // 	238 99 99
-	IndianRed3		:   Raphael.getRGB("#CD5555	"),  // 	205 85 85
-	IndianRed4		:   Raphael.getRGB("#8B3A3A	"),  // 	139 58 58
-	Sienna1			:   Raphael.getRGB("#FF8247	"),  // 	255 130 71
-	Sienna2			:   Raphael.getRGB("#EE7942	"),  // 	238 121 66
-	Sienna3			:   Raphael.getRGB("#CD6839	"),  // 	205 104 57
-	Sienna4			:   Raphael.getRGB("#8B4726	"),  // 	139 71 38
-	Burlywood1		:   Raphael.getRGB("#FFD39B	"),  // 	255 211 155
-	Burlywood2		:   Raphael.getRGB("#EEC591	"),  // 	238 197 145
-	Burlywood3		:   Raphael.getRGB("#CDAA7D	"),  // 	205 170 125
-	Burlywood4		:   Raphael.getRGB("#8B7355	"),  // 	139 115 85
-	Wheat1			:   Raphael.getRGB("#FFE7BA	"),  // 	255 231 186
-	Wheat2			:   Raphael.getRGB("#EED8AE	"),  // 	238 216 174
-	Wheat3			:   Raphael.getRGB("#CDBA96	"),  // 	205 186 150
-	Wheat4			:   Raphael.getRGB("#8B7E66	"),  // 	139 126 102
-	Tan1			:   Raphael.getRGB("#FFA54F	"),  // 	255 165 79
-	Tan2			:   Raphael.getRGB("#EE9A49	"),  // 	238 154 73
-	Tan3			:   Raphael.getRGB("#CD853F	"),  // 	205 133 63
-	Tan4			:   Raphael.getRGB("#8B5A2B	"),  // 	139 90 43
-	Chocolate1		:   Raphael.getRGB("#FF7F24	"),  // 	255 127 36
-	Chocolate2		:   Raphael.getRGB("#EE7621	"),  // 	238 118 33
-	Chocolate3		:   Raphael.getRGB("#CD661D	"),  // 	205 102 29
-	Chocolate4		:   Raphael.getRGB("#8B4513	"),  // 	139 69 19
-	Firebrick1		:   Raphael.getRGB("#FF3030	"),  // 	255 48 48
-	Firebrick2		:   Raphael.getRGB("#EE2C2C	"),  // 	238 44 44
-	Firebrick3		:   Raphael.getRGB("#CD2626	"),  // 	205 38 38
-	Firebrick4		:   Raphael.getRGB("#8B1A1A	"),  // 	139 26 26
-	Brown1			:   Raphael.getRGB("#FF4040	"),  // 	255 64 64
-	Brown2			:   Raphael.getRGB("#EE3B3B	"),  // 	238 59 59
-	Brown3			:   Raphael.getRGB("#CD3333	"),  // 	205 51 51
-	Brown4			:   Raphael.getRGB("#8B2323	"),  // 	139 35 35
-	Salmon1			:   Raphael.getRGB("#FF8C69	"),  // 	255 140 105
-	Salmon2			:   Raphael.getRGB("#EE8262	"),  // 	238 130 98
-	Salmon3			:   Raphael.getRGB("#CD7054	"),  // 	205 112 84
-	Salmon4			:   Raphael.getRGB("#8B4C39	"),  // 	139 76 57
-	LightSalmon1	:   Raphael.getRGB("#FFA07A	"),  // 	255 160 122
-	LightSalmon2	:   Raphael.getRGB("#EE9572	"),  // 	238 149 114
-	LightSalmon3	:   Raphael.getRGB("#CD8162	"),  // 	205 129 98
-	LightSalmon4	:   Raphael.getRGB("#8B5742	"),  // 	139 87 66
-	Orange1			:   Raphael.getRGB("#FFA500	"),  // 	255 165 0
-	Orange2			:   Raphael.getRGB("#EE9A00	"),  // 	238 154 0
-	Orange3			:   Raphael.getRGB("#CD8500	"),  // 	205 133 0
-	Orange4			:   Raphael.getRGB("#8B5A00	"),  // 	139 90 0
-	DarkOrange1		:   Raphael.getRGB("#FF7F00	"),  // 	255 127 0
-	DarkOrange2		:   Raphael.getRGB("#EE7600	"),  // 	238 118 0
-	DarkOrange3		:   Raphael.getRGB("#CD6600	"),  // 	205 102 0
-	DarkOrange4		:   Raphael.getRGB("#8B4500	"),  // 	139 69 0
-	Coral1			:   Raphael.getRGB("#FF7256	"),  // 	255 114 86
-	Coral2			:   Raphael.getRGB("#EE6A50	"),  // 	238 106 80
-	Coral3			:   Raphael.getRGB("#CD5B45	"),  // 	205 91 69
-	Coral4			:   Raphael.getRGB("#8B3E2F	"),  // 	139 62 47
-	Tomato1			:   Raphael.getRGB("#FF6347	"),  // 	255 99 71
-	Tomato2			:   Raphael.getRGB("#EE5C42	"),  // 	238 92 66
-	Tomato3			:   Raphael.getRGB("#CD4F39	"),  // 	205 79 57
-	Tomato4			:   Raphael.getRGB("#8B3626	"),  // 	139 54 38
-	OrangeRed1		:   Raphael.getRGB("#FF4500	"),  // 	255 69 0
-	OrangeRed2		:   Raphael.getRGB("#EE4000	"),  // 	238 64 0
-	OrangeRed3		:   Raphael.getRGB("#CD3700	"),  // 	205 55 0
-	OrangeRed4		:   Raphael.getRGB("#8B2500	"),  // 	139 37 0
-	Red1			:   Raphael.getRGB("#FF0000	"),  // 	255 0 0
-	Red2			:   Raphael.getRGB("#EE0000	"),  // 	238 0 0
-	Red3			:   Raphael.getRGB("#CD0000	"),  // 	205 0 0
-	Red4			:   Raphael.getRGB("#8B0000	"),  // 	139 0 0
-	DeepPink1		:   Raphael.getRGB("#FF1493	"),  // 	255 20 147
-	DeepPink2		:   Raphael.getRGB("#EE1289	"),  // 	238 18 137
-	DeepPink3		:   Raphael.getRGB("#CD1076	"),  // 	205 16 118
-	DeepPink4		:   Raphael.getRGB("#8B0A50	"),  // 	139 10 80
-	HotPink1		:   Raphael.getRGB("#FF6EB4	"),  // 	255 110 180
-	HotPink2		:   Raphael.getRGB("#EE6AA7	"),  // 	238 106 167
-	HotPink3		:   Raphael.getRGB("#CD6090	"),  // 	205 96 144
-	HotPink4		:   Raphael.getRGB("#8B3A62	"),  // 	139 58 98
-	Pink1			:   Raphael.getRGB("#FFB5C5	"),  // 	255 181 197
-	Pink2			:   Raphael.getRGB("#EEA9B8	"),  // 	238 169 184
-	Pink3			:   Raphael.getRGB("#CD919E	"),  // 	205 145 158
-	Pink4			:   Raphael.getRGB("#8B636C	"),  // 	139 99 108
-	LightPink1		:   Raphael.getRGB("#FFAEB9	"),  // 	255 174 185
-	LightPink2		:   Raphael.getRGB("#EEA2AD	"),  // 	238 162 173
-	LightPink3		:   Raphael.getRGB("#CD8C95	"),  // 	205 140 149
-	LightPink4		:   Raphael.getRGB("#8B5F65	"),  // 	139 95 101
-	PaleVioletRed1	:   Raphael.getRGB("#FF82AB	"),  // 	255 130 171
-	PaleVioletRed2	:   Raphael.getRGB("#EE799F	"),  // 	238 121 159
-	PaleVioletRed3	:   Raphael.getRGB("#CD6889	"),  // 	205 104 137
-	PaleVioletRed4	:   Raphael.getRGB("#8B475D	"),  // 	139 71 93
-	Maroon1			:   Raphael.getRGB("#FF34B3	"),  // 	255 52 179
-	Maroon2			:   Raphael.getRGB("#EE30A7	"),  // 	238 48 167
-	Maroon3			:   Raphael.getRGB("#CD2990	"),  // 	205 41 144
-	Maroon4			:   Raphael.getRGB("#8B1C62	"),  // 	139 28 98
-	VioletRed1		:   Raphael.getRGB("#FF3E96	"),  // 	255 62 150
-	VioletRed2		:   Raphael.getRGB("#EE3A8C	"),  // 	238 58 140
-	VioletRed3		:   Raphael.getRGB("#CD3278	"),  // 	205 50 120
-	VioletRed4		:   Raphael.getRGB("#8B2252	"),  // 	139 34 82
-	Magenta1		:   Raphael.getRGB("#FF00FF	"),  // 	255 0 255
-	Magenta2		:   Raphael.getRGB("#EE00EE	"),  // 	238 0 238
-	Magenta3		:   Raphael.getRGB("#CD00CD	"),  // 	205 0 205
-	Magenta4		:   Raphael.getRGB("#8B008B	"),  // 	139 0 139
-	Orchid1			:   Raphael.getRGB("#FF83FA	"),  // 	255 131 250
-	Orchid2			:   Raphael.getRGB("#EE7AE9	"),  // 	238 122 233
-	Orchid3			:   Raphael.getRGB("#CD69C9	"),  // 	205 105 201
-	Orchid4			:   Raphael.getRGB("#8B4789	"),  // 	139 71 137
-	Plum1			:   Raphael.getRGB("#FFBBFF	"),  // 	255 187 255
-	Plum2			:   Raphael.getRGB("#EEAEEE	"),  // 	238 174 238
-	Plum3			:   Raphael.getRGB("#CD96CD	"),  // 	205 150 205
-	Plum4			:   Raphael.getRGB("#8B668B	"),  // 	139 102 139
-	MediumOrchid1	:   Raphael.getRGB("#E066FF	"),  // 	224 102 255
-	MediumOrchid2	:   Raphael.getRGB("#D15FEE	"),  // 	209 95 238
-	MediumOrchid3	:   Raphael.getRGB("#B452CD	"),  // 	180 82 205
-	MediumOrchid4	:   Raphael.getRGB("#7A378B	"),  // 	122 55 139
-	DarkOrchid1		:   Raphael.getRGB("#BF3EFF	"),  // 	191 62 255
-	DarkOrchid2		:   Raphael.getRGB("#B23AEE	"),  // 	178 58 238
-	DarkOrchid3		:   Raphael.getRGB("#9A32CD	"),  // 	154 50 205
-	DarkOrchid4		:   Raphael.getRGB("#68228B	"),  // 	104 34 139
-	Purple1			:   Raphael.getRGB("#9B30FF	"),  // 	155 48 255
-	Purple2			:   Raphael.getRGB("#912CEE	"),  // 	145 44 238
-	Purple3			:   Raphael.getRGB("#7D26CD	"),  // 	125 38 205
-	Purple4			:   Raphael.getRGB("#551A8B	"),  // 	85 26 139
-	MediumPurple1	:   Raphael.getRGB("#AB82FF	"),  // 	171 130 255
-	MediumPurple2	:   Raphael.getRGB("#9F79EE	"),  // 	159 121 238
-	MediumPurple3	:   Raphael.getRGB("#8968CD	"),  // 	137 104 205
-	MediumPurple4	:   Raphael.getRGB("#5D478B	"),  // 	93 71 139
-	Thistle1		:   Raphael.getRGB("#FFE1FF	"),  // 	255 225 255
-	Thistle2		:   Raphael.getRGB("#EED2EE	"),  // 	238 210 238
-	Thistle3		:   Raphael.getRGB("#CDB5CD	"),  // 	205 181 205
-	Thistle4		:   Raphael.getRGB("#8B7B8B	"),  // 	139 123 139
-	grey11			:   Raphael.getRGB("#1C1C1C	"),  // 	28 28 28
-	grey21			:   Raphael.getRGB("#363636	"),  // 	54 54 54
-	grey31			:   Raphael.getRGB("#4F4F4F	"),  // 	79 79 79
-	grey41			:   Raphael.getRGB("#696969	"),  // 	105 105 105
-	grey51			:   Raphael.getRGB("#828282	"),  // 	130 130 130
-	grey61			:   Raphael.getRGB("#9C9C9C	"),  // 	156 156 156
-	grey71			:   Raphael.getRGB("#B5B5B5	"),  // 	181 181 181
-	gray81			:   Raphael.getRGB("#CFCFCF	"),  // 	207 207 207
-	gray91			:   Raphael.getRGB("#E8E8E8	"),  // 	232 232 232
-	DarkGrey		:   Raphael.getRGB("#A9A9A9	"),  // 	169 169 169
-	DarkBlue		:   Raphael.getRGB("#00008B	"),  // 	0 0 139
-	DarkCyan		:   Raphael.getRGB("#008B8B	"),  // 	0 139 139
-	DarkMagenta		:   Raphael.getRGB("#8B008B	"),  // 	139 0 139
-	DarkRed			:   Raphael.getRGB("#8B0000	"),  // 	139 0 0
-	LightGreen		:   Raphael.getRGB("#90EE90	"),  // 	144 238 144
+	/**
+	 * The color white.  In the default sRGB space.
+	 */
+	WHITE: this.white,
 
-  
-  
-  get: function(R, G, B){
-	return Raphael.getRGB("rgb(" + R + ", " + G + ", " + B + ")");
-  }
-};
\ No newline at end of file
+	/**
+	 * The color light gray.  In the default sRGB space.
+	 */
+	lightGray: Raphael.getRGB("rgb(192, 192, 192)"),
+
+	/**
+	 * The color light gray.  In the default sRGB space.
+	 */
+	LIGHT_GRAY: this.lightGray,
+
+	/**
+	 * The color gray.  In the default sRGB space.
+	 */
+	gray: Raphael.getRGB("rgb(128, 128, 128)"),
+
+	/**
+	 * The color gray.  In the default sRGB space.
+	 */
+	GRAY: this.gray,
+
+	/**
+	 * The color dark gray.  In the default sRGB space.
+	 */
+	darkGray: Raphael.getRGB("rgb(64, 64, 64)"),
+
+	/**
+	 * The color dark gray.  In the default sRGB space.
+	 */
+	DARK_GRAY: this.darkGray,
+
+	/**
+	 * The color black.  In the default sRGB space.
+	 */
+	black: Raphael.getRGB("rgb(0, 0, 0)"),
+
+	/**
+	 * The color black.  In the default sRGB space.
+	 */
+	BLACK: this.black,
+
+	/**
+	 * The color red.  In the default sRGB space.
+	 */
+	red: Raphael.getRGB("rgb(255, 0, 0)"),
+
+	/**
+	 * The color red.  In the default sRGB space.
+	 */
+	RED: this.red,
+
+	/**
+	 * The color pink.  In the default sRGB space.
+	 */
+	pink: Raphael.getRGB("rgb(255, 175, 175)"),
+
+	/**
+	 * The color pink.  In the default sRGB space.
+	 */
+	PINK: this.pink,
+
+	/**
+	 * The color orange.  In the default sRGB space.
+	 */
+	orange: Raphael.getRGB("rgb(255, 200, 0)"),
+
+	/**
+	 * The color orange.  In the default sRGB space.
+	 */
+	ORANGE: this.orange,
+
+	/**
+	 * The color yellow.  In the default sRGB space.
+	 */
+	yellow: Raphael.getRGB("rgb(255, 255, 0)"),
+
+	/**
+	 * The color yellow.  In the default sRGB space.
+	 */
+	YELLOW: this.yellow,
+
+	/**
+	 * The color green.  In the default sRGB space.
+	 */
+	green: Raphael.getRGB("rgb(0, 255, 0)"),
+
+	/**
+	 * The color green.  In the default sRGB space.
+	 */
+	GREEN: this.green,
+
+	/**
+	 * The color magenta.  In the default sRGB space.
+	 */
+	magenta: Raphael.getRGB("rgb(255, 0, 255)"),
+
+	/**
+	 * The color magenta.  In the default sRGB space.
+	 */
+	MAGENTA: this.magenta,
+
+	/**
+	 * The color cyan.  In the default sRGB space.
+	 */
+	cyan: Raphael.getRGB("rgb(0, 255, 255)"),
+
+	/**
+	 * The color cyan.  In the default sRGB space.
+	 */
+	CYAN: this.cyan,
+
+	/**
+	 * The color blue.  In the default sRGB space.
+	 */
+	blue: Raphael.getRGB("rgb(0, 0, 255)"),
+
+	/**
+	 * The color blue.  In the default sRGB space.
+	 */
+	BLUE: this.blue,
+
+	/************************************************************************/
+
+	// http://www.stm.dp.ua/web-design/color-html.php
+
+	Snow: Raphael.getRGB("#FFFAFA	"),  // 	255 250 250
+	GhostWhite: Raphael.getRGB("#F8F8FF	"),  // 	248 248 255
+	WhiteSmoke: Raphael.getRGB("#F5F5F5	"),  // 	245 245 245
+	Gainsboro: Raphael.getRGB("#DCDCDC	"),  // 	220 220 220
+	FloralWhite: Raphael.getRGB("#FFFAF0	"),  // 	255 250 240
+	OldLace: Raphael.getRGB("#FDF5E6	"),  // 	253 245 230
+	Linen: Raphael.getRGB("#FAF0E6	"),  // 	250 240 230
+	AntiqueWhite: Raphael.getRGB("#FAEBD7	"),  // 	250 235 215
+	PapayaWhip: Raphael.getRGB("#FFEFD5	"),  // 	255 239 213
+	BlanchedAlmond: Raphael.getRGB("#FFEBCD	"),  // 	255 235 205
+	Bisque: Raphael.getRGB("#FFE4C4	"),  // 	255 228 196
+	PeachPuff: Raphael.getRGB("#FFDAB9	"),  // 	255 218 185
+	NavajoWhite: Raphael.getRGB("#FFDEAD	"),  // 	255 222 173
+	Moccasin: Raphael.getRGB("#FFE4B5	"),  // 	255 228 181
+	Cornsilk: Raphael.getRGB("#FFF8DC	"),  // 	255 248 220
+	Ivory: Raphael.getRGB("#FFFFF0	"),  // 	255 255 240
+	LemonChiffon: Raphael.getRGB("#FFFACD	"),  // 	255 250 205
+	Seashell: Raphael.getRGB("#FFF5EE	"),  // 	255 245 238
+	Honeydew: Raphael.getRGB("#F0FFF0	"),  // 	240 255 240
+	MintCream: Raphael.getRGB("#F5FFFA	"),  // 	245 255 250
+	Azure: Raphael.getRGB("#F0FFFF	"),  // 	240 255 255
+	AliceBlue: Raphael.getRGB("#F0F8FF	"),  // 	240 248 255
+	lavender: Raphael.getRGB("#E6E6FA	"),  // 	230 230 250
+	LavenderBlush: Raphael.getRGB("#FFF0F5	"),  // 	255 240 245
+	MistyRose: Raphael.getRGB("#FFE4E1	"),  // 	255 228 225
+	White: Raphael.getRGB("#FFFFFF	"),  // 	255 255 255
+	Black: Raphael.getRGB("#000000	"),  // 	0 0 0
+	DarkSlateGray: Raphael.getRGB("#2F4F4F	"),  // 	47 79 79
+	DimGrey: Raphael.getRGB("#696969	"),  // 	105 105 105
+	SlateGrey: Raphael.getRGB("#708090	"),  // 	112 128 144
+	LightSlateGray: Raphael.getRGB("#778899	"),  // 	119 136 153
+	Grey: Raphael.getRGB("#BEBEBE	"),  // 	190 190 190
+	LightGray: Raphael.getRGB("#D3D3D3	"),  // 	211 211 211
+	MidnightBlue: Raphael.getRGB("#191970	"),  // 	25 25 112
+	NavyBlue: Raphael.getRGB("#000080	"),  // 	0 0 128
+	CornflowerBlue: Raphael.getRGB("#6495ED	"),  // 	100 149 237
+	DarkSlateBlue: Raphael.getRGB("#483D8B	"),  // 	72 61 139
+	SlateBlue: Raphael.getRGB("#6A5ACD	"),  // 	106 90 205
+	MediumSlateBlue: Raphael.getRGB("#7B68EE	"),  // 	123 104 238
+	LightSlateBlue: Raphael.getRGB("#8470FF	"),  // 	132 112 255
+	MediumBlue: Raphael.getRGB("#0000CD	"),  // 	0 0 205
+	RoyalBlue: Raphael.getRGB("#4169E1	"),  // 	65 105 225
+	Blue: Raphael.getRGB("#0000FF	"),  // 	0 0 255
+	DodgerBlue: Raphael.getRGB("#1E90FF	"),  // 	30 144 255
+	DeepSkyBlue: Raphael.getRGB("#00BFFF	"),  // 	0 191 255
+	SkyBlue: Raphael.getRGB("#87CEEB	"),  // 	135 206 235
+	LightSkyBlue: Raphael.getRGB("#87CEFA	"),  // 	135 206 250
+	SteelBlue: Raphael.getRGB("#4682B4	"),  // 	70 130 180
+	LightSteelBlue: Raphael.getRGB("#B0C4DE	"),  // 	176 196 222
+	LightBlue: Raphael.getRGB("#ADD8E6	"),  // 	173 216 230
+	PowderBlue: Raphael.getRGB("#B0E0E6	"),  // 	176 224 230
+	PaleTurquoise: Raphael.getRGB("#AFEEEE	"),  // 	175 238 238
+	DarkTurquoise: Raphael.getRGB("#00CED1	"),  // 	0 206 209
+	MediumTurquoise: Raphael.getRGB("#48D1CC	"),  // 	72 209 204
+	Turquoise: Raphael.getRGB("#40E0D0	"),  // 	64 224 208
+	Cyan: Raphael.getRGB("#00FFFF	"),  // 	0 255 255
+	LightCyan: Raphael.getRGB("#E0FFFF	"),  // 	224 255 255
+	CadetBlue: Raphael.getRGB("#5F9EA0	"),  // 	95 158 160
+	MediumAquamarine: Raphael.getRGB("#66CDAA	"),  // 	102 205 170
+	Aquamarine: Raphael.getRGB("#7FFFD4	"),  // 	127 255 212
+	DarkGreen: Raphael.getRGB("#006400	"),  // 	0 100 0
+	DarkOliveGreen: Raphael.getRGB("#556B2F	"),  // 	85 107 47
+	DarkSeaGreen: Raphael.getRGB("#8FBC8F	"),  // 	143 188 143
+	SeaGreen: Raphael.getRGB("#2E8B57	"),  // 	46 139 87
+	MediumSeaGreen: Raphael.getRGB("#3CB371	"),  // 	60 179 113
+	LightSeaGreen: Raphael.getRGB("#20B2AA	"),  // 	32 178 170
+	PaleGreen: Raphael.getRGB("#98FB98	"),  // 	152 251 152
+	SpringGreen: Raphael.getRGB("#00FF7F	"),  // 	0 255 127
+	LawnGreen: Raphael.getRGB("#7CFC00	"),  // 	124 252 0
+	Green: Raphael.getRGB("#00FF00	"),  // 	0 255 0
+	Chartreuse: Raphael.getRGB("#7FFF00	"),  // 	127 255 0
+	MedSpringGreen: Raphael.getRGB("#00FA9A	"),  // 	0 250 154
+	GreenYellow: Raphael.getRGB("#ADFF2F	"),  // 	173 255 47
+	LimeGreen: Raphael.getRGB("#32CD32	"),  // 	50 205 50
+	YellowGreen: Raphael.getRGB("#9ACD32	"),  // 	154 205 50
+	ForestGreen: Raphael.getRGB("#228B22	"),  // 	34 139 34
+	OliveDrab: Raphael.getRGB("#6B8E23	"),  // 	107 142 35
+	DarkKhaki: Raphael.getRGB("#BDB76B	"),  // 	189 183 107
+	PaleGoldenrod: Raphael.getRGB("#EEE8AA	"),  // 	238 232 170
+	LtGoldenrodYello: Raphael.getRGB("#FAFAD2	"),  // 	250 250 210
+	LightYellow: Raphael.getRGB("#FFFFE0	"),  // 	255 255 224
+	Yellow: Raphael.getRGB("#FFFF00	"),  // 	255 255 0
+	Gold: Raphael.getRGB("#FFD700	"),  // 	255 215 0
+	LightGoldenrod: Raphael.getRGB("#EEDD82	"),  // 	238 221 130
+	goldenrod: Raphael.getRGB("#DAA520	"),  // 	218 165 32
+	DarkGoldenrod: Raphael.getRGB("#B8860B	"),  // 	184 134 11
+	RosyBrown: Raphael.getRGB("#BC8F8F	"),  // 	188 143 143
+	IndianRed: Raphael.getRGB("#CD5C5C	"),  // 	205 92 92
+	SaddleBrown: Raphael.getRGB("#8B4513	"),  // 	139 69 19
+	Sienna: Raphael.getRGB("#A0522D	"),  // 	160 82 45
+	Peru: Raphael.getRGB("#CD853F	"),  // 	205 133 63
+	Burlywood: Raphael.getRGB("#DEB887	"),  // 	222 184 135
+	Beige: Raphael.getRGB("#F5F5DC	"),  // 	245 245 220
+	Wheat: Raphael.getRGB("#F5DEB3	"),  // 	245 222 179
+	SandyBrown: Raphael.getRGB("#F4A460	"),  // 	244 164 96
+	Tan: Raphael.getRGB("#D2B48C	"),  // 	210 180 140
+	Chocolate: Raphael.getRGB("#D2691E	"),  // 	210 105 30
+	Firebrick: Raphael.getRGB("#B22222	"),  // 	178 34 34
+	Brown: Raphael.getRGB("#A52A2A	"),  // 	165 42 42
+	DarkSalmon: Raphael.getRGB("#E9967A	"),  // 	233 150 122
+	Salmon: Raphael.getRGB("#FA8072	"),  // 	250 128 114
+	LightSalmon: Raphael.getRGB("#FFA07A	"),  // 	255 160 122
+	Orange: Raphael.getRGB("#FFA500	"),  // 	255 165 0
+	DarkOrange: Raphael.getRGB("#FF8C00	"),  // 	255 140 0
+	Coral: Raphael.getRGB("#FF7F50	"),  // 	255 127 80
+	LightCoral: Raphael.getRGB("#F08080	"),  // 	240 128 128
+	Tomato: Raphael.getRGB("#FF6347	"),  // 	255 99 71
+	OrangeRed: Raphael.getRGB("#FF4500	"),  // 	255 69 0
+	Red: Raphael.getRGB("#FF0000	"),  // 	255 0 0
+	HotPink: Raphael.getRGB("#FF69B4	"),  // 	255 105 180
+	DeepPink: Raphael.getRGB("#FF1493	"),  // 	255 20 147
+	Pink: Raphael.getRGB("#FFC0CB	"),  // 	255 192 203
+	LightPink: Raphael.getRGB("#FFB6C1	"),  // 	255 182 193
+	PaleVioletRed: Raphael.getRGB("#DB7093	"),  // 	219 112 147
+	Maroon: Raphael.getRGB("#B03060	"),  // 	176 48 96
+	MediumVioletRed: Raphael.getRGB("#C71585	"),  // 	199 21 133
+	VioletRed: Raphael.getRGB("#D02090	"),  // 	208 32 144
+	Magenta: Raphael.getRGB("#FF00FF	"),  // 	255 0 255
+	Violet: Raphael.getRGB("#EE82EE	"),  // 	238 130 238
+	Plum: Raphael.getRGB("#DDA0DD	"),  // 	221 160 221
+	Orchid: Raphael.getRGB("#DA70D6	"),  // 	218 112 214
+	MediumOrchid: Raphael.getRGB("#BA55D3	"),  // 	186 85 211
+	DarkOrchid: Raphael.getRGB("#9932CC	"),  // 	153 50 204
+	DarkViolet: Raphael.getRGB("#9400D3	"),  // 	148 0 211
+	BlueViolet: Raphael.getRGB("#8A2BE2	"),  // 	138 43 226
+	Purple: Raphael.getRGB("#A020F0	"),  // 	160 32 240
+	MediumPurple: Raphael.getRGB("#9370DB	"),  // 	147 112 219
+	Thistle: Raphael.getRGB("#D8BFD8	"),  // 	216 191 216
+	Snow1: Raphael.getRGB("#FFFAFA	"),  // 	255 250 250
+	Snow2: Raphael.getRGB("#EEE9E9	"),  // 	238 233 233
+	Snow3: Raphael.getRGB("#CDC9C9	"),  // 	205 201 201
+	Snow4: Raphael.getRGB("#8B8989	"),  // 	139 137 137
+	Seashell1: Raphael.getRGB("#FFF5EE	"),  // 	255 245 238
+	Seashell2: Raphael.getRGB("#EEE5DE	"),  // 	238 229 222
+	Seashell3: Raphael.getRGB("#CDC5BF	"),  // 	205 197 191
+	Seashell4: Raphael.getRGB("#8B8682	"),  // 	139 134 130
+	AntiqueWhite1: Raphael.getRGB("#FFEFDB	"),  // 	255 239 219
+	AntiqueWhite2: Raphael.getRGB("#EEDFCC	"),  // 	238 223 204
+	AntiqueWhite3: Raphael.getRGB("#CDC0B0	"),  // 	205 192 176
+	AntiqueWhite4: Raphael.getRGB("#8B8378	"),  // 	139 131 120
+	Bisque1: Raphael.getRGB("#FFE4C4	"),  // 	255 228 196
+	Bisque2: Raphael.getRGB("#EED5B7	"),  // 	238 213 183
+	Bisque3: Raphael.getRGB("#CDB79E	"),  // 	205 183 158
+	Bisque4: Raphael.getRGB("#8B7D6B	"),  // 	139 125 107
+	PeachPuff1: Raphael.getRGB("#FFDAB9	"),  // 	255 218 185
+	PeachPuff2: Raphael.getRGB("#EECBAD	"),  // 	238 203 173
+	PeachPuff3: Raphael.getRGB("#CDAF95	"),  // 	205 175 149
+	PeachPuff4: Raphael.getRGB("#8B7765	"),  // 	139 119 101
+	NavajoWhite1: Raphael.getRGB("#FFDEAD	"),  // 	255 222 173
+	NavajoWhite2: Raphael.getRGB("#EECFA1	"),  // 	238 207 161
+	NavajoWhite3: Raphael.getRGB("#CDB38B	"),  // 	205 179 139
+	NavajoWhite4: Raphael.getRGB("#8B795E	"),  // 	139 121 94
+	LemonChiffon1: Raphael.getRGB("#FFFACD	"),  // 	255 250 205
+	LemonChiffon2: Raphael.getRGB("#EEE9BF	"),  // 	238 233 191
+	LemonChiffon3: Raphael.getRGB("#CDC9A5	"),  // 	205 201 165
+	LemonChiffon4: Raphael.getRGB("#8B8970	"),  // 	139 137 112
+	Cornsilk1: Raphael.getRGB("#FFF8DC	"),  // 	255 248 220
+	Cornsilk2: Raphael.getRGB("#EEE8CD	"),  // 	238 232 205
+	Cornsilk3: Raphael.getRGB("#CDC8B1	"),  // 	205 200 177
+	Cornsilk4: Raphael.getRGB("#8B8878	"),  // 	139 136 120
+	Ivory1: Raphael.getRGB("#FFFFF0	"),  // 	255 255 240
+	Ivory2: Raphael.getRGB("#EEEEE0	"),  // 	238 238 224
+	Ivory3: Raphael.getRGB("#CDCDC1	"),  // 	205 205 193
+	Ivory4: Raphael.getRGB("#8B8B83	"),  // 	139 139 131
+	Honeydew1: Raphael.getRGB("#F0FFF0	"),  // 	240 255 240
+	Honeydew2: Raphael.getRGB("#E0EEE0	"),  // 	224 238 224
+	Honeydew3: Raphael.getRGB("#C1CDC1	"),  // 	193 205 193
+	Honeydew4: Raphael.getRGB("#838B83	"),  // 	131 139 131
+	LavenderBlush1: Raphael.getRGB("#FFF0F5	"),  // 	255 240 245
+	LavenderBlush2: Raphael.getRGB("#EEE0E5	"),  // 	238 224 229
+	LavenderBlush3: Raphael.getRGB("#CDC1C5	"),  // 	205 193 197
+	LavenderBlush4: Raphael.getRGB("#8B8386	"),  // 	139 131 134
+	MistyRose1: Raphael.getRGB("#FFE4E1	"),  // 	255 228 225
+	MistyRose2: Raphael.getRGB("#EED5D2	"),  // 	238 213 210
+	MistyRose3: Raphael.getRGB("#CDB7B5	"),  // 	205 183 181
+	MistyRose4: Raphael.getRGB("#8B7D7B	"),  // 	139 125 123
+	Azure1: Raphael.getRGB("#F0FFFF	"),  // 	240 255 255
+	Azure2: Raphael.getRGB("#E0EEEE	"),  // 	224 238 238
+	Azure3: Raphael.getRGB("#C1CDCD	"),  // 	193 205 205
+	Azure4: Raphael.getRGB("#838B8B	"),  // 	131 139 139
+	SlateBlue1: Raphael.getRGB("#836FFF	"),  // 	131 111 255
+	SlateBlue2: Raphael.getRGB("#7A67EE	"),  // 	122 103 238
+	SlateBlue3: Raphael.getRGB("#6959CD	"),  // 	105 89 205
+	SlateBlue4: Raphael.getRGB("#473C8B	"),  // 	71 60 139
+	RoyalBlue1: Raphael.getRGB("#4876FF	"),  // 	72 118 255
+	RoyalBlue2: Raphael.getRGB("#436EEE	"),  // 	67 110 238
+	RoyalBlue3: Raphael.getRGB("#3A5FCD	"),  // 	58 95 205
+	RoyalBlue4: Raphael.getRGB("#27408B	"),  // 	39 64 139
+	Blue1: Raphael.getRGB("#0000FF	"),  // 	0 0 255
+	Blue2: Raphael.getRGB("#0000EE	"),  // 	0 0 238
+	Blue3: Raphael.getRGB("#0000CD	"),  // 	0 0 205
+	Blue4: Raphael.getRGB("#00008B	"),  // 	0 0 139
+	DodgerBlue1: Raphael.getRGB("#1E90FF	"),  // 	30 144 255
+	DodgerBlue2: Raphael.getRGB("#1C86EE	"),  // 	28 134 238
+	DodgerBlue3: Raphael.getRGB("#1874CD	"),  // 	24 116 205
+	DodgerBlue4: Raphael.getRGB("#104E8B	"),  // 	16 78 139
+	SteelBlue1: Raphael.getRGB("#63B8FF	"),  // 	99 184 255
+	SteelBlue2: Raphael.getRGB("#5CACEE	"),  // 	92 172 238
+	SteelBlue3: Raphael.getRGB("#4F94CD	"),  // 	79 148 205
+	SteelBlue4: Raphael.getRGB("#36648B	"),  // 	54 100 139
+	DeepSkyBlue1: Raphael.getRGB("#00BFFF	"),  // 	0 191 255
+	DeepSkyBlue2: Raphael.getRGB("#00B2EE	"),  // 	0 178 238
+	DeepSkyBlue3: Raphael.getRGB("#009ACD	"),  // 	0 154 205
+	DeepSkyBlue4: Raphael.getRGB("#00688B	"),  // 	0 104 139
+	SkyBlue1: Raphael.getRGB("#87CEFF	"),  // 	135 206 255
+	SkyBlue2: Raphael.getRGB("#7EC0EE	"),  // 	126 192 238
+	SkyBlue3: Raphael.getRGB("#6CA6CD	"),  // 	108 166 205
+	SkyBlue4: Raphael.getRGB("#4A708B	"),  // 	74 112 139
+	LightSkyBlue1: Raphael.getRGB("#B0E2FF	"),  // 	176 226 255
+	LightSkyBlue2: Raphael.getRGB("#A4D3EE	"),  // 	164 211 238
+	LightSkyBlue3: Raphael.getRGB("#8DB6CD	"),  // 	141 182 205
+	LightSkyBlue4: Raphael.getRGB("#607B8B	"),  // 	96 123 139
+	SlateGray1: Raphael.getRGB("#C6E2FF	"),  // 	198 226 255
+	SlateGray2: Raphael.getRGB("#B9D3EE	"),  // 	185 211 238
+	SlateGray3: Raphael.getRGB("#9FB6CD	"),  // 	159 182 205
+	SlateGray4: Raphael.getRGB("#6C7B8B	"),  // 	108 123 139
+	LightSteelBlue1: Raphael.getRGB("#CAE1FF	"),  // 	202 225 255
+	LightSteelBlue2: Raphael.getRGB("#BCD2EE	"),  // 	188 210 238
+	LightSteelBlue3: Raphael.getRGB("#A2B5CD	"),  // 	162 181 205
+	LightSteelBlue4: Raphael.getRGB("#6E7B8B	"),  // 	110 123 139
+	LightBlue1: Raphael.getRGB("#BFEFFF	"),  // 	191 239 255
+	LightBlue2: Raphael.getRGB("#B2DFEE	"),  // 	178 223 238
+	LightBlue3: Raphael.getRGB("#9AC0CD	"),  // 	154 192 205
+	LightBlue4: Raphael.getRGB("#68838B	"),  // 	104 131 139
+	LightCyan1: Raphael.getRGB("#E0FFFF	"),  // 	224 255 255
+	LightCyan2: Raphael.getRGB("#D1EEEE	"),  // 	209 238 238
+	LightCyan3: Raphael.getRGB("#B4CDCD	"),  // 	180 205 205
+	LightCyan4: Raphael.getRGB("#7A8B8B	"),  // 	122 139 139
+	PaleTurquoise1: Raphael.getRGB("#BBFFFF	"),  // 	187 255 255
+	PaleTurquoise2: Raphael.getRGB("#AEEEEE	"),  // 	174 238 238
+	PaleTurquoise3: Raphael.getRGB("#96CDCD	"),  // 	150 205 205
+	PaleTurquoise4: Raphael.getRGB("#668B8B	"),  // 	102 139 139
+	CadetBlue1: Raphael.getRGB("#98F5FF	"),  // 	152 245 255
+	CadetBlue2: Raphael.getRGB("#8EE5EE	"),  // 	142 229 238
+	CadetBlue3: Raphael.getRGB("#7AC5CD	"),  // 	122 197 205
+	CadetBlue4: Raphael.getRGB("#53868B	"),  // 	83 134 139
+	Turquoise1: Raphael.getRGB("#00F5FF	"),  // 	0 245 255
+	Turquoise2: Raphael.getRGB("#00E5EE	"),  // 	0 229 238
+	Turquoise3: Raphael.getRGB("#00C5CD	"),  // 	0 197 205
+	Turquoise4: Raphael.getRGB("#00868B	"),  // 	0 134 139
+	Cyan1: Raphael.getRGB("#00FFFF	"),  // 	0 255 255
+	Cyan2: Raphael.getRGB("#00EEEE	"),  // 	0 238 238
+	Cyan3: Raphael.getRGB("#00CDCD	"),  // 	0 205 205
+	Cyan4: Raphael.getRGB("#008B8B	"),  // 	0 139 139
+	DarkSlateGray1: Raphael.getRGB("#97FFFF	"),  // 	151 255 255
+	DarkSlateGray2: Raphael.getRGB("#8DEEEE	"),  // 	141 238 238
+	DarkSlateGray3: Raphael.getRGB("#79CDCD	"),  // 	121 205 205
+	DarkSlateGray4: Raphael.getRGB("#528B8B	"),  // 	82 139 139
+	Aquamarine1: Raphael.getRGB("#7FFFD4	"),  // 	127 255 212
+	Aquamarine2: Raphael.getRGB("#76EEC6	"),  // 	118 238 198
+	Aquamarine3: Raphael.getRGB("#66CDAA	"),  // 	102 205 170
+	Aquamarine4: Raphael.getRGB("#458B74	"),  // 	69 139 116
+	DarkSeaGreen1: Raphael.getRGB("#C1FFC1	"),  // 	193 255 193
+	DarkSeaGreen2: Raphael.getRGB("#B4EEB4	"),  // 	180 238 180
+	DarkSeaGreen3: Raphael.getRGB("#9BCD9B	"),  // 	155 205 155
+	DarkSeaGreen4: Raphael.getRGB("#698B69	"),  // 	105 139 105
+	SeaGreen1: Raphael.getRGB("#54FF9F	"),  // 	84 255 159
+	SeaGreen2: Raphael.getRGB("#4EEE94	"),  // 	78 238 148
+	SeaGreen3: Raphael.getRGB("#43CD80	"),  // 	67 205 128
+	SeaGreen4: Raphael.getRGB("#2E8B57	"),  // 	46 139 87
+	PaleGreen1: Raphael.getRGB("#9AFF9A	"),  // 	154 255 154
+	PaleGreen2: Raphael.getRGB("#90EE90	"),  // 	144 238 144
+	PaleGreen3: Raphael.getRGB("#7CCD7C	"),  // 	124 205 124
+	PaleGreen4: Raphael.getRGB("#548B54	"),  // 	84 139 84
+	SpringGreen1: Raphael.getRGB("#00FF7F	"),  // 	0 255 127
+	SpringGreen2: Raphael.getRGB("#00EE76	"),  // 	0 238 118
+	SpringGreen3: Raphael.getRGB("#00CD66	"),  // 	0 205 102
+	SpringGreen4: Raphael.getRGB("#008B45	"),  // 	0 139 69
+	Green1: Raphael.getRGB("#00FF00	"),  // 	0 255 0
+	Green2: Raphael.getRGB("#00EE00	"),  // 	0 238 0
+	Green3: Raphael.getRGB("#00CD00	"),  // 	0 205 0
+	Green4: Raphael.getRGB("#008B00	"),  // 	0 139 0
+	Chartreuse1: Raphael.getRGB("#7FFF00	"),  // 	127 255 0
+	Chartreuse2: Raphael.getRGB("#76EE00	"),  // 	118 238 0
+	Chartreuse3: Raphael.getRGB("#66CD00	"),  // 	102 205 0
+	Chartreuse4: Raphael.getRGB("#458B00	"),  // 	69 139 0
+	OliveDrab1: Raphael.getRGB("#C0FF3E	"),  // 	192 255 62
+	OliveDrab2: Raphael.getRGB("#B3EE3A	"),  // 	179 238 58
+	OliveDrab3: Raphael.getRGB("#9ACD32	"),  // 	154 205 50
+	OliveDrab4: Raphael.getRGB("#698B22	"),  // 	105 139 34
+	DarkOliveGreen1: Raphael.getRGB("#CAFF70	"),  // 	202 255 112
+	DarkOliveGreen2: Raphael.getRGB("#BCEE68	"),  // 	188 238 104
+	DarkOliveGreen3: Raphael.getRGB("#A2CD5A	"),  // 	162 205 90
+	DarkOliveGreen4: Raphael.getRGB("#6E8B3D	"),  // 	110 139 61
+	Khaki1: Raphael.getRGB("#FFF68F	"),  // 	255 246 143
+	Khaki2: Raphael.getRGB("#EEE685	"),  // 	238 230 133
+	Khaki3: Raphael.getRGB("#CDC673	"),  // 	205 198 115
+	Khaki4: Raphael.getRGB("#8B864E	"),  // 	139 134 78
+	LightGoldenrod1: Raphael.getRGB("#FFEC8B	"),  // 	255 236 139
+	LightGoldenrod2: Raphael.getRGB("#EEDC82	"),  // 	238 220 130
+	LightGoldenrod3: Raphael.getRGB("#CDBE70	"),  // 	205 190 112
+	LightGoldenrod4: Raphael.getRGB("#8B814C	"),  // 	139 129 76
+	LightYellow1: Raphael.getRGB("#FFFFE0	"),  // 	255 255 224
+	LightYellow2: Raphael.getRGB("#EEEED1	"),  // 	238 238 209
+	LightYellow3: Raphael.getRGB("#CDCDB4	"),  // 	205 205 180
+	LightYellow4: Raphael.getRGB("#8B8B7A	"),  // 	139 139 122
+	Yellow1: Raphael.getRGB("#FFFF00	"),  // 	255 255 0
+	Yellow2: Raphael.getRGB("#EEEE00	"),  // 	238 238 0
+	Yellow3: Raphael.getRGB("#CDCD00	"),  // 	205 205 0
+	Yellow4: Raphael.getRGB("#8B8B00	"),  // 	139 139 0
+	Gold1: Raphael.getRGB("#FFD700	"),  // 	255 215 0
+	Gold2: Raphael.getRGB("#EEC900	"),  // 	238 201 0
+	Gold3: Raphael.getRGB("#CDAD00	"),  // 	205 173 0
+	Gold4: Raphael.getRGB("#8B7500	"),  // 	139 117 0
+	Goldenrod1: Raphael.getRGB("#FFC125	"),  // 	255 193 37
+	Goldenrod2: Raphael.getRGB("#EEB422	"),  // 	238 180 34
+	Goldenrod3: Raphael.getRGB("#CD9B1D	"),  // 	205 155 29
+	Goldenrod4: Raphael.getRGB("#8B6914	"),  // 	139 105 20
+	DarkGoldenrod1: Raphael.getRGB("#FFB90F	"),  // 	255 185 15
+	DarkGoldenrod2: Raphael.getRGB("#EEAD0E	"),  // 	238 173 14
+	DarkGoldenrod3: Raphael.getRGB("#CD950C	"),  // 	205 149 12
+	DarkGoldenrod4: Raphael.getRGB("#8B658B	"),  // 	139 101 8
+	RosyBrown1: Raphael.getRGB("#FFC1C1	"),  // 	255 193 193
+	RosyBrown2: Raphael.getRGB("#EEB4B4	"),  // 	238 180 180
+	RosyBrown3: Raphael.getRGB("#CD9B9B	"),  // 	205 155 155
+	RosyBrown4: Raphael.getRGB("#8B6969	"),  // 	139 105 105
+	IndianRed1: Raphael.getRGB("#FF6A6A	"),  // 	255 106 106
+	IndianRed2: Raphael.getRGB("#EE6363	"),  // 	238 99 99
+	IndianRed3: Raphael.getRGB("#CD5555	"),  // 	205 85 85
+	IndianRed4: Raphael.getRGB("#8B3A3A	"),  // 	139 58 58
+	Sienna1: Raphael.getRGB("#FF8247	"),  // 	255 130 71
+	Sienna2: Raphael.getRGB("#EE7942	"),  // 	238 121 66
+	Sienna3: Raphael.getRGB("#CD6839	"),  // 	205 104 57
+	Sienna4: Raphael.getRGB("#8B4726	"),  // 	139 71 38
+	Burlywood1: Raphael.getRGB("#FFD39B	"),  // 	255 211 155
+	Burlywood2: Raphael.getRGB("#EEC591	"),  // 	238 197 145
+	Burlywood3: Raphael.getRGB("#CDAA7D	"),  // 	205 170 125
+	Burlywood4: Raphael.getRGB("#8B7355	"),  // 	139 115 85
+	Wheat1: Raphael.getRGB("#FFE7BA	"),  // 	255 231 186
+	Wheat2: Raphael.getRGB("#EED8AE	"),  // 	238 216 174
+	Wheat3: Raphael.getRGB("#CDBA96	"),  // 	205 186 150
+	Wheat4: Raphael.getRGB("#8B7E66	"),  // 	139 126 102
+	Tan1: Raphael.getRGB("#FFA54F	"),  // 	255 165 79
+	Tan2: Raphael.getRGB("#EE9A49	"),  // 	238 154 73
+	Tan3: Raphael.getRGB("#CD853F	"),  // 	205 133 63
+	Tan4: Raphael.getRGB("#8B5A2B	"),  // 	139 90 43
+	Chocolate1: Raphael.getRGB("#FF7F24	"),  // 	255 127 36
+	Chocolate2: Raphael.getRGB("#EE7621	"),  // 	238 118 33
+	Chocolate3: Raphael.getRGB("#CD661D	"),  // 	205 102 29
+	Chocolate4: Raphael.getRGB("#8B4513	"),  // 	139 69 19
+	Firebrick1: Raphael.getRGB("#FF3030	"),  // 	255 48 48
+	Firebrick2: Raphael.getRGB("#EE2C2C	"),  // 	238 44 44
+	Firebrick3: Raphael.getRGB("#CD2626	"),  // 	205 38 38
+	Firebrick4: Raphael.getRGB("#8B1A1A	"),  // 	139 26 26
+	Brown1: Raphael.getRGB("#FF4040	"),  // 	255 64 64
+	Brown2: Raphael.getRGB("#EE3B3B	"),  // 	238 59 59
+	Brown3: Raphael.getRGB("#CD3333	"),  // 	205 51 51
+	Brown4: Raphael.getRGB("#8B2323	"),  // 	139 35 35
+	Salmon1: Raphael.getRGB("#FF8C69	"),  // 	255 140 105
+	Salmon2: Raphael.getRGB("#EE8262	"),  // 	238 130 98
+	Salmon3: Raphael.getRGB("#CD7054	"),  // 	205 112 84
+	Salmon4: Raphael.getRGB("#8B4C39	"),  // 	139 76 57
+	LightSalmon1: Raphael.getRGB("#FFA07A	"),  // 	255 160 122
+	LightSalmon2: Raphael.getRGB("#EE9572	"),  // 	238 149 114
+	LightSalmon3: Raphael.getRGB("#CD8162	"),  // 	205 129 98
+	LightSalmon4: Raphael.getRGB("#8B5742	"),  // 	139 87 66
+	Orange1: Raphael.getRGB("#FFA500	"),  // 	255 165 0
+	Orange2: Raphael.getRGB("#EE9A00	"),  // 	238 154 0
+	Orange3: Raphael.getRGB("#CD8500	"),  // 	205 133 0
+	Orange4: Raphael.getRGB("#8B5A00	"),  // 	139 90 0
+	DarkOrange1: Raphael.getRGB("#FF7F00	"),  // 	255 127 0
+	DarkOrange2: Raphael.getRGB("#EE7600	"),  // 	238 118 0
+	DarkOrange3: Raphael.getRGB("#CD6600	"),  // 	205 102 0
+	DarkOrange4: Raphael.getRGB("#8B4500	"),  // 	139 69 0
+	Coral1: Raphael.getRGB("#FF7256	"),  // 	255 114 86
+	Coral2: Raphael.getRGB("#EE6A50	"),  // 	238 106 80
+	Coral3: Raphael.getRGB("#CD5B45	"),  // 	205 91 69
+	Coral4: Raphael.getRGB("#8B3E2F	"),  // 	139 62 47
+	Tomato1: Raphael.getRGB("#FF6347	"),  // 	255 99 71
+	Tomato2: Raphael.getRGB("#EE5C42	"),  // 	238 92 66
+	Tomato3: Raphael.getRGB("#CD4F39	"),  // 	205 79 57
+	Tomato4: Raphael.getRGB("#8B3626	"),  // 	139 54 38
+	OrangeRed1: Raphael.getRGB("#FF4500	"),  // 	255 69 0
+	OrangeRed2: Raphael.getRGB("#EE4000	"),  // 	238 64 0
+	OrangeRed3: Raphael.getRGB("#CD3700	"),  // 	205 55 0
+	OrangeRed4: Raphael.getRGB("#8B2500	"),  // 	139 37 0
+	Red1: Raphael.getRGB("#FF0000	"),  // 	255 0 0
+	Red2: Raphael.getRGB("#EE0000	"),  // 	238 0 0
+	Red3: Raphael.getRGB("#CD0000	"),  // 	205 0 0
+	Red4: Raphael.getRGB("#8B0000	"),  // 	139 0 0
+	DeepPink1: Raphael.getRGB("#FF1493	"),  // 	255 20 147
+	DeepPink2: Raphael.getRGB("#EE1289	"),  // 	238 18 137
+	DeepPink3: Raphael.getRGB("#CD1076	"),  // 	205 16 118
+	DeepPink4: Raphael.getRGB("#8B0A50	"),  // 	139 10 80
+	HotPink1: Raphael.getRGB("#FF6EB4	"),  // 	255 110 180
+	HotPink2: Raphael.getRGB("#EE6AA7	"),  // 	238 106 167
+	HotPink3: Raphael.getRGB("#CD6090	"),  // 	205 96 144
+	HotPink4: Raphael.getRGB("#8B3A62	"),  // 	139 58 98
+	Pink1: Raphael.getRGB("#FFB5C5	"),  // 	255 181 197
+	Pink2: Raphael.getRGB("#EEA9B8	"),  // 	238 169 184
+	Pink3: Raphael.getRGB("#CD919E	"),  // 	205 145 158
+	Pink4: Raphael.getRGB("#8B636C	"),  // 	139 99 108
+	LightPink1: Raphael.getRGB("#FFAEB9	"),  // 	255 174 185
+	LightPink2: Raphael.getRGB("#EEA2AD	"),  // 	238 162 173
+	LightPink3: Raphael.getRGB("#CD8C95	"),  // 	205 140 149
+	LightPink4: Raphael.getRGB("#8B5F65	"),  // 	139 95 101
+	PaleVioletRed1: Raphael.getRGB("#FF82AB	"),  // 	255 130 171
+	PaleVioletRed2: Raphael.getRGB("#EE799F	"),  // 	238 121 159
+	PaleVioletRed3: Raphael.getRGB("#CD6889	"),  // 	205 104 137
+	PaleVioletRed4: Raphael.getRGB("#8B475D	"),  // 	139 71 93
+	Maroon1: Raphael.getRGB("#FF34B3	"),  // 	255 52 179
+	Maroon2: Raphael.getRGB("#EE30A7	"),  // 	238 48 167
+	Maroon3: Raphael.getRGB("#CD2990	"),  // 	205 41 144
+	Maroon4: Raphael.getRGB("#8B1C62	"),  // 	139 28 98
+	VioletRed1: Raphael.getRGB("#FF3E96	"),  // 	255 62 150
+	VioletRed2: Raphael.getRGB("#EE3A8C	"),  // 	238 58 140
+	VioletRed3: Raphael.getRGB("#CD3278	"),  // 	205 50 120
+	VioletRed4: Raphael.getRGB("#8B2252	"),  // 	139 34 82
+	Magenta1: Raphael.getRGB("#FF00FF	"),  // 	255 0 255
+	Magenta2: Raphael.getRGB("#EE00EE	"),  // 	238 0 238
+	Magenta3: Raphael.getRGB("#CD00CD	"),  // 	205 0 205
+	Magenta4: Raphael.getRGB("#8B008B	"),  // 	139 0 139
+	Orchid1: Raphael.getRGB("#FF83FA	"),  // 	255 131 250
+	Orchid2: Raphael.getRGB("#EE7AE9	"),  // 	238 122 233
+	Orchid3: Raphael.getRGB("#CD69C9	"),  // 	205 105 201
+	Orchid4: Raphael.getRGB("#8B4789	"),  // 	139 71 137
+	Plum1: Raphael.getRGB("#FFBBFF	"),  // 	255 187 255
+	Plum2: Raphael.getRGB("#EEAEEE	"),  // 	238 174 238
+	Plum3: Raphael.getRGB("#CD96CD	"),  // 	205 150 205
+	Plum4: Raphael.getRGB("#8B668B	"),  // 	139 102 139
+	MediumOrchid1: Raphael.getRGB("#E066FF	"),  // 	224 102 255
+	MediumOrchid2: Raphael.getRGB("#D15FEE	"),  // 	209 95 238
+	MediumOrchid3: Raphael.getRGB("#B452CD	"),  // 	180 82 205
+	MediumOrchid4: Raphael.getRGB("#7A378B	"),  // 	122 55 139
+	DarkOrchid1: Raphael.getRGB("#BF3EFF	"),  // 	191 62 255
+	DarkOrchid2: Raphael.getRGB("#B23AEE	"),  // 	178 58 238
+	DarkOrchid3: Raphael.getRGB("#9A32CD	"),  // 	154 50 205
+	DarkOrchid4: Raphael.getRGB("#68228B	"),  // 	104 34 139
+	Purple1: Raphael.getRGB("#9B30FF	"),  // 	155 48 255
+	Purple2: Raphael.getRGB("#912CEE	"),  // 	145 44 238
+	Purple3: Raphael.getRGB("#7D26CD	"),  // 	125 38 205
+	Purple4: Raphael.getRGB("#551A8B	"),  // 	85 26 139
+	MediumPurple1: Raphael.getRGB("#AB82FF	"),  // 	171 130 255
+	MediumPurple2: Raphael.getRGB("#9F79EE	"),  // 	159 121 238
+	MediumPurple3: Raphael.getRGB("#8968CD	"),  // 	137 104 205
+	MediumPurple4: Raphael.getRGB("#5D478B	"),  // 	93 71 139
+	Thistle1: Raphael.getRGB("#FFE1FF	"),  // 	255 225 255
+	Thistle2: Raphael.getRGB("#EED2EE	"),  // 	238 210 238
+	Thistle3: Raphael.getRGB("#CDB5CD	"),  // 	205 181 205
+	Thistle4: Raphael.getRGB("#8B7B8B	"),  // 	139 123 139
+	grey11: Raphael.getRGB("#1C1C1C	"),  // 	28 28 28
+	grey21: Raphael.getRGB("#363636	"),  // 	54 54 54
+	grey31: Raphael.getRGB("#4F4F4F	"),  // 	79 79 79
+	grey41: Raphael.getRGB("#696969	"),  // 	105 105 105
+	grey51: Raphael.getRGB("#828282	"),  // 	130 130 130
+	grey61: Raphael.getRGB("#9C9C9C	"),  // 	156 156 156
+	grey71: Raphael.getRGB("#B5B5B5	"),  // 	181 181 181
+	gray81: Raphael.getRGB("#CFCFCF	"),  // 	207 207 207
+	gray91: Raphael.getRGB("#E8E8E8	"),  // 	232 232 232
+	DarkGrey: Raphael.getRGB("#A9A9A9	"),  // 	169 169 169
+	DarkBlue: Raphael.getRGB("#00008B	"),  // 	0 0 139
+	DarkCyan: Raphael.getRGB("#008B8B	"),  // 	0 139 139
+	DarkMagenta: Raphael.getRGB("#8B008B	"),  // 	139 0 139
+	DarkRed: Raphael.getRGB("#8B0000	"),  // 	139 0 0
+	LightGreen: Raphael.getRGB("#90EE90	"),  // 	144 238 144
+
+
+	get: function (R, G, B) {
+		return Raphael.getRGB("rgb(" + R + ", " + G + ", " + B + ")");
+	}
+};
diff --git a/len-activiti/src/main/resources/static/diagram-viewer/js/LineBreakMeasurer.js b/len-activiti/src/main/resources/static/diagram-viewer/js/LineBreakMeasurer.js
index edba1a0..26730ed 100644
--- a/len-activiti/src/main/resources/static/diagram-viewer/js/LineBreakMeasurer.js
+++ b/len-activiti/src/main/resources/static/diagram-viewer/js/LineBreakMeasurer.js
@@ -1,270 +1,270 @@
 /**
  * Word wrapping
- * 
+ *
  * @author (Javascript) Dmitry Farafonov
  */
 
-		var AttributedStringIterator = function(text){
-				//this.text = this.rtrim(this.ltrim(text));
-				text = text.replace(/(\s)+/, " ");
-				this.text = this.rtrim(text);
+var AttributedStringIterator = function (text) {
+	//this.text = this.rtrim(this.ltrim(text));
+	text = text.replace(/(\s)+/, " ");
+	this.text = this.rtrim(text);
+	/*
+	if (beginIndex < 0 || beginIndex > endIndex || endIndex > length()) {
+		throw new IllegalArgumentException("Invalid substring range");
+	}
+	*/
+	this.beginIndex = 0;
+	this.endIndex = this.text.length;
+	this.currentIndex = this.beginIndex;
+
+	//console.group("[AttributedStringIterator]");
+	var i = 0;
+	var string = this.text;
+	var fullPos = 0;
+
+	//console.log("string: \"" + string + "\", length: " + string.length);
+	this.startWordOffsets = [];
+	this.startWordOffsets.push(fullPos);
+
+	// TODO: remove i 1000
+	while (i < 1000) {
+		var pos = string.search(/[ \t\n\f-\.\,]/);
+		if (pos == -1)
+			break;
+
+		// whitespace start
+		fullPos += pos;
+		string = string.substr(pos);
+		////console.log("fullPos: " + fullPos + ", pos: " + pos +  ", string: ", string);
+
+		// remove whitespaces
+		var pos = string.search(/[^ \t\n\f-\.\,]/);
+		if (pos == -1)
+			break;
+
+		// whitespace end
+		fullPos += pos;
+		string = string.substr(pos);
+
+		////console.log("fullPos: " + fullPos);
+		this.startWordOffsets.push(fullPos);
+
+		i++;
+	}
+	//console.log("startWordOffsets: ", this.startWordOffsets);
+	//console.groupEnd();
+};
+AttributedStringIterator.prototype = {
+	getEndIndex: function (pos) {
+		if (typeof (pos) == "undefined")
+			return this.endIndex;
+
+		var string = this.text.substr(pos, this.endIndex - pos);
+
+		var posEndOfLine = string.search(/[\n]/);
+		if (posEndOfLine == -1)
+			return this.endIndex;
+		else
+			return pos + posEndOfLine;
+	},
+	getBeginIndex: function () {
+		return this.beginIndex;
+	},
+	isWhitespace: function (pos) {
+		var str = this.text[pos];
+		var whitespaceChars = " \t\n\f";
+
+		return (whitespaceChars.indexOf(str) != -1);
+	},
+	isNewLine: function (pos) {
+		var str = this.text[pos];
+		var whitespaceChars = "\n";
+
+		return (whitespaceChars.indexOf(str) != -1);
+	},
+	preceding: function (pos) {
+		//console.group("[AttributedStringIterator.preceding]");
+		for (var i in this.startWordOffsets) {
+			var startWordOffset = this.startWordOffsets[i];
+			if (pos < startWordOffset && i > 0) {
+				//console.log("startWordOffset: " + this.startWordOffsets[i-1]);
+				//console.groupEnd();
+				return this.startWordOffsets[i - 1];
+			}
+		}
+		//console.log("pos: " + pos);
+		//console.groupEnd();
+		return this.startWordOffsets[i];
+	},
+	following: function (pos) {
+		//console.group("[AttributedStringIterator.following]");
+		for (var i in this.startWordOffsets) {
+			var startWordOffset = this.startWordOffsets[i];
+			if (pos < startWordOffset && i > 0) {
+				//console.log("startWordOffset: " + this.startWordOffsets[i]);
+				//console.groupEnd();
+				return this.startWordOffsets[i];
+			}
+		}
+		//console.log("pos: " + pos);
+		//console.groupEnd();
+		return this.startWordOffsets[i];
+	},
+	ltrim: function (str) {
+		var patt2 = /^\s+/g;
+		return str.replace(patt2, "");
+	},
+	rtrim: function (str) {
+		var patt2 = /\s+$/g;
+		return str.replace(patt2, "");
+	},
+	getLayout: function (start, limit) {
+		return this.text.substr(start, limit - start);
+	},
+	getCharAtPos: function (pos) {
+		return this.text[pos];
+	}
+};
+
+var LineBreakMeasurer = function (paper, x, y, text, fontAttrs) {
+	this.paper = paper;
+	this.text = new AttributedStringIterator(text);
+	this.fontAttrs = fontAttrs;
+
+	if (this.text.getEndIndex() - this.text.getBeginIndex() < 1) {
+		throw {message: "Text must contain at least one character.", code: "IllegalArgumentException"};
+	}
+
+	//this.measurer = new TextMeasurer(paper, this.text, this.fontAttrs);
+	this.limit = this.text.getEndIndex();
+	this.pos = this.start = this.text.getBeginIndex();
+
+	this.rafaelTextObject = this.paper.text(x, y, this.text.text).attr(fontAttrs).attr("text-anchor", "start");
+	this.svgTextObject = this.rafaelTextObject[0];
+};
+LineBreakMeasurer.prototype = {
+	nextOffset: function (wrappingWidth, offsetLimit, requireNextWord) {
+		//console.group("[nextOffset]");
+		var nextOffset = this.pos;
+		if (this.pos < this.limit) {
+			if (offsetLimit <= this.pos) {
+				throw {message: "offsetLimit must be after current position", code: "IllegalArgumentException"};
+			}
+
+			var charAtMaxAdvance = this.getLineBreakIndex(this.pos, wrappingWidth);
+			//charAtMaxAdvance --;
+			//console.log("charAtMaxAdvance:", charAtMaxAdvance, ", [" + this.text.getCharAtPos(charAtMaxAdvance) + "]");
+
+			if (charAtMaxAdvance == this.limit) {
+				nextOffset = this.limit;
+				//console.log("charAtMaxAdvance == this.limit");
+			} else if (this.text.isNewLine(charAtMaxAdvance)) {
+				//console.log("isNewLine");
+				nextOffset = charAtMaxAdvance + 1;
+			} else if (this.text.isWhitespace(charAtMaxAdvance)) {
+				// TODO: find next noSpaceChar
+				//return nextOffset;
+				nextOffset = this.text.following(charAtMaxAdvance);
+			} else {
+				// Break is in a word;  back up to previous break.
 				/*
-				if (beginIndex < 0 || beginIndex > endIndex || endIndex > length()) {
-					throw new IllegalArgumentException("Invalid substring range");
+				var testPos = charAtMaxAdvance + 1;
+				if (testPos == this.limit) {
+					console.error("hbz...");
+				} else {
+					nextOffset = this.text.preceding(charAtMaxAdvance);
 				}
 				*/
-				this.beginIndex = 0;
-				this.endIndex = this.text.length;
-				this.currentIndex = this.beginIndex;
-				
-				//console.group("[AttributedStringIterator]");
-				var i = 0;
-				var string = this.text;
-				var fullPos = 0;
-				
-				//console.log("string: \"" + string + "\", length: " + string.length);
-				this.startWordOffsets = [];
-				this.startWordOffsets.push(fullPos);
-				
-				// TODO: remove i 1000
-				while (i<1000) {
-					var pos = string.search(/[ \t\n\f-\.\,]/);
-					if (pos == -1)
-						break;
-					
-					// whitespace start
-					fullPos += pos;
-					string = string.substr(pos);
-					////console.log("fullPos: " + fullPos + ", pos: " + pos +  ", string: ", string);
-					
-					// remove whitespaces
-					var pos = string.search(/[^ \t\n\f-\.\,]/);
-					if (pos == -1)
-						break;
-						
-					// whitespace end
-					fullPos += pos;
-					string = string.substr(pos);
-					
-					////console.log("fullPos: " + fullPos);
-					this.startWordOffsets.push(fullPos);
-					
-					i++;
+				nextOffset = this.text.preceding(charAtMaxAdvance);
+
+				if (nextOffset <= this.pos) {
+					nextOffset = Math.max(this.pos + 1, charAtMaxAdvance);
 				}
-				//console.log("startWordOffsets: ", this.startWordOffsets);
+			}
+		}
+		if (nextOffset > offsetLimit) {
+			nextOffset = offsetLimit;
+		}
+		//console.log("nextOffset: " + nextOffset);
+		//console.groupEnd();
+		return nextOffset;
+	},
+	nextLayout: function (wrappingWidth) {
+		//console.groupCollapsed("[nextLayout]");
+		if (this.pos < this.limit) {
+			var requireNextWord = false;
+			var layoutLimit = this.nextOffset(wrappingWidth, this.limit, requireNextWord);
+			//console.log("layoutLimit:", layoutLimit);
+			if (layoutLimit == this.pos) {
 				//console.groupEnd();
-			};
-			AttributedStringIterator.prototype = {
-				getEndIndex: function(pos){
-					if (typeof(pos) == "undefined")
-						return this.endIndex;
-						
-					var string = this.text.substr(pos, this.endIndex - pos);
-					
-					var posEndOfLine = string.search(/[\n]/);
-					if (posEndOfLine == -1)
-						return this.endIndex;
-					else
-						return pos + posEndOfLine;
-				},
-				getBeginIndex: function(){
-					return this.beginIndex;
-				},
-				isWhitespace: function(pos){
-					var str = this.text[pos];
-					var whitespaceChars = " \t\n\f";
-					
-					return (whitespaceChars.indexOf(str) != -1);
-				},
-				isNewLine: function(pos){
-					var str = this.text[pos];
-					var whitespaceChars = "\n";
-					
-					return (whitespaceChars.indexOf(str) != -1);
-				},
-				preceding: function(pos){
-					//console.group("[AttributedStringIterator.preceding]");
-					for(var i in this.startWordOffsets) {
-						var startWordOffset = this.startWordOffsets[i];
-						if (pos < startWordOffset && i>0) {
-							//console.log("startWordOffset: " + this.startWordOffsets[i-1]);
-							//console.groupEnd();
-							return this.startWordOffsets[i-1];
-						}
-					}
-					//console.log("pos: " + pos);
-					//console.groupEnd();
-					return this.startWordOffsets[i];
-				},
-				following: function(pos){
-					//console.group("[AttributedStringIterator.following]");
-					for(var i in this.startWordOffsets) {
-						var startWordOffset = this.startWordOffsets[i];
-						if (pos < startWordOffset && i>0) {
-							//console.log("startWordOffset: " + this.startWordOffsets[i]);
-							//console.groupEnd();
-							return this.startWordOffsets[i];
-						}
-					}
-					//console.log("pos: " + pos);
-					//console.groupEnd();
-					return this.startWordOffsets[i];
-				},
-				ltrim: function(str){
-					var patt2=/^\s+/g;
-					return str.replace(patt2, "");
-				}, 
-				rtrim: function(str){
-					var patt2=/\s+$/g;
-					return str.replace(patt2, "");
-				},
-				getLayout: function(start, limit){
-					return this.text.substr(start, limit - start);
-				},
-				getCharAtPos: function(pos) {
-					return this.text[pos];
-				}
-			};
+				return null;
+			}
+			var result = this.text.getLayout(this.pos, layoutLimit);
+			//console.log("layout: \"" + result + "\"");
 
-		var LineBreakMeasurer = function(paper, x, y, text, fontAttrs){
-				this.paper = paper;
-				this.text = new AttributedStringIterator(text);
-				this.fontAttrs = fontAttrs;
-				
-				if (this.text.getEndIndex() - this.text.getBeginIndex() < 1) {
-					throw {message: "Text must contain at least one character.", code: "IllegalArgumentException"};
-				}
-				
-				//this.measurer = new TextMeasurer(paper, this.text, this.fontAttrs);
-				this.limit = this.text.getEndIndex();
-				this.pos = this.start = this.text.getBeginIndex();
-				
-				this.rafaelTextObject = this.paper.text(x, y, this.text.text).attr(fontAttrs).attr("text-anchor", "start");
-				this.svgTextObject = this.rafaelTextObject[0];
-			};
-			LineBreakMeasurer.prototype = {
-				nextOffset: function(wrappingWidth, offsetLimit, requireNextWord) {
-					//console.group("[nextOffset]");
-					var nextOffset = this.pos;
-					if (this.pos < this.limit) {
-						if (offsetLimit <= this.pos) {
-							throw {message: "offsetLimit must be after current position", code: "IllegalArgumentException"};
-						}
-						
-						var charAtMaxAdvance = this.getLineBreakIndex(this.pos, wrappingWidth);
-						//charAtMaxAdvance --;
-						//console.log("charAtMaxAdvance:", charAtMaxAdvance, ", [" + this.text.getCharAtPos(charAtMaxAdvance) + "]");
-						
-						if (charAtMaxAdvance == this.limit) {
-							nextOffset = this.limit;
-							//console.log("charAtMaxAdvance == this.limit");
-						} else if (this.text.isNewLine(charAtMaxAdvance)) {
-							//console.log("isNewLine");
-							nextOffset = charAtMaxAdvance+1;
-						} else if (this.text.isWhitespace(charAtMaxAdvance)) {
-							// TODO: find next noSpaceChar
-							//return nextOffset;
-							nextOffset = this.text.following(charAtMaxAdvance);
-						} else {
-							// Break is in a word;  back up to previous break.
-							/*
-							var testPos = charAtMaxAdvance + 1;
-							if (testPos == this.limit) {
-								console.error("hbz...");
-							} else {
-								nextOffset = this.text.preceding(charAtMaxAdvance);
-							}
-							*/
-							nextOffset = this.text.preceding(charAtMaxAdvance);
-							
-							if (nextOffset <= this.pos) {
-								nextOffset = Math.max(this.pos+1, charAtMaxAdvance);
-							}
-						}
-					}
-					if (nextOffset > offsetLimit) {
-						nextOffset = offsetLimit;
-					}
-					//console.log("nextOffset: " + nextOffset);
-					//console.groupEnd();
-					return nextOffset;
-				},
-				nextLayout: function(wrappingWidth) {
-					//console.groupCollapsed("[nextLayout]");
-					if (this.pos < this.limit) {
-						var requireNextWord = false;
-						var layoutLimit = this.nextOffset(wrappingWidth, this.limit, requireNextWord);
-						//console.log("layoutLimit:", layoutLimit);
-						if (layoutLimit == this.pos) {
-							//console.groupEnd();
-							return null;
-						}
-						var result = this.text.getLayout(this.pos, layoutLimit);
-						//console.log("layout: \"" + result + "\"");
-						
-						// remove end of line
-						
-						//var posEndOfLine = this.text.getEndIndex(this.pos);
-						//if (posEndOfLine < result.length)
-						//	result = result.substr(0, posEndOfLine);
-						
-						this.pos = layoutLimit;
-						
-						//console.groupEnd();
-						return result;
-					} else {
-						//console.groupEnd();
-						return null;
-					}
-				},
-				getLineBreakIndex: function(pos, wrappingWidth) {
-					//console.group("[getLineBreakIndex]");
-					//console.log("pos:"+pos + ", text: \""+ this.text.text.replace(/\n/g, "_").substr(pos, 1) + "\"");
-					
-					var bb = this.rafaelTextObject.getBBox();
-					
-					var charNum = -1;
-					try {
-						var svgPoint = this.svgTextObject.getStartPositionOfChar(pos);
-						//var dot = this.paper.ellipse(svgPoint.x, svgPoint.y, 1, 1).attr({"stroke-width": 0, fill: Color.blue});
-						svgPoint.x = svgPoint.x + wrappingWidth;
-						//svgPoint.y = bb.y;
-						//console.log("svgPoint:", svgPoint);
-					
-						//var dot = this.paper.ellipse(svgPoint.x, svgPoint.y, 1, 1).attr({"stroke-width": 0, fill: Color.red});
-					
-						charNum = this.svgTextObject.getCharNumAtPosition(svgPoint);
-					} catch (e){
-						console.warn("getStartPositionOfChar error, pos:" + pos);
-						/*
-						var testPos = pos + 1;
-						if (testPos < this.limit) {
-							return testPos
-						}
-						*/
-					}
-					//console.log("charNum:", charNum);
-					if (charNum == -1) {
-						//console.groupEnd();
-						return this.text.getEndIndex(pos);
-					} else {
-						// When case there is new line between pos and charnum then use this new line
-						var newLineIndex = this.text.getEndIndex(pos);
-						if (newLineIndex < charNum ) {
-							console.log("newLineIndex <= charNum, newLineIndex:"+newLineIndex+", charNum:"+charNum, "\"" + this.text.text.substr(newLineIndex+1).replace(/\n/g, "?") + "\"");
-							//console.groupEnd();
-							
-							return newLineIndex;
-						}
-							
-						//var charAtMaxAdvance  = this.text.text.substring(charNum, charNum + 1);
-						var charAtMaxAdvance  = this.text.getCharAtPos(charNum);
-						//console.log("!!charAtMaxAdvance: " + charAtMaxAdvance);
-						//console.groupEnd();
-						return charNum;
-					}
-				}, 
-				getPosition: function() {
-					return this.pos;
-				}
-			};
\ No newline at end of file
+			// remove end of line
+
+			//var posEndOfLine = this.text.getEndIndex(this.pos);
+			//if (posEndOfLine < result.length)
+			//	result = result.substr(0, posEndOfLine);
+
+			this.pos = layoutLimit;
+
+			//console.groupEnd();
+			return result;
+		} else {
+			//console.groupEnd();
+			return null;
+		}
+	},
+	getLineBreakIndex: function (pos, wrappingWidth) {
+		//console.group("[getLineBreakIndex]");
+		//console.log("pos:"+pos + ", text: \""+ this.text.text.replace(/\n/g, "_").substr(pos, 1) + "\"");
+
+		var bb = this.rafaelTextObject.getBBox();
+
+		var charNum = -1;
+		try {
+			var svgPoint = this.svgTextObject.getStartPositionOfChar(pos);
+			//var dot = this.paper.ellipse(svgPoint.x, svgPoint.y, 1, 1).attr({"stroke-width": 0, fill: Color.blue});
+			svgPoint.x = svgPoint.x + wrappingWidth;
+			//svgPoint.y = bb.y;
+			//console.log("svgPoint:", svgPoint);
+
+			//var dot = this.paper.ellipse(svgPoint.x, svgPoint.y, 1, 1).attr({"stroke-width": 0, fill: Color.red});
+
+			charNum = this.svgTextObject.getCharNumAtPosition(svgPoint);
+		} catch (e) {
+			console.warn("getStartPositionOfChar error, pos:" + pos);
+			/*
+			var testPos = pos + 1;
+			if (testPos < this.limit) {
+				return testPos
+			}
+			*/
+		}
+		//console.log("charNum:", charNum);
+		if (charNum == -1) {
+			//console.groupEnd();
+			return this.text.getEndIndex(pos);
+		} else {
+			// When case there is new line between pos and charnum then use this new line
+			var newLineIndex = this.text.getEndIndex(pos);
+			if (newLineIndex < charNum) {
+				console.log("newLineIndex <= charNum, newLineIndex:" + newLineIndex + ", charNum:" + charNum, "\"" + this.text.text.substr(newLineIndex + 1).replace(/\n/g, "?") + "\"");
+				//console.groupEnd();
+
+				return newLineIndex;
+			}
+
+			//var charAtMaxAdvance  = this.text.text.substring(charNum, charNum + 1);
+			var charAtMaxAdvance = this.text.getCharAtPos(charNum);
+			//console.log("!!charAtMaxAdvance: " + charAtMaxAdvance);
+			//console.groupEnd();
+			return charNum;
+		}
+	},
+	getPosition: function () {
+		return this.pos;
+	}
+};
diff --git a/len-activiti/src/main/resources/static/diagram-viewer/js/Polyline.js b/len-activiti/src/main/resources/static/diagram-viewer/js/Polyline.js
index e7e4c30..881ab98 100644
--- a/len-activiti/src/main/resources/static/diagram-viewer/js/Polyline.js
+++ b/len-activiti/src/main/resources/static/diagram-viewer/js/Polyline.js
@@ -3,8 +3,8 @@
  *
  * @author Dmitry Farafonov
  */
- 
-var ANCHOR_TYPE= {
+
+var ANCHOR_TYPE = {
 	main: "main",
 	middle: "middle",
 	first: "first",
@@ -12,7 +12,7 @@ var ANCHOR_TYPE= {
 };
 
 function Anchor(uuid, type, x, y) {
-	this.uuid = uuid; 
+	this.uuid = uuid;
 	this.x = x
 	this.y = y
 	this.type = (type == ANCHOR_TYPE.middle) ? ANCHOR_TYPE.middle : ANCHOR_TYPE.main;
@@ -37,19 +37,19 @@ function Polyline(uuid, points, strokeWidth) {
 	 *			{x: 650, y: 370}];      4
 	 */
 	this.points = points;
-	
+
 	/*
 	 * path for graph
 	 * [["M", x1, y1], ["L", x2, y2], ["C", ax, ay, bx, by, x3, y3], ["L", x3, y3]]
 	 */
 	this.path = [];
-	
+
 	this.anchors = [];
-	
+
 	if (strokeWidth) this.strokeWidth = strokeWidth;
-	
+
 	this.closePath = false;
-	
+
 	this.init();
 };
 
@@ -64,78 +64,78 @@ Polyline.prototype = {
 	element: null,
 	isDefaultConditionAvailable: false,
 	closePath: false,
-	
-	init: function(points){
+
+	init: function (points) {
 		var linesCount = this.getLinesCount();
 		if (linesCount < 1)
 			return;
-			
+
 		this.normalizeCoordinates();
-		
+
 		// create anchors
-		
+
 		this.pushAnchor(ANCHOR_TYPE.first, this.getLine(0).x1, this.getLine(0).y1);
-		
-		for(var i = 1; i < linesCount; i++){
-			var line1 = this.getLine(i-1),
+
+		for (var i = 1; i < linesCount; i++) {
+			var line1 = this.getLine(i - 1),
 				line2 = this.getLine(i);
-			
+
 			//this.pushAnchor(ANCHOR_TYPE.middle, line1.x1 + line1.x2-line1.x1, line1.y1 + line1.y2-line1.y1);
-			this.pushAnchor(ANCHOR_TYPE.main,  line1.x2, line1.y2);
+			this.pushAnchor(ANCHOR_TYPE.main, line1.x2, line1.y2);
 			//this.pushAnchor(ANCHOR_TYPE.middle,  line2.x1 + line2.x2-line2.x1, line2.y1 + line2.y2-line2.y1);
 		}
-		
-		this.pushAnchor(ANCHOR_TYPE.last, this.getLine(linesCount-1).x2, this.getLine(linesCount-1).y2);
-		
+
+		this.pushAnchor(ANCHOR_TYPE.last, this.getLine(linesCount - 1).x2, this.getLine(linesCount - 1).y2);
+
 		this.rebuildPath();
 	},
-	
-	normalizeCoordinates: function(){
-		for(var i=0; i < this.points.length; i++){
+
+	normalizeCoordinates: function () {
+		for (var i = 0; i < this.points.length; i++) {
 			this.points[i].x = parseFloat(this.points[i].x);
 			this.points[i].y = parseFloat(this.points[i].y);
 		}
 	},
-	
-	getLinesCount: function(){
-		return this.points.length-1;
+
+	getLinesCount: function () {
+		return this.points.length - 1;
 	},
-	_getLine: function(i){
-		return {x1: this.points[i].x, y1: this.points[i].y, x2: this.points[i+1].x, y2: this.points[i+1].y};
+	_getLine: function (i) {
+		return {x1: this.points[i].x, y1: this.points[i].y, x2: this.points[i + 1].x, y2: this.points[i + 1].y};
 	},
-	getLine: function(i){
+	getLine: function (i) {
 		var line = this._getLine(i);
-		line.angle = this.getLineAngle(i) ;
+		line.angle = this.getLineAngle(i);
 		return line;
 	},
-	getLineAngle: function(i){
+	getLineAngle: function (i) {
 		var line = this._getLine(i);
 		return Math.atan2(line.y2 - line.y1, line.x2 - line.x1);
 	},
-	getLineLengthX: function(i){
+	getLineLengthX: function (i) {
 		var line = this.getLine(i);
 		return (line.x2 - line.x1);
 	},
-	getLineLengthY: function(i){
+	getLineLengthY: function (i) {
 		var line = this.getLine(i);
 		return (line.y2 - line.y1);
 	},
-	getLineLength: function(i){
+	getLineLength: function (i) {
 		var line = this.getLine(i);
 		return Math.sqrt(Math.pow(this.getLineLengthX(i), 2) + Math.pow(this.getLineLengthY(i), 2));
 	},
-	
-	getAnchors: function(){
-		// ������� ��������������� ������
+
+	getAnchors: function () {
+		// ������� ��������������� ������
 		// ????
 		return this.anchors;
 	},
-	getAnchorsCount: function(type){
+	getAnchorsCount: function (type) {
 		if (!type)
 			return this.anchors.length;
 		else {
 			var count = 0;
-			for(var i=0; i < this.getAnchorsCount(); i++){
+			for (var i = 0; i < this.getAnchorsCount(); i++) {
 				var anchor = this.anchors[i];
 				if (anchor.getType() == type) {
 					count++;
@@ -144,8 +144,8 @@ Polyline.prototype = {
 			return count;
 		}
 	},
-	
-	pushAnchor: function(type, x, y, index){
+
+	pushAnchor: function (type, x, y, index) {
 		if (type == ANCHOR_TYPE.first) {
 			index = 0;
 			typeIndex = 0;
@@ -155,9 +155,9 @@ Polyline.prototype = {
 		} else if (!index) {
 			index = this.anchors.length;
 		} else {
-			// ��������� anchors, �������� ������� ��� �������, ������� � index
+			// ��������� anchors, �������� ������� ��� �������, ������� � index
 			//var anchor = this.getAnchor()
-			for(var i=0; i < this.getAnchorsCount(); i++){
+			for (var i = 0; i < this.getAnchorsCount(); i++) {
 				var anchor = this.anchors[i];
 				if (anchor.index > index) {
 					anchor.index++;
@@ -165,83 +165,84 @@ Polyline.prototype = {
 				}
 			}
 		}
-		
+
 		var anchor = new Anchor(this.id, ANCHOR_TYPE.main, x, y, index, typeIndex);
-		
+
 		this.anchors.push(anchor);
 	},
-	
-	getAnchor: function(position){
+
+	getAnchor: function (position) {
 		return this.anchors[position];
 	},
-	
-	getAnchorByType: function(type, position){
+
+	getAnchorByType: function (type, position) {
 		if (type == ANCHOR_TYPE.first)
 			return this.anchors[0];
 		if (type == ANCHOR_TYPE.last)
-			return this.anchors[this.getAnchorsCount()-1];
-		
-		for(var i=0; i < this.getAnchorsCount(); i++){
+			return this.anchors[this.getAnchorsCount() - 1];
+
+		for (var i = 0; i < this.getAnchorsCount(); i++) {
 			var anchor = this.anchors[i];
 			if (anchor.type == type) {
-				if( position == anchor.position)
+				if (position == anchor.position)
 					return anchor;
 			}
 		}
 		return null;
 	},
-	
-	addNewPoint: function(position, x, y){
-		// 
-		for(var i = 0; i < this.getLinesCount(); i++){
+
+	addNewPoint: function (position, x, y) {
+		//
+		for (var i = 0; i < this.getLinesCount(); i++) {
 			var line = this.getLine(i);
 			if (x > line.x1 && x < line.x2 && y > line.y1 && y < line.y2) {
-				this.points.splice(i+1,0,{x: x, y: y});
+				this.points.splice(i + 1, 0, {x: x, y: y});
 				break;
 			}
 		}
-		
+
 		this.rebuildPath();
 	},
-	
-	rebuildPath: function(){
+
+	rebuildPath: function () {
 		var path = [];
-		
-		for(var i = 0; i < this.getAnchorsCount(); i++){
+
+		for (var i = 0; i < this.getAnchorsCount(); i++) {
 			var anchor = this.getAnchor(i);
-			
+
 			var pathType = ""
-			if (i==0)
+			if (i == 0)
 				pathType = "M";
-			else 
+			else
 				pathType = "L";
-			
+
 // TODO: save previous points and calculate new path just if points are updated, and then save currents values as previous
-			
+
 			var targetX = anchor.x, targetY = anchor.y;
-			if (i>0 && i < this.getAnchorsCount()-1) {
+			if (i > 0 && i < this.getAnchorsCount() - 1) {
 				// get new x,y
 				var cx = anchor.x, cy = anchor.y;
-				
+
 				// pivot point of prev line
-				var AO = this.getLineLength(i-1);
+				var AO = this.getLineLength(i - 1);
 				if (AO < this.radius) {
 					AO = this.radius;
 				}
-				
+
 				this.isDefaultConditionAvailable = (this.isDefaultConditionAvailable || (i == 1 && AO > 10));
 				//console.log("isDefaultConditionAvailable", this.isDefaultConditionAvailable);
-				
-				var ED = this.getLineLengthY(i-1) * this.radius / AO;
-				var OD = this.getLineLengthX(i-1) * this.radius / AO;
-					targetX = anchor.x - OD;
-					targetY = anchor.y - ED;
-				
-				if (AO < 2*this.radius && i>1) {
-					targetX = anchor.x - this.getLineLengthX(i-1)/2;
-					targetY = anchor.y - this.getLineLengthY(i-1)/2;;
+
+				var ED = this.getLineLengthY(i - 1) * this.radius / AO;
+				var OD = this.getLineLengthX(i - 1) * this.radius / AO;
+				targetX = anchor.x - OD;
+				targetY = anchor.y - ED;
+
+				if (AO < 2 * this.radius && i > 1) {
+					targetX = anchor.x - this.getLineLengthX(i - 1) / 2;
+					targetY = anchor.y - this.getLineLengthY(i - 1) / 2;
+					;
 				}
-					
+
 				// pivot point of next line
 				var AO = this.getLineLength(i);
 				if (AO < this.radius) {
@@ -249,38 +250,45 @@ Polyline.prototype = {
 				}
 				var ED = this.getLineLengthY(i) * this.radius / AO;
 				var OD = this.getLineLengthX(i) * this.radius / AO;
-					var nextSrcX = anchor.x + OD;
-					var nextSrcY = anchor.y + ED;
-					
-				if (AO < 2*this.radius && i<this.getAnchorsCount()-2) {
-					nextSrcX = anchor.x + this.getLineLengthX(i)/2;
-					nextSrcY = anchor.y + this.getLineLengthY(i)/2;;
+				var nextSrcX = anchor.x + OD;
+				var nextSrcY = anchor.y + ED;
+
+				if (AO < 2 * this.radius && i < this.getAnchorsCount() - 2) {
+					nextSrcX = anchor.x + this.getLineLengthX(i) / 2;
+					nextSrcY = anchor.y + this.getLineLengthY(i) / 2;
+					;
 				}
-					
-				
+
+
 				var dx0 = (cx - targetX) / 3,
 					dy0 = (cy - targetY) / 3,
 					ax = cx - dx0,
 					ay = cy - dy0,
-					
+
 					dx1 = (cx - nextSrcX) / 3,
 					dy1 = (cy - nextSrcY) / 3,
 					bx = cx - dx1,
 					by = cy - dy1,
-					
-					zx=nextSrcX, zy=nextSrcY;
-					
+
+					zx = nextSrcX, zy = nextSrcY;
+
 				if (this.showDetails) {
-					var c = ProcessDiagramCanvas.g.path("M"+targetX+","+targetY+"L"+ax+","+ay).attr({stroke: Color.get(255, 153, 51), "stroke-dasharray": "- "});
-					var c = ProcessDiagramCanvas.g.path("M"+nextSrcX+","+nextSrcY+"L"+bx+","+by).attr({stroke: Color.get(255, 153, 51), "stroke-dasharray": "- "});
+					var c = ProcessDiagramCanvas.g.path("M" + targetX + "," + targetY + "L" + ax + "," + ay).attr({
+						stroke: Color.get(255, 153, 51),
+						"stroke-dasharray": "- "
+					});
+					var c = ProcessDiagramCanvas.g.path("M" + nextSrcX + "," + nextSrcY + "L" + bx + "," + by).attr({
+						stroke: Color.get(255, 153, 51),
+						"stroke-dasharray": "- "
+					});
 					var c = ProcessDiagramCanvas.g.ellipse(ax, ay, 2, 2).attr({stroke: Color.SlateGrey});
 					var c = ProcessDiagramCanvas.g.ellipse(bx, by, 2, 2).attr({stroke: Color.SlateGrey});
 					var c = ProcessDiagramCanvas.g.ellipse(cx, cy, this.radius, this.radius).attr({stroke: Color.Gainsboro});
 					var c = ProcessDiagramCanvas.g.ellipse(targetX, targetY, 2, 2).attr({fill: Color.red});
 					var c = ProcessDiagramCanvas.g.ellipse(nextSrcX, nextSrcY, 2, 2).attr({fill: Color.red});
 				}
-			} else if (i==1 && this.getAnchorsCount() == 2){
-				var AO = this.getLineLength(i-1);
+			} else if (i == 1 && this.getAnchorsCount() == 2) {
+				var AO = this.getLineLength(i - 1);
 				if (AO < this.radius) {
 					AO = this.radius;
 				}
@@ -289,30 +297,30 @@ Polyline.prototype = {
 			}
 
 			// anti smoothing
-			if (this.strokeWidth%2 == 1) {
+			if (this.strokeWidth % 2 == 1) {
 				targetX += 0.5;
 				targetY += 0.5;
 			}
-			
+
 			path.push([pathType, targetX, targetY]);
-			
-			if (i>0 && i < this.getAnchorsCount()-1) {
+
+			if (i > 0 && i < this.getAnchorsCount() - 1) {
 				path.push(["C", ax, ay, bx, by, zx, zy]);
 			}
 		}
-		
+
 		if (this.closePath) {
 			console.log("closePath:", this.closePath);
 			path.push(["Z"]);
 		}
-		
+
 		this.path = path;
 	},
-	
-	transform: function(transformation){
+
+	transform: function (transformation) {
 		this.element.transform(transformation);
 	},
-	attr: function(attrs){
+	attr: function (attrs) {
 		//console.log("attrs: " +attrs, "", this.element);
 		// TODO: foreach and set each
 		this.element.attr(attrs);
@@ -328,17 +336,17 @@ function Polygone(points, strokeWidth) {
 	 *			{x: 650, y: 370}];      4
 	 */
 	this.points = points;
-	
+
 	/*
 	 * path for graph
 	 * [["M", x1, y1], ["L", x2, y2], ["C", ax, ay, bx, by, x3, y3], ["L", x3, y3]]
 	 */
 	this.path = [];
-	
+
 	this.anchors = [];
-	
+
 	if (strokeWidth) this.strokeWidth = strokeWidth;
-	
+
 	this.closePath = true;
 	this.init();
 };
@@ -348,40 +356,41 @@ function Polygone(points, strokeWidth) {
  * Poligone is inherited from Poliline: draws closedPath of polyline
  */
 
-var Foo = function () { };
+var Foo = function () {
+};
 Foo.prototype = Polyline.prototype;
 
 Polygone.prototype = new Foo();
 
-Polygone.prototype.rebuildPath = function(){
+Polygone.prototype.rebuildPath = function () {
 	var path = [];
 	//console.log("Polygone rebuildPath");
-	for(var i = 0; i < this.getAnchorsCount(); i++){
+	for (var i = 0; i < this.getAnchorsCount(); i++) {
 		var anchor = this.getAnchor(i);
-		
+
 		var pathType = ""
-		if (i==0)
+		if (i == 0)
 			pathType = "M";
-		else 
+		else
 			pathType = "L";
-		
+
 		var targetX = anchor.x, targetY = anchor.y;
-		
+
 		// anti smoothing
-		if (this.strokeWidth%2 == 1) {
+		if (this.strokeWidth % 2 == 1) {
 			targetX += 0.5;
 			targetY += 0.5;
 		}
-		
-		path.push([pathType, targetX, targetY]);	
+
+		path.push([pathType, targetX, targetY]);
 	}
 	if (this.closePath)
 		path.push(["Z"]);
-	
+
 	this.path = path;
 };
 /*
 Polygone.prototype.transform = function(transformation){
 	this.element.transform(transformation);
 };
-*/
\ No newline at end of file
+*/
diff --git a/len-activiti/src/main/resources/static/diagram-viewer/js/ProcessDiagramCanvas.js b/len-activiti/src/main/resources/static/diagram-viewer/js/ProcessDiagramCanvas.js
index eadbe9c..4c0f9a9 100644
--- a/len-activiti/src/main/resources/static/diagram-viewer/js/ProcessDiagramCanvas.js
+++ b/len-activiti/src/main/resources/static/diagram-viewer/js/ProcessDiagramCanvas.js
@@ -1,14 +1,14 @@
 /**
  * Represents a canvas on which BPMN 2.0 constructs can be drawn.
- * 
+ *
  * Some of the icons used are licenced under a Creative Commons Attribution 2.5
  * License, see http://www.famfamfam.com/lab/icons/silk/
- * 
+ *
  * @see ProcessDiagramGenerator
  * @author (Java) Joram Barrez
  * @author (Javascript) Dmitry Farafonov
  */
- 
+
 //Color.Cornsilk
 
 var ARROW_HEAD_SIMPLE = "simple";
@@ -39,9 +39,9 @@ var HIGHLIGHT_COLOR = Color.Firebrick1;
 var SEQUENCEFLOW_COLOR = Color.black;
 
 var CATCHING_EVENT_COLOR = Color.black; /* Color.SlateGrey; */
-var START_EVENT_COLOR = Color.get(251,251,251);
+var START_EVENT_COLOR = Color.get(251, 251, 251);
 var START_EVENT_STROKE_COLOR = Color.black; /* Color.SlateGrey; */
-var END_EVENT_COLOR = Color.get(251,251,251);
+var END_EVENT_COLOR = Color.get(251, 251, 251);
 //var END_EVENT_STROKE_COLOR = Color.black;
 var NONE_END_EVENT_COLOR = Color.Firebrick4;
 var NONE_END_EVENT_STROKE_COLOR = Color.Firebrick4;
@@ -52,10 +52,17 @@ var LABEL_COLOR = Color.get(72, 106, 150);
 
 // Fonts
 var NORMAL_FONT = {font: "10px Arial", opacity: 1, fill: Color.black};
-var LABEL_FONT = {font: "11px Arial", "font-style":"italic", opacity: 1, "fill": LABEL_COLOR};
-var LABEL_FONT_SMOOTH = {font: "10px Arial", "font-style":"italic", opacity: 1, "fill": LABEL_COLOR, stroke: LABEL_COLOR, "stroke-width":.4};
+var LABEL_FONT = {font: "11px Arial", "font-style": "italic", opacity: 1, "fill": LABEL_COLOR};
+var LABEL_FONT_SMOOTH = {
+	font: "10px Arial",
+	"font-style": "italic",
+	opacity: 1,
+	"fill": LABEL_COLOR,
+	stroke: LABEL_COLOR,
+	"stroke-width": .4
+};
 var TASK_FONT = {font: "11px Arial", opacity: 1, fill: Color.black};
-var TASK_FONT_SMOOTH = {font: "11px Arial", opacity: 1, fill: Color.black, stroke: LABEL_COLOR, "stroke-width":.4};
+var TASK_FONT_SMOOTH = {font: "11px Arial", opacity: 1, fill: Color.black, stroke: LABEL_COLOR, "stroke-width": .4};
 var POOL_LANE_FONT = {font: "11px Arial", opacity: 1, fill: Color.black};
 var EXPANDED_SUBPROCESS_FONT = {font: "11px Arial", opacity: 1, fill: Color.black};
 
@@ -65,9 +72,9 @@ var SEQUENCEFLOW_STROKE = 1.5;
 var SEQUENCEFLOW_HIGHLIGHT_STROKE = 2;
 var THICK_TASK_BORDER_STROKE = 2.5;
 var GATEWAY_TYPE_STROKE = 3.2;
-var END_EVENT_STROKE = NORMAL_STROKE+2;
+var END_EVENT_STROKE = NORMAL_STROKE + 2;
 var MULTI_INSTANCE_STROKE = 1.3;
-var EVENT_SUBPROCESS_ATTRS = 	{"stroke": Color.black, "stroke-width": NORMAL_STROKE, "stroke-dasharray": ". "};
+var EVENT_SUBPROCESS_ATTRS = {"stroke": Color.black, "stroke-width": NORMAL_STROKE, "stroke-dasharray": ". "};
 //var EXPANDED_SUBPROCESS_ATTRS = {"stroke": Color.black, "stroke-width": NORMAL_STROKE, "fill": Color.FloralWhite};
 var EXPANDED_SUBPROCESS_ATTRS = {"stroke": Color.black, "stroke-width": NORMAL_STROKE, "fill": Color.WhiteSmoke};
 var NON_INTERRUPTING_EVENT_STROKE = "- ";
@@ -78,21 +85,21 @@ var EXPANDED_SUBPROCESS_CORNER_ROUND = 10;
 // icons
 var ICON_SIZE = 16;
 var ICON_PADDING = 4;
-var USERTASK_IMAGE = 		"images/deployer/user.png";
-var SCRIPTTASK_IMAGE = 		"images/deployer/script.png";
-var SERVICETASK_IMAGE = 	"images/deployer/service.png";
-var RECEIVETASK_IMAGE = 	"images/deployer/receive.png";
-var SENDTASK_IMAGE = 		"images/deployer/send.png";
-var MANUALTASK_IMAGE = 		"images/deployer/manual.png";
+var USERTASK_IMAGE = "images/deployer/user.png";
+var SCRIPTTASK_IMAGE = "images/deployer/script.png";
+var SERVICETASK_IMAGE = "images/deployer/service.png";
+var RECEIVETASK_IMAGE = "images/deployer/receive.png";
+var SENDTASK_IMAGE = "images/deployer/send.png";
+var MANUALTASK_IMAGE = "images/deployer/manual.png";
 var BUSINESS_RULE_TASK_IMAGE = "images/deployer/business_rule.png";
-var TIMER_IMAGE = 			"images/deployer/timer.png";
-var MESSAGE_CATCH_IMAGE = 	"images/deployer/message_catch.png";
-var MESSAGE_THROW_IMAGE = 	"images/deployer/message_throw.png";
-var ERROR_THROW_IMAGE = 	"images/deployer/error_throw.png";
-var ERROR_CATCH_IMAGE = 	"images/deployer/error_catch.png";
-var SIGNAL_CATCH_IMAGE = 	"images/deployer/signal_catch.png";
-var SIGNAL_THROW_IMAGE = 	"images/deployer/signal_throw.png";
-var MULTIPLE_CATCH_IMAGE = 	"images/deployer/multiple_catch.png";
+var TIMER_IMAGE = "images/deployer/timer.png";
+var MESSAGE_CATCH_IMAGE = "images/deployer/message_catch.png";
+var MESSAGE_THROW_IMAGE = "images/deployer/message_throw.png";
+var ERROR_THROW_IMAGE = "images/deployer/error_throw.png";
+var ERROR_CATCH_IMAGE = "images/deployer/error_catch.png";
+var SIGNAL_CATCH_IMAGE = "images/deployer/signal_catch.png";
+var SIGNAL_THROW_IMAGE = "images/deployer/signal_throw.png";
+var MULTIPLE_CATCH_IMAGE = "images/deployer/multiple_catch.png";
 
 
 var ObjectType = {
@@ -102,14 +109,12 @@ var ObjectType = {
 	RHOMBUS: "rhombus"
 };
 
-function OBJ(type){
+function OBJ(type) {
 	this.c = null;
 	this.type = type;
 	this.nestedElements = [];
 };
-OBJ.prototype = {
-	
-};
+OBJ.prototype = {};
 
 var CONNECTION_TYPE = {
 	SEQUENCE_FLOW: "sequence_flow",
@@ -117,83 +122,83 @@ var CONNECTION_TYPE = {
 	ASSOCIATION: "association"
 };
 
-var ProcessDiagramCanvas = function(){
+var ProcessDiagramCanvas = function () {
 };
 ProcessDiagramCanvas.prototype = {
 // var DefaultProcessDiagramCanvas = {
 	canvasHolder: "holder",
-	canvasWidth: 0, 
+	canvasWidth: 0,
 	canvasHeight: 0,
 	paint: Color.black,
 	strokeWidth: 0,
 	font: null,
 	fontSmoothing: null,
-	
+
 	g: null,
 	ninjaPaper: null,
-	
+
 	objects: [],
-	
+
 	processDefinitionId: null,
 	activity: null,
-	
+
 	frame: null,
-	
-	
+
+
 	debug: false,
-	
+
 	/**
-	* Creates an empty canvas with given width and height.
-	*/
-	init: function(width, height, processDefinitionId){
+	 * Creates an empty canvas with given width and height.
+	 */
+	init: function (width, height, processDefinitionId) {
 		this.canvasWidth = width;
 		this.canvasHeight = height;
-		
+
 		// TODO: name it as 'canvasName'
 		if (!processDefinitionId)
 			processDefinitionId = "holder";
-		
+
 		this.processDefinitionId = processDefinitionId;
 		this.canvasHolder = this.processDefinitionId;
 
 		var h = document.getElementById(this.canvasHolder);
 		if (!h) return;
-		
+
 		h.style.width = this.canvasWidth;
 		h.style.height = this.canvasHeight;
-		
+
 		this.g = Raphael(this.canvasHolder);
 		this.g.clear();
-	
+
 		//this.setPaint(Color.DimGrey);
 		this.setPaint(Color.black);
 		//this.setPaint(Color.white);
 		this.setStroke(NORMAL_STROKE);
-		
+
 		//this.setFont("Arial", 11);
 		this.setFont(NORMAL_FONT);
 		//this.font = this.g.getFont("Arial");
-		
+
 		this.fontSmoothing = true;
-		
+
 		// ninja!
 		var RaphaelOriginal = Raphael;
-		this.ninjaPaper =(function (local_raphael) {
+		this.ninjaPaper = (function (local_raphael) {
 			var paper = local_raphael(1, 1, 1, 1, processDefinitionId);
 			return paper;
 		})(Raphael.ninja());
 		Raphael = RaphaelOriginal;
 	},
-	setPaint: function(color){
+	setPaint: function (color) {
 		this.paint = color;
 	},
-	getPaint: function(){
+	getPaint: function () {
 		return this.paint;
 	},
-	setStroke: function(strokeWidth){
+	setStroke: function (strokeWidth) {
 		this.strokeWidth = strokeWidth;
 	},
-	getStroke: function(){
+	getStroke: function () {
 		return this.strokeWidth;
 	},
 	/*
@@ -201,127 +206,137 @@ ProcessDiagramCanvas.prototype = {
 		this.font = this.g.getFont(family, weight);
 	},
 	*/
-	setFont: function(font){
+	setFont: function (font) {
 		this.font = font;
 	},
-	getFont: function(){
+	getFont: function () {
 		return this.font;
 	},
-	drawShaddow: function(object){
+	drawShaddow: function (object) {
 		var border = object.clone();
-		border.attr({"stroke-width": this.strokeWidth + 6, 
-					"stroke": Color.white,
-					"fill": Color.white,
-					"opacity": 1,
-					"stroke-dasharray":null});
+		border.attr({
+			"stroke-width": this.strokeWidth + 6,
+			"stroke": Color.white,
+			"fill": Color.white,
+			"opacity": 1,
+			"stroke-dasharray": null
+		});
 		//border.toBack();
 		object.toFront();
-		
+
 		return border;
 	},
-	
-	setConextObject: function(obj){
+
+	setConextObject: function (obj) {
 		this.contextObject = obj;
 	},
-	getConextObject: function(){
+	getConextObject: function () {
 		return this.contextObject;
 	},
-	setContextToElement: function(object){
+	setContextToElement: function (object) {
 		var contextObject = this.getConextObject();
 		object.id = contextObject.id;
 		object.data("contextObject", contextObject);
 	},
-	onClick: function(event, instance, element){
-	  var overlay = element;
-	  var set = overlay.data("set");
-	  var contextObject = overlay.data("contextObject");
-	  //console.log("["+contextObject.getProperty("type")+"], activityId: " + contextObject.getId());
-	  if (ProcessDiagramGenerator.options && ProcessDiagramGenerator.options.on && ProcessDiagramGenerator.options.on.click) {
-	    var args = [instance, element, contextObject];
-	    ProcessDiagramGenerator.options.on.click.apply(event, args);
-	  }
-	},
-	onRightClick: function(event, instance, element){
-	  var overlay = element;
-	  var set = overlay.data("set");
-	  var contextObject = overlay.data("contextObject");
-	  //console.log("[%s], activityId: %s (RIGHTCLICK)", contextObject.getProperty("type"), contextObject.getId());
-
-	  if (ProcessDiagramGenerator.options && ProcessDiagramGenerator.options.on && ProcessDiagramGenerator.options.on.rightClick) {
-	    var args = [instance, element, contextObject];
-	    ProcessDiagramGenerator.options.on.rightClick.apply(event, args);
-	  }
-	},
-	onHoverIn: function(event, instance, element){
-	  var overlay = element;
-	  var set = overlay.data("set");
-	  var contextObject = overlay.data("contextObject");
-
-	  var border = instance.g.getById(contextObject.id + "_border");
-	  border.attr("opacity", 0.3);
-
-	  // provide callback
-	  if (ProcessDiagramGenerator.options && ProcessDiagramGenerator.options.on && ProcessDiagramGenerator.options.on.over) {
-	    var args = [instance, element, contextObject];
-	    ProcessDiagramGenerator.options.on.over.apply(event, args);
-	  }
-	 },
-	 onHoverOut: function(event, instance, element){
-	   var overlay = element;
-	   var set = overlay.data("set");
-	   var contextObject = overlay.data("contextObject");
-
-	   var border = instance.g.getById(contextObject.id + "_border");
-	   border.attr("opacity", 0.0);
-	   // provide callback
-	   if (ProcessDiagramGenerator.options && ProcessDiagramGenerator.options.on && ProcessDiagramGenerator.options.on.out) {
-	     var args = [instance, element, contextObject];
-	     ProcessDiagramGenerator.options.on.out.apply(event, args);
-	   }
-	 },
-	 addHandlers: function(set, x, y, width, height, type){
-	   var contextObject = this.getConextObject();
-
-	   var cx = x+width/2, cy = y+height/2;
-	   if (type == "event") {
-	     var border = this.g.ellipse(cx, cy, width/2+4, height/2+4);
-	     var overlay = this.g.ellipse(cx, cy, width/2, height/2);
-	   } else if (type == "gateway") {
-	     // rhombus
-	     var border = this.g.path( "M" + (x - 4) + " " + (y + (height / 2)) +
-	         "L" + (x + (width / 2)) + " " + (y + height + 4) +
-	         "L" + (x + width + 4) + " " + (y + (height / 2)) +
-	         "L" + (x + (width / 2)) + " " + (y - 4) +
-	         "z" );
-	     var overlay = this.g.path(  "M" + x + " " + (y + (height / 2)) +
-	         "L" + (x + (width / 2)) + " " + (y + height) +
-	         "L" + (x + width) + " " + (y + (height / 2)) +
-	         "L" + (x + (width / 2)) + " " + y +
-	         "z" );
-	   } else if (type == "task") {
-	     var border = this.g.rect(x - 4, y - 4, width+9, height+9, TASK_CORNER_ROUND+4);
-	     var overlay = this.g.rect(x, y, width, height, TASK_CORNER_ROUND);
-	   }
-
-	   border.attr({stroke: Color.get(132,112,255)/*Color.Tan1*/,"stroke-width": 4, opacity: 0.0});
-	   border.id = contextObject.id + "_border";
-
-	   set.push(border);
-
-	   overlay.attr({stroke: Color.Orange,"stroke-width": 3, fill: Color.get(0,0,0), opacity: 0.0, cursor: "hand"});
-	   overlay.data("set",set);
-	   overlay.id = contextObject.id;
-	   overlay.data("contextObject",contextObject);
-
-	   var instance = this;
-	   overlay.mousedown(function(event){if (event.button == 2) instance.onRightClick(event, instance, this);});
-	   overlay.click(function(event){instance.onClick(event, instance, this);});
-	   overlay.hover(function(event){instance.onHoverIn(event, instance, this);}, function(event){instance.onHoverOut(event, instance, this);});
-	 },
-	
+	onClick: function (event, instance, element) {
+		var overlay = element;
+		var set = overlay.data("set");
+		var contextObject = overlay.data("contextObject");
+		//console.log("["+contextObject.getProperty("type")+"], activityId: " + contextObject.getId());
+		if (ProcessDiagramGenerator.options && ProcessDiagramGenerator.options.on && ProcessDiagramGenerator.options.on.click) {
+			var args = [instance, element, contextObject];
+			ProcessDiagramGenerator.options.on.click.apply(event, args);
+		}
+	},
+	onRightClick: function (event, instance, element) {
+		var overlay = element;
+		var set = overlay.data("set");
+		var contextObject = overlay.data("contextObject");
+		//console.log("[%s], activityId: %s (RIGHTCLICK)", contextObject.getProperty("type"), contextObject.getId());
+
+		if (ProcessDiagramGenerator.options && ProcessDiagramGenerator.options.on && ProcessDiagramGenerator.options.on.rightClick) {
+			var args = [instance, element, contextObject];
+			ProcessDiagramGenerator.options.on.rightClick.apply(event, args);
+		}
+	},
+	onHoverIn: function (event, instance, element) {
+		var overlay = element;
+		var set = overlay.data("set");
+		var contextObject = overlay.data("contextObject");
+
+		var border = instance.g.getById(contextObject.id + "_border");
+		border.attr("opacity", 0.3);
+
+		// provide callback
+		if (ProcessDiagramGenerator.options && ProcessDiagramGenerator.options.on && ProcessDiagramGenerator.options.on.over) {
+			var args = [instance, element, contextObject];
+			ProcessDiagramGenerator.options.on.over.apply(event, args);
+		}
+	},
+	onHoverOut: function (event, instance, element) {
+		var overlay = element;
+		var set = overlay.data("set");
+		var contextObject = overlay.data("contextObject");
+
+		var border = instance.g.getById(contextObject.id + "_border");
+		border.attr("opacity", 0.0);
+		// provide callback
+		if (ProcessDiagramGenerator.options && ProcessDiagramGenerator.options.on && ProcessDiagramGenerator.options.on.out) {
+			var args = [instance, element, contextObject];
+			ProcessDiagramGenerator.options.on.out.apply(event, args);
+		}
+	},
+	addHandlers: function (set, x, y, width, height, type) {
+		var contextObject = this.getConextObject();
+
+		var cx = x + width / 2, cy = y + height / 2;
+		if (type == "event") {
+			var border = this.g.ellipse(cx, cy, width / 2 + 4, height / 2 + 4);
+			var overlay = this.g.ellipse(cx, cy, width / 2, height / 2);
+		} else if (type == "gateway") {
+			// rhombus
+			var border = this.g.path("M" + (x - 4) + " " + (y + (height / 2)) +
+				"L" + (x + (width / 2)) + " " + (y + height + 4) +
+				"L" + (x + width + 4) + " " + (y + (height / 2)) +
+				"L" + (x + (width / 2)) + " " + (y - 4) +
+				"z");
+			var overlay = this.g.path("M" + x + " " + (y + (height / 2)) +
+				"L" + (x + (width / 2)) + " " + (y + height) +
+				"L" + (x + width) + " " + (y + (height / 2)) +
+				"L" + (x + (width / 2)) + " " + y +
+				"z");
+		} else if (type == "task") {
+			var border = this.g.rect(x - 4, y - 4, width + 9, height + 9, TASK_CORNER_ROUND + 4);
+			var overlay = this.g.rect(x, y, width, height, TASK_CORNER_ROUND);
+		}
+
+		border.attr({stroke: Color.get(132, 112, 255)/*Color.Tan1*/, "stroke-width": 4, opacity: 0.0});
+		border.id = contextObject.id + "_border";
+
+		set.push(border);
+
+		overlay.attr({stroke: Color.Orange, "stroke-width": 3, fill: Color.get(0, 0, 0), opacity: 0.0, cursor: "hand"});
+		overlay.data("set", set);
+		overlay.id = contextObject.id;
+		overlay.data("contextObject", contextObject);
+
+		var instance = this;
+		overlay.mousedown(function (event) {
+			if (event.button == 2) instance.onRightClick(event, instance, this);
+		});
+		overlay.click(function (event) {
+			instance.onClick(event, instance, this);
+		});
+		overlay.hover(function (event) {
+			instance.onHoverIn(event, instance, this);
+		}, function (event) {
+			instance.onHoverOut(event, instance, this);
+		});
+	},
+
 	/*
 	 * Start Events:
-	 * 
+	 *
 	 *	drawNoneStartEvent
 	 *	drawTimerStartEvent
 	 *	drawMessageStartEvent
@@ -330,129 +345,131 @@ ProcessDiagramCanvas.prototype = {
 	 *	_drawStartEventImage
 	 *	_drawStartEvent
 	 */
-	 
-	drawNoneStartEvent: function(x, y, width, height) {
-	  this.g.setStart();
-	  
+
+	drawNoneStartEvent: function (x, y, width, height) {
+		this.g.setStart();
+
 		var isInterrupting = undefined;
 		this._drawStartEvent(x, y, width, height, isInterrupting, null);
-		
+
 		var set = this.g.setFinish();
 		this.addHandlers(set, x, y, width, height, "event");
 	},
-	
-	drawTimerStartEvent: function(x, y, width, height, isInterrupting, name) {
-	  this.g.setStart();
-	  
+
+	drawTimerStartEvent: function (x, y, width, height, isInterrupting, name) {
+		this.g.setStart();
+
 		this._drawStartEvent(x, y, width, height, isInterrupting, null);
-		
-		var cx = x + width/2 - this.getStroke()/4;
-		var cy = y + height/2 - this.getStroke()/4;
-		
-		var w = width*.9;// - this.getStroke()*2;
-		var h = height*.9;// - this.getStroke()*2;
-		
+
+		var cx = x + width / 2 - this.getStroke() / 4;
+		var cy = y + height / 2 - this.getStroke() / 4;
+
+		var w = width * .9;// - this.getStroke()*2;
+		var h = height * .9;// - this.getStroke()*2;
+
 		this._drawClock(cx, cy, w, h);
-		
+
 		if (this.gebug)
-			var center = this.g.ellipse(cx, cy, 3, 3).attr({stroke:"none", fill: Color.green});
-		
+			var center = this.g.ellipse(cx, cy, 3, 3).attr({stroke: "none", fill: Color.green});
+
 		var set = this.g.setFinish();
 		this.addHandlers(set, x, y, width, height, "event");
 	},
-	
-	drawMessageStartEvent: function(x, y, width, height, isInterrupting, name) {
-	  this.g.setStart();
-	  
+
+	drawMessageStartEvent: function (x, y, width, height, isInterrupting, name) {
+		this.g.setStart();
+
 		this._drawStartEvent(x, y, width, height, isInterrupting, null);
-		
+
 		this._drawStartEventImage(x, y, width, height, MESSAGE_CATCH_IMAGE);
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "event");
+		this.addHandlers(set, x, y, width, height, "event");
 	},
-	
-	drawErrorStartEvent: function(x, y, width, height, name) {
-	  this.g.setStart();
+
+	drawErrorStartEvent: function (x, y, width, height, name) {
+		this.g.setStart();
 		var isInterrupting = undefined;
 		this._drawStartEvent(x, y, width, height, isInterrupting);
 
 		this._drawStartEventImage(x, y, width, height, ERROR_CATCH_IMAGE);
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "event");
+		this.addHandlers(set, x, y, width, height, "event");
 	},
-	
-	drawSignalStartEvent: function(x, y, width, height, isInterrupting, name) {
-	  this.g.setStart();
+
+	drawSignalStartEvent: function (x, y, width, height, isInterrupting, name) {
+		this.g.setStart();
 		this._drawStartEvent(x, y, width, height, isInterrupting, null);
-		
+
 		this._drawStartEventImage(x, y, width, height, SIGNAL_CATCH_IMAGE);
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "event");
-	},
-	
-	drawMultipleStartEvent: function(x, y, width, height, isInterrupting, name) {
-	  this.g.setStart();
-		
-	  this._drawStartEvent(x, y, width, height, isInterrupting, null);
-		
-		var cx = x + width/2 - this.getStroke()/4;
-		var cy = y + height/2 - this.getStroke()/4;
-		
-		var w = width*1;
-		var h = height*1;
-		
+		this.addHandlers(set, x, y, width, height, "event");
+	},
+
+	drawMultipleStartEvent: function (x, y, width, height, isInterrupting, name) {
+		this.g.setStart();
+
+		this._drawStartEvent(x, y, width, height, isInterrupting, null);
+
+		var cx = x + width / 2 - this.getStroke() / 4;
+		var cy = y + height / 2 - this.getStroke() / 4;
+
+		var w = width * 1;
+		var h = height * 1;
+
 		this._drawPentagon(cx, cy, w, h);
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "event");
-	},
-	
-	_drawStartEventImage: function(x, y, width, height, image){
-		var cx = x + width/2 - this.getStroke()/2;
-		var cy = y + height/2 - this.getStroke()/2;
-		
-		var w = width*.65;// - this.getStroke()*2;
-		var h = height*.65;// - this.getStroke()*2;
-		
-		var img = this.g.image(image, cx-w/2, cy-h/2, w, h);
-	},
-	_drawStartEvent: function(x, y, width, height, isInterrupting){
+		this.addHandlers(set, x, y, width, height, "event");
+	},
+
+	_drawStartEventImage: function (x, y, width, height, image) {
+		var cx = x + width / 2 - this.getStroke() / 2;
+		var cy = y + height / 2 - this.getStroke() / 2;
+
+		var w = width * .65;// - this.getStroke()*2;
+		var h = height * .65;// - this.getStroke()*2;
+
+		var img = this.g.image(image, cx - w / 2, cy - h / 2, w, h);
+	},
+	_drawStartEvent: function (x, y, width, height, isInterrupting) {
 		var originalPaint = this.getPaint();
-		if (typeof(START_EVENT_STROKE_COLOR) != "undefined")
+		if (typeof (START_EVENT_STROKE_COLOR) != "undefined")
 			this.setPaint(START_EVENT_STROKE_COLOR);
-		
-		
+
+
 		width -= this.strokeWidth / 2;
 		height -= this.strokeWidth / 2;
-		
-		x = x + width/2;
-		y = y + height/2;
-		
-		var circle = this.g.ellipse(x, y, width/2, height/2);
-		
-		circle.attr({"stroke-width": this.strokeWidth, 
-				"stroke": this.paint, 
-				//"stroke": START_EVENT_STROKE_COLOR,
-				"fill": START_EVENT_COLOR});
-				
+
+		x = x + width / 2;
+		y = y + height / 2;
+
+		var circle = this.g.ellipse(x, y, width / 2, height / 2);
+
+		circle.attr({
+			"stroke-width": this.strokeWidth,
+			"stroke": this.paint,
+			//"stroke": START_EVENT_STROKE_COLOR,
+			"fill": START_EVENT_COLOR
+		});
+
 		// white shaddow
 		this.drawShaddow(circle);
-		
-		if (isInterrupting!=null && isInterrupting!=undefined && !isInterrupting) 
+
+		if (isInterrupting != null && isInterrupting != undefined && !isInterrupting)
 			circle.attr({"stroke-dasharray": NON_INTERRUPTING_EVENT_STROKE});
 
 		this.setContextToElement(circle);
-		
-		
+
+
 		this.setPaint(originalPaint);
 	},
-	
+
 	/*
 	 * End Events:
-	 * 
+	 *
 	 *	drawNoneEndEvent
 	 *	drawErrorEndEvent
 	 *	drawMessageEndEvent
@@ -461,146 +478,150 @@ ProcessDiagramCanvas.prototype = {
 	 *  _drawEndEventImage
 	 *	_drawNoneEndEvent
 	 */
-	 
-	drawNoneEndEvent: function(x, y, width, height) {
-	  this.g.setStart();
-	  
+
+	drawNoneEndEvent: function (x, y, width, height) {
+		this.g.setStart();
+
 		this._drawNoneEndEvent(x, y, width, height, null, "noneEndEvent");
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "event");
+		this.addHandlers(set, x, y, width, height, "event");
 	},
-	
-	drawErrorEndEvent: function(x, y, width, height) {
-	  this.g.setStart();
+
+	drawErrorEndEvent: function (x, y, width, height) {
+		this.g.setStart();
 		var type = "errorEndEvent";
 		this._drawNoneEndEvent(x, y, width, height, null, type);
-		
+
 		this._drawEndEventImage(x, y, width, height, ERROR_THROW_IMAGE);
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "event");
+		this.addHandlers(set, x, y, width, height, "event");
 	},
-	
-	drawMessageEndEvent: function(x, y, width, height, name) {
-	  this.g.setStart();
+
+	drawMessageEndEvent: function (x, y, width, height, name) {
+		this.g.setStart();
 		var type = "errorEndEvent";
 		this._drawNoneEndEvent(x, y, width, height, null, type);
-		
+
 		this._drawEndEventImage(x, y, width, height, MESSAGE_THROW_IMAGE);
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "event");
+		this.addHandlers(set, x, y, width, height, "event");
 	},
-	
-	drawSignalEndEvent: function(x, y, width, height, name) {
-	  this.g.setStart();
+
+	drawSignalEndEvent: function (x, y, width, height, name) {
+		this.g.setStart();
 		var type = "errorEndEvent";
 		this._drawNoneEndEvent(x, y, width, height, null, type);
-		
+
 		this._drawEndEventImage(x, y, width, height, SIGNAL_THROW_IMAGE);
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "event");
+		this.addHandlers(set, x, y, width, height, "event");
 	},
-	
-	drawMultipleEndEvent: function(x, y, width, height, name) {
-	  this.g.setStart();
+
+	drawMultipleEndEvent: function (x, y, width, height, name) {
+		this.g.setStart();
 		var type = "errorEndEvent";
 		this._drawNoneEndEvent(x, y, width, height, null, type);
-		
-		var cx = x + width/2;// - this.getStroke();
-		var cy = y + height/2;// - this.getStroke();
-		
-		var w = width*1;
-		var h = height*1;
-		
+
+		var cx = x + width / 2;// - this.getStroke();
+		var cy = y + height / 2;// - this.getStroke();
+
+		var w = width * 1;
+		var h = height * 1;
+
 		var filled = true;
 		this._drawPentagon(cx, cy, w, h, filled);
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "event");
+		this.addHandlers(set, x, y, width, height, "event");
 	},
-	
-	drawTerminateEndEvent: function(x, y, width, height) {
-	  this.g.setStart();
+
+	drawTerminateEndEvent: function (x, y, width, height) {
+		this.g.setStart();
 		var type = "errorEndEvent";
 		this._drawNoneEndEvent(x, y, width, height, null, type);
-		
-		var cx = x + width/2;// - this.getStroke()/2;
-		var cy = y + height/2;// - this.getStroke()/2;
-		
-		var w = width/2*.6;
-		var h = height/2*.6;
-		
+
+		var cx = x + width / 2;// - this.getStroke()/2;
+		var cy = y + height / 2;// - this.getStroke()/2;
+
+		var w = width / 2 * .6;
+		var h = height / 2 * .6;
+
 		var circle = this.g.ellipse(cx, cy, w, h).attr({fill: Color.black});
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "event");
-	},
-	
-	_drawEndEventImage: function(x, y, width, height, image){
-		var cx = x + width/2 - this.getStroke()/2;
-		var cy = y + height/2 - this.getStroke()/2;
-		
-		var w = width*.65;
-		var h = height*.65;
-		
-		var img = this.g.image(image, cx-w/2, cy-h/2, w, h);
-	},
-	
-	_drawNoneEndEvent: function(x, y, width, height, image, type) {
+		this.addHandlers(set, x, y, width, height, "event");
+	},
+
+	_drawEndEventImage: function (x, y, width, height, image) {
+		var cx = x + width / 2 - this.getStroke() / 2;
+		var cy = y + height / 2 - this.getStroke() / 2;
+
+		var w = width * .65;
+		var h = height * .65;
+
+		var img = this.g.image(image, cx - w / 2, cy - h / 2, w, h);
+	},
+
+	_drawNoneEndEvent: function (x, y, width, height, image, type) {
 		var originalPaint = this.getPaint();
-		if (typeof(CATCHING_EVENT_COLOR) != "undefined")
+		if (typeof (CATCHING_EVENT_COLOR) != "undefined")
 			this.setPaint(CATCHING_EVENT_COLOR);
-			
+
 		var strokeColor = this.getPaint();
 		var fillColor = this.getPaint();
-		
+
 		if (type == "errorEndEvent") {
 			strokeColor = ERROR_END_EVENT_STROKE_COLOR;
 			fillColor = ERROR_END_EVENT_COLOR;
 		} else if (type == "noneEndEvent") {
 			strokeColor = NONE_END_EVENT_STROKE_COLOR;
 			fillColor = NONE_END_EVENT_COLOR;
-		} else 
-			
-		// event circles
-		width -= this.strokeWidth / 2;
+		} else
+
+			// event circles
+			width -= this.strokeWidth / 2;
 		height -= this.strokeWidth / 2;
-		
-		x = x + width/2;// + this.strokeWidth/2;
-		y = y + width/2;// + this.strokeWidth/2;
-		
+
+		x = x + width / 2;// + this.strokeWidth/2;
+		y = y + width / 2;// + this.strokeWidth/2;
+
 		// outerCircle
-		var outerCircle = this.g.ellipse(x, y, width/2, height/2);
-		
+		var outerCircle = this.g.ellipse(x, y, width / 2, height / 2);
+
 		// white shaddow
 		var shaddow = this.drawShaddow(outerCircle);
-		
-		outerCircle.attr({"stroke-width": this.strokeWidth,
-						"stroke": strokeColor,
-						"fill": fillColor});
-		
+
+		outerCircle.attr({
+			"stroke-width": this.strokeWidth,
+			"stroke": strokeColor,
+			"fill": fillColor
+		});
+
 		var innerCircleX = x;
 		var innerCircleY = y;
-		var innerCircleWidth = width/2 - 2;
-		var innerCircleHeight = height/2 - 2;
+		var innerCircleWidth = width / 2 - 2;
+		var innerCircleHeight = height / 2 - 2;
 		var innerCircle = this.g.ellipse(innerCircleX, innerCircleY, innerCircleWidth, innerCircleHeight);
-		innerCircle.attr({"stroke-width": this.strokeWidth,
-				"stroke": strokeColor,
-				"fill": Color.white});
+		innerCircle.attr({
+			"stroke-width": this.strokeWidth,
+			"stroke": strokeColor,
+			"fill": Color.white
+		});
 
 		// TODO: implement it
 		//var originalPaint = this.getPaint();
 		//this.g.setPaint(BOUNDARY_EVENT_COLOR);
-		
+
 		this.setPaint(originalPaint);
 	},
-	
+
 	/*
 	 * Catching Events:
-	 * 
+	 *
 	 *	drawCatchingTimerEvent
 	 *	drawCatchingErrorEvent
 	 *	drawCatchingSignalEvent
@@ -609,135 +630,139 @@ ProcessDiagramCanvas.prototype = {
 	 *	_drawCatchingEventImage
 	 *	_drawCatchingEvent
 	 */
-	 
-	
-	drawCatchingTimerEvent: function(x, y, width, height, isInterrupting, name) {
-	  this.g.setStart();
+
+
+	drawCatchingTimerEvent: function (x, y, width, height, isInterrupting, name) {
+		this.g.setStart();
 		this._drawCatchingEvent(x, y, width, height, isInterrupting, null);
-		
+
 		var innerCircleWidth = width - 4;
 		var innerCircleHeight = height - 4;
-		
-		var cx = x + width/2 - this.getStroke()/4;
-		var cy = y + height/2 - this.getStroke()/4;
-		
-		var w = innerCircleWidth*.9;// - this.getStroke()*2;
-		var h = innerCircleHeight*.9;// - this.getStroke()*2;
-		
+
+		var cx = x + width / 2 - this.getStroke() / 4;
+		var cy = y + height / 2 - this.getStroke() / 4;
+
+		var w = innerCircleWidth * .9;// - this.getStroke()*2;
+		var h = innerCircleHeight * .9;// - this.getStroke()*2;
+
 		this._drawClock(cx, cy, w, h);
-		
+
 		var set = this.g.setFinish();
 		this.addHandlers(set, x, y, width, height, "event");
 	},
 
-	drawCatchingErrorEvent: function(x, y, width, height, isInterrupting, name) {
-	  this.g.setStart();
+	drawCatchingErrorEvent: function (x, y, width, height, isInterrupting, name) {
+		this.g.setStart();
 		this._drawCatchingEvent(x, y, width, height, isInterrupting, null);
-		
+
 		this._drawCatchingEventImage(x, y, width, height, ERROR_CATCH_IMAGE);
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "event");
+		this.addHandlers(set, x, y, width, height, "event");
 	},
-	
-	drawCatchingSignalEvent: function(x, y, width, height, isInterrupting, name) {
-	  this.g.setStart();
+
+	drawCatchingSignalEvent: function (x, y, width, height, isInterrupting, name) {
+		this.g.setStart();
 		this._drawCatchingEvent(x, y, width, height, isInterrupting, null);
-		
+
 		this._drawCatchingEventImage(x, y, width, height, SIGNAL_CATCH_IMAGE);
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "event");
+		this.addHandlers(set, x, y, width, height, "event");
 	},
-	
-	drawCatchingMessageEvent: function(x, y, width, height, isInterrupting, name) {
-	  this.g.setStart();
+
+	drawCatchingMessageEvent: function (x, y, width, height, isInterrupting, name) {
+		this.g.setStart();
 		this._drawCatchingEvent(x, y, width, height, isInterrupting, null);
-		
+
 		this._drawCatchingEventImage(x, y, width, height, MESSAGE_CATCH_IMAGE);
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "event");
+		this.addHandlers(set, x, y, width, height, "event");
 	},
-	
-	drawCatchingMultipleEvent: function(x, y, width, height, isInterrupting, name) {
-	  this.g.setStart();
+
+	drawCatchingMultipleEvent: function (x, y, width, height, isInterrupting, name) {
+		this.g.setStart();
 		this._drawCatchingEvent(x, y, width, height, isInterrupting, null);
-		
-		var cx = x + width/2 - this.getStroke();
-		var cy = y + height/2 - this.getStroke();
-		
-		var w = width*.9;
-		var h = height*.9;
-		
+
+		var cx = x + width / 2 - this.getStroke();
+		var cy = y + height / 2 - this.getStroke();
+
+		var w = width * .9;
+		var h = height * .9;
+
 		this._drawPentagon(cx, cy, w, h);
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "event");
+		this.addHandlers(set, x, y, width, height, "event");
 	},
-	
-	_drawCatchingEventImage: function(x, y, width, height, image){
+
+	_drawCatchingEventImage: function (x, y, width, height, image) {
 		var innerCircleWidth = width - 4;
 		var innerCircleHeight = height - 4;
-		
-		var cx = x + width/2 - this.getStroke()/2;
-		var cy = y + height/2 - this.getStroke()/2;
-		
-		var w = innerCircleWidth*.6;// - this.getStroke()*2;
-		var h = innerCircleHeight*.6;// - this.getStroke()*2;
-		
-		var img = this.g.image(image, cx-w/2, cy-h/2, w, h);
-	},
-	
-	_drawCatchingEvent: function(x, y, width, height, isInterrupting, image) {
+
+		var cx = x + width / 2 - this.getStroke() / 2;
+		var cy = y + height / 2 - this.getStroke() / 2;
+
+		var w = innerCircleWidth * .6;// - this.getStroke()*2;
+		var h = innerCircleHeight * .6;// - this.getStroke()*2;
+
+		var img = this.g.image(image, cx - w / 2, cy - h / 2, w, h);
+	},
+
+	_drawCatchingEvent: function (x, y, width, height, isInterrupting, image) {
 		var originalPaint = this.getPaint();
-		if (typeof(CATCHING_EVENT_COLOR) != "undefined")
+		if (typeof (CATCHING_EVENT_COLOR) != "undefined")
 			this.setPaint(CATCHING_EVENT_COLOR);
-			
+
 		// event circles
 		width -= this.strokeWidth / 2;
 		height -= this.strokeWidth / 2;
-		
-		x = x + width/2;// + this.strokeWidth/2;
-		y = y + width/2;// + this.strokeWidth/2;
-		
+
+		x = x + width / 2;// + this.strokeWidth/2;
+		y = y + width / 2;// + this.strokeWidth/2;
+
 		// outerCircle
-		var outerCircle = this.g.ellipse(x, y, width/2, height/2);
-		
+		var outerCircle = this.g.ellipse(x, y, width / 2, height / 2);
+
 		// white shaddow
 		var shaddow = this.drawShaddow(outerCircle);
-		
+
 		//console.log("isInterrupting: " + isInterrupting, "x:" , x, "y:",y);
-		if (isInterrupting!=null && isInterrupting!=undefined && !isInterrupting) 
+		if (isInterrupting != null && isInterrupting != undefined && !isInterrupting)
 			outerCircle.attr({"stroke-dasharray": NON_INTERRUPTING_EVENT_STROKE});
-		
-		outerCircle.attr({"stroke-width": this.strokeWidth,
-						"stroke": this.getPaint(),
-						"fill": BOUNDARY_EVENT_COLOR});
-		
+
+		outerCircle.attr({
+			"stroke-width": this.strokeWidth,
+			"stroke": this.getPaint(),
+			"fill": BOUNDARY_EVENT_COLOR
+		});
+
 		var innerCircleX = x;
 		var innerCircleY = y;
-		var innerCircleRadiusX = width/2 - 4;
-		var innerCircleRadiusY = height/2 - 4;
+		var innerCircleRadiusX = width / 2 - 4;
+		var innerCircleRadiusY = height / 2 - 4;
 		var innerCircle = this.g.ellipse(innerCircleX, innerCircleY, innerCircleRadiusX, innerCircleRadiusY);
-		innerCircle.attr({"stroke-width": this.strokeWidth,
-				"stroke": this.getPaint()});
+		innerCircle.attr({
+			"stroke-width": this.strokeWidth,
+			"stroke": this.getPaint()
+		});
 
 		if (image) {
-			var imageWidth = imageHeight = innerCircleRadiusX*1.2 + this.getStroke()*2;
-			var imageX = innerCircleX-imageWidth/2 - this.strokeWidth/2;
-			var imageY = innerCircleY-imageWidth/2 - this.strokeWidth/2;
+			var imageWidth = imageHeight = innerCircleRadiusX * 1.2 + this.getStroke() * 2;
+			var imageX = innerCircleX - imageWidth / 2 - this.strokeWidth / 2;
+			var imageY = innerCircleY - imageWidth / 2 - this.strokeWidth / 2;
 			var img = this.g.image(image, imageX, imageY, imageWidth, imageHeight);
 		}
-		
+
 		this.setPaint(originalPaint);
-		
+
 		var set = this.g.set();
 		set.push(outerCircle, innerCircle, shaddow);
 		this.setContextToElement(outerCircle);
-		
+
 		// TODO: add shapes to set
-		
+
 		/*
 		var st = this.g.set();
 		st.push(
@@ -747,64 +772,64 @@ ProcessDiagramCanvas.prototype = {
 		st.attr({fill: "red", "stroke-width":0});
 		*/
 	},
-	
+
 	/*
 	 * Catching Events:
-	 * 
+	 *
 	 *	drawThrowingNoneEvent
 	 *	drawThrowingSignalEvent
 	 *	drawThrowingMessageEvent
 	 *	drawThrowingMultipleEvent
 	 */
-	
-	drawThrowingNoneEvent: function(x, y, width, height, name) {
-	  this.g.setStart();
+
+	drawThrowingNoneEvent: function (x, y, width, height, name) {
+		this.g.setStart();
 		this._drawCatchingEvent(x, y, width, height, null, null);
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "event");
+		this.addHandlers(set, x, y, width, height, "event");
 	},
-	
-	drawThrowingSignalEvent: function(x, y, width, height, name) {
-	  this.g.setStart();
+
+	drawThrowingSignalEvent: function (x, y, width, height, name) {
+		this.g.setStart();
 		this._drawCatchingEvent(x, y, width, height, null, null);
-		
+
 		this._drawCatchingEventImage(x, y, width, height, SIGNAL_THROW_IMAGE);
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "event");
+		this.addHandlers(set, x, y, width, height, "event");
 	},
-	
-	drawThrowingMessageEvent: function(x, y, width, height, name) {
-	  this.g.setStart();
+
+	drawThrowingMessageEvent: function (x, y, width, height, name) {
+		this.g.setStart();
 		this._drawCatchingEvent(x, y, width, height, null, null);
-		
+
 		this._drawCatchingEventImage(x, y, width, height, MESSAGE_THROW_IMAGE);
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "event");
+		this.addHandlers(set, x, y, width, height, "event");
 	},
-	
-	drawThrowingMultipleEvent: function(x, y, width, height, name) {
-	  this.g.setStart();
+
+	drawThrowingMultipleEvent: function (x, y, width, height, name) {
+		this.g.setStart();
 		this._drawCatchingEvent(x, y, width, height, null, null);
-		
-		var cx = x + width/2 - this.getStroke();
-		var cy = y + height/2 - this.getStroke();
-		
-		var w = width*.9;
-		var h = height*.9;
-		
+
+		var cx = x + width / 2 - this.getStroke();
+		var cy = y + height / 2 - this.getStroke();
+
+		var w = width * .9;
+		var h = height * .9;
+
 		var filled = true;
 		this._drawPentagon(cx, cy, w, h, filled);
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "event");
+		this.addHandlers(set, x, y, width, height, "event");
 	},
-	
+
 	/*
 	 * Draw flows:
-	 * 
+	 *
 	 *  _connectFlowToActivity
 	 *	_drawFlow
 	 *	_drawDefaultSequenceFlowIndicator
@@ -816,87 +841,99 @@ ProcessDiagramCanvas.prototype = {
 	 *	_drawConditionalSequenceFlowIndicator
 	 *	drawSequenceflowWithoutArrow
 	 */
-	 
-	_connectFlowToActivity: function(sourceActivityId, destinationActivityId, waypoints){
+
+	_connectFlowToActivity: function (sourceActivityId, destinationActivityId, waypoints) {
 		var sourceActivity = this.g.getById(sourceActivityId);
 		var destinationActivity = this.g.getById(destinationActivityId);
 		if (sourceActivity == null || destinationActivity == null) {
 			if (sourceActivity == null)
-				console.error("source activity["+sourceActivityId+"] not found");
+				console.error("source activity[" + sourceActivityId + "] not found");
 			else
-				console.error("destination activity["+destinationActivityId+"] not found");
+				console.error("destination activity[" + destinationActivityId + "] not found");
 			return null;
 		}
-			var bbSourceActivity = sourceActivity.getBBox()
-			var bbDestinationActivity = destinationActivity.getBBox()
-			
-			var path = [];
-			var newWaypoints = [];
-			for(var i = 0; i < waypoints.length; i++){
-				var pathType = ""
-				if (i==0)
-					pathType = "M";
-				else 
-					pathType = "L";
-					
-				path.push([pathType, waypoints[i].x, waypoints[i].y]);
-				newWaypoints.push({x:waypoints[i].x, y:waypoints[i].y});
-			}
+		var bbSourceActivity = sourceActivity.getBBox()
+		var bbDestinationActivity = destinationActivity.getBBox()
 
-			var ninjaPathSourceActivity = this.ninjaPaper.path(sourceActivity.realPath);
-			var ninjaPathDestinationActivity = this.ninjaPaper.path(destinationActivity.realPath);
-			var ninjaBBSourceActivity = ninjaPathSourceActivity.getBBox();
-			var ninjaBBDestinationActivity = ninjaPathDestinationActivity.getBBox();
-			
-			// set target of the flow to the center of the taskObject
-			var newPath = path;
-			var originalSource = {x: newPath[0][1], y: newPath[0][2]};
-			var originalTarget = {x: newPath[newPath.length-1][1], y: newPath[newPath.length-1][2]};
-			newPath[0][1] = ninjaBBSourceActivity.x + (ninjaBBSourceActivity.x2 - ninjaBBSourceActivity.x ) / 2;
-			newPath[0][2] = ninjaBBSourceActivity.y + (ninjaBBSourceActivity.y2 - ninjaBBSourceActivity.y ) / 2;
-			newPath[newPath.length-1][1] = ninjaBBDestinationActivity.x + (ninjaBBDestinationActivity.x2 - ninjaBBDestinationActivity.x ) / 2;
-			newPath[newPath.length-1][2] = ninjaBBDestinationActivity.y + (ninjaBBDestinationActivity.y2 - ninjaBBDestinationActivity.y ) / 2;
-			
-			var ninjaPathFlowObject = this.ninjaPaper.path(newPath);
-			var ninjaBBFlowObject = ninjaPathFlowObject.getBBox();
-			
-			var intersectionsSource = Raphael.pathIntersection(ninjaPathSourceActivity.realPath, ninjaPathFlowObject.realPath);
-			var intersectionsDestination = Raphael.pathIntersection(ninjaPathDestinationActivity.realPath, ninjaPathFlowObject.realPath);
-			var intersectionSource = intersectionsSource.pop();
-			var intersectionDestination = intersectionsDestination.pop();
-			
-			if (intersectionSource != undefined) {
-				if (this.gebug) {
-					var diameter = 5;
-					var dotOriginal = this.g.ellipse(originalSource.x, originalSource.y, diameter, diameter).attr({"fill": Color.white, "stroke": Color.Pink});
-					var dot = this.g.ellipse(intersectionSource.x, intersectionSource.y, diameter, diameter).attr({"fill": Color.white, "stroke": Color.Green});
-				}
-				
-				newWaypoints[0].x = intersectionSource.x;
-				newWaypoints[0].y = intersectionSource.y;
+		var path = [];
+		var newWaypoints = [];
+		for (var i = 0; i < waypoints.length; i++) {
+			var pathType = ""
+			if (i == 0)
+				pathType = "M";
+			else
+				pathType = "L";
+
+			path.push([pathType, waypoints[i].x, waypoints[i].y]);
+			newWaypoints.push({x: waypoints[i].x, y: waypoints[i].y});
+		}
+
+		var ninjaPathSourceActivity = this.ninjaPaper.path(sourceActivity.realPath);
+		var ninjaPathDestinationActivity = this.ninjaPaper.path(destinationActivity.realPath);
+		var ninjaBBSourceActivity = ninjaPathSourceActivity.getBBox();
+		var ninjaBBDestinationActivity = ninjaPathDestinationActivity.getBBox();
+
+		// set target of the flow to the center of the taskObject
+		var newPath = path;
+		var originalSource = {x: newPath[0][1], y: newPath[0][2]};
+		var originalTarget = {x: newPath[newPath.length - 1][1], y: newPath[newPath.length - 1][2]};
+		newPath[0][1] = ninjaBBSourceActivity.x + (ninjaBBSourceActivity.x2 - ninjaBBSourceActivity.x) / 2;
+		newPath[0][2] = ninjaBBSourceActivity.y + (ninjaBBSourceActivity.y2 - ninjaBBSourceActivity.y) / 2;
+		newPath[newPath.length - 1][1] = ninjaBBDestinationActivity.x + (ninjaBBDestinationActivity.x2 - ninjaBBDestinationActivity.x) / 2;
+		newPath[newPath.length - 1][2] = ninjaBBDestinationActivity.y + (ninjaBBDestinationActivity.y2 - ninjaBBDestinationActivity.y) / 2;
+
+		var ninjaPathFlowObject = this.ninjaPaper.path(newPath);
+		var ninjaBBFlowObject = ninjaPathFlowObject.getBBox();
+
+		var intersectionsSource = Raphael.pathIntersection(ninjaPathSourceActivity.realPath, ninjaPathFlowObject.realPath);
+		var intersectionsDestination = Raphael.pathIntersection(ninjaPathDestinationActivity.realPath, ninjaPathFlowObject.realPath);
+		var intersectionSource = intersectionsSource.pop();
+		var intersectionDestination = intersectionsDestination.pop();
+
+		if (intersectionSource != undefined) {
+			if (this.gebug) {
+				var diameter = 5;
+				var dotOriginal = this.g.ellipse(originalSource.x, originalSource.y, diameter, diameter).attr({
+					"fill": Color.white,
+					"stroke": Color.Pink
+				});
+				var dot = this.g.ellipse(intersectionSource.x, intersectionSource.y, diameter, diameter).attr({
+					"fill": Color.white,
+					"stroke": Color.Green
+				});
 			}
-			if (intersectionDestination != undefined) {
-				if (this.gebug) {
-					var diameter = 5;
-					var dotOriginal = this.g.ellipse(originalTarget.x, originalTarget.y, diameter, diameter).attr({"fill": Color.white, "stroke": Color.Red});
-					var dot = this.g.ellipse(intersectionDestination.x, intersectionDestination.y, diameter, diameter).attr({"fill": Color.white, "stroke": Color.Blue});
-				}
-				
-				newWaypoints[newWaypoints.length-1].x = intersectionDestination.x;
-				newWaypoints[newWaypoints.length-1].y = intersectionDestination.y;
+
+			newWaypoints[0].x = intersectionSource.x;
+			newWaypoints[0].y = intersectionSource.y;
+		}
+		if (intersectionDestination != undefined) {
+			if (this.gebug) {
+				var diameter = 5;
+				var dotOriginal = this.g.ellipse(originalTarget.x, originalTarget.y, diameter, diameter).attr({
+					"fill": Color.white,
+					"stroke": Color.Red
+				});
+				var dot = this.g.ellipse(intersectionDestination.x, intersectionDestination.y, diameter, diameter).attr({
+					"fill": Color.white,
+					"stroke": Color.Blue
+				});
 			}
-			
-			this.ninjaPaper.clear();
+
+			newWaypoints[newWaypoints.length - 1].x = intersectionDestination.x;
+			newWaypoints[newWaypoints.length - 1].y = intersectionDestination.y;
+		}
+
+		this.ninjaPaper.clear();
 		return newWaypoints;
 	},
-	 
-	_drawFlow: function(waypoints, conditional, isDefault, highLighted, withArrowHead, connectionType){
+
+	_drawFlow: function (waypoints, conditional, isDefault, highLighted, withArrowHead, connectionType) {
 		var originalPaint = this.getPaint();
 		var originalStroke = this.getStroke();
-		
+
 		this.setPaint(SEQUENCEFLOW_COLOR);
 		this.setStroke(SEQUENCEFLOW_STROKE);
-		
+
 		if (highLighted) {
 			this.setPaint(HIGHLIGHT_COLOR);
 			this.setStroke(SEQUENCEFLOW_HIGHLIGHT_STROKE);
@@ -904,32 +941,32 @@ ProcessDiagramCanvas.prototype = {
 
 // TODO: generate polylineId or do something!!
 		var uuid = Raphael.createUUID();
-		
+
 		var contextObject = this.getConextObject();
 		var newWaypoints = waypoints;
 		if (contextObject) {
 			var newWaypoints = this._connectFlowToActivity(contextObject.sourceActivityId, contextObject.destinationActivityId, waypoints);
-			
+
 			if (!newWaypoints) {
-				console.error("Error draw flow from '"+contextObject.sourceActivityId+"' to '"+contextObject.destinationActivityId+"' ");
+				console.error("Error draw flow from '" + contextObject.sourceActivityId + "' to '" + contextObject.destinationActivityId + "' ");
 				return;
 			}
 		}
 		var polyline = new Polyline(uuid, newWaypoints, this.getStroke());
 		//var polyline = new Polyline(waypoints, 3);
-		
+
 		polyline.element = this.g.path(polyline.path);
 		polyline.element.attr("stroke-width", this.getStroke());
 		polyline.element.attr("stroke", this.getPaint());
-			
+
 		if (contextObject) {
 			polyline.element.id = contextObject.id;
 			polyline.element.data("contextObject", contextObject);
 		} else {
 			polyline.element.id = uuid;
 		}
-		
-		
+
+
 		/*
 		polyline.element.mouseover(function(){
 			this.attr({"stroke-width": NORMAL_STROKE + 2});
@@ -937,16 +974,16 @@ ProcessDiagramCanvas.prototype = {
 			this.attr({"stroke-width": NORMAL_STROKE});
 		});
 		*/
-		
-		var last = polyline.getAnchorsCount()-1;
+
+		var last = polyline.getAnchorsCount() - 1;
 		var x = polyline.getAnchor(last).x;
 		var y = polyline.getAnchor(last).y;
 		//var c = this.g.ellipse(x, y, 5, 5);
-		
-		var lastLineIndex = polyline.getLinesCount()-1;
+
+		var lastLineIndex = polyline.getLinesCount() - 1;
 		var line = polyline.getLine(lastLineIndex);
 		var firstLine = polyline.getLine(0);
-		
+
 		var arrowHead = null,
 			circleTail = null,
 			defaultSequenceFlowIndicator = null,
@@ -955,57 +992,62 @@ ProcessDiagramCanvas.prototype = {
 		if (connectionType == CONNECTION_TYPE.MESSAGE_FLOW) {
 			circleTail = this._drawCircleTail(firstLine, connectionType);
 		}
-		if(withArrowHead)
+		if (withArrowHead)
 			arrowHead = this._drawArrowHead(line, connectionType);
-		
+
 		//console.log("isDefault: ", isDefault, ", isDefaultConditionAvailable: ", polyline.isDefaultConditionAvailable);
 		if (isDefault && polyline.isDefaultConditionAvailable) {
 			//var angle = polyline.getLineAngle(0);
 			//console.log("firstLine", firstLine);
 			defaultSequenceFlowIndicator = this._drawDefaultSequenceFlowIndicator(firstLine);
 		}
-		
+
 		if (conditional) {
 			conditionalSequenceFlowIndicator = this._drawConditionalSequenceFlowIndicator(firstLine);
 		}
 
-        // draw flow name
-        var flowName = contextObject.name;
-        if (flowName) {
-            var xPointArray = contextObject.xPointArray;
-            var yPointArray = contextObject.yPointArray;
-            var textX = xPointArray[0] < xPointArray[1] ? xPointArray[0] : xPointArray[1];
-            var textY = yPointArray[0] < yPointArray[1] ? yPointArray[1] : yPointArray[0];
-            // fix xy
-            textX += 20;
-            textY -= 10;
-            this.g.text(textX, textY, flowName).attr(LABEL_FONT);
-        }
-		
+		// draw flow name
+		var flowName = contextObject.name;
+		if (flowName) {
+			var xPointArray = contextObject.xPointArray;
+			var yPointArray = contextObject.yPointArray;
+			var textX = xPointArray[0] < xPointArray[1] ? xPointArray[0] : xPointArray[1];
+			var textY = yPointArray[0] < yPointArray[1] ? yPointArray[1] : yPointArray[0];
+			// fix xy
+			textX += 20;
+			textY -= 10;
+			this.g.text(textX, textY, flowName).attr(LABEL_FONT);
+		}
+
 		var st = this.g.set();
 		st.push(polyline.element, arrowHead, circleTail, conditionalSequenceFlowIndicator);
 		polyline.element.data("set", st);
 		polyline.element.data("withArrowHead", withArrowHead);
-		
-		var polyCloneAttrNormal = {"stroke-width": this.getStroke() + 5, stroke: Color.get(132,112,255), opacity: 0.0, cursor: "hand"};
+
+		var polyCloneAttrNormal = {
+			"stroke-width": this.getStroke() + 5,
+			stroke: Color.get(132, 112, 255),
+			opacity: 0.0,
+			cursor: "hand"
+		};
 		var polyClone = st.clone().attr(polyCloneAttrNormal).hover(function () {
-				//if (polyLine.data("isSelected")) return;
-				polyClone.attr({opacity: 0.2});
-			}, function () {
-				//if (polyLine.data("isSelected")) return;
-				polyClone.attr({opacity: 0.0});
-			});
+			//if (polyLine.data("isSelected")) return;
+			polyClone.attr({opacity: 0.2});
+		}, function () {
+			//if (polyLine.data("isSelected")) return;
+			polyClone.attr({opacity: 0.0});
+		});
 		polyClone.data("objectId", polyline.element.id);
-		polyClone.click(function(){
+		polyClone.click(function () {
 			var instance = this;
 			var objectId = instance.data("objectId");
 			var object = this.paper.getById(objectId);
 			var contextObject = object.data("contextObject");
 			if (contextObject) {
-				console.log("[flow], objectId: " + object.id +", flow: " + contextObject.flow);
+				console.log("[flow], objectId: " + object.id + ", flow: " + contextObject.flow);
 				ProcessDiagramGenerator.showFlowInfo(contextObject);
 			}
-		}).dblclick(function(){
+		}).dblclick(function () {
 			console.log("!!! DOUBLE CLICK !!!");
 		}).hover(function (mouseEvent) {
 			var instance = this;
@@ -1016,128 +1058,129 @@ ProcessDiagramCanvas.prototype = {
 				ProcessDiagramGenerator.showFlowInfo(contextObject);
 		});
 		polyClone.data("parentId", uuid);
-		
+
 		if (!connectionType || connectionType == CONNECTION_TYPE.SEQUENCE_FLOW)
 			polyline.element.attr("stroke-width", this.getStroke());
 		else if (connectionType == CONNECTION_TYPE.MESSAGE_FLOW)
 			polyline.element.attr({"stroke-dasharray": "--"});
 		else if (connectionType == CONNECTION_TYPE.ASSOCIATION)
 			polyline.element.attr({"stroke-dasharray": ". "});
-		
+
 		this.setPaint(originalPaint);
 		this.setStroke(originalStroke);
 	},
-	
-	_drawDefaultSequenceFlowIndicator: function(line) {
+
+	_drawDefaultSequenceFlowIndicator: function (line) {
 		//console.log("line: ", line);
-		
-		var len = 10; c = len/2, f = 8;
+
+		var len = 10;
+		c = len / 2, f = 8;
 		var defaultIndicator = this.g.path("M" + (-c) + " " + 0 + "L" + (c) + " " + 0);
-		defaultIndicator.attr("stroke-width", this.getStroke()+0);
+		defaultIndicator.attr("stroke-width", this.getStroke() + 0);
 		defaultIndicator.attr("stroke", this.getPaint());
-		
-		
+
+
 		var cosAngle = Math.cos((line.angle));
 		var sinAngle = Math.sin((line.angle));
-		
+
 		var dx = f * cosAngle;
 		var dy = f * sinAngle;
-		
-		var x1 = line.x1 + dx + 0*c*cosAngle;
-		var y1 = line.y1 + dy + 0*c*sinAngle;
-		
+
+		var x1 = line.x1 + dx + 0 * c * cosAngle;
+		var y1 = line.y1 + dy + 0 * c * sinAngle;
+
 		defaultIndicator.transform("t" + (x1) + "," + (y1) + "");
-		defaultIndicator.transform("...r" + Raphael.deg(line.angle - 3*Math.PI / 4) + " " + 0 + " " + 0);
+		defaultIndicator.transform("...r" + Raphael.deg(line.angle - 3 * Math.PI / 4) + " " + 0 + " " + 0);
 		/*
 		var c0 = this.g.ellipse(0, 0, 1, 1).attr({stroke: Color.Blue});
 		c0.transform("t" + (line.x1) + "," + (line.y1) + "");
 		var center = this.g.ellipse(0, 0, 1, 1).attr({stroke: Color.Red});
 		center.transform("t" + (line.x1+dx) + "," + (line.y1+dy) + "");
 		*/
-		
+
 		return defaultIndicator;
 	},
-	
-	drawSequenceflow: function(waypoints, conditional, isDefault, highLighted) {
+
+	drawSequenceflow: function (waypoints, conditional, isDefault, highLighted) {
 		var withArrowHead = true;
 		this._drawFlow(waypoints, conditional, isDefault, highLighted, withArrowHead, CONNECTION_TYPE.SEQUENCE_FLOW);
 	},
-	
-	drawMessageflow: function(waypoints, highLighted) {
+
+	drawMessageflow: function (waypoints, highLighted) {
 		var withArrowHead = true;
-		var conditional=isDefault=false;
+		var conditional = isDefault = false;
 		this._drawFlow(waypoints, conditional, isDefault, highLighted, withArrowHead, CONNECTION_TYPE.MESSAGE_FLOW);
 	},
-	
-	drawAssociation: function(waypoints, withArrowHead, highLighted) {
+
+	drawAssociation: function (waypoints, withArrowHead, highLighted) {
 		var withArrowHead = withArrowHead;
-		var conditional=isDefault=false;
+		var conditional = isDefault = false;
 		this._drawFlow(waypoints, conditional, isDefault, highLighted, withArrowHead, CONNECTION_TYPE.ASSOCIATION);
 	},
-  
-	_drawCircleTail: function(line, connectionType){
-		var diameter = ARROW_WIDTH/2*1.5;
-		
+
+	_drawCircleTail: function (line, connectionType) {
+		var diameter = ARROW_WIDTH / 2 * 1.5;
+
 		// anti smoothing
-		if (this.strokeWidth%2 == 1)
+		if (this.strokeWidth % 2 == 1)
 			line.x1 += .5, line.y1 += .5;
-		
+
 		var circleTail = this.g.ellipse(line.x1, line.y1, diameter, diameter);
 		circleTail.attr("fill", Color.white);
 		circleTail.attr("stroke", this.getPaint());
-		
+
 		return circleTail;
 	},
-	
-	_drawArrowHead: function(line, connectionType){
+
+	_drawArrowHead: function (line, connectionType) {
 		var doubleArrowWidth = 2 * ARROW_WIDTH;
-		
+
 		if (connectionType == CONNECTION_TYPE.ASSOCIATION)
-			var arrowHead = this.g.path("M-" + (ARROW_WIDTH/2+.5) + " -" + doubleArrowWidth + "L 0 0 L" + (ARROW_WIDTH/2+.5) + " -" + doubleArrowWidth);
+			var arrowHead = this.g.path("M-" + (ARROW_WIDTH / 2 + .5) + " -" + doubleArrowWidth + "L 0 0 L" + (ARROW_WIDTH / 2 + .5) + " -" + doubleArrowWidth);
 		else
-			var arrowHead = this.g.path("M0 0L-" + (ARROW_WIDTH/2+.5) + " -" + doubleArrowWidth + "L" + (ARROW_WIDTH/2+.5) + " -" + doubleArrowWidth + "z");
-		
+			var arrowHead = this.g.path("M0 0L-" + (ARROW_WIDTH / 2 + .5) + " -" + doubleArrowWidth + "L" + (ARROW_WIDTH / 2 + .5) + " -" + doubleArrowWidth + "z");
+
 		//arrowHead.transform("t" + 0 + ",-" + this.getStroke() + "");
-		
+
 		// anti smoothing
-		if (this.strokeWidth%2 == 1)
+		if (this.strokeWidth % 2 == 1)
 			line.x2 += .5, line.y2 += .5;
-		
+
 		arrowHead.transform("t" + line.x2 + "," + line.y2 + "");
 		arrowHead.transform("...r" + Raphael.deg(line.angle - Math.PI / 2) + " " + 0 + " " + 0);
-		
+
 		if (!connectionType || connectionType == CONNECTION_TYPE.SEQUENCE_FLOW)
 			arrowHead.attr("fill", this.getPaint());
 		else if (connectionType == CONNECTION_TYPE.MESSAGE_FLOW)
 			arrowHead.attr("fill", Color.white);
-			
+
 		arrowHead.attr("stroke-width", this.getStroke());
 		arrowHead.attr("stroke", this.getPaint());
-		
+
 		return arrowHead;
 	},
-	
+
 	/*
 	drawArrowHead2: function(srcX, srcY, targetX, targetY) {
 		var doubleArrowWidth = 2 * ARROW_WIDTH;
-		
+
 		//var arrowHead = this.g.path("M-" + ARROW_WIDTH/2 + " -" + doubleArrowWidth + "L0 0" + "L" + ARROW_WIDTH/2 + " -" + doubleArrowWidth + "z");
-		
+
 		var arrowHead = this.g.path("M0 0L-" + ARROW_WIDTH/1.5 + " -" + doubleArrowWidth + "L" + ARROW_WIDTH/1.5 + " -" + doubleArrowWidth + "z");
 		//var c = DefaultProcessDiagramCanvas.g.ellipse(0, 0, 3, 3);
 		//c.transform("t"+targetX+","+targetY+"");
-		
+
 		var angle = Math.atan2(targetY - srcY, targetX - srcX);
-		
+
 		arrowHead.transform("t"+targetX+","+targetY+"");
 		arrowHead.transform("...r" + Raphael.deg(angle - Math.PI / 2) + " "+0+" "+0);
-		
+
 		//console.log(arrowHead.transform());
 		//console.log("--> " + Raphael.deg(angle - Math.PI / 2));
-		
+
 		arrowHead.attr("fill", this.getPaint());
 		arrowHead.attr("stroke", this.getPaint());
-		
+
 		/ *
 		// shaddow
 		var c0 = arrowHead.clone();
@@ -1149,17 +1192,17 @@ ProcessDiagramCanvas.prototype = {
 		* /
 	},
 	*/
-	
-	_drawConditionalSequenceFlowIndicator: function(line){
+
+	_drawConditionalSequenceFlowIndicator: function (line) {
 		var horizontal = (CONDITIONAL_INDICATOR_WIDTH * 0.7);
 		var halfOfHorizontal = horizontal / 2;
 		var halfOfVertical = CONDITIONAL_INDICATOR_WIDTH / 2;
 
 		var uuid = null;
 		var waypoints = [{x: 0, y: 0},
-						{x: -halfOfHorizontal, y: halfOfVertical},
-						{x: 0, y: CONDITIONAL_INDICATOR_WIDTH},
-						{x: halfOfHorizontal, y: halfOfVertical}];
+			{x: -halfOfHorizontal, y: halfOfVertical},
+			{x: 0, y: CONDITIONAL_INDICATOR_WIDTH},
+			{x: halfOfHorizontal, y: halfOfVertical}];
 		/*
 		var polyline = new Polyline(uuid, waypoints, this.getStroke());
 		polyline.element = this.g.path(polyline.path);
@@ -1170,88 +1213,88 @@ ProcessDiagramCanvas.prototype = {
 		var polygone = new Polygone(waypoints, this.getStroke());
 		polygone.element = this.g.path(polygone.path);
 		polygone.element.attr("fill", Color.white);
-		
+
 		polygone.transform("t" + line.x1 + "," + line.y1 + "");
 		polygone.transform("...r" + Raphael.deg(line.angle - Math.PI / 2) + " " + 0 + " " + 0);
-		
-		
+
+
 		var cosAngle = Math.cos((line.angle));
 		var sinAngle = Math.sin((line.angle));
-		
+
 		//polygone.element.attr("stroke-width", this.getStroke());
 		//polygone.element.attr("stroke", this.getPaint());
-		
+
 		polygone.attr({"stroke-width": this.getStroke(), "stroke": this.getPaint()});
-		
+
 		return polygone.element;
 	},
-  
-	drawSequenceflowWithoutArrow: function(waypoints, conditional, isDefault, highLighted) {
+
+	drawSequenceflowWithoutArrow: function (waypoints, conditional, isDefault, highLighted) {
 		var withArrowHead = false;
 		this._drawFlow(waypoints, conditional, isDefault, highLighted, withArrowHead, CONNECTION_TYPE.SEQUENCE_FLOW);
 	},
-	
+
 	/*
 	 * Draw artifacts
 	 */
-	
-	drawPoolOrLane: function(x, y, width, height, name){
+
+	drawPoolOrLane: function (x, y, width, height, name) {
 		// anti smoothing
-		if (this.strokeWidth%2 == 1)
+		if (this.strokeWidth % 2 == 1)
 			x = Math.round(x) + .5, y = Math.round(y) + .5;
-		
+
 		// shape
 		var rect = this.g.rect(x, y, width, height);
 		var attr = {"stroke-width": NORMAL_STROKE, stroke: TASK_STROKE_COLOR};
 		rect.attr(attr);
-		
+
 		// Add the name as text, vertical
-		if(name != null && name.length > 0) {
+		if (name != null && name.length > 0) {
 			var attr = POOL_LANE_FONT;
-			
+
 			// Include some padding
 			var availableTextSpace = height - 6;
-			
+
 			// Create rotation for derived font
 			var truncated = this.fitTextToWidth(name, availableTextSpace);
 			var realWidth = this.getStringWidth(truncated, attr);
 			var realHeight = this.getStringHeight(truncated, attr);
-			
+
 			//console.log("truncated:", truncated, ", height:", height, ", realHeight:", realHeight, ", availableTextSpace:", availableTextSpace, ", realWidth:", realWidth);
-			var newX = x + 2 + realHeight*1 - realHeight/2;
-			var newY = 3 + y + availableTextSpace - (availableTextSpace - realWidth) / 2 - realWidth/2;
+			var newX = x + 2 + realHeight * 1 - realHeight / 2;
+			var newY = 3 + y + availableTextSpace - (availableTextSpace - realWidth) / 2 - realWidth / 2;
 			var textElement = this.g.text(newX, newY, truncated).attr(attr);
 			//console.log(".getBBox(): ", t.getBBox());
-			textElement.transform("r" + Raphael.deg(270 * Math.PI/180) + " " + newX + " " + newY);
+			textElement.transform("r" + Raphael.deg(270 * Math.PI / 180) + " " + newX + " " + newY);
 		}
-		
+
 		// TODO: add to set
 	},
-	
-	_drawTask: function(name, x, y, width, height, thickBorder) {
+
+	_drawTask: function (name, x, y, width, height, thickBorder) {
 		var originalPaint = this.getPaint();
 		this.setPaint(TASK_COLOR);
-		
+
 		// anti smoothing
-		if (this.strokeWidth%2 == 1)
+		if (this.strokeWidth % 2 == 1)
 			x = Math.round(x) + .5, y = Math.round(y) + .5;
-		
+
 		// shape
 		var shape = this.g.rect(x, y, width, height, TASK_CORNER_ROUND);
 		var attr = {"stroke-width": this.strokeWidth, stroke: TASK_STROKE_COLOR, fill: this.getPaint()};
 		shape.attr(attr);
 		//shape.attr({fill: "90-"+this.getPaint()+"-" + Color.get(250, 250, 244)});
-		
+
 		var contextObject = this.getConextObject();
 		if (contextObject) {
 			shape.id = contextObject.id;
 			shape.data("contextObject", contextObject);
 		}
-		
+
 		//var activity = this.getConextObject();
 		//console.log("activity: " + activity.getId(), activity);
 		//Object.clone(activity);
-		
+
 		/*
 		c.mouseover(function(){
 			this.attr({"stroke-width": NORMAL_STROKE + 2});
@@ -1259,28 +1302,28 @@ ProcessDiagramCanvas.prototype = {
 			this.attr({"stroke-width": NORMAL_STROKE});
 		});
 		*/
-		
+
 		this.setPaint(originalPaint);
 
 		// white shaddow
 		this.drawShaddow(shape);
-		
-		
+
+
 		if (thickBorder) {
 			shape.attr({"stroke-width": THICK_TASK_BORDER_STROKE});
 		} else {
 			//g.draw(rect);
 		}
-		
+
 		// text
 		if (name) {
 			var fontAttr = TASK_FONT;
-			
+
 			// Include some padding
 			var paddingX = 5;
 			var paddingY = 5;
-			var availableTextSpace = width - paddingX*2;
-			
+			var availableTextSpace = width - paddingX * 2;
+
 			// TODO: this.setFont
 			// var originalFont = this.getFont();
 			// this.setFont(TASK_FONT)
@@ -1288,117 +1331,117 @@ ProcessDiagramCanvas.prototype = {
 			var truncated = this.fitTextToWidth(name, availableTextSpace);
 			var realWidth = this.getStringWidth(truncated, fontAttr);
 			var realHeight = this.getStringHeight(truncated, fontAttr);
-			
+
 			//var t = this.g.text(x + width/2 + realWidth*0/2 + paddingX*0, y + height/2, truncated).attr(fontAttr);
 			*/
 			//console.log("draw task name: " + name);
 			var boxWidth = width - (2 * TEXT_PADDING);
 			var boxHeight = height - ICON_SIZE - ICON_PADDING - ICON_PADDING - MARKER_WIDTH - 2 - 2;
-			var boxX = x + width/2 - boxWidth/2;
-			var boxY = y + height/2 - boxHeight/2 + ICON_PADDING + ICON_PADDING - 2 - 2;
+			var boxX = x + width / 2 - boxWidth / 2;
+			var boxY = y + height / 2 - boxHeight / 2 + ICON_PADDING + ICON_PADDING - 2 - 2;
 			/*
 			var boxWidth = width - (2 * ANNOTATION_TEXT_PADDING);
 			var boxHeight = height - (2 * ANNOTATION_TEXT_PADDING);
 			var boxX = x + width/2 - boxWidth/2;
 			var boxY = y + height/2 - boxHeight/2;
 			*/
-			
+
 			this.drawTaskLabel(name, boxX, boxY, boxWidth, boxHeight);
 		}
 	},
-	
-	drawTaskLabel: function(text, x, y, boxWidth, boxHeight){
+
+	drawTaskLabel: function (text, x, y, boxWidth, boxHeight) {
 		var originalFont = this.getFont();
 		this.setFont(TASK_FONT);
-			
+
 		this._drawMultilineText(text, x, y, boxWidth, boxHeight, MULTILINE_VERTICAL_ALIGN_MIDDLE, MULTILINE_HORIZONTAL_ALIGN_MIDDLE);
-		
+
 		this.setFont(originalFont);
 	},
-	
-	drawAnnotationText: function(text, x, y, width, height){
+
+	drawAnnotationText: function (text, x, y, width, height) {
 		//this._drawMultilineText(text, x, y, width, height, "start");
-		
+
 		var originalPaint = this.getPaint();
 		var originalFont = this.getFont();
-		
+
 		this.setPaint(Color.black);
 		this.setFont(TASK_FONT);
-			
+
 		this._drawMultilineText(text, x, y, width, height, MULTILINE_VERTICAL_ALIGN_TOP, MULTILINE_HORIZONTAL_ALIGN_LEFT);
-		
+
 		this.setPaint(originalPaint);
 		this.setFont(originalFont);
 	},
-	
-	drawLabel: function(text, x, y, width, height){
+
+	drawLabel: function (text, x, y, width, height) {
 		//this._drawMultilineText(text, x, y, width, height, "start");
-		
+
 		var originalPaint = this.getPaint();
 		var originalFont = this.getFont();
-		
+
 		this.setPaint(LABEL_COLOR);
 		//this.setFont(LABEL_FONT);
 		this.setFont(LABEL_FONT_SMOOTH);
-		
+
 		// predefined box width for labels
 		// TODO: use label width as is, but not height (for stretching)
 		if (!width || !height) {
-		  width = 100;
-		  height = 0;
+			width = 100;
+			height = 0;
 		}
-		
+
 		// TODO: remove it. It is debug
-		x = x - width/2;
-	  
+		x = x - width / 2;
+
 		this._drawMultilineText(text, x, y, width, height, MULTILINE_VERTICAL_ALIGN_TOP, MULTILINE_HORIZONTAL_ALIGN_MIDDLE);
-		
+
 		this.setPaint(originalPaint);
 		this.setFont(originalFont);
 	},
-	
+
 	/*
 	drawMultilineLabel: function(text, x, y){
 		var originalFont = this.getFont();
 		this.setFont(LABEL_FONT_SMOOTH);
-		
+
 		var boxWidth = 80;
 		x = x - boxWidth/2
-		
+
 		this._drawMultilineText(text, x, y, boxWidth, null, "middle");
 		this.setFont(originalFont);
 	},
 	*/
-	
-	getStringWidth: function(text, fontAttrs){
+
+	getStringWidth: function (text, fontAttrs) {
 		var textElement = this.g.text(0, 0, text).attr(fontAttrs).hide();
 		var bb = textElement.getBBox();
-		
+
 		//console.log("string width: ", t.getBBox().width);
 		return textElement.getBBox().width;
 	},
-	getStringHeight: function(text, fontAttrs){
+	getStringHeight: function (text, fontAttrs) {
 		var textElement = this.g.text(0, 0, text).attr(fontAttrs).hide();
 		var bb = textElement.getBBox();
-		
+
 		//console.log("string height: ", t.getBBox().height);
 		return textElement.getBBox().height;
 	},
-	fitTextToWidth: function(original, width) {
+	fitTextToWidth: function (original, width) {
 		var text = original;
 
 		// TODO: move attr on parameters
 		var attr = {font: "11px Arial", opacity: 0};
-		
+
 		// remove length for "..."
 		var dots = this.g.text(0, 0, "...").attr(attr).hide();
 		var dotsBB = dots.getBBox();
-		
+
 		var maxWidth = width - dotsBB.width;
-		
+
 		var textElement = this.g.text(0, 0, text).attr(attr).hide();
 		var bb = textElement.getBBox();
-		
+
 		// it's a little bit incorrect with "..."
 		while (bb.width > maxWidth && text.length > 0) {
 			text = text.substring(0, text.length - 1);
@@ -1408,258 +1451,258 @@ ProcessDiagramCanvas.prototype = {
 
 		// remove element from paper
 		textElement.remove();
-		
+
 		if (text != original) {
 			text = text + "...";
 		}
 
 		return text;
 	},
-	wrapTextToWidth: function(original, width){
-	
+	wrapTextToWidth: function (original, width) {
+
 		//return original;
-		
+
 		var text = original;
 		var wrappedText = "\n";
-		
+
 		// TODO: move attr on parameters
 		var attr = {font: "11px Arial", opacity: 0};
-		
+
 		var textElement = this.g.text(0, 0, wrappedText).attr(attr).hide();
 		var bb = textElement.getBBox();
-		
+
 		var resultText = "";
 		var i = 0, j = 0;
 		while (text.length > 0) {
-			while (bb.width < width && text.length>0) {
+			while (bb.width < width && text.length > 0) {
 				// remove "\n"
-				wrappedText = wrappedText.substring(0,wrappedText.length-1);
+				wrappedText = wrappedText.substring(0, wrappedText.length - 1);
 				// add new char, add "\n"
-				wrappedText = wrappedText + text.substring(0,1) + "\n";
+				wrappedText = wrappedText + text.substring(0, 1) + "\n";
 				text = text.substring(1);
-				
+
 				textElement.attr({"text": wrappedText});
 				bb = textElement.getBBox();
 				i++;
-				if (i>200) break;
+				if (i > 200) break;
 			}
 			// remove "\n"
 			wrappedText = wrappedText.substring(0, wrappedText.length - 1);
-			
+
 			if (text.length == 0) {
 				resultText += wrappedText;
 				break;
 			}
-			
+
 			// return last char to text
-			text = wrappedText.substring(wrappedText.length-1) + text;
+			text = wrappedText.substring(wrappedText.length - 1) + text;
 			// remove last char from wrappedText
-			wrappedText = wrappedText.substring(0, wrappedText.length-1) + "\n";
-			
+			wrappedText = wrappedText.substring(0, wrappedText.length - 1) + "\n";
+
 			textElement.attr({"text": wrappedText});
 			bb = textElement.getBBox();
-			
+
 			//console.log(">> ", wrappedText, ", ", text);
 			resultText += wrappedText;
 			wrappedText = "\n";
-			
+
 			j++;
-			if (j>20) break;
+			if (j > 20) break;
 		}
 		// remove element from paper
 		textElement.remove();
-		
+
 		return resultText;
 	},
-	
-	wrapTextToWidth2: function(original, width){
+
+	wrapTextToWidth2: function (original, width) {
 		var text = original;
 		var wrappedText = "\n";
-		
+
 		// TODO: move attr on parameters
 		var attr = {font: "11px Arial", opacity: 0};
-		
+
 		var textElement = this.g.text(0, 0, wrappedText).attr(attr).hide();
 		var bb = textElement.getBBox();
-		
+
 		var resultText = "";
 		var i = 0, j = 0;
 		while (text.length > 0) {
-			while (bb.width < width && text.length>0) {
+			while (bb.width < width && text.length > 0) {
 				// remove "\n"
-				wrappedText = wrappedText.substring(0,wrappedText.length-1);
+				wrappedText = wrappedText.substring(0, wrappedText.length - 1);
 				// add new char, add "\n"
-				wrappedText = wrappedText + text.substring(0,1) + "\n";
+				wrappedText = wrappedText + text.substring(0, 1) + "\n";
 				text = text.substring(1);
-				
+
 				textElement.attr({"text": wrappedText});
 				bb = textElement.getBBox();
 				i++;
-				if (i>200) break;
+				if (i > 200) break;
 			}
 			// remove "\n"
 			wrappedText = wrappedText.substring(0, wrappedText.length - 1);
-			
+
 			if (text.length == 0) {
 				resultText += wrappedText;
 				break;
 			}
-			
+
 			// return last char to text
-			text = wrappedText.substring(wrappedText.length-1) + text;
+			text = wrappedText.substring(wrappedText.length - 1) + text;
 			// remove last char from wrappedText
-			wrappedText = wrappedText.substring(0, wrappedText.length-1) + "\n";
-			
+			wrappedText = wrappedText.substring(0, wrappedText.length - 1) + "\n";
+
 			textElement.attr({"text": wrappedText});
 			bb = textElement.getBBox();
-			
+
 			//console.log(">> ", wrappedText, ", ", text);
 			resultText += wrappedText;
 			wrappedText = "\n";
-			
+
 			j++;
-			if (j>20) break;
+			if (j > 20) break;
 		}
 		// remove element from paper
 		textElement.remove();
-		
+
 		return resultText;
 	},
-	
-	drawUserTask: function(name, x, y, width, height) {
-	  this.g.setStart();
+
+	drawUserTask: function (name, x, y, width, height) {
+		this.g.setStart();
 		this._drawTask(name, x, y, width, height);
 		var img = this.g.image(USERTASK_IMAGE, x + ICON_PADDING, y + ICON_PADDING, ICON_SIZE, ICON_SIZE);
 		var set = this.g.setFinish();
 		this.addHandlers(set, x, y, width, height, "task");
 	},
-	
-	drawScriptTask: function(name, x, y, width, height) {
-	  this.g.setStart();
+
+	drawScriptTask: function (name, x, y, width, height) {
+		this.g.setStart();
 		this._drawTask(name, x, y, width, height);
 		var img = this.g.image(SCRIPTTASK_IMAGE, x + ICON_PADDING, y + ICON_PADDING, ICON_SIZE, ICON_SIZE);
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "task");
+		this.addHandlers(set, x, y, width, height, "task");
 	},
-	
-	drawServiceTask: function(name, x, y, width, height) {
-	  this.g.setStart();
+
+	drawServiceTask: function (name, x, y, width, height) {
+		this.g.setStart();
 		this._drawTask(name, x, y, width, height);
 		var img = this.g.image(SERVICETASK_IMAGE, x + ICON_PADDING, y + ICON_PADDING, ICON_SIZE, ICON_SIZE);
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "task");
+		this.addHandlers(set, x, y, width, height, "task");
 	},
-	
-	drawReceiveTask: function(name, x, y, width, height) {
-	  this.g.setStart();
+
+	drawReceiveTask: function (name, x, y, width, height) {
+		this.g.setStart();
 		this._drawTask(name, x, y, width, height);
 		var img = this.g.image(RECEIVETASK_IMAGE, x + 7, y + 7, ICON_SIZE, ICON_SIZE);
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "task");
+		this.addHandlers(set, x, y, width, height, "task");
 	},
-	
-	drawSendTask: function(name, x, y, width, height) {
-	  this.g.setStart();
+
+	drawSendTask: function (name, x, y, width, height) {
+		this.g.setStart();
 		this._drawTask(name, x, y, width, height);
 		var img = this.g.image(SENDTASK_IMAGE, x + 7, y + 7, ICON_SIZE, ICON_SIZE);
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "task");
+		this.addHandlers(set, x, y, width, height, "task");
 	},
-	
-	drawManualTask: function(name, x, y, width, height) {
-	  this.g.setStart();
+
+	drawManualTask: function (name, x, y, width, height) {
+		this.g.setStart();
 		this._drawTask(name, x, y, width, height);
 		var img = this.g.image(MANUALTASK_IMAGE, x + 7, y + 7, ICON_SIZE, ICON_SIZE);
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "task");
+		this.addHandlers(set, x, y, width, height, "task");
 	},
-	
-	drawBusinessRuleTask: function(name, x, y, width, height) {
-	  this.g.setStart();
+
+	drawBusinessRuleTask: function (name, x, y, width, height) {
+		this.g.setStart();
 		this._drawTask(name, x, y, width, height);
 		var img = this.g.image(BUSINESS_RULE_TASK_IMAGE, x + 7, y + 7, ICON_SIZE, ICON_SIZE);
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "task");
+		this.addHandlers(set, x, y, width, height, "task");
 	},
-	
-	drawExpandedSubProcess: function(name, x, y, width, height, isTriggeredByEvent){
-	  this.g.setStart();
+
+	drawExpandedSubProcess: function (name, x, y, width, height, isTriggeredByEvent) {
+		this.g.setStart();
 		// anti smoothing
-		if (this.strokeWidth%2 == 1)
+		if (this.strokeWidth % 2 == 1)
 			x = Math.round(x) + .5, y = Math.round(y) + .5;
-		
+
 		// shape
 		var rect = this.g.rect(x, y, width, height, EXPANDED_SUBPROCESS_CORNER_ROUND);
-		
+
 		// Use different stroke (dashed)
-		if(isTriggeredByEvent) {
+		if (isTriggeredByEvent) {
 			rect.attr(EVENT_SUBPROCESS_ATTRS);
 		} else {
 			rect.attr(EXPANDED_SUBPROCESS_ATTRS);
 		}
-		
+
 		this.setContextToElement(rect);
-		
+
 		var fontAttr = EXPANDED_SUBPROCESS_FONT;
-		
+
 		// Include some padding
 		var paddingX = 10;
 		var paddingY = 5;
-		var availableTextSpace = width - paddingX*2;
-		
+		var availableTextSpace = width - paddingX * 2;
+
 		var truncated = this.fitTextToWidth(name, availableTextSpace);
 		var realWidth = this.getStringWidth(truncated, fontAttr);
 		var realHeight = this.getStringHeight(truncated, fontAttr);
-		
-		var textElement = this.g.text(x + width/2 - realWidth*0/2 + 0*paddingX, y + realHeight/2 + paddingY, truncated).attr(fontAttr);
-		
+
+		var textElement = this.g.text(x + width / 2 - realWidth * 0 / 2 + 0 * paddingX, y + realHeight / 2 + paddingY, truncated).attr(fontAttr);
+
 		var set = this.g.setFinish();
 		// TODO: Expanded Sub Process may has specific handlers
 		//this.addHandlers(set, x, y, width, height, "task");
 	},
-	
-	drawCollapsedSubProcess: function(name, x, y, width, height, isTriggeredByEvent) {
-	  this.g.setStart();
-	  this._drawCollapsedTask(name, x, y, width, height, false);
-	  var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "task");
+
+	drawCollapsedSubProcess: function (name, x, y, width, height, isTriggeredByEvent) {
+		this.g.setStart();
+		this._drawCollapsedTask(name, x, y, width, height, false);
+		var set = this.g.setFinish();
+		this.addHandlers(set, x, y, width, height, "task");
 	},
-	
-	drawCollapsedCallActivity: function(name, x, y, width, height) {
-	  this.g.setStart();
+
+	drawCollapsedCallActivity: function (name, x, y, width, height) {
+		this.g.setStart();
 		this._drawCollapsedTask(name, x, y, width, height, true);
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "task");
+		this.addHandlers(set, x, y, width, height, "task");
 	},
 
-	_drawCollapsedTask: function(name, x, y, width, height, thickBorder) {
+	_drawCollapsedTask: function (name, x, y, width, height, thickBorder) {
 		// The collapsed marker is now visualized separately
 		this._drawTask(name, x, y, width, height, thickBorder);
 	},
-	
-	drawCollapsedMarker: function(x, y, width, height){
+
+	drawCollapsedMarker: function (x, y, width, height) {
 		// rectangle
 		var rectangleWidth = MARKER_WIDTH;
 		var rectangleHeight = MARKER_WIDTH;
-		
+
 		// anti smoothing
-		if (this.strokeWidth%2 == 1)
+		if (this.strokeWidth % 2 == 1)
 			y += .5;
-		
+
 		var rect = this.g.rect(x + (width - rectangleWidth) / 2, y + height - rectangleHeight - 3, rectangleWidth, rectangleHeight);
-		
+
 		// plus inside rectangle
-		var cx = rect.attr("x") + rect.attr("width")/2;
-		var cy = rect.attr("y") + rect.attr("height")/2;
-		
+		var cx = rect.attr("x") + rect.attr("width") / 2;
+		var cy = rect.attr("y") + rect.attr("height") / 2;
+
 		var line = this.g.path(
-			"M" + cx + " " + (cy+2) + "L" + cx + " " + (cy-2) + 
-			"M" + (cx-2) + " " + cy + "L" + (cx+2) + " " + cy
+			"M" + cx + " " + (cy + 2) + "L" + cx + " " + (cy - 2) +
+			"M" + (cx - 2) + " " + cy + "L" + (cx + 2) + " " + cy
 		).attr({"stroke-width": this.strokeWidth});
-		
+
 	},
-	
-	drawActivityMarkers: function(x, y, width, height, multiInstanceSequential, multiInstanceParallel, collapsed){
+
+	drawActivityMarkers: function (x, y, width, height, multiInstanceSequential, multiInstanceParallel, collapsed) {
 		if (collapsed) {
 			if (!multiInstanceSequential && !multiInstanceParallel) {
 				this.drawCollapsedMarker(x, y, width, height);
@@ -1683,126 +1726,126 @@ ProcessDiagramCanvas.prototype = {
 			}
 		}
 	},
-	
-	drawGateway: function(x, y, width, height) {
-		
-		var rhombus = this.g.path(	"M" + x + " " + (y + (height / 2)) + 
-									"L" + (x + (width / 2)) + " " + (y + height) + 
-									"L" + (x + width) + " " + (y + (height / 2)) +
-									"L" + (x + (width / 2)) + " " + y +
-									"z"
-								);
-		
+
+	drawGateway: function (x, y, width, height) {
+
+		var rhombus = this.g.path("M" + x + " " + (y + (height / 2)) +
+			"L" + (x + (width / 2)) + " " + (y + height) +
+			"L" + (x + width) + " " + (y + (height / 2)) +
+			"L" + (x + (width / 2)) + " " + y +
+			"z"
+		);
+
 		// white shaddow
 		this.drawShaddow(rhombus);
-		
+
 		rhombus.attr("stroke-width", this.strokeWidth);
 		rhombus.attr("stroke", Color.SlateGrey);
 		rhombus.attr({fill: Color.white});
-		
+
 		this.setContextToElement(rhombus);
-		
+
 		return rhombus;
 	},
-	
-	drawParallelGateway: function(x, y, width, height) {
-	  this.g.setStart();
-	  
+
+	drawParallelGateway: function (x, y, width, height) {
+		this.g.setStart();
+
 		// rhombus
 		this.drawGateway(x, y, width, height);
 
 		// plus inside rhombus
 		var originalStroke = this.getStroke();
 		this.setStroke(GATEWAY_TYPE_STROKE);
-		
+
 		var plus = this.g.path(
 			"M" + (x + 10) + " " + (y + height / 2) + "L" + (x + width - 10) + " " + (y + height / 2) +	// horizontal
 			"M" + (x + width / 2) + " " + (y + height - 10) + "L" + (x + width / 2) + " " + (y + 10)	// vertical
 		);
 		plus.attr({"stroke-width": this.getStroke(), "stroke": this.getPaint()});
-		
+
 		this.setStroke(originalStroke);
-		
+
 		var set = this.g.setFinish();
 		this.addHandlers(set, x, y, width, height, "gateway");
 	},
-	
-	drawExclusiveGateway: function(x, y, width, height) {
-	  this.g.setStart();
-	  
+
+	drawExclusiveGateway: function (x, y, width, height) {
+		this.g.setStart();
+
 		// rhombus
 		var rhombus = this.drawGateway(x, y, width, height);
 
 		var quarterWidth = width / 4;
 		var quarterHeight = height / 4;
-		
+
 		// X inside rhombus
 		var originalStroke = this.getStroke();
 		this.setStroke(GATEWAY_TYPE_STROKE);
-		
+
 		var iks = this.g.path(
-			"M" + (x + quarterWidth + 3) + " " + (y + quarterHeight + 3) + "L" + (x + 3 * quarterWidth - 3) + " " + (y + 3 * quarterHeight - 3) + 
+			"M" + (x + quarterWidth + 3) + " " + (y + quarterHeight + 3) + "L" + (x + 3 * quarterWidth - 3) + " " + (y + 3 * quarterHeight - 3) +
 			"M" + (x + quarterWidth + 3) + " " + (y + 3 * quarterHeight - 3) + "L" + (x + 3 * quarterWidth - 3) + " " + (y + quarterHeight + 3)
 		);
 		iks.attr({"stroke-width": this.getStroke(), "stroke": this.getPaint()});
-		
+
 		this.setStroke(originalStroke);
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "gateway");
+		this.addHandlers(set, x, y, width, height, "gateway");
 	},
-	
-	drawInclusiveGateway: function(x, y, width, height){
-	  this.g.setStart();
-	  
+
+	drawInclusiveGateway: function (x, y, width, height) {
+		this.g.setStart();
+
 		// rhombus
 		this.drawGateway(x, y, width, height);
-		
+
 		var diameter = width / 4;
-		
+
 		// circle inside rhombus
 		var originalStroke = this.getStroke();
 		this.setStroke(GATEWAY_TYPE_STROKE);
-		var circle = this.g.ellipse(width/2 + x, height/2 + y, diameter, diameter);
+		var circle = this.g.ellipse(width / 2 + x, height / 2 + y, diameter, diameter);
 		circle.attr({"stroke-width": this.getStroke(), "stroke": this.getPaint()});
-		
+
 		this.setStroke(originalStroke);
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "gateway");
+		this.addHandlers(set, x, y, width, height, "gateway");
 	},
-	
-	drawEventBasedGateway: function(x, y, width, height){
-	  this.g.setStart();
-	  
+
+	drawEventBasedGateway: function (x, y, width, height) {
+		this.g.setStart();
+
 		// rhombus
 		this.drawGateway(x, y, width, height);
-		
+
 		var diameter = width / 2;
 
-	    // rombus inside rhombus
-	    var originalStroke = this.getStroke();
+		// rombus inside rhombus
+		var originalStroke = this.getStroke();
 		this.setStroke(GATEWAY_TYPE_STROKE);
-	    
-	    
-	    // draw GeneralPath (polygon)
-	    var n=5;
-	    var angle = 2*Math.PI/n;
-	    var x1Points = [];
-	    var y1Points = [];
-		
-		for ( var index = 0; index < n; index++ ) {
-			var v = index*angle - Math.PI/2;
-			x1Points[index] = x + parseInt(Math.round(width/2)) + parseInt(Math.round((width/4)*Math.cos(v)));
-        	y1Points[index] = y + parseInt(Math.round(height/2)) + parseInt(Math.round((height/4)*Math.sin(v)));
+
+
+		// draw GeneralPath (polygon)
+		var n = 5;
+		var angle = 2 * Math.PI / n;
+		var x1Points = [];
+		var y1Points = [];
+
+		for (var index = 0; index < n; index++) {
+			var v = index * angle - Math.PI / 2;
+			x1Points[index] = x + parseInt(Math.round(width / 2)) + parseInt(Math.round((width / 4) * Math.cos(v)));
+			y1Points[index] = y + parseInt(Math.round(height / 2)) + parseInt(Math.round((height / 4) * Math.sin(v)));
 		}
 		//g.drawPolygon(x1Points, y1Points, n);
-		
+
 		var path = "";
-		for ( var index = 0; index < n; index++ ) {
-			if (index == 0) 
+		for (var index = 0; index < n; index++) {
+			if (index == 0)
 				path += "M";
-			else 
+			else
 				path += "L";
 			path += x1Points[index] + "," + y1Points[index];
 		}
@@ -1810,209 +1853,209 @@ ProcessDiagramCanvas.prototype = {
 		var polygone = this.g.path(path);
 		polygone.attr("stroke-width", this.strokeWidth);
 		polygone.attr("stroke", this.getPaint());
-		
+
 		this.setStroke(originalStroke);
-		
+
 		var set = this.g.setFinish();
-    this.addHandlers(set, x, y, width, height, "gateway");
+		this.addHandlers(set, x, y, width, height, "gateway");
 	},
-	
+
 	/*
 	*  drawMultiInstanceMarker
 	*  drawHighLight
 	*  highLightFlow
 	*/
-	
-	drawMultiInstanceMarker: function(sequential, x, y, width, height) {
+
+	drawMultiInstanceMarker: function (sequential, x, y, width, height) {
 		var rectangleWidth = MARKER_WIDTH;
 		var rectangleHeight = MARKER_WIDTH;
-		
+
 		// anti smoothing
-		if (this.strokeWidth%2 == 1)
+		if (this.strokeWidth % 2 == 1)
 			x += .5;//, y += .5;
-			
+
 		var lineX = x + (width - rectangleWidth) / 2;
 		var lineY = y + height - rectangleHeight - 3;
-		
+
 		var originalStroke = this.getStroke();
 		this.setStroke(MULTI_INSTANCE_STROKE);
-		
+
 		if (sequential) {
 			var line = this.g.path(
-				"M" + lineX + " " + lineY + 							"L" + (lineX + rectangleWidth) + " " + lineY + 
-				"M" + lineX + " " + (lineY + rectangleHeight / 2) + 	"L" + (lineX + rectangleWidth) + " " + (lineY + rectangleHeight / 2) + 
-				"M" + lineX + " " + (lineY + rectangleHeight) + 		"L" + (lineX + rectangleWidth) + " " + (lineY + rectangleHeight)
+				"M" + lineX + " " + lineY + "L" + (lineX + rectangleWidth) + " " + lineY +
+				"M" + lineX + " " + (lineY + rectangleHeight / 2) + "L" + (lineX + rectangleWidth) + " " + (lineY + rectangleHeight / 2) +
+				"M" + lineX + " " + (lineY + rectangleHeight) + "L" + (lineX + rectangleWidth) + " " + (lineY + rectangleHeight)
 			).attr({"stroke-width": this.strokeWidth});
 		} else {
 			var line = this.g.path(
-				"M" + lineX + " " + 							lineY + "L" + lineX + " " + 					(lineY + rectangleHeight) +
-				"M" + (lineX + rectangleWidth / 2) + " " + 	lineY + "L" + (lineX + rectangleWidth / 2) + " " + 	(lineY + rectangleHeight) + 
-				"M" + (lineX + rectangleWidth) + " " + 		lineY + "L" + (lineX + rectangleWidth) + " " + 		(lineY + rectangleHeight)
+				"M" + lineX + " " + lineY + "L" + lineX + " " + (lineY + rectangleHeight) +
+				"M" + (lineX + rectangleWidth / 2) + " " + lineY + "L" + (lineX + rectangleWidth / 2) + " " + (lineY + rectangleHeight) +
+				"M" + (lineX + rectangleWidth) + " " + lineY + "L" + (lineX + rectangleWidth) + " " + (lineY + rectangleHeight)
 			).attr({"stroke-width": this.strokeWidth});
 		}
-		
+
 		this.setStroke(originalStroke);
 	},
-	
-	drawHighLight: function(x, y, width, height){
+
+	drawHighLight: function (x, y, width, height) {
 		var originalPaint = this.getPaint();
 		var originalStroke = this.getStroke();
-		
+
 		this.setPaint(HIGHLIGHT_COLOR);
 		this.setStroke(THICK_TASK_BORDER_STROKE);
 
 		//var c = this.g.rect(x - width/2 - THICK_TASK_BORDER_STROKE, y - height/2 - THICK_TASK_BORDER_STROKE, width + THICK_TASK_BORDER_STROKE*2, height + THICK_TASK_BORDER_STROKE*2, 5);
-		var rect = this.g.rect(x - THICK_TASK_BORDER_STROKE, y - THICK_TASK_BORDER_STROKE, width + THICK_TASK_BORDER_STROKE*2, height + THICK_TASK_BORDER_STROKE*2, TASK_CORNER_ROUND);
+		var rect = this.g.rect(x - THICK_TASK_BORDER_STROKE, y - THICK_TASK_BORDER_STROKE, width + THICK_TASK_BORDER_STROKE * 2, height + THICK_TASK_BORDER_STROKE * 2, TASK_CORNER_ROUND);
 		rect.attr("stroke-width", this.strokeWidth);
 		rect.attr("stroke", this.getPaint());
-		
+
 		this.setPaint(originalPaint);
 		this.setStroke(originalStroke);
 	},
-	
-	highLightActivity: function(activityId){
+
+	highLightActivity: function (activityId) {
 		var shape = this.g.getById(activityId);
 		if (!shape) {
 			console.error("Activity " + activityId + " not found");
 			return;
 		}
-		
+
 		var contextObject = shape.data("contextObject");
 		if (contextObject)
-			console.log("--> highLightActivity: ["+contextObject.getProperty("type")+"], activityId: " + contextObject.getId());
+			console.log("--> highLightActivity: [" + contextObject.getProperty("type") + "], activityId: " + contextObject.getId());
 		else
 			console.log("--> highLightActivity: ", shape, shape.data("contextObject"));
-		
+
 		shape.attr("stroke-width", THICK_TASK_BORDER_STROKE);
 		shape.attr("stroke", HIGHLIGHT_COLOR);
 	},
-	
-	highLightFlow: function(flowId){
+
+	highLightFlow: function (flowId) {
 		var shapeFlow = this.g.getById(flowId);
 		if (!shapeFlow) {
 			console.error("Flow " + flowId + " not found");
 			return;
 		}
-		
+
 		var contextObject = shapeFlow.data("contextObject");
 		if (contextObject)
-			console.log("--> highLightFlow: ["+contextObject.id+"] " + contextObject.flow);
+			console.log("--> highLightFlow: [" + contextObject.id + "] " + contextObject.flow);
 		//console.log("--> highLightFlow: ", flow.flow, flow.data("set"));
-		
+
 		var st = shapeFlow.data("set");
-		
+
 		st.attr("stroke-width", SEQUENCEFLOW_HIGHLIGHT_STROKE);
 		st.attr("stroke", HIGHLIGHT_COLOR);
 		var withArrowHead = shapeFlow.data("withArrowHead");
 		if (withArrowHead)
 			st[1].attr("fill", HIGHLIGHT_COLOR);
-		
-		st.forEach(function(el){
+
+		st.forEach(function (el) {
 			//console.log("---->", el);
 			//el.attr("")
 		});
 	},
-	
 
-	_drawClock: function(cx, cy, width, height){
-		
-		var circle = this.g.ellipse(cx, cy, 1, 1).attr({stroke:"none", fill: Color.get(232, 239, 241)});
+
+	_drawClock: function (cx, cy, width, height) {
+
+		var circle = this.g.ellipse(cx, cy, 1, 1).attr({stroke: "none", fill: Color.get(232, 239, 241)});
 		//var c = this.g.ellipse(cx, cy, width, height).attr({stroke:"none", fill: Color.red});
 		//x = cx - width/2;
 		//y = cy - height/2;
-	
+
 		var clock = this.g.path(
-		/* outer circle */ "M15.5,2.374		C8.251,2.375,2.376,8.251,2.374,15.5		C2.376,22.748,8.251,28.623,15.5,28.627c7.249-0.004,13.124-5.879,13.125-13.127C28.624,8.251,22.749,2.375,15.5,2.374z" +
-		/* inner circle */ "M15.5,26.623	C8.909,26.615,4.385,22.09,4.375,15.5	C4.385,8.909,8.909,4.384,15.5,4.374c4.59,0.01,11.115,3.535,11.124,11.125C26.615,22.09,22.091,26.615,15.5,26.623z" +
-		/*  9 */ "M8.625,15.5c-0.001-0.552-0.448-0.999-1.001-1c-0.553,0-1,0.448-1,1c0,0.553,0.449,1,1,1C8.176,16.5,8.624,16.053,8.625,15.5z" +
-		/*  8 */ "M8.179,18.572c-0.478,0.277-0.642,0.889-0.365,1.367c0.275,0.479,0.889,0.641,1.365,0.365c0.479-0.275,0.643-0.887,0.367-1.367C9.27,18.461,8.658,18.297,8.179,18.572z" +
-		/* 10 */ "M9.18,10.696c-0.479-0.276-1.09-0.112-1.366,0.366s-0.111,1.09,0.365,1.366c0.479,0.276,1.09,0.113,1.367-0.366C9.821,11.584,9.657,10.973,9.18,10.696z" +
-		/*  2 */ "M22.822,12.428c0.478-0.275,0.643-0.888,0.366-1.366c-0.275-0.478-0.89-0.642-1.366-0.366c-0.479,0.278-0.642,0.89-0.366,1.367C21.732,12.54,22.344,12.705,22.822,12.428z" +
-		/*  7 */ "M12.062,21.455c-0.478-0.275-1.089-0.111-1.366,0.367c-0.275,0.479-0.111,1.09,0.366,1.365c0.478,0.277,1.091,0.111,1.365-0.365C12.704,22.344,12.54,21.732,12.062,21.455z" +
-		/* 11 */ "M12.062,9.545c0.479-0.276,0.642-0.888,0.366-1.366c-0.276-0.478-0.888-0.642-1.366-0.366s-0.642,0.888-0.366,1.366C10.973,9.658,11.584,9.822,12.062,9.545z" +
-		/*  4 */ "M22.823,18.572c-0.48-0.275-1.092-0.111-1.367,0.365c-0.275,0.479-0.112,1.092,0.367,1.367c0.477,0.275,1.089,0.113,1.365-0.365C23.464,19.461,23.3,18.848,22.823,18.572z" +
-		/*  2 */ "M19.938,7.813c-0.477-0.276-1.091-0.111-1.365,0.366c-0.275,0.48-0.111,1.091,0.366,1.367s1.089,0.112,1.366-0.366C20.581,8.702,20.418,8.089,19.938,7.813z" +
-		/*  3 */ "M23.378,14.5c-0.554,0.002-1.001,0.45-1.001,1c0.001,0.552,0.448,1,1.001,1c0.551,0,1-0.447,1-1C24.378,14.949,23.929,14.5,23.378,14.5z" +
-		/* arrows */ "M15.501,6.624c-0.552,0-1,0.448-1,1l-0.466,7.343l-3.004,1.96c-0.478,0.277-0.642,0.889-0.365,1.365c0.275,0.479,0.889,0.643,1.365,0.367l3.305-1.676C15.39,16.99,15.444,17,15.501,17c0.828,0,1.5-0.671,1.5-1.5l-0.5-7.876C16.501,7.072,16.053,6.624,15.501,6.624z" +
-		/*  9 */ "M15.501,22.377c-0.552,0-1,0.447-1,1s0.448,1,1,1s1-0.447,1-1S16.053,22.377,15.501,22.377z" +
-		/*  8 */ "M18.939,21.455c-0.479,0.277-0.643,0.889-0.366,1.367c0.275,0.477,0.888,0.643,1.366,0.365c0.478-0.275,0.642-0.889,0.366-1.365C20.028,21.344,19.417,21.18,18.939,21.455z" +
-		"");
+			/* outer circle */ "M15.5,2.374		C8.251,2.375,2.376,8.251,2.374,15.5		C2.376,22.748,8.251,28.623,15.5,28.627c7.249-0.004,13.124-5.879,13.125-13.127C28.624,8.251,22.749,2.375,15.5,2.374z" +
+			/* inner circle */ "M15.5,26.623	C8.909,26.615,4.385,22.09,4.375,15.5	C4.385,8.909,8.909,4.384,15.5,4.374c4.59,0.01,11.115,3.535,11.124,11.125C26.615,22.09,22.091,26.615,15.5,26.623z" +
+			/*  9 */ "M8.625,15.5c-0.001-0.552-0.448-0.999-1.001-1c-0.553,0-1,0.448-1,1c0,0.553,0.449,1,1,1C8.176,16.5,8.624,16.053,8.625,15.5z" +
+			/*  8 */ "M8.179,18.572c-0.478,0.277-0.642,0.889-0.365,1.367c0.275,0.479,0.889,0.641,1.365,0.365c0.479-0.275,0.643-0.887,0.367-1.367C9.27,18.461,8.658,18.297,8.179,18.572z" +
+			/* 10 */ "M9.18,10.696c-0.479-0.276-1.09-0.112-1.366,0.366s-0.111,1.09,0.365,1.366c0.479,0.276,1.09,0.113,1.367-0.366C9.821,11.584,9.657,10.973,9.18,10.696z" +
+			/*  2 */ "M22.822,12.428c0.478-0.275,0.643-0.888,0.366-1.366c-0.275-0.478-0.89-0.642-1.366-0.366c-0.479,0.278-0.642,0.89-0.366,1.367C21.732,12.54,22.344,12.705,22.822,12.428z" +
+			/*  7 */ "M12.062,21.455c-0.478-0.275-1.089-0.111-1.366,0.367c-0.275,0.479-0.111,1.09,0.366,1.365c0.478,0.277,1.091,0.111,1.365-0.365C12.704,22.344,12.54,21.732,12.062,21.455z" +
+			/* 11 */ "M12.062,9.545c0.479-0.276,0.642-0.888,0.366-1.366c-0.276-0.478-0.888-0.642-1.366-0.366s-0.642,0.888-0.366,1.366C10.973,9.658,11.584,9.822,12.062,9.545z" +
+			/*  4 */ "M22.823,18.572c-0.48-0.275-1.092-0.111-1.367,0.365c-0.275,0.479-0.112,1.092,0.367,1.367c0.477,0.275,1.089,0.113,1.365-0.365C23.464,19.461,23.3,18.848,22.823,18.572z" +
+			/*  2 */ "M19.938,7.813c-0.477-0.276-1.091-0.111-1.365,0.366c-0.275,0.48-0.111,1.091,0.366,1.367s1.089,0.112,1.366-0.366C20.581,8.702,20.418,8.089,19.938,7.813z" +
+			/*  3 */ "M23.378,14.5c-0.554,0.002-1.001,0.45-1.001,1c0.001,0.552,0.448,1,1.001,1c0.551,0,1-0.447,1-1C24.378,14.949,23.929,14.5,23.378,14.5z" +
+			/* arrows */ "M15.501,6.624c-0.552,0-1,0.448-1,1l-0.466,7.343l-3.004,1.96c-0.478,0.277-0.642,0.889-0.365,1.365c0.275,0.479,0.889,0.643,1.365,0.367l3.305-1.676C15.39,16.99,15.444,17,15.501,17c0.828,0,1.5-0.671,1.5-1.5l-0.5-7.876C16.501,7.072,16.053,6.624,15.501,6.624z" +
+			/*  9 */ "M15.501,22.377c-0.552,0-1,0.447-1,1s0.448,1,1,1s1-0.447,1-1S16.053,22.377,15.501,22.377z" +
+			/*  8 */ "M18.939,21.455c-0.479,0.277-0.643,0.889-0.366,1.367c0.275,0.477,0.888,0.643,1.366,0.365c0.478-0.275,0.642-0.889,0.366-1.365C20.028,21.344,19.417,21.18,18.939,21.455z" +
+			"");
 		clock.attr({fill: Color.black, stroke: "none"});
 		//clock.transform("t " + (cx-29.75/2) + " " + (cy-29.75/2));
 		//clock.transform("...s 0.85");
-		
+
 		//clock.transform("...s " + .85 + " " + .85);
-		clock.transform("t " + (-2.374) + " " + (-2.374)	);
-		clock.transform("...t -" + (15.5-2.374) + " -" + (15.5-2.374)	);
-		clock.transform("...s " + 1*(width/35) + " " + 1*(height/35));
+		clock.transform("t " + (-2.374) + " " + (-2.374));
+		clock.transform("...t -" + (15.5 - 2.374) + " -" + (15.5 - 2.374));
+		clock.transform("...s " + 1 * (width / 35) + " " + 1 * (height / 35));
 		clock.transform("...T " + cx + " " + cy);
 		//clock.transform("t " + (cx-width/2) + " " + (cy-height/2));
-		
+
 		//console.log(".getBBox(): ", clock.getBBox());
 		//console.log(".attr(): ", c.attrs);
-		circle.attr("rx", clock.getBBox().width/2);
-		circle.attr("ry", clock.getBBox().height/2);
-		
+		circle.attr("rx", clock.getBBox().width / 2);
+		circle.attr("ry", clock.getBBox().height / 2);
+
 		//return circle
 	},
-	
-	_drawPentagon: function(cx, cy, width, height, filled){
+
+	_drawPentagon: function (cx, cy, width, height, filled) {
 		// draw GeneralPath (polygon)
-	    var n=5;
-	    var angle = 2*Math.PI/n;
-	    var waypoints = [];
-		
-		for ( var index = 0; index < n; index++ ) {
-			var v = index*angle - Math.PI/2;
+		var n = 5;
+		var angle = 2 * Math.PI / n;
+		var waypoints = [];
+
+		for (var index = 0; index < n; index++) {
+			var v = index * angle - Math.PI / 2;
 			var point = {};
-			point.x = -width*1.2/2 + parseInt(Math.round(width*1.2/2)) + parseInt(Math.round((width*1.2/4)*Math.cos(v)));
-        	point.y = -height*1.2/2 + parseInt(Math.round(height*1.2/2)) + parseInt(Math.round((height*1.2/4)*Math.sin(v)));
+			point.x = -width * 1.2 / 2 + parseInt(Math.round(width * 1.2 / 2)) + parseInt(Math.round((width * 1.2 / 4) * Math.cos(v)));
+			point.y = -height * 1.2 / 2 + parseInt(Math.round(height * 1.2 / 2)) + parseInt(Math.round((height * 1.2 / 4) * Math.sin(v)));
 			waypoints[index] = point;
 		}
-		
+
 		var polygone = new Polygone(waypoints, this.getStroke());
 		polygone.element = this.g.path(polygone.path);
 		if (filled)
 			polygone.element.attr("fill", Color.black);
 		else
 			polygone.element.attr("fill", Color.white);
-		
-		polygone.element.transform("s " + 1*(width/35) + " " + 1*(height/35));
+
+		polygone.element.transform("s " + 1 * (width / 35) + " " + 1 * (height / 35));
 		polygone.element.transform("...T " + cx + " " + cy);
 	},
-	
+
 	//_drawMultilineText: function(text, x, y, boxWidth, boxHeight, textAnchor) {
-	_drawMultilineText: function(text, x, y, boxWidth, boxHeight, verticalAlign, horizontalAlign) {
-		if (!text || text == "") 
+	_drawMultilineText: function (text, x, y, boxWidth, boxHeight, verticalAlign, horizontalAlign) {
+		if (!text || text == "")
 			return;
-			
+
 		// Autostretch boxHeight if boxHeight is 0
 		if (boxHeight == 0)
-		  verticalAlign = MULTILINE_VERTICAL_ALIGN_TOP;	  
-	
+			verticalAlign = MULTILINE_VERTICAL_ALIGN_TOP;
+
 		//var TEXT_PADDING = 3;
 		var width = boxWidth;
 		if (boxHeight)
 			var height = boxHeight;
-	
+
 		var layouts = [];
-		
+
 		//var font = {font: "11px Arial", opacity: 1, "fill": LABEL_COLOR};
 		var font = this.getFont();
 		var measurer = new LineBreakMeasurer(this.g, x, y, text, font);
 		var lineHeight = measurer.rafaelTextObject.getBBox().height;
 		//console.log("text: ", text.replace(/\n/g, "?"));
-		
+
 		if (height) {
-			var availableLinesCount = parseInt(height/lineHeight);
+			var availableLinesCount = parseInt(height / lineHeight);
 			//console.log("availableLinesCount: " + availableLinesCount);
 		}
-		
+
 		var i = 1;
 		while (measurer.getPosition() < measurer.text.getEndIndex()) {
 			var layout = measurer.nextLayout(width);
 			//console.log("LAYOUT: " + layout + ", getPosition: " + measurer.getPosition());
-			
+
 			if (layout != null) {
 				// TODO: and check if measurer has next layout. If no then don't draw  dots
 				if (!availableLinesCount || i < availableLinesCount) {
@@ -2023,150 +2066,159 @@ ProcessDiagramCanvas.prototype = {
 				}
 			}
 			i++;
-		};
+		}
+		;
 		//console.log(layouts);
-		
+
 		measurer.rafaelTextObject.attr({"text": layouts.join("\n")});
-		
+
 		if (horizontalAlign)
 			measurer.rafaelTextObject.attr({"text-anchor": horizontalAlign}); // end, middle, start
-			
+
 		var bb = measurer.rafaelTextObject.getBBox();
 		// TODO: there is somethin wrong with wertical align. May be: measurer.rafaelTextObject.attr({"y": y + height/2 - bb.height/2})
-		measurer.rafaelTextObject.attr({"y": y + bb.height/2});
+		measurer.rafaelTextObject.attr({"y": y + bb.height / 2});
 		//var bb = measurer.rafaelTextObject.getBBox();
-		
-		if (measurer.rafaelTextObject.attr("text-anchor") == MULTILINE_HORIZONTAL_ALIGN_MIDDLE )
-			measurer.rafaelTextObject.attr("x",  x +  boxWidth/2);
-		else if (measurer.rafaelTextObject.attr("text-anchor") == MULTILINE_HORIZONTAL_ALIGN_RIGHT )
-			measurer.rafaelTextObject.attr("x",  x +  boxWidth);
-		
+
+		if (measurer.rafaelTextObject.attr("text-anchor") == MULTILINE_HORIZONTAL_ALIGN_MIDDLE)
+			measurer.rafaelTextObject.attr("x", x + boxWidth / 2);
+		else if (measurer.rafaelTextObject.attr("text-anchor") == MULTILINE_HORIZONTAL_ALIGN_RIGHT)
+			measurer.rafaelTextObject.attr("x", x + boxWidth);
+
 		var boxStyle = {stroke: Color.LightSteelBlue2, "stroke-width": 1.0, "stroke-dasharray": "- "};
 		//var box = this.g.rect(x+.5, y + .5, width, height).attr(boxStyle);
-		var textAreaCX = x + boxWidth/2;
-				var height = boxHeight;
-				if (!height) height = bb.height;
-				var textAreaCY = y + height/2;
-				var dotLeftTop = this.g.ellipse(x, y, 3, 3).attr({"stroke-width": 0, fill: Color.LightSteelBlue, stroke: "none"}).hide();
-				var dotCenter = this.g.ellipse(textAreaCX, textAreaCY, 3, 3).attr({fill: Color.LightSteelBlue2, stroke: "none"}).hide();
-
-				/*
-				// real bbox
-				var bb = measurer.rafaelTextObject.getBBox();
-				var rect = paper.rect(bb.x+.5, bb.y + .5, bb.width, bb.height).attr({"stroke-width": 1});
-				*/
-				var rect = this.g.rect(x, y, boxWidth, height).attr({"stroke-width": 1}).attr(boxStyle).hide();
-				var debugSet = this.g.set();
-				debugSet.push(dotLeftTop, dotCenter, rect);
-				//debugSet.show();
-	},
-	
-	drawTextAnnotation: function(text, x, y, width, height){
+		var textAreaCX = x + boxWidth / 2;
+		var height = boxHeight;
+		if (!height) height = bb.height;
+		var textAreaCY = y + height / 2;
+		var dotLeftTop = this.g.ellipse(x, y, 3, 3).attr({
+			"stroke-width": 0,
+			fill: Color.LightSteelBlue,
+			stroke: "none"
+		}).hide();
+		var dotCenter = this.g.ellipse(textAreaCX, textAreaCY, 3, 3).attr({
+			fill: Color.LightSteelBlue2,
+			stroke: "none"
+		}).hide();
+
+		/*
+		// real bbox
+		var bb = measurer.rafaelTextObject.getBBox();
+		var rect = paper.rect(bb.x+.5, bb.y + .5, bb.width, bb.height).attr({"stroke-width": 1});
+		*/
+		var rect = this.g.rect(x, y, boxWidth, height).attr({"stroke-width": 1}).attr(boxStyle).hide();
+		var debugSet = this.g.set();
+		debugSet.push(dotLeftTop, dotCenter, rect);
+		//debugSet.show();
+	},
+
+	drawTextAnnotation: function (text, x, y, width, height) {
 		var lineLength = 18;
 		var path = [];
-		  path.push(["M", x + lineLength, y]);
-		  path.push(["L", x, y]);
-		  path.push(["L", x, y + height]);
-		  path.push(["L", x + lineLength, y + height]);
-		  
-		  path.push(["L", x + lineLength, y + height -1]);
-		  path.push(["L", x + 1, y + height -1]);
-		  path.push(["L", x + 1, y + 1]);
-		  path.push(["L", x + lineLength, y + 1]);
-		  path.push(["z"]);
-	
+		path.push(["M", x + lineLength, y]);
+		path.push(["L", x, y]);
+		path.push(["L", x, y + height]);
+		path.push(["L", x + lineLength, y + height]);
+
+		path.push(["L", x + lineLength, y + height - 1]);
+		path.push(["L", x + 1, y + height - 1]);
+		path.push(["L", x + 1, y + 1]);
+		path.push(["L", x + lineLength, y + 1]);
+		path.push(["z"]);
+
 		var textAreaLines = this.g.path(path);
-		
-	  var boxWidth = width - (2 * ANNOTATION_TEXT_PADDING);
-      var boxHeight = height - (2 * ANNOTATION_TEXT_PADDING);
-      var boxX = x + width/2 - boxWidth/2;
-      var boxY = y + height/2 - boxHeight/2;
-      
-      // for debug
-          var rectStyle = {stroke: Color(112, 146, 190), "stroke-width": 1.0, "stroke-dasharray": "- "};
-          var r = this.g.rect(boxX, boxY, boxWidth, boxHeight).attr(rectStyle);
-	  //
-      
-	  this.drawAnnotationText(text, boxX, boxY, boxWidth, boxHeight);
-	},
-	
-	drawLabel111111111: function(text, x, y, width, height, labelAttrs){
-		var  debug = false;
-		
+
+		var boxWidth = width - (2 * ANNOTATION_TEXT_PADDING);
+		var boxHeight = height - (2 * ANNOTATION_TEXT_PADDING);
+		var boxX = x + width / 2 - boxWidth / 2;
+		var boxY = y + height / 2 - boxHeight / 2;
+
+		// for debug
+		var rectStyle = {stroke: Color(112, 146, 190), "stroke-width": 1.0, "stroke-dasharray": "- "};
+		var r = this.g.rect(boxX, boxY, boxWidth, boxHeight).attr(rectStyle);
+		//
+
+		this.drawAnnotationText(text, boxX, boxY, boxWidth, boxHeight);
+	},
+
+	drawLabel111111111: function (text, x, y, width, height, labelAttrs) {
+		var debug = false;
+
 		// text
 		if (text != null && text != undefined && text != "") {
 			var attr = LABEL_FONT;
-			
+
 			//console.log("x", x, "y", y, "width", width, "height", height );
-			
+
 			wrappedText = text;
 			if (labelAttrs && labelAttrs.wrapWidth) {
 				wrappedText = this.wrapTextToWidth(wrappedText, labelAttrs.wrapWidth);
 			}
 			var realWidth = this.getStringWidth(wrappedText, attr);
 			var realHeight = this.getStringHeight(wrappedText, attr);
-			
-			var textAreaCX = x + width/2;
-			var textAreaCY = y + 3 + height + this.getStringHeight(wrappedText, attr)/2;
-			
+
+			var textAreaCX = x + width / 2;
+			var textAreaCY = y + 3 + height + this.getStringHeight(wrappedText, attr) / 2;
+
 			var textX = textAreaCX;
 			var textY = textAreaCY;
 
 			var textAttrs = {};
 			if (labelAttrs && labelAttrs.align) {
 				switch (labelAttrs.align) {
-					case "left": 
-						textAttrs["text-anchor"] = "start"; 
-						textX = textX - realWidth/2;
-					break;
-					case "center": 
-						textAttrs["text-anchor"] = "middle"; 
-					break;
-					case "right": 
-						textAttrs["text-anchor"] = "end"; 
-						textX = textX + realWidth/2;
-					break;
+					case "left":
+						textAttrs["text-anchor"] = "start";
+						textX = textX - realWidth / 2;
+						break;
+					case "center":
+						textAttrs["text-anchor"] = "middle";
+						break;
+					case "right":
+						textAttrs["text-anchor"] = "end";
+						textX = textX + realWidth / 2;
+						break;
 				}
 			}
 			if (labelAttrs && labelAttrs.wrapWidth) {
 				if (true) {
 					// Draw frameborder
 					var textAreaStyle = {stroke: Color.LightSteelBlue2, "stroke-width": 1.0, "stroke-dasharray": "- "};
-					var textAreaX = textAreaCX - realWidth/2;
-					var textAreaY = textAreaCY+.5 - realHeight/2;
+					var textAreaX = textAreaCX - realWidth / 2;
+					var textAreaY = textAreaCY + .5 - realHeight / 2;
 					var textArea = this.g.rect(textAreaX, textAreaY, realWidth, realHeight).attr(textAreaStyle);
-					
-					var textAreaLines = this.g.path("M" + textAreaX + " " + textAreaY + "L" + (textAreaX+realWidth) + " " + (textAreaY+realHeight) + "M" +  + (textAreaX+realWidth) + " " + textAreaY + "L" + textAreaX + " " + (textAreaY+realHeight));
+
+					var textAreaLines = this.g.path("M" + textAreaX + " " + textAreaY + "L" + (textAreaX + realWidth) + " " + (textAreaY + realHeight) + "M" + +(textAreaX + realWidth) + " " + textAreaY + "L" + textAreaX + " " + (textAreaY + realHeight));
 					textAreaLines.attr(textAreaStyle);
-					
+
 					this.g.ellipse(textAreaCX, textAreaCY, 3, 3).attr({fill: Color.LightSteelBlue2, stroke: "none"});
 				}
 			}
-			
+
 			var label = this.g.text(textX, textY, wrappedText).attr(attr).attr(textAttrs);
 			//label.id = Raphael.createUUID();
 			//console.log("label ", label.id, ", ", wrappedText);
-			
+
 			if (this.fontSmoothing) {
-				label.attr({stroke: LABEL_COLOR, "stroke-width":.4});
+				label.attr({stroke: LABEL_COLOR, "stroke-width": .4});
 			}
-			
+
 			// debug
 			if (debug) {
 				var imageAreaStyle = {stroke: Color.grey61, "stroke-width": 1.0, "stroke-dasharray": "- "};
-				var imageArea = this.g.rect(x+.5, y+.5, width, height).attr(imageAreaStyle);
-				var imageAreaLines = this.g.path("M" + x + " " + y + "L" + (x+width) + " " + (y+height) + "M" +  + (x+width) + " " + y + "L" + x + " " + (y+height));
+				var imageArea = this.g.rect(x + .5, y + .5, width, height).attr(imageAreaStyle);
+				var imageAreaLines = this.g.path("M" + x + " " + y + "L" + (x + width) + " " + (y + height) + "M" + +(x + width) + " " + y + "L" + x + " " + (y + height));
 				imageAreaLines.attr(imageAreaStyle);
 				var dotStyle = {fill: Color.Coral, stroke: "none"};
 				this.g.ellipse(x, y, 3, 3).attr(dotStyle);
-				this.g.ellipse(x+width, y, 2, 2).attr(dotStyle);
-				this.g.ellipse(x+width, y+height, 2, 2).attr(dotStyle);
-				this.g.ellipse(x, y+height, 2, 2).attr(dotStyle);
+				this.g.ellipse(x + width, y, 2, 2).attr(dotStyle);
+				this.g.ellipse(x + width, y + height, 2, 2).attr(dotStyle);
+				this.g.ellipse(x, y + height, 2, 2).attr(dotStyle);
 			}
-			
+
 			return label;
 		}
 	},
-	
-	vvoid: function(){}
+
+	vvoid: function () {
+	}
 };
diff --git a/len-activiti/src/main/resources/static/diagram-viewer/js/ProcessDiagramGenerator.js b/len-activiti/src/main/resources/static/diagram-viewer/js/ProcessDiagramGenerator.js
index 9fb3fef..65e915e 100644
--- a/len-activiti/src/main/resources/static/diagram-viewer/js/ProcessDiagramGenerator.js
+++ b/len-activiti/src/main/resources/static/diagram-viewer/js/ProcessDiagramGenerator.js
@@ -1,514 +1,513 @@
- /**
+/**
  * Class to generate an image based the diagram interchange information in a
  * BPMN 2.0 process.
  *
  * @author (Javascript) Dmitry Farafonov
  */
- 
-var ProcessDiagramGenerator = {	
+
+var ProcessDiagramGenerator = {
 	options: {},
-	
+
 	processDiagramCanvas: [],
-	
-	activityDrawInstructions:{},
-	
+
+	activityDrawInstructions: {},
+
 	processDiagrams: {},
-	
+
 	diagramBreadCrumbs: null,
-	
-	init: function(){
+
+	init: function () {
 		// start event
-		this.activityDrawInstructions["startEvent"] = function(){
+		this.activityDrawInstructions["startEvent"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawNoneStartEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight());
 		};
-		
+
 		// start timer event
-		this.activityDrawInstructions["startTimerEvent"] = function(){
+		this.activityDrawInstructions["startTimerEvent"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			var isInterrupting = activityImpl.getProperty("isInterrupting");
 			processDiagramCanvas.drawTimerStartEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), isInterrupting, activityImpl.getProperty("name"));
 		};
-		
+
 		// start event
-		this.activityDrawInstructions["messageStartEvent"] = function(){
+		this.activityDrawInstructions["messageStartEvent"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			var isInterrupting = activityImpl.getProperty("isInterrupting");
 			processDiagramCanvas.drawMessageStartEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), isInterrupting, activityImpl.getProperty("name"));
 		};
-		
+
 		// start signal event
-		this.activityDrawInstructions["startSignalEvent"] = function(){
+		this.activityDrawInstructions["startSignalEvent"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			var isInterrupting = activityImpl.getProperty("isInterrupting");
 			processDiagramCanvas.drawSignalStartEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), isInterrupting, activityImpl.getProperty("name"));
 		};
-		
+
 		// start multiple event
-		this.activityDrawInstructions["startMultipleEvent"] = function(){
+		this.activityDrawInstructions["startMultipleEvent"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			var isInterrupting = activityImpl.getProperty("isInterrupting");
 			processDiagramCanvas.drawMultipleStartEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), isInterrupting, activityImpl.getProperty("name"));
 		};
-		
+
 		// signal catch
-		this.activityDrawInstructions["intermediateSignalCatch"] = function(){
+		this.activityDrawInstructions["intermediateSignalCatch"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			var isInterrupting = activityImpl.getProperty("isInterrupting");
 			processDiagramCanvas.drawCatchingSignalEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), isInterrupting, null);
-			
+
 			var label = ProcessDiagramGenerator.getActivitiLabel(activityImpl);
 			if (label)
-			  processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
+				processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
 		};
-		
+
 		// message catch
-		this.activityDrawInstructions["intermediateMessageCatch"] = function(){
+		this.activityDrawInstructions["intermediateMessageCatch"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			var isInterrupting = activityImpl.getProperty("isInterrupting");
 			processDiagramCanvas.drawCatchingMessageEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), isInterrupting, null);
-			
+
 			var label = ProcessDiagramGenerator.getActivitiLabel(activityImpl);
-      if (label)
-        processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
+			if (label)
+				processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
 		};
-		
+
 		// multiple catch
-		this.activityDrawInstructions["intermediateMultipleCatch"] = function(){
+		this.activityDrawInstructions["intermediateMultipleCatch"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			var isInterrupting = activityImpl.getProperty("isInterrupting");
 			processDiagramCanvas.drawCatchingMultipleEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), isInterrupting, null);
-			
+
 			var label = ProcessDiagramGenerator.getActivitiLabel(activityImpl);
-      if (label)
-        processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
+			if (label)
+				processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
 		};
-		
-		
-		
+
+
 		// signal throw
-		this.activityDrawInstructions["intermediateSignalThrow"] = function(){
+		this.activityDrawInstructions["intermediateSignalThrow"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawThrowingSignalEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), activityImpl.getProperty("name"));
-			
+
 			var label = ProcessDiagramGenerator.getActivitiLabel(activityImpl);
-      if (label)
-        processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
+			if (label)
+				processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
 		};
-		
+
 		// message throw
-		this.activityDrawInstructions["intermediateMessageThrow"] = function(){
+		this.activityDrawInstructions["intermediateMessageThrow"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawThrowingMessageEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), activityImpl.getProperty("name"));
-			
+
 			var label = ProcessDiagramGenerator.getActivitiLabel(activityImpl);
-      if (label)
-        processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
+			if (label)
+				processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
 		};
-		
+
 		// multiple throw
-		this.activityDrawInstructions["intermediateMultipleThrow"] = function(){
+		this.activityDrawInstructions["intermediateMultipleThrow"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawThrowingMultipleEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), activityImpl.getProperty("name"));
-			
+
 			var label = ProcessDiagramGenerator.getActivitiLabel(activityImpl);
-      if (label)
-        processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
+			if (label)
+				processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
 		};
-		
+
 		// none throw
-		this.activityDrawInstructions["intermediateThrowEvent"] = function() {
+		this.activityDrawInstructions["intermediateThrowEvent"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawThrowingNoneEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), activityImpl.getProperty("name"));
-			
+
 			var label = ProcessDiagramGenerator.getActivitiLabel(activityImpl);
-      if (label)
-        processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
+			if (label)
+				processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
 		};
-		
+
 		// end event
-		this.activityDrawInstructions["endEvent"] = function(){
+		this.activityDrawInstructions["endEvent"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawNoneEndEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight());
 		};
-		
+
 		// error end event
-		this.activityDrawInstructions["errorEndEvent"] = function(){
+		this.activityDrawInstructions["errorEndEvent"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawErrorEndEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), null);
-			
+
 			var label = ProcessDiagramGenerator.getActivitiLabel(activityImpl);
-      if (label)
-        processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
+			if (label)
+				processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
 		};
-		
+
 		// message end event
-		this.activityDrawInstructions["messageEndEvent"] = function(){
+		this.activityDrawInstructions["messageEndEvent"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawMessageEndEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), null);
-			
+
 			var label = ProcessDiagramGenerator.getActivitiLabel(activityImpl);
-      if (label)
-        processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
+			if (label)
+				processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
 		};
-		
+
 		// signal end event
-		this.activityDrawInstructions["signalEndEvent"] = function(){
+		this.activityDrawInstructions["signalEndEvent"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawSignalEndEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), null);
-			
+
 			var label = ProcessDiagramGenerator.getActivitiLabel(activityImpl);
-      if (label)
-        processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
+			if (label)
+				processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
 		};
-		
+
 		// multiple end event
-		this.activityDrawInstructions["multipleEndEvent"] = function(){
+		this.activityDrawInstructions["multipleEndEvent"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawMultipleEndEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), null);
-			
+
 			var label = ProcessDiagramGenerator.getActivitiLabel(activityImpl);
-      if (label)
-        processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
+			if (label)
+				processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
 		};
-		
+
 		// terminate end event
-		this.activityDrawInstructions["terminateEndEvent"] = function(){
+		this.activityDrawInstructions["terminateEndEvent"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawTerminateEndEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight());
-			
+
 			var label = ProcessDiagramGenerator.getActivitiLabel(activityImpl);
-      if (label)
-        processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
+			if (label)
+				processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
 		};
-		
+
 		// error start event
-		this.activityDrawInstructions["errorStartEvent"] = function(){
+		this.activityDrawInstructions["errorStartEvent"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawErrorStartEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), activityImpl.getProperty("name"));
-			
+
 			var label = ProcessDiagramGenerator.getActivitiLabel(activityImpl);
-      if (label)
-        processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
+			if (label)
+				processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
 		};
-		
+
 		// task
-		this.activityDrawInstructions["task"] = function(){
+		this.activityDrawInstructions["task"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
-			// TODO: 
+
+			// TODO:
 			//console.error("task is not implemented yet");
 			/*
 			var activityImpl = this;
 			processDiagramCanvas.drawTask(activityImpl.getProperty("name"), activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), thickBorder);
 			*/
 		};
-		
-		
+
+
 		// user task
-		this.activityDrawInstructions["userTask"] = function(){
+		this.activityDrawInstructions["userTask"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawUserTask(activityImpl.getProperty("name"), activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight());
 		};
-		
+
 		// script task
-		this.activityDrawInstructions["scriptTask"] = function(){
+		this.activityDrawInstructions["scriptTask"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawScriptTask(activityImpl.getProperty("name"), activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight());
 		};
-		
+
 		// service task
-		this.activityDrawInstructions["serviceTask"] = function(){
+		this.activityDrawInstructions["serviceTask"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawServiceTask(activityImpl.getProperty("name"), activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight());
 		};
 
 		// receive task
-		this.activityDrawInstructions["receiveTask"] = function(){
+		this.activityDrawInstructions["receiveTask"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawReceiveTask(activityImpl.getProperty("name"), activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight());
 		};
-		
+
 		// send task
-		this.activityDrawInstructions["sendTask"] = function(){
+		this.activityDrawInstructions["sendTask"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawSendTask(activityImpl.getProperty("name"), activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight());
 		};
 
 		// manual task
-		this.activityDrawInstructions["manualTask"] = function(){
+		this.activityDrawInstructions["manualTask"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-		
+
 			processDiagramCanvas.drawManualTask(activityImpl.getProperty("name"), activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight());
 		};
 
 		// businessRuleTask task
-		this.activityDrawInstructions["businessRuleTask"] = function(){
+		this.activityDrawInstructions["businessRuleTask"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawBusinessRuleTask(activityImpl.getProperty("name"), activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight());
 		};
 
 		// exclusive gateway
-		this.activityDrawInstructions["exclusiveGateway"] = function(){
+		this.activityDrawInstructions["exclusiveGateway"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawExclusiveGateway(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight());
 		};
-		
+
 		// inclusive gateway
-		this.activityDrawInstructions["inclusiveGateway"] = function(){
+		this.activityDrawInstructions["inclusiveGateway"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawInclusiveGateway(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight());
 		};
-		
+
 		// parallel gateway
-		this.activityDrawInstructions["parallelGateway"] = function(){
+		this.activityDrawInstructions["parallelGateway"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawParallelGateway(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight());
 		};
-		
+
 		// eventBasedGateway
-		this.activityDrawInstructions["eventBasedGateway"] = function(){
+		this.activityDrawInstructions["eventBasedGateway"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			processDiagramCanvas.drawEventBasedGateway(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight());
 		};
-		
+
 		// Boundary timer
-		this.activityDrawInstructions["boundaryTimer"] = function(){
+		this.activityDrawInstructions["boundaryTimer"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			var isInterrupting = activityImpl.getProperty("isInterrupting");
 			processDiagramCanvas.drawCatchingTimerEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), isInterrupting, null);
-			
+
 			var label = ProcessDiagramGenerator.getActivitiLabel(activityImpl);
-      if (label)
-        processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
+			if (label)
+				processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
 		};
-		
+
 		// Boundary catch error
-		this.activityDrawInstructions["boundaryError"] = function(){
+		this.activityDrawInstructions["boundaryError"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			var isInterrupting = activityImpl.getProperty("isInterrupting");
 			processDiagramCanvas.drawCatchingErrorEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), isInterrupting, null);
-			
+
 			var label = ProcessDiagramGenerator.getActivitiLabel(activityImpl);
-      if (label)
-        processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
+			if (label)
+				processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
 		};
-		
+
 		// Boundary signal event
-		this.activityDrawInstructions["boundarySignal"] = function(){
+		this.activityDrawInstructions["boundarySignal"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			var isInterrupting = activityImpl.getProperty("isInterrupting");
 			processDiagramCanvas.drawCatchingSignalEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), isInterrupting, null);
-			
+
 			var label = ProcessDiagramGenerator.getActivitiLabel(activityImpl);
-      if (label)
-        processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
+			if (label)
+				processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
 		};
 
-    // Boundary message event
-    this.activityDrawInstructions["boundaryMessage"] = function(){
-        var activityImpl = this.activity;
-        var processDiagramCanvas = this.processDiagramCanvas;
-        processDiagramCanvas.setConextObject(activityImpl);
+		// Boundary message event
+		this.activityDrawInstructions["boundaryMessage"] = function () {
+			var activityImpl = this.activity;
+			var processDiagramCanvas = this.processDiagramCanvas;
+			processDiagramCanvas.setConextObject(activityImpl);
+
+			var isInterrupting = activityImpl.getProperty("isInterrupting");
+			processDiagramCanvas.drawCatchingMessageEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), isInterrupting, null);
 
-        var isInterrupting = activityImpl.getProperty("isInterrupting");
-        processDiagramCanvas.drawCatchingMessageEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), isInterrupting, null);
+			var label = ProcessDiagramGenerator.getActivitiLabel(activityImpl);
+			if (label)
+				processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
+		};
 
-        var label = ProcessDiagramGenerator.getActivitiLabel(activityImpl);
-        if (label)
-            processDiagramCanvas.drawLabel(label.text, label.x, label.y, label.width, label.height);
-    };
-		
 		// timer catch event
-		this.activityDrawInstructions["intermediateTimer"] = function(){
+		this.activityDrawInstructions["intermediateTimer"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			var isInterrupting = null;
 			processDiagramCanvas.drawCatchingTimerEvent(activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight(), isInterrupting, activityImpl.getProperty("name"));
 		};
-		
+
 		// subprocess
-		this.activityDrawInstructions["subProcess"] = function(){
+		this.activityDrawInstructions["subProcess"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
-			// TODO: 
-			
+			// TODO:
+
 			processDiagramCanvas.setConextObject(activityImpl);
-			
+
 			var isExpanded = activityImpl.getProperty("isExpanded");
 			var isTriggeredByEvent = activityImpl.getProperty("triggeredByEvent");
-			if(isTriggeredByEvent == undefined) {
-			  isTriggeredByEvent = true;
+			if (isTriggeredByEvent == undefined) {
+				isTriggeredByEvent = true;
 			}
 			// TODO: check why isTriggeredByEvent = true when undefined
 			isTriggeredByEvent = false;
-			
+
 			if (isExpanded != undefined && isExpanded == false) {
-			  processDiagramCanvas.drawCollapsedSubProcess(activityImpl.getProperty("name"), activityImpl.getX(), activityImpl.getY(),
-					  activityImpl.getWidth(), activityImpl.getHeight(), isTriggeredByEvent);
+				processDiagramCanvas.drawCollapsedSubProcess(activityImpl.getProperty("name"), activityImpl.getX(), activityImpl.getY(),
+					activityImpl.getWidth(), activityImpl.getHeight(), isTriggeredByEvent);
 			} else {
-			  processDiagramCanvas.drawExpandedSubProcess(activityImpl.getProperty("name"), activityImpl.getX(), activityImpl.getY(),
-					  activityImpl.getWidth(), activityImpl.getHeight(), isTriggeredByEvent);
+				processDiagramCanvas.drawExpandedSubProcess(activityImpl.getProperty("name"), activityImpl.getX(), activityImpl.getY(),
+					activityImpl.getWidth(), activityImpl.getHeight(), isTriggeredByEvent);
 			}
-			
+
 			//console.error("subProcess is not implemented yet");
 		};
-		
+
 		// call activity
-		this.activityDrawInstructions["callActivity"] = function(){
+		this.activityDrawInstructions["callActivity"] = function () {
 			var activityImpl = this.activity;
 			var processDiagramCanvas = this.processDiagramCanvas;
 			processDiagramCanvas.setConextObject(activityImpl);
 			processDiagramCanvas.drawCollapsedCallActivity(activityImpl.getProperty("name"), activityImpl.getX(), activityImpl.getY(), activityImpl.getWidth(), activityImpl.getHeight());
 		};
-		
-		$(document).ready(function(){
-		  // Protect right click on SVG elements (and on canvas too)
-		  document.body.oncontextmenu = function(event) {
-		    if (window.event.srcElement.tagName == "shape" || window.event.srcElement.tagName == "DIV" && window.event.srcElement.parentElement.className == "diagram") {
-
-		      // IE DIAGRAM CANVAS OR SHAPE DETECTED!
-		      return false;
-		    }
-		    return (!Object.isSVGElement(window.event.srcElement));
-		  };
+
+		$(document).ready(function () {
+			// Protect right click on SVG elements (and on canvas too)
+			document.body.oncontextmenu = function (event) {
+				if (window.event.srcElement.tagName == "shape" || window.event.srcElement.tagName == "DIV" && window.event.srcElement.parentElement.className == "diagram") {
+
+					// IE DIAGRAM CANVAS OR SHAPE DETECTED!
+					return false;
+				}
+				return (!Object.isSVGElement(window.event.srcElement));
+			};
 		});
 	},
-	
-	 getActivitiLabel:function(activityImpl){
-	   /*
-	     TODO: Label object should be in activityImpl and looks like:
-	     {
-	       x: 250,
-	       y: 250,
-	       width: 80,
-	       height: 30
-	     }
-	     And then:
-	     if (!activityImpl.label)
-	       return null;
-	     var label = activityImpl.label;
-	     label.text = activityImpl.name;
-	     return label;
-	   */
-
-	   // But now default label for all events is:
-	   return {
-	     text: activityImpl.getProperty("name"),
-	     x: activityImpl.getX() + .5 + activityImpl.getWidth()/2,
-	     y: activityImpl.getY() + .5 + activityImpl.getHeight() + ICON_PADDING,
-	     width: 100,
-	     height: 0
-	   };
+
+	getActivitiLabel: function (activityImpl) {
+		/*
+		  TODO: Label object should be in activityImpl and looks like:
+		  {
+			x: 250,
+			y: 250,
+			width: 80,
+			height: 30
+		  }
+		  And then:
+		  if (!activityImpl.label)
+			return null;
+		  var label = activityImpl.label;
+		  label.text = activityImpl.name;
+		  return label;
+		*/
+
+		// But now default label for all events is:
+		return {
+			text: activityImpl.getProperty("name"),
+			x: activityImpl.getX() + .5 + activityImpl.getWidth() / 2,
+			y: activityImpl.getY() + .5 + activityImpl.getHeight() + ICON_PADDING,
+			width: 100,
+			height: 0
+		};
 	},
-		
-	generateDiagram: function(processDefinitionDiagramLayout){
+
+	generateDiagram: function (processDefinitionDiagramLayout) {
 		// Init canvas
 		var processDefinitionId = processDefinitionDiagramLayout.processDefinition.id;
 		//console.log("Init canvas ", processDefinitionId);
-		
+
 		if (this.getProcessDiagram(processDefinitionId) != undefined) {
 			// TODO: may be reset canvas if exists.. Or just show
 			//console.log("ProcessDiagram '" + processDefinitionId + "' is already generated. Just show it.");
@@ -516,148 +515,148 @@ var ProcessDiagramGenerator = {
 		}
 		var processDiagram = this.initProcessDiagramCanvas(processDefinitionDiagramLayout);
 		var processDiagramCanvas = processDiagram.diagramCanvas;
-		
+
 		// Draw pool shape, if process is participant in collaboration
-		
-		if(processDefinitionDiagramLayout.participantProcess != undefined) {
-		  //console.log("Draw pool shape");
-		  var pProc = processDefinitionDiagramLayout.participantProcess;
-		  processDiagramCanvas.drawPoolOrLane(pProc.x, pProc.y, pProc.width, pProc.height, pProc.name);
+
+		if (processDefinitionDiagramLayout.participantProcess != undefined) {
+			//console.log("Draw pool shape");
+			var pProc = processDefinitionDiagramLayout.participantProcess;
+			processDiagramCanvas.drawPoolOrLane(pProc.x, pProc.y, pProc.width, pProc.height, pProc.name);
 		}
-		
+
 		var laneSets = processDefinitionDiagramLayout.laneSets;
 		var activities = processDefinitionDiagramLayout.activities;
 		var sequenceFlows = processDefinitionDiagramLayout.sequenceFlows;
-		
-		
+
+
 		pb1.set('value', 0);
 		var cnt = 0;
-		if (laneSets) 
-			for(var i in laneSets) {
+		if (laneSets)
+			for (var i in laneSets) {
 				cnt += laneSets[i].lanes.length;
 			}
-		if (activities) 
+		if (activities)
 			cnt += activities.length;
-		if (sequenceFlows) 
+		if (sequenceFlows)
 			cnt += sequenceFlows.length;
-		var step = (cnt>0)? 100/cnt : 0;
+		var step = (cnt > 0) ? 100 / cnt : 0;
 		var progress = 0;
 		//console.log("progress bar step: ", step);
-		
+
 		var task1 = new $.AsyncQueue();
-		
-			// Draw lanes
-			
-			task1.add(function (task1) {
-				if (!laneSets) laneSets = [];
-				//console.log("> draw lane sets, count:", laneSets.length)
-			});
-			
-			for(var i in laneSets) {
-				var laneSet = laneSets[i];
-				//laneSet.id, laneSet.name
-				
-				task1.add(laneSet.lanes,function (task1, lane) {
-					progress += step;
-					pb1.set('value', parseInt(progress));
-					
-					//console.log("--> laneId: " + lane.name + ", name: " + lane.name);
-					
-					processDiagramCanvas.drawPoolOrLane(lane.x, lane.y, lane.width, lane.height, lane.name);
-				});
-			}
-			
-			// Draw activities
-			
-			task1.add(function (task1) {
-				if (!activities) activities = [];
-				//console.log("> draw activities, count:", activities.length)
-			});
-			
-			var activitiesLength = activities.length;
-			task1.add(activities,function (task1, activityJson) {
-				var activity = new ActivityImpl(activityJson);
-				activitiesLength --;
-				progress += step;
-				pb1.set('value', parseInt(progress));
-				//console.log(activitiesLength, "--> activityId: " + activity.getId() + ", name: " + activity.getProperty("name"));
-				ProcessDiagramGenerator.drawActivity(processDiagramCanvas, activity);
-			});
-			
-			// Draw sequence-flows
-			
-			task1.add(function (task1) {
-				if (!sequenceFlows) sequenceFlows = [];
-				//console.log("> draw sequence flows, count:", sequenceFlows.length)
-			});
-			
-			var flowsLength = sequenceFlows.length;
-			task1.add(sequenceFlows,function (task1, flow) {
-				var waypoints = [];
-				for(var j in flow.xPointArray) {
-					waypoints[j] = {x: flow.xPointArray[j], y: flow.yPointArray[j]};
-				}
-				var isDefault = flow.isDefault;
-				var isConditional = flow.isConditional;
-				var isHighLighted = flow.isHighLighted;
-				
-				// TODO: add source and destination for sequence flows in REST
-				// parse for test
-					var f = flow.flow;
-					var matches = f.match(/\((.*)\)--.*-->\((.*)\)/);
-					var sourceActivityId, destinationActivityId;
-					if (matches != null) {
-						sourceActivityId = matches[1];
-						destinationActivityId = matches[2];
-					}
-					flow.sourceActivityId = sourceActivityId;
-					flow.destinationActivityId = destinationActivityId;
-				//
-				flowsLength--;
+
+		// Draw lanes
+
+		task1.add(function (task1) {
+			if (!laneSets) laneSets = [];
+			//console.log("> draw lane sets, count:", laneSets.length)
+		});
+
+		for (var i in laneSets) {
+			var laneSet = laneSets[i];
+			//laneSet.id, laneSet.name
+
+			task1.add(laneSet.lanes, function (task1, lane) {
 				progress += step;
 				pb1.set('value', parseInt(progress));
-				
-				//console.log(flowsLength, "--> flow: " + flow.flow);
-				
-				processDiagramCanvas.setConextObject(flow);
-				processDiagramCanvas.drawSequenceflow(waypoints, isConditional, isDefault, isHighLighted);
-			});
-			
-			task1.onComplete(function(){
-				if (progress<100)
-					pb1.set('value', 100);
-				//console.log("COMPLETE!!!");
-					
-				//console.timeEnd('generateDiagram');
+
+				//console.log("--> laneId: " + lane.name + ", name: " + lane.name);
+
+				processDiagramCanvas.drawPoolOrLane(lane.x, lane.y, lane.width, lane.height, lane.name);
 			});
-			
-			task1.run();
+		}
+
+		// Draw activities
+
+		task1.add(function (task1) {
+			if (!activities) activities = [];
+			//console.log("> draw activities, count:", activities.length)
+		});
+
+		var activitiesLength = activities.length;
+		task1.add(activities, function (task1, activityJson) {
+			var activity = new ActivityImpl(activityJson);
+			activitiesLength--;
+			progress += step;
+			pb1.set('value', parseInt(progress));
+			//console.log(activitiesLength, "--> activityId: " + activity.getId() + ", name: " + activity.getProperty("name"));
+			ProcessDiagramGenerator.drawActivity(processDiagramCanvas, activity);
+		});
+
+		// Draw sequence-flows
+
+		task1.add(function (task1) {
+			if (!sequenceFlows) sequenceFlows = [];
+			//console.log("> draw sequence flows, count:", sequenceFlows.length)
+		});
+
+		var flowsLength = sequenceFlows.length;
+		task1.add(sequenceFlows, function (task1, flow) {
+			var waypoints = [];
+			for (var j in flow.xPointArray) {
+				waypoints[j] = {x: flow.xPointArray[j], y: flow.yPointArray[j]};
+			}
+			var isDefault = flow.isDefault;
+			var isConditional = flow.isConditional;
+			var isHighLighted = flow.isHighLighted;
+
+			// TODO: add source and destination for sequence flows in REST
+			// parse for test
+			var f = flow.flow;
+			var matches = f.match(/\((.*)\)--.*-->\((.*)\)/);
+			var sourceActivityId, destinationActivityId;
+			if (matches != null) {
+				sourceActivityId = matches[1];
+				destinationActivityId = matches[2];
+			}
+			flow.sourceActivityId = sourceActivityId;
+			flow.destinationActivityId = destinationActivityId;
+			//
+			flowsLength--;
+			progress += step;
+			pb1.set('value', parseInt(progress));
+
+			//console.log(flowsLength, "--> flow: " + flow.flow);
+
+			processDiagramCanvas.setConextObject(flow);
+			processDiagramCanvas.drawSequenceflow(waypoints, isConditional, isDefault, isHighLighted);
+		});
+
+		task1.onComplete(function () {
+			if (progress < 100)
+				pb1.set('value', 100);
+			//console.log("COMPLETE!!!");
+
+			//console.timeEnd('generateDiagram');
+		});
+
+		task1.run();
 	},
-	
+
 	getProcessDiagram: function (processDefinitionId) {
 		return this.processDiagrams[processDefinitionId];
 	},
-	
+
 	initProcessDiagramCanvas: function (processDefinitionDiagramLayout) {
 		var minX = 0;
 		var maxX = 0;
 		var minY = 0;
 		var maxY = 0;
-		
-		if(processDefinitionDiagramLayout.participantProcess != undefined) {
-		  var pProc = processDefinitionDiagramLayout.participantProcess;
-		  
-		  minX = pProc.x;
-		  maxX = pProc.x + pProc.width;
-		  minY = pProc.y;
-		  maxY = pProc.y + pProc.height;
+
+		if (processDefinitionDiagramLayout.participantProcess != undefined) {
+			var pProc = processDefinitionDiagramLayout.participantProcess;
+
+			minX = pProc.x;
+			maxX = pProc.x + pProc.width;
+			minY = pProc.y;
+			maxY = pProc.y + pProc.height;
 		}
 
 		var activities = processDefinitionDiagramLayout.activities;
-		for(var i in activities) {
+		for (var i in activities) {
 			var activityJson = activities[i];
 			var activity = new ActivityImpl(activityJson);
-			
+
 			// width
 			if (activity.getX() + activity.getWidth() > maxX) {
 				maxX = activity.getX() + activity.getWidth();
@@ -673,14 +672,14 @@ var ProcessDiagramGenerator = {
 				minY = activity.getY();
 			}
 		}
-		
+
 		var sequenceFlows = processDefinitionDiagramLayout.sequenceFlows;
-		for(var i in sequenceFlows) {
+		for (var i in sequenceFlows) {
 			var flow = sequenceFlows[i];
 			var waypoints = [];
-			for(var j in flow.xPointArray) {
+			for (var j in flow.xPointArray) {
 				waypoints[j] = {x: flow.xPointArray[j], y: flow.yPointArray[j]};
-				
+
 				// width
 				if (waypoints[j].x > maxX) {
 					maxX = waypoints[j].x;
@@ -697,34 +696,34 @@ var ProcessDiagramGenerator = {
 				}
 			}
 		}
-		
+
 		var laneSets = processDefinitionDiagramLayout.laneSets;
-		for(var i in laneSets) {
+		for (var i in laneSets) {
 			var laneSet = laneSets[i];
 			//laneSet.id, laneSet.name
-			
-			for(var j in laneSet.lanes) {
+
+			for (var j in laneSet.lanes) {
 				var lane = laneSet.lanes[j];
 				// width
 				if (lane.x + lane.width > maxX) {
-				  maxX = lane.x + lane.width;
+					maxX = lane.x + lane.width;
 				}
 				if (lane.x < minX) {
-				  minX = lane.x;
+					minX = lane.x;
 				}
 				// height
 				if (lane.y + lane.height > maxY) {
-				  maxY = lane.y + lane.height;
+					maxY = lane.y + lane.height;
 				}
 				if (lane.y < minY) {
-				  minY = lane.y;
+					minY = lane.y;
 				}
 			}
 		}
-	
+
 		var diagramCanvas = new ProcessDiagramCanvas();
 		if (diagramCanvas) {
-			
+
 			// create div in diagramHolder
 			var diagramHolder = document.getElementById(this.options.diagramHolderId);
 			if (!diagramHolder)
@@ -733,7 +732,7 @@ var ProcessDiagramGenerator = {
 			div.id = processDefinitionDiagramLayout.processDefinition.id;
 			div.className = "diagram";
 			diagramHolder.appendChild(div);
-			
+
 			diagramCanvas.init(maxX + 20, maxY + 20, processDefinitionDiagramLayout.processDefinition.id);
 			this.processDiagrams[processDefinitionDiagramLayout.processDefinition.id] = {
 				processDefinitionDiagramLayout: processDefinitionDiagramLayout,
@@ -743,54 +742,54 @@ var ProcessDiagramGenerator = {
 		return this.getProcessDiagram(processDefinitionDiagramLayout.processDefinition.id);
 		//return new DefaultProcessDiagramCanvas(maxX + 10, maxY + 10, minX, minY);
 	},
-	
-	drawActivity: function(processDiagramCanvas, activity, highLightedActivities) {
+
+	drawActivity: function (processDiagramCanvas, activity, highLightedActivities) {
 		var type = activity.getProperty("type");
 		var drawInstruction = this.activityDrawInstructions[type];
-		if (drawInstruction != null) {	
-			drawInstruction.apply({processDiagramCanvas:processDiagramCanvas, activity:activity});
+		if (drawInstruction != null) {
+			drawInstruction.apply({processDiagramCanvas: processDiagramCanvas, activity: activity});
 		} else {
 			//console.error("no drawInstruction for " + type + ": ", activity);
 		}
-		
+
 		// Actually draw the markers
 		if (activity.getProperty("multiInstance") != undefined || activity.getProperty("collapsed") != undefined) {
 			//console.log(activity.getProperty("name"), activity.properties);
 			var multiInstanceSequential = (activity.getProperty("multiInstance") == "sequential");
 			var multiInstanceParallel = (activity.getProperty("multiInstance") == "parrallel");
 			var collapsed = activity.getProperty("collapsed");
-				processDiagramCanvas.drawActivityMarkers(activity.getX(), activity.getY(), activity.getWidth(), activity.getHeight(), 
-					multiInstanceSequential, multiInstanceParallel, collapsed);
+			processDiagramCanvas.drawActivityMarkers(activity.getX(), activity.getY(), activity.getWidth(), activity.getHeight(),
+				multiInstanceSequential, multiInstanceParallel, collapsed);
 		}
 		/*
 		processDiagramCanvas.drawActivityMarkers(activity.getX(), activity.getY(), activity.getWidth(), activity.getHeight(), multiInstanceSequential,
-              multiInstanceParallel, collapsed);
+			  multiInstanceParallel, collapsed);
 		*/
 
 		// TODO: Draw highlighted activities if they are present
-		
+
 	},
-	
-	setHighLights: function(highLights){
+
+	setHighLights: function (highLights) {
 		if (highLights.processDefinitionId == undefined) {
 			//console.error("Process instance " + highLights.processInstanceId + " doesn't exist");
 			return;
 		}
-		
+
 		var processDiagram = this.getProcessDiagram(highLights.processDefinitionId);
 		if (processDiagram == undefined) {
 			//console.error("Process diagram " + highLights.processDefinitionId + " not found");
 			return;
 		}
-		
+
 		var processDiagramCanvas = processDiagram.diagramCanvas;
-		
+
 		// TODO: remove highLightes from all activities before set new highLight
 		for (var i in highLights.activities) {
 			var activityId = highLights.activities[i];
 			processDiagramCanvas.highLightActivity(activityId);
 		}
-		
+
 		// TODO: remove highLightes from all flows before set new highLight
 		for (var i in highLights.flows) {
 			var flowId = highLights.flows[i];
@@ -800,8 +799,8 @@ var ProcessDiagramGenerator = {
 			processDiagramCanvas.highLightFlow(flowId);
 		}
 	},
-	
-	drawHighLights: function(processInstanceId) {
+
+	drawHighLights: function (processInstanceId) {
 		// Load highLights for the processInstanceId
 		/*
 		var url = Lang.sub(this.options.processInstanceHighLightsUrl, {processInstanceId: processInstanceId});
@@ -817,9 +816,9 @@ var ProcessDiagramGenerator = {
 				console.log("highLights not found");
 				return;
 			}
-			
+
 			console.log("highLights[" + highLights.processDefinitionId + "][" + processInstanceId + "]: ", highLights);
-			
+
 			ProcessDiagramGenerator.setHighLights(highLights);
 		}).fail(function(jqXHR, textStatus){
 			console.log('Get HighLights['+processDefinitionId+'] failure: ', textStatus, jqXHR);
@@ -827,19 +826,19 @@ var ProcessDiagramGenerator = {
 		*/
 		ActivitiRest.getHighLights(processInstanceId, this._drawHighLights);
 	},
-	_drawHighLights: function() {
+	_drawHighLights: function () {
 		var highLights = this.highLights;
 		ProcessDiagramGenerator.setHighLights(highLights);
 	},
-	
+
 	// Load processDefinition
-	
-	drawDiagram: function(processDefinitionId) {
+
+	drawDiagram: function (processDefinitionId) {
 		// Hide all diagrams
 		var diagrams = $("#" + this.options.diagramHolderId + " div.diagram");
 		diagrams.addClass("hidden");
-	
-	
+
+
 		// If processDefinitionId doesn't contain ":" then it's a "processDefinitionKey", not an id.
 		// Get process definition by key
 		if (processDefinitionId.indexOf(":") < 0) {
@@ -848,52 +847,52 @@ var ProcessDiagramGenerator = {
 			this._drawDiagram.apply({processDefinitionId: processDefinitionId});
 		}
 	},
-	_drawDiagram: function() {
+	_drawDiagram: function () {
 		var processDefinitionId = this.processDefinitionId;
-		
+
 		ProcessDiagramGenerator.addBreadCrumbsItem(processDefinitionId);
-		
-		
+
+
 		// Check if processDefinition is already loaded and rendered
-		
-		
+
+
 		var processDiagram = ProcessDiagramGenerator.getProcessDiagram(processDefinitionId);
 
 		if (processDiagram != undefined && processDiagram != null) {
 			//console.log("Process diagram " + processDefinitionId + " is already loaded");
 			//return;
-			
+
 			var diagram = document.getElementById(processDefinitionId);
 			$(diagram).removeClass("hidden");
-			
+
 			// Regenerate image
 			var processDefinitionDiagramLayout = processDiagram.processDefinitionDiagramLayout;
 			ProcessDiagramGenerator.generateDiagram(processDefinitionDiagramLayout);
-			
+
 			return;
 		}
 
 		//console.time('loadDiagram');
-		
+
 		// Load processDefinition
-		
+
 		ActivitiRest.getProcessDefinition(processDefinitionId, ProcessDiagramGenerator._generateDiagram);
 	},
-	_generateDiagram: function() {
+	_generateDiagram: function () {
 		var processDefinitionDiagramLayout = this.processDefinitionDiagramLayout;
-		
+
 		//console.log("process-definition-diagram-layout["+processDefinitionDiagramLayout.processDefinition.id+"]: ", processDefinitionDiagramLayout);
-		
+
 		//console.timeEnd('loadDiagram');
 		//console.time('generateDiagram');
-		
+
 		pb1.set('value', 0);
 		ProcessDiagramGenerator.generateDiagram(processDefinitionDiagramLayout);
 	},
-	
-	getProcessDefinitionByKey: function(processDefinitionKey) {
+
+	getProcessDefinitionByKey: function (processDefinitionKey) {
 		var url = Lang.sub(this.options.processDefinitionByKeyUrl, {processDefinitionKey: processDefinitionKey});
-		
+
 		var processDefinition;
 		$.ajax({
 			url: url,
@@ -901,17 +900,17 @@ var ProcessDiagramGenerator = {
 			dataType: 'json',
 			cache: false,
 			async: false
-		}).done(function(data) { 
+		}).done(function (data) {
 			//console.log("ajax returned data");
 			//console.log("ajax returned data:", data);
 			processDefinition = data;
 			if (!processDefinition) {
 				//console.error("Process definition '" + processDefinitionKey + "' not found");
 			}
-		}).fail(function(jqXHR, textStatus){
+		}).fail(function (jqXHR, textStatus) {
 			//console.error('Get diagram layout['+processDefinitionKey+'] failure: ', textStatus, jqXHR);
 		});
-		
+
 		if (processDefinition) {
 			//console.log("Get process definition by key '" + processDefinitionKey + "': ", processDefinition.id);
 			return processDefinition;
@@ -919,31 +918,31 @@ var ProcessDiagramGenerator = {
 			return null;
 		}
 	},
-	
-	addBreadCrumbsItem: function(processDefinitionId){
+
+	addBreadCrumbsItem: function (processDefinitionId) {
 		var TPL_UL_CONTAINER = '<ul></ul>',
 			TPL_LI_CONTAINER = '<li id="{id}", processDefinitionId="{processDefinitionId}"><span>{name}</span></li>';
-		
+
 		if (!this.diagramBreadCrumbs)
 			this.diagramBreadCrumbs = $("#" + this.options.diagramBreadCrumbsId);
 		if (!this.diagramBreadCrumbs) return;
-		
-		
+
+
 		var ul = this.diagramBreadCrumbs.find("ul");
 		//console.log("ul: ", ul);
 		if (ul.size() == 0) {
 			ul = $(TPL_UL_CONTAINER);
 			this.diagramBreadCrumbs.append(ul);
-			
+
 		}
 		var liListOld = ul.find("li");
 		//console.warn("liListOld", liListOld);
-		
+
 		// TODO: if there is any items after current then remove that before adding new item (m.b. it is a duplicate)
 		var currentBreadCrumbsItemId = this.currentBreadCrumbsItemId;
-			found = false;
+		found = false;
 		liListOld.each(
-			function(index, item) {
+			function (index, item) {
 				//console.warn("item:", $(this));
 				if (!found && currentBreadCrumbsItemId == $(this).attr("id")) {
 					found = true;
@@ -955,133 +954,139 @@ var ProcessDiagramGenerator = {
 				}
 			}
 		);
-		
+
 		var liListNew = ul.find("li");
-		
+
 		//console.log("liListNew size: ", liListNew.size());
 		var values = {
 			id: 'breadCrumbsItem_' + liListNew.size(),
 			processDefinitionId: processDefinitionId,
 			name: processDefinitionId
 		};
-		
-		
+
+
 		var tpl = Lang.sub(TPL_LI_CONTAINER, values);
 		//console.log("tpl: ", tpl);
 		ul.append(tpl);
-		
+
 		var li = ul.find("#" + values.id);
 		//console.warn("li:", li);
 		$('#' + values.id).on('click', this._breadCrumbsItemClick);
-		
+
 		ul.find("li").removeClass("selected");
 		li.attr("num", liListNew.size());
 		li.addClass("selected");
 		this.currentBreadCrumbsItemId = li.attr("id");
 	},
-	_breadCrumbsItemClick: function(){
+	_breadCrumbsItemClick: function () {
 		var li = $(this),
 			id = li.attr("id"),
 			processDefinitionId = li.attr("processDefinitionId");
 		//console.warn("_breadCrumbsItemClick: ", id, ", processDefinitionId: ", processDefinitionId);
-		
+
 		var ul = ProcessDiagramGenerator.diagramBreadCrumbs.one("ul");
 		ul.find("li").removeClass("selected");
 		li.addClass("selected");
 		ProcessDiagramGenerator.currentBreadCrumbsItemId = li.attr("id");
-		
+
 		// Hide all diagrams
-		var diagrams = $("#"+ProcessDiagramGenerator.options.diagramHolderId+" div.diagram");
+		var diagrams = $("#" + ProcessDiagramGenerator.options.diagramHolderId + " div.diagram");
 		diagrams.addClass("hidden");
-		
+
 		var processDiagram = ProcessDiagramGenerator.getProcessDiagram(processDefinitionId);
-		
+
 		var diagram = document.getElementById(processDefinitionId);
 		if (!diagram) return;
 		$(diagram).removeClass("hidden");
-		
+
 		// Regenerate image
 		var processDefinitionDiagramLayout = processDiagram.processDefinitionDiagramLayout;
 		ProcessDiagramGenerator.generateDiagram(processDefinitionDiagramLayout);
 	},
-	
-	showFlowInfo: function(flow){
+
+	showFlowInfo: function (flow) {
 		var diagramInfo = $("#" + this.options.diagramInfoId);
 		if (!diagramInfo) return;
-		
+
 		var values = {
 			flow: flow.flow,
-			isDefault: (flow.isDefault)? "true":"",
-			isConditional: (flow.isConditional)? "true":"",
-			isHighLighted: (flow.isHighLighted)? "true":"",
+			isDefault: (flow.isDefault) ? "true" : "",
+			isConditional: (flow.isConditional) ? "true" : "",
+			isHighLighted: (flow.isHighLighted) ? "true" : "",
 			sourceActivityId: flow.sourceActivityId,
 			destinationActivityId: flow.destinationActivityId
 		};
-		var TPL_FLOW_INFO = '<div>{flow}</div>' 
-				+ '<div><b>sourceActivityId</b>: {sourceActivityId}</div>'
-				+ '<div><b>destinationActivityId</b>: {destinationActivityId}</div>'
-				+ '<div><b>isDefault</b>: {isDefault}</div>'
-				+ '<div><b>isConditional</b>: {isConditional}</div>'
-				+ '<div><b>isHighLighted</b>: {isHighLighted}</div>';
+		var TPL_FLOW_INFO = '<div>{flow}</div>'
+			+ '<div><b>sourceActivityId</b>: {sourceActivityId}</div>'
+			+ '<div><b>destinationActivityId</b>: {destinationActivityId}</div>'
+			+ '<div><b>isDefault</b>: {isDefault}</div>'
+			+ '<div><b>isConditional</b>: {isConditional}</div>'
+			+ '<div><b>isHighLighted</b>: {isHighLighted}</div>';
 		var tpl = Lang.sub(TPL_FLOW_INFO, values);
 		//console.log("info: ", tpl);
 		diagramInfo.html(tpl);
 	},
-	
-	showActivityInfo: function(activity){
+
+	showActivityInfo: function (activity) {
 		var diagramInfo = $("#" + this.options.diagramInfoId);
 		if (!diagramInfo) return;
-		
+
 		var values = {
 			activityId: activity.getId(),
 			name: activity.getProperty("name"),
 			type: activity.getProperty("type")
 		};
-		var TPL_ACTIVITY_INFO = '' 
-				+ '<div><b>activityId</b>: {activityId}</div>'
-				+ '<div><b>name</b>: {name}</div>'
-				+ '<div><b>type</b>: {type}</div>';
+		var TPL_ACTIVITY_INFO = ''
+			+ '<div><b>activityId</b>: {activityId}</div>'
+			+ '<div><b>name</b>: {name}</div>'
+			+ '<div><b>type</b>: {type}</div>';
 		var TPL_CALLACTIVITY_INFO = ''
-				+ '<div><b>collapsed</b>: {collapsed}</div>'
-				+ '<div><b>processDefinitonKey</b>: {processDefinitonKey}</div>';
-		
+			+ '<div><b>collapsed</b>: {collapsed}</div>'
+			+ '<div><b>processDefinitonKey</b>: {processDefinitonKey}</div>';
+
 		var template = TPL_ACTIVITY_INFO;
 		if (activity.getProperty("type") == "callActivity") {
 			values.collapsed = activity.getProperty("collapsed");
 			values.processDefinitonKey = activity.getProperty("processDefinitonKey");
 			template += TPL_CALLACTIVITY_INFO;
 		} else if (activity.getProperty("type") == "callActivity") {
-		
+
 		}
-				
+
 		var tpl = Lang.sub(template, values);
 		//console.log("info: ", tpl);
 		diagramInfo.html(tpl);
 	},
-	
-	hideInfo: function(){
-	  var diagramInfo = $("#" + this.options.diagramInfoId);
-	  if (!diagramInfo) return;
-	  diagramInfo.html("");
+
+	hideInfo: function () {
+		var diagramInfo = $("#" + this.options.diagramInfoId);
+		if (!diagramInfo) return;
+		diagramInfo.html("");
 	},
-	
-	vvoid: function(){}
+
+	vvoid: function () {
+	}
 };
 
 var Lang = {
 	SUBREGEX: /\{\s*([^\|\}]+?)\s*(?:\|([^\}]*))?\s*\}/g,
 	UNDEFINED: 'undefined',
-	isUndefined: function(o) {
+	isUndefined: function (o) {
 		return typeof o === Lang.UNDEFINED;
 	},
-	sub: function(s, o) {
-		return ((s.replace) ? s.replace(Lang.SUBREGEX, function(match, key) {
+	sub: function (s, o) {
+		return ((s.replace) ? s.replace(Lang.SUBREGEX, function (match, key) {
 			return (!Lang.isUndefined(o[key])) ? o[key] : match;
 		}) : s);
 	}
 };
 
 if (Lang.isUndefined(console)) {
-    console = { log: function() {}, warn: function() {}, error: function() {}};
+	console = {
+		log: function () {
+		}, warn: function () {
+		}, error: function () {
+		}
+	};
 }
-ProcessDiagramGenerator.init();
\ No newline at end of file
+ProcessDiagramGenerator.init();
diff --git a/len-activiti/src/main/resources/static/diagram-viewer/js/jquery/jquery.asyncqueue.js b/len-activiti/src/main/resources/static/diagram-viewer/js/jquery/jquery.asyncqueue.js
index 7f9d4d0..86051d4 100644
--- a/len-activiti/src/main/resources/static/diagram-viewer/js/jquery/jquery.asyncqueue.js
+++ b/len-activiti/src/main/resources/static/diagram-viewer/js/jquery/jquery.asyncqueue.js
@@ -7,119 +7,123 @@
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */
-(function($){
-    $.AsyncQueue = function() {
-        var that = this,
-            queue = [],
+(function ($) {
+	$.AsyncQueue = function () {
+		var that = this,
+			queue = [],
 			completeFunc,
-            failureFunc,
-            paused = false,
-            lastCallbackData,
-            _run,
+			failureFunc,
+			paused = false,
+			lastCallbackData,
+			_run,
 			_complete,
 			inQueue = 0,
 			defaultTimeOut = 10;
 
-        _run = function() {
-            var f = queue.shift();
+		_run = function () {
+			var f = queue.shift();
 
-            if (f) {
+			if (f) {
 				inQueue++;
-				setTimeout(function(){
+				setTimeout(function () {
 					f.fn.apply(that, [that]);
-				
+
 					if (!f.isParallel)
 						if (paused === false) {
 							_run();
 						}
-					inQueue --;
+					inQueue--;
 					if (inQueue == 0 && queue.length == 0)
 						_complete();
-				}, f.timeOut);                
-				
+				}, f.timeOut);
+
 				if (f.isParallel)
 					if (paused === false) {
 						_run();
 					}
-            }
-        };
-		
-		_complete = function(){
+			}
+		};
+
+		_complete = function () {
 			if (completeFunc)
-					completeFunc.apply(that, [that]);
+				completeFunc.apply(that, [that]);
 		};
 
-		this.onComplete = function(func) {
-            completeFunc = func;
-        };
-		
-		this.onFailure = function(func) {
-            failureFunc = func;
-        };
+		this.onComplete = function (func) {
+			completeFunc = func;
+		};
 
-        this.add = function(func) {
+		this.onFailure = function (func) {
+			failureFunc = func;
+		};
+
+		this.add = function (func) {
 			// TODO: add callback for queue[i] complete
-			
+
 			var obj = arguments[0];
 			if (obj && Object.prototype.toString.call(obj) === "[object Array]") {
 				var fn = arguments[1];
-				var timeOut = (typeof(arguments[2]) != "undefined")? arguments[2] : defaultTimeOut;
-				if (typeof(fn) == "function") {
-					for(var i = 0; i < obj.length; i++) {
-						var f = function(objx){
-							queue.push({isParallel: true, fn: function(){fn.apply(that, [that, objx]);}, timeOut: timeOut});
+				var timeOut = (typeof (arguments[2]) != "undefined") ? arguments[2] : defaultTimeOut;
+				if (typeof (fn) == "function") {
+					for (var i = 0; i < obj.length; i++) {
+						var f = function (objx) {
+							queue.push({
+								isParallel: true, fn: function () {
+									fn.apply(that, [that, objx]);
+								}, timeOut: timeOut
+							});
 						}(obj[i])
 					}
 				}
 			} else {
 				var fn = arguments[0];
-				var timeOut = (typeof(arguments[1]) != "undefined")? arguments[2] : defaultTimeOut;
+				var timeOut = (typeof (arguments[1]) != "undefined") ? arguments[2] : defaultTimeOut;
 				queue.push({isParallel: false, fn: func, timeOut: timeOut});
 			}
-            return this;
-        };
-		
-		this.addParallel = function(func, timeOut) {
+			return this;
+		};
+
+		this.addParallel = function (func, timeOut) {
 			// TODO: add callback for queue[i] complete
-			
-            queue.push({isParallel: true, fn: func, timeOut: timeOut});
-            return this;
-        };
-
-        this.storeData = function(dataObject) {
-            lastCallbackData = dataObject;
-            return this;
-        };
-
-        this.lastCallbackData = function () {
-            return lastCallbackData;
-        };
-
-        this.run = function() {
-            paused = false;
-            _run();
-        };
-
-        this.pause = function () {
-            paused = true;
-            return this;
-        };
-
-        this.failure = function() {
-            paused = true;
-            if (failureFunc) {
-                var args = [that];
-                for(i = 0; i < arguments.length; i++) {
-                    args.push(arguments[i]);
-                }
-                failureFunc.apply(that, args);
-            }
-        };
-		
-		this.size = function(){
+
+			queue.push({isParallel: true, fn: func, timeOut: timeOut});
+			return this;
+		};
+
+		this.storeData = function (dataObject) {
+			lastCallbackData = dataObject;
+			return this;
+		};
+
+		this.lastCallbackData = function () {
+			return lastCallbackData;
+		};
+
+		this.run = function () {
+			paused = false;
+			_run();
+		};
+
+		this.pause = function () {
+			paused = true;
+			return this;
+		};
+
+		this.failure = function () {
+			paused = true;
+			if (failureFunc) {
+				var args = [that];
+				for (i = 0; i < arguments.length; i++) {
+					args.push(arguments[i]);
+				}
+				failureFunc.apply(that, args);
+			}
+		};
+
+		this.size = function () {
 			return queue.length;
 		};
 
-        return this;
-    }
+		return this;
+	}
 })(jQuery);
diff --git a/len-activiti/src/main/resources/static/diagram-viewer/js/jquery/jquery.js b/len-activiti/src/main/resources/static/diagram-viewer/js/jquery/jquery.js
index 2af1c89..da873b1 100644
--- a/len-activiti/src/main/resources/static/diagram-viewer/js/jquery/jquery.js
+++ b/len-activiti/src/main/resources/static/diagram-viewer/js/jquery/jquery.js
@@ -13,965 +13,969 @@
  *
  * Date: Mon Nov 21 21:11:03 2011 -0500
  */
-(function( window, undefined ) {
+(function (window, undefined) {
 
 // Use the correct document accordingly with window argument (sandbox)
-var document = window.document,
-	navigator = window.navigator,
-	location = window.location;
-var jQuery = (function() {
+	var document = window.document,
+		navigator = window.navigator,
+		location = window.location;
+	var jQuery = (function () {
 
 // Define a local copy of jQuery
-var jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context, rootjQuery );
-	},
+		var jQuery = function (selector, context) {
+				// The jQuery object is actually just the init constructor 'enhanced'
+				return new jQuery.fn.init(selector, context, rootjQuery);
+			},
 
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
+			// Map over jQuery in case of overwrite
+			_jQuery = window.jQuery,
 
-	// Map over the $ in case of overwrite
-	_$ = window.$,
+			// Map over the $ in case of overwrite
+			_$ = window.$,
 
-	// A central reference to the root jQuery(document)
-	rootjQuery,
+			// A central reference to the root jQuery(document)
+			rootjQuery,
 
-	// A simple way to check for HTML strings or ID strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
+			// A simple way to check for HTML strings or ID strings
+			// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+			quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
 
-	// Check if a string has a non-whitespace character in it
-	rnotwhite = /\S/,
+			// Check if a string has a non-whitespace character in it
+			rnotwhite = /\S/,
 
-	// Used for trimming whitespace
-	trimLeft = /^\s+/,
-	trimRight = /\s+$/,
+			// Used for trimming whitespace
+			trimLeft = /^\s+/,
+			trimRight = /\s+$/,
 
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
+			// Match a standalone tag
+			rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
 
-	// JSON RegExp
-	rvalidchars = /^[\],:{}\s]*$/,
-	rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
-	rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
-	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
+			// JSON RegExp
+			rvalidchars = /^[\],:{}\s]*$/,
+			rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
+			rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
+			rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
 
-	// Useragent RegExp
-	rwebkit = /(webkit)[ \/]([\w.]+)/,
-	ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
-	rmsie = /(msie) ([\w.]+)/,
-	rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
+			// Useragent RegExp
+			rwebkit = /(webkit)[ \/]([\w.]+)/,
+			ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
+			rmsie = /(msie) ([\w.]+)/,
+			rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
 
-	// Matches dashed string for camelizing
-	rdashAlpha = /-([a-z]|[0-9])/ig,
-	rmsPrefix = /^-ms-/,
+			// Matches dashed string for camelizing
+			rdashAlpha = /-([a-z]|[0-9])/ig,
+			rmsPrefix = /^-ms-/,
 
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return ( letter + "" ).toUpperCase();
-	},
+			// Used by jQuery.camelCase as callback to replace()
+			fcamelCase = function (all, letter) {
+				return (letter + "").toUpperCase();
+			},
 
-	// Keep a UserAgent string for use with jQuery.browser
-	userAgent = navigator.userAgent,
+			// Keep a UserAgent string for use with jQuery.browser
+			userAgent = navigator.userAgent,
 
-	// For matching the engine and version of the browser
-	browserMatch,
+			// For matching the engine and version of the browser
+			browserMatch,
 
-	// The deferred used on DOM ready
-	readyList,
+			// The deferred used on DOM ready
+			readyList,
 
-	// The ready event handler
-	DOMContentLoaded,
+			// The ready event handler
+			DOMContentLoaded,
 
-	// Save a reference to some core methods
-	toString = Object.prototype.toString,
-	hasOwn = Object.prototype.hasOwnProperty,
-	push = Array.prototype.push,
-	slice = Array.prototype.slice,
-	trim = String.prototype.trim,
-	indexOf = Array.prototype.indexOf,
+			// Save a reference to some core methods
+			toString = Object.prototype.toString,
+			hasOwn = Object.prototype.hasOwnProperty,
+			push = Array.prototype.push,
+			slice = Array.prototype.slice,
+			trim = String.prototype.trim,
+			indexOf = Array.prototype.indexOf,
 
-	// [[Class]] -> type pairs
-	class2type = {};
+			// [[Class]] -> type pairs
+			class2type = {};
 
-jQuery.fn = jQuery.prototype = {
-	constructor: jQuery,
-	init: function( selector, context, rootjQuery ) {
-		var match, elem, ret, doc;
+		jQuery.fn = jQuery.prototype = {
+			constructor: jQuery,
+			init: function (selector, context, rootjQuery) {
+				var match, elem, ret, doc;
 
-		// Handle $(""), $(null), or $(undefined)
-		if ( !selector ) {
-			return this;
-		}
+				// Handle $(""), $(null), or $(undefined)
+				if (!selector) {
+					return this;
+				}
 
-		// Handle $(DOMElement)
-		if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-		}
+				// Handle $(DOMElement)
+				if (selector.nodeType) {
+					this.context = this[0] = selector;
+					this.length = 1;
+					return this;
+				}
 
-		// The body element only exists once, optimize finding it
-		if ( selector === "body" && !context && document.body ) {
-			this.context = document;
-			this[0] = document.body;
-			this.selector = selector;
-			this.length = 1;
-			return this;
-		}
+				// The body element only exists once, optimize finding it
+				if (selector === "body" && !context && document.body) {
+					this.context = document;
+					this[0] = document.body;
+					this.selector = selector;
+					this.length = 1;
+					return this;
+				}
 
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			// Are we dealing with HTML string or an ID?
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
+				// Handle HTML strings
+				if (typeof selector === "string") {
+					// Are we dealing with HTML string or an ID?
+					if (selector.charAt(0) === "<" && selector.charAt(selector.length - 1) === ">" && selector.length >= 3) {
+						// Assume that strings that start and end with <> are HTML and skip the regex check
+						match = [null, selector, null];
 
-			} else {
-				match = quickExpr.exec( selector );
-			}
+					} else {
+						match = quickExpr.exec(selector);
+					}
 
-			// Verify a match, and that no context was specified for #id
-			if ( match && (match[1] || !context) ) {
+					// Verify a match, and that no context was specified for #id
+					if (match && (match[1] || !context)) {
 
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-					doc = ( context ? context.ownerDocument || context : document );
+						// HANDLE: $(html) -> $(array)
+						if (match[1]) {
+							context = context instanceof jQuery ? context[0] : context;
+							doc = (context ? context.ownerDocument || context : document);
 
-					// If a single string is passed in and it's a single tag
-					// just do a createElement and skip the rest
-					ret = rsingleTag.exec( selector );
+							// If a single string is passed in and it's a single tag
+							// just do a createElement and skip the rest
+							ret = rsingleTag.exec(selector);
 
-					if ( ret ) {
-						if ( jQuery.isPlainObject( context ) ) {
-							selector = [ document.createElement( ret[1] ) ];
-							jQuery.fn.attr.call( selector, context, true );
+							if (ret) {
+								if (jQuery.isPlainObject(context)) {
+									selector = [document.createElement(ret[1])];
+									jQuery.fn.attr.call(selector, context, true);
 
-						} else {
-							selector = [ doc.createElement( ret[1] ) ];
-						}
+								} else {
+									selector = [doc.createElement(ret[1])];
+								}
 
-					} else {
-						ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
-						selector = ( ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment ).childNodes;
-					}
+							} else {
+								ret = jQuery.buildFragment([match[1]], [doc]);
+								selector = (ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment).childNodes;
+							}
 
-					return jQuery.merge( this, selector );
+							return jQuery.merge(this, selector);
 
-				// HANDLE: $("#id")
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
+							// HANDLE: $("#id")
+						} else {
+							elem = document.getElementById(match[2]);
+
+							// Check parentNode to catch when Blackberry 4.6 returns
+							// nodes that are no longer in the document #6963
+							if (elem && elem.parentNode) {
+								// Handle the case where IE and Opera return items
+								// by name instead of ID
+								if (elem.id !== match[2]) {
+									return rootjQuery.find(selector);
+								}
+
+								// Otherwise, we inject the element directly into the jQuery object
+								this.length = 1;
+								this[0] = elem;
+							}
+
+							this.context = document;
+							this.selector = selector;
+							return this;
 						}
 
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
+						// HANDLE: $(expr, $(...))
+					} else if (!context || context.jquery) {
+						return (context || rootjQuery).find(selector);
+
+						// HANDLE: $(expr, context)
+						// (which is just equivalent to: $(context).find(expr)
+					} else {
+						return this.constructor(context).find(selector);
 					}
 
-					this.context = document;
-					this.selector = selector;
-					return this;
+					// HANDLE: $(function)
+					// Shortcut for document ready
+				} else if (jQuery.isFunction(selector)) {
+					return rootjQuery.ready(selector);
 				}
 
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
+				if (selector.selector !== undefined) {
+					this.selector = selector.selector;
+					this.context = selector.context;
+				}
 
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
+				return jQuery.makeArray(selector, this);
+			},
 
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
+			// Start with an empty selector
+			selector: "",
 
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
+			// The current version of jQuery being used
+			jquery: "1.7.1",
 
-		return jQuery.makeArray( selector, this );
-	},
+			// The default length of a jQuery object is 0
+			length: 0,
 
-	// Start with an empty selector
-	selector: "",
+			// The number of elements contained in the matched element set
+			size: function () {
+				return this.length;
+			},
 
-	// The current version of jQuery being used
-	jquery: "1.7.1",
+			toArray: function () {
+				return slice.call(this, 0);
+			},
 
-	// The default length of a jQuery object is 0
-	length: 0,
+			// Get the Nth element in the matched element set OR
+			// Get the whole matched element set as a clean array
+			get: function (num) {
+				return num == null ?
 
-	// The number of elements contained in the matched element set
-	size: function() {
-		return this.length;
-	},
+					// Return a 'clean' array
+					this.toArray() :
 
-	toArray: function() {
-		return slice.call( this, 0 );
-	},
+					// Return just the object
+					(num < 0 ? this[this.length + num] : this[num]);
+			},
 
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == null ?
+			// Take an array of elements and push it onto the stack
+			// (returning the new matched element set)
+			pushStack: function (elems, name, selector) {
+				// Build a new jQuery matched element set
+				var ret = this.constructor();
 
-			// Return a 'clean' array
-			this.toArray() :
+				if (jQuery.isArray(elems)) {
+					push.apply(ret, elems);
 
-			// Return just the object
-			( num < 0 ? this[ this.length + num ] : this[ num ] );
-	},
+				} else {
+					jQuery.merge(ret, elems);
+				}
 
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems, name, selector ) {
-		// Build a new jQuery matched element set
-		var ret = this.constructor();
+				// Add the old object onto the stack (as a reference)
+				ret.prevObject = this;
 
-		if ( jQuery.isArray( elems ) ) {
-			push.apply( ret, elems );
+				ret.context = this.context;
 
-		} else {
-			jQuery.merge( ret, elems );
-		}
+				if (name === "find") {
+					ret.selector = this.selector + (this.selector ? " " : "") + selector;
+				} else if (name) {
+					ret.selector = this.selector + "." + name + "(" + selector + ")";
+				}
 
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
+				// Return the newly-formed element set
+				return ret;
+			},
 
-		ret.context = this.context;
+			// Execute a callback for every element in the matched set.
+			// (You can seed the arguments with an array of args, but this is
+			// only used internally.)
+			each: function (callback, args) {
+				return jQuery.each(this, callback, args);
+			},
 
-		if ( name === "find" ) {
-			ret.selector = this.selector + ( this.selector ? " " : "" ) + selector;
-		} else if ( name ) {
-			ret.selector = this.selector + "." + name + "(" + selector + ")";
-		}
+			ready: function (fn) {
+				// Attach the listeners
+				jQuery.bindReady();
 
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	ready: function( fn ) {
-		// Attach the listeners
-		jQuery.bindReady();
-
-		// Add the callback
-		readyList.add( fn );
-
-		return this;
-	},
-
-	eq: function( i ) {
-		i = +i;
-		return i === -1 ?
-			this.slice( i ) :
-			this.slice( i, i + 1 );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ),
-			"slice", slice.call(arguments).join(",") );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
-	sort: [].sort,
-	splice: [].splice
-};
+				// Add the callback
+				readyList.add(fn);
 
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var options, name, src, copy, copyIsArray, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
+				return this;
+			},
 
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
+			eq: function (i) {
+				i = +i;
+				return i === -1 ?
+					this.slice(i) :
+					this.slice(i, i + 1);
+			},
 
-	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
-		target = this;
-		--i;
-	}
+			first: function () {
+				return this.eq(0);
+			},
 
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
+			last: function () {
+				return this.eq(-1);
+			},
 
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
+			slice: function () {
+				return this.pushStack(slice.apply(this, arguments),
+					"slice", slice.call(arguments).join(","));
+			},
 
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
+			map: function (callback) {
+				return this.pushStack(jQuery.map(this, function (elem, i) {
+					return callback.call(elem, i, elem);
+				}));
+			},
 
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
+			end: function () {
+				return this.prevObject || this.constructor(null);
+			},
 
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
+			// For internal use only.
+			// Behaves like an Array's method, not like a jQuery method.
+			push: push,
+			sort: [].sort,
+			splice: [].splice
+		};
 
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
+// Give the init function the jQuery prototype for later instantiation
+		jQuery.fn.init.prototype = jQuery.fn;
+
+		jQuery.extend = jQuery.fn.extend = function () {
+			var options, name, src, copy, copyIsArray, clone,
+				target = arguments[0] || {},
+				i = 1,
+				length = arguments.length,
+				deep = false;
+
+			// Handle a deep copy situation
+			if (typeof target === "boolean") {
+				deep = target;
+				target = arguments[1] || {};
+				// skip the boolean and the target
+				i = 2;
 			}
-		}
-	}
 
-	// Return the modified object
-	return target;
-};
+			// Handle case when target is a string or something (possible in deep copy)
+			if (typeof target !== "object" && !jQuery.isFunction(target)) {
+				target = {};
+			}
 
-jQuery.extend({
-	noConflict: function( deep ) {
-		if ( window.$ === jQuery ) {
-			window.$ = _$;
-		}
+			// extend jQuery itself if only one argument is passed
+			if (length === i) {
+				target = this;
+				--i;
+			}
 
-		if ( deep && window.jQuery === jQuery ) {
-			window.jQuery = _jQuery;
-		}
+			for (; i < length; i++) {
+				// Only deal with non-null/undefined values
+				if ((options = arguments[i]) != null) {
+					// Extend the base object
+					for (name in options) {
+						src = target[name];
+						copy = options[name];
 
-		return jQuery;
-	},
+						// Prevent never-ending loop
+						if (target === copy) {
+							continue;
+						}
 
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
+						// Recurse if we're merging plain objects or arrays
+						if (deep && copy && (jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)))) {
+							if (copyIsArray) {
+								copyIsArray = false;
+								clone = src && jQuery.isArray(src) ? src : [];
 
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
+							} else {
+								clone = src && jQuery.isPlainObject(src) ? src : {};
+							}
 
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
+							// Never move original objects, clone them
+							target[name] = jQuery.extend(deep, clone, copy);
 
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-		// Either a released hold or an DOMready/load event and not yet ready
-		if ( (wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady) ) {
-			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-			if ( !document.body ) {
-				return setTimeout( jQuery.ready, 1 );
+							// Don't bring in undefined values
+						} else if (copy !== undefined) {
+							target[name] = copy;
+						}
+					}
+				}
 			}
 
-			// Remember that the DOM is ready
-			jQuery.isReady = true;
+			// Return the modified object
+			return target;
+		};
 
-			// If a normal DOM Ready event fired, decrement, and wait if need be
-			if ( wait !== true && --jQuery.readyWait > 0 ) {
-				return;
-			}
+		jQuery.extend({
+			noConflict: function (deep) {
+				if (window.$ === jQuery) {
+					window.$ = _$;
+				}
 
-			// If there are functions bound, to execute
-			readyList.fireWith( document, [ jQuery ] );
+				if (deep && window.jQuery === jQuery) {
+					window.jQuery = _jQuery;
+				}
 
-			// Trigger any bound ready events
-			if ( jQuery.fn.trigger ) {
-				jQuery( document ).trigger( "ready" ).off( "ready" );
-			}
-		}
-	},
+				return jQuery;
+			},
 
-	bindReady: function() {
-		if ( readyList ) {
-			return;
-		}
+			// Is the DOM ready to be used? Set to true once it occurs.
+			isReady: false,
 
-		readyList = jQuery.Callbacks( "once memory" );
+			// A counter to track how many items to wait for before
+			// the ready event fires. See #6781
+			readyWait: 1,
 
-		// Catch cases where $(document).ready() is called after the
-		// browser event has already occurred.
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			return setTimeout( jQuery.ready, 1 );
-		}
+			// Hold (or release) the ready event
+			holdReady: function (hold) {
+				if (hold) {
+					jQuery.readyWait++;
+				} else {
+					jQuery.ready(true);
+				}
+			},
 
-		// Mozilla, Opera and webkit nightlies currently support this event
-		if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+			// Handle when the DOM is ready
+			ready: function (wait) {
+				// Either a released hold or an DOMready/load event and not yet ready
+				if ((wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady)) {
+					// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+					if (!document.body) {
+						return setTimeout(jQuery.ready, 1);
+					}
 
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", jQuery.ready, false );
+					// Remember that the DOM is ready
+					jQuery.isReady = true;
 
-		// If IE event model is used
-		} else if ( document.attachEvent ) {
-			// ensure firing before onload,
-			// maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", DOMContentLoaded );
+					// If a normal DOM Ready event fired, decrement, and wait if need be
+					if (wait !== true && --jQuery.readyWait > 0) {
+						return;
+					}
 
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", jQuery.ready );
+					// If there are functions bound, to execute
+					readyList.fireWith(document, [jQuery]);
 
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var toplevel = false;
+					// Trigger any bound ready events
+					if (jQuery.fn.trigger) {
+						jQuery(document).trigger("ready").off("ready");
+					}
+				}
+			},
 
-			try {
-				toplevel = window.frameElement == null;
-			} catch(e) {}
+			bindReady: function () {
+				if (readyList) {
+					return;
+				}
 
-			if ( document.documentElement.doScroll && toplevel ) {
-				doScrollCheck();
-			}
-		}
-	},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
-	},
-
-	// A crude way of determining if an object is a window
-	isWindow: function( obj ) {
-		return obj && typeof obj === "object" && "setInterval" in obj;
-	},
-
-	isNumeric: function( obj ) {
-		return !isNaN( parseFloat(obj) ) && isFinite( obj );
-	},
-
-	type: function( obj ) {
-		return obj == null ?
-			String( obj ) :
-			class2type[ toString.call(obj) ] || "object";
-	},
-
-	isPlainObject: function( obj ) {
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
+				readyList = jQuery.Callbacks("once memory");
 
-		try {
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!hasOwn.call(obj, "constructor") &&
-				!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-				return false;
-			}
-		} catch ( e ) {
-			// IE8,9 Will throw exceptions on certain host objects #9897
-			return false;
-		}
+				// Catch cases where $(document).ready() is called after the
+				// browser event has already occurred.
+				if (document.readyState === "complete") {
+					// Handle it asynchronously to allow scripts the opportunity to delay ready
+					return setTimeout(jQuery.ready, 1);
+				}
 
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
+				// Mozilla, Opera and webkit nightlies currently support this event
+				if (document.addEventListener) {
+					// Use the handy event callback
+					document.addEventListener("DOMContentLoaded", DOMContentLoaded, false);
 
-		var key;
-		for ( key in obj ) {}
+					// A fallback to window.onload, that will always work
+					window.addEventListener("load", jQuery.ready, false);
 
-		return key === undefined || hasOwn.call( obj, key );
-	},
+					// If IE event model is used
+				} else if (document.attachEvent) {
+					// ensure firing before onload,
+					// maybe late but safe also for iframes
+					document.attachEvent("onreadystatechange", DOMContentLoaded);
 
-	isEmptyObject: function( obj ) {
-		for ( var name in obj ) {
-			return false;
-		}
-		return true;
-	},
+					// A fallback to window.onload, that will always work
+					window.attachEvent("onload", jQuery.ready);
 
-	error: function( msg ) {
-		throw new Error( msg );
-	},
+					// If IE and not a frame
+					// continually check to see if the document is ready
+					var toplevel = false;
 
-	parseJSON: function( data ) {
-		if ( typeof data !== "string" || !data ) {
-			return null;
-		}
+					try {
+						toplevel = window.frameElement == null;
+					} catch (e) {
+					}
 
-		// Make sure leading/trailing whitespace is removed (IE can't handle it)
-		data = jQuery.trim( data );
+					if (document.documentElement.doScroll && toplevel) {
+						doScrollCheck();
+					}
+				}
+			},
 
-		// Attempt to parse using the native JSON parser first
-		if ( window.JSON && window.JSON.parse ) {
-			return window.JSON.parse( data );
-		}
+			// See test/unit/core.js for details concerning isFunction.
+			// Since version 1.3, DOM methods and functions like alert
+			// aren't supported. They return false on IE (#2968).
+			isFunction: function (obj) {
+				return jQuery.type(obj) === "function";
+			},
 
-		// Make sure the incoming data is actual JSON
-		// Logic borrowed from http://json.org/json2.js
-		if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-			.replace( rvalidtokens, "]" )
-			.replace( rvalidbraces, "")) ) {
+			isArray: Array.isArray || function (obj) {
+				return jQuery.type(obj) === "array";
+			},
 
-			return ( new Function( "return " + data ) )();
+			// A crude way of determining if an object is a window
+			isWindow: function (obj) {
+				return obj && typeof obj === "object" && "setInterval" in obj;
+			},
 
-		}
-		jQuery.error( "Invalid JSON: " + data );
-	},
+			isNumeric: function (obj) {
+				return !isNaN(parseFloat(obj)) && isFinite(obj);
+			},
 
-	// Cross-browser xml parsing
-	parseXML: function( data ) {
-		var xml, tmp;
-		try {
-			if ( window.DOMParser ) { // Standard
-				tmp = new DOMParser();
-				xml = tmp.parseFromString( data , "text/xml" );
-			} else { // IE
-				xml = new ActiveXObject( "Microsoft.XMLDOM" );
-				xml.async = "false";
-				xml.loadXML( data );
-			}
-		} catch( e ) {
-			xml = undefined;
-		}
-		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-			jQuery.error( "Invalid XML: " + data );
-		}
-		return xml;
-	},
-
-	noop: function() {},
-
-	// Evaluates a script in a global context
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-	globalEval: function( data ) {
-		if ( data && rnotwhite.test( data ) ) {
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
-			} )( data );
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
-	},
-
-	// args is for internal usage only
-	each: function( object, callback, args ) {
-		var name, i = 0,
-			length = object.length,
-			isObj = length === undefined || jQuery.isFunction( object );
-
-		if ( args ) {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.apply( object[ name ], args ) === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( ; i < length; ) {
-					if ( callback.apply( object[ i++ ], args ) === false ) {
-						break;
-					}
-				}
-			}
+			type: function (obj) {
+				return obj == null ?
+					String(obj) :
+					class2type[toString.call(obj)] || "object";
+			},
 
-		// A special, fast, case for the most util use of each
-		} else {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
-						break;
-					}
+			isPlainObject: function (obj) {
+				// Must be an Object.
+				// Because of IE, we also have to check the presence of the constructor property.
+				// Make sure that DOM nodes and window objects don't pass through, as well
+				if (!obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow(obj)) {
+					return false;
 				}
-			} else {
-				for ( ; i < length; ) {
-					if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) {
-						break;
+
+				try {
+					// Not own constructor property must be Object
+					if (obj.constructor &&
+						!hasOwn.call(obj, "constructor") &&
+						!hasOwn.call(obj.constructor.prototype, "isPrototypeOf")) {
+						return false;
 					}
+				} catch (e) {
+					// IE8,9 Will throw exceptions on certain host objects #9897
+					return false;
 				}
-			}
-		}
 
-		return object;
-	},
-
-	// Use native String.trim function wherever possible
-	trim: trim ?
-		function( text ) {
-			return text == null ?
-				"" :
-				trim.call( text );
-		} :
+				// Own properties are enumerated firstly, so to speed up,
+				// if last one is own, then all properties are own.
 
-		// Otherwise use our own trimming functionality
-		function( text ) {
-			return text == null ?
-				"" :
-				text.toString().replace( trimLeft, "" ).replace( trimRight, "" );
-		},
+				var key;
+				for (key in obj) {
+				}
 
-	// results is for internal usage only
-	makeArray: function( array, results ) {
-		var ret = results || [];
+				return key === undefined || hasOwn.call(obj, key);
+			},
 
-		if ( array != null ) {
-			// The window, strings (and functions) also have 'length'
-			// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
-			var type = jQuery.type( array );
+			isEmptyObject: function (obj) {
+				for (var name in obj) {
+					return false;
+				}
+				return true;
+			},
 
-			if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
-				push.call( ret, array );
-			} else {
-				jQuery.merge( ret, array );
-			}
-		}
+			error: function (msg) {
+				throw new Error(msg);
+			},
+
+			parseJSON: function (data) {
+				if (typeof data !== "string" || !data) {
+					return null;
+				}
 
-		return ret;
-	},
+				// Make sure leading/trailing whitespace is removed (IE can't handle it)
+				data = jQuery.trim(data);
 
-	inArray: function( elem, array, i ) {
-		var len;
+				// Attempt to parse using the native JSON parser first
+				if (window.JSON && window.JSON.parse) {
+					return window.JSON.parse(data);
+				}
 
-		if ( array ) {
-			if ( indexOf ) {
-				return indexOf.call( array, elem, i );
-			}
+				// Make sure the incoming data is actual JSON
+				// Logic borrowed from http://json.org/json2.js
+				if (rvalidchars.test(data.replace(rvalidescape, "@")
+					.replace(rvalidtokens, "]")
+					.replace(rvalidbraces, ""))) {
 
-			len = array.length;
-			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
+					return (new Function("return " + data))();
 
-			for ( ; i < len; i++ ) {
-				// Skip accessing in sparse arrays
-				if ( i in array && array[ i ] === elem ) {
-					return i;
 				}
-			}
-		}
+				jQuery.error("Invalid JSON: " + data);
+			},
 
-		return -1;
-	},
+			// Cross-browser xml parsing
+			parseXML: function (data) {
+				var xml, tmp;
+				try {
+					if (window.DOMParser) { // Standard
+						tmp = new DOMParser();
+						xml = tmp.parseFromString(data, "text/xml");
+					} else { // IE
+						xml = new ActiveXObject("Microsoft.XMLDOM");
+						xml.async = "false";
+						xml.loadXML(data);
+					}
+				} catch (e) {
+					xml = undefined;
+				}
+				if (!xml || !xml.documentElement || xml.getElementsByTagName("parsererror").length) {
+					jQuery.error("Invalid XML: " + data);
+				}
+				return xml;
+			},
 
-	merge: function( first, second ) {
-		var i = first.length,
-			j = 0;
+			noop: function () {
+			},
 
-		if ( typeof second.length === "number" ) {
-			for ( var l = second.length; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
-			}
+			// Evaluates a script in a global context
+			// Workarounds based on findings by Jim Driscoll
+			// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
+			globalEval: function (data) {
+				if (data && rnotwhite.test(data)) {
+					// We use execScript on Internet Explorer
+					// We use an anonymous function so that context is window
+					// rather than jQuery in Firefox
+					(window.execScript || function (data) {
+						window["eval"].call(window, data);
+					})(data);
+				}
+			},
 
-		} else {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
+			// Convert dashed to camelCase; used by the css and data modules
+			// Microsoft forgot to hump their vendor prefix (#9572)
+			camelCase: function (string) {
+				return string.replace(rmsPrefix, "ms-").replace(rdashAlpha, fcamelCase);
+			},
 
-		first.length = i;
+			nodeName: function (elem, name) {
+				return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
+			},
 
-		return first;
-	},
+			// args is for internal usage only
+			each: function (object, callback, args) {
+				var name, i = 0,
+					length = object.length,
+					isObj = length === undefined || jQuery.isFunction(object);
+
+				if (args) {
+					if (isObj) {
+						for (name in object) {
+							if (callback.apply(object[name], args) === false) {
+								break;
+							}
+						}
+					} else {
+						for (; i < length;) {
+							if (callback.apply(object[i++], args) === false) {
+								break;
+							}
+						}
+					}
 
-	grep: function( elems, callback, inv ) {
-		var ret = [], retVal;
-		inv = !!inv;
+					// A special, fast, case for the most util use of each
+				} else {
+					if (isObj) {
+						for (name in object) {
+							if (callback.call(object[name], name, object[name]) === false) {
+								break;
+							}
+						}
+					} else {
+						for (; i < length;) {
+							if (callback.call(object[i], i, object[i++]) === false) {
+								break;
+							}
+						}
+					}
+				}
 
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			retVal = !!callback( elems[ i ], i );
-			if ( inv !== retVal ) {
-				ret.push( elems[ i ] );
-			}
-		}
+				return object;
+			},
 
-		return ret;
-	},
+			// Use native String.trim function wherever possible
+			trim: trim ?
+				function (text) {
+					return text == null ?
+						"" :
+						trim.call(text);
+				} :
+
+				// Otherwise use our own trimming functionality
+				function (text) {
+					return text == null ?
+						"" :
+						text.toString().replace(trimLeft, "").replace(trimRight, "");
+				},
 
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value, key, ret = [],
-			i = 0,
-			length = elems.length,
-			// jquery objects are treated as arrays
-			isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ;
+			// results is for internal usage only
+			makeArray: function (array, results) {
+				var ret = results || [];
 
-		// Go through the array, translating each of the items to their
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
+				if (array != null) {
+					// The window, strings (and functions) also have 'length'
+					// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
+					var type = jQuery.type(array);
 
-				if ( value != null ) {
-					ret[ ret.length ] = value;
+					if (array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow(array)) {
+						push.call(ret, array);
+					} else {
+						jQuery.merge(ret, array);
+					}
 				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( key in elems ) {
-				value = callback( elems[ key ], key, arg );
 
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-		}
+				return ret;
+			},
 
-		// Flatten any nested arrays
-		return ret.concat.apply( [], ret );
-	},
+			inArray: function (elem, array, i) {
+				var len;
 
-	// A global GUID counter for objects
-	guid: 1,
+				if (array) {
+					if (indexOf) {
+						return indexOf.call(array, elem, i);
+					}
 
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		if ( typeof context === "string" ) {
-			var tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
+					len = array.length;
+					i = i ? i < 0 ? Math.max(0, len + i) : i : 0;
 
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
+					for (; i < len; i++) {
+						// Skip accessing in sparse arrays
+						if (i in array && array[i] === elem) {
+							return i;
+						}
+					}
+				}
 
-		// Simulated bind
-		var args = slice.call( arguments, 2 ),
-			proxy = function() {
-				return fn.apply( context, args.concat( slice.call( arguments ) ) );
-			};
+				return -1;
+			},
 
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
+			merge: function (first, second) {
+				var i = first.length,
+					j = 0;
 
-		return proxy;
-	},
+				if (typeof second.length === "number") {
+					for (var l = second.length; j < l; j++) {
+						first[i++] = second[j];
+					}
 
-	// Mutifunctional method to get and set values to a collection
-	// The value/s can optionally be executed if it's a function
-	access: function( elems, key, value, exec, fn, pass ) {
-		var length = elems.length;
+				} else {
+					while (second[j] !== undefined) {
+						first[i++] = second[j++];
+					}
+				}
 
-		// Setting many attributes
-		if ( typeof key === "object" ) {
-			for ( var k in key ) {
-				jQuery.access( elems, k, key[k], exec, fn, value );
-			}
-			return elems;
-		}
+				first.length = i;
 
-		// Setting one attribute
-		if ( value !== undefined ) {
-			// Optionally, function values get executed if exec is true
-			exec = !pass && exec && jQuery.isFunction(value);
+				return first;
+			},
 
-			for ( var i = 0; i < length; i++ ) {
-				fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
-			}
+			grep: function (elems, callback, inv) {
+				var ret = [], retVal;
+				inv = !!inv;
 
-			return elems;
-		}
+				// Go through the array, only saving the items
+				// that pass the validator function
+				for (var i = 0, length = elems.length; i < length; i++) {
+					retVal = !!callback(elems[i], i);
+					if (inv !== retVal) {
+						ret.push(elems[i]);
+					}
+				}
 
-		// Getting an attribute
-		return length ? fn( elems[0], key ) : undefined;
-	},
+				return ret;
+			},
 
-	now: function() {
-		return ( new Date() ).getTime();
-	},
+			// arg is for internal usage only
+			map: function (elems, callback, arg) {
+				var value, key, ret = [],
+					i = 0,
+					length = elems.length,
+					// jquery objects are treated as arrays
+					isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ((length > 0 && elems[0] && elems[length - 1]) || length === 0 || jQuery.isArray(elems));
 
-	// Use of jQuery.browser is frowned upon.
-	// More details: http://docs.jquery.com/Utilities/jQuery.browser
-	uaMatch: function( ua ) {
-		ua = ua.toLowerCase();
+				// Go through the array, translating each of the items to their
+				if (isArray) {
+					for (; i < length; i++) {
+						value = callback(elems[i], i, arg);
 
-		var match = rwebkit.exec( ua ) ||
-			ropera.exec( ua ) ||
-			rmsie.exec( ua ) ||
-			ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
-			[];
+						if (value != null) {
+							ret[ret.length] = value;
+						}
+					}
 
-		return { browser: match[1] || "", version: match[2] || "0" };
-	},
+					// Go through every key on the object,
+				} else {
+					for (key in elems) {
+						value = callback(elems[key], key, arg);
 
-	sub: function() {
-		function jQuerySub( selector, context ) {
-			return new jQuerySub.fn.init( selector, context );
-		}
-		jQuery.extend( true, jQuerySub, this );
-		jQuerySub.superclass = this;
-		jQuerySub.fn = jQuerySub.prototype = this();
-		jQuerySub.fn.constructor = jQuerySub;
-		jQuerySub.sub = this.sub;
-		jQuerySub.fn.init = function init( selector, context ) {
-			if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
-				context = jQuerySub( context );
-			}
+						if (value != null) {
+							ret[ret.length] = value;
+						}
+					}
+				}
 
-			return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
-		};
-		jQuerySub.fn.init.prototype = jQuerySub.fn;
-		var rootjQuerySub = jQuerySub(document);
-		return jQuerySub;
-	},
+				// Flatten any nested arrays
+				return ret.concat.apply([], ret);
+			},
+
+			// A global GUID counter for objects
+			guid: 1,
+
+			// Bind a function to a context, optionally partially applying any
+			// arguments.
+			proxy: function (fn, context) {
+				if (typeof context === "string") {
+					var tmp = fn[context];
+					context = fn;
+					fn = tmp;
+				}
+
+				// Quick check to determine if target is callable, in the spec
+				// this throws a TypeError, but we will just return undefined.
+				if (!jQuery.isFunction(fn)) {
+					return undefined;
+				}
+
+				// Simulated bind
+				var args = slice.call(arguments, 2),
+					proxy = function () {
+						return fn.apply(context, args.concat(slice.call(arguments)));
+					};
+
+				// Set the guid of unique handler to the same of original handler, so it can be removed
+				proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
+
+				return proxy;
+			},
+
+			// Mutifunctional method to get and set values to a collection
+			// The value/s can optionally be executed if it's a function
+			access: function (elems, key, value, exec, fn, pass) {
+				var length = elems.length;
+
+				// Setting many attributes
+				if (typeof key === "object") {
+					for (var k in key) {
+						jQuery.access(elems, k, key[k], exec, fn, value);
+					}
+					return elems;
+				}
+
+				// Setting one attribute
+				if (value !== undefined) {
+					// Optionally, function values get executed if exec is true
+					exec = !pass && exec && jQuery.isFunction(value);
+
+					for (var i = 0; i < length; i++) {
+						fn(elems[i], key, exec ? value.call(elems[i], i, fn(elems[i], key)) : value, pass);
+					}
+
+					return elems;
+				}
+
+				// Getting an attribute
+				return length ? fn(elems[0], key) : undefined;
+			},
+
+			now: function () {
+				return (new Date()).getTime();
+			},
+
+			// Use of jQuery.browser is frowned upon.
+			// More details: http://docs.jquery.com/Utilities/jQuery.browser
+			uaMatch: function (ua) {
+				ua = ua.toLowerCase();
+
+				var match = rwebkit.exec(ua) ||
+					ropera.exec(ua) ||
+					rmsie.exec(ua) ||
+					ua.indexOf("compatible") < 0 && rmozilla.exec(ua) ||
+					[];
 
-	browser: {}
-});
+				return {browser: match[1] || "", version: match[2] || "0"};
+			},
+
+			sub: function () {
+				function jQuerySub(selector, context) {
+					return new jQuerySub.fn.init(selector, context);
+				}
+
+				jQuery.extend(true, jQuerySub, this);
+				jQuerySub.superclass = this;
+				jQuerySub.fn = jQuerySub.prototype = this();
+				jQuerySub.fn.constructor = jQuerySub;
+				jQuerySub.sub = this.sub;
+				jQuerySub.fn.init = function init(selector, context) {
+					if (context && context instanceof jQuery && !(context instanceof jQuerySub)) {
+						context = jQuerySub(context);
+					}
+
+					return jQuery.fn.init.call(this, selector, context, rootjQuerySub);
+				};
+				jQuerySub.fn.init.prototype = jQuerySub.fn;
+				var rootjQuerySub = jQuerySub(document);
+				return jQuerySub;
+			},
+
+			browser: {}
+		});
 
 // Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
+		jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function (i, name) {
+			class2type["[object " + name + "]"] = name.toLowerCase();
+		});
 
-browserMatch = jQuery.uaMatch( userAgent );
-if ( browserMatch.browser ) {
-	jQuery.browser[ browserMatch.browser ] = true;
-	jQuery.browser.version = browserMatch.version;
-}
+		browserMatch = jQuery.uaMatch(userAgent);
+		if (browserMatch.browser) {
+			jQuery.browser[browserMatch.browser] = true;
+			jQuery.browser.version = browserMatch.version;
+		}
 
 // Deprecated, use jQuery.browser.webkit instead
-if ( jQuery.browser.webkit ) {
-	jQuery.browser.safari = true;
-}
+		if (jQuery.browser.webkit) {
+			jQuery.browser.safari = true;
+		}
 
 // IE doesn't match non-breaking spaces with \s
-if ( rnotwhite.test( "\xA0" ) ) {
-	trimLeft = /^[\s\xA0]+/;
-	trimRight = /[\s\xA0]+$/;
-}
+		if (rnotwhite.test("\xA0")) {
+			trimLeft = /^[\s\xA0]+/;
+			trimRight = /[\s\xA0]+$/;
+		}
 
 // All jQuery objects should point back to these
-rootjQuery = jQuery(document);
+		rootjQuery = jQuery(document);
 
 // Cleanup functions for the document ready method
-if ( document.addEventListener ) {
-	DOMContentLoaded = function() {
-		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-		jQuery.ready();
-	};
+		if (document.addEventListener) {
+			DOMContentLoaded = function () {
+				document.removeEventListener("DOMContentLoaded", DOMContentLoaded, false);
+				jQuery.ready();
+			};
 
-} else if ( document.attachEvent ) {
-	DOMContentLoaded = function() {
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( document.readyState === "complete" ) {
-			document.detachEvent( "onreadystatechange", DOMContentLoaded );
-			jQuery.ready();
+		} else if (document.attachEvent) {
+			DOMContentLoaded = function () {
+				// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+				if (document.readyState === "complete") {
+					document.detachEvent("onreadystatechange", DOMContentLoaded);
+					jQuery.ready();
+				}
+			};
 		}
-	};
-}
 
 // The DOM ready check for Internet Explorer
-function doScrollCheck() {
-	if ( jQuery.isReady ) {
-		return;
-	}
+		function doScrollCheck() {
+			if (jQuery.isReady) {
+				return;
+			}
 
-	try {
-		// If IE is used, use the trick by Diego Perini
-		// http://javascript.nwbox.com/IEContentLoaded/
-		document.documentElement.doScroll("left");
-	} catch(e) {
-		setTimeout( doScrollCheck, 1 );
-		return;
-	}
+			try {
+				// If IE is used, use the trick by Diego Perini
+				// http://javascript.nwbox.com/IEContentLoaded/
+				document.documentElement.doScroll("left");
+			} catch (e) {
+				setTimeout(doScrollCheck, 1);
+				return;
+			}
 
-	// and execute any waiting functions
-	jQuery.ready();
-}
+			// and execute any waiting functions
+			jQuery.ready();
+		}
 
-return jQuery;
+		return jQuery;
 
-})();
+	})();
 
 
 // String to Object flags format cache
-var flagsCache = {};
+	var flagsCache = {};
 
 // Convert String-formatted flags into Object-formatted ones and store in cache
-function createFlags( flags ) {
-	var object = flagsCache[ flags ] = {},
-		i, length;
-	flags = flags.split( /\s+/ );
-	for ( i = 0, length = flags.length; i < length; i++ ) {
-		object[ flags[i] ] = true;
+	function createFlags(flags) {
+		var object = flagsCache[flags] = {},
+			i, length;
+		flags = flags.split(/\s+/);
+		for (i = 0, length = flags.length; i < length; i++) {
+			object[flags[i]] = true;
+		}
+		return object;
 	}
-	return object;
-}
 
-/*
+	/*
  * Create a callback list using the following parameters:
  *
  *	flags:	an optional list of space-separated flags that will change how
@@ -993,5863 +997,5857 @@ function createFlags( flags ) {
  *	stopOnFalse:	interrupt callings when a callback returns false
  *
  */
-jQuery.Callbacks = function( flags ) {
-
-	// Convert flags from String-formatted to Object-formatted
-	// (we check in cache first)
-	flags = flags ? ( flagsCache[ flags ] || createFlags( flags ) ) : {};
-
-	var // Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = [],
-		// Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list is currently firing
-		firing,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// Add one or several callbacks to the list
-		add = function( args ) {
-			var i,
-				length,
-				elem,
-				type,
-				actual;
-			for ( i = 0, length = args.length; i < length; i++ ) {
-				elem = args[ i ];
-				type = jQuery.type( elem );
-				if ( type === "array" ) {
-					// Inspect recursively
-					add( elem );
-				} else if ( type === "function" ) {
-					// Add if not in unique mode and callback is not in
-					if ( !flags.unique || !self.has( elem ) ) {
-						list.push( elem );
+	jQuery.Callbacks = function (flags) {
+
+		// Convert flags from String-formatted to Object-formatted
+		// (we check in cache first)
+		flags = flags ? (flagsCache[flags] || createFlags(flags)) : {};
+
+		var // Actual callback list
+			list = [],
+			// Stack of fire calls for repeatable lists
+			stack = [],
+			// Last fire value (for non-forgettable lists)
+			memory,
+			// Flag to know if list is currently firing
+			firing,
+			// First callback to fire (used internally by add and fireWith)
+			firingStart,
+			// End of the loop when firing
+			firingLength,
+			// Index of currently firing callback (modified by remove if needed)
+			firingIndex,
+			// Add one or several callbacks to the list
+			add = function (args) {
+				var i,
+					length,
+					elem,
+					type,
+					actual;
+				for (i = 0, length = args.length; i < length; i++) {
+					elem = args[i];
+					type = jQuery.type(elem);
+					if (type === "array") {
+						// Inspect recursively
+						add(elem);
+					} else if (type === "function") {
+						// Add if not in unique mode and callback is not in
+						if (!flags.unique || !self.has(elem)) {
+							list.push(elem);
+						}
 					}
 				}
-			}
-		},
-		// Fire callbacks
-		fire = function( context, args ) {
-			args = args || [];
-			memory = !flags.memory || [ context, args ];
-			firing = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( context, args ) === false && flags.stopOnFalse ) {
-					memory = true; // Mark as halted
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( !flags.once ) {
-					if ( stack && stack.length ) {
-						memory = stack.shift();
-						self.fireWith( memory[ 0 ], memory[ 1 ] );
+			},
+			// Fire callbacks
+			fire = function (context, args) {
+				args = args || [];
+				memory = !flags.memory || [context, args];
+				firing = true;
+				firingIndex = firingStart || 0;
+				firingStart = 0;
+				firingLength = list.length;
+				for (; list && firingIndex < firingLength; firingIndex++) {
+					if (list[firingIndex].apply(context, args) === false && flags.stopOnFalse) {
+						memory = true; // Mark as halted
+						break;
 					}
-				} else if ( memory === true ) {
-					self.disable();
-				} else {
-					list = [];
 				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					var length = list.length;
-					add( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away, unless previous
-					// firing was halted (stopOnFalse)
-					} else if ( memory && memory !== true ) {
-						firingStart = length;
-						fire( memory[ 0 ], memory[ 1 ] );
+				firing = false;
+				if (list) {
+					if (!flags.once) {
+						if (stack && stack.length) {
+							memory = stack.shift();
+							self.fireWith(memory[0], memory[1]);
+						}
+					} else if (memory === true) {
+						self.disable();
+					} else {
+						list = [];
 					}
 				}
-				return this;
 			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					var args = arguments,
-						argIndex = 0,
-						argLength = args.length;
-					for ( ; argIndex < argLength ; argIndex++ ) {
-						for ( var i = 0; i < list.length; i++ ) {
-							if ( args[ argIndex ] === list[ i ] ) {
-								// Handle firingIndex and firingLength
-								if ( firing ) {
-									if ( i <= firingLength ) {
-										firingLength--;
-										if ( i <= firingIndex ) {
-											firingIndex--;
+			// Actual Callbacks object
+			self = {
+				// Add a callback or a collection of callbacks to the list
+				add: function () {
+					if (list) {
+						var length = list.length;
+						add(arguments);
+						// Do we need to add the callbacks to the
+						// current firing batch?
+						if (firing) {
+							firingLength = list.length;
+							// With memory, if we're not firing then
+							// we should call right away, unless previous
+							// firing was halted (stopOnFalse)
+						} else if (memory && memory !== true) {
+							firingStart = length;
+							fire(memory[0], memory[1]);
+						}
+					}
+					return this;
+				},
+				// Remove a callback from the list
+				remove: function () {
+					if (list) {
+						var args = arguments,
+							argIndex = 0,
+							argLength = args.length;
+						for (; argIndex < argLength; argIndex++) {
+							for (var i = 0; i < list.length; i++) {
+								if (args[argIndex] === list[i]) {
+									// Handle firingIndex and firingLength
+									if (firing) {
+										if (i <= firingLength) {
+											firingLength--;
+											if (i <= firingIndex) {
+												firingIndex--;
+											}
 										}
 									}
-								}
-								// Remove the element
-								list.splice( i--, 1 );
-								// If we have some unicity property then
-								// we only need to do this once
-								if ( flags.unique ) {
-									break;
+									// Remove the element
+									list.splice(i--, 1);
+									// If we have some unicity property then
+									// we only need to do this once
+									if (flags.unique) {
+										break;
+									}
 								}
 							}
 						}
 					}
-				}
-				return this;
-			},
-			// Control if a given callback is in the list
-			has: function( fn ) {
-				if ( list ) {
-					var i = 0,
-						length = list.length;
-					for ( ; i < length; i++ ) {
-						if ( fn === list[ i ] ) {
-							return true;
+					return this;
+				},
+				// Control if a given callback is in the list
+				has: function (fn) {
+					if (list) {
+						var i = 0,
+							length = list.length;
+						for (; i < length; i++) {
+							if (fn === list[i]) {
+								return true;
+							}
 						}
 					}
-				}
-				return false;
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},
-			// Lock the list in its current state
-			lock: function() {
-				stack = undefined;
-				if ( !memory || memory === true ) {
-					self.disable();
-				}
-				return this;
-			},
-			// Is it locked?
-			locked: function() {
-				return !stack;
-			},
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				if ( stack ) {
-					if ( firing ) {
-						if ( !flags.once ) {
-							stack.push( [ context, args ] );
+					return false;
+				},
+				// Remove all callbacks from the list
+				empty: function () {
+					list = [];
+					return this;
+				},
+				// Have the list do nothing anymore
+				disable: function () {
+					list = stack = memory = undefined;
+					return this;
+				},
+				// Is it disabled?
+				disabled: function () {
+					return !list;
+				},
+				// Lock the list in its current state
+				lock: function () {
+					stack = undefined;
+					if (!memory || memory === true) {
+						self.disable();
+					}
+					return this;
+				},
+				// Is it locked?
+				locked: function () {
+					return !stack;
+				},
+				// Call all callbacks with the given context and arguments
+				fireWith: function (context, args) {
+					if (stack) {
+						if (firing) {
+							if (!flags.once) {
+								stack.push([context, args]);
+							}
+						} else if (!(flags.once && memory)) {
+							fire(context, args);
 						}
-					} else if ( !( flags.once && memory ) ) {
-						fire( context, args );
 					}
+					return this;
+				},
+				// Call all the callbacks with the given arguments
+				fire: function () {
+					self.fireWith(this, arguments);
+					return this;
+				},
+				// To know if the callbacks have already been called at least once
+				fired: function () {
+					return !!memory;
 				}
-				return this;
-			},
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!memory;
-			}
-		};
-
-	return self;
-};
-
-
-
-
-var // Static reference to slice
-	sliceDeferred = [].slice;
+			};
 
-jQuery.extend({
+		return self;
+	};
 
-	Deferred: function( func ) {
-		var doneList = jQuery.Callbacks( "once memory" ),
-			failList = jQuery.Callbacks( "once memory" ),
-			progressList = jQuery.Callbacks( "memory" ),
-			state = "pending",
-			lists = {
-				resolve: doneList,
-				reject: failList,
-				notify: progressList
-			},
-			promise = {
-				done: doneList.add,
-				fail: failList.add,
-				progress: progressList.add,
 
-				state: function() {
-					return state;
-				},
+	var // Static reference to slice
+		sliceDeferred = [].slice;
 
-				// Deprecated
-				isResolved: doneList.fired,
-				isRejected: failList.fired,
+	jQuery.extend({
 
-				then: function( doneCallbacks, failCallbacks, progressCallbacks ) {
-					deferred.done( doneCallbacks ).fail( failCallbacks ).progress( progressCallbacks );
-					return this;
-				},
-				always: function() {
-					deferred.done.apply( deferred, arguments ).fail.apply( deferred, arguments );
-					return this;
+		Deferred: function (func) {
+			var doneList = jQuery.Callbacks("once memory"),
+				failList = jQuery.Callbacks("once memory"),
+				progressList = jQuery.Callbacks("memory"),
+				state = "pending",
+				lists = {
+					resolve: doneList,
+					reject: failList,
+					notify: progressList
 				},
-				pipe: function( fnDone, fnFail, fnProgress ) {
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( {
-							done: [ fnDone, "resolve" ],
-							fail: [ fnFail, "reject" ],
-							progress: [ fnProgress, "notify" ]
-						}, function( handler, data ) {
-							var fn = data[ 0 ],
-								action = data[ 1 ],
-								returned;
-							if ( jQuery.isFunction( fn ) ) {
-								deferred[ handler ](function() {
-									returned = fn.apply( this, arguments );
-									if ( returned && jQuery.isFunction( returned.promise ) ) {
-										returned.promise().then( newDefer.resolve, newDefer.reject, newDefer.notify );
-									} else {
-										newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] );
-									}
-								});
-							} else {
-								deferred[ handler ]( newDefer[ action ] );
+				promise = {
+					done: doneList.add,
+					fail: failList.add,
+					progress: progressList.add,
+
+					state: function () {
+						return state;
+					},
+
+					// Deprecated
+					isResolved: doneList.fired,
+					isRejected: failList.fired,
+
+					then: function (doneCallbacks, failCallbacks, progressCallbacks) {
+						deferred.done(doneCallbacks).fail(failCallbacks).progress(progressCallbacks);
+						return this;
+					},
+					always: function () {
+						deferred.done.apply(deferred, arguments).fail.apply(deferred, arguments);
+						return this;
+					},
+					pipe: function (fnDone, fnFail, fnProgress) {
+						return jQuery.Deferred(function (newDefer) {
+							jQuery.each({
+								done: [fnDone, "resolve"],
+								fail: [fnFail, "reject"],
+								progress: [fnProgress, "notify"]
+							}, function (handler, data) {
+								var fn = data[0],
+									action = data[1],
+									returned;
+								if (jQuery.isFunction(fn)) {
+									deferred[handler](function () {
+										returned = fn.apply(this, arguments);
+										if (returned && jQuery.isFunction(returned.promise)) {
+											returned.promise().then(newDefer.resolve, newDefer.reject, newDefer.notify);
+										} else {
+											newDefer[action + "With"](this === deferred ? newDefer : this, [returned]);
+										}
+									});
+								} else {
+									deferred[handler](newDefer[action]);
+								}
+							});
+						}).promise();
+					},
+					// Get a promise for this deferred
+					// If obj is provided, the promise aspect is added to the object
+					promise: function (obj) {
+						if (obj == null) {
+							obj = promise;
+						} else {
+							for (var key in promise) {
+								obj[key] = promise[key];
 							}
-						});
-					}).promise();
-				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					if ( obj == null ) {
-						obj = promise;
-					} else {
-						for ( var key in promise ) {
-							obj[ key ] = promise[ key ];
 						}
+						return obj;
 					}
-					return obj;
-				}
-			},
-			deferred = promise.promise({}),
-			key;
+				},
+				deferred = promise.promise({}),
+				key;
 
-		for ( key in lists ) {
-			deferred[ key ] = lists[ key ].fire;
-			deferred[ key + "With" ] = lists[ key ].fireWith;
-		}
+			for (key in lists) {
+				deferred[key] = lists[key].fire;
+				deferred[key + "With"] = lists[key].fireWith;
+			}
 
-		// Handle state
-		deferred.done( function() {
-			state = "resolved";
-		}, failList.disable, progressList.lock ).fail( function() {
-			state = "rejected";
-		}, doneList.disable, progressList.lock );
+			// Handle state
+			deferred.done(function () {
+				state = "resolved";
+			}, failList.disable, progressList.lock).fail(function () {
+				state = "rejected";
+			}, doneList.disable, progressList.lock);
 
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
+			// Call given func if any
+			if (func) {
+				func.call(deferred, deferred);
+			}
 
-		// All done!
-		return deferred;
-	},
+			// All done!
+			return deferred;
+		},
 
-	// Deferred helper
-	when: function( firstParam ) {
-		var args = sliceDeferred.call( arguments, 0 ),
-			i = 0,
-			length = args.length,
-			pValues = new Array( length ),
-			count = length,
-			pCount = length,
-			deferred = length <= 1 && firstParam && jQuery.isFunction( firstParam.promise ) ?
-				firstParam :
-				jQuery.Deferred(),
-			promise = deferred.promise();
-		function resolveFunc( i ) {
-			return function( value ) {
-				args[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value;
-				if ( !( --count ) ) {
-					deferred.resolveWith( deferred, args );
+		// Deferred helper
+		when: function (firstParam) {
+			var args = sliceDeferred.call(arguments, 0),
+				i = 0,
+				length = args.length,
+				pValues = new Array(length),
+				count = length,
+				pCount = length,
+				deferred = length <= 1 && firstParam && jQuery.isFunction(firstParam.promise) ?
+					firstParam :
+					jQuery.Deferred(),
+				promise = deferred.promise();
+
+			function resolveFunc(i) {
+				return function (value) {
+					args[i] = arguments.length > 1 ? sliceDeferred.call(arguments, 0) : value;
+					if (!(--count)) {
+						deferred.resolveWith(deferred, args);
+					}
+				};
+			}
+
+			function progressFunc(i) {
+				return function (value) {
+					pValues[i] = arguments.length > 1 ? sliceDeferred.call(arguments, 0) : value;
+					deferred.notifyWith(promise, pValues);
+				};
+			}
+
+			if (length > 1) {
+				for (; i < length; i++) {
+					if (args[i] && args[i].promise && jQuery.isFunction(args[i].promise)) {
+						args[i].promise().then(resolveFunc(i), deferred.reject, progressFunc(i));
+					} else {
+						--count;
+					}
 				}
-			};
-		}
-		function progressFunc( i ) {
-			return function( value ) {
-				pValues[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value;
-				deferred.notifyWith( promise, pValues );
-			};
-		}
-		if ( length > 1 ) {
-			for ( ; i < length; i++ ) {
-				if ( args[ i ] && args[ i ].promise && jQuery.isFunction( args[ i ].promise ) ) {
-					args[ i ].promise().then( resolveFunc(i), deferred.reject, progressFunc(i) );
-				} else {
-					--count;
+				if (!count) {
+					deferred.resolveWith(deferred, args);
 				}
+			} else if (deferred !== firstParam) {
+				deferred.resolveWith(deferred, length ? [firstParam] : []);
 			}
-			if ( !count ) {
-				deferred.resolveWith( deferred, args );
-			}
-		} else if ( deferred !== firstParam ) {
-			deferred.resolveWith( deferred, length ? [ firstParam ] : [] );
+			return promise;
 		}
-		return promise;
-	}
-});
-
-
+	});
 
 
-jQuery.support = (function() {
+	jQuery.support = (function () {
 
-	var support,
-		all,
-		a,
-		select,
-		opt,
-		input,
-		marginDiv,
-		fragment,
-		tds,
-		events,
-		eventName,
-		i,
-		isSupported,
-		div = document.createElement( "div" ),
-		documentElement = document.documentElement;
+		var support,
+			all,
+			a,
+			select,
+			opt,
+			input,
+			marginDiv,
+			fragment,
+			tds,
+			events,
+			eventName,
+			i,
+			isSupported,
+			div = document.createElement("div"),
+			documentElement = document.documentElement;
+
+		// Preliminary tests
+		div.setAttribute("className", "t");
+		div.innerHTML = "   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
+
+		all = div.getElementsByTagName("*");
+		a = div.getElementsByTagName("a")[0];
+
+		// Can't get basic test support
+		if (!all || !all.length || !a) {
+			return {};
+		}
+
+		// First batch of supports tests
+		select = document.createElement("select");
+		opt = select.appendChild(document.createElement("option"));
+		input = div.getElementsByTagName("input")[0];
+
+		support = {
+			// IE strips leading whitespace when .innerHTML is used
+			leadingWhitespace: (div.firstChild.nodeType === 3),
+
+			// Make sure that tbody elements aren't automatically inserted
+			// IE will insert them into empty tables
+			tbody: !div.getElementsByTagName("tbody").length,
+
+			// Make sure that link elements get serialized correctly by innerHTML
+			// This requires a wrapper element in IE
+			htmlSerialize: !!div.getElementsByTagName("link").length,
+
+			// Get the style information from getAttribute
+			// (IE uses .cssText instead)
+			style: /top/.test(a.getAttribute("style")),
+
+			// Make sure that URLs aren't manipulated
+			// (IE normalizes it by default)
+			hrefNormalized: (a.getAttribute("href") === "/a"),
+
+			// Make sure that element opacity exists
+			// (IE uses filter instead)
+			// Use a regex to work around a WebKit issue. See #5145
+			opacity: /^0.55/.test(a.style.opacity),
+
+			// Verify style float existence
+			// (IE uses styleFloat instead of cssFloat)
+			cssFloat: !!a.style.cssFloat,
+
+			// Make sure that if no value is specified for a checkbox
+			// that it defaults to "on".
+			// (WebKit defaults to "" instead)
+			checkOn: (input.value === "on"),
+
+			// Make sure that a selected-by-default option has a working selected property.
+			// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+			optSelected: opt.selected,
+
+			// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
+			getSetAttribute: div.className !== "t",
+
+			// Tests for enctype support on a form(#6743)
+			enctype: !!document.createElement("form").enctype,
+
+			// Makes sure cloning an html5 element does not cause problems
+			// Where outerHTML is undefined, this still works
+			html5Clone: document.createElement("nav").cloneNode(true).outerHTML !== "<:nav></:nav>",
+
+			// Will be defined later
+			submitBubbles: true,
+			changeBubbles: true,
+			focusinBubbles: false,
+			deleteExpando: true,
+			noCloneEvent: true,
+			inlineBlockNeedsLayout: false,
+			shrinkWrapBlocks: false,
+			reliableMarginRight: true
+		};
 
-	// Preliminary tests
-	div.setAttribute("className", "t");
-	div.innerHTML = "   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
+		// Make sure checked status is properly cloned
+		input.checked = true;
+		support.noCloneChecked = input.cloneNode(true).checked;
 
-	all = div.getElementsByTagName( "*" );
-	a = div.getElementsByTagName( "a" )[ 0 ];
+		// Make sure that the options inside disabled selects aren't marked as disabled
+		// (WebKit marks them as disabled)
+		select.disabled = true;
+		support.optDisabled = !opt.disabled;
 
-	// Can't get basic test support
-	if ( !all || !all.length || !a ) {
-		return {};
-	}
+		// Test to see if it's possible to delete an expando from an element
+		// Fails in Internet Explorer
+		try {
+			delete div.test;
+		} catch (e) {
+			support.deleteExpando = false;
+		}
 
-	// First batch of supports tests
-	select = document.createElement( "select" );
-	opt = select.appendChild( document.createElement("option") );
-	input = div.getElementsByTagName( "input" )[ 0 ];
-
-	support = {
-		// IE strips leading whitespace when .innerHTML is used
-		leadingWhitespace: ( div.firstChild.nodeType === 3 ),
-
-		// Make sure that tbody elements aren't automatically inserted
-		// IE will insert them into empty tables
-		tbody: !div.getElementsByTagName("tbody").length,
-
-		// Make sure that link elements get serialized correctly by innerHTML
-		// This requires a wrapper element in IE
-		htmlSerialize: !!div.getElementsByTagName("link").length,
-
-		// Get the style information from getAttribute
-		// (IE uses .cssText instead)
-		style: /top/.test( a.getAttribute("style") ),
-
-		// Make sure that URLs aren't manipulated
-		// (IE normalizes it by default)
-		hrefNormalized: ( a.getAttribute("href") === "/a" ),
-
-		// Make sure that element opacity exists
-		// (IE uses filter instead)
-		// Use a regex to work around a WebKit issue. See #5145
-		opacity: /^0.55/.test( a.style.opacity ),
-
-		// Verify style float existence
-		// (IE uses styleFloat instead of cssFloat)
-		cssFloat: !!a.style.cssFloat,
-
-		// Make sure that if no value is specified for a checkbox
-		// that it defaults to "on".
-		// (WebKit defaults to "" instead)
-		checkOn: ( input.value === "on" ),
-
-		// Make sure that a selected-by-default option has a working selected property.
-		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-		optSelected: opt.selected,
-
-		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-		getSetAttribute: div.className !== "t",
-
-		// Tests for enctype support on a form(#6743)
-		enctype: !!document.createElement("form").enctype,
-
-		// Makes sure cloning an html5 element does not cause problems
-		// Where outerHTML is undefined, this still works
-		html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>",
-
-		// Will be defined later
-		submitBubbles: true,
-		changeBubbles: true,
-		focusinBubbles: false,
-		deleteExpando: true,
-		noCloneEvent: true,
-		inlineBlockNeedsLayout: false,
-		shrinkWrapBlocks: false,
-		reliableMarginRight: true
-	};
+		if (!div.addEventListener && div.attachEvent && div.fireEvent) {
+			div.attachEvent("onclick", function () {
+				// Cloning a node shouldn't copy over any
+				// bound event handlers (IE does this)
+				support.noCloneEvent = false;
+			});
+			div.cloneNode(true).fireEvent("onclick");
+		}
 
-	// Make sure checked status is properly cloned
-	input.checked = true;
-	support.noCloneChecked = input.cloneNode( true ).checked;
+		// Check if a radio maintains its value
+		// after being appended to the DOM
+		input = document.createElement("input");
+		input.value = "t";
+		input.setAttribute("type", "radio");
+		support.radioValue = input.value === "t";
 
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
+		input.setAttribute("checked", "checked");
+		div.appendChild(input);
+		fragment = document.createDocumentFragment();
+		fragment.appendChild(div.lastChild);
 
-	// Test to see if it's possible to delete an expando from an element
-	// Fails in Internet Explorer
-	try {
-		delete div.test;
-	} catch( e ) {
-		support.deleteExpando = false;
-	}
+		// WebKit doesn't clone checked state correctly in fragments
+		support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked;
 
-	if ( !div.addEventListener && div.attachEvent && div.fireEvent ) {
-		div.attachEvent( "onclick", function() {
-			// Cloning a node shouldn't copy over any
-			// bound event handlers (IE does this)
-			support.noCloneEvent = false;
-		});
-		div.cloneNode( true ).fireEvent( "onclick" );
-	}
+		// Check if a disconnected checkbox will retain its checked
+		// value of true after appended to the DOM (IE6/7)
+		support.appendChecked = input.checked;
 
-	// Check if a radio maintains its value
-	// after being appended to the DOM
-	input = document.createElement("input");
-	input.value = "t";
-	input.setAttribute("type", "radio");
-	support.radioValue = input.value === "t";
-
-	input.setAttribute("checked", "checked");
-	div.appendChild( input );
-	fragment = document.createDocumentFragment();
-	fragment.appendChild( div.lastChild );
-
-	// WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	support.appendChecked = input.checked;
-
-	fragment.removeChild( input );
-	fragment.appendChild( div );
-
-	div.innerHTML = "";
-
-	// Check if div with explicit width and no margin-right incorrectly
-	// gets computed margin-right based on width of container. For more
-	// info see bug #3333
-	// Fails in WebKit before Feb 2011 nightlies
-	// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-	if ( window.getComputedStyle ) {
-		marginDiv = document.createElement( "div" );
-		marginDiv.style.width = "0";
-		marginDiv.style.marginRight = "0";
-		div.style.width = "2px";
-		div.appendChild( marginDiv );
-		support.reliableMarginRight =
-			( parseInt( ( window.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0;
-	}
+		fragment.removeChild(input);
+		fragment.appendChild(div);
 
-	// Technique from Juriy Zaytsev
-	// http://perfectionkills.com/detecting-event-support-without-browser-sniffing/
-	// We only care about the case where non-standard event systems
-	// are used, namely in IE. Short-circuiting here helps us to
-	// avoid an eval call (in setAttribute) which can cause CSP
-	// to go haywire. See: https://developer.mozilla.org/en/Security/CSP
-	if ( div.attachEvent ) {
-		for( i in {
-			submit: 1,
-			change: 1,
-			focusin: 1
-		}) {
-			eventName = "on" + i;
-			isSupported = ( eventName in div );
-			if ( !isSupported ) {
-				div.setAttribute( eventName, "return;" );
-				isSupported = ( typeof div[ eventName ] === "function" );
-			}
-			support[ i + "Bubbles" ] = isSupported;
-		}
-	}
+		div.innerHTML = "";
 
-	fragment.removeChild( div );
+		// Check if div with explicit width and no margin-right incorrectly
+		// gets computed margin-right based on width of container. For more
+		// info see bug #3333
+		// Fails in WebKit before Feb 2011 nightlies
+		// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+		if (window.getComputedStyle) {
+			marginDiv = document.createElement("div");
+			marginDiv.style.width = "0";
+			marginDiv.style.marginRight = "0";
+			div.style.width = "2px";
+			div.appendChild(marginDiv);
+			support.reliableMarginRight =
+				(parseInt((window.getComputedStyle(marginDiv, null) || {marginRight: 0}).marginRight, 10) || 0) === 0;
+		}
+
+		// Technique from Juriy Zaytsev
+		// http://perfectionkills.com/detecting-event-support-without-browser-sniffing/
+		// We only care about the case where non-standard event systems
+		// are used, namely in IE. Short-circuiting here helps us to
+		// avoid an eval call (in setAttribute) which can cause CSP
+		// to go haywire. See: https://developer.mozilla.org/en/Security/CSP
+		if (div.attachEvent) {
+			for (i in {
+				submit: 1,
+				change: 1,
+				focusin: 1
+			}) {
+				eventName = "on" + i;
+				isSupported = (eventName in div);
+				if (!isSupported) {
+					div.setAttribute(eventName, "return;");
+					isSupported = (typeof div[eventName] === "function");
+				}
+				support[i + "Bubbles"] = isSupported;
+			}
+		}
+
+		fragment.removeChild(div);
+
+		// Null elements to avoid leaks in IE
+		fragment = select = opt = marginDiv = div = input = null;
+
+		// Run tests that need a body at doc ready
+		jQuery(function () {
+			var container, outer, inner, table, td, offsetSupport,
+				conMarginTop, ptlm, vb, style, html,
+				body = document.getElementsByTagName("body")[0];
+
+			if (!body) {
+				// Return for frameset docs that don't have a body
+				return;
+			}
 
-	// Null elements to avoid leaks in IE
-	fragment = select = opt = marginDiv = div = input = null;
+			conMarginTop = 1;
+			ptlm = "position:absolute;top:0;left:0;width:1px;height:1px;margin:0;";
+			vb = "visibility:hidden;border:0;";
+			style = "style='" + ptlm + "border:5px solid #000;padding:0;'";
+			html = "<div " + style + "><div></div></div>" +
+				"<table " + style + " cellpadding='0' cellspacing='0'>" +
+				"<tr><td></td></tr></table>";
+
+			container = document.createElement("div");
+			container.style.cssText = vb + "width:0;height:0;position:static;top:0;margin-top:" + conMarginTop + "px";
+			body.insertBefore(container, body.firstChild);
+
+			// Construct the test element
+			div = document.createElement("div");
+			container.appendChild(div);
+
+			// Check if table cells still have offsetWidth/Height when they are set
+			// to display:none and there are still other visible table cells in a
+			// table row; if so, offsetWidth/Height are not reliable for use when
+			// determining if an element has been hidden directly using
+			// display:none (it is still safe to use offsets if a parent element is
+			// hidden; don safety goggles and see bug #4512 for more information).
+			// (only IE 8 fails this test)
+			div.innerHTML = "<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";
+			tds = div.getElementsByTagName("td");
+			isSupported = (tds[0].offsetHeight === 0);
+
+			tds[0].style.display = "";
+			tds[1].style.display = "none";
+
+			// Check if empty table cells still have offsetWidth/Height
+			// (IE <= 8 fail this test)
+			support.reliableHiddenOffsets = isSupported && (tds[0].offsetHeight === 0);
+
+			// Figure out if the W3C box model works as expected
+			div.innerHTML = "";
+			div.style.width = div.style.paddingLeft = "1px";
+			jQuery.boxModel = support.boxModel = div.offsetWidth === 2;
+
+			if (typeof div.style.zoom !== "undefined") {
+				// Check if natively block-level elements act like inline-block
+				// elements when setting their display to 'inline' and giving
+				// them layout
+				// (IE < 8 does this)
+				div.style.display = "inline";
+				div.style.zoom = 1;
+				support.inlineBlockNeedsLayout = (div.offsetWidth === 2);
+
+				// Check if elements with layout shrink-wrap their children
+				// (IE 6 does this)
+				div.style.display = "";
+				div.innerHTML = "<div style='width:4px;'></div>";
+				support.shrinkWrapBlocks = (div.offsetWidth !== 2);
+			}
+
+			div.style.cssText = ptlm + vb;
+			div.innerHTML = html;
+
+			outer = div.firstChild;
+			inner = outer.firstChild;
+			td = outer.nextSibling.firstChild.firstChild;
+
+			offsetSupport = {
+				doesNotAddBorder: (inner.offsetTop !== 5),
+				doesAddBorderForTableAndCells: (td.offsetTop === 5)
+			};
 
-	// Run tests that need a body at doc ready
-	jQuery(function() {
-		var container, outer, inner, table, td, offsetSupport,
-			conMarginTop, ptlm, vb, style, html,
-			body = document.getElementsByTagName("body")[0];
+			inner.style.position = "fixed";
+			inner.style.top = "20px";
 
-		if ( !body ) {
-			// Return for frameset docs that don't have a body
-			return;
-		}
+			// safari subtracts parent border width here which is 5px
+			offsetSupport.fixedPosition = (inner.offsetTop === 20 || inner.offsetTop === 15);
+			inner.style.position = inner.style.top = "";
 
-		conMarginTop = 1;
-		ptlm = "position:absolute;top:0;left:0;width:1px;height:1px;margin:0;";
-		vb = "visibility:hidden;border:0;";
-		style = "style='" + ptlm + "border:5px solid #000;padding:0;'";
-		html = "<div " + style + "><div></div></div>" +
-			"<table " + style + " cellpadding='0' cellspacing='0'>" +
-			"<tr><td></td></tr></table>";
-
-		container = document.createElement("div");
-		container.style.cssText = vb + "width:0;height:0;position:static;top:0;margin-top:" + conMarginTop + "px";
-		body.insertBefore( container, body.firstChild );
-
-		// Construct the test element
-		div = document.createElement("div");
-		container.appendChild( div );
-
-		// Check if table cells still have offsetWidth/Height when they are set
-		// to display:none and there are still other visible table cells in a
-		// table row; if so, offsetWidth/Height are not reliable for use when
-		// determining if an element has been hidden directly using
-		// display:none (it is still safe to use offsets if a parent element is
-		// hidden; don safety goggles and see bug #4512 for more information).
-		// (only IE 8 fails this test)
-		div.innerHTML = "<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";
-		tds = div.getElementsByTagName( "td" );
-		isSupported = ( tds[ 0 ].offsetHeight === 0 );
-
-		tds[ 0 ].style.display = "";
-		tds[ 1 ].style.display = "none";
-
-		// Check if empty table cells still have offsetWidth/Height
-		// (IE <= 8 fail this test)
-		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
-
-		// Figure out if the W3C box model works as expected
-		div.innerHTML = "";
-		div.style.width = div.style.paddingLeft = "1px";
-		jQuery.boxModel = support.boxModel = div.offsetWidth === 2;
-
-		if ( typeof div.style.zoom !== "undefined" ) {
-			// Check if natively block-level elements act like inline-block
-			// elements when setting their display to 'inline' and giving
-			// them layout
-			// (IE < 8 does this)
-			div.style.display = "inline";
-			div.style.zoom = 1;
-			support.inlineBlockNeedsLayout = ( div.offsetWidth === 2 );
-
-			// Check if elements with layout shrink-wrap their children
-			// (IE 6 does this)
-			div.style.display = "";
-			div.innerHTML = "<div style='width:4px;'></div>";
-			support.shrinkWrapBlocks = ( div.offsetWidth !== 2 );
-		}
+			outer.style.overflow = "hidden";
+			outer.style.position = "relative";
 
-		div.style.cssText = ptlm + vb;
-		div.innerHTML = html;
+			offsetSupport.subtractsBorderForOverflowNotVisible = (inner.offsetTop === -5);
+			offsetSupport.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== conMarginTop);
 
-		outer = div.firstChild;
-		inner = outer.firstChild;
-		td = outer.nextSibling.firstChild.firstChild;
+			body.removeChild(container);
+			div = container = null;
 
-		offsetSupport = {
-			doesNotAddBorder: ( inner.offsetTop !== 5 ),
-			doesAddBorderForTableAndCells: ( td.offsetTop === 5 )
-		};
+			jQuery.extend(support, offsetSupport);
+		});
 
-		inner.style.position = "fixed";
-		inner.style.top = "20px";
+		return support;
+	})();
 
-		// safari subtracts parent border width here which is 5px
-		offsetSupport.fixedPosition = ( inner.offsetTop === 20 || inner.offsetTop === 15 );
-		inner.style.position = inner.style.top = "";
 
-		outer.style.overflow = "hidden";
-		outer.style.position = "relative";
+	var rbrace = /^(?:\{.*\}|\[.*\])$/,
+		rmultiDash = /([A-Z])/g;
 
-		offsetSupport.subtractsBorderForOverflowNotVisible = ( inner.offsetTop === -5 );
-		offsetSupport.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== conMarginTop );
+	jQuery.extend({
+		cache: {},
 
-		body.removeChild( container );
-		div  = container = null;
+		// Please use with caution
+		uuid: 0,
 
-		jQuery.extend( support, offsetSupport );
-	});
+		// Unique for each copy of jQuery on the page
+		// Non-digits removed to match rinlinejQuery
+		expando: "jQuery" + (jQuery.fn.jquery + Math.random()).replace(/\D/g, ""),
 
-	return support;
-})();
+		// The following elements throw uncatchable exceptions if you
+		// attempt to add expando properties to them.
+		noData: {
+			"embed": true,
+			// Ban all objects except for Flash (which handle expandos)
+			"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
+			"applet": true
+		},
 
+		hasData: function (elem) {
+			elem = elem.nodeType ? jQuery.cache[elem[jQuery.expando]] : elem[jQuery.expando];
+			return !!elem && !isEmptyDataObject(elem);
+		},
 
+		data: function (elem, name, data, pvt /* Internal Use Only */) {
+			if (!jQuery.acceptData(elem)) {
+				return;
+			}
 
+			var privateCache, thisCache, ret,
+				internalKey = jQuery.expando,
+				getByName = typeof name === "string",
 
-var rbrace = /^(?:\{.*\}|\[.*\])$/,
-	rmultiDash = /([A-Z])/g;
+				// We have to handle DOM nodes and JS objects differently because IE6-7
+				// can't GC object references properly across the DOM-JS boundary
+				isNode = elem.nodeType,
 
-jQuery.extend({
-	cache: {},
+				// Only DOM nodes need the global jQuery cache; JS object data is
+				// attached directly to the object so GC can occur automatically
+				cache = isNode ? jQuery.cache : elem,
 
-	// Please use with caution
-	uuid: 0,
+				// Only defining an ID for JS objects if its cache already exists allows
+				// the code to shortcut on the same path as a DOM node with no cache
+				id = isNode ? elem[internalKey] : elem[internalKey] && internalKey,
+				isEvents = name === "events";
 
-	// Unique for each copy of jQuery on the page
-	// Non-digits removed to match rinlinejQuery
-	expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ),
+			// Avoid doing any more work than we need to when trying to get data on an
+			// object that has no data at all
+			if ((!id || !cache[id] || (!isEvents && !pvt && !cache[id].data)) && getByName && data === undefined) {
+				return;
+			}
 
-	// The following elements throw uncatchable exceptions if you
-	// attempt to add expando properties to them.
-	noData: {
-		"embed": true,
-		// Ban all objects except for Flash (which handle expandos)
-		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
-		"applet": true
-	},
+			if (!id) {
+				// Only DOM nodes need a new unique ID for each element since their data
+				// ends up in the global cache
+				if (isNode) {
+					elem[internalKey] = id = ++jQuery.uuid;
+				} else {
+					id = internalKey;
+				}
+			}
 
-	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
-		return !!elem && !isEmptyDataObject( elem );
-	},
+			if (!cache[id]) {
+				cache[id] = {};
 
-	data: function( elem, name, data, pvt /* Internal Use Only */ ) {
-		if ( !jQuery.acceptData( elem ) ) {
-			return;
-		}
+				// Avoids exposing jQuery metadata on plain JS objects when the object
+				// is serialized using JSON.stringify
+				if (!isNode) {
+					cache[id].toJSON = jQuery.noop;
+				}
+			}
 
-		var privateCache, thisCache, ret,
-			internalKey = jQuery.expando,
-			getByName = typeof name === "string",
+			// An object can be passed to jQuery.data instead of a key/value pair; this gets
+			// shallow copied over onto the existing cache
+			if (typeof name === "object" || typeof name === "function") {
+				if (pvt) {
+					cache[id] = jQuery.extend(cache[id], name);
+				} else {
+					cache[id].data = jQuery.extend(cache[id].data, name);
+				}
+			}
 
-			// We have to handle DOM nodes and JS objects differently because IE6-7
-			// can't GC object references properly across the DOM-JS boundary
-			isNode = elem.nodeType,
+			privateCache = thisCache = cache[id];
 
-			// Only DOM nodes need the global jQuery cache; JS object data is
-			// attached directly to the object so GC can occur automatically
-			cache = isNode ? jQuery.cache : elem,
+			// jQuery data() is stored in a separate object inside the object's internal data
+			// cache in order to avoid key collisions between internal data and user-defined
+			// data.
+			if (!pvt) {
+				if (!thisCache.data) {
+					thisCache.data = {};
+				}
 
-			// Only defining an ID for JS objects if its cache already exists allows
-			// the code to shortcut on the same path as a DOM node with no cache
-			id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey,
-			isEvents = name === "events";
+				thisCache = thisCache.data;
+			}
 
-		// Avoid doing any more work than we need to when trying to get data on an
-		// object that has no data at all
-		if ( (!id || !cache[id] || (!isEvents && !pvt && !cache[id].data)) && getByName && data === undefined ) {
-			return;
-		}
+			if (data !== undefined) {
+				thisCache[jQuery.camelCase(name)] = data;
+			}
 
-		if ( !id ) {
-			// Only DOM nodes need a new unique ID for each element since their data
-			// ends up in the global cache
-			if ( isNode ) {
-				elem[ internalKey ] = id = ++jQuery.uuid;
-			} else {
-				id = internalKey;
+			// Users should not attempt to inspect the internal events object using jQuery.data,
+			// it is undocumented and subject to change. But does anyone listen? No.
+			if (isEvents && !thisCache[name]) {
+				return privateCache.events;
 			}
-		}
 
-		if ( !cache[ id ] ) {
-			cache[ id ] = {};
+			// Check for both converted-to-camel and non-converted data property names
+			// If a data property was specified
+			if (getByName) {
 
-			// Avoids exposing jQuery metadata on plain JS objects when the object
-			// is serialized using JSON.stringify
-			if ( !isNode ) {
-				cache[ id ].toJSON = jQuery.noop;
-			}
-		}
+				// First Try to find as-is property data
+				ret = thisCache[name];
+
+				// Test for null|undefined property data
+				if (ret == null) {
 
-		// An object can be passed to jQuery.data instead of a key/value pair; this gets
-		// shallow copied over onto the existing cache
-		if ( typeof name === "object" || typeof name === "function" ) {
-			if ( pvt ) {
-				cache[ id ] = jQuery.extend( cache[ id ], name );
+					// Try to find the camelCased property
+					ret = thisCache[jQuery.camelCase(name)];
+				}
 			} else {
-				cache[ id ].data = jQuery.extend( cache[ id ].data, name );
+				ret = thisCache;
 			}
-		}
 
-		privateCache = thisCache = cache[ id ];
+			return ret;
+		},
 
-		// jQuery data() is stored in a separate object inside the object's internal data
-		// cache in order to avoid key collisions between internal data and user-defined
-		// data.
-		if ( !pvt ) {
-			if ( !thisCache.data ) {
-				thisCache.data = {};
+		removeData: function (elem, name, pvt /* Internal Use Only */) {
+			if (!jQuery.acceptData(elem)) {
+				return;
 			}
 
-			thisCache = thisCache.data;
-		}
-
-		if ( data !== undefined ) {
-			thisCache[ jQuery.camelCase( name ) ] = data;
-		}
+			var thisCache, i, l,
 
-		// Users should not attempt to inspect the internal events object using jQuery.data,
-		// it is undocumented and subject to change. But does anyone listen? No.
-		if ( isEvents && !thisCache[ name ] ) {
-			return privateCache.events;
-		}
+				// Reference to internal data cache key
+				internalKey = jQuery.expando,
 
-		// Check for both converted-to-camel and non-converted data property names
-		// If a data property was specified
-		if ( getByName ) {
+				isNode = elem.nodeType,
 
-			// First Try to find as-is property data
-			ret = thisCache[ name ];
+				// See jQuery.data for more information
+				cache = isNode ? jQuery.cache : elem,
 
-			// Test for null|undefined property data
-			if ( ret == null ) {
+				// See jQuery.data for more information
+				id = isNode ? elem[internalKey] : internalKey;
 
-				// Try to find the camelCased property
-				ret = thisCache[ jQuery.camelCase( name ) ];
+			// If there is already no cache entry for this object, there is no
+			// purpose in continuing
+			if (!cache[id]) {
+				return;
 			}
-		} else {
-			ret = thisCache;
-		}
 
-		return ret;
-	},
+			if (name) {
 
-	removeData: function( elem, name, pvt /* Internal Use Only */ ) {
-		if ( !jQuery.acceptData( elem ) ) {
-			return;
-		}
+				thisCache = pvt ? cache[id] : cache[id].data;
 
-		var thisCache, i, l,
+				if (thisCache) {
 
-			// Reference to internal data cache key
-			internalKey = jQuery.expando,
+					// Support array or space separated string names for data keys
+					if (!jQuery.isArray(name)) {
 
-			isNode = elem.nodeType,
+						// try the string as a key before any manipulation
+						if (name in thisCache) {
+							name = [name];
+						} else {
 
-			// See jQuery.data for more information
-			cache = isNode ? jQuery.cache : elem,
+							// split the camel cased version by spaces unless a key with the spaces exists
+							name = jQuery.camelCase(name);
+							if (name in thisCache) {
+								name = [name];
+							} else {
+								name = name.split(" ");
+							}
+						}
+					}
 
-			// See jQuery.data for more information
-			id = isNode ? elem[ internalKey ] : internalKey;
-
-		// If there is already no cache entry for this object, there is no
-		// purpose in continuing
-		if ( !cache[ id ] ) {
-			return;
-		}
-
-		if ( name ) {
-
-			thisCache = pvt ? cache[ id ] : cache[ id ].data;
-
-			if ( thisCache ) {
-
-				// Support array or space separated string names for data keys
-				if ( !jQuery.isArray( name ) ) {
-
-					// try the string as a key before any manipulation
-					if ( name in thisCache ) {
-						name = [ name ];
-					} else {
+					for (i = 0, l = name.length; i < l; i++) {
+						delete thisCache[name[i]];
+					}
 
-						// split the camel cased version by spaces unless a key with the spaces exists
-						name = jQuery.camelCase( name );
-						if ( name in thisCache ) {
-							name = [ name ];
-						} else {
-							name = name.split( " " );
-						}
+					// If there is no data left in the cache, we want to continue
+					// and let the cache object itself get destroyed
+					if (!(pvt ? isEmptyDataObject : jQuery.isEmptyObject)(thisCache)) {
+						return;
 					}
 				}
+			}
 
-				for ( i = 0, l = name.length; i < l; i++ ) {
-					delete thisCache[ name[i] ];
-				}
+			// See jQuery.data for more information
+			if (!pvt) {
+				delete cache[id].data;
 
-				// If there is no data left in the cache, we want to continue
-				// and let the cache object itself get destroyed
-				if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) {
+				// Don't destroy the parent cache unless the internal data object
+				// had been the only thing left in it
+				if (!isEmptyDataObject(cache[id])) {
 					return;
 				}
 			}
-		}
-
-		// See jQuery.data for more information
-		if ( !pvt ) {
-			delete cache[ id ].data;
-
-			// Don't destroy the parent cache unless the internal data object
-			// had been the only thing left in it
-			if ( !isEmptyDataObject(cache[ id ]) ) {
-				return;
-			}
-		}
-
-		// Browsers that fail expando deletion also refuse to delete expandos on
-		// the window, but it will allow it on all other JS objects; other browsers
-		// don't care
-		// Ensure that `cache` is not a window object #10080
-		if ( jQuery.support.deleteExpando || !cache.setInterval ) {
-			delete cache[ id ];
-		} else {
-			cache[ id ] = null;
-		}
 
-		// We destroyed the cache and need to eliminate the expando on the node to avoid
-		// false lookups in the cache for entries that no longer exist
-		if ( isNode ) {
-			// IE does not allow us to delete expando properties from nodes,
-			// nor does it have a removeAttribute function on Document nodes;
-			// we must handle all of these cases
-			if ( jQuery.support.deleteExpando ) {
-				delete elem[ internalKey ];
-			} else if ( elem.removeAttribute ) {
-				elem.removeAttribute( internalKey );
+			// Browsers that fail expando deletion also refuse to delete expandos on
+			// the window, but it will allow it on all other JS objects; other browsers
+			// don't care
+			// Ensure that `cache` is not a window object #10080
+			if (jQuery.support.deleteExpando || !cache.setInterval) {
+				delete cache[id];
 			} else {
-				elem[ internalKey ] = null;
+				cache[id] = null;
+			}
+
+			// We destroyed the cache and need to eliminate the expando on the node to avoid
+			// false lookups in the cache for entries that no longer exist
+			if (isNode) {
+				// IE does not allow us to delete expando properties from nodes,
+				// nor does it have a removeAttribute function on Document nodes;
+				// we must handle all of these cases
+				if (jQuery.support.deleteExpando) {
+					delete elem[internalKey];
+				} else if (elem.removeAttribute) {
+					elem.removeAttribute(internalKey);
+				} else {
+					elem[internalKey] = null;
+				}
 			}
-		}
-	},
+		},
 
-	// For internal use only.
-	_data: function( elem, name, data ) {
-		return jQuery.data( elem, name, data, true );
-	},
+		// For internal use only.
+		_data: function (elem, name, data) {
+			return jQuery.data(elem, name, data, true);
+		},
 
-	// A method for determining if a DOM node can handle the data expando
-	acceptData: function( elem ) {
-		if ( elem.nodeName ) {
-			var match = jQuery.noData[ elem.nodeName.toLowerCase() ];
+		// A method for determining if a DOM node can handle the data expando
+		acceptData: function (elem) {
+			if (elem.nodeName) {
+				var match = jQuery.noData[elem.nodeName.toLowerCase()];
 
-			if ( match ) {
-				return !(match === true || elem.getAttribute("classid") !== match);
+				if (match) {
+					return !(match === true || elem.getAttribute("classid") !== match);
+				}
 			}
-		}
 
-		return true;
-	}
-});
+			return true;
+		}
+	});
 
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var parts, attr, name,
-			data = null;
+	jQuery.fn.extend({
+		data: function (key, value) {
+			var parts, attr, name,
+				data = null;
 
-		if ( typeof key === "undefined" ) {
-			if ( this.length ) {
-				data = jQuery.data( this[0] );
+			if (typeof key === "undefined") {
+				if (this.length) {
+					data = jQuery.data(this[0]);
 
-				if ( this[0].nodeType === 1 && !jQuery._data( this[0], "parsedAttrs" ) ) {
-					attr = this[0].attributes;
-					for ( var i = 0, l = attr.length; i < l; i++ ) {
-						name = attr[i].name;
+					if (this[0].nodeType === 1 && !jQuery._data(this[0], "parsedAttrs")) {
+						attr = this[0].attributes;
+						for (var i = 0, l = attr.length; i < l; i++) {
+							name = attr[i].name;
 
-						if ( name.indexOf( "data-" ) === 0 ) {
-							name = jQuery.camelCase( name.substring(5) );
+							if (name.indexOf("data-") === 0) {
+								name = jQuery.camelCase(name.substring(5));
 
-							dataAttr( this[0], name, data[ name ] );
+								dataAttr(this[0], name, data[name]);
+							}
 						}
+						jQuery._data(this[0], "parsedAttrs", true);
 					}
-					jQuery._data( this[0], "parsedAttrs", true );
 				}
-			}
 
-			return data;
+				return data;
 
-		} else if ( typeof key === "object" ) {
-			return this.each(function() {
-				jQuery.data( this, key );
-			});
-		}
+			} else if (typeof key === "object") {
+				return this.each(function () {
+					jQuery.data(this, key);
+				});
+			}
 
-		parts = key.split(".");
-		parts[1] = parts[1] ? "." + parts[1] : "";
+			parts = key.split(".");
+			parts[1] = parts[1] ? "." + parts[1] : "";
 
-		if ( value === undefined ) {
-			data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+			if (value === undefined) {
+				data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
 
-			// Try to fetch any internally stored data first
-			if ( data === undefined && this.length ) {
-				data = jQuery.data( this[0], key );
-				data = dataAttr( this[0], key, data );
-			}
+				// Try to fetch any internally stored data first
+				if (data === undefined && this.length) {
+					data = jQuery.data(this[0], key);
+					data = dataAttr(this[0], key, data);
+				}
 
-			return data === undefined && parts[1] ?
-				this.data( parts[0] ) :
-				data;
+				return data === undefined && parts[1] ?
+					this.data(parts[0]) :
+					data;
 
-		} else {
-			return this.each(function() {
-				var self = jQuery( this ),
-					args = [ parts[0], value ];
+			} else {
+				return this.each(function () {
+					var self = jQuery(this),
+						args = [parts[0], value];
 
-				self.triggerHandler( "setData" + parts[1] + "!", args );
-				jQuery.data( this, key, value );
-				self.triggerHandler( "changeData" + parts[1] + "!", args );
+					self.triggerHandler("setData" + parts[1] + "!", args);
+					jQuery.data(this, key, value);
+					self.triggerHandler("changeData" + parts[1] + "!", args);
+				});
+			}
+		},
+
+		removeData: function (key) {
+			return this.each(function () {
+				jQuery.removeData(this, key);
 			});
 		}
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			jQuery.removeData( this, key );
-		});
-	}
-});
+	});
 
-function dataAttr( elem, key, data ) {
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
+	function dataAttr(elem, key, data) {
+		// If nothing was found internally, try to fetch any
+		// data from the HTML5 data-* attribute
+		if (data === undefined && elem.nodeType === 1) {
 
-		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
+			var name = "data-" + key.replace(rmultiDash, "-$1").toLowerCase();
 
-		data = elem.getAttribute( name );
+			data = elem.getAttribute(name);
 
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-				data === "false" ? false :
-				data === "null" ? null :
-				jQuery.isNumeric( data ) ? parseFloat( data ) :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
-			} catch( e ) {}
+			if (typeof data === "string") {
+				try {
+					data = data === "true" ? true :
+						data === "false" ? false :
+							data === "null" ? null :
+								jQuery.isNumeric(data) ? parseFloat(data) :
+									rbrace.test(data) ? jQuery.parseJSON(data) :
+										data;
+				} catch (e) {
+				}
 
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
+				// Make sure we set the data so it isn't changed later
+				jQuery.data(elem, key, data);
 
-		} else {
-			data = undefined;
+			} else {
+				data = undefined;
+			}
 		}
-	}
 
-	return data;
-}
+		return data;
+	}
 
 // checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
-	for ( var name in obj ) {
+	function isEmptyDataObject(obj) {
+		for (var name in obj) {
 
-		// if the public data object is empty, the private is still empty
-		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
-			continue;
-		}
-		if ( name !== "toJSON" ) {
-			return false;
+			// if the public data object is empty, the private is still empty
+			if (name === "data" && jQuery.isEmptyObject(obj[name])) {
+				continue;
+			}
+			if (name !== "toJSON") {
+				return false;
+			}
 		}
-	}
 
-	return true;
-}
+		return true;
+	}
 
 
+	function handleQueueMarkDefer(elem, type, src) {
+		var deferDataKey = type + "defer",
+			queueDataKey = type + "queue",
+			markDataKey = type + "mark",
+			defer = jQuery._data(elem, deferDataKey);
+		if (defer &&
+			(src === "queue" || !jQuery._data(elem, queueDataKey)) &&
+			(src === "mark" || !jQuery._data(elem, markDataKey))) {
+			// Give room for hard-coded callbacks to fire first
+			// and eventually mark/queue something else on the element
+			setTimeout(function () {
+				if (!jQuery._data(elem, queueDataKey) &&
+					!jQuery._data(elem, markDataKey)) {
+					jQuery.removeData(elem, deferDataKey, true);
+					defer.fire();
+				}
+			}, 0);
+		}
+	}
 
+	jQuery.extend({
 
-function handleQueueMarkDefer( elem, type, src ) {
-	var deferDataKey = type + "defer",
-		queueDataKey = type + "queue",
-		markDataKey = type + "mark",
-		defer = jQuery._data( elem, deferDataKey );
-	if ( defer &&
-		( src === "queue" || !jQuery._data(elem, queueDataKey) ) &&
-		( src === "mark" || !jQuery._data(elem, markDataKey) ) ) {
-		// Give room for hard-coded callbacks to fire first
-		// and eventually mark/queue something else on the element
-		setTimeout( function() {
-			if ( !jQuery._data( elem, queueDataKey ) &&
-				!jQuery._data( elem, markDataKey ) ) {
-				jQuery.removeData( elem, deferDataKey, true );
-				defer.fire();
+		_mark: function (elem, type) {
+			if (elem) {
+				type = (type || "fx") + "mark";
+				jQuery._data(elem, type, (jQuery._data(elem, type) || 0) + 1);
 			}
-		}, 0 );
-	}
-}
+		},
 
-jQuery.extend({
+		_unmark: function (force, elem, type) {
+			if (force !== true) {
+				type = elem;
+				elem = force;
+				force = false;
+			}
+			if (elem) {
+				type = type || "fx";
+				var key = type + "mark",
+					count = force ? 0 : ((jQuery._data(elem, key) || 1) - 1);
+				if (count) {
+					jQuery._data(elem, key, count);
+				} else {
+					jQuery.removeData(elem, key, true);
+					handleQueueMarkDefer(elem, type, "mark");
+				}
+			}
+		},
 
-	_mark: function( elem, type ) {
-		if ( elem ) {
-			type = ( type || "fx" ) + "mark";
-			jQuery._data( elem, type, (jQuery._data( elem, type ) || 0) + 1 );
-		}
-	},
+		queue: function (elem, type, data) {
+			var q;
+			if (elem) {
+				type = (type || "fx") + "queue";
+				q = jQuery._data(elem, type);
 
-	_unmark: function( force, elem, type ) {
-		if ( force !== true ) {
-			type = elem;
-			elem = force;
-			force = false;
-		}
-		if ( elem ) {
-			type = type || "fx";
-			var key = type + "mark",
-				count = force ? 0 : ( (jQuery._data( elem, key ) || 1) - 1 );
-			if ( count ) {
-				jQuery._data( elem, key, count );
-			} else {
-				jQuery.removeData( elem, key, true );
-				handleQueueMarkDefer( elem, type, "mark" );
-			}
-		}
-	},
-
-	queue: function( elem, type, data ) {
-		var q;
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			q = jQuery._data( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !q || jQuery.isArray(data) ) {
-					q = jQuery._data( elem, type, jQuery.makeArray(data) );
-				} else {
-					q.push( data );
+				// Speed up dequeue by getting out quickly if this is just a lookup
+				if (data) {
+					if (!q || jQuery.isArray(data)) {
+						q = jQuery._data(elem, type, jQuery.makeArray(data));
+					} else {
+						q.push(data);
+					}
 				}
+				return q || [];
 			}
-			return q || [];
-		}
-	},
+		},
 
-	dequeue: function( elem, type ) {
-		type = type || "fx";
+		dequeue: function (elem, type) {
+			type = type || "fx";
 
-		var queue = jQuery.queue( elem, type ),
-			fn = queue.shift(),
-			hooks = {};
+			var queue = jQuery.queue(elem, type),
+				fn = queue.shift(),
+				hooks = {};
 
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-		}
+			// If the fx queue is dequeued, always remove the progress sentinel
+			if (fn === "inprogress") {
+				fn = queue.shift();
+			}
+
+			if (fn) {
+				// Add a progress sentinel to prevent the fx queue from being
+				// automatically dequeued
+				if (type === "fx") {
+					queue.unshift("inprogress");
+				}
 
-		if ( fn ) {
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
+				jQuery._data(elem, type + ".run", hooks);
+				fn.call(elem, function () {
+					jQuery.dequeue(elem, type);
+				}, hooks);
 			}
 
-			jQuery._data( elem, type + ".run", hooks );
-			fn.call( elem, function() {
-				jQuery.dequeue( elem, type );
-			}, hooks );
+			if (!queue.length) {
+				jQuery.removeData(elem, type + "queue " + type + ".run", true);
+				handleQueueMarkDefer(elem, type, "queue");
+			}
 		}
+	});
 
-		if ( !queue.length ) {
-			jQuery.removeData( elem, type + "queue " + type + ".run", true );
-			handleQueueMarkDefer( elem, type, "queue" );
-		}
-	}
-});
+	jQuery.fn.extend({
+		queue: function (type, data) {
+			if (typeof type !== "string") {
+				data = type;
+				type = "fx";
+			}
 
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-		}
+			if (data === undefined) {
+				return jQuery.queue(this[0], type);
+			}
+			return this.each(function () {
+				var queue = jQuery.queue(this, type, data);
 
-		if ( data === undefined ) {
-			return jQuery.queue( this[0], type );
-		}
-		return this.each(function() {
-			var queue = jQuery.queue( this, type, data );
+				if (type === "fx" && queue[0] !== "inprogress") {
+					jQuery.dequeue(this, type);
+				}
+			});
+		},
+		dequeue: function (type) {
+			return this.each(function () {
+				jQuery.dequeue(this, type);
+			});
+		},
+		// Based off of the plugin by Clint Helfers, with permission.
+		// http://blindsignals.com/index.php/2009/07/jquery-delay/
+		delay: function (time, type) {
+			time = jQuery.fx ? jQuery.fx.speeds[time] || time : time;
+			type = type || "fx";
 
-			if ( type === "fx" && queue[0] !== "inprogress" ) {
-				jQuery.dequeue( this, type );
+			return this.queue(type, function (next, hooks) {
+				var timeout = setTimeout(next, time);
+				hooks.stop = function () {
+					clearTimeout(timeout);
+				};
+			});
+		},
+		clearQueue: function (type) {
+			return this.queue(type || "fx", []);
+		},
+		// Get a promise resolved when queues of a certain type
+		// are emptied (fx is the type by default)
+		promise: function (type, object) {
+			if (typeof type !== "string") {
+				object = type;
+				type = undefined;
 			}
-		});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	// Based off of the plugin by Clint Helfers, with permission.
-	// http://blindsignals.com/index.php/2009/07/jquery-delay/
-	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-		type = type || "fx";
-
-		return this.queue( type, function( next, hooks ) {
-			var timeout = setTimeout( next, time );
-			hooks.stop = function() {
-				clearTimeout( timeout );
-			};
-		});
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, object ) {
-		if ( typeof type !== "string" ) {
-			object = type;
-			type = undefined;
-		}
-		type = type || "fx";
-		var defer = jQuery.Deferred(),
-			elements = this,
-			i = elements.length,
-			count = 1,
-			deferDataKey = type + "defer",
-			queueDataKey = type + "queue",
-			markDataKey = type + "mark",
-			tmp;
-		function resolve() {
-			if ( !( --count ) ) {
-				defer.resolveWith( elements, [ elements ] );
+			type = type || "fx";
+			var defer = jQuery.Deferred(),
+				elements = this,
+				i = elements.length,
+				count = 1,
+				deferDataKey = type + "defer",
+				queueDataKey = type + "queue",
+				markDataKey = type + "mark",
+				tmp;
+
+			function resolve() {
+				if (!(--count)) {
+					defer.resolveWith(elements, [elements]);
+				}
 			}
-		}
-		while( i-- ) {
-			if (( tmp = jQuery.data( elements[ i ], deferDataKey, undefined, true ) ||
-					( jQuery.data( elements[ i ], queueDataKey, undefined, true ) ||
-						jQuery.data( elements[ i ], markDataKey, undefined, true ) ) &&
-					jQuery.data( elements[ i ], deferDataKey, jQuery.Callbacks( "once memory" ), true ) )) {
-				count++;
-				tmp.add( resolve );
+
+			while (i--) {
+				if ((tmp = jQuery.data(elements[i], deferDataKey, undefined, true) ||
+					(jQuery.data(elements[i], queueDataKey, undefined, true) ||
+						jQuery.data(elements[i], markDataKey, undefined, true)) &&
+					jQuery.data(elements[i], deferDataKey, jQuery.Callbacks("once memory"), true))) {
+					count++;
+					tmp.add(resolve);
+				}
 			}
+			resolve();
+			return defer.promise();
 		}
-		resolve();
-		return defer.promise();
-	}
-});
-
-
+	});
 
 
-var rclass = /[\n\t\r]/g,
-	rspace = /\s+/,
-	rreturn = /\r/g,
-	rtype = /^(?:button|input)$/i,
-	rfocusable = /^(?:button|input|object|select|textarea)$/i,
-	rclickable = /^a(?:rea)?$/i,
-	rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
-	getSetAttribute = jQuery.support.getSetAttribute,
-	nodeHook, boolHook, fixSpecified;
+	var rclass = /[\n\t\r]/g,
+		rspace = /\s+/,
+		rreturn = /\r/g,
+		rtype = /^(?:button|input)$/i,
+		rfocusable = /^(?:button|input|object|select|textarea)$/i,
+		rclickable = /^a(?:rea)?$/i,
+		rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
+		getSetAttribute = jQuery.support.getSetAttribute,
+		nodeHook, boolHook, fixSpecified;
 
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return jQuery.access( this, name, value, true, jQuery.attr );
-	},
+	jQuery.fn.extend({
+		attr: function (name, value) {
+			return jQuery.access(this, name, value, true, jQuery.attr);
+		},
 
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	},
+		removeAttr: function (name) {
+			return this.each(function () {
+				jQuery.removeAttr(this, name);
+			});
+		},
 
-	prop: function( name, value ) {
-		return jQuery.access( this, name, value, true, jQuery.prop );
-	},
+		prop: function (name, value) {
+			return jQuery.access(this, name, value, true, jQuery.prop);
+		},
 
-	removeProp: function( name ) {
-		name = jQuery.propFix[ name ] || name;
-		return this.each(function() {
-			// try/catch handles cases where IE balks (such as removing a property on window)
-			try {
-				this[ name ] = undefined;
-				delete this[ name ];
-			} catch( e ) {}
-		});
-	},
+		removeProp: function (name) {
+			name = jQuery.propFix[name] || name;
+			return this.each(function () {
+				// try/catch handles cases where IE balks (such as removing a property on window)
+				try {
+					this[name] = undefined;
+					delete this[name];
+				} catch (e) {
+				}
+			});
+		},
 
-	addClass: function( value ) {
-		var classNames, i, l, elem,
-			setClass, c, cl;
+		addClass: function (value) {
+			var classNames, i, l, elem,
+				setClass, c, cl;
 
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call(this, j, this.className) );
-			});
-		}
+			if (jQuery.isFunction(value)) {
+				return this.each(function (j) {
+					jQuery(this).addClass(value.call(this, j, this.className));
+				});
+			}
 
-		if ( value && typeof value === "string" ) {
-			classNames = value.split( rspace );
+			if (value && typeof value === "string") {
+				classNames = value.split(rspace);
 
-			for ( i = 0, l = this.length; i < l; i++ ) {
-				elem = this[ i ];
+				for (i = 0, l = this.length; i < l; i++) {
+					elem = this[i];
 
-				if ( elem.nodeType === 1 ) {
-					if ( !elem.className && classNames.length === 1 ) {
-						elem.className = value;
+					if (elem.nodeType === 1) {
+						if (!elem.className && classNames.length === 1) {
+							elem.className = value;
 
-					} else {
-						setClass = " " + elem.className + " ";
+						} else {
+							setClass = " " + elem.className + " ";
 
-						for ( c = 0, cl = classNames.length; c < cl; c++ ) {
-							if ( !~setClass.indexOf( " " + classNames[ c ] + " " ) ) {
-								setClass += classNames[ c ] + " ";
+							for (c = 0, cl = classNames.length; c < cl; c++) {
+								if (!~setClass.indexOf(" " + classNames[c] + " ")) {
+									setClass += classNames[c] + " ";
+								}
 							}
+							elem.className = jQuery.trim(setClass);
 						}
-						elem.className = jQuery.trim( setClass );
 					}
 				}
 			}
-		}
 
-		return this;
-	},
+			return this;
+		},
 
-	removeClass: function( value ) {
-		var classNames, i, l, elem, className, c, cl;
+		removeClass: function (value) {
+			var classNames, i, l, elem, className, c, cl;
 
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call(this, j, this.className) );
-			});
-		}
+			if (jQuery.isFunction(value)) {
+				return this.each(function (j) {
+					jQuery(this).removeClass(value.call(this, j, this.className));
+				});
+			}
 
-		if ( (value && typeof value === "string") || value === undefined ) {
-			classNames = ( value || "" ).split( rspace );
+			if ((value && typeof value === "string") || value === undefined) {
+				classNames = (value || "").split(rspace);
 
-			for ( i = 0, l = this.length; i < l; i++ ) {
-				elem = this[ i ];
+				for (i = 0, l = this.length; i < l; i++) {
+					elem = this[i];
 
-				if ( elem.nodeType === 1 && elem.className ) {
-					if ( value ) {
-						className = (" " + elem.className + " ").replace( rclass, " " );
-						for ( c = 0, cl = classNames.length; c < cl; c++ ) {
-							className = className.replace(" " + classNames[ c ] + " ", " ");
-						}
-						elem.className = jQuery.trim( className );
+					if (elem.nodeType === 1 && elem.className) {
+						if (value) {
+							className = (" " + elem.className + " ").replace(rclass, " ");
+							for (c = 0, cl = classNames.length; c < cl; c++) {
+								className = className.replace(" " + classNames[c] + " ", " ");
+							}
+							elem.className = jQuery.trim(className);
 
-					} else {
-						elem.className = "";
+						} else {
+							elem.className = "";
+						}
 					}
 				}
 			}
-		}
 
-		return this;
-	},
+			return this;
+		},
 
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value,
-			isBool = typeof stateVal === "boolean";
+		toggleClass: function (value, stateVal) {
+			var type = typeof value,
+				isBool = typeof stateVal === "boolean";
 
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-			});
-		}
+			if (jQuery.isFunction(value)) {
+				return this.each(function (i) {
+					jQuery(this).toggleClass(value.call(this, i, this.className, stateVal), stateVal);
+				});
+			}
 
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					state = stateVal,
-					classNames = value.split( rspace );
+			return this.each(function () {
+				if (type === "string") {
+					// toggle individual class names
+					var className,
+						i = 0,
+						self = jQuery(this),
+						state = stateVal,
+						classNames = value.split(rspace);
 
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space seperated list
-					state = isBool ? state : !self.hasClass( className );
-					self[ state ? "addClass" : "removeClass" ]( className );
-				}
+					while ((className = classNames[i++])) {
+						// check each className given, space seperated list
+						state = isBool ? state : !self.hasClass(className);
+						self[state ? "addClass" : "removeClass"](className);
+					}
 
-			} else if ( type === "undefined" || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery._data( this, "__className__", this.className );
+				} else if (type === "undefined" || type === "boolean") {
+					if (this.className) {
+						// store className if set
+						jQuery._data(this, "__className__", this.className);
+					}
+
+					// toggle whole className
+					this.className = this.className || value === false ? "" : jQuery._data(this, "__className__") || "";
 				}
+			});
+		},
 
-				// toggle whole className
-				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
+		hasClass: function (selector) {
+			var className = " " + selector + " ",
+				i = 0,
+				l = this.length;
+			for (; i < l; i++) {
+				if (this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf(className) > -1) {
+					return true;
+				}
 			}
-		});
-	},
 
-	hasClass: function( selector ) {
-		var className = " " + selector + " ",
-			i = 0,
-			l = this.length;
-		for ( ; i < l; i++ ) {
-			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
-				return true;
-			}
-		}
+			return false;
+		},
 
-		return false;
-	},
+		val: function (value) {
+			var hooks, ret, isFunction,
+				elem = this[0];
+
+			if (!arguments.length) {
+				if (elem) {
+					hooks = jQuery.valHooks[elem.nodeName.toLowerCase()] || jQuery.valHooks[elem.type];
 
-	val: function( value ) {
-		var hooks, ret, isFunction,
-			elem = this[0];
+					if (hooks && "get" in hooks && (ret = hooks.get(elem, "value")) !== undefined) {
+						return ret;
+					}
 
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.nodeName.toLowerCase() ] || jQuery.valHooks[ elem.type ];
+					ret = elem.value;
 
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
+					return typeof ret === "string" ?
+						// handle most util string cases
+						ret.replace(rreturn, "") :
+						// handle cases where value is null/undef or number
+						ret == null ? "" : ret;
 				}
 
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-					// handle most util string cases
-					ret.replace(rreturn, "") :
-					// handle cases where value is null/undef or number
-					ret == null ? "" : ret;
+				return;
 			}
 
-			return;
-		}
+			isFunction = jQuery.isFunction(value);
 
-		isFunction = jQuery.isFunction( value );
+			return this.each(function (i) {
+				var self = jQuery(this), val;
 
-		return this.each(function( i ) {
-			var self = jQuery(this), val;
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
+				if (this.nodeType !== 1) {
+					return;
+				}
 
-			if ( isFunction ) {
-				val = value.call( this, i, self.val() );
-			} else {
-				val = value;
-			}
+				if (isFunction) {
+					val = value.call(this, i, self.val());
+				} else {
+					val = value;
+				}
 
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
-				val += "";
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map(val, function ( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
+				// Treat null/undefined as ""; convert numbers to string
+				if (val == null) {
+					val = "";
+				} else if (typeof val === "number") {
+					val += "";
+				} else if (jQuery.isArray(val)) {
+					val = jQuery.map(val, function (value) {
+						return value == null ? "" : value + "";
+					});
+				}
 
-			hooks = jQuery.valHooks[ this.nodeName.toLowerCase() ] || jQuery.valHooks[ this.type ];
+				hooks = jQuery.valHooks[this.nodeName.toLowerCase()] || jQuery.valHooks[this.type];
 
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
+				// If set returns undefined, fall back to normal setting
+				if (!hooks || !("set" in hooks) || hooks.set(this, val, "value") === undefined) {
+					this.value = val;
+				}
+			});
+		}
+	});
 
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				// attributes.value is undefined in Blackberry 4.7 but
-				// uses .value. See #6932
-				var val = elem.attributes.value;
-				return !val || val.specified ? elem.value : elem.text;
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, i, max, option,
-					index = elem.selectedIndex,
-					values = [],
-					options = elem.options,
-					one = elem.type === "select-one";
-
-				// Nothing was selected
-				if ( index < 0 ) {
-					return null;
+	jQuery.extend({
+		valHooks: {
+			option: {
+				get: function (elem) {
+					// attributes.value is undefined in Blackberry 4.7 but
+					// uses .value. See #6932
+					var val = elem.attributes.value;
+					return !val || val.specified ? elem.value : elem.text;
 				}
+			},
+			select: {
+				get: function (elem) {
+					var value, i, max, option,
+						index = elem.selectedIndex,
+						values = [],
+						options = elem.options,
+						one = elem.type === "select-one";
+
+					// Nothing was selected
+					if (index < 0) {
+						return null;
+					}
 
-				// Loop through all the selected options
-				i = one ? index : 0;
-				max = one ? index + 1 : options.length;
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
+					// Loop through all the selected options
+					i = one ? index : 0;
+					max = one ? index + 1 : options.length;
+					for (; i < max; i++) {
+						option = options[i];
 
-					// Don't return options that are disabled or in a disabled optgroup
-					if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
-							(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
+						// Don't return options that are disabled or in a disabled optgroup
+						if (option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
+							(!option.parentNode.disabled || !jQuery.nodeName(option.parentNode, "optgroup"))) {
 
-						// Get the specific value for the option
-						value = jQuery( option ).val();
+							// Get the specific value for the option
+							value = jQuery(option).val();
 
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
+							// We don't need an array for one selects
+							if (one) {
+								return value;
+							}
 
-						// Multi-Selects return an array
-						values.push( value );
+							// Multi-Selects return an array
+							values.push(value);
+						}
 					}
-				}
 
-				// Fixes Bug #2551 -- select.val() broken in IE after form.reset()
-				if ( one && !values.length && options.length ) {
-					return jQuery( options[ index ] ).val();
-				}
+					// Fixes Bug #2551 -- select.val() broken in IE after form.reset()
+					if (one && !values.length && options.length) {
+						return jQuery(options[index]).val();
+					}
 
-				return values;
-			},
+					return values;
+				},
 
-			set: function( elem, value ) {
-				var values = jQuery.makeArray( value );
+				set: function (elem, value) {
+					var values = jQuery.makeArray(value);
 
-				jQuery(elem).find("option").each(function() {
-					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
-				});
+					jQuery(elem).find("option").each(function () {
+						this.selected = jQuery.inArray(jQuery(this).val(), values) >= 0;
+					});
 
-				if ( !values.length ) {
-					elem.selectedIndex = -1;
+					if (!values.length) {
+						elem.selectedIndex = -1;
+					}
+					return values;
 				}
-				return values;
 			}
-		}
-	},
-
-	attrFn: {
-		val: true,
-		css: true,
-		html: true,
-		text: true,
-		data: true,
-		width: true,
-		height: true,
-		offset: true
-	},
-
-	attr: function( elem, name, value, pass ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		if ( pass && name in jQuery.attrFn ) {
-			return jQuery( elem )[ name ]( value );
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === "undefined" ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+		},
 
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( notxml ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook );
-		}
+		attrFn: {
+			val: true,
+			css: true,
+			html: true,
+			text: true,
+			data: true,
+			width: true,
+			height: true,
+			offset: true
+		},
 
-		if ( value !== undefined ) {
+		attr: function (elem, name, value, pass) {
+			var ret, hooks, notxml,
+				nType = elem.nodeType;
 
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
+			// don't get/set attributes on text, comment and attribute nodes
+			if (!elem || nType === 3 || nType === 8 || nType === 2) {
 				return;
+			}
 
-			} else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, "" + value );
-				return value;
+			if (pass && name in jQuery.attrFn) {
+				return jQuery(elem)[name](value);
 			}
 
-		} else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) {
-			return ret;
+			// Fallback to prop when attributes are not supported
+			if (typeof elem.getAttribute === "undefined") {
+				return jQuery.prop(elem, name, value);
+			}
 
-		} else {
+			notxml = nType !== 1 || !jQuery.isXMLDoc(elem);
 
-			ret = elem.getAttribute( name );
+			// All attributes are lowercase
+			// Grab necessary hook if one is defined
+			if (notxml) {
+				name = name.toLowerCase();
+				hooks = jQuery.attrHooks[name] || (rboolean.test(name) ? boolHook : nodeHook);
+			}
 
-			// Non-existent attributes return null, we normalize to undefined
-			return ret === null ?
-				undefined :
-				ret;
-		}
-	},
+			if (value !== undefined) {
 
-	removeAttr: function( elem, value ) {
-		var propName, attrNames, name, l,
-			i = 0;
+				if (value === null) {
+					jQuery.removeAttr(elem, name);
+					return;
 
-		if ( value && elem.nodeType === 1 ) {
-			attrNames = value.toLowerCase().split( rspace );
-			l = attrNames.length;
+				} else if (hooks && "set" in hooks && notxml && (ret = hooks.set(elem, value, name)) !== undefined) {
+					return ret;
 
-			for ( ; i < l; i++ ) {
-				name = attrNames[ i ];
+				} else {
+					elem.setAttribute(name, "" + value);
+					return value;
+				}
+
+			} else if (hooks && "get" in hooks && notxml && (ret = hooks.get(elem, name)) !== null) {
+				return ret;
 
-				if ( name ) {
-					propName = jQuery.propFix[ name ] || name;
+			} else {
 
-					// See #9699 for explanation of this approach (setting first, then removal)
-					jQuery.attr( elem, name, "" );
-					elem.removeAttribute( getSetAttribute ? name : propName );
+				ret = elem.getAttribute(name);
 
-					// Set corresponding property to false for boolean attributes
-					if ( rboolean.test( name ) && propName in elem ) {
-						elem[ propName ] = false;
-					}
-				}
+				// Non-existent attributes return null, we normalize to undefined
+				return ret === null ?
+					undefined :
+					ret;
 			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				// We can't allow the type property to be changed (since it causes problems in IE)
-				if ( rtype.test( elem.nodeName ) && elem.parentNode ) {
-					jQuery.error( "type property can't be changed" );
-				} else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// Setting the type on a radio button after the value resets the value in IE6-9
-					// Reset value to it's default in case type is set after value
-					// This is for element creation
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
+		},
+
+		removeAttr: function (elem, value) {
+			var propName, attrNames, name, l,
+				i = 0;
+
+			if (value && elem.nodeType === 1) {
+				attrNames = value.toLowerCase().split(rspace);
+				l = attrNames.length;
+
+				for (; i < l; i++) {
+					name = attrNames[i];
+
+					if (name) {
+						propName = jQuery.propFix[name] || name;
+
+						// See #9699 for explanation of this approach (setting first, then removal)
+						jQuery.attr(elem, name, "");
+						elem.removeAttribute(getSetAttribute ? name : propName);
+
+						// Set corresponding property to false for boolean attributes
+						if (rboolean.test(name) && propName in elem) {
+							elem[propName] = false;
+						}
 					}
-					return value;
 				}
 			}
 		},
-		// Use the value property for back compat
-		// Use the nodeHook for button elements in IE6/7 (#1954)
-		value: {
-			get: function( elem, name ) {
-				if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
-					return nodeHook.get( elem, name );
-				}
-				return name in elem ?
-					elem.value :
-					null;
+
+		attrHooks: {
+			type: {
+				set: function (elem, value) {
+					// We can't allow the type property to be changed (since it causes problems in IE)
+					if (rtype.test(elem.nodeName) && elem.parentNode) {
+						jQuery.error("type property can't be changed");
+					} else if (!jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input")) {
+						// Setting the type on a radio button after the value resets the value in IE6-9
+						// Reset value to it's default in case type is set after value
+						// This is for element creation
+						var val = elem.value;
+						elem.setAttribute("type", value);
+						if (val) {
+							elem.value = val;
+						}
+						return value;
+					}
+				}
 			},
-			set: function( elem, value, name ) {
-				if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
-					return nodeHook.set( elem, value, name );
+			// Use the value property for back compat
+			// Use the nodeHook for button elements in IE6/7 (#1954)
+			value: {
+				get: function (elem, name) {
+					if (nodeHook && jQuery.nodeName(elem, "button")) {
+						return nodeHook.get(elem, name);
+					}
+					return name in elem ?
+						elem.value :
+						null;
+				},
+				set: function (elem, value, name) {
+					if (nodeHook && jQuery.nodeName(elem, "button")) {
+						return nodeHook.set(elem, value, name);
+					}
+					// Does not return so that setAttribute is also used
+					elem.value = value;
 				}
-				// Does not return so that setAttribute is also used
-				elem.value = value;
 			}
-		}
-	},
-
-	propFix: {
-		tabindex: "tabIndex",
-		readonly: "readOnly",
-		"for": "htmlFor",
-		"class": "className",
-		maxlength: "maxLength",
-		cellspacing: "cellSpacing",
-		cellpadding: "cellPadding",
-		rowspan: "rowSpan",
-		colspan: "colSpan",
-		usemap: "useMap",
-		frameborder: "frameBorder",
-		contenteditable: "contentEditable"
-	},
-
-	prop: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
+		},
 
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+		propFix: {
+			tabindex: "tabIndex",
+			readonly: "readOnly",
+			"for": "htmlFor",
+			"class": "className",
+			maxlength: "maxLength",
+			cellspacing: "cellSpacing",
+			cellpadding: "cellPadding",
+			rowspan: "rowSpan",
+			colspan: "colSpan",
+			usemap: "useMap",
+			frameborder: "frameBorder",
+			contenteditable: "contentEditable"
+		},
 
-		if ( notxml ) {
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
+		prop: function (elem, name, value) {
+			var ret, hooks, notxml,
+				nType = elem.nodeType;
 
-		if ( value !== undefined ) {
-			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
+			// don't get/set properties on text, comment and attribute nodes
+			if (!elem || nType === 3 || nType === 8 || nType === 2) {
+				return;
+			}
 
-			} else {
-				return ( elem[ name ] = value );
+			notxml = nType !== 1 || !jQuery.isXMLDoc(elem);
+
+			if (notxml) {
+				// Fix name and attach hooks
+				name = jQuery.propFix[name] || name;
+				hooks = jQuery.propHooks[name];
 			}
 
-		} else {
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-				return ret;
+			if (value !== undefined) {
+				if (hooks && "set" in hooks && (ret = hooks.set(elem, value, name)) !== undefined) {
+					return ret;
+
+				} else {
+					return (elem[name] = value);
+				}
 
 			} else {
-				return elem[ name ];
-			}
-		}
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				var attributeNode = elem.getAttributeNode("tabindex");
-
-				return attributeNode && attributeNode.specified ?
-					parseInt( attributeNode.value, 10 ) :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						undefined;
+				if (hooks && "get" in hooks && (ret = hooks.get(elem, name)) !== null) {
+					return ret;
+
+				} else {
+					return elem[name];
+				}
 			}
-		}
-	}
-});
+		},
 
-// Add the tabIndex propHook to attrHooks for back-compat (different case is intentional)
-jQuery.attrHooks.tabindex = jQuery.propHooks.tabIndex;
+		propHooks: {
+			tabIndex: {
+				get: function (elem) {
+					// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+					// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+					var attributeNode = elem.getAttributeNode("tabindex");
 
-// Hook for boolean attributes
-boolHook = {
-	get: function( elem, name ) {
-		// Align boolean attributes with corresponding properties
-		// Fall back to attribute presence where some booleans are not supported
-		var attrNode,
-			property = jQuery.prop( elem, name );
-		return property === true || typeof property !== "boolean" && ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ?
-			name.toLowerCase() :
-			undefined;
-	},
-	set: function( elem, value, name ) {
-		var propName;
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else {
-			// value is true since we know at this point it's type boolean and not false
-			// Set boolean attributes to the same name and set the DOM property
-			propName = jQuery.propFix[ name ] || name;
-			if ( propName in elem ) {
-				// Only set the IDL specifically if it already exists on the element
-				elem[ propName ] = true;
+					return attributeNode && attributeNode.specified ?
+						parseInt(attributeNode.value, 10) :
+						rfocusable.test(elem.nodeName) || rclickable.test(elem.nodeName) && elem.href ?
+							0 :
+							undefined;
+				}
 			}
-
-			elem.setAttribute( name, name.toLowerCase() );
 		}
-		return name;
-	}
-};
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !getSetAttribute ) {
+	});
 
-	fixSpecified = {
-		name: true,
-		id: true
-	};
+// Add the tabIndex propHook to attrHooks for back-compat (different case is intentional)
+	jQuery.attrHooks.tabindex = jQuery.propHooks.tabIndex;
 
-	// Use this for any attribute in IE6/7
-	// This fixes almost every IE6/7 issue
-	nodeHook = jQuery.valHooks.button = {
-		get: function( elem, name ) {
-			var ret;
-			ret = elem.getAttributeNode( name );
-			return ret && ( fixSpecified[ name ] ? ret.nodeValue !== "" : ret.specified ) ?
-				ret.nodeValue :
+// Hook for boolean attributes
+	boolHook = {
+		get: function (elem, name) {
+			// Align boolean attributes with corresponding properties
+			// Fall back to attribute presence where some booleans are not supported
+			var attrNode,
+				property = jQuery.prop(elem, name);
+			return property === true || typeof property !== "boolean" && (attrNode = elem.getAttributeNode(name)) && attrNode.nodeValue !== false ?
+				name.toLowerCase() :
 				undefined;
 		},
-		set: function( elem, value, name ) {
-			// Set the existing or create a new attribute node
-			var ret = elem.getAttributeNode( name );
-			if ( !ret ) {
-				ret = document.createAttribute( name );
-				elem.setAttributeNode( ret );
-			}
-			return ( ret.nodeValue = value + "" );
+		set: function (elem, value, name) {
+			var propName;
+			if (value === false) {
+				// Remove boolean attributes when set to false
+				jQuery.removeAttr(elem, name);
+			} else {
+				// value is true since we know at this point it's type boolean and not false
+				// Set boolean attributes to the same name and set the DOM property
+				propName = jQuery.propFix[name] || name;
+				if (propName in elem) {
+					// Only set the IDL specifically if it already exists on the element
+					elem[propName] = true;
+				}
+
+				elem.setAttribute(name, name.toLowerCase());
+			}
+			return name;
 		}
 	};
 
-	// Apply the nodeHook to tabindex
-	jQuery.attrHooks.tabindex.set = nodeHook.set;
+// IE6/7 do not support getting/setting some attributes with get/setAttribute
+	if (!getSetAttribute) {
 
-	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
-	// This is for removals
-	jQuery.each([ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			set: function( elem, value ) {
-				if ( value === "" ) {
-					elem.setAttribute( name, "auto" );
-					return value;
+		fixSpecified = {
+			name: true,
+			id: true
+		};
+
+		// Use this for any attribute in IE6/7
+		// This fixes almost every IE6/7 issue
+		nodeHook = jQuery.valHooks.button = {
+			get: function (elem, name) {
+				var ret;
+				ret = elem.getAttributeNode(name);
+				return ret && (fixSpecified[name] ? ret.nodeValue !== "" : ret.specified) ?
+					ret.nodeValue :
+					undefined;
+			},
+			set: function (elem, value, name) {
+				// Set the existing or create a new attribute node
+				var ret = elem.getAttributeNode(name);
+				if (!ret) {
+					ret = document.createAttribute(name);
+					elem.setAttributeNode(ret);
 				}
+				return (ret.nodeValue = value + "");
 			}
+		};
+
+		// Apply the nodeHook to tabindex
+		jQuery.attrHooks.tabindex.set = nodeHook.set;
+
+		// Set width and height to auto instead of 0 on empty string( Bug #8150 )
+		// This is for removals
+		jQuery.each(["width", "height"], function (i, name) {
+			jQuery.attrHooks[name] = jQuery.extend(jQuery.attrHooks[name], {
+				set: function (elem, value) {
+					if (value === "") {
+						elem.setAttribute(name, "auto");
+						return value;
+					}
+				}
+			});
 		});
-	});
 
-	// Set contenteditable to false on removals(#10429)
-	// Setting to empty string throws an error as an invalid value
-	jQuery.attrHooks.contenteditable = {
-		get: nodeHook.get,
-		set: function( elem, value, name ) {
-			if ( value === "" ) {
-				value = "false";
+		// Set contenteditable to false on removals(#10429)
+		// Setting to empty string throws an error as an invalid value
+		jQuery.attrHooks.contenteditable = {
+			get: nodeHook.get,
+			set: function (elem, value, name) {
+				if (value === "") {
+					value = "false";
+				}
+				nodeHook.set(elem, value, name);
 			}
-			nodeHook.set( elem, value, name );
-		}
-	};
-}
+		};
+	}
 
 
 // Some attributes require a special call on IE
-if ( !jQuery.support.hrefNormalized ) {
-	jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			get: function( elem ) {
-				var ret = elem.getAttribute( name, 2 );
-				return ret === null ? undefined : ret;
-			}
+	if (!jQuery.support.hrefNormalized) {
+		jQuery.each(["href", "src", "width", "height"], function (i, name) {
+			jQuery.attrHooks[name] = jQuery.extend(jQuery.attrHooks[name], {
+				get: function (elem) {
+					var ret = elem.getAttribute(name, 2);
+					return ret === null ? undefined : ret;
+				}
+			});
 		});
-	});
-}
-
-if ( !jQuery.support.style ) {
-	jQuery.attrHooks.style = {
-		get: function( elem ) {
-			// Return undefined in the case of empty string
-			// Normalize to lowercase since IE uppercases css property names
-			return elem.style.cssText.toLowerCase() || undefined;
-		},
-		set: function( elem, value ) {
-			return ( elem.style.cssText = "" + value );
-		}
-	};
-}
+	}
+
+	if (!jQuery.support.style) {
+		jQuery.attrHooks.style = {
+			get: function (elem) {
+				// Return undefined in the case of empty string
+				// Normalize to lowercase since IE uppercases css property names
+				return elem.style.cssText.toLowerCase() || undefined;
+			},
+			set: function (elem, value) {
+				return (elem.style.cssText = "" + value);
+			}
+		};
+	}
 
 // Safari mis-reports the default selected property of an option
 // Accessing the parent's selectedIndex property fixes it
-if ( !jQuery.support.optSelected ) {
-	jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
-		get: function( elem ) {
-			var parent = elem.parentNode;
+	if (!jQuery.support.optSelected) {
+		jQuery.propHooks.selected = jQuery.extend(jQuery.propHooks.selected, {
+			get: function (elem) {
+				var parent = elem.parentNode;
 
-			if ( parent ) {
-				parent.selectedIndex;
+				if (parent) {
+					parent.selectedIndex;
 
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
+					// Make sure that it also works with optgroups, see #5701
+					if (parent.parentNode) {
+						parent.parentNode.selectedIndex;
+					}
 				}
+				return null;
 			}
-			return null;
-		}
-	});
-}
+		});
+	}
 
 // IE6/7 call enctype encoding
-if ( !jQuery.support.enctype ) {
-	jQuery.propFix.enctype = "encoding";
-}
+	if (!jQuery.support.enctype) {
+		jQuery.propFix.enctype = "encoding";
+	}
 
 // Radios and checkboxes getter/setter
-if ( !jQuery.support.checkOn ) {
-	jQuery.each([ "radio", "checkbox" ], function() {
-		jQuery.valHooks[ this ] = {
-			get: function( elem ) {
-				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
-				return elem.getAttribute("value") === null ? "on" : elem.value;
-			}
-		};
-	});
-}
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
+	if (!jQuery.support.checkOn) {
+		jQuery.each(["radio", "checkbox"], function () {
+			jQuery.valHooks[this] = {
+				get: function (elem) {
+					// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
+					return elem.getAttribute("value") === null ? "on" : elem.value;
+				}
+			};
+		});
+	}
+	jQuery.each(["radio", "checkbox"], function () {
+		jQuery.valHooks[this] = jQuery.extend(jQuery.valHooks[this], {
+			set: function (elem, value) {
+				if (jQuery.isArray(value)) {
+					return (elem.checked = jQuery.inArray(jQuery(elem).val(), value) >= 0);
+				}
 			}
-		}
+		});
 	});
-});
-
-
 
 
-var rformElems = /^(?:textarea|input|select)$/i,
-	rtypenamespace = /^([^\.]*)?(?:\.(.+))?$/,
-	rhoverHack = /\bhover(\.\S+)?\b/,
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|contextmenu)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rquickIs = /^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,
-	quickParse = function( selector ) {
-		var quick = rquickIs.exec( selector );
-		if ( quick ) {
-			//   0  1    2   3
-			// [ _, tag, id, class ]
-			quick[1] = ( quick[1] || "" ).toLowerCase();
-			quick[3] = quick[3] && new RegExp( "(?:^|\\s)" + quick[3] + "(?:\\s|$)" );
-		}
-		return quick;
-	},
-	quickIs = function( elem, m ) {
-		var attrs = elem.attributes || {};
-		return (
-			(!m[1] || elem.nodeName.toLowerCase() === m[1]) &&
-			(!m[2] || (attrs.id || {}).value === m[2]) &&
-			(!m[3] || m[3].test( (attrs[ "class" ] || {}).value ))
-		);
-	},
-	hoverHack = function( events ) {
-		return jQuery.event.special.hover ? events : events.replace( rhoverHack, "mouseenter$1 mouseleave$1" );
-	};
+	var rformElems = /^(?:textarea|input|select)$/i,
+		rtypenamespace = /^([^\.]*)?(?:\.(.+))?$/,
+		rhoverHack = /\bhover(\.\S+)?\b/,
+		rkeyEvent = /^key/,
+		rmouseEvent = /^(?:mouse|contextmenu)|click/,
+		rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
+		rquickIs = /^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,
+		quickParse = function (selector) {
+			var quick = rquickIs.exec(selector);
+			if (quick) {
+				//   0  1    2   3
+				// [ _, tag, id, class ]
+				quick[1] = (quick[1] || "").toLowerCase();
+				quick[3] = quick[3] && new RegExp("(?:^|\\s)" + quick[3] + "(?:\\s|$)");
+			}
+			return quick;
+		},
+		quickIs = function (elem, m) {
+			var attrs = elem.attributes || {};
+			return (
+				(!m[1] || elem.nodeName.toLowerCase() === m[1]) &&
+				(!m[2] || (attrs.id || {}).value === m[2]) &&
+				(!m[3] || m[3].test((attrs["class"] || {}).value))
+			);
+		},
+		hoverHack = function (events) {
+			return jQuery.event.special.hover ? events : events.replace(rhoverHack, "mouseenter$1 mouseleave$1");
+		};
 
-/*
+	/*
  * Helper functions for managing events -- not part of the public interface.
  * Props to Dean Edwards' addEvent library for many of the ideas.
  */
-jQuery.event = {
-
-	add: function( elem, types, handler, data, selector ) {
-
-		var elemData, eventHandle, events,
-			t, tns, type, namespaces, handleObj,
-			handleObjIn, quick, handlers, special;
+	jQuery.event = {
 
-		// Don't attach events to noData or text/comment nodes (allow plain objects tho)
-		if ( elem.nodeType === 3 || elem.nodeType === 8 || !types || !handler || !(elemData = jQuery._data( elem )) ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		events = elemData.events;
-		if ( !events ) {
-			elemData.events = events = {};
-		}
-		eventHandle = elemData.handle;
-		if ( !eventHandle ) {
-			elemData.handle = eventHandle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ?
-					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
-			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
-			eventHandle.elem = elem;
-		}
-
-		// Handle multiple events separated by a space
-		// jQuery(...).bind("mouseover mouseout", fn);
-		types = jQuery.trim( hoverHack(types) ).split( " " );
-		for ( t = 0; t < types.length; t++ ) {
+		add: function (elem, types, handler, data, selector) {
 
-			tns = rtypenamespace.exec( types[t] ) || [];
-			type = tns[1];
-			namespaces = ( tns[2] || "" ).split( "." ).sort();
+			var elemData, eventHandle, events,
+				t, tns, type, namespaces, handleObj,
+				handleObjIn, quick, handlers, special;
 
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
+			// Don't attach events to noData or text/comment nodes (allow plain objects tho)
+			if (elem.nodeType === 3 || elem.nodeType === 8 || !types || !handler || !(elemData = jQuery._data(elem))) {
+				return;
+			}
 
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
+			// Caller can pass in an object of custom data in lieu of the handler
+			if (handler.handler) {
+				handleObjIn = handler;
+				handler = handleObjIn.handler;
+			}
 
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
-				type: type,
-				origType: tns[1],
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				quick: quickParse( selector ),
-				namespace: namespaces.join(".")
-			}, handleObjIn );
+			// Make sure that the handler has a unique ID, used to find/remove it later
+			if (!handler.guid) {
+				handler.guid = jQuery.guid++;
+			}
 
-			// Init the event handler queue if we're the first
-			handlers = events[ type ];
-			if ( !handlers ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
+			// Init the element's event structure and main handler, if this is the first
+			events = elemData.events;
+			if (!events) {
+				elemData.events = events = {};
+			}
+			eventHandle = elemData.handle;
+			if (!eventHandle) {
+				elemData.handle = eventHandle = function (e) {
+					// Discard the second event of a jQuery.event.trigger() and
+					// when an event is called after a page has unloaded
+					return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ?
+						jQuery.event.dispatch.apply(eventHandle.elem, arguments) :
+						undefined;
+				};
+				// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
+				eventHandle.elem = elem;
+			}
+
+			// Handle multiple events separated by a space
+			// jQuery(...).bind("mouseover mouseout", fn);
+			types = jQuery.trim(hoverHack(types)).split(" ");
+			for (t = 0; t < types.length; t++) {
+
+				tns = rtypenamespace.exec(types[t]) || [];
+				type = tns[1];
+				namespaces = (tns[2] || "").split(".").sort();
+
+				// If event changes its type, use the special event handlers for the changed type
+				special = jQuery.event.special[type] || {};
+
+				// If selector defined, determine special event api type, otherwise given type
+				type = (selector ? special.delegateType : special.bindType) || type;
+
+				// Update special based on newly reset type
+				special = jQuery.event.special[type] || {};
+
+				// handleObj is passed to all event handlers
+				handleObj = jQuery.extend({
+					type: type,
+					origType: tns[1],
+					data: data,
+					handler: handler,
+					guid: handler.guid,
+					selector: selector,
+					quick: quickParse(selector),
+					namespace: namespaces.join(".")
+				}, handleObjIn);
+
+				// Init the event handler queue if we're the first
+				handlers = events[type];
+				if (!handlers) {
+					handlers = events[type] = [];
+					handlers.delegateCount = 0;
+
+					// Only use addEventListener/attachEvent if the special events handler returns false
+					if (!special.setup || special.setup.call(elem, data, namespaces, eventHandle) === false) {
+						// Bind the global event handler to the element
+						if (elem.addEventListener) {
+							elem.addEventListener(type, eventHandle, false);
+
+						} else if (elem.attachEvent) {
+							elem.attachEvent("on" + type, eventHandle);
+						}
+					}
+				}
 
-				// Only use addEventListener/attachEvent if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					// Bind the global event handler to the element
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
+				if (special.add) {
+					special.add.call(elem, handleObj);
 
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
+					if (!handleObj.handler.guid) {
+						handleObj.handler.guid = handler.guid;
 					}
 				}
-			}
 
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
+				// Add to the element's handler list, delegates in front
+				if (selector) {
+					handlers.splice(handlers.delegateCount++, 0, handleObj);
+				} else {
+					handlers.push(handleObj);
 				}
-			}
 
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
+				// Keep track of which events have ever been used, for event optimization
+				jQuery.event.global[type] = true;
 			}
 
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
+			// Nullify elem to prevent memory leaks in IE
+			elem = null;
+		},
 
-	global: {},
+		global: {},
 
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
+		// Detach an event or set of events from an element
+		remove: function (elem, types, handler, selector, mappedTypes) {
 
-		var elemData = jQuery.hasData( elem ) && jQuery._data( elem ),
-			t, tns, type, origType, namespaces, origCount,
-			j, events, special, handle, eventType, handleObj;
+			var elemData = jQuery.hasData(elem) && jQuery._data(elem),
+				t, tns, type, origType, namespaces, origCount,
+				j, events, special, handle, eventType, handleObj;
 
-		if ( !elemData || !(events = elemData.events) ) {
-			return;
-		}
+			if (!elemData || !(events = elemData.events)) {
+				return;
+			}
 
-		// Once for each type.namespace in types; type may be omitted
-		types = jQuery.trim( hoverHack( types || "" ) ).split(" ");
-		for ( t = 0; t < types.length; t++ ) {
-			tns = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tns[1];
-			namespaces = tns[2];
+			// Once for each type.namespace in types; type may be omitted
+			types = jQuery.trim(hoverHack(types || "")).split(" ");
+			for (t = 0; t < types.length; t++) {
+				tns = rtypenamespace.exec(types[t]) || [];
+				type = origType = tns[1];
+				namespaces = tns[2];
 
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
+				// Unbind all events (on this namespace, if provided) for the element
+				if (!type) {
+					for (type in events) {
+						jQuery.event.remove(elem, type + types[t], handler, selector, true);
+					}
+					continue;
 				}
-				continue;
-			}
 
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector? special.delegateType : special.bindType ) || type;
-			eventType = events[ type ] || [];
-			origCount = eventType.length;
-			namespaces = namespaces ? new RegExp("(^|\\.)" + namespaces.split(".").sort().join("\\.(?:.*\\.)?") + "(\\.|$)") : null;
+				special = jQuery.event.special[type] || {};
+				type = (selector ? special.delegateType : special.bindType) || type;
+				eventType = events[type] || [];
+				origCount = eventType.length;
+				namespaces = namespaces ? new RegExp("(^|\\.)" + namespaces.split(".").sort().join("\\.(?:.*\\.)?") + "(\\.|$)") : null;
 
-			// Remove matching events
-			for ( j = 0; j < eventType.length; j++ ) {
-				handleObj = eventType[ j ];
+				// Remove matching events
+				for (j = 0; j < eventType.length; j++) {
+					handleObj = eventType[j];
 
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					 ( !handler || handler.guid === handleObj.guid ) &&
-					 ( !namespaces || namespaces.test( handleObj.namespace ) ) &&
-					 ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-					eventType.splice( j--, 1 );
+					if ((mappedTypes || origType === handleObj.origType) &&
+						(!handler || handler.guid === handleObj.guid) &&
+						(!namespaces || namespaces.test(handleObj.namespace)) &&
+						(!selector || selector === handleObj.selector || selector === "**" && handleObj.selector)) {
+						eventType.splice(j--, 1);
 
-					if ( handleObj.selector ) {
-						eventType.delegateCount--;
+						if (handleObj.selector) {
+							eventType.delegateCount--;
+						}
+						if (special.remove) {
+							special.remove.call(elem, handleObj);
+						}
 					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
+				}
+
+				// Remove generic event handler if we removed something and no more handlers exist
+				// (avoids potential for endless recursion during removal of special event handlers)
+				if (eventType.length === 0 && origCount !== eventType.length) {
+					if (!special.teardown || special.teardown.call(elem, namespaces) === false) {
+						jQuery.removeEvent(elem, type, elemData.handle);
 					}
+
+					delete events[type];
 				}
 			}
 
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( eventType.length === 0 && origCount !== eventType.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
+			// Remove the expando if it's no longer used
+			if (jQuery.isEmptyObject(events)) {
+				handle = elemData.handle;
+				if (handle) {
+					handle.elem = null;
 				}
 
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			handle = elemData.handle;
-			if ( handle ) {
-				handle.elem = null;
+				// removeData also checks for emptiness and clears the expando if empty
+				// so use it instead of delete
+				jQuery.removeData(elem, ["events", "handle"], true);
 			}
+		},
 
-			// removeData also checks for emptiness and clears the expando if empty
-			// so use it instead of delete
-			jQuery.removeData( elem, [ "events", "handle" ], true );
-		}
-	},
-
-	// Events that are safe to short-circuit if no handlers are attached.
-	// Native DOM events should not be added, they may have inline handlers.
-	customEvent: {
-		"getData": true,
-		"setData": true,
-		"changeData": true
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-		// Don't do events on text and comment nodes
-		if ( elem && (elem.nodeType === 3 || elem.nodeType === 8) ) {
-			return;
-		}
-
-		// Event object or event type
-		var type = event.type || event,
-			namespaces = [],
-			cache, exclusive, i, cur, old, ontype, special, handle, eventPath, bubbleType;
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
+		// Events that are safe to short-circuit if no handlers are attached.
+		// Native DOM events should not be added, they may have inline handlers.
+		customEvent: {
+			"getData": true,
+			"setData": true,
+			"changeData": true
+		},
 
-		if ( type.indexOf( "!" ) >= 0 ) {
-			// Exclusive events trigger only for the exact event (no namespaces)
-			type = type.slice(0, -1);
-			exclusive = true;
-		}
+		trigger: function (event, data, elem, onlyHandlers) {
+			// Don't do events on text and comment nodes
+			if (elem && (elem.nodeType === 3 || elem.nodeType === 8)) {
+				return;
+			}
 
-		if ( type.indexOf( "." ) >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
+			// Event object or event type
+			var type = event.type || event,
+				namespaces = [],
+				cache, exclusive, i, cur, old, ontype, special, handle, eventPath, bubbleType;
 
-		if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) {
-			// No jQuery handlers for this event type, and it can't have inline handlers
-			return;
-		}
+			// focus/blur morphs to focusin/out; ensure we're not firing them right now
+			if (rfocusMorph.test(type + jQuery.event.triggered)) {
+				return;
+			}
 
-		// Caller can pass in an Event, Object, or just an event type string
-		event = typeof event === "object" ?
-			// jQuery.Event object
-			event[ jQuery.expando ] ? event :
-			// Object literal
-			new jQuery.Event( type, event ) :
-			// Just the event type (string)
-			new jQuery.Event( type );
+			if (type.indexOf("!") >= 0) {
+				// Exclusive events trigger only for the exact event (no namespaces)
+				type = type.slice(0, -1);
+				exclusive = true;
+			}
 
-		event.type = type;
-		event.isTrigger = true;
-		event.exclusive = exclusive;
-		event.namespace = namespaces.join( "." );
-		event.namespace_re = event.namespace? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)") : null;
-		ontype = type.indexOf( ":" ) < 0 ? "on" + type : "";
+			if (type.indexOf(".") >= 0) {
+				// Namespaced trigger; create a regexp to match event type in handle()
+				namespaces = type.split(".");
+				type = namespaces.shift();
+				namespaces.sort();
+			}
 
-		// Handle a global trigger
-		if ( !elem ) {
+			if ((!elem || jQuery.event.customEvent[type]) && !jQuery.event.global[type]) {
+				// No jQuery handlers for this event type, and it can't have inline handlers
+				return;
+			}
 
-			// TODO: Stop taunting the data cache; remove global events and always attach to document
-			cache = jQuery.cache;
-			for ( i in cache ) {
-				if ( cache[ i ].events && cache[ i ].events[ type ] ) {
-					jQuery.event.trigger( event, data, cache[ i ].handle.elem, true );
+			// Caller can pass in an Event, Object, or just an event type string
+			event = typeof event === "object" ?
+				// jQuery.Event object
+				event[jQuery.expando] ? event :
+					// Object literal
+					new jQuery.Event(type, event) :
+				// Just the event type (string)
+				new jQuery.Event(type);
+
+			event.type = type;
+			event.isTrigger = true;
+			event.exclusive = exclusive;
+			event.namespace = namespaces.join(".");
+			event.namespace_re = event.namespace ? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)") : null;
+			ontype = type.indexOf(":") < 0 ? "on" + type : "";
+
+			// Handle a global trigger
+			if (!elem) {
+
+				// TODO: Stop taunting the data cache; remove global events and always attach to document
+				cache = jQuery.cache;
+				for (i in cache) {
+					if (cache[i].events && cache[i].events[type]) {
+						jQuery.event.trigger(event, data, cache[i].handle.elem, true);
+					}
 				}
+				return;
 			}
-			return;
-		}
 
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
+			// Clean up the event in case it is being reused
+			event.result = undefined;
+			if (!event.target) {
+				event.target = elem;
+			}
 
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data != null ? jQuery.makeArray( data ) : [];
-		data.unshift( event );
+			// Clone any incoming data and prepend the event, creating the handler arg list
+			data = data != null ? jQuery.makeArray(data) : [];
+			data.unshift(event);
 
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
+			// Allow special events to draw outside the lines
+			special = jQuery.event.special[type] || {};
+			if (special.trigger && special.trigger.apply(elem, data) === false) {
+				return;
+			}
 
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		eventPath = [[ elem, special.bindType || type ]];
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
+			// Determine event propagation path in advance, per W3C events spec (#9951)
+			// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
+			eventPath = [[elem, special.bindType || type]];
+			if (!onlyHandlers && !special.noBubble && !jQuery.isWindow(elem)) {
 
-			bubbleType = special.delegateType || type;
-			cur = rfocusMorph.test( bubbleType + type ) ? elem : elem.parentNode;
-			old = null;
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push([ cur, bubbleType ]);
-				old = cur;
-			}
+				bubbleType = special.delegateType || type;
+				cur = rfocusMorph.test(bubbleType + type) ? elem : elem.parentNode;
+				old = null;
+				for (; cur; cur = cur.parentNode) {
+					eventPath.push([cur, bubbleType]);
+					old = cur;
+				}
 
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( old && old === elem.ownerDocument ) {
-				eventPath.push([ old.defaultView || old.parentWindow || window, bubbleType ]);
+				// Only add window if we got to document (e.g., not plain obj or detached DOM)
+				if (old && old === elem.ownerDocument) {
+					eventPath.push([old.defaultView || old.parentWindow || window, bubbleType]);
+				}
 			}
-		}
 
-		// Fire handlers on the event path
-		for ( i = 0; i < eventPath.length && !event.isPropagationStopped(); i++ ) {
+			// Fire handlers on the event path
+			for (i = 0; i < eventPath.length && !event.isPropagationStopped(); i++) {
 
-			cur = eventPath[i][0];
-			event.type = eventPath[i][1];
+				cur = eventPath[i][0];
+				event.type = eventPath[i][1];
 
-			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-			// Note that this is a bare JS function and not a jQuery handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && jQuery.acceptData( cur ) && handle.apply( cur, data ) === false ) {
-				event.preventDefault();
+				handle = (jQuery._data(cur, "events") || {})[event.type] && jQuery._data(cur, "handle");
+				if (handle) {
+					handle.apply(cur, data);
+				}
+				// Note that this is a bare JS function and not a jQuery handler
+				handle = ontype && cur[ontype];
+				if (handle && jQuery.acceptData(cur) && handle.apply(cur, data) === false) {
+					event.preventDefault();
+				}
 			}
-		}
-		event.type = type;
+			event.type = type;
 
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
+			// If nobody prevented the default action, do it now
+			if (!onlyHandlers && !event.isDefaultPrevented()) {
 
-			if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) &&
-				!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
+				if ((!special._default || special._default.apply(elem.ownerDocument, data) === false) &&
+					!(type === "click" && jQuery.nodeName(elem, "a")) && jQuery.acceptData(elem)) {
 
-				// Call a native DOM method on the target with the same name name as the event.
-				// Can't use an .isFunction() check here because IE6/7 fails that test.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				// IE<9 dies on focus/blur to hidden element (#1486)
-				if ( ontype && elem[ type ] && ((type !== "focus" && type !== "blur") || event.target.offsetWidth !== 0) && !jQuery.isWindow( elem ) ) {
+					// Call a native DOM method on the target with the same name name as the event.
+					// Can't use an .isFunction() check here because IE6/7 fails that test.
+					// Don't do default actions on window, that's where global variables be (#6170)
+					// IE<9 dies on focus/blur to hidden element (#1486)
+					if (ontype && elem[type] && ((type !== "focus" && type !== "blur") || event.target.offsetWidth !== 0) && !jQuery.isWindow(elem)) {
 
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					old = elem[ ontype ];
+						// Don't re-trigger an onFOO event when we call its FOO() method
+						old = elem[ontype];
 
-					if ( old ) {
-						elem[ ontype ] = null;
-					}
+						if (old) {
+							elem[ontype] = null;
+						}
 
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					elem[ type ]();
-					jQuery.event.triggered = undefined;
+						// Prevent re-triggering of the same event, since we already bubbled it above
+						jQuery.event.triggered = type;
+						elem[type]();
+						jQuery.event.triggered = undefined;
 
-					if ( old ) {
-						elem[ ontype ] = old;
+						if (old) {
+							elem[ontype] = old;
+						}
 					}
 				}
 			}
-		}
 
-		return event.result;
-	},
+			return event.result;
+		},
 
-	dispatch: function( event ) {
+		dispatch: function (event) {
+
+			// Make a writable jQuery.Event from the native event object
+			event = jQuery.event.fix(event || window.event);
+
+			var handlers = ((jQuery._data(this, "events") || {})[event.type] || []),
+				delegateCount = handlers.delegateCount,
+				args = [].slice.call(arguments, 0),
+				run_all = !event.exclusive && !event.namespace,
+				handlerQueue = [],
+				i, j, cur, jqcur, ret, selMatch, matched, matches, handleObj, sel, related;
+
+			// Use the fix-ed jQuery.Event rather than the (read-only) native event
+			args[0] = event;
+			event.delegateTarget = this;
+
+			// Determine handlers that should run if there are delegated events
+			// Avoid disabled elements in IE (#6911) and non-left-click bubbling in Firefox (#3861)
+			if (delegateCount && !event.target.disabled && !(event.button && event.type === "click")) {
+
+				// Pregenerate a single jQuery object for reuse with .is()
+				jqcur = jQuery(this);
+				jqcur.context = this.ownerDocument || this;
+
+				for (cur = event.target; cur != this; cur = cur.parentNode || this) {
+					selMatch = {};
+					matches = [];
+					jqcur[0] = cur;
+					for (i = 0; i < delegateCount; i++) {
+						handleObj = handlers[i];
+						sel = handleObj.selector;
+
+						if (selMatch[sel] === undefined) {
+							selMatch[sel] = (
+								handleObj.quick ? quickIs(cur, handleObj.quick) : jqcur.is(sel)
+							);
+						}
+						if (selMatch[sel]) {
+							matches.push(handleObj);
+						}
+					}
+					if (matches.length) {
+						handlerQueue.push({elem: cur, matches: matches});
+					}
+				}
+			}
 
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event || window.event );
+			// Add the remaining (directly-bound) handlers
+			if (handlers.length > delegateCount) {
+				handlerQueue.push({elem: this, matches: handlers.slice(delegateCount)});
+			}
 
-		var handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []),
-			delegateCount = handlers.delegateCount,
-			args = [].slice.call( arguments, 0 ),
-			run_all = !event.exclusive && !event.namespace,
-			handlerQueue = [],
-			i, j, cur, jqcur, ret, selMatch, matched, matches, handleObj, sel, related;
+			// Run delegates first; they may want to stop propagation beneath us
+			for (i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++) {
+				matched = handlerQueue[i];
+				event.currentTarget = matched.elem;
 
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
-		event.delegateTarget = this;
+				for (j = 0; j < matched.matches.length && !event.isImmediatePropagationStopped(); j++) {
+					handleObj = matched.matches[j];
 
-		// Determine handlers that should run if there are delegated events
-		// Avoid disabled elements in IE (#6911) and non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && !event.target.disabled && !(event.button && event.type === "click") ) {
+					// Triggered event must either 1) be non-exclusive and have no namespace, or
+					// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
+					if (run_all || (!event.namespace && !handleObj.namespace) || event.namespace_re && event.namespace_re.test(handleObj.namespace)) {
 
-			// Pregenerate a single jQuery object for reuse with .is()
-			jqcur = jQuery(this);
-			jqcur.context = this.ownerDocument || this;
+						event.data = handleObj.data;
+						event.handleObj = handleObj;
 
-			for ( cur = event.target; cur != this; cur = cur.parentNode || this ) {
-				selMatch = {};
-				matches = [];
-				jqcur[0] = cur;
-				for ( i = 0; i < delegateCount; i++ ) {
-					handleObj = handlers[ i ];
-					sel = handleObj.selector;
+						ret = ((jQuery.event.special[handleObj.origType] || {}).handle || handleObj.handler)
+							.apply(matched.elem, args);
 
-					if ( selMatch[ sel ] === undefined ) {
-						selMatch[ sel ] = (
-							handleObj.quick ? quickIs( cur, handleObj.quick ) : jqcur.is( sel )
-						);
-					}
-					if ( selMatch[ sel ] ) {
-						matches.push( handleObj );
+						if (ret !== undefined) {
+							event.result = ret;
+							if (ret === false) {
+								event.preventDefault();
+								event.stopPropagation();
+							}
+						}
 					}
 				}
-				if ( matches.length ) {
-					handlerQueue.push({ elem: cur, matches: matches });
-				}
 			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( handlers.length > delegateCount ) {
-			handlerQueue.push({ elem: this, matches: handlers.slice( delegateCount ) });
-		}
-
-		// Run delegates first; they may want to stop propagation beneath us
-		for ( i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) {
-			matched = handlerQueue[ i ];
-			event.currentTarget = matched.elem;
 
-			for ( j = 0; j < matched.matches.length && !event.isImmediatePropagationStopped(); j++ ) {
-				handleObj = matched.matches[ j ];
+			return event.result;
+		},
 
-				// Triggered event must either 1) be non-exclusive and have no namespace, or
-				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
-				if ( run_all || (!event.namespace && !handleObj.namespace) || event.namespace_re && event.namespace_re.test( handleObj.namespace ) ) {
+		// Includes some event props shared by KeyEvent and MouseEvent
+		// *** attrChange attrName relatedNode srcElement  are not normalized, non-W3C, deprecated, will be removed in 1.8 ***
+		props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
 
-					event.data = handleObj.data;
-					event.handleObj = handleObj;
+		fixHooks: {},
 
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
+		keyHooks: {
+			props: "char charCode key keyCode".split(" "),
+			filter: function (event, original) {
 
-					if ( ret !== undefined ) {
-						event.result = ret;
-						if ( ret === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
+				// Add which for key events
+				if (event.which == null) {
+					event.which = original.charCode != null ? original.charCode : original.keyCode;
 				}
+
+				return event;
 			}
-		}
+		},
 
-		return event.result;
-	},
+		mouseHooks: {
+			props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
+			filter: function (event, original) {
+				var eventDoc, doc, body,
+					button = original.button,
+					fromElement = original.fromElement;
 
-	// Includes some event props shared by KeyEvent and MouseEvent
-	// *** attrChange attrName relatedNode srcElement  are not normalized, non-W3C, deprecated, will be removed in 1.8 ***
-	props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
+				// Calculate pageX/Y if missing and clientX/Y available
+				if (event.pageX == null && original.clientX != null) {
+					eventDoc = event.target.ownerDocument || document;
+					doc = eventDoc.documentElement;
+					body = eventDoc.body;
 
-	fixHooks: {},
+					event.pageX = original.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
+					event.pageY = original.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc && doc.clientTop || body && body.clientTop || 0);
+				}
+
+				// Add relatedTarget, if necessary
+				if (!event.relatedTarget && fromElement) {
+					event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
+				}
 
-	keyHooks: {
-		props: "char charCode key keyCode".split(" "),
-		filter: function( event, original ) {
+				// Add which for click: 1 === left; 2 === middle; 3 === right
+				// Note: button is not normalized, so don't use it
+				if (!event.which && button !== undefined) {
+					event.which = (button & 1 ? 1 : (button & 2 ? 3 : (button & 4 ? 2 : 0)));
+				}
 
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
+				return event;
 			}
+		},
 
-			return event;
-		}
-	},
+		fix: function (event) {
+			if (event[jQuery.expando]) {
+				return event;
+			}
 
-	mouseHooks: {
-		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-		filter: function( event, original ) {
-			var eventDoc, doc, body,
-				button = original.button,
-				fromElement = original.fromElement;
+			// Create a writable copy of the event object and normalize some properties
+			var i, prop,
+				originalEvent = event,
+				fixHook = jQuery.event.fixHooks[event.type] || {},
+				copy = fixHook.props ? this.props.concat(fixHook.props) : this.props;
 
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
+			event = jQuery.Event(originalEvent);
 
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
+			for (i = copy.length; i;) {
+				prop = copy[--i];
+				event[prop] = originalEvent[prop];
 			}
 
-			// Add relatedTarget, if necessary
-			if ( !event.relatedTarget && fromElement ) {
-				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
+			// Fix target property, if necessary (#1925, IE 6/7/8 & Safari2)
+			if (!event.target) {
+				event.target = originalEvent.srcElement || document;
 			}
 
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
+			// Target should not be a text node (#504, Safari)
+			if (event.target.nodeType === 3) {
+				event.target = event.target.parentNode;
 			}
 
-			return event;
-		}
-	},
+			// For mouse/key events; add metaKey if it's not there (#3368, IE6/7/8)
+			if (event.metaKey === undefined) {
+				event.metaKey = event.ctrlKey;
+			}
 
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
+			return fixHook.filter ? fixHook.filter(event, originalEvent) : event;
+		},
 
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop,
-			originalEvent = event,
-			fixHook = jQuery.event.fixHooks[ event.type ] || {},
-			copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
+		special: {
+			ready: {
+				// Make sure the ready event is setup
+				setup: jQuery.bindReady
+			},
 
-		event = jQuery.Event( originalEvent );
-
-		for ( i = copy.length; i; ) {
-			prop = copy[ --i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Fix target property, if necessary (#1925, IE 6/7/8 & Safari2)
-		if ( !event.target ) {
-			event.target = originalEvent.srcElement || document;
-		}
-
-		// Target should not be a text node (#504, Safari)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		// For mouse/key events; add metaKey if it's not there (#3368, IE6/7/8)
-		if ( event.metaKey === undefined ) {
-			event.metaKey = event.ctrlKey;
-		}
-
-		return fixHook.filter? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	special: {
-		ready: {
-			// Make sure the ready event is setup
-			setup: jQuery.bindReady
-		},
+			load: {
+				// Prevent triggered image.load events from bubbling to window.load
+				noBubble: true
+			},
 
-		load: {
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
+			focus: {
+				delegateType: "focusin"
+			},
+			blur: {
+				delegateType: "focusout"
+			},
 
-		focus: {
-			delegateType: "focusin"
-		},
-		blur: {
-			delegateType: "focusout"
-		},
+			beforeunload: {
+				setup: function (data, namespaces, eventHandle) {
+					// We only want to do this special case on windows
+					if (jQuery.isWindow(this)) {
+						this.onbeforeunload = eventHandle;
+					}
+				},
 
-		beforeunload: {
-			setup: function( data, namespaces, eventHandle ) {
-				// We only want to do this special case on windows
-				if ( jQuery.isWindow( this ) ) {
-					this.onbeforeunload = eventHandle;
+				teardown: function (namespaces, eventHandle) {
+					if (this.onbeforeunload === eventHandle) {
+						this.onbeforeunload = null;
+					}
 				}
-			},
+			}
+		},
 
-			teardown: function( namespaces, eventHandle ) {
-				if ( this.onbeforeunload === eventHandle ) {
-					this.onbeforeunload = null;
+		simulate: function (type, elem, event, bubble) {
+			// Piggyback on a donor event to simulate a different one.
+			// Fake originalEvent to avoid donor's stopPropagation, but if the
+			// simulated event prevents default then we do the same on the donor.
+			var e = jQuery.extend(
+				new jQuery.Event(),
+				event,
+				{
+					type: type,
+					isSimulated: true,
+					originalEvent: {}
 				}
+			);
+			if (bubble) {
+				jQuery.event.trigger(e, null, elem);
+			} else {
+				jQuery.event.dispatch.call(elem, e);
+			}
+			if (e.isDefaultPrevented()) {
+				event.preventDefault();
 			}
 		}
-	},
-
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{ type: type,
-				isSimulated: true,
-				originalEvent: {}
-			}
-		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
-		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
-	}
-};
+	};
 
 // Some plugins are using, but it's undocumented/deprecated and will be removed.
 // The 1.7 special event interface should provide all the hooks needed now.
-jQuery.event.handle = jQuery.event.dispatch;
+	jQuery.event.handle = jQuery.event.dispatch;
 
-jQuery.removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle, false );
-		}
-	} :
-	function( elem, type, handle ) {
-		if ( elem.detachEvent ) {
-			elem.detachEvent( "on" + type, handle );
+	jQuery.removeEvent = document.removeEventListener ?
+		function (elem, type, handle) {
+			if (elem.removeEventListener) {
+				elem.removeEventListener(type, handle, false);
+			}
+		} :
+		function (elem, type, handle) {
+			if (elem.detachEvent) {
+				elem.detachEvent("on" + type, handle);
+			}
+		};
+
+	jQuery.Event = function (src, props) {
+		// Allow instantiation without the 'new' keyword
+		if (!(this instanceof jQuery.Event)) {
+			return new jQuery.Event(src, props);
 		}
-	};
 
-jQuery.Event = function( src, props ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
-		return new jQuery.Event( src, props );
-	}
+		// Event object
+		if (src && src.type) {
+			this.originalEvent = src;
+			this.type = src.type;
 
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
+			// Events bubbling up the document may have been marked as prevented
+			// by a handler lower down the tree; reflect the correct value.
+			this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false ||
+				src.getPreventDefault && src.getPreventDefault()) ? returnTrue : returnFalse;
 
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
-			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
+			// Event type
+		} else {
+			this.type = src;
+		}
 
-	// Event type
-	} else {
-		this.type = src;
-	}
+		// Put explicitly provided properties onto the event object
+		if (props) {
+			jQuery.extend(this, props);
+		}
 
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
+		// Create a timestamp if incoming event doesn't have one
+		this.timeStamp = src && src.timeStamp || jQuery.now();
 
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
+		// Mark it as fixed
+		this[jQuery.expando] = true;
+	};
 
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
+	function returnFalse() {
+		return false;
+	}
 
-function returnFalse() {
-	return false;
-}
-function returnTrue() {
-	return true;
-}
+	function returnTrue() {
+		return true;
+	}
 
 // jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
 // http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	preventDefault: function() {
-		this.isDefaultPrevented = returnTrue;
+	jQuery.Event.prototype = {
+		preventDefault: function () {
+			this.isDefaultPrevented = returnTrue;
 
-		var e = this.originalEvent;
-		if ( !e ) {
-			return;
-		}
+			var e = this.originalEvent;
+			if (!e) {
+				return;
+			}
 
-		// if preventDefault exists run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
+			// if preventDefault exists run it on the original event
+			if (e.preventDefault) {
+				e.preventDefault();
 
-		// otherwise set the returnValue property of the original event to false (IE)
-		} else {
-			e.returnValue = false;
-		}
-	},
-	stopPropagation: function() {
-		this.isPropagationStopped = returnTrue;
+				// otherwise set the returnValue property of the original event to false (IE)
+			} else {
+				e.returnValue = false;
+			}
+		},
+		stopPropagation: function () {
+			this.isPropagationStopped = returnTrue;
 
-		var e = this.originalEvent;
-		if ( !e ) {
-			return;
-		}
-		// if stopPropagation exists run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
-		// otherwise set the cancelBubble property of the original event to true (IE)
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		this.isImmediatePropagationStopped = returnTrue;
-		this.stopPropagation();
-	},
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse
-};
+			var e = this.originalEvent;
+			if (!e) {
+				return;
+			}
+			// if stopPropagation exists run it on the original event
+			if (e.stopPropagation) {
+				e.stopPropagation();
+			}
+			// otherwise set the cancelBubble property of the original event to true (IE)
+			e.cancelBubble = true;
+		},
+		stopImmediatePropagation: function () {
+			this.isImmediatePropagationStopped = returnTrue;
+			this.stopPropagation();
+		},
+		isDefaultPrevented: returnFalse,
+		isPropagationStopped: returnFalse,
+		isImmediatePropagationStopped: returnFalse
+	};
 
 // Create mouseenter/leave events using mouseover/out and event-time checks
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj,
-				selector = handleObj.selector,
-				ret;
-
-			// For mousenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
+	jQuery.each({
+		mouseenter: "mouseover",
+		mouseleave: "mouseout"
+	}, function (orig, fix) {
+		jQuery.event.special[orig] = {
+			delegateType: fix,
+			bindType: fix,
+
+			handle: function (event) {
+				var target = this,
+					related = event.relatedTarget,
+					handleObj = event.handleObj,
+					selector = handleObj.selector,
+					ret;
+
+				// For mousenter/leave call the handler if related is outside the target.
+				// NB: No relatedTarget if the mouse left/entered the browser window
+				if (!related || (related !== target && !jQuery.contains(target, related))) {
+					event.type = handleObj.origType;
+					ret = handleObj.handler.apply(this, arguments);
+					event.type = fix;
+				}
+				return ret;
 			}
-			return ret;
-		}
-	};
-});
+		};
+	});
 
 // IE submit delegation
-if ( !jQuery.support.submitBubbles ) {
+	if (!jQuery.support.submitBubbles) {
 
-	jQuery.event.special.submit = {
-		setup: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
+		jQuery.event.special.submit = {
+			setup: function () {
+				// Only need this for delegated form submit events
+				if (jQuery.nodeName(this, "form")) {
+					return false;
+				}
 
-			// Lazy-add a submit handler when a descendant form may potentially be submitted
-			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
-				// Node name check avoids a VML-related crash in IE (#9807)
-				var elem = e.target,
-					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
-				if ( form && !form._submit_attached ) {
-					jQuery.event.add( form, "submit._submit", function( event ) {
-						// If form was submitted by the user, bubble the event up the tree
-						if ( this.parentNode && !event.isTrigger ) {
-							jQuery.event.simulate( "submit", this.parentNode, event, true );
-						}
-					});
-					form._submit_attached = true;
+				// Lazy-add a submit handler when a descendant form may potentially be submitted
+				jQuery.event.add(this, "click._submit keypress._submit", function (e) {
+					// Node name check avoids a VML-related crash in IE (#9807)
+					var elem = e.target,
+						form = jQuery.nodeName(elem, "input") || jQuery.nodeName(elem, "button") ? elem.form : undefined;
+					if (form && !form._submit_attached) {
+						jQuery.event.add(form, "submit._submit", function (event) {
+							// If form was submitted by the user, bubble the event up the tree
+							if (this.parentNode && !event.isTrigger) {
+								jQuery.event.simulate("submit", this.parentNode, event, true);
+							}
+						});
+						form._submit_attached = true;
+					}
+				});
+				// return undefined since we don't need an event listener
+			},
+
+			teardown: function () {
+				// Only need this for delegated form submit events
+				if (jQuery.nodeName(this, "form")) {
+					return false;
 				}
-			});
-			// return undefined since we don't need an event listener
-		},
 
-		teardown: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
+				// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
+				jQuery.event.remove(this, "._submit");
 			}
-
-			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
-			jQuery.event.remove( this, "._submit" );
-		}
-	};
-}
+		};
+	}
 
 // IE change delegation and checkbox/radio fix
-if ( !jQuery.support.changeBubbles ) {
+	if (!jQuery.support.changeBubbles) {
 
-	jQuery.event.special.change = {
+		jQuery.event.special.change = {
 
-		setup: function() {
+			setup: function () {
 
-			if ( rformElems.test( this.nodeName ) ) {
-				// IE doesn't fire change on a check/radio until blur; trigger it on click
-				// after a propertychange. Eat the blur-change in special.change.handle.
-				// This still fires onchange a second time for check/radio after blur.
-				if ( this.type === "checkbox" || this.type === "radio" ) {
-					jQuery.event.add( this, "propertychange._change", function( event ) {
-						if ( event.originalEvent.propertyName === "checked" ) {
-							this._just_changed = true;
-						}
-					});
-					jQuery.event.add( this, "click._change", function( event ) {
-						if ( this._just_changed && !event.isTrigger ) {
-							this._just_changed = false;
-							jQuery.event.simulate( "change", this, event, true );
-						}
-					});
+				if (rformElems.test(this.nodeName)) {
+					// IE doesn't fire change on a check/radio until blur; trigger it on click
+					// after a propertychange. Eat the blur-change in special.change.handle.
+					// This still fires onchange a second time for check/radio after blur.
+					if (this.type === "checkbox" || this.type === "radio") {
+						jQuery.event.add(this, "propertychange._change", function (event) {
+							if (event.originalEvent.propertyName === "checked") {
+								this._just_changed = true;
+							}
+						});
+						jQuery.event.add(this, "click._change", function (event) {
+							if (this._just_changed && !event.isTrigger) {
+								this._just_changed = false;
+								jQuery.event.simulate("change", this, event, true);
+							}
+						});
+					}
+					return false;
 				}
-				return false;
-			}
-			// Delegated event; lazy-add a change handler on descendant inputs
-			jQuery.event.add( this, "beforeactivate._change", function( e ) {
-				var elem = e.target;
+				// Delegated event; lazy-add a change handler on descendant inputs
+				jQuery.event.add(this, "beforeactivate._change", function (e) {
+					var elem = e.target;
 
-				if ( rformElems.test( elem.nodeName ) && !elem._change_attached ) {
-					jQuery.event.add( elem, "change._change", function( event ) {
-						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
-							jQuery.event.simulate( "change", this.parentNode, event, true );
-						}
-					});
-					elem._change_attached = true;
-				}
-			});
-		},
+					if (rformElems.test(elem.nodeName) && !elem._change_attached) {
+						jQuery.event.add(elem, "change._change", function (event) {
+							if (this.parentNode && !event.isSimulated && !event.isTrigger) {
+								jQuery.event.simulate("change", this.parentNode, event, true);
+							}
+						});
+						elem._change_attached = true;
+					}
+				});
+			},
 
-		handle: function( event ) {
-			var elem = event.target;
+			handle: function (event) {
+				var elem = event.target;
 
-			// Swallow native change events from checkbox/radio, we already triggered them above
-			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
-				return event.handleObj.handler.apply( this, arguments );
-			}
-		},
+				// Swallow native change events from checkbox/radio, we already triggered them above
+				if (this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox")) {
+					return event.handleObj.handler.apply(this, arguments);
+				}
+			},
 
-		teardown: function() {
-			jQuery.event.remove( this, "._change" );
+			teardown: function () {
+				jQuery.event.remove(this, "._change");
 
-			return rformElems.test( this.nodeName );
-		}
-	};
-}
+				return rformElems.test(this.nodeName);
+			}
+		};
+	}
 
 // Create "bubbling" focus and blur events
-if ( !jQuery.support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+	if (!jQuery.support.focusinBubbles) {
+		jQuery.each({focus: "focusin", blur: "focusout"}, function (orig, fix) {
 
-		// Attach a single capturing handler while someone wants focusin/focusout
-		var attaches = 0,
-			handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
+			// Attach a single capturing handler while someone wants focusin/focusout
+			var attaches = 0,
+				handler = function (event) {
+					jQuery.event.simulate(fix, event.target, jQuery.event.fix(event), true);
+				};
+
+			jQuery.event.special[fix] = {
+				setup: function () {
+					if (attaches++ === 0) {
+						document.addEventListener(orig, handler, true);
+					}
+				},
+				teardown: function () {
+					if (--attaches === 0) {
+						document.removeEventListener(orig, handler, true);
+					}
+				}
 			};
+		});
+	}
+
+	jQuery.fn.extend({
+
+		on: function (types, selector, data, fn, /*INTERNAL*/ one) {
+			var origFn, type;
 
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				if ( attaches++ === 0 ) {
-					document.addEventListener( orig, handler, true );
+			// Types can be a map of types/handlers
+			if (typeof types === "object") {
+				// ( types-Object, selector, data )
+				if (typeof selector !== "string") {
+					// ( types-Object, data )
+					data = selector;
+					selector = undefined;
 				}
-			},
-			teardown: function() {
-				if ( --attaches === 0 ) {
-					document.removeEventListener( orig, handler, true );
+				for (type in types) {
+					this.on(type, selector, data, types[type], one);
 				}
+				return this;
 			}
-		};
-	});
-}
-
-jQuery.fn.extend({
-
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var origFn, type;
 
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) {
-				// ( types-Object, data )
-				data = selector;
-				selector = undefined;
+			if (data == null && fn == null) {
+				// ( types, fn )
+				fn = selector;
+				data = selector = undefined;
+			} else if (fn == null) {
+				if (typeof selector === "string") {
+					// ( types, selector, fn )
+					fn = data;
+					data = undefined;
+				} else {
+					// ( types, data, fn )
+					fn = data;
+					data = selector;
+					selector = undefined;
+				}
 			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
+			if (fn === false) {
+				fn = returnFalse;
+			} else if (!fn) {
+				return this;
 			}
-			return this;
-		}
 
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
+			if (one === 1) {
+				origFn = fn;
+				fn = function (event) {
+					// Can use an empty set, since event contains the info
+					jQuery().off(event);
+					return origFn.apply(this, arguments);
+				};
+				// Use same guid so caller can remove using origFn
+				fn.guid = origFn.guid || (origFn.guid = jQuery.guid++);
+			}
+			return this.each(function () {
+				jQuery.event.add(this, types, fn, data, selector);
+			});
+		},
+		one: function (types, selector, data, fn) {
+			return this.on.call(this, types, selector, data, fn, 1);
+		},
+		off: function (types, selector, fn) {
+			if (types && types.preventDefault && types.handleObj) {
+				// ( event )  dispatched jQuery.Event
+				var handleObj = types.handleObj;
+				jQuery(types.delegateTarget).off(
+					handleObj.namespace ? handleObj.type + "." + handleObj.namespace : handleObj.type,
+					handleObj.selector,
+					handleObj.handler
+				);
+				return this;
+			}
+			if (typeof types === "object") {
+				// ( types-object [, selector] )
+				for (var type in types) {
+					this.off(type, selector, types[type]);
+				}
+				return this;
+			}
+			if (selector === false || typeof selector === "function") {
+				// ( types [, fn] )
+				fn = selector;
 				selector = undefined;
 			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
+			if (fn === false) {
+				fn = returnFalse;
+			}
+			return this.each(function () {
+				jQuery.event.remove(this, types, fn, selector);
+			});
+		},
 
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
-	},
-	one: function( types, selector, data, fn ) {
-		return this.on.call( this, types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			var handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace? handleObj.type + "." + handleObj.namespace : handleObj.type,
-				handleObj.selector,
-				handleObj.handler
-			);
+		bind: function (types, data, fn) {
+			return this.on(types, null, data, fn);
+		},
+		unbind: function (types, fn) {
+			return this.off(types, null, fn);
+		},
+
+		live: function (types, data, fn) {
+			jQuery(this.context).on(types, this.selector, data, fn);
 			return this;
-		}
-		if ( typeof types === "object" ) {
-			// ( types-object [, selector] )
-			for ( var type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
+		},
+		die: function (types, fn) {
+			jQuery(this.context).off(types, this.selector || "**", fn);
 			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each(function() {
-			jQuery.event.remove( this, types, fn, selector );
-		});
-	},
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	live: function( types, data, fn ) {
-		jQuery( this.context ).on( types, this.selector, data, fn );
-		return this;
-	},
-	die: function( types, fn ) {
-		jQuery( this.context ).off( types, this.selector || "**", fn );
-		return this;
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length == 1? this.off( selector, "**" ) : this.off( types, selector, fn );
-	},
-
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-	triggerHandler: function( type, data ) {
-		if ( this[0] ) {
-			return jQuery.event.trigger( type, data, this[0], true );
-		}
-	},
+		},
 
-	toggle: function( fn ) {
-		// Save reference to arguments for access in closure
-		var args = arguments,
-			guid = fn.guid || jQuery.guid++,
-			i = 0,
-			toggler = function( event ) {
-				// Figure out which function to execute
-				var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
-				jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+		delegate: function (selector, types, data, fn) {
+			return this.on(types, selector, data, fn);
+		},
+		undelegate: function (selector, types, fn) {
+			// ( namespace ) or ( selector, types [, fn] )
+			return arguments.length == 1 ? this.off(selector, "**") : this.off(types, selector, fn);
+		},
 
-				// Make sure that clicks stop
-				event.preventDefault();
+		trigger: function (type, data) {
+			return this.each(function () {
+				jQuery.event.trigger(type, data, this);
+			});
+		},
+		triggerHandler: function (type, data) {
+			if (this[0]) {
+				return jQuery.event.trigger(type, data, this[0], true);
+			}
+		},
 
-				// and execute the function
-				return args[ lastToggle ].apply( this, arguments ) || false;
-			};
+		toggle: function (fn) {
+			// Save reference to arguments for access in closure
+			var args = arguments,
+				guid = fn.guid || jQuery.guid++,
+				i = 0,
+				toggler = function (event) {
+					// Figure out which function to execute
+					var lastToggle = (jQuery._data(this, "lastToggle" + fn.guid) || 0) % i;
+					jQuery._data(this, "lastToggle" + fn.guid, lastToggle + 1);
 
-		// link all the functions, so any of them can unbind this click handler
-		toggler.guid = guid;
-		while ( i < args.length ) {
-			args[ i++ ].guid = guid;
-		}
+					// Make sure that clicks stop
+					event.preventDefault();
 
-		return this.click( toggler );
-	},
+					// and execute the function
+					return args[lastToggle].apply(this, arguments) || false;
+				};
 
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	}
-});
+			// link all the functions, so any of them can unbind this click handler
+			toggler.guid = guid;
+			while (i < args.length) {
+				args[i++].guid = guid;
+			}
 
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
+			return this.click(toggler);
+		},
 
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		if ( fn == null ) {
-			fn = data;
-			data = null;
+		hover: function (fnOver, fnOut) {
+			return this.mouseenter(fnOver).mouseleave(fnOut || fnOver);
 		}
+	});
 
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
-	};
+	jQuery.each(("blur focus focusin focusout load resize scroll unload click dblclick " +
+		"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+		"change select submit keydown keypress keyup error contextmenu").split(" "), function (i, name) {
 
-	if ( jQuery.attrFn ) {
-		jQuery.attrFn[ name ] = true;
-	}
+		// Handle event binding
+		jQuery.fn[name] = function (data, fn) {
+			if (fn == null) {
+				fn = data;
+				data = null;
+			}
 
-	if ( rkeyEvent.test( name ) ) {
-		jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks;
-	}
+			return arguments.length > 0 ?
+				this.on(name, null, data, fn) :
+				this.trigger(name);
+		};
 
-	if ( rmouseEvent.test( name ) ) {
-		jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks;
-	}
-});
+		if (jQuery.attrFn) {
+			jQuery.attrFn[name] = true;
+		}
 
+		if (rkeyEvent.test(name)) {
+			jQuery.event.fixHooks[name] = jQuery.event.keyHooks;
+		}
+
+		if (rmouseEvent.test(name)) {
+			jQuery.event.fixHooks[name] = jQuery.event.mouseHooks;
+		}
+	});
 
 
-/*!
+	/*!
  * Sizzle CSS Selector Engine
  *  Copyright 2011, The Dojo Foundation
  *  Released under the MIT, BSD, and GPL Licenses.
  *  More information: http://sizzlejs.com/
  */
-(function(){
-
-var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
-	expando = "sizcache" + (Math.random() + '').replace('.', ''),
-	done = 0,
-	toString = Object.prototype.toString,
-	hasDuplicate = false,
-	baseHasDuplicate = true,
-	rBackslash = /\\/g,
-	rReturn = /\r\n/g,
-	rNonWord = /\W/;
+	(function () {
+
+		var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+			expando = "sizcache" + (Math.random() + '').replace('.', ''),
+			done = 0,
+			toString = Object.prototype.toString,
+			hasDuplicate = false,
+			baseHasDuplicate = true,
+			rBackslash = /\\/g,
+			rReturn = /\r\n/g,
+			rNonWord = /\W/;
 
 // Here we check if the JavaScript engine is using some sort of
 // optimization where it does not always call our comparision
 // function. If that is the case, discard the hasDuplicate value.
 //   Thus far that includes Google Chrome.
-[0, 0].sort(function() {
-	baseHasDuplicate = false;
-	return 0;
-});
+		[0, 0].sort(function () {
+			baseHasDuplicate = false;
+			return 0;
+		});
 
-var Sizzle = function( selector, context, results, seed ) {
-	results = results || [];
-	context = context || document;
+		var Sizzle = function (selector, context, results, seed) {
+			results = results || [];
+			context = context || document;
 
-	var origContext = context;
+			var origContext = context;
 
-	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
-		return [];
-	}
-	
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
+			if (context.nodeType !== 1 && context.nodeType !== 9) {
+				return [];
+			}
 
-	var m, set, checkSet, extra, ret, cur, pop, i,
-		prune = true,
-		contextXML = Sizzle.isXML( context ),
-		parts = [],
-		soFar = selector;
-	
-	// Reset the position of the chunker regexp (start from head)
-	do {
-		chunker.exec( "" );
-		m = chunker.exec( soFar );
-
-		if ( m ) {
-			soFar = m[3];
-		
-			parts.push( m[1] );
-		
-			if ( m[2] ) {
-				extra = m[3];
-				break;
+			if (!selector || typeof selector !== "string") {
+				return results;
 			}
-		}
-	} while ( m );
 
-	if ( parts.length > 1 && origPOS.exec( selector ) ) {
+			var m, set, checkSet, extra, ret, cur, pop, i,
+				prune = true,
+				contextXML = Sizzle.isXML(context),
+				parts = [],
+				soFar = selector;
 
-		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
-			set = posProcess( parts[0] + parts[1], context, seed );
+			// Reset the position of the chunker regexp (start from head)
+			do {
+				chunker.exec("");
+				m = chunker.exec(soFar);
 
-		} else {
-			set = Expr.relative[ parts[0] ] ?
-				[ context ] :
-				Sizzle( parts.shift(), context );
+				if (m) {
+					soFar = m[3];
 
-			while ( parts.length ) {
-				selector = parts.shift();
+					parts.push(m[1]);
 
-				if ( Expr.relative[ selector ] ) {
-					selector += parts.shift();
+					if (m[2]) {
+						extra = m[3];
+						break;
+					}
 				}
-				
-				set = posProcess( selector, set, seed );
-			}
-		}
+			} while (m);
 
-	} else {
-		// Take a shortcut and set the context if the root selector is an ID
-		// (but not if it'll be faster if the inner selector is an ID)
-		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
-				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
-
-			ret = Sizzle.find( parts.shift(), context, contextXML );
-			context = ret.expr ?
-				Sizzle.filter( ret.expr, ret.set )[0] :
-				ret.set[0];
-		}
+			if (parts.length > 1 && origPOS.exec(selector)) {
 
-		if ( context ) {
-			ret = seed ?
-				{ expr: parts.pop(), set: makeArray(seed) } :
-				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
+				if (parts.length === 2 && Expr.relative[parts[0]]) {
+					set = posProcess(parts[0] + parts[1], context, seed);
 
-			set = ret.expr ?
-				Sizzle.filter( ret.expr, ret.set ) :
-				ret.set;
-
-			if ( parts.length > 0 ) {
-				checkSet = makeArray( set );
+				} else {
+					set = Expr.relative[parts[0]] ?
+						[context] :
+						Sizzle(parts.shift(), context);
 
-			} else {
-				prune = false;
-			}
+					while (parts.length) {
+						selector = parts.shift();
 
-			while ( parts.length ) {
-				cur = parts.pop();
-				pop = cur;
+						if (Expr.relative[selector]) {
+							selector += parts.shift();
+						}
 
-				if ( !Expr.relative[ cur ] ) {
-					cur = "";
-				} else {
-					pop = parts.pop();
+						set = posProcess(selector, set, seed);
+					}
 				}
 
-				if ( pop == null ) {
-					pop = context;
+			} else {
+				// Take a shortcut and set the context if the root selector is an ID
+				// (but not if it'll be faster if the inner selector is an ID)
+				if (!seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
+					Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1])) {
+
+					ret = Sizzle.find(parts.shift(), context, contextXML);
+					context = ret.expr ?
+						Sizzle.filter(ret.expr, ret.set)[0] :
+						ret.set[0];
 				}
 
-				Expr.relative[ cur ]( checkSet, pop, contextXML );
-			}
+				if (context) {
+					ret = seed ?
+						{expr: parts.pop(), set: makeArray(seed)} :
+						Sizzle.find(parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML);
 
-		} else {
-			checkSet = parts = [];
-		}
-	}
+					set = ret.expr ?
+						Sizzle.filter(ret.expr, ret.set) :
+						ret.set;
 
-	if ( !checkSet ) {
-		checkSet = set;
-	}
+					if (parts.length > 0) {
+						checkSet = makeArray(set);
 
-	if ( !checkSet ) {
-		Sizzle.error( cur || selector );
-	}
+					} else {
+						prune = false;
+					}
+
+					while (parts.length) {
+						cur = parts.pop();
+						pop = cur;
 
-	if ( toString.call(checkSet) === "[object Array]" ) {
-		if ( !prune ) {
-			results.push.apply( results, checkSet );
+						if (!Expr.relative[cur]) {
+							cur = "";
+						} else {
+							pop = parts.pop();
+						}
+
+						if (pop == null) {
+							pop = context;
+						}
 
-		} else if ( context && context.nodeType === 1 ) {
-			for ( i = 0; checkSet[i] != null; i++ ) {
-				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {
-					results.push( set[i] );
+						Expr.relative[cur](checkSet, pop, contextXML);
+					}
+
+				} else {
+					checkSet = parts = [];
 				}
 			}
 
-		} else {
-			for ( i = 0; checkSet[i] != null; i++ ) {
-				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
-					results.push( set[i] );
-				}
+			if (!checkSet) {
+				checkSet = set;
 			}
-		}
 
-	} else {
-		makeArray( checkSet, results );
-	}
+			if (!checkSet) {
+				Sizzle.error(cur || selector);
+			}
 
-	if ( extra ) {
-		Sizzle( extra, origContext, results, seed );
-		Sizzle.uniqueSort( results );
-	}
+			if (toString.call(checkSet) === "[object Array]") {
+				if (!prune) {
+					results.push.apply(results, checkSet);
+
+				} else if (context && context.nodeType === 1) {
+					for (i = 0; checkSet[i] != null; i++) {
+						if (checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i]))) {
+							results.push(set[i]);
+						}
+					}
+
+				} else {
+					for (i = 0; checkSet[i] != null; i++) {
+						if (checkSet[i] && checkSet[i].nodeType === 1) {
+							results.push(set[i]);
+						}
+					}
+				}
+
+			} else {
+				makeArray(checkSet, results);
+			}
 
-	return results;
-};
+			if (extra) {
+				Sizzle(extra, origContext, results, seed);
+				Sizzle.uniqueSort(results);
+			}
+
+			return results;
+		};
 
-Sizzle.uniqueSort = function( results ) {
-	if ( sortOrder ) {
-		hasDuplicate = baseHasDuplicate;
-		results.sort( sortOrder );
+		Sizzle.uniqueSort = function (results) {
+			if (sortOrder) {
+				hasDuplicate = baseHasDuplicate;
+				results.sort(sortOrder);
 
-		if ( hasDuplicate ) {
-			for ( var i = 1; i < results.length; i++ ) {
-				if ( results[i] === results[ i - 1 ] ) {
-					results.splice( i--, 1 );
+				if (hasDuplicate) {
+					for (var i = 1; i < results.length; i++) {
+						if (results[i] === results[i - 1]) {
+							results.splice(i--, 1);
+						}
+					}
 				}
 			}
-		}
-	}
 
-	return results;
-};
+			return results;
+		};
 
-Sizzle.matches = function( expr, set ) {
-	return Sizzle( expr, null, null, set );
-};
+		Sizzle.matches = function (expr, set) {
+			return Sizzle(expr, null, null, set);
+		};
 
-Sizzle.matchesSelector = function( node, expr ) {
-	return Sizzle( expr, null, null, [node] ).length > 0;
-};
+		Sizzle.matchesSelector = function (node, expr) {
+			return Sizzle(expr, null, null, [node]).length > 0;
+		};
 
-Sizzle.find = function( expr, context, isXML ) {
-	var set, i, len, match, type, left;
+		Sizzle.find = function (expr, context, isXML) {
+			var set, i, len, match, type, left;
 
-	if ( !expr ) {
-		return [];
-	}
+			if (!expr) {
+				return [];
+			}
 
-	for ( i = 0, len = Expr.order.length; i < len; i++ ) {
-		type = Expr.order[i];
-		
-		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
-			left = match[1];
-			match.splice( 1, 1 );
+			for (i = 0, len = Expr.order.length; i < len; i++) {
+				type = Expr.order[i];
 
-			if ( left.substr( left.length - 1 ) !== "\\" ) {
-				match[1] = (match[1] || "").replace( rBackslash, "" );
-				set = Expr.find[ type ]( match, context, isXML );
+				if ((match = Expr.leftMatch[type].exec(expr))) {
+					left = match[1];
+					match.splice(1, 1);
 
-				if ( set != null ) {
-					expr = expr.replace( Expr.match[ type ], "" );
-					break;
+					if (left.substr(left.length - 1) !== "\\") {
+						match[1] = (match[1] || "").replace(rBackslash, "");
+						set = Expr.find[type](match, context, isXML);
+
+						if (set != null) {
+							expr = expr.replace(Expr.match[type], "");
+							break;
+						}
+					}
 				}
 			}
-		}
-	}
 
-	if ( !set ) {
-		set = typeof context.getElementsByTagName !== "undefined" ?
-			context.getElementsByTagName( "*" ) :
-			[];
-	}
+			if (!set) {
+				set = typeof context.getElementsByTagName !== "undefined" ?
+					context.getElementsByTagName("*") :
+					[];
+			}
 
-	return { set: set, expr: expr };
-};
+			return {set: set, expr: expr};
+		};
 
-Sizzle.filter = function( expr, set, inplace, not ) {
-	var match, anyFound,
-		type, found, item, filter, left,
-		i, pass,
-		old = expr,
-		result = [],
-		curLoop = set,
-		isXMLFilter = set && set[0] && Sizzle.isXML( set[0] );
+		Sizzle.filter = function (expr, set, inplace, not) {
+			var match, anyFound,
+				type, found, item, filter, left,
+				i, pass,
+				old = expr,
+				result = [],
+				curLoop = set,
+				isXMLFilter = set && set[0] && Sizzle.isXML(set[0]);
 
-	while ( expr && set.length ) {
-		for ( type in Expr.filter ) {
-			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
-				filter = Expr.filter[ type ];
-				left = match[1];
+			while (expr && set.length) {
+				for (type in Expr.filter) {
+					if ((match = Expr.leftMatch[type].exec(expr)) != null && match[2]) {
+						filter = Expr.filter[type];
+						left = match[1];
 
-				anyFound = false;
+						anyFound = false;
 
-				match.splice(1,1);
+						match.splice(1, 1);
 
-				if ( left.substr( left.length - 1 ) === "\\" ) {
-					continue;
-				}
+						if (left.substr(left.length - 1) === "\\") {
+							continue;
+						}
 
-				if ( curLoop === result ) {
-					result = [];
-				}
+						if (curLoop === result) {
+							result = [];
+						}
 
-				if ( Expr.preFilter[ type ] ) {
-					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
+						if (Expr.preFilter[type]) {
+							match = Expr.preFilter[type](match, curLoop, inplace, result, not, isXMLFilter);
 
-					if ( !match ) {
-						anyFound = found = true;
+							if (!match) {
+								anyFound = found = true;
 
-					} else if ( match === true ) {
-						continue;
-					}
-				}
+							} else if (match === true) {
+								continue;
+							}
+						}
 
-				if ( match ) {
-					for ( i = 0; (item = curLoop[i]) != null; i++ ) {
-						if ( item ) {
-							found = filter( item, match, i, curLoop );
-							pass = not ^ found;
+						if (match) {
+							for (i = 0; (item = curLoop[i]) != null; i++) {
+								if (item) {
+									found = filter(item, match, i, curLoop);
+									pass = not ^ found;
 
-							if ( inplace && found != null ) {
-								if ( pass ) {
-									anyFound = true;
+									if (inplace && found != null) {
+										if (pass) {
+											anyFound = true;
 
-								} else {
-									curLoop[i] = false;
+										} else {
+											curLoop[i] = false;
+										}
+
+									} else if (pass) {
+										result.push(item);
+										anyFound = true;
+									}
 								}
+							}
+						}
+
+						if (found !== undefined) {
+							if (!inplace) {
+								curLoop = result;
+							}
+
+							expr = expr.replace(Expr.match[type], "");
 
-							} else if ( pass ) {
-								result.push( item );
-								anyFound = true;
+							if (!anyFound) {
+								return [];
 							}
+
+							break;
 						}
 					}
 				}
 
-				if ( found !== undefined ) {
-					if ( !inplace ) {
-						curLoop = result;
-					}
-
-					expr = expr.replace( Expr.match[ type ], "" );
+				// Improper expression
+				if (expr === old) {
+					if (anyFound == null) {
+						Sizzle.error(expr);
 
-					if ( !anyFound ) {
-						return [];
+					} else {
+						break;
 					}
-
-					break;
 				}
+
+				old = expr;
 			}
-		}
 
-		// Improper expression
-		if ( expr === old ) {
-			if ( anyFound == null ) {
-				Sizzle.error( expr );
+			return curLoop;
+		};
+
+		Sizzle.error = function (msg) {
+			throw new Error("Syntax error, unrecognized expression: " + msg);
+		};
 
+		/**
+		 * Utility function for retreiving the text value of an array of DOM nodes
+		 * @param {Array|Element} elem
+		 */
+		var getText = Sizzle.getText = function (elem) {
+			var i, node,
+				nodeType = elem.nodeType,
+				ret = "";
+
+			if (nodeType) {
+				if (nodeType === 1 || nodeType === 9) {
+					// Use textContent || innerText for elements
+					if (typeof elem.textContent === 'string') {
+						return elem.textContent;
+					} else if (typeof elem.innerText === 'string') {
+						// Replace IE's carriage returns
+						return elem.innerText.replace(rReturn, '');
+					} else {
+						// Traverse it's children
+						for (elem = elem.firstChild; elem; elem = elem.nextSibling) {
+							ret += getText(elem);
+						}
+					}
+				} else if (nodeType === 3 || nodeType === 4) {
+					return elem.nodeValue;
+				}
 			} else {
-				break;
+
+				// If no nodeType, this is expected to be an array
+				for (i = 0; (node = elem[i]); i++) {
+					// Do not traverse comment nodes
+					if (node.nodeType !== 8) {
+						ret += getText(node);
+					}
+				}
 			}
-		}
+			return ret;
+		};
 
-		old = expr;
-	}
+		var Expr = Sizzle.selectors = {
+			order: ["ID", "NAME", "TAG"],
+
+			match: {
+				ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
+				CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
+				NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,
+				ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,
+				TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,
+				CHILD: /:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,
+				POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,
+				PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
+			},
 
-	return curLoop;
-};
+			leftMatch: {},
 
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
+			attrMap: {
+				"class": "className",
+				"for": "htmlFor"
+			},
 
-/**
- * Utility function for retreiving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-var getText = Sizzle.getText = function( elem ) {
-    var i, node,
-		nodeType = elem.nodeType,
-		ret = "";
-
-	if ( nodeType ) {
-		if ( nodeType === 1 || nodeType === 9 ) {
-			// Use textContent || innerText for elements
-			if ( typeof elem.textContent === 'string' ) {
-				return elem.textContent;
-			} else if ( typeof elem.innerText === 'string' ) {
-				// Replace IE's carriage returns
-				return elem.innerText.replace( rReturn, '' );
-			} else {
-				// Traverse it's children
-				for ( elem = elem.firstChild; elem; elem = elem.nextSibling) {
-					ret += getText( elem );
+			attrHandle: {
+				href: function (elem) {
+					return elem.getAttribute("href");
+				},
+				type: function (elem) {
+					return elem.getAttribute("type");
 				}
-			}
-		} else if ( nodeType === 3 || nodeType === 4 ) {
-			return elem.nodeValue;
-		}
-	} else {
+			},
 
-		// If no nodeType, this is expected to be an array
-		for ( i = 0; (node = elem[i]); i++ ) {
-			// Do not traverse comment nodes
-			if ( node.nodeType !== 8 ) {
-				ret += getText( node );
-			}
-		}
-	}
-	return ret;
-};
-
-var Expr = Sizzle.selectors = {
-	order: [ "ID", "NAME", "TAG" ],
-
-	match: {
-		ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
-		CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
-		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,
-		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,
-		TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,
-		CHILD: /:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,
-		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,
-		PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
-	},
-
-	leftMatch: {},
-
-	attrMap: {
-		"class": "className",
-		"for": "htmlFor"
-	},
-
-	attrHandle: {
-		href: function( elem ) {
-			return elem.getAttribute( "href" );
-		},
-		type: function( elem ) {
-			return elem.getAttribute( "type" );
-		}
-	},
+			relative: {
+				"+": function (checkSet, part) {
+					var isPartStr = typeof part === "string",
+						isTag = isPartStr && !rNonWord.test(part),
+						isPartStrNotTag = isPartStr && !isTag;
 
-	relative: {
-		"+": function(checkSet, part){
-			var isPartStr = typeof part === "string",
-				isTag = isPartStr && !rNonWord.test( part ),
-				isPartStrNotTag = isPartStr && !isTag;
+					if (isTag) {
+						part = part.toLowerCase();
+					}
 
-			if ( isTag ) {
-				part = part.toLowerCase();
-			}
+					for (var i = 0, l = checkSet.length, elem; i < l; i++) {
+						if ((elem = checkSet[i])) {
+							while ((elem = elem.previousSibling) && elem.nodeType !== 1) {
+							}
 
-			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
-				if ( (elem = checkSet[i]) ) {
-					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
+							checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
+								elem || false :
+								elem === part;
+						}
+					}
 
-					checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
-						elem || false :
-						elem === part;
-				}
-			}
+					if (isPartStrNotTag) {
+						Sizzle.filter(part, checkSet, true);
+					}
+				},
 
-			if ( isPartStrNotTag ) {
-				Sizzle.filter( part, checkSet, true );
-			}
-		},
+				">": function (checkSet, part) {
+					var elem,
+						isPartStr = typeof part === "string",
+						i = 0,
+						l = checkSet.length;
 
-		">": function( checkSet, part ) {
-			var elem,
-				isPartStr = typeof part === "string",
-				i = 0,
-				l = checkSet.length;
+					if (isPartStr && !rNonWord.test(part)) {
+						part = part.toLowerCase();
 
-			if ( isPartStr && !rNonWord.test( part ) ) {
-				part = part.toLowerCase();
+						for (; i < l; i++) {
+							elem = checkSet[i];
 
-				for ( ; i < l; i++ ) {
-					elem = checkSet[i];
+							if (elem) {
+								var parent = elem.parentNode;
+								checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
+							}
+						}
+
+					} else {
+						for (; i < l; i++) {
+							elem = checkSet[i];
+
+							if (elem) {
+								checkSet[i] = isPartStr ?
+									elem.parentNode :
+									elem.parentNode === part;
+							}
+						}
+
+						if (isPartStr) {
+							Sizzle.filter(part, checkSet, true);
+						}
+					}
+				},
+
+				"": function (checkSet, part, isXML) {
+					var nodeCheck,
+						doneName = done++,
+						checkFn = dirCheck;
+
+					if (typeof part === "string" && !rNonWord.test(part)) {
+						part = part.toLowerCase();
+						nodeCheck = part;
+						checkFn = dirNodeCheck;
+					}
+
+					checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);
+				},
+
+				"~": function (checkSet, part, isXML) {
+					var nodeCheck,
+						doneName = done++,
+						checkFn = dirCheck;
+
+					if (typeof part === "string" && !rNonWord.test(part)) {
+						part = part.toLowerCase();
+						nodeCheck = part;
+						checkFn = dirNodeCheck;
+					}
+
+					checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML);
+				}
+			},
+
+			find: {
+				ID: function (match, context, isXML) {
+					if (typeof context.getElementById !== "undefined" && !isXML) {
+						var m = context.getElementById(match[1]);
+						// Check parentNode to catch when Blackberry 4.6 returns
+						// nodes that are no longer in the document #6963
+						return m && m.parentNode ? [m] : [];
+					}
+				},
+
+				NAME: function (match, context) {
+					if (typeof context.getElementsByName !== "undefined") {
+						var ret = [],
+							results = context.getElementsByName(match[1]);
+
+						for (var i = 0, l = results.length; i < l; i++) {
+							if (results[i].getAttribute("name") === match[1]) {
+								ret.push(results[i]);
+							}
+						}
 
-					if ( elem ) {
-						var parent = elem.parentNode;
-						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
+						return ret.length === 0 ? null : ret;
 					}
-				}
-
-			} else {
-				for ( ; i < l; i++ ) {
-					elem = checkSet[i];
+				},
 
-					if ( elem ) {
-						checkSet[i] = isPartStr ?
-							elem.parentNode :
-							elem.parentNode === part;
+				TAG: function (match, context) {
+					if (typeof context.getElementsByTagName !== "undefined") {
+						return context.getElementsByTagName(match[1]);
 					}
 				}
+			},
+			preFilter: {
+				CLASS: function (match, curLoop, inplace, result, not, isXML) {
+					match = " " + match[1].replace(rBackslash, "") + " ";
 
-				if ( isPartStr ) {
-					Sizzle.filter( part, checkSet, true );
-				}
-			}
-		},
+					if (isXML) {
+						return match;
+					}
 
-		"": function(checkSet, part, isXML){
-			var nodeCheck,
-				doneName = done++,
-				checkFn = dirCheck;
+					for (var i = 0, elem; (elem = curLoop[i]) != null; i++) {
+						if (elem) {
+							if (not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0)) {
+								if (!inplace) {
+									result.push(elem);
+								}
 
-			if ( typeof part === "string" && !rNonWord.test( part ) ) {
-				part = part.toLowerCase();
-				nodeCheck = part;
-				checkFn = dirNodeCheck;
-			}
+							} else if (inplace) {
+								curLoop[i] = false;
+							}
+						}
+					}
 
-			checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML );
-		},
+					return false;
+				},
 
-		"~": function( checkSet, part, isXML ) {
-			var nodeCheck,
-				doneName = done++,
-				checkFn = dirCheck;
+				ID: function (match) {
+					return match[1].replace(rBackslash, "");
+				},
 
-			if ( typeof part === "string" && !rNonWord.test( part ) ) {
-				part = part.toLowerCase();
-				nodeCheck = part;
-				checkFn = dirNodeCheck;
-			}
+				TAG: function (match, curLoop) {
+					return match[1].replace(rBackslash, "").toLowerCase();
+				},
 
-			checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML );
-		}
-	},
+				CHILD: function (match) {
+					if (match[1] === "nth") {
+						if (!match[2]) {
+							Sizzle.error(match[0]);
+						}
 
-	find: {
-		ID: function( match, context, isXML ) {
-			if ( typeof context.getElementById !== "undefined" && !isXML ) {
-				var m = context.getElementById(match[1]);
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [m] : [];
-			}
-		},
+						match[2] = match[2].replace(/^\+|\s*/g, '');
 
-		NAME: function( match, context ) {
-			if ( typeof context.getElementsByName !== "undefined" ) {
-				var ret = [],
-					results = context.getElementsByName( match[1] );
+						// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
+						var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec(
+							match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
+							!/\D/.test(match[2]) && "0n+" + match[2] || match[2]);
 
-				for ( var i = 0, l = results.length; i < l; i++ ) {
-					if ( results[i].getAttribute("name") === match[1] ) {
-						ret.push( results[i] );
+						// calculate the numbers (first)n+(last) including if they are negative
+						match[2] = (test[1] + (test[2] || 1)) - 0;
+						match[3] = test[3] - 0;
+					} else if (match[2]) {
+						Sizzle.error(match[0]);
 					}
-				}
-
-				return ret.length === 0 ? null : ret;
-			}
-		},
 
-		TAG: function( match, context ) {
-			if ( typeof context.getElementsByTagName !== "undefined" ) {
-				return context.getElementsByTagName( match[1] );
-			}
-		}
-	},
-	preFilter: {
-		CLASS: function( match, curLoop, inplace, result, not, isXML ) {
-			match = " " + match[1].replace( rBackslash, "" ) + " ";
+					// TODO: Move to normal caching system
+					match[0] = done++;
 
-			if ( isXML ) {
-				return match;
-			}
+					return match;
+				},
 
-			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
-				if ( elem ) {
-					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0) ) {
-						if ( !inplace ) {
-							result.push( elem );
-						}
+				ATTR: function (match, curLoop, inplace, result, not, isXML) {
+					var name = match[1] = match[1].replace(rBackslash, "");
 
-					} else if ( inplace ) {
-						curLoop[i] = false;
+					if (!isXML && Expr.attrMap[name]) {
+						match[1] = Expr.attrMap[name];
 					}
-				}
-			}
 
-			return false;
-		},
-
-		ID: function( match ) {
-			return match[1].replace( rBackslash, "" );
-		},
+					// Handle if an un-quoted value was used
+					match[4] = (match[4] || match[5] || "").replace(rBackslash, "");
 
-		TAG: function( match, curLoop ) {
-			return match[1].replace( rBackslash, "" ).toLowerCase();
-		},
+					if (match[2] === "~=") {
+						match[4] = " " + match[4] + " ";
+					}
 
-		CHILD: function( match ) {
-			if ( match[1] === "nth" ) {
-				if ( !match[2] ) {
-					Sizzle.error( match[0] );
-				}
+					return match;
+				},
 
-				match[2] = match[2].replace(/^\+|\s*/g, '');
+				PSEUDO: function (match, curLoop, inplace, result, not) {
+					if (match[1] === "not") {
+						// If we're dealing with a complex expression, or a simple one
+						if ((chunker.exec(match[3]) || "").length > 1 || /^\w/.test(match[3])) {
+							match[3] = Sizzle(match[3], null, null, curLoop);
 
-				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
-				var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec(
-					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
-					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
+						} else {
+							var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
 
-				// calculate the numbers (first)n+(last) including if they are negative
-				match[2] = (test[1] + (test[2] || 1)) - 0;
-				match[3] = test[3] - 0;
-			}
-			else if ( match[2] ) {
-				Sizzle.error( match[0] );
-			}
+							if (!inplace) {
+								result.push.apply(result, ret);
+							}
 
-			// TODO: Move to normal caching system
-			match[0] = done++;
+							return false;
+						}
 
-			return match;
-		},
+					} else if (Expr.match.POS.test(match[0]) || Expr.match.CHILD.test(match[0])) {
+						return true;
+					}
 
-		ATTR: function( match, curLoop, inplace, result, not, isXML ) {
-			var name = match[1] = match[1].replace( rBackslash, "" );
-			
-			if ( !isXML && Expr.attrMap[name] ) {
-				match[1] = Expr.attrMap[name];
-			}
+					return match;
+				},
 
-			// Handle if an un-quoted value was used
-			match[4] = ( match[4] || match[5] || "" ).replace( rBackslash, "" );
+				POS: function (match) {
+					match.unshift(true);
 
-			if ( match[2] === "~=" ) {
-				match[4] = " " + match[4] + " ";
-			}
+					return match;
+				}
+			},
 
-			return match;
-		},
+			filters: {
+				enabled: function (elem) {
+					return elem.disabled === false && elem.type !== "hidden";
+				},
 
-		PSEUDO: function( match, curLoop, inplace, result, not ) {
-			if ( match[1] === "not" ) {
-				// If we're dealing with a complex expression, or a simple one
-				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
-					match[3] = Sizzle(match[3], null, null, curLoop);
+				disabled: function (elem) {
+					return elem.disabled === true;
+				},
 
-				} else {
-					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
+				checked: function (elem) {
+					return elem.checked === true;
+				},
 
-					if ( !inplace ) {
-						result.push.apply( result, ret );
+				selected: function (elem) {
+					// Accessing this property makes selected-by-default
+					// options in Safari work properly
+					if (elem.parentNode) {
+						elem.parentNode.selectedIndex;
 					}
 
-					return false;
-				}
-
-			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
-				return true;
-			}
-			
-			return match;
-		},
+					return elem.selected === true;
+				},
 
-		POS: function( match ) {
-			match.unshift( true );
+				parent: function (elem) {
+					return !!elem.firstChild;
+				},
 
-			return match;
-		}
-	},
-	
-	filters: {
-		enabled: function( elem ) {
-			return elem.disabled === false && elem.type !== "hidden";
-		},
+				empty: function (elem) {
+					return !elem.firstChild;
+				},
 
-		disabled: function( elem ) {
-			return elem.disabled === true;
-		},
+				has: function (elem, i, match) {
+					return !!Sizzle(match[3], elem).length;
+				},
 
-		checked: function( elem ) {
-			return elem.checked === true;
-		},
-		
-		selected: function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-			
-			return elem.selected === true;
-		},
+				header: function (elem) {
+					return (/h\d/i).test(elem.nodeName);
+				},
 
-		parent: function( elem ) {
-			return !!elem.firstChild;
-		},
+				text: function (elem) {
+					var attr = elem.getAttribute("type"), type = elem.type;
+					// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
+					// use getAttribute instead to test this case
+					return elem.nodeName.toLowerCase() === "input" && "text" === type && (attr === type || attr === null);
+				},
 
-		empty: function( elem ) {
-			return !elem.firstChild;
-		},
+				radio: function (elem) {
+					return elem.nodeName.toLowerCase() === "input" && "radio" === elem.type;
+				},
 
-		has: function( elem, i, match ) {
-			return !!Sizzle( match[3], elem ).length;
-		},
+				checkbox: function (elem) {
+					return elem.nodeName.toLowerCase() === "input" && "checkbox" === elem.type;
+				},
 
-		header: function( elem ) {
-			return (/h\d/i).test( elem.nodeName );
-		},
+				file: function (elem) {
+					return elem.nodeName.toLowerCase() === "input" && "file" === elem.type;
+				},
 
-		text: function( elem ) {
-			var attr = elem.getAttribute( "type" ), type = elem.type;
-			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) 
-			// use getAttribute instead to test this case
-			return elem.nodeName.toLowerCase() === "input" && "text" === type && ( attr === type || attr === null );
-		},
+				password: function (elem) {
+					return elem.nodeName.toLowerCase() === "input" && "password" === elem.type;
+				},
 
-		radio: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "radio" === elem.type;
-		},
+				submit: function (elem) {
+					var name = elem.nodeName.toLowerCase();
+					return (name === "input" || name === "button") && "submit" === elem.type;
+				},
 
-		checkbox: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "checkbox" === elem.type;
-		},
+				image: function (elem) {
+					return elem.nodeName.toLowerCase() === "input" && "image" === elem.type;
+				},
 
-		file: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "file" === elem.type;
-		},
+				reset: function (elem) {
+					var name = elem.nodeName.toLowerCase();
+					return (name === "input" || name === "button") && "reset" === elem.type;
+				},
 
-		password: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "password" === elem.type;
-		},
+				button: function (elem) {
+					var name = elem.nodeName.toLowerCase();
+					return name === "input" && "button" === elem.type || name === "button";
+				},
 
-		submit: function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return (name === "input" || name === "button") && "submit" === elem.type;
-		},
+				input: function (elem) {
+					return (/input|select|textarea|button/i).test(elem.nodeName);
+				},
 
-		image: function( elem ) {
-			return elem.nodeName.toLowerCase() === "input" && "image" === elem.type;
-		},
+				focus: function (elem) {
+					return elem === elem.ownerDocument.activeElement;
+				}
+			},
+			setFilters: {
+				first: function (elem, i) {
+					return i === 0;
+				},
 
-		reset: function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return (name === "input" || name === "button") && "reset" === elem.type;
-		},
+				last: function (elem, i, match, array) {
+					return i === array.length - 1;
+				},
 
-		button: function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && "button" === elem.type || name === "button";
-		},
+				even: function (elem, i) {
+					return i % 2 === 0;
+				},
 
-		input: function( elem ) {
-			return (/input|select|textarea|button/i).test( elem.nodeName );
-		},
+				odd: function (elem, i) {
+					return i % 2 === 1;
+				},
 
-		focus: function( elem ) {
-			return elem === elem.ownerDocument.activeElement;
-		}
-	},
-	setFilters: {
-		first: function( elem, i ) {
-			return i === 0;
-		},
+				lt: function (elem, i, match) {
+					return i < match[3] - 0;
+				},
 
-		last: function( elem, i, match, array ) {
-			return i === array.length - 1;
-		},
+				gt: function (elem, i, match) {
+					return i > match[3] - 0;
+				},
 
-		even: function( elem, i ) {
-			return i % 2 === 0;
-		},
+				nth: function (elem, i, match) {
+					return match[3] - 0 === i;
+				},
 
-		odd: function( elem, i ) {
-			return i % 2 === 1;
-		},
+				eq: function (elem, i, match) {
+					return match[3] - 0 === i;
+				}
+			},
+			filter: {
+				PSEUDO: function (elem, match, i, array) {
+					var name = match[1],
+						filter = Expr.filters[name];
 
-		lt: function( elem, i, match ) {
-			return i < match[3] - 0;
-		},
+					if (filter) {
+						return filter(elem, i, match, array);
 
-		gt: function( elem, i, match ) {
-			return i > match[3] - 0;
-		},
+					} else if (name === "contains") {
+						return (elem.textContent || elem.innerText || getText([elem]) || "").indexOf(match[3]) >= 0;
 
-		nth: function( elem, i, match ) {
-			return match[3] - 0 === i;
-		},
+					} else if (name === "not") {
+						var not = match[3];
 
-		eq: function( elem, i, match ) {
-			return match[3] - 0 === i;
-		}
-	},
-	filter: {
-		PSEUDO: function( elem, match, i, array ) {
-			var name = match[1],
-				filter = Expr.filters[ name ];
+						for (var j = 0, l = not.length; j < l; j++) {
+							if (not[j] === elem) {
+								return false;
+							}
+						}
 
-			if ( filter ) {
-				return filter( elem, i, match, array );
+						return true;
 
-			} else if ( name === "contains" ) {
-				return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0;
+					} else {
+						Sizzle.error(name);
+					}
+				},
 
-			} else if ( name === "not" ) {
-				var not = match[3];
+				CHILD: function (elem, match) {
+					var first, last,
+						doneName, parent, cache,
+						count, diff,
+						type = match[1],
+						node = elem;
+
+					switch (type) {
+						case "only":
+						case "first":
+							while ((node = node.previousSibling)) {
+								if (node.nodeType === 1) {
+									return false;
+								}
+							}
 
-				for ( var j = 0, l = not.length; j < l; j++ ) {
-					if ( not[j] === elem ) {
-						return false;
-					}
-				}
+							if (type === "first") {
+								return true;
+							}
 
-				return true;
+							node = elem;
 
-			} else {
-				Sizzle.error( name );
-			}
-		},
+						case "last":
+							while ((node = node.nextSibling)) {
+								if (node.nodeType === 1) {
+									return false;
+								}
+							}
 
-		CHILD: function( elem, match ) {
-			var first, last,
-				doneName, parent, cache,
-				count, diff,
-				type = match[1],
-				node = elem;
-
-			switch ( type ) {
-				case "only":
-				case "first":
-					while ( (node = node.previousSibling) )	 {
-						if ( node.nodeType === 1 ) { 
-							return false; 
-						}
-					}
+							return true;
 
-					if ( type === "first" ) { 
-						return true; 
-					}
+						case "nth":
+							first = match[2];
+							last = match[3];
 
-					node = elem;
+							if (first === 1 && last === 0) {
+								return true;
+							}
 
-				case "last":
-					while ( (node = node.nextSibling) )	 {
-						if ( node.nodeType === 1 ) { 
-							return false; 
-						}
-					}
+							doneName = match[0];
+							parent = elem.parentNode;
 
-					return true;
+							if (parent && (parent[expando] !== doneName || !elem.nodeIndex)) {
+								count = 0;
 
-				case "nth":
-					first = match[2];
-					last = match[3];
+								for (node = parent.firstChild; node; node = node.nextSibling) {
+									if (node.nodeType === 1) {
+										node.nodeIndex = ++count;
+									}
+								}
 
-					if ( first === 1 && last === 0 ) {
-						return true;
-					}
-					
-					doneName = match[0];
-					parent = elem.parentNode;
-	
-					if ( parent && (parent[ expando ] !== doneName || !elem.nodeIndex) ) {
-						count = 0;
-						
-						for ( node = parent.firstChild; node; node = node.nextSibling ) {
-							if ( node.nodeType === 1 ) {
-								node.nodeIndex = ++count;
+								parent[expando] = doneName;
 							}
-						} 
 
-						parent[ expando ] = doneName;
-					}
-					
-					diff = elem.nodeIndex - last;
+							diff = elem.nodeIndex - last;
 
-					if ( first === 0 ) {
-						return diff === 0;
+							if (first === 0) {
+								return diff === 0;
 
-					} else {
-						return ( diff % first === 0 && diff / first >= 0 );
+							} else {
+								return (diff % first === 0 && diff / first >= 0);
+							}
 					}
-			}
-		},
+				},
 
-		ID: function( elem, match ) {
-			return elem.nodeType === 1 && elem.getAttribute("id") === match;
-		},
+				ID: function (elem, match) {
+					return elem.nodeType === 1 && elem.getAttribute("id") === match;
+				},
 
-		TAG: function( elem, match ) {
-			return (match === "*" && elem.nodeType === 1) || !!elem.nodeName && elem.nodeName.toLowerCase() === match;
-		},
-		
-		CLASS: function( elem, match ) {
-			return (" " + (elem.className || elem.getAttribute("class")) + " ")
-				.indexOf( match ) > -1;
-		},
+				TAG: function (elem, match) {
+					return (match === "*" && elem.nodeType === 1) || !!elem.nodeName && elem.nodeName.toLowerCase() === match;
+				},
 
-		ATTR: function( elem, match ) {
-			var name = match[1],
-				result = Sizzle.attr ?
-					Sizzle.attr( elem, name ) :
-					Expr.attrHandle[ name ] ?
-					Expr.attrHandle[ name ]( elem ) :
-					elem[ name ] != null ?
-						elem[ name ] :
-						elem.getAttribute( name ),
-				value = result + "",
-				type = match[2],
-				check = match[4];
-
-			return result == null ?
-				type === "!=" :
-				!type && Sizzle.attr ?
-				result != null :
-				type === "=" ?
-				value === check :
-				type === "*=" ?
-				value.indexOf(check) >= 0 :
-				type === "~=" ?
-				(" " + value + " ").indexOf(check) >= 0 :
-				!check ?
-				value && result !== false :
-				type === "!=" ?
-				value !== check :
-				type === "^=" ?
-				value.indexOf(check) === 0 :
-				type === "$=" ?
-				value.substr(value.length - check.length) === check :
-				type === "|=" ?
-				value === check || value.substr(0, check.length + 1) === check + "-" :
-				false;
-		},
+				CLASS: function (elem, match) {
+					return (" " + (elem.className || elem.getAttribute("class")) + " ")
+						.indexOf(match) > -1;
+				},
+
+				ATTR: function (elem, match) {
+					var name = match[1],
+						result = Sizzle.attr ?
+							Sizzle.attr(elem, name) :
+							Expr.attrHandle[name] ?
+								Expr.attrHandle[name](elem) :
+								elem[name] != null ?
+									elem[name] :
+									elem.getAttribute(name),
+						value = result + "",
+						type = match[2],
+						check = match[4];
+
+					return result == null ?
+						type === "!=" :
+						!type && Sizzle.attr ?
+							result != null :
+							type === "=" ?
+								value === check :
+								type === "*=" ?
+									value.indexOf(check) >= 0 :
+									type === "~=" ?
+										(" " + value + " ").indexOf(check) >= 0 :
+										!check ?
+											value && result !== false :
+											type === "!=" ?
+												value !== check :
+												type === "^=" ?
+													value.indexOf(check) === 0 :
+													type === "$=" ?
+														value.substr(value.length - check.length) === check :
+														type === "|=" ?
+															value === check || value.substr(0, check.length + 1) === check + "-" :
+															false;
+				},
 
-		POS: function( elem, match, i, array ) {
-			var name = match[2],
-				filter = Expr.setFilters[ name ];
+				POS: function (elem, match, i, array) {
+					var name = match[2],
+						filter = Expr.setFilters[name];
 
-			if ( filter ) {
-				return filter( elem, i, match, array );
+					if (filter) {
+						return filter(elem, i, match, array);
+					}
+				}
 			}
-		}
-	}
-};
+		};
 
-var origPOS = Expr.match.POS,
-	fescape = function(all, num){
-		return "\\" + (num - 0 + 1);
-	};
+		var origPOS = Expr.match.POS,
+			fescape = function (all, num) {
+				return "\\" + (num - 0 + 1);
+			};
 
-for ( var type in Expr.match ) {
-	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );
-	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );
-}
+		for (var type in Expr.match) {
+			Expr.match[type] = new RegExp(Expr.match[type].source + (/(?![^\[]*\])(?![^\(]*\))/.source));
+			Expr.leftMatch[type] = new RegExp(/(^(?:.|\r|\n)*?)/.source + Expr.match[type].source.replace(/\\(\d+)/g, fescape));
+		}
 
-var makeArray = function( array, results ) {
-	array = Array.prototype.slice.call( array, 0 );
+		var makeArray = function (array, results) {
+			array = Array.prototype.slice.call(array, 0);
 
-	if ( results ) {
-		results.push.apply( results, array );
-		return results;
-	}
-	
-	return array;
-};
+			if (results) {
+				results.push.apply(results, array);
+				return results;
+			}
+
+			return array;
+		};
 
 // Perform a simple check to determine if the browser is capable of
 // converting a NodeList to an array using builtin methods.
 // Also verifies that the returned array holds DOM nodes
 // (which is not the case in the Blackberry browser)
-try {
-	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
+		try {
+			Array.prototype.slice.call(document.documentElement.childNodes, 0)[0].nodeType;
 
 // Provide a fallback method if it does not work
-} catch( e ) {
-	makeArray = function( array, results ) {
-		var i = 0,
-			ret = results || [];
+		} catch (e) {
+			makeArray = function (array, results) {
+				var i = 0,
+					ret = results || [];
 
-		if ( toString.call(array) === "[object Array]" ) {
-			Array.prototype.push.apply( ret, array );
+				if (toString.call(array) === "[object Array]") {
+					Array.prototype.push.apply(ret, array);
 
-		} else {
-			if ( typeof array.length === "number" ) {
-				for ( var l = array.length; i < l; i++ ) {
-					ret.push( array[i] );
-				}
+				} else {
+					if (typeof array.length === "number") {
+						for (var l = array.length; i < l; i++) {
+							ret.push(array[i]);
+						}
 
-			} else {
-				for ( ; array[i]; i++ ) {
-					ret.push( array[i] );
+					} else {
+						for (; array[i]; i++) {
+							ret.push(array[i]);
+						}
+					}
 				}
-			}
+
+				return ret;
+			};
 		}
 
-		return ret;
-	};
-}
+		var sortOrder, siblingCheck;
 
-var sortOrder, siblingCheck;
+		if (document.documentElement.compareDocumentPosition) {
+			sortOrder = function (a, b) {
+				if (a === b) {
+					hasDuplicate = true;
+					return 0;
+				}
 
-if ( document.documentElement.compareDocumentPosition ) {
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
+				if (!a.compareDocumentPosition || !b.compareDocumentPosition) {
+					return a.compareDocumentPosition ? -1 : 1;
+				}
 
-		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
-			return a.compareDocumentPosition ? -1 : 1;
-		}
+				return a.compareDocumentPosition(b) & 4 ? -1 : 1;
+			};
 
-		return a.compareDocumentPosition(b) & 4 ? -1 : 1;
-	};
+		} else {
+			sortOrder = function (a, b) {
+				// The nodes are identical, we can exit early
+				if (a === b) {
+					hasDuplicate = true;
+					return 0;
 
-} else {
-	sortOrder = function( a, b ) {
-		// The nodes are identical, we can exit early
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
+					// Fallback to using sourceIndex (in IE) if it's available on both nodes
+				} else if (a.sourceIndex && b.sourceIndex) {
+					return a.sourceIndex - b.sourceIndex;
+				}
 
-		// Fallback to using sourceIndex (in IE) if it's available on both nodes
-		} else if ( a.sourceIndex && b.sourceIndex ) {
-			return a.sourceIndex - b.sourceIndex;
-		}
+				var al, bl,
+					ap = [],
+					bp = [],
+					aup = a.parentNode,
+					bup = b.parentNode,
+					cur = aup;
 
-		var al, bl,
-			ap = [],
-			bp = [],
-			aup = a.parentNode,
-			bup = b.parentNode,
-			cur = aup;
+				// If the nodes are siblings (or identical) we can do a quick check
+				if (aup === bup) {
+					return siblingCheck(a, b);
 
-		// If the nodes are siblings (or identical) we can do a quick check
-		if ( aup === bup ) {
-			return siblingCheck( a, b );
+					// If no parents were found then the nodes are disconnected
+				} else if (!aup) {
+					return -1;
 
-		// If no parents were found then the nodes are disconnected
-		} else if ( !aup ) {
-			return -1;
+				} else if (!bup) {
+					return 1;
+				}
 
-		} else if ( !bup ) {
-			return 1;
-		}
+				// Otherwise they're somewhere else in the tree so we need
+				// to build up a full list of the parentNodes for comparison
+				while (cur) {
+					ap.unshift(cur);
+					cur = cur.parentNode;
+				}
 
-		// Otherwise they're somewhere else in the tree so we need
-		// to build up a full list of the parentNodes for comparison
-		while ( cur ) {
-			ap.unshift( cur );
-			cur = cur.parentNode;
-		}
+				cur = bup;
 
-		cur = bup;
+				while (cur) {
+					bp.unshift(cur);
+					cur = cur.parentNode;
+				}
 
-		while ( cur ) {
-			bp.unshift( cur );
-			cur = cur.parentNode;
-		}
+				al = ap.length;
+				bl = bp.length;
 
-		al = ap.length;
-		bl = bp.length;
+				// Start walking down the tree looking for a discrepancy
+				for (var i = 0; i < al && i < bl; i++) {
+					if (ap[i] !== bp[i]) {
+						return siblingCheck(ap[i], bp[i]);
+					}
+				}
 
-		// Start walking down the tree looking for a discrepancy
-		for ( var i = 0; i < al && i < bl; i++ ) {
-			if ( ap[i] !== bp[i] ) {
-				return siblingCheck( ap[i], bp[i] );
-			}
-		}
+				// We ended someplace up the tree so do a sibling check
+				return i === al ?
+					siblingCheck(a, bp[i], -1) :
+					siblingCheck(ap[i], b, 1);
+			};
 
-		// We ended someplace up the tree so do a sibling check
-		return i === al ?
-			siblingCheck( a, bp[i], -1 ) :
-			siblingCheck( ap[i], b, 1 );
-	};
+			siblingCheck = function (a, b, ret) {
+				if (a === b) {
+					return ret;
+				}
 
-	siblingCheck = function( a, b, ret ) {
-		if ( a === b ) {
-			return ret;
-		}
+				var cur = a.nextSibling;
 
-		var cur = a.nextSibling;
+				while (cur) {
+					if (cur === b) {
+						return -1;
+					}
 
-		while ( cur ) {
-			if ( cur === b ) {
-				return -1;
-			}
+					cur = cur.nextSibling;
+				}
 
-			cur = cur.nextSibling;
+				return 1;
+			};
 		}
 
-		return 1;
-	};
-}
-
 // Check to see if the browser returns elements by name when
 // querying by getElementById (and provide a workaround)
-(function(){
-	// We're going to inject a fake input element with a specified name
-	var form = document.createElement("div"),
-		id = "script" + (new Date()).getTime(),
-		root = document.documentElement;
-
-	form.innerHTML = "<a name='" + id + "'/>";
-
-	// Inject it into the root element, check its status, and remove it quickly
-	root.insertBefore( form, root.firstChild );
-
-	// The workaround has to do additional checks after a getElementById
-	// Which slows things down for other browsers (hence the branching)
-	if ( document.getElementById( id ) ) {
-		Expr.find.ID = function( match, context, isXML ) {
-			if ( typeof context.getElementById !== "undefined" && !isXML ) {
-				var m = context.getElementById(match[1]);
-
-				return m ?
-					m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ?
-						[m] :
-						undefined :
-					[];
-			}
-		};
+		(function () {
+			// We're going to inject a fake input element with a specified name
+			var form = document.createElement("div"),
+				id = "script" + (new Date()).getTime(),
+				root = document.documentElement;
+
+			form.innerHTML = "<a name='" + id + "'/>";
+
+			// Inject it into the root element, check its status, and remove it quickly
+			root.insertBefore(form, root.firstChild);
+
+			// The workaround has to do additional checks after a getElementById
+			// Which slows things down for other browsers (hence the branching)
+			if (document.getElementById(id)) {
+				Expr.find.ID = function (match, context, isXML) {
+					if (typeof context.getElementById !== "undefined" && !isXML) {
+						var m = context.getElementById(match[1]);
+
+						return m ?
+							m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ?
+								[m] :
+								undefined :
+							[];
+					}
+				};
 
-		Expr.filter.ID = function( elem, match ) {
-			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+				Expr.filter.ID = function (elem, match) {
+					var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
 
-			return elem.nodeType === 1 && node && node.nodeValue === match;
-		};
-	}
+					return elem.nodeType === 1 && node && node.nodeValue === match;
+				};
+			}
 
-	root.removeChild( form );
+			root.removeChild(form);
 
-	// release memory in IE
-	root = form = null;
-})();
+			// release memory in IE
+			root = form = null;
+		})();
 
-(function(){
-	// Check to see if the browser returns only elements
-	// when doing getElementsByTagName("*")
+		(function () {
+			// Check to see if the browser returns only elements
+			// when doing getElementsByTagName("*")
 
-	// Create a fake element
-	var div = document.createElement("div");
-	div.appendChild( document.createComment("") );
+			// Create a fake element
+			var div = document.createElement("div");
+			div.appendChild(document.createComment(""));
 
-	// Make sure no comments are found
-	if ( div.getElementsByTagName("*").length > 0 ) {
-		Expr.find.TAG = function( match, context ) {
-			var results = context.getElementsByTagName( match[1] );
+			// Make sure no comments are found
+			if (div.getElementsByTagName("*").length > 0) {
+				Expr.find.TAG = function (match, context) {
+					var results = context.getElementsByTagName(match[1]);
 
-			// Filter out possible comments
-			if ( match[1] === "*" ) {
-				var tmp = [];
+					// Filter out possible comments
+					if (match[1] === "*") {
+						var tmp = [];
 
-				for ( var i = 0; results[i]; i++ ) {
-					if ( results[i].nodeType === 1 ) {
-						tmp.push( results[i] );
+						for (var i = 0; results[i]; i++) {
+							if (results[i].nodeType === 1) {
+								tmp.push(results[i]);
+							}
+						}
+
+						results = tmp;
 					}
+
+					return results;
+				};
+			}
+
+			// Check to see if an attribute returns normalized href attributes
+			div.innerHTML = "<a href='#'></a>";
+
+			if (div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
+				div.firstChild.getAttribute("href") !== "#") {
+
+				Expr.attrHandle.href = function (elem) {
+					return elem.getAttribute("href", 2);
+				};
+			}
+
+			// release memory in IE
+			div = null;
+		})();
+
+		if (document.querySelectorAll) {
+			(function () {
+				var oldSizzle = Sizzle,
+					div = document.createElement("div"),
+					id = "__sizzle__";
+
+				div.innerHTML = "<p class='TEST'></p>";
+
+				// Safari can't handle uppercase or unicode characters when
+				// in quirks mode.
+				if (div.querySelectorAll && div.querySelectorAll(".TEST").length === 0) {
+					return;
 				}
 
-				results = tmp;
-			}
-
-			return results;
-		};
-	}
+				Sizzle = function (query, context, extra, seed) {
+					context = context || document;
 
-	// Check to see if an attribute returns normalized href attributes
-	div.innerHTML = "<a href='#'></a>";
+					// Only use querySelectorAll on non-XML documents
+					// (ID selectors don't work in non-HTML documents)
+					if (!seed && !Sizzle.isXML(context)) {
+						// See if we find a selector to speed up
+						var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(query);
 
-	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
-			div.firstChild.getAttribute("href") !== "#" ) {
+						if (match && (context.nodeType === 1 || context.nodeType === 9)) {
+							// Speed-up: Sizzle("TAG")
+							if (match[1]) {
+								return makeArray(context.getElementsByTagName(query), extra);
 
-		Expr.attrHandle.href = function( elem ) {
-			return elem.getAttribute( "href", 2 );
-		};
-	}
+								// Speed-up: Sizzle(".CLASS")
+							} else if (match[2] && Expr.find.CLASS && context.getElementsByClassName) {
+								return makeArray(context.getElementsByClassName(match[2]), extra);
+							}
+						}
 
-	// release memory in IE
-	div = null;
-})();
+						if (context.nodeType === 9) {
+							// Speed-up: Sizzle("body")
+							// The body element only exists once, optimize finding it
+							if (query === "body" && context.body) {
+								return makeArray([context.body], extra);
+
+								// Speed-up: Sizzle("#ID")
+							} else if (match && match[3]) {
+								var elem = context.getElementById(match[3]);
+
+								// Check parentNode to catch when Blackberry 4.6 returns
+								// nodes that are no longer in the document #6963
+								if (elem && elem.parentNode) {
+									// Handle the case where IE and Opera return items
+									// by name instead of ID
+									if (elem.id === match[3]) {
+										return makeArray([elem], extra);
+									}
 
-if ( document.querySelectorAll ) {
-	(function(){
-		var oldSizzle = Sizzle,
-			div = document.createElement("div"),
-			id = "__sizzle__";
+								} else {
+									return makeArray([], extra);
+								}
+							}
 
-		div.innerHTML = "<p class='TEST'></p>";
+							try {
+								return makeArray(context.querySelectorAll(query), extra);
+							} catch (qsaError) {
+							}
 
-		// Safari can't handle uppercase or unicode characters when
-		// in quirks mode.
-		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
-			return;
-		}
-	
-		Sizzle = function( query, context, extra, seed ) {
-			context = context || document;
+							// qSA works strangely on Element-rooted queries
+							// We can work around this by specifying an extra ID on the root
+							// and working up from there (Thanks to Andrew Dupont for the technique)
+							// IE 8 doesn't work on object elements
+						} else if (context.nodeType === 1 && context.nodeName.toLowerCase() !== "object") {
+							var oldContext = context,
+								old = context.getAttribute("id"),
+								nid = old || id,
+								hasParent = context.parentNode,
+								relativeHierarchySelector = /^\s*[+~]/.test(query);
+
+							if (!old) {
+								context.setAttribute("id", nid);
+							} else {
+								nid = nid.replace(/'/g, "\\$&");
+							}
+							if (relativeHierarchySelector && hasParent) {
+								context = context.parentNode;
+							}
 
-			// Only use querySelectorAll on non-XML documents
-			// (ID selectors don't work in non-HTML documents)
-			if ( !seed && !Sizzle.isXML(context) ) {
-				// See if we find a selector to speed up
-				var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query );
-				
-				if ( match && (context.nodeType === 1 || context.nodeType === 9) ) {
-					// Speed-up: Sizzle("TAG")
-					if ( match[1] ) {
-						return makeArray( context.getElementsByTagName( query ), extra );
-					
-					// Speed-up: Sizzle(".CLASS")
-					} else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) {
-						return makeArray( context.getElementsByClassName( match[2] ), extra );
-					}
-				}
-				
-				if ( context.nodeType === 9 ) {
-					// Speed-up: Sizzle("body")
-					// The body element only exists once, optimize finding it
-					if ( query === "body" && context.body ) {
-						return makeArray( [ context.body ], extra );
-						
-					// Speed-up: Sizzle("#ID")
-					} else if ( match && match[3] ) {
-						var elem = context.getElementById( match[3] );
+							try {
+								if (!relativeHierarchySelector || hasParent) {
+									return makeArray(context.querySelectorAll("[id='" + nid + "'] " + query), extra);
+								}
 
-						// Check parentNode to catch when Blackberry 4.6 returns
-						// nodes that are no longer in the document #6963
-						if ( elem && elem.parentNode ) {
-							// Handle the case where IE and Opera return items
-							// by name instead of ID
-							if ( elem.id === match[3] ) {
-								return makeArray( [ elem ], extra );
+							} catch (pseudoError) {
+							} finally {
+								if (!old) {
+									oldContext.removeAttribute("id");
+								}
 							}
-							
-						} else {
-							return makeArray( [], extra );
 						}
 					}
-					
-					try {
-						return makeArray( context.querySelectorAll(query), extra );
-					} catch(qsaError) {}
-
-				// qSA works strangely on Element-rooted queries
-				// We can work around this by specifying an extra ID on the root
-				// and working up from there (Thanks to Andrew Dupont for the technique)
-				// IE 8 doesn't work on object elements
-				} else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-					var oldContext = context,
-						old = context.getAttribute( "id" ),
-						nid = old || id,
-						hasParent = context.parentNode,
-						relativeHierarchySelector = /^\s*[+~]/.test( query );
-
-					if ( !old ) {
-						context.setAttribute( "id", nid );
-					} else {
-						nid = nid.replace( /'/g, "\\$&" );
-					}
-					if ( relativeHierarchySelector && hasParent ) {
-						context = context.parentNode;
-					}
 
-					try {
-						if ( !relativeHierarchySelector || hasParent ) {
-							return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra );
-						}
+					return oldSizzle(query, context, extra, seed);
+				};
 
-					} catch(pseudoError) {
-					} finally {
-						if ( !old ) {
-							oldContext.removeAttribute( "id" );
-						}
-					}
+				for (var prop in oldSizzle) {
+					Sizzle[prop] = oldSizzle[prop];
 				}
-			}
-		
-			return oldSizzle(query, context, extra, seed);
-		};
 
-		for ( var prop in oldSizzle ) {
-			Sizzle[ prop ] = oldSizzle[ prop ];
+				// release memory in IE
+				div = null;
+			})();
 		}
 
-		// release memory in IE
-		div = null;
-	})();
-}
+		(function () {
+			var html = document.documentElement,
+				matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector;
 
-(function(){
-	var html = document.documentElement,
-		matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector;
+			if (matches) {
+				// Check to see if it's possible to do matchesSelector
+				// on a disconnected node (IE 9 fails this)
+				var disconnectedMatch = !matches.call(document.createElement("div"), "div"),
+					pseudoWorks = false;
 
-	if ( matches ) {
-		// Check to see if it's possible to do matchesSelector
-		// on a disconnected node (IE 9 fails this)
-		var disconnectedMatch = !matches.call( document.createElement( "div" ), "div" ),
-			pseudoWorks = false;
+				try {
+					// This should fail with an exception
+					// Gecko does not error, returns false instead
+					matches.call(document.documentElement, "[test!='']:sizzle");
 
-		try {
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( document.documentElement, "[test!='']:sizzle" );
-	
-		} catch( pseudoError ) {
-			pseudoWorks = true;
-		}
+				} catch (pseudoError) {
+					pseudoWorks = true;
+				}
 
-		Sizzle.matchesSelector = function( node, expr ) {
-			// Make sure that attribute selectors are quoted
-			expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
-
-			if ( !Sizzle.isXML( node ) ) {
-				try { 
-					if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) {
-						var ret = matches.call( node, expr );
-
-						// IE 9's matchesSelector returns false on disconnected nodes
-						if ( ret || !disconnectedMatch ||
-								// As well, disconnected nodes are said to be in a document
-								// fragment in IE 9, so check for that
-								node.document && node.document.nodeType !== 11 ) {
-							return ret;
+				Sizzle.matchesSelector = function (node, expr) {
+					// Make sure that attribute selectors are quoted
+					expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
+
+					if (!Sizzle.isXML(node)) {
+						try {
+							if (pseudoWorks || !Expr.match.PSEUDO.test(expr) && !/!=/.test(expr)) {
+								var ret = matches.call(node, expr);
+
+								// IE 9's matchesSelector returns false on disconnected nodes
+								if (ret || !disconnectedMatch ||
+									// As well, disconnected nodes are said to be in a document
+									// fragment in IE 9, so check for that
+									node.document && node.document.nodeType !== 11) {
+									return ret;
+								}
+							}
+						} catch (e) {
 						}
 					}
-				} catch(e) {}
+
+					return Sizzle(expr, null, null, [node]).length > 0;
+				};
 			}
+		})();
 
-			return Sizzle(expr, null, null, [node]).length > 0;
-		};
-	}
-})();
+		(function () {
+			var div = document.createElement("div");
 
-(function(){
-	var div = document.createElement("div");
+			div.innerHTML = "<div class='test e'></div><div class='test'></div>";
 
-	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
+			// Opera can't find a second classname (in 9.6)
+			// Also, make sure that getElementsByClassName actually exists
+			if (!div.getElementsByClassName || div.getElementsByClassName("e").length === 0) {
+				return;
+			}
 
-	// Opera can't find a second classname (in 9.6)
-	// Also, make sure that getElementsByClassName actually exists
-	if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
-		return;
-	}
+			// Safari caches class attributes, doesn't catch changes (in 3.2)
+			div.lastChild.className = "e";
 
-	// Safari caches class attributes, doesn't catch changes (in 3.2)
-	div.lastChild.className = "e";
+			if (div.getElementsByClassName("e").length === 1) {
+				return;
+			}
 
-	if ( div.getElementsByClassName("e").length === 1 ) {
-		return;
-	}
-	
-	Expr.order.splice(1, 0, "CLASS");
-	Expr.find.CLASS = function( match, context, isXML ) {
-		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
-			return context.getElementsByClassName(match[1]);
-		}
-	};
+			Expr.order.splice(1, 0, "CLASS");
+			Expr.find.CLASS = function (match, context, isXML) {
+				if (typeof context.getElementsByClassName !== "undefined" && !isXML) {
+					return context.getElementsByClassName(match[1]);
+				}
+			};
 
-	// release memory in IE
-	div = null;
-})();
+			// release memory in IE
+			div = null;
+		})();
 
-function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
-	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-		var elem = checkSet[i];
+		function dirNodeCheck(dir, cur, doneName, checkSet, nodeCheck, isXML) {
+			for (var i = 0, l = checkSet.length; i < l; i++) {
+				var elem = checkSet[i];
 
-		if ( elem ) {
-			var match = false;
+				if (elem) {
+					var match = false;
 
-			elem = elem[dir];
+					elem = elem[dir];
 
-			while ( elem ) {
-				if ( elem[ expando ] === doneName ) {
-					match = checkSet[elem.sizset];
-					break;
-				}
+					while (elem) {
+						if (elem[expando] === doneName) {
+							match = checkSet[elem.sizset];
+							break;
+						}
 
-				if ( elem.nodeType === 1 && !isXML ){
-					elem[ expando ] = doneName;
-					elem.sizset = i;
-				}
+						if (elem.nodeType === 1 && !isXML) {
+							elem[expando] = doneName;
+							elem.sizset = i;
+						}
 
-				if ( elem.nodeName.toLowerCase() === cur ) {
-					match = elem;
-					break;
-				}
+						if (elem.nodeName.toLowerCase() === cur) {
+							match = elem;
+							break;
+						}
 
-				elem = elem[dir];
-			}
+						elem = elem[dir];
+					}
 
-			checkSet[i] = match;
+					checkSet[i] = match;
+				}
+			}
 		}
-	}
-}
 
-function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
-	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-		var elem = checkSet[i];
+		function dirCheck(dir, cur, doneName, checkSet, nodeCheck, isXML) {
+			for (var i = 0, l = checkSet.length; i < l; i++) {
+				var elem = checkSet[i];
 
-		if ( elem ) {
-			var match = false;
-			
-			elem = elem[dir];
+				if (elem) {
+					var match = false;
 
-			while ( elem ) {
-				if ( elem[ expando ] === doneName ) {
-					match = checkSet[elem.sizset];
-					break;
-				}
-
-				if ( elem.nodeType === 1 ) {
-					if ( !isXML ) {
-						elem[ expando ] = doneName;
-						elem.sizset = i;
-					}
+					elem = elem[dir];
 
-					if ( typeof cur !== "string" ) {
-						if ( elem === cur ) {
-							match = true;
+					while (elem) {
+						if (elem[expando] === doneName) {
+							match = checkSet[elem.sizset];
 							break;
 						}
 
-					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
-						match = elem;
-						break;
+						if (elem.nodeType === 1) {
+							if (!isXML) {
+								elem[expando] = doneName;
+								elem.sizset = i;
+							}
+
+							if (typeof cur !== "string") {
+								if (elem === cur) {
+									match = true;
+									break;
+								}
+
+							} else if (Sizzle.filter(cur, [elem]).length > 0) {
+								match = elem;
+								break;
+							}
+						}
+
+						elem = elem[dir];
 					}
-				}
 
-				elem = elem[dir];
+					checkSet[i] = match;
+				}
 			}
+		}
+
+		if (document.documentElement.contains) {
+			Sizzle.contains = function (a, b) {
+				return a !== b && (a.contains ? a.contains(b) : true);
+			};
+
+		} else if (document.documentElement.compareDocumentPosition) {
+			Sizzle.contains = function (a, b) {
+				return !!(a.compareDocumentPosition(b) & 16);
+			};
 
-			checkSet[i] = match;
+		} else {
+			Sizzle.contains = function () {
+				return false;
+			};
 		}
-	}
-}
 
-if ( document.documentElement.contains ) {
-	Sizzle.contains = function( a, b ) {
-		return a !== b && (a.contains ? a.contains(b) : true);
-	};
+		Sizzle.isXML = function (elem) {
+			// documentElement is verified for cases where it doesn't yet exist
+			// (such as loading iframes in IE - #4833)
+			var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
 
-} else if ( document.documentElement.compareDocumentPosition ) {
-	Sizzle.contains = function( a, b ) {
-		return !!(a.compareDocumentPosition(b) & 16);
-	};
+			return documentElement ? documentElement.nodeName !== "HTML" : false;
+		};
 
-} else {
-	Sizzle.contains = function() {
-		return false;
-	};
-}
-
-Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833) 
-	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
-
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-var posProcess = function( selector, context, seed ) {
-	var match,
-		tmpSet = [],
-		later = "",
-		root = context.nodeType ? [context] : context;
-
-	// Position selectors must be done after the filter
-	// And so must :not(positional) so we move all PSEUDOs to the end
-	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
-		later += match[0];
-		selector = selector.replace( Expr.match.PSEUDO, "" );
-	}
+		var posProcess = function (selector, context, seed) {
+			var match,
+				tmpSet = [],
+				later = "",
+				root = context.nodeType ? [context] : context;
 
-	selector = Expr.relative[selector] ? selector + "*" : selector;
+			// Position selectors must be done after the filter
+			// And so must :not(positional) so we move all PSEUDOs to the end
+			while ((match = Expr.match.PSEUDO.exec(selector))) {
+				later += match[0];
+				selector = selector.replace(Expr.match.PSEUDO, "");
+			}
 
-	for ( var i = 0, l = root.length; i < l; i++ ) {
-		Sizzle( selector, root[i], tmpSet, seed );
-	}
+			selector = Expr.relative[selector] ? selector + "*" : selector;
 
-	return Sizzle.filter( later, tmpSet );
-};
+			for (var i = 0, l = root.length; i < l; i++) {
+				Sizzle(selector, root[i], tmpSet, seed);
+			}
+
+			return Sizzle.filter(later, tmpSet);
+		};
 
 // EXPOSE
 // Override sizzle attribute retrieval
-Sizzle.attr = jQuery.attr;
-Sizzle.selectors.attrMap = {};
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.filters;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-})();
-
-
-var runtil = /Until$/,
-	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
-	// Note: This RegExp should be improved, or likely pulled from Sizzle
-	rmultiselector = /,/,
-	isSimple = /^.[^:#\[\.,]*$/,
-	slice = Array.prototype.slice,
-	POS = jQuery.expr.match.POS,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
+		Sizzle.attr = jQuery.attr;
+		Sizzle.selectors.attrMap = {};
+		jQuery.find = Sizzle;
+		jQuery.expr = Sizzle.selectors;
+		jQuery.expr[":"] = jQuery.expr.filters;
+		jQuery.unique = Sizzle.uniqueSort;
+		jQuery.text = Sizzle.getText;
+		jQuery.isXMLDoc = Sizzle.isXML;
+		jQuery.contains = Sizzle.contains;
 
-jQuery.fn.extend({
-	find: function( selector ) {
-		var self = this,
-			i, l;
 
-		if ( typeof selector !== "string" ) {
-			return jQuery( selector ).filter(function() {
-				for ( i = 0, l = self.length; i < l; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
+	})();
+
+
+	var runtil = /Until$/,
+		rparentsprev = /^(?:parents|prevUntil|prevAll)/,
+		// Note: This RegExp should be improved, or likely pulled from Sizzle
+		rmultiselector = /,/,
+		isSimple = /^.[^:#\[\.,]*$/,
+		slice = Array.prototype.slice,
+		POS = jQuery.expr.match.POS,
+		// methods guaranteed to produce a unique set when starting from a unique set
+		guaranteedUnique = {
+			children: true,
+			contents: true,
+			next: true,
+			prev: true
+		};
+
+	jQuery.fn.extend({
+		find: function (selector) {
+			var self = this,
+				i, l;
+
+			if (typeof selector !== "string") {
+				return jQuery(selector).filter(function () {
+					for (i = 0, l = self.length; i < l; i++) {
+						if (jQuery.contains(self[i], this)) {
+							return true;
+						}
 					}
-				}
-			});
-		}
+				});
+			}
 
-		var ret = this.pushStack( "", "find", selector ),
-			length, n, r;
+			var ret = this.pushStack("", "find", selector),
+				length, n, r;
 
-		for ( i = 0, l = this.length; i < l; i++ ) {
-			length = ret.length;
-			jQuery.find( selector, this[i], ret );
+			for (i = 0, l = this.length; i < l; i++) {
+				length = ret.length;
+				jQuery.find(selector, this[i], ret);
 
-			if ( i > 0 ) {
-				// Make sure that the results are unique
-				for ( n = length; n < ret.length; n++ ) {
-					for ( r = 0; r < length; r++ ) {
-						if ( ret[r] === ret[n] ) {
-							ret.splice(n--, 1);
-							break;
+				if (i > 0) {
+					// Make sure that the results are unique
+					for (n = length; n < ret.length; n++) {
+						for (r = 0; r < length; r++) {
+							if (ret[r] === ret[n]) {
+								ret.splice(n--, 1);
+								break;
+							}
 						}
 					}
 				}
 			}
-		}
 
-		return ret;
-	},
+			return ret;
+		},
 
-	has: function( target ) {
-		var targets = jQuery( target );
-		return this.filter(function() {
-			for ( var i = 0, l = targets.length; i < l; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
+		has: function (target) {
+			var targets = jQuery(target);
+			return this.filter(function () {
+				for (var i = 0, l = targets.length; i < l; i++) {
+					if (jQuery.contains(this, targets[i])) {
+						return true;
+					}
 				}
-			}
-		});
-	},
+			});
+		},
+
+		not: function (selector) {
+			return this.pushStack(winnow(this, selector, false), "not", selector);
+		},
 
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector, false), "not", selector);
-	},
+		filter: function (selector) {
+			return this.pushStack(winnow(this, selector, true), "filter", selector);
+		},
 
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector, true), "filter", selector );
-	},
+		is: function (selector) {
+			return !!selector && (
+				typeof selector === "string" ?
+					// If this is a positional selector, check membership in the returned set
+					// so $("p:first").is("p:last") won't return true for a doc with two "p".
+					POS.test(selector) ?
+						jQuery(selector, this.context).index(this[0]) >= 0 :
+						jQuery.filter(selector, this).length > 0 :
+					this.filter(selector).length > 0);
+		},
 
-	is: function( selector ) {
-		return !!selector && ( 
-			typeof selector === "string" ?
-				// If this is a positional selector, check membership in the returned set
-				// so $("p:first").is("p:last") won't return true for a doc with two "p".
-				POS.test( selector ) ? 
-					jQuery( selector, this.context ).index( this[0] ) >= 0 :
-					jQuery.filter( selector, this ).length > 0 :
-				this.filter( selector ).length > 0 );
-	},
+		closest: function (selectors, context) {
+			var ret = [], i, l, cur = this[0];
 
-	closest: function( selectors, context ) {
-		var ret = [], i, l, cur = this[0];
-		
-		// Array (deprecated as of jQuery 1.7)
-		if ( jQuery.isArray( selectors ) ) {
-			var level = 1;
+			// Array (deprecated as of jQuery 1.7)
+			if (jQuery.isArray(selectors)) {
+				var level = 1;
 
-			while ( cur && cur.ownerDocument && cur !== context ) {
-				for ( i = 0; i < selectors.length; i++ ) {
+				while (cur && cur.ownerDocument && cur !== context) {
+					for (i = 0; i < selectors.length; i++) {
 
-					if ( jQuery( cur ).is( selectors[ i ] ) ) {
-						ret.push({ selector: selectors[ i ], elem: cur, level: level });
+						if (jQuery(cur).is(selectors[i])) {
+							ret.push({selector: selectors[i], elem: cur, level: level});
+						}
 					}
+
+					cur = cur.parentNode;
+					level++;
 				}
 
-				cur = cur.parentNode;
-				level++;
+				return ret;
 			}
 
-			return ret;
-		}
-
-		// String
-		var pos = POS.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
+			// String
+			var pos = POS.test(selectors) || typeof selectors !== "string" ?
+				jQuery(selectors, context || this.context) :
 				0;
 
-		for ( i = 0, l = this.length; i < l; i++ ) {
-			cur = this[i];
-
-			while ( cur ) {
-				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
-					ret.push( cur );
-					break;
+			for (i = 0, l = this.length; i < l; i++) {
+				cur = this[i];
 
-				} else {
-					cur = cur.parentNode;
-					if ( !cur || !cur.ownerDocument || cur === context || cur.nodeType === 11 ) {
+				while (cur) {
+					if (pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors)) {
+						ret.push(cur);
 						break;
+
+					} else {
+						cur = cur.parentNode;
+						if (!cur || !cur.ownerDocument || cur === context || cur.nodeType === 11) {
+							break;
+						}
 					}
 				}
 			}
-		}
 
-		ret = ret.length > 1 ? jQuery.unique( ret ) : ret;
+			ret = ret.length > 1 ? jQuery.unique(ret) : ret;
 
-		return this.pushStack( ret, "closest", selectors );
-	},
+			return this.pushStack(ret, "closest", selectors);
+		},
 
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
+		// Determine the position of an element within
+		// the matched set of elements
+		index: function (elem) {
 
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[0] && this[0].parentNode ) ? this.prevAll().length : -1;
-		}
+			// No argument, return index in parent
+			if (!elem) {
+				return (this[0] && this[0].parentNode) ? this.prevAll().length : -1;
+			}
 
-		// index in selector
-		if ( typeof elem === "string" ) {
-			return jQuery.inArray( this[0], jQuery( elem ) );
-		}
+			// index in selector
+			if (typeof elem === "string") {
+				return jQuery.inArray(this[0], jQuery(elem));
+			}
 
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		var set = typeof selector === "string" ?
-				jQuery( selector, context ) :
-				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
-			all = jQuery.merge( this.get(), set );
-
-		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
-			all :
-			jQuery.unique( all ) );
-	},
-
-	andSelf: function() {
-		return this.add( this.prevObject );
-	}
-});
+			// Locate the position of the desired element
+			return jQuery.inArray(
+				// If it receives a jQuery object, the first element is used
+				elem.jquery ? elem[0] : elem, this);
+		},
+
+		add: function (selector, context) {
+			var set = typeof selector === "string" ?
+					jQuery(selector, context) :
+					jQuery.makeArray(selector && selector.nodeType ? [selector] : selector),
+				all = jQuery.merge(this.get(), set);
+
+			return this.pushStack(isDisconnected(set[0]) || isDisconnected(all[0]) ?
+				all :
+				jQuery.unique(all));
+		},
+
+		andSelf: function () {
+			return this.add(this.prevObject);
+		}
+	});
 
 // A painfully simple check to see if an element is disconnected
 // from a document (should be improved, where feasible).
-function isDisconnected( node ) {
-	return !node || !node.parentNode || node.parentNode.nodeType === 11;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return jQuery.nth( elem, 2, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return jQuery.nth( elem, 2, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( elem.parentNode.firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.makeArray( elem.childNodes );
+	function isDisconnected(node) {
+		return !node || !node.parentNode || node.parentNode.nodeType === 11;
 	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
 
-		if ( !runtil.test( name ) ) {
-			selector = until;
+	jQuery.each({
+		parent: function (elem) {
+			var parent = elem.parentNode;
+			return parent && parent.nodeType !== 11 ? parent : null;
+		},
+		parents: function (elem) {
+			return jQuery.dir(elem, "parentNode");
+		},
+		parentsUntil: function (elem, i, until) {
+			return jQuery.dir(elem, "parentNode", until);
+		},
+		next: function (elem) {
+			return jQuery.nth(elem, 2, "nextSibling");
+		},
+		prev: function (elem) {
+			return jQuery.nth(elem, 2, "previousSibling");
+		},
+		nextAll: function (elem) {
+			return jQuery.dir(elem, "nextSibling");
+		},
+		prevAll: function (elem) {
+			return jQuery.dir(elem, "previousSibling");
+		},
+		nextUntil: function (elem, i, until) {
+			return jQuery.dir(elem, "nextSibling", until);
+		},
+		prevUntil: function (elem, i, until) {
+			return jQuery.dir(elem, "previousSibling", until);
+		},
+		siblings: function (elem) {
+			return jQuery.sibling(elem.parentNode.firstChild, elem);
+		},
+		children: function (elem) {
+			return jQuery.sibling(elem.firstChild);
+		},
+		contents: function (elem) {
+			return jQuery.nodeName(elem, "iframe") ?
+				elem.contentDocument || elem.contentWindow.document :
+				jQuery.makeArray(elem.childNodes);
 		}
+	}, function (name, fn) {
+		jQuery.fn[name] = function (until, selector) {
+			var ret = jQuery.map(this, fn, until);
 
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
+			if (!runtil.test(name)) {
+				selector = until;
+			}
 
-		ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
+			if (selector && typeof selector === "string") {
+				ret = jQuery.filter(selector, ret);
+			}
 
-		if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
-			ret = ret.reverse();
-		}
+			ret = this.length > 1 && !guaranteedUnique[name] ? jQuery.unique(ret) : ret;
 
-		return this.pushStack( ret, name, slice.call( arguments ).join(",") );
-	};
-});
+			if ((this.length > 1 || rmultiselector.test(selector)) && rparentsprev.test(name)) {
+				ret = ret.reverse();
+			}
 
-jQuery.extend({
-	filter: function( expr, elems, not ) {
-		if ( not ) {
-			expr = ":not(" + expr + ")";
-		}
+			return this.pushStack(ret, name, slice.call(arguments).join(","));
+		};
+	});
 
-		return elems.length === 1 ?
-			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
-			jQuery.find.matches(expr, elems);
-	},
+	jQuery.extend({
+		filter: function (expr, elems, not) {
+			if (not) {
+				expr = ":not(" + expr + ")";
+			}
+
+			return elems.length === 1 ?
+				jQuery.find.matchesSelector(elems[0], expr) ? [elems[0]] : [] :
+				jQuery.find.matches(expr, elems);
+		},
 
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			cur = elem[ dir ];
+		dir: function (elem, dir, until) {
+			var matched = [],
+				cur = elem[dir];
 
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			if ( cur.nodeType === 1 ) {
-				matched.push( cur );
+			while (cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery(cur).is(until))) {
+				if (cur.nodeType === 1) {
+					matched.push(cur);
+				}
+				cur = cur[dir];
 			}
-			cur = cur[dir];
-		}
-		return matched;
-	},
+			return matched;
+		},
 
-	nth: function( cur, result, dir, elem ) {
-		result = result || 1;
-		var num = 0;
+		nth: function (cur, result, dir, elem) {
+			result = result || 1;
+			var num = 0;
 
-		for ( ; cur; cur = cur[dir] ) {
-			if ( cur.nodeType === 1 && ++num === result ) {
-				break;
+			for (; cur; cur = cur[dir]) {
+				if (cur.nodeType === 1 && ++num === result) {
+					break;
+				}
 			}
-		}
 
-		return cur;
-	},
+			return cur;
+		},
 
-	sibling: function( n, elem ) {
-		var r = [];
+		sibling: function (n, elem) {
+			var r = [];
 
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				r.push( n );
+			for (; n; n = n.nextSibling) {
+				if (n.nodeType === 1 && n !== elem) {
+					r.push(n);
+				}
 			}
-		}
 
-		return r;
-	}
-});
+			return r;
+		}
+	});
 
 // Implement the identical functionality for filter and not
-function winnow( elements, qualifier, keep ) {
+	function winnow(elements, qualifier, keep) {
 
-	// Can't pass null or undefined to indexOf in Firefox 4
-	// Set to 0 to skip string check
-	qualifier = qualifier || 0;
+		// Can't pass null or undefined to indexOf in Firefox 4
+		// Set to 0 to skip string check
+		qualifier = qualifier || 0;
 
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			var retVal = !!qualifier.call( elem, i, elem );
-			return retVal === keep;
-		});
+		if (jQuery.isFunction(qualifier)) {
+			return jQuery.grep(elements, function (elem, i) {
+				var retVal = !!qualifier.call(elem, i, elem);
+				return retVal === keep;
+			});
 
-	} else if ( qualifier.nodeType ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			return ( elem === qualifier ) === keep;
-		});
+		} else if (qualifier.nodeType) {
+			return jQuery.grep(elements, function (elem, i) {
+				return (elem === qualifier) === keep;
+			});
 
-	} else if ( typeof qualifier === "string" ) {
-		var filtered = jQuery.grep(elements, function( elem ) {
-			return elem.nodeType === 1;
-		});
+		} else if (typeof qualifier === "string") {
+			var filtered = jQuery.grep(elements, function (elem) {
+				return elem.nodeType === 1;
+			});
 
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter(qualifier, filtered, !keep);
-		} else {
-			qualifier = jQuery.filter( qualifier, filtered );
+			if (isSimple.test(qualifier)) {
+				return jQuery.filter(qualifier, filtered, !keep);
+			} else {
+				qualifier = jQuery.filter(qualifier, filtered);
+			}
 		}
+
+		return jQuery.grep(elements, function (elem, i) {
+			return (jQuery.inArray(elem, qualifier) >= 0) === keep;
+		});
 	}
 
-	return jQuery.grep(elements, function( elem, i ) {
-		return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep;
-	});
-}
 
+	function createSafeFragment(document) {
+		var list = nodeNames.split("|"),
+			safeFrag = document.createDocumentFragment();
 
+		if (safeFrag.createElement) {
+			while (list.length) {
+				safeFrag.createElement(
+					list.pop()
+				);
+			}
+		}
+		return safeFrag;
+	}
 
+	var nodeNames = "abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|" +
+			"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
+		rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
+		rleadingWhitespace = /^\s+/,
+		rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
+		rtagName = /<([\w:]+)/,
+		rtbody = /<tbody/i,
+		rhtml = /<|&#?\w+;/,
+		rnoInnerhtml = /<(?:script|style)/i,
+		rnocache = /<(?:script|object|embed|option|style)/i,
+		rnoshimcache = new RegExp("<(?:" + nodeNames + ")", "i"),
+		// checked="checked" or checked
+		rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+		rscriptType = /\/(java|ecma)script/i,
+		rcleanScript = /^\s*<!(?:\[CDATA\[|\-\-)/,
+		wrapMap = {
+			option: [1, "<select multiple='multiple'>", "</select>"],
+			legend: [1, "<fieldset>", "</fieldset>"],
+			thead: [1, "<table>", "</table>"],
+			tr: [2, "<table><tbody>", "</tbody></table>"],
+			td: [3, "<table><tbody><tr>", "</tr></tbody></table>"],
+			col: [2, "<table><tbody></tbody><colgroup>", "</colgroup></table>"],
+			area: [1, "<map>", "</map>"],
+			_default: [0, "", ""]
+		},
+		safeFragment = createSafeFragment(document);
 
-function createSafeFragment( document ) {
-	var list = nodeNames.split( "|" ),
-	safeFrag = document.createDocumentFragment();
+	wrapMap.optgroup = wrapMap.option;
+	wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+	wrapMap.th = wrapMap.td;
 
-	if ( safeFrag.createElement ) {
-		while ( list.length ) {
-			safeFrag.createElement(
-				list.pop()
-			);
-		}
+// IE can't serialize <link> and <script> tags normally
+	if (!jQuery.support.htmlSerialize) {
+		wrapMap._default = [1, "div<div>", "</div>"];
 	}
-	return safeFrag;
-}
-
-var nodeNames = "abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|" +
-		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
-	rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
-	rtagName = /<([\w:]+)/,
-	rtbody = /<tbody/i,
-	rhtml = /<|&#?\w+;/,
-	rnoInnerhtml = /<(?:script|style)/i,
-	rnocache = /<(?:script|object|embed|option|style)/i,
-	rnoshimcache = new RegExp("<(?:" + nodeNames + ")", "i"),
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /\/(java|ecma)script/i,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|\-\-)/,
-	wrapMap = {
-		option: [ 1, "<select multiple='multiple'>", "</select>" ],
-		legend: [ 1, "<fieldset>", "</fieldset>" ],
-		thead: [ 1, "<table>", "</table>" ],
-		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-		area: [ 1, "<map>", "</map>" ],
-		_default: [ 0, "", "" ]
-	},
-	safeFragment = createSafeFragment( document );
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
 
-// IE can't serialize <link> and <script> tags normally
-if ( !jQuery.support.htmlSerialize ) {
-	wrapMap._default = [ 1, "div<div>", "</div>" ];
-}
+	jQuery.fn.extend({
+		text: function (text) {
+			if (jQuery.isFunction(text)) {
+				return this.each(function (i) {
+					var self = jQuery(this);
 
-jQuery.fn.extend({
-	text: function( text ) {
-		if ( jQuery.isFunction(text) ) {
-			return this.each(function(i) {
-				var self = jQuery( this );
+					self.text(text.call(this, i, self.text()));
+				});
+			}
 
-				self.text( text.call(this, i, self.text()) );
-			});
-		}
+			if (typeof text !== "object" && text !== undefined) {
+				return this.empty().append((this[0] && this[0].ownerDocument || document).createTextNode(text));
+			}
 
-		if ( typeof text !== "object" && text !== undefined ) {
-			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
-		}
+			return jQuery.text(this);
+		},
+
+		wrapAll: function (html) {
+			if (jQuery.isFunction(html)) {
+				return this.each(function (i) {
+					jQuery(this).wrapAll(html.call(this, i));
+				});
+			}
 
-		return jQuery.text( this );
-	},
+			if (this[0]) {
+				// The elements to wrap the target around
+				var wrap = jQuery(html, this[0].ownerDocument).eq(0).clone(true);
 
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
-			});
-		}
+				if (this[0].parentNode) {
+					wrap.insertBefore(this[0]);
+				}
+
+				wrap.map(function () {
+					var elem = this;
+
+					while (elem.firstChild && elem.firstChild.nodeType === 1) {
+						elem = elem.firstChild;
+					}
+
+					return elem;
+				}).append(this);
+			}
+
+			return this;
+		},
+
+		wrapInner: function (html) {
+			if (jQuery.isFunction(html)) {
+				return this.each(function (i) {
+					jQuery(this).wrapInner(html.call(this, i));
+				});
+			}
 
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
+			return this.each(function () {
+				var self = jQuery(this),
+					contents = self.contents();
+
+				if (contents.length) {
+					contents.wrapAll(html);
+
+				} else {
+					self.append(html);
+				}
+			});
+		},
 
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
-			}
+		wrap: function (html) {
+			var isFunction = jQuery.isFunction(html);
 
-			wrap.map(function() {
-				var elem = this;
+			return this.each(function (i) {
+				jQuery(this).wrapAll(isFunction ? html.call(this, i) : html);
+			});
+		},
 
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
+		unwrap: function () {
+			return this.parent().each(function () {
+				if (!jQuery.nodeName(this, "body")) {
+					jQuery(this).replaceWith(this.childNodes);
 				}
+			}).end();
+		},
 
-				return elem;
-			}).append( this );
-		}
-
-		return this;
-	},
+		append: function () {
+			return this.domManip(arguments, true, function (elem) {
+				if (this.nodeType === 1) {
+					this.appendChild(elem);
+				}
+			});
+		},
 
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
+		prepend: function () {
+			return this.domManip(arguments, true, function (elem) {
+				if (this.nodeType === 1) {
+					this.insertBefore(elem, this.firstChild);
+				}
 			});
-		}
+		},
+
+		before: function () {
+			if (this[0] && this[0].parentNode) {
+				return this.domManip(arguments, false, function (elem) {
+					this.parentNode.insertBefore(elem, this);
+				});
+			} else if (arguments.length) {
+				var set = jQuery.clean(arguments);
+				set.push.apply(set, this.toArray());
+				return this.pushStack(set, "before", arguments);
+			}
+		},
 
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
+		after: function () {
+			if (this[0] && this[0].parentNode) {
+				return this.domManip(arguments, false, function (elem) {
+					this.parentNode.insertBefore(elem, this.nextSibling);
+				});
+			} else if (arguments.length) {
+				var set = this.pushStack(this, "after", arguments);
+				set.push.apply(set, jQuery.clean(arguments));
+				return set;
+			}
+		},
 
-			if ( contents.length ) {
-				contents.wrapAll( html );
+		// keepData is for internal use only--do not document
+		remove: function (selector, keepData) {
+			for (var i = 0, elem; (elem = this[i]) != null; i++) {
+				if (!selector || jQuery.filter(selector, [elem]).length) {
+					if (!keepData && elem.nodeType === 1) {
+						jQuery.cleanData(elem.getElementsByTagName("*"));
+						jQuery.cleanData([elem]);
+					}
 
-			} else {
-				self.append( html );
+					if (elem.parentNode) {
+						elem.parentNode.removeChild(elem);
+					}
+				}
 			}
-		});
-	},
 
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
+			return this;
+		},
 
-		return this.each(function(i) {
-			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-		});
-	},
+		empty: function () {
+			for (var i = 0, elem; (elem = this[i]) != null; i++) {
+				// Remove element nodes and prevent memory leaks
+				if (elem.nodeType === 1) {
+					jQuery.cleanData(elem.getElementsByTagName("*"));
+				}
 
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
+				// Remove any remaining nodes
+				while (elem.firstChild) {
+					elem.removeChild(elem.firstChild);
+				}
 			}
-		}).end();
-	},
 
-	append: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 ) {
-				this.appendChild( elem );
-			}
-		});
-	},
+			return this;
+		},
 
-	prepend: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 ) {
-				this.insertBefore( elem, this.firstChild );
-			}
-		});
-	},
+		clone: function (dataAndEvents, deepDataAndEvents) {
+			dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+			deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
 
-	before: function() {
-		if ( this[0] && this[0].parentNode ) {
-			return this.domManip(arguments, false, function( elem ) {
-				this.parentNode.insertBefore( elem, this );
+			return this.map(function () {
+				return jQuery.clone(this, dataAndEvents, deepDataAndEvents);
 			});
-		} else if ( arguments.length ) {
-			var set = jQuery.clean( arguments );
-			set.push.apply( set, this.toArray() );
-			return this.pushStack( set, "before", arguments );
-		}
-	},
+		},
 
-	after: function() {
-		if ( this[0] && this[0].parentNode ) {
-			return this.domManip(arguments, false, function( elem ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			});
-		} else if ( arguments.length ) {
-			var set = this.pushStack( this, "after", arguments );
-			set.push.apply( set, jQuery.clean(arguments) );
-			return set;
-		}
-	},
+		html: function (value) {
+			if (value === undefined) {
+				return this[0] && this[0].nodeType === 1 ?
+					this[0].innerHTML.replace(rinlinejQuery, "") :
+					null;
 
-	// keepData is for internal use only--do not document
-	remove: function( selector, keepData ) {
-		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
-			if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
-				if ( !keepData && elem.nodeType === 1 ) {
-					jQuery.cleanData( elem.getElementsByTagName("*") );
-					jQuery.cleanData( [ elem ] );
-				}
+				// See if we can take a shortcut and just use innerHTML
+			} else if (typeof value === "string" && !rnoInnerhtml.test(value) &&
+				(jQuery.support.leadingWhitespace || !rleadingWhitespace.test(value)) &&
+				!wrapMap[(rtagName.exec(value) || ["", ""])[1].toLowerCase()]) {
+
+				value = value.replace(rxhtmlTag, "<$1></$2>");
+
+				try {
+					for (var i = 0, l = this.length; i < l; i++) {
+						// Remove element nodes and prevent memory leaks
+						if (this[i].nodeType === 1) {
+							jQuery.cleanData(this[i].getElementsByTagName("*"));
+							this[i].innerHTML = value;
+						}
+					}
 
-				if ( elem.parentNode ) {
-					elem.parentNode.removeChild( elem );
+					// If using innerHTML throws an exception, use the fallback method
+				} catch (e) {
+					this.empty().append(value);
 				}
-			}
-		}
 
-		return this;
-	},
+			} else if (jQuery.isFunction(value)) {
+				this.each(function (i) {
+					var self = jQuery(this);
 
-	empty: function() {
-		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( elem.getElementsByTagName("*") );
-			}
+					self.html(value.call(this, i, self.html()));
+				});
 
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
+			} else {
+				this.empty().append(value);
 			}
-		}
 
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+			return this;
+		},
 
-		return this.map( function () {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
+		replaceWith: function (value) {
+			if (this[0] && this[0].parentNode) {
+				// Make sure that the elements are removed from the DOM before they are inserted
+				// this can help fix replacing a parent with child elements
+				if (jQuery.isFunction(value)) {
+					return this.each(function (i) {
+						var self = jQuery(this), old = self.html();
+						self.replaceWith(value.call(this, i, old));
+					});
+				}
 
-	html: function( value ) {
-		if ( value === undefined ) {
-			return this[0] && this[0].nodeType === 1 ?
-				this[0].innerHTML.replace(rinlinejQuery, "") :
-				null;
+				if (typeof value !== "string") {
+					value = jQuery(value).detach();
+				}
 
-		// See if we can take a shortcut and just use innerHTML
-		} else if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-			(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
-			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
+				return this.each(function () {
+					var next = this.nextSibling,
+						parent = this.parentNode;
 
-			value = value.replace(rxhtmlTag, "<$1></$2>");
+					jQuery(this).remove();
 
-			try {
-				for ( var i = 0, l = this.length; i < l; i++ ) {
-					// Remove element nodes and prevent memory leaks
-					if ( this[i].nodeType === 1 ) {
-						jQuery.cleanData( this[i].getElementsByTagName("*") );
-						this[i].innerHTML = value;
+					if (next) {
+						jQuery(next).before(value);
+					} else {
+						jQuery(parent).append(value);
 					}
-				}
-
-			// If using innerHTML throws an exception, use the fallback method
-			} catch(e) {
-				this.empty().append( value );
+				});
+			} else {
+				return this.length ?
+					this.pushStack(jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value) :
+					this;
 			}
+		},
 
-		} else if ( jQuery.isFunction( value ) ) {
-			this.each(function(i){
-				var self = jQuery( this );
-
-				self.html( value.call(this, i, self.html()) );
-			});
+		detach: function (selector) {
+			return this.remove(selector, true);
+		},
 
-		} else {
-			this.empty().append( value );
-		}
+		domManip: function (args, table, callback) {
+			var results, first, fragment, parent,
+				value = args[0],
+				scripts = [];
 
-		return this;
-	},
-
-	replaceWith: function( value ) {
-		if ( this[0] && this[0].parentNode ) {
-			// Make sure that the elements are removed from the DOM before they are inserted
-			// this can help fix replacing a parent with child elements
-			if ( jQuery.isFunction( value ) ) {
-				return this.each(function(i) {
-					var self = jQuery(this), old = self.html();
-					self.replaceWith( value.call( this, i, old ) );
+			// We can't cloneNode fragments that contain checked, in WebKit
+			if (!jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test(value)) {
+				return this.each(function () {
+					jQuery(this).domManip(args, table, callback, true);
 				});
 			}
 
-			if ( typeof value !== "string" ) {
-				value = jQuery( value ).detach();
+			if (jQuery.isFunction(value)) {
+				return this.each(function (i) {
+					var self = jQuery(this);
+					args[0] = value.call(this, i, table ? self.html() : undefined);
+					self.domManip(args, table, callback);
+				});
 			}
 
-			return this.each(function() {
-				var next = this.nextSibling,
-					parent = this.parentNode;
+			if (this[0]) {
+				parent = value && value.parentNode;
 
-				jQuery( this ).remove();
+				// If we're in a fragment, just use that instead of building a new one
+				if (jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length) {
+					results = {fragment: parent};
 
-				if ( next ) {
-					jQuery(next).before( value );
 				} else {
-					jQuery(parent).append( value );
+					results = jQuery.buildFragment(args, this, scripts);
 				}
-			});
-		} else {
-			return this.length ?
-				this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value ) :
-				this;
-		}
-	},
 
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
+				fragment = results.fragment;
 
-	domManip: function( args, table, callback ) {
-		var results, first, fragment, parent,
-			value = args[0],
-			scripts = [];
+				if (fragment.childNodes.length === 1) {
+					first = fragment = fragment.firstChild;
+				} else {
+					first = fragment.firstChild;
+				}
+
+				if (first) {
+					table = table && jQuery.nodeName(first, "tr");
+
+					for (var i = 0, l = this.length, lastIndex = l - 1; i < l; i++) {
+						callback.call(
+							table ?
+								root(this[i], first) :
+								this[i],
+							// Make sure that we do not leak memory by inadvertently discarding
+							// the original fragment (which might have attached data) instead of
+							// using it; in addition, use the original fragment object for the last
+							// item instead of first because it can end up being emptied incorrectly
+							// in certain situations (Bug #8070).
+							// Fragments from the fragment cache must always be cloned and never used
+							// in place.
+							results.cacheable || (l > 1 && i < lastIndex) ?
+								jQuery.clone(fragment, true, true) :
+								fragment
+						);
+					}
+				}
 
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
-			return this.each(function() {
-				jQuery(this).domManip( args, table, callback, true );
-			});
-		}
+				if (scripts.length) {
+					jQuery.each(scripts, evalScript);
+				}
+			}
 
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				args[0] = value.call(this, i, table ? self.html() : undefined);
-				self.domManip( args, table, callback );
-			});
+			return this;
 		}
+	});
 
-		if ( this[0] ) {
-			parent = value && value.parentNode;
+	function root(elem, cur) {
+		return jQuery.nodeName(elem, "table") ?
+			(elem.getElementsByTagName("tbody")[0] ||
+				elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
+			elem;
+	}
 
-			// If we're in a fragment, just use that instead of building a new one
-			if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
-				results = { fragment: parent };
+	function cloneCopyEvent(src, dest) {
 
-			} else {
-				results = jQuery.buildFragment( args, this, scripts );
-			}
+		if (dest.nodeType !== 1 || !jQuery.hasData(src)) {
+			return;
+		}
 
-			fragment = results.fragment;
+		var type, i, l,
+			oldData = jQuery._data(src),
+			curData = jQuery._data(dest, oldData),
+			events = oldData.events;
 
-			if ( fragment.childNodes.length === 1 ) {
-				first = fragment = fragment.firstChild;
-			} else {
-				first = fragment.firstChild;
-			}
-
-			if ( first ) {
-				table = table && jQuery.nodeName( first, "tr" );
-
-				for ( var i = 0, l = this.length, lastIndex = l - 1; i < l; i++ ) {
-					callback.call(
-						table ?
-							root(this[i], first) :
-							this[i],
-						// Make sure that we do not leak memory by inadvertently discarding
-						// the original fragment (which might have attached data) instead of
-						// using it; in addition, use the original fragment object for the last
-						// item instead of first because it can end up being emptied incorrectly
-						// in certain situations (Bug #8070).
-						// Fragments from the fragment cache must always be cloned and never used
-						// in place.
-						results.cacheable || ( l > 1 && i < lastIndex ) ?
-							jQuery.clone( fragment, true, true ) :
-							fragment
-					);
-				}
-			}
+		if (events) {
+			delete curData.handle;
+			curData.events = {};
 
-			if ( scripts.length ) {
-				jQuery.each( scripts, evalScript );
+			for (type in events) {
+				for (i = 0, l = events[type].length; i < l; i++) {
+					jQuery.event.add(dest, type + (events[type][i].namespace ? "." : "") + events[type][i].namespace, events[type][i], events[type][i].data);
+				}
 			}
 		}
 
-		return this;
+		// make the cloned public data object a copy from the original
+		if (curData.data) {
+			curData.data = jQuery.extend({}, curData.data);
+		}
 	}
-});
 
-function root( elem, cur ) {
-	return jQuery.nodeName(elem, "table") ?
-		(elem.getElementsByTagName("tbody")[0] ||
-		elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
-		elem;
-}
+	function cloneFixAttributes(src, dest) {
+		var nodeName;
 
-function cloneCopyEvent( src, dest ) {
+		// We do not need to do anything for non-Elements
+		if (dest.nodeType !== 1) {
+			return;
+		}
 
-	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
-		return;
-	}
+		// clearAttributes removes the attributes, which we don't want,
+		// but also removes the attachEvent events, which we *do* want
+		if (dest.clearAttributes) {
+			dest.clearAttributes();
+		}
 
-	var type, i, l,
-		oldData = jQuery._data( src ),
-		curData = jQuery._data( dest, oldData ),
-		events = oldData.events;
+		// mergeAttributes, in contrast, only merges back on the
+		// original attributes, not the events
+		if (dest.mergeAttributes) {
+			dest.mergeAttributes(src);
+		}
 
-	if ( events ) {
-		delete curData.handle;
-		curData.events = {};
+		nodeName = dest.nodeName.toLowerCase();
 
-		for ( type in events ) {
-			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-				jQuery.event.add( dest, type + ( events[ type ][ i ].namespace ? "." : "" ) + events[ type ][ i ].namespace, events[ type ][ i ], events[ type ][ i ].data );
-			}
-		}
-	}
+		// IE6-8 fail to clone children inside object elements that use
+		// the proprietary classid attribute value (rather than the type
+		// attribute) to identify the type of content to display
+		if (nodeName === "object") {
+			dest.outerHTML = src.outerHTML;
 
-	// make the cloned public data object a copy from the original
-	if ( curData.data ) {
-		curData.data = jQuery.extend( {}, curData.data );
-	}
-}
+		} else if (nodeName === "input" && (src.type === "checkbox" || src.type === "radio")) {
+			// IE6-8 fails to persist the checked state of a cloned checkbox
+			// or radio button. Worse, IE6-7 fail to give the cloned element
+			// a checked appearance if the defaultChecked value isn't also set
+			if (src.checked) {
+				dest.defaultChecked = dest.checked = src.checked;
+			}
 
-function cloneFixAttributes( src, dest ) {
-	var nodeName;
+			// IE6-7 get confused and end up setting the value of a cloned
+			// checkbox/radio button to an empty string instead of "on"
+			if (dest.value !== src.value) {
+				dest.value = src.value;
+			}
 
-	// We do not need to do anything for non-Elements
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
+			// IE6-8 fails to return the selected option to the default selected
+			// state when cloning options
+		} else if (nodeName === "option") {
+			dest.selected = src.defaultSelected;
 
-	// clearAttributes removes the attributes, which we don't want,
-	// but also removes the attachEvent events, which we *do* want
-	if ( dest.clearAttributes ) {
-		dest.clearAttributes();
-	}
+			// IE6-8 fails to set the defaultValue to the correct value when
+			// cloning other types of input fields
+		} else if (nodeName === "input" || nodeName === "textarea") {
+			dest.defaultValue = src.defaultValue;
+		}
 
-	// mergeAttributes, in contrast, only merges back on the
-	// original attributes, not the events
-	if ( dest.mergeAttributes ) {
-		dest.mergeAttributes( src );
+		// Event data gets referenced instead of copied if the expando
+		// gets copied too
+		dest.removeAttribute(jQuery.expando);
 	}
 
-	nodeName = dest.nodeName.toLowerCase();
+	jQuery.buildFragment = function (args, nodes, scripts) {
+		var fragment, cacheable, cacheresults, doc,
+			first = args[0];
 
-	// IE6-8 fail to clone children inside object elements that use
-	// the proprietary classid attribute value (rather than the type
-	// attribute) to identify the type of content to display
-	if ( nodeName === "object" ) {
-		dest.outerHTML = src.outerHTML;
-
-	} else if ( nodeName === "input" && (src.type === "checkbox" || src.type === "radio") ) {
-		// IE6-8 fails to persist the checked state of a cloned checkbox
-		// or radio button. Worse, IE6-7 fail to give the cloned element
-		// a checked appearance if the defaultChecked value isn't also set
-		if ( src.checked ) {
-			dest.defaultChecked = dest.checked = src.checked;
+		// nodes may contain either an explicit document object,
+		// a jQuery collection or context object.
+		// If nodes[0] contains a valid object to assign to doc
+		if (nodes && nodes[0]) {
+			doc = nodes[0].ownerDocument || nodes[0];
 		}
 
-		// IE6-7 get confused and end up setting the value of a cloned
-		// checkbox/radio button to an empty string instead of "on"
-		if ( dest.value !== src.value ) {
-			dest.value = src.value;
+		// Ensure that an attr object doesn't incorrectly stand in as a document object
+		// Chrome and Firefox seem to allow this to occur and will throw exception
+		// Fixes #8950
+		if (!doc.createDocumentFragment) {
+			doc = document;
 		}
 
-	// IE6-8 fails to return the selected option to the default selected
-	// state when cloning options
-	} else if ( nodeName === "option" ) {
-		dest.selected = src.defaultSelected;
-
-	// IE6-8 fails to set the defaultValue to the correct value when
-	// cloning other types of input fields
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-
-	// Event data gets referenced instead of copied if the expando
-	// gets copied too
-	dest.removeAttribute( jQuery.expando );
-}
+		// Only cache "small" (1/2 KB) HTML strings that are associated with the main document
+		// Cloning options loses the selected state, so don't cache them
+		// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
+		// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
+		// Lastly, IE6,7,8 will not correctly reuse cached fragments that were created from unknown elems #10501
+		if (args.length === 1 && typeof first === "string" && first.length < 512 && doc === document &&
+			first.charAt(0) === "<" && !rnocache.test(first) &&
+			(jQuery.support.checkClone || !rchecked.test(first)) &&
+			(jQuery.support.html5Clone || !rnoshimcache.test(first))) {
 
-jQuery.buildFragment = function( args, nodes, scripts ) {
-	var fragment, cacheable, cacheresults, doc,
-	first = args[ 0 ];
+			cacheable = true;
 
-	// nodes may contain either an explicit document object,
-	// a jQuery collection or context object.
-	// If nodes[0] contains a valid object to assign to doc
-	if ( nodes && nodes[0] ) {
-		doc = nodes[0].ownerDocument || nodes[0];
-	}
+			cacheresults = jQuery.fragments[first];
+			if (cacheresults && cacheresults !== 1) {
+				fragment = cacheresults;
+			}
+		}
 
-	// Ensure that an attr object doesn't incorrectly stand in as a document object
-	// Chrome and Firefox seem to allow this to occur and will throw exception
-	// Fixes #8950
-	if ( !doc.createDocumentFragment ) {
-		doc = document;
-	}
+		if (!fragment) {
+			fragment = doc.createDocumentFragment();
+			jQuery.clean(args, doc, fragment, scripts);
+		}
 
-	// Only cache "small" (1/2 KB) HTML strings that are associated with the main document
-	// Cloning options loses the selected state, so don't cache them
-	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
-	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
-	// Lastly, IE6,7,8 will not correctly reuse cached fragments that were created from unknown elems #10501
-	if ( args.length === 1 && typeof first === "string" && first.length < 512 && doc === document &&
-		first.charAt(0) === "<" && !rnocache.test( first ) &&
-		(jQuery.support.checkClone || !rchecked.test( first )) &&
-		(jQuery.support.html5Clone || !rnoshimcache.test( first )) ) {
-
-		cacheable = true;
-
-		cacheresults = jQuery.fragments[ first ];
-		if ( cacheresults && cacheresults !== 1 ) {
-			fragment = cacheresults;
+		if (cacheable) {
+			jQuery.fragments[first] = cacheresults ? fragment : 1;
 		}
-	}
 
-	if ( !fragment ) {
-		fragment = doc.createDocumentFragment();
-		jQuery.clean( args, doc, fragment, scripts );
-	}
+		return {fragment: fragment, cacheable: cacheable};
+	};
 
-	if ( cacheable ) {
-		jQuery.fragments[ first ] = cacheresults ? fragment : 1;
-	}
+	jQuery.fragments = {};
+
+	jQuery.each({
+		appendTo: "append",
+		prependTo: "prepend",
+		insertBefore: "before",
+		insertAfter: "after",
+		replaceAll: "replaceWith"
+	}, function (name, original) {
+		jQuery.fn[name] = function (selector) {
+			var ret = [],
+				insert = jQuery(selector),
+				parent = this.length === 1 && this[0].parentNode;
+
+			if (parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1) {
+				insert[original](this[0]);
+				return this;
 
-	return { fragment: fragment, cacheable: cacheable };
-};
-
-jQuery.fragments = {};
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var ret = [],
-			insert = jQuery( selector ),
-			parent = this.length === 1 && this[0].parentNode;
-
-		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
-			insert[ original ]( this[0] );
-			return this;
+			} else {
+				for (var i = 0, l = insert.length; i < l; i++) {
+					var elems = (i > 0 ? this.clone(true) : this).get();
+					jQuery(insert[i])[original](elems);
+					ret = ret.concat(elems);
+				}
 
-		} else {
-			for ( var i = 0, l = insert.length; i < l; i++ ) {
-				var elems = ( i > 0 ? this.clone(true) : this ).get();
-				jQuery( insert[i] )[ original ]( elems );
-				ret = ret.concat( elems );
+				return this.pushStack(ret, name, insert.selector);
 			}
+		};
+	});
 
-			return this.pushStack( ret, name, insert.selector );
-		}
-	};
-});
-
-function getAll( elem ) {
-	if ( typeof elem.getElementsByTagName !== "undefined" ) {
-		return elem.getElementsByTagName( "*" );
+	function getAll(elem) {
+		if (typeof elem.getElementsByTagName !== "undefined") {
+			return elem.getElementsByTagName("*");
 
-	} else if ( typeof elem.querySelectorAll !== "undefined" ) {
-		return elem.querySelectorAll( "*" );
+		} else if (typeof elem.querySelectorAll !== "undefined") {
+			return elem.querySelectorAll("*");
 
-	} else {
-		return [];
+		} else {
+			return [];
+		}
 	}
-}
 
 // Used in clean, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
-	if ( elem.type === "checkbox" || elem.type === "radio" ) {
-		elem.defaultChecked = elem.checked;
+	function fixDefaultChecked(elem) {
+		if (elem.type === "checkbox" || elem.type === "radio") {
+			elem.defaultChecked = elem.checked;
+		}
 	}
-}
+
 // Finds all inputs and passes them to fixDefaultChecked
-function findInputs( elem ) {
-	var nodeName = ( elem.nodeName || "" ).toLowerCase();
-	if ( nodeName === "input" ) {
-		fixDefaultChecked( elem );
-	// Skip scripts, get other children
-	} else if ( nodeName !== "script" && typeof elem.getElementsByTagName !== "undefined" ) {
-		jQuery.grep( elem.getElementsByTagName("input"), fixDefaultChecked );
+	function findInputs(elem) {
+		var nodeName = (elem.nodeName || "").toLowerCase();
+		if (nodeName === "input") {
+			fixDefaultChecked(elem);
+			// Skip scripts, get other children
+		} else if (nodeName !== "script" && typeof elem.getElementsByTagName !== "undefined") {
+			jQuery.grep(elem.getElementsByTagName("input"), fixDefaultChecked);
+		}
 	}
-}
 
 // Derived From: http://www.iecss.com/shimprove/javascript/shimprove.1-0-1.js
-function shimCloneNode( elem ) {
-	var div = document.createElement( "div" );
-	safeFragment.appendChild( div );
-
-	div.innerHTML = elem.outerHTML;
-	return div.firstChild;
-}
-
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var srcElements,
-			destElements,
-			i,
-			// IE<=8 does not properly clone detached, unknown element nodes
-			clone = jQuery.support.html5Clone || !rnoshimcache.test( "<" + elem.nodeName ) ?
-				elem.cloneNode( true ) :
-				shimCloneNode( elem );
-
-		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
-				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
-			// IE copies events bound via attachEvent when using cloneNode.
-			// Calling detachEvent on the clone will also remove the events
-			// from the original. In order to get around this, we use some
-			// proprietary methods to clear the events. Thanks to MooTools
-			// guys for this hotness.
-
-			cloneFixAttributes( elem, clone );
-
-			// Using Sizzle here is crazy slow, so we use getElementsByTagName instead
-			srcElements = getAll( elem );
-			destElements = getAll( clone );
-
-			// Weird iteration because IE will replace the length property
-			// with an element if you are cloning the body and one of the
-			// elements on the page has a name or id of "length"
-			for ( i = 0; srcElements[i]; ++i ) {
-				// Ensure that the destination node is not null; Fixes #9587
-				if ( destElements[i] ) {
-					cloneFixAttributes( srcElements[i], destElements[i] );
+	function shimCloneNode(elem) {
+		var div = document.createElement("div");
+		safeFragment.appendChild(div);
+
+		div.innerHTML = elem.outerHTML;
+		return div.firstChild;
+	}
+
+	jQuery.extend({
+		clone: function (elem, dataAndEvents, deepDataAndEvents) {
+			var srcElements,
+				destElements,
+				i,
+				// IE<=8 does not properly clone detached, unknown element nodes
+				clone = jQuery.support.html5Clone || !rnoshimcache.test("<" + elem.nodeName) ?
+					elem.cloneNode(true) :
+					shimCloneNode(elem);
+
+			if ((!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
+				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem)) {
+				// IE copies events bound via attachEvent when using cloneNode.
+				// Calling detachEvent on the clone will also remove the events
+				// from the original. In order to get around this, we use some
+				// proprietary methods to clear the events. Thanks to MooTools
+				// guys for this hotness.
+
+				cloneFixAttributes(elem, clone);
+
+				// Using Sizzle here is crazy slow, so we use getElementsByTagName instead
+				srcElements = getAll(elem);
+				destElements = getAll(clone);
+
+				// Weird iteration because IE will replace the length property
+				// with an element if you are cloning the body and one of the
+				// elements on the page has a name or id of "length"
+				for (i = 0; srcElements[i]; ++i) {
+					// Ensure that the destination node is not null; Fixes #9587
+					if (destElements[i]) {
+						cloneFixAttributes(srcElements[i], destElements[i]);
+					}
 				}
 			}
-		}
 
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			cloneCopyEvent( elem, clone );
+			// Copy the events from the original to the clone
+			if (dataAndEvents) {
+				cloneCopyEvent(elem, clone);
 
-			if ( deepDataAndEvents ) {
-				srcElements = getAll( elem );
-				destElements = getAll( clone );
+				if (deepDataAndEvents) {
+					srcElements = getAll(elem);
+					destElements = getAll(clone);
 
-				for ( i = 0; srcElements[i]; ++i ) {
-					cloneCopyEvent( srcElements[i], destElements[i] );
+					for (i = 0; srcElements[i]; ++i) {
+						cloneCopyEvent(srcElements[i], destElements[i]);
+					}
 				}
 			}
-		}
 
-		srcElements = destElements = null;
+			srcElements = destElements = null;
 
-		// Return the cloned set
-		return clone;
-	},
+			// Return the cloned set
+			return clone;
+		},
 
-	clean: function( elems, context, fragment, scripts ) {
-		var checkScriptType;
+		clean: function (elems, context, fragment, scripts) {
+			var checkScriptType;
 
-		context = context || document;
+			context = context || document;
 
-		// !context.createElement fails in IE with an error but returns typeof 'object'
-		if ( typeof context.createElement === "undefined" ) {
-			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
-		}
+			// !context.createElement fails in IE with an error but returns typeof 'object'
+			if (typeof context.createElement === "undefined") {
+				context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
+			}
 
-		var ret = [], j;
+			var ret = [], j;
 
-		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-			if ( typeof elem === "number" ) {
-				elem += "";
-			}
+			for (var i = 0, elem; (elem = elems[i]) != null; i++) {
+				if (typeof elem === "number") {
+					elem += "";
+				}
 
-			if ( !elem ) {
-				continue;
-			}
+				if (!elem) {
+					continue;
+				}
 
-			// Convert html string into DOM nodes
-			if ( typeof elem === "string" ) {
-				if ( !rhtml.test( elem ) ) {
-					elem = context.createTextNode( elem );
-				} else {
-					// Fix "XHTML"-style tags in all browsers
-					elem = elem.replace(rxhtmlTag, "<$1></$2>");
-
-					// Trim whitespace, otherwise indexOf won't work as expected
-					var tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase(),
-						wrap = wrapMap[ tag ] || wrapMap._default,
-						depth = wrap[0],
-						div = context.createElement("div");
-
-					// Append wrapper element to unknown element safe doc fragment
-					if ( context === document ) {
-						// Use the fragment we've already created for this document
-						safeFragment.appendChild( div );
+				// Convert html string into DOM nodes
+				if (typeof elem === "string") {
+					if (!rhtml.test(elem)) {
+						elem = context.createTextNode(elem);
 					} else {
-						// Use a fragment created with the owner document
-						createSafeFragment( context ).appendChild( div );
-					}
+						// Fix "XHTML"-style tags in all browsers
+						elem = elem.replace(rxhtmlTag, "<$1></$2>");
+
+						// Trim whitespace, otherwise indexOf won't work as expected
+						var tag = (rtagName.exec(elem) || ["", ""])[1].toLowerCase(),
+							wrap = wrapMap[tag] || wrapMap._default,
+							depth = wrap[0],
+							div = context.createElement("div");
+
+						// Append wrapper element to unknown element safe doc fragment
+						if (context === document) {
+							// Use the fragment we've already created for this document
+							safeFragment.appendChild(div);
+						} else {
+							// Use a fragment created with the owner document
+							createSafeFragment(context).appendChild(div);
+						}
 
-					// Go to html and back, then peel off extra wrappers
-					div.innerHTML = wrap[1] + elem + wrap[2];
+						// Go to html and back, then peel off extra wrappers
+						div.innerHTML = wrap[1] + elem + wrap[2];
 
-					// Move to the right depth
-					while ( depth-- ) {
-						div = div.lastChild;
-					}
+						// Move to the right depth
+						while (depth--) {
+							div = div.lastChild;
+						}
 
-					// Remove IE's autoinserted <tbody> from table fragments
-					if ( !jQuery.support.tbody ) {
+						// Remove IE's autoinserted <tbody> from table fragments
+						if (!jQuery.support.tbody) {
 
-						// String was a <table>, *may* have spurious <tbody>
-						var hasBody = rtbody.test(elem),
-							tbody = tag === "table" && !hasBody ?
-								div.firstChild && div.firstChild.childNodes :
+							// String was a <table>, *may* have spurious <tbody>
+							var hasBody = rtbody.test(elem),
+								tbody = tag === "table" && !hasBody ?
+									div.firstChild && div.firstChild.childNodes :
 
-								// String was a bare <thead> or <tfoot>
-								wrap[1] === "<table>" && !hasBody ?
-									div.childNodes :
-									[];
+									// String was a bare <thead> or <tfoot>
+									wrap[1] === "<table>" && !hasBody ?
+										div.childNodes :
+										[];
 
-						for ( j = tbody.length - 1; j >= 0 ; --j ) {
-							if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
-								tbody[ j ].parentNode.removeChild( tbody[ j ] );
+							for (j = tbody.length - 1; j >= 0; --j) {
+								if (jQuery.nodeName(tbody[j], "tbody") && !tbody[j].childNodes.length) {
+									tbody[j].parentNode.removeChild(tbody[j]);
+								}
 							}
 						}
-					}
 
-					// IE completely kills leading whitespace when innerHTML is used
-					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-						div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
-					}
+						// IE completely kills leading whitespace when innerHTML is used
+						if (!jQuery.support.leadingWhitespace && rleadingWhitespace.test(elem)) {
+							div.insertBefore(context.createTextNode(rleadingWhitespace.exec(elem)[0]), div.firstChild);
+						}
 
-					elem = div.childNodes;
+						elem = div.childNodes;
+					}
 				}
-			}
 
-			// Resets defaultChecked for any radios and checkboxes
-			// about to be appended to the DOM in IE 6/7 (#8060)
-			var len;
-			if ( !jQuery.support.appendChecked ) {
-				if ( elem[0] && typeof (len = elem.length) === "number" ) {
-					for ( j = 0; j < len; j++ ) {
-						findInputs( elem[j] );
+				// Resets defaultChecked for any radios and checkboxes
+				// about to be appended to the DOM in IE 6/7 (#8060)
+				var len;
+				if (!jQuery.support.appendChecked) {
+					if (elem[0] && typeof (len = elem.length) === "number") {
+						for (j = 0; j < len; j++) {
+							findInputs(elem[j]);
+						}
+					} else {
+						findInputs(elem);
 					}
-				} else {
-					findInputs( elem );
 				}
-			}
 
-			if ( elem.nodeType ) {
-				ret.push( elem );
-			} else {
-				ret = jQuery.merge( ret, elem );
+				if (elem.nodeType) {
+					ret.push(elem);
+				} else {
+					ret = jQuery.merge(ret, elem);
+				}
 			}
-		}
 
-		if ( fragment ) {
-			checkScriptType = function( elem ) {
-				return !elem.type || rscriptType.test( elem.type );
-			};
-			for ( i = 0; ret[i]; i++ ) {
-				if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
-					scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
+			if (fragment) {
+				checkScriptType = function (elem) {
+					return !elem.type || rscriptType.test(elem.type);
+				};
+				for (i = 0; ret[i]; i++) {
+					if (scripts && jQuery.nodeName(ret[i], "script") && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript")) {
+						scripts.push(ret[i].parentNode ? ret[i].parentNode.removeChild(ret[i]) : ret[i]);
 
-				} else {
-					if ( ret[i].nodeType === 1 ) {
-						var jsTags = jQuery.grep( ret[i].getElementsByTagName( "script" ), checkScriptType );
+					} else {
+						if (ret[i].nodeType === 1) {
+							var jsTags = jQuery.grep(ret[i].getElementsByTagName("script"), checkScriptType);
 
-						ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
+							ret.splice.apply(ret, [i + 1, 0].concat(jsTags));
+						}
+						fragment.appendChild(ret[i]);
 					}
-					fragment.appendChild( ret[i] );
 				}
 			}
-		}
 
-		return ret;
-	},
+			return ret;
+		},
 
-	cleanData: function( elems ) {
-		var data, id,
-			cache = jQuery.cache,
-			special = jQuery.event.special,
-			deleteExpando = jQuery.support.deleteExpando;
+		cleanData: function (elems) {
+			var data, id,
+				cache = jQuery.cache,
+				special = jQuery.event.special,
+				deleteExpando = jQuery.support.deleteExpando;
 
-		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-			if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
-				continue;
-			}
+			for (var i = 0, elem; (elem = elems[i]) != null; i++) {
+				if (elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) {
+					continue;
+				}
 
-			id = elem[ jQuery.expando ];
+				id = elem[jQuery.expando];
 
-			if ( id ) {
-				data = cache[ id ];
+				if (id) {
+					data = cache[id];
 
-				if ( data && data.events ) {
-					for ( var type in data.events ) {
-						if ( special[ type ] ) {
-							jQuery.event.remove( elem, type );
+					if (data && data.events) {
+						for (var type in data.events) {
+							if (special[type]) {
+								jQuery.event.remove(elem, type);
 
-						// This is a shortcut to avoid jQuery.event.remove's overhead
-						} else {
-							jQuery.removeEvent( elem, type, data.handle );
+								// This is a shortcut to avoid jQuery.event.remove's overhead
+							} else {
+								jQuery.removeEvent(elem, type, data.handle);
+							}
 						}
-					}
 
-					// Null the DOM reference to avoid IE6/7/8 leak (#7054)
-					if ( data.handle ) {
-						data.handle.elem = null;
+						// Null the DOM reference to avoid IE6/7/8 leak (#7054)
+						if (data.handle) {
+							data.handle.elem = null;
+						}
 					}
-				}
 
-				if ( deleteExpando ) {
-					delete elem[ jQuery.expando ];
+					if (deleteExpando) {
+						delete elem[jQuery.expando];
 
-				} else if ( elem.removeAttribute ) {
-					elem.removeAttribute( jQuery.expando );
-				}
+					} else if (elem.removeAttribute) {
+						elem.removeAttribute(jQuery.expando);
+					}
 
-				delete cache[ id ];
+					delete cache[id];
+				}
 			}
 		}
-	}
-});
-
-function evalScript( i, elem ) {
-	if ( elem.src ) {
-		jQuery.ajax({
-			url: elem.src,
-			async: false,
-			dataType: "script"
-		});
-	} else {
-		jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "/*$0*/" ) );
-	}
+	});
 
-	if ( elem.parentNode ) {
-		elem.parentNode.removeChild( elem );
-	}
-}
+	function evalScript(i, elem) {
+		if (elem.src) {
+			jQuery.ajax({
+				url: elem.src,
+				async: false,
+				dataType: "script"
+			});
+		} else {
+			jQuery.globalEval((elem.text || elem.textContent || elem.innerHTML || "").replace(rcleanScript, "/*$0*/"));
+		}
 
+		if (elem.parentNode) {
+			elem.parentNode.removeChild(elem);
+		}
+	}
 
 
+	var ralpha = /alpha\([^)]*\)/i,
+		ropacity = /opacity=([^)]*)/,
+		// fixed for IE9, see #8346
+		rupper = /([A-Z]|^ms)/g,
+		rnumpx = /^-?\d+(?:px)?$/i,
+		rnum = /^-?\d/,
+		rrelNum = /^([\-+])=([\-+.\de]+)/,
 
-var ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity=([^)]*)/,
-	// fixed for IE9, see #8346
-	rupper = /([A-Z]|^ms)/g,
-	rnumpx = /^-?\d+(?:px)?$/i,
-	rnum = /^-?\d/,
-	rrelNum = /^([\-+])=([\-+.\de]+)/,
+		cssShow = {position: "absolute", visibility: "hidden", display: "block"},
+		cssWidth = ["Left", "Right"],
+		cssHeight = ["Top", "Bottom"],
+		curCSS,
 
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssWidth = [ "Left", "Right" ],
-	cssHeight = [ "Top", "Bottom" ],
-	curCSS,
+		getComputedStyle,
+		currentStyle;
 
-	getComputedStyle,
-	currentStyle;
+	jQuery.fn.css = function (name, value) {
+		// Setting 'undefined' is a no-op
+		if (arguments.length === 2 && value === undefined) {
+			return this;
+		}
 
-jQuery.fn.css = function( name, value ) {
-	// Setting 'undefined' is a no-op
-	if ( arguments.length === 2 && value === undefined ) {
-		return this;
-	}
+		return jQuery.access(this, name, value, true, function (elem, name, value) {
+			return value !== undefined ?
+				jQuery.style(elem, name, value) :
+				jQuery.css(elem, name);
+		});
+	};
 
-	return jQuery.access( this, name, value, true, function( elem, name, value ) {
-		return value !== undefined ?
-			jQuery.style( elem, name, value ) :
-			jQuery.css( elem, name );
-	});
-};
-
-jQuery.extend({
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity", "opacity" );
-					return ret === "" ? "1" : ret;
+	jQuery.extend({
+		// Add in style property hooks for overriding the default
+		// behavior of getting and setting a style property
+		cssHooks: {
+			opacity: {
+				get: function (elem, computed) {
+					if (computed) {
+						// We should always get a number back from opacity
+						var ret = curCSS(elem, "opacity", "opacity");
+						return ret === "" ? "1" : ret;
 
-				} else {
-					return elem.style.opacity;
+					} else {
+						return elem.style.opacity;
+					}
 				}
 			}
-		}
-	},
-
-	// Exclude the following css properties to add px
-	cssNumber: {
-		"fillOpacity": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		// normalize float css property
-		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, origName = jQuery.camelCase( name ),
-			style = elem.style, hooks = jQuery.cssHooks[ origName ];
-
-		name = jQuery.cssProps[ origName ] || origName;
+		},
 
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
+		// Exclude the following css properties to add px
+		cssNumber: {
+			"fillOpacity": true,
+			"fontWeight": true,
+			"lineHeight": true,
+			"opacity": true,
+			"orphans": true,
+			"widows": true,
+			"zIndex": true,
+			"zoom": true
+		},
 
-			// convert relative number strings (+= or -=) to relative numbers. #7345
-			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-				value = ( +( ret[1] + 1) * +ret[2] ) + parseFloat( jQuery.css( elem, name ) );
-				// Fixes bug #9237
-				type = "number";
-			}
+		// Add in properties whose names you wish to fix before
+		// setting or getting the value
+		cssProps: {
+			// normalize float css property
+			"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
+		},
 
-			// Make sure that NaN and null values aren't set. See: #7116
-			if ( value == null || type === "number" && isNaN( value ) ) {
+		// Get and set the style property on a DOM Node
+		style: function (elem, name, value, extra) {
+			// Don't set styles on text and comment nodes
+			if (!elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style) {
 				return;
 			}
 
-			// If a number was passed in, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
+			// Make sure that we're working with the right name
+			var ret, type, origName = jQuery.camelCase(name),
+				style = elem.style, hooks = jQuery.cssHooks[origName];
 
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
-				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
-				// Fixes bug #5509
-				try {
-					style[ name ] = value;
-				} catch(e) {}
-			}
+			name = jQuery.cssProps[origName] || origName;
 
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
+			// Check if we're setting a value
+			if (value !== undefined) {
+				type = typeof value;
 
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
+				// convert relative number strings (+= or -=) to relative numbers. #7345
+				if (type === "string" && (ret = rrelNum.exec(value))) {
+					value = (+(ret[1] + 1) * +ret[2]) + parseFloat(jQuery.css(elem, name));
+					// Fixes bug #9237
+					type = "number";
+				}
+
+				// Make sure that NaN and null values aren't set. See: #7116
+				if (value == null || type === "number" && isNaN(value)) {
+					return;
+				}
 
-	css: function( elem, name, extra ) {
-		var ret, hooks;
+				// If a number was passed in, add 'px' to the (except for certain CSS properties)
+				if (type === "number" && !jQuery.cssNumber[origName]) {
+					value += "px";
+				}
 
-		// Make sure that we're working with the right name
-		name = jQuery.camelCase( name );
-		hooks = jQuery.cssHooks[ name ];
-		name = jQuery.cssProps[ name ] || name;
+				// If a hook was provided, use that value, otherwise just set the specified value
+				if (!hooks || !("set" in hooks) || (value = hooks.set(elem, value)) !== undefined) {
+					// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
+					// Fixes bug #5509
+					try {
+						style[name] = value;
+					} catch (e) {
+					}
+				}
 
-		// cssFloat needs a special treatment
-		if ( name === "cssFloat" ) {
-			name = "float";
-		}
+			} else {
+				// If a hook was provided get the non-computed value from there
+				if (hooks && "get" in hooks && (ret = hooks.get(elem, false, extra)) !== undefined) {
+					return ret;
+				}
+
+				// Otherwise just get the value from the style object
+				return style[name];
+			}
+		},
+
+		css: function (elem, name, extra) {
+			var ret, hooks;
+
+			// Make sure that we're working with the right name
+			name = jQuery.camelCase(name);
+			hooks = jQuery.cssHooks[name];
+			name = jQuery.cssProps[name] || name;
+
+			// cssFloat needs a special treatment
+			if (name === "cssFloat") {
+				name = "float";
+			}
 
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) {
-			return ret;
+			// If a hook was provided get the computed value from there
+			if (hooks && "get" in hooks && (ret = hooks.get(elem, true, extra)) !== undefined) {
+				return ret;
 
-		// Otherwise, if a way to get the computed value exists, use that
-		} else if ( curCSS ) {
-			return curCSS( elem, name );
-		}
-	},
+				// Otherwise, if a way to get the computed value exists, use that
+			} else if (curCSS) {
+				return curCSS(elem, name);
+			}
+		},
 
-	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback ) {
-		var old = {};
+		// A method for quickly swapping in/out CSS properties to get correct calculations
+		swap: function (elem, options, callback) {
+			var old = {};
 
-		// Remember the old values, and insert the new ones
-		for ( var name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
+			// Remember the old values, and insert the new ones
+			for (var name in options) {
+				old[name] = elem.style[name];
+				elem.style[name] = options[name];
+			}
 
-		callback.call( elem );
+			callback.call(elem);
 
-		// Revert the old values
-		for ( name in options ) {
-			elem.style[ name ] = old[ name ];
+			// Revert the old values
+			for (name in options) {
+				elem.style[name] = old[name];
+			}
 		}
-	}
-});
+	});
 
 // DEPRECATED, Use jQuery.css() instead
-jQuery.curCSS = jQuery.css;
+	jQuery.curCSS = jQuery.css;
 
-jQuery.each(["height", "width"], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			var val;
+	jQuery.each(["height", "width"], function (i, name) {
+		jQuery.cssHooks[name] = {
+			get: function (elem, computed, extra) {
+				var val;
 
-			if ( computed ) {
-				if ( elem.offsetWidth !== 0 ) {
-					return getWH( elem, name, extra );
-				} else {
-					jQuery.swap( elem, cssShow, function() {
-						val = getWH( elem, name, extra );
-					});
+				if (computed) {
+					if (elem.offsetWidth !== 0) {
+						return getWH(elem, name, extra);
+					} else {
+						jQuery.swap(elem, cssShow, function () {
+							val = getWH(elem, name, extra);
+						});
+					}
+
+					return val;
 				}
+			},
 
-				return val;
-			}
-		},
+			set: function (elem, value) {
+				if (rnumpx.test(value)) {
+					// ignore negative width and height values #1599
+					value = parseFloat(value);
 
-		set: function( elem, value ) {
-			if ( rnumpx.test( value ) ) {
-				// ignore negative width and height values #1599
-				value = parseFloat( value );
+					if (value >= 0) {
+						return value + "px";
+					}
 
-				if ( value >= 0 ) {
-					return value + "px";
+				} else {
+					return value;
 				}
-
-			} else {
-				return value;
 			}
-		}
-	};
-});
-
-if ( !jQuery.support.opacity ) {
-	jQuery.cssHooks.opacity = {
-		get: function( elem, computed ) {
-			// IE uses filters for opacity
-			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
-				( parseFloat( RegExp.$1 ) / 100 ) + "" :
-				computed ? "1" : "";
-		},
+		};
+	});
 
-		set: function( elem, value ) {
-			var style = elem.style,
-				currentStyle = elem.currentStyle,
-				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
-				filter = currentStyle && currentStyle.filter || style.filter || "";
+	if (!jQuery.support.opacity) {
+		jQuery.cssHooks.opacity = {
+			get: function (elem, computed) {
+				// IE uses filters for opacity
+				return ropacity.test((computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "") ?
+					(parseFloat(RegExp.$1) / 100) + "" :
+					computed ? "1" : "";
+			},
 
-			// IE has trouble with opacity if it does not have layout
-			// Force it by setting the zoom level
-			style.zoom = 1;
+			set: function (elem, value) {
+				var style = elem.style,
+					currentStyle = elem.currentStyle,
+					opacity = jQuery.isNumeric(value) ? "alpha(opacity=" + value * 100 + ")" : "",
+					filter = currentStyle && currentStyle.filter || style.filter || "";
 
-			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
-			if ( value >= 1 && jQuery.trim( filter.replace( ralpha, "" ) ) === "" ) {
+				// IE has trouble with opacity if it does not have layout
+				// Force it by setting the zoom level
+				style.zoom = 1;
 
-				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
-				// if "filter:" is present at all, clearType is disabled, we want to avoid this
-				// style.removeAttribute is IE Only, but so apparently is this code path...
-				style.removeAttribute( "filter" );
+				// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
+				if (value >= 1 && jQuery.trim(filter.replace(ralpha, "")) === "") {
 
-				// if there there is no filter style applied in a css rule, we are done
-				if ( currentStyle && !currentStyle.filter ) {
-					return;
-				}
-			}
+					// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
+					// if "filter:" is present at all, clearType is disabled, we want to avoid this
+					// style.removeAttribute is IE Only, but so apparently is this code path...
+					style.removeAttribute("filter");
 
-			// otherwise, set new filter values
-			style.filter = ralpha.test( filter ) ?
-				filter.replace( ralpha, opacity ) :
-				filter + " " + opacity;
-		}
-	};
-}
-
-jQuery(function() {
-	// This hook cannot be added until DOM ready because the support test
-	// for it is not run until after DOM ready
-	if ( !jQuery.support.reliableMarginRight ) {
-		jQuery.cssHooks.marginRight = {
-			get: function( elem, computed ) {
-				// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-				// Work around by temporarily setting element display to inline-block
-				var ret;
-				jQuery.swap( elem, { "display": "inline-block" }, function() {
-					if ( computed ) {
-						ret = curCSS( elem, "margin-right", "marginRight" );
-					} else {
-						ret = elem.style.marginRight;
+					// if there there is no filter style applied in a css rule, we are done
+					if (currentStyle && !currentStyle.filter) {
+						return;
 					}
-				});
-				return ret;
+				}
+
+				// otherwise, set new filter values
+				style.filter = ralpha.test(filter) ?
+					filter.replace(ralpha, opacity) :
+					filter + " " + opacity;
 			}
 		};
 	}
-});
-
-if ( document.defaultView && document.defaultView.getComputedStyle ) {
-	getComputedStyle = function( elem, name ) {
-		var ret, defaultView, computedStyle;
-
-		name = name.replace( rupper, "-$1" ).toLowerCase();
 
-		if ( (defaultView = elem.ownerDocument.defaultView) &&
-				(computedStyle = defaultView.getComputedStyle( elem, null )) ) {
-			ret = computedStyle.getPropertyValue( name );
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
+	jQuery(function () {
+		// This hook cannot be added until DOM ready because the support test
+		// for it is not run until after DOM ready
+		if (!jQuery.support.reliableMarginRight) {
+			jQuery.cssHooks.marginRight = {
+				get: function (elem, computed) {
+					// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+					// Work around by temporarily setting element display to inline-block
+					var ret;
+					jQuery.swap(elem, {"display": "inline-block"}, function () {
+						if (computed) {
+							ret = curCSS(elem, "margin-right", "marginRight");
+						} else {
+							ret = elem.style.marginRight;
+						}
+					});
+					return ret;
+				}
+			};
 		}
+	});
 
-		return ret;
-	};
-}
-
-if ( document.documentElement.currentStyle ) {
-	currentStyle = function( elem, name ) {
-		var left, rsLeft, uncomputed,
-			ret = elem.currentStyle && elem.currentStyle[ name ],
-			style = elem.style;
-
-		// Avoid setting ret to empty string here
-		// so we don't default to auto
-		if ( ret === null && style && (uncomputed = style[ name ]) ) {
-			ret = uncomputed;
-		}
+	if (document.defaultView && document.defaultView.getComputedStyle) {
+		getComputedStyle = function (elem, name) {
+			var ret, defaultView, computedStyle;
 
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+			name = name.replace(rupper, "-$1").toLowerCase();
 
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
+			if ((defaultView = elem.ownerDocument.defaultView) &&
+				(computedStyle = defaultView.getComputedStyle(elem, null))) {
+				ret = computedStyle.getPropertyValue(name);
+				if (ret === "" && !jQuery.contains(elem.ownerDocument.documentElement, elem)) {
+					ret = jQuery.style(elem, name);
+				}
+			}
 
-			// Remember the original values
-			left = style.left;
-			rsLeft = elem.runtimeStyle && elem.runtimeStyle.left;
+			return ret;
+		};
+	}
 
-			// Put in the new values to get a computed value out
-			if ( rsLeft ) {
-				elem.runtimeStyle.left = elem.currentStyle.left;
-			}
-			style.left = name === "fontSize" ? "1em" : ( ret || 0 );
-			ret = style.pixelLeft + "px";
+	if (document.documentElement.currentStyle) {
+		currentStyle = function (elem, name) {
+			var left, rsLeft, uncomputed,
+				ret = elem.currentStyle && elem.currentStyle[name],
+				style = elem.style;
 
-			// Revert the changed values
-			style.left = left;
-			if ( rsLeft ) {
-				elem.runtimeStyle.left = rsLeft;
+			// Avoid setting ret to empty string here
+			// so we don't default to auto
+			if (ret === null && style && (uncomputed = style[name])) {
+				ret = uncomputed;
 			}
-		}
-
-		return ret === "" ? "auto" : ret;
-	};
-}
 
-curCSS = getComputedStyle || currentStyle;
+			// From the awesome hack by Dean Edwards
+			// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
 
-function getWH( elem, name, extra ) {
+			// If we're not dealing with a regular pixel number
+			// but a number that has a weird ending, we need to convert it to pixels
+			if (!rnumpx.test(ret) && rnum.test(ret)) {
 
-	// Start with offset property
-	var val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		which = name === "width" ? cssWidth : cssHeight,
-		i = 0,
-		len = which.length;
+				// Remember the original values
+				left = style.left;
+				rsLeft = elem.runtimeStyle && elem.runtimeStyle.left;
 
-	if ( val > 0 ) {
-		if ( extra !== "border" ) {
-			for ( ; i < len; i++ ) {
-				if ( !extra ) {
-					val -= parseFloat( jQuery.css( elem, "padding" + which[ i ] ) ) || 0;
+				// Put in the new values to get a computed value out
+				if (rsLeft) {
+					elem.runtimeStyle.left = elem.currentStyle.left;
 				}
-				if ( extra === "margin" ) {
-					val += parseFloat( jQuery.css( elem, extra + which[ i ] ) ) || 0;
-				} else {
-					val -= parseFloat( jQuery.css( elem, "border" + which[ i ] + "Width" ) ) || 0;
+				style.left = name === "fontSize" ? "1em" : (ret || 0);
+				ret = style.pixelLeft + "px";
+
+				// Revert the changed values
+				style.left = left;
+				if (rsLeft) {
+					elem.runtimeStyle.left = rsLeft;
 				}
 			}
-		}
 
-		return val + "px";
+			return ret === "" ? "auto" : ret;
+		};
 	}
 
-	// Fall back to computed then uncomputed css if necessary
-	val = curCSS( elem, name, name );
-	if ( val < 0 || val == null ) {
-		val = elem.style[ name ] || 0;
-	}
-	// Normalize "", auto, and prepare for extra
-	val = parseFloat( val ) || 0;
+	curCSS = getComputedStyle || currentStyle;
 
-	// Add padding, border, margin
-	if ( extra ) {
-		for ( ; i < len; i++ ) {
-			val += parseFloat( jQuery.css( elem, "padding" + which[ i ] ) ) || 0;
-			if ( extra !== "padding" ) {
-				val += parseFloat( jQuery.css( elem, "border" + which[ i ] + "Width" ) ) || 0;
-			}
-			if ( extra === "margin" ) {
-				val += parseFloat( jQuery.css( elem, extra + which[ i ] ) ) || 0;
-			}
-		}
-	}
+	function getWH(elem, name, extra) {
 
-	return val + "px";
-}
+		// Start with offset property
+		var val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+			which = name === "width" ? cssWidth : cssHeight,
+			i = 0,
+			len = which.length;
 
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.hidden = function( elem ) {
-		var width = elem.offsetWidth,
-			height = elem.offsetHeight;
+		if (val > 0) {
+			if (extra !== "border") {
+				for (; i < len; i++) {
+					if (!extra) {
+						val -= parseFloat(jQuery.css(elem, "padding" + which[i])) || 0;
+					}
+					if (extra === "margin") {
+						val += parseFloat(jQuery.css(elem, extra + which[i])) || 0;
+					} else {
+						val -= parseFloat(jQuery.css(elem, "border" + which[i] + "Width")) || 0;
+					}
+				}
+			}
 
-		return ( width === 0 && height === 0 ) || (!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
-	};
+			return val + "px";
+		}
 
-	jQuery.expr.filters.visible = function( elem ) {
-		return !jQuery.expr.filters.hidden( elem );
-	};
-}
+		// Fall back to computed then uncomputed css if necessary
+		val = curCSS(elem, name, name);
+		if (val < 0 || val == null) {
+			val = elem.style[name] || 0;
+		}
+		// Normalize "", auto, and prepare for extra
+		val = parseFloat(val) || 0;
+
+		// Add padding, border, margin
+		if (extra) {
+			for (; i < len; i++) {
+				val += parseFloat(jQuery.css(elem, "padding" + which[i])) || 0;
+				if (extra !== "padding") {
+					val += parseFloat(jQuery.css(elem, "border" + which[i] + "Width")) || 0;
+				}
+				if (extra === "margin") {
+					val += parseFloat(jQuery.css(elem, extra + which[i])) || 0;
+				}
+			}
+		}
 
+		return val + "px";
+	}
 
+	if (jQuery.expr && jQuery.expr.filters) {
+		jQuery.expr.filters.hidden = function (elem) {
+			var width = elem.offsetWidth,
+				height = elem.offsetHeight;
 
+			return (width === 0 && height === 0) || (!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css(elem, "display")) === "none");
+		};
 
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rhash = /#.*$/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
-	rinput = /^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
-	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rprotocol = /^\/\//,
-	rquery = /\?/,
-	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
-	rselectTextarea = /^(?:select|textarea)/i,
-	rspacesAjax = /\s+/,
-	rts = /([?&])_=[^&]*/,
-	rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,
+		jQuery.expr.filters.visible = function (elem) {
+			return !jQuery.expr.filters.hidden(elem);
+		};
+	}
 
-	// Keep a copy of the old load method
-	_load = jQuery.fn.load,
 
-	/* Prefilters
+	var r20 = /%20/g,
+		rbracket = /\[\]$/,
+		rCRLF = /\r?\n/g,
+		rhash = /#.*$/,
+		rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
+		rinput = /^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
+		// #7653, #8125, #8152: local protocol detection
+		rlocalProtocol = /^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,
+		rnoContent = /^(?:GET|HEAD)$/,
+		rprotocol = /^\/\//,
+		rquery = /\?/,
+		rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+		rselectTextarea = /^(?:select|textarea)/i,
+		rspacesAjax = /\s+/,
+		rts = /([?&])_=[^&]*/,
+		rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,
+
+		// Keep a copy of the old load method
+		_load = jQuery.fn.load,
+
+		/* Prefilters
 	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
 	 * 2) These are called:
 	 *    - BEFORE asking for a transport
@@ -6858,296 +6856,296 @@ var r20 = /%20/g,
 	 * 4) the catchall symbol "*" can be used
 	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
 	 */
-	prefilters = {},
+		prefilters = {},
 
-	/* Transports bindings
+		/* Transports bindings
 	 * 1) key is the dataType
 	 * 2) the catchall symbol "*" can be used
 	 * 3) selection will start with transport dataType and THEN go to "*" if needed
 	 */
-	transports = {},
+		transports = {},
 
-	// Document location
-	ajaxLocation,
+		// Document location
+		ajaxLocation,
 
-	// Document location segments
-	ajaxLocParts,
+		// Document location segments
+		ajaxLocParts,
 
-	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-	allTypes = ["*/"] + ["*"];
+		// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
+		allTypes = ["*/"] + ["*"];
 
 // #8138, IE may throw an exception when accessing
 // a field from window.location if document.domain has been set
-try {
-	ajaxLocation = location.href;
-} catch( e ) {
-	// Use the href attribute of an A element
-	// since IE will modify it given document.location
-	ajaxLocation = document.createElement( "a" );
-	ajaxLocation.href = "";
-	ajaxLocation = ajaxLocation.href;
-}
+	try {
+		ajaxLocation = location.href;
+	} catch (e) {
+		// Use the href attribute of an A element
+		// since IE will modify it given document.location
+		ajaxLocation = document.createElement("a");
+		ajaxLocation.href = "";
+		ajaxLocation = ajaxLocation.href;
+	}
 
 // Segment location into parts
-ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
+	ajaxLocParts = rurl.exec(ajaxLocation.toLowerCase()) || [];
 
 // Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
+	function addToPrefiltersOrTransports(structure) {
 
-	// dataTypeExpression is optional and defaults to "*"
-	return function( dataTypeExpression, func ) {
+		// dataTypeExpression is optional and defaults to "*"
+		return function (dataTypeExpression, func) {
 
-		if ( typeof dataTypeExpression !== "string" ) {
-			func = dataTypeExpression;
-			dataTypeExpression = "*";
-		}
+			if (typeof dataTypeExpression !== "string") {
+				func = dataTypeExpression;
+				dataTypeExpression = "*";
+			}
 
-		if ( jQuery.isFunction( func ) ) {
-			var dataTypes = dataTypeExpression.toLowerCase().split( rspacesAjax ),
-				i = 0,
-				length = dataTypes.length,
-				dataType,
-				list,
-				placeBefore;
-
-			// For each dataType in the dataTypeExpression
-			for ( ; i < length; i++ ) {
-				dataType = dataTypes[ i ];
-				// We control if we're asked to add before
-				// any existing element
-				placeBefore = /^\+/.test( dataType );
-				if ( placeBefore ) {
-					dataType = dataType.substr( 1 ) || "*";
-				}
-				list = structure[ dataType ] = structure[ dataType ] || [];
-				// then we add to the structure accordingly
-				list[ placeBefore ? "unshift" : "push" ]( func );
+			if (jQuery.isFunction(func)) {
+				var dataTypes = dataTypeExpression.toLowerCase().split(rspacesAjax),
+					i = 0,
+					length = dataTypes.length,
+					dataType,
+					list,
+					placeBefore;
+
+				// For each dataType in the dataTypeExpression
+				for (; i < length; i++) {
+					dataType = dataTypes[i];
+					// We control if we're asked to add before
+					// any existing element
+					placeBefore = /^\+/.test(dataType);
+					if (placeBefore) {
+						dataType = dataType.substr(1) || "*";
+					}
+					list = structure[dataType] = structure[dataType] || [];
+					// then we add to the structure accordingly
+					list[placeBefore ? "unshift" : "push"](func);
+				}
 			}
-		}
-	};
-}
+		};
+	}
 
 // Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR,
-		dataType /* internal */, inspected /* internal */ ) {
-
-	dataType = dataType || options.dataTypes[ 0 ];
-	inspected = inspected || {};
-
-	inspected[ dataType ] = true;
-
-	var list = structure[ dataType ],
-		i = 0,
-		length = list ? list.length : 0,
-		executeOnly = ( structure === prefilters ),
-		selection;
-
-	for ( ; i < length && ( executeOnly || !selection ); i++ ) {
-		selection = list[ i ]( options, originalOptions, jqXHR );
-		// If we got redirected to another dataType
-		// we try there if executing only and not done already
-		if ( typeof selection === "string" ) {
-			if ( !executeOnly || inspected[ selection ] ) {
-				selection = undefined;
-			} else {
-				options.dataTypes.unshift( selection );
-				selection = inspectPrefiltersOrTransports(
-						structure, options, originalOptions, jqXHR, selection, inspected );
+	function inspectPrefiltersOrTransports(structure, options, originalOptions, jqXHR,
+										   dataType /* internal */, inspected /* internal */) {
+
+		dataType = dataType || options.dataTypes[0];
+		inspected = inspected || {};
+
+		inspected[dataType] = true;
+
+		var list = structure[dataType],
+			i = 0,
+			length = list ? list.length : 0,
+			executeOnly = (structure === prefilters),
+			selection;
+
+		for (; i < length && (executeOnly || !selection); i++) {
+			selection = list[i](options, originalOptions, jqXHR);
+			// If we got redirected to another dataType
+			// we try there if executing only and not done already
+			if (typeof selection === "string") {
+				if (!executeOnly || inspected[selection]) {
+					selection = undefined;
+				} else {
+					options.dataTypes.unshift(selection);
+					selection = inspectPrefiltersOrTransports(
+						structure, options, originalOptions, jqXHR, selection, inspected);
+				}
 			}
 		}
+		// If we're only executing or nothing was selected
+		// we try the catchall dataType if not done already
+		if ((executeOnly || !selection) && !inspected["*"]) {
+			selection = inspectPrefiltersOrTransports(
+				structure, options, originalOptions, jqXHR, "*", inspected);
+		}
+		// unnecessary when only executing (prefilters)
+		// but it'll be ignored by the caller in that case
+		return selection;
 	}
-	// If we're only executing or nothing was selected
-	// we try the catchall dataType if not done already
-	if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
-		selection = inspectPrefiltersOrTransports(
-				structure, options, originalOptions, jqXHR, "*", inspected );
-	}
-	// unnecessary when only executing (prefilters)
-	// but it'll be ignored by the caller in that case
-	return selection;
-}
 
 // A special extend for ajax options
 // that takes "flat" options (not to be deep extended)
 // Fixes #9887
-function ajaxExtend( target, src ) {
-	var key, deep,
-		flatOptions = jQuery.ajaxSettings.flatOptions || {};
-	for ( key in src ) {
-		if ( src[ key ] !== undefined ) {
-			( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ];
+	function ajaxExtend(target, src) {
+		var key, deep,
+			flatOptions = jQuery.ajaxSettings.flatOptions || {};
+		for (key in src) {
+			if (src[key] !== undefined) {
+				(flatOptions[key] ? target : (deep || (deep = {})))[key] = src[key];
+			}
+		}
+		if (deep) {
+			jQuery.extend(true, target, deep);
 		}
 	}
-	if ( deep ) {
-		jQuery.extend( true, target, deep );
-	}
-}
 
-jQuery.fn.extend({
-	load: function( url, params, callback ) {
-		if ( typeof url !== "string" && _load ) {
-			return _load.apply( this, arguments );
+	jQuery.fn.extend({
+		load: function (url, params, callback) {
+			if (typeof url !== "string" && _load) {
+				return _load.apply(this, arguments);
 
-		// Don't do a request if no elements are being requested
-		} else if ( !this.length ) {
-			return this;
-		}
+				// Don't do a request if no elements are being requested
+			} else if (!this.length) {
+				return this;
+			}
 
-		var off = url.indexOf( " " );
-		if ( off >= 0 ) {
-			var selector = url.slice( off, url.length );
-			url = url.slice( 0, off );
-		}
+			var off = url.indexOf(" ");
+			if (off >= 0) {
+				var selector = url.slice(off, url.length);
+				url = url.slice(0, off);
+			}
 
-		// Default to a GET request
-		var type = "GET";
+			// Default to a GET request
+			var type = "GET";
 
-		// If the second parameter was provided
-		if ( params ) {
-			// If it's a function
-			if ( jQuery.isFunction( params ) ) {
-				// We assume that it's the callback
-				callback = params;
-				params = undefined;
+			// If the second parameter was provided
+			if (params) {
+				// If it's a function
+				if (jQuery.isFunction(params)) {
+					// We assume that it's the callback
+					callback = params;
+					params = undefined;
 
-			// Otherwise, build a param string
-			} else if ( typeof params === "object" ) {
-				params = jQuery.param( params, jQuery.ajaxSettings.traditional );
-				type = "POST";
+					// Otherwise, build a param string
+				} else if (typeof params === "object") {
+					params = jQuery.param(params, jQuery.ajaxSettings.traditional);
+					type = "POST";
+				}
 			}
-		}
 
-		var self = this;
-
-		// Request the remote document
-		jQuery.ajax({
-			url: url,
-			type: type,
-			dataType: "html",
-			data: params,
-			// Complete callback (responseText is used internally)
-			complete: function( jqXHR, status, responseText ) {
-				// Store the response as specified by the jqXHR object
-				responseText = jqXHR.responseText;
-				// If successful, inject the HTML into all the matched elements
-				if ( jqXHR.isResolved() ) {
-					// #4825: Get the actual response in case
-					// a dataFilter is present in ajaxSettings
-					jqXHR.done(function( r ) {
-						responseText = r;
-					});
-					// See if a selector was specified
-					self.html( selector ?
-						// Create a dummy div to hold the results
-						jQuery("<div>")
-							// inject the contents of the document in, removing the scripts
-							// to avoid any 'Permission Denied' errors in IE
-							.append(responseText.replace(rscript, ""))
+			var self = this;
 
-							// Locate the specified elements
-							.find(selector) :
+			// Request the remote document
+			jQuery.ajax({
+				url: url,
+				type: type,
+				dataType: "html",
+				data: params,
+				// Complete callback (responseText is used internally)
+				complete: function (jqXHR, status, responseText) {
+					// Store the response as specified by the jqXHR object
+					responseText = jqXHR.responseText;
+					// If successful, inject the HTML into all the matched elements
+					if (jqXHR.isResolved()) {
+						// #4825: Get the actual response in case
+						// a dataFilter is present in ajaxSettings
+						jqXHR.done(function (r) {
+							responseText = r;
+						});
+						// See if a selector was specified
+						self.html(selector ?
+							// Create a dummy div to hold the results
+							jQuery("<div>")
+								// inject the contents of the document in, removing the scripts
+								// to avoid any 'Permission Denied' errors in IE
+								.append(responseText.replace(rscript, ""))
+
+								// Locate the specified elements
+								.find(selector) :
+
+							// If not, just inject the full result
+							responseText);
+					}
 
-						// If not, just inject the full result
-						responseText );
+					if (callback) {
+						self.each(callback, [responseText, status, jqXHR]);
+					}
 				}
+			});
 
-				if ( callback ) {
-					self.each( callback, [ responseText, status, jqXHR ] );
-				}
-			}
-		});
+			return this;
+		},
 
-		return this;
-	},
-
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-
-	serializeArray: function() {
-		return this.map(function(){
-			return this.elements ? jQuery.makeArray( this.elements ) : this;
-		})
-		.filter(function(){
-			return this.name && !this.disabled &&
-				( this.checked || rselectTextarea.test( this.nodeName ) ||
-					rinput.test( this.type ) );
-		})
-		.map(function( i, elem ){
-			var val = jQuery( this ).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val, i ){
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					}) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		}).get();
-	}
-});
+		serialize: function () {
+			return jQuery.param(this.serializeArray());
+		},
 
-// Attach a bunch of functions for handling util AJAX events
-jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){
-	jQuery.fn[ o ] = function( f ){
-		return this.on( o, f );
-	};
-});
-
-jQuery.each( [ "get", "post" ], function( i, method ) {
-	jQuery[ method ] = function( url, data, callback, type ) {
-		// shift arguments if data argument was omitted
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = undefined;
+		serializeArray: function () {
+			return this.map(function () {
+				return this.elements ? jQuery.makeArray(this.elements) : this;
+			})
+				.filter(function () {
+					return this.name && !this.disabled &&
+						(this.checked || rselectTextarea.test(this.nodeName) ||
+							rinput.test(this.type));
+				})
+				.map(function (i, elem) {
+					var val = jQuery(this).val();
+
+					return val == null ?
+						null :
+						jQuery.isArray(val) ?
+							jQuery.map(val, function (val, i) {
+								return {name: elem.name, value: val.replace(rCRLF, "\r\n")};
+							}) :
+							{name: elem.name, value: val.replace(rCRLF, "\r\n")};
+				}).get();
 		}
+	});
 
-		return jQuery.ajax({
-			type: method,
-			url: url,
-			data: data,
-			success: callback,
-			dataType: type
-		});
-	};
-});
+// Attach a bunch of functions for handling util AJAX events
+	jQuery.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function (i, o) {
+		jQuery.fn[o] = function (f) {
+			return this.on(o, f);
+		};
+	});
+
+	jQuery.each(["get", "post"], function (i, method) {
+		jQuery[method] = function (url, data, callback, type) {
+			// shift arguments if data argument was omitted
+			if (jQuery.isFunction(data)) {
+				type = type || callback;
+				callback = data;
+				data = undefined;
+			}
+
+			return jQuery.ajax({
+				type: method,
+				url: url,
+				data: data,
+				success: callback,
+				dataType: type
+			});
+		};
+	});
 
-jQuery.extend({
+	jQuery.extend({
 
-	getScript: function( url, callback ) {
-		return jQuery.get( url, undefined, callback, "script" );
-	},
+		getScript: function (url, callback) {
+			return jQuery.get(url, undefined, callback, "script");
+		},
 
-	getJSON: function( url, data, callback ) {
-		return jQuery.get( url, data, callback, "json" );
-	},
+		getJSON: function (url, data, callback) {
+			return jQuery.get(url, data, callback, "json");
+		},
 
-	// Creates a full fledged settings object into target
-	// with both ajaxSettings and settings fields.
-	// If target is omitted, writes into ajaxSettings.
-	ajaxSetup: function( target, settings ) {
-		if ( settings ) {
-			// Building a settings object
-			ajaxExtend( target, jQuery.ajaxSettings );
-		} else {
-			// Extending ajaxSettings
-			settings = target;
-			target = jQuery.ajaxSettings;
-		}
-		ajaxExtend( target, settings );
-		return target;
-	},
-
-	ajaxSettings: {
-		url: ajaxLocation,
-		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
-		global: true,
-		type: "GET",
-		contentType: "application/x-www-form-urlencoded",
-		processData: true,
-		async: true,
-		/*
+		// Creates a full fledged settings object into target
+		// with both ajaxSettings and settings fields.
+		// If target is omitted, writes into ajaxSettings.
+		ajaxSetup: function (target, settings) {
+			if (settings) {
+				// Building a settings object
+				ajaxExtend(target, jQuery.ajaxSettings);
+			} else {
+				// Extending ajaxSettings
+				settings = target;
+				target = jQuery.ajaxSettings;
+			}
+			ajaxExtend(target, settings);
+			return target;
+		},
+
+		ajaxSettings: {
+			url: ajaxLocation,
+			isLocal: rlocalProtocol.test(ajaxLocParts[1]),
+			global: true,
+			type: "GET",
+			contentType: "application/x-www-form-urlencoded",
+			processData: true,
+			async: true,
+			/*
 		timeout: 0,
 		data: null,
 		dataType: null,
@@ -7158,2092 +7156,2082 @@ jQuery.extend({
 		headers: {},
 		*/
 
-		accepts: {
-			xml: "application/xml, text/xml",
-			html: "text/html",
-			text: "text/plain",
-			json: "application/json, text/javascript",
-			"*": allTypes
-		},
-
-		contents: {
-			xml: /xml/,
-			html: /html/,
-			json: /json/
-		},
-
-		responseFields: {
-			xml: "responseXML",
-			text: "responseText"
-		},
-
-		// List of data converters
-		// 1) key format is "source_type destination_type" (a single space in-between)
-		// 2) the catchall symbol "*" can be used for source_type
-		converters: {
-
-			// Convert anything to text
-			"* text": window.String,
+			accepts: {
+				xml: "application/xml, text/xml",
+				html: "text/html",
+				text: "text/plain",
+				json: "application/json, text/javascript",
+				"*": allTypes
+			},
 
-			// Text to html (true = no transformation)
-			"text html": true,
+			contents: {
+				xml: /xml/,
+				html: /html/,
+				json: /json/
+			},
 
-			// Evaluate text as a json expression
-			"text json": jQuery.parseJSON,
+			responseFields: {
+				xml: "responseXML",
+				text: "responseText"
+			},
 
-			// Parse text as xml
-			"text xml": jQuery.parseXML
-		},
+			// List of data converters
+			// 1) key format is "source_type destination_type" (a single space in-between)
+			// 2) the catchall symbol "*" can be used for source_type
+			converters: {
 
-		// For options that shouldn't be deep extended:
-		// you can add your own custom options here if
-		// and when you create one that shouldn't be
-		// deep extended (see ajaxExtend)
-		flatOptions: {
-			context: true,
-			url: true
-		}
-	},
+				// Convert anything to text
+				"* text": window.String,
 
-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-	ajaxTransport: addToPrefiltersOrTransports( transports ),
+				// Text to html (true = no transformation)
+				"text html": true,
 
-	// Main method
-	ajax: function( url, options ) {
+				// Evaluate text as a json expression
+				"text json": jQuery.parseJSON,
 
-		// If url is an object, simulate pre-1.5 signature
-		if ( typeof url === "object" ) {
-			options = url;
-			url = undefined;
-		}
+				// Parse text as xml
+				"text xml": jQuery.parseXML
+			},
 
-		// Force options to be an object
-		options = options || {};
-
-		var // Create the final options object
-			s = jQuery.ajaxSetup( {}, options ),
-			// Callbacks context
-			callbackContext = s.context || s,
-			// Context for global events
-			// It's the callbackContext if one was provided in the options
-			// and if it's a DOM node or a jQuery collection
-			globalEventContext = callbackContext !== s &&
-				( callbackContext.nodeType || callbackContext instanceof jQuery ) ?
-						jQuery( callbackContext ) : jQuery.event,
-			// Deferreds
-			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery.Callbacks( "once memory" ),
-			// Status-dependent callbacks
-			statusCode = s.statusCode || {},
-			// ifModified key
-			ifModifiedKey,
-			// Headers (they are sent all at once)
-			requestHeaders = {},
-			requestHeadersNames = {},
-			// Response headers
-			responseHeadersString,
-			responseHeaders,
-			// transport
-			transport,
-			// timeout handle
-			timeoutTimer,
-			// Cross-domain detection vars
-			parts,
-			// The jqXHR state
-			state = 0,
-			// To know if global events are to be dispatched
-			fireGlobals,
-			// Loop variable
-			i,
-			// Fake xhr
-			jqXHR = {
+			// For options that shouldn't be deep extended:
+			// you can add your own custom options here if
+			// and when you create one that shouldn't be
+			// deep extended (see ajaxExtend)
+			flatOptions: {
+				context: true,
+				url: true
+			}
+		},
 
-				readyState: 0,
+		ajaxPrefilter: addToPrefiltersOrTransports(prefilters),
+		ajaxTransport: addToPrefiltersOrTransports(transports),
+
+		// Main method
+		ajax: function (url, options) {
+
+			// If url is an object, simulate pre-1.5 signature
+			if (typeof url === "object") {
+				options = url;
+				url = undefined;
+			}
+
+			// Force options to be an object
+			options = options || {};
+
+			var // Create the final options object
+				s = jQuery.ajaxSetup({}, options),
+				// Callbacks context
+				callbackContext = s.context || s,
+				// Context for global events
+				// It's the callbackContext if one was provided in the options
+				// and if it's a DOM node or a jQuery collection
+				globalEventContext = callbackContext !== s &&
+				(callbackContext.nodeType || callbackContext instanceof jQuery) ?
+					jQuery(callbackContext) : jQuery.event,
+				// Deferreds
+				deferred = jQuery.Deferred(),
+				completeDeferred = jQuery.Callbacks("once memory"),
+				// Status-dependent callbacks
+				statusCode = s.statusCode || {},
+				// ifModified key
+				ifModifiedKey,
+				// Headers (they are sent all at once)
+				requestHeaders = {},
+				requestHeadersNames = {},
+				// Response headers
+				responseHeadersString,
+				responseHeaders,
+				// transport
+				transport,
+				// timeout handle
+				timeoutTimer,
+				// Cross-domain detection vars
+				parts,
+				// The jqXHR state
+				state = 0,
+				// To know if global events are to be dispatched
+				fireGlobals,
+				// Loop variable
+				i,
+				// Fake xhr
+				jqXHR = {
+
+					readyState: 0,
+
+					// Caches the header
+					setRequestHeader: function (name, value) {
+						if (!state) {
+							var lname = name.toLowerCase();
+							name = requestHeadersNames[lname] = requestHeadersNames[lname] || name;
+							requestHeaders[name] = value;
+						}
+						return this;
+					},
+
+					// Raw string
+					getAllResponseHeaders: function () {
+						return state === 2 ? responseHeadersString : null;
+					},
+
+					// Builds headers hashtable if needed
+					getResponseHeader: function (key) {
+						var match;
+						if (state === 2) {
+							if (!responseHeaders) {
+								responseHeaders = {};
+								while ((match = rheaders.exec(responseHeadersString))) {
+									responseHeaders[match[1].toLowerCase()] = match[2];
+								}
+							}
+							match = responseHeaders[key.toLowerCase()];
+						}
+						return match === undefined ? null : match;
+					},
 
-				// Caches the header
-				setRequestHeader: function( name, value ) {
-					if ( !state ) {
-						var lname = name.toLowerCase();
-						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
-						requestHeaders[ name ] = value;
+					// Overrides response content-type header
+					overrideMimeType: function (type) {
+						if (!state) {
+							s.mimeType = type;
+						}
+						return this;
+					},
+
+					// Cancel the request
+					abort: function (statusText) {
+						statusText = statusText || "abort";
+						if (transport) {
+							transport.abort(statusText);
+						}
+						done(0, statusText);
+						return this;
 					}
-					return this;
-				},
+				};
 
-				// Raw string
-				getAllResponseHeaders: function() {
-					return state === 2 ? responseHeadersString : null;
-				},
+			// Callback for when everything is done
+			// It is defined here because jslint complains if it is declared
+			// at the end of the function (which would be more logical and readable)
+			function done(status, nativeStatusText, responses, headers) {
 
-				// Builds headers hashtable if needed
-				getResponseHeader: function( key ) {
-					var match;
-					if ( state === 2 ) {
-						if ( !responseHeaders ) {
-							responseHeaders = {};
-							while( ( match = rheaders.exec( responseHeadersString ) ) ) {
-								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
-							}
-						}
-						match = responseHeaders[ key.toLowerCase() ];
-					}
-					return match === undefined ? null : match;
-				},
+				// Called once
+				if (state === 2) {
+					return;
+				}
 
-				// Overrides response content-type header
-				overrideMimeType: function( type ) {
-					if ( !state ) {
-						s.mimeType = type;
-					}
-					return this;
-				},
+				// State is "done" now
+				state = 2;
 
-				// Cancel the request
-				abort: function( statusText ) {
-					statusText = statusText || "abort";
-					if ( transport ) {
-						transport.abort( statusText );
-					}
-					done( 0, statusText );
-					return this;
+				// Clear timeout if it exists
+				if (timeoutTimer) {
+					clearTimeout(timeoutTimer);
 				}
-			};
 
-		// Callback for when everything is done
-		// It is defined here because jslint complains if it is declared
-		// at the end of the function (which would be more logical and readable)
-		function done( status, nativeStatusText, responses, headers ) {
+				// Dereference transport for early garbage collection
+				// (no matter how long the jqXHR object will be used)
+				transport = undefined;
 
-			// Called once
-			if ( state === 2 ) {
-				return;
-			}
+				// Cache response headers
+				responseHeadersString = headers || "";
 
-			// State is "done" now
-			state = 2;
+				// Set readyState
+				jqXHR.readyState = status > 0 ? 4 : 0;
 
-			// Clear timeout if it exists
-			if ( timeoutTimer ) {
-				clearTimeout( timeoutTimer );
-			}
+				var isSuccess,
+					success,
+					error,
+					statusText = nativeStatusText,
+					response = responses ? ajaxHandleResponses(s, jqXHR, responses) : undefined,
+					lastModified,
+					etag;
 
-			// Dereference transport for early garbage collection
-			// (no matter how long the jqXHR object will be used)
-			transport = undefined;
+				// If successful, handle type chaining
+				if (status >= 200 && status < 300 || status === 304) {
 
-			// Cache response headers
-			responseHeadersString = headers || "";
+					// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+					if (s.ifModified) {
 
-			// Set readyState
-			jqXHR.readyState = status > 0 ? 4 : 0;
+						if ((lastModified = jqXHR.getResponseHeader("Last-Modified"))) {
+							jQuery.lastModified[ifModifiedKey] = lastModified;
+						}
+						if ((etag = jqXHR.getResponseHeader("Etag"))) {
+							jQuery.etag[ifModifiedKey] = etag;
+						}
+					}
 
-			var isSuccess,
-				success,
-				error,
-				statusText = nativeStatusText,
-				response = responses ? ajaxHandleResponses( s, jqXHR, responses ) : undefined,
-				lastModified,
-				etag;
+					// If not modified
+					if (status === 304) {
 
-			// If successful, handle type chaining
-			if ( status >= 200 && status < 300 || status === 304 ) {
+						statusText = "notmodified";
+						isSuccess = true;
 
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
+						// If we have data
+					} else {
 
-					if ( ( lastModified = jqXHR.getResponseHeader( "Last-Modified" ) ) ) {
-						jQuery.lastModified[ ifModifiedKey ] = lastModified;
+						try {
+							success = ajaxConvert(s, response);
+							statusText = "success";
+							isSuccess = true;
+						} catch (e) {
+							// We have a parsererror
+							statusText = "parsererror";
+							error = e;
+						}
 					}
-					if ( ( etag = jqXHR.getResponseHeader( "Etag" ) ) ) {
-						jQuery.etag[ ifModifiedKey ] = etag;
+				} else {
+					// We extract error from statusText
+					// then normalize statusText and status for non-aborts
+					error = statusText;
+					if (!statusText || status) {
+						statusText = "error";
+						if (status < 0) {
+							status = 0;
+						}
 					}
 				}
 
-				// If not modified
-				if ( status === 304 ) {
-
-					statusText = "notmodified";
-					isSuccess = true;
+				// Set data for the fake xhr object
+				jqXHR.status = status;
+				jqXHR.statusText = "" + (nativeStatusText || statusText);
 
-				// If we have data
+				// Success/Error
+				if (isSuccess) {
+					deferred.resolveWith(callbackContext, [success, statusText, jqXHR]);
 				} else {
+					deferred.rejectWith(callbackContext, [jqXHR, statusText, error]);
+				}
 
-					try {
-						success = ajaxConvert( s, response );
-						statusText = "success";
-						isSuccess = true;
-					} catch(e) {
-						// We have a parsererror
-						statusText = "parsererror";
-						error = e;
-					}
+				// Status-dependent callbacks
+				jqXHR.statusCode(statusCode);
+				statusCode = undefined;
+
+				if (fireGlobals) {
+					globalEventContext.trigger("ajax" + (isSuccess ? "Success" : "Error"),
+						[jqXHR, s, isSuccess ? success : error]);
 				}
-			} else {
-				// We extract error from statusText
-				// then normalize statusText and status for non-aborts
-				error = statusText;
-				if ( !statusText || status ) {
-					statusText = "error";
-					if ( status < 0 ) {
-						status = 0;
+
+				// Complete
+				completeDeferred.fireWith(callbackContext, [jqXHR, statusText]);
+
+				if (fireGlobals) {
+					globalEventContext.trigger("ajaxComplete", [jqXHR, s]);
+					// Handle the global AJAX counter
+					if (!(--jQuery.active)) {
+						jQuery.event.trigger("ajaxStop");
 					}
 				}
 			}
 
-			// Set data for the fake xhr object
-			jqXHR.status = status;
-			jqXHR.statusText = "" + ( nativeStatusText || statusText );
-
-			// Success/Error
-			if ( isSuccess ) {
-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-			} else {
-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-			}
+			// Attach deferreds
+			deferred.promise(jqXHR);
+			jqXHR.success = jqXHR.done;
+			jqXHR.error = jqXHR.fail;
+			jqXHR.complete = completeDeferred.add;
 
 			// Status-dependent callbacks
-			jqXHR.statusCode( statusCode );
-			statusCode = undefined;
+			jqXHR.statusCode = function (map) {
+				if (map) {
+					var tmp;
+					if (state < 2) {
+						for (tmp in map) {
+							statusCode[tmp] = [statusCode[tmp], map[tmp]];
+						}
+					} else {
+						tmp = map[jqXHR.status];
+						jqXHR.then(tmp, tmp);
+					}
+				}
+				return this;
+			};
 
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ),
-						[ jqXHR, s, isSuccess ? success : error ] );
+			// Remove hash character (#7531: and string promotion)
+			// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
+			// We also use the url parameter if available
+			s.url = ((url || s.url) + "").replace(rhash, "").replace(rprotocol, ajaxLocParts[1] + "//");
+
+			// Extract dataTypes list
+			s.dataTypes = jQuery.trim(s.dataType || "*").toLowerCase().split(rspacesAjax);
+
+			// Determine if a cross-domain request is in order
+			if (s.crossDomain == null) {
+				parts = rurl.exec(s.url.toLowerCase());
+				s.crossDomain = !!(parts &&
+					(parts[1] != ajaxLocParts[1] || parts[2] != ajaxLocParts[2] ||
+						(parts[3] || (parts[1] === "http:" ? 80 : 443)) !=
+						(ajaxLocParts[3] || (ajaxLocParts[1] === "http:" ? 80 : 443)))
+				);
 			}
 
-			// Complete
-			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
-				// Handle the global AJAX counter
-				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger( "ajaxStop" );
-				}
+			// Convert data if not already a string
+			if (s.data && s.processData && typeof s.data !== "string") {
+				s.data = jQuery.param(s.data, s.traditional);
 			}
-		}
 
-		// Attach deferreds
-		deferred.promise( jqXHR );
-		jqXHR.success = jqXHR.done;
-		jqXHR.error = jqXHR.fail;
-		jqXHR.complete = completeDeferred.add;
+			// Apply prefilters
+			inspectPrefiltersOrTransports(prefilters, s, options, jqXHR);
 
-		// Status-dependent callbacks
-		jqXHR.statusCode = function( map ) {
-			if ( map ) {
-				var tmp;
-				if ( state < 2 ) {
-					for ( tmp in map ) {
-						statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ];
-					}
-				} else {
-					tmp = map[ jqXHR.status ];
-					jqXHR.then( tmp, tmp );
-				}
+			// If request was aborted inside a prefiler, stop there
+			if (state === 2) {
+				return false;
 			}
-			return this;
-		};
 
-		// Remove hash character (#7531: and string promotion)
-		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
-		// We also use the url parameter if available
-		s.url = ( ( url || s.url ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
-
-		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax );
-
-		// Determine if a cross-domain request is in order
-		if ( s.crossDomain == null ) {
-			parts = rurl.exec( s.url.toLowerCase() );
-			s.crossDomain = !!( parts &&
-				( parts[ 1 ] != ajaxLocParts[ 1 ] || parts[ 2 ] != ajaxLocParts[ 2 ] ||
-					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
-						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
-			);
-		}
+			// We can fire global events as of now if asked to
+			fireGlobals = s.global;
 
-		// Convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
+			// Uppercase the type
+			s.type = s.type.toUpperCase();
 
-		// Apply prefilters
-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+			// Determine if request has content
+			s.hasContent = !rnoContent.test(s.type);
 
-		// If request was aborted inside a prefiler, stop there
-		if ( state === 2 ) {
-			return false;
-		}
+			// Watch for a new set of requests
+			if (fireGlobals && jQuery.active++ === 0) {
+				jQuery.event.trigger("ajaxStart");
+			}
 
-		// We can fire global events as of now if asked to
-		fireGlobals = s.global;
+			// More options handling for requests with no content
+			if (!s.hasContent) {
 
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
+				// If data is available, append data to url
+				if (s.data) {
+					s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
+					// #9682: remove data so that it's not used in an eventual retry
+					delete s.data;
+				}
 
-		// Determine if request has content
-		s.hasContent = !rnoContent.test( s.type );
+				// Get ifModifiedKey before adding the anti-cache parameter
+				ifModifiedKey = s.url;
 
-		// Watch for a new set of requests
-		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger( "ajaxStart" );
-		}
+				// Add anti-cache in url if needed
+				if (s.cache === false) {
 
-		// More options handling for requests with no content
-		if ( !s.hasContent ) {
+					var ts = jQuery.now(),
+						// try replacing _= if it is there
+						ret = s.url.replace(rts, "$1_=" + ts);
 
-			// If data is available, append data to url
-			if ( s.data ) {
-				s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
-				// #9682: remove data so that it's not used in an eventual retry
-				delete s.data;
+					// if nothing was replaced, add timestamp to the end
+					s.url = ret + ((ret === s.url) ? (rquery.test(s.url) ? "&" : "?") + "_=" + ts : "");
+				}
 			}
 
-			// Get ifModifiedKey before adding the anti-cache parameter
-			ifModifiedKey = s.url;
-
-			// Add anti-cache in url if needed
-			if ( s.cache === false ) {
-
-				var ts = jQuery.now(),
-					// try replacing _= if it is there
-					ret = s.url.replace( rts, "$1_=" + ts );
+			// Set the correct header, if data is being sent
+			if (s.data && s.hasContent && s.contentType !== false || options.contentType) {
+				jqXHR.setRequestHeader("Content-Type", s.contentType);
+			}
 
-				// if nothing was replaced, add timestamp to the end
-				s.url = ret + ( ( ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" );
+			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+			if (s.ifModified) {
+				ifModifiedKey = ifModifiedKey || s.url;
+				if (jQuery.lastModified[ifModifiedKey]) {
+					jqXHR.setRequestHeader("If-Modified-Since", jQuery.lastModified[ifModifiedKey]);
+				}
+				if (jQuery.etag[ifModifiedKey]) {
+					jqXHR.setRequestHeader("If-None-Match", jQuery.etag[ifModifiedKey]);
+				}
 			}
-		}
 
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
+			// Set the Accepts header for the server, depending on the dataType
+			jqXHR.setRequestHeader(
+				"Accept",
+				s.dataTypes[0] && s.accepts[s.dataTypes[0]] ?
+					s.accepts[s.dataTypes[0]] + (s.dataTypes[0] !== "*" ? ", " + allTypes + "; q=0.01" : "") :
+					s.accepts["*"]
+			);
 
-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-		if ( s.ifModified ) {
-			ifModifiedKey = ifModifiedKey || s.url;
-			if ( jQuery.lastModified[ ifModifiedKey ] ) {
-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ ifModifiedKey ] );
+			// Check for headers option
+			for (i in s.headers) {
+				jqXHR.setRequestHeader(i, s.headers[i]);
 			}
-			if ( jQuery.etag[ ifModifiedKey ] ) {
-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ ifModifiedKey ] );
-			}
-		}
 
-		// Set the Accepts header for the server, depending on the dataType
-		jqXHR.setRequestHeader(
-			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
-				s.accepts[ "*" ]
-		);
-
-		// Check for headers option
-		for ( i in s.headers ) {
-			jqXHR.setRequestHeader( i, s.headers[ i ] );
-		}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+			// Allow custom headers/mimetypes and early abort
+			if (s.beforeSend && (s.beforeSend.call(callbackContext, jqXHR, s) === false || state === 2)) {
 				// Abort if not done already
 				jqXHR.abort();
 				return false;
 
-		}
+			}
 
-		// Install callbacks on deferreds
-		for ( i in { success: 1, error: 1, complete: 1 } ) {
-			jqXHR[ i ]( s[ i ] );
-		}
+			// Install callbacks on deferreds
+			for (i in {success: 1, error: 1, complete: 1}) {
+				jqXHR[i](s[i]);
+			}
 
-		// Get transport
-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+			// Get transport
+			transport = inspectPrefiltersOrTransports(transports, s, options, jqXHR);
 
-		// If no transport, we auto-abort
-		if ( !transport ) {
-			done( -1, "No Transport" );
-		} else {
-			jqXHR.readyState = 1;
-			// Send global event
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-			}
-			// Timeout
-			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = setTimeout( function(){
-					jqXHR.abort( "timeout" );
-				}, s.timeout );
-			}
+			// If no transport, we auto-abort
+			if (!transport) {
+				done(-1, "No Transport");
+			} else {
+				jqXHR.readyState = 1;
+				// Send global event
+				if (fireGlobals) {
+					globalEventContext.trigger("ajaxSend", [jqXHR, s]);
+				}
+				// Timeout
+				if (s.async && s.timeout > 0) {
+					timeoutTimer = setTimeout(function () {
+						jqXHR.abort("timeout");
+					}, s.timeout);
+				}
 
-			try {
-				state = 1;
-				transport.send( requestHeaders, done );
-			} catch (e) {
-				// Propagate exception as error if not done
-				if ( state < 2 ) {
-					done( -1, e );
-				// Simply rethrow otherwise
-				} else {
-					throw e;
+				try {
+					state = 1;
+					transport.send(requestHeaders, done);
+				} catch (e) {
+					// Propagate exception as error if not done
+					if (state < 2) {
+						done(-1, e);
+						// Simply rethrow otherwise
+					} else {
+						throw e;
+					}
 				}
 			}
-		}
 
-		return jqXHR;
-	},
-
-	// Serialize an array of form elements or a set of
-	// key/values into a query string
-	param: function( a, traditional ) {
-		var s = [],
-			add = function( key, value ) {
-				// If value is a function, invoke it and return its value
-				value = jQuery.isFunction( value ) ? value() : value;
-				s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-			};
+			return jqXHR;
+		},
 
-		// Set traditional to true for jQuery <= 1.3.2 behavior.
-		if ( traditional === undefined ) {
-			traditional = jQuery.ajaxSettings.traditional;
-		}
+		// Serialize an array of form elements or a set of
+		// key/values into a query string
+		param: function (a, traditional) {
+			var s = [],
+				add = function (key, value) {
+					// If value is a function, invoke it and return its value
+					value = jQuery.isFunction(value) ? value() : value;
+					s[s.length] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
+				};
 
-		// If an array was passed in, assume that it is an array of form elements.
-		if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-			// Serialize the form elements
-			jQuery.each( a, function() {
-				add( this.name, this.value );
-			});
+			// Set traditional to true for jQuery <= 1.3.2 behavior.
+			if (traditional === undefined) {
+				traditional = jQuery.ajaxSettings.traditional;
+			}
 
-		} else {
-			// If traditional, encode the "old" way (the way 1.3.2 or older
-			// did it), otherwise encode params recursively.
-			for ( var prefix in a ) {
-				buildParams( prefix, a[ prefix ], traditional, add );
+			// If an array was passed in, assume that it is an array of form elements.
+			if (jQuery.isArray(a) || (a.jquery && !jQuery.isPlainObject(a))) {
+				// Serialize the form elements
+				jQuery.each(a, function () {
+					add(this.name, this.value);
+				});
+
+			} else {
+				// If traditional, encode the "old" way (the way 1.3.2 or older
+				// did it), otherwise encode params recursively.
+				for (var prefix in a) {
+					buildParams(prefix, a[prefix], traditional, add);
+				}
 			}
+
+			// Return the resulting serialization
+			return s.join("&").replace(r20, "+");
 		}
+	});
 
-		// Return the resulting serialization
-		return s.join( "&" ).replace( r20, "+" );
-	}
-});
+	function buildParams(prefix, obj, traditional, add) {
+		if (jQuery.isArray(obj)) {
+			// Serialize array item.
+			jQuery.each(obj, function (i, v) {
+				if (traditional || rbracket.test(prefix)) {
+					// Treat each array item as a scalar.
+					add(prefix, v);
 
-function buildParams( prefix, obj, traditional, add ) {
-	if ( jQuery.isArray( obj ) ) {
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-				// Treat each array item as a scalar.
-				add( prefix, v );
+				} else {
+					// If array item is non-scalar (array or object), encode its
+					// numeric index to resolve deserialization ambiguity issues.
+					// Note that rack (as of 1.0.0) can't currently deserialize
+					// nested arrays properly, and attempting to do so may cause
+					// a server error. Possible fixes are to modify rack's
+					// deserialization algorithm or to provide an option or flag
+					// to force array serialization to be shallow.
+					buildParams(prefix + "[" + (typeof v === "object" || jQuery.isArray(v) ? i : "") + "]", v, traditional, add);
+				}
+			});
 
-			} else {
-				// If array item is non-scalar (array or object), encode its
-				// numeric index to resolve deserialization ambiguity issues.
-				// Note that rack (as of 1.0.0) can't currently deserialize
-				// nested arrays properly, and attempting to do so may cause
-				// a server error. Possible fixes are to modify rack's
-				// deserialization algorithm or to provide an option or flag
-				// to force array serialization to be shallow.
-				buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v, traditional, add );
+		} else if (!traditional && obj != null && typeof obj === "object") {
+			// Serialize object item.
+			for (var name in obj) {
+				buildParams(prefix + "[" + name + "]", obj[name], traditional, add);
 			}
-		});
 
-	} else if ( !traditional && obj != null && typeof obj === "object" ) {
-		// Serialize object item.
-		for ( var name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+		} else {
+			// Serialize scalar item.
+			add(prefix, obj);
 		}
-
-	} else {
-		// Serialize scalar item.
-		add( prefix, obj );
 	}
-}
 
 // This is still on the jQuery object... for now
 // Want to move this to jQuery.ajax some day
-jQuery.extend({
+	jQuery.extend({
 
-	// Counter for holding the number of active queries
-	active: 0,
+		// Counter for holding the number of active queries
+		active: 0,
 
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {}
+		// Last-Modified header cache for next request
+		lastModified: {},
+		etag: {}
 
-});
+	});
 
-/* Handles responses to an ajax request:
+	/* Handles responses to an ajax request:
  * - sets all responseXXX fields accordingly
  * - finds the right dataType (mediates between content-type and expected dataType)
  * - returns the corresponding response
  */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-
-	var contents = s.contents,
-		dataTypes = s.dataTypes,
-		responseFields = s.responseFields,
-		ct,
-		type,
-		finalDataType,
-		firstDataType;
-
-	// Fill responseXXX fields
-	for ( type in responseFields ) {
-		if ( type in responses ) {
-			jqXHR[ responseFields[type] ] = responses[ type ];
-		}
-	}
+	function ajaxHandleResponses(s, jqXHR, responses) {
 
-	// Remove auto dataType and get content-type in the process
-	while( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader( "content-type" );
+		var contents = s.contents,
+			dataTypes = s.dataTypes,
+			responseFields = s.responseFields,
+			ct,
+			type,
+			finalDataType,
+			firstDataType;
+
+		// Fill responseXXX fields
+		for (type in responseFields) {
+			if (type in responses) {
+				jqXHR[responseFields[type]] = responses[type];
+			}
 		}
-	}
 
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
+		// Remove auto dataType and get content-type in the process
+		while (dataTypes[0] === "*") {
+			dataTypes.shift();
+			if (ct === undefined) {
+				ct = s.mimeType || jqXHR.getResponseHeader("content-type");
 			}
 		}
-	}
 
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
-	} else {
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-				finalDataType = type;
-				break;
+		// Check if we're dealing with a known content-type
+		if (ct) {
+			for (type in contents) {
+				if (contents[type] && contents[type].test(ct)) {
+					dataTypes.unshift(type);
+					break;
+				}
 			}
-			if ( !firstDataType ) {
-				firstDataType = type;
+		}
+
+		// Check to see if we have a response for the expected dataType
+		if (dataTypes[0] in responses) {
+			finalDataType = dataTypes[0];
+		} else {
+			// Try convertible dataTypes
+			for (type in responses) {
+				if (!dataTypes[0] || s.converters[type + " " + dataTypes[0]]) {
+					finalDataType = type;
+					break;
+				}
+				if (!firstDataType) {
+					firstDataType = type;
+				}
 			}
+			// Or just use first one
+			finalDataType = finalDataType || firstDataType;
 		}
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
 
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
+		// If we found a dataType
+		// We add the dataType to the list if needed
+		// and return the corresponding response
+		if (finalDataType) {
+			if (finalDataType !== dataTypes[0]) {
+				dataTypes.unshift(finalDataType);
+			}
+			return responses[finalDataType];
 		}
-		return responses[ finalDataType ];
 	}
-}
 
 // Chain conversions given the request and the original response
-function ajaxConvert( s, response ) {
+	function ajaxConvert(s, response) {
 
-	// Apply the dataFilter if provided
-	if ( s.dataFilter ) {
-		response = s.dataFilter( response, s.dataType );
-	}
+		// Apply the dataFilter if provided
+		if (s.dataFilter) {
+			response = s.dataFilter(response, s.dataType);
+		}
 
-	var dataTypes = s.dataTypes,
-		converters = {},
-		i,
-		key,
-		length = dataTypes.length,
-		tmp,
-		// Current and previous dataTypes
-		current = dataTypes[ 0 ],
-		prev,
-		// Conversion expression
-		conversion,
-		// Conversion function
-		conv,
-		// Conversion functions (transitive conversion)
-		conv1,
-		conv2;
-
-	// For each dataType in the chain
-	for ( i = 1; i < length; i++ ) {
-
-		// Create converters map
-		// with lowercased keys
-		if ( i === 1 ) {
-			for ( key in s.converters ) {
-				if ( typeof key === "string" ) {
-					converters[ key.toLowerCase() ] = s.converters[ key ];
+		var dataTypes = s.dataTypes,
+			converters = {},
+			i,
+			key,
+			length = dataTypes.length,
+			tmp,
+			// Current and previous dataTypes
+			current = dataTypes[0],
+			prev,
+			// Conversion expression
+			conversion,
+			// Conversion function
+			conv,
+			// Conversion functions (transitive conversion)
+			conv1,
+			conv2;
+
+		// For each dataType in the chain
+		for (i = 1; i < length; i++) {
+
+			// Create converters map
+			// with lowercased keys
+			if (i === 1) {
+				for (key in s.converters) {
+					if (typeof key === "string") {
+						converters[key.toLowerCase()] = s.converters[key];
+					}
 				}
 			}
-		}
 
-		// Get the dataTypes
-		prev = current;
-		current = dataTypes[ i ];
-
-		// If current is auto dataType, update it to prev
-		if ( current === "*" ) {
-			current = prev;
-		// If no auto and dataTypes are actually different
-		} else if ( prev !== "*" && prev !== current ) {
-
-			// Get the converter
-			conversion = prev + " " + current;
-			conv = converters[ conversion ] || converters[ "* " + current ];
-
-			// If there is no direct converter, search transitively
-			if ( !conv ) {
-				conv2 = undefined;
-				for ( conv1 in converters ) {
-					tmp = conv1.split( " " );
-					if ( tmp[ 0 ] === prev || tmp[ 0 ] === "*" ) {
-						conv2 = converters[ tmp[1] + " " + current ];
-						if ( conv2 ) {
-							conv1 = converters[ conv1 ];
-							if ( conv1 === true ) {
-								conv = conv2;
-							} else if ( conv2 === true ) {
-								conv = conv1;
+			// Get the dataTypes
+			prev = current;
+			current = dataTypes[i];
+
+			// If current is auto dataType, update it to prev
+			if (current === "*") {
+				current = prev;
+				// If no auto and dataTypes are actually different
+			} else if (prev !== "*" && prev !== current) {
+
+				// Get the converter
+				conversion = prev + " " + current;
+				conv = converters[conversion] || converters["* " + current];
+
+				// If there is no direct converter, search transitively
+				if (!conv) {
+					conv2 = undefined;
+					for (conv1 in converters) {
+						tmp = conv1.split(" ");
+						if (tmp[0] === prev || tmp[0] === "*") {
+							conv2 = converters[tmp[1] + " " + current];
+							if (conv2) {
+								conv1 = converters[conv1];
+								if (conv1 === true) {
+									conv = conv2;
+								} else if (conv2 === true) {
+									conv = conv1;
+								}
+								break;
 							}
-							break;
 						}
 					}
 				}
-			}
-			// If we found no converter, dispatch an error
-			if ( !( conv || conv2 ) ) {
-				jQuery.error( "No conversion from " + conversion.replace(" "," to ") );
-			}
-			// If found converter is not an equivalence
-			if ( conv !== true ) {
-				// Convert with 1 or 2 converters accordingly
-				response = conv ? conv( response ) : conv2( conv1(response) );
+				// If we found no converter, dispatch an error
+				if (!(conv || conv2)) {
+					jQuery.error("No conversion from " + conversion.replace(" ", " to "));
+				}
+				// If found converter is not an equivalence
+				if (conv !== true) {
+					// Convert with 1 or 2 converters accordingly
+					response = conv ? conv(response) : conv2(conv1(response));
+				}
 			}
 		}
+		return response;
 	}
-	return response;
-}
-
-
 
 
-var jsc = jQuery.now(),
-	jsre = /(\=)\?(&|$)|\?\?/i;
+	var jsc = jQuery.now(),
+		jsre = /(\=)\?(&|$)|\?\?/i;
 
 // Default jsonp settings
-jQuery.ajaxSetup({
-	jsonp: "callback",
-	jsonpCallback: function() {
-		return jQuery.expando + "_" + ( jsc++ );
-	}
-});
+	jQuery.ajaxSetup({
+		jsonp: "callback",
+		jsonpCallback: function () {
+			return jQuery.expando + "_" + (jsc++);
+		}
+	});
 
 // Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-	var inspectData = s.contentType === "application/x-www-form-urlencoded" &&
-		( typeof s.data === "string" );
-
-	if ( s.dataTypes[ 0 ] === "jsonp" ||
-		s.jsonp !== false && ( jsre.test( s.url ) ||
-				inspectData && jsre.test( s.data ) ) ) {
-
-		var responseContainer,
-			jsonpCallback = s.jsonpCallback =
-				jQuery.isFunction( s.jsonpCallback ) ? s.jsonpCallback() : s.jsonpCallback,
-			previous = window[ jsonpCallback ],
-			url = s.url,
-			data = s.data,
-			replace = "$1" + jsonpCallback + "$2";
-
-		if ( s.jsonp !== false ) {
-			url = url.replace( jsre, replace );
-			if ( s.url === url ) {
-				if ( inspectData ) {
-					data = data.replace( jsre, replace );
-				}
-				if ( s.data === data ) {
-					// Add callback manually
-					url += (/\?/.test( url ) ? "&" : "?") + s.jsonp + "=" + jsonpCallback;
+	jQuery.ajaxPrefilter("json jsonp", function (s, originalSettings, jqXHR) {
+
+		var inspectData = s.contentType === "application/x-www-form-urlencoded" &&
+			(typeof s.data === "string");
+
+		if (s.dataTypes[0] === "jsonp" ||
+			s.jsonp !== false && (jsre.test(s.url) ||
+				inspectData && jsre.test(s.data))) {
+
+			var responseContainer,
+				jsonpCallback = s.jsonpCallback =
+					jQuery.isFunction(s.jsonpCallback) ? s.jsonpCallback() : s.jsonpCallback,
+				previous = window[jsonpCallback],
+				url = s.url,
+				data = s.data,
+				replace = "$1" + jsonpCallback + "$2";
+
+			if (s.jsonp !== false) {
+				url = url.replace(jsre, replace);
+				if (s.url === url) {
+					if (inspectData) {
+						data = data.replace(jsre, replace);
+					}
+					if (s.data === data) {
+						// Add callback manually
+						url += (/\?/.test(url) ? "&" : "?") + s.jsonp + "=" + jsonpCallback;
+					}
 				}
 			}
-		}
-
-		s.url = url;
-		s.data = data;
 
-		// Install callback
-		window[ jsonpCallback ] = function( response ) {
-			responseContainer = [ response ];
-		};
-
-		// Clean-up function
-		jqXHR.always(function() {
-			// Set callback back to previous value
-			window[ jsonpCallback ] = previous;
-			// Call if it was a function and we have a response
-			if ( responseContainer && jQuery.isFunction( previous ) ) {
-				window[ jsonpCallback ]( responseContainer[ 0 ] );
-			}
-		});
+			s.url = url;
+			s.data = data;
 
-		// Use data converter to retrieve json after script execution
-		s.converters["script json"] = function() {
-			if ( !responseContainer ) {
-				jQuery.error( jsonpCallback + " was not called" );
-			}
-			return responseContainer[ 0 ];
-		};
+			// Install callback
+			window[jsonpCallback] = function (response) {
+				responseContainer = [response];
+			};
 
-		// force json dataType
-		s.dataTypes[ 0 ] = "json";
+			// Clean-up function
+			jqXHR.always(function () {
+				// Set callback back to previous value
+				window[jsonpCallback] = previous;
+				// Call if it was a function and we have a response
+				if (responseContainer && jQuery.isFunction(previous)) {
+					window[jsonpCallback](responseContainer[0]);
+				}
+			});
 
-		// Delegate to script
-		return "script";
-	}
-});
+			// Use data converter to retrieve json after script execution
+			s.converters["script json"] = function () {
+				if (!responseContainer) {
+					jQuery.error(jsonpCallback + " was not called");
+				}
+				return responseContainer[0];
+			};
 
+			// force json dataType
+			s.dataTypes[0] = "json";
 
+			// Delegate to script
+			return "script";
+		}
+	});
 
 
 // Install script dataType
-jQuery.ajaxSetup({
-	accepts: {
-		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
-	},
-	contents: {
-		script: /javascript|ecmascript/
-	},
-	converters: {
-		"text script": function( text ) {
-			jQuery.globalEval( text );
-			return text;
+	jQuery.ajaxSetup({
+		accepts: {
+			script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+		},
+		contents: {
+			script: /javascript|ecmascript/
+		},
+		converters: {
+			"text script": function (text) {
+				jQuery.globalEval(text);
+				return text;
+			}
 		}
-	}
-});
+	});
 
 // Handle cache's special case and global
-jQuery.ajaxPrefilter( "script", function( s ) {
-	if ( s.cache === undefined ) {
-		s.cache = false;
-	}
-	if ( s.crossDomain ) {
-		s.type = "GET";
-		s.global = false;
-	}
-});
+	jQuery.ajaxPrefilter("script", function (s) {
+		if (s.cache === undefined) {
+			s.cache = false;
+		}
+		if (s.crossDomain) {
+			s.type = "GET";
+			s.global = false;
+		}
+	});
 
 // Bind script tag hack transport
-jQuery.ajaxTransport( "script", function(s) {
+	jQuery.ajaxTransport("script", function (s) {
 
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
+		// This transport only deals with cross domain requests
+		if (s.crossDomain) {
 
-		var script,
-			head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
+			var script,
+				head = document.head || document.getElementsByTagName("head")[0] || document.documentElement;
 
-		return {
+			return {
 
-			send: function( _, callback ) {
+				send: function (_, callback) {
 
-				script = document.createElement( "script" );
+					script = document.createElement("script");
 
-				script.async = "async";
+					script.async = "async";
 
-				if ( s.scriptCharset ) {
-					script.charset = s.scriptCharset;
-				}
+					if (s.scriptCharset) {
+						script.charset = s.scriptCharset;
+					}
 
-				script.src = s.url;
+					script.src = s.url;
 
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function( _, isAbort ) {
+					// Attach handlers for all browsers
+					script.onload = script.onreadystatechange = function (_, isAbort) {
 
-					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
+						if (isAbort || !script.readyState || /loaded|complete/.test(script.readyState)) {
 
-						// Handle memory leak in IE
-						script.onload = script.onreadystatechange = null;
+							// Handle memory leak in IE
+							script.onload = script.onreadystatechange = null;
 
-						// Remove the script
-						if ( head && script.parentNode ) {
-							head.removeChild( script );
-						}
+							// Remove the script
+							if (head && script.parentNode) {
+								head.removeChild(script);
+							}
 
-						// Dereference the script
-						script = undefined;
+							// Dereference the script
+							script = undefined;
 
-						// Callback if not abort
-						if ( !isAbort ) {
-							callback( 200, "success" );
+							// Callback if not abort
+							if (!isAbort) {
+								callback(200, "success");
+							}
 						}
-					}
-				};
-				// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
-				// This arises when a base node is used (#2709 and #4378).
-				head.insertBefore( script, head.firstChild );
-			},
+					};
+					// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+					// This arises when a base node is used (#2709 and #4378).
+					head.insertBefore(script, head.firstChild);
+				},
 
-			abort: function() {
-				if ( script ) {
-					script.onload( 0, 1 );
+				abort: function () {
+					if (script) {
+						script.onload(0, 1);
+					}
 				}
-			}
-		};
-	}
-});
-
-
+			};
+		}
+	});
 
 
-var // #5280: Internet Explorer will keep connections alive if we don't abort on unload
-	xhrOnUnloadAbort = window.ActiveXObject ? function() {
-		// Abort all pending requests
-		for ( var key in xhrCallbacks ) {
-			xhrCallbacks[ key ]( 0, 1 );
-		}
-	} : false,
-	xhrId = 0,
-	xhrCallbacks;
+	var // #5280: Internet Explorer will keep connections alive if we don't abort on unload
+		xhrOnUnloadAbort = window.ActiveXObject ? function () {
+			// Abort all pending requests
+			for (var key in xhrCallbacks) {
+				xhrCallbacks[key](0, 1);
+			}
+		} : false,
+		xhrId = 0,
+		xhrCallbacks;
 
 // Functions to create xhrs
-function createStandardXHR() {
-	try {
-		return new window.XMLHttpRequest();
-	} catch( e ) {}
-}
+	function createStandardXHR() {
+		try {
+			return new window.XMLHttpRequest();
+		} catch (e) {
+		}
+	}
 
-function createActiveXHR() {
-	try {
-		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
-	} catch( e ) {}
-}
+	function createActiveXHR() {
+		try {
+			return new window.ActiveXObject("Microsoft.XMLHTTP");
+		} catch (e) {
+		}
+	}
 
 // Create the request object
 // (This is still attached to ajaxSettings for backward compatibility)
-jQuery.ajaxSettings.xhr = window.ActiveXObject ?
-	/* Microsoft failed to properly
+	jQuery.ajaxSettings.xhr = window.ActiveXObject ?
+		/* Microsoft failed to properly
 	 * implement the XMLHttpRequest in IE7 (can't request local files),
 	 * so we use the ActiveXObject when it is available
 	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
 	 * we need a fallback.
 	 */
-	function() {
-		return !this.isLocal && createStandardXHR() || createActiveXHR();
-	} :
-	// For all other browsers, use the standard XMLHttpRequest object
-	createStandardXHR;
+		function () {
+			return !this.isLocal && createStandardXHR() || createActiveXHR();
+		} :
+		// For all other browsers, use the standard XMLHttpRequest object
+		createStandardXHR;
 
 // Determine support properties
-(function( xhr ) {
-	jQuery.extend( jQuery.support, {
-		ajax: !!xhr,
-		cors: !!xhr && ( "withCredentials" in xhr )
-	});
-})( jQuery.ajaxSettings.xhr() );
+	(function (xhr) {
+		jQuery.extend(jQuery.support, {
+			ajax: !!xhr,
+			cors: !!xhr && ("withCredentials" in xhr)
+		});
+	})(jQuery.ajaxSettings.xhr());
 
 // Create transport if the browser can provide an xhr
-if ( jQuery.support.ajax ) {
+	if (jQuery.support.ajax) {
 
-	jQuery.ajaxTransport(function( s ) {
-		// Cross domain only allowed if supported through XMLHttpRequest
-		if ( !s.crossDomain || jQuery.support.cors ) {
+		jQuery.ajaxTransport(function (s) {
+			// Cross domain only allowed if supported through XMLHttpRequest
+			if (!s.crossDomain || jQuery.support.cors) {
 
-			var callback;
+				var callback;
 
-			return {
-				send: function( headers, complete ) {
+				return {
+					send: function (headers, complete) {
 
-					// Get a new xhr
-					var xhr = s.xhr(),
-						handle,
-						i;
+						// Get a new xhr
+						var xhr = s.xhr(),
+							handle,
+							i;
 
-					// Open the socket
-					// Passing null username, generates a login popup on Opera (#2865)
-					if ( s.username ) {
-						xhr.open( s.type, s.url, s.async, s.username, s.password );
-					} else {
-						xhr.open( s.type, s.url, s.async );
-					}
+						// Open the socket
+						// Passing null username, generates a login popup on Opera (#2865)
+						if (s.username) {
+							xhr.open(s.type, s.url, s.async, s.username, s.password);
+						} else {
+							xhr.open(s.type, s.url, s.async);
+						}
 
-					// Apply custom fields if provided
-					if ( s.xhrFields ) {
-						for ( i in s.xhrFields ) {
-							xhr[ i ] = s.xhrFields[ i ];
+						// Apply custom fields if provided
+						if (s.xhrFields) {
+							for (i in s.xhrFields) {
+								xhr[i] = s.xhrFields[i];
+							}
 						}
-					}
 
-					// Override mime type if needed
-					if ( s.mimeType && xhr.overrideMimeType ) {
-						xhr.overrideMimeType( s.mimeType );
-					}
+						// Override mime type if needed
+						if (s.mimeType && xhr.overrideMimeType) {
+							xhr.overrideMimeType(s.mimeType);
+						}
 
-					// X-Requested-With header
-					// For cross-domain requests, seeing as conditions for a preflight are
-					// akin to a jigsaw puzzle, we simply never set it to be sure.
-					// (it can always be set on a per-request basis or even using ajaxSetup)
-					// For same-domain requests, won't change header if already provided.
-					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
-						headers[ "X-Requested-With" ] = "XMLHttpRequest";
-					}
+						// X-Requested-With header
+						// For cross-domain requests, seeing as conditions for a preflight are
+						// akin to a jigsaw puzzle, we simply never set it to be sure.
+						// (it can always be set on a per-request basis or even using ajaxSetup)
+						// For same-domain requests, won't change header if already provided.
+						if (!s.crossDomain && !headers["X-Requested-With"]) {
+							headers["X-Requested-With"] = "XMLHttpRequest";
+						}
 
-					// Need an extra try/catch for cross domain requests in Firefox 3
-					try {
-						for ( i in headers ) {
-							xhr.setRequestHeader( i, headers[ i ] );
+						// Need an extra try/catch for cross domain requests in Firefox 3
+						try {
+							for (i in headers) {
+								xhr.setRequestHeader(i, headers[i]);
+							}
+						} catch (_) {
 						}
-					} catch( _ ) {}
 
-					// Do send the request
-					// This may raise an exception which is actually
-					// handled in jQuery.ajax (so no try/catch here)
-					xhr.send( ( s.hasContent && s.data ) || null );
+						// Do send the request
+						// This may raise an exception which is actually
+						// handled in jQuery.ajax (so no try/catch here)
+						xhr.send((s.hasContent && s.data) || null);
 
-					// Listener
-					callback = function( _, isAbort ) {
+						// Listener
+						callback = function (_, isAbort) {
 
-						var status,
-							statusText,
-							responseHeaders,
-							responses,
-							xml;
+							var status,
+								statusText,
+								responseHeaders,
+								responses,
+								xml;
 
-						// Firefox throws exceptions when accessing properties
-						// of an xhr when a network error occured
-						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
-						try {
+							// Firefox throws exceptions when accessing properties
+							// of an xhr when a network error occured
+							// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
+							try {
 
-							// Was never called and is aborted or complete
-							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
+								// Was never called and is aborted or complete
+								if (callback && (isAbort || xhr.readyState === 4)) {
 
-								// Only called once
-								callback = undefined;
+									// Only called once
+									callback = undefined;
 
-								// Do not keep as active anymore
-								if ( handle ) {
-									xhr.onreadystatechange = jQuery.noop;
-									if ( xhrOnUnloadAbort ) {
-										delete xhrCallbacks[ handle ];
+									// Do not keep as active anymore
+									if (handle) {
+										xhr.onreadystatechange = jQuery.noop;
+										if (xhrOnUnloadAbort) {
+											delete xhrCallbacks[handle];
+										}
 									}
-								}
 
-								// If it's an abort
-								if ( isAbort ) {
-									// Abort it manually if needed
-									if ( xhr.readyState !== 4 ) {
-										xhr.abort();
-									}
-								} else {
-									status = xhr.status;
-									responseHeaders = xhr.getAllResponseHeaders();
-									responses = {};
-									xml = xhr.responseXML;
-
-									// Construct response list
-									if ( xml && xml.documentElement /* #4958 */ ) {
-										responses.xml = xml;
-									}
-									responses.text = xhr.responseText;
-
-									// Firefox throws an exception when accessing
-									// statusText for faulty cross-domain requests
-									try {
-										statusText = xhr.statusText;
-									} catch( e ) {
-										// We normalize with Webkit giving an empty statusText
-										statusText = "";
-									}
+									// If it's an abort
+									if (isAbort) {
+										// Abort it manually if needed
+										if (xhr.readyState !== 4) {
+											xhr.abort();
+										}
+									} else {
+										status = xhr.status;
+										responseHeaders = xhr.getAllResponseHeaders();
+										responses = {};
+										xml = xhr.responseXML;
+
+										// Construct response list
+										if (xml && xml.documentElement /* #4958 */) {
+											responses.xml = xml;
+										}
+										responses.text = xhr.responseText;
+
+										// Firefox throws an exception when accessing
+										// statusText for faulty cross-domain requests
+										try {
+											statusText = xhr.statusText;
+										} catch (e) {
+											// We normalize with Webkit giving an empty statusText
+											statusText = "";
+										}
 
-									// Filter status for non standard behaviors
+										// Filter status for non standard behaviors
 
-									// If the request is local and we have data: assume a success
-									// (success with no data won't get notified, that's the best we
-									// can do given current implementations)
-									if ( !status && s.isLocal && !s.crossDomain ) {
-										status = responses.text ? 200 : 404;
-									// IE - #1450: sometimes returns 1223 when it should be 204
-									} else if ( status === 1223 ) {
-										status = 204;
+										// If the request is local and we have data: assume a success
+										// (success with no data won't get notified, that's the best we
+										// can do given current implementations)
+										if (!status && s.isLocal && !s.crossDomain) {
+											status = responses.text ? 200 : 404;
+											// IE - #1450: sometimes returns 1223 when it should be 204
+										} else if (status === 1223) {
+											status = 204;
+										}
 									}
 								}
+							} catch (firefoxAccessException) {
+								if (!isAbort) {
+									complete(-1, firefoxAccessException);
+								}
 							}
-						} catch( firefoxAccessException ) {
-							if ( !isAbort ) {
-								complete( -1, firefoxAccessException );
-							}
-						}
 
-						// Call complete if needed
-						if ( responses ) {
-							complete( status, statusText, responses, responseHeaders );
-						}
-					};
+							// Call complete if needed
+							if (responses) {
+								complete(status, statusText, responses, responseHeaders);
+							}
+						};
 
-					// if we're in sync mode or it's in cache
-					// and has been retrieved directly (IE6 & IE7)
-					// we need to manually fire the callback
-					if ( !s.async || xhr.readyState === 4 ) {
-						callback();
-					} else {
-						handle = ++xhrId;
-						if ( xhrOnUnloadAbort ) {
-							// Create the active xhrs callbacks list if needed
-							// and attach the unload handler
-							if ( !xhrCallbacks ) {
-								xhrCallbacks = {};
-								jQuery( window ).unload( xhrOnUnloadAbort );
+						// if we're in sync mode or it's in cache
+						// and has been retrieved directly (IE6 & IE7)
+						// we need to manually fire the callback
+						if (!s.async || xhr.readyState === 4) {
+							callback();
+						} else {
+							handle = ++xhrId;
+							if (xhrOnUnloadAbort) {
+								// Create the active xhrs callbacks list if needed
+								// and attach the unload handler
+								if (!xhrCallbacks) {
+									xhrCallbacks = {};
+									jQuery(window).unload(xhrOnUnloadAbort);
+								}
+								// Add to list of active xhrs callbacks
+								xhrCallbacks[handle] = callback;
 							}
-							// Add to list of active xhrs callbacks
-							xhrCallbacks[ handle ] = callback;
+							xhr.onreadystatechange = callback;
 						}
-						xhr.onreadystatechange = callback;
-					}
-				},
+					},
 
-				abort: function() {
-					if ( callback ) {
-						callback(0,1);
+					abort: function () {
+						if (callback) {
+							callback(0, 1);
+						}
 					}
-				}
-			};
-		}
-	});
-}
-
-
-
-
-var elemdisplay = {},
-	iframe, iframeDoc,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,
-	timerId,
-	fxAttrs = [
-		// height animations
-		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
-		// width animations
-		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
-		// opacity animations
-		[ "opacity" ]
-	],
-	fxNow;
+				};
+			}
+		});
+	}
 
-jQuery.fn.extend({
-	show: function( speed, easing, callback ) {
-		var elem, display;
 
-		if ( speed || speed === 0 ) {
-			return this.animate( genFx("show", 3), speed, easing, callback );
+	var elemdisplay = {},
+		iframe, iframeDoc,
+		rfxtypes = /^(?:toggle|show|hide)$/,
+		rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,
+		timerId,
+		fxAttrs = [
+			// height animations
+			["height", "marginTop", "marginBottom", "paddingTop", "paddingBottom"],
+			// width animations
+			["width", "marginLeft", "marginRight", "paddingLeft", "paddingRight"],
+			// opacity animations
+			["opacity"]
+		],
+		fxNow;
+
+	jQuery.fn.extend({
+		show: function (speed, easing, callback) {
+			var elem, display;
+
+			if (speed || speed === 0) {
+				return this.animate(genFx("show", 3), speed, easing, callback);
 
-		} else {
-			for ( var i = 0, j = this.length; i < j; i++ ) {
-				elem = this[ i ];
+			} else {
+				for (var i = 0, j = this.length; i < j; i++) {
+					elem = this[i];
 
-				if ( elem.style ) {
-					display = elem.style.display;
+					if (elem.style) {
+						display = elem.style.display;
 
-					// Reset the inline display of this element to learn if it is
-					// being hidden by cascaded rules or not
-					if ( !jQuery._data(elem, "olddisplay") && display === "none" ) {
-						display = elem.style.display = "";
-					}
+						// Reset the inline display of this element to learn if it is
+						// being hidden by cascaded rules or not
+						if (!jQuery._data(elem, "olddisplay") && display === "none") {
+							display = elem.style.display = "";
+						}
 
-					// Set elements which have been overridden with display: none
-					// in a stylesheet to whatever the default browser style is
-					// for such an element
-					if ( display === "" && jQuery.css(elem, "display") === "none" ) {
-						jQuery._data( elem, "olddisplay", defaultDisplay(elem.nodeName) );
+						// Set elements which have been overridden with display: none
+						// in a stylesheet to whatever the default browser style is
+						// for such an element
+						if (display === "" && jQuery.css(elem, "display") === "none") {
+							jQuery._data(elem, "olddisplay", defaultDisplay(elem.nodeName));
+						}
 					}
 				}
-			}
 
-			// Set the display of most of the elements in a second loop
-			// to avoid the constant reflow
-			for ( i = 0; i < j; i++ ) {
-				elem = this[ i ];
+				// Set the display of most of the elements in a second loop
+				// to avoid the constant reflow
+				for (i = 0; i < j; i++) {
+					elem = this[i];
 
-				if ( elem.style ) {
-					display = elem.style.display;
+					if (elem.style) {
+						display = elem.style.display;
 
-					if ( display === "" || display === "none" ) {
-						elem.style.display = jQuery._data( elem, "olddisplay" ) || "";
+						if (display === "" || display === "none") {
+							elem.style.display = jQuery._data(elem, "olddisplay") || "";
+						}
 					}
 				}
-			}
 
-			return this;
-		}
-	},
+				return this;
+			}
+		},
 
-	hide: function( speed, easing, callback ) {
-		if ( speed || speed === 0 ) {
-			return this.animate( genFx("hide", 3), speed, easing, callback);
+		hide: function (speed, easing, callback) {
+			if (speed || speed === 0) {
+				return this.animate(genFx("hide", 3), speed, easing, callback);
 
-		} else {
-			var elem, display,
-				i = 0,
-				j = this.length;
+			} else {
+				var elem, display,
+					i = 0,
+					j = this.length;
 
-			for ( ; i < j; i++ ) {
-				elem = this[i];
-				if ( elem.style ) {
-					display = jQuery.css( elem, "display" );
+				for (; i < j; i++) {
+					elem = this[i];
+					if (elem.style) {
+						display = jQuery.css(elem, "display");
 
-					if ( display !== "none" && !jQuery._data( elem, "olddisplay" ) ) {
-						jQuery._data( elem, "olddisplay", display );
+						if (display !== "none" && !jQuery._data(elem, "olddisplay")) {
+							jQuery._data(elem, "olddisplay", display);
+						}
 					}
 				}
-			}
 
-			// Set the display of the elements in a second loop
-			// to avoid the constant reflow
-			for ( i = 0; i < j; i++ ) {
-				if ( this[i].style ) {
-					this[i].style.display = "none";
+				// Set the display of the elements in a second loop
+				// to avoid the constant reflow
+				for (i = 0; i < j; i++) {
+					if (this[i].style) {
+						this[i].style.display = "none";
+					}
 				}
-			}
 
-			return this;
-		}
-	},
+				return this;
+			}
+		},
 
-	// Save the old toggle function
-	_toggle: jQuery.fn.toggle,
+		// Save the old toggle function
+		_toggle: jQuery.fn.toggle,
 
-	toggle: function( fn, fn2, callback ) {
-		var bool = typeof fn === "boolean";
+		toggle: function (fn, fn2, callback) {
+			var bool = typeof fn === "boolean";
 
-		if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
-			this._toggle.apply( this, arguments );
+			if (jQuery.isFunction(fn) && jQuery.isFunction(fn2)) {
+				this._toggle.apply(this, arguments);
 
-		} else if ( fn == null || bool ) {
-			this.each(function() {
-				var state = bool ? fn : jQuery(this).is(":hidden");
-				jQuery(this)[ state ? "show" : "hide" ]();
-			});
+			} else if (fn == null || bool) {
+				this.each(function () {
+					var state = bool ? fn : jQuery(this).is(":hidden");
+					jQuery(this)[state ? "show" : "hide"]();
+				});
 
-		} else {
-			this.animate(genFx("toggle", 3), fn, fn2, callback);
-		}
+			} else {
+				this.animate(genFx("toggle", 3), fn, fn2, callback);
+			}
 
-		return this;
-	},
+			return this;
+		},
 
-	fadeTo: function( speed, to, easing, callback ) {
-		return this.filter(":hidden").css("opacity", 0).show().end()
-					.animate({opacity: to}, speed, easing, callback);
-	},
+		fadeTo: function (speed, to, easing, callback) {
+			return this.filter(":hidden").css("opacity", 0).show().end()
+				.animate({opacity: to}, speed, easing, callback);
+		},
 
-	animate: function( prop, speed, easing, callback ) {
-		var optall = jQuery.speed( speed, easing, callback );
+		animate: function (prop, speed, easing, callback) {
+			var optall = jQuery.speed(speed, easing, callback);
 
-		if ( jQuery.isEmptyObject( prop ) ) {
-			return this.each( optall.complete, [ false ] );
-		}
+			if (jQuery.isEmptyObject(prop)) {
+				return this.each(optall.complete, [false]);
+			}
 
-		// Do not change referenced properties as per-property easing will be lost
-		prop = jQuery.extend( {}, prop );
+			// Do not change referenced properties as per-property easing will be lost
+			prop = jQuery.extend({}, prop);
 
-		function doAnimation() {
-			// XXX 'this' does not always have a nodeName when running the
-			// test suite
+			function doAnimation() {
+				// XXX 'this' does not always have a nodeName when running the
+				// test suite
 
-			if ( optall.queue === false ) {
-				jQuery._mark( this );
-			}
+				if (optall.queue === false) {
+					jQuery._mark(this);
+				}
 
-			var opt = jQuery.extend( {}, optall ),
-				isElement = this.nodeType === 1,
-				hidden = isElement && jQuery(this).is(":hidden"),
-				name, val, p, e,
-				parts, start, end, unit,
-				method;
+				var opt = jQuery.extend({}, optall),
+					isElement = this.nodeType === 1,
+					hidden = isElement && jQuery(this).is(":hidden"),
+					name, val, p, e,
+					parts, start, end, unit,
+					method;
 
-			// will store per property easing and be used to determine when an animation is complete
-			opt.animatedProperties = {};
+				// will store per property easing and be used to determine when an animation is complete
+				opt.animatedProperties = {};
 
-			for ( p in prop ) {
+				for (p in prop) {
 
-				// property name normalization
-				name = jQuery.camelCase( p );
-				if ( p !== name ) {
-					prop[ name ] = prop[ p ];
-					delete prop[ p ];
-				}
+					// property name normalization
+					name = jQuery.camelCase(p);
+					if (p !== name) {
+						prop[name] = prop[p];
+						delete prop[p];
+					}
 
-				val = prop[ name ];
+					val = prop[name];
 
-				// easing resolution: per property > opt.specialEasing > opt.easing > 'swing' (default)
-				if ( jQuery.isArray( val ) ) {
-					opt.animatedProperties[ name ] = val[ 1 ];
-					val = prop[ name ] = val[ 0 ];
-				} else {
-					opt.animatedProperties[ name ] = opt.specialEasing && opt.specialEasing[ name ] || opt.easing || 'swing';
-				}
+					// easing resolution: per property > opt.specialEasing > opt.easing > 'swing' (default)
+					if (jQuery.isArray(val)) {
+						opt.animatedProperties[name] = val[1];
+						val = prop[name] = val[0];
+					} else {
+						opt.animatedProperties[name] = opt.specialEasing && opt.specialEasing[name] || opt.easing || 'swing';
+					}
 
-				if ( val === "hide" && hidden || val === "show" && !hidden ) {
-					return opt.complete.call( this );
-				}
+					if (val === "hide" && hidden || val === "show" && !hidden) {
+						return opt.complete.call(this);
+					}
 
-				if ( isElement && ( name === "height" || name === "width" ) ) {
-					// Make sure that nothing sneaks out
-					// Record all 3 overflow attributes because IE does not
-					// change the overflow attribute when overflowX and
-					// overflowY are set to the same value
-					opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ];
+					if (isElement && (name === "height" || name === "width")) {
+						// Make sure that nothing sneaks out
+						// Record all 3 overflow attributes because IE does not
+						// change the overflow attribute when overflowX and
+						// overflowY are set to the same value
+						opt.overflow = [this.style.overflow, this.style.overflowX, this.style.overflowY];
 
-					// Set display property to inline-block for height/width
-					// animations on inline elements that are having width/height animated
-					if ( jQuery.css( this, "display" ) === "inline" &&
-							jQuery.css( this, "float" ) === "none" ) {
+						// Set display property to inline-block for height/width
+						// animations on inline elements that are having width/height animated
+						if (jQuery.css(this, "display") === "inline" &&
+							jQuery.css(this, "float") === "none") {
 
-						// inline-level elements accept inline-block;
-						// block-level elements need to be inline with layout
-						if ( !jQuery.support.inlineBlockNeedsLayout || defaultDisplay( this.nodeName ) === "inline" ) {
-							this.style.display = "inline-block";
+							// inline-level elements accept inline-block;
+							// block-level elements need to be inline with layout
+							if (!jQuery.support.inlineBlockNeedsLayout || defaultDisplay(this.nodeName) === "inline") {
+								this.style.display = "inline-block";
 
-						} else {
-							this.style.zoom = 1;
+							} else {
+								this.style.zoom = 1;
+							}
 						}
 					}
 				}
-			}
-
-			if ( opt.overflow != null ) {
-				this.style.overflow = "hidden";
-			}
 
-			for ( p in prop ) {
-				e = new jQuery.fx( this, opt, p );
-				val = prop[ p ];
+				if (opt.overflow != null) {
+					this.style.overflow = "hidden";
+				}
 
-				if ( rfxtypes.test( val ) ) {
+				for (p in prop) {
+					e = new jQuery.fx(this, opt, p);
+					val = prop[p];
 
-					// Tracks whether to show or hide based on private
-					// data attached to the element
-					method = jQuery._data( this, "toggle" + p ) || ( val === "toggle" ? hidden ? "show" : "hide" : 0 );
-					if ( method ) {
-						jQuery._data( this, "toggle" + p, method === "show" ? "hide" : "show" );
-						e[ method ]();
-					} else {
-						e[ val ]();
-					}
+					if (rfxtypes.test(val)) {
 
-				} else {
-					parts = rfxnum.exec( val );
-					start = e.cur();
-
-					if ( parts ) {
-						end = parseFloat( parts[2] );
-						unit = parts[3] || ( jQuery.cssNumber[ p ] ? "" : "px" );
-
-						// We need to compute starting value
-						if ( unit !== "px" ) {
-							jQuery.style( this, p, (end || 1) + unit);
-							start = ( (end || 1) / e.cur() ) * start;
-							jQuery.style( this, p, start + unit);
+						// Tracks whether to show or hide based on private
+						// data attached to the element
+						method = jQuery._data(this, "toggle" + p) || (val === "toggle" ? hidden ? "show" : "hide" : 0);
+						if (method) {
+							jQuery._data(this, "toggle" + p, method === "show" ? "hide" : "show");
+							e[method]();
+						} else {
+							e[val]();
 						}
 
-						// If a +=/-= token was provided, we're doing a relative animation
-						if ( parts[1] ) {
-							end = ( (parts[ 1 ] === "-=" ? -1 : 1) * end ) + start;
-						}
+					} else {
+						parts = rfxnum.exec(val);
+						start = e.cur();
+
+						if (parts) {
+							end = parseFloat(parts[2]);
+							unit = parts[3] || (jQuery.cssNumber[p] ? "" : "px");
+
+							// We need to compute starting value
+							if (unit !== "px") {
+								jQuery.style(this, p, (end || 1) + unit);
+								start = ((end || 1) / e.cur()) * start;
+								jQuery.style(this, p, start + unit);
+							}
+
+							// If a +=/-= token was provided, we're doing a relative animation
+							if (parts[1]) {
+								end = ((parts[1] === "-=" ? -1 : 1) * end) + start;
+							}
 
-						e.custom( start, end, unit );
+							e.custom(start, end, unit);
 
-					} else {
-						e.custom( start, val, "" );
+						} else {
+							e.custom(start, val, "");
+						}
 					}
 				}
-			}
 
-			// For JS strict compliance
-			return true;
-		}
+				// For JS strict compliance
+				return true;
+			}
 
-		return optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
+			return optall.queue === false ?
+				this.each(doAnimation) :
+				this.queue(optall.queue, doAnimation);
+		},
 
-	stop: function( type, clearQueue, gotoEnd ) {
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue && type !== false ) {
-			this.queue( type || "fx", [] );
-		}
+		stop: function (type, clearQueue, gotoEnd) {
+			if (typeof type !== "string") {
+				gotoEnd = clearQueue;
+				clearQueue = type;
+				type = undefined;
+			}
+			if (clearQueue && type !== false) {
+				this.queue(type || "fx", []);
+			}
 
-		return this.each(function() {
-			var index,
-				hadTimers = false,
-				timers = jQuery.timers,
-				data = jQuery._data( this );
+			return this.each(function () {
+				var index,
+					hadTimers = false,
+					timers = jQuery.timers,
+					data = jQuery._data(this);
 
-			// clear marker counters if we know they won't be
-			if ( !gotoEnd ) {
-				jQuery._unmark( true, this );
-			}
+				// clear marker counters if we know they won't be
+				if (!gotoEnd) {
+					jQuery._unmark(true, this);
+				}
 
-			function stopQueue( elem, data, index ) {
-				var hooks = data[ index ];
-				jQuery.removeData( elem, index, true );
-				hooks.stop( gotoEnd );
-			}
+				function stopQueue(elem, data, index) {
+					var hooks = data[index];
+					jQuery.removeData(elem, index, true);
+					hooks.stop(gotoEnd);
+				}
 
-			if ( type == null ) {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && index.indexOf(".run") === index.length - 4 ) {
-						stopQueue( this, data, index );
+				if (type == null) {
+					for (index in data) {
+						if (data[index] && data[index].stop && index.indexOf(".run") === index.length - 4) {
+							stopQueue(this, data, index);
+						}
 					}
+				} else if (data[index = type + ".run"] && data[index].stop) {
+					stopQueue(this, data, index);
 				}
-			} else if ( data[ index = type + ".run" ] && data[ index ].stop ){
-				stopQueue( this, data, index );
-			}
 
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
-					if ( gotoEnd ) {
+				for (index = timers.length; index--;) {
+					if (timers[index].elem === this && (type == null || timers[index].queue === type)) {
+						if (gotoEnd) {
 
-						// force the next step to be the last
-						timers[ index ]( true );
-					} else {
-						timers[ index ].saveState();
+							// force the next step to be the last
+							timers[index](true);
+						} else {
+							timers[index].saveState();
+						}
+						hadTimers = true;
+						timers.splice(index, 1);
 					}
-					hadTimers = true;
-					timers.splice( index, 1 );
 				}
-			}
 
-			// start the next in the queue if the last step wasn't forced
-			// timers currently will call their complete callbacks, which will dequeue
-			// but only if they were gotoEnd
-			if ( !( gotoEnd && hadTimers ) ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	}
+				// start the next in the queue if the last step wasn't forced
+				// timers currently will call their complete callbacks, which will dequeue
+				// but only if they were gotoEnd
+				if (!(gotoEnd && hadTimers)) {
+					jQuery.dequeue(this, type);
+				}
+			});
+		}
 
-});
+	});
 
 // Animations created synchronously will run synchronously
-function createFxNow() {
-	setTimeout( clearFxNow, 0 );
-	return ( fxNow = jQuery.now() );
-}
+	function createFxNow() {
+		setTimeout(clearFxNow, 0);
+		return (fxNow = jQuery.now());
+	}
 
-function clearFxNow() {
-	fxNow = undefined;
-}
+	function clearFxNow() {
+		fxNow = undefined;
+	}
 
 // Generate parameters to create a standard animation
-function genFx( type, num ) {
-	var obj = {};
+	function genFx(type, num) {
+		var obj = {};
 
-	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice( 0, num )), function() {
-		obj[ this ] = type;
-	});
+		jQuery.each(fxAttrs.concat.apply([], fxAttrs.slice(0, num)), function () {
+			obj[this] = type;
+		});
 
-	return obj;
-}
+		return obj;
+	}
 
 // Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx( "show", 1 ),
-	slideUp: genFx( "hide", 1 ),
-	slideToggle: genFx( "toggle", 1 ),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-});
-
-jQuery.extend({
-	speed: function( speed, easing, fn ) {
-		var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-			complete: fn || !fn && easing ||
-				jQuery.isFunction( speed ) && speed,
-			duration: speed,
-			easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
+	jQuery.each({
+		slideDown: genFx("show", 1),
+		slideUp: genFx("hide", 1),
+		slideToggle: genFx("toggle", 1),
+		fadeIn: {opacity: "show"},
+		fadeOut: {opacity: "hide"},
+		fadeToggle: {opacity: "toggle"}
+	}, function (name, props) {
+		jQuery.fn[name] = function (speed, easing, callback) {
+			return this.animate(props, speed, easing, callback);
 		};
+	});
 
-		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-			opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
-		// normalize opt.queue - true/undefined/null -> "fx"
-		if ( opt.queue == null || opt.queue === true ) {
-			opt.queue = "fx";
-		}
+	jQuery.extend({
+		speed: function (speed, easing, fn) {
+			var opt = speed && typeof speed === "object" ? jQuery.extend({}, speed) : {
+				complete: fn || !fn && easing ||
+					jQuery.isFunction(speed) && speed,
+				duration: speed,
+				easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
+			};
 
-		// Queueing
-		opt.old = opt.complete;
+			opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+				opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[opt.duration] : jQuery.fx.speeds._default;
 
-		opt.complete = function( noUnmark ) {
-			if ( jQuery.isFunction( opt.old ) ) {
-				opt.old.call( this );
+			// normalize opt.queue - true/undefined/null -> "fx"
+			if (opt.queue == null || opt.queue === true) {
+				opt.queue = "fx";
 			}
 
-			if ( opt.queue ) {
-				jQuery.dequeue( this, opt.queue );
-			} else if ( noUnmark !== false ) {
-				jQuery._unmark( this );
-			}
-		};
+			// Queueing
+			opt.old = opt.complete;
 
-		return opt;
-	},
+			opt.complete = function (noUnmark) {
+				if (jQuery.isFunction(opt.old)) {
+					opt.old.call(this);
+				}
 
-	easing: {
-		linear: function( p, n, firstNum, diff ) {
-			return firstNum + diff * p;
-		},
-		swing: function( p, n, firstNum, diff ) {
-			return ( ( -Math.cos( p*Math.PI ) / 2 ) + 0.5 ) * diff + firstNum;
-		}
-	},
+				if (opt.queue) {
+					jQuery.dequeue(this, opt.queue);
+				} else if (noUnmark !== false) {
+					jQuery._unmark(this);
+				}
+			};
 
-	timers: [],
+			return opt;
+		},
 
-	fx: function( elem, options, prop ) {
-		this.options = options;
-		this.elem = elem;
-		this.prop = prop;
+		easing: {
+			linear: function (p, n, firstNum, diff) {
+				return firstNum + diff * p;
+			},
+			swing: function (p, n, firstNum, diff) {
+				return ((-Math.cos(p * Math.PI) / 2) + 0.5) * diff + firstNum;
+			}
+		},
 
-		options.orig = options.orig || {};
-	}
+		timers: [],
 
-});
+		fx: function (elem, options, prop) {
+			this.options = options;
+			this.elem = elem;
+			this.prop = prop;
 
-jQuery.fx.prototype = {
-	// Simple function for setting a style value
-	update: function() {
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
+			options.orig = options.orig || {};
 		}
 
-		( jQuery.fx.step[ this.prop ] || jQuery.fx.step._default )( this );
-	},
+	});
 
-	// Get the current size
-	cur: function() {
-		if ( this.elem[ this.prop ] != null && (!this.elem.style || this.elem.style[ this.prop ] == null) ) {
-			return this.elem[ this.prop ];
-		}
+	jQuery.fx.prototype = {
+		// Simple function for setting a style value
+		update: function () {
+			if (this.options.step) {
+				this.options.step.call(this.elem, this.now, this);
+			}
 
-		var parsed,
-			r = jQuery.css( this.elem, this.prop );
-		// Empty strings, null, undefined and "auto" are converted to 0,
-		// complex values such as "rotate(1rad)" are returned as is,
-		// simple values such as "10px" are parsed to Float.
-		return isNaN( parsed = parseFloat( r ) ) ? !r || r === "auto" ? 0 : r : parsed;
-	},
-
-	// Start an animation from one number to another
-	custom: function( from, to, unit ) {
-		var self = this,
-			fx = jQuery.fx;
-
-		this.startTime = fxNow || createFxNow();
-		this.end = to;
-		this.now = this.start = from;
-		this.pos = this.state = 0;
-		this.unit = unit || this.unit || ( jQuery.cssNumber[ this.prop ] ? "" : "px" );
-
-		function t( gotoEnd ) {
-			return self.step( gotoEnd );
-		}
+			(jQuery.fx.step[this.prop] || jQuery.fx.step._default)(this);
+		},
 
-		t.queue = this.options.queue;
-		t.elem = this.elem;
-		t.saveState = function() {
-			if ( self.options.hide && jQuery._data( self.elem, "fxshow" + self.prop ) === undefined ) {
-				jQuery._data( self.elem, "fxshow" + self.prop, self.start );
+		// Get the current size
+		cur: function () {
+			if (this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null)) {
+				return this.elem[this.prop];
 			}
-		};
 
-		if ( t() && jQuery.timers.push(t) && !timerId ) {
-			timerId = setInterval( fx.tick, fx.interval );
-		}
-	},
+			var parsed,
+				r = jQuery.css(this.elem, this.prop);
+			// Empty strings, null, undefined and "auto" are converted to 0,
+			// complex values such as "rotate(1rad)" are returned as is,
+			// simple values such as "10px" are parsed to Float.
+			return isNaN(parsed = parseFloat(r)) ? !r || r === "auto" ? 0 : r : parsed;
+		},
 
-	// Simple 'show' function
-	show: function() {
-		var dataShow = jQuery._data( this.elem, "fxshow" + this.prop );
+		// Start an animation from one number to another
+		custom: function (from, to, unit) {
+			var self = this,
+				fx = jQuery.fx;
 
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[ this.prop ] = dataShow || jQuery.style( this.elem, this.prop );
-		this.options.show = true;
+			this.startTime = fxNow || createFxNow();
+			this.end = to;
+			this.now = this.start = from;
+			this.pos = this.state = 0;
+			this.unit = unit || this.unit || (jQuery.cssNumber[this.prop] ? "" : "px");
 
-		// Begin the animation
-		// Make sure that we start at a small width/height to avoid any flash of content
-		if ( dataShow !== undefined ) {
-			// This show is picking up where a previous hide or show left off
-			this.custom( this.cur(), dataShow );
-		} else {
-			this.custom( this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur() );
-		}
+			function t(gotoEnd) {
+				return self.step(gotoEnd);
+			}
+
+			t.queue = this.options.queue;
+			t.elem = this.elem;
+			t.saveState = function () {
+				if (self.options.hide && jQuery._data(self.elem, "fxshow" + self.prop) === undefined) {
+					jQuery._data(self.elem, "fxshow" + self.prop, self.start);
+				}
+			};
+
+			if (t() && jQuery.timers.push(t) && !timerId) {
+				timerId = setInterval(fx.tick, fx.interval);
+			}
+		},
+
+		// Simple 'show' function
+		show: function () {
+			var dataShow = jQuery._data(this.elem, "fxshow" + this.prop);
 
-		// Start by showing the element
-		jQuery( this.elem ).show();
-	},
+			// Remember where we started, so that we can go back to it later
+			this.options.orig[this.prop] = dataShow || jQuery.style(this.elem, this.prop);
+			this.options.show = true;
 
-	// Simple 'hide' function
-	hide: function() {
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[ this.prop ] = jQuery._data( this.elem, "fxshow" + this.prop ) || jQuery.style( this.elem, this.prop );
-		this.options.hide = true;
+			// Begin the animation
+			// Make sure that we start at a small width/height to avoid any flash of content
+			if (dataShow !== undefined) {
+				// This show is picking up where a previous hide or show left off
+				this.custom(this.cur(), dataShow);
+			} else {
+				this.custom(this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur());
+			}
 
-		// Begin the animation
-		this.custom( this.cur(), 0 );
-	},
+			// Start by showing the element
+			jQuery(this.elem).show();
+		},
 
-	// Each step of an animation
-	step: function( gotoEnd ) {
-		var p, n, complete,
-			t = fxNow || createFxNow(),
-			done = true,
-			elem = this.elem,
-			options = this.options;
+		// Simple 'hide' function
+		hide: function () {
+			// Remember where we started, so that we can go back to it later
+			this.options.orig[this.prop] = jQuery._data(this.elem, "fxshow" + this.prop) || jQuery.style(this.elem, this.prop);
+			this.options.hide = true;
 
-		if ( gotoEnd || t >= options.duration + this.startTime ) {
-			this.now = this.end;
-			this.pos = this.state = 1;
-			this.update();
+			// Begin the animation
+			this.custom(this.cur(), 0);
+		},
 
-			options.animatedProperties[ this.prop ] = true;
+		// Each step of an animation
+		step: function (gotoEnd) {
+			var p, n, complete,
+				t = fxNow || createFxNow(),
+				done = true,
+				elem = this.elem,
+				options = this.options;
 
-			for ( p in options.animatedProperties ) {
-				if ( options.animatedProperties[ p ] !== true ) {
-					done = false;
-				}
-			}
+			if (gotoEnd || t >= options.duration + this.startTime) {
+				this.now = this.end;
+				this.pos = this.state = 1;
+				this.update();
 
-			if ( done ) {
-				// Reset the overflow
-				if ( options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
+				options.animatedProperties[this.prop] = true;
 
-					jQuery.each( [ "", "X", "Y" ], function( index, value ) {
-						elem.style[ "overflow" + value ] = options.overflow[ index ];
-					});
+				for (p in options.animatedProperties) {
+					if (options.animatedProperties[p] !== true) {
+						done = false;
+					}
 				}
 
-				// Hide the element if the "hide" operation was done
-				if ( options.hide ) {
-					jQuery( elem ).hide();
-				}
+				if (done) {
+					// Reset the overflow
+					if (options.overflow != null && !jQuery.support.shrinkWrapBlocks) {
 
-				// Reset the properties, if the item has been hidden or shown
-				if ( options.hide || options.show ) {
-					for ( p in options.animatedProperties ) {
-						jQuery.style( elem, p, options.orig[ p ] );
-						jQuery.removeData( elem, "fxshow" + p, true );
-						// Toggle data is no longer needed
-						jQuery.removeData( elem, "toggle" + p, true );
+						jQuery.each(["", "X", "Y"], function (index, value) {
+							elem.style["overflow" + value] = options.overflow[index];
+						});
+					}
+
+					// Hide the element if the "hide" operation was done
+					if (options.hide) {
+						jQuery(elem).hide();
+					}
+
+					// Reset the properties, if the item has been hidden or shown
+					if (options.hide || options.show) {
+						for (p in options.animatedProperties) {
+							jQuery.style(elem, p, options.orig[p]);
+							jQuery.removeData(elem, "fxshow" + p, true);
+							// Toggle data is no longer needed
+							jQuery.removeData(elem, "toggle" + p, true);
+						}
 					}
-				}
 
-				// Execute the complete function
-				// in the event that the complete function throws an exception
-				// we must ensure it won't be called twice. #5684
+					// Execute the complete function
+					// in the event that the complete function throws an exception
+					// we must ensure it won't be called twice. #5684
 
-				complete = options.complete;
-				if ( complete ) {
+					complete = options.complete;
+					if (complete) {
 
-					options.complete = false;
-					complete.call( elem );
+						options.complete = false;
+						complete.call(elem);
+					}
 				}
-			}
 
-			return false;
+				return false;
 
-		} else {
-			// classical easing cannot be used with an Infinity duration
-			if ( options.duration == Infinity ) {
-				this.now = t;
 			} else {
-				n = t - this.startTime;
-				this.state = n / options.duration;
+				// classical easing cannot be used with an Infinity duration
+				if (options.duration == Infinity) {
+					this.now = t;
+				} else {
+					n = t - this.startTime;
+					this.state = n / options.duration;
 
-				// Perform the easing function, defaults to swing
-				this.pos = jQuery.easing[ options.animatedProperties[this.prop] ]( this.state, n, 0, 1, options.duration );
-				this.now = this.start + ( (this.end - this.start) * this.pos );
+					// Perform the easing function, defaults to swing
+					this.pos = jQuery.easing[options.animatedProperties[this.prop]](this.state, n, 0, 1, options.duration);
+					this.now = this.start + ((this.end - this.start) * this.pos);
+				}
+				// Perform the next step of the animation
+				this.update();
 			}
-			// Perform the next step of the animation
-			this.update();
-		}
 
-		return true;
-	}
-};
+			return true;
+		}
+	};
 
-jQuery.extend( jQuery.fx, {
-	tick: function() {
-		var timer,
-			timers = jQuery.timers,
-			i = 0;
+	jQuery.extend(jQuery.fx, {
+		tick: function () {
+			var timer,
+				timers = jQuery.timers,
+				i = 0;
 
-		for ( ; i < timers.length; i++ ) {
-			timer = timers[ i ];
-			// Checks the timer has not already been removed
-			if ( !timer() && timers[ i ] === timer ) {
-				timers.splice( i--, 1 );
+			for (; i < timers.length; i++) {
+				timer = timers[i];
+				// Checks the timer has not already been removed
+				if (!timer() && timers[i] === timer) {
+					timers.splice(i--, 1);
+				}
 			}
-		}
 
-		if ( !timers.length ) {
-			jQuery.fx.stop();
-		}
-	},
-
-	interval: 13,
+			if (!timers.length) {
+				jQuery.fx.stop();
+			}
+		},
 
-	stop: function() {
-		clearInterval( timerId );
-		timerId = null;
-	},
+		interval: 13,
 
-	speeds: {
-		slow: 600,
-		fast: 200,
-		// Default speed
-		_default: 400
-	},
+		stop: function () {
+			clearInterval(timerId);
+			timerId = null;
+		},
 
-	step: {
-		opacity: function( fx ) {
-			jQuery.style( fx.elem, "opacity", fx.now );
+		speeds: {
+			slow: 600,
+			fast: 200,
+			// Default speed
+			_default: 400
 		},
 
-		_default: function( fx ) {
-			if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
-				fx.elem.style[ fx.prop ] = fx.now + fx.unit;
-			} else {
-				fx.elem[ fx.prop ] = fx.now;
+		step: {
+			opacity: function (fx) {
+				jQuery.style(fx.elem, "opacity", fx.now);
+			},
+
+			_default: function (fx) {
+				if (fx.elem.style && fx.elem.style[fx.prop] != null) {
+					fx.elem.style[fx.prop] = fx.now + fx.unit;
+				} else {
+					fx.elem[fx.prop] = fx.now;
+				}
 			}
 		}
-	}
-});
+	});
 
 // Adds width/height step functions
 // Do not set anything below 0
-jQuery.each([ "width", "height" ], function( i, prop ) {
-	jQuery.fx.step[ prop ] = function( fx ) {
-		jQuery.style( fx.elem, prop, Math.max(0, fx.now) + fx.unit );
-	};
-});
+	jQuery.each(["width", "height"], function (i, prop) {
+		jQuery.fx.step[prop] = function (fx) {
+			jQuery.style(fx.elem, prop, Math.max(0, fx.now) + fx.unit);
+		};
+	});
 
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.animated = function( elem ) {
-		return jQuery.grep(jQuery.timers, function( fn ) {
-			return elem === fn.elem;
-		}).length;
-	};
-}
+	if (jQuery.expr && jQuery.expr.filters) {
+		jQuery.expr.filters.animated = function (elem) {
+			return jQuery.grep(jQuery.timers, function (fn) {
+				return elem === fn.elem;
+			}).length;
+		};
+	}
 
 // Try to restore the default display value of an element
-function defaultDisplay( nodeName ) {
+	function defaultDisplay(nodeName) {
 
-	if ( !elemdisplay[ nodeName ] ) {
+		if (!elemdisplay[nodeName]) {
 
-		var body = document.body,
-			elem = jQuery( "<" + nodeName + ">" ).appendTo( body ),
-			display = elem.css( "display" );
-		elem.remove();
+			var body = document.body,
+				elem = jQuery("<" + nodeName + ">").appendTo(body),
+				display = elem.css("display");
+			elem.remove();
 
-		// If the simple way fails,
-		// get element's real default display by attaching it to a temp iframe
-		if ( display === "none" || display === "" ) {
-			// No iframe to use yet, so create it
-			if ( !iframe ) {
-				iframe = document.createElement( "iframe" );
-				iframe.frameBorder = iframe.width = iframe.height = 0;
-			}
+			// If the simple way fails,
+			// get element's real default display by attaching it to a temp iframe
+			if (display === "none" || display === "") {
+				// No iframe to use yet, so create it
+				if (!iframe) {
+					iframe = document.createElement("iframe");
+					iframe.frameBorder = iframe.width = iframe.height = 0;
+				}
 
-			body.appendChild( iframe );
+				body.appendChild(iframe);
 
-			// Create a cacheable copy of the iframe document on first call.
-			// IE and Opera will allow us to reuse the iframeDoc without re-writing the fake HTML
-			// document to it; WebKit & Firefox won't allow reusing the iframe document.
-			if ( !iframeDoc || !iframe.createElement ) {
-				iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
-				iframeDoc.write( ( document.compatMode === "CSS1Compat" ? "<!doctype html>" : "" ) + "<html><body>" );
-				iframeDoc.close();
-			}
+				// Create a cacheable copy of the iframe document on first call.
+				// IE and Opera will allow us to reuse the iframeDoc without re-writing the fake HTML
+				// document to it; WebKit & Firefox won't allow reusing the iframe document.
+				if (!iframeDoc || !iframe.createElement) {
+					iframeDoc = (iframe.contentWindow || iframe.contentDocument).document;
+					iframeDoc.write((document.compatMode === "CSS1Compat" ? "<!doctype html>" : "") + "<html><body>");
+					iframeDoc.close();
+				}
 
-			elem = iframeDoc.createElement( nodeName );
+				elem = iframeDoc.createElement(nodeName);
 
-			iframeDoc.body.appendChild( elem );
+				iframeDoc.body.appendChild(elem);
+
+				display = jQuery.css(elem, "display");
+				body.removeChild(iframe);
+			}
 
-			display = jQuery.css( elem, "display" );
-			body.removeChild( iframe );
+			// Store the correct default display
+			elemdisplay[nodeName] = display;
 		}
 
-		// Store the correct default display
-		elemdisplay[ nodeName ] = display;
+		return elemdisplay[nodeName];
 	}
 
-	return elemdisplay[ nodeName ];
-}
 
+	var rtable = /^t(?:able|d|h)$/i,
+		rroot = /^(?:body|html)$/i;
 
+	if ("getBoundingClientRect" in document.documentElement) {
+		jQuery.fn.offset = function (options) {
+			var elem = this[0], box;
 
+			if (options) {
+				return this.each(function (i) {
+					jQuery.offset.setOffset(this, options, i);
+				});
+			}
 
-var rtable = /^t(?:able|d|h)$/i,
-	rroot = /^(?:body|html)$/i;
-
-if ( "getBoundingClientRect" in document.documentElement ) {
-	jQuery.fn.offset = function( options ) {
-		var elem = this[0], box;
+			if (!elem || !elem.ownerDocument) {
+				return null;
+			}
 
-		if ( options ) {
-			return this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-		}
+			if (elem === elem.ownerDocument.body) {
+				return jQuery.offset.bodyOffset(elem);
+			}
 
-		if ( !elem || !elem.ownerDocument ) {
-			return null;
-		}
+			try {
+				box = elem.getBoundingClientRect();
+			} catch (e) {
+			}
 
-		if ( elem === elem.ownerDocument.body ) {
-			return jQuery.offset.bodyOffset( elem );
-		}
+			var doc = elem.ownerDocument,
+				docElem = doc.documentElement;
 
-		try {
-			box = elem.getBoundingClientRect();
-		} catch(e) {}
+			// Make sure we're not dealing with a disconnected DOM node
+			if (!box || !jQuery.contains(docElem, elem)) {
+				return box ? {top: box.top, left: box.left} : {top: 0, left: 0};
+			}
 
-		var doc = elem.ownerDocument,
-			docElem = doc.documentElement;
+			var body = doc.body,
+				win = getWindow(doc),
+				clientTop = docElem.clientTop || body.clientTop || 0,
+				clientLeft = docElem.clientLeft || body.clientLeft || 0,
+				scrollTop = win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop || body.scrollTop,
+				scrollLeft = win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft,
+				top = box.top + scrollTop - clientTop,
+				left = box.left + scrollLeft - clientLeft;
 
-		// Make sure we're not dealing with a disconnected DOM node
-		if ( !box || !jQuery.contains( docElem, elem ) ) {
-			return box ? { top: box.top, left: box.left } : { top: 0, left: 0 };
-		}
+			return {top: top, left: left};
+		};
 
-		var body = doc.body,
-			win = getWindow(doc),
-			clientTop  = docElem.clientTop  || body.clientTop  || 0,
-			clientLeft = docElem.clientLeft || body.clientLeft || 0,
-			scrollTop  = win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop,
-			scrollLeft = win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft,
-			top  = box.top  + scrollTop  - clientTop,
-			left = box.left + scrollLeft - clientLeft;
+	} else {
+		jQuery.fn.offset = function (options) {
+			var elem = this[0];
 
-		return { top: top, left: left };
-	};
+			if (options) {
+				return this.each(function (i) {
+					jQuery.offset.setOffset(this, options, i);
+				});
+			}
 
-} else {
-	jQuery.fn.offset = function( options ) {
-		var elem = this[0];
+			if (!elem || !elem.ownerDocument) {
+				return null;
+			}
 
-		if ( options ) {
-			return this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-		}
+			if (elem === elem.ownerDocument.body) {
+				return jQuery.offset.bodyOffset(elem);
+			}
 
-		if ( !elem || !elem.ownerDocument ) {
-			return null;
-		}
+			var computedStyle,
+				offsetParent = elem.offsetParent,
+				prevOffsetParent = elem,
+				doc = elem.ownerDocument,
+				docElem = doc.documentElement,
+				body = doc.body,
+				defaultView = doc.defaultView,
+				prevComputedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle,
+				top = elem.offsetTop,
+				left = elem.offsetLeft;
 
-		if ( elem === elem.ownerDocument.body ) {
-			return jQuery.offset.bodyOffset( elem );
-		}
+			while ((elem = elem.parentNode) && elem !== body && elem !== docElem) {
+				if (jQuery.support.fixedPosition && prevComputedStyle.position === "fixed") {
+					break;
+				}
 
-		var computedStyle,
-			offsetParent = elem.offsetParent,
-			prevOffsetParent = elem,
-			doc = elem.ownerDocument,
-			docElem = doc.documentElement,
-			body = doc.body,
-			defaultView = doc.defaultView,
-			prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
-			top = elem.offsetTop,
-			left = elem.offsetLeft;
+				computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
+				top -= elem.scrollTop;
+				left -= elem.scrollLeft;
 
-		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
-			if ( jQuery.support.fixedPosition && prevComputedStyle.position === "fixed" ) {
-				break;
-			}
+				if (elem === offsetParent) {
+					top += elem.offsetTop;
+					left += elem.offsetLeft;
 
-			computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
-			top  -= elem.scrollTop;
-			left -= elem.scrollLeft;
+					if (jQuery.support.doesNotAddBorder && !(jQuery.support.doesAddBorderForTableAndCells && rtable.test(elem.nodeName))) {
+						top += parseFloat(computedStyle.borderTopWidth) || 0;
+						left += parseFloat(computedStyle.borderLeftWidth) || 0;
+					}
 
-			if ( elem === offsetParent ) {
-				top  += elem.offsetTop;
-				left += elem.offsetLeft;
+					prevOffsetParent = offsetParent;
+					offsetParent = elem.offsetParent;
+				}
 
-				if ( jQuery.support.doesNotAddBorder && !(jQuery.support.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) {
-					top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
-					left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+				if (jQuery.support.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible") {
+					top += parseFloat(computedStyle.borderTopWidth) || 0;
+					left += parseFloat(computedStyle.borderLeftWidth) || 0;
 				}
 
-				prevOffsetParent = offsetParent;
-				offsetParent = elem.offsetParent;
+				prevComputedStyle = computedStyle;
 			}
 
-			if ( jQuery.support.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
-				top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
-				left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+			if (prevComputedStyle.position === "relative" || prevComputedStyle.position === "static") {
+				top += body.offsetTop;
+				left += body.offsetLeft;
 			}
 
-			prevComputedStyle = computedStyle;
-		}
-
-		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
-			top  += body.offsetTop;
-			left += body.offsetLeft;
-		}
+			if (jQuery.support.fixedPosition && prevComputedStyle.position === "fixed") {
+				top += Math.max(docElem.scrollTop, body.scrollTop);
+				left += Math.max(docElem.scrollLeft, body.scrollLeft);
+			}
 
-		if ( jQuery.support.fixedPosition && prevComputedStyle.position === "fixed" ) {
-			top  += Math.max( docElem.scrollTop, body.scrollTop );
-			left += Math.max( docElem.scrollLeft, body.scrollLeft );
-		}
+			return {top: top, left: left};
+		};
+	}
 
-		return { top: top, left: left };
-	};
-}
+	jQuery.offset = {
 
-jQuery.offset = {
+		bodyOffset: function (body) {
+			var top = body.offsetTop,
+				left = body.offsetLeft;
 
-	bodyOffset: function( body ) {
-		var top = body.offsetTop,
-			left = body.offsetLeft;
+			if (jQuery.support.doesNotIncludeMarginInBodyOffset) {
+				top += parseFloat(jQuery.css(body, "marginTop")) || 0;
+				left += parseFloat(jQuery.css(body, "marginLeft")) || 0;
+			}
 
-		if ( jQuery.support.doesNotIncludeMarginInBodyOffset ) {
-			top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
-			left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
-		}
+			return {top: top, left: left};
+		},
 
-		return { top: top, left: left };
-	},
+		setOffset: function (elem, options, i) {
+			var position = jQuery.css(elem, "position");
 
-	setOffset: function( elem, options, i ) {
-		var position = jQuery.css( elem, "position" );
+			// set position first, in-case top/left are set even on static elem
+			if (position === "static") {
+				elem.style.position = "relative";
+			}
 
-		// set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
-			elem.style.position = "relative";
-		}
+			var curElem = jQuery(elem),
+				curOffset = curElem.offset(),
+				curCSSTop = jQuery.css(elem, "top"),
+				curCSSLeft = jQuery.css(elem, "left"),
+				calculatePosition = (position === "absolute" || position === "fixed") && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
+				props = {}, curPosition = {}, curTop, curLeft;
 
-		var curElem = jQuery( elem ),
-			curOffset = curElem.offset(),
-			curCSSTop = jQuery.css( elem, "top" ),
-			curCSSLeft = jQuery.css( elem, "left" ),
-			calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
-			props = {}, curPosition = {}, curTop, curLeft;
-
-		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-			curTop = curPosition.top;
-			curLeft = curPosition.left;
-		} else {
-			curTop = parseFloat( curCSSTop ) || 0;
-			curLeft = parseFloat( curCSSLeft ) || 0;
-		}
+			// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
+			if (calculatePosition) {
+				curPosition = curElem.position();
+				curTop = curPosition.top;
+				curLeft = curPosition.left;
+			} else {
+				curTop = parseFloat(curCSSTop) || 0;
+				curLeft = parseFloat(curCSSLeft) || 0;
+			}
 
-		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
-		}
+			if (jQuery.isFunction(options)) {
+				options = options.call(elem, i, curOffset);
+			}
 
-		if ( options.top != null ) {
-			props.top = ( options.top - curOffset.top ) + curTop;
-		}
-		if ( options.left != null ) {
-			props.left = ( options.left - curOffset.left ) + curLeft;
-		}
+			if (options.top != null) {
+				props.top = (options.top - curOffset.top) + curTop;
+			}
+			if (options.left != null) {
+				props.left = (options.left - curOffset.left) + curLeft;
+			}
 
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-		} else {
-			curElem.css( props );
+			if ("using" in options) {
+				options.using.call(elem, props);
+			} else {
+				curElem.css(props);
+			}
 		}
-	}
-};
+	};
 
 
-jQuery.fn.extend({
+	jQuery.fn.extend({
 
-	position: function() {
-		if ( !this[0] ) {
-			return null;
-		}
+		position: function () {
+			if (!this[0]) {
+				return null;
+			}
 
-		var elem = this[0],
+			var elem = this[0],
 
-		// Get *real* offsetParent
-		offsetParent = this.offsetParent(),
+				// Get *real* offsetParent
+				offsetParent = this.offsetParent(),
 
-		// Get correct offsets
-		offset       = this.offset(),
-		parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
+				// Get correct offsets
+				offset = this.offset(),
+				parentOffset = rroot.test(offsetParent[0].nodeName) ? {top: 0, left: 0} : offsetParent.offset();
 
-		// Subtract element margins
-		// note: when an element has margin: auto the offsetLeft and marginLeft
-		// are the same in Safari causing offset.left to incorrectly be 0
-		offset.top  -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
-		offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
+			// Subtract element margins
+			// note: when an element has margin: auto the offsetLeft and marginLeft
+			// are the same in Safari causing offset.left to incorrectly be 0
+			offset.top -= parseFloat(jQuery.css(elem, "marginTop")) || 0;
+			offset.left -= parseFloat(jQuery.css(elem, "marginLeft")) || 0;
 
-		// Add offsetParent borders
-		parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
-		parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
+			// Add offsetParent borders
+			parentOffset.top += parseFloat(jQuery.css(offsetParent[0], "borderTopWidth")) || 0;
+			parentOffset.left += parseFloat(jQuery.css(offsetParent[0], "borderLeftWidth")) || 0;
 
-		// Subtract the two offsets
-		return {
-			top:  offset.top  - parentOffset.top,
-			left: offset.left - parentOffset.left
-		};
-	},
+			// Subtract the two offsets
+			return {
+				top: offset.top - parentOffset.top,
+				left: offset.left - parentOffset.left
+			};
+		},
 
-	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || document.body;
-			while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-			return offsetParent;
-		});
-	}
-});
+		offsetParent: function () {
+			return this.map(function () {
+				var offsetParent = this.offsetParent || document.body;
+				while (offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static")) {
+					offsetParent = offsetParent.offsetParent;
+				}
+				return offsetParent;
+			});
+		}
+	});
 
 
 // Create scrollLeft and scrollTop methods
-jQuery.each( ["Left", "Top"], function( i, name ) {
-	var method = "scroll" + name;
-
-	jQuery.fn[ method ] = function( val ) {
-		var elem, win;
-
-		if ( val === undefined ) {
-			elem = this[ 0 ];
-
-			if ( !elem ) {
-				return null;
-			}
+	jQuery.each(["Left", "Top"], function (i, name) {
+		var method = "scroll" + name;
 
-			win = getWindow( elem );
+		jQuery.fn[method] = function (val) {
+			var elem, win;
 
-			// Return the scroll offset
-			return win ? ("pageXOffset" in win) ? win[ i ? "pageYOffset" : "pageXOffset" ] :
-				jQuery.support.boxModel && win.document.documentElement[ method ] ||
-					win.document.body[ method ] :
-				elem[ method ];
-		}
+			if (val === undefined) {
+				elem = this[0];
 
-		// Set the scroll offset
-		return this.each(function() {
-			win = getWindow( this );
+				if (!elem) {
+					return null;
+				}
 
-			if ( win ) {
-				win.scrollTo(
-					!i ? val : jQuery( win ).scrollLeft(),
-					 i ? val : jQuery( win ).scrollTop()
-				);
+				win = getWindow(elem);
 
-			} else {
-				this[ method ] = val;
+				// Return the scroll offset
+				return win ? ("pageXOffset" in win) ? win[i ? "pageYOffset" : "pageXOffset"] :
+						jQuery.support.boxModel && win.document.documentElement[method] ||
+						win.document.body[method] :
+					elem[method];
 			}
-		});
-	};
-});
 
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ?
-		elem :
-		elem.nodeType === 9 ?
-			elem.defaultView || elem.parentWindow :
-			false;
-}
+			// Set the scroll offset
+			return this.each(function () {
+				win = getWindow(this);
+
+				if (win) {
+					win.scrollTo(
+						!i ? val : jQuery(win).scrollLeft(),
+						i ? val : jQuery(win).scrollTop()
+					);
 
+				} else {
+					this[method] = val;
+				}
+			});
+		};
+	});
 
+	function getWindow(elem) {
+		return jQuery.isWindow(elem) ?
+			elem :
+			elem.nodeType === 9 ?
+				elem.defaultView || elem.parentWindow :
+				false;
+	}
 
 
 // Create width, height, innerHeight, innerWidth, outerHeight and outerWidth methods
-jQuery.each([ "Height", "Width" ], function( i, name ) {
-
-	var type = name.toLowerCase();
-
-	// innerHeight and innerWidth
-	jQuery.fn[ "inner" + name ] = function() {
-		var elem = this[0];
-		return elem ?
-			elem.style ?
-			parseFloat( jQuery.css( elem, type, "padding" ) ) :
-			this[ type ]() :
-			null;
-	};
+	jQuery.each(["Height", "Width"], function (i, name) {
 
-	// outerHeight and outerWidth
-	jQuery.fn[ "outer" + name ] = function( margin ) {
-		var elem = this[0];
-		return elem ?
-			elem.style ?
-			parseFloat( jQuery.css( elem, type, margin ? "margin" : "border" ) ) :
-			this[ type ]() :
-			null;
-	};
+		var type = name.toLowerCase();
 
-	jQuery.fn[ type ] = function( size ) {
-		// Get window width or height
-		var elem = this[0];
-		if ( !elem ) {
-			return size == null ? null : this;
-		}
+		// innerHeight and innerWidth
+		jQuery.fn["inner" + name] = function () {
+			var elem = this[0];
+			return elem ?
+				elem.style ?
+					parseFloat(jQuery.css(elem, type, "padding")) :
+					this[type]() :
+				null;
+		};
 
-		if ( jQuery.isFunction( size ) ) {
-			return this.each(function( i ) {
-				var self = jQuery( this );
-				self[ type ]( size.call( this, i, self[ type ]() ) );
-			});
-		}
+		// outerHeight and outerWidth
+		jQuery.fn["outer" + name] = function (margin) {
+			var elem = this[0];
+			return elem ?
+				elem.style ?
+					parseFloat(jQuery.css(elem, type, margin ? "margin" : "border")) :
+					this[type]() :
+				null;
+		};
 
-		if ( jQuery.isWindow( elem ) ) {
-			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
-			// 3rd condition allows Nokia support, as it supports the docElem prop but not CSS1Compat
-			var docElemProp = elem.document.documentElement[ "client" + name ],
-				body = elem.document.body;
-			return elem.document.compatMode === "CSS1Compat" && docElemProp ||
-				body && body[ "client" + name ] || docElemProp;
-
-		// Get document width or height
-		} else if ( elem.nodeType === 9 ) {
-			// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
-			return Math.max(
-				elem.documentElement["client" + name],
-				elem.body["scroll" + name], elem.documentElement["scroll" + name],
-				elem.body["offset" + name], elem.documentElement["offset" + name]
-			);
+		jQuery.fn[type] = function (size) {
+			// Get window width or height
+			var elem = this[0];
+			if (!elem) {
+				return size == null ? null : this;
+			}
 
-		// Get or set width or height on the element
-		} else if ( size === undefined ) {
-			var orig = jQuery.css( elem, type ),
-				ret = parseFloat( orig );
+			if (jQuery.isFunction(size)) {
+				return this.each(function (i) {
+					var self = jQuery(this);
+					self[type](size.call(this, i, self[type]()));
+				});
+			}
 
-			return jQuery.isNumeric( ret ) ? ret : orig;
+			if (jQuery.isWindow(elem)) {
+				// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
+				// 3rd condition allows Nokia support, as it supports the docElem prop but not CSS1Compat
+				var docElemProp = elem.document.documentElement["client" + name],
+					body = elem.document.body;
+				return elem.document.compatMode === "CSS1Compat" && docElemProp ||
+					body && body["client" + name] || docElemProp;
+
+				// Get document width or height
+			} else if (elem.nodeType === 9) {
+				// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+				return Math.max(
+					elem.documentElement["client" + name],
+					elem.body["scroll" + name], elem.documentElement["scroll" + name],
+					elem.body["offset" + name], elem.documentElement["offset" + name]
+				);
 
-		// Set the width or height on the element (default to pixels if value is unitless)
-		} else {
-			return this.css( type, typeof size === "string" ? size : size + "px" );
-		}
-	};
+				// Get or set width or height on the element
+			} else if (size === undefined) {
+				var orig = jQuery.css(elem, type),
+					ret = parseFloat(orig);
 
-});
+				return jQuery.isNumeric(ret) ? ret : orig;
 
+				// Set the width or height on the element (default to pixels if value is unitless)
+			} else {
+				return this.css(type, typeof size === "string" ? size : size + "px");
+			}
+		};
 
+	});
 
 
 // Expose jQuery to the global object
-window.jQuery = window.$ = jQuery;
+	window.jQuery = window.$ = jQuery;
 
 // Expose jQuery as an AMD module, but only for AMD loaders that
 // understand the issues with loading multiple versions of jQuery
@@ -9257,10 +9245,11 @@ window.jQuery = window.$ = jQuery;
 // file names, and jQuery is normally delivered in a lowercase file name.
 // Do this after creating the global so that if an AMD module wants to call
 // noConflict to hide this version of jQuery, it will work.
-if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
-	define( "jquery", [], function () { return jQuery; } );
-}
-
+	if (typeof define === "function" && define.amd && define.amd.jQuery) {
+		define("jquery", [], function () {
+			return jQuery;
+		});
+	}
 
 
-})( window );
+})(window);
diff --git a/len-activiti/src/main/resources/static/diagram-viewer/js/jquery/jquery.progressbar.js b/len-activiti/src/main/resources/static/diagram-viewer/js/jquery/jquery.progressbar.js
index 0b2fdc7..041cf14 100644
--- a/len-activiti/src/main/resources/static/diagram-viewer/js/jquery/jquery.progressbar.js
+++ b/len-activiti/src/main/resources/static/diagram-viewer/js/jquery/jquery.progressbar.js
@@ -2,130 +2,130 @@
  * @ Dmitry Farafonov
  */
 
-(function($){
-$.ProgressBar = function(options) {
-	this.element = $(options.boundingBox);
-	if (options.on && options.on.complete){
-		this.onComplete = options.on.complete;
-	}
-	if (options.on && options.on.valueChange){
-		this.onValueChange = options.on.valueChange;
-	}
-	
-	this._create();
-	
-	if (options.label)
-		this.set("label", options.label);
-	if (options.value)
-		this.value(options.value);
-	if (options.max)
-		this.set("max", options.max);
-};
-$.ProgressBar.prototype = {
-	options: {
-		value: 0,
-		max: 100
-	},
-
-	min: 0,
-
-	_create: function() {
-		this.element
-			.addClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
-			.attr({
-				role: "progressbar",
-				"aria-valuemin": this.min,
-				"aria-valuemax": this.options.max,
-				"aria-valuenow": this._value()
-			});
-
-		this.valueDiv = $( "<div class='ui-progressbar-label'></div>" )
-			.appendTo( this.element );
-			
-		this.valueDiv = $( "<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>" )
-			.appendTo( this.element );
-
-		this.oldValue = this._value();
-		this._refreshValue();
-	},
-
-	_destroy: function() {
-		this.element
-			.removeClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
-			.removeAttr( "role" )
-			.removeAttr( "aria-valuemin" )
-			.removeAttr( "aria-valuemax" )
-			.removeAttr( "aria-valuenow" );
-
-		this.valueDiv.remove();
-	},
-
-	value: function( newValue ) {
-		if ( newValue === undefined ) {
-			return this._value();
+(function ($) {
+	$.ProgressBar = function (options) {
+		this.element = $(options.boundingBox);
+		if (options.on && options.on.complete) {
+			this.onComplete = options.on.complete;
+		}
+		if (options.on && options.on.valueChange) {
+			this.onValueChange = options.on.valueChange;
 		}
 
-		this._setOption( "value", newValue );
-		return this;
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "value" ) {
-			//var oldVal = this.options.value;
-			this.options.value = value;
+		this._create();
+
+		if (options.label)
+			this.set("label", options.label);
+		if (options.value)
+			this.value(options.value);
+		if (options.max)
+			this.set("max", options.max);
+	};
+	$.ProgressBar.prototype = {
+		options: {
+			value: 0,
+			max: 100
+		},
+
+		min: 0,
+
+		_create: function () {
+			this.element
+				.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all")
+				.attr({
+					role: "progressbar",
+					"aria-valuemin": this.min,
+					"aria-valuemax": this.options.max,
+					"aria-valuenow": this._value()
+				});
+
+			this.valueDiv = $("<div class='ui-progressbar-label'></div>")
+				.appendTo(this.element);
+
+			this.valueDiv = $("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>")
+				.appendTo(this.element);
+
+			this.oldValue = this._value();
 			this._refreshValue();
-			
-			if (this.onValueChange)
-				this.onValueChange.apply(this, [{oldVal: this.oldValue, newVal: value}]);
-			
-			if ( this._value() === this.options.max ) {
-				//this._trigger( "complete" );
-				if (this.onComplete)
-					this.onComplete.apply(this);
+		},
+
+		_destroy: function () {
+			this.element
+				.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all")
+				.removeAttr("role")
+				.removeAttr("aria-valuemin")
+				.removeAttr("aria-valuemax")
+				.removeAttr("aria-valuenow");
+
+			this.valueDiv.remove();
+		},
+
+		value: function (newValue) {
+			if (newValue === undefined) {
+				return this._value();
 			}
-		} else if (key === "label") {
-			$(this.element).find(".ui-progressbar-label").html(value);
-		} else if (key === "max") {
-			this.options.max = value;
-		}
 
-		//this._super( key, value );
-	},
+			this._setOption("value", newValue);
+			return this;
+		},
+
+		_setOption: function (key, value) {
+			if (key === "value") {
+				//var oldVal = this.options.value;
+				this.options.value = value;
+				this._refreshValue();
+
+				if (this.onValueChange)
+					this.onValueChange.apply(this, [{oldVal: this.oldValue, newVal: value}]);
+
+				if (this._value() === this.options.max) {
+					//this._trigger( "complete" );
+					if (this.onComplete)
+						this.onComplete.apply(this);
+				}
+			} else if (key === "label") {
+				$(this.element).find(".ui-progressbar-label").html(value);
+			} else if (key === "max") {
+				this.options.max = value;
+			}
 
-	_value: function() {
-		var val = this.options.value;
-		// normalize invalid value
-		if ( typeof val !== "number" ) {
-			val = 0;
-		}
-		return Math.min( this.options.max, Math.max( this.min, val ) );
-	},
+			//this._super( key, value );
+		},
+
+		_value: function () {
+			var val = this.options.value;
+			// normalize invalid value
+			if (typeof val !== "number") {
+				val = 0;
+			}
+			return Math.min(this.options.max, Math.max(this.min, val));
+		},
+
+		_percentage: function () {
+			return 100 * this._value() / this.options.max;
+		},
+
+		_refreshValue: function () {
+			var value = this.value(),
+				percentage = this._percentage();
+
+			if (this.oldValue !== value) {
+				this.oldValue = value;
+				//this._trigger( "change" );
+			}
 
-	_percentage: function() {
-		return 100 * this._value() / this.options.max;
-	},
+			this.valueDiv
+				.toggle(value > this.min)
+				.toggleClass("ui-corner-right", value === this.options.max)
+				.width(percentage.toFixed(0) + "%");
+			this.element.attr("aria-valuenow", value);
 
-	_refreshValue: function() {
-		var value = this.value(),
-			percentage = this._percentage();
+			//$(this.element).find(".ui-progressbar-label").html(value + "%");
+		},
 
-		if ( this.oldValue !== value ) {
-			this.oldValue = value;
-			//this._trigger( "change" );
+		set: function (key, value) {
+			this._setOption(key, value);
 		}
+	};
 
-		this.valueDiv
-			.toggle( value > this.min )
-			.toggleClass( "ui-corner-right", value === this.options.max )
-			.width( percentage.toFixed(0) + "%" );
-		this.element.attr( "aria-valuenow", value );
-		
-		//$(this.element).find(".ui-progressbar-label").html(value + "%");
-	},
-	
-	set: function(key, value){
-		this._setOption(key, value);
-	}
-};
-
-})( jQuery );
\ No newline at end of file
+})(jQuery);
diff --git a/len-activiti/src/main/resources/static/diagram-viewer/js/jstools.js b/len-activiti/src/main/resources/static/diagram-viewer/js/jstools.js
index d0c2829..74b6f33 100644
--- a/len-activiti/src/main/resources/static/diagram-viewer/js/jstools.js
+++ b/len-activiti/src/main/resources/static/diagram-viewer/js/jstools.js
@@ -1,23 +1,29 @@
-if (typeof(console) == "undefined") {
-  var console = {
-    info: function(){},
-    warn: function(){},
-    error: function(){},
-    log: function(){},
-    time: function(){},
-    timeEnd: function(){}
-  };
+if (typeof (console) == "undefined") {
+	var console = {
+		info: function () {
+		},
+		warn: function () {
+		},
+		error: function () {
+		},
+		log: function () {
+		},
+		time: function () {
+		},
+		timeEnd: function () {
+		}
+	};
 }
 
-if(!Array.isArray) {
-  Array.isArray = function (vArg) {
-    return Object.prototype.toString.call(vArg) === "[object Array]";
-  };
+if (!Array.isArray) {
+	Array.isArray = function (vArg) {
+		return Object.prototype.toString.call(vArg) === "[object Array]";
+	};
 }
 
 if (!Object.isSVGElement) {
-  Object.isSVGElement = function(vArg) {
-  var str = Object.prototype.toString.call(vArg);
-  return (str.indexOf("[object SVG") == 0);
-  };
+	Object.isSVGElement = function (vArg) {
+		var str = Object.prototype.toString.call(vArg);
+		return (str.indexOf("[object SVG") == 0);
+	};
 }
diff --git a/len-activiti/src/main/resources/static/diagram-viewer/js/raphael_uncompressed.js b/len-activiti/src/main/resources/static/diagram-viewer/js/raphael_uncompressed.js
index d03dcf6..0e9fd26 100644
--- a/len-activiti/src/main/resources/static/diagram-viewer/js/raphael_uncompressed.js
+++ b/len-activiti/src/main/resources/static/diagram-viewer/js/raphael_uncompressed.js
@@ -15,211 +15,214 @@
 // └──────────────────────────────────────────────────────────────────────────────────────┘ \\
 
 (function (glob) {
-    var version = "0.3.4",
-        has = "hasOwnProperty",
-        separator = /[\.\/]/,
-        wildcard = "*",
-        fun = function () {},
-        numsort = function (a, b) {
-            return a - b;
-        },
-        current_event,
-        stop,
-        events = {n: {}},
-    
-        eve = function (name, scope) {
-            var e = events,
-                oldstop = stop,
-                args = Array.prototype.slice.call(arguments, 2),
-                listeners = eve.listeners(name),
-                z = 0,
-                f = false,
-                l,
-                indexed = [],
-                queue = {},
-                out = [],
-                ce = current_event,
-                errors = [];
-            current_event = name;
-            stop = 0;
-            for (var i = 0, ii = listeners.length; i < ii; i++) if ("zIndex" in listeners[i]) {
-                indexed.push(listeners[i].zIndex);
-                if (listeners[i].zIndex < 0) {
-                    queue[listeners[i].zIndex] = listeners[i];
-                }
-            }
-            indexed.sort(numsort);
-            while (indexed[z] < 0) {
-                l = queue[indexed[z++]];
-                out.push(l.apply(scope, args));
-                if (stop) {
-                    stop = oldstop;
-                    return out;
-                }
-            }
-            for (i = 0; i < ii; i++) {
-                l = listeners[i];
-                if ("zIndex" in l) {
-                    if (l.zIndex == indexed[z]) {
-                        out.push(l.apply(scope, args));
-                        if (stop) {
-                            break;
-                        }
-                        do {
-                            z++;
-                            l = queue[indexed[z]];
-                            l && out.push(l.apply(scope, args));
-                            if (stop) {
-                                break;
-                            }
-                        } while (l)
-                    } else {
-                        queue[l.zIndex] = l;
-                    }
-                } else {
-                    out.push(l.apply(scope, args));
-                    if (stop) {
-                        break;
-                    }
-                }
-            }
-            stop = oldstop;
-            current_event = ce;
-            return out.length ? out : null;
-        };
-    
-    eve.listeners = function (name) {
-        var names = name.split(separator),
-            e = events,
-            item,
-            items,
-            k,
-            i,
-            ii,
-            j,
-            jj,
-            nes,
-            es = [e],
-            out = [];
-        for (i = 0, ii = names.length; i < ii; i++) {
-            nes = [];
-            for (j = 0, jj = es.length; j < jj; j++) {
-                e = es[j].n;
-                items = [e[names[i]], e[wildcard]];
-                k = 2;
-                while (k--) {
-                    item = items[k];
-                    if (item) {
-                        nes.push(item);
-                        out = out.concat(item.f || []);
-                    }
-                }
-            }
-            es = nes;
-        }
-        return out;
-    };
-    
-    
-    eve.on = function (name, f) {
-        var names = name.split(separator),
-            e = events;
-        for (var i = 0, ii = names.length; i < ii; i++) {
-            e = e.n;
-            !e[names[i]] && (e[names[i]] = {n: {}});
-            e = e[names[i]];
-        }
-        e.f = e.f || [];
-        for (i = 0, ii = e.f.length; i < ii; i++) if (e.f[i] == f) {
-            return fun;
-        }
-        e.f.push(f);
-        return function (zIndex) {
-            if (+zIndex == +zIndex) {
-                f.zIndex = +zIndex;
-            }
-        };
-    };
-    
-    eve.stop = function () {
-        stop = 1;
-    };
-    
-    eve.nt = function (subname) {
-        if (subname) {
-            return new RegExp("(?:\\.|\\/|^)" + subname + "(?:\\.|\\/|$)").test(current_event);
-        }
-        return current_event;
-    };
-    
-    
-    eve.off = eve.unbind = function (name, f) {
-        var names = name.split(separator),
-            e,
-            key,
-            splice,
-            i, ii, j, jj,
-            cur = [events];
-        for (i = 0, ii = names.length; i < ii; i++) {
-            for (j = 0; j < cur.length; j += splice.length - 2) {
-                splice = [j, 1];
-                e = cur[j].n;
-                if (names[i] != wildcard) {
-                    if (e[names[i]]) {
-                        splice.push(e[names[i]]);
-                    }
-                } else {
-                    for (key in e) if (e[has](key)) {
-                        splice.push(e[key]);
-                    }
-                }
-                cur.splice.apply(cur, splice);
-            }
-        }
-        for (i = 0, ii = cur.length; i < ii; i++) {
-            e = cur[i];
-            while (e.n) {
-                if (f) {
-                    if (e.f) {
-                        for (j = 0, jj = e.f.length; j < jj; j++) if (e.f[j] == f) {
-                            e.f.splice(j, 1);
-                            break;
-                        }
-                        !e.f.length && delete e.f;
-                    }
-                    for (key in e.n) if (e.n[has](key) && e.n[key].f) {
-                        var funcs = e.n[key].f;
-                        for (j = 0, jj = funcs.length; j < jj; j++) if (funcs[j] == f) {
-                            funcs.splice(j, 1);
-                            break;
-                        }
-                        !funcs.length && delete e.n[key].f;
-                    }
-                } else {
-                    delete e.f;
-                    for (key in e.n) if (e.n[has](key) && e.n[key].f) {
-                        delete e.n[key].f;
-                    }
-                }
-                e = e.n;
-            }
-        }
-    };
-    
-    eve.once = function (name, f) {
-        var f2 = function () {
-            var res = f.apply(this, arguments);
-            eve.unbind(name, f2);
-            return res;
-        };
-        return eve.on(name, f2);
-    };
-    
-    eve.version = version;
-    eve.toString = function () {
-        return "You are running Eve " + version;
-    };
-    (typeof module != "undefined" && module.exports) ? (module.exports = eve) : (typeof define != "undefined" ? (define("eve", [], function() { return eve; })) : (glob.eve = eve));
+	var version = "0.3.4",
+		has = "hasOwnProperty",
+		separator = /[\.\/]/,
+		wildcard = "*",
+		fun = function () {
+		},
+		numsort = function (a, b) {
+			return a - b;
+		},
+		current_event,
+		stop,
+		events = {n: {}},
+
+		eve = function (name, scope) {
+			var e = events,
+				oldstop = stop,
+				args = Array.prototype.slice.call(arguments, 2),
+				listeners = eve.listeners(name),
+				z = 0,
+				f = false,
+				l,
+				indexed = [],
+				queue = {},
+				out = [],
+				ce = current_event,
+				errors = [];
+			current_event = name;
+			stop = 0;
+			for (var i = 0, ii = listeners.length; i < ii; i++) if ("zIndex" in listeners[i]) {
+				indexed.push(listeners[i].zIndex);
+				if (listeners[i].zIndex < 0) {
+					queue[listeners[i].zIndex] = listeners[i];
+				}
+			}
+			indexed.sort(numsort);
+			while (indexed[z] < 0) {
+				l = queue[indexed[z++]];
+				out.push(l.apply(scope, args));
+				if (stop) {
+					stop = oldstop;
+					return out;
+				}
+			}
+			for (i = 0; i < ii; i++) {
+				l = listeners[i];
+				if ("zIndex" in l) {
+					if (l.zIndex == indexed[z]) {
+						out.push(l.apply(scope, args));
+						if (stop) {
+							break;
+						}
+						do {
+							z++;
+							l = queue[indexed[z]];
+							l && out.push(l.apply(scope, args));
+							if (stop) {
+								break;
+							}
+						} while (l)
+					} else {
+						queue[l.zIndex] = l;
+					}
+				} else {
+					out.push(l.apply(scope, args));
+					if (stop) {
+						break;
+					}
+				}
+			}
+			stop = oldstop;
+			current_event = ce;
+			return out.length ? out : null;
+		};
+
+	eve.listeners = function (name) {
+		var names = name.split(separator),
+			e = events,
+			item,
+			items,
+			k,
+			i,
+			ii,
+			j,
+			jj,
+			nes,
+			es = [e],
+			out = [];
+		for (i = 0, ii = names.length; i < ii; i++) {
+			nes = [];
+			for (j = 0, jj = es.length; j < jj; j++) {
+				e = es[j].n;
+				items = [e[names[i]], e[wildcard]];
+				k = 2;
+				while (k--) {
+					item = items[k];
+					if (item) {
+						nes.push(item);
+						out = out.concat(item.f || []);
+					}
+				}
+			}
+			es = nes;
+		}
+		return out;
+	};
+
+
+	eve.on = function (name, f) {
+		var names = name.split(separator),
+			e = events;
+		for (var i = 0, ii = names.length; i < ii; i++) {
+			e = e.n;
+			!e[names[i]] && (e[names[i]] = {n: {}});
+			e = e[names[i]];
+		}
+		e.f = e.f || [];
+		for (i = 0, ii = e.f.length; i < ii; i++) if (e.f[i] == f) {
+			return fun;
+		}
+		e.f.push(f);
+		return function (zIndex) {
+			if (+zIndex == +zIndex) {
+				f.zIndex = +zIndex;
+			}
+		};
+	};
+
+	eve.stop = function () {
+		stop = 1;
+	};
+
+	eve.nt = function (subname) {
+		if (subname) {
+			return new RegExp("(?:\\.|\\/|^)" + subname + "(?:\\.|\\/|$)").test(current_event);
+		}
+		return current_event;
+	};
+
+
+	eve.off = eve.unbind = function (name, f) {
+		var names = name.split(separator),
+			e,
+			key,
+			splice,
+			i, ii, j, jj,
+			cur = [events];
+		for (i = 0, ii = names.length; i < ii; i++) {
+			for (j = 0; j < cur.length; j += splice.length - 2) {
+				splice = [j, 1];
+				e = cur[j].n;
+				if (names[i] != wildcard) {
+					if (e[names[i]]) {
+						splice.push(e[names[i]]);
+					}
+				} else {
+					for (key in e) if (e[has](key)) {
+						splice.push(e[key]);
+					}
+				}
+				cur.splice.apply(cur, splice);
+			}
+		}
+		for (i = 0, ii = cur.length; i < ii; i++) {
+			e = cur[i];
+			while (e.n) {
+				if (f) {
+					if (e.f) {
+						for (j = 0, jj = e.f.length; j < jj; j++) if (e.f[j] == f) {
+							e.f.splice(j, 1);
+							break;
+						}
+						!e.f.length && delete e.f;
+					}
+					for (key in e.n) if (e.n[has](key) && e.n[key].f) {
+						var funcs = e.n[key].f;
+						for (j = 0, jj = funcs.length; j < jj; j++) if (funcs[j] == f) {
+							funcs.splice(j, 1);
+							break;
+						}
+						!funcs.length && delete e.n[key].f;
+					}
+				} else {
+					delete e.f;
+					for (key in e.n) if (e.n[has](key) && e.n[key].f) {
+						delete e.n[key].f;
+					}
+				}
+				e = e.n;
+			}
+		}
+	};
+
+	eve.once = function (name, f) {
+		var f2 = function () {
+			var res = f.apply(this, arguments);
+			eve.unbind(name, f2);
+			return res;
+		};
+		return eve.on(name, f2);
+	};
+
+	eve.version = version;
+	eve.toString = function () {
+		return "You are running Eve " + version;
+	};
+	(typeof module != "undefined" && module.exports) ? (module.exports = eve) : (typeof define != "undefined" ? (define("eve", [], function () {
+		return eve;
+	})) : (glob.eve = eve));
 })(this);
 
 
@@ -231,3515 +234,3536 @@
 // │ Licensed under the MIT (http://raphaeljs.com/license.html) license. │ \\
 // └─────────────────────────────────────────────────────────────────────┘ \\
 (function () {
-    
-    function R(first) {
-        if (R.is(first, "function")) {
-            return loaded ? first() : eve.on("raphael.DOMload", first);
-        } else if (R.is(first, array)) {
-            return R._engine.create[apply](R, first.splice(0, 3 + R.is(first[0], nu))).add(first);
-        } else {
-            var args = Array.prototype.slice.call(arguments, 0);
-            if (R.is(args[args.length - 1], "function")) {
-                var f = args.pop();
-                return loaded ? f.call(R._engine.create[apply](R, args)) : eve.on("raphael.DOMload", function () {
-                    f.call(R._engine.create[apply](R, args));
-                });
-            } else {
-                return R._engine.create[apply](R, arguments);
-            }
-        }
-    }
-    R.version = "2.1.0";
-    R.eve = eve;
-    var loaded,
-        separator = /[, ]+/,
-        elements = {circle: 1, rect: 1, path: 1, ellipse: 1, text: 1, image: 1},
-        formatrg = /\{(\d+)\}/g,
-        proto = "prototype",
-        has = "hasOwnProperty",
-        g = {
-            doc: document,
-            win: window
-        },
-        oldRaphael = {
-            was: Object.prototype[has].call(g.win, "Raphael"),
-            is: g.win.Raphael
-        },
-        Paper = function () {
-            
-            
-            this.ca = this.customAttributes = {};
-        },
-        paperproto,
-        appendChild = "appendChild",
-        apply = "apply",
-        concat = "concat",
-        supportsTouch = "createTouch" in g.doc,
-        E = "",
-        S = " ",
-        Str = String,
-        split = "split",
-        events = "click dblclick mousedown mousemove mouseout mouseover mouseup touchstart touchmove touchend touchcancel"[split](S),
-        touchMap = {
-            mousedown: "touchstart",
-            mousemove: "touchmove",
-            mouseup: "touchend"
-        },
-        lowerCase = Str.prototype.toLowerCase,
-        math = Math,
-        mmax = math.max,
-        mmin = math.min,
-        abs = math.abs,
-        pow = math.pow,
-        PI = math.PI,
-        nu = "number",
-        string = "string",
-        array = "array",
-        toString = "toString",
-        fillString = "fill",
-        objectToString = Object.prototype.toString,
-        paper = {},
-        push = "push",
-        ISURL = R._ISURL = /^url\(['"]?([^\)]+?)['"]?\)$/i,
-        colourRegExp = /^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgba?\(\s*([\d\.]+%?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+%?(?:\s*,\s*[\d\.]+%?)?)\s*\)|hsba?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\)|hsla?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\))\s*$/i,
-        isnan = {"NaN": 1, "Infinity": 1, "-Infinity": 1},
-        bezierrg = /^(?:cubic-)?bezier\(([^,]+),([^,]+),([^,]+),([^\)]+)\)/,
-        round = math.round,
-        setAttribute = "setAttribute",
-        toFloat = parseFloat,
-        toInt = parseInt,
-        upperCase = Str.prototype.toUpperCase,
-        availableAttrs = R._availableAttrs = {
-            "arrow-end": "none",
-            "arrow-start": "none",
-            blur: 0,
-            "clip-rect": "0 0 1e9 1e9",
-            cursor: "default",
-            cx: 0,
-            cy: 0,
-            fill: "#fff",
-            "fill-opacity": 1,
-            font: '10px "Arial"',
-            "font-family": '"Arial"',
-            "font-size": "10",
-            "font-style": "normal",
-            "font-weight": 400,
-            gradient: 0,
-            height: 0,
-            href: "http://raphaeljs.com/",
-            "letter-spacing": 0,
-            opacity: 1,
-            path: "M0,0",
-            r: 0,
-            rx: 0,
-            ry: 0,
-            src: "",
-            stroke: "#000",
-            "stroke-dasharray": "",
-            "stroke-linecap": "butt",
-            "stroke-linejoin": "butt",
-            "stroke-miterlimit": 0,
-            "stroke-opacity": 1,
-            "stroke-width": 1,
-            target: "_blank",
-            "text-anchor": "middle",
-            title: "Raphael",
-            transform: "",
-            width: 0,
-            x: 0,
-            y: 0
-        },
-        availableAnimAttrs = R._availableAnimAttrs = {
-            blur: nu,
-            "clip-rect": "csv",
-            cx: nu,
-            cy: nu,
-            fill: "colour",
-            "fill-opacity": nu,
-            "font-size": nu,
-            height: nu,
-            opacity: nu,
-            path: "path",
-            r: nu,
-            rx: nu,
-            ry: nu,
-            stroke: "colour",
-            "stroke-opacity": nu,
-            "stroke-width": nu,
-            transform: "transform",
-            width: nu,
-            x: nu,
-            y: nu
-        },
-        whitespace = /[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]/g,
-        commaSpaces = /[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*/,
-        hsrg = {hs: 1, rg: 1},
-        p2s = /,?([achlmqrstvxz]),?/gi,
-        pathCommand = /([achlmrqstvz])[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029,]*((-?\d*\.?\d*(?:e[\-+]?\d+)?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*)+)/ig,
-        tCommand = /([rstm])[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029,]*((-?\d*\.?\d*(?:e[\-+]?\d+)?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*)+)/ig,
-        pathValues = /(-?\d*\.?\d*(?:e[\-+]?\d+)?)[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*/ig,
-        radial_gradient = R._radial_gradient = /^r(?:\(([^,]+?)[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*([^\)]+?)\))?/,
-        eldata = {},
-        sortByKey = function (a, b) {
-            return a.key - b.key;
-        },
-        sortByNumber = function (a, b) {
-            return toFloat(a) - toFloat(b);
-        },
-        fun = function () {},
-        pipe = function (x) {
-            return x;
-        },
-        rectPath = R._rectPath = function (x, y, w, h, r) {
-            if (r) {
-                return [["M", x + r, y], ["l", w - r * 2, 0], ["a", r, r, 0, 0, 1, r, r], ["l", 0, h - r * 2], ["a", r, r, 0, 0, 1, -r, r], ["l", r * 2 - w, 0], ["a", r, r, 0, 0, 1, -r, -r], ["l", 0, r * 2 - h], ["a", r, r, 0, 0, 1, r, -r], ["z"]];
-            }
-            return [["M", x, y], ["l", w, 0], ["l", 0, h], ["l", -w, 0], ["z"]];
-        },
-        ellipsePath = function (x, y, rx, ry) {
-            if (ry == null) {
-                ry = rx;
-            }
-            return [["M", x, y], ["m", 0, -ry], ["a", rx, ry, 0, 1, 1, 0, 2 * ry], ["a", rx, ry, 0, 1, 1, 0, -2 * ry], ["z"]];
-        },
-        getPath = R._getPath = {
-            path: function (el) {
-                return el.attr("path");
-            },
-            circle: function (el) {
-                var a = el.attrs;
-                return ellipsePath(a.cx, a.cy, a.r);
-            },
-            ellipse: function (el) {
-                var a = el.attrs;
-                return ellipsePath(a.cx, a.cy, a.rx, a.ry);
-            },
-            rect: function (el) {
-                var a = el.attrs;
-                return rectPath(a.x, a.y, a.width, a.height, a.r);
-            },
-            image: function (el) {
-                var a = el.attrs;
-                return rectPath(a.x, a.y, a.width, a.height);
-            },
-            text: function (el) {
-                var bbox = el._getBBox();
-                return rectPath(bbox.x, bbox.y, bbox.width, bbox.height);
-            }
-        },
-        
-        mapPath = R.mapPath = function (path, matrix) {
-            if (!matrix) {
-                return path;
-            }
-            var x, y, i, j, ii, jj, pathi;
-            path = path2curve(path);
-            for (i = 0, ii = path.length; i < ii; i++) {
-                pathi = path[i];
-                for (j = 1, jj = pathi.length; j < jj; j += 2) {
-                    x = matrix.x(pathi[j], pathi[j + 1]);
-                    y = matrix.y(pathi[j], pathi[j + 1]);
-                    pathi[j] = x;
-                    pathi[j + 1] = y;
-                }
-            }
-            return path;
-        };
-
-    R._g = g;
-    
-    R.type = (g.win.SVGAngle || g.doc.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1") ? "SVG" : "VML");
-    if (R.type == "VML") {
-        var d = g.doc.createElement("div"),
-            b;
-        d.innerHTML = '<v:shape adj="1"/>';
-        b = d.firstChild;
-        b.style.behavior = "url(#default#VML)";
-        if (!(b && typeof b.adj == "object")) {
-            return (R.type = E);
-        }
-        d = null;
-    }
-    
-    
-    R.svg = !(R.vml = R.type == "VML");
-    R._Paper = Paper;
-    
-    R.fn = paperproto = Paper.prototype = R.prototype;
-    R._id = 0;
-    R._oid = 0;
-    
-    R.is = function (o, type) {
-        type = lowerCase.call(type);
-        if (type == "finite") {
-            return !isnan[has](+o);
-        }
-        if (type == "array") {
-            return o instanceof Array;
-        }
-        return  (type == "null" && o === null) ||
-                (type == typeof o && o !== null) ||
-                (type == "object" && o === Object(o)) ||
-                (type == "array" && Array.isArray && Array.isArray(o)) ||
-                objectToString.call(o).slice(8, -1).toLowerCase() == type;
-    };
-
-    function clone(obj) {
-        if (Object(obj) !== obj) {
-            return obj;
-        }
-        var res = new obj.constructor;
-        for (var key in obj) if (obj[has](key)) {
-            res[key] = clone(obj[key]);
-        }
-        return res;
-    }
-
-    
-    R.angle = function (x1, y1, x2, y2, x3, y3) {
-        if (x3 == null) {
-            var x = x1 - x2,
-                y = y1 - y2;
-            if (!x && !y) {
-                return 0;
-            }
-            return (180 + math.atan2(-y, -x) * 180 / PI + 360) % 360;
-        } else {
-            return R.angle(x1, y1, x3, y3) - R.angle(x2, y2, x3, y3);
-        }
-    };
-    
-    R.rad = function (deg) {
-        return deg % 360 * PI / 180;
-    };
-    
-    R.deg = function (rad) {
-        return rad * 180 / PI % 360;
-    };
-    
-    R.snapTo = function (values, value, tolerance) {
-        tolerance = R.is(tolerance, "finite") ? tolerance : 10;
-        if (R.is(values, array)) {
-            var i = values.length;
-            while (i--) if (abs(values[i] - value) <= tolerance) {
-                return values[i];
-            }
-        } else {
-            values = +values;
-            var rem = value % values;
-            if (rem < tolerance) {
-                return value - rem;
-            }
-            if (rem > values - tolerance) {
-                return value - rem + values;
-            }
-        }
-        return value;
-    };
-    
-    
-    var createUUID = R.createUUID = (function (uuidRegEx, uuidReplacer) {
-        return function () {
-            return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(uuidRegEx, uuidReplacer).toUpperCase();
-        };
-    })(/[xy]/g, function (c) {
-        var r = math.random() * 16 | 0,
-            v = c == "x" ? r : (r & 3 | 8);
-        return v.toString(16);
-    });
-
-    
-    R.setWindow = function (newwin) {
-        eve("raphael.setWindow", R, g.win, newwin);
-        g.win = newwin;
-        g.doc = g.win.document;
-        if (R._engine.initWin) {
-            R._engine.initWin(g.win);
-        }
-    };
-    var toHex = function (color) {
-        if (R.vml) {
-            // http://dean.edwards.name/weblog/2009/10/convert-any-colour-value-to-hex-in-msie/
-            var trim = /^\s+|\s+$/g;
-            var bod;
-            try {
-                var docum = new ActiveXObject("htmlfile");
-                docum.write("<body>");
-                docum.close();
-                bod = docum.body;
-            } catch(e) {
-                bod = createPopup().document.body;
-            }
-            var range = bod.createTextRange();
-            toHex = cacher(function (color) {
-                try {
-                    bod.style.color = Str(color).replace(trim, E);
-                    var value = range.queryCommandValue("ForeColor");
-                    value = ((value & 255) << 16) | (value & 65280) | ((value & 16711680) >>> 16);
-                    return "#" + ("000000" + value.toString(16)).slice(-6);
-                } catch(e) {
-                    return "none";
-                }
-            });
-        } else {
-            var i = g.doc.createElement("i");
-            i.title = "Rapha\xebl Colour Picker";
-            i.style.display = "none";
-            g.doc.body.appendChild(i);
-            toHex = cacher(function (color) {
-                i.style.color = color;
-                return g.doc.defaultView.getComputedStyle(i, E).getPropertyValue("color");
-            });
-        }
-        return toHex(color);
-    },
-    hsbtoString = function () {
-        return "hsb(" + [this.h, this.s, this.b] + ")";
-    },
-    hsltoString = function () {
-        return "hsl(" + [this.h, this.s, this.l] + ")";
-    },
-    rgbtoString = function () {
-        return this.hex;
-    },
-    prepareRGB = function (r, g, b) {
-        if (g == null && R.is(r, "object") && "r" in r && "g" in r && "b" in r) {
-            b = r.b;
-            g = r.g;
-            r = r.r;
-        }
-        if (g == null && R.is(r, string)) {
-            var clr = R.getRGB(r);
-            r = clr.r;
-            g = clr.g;
-            b = clr.b;
-        }
-        if (r > 1 || g > 1 || b > 1) {
-            r /= 255;
-            g /= 255;
-            b /= 255;
-        }
-        
-        return [r, g, b];
-    },
-    packageRGB = function (r, g, b, o) {
-        r *= 255;
-        g *= 255;
-        b *= 255;
-        var rgb = {
-            r: r,
-            g: g,
-            b: b,
-            hex: R.rgb(r, g, b),
-            toString: rgbtoString
-        };
-        R.is(o, "finite") && (rgb.opacity = o);
-        return rgb;
-    };
-    
-    
-    R.color = function (clr) {
-        var rgb;
-        if (R.is(clr, "object") && "h" in clr && "s" in clr && "b" in clr) {
-            rgb = R.hsb2rgb(clr);
-            clr.r = rgb.r;
-            clr.g = rgb.g;
-            clr.b = rgb.b;
-            clr.hex = rgb.hex;
-        } else if (R.is(clr, "object") && "h" in clr && "s" in clr && "l" in clr) {
-            rgb = R.hsl2rgb(clr);
-            clr.r = rgb.r;
-            clr.g = rgb.g;
-            clr.b = rgb.b;
-            clr.hex = rgb.hex;
-        } else {
-            if (R.is(clr, "string")) {
-                clr = R.getRGB(clr);
-            }
-            if (R.is(clr, "object") && "r" in clr && "g" in clr && "b" in clr) {
-                rgb = R.rgb2hsl(clr);
-                clr.h = rgb.h;
-                clr.s = rgb.s;
-                clr.l = rgb.l;
-                rgb = R.rgb2hsb(clr);
-                clr.v = rgb.b;
-            } else {
-                clr = {hex: "none"};
-                clr.r = clr.g = clr.b = clr.h = clr.s = clr.v = clr.l = -1;
-            }
-        }
-        clr.toString = rgbtoString;
-        return clr;
-    };
-    
-    R.hsb2rgb = function (h, s, v, o) {
-        if (this.is(h, "object") && "h" in h && "s" in h && "b" in h) {
-            v = h.b;
-            s = h.s;
-            h = h.h;
-            o = h.o;
-        }
-        h *= 360;
-        var R, G, B, X, C;
-        h = (h % 360) / 60;
-        C = v * s;
-        X = C * (1 - abs(h % 2 - 1));
-        R = G = B = v - C;
-
-        h = ~~h;
-        R += [C, X, 0, 0, X, C][h];
-        G += [X, C, C, X, 0, 0][h];
-        B += [0, 0, X, C, C, X][h];
-        return packageRGB(R, G, B, o);
-    };
-    
-    R.hsl2rgb = function (h, s, l, o) {
-        if (this.is(h, "object") && "h" in h && "s" in h && "l" in h) {
-            l = h.l;
-            s = h.s;
-            h = h.h;
-        }
-        if (h > 1 || s > 1 || l > 1) {
-            h /= 360;
-            s /= 100;
-            l /= 100;
-        }
-        h *= 360;
-        var R, G, B, X, C;
-        h = (h % 360) / 60;
-        C = 2 * s * (l < .5 ? l : 1 - l);
-        X = C * (1 - abs(h % 2 - 1));
-        R = G = B = l - C / 2;
-
-        h = ~~h;
-        R += [C, X, 0, 0, X, C][h];
-        G += [X, C, C, X, 0, 0][h];
-        B += [0, 0, X, C, C, X][h];
-        return packageRGB(R, G, B, o);
-    };
-    
-    R.rgb2hsb = function (r, g, b) {
-        b = prepareRGB(r, g, b);
-        r = b[0];
-        g = b[1];
-        b = b[2];
-
-        var H, S, V, C;
-        V = mmax(r, g, b);
-        C = V - mmin(r, g, b);
-        H = (C == 0 ? null :
-             V == r ? (g - b) / C :
-             V == g ? (b - r) / C + 2 :
-                      (r - g) / C + 4
-            );
-        H = ((H + 360) % 6) * 60 / 360;
-        S = C == 0 ? 0 : C / V;
-        return {h: H, s: S, b: V, toString: hsbtoString};
-    };
-    
-    R.rgb2hsl = function (r, g, b) {
-        b = prepareRGB(r, g, b);
-        r = b[0];
-        g = b[1];
-        b = b[2];
-
-        var H, S, L, M, m, C;
-        M = mmax(r, g, b);
-        m = mmin(r, g, b);
-        C = M - m;
-        H = (C == 0 ? null :
-             M == r ? (g - b) / C :
-             M == g ? (b - r) / C + 2 :
-                      (r - g) / C + 4);
-        H = ((H + 360) % 6) * 60 / 360;
-        L = (M + m) / 2;
-        S = (C == 0 ? 0 :
-             L < .5 ? C / (2 * L) :
-                      C / (2 - 2 * L));
-        return {h: H, s: S, l: L, toString: hsltoString};
-    };
-    R._path2string = function () {
-        return this.join(",").replace(p2s, "$1");
-    };
-    function repush(array, item) {
-        for (var i = 0, ii = array.length; i < ii; i++) if (array[i] === item) {
-            return array.push(array.splice(i, 1)[0]);
-        }
-    }
-    function cacher(f, scope, postprocessor) {
-        function newf() {
-            var arg = Array.prototype.slice.call(arguments, 0),
-                args = arg.join("\u2400"),
-                cache = newf.cache = newf.cache || {},
-                count = newf.count = newf.count || [];
-            if (cache[has](args)) {
-                repush(count, args);
-                return postprocessor ? postprocessor(cache[args]) : cache[args];
-            }
-            count.length >= 1e3 && delete cache[count.shift()];
-            count.push(args);
-            cache[args] = f[apply](scope, arg);
-            return postprocessor ? postprocessor(cache[args]) : cache[args];
-        }
-        return newf;
-    }
-
-    var preload = R._preload = function (src, f) {
-        var img = g.doc.createElement("img");
-        img.style.cssText = "position:absolute;left:-9999em;top:-9999em";
-        img.onload = function () {
-            f.call(this);
-            this.onload = null;
-            g.doc.body.removeChild(this);
-        };
-        img.onerror = function () {
-            g.doc.body.removeChild(this);
-        };
-        g.doc.body.appendChild(img);
-        img.src = src;
-    };
-    
-    function clrToString() {
-        return this.hex;
-    }
-
-    
-    R.getRGB = cacher(function (colour) {
-        if (!colour || !!((colour = Str(colour)).indexOf("-") + 1)) {
-            return {r: -1, g: -1, b: -1, hex: "none", error: 1, toString: clrToString};
-        }
-        if (colour == "none") {
-            return {r: -1, g: -1, b: -1, hex: "none", toString: clrToString};
-        }
-        !(hsrg[has](colour.toLowerCase().substring(0, 2)) || colour.charAt() == "#") && (colour = toHex(colour));
-        var res,
-            red,
-            green,
-            blue,
-            opacity,
-            t,
-            values,
-            rgb = colour.match(colourRegExp);
-        if (rgb) {
-            if (rgb[2]) {
-                blue = toInt(rgb[2].substring(5), 16);
-                green = toInt(rgb[2].substring(3, 5), 16);
-                red = toInt(rgb[2].substring(1, 3), 16);
-            }
-            if (rgb[3]) {
-                blue = toInt((t = rgb[3].charAt(3)) + t, 16);
-                green = toInt((t = rgb[3].charAt(2)) + t, 16);
-                red = toInt((t = rgb[3].charAt(1)) + t, 16);
-            }
-            if (rgb[4]) {
-                values = rgb[4][split](commaSpaces);
-                red = toFloat(values[0]);
-                values[0].slice(-1) == "%" && (red *= 2.55);
-                green = toFloat(values[1]);
-                values[1].slice(-1) == "%" && (green *= 2.55);
-                blue = toFloat(values[2]);
-                values[2].slice(-1) == "%" && (blue *= 2.55);
-                rgb[1].toLowerCase().slice(0, 4) == "rgba" && (opacity = toFloat(values[3]));
-                values[3] && values[3].slice(-1) == "%" && (opacity /= 100);
-            }
-            if (rgb[5]) {
-                values = rgb[5][split](commaSpaces);
-                red = toFloat(values[0]);
-                values[0].slice(-1) == "%" && (red *= 2.55);
-                green = toFloat(values[1]);
-                values[1].slice(-1) == "%" && (green *= 2.55);
-                blue = toFloat(values[2]);
-                values[2].slice(-1) == "%" && (blue *= 2.55);
-                (values[0].slice(-3) == "deg" || values[0].slice(-1) == "\xb0") && (red /= 360);
-                rgb[1].toLowerCase().slice(0, 4) == "hsba" && (opacity = toFloat(values[3]));
-                values[3] && values[3].slice(-1) == "%" && (opacity /= 100);
-                return R.hsb2rgb(red, green, blue, opacity);
-            }
-            if (rgb[6]) {
-                values = rgb[6][split](commaSpaces);
-                red = toFloat(values[0]);
-                values[0].slice(-1) == "%" && (red *= 2.55);
-                green = toFloat(values[1]);
-                values[1].slice(-1) == "%" && (green *= 2.55);
-                blue = toFloat(values[2]);
-                values[2].slice(-1) == "%" && (blue *= 2.55);
-                (values[0].slice(-3) == "deg" || values[0].slice(-1) == "\xb0") && (red /= 360);
-                rgb[1].toLowerCase().slice(0, 4) == "hsla" && (opacity = toFloat(values[3]));
-                values[3] && values[3].slice(-1) == "%" && (opacity /= 100);
-                return R.hsl2rgb(red, green, blue, opacity);
-            }
-            rgb = {r: red, g: green, b: blue, toString: clrToString};
-            rgb.hex = "#" + (16777216 | blue | (green << 8) | (red << 16)).toString(16).slice(1);
-            R.is(opacity, "finite") && (rgb.opacity = opacity);
-            return rgb;
-        }
-        return {r: -1, g: -1, b: -1, hex: "none", error: 1, toString: clrToString};
-    }, R);
-    
-    R.hsb = cacher(function (h, s, b) {
-        return R.hsb2rgb(h, s, b).hex;
-    });
-    
-    R.hsl = cacher(function (h, s, l) {
-        return R.hsl2rgb(h, s, l).hex;
-    });
-    
-    R.rgb = cacher(function (r, g, b) {
-        return "#" + (16777216 | b | (g << 8) | (r << 16)).toString(16).slice(1);
-    });
-    
-    R.getColor = function (value) {
-        var start = this.getColor.start = this.getColor.start || {h: 0, s: 1, b: value || .75},
-            rgb = this.hsb2rgb(start.h, start.s, start.b);
-        start.h += .075;
-        if (start.h > 1) {
-            start.h = 0;
-            start.s -= .2;
-            start.s <= 0 && (this.getColor.start = {h: 0, s: 1, b: start.b});
-        }
-        return rgb.hex;
-    };
-    
-    R.getColor.reset = function () {
-        delete this.start;
-    };
-
-    // http://schepers.cc/getting-to-the-point
-    function catmullRom2bezier(crp, z) {
-        var d = [];
-        for (var i = 0, iLen = crp.length; iLen - 2 * !z > i; i += 2) {
-            var p = [
-                        {x: +crp[i - 2], y: +crp[i - 1]},
-                        {x: +crp[i],     y: +crp[i + 1]},
-                        {x: +crp[i + 2], y: +crp[i + 3]},
-                        {x: +crp[i + 4], y: +crp[i + 5]}
-                    ];
-            if (z) {
-                if (!i) {
-                    p[0] = {x: +crp[iLen - 2], y: +crp[iLen - 1]};
-                } else if (iLen - 4 == i) {
-                    p[3] = {x: +crp[0], y: +crp[1]};
-                } else if (iLen - 2 == i) {
-                    p[2] = {x: +crp[0], y: +crp[1]};
-                    p[3] = {x: +crp[2], y: +crp[3]};
-                }
-            } else {
-                if (iLen - 4 == i) {
-                    p[3] = p[2];
-                } else if (!i) {
-                    p[0] = {x: +crp[i], y: +crp[i + 1]};
-                }
-            }
-            d.push(["C",
-                  (-p[0].x + 6 * p[1].x + p[2].x) / 6,
-                  (-p[0].y + 6 * p[1].y + p[2].y) / 6,
-                  (p[1].x + 6 * p[2].x - p[3].x) / 6,
-                  (p[1].y + 6*p[2].y - p[3].y) / 6,
-                  p[2].x,
-                  p[2].y
-            ]);
-        }
-
-        return d;
-    }
-    
-    R.parsePathString = function (pathString) {
-        if (!pathString) {
-            return null;
-        }
-        var pth = paths(pathString);
-        if (pth.arr) {
-            return pathClone(pth.arr);
-        }
-        
-        var paramCounts = {a: 7, c: 6, h: 1, l: 2, m: 2, r: 4, q: 4, s: 4, t: 2, v: 1, z: 0},
-            data = [];
-        if (R.is(pathString, array) && R.is(pathString[0], array)) { // rough assumption
-            data = pathClone(pathString);
-        }
-        if (!data.length) {
-            Str(pathString).replace(pathCommand, function (a, b, c) {
-                var params = [],
-                    name = b.toLowerCase();
-                c.replace(pathValues, function (a, b) {
-                    b && params.push(+b);
-                });
-                if (name == "m" && params.length > 2) {
-                    data.push([b][concat](params.splice(0, 2)));
-                    name = "l";
-                    b = b == "m" ? "l" : "L";
-                }
-                if (name == "r") {
-                    data.push([b][concat](params));
-                } else while (params.length >= paramCounts[name]) {
-                    data.push([b][concat](params.splice(0, paramCounts[name])));
-                    if (!paramCounts[name]) {
-                        break;
-                    }
-                }
-            });
-        }
-        data.toString = R._path2string;
-        pth.arr = pathClone(data);
-        return data;
-    };
-    
-    R.parseTransformString = cacher(function (TString) {
-        if (!TString) {
-            return null;
-        }
-        var paramCounts = {r: 3, s: 4, t: 2, m: 6},
-            data = [];
-        if (R.is(TString, array) && R.is(TString[0], array)) { // rough assumption
-            data = pathClone(TString);
-        }
-        if (!data.length) {
-            Str(TString).replace(tCommand, function (a, b, c) {
-                var params = [],
-                    name = lowerCase.call(b);
-                c.replace(pathValues, function (a, b) {
-                    b && params.push(+b);
-                });
-                data.push([b][concat](params));
-            });
-        }
-        data.toString = R._path2string;
-        return data;
-    });
-    // PATHS
-    var paths = function (ps) {
-        var p = paths.ps = paths.ps || {};
-        if (p[ps]) {
-            p[ps].sleep = 100;
-        } else {
-            p[ps] = {
-                sleep: 100
-            };
-        }
-        setTimeout(function () {
-            for (var key in p) if (p[has](key) && key != ps) {
-                p[key].sleep--;
-                !p[key].sleep && delete p[key];
-            }
-        });
-        return p[ps];
-    };
-    
-    R.findDotsAtSegment = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t) {
-        var t1 = 1 - t,
-            t13 = pow(t1, 3),
-            t12 = pow(t1, 2),
-            t2 = t * t,
-            t3 = t2 * t,
-            x = t13 * p1x + t12 * 3 * t * c1x + t1 * 3 * t * t * c2x + t3 * p2x,
-            y = t13 * p1y + t12 * 3 * t * c1y + t1 * 3 * t * t * c2y + t3 * p2y,
-            mx = p1x + 2 * t * (c1x - p1x) + t2 * (c2x - 2 * c1x + p1x),
-            my = p1y + 2 * t * (c1y - p1y) + t2 * (c2y - 2 * c1y + p1y),
-            nx = c1x + 2 * t * (c2x - c1x) + t2 * (p2x - 2 * c2x + c1x),
-            ny = c1y + 2 * t * (c2y - c1y) + t2 * (p2y - 2 * c2y + c1y),
-            ax = t1 * p1x + t * c1x,
-            ay = t1 * p1y + t * c1y,
-            cx = t1 * c2x + t * p2x,
-            cy = t1 * c2y + t * p2y,
-            alpha = (90 - math.atan2(mx - nx, my - ny) * 180 / PI);
-        (mx > nx || my < ny) && (alpha += 180);
-        return {
-            x: x,
-            y: y,
-            m: {x: mx, y: my},
-            n: {x: nx, y: ny},
-            start: {x: ax, y: ay},
-            end: {x: cx, y: cy},
-            alpha: alpha
-        };
-    };
-    
-    R.bezierBBox = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y) {
-        if (!R.is(p1x, "array")) {
-            p1x = [p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y];
-        }
-        var bbox = curveDim.apply(null, p1x);
-        return {
-            x: bbox.min.x,
-            y: bbox.min.y,
-            x2: bbox.max.x,
-            y2: bbox.max.y,
-            width: bbox.max.x - bbox.min.x,
-            height: bbox.max.y - bbox.min.y
-        };
-    };
-    
-    R.isPointInsideBBox = function (bbox, x, y) {
-        return x >= bbox.x && x <= bbox.x2 && y >= bbox.y && y <= bbox.y2;
-    };
-    
-    R.isBBoxIntersect = function (bbox1, bbox2) {
-        var i = R.isPointInsideBBox;
-        return i(bbox2, bbox1.x, bbox1.y)
-            || i(bbox2, bbox1.x2, bbox1.y)
-            || i(bbox2, bbox1.x, bbox1.y2)
-            || i(bbox2, bbox1.x2, bbox1.y2)
-            || i(bbox1, bbox2.x, bbox2.y)
-            || i(bbox1, bbox2.x2, bbox2.y)
-            || i(bbox1, bbox2.x, bbox2.y2)
-            || i(bbox1, bbox2.x2, bbox2.y2)
-            || (bbox1.x < bbox2.x2 && bbox1.x > bbox2.x || bbox2.x < bbox1.x2 && bbox2.x > bbox1.x)
-            && (bbox1.y < bbox2.y2 && bbox1.y > bbox2.y || bbox2.y < bbox1.y2 && bbox2.y > bbox1.y);
-    };
-    function base3(t, p1, p2, p3, p4) {
-        var t1 = -3 * p1 + 9 * p2 - 9 * p3 + 3 * p4,
-            t2 = t * t1 + 6 * p1 - 12 * p2 + 6 * p3;
-        return t * t2 - 3 * p1 + 3 * p2;
-    }
-    function bezlen(x1, y1, x2, y2, x3, y3, x4, y4, z) {
-        if (z == null) {
-            z = 1;
-        }
-        z = z > 1 ? 1 : z < 0 ? 0 : z;
-        var z2 = z / 2,
-            n = 12,
-            Tvalues = [-0.1252,0.1252,-0.3678,0.3678,-0.5873,0.5873,-0.7699,0.7699,-0.9041,0.9041,-0.9816,0.9816],
-            Cvalues = [0.2491,0.2491,0.2335,0.2335,0.2032,0.2032,0.1601,0.1601,0.1069,0.1069,0.0472,0.0472],
-            sum = 0;
-        for (var i = 0; i < n; i++) {
-            var ct = z2 * Tvalues[i] + z2,
-                xbase = base3(ct, x1, x2, x3, x4),
-                ybase = base3(ct, y1, y2, y3, y4),
-                comb = xbase * xbase + ybase * ybase;
-            sum += Cvalues[i] * math.sqrt(comb);
-        }
-        return z2 * sum;
-    }
-    function getTatLen(x1, y1, x2, y2, x3, y3, x4, y4, ll) {
-        if (ll < 0 || bezlen(x1, y1, x2, y2, x3, y3, x4, y4) < ll) {
-            return;
-        }
-        var t = 1,
-            step = t / 2,
-            t2 = t - step,
-            l,
-            e = .01;
-        l = bezlen(x1, y1, x2, y2, x3, y3, x4, y4, t2);
-        while (abs(l - ll) > e) {
-            step /= 2;
-            t2 += (l < ll ? 1 : -1) * step;
-            l = bezlen(x1, y1, x2, y2, x3, y3, x4, y4, t2);
-        }
-        return t2;
-    }
-    function intersect(x1, y1, x2, y2, x3, y3, x4, y4) {
-        if (
-            mmax(x1, x2) < mmin(x3, x4) ||
-            mmin(x1, x2) > mmax(x3, x4) ||
-            mmax(y1, y2) < mmin(y3, y4) ||
-            mmin(y1, y2) > mmax(y3, y4)
-        ) {
-            return;
-        }
-        var nx = (x1 * y2 - y1 * x2) * (x3 - x4) - (x1 - x2) * (x3 * y4 - y3 * x4),
-            ny = (x1 * y2 - y1 * x2) * (y3 - y4) - (y1 - y2) * (x3 * y4 - y3 * x4),
-            denominator = (x1 - x2) * (y3 - y4) - (y1 - y2) * (x3 - x4);
-
-        if (!denominator) {
-            return;
-        }
-        var px = nx / denominator,
-            py = ny / denominator,
-            px2 = +px.toFixed(2),
-            py2 = +py.toFixed(2);
-        if (
-            px2 < +mmin(x1, x2).toFixed(2) ||
-            px2 > +mmax(x1, x2).toFixed(2) ||
-            px2 < +mmin(x3, x4).toFixed(2) ||
-            px2 > +mmax(x3, x4).toFixed(2) ||
-            py2 < +mmin(y1, y2).toFixed(2) ||
-            py2 > +mmax(y1, y2).toFixed(2) ||
-            py2 < +mmin(y3, y4).toFixed(2) ||
-            py2 > +mmax(y3, y4).toFixed(2)
-        ) {
-            return;
-        }
-        return {x: px, y: py};
-    }
-    function inter(bez1, bez2) {
-        return interHelper(bez1, bez2);
-    }
-    function interCount(bez1, bez2) {
-        return interHelper(bez1, bez2, 1);
-    }
-    function interHelper(bez1, bez2, justCount) {
-        var bbox1 = R.bezierBBox(bez1),
-            bbox2 = R.bezierBBox(bez2);
-        if (!R.isBBoxIntersect(bbox1, bbox2)) {
-            return justCount ? 0 : [];
-        }
-        var l1 = bezlen.apply(0, bez1),
-            l2 = bezlen.apply(0, bez2),
-            n1 = ~~(l1 / 5),
-            n2 = ~~(l2 / 5),
-            dots1 = [],
-            dots2 = [],
-            xy = {},
-            res = justCount ? 0 : [];
-        for (var i = 0; i < n1 + 1; i++) {
-            var p = R.findDotsAtSegment.apply(R, bez1.concat(i / n1));
-            dots1.push({x: p.x, y: p.y, t: i / n1});
-        }
-        for (i = 0; i < n2 + 1; i++) {
-            p = R.findDotsAtSegment.apply(R, bez2.concat(i / n2));
-            dots2.push({x: p.x, y: p.y, t: i / n2});
-        }
-        for (i = 0; i < n1; i++) {
-            for (var j = 0; j < n2; j++) {
-                var di = dots1[i],
-                    di1 = dots1[i + 1],
-                    dj = dots2[j],
-                    dj1 = dots2[j + 1],
-                    ci = abs(di1.x - di.x) < .001 ? "y" : "x",
-                    cj = abs(dj1.x - dj.x) < .001 ? "y" : "x",
-                    is = intersect(di.x, di.y, di1.x, di1.y, dj.x, dj.y, dj1.x, dj1.y);
-                if (is) {
-                    if (xy[is.x.toFixed(4)] == is.y.toFixed(4)) {
-                        continue;
-                    }
-                    xy[is.x.toFixed(4)] = is.y.toFixed(4);
-                    var t1 = di.t + abs((is[ci] - di[ci]) / (di1[ci] - di[ci])) * (di1.t - di.t),
-                        t2 = dj.t + abs((is[cj] - dj[cj]) / (dj1[cj] - dj[cj])) * (dj1.t - dj.t);
-                    if (t1 >= 0 && t1 <= 1 && t2 >= 0 && t2 <= 1) {
-                        if (justCount) {
-                            res++;
-                        } else {
-                            res.push({
-                                x: is.x,
-                                y: is.y,
-                                t1: t1,
-                                t2: t2
-                            });
-                        }
-                    }
-                }
-            }
-        }
-        return res;
-    }
-    
-    R.pathIntersection = function (path1, path2) {
-        return interPathHelper(path1, path2);
-    };
-    R.pathIntersectionNumber = function (path1, path2) {
-        return interPathHelper(path1, path2, 1);
-    };
-    function interPathHelper(path1, path2, justCount) {
-        path1 = R._path2curve(path1);
-        path2 = R._path2curve(path2);
-        var x1, y1, x2, y2, x1m, y1m, x2m, y2m, bez1, bez2,
-            res = justCount ? 0 : [];
-        for (var i = 0, ii = path1.length; i < ii; i++) {
-            var pi = path1[i];
-            if (pi[0] == "M") {
-                x1 = x1m = pi[1];
-                y1 = y1m = pi[2];
-            } else {
-                if (pi[0] == "C") {
-                    bez1 = [x1, y1].concat(pi.slice(1));
-                    x1 = bez1[6];
-                    y1 = bez1[7];
-                } else {
-                    bez1 = [x1, y1, x1, y1, x1m, y1m, x1m, y1m];
-                    x1 = x1m;
-                    y1 = y1m;
-                }
-                for (var j = 0, jj = path2.length; j < jj; j++) {
-                    var pj = path2[j];
-                    if (pj[0] == "M") {
-                        x2 = x2m = pj[1];
-                        y2 = y2m = pj[2];
-                    } else {
-                        if (pj[0] == "C") {
-                            bez2 = [x2, y2].concat(pj.slice(1));
-                            x2 = bez2[6];
-                            y2 = bez2[7];
-                        } else {
-                            bez2 = [x2, y2, x2, y2, x2m, y2m, x2m, y2m];
-                            x2 = x2m;
-                            y2 = y2m;
-                        }
-                        var intr = interHelper(bez1, bez2, justCount);
-                        if (justCount) {
-                            res += intr;
-                        } else {
-                            for (var k = 0, kk = intr.length; k < kk; k++) {
-                                intr[k].segment1 = i;
-                                intr[k].segment2 = j;
-                                intr[k].bez1 = bez1;
-                                intr[k].bez2 = bez2;
-                            }
-                            res = res.concat(intr);
-                        }
-                    }
-                }
-            }
-        }
-        return res;
-    }
-    
-    R.isPointInsidePath = function (path, x, y) {
-        var bbox = R.pathBBox(path);
-        return R.isPointInsideBBox(bbox, x, y) &&
-               interPathHelper(path, [["M", x, y], ["H", bbox.x2 + 10]], 1) % 2 == 1;
-    };
-    R._removedFactory = function (methodname) {
-        return function () {
-            eve("raphael.log", null, "Rapha\xebl: you are calling to method \u201c" + methodname + "\u201d of removed object", methodname);
-        };
-    };
-    
-    var pathDimensions = R.pathBBox = function (path) {
-        var pth = paths(path);
-        if (pth.bbox) {
-            return pth.bbox;
-        }
-        if (!path) {
-            return {x: 0, y: 0, width: 0, height: 0, x2: 0, y2: 0};
-        }
-        path = path2curve(path);
-        var x = 0, 
-            y = 0,
-            X = [],
-            Y = [],
-            p;
-        for (var i = 0, ii = path.length; i < ii; i++) {
-            p = path[i];
-            if (p[0] == "M") {
-                x = p[1];
-                y = p[2];
-                X.push(x);
-                Y.push(y);
-            } else {
-                var dim = curveDim(x, y, p[1], p[2], p[3], p[4], p[5], p[6]);
-                X = X[concat](dim.min.x, dim.max.x);
-                Y = Y[concat](dim.min.y, dim.max.y);
-                x = p[5];
-                y = p[6];
-            }
-        }
-        var xmin = mmin[apply](0, X),
-            ymin = mmin[apply](0, Y),
-            xmax = mmax[apply](0, X),
-            ymax = mmax[apply](0, Y),
-            bb = {
-                x: xmin,
-                y: ymin,
-                x2: xmax,
-                y2: ymax,
-                width: xmax - xmin,
-                height: ymax - ymin
-            };
-        pth.bbox = clone(bb);
-        return bb;
-    },
-        pathClone = function (pathArray) {
-            var res = clone(pathArray);
-            res.toString = R._path2string;
-            return res;
-        },
-        pathToRelative = R._pathToRelative = function (pathArray) {
-            var pth = paths(pathArray);
-            if (pth.rel) {
-                return pathClone(pth.rel);
-            }
-            if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption
-                pathArray = R.parsePathString(pathArray);
-            }
-            var res = [],
-                x = 0,
-                y = 0,
-                mx = 0,
-                my = 0,
-                start = 0;
-            if (pathArray[0][0] == "M") {
-                x = pathArray[0][1];
-                y = pathArray[0][2];
-                mx = x;
-                my = y;
-                start++;
-                res.push(["M", x, y]);
-            }
-            for (var i = start, ii = pathArray.length; i < ii; i++) {
-                var r = res[i] = [],
-                    pa = pathArray[i];
-                if (pa[0] != lowerCase.call(pa[0])) {
-                    r[0] = lowerCase.call(pa[0]);
-                    switch (r[0]) {
-                        case "a":
-                            r[1] = pa[1];
-                            r[2] = pa[2];
-                            r[3] = pa[3];
-                            r[4] = pa[4];
-                            r[5] = pa[5];
-                            r[6] = +(pa[6] - x).toFixed(3);
-                            r[7] = +(pa[7] - y).toFixed(3);
-                            break;
-                        case "v":
-                            r[1] = +(pa[1] - y).toFixed(3);
-                            break;
-                        case "m":
-                            mx = pa[1];
-                            my = pa[2];
-                        default:
-                            for (var j = 1, jj = pa.length; j < jj; j++) {
-                                r[j] = +(pa[j] - ((j % 2) ? x : y)).toFixed(3);
-                            }
-                    }
-                } else {
-                    r = res[i] = [];
-                    if (pa[0] == "m") {
-                        mx = pa[1] + x;
-                        my = pa[2] + y;
-                    }
-                    for (var k = 0, kk = pa.length; k < kk; k++) {
-                        res[i][k] = pa[k];
-                    }
-                }
-                var len = res[i].length;
-                switch (res[i][0]) {
-                    case "z":
-                        x = mx;
-                        y = my;
-                        break;
-                    case "h":
-                        x += +res[i][len - 1];
-                        break;
-                    case "v":
-                        y += +res[i][len - 1];
-                        break;
-                    default:
-                        x += +res[i][len - 2];
-                        y += +res[i][len - 1];
-                }
-            }
-            res.toString = R._path2string;
-            pth.rel = pathClone(res);
-            return res;
-        },
-        pathToAbsolute = R._pathToAbsolute = function (pathArray) {
-            var pth = paths(pathArray);
-            if (pth.abs) {
-                return pathClone(pth.abs);
-            }
-            if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption
-                pathArray = R.parsePathString(pathArray);
-            }
-            if (!pathArray || !pathArray.length) {
-                return [["M", 0, 0]];
-            }
-            var res = [],
-                x = 0,
-                y = 0,
-                mx = 0,
-                my = 0,
-                start = 0;
-            if (pathArray[0][0] == "M") {
-                x = +pathArray[0][1];
-                y = +pathArray[0][2];
-                mx = x;
-                my = y;
-                start++;
-                res[0] = ["M", x, y];
-            }
-            var crz = pathArray.length == 3 && pathArray[0][0] == "M" && pathArray[1][0].toUpperCase() == "R" && pathArray[2][0].toUpperCase() == "Z";
-            for (var r, pa, i = start, ii = pathArray.length; i < ii; i++) {
-                res.push(r = []);
-                pa = pathArray[i];
-                if (pa[0] != upperCase.call(pa[0])) {
-                    r[0] = upperCase.call(pa[0]);
-                    switch (r[0]) {
-                        case "A":
-                            r[1] = pa[1];
-                            r[2] = pa[2];
-                            r[3] = pa[3];
-                            r[4] = pa[4];
-                            r[5] = pa[5];
-                            r[6] = +(pa[6] + x);
-                            r[7] = +(pa[7] + y);
-                            break;
-                        case "V":
-                            r[1] = +pa[1] + y;
-                            break;
-                        case "H":
-                            r[1] = +pa[1] + x;
-                            break;
-                        case "R":
-                            var dots = [x, y][concat](pa.slice(1));
-                            for (var j = 2, jj = dots.length; j < jj; j++) {
-                                dots[j] = +dots[j] + x;
-                                dots[++j] = +dots[j] + y;
-                            }
-                            res.pop();
-                            res = res[concat](catmullRom2bezier(dots, crz));
-                            break;
-                        case "M":
-                            mx = +pa[1] + x;
-                            my = +pa[2] + y;
-                        default:
-                            for (j = 1, jj = pa.length; j < jj; j++) {
-                                r[j] = +pa[j] + ((j % 2) ? x : y);
-                            }
-                    }
-                } else if (pa[0] == "R") {
-                    dots = [x, y][concat](pa.slice(1));
-                    res.pop();
-                    res = res[concat](catmullRom2bezier(dots, crz));
-                    r = ["R"][concat](pa.slice(-2));
-                } else {
-                    for (var k = 0, kk = pa.length; k < kk; k++) {
-                        r[k] = pa[k];
-                    }
-                }
-                switch (r[0]) {
-                    case "Z":
-                        x = mx;
-                        y = my;
-                        break;
-                    case "H":
-                        x = r[1];
-                        break;
-                    case "V":
-                        y = r[1];
-                        break;
-                    case "M":
-                        mx = r[r.length - 2];
-                        my = r[r.length - 1];
-                    default:
-                        x = r[r.length - 2];
-                        y = r[r.length - 1];
-                }
-            }
-            res.toString = R._path2string;
-            pth.abs = pathClone(res);
-            return res;
-        },
-        l2c = function (x1, y1, x2, y2) {
-            return [x1, y1, x2, y2, x2, y2];
-        },
-        q2c = function (x1, y1, ax, ay, x2, y2) {
-            var _13 = 1 / 3,
-                _23 = 2 / 3;
-            return [
-                    _13 * x1 + _23 * ax,
-                    _13 * y1 + _23 * ay,
-                    _13 * x2 + _23 * ax,
-                    _13 * y2 + _23 * ay,
-                    x2,
-                    y2
-                ];
-        },
-        a2c = function (x1, y1, rx, ry, angle, large_arc_flag, sweep_flag, x2, y2, recursive) {
-            // for more information of where this math came from visit:
-            // http://www.w3.org/TR/SVG11/implnote.html#ArcImplementationNotes
-            var _120 = PI * 120 / 180,
-                rad = PI / 180 * (+angle || 0),
-                res = [],
-                xy,
-                rotate = cacher(function (x, y, rad) {
-                    var X = x * math.cos(rad) - y * math.sin(rad),
-                        Y = x * math.sin(rad) + y * math.cos(rad);
-                    return {x: X, y: Y};
-                });
-            if (!recursive) {
-                xy = rotate(x1, y1, -rad);
-                x1 = xy.x;
-                y1 = xy.y;
-                xy = rotate(x2, y2, -rad);
-                x2 = xy.x;
-                y2 = xy.y;
-                var cos = math.cos(PI / 180 * angle),
-                    sin = math.sin(PI / 180 * angle),
-                    x = (x1 - x2) / 2,
-                    y = (y1 - y2) / 2;
-                var h = (x * x) / (rx * rx) + (y * y) / (ry * ry);
-                if (h > 1) {
-                    h = math.sqrt(h);
-                    rx = h * rx;
-                    ry = h * ry;
-                }
-                var rx2 = rx * rx,
-                    ry2 = ry * ry,
-                    k = (large_arc_flag == sweep_flag ? -1 : 1) *
-                        math.sqrt(abs((rx2 * ry2 - rx2 * y * y - ry2 * x * x) / (rx2 * y * y + ry2 * x * x))),
-                    cx = k * rx * y / ry + (x1 + x2) / 2,
-                    cy = k * -ry * x / rx + (y1 + y2) / 2,
-                    f1 = math.asin(((y1 - cy) / ry).toFixed(9)),
-                    f2 = math.asin(((y2 - cy) / ry).toFixed(9));
-
-                f1 = x1 < cx ? PI - f1 : f1;
-                f2 = x2 < cx ? PI - f2 : f2;
-                f1 < 0 && (f1 = PI * 2 + f1);
-                f2 < 0 && (f2 = PI * 2 + f2);
-                if (sweep_flag && f1 > f2) {
-                    f1 = f1 - PI * 2;
-                }
-                if (!sweep_flag && f2 > f1) {
-                    f2 = f2 - PI * 2;
-                }
-            } else {
-                f1 = recursive[0];
-                f2 = recursive[1];
-                cx = recursive[2];
-                cy = recursive[3];
-            }
-            var df = f2 - f1;
-            if (abs(df) > _120) {
-                var f2old = f2,
-                    x2old = x2,
-                    y2old = y2;
-                f2 = f1 + _120 * (sweep_flag && f2 > f1 ? 1 : -1);
-                x2 = cx + rx * math.cos(f2);
-                y2 = cy + ry * math.sin(f2);
-                res = a2c(x2, y2, rx, ry, angle, 0, sweep_flag, x2old, y2old, [f2, f2old, cx, cy]);
-            }
-            df = f2 - f1;
-            var c1 = math.cos(f1),
-                s1 = math.sin(f1),
-                c2 = math.cos(f2),
-                s2 = math.sin(f2),
-                t = math.tan(df / 4),
-                hx = 4 / 3 * rx * t,
-                hy = 4 / 3 * ry * t,
-                m1 = [x1, y1],
-                m2 = [x1 + hx * s1, y1 - hy * c1],
-                m3 = [x2 + hx * s2, y2 - hy * c2],
-                m4 = [x2, y2];
-            m2[0] = 2 * m1[0] - m2[0];
-            m2[1] = 2 * m1[1] - m2[1];
-            if (recursive) {
-                return [m2, m3, m4][concat](res);
-            } else {
-                res = [m2, m3, m4][concat](res).join()[split](",");
-                var newres = [];
-                for (var i = 0, ii = res.length; i < ii; i++) {
-                    newres[i] = i % 2 ? rotate(res[i - 1], res[i], rad).y : rotate(res[i], res[i + 1], rad).x;
-                }
-                return newres;
-            }
-        },
-        findDotAtSegment = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t) {
-            var t1 = 1 - t;
-            return {
-                x: pow(t1, 3) * p1x + pow(t1, 2) * 3 * t * c1x + t1 * 3 * t * t * c2x + pow(t, 3) * p2x,
-                y: pow(t1, 3) * p1y + pow(t1, 2) * 3 * t * c1y + t1 * 3 * t * t * c2y + pow(t, 3) * p2y
-            };
-        },
-        curveDim = cacher(function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y) {
-            var a = (c2x - 2 * c1x + p1x) - (p2x - 2 * c2x + c1x),
-                b = 2 * (c1x - p1x) - 2 * (c2x - c1x),
-                c = p1x - c1x,
-                t1 = (-b + math.sqrt(b * b - 4 * a * c)) / 2 / a,
-                t2 = (-b - math.sqrt(b * b - 4 * a * c)) / 2 / a,
-                y = [p1y, p2y],
-                x = [p1x, p2x],
-                dot;
-            abs(t1) > "1e12" && (t1 = .5);
-            abs(t2) > "1e12" && (t2 = .5);
-            if (t1 > 0 && t1 < 1) {
-                dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t1);
-                x.push(dot.x);
-                y.push(dot.y);
-            }
-            if (t2 > 0 && t2 < 1) {
-                dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t2);
-                x.push(dot.x);
-                y.push(dot.y);
-            }
-            a = (c2y - 2 * c1y + p1y) - (p2y - 2 * c2y + c1y);
-            b = 2 * (c1y - p1y) - 2 * (c2y - c1y);
-            c = p1y - c1y;
-            t1 = (-b + math.sqrt(b * b - 4 * a * c)) / 2 / a;
-            t2 = (-b - math.sqrt(b * b - 4 * a * c)) / 2 / a;
-            abs(t1) > "1e12" && (t1 = .5);
-            abs(t2) > "1e12" && (t2 = .5);
-            if (t1 > 0 && t1 < 1) {
-                dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t1);
-                x.push(dot.x);
-                y.push(dot.y);
-            }
-            if (t2 > 0 && t2 < 1) {
-                dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t2);
-                x.push(dot.x);
-                y.push(dot.y);
-            }
-            return {
-                min: {x: mmin[apply](0, x), y: mmin[apply](0, y)},
-                max: {x: mmax[apply](0, x), y: mmax[apply](0, y)}
-            };
-        }),
-        path2curve = R._path2curve = cacher(function (path, path2) {
-            var pth = !path2 && paths(path);
-            if (!path2 && pth.curve) {
-                return pathClone(pth.curve);
-            }
-            var p = pathToAbsolute(path),
-                p2 = path2 && pathToAbsolute(path2),
-                attrs = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null},
-                attrs2 = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null},
-                processPath = function (path, d) {
-                    var nx, ny;
-                    if (!path) {
-                        return ["C", d.x, d.y, d.x, d.y, d.x, d.y];
-                    }
-                    !(path[0] in {T:1, Q:1}) && (d.qx = d.qy = null);
-                    switch (path[0]) {
-                        case "M":
-                            d.X = path[1];
-                            d.Y = path[2];
-                            break;
-                        case "A":
-                            path = ["C"][concat](a2c[apply](0, [d.x, d.y][concat](path.slice(1))));
-                            break;
-                        case "S":
-                            nx = d.x + (d.x - (d.bx || d.x));
-                            ny = d.y + (d.y - (d.by || d.y));
-                            path = ["C", nx, ny][concat](path.slice(1));
-                            break;
-                        case "T":
-                            d.qx = d.x + (d.x - (d.qx || d.x));
-                            d.qy = d.y + (d.y - (d.qy || d.y));
-                            path = ["C"][concat](q2c(d.x, d.y, d.qx, d.qy, path[1], path[2]));
-                            break;
-                        case "Q":
-                            d.qx = path[1];
-                            d.qy = path[2];
-                            path = ["C"][concat](q2c(d.x, d.y, path[1], path[2], path[3], path[4]));
-                            break;
-                        case "L":
-                            path = ["C"][concat](l2c(d.x, d.y, path[1], path[2]));
-                            break;
-                        case "H":
-                            path = ["C"][concat](l2c(d.x, d.y, path[1], d.y));
-                            break;
-                        case "V":
-                            path = ["C"][concat](l2c(d.x, d.y, d.x, path[1]));
-                            break;
-                        case "Z":
-                            path = ["C"][concat](l2c(d.x, d.y, d.X, d.Y));
-                            break;
-                    }
-                    return path;
-                },
-                fixArc = function (pp, i) {
-                    if (pp[i].length > 7) {
-                        pp[i].shift();
-                        var pi = pp[i];
-                        while (pi.length) {
-                            pp.splice(i++, 0, ["C"][concat](pi.splice(0, 6)));
-                        }
-                        pp.splice(i, 1);
-                        ii = mmax(p.length, p2 && p2.length || 0);
-                    }
-                },
-                fixM = function (path1, path2, a1, a2, i) {
-                    if (path1 && path2 && path1[i][0] == "M" && path2[i][0] != "M") {
-                        path2.splice(i, 0, ["M", a2.x, a2.y]);
-                        a1.bx = 0;
-                        a1.by = 0;
-                        a1.x = path1[i][1];
-                        a1.y = path1[i][2];
-                        ii = mmax(p.length, p2 && p2.length || 0);
-                    }
-                };
-            for (var i = 0, ii = mmax(p.length, p2 && p2.length || 0); i < ii; i++) {
-                p[i] = processPath(p[i], attrs);
-                fixArc(p, i);
-                p2 && (p2[i] = processPath(p2[i], attrs2));
-                p2 && fixArc(p2, i);
-                fixM(p, p2, attrs, attrs2, i);
-                fixM(p2, p, attrs2, attrs, i);
-                var seg = p[i],
-                    seg2 = p2 && p2[i],
-                    seglen = seg.length,
-                    seg2len = p2 && seg2.length;
-                attrs.x = seg[seglen - 2];
-                attrs.y = seg[seglen - 1];
-                attrs.bx = toFloat(seg[seglen - 4]) || attrs.x;
-                attrs.by = toFloat(seg[seglen - 3]) || attrs.y;
-                attrs2.bx = p2 && (toFloat(seg2[seg2len - 4]) || attrs2.x);
-                attrs2.by = p2 && (toFloat(seg2[seg2len - 3]) || attrs2.y);
-                attrs2.x = p2 && seg2[seg2len - 2];
-                attrs2.y = p2 && seg2[seg2len - 1];
-            }
-            if (!p2) {
-                pth.curve = pathClone(p);
-            }
-            return p2 ? [p, p2] : p;
-        }, null, pathClone),
-        parseDots = R._parseDots = cacher(function (gradient) {
-            var dots = [];
-            for (var i = 0, ii = gradient.length; i < ii; i++) {
-                var dot = {},
-                    par = gradient[i].match(/^([^:]*):?([\d\.]*)/);
-                dot.color = R.getRGB(par[1]);
-                if (dot.color.error) {
-                    return null;
-                }
-                dot.color = dot.color.hex;
-                par[2] && (dot.offset = par[2] + "%");
-                dots.push(dot);
-            }
-            for (i = 1, ii = dots.length - 1; i < ii; i++) {
-                if (!dots[i].offset) {
-                    var start = toFloat(dots[i - 1].offset || 0),
-                        end = 0;
-                    for (var j = i + 1; j < ii; j++) {
-                        if (dots[j].offset) {
-                            end = dots[j].offset;
-                            break;
-                        }
-                    }
-                    if (!end) {
-                        end = 100;
-                        j = ii;
-                    }
-                    end = toFloat(end);
-                    var d = (end - start) / (j - i + 1);
-                    for (; i < j; i++) {
-                        start += d;
-                        dots[i].offset = start + "%";
-                    }
-                }
-            }
-            return dots;
-        }),
-        tear = R._tear = function (el, paper) {
-            el == paper.top && (paper.top = el.prev);
-            el == paper.bottom && (paper.bottom = el.next);
-            el.next && (el.next.prev = el.prev);
-            el.prev && (el.prev.next = el.next);
-        },
-        tofront = R._tofront = function (el, paper) {
-            if (paper.top === el) {
-                return;
-            }
-            tear(el, paper);
-            el.next = null;
-            el.prev = paper.top;
-            paper.top.next = el;
-            paper.top = el;
-        },
-        toback = R._toback = function (el, paper) {
-            if (paper.bottom === el) {
-                return;
-            }
-            tear(el, paper);
-            el.next = paper.bottom;
-            el.prev = null;
-            paper.bottom.prev = el;
-            paper.bottom = el;
-        },
-        insertafter = R._insertafter = function (el, el2, paper) {
-            tear(el, paper);
-            el2 == paper.top && (paper.top = el);
-            el2.next && (el2.next.prev = el);
-            el.next = el2.next;
-            el.prev = el2;
-            el2.next = el;
-        },
-        insertbefore = R._insertbefore = function (el, el2, paper) {
-            tear(el, paper);
-            el2 == paper.bottom && (paper.bottom = el);
-            el2.prev && (el2.prev.next = el);
-            el.prev = el2.prev;
-            el2.prev = el;
-            el.next = el2;
-        },
-        
-        toMatrix = R.toMatrix = function (path, transform) {
-            var bb = pathDimensions(path),
-                el = {
-                    _: {
-                        transform: E
-                    },
-                    getBBox: function () {
-                        return bb;
-                    }
-                };
-            extractTransform(el, transform);
-            return el.matrix;
-        },
-        
-        transformPath = R.transformPath = function (path, transform) {
-            return mapPath(path, toMatrix(path, transform));
-        },
-        extractTransform = R._extractTransform = function (el, tstr) {
-            if (tstr == null) {
-                return el._.transform;
-            }
-            tstr = Str(tstr).replace(/\.{3}|\u2026/g, el._.transform || E);
-            var tdata = R.parseTransformString(tstr),
-                deg = 0,
-                dx = 0,
-                dy = 0,
-                sx = 1,
-                sy = 1,
-                _ = el._,
-                m = new Matrix;
-            _.transform = tdata || [];
-            if (tdata) {
-                for (var i = 0, ii = tdata.length; i < ii; i++) {
-                    var t = tdata[i],
-                        tlen = t.length,
-                        command = Str(t[0]).toLowerCase(),
-                        absolute = t[0] != command,
-                        inver = absolute ? m.invert() : 0,
-                        x1,
-                        y1,
-                        x2,
-                        y2,
-                        bb;
-                    if (command == "t" && tlen == 3) {
-                        if (absolute) {
-                            x1 = inver.x(0, 0);
-                            y1 = inver.y(0, 0);
-                            x2 = inver.x(t[1], t[2]);
-                            y2 = inver.y(t[1], t[2]);
-                            m.translate(x2 - x1, y2 - y1);
-                        } else {
-                            m.translate(t[1], t[2]);
-                        }
-                    } else if (command == "r") {
-                        if (tlen == 2) {
-                            bb = bb || el.getBBox(1);
-                            m.rotate(t[1], bb.x + bb.width / 2, bb.y + bb.height / 2);
-                            deg += t[1];
-                        } else if (tlen == 4) {
-                            if (absolute) {
-                                x2 = inver.x(t[2], t[3]);
-                                y2 = inver.y(t[2], t[3]);
-                                m.rotate(t[1], x2, y2);
-                            } else {
-                                m.rotate(t[1], t[2], t[3]);
-                            }
-                            deg += t[1];
-                        }
-                    } else if (command == "s") {
-                        if (tlen == 2 || tlen == 3) {
-                            bb = bb || el.getBBox(1);
-                            m.scale(t[1], t[tlen - 1], bb.x + bb.width / 2, bb.y + bb.height / 2);
-                            sx *= t[1];
-                            sy *= t[tlen - 1];
-                        } else if (tlen == 5) {
-                            if (absolute) {
-                                x2 = inver.x(t[3], t[4]);
-                                y2 = inver.y(t[3], t[4]);
-                                m.scale(t[1], t[2], x2, y2);
-                            } else {
-                                m.scale(t[1], t[2], t[3], t[4]);
-                            }
-                            sx *= t[1];
-                            sy *= t[2];
-                        }
-                    } else if (command == "m" && tlen == 7) {
-                        m.add(t[1], t[2], t[3], t[4], t[5], t[6]);
-                    }
-                    _.dirtyT = 1;
-                    el.matrix = m;
-                }
-            }
-
-            
-            el.matrix = m;
-
-            _.sx = sx;
-            _.sy = sy;
-            _.deg = deg;
-            _.dx = dx = m.e;
-            _.dy = dy = m.f;
-
-            if (sx == 1 && sy == 1 && !deg && _.bbox) {
-                _.bbox.x += +dx;
-                _.bbox.y += +dy;
-            } else {
-                _.dirtyT = 1;
-            }
-        },
-        getEmpty = function (item) {
-            var l = item[0];
-            switch (l.toLowerCase()) {
-                case "t": return [l, 0, 0];
-                case "m": return [l, 1, 0, 0, 1, 0, 0];
-                case "r": if (item.length == 4) {
-                    return [l, 0, item[2], item[3]];
-                } else {
-                    return [l, 0];
-                }
-                case "s": if (item.length == 5) {
-                    return [l, 1, 1, item[3], item[4]];
-                } else if (item.length == 3) {
-                    return [l, 1, 1];
-                } else {
-                    return [l, 1];
-                }
-            }
-        },
-        equaliseTransform = R._equaliseTransform = function (t1, t2) {
-            t2 = Str(t2).replace(/\.{3}|\u2026/g, t1);
-            t1 = R.parseTransformString(t1) || [];
-            t2 = R.parseTransformString(t2) || [];
-            var maxlength = mmax(t1.length, t2.length),
-                from = [],
-                to = [],
-                i = 0, j, jj,
-                tt1, tt2;
-            for (; i < maxlength; i++) {
-                tt1 = t1[i] || getEmpty(t2[i]);
-                tt2 = t2[i] || getEmpty(tt1);
-                if ((tt1[0] != tt2[0]) ||
-                    (tt1[0].toLowerCase() == "r" && (tt1[2] != tt2[2] || tt1[3] != tt2[3])) ||
-                    (tt1[0].toLowerCase() == "s" && (tt1[3] != tt2[3] || tt1[4] != tt2[4]))
-                    ) {
-                    return;
-                }
-                from[i] = [];
-                to[i] = [];
-                for (j = 0, jj = mmax(tt1.length, tt2.length); j < jj; j++) {
-                    j in tt1 && (from[i][j] = tt1[j]);
-                    j in tt2 && (to[i][j] = tt2[j]);
-                }
-            }
-            return {
-                from: from,
-                to: to
-            };
-        };
-    R._getContainer = function (x, y, w, h) {
-        var container;
-        container = h == null && !R.is(x, "object") ? g.doc.getElementById(x) : x;
-        if (container == null) {
-            return;
-        }
-        if (container.tagName) {
-            if (y == null) {
-                return {
-                    container: container,
-                    width: container.style.pixelWidth || container.offsetWidth,
-                    height: container.style.pixelHeight || container.offsetHeight
-                };
-            } else {
-                return {
-                    container: container,
-                    width: y,
-                    height: w
-                };
-            }
-        }
-        return {
-            container: 1,
-            x: x,
-            y: y,
-            width: w,
-            height: h
-        };
-    };
-    
-    R.pathToRelative = pathToRelative;
-    R._engine = {};
-    
-    R.path2curve = path2curve;
-    
-    R.matrix = function (a, b, c, d, e, f) {
-        return new Matrix(a, b, c, d, e, f);
-    };
-    function Matrix(a, b, c, d, e, f) {
-        if (a != null) {
-            this.a = +a;
-            this.b = +b;
-            this.c = +c;
-            this.d = +d;
-            this.e = +e;
-            this.f = +f;
-        } else {
-            this.a = 1;
-            this.b = 0;
-            this.c = 0;
-            this.d = 1;
-            this.e = 0;
-            this.f = 0;
-        }
-    }
-    (function (matrixproto) {
-        
-        matrixproto.add = function (a, b, c, d, e, f) {
-            var out = [[], [], []],
-                m = [[this.a, this.c, this.e], [this.b, this.d, this.f], [0, 0, 1]],
-                matrix = [[a, c, e], [b, d, f], [0, 0, 1]],
-                x, y, z, res;
-
-            if (a && a instanceof Matrix) {
-                matrix = [[a.a, a.c, a.e], [a.b, a.d, a.f], [0, 0, 1]];
-            }
-
-            for (x = 0; x < 3; x++) {
-                for (y = 0; y < 3; y++) {
-                    res = 0;
-                    for (z = 0; z < 3; z++) {
-                        res += m[x][z] * matrix[z][y];
-                    }
-                    out[x][y] = res;
-                }
-            }
-            this.a = out[0][0];
-            this.b = out[1][0];
-            this.c = out[0][1];
-            this.d = out[1][1];
-            this.e = out[0][2];
-            this.f = out[1][2];
-        };
-        
-        matrixproto.invert = function () {
-            var me = this,
-                x = me.a * me.d - me.b * me.c;
-            return new Matrix(me.d / x, -me.b / x, -me.c / x, me.a / x, (me.c * me.f - me.d * me.e) / x, (me.b * me.e - me.a * me.f) / x);
-        };
-        
-        matrixproto.clone = function () {
-            return new Matrix(this.a, this.b, this.c, this.d, this.e, this.f);
-        };
-        
-        matrixproto.translate = function (x, y) {
-            this.add(1, 0, 0, 1, x, y);
-        };
-        
-        matrixproto.scale = function (x, y, cx, cy) {
-            y == null && (y = x);
-            (cx || cy) && this.add(1, 0, 0, 1, cx, cy);
-            this.add(x, 0, 0, y, 0, 0);
-            (cx || cy) && this.add(1, 0, 0, 1, -cx, -cy);
-        };
-        
-        matrixproto.rotate = function (a, x, y) {
-            a = R.rad(a);
-            x = x || 0;
-            y = y || 0;
-            var cos = +math.cos(a).toFixed(9),
-                sin = +math.sin(a).toFixed(9);
-            this.add(cos, sin, -sin, cos, x, y);
-            this.add(1, 0, 0, 1, -x, -y);
-        };
-        
-        matrixproto.x = function (x, y) {
-            return x * this.a + y * this.c + this.e;
-        };
-        
-        matrixproto.y = function (x, y) {
-            return x * this.b + y * this.d + this.f;
-        };
-        matrixproto.get = function (i) {
-            return +this[Str.fromCharCode(97 + i)].toFixed(4);
-        };
-        matrixproto.toString = function () {
-            return R.svg ?
-                "matrix(" + [this.get(0), this.get(1), this.get(2), this.get(3), this.get(4), this.get(5)].join() + ")" :
-                [this.get(0), this.get(2), this.get(1), this.get(3), 0, 0].join();
-        };
-        matrixproto.toFilter = function () {
-            return "progid:DXImageTransform.Microsoft.Matrix(M11=" + this.get(0) +
-                ", M12=" + this.get(2) + ", M21=" + this.get(1) + ", M22=" + this.get(3) +
-                ", Dx=" + this.get(4) + ", Dy=" + this.get(5) + ", sizingmethod='auto expand')";
-        };
-        matrixproto.offset = function () {
-            return [this.e.toFixed(4), this.f.toFixed(4)];
-        };
-        function norm(a) {
-            return a[0] * a[0] + a[1] * a[1];
-        }
-        function normalize(a) {
-            var mag = math.sqrt(norm(a));
-            a[0] && (a[0] /= mag);
-            a[1] && (a[1] /= mag);
-        }
-        
-        matrixproto.split = function () {
-            var out = {};
-            // translation
-            out.dx = this.e;
-            out.dy = this.f;
-
-            // scale and shear
-            var row = [[this.a, this.c], [this.b, this.d]];
-            out.scalex = math.sqrt(norm(row[0]));
-            normalize(row[0]);
-
-            out.shear = row[0][0] * row[1][0] + row[0][1] * row[1][1];
-            row[1] = [row[1][0] - row[0][0] * out.shear, row[1][1] - row[0][1] * out.shear];
-
-            out.scaley = math.sqrt(norm(row[1]));
-            normalize(row[1]);
-            out.shear /= out.scaley;
-
-            // rotation
-            var sin = -row[0][1],
-                cos = row[1][1];
-            if (cos < 0) {
-                out.rotate = R.deg(math.acos(cos));
-                if (sin < 0) {
-                    out.rotate = 360 - out.rotate;
-                }
-            } else {
-                out.rotate = R.deg(math.asin(sin));
-            }
-
-            out.isSimple = !+out.shear.toFixed(9) && (out.scalex.toFixed(9) == out.scaley.toFixed(9) || !out.rotate);
-            out.isSuperSimple = !+out.shear.toFixed(9) && out.scalex.toFixed(9) == out.scaley.toFixed(9) && !out.rotate;
-            out.noRotation = !+out.shear.toFixed(9) && !out.rotate;
-            return out;
-        };
-        
-        matrixproto.toTransformString = function (shorter) {
-            var s = shorter || this[split]();
-            if (s.isSimple) {
-                s.scalex = +s.scalex.toFixed(4);
-                s.scaley = +s.scaley.toFixed(4);
-                s.rotate = +s.rotate.toFixed(4);
-                return  (s.dx || s.dy ? "t" + [s.dx, s.dy] : E) + 
-                        (s.scalex != 1 || s.scaley != 1 ? "s" + [s.scalex, s.scaley, 0, 0] : E) +
-                        (s.rotate ? "r" + [s.rotate, 0, 0] : E);
-            } else {
-                return "m" + [this.get(0), this.get(1), this.get(2), this.get(3), this.get(4), this.get(5)];
-            }
-        };
-    })(Matrix.prototype);
-
-    // WebKit rendering bug workaround method
-    var version = navigator.userAgent.match(/Version\/(.*?)\s/) || navigator.userAgent.match(/Chrome\/(\d+)/);
-    if ((navigator.vendor == "Apple Computer, Inc.") && (version && version[1] < 4 || navigator.platform.slice(0, 2) == "iP") ||
-        (navigator.vendor == "Google Inc." && version && version[1] < 8)) {
-        
-        paperproto.safari = function () {
-            var rect = this.rect(-99, -99, this.width + 99, this.height + 99).attr({stroke: "none"});
-            setTimeout(function () {rect.remove();});
-        };
-    } else {
-        paperproto.safari = fun;
-    }
- 
-    var preventDefault = function () {
-        this.returnValue = false;
-    },
-    preventTouch = function () {
-        return this.originalEvent.preventDefault();
-    },
-    stopPropagation = function () {
-        this.cancelBubble = true;
-    },
-    stopTouch = function () {
-        return this.originalEvent.stopPropagation();
-    },
-    addEvent = (function () {
-        if (g.doc.addEventListener) {
-            return function (obj, type, fn, element) {
-                var realName = supportsTouch && touchMap[type] ? touchMap[type] : type,
-                    f = function (e) {
-                        var scrollY = g.doc.documentElement.scrollTop || g.doc.body.scrollTop,
-                            scrollX = g.doc.documentElement.scrollLeft || g.doc.body.scrollLeft,
-                            x = e.clientX + scrollX,
-                            y = e.clientY + scrollY;
-                    if (supportsTouch && touchMap[has](type)) {
-                        for (var i = 0, ii = e.targetTouches && e.targetTouches.length; i < ii; i++) {
-                            if (e.targetTouches[i].target == obj) {
-                                var olde = e;
-                                e = e.targetTouches[i];
-                                e.originalEvent = olde;
-                                e.preventDefault = preventTouch;
-                                e.stopPropagation = stopTouch;
-                                break;
-                            }
-                        }
-                    }
-                    return fn.call(element, e, x, y);
-                };
-                obj.addEventListener(realName, f, false);
-                return function () {
-                    obj.removeEventListener(realName, f, false);
-                    return true;
-                };
-            };
-        } else if (g.doc.attachEvent) {
-            return function (obj, type, fn, element) {
-                var f = function (e) {
-                    e = e || g.win.event;
-                    var scrollY = g.doc.documentElement.scrollTop || g.doc.body.scrollTop,
-                        scrollX = g.doc.documentElement.scrollLeft || g.doc.body.scrollLeft,
-                        x = e.clientX + scrollX,
-                        y = e.clientY + scrollY;
-                    e.preventDefault = e.preventDefault || preventDefault;
-                    e.stopPropagation = e.stopPropagation || stopPropagation;
-                    return fn.call(element, e, x, y);
-                };
-                obj.attachEvent("on" + type, f);
-                var detacher = function () {
-                    obj.detachEvent("on" + type, f);
-                    return true;
-                };
-                return detacher;
-            };
-        }
-    })(),
-    drag = [],
-    dragMove = function (e) {
-        var x = e.clientX,
-            y = e.clientY,
-            scrollY = g.doc.documentElement.scrollTop || g.doc.body.scrollTop,
-            scrollX = g.doc.documentElement.scrollLeft || g.doc.body.scrollLeft,
-            dragi,
-            j = drag.length;
-        while (j--) {
-            dragi = drag[j];
-            if (supportsTouch) {
-                var i = e.touches.length,
-                    touch;
-                while (i--) {
-                    touch = e.touches[i];
-                    if (touch.identifier == dragi.el._drag.id) {
-                        x = touch.clientX;
-                        y = touch.clientY;
-                        (e.originalEvent ? e.originalEvent : e).preventDefault();
-                        break;
-                    }
-                }
-            } else {
-                e.preventDefault();
-            }
-            var node = dragi.el.node,
-                o,
-                next = node.nextSibling,
-                parent = node.parentNode,
-                display = node.style.display;
-            g.win.opera && parent.removeChild(node);
-            node.style.display = "none";
-            o = dragi.el.paper.getElementByPoint(x, y);
-            node.style.display = display;
-            g.win.opera && (next ? parent.insertBefore(node, next) : parent.appendChild(node));
-            o && eve("raphael.drag.over." + dragi.el.id, dragi.el, o);
-            x += scrollX;
-            y += scrollY;
-            eve("raphael.drag.move." + dragi.el.id, dragi.move_scope || dragi.el, x - dragi.el._drag.x, y - dragi.el._drag.y, x, y, e);
-        }
-    },
-    dragUp = function (e) {
-        R.unmousemove(dragMove).unmouseup(dragUp);
-        var i = drag.length,
-            dragi;
-        while (i--) {
-            dragi = drag[i];
-            dragi.el._drag = {};
-            eve("raphael.drag.end." + dragi.el.id, dragi.end_scope || dragi.start_scope || dragi.move_scope || dragi.el, e);
-        }
-        drag = [];
-    },
-    
-    elproto = R.el = {};
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    for (var i = events.length; i--;) {
-        (function (eventName) {
-            R[eventName] = elproto[eventName] = function (fn, scope) {
-                if (R.is(fn, "function")) {
-                    this.events = this.events || [];
-                    this.events.push({name: eventName, f: fn, unbind: addEvent(this.shape || this.node || g.doc, eventName, fn, scope || this)});
-                }
-                return this;
-            };
-            R["un" + eventName] = elproto["un" + eventName] = function (fn) {
-                var events = this.events || [],
-                    l = events.length;
-                while (l--) if (events[l].name == eventName && events[l].f == fn) {
-                    events[l].unbind();
-                    events.splice(l, 1);
-                    !events.length && delete this.events;
-                    return this;
-                }
-                return this;
-            };
-        })(events[i]);
-    }
-    
-    
-    elproto.data = function (key, value) {
-        var data = eldata[this.id] = eldata[this.id] || {};
-        if (arguments.length == 1) {
-            if (R.is(key, "object")) {
-                for (var i in key) if (key[has](i)) {
-                    this.data(i, key[i]);
-                }
-                return this;
-            }
-            eve("raphael.data.get." + this.id, this, data[key], key);
-            return data[key];
-        }
-        data[key] = value;
-        eve("raphael.data.set." + this.id, this, value, key);
-        return this;
-    };
-    
-    elproto.removeData = function (key) {
-        if (key == null) {
-            eldata[this.id] = {};
-        } else {
-            eldata[this.id] && delete eldata[this.id][key];
-        }
-        return this;
-    };
-    
-    elproto.hover = function (f_in, f_out, scope_in, scope_out) {
-        return this.mouseover(f_in, scope_in).mouseout(f_out, scope_out || scope_in);
-    };
-    
-    elproto.unhover = function (f_in, f_out) {
-        return this.unmouseover(f_in).unmouseout(f_out);
-    };
-    var draggable = [];
-    
-    elproto.drag = function (onmove, onstart, onend, move_scope, start_scope, end_scope) {
-        function start(e) {
-            (e.originalEvent || e).preventDefault();
-            var scrollY = g.doc.documentElement.scrollTop || g.doc.body.scrollTop,
-                scrollX = g.doc.documentElement.scrollLeft || g.doc.body.scrollLeft;
-            this._drag.x = e.clientX + scrollX;
-            this._drag.y = e.clientY + scrollY;
-            this._drag.id = e.identifier;
-            !drag.length && R.mousemove(dragMove).mouseup(dragUp);
-            drag.push({el: this, move_scope: move_scope, start_scope: start_scope, end_scope: end_scope});
-            onstart && eve.on("raphael.drag.start." + this.id, onstart);
-            onmove && eve.on("raphael.drag.move." + this.id, onmove);
-            onend && eve.on("raphael.drag.end." + this.id, onend);
-            eve("raphael.drag.start." + this.id, start_scope || move_scope || this, e.clientX + scrollX, e.clientY + scrollY, e);
-        }
-        this._drag = {};
-        draggable.push({el: this, start: start});
-        this.mousedown(start);
-        return this;
-    };
-    
-    elproto.onDragOver = function (f) {
-        f ? eve.on("raphael.drag.over." + this.id, f) : eve.unbind("raphael.drag.over." + this.id);
-    };
-    
-    elproto.undrag = function () {
-        var i = draggable.length;
-        while (i--) if (draggable[i].el == this) {
-            this.unmousedown(draggable[i].start);
-            draggable.splice(i, 1);
-            eve.unbind("raphael.drag.*." + this.id);
-        }
-        !draggable.length && R.unmousemove(dragMove).unmouseup(dragUp);
-    };
-    
-    paperproto.circle = function (x, y, r) {
-        var out = R._engine.circle(this, x || 0, y || 0, r || 0);
-        this.__set__ && this.__set__.push(out);
-        return out;
-    };
-    
-    paperproto.rect = function (x, y, w, h, r) {
-        var out = R._engine.rect(this, x || 0, y || 0, w || 0, h || 0, r || 0);
-        this.__set__ && this.__set__.push(out);
-        return out;
-    };
-    
-    paperproto.ellipse = function (x, y, rx, ry) {
-        var out = R._engine.ellipse(this, x || 0, y || 0, rx || 0, ry || 0);
-        this.__set__ && this.__set__.push(out);
-        return out;
-    };
-    
-    paperproto.path = function (pathString) {
-        pathString && !R.is(pathString, string) && !R.is(pathString[0], array) && (pathString += E);
-        var out = R._engine.path(R.format[apply](R, arguments), this);
-        this.__set__ && this.__set__.push(out);
-        return out;
-    };
-    
-    paperproto.image = function (src, x, y, w, h) {
-        var out = R._engine.image(this, src || "about:blank", x || 0, y || 0, w || 0, h || 0);
-        this.__set__ && this.__set__.push(out);
-        return out;
-    };
-    
-    paperproto.text = function (x, y, text) {
-        var out = R._engine.text(this, x || 0, y || 0, Str(text));
-        this.__set__ && this.__set__.push(out);
-        return out;
-    };
-    
-    paperproto.set = function (itemsArray) {
-        !R.is(itemsArray, "array") && (itemsArray = Array.prototype.splice.call(arguments, 0, arguments.length));
-        var out = new Set(itemsArray);
-        this.__set__ && this.__set__.push(out);
-        return out;
-    };
-    
-    paperproto.setStart = function (set) {
-        this.__set__ = set || this.set();
-    };
-    
-    paperproto.setFinish = function (set) {
-        var out = this.__set__;
-        delete this.__set__;
-        return out;
-    };
-    
-    paperproto.setSize = function (width, height) {
-        return R._engine.setSize.call(this, width, height);
-    };
-    
-    paperproto.setViewBox = function (x, y, w, h, fit) {
-        return R._engine.setViewBox.call(this, x, y, w, h, fit);
-    };
-    
-    
-    paperproto.top = paperproto.bottom = null;
-    
-    paperproto.raphael = R;
-    var getOffset = function (elem) {
-        var box = elem.getBoundingClientRect(),
-            doc = elem.ownerDocument,
-            body = doc.body,
-            docElem = doc.documentElement,
-            clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0,
-            top  = box.top  + (g.win.pageYOffset || docElem.scrollTop || body.scrollTop ) - clientTop,
-            left = box.left + (g.win.pageXOffset || docElem.scrollLeft || body.scrollLeft) - clientLeft;
-        return {
-            y: top,
-            x: left
-        };
-    };
-    
-    paperproto.getElementByPoint = function (x, y) {
-        var paper = this,
-            svg = paper.canvas,
-            target = g.doc.elementFromPoint(x, y);
-        if (g.win.opera && target.tagName == "svg") {
-            var so = getOffset(svg),
-                sr = svg.createSVGRect();
-            sr.x = x - so.x;
-            sr.y = y - so.y;
-            sr.width = sr.height = 1;
-            var hits = svg.getIntersectionList(sr, null);
-            if (hits.length) {
-                target = hits[hits.length - 1];
-            }
-        }
-        if (!target) {
-            return null;
-        }
-        while (target.parentNode && target != svg.parentNode && !target.raphael) {
-            target = target.parentNode;
-        }
-        target == paper.canvas.parentNode && (target = svg);
-        target = target && target.raphael ? paper.getById(target.raphaelid) : null;
-        return target;
-    };
-    
-    paperproto.getById = function (id) {
-        var bot = this.bottom;
-        while (bot) {
-            if (bot.id == id) {
-                return bot;
-            }
-            bot = bot.next;
-        }
-        return null;
-    };
-    
-    paperproto.forEach = function (callback, thisArg) {
-        var bot = this.bottom;
-        while (bot) {
-            if (callback.call(thisArg, bot) === false) {
-                return this;
-            }
-            bot = bot.next;
-        }
-        return this;
-    };
-    
-    paperproto.getElementsByPoint = function (x, y) {
-        var set = this.set();
-        this.forEach(function (el) {
-            if (el.isPointInside(x, y)) {
-                set.push(el);
-            }
-        });
-        return set;
-    };
-    function x_y() {
-        return this.x + S + this.y;
-    }
-    function x_y_w_h() {
-        return this.x + S + this.y + S + this.width + " \xd7 " + this.height;
-    }
-    
-    elproto.isPointInside = function (x, y) {
-        var rp = this.realPath = this.realPath || getPath[this.type](this);
-        return R.isPointInsidePath(rp, x, y);
-    };
-    
-    elproto.getBBox = function (isWithoutTransform) {
-        if (this.removed) {
-            return {};
-        }
-        var _ = this._;
-        if (isWithoutTransform) {
-            if (_.dirty || !_.bboxwt) {
-                this.realPath = getPath[this.type](this);
-                _.bboxwt = pathDimensions(this.realPath);
-                _.bboxwt.toString = x_y_w_h;
-                _.dirty = 0;
-            }
-            return _.bboxwt;
-        }
-        if (_.dirty || _.dirtyT || !_.bbox) {
-            if (_.dirty || !this.realPath) {
-                _.bboxwt = 0;
-                this.realPath = getPath[this.type](this);
-            }
-            _.bbox = pathDimensions(mapPath(this.realPath, this.matrix));
-            _.bbox.toString = x_y_w_h;
-            _.dirty = _.dirtyT = 0;
-        }
-        return _.bbox;
-    };
-    
-    elproto.clone = function () {
-        if (this.removed) {
-            return null;
-        }
-        var out = this.paper[this.type]().attr(this.attr());
-        this.__set__ && this.__set__.push(out);
-        return out;
-    };
-    
-    elproto.glow = function (glow) {
-        if (this.type == "text") {
-            return null;
-        }
-        glow = glow || {};
-        var s = {
-            width: (glow.width || 10) + (+this.attr("stroke-width") || 1),
-            fill: glow.fill || false,
-            opacity: glow.opacity || .5,
-            offsetx: glow.offsetx || 0,
-            offsety: glow.offsety || 0,
-            color: glow.color || "#000"
-        },
-            c = s.width / 2,
-            r = this.paper,
-            out = r.set(),
-            path = this.realPath || getPath[this.type](this);
-        path = this.matrix ? mapPath(path, this.matrix) : path;
-        for (var i = 1; i < c + 1; i++) {
-            out.push(r.path(path).attr({
-                stroke: s.color,
-                fill: s.fill ? s.color : "none",
-                "stroke-linejoin": "round",
-                "stroke-linecap": "round",
-                "stroke-width": +(s.width / c * i).toFixed(3),
-                opacity: +(s.opacity / c).toFixed(3)
-            }));
-        }
-        return out.insertBefore(this).translate(s.offsetx, s.offsety);
-    };
-    var curveslengths = {},
-    getPointAtSegmentLength = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, length) {
-        if (length == null) {
-            return bezlen(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y);
-        } else {
-            return R.findDotsAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, getTatLen(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, length));
-        }
-    },
-    getLengthFactory = function (istotal, subpath) {
-        return function (path, length, onlystart) {
-            path = path2curve(path);
-            var x, y, p, l, sp = "", subpaths = {}, point,
-                len = 0;
-            for (var i = 0, ii = path.length; i < ii; i++) {
-                p = path[i];
-                if (p[0] == "M") {
-                    x = +p[1];
-                    y = +p[2];
-                } else {
-                    l = getPointAtSegmentLength(x, y, p[1], p[2], p[3], p[4], p[5], p[6]);
-                    if (len + l > length) {
-                        if (subpath && !subpaths.start) {
-                            point = getPointAtSegmentLength(x, y, p[1], p[2], p[3], p[4], p[5], p[6], length - len);
-                            sp += ["C" + point.start.x, point.start.y, point.m.x, point.m.y, point.x, point.y];
-                            if (onlystart) {return sp;}
-                            subpaths.start = sp;
-                            sp = ["M" + point.x, point.y + "C" + point.n.x, point.n.y, point.end.x, point.end.y, p[5], p[6]].join();
-                            len += l;
-                            x = +p[5];
-                            y = +p[6];
-                            continue;
-                        }
-                        if (!istotal && !subpath) {
-                            point = getPointAtSegmentLength(x, y, p[1], p[2], p[3], p[4], p[5], p[6], length - len);
-                            return {x: point.x, y: point.y, alpha: point.alpha};
-                        }
-                    }
-                    len += l;
-                    x = +p[5];
-                    y = +p[6];
-                }
-                sp += p.shift() + p;
-            }
-            subpaths.end = sp;
-            point = istotal ? len : subpath ? subpaths : R.findDotsAtSegment(x, y, p[0], p[1], p[2], p[3], p[4], p[5], 1);
-            point.alpha && (point = {x: point.x, y: point.y, alpha: point.alpha});
-            return point;
-        };
-    };
-    var getTotalLength = getLengthFactory(1),
-        getPointAtLength = getLengthFactory(),
-        getSubpathsAtLength = getLengthFactory(0, 1);
-    
-    R.getTotalLength = getTotalLength;
-    
-    R.getPointAtLength = getPointAtLength;
-    
-    R.getSubpath = function (path, from, to) {
-        if (this.getTotalLength(path) - to < 1e-6) {
-            return getSubpathsAtLength(path, from).end;
-        }
-        var a = getSubpathsAtLength(path, to, 1);
-        return from ? getSubpathsAtLength(a, from).end : a;
-    };
-    
-    elproto.getTotalLength = function () {
-        if (this.type != "path") {return;}
-        if (this.node.getTotalLength) {
-            return this.node.getTotalLength();
-        }
-        return getTotalLength(this.attrs.path);
-    };
-    
-    elproto.getPointAtLength = function (length) {
-        if (this.type != "path") {return;}
-        return getPointAtLength(this.attrs.path, length);
-    };
-    
-    elproto.getSubpath = function (from, to) {
-        if (this.type != "path") {return;}
-        return R.getSubpath(this.attrs.path, from, to);
-    };
-    
-    var ef = R.easing_formulas = {
-        linear: function (n) {
-            return n;
-        },
-        "<": function (n) {
-            return pow(n, 1.7);
-        },
-        ">": function (n) {
-            return pow(n, .48);
-        },
-        "<>": function (n) {
-            var q = .48 - n / 1.04,
-                Q = math.sqrt(.1734 + q * q),
-                x = Q - q,
-                X = pow(abs(x), 1 / 3) * (x < 0 ? -1 : 1),
-                y = -Q - q,
-                Y = pow(abs(y), 1 / 3) * (y < 0 ? -1 : 1),
-                t = X + Y + .5;
-            return (1 - t) * 3 * t * t + t * t * t;
-        },
-        backIn: function (n) {
-            var s = 1.70158;
-            return n * n * ((s + 1) * n - s);
-        },
-        backOut: function (n) {
-            n = n - 1;
-            var s = 1.70158;
-            return n * n * ((s + 1) * n + s) + 1;
-        },
-        elastic: function (n) {
-            if (n == !!n) {
-                return n;
-            }
-            return pow(2, -10 * n) * math.sin((n - .075) * (2 * PI) / .3) + 1;
-        },
-        bounce: function (n) {
-            var s = 7.5625,
-                p = 2.75,
-                l;
-            if (n < (1 / p)) {
-                l = s * n * n;
-            } else {
-                if (n < (2 / p)) {
-                    n -= (1.5 / p);
-                    l = s * n * n + .75;
-                } else {
-                    if (n < (2.5 / p)) {
-                        n -= (2.25 / p);
-                        l = s * n * n + .9375;
-                    } else {
-                        n -= (2.625 / p);
-                        l = s * n * n + .984375;
-                    }
-                }
-            }
-            return l;
-        }
-    };
-    ef.easeIn = ef["ease-in"] = ef["<"];
-    ef.easeOut = ef["ease-out"] = ef[">"];
-    ef.easeInOut = ef["ease-in-out"] = ef["<>"];
-    ef["back-in"] = ef.backIn;
-    ef["back-out"] = ef.backOut;
-
-    var animationElements = [],
-        requestAnimFrame = window.requestAnimationFrame       ||
-                           window.webkitRequestAnimationFrame ||
-                           window.mozRequestAnimationFrame    ||
-                           window.oRequestAnimationFrame      ||
-                           window.msRequestAnimationFrame     ||
-                           function (callback) {
-                               setTimeout(callback, 16);
-                           },
-        animation = function () {
-            var Now = +new Date,
-                l = 0;
-            for (; l < animationElements.length; l++) {
-                var e = animationElements[l];
-                if (e.el.removed || e.paused) {
-                    continue;
-                }
-                var time = Now - e.start,
-                    ms = e.ms,
-                    easing = e.easing,
-                    from = e.from,
-                    diff = e.diff,
-                    to = e.to,
-                    t = e.t,
-                    that = e.el,
-                    set = {},
-                    now,
-                    init = {},
-                    key;
-                if (e.initstatus) {
-                    time = (e.initstatus * e.anim.top - e.prev) / (e.percent - e.prev) * ms;
-                    e.status = e.initstatus;
-                    delete e.initstatus;
-                    e.stop && animationElements.splice(l--, 1);
-                } else {
-                    e.status = (e.prev + (e.percent - e.prev) * (time / ms)) / e.anim.top;
-                }
-                if (time < 0) {
-                    continue;
-                }
-                if (time < ms) {
-                    var pos = easing(time / ms);
-                    for (var attr in from) if (from[has](attr)) {
-                        switch (availableAnimAttrs[attr]) {
-                            case nu:
-                                now = +from[attr] + pos * ms * diff[attr];
-                                break;
-                            case "colour":
-                                now = "rgb(" + [
-                                    upto255(round(from[attr].r + pos * ms * diff[attr].r)),
-                                    upto255(round(from[attr].g + pos * ms * diff[attr].g)),
-                                    upto255(round(from[attr].b + pos * ms * diff[attr].b))
-                                ].join(",") + ")";
-                                break;
-                            case "path":
-                                now = [];
-                                for (var i = 0, ii = from[attr].length; i < ii; i++) {
-                                    now[i] = [from[attr][i][0]];
-                                    for (var j = 1, jj = from[attr][i].length; j < jj; j++) {
-                                        now[i][j] = +from[attr][i][j] + pos * ms * diff[attr][i][j];
-                                    }
-                                    now[i] = now[i].join(S);
-                                }
-                                now = now.join(S);
-                                break;
-                            case "transform":
-                                if (diff[attr].real) {
-                                    now = [];
-                                    for (i = 0, ii = from[attr].length; i < ii; i++) {
-                                        now[i] = [from[attr][i][0]];
-                                        for (j = 1, jj = from[attr][i].length; j < jj; j++) {
-                                            now[i][j] = from[attr][i][j] + pos * ms * diff[attr][i][j];
-                                        }
-                                    }
-                                } else {
-                                    var get = function (i) {
-                                        return +from[attr][i] + pos * ms * diff[attr][i];
-                                    };
-                                    // now = [["r", get(2), 0, 0], ["t", get(3), get(4)], ["s", get(0), get(1), 0, 0]];
-                                    now = [["m", get(0), get(1), get(2), get(3), get(4), get(5)]];
-                                }
-                                break;
-                            case "csv":
-                                if (attr == "clip-rect") {
-                                    now = [];
-                                    i = 4;
-                                    while (i--) {
-                                        now[i] = +from[attr][i] + pos * ms * diff[attr][i];
-                                    }
-                                }
-                                break;
-                            default:
-                                var from2 = [][concat](from[attr]);
-                                now = [];
-                                i = that.paper.customAttributes[attr].length;
-                                while (i--) {
-                                    now[i] = +from2[i] + pos * ms * diff[attr][i];
-                                }
-                                break;
-                        }
-                        set[attr] = now;
-                    }
-                    that.attr(set);
-                    (function (id, that, anim) {
-                        setTimeout(function () {
-                            eve("raphael.anim.frame." + id, that, anim);
-                        });
-                    })(that.id, that, e.anim);
-                } else {
-                    (function(f, el, a) {
-                        setTimeout(function() {
-                            eve("raphael.anim.frame." + el.id, el, a);
-                            eve("raphael.anim.finish." + el.id, el, a);
-                            R.is(f, "function") && f.call(el);
-                        });
-                    })(e.callback, that, e.anim);
-                    that.attr(to);
-                    animationElements.splice(l--, 1);
-                    if (e.repeat > 1 && !e.next) {
-                        for (key in to) if (to[has](key)) {
-                            init[key] = e.totalOrigin[key];
-                        }
-                        e.el.attr(init);
-                        runAnimation(e.anim, e.el, e.anim.percents[0], null, e.totalOrigin, e.repeat - 1);
-                    }
-                    if (e.next && !e.stop) {
-                        runAnimation(e.anim, e.el, e.next, null, e.totalOrigin, e.repeat);
-                    }
-                }
-            }
-            R.svg && that && that.paper && that.paper.safari();
-            animationElements.length && requestAnimFrame(animation);
-        },
-        upto255 = function (color) {
-            return color > 255 ? 255 : color < 0 ? 0 : color;
-        };
-    
-    elproto.animateWith = function (el, anim, params, ms, easing, callback) {
-        var element = this;
-        if (element.removed) {
-            callback && callback.call(element);
-            return element;
-        }
-        var a = params instanceof Animation ? params : R.animation(params, ms, easing, callback),
-            x, y;
-        runAnimation(a, element, a.percents[0], null, element.attr());
-        for (var i = 0, ii = animationElements.length; i < ii; i++) {
-            if (animationElements[i].anim == anim && animationElements[i].el == el) {
-                animationElements[ii - 1].start = animationElements[i].start;
-                break;
-            }
-        }
-        return element;
-        // 
-        // 
-        // var a = params ? R.animation(params, ms, easing, callback) : anim,
-        //     status = element.status(anim);
-        // return this.animate(a).status(a, status * anim.ms / a.ms);
-    };
-    function CubicBezierAtTime(t, p1x, p1y, p2x, p2y, duration) {
-        var cx = 3 * p1x,
-            bx = 3 * (p2x - p1x) - cx,
-            ax = 1 - cx - bx,
-            cy = 3 * p1y,
-            by = 3 * (p2y - p1y) - cy,
-            ay = 1 - cy - by;
-        function sampleCurveX(t) {
-            return ((ax * t + bx) * t + cx) * t;
-        }
-        function solve(x, epsilon) {
-            var t = solveCurveX(x, epsilon);
-            return ((ay * t + by) * t + cy) * t;
-        }
-        function solveCurveX(x, epsilon) {
-            var t0, t1, t2, x2, d2, i;
-            for(t2 = x, i = 0; i < 8; i++) {
-                x2 = sampleCurveX(t2) - x;
-                if (abs(x2) < epsilon) {
-                    return t2;
-                }
-                d2 = (3 * ax * t2 + 2 * bx) * t2 + cx;
-                if (abs(d2) < 1e-6) {
-                    break;
-                }
-                t2 = t2 - x2 / d2;
-            }
-            t0 = 0;
-            t1 = 1;
-            t2 = x;
-            if (t2 < t0) {
-                return t0;
-            }
-            if (t2 > t1) {
-                return t1;
-            }
-            while (t0 < t1) {
-                x2 = sampleCurveX(t2);
-                if (abs(x2 - x) < epsilon) {
-                    return t2;
-                }
-                if (x > x2) {
-                    t0 = t2;
-                } else {
-                    t1 = t2;
-                }
-                t2 = (t1 - t0) / 2 + t0;
-            }
-            return t2;
-        }
-        return solve(t, 1 / (200 * duration));
-    }
-    elproto.onAnimation = function (f) {
-        f ? eve.on("raphael.anim.frame." + this.id, f) : eve.unbind("raphael.anim.frame." + this.id);
-        return this;
-    };
-    function Animation(anim, ms) {
-        var percents = [],
-            newAnim = {};
-        this.ms = ms;
-        this.times = 1;
-        if (anim) {
-            for (var attr in anim) if (anim[has](attr)) {
-                newAnim[toFloat(attr)] = anim[attr];
-                percents.push(toFloat(attr));
-            }
-            percents.sort(sortByNumber);
-        }
-        this.anim = newAnim;
-        this.top = percents[percents.length - 1];
-        this.percents = percents;
-    }
-    
-    Animation.prototype.delay = function (delay) {
-        var a = new Animation(this.anim, this.ms);
-        a.times = this.times;
-        a.del = +delay || 0;
-        return a;
-    };
-    
-    Animation.prototype.repeat = function (times) { 
-        var a = new Animation(this.anim, this.ms);
-        a.del = this.del;
-        a.times = math.floor(mmax(times, 0)) || 1;
-        return a;
-    };
-    function runAnimation(anim, element, percent, status, totalOrigin, times) {
-        percent = toFloat(percent);
-        var params,
-            isInAnim,
-            isInAnimSet,
-            percents = [],
-            next,
-            prev,
-            timestamp,
-            ms = anim.ms,
-            from = {},
-            to = {},
-            diff = {};
-        if (status) {
-            for (i = 0, ii = animationElements.length; i < ii; i++) {
-                var e = animationElements[i];
-                if (e.el.id == element.id && e.anim == anim) {
-                    if (e.percent != percent) {
-                        animationElements.splice(i, 1);
-                        isInAnimSet = 1;
-                    } else {
-                        isInAnim = e;
-                    }
-                    element.attr(e.totalOrigin);
-                    break;
-                }
-            }
-        } else {
-            status = +to; // NaN
-        }
-        for (var i = 0, ii = anim.percents.length; i < ii; i++) {
-            if (anim.percents[i] == percent || anim.percents[i] > status * anim.top) {
-                percent = anim.percents[i];
-                prev = anim.percents[i - 1] || 0;
-                ms = ms / anim.top * (percent - prev);
-                next = anim.percents[i + 1];
-                params = anim.anim[percent];
-                break;
-            } else if (status) {
-                element.attr(anim.anim[anim.percents[i]]);
-            }
-        }
-        if (!params) {
-            return;
-        }
-        if (!isInAnim) {
-            for (var attr in params) if (params[has](attr)) {
-                if (availableAnimAttrs[has](attr) || element.paper.customAttributes[has](attr)) {
-                    from[attr] = element.attr(attr);
-                    (from[attr] == null) && (from[attr] = availableAttrs[attr]);
-                    to[attr] = params[attr];
-                    switch (availableAnimAttrs[attr]) {
-                        case nu:
-                            diff[attr] = (to[attr] - from[attr]) / ms;
-                            break;
-                        case "colour":
-                            from[attr] = R.getRGB(from[attr]);
-                            var toColour = R.getRGB(to[attr]);
-                            diff[attr] = {
-                                r: (toColour.r - from[attr].r) / ms,
-                                g: (toColour.g - from[attr].g) / ms,
-                                b: (toColour.b - from[attr].b) / ms
-                            };
-                            break;
-                        case "path":
-                            var pathes = path2curve(from[attr], to[attr]),
-                                toPath = pathes[1];
-                            from[attr] = pathes[0];
-                            diff[attr] = [];
-                            for (i = 0, ii = from[attr].length; i < ii; i++) {
-                                diff[attr][i] = [0];
-                                for (var j = 1, jj = from[attr][i].length; j < jj; j++) {
-                                    diff[attr][i][j] = (toPath[i][j] - from[attr][i][j]) / ms;
-                                }
-                            }
-                            break;
-                        case "transform":
-                            var _ = element._,
-                                eq = equaliseTransform(_[attr], to[attr]);
-                            if (eq) {
-                                from[attr] = eq.from;
-                                to[attr] = eq.to;
-                                diff[attr] = [];
-                                diff[attr].real = true;
-                                for (i = 0, ii = from[attr].length; i < ii; i++) {
-                                    diff[attr][i] = [from[attr][i][0]];
-                                    for (j = 1, jj = from[attr][i].length; j < jj; j++) {
-                                        diff[attr][i][j] = (to[attr][i][j] - from[attr][i][j]) / ms;
-                                    }
-                                }
-                            } else {
-                                var m = (element.matrix || new Matrix),
-                                    to2 = {
-                                        _: {transform: _.transform},
-                                        getBBox: function () {
-                                            return element.getBBox(1);
-                                        }
-                                    };
-                                from[attr] = [
-                                    m.a,
-                                    m.b,
-                                    m.c,
-                                    m.d,
-                                    m.e,
-                                    m.f
-                                ];
-                                extractTransform(to2, to[attr]);
-                                to[attr] = to2._.transform;
-                                diff[attr] = [
-                                    (to2.matrix.a - m.a) / ms,
-                                    (to2.matrix.b - m.b) / ms,
-                                    (to2.matrix.c - m.c) / ms,
-                                    (to2.matrix.d - m.d) / ms,
-                                    (to2.matrix.e - m.e) / ms,
-                                    (to2.matrix.f - m.f) / ms
-                                ];
-                                // from[attr] = [_.sx, _.sy, _.deg, _.dx, _.dy];
-                                // var to2 = {_:{}, getBBox: function () { return element.getBBox(); }};
-                                // extractTransform(to2, to[attr]);
-                                // diff[attr] = [
-                                //     (to2._.sx - _.sx) / ms,
-                                //     (to2._.sy - _.sy) / ms,
-                                //     (to2._.deg - _.deg) / ms,
-                                //     (to2._.dx - _.dx) / ms,
-                                //     (to2._.dy - _.dy) / ms
-                                // ];
-                            }
-                            break;
-                        case "csv":
-                            var values = Str(params[attr])[split](separator),
-                                from2 = Str(from[attr])[split](separator);
-                            if (attr == "clip-rect") {
-                                from[attr] = from2;
-                                diff[attr] = [];
-                                i = from2.length;
-                                while (i--) {
-                                    diff[attr][i] = (values[i] - from[attr][i]) / ms;
-                                }
-                            }
-                            to[attr] = values;
-                            break;
-                        default:
-                            values = [][concat](params[attr]);
-                            from2 = [][concat](from[attr]);
-                            diff[attr] = [];
-                            i = element.paper.customAttributes[attr].length;
-                            while (i--) {
-                                diff[attr][i] = ((values[i] || 0) - (from2[i] || 0)) / ms;
-                            }
-                            break;
-                    }
-                }
-            }
-            var easing = params.easing,
-                easyeasy = R.easing_formulas[easing];
-            if (!easyeasy) {
-                easyeasy = Str(easing).match(bezierrg);
-                if (easyeasy && easyeasy.length == 5) {
-                    var curve = easyeasy;
-                    easyeasy = function (t) {
-                        return CubicBezierAtTime(t, +curve[1], +curve[2], +curve[3], +curve[4], ms);
-                    };
-                } else {
-                    easyeasy = pipe;
-                }
-            }
-            timestamp = params.start || anim.start || +new Date;
-            e = {
-                anim: anim,
-                percent: percent,
-                timestamp: timestamp,
-                start: timestamp + (anim.del || 0),
-                status: 0,
-                initstatus: status || 0,
-                stop: false,
-                ms: ms,
-                easing: easyeasy,
-                from: from,
-                diff: diff,
-                to: to,
-                el: element,
-                callback: params.callback,
-                prev: prev,
-                next: next,
-                repeat: times || anim.times,
-                origin: element.attr(),
-                totalOrigin: totalOrigin
-            };
-            animationElements.push(e);
-            if (status && !isInAnim && !isInAnimSet) {
-                e.stop = true;
-                e.start = new Date - ms * status;
-                if (animationElements.length == 1) {
-                    return animation();
-                }
-            }
-            if (isInAnimSet) {
-                e.start = new Date - e.ms * status;
-            }
-            animationElements.length == 1 && requestAnimFrame(animation);
-        } else {
-            isInAnim.initstatus = status;
-            isInAnim.start = new Date - isInAnim.ms * status;
-        }
-        eve("raphael.anim.start." + element.id, element, anim);
-    }
-    
-    R.animation = function (params, ms, easing, callback) {
-        if (params instanceof Animation) {
-            return params;
-        }
-        if (R.is(easing, "function") || !easing) {
-            callback = callback || easing || null;
-            easing = null;
-        }
-        params = Object(params);
-        ms = +ms || 0;
-        var p = {},
-            json,
-            attr;
-        for (attr in params) if (params[has](attr) && toFloat(attr) != attr && toFloat(attr) + "%" != attr) {
-            json = true;
-            p[attr] = params[attr];
-        }
-        if (!json) {
-            return new Animation(params, ms);
-        } else {
-            easing && (p.easing = easing);
-            callback && (p.callback = callback);
-            return new Animation({100: p}, ms);
-        }
-    };
-    
-    elproto.animate = function (params, ms, easing, callback) {
-        var element = this;
-        if (element.removed) {
-            callback && callback.call(element);
-            return element;
-        }
-        var anim = params instanceof Animation ? params : R.animation(params, ms, easing, callback);
-        runAnimation(anim, element, anim.percents[0], null, element.attr());
-        return element;
-    };
-    
-    elproto.setTime = function (anim, value) {
-        if (anim && value != null) {
-            this.status(anim, mmin(value, anim.ms) / anim.ms);
-        }
-        return this;
-    };
-    
-    elproto.status = function (anim, value) {
-        var out = [],
-            i = 0,
-            len,
-            e;
-        if (value != null) {
-            runAnimation(anim, this, -1, mmin(value, 1));
-            return this;
-        } else {
-            len = animationElements.length;
-            for (; i < len; i++) {
-                e = animationElements[i];
-                if (e.el.id == this.id && (!anim || e.anim == anim)) {
-                    if (anim) {
-                        return e.status;
-                    }
-                    out.push({
-                        anim: e.anim,
-                        status: e.status
-                    });
-                }
-            }
-            if (anim) {
-                return 0;
-            }
-            return out;
-        }
-    };
-    
-    elproto.pause = function (anim) {
-        for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) {
-            if (eve("raphael.anim.pause." + this.id, this, animationElements[i].anim) !== false) {
-                animationElements[i].paused = true;
-            }
-        }
-        return this;
-    };
-    
-    elproto.resume = function (anim) {
-        for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) {
-            var e = animationElements[i];
-            if (eve("raphael.anim.resume." + this.id, this, e.anim) !== false) {
-                delete e.paused;
-                this.status(e.anim, e.status);
-            }
-        }
-        return this;
-    };
-    
-    elproto.stop = function (anim) {
-        for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) {
-            if (eve("raphael.anim.stop." + this.id, this, animationElements[i].anim) !== false) {
-                animationElements.splice(i--, 1);
-            }
-        }
-        return this;
-    };
-    function stopAnimation(paper) {
-        for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.paper == paper) {
-            animationElements.splice(i--, 1);
-        }
-    }
-    eve.on("raphael.remove", stopAnimation);
-    eve.on("raphael.clear", stopAnimation);
-    elproto.toString = function () {
-        return "Rapha\xebl\u2019s object";
-    };
-
-    // Set
-    var Set = function (items) {
-        this.items = [];
-        this.length = 0;
-        this.type = "set";
-        if (items) {
-            for (var i = 0, ii = items.length; i < ii; i++) {
-                if (items[i] && (items[i].constructor == elproto.constructor || items[i].constructor == Set)) {
-                    this[this.items.length] = this.items[this.items.length] = items[i];
-                    this.length++;
-                }
-            }
-        }
-    },
-    setproto = Set.prototype;
-    
-    setproto.push = function () {
-        var item,
-            len;
-        for (var i = 0, ii = arguments.length; i < ii; i++) {
-            item = arguments[i];
-            if (item && (item.constructor == elproto.constructor || item.constructor == Set)) {
-                len = this.items.length;
-                this[len] = this.items[len] = item;
-                this.length++;
-            }
-        }
-        return this;
-    };
-    
-    setproto.pop = function () {
-        this.length && delete this[this.length--];
-        return this.items.pop();
-    };
-    
-    setproto.forEach = function (callback, thisArg) {
-        for (var i = 0, ii = this.items.length; i < ii; i++) {
-            if (callback.call(thisArg, this.items[i], i) === false) {
-                return this;
-            }
-        }
-        return this;
-    };
-    for (var method in elproto) if (elproto[has](method)) {
-        setproto[method] = (function (methodname) {
-            return function () {
-                var arg = arguments;
-                return this.forEach(function (el) {
-                    el[methodname][apply](el, arg);
-                });
-            };
-        })(method);
-    }
-    setproto.attr = function (name, value) {
-        if (name && R.is(name, array) && R.is(name[0], "object")) {
-            for (var j = 0, jj = name.length; j < jj; j++) {
-                this.items[j].attr(name[j]);
-            }
-        } else {
-            for (var i = 0, ii = this.items.length; i < ii; i++) {
-                this.items[i].attr(name, value);
-            }
-        }
-        return this;
-    };
-    
-    setproto.clear = function () {
-        while (this.length) {
-            this.pop();
-        }
-    };
-    
-    setproto.splice = function (index, count, insertion) {
-        index = index < 0 ? mmax(this.length + index, 0) : index;
-        count = mmax(0, mmin(this.length - index, count));
-        var tail = [],
-            todel = [],
-            args = [],
-            i;
-        for (i = 2; i < arguments.length; i++) {
-            args.push(arguments[i]);
-        }
-        for (i = 0; i < count; i++) {
-            todel.push(this[index + i]);
-        }
-        for (; i < this.length - index; i++) {
-            tail.push(this[index + i]);
-        }
-        var arglen = args.length;
-        for (i = 0; i < arglen + tail.length; i++) {
-            this.items[index + i] = this[index + i] = i < arglen ? args[i] : tail[i - arglen];
-        }
-        i = this.items.length = this.length -= count - arglen;
-        while (this[i]) {
-            delete this[i++];
-        }
-        return new Set(todel);
-    };
-    
-    setproto.exclude = function (el) {
-        for (var i = 0, ii = this.length; i < ii; i++) if (this[i] == el) {
-            this.splice(i, 1);
-            return true;
-        }
-    };
-    setproto.animate = function (params, ms, easing, callback) {
-        (R.is(easing, "function") || !easing) && (callback = easing || null);
-        var len = this.items.length,
-            i = len,
-            item,
-            set = this,
-            collector;
-        if (!len) {
-            return this;
-        }
-        callback && (collector = function () {
-            !--len && callback.call(set);
-        });
-        easing = R.is(easing, string) ? easing : collector;
-        var anim = R.animation(params, ms, easing, collector);
-        item = this.items[--i].animate(anim);
-        while (i--) {
-            this.items[i] && !this.items[i].removed && this.items[i].animateWith(item, anim, anim);
-        }
-        return this;
-    };
-    setproto.insertAfter = function (el) {
-        var i = this.items.length;
-        while (i--) {
-            this.items[i].insertAfter(el);
-        }
-        return this;
-    };
-    setproto.getBBox = function () {
-        var x = [],
-            y = [],
-            x2 = [],
-            y2 = [];
-        for (var i = this.items.length; i--;) if (!this.items[i].removed) {
-            var box = this.items[i].getBBox();
-            x.push(box.x);
-            y.push(box.y);
-            x2.push(box.x + box.width);
-            y2.push(box.y + box.height);
-        }
-        x = mmin[apply](0, x);
-        y = mmin[apply](0, y);
-        x2 = mmax[apply](0, x2);
-        y2 = mmax[apply](0, y2);
-        return {
-            x: x,
-            y: y,
-            x2: x2,
-            y2: y2,
-            width: x2 - x,
-            height: y2 - y
-        };
-    };
-    setproto.clone = function (s) {
-        s = new Set;
-        for (var i = 0, ii = this.items.length; i < ii; i++) {
-            s.push(this.items[i].clone());
-        }
-        return s;
-    };
-    setproto.toString = function () {
-        return "Rapha\xebl\u2018s set";
-    };
-
-    
-    R.registerFont = function (font) {
-        if (!font.face) {
-            return font;
-        }
-        this.fonts = this.fonts || {};
-        var fontcopy = {
-                w: font.w,
-                face: {},
-                glyphs: {}
-            },
-            family = font.face["font-family"];
-        for (var prop in font.face) if (font.face[has](prop)) {
-            fontcopy.face[prop] = font.face[prop];
-        }
-        if (this.fonts[family]) {
-            this.fonts[family].push(fontcopy);
-        } else {
-            this.fonts[family] = [fontcopy];
-        }
-        if (!font.svg) {
-            fontcopy.face["units-per-em"] = toInt(font.face["units-per-em"], 10);
-            for (var glyph in font.glyphs) if (font.glyphs[has](glyph)) {
-                var path = font.glyphs[glyph];
-                fontcopy.glyphs[glyph] = {
-                    w: path.w,
-                    k: {},
-                    d: path.d && "M" + path.d.replace(/[mlcxtrv]/g, function (command) {
-                            return {l: "L", c: "C", x: "z", t: "m", r: "l", v: "c"}[command] || "M";
-                        }) + "z"
-                };
-                if (path.k) {
-                    for (var k in path.k) if (path[has](k)) {
-                        fontcopy.glyphs[glyph].k[k] = path.k[k];
-                    }
-                }
-            }
-        }
-        return font;
-    };
-    
-    paperproto.getFont = function (family, weight, style, stretch) {
-        stretch = stretch || "normal";
-        style = style || "normal";
-        weight = +weight || {normal: 400, bold: 700, lighter: 300, bolder: 800}[weight] || 400;
-        if (!R.fonts) {
-            return;
-        }
-        var font = R.fonts[family];
-        if (!font) {
-            var name = new RegExp("(^|\\s)" + family.replace(/[^\w\d\s+!~.:_-]/g, E) + "(\\s|$)", "i");
-            for (var fontName in R.fonts) if (R.fonts[has](fontName)) {
-                if (name.test(fontName)) {
-                    font = R.fonts[fontName];
-                    break;
-                }
-            }
-        }
-        var thefont;
-        if (font) {
-            for (var i = 0, ii = font.length; i < ii; i++) {
-                thefont = font[i];
-                if (thefont.face["font-weight"] == weight && (thefont.face["font-style"] == style || !thefont.face["font-style"]) && thefont.face["font-stretch"] == stretch) {
-                    break;
-                }
-            }
-        }
-        return thefont;
-    };
-    
-    paperproto.print = function (x, y, string, font, size, origin, letter_spacing) {
-        origin = origin || "middle"; // baseline|middle
-        letter_spacing = mmax(mmin(letter_spacing || 0, 1), -1);
-        var letters = Str(string)[split](E),
-            shift = 0,
-            notfirst = 0,
-            path = E,
-            scale;
-        R.is(font, string) && (font = this.getFont(font));
-        if (font) {
-            scale = (size || 16) / font.face["units-per-em"];
-            var bb = font.face.bbox[split](separator),
-                top = +bb[0],
-                lineHeight = bb[3] - bb[1],
-                shifty = 0,
-                height = +bb[1] + (origin == "baseline" ? lineHeight + (+font.face.descent) : lineHeight / 2);
-            for (var i = 0, ii = letters.length; i < ii; i++) {
-                if (letters[i] == "\n") {
-                    shift = 0;
-                    curr = 0;
-                    notfirst = 0;
-                    shifty += lineHeight;
-                } else {
-                    var prev = notfirst && font.glyphs[letters[i - 1]] || {},
-                        curr = font.glyphs[letters[i]];
-                    shift += notfirst ? (prev.w || font.w) + (prev.k && prev.k[letters[i]] || 0) + (font.w * letter_spacing) : 0;
-                    notfirst = 1;
-                }
-                if (curr && curr.d) {
-                    path += R.transformPath(curr.d, ["t", shift * scale, shifty * scale, "s", scale, scale, top, height, "t", (x - top) / scale, (y - height) / scale]);
-                }
-            }
-        }
-        return this.path(path).attr({
-            fill: "#000",
-            stroke: "none"
-        });
-    };
-
-    
-    paperproto.add = function (json) {
-        if (R.is(json, "array")) {
-            var res = this.set(),
-                i = 0,
-                ii = json.length,
-                j;
-            for (; i < ii; i++) {
-                j = json[i] || {};
-                elements[has](j.type) && res.push(this[j.type]().attr(j));
-            }
-        }
-        return res;
-    };
-
-    
-    R.format = function (token, params) {
-        var args = R.is(params, array) ? [0][concat](params) : arguments;
-        token && R.is(token, string) && args.length - 1 && (token = token.replace(formatrg, function (str, i) {
-            return args[++i] == null ? E : args[i];
-        }));
-        return token || E;
-    };
-    
-    R.fullfill = (function () {
-        var tokenRegex = /\{([^\}]+)\}/g,
-            objNotationRegex = /(?:(?:^|\.)(.+?)(?=\[|\.|$|\()|\[('|")(.+?)\2\])(\(\))?/g, // matches .xxxxx or ["xxxxx"] to run over object properties
-            replacer = function (all, key, obj) {
-                var res = obj;
-                key.replace(objNotationRegex, function (all, name, quote, quotedName, isFunc) {
-                    name = name || quotedName;
-                    if (res) {
-                        if (name in res) {
-                            res = res[name];
-                        }
-                        typeof res == "function" && isFunc && (res = res());
-                    }
-                });
-                res = (res == null || res == obj ? all : res) + "";
-                return res;
-            };
-        return function (str, obj) {
-            return String(str).replace(tokenRegex, function (all, key) {
-                return replacer(all, key, obj);
-            });
-        };
-    })();
-    
-    R.ninja = function () {
-        oldRaphael.was ? (g.win.Raphael = oldRaphael.is) : delete Raphael;
-        return R;
-    };
-    
-    R.st = setproto;
-    // Firefox <3.6 fix: http://webreflection.blogspot.com/2009/11/195-chars-to-help-lazy-loading.html
-    (function (doc, loaded, f) {
-        if (doc.readyState == null && doc.addEventListener){
-            doc.addEventListener(loaded, f = function () {
-                doc.removeEventListener(loaded, f, false);
-                doc.readyState = "complete";
-            }, false);
-            doc.readyState = "loading";
-        }
-        function isLoaded() {
-            (/in/).test(doc.readyState) ? setTimeout(isLoaded, 9) : R.eve("raphael.DOMload");
-        }
-        isLoaded();
-    })(document, "DOMContentLoaded");
-
-    oldRaphael.was ? (g.win.Raphael = R) : (Raphael = R);
-    
-    eve.on("raphael.DOMload", function () {
-        loaded = true;
-    });
+
+	function R(first) {
+		if (R.is(first, "function")) {
+			return loaded ? first() : eve.on("raphael.DOMload", first);
+		} else if (R.is(first, array)) {
+			return R._engine.create[apply](R, first.splice(0, 3 + R.is(first[0], nu))).add(first);
+		} else {
+			var args = Array.prototype.slice.call(arguments, 0);
+			if (R.is(args[args.length - 1], "function")) {
+				var f = args.pop();
+				return loaded ? f.call(R._engine.create[apply](R, args)) : eve.on("raphael.DOMload", function () {
+					f.call(R._engine.create[apply](R, args));
+				});
+			} else {
+				return R._engine.create[apply](R, arguments);
+			}
+		}
+	}
+
+	R.version = "2.1.0";
+	R.eve = eve;
+	var loaded,
+		separator = /[, ]+/,
+		elements = {circle: 1, rect: 1, path: 1, ellipse: 1, text: 1, image: 1},
+		formatrg = /\{(\d+)\}/g,
+		proto = "prototype",
+		has = "hasOwnProperty",
+		g = {
+			doc: document,
+			win: window
+		},
+		oldRaphael = {
+			was: Object.prototype[has].call(g.win, "Raphael"),
+			is: g.win.Raphael
+		},
+		Paper = function () {
+
+
+			this.ca = this.customAttributes = {};
+		},
+		paperproto,
+		appendChild = "appendChild",
+		apply = "apply",
+		concat = "concat",
+		supportsTouch = "createTouch" in g.doc,
+		E = "",
+		S = " ",
+		Str = String,
+		split = "split",
+		events = "click dblclick mousedown mousemove mouseout mouseover mouseup touchstart touchmove touchend touchcancel"[split](S),
+		touchMap = {
+			mousedown: "touchstart",
+			mousemove: "touchmove",
+			mouseup: "touchend"
+		},
+		lowerCase = Str.prototype.toLowerCase,
+		math = Math,
+		mmax = math.max,
+		mmin = math.min,
+		abs = math.abs,
+		pow = math.pow,
+		PI = math.PI,
+		nu = "number",
+		string = "string",
+		array = "array",
+		toString = "toString",
+		fillString = "fill",
+		objectToString = Object.prototype.toString,
+		paper = {},
+		push = "push",
+		ISURL = R._ISURL = /^url\(['"]?([^\)]+?)['"]?\)$/i,
+		colourRegExp = /^\s*((#[a-f\d]{6})|(#[a-f\d]{3})|rgba?\(\s*([\d\.]+%?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+%?(?:\s*,\s*[\d\.]+%?)?)\s*\)|hsba?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\)|hsla?\(\s*([\d\.]+(?:deg|\xb0|%)?\s*,\s*[\d\.]+%?\s*,\s*[\d\.]+(?:%?\s*,\s*[\d\.]+)?)%?\s*\))\s*$/i,
+		isnan = {"NaN": 1, "Infinity": 1, "-Infinity": 1},
+		bezierrg = /^(?:cubic-)?bezier\(([^,]+),([^,]+),([^,]+),([^\)]+)\)/,
+		round = math.round,
+		setAttribute = "setAttribute",
+		toFloat = parseFloat,
+		toInt = parseInt,
+		upperCase = Str.prototype.toUpperCase,
+		availableAttrs = R._availableAttrs = {
+			"arrow-end": "none",
+			"arrow-start": "none",
+			blur: 0,
+			"clip-rect": "0 0 1e9 1e9",
+			cursor: "default",
+			cx: 0,
+			cy: 0,
+			fill: "#fff",
+			"fill-opacity": 1,
+			font: '10px "Arial"',
+			"font-family": '"Arial"',
+			"font-size": "10",
+			"font-style": "normal",
+			"font-weight": 400,
+			gradient: 0,
+			height: 0,
+			href: "http://raphaeljs.com/",
+			"letter-spacing": 0,
+			opacity: 1,
+			path: "M0,0",
+			r: 0,
+			rx: 0,
+			ry: 0,
+			src: "",
+			stroke: "#000",
+			"stroke-dasharray": "",
+			"stroke-linecap": "butt",
+			"stroke-linejoin": "butt",
+			"stroke-miterlimit": 0,
+			"stroke-opacity": 1,
+			"stroke-width": 1,
+			target: "_blank",
+			"text-anchor": "middle",
+			title: "Raphael",
+			transform: "",
+			width: 0,
+			x: 0,
+			y: 0
+		},
+		availableAnimAttrs = R._availableAnimAttrs = {
+			blur: nu,
+			"clip-rect": "csv",
+			cx: nu,
+			cy: nu,
+			fill: "colour",
+			"fill-opacity": nu,
+			"font-size": nu,
+			height: nu,
+			opacity: nu,
+			path: "path",
+			r: nu,
+			rx: nu,
+			ry: nu,
+			stroke: "colour",
+			"stroke-opacity": nu,
+			"stroke-width": nu,
+			transform: "transform",
+			width: nu,
+			x: nu,
+			y: nu
+		},
+		whitespace = /[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]/g,
+		commaSpaces = /[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*/,
+		hsrg = {hs: 1, rg: 1},
+		p2s = /,?([achlmqrstvxz]),?/gi,
+		pathCommand = /([achlmrqstvz])[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029,]*((-?\d*\.?\d*(?:e[\-+]?\d+)?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*)+)/ig,
+		tCommand = /([rstm])[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029,]*((-?\d*\.?\d*(?:e[\-+]?\d+)?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*)+)/ig,
+		pathValues = /(-?\d*\.?\d*(?:e[\-+]?\d+)?)[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,?[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*/ig,
+		radial_gradient = R._radial_gradient = /^r(?:\(([^,]+?)[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*,[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029]*([^\)]+?)\))?/,
+		eldata = {},
+		sortByKey = function (a, b) {
+			return a.key - b.key;
+		},
+		sortByNumber = function (a, b) {
+			return toFloat(a) - toFloat(b);
+		},
+		fun = function () {
+		},
+		pipe = function (x) {
+			return x;
+		},
+		rectPath = R._rectPath = function (x, y, w, h, r) {
+			if (r) {
+				return [["M", x + r, y], ["l", w - r * 2, 0], ["a", r, r, 0, 0, 1, r, r], ["l", 0, h - r * 2], ["a", r, r, 0, 0, 1, -r, r], ["l", r * 2 - w, 0], ["a", r, r, 0, 0, 1, -r, -r], ["l", 0, r * 2 - h], ["a", r, r, 0, 0, 1, r, -r], ["z"]];
+			}
+			return [["M", x, y], ["l", w, 0], ["l", 0, h], ["l", -w, 0], ["z"]];
+		},
+		ellipsePath = function (x, y, rx, ry) {
+			if (ry == null) {
+				ry = rx;
+			}
+			return [["M", x, y], ["m", 0, -ry], ["a", rx, ry, 0, 1, 1, 0, 2 * ry], ["a", rx, ry, 0, 1, 1, 0, -2 * ry], ["z"]];
+		},
+		getPath = R._getPath = {
+			path: function (el) {
+				return el.attr("path");
+			},
+			circle: function (el) {
+				var a = el.attrs;
+				return ellipsePath(a.cx, a.cy, a.r);
+			},
+			ellipse: function (el) {
+				var a = el.attrs;
+				return ellipsePath(a.cx, a.cy, a.rx, a.ry);
+			},
+			rect: function (el) {
+				var a = el.attrs;
+				return rectPath(a.x, a.y, a.width, a.height, a.r);
+			},
+			image: function (el) {
+				var a = el.attrs;
+				return rectPath(a.x, a.y, a.width, a.height);
+			},
+			text: function (el) {
+				var bbox = el._getBBox();
+				return rectPath(bbox.x, bbox.y, bbox.width, bbox.height);
+			}
+		},
+
+		mapPath = R.mapPath = function (path, matrix) {
+			if (!matrix) {
+				return path;
+			}
+			var x, y, i, j, ii, jj, pathi;
+			path = path2curve(path);
+			for (i = 0, ii = path.length; i < ii; i++) {
+				pathi = path[i];
+				for (j = 1, jj = pathi.length; j < jj; j += 2) {
+					x = matrix.x(pathi[j], pathi[j + 1]);
+					y = matrix.y(pathi[j], pathi[j + 1]);
+					pathi[j] = x;
+					pathi[j + 1] = y;
+				}
+			}
+			return path;
+		};
+
+	R._g = g;
+
+	R.type = (g.win.SVGAngle || g.doc.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure", "1.1") ? "SVG" : "VML");
+	if (R.type == "VML") {
+		var d = g.doc.createElement("div"),
+			b;
+		d.innerHTML = '<v:shape adj="1"/>';
+		b = d.firstChild;
+		b.style.behavior = "url(#default#VML)";
+		if (!(b && typeof b.adj == "object")) {
+			return (R.type = E);
+		}
+		d = null;
+	}
+
+
+	R.svg = !(R.vml = R.type == "VML");
+	R._Paper = Paper;
+
+	R.fn = paperproto = Paper.prototype = R.prototype;
+	R._id = 0;
+	R._oid = 0;
+
+	R.is = function (o, type) {
+		type = lowerCase.call(type);
+		if (type == "finite") {
+			return !isnan[has](+o);
+		}
+		if (type == "array") {
+			return o instanceof Array;
+		}
+		return (type == "null" && o === null) ||
+			(type == typeof o && o !== null) ||
+			(type == "object" && o === Object(o)) ||
+			(type == "array" && Array.isArray && Array.isArray(o)) ||
+			objectToString.call(o).slice(8, -1).toLowerCase() == type;
+	};
+
+	function clone(obj) {
+		if (Object(obj) !== obj) {
+			return obj;
+		}
+		var res = new obj.constructor;
+		for (var key in obj) if (obj[has](key)) {
+			res[key] = clone(obj[key]);
+		}
+		return res;
+	}
+
+
+	R.angle = function (x1, y1, x2, y2, x3, y3) {
+		if (x3 == null) {
+			var x = x1 - x2,
+				y = y1 - y2;
+			if (!x && !y) {
+				return 0;
+			}
+			return (180 + math.atan2(-y, -x) * 180 / PI + 360) % 360;
+		} else {
+			return R.angle(x1, y1, x3, y3) - R.angle(x2, y2, x3, y3);
+		}
+	};
+
+	R.rad = function (deg) {
+		return deg % 360 * PI / 180;
+	};
+
+	R.deg = function (rad) {
+		return rad * 180 / PI % 360;
+	};
+
+	R.snapTo = function (values, value, tolerance) {
+		tolerance = R.is(tolerance, "finite") ? tolerance : 10;
+		if (R.is(values, array)) {
+			var i = values.length;
+			while (i--) if (abs(values[i] - value) <= tolerance) {
+				return values[i];
+			}
+		} else {
+			values = +values;
+			var rem = value % values;
+			if (rem < tolerance) {
+				return value - rem;
+			}
+			if (rem > values - tolerance) {
+				return value - rem + values;
+			}
+		}
+		return value;
+	};
+
+
+	var createUUID = R.createUUID = (function (uuidRegEx, uuidReplacer) {
+		return function () {
+			return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(uuidRegEx, uuidReplacer).toUpperCase();
+		};
+	})(/[xy]/g, function (c) {
+		var r = math.random() * 16 | 0,
+			v = c == "x" ? r : (r & 3 | 8);
+		return v.toString(16);
+	});
+
+
+	R.setWindow = function (newwin) {
+		eve("raphael.setWindow", R, g.win, newwin);
+		g.win = newwin;
+		g.doc = g.win.document;
+		if (R._engine.initWin) {
+			R._engine.initWin(g.win);
+		}
+	};
+	var toHex = function (color) {
+			if (R.vml) {
+				// http://dean.edwards.name/weblog/2009/10/convert-any-colour-value-to-hex-in-msie/
+				var trim = /^\s+|\s+$/g;
+				var bod;
+				try {
+					var docum = new ActiveXObject("htmlfile");
+					docum.write("<body>");
+					docum.close();
+					bod = docum.body;
+				} catch (e) {
+					bod = createPopup().document.body;
+				}
+				var range = bod.createTextRange();
+				toHex = cacher(function (color) {
+					try {
+						bod.style.color = Str(color).replace(trim, E);
+						var value = range.queryCommandValue("ForeColor");
+						value = ((value & 255) << 16) | (value & 65280) | ((value & 16711680) >>> 16);
+						return "#" + ("000000" + value.toString(16)).slice(-6);
+					} catch (e) {
+						return "none";
+					}
+				});
+			} else {
+				var i = g.doc.createElement("i");
+				i.title = "Rapha\xebl Colour Picker";
+				i.style.display = "none";
+				g.doc.body.appendChild(i);
+				toHex = cacher(function (color) {
+					i.style.color = color;
+					return g.doc.defaultView.getComputedStyle(i, E).getPropertyValue("color");
+				});
+			}
+			return toHex(color);
+		},
+		hsbtoString = function () {
+			return "hsb(" + [this.h, this.s, this.b] + ")";
+		},
+		hsltoString = function () {
+			return "hsl(" + [this.h, this.s, this.l] + ")";
+		},
+		rgbtoString = function () {
+			return this.hex;
+		},
+		prepareRGB = function (r, g, b) {
+			if (g == null && R.is(r, "object") && "r" in r && "g" in r && "b" in r) {
+				b = r.b;
+				g = r.g;
+				r = r.r;
+			}
+			if (g == null && R.is(r, string)) {
+				var clr = R.getRGB(r);
+				r = clr.r;
+				g = clr.g;
+				b = clr.b;
+			}
+			if (r > 1 || g > 1 || b > 1) {
+				r /= 255;
+				g /= 255;
+				b /= 255;
+			}
+
+			return [r, g, b];
+		},
+		packageRGB = function (r, g, b, o) {
+			r *= 255;
+			g *= 255;
+			b *= 255;
+			var rgb = {
+				r: r,
+				g: g,
+				b: b,
+				hex: R.rgb(r, g, b),
+				toString: rgbtoString
+			};
+			R.is(o, "finite") && (rgb.opacity = o);
+			return rgb;
+		};
+
+
+	R.color = function (clr) {
+		var rgb;
+		if (R.is(clr, "object") && "h" in clr && "s" in clr && "b" in clr) {
+			rgb = R.hsb2rgb(clr);
+			clr.r = rgb.r;
+			clr.g = rgb.g;
+			clr.b = rgb.b;
+			clr.hex = rgb.hex;
+		} else if (R.is(clr, "object") && "h" in clr && "s" in clr && "l" in clr) {
+			rgb = R.hsl2rgb(clr);
+			clr.r = rgb.r;
+			clr.g = rgb.g;
+			clr.b = rgb.b;
+			clr.hex = rgb.hex;
+		} else {
+			if (R.is(clr, "string")) {
+				clr = R.getRGB(clr);
+			}
+			if (R.is(clr, "object") && "r" in clr && "g" in clr && "b" in clr) {
+				rgb = R.rgb2hsl(clr);
+				clr.h = rgb.h;
+				clr.s = rgb.s;
+				clr.l = rgb.l;
+				rgb = R.rgb2hsb(clr);
+				clr.v = rgb.b;
+			} else {
+				clr = {hex: "none"};
+				clr.r = clr.g = clr.b = clr.h = clr.s = clr.v = clr.l = -1;
+			}
+		}
+		clr.toString = rgbtoString;
+		return clr;
+	};
+
+	R.hsb2rgb = function (h, s, v, o) {
+		if (this.is(h, "object") && "h" in h && "s" in h && "b" in h) {
+			v = h.b;
+			s = h.s;
+			h = h.h;
+			o = h.o;
+		}
+		h *= 360;
+		var R, G, B, X, C;
+		h = (h % 360) / 60;
+		C = v * s;
+		X = C * (1 - abs(h % 2 - 1));
+		R = G = B = v - C;
+
+		h = ~~h;
+		R += [C, X, 0, 0, X, C][h];
+		G += [X, C, C, X, 0, 0][h];
+		B += [0, 0, X, C, C, X][h];
+		return packageRGB(R, G, B, o);
+	};
+
+	R.hsl2rgb = function (h, s, l, o) {
+		if (this.is(h, "object") && "h" in h && "s" in h && "l" in h) {
+			l = h.l;
+			s = h.s;
+			h = h.h;
+		}
+		if (h > 1 || s > 1 || l > 1) {
+			h /= 360;
+			s /= 100;
+			l /= 100;
+		}
+		h *= 360;
+		var R, G, B, X, C;
+		h = (h % 360) / 60;
+		C = 2 * s * (l < .5 ? l : 1 - l);
+		X = C * (1 - abs(h % 2 - 1));
+		R = G = B = l - C / 2;
+
+		h = ~~h;
+		R += [C, X, 0, 0, X, C][h];
+		G += [X, C, C, X, 0, 0][h];
+		B += [0, 0, X, C, C, X][h];
+		return packageRGB(R, G, B, o);
+	};
+
+	R.rgb2hsb = function (r, g, b) {
+		b = prepareRGB(r, g, b);
+		r = b[0];
+		g = b[1];
+		b = b[2];
+
+		var H, S, V, C;
+		V = mmax(r, g, b);
+		C = V - mmin(r, g, b);
+		H = (C == 0 ? null :
+				V == r ? (g - b) / C :
+					V == g ? (b - r) / C + 2 :
+						(r - g) / C + 4
+		);
+		H = ((H + 360) % 6) * 60 / 360;
+		S = C == 0 ? 0 : C / V;
+		return {h: H, s: S, b: V, toString: hsbtoString};
+	};
+
+	R.rgb2hsl = function (r, g, b) {
+		b = prepareRGB(r, g, b);
+		r = b[0];
+		g = b[1];
+		b = b[2];
+
+		var H, S, L, M, m, C;
+		M = mmax(r, g, b);
+		m = mmin(r, g, b);
+		C = M - m;
+		H = (C == 0 ? null :
+			M == r ? (g - b) / C :
+				M == g ? (b - r) / C + 2 :
+					(r - g) / C + 4);
+		H = ((H + 360) % 6) * 60 / 360;
+		L = (M + m) / 2;
+		S = (C == 0 ? 0 :
+			L < .5 ? C / (2 * L) :
+				C / (2 - 2 * L));
+		return {h: H, s: S, l: L, toString: hsltoString};
+	};
+	R._path2string = function () {
+		return this.join(",").replace(p2s, "$1");
+	};
+
+	function repush(array, item) {
+		for (var i = 0, ii = array.length; i < ii; i++) if (array[i] === item) {
+			return array.push(array.splice(i, 1)[0]);
+		}
+	}
+
+	function cacher(f, scope, postprocessor) {
+		function newf() {
+			var arg = Array.prototype.slice.call(arguments, 0),
+				args = arg.join("\u2400"),
+				cache = newf.cache = newf.cache || {},
+				count = newf.count = newf.count || [];
+			if (cache[has](args)) {
+				repush(count, args);
+				return postprocessor ? postprocessor(cache[args]) : cache[args];
+			}
+			count.length >= 1e3 && delete cache[count.shift()];
+			count.push(args);
+			cache[args] = f[apply](scope, arg);
+			return postprocessor ? postprocessor(cache[args]) : cache[args];
+		}
+
+		return newf;
+	}
+
+	var preload = R._preload = function (src, f) {
+		var img = g.doc.createElement("img");
+		img.style.cssText = "position:absolute;left:-9999em;top:-9999em";
+		img.onload = function () {
+			f.call(this);
+			this.onload = null;
+			g.doc.body.removeChild(this);
+		};
+		img.onerror = function () {
+			g.doc.body.removeChild(this);
+		};
+		g.doc.body.appendChild(img);
+		img.src = src;
+	};
+
+	function clrToString() {
+		return this.hex;
+	}
+
+
+	R.getRGB = cacher(function (colour) {
+		if (!colour || !!((colour = Str(colour)).indexOf("-") + 1)) {
+			return {r: -1, g: -1, b: -1, hex: "none", error: 1, toString: clrToString};
+		}
+		if (colour == "none") {
+			return {r: -1, g: -1, b: -1, hex: "none", toString: clrToString};
+		}
+		!(hsrg[has](colour.toLowerCase().substring(0, 2)) || colour.charAt() == "#") && (colour = toHex(colour));
+		var res,
+			red,
+			green,
+			blue,
+			opacity,
+			t,
+			values,
+			rgb = colour.match(colourRegExp);
+		if (rgb) {
+			if (rgb[2]) {
+				blue = toInt(rgb[2].substring(5), 16);
+				green = toInt(rgb[2].substring(3, 5), 16);
+				red = toInt(rgb[2].substring(1, 3), 16);
+			}
+			if (rgb[3]) {
+				blue = toInt((t = rgb[3].charAt(3)) + t, 16);
+				green = toInt((t = rgb[3].charAt(2)) + t, 16);
+				red = toInt((t = rgb[3].charAt(1)) + t, 16);
+			}
+			if (rgb[4]) {
+				values = rgb[4][split](commaSpaces);
+				red = toFloat(values[0]);
+				values[0].slice(-1) == "%" && (red *= 2.55);
+				green = toFloat(values[1]);
+				values[1].slice(-1) == "%" && (green *= 2.55);
+				blue = toFloat(values[2]);
+				values[2].slice(-1) == "%" && (blue *= 2.55);
+				rgb[1].toLowerCase().slice(0, 4) == "rgba" && (opacity = toFloat(values[3]));
+				values[3] && values[3].slice(-1) == "%" && (opacity /= 100);
+			}
+			if (rgb[5]) {
+				values = rgb[5][split](commaSpaces);
+				red = toFloat(values[0]);
+				values[0].slice(-1) == "%" && (red *= 2.55);
+				green = toFloat(values[1]);
+				values[1].slice(-1) == "%" && (green *= 2.55);
+				blue = toFloat(values[2]);
+				values[2].slice(-1) == "%" && (blue *= 2.55);
+				(values[0].slice(-3) == "deg" || values[0].slice(-1) == "\xb0") && (red /= 360);
+				rgb[1].toLowerCase().slice(0, 4) == "hsba" && (opacity = toFloat(values[3]));
+				values[3] && values[3].slice(-1) == "%" && (opacity /= 100);
+				return R.hsb2rgb(red, green, blue, opacity);
+			}
+			if (rgb[6]) {
+				values = rgb[6][split](commaSpaces);
+				red = toFloat(values[0]);
+				values[0].slice(-1) == "%" && (red *= 2.55);
+				green = toFloat(values[1]);
+				values[1].slice(-1) == "%" && (green *= 2.55);
+				blue = toFloat(values[2]);
+				values[2].slice(-1) == "%" && (blue *= 2.55);
+				(values[0].slice(-3) == "deg" || values[0].slice(-1) == "\xb0") && (red /= 360);
+				rgb[1].toLowerCase().slice(0, 4) == "hsla" && (opacity = toFloat(values[3]));
+				values[3] && values[3].slice(-1) == "%" && (opacity /= 100);
+				return R.hsl2rgb(red, green, blue, opacity);
+			}
+			rgb = {r: red, g: green, b: blue, toString: clrToString};
+			rgb.hex = "#" + (16777216 | blue | (green << 8) | (red << 16)).toString(16).slice(1);
+			R.is(opacity, "finite") && (rgb.opacity = opacity);
+			return rgb;
+		}
+		return {r: -1, g: -1, b: -1, hex: "none", error: 1, toString: clrToString};
+	}, R);
+
+	R.hsb = cacher(function (h, s, b) {
+		return R.hsb2rgb(h, s, b).hex;
+	});
+
+	R.hsl = cacher(function (h, s, l) {
+		return R.hsl2rgb(h, s, l).hex;
+	});
+
+	R.rgb = cacher(function (r, g, b) {
+		return "#" + (16777216 | b | (g << 8) | (r << 16)).toString(16).slice(1);
+	});
+
+	R.getColor = function (value) {
+		var start = this.getColor.start = this.getColor.start || {h: 0, s: 1, b: value || .75},
+			rgb = this.hsb2rgb(start.h, start.s, start.b);
+		start.h += .075;
+		if (start.h > 1) {
+			start.h = 0;
+			start.s -= .2;
+			start.s <= 0 && (this.getColor.start = {h: 0, s: 1, b: start.b});
+		}
+		return rgb.hex;
+	};
+
+	R.getColor.reset = function () {
+		delete this.start;
+	};
+
+	// http://schepers.cc/getting-to-the-point
+	function catmullRom2bezier(crp, z) {
+		var d = [];
+		for (var i = 0, iLen = crp.length; iLen - 2 * !z > i; i += 2) {
+			var p = [
+				{x: +crp[i - 2], y: +crp[i - 1]},
+				{x: +crp[i], y: +crp[i + 1]},
+				{x: +crp[i + 2], y: +crp[i + 3]},
+				{x: +crp[i + 4], y: +crp[i + 5]}
+			];
+			if (z) {
+				if (!i) {
+					p[0] = {x: +crp[iLen - 2], y: +crp[iLen - 1]};
+				} else if (iLen - 4 == i) {
+					p[3] = {x: +crp[0], y: +crp[1]};
+				} else if (iLen - 2 == i) {
+					p[2] = {x: +crp[0], y: +crp[1]};
+					p[3] = {x: +crp[2], y: +crp[3]};
+				}
+			} else {
+				if (iLen - 4 == i) {
+					p[3] = p[2];
+				} else if (!i) {
+					p[0] = {x: +crp[i], y: +crp[i + 1]};
+				}
+			}
+			d.push(["C",
+				(-p[0].x + 6 * p[1].x + p[2].x) / 6,
+				(-p[0].y + 6 * p[1].y + p[2].y) / 6,
+				(p[1].x + 6 * p[2].x - p[3].x) / 6,
+				(p[1].y + 6 * p[2].y - p[3].y) / 6,
+				p[2].x,
+				p[2].y
+			]);
+		}
+
+		return d;
+	}
+
+	R.parsePathString = function (pathString) {
+		if (!pathString) {
+			return null;
+		}
+		var pth = paths(pathString);
+		if (pth.arr) {
+			return pathClone(pth.arr);
+		}
+
+		var paramCounts = {a: 7, c: 6, h: 1, l: 2, m: 2, r: 4, q: 4, s: 4, t: 2, v: 1, z: 0},
+			data = [];
+		if (R.is(pathString, array) && R.is(pathString[0], array)) { // rough assumption
+			data = pathClone(pathString);
+		}
+		if (!data.length) {
+			Str(pathString).replace(pathCommand, function (a, b, c) {
+				var params = [],
+					name = b.toLowerCase();
+				c.replace(pathValues, function (a, b) {
+					b && params.push(+b);
+				});
+				if (name == "m" && params.length > 2) {
+					data.push([b][concat](params.splice(0, 2)));
+					name = "l";
+					b = b == "m" ? "l" : "L";
+				}
+				if (name == "r") {
+					data.push([b][concat](params));
+				} else while (params.length >= paramCounts[name]) {
+					data.push([b][concat](params.splice(0, paramCounts[name])));
+					if (!paramCounts[name]) {
+						break;
+					}
+				}
+			});
+		}
+		data.toString = R._path2string;
+		pth.arr = pathClone(data);
+		return data;
+	};
+
+	R.parseTransformString = cacher(function (TString) {
+		if (!TString) {
+			return null;
+		}
+		var paramCounts = {r: 3, s: 4, t: 2, m: 6},
+			data = [];
+		if (R.is(TString, array) && R.is(TString[0], array)) { // rough assumption
+			data = pathClone(TString);
+		}
+		if (!data.length) {
+			Str(TString).replace(tCommand, function (a, b, c) {
+				var params = [],
+					name = lowerCase.call(b);
+				c.replace(pathValues, function (a, b) {
+					b && params.push(+b);
+				});
+				data.push([b][concat](params));
+			});
+		}
+		data.toString = R._path2string;
+		return data;
+	});
+	// PATHS
+	var paths = function (ps) {
+		var p = paths.ps = paths.ps || {};
+		if (p[ps]) {
+			p[ps].sleep = 100;
+		} else {
+			p[ps] = {
+				sleep: 100
+			};
+		}
+		setTimeout(function () {
+			for (var key in p) if (p[has](key) && key != ps) {
+				p[key].sleep--;
+				!p[key].sleep && delete p[key];
+			}
+		});
+		return p[ps];
+	};
+
+	R.findDotsAtSegment = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t) {
+		var t1 = 1 - t,
+			t13 = pow(t1, 3),
+			t12 = pow(t1, 2),
+			t2 = t * t,
+			t3 = t2 * t,
+			x = t13 * p1x + t12 * 3 * t * c1x + t1 * 3 * t * t * c2x + t3 * p2x,
+			y = t13 * p1y + t12 * 3 * t * c1y + t1 * 3 * t * t * c2y + t3 * p2y,
+			mx = p1x + 2 * t * (c1x - p1x) + t2 * (c2x - 2 * c1x + p1x),
+			my = p1y + 2 * t * (c1y - p1y) + t2 * (c2y - 2 * c1y + p1y),
+			nx = c1x + 2 * t * (c2x - c1x) + t2 * (p2x - 2 * c2x + c1x),
+			ny = c1y + 2 * t * (c2y - c1y) + t2 * (p2y - 2 * c2y + c1y),
+			ax = t1 * p1x + t * c1x,
+			ay = t1 * p1y + t * c1y,
+			cx = t1 * c2x + t * p2x,
+			cy = t1 * c2y + t * p2y,
+			alpha = (90 - math.atan2(mx - nx, my - ny) * 180 / PI);
+		(mx > nx || my < ny) && (alpha += 180);
+		return {
+			x: x,
+			y: y,
+			m: {x: mx, y: my},
+			n: {x: nx, y: ny},
+			start: {x: ax, y: ay},
+			end: {x: cx, y: cy},
+			alpha: alpha
+		};
+	};
+
+	R.bezierBBox = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y) {
+		if (!R.is(p1x, "array")) {
+			p1x = [p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y];
+		}
+		var bbox = curveDim.apply(null, p1x);
+		return {
+			x: bbox.min.x,
+			y: bbox.min.y,
+			x2: bbox.max.x,
+			y2: bbox.max.y,
+			width: bbox.max.x - bbox.min.x,
+			height: bbox.max.y - bbox.min.y
+		};
+	};
+
+	R.isPointInsideBBox = function (bbox, x, y) {
+		return x >= bbox.x && x <= bbox.x2 && y >= bbox.y && y <= bbox.y2;
+	};
+
+	R.isBBoxIntersect = function (bbox1, bbox2) {
+		var i = R.isPointInsideBBox;
+		return i(bbox2, bbox1.x, bbox1.y)
+			|| i(bbox2, bbox1.x2, bbox1.y)
+			|| i(bbox2, bbox1.x, bbox1.y2)
+			|| i(bbox2, bbox1.x2, bbox1.y2)
+			|| i(bbox1, bbox2.x, bbox2.y)
+			|| i(bbox1, bbox2.x2, bbox2.y)
+			|| i(bbox1, bbox2.x, bbox2.y2)
+			|| i(bbox1, bbox2.x2, bbox2.y2)
+			|| (bbox1.x < bbox2.x2 && bbox1.x > bbox2.x || bbox2.x < bbox1.x2 && bbox2.x > bbox1.x)
+			&& (bbox1.y < bbox2.y2 && bbox1.y > bbox2.y || bbox2.y < bbox1.y2 && bbox2.y > bbox1.y);
+	};
+
+	function base3(t, p1, p2, p3, p4) {
+		var t1 = -3 * p1 + 9 * p2 - 9 * p3 + 3 * p4,
+			t2 = t * t1 + 6 * p1 - 12 * p2 + 6 * p3;
+		return t * t2 - 3 * p1 + 3 * p2;
+	}
+
+	function bezlen(x1, y1, x2, y2, x3, y3, x4, y4, z) {
+		if (z == null) {
+			z = 1;
+		}
+		z = z > 1 ? 1 : z < 0 ? 0 : z;
+		var z2 = z / 2,
+			n = 12,
+			Tvalues = [-0.1252, 0.1252, -0.3678, 0.3678, -0.5873, 0.5873, -0.7699, 0.7699, -0.9041, 0.9041, -0.9816, 0.9816],
+			Cvalues = [0.2491, 0.2491, 0.2335, 0.2335, 0.2032, 0.2032, 0.1601, 0.1601, 0.1069, 0.1069, 0.0472, 0.0472],
+			sum = 0;
+		for (var i = 0; i < n; i++) {
+			var ct = z2 * Tvalues[i] + z2,
+				xbase = base3(ct, x1, x2, x3, x4),
+				ybase = base3(ct, y1, y2, y3, y4),
+				comb = xbase * xbase + ybase * ybase;
+			sum += Cvalues[i] * math.sqrt(comb);
+		}
+		return z2 * sum;
+	}
+
+	function getTatLen(x1, y1, x2, y2, x3, y3, x4, y4, ll) {
+		if (ll < 0 || bezlen(x1, y1, x2, y2, x3, y3, x4, y4) < ll) {
+			return;
+		}
+		var t = 1,
+			step = t / 2,
+			t2 = t - step,
+			l,
+			e = .01;
+		l = bezlen(x1, y1, x2, y2, x3, y3, x4, y4, t2);
+		while (abs(l - ll) > e) {
+			step /= 2;
+			t2 += (l < ll ? 1 : -1) * step;
+			l = bezlen(x1, y1, x2, y2, x3, y3, x4, y4, t2);
+		}
+		return t2;
+	}
+
+	function intersect(x1, y1, x2, y2, x3, y3, x4, y4) {
+		if (
+			mmax(x1, x2) < mmin(x3, x4) ||
+			mmin(x1, x2) > mmax(x3, x4) ||
+			mmax(y1, y2) < mmin(y3, y4) ||
+			mmin(y1, y2) > mmax(y3, y4)
+		) {
+			return;
+		}
+		var nx = (x1 * y2 - y1 * x2) * (x3 - x4) - (x1 - x2) * (x3 * y4 - y3 * x4),
+			ny = (x1 * y2 - y1 * x2) * (y3 - y4) - (y1 - y2) * (x3 * y4 - y3 * x4),
+			denominator = (x1 - x2) * (y3 - y4) - (y1 - y2) * (x3 - x4);
+
+		if (!denominator) {
+			return;
+		}
+		var px = nx / denominator,
+			py = ny / denominator,
+			px2 = +px.toFixed(2),
+			py2 = +py.toFixed(2);
+		if (
+			px2 < +mmin(x1, x2).toFixed(2) ||
+			px2 > +mmax(x1, x2).toFixed(2) ||
+			px2 < +mmin(x3, x4).toFixed(2) ||
+			px2 > +mmax(x3, x4).toFixed(2) ||
+			py2 < +mmin(y1, y2).toFixed(2) ||
+			py2 > +mmax(y1, y2).toFixed(2) ||
+			py2 < +mmin(y3, y4).toFixed(2) ||
+			py2 > +mmax(y3, y4).toFixed(2)
+		) {
+			return;
+		}
+		return {x: px, y: py};
+	}
+
+	function inter(bez1, bez2) {
+		return interHelper(bez1, bez2);
+	}
+
+	function interCount(bez1, bez2) {
+		return interHelper(bez1, bez2, 1);
+	}
+
+	function interHelper(bez1, bez2, justCount) {
+		var bbox1 = R.bezierBBox(bez1),
+			bbox2 = R.bezierBBox(bez2);
+		if (!R.isBBoxIntersect(bbox1, bbox2)) {
+			return justCount ? 0 : [];
+		}
+		var l1 = bezlen.apply(0, bez1),
+			l2 = bezlen.apply(0, bez2),
+			n1 = ~~(l1 / 5),
+			n2 = ~~(l2 / 5),
+			dots1 = [],
+			dots2 = [],
+			xy = {},
+			res = justCount ? 0 : [];
+		for (var i = 0; i < n1 + 1; i++) {
+			var p = R.findDotsAtSegment.apply(R, bez1.concat(i / n1));
+			dots1.push({x: p.x, y: p.y, t: i / n1});
+		}
+		for (i = 0; i < n2 + 1; i++) {
+			p = R.findDotsAtSegment.apply(R, bez2.concat(i / n2));
+			dots2.push({x: p.x, y: p.y, t: i / n2});
+		}
+		for (i = 0; i < n1; i++) {
+			for (var j = 0; j < n2; j++) {
+				var di = dots1[i],
+					di1 = dots1[i + 1],
+					dj = dots2[j],
+					dj1 = dots2[j + 1],
+					ci = abs(di1.x - di.x) < .001 ? "y" : "x",
+					cj = abs(dj1.x - dj.x) < .001 ? "y" : "x",
+					is = intersect(di.x, di.y, di1.x, di1.y, dj.x, dj.y, dj1.x, dj1.y);
+				if (is) {
+					if (xy[is.x.toFixed(4)] == is.y.toFixed(4)) {
+						continue;
+					}
+					xy[is.x.toFixed(4)] = is.y.toFixed(4);
+					var t1 = di.t + abs((is[ci] - di[ci]) / (di1[ci] - di[ci])) * (di1.t - di.t),
+						t2 = dj.t + abs((is[cj] - dj[cj]) / (dj1[cj] - dj[cj])) * (dj1.t - dj.t);
+					if (t1 >= 0 && t1 <= 1 && t2 >= 0 && t2 <= 1) {
+						if (justCount) {
+							res++;
+						} else {
+							res.push({
+								x: is.x,
+								y: is.y,
+								t1: t1,
+								t2: t2
+							});
+						}
+					}
+				}
+			}
+		}
+		return res;
+	}
+
+	R.pathIntersection = function (path1, path2) {
+		return interPathHelper(path1, path2);
+	};
+	R.pathIntersectionNumber = function (path1, path2) {
+		return interPathHelper(path1, path2, 1);
+	};
+
+	function interPathHelper(path1, path2, justCount) {
+		path1 = R._path2curve(path1);
+		path2 = R._path2curve(path2);
+		var x1, y1, x2, y2, x1m, y1m, x2m, y2m, bez1, bez2,
+			res = justCount ? 0 : [];
+		for (var i = 0, ii = path1.length; i < ii; i++) {
+			var pi = path1[i];
+			if (pi[0] == "M") {
+				x1 = x1m = pi[1];
+				y1 = y1m = pi[2];
+			} else {
+				if (pi[0] == "C") {
+					bez1 = [x1, y1].concat(pi.slice(1));
+					x1 = bez1[6];
+					y1 = bez1[7];
+				} else {
+					bez1 = [x1, y1, x1, y1, x1m, y1m, x1m, y1m];
+					x1 = x1m;
+					y1 = y1m;
+				}
+				for (var j = 0, jj = path2.length; j < jj; j++) {
+					var pj = path2[j];
+					if (pj[0] == "M") {
+						x2 = x2m = pj[1];
+						y2 = y2m = pj[2];
+					} else {
+						if (pj[0] == "C") {
+							bez2 = [x2, y2].concat(pj.slice(1));
+							x2 = bez2[6];
+							y2 = bez2[7];
+						} else {
+							bez2 = [x2, y2, x2, y2, x2m, y2m, x2m, y2m];
+							x2 = x2m;
+							y2 = y2m;
+						}
+						var intr = interHelper(bez1, bez2, justCount);
+						if (justCount) {
+							res += intr;
+						} else {
+							for (var k = 0, kk = intr.length; k < kk; k++) {
+								intr[k].segment1 = i;
+								intr[k].segment2 = j;
+								intr[k].bez1 = bez1;
+								intr[k].bez2 = bez2;
+							}
+							res = res.concat(intr);
+						}
+					}
+				}
+			}
+		}
+		return res;
+	}
+
+	R.isPointInsidePath = function (path, x, y) {
+		var bbox = R.pathBBox(path);
+		return R.isPointInsideBBox(bbox, x, y) &&
+			interPathHelper(path, [["M", x, y], ["H", bbox.x2 + 10]], 1) % 2 == 1;
+	};
+	R._removedFactory = function (methodname) {
+		return function () {
+			eve("raphael.log", null, "Rapha\xebl: you are calling to method \u201c" + methodname + "\u201d of removed object", methodname);
+		};
+	};
+
+	var pathDimensions = R.pathBBox = function (path) {
+			var pth = paths(path);
+			if (pth.bbox) {
+				return pth.bbox;
+			}
+			if (!path) {
+				return {x: 0, y: 0, width: 0, height: 0, x2: 0, y2: 0};
+			}
+			path = path2curve(path);
+			var x = 0,
+				y = 0,
+				X = [],
+				Y = [],
+				p;
+			for (var i = 0, ii = path.length; i < ii; i++) {
+				p = path[i];
+				if (p[0] == "M") {
+					x = p[1];
+					y = p[2];
+					X.push(x);
+					Y.push(y);
+				} else {
+					var dim = curveDim(x, y, p[1], p[2], p[3], p[4], p[5], p[6]);
+					X = X[concat](dim.min.x, dim.max.x);
+					Y = Y[concat](dim.min.y, dim.max.y);
+					x = p[5];
+					y = p[6];
+				}
+			}
+			var xmin = mmin[apply](0, X),
+				ymin = mmin[apply](0, Y),
+				xmax = mmax[apply](0, X),
+				ymax = mmax[apply](0, Y),
+				bb = {
+					x: xmin,
+					y: ymin,
+					x2: xmax,
+					y2: ymax,
+					width: xmax - xmin,
+					height: ymax - ymin
+				};
+			pth.bbox = clone(bb);
+			return bb;
+		},
+		pathClone = function (pathArray) {
+			var res = clone(pathArray);
+			res.toString = R._path2string;
+			return res;
+		},
+		pathToRelative = R._pathToRelative = function (pathArray) {
+			var pth = paths(pathArray);
+			if (pth.rel) {
+				return pathClone(pth.rel);
+			}
+			if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption
+				pathArray = R.parsePathString(pathArray);
+			}
+			var res = [],
+				x = 0,
+				y = 0,
+				mx = 0,
+				my = 0,
+				start = 0;
+			if (pathArray[0][0] == "M") {
+				x = pathArray[0][1];
+				y = pathArray[0][2];
+				mx = x;
+				my = y;
+				start++;
+				res.push(["M", x, y]);
+			}
+			for (var i = start, ii = pathArray.length; i < ii; i++) {
+				var r = res[i] = [],
+					pa = pathArray[i];
+				if (pa[0] != lowerCase.call(pa[0])) {
+					r[0] = lowerCase.call(pa[0]);
+					switch (r[0]) {
+						case "a":
+							r[1] = pa[1];
+							r[2] = pa[2];
+							r[3] = pa[3];
+							r[4] = pa[4];
+							r[5] = pa[5];
+							r[6] = +(pa[6] - x).toFixed(3);
+							r[7] = +(pa[7] - y).toFixed(3);
+							break;
+						case "v":
+							r[1] = +(pa[1] - y).toFixed(3);
+							break;
+						case "m":
+							mx = pa[1];
+							my = pa[2];
+						default:
+							for (var j = 1, jj = pa.length; j < jj; j++) {
+								r[j] = +(pa[j] - ((j % 2) ? x : y)).toFixed(3);
+							}
+					}
+				} else {
+					r = res[i] = [];
+					if (pa[0] == "m") {
+						mx = pa[1] + x;
+						my = pa[2] + y;
+					}
+					for (var k = 0, kk = pa.length; k < kk; k++) {
+						res[i][k] = pa[k];
+					}
+				}
+				var len = res[i].length;
+				switch (res[i][0]) {
+					case "z":
+						x = mx;
+						y = my;
+						break;
+					case "h":
+						x += +res[i][len - 1];
+						break;
+					case "v":
+						y += +res[i][len - 1];
+						break;
+					default:
+						x += +res[i][len - 2];
+						y += +res[i][len - 1];
+				}
+			}
+			res.toString = R._path2string;
+			pth.rel = pathClone(res);
+			return res;
+		},
+		pathToAbsolute = R._pathToAbsolute = function (pathArray) {
+			var pth = paths(pathArray);
+			if (pth.abs) {
+				return pathClone(pth.abs);
+			}
+			if (!R.is(pathArray, array) || !R.is(pathArray && pathArray[0], array)) { // rough assumption
+				pathArray = R.parsePathString(pathArray);
+			}
+			if (!pathArray || !pathArray.length) {
+				return [["M", 0, 0]];
+			}
+			var res = [],
+				x = 0,
+				y = 0,
+				mx = 0,
+				my = 0,
+				start = 0;
+			if (pathArray[0][0] == "M") {
+				x = +pathArray[0][1];
+				y = +pathArray[0][2];
+				mx = x;
+				my = y;
+				start++;
+				res[0] = ["M", x, y];
+			}
+			var crz = pathArray.length == 3 && pathArray[0][0] == "M" && pathArray[1][0].toUpperCase() == "R" && pathArray[2][0].toUpperCase() == "Z";
+			for (var r, pa, i = start, ii = pathArray.length; i < ii; i++) {
+				res.push(r = []);
+				pa = pathArray[i];
+				if (pa[0] != upperCase.call(pa[0])) {
+					r[0] = upperCase.call(pa[0]);
+					switch (r[0]) {
+						case "A":
+							r[1] = pa[1];
+							r[2] = pa[2];
+							r[3] = pa[3];
+							r[4] = pa[4];
+							r[5] = pa[5];
+							r[6] = +(pa[6] + x);
+							r[7] = +(pa[7] + y);
+							break;
+						case "V":
+							r[1] = +pa[1] + y;
+							break;
+						case "H":
+							r[1] = +pa[1] + x;
+							break;
+						case "R":
+							var dots = [x, y][concat](pa.slice(1));
+							for (var j = 2, jj = dots.length; j < jj; j++) {
+								dots[j] = +dots[j] + x;
+								dots[++j] = +dots[j] + y;
+							}
+							res.pop();
+							res = res[concat](catmullRom2bezier(dots, crz));
+							break;
+						case "M":
+							mx = +pa[1] + x;
+							my = +pa[2] + y;
+						default:
+							for (j = 1, jj = pa.length; j < jj; j++) {
+								r[j] = +pa[j] + ((j % 2) ? x : y);
+							}
+					}
+				} else if (pa[0] == "R") {
+					dots = [x, y][concat](pa.slice(1));
+					res.pop();
+					res = res[concat](catmullRom2bezier(dots, crz));
+					r = ["R"][concat](pa.slice(-2));
+				} else {
+					for (var k = 0, kk = pa.length; k < kk; k++) {
+						r[k] = pa[k];
+					}
+				}
+				switch (r[0]) {
+					case "Z":
+						x = mx;
+						y = my;
+						break;
+					case "H":
+						x = r[1];
+						break;
+					case "V":
+						y = r[1];
+						break;
+					case "M":
+						mx = r[r.length - 2];
+						my = r[r.length - 1];
+					default:
+						x = r[r.length - 2];
+						y = r[r.length - 1];
+				}
+			}
+			res.toString = R._path2string;
+			pth.abs = pathClone(res);
+			return res;
+		},
+		l2c = function (x1, y1, x2, y2) {
+			return [x1, y1, x2, y2, x2, y2];
+		},
+		q2c = function (x1, y1, ax, ay, x2, y2) {
+			var _13 = 1 / 3,
+				_23 = 2 / 3;
+			return [
+				_13 * x1 + _23 * ax,
+				_13 * y1 + _23 * ay,
+				_13 * x2 + _23 * ax,
+				_13 * y2 + _23 * ay,
+				x2,
+				y2
+			];
+		},
+		a2c = function (x1, y1, rx, ry, angle, large_arc_flag, sweep_flag, x2, y2, recursive) {
+			// for more information of where this math came from visit:
+			// http://www.w3.org/TR/SVG11/implnote.html#ArcImplementationNotes
+			var _120 = PI * 120 / 180,
+				rad = PI / 180 * (+angle || 0),
+				res = [],
+				xy,
+				rotate = cacher(function (x, y, rad) {
+					var X = x * math.cos(rad) - y * math.sin(rad),
+						Y = x * math.sin(rad) + y * math.cos(rad);
+					return {x: X, y: Y};
+				});
+			if (!recursive) {
+				xy = rotate(x1, y1, -rad);
+				x1 = xy.x;
+				y1 = xy.y;
+				xy = rotate(x2, y2, -rad);
+				x2 = xy.x;
+				y2 = xy.y;
+				var cos = math.cos(PI / 180 * angle),
+					sin = math.sin(PI / 180 * angle),
+					x = (x1 - x2) / 2,
+					y = (y1 - y2) / 2;
+				var h = (x * x) / (rx * rx) + (y * y) / (ry * ry);
+				if (h > 1) {
+					h = math.sqrt(h);
+					rx = h * rx;
+					ry = h * ry;
+				}
+				var rx2 = rx * rx,
+					ry2 = ry * ry,
+					k = (large_arc_flag == sweep_flag ? -1 : 1) *
+						math.sqrt(abs((rx2 * ry2 - rx2 * y * y - ry2 * x * x) / (rx2 * y * y + ry2 * x * x))),
+					cx = k * rx * y / ry + (x1 + x2) / 2,
+					cy = k * -ry * x / rx + (y1 + y2) / 2,
+					f1 = math.asin(((y1 - cy) / ry).toFixed(9)),
+					f2 = math.asin(((y2 - cy) / ry).toFixed(9));
+
+				f1 = x1 < cx ? PI - f1 : f1;
+				f2 = x2 < cx ? PI - f2 : f2;
+				f1 < 0 && (f1 = PI * 2 + f1);
+				f2 < 0 && (f2 = PI * 2 + f2);
+				if (sweep_flag && f1 > f2) {
+					f1 = f1 - PI * 2;
+				}
+				if (!sweep_flag && f2 > f1) {
+					f2 = f2 - PI * 2;
+				}
+			} else {
+				f1 = recursive[0];
+				f2 = recursive[1];
+				cx = recursive[2];
+				cy = recursive[3];
+			}
+			var df = f2 - f1;
+			if (abs(df) > _120) {
+				var f2old = f2,
+					x2old = x2,
+					y2old = y2;
+				f2 = f1 + _120 * (sweep_flag && f2 > f1 ? 1 : -1);
+				x2 = cx + rx * math.cos(f2);
+				y2 = cy + ry * math.sin(f2);
+				res = a2c(x2, y2, rx, ry, angle, 0, sweep_flag, x2old, y2old, [f2, f2old, cx, cy]);
+			}
+			df = f2 - f1;
+			var c1 = math.cos(f1),
+				s1 = math.sin(f1),
+				c2 = math.cos(f2),
+				s2 = math.sin(f2),
+				t = math.tan(df / 4),
+				hx = 4 / 3 * rx * t,
+				hy = 4 / 3 * ry * t,
+				m1 = [x1, y1],
+				m2 = [x1 + hx * s1, y1 - hy * c1],
+				m3 = [x2 + hx * s2, y2 - hy * c2],
+				m4 = [x2, y2];
+			m2[0] = 2 * m1[0] - m2[0];
+			m2[1] = 2 * m1[1] - m2[1];
+			if (recursive) {
+				return [m2, m3, m4][concat](res);
+			} else {
+				res = [m2, m3, m4][concat](res).join()[split](",");
+				var newres = [];
+				for (var i = 0, ii = res.length; i < ii; i++) {
+					newres[i] = i % 2 ? rotate(res[i - 1], res[i], rad).y : rotate(res[i], res[i + 1], rad).x;
+				}
+				return newres;
+			}
+		},
+		findDotAtSegment = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t) {
+			var t1 = 1 - t;
+			return {
+				x: pow(t1, 3) * p1x + pow(t1, 2) * 3 * t * c1x + t1 * 3 * t * t * c2x + pow(t, 3) * p2x,
+				y: pow(t1, 3) * p1y + pow(t1, 2) * 3 * t * c1y + t1 * 3 * t * t * c2y + pow(t, 3) * p2y
+			};
+		},
+		curveDim = cacher(function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y) {
+			var a = (c2x - 2 * c1x + p1x) - (p2x - 2 * c2x + c1x),
+				b = 2 * (c1x - p1x) - 2 * (c2x - c1x),
+				c = p1x - c1x,
+				t1 = (-b + math.sqrt(b * b - 4 * a * c)) / 2 / a,
+				t2 = (-b - math.sqrt(b * b - 4 * a * c)) / 2 / a,
+				y = [p1y, p2y],
+				x = [p1x, p2x],
+				dot;
+			abs(t1) > "1e12" && (t1 = .5);
+			abs(t2) > "1e12" && (t2 = .5);
+			if (t1 > 0 && t1 < 1) {
+				dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t1);
+				x.push(dot.x);
+				y.push(dot.y);
+			}
+			if (t2 > 0 && t2 < 1) {
+				dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t2);
+				x.push(dot.x);
+				y.push(dot.y);
+			}
+			a = (c2y - 2 * c1y + p1y) - (p2y - 2 * c2y + c1y);
+			b = 2 * (c1y - p1y) - 2 * (c2y - c1y);
+			c = p1y - c1y;
+			t1 = (-b + math.sqrt(b * b - 4 * a * c)) / 2 / a;
+			t2 = (-b - math.sqrt(b * b - 4 * a * c)) / 2 / a;
+			abs(t1) > "1e12" && (t1 = .5);
+			abs(t2) > "1e12" && (t2 = .5);
+			if (t1 > 0 && t1 < 1) {
+				dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t1);
+				x.push(dot.x);
+				y.push(dot.y);
+			}
+			if (t2 > 0 && t2 < 1) {
+				dot = findDotAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, t2);
+				x.push(dot.x);
+				y.push(dot.y);
+			}
+			return {
+				min: {x: mmin[apply](0, x), y: mmin[apply](0, y)},
+				max: {x: mmax[apply](0, x), y: mmax[apply](0, y)}
+			};
+		}),
+		path2curve = R._path2curve = cacher(function (path, path2) {
+			var pth = !path2 && paths(path);
+			if (!path2 && pth.curve) {
+				return pathClone(pth.curve);
+			}
+			var p = pathToAbsolute(path),
+				p2 = path2 && pathToAbsolute(path2),
+				attrs = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null},
+				attrs2 = {x: 0, y: 0, bx: 0, by: 0, X: 0, Y: 0, qx: null, qy: null},
+				processPath = function (path, d) {
+					var nx, ny;
+					if (!path) {
+						return ["C", d.x, d.y, d.x, d.y, d.x, d.y];
+					}
+					!(path[0] in {T: 1, Q: 1}) && (d.qx = d.qy = null);
+					switch (path[0]) {
+						case "M":
+							d.X = path[1];
+							d.Y = path[2];
+							break;
+						case "A":
+							path = ["C"][concat](a2c[apply](0, [d.x, d.y][concat](path.slice(1))));
+							break;
+						case "S":
+							nx = d.x + (d.x - (d.bx || d.x));
+							ny = d.y + (d.y - (d.by || d.y));
+							path = ["C", nx, ny][concat](path.slice(1));
+							break;
+						case "T":
+							d.qx = d.x + (d.x - (d.qx || d.x));
+							d.qy = d.y + (d.y - (d.qy || d.y));
+							path = ["C"][concat](q2c(d.x, d.y, d.qx, d.qy, path[1], path[2]));
+							break;
+						case "Q":
+							d.qx = path[1];
+							d.qy = path[2];
+							path = ["C"][concat](q2c(d.x, d.y, path[1], path[2], path[3], path[4]));
+							break;
+						case "L":
+							path = ["C"][concat](l2c(d.x, d.y, path[1], path[2]));
+							break;
+						case "H":
+							path = ["C"][concat](l2c(d.x, d.y, path[1], d.y));
+							break;
+						case "V":
+							path = ["C"][concat](l2c(d.x, d.y, d.x, path[1]));
+							break;
+						case "Z":
+							path = ["C"][concat](l2c(d.x, d.y, d.X, d.Y));
+							break;
+					}
+					return path;
+				},
+				fixArc = function (pp, i) {
+					if (pp[i].length > 7) {
+						pp[i].shift();
+						var pi = pp[i];
+						while (pi.length) {
+							pp.splice(i++, 0, ["C"][concat](pi.splice(0, 6)));
+						}
+						pp.splice(i, 1);
+						ii = mmax(p.length, p2 && p2.length || 0);
+					}
+				},
+				fixM = function (path1, path2, a1, a2, i) {
+					if (path1 && path2 && path1[i][0] == "M" && path2[i][0] != "M") {
+						path2.splice(i, 0, ["M", a2.x, a2.y]);
+						a1.bx = 0;
+						a1.by = 0;
+						a1.x = path1[i][1];
+						a1.y = path1[i][2];
+						ii = mmax(p.length, p2 && p2.length || 0);
+					}
+				};
+			for (var i = 0, ii = mmax(p.length, p2 && p2.length || 0); i < ii; i++) {
+				p[i] = processPath(p[i], attrs);
+				fixArc(p, i);
+				p2 && (p2[i] = processPath(p2[i], attrs2));
+				p2 && fixArc(p2, i);
+				fixM(p, p2, attrs, attrs2, i);
+				fixM(p2, p, attrs2, attrs, i);
+				var seg = p[i],
+					seg2 = p2 && p2[i],
+					seglen = seg.length,
+					seg2len = p2 && seg2.length;
+				attrs.x = seg[seglen - 2];
+				attrs.y = seg[seglen - 1];
+				attrs.bx = toFloat(seg[seglen - 4]) || attrs.x;
+				attrs.by = toFloat(seg[seglen - 3]) || attrs.y;
+				attrs2.bx = p2 && (toFloat(seg2[seg2len - 4]) || attrs2.x);
+				attrs2.by = p2 && (toFloat(seg2[seg2len - 3]) || attrs2.y);
+				attrs2.x = p2 && seg2[seg2len - 2];
+				attrs2.y = p2 && seg2[seg2len - 1];
+			}
+			if (!p2) {
+				pth.curve = pathClone(p);
+			}
+			return p2 ? [p, p2] : p;
+		}, null, pathClone),
+		parseDots = R._parseDots = cacher(function (gradient) {
+			var dots = [];
+			for (var i = 0, ii = gradient.length; i < ii; i++) {
+				var dot = {},
+					par = gradient[i].match(/^([^:]*):?([\d\.]*)/);
+				dot.color = R.getRGB(par[1]);
+				if (dot.color.error) {
+					return null;
+				}
+				dot.color = dot.color.hex;
+				par[2] && (dot.offset = par[2] + "%");
+				dots.push(dot);
+			}
+			for (i = 1, ii = dots.length - 1; i < ii; i++) {
+				if (!dots[i].offset) {
+					var start = toFloat(dots[i - 1].offset || 0),
+						end = 0;
+					for (var j = i + 1; j < ii; j++) {
+						if (dots[j].offset) {
+							end = dots[j].offset;
+							break;
+						}
+					}
+					if (!end) {
+						end = 100;
+						j = ii;
+					}
+					end = toFloat(end);
+					var d = (end - start) / (j - i + 1);
+					for (; i < j; i++) {
+						start += d;
+						dots[i].offset = start + "%";
+					}
+				}
+			}
+			return dots;
+		}),
+		tear = R._tear = function (el, paper) {
+			el == paper.top && (paper.top = el.prev);
+			el == paper.bottom && (paper.bottom = el.next);
+			el.next && (el.next.prev = el.prev);
+			el.prev && (el.prev.next = el.next);
+		},
+		tofront = R._tofront = function (el, paper) {
+			if (paper.top === el) {
+				return;
+			}
+			tear(el, paper);
+			el.next = null;
+			el.prev = paper.top;
+			paper.top.next = el;
+			paper.top = el;
+		},
+		toback = R._toback = function (el, paper) {
+			if (paper.bottom === el) {
+				return;
+			}
+			tear(el, paper);
+			el.next = paper.bottom;
+			el.prev = null;
+			paper.bottom.prev = el;
+			paper.bottom = el;
+		},
+		insertafter = R._insertafter = function (el, el2, paper) {
+			tear(el, paper);
+			el2 == paper.top && (paper.top = el);
+			el2.next && (el2.next.prev = el);
+			el.next = el2.next;
+			el.prev = el2;
+			el2.next = el;
+		},
+		insertbefore = R._insertbefore = function (el, el2, paper) {
+			tear(el, paper);
+			el2 == paper.bottom && (paper.bottom = el);
+			el2.prev && (el2.prev.next = el);
+			el.prev = el2.prev;
+			el2.prev = el;
+			el.next = el2;
+		},
+
+		toMatrix = R.toMatrix = function (path, transform) {
+			var bb = pathDimensions(path),
+				el = {
+					_: {
+						transform: E
+					},
+					getBBox: function () {
+						return bb;
+					}
+				};
+			extractTransform(el, transform);
+			return el.matrix;
+		},
+
+		transformPath = R.transformPath = function (path, transform) {
+			return mapPath(path, toMatrix(path, transform));
+		},
+		extractTransform = R._extractTransform = function (el, tstr) {
+			if (tstr == null) {
+				return el._.transform;
+			}
+			tstr = Str(tstr).replace(/\.{3}|\u2026/g, el._.transform || E);
+			var tdata = R.parseTransformString(tstr),
+				deg = 0,
+				dx = 0,
+				dy = 0,
+				sx = 1,
+				sy = 1,
+				_ = el._,
+				m = new Matrix;
+			_.transform = tdata || [];
+			if (tdata) {
+				for (var i = 0, ii = tdata.length; i < ii; i++) {
+					var t = tdata[i],
+						tlen = t.length,
+						command = Str(t[0]).toLowerCase(),
+						absolute = t[0] != command,
+						inver = absolute ? m.invert() : 0,
+						x1,
+						y1,
+						x2,
+						y2,
+						bb;
+					if (command == "t" && tlen == 3) {
+						if (absolute) {
+							x1 = inver.x(0, 0);
+							y1 = inver.y(0, 0);
+							x2 = inver.x(t[1], t[2]);
+							y2 = inver.y(t[1], t[2]);
+							m.translate(x2 - x1, y2 - y1);
+						} else {
+							m.translate(t[1], t[2]);
+						}
+					} else if (command == "r") {
+						if (tlen == 2) {
+							bb = bb || el.getBBox(1);
+							m.rotate(t[1], bb.x + bb.width / 2, bb.y + bb.height / 2);
+							deg += t[1];
+						} else if (tlen == 4) {
+							if (absolute) {
+								x2 = inver.x(t[2], t[3]);
+								y2 = inver.y(t[2], t[3]);
+								m.rotate(t[1], x2, y2);
+							} else {
+								m.rotate(t[1], t[2], t[3]);
+							}
+							deg += t[1];
+						}
+					} else if (command == "s") {
+						if (tlen == 2 || tlen == 3) {
+							bb = bb || el.getBBox(1);
+							m.scale(t[1], t[tlen - 1], bb.x + bb.width / 2, bb.y + bb.height / 2);
+							sx *= t[1];
+							sy *= t[tlen - 1];
+						} else if (tlen == 5) {
+							if (absolute) {
+								x2 = inver.x(t[3], t[4]);
+								y2 = inver.y(t[3], t[4]);
+								m.scale(t[1], t[2], x2, y2);
+							} else {
+								m.scale(t[1], t[2], t[3], t[4]);
+							}
+							sx *= t[1];
+							sy *= t[2];
+						}
+					} else if (command == "m" && tlen == 7) {
+						m.add(t[1], t[2], t[3], t[4], t[5], t[6]);
+					}
+					_.dirtyT = 1;
+					el.matrix = m;
+				}
+			}
+
+
+			el.matrix = m;
+
+			_.sx = sx;
+			_.sy = sy;
+			_.deg = deg;
+			_.dx = dx = m.e;
+			_.dy = dy = m.f;
+
+			if (sx == 1 && sy == 1 && !deg && _.bbox) {
+				_.bbox.x += +dx;
+				_.bbox.y += +dy;
+			} else {
+				_.dirtyT = 1;
+			}
+		},
+		getEmpty = function (item) {
+			var l = item[0];
+			switch (l.toLowerCase()) {
+				case "t":
+					return [l, 0, 0];
+				case "m":
+					return [l, 1, 0, 0, 1, 0, 0];
+				case "r":
+					if (item.length == 4) {
+						return [l, 0, item[2], item[3]];
+					} else {
+						return [l, 0];
+					}
+				case "s":
+					if (item.length == 5) {
+						return [l, 1, 1, item[3], item[4]];
+					} else if (item.length == 3) {
+						return [l, 1, 1];
+					} else {
+						return [l, 1];
+					}
+			}
+		},
+		equaliseTransform = R._equaliseTransform = function (t1, t2) {
+			t2 = Str(t2).replace(/\.{3}|\u2026/g, t1);
+			t1 = R.parseTransformString(t1) || [];
+			t2 = R.parseTransformString(t2) || [];
+			var maxlength = mmax(t1.length, t2.length),
+				from = [],
+				to = [],
+				i = 0, j, jj,
+				tt1, tt2;
+			for (; i < maxlength; i++) {
+				tt1 = t1[i] || getEmpty(t2[i]);
+				tt2 = t2[i] || getEmpty(tt1);
+				if ((tt1[0] != tt2[0]) ||
+					(tt1[0].toLowerCase() == "r" && (tt1[2] != tt2[2] || tt1[3] != tt2[3])) ||
+					(tt1[0].toLowerCase() == "s" && (tt1[3] != tt2[3] || tt1[4] != tt2[4]))
+				) {
+					return;
+				}
+				from[i] = [];
+				to[i] = [];
+				for (j = 0, jj = mmax(tt1.length, tt2.length); j < jj; j++) {
+					j in tt1 && (from[i][j] = tt1[j]);
+					j in tt2 && (to[i][j] = tt2[j]);
+				}
+			}
+			return {
+				from: from,
+				to: to
+			};
+		};
+	R._getContainer = function (x, y, w, h) {
+		var container;
+		container = h == null && !R.is(x, "object") ? g.doc.getElementById(x) : x;
+		if (container == null) {
+			return;
+		}
+		if (container.tagName) {
+			if (y == null) {
+				return {
+					container: container,
+					width: container.style.pixelWidth || container.offsetWidth,
+					height: container.style.pixelHeight || container.offsetHeight
+				};
+			} else {
+				return {
+					container: container,
+					width: y,
+					height: w
+				};
+			}
+		}
+		return {
+			container: 1,
+			x: x,
+			y: y,
+			width: w,
+			height: h
+		};
+	};
+
+	R.pathToRelative = pathToRelative;
+	R._engine = {};
+
+	R.path2curve = path2curve;
+
+	R.matrix = function (a, b, c, d, e, f) {
+		return new Matrix(a, b, c, d, e, f);
+	};
+
+	function Matrix(a, b, c, d, e, f) {
+		if (a != null) {
+			this.a = +a;
+			this.b = +b;
+			this.c = +c;
+			this.d = +d;
+			this.e = +e;
+			this.f = +f;
+		} else {
+			this.a = 1;
+			this.b = 0;
+			this.c = 0;
+			this.d = 1;
+			this.e = 0;
+			this.f = 0;
+		}
+	}
+
+	(function (matrixproto) {
+
+		matrixproto.add = function (a, b, c, d, e, f) {
+			var out = [[], [], []],
+				m = [[this.a, this.c, this.e], [this.b, this.d, this.f], [0, 0, 1]],
+				matrix = [[a, c, e], [b, d, f], [0, 0, 1]],
+				x, y, z, res;
+
+			if (a && a instanceof Matrix) {
+				matrix = [[a.a, a.c, a.e], [a.b, a.d, a.f], [0, 0, 1]];
+			}
+
+			for (x = 0; x < 3; x++) {
+				for (y = 0; y < 3; y++) {
+					res = 0;
+					for (z = 0; z < 3; z++) {
+						res += m[x][z] * matrix[z][y];
+					}
+					out[x][y] = res;
+				}
+			}
+			this.a = out[0][0];
+			this.b = out[1][0];
+			this.c = out[0][1];
+			this.d = out[1][1];
+			this.e = out[0][2];
+			this.f = out[1][2];
+		};
+
+		matrixproto.invert = function () {
+			var me = this,
+				x = me.a * me.d - me.b * me.c;
+			return new Matrix(me.d / x, -me.b / x, -me.c / x, me.a / x, (me.c * me.f - me.d * me.e) / x, (me.b * me.e - me.a * me.f) / x);
+		};
+
+		matrixproto.clone = function () {
+			return new Matrix(this.a, this.b, this.c, this.d, this.e, this.f);
+		};
+
+		matrixproto.translate = function (x, y) {
+			this.add(1, 0, 0, 1, x, y);
+		};
+
+		matrixproto.scale = function (x, y, cx, cy) {
+			y == null && (y = x);
+			(cx || cy) && this.add(1, 0, 0, 1, cx, cy);
+			this.add(x, 0, 0, y, 0, 0);
+			(cx || cy) && this.add(1, 0, 0, 1, -cx, -cy);
+		};
+
+		matrixproto.rotate = function (a, x, y) {
+			a = R.rad(a);
+			x = x || 0;
+			y = y || 0;
+			var cos = +math.cos(a).toFixed(9),
+				sin = +math.sin(a).toFixed(9);
+			this.add(cos, sin, -sin, cos, x, y);
+			this.add(1, 0, 0, 1, -x, -y);
+		};
+
+		matrixproto.x = function (x, y) {
+			return x * this.a + y * this.c + this.e;
+		};
+
+		matrixproto.y = function (x, y) {
+			return x * this.b + y * this.d + this.f;
+		};
+		matrixproto.get = function (i) {
+			return +this[Str.fromCharCode(97 + i)].toFixed(4);
+		};
+		matrixproto.toString = function () {
+			return R.svg ?
+				"matrix(" + [this.get(0), this.get(1), this.get(2), this.get(3), this.get(4), this.get(5)].join() + ")" :
+				[this.get(0), this.get(2), this.get(1), this.get(3), 0, 0].join();
+		};
+		matrixproto.toFilter = function () {
+			return "progid:DXImageTransform.Microsoft.Matrix(M11=" + this.get(0) +
+				", M12=" + this.get(2) + ", M21=" + this.get(1) + ", M22=" + this.get(3) +
+				", Dx=" + this.get(4) + ", Dy=" + this.get(5) + ", sizingmethod='auto expand')";
+		};
+		matrixproto.offset = function () {
+			return [this.e.toFixed(4), this.f.toFixed(4)];
+		};
+
+		function norm(a) {
+			return a[0] * a[0] + a[1] * a[1];
+		}
+
+		function normalize(a) {
+			var mag = math.sqrt(norm(a));
+			a[0] && (a[0] /= mag);
+			a[1] && (a[1] /= mag);
+		}
+
+		matrixproto.split = function () {
+			var out = {};
+			// translation
+			out.dx = this.e;
+			out.dy = this.f;
+
+			// scale and shear
+			var row = [[this.a, this.c], [this.b, this.d]];
+			out.scalex = math.sqrt(norm(row[0]));
+			normalize(row[0]);
+
+			out.shear = row[0][0] * row[1][0] + row[0][1] * row[1][1];
+			row[1] = [row[1][0] - row[0][0] * out.shear, row[1][1] - row[0][1] * out.shear];
+
+			out.scaley = math.sqrt(norm(row[1]));
+			normalize(row[1]);
+			out.shear /= out.scaley;
+
+			// rotation
+			var sin = -row[0][1],
+				cos = row[1][1];
+			if (cos < 0) {
+				out.rotate = R.deg(math.acos(cos));
+				if (sin < 0) {
+					out.rotate = 360 - out.rotate;
+				}
+			} else {
+				out.rotate = R.deg(math.asin(sin));
+			}
+
+			out.isSimple = !+out.shear.toFixed(9) && (out.scalex.toFixed(9) == out.scaley.toFixed(9) || !out.rotate);
+			out.isSuperSimple = !+out.shear.toFixed(9) && out.scalex.toFixed(9) == out.scaley.toFixed(9) && !out.rotate;
+			out.noRotation = !+out.shear.toFixed(9) && !out.rotate;
+			return out;
+		};
+
+		matrixproto.toTransformString = function (shorter) {
+			var s = shorter || this[split]();
+			if (s.isSimple) {
+				s.scalex = +s.scalex.toFixed(4);
+				s.scaley = +s.scaley.toFixed(4);
+				s.rotate = +s.rotate.toFixed(4);
+				return (s.dx || s.dy ? "t" + [s.dx, s.dy] : E) +
+					(s.scalex != 1 || s.scaley != 1 ? "s" + [s.scalex, s.scaley, 0, 0] : E) +
+					(s.rotate ? "r" + [s.rotate, 0, 0] : E);
+			} else {
+				return "m" + [this.get(0), this.get(1), this.get(2), this.get(3), this.get(4), this.get(5)];
+			}
+		};
+	})(Matrix.prototype);
+
+	// WebKit rendering bug workaround method
+	var version = navigator.userAgent.match(/Version\/(.*?)\s/) || navigator.userAgent.match(/Chrome\/(\d+)/);
+	if ((navigator.vendor == "Apple Computer, Inc.") && (version && version[1] < 4 || navigator.platform.slice(0, 2) == "iP") ||
+		(navigator.vendor == "Google Inc." && version && version[1] < 8)) {
+
+		paperproto.safari = function () {
+			var rect = this.rect(-99, -99, this.width + 99, this.height + 99).attr({stroke: "none"});
+			setTimeout(function () {
+				rect.remove();
+			});
+		};
+	} else {
+		paperproto.safari = fun;
+	}
+
+	var preventDefault = function () {
+			this.returnValue = false;
+		},
+		preventTouch = function () {
+			return this.originalEvent.preventDefault();
+		},
+		stopPropagation = function () {
+			this.cancelBubble = true;
+		},
+		stopTouch = function () {
+			return this.originalEvent.stopPropagation();
+		},
+		addEvent = (function () {
+			if (g.doc.addEventListener) {
+				return function (obj, type, fn, element) {
+					var realName = supportsTouch && touchMap[type] ? touchMap[type] : type,
+						f = function (e) {
+							var scrollY = g.doc.documentElement.scrollTop || g.doc.body.scrollTop,
+								scrollX = g.doc.documentElement.scrollLeft || g.doc.body.scrollLeft,
+								x = e.clientX + scrollX,
+								y = e.clientY + scrollY;
+							if (supportsTouch && touchMap[has](type)) {
+								for (var i = 0, ii = e.targetTouches && e.targetTouches.length; i < ii; i++) {
+									if (e.targetTouches[i].target == obj) {
+										var olde = e;
+										e = e.targetTouches[i];
+										e.originalEvent = olde;
+										e.preventDefault = preventTouch;
+										e.stopPropagation = stopTouch;
+										break;
+									}
+								}
+							}
+							return fn.call(element, e, x, y);
+						};
+					obj.addEventListener(realName, f, false);
+					return function () {
+						obj.removeEventListener(realName, f, false);
+						return true;
+					};
+				};
+			} else if (g.doc.attachEvent) {
+				return function (obj, type, fn, element) {
+					var f = function (e) {
+						e = e || g.win.event;
+						var scrollY = g.doc.documentElement.scrollTop || g.doc.body.scrollTop,
+							scrollX = g.doc.documentElement.scrollLeft || g.doc.body.scrollLeft,
+							x = e.clientX + scrollX,
+							y = e.clientY + scrollY;
+						e.preventDefault = e.preventDefault || preventDefault;
+						e.stopPropagation = e.stopPropagation || stopPropagation;
+						return fn.call(element, e, x, y);
+					};
+					obj.attachEvent("on" + type, f);
+					var detacher = function () {
+						obj.detachEvent("on" + type, f);
+						return true;
+					};
+					return detacher;
+				};
+			}
+		})(),
+		drag = [],
+		dragMove = function (e) {
+			var x = e.clientX,
+				y = e.clientY,
+				scrollY = g.doc.documentElement.scrollTop || g.doc.body.scrollTop,
+				scrollX = g.doc.documentElement.scrollLeft || g.doc.body.scrollLeft,
+				dragi,
+				j = drag.length;
+			while (j--) {
+				dragi = drag[j];
+				if (supportsTouch) {
+					var i = e.touches.length,
+						touch;
+					while (i--) {
+						touch = e.touches[i];
+						if (touch.identifier == dragi.el._drag.id) {
+							x = touch.clientX;
+							y = touch.clientY;
+							(e.originalEvent ? e.originalEvent : e).preventDefault();
+							break;
+						}
+					}
+				} else {
+					e.preventDefault();
+				}
+				var node = dragi.el.node,
+					o,
+					next = node.nextSibling,
+					parent = node.parentNode,
+					display = node.style.display;
+				g.win.opera && parent.removeChild(node);
+				node.style.display = "none";
+				o = dragi.el.paper.getElementByPoint(x, y);
+				node.style.display = display;
+				g.win.opera && (next ? parent.insertBefore(node, next) : parent.appendChild(node));
+				o && eve("raphael.drag.over." + dragi.el.id, dragi.el, o);
+				x += scrollX;
+				y += scrollY;
+				eve("raphael.drag.move." + dragi.el.id, dragi.move_scope || dragi.el, x - dragi.el._drag.x, y - dragi.el._drag.y, x, y, e);
+			}
+		},
+		dragUp = function (e) {
+			R.unmousemove(dragMove).unmouseup(dragUp);
+			var i = drag.length,
+				dragi;
+			while (i--) {
+				dragi = drag[i];
+				dragi.el._drag = {};
+				eve("raphael.drag.end." + dragi.el.id, dragi.end_scope || dragi.start_scope || dragi.move_scope || dragi.el, e);
+			}
+			drag = [];
+		},
+
+		elproto = R.el = {};
+
+
+	for (var i = events.length; i--;) {
+		(function (eventName) {
+			R[eventName] = elproto[eventName] = function (fn, scope) {
+				if (R.is(fn, "function")) {
+					this.events = this.events || [];
+					this.events.push({
+						name: eventName,
+						f: fn,
+						unbind: addEvent(this.shape || this.node || g.doc, eventName, fn, scope || this)
+					});
+				}
+				return this;
+			};
+			R["un" + eventName] = elproto["un" + eventName] = function (fn) {
+				var events = this.events || [],
+					l = events.length;
+				while (l--) if (events[l].name == eventName && events[l].f == fn) {
+					events[l].unbind();
+					events.splice(l, 1);
+					!events.length && delete this.events;
+					return this;
+				}
+				return this;
+			};
+		})(events[i]);
+	}
+
+
+	elproto.data = function (key, value) {
+		var data = eldata[this.id] = eldata[this.id] || {};
+		if (arguments.length == 1) {
+			if (R.is(key, "object")) {
+				for (var i in key) if (key[has](i)) {
+					this.data(i, key[i]);
+				}
+				return this;
+			}
+			eve("raphael.data.get." + this.id, this, data[key], key);
+			return data[key];
+		}
+		data[key] = value;
+		eve("raphael.data.set." + this.id, this, value, key);
+		return this;
+	};
+
+	elproto.removeData = function (key) {
+		if (key == null) {
+			eldata[this.id] = {};
+		} else {
+			eldata[this.id] && delete eldata[this.id][key];
+		}
+		return this;
+	};
+
+	elproto.hover = function (f_in, f_out, scope_in, scope_out) {
+		return this.mouseover(f_in, scope_in).mouseout(f_out, scope_out || scope_in);
+	};
+
+	elproto.unhover = function (f_in, f_out) {
+		return this.unmouseover(f_in).unmouseout(f_out);
+	};
+	var draggable = [];
+
+	elproto.drag = function (onmove, onstart, onend, move_scope, start_scope, end_scope) {
+		function start(e) {
+			(e.originalEvent || e).preventDefault();
+			var scrollY = g.doc.documentElement.scrollTop || g.doc.body.scrollTop,
+				scrollX = g.doc.documentElement.scrollLeft || g.doc.body.scrollLeft;
+			this._drag.x = e.clientX + scrollX;
+			this._drag.y = e.clientY + scrollY;
+			this._drag.id = e.identifier;
+			!drag.length && R.mousemove(dragMove).mouseup(dragUp);
+			drag.push({el: this, move_scope: move_scope, start_scope: start_scope, end_scope: end_scope});
+			onstart && eve.on("raphael.drag.start." + this.id, onstart);
+			onmove && eve.on("raphael.drag.move." + this.id, onmove);
+			onend && eve.on("raphael.drag.end." + this.id, onend);
+			eve("raphael.drag.start." + this.id, start_scope || move_scope || this, e.clientX + scrollX, e.clientY + scrollY, e);
+		}
+
+		this._drag = {};
+		draggable.push({el: this, start: start});
+		this.mousedown(start);
+		return this;
+	};
+
+	elproto.onDragOver = function (f) {
+		f ? eve.on("raphael.drag.over." + this.id, f) : eve.unbind("raphael.drag.over." + this.id);
+	};
+
+	elproto.undrag = function () {
+		var i = draggable.length;
+		while (i--) if (draggable[i].el == this) {
+			this.unmousedown(draggable[i].start);
+			draggable.splice(i, 1);
+			eve.unbind("raphael.drag.*." + this.id);
+		}
+		!draggable.length && R.unmousemove(dragMove).unmouseup(dragUp);
+	};
+
+	paperproto.circle = function (x, y, r) {
+		var out = R._engine.circle(this, x || 0, y || 0, r || 0);
+		this.__set__ && this.__set__.push(out);
+		return out;
+	};
+
+	paperproto.rect = function (x, y, w, h, r) {
+		var out = R._engine.rect(this, x || 0, y || 0, w || 0, h || 0, r || 0);
+		this.__set__ && this.__set__.push(out);
+		return out;
+	};
+
+	paperproto.ellipse = function (x, y, rx, ry) {
+		var out = R._engine.ellipse(this, x || 0, y || 0, rx || 0, ry || 0);
+		this.__set__ && this.__set__.push(out);
+		return out;
+	};
+
+	paperproto.path = function (pathString) {
+		pathString && !R.is(pathString, string) && !R.is(pathString[0], array) && (pathString += E);
+		var out = R._engine.path(R.format[apply](R, arguments), this);
+		this.__set__ && this.__set__.push(out);
+		return out;
+	};
+
+	paperproto.image = function (src, x, y, w, h) {
+		var out = R._engine.image(this, src || "about:blank", x || 0, y || 0, w || 0, h || 0);
+		this.__set__ && this.__set__.push(out);
+		return out;
+	};
+
+	paperproto.text = function (x, y, text) {
+		var out = R._engine.text(this, x || 0, y || 0, Str(text));
+		this.__set__ && this.__set__.push(out);
+		return out;
+	};
+
+	paperproto.set = function (itemsArray) {
+		!R.is(itemsArray, "array") && (itemsArray = Array.prototype.splice.call(arguments, 0, arguments.length));
+		var out = new Set(itemsArray);
+		this.__set__ && this.__set__.push(out);
+		return out;
+	};
+
+	paperproto.setStart = function (set) {
+		this.__set__ = set || this.set();
+	};
+
+	paperproto.setFinish = function (set) {
+		var out = this.__set__;
+		delete this.__set__;
+		return out;
+	};
+
+	paperproto.setSize = function (width, height) {
+		return R._engine.setSize.call(this, width, height);
+	};
+
+	paperproto.setViewBox = function (x, y, w, h, fit) {
+		return R._engine.setViewBox.call(this, x, y, w, h, fit);
+	};
+
+
+	paperproto.top = paperproto.bottom = null;
+
+	paperproto.raphael = R;
+	var getOffset = function (elem) {
+		var box = elem.getBoundingClientRect(),
+			doc = elem.ownerDocument,
+			body = doc.body,
+			docElem = doc.documentElement,
+			clientTop = docElem.clientTop || body.clientTop || 0,
+			clientLeft = docElem.clientLeft || body.clientLeft || 0,
+			top = box.top + (g.win.pageYOffset || docElem.scrollTop || body.scrollTop) - clientTop,
+			left = box.left + (g.win.pageXOffset || docElem.scrollLeft || body.scrollLeft) - clientLeft;
+		return {
+			y: top,
+			x: left
+		};
+	};
+
+	paperproto.getElementByPoint = function (x, y) {
+		var paper = this,
+			svg = paper.canvas,
+			target = g.doc.elementFromPoint(x, y);
+		if (g.win.opera && target.tagName == "svg") {
+			var so = getOffset(svg),
+				sr = svg.createSVGRect();
+			sr.x = x - so.x;
+			sr.y = y - so.y;
+			sr.width = sr.height = 1;
+			var hits = svg.getIntersectionList(sr, null);
+			if (hits.length) {
+				target = hits[hits.length - 1];
+			}
+		}
+		if (!target) {
+			return null;
+		}
+		while (target.parentNode && target != svg.parentNode && !target.raphael) {
+			target = target.parentNode;
+		}
+		target == paper.canvas.parentNode && (target = svg);
+		target = target && target.raphael ? paper.getById(target.raphaelid) : null;
+		return target;
+	};
+
+	paperproto.getById = function (id) {
+		var bot = this.bottom;
+		while (bot) {
+			if (bot.id == id) {
+				return bot;
+			}
+			bot = bot.next;
+		}
+		return null;
+	};
+
+	paperproto.forEach = function (callback, thisArg) {
+		var bot = this.bottom;
+		while (bot) {
+			if (callback.call(thisArg, bot) === false) {
+				return this;
+			}
+			bot = bot.next;
+		}
+		return this;
+	};
+
+	paperproto.getElementsByPoint = function (x, y) {
+		var set = this.set();
+		this.forEach(function (el) {
+			if (el.isPointInside(x, y)) {
+				set.push(el);
+			}
+		});
+		return set;
+	};
+
+	function x_y() {
+		return this.x + S + this.y;
+	}
+
+	function x_y_w_h() {
+		return this.x + S + this.y + S + this.width + " \xd7 " + this.height;
+	}
+
+	elproto.isPointInside = function (x, y) {
+		var rp = this.realPath = this.realPath || getPath[this.type](this);
+		return R.isPointInsidePath(rp, x, y);
+	};
+
+	elproto.getBBox = function (isWithoutTransform) {
+		if (this.removed) {
+			return {};
+		}
+		var _ = this._;
+		if (isWithoutTransform) {
+			if (_.dirty || !_.bboxwt) {
+				this.realPath = getPath[this.type](this);
+				_.bboxwt = pathDimensions(this.realPath);
+				_.bboxwt.toString = x_y_w_h;
+				_.dirty = 0;
+			}
+			return _.bboxwt;
+		}
+		if (_.dirty || _.dirtyT || !_.bbox) {
+			if (_.dirty || !this.realPath) {
+				_.bboxwt = 0;
+				this.realPath = getPath[this.type](this);
+			}
+			_.bbox = pathDimensions(mapPath(this.realPath, this.matrix));
+			_.bbox.toString = x_y_w_h;
+			_.dirty = _.dirtyT = 0;
+		}
+		return _.bbox;
+	};
+
+	elproto.clone = function () {
+		if (this.removed) {
+			return null;
+		}
+		var out = this.paper[this.type]().attr(this.attr());
+		this.__set__ && this.__set__.push(out);
+		return out;
+	};
+
+	elproto.glow = function (glow) {
+		if (this.type == "text") {
+			return null;
+		}
+		glow = glow || {};
+		var s = {
+				width: (glow.width || 10) + (+this.attr("stroke-width") || 1),
+				fill: glow.fill || false,
+				opacity: glow.opacity || .5,
+				offsetx: glow.offsetx || 0,
+				offsety: glow.offsety || 0,
+				color: glow.color || "#000"
+			},
+			c = s.width / 2,
+			r = this.paper,
+			out = r.set(),
+			path = this.realPath || getPath[this.type](this);
+		path = this.matrix ? mapPath(path, this.matrix) : path;
+		for (var i = 1; i < c + 1; i++) {
+			out.push(r.path(path).attr({
+				stroke: s.color,
+				fill: s.fill ? s.color : "none",
+				"stroke-linejoin": "round",
+				"stroke-linecap": "round",
+				"stroke-width": +(s.width / c * i).toFixed(3),
+				opacity: +(s.opacity / c).toFixed(3)
+			}));
+		}
+		return out.insertBefore(this).translate(s.offsetx, s.offsety);
+	};
+	var curveslengths = {},
+		getPointAtSegmentLength = function (p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, length) {
+			if (length == null) {
+				return bezlen(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y);
+			} else {
+				return R.findDotsAtSegment(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, getTatLen(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, length));
+			}
+		},
+		getLengthFactory = function (istotal, subpath) {
+			return function (path, length, onlystart) {
+				path = path2curve(path);
+				var x, y, p, l, sp = "", subpaths = {}, point,
+					len = 0;
+				for (var i = 0, ii = path.length; i < ii; i++) {
+					p = path[i];
+					if (p[0] == "M") {
+						x = +p[1];
+						y = +p[2];
+					} else {
+						l = getPointAtSegmentLength(x, y, p[1], p[2], p[3], p[4], p[5], p[6]);
+						if (len + l > length) {
+							if (subpath && !subpaths.start) {
+								point = getPointAtSegmentLength(x, y, p[1], p[2], p[3], p[4], p[5], p[6], length - len);
+								sp += ["C" + point.start.x, point.start.y, point.m.x, point.m.y, point.x, point.y];
+								if (onlystart) {
+									return sp;
+								}
+								subpaths.start = sp;
+								sp = ["M" + point.x, point.y + "C" + point.n.x, point.n.y, point.end.x, point.end.y, p[5], p[6]].join();
+								len += l;
+								x = +p[5];
+								y = +p[6];
+								continue;
+							}
+							if (!istotal && !subpath) {
+								point = getPointAtSegmentLength(x, y, p[1], p[2], p[3], p[4], p[5], p[6], length - len);
+								return {x: point.x, y: point.y, alpha: point.alpha};
+							}
+						}
+						len += l;
+						x = +p[5];
+						y = +p[6];
+					}
+					sp += p.shift() + p;
+				}
+				subpaths.end = sp;
+				point = istotal ? len : subpath ? subpaths : R.findDotsAtSegment(x, y, p[0], p[1], p[2], p[3], p[4], p[5], 1);
+				point.alpha && (point = {x: point.x, y: point.y, alpha: point.alpha});
+				return point;
+			};
+		};
+	var getTotalLength = getLengthFactory(1),
+		getPointAtLength = getLengthFactory(),
+		getSubpathsAtLength = getLengthFactory(0, 1);
+
+	R.getTotalLength = getTotalLength;
+
+	R.getPointAtLength = getPointAtLength;
+
+	R.getSubpath = function (path, from, to) {
+		if (this.getTotalLength(path) - to < 1e-6) {
+			return getSubpathsAtLength(path, from).end;
+		}
+		var a = getSubpathsAtLength(path, to, 1);
+		return from ? getSubpathsAtLength(a, from).end : a;
+	};
+
+	elproto.getTotalLength = function () {
+		if (this.type != "path") {
+			return;
+		}
+		if (this.node.getTotalLength) {
+			return this.node.getTotalLength();
+		}
+		return getTotalLength(this.attrs.path);
+	};
+
+	elproto.getPointAtLength = function (length) {
+		if (this.type != "path") {
+			return;
+		}
+		return getPointAtLength(this.attrs.path, length);
+	};
+
+	elproto.getSubpath = function (from, to) {
+		if (this.type != "path") {
+			return;
+		}
+		return R.getSubpath(this.attrs.path, from, to);
+	};
+
+	var ef = R.easing_formulas = {
+		linear: function (n) {
+			return n;
+		},
+		"<": function (n) {
+			return pow(n, 1.7);
+		},
+		">": function (n) {
+			return pow(n, .48);
+		},
+		"<>": function (n) {
+			var q = .48 - n / 1.04,
+				Q = math.sqrt(.1734 + q * q),
+				x = Q - q,
+				X = pow(abs(x), 1 / 3) * (x < 0 ? -1 : 1),
+				y = -Q - q,
+				Y = pow(abs(y), 1 / 3) * (y < 0 ? -1 : 1),
+				t = X + Y + .5;
+			return (1 - t) * 3 * t * t + t * t * t;
+		},
+		backIn: function (n) {
+			var s = 1.70158;
+			return n * n * ((s + 1) * n - s);
+		},
+		backOut: function (n) {
+			n = n - 1;
+			var s = 1.70158;
+			return n * n * ((s + 1) * n + s) + 1;
+		},
+		elastic: function (n) {
+			if (n == !!n) {
+				return n;
+			}
+			return pow(2, -10 * n) * math.sin((n - .075) * (2 * PI) / .3) + 1;
+		},
+		bounce: function (n) {
+			var s = 7.5625,
+				p = 2.75,
+				l;
+			if (n < (1 / p)) {
+				l = s * n * n;
+			} else {
+				if (n < (2 / p)) {
+					n -= (1.5 / p);
+					l = s * n * n + .75;
+				} else {
+					if (n < (2.5 / p)) {
+						n -= (2.25 / p);
+						l = s * n * n + .9375;
+					} else {
+						n -= (2.625 / p);
+						l = s * n * n + .984375;
+					}
+				}
+			}
+			return l;
+		}
+	};
+	ef.easeIn = ef["ease-in"] = ef["<"];
+	ef.easeOut = ef["ease-out"] = ef[">"];
+	ef.easeInOut = ef["ease-in-out"] = ef["<>"];
+	ef["back-in"] = ef.backIn;
+	ef["back-out"] = ef.backOut;
+
+	var animationElements = [],
+		requestAnimFrame = window.requestAnimationFrame ||
+			window.webkitRequestAnimationFrame ||
+			window.mozRequestAnimationFrame ||
+			window.oRequestAnimationFrame ||
+			window.msRequestAnimationFrame ||
+			function (callback) {
+				setTimeout(callback, 16);
+			},
+		animation = function () {
+			var Now = +new Date,
+				l = 0;
+			for (; l < animationElements.length; l++) {
+				var e = animationElements[l];
+				if (e.el.removed || e.paused) {
+					continue;
+				}
+				var time = Now - e.start,
+					ms = e.ms,
+					easing = e.easing,
+					from = e.from,
+					diff = e.diff,
+					to = e.to,
+					t = e.t,
+					that = e.el,
+					set = {},
+					now,
+					init = {},
+					key;
+				if (e.initstatus) {
+					time = (e.initstatus * e.anim.top - e.prev) / (e.percent - e.prev) * ms;
+					e.status = e.initstatus;
+					delete e.initstatus;
+					e.stop && animationElements.splice(l--, 1);
+				} else {
+					e.status = (e.prev + (e.percent - e.prev) * (time / ms)) / e.anim.top;
+				}
+				if (time < 0) {
+					continue;
+				}
+				if (time < ms) {
+					var pos = easing(time / ms);
+					for (var attr in from) if (from[has](attr)) {
+						switch (availableAnimAttrs[attr]) {
+							case nu:
+								now = +from[attr] + pos * ms * diff[attr];
+								break;
+							case "colour":
+								now = "rgb(" + [
+									upto255(round(from[attr].r + pos * ms * diff[attr].r)),
+									upto255(round(from[attr].g + pos * ms * diff[attr].g)),
+									upto255(round(from[attr].b + pos * ms * diff[attr].b))
+								].join(",") + ")";
+								break;
+							case "path":
+								now = [];
+								for (var i = 0, ii = from[attr].length; i < ii; i++) {
+									now[i] = [from[attr][i][0]];
+									for (var j = 1, jj = from[attr][i].length; j < jj; j++) {
+										now[i][j] = +from[attr][i][j] + pos * ms * diff[attr][i][j];
+									}
+									now[i] = now[i].join(S);
+								}
+								now = now.join(S);
+								break;
+							case "transform":
+								if (diff[attr].real) {
+									now = [];
+									for (i = 0, ii = from[attr].length; i < ii; i++) {
+										now[i] = [from[attr][i][0]];
+										for (j = 1, jj = from[attr][i].length; j < jj; j++) {
+											now[i][j] = from[attr][i][j] + pos * ms * diff[attr][i][j];
+										}
+									}
+								} else {
+									var get = function (i) {
+										return +from[attr][i] + pos * ms * diff[attr][i];
+									};
+									// now = [["r", get(2), 0, 0], ["t", get(3), get(4)], ["s", get(0), get(1), 0, 0]];
+									now = [["m", get(0), get(1), get(2), get(3), get(4), get(5)]];
+								}
+								break;
+							case "csv":
+								if (attr == "clip-rect") {
+									now = [];
+									i = 4;
+									while (i--) {
+										now[i] = +from[attr][i] + pos * ms * diff[attr][i];
+									}
+								}
+								break;
+							default:
+								var from2 = [][concat](from[attr]);
+								now = [];
+								i = that.paper.customAttributes[attr].length;
+								while (i--) {
+									now[i] = +from2[i] + pos * ms * diff[attr][i];
+								}
+								break;
+						}
+						set[attr] = now;
+					}
+					that.attr(set);
+					(function (id, that, anim) {
+						setTimeout(function () {
+							eve("raphael.anim.frame." + id, that, anim);
+						});
+					})(that.id, that, e.anim);
+				} else {
+					(function (f, el, a) {
+						setTimeout(function () {
+							eve("raphael.anim.frame." + el.id, el, a);
+							eve("raphael.anim.finish." + el.id, el, a);
+							R.is(f, "function") && f.call(el);
+						});
+					})(e.callback, that, e.anim);
+					that.attr(to);
+					animationElements.splice(l--, 1);
+					if (e.repeat > 1 && !e.next) {
+						for (key in to) if (to[has](key)) {
+							init[key] = e.totalOrigin[key];
+						}
+						e.el.attr(init);
+						runAnimation(e.anim, e.el, e.anim.percents[0], null, e.totalOrigin, e.repeat - 1);
+					}
+					if (e.next && !e.stop) {
+						runAnimation(e.anim, e.el, e.next, null, e.totalOrigin, e.repeat);
+					}
+				}
+			}
+			R.svg && that && that.paper && that.paper.safari();
+			animationElements.length && requestAnimFrame(animation);
+		},
+		upto255 = function (color) {
+			return color > 255 ? 255 : color < 0 ? 0 : color;
+		};
+
+	elproto.animateWith = function (el, anim, params, ms, easing, callback) {
+		var element = this;
+		if (element.removed) {
+			callback && callback.call(element);
+			return element;
+		}
+		var a = params instanceof Animation ? params : R.animation(params, ms, easing, callback),
+			x, y;
+		runAnimation(a, element, a.percents[0], null, element.attr());
+		for (var i = 0, ii = animationElements.length; i < ii; i++) {
+			if (animationElements[i].anim == anim && animationElements[i].el == el) {
+				animationElements[ii - 1].start = animationElements[i].start;
+				break;
+			}
+		}
+		return element;
+		//
+		//
+		// var a = params ? R.animation(params, ms, easing, callback) : anim,
+		//     status = element.status(anim);
+		// return this.animate(a).status(a, status * anim.ms / a.ms);
+	};
+
+	function CubicBezierAtTime(t, p1x, p1y, p2x, p2y, duration) {
+		var cx = 3 * p1x,
+			bx = 3 * (p2x - p1x) - cx,
+			ax = 1 - cx - bx,
+			cy = 3 * p1y,
+			by = 3 * (p2y - p1y) - cy,
+			ay = 1 - cy - by;
+
+		function sampleCurveX(t) {
+			return ((ax * t + bx) * t + cx) * t;
+		}
+
+		function solve(x, epsilon) {
+			var t = solveCurveX(x, epsilon);
+			return ((ay * t + by) * t + cy) * t;
+		}
+
+		function solveCurveX(x, epsilon) {
+			var t0, t1, t2, x2, d2, i;
+			for (t2 = x, i = 0; i < 8; i++) {
+				x2 = sampleCurveX(t2) - x;
+				if (abs(x2) < epsilon) {
+					return t2;
+				}
+				d2 = (3 * ax * t2 + 2 * bx) * t2 + cx;
+				if (abs(d2) < 1e-6) {
+					break;
+				}
+				t2 = t2 - x2 / d2;
+			}
+			t0 = 0;
+			t1 = 1;
+			t2 = x;
+			if (t2 < t0) {
+				return t0;
+			}
+			if (t2 > t1) {
+				return t1;
+			}
+			while (t0 < t1) {
+				x2 = sampleCurveX(t2);
+				if (abs(x2 - x) < epsilon) {
+					return t2;
+				}
+				if (x > x2) {
+					t0 = t2;
+				} else {
+					t1 = t2;
+				}
+				t2 = (t1 - t0) / 2 + t0;
+			}
+			return t2;
+		}
+
+		return solve(t, 1 / (200 * duration));
+	}
+
+	elproto.onAnimation = function (f) {
+		f ? eve.on("raphael.anim.frame." + this.id, f) : eve.unbind("raphael.anim.frame." + this.id);
+		return this;
+	};
+
+	function Animation(anim, ms) {
+		var percents = [],
+			newAnim = {};
+		this.ms = ms;
+		this.times = 1;
+		if (anim) {
+			for (var attr in anim) if (anim[has](attr)) {
+				newAnim[toFloat(attr)] = anim[attr];
+				percents.push(toFloat(attr));
+			}
+			percents.sort(sortByNumber);
+		}
+		this.anim = newAnim;
+		this.top = percents[percents.length - 1];
+		this.percents = percents;
+	}
+
+	Animation.prototype.delay = function (delay) {
+		var a = new Animation(this.anim, this.ms);
+		a.times = this.times;
+		a.del = +delay || 0;
+		return a;
+	};
+
+	Animation.prototype.repeat = function (times) {
+		var a = new Animation(this.anim, this.ms);
+		a.del = this.del;
+		a.times = math.floor(mmax(times, 0)) || 1;
+		return a;
+	};
+
+	function runAnimation(anim, element, percent, status, totalOrigin, times) {
+		percent = toFloat(percent);
+		var params,
+			isInAnim,
+			isInAnimSet,
+			percents = [],
+			next,
+			prev,
+			timestamp,
+			ms = anim.ms,
+			from = {},
+			to = {},
+			diff = {};
+		if (status) {
+			for (i = 0, ii = animationElements.length; i < ii; i++) {
+				var e = animationElements[i];
+				if (e.el.id == element.id && e.anim == anim) {
+					if (e.percent != percent) {
+						animationElements.splice(i, 1);
+						isInAnimSet = 1;
+					} else {
+						isInAnim = e;
+					}
+					element.attr(e.totalOrigin);
+					break;
+				}
+			}
+		} else {
+			status = +to; // NaN
+		}
+		for (var i = 0, ii = anim.percents.length; i < ii; i++) {
+			if (anim.percents[i] == percent || anim.percents[i] > status * anim.top) {
+				percent = anim.percents[i];
+				prev = anim.percents[i - 1] || 0;
+				ms = ms / anim.top * (percent - prev);
+				next = anim.percents[i + 1];
+				params = anim.anim[percent];
+				break;
+			} else if (status) {
+				element.attr(anim.anim[anim.percents[i]]);
+			}
+		}
+		if (!params) {
+			return;
+		}
+		if (!isInAnim) {
+			for (var attr in params) if (params[has](attr)) {
+				if (availableAnimAttrs[has](attr) || element.paper.customAttributes[has](attr)) {
+					from[attr] = element.attr(attr);
+					(from[attr] == null) && (from[attr] = availableAttrs[attr]);
+					to[attr] = params[attr];
+					switch (availableAnimAttrs[attr]) {
+						case nu:
+							diff[attr] = (to[attr] - from[attr]) / ms;
+							break;
+						case "colour":
+							from[attr] = R.getRGB(from[attr]);
+							var toColour = R.getRGB(to[attr]);
+							diff[attr] = {
+								r: (toColour.r - from[attr].r) / ms,
+								g: (toColour.g - from[attr].g) / ms,
+								b: (toColour.b - from[attr].b) / ms
+							};
+							break;
+						case "path":
+							var pathes = path2curve(from[attr], to[attr]),
+								toPath = pathes[1];
+							from[attr] = pathes[0];
+							diff[attr] = [];
+							for (i = 0, ii = from[attr].length; i < ii; i++) {
+								diff[attr][i] = [0];
+								for (var j = 1, jj = from[attr][i].length; j < jj; j++) {
+									diff[attr][i][j] = (toPath[i][j] - from[attr][i][j]) / ms;
+								}
+							}
+							break;
+						case "transform":
+							var _ = element._,
+								eq = equaliseTransform(_[attr], to[attr]);
+							if (eq) {
+								from[attr] = eq.from;
+								to[attr] = eq.to;
+								diff[attr] = [];
+								diff[attr].real = true;
+								for (i = 0, ii = from[attr].length; i < ii; i++) {
+									diff[attr][i] = [from[attr][i][0]];
+									for (j = 1, jj = from[attr][i].length; j < jj; j++) {
+										diff[attr][i][j] = (to[attr][i][j] - from[attr][i][j]) / ms;
+									}
+								}
+							} else {
+								var m = (element.matrix || new Matrix),
+									to2 = {
+										_: {transform: _.transform},
+										getBBox: function () {
+											return element.getBBox(1);
+										}
+									};
+								from[attr] = [
+									m.a,
+									m.b,
+									m.c,
+									m.d,
+									m.e,
+									m.f
+								];
+								extractTransform(to2, to[attr]);
+								to[attr] = to2._.transform;
+								diff[attr] = [
+									(to2.matrix.a - m.a) / ms,
+									(to2.matrix.b - m.b) / ms,
+									(to2.matrix.c - m.c) / ms,
+									(to2.matrix.d - m.d) / ms,
+									(to2.matrix.e - m.e) / ms,
+									(to2.matrix.f - m.f) / ms
+								];
+								// from[attr] = [_.sx, _.sy, _.deg, _.dx, _.dy];
+								// var to2 = {_:{}, getBBox: function () { return element.getBBox(); }};
+								// extractTransform(to2, to[attr]);
+								// diff[attr] = [
+								//     (to2._.sx - _.sx) / ms,
+								//     (to2._.sy - _.sy) / ms,
+								//     (to2._.deg - _.deg) / ms,
+								//     (to2._.dx - _.dx) / ms,
+								//     (to2._.dy - _.dy) / ms
+								// ];
+							}
+							break;
+						case "csv":
+							var values = Str(params[attr])[split](separator),
+								from2 = Str(from[attr])[split](separator);
+							if (attr == "clip-rect") {
+								from[attr] = from2;
+								diff[attr] = [];
+								i = from2.length;
+								while (i--) {
+									diff[attr][i] = (values[i] - from[attr][i]) / ms;
+								}
+							}
+							to[attr] = values;
+							break;
+						default:
+							values = [][concat](params[attr]);
+							from2 = [][concat](from[attr]);
+							diff[attr] = [];
+							i = element.paper.customAttributes[attr].length;
+							while (i--) {
+								diff[attr][i] = ((values[i] || 0) - (from2[i] || 0)) / ms;
+							}
+							break;
+					}
+				}
+			}
+			var easing = params.easing,
+				easyeasy = R.easing_formulas[easing];
+			if (!easyeasy) {
+				easyeasy = Str(easing).match(bezierrg);
+				if (easyeasy && easyeasy.length == 5) {
+					var curve = easyeasy;
+					easyeasy = function (t) {
+						return CubicBezierAtTime(t, +curve[1], +curve[2], +curve[3], +curve[4], ms);
+					};
+				} else {
+					easyeasy = pipe;
+				}
+			}
+			timestamp = params.start || anim.start || +new Date;
+			e = {
+				anim: anim,
+				percent: percent,
+				timestamp: timestamp,
+				start: timestamp + (anim.del || 0),
+				status: 0,
+				initstatus: status || 0,
+				stop: false,
+				ms: ms,
+				easing: easyeasy,
+				from: from,
+				diff: diff,
+				to: to,
+				el: element,
+				callback: params.callback,
+				prev: prev,
+				next: next,
+				repeat: times || anim.times,
+				origin: element.attr(),
+				totalOrigin: totalOrigin
+			};
+			animationElements.push(e);
+			if (status && !isInAnim && !isInAnimSet) {
+				e.stop = true;
+				e.start = new Date - ms * status;
+				if (animationElements.length == 1) {
+					return animation();
+				}
+			}
+			if (isInAnimSet) {
+				e.start = new Date - e.ms * status;
+			}
+			animationElements.length == 1 && requestAnimFrame(animation);
+		} else {
+			isInAnim.initstatus = status;
+			isInAnim.start = new Date - isInAnim.ms * status;
+		}
+		eve("raphael.anim.start." + element.id, element, anim);
+	}
+
+	R.animation = function (params, ms, easing, callback) {
+		if (params instanceof Animation) {
+			return params;
+		}
+		if (R.is(easing, "function") || !easing) {
+			callback = callback || easing || null;
+			easing = null;
+		}
+		params = Object(params);
+		ms = +ms || 0;
+		var p = {},
+			json,
+			attr;
+		for (attr in params) if (params[has](attr) && toFloat(attr) != attr && toFloat(attr) + "%" != attr) {
+			json = true;
+			p[attr] = params[attr];
+		}
+		if (!json) {
+			return new Animation(params, ms);
+		} else {
+			easing && (p.easing = easing);
+			callback && (p.callback = callback);
+			return new Animation({100: p}, ms);
+		}
+	};
+
+	elproto.animate = function (params, ms, easing, callback) {
+		var element = this;
+		if (element.removed) {
+			callback && callback.call(element);
+			return element;
+		}
+		var anim = params instanceof Animation ? params : R.animation(params, ms, easing, callback);
+		runAnimation(anim, element, anim.percents[0], null, element.attr());
+		return element;
+	};
+
+	elproto.setTime = function (anim, value) {
+		if (anim && value != null) {
+			this.status(anim, mmin(value, anim.ms) / anim.ms);
+		}
+		return this;
+	};
+
+	elproto.status = function (anim, value) {
+		var out = [],
+			i = 0,
+			len,
+			e;
+		if (value != null) {
+			runAnimation(anim, this, -1, mmin(value, 1));
+			return this;
+		} else {
+			len = animationElements.length;
+			for (; i < len; i++) {
+				e = animationElements[i];
+				if (e.el.id == this.id && (!anim || e.anim == anim)) {
+					if (anim) {
+						return e.status;
+					}
+					out.push({
+						anim: e.anim,
+						status: e.status
+					});
+				}
+			}
+			if (anim) {
+				return 0;
+			}
+			return out;
+		}
+	};
+
+	elproto.pause = function (anim) {
+		for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) {
+			if (eve("raphael.anim.pause." + this.id, this, animationElements[i].anim) !== false) {
+				animationElements[i].paused = true;
+			}
+		}
+		return this;
+	};
+
+	elproto.resume = function (anim) {
+		for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) {
+			var e = animationElements[i];
+			if (eve("raphael.anim.resume." + this.id, this, e.anim) !== false) {
+				delete e.paused;
+				this.status(e.anim, e.status);
+			}
+		}
+		return this;
+	};
+
+	elproto.stop = function (anim) {
+		for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.id == this.id && (!anim || animationElements[i].anim == anim)) {
+			if (eve("raphael.anim.stop." + this.id, this, animationElements[i].anim) !== false) {
+				animationElements.splice(i--, 1);
+			}
+		}
+		return this;
+	};
+
+	function stopAnimation(paper) {
+		for (var i = 0; i < animationElements.length; i++) if (animationElements[i].el.paper == paper) {
+			animationElements.splice(i--, 1);
+		}
+	}
+
+	eve.on("raphael.remove", stopAnimation);
+	eve.on("raphael.clear", stopAnimation);
+	elproto.toString = function () {
+		return "Rapha\xebl\u2019s object";
+	};
+
+	// Set
+	var Set = function (items) {
+			this.items = [];
+			this.length = 0;
+			this.type = "set";
+			if (items) {
+				for (var i = 0, ii = items.length; i < ii; i++) {
+					if (items[i] && (items[i].constructor == elproto.constructor || items[i].constructor == Set)) {
+						this[this.items.length] = this.items[this.items.length] = items[i];
+						this.length++;
+					}
+				}
+			}
+		},
+		setproto = Set.prototype;
+
+	setproto.push = function () {
+		var item,
+			len;
+		for (var i = 0, ii = arguments.length; i < ii; i++) {
+			item = arguments[i];
+			if (item && (item.constructor == elproto.constructor || item.constructor == Set)) {
+				len = this.items.length;
+				this[len] = this.items[len] = item;
+				this.length++;
+			}
+		}
+		return this;
+	};
+
+	setproto.pop = function () {
+		this.length && delete this[this.length--];
+		return this.items.pop();
+	};
+
+	setproto.forEach = function (callback, thisArg) {
+		for (var i = 0, ii = this.items.length; i < ii; i++) {
+			if (callback.call(thisArg, this.items[i], i) === false) {
+				return this;
+			}
+		}
+		return this;
+	};
+	for (var method in elproto) if (elproto[has](method)) {
+		setproto[method] = (function (methodname) {
+			return function () {
+				var arg = arguments;
+				return this.forEach(function (el) {
+					el[methodname][apply](el, arg);
+				});
+			};
+		})(method);
+	}
+	setproto.attr = function (name, value) {
+		if (name && R.is(name, array) && R.is(name[0], "object")) {
+			for (var j = 0, jj = name.length; j < jj; j++) {
+				this.items[j].attr(name[j]);
+			}
+		} else {
+			for (var i = 0, ii = this.items.length; i < ii; i++) {
+				this.items[i].attr(name, value);
+			}
+		}
+		return this;
+	};
+
+	setproto.clear = function () {
+		while (this.length) {
+			this.pop();
+		}
+	};
+
+	setproto.splice = function (index, count, insertion) {
+		index = index < 0 ? mmax(this.length + index, 0) : index;
+		count = mmax(0, mmin(this.length - index, count));
+		var tail = [],
+			todel = [],
+			args = [],
+			i;
+		for (i = 2; i < arguments.length; i++) {
+			args.push(arguments[i]);
+		}
+		for (i = 0; i < count; i++) {
+			todel.push(this[index + i]);
+		}
+		for (; i < this.length - index; i++) {
+			tail.push(this[index + i]);
+		}
+		var arglen = args.length;
+		for (i = 0; i < arglen + tail.length; i++) {
+			this.items[index + i] = this[index + i] = i < arglen ? args[i] : tail[i - arglen];
+		}
+		i = this.items.length = this.length -= count - arglen;
+		while (this[i]) {
+			delete this[i++];
+		}
+		return new Set(todel);
+	};
+
+	setproto.exclude = function (el) {
+		for (var i = 0, ii = this.length; i < ii; i++) if (this[i] == el) {
+			this.splice(i, 1);
+			return true;
+		}
+	};
+	setproto.animate = function (params, ms, easing, callback) {
+		(R.is(easing, "function") || !easing) && (callback = easing || null);
+		var len = this.items.length,
+			i = len,
+			item,
+			set = this,
+			collector;
+		if (!len) {
+			return this;
+		}
+		callback && (collector = function () {
+			!--len && callback.call(set);
+		});
+		easing = R.is(easing, string) ? easing : collector;
+		var anim = R.animation(params, ms, easing, collector);
+		item = this.items[--i].animate(anim);
+		while (i--) {
+			this.items[i] && !this.items[i].removed && this.items[i].animateWith(item, anim, anim);
+		}
+		return this;
+	};
+	setproto.insertAfter = function (el) {
+		var i = this.items.length;
+		while (i--) {
+			this.items[i].insertAfter(el);
+		}
+		return this;
+	};
+	setproto.getBBox = function () {
+		var x = [],
+			y = [],
+			x2 = [],
+			y2 = [];
+		for (var i = this.items.length; i--;) if (!this.items[i].removed) {
+			var box = this.items[i].getBBox();
+			x.push(box.x);
+			y.push(box.y);
+			x2.push(box.x + box.width);
+			y2.push(box.y + box.height);
+		}
+		x = mmin[apply](0, x);
+		y = mmin[apply](0, y);
+		x2 = mmax[apply](0, x2);
+		y2 = mmax[apply](0, y2);
+		return {
+			x: x,
+			y: y,
+			x2: x2,
+			y2: y2,
+			width: x2 - x,
+			height: y2 - y
+		};
+	};
+	setproto.clone = function (s) {
+		s = new Set;
+		for (var i = 0, ii = this.items.length; i < ii; i++) {
+			s.push(this.items[i].clone());
+		}
+		return s;
+	};
+	setproto.toString = function () {
+		return "Rapha\xebl\u2018s set";
+	};
+
+
+	R.registerFont = function (font) {
+		if (!font.face) {
+			return font;
+		}
+		this.fonts = this.fonts || {};
+		var fontcopy = {
+				w: font.w,
+				face: {},
+				glyphs: {}
+			},
+			family = font.face["font-family"];
+		for (var prop in font.face) if (font.face[has](prop)) {
+			fontcopy.face[prop] = font.face[prop];
+		}
+		if (this.fonts[family]) {
+			this.fonts[family].push(fontcopy);
+		} else {
+			this.fonts[family] = [fontcopy];
+		}
+		if (!font.svg) {
+			fontcopy.face["units-per-em"] = toInt(font.face["units-per-em"], 10);
+			for (var glyph in font.glyphs) if (font.glyphs[has](glyph)) {
+				var path = font.glyphs[glyph];
+				fontcopy.glyphs[glyph] = {
+					w: path.w,
+					k: {},
+					d: path.d && "M" + path.d.replace(/[mlcxtrv]/g, function (command) {
+						return {l: "L", c: "C", x: "z", t: "m", r: "l", v: "c"}[command] || "M";
+					}) + "z"
+				};
+				if (path.k) {
+					for (var k in path.k) if (path[has](k)) {
+						fontcopy.glyphs[glyph].k[k] = path.k[k];
+					}
+				}
+			}
+		}
+		return font;
+	};
+
+	paperproto.getFont = function (family, weight, style, stretch) {
+		stretch = stretch || "normal";
+		style = style || "normal";
+		weight = +weight || {normal: 400, bold: 700, lighter: 300, bolder: 800}[weight] || 400;
+		if (!R.fonts) {
+			return;
+		}
+		var font = R.fonts[family];
+		if (!font) {
+			var name = new RegExp("(^|\\s)" + family.replace(/[^\w\d\s+!~.:_-]/g, E) + "(\\s|$)", "i");
+			for (var fontName in R.fonts) if (R.fonts[has](fontName)) {
+				if (name.test(fontName)) {
+					font = R.fonts[fontName];
+					break;
+				}
+			}
+		}
+		var thefont;
+		if (font) {
+			for (var i = 0, ii = font.length; i < ii; i++) {
+				thefont = font[i];
+				if (thefont.face["font-weight"] == weight && (thefont.face["font-style"] == style || !thefont.face["font-style"]) && thefont.face["font-stretch"] == stretch) {
+					break;
+				}
+			}
+		}
+		return thefont;
+	};
+
+	paperproto.print = function (x, y, string, font, size, origin, letter_spacing) {
+		origin = origin || "middle"; // baseline|middle
+		letter_spacing = mmax(mmin(letter_spacing || 0, 1), -1);
+		var letters = Str(string)[split](E),
+			shift = 0,
+			notfirst = 0,
+			path = E,
+			scale;
+		R.is(font, string) && (font = this.getFont(font));
+		if (font) {
+			scale = (size || 16) / font.face["units-per-em"];
+			var bb = font.face.bbox[split](separator),
+				top = +bb[0],
+				lineHeight = bb[3] - bb[1],
+				shifty = 0,
+				height = +bb[1] + (origin == "baseline" ? lineHeight + (+font.face.descent) : lineHeight / 2);
+			for (var i = 0, ii = letters.length; i < ii; i++) {
+				if (letters[i] == "\n") {
+					shift = 0;
+					curr = 0;
+					notfirst = 0;
+					shifty += lineHeight;
+				} else {
+					var prev = notfirst && font.glyphs[letters[i - 1]] || {},
+						curr = font.glyphs[letters[i]];
+					shift += notfirst ? (prev.w || font.w) + (prev.k && prev.k[letters[i]] || 0) + (font.w * letter_spacing) : 0;
+					notfirst = 1;
+				}
+				if (curr && curr.d) {
+					path += R.transformPath(curr.d, ["t", shift * scale, shifty * scale, "s", scale, scale, top, height, "t", (x - top) / scale, (y - height) / scale]);
+				}
+			}
+		}
+		return this.path(path).attr({
+			fill: "#000",
+			stroke: "none"
+		});
+	};
+
+
+	paperproto.add = function (json) {
+		if (R.is(json, "array")) {
+			var res = this.set(),
+				i = 0,
+				ii = json.length,
+				j;
+			for (; i < ii; i++) {
+				j = json[i] || {};
+				elements[has](j.type) && res.push(this[j.type]().attr(j));
+			}
+		}
+		return res;
+	};
+
+
+	R.format = function (token, params) {
+		var args = R.is(params, array) ? [0][concat](params) : arguments;
+		token && R.is(token, string) && args.length - 1 && (token = token.replace(formatrg, function (str, i) {
+			return args[++i] == null ? E : args[i];
+		}));
+		return token || E;
+	};
+
+	R.fullfill = (function () {
+		var tokenRegex = /\{([^\}]+)\}/g,
+			objNotationRegex = /(?:(?:^|\.)(.+?)(?=\[|\.|$|\()|\[('|")(.+?)\2\])(\(\))?/g, // matches .xxxxx or ["xxxxx"] to run over object properties
+			replacer = function (all, key, obj) {
+				var res = obj;
+				key.replace(objNotationRegex, function (all, name, quote, quotedName, isFunc) {
+					name = name || quotedName;
+					if (res) {
+						if (name in res) {
+							res = res[name];
+						}
+						typeof res == "function" && isFunc && (res = res());
+					}
+				});
+				res = (res == null || res == obj ? all : res) + "";
+				return res;
+			};
+		return function (str, obj) {
+			return String(str).replace(tokenRegex, function (all, key) {
+				return replacer(all, key, obj);
+			});
+		};
+	})();
+
+	R.ninja = function () {
+		oldRaphael.was ? (g.win.Raphael = oldRaphael.is) : delete Raphael;
+		return R;
+	};
+
+	R.st = setproto;
+	// Firefox <3.6 fix: http://webreflection.blogspot.com/2009/11/195-chars-to-help-lazy-loading.html
+	(function (doc, loaded, f) {
+		if (doc.readyState == null && doc.addEventListener) {
+			doc.addEventListener(loaded, f = function () {
+				doc.removeEventListener(loaded, f, false);
+				doc.readyState = "complete";
+			}, false);
+			doc.readyState = "loading";
+		}
+
+		function isLoaded() {
+			(/in/).test(doc.readyState) ? setTimeout(isLoaded, 9) : R.eve("raphael.DOMload");
+		}
+
+		isLoaded();
+	})(document, "DOMContentLoaded");
+
+	oldRaphael.was ? (g.win.Raphael = R) : (Raphael = R);
+
+	eve.on("raphael.DOMload", function () {
+		loaded = true;
+	});
 })();
 
 
@@ -3753,1091 +3777,1104 @@
 // │ Licensed under the MIT (http://raphaeljs.com/license.html) license. │ \\
 // └─────────────────────────────────────────────────────────────────────┘ \\
 window.Raphael.svg && function (R) {
-    var has = "hasOwnProperty",
-        Str = String,
-        toFloat = parseFloat,
-        toInt = parseInt,
-        math = Math,
-        mmax = math.max,
-        abs = math.abs,
-        pow = math.pow,
-        separator = /[, ]+/,
-        eve = R.eve,
-        E = "",
-        S = " ";
-    var xlink = "http://www.w3.org/1999/xlink",
-        markers = {
-            block: "M5,0 0,2.5 5,5z",
-            classic: "M5,0 0,2.5 5,5 3.5,3 3.5,2z",
-            diamond: "M2.5,0 5,2.5 2.5,5 0,2.5z",
-            open: "M6,1 1,3.5 6,6",
-            oval: "M2.5,0A2.5,2.5,0,0,1,2.5,5 2.5,2.5,0,0,1,2.5,0z"
-        },
-        markerCounter = {};
-    R.toString = function () {
-        return  "Your browser supports SVG.\nYou are running Rapha\xebl " + this.version;
-    };
-    var $ = function (el, attr) {
-        if (attr) {
-            if (typeof el == "string") {
-                el = $(el);
-            }
-            for (var key in attr) if (attr[has](key)) {
-                if (key.substring(0, 6) == "xlink:") {
-                    el.setAttributeNS(xlink, key.substring(6), Str(attr[key]));
-                } else {
-                    el.setAttribute(key, Str(attr[key]));
-                }
-            }
-        } else {
-            el = R._g.doc.createElementNS("http://www.w3.org/2000/svg", el);
-            el.style && (el.style.webkitTapHighlightColor = "rgba(0,0,0,0)");
-        }
-        return el;
-    },
-    addGradientFill = function (element, gradient) {
-        var type = "linear",
-            id = element.id + gradient,
-            fx = .5, fy = .5,
-            o = element.node,
-            SVG = element.paper,
-            s = o.style,
-            el = R._g.doc.getElementById(id);
-        if (!el) {
-            gradient = Str(gradient).replace(R._radial_gradient, function (all, _fx, _fy) {
-                type = "radial";
-                if (_fx && _fy) {
-                    fx = toFloat(_fx);
-                    fy = toFloat(_fy);
-                    var dir = ((fy > .5) * 2 - 1);
-                    pow(fx - .5, 2) + pow(fy - .5, 2) > .25 &&
-                        (fy = math.sqrt(.25 - pow(fx - .5, 2)) * dir + .5) &&
-                        fy != .5 &&
-                        (fy = fy.toFixed(5) - 1e-5 * dir);
-                }
-                return E;
-            });
-            gradient = gradient.split(/\s*\-\s*/);
-            if (type == "linear") {
-                var angle = gradient.shift();
-                angle = -toFloat(angle);
-                if (isNaN(angle)) {
-                    return null;
-                }
-                var vector = [0, 0, math.cos(R.rad(angle)), math.sin(R.rad(angle))],
-                    max = 1 / (mmax(abs(vector[2]), abs(vector[3])) || 1);
-                vector[2] *= max;
-                vector[3] *= max;
-                if (vector[2] < 0) {
-                    vector[0] = -vector[2];
-                    vector[2] = 0;
-                }
-                if (vector[3] < 0) {
-                    vector[1] = -vector[3];
-                    vector[3] = 0;
-                }
-            }
-            var dots = R._parseDots(gradient);
-            if (!dots) {
-                return null;
-            }
-            id = id.replace(/[\(\)\s,\xb0#]/g, "_");
-            
-            if (element.gradient && id != element.gradient.id) {
-                SVG.defs.removeChild(element.gradient);
-                delete element.gradient;
-            }
-
-            if (!element.gradient) {
-                el = $(type + "Gradient", {id: id});
-                element.gradient = el;
-                $(el, type == "radial" ? {
-                    fx: fx,
-                    fy: fy
-                } : {
-                    x1: vector[0],
-                    y1: vector[1],
-                    x2: vector[2],
-                    y2: vector[3],
-                    gradientTransform: element.matrix.invert()
-                });
-                SVG.defs.appendChild(el);
-                for (var i = 0, ii = dots.length; i < ii; i++) {
-                    el.appendChild($("stop", {
-                        offset: dots[i].offset ? dots[i].offset : i ? "100%" : "0%",
-                        "stop-color": dots[i].color || "#fff"
-                    }));
-                }
-            }
-        }
-        $(o, {
-            fill: "url(#" + id + ")",
-            opacity: 1,
-            "fill-opacity": 1
-        });
-        s.fill = E;
-        s.opacity = 1;
-        s.fillOpacity = 1;
-        return 1;
-    },
-    updatePosition = function (o) {
-        var bbox = o.getBBox(1);
-        $(o.pattern, {patternTransform: o.matrix.invert() + " translate(" + bbox.x + "," + bbox.y + ")"});
-    },
-    addArrow = function (o, value, isEnd) {
-        if (o.type == "path") {
-            var values = Str(value).toLowerCase().split("-"),
-                p = o.paper,
-                se = isEnd ? "end" : "start",
-                node = o.node,
-                attrs = o.attrs,
-                stroke = attrs["stroke-width"],
-                i = values.length,
-                type = "classic",
-                from,
-                to,
-                dx,
-                refX,
-                attr,
-                w = 3,
-                h = 3,
-                t = 5;
-            while (i--) {
-                switch (values[i]) {
-                    case "block":
-                    case "classic":
-                    case "oval":
-                    case "diamond":
-                    case "open":
-                    case "none":
-                        type = values[i];
-                        break;
-                    case "wide": h = 5; break;
-                    case "narrow": h = 2; break;
-                    case "long": w = 5; break;
-                    case "short": w = 2; break;
-                }
-            }
-            if (type == "open") {
-                w += 2;
-                h += 2;
-                t += 2;
-                dx = 1;
-                refX = isEnd ? 4 : 1;
-                attr = {
-                    fill: "none",
-                    stroke: attrs.stroke
-                };
-            } else {
-                refX = dx = w / 2;
-                attr = {
-                    fill: attrs.stroke,
-                    stroke: "none"
-                };
-            }
-            if (o._.arrows) {
-                if (isEnd) {
-                    o._.arrows.endPath && markerCounter[o._.arrows.endPath]--;
-                    o._.arrows.endMarker && markerCounter[o._.arrows.endMarker]--;
-                } else {
-                    o._.arrows.startPath && markerCounter[o._.arrows.startPath]--;
-                    o._.arrows.startMarker && markerCounter[o._.arrows.startMarker]--;
-                }
-            } else {
-                o._.arrows = {};
-            }
-            if (type != "none") {
-                var pathId = "raphael-marker-" + type,
-                    markerId = "raphael-marker-" + se + type + w + h;
-                if (!R._g.doc.getElementById(pathId)) {
-                    p.defs.appendChild($($("path"), {
-                        "stroke-linecap": "round",
-                        d: markers[type],
-                        id: pathId
-                    }));
-                    markerCounter[pathId] = 1;
-                } else {
-                    markerCounter[pathId]++;
-                }
-                var marker = R._g.doc.getElementById(markerId),
-                    use;
-                if (!marker) {
-                    marker = $($("marker"), {
-                        id: markerId,
-                        markerHeight: h,
-                        markerWidth: w,
-                        orient: "auto",
-                        refX: refX,
-                        refY: h / 2
-                    });
-                    use = $($("use"), {
-                        "xlink:href": "#" + pathId,
-                        transform: (isEnd ? "rotate(180 " + w / 2 + " " + h / 2 + ") " : E) + "scale(" + w / t + "," + h / t + ")",
-                        "stroke-width": (1 / ((w / t + h / t) / 2)).toFixed(4)
-                    });
-                    marker.appendChild(use);
-                    p.defs.appendChild(marker);
-                    markerCounter[markerId] = 1;
-                } else {
-                    markerCounter[markerId]++;
-                    use = marker.getElementsByTagName("use")[0];
-                }
-                $(use, attr);
-                var delta = dx * (type != "diamond" && type != "oval");
-                if (isEnd) {
-                    from = o._.arrows.startdx * stroke || 0;
-                    to = R.getTotalLength(attrs.path) - delta * stroke;
-                } else {
-                    from = delta * stroke;
-                    to = R.getTotalLength(attrs.path) - (o._.arrows.enddx * stroke || 0);
-                }
-                attr = {};
-                attr["marker-" + se] = "url(#" + markerId + ")";
-                if (to || from) {
-                    attr.d = Raphael.getSubpath(attrs.path, from, to);
-                }
-                $(node, attr);
-                o._.arrows[se + "Path"] = pathId;
-                o._.arrows[se + "Marker"] = markerId;
-                o._.arrows[se + "dx"] = delta;
-                o._.arrows[se + "Type"] = type;
-                o._.arrows[se + "String"] = value;
-            } else {
-                if (isEnd) {
-                    from = o._.arrows.startdx * stroke || 0;
-                    to = R.getTotalLength(attrs.path) - from;
-                } else {
-                    from = 0;
-                    to = R.getTotalLength(attrs.path) - (o._.arrows.enddx * stroke || 0);
-                }
-                o._.arrows[se + "Path"] && $(node, {d: Raphael.getSubpath(attrs.path, from, to)});
-                delete o._.arrows[se + "Path"];
-                delete o._.arrows[se + "Marker"];
-                delete o._.arrows[se + "dx"];
-                delete o._.arrows[se + "Type"];
-                delete o._.arrows[se + "String"];
-            }
-            for (attr in markerCounter) if (markerCounter[has](attr) && !markerCounter[attr]) {
-                var item = R._g.doc.getElementById(attr);
-                item && item.parentNode.removeChild(item);
-            }
-        }
-    },
-    dasharray = {
-        "": [0],
-        "none": [0],
-        "-": [3, 1],
-        ".": [1, 1],
-        "-.": [3, 1, 1, 1],
-        "-..": [3, 1, 1, 1, 1, 1],
-        ". ": [1, 3],
-        "- ": [4, 3],
-        "--": [8, 3],
-        "- .": [4, 3, 1, 3],
-        "--.": [8, 3, 1, 3],
-        "--..": [8, 3, 1, 3, 1, 3]
-    },
-    addDashes = function (o, value, params) {
-        value = dasharray[Str(value).toLowerCase()];
-        if (value) {
-            var width = o.attrs["stroke-width"] || "1",
-                butt = {round: width, square: width, butt: 0}[o.attrs["stroke-linecap"] || params["stroke-linecap"]] || 0,
-                dashes = [],
-                i = value.length;
-            while (i--) {
-                dashes[i] = value[i] * width + ((i % 2) ? 1 : -1) * butt;
-            }
-            $(o.node, {"stroke-dasharray": dashes.join(",")});
-        }
-    },
-    setFillAndStroke = function (o, params) {
-        var node = o.node,
-            attrs = o.attrs,
-            vis = node.style.visibility;
-        node.style.visibility = "hidden";
-        for (var att in params) {
-            if (params[has](att)) {
-                if (!R._availableAttrs[has](att)) {
-                    continue;
-                }
-                var value = params[att];
-                attrs[att] = value;
-                switch (att) {
-                    case "blur":
-                        o.blur(value);
-                        break;
-                    case "href":
-                    case "title":
-                    case "target":
-                        var pn = node.parentNode;
-                        if (pn.tagName.toLowerCase() != "a") {
-                            var hl = $("a");
-                            pn.insertBefore(hl, node);
-                            hl.appendChild(node);
-                            pn = hl;
-                        }
-                        if (att == "target") {
-                            pn.setAttributeNS(xlink, "show", value == "blank" ? "new" : value);
-                        } else {
-                            pn.setAttributeNS(xlink, att, value);
-                        }
-                        break;
-                    case "cursor":
-                        node.style.cursor = value;
-                        break;
-                    case "transform":
-                        o.transform(value);
-                        break;
-                    case "arrow-start":
-                        addArrow(o, value);
-                        break;
-                    case "arrow-end":
-                        addArrow(o, value, 1);
-                        break;
-                    case "clip-rect":
-                        var rect = Str(value).split(separator);
-                        if (rect.length == 4) {
-                            o.clip && o.clip.parentNode.parentNode.removeChild(o.clip.parentNode);
-                            var el = $("clipPath"),
-                                rc = $("rect");
-                            el.id = R.createUUID();
-                            $(rc, {
-                                x: rect[0],
-                                y: rect[1],
-                                width: rect[2],
-                                height: rect[3]
-                            });
-                            el.appendChild(rc);
-                            o.paper.defs.appendChild(el);
-                            $(node, {"clip-path": "url(#" + el.id + ")"});
-                            o.clip = rc;
-                        }
-                        if (!value) {
-                            var path = node.getAttribute("clip-path");
-                            if (path) {
-                                var clip = R._g.doc.getElementById(path.replace(/(^url\(#|\)$)/g, E));
-                                clip && clip.parentNode.removeChild(clip);
-                                $(node, {"clip-path": E});
-                                delete o.clip;
-                            }
-                        }
-                    break;
-                    case "path":
-                        if (o.type == "path") {
-                            $(node, {d: value ? attrs.path = R._pathToAbsolute(value) : "M0,0"});
-                            o._.dirty = 1;
-                            if (o._.arrows) {
-                                "startString" in o._.arrows && addArrow(o, o._.arrows.startString);
-                                "endString" in o._.arrows && addArrow(o, o._.arrows.endString, 1);
-                            }
-                        }
-                        break;
-                    case "width":
-                        node.setAttribute(att, value);
-                        o._.dirty = 1;
-                        if (attrs.fx) {
-                            att = "x";
-                            value = attrs.x;
-                        } else {
-                            break;
-                        }
-                    case "x":
-                        if (attrs.fx) {
-                            value = -attrs.x - (attrs.width || 0);
-                        }
-                    case "rx":
-                        if (att == "rx" && o.type == "rect") {
-                            break;
-                        }
-                    case "cx":
-                        node.setAttribute(att, value);
-                        o.pattern && updatePosition(o);
-                        o._.dirty = 1;
-                        break;
-                    case "height":
-                        node.setAttribute(att, value);
-                        o._.dirty = 1;
-                        if (attrs.fy) {
-                            att = "y";
-                            value = attrs.y;
-                        } else {
-                            break;
-                        }
-                    case "y":
-                        if (attrs.fy) {
-                            value = -attrs.y - (attrs.height || 0);
-                        }
-                    case "ry":
-                        if (att == "ry" && o.type == "rect") {
-                            break;
-                        }
-                    case "cy":
-                        node.setAttribute(att, value);
-                        o.pattern && updatePosition(o);
-                        o._.dirty = 1;
-                        break;
-                    case "r":
-                        if (o.type == "rect") {
-                            $(node, {rx: value, ry: value});
-                        } else {
-                            node.setAttribute(att, value);
-                        }
-                        o._.dirty = 1;
-                        break;
-                    case "src":
-                        if (o.type == "image") {
-                            node.setAttributeNS(xlink, "href", value);
-                        }
-                        break;
-                    case "stroke-width":
-                        if (o._.sx != 1 || o._.sy != 1) {
-                            value /= mmax(abs(o._.sx), abs(o._.sy)) || 1;
-                        }
-                        if (o.paper._vbSize) {
-                            value *= o.paper._vbSize;
-                        }
-                        node.setAttribute(att, value);
-                        if (attrs["stroke-dasharray"]) {
-                            addDashes(o, attrs["stroke-dasharray"], params);
-                        }
-                        if (o._.arrows) {
-                            "startString" in o._.arrows && addArrow(o, o._.arrows.startString);
-                            "endString" in o._.arrows && addArrow(o, o._.arrows.endString, 1);
-                        }
-                        break;
-                    case "stroke-dasharray":
-                        addDashes(o, value, params);
-                        break;
-                    case "fill":
-                        var isURL = Str(value).match(R._ISURL);
-                        if (isURL) {
-                            el = $("pattern");
-                            var ig = $("image");
-                            el.id = R.createUUID();
-                            $(el, {x: 0, y: 0, patternUnits: "userSpaceOnUse", height: 1, width: 1});
-                            $(ig, {x: 0, y: 0, "xlink:href": isURL[1]});
-                            el.appendChild(ig);
-
-                            (function (el) {
-                                R._preload(isURL[1], function () {
-                                    var w = this.offsetWidth,
-                                        h = this.offsetHeight;
-                                    $(el, {width: w, height: h});
-                                    $(ig, {width: w, height: h});
-                                    o.paper.safari();
-                                });
-                            })(el);
-                            o.paper.defs.appendChild(el);
-                            $(node, {fill: "url(#" + el.id + ")"});
-                            o.pattern = el;
-                            o.pattern && updatePosition(o);
-                            break;
-                        }
-                        var clr = R.getRGB(value);
-                        if (!clr.error) {
-                            delete params.gradient;
-                            delete attrs.gradient;
-                            !R.is(attrs.opacity, "undefined") &&
-                                R.is(params.opacity, "undefined") &&
-                                $(node, {opacity: attrs.opacity});
-                            !R.is(attrs["fill-opacity"], "undefined") &&
-                                R.is(params["fill-opacity"], "undefined") &&
-                                $(node, {"fill-opacity": attrs["fill-opacity"]});
-                        } else if ((o.type == "circle" || o.type == "ellipse" || Str(value).charAt() != "r") && addGradientFill(o, value)) {
-                            if ("opacity" in attrs || "fill-opacity" in attrs) {
-                                var gradient = R._g.doc.getElementById(node.getAttribute("fill").replace(/^url\(#|\)$/g, E));
-                                if (gradient) {
-                                    var stops = gradient.getElementsByTagName("stop");
-                                    $(stops[stops.length - 1], {"stop-opacity": ("opacity" in attrs ? attrs.opacity : 1) * ("fill-opacity" in attrs ? attrs["fill-opacity"] : 1)});
-                                }
-                            }
-                            attrs.gradient = value;
-                            attrs.fill = "none";
-                            break;
-                        }
-                        clr[has]("opacity") && $(node, {"fill-opacity": clr.opacity > 1 ? clr.opacity / 100 : clr.opacity});
-                    case "stroke":
-                        clr = R.getRGB(value);
-                        node.setAttribute(att, clr.hex);
-                        att == "stroke" && clr[has]("opacity") && $(node, {"stroke-opacity": clr.opacity > 1 ? clr.opacity / 100 : clr.opacity});
-                        if (att == "stroke" && o._.arrows) {
-                            "startString" in o._.arrows && addArrow(o, o._.arrows.startString);
-                            "endString" in o._.arrows && addArrow(o, o._.arrows.endString, 1);
-                        }
-                        break;
-                    case "gradient":
-                        (o.type == "circle" || o.type == "ellipse" || Str(value).charAt() != "r") && addGradientFill(o, value);
-                        break;
-                    case "opacity":
-                        if (attrs.gradient && !attrs[has]("stroke-opacity")) {
-                            $(node, {"stroke-opacity": value > 1 ? value / 100 : value});
-                        }
-                        // fall
-                    case "fill-opacity":
-                        if (attrs.gradient) {
-                            gradient = R._g.doc.getElementById(node.getAttribute("fill").replace(/^url\(#|\)$/g, E));
-                            if (gradient) {
-                                stops = gradient.getElementsByTagName("stop");
-                                $(stops[stops.length - 1], {"stop-opacity": value});
-                            }
-                            break;
-                        }
-                    default:
-                        att == "font-size" && (value = toInt(value, 10) + "px");
-                        var cssrule = att.replace(/(\-.)/g, function (w) {
-                            return w.substring(1).toUpperCase();
-                        });
-                        node.style[cssrule] = value;
-                        o._.dirty = 1;
-                        node.setAttribute(att, value);
-                        break;
-                }
-            }
-        }
-
-        tuneText(o, params);
-        node.style.visibility = vis;
-    },
-    leading = 1.2,
-    tuneText = function (el, params) {
-        if (el.type != "text" || !(params[has]("text") || params[has]("font") || params[has]("font-size") || params[has]("x") || params[has]("y"))) {
-            return;
-        }
-        var a = el.attrs,
-            node = el.node,
-            fontSize = node.firstChild ? toInt(R._g.doc.defaultView.getComputedStyle(node.firstChild, E).getPropertyValue("font-size"), 10) : 10;
-
-        if (params[has]("text")) {
-            a.text = params.text;
-            while (node.firstChild) {
-                node.removeChild(node.firstChild);
-            }
-            var texts = Str(params.text).split("\n"),
-                tspans = [],
-                tspan;
-            for (var i = 0, ii = texts.length; i < ii; i++) {
-                tspan = $("tspan");
-                i && $(tspan, {dy: fontSize * leading, x: a.x});
-                tspan.appendChild(R._g.doc.createTextNode(texts[i]));
-                node.appendChild(tspan);
-                tspans[i] = tspan;
-            }
-        } else {
-            tspans = node.getElementsByTagName("tspan");
-            for (i = 0, ii = tspans.length; i < ii; i++) if (i) {
-                $(tspans[i], {dy: fontSize * leading, x: a.x});
-            } else {
-                $(tspans[0], {dy: 0});
-            }
-        }
-        $(node, {x: a.x, y: a.y});
-        el._.dirty = 1;
-        var bb = el._getBBox(),
-            dif = a.y - (bb.y + bb.height / 2);
-        dif && R.is(dif, "finite") && $(tspans[0], {dy: dif});
-    },
-    Element = function (node, svg) {
-        var X = 0,
-            Y = 0;
-        
-        this[0] = this.node = node;
-        
-        node.raphael = true;
-        
-        this.id = R._oid++;
-        node.raphaelid = this.id;
-        this.matrix = R.matrix();
-        this.realPath = null;
-        
-        this.paper = svg;
-        this.attrs = this.attrs || {};
-        this._ = {
-            transform: [],
-            sx: 1,
-            sy: 1,
-            deg: 0,
-            dx: 0,
-            dy: 0,
-            dirty: 1
-        };
-        !svg.bottom && (svg.bottom = this);
-        
-        this.prev = svg.top;
-        svg.top && (svg.top.next = this);
-        svg.top = this;
-        
-        this.next = null;
-    },
-    elproto = R.el;
-
-    Element.prototype = elproto;
-    elproto.constructor = Element;
-
-    R._engine.path = function (pathString, SVG) {
-        var el = $("path");
-        SVG.canvas && SVG.canvas.appendChild(el);
-        var p = new Element(el, SVG);
-        p.type = "path";
-        setFillAndStroke(p, {
-            fill: "none",
-            stroke: "#000",
-            path: pathString
-        });
-        return p;
-    };
-    
-    elproto.rotate = function (deg, cx, cy) {
-        if (this.removed) {
-            return this;
-        }
-        deg = Str(deg).split(separator);
-        if (deg.length - 1) {
-            cx = toFloat(deg[1]);
-            cy = toFloat(deg[2]);
-        }
-        deg = toFloat(deg[0]);
-        (cy == null) && (cx = cy);
-        if (cx == null || cy == null) {
-            var bbox = this.getBBox(1);
-            cx = bbox.x + bbox.width / 2;
-            cy = bbox.y + bbox.height / 2;
-        }
-        this.transform(this._.transform.concat([["r", deg, cx, cy]]));
-        return this;
-    };
-    
-    elproto.scale = function (sx, sy, cx, cy) {
-        if (this.removed) {
-            return this;
-        }
-        sx = Str(sx).split(separator);
-        if (sx.length - 1) {
-            sy = toFloat(sx[1]);
-            cx = toFloat(sx[2]);
-            cy = toFloat(sx[3]);
-        }
-        sx = toFloat(sx[0]);
-        (sy == null) && (sy = sx);
-        (cy == null) && (cx = cy);
-        if (cx == null || cy == null) {
-            var bbox = this.getBBox(1);
-        }
-        cx = cx == null ? bbox.x + bbox.width / 2 : cx;
-        cy = cy == null ? bbox.y + bbox.height / 2 : cy;
-        this.transform(this._.transform.concat([["s", sx, sy, cx, cy]]));
-        return this;
-    };
-    
-    elproto.translate = function (dx, dy) {
-        if (this.removed) {
-            return this;
-        }
-        dx = Str(dx).split(separator);
-        if (dx.length - 1) {
-            dy = toFloat(dx[1]);
-        }
-        dx = toFloat(dx[0]) || 0;
-        dy = +dy || 0;
-        this.transform(this._.transform.concat([["t", dx, dy]]));
-        return this;
-    };
-    
-    elproto.transform = function (tstr) {
-        var _ = this._;
-        if (tstr == null) {
-            return _.transform;
-        }
-        R._extractTransform(this, tstr);
-
-        this.clip && $(this.clip, {transform: this.matrix.invert()});
-        this.pattern && updatePosition(this);
-        this.node && $(this.node, {transform: this.matrix});
-    
-        if (_.sx != 1 || _.sy != 1) {
-            var sw = this.attrs[has]("stroke-width") ? this.attrs["stroke-width"] : 1;
-            this.attr({"stroke-width": sw});
-        }
-
-        return this;
-    };
-    
-    elproto.hide = function () {
-        !this.removed && this.paper.safari(this.node.style.display = "none");
-        return this;
-    };
-    
-    elproto.show = function () {
-        !this.removed && this.paper.safari(this.node.style.display = "");
-        return this;
-    };
-    
-    elproto.remove = function () {
-        if (this.removed || !this.node.parentNode) {
-            return;
-        }
-        var paper = this.paper;
-        paper.__set__ && paper.__set__.exclude(this);
-        eve.unbind("raphael.*.*." + this.id);
-        if (this.gradient) {
-            paper.defs.removeChild(this.gradient);
-        }
-        R._tear(this, paper);
-        if (this.node.parentNode.tagName.toLowerCase() == "a") {
-            this.node.parentNode.parentNode.removeChild(this.node.parentNode);
-        } else {
-            this.node.parentNode.removeChild(this.node);
-        }
-        for (var i in this) {
-            this[i] = typeof this[i] == "function" ? R._removedFactory(i) : null;
-        }
-        this.removed = true;
-    };
-    elproto._getBBox = function () {
-        if (this.node.style.display == "none") {
-            this.show();
-            var hide = true;
-        }
-        var bbox = {};
-        try {
-            bbox = this.node.getBBox();
-        } catch(e) {
-            // Firefox 3.0.x plays badly here
-        } finally {
-            bbox = bbox || {};
-        }
-        hide && this.hide();
-        return bbox;
-    };
-    
-    elproto.attr = function (name, value) {
-        if (this.removed) {
-            return this;
-        }
-        if (name == null) {
-            var res = {};
-            for (var a in this.attrs) if (this.attrs[has](a)) {
-                res[a] = this.attrs[a];
-            }
-            res.gradient && res.fill == "none" && (res.fill = res.gradient) && delete res.gradient;
-            res.transform = this._.transform;
-            return res;
-        }
-        if (value == null && R.is(name, "string")) {
-            if (name == "fill" && this.attrs.fill == "none" && this.attrs.gradient) {
-                return this.attrs.gradient;
-            }
-            if (name == "transform") {
-                return this._.transform;
-            }
-            var names = name.split(separator),
-                out = {};
-            for (var i = 0, ii = names.length; i < ii; i++) {
-                name = names[i];
-                if (name in this.attrs) {
-                    out[name] = this.attrs[name];
-                } else if (R.is(this.paper.customAttributes[name], "function")) {
-                    out[name] = this.paper.customAttributes[name].def;
-                } else {
-                    out[name] = R._availableAttrs[name];
-                }
-            }
-            return ii - 1 ? out : out[names[0]];
-        }
-        if (value == null && R.is(name, "array")) {
-            out = {};
-            for (i = 0, ii = name.length; i < ii; i++) {
-                out[name[i]] = this.attr(name[i]);
-            }
-            return out;
-        }
-        if (value != null) {
-            var params = {};
-            params[name] = value;
-        } else if (name != null && R.is(name, "object")) {
-            params = name;
-        }
-        for (var key in params) {
-            eve("raphael.attr." + key + "." + this.id, this, params[key]);
-        }
-        for (key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) {
-            var par = this.paper.customAttributes[key].apply(this, [].concat(params[key]));
-            this.attrs[key] = params[key];
-            for (var subkey in par) if (par[has](subkey)) {
-                params[subkey] = par[subkey];
-            }
-        }
-        setFillAndStroke(this, params);
-        return this;
-    };
-    
-    elproto.toFront = function () {
-        if (this.removed) {
-            return this;
-        }
-        if (this.node.parentNode.tagName.toLowerCase() == "a") {
-            this.node.parentNode.parentNode.appendChild(this.node.parentNode);
-        } else {
-            this.node.parentNode.appendChild(this.node);
-        }
-        var svg = this.paper;
-        svg.top != this && R._tofront(this, svg);
-        return this;
-    };
-    
-    elproto.toBack = function () {
-        if (this.removed) {
-            return this;
-        }
-        var parent = this.node.parentNode;
-        if (parent.tagName.toLowerCase() == "a") {
-            parent.parentNode.insertBefore(this.node.parentNode, this.node.parentNode.parentNode.firstChild); 
-        } else if (parent.firstChild != this.node) {
-            parent.insertBefore(this.node, this.node.parentNode.firstChild);
-        }
-        R._toback(this, this.paper);
-        var svg = this.paper;
-        return this;
-    };
-    
-    elproto.insertAfter = function (element) {
-        if (this.removed) {
-            return this;
-        }
-        var node = element.node || element[element.length - 1].node;
-        if (node.nextSibling) {
-            node.parentNode.insertBefore(this.node, node.nextSibling);
-        } else {
-            node.parentNode.appendChild(this.node);
-        }
-        R._insertafter(this, element, this.paper);
-        return this;
-    };
-    
-    elproto.insertBefore = function (element) {
-        if (this.removed) {
-            return this;
-        }
-        var node = element.node || element[0].node;
-        node.parentNode.insertBefore(this.node, node);
-        R._insertbefore(this, element, this.paper);
-        return this;
-    };
-    elproto.blur = function (size) {
-        // Experimental. No Safari support. Use it on your own risk.
-        var t = this;
-        if (+size !== 0) {
-            var fltr = $("filter"),
-                blur = $("feGaussianBlur");
-            t.attrs.blur = size;
-            fltr.id = R.createUUID();
-            $(blur, {stdDeviation: +size || 1.5});
-            fltr.appendChild(blur);
-            t.paper.defs.appendChild(fltr);
-            t._blur = fltr;
-            $(t.node, {filter: "url(#" + fltr.id + ")"});
-        } else {
-            if (t._blur) {
-                t._blur.parentNode.removeChild(t._blur);
-                delete t._blur;
-                delete t.attrs.blur;
-            }
-            t.node.removeAttribute("filter");
-        }
-    };
-    R._engine.circle = function (svg, x, y, r) {
-        var el = $("circle");
-        svg.canvas && svg.canvas.appendChild(el);
-        var res = new Element(el, svg);
-        res.attrs = {cx: x, cy: y, r: r, fill: "none", stroke: "#000"};
-        res.type = "circle";
-        $(el, res.attrs);
-        return res;
-    };
-    R._engine.rect = function (svg, x, y, w, h, r) {
-        var el = $("rect");
-        svg.canvas && svg.canvas.appendChild(el);
-        var res = new Element(el, svg);
-        res.attrs = {x: x, y: y, width: w, height: h, r: r || 0, rx: r || 0, ry: r || 0, fill: "none", stroke: "#000"};
-        res.type = "rect";
-        $(el, res.attrs);
-        return res;
-    };
-    R._engine.ellipse = function (svg, x, y, rx, ry) {
-        var el = $("ellipse");
-        svg.canvas && svg.canvas.appendChild(el);
-        var res = new Element(el, svg);
-        res.attrs = {cx: x, cy: y, rx: rx, ry: ry, fill: "none", stroke: "#000"};
-        res.type = "ellipse";
-        $(el, res.attrs);
-        return res;
-    };
-    R._engine.image = function (svg, src, x, y, w, h) {
-        var el = $("image");
-        $(el, {x: x, y: y, width: w, height: h, preserveAspectRatio: "none"});
-        el.setAttributeNS(xlink, "href", src);
-        svg.canvas && svg.canvas.appendChild(el);
-        var res = new Element(el, svg);
-        res.attrs = {x: x, y: y, width: w, height: h, src: src};
-        res.type = "image";
-        return res;
-    };
-    R._engine.text = function (svg, x, y, text) {
-        var el = $("text");
-        svg.canvas && svg.canvas.appendChild(el);
-        var res = new Element(el, svg);
-        res.attrs = {
-            x: x,
-            y: y,
-            "text-anchor": "middle",
-            text: text,
-            font: R._availableAttrs.font,
-            stroke: "none",
-            fill: "#000"
-        };
-        res.type = "text";
-        setFillAndStroke(res, res.attrs);
-        return res;
-    };
-    R._engine.setSize = function (width, height) {
-        this.width = width || this.width;
-        this.height = height || this.height;
-        this.canvas.setAttribute("width", this.width);
-        this.canvas.setAttribute("height", this.height);
-        if (this._viewBox) {
-            this.setViewBox.apply(this, this._viewBox);
-        }
-        return this;
-    };
-    R._engine.create = function () {
-        var con = R._getContainer.apply(0, arguments),
-            container = con && con.container,
-            x = con.x,
-            y = con.y,
-            width = con.width,
-            height = con.height;
-        if (!container) {
-            throw new Error("SVG container not found.");
-        }
-        var cnvs = $("svg"),
-            css = "overflow:hidden;",
-            isFloating;
-        x = x || 0;
-        y = y || 0;
-        width = width || 512;
-        height = height || 342;
-        $(cnvs, {
-            height: height,
-            version: 1.1,
-            width: width,
-            xmlns: "http://www.w3.org/2000/svg"
-        });
-        if (container == 1) {
-            cnvs.style.cssText = css + "position:absolute;left:" + x + "px;top:" + y + "px";
-            R._g.doc.body.appendChild(cnvs);
-            isFloating = 1;
-        } else {
-            cnvs.style.cssText = css + "position:relative";
-            if (container.firstChild) {
-                container.insertBefore(cnvs, container.firstChild);
-            } else {
-                container.appendChild(cnvs);
-            }
-        }
-        container = new R._Paper;
-        container.width = width;
-        container.height = height;
-        container.canvas = cnvs;
-        container.clear();
-        container._left = container._top = 0;
-        isFloating && (container.renderfix = function () {});
-        container.renderfix();
-        return container;
-    };
-    R._engine.setViewBox = function (x, y, w, h, fit) {
-        eve("raphael.setViewBox", this, this._viewBox, [x, y, w, h, fit]);
-        var size = mmax(w / this.width, h / this.height),
-            top = this.top,
-            aspectRatio = fit ? "meet" : "xMinYMin",
-            vb,
-            sw;
-        if (x == null) {
-            if (this._vbSize) {
-                size = 1;
-            }
-            delete this._vbSize;
-            vb = "0 0 " + this.width + S + this.height;
-        } else {
-            this._vbSize = size;
-            vb = x + S + y + S + w + S + h;
-        }
-        $(this.canvas, {
-            viewBox: vb,
-            preserveAspectRatio: aspectRatio
-        });
-        while (size && top) {
-            sw = "stroke-width" in top.attrs ? top.attrs["stroke-width"] : 1;
-            top.attr({"stroke-width": sw});
-            top._.dirty = 1;
-            top._.dirtyT = 1;
-            top = top.prev;
-        }
-        this._viewBox = [x, y, w, h, !!fit];
-        return this;
-    };
-    
-    R.prototype.renderfix = function () {
-        var cnvs = this.canvas,
-            s = cnvs.style,
-            pos;
-        try {
-            pos = cnvs.getScreenCTM() || cnvs.createSVGMatrix();
-        } catch (e) {
-            pos = cnvs.createSVGMatrix();
-        }
-        var left = -pos.e % 1,
-            top = -pos.f % 1;
-        if (left || top) {
-            if (left) {
-                this._left = (this._left + left) % 1;
-                s.left = this._left + "px";
-            }
-            if (top) {
-                this._top = (this._top + top) % 1;
-                s.top = this._top + "px";
-            }
-        }
-    };
-    
-    R.prototype.clear = function () {
-        R.eve("raphael.clear", this);
-        var c = this.canvas;
-        while (c.firstChild) {
-            c.removeChild(c.firstChild);
-        }
-        this.bottom = this.top = null;
-        (this.desc = $("desc")).appendChild(R._g.doc.createTextNode("Created with Rapha\xebl " + R.version));
-        c.appendChild(this.desc);
-        c.appendChild(this.defs = $("defs"));
-    };
-    
-    R.prototype.remove = function () {
-        eve("raphael.remove", this);
-        this.canvas.parentNode && this.canvas.parentNode.removeChild(this.canvas);
-        for (var i in this) {
-            this[i] = typeof this[i] == "function" ? R._removedFactory(i) : null;
-        }
-    };
-    var setproto = R.st;
-    for (var method in elproto) if (elproto[has](method) && !setproto[has](method)) {
-        setproto[method] = (function (methodname) {
-            return function () {
-                var arg = arguments;
-                return this.forEach(function (el) {
-                    el[methodname].apply(el, arg);
-                });
-            };
-        })(method);
-    }
+	var has = "hasOwnProperty",
+		Str = String,
+		toFloat = parseFloat,
+		toInt = parseInt,
+		math = Math,
+		mmax = math.max,
+		abs = math.abs,
+		pow = math.pow,
+		separator = /[, ]+/,
+		eve = R.eve,
+		E = "",
+		S = " ";
+	var xlink = "http://www.w3.org/1999/xlink",
+		markers = {
+			block: "M5,0 0,2.5 5,5z",
+			classic: "M5,0 0,2.5 5,5 3.5,3 3.5,2z",
+			diamond: "M2.5,0 5,2.5 2.5,5 0,2.5z",
+			open: "M6,1 1,3.5 6,6",
+			oval: "M2.5,0A2.5,2.5,0,0,1,2.5,5 2.5,2.5,0,0,1,2.5,0z"
+		},
+		markerCounter = {};
+	R.toString = function () {
+		return "Your browser supports SVG.\nYou are running Rapha\xebl " + this.version;
+	};
+	var $ = function (el, attr) {
+			if (attr) {
+				if (typeof el == "string") {
+					el = $(el);
+				}
+				for (var key in attr) if (attr[has](key)) {
+					if (key.substring(0, 6) == "xlink:") {
+						el.setAttributeNS(xlink, key.substring(6), Str(attr[key]));
+					} else {
+						el.setAttribute(key, Str(attr[key]));
+					}
+				}
+			} else {
+				el = R._g.doc.createElementNS("http://www.w3.org/2000/svg", el);
+				el.style && (el.style.webkitTapHighlightColor = "rgba(0,0,0,0)");
+			}
+			return el;
+		},
+		addGradientFill = function (element, gradient) {
+			var type = "linear",
+				id = element.id + gradient,
+				fx = .5, fy = .5,
+				o = element.node,
+				SVG = element.paper,
+				s = o.style,
+				el = R._g.doc.getElementById(id);
+			if (!el) {
+				gradient = Str(gradient).replace(R._radial_gradient, function (all, _fx, _fy) {
+					type = "radial";
+					if (_fx && _fy) {
+						fx = toFloat(_fx);
+						fy = toFloat(_fy);
+						var dir = ((fy > .5) * 2 - 1);
+						pow(fx - .5, 2) + pow(fy - .5, 2) > .25 &&
+						(fy = math.sqrt(.25 - pow(fx - .5, 2)) * dir + .5) &&
+						fy != .5 &&
+						(fy = fy.toFixed(5) - 1e-5 * dir);
+					}
+					return E;
+				});
+				gradient = gradient.split(/\s*\-\s*/);
+				if (type == "linear") {
+					var angle = gradient.shift();
+					angle = -toFloat(angle);
+					if (isNaN(angle)) {
+						return null;
+					}
+					var vector = [0, 0, math.cos(R.rad(angle)), math.sin(R.rad(angle))],
+						max = 1 / (mmax(abs(vector[2]), abs(vector[3])) || 1);
+					vector[2] *= max;
+					vector[3] *= max;
+					if (vector[2] < 0) {
+						vector[0] = -vector[2];
+						vector[2] = 0;
+					}
+					if (vector[3] < 0) {
+						vector[1] = -vector[3];
+						vector[3] = 0;
+					}
+				}
+				var dots = R._parseDots(gradient);
+				if (!dots) {
+					return null;
+				}
+				id = id.replace(/[\(\)\s,\xb0#]/g, "_");
+
+				if (element.gradient && id != element.gradient.id) {
+					SVG.defs.removeChild(element.gradient);
+					delete element.gradient;
+				}
+
+				if (!element.gradient) {
+					el = $(type + "Gradient", {id: id});
+					element.gradient = el;
+					$(el, type == "radial" ? {
+						fx: fx,
+						fy: fy
+					} : {
+						x1: vector[0],
+						y1: vector[1],
+						x2: vector[2],
+						y2: vector[3],
+						gradientTransform: element.matrix.invert()
+					});
+					SVG.defs.appendChild(el);
+					for (var i = 0, ii = dots.length; i < ii; i++) {
+						el.appendChild($("stop", {
+							offset: dots[i].offset ? dots[i].offset : i ? "100%" : "0%",
+							"stop-color": dots[i].color || "#fff"
+						}));
+					}
+				}
+			}
+			$(o, {
+				fill: "url(#" + id + ")",
+				opacity: 1,
+				"fill-opacity": 1
+			});
+			s.fill = E;
+			s.opacity = 1;
+			s.fillOpacity = 1;
+			return 1;
+		},
+		updatePosition = function (o) {
+			var bbox = o.getBBox(1);
+			$(o.pattern, {patternTransform: o.matrix.invert() + " translate(" + bbox.x + "," + bbox.y + ")"});
+		},
+		addArrow = function (o, value, isEnd) {
+			if (o.type == "path") {
+				var values = Str(value).toLowerCase().split("-"),
+					p = o.paper,
+					se = isEnd ? "end" : "start",
+					node = o.node,
+					attrs = o.attrs,
+					stroke = attrs["stroke-width"],
+					i = values.length,
+					type = "classic",
+					from,
+					to,
+					dx,
+					refX,
+					attr,
+					w = 3,
+					h = 3,
+					t = 5;
+				while (i--) {
+					switch (values[i]) {
+						case "block":
+						case "classic":
+						case "oval":
+						case "diamond":
+						case "open":
+						case "none":
+							type = values[i];
+							break;
+						case "wide":
+							h = 5;
+							break;
+						case "narrow":
+							h = 2;
+							break;
+						case "long":
+							w = 5;
+							break;
+						case "short":
+							w = 2;
+							break;
+					}
+				}
+				if (type == "open") {
+					w += 2;
+					h += 2;
+					t += 2;
+					dx = 1;
+					refX = isEnd ? 4 : 1;
+					attr = {
+						fill: "none",
+						stroke: attrs.stroke
+					};
+				} else {
+					refX = dx = w / 2;
+					attr = {
+						fill: attrs.stroke,
+						stroke: "none"
+					};
+				}
+				if (o._.arrows) {
+					if (isEnd) {
+						o._.arrows.endPath && markerCounter[o._.arrows.endPath]--;
+						o._.arrows.endMarker && markerCounter[o._.arrows.endMarker]--;
+					} else {
+						o._.arrows.startPath && markerCounter[o._.arrows.startPath]--;
+						o._.arrows.startMarker && markerCounter[o._.arrows.startMarker]--;
+					}
+				} else {
+					o._.arrows = {};
+				}
+				if (type != "none") {
+					var pathId = "raphael-marker-" + type,
+						markerId = "raphael-marker-" + se + type + w + h;
+					if (!R._g.doc.getElementById(pathId)) {
+						p.defs.appendChild($($("path"), {
+							"stroke-linecap": "round",
+							d: markers[type],
+							id: pathId
+						}));
+						markerCounter[pathId] = 1;
+					} else {
+						markerCounter[pathId]++;
+					}
+					var marker = R._g.doc.getElementById(markerId),
+						use;
+					if (!marker) {
+						marker = $($("marker"), {
+							id: markerId,
+							markerHeight: h,
+							markerWidth: w,
+							orient: "auto",
+							refX: refX,
+							refY: h / 2
+						});
+						use = $($("use"), {
+							"xlink:href": "#" + pathId,
+							transform: (isEnd ? "rotate(180 " + w / 2 + " " + h / 2 + ") " : E) + "scale(" + w / t + "," + h / t + ")",
+							"stroke-width": (1 / ((w / t + h / t) / 2)).toFixed(4)
+						});
+						marker.appendChild(use);
+						p.defs.appendChild(marker);
+						markerCounter[markerId] = 1;
+					} else {
+						markerCounter[markerId]++;
+						use = marker.getElementsByTagName("use")[0];
+					}
+					$(use, attr);
+					var delta = dx * (type != "diamond" && type != "oval");
+					if (isEnd) {
+						from = o._.arrows.startdx * stroke || 0;
+						to = R.getTotalLength(attrs.path) - delta * stroke;
+					} else {
+						from = delta * stroke;
+						to = R.getTotalLength(attrs.path) - (o._.arrows.enddx * stroke || 0);
+					}
+					attr = {};
+					attr["marker-" + se] = "url(#" + markerId + ")";
+					if (to || from) {
+						attr.d = Raphael.getSubpath(attrs.path, from, to);
+					}
+					$(node, attr);
+					o._.arrows[se + "Path"] = pathId;
+					o._.arrows[se + "Marker"] = markerId;
+					o._.arrows[se + "dx"] = delta;
+					o._.arrows[se + "Type"] = type;
+					o._.arrows[se + "String"] = value;
+				} else {
+					if (isEnd) {
+						from = o._.arrows.startdx * stroke || 0;
+						to = R.getTotalLength(attrs.path) - from;
+					} else {
+						from = 0;
+						to = R.getTotalLength(attrs.path) - (o._.arrows.enddx * stroke || 0);
+					}
+					o._.arrows[se + "Path"] && $(node, {d: Raphael.getSubpath(attrs.path, from, to)});
+					delete o._.arrows[se + "Path"];
+					delete o._.arrows[se + "Marker"];
+					delete o._.arrows[se + "dx"];
+					delete o._.arrows[se + "Type"];
+					delete o._.arrows[se + "String"];
+				}
+				for (attr in markerCounter) if (markerCounter[has](attr) && !markerCounter[attr]) {
+					var item = R._g.doc.getElementById(attr);
+					item && item.parentNode.removeChild(item);
+				}
+			}
+		},
+		dasharray = {
+			"": [0],
+			"none": [0],
+			"-": [3, 1],
+			".": [1, 1],
+			"-.": [3, 1, 1, 1],
+			"-..": [3, 1, 1, 1, 1, 1],
+			". ": [1, 3],
+			"- ": [4, 3],
+			"--": [8, 3],
+			"- .": [4, 3, 1, 3],
+			"--.": [8, 3, 1, 3],
+			"--..": [8, 3, 1, 3, 1, 3]
+		},
+		addDashes = function (o, value, params) {
+			value = dasharray[Str(value).toLowerCase()];
+			if (value) {
+				var width = o.attrs["stroke-width"] || "1",
+					butt = {
+						round: width,
+						square: width,
+						butt: 0
+					}[o.attrs["stroke-linecap"] || params["stroke-linecap"]] || 0,
+					dashes = [],
+					i = value.length;
+				while (i--) {
+					dashes[i] = value[i] * width + ((i % 2) ? 1 : -1) * butt;
+				}
+				$(o.node, {"stroke-dasharray": dashes.join(",")});
+			}
+		},
+		setFillAndStroke = function (o, params) {
+			var node = o.node,
+				attrs = o.attrs,
+				vis = node.style.visibility;
+			node.style.visibility = "hidden";
+			for (var att in params) {
+				if (params[has](att)) {
+					if (!R._availableAttrs[has](att)) {
+						continue;
+					}
+					var value = params[att];
+					attrs[att] = value;
+					switch (att) {
+						case "blur":
+							o.blur(value);
+							break;
+						case "href":
+						case "title":
+						case "target":
+							var pn = node.parentNode;
+							if (pn.tagName.toLowerCase() != "a") {
+								var hl = $("a");
+								pn.insertBefore(hl, node);
+								hl.appendChild(node);
+								pn = hl;
+							}
+							if (att == "target") {
+								pn.setAttributeNS(xlink, "show", value == "blank" ? "new" : value);
+							} else {
+								pn.setAttributeNS(xlink, att, value);
+							}
+							break;
+						case "cursor":
+							node.style.cursor = value;
+							break;
+						case "transform":
+							o.transform(value);
+							break;
+						case "arrow-start":
+							addArrow(o, value);
+							break;
+						case "arrow-end":
+							addArrow(o, value, 1);
+							break;
+						case "clip-rect":
+							var rect = Str(value).split(separator);
+							if (rect.length == 4) {
+								o.clip && o.clip.parentNode.parentNode.removeChild(o.clip.parentNode);
+								var el = $("clipPath"),
+									rc = $("rect");
+								el.id = R.createUUID();
+								$(rc, {
+									x: rect[0],
+									y: rect[1],
+									width: rect[2],
+									height: rect[3]
+								});
+								el.appendChild(rc);
+								o.paper.defs.appendChild(el);
+								$(node, {"clip-path": "url(#" + el.id + ")"});
+								o.clip = rc;
+							}
+							if (!value) {
+								var path = node.getAttribute("clip-path");
+								if (path) {
+									var clip = R._g.doc.getElementById(path.replace(/(^url\(#|\)$)/g, E));
+									clip && clip.parentNode.removeChild(clip);
+									$(node, {"clip-path": E});
+									delete o.clip;
+								}
+							}
+							break;
+						case "path":
+							if (o.type == "path") {
+								$(node, {d: value ? attrs.path = R._pathToAbsolute(value) : "M0,0"});
+								o._.dirty = 1;
+								if (o._.arrows) {
+									"startString" in o._.arrows && addArrow(o, o._.arrows.startString);
+									"endString" in o._.arrows && addArrow(o, o._.arrows.endString, 1);
+								}
+							}
+							break;
+						case "width":
+							node.setAttribute(att, value);
+							o._.dirty = 1;
+							if (attrs.fx) {
+								att = "x";
+								value = attrs.x;
+							} else {
+								break;
+							}
+						case "x":
+							if (attrs.fx) {
+								value = -attrs.x - (attrs.width || 0);
+							}
+						case "rx":
+							if (att == "rx" && o.type == "rect") {
+								break;
+							}
+						case "cx":
+							node.setAttribute(att, value);
+							o.pattern && updatePosition(o);
+							o._.dirty = 1;
+							break;
+						case "height":
+							node.setAttribute(att, value);
+							o._.dirty = 1;
+							if (attrs.fy) {
+								att = "y";
+								value = attrs.y;
+							} else {
+								break;
+							}
+						case "y":
+							if (attrs.fy) {
+								value = -attrs.y - (attrs.height || 0);
+							}
+						case "ry":
+							if (att == "ry" && o.type == "rect") {
+								break;
+							}
+						case "cy":
+							node.setAttribute(att, value);
+							o.pattern && updatePosition(o);
+							o._.dirty = 1;
+							break;
+						case "r":
+							if (o.type == "rect") {
+								$(node, {rx: value, ry: value});
+							} else {
+								node.setAttribute(att, value);
+							}
+							o._.dirty = 1;
+							break;
+						case "src":
+							if (o.type == "image") {
+								node.setAttributeNS(xlink, "href", value);
+							}
+							break;
+						case "stroke-width":
+							if (o._.sx != 1 || o._.sy != 1) {
+								value /= mmax(abs(o._.sx), abs(o._.sy)) || 1;
+							}
+							if (o.paper._vbSize) {
+								value *= o.paper._vbSize;
+							}
+							node.setAttribute(att, value);
+							if (attrs["stroke-dasharray"]) {
+								addDashes(o, attrs["stroke-dasharray"], params);
+							}
+							if (o._.arrows) {
+								"startString" in o._.arrows && addArrow(o, o._.arrows.startString);
+								"endString" in o._.arrows && addArrow(o, o._.arrows.endString, 1);
+							}
+							break;
+						case "stroke-dasharray":
+							addDashes(o, value, params);
+							break;
+						case "fill":
+							var isURL = Str(value).match(R._ISURL);
+							if (isURL) {
+								el = $("pattern");
+								var ig = $("image");
+								el.id = R.createUUID();
+								$(el, {x: 0, y: 0, patternUnits: "userSpaceOnUse", height: 1, width: 1});
+								$(ig, {x: 0, y: 0, "xlink:href": isURL[1]});
+								el.appendChild(ig);
+
+								(function (el) {
+									R._preload(isURL[1], function () {
+										var w = this.offsetWidth,
+											h = this.offsetHeight;
+										$(el, {width: w, height: h});
+										$(ig, {width: w, height: h});
+										o.paper.safari();
+									});
+								})(el);
+								o.paper.defs.appendChild(el);
+								$(node, {fill: "url(#" + el.id + ")"});
+								o.pattern = el;
+								o.pattern && updatePosition(o);
+								break;
+							}
+							var clr = R.getRGB(value);
+							if (!clr.error) {
+								delete params.gradient;
+								delete attrs.gradient;
+								!R.is(attrs.opacity, "undefined") &&
+								R.is(params.opacity, "undefined") &&
+								$(node, {opacity: attrs.opacity});
+								!R.is(attrs["fill-opacity"], "undefined") &&
+								R.is(params["fill-opacity"], "undefined") &&
+								$(node, {"fill-opacity": attrs["fill-opacity"]});
+							} else if ((o.type == "circle" || o.type == "ellipse" || Str(value).charAt() != "r") && addGradientFill(o, value)) {
+								if ("opacity" in attrs || "fill-opacity" in attrs) {
+									var gradient = R._g.doc.getElementById(node.getAttribute("fill").replace(/^url\(#|\)$/g, E));
+									if (gradient) {
+										var stops = gradient.getElementsByTagName("stop");
+										$(stops[stops.length - 1], {"stop-opacity": ("opacity" in attrs ? attrs.opacity : 1) * ("fill-opacity" in attrs ? attrs["fill-opacity"] : 1)});
+									}
+								}
+								attrs.gradient = value;
+								attrs.fill = "none";
+								break;
+							}
+							clr[has]("opacity") && $(node, {"fill-opacity": clr.opacity > 1 ? clr.opacity / 100 : clr.opacity});
+						case "stroke":
+							clr = R.getRGB(value);
+							node.setAttribute(att, clr.hex);
+							att == "stroke" && clr[has]("opacity") && $(node, {"stroke-opacity": clr.opacity > 1 ? clr.opacity / 100 : clr.opacity});
+							if (att == "stroke" && o._.arrows) {
+								"startString" in o._.arrows && addArrow(o, o._.arrows.startString);
+								"endString" in o._.arrows && addArrow(o, o._.arrows.endString, 1);
+							}
+							break;
+						case "gradient":
+							(o.type == "circle" || o.type == "ellipse" || Str(value).charAt() != "r") && addGradientFill(o, value);
+							break;
+						case "opacity":
+							if (attrs.gradient && !attrs[has]("stroke-opacity")) {
+								$(node, {"stroke-opacity": value > 1 ? value / 100 : value});
+							}
+						// fall
+						case "fill-opacity":
+							if (attrs.gradient) {
+								gradient = R._g.doc.getElementById(node.getAttribute("fill").replace(/^url\(#|\)$/g, E));
+								if (gradient) {
+									stops = gradient.getElementsByTagName("stop");
+									$(stops[stops.length - 1], {"stop-opacity": value});
+								}
+								break;
+							}
+						default:
+							att == "font-size" && (value = toInt(value, 10) + "px");
+							var cssrule = att.replace(/(\-.)/g, function (w) {
+								return w.substring(1).toUpperCase();
+							});
+							node.style[cssrule] = value;
+							o._.dirty = 1;
+							node.setAttribute(att, value);
+							break;
+					}
+				}
+			}
+
+			tuneText(o, params);
+			node.style.visibility = vis;
+		},
+		leading = 1.2,
+		tuneText = function (el, params) {
+			if (el.type != "text" || !(params[has]("text") || params[has]("font") || params[has]("font-size") || params[has]("x") || params[has]("y"))) {
+				return;
+			}
+			var a = el.attrs,
+				node = el.node,
+				fontSize = node.firstChild ? toInt(R._g.doc.defaultView.getComputedStyle(node.firstChild, E).getPropertyValue("font-size"), 10) : 10;
+
+			if (params[has]("text")) {
+				a.text = params.text;
+				while (node.firstChild) {
+					node.removeChild(node.firstChild);
+				}
+				var texts = Str(params.text).split("\n"),
+					tspans = [],
+					tspan;
+				for (var i = 0, ii = texts.length; i < ii; i++) {
+					tspan = $("tspan");
+					i && $(tspan, {dy: fontSize * leading, x: a.x});
+					tspan.appendChild(R._g.doc.createTextNode(texts[i]));
+					node.appendChild(tspan);
+					tspans[i] = tspan;
+				}
+			} else {
+				tspans = node.getElementsByTagName("tspan");
+				for (i = 0, ii = tspans.length; i < ii; i++) if (i) {
+					$(tspans[i], {dy: fontSize * leading, x: a.x});
+				} else {
+					$(tspans[0], {dy: 0});
+				}
+			}
+			$(node, {x: a.x, y: a.y});
+			el._.dirty = 1;
+			var bb = el._getBBox(),
+				dif = a.y - (bb.y + bb.height / 2);
+			dif && R.is(dif, "finite") && $(tspans[0], {dy: dif});
+		},
+		Element = function (node, svg) {
+			var X = 0,
+				Y = 0;
+
+			this[0] = this.node = node;
+
+			node.raphael = true;
+
+			this.id = R._oid++;
+			node.raphaelid = this.id;
+			this.matrix = R.matrix();
+			this.realPath = null;
+
+			this.paper = svg;
+			this.attrs = this.attrs || {};
+			this._ = {
+				transform: [],
+				sx: 1,
+				sy: 1,
+				deg: 0,
+				dx: 0,
+				dy: 0,
+				dirty: 1
+			};
+			!svg.bottom && (svg.bottom = this);
+
+			this.prev = svg.top;
+			svg.top && (svg.top.next = this);
+			svg.top = this;
+
+			this.next = null;
+		},
+		elproto = R.el;
+
+	Element.prototype = elproto;
+	elproto.constructor = Element;
+
+	R._engine.path = function (pathString, SVG) {
+		var el = $("path");
+		SVG.canvas && SVG.canvas.appendChild(el);
+		var p = new Element(el, SVG);
+		p.type = "path";
+		setFillAndStroke(p, {
+			fill: "none",
+			stroke: "#000",
+			path: pathString
+		});
+		return p;
+	};
+
+	elproto.rotate = function (deg, cx, cy) {
+		if (this.removed) {
+			return this;
+		}
+		deg = Str(deg).split(separator);
+		if (deg.length - 1) {
+			cx = toFloat(deg[1]);
+			cy = toFloat(deg[2]);
+		}
+		deg = toFloat(deg[0]);
+		(cy == null) && (cx = cy);
+		if (cx == null || cy == null) {
+			var bbox = this.getBBox(1);
+			cx = bbox.x + bbox.width / 2;
+			cy = bbox.y + bbox.height / 2;
+		}
+		this.transform(this._.transform.concat([["r", deg, cx, cy]]));
+		return this;
+	};
+
+	elproto.scale = function (sx, sy, cx, cy) {
+		if (this.removed) {
+			return this;
+		}
+		sx = Str(sx).split(separator);
+		if (sx.length - 1) {
+			sy = toFloat(sx[1]);
+			cx = toFloat(sx[2]);
+			cy = toFloat(sx[3]);
+		}
+		sx = toFloat(sx[0]);
+		(sy == null) && (sy = sx);
+		(cy == null) && (cx = cy);
+		if (cx == null || cy == null) {
+			var bbox = this.getBBox(1);
+		}
+		cx = cx == null ? bbox.x + bbox.width / 2 : cx;
+		cy = cy == null ? bbox.y + bbox.height / 2 : cy;
+		this.transform(this._.transform.concat([["s", sx, sy, cx, cy]]));
+		return this;
+	};
+
+	elproto.translate = function (dx, dy) {
+		if (this.removed) {
+			return this;
+		}
+		dx = Str(dx).split(separator);
+		if (dx.length - 1) {
+			dy = toFloat(dx[1]);
+		}
+		dx = toFloat(dx[0]) || 0;
+		dy = +dy || 0;
+		this.transform(this._.transform.concat([["t", dx, dy]]));
+		return this;
+	};
+
+	elproto.transform = function (tstr) {
+		var _ = this._;
+		if (tstr == null) {
+			return _.transform;
+		}
+		R._extractTransform(this, tstr);
+
+		this.clip && $(this.clip, {transform: this.matrix.invert()});
+		this.pattern && updatePosition(this);
+		this.node && $(this.node, {transform: this.matrix});
+
+		if (_.sx != 1 || _.sy != 1) {
+			var sw = this.attrs[has]("stroke-width") ? this.attrs["stroke-width"] : 1;
+			this.attr({"stroke-width": sw});
+		}
+
+		return this;
+	};
+
+	elproto.hide = function () {
+		!this.removed && this.paper.safari(this.node.style.display = "none");
+		return this;
+	};
+
+	elproto.show = function () {
+		!this.removed && this.paper.safari(this.node.style.display = "");
+		return this;
+	};
+
+	elproto.remove = function () {
+		if (this.removed || !this.node.parentNode) {
+			return;
+		}
+		var paper = this.paper;
+		paper.__set__ && paper.__set__.exclude(this);
+		eve.unbind("raphael.*.*." + this.id);
+		if (this.gradient) {
+			paper.defs.removeChild(this.gradient);
+		}
+		R._tear(this, paper);
+		if (this.node.parentNode.tagName.toLowerCase() == "a") {
+			this.node.parentNode.parentNode.removeChild(this.node.parentNode);
+		} else {
+			this.node.parentNode.removeChild(this.node);
+		}
+		for (var i in this) {
+			this[i] = typeof this[i] == "function" ? R._removedFactory(i) : null;
+		}
+		this.removed = true;
+	};
+	elproto._getBBox = function () {
+		if (this.node.style.display == "none") {
+			this.show();
+			var hide = true;
+		}
+		var bbox = {};
+		try {
+			bbox = this.node.getBBox();
+		} catch (e) {
+			// Firefox 3.0.x plays badly here
+		} finally {
+			bbox = bbox || {};
+		}
+		hide && this.hide();
+		return bbox;
+	};
+
+	elproto.attr = function (name, value) {
+		if (this.removed) {
+			return this;
+		}
+		if (name == null) {
+			var res = {};
+			for (var a in this.attrs) if (this.attrs[has](a)) {
+				res[a] = this.attrs[a];
+			}
+			res.gradient && res.fill == "none" && (res.fill = res.gradient) && delete res.gradient;
+			res.transform = this._.transform;
+			return res;
+		}
+		if (value == null && R.is(name, "string")) {
+			if (name == "fill" && this.attrs.fill == "none" && this.attrs.gradient) {
+				return this.attrs.gradient;
+			}
+			if (name == "transform") {
+				return this._.transform;
+			}
+			var names = name.split(separator),
+				out = {};
+			for (var i = 0, ii = names.length; i < ii; i++) {
+				name = names[i];
+				if (name in this.attrs) {
+					out[name] = this.attrs[name];
+				} else if (R.is(this.paper.customAttributes[name], "function")) {
+					out[name] = this.paper.customAttributes[name].def;
+				} else {
+					out[name] = R._availableAttrs[name];
+				}
+			}
+			return ii - 1 ? out : out[names[0]];
+		}
+		if (value == null && R.is(name, "array")) {
+			out = {};
+			for (i = 0, ii = name.length; i < ii; i++) {
+				out[name[i]] = this.attr(name[i]);
+			}
+			return out;
+		}
+		if (value != null) {
+			var params = {};
+			params[name] = value;
+		} else if (name != null && R.is(name, "object")) {
+			params = name;
+		}
+		for (var key in params) {
+			eve("raphael.attr." + key + "." + this.id, this, params[key]);
+		}
+		for (key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) {
+			var par = this.paper.customAttributes[key].apply(this, [].concat(params[key]));
+			this.attrs[key] = params[key];
+			for (var subkey in par) if (par[has](subkey)) {
+				params[subkey] = par[subkey];
+			}
+		}
+		setFillAndStroke(this, params);
+		return this;
+	};
+
+	elproto.toFront = function () {
+		if (this.removed) {
+			return this;
+		}
+		if (this.node.parentNode.tagName.toLowerCase() == "a") {
+			this.node.parentNode.parentNode.appendChild(this.node.parentNode);
+		} else {
+			this.node.parentNode.appendChild(this.node);
+		}
+		var svg = this.paper;
+		svg.top != this && R._tofront(this, svg);
+		return this;
+	};
+
+	elproto.toBack = function () {
+		if (this.removed) {
+			return this;
+		}
+		var parent = this.node.parentNode;
+		if (parent.tagName.toLowerCase() == "a") {
+			parent.parentNode.insertBefore(this.node.parentNode, this.node.parentNode.parentNode.firstChild);
+		} else if (parent.firstChild != this.node) {
+			parent.insertBefore(this.node, this.node.parentNode.firstChild);
+		}
+		R._toback(this, this.paper);
+		var svg = this.paper;
+		return this;
+	};
+
+	elproto.insertAfter = function (element) {
+		if (this.removed) {
+			return this;
+		}
+		var node = element.node || element[element.length - 1].node;
+		if (node.nextSibling) {
+			node.parentNode.insertBefore(this.node, node.nextSibling);
+		} else {
+			node.parentNode.appendChild(this.node);
+		}
+		R._insertafter(this, element, this.paper);
+		return this;
+	};
+
+	elproto.insertBefore = function (element) {
+		if (this.removed) {
+			return this;
+		}
+		var node = element.node || element[0].node;
+		node.parentNode.insertBefore(this.node, node);
+		R._insertbefore(this, element, this.paper);
+		return this;
+	};
+	elproto.blur = function (size) {
+		// Experimental. No Safari support. Use it on your own risk.
+		var t = this;
+		if (+size !== 0) {
+			var fltr = $("filter"),
+				blur = $("feGaussianBlur");
+			t.attrs.blur = size;
+			fltr.id = R.createUUID();
+			$(blur, {stdDeviation: +size || 1.5});
+			fltr.appendChild(blur);
+			t.paper.defs.appendChild(fltr);
+			t._blur = fltr;
+			$(t.node, {filter: "url(#" + fltr.id + ")"});
+		} else {
+			if (t._blur) {
+				t._blur.parentNode.removeChild(t._blur);
+				delete t._blur;
+				delete t.attrs.blur;
+			}
+			t.node.removeAttribute("filter");
+		}
+	};
+	R._engine.circle = function (svg, x, y, r) {
+		var el = $("circle");
+		svg.canvas && svg.canvas.appendChild(el);
+		var res = new Element(el, svg);
+		res.attrs = {cx: x, cy: y, r: r, fill: "none", stroke: "#000"};
+		res.type = "circle";
+		$(el, res.attrs);
+		return res;
+	};
+	R._engine.rect = function (svg, x, y, w, h, r) {
+		var el = $("rect");
+		svg.canvas && svg.canvas.appendChild(el);
+		var res = new Element(el, svg);
+		res.attrs = {x: x, y: y, width: w, height: h, r: r || 0, rx: r || 0, ry: r || 0, fill: "none", stroke: "#000"};
+		res.type = "rect";
+		$(el, res.attrs);
+		return res;
+	};
+	R._engine.ellipse = function (svg, x, y, rx, ry) {
+		var el = $("ellipse");
+		svg.canvas && svg.canvas.appendChild(el);
+		var res = new Element(el, svg);
+		res.attrs = {cx: x, cy: y, rx: rx, ry: ry, fill: "none", stroke: "#000"};
+		res.type = "ellipse";
+		$(el, res.attrs);
+		return res;
+	};
+	R._engine.image = function (svg, src, x, y, w, h) {
+		var el = $("image");
+		$(el, {x: x, y: y, width: w, height: h, preserveAspectRatio: "none"});
+		el.setAttributeNS(xlink, "href", src);
+		svg.canvas && svg.canvas.appendChild(el);
+		var res = new Element(el, svg);
+		res.attrs = {x: x, y: y, width: w, height: h, src: src};
+		res.type = "image";
+		return res;
+	};
+	R._engine.text = function (svg, x, y, text) {
+		var el = $("text");
+		svg.canvas && svg.canvas.appendChild(el);
+		var res = new Element(el, svg);
+		res.attrs = {
+			x: x,
+			y: y,
+			"text-anchor": "middle",
+			text: text,
+			font: R._availableAttrs.font,
+			stroke: "none",
+			fill: "#000"
+		};
+		res.type = "text";
+		setFillAndStroke(res, res.attrs);
+		return res;
+	};
+	R._engine.setSize = function (width, height) {
+		this.width = width || this.width;
+		this.height = height || this.height;
+		this.canvas.setAttribute("width", this.width);
+		this.canvas.setAttribute("height", this.height);
+		if (this._viewBox) {
+			this.setViewBox.apply(this, this._viewBox);
+		}
+		return this;
+	};
+	R._engine.create = function () {
+		var con = R._getContainer.apply(0, arguments),
+			container = con && con.container,
+			x = con.x,
+			y = con.y,
+			width = con.width,
+			height = con.height;
+		if (!container) {
+			throw new Error("SVG container not found.");
+		}
+		var cnvs = $("svg"),
+			css = "overflow:hidden;",
+			isFloating;
+		x = x || 0;
+		y = y || 0;
+		width = width || 512;
+		height = height || 342;
+		$(cnvs, {
+			height: height,
+			version: 1.1,
+			width: width,
+			xmlns: "http://www.w3.org/2000/svg"
+		});
+		if (container == 1) {
+			cnvs.style.cssText = css + "position:absolute;left:" + x + "px;top:" + y + "px";
+			R._g.doc.body.appendChild(cnvs);
+			isFloating = 1;
+		} else {
+			cnvs.style.cssText = css + "position:relative";
+			if (container.firstChild) {
+				container.insertBefore(cnvs, container.firstChild);
+			} else {
+				container.appendChild(cnvs);
+			}
+		}
+		container = new R._Paper;
+		container.width = width;
+		container.height = height;
+		container.canvas = cnvs;
+		container.clear();
+		container._left = container._top = 0;
+		isFloating && (container.renderfix = function () {
+		});
+		container.renderfix();
+		return container;
+	};
+	R._engine.setViewBox = function (x, y, w, h, fit) {
+		eve("raphael.setViewBox", this, this._viewBox, [x, y, w, h, fit]);
+		var size = mmax(w / this.width, h / this.height),
+			top = this.top,
+			aspectRatio = fit ? "meet" : "xMinYMin",
+			vb,
+			sw;
+		if (x == null) {
+			if (this._vbSize) {
+				size = 1;
+			}
+			delete this._vbSize;
+			vb = "0 0 " + this.width + S + this.height;
+		} else {
+			this._vbSize = size;
+			vb = x + S + y + S + w + S + h;
+		}
+		$(this.canvas, {
+			viewBox: vb,
+			preserveAspectRatio: aspectRatio
+		});
+		while (size && top) {
+			sw = "stroke-width" in top.attrs ? top.attrs["stroke-width"] : 1;
+			top.attr({"stroke-width": sw});
+			top._.dirty = 1;
+			top._.dirtyT = 1;
+			top = top.prev;
+		}
+		this._viewBox = [x, y, w, h, !!fit];
+		return this;
+	};
+
+	R.prototype.renderfix = function () {
+		var cnvs = this.canvas,
+			s = cnvs.style,
+			pos;
+		try {
+			pos = cnvs.getScreenCTM() || cnvs.createSVGMatrix();
+		} catch (e) {
+			pos = cnvs.createSVGMatrix();
+		}
+		var left = -pos.e % 1,
+			top = -pos.f % 1;
+		if (left || top) {
+			if (left) {
+				this._left = (this._left + left) % 1;
+				s.left = this._left + "px";
+			}
+			if (top) {
+				this._top = (this._top + top) % 1;
+				s.top = this._top + "px";
+			}
+		}
+	};
+
+	R.prototype.clear = function () {
+		R.eve("raphael.clear", this);
+		var c = this.canvas;
+		while (c.firstChild) {
+			c.removeChild(c.firstChild);
+		}
+		this.bottom = this.top = null;
+		(this.desc = $("desc")).appendChild(R._g.doc.createTextNode("Created with Rapha\xebl " + R.version));
+		c.appendChild(this.desc);
+		c.appendChild(this.defs = $("defs"));
+	};
+
+	R.prototype.remove = function () {
+		eve("raphael.remove", this);
+		this.canvas.parentNode && this.canvas.parentNode.removeChild(this.canvas);
+		for (var i in this) {
+			this[i] = typeof this[i] == "function" ? R._removedFactory(i) : null;
+		}
+	};
+	var setproto = R.st;
+	for (var method in elproto) if (elproto[has](method) && !setproto[has](method)) {
+		setproto[method] = (function (methodname) {
+			return function () {
+				var arg = arguments;
+				return this.forEach(function (el) {
+					el[methodname].apply(el, arg);
+				});
+			};
+		})(method);
+	}
 }(window.Raphael);
 
 // ┌─────────────────────────────────────────────────────────────────────┐ \\
@@ -4850,966 +4887,974 @@ window.Raphael.svg && function (R) {
 // │ Licensed under the MIT (http://raphaeljs.com/license.html) license. │ \\
 // └─────────────────────────────────────────────────────────────────────┘ \\
 window.Raphael.vml && function (R) {
-    var has = "hasOwnProperty",
-        Str = String,
-        toFloat = parseFloat,
-        math = Math,
-        round = math.round,
-        mmax = math.max,
-        mmin = math.min,
-        abs = math.abs,
-        fillString = "fill",
-        separator = /[, ]+/,
-        eve = R.eve,
-        ms = " progid:DXImageTransform.Microsoft",
-        S = " ",
-        E = "",
-        map = {M: "m", L: "l", C: "c", Z: "x", m: "t", l: "r", c: "v", z: "x"},
-        bites = /([clmz]),?([^clmz]*)/gi,
-        blurregexp = / progid:\S+Blur\([^\)]+\)/g,
-        val = /-?[^,\s-]+/g,
-        cssDot = "position:absolute;left:0;top:0;width:1px;height:1px",
-        zoom = 21600,
-        pathTypes = {path: 1, rect: 1, image: 1},
-        ovalTypes = {circle: 1, ellipse: 1},
-        path2vml = function (path) {
-            var total =  /[ahqstv]/ig,
-                command = R._pathToAbsolute;
-            Str(path).match(total) && (command = R._path2curve);
-            total = /[clmz]/g;
-            if (command == R._pathToAbsolute && !Str(path).match(total)) {
-                var res = Str(path).replace(bites, function (all, command, args) {
-                    var vals = [],
-                        isMove = command.toLowerCase() == "m",
-                        res = map[command];
-                    args.replace(val, function (value) {
-                        if (isMove && vals.length == 2) {
-                            res += vals + map[command == "m" ? "l" : "L"];
-                            vals = [];
-                        }
-                        vals.push(round(value * zoom));
-                    });
-                    return res + vals;
-                });
-                return res;
-            }
-            var pa = command(path), p, r;
-            res = [];
-            for (var i = 0, ii = pa.length; i < ii; i++) {
-                p = pa[i];
-                r = pa[i][0].toLowerCase();
-                r == "z" && (r = "x");
-                for (var j = 1, jj = p.length; j < jj; j++) {
-                    r += round(p[j] * zoom) + (j != jj - 1 ? "," : E);
-                }
-                res.push(r);
-            }
-            return res.join(S);
-        },
-        compensation = function (deg, dx, dy) {
-            var m = R.matrix();
-            m.rotate(-deg, .5, .5);
-            return {
-                dx: m.x(dx, dy),
-                dy: m.y(dx, dy)
-            };
-        },
-        setCoords = function (p, sx, sy, dx, dy, deg) {
-            var _ = p._,
-                m = p.matrix,
-                fillpos = _.fillpos,
-                o = p.node,
-                s = o.style,
-                y = 1,
-                flip = "",
-                dxdy,
-                kx = zoom / sx,
-                ky = zoom / sy;
-            s.visibility = "hidden";
-            if (!sx || !sy) {
-                return;
-            }
-            o.coordsize = abs(kx) + S + abs(ky);
-            s.rotation = deg * (sx * sy < 0 ? -1 : 1);
-            if (deg) {
-                var c = compensation(deg, dx, dy);
-                dx = c.dx;
-                dy = c.dy;
-            }
-            sx < 0 && (flip += "x");
-            sy < 0 && (flip += " y") && (y = -1);
-            s.flip = flip;
-            o.coordorigin = (dx * -kx) + S + (dy * -ky);
-            if (fillpos || _.fillsize) {
-                var fill = o.getElementsByTagName(fillString);
-                fill = fill && fill[0];
-                o.removeChild(fill);
-                if (fillpos) {
-                    c = compensation(deg, m.x(fillpos[0], fillpos[1]), m.y(fillpos[0], fillpos[1]));
-                    fill.position = c.dx * y + S + c.dy * y;
-                }
-                if (_.fillsize) {
-                    fill.size = _.fillsize[0] * abs(sx) + S + _.fillsize[1] * abs(sy);
-                }
-                o.appendChild(fill);
-            }
-            s.visibility = "visible";
-        };
-    R.toString = function () {
-        return  "Your browser doesn\u2019t support SVG. Falling down to VML.\nYou are running Rapha\xebl " + this.version;
-    };
-    var addArrow = function (o, value, isEnd) {
-        var values = Str(value).toLowerCase().split("-"),
-            se = isEnd ? "end" : "start",
-            i = values.length,
-            type = "classic",
-            w = "medium",
-            h = "medium";
-        while (i--) {
-            switch (values[i]) {
-                case "block":
-                case "classic":
-                case "oval":
-                case "diamond":
-                case "open":
-                case "none":
-                    type = values[i];
-                    break;
-                case "wide":
-                case "narrow": h = values[i]; break;
-                case "long":
-                case "short": w = values[i]; break;
-            }
-        }
-        var stroke = o.node.getElementsByTagName("stroke")[0];
-        stroke[se + "arrow"] = type;
-        stroke[se + "arrowlength"] = w;
-        stroke[se + "arrowwidth"] = h;
-    },
-    setFillAndStroke = function (o, params) {
-        // o.paper.canvas.style.display = "none";
-        o.attrs = o.attrs || {};
-        var node = o.node,
-            a = o.attrs,
-            s = node.style,
-            xy,
-            newpath = pathTypes[o.type] && (params.x != a.x || params.y != a.y || params.width != a.width || params.height != a.height || params.cx != a.cx || params.cy != a.cy || params.rx != a.rx || params.ry != a.ry || params.r != a.r),
-            isOval = ovalTypes[o.type] && (a.cx != params.cx || a.cy != params.cy || a.r != params.r || a.rx != params.rx || a.ry != params.ry),
-            res = o;
-
-
-        for (var par in params) if (params[has](par)) {
-            a[par] = params[par];
-        }
-        if (newpath) {
-            a.path = R._getPath[o.type](o);
-            o._.dirty = 1;
-        }
-        params.href && (node.href = params.href);
-        params.title && (node.title = params.title);
-        params.target && (node.target = params.target);
-        params.cursor && (s.cursor = params.cursor);
-        "blur" in params && o.blur(params.blur);
-        if (params.path && o.type == "path" || newpath) {
-            node.path = path2vml(~Str(a.path).toLowerCase().indexOf("r") ? R._pathToAbsolute(a.path) : a.path);
-            if (o.type == "image") {
-                o._.fillpos = [a.x, a.y];
-                o._.fillsize = [a.width, a.height];
-                setCoords(o, 1, 1, 0, 0, 0);
-            }
-        }
-        "transform" in params && o.transform(params.transform);
-        if (isOval) {
-            var cx = +a.cx,
-                cy = +a.cy,
-                rx = +a.rx || +a.r || 0,
-                ry = +a.ry || +a.r || 0;
-            node.path = R.format("ar{0},{1},{2},{3},{4},{1},{4},{1}x", round((cx - rx) * zoom), round((cy - ry) * zoom), round((cx + rx) * zoom), round((cy + ry) * zoom), round(cx * zoom));
-        }
-        if ("clip-rect" in params) {
-            var rect = Str(params["clip-rect"]).split(separator);
-            if (rect.length == 4) {
-                rect[2] = +rect[2] + (+rect[0]);
-                rect[3] = +rect[3] + (+rect[1]);
-                var div = node.clipRect || R._g.doc.createElement("div"),
-                    dstyle = div.style;
-                dstyle.clip = R.format("rect({1}px {2}px {3}px {0}px)", rect);
-                if (!node.clipRect) {
-                    dstyle.position = "absolute";
-                    dstyle.top = 0;
-                    dstyle.left = 0;
-                    dstyle.width = o.paper.width + "px";
-                    dstyle.height = o.paper.height + "px";
-                    node.parentNode.insertBefore(div, node);
-                    div.appendChild(node);
-                    node.clipRect = div;
-                }
-            }
-            if (!params["clip-rect"]) {
-                node.clipRect && (node.clipRect.style.clip = "auto");
-            }
-        }
-        if (o.textpath) {
-            var textpathStyle = o.textpath.style;
-            params.font && (textpathStyle.font = params.font);
-            params["font-family"] && (textpathStyle.fontFamily = '"' + params["font-family"].split(",")[0].replace(/^['"]+|['"]+$/g, E) + '"');
-            params["font-size"] && (textpathStyle.fontSize = params["font-size"]);
-            params["font-weight"] && (textpathStyle.fontWeight = params["font-weight"]);
-            params["font-style"] && (textpathStyle.fontStyle = params["font-style"]);
-        }
-        if ("arrow-start" in params) {
-            addArrow(res, params["arrow-start"]);
-        }
-        if ("arrow-end" in params) {
-            addArrow(res, params["arrow-end"], 1);
-        }
-        if (params.opacity != null || 
-            params["stroke-width"] != null ||
-            params.fill != null ||
-            params.src != null ||
-            params.stroke != null ||
-            params["stroke-width"] != null ||
-            params["stroke-opacity"] != null ||
-            params["fill-opacity"] != null ||
-            params["stroke-dasharray"] != null ||
-            params["stroke-miterlimit"] != null ||
-            params["stroke-linejoin"] != null ||
-            params["stroke-linecap"] != null) {
-            var fill = node.getElementsByTagName(fillString),
-                newfill = false;
-            fill = fill && fill[0];
-            !fill && (newfill = fill = createNode(fillString));
-            if (o.type == "image" && params.src) {
-                fill.src = params.src;
-            }
-            params.fill && (fill.on = true);
-            if (fill.on == null || params.fill == "none" || params.fill === null) {
-                fill.on = false;
-            }
-            if (fill.on && params.fill) {
-                var isURL = Str(params.fill).match(R._ISURL);
-                if (isURL) {
-                    fill.parentNode == node && node.removeChild(fill);
-                    fill.rotate = true;
-                    fill.src = isURL[1];
-                    fill.type = "tile";
-                    var bbox = o.getBBox(1);
-                    fill.position = bbox.x + S + bbox.y;
-                    o._.fillpos = [bbox.x, bbox.y];
-
-                    R._preload(isURL[1], function () {
-                        o._.fillsize = [this.offsetWidth, this.offsetHeight];
-                    });
-                } else {
-                    fill.color = R.getRGB(params.fill).hex;
-                    fill.src = E;
-                    fill.type = "solid";
-                    if (R.getRGB(params.fill).error && (res.type in {circle: 1, ellipse: 1} || Str(params.fill).charAt() != "r") && addGradientFill(res, params.fill, fill)) {
-                        a.fill = "none";
-                        a.gradient = params.fill;
-                        fill.rotate = false;
-                    }
-                }
-            }
-            if ("fill-opacity" in params || "opacity" in params) {
-                var opacity = ((+a["fill-opacity"] + 1 || 2) - 1) * ((+a.opacity + 1 || 2) - 1) * ((+R.getRGB(params.fill).o + 1 || 2) - 1);
-                opacity = mmin(mmax(opacity, 0), 1);
-                fill.opacity = opacity;
-                if (fill.src) {
-                    fill.color = "none";
-                }
-            }
-            node.appendChild(fill);
-            var stroke = (node.getElementsByTagName("stroke") && node.getElementsByTagName("stroke")[0]),
-            newstroke = false;
-            !stroke && (newstroke = stroke = createNode("stroke"));
-            if ((params.stroke && params.stroke != "none") ||
-                params["stroke-width"] ||
-                params["stroke-opacity"] != null ||
-                params["stroke-dasharray"] ||
-                params["stroke-miterlimit"] ||
-                params["stroke-linejoin"] ||
-                params["stroke-linecap"]) {
-                stroke.on = true;
-            }
-            (params.stroke == "none" || params.stroke === null || stroke.on == null || params.stroke == 0 || params["stroke-width"] == 0) && (stroke.on = false);
-            var strokeColor = R.getRGB(params.stroke);
-            stroke.on && params.stroke && (stroke.color = strokeColor.hex);
-            opacity = ((+a["stroke-opacity"] + 1 || 2) - 1) * ((+a.opacity + 1 || 2) - 1) * ((+strokeColor.o + 1 || 2) - 1);
-            var width = (toFloat(params["stroke-width"]) || 1) * .75;
-            opacity = mmin(mmax(opacity, 0), 1);
-            params["stroke-width"] == null && (width = a["stroke-width"]);
-            params["stroke-width"] && (stroke.weight = width);
-            width && width < 1 && (opacity *= width) && (stroke.weight = 1);
-            stroke.opacity = opacity;
-        
-            params["stroke-linejoin"] && (stroke.joinstyle = params["stroke-linejoin"] || "miter");
-            stroke.miterlimit = params["stroke-miterlimit"] || 8;
-            params["stroke-linecap"] && (stroke.endcap = params["stroke-linecap"] == "butt" ? "flat" : params["stroke-linecap"] == "square" ? "square" : "round");
-            if (params["stroke-dasharray"]) {
-                var dasharray = {
-                    "-": "shortdash",
-                    ".": "shortdot",
-                    "-.": "shortdashdot",
-                    "-..": "shortdashdotdot",
-                    ". ": "dot",
-                    "- ": "dash",
-                    "--": "longdash",
-                    "- .": "dashdot",
-                    "--.": "longdashdot",
-                    "--..": "longdashdotdot"
-                };
-                stroke.dashstyle = dasharray[has](params["stroke-dasharray"]) ? dasharray[params["stroke-dasharray"]] : E;
-            }
-            newstroke && node.appendChild(stroke);
-        }
-        if (res.type == "text") {
-            res.paper.canvas.style.display = E;
-            var span = res.paper.span,
-                m = 100,
-                fontSize = a.font && a.font.match(/\d+(?:\.\d*)?(?=px)/);
-            s = span.style;
-            a.font && (s.font = a.font);
-            a["font-family"] && (s.fontFamily = a["font-family"]);
-            a["font-weight"] && (s.fontWeight = a["font-weight"]);
-            a["font-style"] && (s.fontStyle = a["font-style"]);
-            fontSize = toFloat(a["font-size"] || fontSize && fontSize[0]) || 10;
-            s.fontSize = fontSize * m + "px";
-            res.textpath.string && (span.innerHTML = Str(res.textpath.string).replace(/</g, "&#60;").replace(/&/g, "&#38;").replace(/\n/g, "<br>"));
-            var brect = span.getBoundingClientRect();
-            res.W = a.w = (brect.right - brect.left) / m;
-            res.H = a.h = (brect.bottom - brect.top) / m;
-            // res.paper.canvas.style.display = "none";
-            res.X = a.x;
-            res.Y = a.y + res.H / 2;
-
-            ("x" in params || "y" in params) && (res.path.v = R.format("m{0},{1}l{2},{1}", round(a.x * zoom), round(a.y * zoom), round(a.x * zoom) + 1));
-            var dirtyattrs = ["x", "y", "text", "font", "font-family", "font-weight", "font-style", "font-size"];
-            for (var d = 0, dd = dirtyattrs.length; d < dd; d++) if (dirtyattrs[d] in params) {
-                res._.dirty = 1;
-                break;
-            }
-        
-            // text-anchor emulation
-            switch (a["text-anchor"]) {
-                case "start":
-                    res.textpath.style["v-text-align"] = "left";
-                    res.bbx = res.W / 2;
-                break;
-                case "end":
-                    res.textpath.style["v-text-align"] = "right";
-                    res.bbx = -res.W / 2;
-                break;
-                default:
-                    res.textpath.style["v-text-align"] = "center";
-                    res.bbx = 0;
-                break;
-            }
-            res.textpath.style["v-text-kern"] = true;
-        }
-        // res.paper.canvas.style.display = E;
-    },
-    addGradientFill = function (o, gradient, fill) {
-        o.attrs = o.attrs || {};
-        var attrs = o.attrs,
-            pow = Math.pow,
-            opacity,
-            oindex,
-            type = "linear",
-            fxfy = ".5 .5";
-        o.attrs.gradient = gradient;
-        gradient = Str(gradient).replace(R._radial_gradient, function (all, fx, fy) {
-            type = "radial";
-            if (fx && fy) {
-                fx = toFloat(fx);
-                fy = toFloat(fy);
-                pow(fx - .5, 2) + pow(fy - .5, 2) > .25 && (fy = math.sqrt(.25 - pow(fx - .5, 2)) * ((fy > .5) * 2 - 1) + .5);
-                fxfy = fx + S + fy;
-            }
-            return E;
-        });
-        gradient = gradient.split(/\s*\-\s*/);
-        if (type == "linear") {
-            var angle = gradient.shift();
-            angle = -toFloat(angle);
-            if (isNaN(angle)) {
-                return null;
-            }
-        }
-        var dots = R._parseDots(gradient);
-        if (!dots) {
-            return null;
-        }
-        o = o.shape || o.node;
-        if (dots.length) {
-            o.removeChild(fill);
-            fill.on = true;
-            fill.method = "none";
-            fill.color = dots[0].color;
-            fill.color2 = dots[dots.length - 1].color;
-            var clrs = [];
-            for (var i = 0, ii = dots.length; i < ii; i++) {
-                dots[i].offset && clrs.push(dots[i].offset + S + dots[i].color);
-            }
-            fill.colors = clrs.length ? clrs.join() : "0% " + fill.color;
-            if (type == "radial") {
-                fill.type = "gradientTitle";
-                fill.focus = "100%";
-                fill.focussize = "0 0";
-                fill.focusposition = fxfy;
-                fill.angle = 0;
-            } else {
-                // fill.rotate= true;
-                fill.type = "gradient";
-                fill.angle = (270 - angle) % 360;
-            }
-            o.appendChild(fill);
-        }
-        return 1;
-    },
-    Element = function (node, vml) {
-        this[0] = this.node = node;
-        node.raphael = true;
-        this.id = R._oid++;
-        node.raphaelid = this.id;
-        this.X = 0;
-        this.Y = 0;
-        this.attrs = {};
-        this.paper = vml;
-        this.matrix = R.matrix();
-        this._ = {
-            transform: [],
-            sx: 1,
-            sy: 1,
-            dx: 0,
-            dy: 0,
-            deg: 0,
-            dirty: 1,
-            dirtyT: 1
-        };
-        !vml.bottom && (vml.bottom = this);
-        this.prev = vml.top;
-        vml.top && (vml.top.next = this);
-        vml.top = this;
-        this.next = null;
-    };
-    var elproto = R.el;
-
-    Element.prototype = elproto;
-    elproto.constructor = Element;
-    elproto.transform = function (tstr) {
-        if (tstr == null) {
-            return this._.transform;
-        }
-        var vbs = this.paper._viewBoxShift,
-            vbt = vbs ? "s" + [vbs.scale, vbs.scale] + "-1-1t" + [vbs.dx, vbs.dy] : E,
-            oldt;
-        if (vbs) {
-            oldt = tstr = Str(tstr).replace(/\.{3}|\u2026/g, this._.transform || E);
-        }
-        R._extractTransform(this, vbt + tstr);
-        var matrix = this.matrix.clone(),
-            skew = this.skew,
-            o = this.node,
-            split,
-            isGrad = ~Str(this.attrs.fill).indexOf("-"),
-            isPatt = !Str(this.attrs.fill).indexOf("url(");
-        matrix.translate(-.5, -.5);
-        if (isPatt || isGrad || this.type == "image") {
-            skew.matrix = "1 0 0 1";
-            skew.offset = "0 0";
-            split = matrix.split();
-            if ((isGrad && split.noRotation) || !split.isSimple) {
-                o.style.filter = matrix.toFilter();
-                var bb = this.getBBox(),
-                    bbt = this.getBBox(1),
-                    dx = bb.x - bbt.x,
-                    dy = bb.y - bbt.y;
-                o.coordorigin = (dx * -zoom) + S + (dy * -zoom);
-                setCoords(this, 1, 1, dx, dy, 0);
-            } else {
-                o.style.filter = E;
-                setCoords(this, split.scalex, split.scaley, split.dx, split.dy, split.rotate);
-            }
-        } else {
-            o.style.filter = E;
-            skew.matrix = Str(matrix);
-            skew.offset = matrix.offset();
-        }
-        oldt && (this._.transform = oldt);
-        return this;
-    };
-    elproto.rotate = function (deg, cx, cy) {
-        if (this.removed) {
-            return this;
-        }
-        if (deg == null) {
-            return;
-        }
-        deg = Str(deg).split(separator);
-        if (deg.length - 1) {
-            cx = toFloat(deg[1]);
-            cy = toFloat(deg[2]);
-        }
-        deg = toFloat(deg[0]);
-        (cy == null) && (cx = cy);
-        if (cx == null || cy == null) {
-            var bbox = this.getBBox(1);
-            cx = bbox.x + bbox.width / 2;
-            cy = bbox.y + bbox.height / 2;
-        }
-        this._.dirtyT = 1;
-        this.transform(this._.transform.concat([["r", deg, cx, cy]]));
-        return this;
-    };
-    elproto.translate = function (dx, dy) {
-        if (this.removed) {
-            return this;
-        }
-        dx = Str(dx).split(separator);
-        if (dx.length - 1) {
-            dy = toFloat(dx[1]);
-        }
-        dx = toFloat(dx[0]) || 0;
-        dy = +dy || 0;
-        if (this._.bbox) {
-            this._.bbox.x += dx;
-            this._.bbox.y += dy;
-        }
-        this.transform(this._.transform.concat([["t", dx, dy]]));
-        return this;
-    };
-    elproto.scale = function (sx, sy, cx, cy) {
-        if (this.removed) {
-            return this;
-        }
-        sx = Str(sx).split(separator);
-        if (sx.length - 1) {
-            sy = toFloat(sx[1]);
-            cx = toFloat(sx[2]);
-            cy = toFloat(sx[3]);
-            isNaN(cx) && (cx = null);
-            isNaN(cy) && (cy = null);
-        }
-        sx = toFloat(sx[0]);
-        (sy == null) && (sy = sx);
-        (cy == null) && (cx = cy);
-        if (cx == null || cy == null) {
-            var bbox = this.getBBox(1);
-        }
-        cx = cx == null ? bbox.x + bbox.width / 2 : cx;
-        cy = cy == null ? bbox.y + bbox.height / 2 : cy;
-    
-        this.transform(this._.transform.concat([["s", sx, sy, cx, cy]]));
-        this._.dirtyT = 1;
-        return this;
-    };
-    elproto.hide = function () {
-        !this.removed && (this.node.style.display = "none");
-        return this;
-    };
-    elproto.show = function () {
-        !this.removed && (this.node.style.display = E);
-        return this;
-    };
-    elproto._getBBox = function () {
-        if (this.removed) {
-            return {};
-        }
-        return {
-            x: this.X + (this.bbx || 0) - this.W / 2,
-            y: this.Y - this.H,
-            width: this.W,
-            height: this.H
-        };
-    };
-    elproto.remove = function () {
-        if (this.removed || !this.node.parentNode) {
-            return;
-        }
-        this.paper.__set__ && this.paper.__set__.exclude(this);
-        R.eve.unbind("raphael.*.*." + this.id);
-        R._tear(this, this.paper);
-        this.node.parentNode.removeChild(this.node);
-        this.shape && this.shape.parentNode.removeChild(this.shape);
-        for (var i in this) {
-            this[i] = typeof this[i] == "function" ? R._removedFactory(i) : null;
-        }
-        this.removed = true;
-    };
-    elproto.attr = function (name, value) {
-        if (this.removed) {
-            return this;
-        }
-        if (name == null) {
-            var res = {};
-            for (var a in this.attrs) if (this.attrs[has](a)) {
-                res[a] = this.attrs[a];
-            }
-            res.gradient && res.fill == "none" && (res.fill = res.gradient) && delete res.gradient;
-            res.transform = this._.transform;
-            return res;
-        }
-        if (value == null && R.is(name, "string")) {
-            if (name == fillString && this.attrs.fill == "none" && this.attrs.gradient) {
-                return this.attrs.gradient;
-            }
-            var names = name.split(separator),
-                out = {};
-            for (var i = 0, ii = names.length; i < ii; i++) {
-                name = names[i];
-                if (name in this.attrs) {
-                    out[name] = this.attrs[name];
-                } else if (R.is(this.paper.customAttributes[name], "function")) {
-                    out[name] = this.paper.customAttributes[name].def;
-                } else {
-                    out[name] = R._availableAttrs[name];
-                }
-            }
-            return ii - 1 ? out : out[names[0]];
-        }
-        if (this.attrs && value == null && R.is(name, "array")) {
-            out = {};
-            for (i = 0, ii = name.length; i < ii; i++) {
-                out[name[i]] = this.attr(name[i]);
-            }
-            return out;
-        }
-        var params;
-        if (value != null) {
-            params = {};
-            params[name] = value;
-        }
-        value == null && R.is(name, "object") && (params = name);
-        for (var key in params) {
-            eve("raphael.attr." + key + "." + this.id, this, params[key]);
-        }
-        if (params) {
-            for (key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) {
-                var par = this.paper.customAttributes[key].apply(this, [].concat(params[key]));
-                this.attrs[key] = params[key];
-                for (var subkey in par) if (par[has](subkey)) {
-                    params[subkey] = par[subkey];
-                }
-            }
-            // this.paper.canvas.style.display = "none";
-            if (params.text && this.type == "text") {
-                this.textpath.string = params.text;
-            }
-            setFillAndStroke(this, params);
-            // this.paper.canvas.style.display = E;
-        }
-        return this;
-    };
-    elproto.toFront = function () {
-        !this.removed && this.node.parentNode.appendChild(this.node);
-        this.paper && this.paper.top != this && R._tofront(this, this.paper);
-        return this;
-    };
-    elproto.toBack = function () {
-        if (this.removed) {
-            return this;
-        }
-        if (this.node.parentNode.firstChild != this.node) {
-            this.node.parentNode.insertBefore(this.node, this.node.parentNode.firstChild);
-            R._toback(this, this.paper);
-        }
-        return this;
-    };
-    elproto.insertAfter = function (element) {
-        if (this.removed) {
-            return this;
-        }
-        if (element.constructor == R.st.constructor) {
-            element = element[element.length - 1];
-        }
-        if (element.node.nextSibling) {
-            element.node.parentNode.insertBefore(this.node, element.node.nextSibling);
-        } else {
-            element.node.parentNode.appendChild(this.node);
-        }
-        R._insertafter(this, element, this.paper);
-        return this;
-    };
-    elproto.insertBefore = function (element) {
-        if (this.removed) {
-            return this;
-        }
-        if (element.constructor == R.st.constructor) {
-            element = element[0];
-        }
-        element.node.parentNode.insertBefore(this.node, element.node);
-        R._insertbefore(this, element, this.paper);
-        return this;
-    };
-    elproto.blur = function (size) {
-        var s = this.node.runtimeStyle,
-            f = s.filter;
-        f = f.replace(blurregexp, E);
-        if (+size !== 0) {
-            this.attrs.blur = size;
-            s.filter = f + S + ms + ".Blur(pixelradius=" + (+size || 1.5) + ")";
-            s.margin = R.format("-{0}px 0 0 -{0}px", round(+size || 1.5));
-        } else {
-            s.filter = f;
-            s.margin = 0;
-            delete this.attrs.blur;
-        }
-    };
-
-    R._engine.path = function (pathString, vml) {
-        var el = createNode("shape");
-        el.style.cssText = cssDot;
-        el.coordsize = zoom + S + zoom;
-        el.coordorigin = vml.coordorigin;
-        var p = new Element(el, vml),
-            attr = {fill: "none", stroke: "#000"};
-        pathString && (attr.path = pathString);
-        p.type = "path";
-        p.path = [];
-        p.Path = E;
-        setFillAndStroke(p, attr);
-        vml.canvas.appendChild(el);
-        var skew = createNode("skew");
-        skew.on = true;
-        el.appendChild(skew);
-        p.skew = skew;
-        p.transform(E);
-        return p;
-    };
-    R._engine.rect = function (vml, x, y, w, h, r) {
-        var path = R._rectPath(x, y, w, h, r),
-            res = vml.path(path),
-            a = res.attrs;
-        res.X = a.x = x;
-        res.Y = a.y = y;
-        res.W = a.width = w;
-        res.H = a.height = h;
-        a.r = r;
-        a.path = path;
-        res.type = "rect";
-        return res;
-    };
-    R._engine.ellipse = function (vml, x, y, rx, ry) {
-        var res = vml.path(),
-            a = res.attrs;
-        res.X = x - rx;
-        res.Y = y - ry;
-        res.W = rx * 2;
-        res.H = ry * 2;
-        res.type = "ellipse";
-        setFillAndStroke(res, {
-            cx: x,
-            cy: y,
-            rx: rx,
-            ry: ry
-        });
-        return res;
-    };
-    R._engine.circle = function (vml, x, y, r) {
-        var res = vml.path(),
-            a = res.attrs;
-        res.X = x - r;
-        res.Y = y - r;
-        res.W = res.H = r * 2;
-        res.type = "circle";
-        setFillAndStroke(res, {
-            cx: x,
-            cy: y,
-            r: r
-        });
-        return res;
-    };
-    R._engine.image = function (vml, src, x, y, w, h) {
-        var path = R._rectPath(x, y, w, h),
-            res = vml.path(path).attr({stroke: "none"}),
-            a = res.attrs,
-            node = res.node,
-            fill = node.getElementsByTagName(fillString)[0];
-        a.src = src;
-        res.X = a.x = x;
-        res.Y = a.y = y;
-        res.W = a.width = w;
-        res.H = a.height = h;
-        a.path = path;
-        res.type = "image";
-        fill.parentNode == node && node.removeChild(fill);
-        fill.rotate = true;
-        fill.src = src;
-        fill.type = "tile";
-        res._.fillpos = [x, y];
-        res._.fillsize = [w, h];
-        node.appendChild(fill);
-        setCoords(res, 1, 1, 0, 0, 0);
-        return res;
-    };
-    R._engine.text = function (vml, x, y, text) {
-        var el = createNode("shape"),
-            path = createNode("path"),
-            o = createNode("textpath");
-        x = x || 0;
-        y = y || 0;
-        text = text || "";
-        path.v = R.format("m{0},{1}l{2},{1}", round(x * zoom), round(y * zoom), round(x * zoom) + 1);
-        path.textpathok = true;
-        o.string = Str(text);
-        o.on = true;
-        el.style.cssText = cssDot;
-        el.coordsize = zoom + S + zoom;
-        el.coordorigin = "0 0";
-        var p = new Element(el, vml),
-            attr = {
-                fill: "#000",
-                stroke: "none",
-                font: R._availableAttrs.font,
-                text: text
-            };
-        p.shape = el;
-        p.path = path;
-        p.textpath = o;
-        p.type = "text";
-        p.attrs.text = Str(text);
-        p.attrs.x = x;
-        p.attrs.y = y;
-        p.attrs.w = 1;
-        p.attrs.h = 1;
-        setFillAndStroke(p, attr);
-        el.appendChild(o);
-        el.appendChild(path);
-        vml.canvas.appendChild(el);
-        var skew = createNode("skew");
-        skew.on = true;
-        el.appendChild(skew);
-        p.skew = skew;
-        p.transform(E);
-        return p;
-    };
-    R._engine.setSize = function (width, height) {
-        var cs = this.canvas.style;
-        this.width = width;
-        this.height = height;
-        width == +width && (width += "px");
-        height == +height && (height += "px");
-        cs.width = width;
-        cs.height = height;
-        cs.clip = "rect(0 " + width + " " + height + " 0)";
-        if (this._viewBox) {
-            R._engine.setViewBox.apply(this, this._viewBox);
-        }
-        return this;
-    };
-    R._engine.setViewBox = function (x, y, w, h, fit) {
-        R.eve("raphael.setViewBox", this, this._viewBox, [x, y, w, h, fit]);
-        var width = this.width,
-            height = this.height,
-            size = 1 / mmax(w / width, h / height),
-            H, W;
-        if (fit) {
-            H = height / h;
-            W = width / w;
-            if (w * H < width) {
-                x -= (width - w * H) / 2 / H;
-            }
-            if (h * W < height) {
-                y -= (height - h * W) / 2 / W;
-            }
-        }
-        this._viewBox = [x, y, w, h, !!fit];
-        this._viewBoxShift = {
-            dx: -x,
-            dy: -y,
-            scale: size
-        };
-        this.forEach(function (el) {
-            el.transform("...");
-        });
-        return this;
-    };
-    var createNode;
-    R._engine.initWin = function (win) {
-            var doc = win.document;
-            doc.createStyleSheet().addRule(".rvml", "behavior:url(#default#VML)");
-            try {
-                !doc.namespaces.rvml && doc.namespaces.add("rvml", "urn:schemas-microsoft-com:vml");
-                createNode = function (tagName) {
-                    return doc.createElement('<rvml:' + tagName + ' class="rvml">');
-                };
-            } catch (e) {
-                createNode = function (tagName) {
-                    return doc.createElement('<' + tagName + ' xmlns="urn:schemas-microsoft.com:vml" class="rvml">');
-                };
-            }
-        };
-    R._engine.initWin(R._g.win);
-    R._engine.create = function () {
-        var con = R._getContainer.apply(0, arguments),
-            container = con.container,
-            height = con.height,
-            s,
-            width = con.width,
-            x = con.x,
-            y = con.y;
-        if (!container) {
-            throw new Error("VML container not found.");
-        }
-        var res = new R._Paper,
-            c = res.canvas = R._g.doc.createElement("div"),
-            cs = c.style;
-        x = x || 0;
-        y = y || 0;
-        width = width || 512;
-        height = height || 342;
-        res.width = width;
-        res.height = height;
-        width == +width && (width += "px");
-        height == +height && (height += "px");
-        res.coordsize = zoom * 1e3 + S + zoom * 1e3;
-        res.coordorigin = "0 0";
-        res.span = R._g.doc.createElement("span");
-        res.span.style.cssText = "position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;";
-        c.appendChild(res.span);
-        cs.cssText = R.format("top:0;left:0;width:{0};height:{1};display:inline-block;position:relative;clip:rect(0 {0} {1} 0);overflow:hidden", width, height);
-        if (container == 1) {
-            R._g.doc.body.appendChild(c);
-            cs.left = x + "px";
-            cs.top = y + "px";
-            cs.position = "absolute";
-        } else {
-            if (container.firstChild) {
-                container.insertBefore(c, container.firstChild);
-            } else {
-                container.appendChild(c);
-            }
-        }
-        res.renderfix = function () {};
-        return res;
-    };
-    R.prototype.clear = function () {
-        R.eve("raphael.clear", this);
-        this.canvas.innerHTML = E;
-        this.span = R._g.doc.createElement("span");
-        this.span.style.cssText = "position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;display:inline;";
-        this.canvas.appendChild(this.span);
-        this.bottom = this.top = null;
-    };
-    R.prototype.remove = function () {
-        R.eve("raphael.remove", this);
-        this.canvas.parentNode.removeChild(this.canvas);
-        for (var i in this) {
-            this[i] = typeof this[i] == "function" ? R._removedFactory(i) : null;
-        }
-        return true;
-    };
-
-    var setproto = R.st;
-    for (var method in elproto) if (elproto[has](method) && !setproto[has](method)) {
-        setproto[method] = (function (methodname) {
-            return function () {
-                var arg = arguments;
-                return this.forEach(function (el) {
-                    el[methodname].apply(el, arg);
-                });
-            };
-        })(method);
-    }
-}(window.Raphael);
\ No newline at end of file
+	var has = "hasOwnProperty",
+		Str = String,
+		toFloat = parseFloat,
+		math = Math,
+		round = math.round,
+		mmax = math.max,
+		mmin = math.min,
+		abs = math.abs,
+		fillString = "fill",
+		separator = /[, ]+/,
+		eve = R.eve,
+		ms = " progid:DXImageTransform.Microsoft",
+		S = " ",
+		E = "",
+		map = {M: "m", L: "l", C: "c", Z: "x", m: "t", l: "r", c: "v", z: "x"},
+		bites = /([clmz]),?([^clmz]*)/gi,
+		blurregexp = / progid:\S+Blur\([^\)]+\)/g,
+		val = /-?[^,\s-]+/g,
+		cssDot = "position:absolute;left:0;top:0;width:1px;height:1px",
+		zoom = 21600,
+		pathTypes = {path: 1, rect: 1, image: 1},
+		ovalTypes = {circle: 1, ellipse: 1},
+		path2vml = function (path) {
+			var total = /[ahqstv]/ig,
+				command = R._pathToAbsolute;
+			Str(path).match(total) && (command = R._path2curve);
+			total = /[clmz]/g;
+			if (command == R._pathToAbsolute && !Str(path).match(total)) {
+				var res = Str(path).replace(bites, function (all, command, args) {
+					var vals = [],
+						isMove = command.toLowerCase() == "m",
+						res = map[command];
+					args.replace(val, function (value) {
+						if (isMove && vals.length == 2) {
+							res += vals + map[command == "m" ? "l" : "L"];
+							vals = [];
+						}
+						vals.push(round(value * zoom));
+					});
+					return res + vals;
+				});
+				return res;
+			}
+			var pa = command(path), p, r;
+			res = [];
+			for (var i = 0, ii = pa.length; i < ii; i++) {
+				p = pa[i];
+				r = pa[i][0].toLowerCase();
+				r == "z" && (r = "x");
+				for (var j = 1, jj = p.length; j < jj; j++) {
+					r += round(p[j] * zoom) + (j != jj - 1 ? "," : E);
+				}
+				res.push(r);
+			}
+			return res.join(S);
+		},
+		compensation = function (deg, dx, dy) {
+			var m = R.matrix();
+			m.rotate(-deg, .5, .5);
+			return {
+				dx: m.x(dx, dy),
+				dy: m.y(dx, dy)
+			};
+		},
+		setCoords = function (p, sx, sy, dx, dy, deg) {
+			var _ = p._,
+				m = p.matrix,
+				fillpos = _.fillpos,
+				o = p.node,
+				s = o.style,
+				y = 1,
+				flip = "",
+				dxdy,
+				kx = zoom / sx,
+				ky = zoom / sy;
+			s.visibility = "hidden";
+			if (!sx || !sy) {
+				return;
+			}
+			o.coordsize = abs(kx) + S + abs(ky);
+			s.rotation = deg * (sx * sy < 0 ? -1 : 1);
+			if (deg) {
+				var c = compensation(deg, dx, dy);
+				dx = c.dx;
+				dy = c.dy;
+			}
+			sx < 0 && (flip += "x");
+			sy < 0 && (flip += " y") && (y = -1);
+			s.flip = flip;
+			o.coordorigin = (dx * -kx) + S + (dy * -ky);
+			if (fillpos || _.fillsize) {
+				var fill = o.getElementsByTagName(fillString);
+				fill = fill && fill[0];
+				o.removeChild(fill);
+				if (fillpos) {
+					c = compensation(deg, m.x(fillpos[0], fillpos[1]), m.y(fillpos[0], fillpos[1]));
+					fill.position = c.dx * y + S + c.dy * y;
+				}
+				if (_.fillsize) {
+					fill.size = _.fillsize[0] * abs(sx) + S + _.fillsize[1] * abs(sy);
+				}
+				o.appendChild(fill);
+			}
+			s.visibility = "visible";
+		};
+	R.toString = function () {
+		return "Your browser doesn\u2019t support SVG. Falling down to VML.\nYou are running Rapha\xebl " + this.version;
+	};
+	var addArrow = function (o, value, isEnd) {
+			var values = Str(value).toLowerCase().split("-"),
+				se = isEnd ? "end" : "start",
+				i = values.length,
+				type = "classic",
+				w = "medium",
+				h = "medium";
+			while (i--) {
+				switch (values[i]) {
+					case "block":
+					case "classic":
+					case "oval":
+					case "diamond":
+					case "open":
+					case "none":
+						type = values[i];
+						break;
+					case "wide":
+					case "narrow":
+						h = values[i];
+						break;
+					case "long":
+					case "short":
+						w = values[i];
+						break;
+				}
+			}
+			var stroke = o.node.getElementsByTagName("stroke")[0];
+			stroke[se + "arrow"] = type;
+			stroke[se + "arrowlength"] = w;
+			stroke[se + "arrowwidth"] = h;
+		},
+		setFillAndStroke = function (o, params) {
+			// o.paper.canvas.style.display = "none";
+			o.attrs = o.attrs || {};
+			var node = o.node,
+				a = o.attrs,
+				s = node.style,
+				xy,
+				newpath = pathTypes[o.type] && (params.x != a.x || params.y != a.y || params.width != a.width || params.height != a.height || params.cx != a.cx || params.cy != a.cy || params.rx != a.rx || params.ry != a.ry || params.r != a.r),
+				isOval = ovalTypes[o.type] && (a.cx != params.cx || a.cy != params.cy || a.r != params.r || a.rx != params.rx || a.ry != params.ry),
+				res = o;
+
+
+			for (var par in params) if (params[has](par)) {
+				a[par] = params[par];
+			}
+			if (newpath) {
+				a.path = R._getPath[o.type](o);
+				o._.dirty = 1;
+			}
+			params.href && (node.href = params.href);
+			params.title && (node.title = params.title);
+			params.target && (node.target = params.target);
+			params.cursor && (s.cursor = params.cursor);
+			"blur" in params && o.blur(params.blur);
+			if (params.path && o.type == "path" || newpath) {
+				node.path = path2vml(~Str(a.path).toLowerCase().indexOf("r") ? R._pathToAbsolute(a.path) : a.path);
+				if (o.type == "image") {
+					o._.fillpos = [a.x, a.y];
+					o._.fillsize = [a.width, a.height];
+					setCoords(o, 1, 1, 0, 0, 0);
+				}
+			}
+			"transform" in params && o.transform(params.transform);
+			if (isOval) {
+				var cx = +a.cx,
+					cy = +a.cy,
+					rx = +a.rx || +a.r || 0,
+					ry = +a.ry || +a.r || 0;
+				node.path = R.format("ar{0},{1},{2},{3},{4},{1},{4},{1}x", round((cx - rx) * zoom), round((cy - ry) * zoom), round((cx + rx) * zoom), round((cy + ry) * zoom), round(cx * zoom));
+			}
+			if ("clip-rect" in params) {
+				var rect = Str(params["clip-rect"]).split(separator);
+				if (rect.length == 4) {
+					rect[2] = +rect[2] + (+rect[0]);
+					rect[3] = +rect[3] + (+rect[1]);
+					var div = node.clipRect || R._g.doc.createElement("div"),
+						dstyle = div.style;
+					dstyle.clip = R.format("rect({1}px {2}px {3}px {0}px)", rect);
+					if (!node.clipRect) {
+						dstyle.position = "absolute";
+						dstyle.top = 0;
+						dstyle.left = 0;
+						dstyle.width = o.paper.width + "px";
+						dstyle.height = o.paper.height + "px";
+						node.parentNode.insertBefore(div, node);
+						div.appendChild(node);
+						node.clipRect = div;
+					}
+				}
+				if (!params["clip-rect"]) {
+					node.clipRect && (node.clipRect.style.clip = "auto");
+				}
+			}
+			if (o.textpath) {
+				var textpathStyle = o.textpath.style;
+				params.font && (textpathStyle.font = params.font);
+				params["font-family"] && (textpathStyle.fontFamily = '"' + params["font-family"].split(",")[0].replace(/^['"]+|['"]+$/g, E) + '"');
+				params["font-size"] && (textpathStyle.fontSize = params["font-size"]);
+				params["font-weight"] && (textpathStyle.fontWeight = params["font-weight"]);
+				params["font-style"] && (textpathStyle.fontStyle = params["font-style"]);
+			}
+			if ("arrow-start" in params) {
+				addArrow(res, params["arrow-start"]);
+			}
+			if ("arrow-end" in params) {
+				addArrow(res, params["arrow-end"], 1);
+			}
+			if (params.opacity != null ||
+				params["stroke-width"] != null ||
+				params.fill != null ||
+				params.src != null ||
+				params.stroke != null ||
+				params["stroke-width"] != null ||
+				params["stroke-opacity"] != null ||
+				params["fill-opacity"] != null ||
+				params["stroke-dasharray"] != null ||
+				params["stroke-miterlimit"] != null ||
+				params["stroke-linejoin"] != null ||
+				params["stroke-linecap"] != null) {
+				var fill = node.getElementsByTagName(fillString),
+					newfill = false;
+				fill = fill && fill[0];
+				!fill && (newfill = fill = createNode(fillString));
+				if (o.type == "image" && params.src) {
+					fill.src = params.src;
+				}
+				params.fill && (fill.on = true);
+				if (fill.on == null || params.fill == "none" || params.fill === null) {
+					fill.on = false;
+				}
+				if (fill.on && params.fill) {
+					var isURL = Str(params.fill).match(R._ISURL);
+					if (isURL) {
+						fill.parentNode == node && node.removeChild(fill);
+						fill.rotate = true;
+						fill.src = isURL[1];
+						fill.type = "tile";
+						var bbox = o.getBBox(1);
+						fill.position = bbox.x + S + bbox.y;
+						o._.fillpos = [bbox.x, bbox.y];
+
+						R._preload(isURL[1], function () {
+							o._.fillsize = [this.offsetWidth, this.offsetHeight];
+						});
+					} else {
+						fill.color = R.getRGB(params.fill).hex;
+						fill.src = E;
+						fill.type = "solid";
+						if (R.getRGB(params.fill).error && (res.type in {
+							circle: 1,
+							ellipse: 1
+						} || Str(params.fill).charAt() != "r") && addGradientFill(res, params.fill, fill)) {
+							a.fill = "none";
+							a.gradient = params.fill;
+							fill.rotate = false;
+						}
+					}
+				}
+				if ("fill-opacity" in params || "opacity" in params) {
+					var opacity = ((+a["fill-opacity"] + 1 || 2) - 1) * ((+a.opacity + 1 || 2) - 1) * ((+R.getRGB(params.fill).o + 1 || 2) - 1);
+					opacity = mmin(mmax(opacity, 0), 1);
+					fill.opacity = opacity;
+					if (fill.src) {
+						fill.color = "none";
+					}
+				}
+				node.appendChild(fill);
+				var stroke = (node.getElementsByTagName("stroke") && node.getElementsByTagName("stroke")[0]),
+					newstroke = false;
+				!stroke && (newstroke = stroke = createNode("stroke"));
+				if ((params.stroke && params.stroke != "none") ||
+					params["stroke-width"] ||
+					params["stroke-opacity"] != null ||
+					params["stroke-dasharray"] ||
+					params["stroke-miterlimit"] ||
+					params["stroke-linejoin"] ||
+					params["stroke-linecap"]) {
+					stroke.on = true;
+				}
+				(params.stroke == "none" || params.stroke === null || stroke.on == null || params.stroke == 0 || params["stroke-width"] == 0) && (stroke.on = false);
+				var strokeColor = R.getRGB(params.stroke);
+				stroke.on && params.stroke && (stroke.color = strokeColor.hex);
+				opacity = ((+a["stroke-opacity"] + 1 || 2) - 1) * ((+a.opacity + 1 || 2) - 1) * ((+strokeColor.o + 1 || 2) - 1);
+				var width = (toFloat(params["stroke-width"]) || 1) * .75;
+				opacity = mmin(mmax(opacity, 0), 1);
+				params["stroke-width"] == null && (width = a["stroke-width"]);
+				params["stroke-width"] && (stroke.weight = width);
+				width && width < 1 && (opacity *= width) && (stroke.weight = 1);
+				stroke.opacity = opacity;
+
+				params["stroke-linejoin"] && (stroke.joinstyle = params["stroke-linejoin"] || "miter");
+				stroke.miterlimit = params["stroke-miterlimit"] || 8;
+				params["stroke-linecap"] && (stroke.endcap = params["stroke-linecap"] == "butt" ? "flat" : params["stroke-linecap"] == "square" ? "square" : "round");
+				if (params["stroke-dasharray"]) {
+					var dasharray = {
+						"-": "shortdash",
+						".": "shortdot",
+						"-.": "shortdashdot",
+						"-..": "shortdashdotdot",
+						". ": "dot",
+						"- ": "dash",
+						"--": "longdash",
+						"- .": "dashdot",
+						"--.": "longdashdot",
+						"--..": "longdashdotdot"
+					};
+					stroke.dashstyle = dasharray[has](params["stroke-dasharray"]) ? dasharray[params["stroke-dasharray"]] : E;
+				}
+				newstroke && node.appendChild(stroke);
+			}
+			if (res.type == "text") {
+				res.paper.canvas.style.display = E;
+				var span = res.paper.span,
+					m = 100,
+					fontSize = a.font && a.font.match(/\d+(?:\.\d*)?(?=px)/);
+				s = span.style;
+				a.font && (s.font = a.font);
+				a["font-family"] && (s.fontFamily = a["font-family"]);
+				a["font-weight"] && (s.fontWeight = a["font-weight"]);
+				a["font-style"] && (s.fontStyle = a["font-style"]);
+				fontSize = toFloat(a["font-size"] || fontSize && fontSize[0]) || 10;
+				s.fontSize = fontSize * m + "px";
+				res.textpath.string && (span.innerHTML = Str(res.textpath.string).replace(/</g, "&#60;").replace(/&/g, "&#38;").replace(/\n/g, "<br>"));
+				var brect = span.getBoundingClientRect();
+				res.W = a.w = (brect.right - brect.left) / m;
+				res.H = a.h = (brect.bottom - brect.top) / m;
+				// res.paper.canvas.style.display = "none";
+				res.X = a.x;
+				res.Y = a.y + res.H / 2;
+
+				("x" in params || "y" in params) && (res.path.v = R.format("m{0},{1}l{2},{1}", round(a.x * zoom), round(a.y * zoom), round(a.x * zoom) + 1));
+				var dirtyattrs = ["x", "y", "text", "font", "font-family", "font-weight", "font-style", "font-size"];
+				for (var d = 0, dd = dirtyattrs.length; d < dd; d++) if (dirtyattrs[d] in params) {
+					res._.dirty = 1;
+					break;
+				}
+
+				// text-anchor emulation
+				switch (a["text-anchor"]) {
+					case "start":
+						res.textpath.style["v-text-align"] = "left";
+						res.bbx = res.W / 2;
+						break;
+					case "end":
+						res.textpath.style["v-text-align"] = "right";
+						res.bbx = -res.W / 2;
+						break;
+					default:
+						res.textpath.style["v-text-align"] = "center";
+						res.bbx = 0;
+						break;
+				}
+				res.textpath.style["v-text-kern"] = true;
+			}
+			// res.paper.canvas.style.display = E;
+		},
+		addGradientFill = function (o, gradient, fill) {
+			o.attrs = o.attrs || {};
+			var attrs = o.attrs,
+				pow = Math.pow,
+				opacity,
+				oindex,
+				type = "linear",
+				fxfy = ".5 .5";
+			o.attrs.gradient = gradient;
+			gradient = Str(gradient).replace(R._radial_gradient, function (all, fx, fy) {
+				type = "radial";
+				if (fx && fy) {
+					fx = toFloat(fx);
+					fy = toFloat(fy);
+					pow(fx - .5, 2) + pow(fy - .5, 2) > .25 && (fy = math.sqrt(.25 - pow(fx - .5, 2)) * ((fy > .5) * 2 - 1) + .5);
+					fxfy = fx + S + fy;
+				}
+				return E;
+			});
+			gradient = gradient.split(/\s*\-\s*/);
+			if (type == "linear") {
+				var angle = gradient.shift();
+				angle = -toFloat(angle);
+				if (isNaN(angle)) {
+					return null;
+				}
+			}
+			var dots = R._parseDots(gradient);
+			if (!dots) {
+				return null;
+			}
+			o = o.shape || o.node;
+			if (dots.length) {
+				o.removeChild(fill);
+				fill.on = true;
+				fill.method = "none";
+				fill.color = dots[0].color;
+				fill.color2 = dots[dots.length - 1].color;
+				var clrs = [];
+				for (var i = 0, ii = dots.length; i < ii; i++) {
+					dots[i].offset && clrs.push(dots[i].offset + S + dots[i].color);
+				}
+				fill.colors = clrs.length ? clrs.join() : "0% " + fill.color;
+				if (type == "radial") {
+					fill.type = "gradientTitle";
+					fill.focus = "100%";
+					fill.focussize = "0 0";
+					fill.focusposition = fxfy;
+					fill.angle = 0;
+				} else {
+					// fill.rotate= true;
+					fill.type = "gradient";
+					fill.angle = (270 - angle) % 360;
+				}
+				o.appendChild(fill);
+			}
+			return 1;
+		},
+		Element = function (node, vml) {
+			this[0] = this.node = node;
+			node.raphael = true;
+			this.id = R._oid++;
+			node.raphaelid = this.id;
+			this.X = 0;
+			this.Y = 0;
+			this.attrs = {};
+			this.paper = vml;
+			this.matrix = R.matrix();
+			this._ = {
+				transform: [],
+				sx: 1,
+				sy: 1,
+				dx: 0,
+				dy: 0,
+				deg: 0,
+				dirty: 1,
+				dirtyT: 1
+			};
+			!vml.bottom && (vml.bottom = this);
+			this.prev = vml.top;
+			vml.top && (vml.top.next = this);
+			vml.top = this;
+			this.next = null;
+		};
+	var elproto = R.el;
+
+	Element.prototype = elproto;
+	elproto.constructor = Element;
+	elproto.transform = function (tstr) {
+		if (tstr == null) {
+			return this._.transform;
+		}
+		var vbs = this.paper._viewBoxShift,
+			vbt = vbs ? "s" + [vbs.scale, vbs.scale] + "-1-1t" + [vbs.dx, vbs.dy] : E,
+			oldt;
+		if (vbs) {
+			oldt = tstr = Str(tstr).replace(/\.{3}|\u2026/g, this._.transform || E);
+		}
+		R._extractTransform(this, vbt + tstr);
+		var matrix = this.matrix.clone(),
+			skew = this.skew,
+			o = this.node,
+			split,
+			isGrad = ~Str(this.attrs.fill).indexOf("-"),
+			isPatt = !Str(this.attrs.fill).indexOf("url(");
+		matrix.translate(-.5, -.5);
+		if (isPatt || isGrad || this.type == "image") {
+			skew.matrix = "1 0 0 1";
+			skew.offset = "0 0";
+			split = matrix.split();
+			if ((isGrad && split.noRotation) || !split.isSimple) {
+				o.style.filter = matrix.toFilter();
+				var bb = this.getBBox(),
+					bbt = this.getBBox(1),
+					dx = bb.x - bbt.x,
+					dy = bb.y - bbt.y;
+				o.coordorigin = (dx * -zoom) + S + (dy * -zoom);
+				setCoords(this, 1, 1, dx, dy, 0);
+			} else {
+				o.style.filter = E;
+				setCoords(this, split.scalex, split.scaley, split.dx, split.dy, split.rotate);
+			}
+		} else {
+			o.style.filter = E;
+			skew.matrix = Str(matrix);
+			skew.offset = matrix.offset();
+		}
+		oldt && (this._.transform = oldt);
+		return this;
+	};
+	elproto.rotate = function (deg, cx, cy) {
+		if (this.removed) {
+			return this;
+		}
+		if (deg == null) {
+			return;
+		}
+		deg = Str(deg).split(separator);
+		if (deg.length - 1) {
+			cx = toFloat(deg[1]);
+			cy = toFloat(deg[2]);
+		}
+		deg = toFloat(deg[0]);
+		(cy == null) && (cx = cy);
+		if (cx == null || cy == null) {
+			var bbox = this.getBBox(1);
+			cx = bbox.x + bbox.width / 2;
+			cy = bbox.y + bbox.height / 2;
+		}
+		this._.dirtyT = 1;
+		this.transform(this._.transform.concat([["r", deg, cx, cy]]));
+		return this;
+	};
+	elproto.translate = function (dx, dy) {
+		if (this.removed) {
+			return this;
+		}
+		dx = Str(dx).split(separator);
+		if (dx.length - 1) {
+			dy = toFloat(dx[1]);
+		}
+		dx = toFloat(dx[0]) || 0;
+		dy = +dy || 0;
+		if (this._.bbox) {
+			this._.bbox.x += dx;
+			this._.bbox.y += dy;
+		}
+		this.transform(this._.transform.concat([["t", dx, dy]]));
+		return this;
+	};
+	elproto.scale = function (sx, sy, cx, cy) {
+		if (this.removed) {
+			return this;
+		}
+		sx = Str(sx).split(separator);
+		if (sx.length - 1) {
+			sy = toFloat(sx[1]);
+			cx = toFloat(sx[2]);
+			cy = toFloat(sx[3]);
+			isNaN(cx) && (cx = null);
+			isNaN(cy) && (cy = null);
+		}
+		sx = toFloat(sx[0]);
+		(sy == null) && (sy = sx);
+		(cy == null) && (cx = cy);
+		if (cx == null || cy == null) {
+			var bbox = this.getBBox(1);
+		}
+		cx = cx == null ? bbox.x + bbox.width / 2 : cx;
+		cy = cy == null ? bbox.y + bbox.height / 2 : cy;
+
+		this.transform(this._.transform.concat([["s", sx, sy, cx, cy]]));
+		this._.dirtyT = 1;
+		return this;
+	};
+	elproto.hide = function () {
+		!this.removed && (this.node.style.display = "none");
+		return this;
+	};
+	elproto.show = function () {
+		!this.removed && (this.node.style.display = E);
+		return this;
+	};
+	elproto._getBBox = function () {
+		if (this.removed) {
+			return {};
+		}
+		return {
+			x: this.X + (this.bbx || 0) - this.W / 2,
+			y: this.Y - this.H,
+			width: this.W,
+			height: this.H
+		};
+	};
+	elproto.remove = function () {
+		if (this.removed || !this.node.parentNode) {
+			return;
+		}
+		this.paper.__set__ && this.paper.__set__.exclude(this);
+		R.eve.unbind("raphael.*.*." + this.id);
+		R._tear(this, this.paper);
+		this.node.parentNode.removeChild(this.node);
+		this.shape && this.shape.parentNode.removeChild(this.shape);
+		for (var i in this) {
+			this[i] = typeof this[i] == "function" ? R._removedFactory(i) : null;
+		}
+		this.removed = true;
+	};
+	elproto.attr = function (name, value) {
+		if (this.removed) {
+			return this;
+		}
+		if (name == null) {
+			var res = {};
+			for (var a in this.attrs) if (this.attrs[has](a)) {
+				res[a] = this.attrs[a];
+			}
+			res.gradient && res.fill == "none" && (res.fill = res.gradient) && delete res.gradient;
+			res.transform = this._.transform;
+			return res;
+		}
+		if (value == null && R.is(name, "string")) {
+			if (name == fillString && this.attrs.fill == "none" && this.attrs.gradient) {
+				return this.attrs.gradient;
+			}
+			var names = name.split(separator),
+				out = {};
+			for (var i = 0, ii = names.length; i < ii; i++) {
+				name = names[i];
+				if (name in this.attrs) {
+					out[name] = this.attrs[name];
+				} else if (R.is(this.paper.customAttributes[name], "function")) {
+					out[name] = this.paper.customAttributes[name].def;
+				} else {
+					out[name] = R._availableAttrs[name];
+				}
+			}
+			return ii - 1 ? out : out[names[0]];
+		}
+		if (this.attrs && value == null && R.is(name, "array")) {
+			out = {};
+			for (i = 0, ii = name.length; i < ii; i++) {
+				out[name[i]] = this.attr(name[i]);
+			}
+			return out;
+		}
+		var params;
+		if (value != null) {
+			params = {};
+			params[name] = value;
+		}
+		value == null && R.is(name, "object") && (params = name);
+		for (var key in params) {
+			eve("raphael.attr." + key + "." + this.id, this, params[key]);
+		}
+		if (params) {
+			for (key in this.paper.customAttributes) if (this.paper.customAttributes[has](key) && params[has](key) && R.is(this.paper.customAttributes[key], "function")) {
+				var par = this.paper.customAttributes[key].apply(this, [].concat(params[key]));
+				this.attrs[key] = params[key];
+				for (var subkey in par) if (par[has](subkey)) {
+					params[subkey] = par[subkey];
+				}
+			}
+			// this.paper.canvas.style.display = "none";
+			if (params.text && this.type == "text") {
+				this.textpath.string = params.text;
+			}
+			setFillAndStroke(this, params);
+			// this.paper.canvas.style.display = E;
+		}
+		return this;
+	};
+	elproto.toFront = function () {
+		!this.removed && this.node.parentNode.appendChild(this.node);
+		this.paper && this.paper.top != this && R._tofront(this, this.paper);
+		return this;
+	};
+	elproto.toBack = function () {
+		if (this.removed) {
+			return this;
+		}
+		if (this.node.parentNode.firstChild != this.node) {
+			this.node.parentNode.insertBefore(this.node, this.node.parentNode.firstChild);
+			R._toback(this, this.paper);
+		}
+		return this;
+	};
+	elproto.insertAfter = function (element) {
+		if (this.removed) {
+			return this;
+		}
+		if (element.constructor == R.st.constructor) {
+			element = element[element.length - 1];
+		}
+		if (element.node.nextSibling) {
+			element.node.parentNode.insertBefore(this.node, element.node.nextSibling);
+		} else {
+			element.node.parentNode.appendChild(this.node);
+		}
+		R._insertafter(this, element, this.paper);
+		return this;
+	};
+	elproto.insertBefore = function (element) {
+		if (this.removed) {
+			return this;
+		}
+		if (element.constructor == R.st.constructor) {
+			element = element[0];
+		}
+		element.node.parentNode.insertBefore(this.node, element.node);
+		R._insertbefore(this, element, this.paper);
+		return this;
+	};
+	elproto.blur = function (size) {
+		var s = this.node.runtimeStyle,
+			f = s.filter;
+		f = f.replace(blurregexp, E);
+		if (+size !== 0) {
+			this.attrs.blur = size;
+			s.filter = f + S + ms + ".Blur(pixelradius=" + (+size || 1.5) + ")";
+			s.margin = R.format("-{0}px 0 0 -{0}px", round(+size || 1.5));
+		} else {
+			s.filter = f;
+			s.margin = 0;
+			delete this.attrs.blur;
+		}
+	};
+
+	R._engine.path = function (pathString, vml) {
+		var el = createNode("shape");
+		el.style.cssText = cssDot;
+		el.coordsize = zoom + S + zoom;
+		el.coordorigin = vml.coordorigin;
+		var p = new Element(el, vml),
+			attr = {fill: "none", stroke: "#000"};
+		pathString && (attr.path = pathString);
+		p.type = "path";
+		p.path = [];
+		p.Path = E;
+		setFillAndStroke(p, attr);
+		vml.canvas.appendChild(el);
+		var skew = createNode("skew");
+		skew.on = true;
+		el.appendChild(skew);
+		p.skew = skew;
+		p.transform(E);
+		return p;
+	};
+	R._engine.rect = function (vml, x, y, w, h, r) {
+		var path = R._rectPath(x, y, w, h, r),
+			res = vml.path(path),
+			a = res.attrs;
+		res.X = a.x = x;
+		res.Y = a.y = y;
+		res.W = a.width = w;
+		res.H = a.height = h;
+		a.r = r;
+		a.path = path;
+		res.type = "rect";
+		return res;
+	};
+	R._engine.ellipse = function (vml, x, y, rx, ry) {
+		var res = vml.path(),
+			a = res.attrs;
+		res.X = x - rx;
+		res.Y = y - ry;
+		res.W = rx * 2;
+		res.H = ry * 2;
+		res.type = "ellipse";
+		setFillAndStroke(res, {
+			cx: x,
+			cy: y,
+			rx: rx,
+			ry: ry
+		});
+		return res;
+	};
+	R._engine.circle = function (vml, x, y, r) {
+		var res = vml.path(),
+			a = res.attrs;
+		res.X = x - r;
+		res.Y = y - r;
+		res.W = res.H = r * 2;
+		res.type = "circle";
+		setFillAndStroke(res, {
+			cx: x,
+			cy: y,
+			r: r
+		});
+		return res;
+	};
+	R._engine.image = function (vml, src, x, y, w, h) {
+		var path = R._rectPath(x, y, w, h),
+			res = vml.path(path).attr({stroke: "none"}),
+			a = res.attrs,
+			node = res.node,
+			fill = node.getElementsByTagName(fillString)[0];
+		a.src = src;
+		res.X = a.x = x;
+		res.Y = a.y = y;
+		res.W = a.width = w;
+		res.H = a.height = h;
+		a.path = path;
+		res.type = "image";
+		fill.parentNode == node && node.removeChild(fill);
+		fill.rotate = true;
+		fill.src = src;
+		fill.type = "tile";
+		res._.fillpos = [x, y];
+		res._.fillsize = [w, h];
+		node.appendChild(fill);
+		setCoords(res, 1, 1, 0, 0, 0);
+		return res;
+	};
+	R._engine.text = function (vml, x, y, text) {
+		var el = createNode("shape"),
+			path = createNode("path"),
+			o = createNode("textpath");
+		x = x || 0;
+		y = y || 0;
+		text = text || "";
+		path.v = R.format("m{0},{1}l{2},{1}", round(x * zoom), round(y * zoom), round(x * zoom) + 1);
+		path.textpathok = true;
+		o.string = Str(text);
+		o.on = true;
+		el.style.cssText = cssDot;
+		el.coordsize = zoom + S + zoom;
+		el.coordorigin = "0 0";
+		var p = new Element(el, vml),
+			attr = {
+				fill: "#000",
+				stroke: "none",
+				font: R._availableAttrs.font,
+				text: text
+			};
+		p.shape = el;
+		p.path = path;
+		p.textpath = o;
+		p.type = "text";
+		p.attrs.text = Str(text);
+		p.attrs.x = x;
+		p.attrs.y = y;
+		p.attrs.w = 1;
+		p.attrs.h = 1;
+		setFillAndStroke(p, attr);
+		el.appendChild(o);
+		el.appendChild(path);
+		vml.canvas.appendChild(el);
+		var skew = createNode("skew");
+		skew.on = true;
+		el.appendChild(skew);
+		p.skew = skew;
+		p.transform(E);
+		return p;
+	};
+	R._engine.setSize = function (width, height) {
+		var cs = this.canvas.style;
+		this.width = width;
+		this.height = height;
+		width == +width && (width += "px");
+		height == +height && (height += "px");
+		cs.width = width;
+		cs.height = height;
+		cs.clip = "rect(0 " + width + " " + height + " 0)";
+		if (this._viewBox) {
+			R._engine.setViewBox.apply(this, this._viewBox);
+		}
+		return this;
+	};
+	R._engine.setViewBox = function (x, y, w, h, fit) {
+		R.eve("raphael.setViewBox", this, this._viewBox, [x, y, w, h, fit]);
+		var width = this.width,
+			height = this.height,
+			size = 1 / mmax(w / width, h / height),
+			H, W;
+		if (fit) {
+			H = height / h;
+			W = width / w;
+			if (w * H < width) {
+				x -= (width - w * H) / 2 / H;
+			}
+			if (h * W < height) {
+				y -= (height - h * W) / 2 / W;
+			}
+		}
+		this._viewBox = [x, y, w, h, !!fit];
+		this._viewBoxShift = {
+			dx: -x,
+			dy: -y,
+			scale: size
+		};
+		this.forEach(function (el) {
+			el.transform("...");
+		});
+		return this;
+	};
+	var createNode;
+	R._engine.initWin = function (win) {
+		var doc = win.document;
+		doc.createStyleSheet().addRule(".rvml", "behavior:url(#default#VML)");
+		try {
+			!doc.namespaces.rvml && doc.namespaces.add("rvml", "urn:schemas-microsoft-com:vml");
+			createNode = function (tagName) {
+				return doc.createElement('<rvml:' + tagName + ' class="rvml">');
+			};
+		} catch (e) {
+			createNode = function (tagName) {
+				return doc.createElement('<' + tagName + ' xmlns="urn:schemas-microsoft.com:vml" class="rvml">');
+			};
+		}
+	};
+	R._engine.initWin(R._g.win);
+	R._engine.create = function () {
+		var con = R._getContainer.apply(0, arguments),
+			container = con.container,
+			height = con.height,
+			s,
+			width = con.width,
+			x = con.x,
+			y = con.y;
+		if (!container) {
+			throw new Error("VML container not found.");
+		}
+		var res = new R._Paper,
+			c = res.canvas = R._g.doc.createElement("div"),
+			cs = c.style;
+		x = x || 0;
+		y = y || 0;
+		width = width || 512;
+		height = height || 342;
+		res.width = width;
+		res.height = height;
+		width == +width && (width += "px");
+		height == +height && (height += "px");
+		res.coordsize = zoom * 1e3 + S + zoom * 1e3;
+		res.coordorigin = "0 0";
+		res.span = R._g.doc.createElement("span");
+		res.span.style.cssText = "position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;";
+		c.appendChild(res.span);
+		cs.cssText = R.format("top:0;left:0;width:{0};height:{1};display:inline-block;position:relative;clip:rect(0 {0} {1} 0);overflow:hidden", width, height);
+		if (container == 1) {
+			R._g.doc.body.appendChild(c);
+			cs.left = x + "px";
+			cs.top = y + "px";
+			cs.position = "absolute";
+		} else {
+			if (container.firstChild) {
+				container.insertBefore(c, container.firstChild);
+			} else {
+				container.appendChild(c);
+			}
+		}
+		res.renderfix = function () {
+		};
+		return res;
+	};
+	R.prototype.clear = function () {
+		R.eve("raphael.clear", this);
+		this.canvas.innerHTML = E;
+		this.span = R._g.doc.createElement("span");
+		this.span.style.cssText = "position:absolute;left:-9999em;top:-9999em;padding:0;margin:0;line-height:1;display:inline;";
+		this.canvas.appendChild(this.span);
+		this.bottom = this.top = null;
+	};
+	R.prototype.remove = function () {
+		R.eve("raphael.remove", this);
+		this.canvas.parentNode.removeChild(this.canvas);
+		for (var i in this) {
+			this[i] = typeof this[i] == "function" ? R._removedFactory(i) : null;
+		}
+		return true;
+	};
+
+	var setproto = R.st;
+	for (var method in elproto) if (elproto[has](method) && !setproto[has](method)) {
+		setproto[method] = (function (methodname) {
+			return function () {
+				var arg = arguments;
+				return this.forEach(function (el) {
+					el[methodname].apply(el, arg);
+				});
+			};
+		})(method);
+	}
+}(window.Raphael);
diff --git a/len-activiti/src/main/resources/static/diagram-viewer/js/textlayout.js b/len-activiti/src/main/resources/static/diagram-viewer/js/textlayout.js
index 1740960..df21540 100644
--- a/len-activiti/src/main/resources/static/diagram-viewer/js/textlayout.js
+++ b/len-activiti/src/main/resources/static/diagram-viewer/js/textlayout.js
@@ -1,441 +1,450 @@
-	window.onload = function () {
-			var paper = Raphael("holder");
-
-			//var curve = paper.ellipse(100, 100, 1, 1).attr({"stroke-width": 0, fill: Color.red});
-			
-			var text = "Betty Botter bought some butter but, she said, the butter's bitter. If I put it in my batter, it will make my batter bitter. But a bit of better butter will make my batter better. So, she bought a bit of butter, better than her bitter butter, and she put it in her batter, and the batter was not bitter. It was better Betty Botter bought a bit better butter.";
-			var font = {font: "11px Arial", "font-style":"italic", opacity: 1, "fill": LABEL_COLOR, stroke: LABEL_COLOR, "stroke-width":.3};
-			var font = {font: "11px Arial", opacity: 1, "fill": LABEL_COLOR};
-			var boxWidth = 100
-			
-			var AttributedStringIterator = function(text){
-				//this.text = this.rtrim(this.ltrim(text));
-				text = text.replace(/(\s)+/, " ");
-				this.text = this.rtrim(text);
-				/*
-				if (beginIndex < 0 || beginIndex > endIndex || endIndex > length()) {
-					throw new IllegalArgumentException("Invalid substring range");
-				}
-				*/
-				this.beginIndex = 0;
-				this.endIndex = this.text.length;
-				this.currentIndex = this.beginIndex;
-				
-				//console.group("[AttributedStringIterator]");
-				var i = 0;
-				var string = this.text;
-				var fullPos = 0;
-				
-				//console.log("string: \"" + string + "\", length: " + string.length);
-				this.startWordOffsets = [];
-				this.startWordOffsets.push(fullPos);
-				
-				// TODO: remove i 1000
-				while (i<1000) {
-					var pos = string.search(/[ \t\n\f-\.\,]/);
-					if (pos == -1)
-						break;
-					
-					// whitespace start
-					fullPos += pos;
-					string = string.substr(pos);
-					////console.log("fullPos: " + fullPos + ", pos: " + pos +  ", string: ", string);
-					
-					// remove whitespaces
-					var pos = string.search(/[^ \t\n\f-\.\,]/);
-					if (pos == -1)
-						break;
-						
-					// whitespace end
-					fullPos += pos;
-					string = string.substr(pos);
-					
-					////console.log("fullPos: " + fullPos);
-					this.startWordOffsets.push(fullPos);
-					
-					i++;
-				}
-				//console.log("startWordOffsets: ", this.startWordOffsets);
-				//console.groupEnd();
-			};
-			AttributedStringIterator.prototype = {
-				getEndIndex: function(pos){
-					if (typeof(pos) == "undefined")
-						return this.endIndex;
-						
-					var string = this.text.substr(pos, this.endIndex - pos);
-					
-					var posEndOfLine = string.search(/[\n]/);
-					if (posEndOfLine == -1)
-						return this.endIndex;
-					else
-						return pos + posEndOfLine;
-				},
-				getBeginIndex: function(){
-					return this.beginIndex;
-				},
-				isWhitespace: function(pos){
-					var str = this.text[pos];
-					var whitespaceChars = " \t\n\f";
-					
-					return (whitespaceChars.indexOf(str) != -1);
-				},
-				isNewLine: function(pos){
-					var str = this.text[pos];
-					var whitespaceChars = "\n";
-					
-					return (whitespaceChars.indexOf(str) != -1);
-				},
-				preceding: function(pos){
-					//console.group("[AttributedStringIterator.preceding]");
-					for(var i in this.startWordOffsets) {
-						var startWordOffset = this.startWordOffsets[i];
-						if (pos < startWordOffset && i>0) {
-							//console.log("startWordOffset: " + this.startWordOffsets[i-1]);
-							//console.groupEnd();
-							return this.startWordOffsets[i-1];
-						}
-					}
-					//console.log("pos: " + pos);
+window.onload = function () {
+	var paper = Raphael("holder");
+
+	//var curve = paper.ellipse(100, 100, 1, 1).attr({"stroke-width": 0, fill: Color.red});
+
+	var text = "Betty Botter bought some butter but, she said, the butter's bitter. If I put it in my batter, it will make my batter bitter. But a bit of better butter will make my batter better. So, she bought a bit of butter, better than her bitter butter, and she put it in her batter, and the batter was not bitter. It was better Betty Botter bought a bit better butter.";
+	var font = {
+		font: "11px Arial",
+		"font-style": "italic",
+		opacity: 1,
+		"fill": LABEL_COLOR,
+		stroke: LABEL_COLOR,
+		"stroke-width": .3
+	};
+	var font = {font: "11px Arial", opacity: 1, "fill": LABEL_COLOR};
+	var boxWidth = 100
+
+	var AttributedStringIterator = function (text) {
+		//this.text = this.rtrim(this.ltrim(text));
+		text = text.replace(/(\s)+/, " ");
+		this.text = this.rtrim(text);
+		/*
+		if (beginIndex < 0 || beginIndex > endIndex || endIndex > length()) {
+			throw new IllegalArgumentException("Invalid substring range");
+		}
+		*/
+		this.beginIndex = 0;
+		this.endIndex = this.text.length;
+		this.currentIndex = this.beginIndex;
+
+		//console.group("[AttributedStringIterator]");
+		var i = 0;
+		var string = this.text;
+		var fullPos = 0;
+
+		//console.log("string: \"" + string + "\", length: " + string.length);
+		this.startWordOffsets = [];
+		this.startWordOffsets.push(fullPos);
+
+		// TODO: remove i 1000
+		while (i < 1000) {
+			var pos = string.search(/[ \t\n\f-\.\,]/);
+			if (pos == -1)
+				break;
+
+			// whitespace start
+			fullPos += pos;
+			string = string.substr(pos);
+			////console.log("fullPos: " + fullPos + ", pos: " + pos +  ", string: ", string);
+
+			// remove whitespaces
+			var pos = string.search(/[^ \t\n\f-\.\,]/);
+			if (pos == -1)
+				break;
+
+			// whitespace end
+			fullPos += pos;
+			string = string.substr(pos);
+
+			////console.log("fullPos: " + fullPos);
+			this.startWordOffsets.push(fullPos);
+
+			i++;
+		}
+		//console.log("startWordOffsets: ", this.startWordOffsets);
+		//console.groupEnd();
+	};
+	AttributedStringIterator.prototype = {
+		getEndIndex: function (pos) {
+			if (typeof (pos) == "undefined")
+				return this.endIndex;
+
+			var string = this.text.substr(pos, this.endIndex - pos);
+
+			var posEndOfLine = string.search(/[\n]/);
+			if (posEndOfLine == -1)
+				return this.endIndex;
+			else
+				return pos + posEndOfLine;
+		},
+		getBeginIndex: function () {
+			return this.beginIndex;
+		},
+		isWhitespace: function (pos) {
+			var str = this.text[pos];
+			var whitespaceChars = " \t\n\f";
+
+			return (whitespaceChars.indexOf(str) != -1);
+		},
+		isNewLine: function (pos) {
+			var str = this.text[pos];
+			var whitespaceChars = "\n";
+
+			return (whitespaceChars.indexOf(str) != -1);
+		},
+		preceding: function (pos) {
+			//console.group("[AttributedStringIterator.preceding]");
+			for (var i in this.startWordOffsets) {
+				var startWordOffset = this.startWordOffsets[i];
+				if (pos < startWordOffset && i > 0) {
+					//console.log("startWordOffset: " + this.startWordOffsets[i-1]);
 					//console.groupEnd();
-					return this.startWordOffsets[i];
-				},
-				following: function(pos){
-					//console.group("[AttributedStringIterator.following]");
-					for(var i in this.startWordOffsets) {
-						var startWordOffset = this.startWordOffsets[i];
-						if (pos < startWordOffset && i>0) {
-							//console.log("startWordOffset: " + this.startWordOffsets[i]);
-							//console.groupEnd();
-							return this.startWordOffsets[i];
-						}
-					}
-					//console.log("pos: " + pos);
+					return this.startWordOffsets[i - 1];
+				}
+			}
+			//console.log("pos: " + pos);
+			//console.groupEnd();
+			return this.startWordOffsets[i];
+		},
+		following: function (pos) {
+			//console.group("[AttributedStringIterator.following]");
+			for (var i in this.startWordOffsets) {
+				var startWordOffset = this.startWordOffsets[i];
+				if (pos < startWordOffset && i > 0) {
+					//console.log("startWordOffset: " + this.startWordOffsets[i]);
 					//console.groupEnd();
 					return this.startWordOffsets[i];
-				},
-				ltrim: function(str){
-					var patt2=/^\s+/g;
-					return str.replace(patt2, "");
-				}, 
-				rtrim: function(str){
-					var patt2=/\s+$/g;
-					return str.replace(patt2, "");
-				},
-				getLayout: function(start, limit){
-					return this.text.substr(start, limit - start);
-				},
-				getCharAtPos: function(pos) {
-					return this.text[pos];
-				}
-			};
-			
-			/*
-			var TextMeasurer = function(paper, text, fontAttrs){
-				this.text = text;
-				this.paper = paper;
-				this.fontAttrs = fontAttrs;
-				
-				this.fStart = this.text.getBeginIndex();
-
-			};
-			TextMeasurer.prototype = {
-				getLineBreakIndex: function(start, maxAdvance){
-					var localStart = start - this.fStart;
-				},
-				getLayout: function(){
 				}
 			}
-			*/
-			
-			
-			var LineBreakMeasurer = function(paper, text, fontAttrs){
-				this.paper = paper;
-				this.text = new AttributedStringIterator(text);
-				this.fontAttrs = fontAttrs;
-				
-				if (this.text.getEndIndex() - this.text.getBeginIndex() < 1) {
-					throw {message: "Text must contain at least one character.", code: "IllegalArgumentException"};
+			//console.log("pos: " + pos);
+			//console.groupEnd();
+			return this.startWordOffsets[i];
+		},
+		ltrim: function (str) {
+			var patt2 = /^\s+/g;
+			return str.replace(patt2, "");
+		},
+		rtrim: function (str) {
+			var patt2 = /\s+$/g;
+			return str.replace(patt2, "");
+		},
+		getLayout: function (start, limit) {
+			return this.text.substr(start, limit - start);
+		},
+		getCharAtPos: function (pos) {
+			return this.text[pos];
+		}
+	};
+
+	/*
+	var TextMeasurer = function(paper, text, fontAttrs){
+		this.text = text;
+		this.paper = paper;
+		this.fontAttrs = fontAttrs;
+
+		this.fStart = this.text.getBeginIndex();
+
+	};
+	TextMeasurer.prototype = {
+		getLineBreakIndex: function(start, maxAdvance){
+			var localStart = start - this.fStart;
+		},
+		getLayout: function(){
+		}
+	}
+	*/
+
+
+	var LineBreakMeasurer = function (paper, text, fontAttrs) {
+		this.paper = paper;
+		this.text = new AttributedStringIterator(text);
+		this.fontAttrs = fontAttrs;
+
+		if (this.text.getEndIndex() - this.text.getBeginIndex() < 1) {
+			throw {message: "Text must contain at least one character.", code: "IllegalArgumentException"};
+		}
+
+		//this.measurer = new TextMeasurer(paper, this.text, this.fontAttrs);
+		this.limit = this.text.getEndIndex();
+		this.pos = this.start = this.text.getBeginIndex();
+
+		this.rafaelTextObject = this.paper.text(100, 100, this.text.text).attr(fontAttrs).attr("text-anchor", "start");
+		this.svgTextObject = this.rafaelTextObject[0];
+	};
+	LineBreakMeasurer.prototype = {
+		nextOffset: function (wrappingWidth, offsetLimit, requireNextWord) {
+			//console.group("[nextOffset]");
+			var nextOffset = this.pos;
+			if (this.pos < this.limit) {
+				if (offsetLimit <= this.pos) {
+					throw {message: "offsetLimit must be after current position", code: "IllegalArgumentException"};
 				}
-				
-				//this.measurer = new TextMeasurer(paper, this.text, this.fontAttrs);
-				this.limit = this.text.getEndIndex();
-				this.pos = this.start = this.text.getBeginIndex();
-				
-				this.rafaelTextObject = this.paper.text(100, 100, this.text.text).attr(fontAttrs).attr("text-anchor", "start");
-				this.svgTextObject = this.rafaelTextObject[0];
-			};
-			LineBreakMeasurer.prototype = {
-				nextOffset: function(wrappingWidth, offsetLimit, requireNextWord) {
-					//console.group("[nextOffset]");
-					var nextOffset = this.pos;
-					if (this.pos < this.limit) {
-						if (offsetLimit <= this.pos) {
-							throw {message: "offsetLimit must be after current position", code: "IllegalArgumentException"};
-						}
-						
-						var charAtMaxAdvance = this.getLineBreakIndex(this.pos, wrappingWidth);
-						//charAtMaxAdvance --;
-						//console.log("charAtMaxAdvance:", charAtMaxAdvance, ", [" + this.text.getCharAtPos(charAtMaxAdvance) + "]");
-						
-						if (charAtMaxAdvance == this.limit) {
-							nextOffset = this.limit;
-							//console.log("charAtMaxAdvance == this.limit");
-						} else if (this.text.isNewLine(charAtMaxAdvance)) {
-							console.log("isNewLine");
-							nextOffset = charAtMaxAdvance+1;
-						} else if (this.text.isWhitespace(charAtMaxAdvance)) {
-							// TODO: find next noSpaceChar
-							//return nextOffset;
-							nextOffset = this.text.following(charAtMaxAdvance);
-						} else {
-							// Break is in a word;  back up to previous break.
-							/*
-							var testPos = charAtMaxAdvance + 1;
-							if (testPos == this.limit) {
-								console.error("hbz...");
-							} else {
-								nextOffset = this.text.preceding(charAtMaxAdvance);
-							}
-							*/
-							nextOffset = this.text.preceding(charAtMaxAdvance);
-							
-							if (nextOffset <= this.pos) {
-								nextOffset = Math.max(this.pos+1, charAtMaxAdvance);
-							}
-						}
-					}
-					if (nextOffset > offsetLimit) {
-						nextOffset = offsetLimit;
-					}
-					//console.log("nextOffset: " + nextOffset);
-					//console.groupEnd();
-					return nextOffset;
-				},
-				nextLayout: function(wrappingWidth) {
-					//console.groupCollapsed("[nextLayout]");
-					if (this.pos < this.limit) {
-						var requireNextWord = false;
-						var layoutLimit = this.nextOffset(wrappingWidth, this.limit, requireNextWord);
-						//console.log("layoutLimit:", layoutLimit);
-						if (layoutLimit == this.pos) {
-							//console.groupEnd();
-							return null;
-						}
-						var result = this.text.getLayout(this.pos, layoutLimit);
-						//console.log("layout: \"" + result + "\"");
-						
-						// remove end of line
-						
-						//var posEndOfLine = this.text.getEndIndex(this.pos);
-						//if (posEndOfLine < result.length)
-						//	result = result.substr(0, posEndOfLine);
-						
-						this.pos = layoutLimit;
-						
-						//console.groupEnd();
-						return result;
+
+				var charAtMaxAdvance = this.getLineBreakIndex(this.pos, wrappingWidth);
+				//charAtMaxAdvance --;
+				//console.log("charAtMaxAdvance:", charAtMaxAdvance, ", [" + this.text.getCharAtPos(charAtMaxAdvance) + "]");
+
+				if (charAtMaxAdvance == this.limit) {
+					nextOffset = this.limit;
+					//console.log("charAtMaxAdvance == this.limit");
+				} else if (this.text.isNewLine(charAtMaxAdvance)) {
+					console.log("isNewLine");
+					nextOffset = charAtMaxAdvance + 1;
+				} else if (this.text.isWhitespace(charAtMaxAdvance)) {
+					// TODO: find next noSpaceChar
+					//return nextOffset;
+					nextOffset = this.text.following(charAtMaxAdvance);
+				} else {
+					// Break is in a word;  back up to previous break.
+					/*
+					var testPos = charAtMaxAdvance + 1;
+					if (testPos == this.limit) {
+						console.error("hbz...");
 					} else {
-						//console.groupEnd();
-						return null;
-					}
-				},
-				getLineBreakIndex: function(pos, wrappingWidth) {
-					//console.group("[getLineBreakIndex]");
-					//console.log("pos:"+pos + ", text: \""+ this.text.text.replace(/\n/g, "_").substr(pos, 1) + "\"");
-					
-					var bb = this.rafaelTextObject.getBBox();
-					
-					var charNum = -1;
-					try {
-						var svgPoint = this.svgTextObject.getStartPositionOfChar(pos);
-						//var dot = this.paper.ellipse(svgPoint.x, svgPoint.y, 1, 1).attr({"stroke-width": 0, fill: Color.blue});
-						svgPoint.x = svgPoint.x + wrappingWidth;
-						//svgPoint.y = bb.y;
-						//console.log("svgPoint:", svgPoint);
-					
-						//var dot = this.paper.ellipse(svgPoint.x, svgPoint.y, 1, 1).attr({"stroke-width": 0, fill: Color.red});
-					
-						charNum = this.svgTextObject.getCharNumAtPosition(svgPoint);
-					} catch (e){
-						console.warn("getStartPositionOfChar error, pos:" + pos);
-						/*
-						var testPos = pos + 1;
-						if (testPos < this.limit) {
-							return testPos
-						}
-						*/
+						nextOffset = this.text.preceding(charAtMaxAdvance);
 					}
-					//console.log("charNum:", charNum);
-					if (charNum == -1) {
-						//console.groupEnd();
-						return this.text.getEndIndex(pos);
-					} else {
-						// When case there is new line between pos and charnum then use this new line
-						var newLineIndex = this.text.getEndIndex(pos);
-						if (newLineIndex < charNum ) {
-							console.log("newLineIndex <= charNum, newLineIndex:"+newLineIndex+", charNum:"+charNum, "\"" + this.text.text.substr(newLineIndex+1).replace(/\n/g, "↵") + "\"");
-							//console.groupEnd();
-							
-							return newLineIndex;
-						}
-							
-						//var charAtMaxAdvance  = this.text.text.substring(charNum, charNum + 1);
-						var charAtMaxAdvance  = this.text.getCharAtPos(charNum);
-						//console.log("!!charAtMaxAdvance: " + charAtMaxAdvance);
-						//console.groupEnd();
-						return charNum;
+					*/
+					nextOffset = this.text.preceding(charAtMaxAdvance);
+
+					if (nextOffset <= this.pos) {
+						nextOffset = Math.max(this.pos + 1, charAtMaxAdvance);
 					}
-				}, 
-				getPosition: function() {
-					return this.pos;
 				}
-			};
-			
-			
-			
-			// ******
-			function drawMultilineText(text, x, y, boxWidth, boxHeight, options) {
-				var TEXT_PADDING = 3;
-				var width = boxWidth - (2 * TEXT_PADDING);
-				if (boxHeight)
-					var height = boxHeight - (2 * TEXT_PADDING);
-			
-				var layouts = [];
-				
-				var measurer = new LineBreakMeasurer(paper, text, font);
-				var lineHeight = measurer.rafaelTextObject.getBBox().height;
-				console.log("text: ", text.replace(/\n/g, "↵"));
-				
-				if (height) {
-					var availableLinesCount = parseInt(height/lineHeight);
-					console.log("availableLinesCount: " + availableLinesCount);
+			}
+			if (nextOffset > offsetLimit) {
+				nextOffset = offsetLimit;
+			}
+			//console.log("nextOffset: " + nextOffset);
+			//console.groupEnd();
+			return nextOffset;
+		},
+		nextLayout: function (wrappingWidth) {
+			//console.groupCollapsed("[nextLayout]");
+			if (this.pos < this.limit) {
+				var requireNextWord = false;
+				var layoutLimit = this.nextOffset(wrappingWidth, this.limit, requireNextWord);
+				//console.log("layoutLimit:", layoutLimit);
+				if (layoutLimit == this.pos) {
+					//console.groupEnd();
+					return null;
 				}
-				
-				var i = 1;
-				while (measurer.getPosition() < measurer.text.getEndIndex()) {
-					var layout = measurer.nextLayout(width);
-					//console.log("LAYOUT: " + layout + ", getPosition: " + measurer.getPosition());
-					
-					if (layout != null) {
-						if (!availableLinesCount || i < availableLinesCount) {
-							layouts.push(layout);
-						} else {
-							layouts.push(fitTextToWidth(layout + "...", boxWidth));
-							break;
-						}
-					}
-					i++;
-				};
-				console.log(layouts);
-				
-				measurer.rafaelTextObject.attr({"text": layouts.join("\n")});
-				//measurer.rafaelTextObject.attr({"text-anchor": "end"});
-				//measurer.rafaelTextObject.attr({"text-anchor": "middle"});
-				if (options)
-					measurer.rafaelTextObject.attr({"text-anchor": options["text-anchor"]});
-					
-				var bb = measurer.rafaelTextObject.getBBox();
-				//measurer.rafaelTextObject.attr({"x": x + boxWidth/2});
-				if (options["vertical-align"] == "top")
-					measurer.rafaelTextObject.attr({"y": y + bb.height/2 + TEXT_PADDING});
-				else
-					measurer.rafaelTextObject.attr({"y": y + height/2});
-				//var bb = measurer.rafaelTextObject.getBBox();
-				
-				if (measurer.rafaelTextObject.attr("text-anchor") == "middle" )
-					measurer.rafaelTextObject.attr("x",  x + boxWidth/2 + TEXT_PADDING/2);
-				else if (measurer.rafaelTextObject.attr("text-anchor") == "end" )
-					measurer.rafaelTextObject.attr("x",  x + boxWidth + TEXT_PADDING/2);
-				else 
-					measurer.rafaelTextObject.attr("x", x + boxWidth/2 - bb.width/2 + TEXT_PADDING/2);
-				
-				var boxStyle = {stroke: Color.LightSteelBlue2, "stroke-width": 1.0, "stroke-dasharray": "- "};
-				/*
-				var box = paper.rect(x+.0 + boxWidth/2 - bb.width/2+ TEXT_PADDING/2, y + .5 + boxHeight/2 - bb.height/2, width, height).attr(boxStyle);
-				box.attr("height", bb.height);
-				*/
-				//var box = paper.rect(bb.x - .5 + bb.width/2 + TEXT_PADDING, bb.y + bb.height/2, bb.width, bb.height).attr(boxStyle);
-				
-				var textAreaCX = x + boxWidth/2;
-				var textAreaCY = y + height/2;
-				var dotLeftTop = paper.ellipse(x, y, 3, 3).attr({"stroke-width": 0, fill: Color.LightSteelBlue, stroke: "none"});
-				var dotCenter = paper.ellipse(textAreaCX, textAreaCY, 3, 3).attr({fill: Color.LightSteelBlue2, stroke: "none"});
+				var result = this.text.getLayout(this.pos, layoutLimit);
+				//console.log("layout: \"" + result + "\"");
+
+				// remove end of line
 
+				//var posEndOfLine = this.text.getEndIndex(this.pos);
+				//if (posEndOfLine < result.length)
+				//	result = result.substr(0, posEndOfLine);
+
+				this.pos = layoutLimit;
+
+				//console.groupEnd();
+				return result;
+			} else {
+				//console.groupEnd();
+				return null;
+			}
+		},
+		getLineBreakIndex: function (pos, wrappingWidth) {
+			//console.group("[getLineBreakIndex]");
+			//console.log("pos:"+pos + ", text: \""+ this.text.text.replace(/\n/g, "_").substr(pos, 1) + "\"");
+
+			var bb = this.rafaelTextObject.getBBox();
+
+			var charNum = -1;
+			try {
+				var svgPoint = this.svgTextObject.getStartPositionOfChar(pos);
+				//var dot = this.paper.ellipse(svgPoint.x, svgPoint.y, 1, 1).attr({"stroke-width": 0, fill: Color.blue});
+				svgPoint.x = svgPoint.x + wrappingWidth;
+				//svgPoint.y = bb.y;
+				//console.log("svgPoint:", svgPoint);
+
+				//var dot = this.paper.ellipse(svgPoint.x, svgPoint.y, 1, 1).attr({"stroke-width": 0, fill: Color.red});
+
+				charNum = this.svgTextObject.getCharNumAtPosition(svgPoint);
+			} catch (e) {
+				console.warn("getStartPositionOfChar error, pos:" + pos);
 				/*
-				// real bbox
-				var bb = measurer.rafaelTextObject.getBBox();
-				var rect = paper.rect(bb.x+.5, bb.y + .5, bb.width, bb.height).attr({"stroke-width": 1});
+				var testPos = pos + 1;
+				if (testPos < this.limit) {
+					return testPos
+				}
 				*/
-				var boxStyle = {stroke: Color.LightSteelBlue2, "stroke-width": 1.0, "stroke-dasharray": "- "};
-				var rect = paper.rect(x+.5, y + .5, boxWidth, boxHeight).attr(boxStyle);
-			}
-			
-			
-			
-			
-			/*
-			for (var i=0; i<1; i++) {
-				var t = text;
-				//var t = "Высококвалифицирова";
-				
-				var text = paper.text(300, 100, t).attr(font).attr("text-anchor", "start");
-				var bbText = text.getBBox();
-				paper.rect(300+.5, 100 + .5, bbText.width, bbText.height).attr({"stroke-width": 1});
-				console.log("t: ", t.replace(/\n/g, "↵"));
-				
-				while (measurer.getPosition() < measurer.text.getEndIndex()) {
-					var layout = measurer.nextLayout(width);
-					//console.log("LAYOUT: " + layout + ", getPosition: " + measurer.getPosition());
-					if (layout != null)
-						layouts.push(layout);
-				};
-				
-				measurer.rafaelTextObject.attr("text", layouts.join("\n"));
-				var bb = measurer.rafaelTextObject.getBBox();
-				var rect = paper.rect(bb.x+.5, bb.y + .5, bb.width, bb.height).attr({"stroke-width": 1});
-				
-				lay.push(layouts);
-				console.log(layouts);
 			}
-			*/
-			
-			
-			var fitTextToWidth = function(original, width) {
-				var text = original;
-
-				// TODO: move attr on parameters
-				var attr = {font: "11px Arial", opacity: 0};
-				
-				// remove length for "..."
-				var dots = paper.text(0, 0, "...").attr(attr).hide();
-				var dotsBB = dots.getBBox();
-				
-				var maxWidth = width - dotsBB.width;
-				
-				var textElement = paper.text(0, 0, text).attr(attr).hide();
-				var bb = textElement.getBBox();
-				
-				// it's a little bit incorrect with "..."
-				while (bb.width > maxWidth && text.length > 0) {
-					text = text.substring(0, text.length - 1);
-					textElement.attr({"text": text});
-					bb = textElement.getBBox();
-				}
+			//console.log("charNum:", charNum);
+			if (charNum == -1) {
+				//console.groupEnd();
+				return this.text.getEndIndex(pos);
+			} else {
+				// When case there is new line between pos and charnum then use this new line
+				var newLineIndex = this.text.getEndIndex(pos);
+				if (newLineIndex < charNum) {
+					console.log("newLineIndex <= charNum, newLineIndex:" + newLineIndex + ", charNum:" + charNum, "\"" + this.text.text.substr(newLineIndex + 1).replace(/\n/g, "↵") + "\"");
+					//console.groupEnd();
 
-				// remove element from paper
-				textElement.remove();
-				
-				if (text != original) {
-					text = text + "...";
+					return newLineIndex;
 				}
 
-				return text;
+				//var charAtMaxAdvance  = this.text.text.substring(charNum, charNum + 1);
+				var charAtMaxAdvance = this.text.getCharAtPos(charNum);
+				//console.log("!!charAtMaxAdvance: " + charAtMaxAdvance);
+				//console.groupEnd();
+				return charNum;
+			}
+		},
+		getPosition: function () {
+			return this.pos;
+		}
+	};
+
+
+	// ******
+	function drawMultilineText(text, x, y, boxWidth, boxHeight, options) {
+		var TEXT_PADDING = 3;
+		var width = boxWidth - (2 * TEXT_PADDING);
+		if (boxHeight)
+			var height = boxHeight - (2 * TEXT_PADDING);
+
+		var layouts = [];
+
+		var measurer = new LineBreakMeasurer(paper, text, font);
+		var lineHeight = measurer.rafaelTextObject.getBBox().height;
+		console.log("text: ", text.replace(/\n/g, "↵"));
+
+		if (height) {
+			var availableLinesCount = parseInt(height / lineHeight);
+			console.log("availableLinesCount: " + availableLinesCount);
+		}
+
+		var i = 1;
+		while (measurer.getPosition() < measurer.text.getEndIndex()) {
+			var layout = measurer.nextLayout(width);
+			//console.log("LAYOUT: " + layout + ", getPosition: " + measurer.getPosition());
+
+			if (layout != null) {
+				if (!availableLinesCount || i < availableLinesCount) {
+					layouts.push(layout);
+				} else {
+					layouts.push(fitTextToWidth(layout + "...", boxWidth));
+					break;
+				}
 			}
-			
-			
-			var x=100, y=90, height=20;
-			var options = {"text-anchor": "middle", "boxHeight": 150, "vertical-align": "top"};
-			var options = {"boxHeight": 150, "vertical-align": "top"};
-			drawMultilineText(text, x, y, 150, 100, options);
-	};
\ No newline at end of file
+			i++;
+		}
+		;
+		console.log(layouts);
+
+		measurer.rafaelTextObject.attr({"text": layouts.join("\n")});
+		//measurer.rafaelTextObject.attr({"text-anchor": "end"});
+		//measurer.rafaelTextObject.attr({"text-anchor": "middle"});
+		if (options)
+			measurer.rafaelTextObject.attr({"text-anchor": options["text-anchor"]});
+
+		var bb = measurer.rafaelTextObject.getBBox();
+		//measurer.rafaelTextObject.attr({"x": x + boxWidth/2});
+		if (options["vertical-align"] == "top")
+			measurer.rafaelTextObject.attr({"y": y + bb.height / 2 + TEXT_PADDING});
+		else
+			measurer.rafaelTextObject.attr({"y": y + height / 2});
+		//var bb = measurer.rafaelTextObject.getBBox();
+
+		if (measurer.rafaelTextObject.attr("text-anchor") == "middle")
+			measurer.rafaelTextObject.attr("x", x + boxWidth / 2 + TEXT_PADDING / 2);
+		else if (measurer.rafaelTextObject.attr("text-anchor") == "end")
+			measurer.rafaelTextObject.attr("x", x + boxWidth + TEXT_PADDING / 2);
+		else
+			measurer.rafaelTextObject.attr("x", x + boxWidth / 2 - bb.width / 2 + TEXT_PADDING / 2);
+
+		var boxStyle = {stroke: Color.LightSteelBlue2, "stroke-width": 1.0, "stroke-dasharray": "- "};
+		/*
+		var box = paper.rect(x+.0 + boxWidth/2 - bb.width/2+ TEXT_PADDING/2, y + .5 + boxHeight/2 - bb.height/2, width, height).attr(boxStyle);
+		box.attr("height", bb.height);
+		*/
+		//var box = paper.rect(bb.x - .5 + bb.width/2 + TEXT_PADDING, bb.y + bb.height/2, bb.width, bb.height).attr(boxStyle);
+
+		var textAreaCX = x + boxWidth / 2;
+		var textAreaCY = y + height / 2;
+		var dotLeftTop = paper.ellipse(x, y, 3, 3).attr({
+			"stroke-width": 0,
+			fill: Color.LightSteelBlue,
+			stroke: "none"
+		});
+		var dotCenter = paper.ellipse(textAreaCX, textAreaCY, 3, 3).attr({fill: Color.LightSteelBlue2, stroke: "none"});
+
+		/*
+		// real bbox
+		var bb = measurer.rafaelTextObject.getBBox();
+		var rect = paper.rect(bb.x+.5, bb.y + .5, bb.width, bb.height).attr({"stroke-width": 1});
+		*/
+		var boxStyle = {stroke: Color.LightSteelBlue2, "stroke-width": 1.0, "stroke-dasharray": "- "};
+		var rect = paper.rect(x + .5, y + .5, boxWidth, boxHeight).attr(boxStyle);
+	}
+
+
+	/*
+	for (var i=0; i<1; i++) {
+		var t = text;
+		//var t = "Высококвалифицирова";
+
+		var text = paper.text(300, 100, t).attr(font).attr("text-anchor", "start");
+		var bbText = text.getBBox();
+		paper.rect(300+.5, 100 + .5, bbText.width, bbText.height).attr({"stroke-width": 1});
+		console.log("t: ", t.replace(/\n/g, "↵"));
+
+		while (measurer.getPosition() < measurer.text.getEndIndex()) {
+			var layout = measurer.nextLayout(width);
+			//console.log("LAYOUT: " + layout + ", getPosition: " + measurer.getPosition());
+			if (layout != null)
+				layouts.push(layout);
+		};
+
+		measurer.rafaelTextObject.attr("text", layouts.join("\n"));
+		var bb = measurer.rafaelTextObject.getBBox();
+		var rect = paper.rect(bb.x+.5, bb.y + .5, bb.width, bb.height).attr({"stroke-width": 1});
+
+		lay.push(layouts);
+		console.log(layouts);
+	}
+	*/
+
+
+	var fitTextToWidth = function (original, width) {
+		var text = original;
+
+		// TODO: move attr on parameters
+		var attr = {font: "11px Arial", opacity: 0};
+
+		// remove length for "..."
+		var dots = paper.text(0, 0, "...").attr(attr).hide();
+		var dotsBB = dots.getBBox();
+
+		var maxWidth = width - dotsBB.width;
+
+		var textElement = paper.text(0, 0, text).attr(attr).hide();
+		var bb = textElement.getBBox();
+
+		// it's a little bit incorrect with "..."
+		while (bb.width > maxWidth && text.length > 0) {
+			text = text.substring(0, text.length - 1);
+			textElement.attr({"text": text});
+			bb = textElement.getBBox();
+		}
+
+		// remove element from paper
+		textElement.remove();
+
+		if (text != original) {
+			text = text + "...";
+		}
+
+		return text;
+	}
+
+
+	var x = 100, y = 90, height = 20;
+	var options = {"text-anchor": "middle", "boxHeight": 150, "vertical-align": "top"};
+	var options = {"boxHeight": 150, "vertical-align": "top"};
+	drawMultilineText(text, x, y, 150, 100, options);
+};
diff --git a/len-activiti/src/main/resources/static/diagram-viewer/style.css b/len-activiti/src/main/resources/static/diagram-viewer/style.css
index 55c5eeb..a46ddd0 100644
--- a/len-activiti/src/main/resources/static/diagram-viewer/style.css
+++ b/len-activiti/src/main/resources/static/diagram-viewer/style.css
@@ -1 +1,139 @@
-body {
    background: #fafafa;
    color: #708090;
    /* font: 300 100.1% "Helvetica Neue", Helvetica, "Arial Unicode MS", Arial, sans-serif; */
	font-family: Verdana, sans-serif, Arial;
	font-size: 10px;
}
.wrapper{
	height: 100%;
	position: relative;
	width: 100%;
}
/*
#holder {
    height: 480px;
    width: 640px;
	b_ackground: #F8F8FF;
	
	-moz-border-radius: 10px;
	-webkit-border-radius: 10px;
	-webkit-box-shadow: 0 1px 3px #666;
	background: #DDD url(./images/bg.png);
	/* background: #DDD url(./images/checker-bg.png); * /
	b_order:0px solid #dedede;
}
*/
div.diagramHolder {
	float:left; 
}
div.diagram{
	border:1px solid #dedede;
	margin: 5px;
	padding: 5px;
	background: #FFF;
}
div.diagram.hidden{
	display:none;
}
svg {
	background: #DDD url(./images/bg.png);
}

div.diagram-info {
	float:left;
	position: relative;
	padding: 5px;
}

/* Breadcrumbs */

#diagramBreadCrumbs {
	margin-left: 2px;
	margin-right: 2px;
	margin-top: 10px;
}
#diagramBreadCrumbs ul {
	list-style: none;
	
	background-color: white;
	border: 1px solid #DEDEDE;
	border-color: #C0C2C5;
	margin: 0;
	
	margin-bottom: 10px;
	margin-left: 0;
	
	-webkit-padding-start: 0px;
	-moz-border-radius: 4px;
	-webkit-border-radius: 4px;
	border-radius: 4px;
}
#diagramBreadCrumbs li {
	/*text-decoration: underline;*/
	display: inline-block;
	vertical-align: middle;
	padding-left: .75em;
	padding-right: 0;
	cursor: pointer;
}
#diagramBreadCrumbs li.selected {
	color: #9370DB;
	color: #4876FF;
	color: #4F94CD;
	font-weight: bold;
}
#diagramBreadCrumbs li span {
	background: url(images/breadcrumbs.png) no-repeat 100% 50%;
	display: block;
	padding: .5em 15px .5em 0;
}


/* Progress bar */

.ui-progressbar { 
	height: 25px;
	/*height:2em; text-align: left; overflow: hidden; */
	background: white;
	border: 1px solid #949DAD;
	margin: 2px;
	overflow: hidden;
	padding: 1px;
	position: relative;

	-moz-border-radius: 4px;
	-webkit-border-radius: 4px;
	border-radius: 4px;
}
.ui-progressbar .ui-progressbar-value {
	m_argin: -1px;
	height:100%;
	background: #D4E4FF;
	
	-moz-border-radius: 4px;
	-webkit-border-radius: 4px;
	border-radius: 4px;
}
.ui-widget-header a { color: #222222/*{fcHeader}*/; }

.ui-progressbar .ui-progressbar-label{
	position: absolute;
	margin-top: 7px;
	border:0px solid red;
	width: 100%;
	text-align: center;
}
\ No newline at end of file
+body {
+	background: #fafafa;
+	color: #708090;
+	/* font: 300 100.1% "Helvetica Neue", Helvetica, "Arial Unicode MS", Arial, sans-serif; */
+	font-family: Verdana, sans-serif, Arial;
+	font-size: 10px;
+}
+
+.wrapper {
+	height: 100%;
+	position: relative;
+	width: 100%;
+}
+
+/*
+#holder {
+    height: 480px;
+    width: 640px;
+	b_ackground: #F8F8FF;
+
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	-webkit-box-shadow: 0 1px 3px #666;
+	background: #DDD url(./images/bg.png);
+	/* background: #DDD url(./images/checker-bg.png); * /
+	b_order:0px solid #dedede;
+}
+*/
+div.diagramHolder {
+	float: left;
+}
+
+div.diagram {
+	border: 1px solid #dedede;
+	margin: 5px;
+	padding: 5px;
+	background: #FFF;
+}
+
+div.diagram.hidden {
+	display: none;
+}
+
+svg {
+	background: #DDD url(./images/bg.png);
+}
+
+div.diagram-info {
+	float: left;
+	position: relative;
+	padding: 5px;
+}
+
+/* Breadcrumbs */
+
+#diagramBreadCrumbs {
+	margin-left: 2px;
+	margin-right: 2px;
+	margin-top: 10px;
+}
+
+#diagramBreadCrumbs ul {
+	list-style: none;
+
+	background-color: white;
+	border: 1px solid #DEDEDE;
+	border-color: #C0C2C5;
+	margin: 0;
+
+	margin-bottom: 10px;
+	margin-left: 0;
+
+	-webkit-padding-start: 0px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+
+#diagramBreadCrumbs li {
+	/*text-decoration: underline;*/
+	display: inline-block;
+	vertical-align: middle;
+	padding-left: .75em;
+	padding-right: 0;
+	cursor: pointer;
+}
+
+#diagramBreadCrumbs li.selected {
+	color: #9370DB;
+	color: #4876FF;
+	color: #4F94CD;
+	font-weight: bold;
+}
+
+#diagramBreadCrumbs li span {
+	background: url(images/breadcrumbs.png) no-repeat 100% 50%;
+	display: block;
+	padding: .5em 15px .5em 0;
+}
+
+
+/* Progress bar */
+
+.ui-progressbar {
+	height: 25px;
+	/*height:2em; text-align: left; overflow: hidden; */
+	background: white;
+	border: 1px solid #949DAD;
+	margin: 2px;
+	overflow: hidden;
+	padding: 1px;
+	position: relative;
+
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+
+.ui-progressbar .ui-progressbar-value {
+	m_argin: -1px;
+	height: 100%;
+	background: #D4E4FF;
+
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	border-radius: 4px;
+}
+
+.ui-widget-header a {
+	color: #222222 /*{fcHeader}*/;
+}
+
+.ui-progressbar .ui-progressbar-label {
+	position: absolute;
+	margin-top: 7px;
+	border: 0px solid red;
+	width: 100%;
+	text-align: center;
+}
diff --git a/len-activiti/src/main/resources/static/editor-app/app-cfg.js b/len-activiti/src/main/resources/static/editor-app/app-cfg.js
index 676ca12..aa0fc86 100644
--- a/len-activiti/src/main/resources/static/editor-app/app-cfg.js
+++ b/len-activiti/src/main/resources/static/editor-app/app-cfg.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -21,5 +21,5 @@
 var ACTIVITI = ACTIVITI || {};
 
 ACTIVITI.CONFIG = {
-	'contextRoot' : '../service',
+	'contextRoot': '../service',
 };
diff --git a/len-activiti/src/main/resources/static/editor-app/app.js b/len-activiti/src/main/resources/static/editor-app/app.js
index b56cec2..215fa7b 100644
--- a/len-activiti/src/main/resources/static/editor-app/app.js
+++ b/len-activiti/src/main/resources/static/editor-app/app.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -19,415 +19,413 @@
 'use strict';
 
 var activitiModeler = angular.module('activitiModeler', [
-  'ngCookies',
-  'ngResource',
-  'ngSanitize',
-  'ngRoute',
-  'ngDragDrop',
-  'mgcrea.ngStrap', 
-  'ngGrid',
-  'ngAnimate',
-  'pascalprecht.translate',
-  'duScroll',
-    'tm.pagination'
+	'ngCookies',
+	'ngResource',
+	'ngSanitize',
+	'ngRoute',
+	'ngDragDrop',
+	'mgcrea.ngStrap',
+	'ngGrid',
+	'ngAnimate',
+	'pascalprecht.translate',
+	'duScroll',
+	'tm.pagination'
 ]);
 
 var activitiModule = activitiModeler;
 
 activitiModeler
-  // Initialize routes
-  .config(['$selectProvider', '$translateProvider', function ($selectProvider, $translateProvider) {
-
-      // Override caret for bs-select directive
-      angular.extend($selectProvider.defaults, {
-          caretHtml: '&nbsp;<i class="icon icon-caret-down"></i>'
-      });
-        
-        // Initialize angular-translate
-        $translateProvider.useStaticFilesLoader({
-            prefix: './editor-app/i18n/',
-            suffix: '.json'
-        });
-
-        $translateProvider.preferredLanguage('en');
-
-        // remember language
-        $translateProvider.useCookieStorage();
-        
-  }])
-  .run(['$rootScope', '$timeout', '$modal', '$translate', '$location', '$window', '$http', '$q',
-        function($rootScope, $timeout, $modal, $translate, $location, $window, $http, $q) {
-	  
-			  $rootScope.config = ACTIVITI.CONFIG;
-			  
-			  $rootScope.editorInitialized = false;
-		      
-		      $rootScope.editorFactory = $q.defer();
-		
-		      $rootScope.forceSelectionRefresh = false;
-		
-		      $rootScope.ignoreChanges = false; // by default never ignore changes
-		      
-		      $rootScope.validationErrors = [];
-		      
-		      $rootScope.staticIncludeVersion = Date.now();
-
-			  /**
-		       * A 'safer' apply that avoids concurrent updates (which $apply allows).
-		       */
-		      $rootScope.safeApply = function(fn) {
-		          var phase = this.$root.$$phase;
-		          if(phase == '$apply' || phase == '$digest') {
-		              if(fn && (typeof(fn) === 'function')) {
-		                  fn();
-		              }
-		          } else {
-		              this.$apply(fn);
-		          }
-		      };
-	  
-	  
-            /**
-             * Initialize the event bus: couple all Oryx events with a dispatch of the
-             * event of the event bus. This way, it gets much easier to attach custom logic
-             * to any event.
-             */
-
-            /* Helper method to fetch model from server (always needed) */
-            function fetchModel(modelId) {
-
-                var modelUrl = KISBPM.URL.getModel(modelId);
-
-                $http({method: 'GET', url: modelUrl}).
-                    success(function (data, status, headers, config) {
-                        $rootScope.editor = new ORYX.Editor(data);
-                        $rootScope.modelData = angular.fromJson(data);
-                        $rootScope.editorFactory.resolve();
-                    }).
-                    error(function (data, status, headers, config) {
-                      console.log('Error loading model with id ' + modelId + ' ' + data);
-                    });
-            }
-
-
-            function initScrollHandling() {
-                var canvasSection = jQuery('#canvasSection');
-                canvasSection.scroll(function() {
-
-                    // Hides the resizer and quick menu items during scrolling
-
-                    var selectedElements = $rootScope.editor.selection;
-                    var subSelectionElements = $rootScope.editor._subSelection;
-
-                    $rootScope.selectedElements = selectedElements;
-                    $rootScope.subSelectionElements = subSelectionElements;
-                    if (selectedElements && selectedElements.length > 0) {
-                    	$rootScope.selectedElementBeforeScrolling = selectedElements[0];
-                    }
-
-                    jQuery('.Oryx_button').each(function(i, obj) {
-                    	$rootScope.orginalOryxButtonStyle = obj.style.display;
-                    	obj.style.display = 'none';
-                    });
-                    
-                    jQuery('.resizer_southeast').each(function(i, obj) {
-                    	$rootScope.orginalResizerSEStyle = obj.style.display;
-                        obj.style.display = 'none';
-                    });
-                    jQuery('.resizer_northwest').each(function(i, obj) {
-                    	$rootScope.orginalResizerNWStyle = obj.style.display;
-                        obj.style.display = 'none';
-                    });
-                    $rootScope.editor.handleEvents({type:ORYX.CONFIG.EVENT_CANVAS_SCROLL});
-                });
-
-                canvasSection.scrollStopped(function(){
-
-                    // Puts the quick menu items and resizer back when scroll is stopped.
-
-                    $rootScope.editor.setSelection([]); // needed cause it checks for element changes and does nothing if the elements are the same
-                    $rootScope.editor.setSelection($rootScope.selectedElements, $rootScope.subSelectionElements);
-                    $rootScope.selectedElements = undefined;
-                    $rootScope.subSelectionElements = undefined;
-
-                    function handleDisplayProperty(obj) {
-                        if (jQuery(obj).position().top > 0) {
-                            obj.style.display = 'block';
-                        } else {
-                            obj.style.display = 'none';
-                        }
-                    }
-
-                    jQuery('.Oryx_button').each(function(i, obj) {
-                        handleDisplayProperty(obj);
-                    });
-                    
-                    jQuery('.resizer_southeast').each(function(i, obj) {
-                        handleDisplayProperty(obj);
-                    });
-                    jQuery('.resizer_northwest').each(function(i, obj) {
-                        handleDisplayProperty(obj);
-                    });
-
-                });
-            }
-
-            /**
-             * Initialize the Oryx Editor when the content has been loaded
-             */
-            $rootScope.$on('$includeContentLoaded', function (event) {
-	            if (!$rootScope.editorInitialized) {
-
-	            	ORYX._loadPlugins();
-	
-	                var modelId = EDITOR.UTIL.getParameterByName('modelId');
-	                fetchModel(modelId);
-	
-	                $rootScope.window = {};
-	                var updateWindowSize = function() {
-	                    $rootScope.window.width = $window.innerWidth;
-	                    $rootScope.window.height  = $window.innerHeight;
-	                };
-	
-	                // Window resize hook
-	                angular.element($window).bind('resize', function() {
-	                    $rootScope.safeApply(updateWindowSize());
-	                });
-	
-	                $rootScope.$watch('window.forceRefresh', function(newValue) {
-	                    if(newValue) {
-	                        $timeout(function() {
-	                            updateWindowSize();
-	                            $rootScope.window.forceRefresh = false;
-	                        });
-	                    }
-	                });
-	
-	                updateWindowSize();
-
-	                // Hook in resizing of main panels when window resizes
-	                // TODO: perhaps move to a separate JS-file?
-	                jQuery(window).resize(function () {
-
-	                    // Calculate the offset based on the bottom of the module header
-	                    var offset = jQuery("#editor-header").offset();
-	                    var propSectionHeight = jQuery('#propertySection').height();
-	                    var canvas = jQuery('#canvasSection');
-	                    var mainHeader = jQuery('#main-header');
-
-	                    if (offset == undefined || offset === null
-	                        || propSectionHeight === undefined || propSectionHeight === null
-	                        || canvas === undefined || canvas === null || mainHeader === null) {
-	                        return;
-	                    }
-	                    
-	                    if ($rootScope.editor)
-	                	{
-	        	        	var selectedElements = $rootScope.editor.selection;
-	        	            var subSelectionElements = $rootScope.editor._subSelection;
-	        	
-	        	            $rootScope.selectedElements = selectedElements;
-	        	            $rootScope.subSelectionElements = subSelectionElements;
-	        	            if (selectedElements && selectedElements.length > 0)
-	        	            {
-	        	            	$rootScope.selectedElementBeforeScrolling = selectedElements[0];
-	        	            	
-	        	            	$rootScope.editor.setSelection([]); // needed cause it checks for element changes and does nothing if the elements are the same
-	        	                $rootScope.editor.setSelection($rootScope.selectedElements, $rootScope.subSelectionElements);
-	        	                $rootScope.selectedElements = undefined;
-	        	                $rootScope.subSelectionElements = undefined;
-	        	            }
-	                	}
-
-	                    var totalAvailable = jQuery(window).height() - offset.top - mainHeader.height() - 21;
-	                    canvas.height(totalAvailable - propSectionHeight);
-	                    jQuery('#paletteSection').height(totalAvailable);
-
-	                    // Update positions of the resize-markers, according to the canvas
-
-	                    var actualCanvas = null;
-	                    if (canvas && canvas[0].children[1]) {
-	                        actualCanvas = canvas[0].children[1];
-	                    }
-
-	                    var canvasTop = canvas.position().top;
-	                    var canvasLeft = canvas.position().left;
-	                    var canvasHeight = canvas[0].clientHeight;
-	                    var canvasWidth = canvas[0].clientWidth;
-	                    var iconCenterOffset = 8;
-	                    var widthDiff = 0;
-
-	                    var actualWidth = 0;
-	                    if(actualCanvas) {
-	                        // In some browsers, the SVG-element clientwidth isn't available, so we revert to the parent
-	                        actualWidth = actualCanvas.clientWidth || actualCanvas.parentNode.clientWidth;
-	                    }
-
-
-	                    if(actualWidth < canvas[0].clientWidth) {
-	                        widthDiff = actualWidth - canvas[0].clientWidth;
-	                        // In case the canvas is smaller than the actual viewport, the resizers should be moved
-	                        canvasLeft -= widthDiff / 2;
-	                        canvasWidth += widthDiff;
-	                    }
-
-	                    var iconWidth = 17;
-	                    var iconOffset = 20;
-
-	                    var north = jQuery('#canvas-grow-N');
-	                    north.css('top', canvasTop + iconOffset + 'px');
-	                    north.css('left', canvasLeft - 10 + (canvasWidth - iconWidth) / 2 + 'px');
-
-	                    var south = jQuery('#canvas-grow-S');
-	                    south.css('top', (canvasTop + canvasHeight - iconOffset - iconCenterOffset) +  'px');
-	                    south.css('left', canvasLeft - 10 + (canvasWidth - iconWidth) / 2 + 'px');
-
-	                    var east = jQuery('#canvas-grow-E');
-	                    east.css('top', canvasTop - 10 + (canvasHeight - iconWidth) / 2 + 'px');
-	                    east.css('left', (canvasLeft + canvasWidth - iconOffset - iconCenterOffset) + 'px');
-
-	                    var west = jQuery('#canvas-grow-W');
-	                    west.css('top', canvasTop -10 + (canvasHeight - iconWidth) / 2 + 'px');
-	                    west.css('left', canvasLeft + iconOffset + 'px');
-
-	                    north = jQuery('#canvas-shrink-N');
-	                    north.css('top', canvasTop + iconOffset + 'px');
-	                    north.css('left', canvasLeft + 10 + (canvasWidth - iconWidth) / 2 + 'px');
-
-	                    south = jQuery('#canvas-shrink-S');
-	                    south.css('top', (canvasTop + canvasHeight - iconOffset - iconCenterOffset) +  'px');
-	                    south.css('left', canvasLeft +10 + (canvasWidth - iconWidth) / 2 + 'px');
-
-	                    east = jQuery('#canvas-shrink-E');
-	                    east.css('top', canvasTop + 10 + (canvasHeight - iconWidth) / 2 +  'px');
-	                    east.css('left', (canvasLeft + canvasWidth - iconOffset - iconCenterOffset) + 'px');
-
-	                    west = jQuery('#canvas-shrink-W');
-	                    west.css('top', canvasTop + 10 + (canvasHeight - iconWidth) / 2 + 'px');
-	                    west.css('left', canvasLeft + iconOffset + 'px');
-	                });
-
-	                jQuery(window).trigger('resize');
-
-	                jQuery.fn.scrollStopped = function(callback) {
-	                    jQuery(this).scroll(function(){
-	                        var self = this, $this = jQuery(self);
-	                        if ($this.data('scrollTimeout')) {
-	                            clearTimeout($this.data('scrollTimeout'));
-	                        }
-	                        $this.data('scrollTimeout', setTimeout(callback,50,self));
-	                    });
-	                };
-	                
-	                // Always needed, cause the DOM element on which the scroll event listeners are attached are changed for every new model
-	                initScrollHandling();
-	                
-	                $rootScope.editorInitialized = true;
-	            }
-            });
-
-            /**
-             * Initialize the event bus: couple all Oryx events with a dispatch of the
-             * event of the event bus. This way, it gets much easier to attach custom logic
-             * to any event.
-             */
-
-            $rootScope.editorFactory.promise.then(function() {
-
-                KISBPM.eventBus.editor = $rootScope.editor;
-
-                var eventMappings = [
-                    { oryxType : ORYX.CONFIG.EVENT_SELECTION_CHANGED, kisBpmType : KISBPM.eventBus.EVENT_TYPE_SELECTION_CHANGE },
-                    { oryxType : ORYX.CONFIG.EVENT_DBLCLICK, kisBpmType : KISBPM.eventBus.EVENT_TYPE_DOUBLE_CLICK },
-                    { oryxType : ORYX.CONFIG.EVENT_MOUSEOUT, kisBpmType : KISBPM.eventBus.EVENT_TYPE_MOUSE_OUT },
-                    { oryxType : ORYX.CONFIG.EVENT_MOUSEOVER, kisBpmType : KISBPM.eventBus.EVENT_TYPE_MOUSE_OVER }
-
-                ];
-
-                eventMappings.forEach(function(eventMapping) {
-                    $rootScope.editor.registerOnEvent(eventMapping.oryxType, function(event) {
-                        KISBPM.eventBus.dispatch(eventMapping.kisBpmType, event);
-                    });
-                });
-                
-                $rootScope.editor.registerOnEvent(ORYX.CONFIG.EVENT_SHAPEREMOVED, function (event) {
-    	    		var validateButton = document.getElementById(event.shape.resourceId + "-validate-button");
-    	    		if (validateButton)
-    	    		{
-    	    			validateButton.style.display = 'none';
-    	    		}
-                });
-
-                // The Oryx canvas is ready (we know since we're in this promise callback) and the
-                // event bus is ready. The editor is now ready for use
-                KISBPM.eventBus.dispatch(KISBPM.eventBus.EVENT_TYPE_EDITOR_READY, {type : KISBPM.eventBus.EVENT_TYPE_EDITOR_READY});
-
-            });
-            
-            // Alerts
-            $rootScope.alerts = {
-                queue: []
-            };
-          
-            $rootScope.showAlert = function(alert) {
-                if(alert.queue.length > 0) {
-                    alert.current = alert.queue.shift();
-                    // Start timout for message-pruning
-                    alert.timeout = $timeout(function() {
-                        if (alert.queue.length == 0) {
-                            alert.current = undefined;
-                            alert.timeout = undefined;
-                        } else {
-                            $rootScope.showAlert(alert);
-                        }
-                    }, (alert.current.type == 'error' ? 5000 : 1000));
-                } else {
-                    $rootScope.alerts.current = undefined;
-                }
-            };
-          
-            $rootScope.addAlert = function(message, type) {
-                var newAlert = {message: message, type: type};
-                if (!$rootScope.alerts.timeout) {
-                    // Timeout for message queue is not running, start one
-                    $rootScope.alerts.queue.push(newAlert);
-                    $rootScope.showAlert($rootScope.alerts);
-                } else {
-                    $rootScope.alerts.queue.push(newAlert);
-                }
-            };
-          
-            $rootScope.dismissAlert = function() {
-                if (!$rootScope.alerts.timeout) {
-                    $rootScope.alerts.current = undefined;
-                } else {
-                    $timeout.cancel($rootScope.alerts.timeout);
-                    $rootScope.alerts.timeout = undefined;
-                    $rootScope.showAlert($rootScope.alerts);
-                }
-            };
-          
-            $rootScope.addAlertPromise = function(promise, type) {
-                if (promise) {
-                    promise.then(function(data) {
-                        $rootScope.addAlert(data, type);
-                    });
-                }
-            };
-          
-        }
-  ])
-
-    // Moment-JS date-formatting filter
-    .filter('dateformat', function() {
-        return function(date, format) {
-            if (date) {
-                if (format) {
-                    return moment(date).format(format);
-                } else {
-                    return moment(date).calendar();
-                }
-            }
-            return '';
-        };
-    });
+	// Initialize routes
+	.config(['$selectProvider', '$translateProvider', function ($selectProvider, $translateProvider) {
+
+		// Override caret for bs-select directive
+		angular.extend($selectProvider.defaults, {
+			caretHtml: '&nbsp;<i class="icon icon-caret-down"></i>'
+		});
+
+		// Initialize angular-translate
+		$translateProvider.useStaticFilesLoader({
+			prefix: './editor-app/i18n/',
+			suffix: '.json'
+		});
+
+		$translateProvider.preferredLanguage('en');
+
+		// remember language
+		$translateProvider.useCookieStorage();
+
+	}])
+	.run(['$rootScope', '$timeout', '$modal', '$translate', '$location', '$window', '$http', '$q',
+		function ($rootScope, $timeout, $modal, $translate, $location, $window, $http, $q) {
+
+			$rootScope.config = ACTIVITI.CONFIG;
+
+			$rootScope.editorInitialized = false;
+
+			$rootScope.editorFactory = $q.defer();
+
+			$rootScope.forceSelectionRefresh = false;
+
+			$rootScope.ignoreChanges = false; // by default never ignore changes
+
+			$rootScope.validationErrors = [];
+
+			$rootScope.staticIncludeVersion = Date.now();
+
+			/**
+			 * A 'safer' apply that avoids concurrent updates (which $apply allows).
+			 */
+			$rootScope.safeApply = function (fn) {
+				var phase = this.$root.$$phase;
+				if (phase == '$apply' || phase == '$digest') {
+					if (fn && (typeof (fn) === 'function')) {
+						fn();
+					}
+				} else {
+					this.$apply(fn);
+				}
+			};
+
+
+			/**
+			 * Initialize the event bus: couple all Oryx events with a dispatch of the
+			 * event of the event bus. This way, it gets much easier to attach custom logic
+			 * to any event.
+			 */
+
+			/* Helper method to fetch model from server (always needed) */
+			function fetchModel(modelId) {
+
+				var modelUrl = KISBPM.URL.getModel(modelId);
+
+				$http({method: 'GET', url: modelUrl}).success(function (data, status, headers, config) {
+					$rootScope.editor = new ORYX.Editor(data);
+					$rootScope.modelData = angular.fromJson(data);
+					$rootScope.editorFactory.resolve();
+				}).error(function (data, status, headers, config) {
+					console.log('Error loading model with id ' + modelId + ' ' + data);
+				});
+			}
+
+
+			function initScrollHandling() {
+				var canvasSection = jQuery('#canvasSection');
+				canvasSection.scroll(function () {
+
+					// Hides the resizer and quick menu items during scrolling
+
+					var selectedElements = $rootScope.editor.selection;
+					var subSelectionElements = $rootScope.editor._subSelection;
+
+					$rootScope.selectedElements = selectedElements;
+					$rootScope.subSelectionElements = subSelectionElements;
+					if (selectedElements && selectedElements.length > 0) {
+						$rootScope.selectedElementBeforeScrolling = selectedElements[0];
+					}
+
+					jQuery('.Oryx_button').each(function (i, obj) {
+						$rootScope.orginalOryxButtonStyle = obj.style.display;
+						obj.style.display = 'none';
+					});
+
+					jQuery('.resizer_southeast').each(function (i, obj) {
+						$rootScope.orginalResizerSEStyle = obj.style.display;
+						obj.style.display = 'none';
+					});
+					jQuery('.resizer_northwest').each(function (i, obj) {
+						$rootScope.orginalResizerNWStyle = obj.style.display;
+						obj.style.display = 'none';
+					});
+					$rootScope.editor.handleEvents({type: ORYX.CONFIG.EVENT_CANVAS_SCROLL});
+				});
+
+				canvasSection.scrollStopped(function () {
+
+					// Puts the quick menu items and resizer back when scroll is stopped.
+
+					$rootScope.editor.setSelection([]); // needed cause it checks for element changes and does nothing if the elements are the same
+					$rootScope.editor.setSelection($rootScope.selectedElements, $rootScope.subSelectionElements);
+					$rootScope.selectedElements = undefined;
+					$rootScope.subSelectionElements = undefined;
+
+					function handleDisplayProperty(obj) {
+						if (jQuery(obj).position().top > 0) {
+							obj.style.display = 'block';
+						} else {
+							obj.style.display = 'none';
+						}
+					}
+
+					jQuery('.Oryx_button').each(function (i, obj) {
+						handleDisplayProperty(obj);
+					});
+
+					jQuery('.resizer_southeast').each(function (i, obj) {
+						handleDisplayProperty(obj);
+					});
+					jQuery('.resizer_northwest').each(function (i, obj) {
+						handleDisplayProperty(obj);
+					});
+
+				});
+			}
+
+			/**
+			 * Initialize the Oryx Editor when the content has been loaded
+			 */
+			$rootScope.$on('$includeContentLoaded', function (event) {
+				if (!$rootScope.editorInitialized) {
+
+					ORYX._loadPlugins();
+
+					var modelId = EDITOR.UTIL.getParameterByName('modelId');
+					fetchModel(modelId);
+
+					$rootScope.window = {};
+					var updateWindowSize = function () {
+						$rootScope.window.width = $window.innerWidth;
+						$rootScope.window.height = $window.innerHeight;
+					};
+
+					// Window resize hook
+					angular.element($window).bind('resize', function () {
+						$rootScope.safeApply(updateWindowSize());
+					});
+
+					$rootScope.$watch('window.forceRefresh', function (newValue) {
+						if (newValue) {
+							$timeout(function () {
+								updateWindowSize();
+								$rootScope.window.forceRefresh = false;
+							});
+						}
+					});
+
+					updateWindowSize();
+
+					// Hook in resizing of main panels when window resizes
+					// TODO: perhaps move to a separate JS-file?
+					jQuery(window).resize(function () {
+
+						// Calculate the offset based on the bottom of the module header
+						var offset = jQuery("#editor-header").offset();
+						var propSectionHeight = jQuery('#propertySection').height();
+						var canvas = jQuery('#canvasSection');
+						var mainHeader = jQuery('#main-header');
+
+						if (offset == undefined || offset === null
+							|| propSectionHeight === undefined || propSectionHeight === null
+							|| canvas === undefined || canvas === null || mainHeader === null) {
+							return;
+						}
+
+						if ($rootScope.editor) {
+							var selectedElements = $rootScope.editor.selection;
+							var subSelectionElements = $rootScope.editor._subSelection;
+
+							$rootScope.selectedElements = selectedElements;
+							$rootScope.subSelectionElements = subSelectionElements;
+							if (selectedElements && selectedElements.length > 0) {
+								$rootScope.selectedElementBeforeScrolling = selectedElements[0];
+
+								$rootScope.editor.setSelection([]); // needed cause it checks for element changes and does nothing if the elements are the same
+								$rootScope.editor.setSelection($rootScope.selectedElements, $rootScope.subSelectionElements);
+								$rootScope.selectedElements = undefined;
+								$rootScope.subSelectionElements = undefined;
+							}
+						}
+
+						var totalAvailable = jQuery(window).height() - offset.top - mainHeader.height() - 21;
+						canvas.height(totalAvailable - propSectionHeight);
+						jQuery('#paletteSection').height(totalAvailable);
+
+						// Update positions of the resize-markers, according to the canvas
+
+						var actualCanvas = null;
+						if (canvas && canvas[0].children[1]) {
+							actualCanvas = canvas[0].children[1];
+						}
+
+						var canvasTop = canvas.position().top;
+						var canvasLeft = canvas.position().left;
+						var canvasHeight = canvas[0].clientHeight;
+						var canvasWidth = canvas[0].clientWidth;
+						var iconCenterOffset = 8;
+						var widthDiff = 0;
+
+						var actualWidth = 0;
+						if (actualCanvas) {
+							// In some browsers, the SVG-element clientwidth isn't available, so we revert to the parent
+							actualWidth = actualCanvas.clientWidth || actualCanvas.parentNode.clientWidth;
+						}
+
+
+						if (actualWidth < canvas[0].clientWidth) {
+							widthDiff = actualWidth - canvas[0].clientWidth;
+							// In case the canvas is smaller than the actual viewport, the resizers should be moved
+							canvasLeft -= widthDiff / 2;
+							canvasWidth += widthDiff;
+						}
+
+						var iconWidth = 17;
+						var iconOffset = 20;
+
+						var north = jQuery('#canvas-grow-N');
+						north.css('top', canvasTop + iconOffset + 'px');
+						north.css('left', canvasLeft - 10 + (canvasWidth - iconWidth) / 2 + 'px');
+
+						var south = jQuery('#canvas-grow-S');
+						south.css('top', (canvasTop + canvasHeight - iconOffset - iconCenterOffset) + 'px');
+						south.css('left', canvasLeft - 10 + (canvasWidth - iconWidth) / 2 + 'px');
+
+						var east = jQuery('#canvas-grow-E');
+						east.css('top', canvasTop - 10 + (canvasHeight - iconWidth) / 2 + 'px');
+						east.css('left', (canvasLeft + canvasWidth - iconOffset - iconCenterOffset) + 'px');
+
+						var west = jQuery('#canvas-grow-W');
+						west.css('top', canvasTop - 10 + (canvasHeight - iconWidth) / 2 + 'px');
+						west.css('left', canvasLeft + iconOffset + 'px');
+
+						north = jQuery('#canvas-shrink-N');
+						north.css('top', canvasTop + iconOffset + 'px');
+						north.css('left', canvasLeft + 10 + (canvasWidth - iconWidth) / 2 + 'px');
+
+						south = jQuery('#canvas-shrink-S');
+						south.css('top', (canvasTop + canvasHeight - iconOffset - iconCenterOffset) + 'px');
+						south.css('left', canvasLeft + 10 + (canvasWidth - iconWidth) / 2 + 'px');
+
+						east = jQuery('#canvas-shrink-E');
+						east.css('top', canvasTop + 10 + (canvasHeight - iconWidth) / 2 + 'px');
+						east.css('left', (canvasLeft + canvasWidth - iconOffset - iconCenterOffset) + 'px');
+
+						west = jQuery('#canvas-shrink-W');
+						west.css('top', canvasTop + 10 + (canvasHeight - iconWidth) / 2 + 'px');
+						west.css('left', canvasLeft + iconOffset + 'px');
+					});
+
+					jQuery(window).trigger('resize');
+
+					jQuery.fn.scrollStopped = function (callback) {
+						jQuery(this).scroll(function () {
+							var self = this, $this = jQuery(self);
+							if ($this.data('scrollTimeout')) {
+								clearTimeout($this.data('scrollTimeout'));
+							}
+							$this.data('scrollTimeout', setTimeout(callback, 50, self));
+						});
+					};
+
+					// Always needed, cause the DOM element on which the scroll event listeners are attached are changed for every new model
+					initScrollHandling();
+
+					$rootScope.editorInitialized = true;
+				}
+			});
+
+			/**
+			 * Initialize the event bus: couple all Oryx events with a dispatch of the
+			 * event of the event bus. This way, it gets much easier to attach custom logic
+			 * to any event.
+			 */
+
+			$rootScope.editorFactory.promise.then(function () {
+
+				KISBPM.eventBus.editor = $rootScope.editor;
+
+				var eventMappings = [
+					{
+						oryxType: ORYX.CONFIG.EVENT_SELECTION_CHANGED,
+						kisBpmType: KISBPM.eventBus.EVENT_TYPE_SELECTION_CHANGE
+					},
+					{oryxType: ORYX.CONFIG.EVENT_DBLCLICK, kisBpmType: KISBPM.eventBus.EVENT_TYPE_DOUBLE_CLICK},
+					{oryxType: ORYX.CONFIG.EVENT_MOUSEOUT, kisBpmType: KISBPM.eventBus.EVENT_TYPE_MOUSE_OUT},
+					{oryxType: ORYX.CONFIG.EVENT_MOUSEOVER, kisBpmType: KISBPM.eventBus.EVENT_TYPE_MOUSE_OVER}
+
+				];
+
+				eventMappings.forEach(function (eventMapping) {
+					$rootScope.editor.registerOnEvent(eventMapping.oryxType, function (event) {
+						KISBPM.eventBus.dispatch(eventMapping.kisBpmType, event);
+					});
+				});
+
+				$rootScope.editor.registerOnEvent(ORYX.CONFIG.EVENT_SHAPEREMOVED, function (event) {
+					var validateButton = document.getElementById(event.shape.resourceId + "-validate-button");
+					if (validateButton) {
+						validateButton.style.display = 'none';
+					}
+				});
+
+				// The Oryx canvas is ready (we know since we're in this promise callback) and the
+				// event bus is ready. The editor is now ready for use
+				KISBPM.eventBus.dispatch(KISBPM.eventBus.EVENT_TYPE_EDITOR_READY, {type: KISBPM.eventBus.EVENT_TYPE_EDITOR_READY});
+
+			});
+
+			// Alerts
+			$rootScope.alerts = {
+				queue: []
+			};
+
+			$rootScope.showAlert = function (alert) {
+				if (alert.queue.length > 0) {
+					alert.current = alert.queue.shift();
+					// Start timout for message-pruning
+					alert.timeout = $timeout(function () {
+						if (alert.queue.length == 0) {
+							alert.current = undefined;
+							alert.timeout = undefined;
+						} else {
+							$rootScope.showAlert(alert);
+						}
+					}, (alert.current.type == 'error' ? 5000 : 1000));
+				} else {
+					$rootScope.alerts.current = undefined;
+				}
+			};
+
+			$rootScope.addAlert = function (message, type) {
+				var newAlert = {message: message, type: type};
+				if (!$rootScope.alerts.timeout) {
+					// Timeout for message queue is not running, start one
+					$rootScope.alerts.queue.push(newAlert);
+					$rootScope.showAlert($rootScope.alerts);
+				} else {
+					$rootScope.alerts.queue.push(newAlert);
+				}
+			};
+
+			$rootScope.dismissAlert = function () {
+				if (!$rootScope.alerts.timeout) {
+					$rootScope.alerts.current = undefined;
+				} else {
+					$timeout.cancel($rootScope.alerts.timeout);
+					$rootScope.alerts.timeout = undefined;
+					$rootScope.showAlert($rootScope.alerts);
+				}
+			};
+
+			$rootScope.addAlertPromise = function (promise, type) {
+				if (promise) {
+					promise.then(function (data) {
+						$rootScope.addAlert(data, type);
+					});
+				}
+			};
+
+		}
+	])
+
+	// Moment-JS date-formatting filter
+	.filter('dateformat', function () {
+		return function (date, format) {
+			if (date) {
+				if (format) {
+					return moment(date).format(format);
+				} else {
+					return moment(date).calendar();
+				}
+			}
+			return '';
+		};
+	});
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties-assignment-controller.js b/len-activiti/src/main/resources/static/editor-app/configuration/properties-assignment-controller.js
index 8aa39d7..cf8c686 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties-assignment-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties-assignment-controller.js
@@ -20,431 +20,420 @@
 /*
  * Assignment
  */
-var KisBpmAssignmentCtrl = [ '$scope', '$modal','$http', function($scope, $modal,$http) {
+var KisBpmAssignmentCtrl = ['$scope', '$modal', '$http', function ($scope, $modal, $http) {
 
-    // Config for the modal window
-    var opts = {
-        template:  'editor-app/configuration/properties/assignment-popup.html?version=' + Date.now(),
-        scope: $scope
-    };
+	// Config for the modal window
+	var opts = {
+		template: 'editor-app/configuration/properties/assignment-popup.html?version=' + Date.now(),
+		scope: $scope
+	};
 
-    // Open the dialog
-    $modal(opts);
+	// Open the dialog
+	$modal(opts);
 }];
 
-var KisBpmAssignmentPopupCtrl = [ '$scope','$modal', function($scope, $modal) {
-
-    // Put json representing assignment on scope
-    if ($scope.property.value !== undefined && $scope.property.value !== null
-        && $scope.property.value.assignment !== undefined
-        && $scope.property.value.assignment !== null)
-    {
-        $scope.assignment = $scope.property.value.assignment;
-    } else {
-        $scope.assignment = {};
-    }
-
-    if ($scope.assignment.candidateUsers == undefined || $scope.assignment.candidateUsers.length == 0)
-    {
-        $scope.assignment.candidateUsers = [{value: ''}];
-    }
-
-
-    if ($scope.assignment.assignee == undefined || $scope.assignment.assignee == '')
-    {
-        $scope.assignment.assignee =  '';
-    }
-
-    // Click handler for + button after enum value
-    var userValueIndex = 1;
-    $scope.addCandidateUserValue = function(index) {
-        $scope.assignment.candidateUsers.splice(index + 1, 0, {value: 'value ' + userValueIndex++});
-    };
-
-    // Click handler for - button after enum value
-    $scope.removeCandidateUserValue = function(index) {
-        $scope.assignment.candidateUsers.splice(index, 1);
-    };
-
-    if ($scope.assignment.candidateGroups == undefined || $scope.assignment.candidateGroups.length == 0)
-    {
-        $scope.assignment.candidateGroups = [{value: ''}];
-    }
-
-    var groupValueIndex = 1;
-    $scope.addCandidateGroupValue = function(index) {
-        $scope.assignment.candidateGroups.splice(index + 1, 0, {value: 'value ' + groupValueIndex++});
-    };
-
-    // Click handler for - button after enum value
-    $scope.removeCandidateGroupValue = function(index) {
-        $scope.assignment.candidateGroups.splice(index, 1);
-    };
-
-    //Open the dialog to select users
-    $scope.choseAssignment = function(flag) {
-
-        var opts = {
-            template:  'editor-app/configuration/properties/assignment-popup-popup.html?version=' + Date.now(),
-            scope: $scope
-        };
-        $scope.choseAssignmentFlag = flag;
-        // Open the dialog
-        $modal(opts);
-    }
-
-    //Open the dialog to select candidateGroups
-    $scope.choseCandidateGroups = function(){
-        var opts = {
-            template:  'editor-app/configuration/properties/assignment-candidateGroup.html?version=' + Date.now(),
-            scope: $scope
-        };
-        // Open the dialog
-        $modal(opts);
-    }
-
-    $scope.save = function() {
-
-        $scope.property.value = {};
-        handleAssignmentInput($scope);
-        $scope.property.value.assignment = $scope.assignment;
-
-        $scope.updatePropertyInModel($scope.property);
-        $scope.close();
-    };
-
-    // Close button handler
-    $scope.close = function() {
-        handleAssignmentInput($scope);
-        $scope.property.mode = 'read';
-        $scope.$hide();
-    };
-
-    var handleAssignmentInput = function($scope) {
-        if ($scope.assignment.candidateUsers)
-        {
-            var emptyUsers = true;
-            var toRemoveIndexes = [];
-            for (var i = 0; i < $scope.assignment.candidateUsers.length; i++)
-            {
-                if ($scope.assignment.candidateUsers[i].value != '')
-                {
-                    emptyUsers = false;
-                }
-                else
-                {
-                    toRemoveIndexes[toRemoveIndexes.length] = i;
-                }
-            }
-
-            for (var i = 0; i < toRemoveIndexes.length; i++)
-            {
-                $scope.assignment.candidateUsers.splice(toRemoveIndexes[i], 1);
-            }
-
-            if (emptyUsers)
-            {
-                $scope.assignment.candidateUsers = undefined;
-            }
-        }
-
-        if ($scope.assignment.candidateGroups)
-        {
-            var emptyGroups = true;
-            var toRemoveIndexes = [];
-            for (var i = 0; i < $scope.assignment.candidateGroups.length; i++)
-            {
-                if ($scope.assignment.candidateGroups[i].value != '')
-                {
-                    emptyGroups = false;
-                }
-                else
-                {
-                    toRemoveIndexes[toRemoveIndexes.length] = i;
-                }
-            }
-
-            for (var i = 0; i < toRemoveIndexes.length; i++)
-            {
-                $scope.assignment.candidateGroups.splice(toRemoveIndexes[i], 1);
-            }
-
-            if (emptyGroups)
-            {
-                $scope.assignment.candidateGroups = undefined;
-            }
-        }
-    };
-
-    //因新打开的界面上选定的数据要传输到当前modal中，所以使用此方式，这是angular.js中不同控制器之间传输数据的方式
-    $scope.$on('choseAssigneesStr', function(event,data,nameData){
-        var infos = data.split(",");
-        var nameInfos =nameData.split(",");
-        // $scope.assignment.candidateUsers= [];
-        var currentArr=$scope.assignment.candidateUsers;
-        for(var i=0;i<infos.length;i++){
-            var flag=false;
-            for(var j=0;j<currentArr.length;j++){
-                if(currentArr[j].value===infos[i]){
-                    flag=true;
-                    break;
-                }
-            }
-            if(!flag){
-                currentArr.push({value:infos[i],nameValue:nameInfos[i]})
-            }
-        }
-        /*for(var i=0;i<nam.length;i++)
-        {
-            $scope.assignment.candidateUsers.push({value:inf[i],nameValue:nam[i]});
-            // $scope.assignment.candidateUsers[i].value = infos[i];
-        }*/
-        //清空第一个
-        if( (!$scope.assignment.candidateUsers[0].value )||$scope.assignment.candidateUsers[0]=='' )
-        {
-            //清空第一个元素
-            $scope.assignment.candidateUsers.splice(0,1);
-        }
-    });
-
-
-    $scope.$on('choseAssigneeStr', function(event,data){
-        $scope.assignment.assignee = data;
-    });
-    $scope.$on('choseAssigneeNameStr', function(event,data){
-        $scope.assignment.assigneeshowname = data;
-    });
-    $scope.$on('choseCandidateGroupsStr', function(event,data,nameData){
-        // $scope.assignment.candidateGroups[0].value = data;
-        var infos = data.split(",");
-        var nameInfos =nameData.split(",");
-        var currentArr=$scope.assignment.candidateGroups;
-        for(var i=0;i<infos.length;i++){
-            var flag=false;
-            for(var j=0;j<currentArr.length;j++){
-                if(currentArr[j].value===infos[i]){
-                    flag=true;
-                    break;
-                }
-            }
-            if(!flag){
-                currentArr.push({value:infos[i],nameValue:nameInfos[i]})
-            }
-        }
-
-        //清空第一个
-        if( (!$scope.assignment.candidateGroups[0].value )||$scope.assignment.candidateGroups[0]=='' )
-        {
-            //清空第一个元素
-            $scope.assignment.candidateGroups.splice(0,1);
-        }
-
-    });
+var KisBpmAssignmentPopupCtrl = ['$scope', '$modal', function ($scope, $modal) {
+
+	// Put json representing assignment on scope
+	if ($scope.property.value !== undefined && $scope.property.value !== null
+		&& $scope.property.value.assignment !== undefined
+		&& $scope.property.value.assignment !== null) {
+		$scope.assignment = $scope.property.value.assignment;
+	} else {
+		$scope.assignment = {};
+	}
+
+	if ($scope.assignment.candidateUsers == undefined || $scope.assignment.candidateUsers.length == 0) {
+		$scope.assignment.candidateUsers = [{value: ''}];
+	}
+
+
+	if ($scope.assignment.assignee == undefined || $scope.assignment.assignee == '') {
+		$scope.assignment.assignee = '';
+	}
+
+	// Click handler for + button after enum value
+	var userValueIndex = 1;
+	$scope.addCandidateUserValue = function (index) {
+		$scope.assignment.candidateUsers.splice(index + 1, 0, {value: 'value ' + userValueIndex++});
+	};
+
+	// Click handler for - button after enum value
+	$scope.removeCandidateUserValue = function (index) {
+		$scope.assignment.candidateUsers.splice(index, 1);
+	};
+
+	if ($scope.assignment.candidateGroups == undefined || $scope.assignment.candidateGroups.length == 0) {
+		$scope.assignment.candidateGroups = [{value: ''}];
+	}
+
+	var groupValueIndex = 1;
+	$scope.addCandidateGroupValue = function (index) {
+		$scope.assignment.candidateGroups.splice(index + 1, 0, {value: 'value ' + groupValueIndex++});
+	};
+
+	// Click handler for - button after enum value
+	$scope.removeCandidateGroupValue = function (index) {
+		$scope.assignment.candidateGroups.splice(index, 1);
+	};
+
+	//Open the dialog to select users
+	$scope.choseAssignment = function (flag) {
+
+		var opts = {
+			template: 'editor-app/configuration/properties/assignment-popup-popup.html?version=' + Date.now(),
+			scope: $scope
+		};
+		$scope.choseAssignmentFlag = flag;
+		// Open the dialog
+		$modal(opts);
+	}
+
+	//Open the dialog to select candidateGroups
+	$scope.choseCandidateGroups = function () {
+		var opts = {
+			template: 'editor-app/configuration/properties/assignment-candidateGroup.html?version=' + Date.now(),
+			scope: $scope
+		};
+		// Open the dialog
+		$modal(opts);
+	}
+
+	$scope.save = function () {
+
+		$scope.property.value = {};
+		handleAssignmentInput($scope);
+		$scope.property.value.assignment = $scope.assignment;
+
+		$scope.updatePropertyInModel($scope.property);
+		$scope.close();
+	};
+
+	// Close button handler
+	$scope.close = function () {
+		handleAssignmentInput($scope);
+		$scope.property.mode = 'read';
+		$scope.$hide();
+	};
+
+	var handleAssignmentInput = function ($scope) {
+		if ($scope.assignment.candidateUsers) {
+			var emptyUsers = true;
+			var toRemoveIndexes = [];
+			for (var i = 0; i < $scope.assignment.candidateUsers.length; i++) {
+				if ($scope.assignment.candidateUsers[i].value != '') {
+					emptyUsers = false;
+				} else {
+					toRemoveIndexes[toRemoveIndexes.length] = i;
+				}
+			}
+
+			for (var i = 0; i < toRemoveIndexes.length; i++) {
+				$scope.assignment.candidateUsers.splice(toRemoveIndexes[i], 1);
+			}
+
+			if (emptyUsers) {
+				$scope.assignment.candidateUsers = undefined;
+			}
+		}
+
+		if ($scope.assignment.candidateGroups) {
+			var emptyGroups = true;
+			var toRemoveIndexes = [];
+			for (var i = 0; i < $scope.assignment.candidateGroups.length; i++) {
+				if ($scope.assignment.candidateGroups[i].value != '') {
+					emptyGroups = false;
+				} else {
+					toRemoveIndexes[toRemoveIndexes.length] = i;
+				}
+			}
+
+			for (var i = 0; i < toRemoveIndexes.length; i++) {
+				$scope.assignment.candidateGroups.splice(toRemoveIndexes[i], 1);
+			}
+
+			if (emptyGroups) {
+				$scope.assignment.candidateGroups = undefined;
+			}
+		}
+	};
+
+	//因新打开的界面上选定的数据要传输到当前modal中，所以使用此方式，这是angular.js中不同控制器之间传输数据的方式
+	$scope.$on('choseAssigneesStr', function (event, data, nameData) {
+		var infos = data.split(",");
+		var nameInfos = nameData.split(",");
+		// $scope.assignment.candidateUsers= [];
+		var currentArr = $scope.assignment.candidateUsers;
+		for (var i = 0; i < infos.length; i++) {
+			var flag = false;
+			for (var j = 0; j < currentArr.length; j++) {
+				if (currentArr[j].value === infos[i]) {
+					flag = true;
+					break;
+				}
+			}
+			if (!flag) {
+				currentArr.push({value: infos[i], nameValue: nameInfos[i]})
+			}
+		}
+		/*for(var i=0;i<nam.length;i++)
+		{
+			$scope.assignment.candidateUsers.push({value:inf[i],nameValue:nam[i]});
+			// $scope.assignment.candidateUsers[i].value = infos[i];
+		}*/
+		//清空第一个
+		if ((!$scope.assignment.candidateUsers[0].value) || $scope.assignment.candidateUsers[0] == '') {
+			//清空第一个元素
+			$scope.assignment.candidateUsers.splice(0, 1);
+		}
+	});
+
+
+	$scope.$on('choseAssigneeStr', function (event, data) {
+		$scope.assignment.assignee = data;
+	});
+	$scope.$on('choseAssigneeNameStr', function (event, data) {
+		$scope.assignment.assigneeshowname = data;
+	});
+	$scope.$on('choseCandidateGroupsStr', function (event, data, nameData) {
+		// $scope.assignment.candidateGroups[0].value = data;
+		var infos = data.split(",");
+		var nameInfos = nameData.split(",");
+		var currentArr = $scope.assignment.candidateGroups;
+		for (var i = 0; i < infos.length; i++) {
+			var flag = false;
+			for (var j = 0; j < currentArr.length; j++) {
+				if (currentArr[j].value === infos[i]) {
+					flag = true;
+					break;
+				}
+			}
+			if (!flag) {
+				currentArr.push({value: infos[i], nameValue: nameInfos[i]})
+			}
+		}
+
+		//清空第一个
+		if ((!$scope.assignment.candidateGroups[0].value) || $scope.assignment.candidateGroups[0] == '') {
+			//清空第一个元素
+			$scope.assignment.candidateGroups.splice(0, 1);
+		}
+
+	});
 }];
 
-var KisBpmChoseAssignmentCtrl = ['$scope', '$http', function($scope, $http) {
-
-    $scope.paginationConf = {
-        currentPage: 1,
-        totalItems: 1,
-        itemsPerPage: 15,
-        pagesLength: 15,
-        perPageOptions: [10, 20, 30, 40, 50],
-        onChange: function(){
-
-        }
-    };
-    //初始化左边菜单栏数据，并触发第一个菜单的点击事件
-    var roles = [];
-    var initId;
-    $scope.getAllRoles = function (successCallback) {
-        $http({
-            method: 'get',
-            headers: {'Accept': 'application/json',
-                'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
-            url: '../role/showaLLRoleList'})
-
-            .success(function (data, status, headers, config) {
-                var obj = data;
-                for (var i=0; i<obj.length; i++) {
-                    if (i==0) {
-                        initId = obj[i].id + "";
-                        $scope.getAllAccountByRole(initId);
-                    }
-                    roles.push({id:obj[i].id,name:obj[i].remark});
-                }
-                $scope.roles = roles;
-            })
-            .error(function (data, status, headers, config) {
-            });
-    };
-    $scope.getAllRoles(function(){});
-
-    function getDetail(value,page,limit)
-    {
-
-        $http({
-            method: 'get',
-            headers: {'Accept': 'application/json',
-                'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
-            url: '../user/listByRoleId?roleId='+value+"&page="+page+"&limit="+limit})
-            .success(function (data, status, headers, config) {
-                //封装数据
-                var obj = data.users;
-                if (data != null) {
-                    var accounts = [];
-                    for (var i=0; i<obj.length; i++) {
-                        accounts.push({id:obj[i].id, code : obj[i].username, name : obj[i].realName, index:i});
-                    }
-                    $scope.accounts=accounts;
-                }
-                refreshPage(value,page,limit,data.totals);
-            })
-            .error(function (data, status, headers, config) {
-            });
-    }
-
-    function refreshPage(value,currentPage,perPage,totals) {
-        //初始化表格
-        $scope.paginationConf = {
-            currentPage: currentPage,
-            totalItems: totals,
-            itemsPerPage: perPage,
-            pagesLength: 5,
-            perPageOptions: [10, 20, 30, 40, 50],
-            onChange: function(){
-                var currentPage = $scope.paginationConf.currentPage;
-                getDetail(value,currentPage,perPage);
-            }
-        };
-    }
-
-    //模态框左侧组的点击事件：根据所点击的组获取当前组的所有用户
-    $scope.getAllAccountByRole = function(value) {
-        //初始化表格
-        getDetail(value,1,10);
-    };
-
-    // Close button handler
-    $scope.close = function() {
-        $scope.$hide();
-    };
-    $scope.formData = {};
-    $scope.candidateUser={};
-
-    //Save Data
-    $scope.save = function() {
-        if ($scope.choseAssignmentFlag == "assignee") {
-
-            var choseAssignees = $scope.accounts;
-            var choseAssigneesStr = "";
-            var choseAssigneesNameStr = "";
-            for (var i=0;i<choseAssignees.length; i++) {
-                if (choseAssignees[i].checked) {
-                    choseAssigneesStr = choseAssignees[i].id;
-                    choseAssigneesNameStr = choseAssignees[i].name;
-                    break;
-                }
-            }
-            $scope.$emit('choseAssigneeStr', choseAssigneesStr);
-            $scope.$emit('choseAssigneeNameStr', choseAssigneesNameStr);
-        } else if ($scope.choseAssignmentFlag == "assignees") {
-            var choseAssignees = $scope.accounts;
-            var choseAssigneesStr = "";
-            var choseAssigneesNameStr = "";
-            for (var i=0;i<choseAssignees.length; i++) {
-                if (choseAssignees[i].selected) {
-                    choseAssigneesStr += choseAssignees[i].id + ",";
-                    choseAssigneesNameStr +=choseAssignees[i].name + ",";
-                }
-            }
-            choseAssigneesStr = choseAssigneesStr.substring(0,choseAssigneesStr.length-1);
-            choseAssigneesNameStr = choseAssigneesNameStr.substring(0,choseAssigneesNameStr.length-1);
-            $scope.$emit('choseAssigneesStr', choseAssigneesStr,choseAssigneesNameStr);
-        }
-        $scope.close();
-    };
-    $scope.selectAll = function($event) {
-        var checkbox = $event.target;
-        var choseAssignees = $scope.accounts;
-        for (var i=0;i<choseAssignees.length; i++) {
-            if (checkbox.checked) {
-                choseAssignees[i].selected = true;
-            } else {
-                choseAssignees[i].selected = false;
-            }
-        }
-        $scope.accounts = choseAssignees;
-    };
-
-    $scope.selectThis=function($event,account){
-        if($scope.choseAssignmentFlag == "assignee"){
-            account.checked=!account.checked;
-        }else{
-            account.selected=!account.selected;
-        }
-
-    };
+var KisBpmChoseAssignmentCtrl = ['$scope', '$http', function ($scope, $http) {
+
+	$scope.paginationConf = {
+		currentPage: 1,
+		totalItems: 1,
+		itemsPerPage: 15,
+		pagesLength: 15,
+		perPageOptions: [10, 20, 30, 40, 50],
+		onChange: function () {
+
+		}
+	};
+	//初始化左边菜单栏数据，并触发第一个菜单的点击事件
+	var roles = [];
+	var initId;
+	$scope.getAllRoles = function (successCallback) {
+		$http({
+			method: 'get',
+			headers: {
+				'Accept': 'application/json',
+				'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+			},
+			url: '../role/showaLLRoleList'
+		})
+
+			.success(function (data, status, headers, config) {
+				var obj = data;
+				for (var i = 0; i < obj.length; i++) {
+					if (i == 0) {
+						initId = obj[i].id + "";
+						$scope.getAllAccountByRole(initId);
+					}
+					roles.push({id: obj[i].id, name: obj[i].remark});
+				}
+				$scope.roles = roles;
+			})
+			.error(function (data, status, headers, config) {
+			});
+	};
+	$scope.getAllRoles(function () {
+	});
+
+	function getDetail(value, page, limit) {
+
+		$http({
+			method: 'get',
+			headers: {
+				'Accept': 'application/json',
+				'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+			},
+			url: '../user/listByRoleId?roleId=' + value + "&page=" + page + "&limit=" + limit
+		})
+			.success(function (data, status, headers, config) {
+				//封装数据
+				var obj = data.users;
+				if (data != null) {
+					var accounts = [];
+					for (var i = 0; i < obj.length; i++) {
+						accounts.push({id: obj[i].id, code: obj[i].username, name: obj[i].realName, index: i});
+					}
+					$scope.accounts = accounts;
+				}
+				refreshPage(value, page, limit, data.totals);
+			})
+			.error(function (data, status, headers, config) {
+			});
+	}
+
+	function refreshPage(value, currentPage, perPage, totals) {
+		//初始化表格
+		$scope.paginationConf = {
+			currentPage: currentPage,
+			totalItems: totals,
+			itemsPerPage: perPage,
+			pagesLength: 5,
+			perPageOptions: [10, 20, 30, 40, 50],
+			onChange: function () {
+				var currentPage = $scope.paginationConf.currentPage;
+				getDetail(value, currentPage, perPage);
+			}
+		};
+	}
+
+	//模态框左侧组的点击事件：根据所点击的组获取当前组的所有用户
+	$scope.getAllAccountByRole = function (value) {
+		//初始化表格
+		getDetail(value, 1, 10);
+	};
+
+	// Close button handler
+	$scope.close = function () {
+		$scope.$hide();
+	};
+	$scope.formData = {};
+	$scope.candidateUser = {};
+
+	//Save Data
+	$scope.save = function () {
+		if ($scope.choseAssignmentFlag == "assignee") {
+
+			var choseAssignees = $scope.accounts;
+			var choseAssigneesStr = "";
+			var choseAssigneesNameStr = "";
+			for (var i = 0; i < choseAssignees.length; i++) {
+				if (choseAssignees[i].checked) {
+					choseAssigneesStr = choseAssignees[i].id;
+					choseAssigneesNameStr = choseAssignees[i].name;
+					break;
+				}
+			}
+			$scope.$emit('choseAssigneeStr', choseAssigneesStr);
+			$scope.$emit('choseAssigneeNameStr', choseAssigneesNameStr);
+		} else if ($scope.choseAssignmentFlag == "assignees") {
+			var choseAssignees = $scope.accounts;
+			var choseAssigneesStr = "";
+			var choseAssigneesNameStr = "";
+			for (var i = 0; i < choseAssignees.length; i++) {
+				if (choseAssignees[i].selected) {
+					choseAssigneesStr += choseAssignees[i].id + ",";
+					choseAssigneesNameStr += choseAssignees[i].name + ",";
+				}
+			}
+			choseAssigneesStr = choseAssigneesStr.substring(0, choseAssigneesStr.length - 1);
+			choseAssigneesNameStr = choseAssigneesNameStr.substring(0, choseAssigneesNameStr.length - 1);
+			$scope.$emit('choseAssigneesStr', choseAssigneesStr, choseAssigneesNameStr);
+		}
+		$scope.close();
+	};
+	$scope.selectAll = function ($event) {
+		var checkbox = $event.target;
+		var choseAssignees = $scope.accounts;
+		for (var i = 0; i < choseAssignees.length; i++) {
+			if (checkbox.checked) {
+				choseAssignees[i].selected = true;
+			} else {
+				choseAssignees[i].selected = false;
+			}
+		}
+		$scope.accounts = choseAssignees;
+	};
+
+	$scope.selectThis = function ($event, account) {
+		if ($scope.choseAssignmentFlag == "assignee") {
+			account.checked = !account.checked;
+		} else {
+			account.selected = !account.selected;
+		}
+
+	};
 }];
 
-var KisBpmChoseCandidateGroupsCtrl = ['$scope', '$http', function($scope, $http) {
-
-    var candidateGroups = [];
-    $scope.getAllRoles = function (successCallback) {
-        $http({
-            method: 'get',
-            headers: {'Accept': 'application/json',
-                'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
-            url: '../role/showaLLRoleList'})
-            .success(function (data, status, headers, config) {
-                var obj = data;
-                for (var i=0; i<obj.length; i++) {
-                    candidateGroups.push({id:obj[i].id,name:obj[i].name,description:obj[i].remark});
-                }
-                $scope.candidateGroups = candidateGroups;
-            })
-            .error(function (data, status, headers, config) {
-            });
-    };
-    $scope.getAllRoles(function() {
-    });
-
-    // Close button handler
-    $scope.close = function() {
-        $scope.$hide();
-    };
-
-    $scope.save = function() {
-        var choseCandidateGroups = $scope.candidateGroups;
-        var choseCandidateGroupsStr = "";
-        var choseAssigneesNameStr = "";
-        for (var i=0;i<choseCandidateGroups.length; i++) {
-            if (choseCandidateGroups[i].selected) {
-                choseCandidateGroupsStr += choseCandidateGroups[i].id + ",";
-                choseAssigneesNameStr +=choseCandidateGroups[i].description + ",";
-            }
-        }
-        choseCandidateGroupsStr = choseCandidateGroupsStr.substring(0,choseCandidateGroupsStr.length-1);
-        choseAssigneesNameStr = choseAssigneesNameStr.substring(0,choseAssigneesNameStr.length-1);
-        $scope.$emit('choseCandidateGroupsStr', choseCandidateGroupsStr,choseAssigneesNameStr);
-        $scope.close();
-    }
-
-    $scope.selectAll = function($event) {
-        var checkbox = $event.target;
-        var candidateGroups = $scope.candidateGroups;
-        for (var i=0;i<candidateGroups.length; i++) {
-            if (checkbox.checked) {
-                candidateGroups[i].selected = true;
-            } else {
-                candidateGroups[i].selected = false;
-            }
-        }
-        $scope.candidateGroups = candidateGroups;
-    }
-
-    $scope.selectThis=function($event,candidateGroup){
-        candidateGroup.selected=!candidateGroup.selected;
-    }
+var KisBpmChoseCandidateGroupsCtrl = ['$scope', '$http', function ($scope, $http) {
+
+	var candidateGroups = [];
+	$scope.getAllRoles = function (successCallback) {
+		$http({
+			method: 'get',
+			headers: {
+				'Accept': 'application/json',
+				'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+			},
+			url: '../role/showaLLRoleList'
+		})
+			.success(function (data, status, headers, config) {
+				var obj = data;
+				for (var i = 0; i < obj.length; i++) {
+					candidateGroups.push({id: obj[i].id, name: obj[i].name, description: obj[i].remark});
+				}
+				$scope.candidateGroups = candidateGroups;
+			})
+			.error(function (data, status, headers, config) {
+			});
+	};
+	$scope.getAllRoles(function () {
+	});
+
+	// Close button handler
+	$scope.close = function () {
+		$scope.$hide();
+	};
+
+	$scope.save = function () {
+		var choseCandidateGroups = $scope.candidateGroups;
+		var choseCandidateGroupsStr = "";
+		var choseAssigneesNameStr = "";
+		for (var i = 0; i < choseCandidateGroups.length; i++) {
+			if (choseCandidateGroups[i].selected) {
+				choseCandidateGroupsStr += choseCandidateGroups[i].id + ",";
+				choseAssigneesNameStr += choseCandidateGroups[i].description + ",";
+			}
+		}
+		choseCandidateGroupsStr = choseCandidateGroupsStr.substring(0, choseCandidateGroupsStr.length - 1);
+		choseAssigneesNameStr = choseAssigneesNameStr.substring(0, choseAssigneesNameStr.length - 1);
+		$scope.$emit('choseCandidateGroupsStr', choseCandidateGroupsStr, choseAssigneesNameStr);
+		$scope.close();
+	}
+
+	$scope.selectAll = function ($event) {
+		var checkbox = $event.target;
+		var candidateGroups = $scope.candidateGroups;
+		for (var i = 0; i < candidateGroups.length; i++) {
+			if (checkbox.checked) {
+				candidateGroups[i].selected = true;
+			} else {
+				candidateGroups[i].selected = false;
+			}
+		}
+		$scope.candidateGroups = candidateGroups;
+	}
+
+	$scope.selectThis = function ($event, candidateGroup) {
+		candidateGroup.selected = !candidateGroup.selected;
+	}
 
 }];
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties-condition-expression-controller.js b/len-activiti/src/main/resources/static/editor-app/configuration/properties-condition-expression-controller.js
index 6c2be38..6b933b0 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties-condition-expression-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties-condition-expression-controller.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -21,38 +21,38 @@
  * Condition expression
  */
 
-var KisBpmConditionExpressionCtrl = [ '$scope', '$modal', function($scope, $modal) {
+var KisBpmConditionExpressionCtrl = ['$scope', '$modal', function ($scope, $modal) {
 
-    // Config for the modal window
-    var opts = {
-        template:  'editor-app/configuration/properties/condition-expression-popup.html?version=' + Date.now(),
-        scope: $scope
-    };
+	// Config for the modal window
+	var opts = {
+		template: 'editor-app/configuration/properties/condition-expression-popup.html?version=' + Date.now(),
+		scope: $scope
+	};
 
-    // Open the dialog
-    $modal(opts);
+	// Open the dialog
+	$modal(opts);
 }];
 
-var KisBpmConditionExpressionPopupCtrl = [ '$scope', '$translate', '$http', function($scope, $translate, $http) {
+var KisBpmConditionExpressionPopupCtrl = ['$scope', '$translate', '$http', function ($scope, $translate, $http) {
 
 	// Put json representing condition on scope
-    if ($scope.property.value !== undefined && $scope.property.value !== null) {
-
-        $scope.conditionExpression = {value: $scope.property.value};
-        
-    } else {
-        $scope.conditionExpression = {value: ''};
-    }
-	
-    $scope.save = function() {
-        $scope.property.value = $scope.conditionExpression.value;
-        $scope.updatePropertyInModel($scope.property);
-        $scope.close();
-    };
-
-    // Close button handler
-    $scope.close = function() {
-    	$scope.property.mode = 'read';
-    	$scope.$hide();
-    };
-}];
\ No newline at end of file
+	if ($scope.property.value !== undefined && $scope.property.value !== null) {
+
+		$scope.conditionExpression = {value: $scope.property.value};
+
+	} else {
+		$scope.conditionExpression = {value: ''};
+	}
+
+	$scope.save = function () {
+		$scope.property.value = $scope.conditionExpression.value;
+		$scope.updatePropertyInModel($scope.property);
+		$scope.close();
+	};
+
+	// Close button handler
+	$scope.close = function () {
+		$scope.property.mode = 'read';
+		$scope.$hide();
+	};
+}];
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties-default-controllers.js b/len-activiti/src/main/resources/static/editor-app/configuration/properties-default-controllers.js
index f3f4760..136f876 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties-default-controllers.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties-default-controllers.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -21,34 +21,34 @@
  * String controller
  */
 
-var KisBpmStringPropertyCtrl = [ '$scope', function ($scope) {
+var KisBpmStringPropertyCtrl = ['$scope', function ($scope) {
 
 	$scope.shapeId = $scope.selectedShape.id;
 	$scope.valueFlushed = false;
-    /** Handler called when input field is blurred */
-    $scope.inputBlurred = function() {
-    	$scope.valueFlushed = true;
-    	if ($scope.property.value) {
-    		$scope.property.value = $scope.property.value.replace(/(<([^>]+)>)/ig,"");
-    	}
-        $scope.updatePropertyInModel($scope.property);
-    };
-
-    $scope.enterPressed = function(keyEvent) {
-    	if (keyEvent && keyEvent.which === 13) {
-    		keyEvent.preventDefault();
-	        $scope.inputBlurred(); // we want to do the same as if the user would blur the input field
-    	}
-    };
-    
-    $scope.$on('$destroy', function controllerDestroyed() {
-    	if(!$scope.valueFlushed) {
-    		if ($scope.property.value) {
-        		$scope.property.value = $scope.property.value.replace(/(<([^>]+)>)/ig,"");
-        	}
-    		$scope.updatePropertyInModel($scope.property, $scope.shapeId);
-    	}
-    });
+	/** Handler called when input field is blurred */
+	$scope.inputBlurred = function () {
+		$scope.valueFlushed = true;
+		if ($scope.property.value) {
+			$scope.property.value = $scope.property.value.replace(/(<([^>]+)>)/ig, "");
+		}
+		$scope.updatePropertyInModel($scope.property);
+	};
+
+	$scope.enterPressed = function (keyEvent) {
+		if (keyEvent && keyEvent.which === 13) {
+			keyEvent.preventDefault();
+			$scope.inputBlurred(); // we want to do the same as if the user would blur the input field
+		}
+	};
+
+	$scope.$on('$destroy', function controllerDestroyed() {
+		if (!$scope.valueFlushed) {
+			if ($scope.property.value) {
+				$scope.property.value = $scope.property.value.replace(/(<([^>]+)>)/ig, "");
+			}
+			$scope.updatePropertyInModel($scope.property, $scope.shapeId);
+		}
+	});
 
 }];
 
@@ -58,31 +58,31 @@ var KisBpmStringPropertyCtrl = [ '$scope', function ($scope) {
 
 var KisBpmBooleanPropertyCtrl = ['$scope', function ($scope) {
 
-    $scope.changeValue = function() {
-        if ($scope.property.key === 'oryx-defaultflow' && $scope.property.value) {
-            var selectedShape = $scope.selectedShape;
-            if (selectedShape) {
-                var incomingNodes = selectedShape.getIncomingShapes();
-                if (incomingNodes && incomingNodes.length > 0) {
-                    // get first node, since there can be only one for a sequence flow
-                    var rootNode = incomingNodes[0];
-                    var flows = rootNode.getOutgoingShapes();
-                    if (flows && flows.length > 1) {
-                        // in case there are more flows, check if another flow is already defined as default
-                        for (var i = 0; i < flows.length; i++) {
-                            if (flows[i].resourceId != selectedShape.resourceId) {
-                                var defaultFlowProp = flows[i].properties['oryx-defaultflow'];
-                                if (defaultFlowProp) {
-                                    flows[i].setProperty('oryx-defaultflow', false, true);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        $scope.updatePropertyInModel($scope.property);
-    };
+	$scope.changeValue = function () {
+		if ($scope.property.key === 'oryx-defaultflow' && $scope.property.value) {
+			var selectedShape = $scope.selectedShape;
+			if (selectedShape) {
+				var incomingNodes = selectedShape.getIncomingShapes();
+				if (incomingNodes && incomingNodes.length > 0) {
+					// get first node, since there can be only one for a sequence flow
+					var rootNode = incomingNodes[0];
+					var flows = rootNode.getOutgoingShapes();
+					if (flows && flows.length > 1) {
+						// in case there are more flows, check if another flow is already defined as default
+						for (var i = 0; i < flows.length; i++) {
+							if (flows[i].resourceId != selectedShape.resourceId) {
+								var defaultFlowProp = flows[i].properties['oryx-defaultflow'];
+								if (defaultFlowProp) {
+									flows[i].setProperty('oryx-defaultflow', false, true);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		$scope.updatePropertyInModel($scope.property);
+	};
 
 }];
 
@@ -90,26 +90,26 @@ var KisBpmBooleanPropertyCtrl = ['$scope', function ($scope) {
  * Text controller
  */
 
-var KisBpmTextPropertyCtrl = [ '$scope', '$modal', function($scope, $modal) {
+var KisBpmTextPropertyCtrl = ['$scope', '$modal', function ($scope, $modal) {
 
-    var opts = {
-        template:  'editor-app/configuration/properties/text-popup.html?version=' + Date.now(),
-        scope: $scope
-    };
+	var opts = {
+		template: 'editor-app/configuration/properties/text-popup.html?version=' + Date.now(),
+		scope: $scope
+	};
 
-    // Open the dialog
-    $modal(opts);
+	// Open the dialog
+	$modal(opts);
 }];
 
-var KisBpmTextPropertyPopupCtrl = ['$scope', function($scope) {
-    
-    $scope.save = function() {
-        $scope.updatePropertyInModel($scope.property);
-        $scope.close();
-    };
-
-    $scope.close = function() {
-        $scope.property.mode = 'read';
-        $scope.$hide();
-    };
-}];
\ No newline at end of file
+var KisBpmTextPropertyPopupCtrl = ['$scope', function ($scope) {
+
+	$scope.save = function () {
+		$scope.updatePropertyInModel($scope.property);
+		$scope.close();
+	};
+
+	$scope.close = function () {
+		$scope.property.mode = 'read';
+		$scope.$hide();
+	};
+}];
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties-event-listeners-controller.js b/len-activiti/src/main/resources/static/editor-app/configuration/properties-event-listeners-controller.js
index 6bb0fac..643549c 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties-event-listeners-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties-event-listeners-controller.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -21,246 +21,219 @@
  * Execution listeners
  */
 
-var KisBpmEventListenersCtrl = [ '$scope', '$modal', '$timeout', '$translate', function($scope, $modal, $timeout, $translate) {
+var KisBpmEventListenersCtrl = ['$scope', '$modal', '$timeout', '$translate', function ($scope, $modal, $timeout, $translate) {
 
-    // Config for the modal window
-    var opts = {
-        template:  'editor-app/configuration/properties/event-listeners-popup.html?version=' + Date.now(),
-        scope: $scope
-    };
+	// Config for the modal window
+	var opts = {
+		template: 'editor-app/configuration/properties/event-listeners-popup.html?version=' + Date.now(),
+		scope: $scope
+	};
 
-    // Open the dialog
-    $modal(opts);
+	// Open the dialog
+	$modal(opts);
 }];
 
 //Need a separate controller for the modal window due to https://github.com/angular-ui/bootstrap/issues/259
 // Will be fixed in a newer version of Angular UI
-var KisBpmEventListenersPopupCtrl = [ '$scope', '$q', '$translate', function($scope, $q, $translate) {
-
-    // Put json representing form properties on scope
-    if ($scope.property.value !== undefined && $scope.property.value !== null
-        && $scope.property.value.eventListeners !== undefined
-        && $scope.property.value.eventListeners !== null) {
-    	
-    	if ($scope.property.value.eventListeners.constructor == String)
-    	{
-    		$scope.eventListeners = JSON.parse($scope.property.value.eventListeners);
-    	}
-    	else
-    	{
-    		// Note that we clone the json object rather then setting it directly,
-            // this to cope with the fact that the user can click the cancel button and no changes should have happened
-    		$scope.eventListeners = angular.copy($scope.property.value.eventListeners);
-    	}
-    	
-    } else {
-        $scope.eventListeners = [];
-    }
-
-    // Array to contain selected properties (yes - we only can select one, but ng-grid isn't smart enough)
-    $scope.selectedListeners = [];
-    $scope.translationsRetrieved = false;
-    
-    $scope.labels = {};
-    
-    var eventPromise = $translate('PROPERTY.EXECUTIONLISTENERS.EVENT');
-    var implementationPromise = $translate('PROPERTY.EXECUTIONLISTENERS.FIELDS.IMPLEMENTATION');
-    var namePromise = $translate('PROPERTY.EXECUTIONLISTENERS.FIELDS.NAME');
-    
-    $q.all([eventPromise, implementationPromise, namePromise]).then(function(results) { 
-        $scope.labels.eventLabel = results[0];
-        $scope.labels.implementationLabel = results[1];
-        $scope.labels.nameLabel = results[2];
-        $scope.translationsRetrieved = true;
-        
-        // Config for grid
-        $scope.gridOptions = {
-            data: 'eventListeners',
-            enableRowReordering: true,
-            headerRowHeight: 28,
-            multiSelect: false,
-            keepLastSelected : false,
-            selectedItems: $scope.selectedListeners,
-            afterSelectionChange: function (rowItem, event) {
-            	
-            	if ($scope.selectedListeners.length > 0)
-            	{
-	            	var fields = $scope.selectedListeners[0].fields;
-	            	if (fields !== undefined && fields !== null)
-	            	{
-	            		for (var i = 0; i < fields.length; i++)
-	            		{
-	            			var field = fields[i];
-	            			if (field.stringValue !== undefined && field.stringValue !== '')
-	                    	{
-	            				field.implementation = field.stringValue;
-	                    	}
-	                    	else if (field.expression !== undefined && field.expression !== '')
-	                    	{
-	                    		field.implementation = field.expression;
-	                    	}
-	                    	else if (field.string !== undefined && field.string !== '')
-	                    	{
-	                    		field.implementation = field.string;
-	                    	}
-	            		}
-	            	}
-	            	
-	            	if (!$scope.selectedListeners[0].events || $scope.selectedListeners[0].events.length == 0)
-	                {
-	                	$scope.selectedListeners[0].events = [{event: ''}];
-	                }
-            	}
-            },
-            columnDefs: [{ field: 'event', displayName: $scope.labels.eventLabel },
-                { field: 'implementation', displayName: $scope.labels.implementationLabel }]
-        };
-    });
-    
-    // Click handler for + button after enum value
-    $scope.addEventValue = function(index) {
-        $scope.selectedListeners[0].events.splice(index + 1, 0, {event: ''});
-    };
-
-    // Click handler for - button after enum value
-    $scope.removeEventValue = function(index) {
-        $scope.selectedListeners[0].events.splice(index, 1);
-        $scope.listenerDetailsChanged();
-    };
-    
-    $scope.listenerDetailsChanged = function() {
-    	var listener = $scope.selectedListeners[0];
-    	if (listener.events)
-    	{
-    		var eventText = '';
-    		for (var i = 0; i < listener.events.length; i++)
-    		{
-    			if (i > 0)
-    			{
-    				eventText += ", ";
-    			}
-    			eventText += listener.events[i].event;
-    		}
-    		$scope.selectedListeners[0].event = eventText;
-    	}
-    	
-    	if (listener.rethrowEvent)
-    	{
-    		var implementationText = '';
-    		if (listener.rethrowType && listener.rethrowType.length > 0)
-    		{
-    			if (listener.rethrowType === 'error' && listener.errorcode !== '')
-	        	{
-	        		implementationText = "Rethrow as error " + listener.errorcode;
-	        	}
-    			else if (listener.rethrowType === 'message' && listener.messagename !== '')
-	        	{
-	        		implementationText = "Rethrow as message " + listener.messagename;
-	        	}
-    			else if ((listener.rethrowType === 'signal' || listener.rethrowType === 'globalSignal') && listener.signalname !== '')
-	        	{
-	        		implementationText = "Rethrow as signal " + listener.signalname;
-	        	}
-    		}
-    		$scope.selectedListeners[0].implementation = implementationText;
-    	}
-    	else
-    	{
-        	if ($scope.selectedListeners[0].className !== '')
-        	{
-        		$scope.selectedListeners[0].implementation = $scope.selectedListeners[0].className;
-        	}
-        	else if ($scope.selectedListeners[0].delegateExpression !== '')
-        	{
-        		$scope.selectedListeners[0].implementation = $scope.selectedListeners[0].delegateExpression;
-        	}
-        	else
-        	{
-        		$scope.selectedListeners[0].implementation = '';
-        	}
-    	}
-    };
-
-    // Click handler for add button
-    $scope.addNewListener = function() {
-        $scope.eventListeners.push({ event : '',
-            implementation : '',
-            className : '',
-            delegateExpression: '',
-            retrowEvent: false});
-    };
-
-    // Click handler for remove button
-    $scope.removeListener = function() {
-        if ($scope.selectedListeners.length > 0) {
-            var index = $scope.eventListeners.indexOf($scope.selectedListeners[0]);
-            $scope.gridOptions.selectItem(index, false);
-            $scope.eventListeners.splice(index, 1);
-
-            $scope.selectedListeners.length = 0;
-            if (index < $scope.eventListeners.length) {
-                $scope.gridOptions.selectItem(index + 1, true);
-            } else if ($scope.eventListeners.length > 0) {
-                $scope.gridOptions.selectItem(index - 1, true);
-            }
-        }
-    };
-
-    // Click handler for up button
-    $scope.moveListenerUp = function() {
-        if ($scope.selectedListeners.length > 0) {
-            var index = $scope.eventListeners.indexOf($scope.selectedListeners[0]);
-            if (index != 0) { // If it's the first, no moving up of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.eventListeners[index];
-                $scope.eventListeners.splice(index, 1);
-                $timeout(function(){
-                    $scope.eventListeners.splice(index + -1, 0, temp);
-                }, 100);
-
-            }
-        }
-    };
-
-    // Click handler for down button
-    $scope.moveListenerDown = function() {
-        if ($scope.selectedListeners.length > 0) {
-            var index = $scope.eventListeners.indexOf($scope.selectedListeners[0]);
-            if (index != $scope.eventListeners.length - 1) { // If it's the last element, no moving down of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.eventListeners[index];
-                $scope.eventListeners.splice(index, 1);
-                $timeout(function(){
-                    $scope.eventListeners.splice(index + 1, 0, temp);
-                }, 100);
-
-            }
-        }
-    };
-
-    // Click handler for save button
-    $scope.save = function() {
-
-        if ($scope.eventListeners.length > 0) {
-            $scope.property.value = {};
-            $scope.property.value.eventListeners = $scope.eventListeners;
-        } else {
-            $scope.property.value = null;
-        }
-
-        $scope.updatePropertyInModel($scope.property);
-        $scope.close();
-    };
-
-    $scope.cancel = function() {
-    	$scope.property.mode = 'read';
-    	$scope.$hide();
-    };
-
-    // Close button handler
-    $scope.close = function() {
-    	$scope.property.mode = 'read';
-    	$scope.$hide();
-    };
-
-}];
\ No newline at end of file
+var KisBpmEventListenersPopupCtrl = ['$scope', '$q', '$translate', function ($scope, $q, $translate) {
+
+	// Put json representing form properties on scope
+	if ($scope.property.value !== undefined && $scope.property.value !== null
+		&& $scope.property.value.eventListeners !== undefined
+		&& $scope.property.value.eventListeners !== null) {
+
+		if ($scope.property.value.eventListeners.constructor == String) {
+			$scope.eventListeners = JSON.parse($scope.property.value.eventListeners);
+		} else {
+			// Note that we clone the json object rather then setting it directly,
+			// this to cope with the fact that the user can click the cancel button and no changes should have happened
+			$scope.eventListeners = angular.copy($scope.property.value.eventListeners);
+		}
+
+	} else {
+		$scope.eventListeners = [];
+	}
+
+	// Array to contain selected properties (yes - we only can select one, but ng-grid isn't smart enough)
+	$scope.selectedListeners = [];
+	$scope.translationsRetrieved = false;
+
+	$scope.labels = {};
+
+	var eventPromise = $translate('PROPERTY.EXECUTIONLISTENERS.EVENT');
+	var implementationPromise = $translate('PROPERTY.EXECUTIONLISTENERS.FIELDS.IMPLEMENTATION');
+	var namePromise = $translate('PROPERTY.EXECUTIONLISTENERS.FIELDS.NAME');
+
+	$q.all([eventPromise, implementationPromise, namePromise]).then(function (results) {
+		$scope.labels.eventLabel = results[0];
+		$scope.labels.implementationLabel = results[1];
+		$scope.labels.nameLabel = results[2];
+		$scope.translationsRetrieved = true;
+
+		// Config for grid
+		$scope.gridOptions = {
+			data: 'eventListeners',
+			enableRowReordering: true,
+			headerRowHeight: 28,
+			multiSelect: false,
+			keepLastSelected: false,
+			selectedItems: $scope.selectedListeners,
+			afterSelectionChange: function (rowItem, event) {
+
+				if ($scope.selectedListeners.length > 0) {
+					var fields = $scope.selectedListeners[0].fields;
+					if (fields !== undefined && fields !== null) {
+						for (var i = 0; i < fields.length; i++) {
+							var field = fields[i];
+							if (field.stringValue !== undefined && field.stringValue !== '') {
+								field.implementation = field.stringValue;
+							} else if (field.expression !== undefined && field.expression !== '') {
+								field.implementation = field.expression;
+							} else if (field.string !== undefined && field.string !== '') {
+								field.implementation = field.string;
+							}
+						}
+					}
+
+					if (!$scope.selectedListeners[0].events || $scope.selectedListeners[0].events.length == 0) {
+						$scope.selectedListeners[0].events = [{event: ''}];
+					}
+				}
+			},
+			columnDefs: [{field: 'event', displayName: $scope.labels.eventLabel},
+				{field: 'implementation', displayName: $scope.labels.implementationLabel}]
+		};
+	});
+
+	// Click handler for + button after enum value
+	$scope.addEventValue = function (index) {
+		$scope.selectedListeners[0].events.splice(index + 1, 0, {event: ''});
+	};
+
+	// Click handler for - button after enum value
+	$scope.removeEventValue = function (index) {
+		$scope.selectedListeners[0].events.splice(index, 1);
+		$scope.listenerDetailsChanged();
+	};
+
+	$scope.listenerDetailsChanged = function () {
+		var listener = $scope.selectedListeners[0];
+		if (listener.events) {
+			var eventText = '';
+			for (var i = 0; i < listener.events.length; i++) {
+				if (i > 0) {
+					eventText += ", ";
+				}
+				eventText += listener.events[i].event;
+			}
+			$scope.selectedListeners[0].event = eventText;
+		}
+
+		if (listener.rethrowEvent) {
+			var implementationText = '';
+			if (listener.rethrowType && listener.rethrowType.length > 0) {
+				if (listener.rethrowType === 'error' && listener.errorcode !== '') {
+					implementationText = "Rethrow as error " + listener.errorcode;
+				} else if (listener.rethrowType === 'message' && listener.messagename !== '') {
+					implementationText = "Rethrow as message " + listener.messagename;
+				} else if ((listener.rethrowType === 'signal' || listener.rethrowType === 'globalSignal') && listener.signalname !== '') {
+					implementationText = "Rethrow as signal " + listener.signalname;
+				}
+			}
+			$scope.selectedListeners[0].implementation = implementationText;
+		} else {
+			if ($scope.selectedListeners[0].className !== '') {
+				$scope.selectedListeners[0].implementation = $scope.selectedListeners[0].className;
+			} else if ($scope.selectedListeners[0].delegateExpression !== '') {
+				$scope.selectedListeners[0].implementation = $scope.selectedListeners[0].delegateExpression;
+			} else {
+				$scope.selectedListeners[0].implementation = '';
+			}
+		}
+	};
+
+	// Click handler for add button
+	$scope.addNewListener = function () {
+		$scope.eventListeners.push({
+			event: '',
+			implementation: '',
+			className: '',
+			delegateExpression: '',
+			retrowEvent: false
+		});
+	};
+
+	// Click handler for remove button
+	$scope.removeListener = function () {
+		if ($scope.selectedListeners.length > 0) {
+			var index = $scope.eventListeners.indexOf($scope.selectedListeners[0]);
+			$scope.gridOptions.selectItem(index, false);
+			$scope.eventListeners.splice(index, 1);
+
+			$scope.selectedListeners.length = 0;
+			if (index < $scope.eventListeners.length) {
+				$scope.gridOptions.selectItem(index + 1, true);
+			} else if ($scope.eventListeners.length > 0) {
+				$scope.gridOptions.selectItem(index - 1, true);
+			}
+		}
+	};
+
+	// Click handler for up button
+	$scope.moveListenerUp = function () {
+		if ($scope.selectedListeners.length > 0) {
+			var index = $scope.eventListeners.indexOf($scope.selectedListeners[0]);
+			if (index != 0) { // If it's the first, no moving up of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.eventListeners[index];
+				$scope.eventListeners.splice(index, 1);
+				$timeout(function () {
+					$scope.eventListeners.splice(index + -1, 0, temp);
+				}, 100);
+
+			}
+		}
+	};
+
+	// Click handler for down button
+	$scope.moveListenerDown = function () {
+		if ($scope.selectedListeners.length > 0) {
+			var index = $scope.eventListeners.indexOf($scope.selectedListeners[0]);
+			if (index != $scope.eventListeners.length - 1) { // If it's the last element, no moving down of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.eventListeners[index];
+				$scope.eventListeners.splice(index, 1);
+				$timeout(function () {
+					$scope.eventListeners.splice(index + 1, 0, temp);
+				}, 100);
+
+			}
+		}
+	};
+
+	// Click handler for save button
+	$scope.save = function () {
+
+		if ($scope.eventListeners.length > 0) {
+			$scope.property.value = {};
+			$scope.property.value.eventListeners = $scope.eventListeners;
+		} else {
+			$scope.property.value = null;
+		}
+
+		$scope.updatePropertyInModel($scope.property);
+		$scope.close();
+	};
+
+	$scope.cancel = function () {
+		$scope.property.mode = 'read';
+		$scope.$hide();
+	};
+
+	// Close button handler
+	$scope.close = function () {
+		$scope.property.mode = 'read';
+		$scope.$hide();
+	};
+
+}];
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties-execution-listeners-controller.js b/len-activiti/src/main/resources/static/editor-app/configuration/properties-execution-listeners-controller.js
index abe74e5..9cbbd54 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties-execution-listeners-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties-execution-listeners-controller.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -21,306 +21,277 @@
  * Execution listeners
  */
 
-var KisBpmExecutionListenersCtrl = [ '$scope', '$modal', '$timeout', '$translate', function($scope, $modal, $timeout, $translate) {
+var KisBpmExecutionListenersCtrl = ['$scope', '$modal', '$timeout', '$translate', function ($scope, $modal, $timeout, $translate) {
 
-    // Config for the modal window
-    var opts = {
-        template:  'editor-app/configuration/properties/execution-listeners-popup.html?version=' + Date.now(),
-        scope: $scope
-    };
+	// Config for the modal window
+	var opts = {
+		template: 'editor-app/configuration/properties/execution-listeners-popup.html?version=' + Date.now(),
+		scope: $scope
+	};
 
-    // Open the dialog
-    $modal(opts);
+	// Open the dialog
+	$modal(opts);
 }];
 
-var KisBpmExecutionListenersPopupCtrl = [ '$scope', '$q', '$translate', function($scope, $q, $translate) {
-
-    // Put json representing form properties on scope
-    if ($scope.property.value !== undefined && $scope.property.value !== null
-        && $scope.property.value.executionListeners !== undefined
-        && $scope.property.value.executionListeners !== null) {
-        
-        if ($scope.property.value.executionListeners.constructor == String)
-        {
-            $scope.executionListeners = JSON.parse($scope.property.value.executionListeners);
-        }
-        else
-        {
-            // Note that we clone the json object rather then setting it directly,
-            // this to cope with the fact that the user can click the cancel button and no changes should have happened
-            $scope.executionListeners = angular.copy($scope.property.value.executionListeners);
-        }
-        
-        for (var i = 0; i < $scope.executionListeners.length; i++)
-        {
-            var executionListener = $scope.executionListeners[i];
-            if (executionListener.className !== undefined && executionListener.className !== '')
-            {
-                executionListener.implementation = executionListener.className;
-            }
-            else if (executionListener.expression !== undefined && executionListener.expression !== '')
-            {
-                executionListener.implementation = executionListener.expression;
-            }
-            else if (executionListener.delegateExpression !== undefined && executionListener.delegateExpression !== '')
-            {
-                executionListener.implementation = executionListener.delegateExpression;
-            }
-        }
-    } else {
-        $scope.executionListeners = [];
-    }
-
-    // Array to contain selected properties (yes - we only can select one, but ng-grid isn't smart enough)
-    $scope.selectedListeners = [];
-    $scope.selectedFields = [];
-    $scope.translationsRetrieved = false;
-    
-    $scope.labels = {};
-    
-    var eventPromise = $translate('PROPERTY.EXECUTIONLISTENERS.EVENT');
-    var implementationPromise = $translate('PROPERTY.EXECUTIONLISTENERS.FIELDS.IMPLEMENTATION');
-    var namePromise = $translate('PROPERTY.EXECUTIONLISTENERS.FIELDS.NAME');
-    
-    $q.all([eventPromise, implementationPromise, namePromise]).then(function(results) { 
-        $scope.labels.eventLabel = results[0];
-        $scope.labels.implementationLabel = results[1];
-        $scope.labels.nameLabel = results[2];
-        $scope.translationsRetrieved = true;
-        
-        // Config for grid
-        $scope.gridOptions = {
-            data: 'executionListeners',
-            enableRowReordering: true,
-            headerRowHeight: 28,
-            multiSelect: false,
-            keepLastSelected : false,
-            selectedItems: $scope.selectedListeners,
-            afterSelectionChange: function (rowItem, event) {
-                $scope.selectedFields.length = 0;
-                if ($scope.selectedListeners.length > 0)
-                {
-                    var fields = $scope.selectedListeners[0].fields;
-                    if (fields !== undefined && fields !== null)
-                    {
-                        for (var i = 0; i < fields.length; i++)
-                        {
-                            var field = fields[i];
-                            if (field.stringValue !== undefined && field.stringValue !== '')
-                            {
-                                field.implementation = field.stringValue;
-                            }
-                            else if (field.expression !== undefined && field.expression !== '')
-                            {
-                                field.implementation = field.expression;
-                            }
-                            else if (field.string !== undefined && field.string !== '')
-                            {
-                                field.implementation = field.string;
-                            }
-                        }
-                    }
-                }
-            },
-            columnDefs: [{ field: 'event', displayName: $scope.labels.eventLabel },
-                { field: 'implementation', displayName: $scope.labels.implementationLabel }]
-        };
-        
-        // Config for field grid
-        $scope.gridFieldOptions = {
-            data: 'selectedListeners[0].fields',
-            enableRowReordering: true,
-            headerRowHeight: 28,
-            multiSelect: false,
-            keepLastSelected : false,
-            selectedItems: $scope.selectedFields,
-            columnDefs: [{ field: 'name', displayName: $scope.labels.nameLabel },
-                { field: 'implementation', displayName: $scope.labels.implementationLabel}]
-        };
-    });
-    
-    $scope.listenerDetailsChanged = function() {
-        if ($scope.selectedListeners[0].className !== '')
-        {
-            $scope.selectedListeners[0].implementation = $scope.selectedListeners[0].className;
-        }
-        else if ($scope.selectedListeners[0].expression !== '')
-        {
-            $scope.selectedListeners[0].implementation = $scope.selectedListeners[0].expression;
-        }
-        else if ($scope.selectedListeners[0].delegateExpression !== '')
-        {
-            $scope.selectedListeners[0].implementation = $scope.selectedListeners[0].delegateExpression;
-        }
-        else
-        {
-            $scope.selectedListeners[0].implementation = '';
-        }
-    };
-
-    // Click handler for add button
-    $scope.addNewListener = function() {
-        $scope.executionListeners.push({ event : 'start',
-            implementation : '',
-            className : '',
-            expression: '',
-            delegateExpression: ''});
-    };
-
-    // Click handler for remove button
-    $scope.removeListener = function() {
-        if ($scope.selectedListeners.length > 0) {
-            var index = $scope.executionListeners.indexOf($scope.selectedListeners[0]);
-            $scope.gridOptions.selectItem(index, false);
-            $scope.executionListeners.splice(index, 1);
-
-            $scope.selectedListeners.length = 0;
-            if (index < $scope.executionListeners.length) {
-                $scope.gridOptions.selectItem(index + 1, true);
-            } else if ($scope.executionListeners.length > 0) {
-                $scope.gridOptions.selectItem(index - 1, true);
-            }
-        }
-    };
-
-    // Click handler for up button
-    $scope.moveListenerUp = function() {
-        if ($scope.selectedListeners.length > 0) {
-            var index = $scope.executionListeners.indexOf($scope.selectedListeners[0]);
-            if (index != 0) { // If it's the first, no moving up of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.executionListeners[index];
-                $scope.executionListeners.splice(index, 1);
-                $timeout(function(){
-                    $scope.executionListeners.splice(index + -1, 0, temp);
-                }, 100);
-
-            }
-        }
-    };
-
-    // Click handler for down button
-    $scope.moveListenerDown = function() {
-        if ($scope.selectedListeners.length > 0) {
-            var index = $scope.executionListeners.indexOf($scope.selectedListeners[0]);
-            if (index != $scope.executionListeners.length - 1) { // If it's the last element, no moving down of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.executionListeners[index];
-                $scope.executionListeners.splice(index, 1);
-                $timeout(function(){
-                    $scope.executionListeners.splice(index + 1, 0, temp);
-                }, 100);
-
-            }
-        }
-    };
-    
-    $scope.fieldDetailsChanged = function() {
-        if ($scope.selectedFields[0].stringValue !== '')
-        {
-            $scope.selectedFields[0].implementation = $scope.selectedFields[0].stringValue;
-        }
-        else if ($scope.selectedFields[0].expression !== '')
-        {
-            $scope.selectedFields[0].implementation = $scope.selectedFields[0].expression;
-        }
-        else if ($scope.selectedFields[0].string !== '')
-        {
-            $scope.selectedFields[0].implementation = $scope.selectedFields[0].string;
-        }
-        else
-        {
-            $scope.selectedFields[0].implementation = '';
-        }
-    };
-
-    // Click handler for add button
-    $scope.addNewField = function() {
-        if ($scope.selectedListeners.length > 0)
-        {
-            if ($scope.selectedListeners[0].fields == undefined)
-            {
-                $scope.selectedListeners[0].fields = [];
-            }
-            $scope.selectedListeners[0].fields.push({ name : 'fieldName',
-                implementation : '',
-                stringValue : '',
-                expression: '',
-                string: ''});
-        }
-    };
-
-    // Click handler for remove button
-    $scope.removeField = function() {
-        if ($scope.selectedFields.length > 0) {
-            var index = $scope.selectedListeners[0].fields.indexOf($scope.selectedFields[0]);
-            $scope.gridFieldOptions.selectItem(index, false);
-            $scope.selectedListeners[0].fields.splice(index, 1);
-
-            $scope.selectedFields.length = 0;
-            if (index < $scope.selectedListeners[0].fields.length) {
-                $scope.gridFieldOptions.selectItem(index + 1, true);
-            } else if ($scope.selectedListeners[0].fields.length > 0) {
-                $scope.gridFieldOptions.selectItem(index - 1, true);
-            }
-        }
-    };
-
-    // Click handler for up button
-    $scope.moveFieldUp = function() {
-        if ($scope.selectedFields.length > 0) {
-            var index = $scope.selectedListeners[0].fields.indexOf($scope.selectedFields[0]);
-            if (index != 0) { // If it's the first, no moving up of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.selectedListeners[0].fields[index];
-                $scope.selectedListeners[0].fields.splice(index, 1);
-                $timeout(function(){
-                    $scope.selectedListeners[0].fields.splice(index + -1, 0, temp);
-                }, 100);
-
-            }
-        }
-    };
-
-    // Click handler for down button
-    $scope.moveFieldDown = function() {
-        if ($scope.selectedFields.length > 0) {
-            var index = $scope.selectedListeners[0].fields.indexOf($scope.selectedFields[0]);
-            if (index != $scope.selectedListeners[0].fields.length - 1) { // If it's the last element, no moving down of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.selectedListeners[0].fields[index];
-                $scope.selectedListeners[0].fields.splice(index, 1);
-                $timeout(function(){
-                    $scope.selectedListeners[0].fields.splice(index + 1, 0, temp);
-                }, 100);
-
-            }
-        }
-    };
-
-    // Click handler for save button
-    $scope.save = function() {
-
-        if ($scope.executionListeners.length > 0) {
-            $scope.property.value = {};
-            $scope.property.value.executionListeners = $scope.executionListeners;
-        } else {
-            $scope.property.value = null;
-        }
-
-        $scope.updatePropertyInModel($scope.property);
-        $scope.close();
-    };
-
-    $scope.cancel = function() {
-        $scope.$hide();
-        $scope.property.mode = 'read';
-    };
-
-    // Close button handler
-    $scope.close = function() {
-        $scope.$hide();
-        $scope.property.mode = 'read';
-    };
-
-}];
\ No newline at end of file
+var KisBpmExecutionListenersPopupCtrl = ['$scope', '$q', '$translate', function ($scope, $q, $translate) {
+
+	// Put json representing form properties on scope
+	if ($scope.property.value !== undefined && $scope.property.value !== null
+		&& $scope.property.value.executionListeners !== undefined
+		&& $scope.property.value.executionListeners !== null) {
+
+		if ($scope.property.value.executionListeners.constructor == String) {
+			$scope.executionListeners = JSON.parse($scope.property.value.executionListeners);
+		} else {
+			// Note that we clone the json object rather then setting it directly,
+			// this to cope with the fact that the user can click the cancel button and no changes should have happened
+			$scope.executionListeners = angular.copy($scope.property.value.executionListeners);
+		}
+
+		for (var i = 0; i < $scope.executionListeners.length; i++) {
+			var executionListener = $scope.executionListeners[i];
+			if (executionListener.className !== undefined && executionListener.className !== '') {
+				executionListener.implementation = executionListener.className;
+			} else if (executionListener.expression !== undefined && executionListener.expression !== '') {
+				executionListener.implementation = executionListener.expression;
+			} else if (executionListener.delegateExpression !== undefined && executionListener.delegateExpression !== '') {
+				executionListener.implementation = executionListener.delegateExpression;
+			}
+		}
+	} else {
+		$scope.executionListeners = [];
+	}
+
+	// Array to contain selected properties (yes - we only can select one, but ng-grid isn't smart enough)
+	$scope.selectedListeners = [];
+	$scope.selectedFields = [];
+	$scope.translationsRetrieved = false;
+
+	$scope.labels = {};
+
+	var eventPromise = $translate('PROPERTY.EXECUTIONLISTENERS.EVENT');
+	var implementationPromise = $translate('PROPERTY.EXECUTIONLISTENERS.FIELDS.IMPLEMENTATION');
+	var namePromise = $translate('PROPERTY.EXECUTIONLISTENERS.FIELDS.NAME');
+
+	$q.all([eventPromise, implementationPromise, namePromise]).then(function (results) {
+		$scope.labels.eventLabel = results[0];
+		$scope.labels.implementationLabel = results[1];
+		$scope.labels.nameLabel = results[2];
+		$scope.translationsRetrieved = true;
+
+		// Config for grid
+		$scope.gridOptions = {
+			data: 'executionListeners',
+			enableRowReordering: true,
+			headerRowHeight: 28,
+			multiSelect: false,
+			keepLastSelected: false,
+			selectedItems: $scope.selectedListeners,
+			afterSelectionChange: function (rowItem, event) {
+				$scope.selectedFields.length = 0;
+				if ($scope.selectedListeners.length > 0) {
+					var fields = $scope.selectedListeners[0].fields;
+					if (fields !== undefined && fields !== null) {
+						for (var i = 0; i < fields.length; i++) {
+							var field = fields[i];
+							if (field.stringValue !== undefined && field.stringValue !== '') {
+								field.implementation = field.stringValue;
+							} else if (field.expression !== undefined && field.expression !== '') {
+								field.implementation = field.expression;
+							} else if (field.string !== undefined && field.string !== '') {
+								field.implementation = field.string;
+							}
+						}
+					}
+				}
+			},
+			columnDefs: [{field: 'event', displayName: $scope.labels.eventLabel},
+				{field: 'implementation', displayName: $scope.labels.implementationLabel}]
+		};
+
+		// Config for field grid
+		$scope.gridFieldOptions = {
+			data: 'selectedListeners[0].fields',
+			enableRowReordering: true,
+			headerRowHeight: 28,
+			multiSelect: false,
+			keepLastSelected: false,
+			selectedItems: $scope.selectedFields,
+			columnDefs: [{field: 'name', displayName: $scope.labels.nameLabel},
+				{field: 'implementation', displayName: $scope.labels.implementationLabel}]
+		};
+	});
+
+	$scope.listenerDetailsChanged = function () {
+		if ($scope.selectedListeners[0].className !== '') {
+			$scope.selectedListeners[0].implementation = $scope.selectedListeners[0].className;
+		} else if ($scope.selectedListeners[0].expression !== '') {
+			$scope.selectedListeners[0].implementation = $scope.selectedListeners[0].expression;
+		} else if ($scope.selectedListeners[0].delegateExpression !== '') {
+			$scope.selectedListeners[0].implementation = $scope.selectedListeners[0].delegateExpression;
+		} else {
+			$scope.selectedListeners[0].implementation = '';
+		}
+	};
+
+	// Click handler for add button
+	$scope.addNewListener = function () {
+		$scope.executionListeners.push({
+			event: 'start',
+			implementation: '',
+			className: '',
+			expression: '',
+			delegateExpression: ''
+		});
+	};
+
+	// Click handler for remove button
+	$scope.removeListener = function () {
+		if ($scope.selectedListeners.length > 0) {
+			var index = $scope.executionListeners.indexOf($scope.selectedListeners[0]);
+			$scope.gridOptions.selectItem(index, false);
+			$scope.executionListeners.splice(index, 1);
+
+			$scope.selectedListeners.length = 0;
+			if (index < $scope.executionListeners.length) {
+				$scope.gridOptions.selectItem(index + 1, true);
+			} else if ($scope.executionListeners.length > 0) {
+				$scope.gridOptions.selectItem(index - 1, true);
+			}
+		}
+	};
+
+	// Click handler for up button
+	$scope.moveListenerUp = function () {
+		if ($scope.selectedListeners.length > 0) {
+			var index = $scope.executionListeners.indexOf($scope.selectedListeners[0]);
+			if (index != 0) { // If it's the first, no moving up of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.executionListeners[index];
+				$scope.executionListeners.splice(index, 1);
+				$timeout(function () {
+					$scope.executionListeners.splice(index + -1, 0, temp);
+				}, 100);
+
+			}
+		}
+	};
+
+	// Click handler for down button
+	$scope.moveListenerDown = function () {
+		if ($scope.selectedListeners.length > 0) {
+			var index = $scope.executionListeners.indexOf($scope.selectedListeners[0]);
+			if (index != $scope.executionListeners.length - 1) { // If it's the last element, no moving down of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.executionListeners[index];
+				$scope.executionListeners.splice(index, 1);
+				$timeout(function () {
+					$scope.executionListeners.splice(index + 1, 0, temp);
+				}, 100);
+
+			}
+		}
+	};
+
+	$scope.fieldDetailsChanged = function () {
+		if ($scope.selectedFields[0].stringValue !== '') {
+			$scope.selectedFields[0].implementation = $scope.selectedFields[0].stringValue;
+		} else if ($scope.selectedFields[0].expression !== '') {
+			$scope.selectedFields[0].implementation = $scope.selectedFields[0].expression;
+		} else if ($scope.selectedFields[0].string !== '') {
+			$scope.selectedFields[0].implementation = $scope.selectedFields[0].string;
+		} else {
+			$scope.selectedFields[0].implementation = '';
+		}
+	};
+
+	// Click handler for add button
+	$scope.addNewField = function () {
+		if ($scope.selectedListeners.length > 0) {
+			if ($scope.selectedListeners[0].fields == undefined) {
+				$scope.selectedListeners[0].fields = [];
+			}
+			$scope.selectedListeners[0].fields.push({
+				name: 'fieldName',
+				implementation: '',
+				stringValue: '',
+				expression: '',
+				string: ''
+			});
+		}
+	};
+
+	// Click handler for remove button
+	$scope.removeField = function () {
+		if ($scope.selectedFields.length > 0) {
+			var index = $scope.selectedListeners[0].fields.indexOf($scope.selectedFields[0]);
+			$scope.gridFieldOptions.selectItem(index, false);
+			$scope.selectedListeners[0].fields.splice(index, 1);
+
+			$scope.selectedFields.length = 0;
+			if (index < $scope.selectedListeners[0].fields.length) {
+				$scope.gridFieldOptions.selectItem(index + 1, true);
+			} else if ($scope.selectedListeners[0].fields.length > 0) {
+				$scope.gridFieldOptions.selectItem(index - 1, true);
+			}
+		}
+	};
+
+	// Click handler for up button
+	$scope.moveFieldUp = function () {
+		if ($scope.selectedFields.length > 0) {
+			var index = $scope.selectedListeners[0].fields.indexOf($scope.selectedFields[0]);
+			if (index != 0) { // If it's the first, no moving up of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.selectedListeners[0].fields[index];
+				$scope.selectedListeners[0].fields.splice(index, 1);
+				$timeout(function () {
+					$scope.selectedListeners[0].fields.splice(index + -1, 0, temp);
+				}, 100);
+
+			}
+		}
+	};
+
+	// Click handler for down button
+	$scope.moveFieldDown = function () {
+		if ($scope.selectedFields.length > 0) {
+			var index = $scope.selectedListeners[0].fields.indexOf($scope.selectedFields[0]);
+			if (index != $scope.selectedListeners[0].fields.length - 1) { // If it's the last element, no moving down of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.selectedListeners[0].fields[index];
+				$scope.selectedListeners[0].fields.splice(index, 1);
+				$timeout(function () {
+					$scope.selectedListeners[0].fields.splice(index + 1, 0, temp);
+				}, 100);
+
+			}
+		}
+	};
+
+	// Click handler for save button
+	$scope.save = function () {
+
+		if ($scope.executionListeners.length > 0) {
+			$scope.property.value = {};
+			$scope.property.value.executionListeners = $scope.executionListeners;
+		} else {
+			$scope.property.value = null;
+		}
+
+		$scope.updatePropertyInModel($scope.property);
+		$scope.close();
+	};
+
+	$scope.cancel = function () {
+		$scope.$hide();
+		$scope.property.mode = 'read';
+	};
+
+	// Close button handler
+	$scope.close = function () {
+		$scope.$hide();
+		$scope.property.mode = 'read';
+	};
+
+}];
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties-fields-controller.js b/len-activiti/src/main/resources/static/editor-app/configuration/properties-fields-controller.js
index 3066c04..1fb99e1 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties-fields-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties-fields-controller.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -21,172 +21,161 @@
  * Task listeners
  */
 
-var KisBpmFieldsCtrl = [ '$scope', '$modal', '$timeout', '$translate', function($scope, $modal, $timeout, $translate) {
+var KisBpmFieldsCtrl = ['$scope', '$modal', '$timeout', '$translate', function ($scope, $modal, $timeout, $translate) {
 
-    // Config for the modal window
-    var opts = {
-        template:  'editor-app/configuration/properties/fields-popup.html',
-        scope: $scope
-    };
+	// Config for the modal window
+	var opts = {
+		template: 'editor-app/configuration/properties/fields-popup.html',
+		scope: $scope
+	};
 
-    // Open the dialog
-    $modal(opts);
+	// Open the dialog
+	$modal(opts);
 }];
 
-var KisBpmFieldsPopupCtrl = [ '$scope', '$q', '$translate', function($scope, $q, $translate) {
-
-    // Put json representing form properties on scope
-    if ($scope.property.value !== undefined && $scope.property.value !== null
-        && $scope.property.value.fields !== undefined
-        && $scope.property.value.fields !== null) {
-        // Note that we clone the json object rather then setting it directly,
-        // this to cope with the fact that the user can click the cancel button and no changes should have happened
-        $scope.fields = angular.copy($scope.property.value.fields);
-        
-        for (var i = 0; i < $scope.fields.length; i++)
-		{
+var KisBpmFieldsPopupCtrl = ['$scope', '$q', '$translate', function ($scope, $q, $translate) {
+
+	// Put json representing form properties on scope
+	if ($scope.property.value !== undefined && $scope.property.value !== null
+		&& $scope.property.value.fields !== undefined
+		&& $scope.property.value.fields !== null) {
+		// Note that we clone the json object rather then setting it directly,
+		// this to cope with the fact that the user can click the cancel button and no changes should have happened
+		$scope.fields = angular.copy($scope.property.value.fields);
+
+		for (var i = 0; i < $scope.fields.length; i++) {
 			var field = $scope.fields[i];
-			if (field.stringValue !== undefined && field.stringValue !== '')
-        	{
+			if (field.stringValue !== undefined && field.stringValue !== '') {
 				field.implementation = field.stringValue;
-        	}
-        	else if (field.expression !== undefined && field.expression !== '')
-        	{
-        		field.implementation = field.expression;
-        	}
-        	else if (field.string !== undefined && field.string !== '')
-        	{
-        		field.implementation = field.string;
-        	}
+			} else if (field.expression !== undefined && field.expression !== '') {
+				field.implementation = field.expression;
+			} else if (field.string !== undefined && field.string !== '') {
+				field.implementation = field.string;
+			}
+		}
+
+	} else {
+		$scope.fields = [];
+	}
+
+	// Array to contain selected properties (yes - we only can select one, but ng-grid isn't smart enough)
+	$scope.selectedFields = [];
+	$scope.translationsRetrieved = false;
+	$scope.labels = {};
+
+	var namePromise = $translate('PROPERTY.FIELDS.NAME');
+	var implementationPromise = $translate('PROPERTY.FIELDS.IMPLEMENTATION');
+
+	$q.all([namePromise, implementationPromise]).then(function (results) {
+		$scope.labels.nameLabel = results[0];
+		$scope.labels.implementationLabel = results[1];
+		$scope.translationsRetrieved = true;
+
+		// Config for grid
+		$scope.gridOptions = {
+			data: 'fields',
+			enableRowReordering: true,
+			headerRowHeight: 28,
+			multiSelect: false,
+			keepLastSelected: false,
+			selectedItems: $scope.selectedFields,
+			columnDefs: [{field: 'name', displayName: $scope.labels.nameLabel},
+				{field: 'implementation', displayName: $scope.labels.implementationLabel}]
+		};
+	});
+
+	$scope.fieldDetailsChanged = function () {
+		if ($scope.selectedFields[0].stringValue != '') {
+			$scope.selectedFields[0].implementation = $scope.selectedFields[0].stringValue;
+		} else if ($scope.selectedFields[0].expression != '') {
+			$scope.selectedFields[0].implementation = $scope.selectedFields[0].expression;
+		} else if ($scope.selectedFields[0].string != '') {
+			$scope.selectedFields[0].implementation = $scope.selectedFields[0].string;
+		} else {
+			$scope.selectedFields[0].implementation = '';
+		}
+	};
+
+	// Click handler for add button
+	$scope.addNewField = function () {
+		$scope.fields.push({
+			name: 'fieldName',
+			implementation: '',
+			stringValue: '',
+			expression: '',
+			string: ''
+		});
+	};
+
+	// Click handler for remove button
+	$scope.removeField = function () {
+		if ($scope.selectedFields.length > 0) {
+			var index = $scope.fields.indexOf($scope.selectedFields[0]);
+			$scope.gridOptions.selectItem(index, false);
+			$scope.fields.splice(index, 1);
+
+			$scope.selectedFields.length = 0;
+			if (index < $scope.fields.length) {
+				$scope.gridOptions.selectItem(index + 1, true);
+			} else if ($scope.fields.length > 0) {
+				$scope.gridOptions.selectItem(index - 1, true);
+			}
+		}
+	};
+
+	// Click handler for up button
+	$scope.moveFieldUp = function () {
+		if ($scope.selectedFields.length > 0) {
+			var index = $scope.fields.indexOf($scope.selectedFields[0]);
+			if (index != 0) { // If it's the first, no moving up of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.fields[index];
+				$scope.fields.splice(index, 1);
+				$timeout(function () {
+					$scope.fields.splice(index + -1, 0, temp);
+				}, 100);
+
+			}
+		}
+	};
+
+	// Click handler for down button
+	$scope.moveFieldDown = function () {
+		if ($scope.selectedFields.length > 0) {
+			var index = $scope.fields.indexOf($scope.selectedFields[0]);
+			if (index != $scope.fields.length - 1) { // If it's the last element, no moving down of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.fields[index];
+				$scope.fields.splice(index, 1);
+				$timeout(function () {
+					$scope.fields.splice(index + 1, 0, temp);
+				}, 100);
+
+			}
 		}
-        
-    } else {
-        $scope.fields = [];
-    }
-
-    // Array to contain selected properties (yes - we only can select one, but ng-grid isn't smart enough)
-    $scope.selectedFields = [];
-    $scope.translationsRetrieved = false;
-    $scope.labels = {};
-
-    var namePromise = $translate('PROPERTY.FIELDS.NAME');
-    var implementationPromise = $translate('PROPERTY.FIELDS.IMPLEMENTATION');
-
-    $q.all([namePromise, implementationPromise]).then(function(results) {
-        $scope.labels.nameLabel = results[0];
-        $scope.labels.implementationLabel = results[1];
-        $scope.translationsRetrieved = true;
-
-        // Config for grid
-        $scope.gridOptions = {
-            data: 'fields',
-            enableRowReordering: true,
-            headerRowHeight: 28,
-            multiSelect: false,
-            keepLastSelected: false,
-            selectedItems: $scope.selectedFields,
-            columnDefs: [{field: 'name', displayName: $scope.labels.nameLabel},
-                {field: 'implementation', displayName: $scope.labels.implementationLabel}]
-        };
-    });
-    
-    $scope.fieldDetailsChanged = function() {
-    	if ($scope.selectedFields[0].stringValue != '')
-    	{
-    		$scope.selectedFields[0].implementation = $scope.selectedFields[0].stringValue;
-    	}
-    	else if ($scope.selectedFields[0].expression != '')
-    	{
-    		$scope.selectedFields[0].implementation = $scope.selectedFields[0].expression;
-    	}
-    	else if ($scope.selectedFields[0].string != '')
-    	{
-    		$scope.selectedFields[0].implementation = $scope.selectedFields[0].string;
-    	}
-    	else
-    	{
-    		$scope.selectedFields[0].implementation = '';
-    	}
-    };
-
-    // Click handler for add button
-    $scope.addNewField = function() {
-    	$scope.fields.push({ name : 'fieldName',
-            implementation : '',
-            stringValue : '',
-            expression: '',
-            string: ''});
-    };
-
-    // Click handler for remove button
-    $scope.removeField = function() {
-        if ($scope.selectedFields.length > 0) {
-            var index = $scope.fields.indexOf($scope.selectedFields[0]);
-            $scope.gridOptions.selectItem(index, false);
-            $scope.fields.splice(index, 1);
-
-            $scope.selectedFields.length = 0;
-            if (index < $scope.fields.length) {
-                $scope.gridOptions.selectItem(index + 1, true);
-            } else if ($scope.fields.length > 0) {
-                $scope.gridOptions.selectItem(index - 1, true);
-            }
-        }
-    };
-
-    // Click handler for up button
-    $scope.moveFieldUp = function() {
-        if ($scope.selectedFields.length > 0) {
-            var index = $scope.fields.indexOf($scope.selectedFields[0]);
-            if (index != 0) { // If it's the first, no moving up of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.fields[index];
-                $scope.fields.splice(index, 1);
-                $timeout(function(){
-                	$scope.fields.splice(index + -1, 0, temp);
-                }, 100);
-
-            }
-        }
-    };
-
-    // Click handler for down button
-    $scope.moveFieldDown = function() {
-        if ($scope.selectedFields.length > 0) {
-            var index = $scope.fields.indexOf($scope.selectedFields[0]);
-            if (index != $scope.fields.length - 1) { // If it's the last element, no moving down of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.fields[index];
-                $scope.fields.splice(index, 1);
-                $timeout(function(){
-                	$scope.fields.splice(index + 1, 0, temp);
-                }, 100);
-
-            }
-        }
-    };
-
-    // Click handler for save button
-    $scope.save = function() {
-
-        if ($scope.fields.length > 0) {
-            $scope.property.value = {};
-            $scope.property.value.fields = $scope.fields;
-        } else {
-            $scope.property.value = null;
-        }
-
-        $scope.updatePropertyInModel($scope.property);
-        $scope.close();
-    };
-
-    $scope.cancel = function() {
-        $scope.close();
-    };
-
-    // Close button handler
-    $scope.close = function() {
-        $scope.property.mode = 'read';
-        $scope.$hide();
-    };
-}];
\ No newline at end of file
+	};
+
+	// Click handler for save button
+	$scope.save = function () {
+
+		if ($scope.fields.length > 0) {
+			$scope.property.value = {};
+			$scope.property.value.fields = $scope.fields;
+		} else {
+			$scope.property.value = null;
+		}
+
+		$scope.updatePropertyInModel($scope.property);
+		$scope.close();
+	};
+
+	$scope.cancel = function () {
+		$scope.close();
+	};
+
+	// Close button handler
+	$scope.close = function () {
+		$scope.property.mode = 'read';
+		$scope.$hide();
+	};
+}];
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties-form-properties-controller.js b/len-activiti/src/main/resources/static/editor-app/configuration/properties-form-properties-controller.js
index 16f70b1..272a72c 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties-form-properties-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties-form-properties-controller.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -21,256 +21,261 @@
  * Form Properties
  */
 
-var KisBpmFormPropertiesCtrl = [ '$scope', '$modal', '$timeout', '$translate', function($scope, $modal, $timeout, $translate) {
+var KisBpmFormPropertiesCtrl = ['$scope', '$modal', '$timeout', '$translate', function ($scope, $modal, $timeout, $translate) {
 
-    // Config for the modal window
-    var opts = {
-        template:  'editor-app/configuration/properties/form-properties-popup.html?version=' + Date.now(),
-        scope: $scope
-    };
+	// Config for the modal window
+	var opts = {
+		template: 'editor-app/configuration/properties/form-properties-popup.html?version=' + Date.now(),
+		scope: $scope
+	};
 
-    // Open the dialog
-    $modal(opts);
+	// Open the dialog
+	$modal(opts);
 }];
 
-var KisBpmFormPropertiesPopupCtrl = ['$scope', '$q', '$translate', '$timeout', function($scope, $q, $translate, $timeout) {
-
-    // Put json representing form properties on scope
-    if ($scope.property.value !== undefined && $scope.property.value !== null
-        && $scope.property.value.formProperties !== undefined
-        && $scope.property.value.formProperties !== null) {
-        // Note that we clone the json object rather then setting it directly,
-        // this to cope with the fact that the user can click the cancel button and no changes should have happended
-        $scope.formProperties = angular.copy($scope.property.value.formProperties);
-        
-        for (var i = 0; i < $scope.formProperties.length; i++) {
-        	var formProperty = $scope.formProperties[i];
-        	if (formProperty.enumValues && formProperty.enumValues.length > 0) {
-        		for (var j = 0; j < formProperty.enumValues.length; j++) {
-        			var enumValue = formProperty.enumValues[j];
-        			if (!enumValue.id && !enumValue.name && enumValue.value) {
-        				enumValue.id = enumValue.value;
-        				enumValue.name = enumValue.value;
-        			}
-        		}
-        	}
-        }
-        
-    } else {
-        $scope.formProperties = [];
-    }
-
-    // Array to contain selected properties (yes - we only can select one, but ng-grid isn't smart enough)
-    $scope.selectedProperties = [];
-    $scope.selectedEnumValues = [];
-    
-    $scope.translationsRetrieved = false;
-    
-    $scope.labels = {};
-    
-    var idPromise = $translate('PROPERTY.FORMPROPERTIES.ID');
-    var namePromise = $translate('PROPERTY.FORMPROPERTIES.NAME');
-    var typePromise = $translate('PROPERTY.FORMPROPERTIES.TYPE');
-    
-    $q.all([idPromise, namePromise, typePromise]).then(function(results) { 
-    	$scope.labels.idLabel = results[0];
-        $scope.labels.nameLabel = results[1];
-        $scope.labels.typeLabel = results[2];
-        $scope.translationsRetrieved = true;
-        
-    	// Config for grid
-        $scope.gridOptions = {
-            data: 'formProperties',
-            enableRowReordering: true,
-            headerRowHeight: 28,
-            multiSelect: false,
-            keepLastSelected : false,
-            selectedItems: $scope.selectedProperties,
-            columnDefs: [{ field: 'id', displayName: $scope.labels.idLabel },
-                { field: 'name', displayName: $scope.labels.nameLabel},
-                { field: 'type', displayName: $scope.labels.typeLabel}]
-        };
-        
-        $scope.enumGridOptions = {
-    		data: 'selectedProperties[0].enumValues',
-            enableRowReordering: true,
-            headerRowHeight: 28,
-            multiSelect: false,
-            keepLastSelected : false,
-            selectedItems: $scope.selectedEnumValues,
-            columnDefs: [{ field: 'id', displayName: $scope.labels.idLabel },
-                { field: 'name', displayName: $scope.labels.nameLabel}]
-        }
-    });
-
-    // Handler for when the value of the type dropdown changes
-    $scope.propertyTypeChanged = function() {
-
-        // Check date. If date, show date pattern
-        if ($scope.selectedProperties[0].type === 'date') {
-            $scope.selectedProperties[0].datePattern = 'MM-dd-yyyy hh:mm';
-            
-        } else {
-            delete $scope.selectedProperties[0].datePattern;
-        }
-
-        // Check enum. If enum, show list of options
-        if ($scope.selectedProperties[0].type === 'enum') {
-            $scope.selectedProperties[0].enumValues = [ {id: 'value1', name: 'Value 1'}, {id: 'value2', name: 'Value 2'}];
-            
-        } else {
-            delete $scope.selectedProperties[0].enumValues;
-        }
-    };
-
-    // Click handler for add button
-    var propertyIndex = 1;
-    $scope.addNewProperty = function() {
-        $scope.formProperties.push({ id : 'new_property_' + propertyIndex++,
-            name : '',
-            type : 'string',
-            readable: true,
-            writable: true});
-        
-        $timeout(function(){
-        	$scope.gridOptions.selectItem($scope.formProperties.length - 1, true);
-        });
-    };
-
-    // Click handler for remove button
-    $scope.removeProperty = function() {
-        if ($scope.selectedProperties.length > 0) {
-            var index = $scope.formProperties.indexOf($scope.selectedProperties[0]);
-            $scope.gridOptions.selectItem(index, false);
-            $scope.formProperties.splice(index, 1);
-
-            $scope.selectedProperties.length = 0;
-            if (index < $scope.formProperties.length) {
-                $scope.gridOptions.selectItem(index + 1, true);
-            } else if ($scope.formProperties.length > 0) {
-                $scope.gridOptions.selectItem(index - 1, true);
-            }
-        }
-    };
-
-    // Click handler for up button
-    $scope.movePropertyUp = function() {
-        if ($scope.selectedProperties.length > 0) {
-            var index = $scope.formProperties.indexOf($scope.selectedProperties[0]);
-            if (index != 0) { // If it's the first, no moving up of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.formProperties[index];
-                $scope.formProperties.splice(index, 1);
-                $timeout(function(){
-                    $scope.formProperties.splice(index + -1, 0, temp);
-                }, 100);
-
-            }
-        }
-    };
-
-    // Click handler for down button
-    $scope.movePropertyDown = function() {
-        if ($scope.selectedProperties.length > 0) {
-            var index = $scope.formProperties.indexOf($scope.selectedProperties[0]);
-            if (index != $scope.formProperties.length - 1) { // If it's the last element, no moving down of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.formProperties[index];
-                $scope.formProperties.splice(index, 1);
-                $timeout(function(){
-                    $scope.formProperties.splice(index + 1, 0, temp);
-                }, 100);
-
-            }
-        }
-    };
-    
-    $scope.addNewEnumValue = function() {
-    	if ($scope.selectedProperties.length > 0) {
-	        $scope.selectedProperties[0].enumValues.push({ id : '', name : ''});
-    	}
-    	
-    	$timeout(function(){
-        	$scope.enumGridOptions.selectItem($scope.selectedProperties[0].enumValues.length - 1, true);
-        });
-    };
-
-    // Click handler for remove button
-    $scope.removeEnumValue = function() {
-    	if ($scope.selectedProperties.length > 0 && $scope.selectedEnumValues.length > 0) {
-            var index = $scope.selectedProperties[0].enumValues.indexOf($scope.selectedEnumValues[0]);
-            $scope.enumGridOptions.selectItem(index, false);
-            $scope.selectedProperties[0].enumValues.splice(index, 1);
-
-            $scope.selectedEnumValues.length = 0;
-            if (index < $scope.selectedProperties[0].enumValues.length) {
-            	$timeout(function(){
-            		$scope.enumGridOptions.selectItem(index + 1, true);
-            	});
-            	
-            } else if ($scope.selectedProperties[0].enumValues.length > 0) {
-            	$timeout(function(){
-            		$scope.enumGridOptions.selectItem(index - 1, true);
-            	});
-            }
-        }
-    };
-
-    // Click handler for up button
-    $scope.moveEnumValueUp = function() {
-    	if ($scope.selectedProperties.length > 0 && $scope.selectedEnumValues.length > 0) {
-    		var index = $scope.selectedProperties[0].enumValues.indexOf($scope.selectedEnumValues[0]);
-            if (index != 0) { // If it's the first, no moving up of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.selectedProperties[0].enumValues[index];
-                $scope.selectedProperties[0].enumValues.splice(index, 1);
-                $timeout(function(){
-                    $scope.selectedProperties[0].enumValues.splice(index + -1, 0, temp);
-                });
-
-            }
-        }
-    };
-
-    // Click handler for down button
-    $scope.moveEnumValueDown = function() {
-    	if ($scope.selectedProperties.length > 0 && $scope.selectedEnumValues.length > 0) {
-    		var index = $scope.selectedProperties[0].enumValues.indexOf($scope.selectedEnumValues[0]);
-            if (index != $scope.selectedProperties[0].enumValues.length - 1) { // If it's the last element, no moving down of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.selectedProperties[0].enumValues[index];
-                $scope.selectedProperties[0].enumValues.splice(index, 1);
-                $timeout(function(){
-                    $scope.selectedProperties[0].enumValues.splice(index + 1, 0, temp);
-                });
-
-            }
-        }
-    };
-
-    // Click handler for save button
-    $scope.save = function() {
-
-        if ($scope.formProperties.length > 0) {
-            $scope.property.value = {};
-            $scope.property.value.formProperties = $scope.formProperties;
-        } else {
-            $scope.property.value = null;
-        }
-
-        $scope.updatePropertyInModel($scope.property);
-        $scope.close();
-    };
-
-    $scope.cancel = function() {
-    	$scope.$hide();
-    	$scope.property.mode = 'read';
-    };
-
-    // Close button handler
-    $scope.close = function() {
-    	$scope.$hide();
-    	$scope.property.mode = 'read';
-    };
-
-}];
\ No newline at end of file
+var KisBpmFormPropertiesPopupCtrl = ['$scope', '$q', '$translate', '$timeout', function ($scope, $q, $translate, $timeout) {
+
+	// Put json representing form properties on scope
+	if ($scope.property.value !== undefined && $scope.property.value !== null
+		&& $scope.property.value.formProperties !== undefined
+		&& $scope.property.value.formProperties !== null) {
+		// Note that we clone the json object rather then setting it directly,
+		// this to cope with the fact that the user can click the cancel button and no changes should have happended
+		$scope.formProperties = angular.copy($scope.property.value.formProperties);
+
+		for (var i = 0; i < $scope.formProperties.length; i++) {
+			var formProperty = $scope.formProperties[i];
+			if (formProperty.enumValues && formProperty.enumValues.length > 0) {
+				for (var j = 0; j < formProperty.enumValues.length; j++) {
+					var enumValue = formProperty.enumValues[j];
+					if (!enumValue.id && !enumValue.name && enumValue.value) {
+						enumValue.id = enumValue.value;
+						enumValue.name = enumValue.value;
+					}
+				}
+			}
+		}
+
+	} else {
+		$scope.formProperties = [];
+	}
+
+	// Array to contain selected properties (yes - we only can select one, but ng-grid isn't smart enough)
+	$scope.selectedProperties = [];
+	$scope.selectedEnumValues = [];
+
+	$scope.translationsRetrieved = false;
+
+	$scope.labels = {};
+
+	var idPromise = $translate('PROPERTY.FORMPROPERTIES.ID');
+	var namePromise = $translate('PROPERTY.FORMPROPERTIES.NAME');
+	var typePromise = $translate('PROPERTY.FORMPROPERTIES.TYPE');
+
+	$q.all([idPromise, namePromise, typePromise]).then(function (results) {
+		$scope.labels.idLabel = results[0];
+		$scope.labels.nameLabel = results[1];
+		$scope.labels.typeLabel = results[2];
+		$scope.translationsRetrieved = true;
+
+		// Config for grid
+		$scope.gridOptions = {
+			data: 'formProperties',
+			enableRowReordering: true,
+			headerRowHeight: 28,
+			multiSelect: false,
+			keepLastSelected: false,
+			selectedItems: $scope.selectedProperties,
+			columnDefs: [{field: 'id', displayName: $scope.labels.idLabel},
+				{field: 'name', displayName: $scope.labels.nameLabel},
+				{field: 'type', displayName: $scope.labels.typeLabel}]
+		};
+
+		$scope.enumGridOptions = {
+			data: 'selectedProperties[0].enumValues',
+			enableRowReordering: true,
+			headerRowHeight: 28,
+			multiSelect: false,
+			keepLastSelected: false,
+			selectedItems: $scope.selectedEnumValues,
+			columnDefs: [{field: 'id', displayName: $scope.labels.idLabel},
+				{field: 'name', displayName: $scope.labels.nameLabel}]
+		}
+	});
+
+	// Handler for when the value of the type dropdown changes
+	$scope.propertyTypeChanged = function () {
+
+		// Check date. If date, show date pattern
+		if ($scope.selectedProperties[0].type === 'date') {
+			$scope.selectedProperties[0].datePattern = 'MM-dd-yyyy hh:mm';
+
+		} else {
+			delete $scope.selectedProperties[0].datePattern;
+		}
+
+		// Check enum. If enum, show list of options
+		if ($scope.selectedProperties[0].type === 'enum') {
+			$scope.selectedProperties[0].enumValues = [{id: 'value1', name: 'Value 1'}, {
+				id: 'value2',
+				name: 'Value 2'
+			}];
+
+		} else {
+			delete $scope.selectedProperties[0].enumValues;
+		}
+	};
+
+	// Click handler for add button
+	var propertyIndex = 1;
+	$scope.addNewProperty = function () {
+		$scope.formProperties.push({
+			id: 'new_property_' + propertyIndex++,
+			name: '',
+			type: 'string',
+			readable: true,
+			writable: true
+		});
+
+		$timeout(function () {
+			$scope.gridOptions.selectItem($scope.formProperties.length - 1, true);
+		});
+	};
+
+	// Click handler for remove button
+	$scope.removeProperty = function () {
+		if ($scope.selectedProperties.length > 0) {
+			var index = $scope.formProperties.indexOf($scope.selectedProperties[0]);
+			$scope.gridOptions.selectItem(index, false);
+			$scope.formProperties.splice(index, 1);
+
+			$scope.selectedProperties.length = 0;
+			if (index < $scope.formProperties.length) {
+				$scope.gridOptions.selectItem(index + 1, true);
+			} else if ($scope.formProperties.length > 0) {
+				$scope.gridOptions.selectItem(index - 1, true);
+			}
+		}
+	};
+
+	// Click handler for up button
+	$scope.movePropertyUp = function () {
+		if ($scope.selectedProperties.length > 0) {
+			var index = $scope.formProperties.indexOf($scope.selectedProperties[0]);
+			if (index != 0) { // If it's the first, no moving up of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.formProperties[index];
+				$scope.formProperties.splice(index, 1);
+				$timeout(function () {
+					$scope.formProperties.splice(index + -1, 0, temp);
+				}, 100);
+
+			}
+		}
+	};
+
+	// Click handler for down button
+	$scope.movePropertyDown = function () {
+		if ($scope.selectedProperties.length > 0) {
+			var index = $scope.formProperties.indexOf($scope.selectedProperties[0]);
+			if (index != $scope.formProperties.length - 1) { // If it's the last element, no moving down of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.formProperties[index];
+				$scope.formProperties.splice(index, 1);
+				$timeout(function () {
+					$scope.formProperties.splice(index + 1, 0, temp);
+				}, 100);
+
+			}
+		}
+	};
+
+	$scope.addNewEnumValue = function () {
+		if ($scope.selectedProperties.length > 0) {
+			$scope.selectedProperties[0].enumValues.push({id: '', name: ''});
+		}
+
+		$timeout(function () {
+			$scope.enumGridOptions.selectItem($scope.selectedProperties[0].enumValues.length - 1, true);
+		});
+	};
+
+	// Click handler for remove button
+	$scope.removeEnumValue = function () {
+		if ($scope.selectedProperties.length > 0 && $scope.selectedEnumValues.length > 0) {
+			var index = $scope.selectedProperties[0].enumValues.indexOf($scope.selectedEnumValues[0]);
+			$scope.enumGridOptions.selectItem(index, false);
+			$scope.selectedProperties[0].enumValues.splice(index, 1);
+
+			$scope.selectedEnumValues.length = 0;
+			if (index < $scope.selectedProperties[0].enumValues.length) {
+				$timeout(function () {
+					$scope.enumGridOptions.selectItem(index + 1, true);
+				});
+
+			} else if ($scope.selectedProperties[0].enumValues.length > 0) {
+				$timeout(function () {
+					$scope.enumGridOptions.selectItem(index - 1, true);
+				});
+			}
+		}
+	};
+
+	// Click handler for up button
+	$scope.moveEnumValueUp = function () {
+		if ($scope.selectedProperties.length > 0 && $scope.selectedEnumValues.length > 0) {
+			var index = $scope.selectedProperties[0].enumValues.indexOf($scope.selectedEnumValues[0]);
+			if (index != 0) { // If it's the first, no moving up of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.selectedProperties[0].enumValues[index];
+				$scope.selectedProperties[0].enumValues.splice(index, 1);
+				$timeout(function () {
+					$scope.selectedProperties[0].enumValues.splice(index + -1, 0, temp);
+				});
+
+			}
+		}
+	};
+
+	// Click handler for down button
+	$scope.moveEnumValueDown = function () {
+		if ($scope.selectedProperties.length > 0 && $scope.selectedEnumValues.length > 0) {
+			var index = $scope.selectedProperties[0].enumValues.indexOf($scope.selectedEnumValues[0]);
+			if (index != $scope.selectedProperties[0].enumValues.length - 1) { // If it's the last element, no moving down of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.selectedProperties[0].enumValues[index];
+				$scope.selectedProperties[0].enumValues.splice(index, 1);
+				$timeout(function () {
+					$scope.selectedProperties[0].enumValues.splice(index + 1, 0, temp);
+				});
+
+			}
+		}
+	};
+
+	// Click handler for save button
+	$scope.save = function () {
+
+		if ($scope.formProperties.length > 0) {
+			$scope.property.value = {};
+			$scope.property.value.formProperties = $scope.formProperties;
+		} else {
+			$scope.property.value = null;
+		}
+
+		$scope.updatePropertyInModel($scope.property);
+		$scope.close();
+	};
+
+	$scope.cancel = function () {
+		$scope.$hide();
+		$scope.property.mode = 'read';
+	};
+
+	// Close button handler
+	$scope.close = function () {
+		$scope.$hide();
+		$scope.property.mode = 'read';
+	};
+
+}];
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties-in-parameters-controller.js b/len-activiti/src/main/resources/static/editor-app/configuration/properties-in-parameters-controller.js
index bfb39a7..a8648f2 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties-in-parameters-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties-in-parameters-controller.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -21,138 +21,140 @@
  * Input parameters for call activity
  */
 
-var KisBpmInParametersCtrl = [ '$scope', '$modal', '$timeout', '$translate', function($scope, $modal, $timeout, $translate) {
+var KisBpmInParametersCtrl = ['$scope', '$modal', '$timeout', '$translate', function ($scope, $modal, $timeout, $translate) {
 
-    // Config for the modal window
-    var opts = {
-        template:  'editor-app/configuration/properties/in-parameters-popup.html?version=' + Date.now(),
-        scope: $scope
-    };
+	// Config for the modal window
+	var opts = {
+		template: 'editor-app/configuration/properties/in-parameters-popup.html?version=' + Date.now(),
+		scope: $scope
+	};
 
-    // Open the dialog
-    $modal(opts);
+	// Open the dialog
+	$modal(opts);
 }];
 
-var KisBpmInParametersPopupCtrl = ['$scope', '$q', '$translate', function($scope, $q, $translate) {
-
-    // Put json representing form properties on scope
-    if ($scope.property.value !== undefined && $scope.property.value !== null
-        && $scope.property.value.inParameters !== undefined
-        && $scope.property.value.inParameters !== null) {
-        // Note that we clone the json object rather then setting it directly,
-        // this to cope with the fact that the user can click the cancel button and no changes should have happened
-        $scope.parameters = angular.copy($scope.property.value.inParameters);
-    } else {
-        $scope.parameters = [];
-    }
-
-    // Array to contain selected properties (yes - we only can select one, but ng-grid isn't smart enough)
-    $scope.selectedParameters = [];
-    $scope.translationsRetrieved = false;
-    
-    $scope.labels = {};
-    
-    var sourcePromise = $translate('PROPERTY.PARAMETER.SOURCE');
-    var sourceExpressionPromise = $translate('PROPERTY.PARAMETER.SOURCEEXPRESSION');
-    var targetPromise = $translate('PROPERTY.PARAMETER.TARGET');
-    
-    $q.all([sourcePromise, sourceExpressionPromise, targetPromise]).then(function(results) { 
-        $scope.labels.sourceLabel = results[0];
-        $scope.labels.sourceExpressionLabel = results[1];
-        $scope.labels.targetLabel = results[2];
-        $scope.translationsRetrieved = true;
-
-        // Config for grid
-        $scope.gridOptions = {
-            data: 'parameters',
-            enableRowReordering: true,
-            headerRowHeight: 28,
-            multiSelect: false,
-            keepLastSelected : false,
-            selectedItems: $scope.selectedParameters,
-            columnDefs: [{ field: 'source', displayName: $scope.labels.sourceLabel },
-                         { field: 'sourceExpression', displayName: $scope.labels.sourceExpressionLabel },
-                         { field: 'target', displayName: $scope.labels.targetLabel }]
-        };
-    });
-
-    // Click handler for add button
-    $scope.addNewParameter = function() {
-        $scope.parameters.push({ source : '',
-            sourceExpression : '',
-            target : ''});
-    };
-
-    // Click handler for remove button
-    $scope.removeParameter = function() {
-        if ($scope.selectedParameters.length > 0) {
-            var index = $scope.parameters.indexOf($scope.selectedParameters[0]);
-            $scope.gridOptions.selectItem(index, false);
-            $scope.parameters.splice(index, 1);
-
-            $scope.selectedParameters.length = 0;
-            if (index < $scope.parameters.length) {
-                $scope.gridOptions.selectItem(index + 1, true);
-            } else if ($scope.parameters.length > 0) {
-                $scope.gridOptions.selectItem(index - 1, true);
-            }
-        }
-    };
-
-    // Click handler for up button
-    $scope.moveParameterUp = function() {
-        if ($scope.selectedParameters.length > 0) {
-            var index = $scope.parameters.indexOf($scope.selectedParameters[0]);
-            if (index != 0) { // If it's the first, no moving up of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.parameters[index];
-                $scope.parameters.splice(index, 1);
-                $timeout(function(){
-                    $scope.parameters.splice(index + -1, 0, temp);
-                }, 100);
-
-            }
-        }
-    };
-
-    // Click handler for down button
-    $scope.moveParameterDown = function() {
-        if ($scope.selectedParameters.length > 0) {
-            var index = $scope.parameters.indexOf($scope.selectedParameters[0]);
-            if (index != $scope.parameters.length - 1) { // If it's the last element, no moving down of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.parameters[index];
-                $scope.parameters.splice(index, 1);
-                $timeout(function(){
-                    $scope.parameters.splice(index + 1, 0, temp);
-                }, 100);
-
-            }
-        }
-    };
-
-    // Click handler for save button
-    $scope.save = function() {
-
-        if ($scope.parameters.length > 0) {
-            $scope.property.value = {};
-            $scope.property.value.inParameters = $scope.parameters;
-        } else {
-            $scope.property.value = null;
-        }
-
-        $scope.updatePropertyInModel($scope.property);
-        $scope.close();
-    };
-
-    $scope.cancel = function() {
-        $scope.close();
-    };
-
-    // Close button handler
-    $scope.close = function() {
-        $scope.property.mode = 'read';
-        $scope.$hide();
-    };
-
-}];
\ No newline at end of file
+var KisBpmInParametersPopupCtrl = ['$scope', '$q', '$translate', function ($scope, $q, $translate) {
+
+	// Put json representing form properties on scope
+	if ($scope.property.value !== undefined && $scope.property.value !== null
+		&& $scope.property.value.inParameters !== undefined
+		&& $scope.property.value.inParameters !== null) {
+		// Note that we clone the json object rather then setting it directly,
+		// this to cope with the fact that the user can click the cancel button and no changes should have happened
+		$scope.parameters = angular.copy($scope.property.value.inParameters);
+	} else {
+		$scope.parameters = [];
+	}
+
+	// Array to contain selected properties (yes - we only can select one, but ng-grid isn't smart enough)
+	$scope.selectedParameters = [];
+	$scope.translationsRetrieved = false;
+
+	$scope.labels = {};
+
+	var sourcePromise = $translate('PROPERTY.PARAMETER.SOURCE');
+	var sourceExpressionPromise = $translate('PROPERTY.PARAMETER.SOURCEEXPRESSION');
+	var targetPromise = $translate('PROPERTY.PARAMETER.TARGET');
+
+	$q.all([sourcePromise, sourceExpressionPromise, targetPromise]).then(function (results) {
+		$scope.labels.sourceLabel = results[0];
+		$scope.labels.sourceExpressionLabel = results[1];
+		$scope.labels.targetLabel = results[2];
+		$scope.translationsRetrieved = true;
+
+		// Config for grid
+		$scope.gridOptions = {
+			data: 'parameters',
+			enableRowReordering: true,
+			headerRowHeight: 28,
+			multiSelect: false,
+			keepLastSelected: false,
+			selectedItems: $scope.selectedParameters,
+			columnDefs: [{field: 'source', displayName: $scope.labels.sourceLabel},
+				{field: 'sourceExpression', displayName: $scope.labels.sourceExpressionLabel},
+				{field: 'target', displayName: $scope.labels.targetLabel}]
+		};
+	});
+
+	// Click handler for add button
+	$scope.addNewParameter = function () {
+		$scope.parameters.push({
+			source: '',
+			sourceExpression: '',
+			target: ''
+		});
+	};
+
+	// Click handler for remove button
+	$scope.removeParameter = function () {
+		if ($scope.selectedParameters.length > 0) {
+			var index = $scope.parameters.indexOf($scope.selectedParameters[0]);
+			$scope.gridOptions.selectItem(index, false);
+			$scope.parameters.splice(index, 1);
+
+			$scope.selectedParameters.length = 0;
+			if (index < $scope.parameters.length) {
+				$scope.gridOptions.selectItem(index + 1, true);
+			} else if ($scope.parameters.length > 0) {
+				$scope.gridOptions.selectItem(index - 1, true);
+			}
+		}
+	};
+
+	// Click handler for up button
+	$scope.moveParameterUp = function () {
+		if ($scope.selectedParameters.length > 0) {
+			var index = $scope.parameters.indexOf($scope.selectedParameters[0]);
+			if (index != 0) { // If it's the first, no moving up of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.parameters[index];
+				$scope.parameters.splice(index, 1);
+				$timeout(function () {
+					$scope.parameters.splice(index + -1, 0, temp);
+				}, 100);
+
+			}
+		}
+	};
+
+	// Click handler for down button
+	$scope.moveParameterDown = function () {
+		if ($scope.selectedParameters.length > 0) {
+			var index = $scope.parameters.indexOf($scope.selectedParameters[0]);
+			if (index != $scope.parameters.length - 1) { // If it's the last element, no moving down of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.parameters[index];
+				$scope.parameters.splice(index, 1);
+				$timeout(function () {
+					$scope.parameters.splice(index + 1, 0, temp);
+				}, 100);
+
+			}
+		}
+	};
+
+	// Click handler for save button
+	$scope.save = function () {
+
+		if ($scope.parameters.length > 0) {
+			$scope.property.value = {};
+			$scope.property.value.inParameters = $scope.parameters;
+		} else {
+			$scope.property.value = null;
+		}
+
+		$scope.updatePropertyInModel($scope.property);
+		$scope.close();
+	};
+
+	$scope.cancel = function () {
+		$scope.close();
+	};
+
+	// Close button handler
+	$scope.close = function () {
+		$scope.property.mode = 'read';
+		$scope.$hide();
+	};
+
+}];
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties-message-definitions-controller.js b/len-activiti/src/main/resources/static/editor-app/configuration/properties-message-definitions-controller.js
index 062230e..a2f6cb6 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties-message-definitions-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties-message-definitions-controller.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -23,115 +23,114 @@
 
 angular.module('activitiModeler').controller('ActivitiMessageDefinitionsCtrl', ['$scope', '$modal', function ($scope, $modal) {
 
-    // Config for the modal window
-    var opts = {
-        template: 'editor-app/configuration/properties/message-definitions-popup.html?version=' + Date.now(),
-        scope: $scope
-    };
+	// Config for the modal window
+	var opts = {
+		template: 'editor-app/configuration/properties/message-definitions-popup.html?version=' + Date.now(),
+		scope: $scope
+	};
 
-    // Open the dialog
-    $modal(opts);
+	// Open the dialog
+	$modal(opts);
 }]);
 
 //Need a separate controller for the modal window due to https://github.com/angular-ui/bootstrap/issues/259
 // Will be fixed in a newer version of Angular UI
 angular.module('activitiModeler').controller('ActivitiMessageDefinitionsPopupCtrl',
-    ['$scope', '$q', '$translate', '$timeout', function ($scope, $q, $translate, $timeout) {
-
-        // Put json representing mesage definitions on scope
-        if ($scope.property.value !== undefined && $scope.property.value !== null && $scope.property.value.length > 0) {
-
-            if ($scope.property.value.constructor == String) {
-                $scope.messageDefinitions = JSON.parse($scope.property.value);
-            }
-            else {
-                // Note that we clone the json object rather then setting it directly,
-                // this to cope with the fact that the user can click the cancel button and no changes should have happened
-                $scope.messageDefinitions = angular.copy($scope.property.value);
-            }
-
-        } else {
-            $scope.messageDefinitions = [];
-        }
-
-        // Array to contain selected mesage definitions (yes - we only can select one, but ng-grid isn't smart enough)
-        $scope.selectedMessages = [];
-        $scope.translationsRetrieved = false;
-
-        $scope.labels = {};
-
-        var idPromise = $translate('PROPERTY.MESSAGEDEFINITIONS.ID');
-        var namePromise = $translate('PROPERTY.MESSAGEDEFINITIONS.NAME');
-
-        $q.all([idPromise, namePromise]).then(function (results) {
-
-            $scope.labels.idLabel = results[0];
-            $scope.labels.nameLabel = results[1];
-            $scope.translationsRetrieved = true;
-
-         // Config for grid
-            $scope.gridOptions = {
-                data: 'messageDefinitions',
-                headerRowHeight: 28,
-                enableRowSelection: true,
-                enableRowHeaderSelection: false,
-                multiSelect: false,
-                keepLastSelected : false,
-                selectedItems: $scope.selectedMessages,
-                columnDefs: [
-                    {field: 'id', displayName: $scope.labels.idLabel},
-                    {field: 'name', displayName: $scope.labels.nameLabel}]
-            };
-        });
-
-        // Click handler for add button
-        $scope.addNewMessageDefinition = function () {
-            var newMessageDefinition = {id: '', name: ''};
-
-            $scope.messageDefinitions.push(newMessageDefinition);
-            $timeout(function () {
-            	$scope.gridOptions.selectItem($scope.messageDefinitions.length - 1, true);
-            });
-        };
-
-        // Click handler for remove button
-        $scope.removeMessageDefinition = function () {
-        	if ($scope.selectedMessages && $scope.selectedMessages.length > 0) {
-            	var index = $scope.messageDefinitions.indexOf($scope.selectedMessages[0]);
-                $scope.gridOptions.selectItem(index, false);
-                $scope.messageDefinitions.splice(index, 1);
-
-                $scope.selectedMessages.length = 0;
-                if (index < $scope.messageDefinitions.length) {
-                    $scope.gridOptions.selectItem(index + 1, true);
-                } else if ($scope.messageDefinitions.length > 0) {
-                    $scope.gridOptions.selectItem(index - 1, true);
-                }
-            }
-        };
-
-        // Click handler for save button
-        $scope.save = function () {
-
-            if ($scope.messageDefinitions.length > 0) {
-                $scope.property.value = $scope.messageDefinitions;
-            } else {
-                $scope.property.value = null;
-            }
-
-            $scope.updatePropertyInModel($scope.property);
-            $scope.close();
-        };
-
-        $scope.cancel = function () {
-            $scope.property.mode = 'read';
-            $scope.$hide();
-        };
-
-        // Close button handler
-        $scope.close = function () {
-            $scope.property.mode = 'read';
-            $scope.$hide();
-        };
-
-    }]);
\ No newline at end of file
+	['$scope', '$q', '$translate', '$timeout', function ($scope, $q, $translate, $timeout) {
+
+		// Put json representing mesage definitions on scope
+		if ($scope.property.value !== undefined && $scope.property.value !== null && $scope.property.value.length > 0) {
+
+			if ($scope.property.value.constructor == String) {
+				$scope.messageDefinitions = JSON.parse($scope.property.value);
+			} else {
+				// Note that we clone the json object rather then setting it directly,
+				// this to cope with the fact that the user can click the cancel button and no changes should have happened
+				$scope.messageDefinitions = angular.copy($scope.property.value);
+			}
+
+		} else {
+			$scope.messageDefinitions = [];
+		}
+
+		// Array to contain selected mesage definitions (yes - we only can select one, but ng-grid isn't smart enough)
+		$scope.selectedMessages = [];
+		$scope.translationsRetrieved = false;
+
+		$scope.labels = {};
+
+		var idPromise = $translate('PROPERTY.MESSAGEDEFINITIONS.ID');
+		var namePromise = $translate('PROPERTY.MESSAGEDEFINITIONS.NAME');
+
+		$q.all([idPromise, namePromise]).then(function (results) {
+
+			$scope.labels.idLabel = results[0];
+			$scope.labels.nameLabel = results[1];
+			$scope.translationsRetrieved = true;
+
+			// Config for grid
+			$scope.gridOptions = {
+				data: 'messageDefinitions',
+				headerRowHeight: 28,
+				enableRowSelection: true,
+				enableRowHeaderSelection: false,
+				multiSelect: false,
+				keepLastSelected: false,
+				selectedItems: $scope.selectedMessages,
+				columnDefs: [
+					{field: 'id', displayName: $scope.labels.idLabel},
+					{field: 'name', displayName: $scope.labels.nameLabel}]
+			};
+		});
+
+		// Click handler for add button
+		$scope.addNewMessageDefinition = function () {
+			var newMessageDefinition = {id: '', name: ''};
+
+			$scope.messageDefinitions.push(newMessageDefinition);
+			$timeout(function () {
+				$scope.gridOptions.selectItem($scope.messageDefinitions.length - 1, true);
+			});
+		};
+
+		// Click handler for remove button
+		$scope.removeMessageDefinition = function () {
+			if ($scope.selectedMessages && $scope.selectedMessages.length > 0) {
+				var index = $scope.messageDefinitions.indexOf($scope.selectedMessages[0]);
+				$scope.gridOptions.selectItem(index, false);
+				$scope.messageDefinitions.splice(index, 1);
+
+				$scope.selectedMessages.length = 0;
+				if (index < $scope.messageDefinitions.length) {
+					$scope.gridOptions.selectItem(index + 1, true);
+				} else if ($scope.messageDefinitions.length > 0) {
+					$scope.gridOptions.selectItem(index - 1, true);
+				}
+			}
+		};
+
+		// Click handler for save button
+		$scope.save = function () {
+
+			if ($scope.messageDefinitions.length > 0) {
+				$scope.property.value = $scope.messageDefinitions;
+			} else {
+				$scope.property.value = null;
+			}
+
+			$scope.updatePropertyInModel($scope.property);
+			$scope.close();
+		};
+
+		$scope.cancel = function () {
+			$scope.property.mode = 'read';
+			$scope.$hide();
+		};
+
+		// Close button handler
+		$scope.close = function () {
+			$scope.property.mode = 'read';
+			$scope.$hide();
+		};
+
+	}]);
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties-message-scope-controller.js b/len-activiti/src/main/resources/static/editor-app/configuration/properties-message-scope-controller.js
index 34e477c..b65346d 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties-message-scope-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties-message-scope-controller.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -17,32 +17,32 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-angular.module('activitiModeler').controller('ActivitiMessageRefCtrl', [ '$scope', function($scope) {
+angular.module('activitiModeler').controller('ActivitiMessageRefCtrl', ['$scope', function ($scope) {
 
-    // Find the parent shape on which the message definitions are defined
-    var messageDefinitionsProperty = undefined;
-    var parent = $scope.selectedShape;
-    while (parent !== null && parent !== undefined && messageDefinitionsProperty === undefined) {
-        if (parent.properties && parent.properties['oryx-messagedefinitions']) {
-            messageDefinitionsProperty = parent.properties['oryx-messagedefinitions'];
-        } else {
-            parent = parent.parent;
-        }
-    }
+	// Find the parent shape on which the message definitions are defined
+	var messageDefinitionsProperty = undefined;
+	var parent = $scope.selectedShape;
+	while (parent !== null && parent !== undefined && messageDefinitionsProperty === undefined) {
+		if (parent.properties && parent.properties['oryx-messagedefinitions']) {
+			messageDefinitionsProperty = parent.properties['oryx-messagedefinitions'];
+		} else {
+			parent = parent.parent;
+		}
+	}
 
-    try {
-        messageDefinitionsProperty = JSON.parse(messageDefinitionsProperty);
-        if (typeof messageDefinitionsProperty == 'string') {
-            messageDefinitionsProperty = JSON.parse(messageDefinitionsProperty);
-        }
-    } catch (err) {
-        // Do nothing here, just to be sure we try-catch it
-    }
+	try {
+		messageDefinitionsProperty = JSON.parse(messageDefinitionsProperty);
+		if (typeof messageDefinitionsProperty == 'string') {
+			messageDefinitionsProperty = JSON.parse(messageDefinitionsProperty);
+		}
+	} catch (err) {
+		// Do nothing here, just to be sure we try-catch it
+	}
 
-    $scope.messageDefinitions = messageDefinitionsProperty;
+	$scope.messageDefinitions = messageDefinitionsProperty;
 
 
-    $scope.messageChanged = function() {
-    	$scope.updatePropertyInModel($scope.property);
-    };
-}]);
\ No newline at end of file
+	$scope.messageChanged = function () {
+		$scope.updatePropertyInModel($scope.property);
+	};
+}]);
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties-multiinstance-controller.js b/len-activiti/src/main/resources/static/editor-app/configuration/properties-multiinstance-controller.js
index 7c1386d..3f2a7ff 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties-multiinstance-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties-multiinstance-controller.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -21,14 +21,13 @@
  * Execution listeners
  */
 
-var KisBpmMultiInstanceCtrl = [ '$scope', function($scope) {
+var KisBpmMultiInstanceCtrl = ['$scope', function ($scope) {
+
+	if ($scope.property.value == undefined && $scope.property.value == null) {
+		$scope.property.value = 'None';
+	}
 
-    if ($scope.property.value == undefined && $scope.property.value == null)
-    {
-    	$scope.property.value = 'None';
-    }
-        
-    $scope.multiInstanceChanged = function() {
-    	$scope.updatePropertyInModel($scope.property);
-    };
-}];
\ No newline at end of file
+	$scope.multiInstanceChanged = function () {
+		$scope.updatePropertyInModel($scope.property);
+	};
+}];
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties-out-parameters-controller.js b/len-activiti/src/main/resources/static/editor-app/configuration/properties-out-parameters-controller.js
index dbac84a..488dfcd 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties-out-parameters-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties-out-parameters-controller.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -21,138 +21,140 @@
  * Input parameters for call activity
  */
 
-var KisBpmOutParametersCtrl = [ '$scope' , '$modal', '$timeout', '$translate', function($scope, $modal, $timeout, $translate) {
+var KisBpmOutParametersCtrl = ['$scope', '$modal', '$timeout', '$translate', function ($scope, $modal, $timeout, $translate) {
 
-    // Config for the modal window
-    var opts = {
-        template:  'editor-app/configuration/properties/out-parameters-popup.html?version=' + Date.now(),
-        scope: $scope
-    };
+	// Config for the modal window
+	var opts = {
+		template: 'editor-app/configuration/properties/out-parameters-popup.html?version=' + Date.now(),
+		scope: $scope
+	};
 
-    // Open the dialog
-    $modal(opts);
+	// Open the dialog
+	$modal(opts);
 }];
 
-var KisBpmOutParametersPopupCtrl = [ '$scope', '$q', '$translate', function($scope, $q, $translate) {
-
-    // Put json representing form properties on scope
-    if ($scope.property.value !== undefined && $scope.property.value !== null
-        && $scope.property.value.outParameters !== undefined
-        && $scope.property.value.outParameters !== null) {
-        // Note that we clone the json object rather then setting it directly,
-        // this to cope with the fact that the user can click the cancel button and no changes should have happened
-        $scope.parameters = angular.copy($scope.property.value.outParameters);
-    } else {
-        $scope.parameters = [];
-    }
-
-    // Array to contain selected properties (yes - we only can select one, but ng-grid isn't smart enough)
-    $scope.selectedParameters = [];
-    $scope.translationsRetrieved = false;
-    
-    $scope.labels = {};
-    
-    var sourcePromise = $translate('PROPERTY.PARAMETER.SOURCE');
-    var sourceExpressionPromise = $translate('PROPERTY.PARAMETER.SOURCEEXPRESSION');
-    var targetPromise = $translate('PROPERTY.PARAMETER.TARGET');
-    
-    $q.all([sourcePromise, sourceExpressionPromise, targetPromise]).then(function(results) { 
-        $scope.labels.sourceLabel = results[0];
-        $scope.labels.sourceExpressionLabel = results[1];
-        $scope.labels.targetLabel = results[2];
-        $scope.translationsRetrieved = true;
-        
-        // Config for grid
-        $scope.gridOptions = {
-            data: 'parameters',
-            enableRowReordering: true,
-            headerRowHeight: 28,
-            multiSelect: false,
-            keepLastSelected : false,
-            selectedItems: $scope.selectedParameters,
-            columnDefs: [{ field: 'source', displayName: $scope.labels.sourceLabel },
-                         { field: 'sourceExpression', displayName: $scope.labels.sourceExpressionLabel },
-                         { field: 'target', displayName: $scope.labels.targetLabel }]
-        };
-    });
-
-    // Click handler for add button
-    $scope.addNewParameter = function() {
-        $scope.parameters.push({ source : '',
-            sourceExpression : '',
-            target : ''});
-    };
-
-    // Click handler for remove button
-    $scope.removeParameter = function() {
-        if ($scope.selectedParameters.length > 0) {
-            var index = $scope.parameters.indexOf($scope.selectedParameters[0]);
-            $scope.gridOptions.selectItem(index, false);
-            $scope.parameters.splice(index, 1);
-
-            $scope.selectedParameters.length = 0;
-            if (index < $scope.parameters.length) {
-                $scope.gridOptions.selectItem(index + 1, true);
-            } else if ($scope.parameters.length > 0) {
-                $scope.gridOptions.selectItem(index - 1, true);
-            }
-        }
-    };
-
-    // Click handler for up button
-    $scope.moveParameterUp = function() {
-        if ($scope.selectedParameters.length > 0) {
-            var index = $scope.parameters.indexOf($scope.selectedParameters[0]);
-            if (index != 0) { // If it's the first, no moving up of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.parameters[index];
-                $scope.parameters.splice(index, 1);
-                $timeout(function(){
-                    $scope.parameters.splice(index + -1, 0, temp);
-                }, 100);
-
-            }
-        }
-    };
-
-    // Click handler for down button
-    $scope.moveParameterDown = function() {
-        if ($scope.selectedParameters.length > 0) {
-            var index = $scope.parameters.indexOf($scope.selectedParameters[0]);
-            if (index != $scope.parameters.length - 1) { // If it's the last element, no moving down of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.parameters[index];
-                $scope.parameters.splice(index, 1);
-                $timeout(function(){
-                    $scope.parameters.splice(index + 1, 0, temp);
-                }, 100);
-
-            }
-        }
-    };
-
-    // Click handler for save button
-    $scope.save = function() {
-
-        if ($scope.parameters.length > 0) {
-            $scope.property.value = {};
-            $scope.property.value.outParameters = $scope.parameters;
-        } else {
-            $scope.property.value = null;
-        }
-
-        $scope.updatePropertyInModel($scope.property);
-        $scope.close();
-    };
-
-    $scope.cancel = function() {
-        $scope.close();
-    };
-
-    // Close button handler
-    $scope.close = function() {
-        $scope.property.mode = 'read';
-        $scope.$hide();
-    };
-
-}];
\ No newline at end of file
+var KisBpmOutParametersPopupCtrl = ['$scope', '$q', '$translate', function ($scope, $q, $translate) {
+
+	// Put json representing form properties on scope
+	if ($scope.property.value !== undefined && $scope.property.value !== null
+		&& $scope.property.value.outParameters !== undefined
+		&& $scope.property.value.outParameters !== null) {
+		// Note that we clone the json object rather then setting it directly,
+		// this to cope with the fact that the user can click the cancel button and no changes should have happened
+		$scope.parameters = angular.copy($scope.property.value.outParameters);
+	} else {
+		$scope.parameters = [];
+	}
+
+	// Array to contain selected properties (yes - we only can select one, but ng-grid isn't smart enough)
+	$scope.selectedParameters = [];
+	$scope.translationsRetrieved = false;
+
+	$scope.labels = {};
+
+	var sourcePromise = $translate('PROPERTY.PARAMETER.SOURCE');
+	var sourceExpressionPromise = $translate('PROPERTY.PARAMETER.SOURCEEXPRESSION');
+	var targetPromise = $translate('PROPERTY.PARAMETER.TARGET');
+
+	$q.all([sourcePromise, sourceExpressionPromise, targetPromise]).then(function (results) {
+		$scope.labels.sourceLabel = results[0];
+		$scope.labels.sourceExpressionLabel = results[1];
+		$scope.labels.targetLabel = results[2];
+		$scope.translationsRetrieved = true;
+
+		// Config for grid
+		$scope.gridOptions = {
+			data: 'parameters',
+			enableRowReordering: true,
+			headerRowHeight: 28,
+			multiSelect: false,
+			keepLastSelected: false,
+			selectedItems: $scope.selectedParameters,
+			columnDefs: [{field: 'source', displayName: $scope.labels.sourceLabel},
+				{field: 'sourceExpression', displayName: $scope.labels.sourceExpressionLabel},
+				{field: 'target', displayName: $scope.labels.targetLabel}]
+		};
+	});
+
+	// Click handler for add button
+	$scope.addNewParameter = function () {
+		$scope.parameters.push({
+			source: '',
+			sourceExpression: '',
+			target: ''
+		});
+	};
+
+	// Click handler for remove button
+	$scope.removeParameter = function () {
+		if ($scope.selectedParameters.length > 0) {
+			var index = $scope.parameters.indexOf($scope.selectedParameters[0]);
+			$scope.gridOptions.selectItem(index, false);
+			$scope.parameters.splice(index, 1);
+
+			$scope.selectedParameters.length = 0;
+			if (index < $scope.parameters.length) {
+				$scope.gridOptions.selectItem(index + 1, true);
+			} else if ($scope.parameters.length > 0) {
+				$scope.gridOptions.selectItem(index - 1, true);
+			}
+		}
+	};
+
+	// Click handler for up button
+	$scope.moveParameterUp = function () {
+		if ($scope.selectedParameters.length > 0) {
+			var index = $scope.parameters.indexOf($scope.selectedParameters[0]);
+			if (index != 0) { // If it's the first, no moving up of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.parameters[index];
+				$scope.parameters.splice(index, 1);
+				$timeout(function () {
+					$scope.parameters.splice(index + -1, 0, temp);
+				}, 100);
+
+			}
+		}
+	};
+
+	// Click handler for down button
+	$scope.moveParameterDown = function () {
+		if ($scope.selectedParameters.length > 0) {
+			var index = $scope.parameters.indexOf($scope.selectedParameters[0]);
+			if (index != $scope.parameters.length - 1) { // If it's the last element, no moving down of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.parameters[index];
+				$scope.parameters.splice(index, 1);
+				$timeout(function () {
+					$scope.parameters.splice(index + 1, 0, temp);
+				}, 100);
+
+			}
+		}
+	};
+
+	// Click handler for save button
+	$scope.save = function () {
+
+		if ($scope.parameters.length > 0) {
+			$scope.property.value = {};
+			$scope.property.value.outParameters = $scope.parameters;
+		} else {
+			$scope.property.value = null;
+		}
+
+		$scope.updatePropertyInModel($scope.property);
+		$scope.close();
+	};
+
+	$scope.cancel = function () {
+		$scope.close();
+	};
+
+	// Close button handler
+	$scope.close = function () {
+		$scope.property.mode = 'read';
+		$scope.$hide();
+	};
+
+}];
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties-sequenceflow-order-controller.js b/len-activiti/src/main/resources/static/editor-app/configuration/properties-sequenceflow-order-controller.js
index c1a53b0..cf85895 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties-sequenceflow-order-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties-sequenceflow-order-controller.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -21,110 +21,110 @@
  * Sequence flow order controller
  */
 
-var KisBpmSequenceFlowOrderCtrl = [ '$scope', '$modal', '$timeout', '$translate', function($scope, $modal, $timeout, $translate) {
+var KisBpmSequenceFlowOrderCtrl = ['$scope', '$modal', '$timeout', '$translate', function ($scope, $modal, $timeout, $translate) {
 
-    // Config for the modal window
-    var opts = {
-        template:  'editor-app/configuration/properties/sequenceflow-order-popup.html?version=' + Date.now(),
-        scope: $scope
-    };
+	// Config for the modal window
+	var opts = {
+		template: 'editor-app/configuration/properties/sequenceflow-order-popup.html?version=' + Date.now(),
+		scope: $scope
+	};
 
-    $modal(opts);
+	$modal(opts);
 }];
 
-var KisBpmSequenceFlowOrderPopupCtrl = ['$scope', '$translate', function($scope, $translate) {
-
-    // Find the outgoing sequence flow of the current selected shape
-    var outgoingSequenceFlow = [];
-    var selectedShape = $scope.selectedShape;
-    if (selectedShape) {
-        var outgoingNodes = selectedShape.getOutgoingShapes();
-        for (var i=0; i<outgoingNodes.length; i++) {
-            if (outgoingNodes[i].getStencil().title() === 'Sequence flow') {
-                var targetActivity = outgoingNodes[i].getTarget();
-                // We need the resourceId of a sequence flow, not the id because that will change with every editor load
-                outgoingSequenceFlow.push({
-                    id : outgoingNodes[i].resourceId,
-                    targetTitle : targetActivity.properties['oryx-name'],
-                    targetType : targetActivity.getStencil().title()
-                });
-            }
-        }
-    } else {
-        console.log('Programmatic error: no selected shape found');
-    }
-
-    // Now we can apply the order which was (possibly) previously saved
-    var orderedOutgoingSequenceFlow = [];
-    if ($scope.property.value && $scope.property.value.sequenceFlowOrder) {
-
-        var sequenceFlowOrderList = $scope.property.value.sequenceFlowOrder;
-
-        // Loop the list of sequence flow that was saved  in the json model and match them with the outgoing sequence flow found above
-        for (var flowIndex=0; flowIndex < sequenceFlowOrderList.length; flowIndex++) {
-
-            // find the sequence flow in the outgoing sequence flows.
-
-            for (var outgoingFlowIndex=0; outgoingFlowIndex < outgoingSequenceFlow.length; outgoingFlowIndex++) {
-                if (outgoingSequenceFlow[outgoingFlowIndex].id === sequenceFlowOrderList[flowIndex]) {
-                    orderedOutgoingSequenceFlow.push(outgoingSequenceFlow[outgoingFlowIndex]);
-                    outgoingSequenceFlow.splice(outgoingFlowIndex, 1);
-                    break;
-                }
-            }
-        }
-
-        // Now all the matching sequence flow we're removed from the outgoing sequence flow list
-        // We can simply apply the remaining ones (these are new vs. the time when the values were saved to the model)
-        orderedOutgoingSequenceFlow = orderedOutgoingSequenceFlow.concat(outgoingSequenceFlow);
-
-    } else {
-        orderedOutgoingSequenceFlow = outgoingSequenceFlow;
-    }
-
-    // Now we can put it on the scope
-    $scope.outgoingSequenceFlow = orderedOutgoingSequenceFlow;
-
-    // Move up click handler
-    $scope.moveUp = function(index) {
-        var temp = $scope.outgoingSequenceFlow[index];
-        $scope.outgoingSequenceFlow[index] = $scope.outgoingSequenceFlow[index - 1];
-        $scope.outgoingSequenceFlow[index - 1] = temp;
-    };
-
-    // Move down click handler
-    $scope.moveDown = function(index) {
-        var temp = $scope.outgoingSequenceFlow[index];
-        $scope.outgoingSequenceFlow[index] = $scope.outgoingSequenceFlow[index + 1];
-        $scope.outgoingSequenceFlow[index + 1] = temp;
-    };
-
-    // Save click handler
-    $scope.save = function() {
-        if ($scope.outgoingSequenceFlow.length > 0) {
-            $scope.property.value = {};
-            $scope.property.value.sequenceFlowOrder = [];
-
-            for (var flowIndex=0; flowIndex < $scope.outgoingSequenceFlow.length; flowIndex++) {
-                $scope.property.value.sequenceFlowOrder.push($scope.outgoingSequenceFlow[flowIndex].id);
-            }
-        } else {
-            $scope.property.value = null;
-        }
-
-        $scope.updatePropertyInModel($scope.property);
-        $scope.close();
-    };
-
-    // Cancel click handler
-    $scope.cancel = function() {
-        $scope.close();
-    };
-
-    // Close button handler
-    $scope.close = function() {
-        $scope.property.mode = 'read';
-        $scope.$hide();
-    };
-
-}];
\ No newline at end of file
+var KisBpmSequenceFlowOrderPopupCtrl = ['$scope', '$translate', function ($scope, $translate) {
+
+	// Find the outgoing sequence flow of the current selected shape
+	var outgoingSequenceFlow = [];
+	var selectedShape = $scope.selectedShape;
+	if (selectedShape) {
+		var outgoingNodes = selectedShape.getOutgoingShapes();
+		for (var i = 0; i < outgoingNodes.length; i++) {
+			if (outgoingNodes[i].getStencil().title() === 'Sequence flow') {
+				var targetActivity = outgoingNodes[i].getTarget();
+				// We need the resourceId of a sequence flow, not the id because that will change with every editor load
+				outgoingSequenceFlow.push({
+					id: outgoingNodes[i].resourceId,
+					targetTitle: targetActivity.properties['oryx-name'],
+					targetType: targetActivity.getStencil().title()
+				});
+			}
+		}
+	} else {
+		console.log('Programmatic error: no selected shape found');
+	}
+
+	// Now we can apply the order which was (possibly) previously saved
+	var orderedOutgoingSequenceFlow = [];
+	if ($scope.property.value && $scope.property.value.sequenceFlowOrder) {
+
+		var sequenceFlowOrderList = $scope.property.value.sequenceFlowOrder;
+
+		// Loop the list of sequence flow that was saved  in the json model and match them with the outgoing sequence flow found above
+		for (var flowIndex = 0; flowIndex < sequenceFlowOrderList.length; flowIndex++) {
+
+			// find the sequence flow in the outgoing sequence flows.
+
+			for (var outgoingFlowIndex = 0; outgoingFlowIndex < outgoingSequenceFlow.length; outgoingFlowIndex++) {
+				if (outgoingSequenceFlow[outgoingFlowIndex].id === sequenceFlowOrderList[flowIndex]) {
+					orderedOutgoingSequenceFlow.push(outgoingSequenceFlow[outgoingFlowIndex]);
+					outgoingSequenceFlow.splice(outgoingFlowIndex, 1);
+					break;
+				}
+			}
+		}
+
+		// Now all the matching sequence flow we're removed from the outgoing sequence flow list
+		// We can simply apply the remaining ones (these are new vs. the time when the values were saved to the model)
+		orderedOutgoingSequenceFlow = orderedOutgoingSequenceFlow.concat(outgoingSequenceFlow);
+
+	} else {
+		orderedOutgoingSequenceFlow = outgoingSequenceFlow;
+	}
+
+	// Now we can put it on the scope
+	$scope.outgoingSequenceFlow = orderedOutgoingSequenceFlow;
+
+	// Move up click handler
+	$scope.moveUp = function (index) {
+		var temp = $scope.outgoingSequenceFlow[index];
+		$scope.outgoingSequenceFlow[index] = $scope.outgoingSequenceFlow[index - 1];
+		$scope.outgoingSequenceFlow[index - 1] = temp;
+	};
+
+	// Move down click handler
+	$scope.moveDown = function (index) {
+		var temp = $scope.outgoingSequenceFlow[index];
+		$scope.outgoingSequenceFlow[index] = $scope.outgoingSequenceFlow[index + 1];
+		$scope.outgoingSequenceFlow[index + 1] = temp;
+	};
+
+	// Save click handler
+	$scope.save = function () {
+		if ($scope.outgoingSequenceFlow.length > 0) {
+			$scope.property.value = {};
+			$scope.property.value.sequenceFlowOrder = [];
+
+			for (var flowIndex = 0; flowIndex < $scope.outgoingSequenceFlow.length; flowIndex++) {
+				$scope.property.value.sequenceFlowOrder.push($scope.outgoingSequenceFlow[flowIndex].id);
+			}
+		} else {
+			$scope.property.value = null;
+		}
+
+		$scope.updatePropertyInModel($scope.property);
+		$scope.close();
+	};
+
+	// Cancel click handler
+	$scope.cancel = function () {
+		$scope.close();
+	};
+
+	// Close button handler
+	$scope.close = function () {
+		$scope.property.mode = 'read';
+		$scope.$hide();
+	};
+
+}];
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties-signal-definitions-controller.js b/len-activiti/src/main/resources/static/editor-app/configuration/properties-signal-definitions-controller.js
index 5581411..e0eb471 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties-signal-definitions-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties-signal-definitions-controller.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -19,118 +19,117 @@
 
 angular.module('activitiModeler').controller('ActivitiSignalDefinitionsCtrl', ['$scope', '$modal', function ($scope, $modal) {
 
-    // Config for the modal window
-    var opts = {
-        template: 'editor-app/configuration/properties/signal-definitions-popup.html?version=' + Date.now(),
-        scope: $scope
-    };
+	// Config for the modal window
+	var opts = {
+		template: 'editor-app/configuration/properties/signal-definitions-popup.html?version=' + Date.now(),
+		scope: $scope
+	};
 
-    // Open the dialog
-    $modal(opts);
+	// Open the dialog
+	$modal(opts);
 }]);
 
 //Need a separate controller for the modal window due to https://github.com/angular-ui/bootstrap/issues/259
 // Will be fixed in a newer version of Angular UI
 angular.module('activitiModeler').controller('ActivitiSignalDefinitionsPopupCtrl',
-    ['$scope', '$q', '$translate', '$timeout', function ($scope, $q, $translate, $timeout) {
-
-        // Put json representing signal definitions on scope
-        if ($scope.property.value !== undefined && $scope.property.value !== null && $scope.property.value.length > 0) {
-
-            if ($scope.property.value.constructor == String) {
-                $scope.signalDefinitions = JSON.parse($scope.property.value);
-            }
-            else {
-                // Note that we clone the json object rather then setting it directly,
-                // this to cope with the fact that the user can click the cancel button and no changes should have happened
-                $scope.signalDefinitions = angular.copy($scope.property.value);
-            }
-
-        } else {
-            $scope.signalDefinitions = [];
-        }
-
-        // Array to contain selected signal definitions (yes - we only can select one, but ng-grid isn't smart enough)
-        $scope.selectedSignals = [];
-        $scope.translationsRetrieved = false;
-
-        $scope.labels = {};
-
-        var idPromise = $translate('PROPERTY.SIGNALDEFINITIONS.ID');
-        var namePromise = $translate('PROPERTY.SIGNALDEFINITIONS.NAME');
-        var scopePromise = $translate('PROPERTY.SIGNALDEFINITIONS.SCOPE');
-
-        $q.all([idPromise, namePromise, scopePromise]).then(function (results) {
-
-            $scope.labels.idLabel = results[0];
-            $scope.labels.nameLabel = results[1];
-            $scope.labels.scopeLabel = results[2];
-            $scope.translationsRetrieved = true;
-
-            // Config for grid
-            $scope.gridOptions = {
-                data: 'signalDefinitions',
-                headerRowHeight: 28,
-                enableRowSelection: true,
-                enableRowHeaderSelection: false,
-                multiSelect: false,
-                keepLastSelected : false,
-                selectedItems: $scope.selectedSignals,
-                columnDefs: [
-                    {field: 'id', displayName: $scope.labels.idLabel},
-                    {field: 'name', displayName: $scope.labels.nameLabel},
-                    {field: 'scope', displayName: $scope.labels.scopeLabel}]
-            };
-        });
-
-        // Click handler for add button
-        $scope.addNewSignalDefinition = function () {
-            var newSignalDefinition = {id: '', name: '', scope: 'global'};
-
-            $scope.signalDefinitions.push(newSignalDefinition);
-            $timeout(function () {
-            	$scope.gridOptions.selectItem($scope.signalDefinitions.length - 1, true);
-            });
-        };
-
-        // Click handler for remove button
-        $scope.removeSignalDefinition = function () {
-            if ($scope.selectedSignals && $scope.selectedSignals.length > 0) {
-            	var index = $scope.signalDefinitions.indexOf($scope.selectedSignals[0]);
-                $scope.gridOptions.selectItem(index, false);
-                $scope.signalDefinitions.splice(index, 1);
-
-                $scope.selectedSignals.length = 0;
-                if (index < $scope.signalDefinitions.length) {
-                    $scope.gridOptions.selectItem(index + 1, true);
-                } else if ($scope.signalDefinitions.length > 0) {
-                    $scope.gridOptions.selectItem(index - 1, true);
-                }
-            }
-        };
-
-        // Click handler for save button
-        $scope.save = function () {
-
-            if ($scope.signalDefinitions.length > 0) {
-                $scope.property.value = $scope.signalDefinitions;
-            } else {
-                $scope.property.value = null;
-            }
-
-            $scope.updatePropertyInModel($scope.property);
-            $scope.close();
-        };
-
-        $scope.cancel = function () {
-            $scope.property.mode = 'read';
-            $scope.$hide();
-        };
-
-        // Close button handler
-        $scope.close = function () {
-            $scope.property.mode = 'read';
-            $scope.$hide();
-        };
-
-    }]);
\ No newline at end of file
+	['$scope', '$q', '$translate', '$timeout', function ($scope, $q, $translate, $timeout) {
+
+		// Put json representing signal definitions on scope
+		if ($scope.property.value !== undefined && $scope.property.value !== null && $scope.property.value.length > 0) {
+
+			if ($scope.property.value.constructor == String) {
+				$scope.signalDefinitions = JSON.parse($scope.property.value);
+			} else {
+				// Note that we clone the json object rather then setting it directly,
+				// this to cope with the fact that the user can click the cancel button and no changes should have happened
+				$scope.signalDefinitions = angular.copy($scope.property.value);
+			}
+
+		} else {
+			$scope.signalDefinitions = [];
+		}
+
+		// Array to contain selected signal definitions (yes - we only can select one, but ng-grid isn't smart enough)
+		$scope.selectedSignals = [];
+		$scope.translationsRetrieved = false;
+
+		$scope.labels = {};
+
+		var idPromise = $translate('PROPERTY.SIGNALDEFINITIONS.ID');
+		var namePromise = $translate('PROPERTY.SIGNALDEFINITIONS.NAME');
+		var scopePromise = $translate('PROPERTY.SIGNALDEFINITIONS.SCOPE');
+
+		$q.all([idPromise, namePromise, scopePromise]).then(function (results) {
+
+			$scope.labels.idLabel = results[0];
+			$scope.labels.nameLabel = results[1];
+			$scope.labels.scopeLabel = results[2];
+			$scope.translationsRetrieved = true;
+
+			// Config for grid
+			$scope.gridOptions = {
+				data: 'signalDefinitions',
+				headerRowHeight: 28,
+				enableRowSelection: true,
+				enableRowHeaderSelection: false,
+				multiSelect: false,
+				keepLastSelected: false,
+				selectedItems: $scope.selectedSignals,
+				columnDefs: [
+					{field: 'id', displayName: $scope.labels.idLabel},
+					{field: 'name', displayName: $scope.labels.nameLabel},
+					{field: 'scope', displayName: $scope.labels.scopeLabel}]
+			};
+		});
+
+		// Click handler for add button
+		$scope.addNewSignalDefinition = function () {
+			var newSignalDefinition = {id: '', name: '', scope: 'global'};
+
+			$scope.signalDefinitions.push(newSignalDefinition);
+			$timeout(function () {
+				$scope.gridOptions.selectItem($scope.signalDefinitions.length - 1, true);
+			});
+		};
+
+		// Click handler for remove button
+		$scope.removeSignalDefinition = function () {
+			if ($scope.selectedSignals && $scope.selectedSignals.length > 0) {
+				var index = $scope.signalDefinitions.indexOf($scope.selectedSignals[0]);
+				$scope.gridOptions.selectItem(index, false);
+				$scope.signalDefinitions.splice(index, 1);
+
+				$scope.selectedSignals.length = 0;
+				if (index < $scope.signalDefinitions.length) {
+					$scope.gridOptions.selectItem(index + 1, true);
+				} else if ($scope.signalDefinitions.length > 0) {
+					$scope.gridOptions.selectItem(index - 1, true);
+				}
+			}
+		};
+
+		// Click handler for save button
+		$scope.save = function () {
+
+			if ($scope.signalDefinitions.length > 0) {
+				$scope.property.value = $scope.signalDefinitions;
+			} else {
+				$scope.property.value = null;
+			}
+
+			$scope.updatePropertyInModel($scope.property);
+			$scope.close();
+		};
+
+		$scope.cancel = function () {
+			$scope.property.mode = 'read';
+			$scope.$hide();
+		};
+
+		// Close button handler
+		$scope.close = function () {
+			$scope.property.mode = 'read';
+			$scope.$hide();
+		};
+
+	}]);
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties-signal-scope-controller.js b/len-activiti/src/main/resources/static/editor-app/configuration/properties-signal-scope-controller.js
index fb97740..f86da57 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties-signal-scope-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties-signal-scope-controller.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -16,32 +16,32 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
-angular.module('activitiModeler').controller('ActivitiSignalRefCtrl', [ '$scope', function($scope) {
+angular.module('activitiModeler').controller('ActivitiSignalRefCtrl', ['$scope', function ($scope) {
 
-    // Find the parent shape on which the signal definitions are defined
-    var signalDefinitionsProperty = undefined;
-    var parent = $scope.selectedShape;
-    while (parent !== null && parent !== undefined && signalDefinitionsProperty === undefined) {
-        if (parent.properties && parent.properties['oryx-signaldefinitions']) {
-            signalDefinitionsProperty = parent.properties['oryx-signaldefinitions'];
-        } else {
-            parent = parent.parent;
-        }
-    }
+	// Find the parent shape on which the signal definitions are defined
+	var signalDefinitionsProperty = undefined;
+	var parent = $scope.selectedShape;
+	while (parent !== null && parent !== undefined && signalDefinitionsProperty === undefined) {
+		if (parent.properties && parent.properties['oryx-signaldefinitions']) {
+			signalDefinitionsProperty = parent.properties['oryx-signaldefinitions'];
+		} else {
+			parent = parent.parent;
+		}
+	}
 
-    try {
-        signalDefinitionsProperty = JSON.parse(signalDefinitionsProperty);
-        if (typeof signalDefinitionsProperty == 'string') {
-            signalDefinitionsProperty = JSON.parse(signalDefinitionsProperty);
-        }
-    } catch (err) {
-        // Do nothing here, just to be sure we try-catch it
-    }
+	try {
+		signalDefinitionsProperty = JSON.parse(signalDefinitionsProperty);
+		if (typeof signalDefinitionsProperty == 'string') {
+			signalDefinitionsProperty = JSON.parse(signalDefinitionsProperty);
+		}
+	} catch (err) {
+		// Do nothing here, just to be sure we try-catch it
+	}
 
-    $scope.signalDefinitions = signalDefinitionsProperty;
+	$scope.signalDefinitions = signalDefinitionsProperty;
 
 
-    $scope.signalChanged = function() {
-    	$scope.updatePropertyInModel($scope.property);
-    };
-}]);
\ No newline at end of file
+	$scope.signalChanged = function () {
+		$scope.updatePropertyInModel($scope.property);
+	};
+}]);
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties-task-listeners-controller.js b/len-activiti/src/main/resources/static/editor-app/configuration/properties-task-listeners-controller.js
index 33f2dfb..1902320 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties-task-listeners-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties-task-listeners-controller.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -21,305 +21,276 @@
  * Task listeners
  */
 
-var KisBpmTaskListenersCtrl = [ '$scope', '$modal', '$timeout', '$translate', function($scope, $modal, $timeout, $translate) {
+var KisBpmTaskListenersCtrl = ['$scope', '$modal', '$timeout', '$translate', function ($scope, $modal, $timeout, $translate) {
 
-    // Config for the modal window
-    var opts = {
-        template:  'editor-app/configuration/properties/task-listeners-popup.html?version=' + Date.now(),
-        scope: $scope
-    };
+	// Config for the modal window
+	var opts = {
+		template: 'editor-app/configuration/properties/task-listeners-popup.html?version=' + Date.now(),
+		scope: $scope
+	};
 
-    // Open the dialog
-    $modal(opts);
+	// Open the dialog
+	$modal(opts);
 }];
 
-var KisBpmTaskListenersPopupCtrl = [ '$scope', '$q', '$translate', function($scope, $q, $translate) {
-
-    // Put json representing form properties on scope
-    if ($scope.property.value !== undefined && $scope.property.value !== null
-        && $scope.property.value.taskListeners !== undefined
-        && $scope.property.value.taskListeners !== null) {
-        
-        if ($scope.property.value.taskListeners.constructor == String)
-        {
-            $scope.taskListeners = JSON.parse($scope.property.value.taskListeners);
-        }
-        else
-        {
-            // Note that we clone the json object rather then setting it directly,
-            // this to cope with the fact that the user can click the cancel button and no changes should have happened
-            $scope.taskListeners = angular.copy($scope.property.value.taskListeners);
-        }
-        
-        for (var i = 0; i < $scope.taskListeners.length; i++)
-        {
-            var taskListener = $scope.taskListeners[i];
-            if (taskListener.className !== undefined && taskListener.className !== '')
-            {
-                taskListener.implementation = taskListener.className;
-            }
-            else if (taskListener.expression !== undefined && taskListener.expression !== '')
-            {
-                taskListener.implementation = taskListener.expression;
-            }
-            else if (taskListener.delegateExpression !== undefined && taskListener.delegateExpression !== '')
-            {
-                taskListener.implementation = taskListener.delegateExpression;
-            }
-        }
-    } else {
-        $scope.taskListeners = [];
-    }
-
-    // Array to contain selected properties (yes - we only can select one, but ng-grid isn't smart enough)
-    $scope.selectedListeners = [];
-    $scope.selectedFields = [];
-    $scope.translationsRetrieved = false;
-    
-    $scope.labels = {};
-    
-    var eventPromise = $translate('PROPERTY.TASKLISTENERS.EVENT');
-    var implementationPromise = $translate('PROPERTY.TASKLISTENERS.FIELDS.IMPLEMENTATION');
-    var namePromise = $translate('PROPERTY.TASKLISTENERS.FIELDS.NAME');
-    
-    $q.all([eventPromise, implementationPromise, namePromise]).then(function(results) { 
-        $scope.labels.eventLabel = results[0];
-        $scope.labels.implementationLabel = results[1];
-        $scope.labels.nameLabel = results[2];
-        $scope.translationsRetrieved = true;
-
-        // Config for grid
-        $scope.gridOptions = {
-            data: 'taskListeners',
-            enableRowReordering: true,
-            headerRowHeight: 28,
-            multiSelect: false,
-            keepLastSelected : false,
-            selectedItems: $scope.selectedListeners,
-            afterSelectionChange: function (rowItem, event) {
-                $scope.selectedFields.length = 0;
-                if ($scope.selectedListeners.length > 0)
-                {
-                    var fields = $scope.selectedListeners[0].fields;
-                    if (fields !== undefined && fields !== null)
-                    {
-                        for (var i = 0; i < fields.length; i++)
-                        {
-                            var field = fields[i];
-                            if (field.stringValue !== undefined && field.stringValue !== '')
-                            {
-                                field.implementation = field.stringValue;
-                            }
-                            else if (field.expression !== undefined && field.expression !== '')
-                            {
-                                field.implementation = field.expression;
-                            }
-                            else if (field.string !== undefined && field.string !== '')
-                            {
-                                field.implementation = field.string;
-                            }
-                        }
-                    }
-                }
-            },
-            columnDefs: [{ field: 'event', displayName: $scope.labels.eventLabel },
-                { field: 'implementation', displayName: $scope.labels.implementationLabel}]
-        };
-        
-        // Config for field grid
-        $scope.gridFieldOptions = {
-            data: 'selectedListeners[0].fields',
-            enableRowReordering: true,
-            headerRowHeight: 28,
-            multiSelect: false,
-            keepLastSelected : false,
-            selectedItems: $scope.selectedFields,
-            columnDefs: [{ field: 'name', displayName: $scope.labels.name },
-                { field: 'implementation', displayName: $scope.labels.implementationLabel}]
-        };
-    });
-    
-    $scope.listenerDetailsChanged = function() {
-        if ($scope.selectedListeners[0].className !== '')
-        {
-            $scope.selectedListeners[0].implementation = $scope.selectedListeners[0].className;
-        }
-        else if ($scope.selectedListeners[0].expression !== '')
-        {
-            $scope.selectedListeners[0].implementation = $scope.selectedListeners[0].expression;
-        }
-        else if ($scope.selectedListeners[0].delegateExpression !== '')
-        {
-            $scope.selectedListeners[0].implementation = $scope.selectedListeners[0].delegateExpression;
-        }
-        else
-        {
-            $scope.selectedListeners[0].implementation = '';
-        }
-    };
-
-    // Click handler for add button
-    $scope.addNewListener = function() {
-        $scope.taskListeners.push({ event : 'create',
-            implementation : '',
-            className : '',
-            expression: '',
-            delegateExpression: ''});
-    };
-
-    // Click handler for remove button
-    $scope.removeListener = function() {
-        if ($scope.selectedListeners.length > 0) {
-            var index = $scope.taskListeners.indexOf($scope.selectedListeners[0]);
-            $scope.gridOptions.selectItem(index, false);
-            $scope.taskListeners.splice(index, 1);
-
-            $scope.selectedListeners.length = 0;
-            if (index < $scope.taskListeners.length) {
-                $scope.gridOptions.selectItem(index + 1, true);
-            } else if ($scope.taskListeners.length > 0) {
-                $scope.gridOptions.selectItem(index - 1, true);
-            }
-        }
-    };
-
-    // Click handler for up button
-    $scope.moveListenerUp = function() {
-        if ($scope.selectedListeners.length > 0) {
-            var index = $scope.taskListeners.indexOf($scope.selectedListeners[0]);
-            if (index != 0) { // If it's the first, no moving up of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.taskListeners[index];
-                $scope.taskListeners.splice(index, 1);
-                $timeout(function(){
-                    $scope.taskListeners.splice(index + -1, 0, temp);
-                }, 100);
-
-            }
-        }
-    };
-
-    // Click handler for down button
-    $scope.moveListenerDown = function() {
-        if ($scope.selectedListeners.length > 0) {
-            var index = $scope.taskListeners.indexOf($scope.selectedListeners[0]);
-            if (index != $scope.taskListeners.length - 1) { // If it's the last element, no moving down of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.taskListeners[index];
-                $scope.taskListeners.splice(index, 1);
-                $timeout(function(){
-                    $scope.taskListeners.splice(index + 1, 0, temp);
-                }, 100);
-
-            }
-        }
-    };
-    
-    $scope.fieldDetailsChanged = function() {
-        if ($scope.selectedFields[0].stringValue != '')
-        {
-            $scope.selectedFields[0].implementation = $scope.selectedFields[0].stringValue;
-        }
-        else if ($scope.selectedFields[0].expression != '')
-        {
-            $scope.selectedFields[0].implementation = $scope.selectedFields[0].expression;
-        }
-        else if ($scope.selectedFields[0].string != '')
-        {
-            $scope.selectedFields[0].implementation = $scope.selectedFields[0].string;
-        }
-        else
-        {
-            $scope.selectedFields[0].implementation = '';
-        }
-    };
-
-    // Click handler for add button
-    $scope.addNewField = function() {
-        if ($scope.selectedListeners.length > 0)
-        {
-            if ($scope.selectedListeners[0].fields == undefined)
-            {
-                $scope.selectedListeners[0].fields = [];
-            }
-            $scope.selectedListeners[0].fields.push({ name : 'fieldName',
-                implementation : '',
-                stringValue : '',
-                expression: '',
-                string: ''});
-        }
-    };
-
-    // Click handler for remove button
-    $scope.removeField = function() {
-        if ($scope.selectedFields.length > 0) {
-            var index = $scope.selectedListeners[0].fields.indexOf($scope.selectedFields[0]);
-            $scope.gridFieldOptions.selectItem(index, false);
-            $scope.selectedListeners[0].fields.splice(index, 1);
-
-            $scope.selectedFields.length = 0;
-            if (index < $scope.selectedListeners[0].fields.length) {
-                $scope.gridFieldOptions.selectItem(index + 1, true);
-            } else if ($scope.selectedListeners[0].fields.length > 0) {
-                $scope.gridFieldOptions.selectItem(index - 1, true);
-            }
-        }
-    };
-
-    // Click handler for up button
-    $scope.moveFieldUp = function() {
-        if ($scope.selectedFields.length > 0) {
-            var index = $scope.selectedListeners[0].fields.indexOf($scope.selectedFields[0]);
-            if (index != 0) { // If it's the first, no moving up of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.selectedListeners[0].fields[index];
-                $scope.selectedListeners[0].fields.splice(index, 1);
-                $timeout(function(){
-                    $scope.selectedListeners[0].fields.splice(index + -1, 0, temp);
-                }, 100);
-
-            }
-        }
-    };
-
-    // Click handler for down button
-    $scope.moveFieldDown = function() {
-        if ($scope.selectedFields.length > 0) {
-            var index = $scope.selectedListeners[0].fields.indexOf($scope.selectedFields[0]);
-            if (index != $scope.selectedListeners[0].fields.length - 1) { // If it's the last element, no moving down of course
-                // Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
-                var temp = $scope.selectedListeners[0].fields[index];
-                $scope.selectedListeners[0].fields.splice(index, 1);
-                $timeout(function(){
-                    $scope.selectedListeners[0].fields.splice(index + 1, 0, temp);
-                }, 100);
-
-            }
-        }
-    };
-
-    // Click handler for save button
-    $scope.save = function() {
-
-        if ($scope.taskListeners.length > 0) {
-            $scope.property.value = {};
-            $scope.property.value.taskListeners = $scope.taskListeners;
-        } else {
-            $scope.property.value = null;
-        }
-
-        $scope.updatePropertyInModel($scope.property);
-        $scope.close();
-    };
-
-    $scope.cancel = function() {
-        $scope.close();
-    };
-
-    // Close button handler
-    $scope.close = function() {
-        $scope.property.mode = 'read';
-        $scope.$hide();
-    };
-
-}];
\ No newline at end of file
+var KisBpmTaskListenersPopupCtrl = ['$scope', '$q', '$translate', function ($scope, $q, $translate) {
+
+	// Put json representing form properties on scope
+	if ($scope.property.value !== undefined && $scope.property.value !== null
+		&& $scope.property.value.taskListeners !== undefined
+		&& $scope.property.value.taskListeners !== null) {
+
+		if ($scope.property.value.taskListeners.constructor == String) {
+			$scope.taskListeners = JSON.parse($scope.property.value.taskListeners);
+		} else {
+			// Note that we clone the json object rather then setting it directly,
+			// this to cope with the fact that the user can click the cancel button and no changes should have happened
+			$scope.taskListeners = angular.copy($scope.property.value.taskListeners);
+		}
+
+		for (var i = 0; i < $scope.taskListeners.length; i++) {
+			var taskListener = $scope.taskListeners[i];
+			if (taskListener.className !== undefined && taskListener.className !== '') {
+				taskListener.implementation = taskListener.className;
+			} else if (taskListener.expression !== undefined && taskListener.expression !== '') {
+				taskListener.implementation = taskListener.expression;
+			} else if (taskListener.delegateExpression !== undefined && taskListener.delegateExpression !== '') {
+				taskListener.implementation = taskListener.delegateExpression;
+			}
+		}
+	} else {
+		$scope.taskListeners = [];
+	}
+
+	// Array to contain selected properties (yes - we only can select one, but ng-grid isn't smart enough)
+	$scope.selectedListeners = [];
+	$scope.selectedFields = [];
+	$scope.translationsRetrieved = false;
+
+	$scope.labels = {};
+
+	var eventPromise = $translate('PROPERTY.TASKLISTENERS.EVENT');
+	var implementationPromise = $translate('PROPERTY.TASKLISTENERS.FIELDS.IMPLEMENTATION');
+	var namePromise = $translate('PROPERTY.TASKLISTENERS.FIELDS.NAME');
+
+	$q.all([eventPromise, implementationPromise, namePromise]).then(function (results) {
+		$scope.labels.eventLabel = results[0];
+		$scope.labels.implementationLabel = results[1];
+		$scope.labels.nameLabel = results[2];
+		$scope.translationsRetrieved = true;
+
+		// Config for grid
+		$scope.gridOptions = {
+			data: 'taskListeners',
+			enableRowReordering: true,
+			headerRowHeight: 28,
+			multiSelect: false,
+			keepLastSelected: false,
+			selectedItems: $scope.selectedListeners,
+			afterSelectionChange: function (rowItem, event) {
+				$scope.selectedFields.length = 0;
+				if ($scope.selectedListeners.length > 0) {
+					var fields = $scope.selectedListeners[0].fields;
+					if (fields !== undefined && fields !== null) {
+						for (var i = 0; i < fields.length; i++) {
+							var field = fields[i];
+							if (field.stringValue !== undefined && field.stringValue !== '') {
+								field.implementation = field.stringValue;
+							} else if (field.expression !== undefined && field.expression !== '') {
+								field.implementation = field.expression;
+							} else if (field.string !== undefined && field.string !== '') {
+								field.implementation = field.string;
+							}
+						}
+					}
+				}
+			},
+			columnDefs: [{field: 'event', displayName: $scope.labels.eventLabel},
+				{field: 'implementation', displayName: $scope.labels.implementationLabel}]
+		};
+
+		// Config for field grid
+		$scope.gridFieldOptions = {
+			data: 'selectedListeners[0].fields',
+			enableRowReordering: true,
+			headerRowHeight: 28,
+			multiSelect: false,
+			keepLastSelected: false,
+			selectedItems: $scope.selectedFields,
+			columnDefs: [{field: 'name', displayName: $scope.labels.name},
+				{field: 'implementation', displayName: $scope.labels.implementationLabel}]
+		};
+	});
+
+	$scope.listenerDetailsChanged = function () {
+		if ($scope.selectedListeners[0].className !== '') {
+			$scope.selectedListeners[0].implementation = $scope.selectedListeners[0].className;
+		} else if ($scope.selectedListeners[0].expression !== '') {
+			$scope.selectedListeners[0].implementation = $scope.selectedListeners[0].expression;
+		} else if ($scope.selectedListeners[0].delegateExpression !== '') {
+			$scope.selectedListeners[0].implementation = $scope.selectedListeners[0].delegateExpression;
+		} else {
+			$scope.selectedListeners[0].implementation = '';
+		}
+	};
+
+	// Click handler for add button
+	$scope.addNewListener = function () {
+		$scope.taskListeners.push({
+			event: 'create',
+			implementation: '',
+			className: '',
+			expression: '',
+			delegateExpression: ''
+		});
+	};
+
+	// Click handler for remove button
+	$scope.removeListener = function () {
+		if ($scope.selectedListeners.length > 0) {
+			var index = $scope.taskListeners.indexOf($scope.selectedListeners[0]);
+			$scope.gridOptions.selectItem(index, false);
+			$scope.taskListeners.splice(index, 1);
+
+			$scope.selectedListeners.length = 0;
+			if (index < $scope.taskListeners.length) {
+				$scope.gridOptions.selectItem(index + 1, true);
+			} else if ($scope.taskListeners.length > 0) {
+				$scope.gridOptions.selectItem(index - 1, true);
+			}
+		}
+	};
+
+	// Click handler for up button
+	$scope.moveListenerUp = function () {
+		if ($scope.selectedListeners.length > 0) {
+			var index = $scope.taskListeners.indexOf($scope.selectedListeners[0]);
+			if (index != 0) { // If it's the first, no moving up of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.taskListeners[index];
+				$scope.taskListeners.splice(index, 1);
+				$timeout(function () {
+					$scope.taskListeners.splice(index + -1, 0, temp);
+				}, 100);
+
+			}
+		}
+	};
+
+	// Click handler for down button
+	$scope.moveListenerDown = function () {
+		if ($scope.selectedListeners.length > 0) {
+			var index = $scope.taskListeners.indexOf($scope.selectedListeners[0]);
+			if (index != $scope.taskListeners.length - 1) { // If it's the last element, no moving down of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.taskListeners[index];
+				$scope.taskListeners.splice(index, 1);
+				$timeout(function () {
+					$scope.taskListeners.splice(index + 1, 0, temp);
+				}, 100);
+
+			}
+		}
+	};
+
+	$scope.fieldDetailsChanged = function () {
+		if ($scope.selectedFields[0].stringValue != '') {
+			$scope.selectedFields[0].implementation = $scope.selectedFields[0].stringValue;
+		} else if ($scope.selectedFields[0].expression != '') {
+			$scope.selectedFields[0].implementation = $scope.selectedFields[0].expression;
+		} else if ($scope.selectedFields[0].string != '') {
+			$scope.selectedFields[0].implementation = $scope.selectedFields[0].string;
+		} else {
+			$scope.selectedFields[0].implementation = '';
+		}
+	};
+
+	// Click handler for add button
+	$scope.addNewField = function () {
+		if ($scope.selectedListeners.length > 0) {
+			if ($scope.selectedListeners[0].fields == undefined) {
+				$scope.selectedListeners[0].fields = [];
+			}
+			$scope.selectedListeners[0].fields.push({
+				name: 'fieldName',
+				implementation: '',
+				stringValue: '',
+				expression: '',
+				string: ''
+			});
+		}
+	};
+
+	// Click handler for remove button
+	$scope.removeField = function () {
+		if ($scope.selectedFields.length > 0) {
+			var index = $scope.selectedListeners[0].fields.indexOf($scope.selectedFields[0]);
+			$scope.gridFieldOptions.selectItem(index, false);
+			$scope.selectedListeners[0].fields.splice(index, 1);
+
+			$scope.selectedFields.length = 0;
+			if (index < $scope.selectedListeners[0].fields.length) {
+				$scope.gridFieldOptions.selectItem(index + 1, true);
+			} else if ($scope.selectedListeners[0].fields.length > 0) {
+				$scope.gridFieldOptions.selectItem(index - 1, true);
+			}
+		}
+	};
+
+	// Click handler for up button
+	$scope.moveFieldUp = function () {
+		if ($scope.selectedFields.length > 0) {
+			var index = $scope.selectedListeners[0].fields.indexOf($scope.selectedFields[0]);
+			if (index != 0) { // If it's the first, no moving up of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.selectedListeners[0].fields[index];
+				$scope.selectedListeners[0].fields.splice(index, 1);
+				$timeout(function () {
+					$scope.selectedListeners[0].fields.splice(index + -1, 0, temp);
+				}, 100);
+
+			}
+		}
+	};
+
+	// Click handler for down button
+	$scope.moveFieldDown = function () {
+		if ($scope.selectedFields.length > 0) {
+			var index = $scope.selectedListeners[0].fields.indexOf($scope.selectedFields[0]);
+			if (index != $scope.selectedListeners[0].fields.length - 1) { // If it's the last element, no moving down of course
+				// Reason for funny way of swapping, see https://github.com/angular-ui/ng-grid/issues/272
+				var temp = $scope.selectedListeners[0].fields[index];
+				$scope.selectedListeners[0].fields.splice(index, 1);
+				$timeout(function () {
+					$scope.selectedListeners[0].fields.splice(index + 1, 0, temp);
+				}, 100);
+
+			}
+		}
+	};
+
+	// Click handler for save button
+	$scope.save = function () {
+
+		if ($scope.taskListeners.length > 0) {
+			$scope.property.value = {};
+			$scope.property.value.taskListeners = $scope.taskListeners;
+		} else {
+			$scope.property.value = null;
+		}
+
+		$scope.updatePropertyInModel($scope.property);
+		$scope.close();
+	};
+
+	$scope.cancel = function () {
+		$scope.close();
+	};
+
+	// Close button handler
+	$scope.close = function () {
+		$scope.property.mode = 'read';
+		$scope.$hide();
+	};
+
+}];
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties.js b/len-activiti/src/main/resources/static/editor-app/configuration/properties.js
index 55727c6..d533c0c 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -20,80 +20,80 @@
 
 var KISBPM = KISBPM || {};
 KISBPM.PROPERTY_CONFIG =
-{
-    "string": {
-        "readModeTemplateUrl": "editor-app/configuration/properties/default-value-display-template.html",
-        "writeModeTemplateUrl": "editor-app/configuration/properties/string-property-write-mode-template.html"
-    },
-    "boolean": {
-        "templateUrl": "editor-app/configuration/properties/boolean-property-template.html"
-    },
-    "text" : {
-        "readModeTemplateUrl": "editor-app/configuration/properties/default-value-display-template.html",
-        "writeModeTemplateUrl": "editor-app/configuration/properties/text-property-write-template.html"
-    },
-    "kisbpm-multiinstance" : {
-        "readModeTemplateUrl": "editor-app/configuration/properties/default-value-display-template.html",
-        "writeModeTemplateUrl": "editor-app/configuration/properties/multiinstance-property-write-template.html"
-    },
-    "oryx-formproperties-complex": {
-        "readModeTemplateUrl": "editor-app/configuration/properties/form-properties-display-template.html",
-        "writeModeTemplateUrl": "editor-app/configuration/properties/form-properties-write-template.html"
-    },
-    "oryx-executionlisteners-multiplecomplex": {
-        "readModeTemplateUrl": "editor-app/configuration/properties/execution-listeners-display-template.html",
-        "writeModeTemplateUrl": "editor-app/configuration/properties/execution-listeners-write-template.html"
-    },
-    "oryx-tasklisteners-multiplecomplex": {
-        "readModeTemplateUrl": "editor-app/configuration/properties/task-listeners-display-template.html",
-        "writeModeTemplateUrl": "editor-app/configuration/properties/task-listeners-write-template.html"
-    },
-    "oryx-eventlisteners-multiplecomplex": {
-        "readModeTemplateUrl": "editor-app/configuration/properties/event-listeners-display-template.html",
-        "writeModeTemplateUrl": "editor-app/configuration/properties/event-listeners-write-template.html"
-    },
-    "oryx-usertaskassignment-complex": {
-        "readModeTemplateUrl": "editor-app/configuration/properties/assignment-display-template.html",
-        "writeModeTemplateUrl": "editor-app/configuration/properties/assignment-write-template.html"
-    },
-    "oryx-servicetaskfields-complex": {
-        "readModeTemplateUrl": "editor-app/configuration/properties/fields-display-template.html",
-        "writeModeTemplateUrl": "editor-app/configuration/properties/fields-write-template.html"
-    },
-    "oryx-callactivityinparameters-complex": {
-        "readModeTemplateUrl": "editor-app/configuration/properties/in-parameters-display-template.html",
-        "writeModeTemplateUrl": "editor-app/configuration/properties/in-parameters-write-template.html"
-    },
-    "oryx-callactivityoutparameters-complex": {
-        "readModeTemplateUrl": "editor-app/configuration/properties/out-parameters-display-template.html",
-        "writeModeTemplateUrl": "editor-app/configuration/properties/out-parameters-write-template.html"
-    },
-    "oryx-subprocessreference-complex": {
-        "readModeTemplateUrl": "editor-app/configuration/properties/subprocess-reference-display-template.html",
-        "writeModeTemplateUrl": "editor-app/configuration/properties/subprocess-reference-write-template.html"
-    },
-    "oryx-sequencefloworder-complex" : {
-        "readModeTemplateUrl": "editor-app/configuration/properties/sequenceflow-order-display-template.html",
-        "writeModeTemplateUrl": "editor-app/configuration/properties/sequenceflow-order-write-template.html"
-    },
-    "oryx-conditionsequenceflow-complex" : {
-        "readModeTemplateUrl": "editor-app/configuration/properties/condition-expression-display-template.html",
-        "writeModeTemplateUrl": "editor-app/configuration/properties/condition-expression-write-template.html"
-    },
-    "oryx-signaldefinitions-multiplecomplex" : {
-        "readModeTemplateUrl": "editor-app/configuration/properties/signal-definitions-display-template.html",
-        "writeModeTemplateUrl": "editor-app/configuration/properties/signal-definitions-write-template.html"
-    },
-    "oryx-signalref-string" : {
-        "readModeTemplateUrl": "editor-app/configuration/properties/default-value-display-template.html",
-        "writeModeTemplateUrl": "editor-app/configuration/properties/signal-property-write-template.html"
-    },
-    "oryx-messagedefinitions-multiplecomplex" : {
-        "readModeTemplateUrl": "editor-app/configuration/properties/message-definitions-display-template.html",
-        "writeModeTemplateUrl": "editor-app/configuration/properties/message-definitions-write-template.html"
-    },
-    "oryx-messageref-string" : {
-        "readModeTemplateUrl": "editor-app/configuration/properties/default-value-display-template.html",
-        "writeModeTemplateUrl": "editor-app/configuration/properties/message-property-write-template.html"
-    }
-};
+	{
+		"string": {
+			"readModeTemplateUrl": "editor-app/configuration/properties/default-value-display-template.html",
+			"writeModeTemplateUrl": "editor-app/configuration/properties/string-property-write-mode-template.html"
+		},
+		"boolean": {
+			"templateUrl": "editor-app/configuration/properties/boolean-property-template.html"
+		},
+		"text": {
+			"readModeTemplateUrl": "editor-app/configuration/properties/default-value-display-template.html",
+			"writeModeTemplateUrl": "editor-app/configuration/properties/text-property-write-template.html"
+		},
+		"kisbpm-multiinstance": {
+			"readModeTemplateUrl": "editor-app/configuration/properties/default-value-display-template.html",
+			"writeModeTemplateUrl": "editor-app/configuration/properties/multiinstance-property-write-template.html"
+		},
+		"oryx-formproperties-complex": {
+			"readModeTemplateUrl": "editor-app/configuration/properties/form-properties-display-template.html",
+			"writeModeTemplateUrl": "editor-app/configuration/properties/form-properties-write-template.html"
+		},
+		"oryx-executionlisteners-multiplecomplex": {
+			"readModeTemplateUrl": "editor-app/configuration/properties/execution-listeners-display-template.html",
+			"writeModeTemplateUrl": "editor-app/configuration/properties/execution-listeners-write-template.html"
+		},
+		"oryx-tasklisteners-multiplecomplex": {
+			"readModeTemplateUrl": "editor-app/configuration/properties/task-listeners-display-template.html",
+			"writeModeTemplateUrl": "editor-app/configuration/properties/task-listeners-write-template.html"
+		},
+		"oryx-eventlisteners-multiplecomplex": {
+			"readModeTemplateUrl": "editor-app/configuration/properties/event-listeners-display-template.html",
+			"writeModeTemplateUrl": "editor-app/configuration/properties/event-listeners-write-template.html"
+		},
+		"oryx-usertaskassignment-complex": {
+			"readModeTemplateUrl": "editor-app/configuration/properties/assignment-display-template.html",
+			"writeModeTemplateUrl": "editor-app/configuration/properties/assignment-write-template.html"
+		},
+		"oryx-servicetaskfields-complex": {
+			"readModeTemplateUrl": "editor-app/configuration/properties/fields-display-template.html",
+			"writeModeTemplateUrl": "editor-app/configuration/properties/fields-write-template.html"
+		},
+		"oryx-callactivityinparameters-complex": {
+			"readModeTemplateUrl": "editor-app/configuration/properties/in-parameters-display-template.html",
+			"writeModeTemplateUrl": "editor-app/configuration/properties/in-parameters-write-template.html"
+		},
+		"oryx-callactivityoutparameters-complex": {
+			"readModeTemplateUrl": "editor-app/configuration/properties/out-parameters-display-template.html",
+			"writeModeTemplateUrl": "editor-app/configuration/properties/out-parameters-write-template.html"
+		},
+		"oryx-subprocessreference-complex": {
+			"readModeTemplateUrl": "editor-app/configuration/properties/subprocess-reference-display-template.html",
+			"writeModeTemplateUrl": "editor-app/configuration/properties/subprocess-reference-write-template.html"
+		},
+		"oryx-sequencefloworder-complex": {
+			"readModeTemplateUrl": "editor-app/configuration/properties/sequenceflow-order-display-template.html",
+			"writeModeTemplateUrl": "editor-app/configuration/properties/sequenceflow-order-write-template.html"
+		},
+		"oryx-conditionsequenceflow-complex": {
+			"readModeTemplateUrl": "editor-app/configuration/properties/condition-expression-display-template.html",
+			"writeModeTemplateUrl": "editor-app/configuration/properties/condition-expression-write-template.html"
+		},
+		"oryx-signaldefinitions-multiplecomplex": {
+			"readModeTemplateUrl": "editor-app/configuration/properties/signal-definitions-display-template.html",
+			"writeModeTemplateUrl": "editor-app/configuration/properties/signal-definitions-write-template.html"
+		},
+		"oryx-signalref-string": {
+			"readModeTemplateUrl": "editor-app/configuration/properties/default-value-display-template.html",
+			"writeModeTemplateUrl": "editor-app/configuration/properties/signal-property-write-template.html"
+		},
+		"oryx-messagedefinitions-multiplecomplex": {
+			"readModeTemplateUrl": "editor-app/configuration/properties/message-definitions-display-template.html",
+			"writeModeTemplateUrl": "editor-app/configuration/properties/message-definitions-write-template.html"
+		},
+		"oryx-messageref-string": {
+			"readModeTemplateUrl": "editor-app/configuration/properties/default-value-display-template.html",
+			"writeModeTemplateUrl": "editor-app/configuration/properties/message-property-write-template.html"
+		}
+	};
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-candidateGroup.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-candidateGroup.html
index bc43c25..9ae80d9 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-candidateGroup.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-candidateGroup.html
@@ -2,24 +2,28 @@
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="close()">&times;</button>
+				<button aria-hidden="true" class="close" data-dismiss="modal" ng-click="close()" type="button">&times;
+				</button>
 				<h2 translate>PROPERTY.ASSIGNMENT.TITLE</h2>
 			</div>
 			<div class="modal-body">
 				<div class="row row-no-gutter">
 					<div class="col-xs-2"></div>
 					<div class="col-xs-8">
-						<table  class="table table-bordered table-condensed">
+						<table class="table table-bordered table-condensed">
 							<thead>
 							<tr>
-								<th><input type="checkbox" ng-click="selectAll($event)"></th>
+								<th><input ng-click="selectAll($event)" type="checkbox"></th>
 								<th>角色</th>
 							</tr>
 							</thead>
 							<tbody>
-							<tr ng-click="selectThis($event,candidateGroup)" ng-repeat="candidateGroup in candidateGroups">
+							<tr ng-click="selectThis($event,candidateGroup)"
+								ng-repeat="candidateGroup in candidateGroups">
 								<td>
-									<input type="checkbox" ng-click="$event.stopPropagation();" ng-model="candidateGroup.selected" ne-true-value="{{candidateGroup.id}}" ng-false-value="false">
+									<input ne-true-value="{{candidateGroup.id}}" ng-click="$event.stopPropagation();"
+										   ng-false-value="false" ng-model="candidateGroup.selected"
+										   type="checkbox">
 								</td>
 								<td>{{candidateGroup.description}}</td>
 							</tr>
@@ -30,9 +34,9 @@
 				</div>
 			</div>
 			<div class="modal-footer">
-				<button ng-click="close()"  class="btn btn-inverse"  translate>ACTION.CANCEL</button>
-				<button ng-click="save()"  class="btn btn-primary"  translate>ACTION.SAVE</button>
+				<button class="btn btn-inverse" ng-click="close()" translate>ACTION.CANCEL</button>
+				<button class="btn btn-primary" ng-click="save()" translate>ACTION.SAVE</button>
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-display-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-display-template.html
index 40ab69d..882295a 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-display-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-display-template.html
@@ -1,4 +1,10 @@
-<span ng-if="property.value.assignment.assignee">{{'PROPERTY.ASSIGNMENT.ASSIGNEE_DISPLAY' | translate:property.value.assignment }} </span>
-<span ng-if="property.value.assignment.candidateUsers.length > 0">{{'PROPERTY.ASSIGNMENT.CANDIDATE_USERS_DISPLAY' | translate:property.value.assignment.candidateUsers}} </span>
-<span ng-if="property.value.assignment.candidateGroups.length > 0">{{'PROPERTY.ASSIGNMENT.CANDIDATE_GROUPS_DISPLAY' | translate:property.value.assignment.candidateGroups}} </span>
-<span ng-if="!property.value.assignment.assignee && (!property.value.assignment.candidateUsers || property.value.assignment.candidateUsers.length == 0) && (!property.value.assignment.candidateGroups || property.value.assignment.candidateGroups.length == 0)" translate>PROPERTY.ASSIGNMENT.EMPTY</span>
\ No newline at end of file
+<span
+	ng-if="property.value.assignment.assignee">{{'PROPERTY.ASSIGNMENT.ASSIGNEE_DISPLAY' | translate:property.value.assignment
+	}} </span>
+<span
+	ng-if="property.value.assignment.candidateUsers.length > 0">{{'PROPERTY.ASSIGNMENT.CANDIDATE_USERS_DISPLAY' | translate:property.value.assignment.candidateUsers}} </span>
+<span
+	ng-if="property.value.assignment.candidateGroups.length > 0">{{'PROPERTY.ASSIGNMENT.CANDIDATE_GROUPS_DISPLAY' | translate:property.value.assignment.candidateGroups}} </span>
+<span
+	ng-if="!property.value.assignment.assignee && (!property.value.assignment.candidateUsers || property.value.assignment.candidateUsers.length == 0) && (!property.value.assignment.candidateGroups || property.value.assignment.candidateGroups.length == 0)"
+	translate>PROPERTY.ASSIGNMENT.EMPTY</span>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-popup-popup.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-popup-popup.html
index baf8242..89ca807 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-popup-popup.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-popup-popup.html
@@ -2,17 +2,19 @@
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="close()">&times;</button>
+				<button aria-hidden="true" class="close" data-dismiss="modal" ng-click="close()" type="button">&times;
+				</button>
 				<h2 translate>PROPERTY.ASSIGNMENT.TITLE</h2>
 			</div>
 			<div class="modal-body">
 				<div class="row row-no-gutter">
 					<div class="col-xs-3">
-						<div  id="z_tree">
+						<div id="z_tree">
 							<div ng-repeat="role in roles">
-								<ul class="list-group" ng-class="{collapsed: !group.expanded, 'first': $first}" style="margin-bottom: 1px">
+								<ul class="list-group" ng-class="{collapsed: !group.expanded, 'first': $first}"
+									style="margin-bottom: 1px">
 									<li class="list-group-item" style="cursor: pointer;">
-										<span ng-click="getAllAccountByRole(role.id)" >
+										<span ng-click="getAllAccountByRole(role.id)">
 											{{role.name}}
 										</span>
 									</li>
@@ -25,7 +27,8 @@
 						<table class="table table-bordered table-condensed">
 							<thead>
 							<tr>
-								<th><input ng-if="choseAssignmentFlag=='assignees'" type="checkbox" ng-click="selectAll($event)"></th>
+								<th><input ng-click="selectAll($event)" ng-if="choseAssignmentFlag=='assignees'"
+										   type="checkbox"></th>
 								<th>用户名</th>
 								<th>姓名</th>
 							</tr>
@@ -33,11 +36,16 @@
 							<tbody>
 							<tr ng-click="selectThis($event,account)" ng-repeat="account in accounts">
 								<td>
-									<input ng-if="choseAssignmentFlag=='assignee'" ng-click="$event.stopPropagation();"  type="radio" ng-model="account.checked" name="accountsIds" value="{{account.id}}"
+									<input name="accountsIds" ng-click="$event.stopPropagation();"
+										   ng-if="choseAssignmentFlag=='assignee'" ng-model="account.checked"
+										   type="radio"
+										   value="{{account.id}}"
 									>
 
-									<input ng-if="choseAssignmentFlag=='assignees'" ng-click="$event.stopPropagation();" type="checkbox" ng-model="account.selected" ne-true-value="{{account.id}}"
-										   ng-false-value="false">
+									<input ne-true-value="{{account.id}}" ng-click="$event.stopPropagation();"
+										   ng-false-value="false" ng-if="choseAssignmentFlag=='assignees'"
+										   ng-model="account.selected"
+										   type="checkbox">
 								</td>
 								<td>{{account.code}}</td>
 								<td>{{account.name}}</td>
@@ -57,9 +65,9 @@
 					<tm-pagination conf="paginationConf"></tm-pagination>
 				</div>
 
-				<button ng-click="close()"  translate class="btn btn-inverse">ACTION.CANCEL</button>
-				<button ng-click="save()"  class="btn btn-primary" translate>ACTION.SAVE</button>
+				<button class="btn btn-inverse" ng-click="close()" translate>ACTION.CANCEL</button>
+				<button class="btn btn-primary" ng-click="save()" translate>ACTION.SAVE</button>
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-popup.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-popup.html
index 1587271..78ce26d 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-popup.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-popup.html
@@ -1,50 +1,69 @@
 <div class="modal" ng-controller="KisBpmAssignmentPopupCtrl">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="close()">&times;</button>
-                <h2 translate>PROPERTY.ASSIGNMENT.TITLE</h2>
-            </div>
-            <div class="modal-body">
-            
-            	<div class="row row-no-gutter">
-            		<div class="form-group">
-            			<label for="assigneeField">{{'PROPERTY.ASSIGNMENT.ASSIGNEE' | translate}}</label>
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button aria-hidden="true" class="close" data-dismiss="modal" ng-click="close()" type="button">&times;
+				</button>
+				<h2 translate>PROPERTY.ASSIGNMENT.TITLE</h2>
+			</div>
+			<div class="modal-body">
 
-                        <input type="text" id="assigneeShowField" class="form-control" style="cursor: pointer;"  readonly ng-model="assignment.assigneeshowname" placeholder="{{'PROPERTY.ASSIGNMENT.ASSIGNEE_PLACEHOLDER' | translate}}"
-                               ng-click="choseAssignment('assignee')" ng-value="candidateUser.choseAssigneeShowname"/>
-            			<input type="text" id="assigneeField" class="form-control"  ng-hide="true" ng-model="assignment.assignee" placeholder="{{'PROPERTY.ASSIGNMENT.ASSIGNEE_PLACEHOLDER' | translate}}"
-                                 ng-value="candidateUser.choseAssignee"/>
-            		</div>
-            	</div>
-            	
-                <div class="row row-no-gutter">
-                    <div class="form-group">
-                    	<label for="userField">{{'PROPERTY.ASSIGNMENT.CANDIDATE_USERS' | translate}}</label>
-                        <div ng-repeat="candidateUser in assignment.candidateUsers">
-                            <input id="userNameField" class="form-control" type="text" style="cursor: pointer;"   readonly ng-model="candidateUser.nameValue" ng-click="choseAssignment('assignees')" ng-value="candidateUser.value"/>
-            	            <input id="userField" class="form-control" type="text" ng-hide="true" ng-model="candidateUser.value"  ng-value="candidateUser.value"/>
-            	            <i class="glyphicon glyphicon-minus clickable-property" ng-click="removeCandidateUserValue($index)"></i>
-            	            <i ng-if="$index == (assignment.candidateUsers.length - 1)" class="glyphicon glyphicon-plus clickable-property" ng-click="addCandidateUserValue($index)"></i>
-                        </div>
-                   	</div>
-            
-                    <div class="form-group">
-                    	<label for="groupField">{{'PROPERTY.ASSIGNMENT.CANDIDATE_GROUPS' | translate}}</label>
-                        <div ng-repeat="candidateGroup in assignment.candidateGroups">
-                            <input id="groupNameField" class="form-control" type="text" style="cursor: pointer;"   readonly ng-model="candidateGroup.nameValue" ng-click="choseCandidateGroups()"/>
-            	          	<input id="groupField" class="form-control" type="text" ng-model="candidateGroup.value"  ng-hide="true"/>
-            	          	<i class="glyphicon glyphicon-minus clickable-property" ng-click="removeCandidateGroupValue($index)"></i>
-            	          	<i ng-if="$index == (assignment.candidateGroups.length - 1)" class="glyphicon glyphicon-plus clickable-property" ng-click="addCandidateGroupValue($index)"></i>
-                        </div>
-                    </div>
-                </div>
-            
-            </div>
-            <div class="modal-footer">
-                <button ng-click="close()" class="btn btn-primary" translate>ACTION.CANCEL</button>
-                <button ng-click="save()" class="btn btn-primary" translate>ACTION.SAVE</button>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
+				<div class="row row-no-gutter">
+					<div class="form-group">
+						<label for="assigneeField">{{'PROPERTY.ASSIGNMENT.ASSIGNEE' | translate}}</label>
+
+						<input class="form-control" id="assigneeShowField" ng-click="choseAssignment('assignee')"
+							   ng-model="assignment.assigneeshowname" ng-value="candidateUser.choseAssigneeShowname"
+							   placeholder="{{'PROPERTY.ASSIGNMENT.ASSIGNEE_PLACEHOLDER' | translate}}"
+							   readonly
+							   style="cursor: pointer;" type="text"/>
+						<input class="form-control" id="assigneeField" ng-hide="true" ng-model="assignment.assignee"
+							   ng-value="candidateUser.choseAssignee"
+							   placeholder="{{'PROPERTY.ASSIGNMENT.ASSIGNEE_PLACEHOLDER' | translate}}"
+							   type="text"/>
+					</div>
+				</div>
+
+				<div class="row row-no-gutter">
+					<div class="form-group">
+						<label for="userField">{{'PROPERTY.ASSIGNMENT.CANDIDATE_USERS' | translate}}</label>
+						<div ng-repeat="candidateUser in assignment.candidateUsers">
+							<input class="form-control" id="userNameField" ng-click="choseAssignment('assignees')"
+								   ng-model="candidateUser.nameValue" ng-value="candidateUser.value"
+								   readonly style="cursor: pointer;"
+								   type="text"/>
+							<input class="form-control" id="userField" ng-hide="true" ng-model="candidateUser.value"
+								   ng-value="candidateUser.value" type="text"/>
+							<i class="glyphicon glyphicon-minus clickable-property"
+							   ng-click="removeCandidateUserValue($index)"></i>
+							<i class="glyphicon glyphicon-plus clickable-property"
+							   ng-click="addCandidateUserValue($index)"
+							   ng-if="$index == (assignment.candidateUsers.length - 1)"></i>
+						</div>
+					</div>
+
+					<div class="form-group">
+						<label for="groupField">{{'PROPERTY.ASSIGNMENT.CANDIDATE_GROUPS' | translate}}</label>
+						<div ng-repeat="candidateGroup in assignment.candidateGroups">
+							<input class="form-control" id="groupNameField" ng-click="choseCandidateGroups()"
+								   ng-model="candidateGroup.nameValue"
+								   readonly style="cursor: pointer;" type="text"/>
+							<input class="form-control" id="groupField" ng-hide="true" ng-model="candidateGroup.value"
+								   type="text"/>
+							<i class="glyphicon glyphicon-minus clickable-property"
+							   ng-click="removeCandidateGroupValue($index)"></i>
+							<i class="glyphicon glyphicon-plus clickable-property"
+							   ng-click="addCandidateGroupValue($index)"
+							   ng-if="$index == (assignment.candidateGroups.length - 1)"></i>
+						</div>
+					</div>
+				</div>
+
+			</div>
+			<div class="modal-footer">
+				<button class="btn btn-primary" ng-click="close()" translate>ACTION.CANCEL</button>
+				<button class="btn btn-primary" ng-click="save()" translate>ACTION.SAVE</button>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-write-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-write-template.html
index b498b3d..8d2fde3 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-write-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/assignment-write-template.html
@@ -1,4 +1,3 @@
-
 <!-- Just need to instantiate the controller, and it will take care of showing the modal dialog -->
 <span ng-controller="KisBpmAssignmentCtrl">
 </span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/boolean-property-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/boolean-property-template.html
index 836dcaa..ba160d5 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/boolean-property-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/boolean-property-template.html
@@ -1,4 +1,3 @@
-
 <div ng-controller="KisBpmBooleanPropertyCtrl">
-    <input type="checkbox" ng-model="property.value" ng-change="changeValue()"/>
-</div>
\ No newline at end of file
+	<input ng-change="changeValue()" ng-model="property.value" type="checkbox"/>
+</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/condition-expression-display-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/condition-expression-display-template.html
index 37eef24..65d2766 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/condition-expression-display-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/condition-expression-display-template.html
@@ -1,2 +1,2 @@
-<span ng-if="property.value">{{property.value|limitTo:20}}</span>
+<span ng-if="property.value">{{property.value | limitTo:20}}</span>
 <span ng-if="!property.value">{{'PROPERTY.SEQUENCEFLOW.CONDITION.NO-CONDITION-DISPLAY' | translate}}</span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/condition-expression-popup.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/condition-expression-popup.html
index eea2bda..daab9dd 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/condition-expression-popup.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/condition-expression-popup.html
@@ -1,29 +1,30 @@
-
 <div class="modal" ng-controller="KisBpmConditionExpressionPopupCtrl">
-<div class="modal-dialog">
-<div class="modal-content">
-<div class="modal-header">
-    <button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="close()">&times;</button>
-    <h2 translate>PROPERTY.SEQUENCEFLOW.CONDITION.TITLE</h2>
-</div>
-<div class="modal-body">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button aria-hidden="true" class="close" data-dismiss="modal" ng-click="close()" type="button">&times;
+				</button>
+				<h2 translate>PROPERTY.SEQUENCEFLOW.CONDITION.TITLE</h2>
+			</div>
+			<div class="modal-body">
+
+				<div class="detail-group clearfix">
 
-    <div class="detail-group clearfix">
-        
-        <div class="form-group clearfix">
-            <div class="col-xs-12">
-                <label class="col-xs-3">{{'PROPERTY.SEQUENCEFLOW.CONDITION.STATIC' | translate}}</label>
-                <div class="col-xs-9">
-                    <textarea class="form-control" ng-model="conditionExpression.value" style="width:90%; height:100%; max-width: 100%; max-height: 100%; min-height: 100px"/>
-                </div>
-            </div>
-        </div>
+					<div class="form-group clearfix">
+						<div class="col-xs-12">
+							<label class="col-xs-3">{{'PROPERTY.SEQUENCEFLOW.CONDITION.STATIC' | translate}}</label>
+							<div class="col-xs-9">
+                                <textarea class="form-control" ng-model="conditionExpression.value"
+										  style="width:90%; height:100%; max-width: 100%; max-height: 100%; min-height: 100px"/>
+							</div>
+						</div>
+					</div>
 
-    </div>
-    <div class="modal-footer">
-        <button ng-click="close()" class="btn btn-primary" translate>ACTION.CANCEL</button>
-        <button ng-click="save()" class="btn btn-primary" translate>ACTION.SAVE</button>
-    </div>
-</div>
-</div>
-</div>
+				</div>
+				<div class="modal-footer">
+					<button class="btn btn-primary" ng-click="close()" translate>ACTION.CANCEL</button>
+					<button class="btn btn-primary" ng-click="save()" translate>ACTION.SAVE</button>
+				</div>
+			</div>
+		</div>
+	</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/condition-expression-write-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/condition-expression-write-template.html
index 83c64e6..734810a 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/condition-expression-write-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/condition-expression-write-template.html
@@ -1,4 +1,3 @@
-
 <!-- Just need to instantiate the controller, and it will take care of showing the modal dialog -->
 <span ng-controller="KisBpmConditionExpressionCtrl">
 </span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/default-value-display-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/default-value-display-template.html
index 875548c..ec61008 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/default-value-display-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/default-value-display-template.html
@@ -1,4 +1,3 @@
-
-<span ng-if="!property.noValue">{{property.value|limitTo:20}}</span>
+<span ng-if="!property.noValue">{{property.value | limitTo:20}}</span>
 <span ng-if="!property.noValue && property.value != null && property.value.length > 20">...</span>
 <span ng-if="property.noValue" translate>PROPERTY.EMPTY</span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/event-listeners-display-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/event-listeners-display-template.html
index cfc375d..49dfdef 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/event-listeners-display-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/event-listeners-display-template.html
@@ -1,3 +1,2 @@
-
 <span ng-if="!property.noValue">{{'PROPERTY.EVENTLISTENERS.DISPLAY' | translate:property.value.eventListeners}}</span>
 <span ng-if="property.noValue" translate>PROPERTY.EVENTLISTENERS.EMPTY</span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/event-listeners-popup.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/event-listeners-popup.html
index 36049d2..c6bd2e7 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/event-listeners-popup.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/event-listeners-popup.html
@@ -1,115 +1,176 @@
-
 <div class="modal" ng-controller="KisBpmEventListenersPopupCtrl">
-    <div class="modal-dialog modal-wide">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="close()">&times;</button>
-                <h2>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h2>
-            </div>
-            <div class="modal-body">
-            
-                <div class="row row-no-gutter">
-                	<div class="col-xs-10">
-            	        <div ng-if="translationsRetrieved" class="kis-listener-grid" ng-grid="gridOptions"></div>
-            	        <div class="pull-right">
-            	            <div class="btn-group">
-            	                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.MOVE.UP | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="moveListenerUp()"><i class="glyphicon glyphicon-arrow-up"></i></a>
-            	                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.MOVE.DOWN | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="moveListenerDown()"><i class="glyphicon glyphicon-arrow-down"></i></a>
-            	            </div>
-            	            <div class="btn-group">
-            	                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.ADD | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="addNewListener()"><i class="glyphicon glyphicon-plus"></i></a>
-            	                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.REMOVE | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="removeListener()"><i class="glyphicon glyphicon-minus"></i></a>
-            	            </div>
-            	        </div>
-            		</div>
-            	</div>
-            	
-            	<div class="row row-no-gutter">
-                  	<div ng-if="translationsRetrieved" ng-show="selectedListeners.length > 0" class="col-xs-6">
-            			<div class="form-group">
-            	        	<label for="userField">{{'PROPERTY.EVENTLISTENERS.EVENTS' | translate}}</label>
-            	            <div ng-repeat="eventDefinition in selectedListeners[0].events">
-            	            	<select id="eventField" class="form-control" ng-model="eventDefinition.event" ng-change="listenerDetailsChanged()">
-            	            		<option title="{{'EVENT_TYPE.ACTIVITY.COMPENSATE.TOOLTIP' | translate}}">ACTIVITY_COMPENSATE</option>
-            	            		<option title="{{'EVENT_TYPE.ACTIVITY.COMPLETED.TOOLTIP' | translate}}">ACTIVITY_COMPLETED</option>
-            	            		<option title="bla">ACTIVITY_ERROR_RECEIVED</option>
-            	            		<option>ACTIVITY_MESSAGE_RECEIVED</option>
-            	            		<option>ACTIVITY_SIGNALED</option>
-            	            		<option>ACTIVITY_STARTED</option>
-            	            		<option>ENGINE_CLOSED</option>
-            	            		<option>ENGINE_CREATED</option>
-            	            		<option>ENTITY_ACTIVATED</option>
-            	                	<option>ENTITY_CREATED</option>
-            	                	<option>ENTITY_DELETED</option>
-            	                	<option>ENTITY_INITIALIZED</option>
-            	                	<option>ENTITY_SUSPENDED</option>
-            	                	<option>ENTITY_UPDATED</option>
-            	                	<option>JOB_EXECUTION_FAILURE</option>
-            	                	<option>JOB_EXECUTION_SUCCESS</option>
-            	                	<option>JOB_RETRIES_DECREMENTED</option>
-            	                	<option title="{{'EVENT_TYPE.MEMBERSHIP.CREATED.TOOLTIP' | translate}}">MEMBERSHIP_CREATED</option>
-            	                	<option title="{{'EVENT_TYPE.MEMBERSHIP.DELETED.TOOLTIP' | translate}}">MEMBERSHIP_DELETED</option>
-            	                	<option title="{{'EVENT_TYPE.MEMBERSHIPS.DELETED.TOOLTIP' | translate}}">MEMBERSHIPS_DELETED</option>
-            	                	<option title="{{'EVENT_TYPE.TASK.ASSIGNED.TOOLTIP' | translate}}">TASK_ASSIGNED</option>
-            	                	<option title="{{'EVENT_TYPE.TASK.COMPLETED.TOOLTIP' | translate}}">TASK_COMPLETED</option>
-            	                	<option>TIMER_FIRED</option>
-            	                	<option title="{{'EVENT_TYPE.UNCAUGHT.BPMNERROR.TOOLTIP' | translate}}">UNCAUGHT_BPMN_ERROR</option>
-            	                	<option title="{{'EVENT_TYPE.VARIABLE.CREATED.TOOLTIP' | translate}}">VARIABLE_CREATED</option>
-            	                	<option title="{{'EVENT_TYPE.VARIABLE.DELETED.TOOLTIP' | translate}}">VARIABLE_DELETED</option>
-            	                	<option title="{{'EVENT_TYPE.VARIABLE.UPDATED.TOOLTIP' | translate}}">VARIABLE_UPDATED</option>
-            	               	</select>
-            		            <i ng-if="$index > 0" class="glyphicon glyphicon-minus clickable-property" ng-click="removeEventValue($index)"></i>
-            		            <i class="glyphicon glyphicon-plus clickable-property" ng-click="addEventValue($index)"></i>
-            	            </div>
-            	            <div class="form-group">
-            			   		<label for="classField">{{'PROPERTY.EVENTLISTENERS.RETHROW' | translate}}</label>
-            			   		<input type="checkbox" id="rethrowField" class="form-control" ng-model="selectedListeners[0].rethrowEvent" ng-change="listenerDetailsChanged()" />
-            				</div>
-            	       	</div>
-                     </div>
-                     <div ng-show="selectedListeners.length > 0 && selectedListeners[0].events[0].event" class="col-xs-6">
-                     	<div class="form-group" ng-if="!selectedListeners[0].rethrowEvent">
-            		   		<label for="classField">{{'PROPERTY.EVENTLISTENERS.CLASS' | translate}}</label>
-            		   		<input type="text" id="classField" class="form-control" ng-model="selectedListeners[0].className" ng-change="listenerDetailsChanged()" placeholder="{{'PROPERTY.EVENTLISTENERS.CLASS.PLACEHOLDER' | translate}}" />
-            			</div>
-            			<div class="form-group" ng-if="!selectedListeners[0].rethrowEvent">
-            		   		<label for="delegateExpressionField">{{'PROPERTY.EVENTLISTENERS.DELEGATEEXPRESSION' | translate}}</label>
-            		   		<input type="text" id="delegateExpressionField" class="form-control" ng-model="selectedListeners[0].delegateExpression" ng-change="listenerDetailsChanged()" placeholder="{{'PROPERTY.EVENTLISTENERS.DELEGATEEXPRESSION.PLACEHOLDER' | translate}}" />
-            			</div>
-            			<div class="form-group" ng-if="!selectedListeners[0].rethrowEvent">
-            		   		<label for="entityTypeField">{{'PROPERTY.EVENTLISTENERS.ENTITYTYPE' | translate}}</label>
-            		   		<input type="text" id="entityTypeField" class="form-control" ng-model="selectedListeners[0].entityType" ng-change="listenerDetailsChanged()" placeholder="{{'PROPERTY.EVENTLISTENERS.ENTITYTYPE.PLACEHOLDER' | translate}}" />
-            			</div>
-            			<div class="form-group" ng-if="selectedListeners[0].rethrowEvent">
-            		   		<label for="delegateExpressionField">{{'PROPERTY.EVENTLISTENERS.RETHROWTYPE' | translate}}</label>
-            		   		<select id="rethrowTypeField" class="form-control" ng-model="selectedListeners[0].rethrowType" ng-change="rethrowTypeChanged()">
-                                <option>error</option>
-                                <option>message</option>
-                                <option>signal</option>
-                                <option>globalSignal</option>
-                            </select>
-            			</div>
-            			<div class="form-group" ng-if="selectedListeners[0].rethrowType === 'error'">
-            		   		<label for="errorCodeField">{{'PROPERTY.EVENTLISTENERS.ERRORCODE' | translate}}</label>
-            		   		<input type="text" id="errorCodeField" class="form-control" ng-model="selectedListeners[0].errorcode" ng-change="listenerDetailsChanged()" placeholder="{{'PROPERTY.EVENTLISTENERS.ERRORCODE.PLACEHOLDER' | translate}}" />
-            			</div>
-            			<div class="form-group" ng-if="selectedListeners[0].rethrowType === 'message'">
-            		   		<label for="messageNameField">{{'PROPERTY.EVENTLISTENERS.MESSAGENAME' | translate}}</label>
-            		   		<input type="text" id="messageNameField" class="form-control" ng-model="selectedListeners[0].messagename" ng-change="listenerDetailsChanged()" placeholder="{{'PROPERTY.EVENTLISTENERS.MESSAGENAME.PLACEHOLDER' | translate}}" />
-            			</div>
-            			<div class="form-group" ng-if="selectedListeners[0].rethrowType === 'signal' || selectedListeners[0].rethrowType === 'globalSignal'">
-            		   		<label for="messageNameField">{{'PROPERTY.EVENTLISTENERS.SIGNALNAME' | translate}}</label>
-            		   		<input type="text" id="signalNameField" class="form-control" ng-model="selectedListeners[0].signalname" ng-change="listenerDetailsChanged()" placeholder="{{'PROPERTY.EVENTLISTENERS.SIGNALNAME.PLACEHOLDER' | translate}}" />
-            			</div>
-                     </div>
-                     <div ng-show="selectedListeners.length == 0" class="col-xs-6 muted no-property-selected" translate>PROPERTY.EVENTLISTENERS.UNSELECTED</div>
-                </div>
-            
-            </div>
-            <div class="modal-footer">
-                <button ng-click="cancel()" class="btn btn-primary" translate>ACTION.CANCEL</button>
-                <button ng-click="save()" class="btn btn-primary" translate>ACTION.SAVE</button>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
+	<div class="modal-dialog modal-wide">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button aria-hidden="true" class="close" data-dismiss="modal" ng-click="close()" type="button">&times;
+				</button>
+				<h2>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h2>
+			</div>
+			<div class="modal-body">
+
+				<div class="row row-no-gutter">
+					<div class="col-xs-10">
+						<div class="kis-listener-grid" ng-grid="gridOptions" ng-if="translationsRetrieved"></div>
+						<div class="pull-right">
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{ACTION.MOVE.UP | translate}}" ng-click="moveListenerUp()" rel="tooltip"
+								   title=""><i class="glyphicon glyphicon-arrow-up"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title=""
+								   data-placement="bottom" data-title="{{ACTION.MOVE.DOWN | translate}}"
+								   ng-click="moveListenerDown()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-arrow-down"></i></a>
+							</div>
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{ACTION.ADD | translate}}" ng-click="addNewListener()" rel="tooltip"
+								   title=""><i class="glyphicon glyphicon-plus"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{ACTION.REMOVE | translate}}" ng-click="removeListener()" rel="tooltip"
+								   title=""><i class="glyphicon glyphicon-minus"></i></a>
+							</div>
+						</div>
+					</div>
+				</div>
+
+				<div class="row row-no-gutter">
+					<div class="col-xs-6" ng-if="translationsRetrieved" ng-show="selectedListeners.length > 0">
+						<div class="form-group">
+							<label for="userField">{{'PROPERTY.EVENTLISTENERS.EVENTS' | translate}}</label>
+							<div ng-repeat="eventDefinition in selectedListeners[0].events">
+								<select class="form-control" id="eventField" ng-change="listenerDetailsChanged()"
+										ng-model="eventDefinition.event">
+									<option title="{{'EVENT_TYPE.ACTIVITY.COMPENSATE.TOOLTIP' | translate}}">
+										ACTIVITY_COMPENSATE
+									</option>
+									<option title="{{'EVENT_TYPE.ACTIVITY.COMPLETED.TOOLTIP' | translate}}">
+										ACTIVITY_COMPLETED
+									</option>
+									<option title="bla">ACTIVITY_ERROR_RECEIVED</option>
+									<option>ACTIVITY_MESSAGE_RECEIVED</option>
+									<option>ACTIVITY_SIGNALED</option>
+									<option>ACTIVITY_STARTED</option>
+									<option>ENGINE_CLOSED</option>
+									<option>ENGINE_CREATED</option>
+									<option>ENTITY_ACTIVATED</option>
+									<option>ENTITY_CREATED</option>
+									<option>ENTITY_DELETED</option>
+									<option>ENTITY_INITIALIZED</option>
+									<option>ENTITY_SUSPENDED</option>
+									<option>ENTITY_UPDATED</option>
+									<option>JOB_EXECUTION_FAILURE</option>
+									<option>JOB_EXECUTION_SUCCESS</option>
+									<option>JOB_RETRIES_DECREMENTED</option>
+									<option title="{{'EVENT_TYPE.MEMBERSHIP.CREATED.TOOLTIP' | translate}}">
+										MEMBERSHIP_CREATED
+									</option>
+									<option title="{{'EVENT_TYPE.MEMBERSHIP.DELETED.TOOLTIP' | translate}}">
+										MEMBERSHIP_DELETED
+									</option>
+									<option title="{{'EVENT_TYPE.MEMBERSHIPS.DELETED.TOOLTIP' | translate}}">
+										MEMBERSHIPS_DELETED
+									</option>
+									<option title="{{'EVENT_TYPE.TASK.ASSIGNED.TOOLTIP' | translate}}">TASK_ASSIGNED
+									</option>
+									<option title="{{'EVENT_TYPE.TASK.COMPLETED.TOOLTIP' | translate}}">TASK_COMPLETED
+									</option>
+									<option>TIMER_FIRED</option>
+									<option title="{{'EVENT_TYPE.UNCAUGHT.BPMNERROR.TOOLTIP' | translate}}">
+										UNCAUGHT_BPMN_ERROR
+									</option>
+									<option title="{{'EVENT_TYPE.VARIABLE.CREATED.TOOLTIP' | translate}}">
+										VARIABLE_CREATED
+									</option>
+									<option title="{{'EVENT_TYPE.VARIABLE.DELETED.TOOLTIP' | translate}}">
+										VARIABLE_DELETED
+									</option>
+									<option title="{{'EVENT_TYPE.VARIABLE.UPDATED.TOOLTIP' | translate}}">
+										VARIABLE_UPDATED
+									</option>
+								</select>
+								<i class="glyphicon glyphicon-minus clickable-property"
+								   ng-click="removeEventValue($index)"
+								   ng-if="$index > 0"></i>
+								<i class="glyphicon glyphicon-plus clickable-property"
+								   ng-click="addEventValue($index)"></i>
+							</div>
+							<div class="form-group">
+								<label for="classField">{{'PROPERTY.EVENTLISTENERS.RETHROW' | translate}}</label>
+								<input class="form-control" id="rethrowField" ng-change="listenerDetailsChanged()"
+									   ng-model="selectedListeners[0].rethrowEvent"
+									   type="checkbox"/>
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-6"
+						 ng-show="selectedListeners.length > 0 && selectedListeners[0].events[0].event">
+						<div class="form-group" ng-if="!selectedListeners[0].rethrowEvent">
+							<label for="classField">{{'PROPERTY.EVENTLISTENERS.CLASS' | translate}}</label>
+							<input class="form-control" id="classField" ng-change="listenerDetailsChanged()"
+								   ng-model="selectedListeners[0].className"
+								   placeholder="{{'PROPERTY.EVENTLISTENERS.CLASS.PLACEHOLDER' | translate}}"
+								   type="text"/>
+						</div>
+						<div class="form-group" ng-if="!selectedListeners[0].rethrowEvent">
+							<label
+								for="delegateExpressionField">{{'PROPERTY.EVENTLISTENERS.DELEGATEEXPRESSION' | translate}}</label>
+							<input class="form-control" id="delegateExpressionField"
+								   ng-change="listenerDetailsChanged()"
+								   ng-model="selectedListeners[0].delegateExpression"
+								   placeholder="{{'PROPERTY.EVENTLISTENERS.DELEGATEEXPRESSION.PLACEHOLDER' | translate}}"
+								   type="text"/>
+						</div>
+						<div class="form-group" ng-if="!selectedListeners[0].rethrowEvent">
+							<label for="entityTypeField">{{'PROPERTY.EVENTLISTENERS.ENTITYTYPE' | translate}}</label>
+							<input class="form-control" id="entityTypeField" ng-change="listenerDetailsChanged()"
+								   ng-model="selectedListeners[0].entityType"
+								   placeholder="{{'PROPERTY.EVENTLISTENERS.ENTITYTYPE.PLACEHOLDER' | translate}}"
+								   type="text"/>
+						</div>
+						<div class="form-group" ng-if="selectedListeners[0].rethrowEvent">
+							<label
+								for="delegateExpressionField">{{'PROPERTY.EVENTLISTENERS.RETHROWTYPE' | translate}}</label>
+							<select class="form-control" id="rethrowTypeField"
+									ng-change="rethrowTypeChanged()" ng-model="selectedListeners[0].rethrowType">
+								<option>error</option>
+								<option>message</option>
+								<option>signal</option>
+								<option>globalSignal</option>
+							</select>
+						</div>
+						<div class="form-group" ng-if="selectedListeners[0].rethrowType === 'error'">
+							<label for="errorCodeField">{{'PROPERTY.EVENTLISTENERS.ERRORCODE' | translate}}</label>
+							<input class="form-control" id="errorCodeField" ng-change="listenerDetailsChanged()"
+								   ng-model="selectedListeners[0].errorcode"
+								   placeholder="{{'PROPERTY.EVENTLISTENERS.ERRORCODE.PLACEHOLDER' | translate}}"
+								   type="text"/>
+						</div>
+						<div class="form-group" ng-if="selectedListeners[0].rethrowType === 'message'">
+							<label for="messageNameField">{{'PROPERTY.EVENTLISTENERS.MESSAGENAME' | translate}}</label>
+							<input class="form-control" id="messageNameField" ng-change="listenerDetailsChanged()"
+								   ng-model="selectedListeners[0].messagename"
+								   placeholder="{{'PROPERTY.EVENTLISTENERS.MESSAGENAME.PLACEHOLDER' | translate}}"
+								   type="text"/>
+						</div>
+						<div class="form-group"
+							 ng-if="selectedListeners[0].rethrowType === 'signal' || selectedListeners[0].rethrowType === 'globalSignal'">
+							<label for="messageNameField">{{'PROPERTY.EVENTLISTENERS.SIGNALNAME' | translate}}</label>
+							<input class="form-control" id="signalNameField" ng-change="listenerDetailsChanged()"
+								   ng-model="selectedListeners[0].signalname"
+								   placeholder="{{'PROPERTY.EVENTLISTENERS.SIGNALNAME.PLACEHOLDER' | translate}}"
+								   type="text"/>
+						</div>
+					</div>
+					<div class="col-xs-6 muted no-property-selected" ng-show="selectedListeners.length == 0" translate>
+						PROPERTY.EVENTLISTENERS.UNSELECTED
+					</div>
+				</div>
+
+			</div>
+			<div class="modal-footer">
+				<button class="btn btn-primary" ng-click="cancel()" translate>ACTION.CANCEL</button>
+				<button class="btn btn-primary" ng-click="save()" translate>ACTION.SAVE</button>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/event-listeners-write-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/event-listeners-write-template.html
index 7bb40f7..c7dc558 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/event-listeners-write-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/event-listeners-write-template.html
@@ -1,4 +1,3 @@
-
 <!-- Just need to instantiate the controller, and it will take care of showing the modal dialog -->
 <span ng-controller="KisBpmEventListenersCtrl">
 </span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/execution-listeners-display-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/execution-listeners-display-template.html
index 6637400..afaece3 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/execution-listeners-display-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/execution-listeners-display-template.html
@@ -1,3 +1,3 @@
-
-<span ng-if="!property.noValue">{{'PROPERTY.EXECUTIONLISTENERS.DISPLAY' | translate:property.value.executionListeners}}</span>
-<span ng-if="property.noValue" translate>PROPERTY.EXECUTIONLISTENERS.EMPTY</span>
\ No newline at end of file
+<span
+	ng-if="!property.noValue">{{'PROPERTY.EXECUTIONLISTENERS.DISPLAY' | translate:property.value.executionListeners}}</span>
+<span ng-if="property.noValue" translate>PROPERTY.EXECUTIONLISTENERS.EMPTY</span>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/execution-listeners-popup.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/execution-listeners-popup.html
index 1b38a19..20e5c00 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/execution-listeners-popup.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/execution-listeners-popup.html
@@ -1,101 +1,151 @@
-
 <div class="modal" ng-controller="KisBpmExecutionListenersPopupCtrl">
-    <div class="modal-dialog modal-wide">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="close()">&times;</button>
-                <h2>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h2>
-            </div>
-            <div class="modal-body">
-            
-                <div class="row row-no-gutter">
-                    <div class="col-xs-6">
-                        <div ng-if="translationsRetrieved" class="kis-listener-grid" ng-grid="gridOptions"></div>
-                        <div class="pull-right">
-                            <div class="btn-group">
-                                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.MOVE.UP | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="moveListenerUp()"><i class="glyphicon glyphicon-arrow-up"></i></a>
-                                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.MOVE.DOWN | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="moveListenerDown()"><i class="glyphicon glyphicon-arrow-down"></i></a>
-                            </div>
-                            <div class="btn-group">
-                                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.ADD | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="addNewListener()"><i class="glyphicon glyphicon-plus"></i></a>
-                                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.REMOVE | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="removeListener()"><i class="glyphicon glyphicon-minus"></i></a>
-                            </div>
-                        </div>
-                    </div>
-            
-                    <div class="col-xs-6">
-                        <div ng-show="selectedListeners.length > 0">
-            
-                            <div class="form-group">
-            			   		<label for="eventField">{{'PROPERTY.EXECUTIONLISTENERS.EVENT' | translate}}</label>
-            			   		<select id="eventField" class="form-control" ng-model="selectedListeners[0].event">
-                                    <option>start</option>
-                                    <option>end</option>
-                                    <option>take</option>
-                                </select>
-            				</div>
-            				<div class="form-group">
-            			   		<label for="classField">{{'PROPERTY.EXECUTIONLISTENERS.CLASS' | translate}}</label>
-            			   		<input type="text" id="classField" class="form-control" ng-model="selectedListeners[0].className" ng-change="listenerDetailsChanged()" placeholder="{{'PROPERTY.EXECUTIONLISTENERS.CLASS.PLACEHOLDER' | translate}}" />
-            				</div>
-            				<div class="form-group">
-            			   		<label for="expressionField">{{'PROPERTY.EXECUTIONLISTENERS.EXPRESSION' | translate}}</label>
-            			   		<input type="text" id="expressionField" class="form-control" ng-model="selectedListeners[0].expression" ng-change="listenerDetailsChanged()" placeholder="{{'PROPERTY.EXECUTIONLISTENERS.EXPRESSION.PLACEHOLDER' | translate}}" />
-            				</div>
-            				<div class="form-group">
-            			   		<label for="delegateExpressionField">{{'PROPERTY.EXECUTIONLISTENERS.DELEGATEEXPRESSION' | translate}}</label>
-            			   		<input type="text" id="delegateExpressionField" class="form-control" ng-model="selectedListeners[0].delegateExpression" ng-change="listenerDetailsChanged()" placeholder="{{'PROPERTY.EXECUTIONLISTENERS.DELEGATEEXPRESSION.PLACEHOLDER' | translate}}" />
-            				</div>
-                        </div>
-                        <div ng-show="selectedListeners.length == 0" class="muted no-property-selected" translate>PROPERTY.EXECUTIONLISTENERS.UNSELECTED</div>
-                    </div>
-                </div>
-                
-                <div class="row row-no-gutter">
-                    <div class="col-xs-6">
-                        <div ng-if="translationsRetrieved" class="kis-field-grid" ng-grid="gridFieldOptions"></div>
-                        <div class="pull-right">
-                            <div class="btn-group">
-                                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.MOVE.UP | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="moveFieldUp()"><i class="glyphicon glyphicon-arrow-up"></i></a>
-                                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.MOVE.DOWN | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="moveFieldDown()"><i class="glyphicon glyphicon-arrow-down"></i></a>
-                            </div>
-                            <div class="btn-group">
-                                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.ADD | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="addNewField()"><i class="glyphicon glyphicon-plus"></i></a>
-                                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.REMOVE | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="removeField()"><i class="glyphicon glyphicon-minus"></i></a>
-                            </div>
-                        </div>
-                    </div>
-            
-                    <div class="col-xs-6">
-                        <div ng-show="selectedFields.length > 0">
-            
-            				<div class="form-group">
-            			   		<label for="nameField">{{'PROPERTY.EXECUTIONLISTENERS.FIELDS.NAME' | translate}}</label>
-            			   		<input type="text" id="nameField" class="form-control" ng-model="selectedFields[0].name" placeholder="{{'PROPERTY.EXECUTIONLISTENERS.FIELDS.NAME.PLACEHOLDER' | translate}}" />
-            				</div>
-                            <div class="form-group">
-            			   		<label for="stringValueField">{{'PROPERTY.EXECUTIONLISTENERS.FIELDS.STRINGVALUE' | translate}}</label>
-            			   		<input type="text" id="stringValueField" class="form-control" ng-model="selectedFields[0].stringValue" ng-change="fieldDetailsChanged()" placeholder="{{'PROPERTY.EXECUTIONLISTENERS.FIELDS.STRINGVALUE.PLACEHOLDER' | translate}}" />
-            				</div>
-            				<div class="form-group">
-            			   		<label for="expressionField">{{'PROPERTY.EXECUTIONLISTENERS.FIELDS.EXPRESSION' | translate}}</label>
-            			   		<input type="text" id="expressionField" class="form-control" ng-model="selectedFields[0].expression" ng-change="fieldDetailsChanged()" placeholder="{{'PROPERTY.EXECUTIONLISTENERS.FIELDS.EXPRESSION.PLACEHOLDER' | translate}}" />
-            				</div>
-            				<div class="form-group">
-            			   		<label for="stringField">{{'PROPERTY.EXECUTIONLISTENERS.FIELDS.STRING' | translate}}</label>
-            			   		<textarea id="stringField" class="form-control" ng-model="selectedFields[0].string" ng-change="fieldDetailsChanged()" placeholder="{{'PROPERTY.EXECUTIONLISTENERS.FIELDS.STRING.PLACEHOLDER' | translate}}"></textarea>
-            				</div>
-                            
-                        </div>
-                        <div ng-show="selectedFields.length == 0" class="muted no-property-selected"translate>PROPERTY.EXECUTIONLISTENERS.FIELDS.EMPTY</div>
-                    </div>
-                </div>
-            
-            </div>
-            <div class="modal-footer">
-                <button ng-click="cancel()" class="btn btn-primary" translate>ACTION.CANCEL</button>
-                <button ng-click="save()" class="btn btn-primary" translate>ACTION.SAVE</button>
-            </div>
-        </div>
-    </div>
+	<div class="modal-dialog modal-wide">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button aria-hidden="true" class="close" data-dismiss="modal" ng-click="close()" type="button">&times;
+				</button>
+				<h2>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h2>
+			</div>
+			<div class="modal-body">
+
+				<div class="row row-no-gutter">
+					<div class="col-xs-6">
+						<div class="kis-listener-grid" ng-grid="gridOptions" ng-if="translationsRetrieved"></div>
+						<div class="pull-right">
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{ACTION.MOVE.UP | translate}}" ng-click="moveListenerUp()" rel="tooltip"
+								   title=""><i class="glyphicon glyphicon-arrow-up"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title=""
+								   data-placement="bottom" data-title="{{ACTION.MOVE.DOWN | translate}}"
+								   ng-click="moveListenerDown()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-arrow-down"></i></a>
+							</div>
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{ACTION.ADD | translate}}" ng-click="addNewListener()" rel="tooltip"
+								   title=""><i class="glyphicon glyphicon-plus"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{ACTION.REMOVE | translate}}" ng-click="removeListener()" rel="tooltip"
+								   title=""><i class="glyphicon glyphicon-minus"></i></a>
+							</div>
+						</div>
+					</div>
+
+					<div class="col-xs-6">
+						<div ng-show="selectedListeners.length > 0">
+
+							<div class="form-group">
+								<label for="eventField">{{'PROPERTY.EXECUTIONLISTENERS.EVENT' | translate}}</label>
+								<select class="form-control" id="eventField" ng-model="selectedListeners[0].event">
+									<option>start</option>
+									<option>end</option>
+									<option>take</option>
+								</select>
+							</div>
+							<div class="form-group">
+								<label for="classField">{{'PROPERTY.EXECUTIONLISTENERS.CLASS' | translate}}</label>
+								<input class="form-control" id="classField" ng-change="listenerDetailsChanged()"
+									   ng-model="selectedListeners[0].className"
+									   placeholder="{{'PROPERTY.EXECUTIONLISTENERS.CLASS.PLACEHOLDER' | translate}}"
+									   type="text"/>
+							</div>
+							<div class="form-group">
+								<label
+									for="expressionField">{{'PROPERTY.EXECUTIONLISTENERS.EXPRESSION' | translate}}</label>
+								<input class="form-control" id="expressionField" ng-change="listenerDetailsChanged()"
+									   ng-model="selectedListeners[0].expression"
+									   placeholder="{{'PROPERTY.EXECUTIONLISTENERS.EXPRESSION.PLACEHOLDER' | translate}}"
+									   type="text"/>
+							</div>
+							<div class="form-group">
+								<label
+									for="delegateExpressionField">{{'PROPERTY.EXECUTIONLISTENERS.DELEGATEEXPRESSION' | translate}}</label>
+								<input class="form-control" id="delegateExpressionField"
+									   ng-change="listenerDetailsChanged()"
+									   ng-model="selectedListeners[0].delegateExpression"
+									   placeholder="{{'PROPERTY.EXECUTIONLISTENERS.DELEGATEEXPRESSION.PLACEHOLDER' | translate}}"
+									   type="text"/>
+							</div>
+						</div>
+						<div class="muted no-property-selected" ng-show="selectedListeners.length == 0" translate>
+							PROPERTY.EXECUTIONLISTENERS.UNSELECTED
+						</div>
+					</div>
+				</div>
+
+				<div class="row row-no-gutter">
+					<div class="col-xs-6">
+						<div class="kis-field-grid" ng-grid="gridFieldOptions" ng-if="translationsRetrieved"></div>
+						<div class="pull-right">
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{ACTION.MOVE.UP | translate}}" ng-click="moveFieldUp()" rel="tooltip"
+								   title=""><i
+									class="glyphicon glyphicon-arrow-up"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title=""
+								   data-placement="bottom" data-title="{{ACTION.MOVE.DOWN | translate}}"
+								   ng-click="moveFieldDown()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-arrow-down"></i></a>
+							</div>
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{ACTION.ADD | translate}}" ng-click="addNewField()" rel="tooltip"
+								   title=""><i
+									class="glyphicon glyphicon-plus"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{ACTION.REMOVE | translate}}" ng-click="removeField()" rel="tooltip"
+								   title=""><i
+									class="glyphicon glyphicon-minus"></i></a>
+							</div>
+						</div>
+					</div>
+
+					<div class="col-xs-6">
+						<div ng-show="selectedFields.length > 0">
+
+							<div class="form-group">
+								<label for="nameField">{{'PROPERTY.EXECUTIONLISTENERS.FIELDS.NAME' | translate}}</label>
+								<input class="form-control" id="nameField" ng-model="selectedFields[0].name"
+									   placeholder="{{'PROPERTY.EXECUTIONLISTENERS.FIELDS.NAME.PLACEHOLDER' | translate}}"
+									   type="text"/>
+							</div>
+							<div class="form-group">
+								<label
+									for="stringValueField">{{'PROPERTY.EXECUTIONLISTENERS.FIELDS.STRINGVALUE' | translate}}</label>
+								<input class="form-control" id="stringValueField" ng-change="fieldDetailsChanged()"
+									   ng-model="selectedFields[0].stringValue"
+									   placeholder="{{'PROPERTY.EXECUTIONLISTENERS.FIELDS.STRINGVALUE.PLACEHOLDER' | translate}}"
+									   type="text"/>
+							</div>
+							<div class="form-group">
+								<label
+									for="expressionField">{{'PROPERTY.EXECUTIONLISTENERS.FIELDS.EXPRESSION' | translate}}</label>
+								<input class="form-control" id="expressionField" ng-change="fieldDetailsChanged()"
+									   ng-model="selectedFields[0].expression"
+									   placeholder="{{'PROPERTY.EXECUTIONLISTENERS.FIELDS.EXPRESSION.PLACEHOLDER' | translate}}"
+									   type="text"/>
+							</div>
+							<div class="form-group">
+								<label
+									for="stringField">{{'PROPERTY.EXECUTIONLISTENERS.FIELDS.STRING' | translate}}</label>
+								<textarea class="form-control" id="stringField" ng-change="fieldDetailsChanged()"
+										  ng-model="selectedFields[0].string"
+										  placeholder="{{'PROPERTY.EXECUTIONLISTENERS.FIELDS.STRING.PLACEHOLDER' | translate}}"></textarea>
+							</div>
+
+						</div>
+						<div class="muted no-property-selected" ng-show="selectedFields.length == 0" translate>
+							PROPERTY.EXECUTIONLISTENERS.FIELDS.EMPTY
+						</div>
+					</div>
+				</div>
+
+			</div>
+			<div class="modal-footer">
+				<button class="btn btn-primary" ng-click="cancel()" translate>ACTION.CANCEL</button>
+				<button class="btn btn-primary" ng-click="save()" translate>ACTION.SAVE</button>
+			</div>
+		</div>
+	</div>
 </div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/execution-listeners-write-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/execution-listeners-write-template.html
index 55a0a52..e12fee6 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/execution-listeners-write-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/execution-listeners-write-template.html
@@ -1,4 +1,3 @@
-
 <!-- Just need to instantiate the controller, and it will take care of showing the modal dialog -->
 <span ng-controller="KisBpmExecutionListenersCtrl">
 </span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/feedback-popup.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/feedback-popup.html
index 17b9126..7b0e9ea 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/feedback-popup.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/feedback-popup.html
@@ -1,17 +1,19 @@
-
 <div class="modal" ng-controller="BpmnFeedbackPopupCtrl">
-    <div class="modal-dialog">
-        <div class="modal-content">
+	<div class="modal-dialog">
+		<div class="modal-content">
 			<div class="modal-header">
-            	<h2>{{'PROPERTY.FEEDBACK.TITLE' | translate:property}}</h2>
-            </div>
-            <div class="modal-body">
-            	<p><textarea auto-focus class="form-control" ng-model="model.feedback" style="width:90%; height:100%; max-width: 100%; max-height: 100%; min-height: 300px"/></p>
-           	</div>
-           	<div class="modal-footer">
-            	<button ng-click="cancel()" class="btn btn-primary" translate >ACTION.CANCEL</button>
-              	<button ng-click="send()" ng-disabled="model.feedback.length === 0" class="btn btn-primary" translate >ACTION.SEND</button>
-            </div>
+				<h2>{{'PROPERTY.FEEDBACK.TITLE' | translate:property}}</h2>
+			</div>
+			<div class="modal-body">
+				<p><textarea auto-focus class="form-control" ng-model="model.feedback"
+							 style="width:90%; height:100%; max-width: 100%; max-height: 100%; min-height: 300px"/></p>
+			</div>
+			<div class="modal-footer">
+				<button class="btn btn-primary" ng-click="cancel()" translate>ACTION.CANCEL</button>
+				<button class="btn btn-primary" ng-click="send()" ng-disabled="model.feedback.length === 0" translate>
+					ACTION.SEND
+				</button>
+			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/fields-display-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/fields-display-template.html
index 64af8a0..ffa83d9 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/fields-display-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/fields-display-template.html
@@ -1,3 +1,2 @@
-
 <span ng-if="!property.noValue">{{'PROPERTY.FIELDS' | translate:property.value.fields}}</span>
 <span ng-if="property.noValue">{{'PROPERTY.FIELDS.EMPTY' | translate}}</span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/fields-popup.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/fields-popup.html
index 5f38bf2..e30905c 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/fields-popup.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/fields-popup.html
@@ -1,60 +1,85 @@
-
 <div class="modal" ng-controller="KisBpmFieldsPopupCtrl">
-    <div class="modal-dialog modal-wide">
-        <div class="modal-content">
+	<div class="modal-dialog modal-wide">
+		<div class="modal-content">
 			<div class="modal-header">
-			    <button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="close()">&times;</button>
-			    <h3>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h3>
+				<button aria-hidden="true" class="close" data-dismiss="modal" ng-click="close()" type="button">&times;
+				</button>
+				<h3>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h3>
 			</div>
 			<div class="modal-body">
 
-			    <div class="row row-no-gutter">
-			        <div class="col-xs-6">
-                        <div ng-if="translationsRetrieved" class="kis-listener-grid" ng-grid="gridOptions"></div>
-			            <div class="pull-right">
-			                <div class="btn-group">
-			                    <a href="#" class="btn btn-icon btn-lg" rel="tooltip" data-title="{{'ACTION.MOVE.UP' | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="moveFieldUp()"><i class="glyphicon glyphicon-arrow-up"></i></a>
-			                    <a href="#" class="btn btn-icon btn-lg" rel="tooltip" data-title="{{'ACTION.MOVE.DOWN' | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="moveFieldDown()"><i class="glyphicon glyphicon-arrow-down"></i></a>
-			                </div>
-			                <div class="btn-group">
-			                    <a href="#" class="btn btn-icon btn-lg" rel="tooltip" data-title="{{'ACTION.ADD' | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="addNewField()"><i class="glyphicon glyphicon-plus"></i></a>
-			                    <a href="#" class="btn btn-icon btn-lg" rel="tooltip" data-title="{{'ACTION.REMOVE' | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="removeField()"><i class="glyphicon glyphicon-minus"></i></a>
-			                </div>
-			            </div>
-			        </div>
-
-			       <div class="col-xs-6">
-			            <div ng-show="selectedFields.length > 0">
-
-			                <div class="form-group">
-                                <label for="fieldName">{{'PROPERTY.FIELDS.NAME' | translate}}</label>
-                                <input type="text" id="fieldName"  class="form-control" ng-model="selectedFields[0].name" placeholder="{{'PROPERTY.FIELDS.NAME.PLACEHOLDER' | translate}}" />
-                            </div>
-
-                            <div class="form-group">
-                            <label for="fieldStringValue">{{'PROPERTY.FIELDS.STRINGVALUE' | translate}}</label>
-                                <input type="text" id="fieldStringValue"  class="form-control" ng-model="selectedFields[0].stringValue" ng-change="fieldDetailsChanged()" placeholder="{{'PROPERTY.FIELDS.STRINGVALUE.PLACEHOLDER' | translate}}" />
-                            </div>
-
-                            <div class="form-group">
-                            <label for="fieldExpression">{{'PROPERTY.FIELDS.EXPRESSION' | translate}}</label>
-                                <input type="text" id="fieldExpression"  class="form-control" ng-model="selectedFields[0].expression" ng-change="fieldDetailsChanged()" placeholder="{{'PROPERTY.FIELDS.EXPRESSION.PLACEHOLDER' | translate}}" />
-                            </div>
-
-                            <div class="form-group">
-                            <label for="fieldString">{{'PROPERTY.FIELDS.STRING' | translate}}</label>
-			                        <textarea type="text" id="fieldString"  class="form-control" ng-model="selectedFields[0].string" ng-change="fieldDetailsChanged()" placeholder="{{'PROPERTY.FIELDS.STRING.PLACEHOLDER' | translate}}"></textarea>
-                            </div>
-
-			            </div>
-			            <div ng-show="selectedFields.length == 0" class="muted no-property-selected" translate>PROPERTY.FIELDS.EMPTY</div>
-			        </div>
-			    </div>
-			
+				<div class="row row-no-gutter">
+					<div class="col-xs-6">
+						<div class="kis-listener-grid" ng-grid="gridOptions" ng-if="translationsRetrieved"></div>
+						<div class="pull-right">
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{'ACTION.MOVE.UP' | translate}}" href="#"
+								   ng-click="moveFieldUp()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-arrow-up"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{'ACTION.MOVE.DOWN' | translate}}" href="#"
+								   ng-click="moveFieldDown()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-arrow-down"></i></a>
+							</div>
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{'ACTION.ADD' | translate}}" href="#"
+								   ng-click="addNewField()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-plus"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{'ACTION.REMOVE' | translate}}" href="#"
+								   ng-click="removeField()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-minus"></i></a>
+							</div>
+						</div>
+					</div>
+
+					<div class="col-xs-6">
+						<div ng-show="selectedFields.length > 0">
+
+							<div class="form-group">
+								<label for="fieldName">{{'PROPERTY.FIELDS.NAME' | translate}}</label>
+								<input class="form-control" id="fieldName" ng-model="selectedFields[0].name"
+									   placeholder="{{'PROPERTY.FIELDS.NAME.PLACEHOLDER' | translate}}"
+									   type="text"/>
+							</div>
+
+							<div class="form-group">
+								<label for="fieldStringValue">{{'PROPERTY.FIELDS.STRINGVALUE' | translate}}</label>
+								<input class="form-control" id="fieldStringValue" ng-change="fieldDetailsChanged()"
+									   ng-model="selectedFields[0].stringValue"
+									   placeholder="{{'PROPERTY.FIELDS.STRINGVALUE.PLACEHOLDER' | translate}}"
+									   type="text"/>
+							</div>
+
+							<div class="form-group">
+								<label for="fieldExpression">{{'PROPERTY.FIELDS.EXPRESSION' | translate}}</label>
+								<input class="form-control" id="fieldExpression" ng-change="fieldDetailsChanged()"
+									   ng-model="selectedFields[0].expression"
+									   placeholder="{{'PROPERTY.FIELDS.EXPRESSION.PLACEHOLDER' | translate}}"
+									   type="text"/>
+							</div>
+
+							<div class="form-group">
+								<label for="fieldString">{{'PROPERTY.FIELDS.STRING' | translate}}</label>
+								<textarea class="form-control" id="fieldString" ng-change="fieldDetailsChanged()"
+										  ng-model="selectedFields[0].string"
+										  placeholder="{{'PROPERTY.FIELDS.STRING.PLACEHOLDER' | translate}}"
+										  type="text"></textarea>
+							</div>
+
+						</div>
+						<div class="muted no-property-selected" ng-show="selectedFields.length == 0" translate>
+							PROPERTY.FIELDS.EMPTY
+						</div>
+					</div>
+				</div>
+
 			</div>
 			<div class="modal-footer">
-			    <button ng-click="cancel()" class="btn btn-primary" translate>ACTION.CANCEL</button>
-			    <button ng-click="save()" class="btn btn-primary" translate>ACTION.SAVE</button>
+				<button class="btn btn-primary" ng-click="cancel()" translate>ACTION.CANCEL</button>
+				<button class="btn btn-primary" ng-click="save()" translate>ACTION.SAVE</button>
 			</div>
 		</div>
 	</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/fields-write-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/fields-write-template.html
index da9489e..b5515e7 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/fields-write-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/fields-write-template.html
@@ -1,4 +1,3 @@
-
 <!-- Just need to instantiate the controller, and it will take care of showing the modal dialog -->
 <span ng-controller="KisBpmFieldsCtrl">
 </span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/form-properties-display-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/form-properties-display-template.html
index 1274342..3d7367e 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/form-properties-display-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/form-properties-display-template.html
@@ -1,3 +1,2 @@
-
 <span ng-if="!property.noValue">{{'PROPERTY.FORMPROPERTIES.VALUE' | translate:property.value.formProperties}}</span>
 <span ng-if="property.noValue" translate>PROPERTY.FORMPROPERTIES.EMPTY</span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/form-properties-popup.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/form-properties-popup.html
index 410ad53..e24994c 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/form-properties-popup.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/form-properties-popup.html
@@ -1,117 +1,177 @@
-
 <div class="modal" ng-controller="KisBpmFormPropertiesPopupCtrl">
-    <div class="modal-dialog modal-wide">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="close()">&times;</button>
-                <h2>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h2>
-            </div>
-            <div class="modal-body">
-            
-                <div class="row row-no-gutter">
-                    <div class="col-xs-6">
-                        <div ng-if="translationsRetrieved" class="default-grid" ng-grid="gridOptions"></div>
-                        <div class="pull-right">
-                            <div class="btn-group">
-                                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{'ACTION.MOVE.UP' | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="movePropertyUp()"><i class="glyphicon glyphicon-arrow-up"></i></a>
-                                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{'ACTION.MOVE.DOWN' | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="movePropertyDown()"><i class="glyphicon glyphicon-arrow-down"></i></a>
-                            </div>
-                            <div class="btn-group">
-                                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{'ACTION.ADD' | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="addNewProperty()"><i class="glyphicon glyphicon-plus"></i></a>
-                                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{'ACTION.REMOVE' | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="removeProperty()"><i class="glyphicon glyphicon-minus"></i></a>
-                            </div>
-                        </div>
-                    </div>
-            
-                    <div class="col-xs-6">
-                        <div ng-show="selectedProperties.length > 0">
-            
-                            <div class="form-group">
-            			   		<label for="idField">{{'PROPERTY.FORMPROPERTIES.ID' | translate}}</label>
-            			   		<input id="idField" class="form-control" type="text" ng-model="selectedProperties[0].id" placeholder="{{'PROPERTY.FORMPROPERTIES.ID.PLACEHOLDER' | translate }}" />
-            				</div>
-            				<div class="form-group">
-            			   		<label for="nameField">{{'PROPERTY.FORMPROPERTIES.NAME' | translate}}</label>
-            			   		<input id="nameField" class="form-control" type="text" ng-model="selectedProperties[0].name" placeholder="{{'PROPERTY.FORMPROPERTIES.NAME.PLACEHOLDER' | translate }}" />
-            				</div>
-            				<div class="form-group">
-            			   		<label for="typeField">{{'PROPERTY.FORMPROPERTIES.TYPE' | translate}}</label>
-            			   		<select id="typeField" class="form-control" ng-model="selectedProperties[0].type" ng-change="propertyTypeChanged()">
-                                    <option>string</option>
-                                    <option>long</option>
-                                    <option>boolean</option>
-                                    <option>date</option>
-                                    <option>enum</option>
-                                </select>
-            				</div>
-                           	<div class="form-group" ng-show="selectedProperties[0].datePattern">
-            			   		<label for="datePatternField">{{'PROPERTY.FORMPROPERTIES.DATEPATTERN' | translate}}</label>
-            			   		<input id="datePatternField" class="form-control" type="text" ng-model="selectedProperties[0].datePattern" placeholder="{{'PROPERTY.FORMPROPERTIES.DATEPATTERN.PLACEHOLDER' | translate }}" />
-            				</div>
-                            <div ng-if="selectedProperties[0].type == 'enum'" style="padding-bottom:10px">
-            			   		<div class="row row-no-gutter">
-				                    <div class="col-xs-6">
-				                        <div ng-if="translationsRetrieved" class="kis-listener-grid" ng-grid="enumGridOptions"></div>
-				                        <div class="pull-right">
-				                            <div class="btn-group">
-				                                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.MOVE.UP | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="moveEnumValueUp()"><i class="glyphicon glyphicon-arrow-up"></i></a>
-				                                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.MOVE.DOWN | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="moveEnumValueDown()"><i class="glyphicon glyphicon-arrow-down"></i></a>
-				                            </div>
-				                            <div class="btn-group">
-				                                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.ADD | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="addNewEnumValue()"><i class="glyphicon glyphicon-plus"></i></a>
-				                                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.REMOVE | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="removeEnumValue()"><i class="glyphicon glyphicon-minus"></i></a>
-				                            </div>
-				                        </div>
-				                    </div>
-				            
-				                    <div class="col-xs-6">
-				                        <div ng-show="selectedEnumValues.length > 0">
-				            
-				                            <div class="form-group">
-				            			   		<label for="classField">{{'PROPERTY.FORMPROPERTIES.VALUES.ID' | translate}}</label>
-				            			   		<input type="text" id="classField" class="form-control" ng-model="selectedEnumValues[0].id" placeholder="{{'PROPERTY.FORMPROPERTIES.VALUES.ID.PLACEHOLDER' | translate}}" />
-				            				</div>
-				            				<div class="form-group">
-				            			   		<label for="classField">{{'PROPERTY.FORMPROPERTIES.VALUES.NAME' | translate}}</label>
-				            			   		<input type="text" id="classField" class="form-control" ng-model="selectedEnumValues[0].name" placeholder="{{'PROPERTY.FORMPROPERTIES.VALUES.NAME.PLACEHOLDER' | translate}}" />
-				            				</div>
-				                        </div>
-				                        <div ng-show="selectedEnumValues.length == 0" class="muted no-property-selected" translate>PROPERTY.FORMPROPERTIES.ENUMVALUES.EMPTY</div>
-				                    </div>
-				                </div>
-            				</div>
-                            <div class="form-group">
-            			   		<label for="expressionField">{{'PROPERTY.FORMPROPERTIES.EXPRESSION' | translate}}</label>
-            			   		<input id="expressionField" class="form-control" type="text" ng-model="selectedProperties[0].expression" placeholder="{{'PROPERTY.FORMPROPERTIES.EXPRESSION.PLACEHOLDER' | translate }}" />
-            				</div>
-            				<div class="form-group">
-            			   		<label for="variableField">{{'PROPERTY.FORMPROPERTIES.VARIABLE' | translate}}</label>
-            			   		<input id="variableField" class="form-control" type="text" ng-model="selectedProperties[0].variable" placeholder="{{'PROPERTY.FORMPROPERTIES.VARIABLE.PLACEHOLDER' | translate }}" />
-            				</div>
-            				<div class="form-inline">
-            					<div class="form-group col-xs-2" >
-            				   		<label for="requiredField">{{'PROPERTY.FORMPROPERTIES.REQUIRED' | translate}}</label>
-            				   		<input id="requiredField" class="form-control" type="checkbox" ng-model="selectedProperties[0].required" />
-            				   	</div>
-            				   	<div class="form-group col-xs-2">
-            				   		<label for="readableField">{{'PROPERTY.FORMPROPERTIES.READABLE' | translate}}</label>
-            				   		<input id="readableField" class="form-control" type="checkbox" ng-model="selectedProperties[0].readable" />
-            					</div>
-            					<div class="form-group col-xs-2">
-            						<label for="writableField">{{'PROPERTY.FORMPROPERTIES.WRITABLE' | translate}}</label>
-            			   			<input id="writableField" class="form-control" type="checkbox" ng-model="selectedProperties[0].writable" />
-            					</div>
-            				</div>
-                        </div>
-                        <div ng-show="selectedProperties.length == 0" class="muted no-property-selected" translate>PROPERTY.FORMPROPERTIES.EMPTY</div>
-                    </div>
-                </div>
-            
-            </div>
-            <div class="modal-footer">
-                <button ng-click="cancel()" class="btn btn-primary" translate>ACTION.CANCEL</button>
-                <button ng-click="save()" class="btn btn-primary" translate>ACTION.SAVE</button>
-            </div>
-        </div>
-    </div>
+	<div class="modal-dialog modal-wide">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button aria-hidden="true" class="close" data-dismiss="modal" ng-click="close()" type="button">&times;
+				</button>
+				<h2>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h2>
+			</div>
+			<div class="modal-body">
+
+				<div class="row row-no-gutter">
+					<div class="col-xs-6">
+						<div class="default-grid" ng-grid="gridOptions" ng-if="translationsRetrieved"></div>
+						<div class="pull-right">
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title=""
+								   data-placement="bottom" data-title="{{'ACTION.MOVE.UP' | translate}}"
+								   ng-click="movePropertyUp()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-arrow-up"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title=""
+								   data-placement="bottom" data-title="{{'ACTION.MOVE.DOWN' | translate}}"
+								   ng-click="movePropertyDown()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-arrow-down"></i></a>
+							</div>
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{'ACTION.ADD' | translate}}" ng-click="addNewProperty()" rel="tooltip"
+								   title=""><i class="glyphicon glyphicon-plus"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title=""
+								   data-placement="bottom" data-title="{{'ACTION.REMOVE' | translate}}"
+								   ng-click="removeProperty()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-minus"></i></a>
+							</div>
+						</div>
+					</div>
+
+					<div class="col-xs-6">
+						<div ng-show="selectedProperties.length > 0">
+
+							<div class="form-group">
+								<label for="idField">{{'PROPERTY.FORMPROPERTIES.ID' | translate}}</label>
+								<input class="form-control" id="idField" ng-model="selectedProperties[0].id"
+									   placeholder="{{'PROPERTY.FORMPROPERTIES.ID.PLACEHOLDER' | translate }}"
+									   type="text"/>
+							</div>
+							<div class="form-group">
+								<label for="nameField">{{'PROPERTY.FORMPROPERTIES.NAME' | translate}}</label>
+								<input class="form-control" id="nameField" ng-model="selectedProperties[0].name"
+									   placeholder="{{'PROPERTY.FORMPROPERTIES.NAME.PLACEHOLDER' | translate }}"
+									   type="text"/>
+							</div>
+							<div class="form-group">
+								<label for="typeField">{{'PROPERTY.FORMPROPERTIES.TYPE' | translate}}</label>
+								<select class="form-control" id="typeField" ng-change="propertyTypeChanged()"
+										ng-model="selectedProperties[0].type">
+									<option>string</option>
+									<option>long</option>
+									<option>boolean</option>
+									<option>date</option>
+									<option>enum</option>
+								</select>
+							</div>
+							<div class="form-group" ng-show="selectedProperties[0].datePattern">
+								<label
+									for="datePatternField">{{'PROPERTY.FORMPROPERTIES.DATEPATTERN' | translate}}</label>
+								<input class="form-control" id="datePatternField"
+									   ng-model="selectedProperties[0].datePattern"
+									   placeholder="{{'PROPERTY.FORMPROPERTIES.DATEPATTERN.PLACEHOLDER' | translate }}"
+									   type="text"/>
+							</div>
+							<div ng-if="selectedProperties[0].type == 'enum'" style="padding-bottom:10px">
+								<div class="row row-no-gutter">
+									<div class="col-xs-6">
+										<div class="kis-listener-grid" ng-grid="enumGridOptions"
+											 ng-if="translationsRetrieved"></div>
+										<div class="pull-right">
+											<div class="btn-group">
+												<a class="btn btn-icon btn-lg" data-original-title=""
+												   data-placement="bottom" data-title="{{ACTION.MOVE.UP | translate}}"
+												   ng-click="moveEnumValueUp()" rel="tooltip" title=""><i
+													class="glyphicon glyphicon-arrow-up"></i></a>
+												<a class="btn btn-icon btn-lg" data-original-title=""
+												   data-placement="bottom" data-title="{{ACTION.MOVE.DOWN | translate}}"
+												   ng-click="moveEnumValueDown()" rel="tooltip" title=""><i
+													class="glyphicon glyphicon-arrow-down"></i></a>
+											</div>
+											<div class="btn-group">
+												<a class="btn btn-icon btn-lg" data-original-title=""
+												   data-placement="bottom" data-title="{{ACTION.ADD | translate}}"
+												   ng-click="addNewEnumValue()" rel="tooltip" title=""><i
+													class="glyphicon glyphicon-plus"></i></a>
+												<a class="btn btn-icon btn-lg" data-original-title=""
+												   data-placement="bottom" data-title="{{ACTION.REMOVE | translate}}"
+												   ng-click="removeEnumValue()" rel="tooltip" title=""><i
+													class="glyphicon glyphicon-minus"></i></a>
+											</div>
+										</div>
+									</div>
+
+									<div class="col-xs-6">
+										<div ng-show="selectedEnumValues.length > 0">
+
+											<div class="form-group">
+												<label
+													for="classField">{{'PROPERTY.FORMPROPERTIES.VALUES.ID' | translate}}</label>
+												<input class="form-control" id="classField"
+													   ng-model="selectedEnumValues[0].id"
+													   placeholder="{{'PROPERTY.FORMPROPERTIES.VALUES.ID.PLACEHOLDER' | translate}}"
+													   type="text"/>
+											</div>
+											<div class="form-group">
+												<label
+													for="classField">{{'PROPERTY.FORMPROPERTIES.VALUES.NAME' | translate}}</label>
+												<input class="form-control" id="classField"
+													   ng-model="selectedEnumValues[0].name"
+													   placeholder="{{'PROPERTY.FORMPROPERTIES.VALUES.NAME.PLACEHOLDER' | translate}}"
+													   type="text"/>
+											</div>
+										</div>
+										<div class="muted no-property-selected" ng-show="selectedEnumValues.length == 0"
+											 translate>PROPERTY.FORMPROPERTIES.ENUMVALUES.EMPTY
+										</div>
+									</div>
+								</div>
+							</div>
+							<div class="form-group">
+								<label
+									for="expressionField">{{'PROPERTY.FORMPROPERTIES.EXPRESSION' | translate}}</label>
+								<input class="form-control" id="expressionField"
+									   ng-model="selectedProperties[0].expression"
+									   placeholder="{{'PROPERTY.FORMPROPERTIES.EXPRESSION.PLACEHOLDER' | translate }}"
+									   type="text"/>
+							</div>
+							<div class="form-group">
+								<label for="variableField">{{'PROPERTY.FORMPROPERTIES.VARIABLE' | translate}}</label>
+								<input class="form-control" id="variableField" ng-model="selectedProperties[0].variable"
+									   placeholder="{{'PROPERTY.FORMPROPERTIES.VARIABLE.PLACEHOLDER' | translate }}"
+									   type="text"/>
+							</div>
+							<div class="form-inline">
+								<div class="form-group col-xs-2">
+									<label
+										for="requiredField">{{'PROPERTY.FORMPROPERTIES.REQUIRED' | translate}}</label>
+									<input class="form-control" id="requiredField"
+										   ng-model="selectedProperties[0].required"
+										   type="checkbox"/>
+								</div>
+								<div class="form-group col-xs-2">
+									<label
+										for="readableField">{{'PROPERTY.FORMPROPERTIES.READABLE' | translate}}</label>
+									<input class="form-control" id="readableField"
+										   ng-model="selectedProperties[0].readable"
+										   type="checkbox"/>
+								</div>
+								<div class="form-group col-xs-2">
+									<label
+										for="writableField">{{'PROPERTY.FORMPROPERTIES.WRITABLE' | translate}}</label>
+									<input class="form-control" id="writableField"
+										   ng-model="selectedProperties[0].writable"
+										   type="checkbox"/>
+								</div>
+							</div>
+						</div>
+						<div class="muted no-property-selected" ng-show="selectedProperties.length == 0" translate>
+							PROPERTY.FORMPROPERTIES.EMPTY
+						</div>
+					</div>
+				</div>
+
+			</div>
+			<div class="modal-footer">
+				<button class="btn btn-primary" ng-click="cancel()" translate>ACTION.CANCEL</button>
+				<button class="btn btn-primary" ng-click="save()" translate>ACTION.SAVE</button>
+			</div>
+		</div>
+	</div>
 </div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/form-properties-write-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/form-properties-write-template.html
index c9f49c7..aeb066f 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/form-properties-write-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/form-properties-write-template.html
@@ -1,4 +1,3 @@
-
 <!-- Just need to instantiate the controller, and it will take care of showing the modal dialog -->
 <span ng-controller="KisBpmFormPropertiesCtrl">
 </span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/in-parameters-display-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/in-parameters-display-template.html
index 961e637..e451d98 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/in-parameters-display-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/in-parameters-display-template.html
@@ -1,3 +1,2 @@
-
 <span ng-if="!property.noValue">{{'PROPERTY.INPARAMETERS.VALUE' | translate:property.value.inParameters}}</span>
 <span ng-if="property.noValue" translate>PROPERTY.INPARAMETERS.EMPTY</span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/in-parameters-popup.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/in-parameters-popup.html
index 879ab94..327e824 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/in-parameters-popup.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/in-parameters-popup.html
@@ -1,52 +1,74 @@
-
 <div class="modal" ng-controller="KisBpmInParametersPopupCtrl">
-    <div class="modal-dialog modal-wide">
-        <div class="modal-content">
+	<div class="modal-dialog modal-wide">
+		<div class="modal-content">
 			<div class="modal-header">
-			    <button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="close()">&times;</button>
-			    <h2>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h2>
+				<button aria-hidden="true" class="close" data-dismiss="modal" ng-click="close()" type="button">&times;
+				</button>
+				<h2>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h2>
 			</div>
 			<div class="modal-body">
-			
-			    <div class="row row-no-gutter">
-			        <div class="col-xs-6">
-			            <div ng-if="translationsRetrieved" class="kis-listener-grid" ng-grid="gridOptions"></div>
-			            <div class="pull-right">
-			                <div class="btn-group">
-			                    <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{'ACTION.MOVE.UP' | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="moveParameterUp()"><i class="glyphicon glyphicon-arrow-up"></i></a>
-			                    <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{'ACTION.MOVE.DOWN' | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="moveParameterDown()"><i class="glyphicon glyphicon-arrow-down"></i></a>
-			                </div>
-			                <div class="btn-group">
-			                    <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{'ACTION.ADD' | translate:property}}" data-placement="bottom" data-original-title="" title="" ng-click="addNewParameter()"><i class="glyphicon glyphicon-plus"></i></a>
-			                    <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{'ACTION.REMOVE' | translate:property}}" data-placement="bottom" data-original-title="" title="" ng-click="removeParameter()"><i class="glyphicon glyphicon-minus"></i></a>
-			                </div>
-			            </div>
-			        </div>
-			
-			        <div class="col-xs-6">
-			            <div ng-show="selectedParameters.length > 0">
-							
+
+				<div class="row row-no-gutter">
+					<div class="col-xs-6">
+						<div class="kis-listener-grid" ng-grid="gridOptions" ng-if="translationsRetrieved"></div>
+						<div class="pull-right">
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title=""
+								   data-placement="bottom" data-title="{{'ACTION.MOVE.UP' | translate}}"
+								   ng-click="moveParameterUp()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-arrow-up"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title=""
+								   data-placement="bottom" data-title="{{'ACTION.MOVE.DOWN' | translate}}"
+								   ng-click="moveParameterDown()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-arrow-down"></i></a>
+							</div>
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title=""
+								   data-placement="bottom" data-title="{{'ACTION.ADD' | translate:property}}"
+								   ng-click="addNewParameter()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-plus"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title=""
+								   data-placement="bottom" data-title="{{'ACTION.REMOVE' | translate:property}}"
+								   ng-click="removeParameter()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-minus"></i></a>
+							</div>
+						</div>
+					</div>
+
+					<div class="col-xs-6">
+						<div ng-show="selectedParameters.length > 0">
+
 							<div class="form-group">
-						   		<label for="sourceField">{{'PROPERTY.PARAMETER.SOURCE' | translate}}</label>
-						   		<input type="text" id="sourceField" class="form-control" ng-model="selectedParameters[0].source" placeholder="{{'PROPERTY.PARAMETER.SOURCE.PLACEHOLDER' | translate}}" />
+								<label for="sourceField">{{'PROPERTY.PARAMETER.SOURCE' | translate}}</label>
+								<input class="form-control" id="sourceField" ng-model="selectedParameters[0].source"
+									   placeholder="{{'PROPERTY.PARAMETER.SOURCE.PLACEHOLDER' | translate}}"
+									   type="text"/>
 							</div>
 							<div class="form-group">
-						   		<label for="expressionField">{{'PROPERTY.PARAMETER.SOURCEEXPRESSION' | translate}}</label>
-						   		<input type="text" id="expressionField" class="form-control" ng-model="selectedParameters[0].sourceExpression" placeholder="{{'PROPERTY.PARAMETER.SOURCEEXPRESSION.PLACEHOLDER' | translate}}" />
+								<label
+									for="expressionField">{{'PROPERTY.PARAMETER.SOURCEEXPRESSION' | translate}}</label>
+								<input class="form-control" id="expressionField"
+									   ng-model="selectedParameters[0].sourceExpression"
+									   placeholder="{{'PROPERTY.PARAMETER.SOURCEEXPRESSION.PLACEHOLDER' | translate}}"
+									   type="text"/>
 							</div>
 							<div class="form-group">
-						   		<label for="expressionField">{{'PROPERTY.PARAMETER.TARGET' | translate}}</label>
-						   		<input type="text" id="expressionField" class="form-control" ng-model="selectedParameters[0].target" placeholder="{{'PROPERTY.PARAMETER.TARGET.PLACEHOLDER' | translate}}" />
+								<label for="expressionField">{{'PROPERTY.PARAMETER.TARGET' | translate}}</label>
+								<input class="form-control" id="expressionField" ng-model="selectedParameters[0].target"
+									   placeholder="{{'PROPERTY.PARAMETER.TARGET.PLACEHOLDER' | translate}}"
+									   type="text"/>
 							</div>
-			                
-			            </div>
-			            <div ng-show="selectedParameters.length == 0" class="muted no-property-selected" translate>PROPERTY.PARAMETER.EMPTY</div>
-			        </div>
-			    </div>
+
+						</div>
+						<div class="muted no-property-selected" ng-show="selectedParameters.length == 0" translate>
+							PROPERTY.PARAMETER.EMPTY
+						</div>
+					</div>
+				</div>
 			</div>
 			<div class="modal-footer">
-			    <button ng-click="cancel()" class="btn btn-primary" translate>ACTION.CANCEL</button>
-			    <button ng-click="save()" class="btn btn-primary" translate>ACTION.SAVE</button>
+				<button class="btn btn-primary" ng-click="cancel()" translate>ACTION.CANCEL</button>
+				<button class="btn btn-primary" ng-click="save()" translate>ACTION.SAVE</button>
 			</div>
 		</div>
 	</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/in-parameters-write-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/in-parameters-write-template.html
index 658e782..7172dfa 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/in-parameters-write-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/in-parameters-write-template.html
@@ -1,4 +1,3 @@
-
 <!-- Just need to instantiate the controller, and it will take care of showing the modal dialog -->
 <span ng-controller="KisBpmInParametersCtrl">
 </span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/message-definitions-popup.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/message-definitions-popup.html
index 700f4d9..28043b4 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/message-definitions-popup.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/message-definitions-popup.html
@@ -1,50 +1,56 @@
-
 <div class="modal" ng-controller="ActivitiMessageDefinitionsPopupCtrl">
-    <div class="modal-dialog modal-wide">
-        <div class="modal-content">
-
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="close()">&times;</button>
-                <h2>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h2>
-            </div>
-
-            <div class="modal-body">
-            
-                <div class="row row-no-gutter">
-
-                	<div class="col-xs-8">
-                        <div ng-if="translationsRetrieved" class="kis-listener-grid" ng-grid="gridOptions"></div>
-            	        <div class="pull-right">
-            	            <div class="btn-group">
-            	                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.ADD | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="addNewMessageDefinition()"><i class="glyphicon glyphicon-plus"></i></a>
-            	                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.REMOVE | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="removeMessageDefinition()"><i class="glyphicon glyphicon-minus"></i></a>
-            	            </div>
-            	        </div>
-            		</div>
-
-                    <div class="col-xs-4" ng-show="selectedMessages && selectedMessages.length > 0">
-
-                        <div class="form-group">
-                            <label>{{'PROPERTY.MESSAGEDEFINITIONS.ID' | translate}}</label>
-                            <input type="text" class="form-control" ng-model="selectedMessages[0].id">
-                        </div>
-
-                        <div class="form-group">
-                            <label>{{'PROPERTY.MESSAGEDEFINITIONS.NAME' | translate}}</label>
-                            <input type="text" class="form-control" ng-model="selectedMessages[0].name">
-                        </div>
-
-                    </div>
-
-            	</div>
-            	
-            </div>
-
-            <div class="modal-footer">
-                <button ng-click="cancel()" class="btn btn-primary" translate>ACTION.CANCEL</button>
-                <button ng-click="save()" class="btn btn-primary" translate>ACTION.SAVE</button>
-            </div>
-
-        </div>
-    </div>
-</div>
\ No newline at end of file
+	<div class="modal-dialog modal-wide">
+		<div class="modal-content">
+
+			<div class="modal-header">
+				<button aria-hidden="true" class="close" data-dismiss="modal" ng-click="close()" type="button">&times;
+				</button>
+				<h2>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h2>
+			</div>
+
+			<div class="modal-body">
+
+				<div class="row row-no-gutter">
+
+					<div class="col-xs-8">
+						<div class="kis-listener-grid" ng-grid="gridOptions" ng-if="translationsRetrieved"></div>
+						<div class="pull-right">
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{ACTION.ADD | translate}}" ng-click="addNewMessageDefinition()"
+								   rel="tooltip"
+								   title=""><i class="glyphicon glyphicon-plus"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{ACTION.REMOVE | translate}}" ng-click="removeMessageDefinition()"
+								   rel="tooltip"
+								   title=""><i class="glyphicon glyphicon-minus"></i></a>
+							</div>
+						</div>
+					</div>
+
+					<div class="col-xs-4" ng-show="selectedMessages && selectedMessages.length > 0">
+
+						<div class="form-group">
+							<label>{{'PROPERTY.MESSAGEDEFINITIONS.ID' | translate}}</label>
+							<input class="form-control" ng-model="selectedMessages[0].id" type="text">
+						</div>
+
+						<div class="form-group">
+							<label>{{'PROPERTY.MESSAGEDEFINITIONS.NAME' | translate}}</label>
+							<input class="form-control" ng-model="selectedMessages[0].name" type="text">
+						</div>
+
+					</div>
+
+				</div>
+
+			</div>
+
+			<div class="modal-footer">
+				<button class="btn btn-primary" ng-click="cancel()" translate>ACTION.CANCEL</button>
+				<button class="btn btn-primary" ng-click="save()" translate>ACTION.SAVE</button>
+			</div>
+
+		</div>
+	</div>
+</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/message-property-write-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/message-property-write-template.html
index 03dc9e4..5c953de 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/message-property-write-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/message-property-write-template.html
@@ -1,4 +1,5 @@
 <div ng-controller="ActivitiMessageRefCtrl">
-    <select ng-model="property.value" ng-change="messageChanged()" ng-options="messageDefinition.id as (messageDefinition.name + ' (' + messageDefinition.id + ')') for messageDefinition in messageDefinitions">
-    </select>
-</div>
\ No newline at end of file
+	<select ng-change="messageChanged()" ng-model="property.value"
+			ng-options="messageDefinition.id as (messageDefinition.name + ' (' + messageDefinition.id + ')') for messageDefinition in messageDefinitions">
+	</select>
+</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/multiinstance-property-write-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/multiinstance-property-write-template.html
index a76fe5c..26eecae 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/multiinstance-property-write-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/multiinstance-property-write-template.html
@@ -1,8 +1,7 @@
-
 <div ng-controller="KisBpmMultiInstanceCtrl">
-    <select ng-model="property.value" ng-change="multiInstanceChanged()">
-    	<option>None</option>
-    	<option>Parallel</option>
-    	<option>Sequential</option>
-    </select>
-</div>
\ No newline at end of file
+	<select ng-change="multiInstanceChanged()" ng-model="property.value">
+		<option>None</option>
+		<option>Parallel</option>
+		<option>Sequential</option>
+	</select>
+</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/out-parameters-display-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/out-parameters-display-template.html
index 859b2e4..9c8b14d 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/out-parameters-display-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/out-parameters-display-template.html
@@ -1,3 +1,2 @@
-
 <span ng-if="!property.noValue">{{'PROPERTY.OUTPARAMETERS.VALUE' | translate:property.value.outParameters}}</span>
 <span ng-if="property.noValue" translate>PROPERTY.OUTPARAMETERS.EMPTY</span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/out-parameters-popup.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/out-parameters-popup.html
index 72b3656..ae29ffc 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/out-parameters-popup.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/out-parameters-popup.html
@@ -1,52 +1,74 @@
-
 <div class="modal" ng-controller="KisBpmOutParametersPopupCtrl">
-    <div class="modal-dialog modal-wide">
-        <div class="modal-content">
+	<div class="modal-dialog modal-wide">
+		<div class="modal-content">
 			<div class="modal-header">
-			    <button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="close()">&times;</button>
-			    <h2>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h2>
+				<button aria-hidden="true" class="close" data-dismiss="modal" ng-click="close()" type="button">&times;
+				</button>
+				<h2>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h2>
 			</div>
 			<div class="modal-body">
-			
-			    <div class="row row-no-gutter">
-			        <div class="col-xs-6">
-			            <div ng-if="translationsRetrieved" class="kis-listener-grid" ng-grid="gridOptions"></div>
-			            <div class="pull-right">
-			                <div class="btn-group">
-			                    <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{'ACTION.MOVE.UP' | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="moveParameterUp()"><i class="glyphicon glyphicon-arrow-up"></i></a>
-			                    <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{'ACTION.MOVE.DOWN' | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="moveParameterDown()"><i class="glyphicon glyphicon-arrow-down"></i></a>
-			                </div>
-			                <div class="btn-group">
-			                    <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{'ACTION.ADD' | translate:property}}" data-placement="bottom" data-original-title="" title="" ng-click="addNewParameter()"><i class="glyphicon glyphicon-plus"></i></a>
-			                    <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{'ACTION.REMOVE' | translate:property}}" data-placement="bottom" data-original-title="" title="" ng-click="removeParameter()"><i class="glyphicon glyphicon-minus"></i></a>
-			                </div>
-			            </div>
-			        </div>
-			
-			        <div class="col-xs-6">
-			            <div ng-show="selectedParameters.length > 0">
-							
+
+				<div class="row row-no-gutter">
+					<div class="col-xs-6">
+						<div class="kis-listener-grid" ng-grid="gridOptions" ng-if="translationsRetrieved"></div>
+						<div class="pull-right">
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title=""
+								   data-placement="bottom" data-title="{{'ACTION.MOVE.UP' | translate}}"
+								   ng-click="moveParameterUp()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-arrow-up"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title=""
+								   data-placement="bottom" data-title="{{'ACTION.MOVE.DOWN' | translate}}"
+								   ng-click="moveParameterDown()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-arrow-down"></i></a>
+							</div>
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title=""
+								   data-placement="bottom" data-title="{{'ACTION.ADD' | translate:property}}"
+								   ng-click="addNewParameter()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-plus"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title=""
+								   data-placement="bottom" data-title="{{'ACTION.REMOVE' | translate:property}}"
+								   ng-click="removeParameter()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-minus"></i></a>
+							</div>
+						</div>
+					</div>
+
+					<div class="col-xs-6">
+						<div ng-show="selectedParameters.length > 0">
+
 							<div class="form-group">
-						   		<label for="sourceField">{{'PROPERTY.PARAMETER.SOURCE' | translate}}</label>
-						   		<input type="text" id="sourceField" class="form-control" ng-model="selectedParameters[0].source" placeholder="{{'PROPERTY.PARAMETER.SOURCE.PLACEHOLDER' | translate}}" />
+								<label for="sourceField">{{'PROPERTY.PARAMETER.SOURCE' | translate}}</label>
+								<input class="form-control" id="sourceField" ng-model="selectedParameters[0].source"
+									   placeholder="{{'PROPERTY.PARAMETER.SOURCE.PLACEHOLDER' | translate}}"
+									   type="text"/>
 							</div>
 							<div class="form-group">
-						   		<label for="expressionField">{{'PROPERTY.PARAMETER.SOURCEEXPRESSION' | translate}}</label>
-						   		<input type="text" id="expressionField" class="form-control" ng-model="selectedParameters[0].sourceExpression" placeholder="{{'PROPERTY.PARAMETER.SOURCEEXPRESSION.PLACEHOLDER' | translate}}" />
+								<label
+									for="expressionField">{{'PROPERTY.PARAMETER.SOURCEEXPRESSION' | translate}}</label>
+								<input class="form-control" id="expressionField"
+									   ng-model="selectedParameters[0].sourceExpression"
+									   placeholder="{{'PROPERTY.PARAMETER.SOURCEEXPRESSION.PLACEHOLDER' | translate}}"
+									   type="text"/>
 							</div>
 							<div class="form-group">
-						   		<label for="expressionField">{{'PROPERTY.PARAMETER.TARGET' | translate}}</label>
-						   		<input type="text" id="expressionField" class="form-control" ng-model="selectedParameters[0].target" placeholder="{{'PROPERTY.PARAMETER.TARGET.PLACEHOLDER' | translate}}" />
+								<label for="expressionField">{{'PROPERTY.PARAMETER.TARGET' | translate}}</label>
+								<input class="form-control" id="expressionField" ng-model="selectedParameters[0].target"
+									   placeholder="{{'PROPERTY.PARAMETER.TARGET.PLACEHOLDER' | translate}}"
+									   type="text"/>
 							</div>
-			                
-			            </div>
-			            <div ng-show="selectedParameters.length == 0" class="muted no-property-selected" translate>PROPERTY.PARAMETER.EMPTY</div>
-			        </div>
-			    </div>
+
+						</div>
+						<div class="muted no-property-selected" ng-show="selectedParameters.length == 0" translate>
+							PROPERTY.PARAMETER.EMPTY
+						</div>
+					</div>
+				</div>
 			</div>
 			<div class="modal-footer">
-			    <button ng-click="cancel()" class="btn btn-primary" translate>ACTION.CANCEL</button>
-			    <button ng-click="save()" class="btn btn-primary" translate>ACTION.SAVE</button>
+				<button class="btn btn-primary" ng-click="cancel()" translate>ACTION.CANCEL</button>
+				<button class="btn btn-primary" ng-click="save()" translate>ACTION.SAVE</button>
 			</div>
 		</div>
 	</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/out-parameters-write-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/out-parameters-write-template.html
index 4075594..3bfe0db 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/out-parameters-write-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/out-parameters-write-template.html
@@ -1,4 +1,3 @@
-
 <!-- Just need to instantiate the controller, and it will take care of showing the modal dialog -->
 <span ng-controller="KisBpmOutParametersCtrl">
 </span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/sequenceflow-order-display-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/sequenceflow-order-display-template.html
index 90f50e9..ff3e0d6 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/sequenceflow-order-display-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/sequenceflow-order-display-template.html
@@ -1,3 +1,2 @@
-
 <span ng-if="!property.noValue" translate>PROPERTY.SEQUENCEFLOW.ORDER.NOT.EMPTY</span>
 <span ng-if="property.noValue" translate>PROPERTY.SEQUENCEFLOW.ORDER.EMPTY</span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/sequenceflow-order-popup.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/sequenceflow-order-popup.html
index 30d3d77..0e46716 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/sequenceflow-order-popup.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/sequenceflow-order-popup.html
@@ -1,46 +1,46 @@
-
 <div class="modal" ng-controller="KisBpmSequenceFlowOrderPopupCtrl">
-    <div class="modal-dialog">
-        <div class="modal-content">
+	<div class="modal-dialog">
+		<div class="modal-content">
 			<div class="modal-header">
-			    <button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="close()">&times;</button>
-			    <h3>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h3>
+				<button aria-hidden="true" class="close" data-dismiss="modal" ng-click="close()" type="button">&times;
+				</button>
+				<h3>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h3>
 			</div>
-			
+
 			<div class="modal-body">
-			
-			    <div translate>PROPERTY.SEQUENCEFLOW.ORDER.DESCRIPTION</div>
-			    <br/>
-			    <ol>
-			        <li class="sequence-flow-order-element" ng-repeat="sequenceFlow in outgoingSequenceFlow">
-			            {{'PROPERTY.SEQUENCEFLOW.ORDER.SEQUENCEFLOW.VALUE' | translate:sequenceFlow}}
-			            <a class="btn btn-icon btn-sm"
-			               rel="tooltip"
-			               data-title="{{'ACTION.MOVE.UP' | translate}}"
-			               data-placement="bottom"
-			               data-original-title="" title=""
-			               ng-click="moveUp($index)"
-			               ng-if="$index > 0">
-			                 <i class="glyphicon glyphicon-arrow-up"></i>
-			            </a>
-			            <a class="btn btn-icon btn-sm"
-			               rel="tooltip"
-			               data-title="{{'ACTION.MOVE.DOWN' | translate}}"
-			               data-placement="bottom"
-			               data-original-title=""
-			               title=""
-			               ng-click="moveDown($index)"
-			               ng-if="$index < outgoingSequenceFlow.length - 1">
-			                 <i class="glyphicon glyphicon-arrow-down"></i>
-			            </a>
-			        </li>
-			    </ol>
-			
-			
+
+				<div translate>PROPERTY.SEQUENCEFLOW.ORDER.DESCRIPTION</div>
+				<br/>
+				<ol>
+					<li class="sequence-flow-order-element" ng-repeat="sequenceFlow in outgoingSequenceFlow">
+						{{'PROPERTY.SEQUENCEFLOW.ORDER.SEQUENCEFLOW.VALUE' | translate:sequenceFlow}}
+						<a class="btn btn-icon btn-sm"
+						   data-original-title=""
+						   data-placement="bottom"
+						   data-title="{{'ACTION.MOVE.UP' | translate}}"
+						   ng-click="moveUp($index)" ng-if="$index > 0"
+						   rel="tooltip"
+						   title="">
+							<i class="glyphicon glyphicon-arrow-up"></i>
+						</a>
+						<a class="btn btn-icon btn-sm"
+						   data-original-title=""
+						   data-placement="bottom"
+						   data-title="{{'ACTION.MOVE.DOWN' | translate}}"
+						   ng-click="moveDown($index)"
+						   ng-if="$index < outgoingSequenceFlow.length - 1"
+						   rel="tooltip"
+						   title="">
+							<i class="glyphicon glyphicon-arrow-down"></i>
+						</a>
+					</li>
+				</ol>
+
+
 			</div>
 			<div class="modal-footer">
-			    <button ng-click="cancel()" class="btn btn-primary" translate>ACTION.CANCEL</button>
-			    <button ng-click="save()" class="btn btn-primary" translate>ACTION.SAVE</button>
+				<button class="btn btn-primary" ng-click="cancel()" translate>ACTION.CANCEL</button>
+				<button class="btn btn-primary" ng-click="save()" translate>ACTION.SAVE</button>
 			</div>
 		</div>
 	</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/sequenceflow-order-write-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/sequenceflow-order-write-template.html
index 2e2ca3a..0fb09fd 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/sequenceflow-order-write-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/sequenceflow-order-write-template.html
@@ -1,4 +1,3 @@
-
 <!-- Just need to instantiate the controller, and it will take care of showing the modal dialog -->
 <span ng-controller="KisBpmSequenceFlowOrderCtrl">
 </span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/signal-definitions-display-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/signal-definitions-display-template.html
index 7fa105b..4e8f1cd 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/signal-definitions-display-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/signal-definitions-display-template.html
@@ -1,3 +1,2 @@
-
 <span ng-if="!property.noValue">{{'PROPERTY.SIGNALDEFINITIONS.DISPLAY' | translate:property.value}}</span>
 <span ng-if="property.noValue" translate>PROPERTY.SIGNALDEFINITIONS.EMPTY</span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/signal-definitions-popup.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/signal-definitions-popup.html
index 4ca3283..ae2e261 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/signal-definitions-popup.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/signal-definitions-popup.html
@@ -1,58 +1,67 @@
-
 <div class="modal" ng-controller="ActivitiSignalDefinitionsPopupCtrl">
-    <div class="modal-dialog modal-wide">
-        <div class="modal-content">
-
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="close()">&times;</button>
-                <h2>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h2>
-            </div>
-
-            <div class="modal-body">
-            
-                <div class="row row-no-gutter">
-
-                	<div class="col-xs-8">
-                        <div ng-if="translationsRetrieved" class="kis-listener-grid" ng-grid="gridOptions"></div>
-            	        <div class="pull-right">
-            	            <div class="btn-group">
-            	                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.ADD | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="addNewSignalDefinition()"><i class="glyphicon glyphicon-plus"></i></a>
-            	                <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.REMOVE | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="removeSignalDefinition()"><i class="glyphicon glyphicon-minus"></i></a>
-            	            </div>
-            	        </div>
-            		</div>
-
-                    <div class="col-xs-4" ng-show="selectedSignals && selectedSignals.length > 0">
-
-                        <div class="form-group">
-                            <label>{{'PROPERTY.SIGNALDEFINITIONS.ID' | translate}}</label>
-                            <input type="text" class="form-control" ng-model="selectedSignals[0].id">
-                        </div>
-
-                        <div class="form-group">
-                            <label>{{'PROPERTY.SIGNALDEFINITIONS.NAME' | translate}}</label>
-                            <input type="text" class="form-control" ng-model="selectedSignals[0].name">
-                        </div>
-
-                        <div class="form-group">
-                            <label>{{'PROPERTY.SIGNALDEFINITIONS.SCOPE' | translate}}</label>
-                            <select class="form-control" ng-model="selectedSignals[0].scope">
-                                <option value="global">{{'PROPERTY.SIGNALDEFINITIONS.SCOPE-GLOBAL' | translate}}</option>
-                                <option value="processInstance">{{'PROPERTY.SIGNALDEFINITIONS.SCOPE-PROCESSINSTANCE' | translate}}</option>
-                            </select>
-                        </div>
-
-                    </div>
-
-            	</div>
-            	
-            </div>
-
-            <div class="modal-footer">
-                <button ng-click="cancel()" class="btn btn-primary" translate>ACTION.CANCEL</button>
-                <button ng-click="save()" class="btn btn-primary" translate>ACTION.SAVE</button>
-            </div>
-
-        </div>
-    </div>
-</div>
\ No newline at end of file
+	<div class="modal-dialog modal-wide">
+		<div class="modal-content">
+
+			<div class="modal-header">
+				<button aria-hidden="true" class="close" data-dismiss="modal" ng-click="close()" type="button">&times;
+				</button>
+				<h2>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h2>
+			</div>
+
+			<div class="modal-body">
+
+				<div class="row row-no-gutter">
+
+					<div class="col-xs-8">
+						<div class="kis-listener-grid" ng-grid="gridOptions" ng-if="translationsRetrieved"></div>
+						<div class="pull-right">
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{ACTION.ADD | translate}}" ng-click="addNewSignalDefinition()"
+								   rel="tooltip"
+								   title=""><i class="glyphicon glyphicon-plus"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{ACTION.REMOVE | translate}}" ng-click="removeSignalDefinition()"
+								   rel="tooltip"
+								   title=""><i class="glyphicon glyphicon-minus"></i></a>
+							</div>
+						</div>
+					</div>
+
+					<div class="col-xs-4" ng-show="selectedSignals && selectedSignals.length > 0">
+
+						<div class="form-group">
+							<label>{{'PROPERTY.SIGNALDEFINITIONS.ID' | translate}}</label>
+							<input class="form-control" ng-model="selectedSignals[0].id" type="text">
+						</div>
+
+						<div class="form-group">
+							<label>{{'PROPERTY.SIGNALDEFINITIONS.NAME' | translate}}</label>
+							<input class="form-control" ng-model="selectedSignals[0].name" type="text">
+						</div>
+
+						<div class="form-group">
+							<label>{{'PROPERTY.SIGNALDEFINITIONS.SCOPE' | translate}}</label>
+							<select class="form-control" ng-model="selectedSignals[0].scope">
+								<option value="global">{{'PROPERTY.SIGNALDEFINITIONS.SCOPE-GLOBAL' | translate}}
+								</option>
+								<option value="processInstance">
+									{{'PROPERTY.SIGNALDEFINITIONS.SCOPE-PROCESSINSTANCE' | translate}}
+								</option>
+							</select>
+						</div>
+
+					</div>
+
+				</div>
+
+			</div>
+
+			<div class="modal-footer">
+				<button class="btn btn-primary" ng-click="cancel()" translate>ACTION.CANCEL</button>
+				<button class="btn btn-primary" ng-click="save()" translate>ACTION.SAVE</button>
+			</div>
+
+		</div>
+	</div>
+</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/signal-definitions-write-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/signal-definitions-write-template.html
index 2282b4c..7c38975 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/signal-definitions-write-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/signal-definitions-write-template.html
@@ -1,4 +1,3 @@
-
 <!-- Just need to instantiate the controller, and it will take care of showing the modal dialog -->
 <span ng-controller="ActivitiSignalDefinitionsCtrl">
 </span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/signal-property-write-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/signal-property-write-template.html
index 7505d81..2c4f53e 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/signal-property-write-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/signal-property-write-template.html
@@ -1,4 +1,5 @@
 <div ng-controller="ActivitiSignalRefCtrl">
-    <select ng-model="property.value" ng-change="signalChanged()" ng-options="signalDefinition.id as (signalDefinition.name + ' (' + signalDefinition.id + ')') for signalDefinition in signalDefinitions">
-    </select>
-</div>
\ No newline at end of file
+	<select ng-change="signalChanged()" ng-model="property.value"
+			ng-options="signalDefinition.id as (signalDefinition.name + ' (' + signalDefinition.id + ')') for signalDefinition in signalDefinitions">
+	</select>
+</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/string-property-write-mode-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/string-property-write-mode-template.html
index 4fd2d73..e1d9510 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/string-property-write-mode-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/string-property-write-mode-template.html
@@ -1,8 +1,7 @@
-
 <div ng-controller="KisBpmStringPropertyCtrl">
-    <input type="text" ng-model="property.value"
-    	   class="form-control" 
-           auto-focus
-           ng-blur="inputBlurred()"
-           ng-keypress="enterPressed($event)"/>
-</div>
\ No newline at end of file
+	<input auto-focus class="form-control"
+		   ng-blur="inputBlurred()"
+		   ng-keypress="enterPressed($event)"
+		   ng-model="property.value"
+		   type="text"/>
+</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/subprocess-reference-display-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/subprocess-reference-display-template.html
index 9889ea9..45e62c4 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/subprocess-reference-display-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/subprocess-reference-display-template.html
@@ -1,3 +1,2 @@
-
 <span ng-if="property.value.name">{{property.value.name}}</span>
 <span ng-if="!property.value || !property.value.name" translate>PROPERTY.SUBPROCESSREFERENCE.EMPTY</span>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/subprocess-reference-popup.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/subprocess-reference-popup.html
index 818eb1a..9c3109c 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/subprocess-reference-popup.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/subprocess-reference-popup.html
@@ -1,42 +1,54 @@
-
 <div class="modal" ng-controller="KisBpmCollapsedSubprocessReferencePopupCrtl">
-    <div class="modal-dialog modal-wide">
-        <div class="modal-content">
+	<div class="modal-dialog modal-wide">
+		<div class="modal-content">
 			<div class="modal-header">
-			    <button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="close()">&times;</button>
-			    <h2>
-			        {{'PROPERTY.SUBPROCESSREFERENCE.TITLE' | translate}}
-			        <span ng-show="selectedSubProcess != null"> - {{selectedSubProcess.name}}</span>
-			        <span ng-show="selectedSubProcess == null"> - {{'PROPERTY.SUBPROCESSREFERENCE.EMPTY' | translate}}</span> 
-			    
-			    </h2>
+				<button aria-hidden="true" class="close" data-dismiss="modal" ng-click="close()" type="button">&times;
+				</button>
+				<h2>
+					{{'PROPERTY.SUBPROCESSREFERENCE.TITLE' | translate}}
+					<span ng-show="selectedSubProcess != null"> - {{selectedSubProcess.name}}</span>
+					<span
+						ng-show="selectedSubProcess == null"> - {{'PROPERTY.SUBPROCESSREFERENCE.EMPTY' | translate}}</span>
+
+				</h2>
 			</div>
 			<div class="modal-body">
-			    <div class="detail-group clearfix">
-                    <div class="col-xs-12">
-			            <div class="alert alert-error" ng-show="(!state.loadingFolders && !state.loadingSubprocesses) && state.subprocessError" translate>PROPERTY.SUBPROCESSREFERENCE.ERROR.SUBPROCESS</div>
-			        </div>
-			    </div>
-			    <div class="detail-group clearfix">
-                    <div class="col-xs-12 editor-item-picker">
-			            <div ng-if="!state.loadingSubprocesses && !state.subprocessError" class="col-xs-4 editor-item-picker-component" ng-repeat="sub in subProcesses" ng-class="{'selected' : sub.id == selectedSubProcess.id}" ng-click="selectSubProcess(sub, $event)">
-			               <div class="controls">
-			                   <input type="checkbox" value="option1" ng-click="selectSubProcess(sub, $event)" ng-checked="sub.id == selectedSubProcess.id" />
-			               </div>
-			               <h4>{{sub.name}}</h4>
-			               <img src="{{config.contextRoot}}/app/rest/models/{{sub.id}}/thumbnail" />
-			             </div>
-			             <div ng-show="state.loadingSubprocesses">
-			               <p class="loading" translate>PROPERTY.SUBPROCESSREFERENCE.SUBPROCESS.LOADING</p>
-			             </div>
-			             <div ng-show="!state.loadingSubprocesses && subProcesses.length == 0">
-			                <p translate>PROPERTY.SUBPROCESSREFERENCE.SUBPROCESS.EMPTY</p>
-			             </div>
-			        </div>
-			    </div>
+				<div class="detail-group clearfix">
+					<div class="col-xs-12">
+						<div class="alert alert-error"
+							 ng-show="(!state.loadingFolders && !state.loadingSubprocesses) && state.subprocessError"
+							 translate>PROPERTY.SUBPROCESSREFERENCE.ERROR.SUBPROCESS
+						</div>
+					</div>
+				</div>
+				<div class="detail-group clearfix">
+					<div class="col-xs-12 editor-item-picker">
+						<div class="col-xs-4 editor-item-picker-component"
+							 ng-class="{'selected' : sub.id == selectedSubProcess.id}"
+							 ng-click="selectSubProcess(sub, $event)"
+							 ng-if="!state.loadingSubprocesses && !state.subprocessError"
+							 ng-repeat="sub in subProcesses">
+							<div class="controls">
+								<input ng-checked="sub.id == selectedSubProcess.id"
+									   ng-click="selectSubProcess(sub, $event)" type="checkbox"
+									   value="option1"/>
+							</div>
+							<h4>{{sub.name}}</h4>
+							<img src="{{config.contextRoot}}/app/rest/models/{{sub.id}}/thumbnail"/>
+						</div>
+						<div ng-show="state.loadingSubprocesses">
+							<p class="loading" translate>PROPERTY.SUBPROCESSREFERENCE.SUBPROCESS.LOADING</p>
+						</div>
+						<div ng-show="!state.loadingSubprocesses && subProcesses.length == 0">
+							<p translate>PROPERTY.SUBPROCESSREFERENCE.SUBPROCESS.EMPTY</p>
+						</div>
+					</div>
+				</div>
 			</div>
 			<div class="modal-footer">
-			    <button ng-disabled="state.subprocessError" ng-click="save()" class="btn btn-primary" translate>ACTION.SAVE</button>
+				<button class="btn btn-primary" ng-click="save()" ng-disabled="state.subprocessError" translate>
+					ACTION.SAVE
+				</button>
 			</div>
 		</div>
 	</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/subprocess-reference-write-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/subprocess-reference-write-template.html
index e9ad8ad..db1e7aa 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/subprocess-reference-write-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/subprocess-reference-write-template.html
@@ -1,4 +1,3 @@
-
 <!-- Just need to instantiate the controller, and it will take care of showing the modal dialog -->
 <span ng-controller="KisBpmCollapsedSubprocessReferenceCrtl">
 </span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/task-listeners-display-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/task-listeners-display-template.html
index 4d07171..f48e36b 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/task-listeners-display-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/task-listeners-display-template.html
@@ -1,3 +1,2 @@
-
 <span ng-if="!property.noValue">{{'PROPERTY.TASKLISTENERS.VALUE' | translate:property.value.taskListeners}}</span>
 <span ng-if="property.noValue" translate>PROPERTY.TASKLISTENERS.EMPTY</span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/task-listeners-popup.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/task-listeners-popup.html
index 7d83e57..baa26d5 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/task-listeners-popup.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/task-listeners-popup.html
@@ -1,101 +1,149 @@
-
 <div class="modal" ng-controller="KisBpmTaskListenersPopupCtrl">
-    <div class="modal-dialog modal-wide">
-        <div class="modal-content">
+	<div class="modal-dialog modal-wide">
+		<div class="modal-content">
 			<div class="modal-header">
-			    <button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="close()">&times;</button>
-			    <h2>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h2>
+				<button aria-hidden="true" class="close" data-dismiss="modal" ng-click="close()" type="button">&times;
+				</button>
+				<h2>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h2>
 			</div>
 			<div class="modal-body">
-			
-			    <div class="row row-no-gutter">
-			        <div class="col-xs-6">
-			            <div ng-if="translationsRetrieved" class="kis-listener-grid" ng-grid="gridOptions"></div>
-			            <div class="pull-right">
-			                <div class="btn-group">
-			                    <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.MOVE.UP | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="moveListenerUp()"><i class="glyphicon glyphicon-arrow-up"></i></a>
-			                    <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.MOVE.DOWN | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="moveListenerDown()"><i class="glyphicon glyphicon-arrow-down"></i></a>
-			                </div>
-			                <div class="btn-group">
-			                    <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.ADD | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="addNewListener()"><i class="glyphicon glyphicon-plus"></i></a>
-			                    <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.REMOVE | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="removeListener()"><i class="glyphicon glyphicon-minus"></i></a>
-			                </div>
-			            </div>
-			        </div>
-			
-			        <div class="col-xs-6">
-			            <div ng-show="selectedListeners.length > 0">
-			
-			                <div class="form-group">
-						   		<label for="eventField">{{'PROPERTY.TASKLISTENERS.EVENT' | translate}}</label>
-						   		<select id="eventField" class="form-control" ng-model="selectedListeners[0].event">
-			                        <option>create</option>
-			                        <option>assignment</option>
-			                        <option>complete</option>
-			                        <option>delete</option>
-			                    </select>
+
+				<div class="row row-no-gutter">
+					<div class="col-xs-6">
+						<div class="kis-listener-grid" ng-grid="gridOptions" ng-if="translationsRetrieved"></div>
+						<div class="pull-right">
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{ACTION.MOVE.UP | translate}}" ng-click="moveListenerUp()" rel="tooltip"
+								   title=""><i class="glyphicon glyphicon-arrow-up"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title=""
+								   data-placement="bottom" data-title="{{ACTION.MOVE.DOWN | translate}}"
+								   ng-click="moveListenerDown()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-arrow-down"></i></a>
 							</div>
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{ACTION.ADD | translate}}" ng-click="addNewListener()" rel="tooltip"
+								   title=""><i class="glyphicon glyphicon-plus"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{ACTION.REMOVE | translate}}" ng-click="removeListener()" rel="tooltip"
+								   title=""><i class="glyphicon glyphicon-minus"></i></a>
+							</div>
+						</div>
+					</div>
+
+					<div class="col-xs-6">
+						<div ng-show="selectedListeners.length > 0">
+
 							<div class="form-group">
-						   		<label for="classField">{{'PROPERTY.TASKLISTENERS.CLASS' | translate}}</label>
-						   		<input type="text" id="classField" class="form-control" ng-model="selectedListeners[0].className" ng-change="listenerDetailsChanged()" placeholder="{{'PROPERTY.TASKLISTENERS.CLASS.PLACEHOLDER' | translate}}" />
+								<label for="eventField">{{'PROPERTY.TASKLISTENERS.EVENT' | translate}}</label>
+								<select class="form-control" id="eventField" ng-model="selectedListeners[0].event">
+									<option>create</option>
+									<option>assignment</option>
+									<option>complete</option>
+									<option>delete</option>
+								</select>
 							</div>
 							<div class="form-group">
-						   		<label for="expressionField">{{'PROPERTY.TASKLISTENERS.EXPRESSION' | translate}}</label>
-						   		<input type="text" id="expressionField" class="form-control" ng-model="selectedListeners[0].expression" ng-change="listenerDetailsChanged()" placeholder="{{'PROPERTY.TASKLISTENERS.EXPRESSION.PLACEHOLDER' | translate}}" />
+								<label for="classField">{{'PROPERTY.TASKLISTENERS.CLASS' | translate}}</label>
+								<input class="form-control" id="classField" ng-change="listenerDetailsChanged()"
+									   ng-model="selectedListeners[0].className"
+									   placeholder="{{'PROPERTY.TASKLISTENERS.CLASS.PLACEHOLDER' | translate}}"
+									   type="text"/>
 							</div>
 							<div class="form-group">
-						   		<label for="delegateExpressionField">{{'PROPERTY.TASKLISTENERS.DELEGATEEXPRESSION' | translate}}</label>
-						   		<input type="text" id="delegateExpressionField" class="form-control" ng-model="selectedListeners[0].delegateExpression" ng-change="listenerDetailsChanged()" placeholder="{{'PROPERTY.TASKLISTENERS.DELEGATEEXPRESSION.PLACEHOLDER' | translate}}" />
+								<label for="expressionField">{{'PROPERTY.TASKLISTENERS.EXPRESSION' | translate}}</label>
+								<input class="form-control" id="expressionField" ng-change="listenerDetailsChanged()"
+									   ng-model="selectedListeners[0].expression"
+									   placeholder="{{'PROPERTY.TASKLISTENERS.EXPRESSION.PLACEHOLDER' | translate}}"
+									   type="text"/>
 							</div>
-			            </div>
-			            <div ng-show="selectedListeners.length == 0" class="muted no-property-selected" translate>PROPERTY.TASKLISTENERS.UNSELECTED</div>
-			        </div>
-			    </div>
-			    
-			    <div class="row row-no-gutter">
-			        <div class="col-xs-6">
-			            <div ng-if="translationsRetrieved" class="kis-field-grid" ng-grid="gridFieldOptions"></div>
-			            <div class="pull-right">
-			                <div class="btn-group">
-			                    <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.MOVE.UP | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="moveFieldUp()"><i class="glyphicon glyphicon-arrow-up"></i></a>
-			                    <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.MOVE.DOWN | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="moveFieldDown()"><i class="glyphicon glyphicon-arrow-down"></i></a>
-			                </div>
-			                <div class="btn-group">
-			                    <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.ADD | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="addNewField()"><i class="glyphicon glyphicon-plus"></i></a>
-			                    <a class="btn btn-icon btn-lg" rel="tooltip" data-title="{{ACTION.REMOVE | translate}}" data-placement="bottom" data-original-title="" title="" ng-click="removeField()"><i class="glyphicon glyphicon-minus"></i></a>
-			                </div>
-			            </div>
-			        </div>
-			
-			        <div class="col-xs-6">
-			            <div ng-show="selectedFields.length > 0">
-			
 							<div class="form-group">
-						   		<label for="nameField">{{'PROPERTY.TASKLISTENERS.FIELDS.NAME' | translate}}</label>
-						   		<input type="text" id="nameField" class="form-control" ng-model="selectedFields[0].name" placeholder="{{'PROPERTY.TASKLISTENERS.FIELDS.NAME.PLACEHOLDER' | translate}}" />
+								<label
+									for="delegateExpressionField">{{'PROPERTY.TASKLISTENERS.DELEGATEEXPRESSION' | translate}}</label>
+								<input class="form-control" id="delegateExpressionField"
+									   ng-change="listenerDetailsChanged()"
+									   ng-model="selectedListeners[0].delegateExpression"
+									   placeholder="{{'PROPERTY.TASKLISTENERS.DELEGATEEXPRESSION.PLACEHOLDER' | translate}}"
+									   type="text"/>
+							</div>
+						</div>
+						<div class="muted no-property-selected" ng-show="selectedListeners.length == 0" translate>
+							PROPERTY.TASKLISTENERS.UNSELECTED
+						</div>
+					</div>
+				</div>
+
+				<div class="row row-no-gutter">
+					<div class="col-xs-6">
+						<div class="kis-field-grid" ng-grid="gridFieldOptions" ng-if="translationsRetrieved"></div>
+						<div class="pull-right">
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{ACTION.MOVE.UP | translate}}" ng-click="moveFieldUp()" rel="tooltip"
+								   title=""><i
+									class="glyphicon glyphicon-arrow-up"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title=""
+								   data-placement="bottom" data-title="{{ACTION.MOVE.DOWN | translate}}"
+								   ng-click="moveFieldDown()" rel="tooltip" title=""><i
+									class="glyphicon glyphicon-arrow-down"></i></a>
 							</div>
-			                <div class="form-group">
-						   		<label for="stringValueField">{{'PROPERTY.TASKLISTENERS.FIELDS.STRINGVALUE' | translate}}</label>
-						   		<input type="text" id="stringValueField" class="form-control" ng-model="selectedFields[0].stringValue" ng-change="fieldDetailsChanged()" placeholder="{{'PROPERTY.TASKLISTENERS.FIELDS.STRINGVALUE.PLACEHOLDER' | translate}}" />
+							<div class="btn-group">
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{ACTION.ADD | translate}}" ng-click="addNewField()" rel="tooltip"
+								   title=""><i
+									class="glyphicon glyphicon-plus"></i></a>
+								<a class="btn btn-icon btn-lg" data-original-title="" data-placement="bottom"
+								   data-title="{{ACTION.REMOVE | translate}}" ng-click="removeField()" rel="tooltip"
+								   title=""><i
+									class="glyphicon glyphicon-minus"></i></a>
+							</div>
+						</div>
+					</div>
+
+					<div class="col-xs-6">
+						<div ng-show="selectedFields.length > 0">
+
+							<div class="form-group">
+								<label for="nameField">{{'PROPERTY.TASKLISTENERS.FIELDS.NAME' | translate}}</label>
+								<input class="form-control" id="nameField" ng-model="selectedFields[0].name"
+									   placeholder="{{'PROPERTY.TASKLISTENERS.FIELDS.NAME.PLACEHOLDER' | translate}}"
+									   type="text"/>
 							</div>
 							<div class="form-group">
-						   		<label for="expressionField">{{'PROPERTY.TASKLISTENERS.FIELDS.EXPRESSION' | translate}}</label>
-						   		<input type="text" id="expressionField" class="form-control" ng-model="selectedFields[0].expression" ng-change="fieldDetailsChanged()" placeholder="{{'PROPERTY.TASKLISTENERS.FIELDS.EXPRESSION.PLACEHOLDER' | translate}}" />
+								<label
+									for="stringValueField">{{'PROPERTY.TASKLISTENERS.FIELDS.STRINGVALUE' | translate}}</label>
+								<input class="form-control" id="stringValueField" ng-change="fieldDetailsChanged()"
+									   ng-model="selectedFields[0].stringValue"
+									   placeholder="{{'PROPERTY.TASKLISTENERS.FIELDS.STRINGVALUE.PLACEHOLDER' | translate}}"
+									   type="text"/>
 							</div>
 							<div class="form-group">
-						   		<label for="stringField">{{'PROPERTY.TASKLISTENERS.FIELDS.STRING' | translate}}</label>
-						   		<textarea id="stringField" class="form-control" ng-model="selectedFields[0].string" ng-change="fieldDetailsChanged()" placeholder="{{'PROPERTY.TASKLISTENERS.FIELDS.STRING.PLACEHOLDER' | translate}}"></textarea>
+								<label
+									for="expressionField">{{'PROPERTY.TASKLISTENERS.FIELDS.EXPRESSION' | translate}}</label>
+								<input class="form-control" id="expressionField" ng-change="fieldDetailsChanged()"
+									   ng-model="selectedFields[0].expression"
+									   placeholder="{{'PROPERTY.TASKLISTENERS.FIELDS.EXPRESSION.PLACEHOLDER' | translate}}"
+									   type="text"/>
 							</div>
-			                
-			            </div>
-			            <div ng-show="selectedFields.length == 0" class="muted no-property-selected"translate>PROPERTY.TASKLISTENERS.FIELDS.EMPTY</div>
-			        </div>
-			    </div>
-			
+							<div class="form-group">
+								<label for="stringField">{{'PROPERTY.TASKLISTENERS.FIELDS.STRING' | translate}}</label>
+								<textarea class="form-control" id="stringField" ng-change="fieldDetailsChanged()"
+										  ng-model="selectedFields[0].string"
+										  placeholder="{{'PROPERTY.TASKLISTENERS.FIELDS.STRING.PLACEHOLDER' | translate}}"></textarea>
+							</div>
+
+						</div>
+						<div class="muted no-property-selected" ng-show="selectedFields.length == 0" translate>
+							PROPERTY.TASKLISTENERS.FIELDS.EMPTY
+						</div>
+					</div>
+				</div>
+
 			</div>
 			<div class="modal-footer">
-			    <button ng-click="cancel()" class="btn btn-primary" translate>ACTION.CANCEL</button>
-			    <button ng-click="save()" class="btn btn-primary" translate>ACTION.SAVE</button>
+				<button class="btn btn-primary" ng-click="cancel()" translate>ACTION.CANCEL</button>
+				<button class="btn btn-primary" ng-click="save()" translate>ACTION.SAVE</button>
 			</div>
 		</div>
 	</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/task-listeners-write-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/task-listeners-write-template.html
index 8c4d993..3c9233e 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/task-listeners-write-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/task-listeners-write-template.html
@@ -1,4 +1,3 @@
-
 <!-- Just need to instantiate the controller, and it will take care of showing the modal dialog -->
 <span ng-controller="KisBpmTaskListenersCtrl">
 </span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/text-popup.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/text-popup.html
index d7c67af..3179392 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/text-popup.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/text-popup.html
@@ -1,17 +1,18 @@
-
 <div class="modal" ng-controller="KisBpmTextPropertyPopupCtrl">
-    <div class="modal-dialog">
-        <div class="modal-content">
+	<div class="modal-dialog">
+		<div class="modal-content">
 			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="close()">&times;</button>
-			    <h3>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h3>
+				<button aria-hidden="true" class="close" data-dismiss="modal" ng-click="close()" type="button">&times;
+				</button>
+				<h3>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate:property}}</h3>
 			</div>
 			<div class="modal-body">
-				<p><textarea auto-focus class="form-control" ng-model="property.value" style="width:70%; height:100%; max-width: 100%; max-height: 100%; min-height: 200px"/></p>
+				<p><textarea auto-focus class="form-control" ng-model="property.value"
+							 style="width:70%; height:100%; max-width: 100%; max-height: 100%; min-height: 200px"/></p>
 			</div>
 			<div class="modal-footer">
-				<button ng-click="save()" class="btn btn-primary" translate >ACTION.SAVE</button>
+				<button class="btn btn-primary" ng-click="save()" translate>ACTION.SAVE</button>
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/properties/text-property-write-template.html b/len-activiti/src/main/resources/static/editor-app/configuration/properties/text-property-write-template.html
index b4a1d7f..f9247ea 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/properties/text-property-write-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/properties/text-property-write-template.html
@@ -1,4 +1,3 @@
-
 <!-- Just need to instantiate the controller, and it will take care of showing the modal dialog -->
 <span ng-controller="KisBpmTextPropertyCtrl">
 </span>
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/toolbar-default-actions.js b/len-activiti/src/main/resources/static/editor-app/configuration/toolbar-default-actions.js
index 2e10e30..1d2c977 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/toolbar-default-actions.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/toolbar-default-actions.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -20,412 +20,406 @@
 
 var KISBPM = KISBPM || {};
 KISBPM.TOOLBAR = {
-    ACTIONS: {
-
-        saveModel: function (services) {
-
-            var modal = services.$modal({
-                backdrop: true,
-                keyboard: true,
-                template: 'editor-app/popups/save-model.html?version=' + Date.now(),
-                scope: services.$scope
-            });
-        },
-
-        undo: function (services) {
-
-            // Get the last commands
-            var lastCommands = services.$scope.undoStack.pop();
-
-            if (lastCommands) {
-                // Add the commands to the redo stack
-                services.$scope.redoStack.push(lastCommands);
-
-                // Force refresh of selection, might be that the undo command
-                // impacts properties in the selected item
-                if (services.$rootScope && services.$rootScope.forceSelectionRefresh) 
-                {
-                	services.$rootScope.forceSelectionRefresh = true;
-                }
-                
-                // Rollback every command
-                for (var i = lastCommands.length - 1; i >= 0; --i) {
-                    lastCommands[i].rollback();
-                }
-                
-                // Update and refresh the canvas
-                services.$scope.editor.handleEvents({
-                    type: ORYX.CONFIG.EVENT_UNDO_ROLLBACK,
-                    commands: lastCommands
-                });
-                
-                // Update
-                services.$scope.editor.getCanvas().update();
-                services.$scope.editor.updateSelection();
-            }
-            
-            var toggleUndo = false;
-            if (services.$scope.undoStack.length == 0)
-            {
-            	toggleUndo = true;
-            }
-            
-            var toggleRedo = false;
-            if (services.$scope.redoStack.length > 0)
-            {
-            	toggleRedo = true;
-            }
-
-            if (toggleUndo || toggleRedo) {
-                for (var i = 0; i < services.$scope.items.length; i++) {
-                    var item = services.$scope.items[i];
-                    if (toggleUndo && item.action === 'KISBPM.TOOLBAR.ACTIONS.undo') {
-                        services.$scope.safeApply(function () {
-                            item.enabled = false;
-                        });
-                    }
-                    else if (toggleRedo && item.action === 'KISBPM.TOOLBAR.ACTIONS.redo') {
-                        services.$scope.safeApply(function () {
-                            item.enabled = true;
-                        });
-                    }
-                }
-            }
-        },
-
-        redo: function (services) {
-
-            // Get the last commands from the redo stack
-            var lastCommands = services.$scope.redoStack.pop();
-
-            if (lastCommands) {
-                // Add this commands to the undo stack
-                services.$scope.undoStack.push(lastCommands);
-                
-                // Force refresh of selection, might be that the redo command
-                // impacts properties in the selected item
-                if (services.$rootScope && services.$rootScope.forceSelectionRefresh) 
-                {
-                	services.$rootScope.forceSelectionRefresh = true;
-                }
-
-                // Execute those commands
-                lastCommands.each(function (command) {
-                    command.execute();
-                });
-
-                // Update and refresh the canvas
-                services.$scope.editor.handleEvents({
-                    type: ORYX.CONFIG.EVENT_UNDO_EXECUTE,
-                    commands: lastCommands
-                });
-
-                // Update
-                services.$scope.editor.getCanvas().update();
-                services.$scope.editor.updateSelection();
-            }
-
-            var toggleUndo = false;
-            if (services.$scope.undoStack.length > 0) {
-                toggleUndo = true;
-            }
-
-            var toggleRedo = false;
-            if (services.$scope.redoStack.length == 0) {
-                toggleRedo = true;
-            }
-
-            if (toggleUndo || toggleRedo) {
-                for (var i = 0; i < services.$scope.items.length; i++) {
-                    var item = services.$scope.items[i];
-                    if (toggleUndo && item.action === 'KISBPM.TOOLBAR.ACTIONS.undo') {
-                        services.$scope.safeApply(function () {
-                            item.enabled = true;
-                        });
-                    }
-                    else if (toggleRedo && item.action === 'KISBPM.TOOLBAR.ACTIONS.redo') {
-                        services.$scope.safeApply(function () {
-                            item.enabled = false;
-                        });
-                    }
-                }
-            }
-        },
-
-        cut: function (services) {
-            KISBPM.TOOLBAR.ACTIONS._getOryxEditPlugin(services.$scope).editCut();
-            for (var i = 0; i < services.$scope.items.length; i++) {
-                var item = services.$scope.items[i];
-                if (item.action === 'KISBPM.TOOLBAR.ACTIONS.paste') {
-                    services.$scope.safeApply(function () {
-                        item.enabled = true;
-                    });
-                }
-            }
-        },
-
-        copy: function (services) {
-            KISBPM.TOOLBAR.ACTIONS._getOryxEditPlugin(services.$scope).editCopy();
-            for (var i = 0; i < services.$scope.items.length; i++) {
-                var item = services.$scope.items[i];
-                if (item.action === 'KISBPM.TOOLBAR.ACTIONS.paste') {
-                    services.$scope.safeApply(function () {
-                        item.enabled = true;
-                    });
-                }
-            }
-        },
-
-        paste: function (services) {
-            KISBPM.TOOLBAR.ACTIONS._getOryxEditPlugin(services.$scope).editPaste();
-        },
-
-        deleteItem: function (services) {
-            KISBPM.TOOLBAR.ACTIONS._getOryxEditPlugin(services.$scope).editDelete();
-        },
-
-        addBendPoint: function (services) {
-
-            var dockerPlugin = KISBPM.TOOLBAR.ACTIONS._getOryxDockerPlugin(services.$scope);
-
-            var enableAdd = !dockerPlugin.enabledAdd();
-            dockerPlugin.setEnableAdd(enableAdd);
-            if (enableAdd)
-            {
-            	dockerPlugin.setEnableRemove(false);
-            	document.body.style.cursor = 'pointer';
-            }
-            else
-            {
-            	document.body.style.cursor = 'default';
-            }
-        },
-
-        removeBendPoint: function (services) {
-
-            var dockerPlugin = KISBPM.TOOLBAR.ACTIONS._getOryxDockerPlugin(services.$scope);
-
-            var enableRemove = !dockerPlugin.enabledRemove();
-            dockerPlugin.setEnableRemove(enableRemove);
-            if (enableRemove)
-            {
-            	dockerPlugin.setEnableAdd(false);
-            	document.body.style.cursor = 'pointer';
-            }
-            else
-            {
-            	document.body.style.cursor = 'default';
-            }
-        },
-
-        /**
-         * Helper method: fetches the Oryx Edit plugin from the provided scope,
-         * if not on the scope, it is created and put on the scope for further use.
-         *
-         * It's important to reuse the same EditPlugin while the same scope is active,
-         * as the clipboard is stored for the whole lifetime of the scope.
-         */
-        _getOryxEditPlugin: function ($scope) {
-            if ($scope.oryxEditPlugin === undefined || $scope.oryxEditPlugin === null) {
-                $scope.oryxEditPlugin = new ORYX.Plugins.Edit($scope.editor);
-            }
-            return $scope.oryxEditPlugin;
-        },
-
-        zoomIn: function (services) {
-            KISBPM.TOOLBAR.ACTIONS._getOryxViewPlugin(services.$scope).zoom([1.0 + ORYX.CONFIG.ZOOM_OFFSET]);
-        },
-
-        zoomOut: function (services) {
-            KISBPM.TOOLBAR.ACTIONS._getOryxViewPlugin(services.$scope).zoom([1.0 - ORYX.CONFIG.ZOOM_OFFSET]);
-        },
-        
-        zoomActual: function (services) {
-            KISBPM.TOOLBAR.ACTIONS._getOryxViewPlugin(services.$scope).setAFixZoomLevel(1);
-        },
-        
-        zoomFit: function (services) {
-        	KISBPM.TOOLBAR.ACTIONS._getOryxViewPlugin(services.$scope).zoomFitToModel();
-        },
-        
-        alignVertical: function (services) {
-        	KISBPM.TOOLBAR.ACTIONS._getOryxArrangmentPlugin(services.$scope).alignShapes([ORYX.CONFIG.EDITOR_ALIGN_MIDDLE]);
-        },
-        
-        alignHorizontal: function (services) {
-        	KISBPM.TOOLBAR.ACTIONS._getOryxArrangmentPlugin(services.$scope).alignShapes([ORYX.CONFIG.EDITOR_ALIGN_CENTER]);
-        },
-        
-        sameSize: function (services) {
-        	KISBPM.TOOLBAR.ACTIONS._getOryxArrangmentPlugin(services.$scope).alignShapes([ORYX.CONFIG.EDITOR_ALIGN_SIZE]);
-        },
-        
-        closeEditor: function(services) {
-          var index = parent.layer.getFrameIndex(window.name);
-          parent.layer.close(index);
-        },
-        
-        /**
-         * Helper method: fetches the Oryx View plugin from the provided scope,
-         * if not on the scope, it is created and put on the scope for further use.
-         */
-        _getOryxViewPlugin: function ($scope) {
-            if ($scope.oryxViewPlugin === undefined || $scope.oryxViewPlugin === null) {
-                $scope.oryxViewPlugin = new ORYX.Plugins.View($scope.editor);
-            }
-            return $scope.oryxViewPlugin;
-        },
-        
-        _getOryxArrangmentPlugin: function ($scope) {
-            if ($scope.oryxArrangmentPlugin === undefined || $scope.oryxArrangmentPlugin === null) {
-                $scope.oryxArrangmentPlugin = new ORYX.Plugins.Arrangement($scope.editor);
-            }
-            return $scope.oryxArrangmentPlugin;
-        },
-
-        _getOryxDockerPlugin: function ($scope) {
-            if ($scope.oryxDockerPlugin === undefined || $scope.oryxDockerPlugin === null) {
-                $scope.oryxDockerPlugin = new ORYX.Plugins.AddDocker($scope.editor);
-            }
-            return $scope.oryxDockerPlugin;
-        }
-    }
+	ACTIONS: {
+
+		saveModel: function (services) {
+
+			var modal = services.$modal({
+				backdrop: true,
+				keyboard: true,
+				template: 'editor-app/popups/save-model.html?version=' + Date.now(),
+				scope: services.$scope
+			});
+		},
+
+		undo: function (services) {
+
+			// Get the last commands
+			var lastCommands = services.$scope.undoStack.pop();
+
+			if (lastCommands) {
+				// Add the commands to the redo stack
+				services.$scope.redoStack.push(lastCommands);
+
+				// Force refresh of selection, might be that the undo command
+				// impacts properties in the selected item
+				if (services.$rootScope && services.$rootScope.forceSelectionRefresh) {
+					services.$rootScope.forceSelectionRefresh = true;
+				}
+
+				// Rollback every command
+				for (var i = lastCommands.length - 1; i >= 0; --i) {
+					lastCommands[i].rollback();
+				}
+
+				// Update and refresh the canvas
+				services.$scope.editor.handleEvents({
+					type: ORYX.CONFIG.EVENT_UNDO_ROLLBACK,
+					commands: lastCommands
+				});
+
+				// Update
+				services.$scope.editor.getCanvas().update();
+				services.$scope.editor.updateSelection();
+			}
+
+			var toggleUndo = false;
+			if (services.$scope.undoStack.length == 0) {
+				toggleUndo = true;
+			}
+
+			var toggleRedo = false;
+			if (services.$scope.redoStack.length > 0) {
+				toggleRedo = true;
+			}
+
+			if (toggleUndo || toggleRedo) {
+				for (var i = 0; i < services.$scope.items.length; i++) {
+					var item = services.$scope.items[i];
+					if (toggleUndo && item.action === 'KISBPM.TOOLBAR.ACTIONS.undo') {
+						services.$scope.safeApply(function () {
+							item.enabled = false;
+						});
+					} else if (toggleRedo && item.action === 'KISBPM.TOOLBAR.ACTIONS.redo') {
+						services.$scope.safeApply(function () {
+							item.enabled = true;
+						});
+					}
+				}
+			}
+		},
+
+		redo: function (services) {
+
+			// Get the last commands from the redo stack
+			var lastCommands = services.$scope.redoStack.pop();
+
+			if (lastCommands) {
+				// Add this commands to the undo stack
+				services.$scope.undoStack.push(lastCommands);
+
+				// Force refresh of selection, might be that the redo command
+				// impacts properties in the selected item
+				if (services.$rootScope && services.$rootScope.forceSelectionRefresh) {
+					services.$rootScope.forceSelectionRefresh = true;
+				}
+
+				// Execute those commands
+				lastCommands.each(function (command) {
+					command.execute();
+				});
+
+				// Update and refresh the canvas
+				services.$scope.editor.handleEvents({
+					type: ORYX.CONFIG.EVENT_UNDO_EXECUTE,
+					commands: lastCommands
+				});
+
+				// Update
+				services.$scope.editor.getCanvas().update();
+				services.$scope.editor.updateSelection();
+			}
+
+			var toggleUndo = false;
+			if (services.$scope.undoStack.length > 0) {
+				toggleUndo = true;
+			}
+
+			var toggleRedo = false;
+			if (services.$scope.redoStack.length == 0) {
+				toggleRedo = true;
+			}
+
+			if (toggleUndo || toggleRedo) {
+				for (var i = 0; i < services.$scope.items.length; i++) {
+					var item = services.$scope.items[i];
+					if (toggleUndo && item.action === 'KISBPM.TOOLBAR.ACTIONS.undo') {
+						services.$scope.safeApply(function () {
+							item.enabled = true;
+						});
+					} else if (toggleRedo && item.action === 'KISBPM.TOOLBAR.ACTIONS.redo') {
+						services.$scope.safeApply(function () {
+							item.enabled = false;
+						});
+					}
+				}
+			}
+		},
+
+		cut: function (services) {
+			KISBPM.TOOLBAR.ACTIONS._getOryxEditPlugin(services.$scope).editCut();
+			for (var i = 0; i < services.$scope.items.length; i++) {
+				var item = services.$scope.items[i];
+				if (item.action === 'KISBPM.TOOLBAR.ACTIONS.paste') {
+					services.$scope.safeApply(function () {
+						item.enabled = true;
+					});
+				}
+			}
+		},
+
+		copy: function (services) {
+			KISBPM.TOOLBAR.ACTIONS._getOryxEditPlugin(services.$scope).editCopy();
+			for (var i = 0; i < services.$scope.items.length; i++) {
+				var item = services.$scope.items[i];
+				if (item.action === 'KISBPM.TOOLBAR.ACTIONS.paste') {
+					services.$scope.safeApply(function () {
+						item.enabled = true;
+					});
+				}
+			}
+		},
+
+		paste: function (services) {
+			KISBPM.TOOLBAR.ACTIONS._getOryxEditPlugin(services.$scope).editPaste();
+		},
+
+		deleteItem: function (services) {
+			KISBPM.TOOLBAR.ACTIONS._getOryxEditPlugin(services.$scope).editDelete();
+		},
+
+		addBendPoint: function (services) {
+
+			var dockerPlugin = KISBPM.TOOLBAR.ACTIONS._getOryxDockerPlugin(services.$scope);
+
+			var enableAdd = !dockerPlugin.enabledAdd();
+			dockerPlugin.setEnableAdd(enableAdd);
+			if (enableAdd) {
+				dockerPlugin.setEnableRemove(false);
+				document.body.style.cursor = 'pointer';
+			} else {
+				document.body.style.cursor = 'default';
+			}
+		},
+
+		removeBendPoint: function (services) {
+
+			var dockerPlugin = KISBPM.TOOLBAR.ACTIONS._getOryxDockerPlugin(services.$scope);
+
+			var enableRemove = !dockerPlugin.enabledRemove();
+			dockerPlugin.setEnableRemove(enableRemove);
+			if (enableRemove) {
+				dockerPlugin.setEnableAdd(false);
+				document.body.style.cursor = 'pointer';
+			} else {
+				document.body.style.cursor = 'default';
+			}
+		},
+
+		/**
+		 * Helper method: fetches the Oryx Edit plugin from the provided scope,
+		 * if not on the scope, it is created and put on the scope for further use.
+		 *
+		 * It's important to reuse the same EditPlugin while the same scope is active,
+		 * as the clipboard is stored for the whole lifetime of the scope.
+		 */
+		_getOryxEditPlugin: function ($scope) {
+			if ($scope.oryxEditPlugin === undefined || $scope.oryxEditPlugin === null) {
+				$scope.oryxEditPlugin = new ORYX.Plugins.Edit($scope.editor);
+			}
+			return $scope.oryxEditPlugin;
+		},
+
+		zoomIn: function (services) {
+			KISBPM.TOOLBAR.ACTIONS._getOryxViewPlugin(services.$scope).zoom([1.0 + ORYX.CONFIG.ZOOM_OFFSET]);
+		},
+
+		zoomOut: function (services) {
+			KISBPM.TOOLBAR.ACTIONS._getOryxViewPlugin(services.$scope).zoom([1.0 - ORYX.CONFIG.ZOOM_OFFSET]);
+		},
+
+		zoomActual: function (services) {
+			KISBPM.TOOLBAR.ACTIONS._getOryxViewPlugin(services.$scope).setAFixZoomLevel(1);
+		},
+
+		zoomFit: function (services) {
+			KISBPM.TOOLBAR.ACTIONS._getOryxViewPlugin(services.$scope).zoomFitToModel();
+		},
+
+		alignVertical: function (services) {
+			KISBPM.TOOLBAR.ACTIONS._getOryxArrangmentPlugin(services.$scope).alignShapes([ORYX.CONFIG.EDITOR_ALIGN_MIDDLE]);
+		},
+
+		alignHorizontal: function (services) {
+			KISBPM.TOOLBAR.ACTIONS._getOryxArrangmentPlugin(services.$scope).alignShapes([ORYX.CONFIG.EDITOR_ALIGN_CENTER]);
+		},
+
+		sameSize: function (services) {
+			KISBPM.TOOLBAR.ACTIONS._getOryxArrangmentPlugin(services.$scope).alignShapes([ORYX.CONFIG.EDITOR_ALIGN_SIZE]);
+		},
+
+		closeEditor: function (services) {
+			var index = parent.layer.getFrameIndex(window.name);
+			parent.layer.close(index);
+		},
+
+		/**
+		 * Helper method: fetches the Oryx View plugin from the provided scope,
+		 * if not on the scope, it is created and put on the scope for further use.
+		 */
+		_getOryxViewPlugin: function ($scope) {
+			if ($scope.oryxViewPlugin === undefined || $scope.oryxViewPlugin === null) {
+				$scope.oryxViewPlugin = new ORYX.Plugins.View($scope.editor);
+			}
+			return $scope.oryxViewPlugin;
+		},
+
+		_getOryxArrangmentPlugin: function ($scope) {
+			if ($scope.oryxArrangmentPlugin === undefined || $scope.oryxArrangmentPlugin === null) {
+				$scope.oryxArrangmentPlugin = new ORYX.Plugins.Arrangement($scope.editor);
+			}
+			return $scope.oryxArrangmentPlugin;
+		},
+
+		_getOryxDockerPlugin: function ($scope) {
+			if ($scope.oryxDockerPlugin === undefined || $scope.oryxDockerPlugin === null) {
+				$scope.oryxDockerPlugin = new ORYX.Plugins.AddDocker($scope.editor);
+			}
+			return $scope.oryxDockerPlugin;
+		}
+	}
 };
 
 /** Custom controller for the save dialog */
-var SaveModelCtrl = [ '$rootScope', '$scope', '$http', '$route', '$location',
-    function ($rootScope, $scope, $http, $route, $location) {
-
-    var modelMetaData = $scope.editor.getModelMetaData();
-
-    var description = '';
-    if (modelMetaData.description) {
-    	description = modelMetaData.description;
-    }
-    
-    var saveDialog = { 'name' : modelMetaData.name,
-            'description' : description};
-    
-    $scope.saveDialog = saveDialog;
-    
-    var json = $scope.editor.getJSON();
-    json = JSON.stringify(json);
-
-    var params = {
-        modeltype: modelMetaData.model.modelType,
-        json_xml: json,
-        name: 'model'
-    };
-
-    $scope.status = {
-        loading: false
-    };
-
-    $scope.close = function () {
-    	$scope.$hide();
-    };
-
-    $scope.saveAndClose = function () {
-    	$scope.save(function() {
-        var index = parent.layer.getFrameIndex(window.name);
-        parent.layer.close(index);
-    	});
-    };
-    $scope.save = function (successCallback) {
-
-        if (!$scope.saveDialog.name || $scope.saveDialog.name.length == 0) {
-            return;
-        }
-
-        // Indicator spinner image
-        $scope.status = {
-        	loading: true
-        };
-        
-        modelMetaData.name = $scope.saveDialog.name;
-        modelMetaData.description = $scope.saveDialog.description;
-
-        var json = $scope.editor.getJSON();
-        json = JSON.stringify(json);
-        
-        var selection = $scope.editor.getSelection();
-        $scope.editor.setSelection([]);
-        
-        // Get the serialized svg image source
-        var svgClone = $scope.editor.getCanvas().getSVGRepresentation(true);
-        $scope.editor.setSelection(selection);
-        if ($scope.editor.getCanvas().properties["oryx-showstripableelements"] === false) {
-            var stripOutArray = jQuery(svgClone).find(".stripable-element");
-            for (var i = stripOutArray.length - 1; i >= 0; i--) {
-            	stripOutArray[i].remove();
-            }
-        }
-
-        // Remove all forced stripable elements
-        var stripOutArray = jQuery(svgClone).find(".stripable-element-force");
-        for (var i = stripOutArray.length - 1; i >= 0; i--) {
-            stripOutArray[i].remove();
-        }
-
-        // Parse dom to string
-        var svgDOM = DataManager.serialize(svgClone);
-
-        var params = {
-            json_xml: json,
-            svg_xml: svgDOM,
-            name: $scope.saveDialog.name,
-            description: $scope.saveDialog.description
-        };
-        console.info('json_xml:'+json);
-        // Update
-        $http({    method: 'POST',
-            data:params,
-            ignoreErrors: true,
-            headers: {'Accept': 'application/json',
-                      'Content-Type': 'application/x-www-form-urlencoded'},
-        ransformRequest: function (obj) {
-                var str = [];
-                for (var p in obj) {
-                    str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
-                }
-                return str.join("&");
-            },
-          url: KISBPM.URL.putModel(modelMetaData.modelId)})
-
-            .success(function (data, status, headers, config) {
-                $scope.editor.handleEvents({
-                    type: ORYX.CONFIG.EVENT_SAVED
-                });
-                $scope.modelData.name = $scope.saveDialog.name;
-                $scope.modelData.lastUpdated = data.lastUpdated;
-                
-                $scope.status.loading = false;
-                $scope.$hide();
-
-                // Fire event to all who is listening
-                var saveEvent = {
-                    type: KISBPM.eventBus.EVENT_TYPE_MODEL_SAVED,
-                    model: params,
-                    modelId: modelMetaData.modelId,
-		            eventType: 'update-model'
-                };
-                KISBPM.eventBus.dispatch(KISBPM.eventBus.EVENT_TYPE_MODEL_SAVED, saveEvent);
-
-                // Reset state
-                $scope.error = undefined;
-                $scope.status.loading = false;
-
-                // Execute any callback
-                if (successCallback) {
-                    successCallback();
-                }
-
-            })
-            .error(function (data, status, headers, config) {
-                $scope.error = {};
-                console.log('Something went wrong when updating the process model:' + JSON.stringify(data));
-                $scope.status.loading = false;
-            });
-    };
-
-}];
\ No newline at end of file
+var SaveModelCtrl = ['$rootScope', '$scope', '$http', '$route', '$location',
+	function ($rootScope, $scope, $http, $route, $location) {
+
+		var modelMetaData = $scope.editor.getModelMetaData();
+
+		var description = '';
+		if (modelMetaData.description) {
+			description = modelMetaData.description;
+		}
+
+		var saveDialog = {
+			'name': modelMetaData.name,
+			'description': description
+		};
+
+		$scope.saveDialog = saveDialog;
+
+		var json = $scope.editor.getJSON();
+		json = JSON.stringify(json);
+
+		var params = {
+			modeltype: modelMetaData.model.modelType,
+			json_xml: json,
+			name: 'model'
+		};
+
+		$scope.status = {
+			loading: false
+		};
+
+		$scope.close = function () {
+			$scope.$hide();
+		};
+
+		$scope.saveAndClose = function () {
+			$scope.save(function () {
+				var index = parent.layer.getFrameIndex(window.name);
+				parent.layer.close(index);
+			});
+		};
+		$scope.save = function (successCallback) {
+
+			if (!$scope.saveDialog.name || $scope.saveDialog.name.length == 0) {
+				return;
+			}
+
+			// Indicator spinner image
+			$scope.status = {
+				loading: true
+			};
+
+			modelMetaData.name = $scope.saveDialog.name;
+			modelMetaData.description = $scope.saveDialog.description;
+
+			var json = $scope.editor.getJSON();
+			json = JSON.stringify(json);
+
+			var selection = $scope.editor.getSelection();
+			$scope.editor.setSelection([]);
+
+			// Get the serialized svg image source
+			var svgClone = $scope.editor.getCanvas().getSVGRepresentation(true);
+			$scope.editor.setSelection(selection);
+			if ($scope.editor.getCanvas().properties["oryx-showstripableelements"] === false) {
+				var stripOutArray = jQuery(svgClone).find(".stripable-element");
+				for (var i = stripOutArray.length - 1; i >= 0; i--) {
+					stripOutArray[i].remove();
+				}
+			}
+
+			// Remove all forced stripable elements
+			var stripOutArray = jQuery(svgClone).find(".stripable-element-force");
+			for (var i = stripOutArray.length - 1; i >= 0; i--) {
+				stripOutArray[i].remove();
+			}
+
+			// Parse dom to string
+			var svgDOM = DataManager.serialize(svgClone);
+
+			var params = {
+				json_xml: json,
+				svg_xml: svgDOM,
+				name: $scope.saveDialog.name,
+				description: $scope.saveDialog.description
+			};
+			console.info('json_xml:' + json);
+			// Update
+			$http({
+				method: 'POST',
+				data: params,
+				ignoreErrors: true,
+				headers: {
+					'Accept': 'application/json',
+					'Content-Type': 'application/x-www-form-urlencoded'
+				},
+				ransformRequest: function (obj) {
+					var str = [];
+					for (var p in obj) {
+						str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
+					}
+					return str.join("&");
+				},
+				url: KISBPM.URL.putModel(modelMetaData.modelId)
+			})
+
+				.success(function (data, status, headers, config) {
+					$scope.editor.handleEvents({
+						type: ORYX.CONFIG.EVENT_SAVED
+					});
+					$scope.modelData.name = $scope.saveDialog.name;
+					$scope.modelData.lastUpdated = data.lastUpdated;
+
+					$scope.status.loading = false;
+					$scope.$hide();
+
+					// Fire event to all who is listening
+					var saveEvent = {
+						type: KISBPM.eventBus.EVENT_TYPE_MODEL_SAVED,
+						model: params,
+						modelId: modelMetaData.modelId,
+						eventType: 'update-model'
+					};
+					KISBPM.eventBus.dispatch(KISBPM.eventBus.EVENT_TYPE_MODEL_SAVED, saveEvent);
+
+					// Reset state
+					$scope.error = undefined;
+					$scope.status.loading = false;
+
+					// Execute any callback
+					if (successCallback) {
+						successCallback();
+					}
+
+				})
+				.error(function (data, status, headers, config) {
+					$scope.error = {};
+					console.log('Something went wrong when updating the process model:' + JSON.stringify(data));
+					$scope.status.loading = false;
+				});
+		};
+
+	}];
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/toolbar.js b/len-activiti/src/main/resources/static/editor-app/configuration/toolbar.js
index f091598..c85ab4e 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/toolbar.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/toolbar.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -20,156 +20,156 @@
 
 var KISBPM = KISBPM || {};
 KISBPM.TOOLBAR_CONFIG = {
-    "items" : [
-        {
-            "type" : "button",
-            "title" : "TOOLBAR.ACTION.SAVE",
-            "cssClass" : "editor-icon editor-icon-save",
-            "action" : "KISBPM.TOOLBAR.ACTIONS.saveModel"
-        },
-        {
-            "type" : "separator",
-            "title" : "",
-            "cssClass" : "toolbar-separator"
-        },
-        {
-            "type" : "button",
-            "title" : "TOOLBAR.ACTION.CUT",
-            "cssClass" : "editor-icon editor-icon-cut",
-            "action" : "KISBPM.TOOLBAR.ACTIONS.cut",
-            "enabled" : false,
-            "enabledAction" : "element"
-        },
-        {
-            "type" : "button",
-            "title" : "TOOLBAR.ACTION.COPY",
-            "cssClass" : "editor-icon editor-icon-copy",
-            "action" : "KISBPM.TOOLBAR.ACTIONS.copy",
-            "enabled" : false,
-            "enabledAction" : "element"
-        },
-        {
-            "type" : "button",
-            "title" : "TOOLBAR.ACTION.PASTE",
-            "cssClass" : "editor-icon editor-icon-paste",
-            "action" : "KISBPM.TOOLBAR.ACTIONS.paste",
-            "enabled" : false
-        },
-        {
-            "type" : "button",
-            "title" : "TOOLBAR.ACTION.DELETE",
-            "cssClass" : "editor-icon editor-icon-delete",
-            "action" : "KISBPM.TOOLBAR.ACTIONS.deleteItem",
-            "enabled" : false,
-            "enabledAction" : "element"
-        },
-        {
-            "type" : "separator",
-            "title" : "TOOLBAR.ACTION.SAVE",
-            "cssClass" : "toolbar-separator"
-        },
-        {
-            "type" : "button",
-            "title" : "TOOLBAR.ACTION.REDO",
-            "cssClass" : "editor-icon editor-icon-redo",
-            "action" : "KISBPM.TOOLBAR.ACTIONS.redo",
-            "enabled" : false
-        },
-        {
-            "type" : "button",
-            "title" : "TOOLBAR.ACTION.UNDO",
-            "cssClass" : "editor-icon editor-icon-undo",
-            "action" : "KISBPM.TOOLBAR.ACTIONS.undo",
-            "enabled" : false
-        },
-        {
-            "type" : "separator",
-            "title" : "TOOLBAR.ACTION.SAVE",
-            "cssClass" : "toolbar-separator"
-        },
-        {
-            "type" : "button",
-            "title" : "TOOLBAR.ACTION.ALIGNVERTICAL",
-            "cssClass" : "editor-icon editor-icon-align-vertical",
-            "action" : "KISBPM.TOOLBAR.ACTIONS.alignVertical",
-            "enabled" : false,
-            "enabledAction" : "element",
-            "minSelectionCount" : 2
-        },
-        {
-            "type" : "button",
-            "title" : "TOOLBAR.ACTION.ALIGNHORIZONTAL",
-            "cssClass" : "editor-icon editor-icon-align-horizontal",
-            "action" : "KISBPM.TOOLBAR.ACTIONS.alignHorizontal",
-            "enabledAction" : "element",
-            "enabled" : false,
-            "minSelectionCount" : 2
-        },
-        {
-            "type" : "button",
-            "title" : "TOOLBAR.ACTION.SAMESIZE",
-            "cssClass" : "editor-icon editor-icon-same-size",
-            "action" : "KISBPM.TOOLBAR.ACTIONS.sameSize",
-            "enabledAction" : "element",
-            "enabled" : false,
-            "minSelectionCount" : 2
-        },
-        {
-        	"type" : "separator",
-        	"title" : "TOOLBAR.ACTION.SAVE",
-        	"cssClass" : "toolbar-separator"
-        },
-        {
-            "type" : "button",
-            "title" : "TOOLBAR.ACTION.ZOOMIN",
-            "cssClass" : "editor-icon editor-icon-zoom-in",
-            "action" : "KISBPM.TOOLBAR.ACTIONS.zoomIn"
-        },
-        {
-            "type" : "button",
-            "title" : "TOOLBAR.ACTION.ZOOMOUT",
-            "cssClass" : "editor-icon editor-icon-zoom-out",
-            "action" : "KISBPM.TOOLBAR.ACTIONS.zoomOut"
-        },
-        {
-            "type" : "button",
-            "title" : "TOOLBAR.ACTION.ZOOMACTUAL",
-            "cssClass" : "editor-icon editor-icon-zoom-actual",
-            "action" : "KISBPM.TOOLBAR.ACTIONS.zoomActual"
-        },
-        {
-            "type" : "button",
-            "title" : "TOOLBAR.ACTION.ZOOMFIT",
-            "cssClass" : "editor-icon editor-icon-zoom-fit",
-            "action" : "KISBPM.TOOLBAR.ACTIONS.zoomFit"
-        },
-        {
-            "type" : "separator",
-            "title" : "TOOLBAR.ACTION.SAVE",
-            "cssClass" : "toolbar-separator"
-        },
-    	{
-            "type" : "button",
-            "title" : "TOOLBAR.ACTION.BENDPOINT.ADD",
-            "cssClass" : "editor-icon editor-icon-bendpoint-add",
-            "action" : "KISBPM.TOOLBAR.ACTIONS.addBendPoint",
-            "id" : "add-bendpoint-button"
-    	},
-    	{
-    	    "type" : "button",
-    	    "title" : "TOOLBAR.ACTION.BENDPOINT.REMOVE",
-    	    "cssClass" : "editor-icon editor-icon-bendpoint-remove",
-    	    "action" : "KISBPM.TOOLBAR.ACTIONS.removeBendPoint",
-    	    "id" : "remove-bendpoint-button"
-    	}
-    ],
-    
-    "secondaryItems" : [
-		{
-		    "type" : "button",
-		    "title" : "Close",
-		    "cssClass" : "editor-icon editor-icon-close",
-		    "action" : "KISBPM.TOOLBAR.ACTIONS.closeEditor"
+	"items": [
+		{
+			"type": "button",
+			"title": "TOOLBAR.ACTION.SAVE",
+			"cssClass": "editor-icon editor-icon-save",
+			"action": "KISBPM.TOOLBAR.ACTIONS.saveModel"
+		},
+		{
+			"type": "separator",
+			"title": "",
+			"cssClass": "toolbar-separator"
+		},
+		{
+			"type": "button",
+			"title": "TOOLBAR.ACTION.CUT",
+			"cssClass": "editor-icon editor-icon-cut",
+			"action": "KISBPM.TOOLBAR.ACTIONS.cut",
+			"enabled": false,
+			"enabledAction": "element"
+		},
+		{
+			"type": "button",
+			"title": "TOOLBAR.ACTION.COPY",
+			"cssClass": "editor-icon editor-icon-copy",
+			"action": "KISBPM.TOOLBAR.ACTIONS.copy",
+			"enabled": false,
+			"enabledAction": "element"
+		},
+		{
+			"type": "button",
+			"title": "TOOLBAR.ACTION.PASTE",
+			"cssClass": "editor-icon editor-icon-paste",
+			"action": "KISBPM.TOOLBAR.ACTIONS.paste",
+			"enabled": false
+		},
+		{
+			"type": "button",
+			"title": "TOOLBAR.ACTION.DELETE",
+			"cssClass": "editor-icon editor-icon-delete",
+			"action": "KISBPM.TOOLBAR.ACTIONS.deleteItem",
+			"enabled": false,
+			"enabledAction": "element"
+		},
+		{
+			"type": "separator",
+			"title": "TOOLBAR.ACTION.SAVE",
+			"cssClass": "toolbar-separator"
+		},
+		{
+			"type": "button",
+			"title": "TOOLBAR.ACTION.REDO",
+			"cssClass": "editor-icon editor-icon-redo",
+			"action": "KISBPM.TOOLBAR.ACTIONS.redo",
+			"enabled": false
+		},
+		{
+			"type": "button",
+			"title": "TOOLBAR.ACTION.UNDO",
+			"cssClass": "editor-icon editor-icon-undo",
+			"action": "KISBPM.TOOLBAR.ACTIONS.undo",
+			"enabled": false
+		},
+		{
+			"type": "separator",
+			"title": "TOOLBAR.ACTION.SAVE",
+			"cssClass": "toolbar-separator"
+		},
+		{
+			"type": "button",
+			"title": "TOOLBAR.ACTION.ALIGNVERTICAL",
+			"cssClass": "editor-icon editor-icon-align-vertical",
+			"action": "KISBPM.TOOLBAR.ACTIONS.alignVertical",
+			"enabled": false,
+			"enabledAction": "element",
+			"minSelectionCount": 2
+		},
+		{
+			"type": "button",
+			"title": "TOOLBAR.ACTION.ALIGNHORIZONTAL",
+			"cssClass": "editor-icon editor-icon-align-horizontal",
+			"action": "KISBPM.TOOLBAR.ACTIONS.alignHorizontal",
+			"enabledAction": "element",
+			"enabled": false,
+			"minSelectionCount": 2
+		},
+		{
+			"type": "button",
+			"title": "TOOLBAR.ACTION.SAMESIZE",
+			"cssClass": "editor-icon editor-icon-same-size",
+			"action": "KISBPM.TOOLBAR.ACTIONS.sameSize",
+			"enabledAction": "element",
+			"enabled": false,
+			"minSelectionCount": 2
+		},
+		{
+			"type": "separator",
+			"title": "TOOLBAR.ACTION.SAVE",
+			"cssClass": "toolbar-separator"
+		},
+		{
+			"type": "button",
+			"title": "TOOLBAR.ACTION.ZOOMIN",
+			"cssClass": "editor-icon editor-icon-zoom-in",
+			"action": "KISBPM.TOOLBAR.ACTIONS.zoomIn"
+		},
+		{
+			"type": "button",
+			"title": "TOOLBAR.ACTION.ZOOMOUT",
+			"cssClass": "editor-icon editor-icon-zoom-out",
+			"action": "KISBPM.TOOLBAR.ACTIONS.zoomOut"
+		},
+		{
+			"type": "button",
+			"title": "TOOLBAR.ACTION.ZOOMACTUAL",
+			"cssClass": "editor-icon editor-icon-zoom-actual",
+			"action": "KISBPM.TOOLBAR.ACTIONS.zoomActual"
+		},
+		{
+			"type": "button",
+			"title": "TOOLBAR.ACTION.ZOOMFIT",
+			"cssClass": "editor-icon editor-icon-zoom-fit",
+			"action": "KISBPM.TOOLBAR.ACTIONS.zoomFit"
+		},
+		{
+			"type": "separator",
+			"title": "TOOLBAR.ACTION.SAVE",
+			"cssClass": "toolbar-separator"
+		},
+		{
+			"type": "button",
+			"title": "TOOLBAR.ACTION.BENDPOINT.ADD",
+			"cssClass": "editor-icon editor-icon-bendpoint-add",
+			"action": "KISBPM.TOOLBAR.ACTIONS.addBendPoint",
+			"id": "add-bendpoint-button"
+		},
+		{
+			"type": "button",
+			"title": "TOOLBAR.ACTION.BENDPOINT.REMOVE",
+			"cssClass": "editor-icon editor-icon-bendpoint-remove",
+			"action": "KISBPM.TOOLBAR.ACTIONS.removeBendPoint",
+			"id": "remove-bendpoint-button"
+		}
+	],
+
+	"secondaryItems": [
+		{
+			"type": "button",
+			"title": "Close",
+			"cssClass": "editor-icon editor-icon-close",
+			"action": "KISBPM.TOOLBAR.ACTIONS.closeEditor"
 		}
-    ]
-};
\ No newline at end of file
+	]
+};
diff --git a/len-activiti/src/main/resources/static/editor-app/configuration/url-config.js b/len-activiti/src/main/resources/static/editor-app/configuration/url-config.js
index e0eb851..2dddd18 100644
--- a/len-activiti/src/main/resources/static/editor-app/configuration/url-config.js
+++ b/len-activiti/src/main/resources/static/editor-app/configuration/url-config.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -20,15 +20,15 @@ var KISBPM = KISBPM || {};
 
 KISBPM.URL = {
 
-    getModel: function(modelId) {
-        return ACTIVITI.CONFIG.contextRoot + '/model/' + modelId + '/json';
-    },
+	getModel: function (modelId) {
+		return ACTIVITI.CONFIG.contextRoot + '/model/' + modelId + '/json';
+	},
 
-    getStencilSet: function() {
-        return ACTIVITI.CONFIG.contextRoot + '/editor/stencilset?version=' + Date.now();
-    },
+	getStencilSet: function () {
+		return ACTIVITI.CONFIG.contextRoot + '/editor/stencilset?version=' + Date.now();
+	},
 
-    putModel: function(modelId) {
-        return ACTIVITI.CONFIG.contextRoot + '/model/' + modelId + '/save';
-    }
-};
\ No newline at end of file
+	putModel: function (modelId) {
+		return ACTIVITI.CONFIG.contextRoot + '/model/' + modelId + '/save';
+	}
+};
diff --git a/len-activiti/src/main/resources/static/editor-app/css/style-common.css b/len-activiti/src/main/resources/static/editor-app/css/style-common.css
index ada78a8..5f09856 100644
--- a/len-activiti/src/main/resources/static/editor-app/css/style-common.css
+++ b/len-activiti/src/main/resources/static/editor-app/css/style-common.css
@@ -11,842 +11,851 @@
 */
 
 .form-control {
-    -webkit-border-radius: 0;
-    -moz-border-radius: 0;
-    border-radius: 0;
-    padding: 4px 8px;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+	padding: 4px 8px;
 }
 
 body {
-    font-family: 'Lato', sans-serif;
+	font-family: 'Lato', sans-serif;
 }
 
 .label {
-    font-size: 18px;
-    font-weight: normal;
-    margin-bottom: 0;
-    color: #1a1a1a;
+	font-size: 18px;
+	font-weight: normal;
+	margin-bottom: 0;
+	color: #1a1a1a;
 }
 
 .subtle {
-    color: #999999;
-    font-size: 13px;
+	color: #999999;
+	font-size: 13px;
 }
 
 
 .simple-list {
-    list-style: none inside;
-    padding: 0;
-    margin: 5px 0;
+	list-style: none inside;
+	padding: 0;
+	margin: 5px 0;
 }
 
 .simple-list.pack {
-    max-height: 250px;
-    overflow: auto;
+	max-height: 250px;
+	overflow: auto;
 }
 
 .simple-list li {
-    padding: 6px;
-    position: relative;
+	padding: 6px;
+	position: relative;
 }
 
 .simple-list li > .icon {
-    padding-right: 5px;
+	padding-right: 5px;
 }
 
 .simple-list li:hover {
-    background-color:  #f8f8f9;
+	background-color: #f8f8f9;
 }
 
 .simple-list li.nothing-to-see:hover {
-    background-color:  transparent;
+	background-color: transparent;
 }
 
 .simple-list li.active {
-    background-color:  #eeeeee;
+	background-color: #eeeeee;
 }
 
-.simple-list li >.actions {
-    visibility: hidden;
-    position: absolute;
-    top: 3px;
-    right: 5px;
-    font-size: 20px;
-    background-color: #f8f8f9;
-    padding: 0 0 0 4px;
+.simple-list li > .actions {
+	visibility: hidden;
+	position: absolute;
+	top: 3px;
+	right: 5px;
+	font-size: 20px;
+	background-color: #f8f8f9;
+	padding: 0 0 0 4px;
 }
 
-.simple-list li >.actions a {
-    padding: 4px 4px 0 4px;
+.simple-list li > .actions a {
+	padding: 4px 4px 0 4px;
 }
 
-.simple-list li >.actions a:hover {
-    background-color: #ffffff;
+.simple-list li > .actions a:hover {
+	background-color: #ffffff;
 }
 
-.simple-list li:hover >.actions {
-    visibility: visible;
+.simple-list li:hover > .actions {
+	visibility: visible;
 }
 
 .simple-list.grid li {
-    border-bottom: 1px solid #eeeeee;
+	border-bottom: 1px solid #eeeeee;
 }
 
 .simple-list.grid li:first-child {
-    border-top: 1px solid #eeeeee;
+	border-top: 1px solid #eeeeee;
 }
 
 .simple-list li .subtle {
-    color: #999999;
-    font-size: 13px;
+	color: #999999;
+	font-size: 13px;
 }
 
 .simple-list.selectable li {
-    cursor: pointer;
+	cursor: pointer;
 }
 
 .simple-list .loading {
-    position: absolute;
-    left: 50%;
-    margin-left: -15px;
-    line-height: 30px;
-    top: 8px;
-    z-index: 1030;
+	position: absolute;
+	left: 50%;
+	margin-left: -15px;
+	line-height: 30px;
+	top: 8px;
+	z-index: 1030;
 }
 
 
 .lt-ie9 .container {
-    display: none !important;
-    visibility: hidden !important;
+	display: none !important;
+	visibility: hidden !important;
 }
 
 .unsupported-browser {
-    margin: 60px 20px 20px 20px;
+	margin: 60px 20px 20px 20px;
 }
 
 a {
-    cursor: pointer;
+	cursor: pointer;
 }
 
 a:hover {
-    text-decoration: none;
+	text-decoration: none;
 }
 
 label {
-    font-weight: normal;
-    color: #636363;
-    font-size: 14px;
+	font-weight: normal;
+	color: #636363;
+	font-size: 14px;
 }
 
-[ng\:cloak], [ng-cloak], .ng-cloak { display: none; }
+[ng\:cloak], [ng-cloak], .ng-cloak {
+	display: none;
+}
 
 .nothing-to-see {
-    padding: 5px 0 20px 0;
-    cursor: default;
+	padding: 5px 0 20px 0;
+	cursor: default;
 }
 
 .nothing-to-see span {
-    font-size: 14px;
-    color: #aaaaaa;
+	font-size: 14px;
+	color: #aaaaaa;
 }
 
 .fixed-container {
-    max-width: 1400px;
-    min-width: 1000px;
-    margin: 0 auto;
+	max-width: 1400px;
+	min-width: 1000px;
+	margin: 0 auto;
 }
 
 .well {
-    -moz-border-radius: 0;
-    -webkit-border-radius: 0;
-    border-radius: 0;
+	-moz-border-radius: 0;
+	-webkit-border-radius: 0;
+	border-radius: 0;
 }
 
 /** Buttons **/
 button.btn, a.btn {
-    /*background-color: #36a7c4;*/
-    background-color: #6dc469;
-    color: #ffffff;
-    border-color: #ffffff;
-    font-size: 15px;
+	/*background-color: #36a7c4;*/
+	background-color: #6dc469;
+	color: #ffffff;
+	border-color: #ffffff;
+	font-size: 15px;
 }
 
 button.btn-subtle, a.btn-subtle {
-    background-color: #fafafb;
-    color: #1a1a1a;
-    font-size: 15px;
+	background-color: #fafafb;
+	color: #1a1a1a;
+	font-size: 15px;
 }
 
 .btn-xs {
-    padding: 1px 8px;
+	padding: 1px 8px;
 }
 
 button.btn.btn-danger {
-    background-color: #d35f5f;
+	background-color: #d35f5f;
 }
 
 .btn.btn-danger:hover, .btn.btn-danger.active, .btn.btn-danger:focus {
-    background-color: #c83737;
+	background-color: #c83737;
 }
 
 .btn:hover, .btn.active, .btn:focus {
-    background-color: #2a8198;
-    border-color: #ffffff;
-    color: #ffffff;
+	background-color: #2a8198;
+	border-color: #ffffff;
+	color: #ffffff;
 }
 
 .btn.disabled, .btn[disabled], .btn[disabled]:active, .btn[disabled]:hover {
-    background-color: #668b94;
-    border-color: #668b94;
-    color: #ffffff;
+	background-color: #668b94;
+	border-color: #668b94;
+	color: #ffffff;
 }
 
 .btn-subtle:hover, .btn-subtle.active, .btn-subtle:focus {
-    background-color: #f6f6f7;
-    border-color: #ffffff;
-    color: #000000;
+	background-color: #f6f6f7;
+	border-color: #ffffff;
+	color: #000000;
 }
 
 .btn-subtle[disabled] {
-    background-color: #f6f6f7;
-    color: #555555;
+	background-color: #f6f6f7;
+	color: #555555;
 }
 
 .modal-header .btn, .header .btn {
-    border-color: #e8edf1;
+	border-color: #e8edf1;
 }
 
 .content {
-    padding: 0 10px;
-    overflow: auto;
+	padding: 0 10px;
+	overflow: auto;
 }
 
 .content.split {
 }
 
 .content .split-left {
-    float: left;
-    width: 60%;
-    padding: 0 10px 0 5px;
+	float: left;
+	width: 60%;
+	padding: 0 10px 0 5px;
 }
 
 .content .split-right {
-    float: right;
-    width: 40%;
-    padding: 0 0 0 15px;
+	float: right;
+	width: 40%;
+	padding: 0 0 0 15px;
 }
 
 
 .form-group .pull-right {
-    margin: 10px 0 0 5px;
+	margin: 10px 0 0 5px;
 }
 
 .form-group.box {
-    padding-bottom: 10px;
-    margin-bottom: 5px;
-    border-bottom: 1px dotted #eeeeee;
+	padding-bottom: 10px;
+	margin-bottom: 5px;
+	border-bottom: 1px dotted #eeeeee;
 }
 
 .form-group .marker {
-    font-size: 15px;
-    color: #666666;
+	font-size: 15px;
+	color: #666666;
 }
 
 /** Dropdowns and dropdown triggers */
 
 .dropdown-menu {
-    -webkit-border-radius: 0px;
-    -moz-border-radius: 0px;
-    border-radius: 0px;
-    box-shadow: none;
+	-webkit-border-radius: 0px;
+	-moz-border-radius: 0px;
+	border-radius: 0px;
+	box-shadow: none;
 }
 
 .dropdown-menu:focus {
-    outline: none;
+	outline: none;
 }
 
 .dropdown-menu > li > a:hover, .dropdown-menu > ul > li > a:hover {
-    /*background: #36a7c4;*/
-    background: #6dc469;
-    color: #ffffff;
+	/*background: #36a7c4;*/
+	background: #6dc469;
+	color: #ffffff;
 }
 
 
 .dropdown-menu > li.active > a, .dropdown-menu > li.active > a:hover {
-    background: #e8edf1;
-    color: #1a1a1a;
+	background: #e8edf1;
+	color: #1a1a1a;
 }
 
 .dropdown-menu > ul > li > a {
-    display: block;
-    text-decoration: none;
-    color: #1a1a1a;
-    padding: 5px;
-    cursor: pointer;
+	display: block;
+	text-decoration: none;
+	color: #1a1a1a;
+	padding: 5px;
+	cursor: pointer;
 }
 
 .dropdown-menu > ul {
-    padding: 10px;
+	padding: 10px;
 }
 
 .dropdown-menu.large-width {
-    min-width: 300px;
+	min-width: 300px;
 }
 
 a.dropdown-toggle {
-    color: #1a1a1a;
-    text-decoration: none;
+	color: #1a1a1a;
+	text-decoration: none;
 }
 
 .open a.dropdown-toggle, a.dropdown-toggle:hover {
-    /*color: #36a7c4;*/
-    color: #6dc469;
+	/*color: #36a7c4;*/
+	color: #6dc469;
 }
 
 .btn-group.open .dropdown-toggle {
-    -moz-box-shadow: none;
-    -webkit-box-shadow: none;
-    box-shadow: none;
+	-moz-box-shadow: none;
+	-webkit-box-shadow: none;
+	box-shadow: none;
 }
 
 /** Subtle dropdown (eg. sort) */
 
 .dropdown-subtle {
-    margin-right: 5px;
-    color: #606b7d;
+	margin-right: 5px;
+	color: #606b7d;
 }
 
 .dropdown-subtle .btn {
-    background: transparent;
-    line-height: 36px;
-    color: #606b7d;
-    padding: 0;
-    font-size: 14px;
-    border: none;
-    box-shadow: none;
-    -webkit-box-shadow: none;
-    -moz-box-shadow: none;
+	background: transparent;
+	line-height: 36px;
+	color: #606b7d;
+	padding: 0;
+	font-size: 14px;
+	border: none;
+	box-shadow: none;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
 }
 
 .dropdown-subtle .btn-group.open .dropdown-toggle {
-    box-shadow: none;
-    -webkit-box-shadow: none;
-    -moz-box-shadow: none;
+	box-shadow: none;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
 }
 
 .dropdown-subtle .btn:hover, .dropdown-subtle .btn:focus {
-    background: transparent;
-    color: #333333;
+	background: transparent;
+	color: #333333;
 }
 
 .dropdown-subtle a {
-    cursor: pointer;
+	cursor: pointer;
 }
 
 /** Popovers */
 .popover {
-    -moz-border-radius: 0;
-    -webkit-border-radius: 0;
-    border-radius: 0;
-    max-width: 400px;
-    min-width: 300px;
-    padding: 0px;
+	-moz-border-radius: 0;
+	-webkit-border-radius: 0;
+	border-radius: 0;
+	max-width: 400px;
+	min-width: 300px;
+	padding: 0px;
 }
 
 .popover.bottom-left, .popover.bottom-right {
-    margin-top: 10px;
+	margin-top: 10px;
 }
-.popover>.arrow, .popover>.arrow {
-    margin-left: -11px;
-    border-top-width: 0;
-    border-bottom-color: #999;
-    border-bottom-color: rgba(0,0,0,.25);
-    top: -11px;
+
+.popover > .arrow, .popover > .arrow {
+	margin-left: -11px;
+	border-top-width: 0;
+	border-bottom-color: #999;
+	border-bottom-color: rgba(0, 0, 0, .25);
+	top: -11px;
 
 }
 
-.popover.bottom-left>.arrow {
-    left: 40px;
+.popover.bottom-left > .arrow {
+	left: 40px;
 }
 
-.popover.bottom-right>.arrow {
-    right: 40px;
+.popover.bottom-right > .arrow {
+	right: 40px;
 }
 
-.popover.bottom-left>.arrow:after, .popover.bottom-right>.arrow:after, .popover.bottom>.arrow:after {
-    content: " ";
-    top: 1px;
-    margin-left: -10px;
-    border-top-width: 0;
-    border-bottom-color: #e8edf1;
+.popover.bottom-left > .arrow:after, .popover.bottom-right > .arrow:after, .popover.bottom > .arrow:after {
+	content: " ";
+	top: 1px;
+	margin-left: -10px;
+	border-top-width: 0;
+	border-bottom-color: #e8edf1;
 }
 
 .popover-wrapper {
-    padding: 10px;
+	padding: 10px;
 }
 
 .popover-header {
-    position: relative;
-    background-color: #e8edf1;
-    min-height: 30px;
-    font-size: 18px;
-    color: #a4acb9;
-    padding: 10px 0;
+	position: relative;
+	background-color: #e8edf1;
+	min-height: 30px;
+	font-size: 18px;
+	color: #a4acb9;
+	padding: 10px 0;
 }
 
 .popover-footer {
-    overflow: hidden;
-    clear: both;
-    padding: 5px 10px 10px 10px;
+	overflow: hidden;
+	clear: both;
+	padding: 5px 10px 10px 10px;
 }
 
 .popover-header .actions {
-    position: absolute;
-    top: 6px;
-    right: 5px;
-    font-size: 12px;
+	position: absolute;
+	top: 6px;
+	right: 5px;
+	font-size: 12px;
 }
 
-.popover-header .actions a{
-    display: inline-block;
-    padding: 8px 5px;
+.popover-header .actions a {
+	display: inline-block;
+	padding: 8px 5px;
 }
 
 .popover-header span {
-    padding: 0 10px;
+	padding: 0 10px;
 }
 
 .popover-wrapper .form-group {
-    margin-bottom: 10px;
+	margin-bottom: 10px;
 }
 
 .popover.wide {
-    max-width: 1000px;
-    min-width: 1000px;
+	max-width: 1000px;
+	min-width: 1000px;
 }
 
 .popover.wide .popover-wrapper {
-    max-height: 400px;
-    overflow: auto;
+	max-height: 400px;
+	overflow: auto;
 }
 
 .popover.medium {
-    max-width: 600px;
-    min-width: 250px;
+	max-width: 600px;
+	min-width: 250px;
 }
 
 .popover .section {
-    border-top: 1px solid #eeeeee;
+	border-top: 1px solid #eeeeee;
 }
 
 .center {
-    text-align: center;
+	text-align: center;
 }
 
 .popover .center .btn, .popover .center .btn-group > .btn:hover, .popover .center .btn-group > .btn:focus {
-    border-color: #ffffff;
+	border-color: #ffffff;
 }
 
 /* Navigation */
 
 .navbar {
-    background-color: #333333;
-    border: none;
-    min-height: 40px;
+	background-color: #333333;
+	border: none;
+	min-height: 40px;
 }
 
 
 .navbar .btn-group .btn-default {
-    border: none;
-    color: #ffffff;
-    background-color: transparent;
-    padding-top: 0px;
-    padding-bottom: 0px;
-    line-height: 40px;
-    -webkit-border-radius: 0px;
-    -moz-border-radius: 0px;
-    border-radius: 0px;
-    font-size: 13px;
+	border: none;
+	color: #ffffff;
+	background-color: transparent;
+	padding-top: 0px;
+	padding-bottom: 0px;
+	line-height: 40px;
+	-webkit-border-radius: 0px;
+	-moz-border-radius: 0px;
+	border-radius: 0px;
+	font-size: 13px;
 }
 
 .navbar .btn-group .btn-default:hover, .navbar .btn-group .btn-default:focus {
-    background-color: #121212;
+	background-color: #121212;
 }
 
 .navbar .btn-group .btn-default {
-    border: none;
-    color: #ffffff;
-    background-color: transparent;
+	border: none;
+	color: #ffffff;
+	background-color: transparent;
 }
 
 .navbar .btn-group .btn-icon {
-    font-size: 22px;
+	font-size: 22px;
 }
 
 
 .navbar-header .navbar-brand {
-    padding-top: 0px;
-    line-height: 40px;
-    height: 40px;
-    /*background: url(../images/logo.png) no-repeat 10px center;*/
-    width: 220px;
-    font-weight:800;
+	padding-top: 0px;
+	line-height: 40px;
+	height: 40px;
+	/*background: url(../images/logo.png) no-repeat 10px center;*/
+	width: 220px;
+	font-weight: 800;
 }
 
 
 .navbar-nav {
-    height: 40px;
+	height: 40px;
 }
 
 .navbar-nav > li > a {
-    line-height: 20px;
-    padding: 10px;
-    font-size: 17px;
-    padding: 10px 35px 10px 35px;
-    color: #ffffff;
+	line-height: 20px;
+	padding: 10px;
+	font-size: 17px;
+	padding: 10px 35px 10px 35px;
+	color: #ffffff;
 }
 
 .navbar-nav > li.active:after {
-    top: 100%;
-    left: 50%;
-    border: solid transparent;
-    content: " ";
-    height: 0;
-    width: 0;
-    position: absolute;
-    pointer-events: none;
-    border-color: rgba(0, 0, 0, 0);
-    border-top-color: #000000;
-    border-width: 6px;
-    margin-left: -6px;
+	top: 100%;
+	left: 50%;
+	border: solid transparent;
+	content: " ";
+	height: 0;
+	width: 0;
+	position: absolute;
+	pointer-events: none;
+	border-color: rgba(0, 0, 0, 0);
+	border-top-color: #000000;
+	border-width: 6px;
+	margin-left: -6px;
 }
 
 .navbar-nav > li.active {
-    background-color: #000000;
-    position: relative;
+	background-color: #000000;
+	position: relative;
 }
 
 
 .navbar-nav > li.active > a {
-    /*color: #36a7c4;*/
-    color: #6dc469;
+	/*color: #36a7c4;*/
+	color: #6dc469;
 }
 
 /* Sub header */
 .subheader {
-    background-color: #ffffff;
-    /*background-color: #e8edf1;*/
-    min-height: 50px;
-    border-bottom: 1px solid #a4acb9;
+	background-color: #ffffff;
+	/*background-color: #e8edf1;*/
+	min-height: 50px;
+	border-bottom: 1px solid #a4acb9;
 }
 
 .subheader > div > .btn-group {
-    margin: 12px 15px 0px 0px;
+	margin: 12px 15px 0px 0px;
 }
 
 .subheader h2 {
-    font-family: 'Lato', sans-serif;
-    color: #1a1a1a;
-    font-size: 20px;
-    font-weight: normal;
-    padding: 19px 0px 5px 10px;
-    margin-top: 0px;
-}
-
-.subheader  .version {
-    font-weight: bold;
-    /*color: #36a7c4;*/
-    color: #6dc469;
-    font-size: 110%;
-    padding-left: 5px;
-    line-height: 1;
-    padding-right: 5px;
-    border-right: 1px solid #a4acb9;
-    margin-right: 5px;
+	font-family: 'Lato', sans-serif;
+	color: #1a1a1a;
+	font-size: 20px;
+	font-weight: normal;
+	padding: 19px 0px 5px 10px;
+	margin-top: 0px;
+}
+
+.subheader .version {
+	font-weight: bold;
+	/*color: #36a7c4;*/
+	color: #6dc469;
+	font-size: 110%;
+	padding-left: 5px;
+	line-height: 1;
+	padding-right: 5px;
+	border-right: 1px solid #a4acb9;
+	margin-right: 5px;
 }
+
 .subheader .btn {
-    border-color: #e8edf1;
+	border-color: #e8edf1;
 }
 
-.subheader a.btn:hover, .subheader a.btn:focus  {
-    border-color: #e8edf1;
-    color: #ffffff;
+.subheader a.btn:hover, .subheader a.btn:focus {
+	border-color: #e8edf1;
+	color: #ffffff;
 }
 
 .subheader .dropdown-menu .detail {
-    vertical-align:middle;
-    color: #1a1a1a;
+	vertical-align: middle;
+	color: #1a1a1a;
 }
 
 .subheader p {
-    font-size: 14px;
-    color: #1a1a1a;
-    word-wrap:break-word;
+	font-size: 14px;
+	color: #1a1a1a;
+	word-wrap: break-word;
 }
 
 .subheader p.hint a {
-    cursor: pointer;
-    color: #1a1a1a;
+	cursor: pointer;
+	color: #1a1a1a;
 }
 
 .subheader .details.subheader .details {
-    margin-bottom: 5px;
-    margin-left: -1px;
-    border-right: 1px solid #a4acb9;
-    border-left: 1px solid #a4acb9;
-    padding: 0px 15px 5px 15px;
+	margin-bottom: 5px;
+	margin-left: -1px;
+	border-right: 1px solid #a4acb9;
+	border-left: 1px solid #a4acb9;
+	padding: 0px 15px 5px 15px;
 }
 
 .subheader .details:first-child {
-    border-left: none;
+	border-left: none;
 }
 
 .subheader .details:last-child {
-    border-right: none;
+	border-right: none;
 }
 
 .subheader .details > span, span.detail {
-    font-size: 13px;
-    display: block;
-    padding-bottom: 5px;
+	font-size: 13px;
+	display: block;
+	padding-bottom: 5px;
 }
 
 .subheader .details p {
-    font-size: 13px;
+	font-size: 13px;
 }
 
 .subheader .related {
-    float: right;
-    margin: 0 -10px 10px 10px;
+	float: right;
+	margin: 0 -10px 10px 10px;
 }
 
 .subheader .details span i, span.detail i {
-    font-size: 90%;
-    padding-right: 8px;
+	font-size: 90%;
+	padding-right: 8px;
 }
 
-.subheader >div>.pull-right {
-    margin-top: 12px;
-    margin-right: 5px;
+.subheader > div > .pull-right {
+	margin-top: 12px;
+	margin-right: 5px;
 }
 
 .subheader a.action {
-    color: #1a1a1a;
-    margin-right: 10px;
-    line-height: 36px;
-    text-decoration: underline;
-    font-size: 14px;
+	color: #1a1a1a;
+	margin-right: 10px;
+	line-height: 36px;
+	text-decoration: underline;
+	font-size: 14px;
 }
 
 .subheader a.action i {
-    text-decoration: none;
-    font-style: normal;
+	text-decoration: none;
+	font-style: normal;
 }
 
 .subheader a:hover {
-    color: #606b7d;
+	color: #606b7d;
 }
 
 .subheader .highlight {
-    color: #ffeeaa;
+	color: #ffeeaa;
 }
 
 
 /** Custom icons **/
 
 .icon {
-    position: relative;
-    top: 1px;
-    display: inline-block;
-    font-family: 'cherokeeregular';
-    font-style: normal;
-    font-weight: 400;
-    line-height: 1;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
+	position: relative;
+	top: 1px;
+	display: inline-block;
+	font-family: 'cherokeeregular';
+	font-style: normal;
+	font-weight: 400;
+	line-height: 1;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
 }
 
 .icon-user-add:before {
-    content: "\e008";
+	content: "\e008";
 }
 
 .icon-comment-add:before {
-    content: "\e111";
+	content: "\e111";
 }
 
 .icon-diagram:before {
-    content: "\e011";
+	content: "\e011";
 }
 
 .icon-caret-down:before {
-    content: "\e114";
+	content: "\e114";
 }
 
 .icon-caret-left:before {
-    content: "\e115";
+	content: "\e115";
 }
 
 .icon-caret-right:before {
-    content: "\e116";
+	content: "\e116";
 }
 
 .icon-remove:before {
-    content: "\e117";
+	content: "\e117";
 }
 
 .icon-pencil:before {
-    content: "\270f";
+	content: "\270f";
 }
 
 .icon-caret-up:before {
-    content: "\e118";
+	content: "\e118";
 }
 
 .icon-user:before {
-    content: "\e119";
+	content: "\e119";
 }
 
 .icon-choice:before {
-    content: "\e120";
+	content: "\e120";
 }
 
 .icon-move:before {
-    content: "\e121";
+	content: "\e121";
 }
 
 .icon-mail:before {
-    content: "\e122";
+	content: "\e122";
 }
 
 .icon-clock:before {
-    content: "\e123";
+	content: "\e123";
 }
 
 .icon-download:before {
-    content: "\e124";
+	content: "\e124";
 }
 
 .icon-word:before {
-    content: "\e125";
+	content: "\e125";
 }
 
 .icon-excel:before {
-    content: "\e126";
+	content: "\e126";
 }
 
 .icon-powerpoint:before {
-    content: "\e127";
+	content: "\e127";
 }
 
 .icon-pdf:before {
-    content: "\e128";
+	content: "\e128";
 }
 
 .icon-content:before {
-    content: "\e129";
+	content: "\e129";
 }
 
 .icon-folder:before {
-    content: "\e130";
+	content: "\e130";
 }
 
 .icon-image:before {
-    content: "\e131";
+	content: "\e131";
 }
 
 .icon-bpmn-stencil:before {
-    content: "\e132";
+	content: "\e132";
 }
 
 .icon-kickstart-stencil:before {
-    content: "\e133";
+	content: "\e133";
 }
 
 .icon-form-stencil:before {
-    content: "\e134";
+	content: "\e134";
 }
 
 .simple-list .icon-image, .related-content .icon-image {
-    color: #484b84;
+	color: #484b84;
 }
 
 .simple-list .icon-pdf, .related-content .icon-pdf {
-    color: #ac2020;
+	color: #ac2020;
 }
 
 .simple-list .icon-powerpoint, .related-content .icon-powerpoint {
-    color: #dc5b31;
+	color: #dc5b31;
 }
 
 .simple-list .icon-excel, .related-content .icon-excel {
-    color: #13743d;
+	color: #13743d;
 }
 
 .simple-list .icon-word, .related-content .icon-word {
-    color: #2974b8;
+	color: #2974b8;
 }
 
 .simple-list .icon-content, .related-content .icon-content {
-    color: #666666;
+	color: #666666;
 }
 
 .loading {
-    margin: 0px 15px;
-    text-align: center;
-    line-height: 34px;
+	margin: 0px 15px;
+	text-align: center;
+	line-height: 34px;
 }
 
 .loading > div {
-    width: 10px;
-    height: 10px;
-    background-color: #9fd7e5;
-    margin: 1px;
+	width: 10px;
+	height: 10px;
+	background-color: #9fd7e5;
+	margin: 1px;
 
-    border-radius: 100%;
-    display: inline-block;
-    -webkit-animation: bouncedelay 1.4s infinite ease-in-out;
-    animation: bouncedelay 1.4s infinite ease-in-out;
-    /* Prevent first frame from flickering when animation starts */
-    -webkit-animation-fill-mode: both;
-    animation-fill-mode: both;
+	border-radius: 100%;
+	display: inline-block;
+	-webkit-animation: bouncedelay 1.4s infinite ease-in-out;
+	animation: bouncedelay 1.4s infinite ease-in-out;
+	/* Prevent first frame from flickering when animation starts */
+	-webkit-animation-fill-mode: both;
+	animation-fill-mode: both;
 }
 
 .loading .l1 {
-    -webkit-animation-delay: -0.32s;
-    animation-delay: -0.32s;
+	-webkit-animation-delay: -0.32s;
+	animation-delay: -0.32s;
 }
 
 .loading .l2 {
-    -webkit-animation-delay: -0.16s;
-    animation-delay: -0.16s;
+	-webkit-animation-delay: -0.16s;
+	animation-delay: -0.16s;
 }
 
 .loading-box {
-    text-align: center;
-    margin: 50px auto 10px auto;
-    padding: 20px 50px;
-    max-width: 400px;
+	text-align: center;
+	margin: 50px auto 10px auto;
+	padding: 20px 50px;
+	max-width: 400px;
 }
 
 .loading-box span {
-    font-size: 16px;
-    color: #333333;
+	font-size: 16px;
+	color: #333333;
 }
 
 
 @-webkit-keyframes bouncedelay {
-    0%, 80%, 100% { -webkit-transform: scale(0.0) }
-    40% { -webkit-transform: scale(1.0) }
+	0%, 80%, 100% {
+		-webkit-transform: scale(0.0)
+	}
+	40% {
+		-webkit-transform: scale(1.0)
+	}
 }
 
 @keyframes bouncedelay {
-    0%, 80%, 100% {
-        transform: scale(0.0);
-        -webkit-transform: scale(0.0);
-    } 40% {
-          transform: scale(1.0);
-          -webkit-transform: scale(1.0);
-      }
+	0%, 80%, 100% {
+		transform: scale(0.0);
+		-webkit-transform: scale(0.0);
+	}
+	40% {
+		transform: scale(1.0);
+		-webkit-transform: scale(1.0);
+	}
 }
 
 /** Alerts */
@@ -855,641 +864,644 @@ a.dropdown-toggle {
 }
 
 .alert-wrapper {
-    position: fixed;
-    top: 40px;
-    left: 0;
-    right: 0;
-    z-index: 1010;
+	position: fixed;
+	top: 40px;
+	left: 0;
+	right: 0;
+	z-index: 1010;
 }
 
-.alert-wrapper.no-header  {
-    top: 0px;
+.alert-wrapper.no-header {
+	top: 0px;
 }
 
 .alert {
-    text-align: center;
-    width: 100%;
-    min-height: 20px;
-    background-color: #eef4d7;
-    background-color: rgba(238, 244, 215, .7);
-    padding: 8px 10px;
-    cursor: pointer;
-    border: none;
-    border-bottom: 1px solid #bcd35f;
-
-    -moz-border-radius: 0px;
-    -webkit-border-radius: 0px;
-    border-radius: 0px;
-
-    -webkit-transition: all .5s ease;
-    -moz-transition: all .5s ease;
-    -o-transition: all .5s ease;
-    transition: all .5s ease;
+	text-align: center;
+	width: 100%;
+	min-height: 20px;
+	background-color: #eef4d7;
+	background-color: rgba(238, 244, 215, .7);
+	padding: 8px 10px;
+	cursor: pointer;
+	border: none;
+	border-bottom: 1px solid #bcd35f;
+
+	-moz-border-radius: 0px;
+	-webkit-border-radius: 0px;
+	border-radius: 0px;
+
+	-webkit-transition: all .5s ease;
+	-moz-transition: all .5s ease;
+	-o-transition: all .5s ease;
+	transition: all .5s ease;
 }
 
 .alert.ng-hide-remove {
-    opacity: 1;
-    display:block!important;
+	opacity: 1;
+	display: block !important;
 }
 
 
 .alert.ng-hide {
-    opacity: 0;
+	opacity: 0;
 }
 
 .alert .badge {
-    background-color: #bcd35f;
-    color: #ffffff;
-    font-size: 12px;
-    margin-top: 2px;
-    margin-left: 10px;
+	background-color: #bcd35f;
+	color: #ffffff;
+	font-size: 12px;
+	margin-top: 2px;
+	margin-left: 10px;
 }
 
 
 .alert .glyphicon {
-    padding-right: 8px;
-    color:  #bcd35f;
+	padding-right: 8px;
+	color: #bcd35f;
 }
 
 .alert span {
-    color: #445016;
-    font-size: 15px;
+	color: #445016;
+	font-size: 15px;
 }
 
 .alert.error {
-    background-color: #e9af9f;
-    border-color: #e4593d;
-    background-color: rgba(228, 89, 61, .7);
+	background-color: #e9af9f;
+	border-color: #e4593d;
+	background-color: rgba(228, 89, 61, .7);
 }
+
 .alert.error .glyphicon {
-    color: #e4593d;
+	color: #e4593d;
 }
 
 .alert.error span {
-    color: #471313;
+	color: #471313;
 }
 
 .alert.error .badge {
-    background-color: #e4593d;
-    color: #ffffff;
+	background-color: #e4593d;
+	color: #ffffff;
 }
 
 .wrapper {
-    padding: 55px 15px 15px 15px;
-    max-width: 1400px;
-    min-width: 1024px;
-    margin: 0 auto;
+	padding: 55px 15px 15px 15px;
+	max-width: 1400px;
+	min-width: 1024px;
+	margin: 0 auto;
 }
 
 .wrapper.full {
-    /*padding: 40px 0px 0px 0px;*/
-    overflow: hidden;
-    max-width: 100%;
-    min-width: 100%;
+	/*padding: 40px 0px 0px 0px;*/
+	overflow: hidden;
+	max-width: 100%;
+	min-width: 100%;
 }
 
 .wrapper.no-header {
-    padding-top: 10px;
+	padding-top: 10px;
 }
 
 /** Main list **/
 .main-list {
-    position: relative;
-    float: left;
-    width: 400px;
-    border: 1px solid #cccccc;
-    background-color: #ffffff;
-    margin-right: 20px;
+	position: relative;
+	float: left;
+	width: 400px;
+	border: 1px solid #cccccc;
+	background-color: #ffffff;
+	margin-right: 20px;
 
-    -webkit-box-shadow: 2px 2px 2px 0px rgba(220,220,220,0.50);
-    -moz-box-shadow: 2px 2px 2px 0px rgba(220,220,220,0.50);
-    box-shadow: 2px 2px 2px 0px rgba(220,220,220,0.50);
+	-webkit-box-shadow: 2px 2px 2px 0px rgba(220, 220, 220, 0.50);
+	-moz-box-shadow: 2px 2px 2px 0px rgba(220, 220, 220, 0.50);
+	box-shadow: 2px 2px 2px 0px rgba(220, 220, 220, 0.50);
 }
 
 .main-list .sort {
-    position: absolute;
-    top: 12px;
-    right: 5px;
+	position: absolute;
+	top: 12px;
+	right: 5px;
 }
 
 .list-header {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    background-color: #ffffff;
-    background-color: rgba(255, 255, 255, .9);
-    border-bottom: 1px solid #cccccc;
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	background-color: #ffffff;
+	background-color: rgba(255, 255, 255, .9);
+	border-bottom: 1px solid #cccccc;
 
-    -webkit-box-shadow: 0px 1px 1px 0px rgba(220,220,220,0.65);
-    -moz-box-shadow: 0px 1px 1px 0px rgba(220,220,220,0.65);
-    box-shadow: 0px 1px 1px 0px rgba(220,220,220,0.65);
-    z-index: 2;
+	-webkit-box-shadow: 0px 1px 1px 0px rgba(220, 220, 220, 0.65);
+	-moz-box-shadow: 0px 1px 1px 0px rgba(220, 220, 220, 0.65);
+	box-shadow: 0px 1px 1px 0px rgba(220, 220, 220, 0.65);
+	z-index: 2;
 
 }
 
 .list-header .loading {
-    position: absolute;
-    left: 50%;
-    margin-left: -15px;
-    line-height: 30px;
+	position: absolute;
+	left: 50%;
+	margin-left: -15px;
+	line-height: 30px;
 }
 
 .list-header .summary {
-    cursor: pointer;
-    padding: 10px 10px 10px 10px;
-    min-height: 30px;
+	cursor: pointer;
+	padding: 10px 10px 10px 10px;
+	min-height: 30px;
 }
 
 .list-header .summary > span {
-    color: #373e48;
+	color: #373e48;
 }
 
 .list-header .summary .divider {
-    content: '&bull';
-    font-size: 70%;
-    line-height: 1;
-    font-style: normal;
-    padding: 0 5px;
+	content: '&bull';
+	font-size: 70%;
+	line-height: 1;
+	font-style: normal;
+	padding: 0 5px;
 }
 
 .list-header .form-group {
-    margin-bottom: 10px;
-    position: relative;
+	margin-bottom: 10px;
+	position: relative;
 }
 
 .selection {
-    position: relative;
-    margin: 0;
-    padding: 6px 8px;
+	position: relative;
+	margin: 0;
+	padding: 6px 8px;
 
-    border: 1px solid #cccccc;
-    -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-    -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-    box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-    background-color: #ffffff;
+	border: 1px solid #cccccc;
+	-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	background-color: #ffffff;
 
-    font-size: 14px;
+	font-size: 14px;
 
-    cursor: pointer;
+	cursor: pointer;
 }
 
-.selection  .glyphicon, .selection  .icon {
-    padding-right: 5px;
+.selection .glyphicon, .selection .icon {
+	padding-right: 5px;
 }
 
 .selection .actions {
-    float: right;
+	float: right;
 }
+
 .selection .actions.no-upload {
-    float: left;
-    margin-right: 10px;
+	float: left;
+	margin-right: 10px;
 }
 
 .selection.narrow {
-    padding: 0;
+	padding: 0;
 }
 
 .selection .pull-right {
-    margin: 4px 4px 4px 0;
+	margin: 4px 4px 4px 0;
 }
 
 .selection.narrow .simple-list {
-    margin-bottom: 0;
-    padding-bottom: 0;
+	margin-bottom: 0;
+	padding-bottom: 0;
 }
 
 .selection.narrow .simple-list li {
-    border-top: 1px dotted #eeeeee;
+	border-top: 1px dotted #eeeeee;
 }
 
 .selection.narrow .simple-list li:first-child {
-    border-top: none;
+	border-top: none;
 }
 
 
 .selection.narrow .no-results {
-    padding: 6px 0 0 5px;
+	padding: 6px 0 0 5px;
 }
 
 .selection.narrow .details {
-    margin: 5px;
-    border: none;
+	margin: 5px;
+	border: none;
 }
 
 .selection.narrow .label {
-    font-size: 13px;
-    padding:0 10px 0 0;
-    margin: 0;
-    color: #666666;
+	font-size: 13px;
+	padding: 0 10px 0 0;
+	margin: 0;
+	color: #666666;
 }
 
 .selection > .icon-caret-down {
-    visibility: hidden;
-    position: absolute;
-    top: 8px;
-    right: 5px;
+	visibility: hidden;
+	position: absolute;
+	top: 8px;
+	right: 5px;
 }
 
 .selection .empty {
-    color: #666666;
+	color: #666666;
 }
 
 .selection:hover > .icon-caret-down, button.selection:active > .icon-caret-down, button.selection:focus > .icon-caret-down {
-    visibility: visible;
+	visibility: visible;
 }
 
 .selection[disabled]:hover > .icon-caret-down, button.selection[disabled]:active > .icon-caret-down, button[disabled].selection:focus > .icon-caret-down {
-    visibility: hidden;
+	visibility: hidden;
 }
 
 .selection[disabled] {
-    background-color: #f6f6f7;
-    color: #999999;
+	background-color: #f6f6f7;
+	color: #999999;
 }
 
-.selection+.dropdown-menu {
-    width: 100%;
+.selection + .dropdown-menu {
+	width: 100%;
 }
 
 button.selection:active, button.selection:focus {
-    outline: none;
-    border-color: #acacac;
+	outline: none;
+	border-color: #acacac;
 }
 
 .selection.toggle {
-    overflow: hidden;
-    clear: both;
-    padding: 0;
+	overflow: hidden;
+	clear: both;
+	padding: 0;
 }
 
 .selection.toggle .toggle-2 {
-    width: 50%;
-    float: left;
+	width: 50%;
+	float: left;
 }
 
 
 .selection.toggle .toggle-3 {
-    width: 33.333%;
-    float: left;
+	width: 33.333%;
+	float: left;
 }
 
 .selection.toggle .toggle-4 {
-    width: 25%;
-    float: left;
+	width: 25%;
+	float: left;
 }
 
 .selection.toggle .btn {
-    border: none;
-    border-right: 1px solid #bbbbbb;
-    width: 100%;
-    background-color: #eeeeee;
-    -moz-border-radius: 0px;
-    -webkit-border-radius: 0px;
-    border-radius: 0px;
-    color: #666666;
-    -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-    -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-    box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
+	border: none;
+	border-right: 1px solid #bbbbbb;
+	width: 100%;
+	background-color: #eeeeee;
+	-moz-border-radius: 0px;
+	-webkit-border-radius: 0px;
+	border-radius: 0px;
+	color: #666666;
+	-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
 
 }
 
 .selection.toggle .btn:active, .selection.toggle .btn:focus {
-    outline: none;
-    color: #1a1a1a;
-    background-color: #f8f8f8;
+	outline: none;
+	color: #1a1a1a;
+	background-color: #f8f8f8;
 }
 
 .selection.toggle > .active .btn {
-    background-color: #ffffff;
-    color: #1a1a1a;
-    -moz-box-shadow: none;
-    -webkit-box-shadow: none;
-    box-shadow: none;
+	background-color: #ffffff;
+	color: #1a1a1a;
+	-moz-box-shadow: none;
+	-webkit-box-shadow: none;
+	box-shadow: none;
 }
 
 .selection.toggle > div:last-child .btn {
-    border: none;
+	border: none;
 }
 
 .subtle-select {
-    padding: 6px 8px;
-    background-color: transparent;
-    color: #1a1a1a;
-    text-decoration: none;
+	padding: 6px 8px;
+	background-color: transparent;
+	color: #1a1a1a;
+	text-decoration: none;
 }
 
 .subtle-select .icon {
-    visibility: hidden;
+	visibility: hidden;
 }
 
 .subtle-select:hover .icon {
-    visibility: visible;
+	visibility: visible;
 }
 
 .subtle-select:hover, .header .detail a.subtle-select:hover {
-    background-color: #ffffff;
-    text-decoration: none;
-    color:#1a1a1a;
+	background-color: #ffffff;
+	text-decoration: none;
+	color: #1a1a1a;
 }
 
 
 .list-header .summary label, .list-header .summary .filter-action {
-    font-size: 11px;
-    font-weight: normal;
-    text-transform: uppercase;
-    margin-bottom: 0;
-    color: #1a1a1a;
+	font-size: 11px;
+	font-weight: normal;
+	text-transform: uppercase;
+	margin-bottom: 0;
+	color: #1a1a1a;
 }
 
 .list-wrapper {
-    overflow: auto;
+	overflow: auto;
 }
 
 
 .main-list {
-    height: 100%;
-    overflow: hidden;
+	height: 100%;
+	overflow: hidden;
 }
 
 .main-list .nothing-to-see {
-    text-align: center;
-    padding:50px 20px;
+	text-align: center;
+	padding: 50px 20px;
 }
 
 .main-list .nothing-to-see span {
-    font-size: 17px;
+	font-size: 17px;
 }
+
 .main-list .popover {
-    width: 375px;
+	width: 375px;
 }
 
 .list-header .summary .filter-action:hover {
-    /*color: #36a7c4;*/
-    color: #6dc469;
+	/*color: #36a7c4;*/
+	color: #6dc469;
 }
 
 .main-list .list-subheader {
-    margin-top: 40px;
-    position: relative;
-    z-index: 1;
-    border-bottom: 1px solid #f2f2f2;
+	margin-top: 40px;
+	position: relative;
+	z-index: 1;
+	border-bottom: 1px solid #f2f2f2;
 }
 
 .main-list .list-subheader > .btn-group {
-    margin: 10px 5px 10px 10px;
+	margin: 10px 5px 10px 10px;
 }
 
 .full-list li.more {
-    padding: 10px 15px;
-    background-color: #ffffff;
-    color: #666666;
+	padding: 10px 15px;
+	background-color: #ffffff;
+	color: #666666;
 }
 
 .full-list li.more i.icon {
-    font-size: 70%;
+	font-size: 70%;
 }
 
 .full-list {
-    list-style: none;
-    padding: 0;
-    margin-bottom: 0;
+	list-style: none;
+	padding: 0;
+	margin-bottom: 0;
 }
 
 .full-list li {
-    position: relative;
-    display: block;
-    border-bottom: 1px solid #f5f5f5;
-    cursor: pointer;
-    padding: 2px 0px 2px 0px;
+	position: relative;
+	display: block;
+	border-bottom: 1px solid #f5f5f5;
+	cursor: pointer;
+	padding: 2px 0px 2px 0px;
 }
 
-.full-list li .badge, .simple-list li .badge{
-    font-size: 12px;
-    line-height: 12px;
+.full-list li .badge, .simple-list li .badge {
+	font-size: 12px;
+	line-height: 12px;
 
-    padding-right: 0;
-    border-radius: 3px;
-    background-color: #e8edf1;
-    /*color: #36a7c4;*/
-    color: #6dc469;
-    background-color: transparent;
-    font-weight: normal;
+	padding-right: 0;
+	border-radius: 3px;
+	background-color: #e8edf1;
+	/*color: #36a7c4;*/
+	color: #6dc469;
+	background-color: transparent;
+	font-weight: normal;
 
 }
 
 
 .full-list li.active {
-    background-color: #fafafb;
+	background-color: #fafafb;
 }
 
 .full-list li:hover {
-    background-color: #fafafb;
+	background-color: #fafafb;
 }
 
 .full-list li > div:hover {
-    border-color: #d8dde1;
+	border-color: #d8dde1;
 }
 
 .full-list li > div {
-    margin: 0 6px 0 4px;
-    border-left: 4px solid #e8edf1;
-    min-height: 50px;
-    padding: 5px 5px 5px 5px;
+	margin: 0 6px 0 4px;
+	border-left: 4px solid #e8edf1;
+	min-height: 50px;
+	padding: 5px 5px 5px 5px;
 }
 
 .full-list li.active > div {
-    /*border-left-color: #36a7c4;*/
-    border-left-color: #6dc469;
+	/*border-left-color: #36a7c4;*/
+	border-left-color: #6dc469;
 }
 
 .full-list li .title {
-    font-size: 16px;
-    margin: 0 0 0 5px;
+	font-size: 16px;
+	margin: 0 0 0 5px;
 
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
 .full-list li .summary {
-    clear: both;
-    margin: 3px 5px 0px 5px;
-    font-size: 13px;
-    color: #1a1a1a;
-    white-space: nowrap;
-    width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
+	clear: both;
+	margin: 3px 5px 0px 5px;
+	font-size: 13px;
+	color: #1a1a1a;
+	white-space: nowrap;
+	width: 100%;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
 .full-list li .detail {
-    margin: 0 5px;
-    font-size: 12px;
-    color: #999999;
-    white-space: nowrap;
-    width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
+	margin: 0 5px;
+	font-size: 12px;
+	color: #999999;
+	white-space: nowrap;
+	width: 100%;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
 .main-content {
-    border: 1px solid #cccccc;
+	border: 1px solid #cccccc;
 
 
-    height: 100%;
-    max-height: 100%;
-    overflow: hidden;
-    padding-bottom: 10px;
+	height: 100%;
+	max-height: 100%;
+	overflow: hidden;
+	padding-bottom: 10px;
 }
 
 .main-content-wrapper {
-    height: 100%;
-    max-height: 100%;
-    overflow: hidden;
-    -webkit-box-shadow: 2px 2px 2px 0px rgba(220,220,220,0.50);
-    -moz-box-shadow: 2px 2px 2px 0px rgba(220,220,220,0.50);
-    box-shadow: 2px 2px 2px 0px rgba(220,220,220,0.50);
+	height: 100%;
+	max-height: 100%;
+	overflow: hidden;
+	-webkit-box-shadow: 2px 2px 2px 0px rgba(220, 220, 220, 0.50);
+	-moz-box-shadow: 2px 2px 2px 0px rgba(220, 220, 220, 0.50);
+	box-shadow: 2px 2px 2px 0px rgba(220, 220, 220, 0.50);
 }
 
 .main-content > .header {
-    background-color: #e8edf1;
-    min-height: 60px;
-    border-bottom: 1px solid #a4acb9;
-    padding: 15px 15px;
+	background-color: #e8edf1;
+	min-height: 60px;
+	border-bottom: 1px solid #a4acb9;
+	padding: 15px 15px;
 }
 
 .main-content > .header h2 {
-    margin: 0 0 5px 0;
-    font-size: 26px;
+	margin: 0 0 5px 0;
+	font-size: 26px;
 }
 
-.main-content > .header .btn:hover, .main-content > .header .btn:focus  {
-    border-color: #e8edf1;
-    color: #ffffff;
+.main-content > .header .btn:hover, .main-content > .header .btn:focus {
+	border-color: #e8edf1;
+	color: #ffffff;
 }
 
 .modal-header .label, .header .label {
-    padding: 0 3px 0 15px;
-    color: #1a1a1a;
-    font-weight: normal;
-    font-size: 13px;
-    color: #666666;
+	padding: 0 3px 0 15px;
+	color: #1a1a1a;
+	font-weight: normal;
+	font-size: 13px;
+	color: #666666;
 }
 
-.header > .detail >.label:first-child {
-    padding-left: 0;
+.header > .detail > .label:first-child {
+	padding-left: 0;
 }
 
 .header .detail a {
-    color: #1a1a1a;
+	color: #1a1a1a;
 }
 
 .header .detail a:hover {
-    /*color: #36a7c4;*/
-    color: #6dc469;
-    text-decoration: underline;
+	/*color: #36a7c4;*/
+	color: #6dc469;
+	text-decoration: underline;
 }
 
 .jumpers {
-    list-style: none inside;
-    padding: 0 10px 10px 10px;
-    margin: 5px 0px 0 0px;
-    border-bottom: 1px solid #eeeeee;
+	list-style: none inside;
+	padding: 0 10px 10px 10px;
+	margin: 5px 0px 0 0px;
+	border-bottom: 1px solid #eeeeee;
 }
 
 .jumpers li {
-    display: inline-block;
-    border: 1px solid #e8edf1;
-    margin: 5px 0 0 2px;
-    padding: 5px 25px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-    border-radius: 2px;
-    cursor: pointer;
+	display: inline-block;
+	border: 1px solid #e8edf1;
+	margin: 5px 0 0 2px;
+	padding: 5px 25px;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+	border-radius: 2px;
+	cursor: pointer;
 }
 
 .jumpers li.pending {
-    border: 1px dotted #d8dde1;
+	border: 1px dotted #d8dde1;
 }
 
 .jumpers li:hover {
-    background-color: #f8f8f9;
+	background-color: #f8f8f9;
 }
 
 .jumpers li.selected {
-    color: white;
-    /*background-color: #36a7c4;*/
-    background-color: #6dc469;
+	color: white;
+	/*background-color: #36a7c4;*/
+	background-color: #6dc469;
 }
 
 
 .jumpers li span {
-    background-color: #f2f2f2;
-    padding: 1px 5px;
-    margin-left: 5px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-    border-radius: 2px;
-    color: #999999;
+	background-color: #f2f2f2;
+	padding: 1px 5px;
+	margin-left: 5px;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+	border-radius: 2px;
+	color: #999999;
 }
 
 .jumpers li:hover span {
-    background-color: #e2e2e2;
+	background-color: #e2e2e2;
 }
 
 
-
 .section {
-    margin: 10px 0;
-    padding: 10px 0 0px 0;
-    min-height: 120px;
+	margin: 10px 0;
+	padding: 10px 0 0px 0;
+	min-height: 120px;
 }
 
 .section.pack {
-    min-height: inherit;
+	min-height: inherit;
 }
 
 .col-xs-12.seperator {
-    height: 1px;
-    border-top: 1px solid #eeeeee;
-    margin: 5px 0;
+	height: 1px;
+	border-top: 1px solid #eeeeee;
+	margin: 5px 0;
 }
 
 .section > h3 {
-    position: relative;
-    margin: 0px;
-    font-size: 18px;
-    cursor: pointer;
+	position: relative;
+	margin: 0px;
+	font-size: 18px;
+	cursor: pointer;
 }
 
 .section > h3 .action > a {
-    font-weight: bold;
-    padding-left: 5px;
-    color: #999999;
+	font-weight: bold;
+	padding-left: 5px;
+	color: #999999;
 }
 
 
 .section > .form-group, .section > div > .form-group {
-    margin: 5px 0;
+	margin: 5px 0;
 }
 
 .modal-backdrop {
-    background-color: #999999; /** Non alpha-supporting browser fallback */
-    background-color: rgba(100, 100, 100, .75);
+	background-color: #999999; /** Non alpha-supporting browser fallback */
+	background-color: rgba(100, 100, 100, .75);
 }
+
 .modal-content {
-    -webkit-border-radius: 0;
-    -moz-border-radius: 0;
-    border-radius: 0;
-    border: none;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+	border: none;
 }
 
 .modal-dialog.wide {
-    margin-left: auto;
-    margin-right: auto;
-    width: 80%;
-    max-width: 1200px;
+	margin-left: auto;
+	margin-right: auto;
+	width: 80%;
+	max-width: 1200px;
 }
 
 .modal-body {
@@ -1497,32 +1509,32 @@ button.selection:active, button.selection:focus {
 
 
 .modal .modal-header {
-    position: relative;
-    background-color: #e8edf1;
-    min-height: 60px;
-    border-bottom: 1px solid #a4acb9;
-    padding: 15px 15px;
+	position: relative;
+	background-color: #e8edf1;
+	min-height: 60px;
+	border-bottom: 1px solid #a4acb9;
+	padding: 15px 15px;
 }
 
 .modal-header .actions {
-    margin-right: 20px;
+	margin-right: 20px;
 }
 
 .modal-body .form-actions {
-    border-top: 1px solid #eeeeee;
-    margin: 0 -30px;
-    padding: 10px 10px 10px 10px;
+	border-top: 1px solid #eeeeee;
+	margin: 0 -30px;
+	padding: 10px 10px 10px 10px;
 }
 
 .modal-body.includes-footer {
-    padding-bottom: 0px;
+	padding-bottom: 0px;
 }
 
 .fullscreen .modal-header h3 {
-    margin: 0 0 5px 0px;
-    font-size: 22px;
+	margin: 0 0 5px 0px;
+	font-size: 22px;
 }
 
 .fullscreen .modal-header h3 .summary {
-    font-size: 13px;
-}
\ No newline at end of file
+	font-size: 13px;
+}
diff --git a/len-activiti/src/main/resources/static/editor-app/css/style-editor.css b/len-activiti/src/main/resources/static/editor-app/css/style-editor.css
index 3e62e43..8f30a3a 100644
--- a/len-activiti/src/main/resources/static/editor-app/css/style-editor.css
+++ b/len-activiti/src/main/resources/static/editor-app/css/style-editor.css
@@ -56,7 +56,8 @@ a.subtle-select:hover .glyphicon {
 .inset .col-sm-3 {
 	margin-left: -15px;
 }
-.no-pad > div{
+
+.no-pad > div {
 	padding: 0;
 }
 
@@ -175,6 +176,7 @@ ul.filter-list li.current a:hover, ul.filter-list li.current a:focus {
 	line-height: 40px;
 	color: #606b7d;
 }
+
 .item-wrapper .message span {
 	font-size: 14px;
 }
@@ -271,6 +273,7 @@ ul.filter-list li.current a:hover, ul.filter-list li.current a:focus {
 	padding: 100px 20px 80px 20px;
 	border: 1px solid #e8edf1;
 }
+
 .create-inline span {
 	display: block;
 	font-size: 18px;
@@ -306,19 +309,20 @@ ul.filter-list li.current a:hover, ul.filter-list li.current a:focus {
 }
 
 .content-canvas-wrapper {
-	-moz-box-shadow:    inset  0  3px 3px -4px #ababab;
-	-webkit-box-shadow: inset  0  3px 3px -4px #ababab;
-	box-shadow:        inset  0  3px 3px -4px #ababab;
+	-moz-box-shadow: inset 0 3px 3px -4px #ababab;
+	-webkit-box-shadow: inset 0 3px 3px -4px #ababab;
+	box-shadow: inset 0 3px 3px -4px #ababab;
 	margin: 15px 7px 0 7px;
 	z-index: 0;
 }
+
 .content-canvas {
 	background-color: #f9f9f9;
 	margin: 0 3px 0 3px;
 
-	-moz-box-shadow:    inset  0  3px 3px -4px #ababab;
-	-webkit-box-shadow: inset  0  3px 3px -4px #ababab;
-	box-shadow:        inset  0  3px 3px -4px #ababab;
+	-moz-box-shadow: inset 0 3px 3px -4px #ababab;
+	-webkit-box-shadow: inset 0 3px 3px -4px #ababab;
+	box-shadow: inset 0 3px 3px -4px #ababab;
 
 	padding: 20px;
 }
@@ -328,7 +332,7 @@ ul.filter-list li.current a:hover, ul.filter-list li.current a:focus {
 	margin-bottom: 5px;
 }
 
-.content-canvas .no-results{
+.content-canvas .no-results {
 	color: #999999;
 	font-size: 16px;
 	margin: 10px 0px;
@@ -360,6 +364,7 @@ table.history tr:hover {
 	background-color: #f3f6f8;
 	cursor: pointer;
 }
+
 table.history tr.current:hover {
 	background-color: #e8edf1;
 	cursor: inherit;
@@ -377,7 +382,7 @@ table.history .version {
 	/*color: #36a7c4;*/
 	color: #6dc469;
 	padding: 5px 10px;
-	vertical-align:middle;
+	vertical-align: middle;
 	/*color: #36a7c4;*/
 }
 
@@ -392,6 +397,7 @@ table.history tr.current {
 	font-weight: bold;
 	background-color: #e8edf1;
 }
+
 table.history tr.current td {
 	background-color: #e8edf1;
 }
@@ -457,6 +463,7 @@ table.history tr.current td {
 	width: 100%;
 	text-align: left;
 }
+
 .popup-wrapper .people-select {
 	max-height: 160px;
 }
@@ -481,6 +488,7 @@ table.history tr.current td {
 .center-pane .content {
 	overflow: hidden;
 }
+
 .center-pane .tab-actions {
 	padding: 8px;
 }
@@ -488,6 +496,7 @@ table.history tr.current td {
 .center-pane .tabs-wrapper > .pull-right {
 	margin-right: 5px;
 }
+
 .center-pane .content {
 	padding: 10px;
 }
@@ -507,13 +516,13 @@ table.history tr.current td {
 .center-pane .header h1 {
 	font-size: 30px;
 	margin: 0;
-	padding:0;
+	padding: 0;
 }
 
 .center-pane .header h2 {
 	font-size: 24px;
 	margin: 0 0 5px 0;
-	padding:0;
+	padding: 0;
 }
 
 .center-pane .header {
@@ -575,32 +584,32 @@ ul.list {
 	margin-bottom: 3px;
 }
 
-ul.list>li {
+ul.list > li {
 	line-height: 30px;
 	margin: 0;
 	padding: 4px;
 	cursor: pointer;
 }
 
-.popup-wrapper ul.list>li {
+.popup-wrapper ul.list > li {
 	border-top: 1px solid #eeeeee;
 }
 
-.popup-wrapper ul.list>li:last-child {
+.popup-wrapper ul.list > li:last-child {
 	border-bottom: 1px solid #eeeeee;
 }
 
-ul.list>li:hover, ul.list>li.active {
+ul.list > li:hover, ul.list > li.active {
 	background-color: #f2f2f2;
 }
 
-ul.list >li .actions {
-	float:right;
+ul.list > li .actions {
+	float: right;
 	margin: 0px 0px 0px 5px;
 	visibility: hidden;
 }
 
-ul.list>li:hover .actions {
+ul.list > li:hover .actions {
 	visibility: inherit;
 }
 
@@ -612,17 +621,19 @@ ul.list>li:hover .actions {
 }
 
 .fadein.ng-enter {
-	opacity:0;
+	opacity: 0;
 }
+
 .fadein.ng-enter.ng-enter-active {
-	opacity:1;
+	opacity: 1;
 }
 
 .fadein.ng-move {
-	opacity:0.5;
+	opacity: 0.5;
 }
+
 .fadein.ng-move.ng-move-active {
-	opacity:1;
+	opacity: 1;
 }
 
 .popup-error {
@@ -641,4 +652,4 @@ ul.list>li:hover .actions {
 .message .loading {
 	line-height: 40px;
 	margin-left: 0px;
-}
\ No newline at end of file
+}
diff --git a/len-activiti/src/main/resources/static/editor-app/css/style.css b/len-activiti/src/main/resources/static/editor-app/css/style.css
index b491693..f78541e 100644
--- a/len-activiti/src/main/resources/static/editor-app/css/style.css
+++ b/len-activiti/src/main/resources/static/editor-app/css/style.css
@@ -1,12 +1,12 @@
 @font-face {
-    font-family: 'ActivitiModeler';
-    src: url('../fonts/activiti-admin-webfont.eot');
-    src: url('../fonts/activiti-admin-webfont.eot?#iefix') format('embedded-opentype'),
-         url('../fonts/activiti-admin-webfont.woff') format('woff'),
-         url('../fonts/activiti-admin-webfont.ttf') format('truetype'),
-         url('../fonts/activiti-admin-webfont.svg#activitimodelerregular') format('svg');
-    font-weight: normal;
-    font-style: normal;
+	font-family: 'ActivitiModeler';
+	src: url('../fonts/activiti-admin-webfont.eot');
+	src: url('../fonts/activiti-admin-webfont.eot?#iefix') format('embedded-opentype'),
+	url('../fonts/activiti-admin-webfont.woff') format('woff'),
+	url('../fonts/activiti-admin-webfont.ttf') format('truetype'),
+	url('../fonts/activiti-admin-webfont.svg#activitimodelerregular') format('svg');
+	font-weight: normal;
+	font-style: normal;
 }
 
 .row-no-gutter .col-xs-9 {
@@ -22,16 +22,16 @@
 }
 
 .editor-item-picker {
-    height: 400px;
-    max-height: 400px;
-    min-height: 400px;
-    overflow: auto;
+	height: 400px;
+	max-height: 400px;
+	min-height: 400px;
+	overflow: auto;
 }
 
 .editor-item-picker-component {
-    height: 185px;
-    max-height: 185px;
-    overflow: hidden;
+	height: 185px;
+	max-height: 185px;
+	overflow: hidden;
 }
 
 .editor-toolbar {
@@ -42,23 +42,24 @@
 	margin: 12px 15px 0px 0px;
 }
 
-.editor-toolbar  > .btn-group.pull-right {
+.editor-toolbar > .btn-group.pull-right {
 	margin: 0;
 }
 
 .editor-toolbar .btn.btn-inverse {
 	font-size: 24px;
 	color: #FFFFFF;
-    border-color: rgba(0, 0, 0, 0);
-    padding: 3px 6px 0px 6px;
-    box-shadow: none;
-    text-shadow: none;
-    text-align: center;
-    border: none;
-    margin: 0px 0px 0px 5px;
-    height: 36px;
-    min-width: 36px;
+	border-color: rgba(0, 0, 0, 0);
+	padding: 3px 6px 0px 6px;
+	box-shadow: none;
+	text-shadow: none;
+	text-align: center;
+	border: none;
+	margin: 0px 0px 0px 5px;
+	height: 36px;
+	min-width: 36px;
 }
+
 .editor-toolbar .btn.btn-inverse.pressed {
 	background-color: #287d92;
 	color: #174753;
@@ -115,16 +116,17 @@
 
 .stencil-group > li > span {
 	margin-left: 5px;
-	padding-top:5px;
+	padding-top: 5px;
 	padding-bottom: 5px;
 	display: block;
 	cursor: pointer;
 }
 
 .stencil-group > li > span > i {
-	font-size: 12px;	
+	font-size: 12px;
 	line-height: 17px;
 }
+
 .stencil-group > li > ul {
 	list-style: none;
 	list-style-position: inside;
@@ -137,6 +139,7 @@
 .stencil-group.collapsed > li {
 	color: #000000;
 }
+
 .stencil-group.collapsed > li > ul {
 	max-height: 0px;
 	padding-top: 0;
@@ -144,24 +147,24 @@
 }
 
 .stencil-group-non-root > li {
-    background-color: #ffffff;
+	background-color: #ffffff;
 }
 
 .stencil-item {
-    cursor: pointer;
-    padding: 5px;
+	cursor: pointer;
+	padding: 5px;
 }
 
 .root-stencil-item {
-    margin: 0 0 0 15px;
-    font-family: Arial, Regular;
-    font-size: 17px;
+	margin: 0 0 0 15px;
+	font-family: Arial, Regular;
+	font-size: 17px;
 }
 
 .ui-draggable.stencil-item.stencil-item-dragged {
-    display: block;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+	display: block;
+	text-overflow: ellipsis;
+	white-space: nowrap;
 }
 
 
@@ -183,9 +186,9 @@ div.canvas-wrapper {
 	height: 17px;
 	width: 17px;
 	text-align: center;
-	-webkit-border-radius:3px;
-	-moz-border-radius:3px;
-	border-radius:3px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
 }
 
 #canvas-grow-N.canvas_resize_indicator, #canvas-shrink-S.canvas_resize_indicator {
@@ -223,16 +226,16 @@ div.canvas-wrapper {
 
 div.propertySection {
 	height: 250px;
-    background-color: #e8edf1;
+	background-color: #e8edf1;
 	margin-bottom: 0px;
 }
 
 .selected-item-title {
-    font-size: 25px;
-    font-weight: bold;
-    padding: 8px 0 8px 8px;
-    border-bottom: 1px solid #a4acb9;
-    cursor: pointer;
+	font-size: 25px;
+	font-weight: bold;
+	padding: 8px 0 8px 8px;
+	border-bottom: 1px solid #a4acb9;
+	cursor: pointer;
 }
 
 .selected-item-title a {
@@ -267,7 +270,7 @@ div.propertySection {
 }
 
 .selected-item-body .property-row:hover {
-	background-color: #d7dfe6;	
+	background-color: #d7dfe6;
 }
 
 .selected-item-body {
@@ -277,7 +280,7 @@ div.propertySection {
 }
 
 .selected-item-body > div {
-	overflow: hidden;	
+	overflow: hidden;
 	margin: 5px 20px;
 }
 
@@ -285,7 +288,7 @@ div.propertySection {
 	display: block;
 	float: left;
 	margin: 2px 2%;
-	padding: 0;	
+	padding: 0;
 	min-height: 25px;
 }
 
@@ -327,41 +330,41 @@ div.propertySection {
 	margin: 2px 0;
 	padding: 0px 5px;
 	width: 100%;
-    outline: none;
-    border:none !important;
-    box-shadow:none !important;
+	outline: none;
+	border: none !important;
+	box-shadow: none !important;
 }
 
 .default-grid {
-    border: 1px solid rgb(212,212,212);
-    width: 100%;
-    height: 300px;
-    margin-bottom: 10px;
+	border: 1px solid rgb(212, 212, 212);
+	width: 100%;
+	height: 300px;
+	margin-bottom: 10px;
 }
 
 .kis-listener-grid {
-    border: 1px solid rgb(212,212,212);
-    width: 100%;
-    height: 200px;
-    margin-bottom: 10px;
+	border: 1px solid rgb(212, 212, 212);
+	width: 100%;
+	height: 200px;
+	margin-bottom: 10px;
 }
 
 .kis-field-grid {
-    border: 1px solid rgb(212,212,212);
-    width: 100%;
-    height: 150px;
-    margin-bottom: 10px;
+	border: 1px solid rgb(212, 212, 212);
+	width: 100%;
+	height: 150px;
+	margin-bottom: 10px;
 }
 
 .saving-text {
-    display: table;
-    margin: 0 auto;
-    padding: 20px 0 0px 0;
+	display: table;
+	margin: 0 auto;
+	padding: 20px 0 0px 0;
 }
 
 
 .form-property-checkbox {
-    margin:0;
+	margin: 0;
 }
 
 /* Oryx overrides
@@ -372,13 +375,13 @@ ul.x-menu-list {
 	width: 200px;
 	background-color: #FFFFFF;
 	border: 1px solid #E1E2E5;
-	-webkit-border-radius:3px;
-	-moz-border-radius:3px;
-	border-radius:3px;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
 	padding: 3px;
 }
 
-img.x-menu-item-icon  {
+img.x-menu-item-icon {
 	width: auto;
 	height: auto;
 	margin-right: 5px;
@@ -401,7 +404,7 @@ li.x-menu-list-item.x-menu-item-active a {
 }
 
 .sequence-flow-order-element {
-    margin: 12px 0 12px 0;
+	margin: 12px 0 12px 0;
 }
 
 /* Editor icon font */
@@ -436,42 +439,55 @@ li.x-menu-list-item.x-menu-item-active a {
 .editor-icon-paste:before {
 	content: 'e';
 }
+
 .editor-icon-delete:before {
 	content: 'f';
 }
+
 .editor-icon-redo:before {
 	content: 'h';
 }
+
 .editor-icon-undo:before {
 	content: 'g';
 }
+
 .editor-icon-same-size:before {
 	content: 'i';
 }
+
 .editor-icon-zoom-in:before {
 	content: 'k';
 }
+
 .editor-icon-zoom-out:before {
 	content: 'l';
 }
+
 .editor-icon-zoom-actual:before {
 	content: 'm';
 }
+
 .editor-icon-zoom-fit:before {
 	content: 'j';
 }
+
 .editor-icon-bendpoint-add:before {
 	content: 'n';
 }
+
 .editor-icon-bendpoint-remove:before {
 	content: 'o';
 }
+
 .editor-icon-align-horizontal:before {
 	content: 'p';
 }
+
 .editor-icon-align-vertical:before {
 	content: 'q';
 }
+
 .editor-icon-close:before {
-    content: "X";
+	content: "X";
 }
diff --git a/len-activiti/src/main/resources/static/editor-app/editor-config.js b/len-activiti/src/main/resources/static/editor-app/editor-config.js
index 3bf4720..b2f666e 100644
--- a/len-activiti/src/main/resources/static/editor-app/editor-config.js
+++ b/len-activiti/src/main/resources/static/editor-app/editor-config.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -21,12 +21,12 @@
 var KISBPM = KISBPM || {};
 
 KISBPM.CONFIG = {
-		'showRemovedProperties' : false
+	'showRemovedProperties': false
 };
 
 KISBPM.HEADER_CONFIG = {
-		'showAppTitle' : true,
-		'showHeaderMenu' : true,
-		'showMainNavigation' : true,
-		'showPageHeader' : true
-};
\ No newline at end of file
+	'showAppTitle': true,
+	'showHeaderMenu': true,
+	'showMainNavigation': true,
+	'showPageHeader': true
+};
diff --git a/len-activiti/src/main/resources/static/editor-app/editor-controller.js b/len-activiti/src/main/resources/static/editor-app/editor-controller.js
index d3778d9..07ed8aa 100644
--- a/len-activiti/src/main/resources/static/editor-app/editor-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/editor-controller.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -19,47 +19,47 @@
 'use strict';
 
 angular.module('activitiModeler')
-.controller('EditorUnsavedChangesPopupCrtl', ['$rootScope', '$scope', '$http', '$location', '$window', function ($rootScope, $scope, $http, $location, $window) {
-   
-	$scope.ok = function () {
-		if ($scope.handleResponseFunction) {
-			$scope.handleResponseFunction(true);
+	.controller('EditorUnsavedChangesPopupCrtl', ['$rootScope', '$scope', '$http', '$location', '$window', function ($rootScope, $scope, $http, $location, $window) {
+
+		$scope.ok = function () {
+			if ($scope.handleResponseFunction) {
+				$scope.handleResponseFunction(true);
 
-            // Also clear any 'onbeforeunload', added by oryx
-            $window.onbeforeunload = undefined;
-		}
-		$scope.$hide();
-	};
+				// Also clear any 'onbeforeunload', added by oryx
+				$window.onbeforeunload = undefined;
+			}
+			$scope.$hide();
+		};
 
-	$scope.cancel = function () {
-		if ($scope.handleResponseFunction) {
-			$scope.handleResponseFunction(false);
-		}
-        $scope.$hide();
-	};
-}]);
+		$scope.cancel = function () {
+			if ($scope.handleResponseFunction) {
+				$scope.handleResponseFunction(false);
+			}
+			$scope.$hide();
+		};
+	}]);
 
 activitiModule
-.directive('autoFocus', ['$timeout', '$parse', function($timeout, $parse) {
-    return {
-        restrict: 'AC',
-        compile: function($element, attr) {
+	.directive('autoFocus', ['$timeout', '$parse', function ($timeout, $parse) {
+		return {
+			restrict: 'AC',
+			compile: function ($element, attr) {
 
-            return function(_scope, _element, _attrs) {
-                var firstChild = (_attrs.focusFirstChild !== undefined);
-                $timeout(function () {
-                    if (firstChild) {
-                        // look for first input-element in child-tree and focus that
-                        var inputs = _element.find('input');
-                        if (inputs && inputs.length > 0) {
-                            inputs[0].focus();
-                        }
-                    } else {
-                        // Focus element where the directive is put on
-                        _element[0].focus();
-                    }
-                }, 100);
-            }
-        }
-    };
-}]);
+				return function (_scope, _element, _attrs) {
+					var firstChild = (_attrs.focusFirstChild !== undefined);
+					$timeout(function () {
+						if (firstChild) {
+							// look for first input-element in child-tree and focus that
+							var inputs = _element.find('input');
+							if (inputs && inputs.length > 0) {
+								inputs[0].focus();
+							}
+						} else {
+							// Focus element where the directive is put on
+							_element[0].focus();
+						}
+					}, 100);
+				}
+			}
+		};
+	}]);
diff --git a/len-activiti/src/main/resources/static/editor-app/editor-utils.js b/len-activiti/src/main/resources/static/editor-app/editor-utils.js
index e97a4c8..7fae86c 100644
--- a/len-activiti/src/main/resources/static/editor-app/editor-utils.js
+++ b/len-activiti/src/main/resources/static/editor-app/editor-utils.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -24,112 +24,112 @@ var EDITOR = EDITOR || {};
 
 EDITOR.UTIL = {
 
-    getParameterByName: function (name) {
-        name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
-        var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
-            results = regex.exec(location.search);
-        return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
-    },
-
-    /**
-     * Starts at the provided start element, and walks all preceding elements in the graph.
-     * Each element is tested to have a certain property and, if it has, adds this property value
-     * to the return result list.
-     */
-    collectPropertiesFromPrecedingElements: function (startElement, propertyType) {
-        var visitedElements = [];
-        var collectedProperties = [];
-        EDITOR.UTIL._visitElementAndCollectProperty(startElement, propertyType, visitedElements, collectedProperties);
-        return collectedProperties;
-    },
-
-    /**
-     * Starts at the provided start element, and walks all preceding elements in the graph.
-     * Each element is tested to be a specific stencil id and, if it has, adds the element
-     * to the return result list.
-     */
-    collectElementsFromPrecedingElements: function (startElement, stencilId) {
-        var visitedElements = [];
-        var collectedElements = [];
-
-        var incomingShapesIterator = startElement.getIncomingShapes();
-        if (incomingShapesIterator) {
-            for (var i = 0; i < incomingShapesIterator.length; i++) {
-                var incomingShape = incomingShapesIterator[i];
-                if (visitedElements.indexOf(incomingShape.id) < 0) {
-                    EDITOR.UTIL._visitElementAndCollectElement(incomingShape, stencilId, visitedElements, collectedElements);
-                }
-            }
-        }
-
-        return collectedElements;
-    },
-
-    _visitElementAndCollectProperty: function (element, propertyType, visitedElementsArray, collectedProperties) {
-
-        visitedElementsArray.push(element.id);
-
-        var property = element.properties[propertyType]
-        if (property) {
-            collectedProperties.push(property);
-        }
-
-        var incomingShapesIterator = element.getIncomingShapes();
-        if (incomingShapesIterator) {
-            for (var i = 0; i < incomingShapesIterator.length; i++) {
-                var incomingShape = incomingShapesIterator[i];
-                if (visitedElementsArray.indexOf(incomingShape.id) < 0) {
-                    EDITOR.UTIL._visitElementAndCollectProperty(incomingShape, propertyType, visitedElementsArray, collectedProperties);
-                }
-            }
-        }
-    },
-
-    _visitElementAndCollectElement: function (element, stencilId, visitedElementsArray, collectedElements) {
-
-        visitedElementsArray.push(element.id);
-
-        var elementStencilId = element.getStencil().id();
-        if (elementStencilId && elementStencilId.indexOf(stencilId) >= 0) {
-            collectedElements.push(element);
-        }
-
-        var incomingShapesIterator = element.getIncomingShapes();
-        if (incomingShapesIterator) {
-            for (var i = 0; i < incomingShapesIterator.length; i++) {
-                var incomingShape = incomingShapesIterator[i];
-                if (visitedElementsArray.indexOf(incomingShape.id) < 0) {
-                    EDITOR.UTIL._visitElementAndCollectElement(incomingShape, stencilId, visitedElementsArray, collectedElements);
-                }
-            }
-        }
-    },
-
-    /**
-     * Goes up the chain of parents of the provided element.
-     * When the property is encountered, its value is immediately returned.
-     * If the chain of parents is completely walked through, undefined is returned.
-     */
-    getPropertyFromParent: function (element, propertyType) {
-        if (element.parent) {
-            return EDITOR.UTIL._getPropertyFromParent(element.parent, propertyType);
-        } else {
-            return undefined;
-        }
-
-    },
-
-    _getPropertyFromParent: function (parentElement, propertyType) {
-        var property = parentElement.properties[propertyType];
-        if (property) {
-            return property;
-        }
-
-        if (parentElement.parent) {
-            return EDITOR.UTIL._getPropertyFromParent(parentElement.parent, propertyType);
-        } else {
-            return undefined;
-        }
-    }
-
-};
\ No newline at end of file
+	getParameterByName: function (name) {
+		name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
+		var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
+			results = regex.exec(location.search);
+		return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
+	},
+
+	/**
+	 * Starts at the provided start element, and walks all preceding elements in the graph.
+	 * Each element is tested to have a certain property and, if it has, adds this property value
+	 * to the return result list.
+	 */
+	collectPropertiesFromPrecedingElements: function (startElement, propertyType) {
+		var visitedElements = [];
+		var collectedProperties = [];
+		EDITOR.UTIL._visitElementAndCollectProperty(startElement, propertyType, visitedElements, collectedProperties);
+		return collectedProperties;
+	},
+
+	/**
+	 * Starts at the provided start element, and walks all preceding elements in the graph.
+	 * Each element is tested to be a specific stencil id and, if it has, adds the element
+	 * to the return result list.
+	 */
+	collectElementsFromPrecedingElements: function (startElement, stencilId) {
+		var visitedElements = [];
+		var collectedElements = [];
+
+		var incomingShapesIterator = startElement.getIncomingShapes();
+		if (incomingShapesIterator) {
+			for (var i = 0; i < incomingShapesIterator.length; i++) {
+				var incomingShape = incomingShapesIterator[i];
+				if (visitedElements.indexOf(incomingShape.id) < 0) {
+					EDITOR.UTIL._visitElementAndCollectElement(incomingShape, stencilId, visitedElements, collectedElements);
+				}
+			}
+		}
+
+		return collectedElements;
+	},
+
+	_visitElementAndCollectProperty: function (element, propertyType, visitedElementsArray, collectedProperties) {
+
+		visitedElementsArray.push(element.id);
+
+		var property = element.properties[propertyType]
+		if (property) {
+			collectedProperties.push(property);
+		}
+
+		var incomingShapesIterator = element.getIncomingShapes();
+		if (incomingShapesIterator) {
+			for (var i = 0; i < incomingShapesIterator.length; i++) {
+				var incomingShape = incomingShapesIterator[i];
+				if (visitedElementsArray.indexOf(incomingShape.id) < 0) {
+					EDITOR.UTIL._visitElementAndCollectProperty(incomingShape, propertyType, visitedElementsArray, collectedProperties);
+				}
+			}
+		}
+	},
+
+	_visitElementAndCollectElement: function (element, stencilId, visitedElementsArray, collectedElements) {
+
+		visitedElementsArray.push(element.id);
+
+		var elementStencilId = element.getStencil().id();
+		if (elementStencilId && elementStencilId.indexOf(stencilId) >= 0) {
+			collectedElements.push(element);
+		}
+
+		var incomingShapesIterator = element.getIncomingShapes();
+		if (incomingShapesIterator) {
+			for (var i = 0; i < incomingShapesIterator.length; i++) {
+				var incomingShape = incomingShapesIterator[i];
+				if (visitedElementsArray.indexOf(incomingShape.id) < 0) {
+					EDITOR.UTIL._visitElementAndCollectElement(incomingShape, stencilId, visitedElementsArray, collectedElements);
+				}
+			}
+		}
+	},
+
+	/**
+	 * Goes up the chain of parents of the provided element.
+	 * When the property is encountered, its value is immediately returned.
+	 * If the chain of parents is completely walked through, undefined is returned.
+	 */
+	getPropertyFromParent: function (element, propertyType) {
+		if (element.parent) {
+			return EDITOR.UTIL._getPropertyFromParent(element.parent, propertyType);
+		} else {
+			return undefined;
+		}
+
+	},
+
+	_getPropertyFromParent: function (parentElement, propertyType) {
+		var property = parentElement.properties[propertyType];
+		if (property) {
+			return property;
+		}
+
+		if (parentElement.parent) {
+			return EDITOR.UTIL._getPropertyFromParent(parentElement.parent, propertyType);
+		} else {
+			return undefined;
+		}
+	}
+
+};
diff --git a/len-activiti/src/main/resources/static/editor-app/editor.html b/len-activiti/src/main/resources/static/editor-app/editor.html
index 1ad4102..7d8e63e 100644
--- a/len-activiti/src/main/resources/static/editor-app/editor.html
+++ b/len-activiti/src/main/resources/static/editor-app/editor.html
@@ -1,127 +1,138 @@
 <div ng-controller="StencilController">
-  <div class="subheader editor-toolbar" id="editor-header">
-  	<div class="btn-group">
-	    <div class="btn-toolbar pull-left" ng-controller="ToolbarController" ng-cloak>
-        	<button id="{{item.id}}"
-                    title="{{item.title | translate}}"
-                    ng-repeat="item in items"
-                    ng-switch on="item.type"
-                    class="btn btn-inverse" ng-class="{'separator': item.type == 'separator'}"
-                    ng-disabled="item.type == 'separator' || item.enabled == false"
-                    ng-click="toolbarButtonClicked($index)">
-        		<i ng-switch-when="button" ng-class="item.cssClass" class="toolbar-button" data-toggle="tooltip" title="{{item.title | translate}}"></i>
-	            <div ng-switch-when="separator" ng-class="item.cssClass"></div>
-        	</button>
-  		  </div>
-        </div>
-  </div>
-  <div class="full">
-      <div class="row row-no-gutter">
-	      <div id="paletteHelpWrapper" class="col-xs-3">
-	      	<div class="stencils" id="paletteSection">
-			    <div ng-if="stencilItemGroups.length > 1">
-                    <div ng-repeat="group in stencilItemGroups">
+	<div class="subheader editor-toolbar" id="editor-header">
+		<div class="btn-group">
+			<div class="btn-toolbar pull-left" ng-cloak ng-controller="ToolbarController">
+				<button class="btn btn-inverse"
+						id="{{item.id}}"
+						ng-class="{'separator': item.type == 'separator'}"
+						ng-click="toolbarButtonClicked($index)"
+						ng-disabled="item.type == 'separator' || item.enabled == false"
+						ng-repeat="item in items" ng-switch
+						on="item.type"
+						title="{{item.title | translate}}">
+					<i class="toolbar-button" data-toggle="tooltip" ng-class="item.cssClass" ng-switch-when="button"
+					   title="{{item.title | translate}}"></i>
+					<div ng-class="item.cssClass" ng-switch-when="separator"></div>
+				</button>
+			</div>
+		</div>
+	</div>
+	<div class="full">
+		<div class="row row-no-gutter">
+			<div class="col-xs-3" id="paletteHelpWrapper">
+				<div class="stencils" id="paletteSection">
+					<div ng-if="stencilItemGroups.length > 1">
+						<div ng-repeat="group in stencilItemGroups">
 
-                        <ul ng-if="group.visible && group.items" class="stencil-group"  ng-class="{collapsed: !group.expanded, 'first': $first}">
-                            <li ng-include="'editor-app/partials/stencil-item-template.html?version=4'"></li>
-                        </ul>
+							<ul class="stencil-group" ng-class="{collapsed: !group.expanded, 'first': $first}"
+								ng-if="group.visible && group.items">
+								<li ng-include="'editor-app/partials/stencil-item-template.html?version=4'"></li>
+							</ul>
 
-                        <div ng-if="!group.items" ng-include="'editor-app/partials/root-stencil-item-template.html?version=4'"></div>
+							<div ng-if="!group.items"
+								 ng-include="'editor-app/partials/root-stencil-item-template.html?version=4'"></div>
 
-                    </div>
-			    </div>
-			    <div ng-if="stencilItemGroups.length == 1">
-	                <ul class="stencil-group">
-	                    <li ng-repeat="item in stencilItemGroups[0].paletteItems" class="stencil-item"
-	                         id="{{item.id}}"
-	                         title="{{item.description}}"
-	                         ng-model="draggedElement"
-	                         data-drag="true"
-	                         jqyoui-draggable="{onStart:'startDragCallback', onDrag:'dragCallback'}"
-	                         data-jqyoui-options="{revert: 'invalid', helper: 'clone', opacity : 0.5}">
+						</div>
+					</div>
+					<div ng-if="stencilItemGroups.length == 1">
+						<ul class="stencil-group">
+							<li class="stencil-item" data-drag="true"
+								data-jqyoui-options="{revert: 'invalid', helper: 'clone', opacity : 0.5}"
+								id="{{item.id}}"
+								jqyoui-draggable="{onStart:'startDragCallback', onDrag:'dragCallback'}"
+								ng-model="draggedElement"
+								ng-repeat="item in stencilItemGroups[0].paletteItems"
+								title="{{item.description}}">
 
-	                        <img ng-src="editor-app/stencilsets/bpmn2.0/icons/{{item.icon}}" width="16px;" height="16px;"/>
-	                        {{item.name}}
-	                    </li>
-                    </ul>
-			     </div>
-		      </div>
-	      </div>
-	      <div id="canvasHelpWrapper" class="col-xs-9">
-	      	<div class="canvas-wrapper" id="canvasSection"
-	      		ng-model="droppedElement"
-                  ng-model="droppedElement"
-                  data-drop="true"
-                  data-jqyoui-options
-                  jqyoui-droppable="{onDrop:'dropCallback',onOver: 'overCallback', onOut: 'outCallback'}">
-            	<div class="canvas-message" id="model-modified-date"></div>
-            	<div class="Oryx_button"
-            	     id="delete-button"
-            	     title="{{'BUTTON.ACTION.DELETE.TOOLTIP' | translate}}"
-            	     ng-click="deleteShape()"
-            	     style="display:none">
-            	    <img src="editor-app/images/delete.png"/>
-            	</div>
-            	<div class="Oryx_button"
-            	     id="morph-button"
-            	     title="{{'BUTTON.ACTION.MORPH.TOOLTIP' | translate}}"
-            	     ng-click="morphShape()"
-            	     style="display:none">
-            	    <img src="editor-app/images/wrench.png"/>
-            	</div>
-            	<div class="Oryx_button"
-            		 ng-repeat="item in quickMenuItems"
-	                 id="{{item.id}}"
-	                 title="{{item.description}}"
-	                 ng-click="quickAddItem(item.id)"
-            	     ng-model="draggedElement"
-	                 data-drag="true"
-	                 jqyoui-draggable="{onStart:'startDragCallbackQuickMenu', onDrag:'dragCallbackQuickMenu'}"
-	                 data-jqyoui-options="{revert: 'invalid', helper: 'clone', opacity : 0.5}"
-	                 style="display:none">
-	             	<img ng-src="editor-app/stencilsets/bpmn2.0/icons/{{item.icon}}"/>
-	             </div>
-	         </div>
-           </div>
-           <div id="propertiesHelpWrapper" class="col-xs-9">
-            	<div class="propertySection" id="propertySection"
-                	ng-class="{collapsed: propertyWindowState.collapsed}">
-	                <div class="selected-item-section">
-	                	<div class="clearfix">
-		                    <div class="pull-right" ng-if="selectedItem.auditData.createDate">
-		                        <strong>{{'ELEMENT.DATE_CREATED' | translate}}: </strong> {{selectedItem.auditData.createDate}}
-		                    </div>
-		                    <div class="pull-right" ng-if="selectedItem.auditData.author">
-		                        <strong>{{'ELEMENT.AUTHOR' | translate}}: </strong> {{selectedItem.auditData.author}}
-		                    </div>
-		                    <div class="selected-item-title">
-		                        <a ng-click="propertyWindowState.toggle()">
-		                            <i class="glyphicon" ng-class="{'glyphicon-chevron-right': propertyWindowState.collapsed, 'glyphicon-chevron-down': !propertyWindowState.collapsed}"></i>
-		                            <span ng-show="selectedItem.title != undefined && selectedItem.title != null && selectedItem.title.length > 0">{{selectedItem.title}}</span>
-		                            <span ng-show="!selectedItem || selectedItem.title == undefined || selectedItem.title == null || selectedItem.title.length == 0">{{modelData.name}}</span>
-		                        </a>
-		                    </div>
-		                </div>
-                    	<div class="selected-item-body">
-	                        <div>
-	                             <div class="property-row" ng-repeat="property in selectedItem.properties"
-	                                ng-click="propertyClicked($index)" ng-class="{'clear' : $index%2 == 0}">
-	                                <span class="title" ng-if="!property.hidden">{{ property.title }}&nbsp;:</span>
-	                                <span class="title-removed" ng-if="property.hidden"><i>{{ property.title }}&nbsp;({{'PROPERTY.REMOVED' | translate}})&nbsp;:</i></span>
-	                                <span class="value">
+								<img height="16px;" ng-src="editor-app/stencilsets/bpmn2.0/icons/{{item.icon}}"
+									 width="16px;"/>
+								{{item.name}}
+							</li>
+						</ul>
+					</div>
+				</div>
+			</div>
+			<div class="col-xs-9" id="canvasHelpWrapper">
+				<div class="canvas-wrapper" data-drop="true"
+					 data-jqyoui-options
+					 id="canvasSection"
+					 jqyoui-droppable="{onDrop:'dropCallback',onOver: 'overCallback', onOut: 'outCallback'}"
+					 ng-model="droppedElement"
+					 ng-model="droppedElement">
+					<div class="canvas-message" id="model-modified-date"></div>
+					<div class="Oryx_button"
+						 id="delete-button"
+						 ng-click="deleteShape()"
+						 style="display:none"
+						 title="{{'BUTTON.ACTION.DELETE.TOOLTIP' | translate}}">
+						<img src="editor-app/images/delete.png"/>
+					</div>
+					<div class="Oryx_button"
+						 id="morph-button"
+						 ng-click="morphShape()"
+						 style="display:none"
+						 title="{{'BUTTON.ACTION.MORPH.TOOLTIP' | translate}}">
+						<img src="editor-app/images/wrench.png"/>
+					</div>
+					<div class="Oryx_button"
+						 data-drag="true"
+						 data-jqyoui-options="{revert: 'invalid', helper: 'clone', opacity : 0.5}"
+						 id="{{item.id}}"
+						 jqyoui-draggable="{onStart:'startDragCallbackQuickMenu', onDrag:'dragCallbackQuickMenu'}"
+						 ng-click="quickAddItem(item.id)"
+						 ng-model="draggedElement"
+						 ng-repeat="item in quickMenuItems"
+						 style="display:none"
+						 title="{{item.description}}">
+						<img ng-src="editor-app/stencilsets/bpmn2.0/icons/{{item.icon}}"/>
+					</div>
+				</div>
+			</div>
+			<div class="col-xs-9" id="propertiesHelpWrapper">
+				<div class="propertySection" id="propertySection"
+					 ng-class="{collapsed: propertyWindowState.collapsed}">
+					<div class="selected-item-section">
+						<div class="clearfix">
+							<div class="pull-right" ng-if="selectedItem.auditData.createDate">
+								<strong>{{'ELEMENT.DATE_CREATED' | translate}}: </strong>
+								{{selectedItem.auditData.createDate}}
+							</div>
+							<div class="pull-right" ng-if="selectedItem.auditData.author">
+								<strong>{{'ELEMENT.AUTHOR' | translate}}: </strong> {{selectedItem.auditData.author}}
+							</div>
+							<div class="selected-item-title">
+								<a ng-click="propertyWindowState.toggle()">
+									<i class="glyphicon"
+									   ng-class="{'glyphicon-chevron-right': propertyWindowState.collapsed, 'glyphicon-chevron-down': !propertyWindowState.collapsed}"></i>
+									<span
+										ng-show="selectedItem.title != undefined && selectedItem.title != null && selectedItem.title.length > 0">{{selectedItem.title}}</span>
+									<span
+										ng-show="!selectedItem || selectedItem.title == undefined || selectedItem.title == null || selectedItem.title.length == 0">{{modelData.name}}</span>
+								</a>
+							</div>
+						</div>
+						<div class="selected-item-body">
+							<div>
+								<div class="property-row" ng-class="{'clear' : $index%2 == 0}"
+									 ng-click="propertyClicked($index)" ng-repeat="property in selectedItem.properties">
+									<span class="title" ng-if="!property.hidden">{{ property.title }}&nbsp;:</span>
+									<span class="title-removed" ng-if="property.hidden"><i>{{ property.title
+										}}&nbsp;({{'PROPERTY.REMOVED' | translate}})&nbsp;:</i></span>
+									<span class="value">
 	                                    <ng-include
-	                                        src="getPropertyTemplateUrl($index)" ng-if="!property.hasReadWriteMode"></ng-include>
-	                                    <ng-include src="getPropertyReadModeTemplateUrl($index)"
-	                                        ng-if="property.hasReadWriteMode && property.mode == 'read'"></ng-include>
-	                                    <ng-include src="getPropertyWriteModeTemplateUrl($index)"
-	                                        ng-if="property.hasReadWriteMode && property.mode == 'write'"></ng-include>
+											ng-if="!property.hasReadWriteMode"
+											src="getPropertyTemplateUrl($index)"></ng-include>
+	                                    <ng-include ng-if="property.hasReadWriteMode && property.mode == 'read'"
+													src="getPropertyReadModeTemplateUrl($index)"></ng-include>
+	                                    <ng-include ng-if="property.hasReadWriteMode && property.mode == 'write'"
+													src="getPropertyWriteModeTemplateUrl($index)"></ng-include>
 	                                </span>
-	                            </div>
-	                        </div>
-	                    </div>
-	    			</div>
-    			</div>
-            </div>
-         </div>
-    </div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
 </div>
diff --git a/len-activiti/src/main/resources/static/editor-app/editor/css/editor.css b/len-activiti/src/main/resources/static/editor-app/editor/css/editor.css
index 0936639..b5ae009 100644
--- a/len-activiti/src/main/resources/static/editor-app/editor/css/editor.css
+++ b/len-activiti/src/main/resources/static/editor-app/editor/css/editor.css
@@ -1,6 +1,6 @@
 body, html {
-    font-family: tahoma,arial,helvetica,sans-serif;
-    font-size: 12px;
+	font-family: tahoma, arial, helvetica, sans-serif;
+	font-size: 12px;
 }
 
 /*********
@@ -9,8 +9,8 @@ body, html {
 
 text,
 text * {
-    cursor:default;
-    -webkit-user-select: none;
+	cursor: default;
+	-webkit-user-select: none;
 }
 
 /*********
@@ -23,51 +23,52 @@ text * {
 }
 
 .ORYX_Editor {
-    background: white;
-    border: none;
-    margin:-5px;
-    margin-top:0px;
-    width:1200px;
-    height:600px;
+	background: white;
+	border: none;
+	margin: -5px;
+	margin-top: 0px;
+	width: 1200px;
+	height: 600px;
 }
 
 .icon-large {
-	width:18px !important;
+	width: 18px !important;
 }
 
 #oryxcanvas {
-	width:1200px;
-	height:600px;
+	width: 1200px;
+	height: 600px;
 }
 
 /** Resizer for the Canvas **/
 .canvas_resize_indicator_area {
 
-	margin		:auto;
-	display		:block;
-	height		:30px;
-	left		:20%;
-	position	:absolute;
-	text-align	:center;
-	top			:0;
-	width		:60%;
+	margin: auto;
+	display: block;
+	height: 30px;
+	left: 20%;
+	position: absolute;
+	text-align: center;
+	top: 0;
+	width: 60%;
 
 }
 
 .canvas_resize_indicator {
 
-	width		: 15px;
-	height		: 15px;
-	position	: absolute;
-	display		: block;
-	margin		: auto;
-	opacity		: 0.6;
+	width: 15px;
+	height: 15px;
+	position: absolute;
+	display: block;
+	margin: auto;
+	opacity: 0.6;
 }
 
 .canvas_resize_indicator:hover {
 
-	opacity		: 1.0;
+	opacity: 1.0;
 }
+
 /** End Resizer **/
 
 .Oryx_down {
@@ -75,10 +76,10 @@ text * {
 }
 
 .Oryx_button img {
-	width:16px;
-	height:16px;
-	top:0px;
-	left:0px;
+	width: 16px;
+	height: 16px;
+	top: 0px;
+	left: 0px;
 	line-height: 16px;
 }
 
@@ -91,7 +92,7 @@ text * {
 
 .Oryx_button.x-opacity-0 {
 	opacity: 0;
-	display:none;
+	display: none;
 }
 
 .Oryx_button.x-opacity-10 {
@@ -111,92 +112,92 @@ text * {
 .Oryx_Top:hover .Oryx_button,
 .Oryx_Bottom:hover .Oryx_button {
 	opacity: 0.7;
-	display:block;
+	display: block;
 }
 
 
 .Oryx_button img {
-	top:0px;
+	top: 0px;
 }
 
 .Oryx_Left img {
-	top:0px;
+	top: 0px;
 }
 
 .Oryx_button {
-	width:24px;
-	height:24px;
-	padding:2px;
-	position:absolute;
+	width: 24px;
+	height: 24px;
+	padding: 2px;
+	position: absolute;
 	background-color: #ffffff;
-	background-color: rgba(255,255,255,0.7);
+	background-color: rgba(255, 255, 255, 0.7);
 	cursor: pointer;
 }
 
 .Oryx_button_with_caption {
-	width:inherit;
-	height:16px;
-	padding:4px;
-	position:absolute;
+	width: inherit;
+	height: 16px;
+	padding: 4px;
+	position: absolute;
 }
 
 /*** Resizer ***/
 
 .resizer_southeast,
 .resizer_northwest {
-	width:12px;
-	height:12px;
-	position:relative;
+	width: 12px;
+	height: 12px;
+	position: relative;
 	background-color: transparent;
-	background-repeat:no-repeat;
+	background-repeat: no-repeat;
 }
 
 /*** Selection Frame ***/
 
-.Oryx_SelectionFrame{
-	position:absolute;
-	border:1px dotted gray;
-	background:none;
+.Oryx_SelectionFrame {
+	position: absolute;
+	border: 1px dotted gray;
+	background: none;
 }
 
 .LoadingIndicator {
-    background-image: url('../../images/loading.gif');
+	background-image: url('../../images/loading.gif');
 }
 
 .Oryx_hover, .Oryx_button:hover {
-    background-color: #999999;
-    background-color: rgba(193, 229, 238, 0.7);
-    opacity: 1 !important;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;
+	background-color: #999999;
+	background-color: rgba(193, 229, 238, 0.7);
+	opacity: 1 !important;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
 }
 
 .ValidateButton {
-    width:24px;
-    height:24px;
-    padding:2px;
-    position:absolute;
-    cursor: pointer;
+	width: 24px;
+	height: 24px;
+	padding: 2px;
+	position: absolute;
+	cursor: pointer;
 }
 
 .ValidateButton:hover {
-    background-color: #999999;
-    background-color: rgba(193, 229, 238, 0.7);
-    opacity: 1 !important;
-    -webkit-border-radius: 3px;
-    -moz-border-radius: 3px;
-    border-radius: 3px;
+	background-color: #999999;
+	background-color: rgba(193, 229, 238, 0.7);
+	opacity: 1 !important;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
 }
 
 .resizer_southeast {
-    background-image:url(../../images/se-handle-dark.gif);
-    cursor: se-resize;
-    background-position: 4px 4px;
+	background-image: url(../../images/se-handle-dark.gif);
+	cursor: se-resize;
+	background-position: 4px 4px;
 }
 
 .resizer_northwest {
-    background-image:url(../../images/nw-handle-dark.gif);
-    cursor: nw-resize;
-    background-position: -2px -2px;
+	background-image: url(../../images/nw-handle-dark.gif);
+	cursor: nw-resize;
+	background-position: -2px -2px;
 }
diff --git a/len-activiti/src/main/resources/static/editor-app/editor/i18n/translation_de.js b/len-activiti/src/main/resources/static/editor-app/editor/i18n/translation_de.js
index 0d588f0..f2080e4 100644
--- a/len-activiti/src/main/resources/static/editor-app/editor/i18n/translation_de.js
+++ b/len-activiti/src/main/resources/static/editor-app/editor/i18n/translation_de.js
@@ -1,22 +1,22 @@
 /**
  * @author nicolas.peters
- * 
+ *
  * Contains all strings for German language.
  * Version 1 - 08/29/08
  */
-if(!ORYX) var ORYX = {};
+if (!ORYX) var ORYX = {};
 
-if(!ORYX.I18N) ORYX.I18N = {};
+if (!ORYX.I18N) ORYX.I18N = {};
 
 ORYX.I18N.Language = "de_DE"; //Pattern <ISO language code>_<ISO country code> in lower case!
 
-if(!ORYX.I18N.Oryx) ORYX.I18N.Oryx = {};
+if (!ORYX.I18N.Oryx) ORYX.I18N.Oryx = {};
 
 ORYX.I18N.Oryx.pleaseWait = "Editor wird geladen. Bitte warten...";
 ORYX.I18N.Oryx.notLoggedOn = "Nicht angemeldet";
-ORYX.I18N.Oryx.noBackendDefined	= "Achtung! \n Es wurde kein Repository definiert.\n Ihr Model kann nicht geladen werden. Bitte nutzen sie eine Editor Konfiguration mit einem Speicher Plugin.";
+ORYX.I18N.Oryx.noBackendDefined = "Achtung! \n Es wurde kein Repository definiert.\n Ihr Model kann nicht geladen werden. Bitte nutzen sie eine Editor Konfiguration mit einem Speicher Plugin.";
 
-if(!ORYX.I18N.AddDocker) ORYX.I18N.AddDocker = {};
+if (!ORYX.I18N.AddDocker) ORYX.I18N.AddDocker = {};
 
 ORYX.I18N.AddDocker.group = "Docker";
 ORYX.I18N.AddDocker.add = "Docker Hinzufügen";
@@ -24,7 +24,7 @@ ORYX.I18N.AddDocker.addDesc = "Fügen Sie einer Kante einen Docker hinzu, indem
 ORYX.I18N.AddDocker.del = "Docker Löschen";
 ORYX.I18N.AddDocker.delDesc = "Löscht einen Docker durch Klicken auf den zu löschenden Docker";
 
-if(!ORYX.I18N.Arrangement) ORYX.I18N.Arrangement = {};
+if (!ORYX.I18N.Arrangement) ORYX.I18N.Arrangement = {};
 
 ORYX.I18N.Arrangement.groupZ = "Z-Order";
 ORYX.I18N.Arrangement.btf = "In den Vordergrund";
@@ -51,7 +51,7 @@ ORYX.I18N.Arrangement.arDesc = "Rechts ausrichten";
 ORYX.I18N.Arrangement.as = "Größenangleichung";
 ORYX.I18N.Arrangement.asDesc = "Größenangleichung";
 
-if(!ORYX.I18N.Edit) ORYX.I18N.Edit = {};
+if (!ORYX.I18N.Edit) ORYX.I18N.Edit = {};
 
 ORYX.I18N.Edit.group = "Edit";
 ORYX.I18N.Edit.cut = "Ausschneiden";
@@ -63,7 +63,7 @@ ORYX.I18N.Edit.pasteDesc = "Einfügen von kopierten/ausgeschnittenen Elementen";
 ORYX.I18N.Edit.del = "Löschen";
 ORYX.I18N.Edit.delDesc = "Löschen der selektierten Elemente";
 
-if(!ORYX.I18N.EPCSupport) ORYX.I18N.EPCSupport = {};
+if (!ORYX.I18N.EPCSupport) ORYX.I18N.EPCSupport = {};
 
 ORYX.I18N.EPCSupport.group = "EPC";
 ORYX.I18N.EPCSupport.exp = "EPML Export";
@@ -79,7 +79,7 @@ ORYX.I18N.EPCSupport.close = "Schließen";
 ORYX.I18N.EPCSupport.error = "Fehler";
 ORYX.I18N.EPCSupport.progressImp = "Importiere...";
 
-if(!ORYX.I18N.ERDFSupport) ORYX.I18N.ERDFSupport = {};
+if (!ORYX.I18N.ERDFSupport) ORYX.I18N.ERDFSupport = {};
 
 ORYX.I18N.ERDFSupport.exp = "ERDF Export";
 ORYX.I18N.ERDFSupport.expDesc = "Exportieren nach ERDF";
@@ -100,7 +100,7 @@ ORYX.I18N.ERDFSupport.close = "Schließen";
 ORYX.I18N.ERDFSupport.deprTitle = "Wirklich nach eRDF exportieren?";
 ORYX.I18N.ERDFSupport.deprText = "Der Export nach eRDF wird nicht empfohlen, da dieses Format in zukünftigen Versionen des Oryx Editors nicht mehr unterstützt wird. Verwenden Sie statt dessen den Export nach JSON, falls möglich. Wollen Sie dennoch das Model nach eRDF exportieren?";
 
-if(!ORYX.I18N.jPDLSupport) ORYX.I18N.jPDLSupport = {};
+if (!ORYX.I18N.jPDLSupport) ORYX.I18N.jPDLSupport = {};
 
 ORYX.I18N.jPDLSupport.group = "ExecBPMN";
 ORYX.I18N.jPDLSupport.exp = "jPDL Export";
@@ -110,7 +110,7 @@ ORYX.I18N.jPDLSupport.impDesc = "jPDL Datei importieren";
 ORYX.I18N.jPDLSupport.impFailedReq = "Anfrage für den Import der jPDL Datei ist fehlgeschlagen.";
 ORYX.I18N.jPDLSupport.impFailedJson = "Transformation der jPDL Datei ist fehlgeschlagen.";
 ORYX.I18N.jPDLSupport.impFailedJsonAbort = "Import abgebrochen.";
-ORYX.I18N.jPDLSupport.loadSseQuestionTitle = "Stencil Set Erweiterung für jBPM muss geladen werden"; 
+ORYX.I18N.jPDLSupport.loadSseQuestionTitle = "Stencil Set Erweiterung für jBPM muss geladen werden";
 ORYX.I18N.jPDLSupport.loadSseQuestionBody = "Um jPDL importieren zu können, muss die Stencil Set Erweiterung für jBPM geladen werden. Möchten Sie fortfahren?";
 ORYX.I18N.jPDLSupport.expFailedReq = "Anfrage für den Export des Models ist fehlgeschlagen.";
 ORYX.I18N.jPDLSupport.expFailedXml = "Export nach jPDL ist fehlgeschlagen. Exporter meldet: ";
@@ -122,7 +122,7 @@ ORYX.I18N.jPDLSupport.impBtn = "Importieren";
 ORYX.I18N.jPDLSupport.impProgress = "Importiere...";
 ORYX.I18N.jPDLSupport.close = "Schließen";
 
-if(!ORYX.I18N.Save) ORYX.I18N.Save = {};
+if (!ORYX.I18N.Save) ORYX.I18N.Save = {};
 
 ORYX.I18N.Save.group = "File";
 ORYX.I18N.Save.save = "Speichern";
@@ -141,7 +141,7 @@ ORYX.I18N.Save.noRights = "Sie haben nicht die erforderlichen Rechte, um Änderu
 ORYX.I18N.Save.saving = "Speichern";
 ORYX.I18N.Save.saveAsHint = "Das Diagramm wurde unter folgendem Link gespeichert:";
 
-if(!ORYX.I18N.File) ORYX.I18N.File = {};
+if (!ORYX.I18N.File) ORYX.I18N.File = {};
 
 ORYX.I18N.File.group = "File";
 ORYX.I18N.File.print = "Drucken";
@@ -155,7 +155,7 @@ ORYX.I18N.File.genPDFFailed = "Die Generierung der PDF Datei ist fehlgeschlagen.
 ORYX.I18N.File.printTitle = "Drucken";
 ORYX.I18N.File.printMsg = "Leider arbeitet die Druckfunktion zur Zeit nicht immer korrekt. Bitte nutzen Sie den PDF Export, und drucken Sie das PDF Dokument aus. Möchten Sie dennoch mit dem Drucken fortfahren?";
 
-if(!ORYX.I18N.Grouping) ORYX.I18N.Grouping = {};
+if (!ORYX.I18N.Grouping) ORYX.I18N.Grouping = {};
 
 ORYX.I18N.Grouping.grouping = "Grouping";
 ORYX.I18N.Grouping.group = "Gruppieren";
@@ -163,11 +163,11 @@ ORYX.I18N.Grouping.groupDesc = "Gruppierung der selektierten Elemente";
 ORYX.I18N.Grouping.ungroup = "Gruppierung aufheben";
 ORYX.I18N.Grouping.ungroupDesc = "Aufheben aller Gruppierungen der selektierten Elemente";
 
-if(!ORYX.I18N.Loading) ORYX.I18N.Loading = {};
+if (!ORYX.I18N.Loading) ORYX.I18N.Loading = {};
 
-ORYX.I18N.Loading.waiting ="Bitte warten...";
+ORYX.I18N.Loading.waiting = "Bitte warten...";
 
-if(!ORYX.I18N.PropertyWindow) ORYX.I18N.PropertyWindow = {};
+if (!ORYX.I18N.PropertyWindow) ORYX.I18N.PropertyWindow = {};
 
 ORYX.I18N.PropertyWindow.name = "Name";
 ORYX.I18N.PropertyWindow.value = "Wert";
@@ -181,13 +181,13 @@ ORYX.I18N.PropertyWindow.ok = "Ok";
 ORYX.I18N.PropertyWindow.cancel = "Abbrechen";
 ORYX.I18N.PropertyWindow.dateFormat = "d/m/y";
 
-if(!ORYX.I18N.ShapeMenuPlugin) ORYX.I18N.ShapeMenuPlugin = {};
+if (!ORYX.I18N.ShapeMenuPlugin) ORYX.I18N.ShapeMenuPlugin = {};
 
 ORYX.I18N.ShapeMenuPlugin.drag = "Ziehen";
 ORYX.I18N.ShapeMenuPlugin.clickDrag = "Klicken oder ziehen";
 ORYX.I18N.ShapeMenuPlugin.morphMsg = "Shape morphen";
 
-if(!ORYX.I18N.SyntaxChecker) ORYX.I18N.SyntaxChecker = {};
+if (!ORYX.I18N.SyntaxChecker) ORYX.I18N.SyntaxChecker = {};
 
 ORYX.I18N.SyntaxChecker.group = "Verification";
 ORYX.I18N.SyntaxChecker.name = "Syntax-Checker";
@@ -196,7 +196,7 @@ ORYX.I18N.SyntaxChecker.noErrors = "Es wurden keine Syntaxfehler gefunden.";
 ORYX.I18N.SyntaxChecker.invalid = "Ungültige Antwort vom Server.";
 ORYX.I18N.SyntaxChecker.checkingMessage = "Überprüfung wird durchgeführt ...";
 
-if(!ORYX.I18N.Undo) ORYX.I18N.Undo = {};
+if (!ORYX.I18N.Undo) ORYX.I18N.Undo = {};
 
 ORYX.I18N.Undo.group = "Undo";
 ORYX.I18N.Undo.undo = "Rückgängig";
@@ -204,7 +204,7 @@ ORYX.I18N.Undo.undoDesc = "Rückgängig";
 ORYX.I18N.Undo.redo = "Wiederherstellen";
 ORYX.I18N.Undo.redoDesc = "Wiederherstellen";
 
-if(!ORYX.I18N.View) ORYX.I18N.View = {};
+if (!ORYX.I18N.View) ORYX.I18N.View = {};
 
 ORYX.I18N.View.group = "Zoom";
 ORYX.I18N.View.zoomIn = "Vergrößern";
@@ -220,7 +220,7 @@ ORYX.I18N.View.zoomFitToModelDesc = "Modelgröße";
 
 ORYX.I18N.PropertyWindow.title = "Eigenschaften";
 
-if(!ORYX.I18N.ShapeRepository) ORYX.I18N.ShapeRepository = {};
+if (!ORYX.I18N.ShapeRepository) ORYX.I18N.ShapeRepository = {};
 ORYX.I18N.ShapeRepository.title = "Shape Verzeichnis";
 
 ORYX.I18N.Save.dialogDesciption = "Bitte geben Sie einen Namen, eine Beschreibung und einen Kommentar ein.";
@@ -229,44 +229,44 @@ ORYX.I18N.Save.dialogLabelDesc = "Beschreibung";
 ORYX.I18N.Save.dialogLabelType = "Typ";
 ORYX.I18N.Save.dialogLabelComment = "Revisionskommentar";
 
-if(!ORYX.I18N.Perspective) ORYX.I18N.Perspective = {};
+if (!ORYX.I18N.Perspective) ORYX.I18N.Perspective = {};
 ORYX.I18N.Perspective.no = "Keine Perspektive"
 ORYX.I18N.Perspective.noTip = "Zurücksetzen der aktuellen Perspektive"
 
 /** New Language Properties: 21.04.2009 */
 ORYX.I18N.JSONSupport = {
-    imp: {
-        name: "JSON importieren",
-        desc: "Importiert ein neues Modell aus JSON",
-        group: "Export",
-        selectFile: "Wählen Sie eine JSON-Datei (*.json) aus, die Sie importieren möchten, oder fügen Sie JSON in das Textfeld ein.",
-        file: "Datei",
-        btnImp: "Importieren",
-        btnClose: "Schließen",
-        progress: "Importieren ...",
-        syntaxError: "Syntaxfehler"
-    },
-    exp: {
-        name: "Nach JSON exportieren",
-        desc: "Exportiert das aktuelle Modell nach JSON",
-        group: "Export"
-    }
+	imp: {
+		name: "JSON importieren",
+		desc: "Importiert ein neues Modell aus JSON",
+		group: "Export",
+		selectFile: "Wählen Sie eine JSON-Datei (*.json) aus, die Sie importieren möchten, oder fügen Sie JSON in das Textfeld ein.",
+		file: "Datei",
+		btnImp: "Importieren",
+		btnClose: "Schließen",
+		progress: "Importieren ...",
+		syntaxError: "Syntaxfehler"
+	},
+	exp: {
+		name: "Nach JSON exportieren",
+		desc: "Exportiert das aktuelle Modell nach JSON",
+		group: "Export"
+	}
 };
 
 /** New Language Properties: 09.05.2009 */
-if(!ORYX.I18N.JSONImport) ORYX.I18N.JSONImport = {};
+if (!ORYX.I18N.JSONImport) ORYX.I18N.JSONImport = {};
 
 ORYX.I18N.JSONImport.title = "JSON Import";
 ORYX.I18N.JSONImport.wrongSS = "Das Stencil Set der importierten Datei ({0}) entspricht nicht dem geladenen Stencil Set ({1})."
 
 /** New Language Properties: 14.05.2009 */
-if(!ORYX.I18N.RDFExport) ORYX.I18N.RDFExport = {};
+if (!ORYX.I18N.RDFExport) ORYX.I18N.RDFExport = {};
 ORYX.I18N.RDFExport.group = "Export";
 ORYX.I18N.RDFExport.rdfExport = "Nach RDF exportieren";
 ORYX.I18N.RDFExport.rdfExportDescription = "Exportiert das aktuelle Model in die XML-Serialisierung des Resource Description Frameworks (RDF)";
 
 /** New Language Properties: 15.05.2009*/
-if(!ORYX.I18N.SyntaxChecker.BPMN) ORYX.I18N.SyntaxChecker.BPMN={};
+if (!ORYX.I18N.SyntaxChecker.BPMN) ORYX.I18N.SyntaxChecker.BPMN = {};
 ORYX.I18N.SyntaxChecker.BPMN_NO_SOURCE = "Eine Kante muss einen Ursprung haben.";
 ORYX.I18N.SyntaxChecker.BPMN_NO_TARGET = "Eine Kante muss ein Ziel haben.";
 ORYX.I18N.SyntaxChecker.BPMN_DIFFERENT_PROCESS = "Ursprungs- und Zielknoten müssen im gleichen Prozess sein.";
@@ -281,18 +281,18 @@ ORYX.I18N.SyntaxChecker.BPMN_ENDEVENT_WITH_OUTGOING_CONTROL_FLOW = "End-Ereignis
 ORYX.I18N.SyntaxChecker.BPMN_EVENTBASEDGATEWAY_BADCONTINUATION = "Auf Ereignis-basierte Gateways dürfen weder Gateways noch Subprozesse folgen.";
 ORYX.I18N.SyntaxChecker.BPMN_NODE_NOT_ALLOWED = "Knotentyp ist nicht erlaubt.";
 
-if(!ORYX.I18N.SyntaxChecker.IBPMN) ORYX.I18N.SyntaxChecker.IBPMN={};
+if (!ORYX.I18N.SyntaxChecker.IBPMN) ORYX.I18N.SyntaxChecker.IBPMN = {};
 ORYX.I18N.SyntaxChecker.IBPMN_NO_ROLE_SET = "Für Interaktionen muss ein Sender und ein Empfänger definiert sein.";
 ORYX.I18N.SyntaxChecker.IBPMN_NO_INCOMING_SEQFLOW = "Dieser Knoten muss eingehenden Sequenzfluss besitzen.";
 ORYX.I18N.SyntaxChecker.IBPMN_NO_OUTGOING_SEQFLOW = "Dieser Knoten muss ausgehenden Sequenzfluss besitzen.";
 
-if(!ORYX.I18N.SyntaxChecker.InteractionNet) ORYX.I18N.SyntaxChecker.InteractionNet={};
+if (!ORYX.I18N.SyntaxChecker.InteractionNet) ORYX.I18N.SyntaxChecker.InteractionNet = {};
 ORYX.I18N.SyntaxChecker.InteractionNet_SENDER_NOT_SET = "Sender ist nicht definiert";
 ORYX.I18N.SyntaxChecker.InteractionNet_RECEIVER_NOT_SET = "Empfänger ist nicht definiert";
 ORYX.I18N.SyntaxChecker.InteractionNet_MESSAGETYPE_NOT_SET = "Nachrichtentyp ist nicht definiert.";
 ORYX.I18N.SyntaxChecker.InteractionNet_ROLE_NOT_SET = "Rolle ist nicht definiert.";
 
-if(!ORYX.I18N.SyntaxChecker.EPC) ORYX.I18N.SyntaxChecker.EPC={};
+if (!ORYX.I18N.SyntaxChecker.EPC) ORYX.I18N.SyntaxChecker.EPC = {};
 ORYX.I18N.SyntaxChecker.EPC_NO_SOURCE = "Eine Kante muss einen Ursprung haben.";
 ORYX.I18N.SyntaxChecker.EPC_NO_TARGET = "Eine Kante muss ein Ziel haben.";
 ORYX.I18N.SyntaxChecker.EPC_NOT_CONNECTED = "Dieser Knoten muss eingehende oder ausgehende Kanten besitzen.";
@@ -302,13 +302,13 @@ ORYX.I18N.SyntaxChecker.EPC_NO_CORRECT_CONNECTOR = "Knoten ist kein korrekter Ko
 ORYX.I18N.SyntaxChecker.EPC_MANY_STARTS = "Es darf nur ein Start-Ereignis geben.";
 ORYX.I18N.SyntaxChecker.EPC_FUNCTION_AFTER_OR = "Funktionen hinter einem OR-/XOR-Split sind nicht erlaubt.";
 ORYX.I18N.SyntaxChecker.EPC_PI_AFTER_OR = "Prozessschnittstellen hinter einem OR-/XOR-Split ist nicht erlaubt.";
-ORYX.I18N.SyntaxChecker.EPC_FUNCTION_AFTER_FUNCTION =  "Auf eine Funktion darf keine Funktion folgen.";
-ORYX.I18N.SyntaxChecker.EPC_EVENT_AFTER_EVENT =  "Auf ein Ereignis darf kein Ereignis folgen.";
-ORYX.I18N.SyntaxChecker.EPC_PI_AFTER_FUNCTION =  "Auf eine Funktion darf keine Prozessschnittstelle folgen.";
-ORYX.I18N.SyntaxChecker.EPC_FUNCTION_AFTER_PI =  "Auf eine Prozessschnittstelle darf keine Funktion folgen.";
+ORYX.I18N.SyntaxChecker.EPC_FUNCTION_AFTER_FUNCTION = "Auf eine Funktion darf keine Funktion folgen.";
+ORYX.I18N.SyntaxChecker.EPC_EVENT_AFTER_EVENT = "Auf ein Ereignis darf kein Ereignis folgen.";
+ORYX.I18N.SyntaxChecker.EPC_PI_AFTER_FUNCTION = "Auf eine Funktion darf keine Prozessschnittstelle folgen.";
+ORYX.I18N.SyntaxChecker.EPC_FUNCTION_AFTER_PI = "Auf eine Prozessschnittstelle darf keine Funktion folgen.";
 ORYX.I18N.SyntaxChecker.EPC_SOURCE_EQUALS_TARGET = "Eine Kante muss zwei verschiedene Knoten verbinden."
 
-if(!ORYX.I18N.SyntaxChecker.PetriNet) ORYX.I18N.SyntaxChecker.PetriNet={};
+if (!ORYX.I18N.SyntaxChecker.PetriNet) ORYX.I18N.SyntaxChecker.PetriNet = {};
 ORYX.I18N.SyntaxChecker.PetriNet_NOT_BIPARTITE = "Der Graph ist nicht bepartit.";
 ORYX.I18N.SyntaxChecker.PetriNet_NO_LABEL = "Bezeichnung für einen bezeichnete Transition ist nicht gesetzt.";
 ORYX.I18N.SyntaxChecker.PetriNet_NO_ID = "Ein Knoten besitzt keine ID.";
@@ -323,19 +323,19 @@ ORYX.I18N.Node = "Knoten";
 ORYX.I18N.SyntaxChecker.notice = "Bitte bewegen Sie den Mauszeiger über ein rotes Kreuz, um die Details zu erfahren.";
 
 /** New Language Properties: 15.07.2009*/
-if(!ORYX.I18N.Layouting) ORYX.I18N.Layouting ={};
+if (!ORYX.I18N.Layouting) ORYX.I18N.Layouting = {};
 ORYX.I18N.Layouting.doing = "Layouten...";
 
 /** New Language Properties: 18.08.2009*/
 ORYX.I18N.SyntaxChecker.MULT_ERRORS = "Mehrere Fehler";
 
 /** New Language Properties: 08.09.2009*/
-if(!ORYX.I18N.PropertyWindow) ORYX.I18N.PropertyWindow = {};
+if (!ORYX.I18N.PropertyWindow) ORYX.I18N.PropertyWindow = {};
 ORYX.I18N.PropertyWindow.oftenUsed = "Hauptattribute";
 ORYX.I18N.PropertyWindow.moreProps = "Mehr Attribute";
 
 /** New Language Properties 01.10.2009 */
-if(!ORYX.I18N.SyntaxChecker.BPMN2) ORYX.I18N.SyntaxChecker.BPMN2 = {};
+if (!ORYX.I18N.SyntaxChecker.BPMN2) ORYX.I18N.SyntaxChecker.BPMN2 = {};
 
 ORYX.I18N.SyntaxChecker.BPMN2_DATA_INPUT_WITH_INCOMING_DATA_ASSOCIATION = "Ein Dateninput darf keine ausgehenden Datenassoziationen haben.";
 ORYX.I18N.SyntaxChecker.BPMN2_DATA_OUTPUT_WITH_OUTGOING_DATA_ASSOCIATION = "Ein Datenoutput darf keine eingehenden Datenassoziationen haben.";
@@ -360,13 +360,13 @@ ORYX.I18N.SyntaxChecker.BPMN2_EVENT_SUBPROCESS_BAD_CONNECTION = "Ein Ereignis-Un
 ORYX.I18N.SyntaxChecker.BPMN_MESSAGE_FLOW_NOT_CONNECTED = "Mindestens ein Ende des Nachrichtenflusses muss mit einem anderen Objekt verbunden sein.";
 
 /** New Language Properties 05.11.2009 */
-if(!ORYX.I18N.RESIZE) ORYX.I18N.RESIZE = {};
+if (!ORYX.I18N.RESIZE) ORYX.I18N.RESIZE = {};
 ORYX.I18N.RESIZE.tipGrow = "Zeichenfläche vergrößern:";
 ORYX.I18N.RESIZE.tipShrink = "Zeichenfläche verkleinern:";
 ORYX.I18N.RESIZE.N = "Nach oben";
 ORYX.I18N.RESIZE.W = "Nach links";
-ORYX.I18N.RESIZE.S ="Nach unten";
-ORYX.I18N.RESIZE.E ="Nach rechts";
+ORYX.I18N.RESIZE.S = "Nach unten";
+ORYX.I18N.RESIZE.E = "Nach rechts";
 
 /** New Language Properties 24.11.2009 */
 ORYX.I18N.SyntaxChecker.BPMN2_TOO_MANY_INITIATING_MESSAGES = "Eine Choreographie-Aktivität darf nur eine initiierende Nachricht besitzen.";
diff --git a/len-activiti/src/main/resources/static/editor-app/editor/i18n/translation_en_us.js b/len-activiti/src/main/resources/static/editor-app/editor/i18n/translation_en_us.js
index 6c3ebc0..16ba519 100644
--- a/len-activiti/src/main/resources/static/editor-app/editor/i18n/translation_en_us.js
+++ b/len-activiti/src/main/resources/static/editor-app/editor/i18n/translation_en_us.js
@@ -1,24 +1,24 @@
 /**
  * @author nicolas.peters
- * 
+ *
  * Contains all strings for the default language (en-us).
  * Version 1 - 08/29/08
  */
-if(!ORYX) var ORYX = {};
+if (!ORYX) var ORYX = {};
 
-if(!ORYX.I18N) ORYX.I18N = {};
+if (!ORYX.I18N) ORYX.I18N = {};
 
 ORYX.I18N.Language = "en_us"; //Pattern <ISO language code>_<ISO country code> in lower case!
 
-if(!ORYX.I18N.Oryx) ORYX.I18N.Oryx = {};
+if (!ORYX.I18N.Oryx) ORYX.I18N.Oryx = {};
 
-ORYX.I18N.Oryx.title		= "Oryx";
-ORYX.I18N.Oryx.noBackendDefined	= "Caution! \nNo Backend defined.\n The requested model cannot be loaded. Try to load a configuration with a save plugin.";
-ORYX.I18N.Oryx.pleaseWait 	= "Please wait while loading...";
+ORYX.I18N.Oryx.title = "Oryx";
+ORYX.I18N.Oryx.noBackendDefined = "Caution! \nNo Backend defined.\n The requested model cannot be loaded. Try to load a configuration with a save plugin.";
+ORYX.I18N.Oryx.pleaseWait = "Please wait while loading...";
 ORYX.I18N.Oryx.notLoggedOn = "Not logged on";
 ORYX.I18N.Oryx.editorOpenTimeout = "The editor does not seem to be started yet. Please check, whether you have a popup blocker enabled and disable it or allow popups for this site. We will never display any commercials on this site.";
 
-if(!ORYX.I18N.AddDocker) ORYX.I18N.AddDocker = {};
+if (!ORYX.I18N.AddDocker) ORYX.I18N.AddDocker = {};
 
 ORYX.I18N.AddDocker.group = "Docker";
 ORYX.I18N.AddDocker.add = "Add Docker";
@@ -26,7 +26,7 @@ ORYX.I18N.AddDocker.addDesc = "Add a Docker to an edge, by clicking on it";
 ORYX.I18N.AddDocker.del = "Delete Docker";
 ORYX.I18N.AddDocker.delDesc = "Delete a Docker";
 
-if(!ORYX.I18N.Arrangement) ORYX.I18N.Arrangement = {};
+if (!ORYX.I18N.Arrangement) ORYX.I18N.Arrangement = {};
 
 ORYX.I18N.Arrangement.groupZ = "Z-Order";
 ORYX.I18N.Arrangement.btf = "Bring To Front";
@@ -53,7 +53,7 @@ ORYX.I18N.Arrangement.arDesc = "Right";
 ORYX.I18N.Arrangement.as = "Alignment Same Size";
 ORYX.I18N.Arrangement.asDesc = "Same Size";
 
-if(!ORYX.I18N.Edit) ORYX.I18N.Edit = {};
+if (!ORYX.I18N.Edit) ORYX.I18N.Edit = {};
 
 ORYX.I18N.Edit.group = "Edit";
 ORYX.I18N.Edit.cut = "Cut";
@@ -65,7 +65,7 @@ ORYX.I18N.Edit.pasteDesc = "Pastes the Oryx clipboard to the canvas";
 ORYX.I18N.Edit.del = "Delete";
 ORYX.I18N.Edit.delDesc = "Deletes all selected shapes";
 
-if(!ORYX.I18N.EPCSupport) ORYX.I18N.EPCSupport = {};
+if (!ORYX.I18N.EPCSupport) ORYX.I18N.EPCSupport = {};
 
 ORYX.I18N.EPCSupport.group = "EPC";
 ORYX.I18N.EPCSupport.exp = "Export EPC";
@@ -81,7 +81,7 @@ ORYX.I18N.EPCSupport.close = "Close";
 ORYX.I18N.EPCSupport.error = "Error";
 ORYX.I18N.EPCSupport.progressImp = "Import...";
 
-if(!ORYX.I18N.ERDFSupport) ORYX.I18N.ERDFSupport = {};
+if (!ORYX.I18N.ERDFSupport) ORYX.I18N.ERDFSupport = {};
 
 ORYX.I18N.ERDFSupport.exp = "Export to ERDF";
 ORYX.I18N.ERDFSupport.expDesc = "Export to ERDF";
@@ -102,7 +102,7 @@ ORYX.I18N.ERDFSupport.close = "Close";
 ORYX.I18N.ERDFSupport.deprTitle = "Really export to eRDF?";
 ORYX.I18N.ERDFSupport.deprText = "Exporting to eRDF is not recommended anymore because the support will be stopped in future versions of the Oryx editor. If possible, export the model to JSON. Do you want to export anyway?";
 
-if(!ORYX.I18N.jPDLSupport) ORYX.I18N.jPDLSupport = {};
+if (!ORYX.I18N.jPDLSupport) ORYX.I18N.jPDLSupport = {};
 
 ORYX.I18N.jPDLSupport.group = "ExecBPMN";
 ORYX.I18N.jPDLSupport.exp = "Export to jPDL";
@@ -112,7 +112,7 @@ ORYX.I18N.jPDLSupport.impDesc = "Import jPDL File";
 ORYX.I18N.jPDLSupport.impFailedReq = "Request for import of jPDL failed.";
 ORYX.I18N.jPDLSupport.impFailedJson = "Transformation of jPDL failed.";
 ORYX.I18N.jPDLSupport.impFailedJsonAbort = "Import aborted.";
-ORYX.I18N.jPDLSupport.loadSseQuestionTitle = "jBPM stencil set extension needs to be loaded"; 
+ORYX.I18N.jPDLSupport.loadSseQuestionTitle = "jBPM stencil set extension needs to be loaded";
 ORYX.I18N.jPDLSupport.loadSseQuestionBody = "In order to import jPDL, the stencil set extension has to be loaded. Do you want to proceed?";
 ORYX.I18N.jPDLSupport.expFailedReq = "Request for export of model failed.";
 ORYX.I18N.jPDLSupport.expFailedXml = "Export to jPDL failed. Exporter reported: ";
@@ -124,7 +124,7 @@ ORYX.I18N.jPDLSupport.impBtn = "Import";
 ORYX.I18N.jPDLSupport.impProgress = "Importing...";
 ORYX.I18N.jPDLSupport.close = "Close";
 
-if(!ORYX.I18N.Save) ORYX.I18N.Save = {};
+if (!ORYX.I18N.Save) ORYX.I18N.Save = {};
 
 ORYX.I18N.Save.group = "File";
 ORYX.I18N.Save.save = "Save";
@@ -143,7 +143,7 @@ ORYX.I18N.Save.noRights = "You have no rights to save changes.";
 ORYX.I18N.Save.saving = "Saving";
 ORYX.I18N.Save.saveAsHint = "The process diagram is stored under:";
 
-if(!ORYX.I18N.File) ORYX.I18N.File = {};
+if (!ORYX.I18N.File) ORYX.I18N.File = {};
 
 ORYX.I18N.File.group = "File";
 ORYX.I18N.File.print = "Print";
@@ -157,7 +157,7 @@ ORYX.I18N.File.genPDFFailed = "Generating PDF failed.";
 ORYX.I18N.File.printTitle = "Print";
 ORYX.I18N.File.printMsg = "We are currently experiencing problems with the printing function. We recommend using the PDF Export to print the diagram. Do you really want to continue printing?";
 
-if(!ORYX.I18N.Grouping) ORYX.I18N.Grouping = {};
+if (!ORYX.I18N.Grouping) ORYX.I18N.Grouping = {};
 
 ORYX.I18N.Grouping.grouping = "Grouping";
 ORYX.I18N.Grouping.group = "Group";
@@ -165,11 +165,11 @@ ORYX.I18N.Grouping.groupDesc = "Groups all selected shapes";
 ORYX.I18N.Grouping.ungroup = "Ungroup";
 ORYX.I18N.Grouping.ungroupDesc = "Deletes the group of all selected Shapes";
 
-if(!ORYX.I18N.Loading) ORYX.I18N.Loading = {};
+if (!ORYX.I18N.Loading) ORYX.I18N.Loading = {};
 
-ORYX.I18N.Loading.waiting ="Please wait...";
+ORYX.I18N.Loading.waiting = "Please wait...";
 
-if(!ORYX.I18N.PropertyWindow) ORYX.I18N.PropertyWindow = {};
+if (!ORYX.I18N.PropertyWindow) ORYX.I18N.PropertyWindow = {};
 
 ORYX.I18N.PropertyWindow.name = "Name";
 ORYX.I18N.PropertyWindow.value = "Value";
@@ -183,13 +183,13 @@ ORYX.I18N.PropertyWindow.ok = "Ok";
 ORYX.I18N.PropertyWindow.cancel = "Cancel";
 ORYX.I18N.PropertyWindow.dateFormat = "m/d/y";
 
-if(!ORYX.I18N.ShapeMenuPlugin) ORYX.I18N.ShapeMenuPlugin = {};
+if (!ORYX.I18N.ShapeMenuPlugin) ORYX.I18N.ShapeMenuPlugin = {};
 
 ORYX.I18N.ShapeMenuPlugin.drag = "Drag";
 ORYX.I18N.ShapeMenuPlugin.clickDrag = "Click or drag";
 ORYX.I18N.ShapeMenuPlugin.morphMsg = "Morph shape";
 
-if(!ORYX.I18N.SyntaxChecker) ORYX.I18N.SyntaxChecker = {};
+if (!ORYX.I18N.SyntaxChecker) ORYX.I18N.SyntaxChecker = {};
 
 ORYX.I18N.SyntaxChecker.group = "Verification";
 ORYX.I18N.SyntaxChecker.name = "Syntax Checker";
@@ -198,25 +198,25 @@ ORYX.I18N.SyntaxChecker.noErrors = "There are no syntax errors.";
 ORYX.I18N.SyntaxChecker.invalid = "Invalid answer from server.";
 ORYX.I18N.SyntaxChecker.checkingMessage = "Checking ...";
 
-if(!ORYX.I18N.FormHandler) ORYX.I18N.FormHandler = {};
+if (!ORYX.I18N.FormHandler) ORYX.I18N.FormHandler = {};
 
 ORYX.I18N.FormHandler.group = "FormHandling";
 ORYX.I18N.FormHandler.name = "FormHandler";
 ORYX.I18N.FormHandler.desc = "Testing from handling";
 
-if(!ORYX.I18N.Deployer) ORYX.I18N.Deployer = {};
+if (!ORYX.I18N.Deployer) ORYX.I18N.Deployer = {};
 
 ORYX.I18N.Deployer.group = "Deployment";
 ORYX.I18N.Deployer.name = "Deployer";
 ORYX.I18N.Deployer.desc = "Deploy to engine";
 
-if(!ORYX.I18N.Tester) ORYX.I18N.Tester = {};
+if (!ORYX.I18N.Tester) ORYX.I18N.Tester = {};
 
 ORYX.I18N.Tester.group = "Testing";
 ORYX.I18N.Tester.name = "Test process";
 ORYX.I18N.Tester.desc = "Open the test component to test this process definition";
 
-if(!ORYX.I18N.Undo) ORYX.I18N.Undo = {};
+if (!ORYX.I18N.Undo) ORYX.I18N.Undo = {};
 
 ORYX.I18N.Undo.group = "Undo";
 ORYX.I18N.Undo.undo = "Undo";
@@ -224,7 +224,7 @@ ORYX.I18N.Undo.undoDesc = "Undo the last action";
 ORYX.I18N.Undo.redo = "Redo";
 ORYX.I18N.Undo.redoDesc = "Redo the last undone action";
 
-if(!ORYX.I18N.View) ORYX.I18N.View = {};
+if (!ORYX.I18N.View) ORYX.I18N.View = {};
 
 ORYX.I18N.View.group = "Zoom";
 ORYX.I18N.View.zoomIn = "Zoom In";
@@ -236,7 +236,7 @@ ORYX.I18N.View.zoomStandardDesc = "Zoom to the standard level";
 ORYX.I18N.View.zoomFitToModel = "Zoom fit to model";
 ORYX.I18N.View.zoomFitToModelDesc = "Zoom to fit the model size";
 
-if(!ORYX.I18N.XFormsSerialization) ORYX.I18N.XFormsSerialization = {};
+if (!ORYX.I18N.XFormsSerialization) ORYX.I18N.XFormsSerialization = {};
 
 ORYX.I18N.XFormsSerialization.group = "XForms Serialization";
 ORYX.I18N.XFormsSerialization.exportXForms = "XForms Export";
@@ -260,7 +260,7 @@ ORYX.I18N.XFormsSerialization.close = "Close";
 
 ORYX.I18N.PropertyWindow.title = "Properties";
 
-if(!ORYX.I18N.ShapeRepository) ORYX.I18N.ShapeRepository = {};
+if (!ORYX.I18N.ShapeRepository) ORYX.I18N.ShapeRepository = {};
 ORYX.I18N.ShapeRepository.title = "Shape Repository";
 
 ORYX.I18N.Save.dialogDesciption = "Please enter a name, a description and a comment.";
@@ -269,44 +269,44 @@ ORYX.I18N.Save.dialogLabelDesc = "Description";
 ORYX.I18N.Save.dialogLabelType = "Type";
 ORYX.I18N.Save.dialogLabelComment = "Revision comment";
 
-if(!ORYX.I18N.Perspective) ORYX.I18N.Perspective = {};
+if (!ORYX.I18N.Perspective) ORYX.I18N.Perspective = {};
 ORYX.I18N.Perspective.no = "No Perspective"
 ORYX.I18N.Perspective.noTip = "Unload the current perspective"
 
 /** New Language Properties: 21.04.2009 */
 ORYX.I18N.JSONSupport = {
-    imp: {
-        name: "Import from JSON",
-        desc: "Imports a model from JSON",
-        group: "Export",
-        selectFile: "Select an JSON (.json) file or type in JSON to import it!",
-        file: "File",
-        btnImp: "Import",
-        btnClose: "Close",
-        progress: "Importing ...",
-        syntaxError: "Syntax error"
-    },
-    exp: {
-        name: "Export to JSON",
-        desc: "Exports current model to JSON",
-        group: "Export"
-    }
+	imp: {
+		name: "Import from JSON",
+		desc: "Imports a model from JSON",
+		group: "Export",
+		selectFile: "Select an JSON (.json) file or type in JSON to import it!",
+		file: "File",
+		btnImp: "Import",
+		btnClose: "Close",
+		progress: "Importing ...",
+		syntaxError: "Syntax error"
+	},
+	exp: {
+		name: "Export to JSON",
+		desc: "Exports current model to JSON",
+		group: "Export"
+	}
 };
 
 /** New Language Properties: 09.05.2009 */
-if(!ORYX.I18N.JSONImport) ORYX.I18N.JSONImport = {};
+if (!ORYX.I18N.JSONImport) ORYX.I18N.JSONImport = {};
 
 ORYX.I18N.JSONImport.title = "JSON Import";
 ORYX.I18N.JSONImport.wrongSS = "The stencil set of the imported file ({0}) does not match to the loaded stencil set ({1})."
 
 /** New Language Properties: 14.05.2009 */
-if(!ORYX.I18N.RDFExport) ORYX.I18N.RDFExport = {};
+if (!ORYX.I18N.RDFExport) ORYX.I18N.RDFExport = {};
 ORYX.I18N.RDFExport.group = "Export";
 ORYX.I18N.RDFExport.rdfExport = "Export to RDF";
 ORYX.I18N.RDFExport.rdfExportDescription = "Exports current model to the XML serialization defined for the Resource Description Framework (RDF)";
 
 /** New Language Properties: 15.05.2009*/
-if(!ORYX.I18N.SyntaxChecker.BPMN) ORYX.I18N.SyntaxChecker.BPMN={};
+if (!ORYX.I18N.SyntaxChecker.BPMN) ORYX.I18N.SyntaxChecker.BPMN = {};
 ORYX.I18N.SyntaxChecker.BPMN_NO_SOURCE = "An edge must have a source.";
 ORYX.I18N.SyntaxChecker.BPMN_NO_TARGET = "An edge must have a target.";
 ORYX.I18N.SyntaxChecker.BPMN_DIFFERENT_PROCESS = "Source and target node must be contained in the same process.";
@@ -321,18 +321,18 @@ ORYX.I18N.SyntaxChecker.BPMN_ENDEVENT_WITH_OUTGOING_CONTROL_FLOW = "End events m
 ORYX.I18N.SyntaxChecker.BPMN_EVENTBASEDGATEWAY_BADCONTINUATION = "Event-based gateways must not be followed by gateways or subprocesses.";
 ORYX.I18N.SyntaxChecker.BPMN_NODE_NOT_ALLOWED = "Node type is not allowed.";
 
-if(!ORYX.I18N.SyntaxChecker.IBPMN) ORYX.I18N.SyntaxChecker.IBPMN={};
+if (!ORYX.I18N.SyntaxChecker.IBPMN) ORYX.I18N.SyntaxChecker.IBPMN = {};
 ORYX.I18N.SyntaxChecker.IBPMN_NO_ROLE_SET = "Interactions must have a sender and a receiver role set";
 ORYX.I18N.SyntaxChecker.IBPMN_NO_INCOMING_SEQFLOW = "This node must have incoming sequence flow.";
 ORYX.I18N.SyntaxChecker.IBPMN_NO_OUTGOING_SEQFLOW = "This node must have outgoing sequence flow.";
 
-if(!ORYX.I18N.SyntaxChecker.InteractionNet) ORYX.I18N.SyntaxChecker.InteractionNet={};
+if (!ORYX.I18N.SyntaxChecker.InteractionNet) ORYX.I18N.SyntaxChecker.InteractionNet = {};
 ORYX.I18N.SyntaxChecker.InteractionNet_SENDER_NOT_SET = "Sender not set";
 ORYX.I18N.SyntaxChecker.InteractionNet_RECEIVER_NOT_SET = "Receiver not set";
 ORYX.I18N.SyntaxChecker.InteractionNet_MESSAGETYPE_NOT_SET = "Message type not set";
 ORYX.I18N.SyntaxChecker.InteractionNet_ROLE_NOT_SET = "Role not set";
 
-if(!ORYX.I18N.SyntaxChecker.EPC) ORYX.I18N.SyntaxChecker.EPC={};
+if (!ORYX.I18N.SyntaxChecker.EPC) ORYX.I18N.SyntaxChecker.EPC = {};
 ORYX.I18N.SyntaxChecker.EPC_NO_SOURCE = "Each edge must have a source.";
 ORYX.I18N.SyntaxChecker.EPC_NO_TARGET = "Each edge must have a target.";
 ORYX.I18N.SyntaxChecker.EPC_NOT_CONNECTED = "Node must be connected with edges.";
@@ -342,13 +342,13 @@ ORYX.I18N.SyntaxChecker.EPC_NO_CORRECT_CONNECTOR = "Node is no correct connector
 ORYX.I18N.SyntaxChecker.EPC_MANY_STARTS = "There must be only one start event.";
 ORYX.I18N.SyntaxChecker.EPC_FUNCTION_AFTER_OR = "There must be no functions after a splitting OR/XOR.";
 ORYX.I18N.SyntaxChecker.EPC_PI_AFTER_OR = "There must be no process interface after a splitting OR/XOR.";
-ORYX.I18N.SyntaxChecker.EPC_FUNCTION_AFTER_FUNCTION =  "There must be no function after a function.";
-ORYX.I18N.SyntaxChecker.EPC_EVENT_AFTER_EVENT =  "There must be no event after an event.";
-ORYX.I18N.SyntaxChecker.EPC_PI_AFTER_FUNCTION =  "There must be no process interface after a function.";
-ORYX.I18N.SyntaxChecker.EPC_FUNCTION_AFTER_PI =  "There must be no function after a process interface.";
+ORYX.I18N.SyntaxChecker.EPC_FUNCTION_AFTER_FUNCTION = "There must be no function after a function.";
+ORYX.I18N.SyntaxChecker.EPC_EVENT_AFTER_EVENT = "There must be no event after an event.";
+ORYX.I18N.SyntaxChecker.EPC_PI_AFTER_FUNCTION = "There must be no process interface after a function.";
+ORYX.I18N.SyntaxChecker.EPC_FUNCTION_AFTER_PI = "There must be no function after a process interface.";
 ORYX.I18N.SyntaxChecker.EPC_SOURCE_EQUALS_TARGET = "Edge must connect two distinct nodes."
 
-if(!ORYX.I18N.SyntaxChecker.PetriNet) ORYX.I18N.SyntaxChecker.PetriNet={};
+if (!ORYX.I18N.SyntaxChecker.PetriNet) ORYX.I18N.SyntaxChecker.PetriNet = {};
 ORYX.I18N.SyntaxChecker.PetriNet_NOT_BIPARTITE = "The graph is not bipartite";
 ORYX.I18N.SyntaxChecker.PetriNet_NO_LABEL = "Label not set for a labeled transition";
 ORYX.I18N.SyntaxChecker.PetriNet_NO_ID = "There is a node without id";
@@ -363,28 +363,28 @@ ORYX.I18N.Node = "Node";
 ORYX.I18N.SyntaxChecker.notice = "Move the mouse over a red cross icon to see the error message.";
 
 /** New Language Properties: 05.06.2009*/
-if(!ORYX.I18N.RESIZE) ORYX.I18N.RESIZE = {};
+if (!ORYX.I18N.RESIZE) ORYX.I18N.RESIZE = {};
 ORYX.I18N.RESIZE.tipGrow = "Increase canvas size:";
 ORYX.I18N.RESIZE.tipShrink = "Decrease canvas size:";
 ORYX.I18N.RESIZE.N = "Top";
 ORYX.I18N.RESIZE.W = "Left";
-ORYX.I18N.RESIZE.S ="Down";
-ORYX.I18N.RESIZE.E ="Right";
+ORYX.I18N.RESIZE.S = "Down";
+ORYX.I18N.RESIZE.E = "Right";
 
 /** New Language Properties: 15.07.2009*/
-if(!ORYX.I18N.Layouting) ORYX.I18N.Layouting ={};
+if (!ORYX.I18N.Layouting) ORYX.I18N.Layouting = {};
 ORYX.I18N.Layouting.doing = "Layouting...";
 
 /** New Language Properties: 18.08.2009*/
 ORYX.I18N.SyntaxChecker.MULT_ERRORS = "Multiple Errors";
 
 /** New Language Properties: 08.09.2009*/
-if(!ORYX.I18N.PropertyWindow) ORYX.I18N.PropertyWindow = {};
+if (!ORYX.I18N.PropertyWindow) ORYX.I18N.PropertyWindow = {};
 ORYX.I18N.PropertyWindow.oftenUsed = "Often used";
 ORYX.I18N.PropertyWindow.moreProps = "More Properties";
 
 /** New Language Properties 01.10.2009 */
-if(!ORYX.I18N.SyntaxChecker.BPMN2) ORYX.I18N.SyntaxChecker.BPMN2 = {};
+if (!ORYX.I18N.SyntaxChecker.BPMN2) ORYX.I18N.SyntaxChecker.BPMN2 = {};
 
 ORYX.I18N.SyntaxChecker.BPMN2_DATA_INPUT_WITH_INCOMING_DATA_ASSOCIATION = "A Data Input must not have any incoming Data Associations.";
 ORYX.I18N.SyntaxChecker.BPMN2_DATA_OUTPUT_WITH_OUTGOING_DATA_ASSOCIATION = "A Data Output must not have any outgoing Data Associations.";
diff --git a/len-activiti/src/main/resources/static/editor-app/editor/i18n/translation_signavio_de.js b/len-activiti/src/main/resources/static/editor-app/editor/i18n/translation_signavio_de.js
index b03e6e7..37c5124 100644
--- a/len-activiti/src/main/resources/static/editor-app/editor/i18n/translation_signavio_de.js
+++ b/len-activiti/src/main/resources/static/editor-app/editor/i18n/translation_signavio_de.js
@@ -1,8 +1,8 @@
 Ext.PagingToolbar.prototype.firstText = "Erste Seite";
 Ext.PagingToolbar.prototype.prevText = "Vorherige Seite";
 Ext.PagingToolbar.prototype.nextText = "Nächste Seite";
-Ext.PagingToolbar.prototype.lastText  = "Letzte Seite";
-	
+Ext.PagingToolbar.prototype.lastText = "Letzte Seite";
+
 
 ORYX.I18N.PropertyWindow.dateFormat = "d.m.y";
 
@@ -41,16 +41,24 @@ ORYX.I18N.Save.exception = "Beim Speichern Ihres Diagramms sind einige Probleme
 ORYX.I18N.Save.retrieveData = "Bitte warten, Daten werden geladen";
 
 /** New Language Properties: 10.6.09*/
-if(!ORYX.I18N.ShapeMenuPlugin) ORYX.I18N.ShapeMenuPlugin = {};
+if (!ORYX.I18N.ShapeMenuPlugin) ORYX.I18N.ShapeMenuPlugin = {};
 ORYX.I18N.ShapeMenuPlugin.morphMsg = "Umwandeln";
 ORYX.I18N.ShapeMenuPlugin.morphWarningTitleMsg = "Umwandeln";
 ORYX.I18N.ShapeMenuPlugin.morphWarningMsg = "Einige Kindelemente können nicht im neuen Element enthalten sein.<br/>Möchten Sie dennoch das Element umwandeln?";
 
-if (!Signavio) { var Signavio = {}; }
-if (!Signavio.I18N) { Signavio.I18N = {} }
-if (!Signavio.I18N.Editor) { Signavio.I18N.Editor = {} }
+if (!Signavio) {
+	var Signavio = {};
+}
+if (!Signavio.I18N) {
+	Signavio.I18N = {}
+}
+if (!Signavio.I18N.Editor) {
+	Signavio.I18N.Editor = {}
+}
 
-if (!Signavio.I18N.Editor.Linking) { Signavio.I18N.Editor.Linking = {} }
+if (!Signavio.I18N.Editor.Linking) {
+	Signavio.I18N.Editor.Linking = {}
+}
 Signavio.I18N.Editor.Linking.CreateDiagram = "Neues Diagramm erstellen:";
 Signavio.I18N.Editor.Linking.UseDiagram = "Vorhandenes Diagramm verwenden";
 Signavio.I18N.Editor.Linking.UseLink = "Web-Link verwenden";
@@ -69,19 +77,21 @@ Signavio.I18N.Editor.Linking.OpenLink = "Öffnen";
 Signavio.I18N.Editor.Linking.BrokenLink = "Der Link ist nicht verfügbar!";
 Signavio.I18N.Editor.Linking.PreviewTitle = "Vorschau";
 
-if(!ORYX.I18N.PropertyWindow) ORYX.I18N.PropertyWindow = {};
+if (!ORYX.I18N.PropertyWindow) ORYX.I18N.PropertyWindow = {};
 ORYX.I18N.PropertyWindow.oftenUsed = "Hauptattribute";
 ORYX.I18N.PropertyWindow.moreProps = "Weitere Attribute";
 ORYX.I18N.PropertyWindow.characteristicNr = "Kennzahlen";
 ORYX.I18N.PropertyWindow.meta = "Eigene Attribute";
 
-if(!ORYX.I18N.PropertyWindow.Category){ORYX.I18N.PropertyWindow.Category = {}}
+if (!ORYX.I18N.PropertyWindow.Category) {
+	ORYX.I18N.PropertyWindow.Category = {}
+}
 ORYX.I18N.PropertyWindow.Category.popular = "Hauptattribute";
 ORYX.I18N.PropertyWindow.Category.characteristicnr = "Kennzahlen";
 ORYX.I18N.PropertyWindow.Category.others = "Weitere Attribute";
 ORYX.I18N.PropertyWindow.Category.meta = "Eigene Attribute";
 
-if(!ORYX.I18N.PropertyWindow.ListView) ORYX.I18N.PropertyWindow.ListView = {};
+if (!ORYX.I18N.PropertyWindow.ListView) ORYX.I18N.PropertyWindow.ListView = {};
 ORYX.I18N.PropertyWindow.ListView.title = "Attribut: ";
 ORYX.I18N.PropertyWindow.ListView.dataViewLabel = "Bereits vorhandene Einträge";
 ORYX.I18N.PropertyWindow.ListView.dataViewEmptyText = "Es sind noch keine Einträge vorhanden.";
@@ -90,17 +100,21 @@ ORYX.I18N.PropertyWindow.ListView.buttonAdd = "Hinzufügen";
 ORYX.I18N.PropertyWindow.ListView.save = "Speichern";
 ORYX.I18N.PropertyWindow.ListView.cancel = "Abbrachen";
 
-if(!Signavio.I18N.Buttons) Signavio.I18N.Buttons = {};
-Signavio.I18N.Buttons.save		= "Speichern";
-Signavio.I18N.Buttons.cancel 	= "Abbrechen";
-Signavio.I18N.Buttons.remove	= "Entfernen";
+if (!Signavio.I18N.Buttons) Signavio.I18N.Buttons = {};
+Signavio.I18N.Buttons.save = "Speichern";
+Signavio.I18N.Buttons.cancel = "Abbrechen";
+Signavio.I18N.Buttons.remove = "Entfernen";
 
-if(!Signavio.I18N.btn) {Signavio.I18N.btn = {};}
+if (!Signavio.I18N.btn) {
+	Signavio.I18N.btn = {};
+}
 Signavio.I18N.btn.btnEdit = "Editieren";
 Signavio.I18N.btn.btnRemove = "Löschen";
 Signavio.I18N.btn.moveUp = "Nach oben";
 Signavio.I18N.btn.moveDown = "Nach unten";
 
-if(!Signavio.I18N.field) {Signavio.I18N.field = {};}
+if (!Signavio.I18N.field) {
+	Signavio.I18N.field = {};
+}
 Signavio.I18N.field.Url = "URL";
-Signavio.I18N.field.UrlLabel = "Label";
\ No newline at end of file
+Signavio.I18N.field.UrlLabel = "Label";
diff --git a/len-activiti/src/main/resources/static/editor-app/editor/i18n/translation_signavio_en_us.js b/len-activiti/src/main/resources/static/editor-app/editor/i18n/translation_signavio_en_us.js
index e103b21..c66ea46 100644
--- a/len-activiti/src/main/resources/static/editor-app/editor/i18n/translation_signavio_en_us.js
+++ b/len-activiti/src/main/resources/static/editor-app/editor/i18n/translation_signavio_en_us.js
@@ -3,7 +3,7 @@ ORYX.I18N.PropertyWindow.dateFormat = "d/m/y";
 ORYX.I18N.View.East = "Attributes";
 ORYX.I18N.View.West = "Modeling Elements";
 
-ORYX.I18N.Oryx.title	= "Signavio";
+ORYX.I18N.Oryx.title = "Signavio";
 ORYX.I18N.Oryx.pleaseWait = "Please wait while the Signavio Process Editor is loading...";
 ORYX.I18N.Edit.cutDesc = "Cuts the selection into the clipboard";
 ORYX.I18N.Edit.copyDesc = "Copies the selection into the clipboard";
@@ -27,16 +27,24 @@ ORYX.I18N.Save.exception = "Some exceptions are raised while trying to save your
 ORYX.I18N.Save.retrieveData = "Please wait, data is retrieving.";
 
 /** New Language Properties: 10.6.09*/
-if(!ORYX.I18N.ShapeMenuPlugin) ORYX.I18N.ShapeMenuPlugin = {};
+if (!ORYX.I18N.ShapeMenuPlugin) ORYX.I18N.ShapeMenuPlugin = {};
 ORYX.I18N.ShapeMenuPlugin.morphMsg = "Transform shape";
 ORYX.I18N.ShapeMenuPlugin.morphWarningTitleMsg = "Transform shape";
 ORYX.I18N.ShapeMenuPlugin.morphWarningMsg = "There are child shape which can not be contained in the transformed element.<br/>Do you want to transform anyway?";
 
-if (!Signavio) { var Signavio = {}; }
-if (!Signavio.I18N) { Signavio.I18N = {} }
-if (!Signavio.I18N.Editor) { Signavio.I18N.Editor = {} }
+if (!Signavio) {
+	var Signavio = {};
+}
+if (!Signavio.I18N) {
+	Signavio.I18N = {}
+}
+if (!Signavio.I18N.Editor) {
+	Signavio.I18N.Editor = {}
+}
 
-if (!Signavio.I18N.Editor.Linking) { Signavio.I18N.Editor.Linking = {} }
+if (!Signavio.I18N.Editor.Linking) {
+	Signavio.I18N.Editor.Linking = {}
+}
 Signavio.I18N.Editor.Linking.CreateDiagram = "Create a new diagram";
 Signavio.I18N.Editor.Linking.UseDiagram = "Use existing diagram";
 Signavio.I18N.Editor.Linking.UseLink = "Use web link";
@@ -55,12 +63,14 @@ Signavio.I18N.Editor.Linking.OpenLink = "Open";
 Signavio.I18N.Editor.Linking.BrokenLink = "The link is broken!";
 Signavio.I18N.Editor.Linking.PreviewTitle = "Preview";
 
-if(!Signavio.I18N.Glossary_Support) { Signavio.I18N.Glossary_Support = {}; }
+if (!Signavio.I18N.Glossary_Support) {
+	Signavio.I18N.Glossary_Support = {};
+}
 Signavio.I18N.Glossary_Support.renameEmpty = "No dictionary entry";
 Signavio.I18N.Glossary_Support.renameLoading = "Searching...";
 
 /** New Language Properties: 08.09.2009*/
-if(!ORYX.I18N.PropertyWindow) ORYX.I18N.PropertyWindow = {};
+if (!ORYX.I18N.PropertyWindow) ORYX.I18N.PropertyWindow = {};
 ORYX.I18N.PropertyWindow.oftenUsed = "Main properties";
 ORYX.I18N.PropertyWindow.moreProps = "More properties";
 
@@ -71,19 +81,21 @@ ORYX.I18N.PropertyWindow.btnUp = "Move up";
 ORYX.I18N.PropertyWindow.btnDown = "Move down";
 ORYX.I18N.PropertyWindow.createNew = "Create new";
 
-if(!ORYX.I18N.PropertyWindow) ORYX.I18N.PropertyWindow = {};
+if (!ORYX.I18N.PropertyWindow) ORYX.I18N.PropertyWindow = {};
 ORYX.I18N.PropertyWindow.oftenUsed = "Main attributes";
 ORYX.I18N.PropertyWindow.moreProps = "More attributes";
 ORYX.I18N.PropertyWindow.characteristicNr = "Cost &amp; Resource Analysis";
 ORYX.I18N.PropertyWindow.meta = "Custom attributes";
 
-if(!ORYX.I18N.PropertyWindow.Category){ORYX.I18N.PropertyWindow.Category = {}}
+if (!ORYX.I18N.PropertyWindow.Category) {
+	ORYX.I18N.PropertyWindow.Category = {}
+}
 ORYX.I18N.PropertyWindow.Category.popular = "Main Attributes";
 ORYX.I18N.PropertyWindow.Category.characteristicnr = "Cost &amp; Resource Analysis";
 ORYX.I18N.PropertyWindow.Category.others = "More Attributes";
 ORYX.I18N.PropertyWindow.Category.meta = "Custom Attributes";
 
-if(!ORYX.I18N.PropertyWindow.ListView) ORYX.I18N.PropertyWindow.ListView = {};
+if (!ORYX.I18N.PropertyWindow.ListView) ORYX.I18N.PropertyWindow.ListView = {};
 ORYX.I18N.PropertyWindow.ListView.title = "Edit: ";
 ORYX.I18N.PropertyWindow.ListView.dataViewLabel = "Already existing entries.";
 ORYX.I18N.PropertyWindow.ListView.dataViewEmptyText = "No list entries.";
@@ -92,17 +104,21 @@ ORYX.I18N.PropertyWindow.ListView.buttonAdd = "Add";
 ORYX.I18N.PropertyWindow.ListView.save = "Save";
 ORYX.I18N.PropertyWindow.ListView.cancel = "Cancel";
 
-if(!Signavio.I18N.Buttons) Signavio.I18N.Buttons = {};
-Signavio.I18N.Buttons.save		= "Save";
-Signavio.I18N.Buttons.cancel 	= "Cancel";
-Signavio.I18N.Buttons.remove	= "Remove";
+if (!Signavio.I18N.Buttons) Signavio.I18N.Buttons = {};
+Signavio.I18N.Buttons.save = "Save";
+Signavio.I18N.Buttons.cancel = "Cancel";
+Signavio.I18N.Buttons.remove = "Remove";
 
-if(!Signavio.I18N.btn) {Signavio.I18N.btn = {};}
+if (!Signavio.I18N.btn) {
+	Signavio.I18N.btn = {};
+}
 Signavio.I18N.btn.btnEdit = "Edit";
 Signavio.I18N.btn.btnRemove = "Remove";
 Signavio.I18N.btn.moveUp = "Move up";
 Signavio.I18N.btn.moveDown = "Move down";
 
-if(!Signavio.I18N.field) {Signavio.I18N.field = {};}
+if (!Signavio.I18N.field) {
+	Signavio.I18N.field = {};
+}
 Signavio.I18N.field.Url = "URL";
 Signavio.I18N.field.UrlLabel = "Label";
diff --git a/len-activiti/src/main/resources/static/editor-app/editor/oryx.debug.js b/len-activiti/src/main/resources/static/editor-app/editor/oryx.debug.js
index da2e3ed..3208aa8 100644
--- a/len-activiti/src/main/resources/static/editor-app/editor/oryx.debug.js
+++ b/len-activiti/src/main/resources/static/editor-app/editor/oryx.debug.js
@@ -1,43 +1,44 @@
 /**
  * @namespace Oryx name space for different utility methods
  * @name ORYX.Utils
-*/
+ */
 
-if(!ORYX) var ORYX = {};
+if (!ORYX) var ORYX = {};
 
 ORYX.Utils = {
-    /**
-     * General helper method for parsing a param out of current location url
-     * @example
-     * // Current url in Browser => "http://oryx.org?param=value"
-     * ORYX.Utils.getParamFromUrl("param") // => "value"
-     * @param {Object} name
-     */
-    getParamFromUrl: function(name){
-        name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");
-        var regexS = "[\\?&]" + name + "=([^&#]*)";
-        var regex = new RegExp(regexS);
-        var results = regex.exec(window.location.href);
-        if (results == null) {
-            return null;
-        }
-        else {
-            return results[1];
-        }
-    },
+	/**
+	 * General helper method for parsing a param out of current location url
+	 * @example
+	 * // Current url in Browser => "http://oryx.org?param=value"
+	 * ORYX.Utils.getParamFromUrl("param") // => "value"
+	 * @param {Object} name
+	 */
+	getParamFromUrl: function (name) {
+		name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");
+		var regexS = "[\\?&]" + name + "=([^&#]*)";
+		var regex = new RegExp(regexS);
+		var results = regex.exec(window.location.href);
+		if (results == null) {
+			return null;
+		} else {
+			return results[1];
+		}
+	},
 
-	adjustLightness: function(){
+	adjustLightness: function () {
 		return arguments[0];
 	},
 
-	adjustGradient: function(gradient, reference){
+	adjustGradient: function (gradient, reference) {
 
-		if (ORYX.CONFIG.DISABLE_GRADIENT && gradient){
+		if (ORYX.CONFIG.DISABLE_GRADIENT && gradient) {
 
 			var col = reference.getAttributeNS(null, "stop-color") || "#ffffff";
 
-			$A(gradient.getElementsByTagName("stop")).each(function(stop){
-				if (stop == reference){ return; }
+			$A(gradient.getElementsByTagName("stop")).each(function (stop) {
+				if (stop == reference) {
+					return;
+				}
 				stop.setAttributeNS(null, "stop-color", col);
 			});
 		}
@@ -54,11 +55,11 @@ ORYX.Utils = {
  */
 
 XMLNS = {
-	ATOM:	"http://www.w3.org/2005/Atom",
-	XHTML:	"http://www.w3.org/1999/xhtml",
-	ERDF:	"http://purl.org/NET/erdf/profile",
-	RDFS:	"http://www.w3.org/2000/01/rdf-schema#",
-	RDF:	"http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+	ATOM: "http://www.w3.org/2005/Atom",
+	XHTML: "http://www.w3.org/1999/xhtml",
+	ERDF: "http://purl.org/NET/erdf/profile",
+	RDFS: "http://www.w3.org/2000/01/rdf-schema#",
+	RDF: "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
 	RAZIEL: "http://b3mn.org/Raziel",
 
 	SCHEMA: ""
@@ -67,28 +68,30 @@ XMLNS = {
 //TODO kann kickstart sich vielleicht auch um die erzeugung von paketen/
 // namespaces k???mmern? z.b. requireNamespace("ORYX.Core.SVG");
 var Kickstart = {
- 	started: false,
+	started: false,
 	callbacks: [],
 	alreadyLoaded: [],
 	PATH: '',
 
-	load: function() { Kickstart.kick(); },
+	load: function () {
+		Kickstart.kick();
+	},
 
-	kick: function() {
+	kick: function () {
 		//console.profile("loading");
-		if(!Kickstart.started) {
+		if (!Kickstart.started) {
 			Kickstart.started = true;
-			Kickstart.callbacks.each(function(callback){
+			Kickstart.callbacks.each(function (callback) {
 				// call the registered callback asynchronously.
 				window.setTimeout(callback, 1);
 			});
 		}
 	},
 
-	register: function(callback) {
+	register: function (callback) {
 		//TODO Add some mutual exclusion between kick and register calls.
-		with(Kickstart) {
-			if(started) window.setTimeout(callback, 1);
+		with (Kickstart) {
+			if (started) window.setTimeout(callback, 1);
 			else Kickstart.callbacks.push(callback)
 		}
 	},
@@ -97,9 +100,9 @@ var Kickstart = {
 	 * Loads a js, assuring that it has only been downloaded once.
 	 * @param {String} url the script to load.
 	 */
-	require: function(url) {
+	require: function (url) {
 		// if not already loaded, include it.
-		if(Kickstart.alreadyLoaded.member(url))
+		if (Kickstart.alreadyLoaded.member(url))
 			return false;
 		return Kickstart.include(url);
 	},
@@ -108,17 +111,17 @@ var Kickstart = {
 	 * Loads a js, regardless of whether it has only been already downloaded.
 	 * @param {String} url the script to load.
 	 */
-	include: function(url) {
+	include: function (url) {
 
 		// prepare a script tag and place it in html head.
 		var head = document.getElementsByTagNameNS(XMLNS.XHTML, 'head')[0];
 		var s = document.createElementNS(XMLNS.XHTML, "script");
 		s.setAttributeNS(XMLNS.XHTML, 'type', 'text/javascript');
-	   	s.src = Kickstart.PATH + url;
+		s.src = Kickstart.PATH + url;
 
 		//TODO macht es sinn, dass neue skript als letztes kind in den head
 		// einzubinden (stichwort reihenfolge der skript tags)?
-	   	head.appendChild(s);
+		head.appendChild(s);
 
 		// remember this url.
 		Kickstart.alreadyLoaded.push(url);
@@ -151,7 +154,7 @@ var ERDF = {
 	callback: undefined,
 	log: undefined,
 
-	init: function(callback) {
+	init: function (callback) {
 
 		// init logging.
 		//ERDF.log = Log4js.getLogger("oryx");
@@ -167,7 +170,7 @@ var ERDF = {
 		ERDF.registerSchema('rdfs', XMLNS.RDFS);
 	},
 
-	run: function() {
+	run: function () {
 
 		//if(ERDF.log.isTraceEnabled())
 		//	ERDF.log.trace("ERDF Parser is running.");
@@ -176,7 +179,7 @@ var ERDF = {
 		return ERDF._checkProfile() && ERDF.parse();
 	},
 
-	parse: function() {
+	parse: function () {
 
 		//(ERDF.log.isDebugEnabled())
 		//	ERDF.log.debug("Begin parsing document metadata.");
@@ -193,13 +196,13 @@ var ERDF = {
 		// time measuring
 		ERDF.__stopTime = new Date();
 
-		var duration = (ERDF.__stopTime - ERDF.__startTime)/1000.;
+		var duration = (ERDF.__stopTime - ERDF.__startTime) / 1000.;
 		//alert('ERDF parsing took ' + duration + ' s.');
 
 		return result;
 	},
 
-	_parseDocumentMetadata: function() {
+	_parseDocumentMetadata: function () {
 
 		// get links from head element.
 		var heads = document.getElementsByTagNameNS(XMLNS.XHTML, 'head');
@@ -207,7 +210,7 @@ var ERDF = {
 		var metas = heads[0].getElementsByTagNameNS(XMLNS.XHTML, 'meta');
 
 		// process links first, since they could contain schema definitions.
-		$A(links).each(function(link) {
+		$A(links).each(function (link) {
 			var properties = link.getAttribute('rel');
 			var reversedProperties = link.getAttribute('rev');
 			var value = link.getAttribute('href');
@@ -224,7 +227,7 @@ var ERDF = {
 		});
 
 		// continue with metas.
-		$A(metas).each(function(meta) {
+		$A(metas).each(function (meta) {
 			var property = meta.getAttribute('name');
 			var value = meta.getAttribute('content');
 
@@ -237,13 +240,15 @@ var ERDF = {
 		return true;
 	},
 
-	_parseFromTag: function(node, subject, depth) {
+	_parseFromTag: function (node, subject, depth) {
 
 		// avoid parsing non-xhtml content.
-		if(!node || !node.namespaceURI || node.namespaceURI != XMLNS.XHTML) { return; }
+		if (!node || !node.namespaceURI || node.namespaceURI != XMLNS.XHTML) {
+			return;
+		}
 
 		// housekeeping.
-		if(!depth) depth=0;
+		if (!depth) depth = 0;
 		var id = node.getAttribute('id');
 
 		// some logging.
@@ -255,7 +260,7 @@ var ERDF = {
 		/* triple finding! */
 
 		// in a-tags...
-		if(node.nodeName.endsWith(':a') || node.nodeName == 'a') {
+		if (node.nodeName.endsWith(':a') || node.nodeName == 'a') {
 			var properties = node.getAttribute('rel');
 			var reversedProperties = node.getAttribute('rev');
 			var value = node.getAttribute('href');
@@ -267,8 +272,8 @@ var ERDF = {
 				subject.type, subject.value,
 				properties,
 				ERDF.RESOURCE, value,
-				function(triple) {
-					var label = title? title : content;
+				function (triple) {
+					var label = title ? title : content;
 
 					// label triples
 					ERDF._parseTriplesFrom(
@@ -288,8 +293,8 @@ var ERDF = {
 				subject.type, subject.value,
 				properties);
 
-		// in img-tags...
-		} else if(node.nodeName.endsWith(':img') || node.nodeName == 'img') {
+			// in img-tags...
+		} else if (node.nodeName.endsWith(':img') || node.nodeName == 'img') {
 			var properties = node.getAttribute('class');
 			var value = node.getAttribute('src');
 			var alt = node.getAttribute('alt');
@@ -298,7 +303,7 @@ var ERDF = {
 				subject.type, subject.value,
 				properties,
 				ERDF.RESOURCE, value,
-				function(triple) {
+				function (triple) {
 					var label = alt;
 
 					// label triples
@@ -322,7 +327,7 @@ var ERDF = {
 			properties,
 			ERDF.LITERAL, label);
 
-		if(id) subject = {type: ERDF.RESOURCE, value: ERDF.HASH+id};
+		if (id) subject = {type: ERDF.RESOURCE, value: ERDF.HASH + id};
 
 		// type triples
 		ERDF._parseTypeTriplesFrom(
@@ -331,29 +336,30 @@ var ERDF = {
 
 		// parse all children that are element nodes.
 		var children = node.childNodes;
-		if(children) $A(children).each(function(_node) {
-			if(_node.nodeType == _node.ELEMENT_NODE)
-				ERDF._parseFromTag(_node, subject, depth+1); });
+		if (children) $A(children).each(function (_node) {
+			if (_node.nodeType == _node.ELEMENT_NODE)
+				ERDF._parseFromTag(_node, subject, depth + 1);
+		});
 	},
 
-	_parseTriplesFrom: function(subjectType, subject, properties,
-		objectType, object, callback) {
+	_parseTriplesFrom: function (subjectType, subject, properties,
+								 objectType, object, callback) {
 
-		if(!properties) return;
-		properties.toLowerCase().split(' ').each( function(property) {
+		if (!properties) return;
+		properties.toLowerCase().split(' ').each(function (property) {
 
 			//if(ERDF.log.isTraceEnabled())
 			//	ERDF.log.trace("Going for property " + property);
 
-			var schema = ERDF.schemas.find( function(schema) {
-				return false || ERDF.DELIMITERS.find( function(delimiter) {
+			var schema = ERDF.schemas.find(function (schema) {
+				return false || ERDF.DELIMITERS.find(function (delimiter) {
 					return property.startsWith(schema.prefix + delimiter);
 				});
 			});
 
-			if(schema && object) {
+			if (schema && object) {
 				property = property.substring(
-					schema.prefix.length+1, property.length);
+					schema.prefix.length + 1, property.length);
 				var triple = ERDF.registerTriple(
 					new ERDF.Resource(subject),
 					{prefix: schema.prefix, name: property},
@@ -361,34 +367,34 @@ var ERDF = {
 						new ERDF.Resource(object) :
 						new ERDF.Literal(object));
 
-				if(callback) callback(triple);
+				if (callback) callback(triple);
 			}
 		});
 	},
 
-	_parseTypeTriplesFrom: function(subjectType, subject, properties, callback) {
+	_parseTypeTriplesFrom: function (subjectType, subject, properties, callback) {
 
-		if(!properties) return;
-		properties.toLowerCase().split(' ').each( function(property) {
+		if (!properties) return;
+		properties.toLowerCase().split(' ').each(function (property) {
 
 			//if(ERDF.log.isTraceEnabled())
 			//	ERDF.log.trace("Going for property " + property);
 
-			var schema = ERDF.schemas.find( function(schema) {
-				return false || ERDF.DELIMITERS.find( function(delimiter) {
+			var schema = ERDF.schemas.find(function (schema) {
+				return false || ERDF.DELIMITERS.find(function (delimiter) {
 					return property.startsWith(ERDF.HYPHEN + schema.prefix + delimiter);
 				});
 			});
 
-			if(schema && subject) {
-				property = property.substring(schema.prefix.length+2, property.length);
+			if (schema && subject) {
+				property = property.substring(schema.prefix.length + 2, property.length);
 				var triple = ERDF.registerTriple(
 					(subjectType == ERDF.RESOURCE) ?
 						new ERDF.Resource(subject) :
 						new ERDF.Literal(subject),
 					{prefix: 'rdf', name: 'type'},
-					new ERDF.Resource(schema.namespace+property));
-				if(callback) callback(triple);
+					new ERDF.Resource(schema.namespace + property));
+				if (callback) callback(triple);
 			}
 		});
 	},
@@ -396,7 +402,7 @@ var ERDF = {
 	/**
 	 * Checks for ERDF profile declaration in head of document.
 	 */
-	_checkProfile: function() {
+	_checkProfile: function () {
 
 		// get profiles from head element.
 		var heads = document.getElementsByTagNameNS(XMLNS.XHTML, 'head');
@@ -404,7 +410,7 @@ var ERDF = {
 		var found = false;
 
 		// if erdf profile is contained.
-		if(profiles && profiles.split(" ").member(XMLNS.ERDF)) {
+		if (profiles && profiles.split(" ").member(XMLNS.ERDF)) {
 
 			// pass check.
 			//if(ERDF.log.isTraceEnabled())
@@ -420,11 +426,11 @@ var ERDF = {
 		}
 	},
 
-	__stripHashes: function(s) {
-		return (s && (typeof s.substring == 'function') && s.substring(0, 1)=='#') ? s.substring(1, s.length) : s;
+	__stripHashes: function (s) {
+		return (s && (typeof s.substring == 'function') && s.substring(0, 1) == '#') ? s.substring(1, s.length) : s;
 	},
 
-	registerSchema: function(prefix, namespace) {
+	registerSchema: function (prefix, namespace) {
 
 		// TODO check whether already registered, if so, complain.
 		ERDF.schemas.push({
@@ -436,10 +442,10 @@ var ERDF = {
 		//	ERDF.log.debug("Prefix '"+prefix+"' for '"+namespace+"' registered.");
 	},
 
-	registerTriple: function(subject, predicate, object) {
+	registerTriple: function (subject, predicate, object) {
 
 		// if prefix is schema, this is a schema definition.
-		if(predicate.prefix.toLowerCase() == 'schema')
+		if (predicate.prefix.toLowerCase() == 'schema')
 			this.registerSchema(predicate.name, object.value);
 
 		var triple = new ERDF.Triple(subject, predicate, object);
@@ -452,33 +458,38 @@ var ERDF = {
 		return triple;
 	},
 
-	__enhanceObject: function() {
+	__enhanceObject: function () {
 
 		/* Resource state querying methods */
-		this.isResource = function() {
-			return this.type == ERDF.RESOURCE };
-		this.isLocal = function() {
-			return this.isResource() && this.value.startsWith('#') };
-		this.isCurrentDocument = function() {
-			return this.isResource() && (this.value == '') };
+		this.isResource = function () {
+			return this.type == ERDF.RESOURCE
+		};
+		this.isLocal = function () {
+			return this.isResource() && this.value.startsWith('#')
+		};
+		this.isCurrentDocument = function () {
+			return this.isResource() && (this.value == '')
+		};
 
 		/* Resource getter methods.*/
-		this.getId = function() {
-			return this.isLocal() ? ERDF.__stripHashes(this.value) : false; };
+		this.getId = function () {
+			return this.isLocal() ? ERDF.__stripHashes(this.value) : false;
+		};
 
 		/* Liiteral state querying methods  */
-		this.isLiteral = function() {
-			return this.type == ERDF.LIITERAL };
+		this.isLiteral = function () {
+			return this.type == ERDF.LIITERAL
+		};
 	},
 
-	serialize: function(literal) {
+	serialize: function (literal) {
 
-		if(!literal){
+		if (!literal) {
 			return "";
-		}else if(literal.constructor == String) {
+		} else if (literal.constructor == String) {
 			return literal;
-		} else if(literal.constructor == Boolean) {
-			return literal? 'true':'false';
+		} else if (literal.constructor == Boolean) {
+			return literal ? 'true' : 'false';
 		} else {
 			return literal.toString();
 		}
@@ -486,40 +497,40 @@ var ERDF = {
 };
 
 
-ERDF.Triple = function(subject, predicate, object) {
+ERDF.Triple = function (subject, predicate, object) {
 
 	this.subject = subject;
 	this.predicate = predicate;
 	this.object = object;
 
-	this.toString = function() {
+	this.toString = function () {
 
 		return "[ERDF.Triple] " +
 			this.subject.toString() + ' ' +
 			this.predicate.prefix + ':' + this.predicate.name + ' ' +
 			this.object.toString();
-		};
+	};
 };
 
-ERDF.Resource = function(uri) {
+ERDF.Resource = function (uri) {
 
 	this.type = ERDF.RESOURCE;
 	this.value = uri;
 	ERDF.__enhanceObject.apply(this);
 
-	this.toString = function() {
+	this.toString = function () {
 		return '&lt;' + this.value + '&gt;';
 	}
 
 };
 
-ERDF.Literal = function(literal) {
+ERDF.Literal = function (literal) {
 
 	this.type = ERDF.LITERAL;
 	this.value = ERDF.serialize(literal);
 	ERDF.__enhanceObject.apply(this);
 
-	this.toString = function() {
+	this.toString = function () {
 		return '"' + this.value + '"';
 	}
 };/*
@@ -536,20 +547,20 @@ ERDF.Literal = function(literal) {
  * Save and triple generation behaviour. Use this area to configure
  * data management to your needs.
  */
-var USE_ASYNCHRONOUS_REQUESTS =		true;
-var DISCARD_UNUSED_TRIPLES =			true;
-var PREFER_SPANS_OVER_DIVS =			true;
-var PREFER_TITLE_OVER_TEXTNODE =		false;
-var RESOURCE_ID_PREFIX =				'resource';
+var USE_ASYNCHRONOUS_REQUESTS = true;
+var DISCARD_UNUSED_TRIPLES = true;
+var PREFER_SPANS_OVER_DIVS = true;
+var PREFER_TITLE_OVER_TEXTNODE = false;
+var RESOURCE_ID_PREFIX = 'resource';
 
-var SHOW_DEBUG_ALERTS_WHEN_SAVING =	false;
-var SHOW_EXTENDED_DEBUG_INFORMATION =	false;
+var SHOW_DEBUG_ALERTS_WHEN_SAVING = false;
+var SHOW_EXTENDED_DEBUG_INFORMATION = false;
 
 /*
  * Back end specific workarounds.
  */
 
-var USE_ARESS_WORKAROUNDS =		true;
+var USE_ARESS_WORKAROUNDS = true;
 
 /*
  * Data management constants. Do not change these, as they are used
@@ -558,17 +569,17 @@ var USE_ARESS_WORKAROUNDS =		true;
  */
 
 // Resource constants
-var RESOURCE_CREATED =			0x01;
-var RESOURCE_REMOVED =			0x02;
-var RESOURCE_SAVED =				0x04;
-var RESOURCE_RELOADED =			0x08;
-var RESOURCE_SYNCHRONIZED = 		0x10;
+var RESOURCE_CREATED = 0x01;
+var RESOURCE_REMOVED = 0x02;
+var RESOURCE_SAVED = 0x04;
+var RESOURCE_RELOADED = 0x08;
+var RESOURCE_SYNCHRONIZED = 0x10;
 
 // Triple constants
-var TRIPLE_REMOVE =	0x01;
-var TRIPLE_ADD =		0x02;
-var TRIPLE_RELOAD =	0x04;
-var TRIPLE_SAVE =		0x08;
+var TRIPLE_REMOVE = 0x01;
+var TRIPLE_ADD = 0x02;
+var TRIPLE_RELOAD = 0x04;
+var TRIPLE_SAVE = 0x08;
 
 var PROCESSDATA_REF = 'processdata';
 
@@ -612,7 +623,7 @@ var DataManager = {
 	 * from then on deliver all resulting triples.
 	 * No parameters needed are needed in a call to this method.
 	 */
-	init: function() {
+	init: function () {
 		ERDF.init(DataManager._registerTriple);
 		DataManager.__synclocal();
 	},
@@ -627,7 +638,7 @@ var DataManager = {
 	 * used in another way than to add triples to the triple store.
 	 * @param {Object} triple the triple to add to the triple store.
 	 */
-	_registerTriple: function(triple) {
+	_registerTriple: function (triple) {
 		DataManager._triples.push(triple)
 	},
 
@@ -637,7 +648,7 @@ var DataManager = {
 	 * store is adjustet to the content of the document, which could have been
 	 * changed by any other applications running on the same page.
 	 */
-	__synclocal: function() {
+	__synclocal: function () {
 		DataManager._triples = [];
 		ERDF.run();
 	},
@@ -647,13 +658,13 @@ var DataManager = {
 	 * This method returns the shapes resource object for further manipulation.
 	 * @param {Object} shape
 	 */
-	__synchronizeShape: function(shape) {
+	__synchronizeShape: function (shape) {
 
 		var r = ResourceManager.getResource(shape.resourceId);
 		var serialize = shape.serialize();
 
 		// store all serialize values
-		serialize.each( function(ser) {
+		serialize.each(function (ser) {
 
 			var resource = (ser.type == 'resource');
 			var _triple = new ERDF.Triple(
@@ -669,7 +680,7 @@ var DataManager = {
 		return r;
 	},
 
-	__storeShape: function(shape) {
+	__storeShape: function (shape) {
 
 		// first synchronize the shape,
 		var resource = DataManager.__synchronizeShape(shape);
@@ -678,35 +689,39 @@ var DataManager = {
 		resource.save();
 	},
 
-	__forceExistance: function(shape) {
+	__forceExistance: function (shape) {
 
-		if(!$(shape.resourceId)) {
+		if (!$(shape.resourceId)) {
 
-			if(!$$('.' + PROCESSDATA_REF)[0])
+			if (!$$('.' + PROCESSDATA_REF)[0])
 				DataManager.graft(XMLNS.XHTML,
-					document.getElementsByTagNameNS(XMLNS.XHTML, 'body').item(0), ['div', {'class': PROCESSDATA_REF, 'style':'display:none;'}]);
+					document.getElementsByTagNameNS(XMLNS.XHTML, 'body').item(0), ['div', {
+						'class': PROCESSDATA_REF,
+						'style': 'display:none;'
+					}]);
 
 			// object is literal
 			DataManager.graft(XMLNS.XHTML,
 				$$('.' + PROCESSDATA_REF)[0], [
 
-				'div', {
-                    'id': shape.resourceId,
-                    //This should be done in a more dynamic way!!!!!
-                    'class': (shape instanceof ORYX.Core.Canvas) ? "-oryx-canvas" : undefined
-                }
-			]);
+					'div', {
+						'id': shape.resourceId,
+						//This should be done in a more dynamic way!!!!!
+						'class': (shape instanceof ORYX.Core.Canvas) ? "-oryx-canvas" : undefined
+					}
+				]);
 
 		} else {
 			var resource = $(shape.resourceId)
 			var children = $A(resource.childNodes)
-			children.each( function(child) {
+			children.each(function (child) {
 				resource.removeChild(child);
 			});
-		};
+		}
+		;
 	},
 
-	__persistShape: function(shape) {
+	__persistShape: function (shape) {
 
 		// a shape serialization.
 		var shapeData = shape.serialize();
@@ -717,11 +732,11 @@ var DataManager = {
 		var shapeResource = new ERDF.Resource(shape.resourceId);
 
 		// remove all triples for this particular shape's resource
-		DataManager.removeTriples( DataManager.query(
+		DataManager.removeTriples(DataManager.query(
 			shapeResource, undefined, undefined));
 
 		// for each data set in the shape's serialization
-		shapeData.each( function(data) {
+		shapeData.each(function (data) {
 
 			// construct a triple's value
 			var value = (data.type == 'resource') ?
@@ -729,7 +744,7 @@ var DataManager = {
 				new ERDF.Literal(data.value);
 
 			// construct triple and add it to the DOM.
-			DataManager.addTriple( new ERDF.Triple(
+			DataManager.addTriple(new ERDF.Triple(
 				shapeResource,
 				{prefix: data.prefix, name: data.name},
 				value
@@ -737,7 +752,7 @@ var DataManager = {
 		});
 	},
 
-	__persistDOM: function(facade) {
+	__persistDOM: function (facade) {
 
 		// getChildShapes gets all shapes (nodes AND edges), deep flag
 		// makes it return a flattened child hierarchy.
@@ -747,16 +762,16 @@ var DataManager = {
 		var result = '';
 
 		// persist all shapes.
-		shapes.each( function(shape) {
+		shapes.each(function (shape) {
 			DataManager.__forceExistance(shape);
 		});
 		//DataManager.__synclocal();
 
 		DataManager.__renderCanvas(facade);
 		result += DataManager.serialize(
-				$(ERDF.__stripHashes(facade.getCanvas().resourceId)), true);
+			$(ERDF.__stripHashes(facade.getCanvas().resourceId)), true);
 
-		shapes.each( function(shape) {
+		shapes.each(function (shape) {
 
 			DataManager.__persistShape(shape);
 			result += DataManager.serialize(
@@ -768,7 +783,7 @@ var DataManager = {
 		return result;
 	},
 
-	__renderCanvas: function(facade) {
+	__renderCanvas: function (facade) {
 
 		var canvas = facade.getCanvas();
 		var stencilSets = facade.getStencilSets();
@@ -781,36 +796,36 @@ var DataManager = {
 		var shapeResource = new ERDF.Resource(canvas.resourceId);
 
 		// remove all triples for this particular shape's resource
-		DataManager.removeTriples( DataManager.query(
+		DataManager.removeTriples(DataManager.query(
 			shapeResource, undefined, undefined));
 
-		DataManager.addTriple( new ERDF.Triple(
+		DataManager.addTriple(new ERDF.Triple(
 			shapeResource,
 			{prefix: "oryx", name: "mode"},
 			new ERDF.Literal("writable")
 		));
 
-		DataManager.addTriple( new ERDF.Triple(
+		DataManager.addTriple(new ERDF.Triple(
 			shapeResource,
 			{prefix: "oryx", name: "mode"},
 			new ERDF.Literal("fullscreen")
 		));
 
-		stencilSets.values().each(function(stencilset) {
-			DataManager.addTriple( new ERDF.Triple(
+		stencilSets.values().each(function (stencilset) {
+			DataManager.addTriple(new ERDF.Triple(
 				shapeResource,
 				{prefix: "oryx", name: "stencilset"},
 				new ERDF.Resource(stencilset.source().replace(/&/g, "%26"))
 			));
 
-			DataManager.addTriple( new ERDF.Triple(
+			DataManager.addTriple(new ERDF.Triple(
 				shapeResource,
 				{prefix: "oryx", name: "ssnamespace"},
 				new ERDF.Resource(stencilset.namespace())
 			));
 
-			stencilset.extensions().keys().each(function(extension) {
-				DataManager.addTriple( new ERDF.Triple(
+			stencilset.extensions().keys().each(function (extension) {
+				DataManager.addTriple(new ERDF.Triple(
 					shapeResource,
 					{prefix: "oryx", name: "ssextension"},
 					new ERDF.Literal(extension)
@@ -818,8 +833,8 @@ var DataManager = {
 			});
 		});
 
-		shapes.each(function(shape) {
-			DataManager.addTriple( new ERDF.Triple(
+		shapes.each(function (shape) {
+			DataManager.addTriple(new ERDF.Triple(
 				shapeResource,
 				{prefix: "oryx", name: "render"},
 				new ERDF.Resource("#" + shape.resourceId)
@@ -828,20 +843,20 @@ var DataManager = {
 	},
 
 	__counter: 0,
-	__provideId: function() {
+	__provideId: function () {
 
-		while($(RESOURCE_ID_PREFIX+DataManager.__counter))
+		while ($(RESOURCE_ID_PREFIX + DataManager.__counter))
 			DataManager.__counter++;
 
-		return RESOURCE_ID_PREFIX+DataManager.__counter;
+		return RESOURCE_ID_PREFIX + DataManager.__counter;
 	},
 
-	serializeDOM: function(facade) {
+	serializeDOM: function (facade) {
 
 		return DataManager.__persistDOM(facade);
 	},
 
-	syncGlobal: function(facade) {
+	syncGlobal: function (facade) {
 
 		return DataManager.__syncglobal(facade);
 	},
@@ -853,7 +868,7 @@ var DataManager = {
 	 * @param {Object} facade The facade of the editor that holds certain
 	 * resource representations as shapes.
 	 */
-	__syncglobal: function(facade) {
+	__syncglobal: function (facade) {
 
 		// getChildShapes gets all shapes (nodes AND edges), deep flag
 		// makes it return a flattened child hierarchy.
@@ -864,16 +879,16 @@ var DataManager = {
 		// create dummy resource representations in the dom
 		// for all shapes that were newly created.
 
-		shapes.select( function(shape) {
+		shapes.select(function (shape) {
 
 			// select shapes without resource id.
 
 			return !($(shape.resourceId));
 
-		}).each( function(shape) {
+		}).each(function (shape) {
 
 			// create new resources for them.
-			if(USE_ARESS_WORKAROUNDS) {
+			if (USE_ARESS_WORKAROUNDS) {
 
 				/*
 				 * This is a workaround due to a bug in aress. Resources are
@@ -897,7 +912,7 @@ var DataManager = {
 				var razielType = shape.properties['raziel-type'];
 
 				var div = '<div xmlns="http://www.w3.org/1999/xhtml">' +
-					'<span class="raziel-type">'+razielType+'</span></div>';
+					'<span class="raziel-type">' + razielType + '</span></div>';
 
 				var r = ResourceManager.__createResource(div);
 				shape.resourceId = r.id();
@@ -910,7 +925,7 @@ var DataManager = {
 
 		});
 
-		shapes.each( function(shape) {
+		shapes.each(function (shape) {
 
 			// store all shapes.
 			DataManager.__storeShape(shape);
@@ -926,7 +941,7 @@ var DataManager = {
 	 *                 namespace. If you are not sure about namespaces, provide
 	 *                 just the element to be serialized.
 	 */
-	serialize: function(node, preserveNamespace) {
+	serialize: function (node, preserveNamespace) {
 
 		if (node.nodeType == node.ELEMENT_NODE) {
 			// serialize an element node.
@@ -938,7 +953,7 @@ var DataManager = {
 
 			// ignore transients.
 
-			if(ignore)
+			if (ignore)
 				return '';
 
 			// start serialization.
@@ -946,18 +961,19 @@ var DataManager = {
 			var result = '<' + node.nodeName;
 
 			// preserve namespace?
-			if(!preserveNamespace)
+			if (!preserveNamespace)
 				result += ' xmlns="' + (node.namespaceURI ? node.namespaceURI : XMLNS.XHTML) + '" xmlns:oryx="http://oryx-editor.org"';
 
 			// add all attributes.
 
-			attributes.each(function(attribute) {
+			attributes.each(function (attribute) {
 				result += ' ' + attribute.nodeName + '="' +
-					attribute.nodeValue + '"';});
+					attribute.nodeValue + '"';
+			});
 
 			// close if no children.
 
-			if(children.length == 0)
+			if (children.length == 0)
 				result += '/>';
 
 			else {
@@ -965,8 +981,9 @@ var DataManager = {
 				// serialize all children.
 
 				result += '>';
-				children.each(function(_node) {
-					result += DataManager.serialize(_node, true)});
+				children.each(function (_node) {
+					result += DataManager.serialize(_node, true)
+				});
 				result += '</' + node.nodeName + '>'
 			}
 
@@ -975,44 +992,48 @@ var DataManager = {
 		} else if (node.nodeType == node.TEXT_NODE) {
 
 			// serialize a text node.
-			return  node.nodeValue;
+			return node.nodeValue;
 		}
 
 		//TODO serialize cdata areas also.
 		//TODO work on namespace awareness.
 	},
 
-	addTriple: function(triple) {
+	addTriple: function (triple) {
 
 		// assert the subject is a resource
 
-		if(!triple.subject.type == ERDF.LITERAL)
+		if (!triple.subject.type == ERDF.LITERAL)
 			throw 'Cannot add the triple ' + triple.toString() +
-				' because the subject is not a resource.'
+			' because the subject is not a resource.'
 
 		// get the element which represents this triple's subject.
 		var elementId = ERDF.__stripHashes(triple.subject.value);
 		var element = $(elementId);
 
 		// assert the subject is inside this document.
-		if(!element)
+		if (!element)
 			throw 'Cannot add the triple ' + triple.toString() +
-				' because the subject "'+elementId+'" is not in the document.';
+			' because the subject "' + elementId + '" is not in the document.';
 
-		if(triple.object.type == ERDF.LITERAL)
+		if (triple.object.type == ERDF.LITERAL)
 
 			// object is literal
 			DataManager.graft(XMLNS.XHTML, element, [
-				'span', {'class': (triple.predicate.prefix + "-" +
-					triple.predicate.name)}, triple.object.value.escapeHTML()
+				'span', {
+					'class': (triple.predicate.prefix + "-" +
+						triple.predicate.name)
+				}, triple.object.value.escapeHTML()
 			]);
 
 		else {
 
 			// object is resource
 			DataManager.graft(XMLNS.XHTML, element, [
-				'a', {'rel': (triple.predicate.prefix + "-" +
-					triple.predicate.name), 'href': triple.object.value}
+				'a', {
+					'rel': (triple.predicate.prefix + "-" +
+						triple.predicate.name), 'href': triple.object.value
+				}
 			]);
 
 		}
@@ -1020,14 +1041,13 @@ var DataManager = {
 		return true;
 	},
 
-	removeTriples: function(triples) {
+	removeTriples: function (triples) {
 
 		// alert('Removing ' +triples.length+' triples.');
 
 		// from all the triples select those ...
 		var removed = triples.select(
-
-			function(triple) {
+			function (triple) {
 
 				// TODO remove also from triple store.
 				// ... that were actually removed.
@@ -1039,7 +1059,7 @@ var DataManager = {
 		return removed;
 	},
 
-	removeTriple: function(triple) {
+	removeTriple: function (triple) {
 
 		// remember whether the triple was actually removed.
 		var result = DataManager.__removeTriple(triple);
@@ -1049,45 +1069,45 @@ var DataManager = {
 		return result;
 	},
 
-	__removeTriple: function(triple) {
+	__removeTriple: function (triple) {
 
 		// assert the subject is a resource
-		if(!triple.subject.type == ERDF.LITERAL)
+		if (!triple.subject.type == ERDF.LITERAL)
 
 			throw 'Cannot remove the triple ' + triple.toString() +
-				' because the subject is not a resource.';
+			' because the subject is not a resource.';
 
 		// get the element which represents this triple's subject.
 		var elementId = ERDF.__stripHashes(triple.subject.value);
 		var element = $(elementId);
 
 		// assert the subject is inside this document.
-		if(!element)
+		if (!element)
 
 			throw 'Cannot remove the triple ' + triple.toString() +
-				' because the subject is not in the document.';
+			' because the subject is not in the document.';
 
-		if(triple.object.type == ERDF.LITERAL) {
+		if (triple.object.type == ERDF.LITERAL) {
 
-  			// continue searching actively for the triple.
+			// continue searching actively for the triple.
 			var result = DataManager.__removeTripleRecursively(triple, element);
 			return result;
 		}
 	},
 
-	__removeTripleRecursively: function(triple, continueFrom) {
+	__removeTripleRecursively: function (triple, continueFrom) {
 
 		// return when this node is not an element node.
-		if(continueFrom.nodeType != continueFrom.ELEMENT_NODE)
+		if (continueFrom.nodeType != continueFrom.ELEMENT_NODE)
 			return false;
 
 		var classes = new String(continueFrom.getAttribute('class'));
 		var children = $A(continueFrom.childNodes);
 
-		if(classes.include(triple.predicate.prefix + '-' + triple.predicate.name)) {
+		if (classes.include(triple.predicate.prefix + '-' + triple.predicate.name)) {
 
 			var content = continueFrom.textContent;
-			if(	(triple.object.type == ERDF.LITERAL) &&
+			if ((triple.object.type == ERDF.LITERAL) &&
 				(triple.object.value == content))
 
 				continueFrom.parentNode.removeChild(continueFrom);
@@ -1096,8 +1116,9 @@ var DataManager = {
 
 		} else {
 
-			children.each(function(_node) {
-			DataManager.__removeTripleRecursively(triple, _node)});
+			children.each(function (_node) {
+				DataManager.__removeTripleRecursively(triple, _node)
+			});
 			return false;
 		}
 
@@ -1114,62 +1135,64 @@ var DataManager = {
 	 * adding non-default attributes yourself or you'll have to enhance this
 	 * function. Latter, I would appreciate: martin???apfelfabrik.de
 	 * @param {Object} namespace The namespace in which
-	 * 					elements should be grafted.
+	 *                    elements should be grafted.
 	 * @param {Object} parent The element that should contain the grafted
-	 * 					structure after the function returned.
+	 *                    structure after the function returned.
 	 * @param {Object} t the crafting structure.
 	 * @param {Object} doc the document in which grafting is performed.
 	 */
-	graft: function(namespace, parent, t, doc) {
-
-	    doc = (doc || (parent && parent.ownerDocument) || document);
-	    var e;
-	    if(t === undefined) {
-	        echo( "Can't graft an undefined value");
-	    } else if(t.constructor == String) {
-	        e = doc.createTextNode( t );
-	    } else {
-	        for(var i = 0; i < t.length; i++) {
-	            if( i === 0 && t[i].constructor == String ) {
-					var snared = t[i].match( /^([a-z][a-z0-9]*)\.([^\s\.]+)$/i );
-	                if( snared ) {
-	                    e = doc.createElementNS(namespace, snared[1]);
-	                    e.setAttributeNS(null, 'class', snared[2] );
-	                    continue;
-	                }
-	                snared = t[i].match( /^([a-z][a-z0-9]*)$/i );
-	                if( snared ) {
-	                    e = doc.createElementNS(namespace, snared[1]);  // but no class
-	                    continue;
-	                }
-
-	                // Otherwise:
-	                e = doc.createElementNS(namespace, "span");
-	                e.setAttribute(null, "class", "namelessFromLOL" );
-	            }
-
-	            if( t[i] === undefined ) {
-	                echo("Can't graft an undefined value in a list!");
-	            } else if( t[i].constructor == String || t[i].constructor == Array) {
-	                this.graft(namespace, e, t[i], doc );
-	            } else if(  t[i].constructor == Number ) {
-	                this.graft(namespace, e, t[i].toString(), doc );
-	            } else if(  t[i].constructor == Object ) {
-	                // hash's properties => element's attributes
-	                for(var k in t[i]) { e.setAttributeNS(null, k, t[i][k] ); }
-	            } else if(  t[i].constructor == Boolean ) {
-	                this.graft(namespace, e, t[i] ? 'true' : 'false', doc );
+	graft: function (namespace, parent, t, doc) {
+
+		doc = (doc || (parent && parent.ownerDocument) || document);
+		var e;
+		if (t === undefined) {
+			echo("Can't graft an undefined value");
+		} else if (t.constructor == String) {
+			e = doc.createTextNode(t);
+		} else {
+			for (var i = 0; i < t.length; i++) {
+				if (i === 0 && t[i].constructor == String) {
+					var snared = t[i].match(/^([a-z][a-z0-9]*)\.([^\s\.]+)$/i);
+					if (snared) {
+						e = doc.createElementNS(namespace, snared[1]);
+						e.setAttributeNS(null, 'class', snared[2]);
+						continue;
+					}
+					snared = t[i].match(/^([a-z][a-z0-9]*)$/i);
+					if (snared) {
+						e = doc.createElementNS(namespace, snared[1]);  // but no class
+						continue;
+					}
+
+					// Otherwise:
+					e = doc.createElementNS(namespace, "span");
+					e.setAttribute(null, "class", "namelessFromLOL");
+				}
+
+				if (t[i] === undefined) {
+					echo("Can't graft an undefined value in a list!");
+				} else if (t[i].constructor == String || t[i].constructor == Array) {
+					this.graft(namespace, e, t[i], doc);
+				} else if (t[i].constructor == Number) {
+					this.graft(namespace, e, t[i].toString(), doc);
+				} else if (t[i].constructor == Object) {
+					// hash's properties => element's attributes
+					for (var k in t[i]) {
+						e.setAttributeNS(null, k, t[i][k]);
+					}
+				} else if (t[i].constructor == Boolean) {
+					this.graft(namespace, e, t[i] ? 'true' : 'false', doc);
 				} else
 					throw "Object " + t[i] + " is inscrutable as an graft arglet.";
-	        }
-	    }
+			}
+		}
 
-		if(parent) parent.appendChild(e);
+		if (parent) parent.appendChild(e);
 
-	    return Element.extend(e); // return the topmost created node
+		return Element.extend(e); // return the topmost created node
 	},
 
-	setObject: function(triple) {
+	setObject: function (triple) {
 
 		/**
 		 * Erwartungen von Arvid an diese Funktion:
@@ -1190,7 +1213,7 @@ var DataManager = {
 		return true;
 	},
 
-	query: function(subject, predicate, object) {
+	query: function (subject, predicate, object) {
 
 		/*
 		 * Typical triple.
@@ -1199,12 +1222,12 @@ var DataManager = {
 		 *	{value: object, type: objectType});
 		 */
 
-		return DataManager._triples.select(function(triple) {
+		return DataManager._triples.select(function (triple) {
 
 			var select = ((subject) ?
 				(triple.subject.type == subject.type) &&
 				(triple.subject.value == subject.value) : true);
-			if(predicate) {
+			if (predicate) {
 				select = select && ((predicate.prefix) ?
 					(triple.predicate.prefix == predicate.prefix) : true);
 				select = select && ((predicate.name) ?
@@ -1220,7 +1243,9 @@ var DataManager = {
 
 Kickstart.register(DataManager.init);
 
-function assert(expr, m) { if(!expr) throw m; };
+function assert(expr, m) {
+	if (!expr) throw m;
+};
 
 function DMCommand(action, triple) {
 
@@ -1228,8 +1253,8 @@ function DMCommand(action, triple) {
 	this.action = action;
 	this.triple = triple;
 
-	this.toString = function() {
-		return 'Command('+action+', '+triple+')';
+	this.toString = function () {
+		return 'Command(' + action + ', ' + triple + ')';
 	};
 }
 
@@ -1241,7 +1266,7 @@ function DMCommandHandler(nextHandler) {
 	 * details).
 	 * @param {DMCommandHandler} handler The handler that is next in the chain.
 	 */
-	this.__setNext = function(handler) {
+	this.__setNext = function (handler) {
 		var _next = this.__next;
 		this.__next = nextHandler;
 		return _next ? _next : true;
@@ -1253,7 +1278,7 @@ function DMCommandHandler(nextHandler) {
 	 * returns false, otherwise it forwards the result of the handling.
 	 * @param {Object} command The command object to be processed.
 	 */
-	this.__invokeNext = function(command) {
+	this.__invokeNext = function (command) {
 		return this.__next ? this.__next.handle(command) : false;
 	};
 
@@ -1265,7 +1290,7 @@ function DMCommandHandler(nextHandler) {
 	 * be invoked.
 	 * @param {Object} command The command object to be processed.
 	 */
-	this.handle = function(command) {
+	this.handle = function (command) {
 		return this.process(command) ? true : this.__invokeNext(command);
 	}
 
@@ -1274,7 +1299,9 @@ function DMCommandHandler(nextHandler) {
 	 * class members, this would be one.
 	 * @param {Object} command The command object to process.
 	 */
-	this.process = function(command) { return false; };
+	this.process = function (command) {
+		return false;
+	};
 };
 
 /**
@@ -1285,22 +1312,22 @@ function DMCommandHandler(nextHandler) {
 function MetaTagHandler(next) {
 
 	DMCommandHandler.apply(this, [next]);
-	this.process = function(command) {
+	this.process = function (command) {
 
-		with(command.triple) {
+		with (command.triple) {
 
 			/* assert prerequisites */
-			if( !(
+			if (!(
 				(subject instanceof ERDF.Resource) &&
 				(subject.isCurrentDocument()) &&
 				(object instanceof ERDF.Literal)
-			))	return false;
+			)) return false;
 		}
 
 	};
 };
 
-var chain =	new MetaTagHandler();
+var chain = new MetaTagHandler();
 var command = new DMCommand(TRIPLE_ADD, new ERDF.Triple(
 	new ERDF.Resource(''),
 	'rdf:tool',
@@ -1319,11 +1346,11 @@ ResourceManager = {
 	__listeners: $H(),
 	__token: 1,
 
-	addListener: function(listener, mask) {
+	addListener: function (listener, mask) {
 
-		if(!(listener instanceof Function))
+		if (!(listener instanceof Function))
 			throw 'Resource event listener is not a function!';
-		if(!(mask))
+		if (!(mask))
 			throw 'Invalid mask for resource event listener registration.';
 
 		// construct controller and token.
@@ -1337,46 +1364,46 @@ ResourceManager = {
 		return token;
 	},
 
-	removeListener: function(token) {
+	removeListener: function (token) {
 
 		// remove the listener with the token and return it.
 		return ResourceManager.__listners.remove(token);
 	},
 
-	__Event: function(action, resourceId) {
+	__Event: function (action, resourceId) {
 		this.action = action;
 		this.resourceId = resourceId;
 	},
 
-	__dispatchEvent: function(event) {
+	__dispatchEvent: function (event) {
 
 		// get all listeners. for each listener, ...
-		ResourceManager.__listeners.values().each(function(controller) {
+		ResourceManager.__listeners.values().each(function (controller) {
 
 			// .. if listener subscribed to this type of event ...
-			if(event.action & controller.mask)
+			if (event.action & controller.mask)
 				return controller.listener(event);
 		});
 	},
 
-	getResource: function(id) {
+	getResource: function (id) {
 
 		// get all possible resources for this.
 		id = ERDF.__stripHashes(id);
 		var resources = DataManager.query(
-			new ERDF.Resource('#'+id),
+			new ERDF.Resource('#' + id),
 			{prefix: 'raziel', name: 'entry'},
 			undefined
 		);
 
 		// check for consistency.
-		if((resources.length == 1) && (resources[0].object.isResource())) {
+		if ((resources.length == 1) && (resources[0].object.isResource())) {
 			var entryUrl = resources[0].object.value;
 			return new ResourceManager.__Resource(id, entryUrl);
 		}
 
 		// else throw an error message.
-		throw ('Resource with id ' +id+ ' not recognized as such. ' +
+		throw ('Resource with id ' + id + ' not recognized as such. ' +
 			((resources.length > 1) ?
 				' There is more than one raziel:entry URL.' :
 				' There is no raziel:entry URL.'));
@@ -1384,7 +1411,7 @@ ResourceManager = {
 		return false;
 	},
 
-	__createResource: function(alternativeDiv) {
+	__createResource: function (alternativeDiv) {
 
 		var collectionUrls = DataManager.query(
 			new ERDF.Resource(''),
@@ -1395,7 +1422,7 @@ ResourceManager = {
 
 		// check for consistency.
 
-		if(	(collectionUrls.length == 1) &&
+		if ((collectionUrls.length == 1) &&
 			(collectionUrls[0].object.isResource())) {
 
 			// get the collection url.
@@ -1406,14 +1433,14 @@ ResourceManager = {
 			// if there is an old id, serialize the dummy div from there,
 			// otherwise create a dummy div on the fly.
 
-			var serialization = alternativeDiv? alternativeDiv :
-					'<div xmlns="http://www.w3.org/1999/xhtml"></div>';
+			var serialization = alternativeDiv ? alternativeDiv :
+				'<div xmlns="http://www.w3.org/1999/xhtml"></div>';
 
 			ResourceManager.__request(
 				'POST', collectionUrl, serialization,
 
 				// on success
-				function() {
+				function () {
 
 					// get div and id that have been generated by the server.
 
@@ -1422,9 +1449,12 @@ ResourceManager = {
 					var id = div.getAttribute('id');
 
 					// store div in DOM
-					if(!$$('.' + PROCESSDATA_REF)[0])
+					if (!$$('.' + PROCESSDATA_REF)[0])
 						DataManager.graft(XMLNS.XHTML,
-							document.getElementsByTagNameNS(XMLNS.XHTML, 'body').item(0), ['div', {'class': PROCESSDATA_REF, 'style':'display:none;'}]);
+							document.getElementsByTagNameNS(XMLNS.XHTML, 'body').item(0), ['div', {
+								'class': PROCESSDATA_REF,
+								'style': 'display:none;'
+							}]);
 
 					$$('.' + PROCESSDATA_REF)[0].appendChild(div.cloneNode(true));
 
@@ -1442,8 +1472,10 @@ ResourceManager = {
 						this, RESOURCE_CREATED, undefined);
 				},
 
-				function() { ResourceManager.__resourceActionFailed(
-					this, RESOURCE_CREATED, undefined);},
+				function () {
+					ResourceManager.__resourceActionFailed(
+						this, RESOURCE_CREATED, undefined);
+				},
 				false
 			);
 
@@ -1456,7 +1488,7 @@ ResourceManager = {
 
 	},
 
-	__Resource: function(id, url) {
+	__Resource: function (id, url) {
 
 		this.__id = id;
 		this.__url = url;
@@ -1493,62 +1525,74 @@ ResourceManager = {
 
 
 		// convenience finction for getting the id.
-		this.id = function() {
+		this.id = function () {
 			return this.__id;
 		}
 
 		// convenience finction for getting the entry url.
-		this.url = function() {
+		this.url = function () {
 			return this.__url;
 		}
 
-		this.reload = function() {
+		this.reload = function () {
 			var _url = this.__url;
 			var _id = this.__id;
 			ResourceManager.__request(
 				'GET', _url, null,
-				function() { ResourceManager.__resourceActionSucceeded(
-					this, RESOURCE_RELOADED, _id); },
-				function() { ResourceManager.__resourceActionFailed(
-					this, RESURCE_RELOADED, _id); },
+				function () {
+					ResourceManager.__resourceActionSucceeded(
+						this, RESOURCE_RELOADED, _id);
+				},
+				function () {
+					ResourceManager.__resourceActionFailed(
+						this, RESURCE_RELOADED, _id);
+				},
 				USE_ASYNCHRONOUS_REQUESTS
 			);
 		};
 
-		this.save = function(synchronize) {
+		this.save = function (synchronize) {
 			var _url = this.__url;
 			var _id = this.__id;
 			data = DataManager.serialize($(_id));
 			ResourceManager.__request(
 				'PUT', _url, data,
-				function() { ResourceManager.__resourceActionSucceeded(
-					this, synchronize ? RESOURCE_SAVED | RESOURCE_SYNCHRONIZED : RESOURCE_SAVED, _id); },
-				function() { ResourceManager.__resourceActionFailed(
-					this, synchronize ? RESOURCE_SAVED | RESOURCE_SYNCHRONIZED : RESOURCE.SAVED, _id); },
+				function () {
+					ResourceManager.__resourceActionSucceeded(
+						this, synchronize ? RESOURCE_SAVED | RESOURCE_SYNCHRONIZED : RESOURCE_SAVED, _id);
+				},
+				function () {
+					ResourceManager.__resourceActionFailed(
+						this, synchronize ? RESOURCE_SAVED | RESOURCE_SYNCHRONIZED : RESOURCE.SAVED, _id);
+				},
 				USE_ASYNCHRONOUS_REQUESTS
 			);
 		};
 
-		this.remove = function() {
+		this.remove = function () {
 			var _url = this.__url;
 			var _id = this.__id;
 			ResourceManager.__request(
 				'DELETE', _url, null,
-				function() { ResourceManager.__resourceActionSucceeded(
-					this, RESOURCE_REMOVED, _id); },
-				function() { ResourceManager.__resourceActionFailed(
-					this, RESOURCE_REMOVED, _id);},
+				function () {
+					ResourceManager.__resourceActionSucceeded(
+						this, RESOURCE_REMOVED, _id);
+				},
+				function () {
+					ResourceManager.__resourceActionFailed(
+						this, RESOURCE_REMOVED, _id);
+				},
 				USE_ASYNCHRONOUS_REQUESTS
 			);
 		};
 	},
 
-	request: function(url, requestOptions) {
+	request: function (url, requestOptions) {
 
 		var options = {
-			method:       'get',
+			method: 'get',
 			asynchronous: true,
-			parameters:   {}
+			parameters: {}
 		};
 
 		Object.extend(options, requestOptions || {});
@@ -1561,78 +1605,87 @@ ResourceManager = {
 			options.method,
 			url,
 			options.data,
-			(options.onSuccess instanceof Function ? function() { options.onSuccess(this); } : undefined ),
-			(options.onFailure instanceof Function ? function() { options.onFailure(this); } : undefined ),
+			(options.onSuccess instanceof Function ? function () {
+				options.onSuccess(this);
+			} : undefined),
+			(options.onFailure instanceof Function ? function () {
+				options.onFailure(this);
+			} : undefined),
 			options.asynchronous && USE_ASYNCHRONOUS_REQUESTS,
 			options.headers);
 	},
 
-	__request: function(method, url, data, success, error, async, headers) {
+	__request: function (method, url, data, success, error, async, headers) {
 
 		// get a request object
 		var httpRequest = Try.these(
-
 			/* do the Mozilla/Safari/Opera stuff */
-			function() { return new XMLHttpRequest(); },
+			function () {
+				return new XMLHttpRequest();
+			},
 
 			/* do the IE stuff */
-			function() { return new ActiveXObject("Msxml2.XMLHTTP"); },
-			function() { return new ActiveXObject("Microsoft.XMLHTTP") }
+			function () {
+				return new ActiveXObject("Msxml2.XMLHTTP");
+			},
+			function () {
+				return new ActiveXObject("Microsoft.XMLHTTP")
+			}
 		);
 
 		// if there is no request object ...
-        if (!httpRequest) {
-			if(!this.__corrupt)
+		if (!httpRequest) {
+			if (!this.__corrupt)
 				throw 'This browser does not provide any AJAX functionality. You will not be able to use the software provided with the page you are viewing. Please consider installing appropriate extensions.';
 			this.__corrupt = true;
 			return false;
-        }
+		}
 
-		if(success instanceof Function)
+		if (success instanceof Function)
 			httpRequest.onload = success;
-		if(error instanceof Function) {
+		if (error instanceof Function) {
 			httpRequest.onerror = error;
 		}
 
 		var h = $H(headers)
-		h.keys().each(function(key) {
+		h.keys().each(function (key) {
 
 			httpRequest.setRequestHeader(key, h[key]);
 		});
 
 		try {
 
-			if(SHOW_DEBUG_ALERTS_WHEN_SAVING)
+			if (SHOW_DEBUG_ALERTS_WHEN_SAVING)
 
 				alert(method + ' ' + url + '\n' +
-					SHOW_EXTENDED_DEBUG_INFORMATION ? data : '');
+				SHOW_EXTENDED_DEBUG_INFORMATION ? data : '');
 
 			// TODO Remove synchronous calls to the server as soon as xenodot
 			// handles asynchronous requests without failure.
-	        httpRequest.open(method, url, !async?false:true);
-	        httpRequest.send(data);
+			httpRequest.open(method, url, !async ? false : true);
+			httpRequest.send(data);
 
-		} catch(e) {
+		} catch (e) {
 			return false;
 		}
 		return true;
-    },
+	},
 
-	__resourceActionSucceeded: function(transport, action, id) {
+	__resourceActionSucceeded: function (transport, action, id) {
 
 		var status = transport.status;
 		var response = transport.responseText;
 
-		if(SHOW_DEBUG_ALERTS_WHEN_SAVING)
+		if (SHOW_DEBUG_ALERTS_WHEN_SAVING)
 
 			alert(status + ' ' + url + '\n' +
-				SHOW_EXTENDED_DEBUG_INFORMATION ? data : '');
+			SHOW_EXTENDED_DEBUG_INFORMATION ? data : '');
 
 		// if the status code is not in 2xx, throw an error.
-		if(status >= 300)
-			throw 'The server responded with an error: ' + status + '\n' + (SHOW_EXTENDED_DEBUG_INFORMATION ? + data : 'If you need additional information here, including the data sent by the server, consider setting SHOW_EXTENDED_DEBUG_INFORMATION to true.');
+		if (status >= 300)
+			throw 'The server responded with an error: ' + status + '\n' + (SHOW_EXTENDED_DEBUG_INFORMATION ? +data : 'If you need additional information here, including the data sent by the server, consider setting SHOW_EXTENDED_DEBUG_INFORMATION to true.');
 
-		switch(action) {
+		switch (action) {
 
 			case RESOURCE_REMOVED:
 
@@ -1672,9 +1725,12 @@ ResourceManager = {
 				localDiv.parentNode.removeChild(localDiv);
 
 				// store div in DOM
-				if(!$$(PROCESSDATA_REF)[0])
+				if (!$$(PROCESSDATA_REF)[0])
 					DataManager.graft(XMLNS.XHTML,
-						document.getElementsByTagNameNS(XMLNS.XHTML, 'body').item(0), ['div', {'class': PROCESSDATA_REF, 'style':'display:none;'}]);
+						document.getElementsByTagNameNS(XMLNS.XHTML, 'body').item(0), ['div', {
+							'class': PROCESSDATA_REF,
+							'style': 'display:none;'
+						}]);
 
 				$$(PROCESSDATA_REF)[0].appendChild(div.cloneNode(true));
 				DataManager.__synclocal();
@@ -1687,16 +1743,15 @@ ResourceManager = {
 
 		// dispatch to all listeners ...
 		ResourceManager.__dispatchEvent(
-
 			// ... an event describing the change that happened here.
 			new ResourceManager.__Event(action, id)
 		);
 	},
 
-	__resourceActionFailed: function(transport, action, id) {
+	__resourceActionFailed: function (transport, action, id) {
 		throw "Fatal: Resource action failed. There is something horribly " +
-			"wrong with either the server, the transport protocol or your " +
-			"online status. Sure you're online?";
+		"wrong with either the server, the transport protocol or your " +
+		"online status. Sure you're online?";
 	}
 }/*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
@@ -1717,13 +1772,15 @@ ResourceManager = {
  * Worth reading.
  * @class Clazz
  */
-var Clazz = function() {};
+var Clazz = function () {
+};
 
 /**
  * Empty constructor.
  * @methodOf Clazz.prototype
  */
-Clazz.prototype.construct = function() {};
+Clazz.prototype.construct = function () {
+};
 
 /**
  * Can be used to build up inheritances of classes.
@@ -1742,25 +1799,27 @@ Clazz.prototype.construct = function() {};
  * });
  * @param {Object} def The definition of the new class.
  */
-Clazz.extend = function(def) {
-    var classDef = function() {
-        if (arguments[0] !== Clazz) { this.construct.apply(this, arguments); }
-    };
+Clazz.extend = function (def) {
+	var classDef = function () {
+		if (arguments[0] !== Clazz) {
+			this.construct.apply(this, arguments);
+		}
+	};
 
-    var proto = new this(Clazz);
-    var superClass = this.prototype;
+	var proto = new this(Clazz);
+	var superClass = this.prototype;
 
-    for (var n in def) {
-        var item = def[n];
-        if (item instanceof Function) item.$ = superClass;
-        proto[n] = item;
-    }
+	for (var n in def) {
+		var item = def[n];
+		if (item instanceof Function) item.$ = superClass;
+		proto[n] = item;
+	}
 
-    classDef.prototype = proto;
+	classDef.prototype = proto;
 
-    //Give this new class the same static extend method
-    classDef.extend = this.extend;
-    return classDef;
+	//Give this new class the same static extend method
+	classDef.extend = this.extend;
+	return classDef;
 };/*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
  * License rights for this program may be obtained from Alfresco Software, Ltd.
@@ -1771,51 +1830,51 @@ Clazz.extend = function(def) {
  * All code Copyright 2013 KIS Consultancy all rights reserved
  */
 
-if(!ORYX) var ORYX = {};
+if (!ORYX) var ORYX = {};
 
-if(!ORYX.CONFIG) ORYX.CONFIG = {};
+if (!ORYX.CONFIG) ORYX.CONFIG = {};
 
 /**
  * This file contains URI constants that may be used for XMLHTTPRequests.
  */
 
-ORYX.CONFIG.ROOT_PATH =					"editor/"; //TODO: Remove last slash!!
-ORYX.CONFIG.EXPLORER_PATH =				"explorer";
-ORYX.CONFIG.LIBS_PATH =					"libs";
+ORYX.CONFIG.ROOT_PATH = "editor/"; //TODO: Remove last slash!!
+ORYX.CONFIG.EXPLORER_PATH = "explorer";
+ORYX.CONFIG.LIBS_PATH = "libs";
 
 /**
  * Regular Config
  */
-ORYX.CONFIG.SERVER_HANDLER_ROOT = 			"service";
-ORYX.CONFIG.SERVER_EDITOR_HANDLER =			ORYX.CONFIG.SERVER_HANDLER_ROOT + "/editor";
-ORYX.CONFIG.SERVER_MODEL_HANDLER =			ORYX.CONFIG.SERVER_HANDLER_ROOT + "/model";
-ORYX.CONFIG.STENCILSET_HANDLER = 			ORYX.CONFIG.SERVER_HANDLER_ROOT + "/editor_stencilset?embedsvg=true&url=true&namespace=";
-ORYX.CONFIG.STENCIL_SETS_URL = 				ORYX.CONFIG.SERVER_HANDLER_ROOT + "/editor_stencilset";
-
-ORYX.CONFIG.PLUGINS_CONFIG =				"editor-app/plugins.xml";
-ORYX.CONFIG.SYNTAXCHECKER_URL =				ORYX.CONFIG.SERVER_HANDLER_ROOT + "/syntaxchecker";
-ORYX.CONFIG.DEPLOY_URL = 					ORYX.CONFIG.SERVER_HANDLER_ROOT + "/model/deploy";
-ORYX.CONFIG.MODEL_LIST_URL = 				ORYX.CONFIG.SERVER_HANDLER_ROOT + "/models";
-ORYX.CONFIG.FORM_FLOW_LIST_URL = 			ORYX.CONFIG.SERVER_HANDLER_ROOT + "/formflows";
-ORYX.CONFIG.FORM_FLOW_IMAGE_URL = 			ORYX.CONFIG.SERVER_HANDLER_ROOT + "/formflow";
-ORYX.CONFIG.FORM_LIST_URL = 				ORYX.CONFIG.SERVER_HANDLER_ROOT + "/forms";
-ORYX.CONFIG.FORM_IMAGE_URL = 				ORYX.CONFIG.SERVER_HANDLER_ROOT + "/form";
-ORYX.CONFIG.SUB_PROCESS_LIST_URL = 			ORYX.CONFIG.SERVER_HANDLER_ROOT + "/subprocesses";
-ORYX.CONFIG.SUB_PROCESS_IMAGE_URL = 		ORYX.CONFIG.SERVER_HANDLER_ROOT + "/subprocess";
-ORYX.CONFIG.TEST_SERVICE_URL = 				ORYX.CONFIG.SERVER_HANDLER_ROOT + "/service/";
-
-ORYX.CONFIG.SERVICE_LIST_URL = 				ORYX.CONFIG.SERVER_HANDLER_ROOT + "/services";
-ORYX.CONFIG.CONDITION_ELEMENT_LIST_URL = 	ORYX.CONFIG.SERVER_HANDLER_ROOT + "/conditionelements";
-ORYX.CONFIG.VARIABLEDEF_ELEMENT_LIST_URL = 	ORYX.CONFIG.SERVER_HANDLER_ROOT + "/variabledefinitionelements";
-ORYX.CONFIG.VALIDATOR_LIST_URL = 			ORYX.CONFIG.SERVER_HANDLER_ROOT + "/validators";
-
-ORYX.CONFIG.SS_EXTENSIONS_FOLDER =			ORYX.CONFIG.ROOT_PATH + "stencilsets/extensions/";
-ORYX.CONFIG.SS_EXTENSIONS_CONFIG =			ORYX.CONFIG.SERVER_HANDLER_ROOT + "/editor_ssextensions";
-ORYX.CONFIG.ORYX_NEW_URL =					"/new";
-ORYX.CONFIG.BPMN_LAYOUTER =					ORYX.CONFIG.ROOT_PATH + "bpmnlayouter";
-
-ORYX.CONFIG.EXPRESSION_METADATA_URL = 			ORYX.CONFIG.SERVER_HANDLER_ROOT + "/expression-metadata";
-ORYX.CONFIG.DATASOURCE_METADATA_URL = 			ORYX.CONFIG.SERVER_HANDLER_ROOT + "/datasource-metadata";/*
+ORYX.CONFIG.SERVER_HANDLER_ROOT = "service";
+ORYX.CONFIG.SERVER_EDITOR_HANDLER = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/editor";
+ORYX.CONFIG.SERVER_MODEL_HANDLER = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/model";
+ORYX.CONFIG.STENCILSET_HANDLER = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/editor_stencilset?embedsvg=true&url=true&namespace=";
+ORYX.CONFIG.STENCIL_SETS_URL = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/editor_stencilset";
+
+ORYX.CONFIG.PLUGINS_CONFIG = "editor-app/plugins.xml";
+ORYX.CONFIG.SYNTAXCHECKER_URL = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/syntaxchecker";
+ORYX.CONFIG.DEPLOY_URL = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/model/deploy";
+ORYX.CONFIG.MODEL_LIST_URL = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/models";
+ORYX.CONFIG.FORM_FLOW_LIST_URL = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/formflows";
+ORYX.CONFIG.FORM_FLOW_IMAGE_URL = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/formflow";
+ORYX.CONFIG.FORM_LIST_URL = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/forms";
+ORYX.CONFIG.FORM_IMAGE_URL = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/form";
+ORYX.CONFIG.SUB_PROCESS_LIST_URL = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/subprocesses";
+ORYX.CONFIG.SUB_PROCESS_IMAGE_URL = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/subprocess";
+ORYX.CONFIG.TEST_SERVICE_URL = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/service/";
+
+ORYX.CONFIG.SERVICE_LIST_URL = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/services";
+ORYX.CONFIG.CONDITION_ELEMENT_LIST_URL = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/conditionelements";
+ORYX.CONFIG.VARIABLEDEF_ELEMENT_LIST_URL = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/variabledefinitionelements";
+ORYX.CONFIG.VALIDATOR_LIST_URL = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/validators";
+
+ORYX.CONFIG.SS_EXTENSIONS_FOLDER = ORYX.CONFIG.ROOT_PATH + "stencilsets/extensions/";
+ORYX.CONFIG.SS_EXTENSIONS_CONFIG = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/editor_ssextensions";
+ORYX.CONFIG.ORYX_NEW_URL = "/new";
+ORYX.CONFIG.BPMN_LAYOUTER = ORYX.CONFIG.ROOT_PATH + "bpmnlayouter";
+
+ORYX.CONFIG.EXPRESSION_METADATA_URL = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/expression-metadata";
+ORYX.CONFIG.DATASOURCE_METADATA_URL = ORYX.CONFIG.SERVER_HANDLER_ROOT + "/datasource-metadata";/*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
  * License rights for this program may be obtained from Alfresco Software, Ltd.
  * pursuant to a written agreement and any use of this program without such an
@@ -1825,19 +1884,19 @@ ORYX.CONFIG.DATASOURCE_METADATA_URL = 			ORYX.CONFIG.SERVER_HANDLER_ROOT + "/dat
  * All code Copyright 2013 KIS Consultancy all rights reserved
  */
 
-if(!ORYX) var ORYX = {};
+if (!ORYX) var ORYX = {};
 
-if(!ORYX.CONFIG) ORYX.CONFIG = {};
+if (!ORYX.CONFIG) ORYX.CONFIG = {};
 
 /**
  * Signavio specific variables
  */
-ORYX.CONFIG.BACKEND_SWITCH 		= 		true;
-ORYX.CONFIG.PANEL_LEFT_WIDTH 	= 		250;
-ORYX.CONFIG.PANEL_RIGHT_COLLAPSED 	= 	true;
-ORYX.CONFIG.PANEL_RIGHT_WIDTH	= 		300;
-ORYX.CONFIG.APPNAME = 					'KISBPM';
-ORYX.CONFIG.WEB_URL = 					".";
+ORYX.CONFIG.BACKEND_SWITCH = true;
+ORYX.CONFIG.PANEL_LEFT_WIDTH = 250;
+ORYX.CONFIG.PANEL_RIGHT_COLLAPSED = true;
+ORYX.CONFIG.PANEL_RIGHT_WIDTH = 300;
+ORYX.CONFIG.APPNAME = 'KISBPM';
+ORYX.CONFIG.WEB_URL = ".";
 
 ORYX.CONFIG.BLANK_IMAGE = ORYX.CONFIG.LIBS_PATH + '/ext-2.0.2/resources/images/default/s.gif';
 
@@ -1845,234 +1904,235 @@ ORYX.CONFIG.BLANK_IMAGE = ORYX.CONFIG.LIBS_PATH + '/ext-2.0.2/resources/images/d
 ORYX.CONFIG.OFFSET_HEADER = 61;
 
 /* Show grid line while dragging */
-ORYX.CONFIG.SHOW_GRIDLINE = 			true;
+ORYX.CONFIG.SHOW_GRIDLINE = true;
 
-	/* Editor-Mode */
-ORYX.CONFIG.MODE_READONLY =				"readonly";
-ORYX.CONFIG.MODE_FULLSCREEN =			"fullscreen";
-ORYX.CONFIG.WINDOW_HEIGHT = 			800;
+/* Editor-Mode */
+ORYX.CONFIG.MODE_READONLY = "readonly";
+ORYX.CONFIG.MODE_FULLSCREEN = "fullscreen";
+ORYX.CONFIG.WINDOW_HEIGHT = 800;
 ORYX.CONFIG.PREVENT_LOADINGMASK_AT_READY = false;
 
-	/* Plugins */
-ORYX.CONFIG.PLUGINS_ENABLED =			true;
-ORYX.CONFIG.PLUGINS_FOLDER =			"Plugins/";
+/* Plugins */
+ORYX.CONFIG.PLUGINS_ENABLED = true;
+ORYX.CONFIG.PLUGINS_FOLDER = "Plugins/";
 
 ORYX.CONFIG.BPMN20_SCHEMA_VALIDATION_ON = true;
 
-	/* Namespaces */
-ORYX.CONFIG.NAMESPACE_ORYX =			"http://www.b3mn.org/oryx";
-ORYX.CONFIG.NAMESPACE_SVG =				"http://www.w3.org/2000/svg";
-
-	/* UI */
-ORYX.CONFIG.CANVAS_WIDTH =				1200;
-ORYX.CONFIG.CANVAS_HEIGHT =				1050;
-ORYX.CONFIG.CANVAS_RESIZE_INTERVAL =	100;
-ORYX.CONFIG.CANVAS_MIN_WIDTH =  800;
-ORYX.CONFIG.CANVAS_MIN_HEIGHT =  300;
-ORYX.CONFIG.SELECTED_AREA_PADDING =		4;
-ORYX.CONFIG.CANVAS_BACKGROUND_COLOR =	"none";
-ORYX.CONFIG.GRID_DISTANCE =				30;
-ORYX.CONFIG.GRID_ENABLED =				true;
-ORYX.CONFIG.ZOOM_OFFSET =				0.1;
-ORYX.CONFIG.DEFAULT_SHAPE_MARGIN =		60;
-ORYX.CONFIG.SCALERS_SIZE =				7;
-ORYX.CONFIG.MINIMUM_SIZE =				20;
-ORYX.CONFIG.MAXIMUM_SIZE =				10000;
-ORYX.CONFIG.OFFSET_MAGNET =				15;
-ORYX.CONFIG.OFFSET_EDGE_LABEL_TOP =		8;
-ORYX.CONFIG.OFFSET_EDGE_LABEL_BOTTOM =	8;
-ORYX.CONFIG.OFFSET_EDGE_BOUNDS =		5;
-ORYX.CONFIG.COPY_MOVE_OFFSET =			30;
-
-ORYX.CONFIG.BORDER_OFFSET =				14;
-
-ORYX.CONFIG.MAX_NUM_SHAPES_NO_GROUP	=	20; // Updated so the form editor shows all elements at once
+/* Namespaces */
+ORYX.CONFIG.NAMESPACE_ORYX = "http://www.b3mn.org/oryx";
+ORYX.CONFIG.NAMESPACE_SVG = "http://www.w3.org/2000/svg";
+
+/* UI */
+ORYX.CONFIG.CANVAS_WIDTH = 1200;
+ORYX.CONFIG.CANVAS_HEIGHT = 1050;
+ORYX.CONFIG.CANVAS_RESIZE_INTERVAL = 100;
+ORYX.CONFIG.CANVAS_MIN_WIDTH = 800;
+ORYX.CONFIG.CANVAS_MIN_HEIGHT = 300;
+ORYX.CONFIG.SELECTED_AREA_PADDING = 4;
+ORYX.CONFIG.CANVAS_BACKGROUND_COLOR = "none";
+ORYX.CONFIG.GRID_DISTANCE = 30;
+ORYX.CONFIG.GRID_ENABLED = true;
+ORYX.CONFIG.ZOOM_OFFSET = 0.1;
+ORYX.CONFIG.DEFAULT_SHAPE_MARGIN = 60;
+ORYX.CONFIG.SCALERS_SIZE = 7;
+ORYX.CONFIG.MINIMUM_SIZE = 20;
+ORYX.CONFIG.MAXIMUM_SIZE = 10000;
+ORYX.CONFIG.OFFSET_MAGNET = 15;
+ORYX.CONFIG.OFFSET_EDGE_LABEL_TOP = 8;
+ORYX.CONFIG.OFFSET_EDGE_LABEL_BOTTOM = 8;
+ORYX.CONFIG.OFFSET_EDGE_BOUNDS = 5;
+ORYX.CONFIG.COPY_MOVE_OFFSET = 30;
+
+ORYX.CONFIG.BORDER_OFFSET = 14;
+
+ORYX.CONFIG.MAX_NUM_SHAPES_NO_GROUP = 20; // Updated so the form editor shows all elements at once
 
 ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET_CORNER = 30;
 ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET = 45;
 
-	/* Shape-Menu Align */
-ORYX.CONFIG.SHAPEMENU_RIGHT =			"Oryx_Right";
-ORYX.CONFIG.SHAPEMENU_BOTTOM =			"Oryx_Bottom";
-ORYX.CONFIG.SHAPEMENU_LEFT =			"Oryx_Left";
-ORYX.CONFIG.SHAPEMENU_TOP =				"Oryx_Top";
-
-
-	/* Morph-Menu Item */
-ORYX.CONFIG.MORPHITEM_DISABLED =		"Oryx_MorphItem_disabled";
-
-	/* Property type names */
-ORYX.CONFIG.TYPE_STRING =				"string";
-ORYX.CONFIG.TYPE_BOOLEAN =				"boolean";
-ORYX.CONFIG.TYPE_INTEGER =				"integer";
-ORYX.CONFIG.TYPE_FLOAT =				"float";
-ORYX.CONFIG.TYPE_COLOR =				"color";
-ORYX.CONFIG.TYPE_DATE =					"date";
-ORYX.CONFIG.TYPE_CHOICE =				"choice";
-ORYX.CONFIG.TYPE_URL =					"url";
-ORYX.CONFIG.TYPE_DIAGRAM_LINK =			"diagramlink";
-ORYX.CONFIG.TYPE_COMPLEX =				"complex";
-ORYX.CONFIG.TYPE_MULTIPLECOMPLEX =		"multiplecomplex";
-ORYX.CONFIG.TYPE_TEXT =					"text";
-ORYX.CONFIG.TYPE_KISBPM_MULTIINSTANCE =	"kisbpm-multiinstance";
-ORYX.CONFIG.TYPE_MODEL_LINK =			"modellink";
-ORYX.CONFIG.TYPE_FORM_FLOW_LINK =		"formflowlink";
-ORYX.CONFIG.TYPE_FORM_LINK =			"formlink";
-ORYX.CONFIG.TYPE_SUB_PROCESS_LINK =		"subprocesslink";
-ORYX.CONFIG.TYPE_SERVICE_LINK =			"servicelink";
-ORYX.CONFIG.TYPE_CONDITIONS =			"conditions";
-ORYX.CONFIG.TYPE_VARIABLES = 			"variables";
-ORYX.CONFIG.TYPE_LISTENER =				"listener";
-ORYX.CONFIG.TYPE_EPC_FREQ = 			"epcfrequency";
-ORYX.CONFIG.TYPE_GLOSSARY_LINK =		"glossarylink";
-ORYX.CONFIG.TYPE_EXPRESSION = 			"expression";
-ORYX.CONFIG.TYPE_DATASOURCE = 			"datasource";
-ORYX.CONFIG.TYPE_DATASOURCE_MINIMAL =	"datasource-minimal";
-ORYX.CONFIG.TYPE_VALIDATORS =			"validators";
-
-
-	/* Vertical line distance of multiline labels */
-ORYX.CONFIG.LABEL_LINE_DISTANCE =		2;
-ORYX.CONFIG.LABEL_DEFAULT_LINE_HEIGHT =	12;
-
-	/* Open Morph Menu with Hover */
+/* Shape-Menu Align */
+ORYX.CONFIG.SHAPEMENU_RIGHT = "Oryx_Right";
+ORYX.CONFIG.SHAPEMENU_BOTTOM = "Oryx_Bottom";
+ORYX.CONFIG.SHAPEMENU_LEFT = "Oryx_Left";
+ORYX.CONFIG.SHAPEMENU_TOP = "Oryx_Top";
+
+
+/* Morph-Menu Item */
+ORYX.CONFIG.MORPHITEM_DISABLED = "Oryx_MorphItem_disabled";
+
+/* Property type names */
+ORYX.CONFIG.TYPE_STRING = "string";
+ORYX.CONFIG.TYPE_BOOLEAN = "boolean";
+ORYX.CONFIG.TYPE_INTEGER = "integer";
+ORYX.CONFIG.TYPE_FLOAT = "float";
+ORYX.CONFIG.TYPE_COLOR = "color";
+ORYX.CONFIG.TYPE_DATE = "date";
+ORYX.CONFIG.TYPE_CHOICE = "choice";
+ORYX.CONFIG.TYPE_URL = "url";
+ORYX.CONFIG.TYPE_DIAGRAM_LINK = "diagramlink";
+ORYX.CONFIG.TYPE_COMPLEX = "complex";
+ORYX.CONFIG.TYPE_MULTIPLECOMPLEX = "multiplecomplex";
+ORYX.CONFIG.TYPE_TEXT = "text";
+ORYX.CONFIG.TYPE_KISBPM_MULTIINSTANCE = "kisbpm-multiinstance";
+ORYX.CONFIG.TYPE_MODEL_LINK = "modellink";
+ORYX.CONFIG.TYPE_FORM_FLOW_LINK = "formflowlink";
+ORYX.CONFIG.TYPE_FORM_LINK = "formlink";
+ORYX.CONFIG.TYPE_SUB_PROCESS_LINK = "subprocesslink";
+ORYX.CONFIG.TYPE_SERVICE_LINK = "servicelink";
+ORYX.CONFIG.TYPE_CONDITIONS = "conditions";
+ORYX.CONFIG.TYPE_VARIABLES = "variables";
+ORYX.CONFIG.TYPE_LISTENER = "listener";
+ORYX.CONFIG.TYPE_EPC_FREQ = "epcfrequency";
+ORYX.CONFIG.TYPE_GLOSSARY_LINK = "glossarylink";
+ORYX.CONFIG.TYPE_EXPRESSION = "expression";
+ORYX.CONFIG.TYPE_DATASOURCE = "datasource";
+ORYX.CONFIG.TYPE_DATASOURCE_MINIMAL = "datasource-minimal";
+ORYX.CONFIG.TYPE_VALIDATORS = "validators";
+
+
+/* Vertical line distance of multiline labels */
+ORYX.CONFIG.LABEL_LINE_DISTANCE = 2;
+ORYX.CONFIG.LABEL_DEFAULT_LINE_HEIGHT = 12;
+
+/* Open Morph Menu with Hover */
 ORYX.CONFIG.ENABLE_MORPHMENU_BY_HOVER = false;
 
 
-	/* Editor constants come here */
-ORYX.CONFIG.EDITOR_ALIGN_BOTTOM =		0x01;
-ORYX.CONFIG.EDITOR_ALIGN_MIDDLE =		0x02;
-ORYX.CONFIG.EDITOR_ALIGN_TOP =			0x04;
-ORYX.CONFIG.EDITOR_ALIGN_LEFT =			0x08;
-ORYX.CONFIG.EDITOR_ALIGN_CENTER =		0x10;
-ORYX.CONFIG.EDITOR_ALIGN_RIGHT =		0x20;
-ORYX.CONFIG.EDITOR_ALIGN_SIZE =			0x30;
-
-	/* Event types */
-ORYX.CONFIG.EVENT_MOUSEDOWN =			"mousedown";
-ORYX.CONFIG.EVENT_MOUSEUP =				"mouseup";
-ORYX.CONFIG.EVENT_MOUSEOVER =			"mouseover";
-ORYX.CONFIG.EVENT_MOUSEOUT =			"mouseout";
-ORYX.CONFIG.EVENT_MOUSEMOVE =			"mousemove";
-ORYX.CONFIG.EVENT_DBLCLICK =			"dblclick";
-ORYX.CONFIG.EVENT_KEYDOWN =				"keydown";
-ORYX.CONFIG.EVENT_KEYUP =				"keyup";
-
-ORYX.CONFIG.EVENT_LOADED =				"editorloaded";
-ORYX.CONFIG.EVENT_SAVED =				"editorSaved";
-
-ORYX.CONFIG.EVENT_EXECUTE_COMMANDS =		"executeCommands";
-ORYX.CONFIG.EVENT_STENCIL_SET_LOADED =		"stencilSetLoaded";
-ORYX.CONFIG.EVENT_SELECTION_CHANGED =		"selectionchanged";
-ORYX.CONFIG.EVENT_SHAPEADDED =				"shapeadded";
-ORYX.CONFIG.EVENT_SHAPEREMOVED =			"shaperemoved";
-ORYX.CONFIG.EVENT_PROPERTY_CHANGED =		"propertyChanged";
-ORYX.CONFIG.EVENT_DRAGDROP_START =			"dragdrop.start";
-ORYX.CONFIG.EVENT_SHAPE_MENU_CLOSE =		"shape.menu.close";
-ORYX.CONFIG.EVENT_DRAGDROP_END =			"dragdrop.end";
-ORYX.CONFIG.EVENT_RESIZE_START =			"resize.start";
-ORYX.CONFIG.EVENT_RESIZE_END =				"resize.end";
-ORYX.CONFIG.EVENT_DRAGDOCKER_DOCKED =		"dragDocker.docked";
-ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW =			"highlight.showHighlight";
-ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE =			"highlight.hideHighlight";
-ORYX.CONFIG.EVENT_LOADING_ENABLE =			"loading.enable";
-ORYX.CONFIG.EVENT_LOADING_DISABLE =			"loading.disable";
-ORYX.CONFIG.EVENT_LOADING_STATUS =			"loading.status";
-ORYX.CONFIG.EVENT_OVERLAY_SHOW =			"overlay.show";
-ORYX.CONFIG.EVENT_OVERLAY_HIDE =			"overlay.hide";
-ORYX.CONFIG.EVENT_ARRANGEMENT_TOP =			"arrangement.setToTop";
-ORYX.CONFIG.EVENT_ARRANGEMENT_BACK =		"arrangement.setToBack";
-ORYX.CONFIG.EVENT_ARRANGEMENT_FORWARD =		"arrangement.setForward";
-ORYX.CONFIG.EVENT_ARRANGEMENT_BACKWARD =	"arrangement.setBackward";
-ORYX.CONFIG.EVENT_PROPWINDOW_PROP_CHANGED =	"propertyWindow.propertyChanged";
-ORYX.CONFIG.EVENT_LAYOUT_ROWS =				"layout.rows";
-ORYX.CONFIG.EVENT_LAYOUT_BPEL =				"layout.BPEL";
-ORYX.CONFIG.EVENT_LAYOUT_BPEL_VERTICAL =    "layout.BPEL.vertical";
-ORYX.CONFIG.EVENT_LAYOUT_BPEL_HORIZONTAL =  "layout.BPEL.horizontal";
+/* Editor constants come here */
+ORYX.CONFIG.EDITOR_ALIGN_BOTTOM = 0x01;
+ORYX.CONFIG.EDITOR_ALIGN_MIDDLE = 0x02;
+ORYX.CONFIG.EDITOR_ALIGN_TOP = 0x04;
+ORYX.CONFIG.EDITOR_ALIGN_LEFT = 0x08;
+ORYX.CONFIG.EDITOR_ALIGN_CENTER = 0x10;
+ORYX.CONFIG.EDITOR_ALIGN_RIGHT = 0x20;
+ORYX.CONFIG.EDITOR_ALIGN_SIZE = 0x30;
+
+/* Event types */
+ORYX.CONFIG.EVENT_MOUSEDOWN = "mousedown";
+ORYX.CONFIG.EVENT_MOUSEUP = "mouseup";
+ORYX.CONFIG.EVENT_MOUSEOVER = "mouseover";
+ORYX.CONFIG.EVENT_MOUSEOUT = "mouseout";
+ORYX.CONFIG.EVENT_MOUSEMOVE = "mousemove";
+ORYX.CONFIG.EVENT_DBLCLICK = "dblclick";
+ORYX.CONFIG.EVENT_KEYDOWN = "keydown";
+ORYX.CONFIG.EVENT_KEYUP = "keyup";
+
+ORYX.CONFIG.EVENT_LOADED = "editorloaded";
+ORYX.CONFIG.EVENT_SAVED = "editorSaved";
+
+ORYX.CONFIG.EVENT_EXECUTE_COMMANDS = "executeCommands";
+ORYX.CONFIG.EVENT_STENCIL_SET_LOADED = "stencilSetLoaded";
+ORYX.CONFIG.EVENT_SELECTION_CHANGED = "selectionchanged";
+ORYX.CONFIG.EVENT_SHAPEADDED = "shapeadded";
+ORYX.CONFIG.EVENT_SHAPEREMOVED = "shaperemoved";
+ORYX.CONFIG.EVENT_PROPERTY_CHANGED = "propertyChanged";
+ORYX.CONFIG.EVENT_DRAGDROP_START = "dragdrop.start";
+ORYX.CONFIG.EVENT_SHAPE_MENU_CLOSE = "shape.menu.close";
+ORYX.CONFIG.EVENT_DRAGDROP_END = "dragdrop.end";
+ORYX.CONFIG.EVENT_RESIZE_START = "resize.start";
+ORYX.CONFIG.EVENT_RESIZE_END = "resize.end";
+ORYX.CONFIG.EVENT_DRAGDOCKER_DOCKED = "dragDocker.docked";
+ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW = "highlight.showHighlight";
+ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE = "highlight.hideHighlight";
+ORYX.CONFIG.EVENT_LOADING_ENABLE = "loading.enable";
+ORYX.CONFIG.EVENT_LOADING_DISABLE = "loading.disable";
+ORYX.CONFIG.EVENT_LOADING_STATUS = "loading.status";
+ORYX.CONFIG.EVENT_OVERLAY_SHOW = "overlay.show";
+ORYX.CONFIG.EVENT_OVERLAY_HIDE = "overlay.hide";
+ORYX.CONFIG.EVENT_ARRANGEMENT_TOP = "arrangement.setToTop";
+ORYX.CONFIG.EVENT_ARRANGEMENT_BACK = "arrangement.setToBack";
+ORYX.CONFIG.EVENT_ARRANGEMENT_FORWARD = "arrangement.setForward";
+ORYX.CONFIG.EVENT_ARRANGEMENT_BACKWARD = "arrangement.setBackward";
+ORYX.CONFIG.EVENT_PROPWINDOW_PROP_CHANGED = "propertyWindow.propertyChanged";
+ORYX.CONFIG.EVENT_LAYOUT_ROWS = "layout.rows";
+ORYX.CONFIG.EVENT_LAYOUT_BPEL = "layout.BPEL";
+ORYX.CONFIG.EVENT_LAYOUT_BPEL_VERTICAL = "layout.BPEL.vertical";
+ORYX.CONFIG.EVENT_LAYOUT_BPEL_HORIZONTAL = "layout.BPEL.horizontal";
 ORYX.CONFIG.EVENT_LAYOUT_BPEL_SINGLECHILD = "layout.BPEL.singlechild";
-ORYX.CONFIG.EVENT_LAYOUT_BPEL_AUTORESIZE =	"layout.BPEL.autoresize";
-ORYX.CONFIG.EVENT_AUTOLAYOUT_LAYOUT =		"autolayout.layout";
-ORYX.CONFIG.EVENT_UNDO_EXECUTE =			"undo.execute";
-ORYX.CONFIG.EVENT_UNDO_ROLLBACK =			"undo.rollback";
-ORYX.CONFIG.EVENT_BUTTON_UPDATE =           "toolbar.button.update";
-ORYX.CONFIG.EVENT_LAYOUT = 					"layout.dolayout";
-ORYX.CONFIG.EVENT_GLOSSARY_LINK_EDIT = 		"glossary.link.edit";
-ORYX.CONFIG.EVENT_GLOSSARY_SHOW =			"glossary.show.info";
-ORYX.CONFIG.EVENT_GLOSSARY_NEW =			"glossary.show.new";
-ORYX.CONFIG.EVENT_DOCKERDRAG = 				"dragTheDocker";
-ORYX.CONFIG.EVENT_CANVAS_SCROLL = 			"canvas.scroll";
-
-ORYX.CONFIG.EVENT_SHOW_PROPERTYWINDOW =		"propertywindow.show";
+ORYX.CONFIG.EVENT_LAYOUT_BPEL_AUTORESIZE = "layout.BPEL.autoresize";
+ORYX.CONFIG.EVENT_AUTOLAYOUT_LAYOUT = "autolayout.layout";
+ORYX.CONFIG.EVENT_UNDO_EXECUTE = "undo.execute";
+ORYX.CONFIG.EVENT_UNDO_ROLLBACK = "undo.rollback";
+ORYX.CONFIG.EVENT_BUTTON_UPDATE = "toolbar.button.update";
+ORYX.CONFIG.EVENT_LAYOUT = "layout.dolayout";
+ORYX.CONFIG.EVENT_GLOSSARY_LINK_EDIT = "glossary.link.edit";
+ORYX.CONFIG.EVENT_GLOSSARY_SHOW = "glossary.show.info";
+ORYX.CONFIG.EVENT_GLOSSARY_NEW = "glossary.show.new";
+ORYX.CONFIG.EVENT_DOCKERDRAG = "dragTheDocker";
+ORYX.CONFIG.EVENT_CANVAS_SCROLL = "canvas.scroll";
+
+ORYX.CONFIG.EVENT_SHOW_PROPERTYWINDOW = "propertywindow.show";
 ORYX.CONFIG.EVENT_ABOUT_TO_SAVE = "file.aboutToSave";
 
-	/* Selection Shapes Highlights */
-ORYX.CONFIG.SELECTION_HIGHLIGHT_SIZE =				5;
-ORYX.CONFIG.SELECTION_HIGHLIGHT_COLOR =				"#4444FF";
-ORYX.CONFIG.SELECTION_HIGHLIGHT_COLOR2 =			"#9999FF";
+/* Selection Shapes Highlights */
+ORYX.CONFIG.SELECTION_HIGHLIGHT_SIZE = 5;
+ORYX.CONFIG.SELECTION_HIGHLIGHT_COLOR = "#4444FF";
+ORYX.CONFIG.SELECTION_HIGHLIGHT_COLOR2 = "#9999FF";
 
-ORYX.CONFIG.SELECTION_HIGHLIGHT_STYLE_CORNER = 		"corner";
-ORYX.CONFIG.SELECTION_HIGHLIGHT_STYLE_RECTANGLE = 	"rectangle";
+ORYX.CONFIG.SELECTION_HIGHLIGHT_STYLE_CORNER = "corner";
+ORYX.CONFIG.SELECTION_HIGHLIGHT_STYLE_RECTANGLE = "rectangle";
 
-ORYX.CONFIG.SELECTION_VALID_COLOR =					"#00FF00";
-ORYX.CONFIG.SELECTION_INVALID_COLOR =				"#FF0000";
+ORYX.CONFIG.SELECTION_VALID_COLOR = "#00FF00";
+ORYX.CONFIG.SELECTION_INVALID_COLOR = "#FF0000";
 
 
-ORYX.CONFIG.DOCKER_DOCKED_COLOR =		"#00FF00";
-ORYX.CONFIG.DOCKER_UNDOCKED_COLOR =		"#FF0000";
-ORYX.CONFIG.DOCKER_SNAP_OFFSET =		10;
+ORYX.CONFIG.DOCKER_DOCKED_COLOR = "#00FF00";
+ORYX.CONFIG.DOCKER_UNDOCKED_COLOR = "#FF0000";
+ORYX.CONFIG.DOCKER_SNAP_OFFSET = 10;
 
-	/* Copy & Paste */
-ORYX.CONFIG.EDIT_OFFSET_PASTE =			10;
+/* Copy & Paste */
+ORYX.CONFIG.EDIT_OFFSET_PASTE = 10;
 
-	/* Key-Codes */
-ORYX.CONFIG.KEY_CODE_X = 				88;
-ORYX.CONFIG.KEY_CODE_C = 				67;
-ORYX.CONFIG.KEY_CODE_V = 				86;
-ORYX.CONFIG.KEY_CODE_DELETE = 			46;
-ORYX.CONFIG.KEY_CODE_META =				224;
-ORYX.CONFIG.KEY_CODE_BACKSPACE =		8;
-ORYX.CONFIG.KEY_CODE_LEFT =				37;
-ORYX.CONFIG.KEY_CODE_RIGHT =			39;
-ORYX.CONFIG.KEY_CODE_UP =				38;
-ORYX.CONFIG.KEY_CODE_DOWN =				40;
+/* Key-Codes */
+ORYX.CONFIG.KEY_CODE_X = 88;
+ORYX.CONFIG.KEY_CODE_C = 67;
+ORYX.CONFIG.KEY_CODE_V = 86;
+ORYX.CONFIG.KEY_CODE_DELETE = 46;
+ORYX.CONFIG.KEY_CODE_META = 224;
+ORYX.CONFIG.KEY_CODE_BACKSPACE = 8;
+ORYX.CONFIG.KEY_CODE_LEFT = 37;
+ORYX.CONFIG.KEY_CODE_RIGHT = 39;
+ORYX.CONFIG.KEY_CODE_UP = 38;
+ORYX.CONFIG.KEY_CODE_DOWN = 40;
 
-	// TODO Determine where the lowercase constants are still used and remove them from here.
-ORYX.CONFIG.KEY_Code_enter =			12;
-ORYX.CONFIG.KEY_Code_left =				37;
-ORYX.CONFIG.KEY_Code_right =			39;
-ORYX.CONFIG.KEY_Code_top =				38;
-ORYX.CONFIG.KEY_Code_bottom =			40;
+// TODO Determine where the lowercase constants are still used and remove them from here.
+ORYX.CONFIG.KEY_Code_enter = 12;
+ORYX.CONFIG.KEY_Code_left = 37;
+ORYX.CONFIG.KEY_Code_right = 39;
+ORYX.CONFIG.KEY_Code_top = 38;
+ORYX.CONFIG.KEY_Code_bottom = 40;
 
 /* Supported Meta Keys */
 
-ORYX.CONFIG.META_KEY_META_CTRL = 		"metactrl";
-ORYX.CONFIG.META_KEY_ALT = 				"alt";
-ORYX.CONFIG.META_KEY_SHIFT = 			"shift";
+ORYX.CONFIG.META_KEY_META_CTRL = "metactrl";
+ORYX.CONFIG.META_KEY_ALT = "alt";
+ORYX.CONFIG.META_KEY_SHIFT = "shift";
 
 /* Key Actions */
 
-ORYX.CONFIG.KEY_ACTION_DOWN = 			"down";
-ORYX.CONFIG.KEY_ACTION_UP = 			"up";
+ORYX.CONFIG.KEY_ACTION_DOWN = "down";
+ORYX.CONFIG.KEY_ACTION_UP = "up";
 
 
 /* Form Rowlayouting */
-ORYX.CONFIG.FORM_ROW_WIDTH =            350;
-ORYX.CONFIG.FORM_GROUP_MARGIN =            5;
-ORYX.CONFIG.FORM_GROUP_EMPTY_HEIGHT =   100;
+ORYX.CONFIG.FORM_ROW_WIDTH = 350;
+ORYX.CONFIG.FORM_GROUP_MARGIN = 5;
+ORYX.CONFIG.FORM_GROUP_EMPTY_HEIGHT = 100;
 
 /* Form element types */
-ORYX.CONFIG.FORM_ELEMENT_ID_PREFIX = 				'http://b3mn.org/stencilset/xforms';
-ORYX.CONFIG.FORM_ELEMENT_TYPE_ROOT = 				'http://b3mn.org/stencilset/xforms#XForm';
-ORYX.CONFIG.FORM_ELEMENT_TYPE_GROUP = 				'http://b3mn.org/stencilset/xforms#Group';
-ORYX.CONFIG.FORM_ELEMENT_TYPE_REPEATING_GROUP =		'http://b3mn.org/stencilset/xforms#RepeatingGroup';
-ORYX.CONFIG.FORM_ELEMENT_TYPE_LABEL_FIELD = 		'http://b3mn.org/stencilset/xforms#LabelField';
+ORYX.CONFIG.FORM_ELEMENT_ID_PREFIX = 'http://b3mn.org/stencilset/xforms';
+ORYX.CONFIG.FORM_ELEMENT_TYPE_ROOT = 'http://b3mn.org/stencilset/xforms#XForm';
+ORYX.CONFIG.FORM_ELEMENT_TYPE_GROUP = 'http://b3mn.org/stencilset/xforms#Group';
+ORYX.CONFIG.FORM_ELEMENT_TYPE_REPEATING_GROUP = 'http://b3mn.org/stencilset/xforms#RepeatingGroup';
+ORYX.CONFIG.FORM_ELEMENT_TYPE_LABEL_FIELD = 'http://b3mn.org/stencilset/xforms#LabelField';
 
-	/*
+/*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
  * License rights for this program may be obtained from Alfresco Software, Ltd.
  * pursuant to a written agreement and any use of this program without such an
  * agreement is prohibited.
  */
+
 /*
  * All code Copyright 2013 KIS Consultancy all rights reserved
  */
@@ -2080,8 +2140,8 @@ ORYX.CONFIG.FORM_ELEMENT_TYPE_LABEL_FIELD = 		'http://b3mn.org/stencilset/xforms
 function printf() {
 
 	var result = arguments[0];
-	for (var i=1; i<arguments.length; i++)
-		result = result.replace('%' + (i-1), arguments[i]);
+	for (var i = 1; i < arguments.length; i++)
+		result = result.replace('%' + (i - 1), arguments[i]);
 	return result;
 }
 
@@ -2096,7 +2156,7 @@ var ORYX_LOGLEVEL = 3;
 var ORYX_CONFIGURATION_DELAY = 100;
 var ORYX_CONFIGURATION_WAIT_ATTEMPTS = 10;
 
-if(!ORYX) var ORYX = {};
+if (!ORYX) var ORYX = {};
 
 ORYX = Object.extend(ORYX, {
 
@@ -2121,39 +2181,51 @@ ORYX = Object.extend(ORYX, {
 
 		__appenders: [
 			{
-				append: function(message) {
-					if(typeof(console) !== "undefined" && console.log !== undefined) {
+				append: function (message) {
+					if (typeof (console) !== "undefined" && console.log !== undefined) {
 						// console.log(message);
 					}
 				}
 			}
 		],
 
-		trace: function() {	if(ORYX_LOGLEVEL >= ORYX_LOGLEVEL_TRACE)
-			ORYX.Log.__log('TRACE', arguments); },
-		debug: function() { if(ORYX_LOGLEVEL >= ORYX_LOGLEVEL_DEBUG)
-			ORYX.Log.__log('DEBUG', arguments); },
-		info: function() { if(ORYX_LOGLEVEL >= ORYX_LOGLEVEL_INFO)
-			ORYX.Log.__log('INFO', arguments); },
-		warn: function() { if(ORYX_LOGLEVEL >= ORYX_LOGLEVEL_WARN)
-			ORYX.Log.__log('WARN', arguments); },
-		error: function() { if(ORYX_LOGLEVEL >= ORYX_LOGLEVEL_ERROR)
-			ORYX.Log.__log('ERROR', arguments); },
-		fatal: function() { if(ORYX_LOGLEVEL >= ORYX_LOGLEVEL_FATAL)
-			ORYX.Log.__log('FATAL', arguments); },
-
-		__log: function(prefix, messageParts) {
+		trace: function () {
+			if (ORYX_LOGLEVEL >= ORYX_LOGLEVEL_TRACE)
+				ORYX.Log.__log('TRACE', arguments);
+		},
+		debug: function () {
+			if (ORYX_LOGLEVEL >= ORYX_LOGLEVEL_DEBUG)
+				ORYX.Log.__log('DEBUG', arguments);
+		},
+		info: function () {
+			if (ORYX_LOGLEVEL >= ORYX_LOGLEVEL_INFO)
+				ORYX.Log.__log('INFO', arguments);
+		},
+		warn: function () {
+			if (ORYX_LOGLEVEL >= ORYX_LOGLEVEL_WARN)
+				ORYX.Log.__log('WARN', arguments);
+		},
+		error: function () {
+			if (ORYX_LOGLEVEL >= ORYX_LOGLEVEL_ERROR)
+				ORYX.Log.__log('ERROR', arguments);
+		},
+		fatal: function () {
+			if (ORYX_LOGLEVEL >= ORYX_LOGLEVEL_FATAL)
+				ORYX.Log.__log('FATAL', arguments);
+		},
+
+		__log: function (prefix, messageParts) {
 
 			messageParts[0] = (new Date()).getTime() + " "
 				+ prefix + " " + messageParts[0];
 			var message = printf.apply(null, messageParts);
 
-			ORYX.Log.__appenders.each(function(appender) {
+			ORYX.Log.__appenders.each(function (appender) {
 				appender.append(message);
 			});
 		},
 
-		addAppender: function(appender) {
+		addAppender: function (appender) {
 			ORYX.Log.__appenders.push(appender);
 		}
 	},
@@ -2166,14 +2238,14 @@ ORYX = Object.extend(ORYX, {
 	 * bootstrapping layer is being invoked. Failing to ensure that any
 	 * preliminary condition is not met has to fail with an error.
 	 */
-	load: function() {
+	load: function () {
 
 		ORYX.Log.debug("Oryx begins loading procedure.");
 
 		// check for prototype
-		if( (typeof Prototype=='undefined') ||
+		if ((typeof Prototype == 'undefined') ||
 			(typeof Element == 'undefined') ||
-			(typeof Element.Methods=='undefined') ||
+			(typeof Element.Methods == 'undefined') ||
 			parseFloat(Prototype.Version.split(".")[0] + "." +
 				Prototype.Version.split(".")[1]) < 1.5)
 
@@ -2193,8 +2265,8 @@ ORYX = Object.extend(ORYX, {
 	 * all urls that are registered with oryx loading are being requested from
 	 * the server. Once everything is loaded, the third layer is being invoked.
 	 */
-	_load: function() {
-	/*
+	_load: function () {
+		/*
 		// if configuration not there already,
 		if(!(ORYX.CONFIG)) {
 
@@ -2249,10 +2321,10 @@ ORYX = Object.extend(ORYX, {
 	 * requested by the server. Afterwards, all editor instances will be
 	 * initialized.
 	 */
-	loadPlugins: function() {
+	loadPlugins: function () {
 
 		// load plugins if enabled.
-		if(ORYX.CONFIG.PLUGINS_ENABLED)
+		if (ORYX.CONFIG.PLUGINS_ENABLED)
 			ORYX._loadPlugins()
 		else
 			ORYX.Log.warn("Ignoring plugins, loading Core only.");
@@ -2261,7 +2333,7 @@ ORYX = Object.extend(ORYX, {
 		init();
 	},
 
-	_loadPlugins: function() {
+	_loadPlugins: function () {
 
 		// load plugin configuration file.
 		var source = ORYX.CONFIG.PLUGINS_CONFIG;
@@ -2271,7 +2343,7 @@ ORYX = Object.extend(ORYX, {
 		new Ajax.Request(source, {
 			asynchronous: false,
 			method: 'get',
-			onSuccess: function(result) {
+			onSuccess: function (result) {
 
 				/*
 				 * This is the method that is being called when the plugin
@@ -2289,16 +2361,21 @@ ORYX = Object.extend(ORYX, {
 				// Get the globale Properties
 				var globalProperties = [];
 				var preferences = $A(resultXml.getElementsByTagName("properties"));
-				preferences.each( function(p) {
+				preferences.each(function (p) {
 
 					var props = $A(p.childNodes);
-					props.each( function(prop) {
+					props.each(function (prop) {
 						var property = new Hash();
 
 						// get all attributes from the node and set to global properties
 						var attributes = $A(prop.attributes)
-						attributes.each(function(attr){property[attr.nodeName] = attr.nodeValue});
-						if(attributes.length > 0) { globalProperties.push(property) };
+						attributes.each(function (attr) {
+							property[attr.nodeName] = attr.nodeValue
+						});
+						if (attributes.length > 0) {
+							globalProperties.push(property)
+						}
+						;
 					});
 				});
 
@@ -2306,22 +2383,23 @@ ORYX = Object.extend(ORYX, {
 				// TODO Why are we using XML if we don't respect structure anyway?
 				// for each plugin element in the configuration..
 				var plugin = resultXml.getElementsByTagName("plugin");
-				$A(plugin).each( function(node) {
+				$A(plugin).each(function (node) {
 
 					// get all element's attributes.
 					// TODO: What about: var pluginData = $H(node.attributes) !?
 					var pluginData = new Hash();
-					$A(node.attributes).each( function(attr){
-						pluginData[attr.nodeName] = attr.nodeValue});
+					$A(node.attributes).each(function (attr) {
+						pluginData[attr.nodeName] = attr.nodeValue
+					});
 
 					// ensure there's a name attribute.
-					if(!pluginData['name']) {
+					if (!pluginData['name']) {
 						ORYX.Log.error("A plugin is not providing a name. Ingnoring this plugin.");
 						return;
 					}
 
 					// ensure there's a source attribute.
-					if(!pluginData['source']) {
+					if (!pluginData['source']) {
 						ORYX.Log.error("Plugin with name '%0' doesn't provide a source attribute.", pluginData['name']);
 						return;
 					}
@@ -2329,13 +2407,18 @@ ORYX = Object.extend(ORYX, {
 					// Get all private Properties
 					var propertyNodes = node.getElementsByTagName("property");
 					var properties = [];
-					$A(propertyNodes).each(function(prop) {
+					$A(propertyNodes).each(function (prop) {
 						var property = new Hash();
 
 						// Get all Attributes from the Node
 						var attributes = $A(prop.attributes)
-						attributes.each(function(attr){property[attr.nodeName] = attr.nodeValue});
-						if(attributes.length > 0) { properties.push(property) };
+						attributes.each(function (attr) {
+							property[attr.nodeName] = attr.nodeValue
+						});
+						if (attributes.length > 0) {
+							properties.push(property)
+						}
+						;
 
 					});
 
@@ -2348,11 +2431,13 @@ ORYX = Object.extend(ORYX, {
 					// Get the RequieredNodes
 					var requireNodes = node.getElementsByTagName("requires");
 					var requires;
-					$A(requireNodes).each(function(req) {
-						var namespace = $A(req.attributes).find(function(attr){ return attr.name == "namespace"})
-						if( namespace && namespace.nodeValue ){
-							if( !requires ){
-								requires = {namespaces:[]}
+					$A(requireNodes).each(function (req) {
+						var namespace = $A(req.attributes).find(function (attr) {
+							return attr.name == "namespace"
+						})
+						if (namespace && namespace.nodeValue) {
+							if (!requires) {
+								requires = {namespaces: []}
 							}
 
 							requires.namespaces.push(namespace.nodeValue)
@@ -2360,7 +2445,7 @@ ORYX = Object.extend(ORYX, {
 					});
 
 					// Set Requires to the Plugin-Data, if there is one
-					if( requires ){
+					if (requires) {
 						pluginData['requires'] = requires;
 					}
 
@@ -2368,11 +2453,13 @@ ORYX = Object.extend(ORYX, {
 					// Get the RequieredNodes
 					var notUsesInNodes = node.getElementsByTagName("notUsesIn");
 					var notUsesIn;
-					$A(notUsesInNodes).each(function(not) {
-						var namespace = $A(not.attributes).find(function(attr){ return attr.name == "namespace"})
-						if( namespace && namespace.nodeValue ){
-							if( !notUsesIn ){
-								notUsesIn = {namespaces:[]}
+					$A(notUsesInNodes).each(function (not) {
+						var namespace = $A(not.attributes).find(function (attr) {
+							return attr.name == "namespace"
+						})
+						if (namespace && namespace.nodeValue) {
+							if (!notUsesIn) {
+								notUsesIn = {namespaces: []}
 							}
 
 							notUsesIn.namespaces.push(namespace.nodeValue)
@@ -2380,7 +2467,7 @@ ORYX = Object.extend(ORYX, {
 					});
 
 					// Set Requires to the Plugin-Data, if there is one
-					if( notUsesIn ){
+					if (notUsesIn) {
 						pluginData['notUsesIn'] = notUsesIn;
 					}
 
@@ -2400,12 +2487,12 @@ ORYX = Object.extend(ORYX, {
 				});
 
 			},
-			onFailure:this._loadPluginsOnFails
+			onFailure: this._loadPluginsOnFails
 		});
 
 	},
 
-	_loadPluginsOnFails: function(result) {
+	_loadPluginsOnFails: function (result) {
 
 		ORYX.Log.error("Plugin configuration file not available.");
 	}
@@ -2425,9 +2512,15 @@ ORYX = Object.extend(ORYX, {
 /**
  * Init namespaces
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
-if(!ORYX.Core.SVG) {ORYX.Core.SVG = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
+if (!ORYX.Core.SVG) {
+	ORYX.Core.SVG = {};
+}
 
 
 /**
@@ -2441,7 +2534,7 @@ if(!ORYX.Core.SVG) {ORYX.Core.SVG = {};}
  */
 ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 
-	construct: function() {
+	construct: function () {
 		arguments.callee.$.construct.apply(this, arguments);
 
 		this.x = 0;
@@ -2464,7 +2557,7 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 * @param {float} deltaWidth Horizontal scaling factor
 	 * @param {float} deltaHeight Vertical scaling factor
 	 */
-	init: function(x, y, oldX, oldY, deltaWidth, deltaHeight) {
+	init: function (x, y, oldX, oldY, deltaWidth, deltaHeight) {
 		this.x = x;
 		this.y = y;
 		this.oldX = oldX;
@@ -2480,14 +2573,14 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 *
 	 * @param {Array} points Array of absolutePoints
 	 */
-	editPointsAbs: function(points) {
-		if(points instanceof Array) {
+	editPointsAbs: function (points) {
+		if (points instanceof Array) {
 			var newPoints = [];
 			var x, y;
-			for(var i = 0; i < points.length; i++) {
-				x = (parseFloat(points[i]) - this.oldX)*this.deltaWidth + this.x;
+			for (var i = 0; i < points.length; i++) {
+				x = (parseFloat(points[i]) - this.oldX) * this.deltaWidth + this.x;
 				i++;
-				y = (parseFloat(points[i]) - this.oldY)*this.deltaHeight + this.y;
+				y = (parseFloat(points[i]) - this.oldY) * this.deltaHeight + this.y;
 				newPoints.push(x);
 				newPoints.push(y);
 			}
@@ -2503,14 +2596,14 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 *
 	 * @param {Array} points Array of absolutePoints
 	 */
-	editPointsRel: function(points) {
-		if(points instanceof Array) {
+	editPointsRel: function (points) {
+		if (points instanceof Array) {
 			var newPoints = [];
 			var x, y;
-			for(var i = 0; i < points.length; i++) {
-				x = parseFloat(points[i])*this.deltaWidth;
+			for (var i = 0; i < points.length; i++) {
+				x = parseFloat(points[i]) * this.deltaWidth;
 				i++;
-				y = parseFloat(points[i])*this.deltaHeight;
+				y = parseFloat(points[i]) * this.deltaHeight;
 				newPoints.push(x);
 				newPoints.push(y);
 			}
@@ -2532,14 +2625,14 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	arcAbs: function(rx, ry, xAxisRotation, largeArcFlag, sweepFlag, x, y) {
-	    var pointsAbs = this.editPointsAbs([x, y]);
+	arcAbs: function (rx, ry, xAxisRotation, largeArcFlag, sweepFlag, x, y) {
+		var pointsAbs = this.editPointsAbs([x, y]);
 		var pointsRel = this.editPointsRel([rx, ry]);
 
 		this.d = this.d.concat(" A" + pointsRel[0] + " " + pointsRel[1] +
-								" " + xAxisRotation + " " + largeArcFlag +
-								" " + sweepFlag + " " + pointsAbs[0] + " " +
-								pointsAbs[1] + " ");
+			" " + xAxisRotation + " " + largeArcFlag +
+			" " + sweepFlag + " " + pointsAbs[0] + " " +
+			pointsAbs[1] + " ");
 	},
 
 	/**
@@ -2553,13 +2646,13 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	arcRel: function(rx, ry, xAxisRotation, largeArcFlag, sweepFlag, x, y) {
+	arcRel: function (rx, ry, xAxisRotation, largeArcFlag, sweepFlag, x, y) {
 		var pointsRel = this.editPointsRel([rx, ry, x, y]);
 
 		this.d = this.d.concat(" a" + pointsRel[0] + " " + pointsRel[1] +
-								" " + xAxisRotation + " " + largeArcFlag +
-								" " + sweepFlag + " " + pointsRel[2] + " " +
-								pointsRel[3] + " ");
+			" " + xAxisRotation + " " + largeArcFlag +
+			" " + sweepFlag + " " + pointsRel[2] + " " +
+			pointsRel[3] + " ");
 	},
 
 	/**
@@ -2572,12 +2665,12 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoCubicAbs: function(x1, y1, x2, y2, x, y) {
-	    var pointsAbs = this.editPointsAbs([x1, y1, x2, y2, x, y]);
+	curvetoCubicAbs: function (x1, y1, x2, y2, x, y) {
+		var pointsAbs = this.editPointsAbs([x1, y1, x2, y2, x, y]);
 
 		this.d = this.d.concat(" C" + pointsAbs[0] + " " + pointsAbs[1] +
-								" " + pointsAbs[2] + " " + pointsAbs[3] +
-								" " + pointsAbs[4] + " " + pointsAbs[5] + " ");
+			" " + pointsAbs[2] + " " + pointsAbs[3] +
+			" " + pointsAbs[4] + " " + pointsAbs[5] + " ");
 	},
 
 	/**
@@ -2590,12 +2683,12 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoCubicRel: function(x1, y1, x2, y2, x, y) {
-	    var pointsRel = this.editPointsRel([x1, y1, x2, y2, x, y]);
+	curvetoCubicRel: function (x1, y1, x2, y2, x, y) {
+		var pointsRel = this.editPointsRel([x1, y1, x2, y2, x, y]);
 
 		this.d = this.d.concat(" c" + pointsRel[0] + " " + pointsRel[1] +
-								" " + pointsRel[2] + " " + pointsRel[3] +
-								" " + pointsRel[4] + " " + pointsRel[5] + " ");
+			" " + pointsRel[2] + " " + pointsRel[3] +
+			" " + pointsRel[4] + " " + pointsRel[5] + " ");
 	},
 
 	/**
@@ -2603,8 +2696,8 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 *
 	 * @param {Number} x
 	 */
-	linetoHorizontalAbs: function(x) {
-	    var pointsAbs = this.editPointsAbs([x, 0]);
+	linetoHorizontalAbs: function (x) {
+		var pointsAbs = this.editPointsAbs([x, 0]);
 
 		this.d = this.d.concat(" H" + pointsAbs[0] + " ");
 	},
@@ -2614,8 +2707,8 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 *
 	 * @param {Number} x
 	 */
-	linetoHorizontalRel: function(x) {
-	    var pointsRel = this.editPointsRel([x, 0]);
+	linetoHorizontalRel: function (x) {
+		var pointsRel = this.editPointsRel([x, 0]);
 
 		this.d = this.d.concat(" h" + pointsRel[0] + " ");
 	},
@@ -2626,8 +2719,8 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	linetoAbs: function(x, y) {
-	    var pointsAbs = this.editPointsAbs([x, y]);
+	linetoAbs: function (x, y) {
+		var pointsAbs = this.editPointsAbs([x, y]);
 
 		this.d = this.d.concat(" L" + pointsAbs[0] + " " + pointsAbs[1] + " ");
 	},
@@ -2638,8 +2731,8 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	linetoRel: function(x, y) {
-	    var pointsRel = this.editPointsRel([x, y]);
+	linetoRel: function (x, y) {
+		var pointsRel = this.editPointsRel([x, y]);
 
 		this.d = this.d.concat(" l" + pointsRel[0] + " " + pointsRel[1] + " ");
 	},
@@ -2650,8 +2743,8 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	movetoAbs: function(x, y) {
-	    var pointsAbs = this.editPointsAbs([x, y]);
+	movetoAbs: function (x, y) {
+		var pointsAbs = this.editPointsAbs([x, y]);
 
 		this.d = this.d.concat(" M" + pointsAbs[0] + " " + pointsAbs[1] + " ");
 	},
@@ -2662,9 +2755,9 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	movetoRel: function(x, y) {
-	    var pointsRel;
-		if(this.d === "") {
+	movetoRel: function (x, y) {
+		var pointsRel;
+		if (this.d === "") {
 			pointsRel = this.editPointsAbs([x, y]);
 		} else {
 			pointsRel = this.editPointsRel([x, y]);
@@ -2681,11 +2774,11 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoQuadraticAbs: function(x1, y1, x, y) {
-	    var pointsAbs = this.editPointsAbs([x1, y1, x, y]);
+	curvetoQuadraticAbs: function (x1, y1, x, y) {
+		var pointsAbs = this.editPointsAbs([x1, y1, x, y]);
 
 		this.d = this.d.concat(" Q" + pointsAbs[0] + " " + pointsAbs[1] + " " +
-								pointsAbs[2] + " " + pointsAbs[3] + " ");
+			pointsAbs[2] + " " + pointsAbs[3] + " ");
 	},
 
 	/**
@@ -2696,11 +2789,11 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoQuadraticRel: function(x1, y1, x, y) {
-	    var pointsRel = this.editPointsRel([x1, y1, x, y]);
+	curvetoQuadraticRel: function (x1, y1, x, y) {
+		var pointsRel = this.editPointsRel([x1, y1, x, y]);
 
 		this.d = this.d.concat(" q" + pointsRel[0] + " " + pointsRel[1] + " " +
-								pointsRel[2] + " " + pointsRel[3] + " ");
+			pointsRel[2] + " " + pointsRel[3] + " ");
 	},
 
 	/**
@@ -2711,11 +2804,11 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoCubicSmoothAbs: function(x2, y2, x, y) {
-	    var pointsAbs = this.editPointsAbs([x2, y2, x, y]);
+	curvetoCubicSmoothAbs: function (x2, y2, x, y) {
+		var pointsAbs = this.editPointsAbs([x2, y2, x, y]);
 
 		this.d = this.d.concat(" S" + pointsAbs[0] + " " + pointsAbs[1] + " " +
-								pointsAbs[2] + " " + pointsAbs[3] + " ");
+			pointsAbs[2] + " " + pointsAbs[3] + " ");
 	},
 
 	/**
@@ -2726,11 +2819,11 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoCubicSmoothRel: function(x2, y2, x, y) {
-	    var pointsRel = this.editPointsRel([x2, y2, x, y]);
+	curvetoCubicSmoothRel: function (x2, y2, x, y) {
+		var pointsRel = this.editPointsRel([x2, y2, x, y]);
 
 		this.d = this.d.concat(" s" + pointsRel[0] + " " + pointsRel[1] + " " +
-								pointsRel[2] + " " + pointsRel[3] + " ");
+			pointsRel[2] + " " + pointsRel[3] + " ");
 	},
 
 	/**
@@ -2739,8 +2832,8 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoQuadraticSmoothAbs: function(x, y) {
-	    var pointsAbs = this.editPointsAbs([x, y]);
+	curvetoQuadraticSmoothAbs: function (x, y) {
+		var pointsAbs = this.editPointsAbs([x, y]);
 
 		this.d = this.d.concat(" T" + pointsAbs[0] + " " + pointsAbs[1] + " ");
 	},
@@ -2751,8 +2844,8 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoQuadraticSmoothRel: function(x, y) {
-	    var pointsRel = this.editPointsRel([x, y]);
+	curvetoQuadraticSmoothRel: function (x, y) {
+		var pointsRel = this.editPointsRel([x, y]);
 
 		this.d = this.d.concat(" t" + pointsRel[0] + " " + pointsRel[1] + " ");
 	},
@@ -2762,8 +2855,8 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 *
 	 * @param {Number} y
 	 */
-	linetoVerticalAbs: function(y) {
-	    var pointsAbs = this.editPointsAbs([0, y]);
+	linetoVerticalAbs: function (y) {
+		var pointsAbs = this.editPointsAbs([0, y]);
 
 		this.d = this.d.concat(" V" + pointsAbs[1] + " ");
 	},
@@ -2773,8 +2866,8 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	 *
 	 * @param {Number} y
 	 */
-	linetoVerticalRel: function(y) {
-	    var pointsRel = this.editPointsRel([0, y]);
+	linetoVerticalRel: function (y) {
+		var pointsRel = this.editPointsRel([0, y]);
 
 		this.d = this.d.concat(" v" + pointsRel[1] + " ");
 	},
@@ -2782,8 +2875,8 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 	/**
 	 * closePath - z or Z
 	 */
-	closePath: function() {
-	    this.d = this.d.concat(" z");
+	closePath: function () {
+		this.d = this.d.concat(" z");
 	}
 
 });/*
@@ -2799,9 +2892,15 @@ ORYX.Core.SVG.EditPathHandler = Clazz.extend({
 /**
  * Init namespaces
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
-if(!ORYX.Core.SVG) {ORYX.Core.SVG = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
+if (!ORYX.Core.SVG) {
+	ORYX.Core.SVG = {};
+}
 
 
 /**
@@ -2815,7 +2914,7 @@ if(!ORYX.Core.SVG) {ORYX.Core.SVG = {};}
  */
 ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 
-	construct: function() {
+	construct: function () {
 		arguments.callee.$.construct.apply(this, arguments);
 
 		this.minX = undefined;
@@ -2832,10 +2931,10 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 *
 	 * @param {Array} points Array of absolutePoints
 	 */
-	calculateMinMax: function(points) {
-		if(points instanceof Array) {
+	calculateMinMax: function (points) {
+		if (points instanceof Array) {
 			var x, y;
-			for(var i = 0; i < points.length; i++) {
+			for (var i = 0; i < points.length; i++) {
 				x = parseFloat(points[i]);
 				i++;
 				y = parseFloat(points[i]);
@@ -2864,8 +2963,8 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	arcAbs: function(rx, ry, xAxisRotation, largeArcFlag, sweepFlag, x, y) {
-	    this.calculateMinMax([x, y]);
+	arcAbs: function (rx, ry, xAxisRotation, largeArcFlag, sweepFlag, x, y) {
+		this.calculateMinMax([x, y]);
 	},
 
 	/**
@@ -2879,8 +2978,8 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	arcRel: function(rx, ry, xAxisRotation, largeArcFlag, sweepFlag, x, y) {
-	    this.calculateMinMax([this._lastAbsX + x, this._lastAbsY + y]);
+	arcRel: function (rx, ry, xAxisRotation, largeArcFlag, sweepFlag, x, y) {
+		this.calculateMinMax([this._lastAbsX + x, this._lastAbsY + y]);
 	},
 
 	/**
@@ -2893,8 +2992,8 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoCubicAbs: function(x1, y1, x2, y2, x, y) {
-	    this.calculateMinMax([x1, y1, x2, y2, x, y]);
+	curvetoCubicAbs: function (x1, y1, x2, y2, x, y) {
+		this.calculateMinMax([x1, y1, x2, y2, x, y]);
 	},
 
 	/**
@@ -2907,10 +3006,10 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoCubicRel: function(x1, y1, x2, y2, x, y) {
-	    this.calculateMinMax([this._lastAbsX + x1, this._lastAbsY + y1,
-							  this._lastAbsX + x2, this._lastAbsY + y2,
-							  this._lastAbsX + x, this._lastAbsY + y]);
+	curvetoCubicRel: function (x1, y1, x2, y2, x, y) {
+		this.calculateMinMax([this._lastAbsX + x1, this._lastAbsY + y1,
+			this._lastAbsX + x2, this._lastAbsY + y2,
+			this._lastAbsX + x, this._lastAbsY + y]);
 	},
 
 	/**
@@ -2918,8 +3017,8 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 *
 	 * @param {Number} x
 	 */
-	linetoHorizontalAbs: function(x) {
-	    this.calculateMinMax([x, this._lastAbsY]);
+	linetoHorizontalAbs: function (x) {
+		this.calculateMinMax([x, this._lastAbsY]);
 	},
 
 	/**
@@ -2927,8 +3026,8 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 *
 	 * @param {Number} x
 	 */
-	linetoHorizontalRel: function(x) {
-	    this.calculateMinMax([this._lastAbsX + x, this._lastAbsY]);
+	linetoHorizontalRel: function (x) {
+		this.calculateMinMax([this._lastAbsX + x, this._lastAbsY]);
 	},
 
 	/**
@@ -2937,8 +3036,8 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	linetoAbs: function(x, y) {
-	    this.calculateMinMax([x, y]);
+	linetoAbs: function (x, y) {
+		this.calculateMinMax([x, y]);
 	},
 
 	/**
@@ -2947,8 +3046,8 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	linetoRel: function(x, y) {
-	    this.calculateMinMax([this._lastAbsX + x, this._lastAbsY + y]);
+	linetoRel: function (x, y) {
+		this.calculateMinMax([this._lastAbsX + x, this._lastAbsY + y]);
 	},
 
 	/**
@@ -2957,8 +3056,8 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	movetoAbs: function(x, y) {
-	    this.calculateMinMax([x, y]);
+	movetoAbs: function (x, y) {
+		this.calculateMinMax([x, y]);
 	},
 
 	/**
@@ -2967,8 +3066,8 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	movetoRel: function(x, y) {
-	    if(this._lastAbsX && this._lastAbsY) {
+	movetoRel: function (x, y) {
+		if (this._lastAbsX && this._lastAbsY) {
 			this.calculateMinMax([this._lastAbsX + x, this._lastAbsY + y]);
 		} else {
 			this.calculateMinMax([x, y]);
@@ -2983,8 +3082,8 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoQuadraticAbs: function(x1, y1, x, y) {
-	    this.calculateMinMax([x1, y1, x, y]);
+	curvetoQuadraticAbs: function (x1, y1, x, y) {
+		this.calculateMinMax([x1, y1, x, y]);
 	},
 
 	/**
@@ -2995,8 +3094,8 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoQuadraticRel: function(x1, y1, x, y) {
-	    this.calculateMinMax([this._lastAbsX + x1, this._lastAbsY + y1, this._lastAbsX + x, this._lastAbsY + y]);
+	curvetoQuadraticRel: function (x1, y1, x, y) {
+		this.calculateMinMax([this._lastAbsX + x1, this._lastAbsY + y1, this._lastAbsX + x, this._lastAbsY + y]);
 	},
 
 	/**
@@ -3007,8 +3106,8 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoCubicSmoothAbs: function(x2, y2, x, y) {
-	    this.calculateMinMax([x2, y2, x, y]);
+	curvetoCubicSmoothAbs: function (x2, y2, x, y) {
+		this.calculateMinMax([x2, y2, x, y]);
 	},
 
 	/**
@@ -3019,8 +3118,8 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoCubicSmoothRel: function(x2, y2, x, y) {
-	    this.calculateMinMax([this._lastAbsX + x2, this._lastAbsY + y2, this._lastAbsX + x, this._lastAbsY + y]);
+	curvetoCubicSmoothRel: function (x2, y2, x, y) {
+		this.calculateMinMax([this._lastAbsX + x2, this._lastAbsY + y2, this._lastAbsX + x, this._lastAbsY + y]);
 	},
 
 	/**
@@ -3029,8 +3128,8 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoQuadraticSmoothAbs: function(x, y) {
-	    this.calculateMinMax([x, y]);
+	curvetoQuadraticSmoothAbs: function (x, y) {
+		this.calculateMinMax([x, y]);
 	},
 
 	/**
@@ -3039,8 +3138,8 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoQuadraticSmoothRel: function(x, y) {
-	    this.calculateMinMax([this._lastAbsX + x, this._lastAbsY + y]);
+	curvetoQuadraticSmoothRel: function (x, y) {
+		this.calculateMinMax([this._lastAbsX + x, this._lastAbsY + y]);
 	},
 
 	/**
@@ -3048,8 +3147,8 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 *
 	 * @param {Number} y
 	 */
-	linetoVerticalAbs: function(y) {
-	    this.calculateMinMax([this._lastAbsX, y]);
+	linetoVerticalAbs: function (y) {
+		this.calculateMinMax([this._lastAbsX, y]);
 	},
 
 	/**
@@ -3057,15 +3156,15 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 	 *
 	 * @param {Number} y
 	 */
-	linetoVerticalRel: function(y) {
-	    this.calculateMinMax([this._lastAbsX, this._lastAbsY + y]);
+	linetoVerticalRel: function (y) {
+		this.calculateMinMax([this._lastAbsX, this._lastAbsY + y]);
 	},
 
 	/**
 	 * closePath - z or Z
 	 */
-	closePath: function() {
-	    return;// do nothing
+	closePath: function () {
+		return;// do nothing
 	}
 
 });/*
@@ -3081,9 +3180,15 @@ ORYX.Core.SVG.MinMaxPathHandler = Clazz.extend({
 /**
  * Init namespaces
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
-if(!ORYX.Core.SVG) {ORYX.Core.SVG = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
+if (!ORYX.Core.SVG) {
+	ORYX.Core.SVG = {};
+}
 
 
 /**
@@ -3097,7 +3202,7 @@ if(!ORYX.Core.SVG) {ORYX.Core.SVG = {};}
  */
 ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 
-	construct: function() {
+	construct: function () {
 		arguments.callee.$.construct.apply(this, arguments);
 
 		this.points = [];
@@ -3111,10 +3216,10 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 *
 	 * @param {Array} points Array of absolutePoints
 	 */
-	addPoints: function(points) {
-		if(points instanceof Array) {
+	addPoints: function (points) {
+		if (points instanceof Array) {
 			var x, y;
-			for(var i = 0; i < points.length; i++) {
+			for (var i = 0; i < points.length; i++) {
 				x = parseFloat(points[i]);
 				i++;
 				y = parseFloat(points[i]);
@@ -3142,8 +3247,8 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	arcAbs: function(rx, ry, xAxisRotation, largeArcFlag, sweepFlag, x, y) {
-	    this.addPoints([x, y]);
+	arcAbs: function (rx, ry, xAxisRotation, largeArcFlag, sweepFlag, x, y) {
+		this.addPoints([x, y]);
 	},
 
 	/**
@@ -3157,8 +3262,8 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	arcRel: function(rx, ry, xAxisRotation, largeArcFlag, sweepFlag, x, y) {
-	    this.addPoints([this._lastAbsX + x, this._lastAbsY + y]);
+	arcRel: function (rx, ry, xAxisRotation, largeArcFlag, sweepFlag, x, y) {
+		this.addPoints([this._lastAbsX + x, this._lastAbsY + y]);
 	},
 
 	/**
@@ -3171,8 +3276,8 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoCubicAbs: function(x1, y1, x2, y2, x, y) {
-	    this.addPoints([x, y]);
+	curvetoCubicAbs: function (x1, y1, x2, y2, x, y) {
+		this.addPoints([x, y]);
 	},
 
 	/**
@@ -3185,8 +3290,8 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoCubicRel: function(x1, y1, x2, y2, x, y) {
-	    this.addPoints([this._lastAbsX + x, this._lastAbsY + y]);
+	curvetoCubicRel: function (x1, y1, x2, y2, x, y) {
+		this.addPoints([this._lastAbsX + x, this._lastAbsY + y]);
 	},
 
 	/**
@@ -3194,8 +3299,8 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 *
 	 * @param {Number} x
 	 */
-	linetoHorizontalAbs: function(x) {
-	    this.addPoints([x, this._lastAbsY]);
+	linetoHorizontalAbs: function (x) {
+		this.addPoints([x, this._lastAbsY]);
 	},
 
 	/**
@@ -3203,8 +3308,8 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 *
 	 * @param {Number} x
 	 */
-	linetoHorizontalRel: function(x) {
-	    this.addPoints([this._lastAbsX + x, this._lastAbsY]);
+	linetoHorizontalRel: function (x) {
+		this.addPoints([this._lastAbsX + x, this._lastAbsY]);
 	},
 
 	/**
@@ -3213,8 +3318,8 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	linetoAbs: function(x, y) {
-	    this.addPoints([x, y]);
+	linetoAbs: function (x, y) {
+		this.addPoints([x, y]);
 	},
 
 	/**
@@ -3223,8 +3328,8 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	linetoRel: function(x, y) {
-	    this.addPoints([this._lastAbsX + x, this._lastAbsY + y]);
+	linetoRel: function (x, y) {
+		this.addPoints([this._lastAbsX + x, this._lastAbsY + y]);
 	},
 
 	/**
@@ -3233,8 +3338,8 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	movetoAbs: function(x, y) {
-	    this.addPoints([x, y]);
+	movetoAbs: function (x, y) {
+		this.addPoints([x, y]);
 	},
 
 	/**
@@ -3243,8 +3348,8 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	movetoRel: function(x, y) {
-	    if(this._lastAbsX && this._lastAbsY) {
+	movetoRel: function (x, y) {
+		if (this._lastAbsX && this._lastAbsY) {
 			this.addPoints([this._lastAbsX + x, this._lastAbsY + y]);
 		} else {
 			this.addPoints([x, y]);
@@ -3259,8 +3364,8 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoQuadraticAbs: function(x1, y1, x, y) {
-	    this.addPoints([x, y]);
+	curvetoQuadraticAbs: function (x1, y1, x, y) {
+		this.addPoints([x, y]);
 	},
 
 	/**
@@ -3271,8 +3376,8 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoQuadraticRel: function(x1, y1, x, y) {
-	    this.addPoints([this._lastAbsX + x, this._lastAbsY + y]);
+	curvetoQuadraticRel: function (x1, y1, x, y) {
+		this.addPoints([this._lastAbsX + x, this._lastAbsY + y]);
 	},
 
 	/**
@@ -3283,8 +3388,8 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoCubicSmoothAbs: function(x2, y2, x, y) {
-	    this.addPoints([x, y]);
+	curvetoCubicSmoothAbs: function (x2, y2, x, y) {
+		this.addPoints([x, y]);
 	},
 
 	/**
@@ -3295,8 +3400,8 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoCubicSmoothRel: function(x2, y2, x, y) {
-	    this.addPoints([this._lastAbsX + x, this._lastAbsY + y]);
+	curvetoCubicSmoothRel: function (x2, y2, x, y) {
+		this.addPoints([this._lastAbsX + x, this._lastAbsY + y]);
 	},
 
 	/**
@@ -3305,8 +3410,8 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoQuadraticSmoothAbs: function(x, y) {
-	    this.addPoints([x, y]);
+	curvetoQuadraticSmoothAbs: function (x, y) {
+		this.addPoints([x, y]);
 	},
 
 	/**
@@ -3315,8 +3420,8 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	curvetoQuadraticSmoothRel: function(x, y) {
-	    this.addPoints([this._lastAbsX + x, this._lastAbsY + y]);
+	curvetoQuadraticSmoothRel: function (x, y) {
+		this.addPoints([this._lastAbsX + x, this._lastAbsY + y]);
 	},
 
 	/**
@@ -3324,8 +3429,8 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 *
 	 * @param {Number} y
 	 */
-	linetoVerticalAbs: function(y) {
-	    this.addPoints([this._lastAbsX, y]);
+	linetoVerticalAbs: function (y) {
+		this.addPoints([this._lastAbsX, y]);
 	},
 
 	/**
@@ -3333,15 +3438,15 @@ ORYX.Core.SVG.PointsPathHandler = Clazz.extend({
 	 *
 	 * @param {Number} y
 	 */
-	linetoVerticalRel: function(y) {
-	    this.addPoints([this._lastAbsX, this._lastAbsY + y]);
+	linetoVerticalRel: function (y) {
+		this.addPoints([this._lastAbsX, this._lastAbsY + y]);
 	},
 
 	/**
 	 * closePath - z or Z
 	 */
-	closePath: function() {
-	    return;// do nothing
+	closePath: function () {
+		return;// do nothing
 	}
 
 });/*
@@ -3372,9 +3477,15 @@ NAMESPACE_SVG = "http://www.w3.org/2000/svg/";
 /**
  * Init package
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
-if(!ORYX.Core.SVG) {ORYX.Core.SVG = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
+if (!ORYX.Core.SVG) {
+	ORYX.Core.SVG = {};
+}
 
 ORYX.Core.SVG.SVGMarker = Clazz.extend({
 
@@ -3382,7 +3493,7 @@ ORYX.Core.SVG.SVGMarker = Clazz.extend({
 	 * Constructor
 	 * @param markerElement {SVGMarkerElement}
 	 */
-	construct: function(markerElement) {
+	construct: function (markerElement) {
 		arguments.callee.$.construct.apply(this, arguments);
 
 		this.id = undefined;
@@ -3408,9 +3519,9 @@ ORYX.Core.SVG.SVGMarker = Clazz.extend({
 	/**
 	 * Initializes the values that are defined in the constructor.
 	 */
-	_init: function() {
+	_init: function () {
 		//check if this.element is a SVGMarkerElement
-		if(!( this.element == "[object SVGMarkerElement]")) {
+		if (!(this.element == "[object SVGMarkerElement]")) {
 			throw "SVGMarker: Argument is not an instance of SVGMarkerElement.";
 		}
 
@@ -3418,25 +3529,25 @@ ORYX.Core.SVG.SVGMarker = Clazz.extend({
 
 		//init svg marker attributes
 		var refXValue = this.element.getAttributeNS(null, "refX");
-		if(refXValue) {
+		if (refXValue) {
 			this.refX = parseFloat(refXValue);
 		} else {
 			this.refX = 0;
 		}
 		var refYValue = this.element.getAttributeNS(null, "refY");
-		if(refYValue) {
+		if (refYValue) {
 			this.refY = parseFloat(refYValue);
 		} else {
 			this.refY = 0;
 		}
 		var markerWidthValue = this.element.getAttributeNS(null, "markerWidth");
-		if(markerWidthValue) {
+		if (markerWidthValue) {
 			this.markerWidth = parseFloat(markerWidthValue);
 		} else {
 			this.markerWidth = 3;
 		}
 		var markerHeightValue = this.element.getAttributeNS(null, "markerHeight");
-		if(markerHeightValue) {
+		if (markerHeightValue) {
 			this.markerHeight = parseFloat(markerHeightValue);
 		} else {
 			this.markerHeight = 3;
@@ -3449,7 +3560,7 @@ ORYX.Core.SVG.SVGMarker = Clazz.extend({
 
 		//init oryx attributes
 		var optionalAttr = this.element.getAttributeNS(NAMESPACE_ORYX, "optional");
-		if(optionalAttr) {
+		if (optionalAttr) {
 			optionalAttr = optionalAttr.strip();
 			this.optional = (optionalAttr.toLowerCase() === "yes");
 		} else {
@@ -3457,7 +3568,7 @@ ORYX.Core.SVG.SVGMarker = Clazz.extend({
 		}
 
 		var enabledAttr = this.element.getAttributeNS(NAMESPACE_ORYX, "enabled");
-		if(enabledAttr) {
+		if (enabledAttr) {
 			enabledAttr = enabledAttr.strip();
 			this.enabled = !(enabledAttr.toLowerCase() === "no");
 		} else {
@@ -3465,12 +3576,12 @@ ORYX.Core.SVG.SVGMarker = Clazz.extend({
 		}
 
 		var minLengthAttr = this.element.getAttributeNS(NAMESPACE_ORYX, "minimumLength");
-		if(minLengthAttr) {
+		if (minLengthAttr) {
 			this.minimumLength = parseFloat(minLengthAttr);
 		}
 
 		var resizeAttr = this.element.getAttributeNS(NAMESPACE_ORYX, "resize");
-		if(resizeAttr) {
+		if (resizeAttr) {
 			resizeAttr = resizeAttr.strip();
 			this.resize = (resizeAttr.toLowerCase() === "yes");
 		} else {
@@ -3484,11 +3595,11 @@ ORYX.Core.SVG.SVGMarker = Clazz.extend({
 	/**
 	 *
 	 */
-	_getSVGShapes: function(svgElement) {
-		if(svgElement.hasChildNodes) {
+	_getSVGShapes: function (svgElement) {
+		if (svgElement.hasChildNodes) {
 			var svgShapes = [];
 			var me = this;
-			$A(svgElement.childNodes).each(function(svgChild) {
+			$A(svgElement.childNodes).each(function (svgChild) {
 				try {
 					var svgShape = new ORYX.Core.SVG.SVGShape(svgChild);
 					svgShapes.push(svgShape);
@@ -3503,7 +3614,7 @@ ORYX.Core.SVG.SVGMarker = Clazz.extend({
 	/**
 	 * Writes the changed values into the SVG marker.
 	 */
-	update: function() {
+	update: function () {
 		//TODO mache marker resizebar!!! aber erst wenn der rest der connectingshape funzt!
 
 //		//update marker attributes
@@ -3536,8 +3647,10 @@ ORYX.Core.SVG.SVGMarker = Clazz.extend({
 		this.oldMarkerHeight = this.markerHeight;
 	},
 
-	toString: function() { return (this.element) ? "SVGMarker " + this.element.id : "SVGMarker " + this.element;}
- });/*
+	toString: function () {
+		return (this.element) ? "SVGMarker " + this.element.id : "SVGMarker " + this.element;
+	}
+});/*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
  * License rights for this program may be obtained from Alfresco Software, Ltd.
  * pursuant to a written agreement and any use of this program without such an
@@ -3566,9 +3679,15 @@ NAMESPACE_SVG = "http://www.w3.org/2000/svg/";
  */
 
 //init package
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
-if(!ORYX.Core.SVG) {ORYX.Core.SVG = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
+if (!ORYX.Core.SVG) {
+	ORYX.Core.SVG = {};
+}
 
 ORYX.Core.SVG.SVGShape = Clazz.extend({
 
@@ -3576,7 +3695,7 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 	 * Constructor
 	 * @param svgElem {SVGElement} An SVGElement that is a basic shape or a path.
 	 */
-	construct: function(svgElem) {
+	construct: function (svgElem) {
 		arguments.callee.$.construct.apply(this, arguments);
 
 		this.type;
@@ -3612,38 +3731,38 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 	/**
 	 * Initializes the values that are defined in the constructor.
 	 */
-	init: function() {
+	init: function () {
 
 		/**initialize position and size*/
-		if(ORYX.Editor.checkClassType(this.element, SVGRectElement) || ORYX.Editor.checkClassType(this.element, SVGImageElement)) {
+		if (ORYX.Editor.checkClassType(this.element, SVGRectElement) || ORYX.Editor.checkClassType(this.element, SVGImageElement)) {
 			this.type = "Rect";
 
 			var xAttr = this.element.getAttributeNS(null, "x");
-			if(xAttr) {
+			if (xAttr) {
 				this.oldX = parseFloat(xAttr);
 			} else {
 				throw "Missing attribute in element " + this.element;
 			}
 			var yAttr = this.element.getAttributeNS(null, "y");
-			if(yAttr) {
+			if (yAttr) {
 				this.oldY = parseFloat(yAttr);
 			} else {
 				throw "Missing attribute in element " + this.element;
 			}
 			var widthAttr = this.element.getAttributeNS(null, "width");
-			if(widthAttr) {
+			if (widthAttr) {
 				this.oldWidth = parseFloat(widthAttr);
 			} else {
 				throw "Missing attribute in element " + this.element;
 			}
 			var heightAttr = this.element.getAttributeNS(null, "height");
-			if(heightAttr) {
+			if (heightAttr) {
 				this.oldHeight = parseFloat(heightAttr);
 			} else {
 				throw "Missing attribute in element " + this.element;
 			}
 
-		} else if(ORYX.Editor.checkClassType(this.element, SVGCircleElement)) {
+		} else if (ORYX.Editor.checkClassType(this.element, SVGCircleElement)) {
 			this.type = "Circle";
 
 			var cx = undefined;
@@ -3651,19 +3770,19 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 			//var r = undefined;
 
 			var cxAttr = this.element.getAttributeNS(null, "cx");
-			if(cxAttr) {
+			if (cxAttr) {
 				cx = parseFloat(cxAttr);
 			} else {
 				throw "Missing attribute in element " + this.element;
 			}
 			var cyAttr = this.element.getAttributeNS(null, "cy");
-			if(cyAttr) {
+			if (cyAttr) {
 				cy = parseFloat(cyAttr);
 			} else {
 				throw "Missing attribute in element " + this.element;
 			}
 			var rAttr = this.element.getAttributeNS(null, "r");
-			if(rAttr) {
+			if (rAttr) {
 				//r = parseFloat(rAttr);
 				this.radiusX = parseFloat(rAttr);
 			} else {
@@ -3671,10 +3790,10 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 			}
 			this.oldX = cx - this.radiusX;
 			this.oldY = cy - this.radiusX;
-			this.oldWidth = 2*this.radiusX;
-			this.oldHeight = 2*this.radiusX;
+			this.oldWidth = 2 * this.radiusX;
+			this.oldHeight = 2 * this.radiusX;
 
-		} else if(ORYX.Editor.checkClassType(this.element, SVGEllipseElement)) {
+		} else if (ORYX.Editor.checkClassType(this.element, SVGEllipseElement)) {
 			this.type = "Ellipse";
 
 			var cx = undefined;
@@ -3682,35 +3801,35 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 			//var rx = undefined;
 			//var ry = undefined;
 			var cxAttr = this.element.getAttributeNS(null, "cx");
-			if(cxAttr) {
+			if (cxAttr) {
 				cx = parseFloat(cxAttr);
 			} else {
 				throw "Missing attribute in element " + this.element;
 			}
 			var cyAttr = this.element.getAttributeNS(null, "cy");
-			if(cyAttr) {
+			if (cyAttr) {
 				cy = parseFloat(cyAttr);
 			} else {
 				throw "Missing attribute in element " + this.element;
 			}
 			var rxAttr = this.element.getAttributeNS(null, "rx");
-			if(rxAttr) {
+			if (rxAttr) {
 				this.radiusX = parseFloat(rxAttr);
 			} else {
 				throw "Missing attribute in element " + this.element;
 			}
 			var ryAttr = this.element.getAttributeNS(null, "ry");
-			if(ryAttr) {
+			if (ryAttr) {
 				this.radiusY = parseFloat(ryAttr);
 			} else {
 				throw "Missing attribute in element " + this.element;
 			}
 			this.oldX = cx - this.radiusX;
 			this.oldY = cy - this.radiusY;
-			this.oldWidth = 2*this.radiusX;
-			this.oldHeight = 2*this.radiusY;
+			this.oldWidth = 2 * this.radiusX;
+			this.oldHeight = 2 * this.radiusY;
 
-		} else if(ORYX.Editor.checkClassType(this.element, SVGLineElement)) {
+		} else if (ORYX.Editor.checkClassType(this.element, SVGLineElement)) {
 			this.type = "Line";
 
 			var x1 = undefined;
@@ -3718,47 +3837,47 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 			var x2 = undefined;
 			var y2 = undefined;
 			var x1Attr = this.element.getAttributeNS(null, "x1");
-			if(x1Attr) {
+			if (x1Attr) {
 				x1 = parseFloat(x1Attr);
 			} else {
 				throw "Missing attribute in element " + this.element;
 			}
 			var y1Attr = this.element.getAttributeNS(null, "y1");
-			if(y1Attr) {
+			if (y1Attr) {
 				y1 = parseFloat(y1Attr);
 			} else {
 				throw "Missing attribute in element " + this.element;
 			}
 			var x2Attr = this.element.getAttributeNS(null, "x2");
-			if(x2Attr) {
+			if (x2Attr) {
 				x2 = parseFloat(x2Attr);
 			} else {
 				throw "Missing attribute in element " + this.element;
 			}
 			var y2Attr = this.element.getAttributeNS(null, "y2");
-			if(y2Attr) {
+			if (y2Attr) {
 				y2 = parseFloat(y2Attr);
 			} else {
 				throw "Missing attribute in element " + this.element;
 			}
-			this.oldX = Math.min(x1,x2);
-			this.oldY = Math.min(y1,y2);
-			this.oldWidth = Math.abs(x1-x2);
-			this.oldHeight = Math.abs(y1-y2);
+			this.oldX = Math.min(x1, x2);
+			this.oldY = Math.min(y1, y2);
+			this.oldWidth = Math.abs(x1 - x2);
+			this.oldHeight = Math.abs(y1 - y2);
 
-		} else if(ORYX.Editor.checkClassType(this.element, SVGPolylineElement) || ORYX.Editor.checkClassType(this.element, SVGPolygonElement)) {
+		} else if (ORYX.Editor.checkClassType(this.element, SVGPolylineElement) || ORYX.Editor.checkClassType(this.element, SVGPolygonElement)) {
 			this.type = "Polyline";
 
 			var pointsArray = [];
-			if (this.element.points&&this.element.points.numberOfItems){
-			    for(var i=0, size=this.element.points.numberOfItems; i<size; i++){
-			        pointsArray.push(this.element.points.getItem(i).x)
-			        pointsArray.push(this.element.points.getItem(i).y)
-			    }
+			if (this.element.points && this.element.points.numberOfItems) {
+				for (var i = 0, size = this.element.points.numberOfItems; i < size; i++) {
+					pointsArray.push(this.element.points.getItem(i).x)
+					pointsArray.push(this.element.points.getItem(i).y)
+				}
 			} else {
 				var points = this.element.getAttributeNS(null, "points");
-				if(points) {
-					points = points.replace(/,/g , " ");
+				if (points) {
+					points = points.replace(/,/g, " ");
 					pointsArray = points.split(" ");
 					pointsArray = pointsArray.without("");
 				} else {
@@ -3767,13 +3886,13 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 			}
 
 
-			if(pointsArray && pointsArray.length && pointsArray.length > 1) {
+			if (pointsArray && pointsArray.length && pointsArray.length > 1) {
 				var minX = parseFloat(pointsArray[0]);
 				var minY = parseFloat(pointsArray[1]);
 				var maxX = parseFloat(pointsArray[0]);
 				var maxY = parseFloat(pointsArray[1]);
 
-				for(var i = 0; i < pointsArray.length; i++) {
+				for (var i = 0; i < pointsArray.length; i++) {
 					minX = Math.min(minX, parseFloat(pointsArray[i]));
 					maxX = Math.max(maxX, parseFloat(pointsArray[i]));
 					i++;
@@ -3783,13 +3902,13 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 
 				this.oldX = minX;
 				this.oldY = minY;
-				this.oldWidth = maxX-minX;
-				this.oldHeight = maxY-minY;
+				this.oldWidth = maxX - minX;
+				this.oldHeight = maxY - minY;
 			} else {
 				throw "Missing attribute in element " + this.element;
 			}
 
-		} else if(ORYX.Editor.checkClassType(this.element, SVGPathElement)) {
+		} else if (ORYX.Editor.checkClassType(this.element, SVGPathElement)) {
 			this.type = "Path";
 
 			this.editPathParser = new PathParser();
@@ -3813,16 +3932,16 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 		}
 
 		/** initialize attributes of oryx namespace */
-		//resize
+			//resize
 		var resizeAttr = this.element.getAttributeNS(NAMESPACE_ORYX, "resize");
-		if(resizeAttr) {
+		if (resizeAttr) {
 			resizeAttr = resizeAttr.toLowerCase();
-			if(resizeAttr.match(/horizontal/)) {
+			if (resizeAttr.match(/horizontal/)) {
 				this.isHorizontallyResizable = true;
 			} else {
 				this.isHorizontallyResizable = false;
 			}
-			if(resizeAttr.match(/vertical/)) {
+			if (resizeAttr.match(/vertical/)) {
 				this.isVerticallyResizable = true;
 			} else {
 				this.isVerticallyResizable = false;
@@ -3834,12 +3953,12 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 
 		//anchors
 		var anchorAttr = this.element.getAttributeNS(NAMESPACE_ORYX, "anchors");
-		if(anchorAttr) {
+		if (anchorAttr) {
 			anchorAttr = anchorAttr.replace("/,/g", " ");
 			var anchors = anchorAttr.split(" ").without("");
 
-			for(var i = 0; i < anchors.length; i++) {
-				switch(anchors[i].toLowerCase()) {
+			for (var i = 0; i < anchors.length; i++) {
+				switch (anchors[i].toLowerCase()) {
 					case "left":
 						this.anchorLeft = true;
 						break;
@@ -3857,10 +3976,10 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 		}
 
 		//allowDockers and resizeMarkerMid
-		if(ORYX.Editor.checkClassType(this.element, SVGPathElement)) {
+		if (ORYX.Editor.checkClassType(this.element, SVGPathElement)) {
 			var allowDockersAttr = this.element.getAttributeNS(NAMESPACE_ORYX, "allowDockers");
-			if(allowDockersAttr) {
-				if(allowDockersAttr.toLowerCase() === "no") {
+			if (allowDockersAttr) {
+				if (allowDockersAttr.toLowerCase() === "no") {
 					this.allowDockers = false;
 				} else {
 					this.allowDockers = true;
@@ -3868,8 +3987,8 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 			}
 
 			var resizeMarkerMidAttr = this.element.getAttributeNS(NAMESPACE_ORYX, "resizeMarker-mid");
-			if(resizeMarkerMidAttr) {
-				if(resizeMarkerMidAttr.toLowerCase() === "yes") {
+			if (resizeMarkerMidAttr) {
+				if (resizeMarkerMidAttr.toLowerCase() === "yes") {
 					this.resizeMarkerMid = true;
 				} else {
 					this.resizeMarkerMid = false;
@@ -3886,15 +4005,15 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 	/**
 	 * Writes the changed values into the SVG element.
 	 */
-	update: function() {
+	update: function () {
 
-		if(this.x !== this.oldX || this.y !== this.oldY || this.width !== this.oldWidth || this.height !== this.oldHeight) {
-			switch(this.type) {
+		if (this.x !== this.oldX || this.y !== this.oldY || this.width !== this.oldWidth || this.height !== this.oldHeight) {
+			switch (this.type) {
 				case "Rect":
-					if(this.x !== this.oldX) this.element.setAttributeNS(null, "x", this.x);
-					if(this.y !== this.oldY) this.element.setAttributeNS(null, "y", this.y);
-				 	if(this.width !== this.oldWidth) this.element.setAttributeNS(null, "width", this.width);
-					if(this.height !== this.oldHeight) this.element.setAttributeNS(null, "height", this.height);
+					if (this.x !== this.oldX) this.element.setAttributeNS(null, "x", this.x);
+					if (this.y !== this.oldY) this.element.setAttributeNS(null, "y", this.y);
+					if (this.width !== this.oldWidth) this.element.setAttributeNS(null, "width", this.width);
+					if (this.height !== this.oldHeight) this.element.setAttributeNS(null, "height", this.height);
 					break;
 				case "Circle":
 					//calculate the radius
@@ -3902,16 +4021,16 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 //					if(this.width/this.oldWidth <= this.height/this.oldHeight) {
 //						this.radiusX = ((this.width > this.height) ? this.width : this.height)/2.0;
 //					} else {
-					 	this.radiusX = ((this.width < this.height) ? this.width : this.height)/2.0;
+					this.radiusX = ((this.width < this.height) ? this.width : this.height) / 2.0;
 					//}
 
-					this.element.setAttributeNS(null, "cx", this.x + this.width/2.0);
-					this.element.setAttributeNS(null, "cy", this.y + this.height/2.0);
+					this.element.setAttributeNS(null, "cx", this.x + this.width / 2.0);
+					this.element.setAttributeNS(null, "cy", this.y + this.height / 2.0);
 					this.element.setAttributeNS(null, "r", this.radiusX);
 					break;
 				case "Ellipse":
-					this.radiusX = this.width/2;
-					this.radiusY = this.height/2;
+					this.radiusX = this.width / 2;
+					this.radiusY = this.height / 2;
 
 					this.element.setAttributeNS(null, "cx", this.x + this.radiusX);
 					this.element.setAttributeNS(null, "cy", this.y + this.radiusY);
@@ -3919,36 +4038,36 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 					this.element.setAttributeNS(null, "ry", this.radiusY);
 					break;
 				case "Line":
-					if(this.x !== this.oldX)
+					if (this.x !== this.oldX)
 						this.element.setAttributeNS(null, "x1", this.x);
 
-					if(this.y !== this.oldY)
+					if (this.y !== this.oldY)
 						this.element.setAttributeNS(null, "y1", this.y);
 
-					if(this.x !== this.oldX || this.width !== this.oldWidth)
+					if (this.x !== this.oldX || this.width !== this.oldWidth)
 						this.element.setAttributeNS(null, "x2", this.x + this.width);
 
-					if(this.y !== this.oldY || this.height !== this.oldHeight)
+					if (this.y !== this.oldY || this.height !== this.oldHeight)
 						this.element.setAttributeNS(null, "y2", this.y + this.height);
 					break;
 				case "Polyline":
 					var points = this.element.getAttributeNS(null, "points");
-					if(points) {
+					if (points) {
 						points = points.replace(/,/g, " ").split(" ").without("");
 
-						if(points && points.length && points.length > 1) {
+						if (points && points.length && points.length > 1) {
 
 							//TODO what if oldWidth == 0?
 							var widthDelta = (this.oldWidth === 0) ? 0 : this.width / this.oldWidth;
-						    var heightDelta = (this.oldHeight === 0) ? 0 : this.height / this.oldHeight;
+							var heightDelta = (this.oldHeight === 0) ? 0 : this.height / this.oldHeight;
 
 							var updatedPoints = "";
-						    for(var i = 0; i < points.length; i++) {
-								var x = (parseFloat(points[i])-this.oldX)*widthDelta + this.x;
+							for (var i = 0; i < points.length; i++) {
+								var x = (parseFloat(points[i]) - this.oldX) * widthDelta + this.x;
 								i++;
-								var y = (parseFloat(points[i])-this.oldY)*heightDelta + this.y;
-		    					updatedPoints += x + " " + y + " ";
-						    }
+								var y = (parseFloat(points[i]) - this.oldY) * heightDelta + this.y;
+								updatedPoints += x + " " + y + " ";
+							}
 							this.element.setAttributeNS(null, "points", updatedPoints);
 						} else {
 							//TODO error
@@ -3983,17 +4102,17 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 		delete this.handler;
 	},
 
-	isPointIncluded: function(pointX, pointY) {
+	isPointIncluded: function (pointX, pointY) {
 
 		// Check if there are the right arguments and if the node is visible
-		if(!pointX || !pointY || !this.isVisible()) {
+		if (!pointX || !pointY || !this.isVisible()) {
 			return false;
 		}
 
-		switch(this.type) {
+		switch (this.type) {
 			case "Rect":
 				return (pointX >= this.x && pointX <= this.x + this.width &&
-						pointY >= this.y && pointY <= this.y+this.height);
+					pointY >= this.y && pointY <= this.y + this.height);
 				break;
 			case "Circle":
 				//calculate the radius
@@ -4003,7 +4122,7 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 //				} else {
 //				 	r = ((this.width < this.height) ? this.width : this.height)/2.0;
 //				}
-				return ORYX.Core.Math.isPointInEllipse(pointX, pointY, this.x + this.width/2.0, this.y + this.height/2.0, this.radiusX, this.radiusX);
+				return ORYX.Core.Math.isPointInEllipse(pointX, pointY, this.x + this.width / 2.0, this.y + this.height / 2.0, this.radiusX, this.radiusX);
 				break;
 			case "Ellipse":
 				return ORYX.Core.Math.isPointInEllipse(pointX, pointY, this.x + this.radiusX, this.y + this.radiusY, this.radiusX, this.radiusY);
@@ -4014,10 +4133,10 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 			case "Polyline":
 				var points = this.element.getAttributeNS(null, "points");
 
-				if(points) {
-					points = points.replace(/,/g , " ").split(" ").without("");
+				if (points) {
+					points = points.replace(/,/g, " ").split(" ").without("");
 
-					points = points.collect(function(n) {
+					points = points.collect(function (n) {
 						return parseFloat(n);
 					});
 
@@ -4049,9 +4168,9 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 	 * @param {SVGElement} elem
 	 * @return boolean
 	 */
-	isVisible: function(elem) {
+	isVisible: function (elem) {
 
-		if (this.visible !== undefined){
+		if (this.visible !== undefined) {
 			return this.visible;
 		}
 
@@ -4062,10 +4181,11 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 		var hasOwnerSVG = false;
 		try {
 			hasOwnerSVG = !!elem.ownerSVGElement;
-		} catch(e){}
+		} catch (e) {
+		}
 
 		// Is SVG context
-		if ( hasOwnerSVG ) {
+		if (hasOwnerSVG) {
 			// IF G-Element
 			if (ORYX.Editor.checkClassType(elem, SVGGElement)) {
 				if (elem.className && elem.className.baseVal == "me") {
@@ -4082,7 +4202,7 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 			} else {
 				// Check if displayed
 				var attr = elem.getAttributeNS(null, "display");
-				if(!attr)
+				if (!attr)
 					this.visible = this.isVisible(elem.parentNode);
 				else if (attr == "none")
 					this.visible = false;
@@ -4096,8 +4216,10 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 		return this.visible;
 	},
 
-	toString: function() { return (this.element) ? "SVGShape " + this.element.id : "SVGShape " + this.element;}
- });/*
+	toString: function () {
+		return (this.element) ? "SVGShape " + this.element.id : "SVGShape " + this.element;
+	}
+});/*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
  * License rights for this program may be obtained from Alfresco Software, Ltd.
  * pursuant to a written agreement and any use of this program without such an
@@ -4110,9 +4232,15 @@ ORYX.Core.SVG.SVGShape = Clazz.extend({
 /**
  * Init namespaces
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
-if(!ORYX.Core.SVG) {ORYX.Core.SVG = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
+if (!ORYX.Core.SVG) {
+	ORYX.Core.SVG = {};
+}
 
 /**
  * @classDescription Class for adding text to a shape.
@@ -4120,7 +4248,7 @@ if(!ORYX.Core.SVG) {ORYX.Core.SVG = {};}
  */
 ORYX.Core.SVG.Label = Clazz.extend({
 
-	_characterSets:[
+	_characterSets: [
 		"%W",
 		"@",
 		"m",
@@ -4133,21 +4261,21 @@ ORYX.Core.SVG.Label = Clazz.extend({
 		"fjI., ",
 		"'",
 		"il"
-		],
-	_characterSetValues:[15,14,13,11,10,9,8,7,6,5,4,3],
+	],
+	_characterSetValues: [15, 14, 13, 11, 10, 9, 8, 7, 6, 5, 4, 3],
 
 	/**
 	 * Constructor
 	 * @param options {Object} :
-	 * 	textElement
+	 *    textElement
 	 *
 	 */
-	construct: function(options) {
+	construct: function (options) {
 		arguments.callee.$.construct.apply(this, arguments);
 
-		if(!options.textElement) {
+		if (!options.textElement) {
 			throw "Label: No parameter textElement."
-		} else if (!ORYX.Editor.checkClassType( options.textElement, SVGTextElement ) ) {
+		} else if (!ORYX.Editor.checkClassType(options.textElement, SVGTextElement)) {
 			throw "Label: Parameter textElement is not an SVGTextElement."
 		}
 
@@ -4190,7 +4318,7 @@ ORYX.Core.SVG.Label = Clazz.extend({
 
 		//if the text element already has an id, don't change it.
 		var _id = this.node.getAttributeNS(null, 'id');
-		if(_id) {
+		if (_id) {
 			this.id = _id;
 		}
 
@@ -4198,27 +4326,31 @@ ORYX.Core.SVG.Label = Clazz.extend({
 
 		//set referenced element the text is fit to
 		this.fitToElemId = this.node.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, 'fittoelem');
-		if(this.fitToElemId)
+		if (this.fitToElemId)
 			this.fitToElemId = this.shapeId + this.fitToElemId;
 
 		//set alignment
 		var alignValues = this.node.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, 'align');
-		if(alignValues) {
+		if (alignValues) {
 			alignValues = alignValues.replace(/,/g, " ");
 			alignValues = alignValues.split(" ");
 			alignValues = alignValues.without("");
 
-			alignValues.each((function(alignValue) {
+			alignValues.each((function (alignValue) {
 				switch (alignValue) {
 					case 'top':
 					case 'middle':
 					case 'bottom':
-						if(!this._verticalAlign){this._originVerticalAlign = this._verticalAlign = alignValue;}
+						if (!this._verticalAlign) {
+							this._originVerticalAlign = this._verticalAlign = alignValue;
+						}
 						break;
 					case 'left':
 					case 'center':
 					case 'right':
-						if(!this._horizontalAlign){this._originHorizontalAlign = this._horizontalAlign = alignValue;}
+						if (!this._horizontalAlign) {
+							this._originHorizontalAlign = this._horizontalAlign = alignValue;
+						}
 						break;
 				}
 			}).bind(this));
@@ -4226,27 +4358,27 @@ ORYX.Core.SVG.Label = Clazz.extend({
 
 		//set edge position (only in case the label belongs to an edge)
 		this.edgePosition = this.node.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, 'edgePosition');
-		if(this.edgePosition) {
+		if (this.edgePosition) {
 			this.originEdgePosition = this.edgePosition = this.edgePosition.toLowerCase();
 		}
 
 
 		//get offset top
 		this.offsetTop = this.node.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, 'offsetTop') || ORYX.CONFIG.OFFSET_EDGE_LABEL_TOP;
-		if(this.offsetTop) {
+		if (this.offsetTop) {
 			this.offsetTop = parseInt(this.offsetTop);
 		}
 
 		//get offset top
 		this.offsetBottom = this.node.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, 'offsetBottom') || ORYX.CONFIG.OFFSET_EDGE_LABEL_BOTTOM;
-		if(this.offsetBottom) {
+		if (this.offsetBottom) {
 			this.offsetBottom = parseInt(this.offsetBottom);
 		}
 
 
 		//set rotation
 		var rotateValue = this.node.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, 'rotate');
-		if(rotateValue) {
+		if (rotateValue) {
 			try {
 				this._rotate = parseFloat(rotateValue);
 			} catch (e) {
@@ -4258,12 +4390,12 @@ ORYX.Core.SVG.Label = Clazz.extend({
 
 		//anchors
 		var anchorAttr = this.node.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, "anchors");
-		if(anchorAttr) {
+		if (anchorAttr) {
 			anchorAttr = anchorAttr.replace("/,/g", " ");
 			var anchors = anchorAttr.split(" ").without("");
 
-			for(var i = 0; i < anchors.length; i++) {
-				switch(anchors[i].toLowerCase()) {
+			for (var i = 0; i < anchors.length; i++) {
+				switch (anchors[i].toLowerCase()) {
 					case "left":
 						this.originAnchorLeft = this.anchorLeft = true;
 						break;
@@ -4281,18 +4413,22 @@ ORYX.Core.SVG.Label = Clazz.extend({
 		}
 
 		//if no alignment defined, set default alignment
-		if(!this._verticalAlign) { this._verticalAlign = 'bottom'; }
-		if(!this._horizontalAlign) { this._horizontalAlign = 'left'; }
+		if (!this._verticalAlign) {
+			this._verticalAlign = 'bottom';
+		}
+		if (!this._horizontalAlign) {
+			this._horizontalAlign = 'left';
+		}
 
 		var xValue = this.node.getAttributeNS(null, 'x');
-		if(xValue) {
+		if (xValue) {
 			this.oldX = this.x = parseFloat(xValue);
 		} else {
 			//TODO error
 		}
 
 		var yValue = this.node.getAttributeNS(null, 'y');
-		if(yValue) {
+		if (yValue) {
 			this.oldY = this.y = parseFloat(yValue);
 		} else {
 			//TODO error
@@ -4307,43 +4443,62 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 * which was specified in the stencil set
 	 *
 	 */
-	resetAnchorPosition: function(){
+	resetAnchorPosition: function () {
 		this.anchorLeft = this.originAnchorLeft || false;
 		this.anchorRight = this.originAnchorRight || false;
 		this.anchorTop = this.originAnchorTop || false;
 		this.anchorBottom = this.originAnchorBottom || false;
 	},
 
-	isOriginAnchorLeft: function(){ return this.originAnchorLeft || false; },
-	isOriginAnchorRight: function(){ return this.originAnchorRight || false; },
-	isOriginAnchorTop: function(){ return this.originAnchorTop || false; },
-	isOriginAnchorBottom: function(){ return this.originAnchorBottom || false; },
+	isOriginAnchorLeft: function () {
+		return this.originAnchorLeft || false;
+	},
+	isOriginAnchorRight: function () {
+		return this.originAnchorRight || false;
+	},
+	isOriginAnchorTop: function () {
+		return this.originAnchorTop || false;
+	},
+	isOriginAnchorBottom: function () {
+		return this.originAnchorBottom || false;
+	},
 
 
-	isAnchorLeft: function(){ return this.anchorLeft || false; },
-	isAnchorRight: function(){ return this.anchorRight || false; },
-	isAnchorTop: function(){ return this.anchorTop || false; },
-	isAnchorBottom: function(){ return this.anchorBottom || false; },
+	isAnchorLeft: function () {
+		return this.anchorLeft || false;
+	},
+	isAnchorRight: function () {
+		return this.anchorRight || false;
+	},
+	isAnchorTop: function () {
+		return this.anchorTop || false;
+	},
+	isAnchorBottom: function () {
+		return this.anchorBottom || false;
+	},
 
 	/**
 	 * Returns the x coordinate
 	 * @return {number}
 	 */
-	getX: function(){
+	getX: function () {
 		try {
 			var x = this.node.x.baseVal.getItem(0).value;
-			switch(this.horizontalAlign()){
-				case "left": return x;
-				case "center": return x - (this.getWidth()/2);
-				case "right": return x - this.getWidth();
+			switch (this.horizontalAlign()) {
+				case "left":
+					return x;
+				case "center":
+					return x - (this.getWidth() / 2);
+				case "right":
+					return x - this.getWidth();
 			}
 			return this.node.getBBox().x;
-		} catch(e){
+		} catch (e) {
 			return this.x;
 		}
 	},
 
-	setX: function(x){
+	setX: function (x) {
 		if (this.position)
 			this.position.x = x;
 		else
@@ -4355,26 +4510,26 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 * Returns the y coordinate
 	 * @return {number}
 	 */
-	getY: function(){
+	getY: function () {
 		try {
 			return this.node.getBBox().y;
-		} catch(e){
+		} catch (e) {
 			return this.y;
 		}
 	},
 
-	setY: function(y){
+	setY: function (y) {
 		if (this.position)
 			this.position.y = y;
 		else
 			this.setOriginY(y);
 	},
 
-	setOriginX: function(x){
+	setOriginX: function (x) {
 		this.x = x;
 	},
 
-	setOriginY: function(y){
+	setOriginY: function (y) {
 		this.y = y;
 	},
 
@@ -4383,7 +4538,7 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 * Returns the width of the label
 	 * @return {number}
 	 */
-	getWidth: function(){
+	getWidth: function () {
 		try {
 			try {
 				var width, cn = this.node.childNodes;
@@ -4397,44 +4552,44 @@ ORYX.Core.SVG.Label = Clazz.extend({
 						}
 					}
 				}
-				return width+(width%2==0?0:1);
+				return width + (width % 2 == 0 ? 0 : 1);
 			} catch (ee) {
 				return this.node.getBBox().width;
 			}
-		} catch(e){
+		} catch (e) {
 			return 0;
 		}
 	},
 
-	getOriginUpperLeft: function(){
+	getOriginUpperLeft: function () {
 		var x = this.x, y = this.y;
-		switch (this._horizontalAlign){
+		switch (this._horizontalAlign) {
 			case 'center' :
-				x -= this.getWidth()/2;
+				x -= this.getWidth() / 2;
 				break;
 			case 'right' :
 				x -= this.getWidth();
 				break;
 		}
-		switch (this._verticalAlign){
+		switch (this._verticalAlign) {
 			case 'middle' :
-				y -= this.getHeight()/2;
+				y -= this.getHeight() / 2;
 				break;
 			case 'bottom' :
 				y -= this.getHeight();
 				break;
 		}
-		return {x:x, y:y};
+		return {x: x, y: y};
 	},
 
 	/**
 	 * Returns the height of the label
 	 * @return {number}
 	 */
-	getHeight: function(){
+	getHeight: function () {
 		try {
 			return this.node.getBBox().height;
-		} catch(e){
+		} catch (e) {
 			return 0;
 		}
 	},
@@ -4444,10 +4599,10 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 * to its parent shape.
 	 * @return {Object}
 	 */
-	getCenter: function(){
+	getCenter: function () {
 		var up = {x: this.getX(), y: this.getY()};
-		up.x += this.getWidth()/2;
-		up.y += this.getHeight()/2;
+		up.x += this.getWidth() / 2;
+		up.y += this.getHeight() / 2;
 		return up;
 	},
 
@@ -4455,14 +4610,14 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 * Sets the position of a label relative to the parent.
 	 * @param {Object} position
 	 */
-	setPosition: function(position){
+	setPosition: function (position) {
 		if (!position || position.x === undefined || position.y === undefined) {
 			delete this.position;
 		} else {
 			this.position = position;
 		}
 
-		if (this.position){
+		if (this.position) {
 			delete this._referencePoint;
 			delete this.edgePosition;
 		}
@@ -4474,26 +4629,26 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	/**
 	 * Return the position
 	 */
-	getPosition: function(){
+	getPosition: function () {
 		return this.position;
 	},
 
-	setReferencePoint: function(ref){
+	setReferencePoint: function (ref) {
 		if (ref) {
 			this._referencePoint = ref;
 		} else {
 			delete this._referencePoint;
 		}
-		if (this._referencePoint){
+		if (this._referencePoint) {
 			delete this.position;
 		}
 	},
 
-	getReferencePoint: function(){
+	getReferencePoint: function () {
 		return this._referencePoint || undefined;
 	},
 
-	changed: function() {
+	changed: function () {
 		this._isChanged = true;
 	},
 
@@ -4502,11 +4657,11 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 * was rendered.
 	 * @param {Object} fn
 	 */
-	registerOnChange: function(fn){
-		if (!this.changeCallbacks){
+	registerOnChange: function (fn) {
+		if (!this.changeCallbacks) {
 			this.changeCallbacks = [];
 		}
-		if (fn instanceof Function && !this.changeCallbacks.include(fn)){
+		if (fn instanceof Function && !this.changeCallbacks.include(fn)) {
 			this.changeCallbacks.push(fn);
 		}
 	},
@@ -4515,8 +4670,8 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 * Unregister the callback for changes.
 	 * @param {Object} fn
 	 */
-	unregisterOnChange: function(fn){
-		if (this.changeCallbacks && fn instanceof Function && this.changeCallbacks.include(fn)){
+	unregisterOnChange: function (fn) {
+		if (this.changeCallbacks && fn instanceof Function && this.changeCallbacks.include(fn)) {
 			this.changeCallbacks = this.changeCallbacks.without(fn);
 		}
 	},
@@ -4526,12 +4681,12 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 * the update mechanism.
 	 * @return {Boolean}
 	 */
-	isUpdating: function(){
+	isUpdating: function () {
 		return !!this._isUpdating;
 	},
 
 
-	getOriginEdgePosition: function(){
+	getOriginEdgePosition: function () {
 		return this.originEdgePosition;
 	},
 
@@ -4541,7 +4696,7 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 * @return {String} "starttop", "startmiddle", "startbottom",
 	 * "midtop", "midbottom", "endtop", "endbottom" or null
 	 */
-	getEdgePosition: function(){
+	getEdgePosition: function () {
 		return this.edgePosition || null;
 	},
 
@@ -4552,9 +4707,9 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 *
 	 * @param {Object} position
 	 */
-	setEdgePosition: function(position){
+	setEdgePosition: function (position) {
 		if (["starttop", "startmiddle", "startbottom",
-			"midtop", "midbottom", "endtop", "endbottom"].include(position)){
+			"midtop", "midbottom", "endtop", "endbottom"].include(position)) {
 			this.edgePosition = position;
 			delete this.position;
 			delete this._referencePoint;
@@ -4566,16 +4721,17 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	/**
 	 * Update the SVG text element.
 	 */
-	update: function(force) {
+	update: function (force) {
 
 		var x = this.x, y = this.y;
-		if (this.position){
+		if (this.position) {
 			x = this.position.x;
 			y = this.position.y;
 		}
-		x = Math.floor(x); y = Math.floor(y);
+		x = Math.floor(x);
+		y = Math.floor(y);
 
-		if(this._isChanged || x !== this.oldX || y !== this.oldY || force === true) {
+		if (this._isChanged || x !== this.oldX || y !== this.oldY || force === true) {
 			if (this.isVisible) {
 				this._isChanged = false;
 				this._isUpdating = true;
@@ -4610,9 +4766,9 @@ ORYX.Core.SVG.Label = Clazz.extend({
 				if (this.node.ownerDocument) {
 					// Only reset the tspans if the text
 					// has changed or has to be wrapped
-					if (this.fitToElemId || this._textHasChanged){
+					if (this.fitToElemId || this._textHasChanged) {
 						this.node.textContent = ""; // Remove content
-						textLines.each((function(textLine, index){
+						textLines.each((function (textLine, index) {
 							var tspan = this.node.ownerDocument.createElementNS(ORYX.CONFIG.NAMESPACE_SVG, 'tspan');
 							tspan.textContent = textLine.trim();
 							if (this.fitToElemId) {
@@ -4624,7 +4780,7 @@ ORYX.Core.SVG.Label = Clazz.extend({
 							 * Chrome's getBBox() method fails, if a text node contains an empty tspan element.
 							 * So, we add a whitespace to such a tspan element.
 							 */
-							if(tspan.textContent === "") {
+							if (tspan.textContent === "") {
 								tspan.textContent = " ";
 							}
 
@@ -4655,86 +4811,84 @@ ORYX.Core.SVG.Label = Clazz.extend({
 		}
 	},
 
-	_checkFittingToReferencedElem: function() {
+	_checkFittingToReferencedElem: function () {
 		try {
 			var tspans = $A(this.node.getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_SVG, 'tspan'));
 
 			//only do this in firefox 3. all other browsers do not support word wrapping!!!!!
 			//if (/Firefox[\/\s](\d+\.\d+)/.test(navigator.userAgent) && new Number(RegExp.$1)>=3) {
-				var newtspans = [];
+			var newtspans = [];
 
-				var refNode = this.node.ownerDocument.getElementById(this.fitToElemId);
+			var refNode = this.node.ownerDocument.getElementById(this.fitToElemId);
 
-				if (refNode) {
-					var refbb = refNode.getBBox();
+			if (refNode) {
+				var refbb = refNode.getBBox();
 
-					var fontSize = this.getFontSize();
+				var fontSize = this.getFontSize();
 
-					for (var j = 0; j < tspans.length; j++) {
-						var tspan = tspans[j];
+				for (var j = 0; j < tspans.length; j++) {
+					var tspan = tspans[j];
 
-						var textLength = this._getRenderedTextLength(tspan, undefined, undefined, fontSize);
+					var textLength = this._getRenderedTextLength(tspan, undefined, undefined, fontSize);
 
-						var refBoxLength = (this._rotate != 0
-								&& this._rotate % 180 != 0
-								&& this._rotate % 90 == 0 ?
-										refbb.height : refbb.width);
+					var refBoxLength = (this._rotate != 0
+					&& this._rotate % 180 != 0
+					&& this._rotate % 90 == 0 ?
+						refbb.height : refbb.width);
 
-						if (textLength > refBoxLength) {
+					if (textLength > refBoxLength) {
 
-							var startIndex = 0;
-							var lastSeperatorIndex = 0;
+						var startIndex = 0;
+						var lastSeperatorIndex = 0;
 
-							var numOfChars = this.getTrimmedTextLength(tspan.textContent);
-							for (var i = 0; i < numOfChars; i++) {
-								var sslength = this._getRenderedTextLength(tspan, startIndex, i-startIndex, fontSize);
+						var numOfChars = this.getTrimmedTextLength(tspan.textContent);
+						for (var i = 0; i < numOfChars; i++) {
+							var sslength = this._getRenderedTextLength(tspan, startIndex, i - startIndex, fontSize);
 
-								if (sslength > refBoxLength - 2) {
-									var newtspan = this.node.ownerDocument.createElementNS(ORYX.CONFIG.NAMESPACE_SVG, 'tspan');
-									if (lastSeperatorIndex <= startIndex) {
-										lastSeperatorIndex = (i == 0) ? i : i-1;
-										newtspan.textContent = tspan.textContent.slice(startIndex, lastSeperatorIndex).trim();
-										//lastSeperatorIndex = i;
-									}
-									else {
-										newtspan.textContent = tspan.textContent.slice(startIndex, ++lastSeperatorIndex).trim();
-									}
+							if (sslength > refBoxLength - 2) {
+								var newtspan = this.node.ownerDocument.createElementNS(ORYX.CONFIG.NAMESPACE_SVG, 'tspan');
+								if (lastSeperatorIndex <= startIndex) {
+									lastSeperatorIndex = (i == 0) ? i : i - 1;
+									newtspan.textContent = tspan.textContent.slice(startIndex, lastSeperatorIndex).trim();
+									//lastSeperatorIndex = i;
+								} else {
+									newtspan.textContent = tspan.textContent.slice(startIndex, ++lastSeperatorIndex).trim();
+								}
 
-									newtspan.setAttributeNS(null, 'x', this.invisibleRenderPoint);
-									newtspan.setAttributeNS(null, 'y', this.invisibleRenderPoint);
+								newtspan.setAttributeNS(null, 'x', this.invisibleRenderPoint);
+								newtspan.setAttributeNS(null, 'y', this.invisibleRenderPoint);
 
-									//insert tspan to text node
-									//this.node.insertBefore(newtspan, tspan);
-									newtspans.push(newtspan);
+								//insert tspan to text node
+								//this.node.insertBefore(newtspan, tspan);
+								newtspans.push(newtspan);
 
-									startIndex = lastSeperatorIndex;
-								}
-								else {
-									var curChar = tspan.textContent.charAt(i);
-									if (curChar == ' ' ||
+								startIndex = lastSeperatorIndex;
+							} else {
+								var curChar = tspan.textContent.charAt(i);
+								if (curChar == ' ' ||
 									curChar == '-' ||
 									curChar == "." ||
 									curChar == "," ||
 									curChar == ";" ||
 									curChar == ":") {
-										lastSeperatorIndex = i;
-									}
+									lastSeperatorIndex = i;
 								}
 							}
-
-							tspan.textContent = tspan.textContent.slice(startIndex).trim();
 						}
 
-						newtspans.push(tspan);
+						tspan.textContent = tspan.textContent.slice(startIndex).trim();
 					}
 
-					while (this.node.hasChildNodes())
-						this.node.removeChild(this.node.childNodes[0]);
+					newtspans.push(tspan);
+				}
 
-					while (newtspans.length > 0) {
-						this.node.appendChild(newtspans.shift());
-					}
+				while (this.node.hasChildNodes())
+					this.node.removeChild(this.node.childNodes[0]);
+
+				while (newtspans.length > 0) {
+					this.node.appendChild(newtspans.shift());
 				}
+			}
 			//}
 		} catch (e) {
 			ORYX.Log.fatal("Error " + e);
@@ -4747,7 +4901,7 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 * This is a work around method for Mozilla bug 293581.
 	 * Before the method getComputedTextLength works, the text has to be rendered.
 	 */
-	_positionText: function() {
+	_positionText: function () {
 		try {
 
 			var tspans = this.node.childNodes;
@@ -4757,23 +4911,24 @@ ORYX.Core.SVG.Label = Clazz.extend({
 			var invalidTSpans = [];
 
 			var x = this.x, y = this.y;
-			if (this.position){
+			if (this.position) {
 				x = this.position.x;
 				y = this.position.y;
 			}
-			x = Math.floor(x); y = Math.floor(y);
+			x = Math.floor(x);
+			y = Math.floor(y);
 
 			var i = 0, indic = []; // Cache indices if the _positionText is called again, before update is called
-			var is =(this.indices || $R(0,tspans.length-1).toArray());
+			var is = (this.indices || $R(0, tspans.length - 1).toArray());
 			var length = is.length;
-			is.each((function(index){
-				if ("undefined" == typeof index){
+			is.each((function (index) {
+				if ("undefined" == typeof index) {
 					return;
 				}
 
 				var tspan = tspans[i++];
 
-				if(tspan.textContent.trim() === "") {
+				if (tspan.textContent.trim() === "") {
 					invalidTSpans.push(tspan);
 				} else {
 					//set vertical position
@@ -4803,7 +4958,7 @@ ORYX.Core.SVG.Label = Clazz.extend({
 			indic.length = tspans.length;
 			this.indices = this.indices || indic;
 
-			invalidTSpans.each(function(tspan) {
+			invalidTSpans.each(function (tspan) {
 				this.node.removeChild(tspan)
 			}.bind(this));
 
@@ -4820,13 +4975,13 @@ ORYX.Core.SVG.Label = Clazz.extend({
 					break;
 			}
 
-		} catch(e) {
+		} catch (e) {
 			//console.log(e);
 			this._isChanged = true;
 		}
 
 
-		if(this.isVisible) {
+		if (this.isVisible) {
 			this.node.removeAttributeNS(null, 'visibility');
 		}
 
@@ -4835,7 +4990,7 @@ ORYX.Core.SVG.Label = Clazz.extend({
 		delete this._isUpdating;
 
 		// Raise change event
-		(this.changeCallbacks||[]).each(function(fn){
+		(this.changeCallbacks || []).each(function (fn) {
 			fn.apply(fn);
 		})
 
@@ -4848,17 +5003,17 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 * @param {int} startIndex Optional, for sub strings
 	 * @param {int} endIndex Optional, for sub strings
 	 */
-	_getRenderedTextLength: function(tspan, startIndex, endIndex, fontSize) {
+	_getRenderedTextLength: function (tspan, startIndex, endIndex, fontSize) {
 		//if (/Firefox[\/\s](\d+\.\d+)/.test(navigator.userAgent) && new Number(RegExp.$1) >= 3) {
-			if(startIndex === undefined) {
+		if (startIndex === undefined) {
 //test string: abcdefghijklmnopqrstuvwxyz????????????????,.-#+ 1234567890?????ABCDEFGHIJKLMNOPQRSTUVWXYZ;:_'*???????????????!"????$%&/()=?[]{}|<>'~????`\^?????????@?????????????????
 //				for(var i = 0; i < tspan.textContent.length; i++) {
 //					console.log(tspan.textContent.charAt(i), tspan.getSubStringLength(i,1), this._estimateCharacterWidth(tspan.textContent.charAt(i))*(fontSize/14.0));
 //				}
-				return tspan.getComputedTextLength();
-			} else {
-				return tspan.getSubStringLength(startIndex, endIndex);
-			}
+			return tspan.getComputedTextLength();
+		} else {
+			return tspan.getSubStringLength(startIndex, endIndex);
+		}
 		/*} else {
 			if(startIndex === undefined) {
 				return this._estimateTextWidth(tspan.textContent, fontSize);
@@ -4873,13 +5028,13 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 * Used for word wrapping in all browser but FF3.
 	 * @param {Object} text
 	 */
-	_estimateTextWidth: function(text, fontSize) {
+	_estimateTextWidth: function (text, fontSize) {
 		var sum = 0.0;
-		for(var i = 0; i < text.length; i++) {
+		for (var i = 0; i < text.length; i++) {
 			sum += this._estimateCharacterWidth(text.charAt(i));
 		}
 
-		return sum*(fontSize/14.0);
+		return sum * (fontSize / 14.0);
 	},
 
 	/**
@@ -4887,26 +5042,26 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 * Used for word wrapping in all browser but FF3.
 	 * @param {Object} character
 	 */
-	_estimateCharacterWidth: function(character) {
-		for(var i = 0; i < this._characterSets.length; i++) {
- 			if(this._characterSets[i].indexOf(character) >= 0) {
+	_estimateCharacterWidth: function (character) {
+		for (var i = 0; i < this._characterSets.length; i++) {
+			if (this._characterSets[i].indexOf(character) >= 0) {
 				return this._characterSetValues[i];
 			}
- 		}
+		}
 		return 9;
- 	},
+	},
 
-	getReferencedElementWidth: function() {
+	getReferencedElementWidth: function () {
 		var refNode = this.node.ownerDocument.getElementById(this.fitToElemId);
 
-		if(refNode) {
+		if (refNode) {
 			var refbb = refNode.getBBox();
 
-			if(refbb) {
+			if (refbb) {
 				return (this._rotate != 0
-						&& this._rotate % 180 != 0
-						&& this._rotate % 90 == 0 ?
-								refbb.height : refbb.width);
+				&& this._rotate % 180 != 0
+				&& this._rotate % 90 == 0 ?
+					refbb.height : refbb.width);
 			}
 		}
 
@@ -4917,7 +5072,7 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 * If no parameter is provided, this method returns the current text.
 	 * @param text {String} Optional. Replaces the old text with this one.
 	 */
-	text: function() {
+	text: function () {
 		switch (arguments.length) {
 			case 0:
 				return this._text
@@ -4925,16 +5080,16 @@ ORYX.Core.SVG.Label = Clazz.extend({
 
 			case 1:
 				var oldText = this._text;
-				if(arguments[0]) {
+				if (arguments[0]) {
 					// Filter out multiple spaces to fix issue in chrome for line-wrapping
 					this._text = arguments[0].toString();
-					if(this._text != null && this._text != undefined) {
-						this._text = this._text.replace(/ {2,}/g,' ');
+					if (this._text != null && this._text != undefined) {
+						this._text = this._text.replace(/ {2,}/g, ' ');
 					}
 				} else {
 					this._text = "";
 				}
-				if(oldText !== this._text) {
+				if (oldText !== this._text) {
 					this._isChanged = true;
 					this._textHasChanged = true;
 				}
@@ -4946,19 +5101,19 @@ ORYX.Core.SVG.Label = Clazz.extend({
 		}
 	},
 
-	getOriginVerticalAlign: function(){
+	getOriginVerticalAlign: function () {
 		return this._originVerticalAlign;
 	},
 
-	verticalAlign: function() {
-		switch(arguments.length) {
+	verticalAlign: function () {
+		switch (arguments.length) {
 			case 0:
 				return this._verticalAlign;
 			case 1:
-				if(['top', 'middle', 'bottom'].member(arguments[0])) {
+				if (['top', 'middle', 'bottom'].member(arguments[0])) {
 					var oldValue = this._verticalAlign;
 					this._verticalAlign = arguments[0];
-					if(this._verticalAlign !== oldValue) {
+					if (this._verticalAlign !== oldValue) {
 						this._isChanged = true;
 					}
 				}
@@ -4970,19 +5125,19 @@ ORYX.Core.SVG.Label = Clazz.extend({
 		}
 	},
 
-	getOriginHorizontalAlign: function(){
+	getOriginHorizontalAlign: function () {
 		return this._originHorizontalAlign;
 	},
 
-	horizontalAlign: function() {
-		switch(arguments.length) {
+	horizontalAlign: function () {
+		switch (arguments.length) {
 			case 0:
 				return this._horizontalAlign;
 			case 1:
-				if(['left', 'center', 'right'].member(arguments[0])) {
+				if (['left', 'center', 'right'].member(arguments[0])) {
 					var oldValue = this._horizontalAlign;
 					this._horizontalAlign = arguments[0];
-					if(this._horizontalAlign !== oldValue) {
+					if (this._horizontalAlign !== oldValue) {
 						this._isChanged = true;
 					}
 				}
@@ -4994,8 +5149,8 @@ ORYX.Core.SVG.Label = Clazz.extend({
 		}
 	},
 
-	rotate: function() {
-		switch(arguments.length) {
+	rotate: function () {
+		switch (arguments.length) {
 			case 0:
 				return this._rotate;
 			case 1:
@@ -5005,10 +5160,10 @@ ORYX.Core.SVG.Label = Clazz.extend({
 					this._isChanged = true;
 				}
 			case 2:
-				if(this._rotate != arguments[0] ||
-				   !this._rotationPoint ||
-				   this._rotationPoint.x != arguments[1].x ||
-				   this._rotationPoint.y != arguments[1].y) {
+				if (this._rotate != arguments[0] ||
+					!this._rotationPoint ||
+					this._rotationPoint.x != arguments[1].x ||
+					this._rotationPoint.y != arguments[1].y) {
 					this._rotate = arguments[0];
 					this._rotationPoint = arguments[1];
 					this._isChanged = true;
@@ -5017,15 +5172,15 @@ ORYX.Core.SVG.Label = Clazz.extend({
 		}
 	},
 
-	hide: function() {
-		if(this.isVisible) {
+	hide: function () {
+		if (this.isVisible) {
 			this.isVisible = false;
 			this._isChanged = true;
 		}
 	},
 
-	show: function() {
-		if(!this.isVisible) {
+	show: function () {
+		if (!this.isVisible) {
 			this.isVisible = true;
 			this._isChanged = true;
 
@@ -5040,19 +5195,19 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 * attribute.
 	 * @param {SVGElement} node
 	 */
-	getInheritedFontSize: function(node) {
-		if(!node || !node.getAttributeNS)
+	getInheritedFontSize: function (node) {
+		if (!node || !node.getAttributeNS)
 			return;
 
 		var attr = node.getAttributeNS(null, "font-size");
-		if(attr) {
+		if (attr) {
 			return parseFloat(attr);
-		} else if(!ORYX.Editor.checkClassType(node, SVGSVGElement)) {
+		} else if (!ORYX.Editor.checkClassType(node, SVGSVGElement)) {
 			return this.getInheritedFontSize(node.parentNode);
 		}
 	},
 
-	getFontSize: function(node) {
+	getFontSize: function (node) {
 		var tspans = this.node.getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_SVG, 'tspan');
 
 		//trying to get an inherited font-size attribute
@@ -5063,8 +5218,7 @@ ORYX.Core.SVG.Label = Clazz.extend({
 			//because this only works in firefox 3, all other browser use the default line height
 			if (tspans[0] && /Firefox[\/\s](\d+\.\d+)/.test(navigator.userAgent) && new Number(RegExp.$1) >= 3) {
 				fontSize = tspans[0].getExtentOfChar(0).height;
-			}
-			else {
+			} else {
 				fontSize = ORYX.CONFIG.LABEL_DEFAULT_LINE_HEIGHT;
 			}
 
@@ -5074,7 +5228,7 @@ ORYX.Core.SVG.Label = Clazz.extend({
 			}
 		}
 
-		if(fontSize)
+		if (fontSize)
 			this.node.setAttribute("oryx:fontSize", fontSize);
 
 		return fontSize;
@@ -5085,7 +5239,7 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 * getExtentOfChar and getSubStringLength.
 	 * @param {String} text
 	 */
-	getTrimmedTextLength: function(text) {
+	getTrimmedTextLength: function (text) {
 		text = text.strip().gsub('  ', ' ');
 
 		var oldLength;
@@ -5103,7 +5257,7 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 * positioned under the edge
 	 * @return {int}
 	 */
-	getOffsetBottom: function(){
+	getOffsetBottom: function () {
 		return this.offsetBottom;
 	},
 
@@ -5114,7 +5268,7 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 * positioned over the edge
 	 * @return {int}
 	 */
-	getOffsetTop: function(){
+	getOffsetTop: function () {
 		return this.offsetTop;
 	},
 
@@ -5122,19 +5276,19 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 *
 	 * @param {Object} obj
 	 */
-	deserialize: function(obj, shape){
-		if (obj && "undefined" != typeof obj.x && "undefined" != typeof obj.y){
-			this.setPosition({x:obj.x, y:obj.y});
+	deserialize: function (obj, shape) {
+		if (obj && "undefined" != typeof obj.x && "undefined" != typeof obj.y) {
+			this.setPosition({x: obj.x, y: obj.y});
 
-			if ("undefined" != typeof obj.distance){
+			if ("undefined" != typeof obj.distance) {
 				var from = shape.dockers[obj.from];
 				var to = shape.dockers[obj.to];
-				if (from && to){
+				if (from && to) {
 					this.setReferencePoint({
-						dirty : true,
-						distance : obj.distance,
-						intersection : {x: obj.x, y: obj.y},
-						orientation : obj.orientation,
+						dirty: true,
+						distance: obj.distance,
+						intersection: {x: obj.x, y: obj.y},
+						orientation: obj.orientation,
 						segment: {
 							from: from,
 							fromIndex: obj.from,
@@ -5154,7 +5308,7 @@ ORYX.Core.SVG.Label = Clazz.extend({
 			if (obj.valign) this.verticalAlign(obj.valign);
 			if (obj.align) this.horizontalAlign(obj.align);
 
-		} else if (obj && "undefined" != typeof obj.edge){
+		} else if (obj && "undefined" != typeof obj.edge) {
 			this.setEdgePosition(obj.edge);
 		}
 	},
@@ -5163,11 +5317,11 @@ ORYX.Core.SVG.Label = Clazz.extend({
 	 *
 	 * @return {Object}
 	 */
-	serialize: function(){
+	serialize: function () {
 
 		// On edge position
-		if (this.getEdgePosition()){
-			if (this.getOriginEdgePosition() !== this.getEdgePosition()){
+		if (this.getEdgePosition()) {
+			if (this.getOriginEdgePosition() !== this.getEdgePosition()) {
 				return {edge: this.getEdgePosition()};
 			} else {
 				return null;
@@ -5175,25 +5329,25 @@ ORYX.Core.SVG.Label = Clazz.extend({
 		}
 
 		// On self defined position
-		if (this.position){
+		if (this.position) {
 			var pos = {x: this.position.x, y: this.position.y};
-			if (this.isAnchorLeft() && this.isAnchorLeft() !== this.isOriginAnchorLeft()){
+			if (this.isAnchorLeft() && this.isAnchorLeft() !== this.isOriginAnchorLeft()) {
 				pos.left = true;
 			}
-			if (this.isAnchorRight() && this.isAnchorRight() !== this.isOriginAnchorRight()){
+			if (this.isAnchorRight() && this.isAnchorRight() !== this.isOriginAnchorRight()) {
 				pos.right = true;
 			}
-			if (this.isAnchorTop() && this.isAnchorTop() !== this.isOriginAnchorTop()){
+			if (this.isAnchorTop() && this.isAnchorTop() !== this.isOriginAnchorTop()) {
 				pos.top = true;
 			}
-			if (this.isAnchorBottom() && this.isAnchorBottom() !== this.isOriginAnchorBottom()){
+			if (this.isAnchorBottom() && this.isAnchorBottom() !== this.isOriginAnchorBottom()) {
 				pos.bottom = true;
 			}
 
-			if (this.getOriginVerticalAlign() !== this.verticalAlign()){
+			if (this.getOriginVerticalAlign() !== this.verticalAlign()) {
 				pos.valign = this.verticalAlign();
 			}
-			if (this.getOriginHorizontalAlign() !== this.horizontalAlign()){
+			if (this.getOriginHorizontalAlign() !== this.horizontalAlign()) {
 				pos.align = this.horizontalAlign();
 			}
 
@@ -5201,24 +5355,26 @@ ORYX.Core.SVG.Label = Clazz.extend({
 		}
 
 		// On reference point which is interesting for edges
-		if (this.getReferencePoint()){
+		if (this.getReferencePoint()) {
 			var ref = this.getReferencePoint();
 			return {
-				distance : ref.distance,
-				x : ref.intersection.x,
-				y : ref.intersection.y,
-				from : ref.segment.fromIndex,
-				to : ref.segment.toIndex,
-				orientation : ref.orientation,
-				valign : this.verticalAlign(),
-				align : this.horizontalAlign()
+				distance: ref.distance,
+				x: ref.intersection.x,
+				y: ref.intersection.y,
+				from: ref.segment.fromIndex,
+				to: ref.segment.toIndex,
+				orientation: ref.orientation,
+				valign: this.verticalAlign(),
+				align: this.horizontalAlign()
 			}
 		}
 		return null;
 	},
 
-	toString: function() { return "Label " + this.id }
- });/*
+	toString: function () {
+		return "Label " + this.id
+	}
+});/*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
  * License rights for this program may be obtained from Alfresco Software, Ltd.
  * pursuant to a written agreement and any use of this program without such an
@@ -5231,9 +5387,15 @@ ORYX.Core.SVG.Label = Clazz.extend({
 /**
  * Init namespaces
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
-if(!ORYX.Core.Math) {ORYX.Core.Math = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
+if (!ORYX.Core.Math) {
+	ORYX.Core.Math = {};
+}
 
 /**
  * Calculate the middle point between two given points
@@ -5241,11 +5403,11 @@ if(!ORYX.Core.Math) {ORYX.Core.Math = {};}
  * @param {x:double, y:double} point2
  * @return the middle point
  */
-ORYX.Core.Math.midPoint = function(point1, point2) {
-	return 	{
-				x: (point1.x + point2.x) / 2.0,
-				y: (point1.y + point2.y) / 2.0
-			}
+ORYX.Core.Math.midPoint = function (point1, point2) {
+	return {
+		x: (point1.x + point2.x) / 2.0,
+		y: (point1.y + point2.y) / 2.0
+	}
 }
 
 /**
@@ -5267,26 +5429,26 @@ ORYX.Core.Math.isPointInLine = function (pointX, pointY, lPoint1X, lPoint1Y, lPo
 	offset = offset ? Math.abs(offset) : 1;
 
 	// Check if the edge is vertical
-	if(Math.abs(lPoint1X-lPoint2X)<=offset && Math.abs(pointX-lPoint1X)<=offset && pointY-Math.max(lPoint1Y, lPoint2Y)<=offset && Math.min(lPoint1Y, lPoint2Y)-pointY<=offset) {
+	if (Math.abs(lPoint1X - lPoint2X) <= offset && Math.abs(pointX - lPoint1X) <= offset && pointY - Math.max(lPoint1Y, lPoint2Y) <= offset && Math.min(lPoint1Y, lPoint2Y) - pointY <= offset) {
 		return true
 	}
 
 	// Check if the edge is horizontal
-	if(Math.abs(lPoint1Y-lPoint2Y)<=offset && Math.abs(pointY-lPoint1Y)<=offset && pointX-Math.max(lPoint1X, lPoint2X)<=offset && Math.min(lPoint1X, lPoint2X)-pointX<=offset) {
+	if (Math.abs(lPoint1Y - lPoint2Y) <= offset && Math.abs(pointY - lPoint1Y) <= offset && pointX - Math.max(lPoint1X, lPoint2X) <= offset && Math.min(lPoint1X, lPoint2X) - pointX <= offset) {
 		return true
 	}
 
-	if(pointX > Math.max(lPoint1X, lPoint2X) || pointX < Math.min(lPoint1X, lPoint2X)) {
+	if (pointX > Math.max(lPoint1X, lPoint2X) || pointX < Math.min(lPoint1X, lPoint2X)) {
 		return false
 	}
 
-	if(pointY > Math.max(lPoint1Y, lPoint2Y) || pointY < Math.min(lPoint1Y, lPoint2Y)) {
+	if (pointY > Math.max(lPoint1Y, lPoint2Y) || pointY < Math.min(lPoint1Y, lPoint2Y)) {
 		return false
 	}
 
 	var s = (lPoint1Y - lPoint2Y) / (lPoint1X - lPoint2X);
 
-	return 	Math.abs(pointY - ((s * pointX) + lPoint1Y - s * lPoint1X)) < offset
+	return Math.abs(pointY - ((s * pointX) + lPoint1Y - s * lPoint1X)) < offset
 }
 
 /**
@@ -5295,14 +5457,14 @@ ORYX.Core.Math.isPointInLine = function (pointX, pointY, lPoint1X, lPoint1Y, lPo
  */
 ORYX.Core.Math.isPointInEllipse = function (pointX, pointY, cx, cy, rx, ry) {
 
-	if(cx === undefined || cy === undefined || rx === undefined || ry === undefined) {
+	if (cx === undefined || cy === undefined || rx === undefined || ry === undefined) {
 		throw "ORYX.Core.Math.isPointInEllipse needs a ellipse with these properties: x, y, radiusX, radiusY"
 	}
 
-    var tx = (pointX - cx) / rx;
-    var ty = (pointY - cy) / ry;
+	var tx = (pointX - cx) / rx;
+	var ty = (pointY - cy) / ry;
 
-    return tx * tx + ty * ty < 1.0;
+	return tx * tx + ty * ty < 1.0;
 }
 
 /**
@@ -5311,13 +5473,13 @@ ORYX.Core.Math.isPointInEllipse = function (pointX, pointY, cx, cy, rx, ry) {
  * @param {int} pointY
  * @param {[int]} Cornerpoints of the Polygone (x,y,x,y,...)
  */
-ORYX.Core.Math.isPointInPolygone = function(pointX, pointY, polygone){
+ORYX.Core.Math.isPointInPolygone = function (pointX, pointY, polygone) {
 
 	if (arguments.length < 3) {
 		throw "ORYX.Core.Math.isPointInPolygone needs two arguments"
 	}
 
-	var lastIndex = polygone.length-1;
+	var lastIndex = polygone.length - 1;
 
 	if (polygone[0] !== polygone[lastIndex - 1] || polygone[1] !== polygone[lastIndex]) {
 		polygone.push(polygone[0]);
@@ -5328,50 +5490,50 @@ ORYX.Core.Math.isPointInPolygone = function(pointX, pointY, polygone){
 
 	var x1, y1, x2, y2, d;
 
-    for (var i = 0; i < polygone.length - 3; ) {
-        x1=polygone[i];
-        y1=polygone[++i];
-        x2=polygone[++i];
-        y2=polygone[i+1];
-        d=(pointY - y1) * (x2 - x1) - (pointX - x1) * (y2 - y1);
+	for (var i = 0; i < polygone.length - 3;) {
+		x1 = polygone[i];
+		y1 = polygone[++i];
+		x2 = polygone[++i];
+		y2 = polygone[i + 1];
+		d = (pointY - y1) * (x2 - x1) - (pointX - x1) * (y2 - y1);
 
-        if ((y1 >= pointY) != (y2 >= pointY)) {
-            crossings += y2 - y1 >= 0 ? d >= 0 : d <= 0;
-        }
-        if (!d && Math.min(x1,x2) <= pointX && pointX <= Math.max(x1,x2)
-            && Math.min(y1,y2) <= pointY && pointY <= Math.max(y1,y2)) {
-            return true;
-        }
-    }
-	return (crossings%2)?true:false;
+		if ((y1 >= pointY) != (y2 >= pointY)) {
+			crossings += y2 - y1 >= 0 ? d >= 0 : d <= 0;
+		}
+		if (!d && Math.min(x1, x2) <= pointX && pointX <= Math.max(x1, x2)
+			&& Math.min(y1, y2) <= pointY && pointY <= Math.max(y1, y2)) {
+			return true;
+		}
+	}
+	return (crossings % 2) ? true : false;
 }
 
 /**
- *	Calculates the distance between a point and a line. It is also testable, if
+ *    Calculates the distance between a point and a line. It is also testable, if
  *  the distance orthogonal to the line, matches the segment of the line.
  *
  *  @param {float} lineP1
- *  	The starting point of the line segment
+ *    The starting point of the line segment
  *  @param {float} lineP2
- *  	The end point of the line segment
+ *    The end point of the line segment
  *  @param {Point} point
- *  	The point to calculate the distance to.
+ *    The point to calculate the distance to.
  *  @param {boolean} toSegmentOnly
- *  	Flag to signal if only the segment of the line shell be evaluated.
+ *    Flag to signal if only the segment of the line shell be evaluated.
  */
-ORYX.Core.Math.distancePointLinie = function(
-									lineP1,
-									lineP2,
-									point,
-									toSegmentOnly) {
+ORYX.Core.Math.distancePointLinie = function (
+	lineP1,
+	lineP2,
+	point,
+	toSegmentOnly) {
 
 	var intersectionPoint =
-				ORYX.Core.Math.getPointOfIntersectionPointLine(lineP1,
-																lineP2,
-																point,
-																toSegmentOnly);
+		ORYX.Core.Math.getPointOfIntersectionPointLine(lineP1,
+			lineP2,
+			point,
+			toSegmentOnly);
 
-	if(!intersectionPoint) {
+	if (!intersectionPoint) {
 		return null;
 	}
 
@@ -5384,7 +5546,7 @@ ORYX.Core.Math.distancePointLinie = function(
  * @param {point} point1
  * @param {point} point2
  */
-ORYX.Core.Math.getDistancePointToPoint = function(point1, point2) {
+ORYX.Core.Math.getDistancePointToPoint = function (point1, point2) {
 	return Math.sqrt(Math.pow(point1.x - point2.x, 2) + Math.pow(point1.y - point2.y, 2));
 };
 
@@ -5395,9 +5557,9 @@ ORYX.Core.Math.getDistancePointToPoint = function(point1, point2) {
  * @param {point} between2
  * @param {point} point
  */
-ORYX.Core.Math.getDistanceBetweenTwoPoints = function(between1, between2, point) {
-	return 	ORYX.Core.Math.getDistancePointToPoint(point, between1) /
-			ORYX.Core.Math.getDistancePointToPoint(between1, between2);
+ORYX.Core.Math.getDistanceBetweenTwoPoints = function (between1, between2, point) {
+	return ORYX.Core.Math.getDistancePointToPoint(point, between1) /
+		ORYX.Core.Math.getDistancePointToPoint(between1, between2);
 };
 
 
@@ -5409,12 +5571,12 @@ ORYX.Core.Math.getDistanceBetweenTwoPoints = function(between1, between2, point)
  * @param {point} lineP2 Line second point
  * @param {point} point
  */
-ORYX.Core.Math.pointIsLeftOfLine = function(lineP1, lineP2, point){
+ORYX.Core.Math.pointIsLeftOfLine = function (lineP1, lineP2, point) {
 
 	var vec1 = ORYX.Core.Math.getVector(lineP1, lineP2);
 	var vec2 = ORYX.Core.Math.getVector(lineP1, point);
 	// if the cross produkt is more than 0
-	return ((vec1.x*vec2.y) - (vec2.x*vec1.y)) > 0
+	return ((vec1.x * vec2.y) - (vec2.x * vec1.y)) > 0
 };
 
 /**
@@ -5424,12 +5586,12 @@ ORYX.Core.Math.pointIsLeftOfLine = function(lineP1, lineP2, point){
  * @param {point} point2
  * @param {number} relative Relative which is between 0 and 1
  */
-ORYX.Core.Math.getPointBetweenTwoPoints = function(point1, point2, relative) {
+ORYX.Core.Math.getPointBetweenTwoPoints = function (point1, point2, relative) {
 	relative = Math.max(Math.min(relative || 0, 1), 0);
 
-	if (relative === 0){
+	if (relative === 0) {
 		return point1;
-	} else if (relative === 1){
+	} else if (relative === 1) {
 		return point2;
 	}
 
@@ -5446,7 +5608,7 @@ ORYX.Core.Math.getPointBetweenTwoPoints = function(point1, point2, relative) {
  * @param {point} point1
  * @param {point} point2
  */
-ORYX.Core.Math.getVector = function(point1, point2){
+ORYX.Core.Math.getVector = function (point1, point2) {
 	return {
 		x: point2.x - point1.x,
 		y: point2.y - point1.y
@@ -5462,13 +5624,13 @@ ORYX.Core.Math.getVector = function(point1, point2){
  * @param {point} point1
  * @param {point} point2
  */
-ORYX.Core.Math.getIdentityVector = function(vector){
+ORYX.Core.Math.getIdentityVector = function (vector) {
 
-	if (arguments.length == 2){
+	if (arguments.length == 2) {
 		vector = ORYX.Core.Math.getVector(arguments[0], arguments[1]);
 	}
 
-	var length = Math.sqrt((vector.x*vector.x)+(vector.y*vector.y))
+	var length = Math.sqrt((vector.x * vector.x) + (vector.y * vector.y))
 	return {
 		x: vector.x / (length || 1),
 		y: vector.y / (length || 1)
@@ -5476,7 +5638,7 @@ ORYX.Core.Math.getIdentityVector = function(vector){
 }
 
 
-ORYX.Core.Math.getOrthogonalIdentityVector = function(point1, point2){
+ORYX.Core.Math.getOrthogonalIdentityVector = function (point1, point2) {
 	var vec = arguments.length == 1 ? point1 : ORYX.Core.Math.getIdentityVector(point1, point2);
 	return {
 		x: vec.y,
@@ -5490,35 +5652,35 @@ ORYX.Core.Math.getOrthogonalIdentityVector = function(point1, point2){
  * orthogonal to the given line.
  *
  *  @param {float} lineP1
- *  	The starting point of the line segment
+ *    The starting point of the line segment
  *  @param {float} lineP2
- *  	The end point of the line segment
+ *    The end point of the line segment
  *  @param {Point} point
- *  	The point to calculate the distance to.
+ *    The point to calculate the distance to.
  *  @param {boolean} onSegmentOnly
- *  	Flag to signal if only the segment of the line shell be evaluated.
+ *    Flag to signal if only the segment of the line shell be evaluated.
  */
-ORYX.Core.Math.getPointOfIntersectionPointLine = function(
-													lineP1,
-													lineP2,
-													point,
-													onSegmentOnly) {
+ORYX.Core.Math.getPointOfIntersectionPointLine = function (
+	lineP1,
+	lineP2,
+	point,
+	onSegmentOnly) {
 
 	/*
 	 * [P3 - P1 - u(P2 - P1)] dot (P2 - P1) = 0
 	 * u =((x3-x1)(x2-x1)+(y3-y1)(y2-y1))/(p2-p1)??
 	 */
 	var denominator = Math.pow(lineP2.x - lineP1.x, 2)
-						+ Math.pow(lineP2.y - lineP1.y, 2);
-	if(denominator == 0) {
+		+ Math.pow(lineP2.y - lineP1.y, 2);
+	if (denominator == 0) {
 		return undefined;
 	}
 
 	var u = ((point.x - lineP1.x) * (lineP2.x - lineP1.x)
 			+ (point.y - lineP1.y) * (lineP2.y - lineP1.y))
-			/ denominator;
+		/ denominator;
 
-	if(onSegmentOnly) {
+	if (onSegmentOnly) {
 		if (!(0 <= u && u <= 1)) {
 			return undefined;
 		}
@@ -5537,10 +5699,10 @@ ORYX.Core.Math.getPointOfIntersectionPointLine = function(
  * @param {Matrix} matrix
  * @return {Object} Includes x, y
  */
-ORYX.Core.Math.getTranslatedPoint = function(point, matrix){
-	var x = matrix.a*point.x+matrix.c*point.y+matrix.e*1;
-	var y = matrix.b*point.x+matrix.d*point.y+matrix.f*1;
-    return {x:x, y:y}
+ORYX.Core.Math.getTranslatedPoint = function (point, matrix) {
+	var x = matrix.a * point.x + matrix.c * point.y + matrix.e * 1;
+	var y = matrix.b * point.x + matrix.d * point.y + matrix.f * 1;
+	return {x: x, y: y}
 }
 
 
@@ -5549,7 +5711,7 @@ ORYX.Core.Math.getTranslatedPoint = function(point, matrix){
  * @param {SVGTransformationMatrix} matrix
  * @return {Matrix}
  */
-ORYX.Core.Math.getInverseMatrix = function(matrix){
+ORYX.Core.Math.getInverseMatrix = function (matrix) {
 
 	var det = ORYX.Core.Math.getDeterminant(matrix), m = matrix;
 	// +-     -+
@@ -5558,12 +5720,12 @@ ORYX.Core.Math.getInverseMatrix = function(matrix){
 	// | 0 0 1 |
 	// +-     -+
 	return {
-		a: det * ((m.d*1)-(m.f*0)),
-		b: det * ((m.f*0)-(m.b*1)),
-		c: det * ((m.e*0)-(m.c*1)),
-		d: det * ((m.a*1)-(m.e*0)),
-		e: det * ((m.c*m.f)-(m.e*m.d)),
-		f: det * ((m.e*m.b)-(m.a*m.f))
+		a: det * ((m.d * 1) - (m.f * 0)),
+		b: det * ((m.f * 0) - (m.b * 1)),
+		c: det * ((m.e * 0) - (m.c * 1)),
+		d: det * ((m.a * 1) - (m.e * 0)),
+		e: det * ((m.c * m.f) - (m.e * m.d)),
+		f: det * ((m.e * m.b) - (m.a * m.f))
 	}
 }
 
@@ -5573,9 +5735,9 @@ ORYX.Core.Math.getInverseMatrix = function(matrix){
  * @return {Number}
  *
  */
-ORYX.Core.Math.getDeterminant = function(m){
+ORYX.Core.Math.getDeterminant = function (m) {
 	// a11a22a33+a12a23a31+a13a21a32-a13a22a31-a12a21a33-a11a23a32
-	return (m.a*m.d*1)+(m.c*m.f*0)+(m.e*m.b*0)-(m.e*m.d*0)-(m.c*m.b*1)-(m.a*m.f*0);
+	return (m.a * m.d * 1) + (m.c * m.f * 0) + (m.e * m.b * 0) - (m.e * m.d * 0) - (m.c * m.b * 1) - (m.a * m.f * 0);
 }
 
 /**
@@ -5584,27 +5746,27 @@ ORYX.Core.Math.getDeterminant = function(m){
  * @param {SVGElement} node
  * @return {Object} Includes x, y, width, height
  */
-ORYX.Core.Math.getTranslatedBoundingBox = function(node){
+ORYX.Core.Math.getTranslatedBoundingBox = function (node) {
 	var matrix = node.getCTM();
 	var bb = node.getBBox();
-	var ul = ORYX.Core.Math.getTranslatedPoint({x:bb.x, y:bb.y}, matrix);
-	var ll = ORYX.Core.Math.getTranslatedPoint({x:bb.x, y:bb.y+bb.height}, matrix);
-	var ur = ORYX.Core.Math.getTranslatedPoint({x:bb.x+bb.width, y:bb.y}, matrix);
-	var lr = ORYX.Core.Math.getTranslatedPoint({x:bb.x+bb.width, y:bb.y+bb.height}, matrix);
+	var ul = ORYX.Core.Math.getTranslatedPoint({x: bb.x, y: bb.y}, matrix);
+	var ll = ORYX.Core.Math.getTranslatedPoint({x: bb.x, y: bb.y + bb.height}, matrix);
+	var ur = ORYX.Core.Math.getTranslatedPoint({x: bb.x + bb.width, y: bb.y}, matrix);
+	var lr = ORYX.Core.Math.getTranslatedPoint({x: bb.x + bb.width, y: bb.y + bb.height}, matrix);
 
 	var minPoint = {
-	    x: Math.min(ul.x, ll.x, ur.x, lr.x),
-	    y: Math.min(ul.y, ll.y, ur.y, lr.y)
+		x: Math.min(ul.x, ll.x, ur.x, lr.x),
+		y: Math.min(ul.y, ll.y, ur.y, lr.y)
 	}
 	var maxPoint = {
-	    x: Math.max(ul.x, ll.x, ur.x, lr.x),
-	    y: Math.max(ul.y, ll.y, ur.y, lr.y)
+		x: Math.max(ul.x, ll.x, ur.x, lr.x),
+		y: Math.max(ul.y, ll.y, ur.y, lr.y)
 	}
 	return {
-	    x: minPoint.x,
-	    y: minPoint.y,
-	    width: maxPoint.x - minPoint.x,
-	    height: maxPoint.y - minPoint.y
+		x: minPoint.x,
+		y: minPoint.y,
+		width: maxPoint.x - minPoint.x,
+		height: maxPoint.y - minPoint.y
 	}
 };
 
@@ -5615,19 +5777,19 @@ ORYX.Core.Math.getTranslatedBoundingBox = function(node){
  * @param {Point} p2
  * @return {Number} 0 <= x <= 359.99999
  */
-ORYX.Core.Math.getAngle = function(p1, p2){
-	if(p1.x == p2.x && p1.y == p2.y)
+ORYX.Core.Math.getAngle = function (p1, p2) {
+	if (p1.x == p2.x && p1.y == p2.y)
 		return 0;
 
-	var angle = Math.asin(Math.sqrt(Math.pow(p1.y-p2.y, 2))
-				/(Math.sqrt(Math.pow(p2.x-p1.x, 2)+Math.pow(p1.y-p2.y, 2))))
-				*180/Math.PI;
+	var angle = Math.asin(Math.sqrt(Math.pow(p1.y - p2.y, 2))
+			/ (Math.sqrt(Math.pow(p2.x - p1.x, 2) + Math.pow(p1.y - p2.y, 2))))
+		* 180 / Math.PI;
 
-	if(p2.x >= p1.x && p2.y <= p1.y)
+	if (p2.x >= p1.x && p2.y <= p1.y)
 		return angle;
-	else if(p2.x < p1.x && p2.y <= p1.y)
+	else if (p2.x < p1.x && p2.y <= p1.y)
 		return 180 - angle;
-	else if(p2.x < p1.x && p2.y > p1.y)
+	else if (p2.x < p1.x && p2.y > p1.y)
 		return 180 + angle;
 	else
 		return 360 - angle;
@@ -5637,20 +5799,20 @@ ORYX.Core.Math.getAngle = function(p1, p2){
 /**
  * Implementation of the cohen-sutherland algorithm
  */
-new function(){
+new function () {
 
-	var RIGHT = 2, TOP = 8,  BOTTOM = 4, LEFT = 1;
+	var RIGHT = 2, TOP = 8, BOTTOM = 4, LEFT = 1;
 
- 	function computeOutCode (x, y, xmin, ymin, xmax, ymax) {
+	function computeOutCode(x, y, xmin, ymin, xmax, ymax) {
 		var code = 0;
 		if (y > ymax)
-		    code |= TOP;
+			code |= TOP;
 		else if (y < ymin)
-		    code |= BOTTOM;
+			code |= BOTTOM;
 		if (x > xmax)
-		    code |= RIGHT;
+			code |= RIGHT;
 		else if (x < xmin)
-		    code |= LEFT;
+			code |= LEFT;
 		return code;
 	}
 
@@ -5665,7 +5827,7 @@ new function(){
 	 * @param {Object} xmax Point B of the rectangle
 	 * @param {Object} ymax
 	 */
-	ORYX.Core.Math.isRectOverLine = function(x1, y1, x2, y2, xmin, ymin, xmax, ymax){
+	ORYX.Core.Math.isRectOverLine = function (x1, y1, x2, y2, xmin, ymin, xmax, ymax) {
 		return !!ORYX.Core.Math.clipLineOnRect.apply(ORYX.Core.Math, arguments);
 	}
 
@@ -5682,63 +5844,63 @@ new function(){
 	 * @param {Object} xmax Point B of the rectangle
 	 * @param {Object} ymax
 	 */
-	ORYX.Core.Math.clipLineOnRect = function(x1, y1, x2, y2, xmin, ymin, xmax, ymax){
-        //Outcodes for P0, P1, and whatever point lies outside the clip rectangle
-        var outcode0, outcode1, outcodeOut, hhh = 0;
-        var accept = false, done = false;
-
-        //compute outcodes
-        outcode0 = computeOutCode(x1, y1, xmin, ymin, xmax, ymax);
-        outcode1 = computeOutCode(x2, y2, xmin, ymin, xmax, ymax);
-
-        do {
-            if ((outcode0 | outcode1) == 0 ){
-                accept = true;
-                done = true;
-            } else if ( (outcode0 & outcode1) > 0 ) {
-                done = true;
-            } else {
-                //failed both tests, so calculate the line segment to clip
-                //from an outside point to an intersection with clip edge
-                var x = 0, y = 0;
-                //At least one endpoint is outside the clip rectangle; pick it.
-                outcodeOut = outcode0 != 0 ? outcode0: outcode1;
-                //Now find the intersection point;
-                //use formulas y = y0 + slope * (x - x0), x = x0 + (1/slope)* (y - y0)
-                if ( (outcodeOut & TOP) > 0 ) {
-                    x = x1 + (x2 - x1) * (ymax - y1)/(y2 - y1);
-                    y = ymax;
-                } else if ((outcodeOut & BOTTOM) > 0 ) {
-                    x = x1 + (x2 - x1) * (ymin - y1)/(y2 - y1);
-                    y = ymin;
-                } else if ((outcodeOut & RIGHT)> 0) {
-                    y = y1 + (y2 - y1) * (xmax - x1)/(x2 - x1);
-                    x = xmax;
-                } else if ((outcodeOut & LEFT) > 0) {
-                    y = y1 + (y2 - y1) * (xmin - x1)/(x2 - x1);
-                    x = xmin;
-                }
+	ORYX.Core.Math.clipLineOnRect = function (x1, y1, x2, y2, xmin, ymin, xmax, ymax) {
+		//Outcodes for P0, P1, and whatever point lies outside the clip rectangle
+		var outcode0, outcode1, outcodeOut, hhh = 0;
+		var accept = false, done = false;
 
-                //Now we move outside point to intersection point to clip
-                //and get ready for next pass.
-                if (outcodeOut == outcode0) {
-                    x1 = x;
-                    y1 = y;
-                    outcode0 = computeOutCode (x1, y1, xmin, ymin, xmax, ymax);
-                } else {
-                    x2 = x;
-                    y2 = y;
-                    outcode1 = computeOutCode (x2, y2, xmin, ymin, xmax, ymax);
-                }
-            }
-            hhh ++;
-        } while (done  != true && hhh < 5000);
+		//compute outcodes
+		outcode0 = computeOutCode(x1, y1, xmin, ymin, xmax, ymax);
+		outcode1 = computeOutCode(x2, y2, xmin, ymin, xmax, ymax);
 
-        if(accept) {
-            return {a:{x:x1, y:y1}, b:{x:x2, y:y2}};
-        }
+		do {
+			if ((outcode0 | outcode1) == 0) {
+				accept = true;
+				done = true;
+			} else if ((outcode0 & outcode1) > 0) {
+				done = true;
+			} else {
+				//failed both tests, so calculate the line segment to clip
+				//from an outside point to an intersection with clip edge
+				var x = 0, y = 0;
+				//At least one endpoint is outside the clip rectangle; pick it.
+				outcodeOut = outcode0 != 0 ? outcode0 : outcode1;
+				//Now find the intersection point;
+				//use formulas y = y0 + slope * (x - x0), x = x0 + (1/slope)* (y - y0)
+				if ((outcodeOut & TOP) > 0) {
+					x = x1 + (x2 - x1) * (ymax - y1) / (y2 - y1);
+					y = ymax;
+				} else if ((outcodeOut & BOTTOM) > 0) {
+					x = x1 + (x2 - x1) * (ymin - y1) / (y2 - y1);
+					y = ymin;
+				} else if ((outcodeOut & RIGHT) > 0) {
+					y = y1 + (y2 - y1) * (xmax - x1) / (x2 - x1);
+					x = xmax;
+				} else if ((outcodeOut & LEFT) > 0) {
+					y = y1 + (y2 - y1) * (xmin - x1) / (x2 - x1);
+					x = xmin;
+				}
+
+				//Now we move outside point to intersection point to clip
+				//and get ready for next pass.
+				if (outcodeOut == outcode0) {
+					x1 = x;
+					y1 = y;
+					outcode0 = computeOutCode(x1, y1, xmin, ymin, xmax, ymax);
+				} else {
+					x2 = x;
+					y2 = y;
+					outcode1 = computeOutCode(x2, y2, xmin, ymin, xmax, ymax);
+				}
+			}
+			hhh++;
+		} while (done != true && hhh < 5000);
+
+		if (accept) {
+			return {a: {x: x1, y: y1}, b: {x: x2, y: y2}};
+		}
 		return null;
-    }
+	}
 }();
 
 
@@ -5755,9 +5917,15 @@ new function(){
 /**
  * Init namespace
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
-if(!ORYX.Core.StencilSet) {ORYX.Core.StencilSet = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
+if (!ORYX.Core.StencilSet) {
+	ORYX.Core.StencilSet = {};
+}
 
 /**
  * Class Stencil
@@ -5771,14 +5939,14 @@ ORYX.Core.StencilSet.Stencil = {
 	/**
 	 * Constructor
 	 */
-	construct: function(jsonStencil, namespace, source, stencilSet, propertyPackages, defaultPosition) {
+	construct: function (jsonStencil, namespace, source, stencilSet, propertyPackages, defaultPosition) {
 		arguments.callee.$.construct.apply(this, arguments); // super();
 
 		// check arguments and set defaults.
-		if(!jsonStencil) throw "Stencilset seems corrupt.";
-		if(!namespace) throw "Stencil does not provide namespace.";
-		if(!source) throw "Stencil does not provide SVG source.";
-		if(!stencilSet) throw "Fatal internal error loading stencilset.";
+		if (!jsonStencil) throw "Stencilset seems corrupt.";
+		if (!namespace) throw "Stencil does not provide namespace.";
+		if (!source) throw "Stencil does not provide SVG source.";
+		if (!stencilSet) throw "Fatal internal error loading stencilset.";
 		//if(!propertyPackages) throw "Fatal internal error loading stencilset.";
 
 		this._source = source;
@@ -5787,7 +5955,7 @@ ORYX.Core.StencilSet.Stencil = {
 		this._namespace = namespace;
 		this._propertyPackages = propertyPackages;
 
-		if(defaultPosition && !this._jsonStencil.position)
+		if (defaultPosition && !this._jsonStencil.position)
 			this._jsonStencil.position = defaultPosition;
 
 		this._view;
@@ -5811,25 +5979,32 @@ ORYX.Core.StencilSet.Stencil = {
 		}*/
 
 		//init all JSON values
-		if(!this._jsonStencil.type || !(this._jsonStencil.type === "edge" || this._jsonStencil.type === "node")) {
+		if (!this._jsonStencil.type || !(this._jsonStencil.type === "edge" || this._jsonStencil.type === "node")) {
 			throw "ORYX.Core.StencilSet.Stencil(construct): Type is not defined.";
 		}
-		if(!this._jsonStencil.id || this._jsonStencil.id === "") {
+		if (!this._jsonStencil.id || this._jsonStencil.id === "") {
 			throw "ORYX.Core.StencilSet.Stencil(construct): Id is not defined.";
 		}
-		if(!this._jsonStencil.title || this._jsonStencil.title === "") {
+		if (!this._jsonStencil.title || this._jsonStencil.title === "") {
 			throw "ORYX.Core.StencilSet.Stencil(construct): Title is not defined.";
 		}
 
-		if(!this._jsonStencil.description) { this._jsonStencil.description = ""; };
-		if(!this._jsonStencil.groups) { this._jsonStencil.groups = []; }
-		if(!this._jsonStencil.roles) { this._jsonStencil.roles = []; }
+		if (!this._jsonStencil.description) {
+			this._jsonStencil.description = "";
+		}
+		;
+		if (!this._jsonStencil.groups) {
+			this._jsonStencil.groups = [];
+		}
+		if (!this._jsonStencil.roles) {
+			this._jsonStencil.roles = [];
+		}
 
 		//add id of stencil to its roles
 		this._jsonStencil.roles.push(this._jsonStencil.id);
 
 		//prepend namespace to each role
-		this._jsonStencil.roles.each((function(role, index) {
+		this._jsonStencil.roles.each((function (role, index) {
 			this._jsonStencil.roles[index] = namespace + role;
 		}).bind(this));
 
@@ -5842,19 +6017,19 @@ ORYX.Core.StencilSet.Stencil = {
 		this.postProcessProperties();
 
 		// init serialize callback
-		if(!this._jsonStencil.serialize) {
+		if (!this._jsonStencil.serialize) {
 			this._jsonStencil.serialize = {};
 			//this._jsonStencil.serialize = function(shape, data) { return data;};
 		}
 
 		// init deserialize callback
-		if(!this._jsonStencil.deserialize) {
+		if (!this._jsonStencil.deserialize) {
 			this._jsonStencil.deserialize = {};
 			//this._jsonStencil.deserialize = function(shape, data) { return data;};
 		}
 
 		// init layout callback
-		if(!this._jsonStencil.layout) {
+		if (!this._jsonStencil.layout) {
 			this._jsonStencil.layout = []
 			//this._jsonStencil.layout = function() {return true;}
 		}
@@ -5864,12 +6039,12 @@ ORYX.Core.StencilSet.Stencil = {
 		var url = source + "view/" + jsonStencil.view;
 		// override content type when this is webkit.
 
-		if(this._jsonStencil.view.trim().match(/</)) {
-			var parser	= new DOMParser();
-			var xml 	= parser.parseFromString( this._jsonStencil.view ,"text/xml");
+		if (this._jsonStencil.view.trim().match(/</)) {
+			var parser = new DOMParser();
+			var xml = parser.parseFromString(this._jsonStencil.view, "text/xml");
 
 			//check if result is a SVG document
-			if( ORYX.Editor.checkClassType( xml.documentElement, SVGSVGElement )) {
+			if (ORYX.Editor.checkClassType(xml.documentElement, SVGSVGElement)) {
 
 				this._view = xml.documentElement;
 
@@ -5879,23 +6054,23 @@ ORYX.Core.StencilSet.Stencil = {
 		} else {
 			new Ajax.Request(
 				url, {
-					asynchronous:false, method:'get',
-					onSuccess:this._loadSVGOnSuccess.bind(this),
-					onFailure:this._loadSVGOnFailure.bind(this)
-			});
+					asynchronous: false, method: 'get',
+					onSuccess: this._loadSVGOnSuccess.bind(this),
+					onFailure: this._loadSVGOnFailure.bind(this)
+				});
 		}
 	},
 
-	postProcessProperties: function() {
+	postProcessProperties: function () {
 
 		// init property packages
-		if(this._jsonStencil.propertyPackages && this._jsonStencil.propertyPackages instanceof Array) {
+		if (this._jsonStencil.propertyPackages && this._jsonStencil.propertyPackages instanceof Array) {
 
-			this._jsonStencil.propertyPackages.each((function(ppId) {
+			this._jsonStencil.propertyPackages.each((function (ppId) {
 				var pp = this._propertyPackages[ppId];
 
-				if(pp) {
-					pp.each((function(prop){
+				if (pp) {
+					pp.each((function (prop) {
 						var oProp = new ORYX.Core.StencilSet.Property(prop, this._namespace, this);
 						this._properties[oProp.prefix() + "-" + oProp.id()] = oProp;
 
@@ -5905,8 +6080,8 @@ ORYX.Core.StencilSet.Stencil = {
 		}
 
 		// init properties
-		if(this._jsonStencil.properties && this._jsonStencil.properties instanceof Array) {
-			this._jsonStencil.properties.each((function(prop) {
+		if (this._jsonStencil.properties && this._jsonStencil.properties instanceof Array) {
+			this._jsonStencil.properties.each((function (prop) {
 				var oProp = new ORYX.Core.StencilSet.Property(prop, this._namespace, this);
 				this._properties[oProp.prefix() + "-" + oProp.id()] = oProp;
 			}).bind(this));
@@ -5918,91 +6093,91 @@ ORYX.Core.StencilSet.Stencil = {
 	 * @param {ORYX.Core.StencilSet.Stencil} stencil
 	 * @return {Boolean} True, if stencil has the same namespace and type.
 	 */
-	equals: function(stencil) {
+	equals: function (stencil) {
 		return (this.id() === stencil.id());
 	},
 
-	stencilSet: function() {
+	stencilSet: function () {
 		return this._stencilSet;
 	},
 
-	type: function() {
+	type: function () {
 		return this._jsonStencil.type;
 	},
 
-	namespace: function() {
+	namespace: function () {
 		return this._namespace;
 	},
 
-	id: function() {
+	id: function () {
 		return this._jsonStencil.id;
 	},
 
-    idWithoutNs: function(){
-        return this.id().replace(this.namespace(),"");
-    },
+	idWithoutNs: function () {
+		return this.id().replace(this.namespace(), "");
+	},
 
-	title: function() {
+	title: function () {
 		return ORYX.Core.StencilSet.getTranslation(this._jsonStencil, "title");
 	},
 
-	description: function() {
+	description: function () {
 		return ORYX.Core.StencilSet.getTranslation(this._jsonStencil, "description");
 	},
 
-	groups: function() {
+	groups: function () {
 		return ORYX.Core.StencilSet.getTranslation(this._jsonStencil, "groups");
 	},
 
-	position: function() {
+	position: function () {
 		return (isNaN(this._jsonStencil.position) ? 0 : this._jsonStencil.position);
 	},
 
-	view: function() {
+	view: function () {
 		return this._view.cloneNode(true) || this._view;
 	},
 
-	icon: function() {
+	icon: function () {
 		return this._jsonStencil.icon;
 	},
 
-	fixedAspectRatio: function() {
+	fixedAspectRatio: function () {
 		return this._jsonStencil.fixedAspectRatio === true;
 	},
 
-	hasMultipleRepositoryEntries: function() {
+	hasMultipleRepositoryEntries: function () {
 		return (this.getRepositoryEntries().length > 0);
 	},
 
-	getRepositoryEntries: function() {
+	getRepositoryEntries: function () {
 		return (this._jsonStencil.repositoryEntries) ?
 			$A(this._jsonStencil.repositoryEntries) : $A([]);
 	},
 
-	properties: function() {
+	properties: function () {
 		return this._properties.values();
 	},
 
-	property: function(id) {
+	property: function (id) {
 		return this._properties[id];
 	},
 
-	roles: function() {
+	roles: function () {
 		return this._jsonStencil.roles;
 	},
 
-	defaultAlign: function() {
-		if(!this._jsonStencil.defaultAlign)
+	defaultAlign: function () {
+		if (!this._jsonStencil.defaultAlign)
 			return "east";
 		return this._jsonStencil.defaultAlign;
 	},
 
-	serialize: function(shape, data) {
+	serialize: function (shape, data) {
 		return this._jsonStencil.serialize;
 		//return this._jsonStencil.serialize(shape, data);
 	},
 
-	deserialize: function(shape, data) {
+	deserialize: function (shape, data) {
 		return this._jsonStencil.deserialize;
 		//return this._jsonStencil.deserialize(shape, data);
 	},
@@ -6012,28 +6187,28 @@ ORYX.Core.StencilSet.Stencil = {
 //		return this._jsonStencil.layout(shape, targetShape);
 //	},
 	// layout property to store events for layouting in plugins
-	layout: function(shape) {
+	layout: function (shape) {
 		return this._jsonStencil.layout
 	},
 
-	addProperty: function(property, namespace) {
-		if(property && namespace) {
+	addProperty: function (property, namespace) {
+		if (property && namespace) {
 			var oProp = new ORYX.Core.StencilSet.Property(property, namespace, this);
 			this._properties[oProp.prefix() + "-" + oProp.id()] = oProp;
 		}
 	},
 
-	removeProperty: function(propertyId) {
-		if(propertyId) {
-			var oProp = this._properties.values().find(function(prop) {
+	removeProperty: function (propertyId) {
+		if (propertyId) {
+			var oProp = this._properties.values().find(function (prop) {
 				return (propertyId == prop.id());
 			});
-			if(oProp)
+			if (oProp)
 				delete this._properties[oProp.prefix() + "-" + oProp.id()];
 		}
 	},
 
-	_loadSVGOnSuccess: function(result) {
+	_loadSVGOnSuccess: function (result) {
 
 		var xml = null;
 
@@ -6047,16 +6222,16 @@ ORYX.Core.StencilSet.Stencil = {
 		// responseXML != undefined.
 		// if(!(result.responseXML))
 
-			// get the dom by data: url.
-			// xml = _evenMoreEvilHack(result.responseText, 'text/xml');
+		// get the dom by data: url.
+		// xml = _evenMoreEvilHack(result.responseText, 'text/xml');
 
 		// else
 
-			// get it the usual way.
-			xml = result.responseXML;
+		// get it the usual way.
+		xml = result.responseXML;
 
 		//check if result is a SVG document
-		if( ORYX.Editor.checkClassType( xml.documentElement, SVGSVGElement )) {
+		if (ORYX.Editor.checkClassType(xml.documentElement, SVGSVGElement)) {
 
 			this._view = xml.documentElement;
 
@@ -6065,11 +6240,13 @@ ORYX.Core.StencilSet.Stencil = {
 		}
 	},
 
-	_loadSVGOnFailure: function(result) {
+	_loadSVGOnFailure: function (result) {
 		throw "ORYX.Core.StencilSet.Stencil(_loadSVGOnFailure): Loading SVG document failed."
 	},
 
-	toString: function() { return "Stencil " + this.title() + " (" + this.id() + ")"; }
+	toString: function () {
+		return "Stencil " + this.title() + " (" + this.id() + ")";
+	}
 };
 
 ORYX.Core.StencilSet.Stencil = Clazz.extend(ORYX.Core.StencilSet.Stencil);
@@ -6094,7 +6271,7 @@ function _evenMoreEvilHack(str, contentType) {
 	} else if (window.XMLHttpRequest) {
 		var req = new XMLHttpRequest;
 		req.open("GET", "data:" + (contentType || "application/xml") +
-						";charset=utf-8," + encodeURIComponent(str), false);
+			";charset=utf-8," + encodeURIComponent(str), false);
 		if (req.overrideMimeType) {
 			req.overrideMimeType(contentType);
 		}
@@ -6127,12 +6304,15 @@ function _evilSafariHack(serializedXML) {
 	// your standard AJAX stuff
 	var req = new XMLHttpRequest();
 	req.open("GET", url);
-	req.onload = function() { dom = req.responseXML; }
+	req.onload = function () {
+		dom = req.responseXML;
+	}
 	req.send(null);
 
 	return dom;
 }
-	/*
+
+/*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
  * License rights for this program may be obtained from Alfresco Software, Ltd.
  * pursuant to a written agreement and any use of this program without such an
@@ -6146,13 +6326,13 @@ function _evilSafariHack(serializedXML) {
  * Init namespace
  */
 if (!ORYX) {
-    var ORYX = {};
+	var ORYX = {};
 }
 if (!ORYX.Core) {
-    ORYX.Core = {};
+	ORYX.Core = {};
 }
 if (!ORYX.Core.StencilSet) {
-    ORYX.Core.StencilSet = {};
+	ORYX.Core.StencilSet = {};
 }
 
 /**
@@ -6162,70 +6342,68 @@ if (!ORYX.Core.StencilSet) {
  */
 ORYX.Core.StencilSet.Property = Clazz.extend({
 
-    /**
-     * Constructor
-     */
-    construct: function(jsonProp, namespace, stencil){
-        arguments.callee.$.construct.apply(this, arguments);
+	/**
+	 * Constructor
+	 */
+	construct: function (jsonProp, namespace, stencil) {
+		arguments.callee.$.construct.apply(this, arguments);
 
-        this._jsonProp = jsonProp || ORYX.Log.error("Parameter jsonProp is not defined.");
-        this._namespace = namespace || ORYX.Log.error("Parameter namespace is not defined.");
-        this._stencil = stencil || ORYX.Log.error("Parameter stencil is not defined.");
+		this._jsonProp = jsonProp || ORYX.Log.error("Parameter jsonProp is not defined.");
+		this._namespace = namespace || ORYX.Log.error("Parameter namespace is not defined.");
+		this._stencil = stencil || ORYX.Log.error("Parameter stencil is not defined.");
 
-        this._items = {};
-        this._complexItems = {};
+		this._items = {};
+		this._complexItems = {};
 
-	    // Flag to indicate whether or not the property should be hidden
-	    // This can be for example when the stencil set is upgraded, but the model
-        // has a value for that specific property filled in which we still want to show.
-        // If the value is missing, the property can simply be not shown.
-        this._hidden = false;
+		// Flag to indicate whether or not the property should be hidden
+		// This can be for example when the stencil set is upgraded, but the model
+		// has a value for that specific property filled in which we still want to show.
+		// If the value is missing, the property can simply be not shown.
+		this._hidden = false;
 
-        jsonProp.id = jsonProp.id || ORYX.Log.error("ORYX.Core.StencilSet.Property(construct): Id is not defined.");
+		jsonProp.id = jsonProp.id || ORYX.Log.error("ORYX.Core.StencilSet.Property(construct): Id is not defined.");
 		jsonProp.id = jsonProp.id.toLowerCase();
 
-        if (!jsonProp.type) {
-            ORYX.Log.info("Type is not defined for stencil '%0', id '%1'. Falling back to 'String'.", stencil, jsonProp.id);
-            jsonProp.type = "string";
-        }
-        else {
-            jsonProp.type = jsonProp.type.toLowerCase();
-        }
+		if (!jsonProp.type) {
+			ORYX.Log.info("Type is not defined for stencil '%0', id '%1'. Falling back to 'String'.", stencil, jsonProp.id);
+			jsonProp.type = "string";
+		} else {
+			jsonProp.type = jsonProp.type.toLowerCase();
+		}
 
-        jsonProp.prefix = jsonProp.prefix || "oryx";
-        jsonProp.title = jsonProp.title || "";
-        jsonProp.value = jsonProp.value || "";
-        jsonProp.description = jsonProp.description || "";
-        jsonProp.readonly = jsonProp.readonly || false;
-        jsonProp.optional = jsonProp.optional !== false;
-
-        //init refToView
-        if (this._jsonProp.refToView) {
-            if (!(this._jsonProp.refToView instanceof Array)) {
-                this._jsonProp.refToView = [this._jsonProp.refToView];
-            }
-        }
-        else {
-            this._jsonProp.refToView = [];
-        }
+		jsonProp.prefix = jsonProp.prefix || "oryx";
+		jsonProp.title = jsonProp.title || "";
+		jsonProp.value = jsonProp.value || "";
+		jsonProp.description = jsonProp.description || "";
+		jsonProp.readonly = jsonProp.readonly || false;
+		jsonProp.optional = jsonProp.optional !== false;
+
+		//init refToView
+		if (this._jsonProp.refToView) {
+			if (!(this._jsonProp.refToView instanceof Array)) {
+				this._jsonProp.refToView = [this._jsonProp.refToView];
+			}
+		} else {
+			this._jsonProp.refToView = [];
+		}
 
 		var globalMin = this.getMinForType(jsonProp.type);
-        if (jsonProp.min === undefined || jsonProp.min === null) {
-            jsonProp.min =globalMin;
-        } else if (jsonProp.min < globalMin) {
+		if (jsonProp.min === undefined || jsonProp.min === null) {
+			jsonProp.min = globalMin;
+		} else if (jsonProp.min < globalMin) {
 			jsonProp.min = globalMin;
 		}
 
 		var globalMax = this.getMaxForType(jsonProp.type);
-        if (jsonProp.max === undefined || jsonProp.max === null) {
-            jsonProp.max = globalMax;
-        } else if (jsonProp.max > globalMax) {
+		if (jsonProp.max === undefined || jsonProp.max === null) {
+			jsonProp.max = globalMax;
+		} else if (jsonProp.max > globalMax) {
 			jsonProp.min = globalMax;
 		}
 
-        if (!jsonProp.fillOpacity) {
-            jsonProp.fillOpacity = false;
-        }
+		if (!jsonProp.fillOpacity) {
+			jsonProp.fillOpacity = false;
+		}
 
 		if ("number" != typeof jsonProp.lightness) {
 			jsonProp.lightness = 1;
@@ -6233,51 +6411,51 @@ ORYX.Core.StencilSet.Property = Clazz.extend({
 			jsonProp.lightness = Math.max(0, Math.min(1, jsonProp.lightness));
 		}
 
-        if (!jsonProp.strokeOpacity) {
-            jsonProp.strokeOpacity = false;
-        }
+		if (!jsonProp.strokeOpacity) {
+			jsonProp.strokeOpacity = false;
+		}
 
-        if (jsonProp.length === undefined || jsonProp.length === null) {
-            jsonProp.length = Number.MAX_VALUE;
-        }
+		if (jsonProp.length === undefined || jsonProp.length === null) {
+			jsonProp.length = Number.MAX_VALUE;
+		}
 
-        if (!jsonProp.wrapLines) {
-            jsonProp.wrapLines = false;
-        }
+		if (!jsonProp.wrapLines) {
+			jsonProp.wrapLines = false;
+		}
 
-        if (!jsonProp.dateFormat) {
-            jsonProp.dateFormat = ORYX.I18N.PropertyWindow.dateFormat || "m/d/y";
-        }
+		if (!jsonProp.dateFormat) {
+			jsonProp.dateFormat = ORYX.I18N.PropertyWindow.dateFormat || "m/d/y";
+		}
 
-        if (!jsonProp.fill) {
-            jsonProp.fill = false;
-        }
+		if (!jsonProp.fill) {
+			jsonProp.fill = false;
+		}
 
-        if (!jsonProp.stroke) {
-            jsonProp.stroke = false;
-        }
+		if (!jsonProp.stroke) {
+			jsonProp.stroke = false;
+		}
 
-        if(!jsonProp.inverseBoolean) {
-        	jsonProp.inverseBoolean = false;
-        }
+		if (!jsonProp.inverseBoolean) {
+			jsonProp.inverseBoolean = false;
+		}
 
-		if(!jsonProp.directlyEditable && jsonProp.directlyEditable != false) {
-        	jsonProp.directlyEditable = true;
-        }
+		if (!jsonProp.directlyEditable && jsonProp.directlyEditable != false) {
+			jsonProp.directlyEditable = true;
+		}
 
-		if(jsonProp.visible !== false) {
+		if (jsonProp.visible !== false) {
 			jsonProp.visible = true;
 		}
 
-		if(jsonProp.isList !== true) {
+		if (jsonProp.isList !== true) {
 			jsonProp.isList = false;
 
-			if(!jsonProp.list || !(jsonProp.list instanceof Array)) {
+			if (!jsonProp.list || !(jsonProp.list instanceof Array)) {
 				jsonProp.list = [];
 			}
 		}
 
-		if(!jsonProp.category) {
+		if (!jsonProp.category) {
 			if (jsonProp.popular) {
 				jsonProp.category = "popular";
 			} else {
@@ -6285,218 +6463,215 @@ ORYX.Core.StencilSet.Property = Clazz.extend({
 			}
 		}
 
-		if(!jsonProp.alwaysAppearInMultiselect) {
+		if (!jsonProp.alwaysAppearInMultiselect) {
 			jsonProp.alwaysAppearInMultiselect = false;
 		}
 
-        if (jsonProp.type === ORYX.CONFIG.TYPE_CHOICE) {
-            if (jsonProp.items && jsonProp.items instanceof Array) {
-                jsonProp.items.each((function(jsonItem){
-                	// why is the item's value used as the key???
-                    this._items[jsonItem.value.toLowerCase()] = new ORYX.Core.StencilSet.PropertyItem(jsonItem, namespace, this);
-                }).bind(this));
-            }
-            else {
-                throw "ORYX.Core.StencilSet.Property(construct): No property items defined."
-            }
-            // extended by Kerstin (start)
-        }
-        else
-            if (jsonProp.type === ORYX.CONFIG.TYPE_COMPLEX || jsonProp.type == ORYX.CONFIG.TYPE_MULTIPLECOMPLEX) {
-                if (jsonProp.complexItems && jsonProp.complexItems instanceof Array) {
-                    jsonProp.complexItems.each((function(jsonComplexItem){
-                        this._complexItems[jsonComplexItem.id.toLowerCase()] = new ORYX.Core.StencilSet.ComplexPropertyItem(jsonComplexItem, namespace, this);
-                    }).bind(this));
-                }
-            }
-        // extended by Kerstin (end)
-    },
+		if (jsonProp.type === ORYX.CONFIG.TYPE_CHOICE) {
+			if (jsonProp.items && jsonProp.items instanceof Array) {
+				jsonProp.items.each((function (jsonItem) {
+					// why is the item's value used as the key???
+					this._items[jsonItem.value.toLowerCase()] = new ORYX.Core.StencilSet.PropertyItem(jsonItem, namespace, this);
+				}).bind(this));
+			} else {
+				throw "ORYX.Core.StencilSet.Property(construct): No property items defined."
+			}
+			// extended by Kerstin (start)
+		} else if (jsonProp.type === ORYX.CONFIG.TYPE_COMPLEX || jsonProp.type == ORYX.CONFIG.TYPE_MULTIPLECOMPLEX) {
+			if (jsonProp.complexItems && jsonProp.complexItems instanceof Array) {
+				jsonProp.complexItems.each((function (jsonComplexItem) {
+					this._complexItems[jsonComplexItem.id.toLowerCase()] = new ORYX.Core.StencilSet.ComplexPropertyItem(jsonComplexItem, namespace, this);
+				}).bind(this));
+			}
+		}
+		// extended by Kerstin (end)
+	},
 
-	getMinForType : function(type) {
+	getMinForType: function (type) {
 		if (type.toLowerCase() == ORYX.CONFIG.TYPE_INTEGER) {
-			return -Math.pow(2,31)
+			return -Math.pow(2, 31)
 		} else {
-			return -Number.MAX_VALUE+1;
+			return -Number.MAX_VALUE + 1;
 		}
 	},
-	getMaxForType : function(type) {
+	getMaxForType: function (type) {
 		if (type.toLowerCase() == ORYX.CONFIG.TYPE_INTEGER) {
-			return Math.pow(2,31)-1
+			return Math.pow(2, 31) - 1
 		} else {
 			return Number.MAX_VALUE;
 		}
 	},
 
-    /**
-     * @param {ORYX.Core.StencilSet.Property} property
-     * @return {Boolean} True, if property has the same namespace and id.
-     */
-    equals: function(property){
-        return (this._namespace === property.namespace() &&
-        this.id() === property.id()) ? true : false;
-    },
+	/**
+	 * @param {ORYX.Core.StencilSet.Property} property
+	 * @return {Boolean} True, if property has the same namespace and id.
+	 */
+	equals: function (property) {
+		return (this._namespace === property.namespace() &&
+			this.id() === property.id()) ? true : false;
+	},
 
-    namespace: function(){
-        return this._namespace;
-    },
+	namespace: function () {
+		return this._namespace;
+	},
 
-    stencil: function(){
-        return this._stencil;
-    },
+	stencil: function () {
+		return this._stencil;
+	},
 
-    id: function(){
-        return this._jsonProp.id;
-    },
+	id: function () {
+		return this._jsonProp.id;
+	},
 
-    prefix: function(){
-        return this._jsonProp.prefix;
-    },
+	prefix: function () {
+		return this._jsonProp.prefix;
+	},
 
-    type: function(){
-        return this._jsonProp.type;
-    },
+	type: function () {
+		return this._jsonProp.type;
+	},
 
-    inverseBoolean: function() {
-    	return this._jsonProp.inverseBoolean;
-    },
+	inverseBoolean: function () {
+		return this._jsonProp.inverseBoolean;
+	},
 
-	category: function() {
+	category: function () {
 		return this._jsonProp.category;
 	},
 
-	setCategory: function(value) {
+	setCategory: function (value) {
 		this._jsonProp.category = value;
 	},
 
-	directlyEditable: function() {
+	directlyEditable: function () {
 		return this._jsonProp.directlyEditable;
 	},
 
-	visible: function() {
+	visible: function () {
 		return this._jsonProp.visible;
 	},
 
-    title: function(){
-        return ORYX.Core.StencilSet.getTranslation(this._jsonProp, "title");
-    },
-
-    value: function(){
-        return this._jsonProp.value;
-    },
-
-    readonly: function(){
-        return this._jsonProp.readonly;
-    },
-
-    optional: function(){
-        return this._jsonProp.optional;
-    },
-
-    description: function(){
-        return ORYX.Core.StencilSet.getTranslation(this._jsonProp, "description");
-    },
-
-    /**
-     * An optional link to a SVG element so that the property affects the
-     * graphical representation of the stencil.
-     */
-    refToView: function(){
-        return this._jsonProp.refToView;
-    },
-
-    /**
-     * If type is integer or float, min is the lower bounds of value.
-     */
-    min: function(){
-        return this._jsonProp.min;
-    },
-
-    /**
-     * If type ist integer or float, max is the upper bounds of value.
-     */
-    max: function(){
-        return this._jsonProp.max;
-    },
-
-    /**
-     * If type is float, this method returns if the fill-opacity property should
-     *  be set.
-     *  @return {Boolean}
-     */
-    fillOpacity: function(){
-        return this._jsonProp.fillOpacity;
-    },
-
-    /**
-     * If type is float, this method returns if the stroke-opacity property should
-     *  be set.
-     *  @return {Boolean}
-     */
-    strokeOpacity: function(){
-        return this._jsonProp.strokeOpacity;
-    },
-
-    /**
-     * If type is string or richtext, length is the maximum length of the text.
-     * TODO how long can a string be.
-     */
-    length: function(){
-        return this._jsonProp.length ? this._jsonProp.length : Number.MAX_VALUE;
-    },
-
-    wrapLines: function(){
-        return this._jsonProp.wrapLines;
-    },
-
-    /**
-     * If type is date, dateFormat specifies the format of the date. The format
-     * specification of the ext library is used:
-     *
-     * Format  Output      Description
-     *	------  ----------  --------------------------------------------------------------
-     *	  d      10         Day of the month, 2 digits with leading zeros
-     *	  D      Wed        A textual representation of a day, three letters
-     *	  j      10         Day of the month without leading zeros
-     *	  l      Wednesday  A full textual representation of the day of the week
-     *	  S      th         English ordinal day of month suffix, 2 chars (use with j)
-     *	  w      3          Numeric representation of the day of the week
-     *	  z      9          The julian date, or day of the year (0-365)
-     *	  W      01         ISO-8601 2-digit week number of year, weeks starting on Monday (00-52)
-     *	  F      January    A full textual representation of the month
-     *	  m      01         Numeric representation of a month, with leading zeros
-     *	  M      Jan        Month name abbreviation, three letters
-     *	  n      1          Numeric representation of a month, without leading zeros
-     *	  t      31         Number of days in the given month
-     *	  L      0          Whether its a leap year (1 if it is a leap year, else 0)
-     *	  Y      2007       A full numeric representation of a year, 4 digits
-     *	  y      07         A two digit representation of a year
-     *	  a      pm         Lowercase Ante meridiem and Post meridiem
-     *	  A      PM         Uppercase Ante meridiem and Post meridiem
-     *	  g      3          12-hour format of an hour without leading zeros
-     *	  G      15         24-hour format of an hour without leading zeros
-     *	  h      03         12-hour format of an hour with leading zeros
-     *	  H      15         24-hour format of an hour with leading zeros
-     *	  i      05         Minutes with leading zeros
-     *	  s      01         Seconds, with leading zeros
-     *	  O      -0600      Difference to Greenwich time (GMT) in hours
-     *	  T      CST        Timezone setting of the machine running the code
-     *	  Z      -21600     Timezone offset in seconds (negative if west of UTC, positive if east)
-     *
-     * Example:
-     *  F j, Y, g:i a  ->  January 10, 2007, 3:05 pm
-     */
-    dateFormat: function(){
-        return this._jsonProp.dateFormat;
-    },
-
-    /**
-     * If type is color, this method returns if the fill property should
-     *  be set.
-     *  @return {Boolean}
-     */
-    fill: function(){
-        return this._jsonProp.fill;
-    },
+	title: function () {
+		return ORYX.Core.StencilSet.getTranslation(this._jsonProp, "title");
+	},
+
+	value: function () {
+		return this._jsonProp.value;
+	},
+
+	readonly: function () {
+		return this._jsonProp.readonly;
+	},
+
+	optional: function () {
+		return this._jsonProp.optional;
+	},
+
+	description: function () {
+		return ORYX.Core.StencilSet.getTranslation(this._jsonProp, "description");
+	},
+
+	/**
+	 * An optional link to a SVG element so that the property affects the
+	 * graphical representation of the stencil.
+	 */
+	refToView: function () {
+		return this._jsonProp.refToView;
+	},
+
+	/**
+	 * If type is integer or float, min is the lower bounds of value.
+	 */
+	min: function () {
+		return this._jsonProp.min;
+	},
+
+	/**
+	 * If type ist integer or float, max is the upper bounds of value.
+	 */
+	max: function () {
+		return this._jsonProp.max;
+	},
+
+	/**
+	 * If type is float, this method returns if the fill-opacity property should
+	 *  be set.
+	 *  @return {Boolean}
+	 */
+	fillOpacity: function () {
+		return this._jsonProp.fillOpacity;
+	},
+
+	/**
+	 * If type is float, this method returns if the stroke-opacity property should
+	 *  be set.
+	 *  @return {Boolean}
+	 */
+	strokeOpacity: function () {
+		return this._jsonProp.strokeOpacity;
+	},
+
+	/**
+	 * If type is string or richtext, length is the maximum length of the text.
+	 * TODO how long can a string be.
+	 */
+	length: function () {
+		return this._jsonProp.length ? this._jsonProp.length : Number.MAX_VALUE;
+	},
+
+	wrapLines: function () {
+		return this._jsonProp.wrapLines;
+	},
+
+	/**
+	 * If type is date, dateFormat specifies the format of the date. The format
+	 * specification of the ext library is used:
+	 *
+	 * Format  Output      Description
+	 *    ------  ----------  --------------------------------------------------------------
+	 *      d      10         Day of the month, 2 digits with leading zeros
+	 *      D      Wed        A textual representation of a day, three letters
+	 *      j      10         Day of the month without leading zeros
+	 *      l      Wednesday  A full textual representation of the day of the week
+	 *      S      th         English ordinal day of month suffix, 2 chars (use with j)
+	 *      w      3          Numeric representation of the day of the week
+	 *      z      9          The julian date, or day of the year (0-365)
+	 *      W      01         ISO-8601 2-digit week number of year, weeks starting on Monday (00-52)
+	 *      F      January    A full textual representation of the month
+	 *      m      01         Numeric representation of a month, with leading zeros
+	 *      M      Jan        Month name abbreviation, three letters
+	 *      n      1          Numeric representation of a month, without leading zeros
+	 *      t      31         Number of days in the given month
+	 *      L      0          Whether its a leap year (1 if it is a leap year, else 0)
+	 *      Y      2007       A full numeric representation of a year, 4 digits
+	 *      y      07         A two digit representation of a year
+	 *      a      pm         Lowercase Ante meridiem and Post meridiem
+	 *      A      PM         Uppercase Ante meridiem and Post meridiem
+	 *      g      3          12-hour format of an hour without leading zeros
+	 *      G      15         24-hour format of an hour without leading zeros
+	 *      h      03         12-hour format of an hour with leading zeros
+	 *      H      15         24-hour format of an hour with leading zeros
+	 *      i      05         Minutes with leading zeros
+	 *      s      01         Seconds, with leading zeros
+	 *      O      -0600      Difference to Greenwich time (GMT) in hours
+	 *      T      CST        Timezone setting of the machine running the code
+	 *      Z      -21600     Timezone offset in seconds (negative if west of UTC, positive if east)
+	 *
+	 * Example:
+	 *  F j, Y, g:i a  ->  January 10, 2007, 3:05 pm
+	 */
+	dateFormat: function () {
+		return this._jsonProp.dateFormat;
+	},
+
+	/**
+	 * If type is color, this method returns if the fill property should
+	 *  be set.
+	 *  @return {Boolean}
+	 */
+	fill: function () {
+		return this._jsonProp.fill;
+	},
 
 	/**
 	 * Lightness defines the satiation of the color
@@ -6504,63 +6679,63 @@ ORYX.Core.StencilSet.Property = Clazz.extend({
 	 * 1 is white
 	 * @return {Integer} lightness
 	 */
-	lightness: function(){
+	lightness: function () {
 		return this._jsonProp.lightness;
 	},
 
-    /**
-     * If type is color, this method returns if the stroke property should
-     *  be set.
-     *  @return {Boolean}
-     */
-    stroke: function(){
-        return this._jsonProp.stroke;
-    },
-
-    /**
-     * If type is choice, items is a hash map with all alternative values
-     * (PropertyItem objects) with id as keys.
-     */
-    items: function(){
-        return $H(this._items).values();
-    },
-
-    item: function(value){
-        if (value) {
+	/**
+	 * If type is color, this method returns if the stroke property should
+	 *  be set.
+	 *  @return {Boolean}
+	 */
+	stroke: function () {
+		return this._jsonProp.stroke;
+	},
+
+	/**
+	 * If type is choice, items is a hash map with all alternative values
+	 * (PropertyItem objects) with id as keys.
+	 */
+	items: function () {
+		return $H(this._items).values();
+	},
+
+	item: function (value) {
+		if (value) {
 			return this._items[value.toLowerCase()];
 		} else {
 			return null;
 		}
-    },
+	},
 
-    toString: function(){
-        return "Property " + this.title() + " (" + this.id() + ")";
-    },
+	toString: function () {
+		return "Property " + this.title() + " (" + this.id() + ")";
+	},
 
-    complexItems: function(){
-        return $H(this._complexItems).values();
-    },
+	complexItems: function () {
+		return $H(this._complexItems).values();
+	},
 
-    complexItem: function(id){
-        if(id) {
+	complexItem: function (id) {
+		if (id) {
 			return this._complexItems[id.toLowerCase()];
 		} else {
 			return null;
 		}
 
-    },
+	},
 
-    complexAttributeToView: function(){
-        return this._jsonProp.complexAttributeToView || "";
-    },
+	complexAttributeToView: function () {
+		return this._jsonProp.complexAttributeToView || "";
+	},
 
-    isList: function() {
-    	return !!this._jsonProp.isList;
-    },
+	isList: function () {
+		return !!this._jsonProp.isList;
+	},
 
-    getListItems: function() {
-    	return this._jsonProp.list;
-    },
+	getListItems: function () {
+		return this._jsonProp.list;
+	},
 
 	/**
 	 * If type is glossary link, the
@@ -6568,27 +6743,27 @@ ORYX.Core.StencilSet.Property = Clazz.extend({
 	 * the link only can go to.
 	 * @return {String} The glossary category id
 	 */
-	linkableType: function(){
+	linkableType: function () {
 		return this._jsonProp.linkableType || "";
 	},
 
-	alwaysAppearInMultiselect : function() {
+	alwaysAppearInMultiselect: function () {
 		return this._jsonProp.alwaysAppearInMultiselect;
 	},
 
-	popular: function() {
+	popular: function () {
 		return this._jsonProp.popular || false;
 	},
 
-	setPopular: function() {
+	setPopular: function () {
 		this._jsonProp.popular = true;
 	},
 
-	hide: function() {
+	hide: function () {
 		this._hidden = true;
 	},
 
-	isHidden: function() {
+	isHidden: function () {
 		return this._hidden;
 	}
 
@@ -6606,9 +6781,15 @@ ORYX.Core.StencilSet.Property = Clazz.extend({
 /**
  * Init namespace
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
-if(!ORYX.Core.StencilSet) {ORYX.Core.StencilSet = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
+if (!ORYX.Core.StencilSet) {
+	ORYX.Core.StencilSet = {};
+}
 
 /**
  * Class Stencil
@@ -6620,16 +6801,16 @@ ORYX.Core.StencilSet.PropertyItem = Clazz.extend({
 	/**
 	 * Constructor
 	 */
-	construct: function(jsonItem, namespace, property) {
+	construct: function (jsonItem, namespace, property) {
 		arguments.callee.$.construct.apply(this, arguments);
 
-		if(!jsonItem) {
+		if (!jsonItem) {
 			throw "ORYX.Core.StencilSet.PropertyItem(construct): Parameter jsonItem is not defined.";
 		}
-		if(!namespace) {
+		if (!namespace) {
 			throw "ORYX.Core.StencilSet.PropertyItem(construct): Parameter namespace is not defined.";
 		}
-		if(!property) {
+		if (!property) {
 			throw "ORYX.Core.StencilSet.PropertyItem(construct): Parameter property is not defined.";
 		}
 
@@ -6638,12 +6819,12 @@ ORYX.Core.StencilSet.PropertyItem = Clazz.extend({
 		this._property = property;
 
 		//init all values
-		if(!jsonItem.value) {
+		if (!jsonItem.value) {
 			throw "ORYX.Core.StencilSet.PropertyItem(construct): Value is not defined.";
 		}
 
-		if(this._jsonItem.refToView) {
-			if(!(this._jsonItem.refToView instanceof Array)) {
+		if (this._jsonItem.refToView) {
+			if (!(this._jsonItem.refToView instanceof Array)) {
 				this._jsonItem.refToView = [this._jsonItem.refToView];
 			}
 		} else {
@@ -6655,36 +6836,38 @@ ORYX.Core.StencilSet.PropertyItem = Clazz.extend({
 	 * @param {ORYX.Core.StencilSet.PropertyItem} item
 	 * @return {Boolean} True, if item has the same namespace and id.
 	 */
-	equals: function(item) {
+	equals: function (item) {
 		return (this.property().equals(item.property()) &&
 			this.value() === item.value());
 	},
 
-	namespace: function() {
+	namespace: function () {
 		return this._namespace;
 	},
 
-	property: function() {
+	property: function () {
 		return this._property;
 	},
 
-	value: function() {
+	value: function () {
 		return this._jsonItem.value;
 	},
 
-	title: function() {
+	title: function () {
 		return ORYX.Core.StencilSet.getTranslation(this._jsonItem, "title");
 	},
 
-	refToView: function() {
+	refToView: function () {
 		return this._jsonItem.refToView;
 	},
 
-	icon: function() {
+	icon: function () {
 		return (this._jsonItem.icon) ? this.property().stencil()._source + "icons/" + this._jsonItem.icon : "";
 	},
 
-	toString: function() { return "PropertyItem " + this.property() + " (" + this.value() + ")"; }
+	toString: function () {
+		return "PropertyItem " + this.property() + " (" + this.value() + ")";
+	}
 });/*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
  * License rights for this program may be obtained from Alfresco Software, Ltd.
@@ -6698,9 +6881,15 @@ ORYX.Core.StencilSet.PropertyItem = Clazz.extend({
 /**
  * Init namespaces
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
-if(!ORYX.Core.StencilSet) {ORYX.Core.StencilSet = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
+if (!ORYX.Core.StencilSet) {
+	ORYX.Core.StencilSet = {};
+}
 
 /**
  * Class Stencil
@@ -6712,16 +6901,16 @@ ORYX.Core.StencilSet.ComplexPropertyItem = Clazz.extend({
 	/**
 	 * Constructor
 	 */
-	construct: function(jsonItem, namespace, property) {
+	construct: function (jsonItem, namespace, property) {
 		arguments.callee.$.construct.apply(this, arguments);
 
-		if(!jsonItem) {
+		if (!jsonItem) {
 			throw "ORYX.Core.StencilSet.ComplexPropertyItem(construct): Parameter jsonItem is not defined.";
 		}
-		if(!namespace) {
+		if (!namespace) {
 			throw "ORYX.Core.StencilSet.ComplexPropertyItem(construct): Parameter namespace is not defined.";
 		}
-		if(!property) {
+		if (!property) {
 			throw "ORYX.Core.StencilSet.ComplexPropertyItem(construct): Parameter property is not defined.";
 		}
 
@@ -6732,27 +6921,27 @@ ORYX.Core.StencilSet.ComplexPropertyItem = Clazz.extend({
 		this._complexItems = new Hash();
 
 		//init all values
-		if(!jsonItem.name) {
+		if (!jsonItem.name) {
 			throw "ORYX.Core.StencilSet.ComplexPropertyItem(construct): Name is not defined.";
 		}
 
-		if(!jsonItem.type) {
+		if (!jsonItem.type) {
 			throw "ORYX.Core.StencilSet.ComplexPropertyItem(construct): Type is not defined.";
 		} else {
 			jsonItem.type = jsonItem.type.toLowerCase();
 		}
 
-		if(jsonItem.type === ORYX.CONFIG.TYPE_CHOICE) {
-			if(jsonItem.items && jsonItem.items instanceof Array) {
-				jsonItem.items.each((function(item) {
+		if (jsonItem.type === ORYX.CONFIG.TYPE_CHOICE) {
+			if (jsonItem.items && jsonItem.items instanceof Array) {
+				jsonItem.items.each((function (item) {
 					this._items[item.value] = new ORYX.Core.StencilSet.PropertyItem(item, namespace, this);
 				}).bind(this));
 			} else {
 				throw "ORYX.Core.StencilSet.Property(construct): No property items defined."
 			}
-		} else if(jsonItem.type === ORYX.CONFIG.TYPE_COMPLEX) {
-			if(jsonItem.complexItems && jsonItem.complexItems instanceof Array) {
-				jsonItem.complexItems.each((function(complexItem) {
+		} else if (jsonItem.type === ORYX.CONFIG.TYPE_COMPLEX) {
+			if (jsonItem.complexItems && jsonItem.complexItems instanceof Array) {
+				jsonItem.complexItems.each((function (complexItem) {
 					this._complexItems[complexItem.id] = new ORYX.Core.StencilSet.ComplexPropertyItem(complexItem, namespace, this);
 				}).bind(this));
 			} else {
@@ -6765,52 +6954,52 @@ ORYX.Core.StencilSet.ComplexPropertyItem = Clazz.extend({
 	 * @param {ORYX.Core.StencilSet.PropertyItem} item
 	 * @return {Boolean} True, if item has the same namespace and id.
 	 */
-	equals: function(item) {
+	equals: function (item) {
 		return (this.property().equals(item.property()) &&
 			this.name() === item.name());
 	},
 
-	namespace: function() {
+	namespace: function () {
 		return this._namespace;
 	},
 
-	property: function() {
+	property: function () {
 		return this._property;
 	},
 
-	name: function() {
+	name: function () {
 		return ORYX.Core.StencilSet.getTranslation(this._jsonItem, "name");
 	},
 
-	id: function() {
+	id: function () {
 		return this._jsonItem.id;
 	},
 
-	type: function() {
+	type: function () {
 		return this._jsonItem.type;
 	},
 
-	optional: function() {
+	optional: function () {
 		return this._jsonItem.optional;
 	},
 
-	width: function() {
+	width: function () {
 		return this._jsonItem.width;
 	},
 
-	value: function() {
+	value: function () {
 		return this._jsonItem.value;
 	},
 
-	items: function() {
+	items: function () {
 		return this._items.values();
 	},
 
-	complexItems: function() {
+	complexItems: function () {
 		return this._complexItems.values();
 	},
 
-	disable: function() {
+	disable: function () {
 		return this._jsonItem.disable;
 	}
 });/*
@@ -6826,9 +7015,15 @@ ORYX.Core.StencilSet.ComplexPropertyItem = Clazz.extend({
 /**
  * Init namespaces
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
-if(!ORYX.Core.StencilSet) {ORYX.Core.StencilSet = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
+if (!ORYX.Core.StencilSet) {
+	ORYX.Core.StencilSet = {};
+}
 
 /**
  * Class Rules uses Prototpye 1.5.0 uses Inheritance
@@ -6840,7 +7035,7 @@ ORYX.Core.StencilSet.Rules = {
 	/**
 	 * Constructor
 	 */
-	construct: function() {
+	construct: function () {
 		arguments.callee.$.construct.apply(this, arguments);
 
 		this._stencilSets = [];
@@ -6869,11 +7064,11 @@ ORYX.Core.StencilSet.Rules = {
 	 * @param {Object}
 	 *            stencilSet
 	 */
-	initializeRules: function(stencilSet) {
+	initializeRules: function (stencilSet) {
 
-		var existingSS = this._stencilSets.find(function(ss) {
-							return (ss.namespace() == stencilSet.namespace());
-						});
+		var existingSS = this._stencilSets.find(function (ss) {
+			return (ss.namespace() == stencilSet.namespace());
+		});
 		if (existingSS) {
 			// reinitialize all rules
 			var stencilsets = this._stencilSets.clone();
@@ -6898,30 +7093,29 @@ ORYX.Core.StencilSet.Rules = {
 			this._morphingRules = new Hash();
 			this._layoutRules = new Hash();
 
-			stencilsets.each(function(ss){
+			stencilsets.each(function (ss) {
 				this.initializeRules(ss);
 			}.bind(this));
 			return;
-		}
-		else {
+		} else {
 			this._stencilSets.push(stencilSet);
 
 			var jsonRules = new Hash(stencilSet.jsonRules());
 			var namespace = stencilSet.namespace();
 			var stencils = stencilSet.stencils();
 
-			stencilSet.extensions().values().each(function(extension) {
-				if(extension.rules) {
-					if(extension.rules.connectionRules)
+			stencilSet.extensions().values().each(function (extension) {
+				if (extension.rules) {
+					if (extension.rules.connectionRules)
 						jsonRules.connectionRules = jsonRules.connectionRules.concat(extension.rules.connectionRules);
-					if(extension.rules.cardinalityRules)
+					if (extension.rules.cardinalityRules)
 						jsonRules.cardinalityRules = jsonRules.cardinalityRules.concat(extension.rules.cardinalityRules);
-					if(extension.rules.containmentRules)
+					if (extension.rules.containmentRules)
 						jsonRules.containmentRules = jsonRules.containmentRules.concat(extension.rules.containmentRules);
-					if(extension.rules.morphingRules)
+					if (extension.rules.morphingRules)
 						jsonRules.morphingRules = jsonRules.morphingRules.concat(extension.rules.morphingRules);
 				}
-				if(extension.stencils)
+				if (extension.stencils)
 					stencils = stencils.concat(extension.stencils);
 			});
 
@@ -6930,28 +7124,26 @@ ORYX.Core.StencilSet.Rules = {
 			// init connection rules
 			var cr = this._connectionRules;
 			if (jsonRules.connectionRules) {
-				jsonRules.connectionRules.each((function(rules){
+				jsonRules.connectionRules.each((function (rules) {
 					if (this._isRoleOfOtherNamespace(rules.role)) {
 						if (!cr[rules.role]) {
 							cr[rules.role] = new Hash();
 						}
-					}
-					else {
+					} else {
 						if (!cr[namespace + rules.role])
 							cr[namespace + rules.role] = new Hash();
 					}
 
-					rules.connects.each((function(connect){
+					rules.connects.each((function (connect) {
 						var toRoles = [];
 						if (connect.to) {
 							if (!(connect.to instanceof Array)) {
 								connect.to = [connect.to];
 							}
-							connect.to.each((function(to){
+							connect.to.each((function (to) {
 								if (this._isRoleOfOtherNamespace(to)) {
 									toRoles.push(to);
-								}
-								else {
+								} else {
 									toRoles.push(namespace + to);
 								}
 							}).bind(this));
@@ -6980,12 +7172,11 @@ ORYX.Core.StencilSet.Rules = {
 			// init cardinality rules
 			var cardr = this._cardinalityRules;
 			if (jsonRules.cardinalityRules) {
-				jsonRules.cardinalityRules.each((function(rules){
+				jsonRules.cardinalityRules.each((function (rules) {
 					var cardrKey;
 					if (this._isRoleOfOtherNamespace(rules.role)) {
 						cardrKey = rules.role;
-					}
-					else {
+					} else {
 						cardrKey = namespace + rules.role;
 					}
 
@@ -6998,11 +7189,10 @@ ORYX.Core.StencilSet.Rules = {
 
 					var oe = new Hash();
 					if (rules.outgoingEdges) {
-						rules.outgoingEdges.each((function(rule){
+						rules.outgoingEdges.each((function (rule) {
 							if (this._isRoleOfOtherNamespace(rule.role)) {
 								oe[rule.role] = rule;
-							}
-							else {
+							} else {
 								oe[namespace + rule.role] = rule;
 							}
 						}).bind(this));
@@ -7010,11 +7200,10 @@ ORYX.Core.StencilSet.Rules = {
 					cardr[cardrKey].outgoingEdges = oe;
 					var ie = new Hash();
 					if (rules.incomingEdges) {
-						rules.incomingEdges.each((function(rule){
+						rules.incomingEdges.each((function (rule) {
 							if (this._isRoleOfOtherNamespace(rule.role)) {
 								ie[rule.role] = rule;
-							}
-							else {
+							} else {
 								ie[namespace + rule.role] = rule;
 							}
 						}).bind(this));
@@ -7026,23 +7215,21 @@ ORYX.Core.StencilSet.Rules = {
 			// init containment rules
 			var conr = this._containmentRules;
 			if (jsonRules.containmentRules) {
-				jsonRules.containmentRules.each((function(rules){
+				jsonRules.containmentRules.each((function (rules) {
 					var conrKey;
 					if (this._isRoleOfOtherNamespace(rules.role)) {
 						conrKey = rules.role;
-					}
-					else {
+					} else {
 						this._containerStencils.push(namespace + rules.role);
 						conrKey = namespace + rules.role;
 					}
 					if (!conr[conrKey]) {
 						conr[conrKey] = [];
 					}
-					(rules.contains||[]).each((function(containRole){
+					(rules.contains || []).each((function (containRole) {
 						if (this._isRoleOfOtherNamespace(containRole)) {
 							conr[conrKey].push(containRole);
-						}
-						else {
+						} else {
 							conr[conrKey].push(namespace + containRole);
 						}
 					}).bind(this));
@@ -7052,23 +7239,22 @@ ORYX.Core.StencilSet.Rules = {
 			// init morphing rules
 			var morphr = this._morphingRules;
 			if (jsonRules.morphingRules) {
-				jsonRules.morphingRules.each((function(rules){
+				jsonRules.morphingRules.each((function (rules) {
 					var morphrKey;
 					if (this._isRoleOfOtherNamespace(rules.role)) {
 						morphrKey = rules.role;
-					}
-					else {
+					} else {
 						morphrKey = namespace + rules.role;
 					}
 					if (!morphr[morphrKey]) {
 						morphr[morphrKey] = [];
 					}
-					if(!rules.preserveBounds) {
+					if (!rules.preserveBounds) {
 						rules.preserveBounds = false;
 					}
-					rules.baseMorphs.each((function(baseMorphStencilId){
+					rules.baseMorphs.each((function (baseMorphStencilId) {
 						var morphStencil = this._getStencilById(namespace + baseMorphStencilId);
-						if(morphStencil) {
+						if (morphStencil) {
 							morphr[morphrKey].push(morphStencil);
 						}
 					}).bind(this));
@@ -7079,64 +7265,67 @@ ORYX.Core.StencilSet.Rules = {
 			var layoutRules = this._layoutRules;
 			if (jsonRules.layoutRules) {
 
-				var getDirections = function(o){
+				var getDirections = function (o) {
 					return {
-							"edgeRole":o.edgeRole||undefined,
-							"t": o["t"]||1,
-							"r": o["r"]||1,
-							"b": o["b"]||1,
-							"l": o["l"]||1
-						}
+						"edgeRole": o.edgeRole || undefined,
+						"t": o["t"] || 1,
+						"r": o["r"] || 1,
+						"b": o["b"] || 1,
+						"l": o["l"] || 1
+					}
 				}
 
-				jsonRules.layoutRules.each(function(rules){
+				jsonRules.layoutRules.each(function (rules) {
 					var layoutKey;
 					if (this._isRoleOfOtherNamespace(rules.role)) {
 						layoutKey = rules.role;
-					}
-					else {
+					} else {
 						layoutKey = namespace + rules.role;
 					}
 					if (!layoutRules[layoutKey]) {
 						layoutRules[layoutKey] = {};
 					}
-					if (rules["in"]){
+					if (rules["in"]) {
 						layoutRules[layoutKey]["in"] = getDirections(rules["in"]);
 					}
-					if (rules["ins"]){
-						layoutRules[layoutKey]["ins"] = (rules["ins"]||[]).map(function(e){ return getDirections(e) })
+					if (rules["ins"]) {
+						layoutRules[layoutKey]["ins"] = (rules["ins"] || []).map(function (e) {
+							return getDirections(e)
+						})
 					}
 					if (rules["out"]) {
 						layoutRules[layoutKey]["out"] = getDirections(rules["out"]);
 					}
-					if (rules["outs"]){
-						layoutRules[layoutKey]["outs"] = (rules["outs"]||[]).map(function(e){ return getDirections(e) })
+					if (rules["outs"]) {
+						layoutRules[layoutKey]["outs"] = (rules["outs"] || []).map(function (e) {
+							return getDirections(e)
+						})
 					}
 				}.bind(this));
 			}
 		}
 	},
 
-	_getStencilById: function(id) {
-		return this._stencils.find(function(stencil) {
-			return stencil.id()==id;
+	_getStencilById: function (id) {
+		return this._stencils.find(function (stencil) {
+			return stencil.id() == id;
 		});
 	},
 
-	_cacheConnect: function(args) {
+	_cacheConnect: function (args) {
 		result = this._canConnect(args);
 
 		if (args.sourceStencil && args.targetStencil) {
 			var source = this._cachedConnectSET[args.sourceStencil.id()];
 
-			if(!source) {
+			if (!source) {
 				source = new Hash();
 				this._cachedConnectSET[args.sourceStencil.id()] = source;
 			}
 
 			var edge = source[args.edgeStencil.id()];
 
-			if(!edge) {
+			if (!edge) {
 				edge = new Hash();
 				source[args.edgeStencil.id()] = edge;
 			}
@@ -7146,7 +7335,7 @@ ORYX.Core.StencilSet.Rules = {
 		} else if (args.sourceStencil) {
 			var source = this._cachedConnectSE[args.sourceStencil.id()];
 
-			if(!source) {
+			if (!source) {
 				source = new Hash();
 				this._cachedConnectSE[args.sourceStencil.id()] = source;
 			}
@@ -7156,7 +7345,7 @@ ORYX.Core.StencilSet.Rules = {
 		} else {
 			var target = this._cachedConnectTE[args.targetStencil.id()];
 
-			if(!target) {
+			if (!target) {
 				target = new Hash();
 				this._cachedConnectTE[args.targetStencil.id()] = target;
 			}
@@ -7167,50 +7356,50 @@ ORYX.Core.StencilSet.Rules = {
 		return result;
 	},
 
-	_cacheCard: function(args) {
+	_cacheCard: function (args) {
 
-		if(args.sourceStencil) {
+		if (args.sourceStencil) {
 			var source = this._cachedCardSE[args.sourceStencil.id()]
 
-			if(!source) {
+			if (!source) {
 				source = new Hash();
 				this._cachedCardSE[args.sourceStencil.id()] = source;
 			}
 
 			var max = this._getMaximumNumberOfOutgoingEdge(args);
-			if(max == undefined)
+			if (max == undefined)
 				max = -1;
 
 			source[args.edgeStencil.id()] = max;
 		}
 
-		if(args.targetStencil) {
+		if (args.targetStencil) {
 			var target = this._cachedCardTE[args.targetStencil.id()]
 
-			if(!target) {
+			if (!target) {
 				target = new Hash();
 				this._cachedCardTE[args.targetStencil.id()] = target;
 			}
 
 			var max = this._getMaximumNumberOfIncomingEdge(args);
-			if(max == undefined)
+			if (max == undefined)
 				max = -1;
 
 			target[args.edgeStencil.id()] = max;
 		}
 	},
 
-	_cacheContain: function(args) {
+	_cacheContain: function (args) {
 
 		var result = [this._canContain(args),
-					  this._getMaximumOccurrence(args.containingStencil, args.containedStencil)]
+			this._getMaximumOccurrence(args.containingStencil, args.containedStencil)]
 
-		if(result[1] == undefined)
+		if (result[1] == undefined)
 			result[1] = -1;
 
 		var children = this._cachedContainPC[args.containingStencil.id()];
 
-		if(!children) {
+		if (!children) {
 			children = new Hash();
 			this._cachedContainPC[args.containingStencil.id()] = children;
 		}
@@ -7224,15 +7413,15 @@ ORYX.Core.StencilSet.Rules = {
 	 * Returns all stencils belonging to a morph group. (calculation result is
 	 * cached)
 	 */
-	_cacheMorph: function(role) {
+	_cacheMorph: function (role) {
 
 		var morphs = this._cachedMorphRS[role];
 
-		if(!morphs) {
+		if (!morphs) {
 			morphs = [];
 
-			if(this._morphingRules.keys().include(role)) {
-				morphs = this._stencils.select(function(stencil) {
+			if (this._morphingRules.keys().include(role)) {
+				morphs = this._stencils.select(function (stencil) {
 					return stencil.roles().include(role);
 				});
 			}
@@ -7255,25 +7444,25 @@ ORYX.Core.StencilSet.Rules = {
 	 * @return {Array} Array of stencils of edges that can be outgoing edges of
 	 *         the source.
 	 */
-	outgoingEdgeStencils: function(args) {
+	outgoingEdgeStencils: function (args) {
 		// check arguments
-		if(!args.sourceShape && !args.sourceStencil) {
+		if (!args.sourceShape && !args.sourceStencil) {
 			return [];
 		}
 
 		// init arguments
-		if(args.sourceShape) {
+		if (args.sourceShape) {
 			args.sourceStencil = args.sourceShape.getStencil();
 		}
 
 		var _edges = [];
 
 		// test each edge, if it can connect to source
-		this._stencils.each((function(stencil) {
-			if(stencil.type() === "edge") {
+		this._stencils.each((function (stencil) {
+			if (stencil.type() === "edge") {
 				var newArgs = Object.clone(args);
 				newArgs.edgeStencil = stencil;
-				if(this.canConnect(newArgs)) {
+				if (this.canConnect(newArgs)) {
 					_edges.push(stencil);
 				}
 			}
@@ -7293,25 +7482,25 @@ ORYX.Core.StencilSet.Rules = {
 	 * @return {Array} Array of stencils of edges that can be incoming edges of
 	 *         the target.
 	 */
-	incomingEdgeStencils: function(args) {
+	incomingEdgeStencils: function (args) {
 		// check arguments
-		if(!args.targetShape && !args.targetStencil) {
+		if (!args.targetShape && !args.targetStencil) {
 			return [];
 		}
 
 		// init arguments
-		if(args.targetShape) {
+		if (args.targetShape) {
 			args.targetStencil = args.targetShape.getStencil();
 		}
 
 		var _edges = [];
 
 		// test each edge, if it can connect to source
-		this._stencils.each((function(stencil) {
-			if(stencil.type() === "edge") {
+		this._stencils.each((function (stencil) {
+			if (stencil.type() === "edge") {
 				var newArgs = Object.clone(args);
 				newArgs.edgeStencil = stencil;
-				if(this.canConnect(newArgs)) {
+				if (this.canConnect(newArgs)) {
 					_edges.push(stencil);
 				}
 			}
@@ -7333,29 +7522,29 @@ ORYX.Core.StencilSet.Rules = {
 	 * @return {Array} Returns an array of stencils that can be source of the
 	 *         specified edge.
 	 */
-	sourceStencils: function(args) {
+	sourceStencils: function (args) {
 		// check arguments
-		if(!args ||
-		   !args.edgeShape && !args.edgeStencil) {
+		if (!args ||
+			!args.edgeShape && !args.edgeStencil) {
 			return [];
 		}
 
 		// init arguments
-		if(args.targetShape) {
+		if (args.targetShape) {
 			args.targetStencil = args.targetShape.getStencil();
 		}
 
-		if(args.edgeShape) {
+		if (args.edgeShape) {
 			args.edgeStencil = args.edgeShape.getStencil();
 		}
 
 		var _sources = [];
 
 		// check each stencil, if it can be a source
-		this._stencils.each((function(stencil) {
+		this._stencils.each((function (stencil) {
 			var newArgs = Object.clone(args);
 			newArgs.sourceStencil = stencil;
-			if(this.canConnect(newArgs)) {
+			if (this.canConnect(newArgs)) {
 				_sources.push(stencil);
 			}
 		}).bind(this));
@@ -7376,29 +7565,29 @@ ORYX.Core.StencilSet.Rules = {
 	 * @return {Array} Returns an array of stencils that can be target of the
 	 *         specified edge.
 	 */
-	targetStencils: function(args) {
+	targetStencils: function (args) {
 		// check arguments
-		if(!args ||
-		   !args.edgeShape && !args.edgeStencil) {
+		if (!args ||
+			!args.edgeShape && !args.edgeStencil) {
 			return [];
 		}
 
 		// init arguments
-		if(args.sourceShape) {
+		if (args.sourceShape) {
 			args.sourceStencil = args.sourceShape.getStencil();
 		}
 
-		if(args.edgeShape) {
+		if (args.edgeShape) {
 			args.edgeStencil = args.edgeShape.getStencil();
 		}
 
 		var _targets = [];
 
 		// check stencil, if it can be a target
-		this._stencils.each((function(stencil) {
+		this._stencils.each((function (stencil) {
 			var newArgs = Object.clone(args);
 			newArgs.targetStencil = stencil;
-			if(this.canConnect(newArgs)) {
+			if (this.canConnect(newArgs)) {
 				_targets.push(stencil);
 			}
 		}).bind(this));
@@ -7420,42 +7609,42 @@ ORYX.Core.StencilSet.Rules = {
 	 *
 	 * @return {Boolean} Returns, if the edge can connect source and target.
 	 */
-	canConnect: function(args) {
+	canConnect: function (args) {
 		// check arguments
-		if(!args ||
-		   (!args.sourceShape && !args.sourceStencil &&
-		    !args.targetShape && !args.targetStencil) ||
-		    !args.edgeShape && !args.edgeStencil) {
-		   	return false;
+		if (!args ||
+			(!args.sourceShape && !args.sourceStencil &&
+				!args.targetShape && !args.targetStencil) ||
+			!args.edgeShape && !args.edgeStencil) {
+			return false;
 		}
 
 		// init arguments
-		if(args.sourceShape) {
+		if (args.sourceShape) {
 			args.sourceStencil = args.sourceShape.getStencil();
 		}
-		if(args.targetShape) {
+		if (args.targetShape) {
 			args.targetStencil = args.targetShape.getStencil();
 		}
-		if(args.edgeShape) {
+		if (args.edgeShape) {
 			args.edgeStencil = args.edgeShape.getStencil();
 		}
 
 		var result;
 
-		if(args.sourceStencil && args.targetStencil) {
+		if (args.sourceStencil && args.targetStencil) {
 			var source = this._cachedConnectSET[args.sourceStencil.id()];
 
-			if(!source)
+			if (!source)
 				result = this._cacheConnect(args);
 			else {
 				var edge = source[args.edgeStencil.id()];
 
-				if(!edge)
+				if (!edge)
 					result = this._cacheConnect(args);
 				else {
 					var target = edge[args.targetStencil.id()];
 
-					if(target == undefined)
+					if (target == undefined)
 						result = this._cacheConnect(args);
 					else
 						result = target;
@@ -7464,12 +7653,12 @@ ORYX.Core.StencilSet.Rules = {
 		} else if (args.sourceStencil) {
 			var source = this._cachedConnectSE[args.sourceStencil.id()];
 
-			if(!source)
+			if (!source)
 				result = this._cacheConnect(args);
 			else {
 				var edge = source[args.edgeStencil.id()];
 
-				if(edge == undefined)
+				if (edge == undefined)
 					result = this._cacheConnect(args);
 				else
 					result = edge;
@@ -7477,12 +7666,12 @@ ORYX.Core.StencilSet.Rules = {
 		} else { // args.targetStencil
 			var target = this._cachedConnectTE[args.targetStencil.id()];
 
-			if(!target)
+			if (!target)
 				result = this._cacheConnect(args);
 			else {
 				var edge = target[args.edgeStencil.id()];
 
-				if(edge == undefined)
+				if (edge == undefined)
 					result = this._cacheConnect(args);
 				else
 					result = edge;
@@ -7491,62 +7680,61 @@ ORYX.Core.StencilSet.Rules = {
 
 		// check cardinality
 		if (result) {
-			if(args.sourceShape) {
+			if (args.sourceShape) {
 				var source = this._cachedCardSE[args.sourceStencil.id()];
 
-				if(!source) {
+				if (!source) {
 					this._cacheCard(args);
 					source = this._cachedCardSE[args.sourceStencil.id()];
 				}
 
 				var max = source[args.edgeStencil.id()];
 
-				if(max == undefined) {
+				if (max == undefined) {
 					this._cacheCard(args);
 				}
 
 				max = source[args.edgeStencil.id()];
 
-				if(max != -1) {
-					result = args.sourceShape.getOutgoingShapes().all(function(cs) {
-								if((cs.getStencil().id() === args.edgeStencil.id()) &&
-								   ((args.edgeShape) ? cs !== args.edgeShape : true)) {
-									max--;
-									return (max > 0) ? true : false;
-								} else {
-									return true;
-								}
-							});
+				if (max != -1) {
+					result = args.sourceShape.getOutgoingShapes().all(function (cs) {
+						if ((cs.getStencil().id() === args.edgeStencil.id()) &&
+							((args.edgeShape) ? cs !== args.edgeShape : true)) {
+							max--;
+							return (max > 0) ? true : false;
+						} else {
+							return true;
+						}
+					});
 				}
 			}
 
 			if (args.targetShape) {
 				var target = this._cachedCardTE[args.targetStencil.id()];
 
-				if(!target) {
+				if (!target) {
 					this._cacheCard(args);
 					target = this._cachedCardTE[args.targetStencil.id()];
 				}
 
 				var max = target[args.edgeStencil.id()];
 
-				if(max == undefined) {
+				if (max == undefined) {
 					this._cacheCard(args);
 				}
 
 				max = target[args.edgeStencil.id()];
 
-				if(max != -1) {
-					result = args.targetShape.getIncomingShapes().all(function(cs){
-								if ((cs.getStencil().id() === args.edgeStencil.id()) &&
-								((args.edgeShape) ? cs !== args.edgeShape : true)) {
-									max--;
-									return (max > 0) ? true : false;
-								}
-								else {
-									return true;
-								}
-							});
+				if (max != -1) {
+					result = args.targetShape.getIncomingShapes().all(function (cs) {
+						if ((cs.getStencil().id() === args.edgeStencil.id()) &&
+							((args.edgeShape) ? cs !== args.edgeShape : true)) {
+							max--;
+							return (max > 0) ? true : false;
+						} else {
+							return true;
+						}
+					});
 				}
 			}
 		}
@@ -7568,23 +7756,23 @@ ORYX.Core.StencilSet.Rules = {
 	 *
 	 * @return {Boolean} Returns, if the edge can connect source and target.
 	 */
-	_canConnect: function(args) {
+	_canConnect: function (args) {
 		// check arguments
-		if(!args ||
-		   (!args.sourceShape && !args.sourceStencil &&
-		    !args.targetShape && !args.targetStencil) ||
-		    !args.edgeShape && !args.edgeStencil) {
-		   	return false;
+		if (!args ||
+			(!args.sourceShape && !args.sourceStencil &&
+				!args.targetShape && !args.targetStencil) ||
+			!args.edgeShape && !args.edgeStencil) {
+			return false;
 		}
 
 		// init arguments
-		if(args.sourceShape) {
+		if (args.sourceShape) {
 			args.sourceStencil = args.sourceShape.getStencil();
 		}
-		if(args.targetShape) {
+		if (args.targetShape) {
 			args.targetStencil = args.targetShape.getStencil();
 		}
-		if(args.edgeShape) {
+		if (args.edgeShape) {
 			args.edgeStencil = args.edgeShape.getStencil();
 		}
 
@@ -7596,17 +7784,19 @@ ORYX.Core.StencilSet.Rules = {
 
 		// check connection rules, if the source can be connected to the target
 		// with the specified edge.
-		if(edgeRules.keys().length === 0) {
+		if (edgeRules.keys().length === 0) {
 			resultCR = false;
 		} else {
-			if(args.sourceStencil) {
-				resultCR = args.sourceStencil.roles().any(function(sourceRole) {
+			if (args.sourceStencil) {
+				resultCR = args.sourceStencil.roles().any(function (sourceRole) {
 					var targetRoles = edgeRules[sourceRole];
 
-					if(!targetRoles) {return false;}
+					if (!targetRoles) {
+						return false;
+					}
 
-					if(args.targetStencil) {
-						return (targetRoles.any(function(targetRole) {
+					if (args.targetStencil) {
+						return (targetRoles.any(function (targetRole) {
 							return args.targetStencil.roles().member(targetRole);
 						}));
 					} else {
@@ -7614,8 +7804,8 @@ ORYX.Core.StencilSet.Rules = {
 					}
 				});
 			} else { // !args.sourceStencil -> there is args.targetStencil
-				resultCR = edgeRules.values().any(function(targetRoles) {
-					return args.targetStencil.roles().any(function(targetRole) {
+				resultCR = edgeRules.values().any(function (targetRoles) {
+					return args.targetStencil.roles().any(function (targetRole) {
 						return targetRoles.member(targetRole);
 					});
 				});
@@ -7630,7 +7820,7 @@ ORYX.Core.StencilSet.Rules = {
 
 	/** Begin containment rules' methods */
 
-	isContainer: function(shape) {
+	isContainer: function (shape) {
 		return this._containerStencils.member(shape.getStencil().id());
 	},
 
@@ -7641,49 +7831,49 @@ ORYX.Core.StencilSet.Rules = {
 	 *            containingShape: ORYX.Core.AbstractShape containedStencil:
 	 *            ORYX.Core.StencilSet.Stencil containedShape: ORYX.Core.Shape
 	 */
-	canContain: function(args) {
-		if(!args ||
-		   !args.containingStencil && !args.containingShape ||
-		   !args.containedStencil && !args.containedShape) {
-		   	return false;
+	canContain: function (args) {
+		if (!args ||
+			!args.containingStencil && !args.containingShape ||
+			!args.containedStencil && !args.containedShape) {
+			return false;
 		}
 
 		// init arguments
-		if(args.containedShape) {
+		if (args.containedShape) {
 			args.containedStencil = args.containedShape.getStencil();
 		}
 
-		if(args.containingShape) {
+		if (args.containingShape) {
 			args.containingStencil = args.containingShape.getStencil();
 		}
 
 		//if(args.containingStencil.type() == 'edge' || args.containedStencil.type() == 'edge')
 		//	return false;
-		if(args.containedStencil.type() == 'edge')
+		if (args.containedStencil.type() == 'edge')
 			return false;
 
 		var childValues;
 
 		var parent = this._cachedContainPC[args.containingStencil.id()];
 
-		if(!parent)
+		if (!parent)
 			childValues = this._cacheContain(args);
 		else {
 			childValues = parent[args.containedStencil.id()];
 
-			if(!childValues)
+			if (!childValues)
 				childValues = this._cacheContain(args);
 		}
 
-		if(!childValues[0])
+		if (!childValues[0])
 			return false;
 		else if (childValues[1] == -1)
 			return true;
 		else {
-			if(args.containingShape) {
+			if (args.containingShape) {
 				var max = childValues[1];
-				return args.containingShape.getChildShapes(false).all(function(as) {
-					if(as.getStencil().id() === args.containedStencil.id()) {
+				return args.containingShape.getChildShapes(false).all(function (as) {
+					if (as.getStencil().id() === args.containedStencil.id()) {
 						max--;
 						return (max > 0) ? true : false;
 					} else {
@@ -7703,19 +7893,19 @@ ORYX.Core.StencilSet.Rules = {
 	 *            containingShape: ORYX.Core.AbstractShape containedStencil:
 	 *            ORYX.Core.StencilSet.Stencil containedShape: ORYX.Core.Shape
 	 */
-	_canContain: function(args) {
-		if(!args ||
-		   !args.containingStencil && !args.containingShape ||
-		   !args.containedStencil && !args.containedShape) {
-		   	return false;
+	_canContain: function (args) {
+		if (!args ||
+			!args.containingStencil && !args.containingShape ||
+			!args.containedStencil && !args.containedShape) {
+			return false;
 		}
 
 		// init arguments
-		if(args.containedShape) {
+		if (args.containedShape) {
 			args.containedStencil = args.containedShape.getStencil();
 		}
 
-		if(args.containingShape) {
+		if (args.containingShape) {
 			args.containingStencil = args.containingShape.getStencil();
 		}
 
@@ -7730,10 +7920,10 @@ ORYX.Core.StencilSet.Rules = {
 		var result;
 
 		// check containment rules
-		result = args.containingStencil.roles().any((function(role) {
+		result = args.containingStencil.roles().any((function (role) {
 			var roles = this._containmentRules[role];
-			if(roles) {
-				return roles.any(function(role) {
+			if (roles) {
+				return roles.any(function (role) {
 					return args.containedStencil.roles().member(role);
 				});
 			} else {
@@ -7761,20 +7951,20 @@ ORYX.Core.StencilSet.Rules = {
 	 * @return {Array} Array of stencils that the passed stencil/shape can be
 	 *         transformed to (including the current stencil itself)
 	 */
-	morphStencils: function(args) {
+	morphStencils: function (args) {
 		// check arguments
-		if(!args.stencil && !args.shape) {
+		if (!args.stencil && !args.shape) {
 			return [];
 		}
 
 		// init arguments
-		if(args.shape) {
+		if (args.shape) {
 			args.stencil = args.shape.getStencil();
 		}
 
 		var _morphStencils = [];
-		args.stencil.roles().each(function(role) {
-			this._cacheMorph(role).each(function(stencil) {
+		args.stencil.roles().each(function (role) {
+			this._cacheMorph(role).each(function (stencil) {
 				_morphStencils.push(stencil);
 			})
 		}.bind(this));
@@ -7782,17 +7972,19 @@ ORYX.Core.StencilSet.Rules = {
 
 		var baseMorphs = this.baseMorphs();
 		// BaseMorphs should be in the front of the array
-		_morphStencils = _morphStencils.uniq().sort(function(a,b){ return baseMorphs.include(a)&&!baseMorphs.include(b) ? -1 : (baseMorphs.include(b)&&!baseMorphs.include(a) ? 1 : 0)})
+		_morphStencils = _morphStencils.uniq().sort(function (a, b) {
+			return baseMorphs.include(a) && !baseMorphs.include(b) ? -1 : (baseMorphs.include(b) && !baseMorphs.include(a) ? 1 : 0)
+		})
 		return _morphStencils;
 	},
 
 	/**
 	 * @return {Array} An array of all base morph stencils
 	 */
-	baseMorphs: function() {
+	baseMorphs: function () {
 		var _baseMorphs = [];
-		this._morphingRules.each(function(pair) {
-			pair.value.each(function(baseMorph) {
+		this._morphingRules.each(function (pair) {
+			pair.value.each(function (baseMorph) {
 				_baseMorphs.push(baseMorph);
 			});
 		});
@@ -7803,8 +7995,10 @@ ORYX.Core.StencilSet.Rules = {
 	 * Returns true if there are morphing rules defines
 	 * @return {boolean}
 	 */
-	containsMorphingRules: function(){
-		return this._stencilSets.any(function(ss){ return !!ss.jsonRules().morphingRules});
+	containsMorphingRules: function () {
+		return this._stencilSets.any(function (ss) {
+			return !!ss.jsonRules().morphingRules
+		});
 	},
 
 	/**
@@ -7824,31 +8018,35 @@ ORYX.Core.StencilSet.Rules = {
 	 * @return {Stencil} Returns, the stencil for the connecting edge
 	 * or null if connection is not possible
 	 */
-	connectMorph: function(args) {
+	connectMorph: function (args) {
 		// check arguments
-		if(!args ||
-		   (!args.sourceShape && !args.sourceStencil &&
-		    !args.targetShape && !args.targetStencil)) {
-		   	return false;
+		if (!args ||
+			(!args.sourceShape && !args.sourceStencil &&
+				!args.targetShape && !args.targetStencil)) {
+			return false;
 		}
 
 		// init arguments
-		if(args.sourceShape) {
+		if (args.sourceShape) {
 			args.sourceStencil = args.sourceShape.getStencil();
 		}
-		if(args.targetShape) {
+		if (args.targetShape) {
 			args.targetStencil = args.targetShape.getStencil();
 		}
 
 		var incoming = this.incomingEdgeStencils(args);
 		var outgoing = this.outgoingEdgeStencils(args);
 
-		var edgeStencils = incoming.select(function(e) { return outgoing.member(e); }); // intersection of sets
-		var baseEdgeStencils = this.baseMorphs().select(function(e) { return edgeStencils.member(e); }); // again: intersection of sets
+		var edgeStencils = incoming.select(function (e) {
+			return outgoing.member(e);
+		}); // intersection of sets
+		var baseEdgeStencils = this.baseMorphs().select(function (e) {
+			return edgeStencils.member(e);
+		}); // again: intersection of sets
 
-		if(baseEdgeStencils.size()>0)
+		if (baseEdgeStencils.size() > 0)
 			return baseEdgeStencils[0]; // return any of the possible base morphs
-		else if(edgeStencils.size()>0)
+		else if (edgeStencils.size() > 0)
 			return edgeStencils[0];	// return any of the possible stencils
 
 		return null; //connection not possible
@@ -7860,19 +8058,19 @@ ORYX.Core.StencilSet.Rules = {
 	 * @return {Boolean} Returns true if the morphs in the morph group of the
 	 * specified morph shall be displayed in the shape menu
 	 */
-	showInShapeMenu: function(stencil) {
-		return 	this._stencilSets.any(function(ss){
-				    return ss.jsonRules().morphingRules
-							.any(function(r){
-								return 	stencil.roles().include(ss.namespace() + r.role)
-										&& r.showInShapeMenu !== false;
-							})
-				});
+	showInShapeMenu: function (stencil) {
+		return this._stencilSets.any(function (ss) {
+			return ss.jsonRules().morphingRules
+				.any(function (r) {
+					return stencil.roles().include(ss.namespace() + r.role)
+						&& r.showInShapeMenu !== false;
+				})
+		});
 	},
 
-	preserveBounds: function(stencil) {
-		return this._stencilSets.any(function(ss) {
-			return ss.jsonRules().morphingRules.any(function(r) {
+	preserveBounds: function (stencil) {
+		return this._stencilSets.any(function (ss) {
+			return ss.jsonRules().morphingRules.any(function (r) {
 
 
 				return stencil.roles().include(ss.namespace() + r.role)
@@ -7892,34 +8090,40 @@ ORYX.Core.StencilSet.Rules = {
 	 * @param {Object} edgeShape (Optional)
 	 * @return {Object} "in" and "out" with a default value of {"t":1, "r":1, "b":1, "r":1} if not specified in the json
 	 */
-	getLayoutingRules : function(shape, edgeShape){
+	getLayoutingRules: function (shape, edgeShape) {
 
-		if (!shape||!(shape instanceof ORYX.Core.Shape)){ return }
+		if (!shape || !(shape instanceof ORYX.Core.Shape)) {
+			return
+		}
 
-		var layout = {"in":{},"out":{}};
+		var layout = {"in": {}, "out": {}};
 
-		var parseValues = function(o, v){
-			if (o && o[v]){
-				["t","r","b","l"].each(function(d){
-					layout[v][d]=Math.max(o[v][d],layout[v][d]||0);
+		var parseValues = function (o, v) {
+			if (o && o[v]) {
+				["t", "r", "b", "l"].each(function (d) {
+					layout[v][d] = Math.max(o[v][d], layout[v][d] || 0);
 				});
 			}
-			if (o && o[v+"s"] instanceof Array){
-				["t","r","b","l"].each(function(d){
-					var defaultRule = o[v+"s"].find(function(e){ return !e.edgeRole });
+			if (o && o[v + "s"] instanceof Array) {
+				["t", "r", "b", "l"].each(function (d) {
+					var defaultRule = o[v + "s"].find(function (e) {
+						return !e.edgeRole
+					});
 					var edgeRule;
 					if (edgeShape instanceof ORYX.Core.Edge) {
-						edgeRule = o[v + "s"].find(function(e){return this._hasRole(edgeShape, e.edgeRole) }.bind(this));
+						edgeRule = o[v + "s"].find(function (e) {
+							return this._hasRole(edgeShape, e.edgeRole)
+						}.bind(this));
 					}
-					layout[v][d]=Math.max(edgeRule?edgeRule[d]:defaultRule[d],layout[v][d]||0);
+					layout[v][d] = Math.max(edgeRule ? edgeRule[d] : defaultRule[d], layout[v][d] || 0);
 				}.bind(this));
 			}
 		}.bind(this)
 
 		// For each role
-		shape.getStencil().roles().each(function(role) {
+		shape.getStencil().roles().each(function (role) {
 			// check if there are layout information
-			if (this._layoutRules[role]){
+			if (this._layoutRules[role]) {
 				// if so, parse those information to the 'layout' variable
 				parseValues(this._layoutRules[role], "in");
 				parseValues(this._layoutRules[role], "out");
@@ -7928,10 +8132,10 @@ ORYX.Core.StencilSet.Rules = {
 
 		// Make sure, that every attribute has an value,
 		// otherwise set 1
-		["in","out"].each(function(v){
-			["t","r","b","l"].each(function(d){
-					layout[v][d]=layout[v][d]!==undefined?layout[v][d]:1;
-				});
+		["in", "out"].each(function (v) {
+			["t", "r", "b", "l"].each(function (d) {
+				layout[v][d] = layout[v][d] !== undefined ? layout[v][d] : 1;
+			});
 		})
 
 		return layout;
@@ -7946,11 +8150,15 @@ ORYX.Core.StencilSet.Rules = {
 	 * @param {ORYX.Core.Shape} shape
 	 * @param {String} role
 	 */
-	_hasRole: function(shape, role){
-		if (!(shape instanceof ORYX.Core.Shape)||!role){ return }
-		var isRole = shape.getStencil().roles().any(function(r){ return r == role});
+	_hasRole: function (shape, role) {
+		if (!(shape instanceof ORYX.Core.Shape) || !role) {
+			return
+		}
+		var isRole = shape.getStencil().roles().any(function (r) {
+			return r == role
+		});
 
-		return isRole || shape.getStencil().id() == (shape.getStencil().namespace()+role);
+		return isRole || shape.getStencil().id() == (shape.getStencil().namespace() + role);
 	},
 
 	/**
@@ -7960,8 +8168,8 @@ ORYX.Core.StencilSet.Rules = {
 	 *
 	 * @return {Array} Returns an array of stencils that can act as role.
 	 */
-	_stencilsWithRole: function(role) {
-		return this._stencils.findAll(function(stencil) {
+	_stencilsWithRole: function (role) {
+		return this._stencils.findAll(function (stencil) {
 			return (stencil.roles().member(role)) ? true : false;
 		});
 	},
@@ -7974,8 +8182,8 @@ ORYX.Core.StencilSet.Rules = {
 	 * @return {Array} Returns an array of stencils that can act as role and
 	 *         have the type 'edge'.
 	 */
-	_edgesWithRole: function(role) {
-		return this._stencils.findAll(function(stencil) {
+	_edgesWithRole: function (role) {
+		return this._stencils.findAll(function (stencil) {
 			return (stencil.roles().member(role) && stencil.type() === "edge") ? true : false;
 		});
 	},
@@ -7988,8 +8196,8 @@ ORYX.Core.StencilSet.Rules = {
 	 * @return {Array} Returns an array of stencils that can act as role and
 	 *         have the type 'node'.
 	 */
-	_nodesWithRole: function(role) {
-		return this._stencils.findAll(function(stencil) {
+	_nodesWithRole: function (role) {
+		return this._stencils.findAll(function (stencil) {
 			return (stencil.roles().member(role) && stencil.type() === "node") ? true : false;
 		});
 	},
@@ -8004,12 +8212,12 @@ ORYX.Core.StencilSet.Rules = {
 	 * @returns {Boolean} Returns the maximum occurrence of shapes of the
 	 *          stencil's type inside the parent.
 	 */
-	_getMaximumOccurrence: function(parent, child) {
+	_getMaximumOccurrence: function (parent, child) {
 		var max;
-		child.roles().each((function(role) {
+		child.roles().each((function (role) {
 			var cardRule = this._cardinalityRules[role];
-			if(cardRule && cardRule.maximumOccurrence) {
-				if(max) {
+			if (cardRule && cardRule.maximumOccurrence) {
+				if (max) {
 					max = Math.min(max, cardRule.maximumOccurrence);
 				} else {
 					max = cardRule.maximumOccurrence;
@@ -8030,23 +8238,23 @@ ORYX.Core.StencilSet.Rules = {
 	 * @return {Boolean} Returns, the maximum number of outgoing edges of the
 	 *         type specified by edgeStencil of the sourceShape.
 	 */
-	_getMaximumNumberOfOutgoingEdge: function(args) {
-		if(!args ||
-		   !args.sourceStencil ||
-		   !args.edgeStencil) {
-		   	return false;
+	_getMaximumNumberOfOutgoingEdge: function (args) {
+		if (!args ||
+			!args.sourceStencil ||
+			!args.edgeStencil) {
+			return false;
 		}
 
 		var max;
-		args.sourceStencil.roles().each((function(role) {
+		args.sourceStencil.roles().each((function (role) {
 			var cardRule = this._cardinalityRules[role];
 
-			if(cardRule && cardRule.outgoingEdges) {
-				args.edgeStencil.roles().each(function(edgeRole) {
+			if (cardRule && cardRule.outgoingEdges) {
+				args.edgeStencil.roles().each(function (edgeRole) {
 					var oe = cardRule.outgoingEdges[edgeRole];
 
-					if(oe && oe.maximum) {
-						if(max) {
+					if (oe && oe.maximum) {
+						if (max) {
 							max = Math.min(max, oe.maximum);
 						} else {
 							max = oe.maximum;
@@ -8068,21 +8276,21 @@ ORYX.Core.StencilSet.Rules = {
 	 * @return {Boolean} Returns the maximum number of incoming edges of the
 	 *         type specified by edgeStencil of the targetShape.
 	 */
-	_getMaximumNumberOfIncomingEdge: function(args) {
-		if(!args ||
-		   !args.targetStencil ||
-		   !args.edgeStencil) {
-		   	return false;
+	_getMaximumNumberOfIncomingEdge: function (args) {
+		if (!args ||
+			!args.targetStencil ||
+			!args.edgeStencil) {
+			return false;
 		}
 
 		var max;
-		args.targetStencil.roles().each((function(role) {
+		args.targetStencil.roles().each((function (role) {
 			var cardRule = this._cardinalityRules[role];
-			if(cardRule && cardRule.incomingEdges) {
-				args.edgeStencil.roles().each(function(edgeRole) {
+			if (cardRule && cardRule.incomingEdges) {
+				args.edgeStencil.roles().each(function (edgeRole) {
 					var ie = cardRule.incomingEdges[edgeRole];
-					if(ie && ie.maximum) {
-						if(max) {
+					if (ie && ie.maximum) {
+						if (max) {
 							max = Math.min(max, ie.maximum);
 						} else {
 							max = ie.maximum;
@@ -8103,12 +8311,12 @@ ORYX.Core.StencilSet.Rules = {
 	 * @return {Hash} Returns a hash map of all connection rules for
 	 *         edgeStencil.
 	 */
-	_getConnectionRulesOfEdgeStencil: function(edgeStencil) {
+	_getConnectionRulesOfEdgeStencil: function (edgeStencil) {
 		var edgeRules = new Hash();
-		edgeStencil.roles().each((function(role) {
-			if(this._connectionRules[role]) {
-				this._connectionRules[role].each(function(cr) {
-					if(edgeRules[cr.key]) {
+		edgeStencil.roles().each((function (role) {
+			if (this._connectionRules[role]) {
+				this._connectionRules[role].each(function (cr) {
+					if (edgeRules[cr.key]) {
 						edgeRules[cr.key] = edgeRules[cr.key].concat(cr.value);
 					} else {
 						edgeRules[cr.key] = cr.value;
@@ -8120,11 +8328,13 @@ ORYX.Core.StencilSet.Rules = {
 		return edgeRules;
 	},
 
-	_isRoleOfOtherNamespace: function(role) {
+	_isRoleOfOtherNamespace: function (role) {
 		return (role.indexOf("#") > 0);
 	},
 
-	toString: function() { return "Rules"; }
+	toString: function () {
+		return "Rules";
+	}
 }
 ORYX.Core.StencilSet.Rules = Clazz.extend(ORYX.Core.StencilSet.Rules);
 /*
@@ -8141,13 +8351,13 @@ ORYX.Core.StencilSet.Rules = Clazz.extend(ORYX.Core.StencilSet.Rules);
  * Init namespace
  */
 if (!ORYX) {
-    var ORYX = {};
+	var ORYX = {};
 }
 if (!ORYX.Core) {
-    ORYX.Core = {};
+	ORYX.Core = {};
 }
 if (!ORYX.Core.StencilSet) {
-    ORYX.Core.StencilSet = {};
+	ORYX.Core.StencilSet = {};
 }
 
 /**
@@ -8157,67 +8367,67 @@ if (!ORYX.Core.StencilSet) {
  */
 ORYX.Core.StencilSet.StencilSet = Clazz.extend({
 
-    /**
-     * Constructor
-     * @param source {URL} A reference to the stencil set specification.
-     *
-     */
-    construct: function(source, modelMetaData, editorId){
-        arguments.callee.$.construct.apply(this, arguments);
+	/**
+	 * Constructor
+	 * @param source {URL} A reference to the stencil set specification.
+	 *
+	 */
+	construct: function (source, modelMetaData, editorId) {
+		arguments.callee.$.construct.apply(this, arguments);
 
-        if (!source) {
-            throw "ORYX.Core.StencilSet.StencilSet(construct): Parameter 'source' is not defined.";
-        }
+		if (!source) {
+			throw "ORYX.Core.StencilSet.StencilSet(construct): Parameter 'source' is not defined.";
+		}
 
-        if (source.endsWith("/")) {
-            source = source.substr(0, source.length - 1);
-        }
+		if (source.endsWith("/")) {
+			source = source.substr(0, source.length - 1);
+		}
 
 		this._extensions = new Hash();
 
-        this._source = source;
-        this._baseUrl = source.substring(0, source.lastIndexOf("/") + 1);
+		this._source = source;
+		this._baseUrl = source.substring(0, source.lastIndexOf("/") + 1);
 
-        this._jsonObject = {};
+		this._jsonObject = {};
 
-        this._stencils = new Hash();
+		this._stencils = new Hash();
 		this._availableStencils = new Hash();
 
-		if(ORYX.CONFIG.BACKEND_SWITCH) {
+		if (ORYX.CONFIG.BACKEND_SWITCH) {
 			this._baseUrl = "editor/stencilsets/bpmn2.0/";
 			this._source = "stencilsets/bpmn2.0/bpmn2.0.json";
 
 			new Ajax.Request(ACTIVITI.CONFIG.contextRoot + '/editor/stencilset?version=' + Date.now(), {
-	            asynchronous: false,
-	            method: 'get',
-	            onSuccess: this._init.bind(this),
-	            onFailure: this._cancelInit.bind(this)
-	        });
+				asynchronous: false,
+				method: 'get',
+				onSuccess: this._init.bind(this),
+				onFailure: this._cancelInit.bind(this)
+			});
 
 		} else {
 			new Ajax.Request(source, {
-	            asynchronous: false,
-	            method: 'get',
-	            onSuccess: this._init.bind(this),
-	            onFailure: this._cancelInit.bind(this)
-	        });
+				asynchronous: false,
+				method: 'get',
+				onSuccess: this._init.bind(this),
+				onFailure: this._cancelInit.bind(this)
+			});
 		}
 
-        if (this.errornous)
-            throw "Loading stencil set " + source + " failed.";
-    },
+		if (this.errornous)
+			throw "Loading stencil set " + source + " failed.";
+	},
 
-    /**
-     * Finds a root stencil in this stencil set. There may be many of these. If
-     * there are, the first one found will be used. In Firefox, this is the
-     * topmost definition in the stencil set description file.
-     */
-    findRootStencilName: function(){
+	/**
+	 * Finds a root stencil in this stencil set. There may be many of these. If
+	 * there are, the first one found will be used. In Firefox, this is the
+	 * topmost definition in the stencil set description file.
+	 */
+	findRootStencilName: function () {
 
-        // find any stencil that may be root.
-        var rootStencil = this._stencils.values().find(function(stencil){
-            return stencil._jsonStencil.mayBeRoot
-        });
+		// find any stencil that may be root.
+		var rootStencil = this._stencils.values().find(function (stencil) {
+			return stencil._jsonStencil.mayBeRoot
+		});
 
 		// if there is none, just guess the first.
 		if (!rootStencil) {
@@ -8225,25 +8435,25 @@ ORYX.Core.StencilSet.StencilSet = Clazz.extend({
 			rootStencil = this._stencils.values()[0];
 		}
 
-        // return its id.
-        return rootStencil.id();
-    },
+		// return its id.
+		return rootStencil.id();
+	},
 
-    /**
-     * @param {ORYX.Core.StencilSet.StencilSet} stencilSet
-     * @return {Boolean} True, if stencil set has the same namespace.
-     */
-    equals: function(stencilSet){
-        return (this.namespace() === stencilSet.namespace());
-    },
+	/**
+	 * @param {ORYX.Core.StencilSet.StencilSet} stencilSet
+	 * @return {Boolean} True, if stencil set has the same namespace.
+	 */
+	equals: function (stencilSet) {
+		return (this.namespace() === stencilSet.namespace());
+	},
 
 	/**
 	 *
 	 * @param {Oryx.Core.StencilSet.Stencil} rootStencil If rootStencil is defined, it only returns stencils
-	 * 			that could be (in)direct child of that stencil.
+	 *            that could be (in)direct child of that stencil.
 	 */
-    stencils: function(rootStencil, rules, sortByGroup){
-		if(rootStencil && rules) {
+	stencils: function (rootStencil, rules, sortByGroup) {
+		if (rootStencil && rules) {
 			var stencils = this._availableStencils.values();
 			var containers = [rootStencil];
 			var checkedContainers = [];
@@ -8253,14 +8463,14 @@ ORYX.Core.StencilSet.StencilSet = Clazz.extend({
 			while (containers.size() > 0) {
 				var container = containers.pop();
 				checkedContainers.push(container);
-				var children = stencils.findAll(function(stencil){
+				var children = stencils.findAll(function (stencil) {
 					var args = {
 						containingStencil: container,
 						containedStencil: stencil
 					};
 					return rules.canContain(args);
 				});
-				for(var i = 0; i < children.size(); i++) {
+				for (var i = 0; i < children.size(); i++) {
 					if (!checkedContainers.member(children[i])) {
 						containers.push(children[i]);
 					}
@@ -8269,18 +8479,18 @@ ORYX.Core.StencilSet.StencilSet = Clazz.extend({
 			}
 
 			// Sort the result to the origin order
-			result = result.sortBy(function(stencil) {
+			result = result.sortBy(function (stencil) {
 				return stencils.indexOf(stencil);
 			});
 
 
-			if(sortByGroup) {
-				result = result.sortBy(function(stencil) {
+			if (sortByGroup) {
+				result = result.sortBy(function (stencil) {
 					return stencil.groups().first();
 				});
 			}
 
-			var edges = stencils.findAll(function(stencil) {
+			var edges = stencils.findAll(function (stencil) {
 				return stencil.type() == "edge";
 			});
 			result = result.concat(edges);
@@ -8288,89 +8498,89 @@ ORYX.Core.StencilSet.StencilSet = Clazz.extend({
 			return result;
 
 		} else {
-        	if(sortByGroup) {
-				return this._availableStencils.values().sortBy(function(stencil) {
+			if (sortByGroup) {
+				return this._availableStencils.values().sortBy(function (stencil) {
 					return stencil.groups().first();
 				});
 			} else {
 				return this._availableStencils.values();
 			}
 		}
-    },
+	},
 
-    nodes: function(){
-        return this._availableStencils.values().findAll(function(stencil){
-            return (stencil.type() === 'node')
-        });
-    },
+	nodes: function () {
+		return this._availableStencils.values().findAll(function (stencil) {
+			return (stencil.type() === 'node')
+		});
+	},
 
-    edges: function(){
-        return this._availableStencils.values().findAll(function(stencil){
-            return (stencil.type() === 'edge')
-        });
-    },
+	edges: function () {
+		return this._availableStencils.values().findAll(function (stencil) {
+			return (stencil.type() === 'edge')
+		});
+	},
 
-    stencil: function(id){
-        return this._stencils[id];
-    },
+	stencil: function (id) {
+		return this._stencils[id];
+	},
 
-    title: function(){
-        return ORYX.Core.StencilSet.getTranslation(this._jsonObject, "title");
-    },
+	title: function () {
+		return ORYX.Core.StencilSet.getTranslation(this._jsonObject, "title");
+	},
 
-    description: function(){
-        return ORYX.Core.StencilSet.getTranslation(this._jsonObject, "description");
-    },
+	description: function () {
+		return ORYX.Core.StencilSet.getTranslation(this._jsonObject, "description");
+	},
 
-    namespace: function(){
-        return this._jsonObject ? this._jsonObject.namespace : null;
-    },
+	namespace: function () {
+		return this._jsonObject ? this._jsonObject.namespace : null;
+	},
 
-    jsonRules: function(){
-        return this._jsonObject ? this._jsonObject.rules : null;
-    },
+	jsonRules: function () {
+		return this._jsonObject ? this._jsonObject.rules : null;
+	},
 
-    source: function(){
-        return this._source;
-    },
+	source: function () {
+		return this._source;
+	},
 
-	extensions: function() {
+	extensions: function () {
 		return this._extensions;
 	},
 
-	addExtension: function(url) {
+	addExtension: function (url) {
 
 		new Ajax.Request(url, {
-            method: 'GET',
-            asynchronous: false,
-			onSuccess: (function(transport) {
+			method: 'GET',
+			asynchronous: false,
+			onSuccess: (function (transport) {
 				this.addExtensionDirectly(transport.responseText);
 			}).bind(this),
-			onFailure: (function(transport) {
+			onFailure: (function (transport) {
 				ORYX.Log.debug("Loading stencil set extension file failed. The request returned an error." + transport);
 			}).bind(this),
-			onException: (function(transport) {
+			onException: (function (transport) {
 				ORYX.Log.debug("Loading stencil set extension file failed. The request returned an error." + transport);
 			}).bind(this)
 
 		});
 	},
 
-	addExtensionDirectly: function(str){
+	addExtensionDirectly: function (str) {
 
 		try {
 			eval("var jsonExtension = " + str);
 
-			if(!(jsonExtension["extends"].endsWith("#")))
-					jsonExtension["extends"] += "#";
+			if (!(jsonExtension["extends"].endsWith("#")))
+				jsonExtension["extends"] += "#";
 
-			if(jsonExtension["extends"] == this.namespace()) {
+			if (jsonExtension["extends"] == this.namespace()) {
 				this._extensions[jsonExtension.namespace] = jsonExtension;
 
 				var defaultPosition = this._stencils.keys().size();
 				//load new stencils
-				if(jsonExtension.stencils) {
-					$A(jsonExtension.stencils).each(function(stencil) {
+				if (jsonExtension.stencils) {
+					$A(jsonExtension.stencils).each(function (stencil) {
 						defaultPosition++;
 						var oStencil = new ORYX.Core.StencilSet.Stencil(stencil, this.namespace(), this._baseUrl, this, undefined, defaultPosition);
 						this._stencils[oStencil.id()] = oStencil;
@@ -8382,20 +8592,19 @@ ORYX.Core.StencilSet.StencilSet = Clazz.extend({
 				if (jsonExtension.properties) {
 					var stencils = this._stencils.values();
 
-					stencils.each(function(stencil){
+					stencils.each(function (stencil) {
 						var roles = stencil.roles();
 
-						jsonExtension.properties.each(function(prop){
-							prop.roles.any(function(role){
+						jsonExtension.properties.each(function (prop) {
+							prop.roles.any(function (role) {
 								role = jsonExtension["extends"] + role;
 								if (roles.member(role)) {
-									prop.properties.each(function(property){
+									prop.properties.each(function (property) {
 										stencil.addProperty(property, jsonExtension.namespace);
 									});
 
 									return true;
-								}
-								else
+								} else
 									return false;
 							})
 						})
@@ -8403,11 +8612,11 @@ ORYX.Core.StencilSet.StencilSet = Clazz.extend({
 				}
 
 				//remove stencil properties
-				if(jsonExtension.removeproperties) {
-					jsonExtension.removeproperties.each(function(remprop) {
+				if (jsonExtension.removeproperties) {
+					jsonExtension.removeproperties.each(function (remprop) {
 						var stencil = this.stencil(jsonExtension["extends"] + remprop.stencil);
-						if(stencil) {
-							remprop.properties.each(function(propId) {
+						if (stencil) {
+							remprop.properties.each(function (propId) {
 								stencil.removeProperty(propId);
 							});
 						}
@@ -8415,8 +8624,8 @@ ORYX.Core.StencilSet.StencilSet = Clazz.extend({
 				}
 
 				//remove stencils
-				if(jsonExtension.removestencils) {
-					$A(jsonExtension.removestencils).each(function(remstencil) {
+				if (jsonExtension.removestencils) {
+					$A(jsonExtension.removestencils).each(function (remstencil) {
 						delete this._availableStencils[jsonExtension["extends"] + remstencil];
 					}.bind(this));
 				}
@@ -8426,13 +8635,13 @@ ORYX.Core.StencilSet.StencilSet = Clazz.extend({
 		}
 	},
 
-	removeExtension: function(namespace) {
+	removeExtension: function (namespace) {
 		var jsonExtension = this._extensions[namespace];
-		if(jsonExtension) {
+		if (jsonExtension) {
 
 			//unload extension's stencils
-			if(jsonExtension.stencils) {
-				$A(jsonExtension.stencils).each(function(stencil) {
+			if (jsonExtension.stencils) {
+				$A(jsonExtension.stencils).each(function (stencil) {
 					var oStencil = new ORYX.Core.StencilSet.Stencil(stencil, this.namespace(), this._baseUrl, this);
 					delete this._stencils[oStencil.id()]; // maybe not ??
 					delete this._availableStencils[oStencil.id()];
@@ -8443,20 +8652,19 @@ ORYX.Core.StencilSet.StencilSet = Clazz.extend({
 			if (jsonExtension.properties) {
 				var stencils = this._stencils.values();
 
-				stencils.each(function(stencil){
+				stencils.each(function (stencil) {
 					var roles = stencil.roles();
 
-					jsonExtension.properties.each(function(prop){
-						prop.roles.any(function(role){
+					jsonExtension.properties.each(function (prop) {
+						prop.roles.any(function (role) {
 							role = jsonExtension["extends"] + role;
 							if (roles.member(role)) {
-								prop.properties.each(function(property){
+								prop.properties.each(function (property) {
 									stencil.removeProperty(property.id);
 								});
 
 								return true;
-							}
-							else
+							} else
 								return false;
 						})
 					})
@@ -8464,13 +8672,17 @@ ORYX.Core.StencilSet.StencilSet = Clazz.extend({
 			}
 
 			//restore removed stencil properties
-			if(jsonExtension.removeproperties) {
-				jsonExtension.removeproperties.each(function(remprop) {
+			if (jsonExtension.removeproperties) {
+				jsonExtension.removeproperties.each(function (remprop) {
 					var stencil = this.stencil(jsonExtension["extends"] + remprop.stencil);
-					if(stencil) {
-						var stencilJson = $A(this._jsonObject.stencils).find(function(s) { return s.id == stencil.id() });
-						remprop.properties.each(function(propId) {
-							var propertyJson = $A(stencilJson.properties).find(function(p) { return p.id == propId });
+					if (stencil) {
+						var stencilJson = $A(this._jsonObject.stencils).find(function (s) {
+							return s.id == stencil.id()
+						});
+						remprop.properties.each(function (propId) {
+							var propertyJson = $A(stencilJson.properties).find(function (p) {
+								return p.id == propId
+							});
 							stencil.addProperty(propertyJson, this.namespace());
 						}.bind(this));
 					}
@@ -8478,8 +8690,8 @@ ORYX.Core.StencilSet.StencilSet = Clazz.extend({
 			}
 
 			//restore removed stencils
-			if(jsonExtension.removestencils) {
-				$A(jsonExtension.removestencils).each(function(remstencil) {
+			if (jsonExtension.removestencils) {
+				$A(jsonExtension.removestencils).each(function (remstencil) {
 					var sId = jsonExtension["extends"] + remstencil;
 					this._availableStencils[sId] = this._stencils[sId];
 				}.bind(this));
@@ -8488,85 +8700,84 @@ ORYX.Core.StencilSet.StencilSet = Clazz.extend({
 		delete this._extensions[namespace];
 	},
 
-    __handleStencilset: function(response){
+	__handleStencilset: function (response) {
 
-        try {
-            // using eval instead of prototype's parsing,
-            // since there are functions in this JSON.
-            eval("this._jsonObject =" + response.responseText);
-        }
-        catch (e) {
-            throw "Stenciset corrupt: " + e;
-        }
+		try {
+			// using eval instead of prototype's parsing,
+			// since there are functions in this JSON.
+			eval("this._jsonObject =" + response.responseText);
+		} catch (e) {
+			throw "Stenciset corrupt: " + e;
+		}
 
-        // assert it was parsed.
-        if (!this._jsonObject) {
-            throw "Error evaluating stencilset. It may be corrupt.";
-        }
+		// assert it was parsed.
+		if (!this._jsonObject) {
+			throw "Error evaluating stencilset. It may be corrupt.";
+		}
 
-        with (this._jsonObject) {
+		with (this._jsonObject) {
 
-            // assert there is a namespace.
-            if (!namespace || namespace === "")
-                throw "Namespace definition missing in stencilset.";
+			// assert there is a namespace.
+			if (!namespace || namespace === "")
+				throw "Namespace definition missing in stencilset.";
 
-            if (!(stencils instanceof Array))
-                throw "Stencilset corrupt.";
+			if (!(stencils instanceof Array))
+				throw "Stencilset corrupt.";
 
-            // assert namespace ends with '#'.
-            if (!namespace.endsWith("#"))
-                namespace = namespace + "#";
+			// assert namespace ends with '#'.
+			if (!namespace.endsWith("#"))
+				namespace = namespace + "#";
 
-            // assert title and description are strings.
-            if (!title)
-                title = "";
-            if (!description)
-                description = "";
-        }
-    },
+			// assert title and description are strings.
+			if (!title)
+				title = "";
+			if (!description)
+				description = "";
+		}
+	},
 
-    /**
-     * This method is called when the HTTP request to get the requested stencil
-     * set succeeds. The response is supposed to be a JSON representation
-     * according to the stencil set specification.
-     * @param {Object} response The JSON representation according to the
-     * 			stencil set specification.
-     */
-    _init: function(response){
+	/**
+	 * This method is called when the HTTP request to get the requested stencil
+	 * set succeeds. The response is supposed to be a JSON representation
+	 * according to the stencil set specification.
+	 * @param {Object} response The JSON representation according to the
+	 *            stencil set specification.
+	 */
+	_init: function (response) {
 
-        // init and check consistency.
-        this.__handleStencilset(response);
+		// init and check consistency.
+		this.__handleStencilset(response);
 
 		var pps = new Hash();
 
 		// init property packages
-		if(this._jsonObject.propertyPackages) {
-			$A(this._jsonObject.propertyPackages).each((function(pp) {
+		if (this._jsonObject.propertyPackages) {
+			$A(this._jsonObject.propertyPackages).each((function (pp) {
 				pps[pp.name] = pp.properties;
 			}).bind(this));
 		}
 
 		var defaultPosition = 0;
 
-        // init each stencil
-        $A(this._jsonObject.stencils).each((function(stencil){
-        	defaultPosition++;
+		// init each stencil
+		$A(this._jsonObject.stencils).each((function (stencil) {
+			defaultPosition++;
 
-            // instantiate normally.
-            var oStencil = new ORYX.Core.StencilSet.Stencil(stencil, this.namespace(), this._baseUrl, this, pps, defaultPosition);
+			// instantiate normally.
+			var oStencil = new ORYX.Core.StencilSet.Stencil(stencil, this.namespace(), this._baseUrl, this, pps, defaultPosition);
 			this._stencils[oStencil.id()] = oStencil;
 			this._availableStencils[oStencil.id()] = oStencil;
 
-        }).bind(this));
-    },
+		}).bind(this));
+	},
 
-    _cancelInit: function(response){
-        this.errornous = true;
-    },
+	_cancelInit: function (response) {
+		this.errornous = true;
+	},
 
-    toString: function(){
-        return "StencilSet " + this.title() + " (" + this.namespace() + ")";
-    }
+	toString: function () {
+		return "StencilSet " + this.title() + " (" + this.namespace() + ")";
+	}
 });
 /*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
@@ -8581,9 +8792,15 @@ ORYX.Core.StencilSet.StencilSet = Clazz.extend({
 /**
  * Init namespace
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
-if(!ORYX.Core.StencilSet) {ORYX.Core.StencilSet = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
+if (!ORYX.Core.StencilSet) {
+	ORYX.Core.StencilSet = {};
+}
 
 /**
  * Class StencilSets
@@ -8609,13 +8826,13 @@ ORYX.Core.StencilSet._rulesByEditorInstance = new Hash();
  * @param {String} editorId
  *
  * @return {Hash} Returns a hash map with all stencil sets that are loaded by
- * 					the editor with the editorId.
+ *                    the editor with the editorId.
  */
-ORYX.Core.StencilSet.stencilSets = function(editorId) {
+ORYX.Core.StencilSet.stencilSets = function (editorId) {
 	var stencilSetNSs = ORYX.Core.StencilSet._StencilSetNSByEditorInstance[editorId];
 	var stencilSets = new Hash();
-	if(stencilSetNSs) {
-		stencilSetNSs.each(function(stencilSetNS) {
+	if (stencilSetNSs) {
+		stencilSetNSs.each(function (stencilSetNS) {
 			var stencilSet = ORYX.Core.StencilSet.stencilSet(stencilSetNS)
 			stencilSets[stencilSet.namespace()] = stencilSet;
 		});
@@ -8628,17 +8845,17 @@ ORYX.Core.StencilSet.stencilSets = function(editorId) {
  * @param {String} namespace
  *
  * @return {ORYX.Core.StencilSet.StencilSet} Returns the stencil set with the specified
- * 										namespace.
+ *                                        namespace.
  *
  * The method can handle namespace strings like
  *  http://www.example.org/stencilset
  *  http://www.example.org/stencilset#
  *  http://www.example.org/stencilset#ANode
  */
-ORYX.Core.StencilSet.stencilSet = function(namespace) {
+ORYX.Core.StencilSet.stencilSet = function (namespace) {
 	ORYX.Log.trace("Getting stencil set %0", namespace);
 	var splitted = namespace.split("#", 1);
-	if(splitted.length === 1) {
+	if (splitted.length === 1) {
 		ORYX.Log.trace("Getting stencil set %0", splitted[0]);
 		return ORYX.Core.StencilSet._stencilSetsByNamespace[splitted[0] + "#"];
 	} else {
@@ -8655,10 +8872,10 @@ ORYX.Core.StencilSet.stencilSet = function(namespace) {
  * The id must be unique and contains the namespace of the stencil's stencil set.
  * e.g. http://www.example.org/stencilset#ANode
  */
-ORYX.Core.StencilSet.stencil = function(id) {
+ORYX.Core.StencilSet.stencil = function (id) {
 	ORYX.Log.trace("Getting stencil for %0", id);
 	var ss = ORYX.Core.StencilSet.stencilSet(id);
-	if(ss) {
+	if (ss) {
 		return ss.stencil(id);
 	} else {
 
@@ -8672,10 +8889,10 @@ ORYX.Core.StencilSet.stencil = function(id) {
  * @param {String} editorId
  *
  * @return {ORYX.Core.StencilSet.Rules} Returns the rules object for the editor
- * 									specified by its editor id.
+ *                                    specified by its editor id.
  */
-ORYX.Core.StencilSet.rules = function(editorId) {
-	if(!ORYX.Core.StencilSet._rulesByEditorInstance[editorId]) {
+ORYX.Core.StencilSet.rules = function (editorId) {
+	if (!ORYX.Core.StencilSet._rulesByEditorInstance[editorId]) {
 		ORYX.Core.StencilSet._rulesByEditorInstance[editorId] = new ORYX.Core.StencilSet.Rules();
 	}
 	return ORYX.Core.StencilSet._rulesByEditorInstance[editorId];
@@ -8690,34 +8907,34 @@ ORYX.Core.StencilSet.rules = function(editorId) {
  * It also stores which editor instance loads the stencil set and
  * initializes the Rules object for the editor instance.
  */
-ORYX.Core.StencilSet.loadStencilSet = function(url, modelMetaData, editorId) {
+ORYX.Core.StencilSet.loadStencilSet = function (url, modelMetaData, editorId) {
 
 	// Alfresco: disable cache, because stencil sets are now flexible
 
 	//var stencilSet = ORYX.Core.StencilSet._stencilSetsByUrl[url];
 
 	//if(!stencilSet) {
-		//load stencil set
-		stencilSet = new ORYX.Core.StencilSet.StencilSet(url, modelMetaData, editorId);
+	//load stencil set
+	stencilSet = new ORYX.Core.StencilSet.StencilSet(url, modelMetaData, editorId);
 
-		//store stencil set
-		ORYX.Core.StencilSet._stencilSetsByNamespace[stencilSet.namespace()] = stencilSet;
+	//store stencil set
+	ORYX.Core.StencilSet._stencilSetsByNamespace[stencilSet.namespace()] = stencilSet;
 
-		//store stencil set by url
-		ORYX.Core.StencilSet._stencilSetsByUrl[url] = stencilSet;
+	//store stencil set by url
+	ORYX.Core.StencilSet._stencilSetsByUrl[url] = stencilSet;
 	//}
 
 	var namespace = stencilSet.namespace();
 
 	//store which editorInstance loads the stencil set
-	if(ORYX.Core.StencilSet._StencilSetNSByEditorInstance[editorId]) {
+	if (ORYX.Core.StencilSet._StencilSetNSByEditorInstance[editorId]) {
 		ORYX.Core.StencilSet._StencilSetNSByEditorInstance[editorId].push(namespace);
 	} else {
 		ORYX.Core.StencilSet._StencilSetNSByEditorInstance[editorId] = [namespace];
 	}
 
 	//store the rules for the editor instance
-	if(ORYX.Core.StencilSet._rulesByEditorInstance[editorId]) {
+	if (ORYX.Core.StencilSet._rulesByEditorInstance[editorId]) {
 		ORYX.Core.StencilSet._rulesByEditorInstance[editorId].initializeRules(stencilSet);
 	} else {
 		var rules = new ORYX.Core.StencilSet.Rules();
@@ -8730,17 +8947,17 @@ ORYX.Core.StencilSet.loadStencilSet = function(url, modelMetaData, editorId) {
  * Returns the translation of an attribute in jsonObject specified by its name
  * according to navigator.language
  */
-ORYX.Core.StencilSet.getTranslation = function(jsonObject, name) {
+ORYX.Core.StencilSet.getTranslation = function (jsonObject, name) {
 	var lang = ORYX.I18N.Language.toLowerCase();
 
 	var result = jsonObject[name + "_" + lang];
 
-	if(result)
+	if (result)
 		return result;
 
 	result = jsonObject[name + "_" + lang.substr(0, 2)];
 
-	if(result)
+	if (result)
 		return result;
 
 	return jsonObject[name];
@@ -8758,8 +8975,12 @@ ORYX.Core.StencilSet.getTranslation = function(jsonObject, name) {
 /**
  * Init namespaces
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
 
 
 /**
@@ -8770,20 +8991,20 @@ ORYX.Core.Command = Clazz.extend({
 	/**
 	 * Constructor
 	 */
-	construct: function() {
+	construct: function () {
 
 	},
 
-	execute: function(){
+	execute: function () {
 		throw "Command.execute() has to be implemented!"
 	},
 
-	rollback: function(){
+	rollback: function () {
 		throw "Command.rollback() has to be implemented!"
 	}
 
 
- });/*
+});/*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
  * License rights for this program may be obtained from Alfresco Software, Ltd.
  * pursuant to a written agreement and any use of this program without such an
@@ -8796,8 +9017,12 @@ ORYX.Core.Command = Clazz.extend({
 /**
  * Init namespaces
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
 
 
 /**
@@ -8808,7 +9033,7 @@ ORYX.Core.Bounds = {
 	/**
 	 * Constructor
 	 */
-	construct: function() {
+	construct: function () {
 		this._changedCallbacks = []; //register a callback with changedCallacks.push(this.method.bind(this));
 		this.a = {};
 		this.b = {};
@@ -8820,9 +9045,9 @@ ORYX.Core.Bounds = {
 	/**
 	 * Calls all registered callbacks.
 	 */
-	_changed: function(sizeChanged) {
-		if(!this.suspendChange) {
-			this._changedCallbacks.each(function(callback) {
+	_changed: function (sizeChanged) {
+		if (!this.suspendChange) {
+			this._changedCallbacks.each(function (callback) {
 				callback(this, sizeChanged);
 			}.bind(this));
 			this.changedWhileSuspend = false;
@@ -8834,8 +9059,8 @@ ORYX.Core.Bounds = {
 	 * Registers a callback that is called, if the bounds changes.
 	 * @param callback {Function} The callback function.
 	 */
-	registerCallback: function(callback) {
-		if(!this._changedCallbacks.member(callback)) {
+	registerCallback: function (callback) {
+		if (!this._changedCallbacks.member(callback)) {
 			this._changedCallbacks.push(callback);
 		}
 	},
@@ -8844,8 +9069,8 @@ ORYX.Core.Bounds = {
 	 * Unregisters a callback.
 	 * @param callback {Function} The callback function.
 	 */
-	unregisterCallback: function(callback) {
-			this._changedCallbacks = this._changedCallbacks.without(callback);
+	unregisterCallback: function (callback) {
+		this._changedCallbacks = this._changedCallbacks.without(callback);
 	},
 
 	/**
@@ -8853,26 +9078,26 @@ ORYX.Core.Bounds = {
 	 * (set(ax, ay, bx, by);), two points (set({x: ax, y: ay}, {x: bx, y: by});)
 	 * or one bound (set({a: {x: ax, y: ay}, b: {x: bx, y: by}});).
 	 */
-	set: function() {
+	set: function () {
 
 		var changed = false;
 
 		switch (arguments.length) {
 
 			case 1:
-				if(this.a.x !== arguments[0].a.x) {
+				if (this.a.x !== arguments[0].a.x) {
 					changed = true;
 					this.a.x = arguments[0].a.x;
 				}
-				if(this.a.y !== arguments[0].a.y) {
+				if (this.a.y !== arguments[0].a.y) {
 					changed = true;
 					this.a.y = arguments[0].a.y;
 				}
-				if(this.b.x !== arguments[0].b.x) {
+				if (this.b.x !== arguments[0].b.x) {
 					changed = true;
 					this.b.x = arguments[0].b.x;
 				}
-				if(this.b.y !== arguments[0].b.y) {
+				if (this.b.y !== arguments[0].b.y) {
 					changed = true;
 					this.b.y = arguments[0].b.y;
 				}
@@ -8883,19 +9108,19 @@ ORYX.Core.Bounds = {
 				var ay = Math.min(arguments[0].y, arguments[1].y);
 				var bx = Math.max(arguments[0].x, arguments[1].x);
 				var by = Math.max(arguments[0].y, arguments[1].y);
-				if(this.a.x !== ax) {
+				if (this.a.x !== ax) {
 					changed = true;
 					this.a.x = ax;
 				}
-				if(this.a.y !== ay) {
+				if (this.a.y !== ay) {
 					changed = true;
 					this.a.y = ay;
 				}
-				if(this.b.x !== bx) {
+				if (this.b.x !== bx) {
 					changed = true;
 					this.b.x = bx;
 				}
-				if(this.b.y !== by) {
+				if (this.b.y !== by) {
 					changed = true;
 					this.b.y = by;
 				}
@@ -8906,26 +9131,26 @@ ORYX.Core.Bounds = {
 				var ay = Math.min(arguments[1], arguments[3]);
 				var bx = Math.max(arguments[0], arguments[2]);
 				var by = Math.max(arguments[1], arguments[3]);
-				if(this.a.x !== ax) {
+				if (this.a.x !== ax) {
 					changed = true;
 					this.a.x = ax;
 				}
-				if(this.a.y !== ay) {
+				if (this.a.y !== ay) {
 					changed = true;
 					this.a.y = ay;
 				}
-				if(this.b.x !== bx) {
+				if (this.b.x !== bx) {
 					changed = true;
 					this.b.x = bx;
 				}
-				if(this.b.y !== by) {
+				if (this.b.y !== by) {
 					changed = true;
 					this.b.y = by;
 				}
 				break;
 		}
 
-		if(changed) {
+		if (changed) {
 			this._changed(true);
 		}
 	},
@@ -8937,7 +9162,7 @@ ORYX.Core.Bounds = {
 	 * @param {Number} x
 	 * @param {Number} y
 	 */
-	moveTo: function() {
+	moveTo: function () {
 
 		var currentPosition = this.upperLeft();
 		switch (arguments.length) {
@@ -8954,7 +9179,7 @@ ORYX.Core.Bounds = {
 				});
 				break;
 			default:
-				//TODO error
+			//TODO error
 		}
 
 	},
@@ -8967,13 +9192,13 @@ ORYX.Core.Bounds = {
 	 * @param {Number} y
 	 *
 	 */
-	moveBy: function() {
+	moveBy: function () {
 		var changed = false;
 
 		switch (arguments.length) {
 			case 1:
 				var p = arguments[0];
-				if(p.x !== 0 || p.y !== 0) {
+				if (p.x !== 0 || p.y !== 0) {
 					changed = true;
 					this.a.x += p.x;
 					this.b.x += p.x;
@@ -8984,7 +9209,7 @@ ORYX.Core.Bounds = {
 			case 2:
 				var x = arguments[0];
 				var y = arguments[1];
-				if(x !== 0 || y !== 0) {
+				if (x !== 0 || y !== 0) {
 					changed = true;
 					this.a.x += x;
 					this.b.x += x;
@@ -8993,10 +9218,10 @@ ORYX.Core.Bounds = {
 				}
 				break;
 			default:
-				//TODO error
+			//TODO error
 		}
 
-		if(changed) {
+		if (changed) {
 			this._changed();
 		}
 	},
@@ -9005,18 +9230,19 @@ ORYX.Core.Bounds = {
 	 * Includes the bounds b into the current bounds.
 	 * @param {Bounds} b
 	 */
-	include: function(b) {
+	include: function (b) {
 
-		if( (this.a.x === undefined) && (this.a.y === undefined) &&
+		if ((this.a.x === undefined) && (this.a.y === undefined) &&
 			(this.b.x === undefined) && (this.b.y === undefined)) {
 			return b;
-		};
+		}
+		;
 
-		var cx = Math.min(this.a.x,b.a.x);
-		var cy = Math.min(this.a.y,b.a.y);
+		var cx = Math.min(this.a.x, b.a.x);
+		var cy = Math.min(this.a.y, b.a.y);
 
-		var dx = Math.max(this.b.x,b.b.x);
-		var dy = Math.max(this.b.y,b.b.y);
+		var dx = Math.max(this.b.x, b.b.x);
+		var dy = Math.max(this.b.y, b.b.y);
 
 
 		this.set(cx, cy, dx, dy);
@@ -9026,9 +9252,9 @@ ORYX.Core.Bounds = {
 	 * Relatively extends the bounds by p.
 	 * @param {Point} p
 	 */
-	extend: function(p) {
+	extend: function (p) {
 
-		if(p.x !== 0 || p.y !== 0) {
+		if (p.x !== 0 || p.y !== 0) {
 			// this is over cross for the case that a and b have same coordinates.
 			//((this.a.x > this.b.x) ? this.a : this.b).x += p.x;
 			//((this.b.y > this.a.y) ? this.b : this.a).y += p.y;
@@ -9043,13 +9269,13 @@ ORYX.Core.Bounds = {
 	 * Widens the scope of the bounds by x.
 	 * @param {Number} x
 	 */
-	widen: function(x) {
+	widen: function (x) {
 		if (x !== 0) {
 			this.suspendChange = true;
 			this.moveBy({x: -x, y: -x});
-			this.extend({x: 2*x, y: 2*x});
+			this.extend({x: 2 * x, y: 2 * x});
 			this.suspendChange = false;
-			if(this.changedWhileSuspend) {
+			if (this.changedWhileSuspend) {
 				this._changed(true);
 			}
 		}
@@ -9059,7 +9285,7 @@ ORYX.Core.Bounds = {
 	 * Returns the upper left corner's point regardless of the
 	 * bound delimiter points.
 	 */
-	upperLeft: function() {
+	upperLeft: function () {
 		var result = {};
 		result.x = this.a.x;
 		result.y = this.a.y;
@@ -9070,7 +9296,7 @@ ORYX.Core.Bounds = {
 	 * Returns the lower Right left corner's point regardless of the
 	 * bound delimiter points.
 	 */
-	lowerRight: function() {
+	lowerRight: function () {
 		var result = {};
 		result.x = this.b.x;
 		result.y = this.b.y;
@@ -9080,24 +9306,24 @@ ORYX.Core.Bounds = {
 	/**
 	 * @return {Number} Width of bounds.
 	 */
-	width: function() {
+	width: function () {
 		return this.b.x - this.a.x;
 	},
 
 	/**
 	 * @return {Number} Height of bounds.
 	 */
-	height: function() {
+	height: function () {
 		return this.b.y - this.a.y;
 	},
 
 	/**
 	 * @return {Point} The center point of this bounds.
 	 */
-	center: function() {
+	center: function () {
 		var center = {};
-		center.x =(this.a.x + this.b.x)/2.0;
-		center.y =(this.a.y + this.b.y)/2.0;
+		center.x = (this.a.x + this.b.x) / 2.0;
+		center.y = (this.a.y + this.b.y) / 2.0;
 		return center;
 	},
 
@@ -9105,11 +9331,11 @@ ORYX.Core.Bounds = {
 	/**
 	 * @return {Point} The center point of this bounds relative to upperLeft.
 	 */
-	midPoint: function() {
+	midPoint: function () {
 
 		var midpoint = {};
-		midpoint.x = (this.b.x - this.a.x)/2.0;
-		midpoint.y = (this.b.y - this.a.y)/2.0;
+		midpoint.x = (this.b.x - this.a.x) / 2.0;
+		midpoint.y = (this.b.y - this.a.y) / 2.0;
 		return midpoint;
 	},
 
@@ -9120,29 +9346,29 @@ ORYX.Core.Bounds = {
 	 * @param x {Number}
 	 * @param y {Number}
 	 */
-	centerMoveTo: function() {
+	centerMoveTo: function () {
 		var currentPosition = this.center();
 
 		switch (arguments.length) {
 
 			case 1:
 				this.moveBy(arguments[0].x - currentPosition.x,
-							arguments[0].y - currentPosition.y);
+					arguments[0].y - currentPosition.y);
 				break;
 
 			case 2:
 				this.moveBy(arguments[0] - currentPosition.x,
-							arguments[1] - currentPosition.y);
+					arguments[1] - currentPosition.y);
 				break;
 		}
 	},
 
-	isIncluded: function(point, offset) {
+	isIncluded: function (point, offset) {
 
 		var pointX, pointY, offset;
 
 		// Get the the two Points
-		switch(arguments.length) {
+		switch (arguments.length) {
 			case 1:
 				pointX = arguments[0].x;
 				pointY = arguments[0].y;
@@ -9150,7 +9376,7 @@ ORYX.Core.Bounds = {
 
 				break;
 			case 2:
-				if(arguments[0].x && arguments[0].y) {
+				if (arguments[0].x && arguments[0].y) {
 					pointX = arguments[0].x;
 					pointY = arguments[0].y;
 					offset = Math.abs(arguments[1]);
@@ -9172,7 +9398,7 @@ ORYX.Core.Bounds = {
 		var ul = this.upperLeft();
 		var lr = this.lowerRight();
 
-		if(pointX >= ul.x - offset
+		if (pointX >= ul.x - offset
 			&& pointX <= lr.x + offset && pointY >= ul.y - offset
 			&& pointY <= lr.y + offset)
 			return true;
@@ -9183,23 +9409,23 @@ ORYX.Core.Bounds = {
 	/**
 	 * @return {Bounds} A copy of this bounds.
 	 */
-	clone: function() {
+	clone: function () {
 
 		//Returns a new bounds object without the callback
 		// references of the original bounds
 		return new ORYX.Core.Bounds(this);
 	},
 
-	toString: function() {
+	toString: function () {
 
-		return "( "+this.a.x+" | "+this.a.y+" )/( "+this.b.x+" | "+this.b.y+" )";
+		return "( " + this.a.x + " | " + this.a.y + " )/( " + this.b.x + " | " + this.b.y + " )";
 	},
 
-	serializeForERDF: function() {
+	serializeForERDF: function () {
 
-		return this.a.x+","+this.a.y+","+this.b.x+","+this.b.y;
+		return this.a.x + "," + this.a.y + "," + this.b.x + "," + this.b.y;
 	}
- };
+};
 
 ORYX.Core.Bounds = Clazz.extend(ORYX.Core.Bounds);/*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
@@ -9214,8 +9440,12 @@ ORYX.Core.Bounds = Clazz.extend(ORYX.Core.Bounds);/*
 /**
  * Init namespaces
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
 
 
 /**
@@ -9227,7 +9457,7 @@ ORYX.Core.UIObject = {
 	/**
 	 * Constructor of the UIObject class.
 	 */
-	construct: function(options) {
+	construct: function (options) {
 
 		this.isChanged = true;			//Flag, if UIObject has been changed since last update.
 		this.isResized = true;
@@ -9246,7 +9476,7 @@ ORYX.Core.UIObject = {
 		this._changedCallback = this._changed.bind(this);	//callback reference for calling _changed
 		this.bounds.registerCallback(this._changedCallback);	//set callback in bounds
 
-		if(options && options.eventHandlerCallback) {
+		if (options && options.eventHandlerCallback) {
 			this.eventHandlerCallback = options.eventHandlerCallback;
 		}
 	},
@@ -9254,22 +9484,22 @@ ORYX.Core.UIObject = {
 	/**
 	 * Sets isChanged flag to true. Callback for the bounds object.
 	 */
-	_changed: function(bounds, isResized) {
+	_changed: function (bounds, isResized) {
 		this.isChanged = true;
-		if(this.bounds == bounds)
+		if (this.bounds == bounds)
 			this.isResized = isResized || this.isResized;
 	},
 
 	/**
 	 * If something changed, this method calls the refresh method that must be implemented by subclasses.
 	 */
-	update: function() {
-		if(this.isChanged) {
+	update: function () {
+		if (this.isChanged) {
 			this.refresh();
 			this.isChanged = false;
 
 			//call update of all children
-			this.children.each(function(value) {
+			this.children.each(function (value) {
 				value.update();
 			});
 		}
@@ -9278,24 +9508,24 @@ ORYX.Core.UIObject = {
 	/**
 	 * Is called in update method, if isChanged is set to true. Sub classes should call the super class method.
 	 */
-	refresh: function() {
+	refresh: function () {
 
 	},
 
 	/**
 	 * @return {Array} Array of all child UIObjects.
 	 */
-	getChildren: function() {
+	getChildren: function () {
 		return this.children.clone();
 	},
 
 	/**
 	 * @return {Array} Array of all parent UIObjects.
 	 */
-	getParents: function(){
+	getParents: function () {
 		var parents = [];
 		var parent = this.parent;
-		while(parent){
+		while (parent) {
 			parents.push(parent);
 			parent = parent.parent;
 		}
@@ -9307,10 +9537,10 @@ ORYX.Core.UIObject = {
 	 * @param {UIObject} parent
 	 * @return {Boolean}
 	 */
-	isParent: function(parent){
+	isParent: function (parent) {
 		var cparent = this;
-		while(cparent){
-			if (cparent === parent){
+		while (cparent) {
+			if (cparent === parent) {
 				return true;
 			}
 			cparent = cparent.parent;
@@ -9321,7 +9551,7 @@ ORYX.Core.UIObject = {
 	/**
 	 * @return {String} Id of this UIObject
 	 */
-	getId: function() {
+	getId: function () {
 		return this.id;
 	},
 
@@ -9332,14 +9562,14 @@ ORYX.Core.UIObject = {
 	 *
 	 * @return {UIObject} If found, it returns the UIObject with id.
 	 */
-	getChildById: function(id, deep) {
-		return this.children.find(function(uiObj) {
-			if(uiObj.getId() === id) {
+	getChildById: function (id, deep) {
+		return this.children.find(function (uiObj) {
+			if (uiObj.getId() === id) {
 				return uiObj;
 			} else {
-				if(deep) {
+				if (deep) {
 					var obj = uiObj.getChildById(id, deep);
-					if(obj) {
+					if (obj) {
 						return obj;
 					}
 				}
@@ -9353,11 +9583,11 @@ ORYX.Core.UIObject = {
 	 * UIObject.
 	 * @param {UIObject} uiObject
 	 */
-	add: function(uiObject) {
+	add: function (uiObject) {
 		//add uiObject, if it is not already a child of this object
 		if (!(this.children.member(uiObject))) {
 			//if uiObject is child of another parent, remove it from that parent.
-			if(uiObject.parent) {
+			if (uiObject.parent) {
 				uiObject.remove(uiObject);
 			}
 
@@ -9384,7 +9614,7 @@ ORYX.Core.UIObject = {
 	 * be removed from this UIObject's SVG representation.
 	 * @param {UIObject} uiObject
 	 */
-	remove: function(uiObject) {
+	remove: function (uiObject) {
 		//if uiObject is a child of this object, remove it.
 		if (this.children.member(uiObject)) {
 			//remove uiObject from children
@@ -9407,12 +9637,12 @@ ORYX.Core.UIObject = {
 	/**
 	 * Calculates absolute bounds of this UIObject.
 	 */
-	absoluteBounds: function() {
-		if(this.parent) {
+	absoluteBounds: function () {
+		if (this.parent) {
 			var absUL = this.absoluteXY();
 			return new ORYX.Core.Bounds(absUL.x, absUL.y,
-							absUL.x + this.bounds.width(),
-							absUL.y + this.bounds.height());
+				absUL.x + this.bounds.width(),
+				absUL.y + this.bounds.height());
 		} else {
 			return this.bounds.clone();
 		}
@@ -9421,8 +9651,8 @@ ORYX.Core.UIObject = {
 	/**
 	 * @return {Point} The absolute position of this UIObject.
 	 */
-	absoluteXY: function() {
-		if(this.parent) {
+	absoluteXY: function () {
+		if (this.parent) {
 			var pXY = this.parent.absoluteXY();
 			var result = {};
 			result.x = pXY.x + this.bounds.upperLeft().x;
@@ -9439,8 +9669,8 @@ ORYX.Core.UIObject = {
 	/**
 	 * @return {Point} The absolute position from the Center of this UIObject.
 	 */
-	absoluteCenterXY: function() {
-		if(this.parent) {
+	absoluteCenterXY: function () {
+		if (this.parent) {
 			var pXY = this.parent.absoluteXY();
 			var result = {};
 			result.x = pXY.x + this.bounds.center().x;
@@ -9458,10 +9688,10 @@ ORYX.Core.UIObject = {
 	/**
 	 * Hides this UIObject and all its children.
 	 */
-	hide: function() {
+	hide: function () {
 		this.node.setAttributeNS(null, 'display', 'none');
 		this.isVisible = false;
-		this.children.each(function(uiObj) {
+		this.children.each(function (uiObj) {
 			uiObj.hide();
 		});
 	},
@@ -9469,15 +9699,15 @@ ORYX.Core.UIObject = {
 	/**
 	 * Enables visibility of this UIObject and all its children.
 	 */
-	show: function() {
+	show: function () {
 		this.node.setAttributeNS(null, 'display', 'inherit');
 		this.isVisible = true;
-		this.children.each(function(uiObj) {
+		this.children.each(function (uiObj) {
 			uiObj.show();
 		});
 	},
 
-	addEventHandlers: function(node) {
+	addEventHandlers: function (node) {
 
 		node.addEventListener(ORYX.CONFIG.EVENT_MOUSEDOWN, this._delegateEvent.bind(this), false);
 		node.addEventListener(ORYX.CONFIG.EVENT_MOUSEMOVE, this._delegateEvent.bind(this), false);
@@ -9489,15 +9719,17 @@ ORYX.Core.UIObject = {
 
 	},
 
-	_delegateEvent: function(event) {
-		if(this.eventHandlerCallback) {
+	_delegateEvent: function (event) {
+		if (this.eventHandlerCallback) {
 			this.eventHandlerCallback(event, this);
 		}
 	},
 
-	toString: function() { return "UIObject " + this.id }
- };
- ORYX.Core.UIObject = Clazz.extend(ORYX.Core.UIObject);/*
+	toString: function () {
+		return "UIObject " + this.id
+	}
+};
+ORYX.Core.UIObject = Clazz.extend(ORYX.Core.UIObject);/*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
  * License rights for this program may be obtained from Alfresco Software, Ltd.
  * pursuant to a written agreement and any use of this program without such an
@@ -9510,8 +9742,12 @@ ORYX.Core.UIObject = {
 /**
  * Init namespaces
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
 
 /**
  * Top Level uiobject.
@@ -9519,456 +9755,485 @@ if(!ORYX.Core) {ORYX.Core = {};}
  * @extends ORYX.Core.UIObject
  */
 ORYX.Core.AbstractShape = ORYX.Core.UIObject.extend(
-/** @lends ORYX.Core.AbstractShape.prototype */
-{
-
-	/**
-	 * Constructor
-	 */
-	construct: function(options, stencil, facade) {
+	/** @lends ORYX.Core.AbstractShape.prototype */
+	{
 
-		arguments.callee.$.construct.apply(this, arguments);
+		/**
+		 * Constructor
+		 */
+		construct: function (options, stencil, facade) {
 
-		this.resourceId = ORYX.Editor.provideId(); //Id of resource in DOM
+			arguments.callee.$.construct.apply(this, arguments);
 
-		// stencil reference
-		this._stencil = stencil;
-		// if the stencil defines a super stencil that should be used for its instances, set it.
-		if (this._stencil._jsonStencil.superId){
-			stencilId = this._stencil.id()
-			superStencilId = stencilId.substring(0, stencilId.indexOf("#") + 1) + stencil._jsonStencil.superId;
-			stencilSet =  this._stencil.stencilSet();
-			this._stencil = stencilSet.stencil(superStencilId);
-		}
+			this.resourceId = ORYX.Editor.provideId(); //Id of resource in DOM
 
-		//Hash map for all properties. Only stores the values of the properties.
-		this.properties = new Hash();
-		this.propertiesChanged = new Hash();
+			// stencil reference
+			this._stencil = stencil;
+			// if the stencil defines a super stencil that should be used for its instances, set it.
+			if (this._stencil._jsonStencil.superId) {
+				stencilId = this._stencil.id()
+				superStencilId = stencilId.substring(0, stencilId.indexOf("#") + 1) + stencil._jsonStencil.superId;
+				stencilSet = this._stencil.stencilSet();
+				this._stencil = stencilSet.stencil(superStencilId);
+			}
 
-		// List of properties which are not included in the stencilset,
-		// but which gets (de)serialized
-		this.hiddenProperties = new Hash();
+			//Hash map for all properties. Only stores the values of the properties.
+			this.properties = new Hash();
+			this.propertiesChanged = new Hash();
 
+			// List of properties which are not included in the stencilset,
+			// but which gets (de)serialized
+			this.hiddenProperties = new Hash();
 
-		//Initialization of property map and initial value.
-		this._stencil.properties().each((function(property) {
-			var key = property.prefix() + "-" + property.id();
-			this.properties[key] = property.value();
-			this.propertiesChanged[key] = true;
-		}).bind(this));
 
-		// if super stencil was defined, also regard stencil's properties:
-		if (stencil._jsonStencil.superId) {
-			stencil.properties().each((function(property) {
+			//Initialization of property map and initial value.
+			this._stencil.properties().each((function (property) {
 				var key = property.prefix() + "-" + property.id();
-				var value = property.value();
-				var oldValue = this.properties[key];
-				this.properties[key] = value;
+				this.properties[key] = property.value();
 				this.propertiesChanged[key] = true;
+			}).bind(this));
 
-				// Raise an event, to show that the property has changed
-				// required for plugins like processLink.js
-				//window.setTimeout( function(){
+			// if super stencil was defined, also regard stencil's properties:
+			if (stencil._jsonStencil.superId) {
+				stencil.properties().each((function (property) {
+					var key = property.prefix() + "-" + property.id();
+					var value = property.value();
+					var oldValue = this.properties[key];
+					this.properties[key] = value;
+					this.propertiesChanged[key] = true;
+
+					// Raise an event, to show that the property has changed
+					// required for plugins like processLink.js
+					//window.setTimeout( function(){
 
 					this._delegateEvent({
-							type	: ORYX.CONFIG.EVENT_PROPERTY_CHANGED,
-							name	: key,
-							value	: value,
-							oldValue: oldValue
-						});
+						type: ORYX.CONFIG.EVENT_PROPERTY_CHANGED,
+						name: key,
+						value: value,
+						oldValue: oldValue
+					});
 
-				//}.bind(this), 10)
+					//}.bind(this), 10)
 
-			}).bind(this));
-		}
+				}).bind(this));
+			}
 
-	},
+		},
 
-	layout: function() {
+		layout: function () {
 
-	},
+		},
 
-	/**
-	 * Returns the stencil object specifiing the type of the shape.
-	 */
-	getStencil: function() {
-		return this._stencil;
-	},
+		/**
+		 * Returns the stencil object specifiing the type of the shape.
+		 */
+		getStencil: function () {
+			return this._stencil;
+		},
 
-	/**
-	 *
-	 * @param {Object} resourceId
-	 */
-	getChildShapeByResourceId: function(resourceId) {
+		/**
+		 *
+		 * @param {Object} resourceId
+		 */
+		getChildShapeByResourceId: function (resourceId) {
 
-		resourceId = ERDF.__stripHashes(resourceId);
+			resourceId = ERDF.__stripHashes(resourceId);
 
-		return this.getChildShapes(true).find(function(shape) {
-					return shape.resourceId == resourceId
-				});
-	},
-	/**
-	 *
-	 * @param {Object} deep
-	 * @param {Object} iterator
-	 */
-	getChildShapes: function(deep, iterator) {
-		var result = [];
+			return this.getChildShapes(true).find(function (shape) {
+				return shape.resourceId == resourceId
+			});
+		},
+		/**
+		 *
+		 * @param {Object} deep
+		 * @param {Object} iterator
+		 */
+		getChildShapes: function (deep, iterator) {
+			var result = [];
 
-		this.children.each(function(uiObject) {
-			if(uiObject instanceof ORYX.Core.Shape && uiObject.isVisible ) {
-				if(iterator) {
-					iterator(uiObject);
-				}
-				result.push(uiObject);
-				if(deep) {
-					result = result.concat(uiObject.getChildShapes(deep, iterator));
+			this.children.each(function (uiObject) {
+				if (uiObject instanceof ORYX.Core.Shape && uiObject.isVisible) {
+					if (iterator) {
+						iterator(uiObject);
+					}
+					result.push(uiObject);
+					if (deep) {
+						result = result.concat(uiObject.getChildShapes(deep, iterator));
+					}
 				}
-			}
-		});
+			});
 
-		return result;
-	},
+			return result;
+		},
 
-    /**
-     * @param {Object} shape
-     * @return {boolean} true if any of shape's childs is given shape
-     */
-    hasChildShape: function(shape){
-        return this.getChildShapes().any(function(child){
-            return (child === shape) || child.hasChildShape(shape);
-        });
-    },
+		/**
+		 * @param {Object} shape
+		 * @return {boolean} true if any of shape's childs is given shape
+		 */
+		hasChildShape: function (shape) {
+			return this.getChildShapes().any(function (child) {
+				return (child === shape) || child.hasChildShape(shape);
+			});
+		},
 
-	/**
-	 *
-	 * @param {Object} deep
-	 * @param {Object} iterator
-	 */
-	getChildNodes: function(deep, iterator) {
-		var result = [];
+		/**
+		 *
+		 * @param {Object} deep
+		 * @param {Object} iterator
+		 */
+		getChildNodes: function (deep, iterator) {
+			var result = [];
 
-		this.children.each(function(uiObject) {
-			if(uiObject instanceof ORYX.Core.Node && uiObject.isVisible) {
-				if(iterator) {
-					iterator(uiObject);
+			this.children.each(function (uiObject) {
+				if (uiObject instanceof ORYX.Core.Node && uiObject.isVisible) {
+					if (iterator) {
+						iterator(uiObject);
+					}
+					result.push(uiObject);
 				}
-				result.push(uiObject);
-			}
-			if(uiObject instanceof ORYX.Core.Shape) {
-				if(deep) {
-					result = result.concat(uiObject.getChildNodes(deep, iterator));
+				if (uiObject instanceof ORYX.Core.Shape) {
+					if (deep) {
+						result = result.concat(uiObject.getChildNodes(deep, iterator));
+					}
 				}
-			}
-		});
+			});
 
-		return result;
-	},
+			return result;
+		},
 
-	/**
-	 *
-	 * @param {Object} deep
-	 * @param {Object} iterator
-	 */
-	getChildEdges: function(deep, iterator) {
-		var result = [];
+		/**
+		 *
+		 * @param {Object} deep
+		 * @param {Object} iterator
+		 */
+		getChildEdges: function (deep, iterator) {
+			var result = [];
 
-		this.children.each(function(uiObject) {
-			if(uiObject instanceof ORYX.Core.Edge && uiObject.isVisible) {
-				if(iterator) {
-					iterator(uiObject);
+			this.children.each(function (uiObject) {
+				if (uiObject instanceof ORYX.Core.Edge && uiObject.isVisible) {
+					if (iterator) {
+						iterator(uiObject);
+					}
+					result.push(uiObject);
 				}
-				result.push(uiObject);
-			}
-			if(uiObject instanceof ORYX.Core.Shape) {
-				if(deep) {
-					result = result.concat(uiObject.getChildEdges(deep, iterator));
+				if (uiObject instanceof ORYX.Core.Shape) {
+					if (deep) {
+						result = result.concat(uiObject.getChildEdges(deep, iterator));
+					}
 				}
-			}
-		});
+			});
 
-		return result;
-	},
+			return result;
+		},
 
-	/**
-	 * Returns a sorted array of ORYX.Core.Node objects.
-	 * Ordered in z Order, the last object has the highest z Order.
-	 */
-	//TODO deep iterator
-	getAbstractShapesAtPosition: function() {
-		var x, y;
-		switch (arguments.length) {
-			case 1:
-				x = arguments[0].x;
-				y = arguments[0].y;
-				break;
-			case 2:	//two or more arguments
-				x = arguments[0];
-				y = arguments[1];
-				break;
-			default:
-				throw "getAbstractShapesAtPosition needs 1 or 2 arguments!"
-		}
+		/**
+		 * Returns a sorted array of ORYX.Core.Node objects.
+		 * Ordered in z Order, the last object has the highest z Order.
+		 */
+		//TODO deep iterator
+		getAbstractShapesAtPosition: function () {
+			var x, y;
+			switch (arguments.length) {
+				case 1:
+					x = arguments[0].x;
+					y = arguments[0].y;
+					break;
+				case 2:	//two or more arguments
+					x = arguments[0];
+					y = arguments[1];
+					break;
+				default:
+					throw "getAbstractShapesAtPosition needs 1 or 2 arguments!"
+			}
 
-		if(this.isPointIncluded(x, y)) {
+			if (this.isPointIncluded(x, y)) {
 
-			var result = [];
-			result.push(this);
+				var result = [];
+				result.push(this);
 
-			//check, if one child is at that position
+				//check, if one child is at that position
 
 
-			var childNodes = this.getChildNodes();
-			var childEdges = this.getChildEdges();
+				var childNodes = this.getChildNodes();
+				var childEdges = this.getChildEdges();
 
-			[childNodes, childEdges].each(function(ne){
-				var nodesAtPosition = new Hash();
+				[childNodes, childEdges].each(function (ne) {
+					var nodesAtPosition = new Hash();
 
-				ne.each(function(node) {
-					if(!node.isVisible){ return }
-					var candidates = node.getAbstractShapesAtPosition( x , y );
-					if(candidates.length > 0) {
-						var nodesInZOrder = $A(node.node.parentNode.childNodes);
-						var zOrderIndex = nodesInZOrder.indexOf(node.node);
-						nodesAtPosition[zOrderIndex] = candidates;
-					}
-				});
+					ne.each(function (node) {
+						if (!node.isVisible) {
+							return
+						}
+						var candidates = node.getAbstractShapesAtPosition(x, y);
+						if (candidates.length > 0) {
+							var nodesInZOrder = $A(node.node.parentNode.childNodes);
+							var zOrderIndex = nodesInZOrder.indexOf(node.node);
+							nodesAtPosition[zOrderIndex] = candidates;
+						}
+					});
 
-				nodesAtPosition.keys().sort().each(function(key) {
-					result = result.concat(nodesAtPosition[key]);
+					nodesAtPosition.keys().sort().each(function (key) {
+						result = result.concat(nodesAtPosition[key]);
+					});
 				});
- 			});
 
-			return result;
+				return result;
 
-		} else {
-			return [];
-		}
-	},
+			} else {
+				return [];
+			}
+		},
 
-	/**
-	 *
-	 * @param key {String} Must be 'prefix-id' of property
-	 * @param value {Object} Can be of type String or Number according to property type.
-	 */
-	setProperty: function(key, value, force) {
-		var oldValue = this.properties[key];
-		if(oldValue !== value || force === true) {
-			this.properties[key] = value;
-			this.propertiesChanged[key] = true;
-			this._changed();
+		/**
+		 *
+		 * @param key {String} Must be 'prefix-id' of property
+		 * @param value {Object} Can be of type String or Number according to property type.
+		 */
+		setProperty: function (key, value, force) {
+			var oldValue = this.properties[key];
+			if (oldValue !== value || force === true) {
+				this.properties[key] = value;
+				this.propertiesChanged[key] = true;
+				this._changed();
 
-			// Raise an event, to show that the property has changed
-			//window.setTimeout( function(){
+				// Raise an event, to show that the property has changed
+				//window.setTimeout( function(){
 
-			if (!this._isInSetProperty) {
-				this._isInSetProperty = true;
+				if (!this._isInSetProperty) {
+					this._isInSetProperty = true;
 
-				this._delegateEvent({
-						type	: ORYX.CONFIG.EVENT_PROPERTY_CHANGED,
-						elements : [this],
-						name	: key,
-						value	: value,
+					this._delegateEvent({
+						type: ORYX.CONFIG.EVENT_PROPERTY_CHANGED,
+						elements: [this],
+						name: key,
+						value: value,
 						oldValue: oldValue
 					});
 
-				delete this._isInSetProperty;
+					delete this._isInSetProperty;
+				}
+				//}.bind(this), 10)
 			}
-			//}.bind(this), 10)
-		}
-	},
-
-	/**
-	 * Returns TRUE if one of the properties is flagged as dirty
-	 * @return {boolean}
-	 */
-	isPropertyChanged: function(){
-		return this.propertiesChanged.any(function(property){ return property.value });
-	},
+		},
 
-	/**
-	 *
-	 * @param {String} Must be 'prefix-id' of property
-	 * @param {Object} Can be of type String or Number according to property type.
-	 */
-	setHiddenProperty: function(key, value) {
-		// IF undefined, Delete
-		if (value === undefined) {
-			delete this.hiddenProperties[key];
-			return;
-		}
-		var oldValue = this.hiddenProperties[key];
-		if (oldValue !== value) {
-			this.hiddenProperties[key] = value;
-		}
-	},
-	/**
-	 * Calculate if the point is inside the Shape
-	 * @param {Point}
-	 */
-	isPointIncluded: function(pointX, pointY, absoluteBounds) {
-		var absBounds = absoluteBounds ? absoluteBounds : this.absoluteBounds();
-		return absBounds.isIncluded(pointX, pointY);
+		/**
+		 * Returns TRUE if one of the properties is flagged as dirty
+		 * @return {boolean}
+		 */
+		isPropertyChanged: function () {
+			return this.propertiesChanged.any(function (property) {
+				return property.value
+			});
+		},
 
-	},
+		/**
+		 *
+		 * @param {String} Must be 'prefix-id' of property
+		 * @param {Object} Can be of type String or Number according to property type.
+		 */
+		setHiddenProperty: function (key, value) {
+			// IF undefined, Delete
+			if (value === undefined) {
+				delete this.hiddenProperties[key];
+				return;
+			}
+			var oldValue = this.hiddenProperties[key];
+			if (oldValue !== value) {
+				this.hiddenProperties[key] = value;
+			}
+		},
+		/**
+		 * Calculate if the point is inside the Shape
+		 * @param {Point}
+		 */
+		isPointIncluded: function (pointX, pointY, absoluteBounds) {
+			var absBounds = absoluteBounds ? absoluteBounds : this.absoluteBounds();
+			return absBounds.isIncluded(pointX, pointY);
 
-	/**
-	 * Get the serialized object
-	 * return Array with hash-entrees (prefix, name, value)
-	 * Following values will given:
-	 * 		Type
-	 * 		Properties
-	 */
-	serialize: function() {
-		var serializedObject = [];
+		},
 
-		// Add the type
-		serializedObject.push({name: 'type', prefix:'oryx', value: this.getStencil().id(), type: 'literal'});
+		/**
+		 * Get the serialized object
+		 * return Array with hash-entrees (prefix, name, value)
+		 * Following values will given:
+		 *        Type
+		 *        Properties
+		 */
+		serialize: function () {
+			var serializedObject = [];
+
+			// Add the type
+			serializedObject.push({name: 'type', prefix: 'oryx', value: this.getStencil().id(), type: 'literal'});
+
+			// Add hidden properties
+			this.hiddenProperties.each(function (prop) {
+				serializedObject.push({
+					name: prop.key.replace("oryx-", ""),
+					prefix: "oryx",
+					value: prop.value,
+					type: 'literal'
+				});
+			}.bind(this));
 
-		// Add hidden properties
-		this.hiddenProperties.each(function(prop){
-			serializedObject.push({name: prop.key.replace("oryx-", ""), prefix: "oryx", value: prop.value, type: 'literal'});
-		}.bind(this));
+			// Add all properties
+			this.getStencil().properties().each((function (property) {
 
-		// Add all properties
-		this.getStencil().properties().each((function(property){
+				var prefix = property.prefix();	// Get prefix
+				var name = property.id();		// Get name
 
-			var prefix = property.prefix();	// Get prefix
-			var name = property.id();		// Get name
+				//if(typeof this.properties[prefix+'-'+name] == 'boolean' || this.properties[prefix+'-'+name] != "")
+				serializedObject.push({
+					name: name,
+					prefix: prefix,
+					value: this.properties[prefix + '-' + name],
+					type: 'literal'
+				});
 
-			//if(typeof this.properties[prefix+'-'+name] == 'boolean' || this.properties[prefix+'-'+name] != "")
-				serializedObject.push({name: name, prefix: prefix, value: this.properties[prefix+'-'+name], type: 'literal'});
+			}).bind(this));
 
-		}).bind(this));
+			return serializedObject;
+		},
 
-		return serializedObject;
-	},
 
+		deserialize: function (serialize) {
+			// Search in Serialize
+			var initializedDocker = 0;
 
-	deserialize: function(serialize){
-		// Search in Serialize
-		var initializedDocker = 0;
+			// Sort properties so that the hidden properties are first in the list
+			serialize = serialize.sort(function (a, b) {
+				a = Number(this.properties.keys().member(a.prefix + "-" + a.name));
+				b = Number(this.properties.keys().member(b.prefix + "-" + b.name));
+				return a > b ? 1 : (a < b ? -1 : 0)
+			}.bind(this));
 
-		// Sort properties so that the hidden properties are first in the list
-		serialize = serialize.sort(function(a,b){ a = Number(this.properties.keys().member(a.prefix+"-"+a.name)); b = Number(this.properties.keys().member(b.prefix+"-"+b.name)); return a > b ? 1 : (a < b ? -1 : 0) }.bind(this));
+			serialize.each((function (obj) {
 
-		serialize.each((function(obj){
+				var name = obj.name;
+				var prefix = obj.prefix;
+				var value = obj.value;
 
-			var name 	= obj.name;
-			var prefix 	= obj.prefix;
-			var value 	= obj.value;
+				// Complex properties can be real json objects, encode them to a string
+				if (Object.prototype.toString.call(value) === "Object") value = JSON.stringify(value);
 
-            // Complex properties can be real json objects, encode them to a string
-            if (Object.prototype.toString.call(value) === "Object") value = JSON.stringify(value);
+				switch (prefix + "-" + name) {
+					case 'raziel-parent':
+						// Set parent
+						if (!this.parent) {
+							break
+						}
+						;
 
-			switch(prefix + "-" + name){
-				case 'raziel-parent':
-							// Set parent
-							if(!this.parent) {break};
+						// Set outgoing Shape
+						var parent = this.getCanvas().getChildShapeByResourceId(value);
+						if (parent) {
+							parent.add(this);
+						}
 
-							// Set outgoing Shape
-							var parent = this.getCanvas().getChildShapeByResourceId(value);
-							if(parent) {
-								parent.add(this);
-							}
+						break;
+					default:
+						// If list, eval as an array
+						var prop = this.getStencil().property(prefix + "-" + name);
+						if (prop && prop.isList() && typeof value === "string") {
+							if ((value || "").strip() && !value.startsWith("[") && !value.startsWith("]"))
+								value = "[\"" + value.strip() + "\"]";
+							value = ((value || "").strip() || "[]").evalJSON();
+						}
 
-							break;
-				default:
-							// If list, eval as an array
-							var prop = this.getStencil().property(prefix+"-"+name);
-							if (prop && prop.isList() && typeof value === "string"){
-								if ((value||"").strip()&&!value.startsWith("[")&&!value.startsWith("]"))
-									value = "[\""+value.strip()+"\"]";
-								value = ((value||"").strip()||"[]").evalJSON();
-							}
+						// Set property
+						if (this.properties.keys().member(prefix + "-" + name)) {
+							this.setProperty(prefix + "-" + name, value);
+						} else if (!(name === "bounds" || name === "parent" || name === "target" || name === "dockers" || name === "docker" || name === "outgoing" || name === "incoming")) {
+							this.setHiddenProperty(prefix + "-" + name, value);
+						}
 
-							// Set property
-							if(this.properties.keys().member(prefix+"-"+name)) {
-								this.setProperty(prefix+"-"+name, value);
-							} else if(!(name === "bounds"||name === "parent"||name === "target"||name === "dockers"||name === "docker"||name === "outgoing"||name === "incoming")) {
-								this.setHiddenProperty(prefix+"-"+name, value);
-							}
+				}
+			}).bind(this));
+		},
 
-			}
-		}).bind(this));
-	},
+		toString: function () {
+			return "ORYX.Core.AbstractShape " + this.id
+		},
 
-	toString: function() { return "ORYX.Core.AbstractShape " + this.id },
-
-    /**
-     * Converts the shape to a JSON representation.
-     * @return {Object} A JSON object with included ORYX.Core.AbstractShape.JSONHelper and getShape() method.
-     */
-    toJSON: function(){
-        var json = {
-            resourceId: this.resourceId,
-            properties: jQuery.extend({}, this.properties, this.hiddenProperties).inject({}, function(props, prop){
-              var key = prop[0];
-              var value = prop[1];
-
-              //If complex property, value should be a json object
-              if ( this.getStencil().property(key)
-                	&& this.getStencil().property(key).type() === ORYX.CONFIG.TYPE_COMPLEX
-                	&& Object.prototype.toString.call(value) === "String"){
-
-                  try {value = JSON.parse(value);} catch(error){}
-            	  //try {value = JSON.parse(value);} catch(error){}
-
-			  // Parse date
-			  } else if (value instanceof Date&&this.getStencil().property(key)){
-			  	try {
-					value = value.format(this.getStencil().property(key).dateFormat());
-				} catch(e){}
-			  }
-
-              //Takes "my_property" instead of "oryx-my_property" as key
-              key = key.replace(/^[\w_]+-/, "");
-              props[key] = value;
-
-              return props;
-            }.bind(this)),
-            stencil: {
-                id: this.getStencil().idWithoutNs()
-            },
-            childShapes: this.getChildShapes().map(function(shape){
-                return shape.toJSON();
-            })
-        };
-
-        if(this.getOutgoingShapes){
-            json.outgoing = this.getOutgoingShapes().map(function(shape){
-                return {
-                    resourceId: shape.resourceId
-                };
-            });
-        }
+		/**
+		 * Converts the shape to a JSON representation.
+		 * @return {Object} A JSON object with included ORYX.Core.AbstractShape.JSONHelper and getShape() method.
+		 */
+		toJSON: function () {
+			var json = {
+				resourceId: this.resourceId,
+				properties: jQuery.extend({}, this.properties, this.hiddenProperties).inject({}, function (props, prop) {
+					var key = prop[0];
+					var value = prop[1];
+
+					//If complex property, value should be a json object
+					if (this.getStencil().property(key)
+						&& this.getStencil().property(key).type() === ORYX.CONFIG.TYPE_COMPLEX
+						&& Object.prototype.toString.call(value) === "String") {
+
+						try {
+							value = JSON.parse(value);
+						} catch (error) {
+						}
+						//try {value = JSON.parse(value);} catch(error){}
 
-        if(this.bounds){
-            json.bounds = {
-                lowerRight: this.bounds.lowerRight(),
-                upperLeft: this.bounds.upperLeft()
-            };
-        }
+						// Parse date
+					} else if (value instanceof Date && this.getStencil().property(key)) {
+						try {
+							value = value.format(this.getStencil().property(key).dateFormat());
+						} catch (e) {
+						}
+					}
 
-        if(this.dockers){
-            json.dockers = this.dockers.map(function(docker){
-                var d = docker.getDockedShape() && docker.referencePoint ? docker.referencePoint : docker.bounds.center();
-                d.getDocker = function(){return docker;};
-                return d;
-            });
-        }
+					//Takes "my_property" instead of "oryx-my_property" as key
+					key = key.replace(/^[\w_]+-/, "");
+					props[key] = value;
 
-        jQuery.extend(json, ORYX.Core.AbstractShape.JSONHelper);
+					return props;
+				}.bind(this)),
+				stencil: {
+					id: this.getStencil().idWithoutNs()
+				},
+				childShapes: this.getChildShapes().map(function (shape) {
+					return shape.toJSON();
+				})
+			};
 
-        // do not pollute the json attributes (for serialization), so put the corresponding
-        // shape is encapsulated in a method
-        json.getShape = function(){
-            return this;
-        }.bind(this);
+			if (this.getOutgoingShapes) {
+				json.outgoing = this.getOutgoingShapes().map(function (shape) {
+					return {
+						resourceId: shape.resourceId
+					};
+				});
+			}
 
-        return json;
-    }
- });
+			if (this.bounds) {
+				json.bounds = {
+					lowerRight: this.bounds.lowerRight(),
+					upperLeft: this.bounds.upperLeft()
+				};
+			}
+
+			if (this.dockers) {
+				json.dockers = this.dockers.map(function (docker) {
+					var d = docker.getDockedShape() && docker.referencePoint ? docker.referencePoint : docker.bounds.center();
+					d.getDocker = function () {
+						return docker;
+					};
+					return d;
+				});
+			}
+
+			jQuery.extend(json, ORYX.Core.AbstractShape.JSONHelper);
+
+			// do not pollute the json attributes (for serialization), so put the corresponding
+			// shape is encapsulated in a method
+			json.getShape = function () {
+				return this;
+			}.bind(this);
+
+			return json;
+		}
+	});
 
 /**
  * @namespace Collection of methods which can be used on a shape json object (ORYX.Core.AbstractShape#toJSON()).
@@ -9976,61 +10241,61 @@ ORYX.Core.AbstractShape = ORYX.Core.UIObject.extend(
  * jQuery.extend(shapeAsJson, ORYX.Core.AbstractShape.JSONHelper);
  */
 ORYX.Core.AbstractShape.JSONHelper = {
-     /**
-      * Iterates over each child shape.
-      * @param {Object} iterator Iterator function getting a child shape and his parent as arguments.
-      * @param {boolean} [deep=false] Iterate recursively (childShapes of childShapes)
-      * @param {boolean} [modify=false] If true, the result of the iterator function is taken as new shape, return false to delete it. This enables modifying the object while iterating through the child shapes.
-      * @example
-      * // Increases the lowerRight x value of each direct child shape by one.
-      * myShapeAsJson.eachChild(function(shape, parentShape){
-      *     shape.bounds.lowerRight.x = shape.bounds.lowerRight.x + 1;
-      *     return shape;
-      * }, false, true);
-      */
-     eachChild: function(iterator, deep, modify){
-         if(!this.childShapes) return;
-
-         var newChildShapes = []; //needed if modify = true
-
-         this.childShapes.each(function(shape){
-		 	 if (!(shape.eachChild instanceof Function)){
-		 		jQuery.extend(shape, ORYX.Core.AbstractShape.JSONHelper);
-			 }
-             var res = iterator(shape, this);
-             if(res) newChildShapes.push(res); //if false is returned, and modify = true, current shape is deleted.
-
-             if(deep) shape.eachChild(iterator, deep, modify);
-         }.bind(this));
-
-         if(modify) this.childShapes = newChildShapes;
-     },
-
-	 getShape: function(){
-	 	return null;
-	 },
-     getChildShapes: function(deep){
-         var allShapes = this.childShapes;
-
-         if(deep){
-             this.eachChild(function(shape){
-			 	 if (!(shape.getChildShapes instanceof Function)){
-			 		jQuery.extend(shape, ORYX.Core.AbstractShape.JSONHelper);
-				 }
-                 allShapes = allShapes.concat(shape.getChildShapes(deep));
-             }, true);
-         }
-
-         return allShapes;
-     },
-
-     /**
-      * @return {String} Serialized JSON object
-      */
-     serialize: function(){
-         return JSON.stringify(this);
-     }
- }
+	/**
+	 * Iterates over each child shape.
+	 * @param {Object} iterator Iterator function getting a child shape and his parent as arguments.
+	 * @param {boolean} [deep=false] Iterate recursively (childShapes of childShapes)
+	 * @param {boolean} [modify=false] If true, the result of the iterator function is taken as new shape, return false to delete it. This enables modifying the object while iterating through the child shapes.
+	 * @example
+	 * // Increases the lowerRight x value of each direct child shape by one.
+	 * myShapeAsJson.eachChild(function(shape, parentShape){
+	 *     shape.bounds.lowerRight.x = shape.bounds.lowerRight.x + 1;
+	 *     return shape;
+	 * }, false, true);
+	 */
+	eachChild: function (iterator, deep, modify) {
+		if (!this.childShapes) return;
+
+		var newChildShapes = []; //needed if modify = true
+
+		this.childShapes.each(function (shape) {
+			if (!(shape.eachChild instanceof Function)) {
+				jQuery.extend(shape, ORYX.Core.AbstractShape.JSONHelper);
+			}
+			var res = iterator(shape, this);
+			if (res) newChildShapes.push(res); //if false is returned, and modify = true, current shape is deleted.
+
+			if (deep) shape.eachChild(iterator, deep, modify);
+		}.bind(this));
+
+		if (modify) this.childShapes = newChildShapes;
+	},
+
+	getShape: function () {
+		return null;
+	},
+	getChildShapes: function (deep) {
+		var allShapes = this.childShapes;
+
+		if (deep) {
+			this.eachChild(function (shape) {
+				if (!(shape.getChildShapes instanceof Function)) {
+					jQuery.extend(shape, ORYX.Core.AbstractShape.JSONHelper);
+				}
+				allShapes = allShapes.concat(shape.getChildShapes(deep));
+			}, true);
+		}
+
+		return allShapes;
+	},
+
+	/**
+	 * @return {String} Serialized JSON object
+	 */
+	serialize: function () {
+		return JSON.stringify(this);
+	}
+}
 /*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
  * License rights for this program may be obtained from Alfresco Software, Ltd.
@@ -10044,13 +10309,17 @@ ORYX.Core.AbstractShape.JSONHelper = {
 /**
  * Init namespaces
  */
-if(!ORYX) {var ORYX = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
 
 /**
-   @namespace Namespace for the Oryx core elements.
-   @name ORYX.Core
-*/
-if(!ORYX.Core) {ORYX.Core = {};}
+ @namespace Namespace for the Oryx core elements.
+ @name ORYX.Core
+ */
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
 
 /**
  * @class Oryx canvas.
@@ -10058,20 +10327,20 @@ if(!ORYX.Core) {ORYX.Core = {};}
  *
  */
 ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
-    /** @lends ORYX.Core.Canvas.prototype */
+	/** @lends ORYX.Core.Canvas.prototype */
 
 	/**
 	 * Defines the current zoom level
 	 */
-	zoomLevel:1,
+	zoomLevel: 1,
 
 	/**
 	 * Constructor
 	 */
-	construct: function(options, stencil, facade) {
+	construct: function (options, stencil, facade) {
 		arguments.callee.$.construct.apply(this, arguments);
 
-		if(!(options && options.width && options.height)) {
+		if (!(options && options.width && options.height)) {
 
 			ORYX.Log.fatal("Canvas is missing mandatory parameters options.width and options.height.");
 			return;
@@ -10099,18 +10368,30 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 		this.rootNode.setAttribute("xmlns:svg", "http://www.w3.org/2000/svg");
 
 		this._htmlContainer = ORYX.Editor.graft("http://www.w3.org/1999/xhtml", options.parentNode,
-			['div', {id: "oryx_canvas_htmlContainer", style:"position:absolute; top:5px"}]);
+			['div', {id: "oryx_canvas_htmlContainer", style: "position:absolute; top:5px"}]);
 
 		// Additional SVG-node BELOW the stencils to allow underlays (if that is even a word) by plugins
 		this.underlayNode = ORYX.Editor.graft("http://www.w3.org/2000/svg", this.rootNode,
-				['svg', {id: "underlay-container"}]);
+			['svg', {id: "underlay-container"}]);
 
 		// Create 2 svg-elements in the svg-container
 		this.columnHightlight1 = ORYX.Editor.graft("http://www.w3.org/2000/svg", this.underlayNode,
-				['rect', {x: 0, width: ORYX.CONFIG.FORM_ROW_WIDTH + 35, height: "100%", style: "fill: #fff6d5", visibility: "hidden"}]);
+			['rect', {
+				x: 0,
+				width: ORYX.CONFIG.FORM_ROW_WIDTH + 35,
+				height: "100%",
+				style: "fill: #fff6d5",
+				visibility: "hidden"
+			}]);
 
 		this.columnHightlight2 = ORYX.Editor.graft("http://www.w3.org/2000/svg", this.underlayNode,
-				['rect', {x: ORYX.CONFIG.FORM_ROW_WIDTH + 35, width: ORYX.CONFIG.FORM_ROW_WIDTH + 25, height: "100%", style: "fill: #fff6d5", visibility: "hidden"}]);
+			['rect', {
+				x: ORYX.CONFIG.FORM_ROW_WIDTH + 35,
+				width: ORYX.CONFIG.FORM_ROW_WIDTH + 25,
+				height: "100%",
+				style: "fill: #fff6d5",
+				visibility: "hidden"
+			}]);
 
 		this.node = ORYX.Editor.graft("http://www.w3.org/2000/svg", this.rootNode,
 			['g', {},
@@ -10119,7 +10400,7 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 					['g', {"class": "children"}],
 					['g', {"class": "edge"}]
 				],
-				['g', {"class":"svgcontainer"}]
+				['g', {"class": "svgcontainer"}]
 			]);
 
 		/*
@@ -10159,20 +10440,21 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 
 		this.node.setAttributeNS(null, 'font-size', ORYX.CONFIG.LABEL_DEFAULT_LINE_HEIGHT);
 
-		this.bounds.set(0,0,options.width, options.height);
+		this.bounds.set(0, 0, options.width, options.height);
 
 		this.addEventHandlers(this.rootNode.parentNode);
 
 		//disable context menu
-		this.rootNode.oncontextmenu = function() {return false;};
+		this.rootNode.oncontextmenu = function () {
+			return false;
+		};
 	},
 
-	focus: function(){
+	focus: function () {
 
 		try {
 			// Get a href
-			if (!this.focusEl)
-			{
+			if (!this.focusEl) {
 				this.focusEl = jQuery('body').append(jQuery('<a href="#" class="x-grid3-focus x-grid3-focus-canvas"/>'));
 				this.focusEl.swallowEvent("click", true);
 			}
@@ -10181,21 +10463,22 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 			this.focusEl.focus.defer(1, this.focusEl);
 			this.focusEl.blur.defer(3, this.focusEl);
 
-		} catch(e){}
+		} catch (e) {
+		}
 	},
 
-	setHightlightState: function(state) {
-		if(this.colHighlightEnabled && this.colHighlightState != state) {
-			if(state == 0) {
+	setHightlightState: function (state) {
+		if (this.colHighlightEnabled && this.colHighlightState != state) {
+			if (state == 0) {
 				this.columnHightlight1.setAttribute("visibility", "hidden");
 				this.columnHightlight2.setAttribute("visibility", "hidden");
-			} else if(state == 1) {
+			} else if (state == 1) {
 				this.columnHightlight1.setAttribute("visibility", "visible");
 				this.columnHightlight2.setAttribute("visibility", "hidden");
-			} else if(state == 2) {
+			} else if (state == 2) {
 				this.columnHightlight1.setAttribute("visibility", "hidden");
 				this.columnHightlight2.setAttribute("visibility", "visible");
-			} else if(state == 3) {
+			} else if (state == 3) {
 				this.columnHightlight1.setAttribute("visibility", "visible");
 				this.columnHightlight2.setAttribute("visibility", "visible");
 			}
@@ -10203,17 +10486,17 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 		}
 	},
 
-	setHightlightStateBasedOnX : function(x) {
-		if(x > ORYX.CONFIG.FORM_ROW_WIDTH + 30) {
+	setHightlightStateBasedOnX: function (x) {
+		if (x > ORYX.CONFIG.FORM_ROW_WIDTH + 30) {
 			this.setHightlightState(2);
 		} else {
 			this.setHightlightState(1);
 		}
 	},
 
-	update: function() {
+	update: function () {
 
-		this.nodes.each(function(node) {
+		this.nodes.each(function (node) {
 			this._traverseForUpdate(node);
 		}.bind(this));
 
@@ -10223,8 +10506,8 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 
 		var layoutEvents = this.getStencil().layout();
 
-		if(layoutEvents) {
-			layoutEvents.each(function(event) {
+		if (layoutEvents) {
+			layoutEvents.each(function (event) {
 
 				// setup additional attributes
 				event.shape = this;
@@ -10246,15 +10529,15 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 		});*/
 	},
 
-	_traverseForUpdate: function(shape) {
+	_traverseForUpdate: function (shape) {
 		var childRet = shape.isChanged;
-		shape.getChildNodes(false, function(child) {
-			if(this._traverseForUpdate(child)) {
+		shape.getChildNodes(false, function (child) {
+			if (this._traverseForUpdate(child)) {
 				childRet = true;
 			}
 		}.bind(this));
 
-		if(childRet) {
+		if (childRet) {
 			shape.layout();
 			return true;
 		} else {
@@ -10262,8 +10545,7 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 		}
 	},
 
-	layout: function() {
-
+	layout: function () {
 
 
 	},
@@ -10273,18 +10555,18 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 	 * @param {Object} deep
 	 * @param {Object} iterator
 	 */
-	getChildNodes: function(deep, iterator) {
-		if(!deep && !iterator) {
+	getChildNodes: function (deep, iterator) {
+		if (!deep && !iterator) {
 			return this.nodes.clone();
 		} else {
 			var result = [];
-			this.nodes.each(function(uiObject) {
-				if(iterator) {
+			this.nodes.each(function (uiObject) {
+				if (iterator) {
 					iterator(uiObject);
 				}
 				result.push(uiObject);
 
-				if(deep && uiObject instanceof ORYX.Core.Shape) {
+				if (deep && uiObject instanceof ORYX.Core.Shape) {
 					result = result.concat(uiObject.getChildNodes(deep, iterator));
 				}
 			});
@@ -10297,7 +10579,7 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 	 * buggy crap! use base class impl instead!
 	 * @param {Object} iterator
 	 */
-/*	getChildEdges: function(iterator) {
+	/*	getChildEdges: function(iterator) {
 		if(iterator) {
 			this.edges.each(function(edge) {
 				iterator(edge);
@@ -10311,18 +10593,18 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 	 * Overrides the UIObject.add method. Adds uiObject to the correct sub node.
 	 * @param {UIObject} uiObject
 	 */
-	add: function(uiObject, index, silent) {
+	add: function (uiObject, index, silent) {
 		//if uiObject is child of another UIObject, remove it.
-		if(uiObject instanceof ORYX.Core.UIObject) {
+		if (uiObject instanceof ORYX.Core.UIObject) {
 			if (!(this.children.member(uiObject))) {
 				//if uiObject is child of another parent, remove it from that parent.
-				if(uiObject.parent) {
+				if (uiObject.parent) {
 					uiObject.parent.remove(uiObject, true);
 				}
 
 				//add uiObject to the Canvas
 				//add uiObject to this Shape
-				if(index != undefined)
+				if (index != undefined)
 					this.children.splice(index, 0, uiObject);
 				else
 					this.children.push(uiObject);
@@ -10331,8 +10613,8 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 				uiObject.parent = this;
 
 				//add uiObject.node to this.node depending on the type of uiObject
-				if(uiObject instanceof ORYX.Core.Shape) {
-					if(uiObject instanceof ORYX.Core.Edge) {
+				if (uiObject instanceof ORYX.Core.Shape) {
+					if (uiObject instanceof ORYX.Core.Edge) {
 						uiObject.addMarkers(this.rootNode.getElementsByTagNameNS(NAMESPACE_SVG, "defs")[0]);
 						uiObject.node = this.node.childNodes[0].childNodes[2].appendChild(uiObject.node);
 						this.edges.push(uiObject);
@@ -10346,8 +10628,8 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 
 				uiObject.bounds.registerCallback(this._changedCallback);
 
-				if(this.eventHandlerCallback && silent !== true)
-					this.eventHandlerCallback({type:ORYX.CONFIG.EVENT_SHAPEADDED,shape:uiObject})
+				if (this.eventHandlerCallback && silent !== true)
+					this.eventHandlerCallback({type: ORYX.CONFIG.EVENT_SHAPEADDED, shape: uiObject})
 			} else {
 
 				ORYX.Log.warn("add: ORYX.Core.UIObject is already a child of this object.");
@@ -10362,7 +10644,7 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 	 * Overrides the UIObject.remove method. Removes uiObject.
 	 * @param {UIObject} uiObject
 	 */
-	remove: function(uiObject, silent) {
+	remove: function (uiObject, silent) {
 		//if uiObject is a child of this object, remove it.
 		if (this.children.member(uiObject)) {
 			//remove uiObject from children
@@ -10374,8 +10656,8 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 			uiObject.parent = undefined;
 
 			//delete uiObject.node from this.node
-			if(uiObject instanceof ORYX.Core.Shape) {
-				if(uiObject instanceof ORYX.Core.Edge) {
+			if (uiObject instanceof ORYX.Core.Shape) {
+				if (uiObject instanceof ORYX.Core.Edge) {
 					uiObject.removeMarkers();
 					uiObject.node = this.node.childNodes[0].childNodes[2].removeChild(uiObject.node);
 					this.edges = this.edges.without(uiObject);
@@ -10384,11 +10666,11 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 					this.nodes = this.nodes.without(uiObject);
 				}
 			} else {	//UIObject
-					uiObject.node = this.node.removeChild(uiObject.node);
+				uiObject.node = this.node.removeChild(uiObject.node);
 			}
 
-			if(this.eventHandlerCallback && silent !== true)
-				this.eventHandlerCallback({type:ORYX.CONFIG.EVENT_SHAPEREMOVED,shape:uiObject, parent:parent});
+			if (this.eventHandlerCallback && silent !== true)
+				this.eventHandlerCallback({type: ORYX.CONFIG.EVENT_SHAPEREMOVED, shape: uiObject, parent: parent});
 
 			uiObject.bounds.unregisterCallback(this._changedCallback);
 		} else {
@@ -10397,10 +10679,10 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 		}
 	},
 
-    /**
-     * Creates shapes out of the given collection of shape objects and adds them to the canvas.
-     * @example
-     * canvas.addShapeObjects({
+	/**
+	 * Creates shapes out of the given collection of shape objects and adds them to the canvas.
+	 * @example
+	 * canvas.addShapeObjects({
          bounds:{ lowerRight:{ y:510, x:633 }, upperLeft:{ y:146, x:210 } },
          resourceId:"oryx_F0715955-50F2-403D-9851-C08CFE70F8BD",
          childShapes:[],
@@ -10411,196 +10693,198 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
          outgoing:[{resourceId: 'aShape'}],
          target: {resourceId: 'aShape'}
        });
-     * @param {Object} shapeObjects
-     * @param {Function} [eventHandler] An event handler passed to each newly created shape (as eventHandlerCallback)
-     * @return {Array} A collection of ORYX.Core.Shape
-     * @methodOf ORYX.Core.Canvas.prototype
-     */
-    addShapeObjects: function(shapeObjects, eventHandler){
-        if(!shapeObjects) return;
+	 * @param {Object} shapeObjects
+	 * @param {Function} [eventHandler] An event handler passed to each newly created shape (as eventHandlerCallback)
+	 * @return {Array} A collection of ORYX.Core.Shape
+	 * @methodOf ORYX.Core.Canvas.prototype
+	 */
+	addShapeObjects: function (shapeObjects, eventHandler) {
+		if (!shapeObjects) return;
 
 		this.initializingShapes = true;
 
-        /*FIXME This implementation is very evil! At first, all shapes are created on
+		/*FIXME This implementation is very evil! At first, all shapes are created on
           canvas. In a second step, the attributes are applied. There must be a distinction
           between the configuration phase (where the outgoings, for example, are just named),
           and the creation phase (where the outgoings are evaluated). This must be reflected
           in code to provide a nicer API/ implementation!!! */
 
-        var addShape = function(shape, parent){
-            // Create a new Stencil
-            var stencil = ORYX.Core.StencilSet.stencil(this.getStencil().namespace() + shape.stencil.id );
-
-            // Create a new Shape
-            var ShapeClass = (stencil.type() == "node") ? ORYX.Core.Node : ORYX.Core.Edge;
-            var newShape = new ShapeClass(
-              {'eventHandlerCallback': eventHandler},
-              stencil, this.facade);
-
-            // Set the resource id
-            newShape.resourceId = shape.resourceId;
-            newShape.node.id = "svg-" + shape.resourceId;
-
-            // Set parent to json object to be used later
-            // Due to the nested json structure, normally shape.parent is not set/ must not be set.
-            // In special cases, it can be easier to set this directly instead of a nested structure.
-            shape.parent = "#" + ((shape.parent && shape.parent.resourceId) || parent.resourceId);
-
-            // Add the shape to the canvas
-            this.add( newShape );
-
-            return {
-              json: shape,
-              object: newShape
-            };
-        }.bind(this);
-
-        /** Builds up recursively a flatted array of shapes, including a javascript object and json representation
-         * @param {Object} shape Any object that has Object#childShapes
-         */
-        var addChildShapesRecursively = function(shape){
-            var addedShapes = [];
-
-            if (shape.childShapes && shape.childShapes.constructor == String)
-            {
-            	shape.childShapes = JSON.parse(shape.childShapes);
-            }
+		var addShape = function (shape, parent) {
+			// Create a new Stencil
+			var stencil = ORYX.Core.StencilSet.stencil(this.getStencil().namespace() + shape.stencil.id);
+
+			// Create a new Shape
+			var ShapeClass = (stencil.type() == "node") ? ORYX.Core.Node : ORYX.Core.Edge;
+			var newShape = new ShapeClass(
+				{'eventHandlerCallback': eventHandler},
+				stencil, this.facade);
+
+			// Set the resource id
+			newShape.resourceId = shape.resourceId;
+			newShape.node.id = "svg-" + shape.resourceId;
+
+			// Set parent to json object to be used later
+			// Due to the nested json structure, normally shape.parent is not set/ must not be set.
+			// In special cases, it can be easier to set this directly instead of a nested structure.
+			shape.parent = "#" + ((shape.parent && shape.parent.resourceId) || parent.resourceId);
+
+			// Add the shape to the canvas
+			this.add(newShape);
+
+			return {
+				json: shape,
+				object: newShape
+			};
+		}.bind(this);
+
+		/** Builds up recursively a flatted array of shapes, including a javascript object and json representation
+		 * @param {Object} shape Any object that has Object#childShapes
+		 */
+		var addChildShapesRecursively = function (shape) {
+			var addedShapes = [];
+
+			if (shape.childShapes && shape.childShapes.constructor == String) {
+				shape.childShapes = JSON.parse(shape.childShapes);
+			}
 
-            shape.childShapes.each(function(childShape){
-              addedShapes.push(addShape(childShape, shape));
-              addedShapes = addedShapes.concat(addChildShapesRecursively(childShape));
-            });
-
-            return addedShapes;
-        }.bind(this);
-
-        var shapes = addChildShapesRecursively({
-            childShapes: shapeObjects,
-            resourceId: this.resourceId
-        });
-
-
-        // prepare deserialisation parameter
-        shapes.each(
-            function(shape){
-            	var properties = [];
-                for(field in shape.json.properties){
-                    properties.push({
-                      prefix: 'oryx',
-                      name: field,
-                      value: shape.json.properties[field]
-                    });
-                  }
-
-                  // Outgoings
-                  shape.json.outgoing.each(function(out){
-                    properties.push({
-                      prefix: 'raziel',
-                      name: 'outgoing',
-                      value: "#"+out.resourceId
-                    });
-                  });
-
-                  // Target
-                  // (because of a bug, the first outgoing is taken when there is no target,
-                  // can be removed after some time)
-                  if(shape.object instanceof ORYX.Core.Edge) {
-	                  var target = shape.json.target || shape.json.outgoing[0];
-	                  if(target){
-	                    properties.push({
-	                      prefix: 'raziel',
-	                      name: 'target',
-	                      value: "#"+target.resourceId
-	                    });
-	                  }
-                  }
-
-                  // Bounds
-                  if (shape.json.bounds) {
-                      properties.push({
-                          prefix: 'oryx',
-                          name: 'bounds',
-                          value: shape.json.bounds.upperLeft.x + "," + shape.json.bounds.upperLeft.y + "," + shape.json.bounds.lowerRight.x + "," + shape.json.bounds.lowerRight.y
-                      });
-                  }
-
-                  //Dockers [{x:40, y:50}, {x:30, y:60}] => "40 50 30 60  #"
-                  if(shape.json.dockers){
-                    properties.push({
-                      prefix: 'oryx',
-                      name: 'dockers',
-                      value: shape.json.dockers.inject("", function(dockersStr, docker){
-                        return dockersStr + docker.x + " " + docker.y + " ";
-                      }) + " #"
-                    });
-                  }
-
-                  //Parent
-                  properties.push({
-                    prefix: 'raziel',
-                    name: 'parent',
-                    value: shape.json.parent
-                  });
-
-                  shape.__properties = properties;
-	         }.bind(this)
-        );
-
-        // Deserialize the properties from the shapes
-        // This can't be done earlier because Shape#deserialize expects that all referenced nodes are already there
-
-        // first, deserialize all nodes
-        shapes.each(function(shape) {
-        	if(shape.object instanceof ORYX.Core.Node) {
-        		shape.object.deserialize(shape.__properties, shape.json);
-        	}
-        });
-
-        // second, deserialize all edges
-        shapes.each(function(shape) {
-        	if(shape.object instanceof ORYX.Core.Edge) {
-        		shape.object.deserialize(shape.__properties, shape.json);
+			shape.childShapes.each(function (childShape) {
+				addedShapes.push(addShape(childShape, shape));
+				addedShapes = addedShapes.concat(addChildShapesRecursively(childShape));
+			});
+
+			return addedShapes;
+		}.bind(this);
+
+		var shapes = addChildShapesRecursively({
+			childShapes: shapeObjects,
+			resourceId: this.resourceId
+		});
+
+
+		// prepare deserialisation parameter
+		shapes.each(
+			function (shape) {
+				var properties = [];
+				for (field in shape.json.properties) {
+					properties.push({
+						prefix: 'oryx',
+						name: field,
+						value: shape.json.properties[field]
+					});
+				}
+
+				// Outgoings
+				shape.json.outgoing.each(function (out) {
+					properties.push({
+						prefix: 'raziel',
+						name: 'outgoing',
+						value: "#" + out.resourceId
+					});
+				});
+
+				// Target
+				// (because of a bug, the first outgoing is taken when there is no target,
+				// can be removed after some time)
+				if (shape.object instanceof ORYX.Core.Edge) {
+					var target = shape.json.target || shape.json.outgoing[0];
+					if (target) {
+						properties.push({
+							prefix: 'raziel',
+							name: 'target',
+							value: "#" + target.resourceId
+						});
+					}
+				}
+
+				// Bounds
+				if (shape.json.bounds) {
+					properties.push({
+						prefix: 'oryx',
+						name: 'bounds',
+						value: shape.json.bounds.upperLeft.x + "," + shape.json.bounds.upperLeft.y + "," + shape.json.bounds.lowerRight.x + "," + shape.json.bounds.lowerRight.y
+					});
+				}
+
+				//Dockers [{x:40, y:50}, {x:30, y:60}] => "40 50 30 60  #"
+				if (shape.json.dockers) {
+					properties.push({
+						prefix: 'oryx',
+						name: 'dockers',
+						value: shape.json.dockers.inject("", function (dockersStr, docker) {
+							return dockersStr + docker.x + " " + docker.y + " ";
+						}) + " #"
+					});
+				}
+
+				//Parent
+				properties.push({
+					prefix: 'raziel',
+					name: 'parent',
+					value: shape.json.parent
+				});
+
+				shape.__properties = properties;
+			}.bind(this)
+		);
+
+		// Deserialize the properties from the shapes
+		// This can't be done earlier because Shape#deserialize expects that all referenced nodes are already there
+
+		// first, deserialize all nodes
+		shapes.each(function (shape) {
+			if (shape.object instanceof ORYX.Core.Node) {
+				shape.object.deserialize(shape.__properties, shape.json);
+			}
+		});
+
+		// second, deserialize all edges
+		shapes.each(function (shape) {
+			if (shape.object instanceof ORYX.Core.Edge) {
+				shape.object.deserialize(shape.__properties, shape.json);
 				shape.object._oldBounds = shape.object.bounds.clone();
 				shape.object._update();
-        	}
-        });
+			}
+		});
 
 		delete this.initializingShapes;
-        return shapes.pluck("object");
-    },
-
-    /**
-     * Updates the size of the canvas, regarding to the containg shapes.
-     */
-    updateSize: function(){
-        // Check the size for the canvas
-        var maxWidth    = 0;
-        var maxHeight   = 0;
-        var offset      = 100;
-        this.getChildShapes(true, function(shape){
-            var b = shape.bounds;
-            maxWidth    = Math.max( maxWidth, b.lowerRight().x + offset)
-            maxHeight   = Math.max( maxHeight, b.lowerRight().y + offset)
-        });
-
-        if( this.bounds.width() < maxWidth || this.bounds.height() < maxHeight ){
-            this.setSize({width: Math.max(this.bounds.width(), maxWidth), height: Math.max(this.bounds.height(), maxHeight)})
-        }
-    },
+		return shapes.pluck("object");
+	},
+
+	/**
+	 * Updates the size of the canvas, regarding to the containg shapes.
+	 */
+	updateSize: function () {
+		// Check the size for the canvas
+		var maxWidth = 0;
+		var maxHeight = 0;
+		var offset = 100;
+		this.getChildShapes(true, function (shape) {
+			var b = shape.bounds;
+			maxWidth = Math.max(maxWidth, b.lowerRight().x + offset)
+			maxHeight = Math.max(maxHeight, b.lowerRight().y + offset)
+		});
+
+		if (this.bounds.width() < maxWidth || this.bounds.height() < maxHeight) {
+			this.setSize({
+				width: Math.max(this.bounds.width(), maxWidth),
+				height: Math.max(this.bounds.height(), maxHeight)
+			})
+		}
+	},
 
-	getRootNode: function() {
+	getRootNode: function () {
 		return this.rootNode;
 	},
 
-	getUnderlayNode: function() {
+	getUnderlayNode: function () {
 		return this.underlayNode;
 	},
 
-	getSvgContainer: function() {
+	getSvgContainer: function () {
 		return this.node.childNodes[1];
 	},
 
-	getHTMLContainer: function() {
+	getHTMLContainer: function () {
 		return this._htmlContainer;
 	},
 
@@ -10608,17 +10892,21 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 	 * Return all elements of the same highest level
 	 * @param {Object} elements
 	 */
-	getShapesWithSharedParent: function(elements) {
+	getShapesWithSharedParent: function (elements) {
 
 		// If there is no elements, return []
-		if(!elements || elements.length < 1) { return []; }
+		if (!elements || elements.length < 1) {
+			return [];
+		}
 		// If there is one element, return this element
-		if(elements.length == 1) { return elements;}
+		if (elements.length == 1) {
+			return elements;
+		}
 
-		return elements.findAll(function(value){
+		return elements.findAll(function (value) {
 			var parentShape = value.parent;
-			while(parentShape){
-				if(elements.member(parentShape)) return false;
+			while (parentShape) {
+				if (elements.member(parentShape)) return false;
 				parentShape = parentShape.parent;
 			}
 			return true;
@@ -10626,10 +10914,13 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 
 	},
 
-	setSize: function(size, dontSetBounds) {
-		if(!size || !size.width || !size.height){return;};
+	setSize: function (size, dontSetBounds) {
+		if (!size || !size.width || !size.height) {
+			return;
+		}
+		;
 
-		if(this.rootNode.parentNode){
+		if (this.rootNode.parentNode) {
 			this.rootNode.parentNode.style.width = size.width + 'px';
 			this.rootNode.parentNode.style.height = size.height + 'px';
 		}
@@ -10638,28 +10929,28 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 		this.rootNode.setAttributeNS(null, 'height', size.height);
 
 		//this._htmlContainer.style.top = "-" + (size.height + 4) + 'px';
-		if( !dontSetBounds ){
-			this.bounds.set({a:{x:0,y:0},b:{x:size.width/this.zoomLevel,y:size.height/this.zoomLevel}});
+		if (!dontSetBounds) {
+			this.bounds.set({a: {x: 0, y: 0}, b: {x: size.width / this.zoomLevel, y: size.height / this.zoomLevel}});
 		}
 	},
 
 	/**
 	 * Returns an SVG document of the current process.
 	 * @param {Boolean} escapeText Use true, if you want to parse it with an XmlParser,
-	 * 					false, if you want to use the SVG document in browser on client side.
+	 *                    false, if you want to use the SVG document in browser on client side.
 	 */
-	getSVGRepresentation: function(escapeText) {
+	getSVGRepresentation: function (escapeText) {
 		// Get the serialized svg image source
-        var svgClone = this.getRootNode().cloneNode(true);
+		var svgClone = this.getRootNode().cloneNode(true);
 
 		this._removeInvisibleElements(svgClone);
 
 		var x1, y1, x2, y2;
-		this.getChildShapes(true).each(function(shape) {
+		this.getChildShapes(true).each(function (shape) {
 			var absBounds = shape.absoluteBounds();
 			var ul = absBounds.upperLeft();
 			var lr = absBounds.lowerRight();
-			if(x1 == undefined) {
+			if (x1 == undefined) {
 				x1 = ul.x;
 				y1 = ul.y;
 				x2 = lr.x;
@@ -10674,7 +10965,7 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 
 		var margin = 50;
 		var width, height, tx, ty;
-		if(x1 == undefined) {
+		if (x1 == undefined) {
 			width = 0;
 			height = 0;
 			tx = 0;
@@ -10682,38 +10973,39 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 		} else {
 			width = x2;
 			height = y2;
-			tx = -x1+margin/2;
-			ty = -y1+margin/2;
+			tx = -x1 + margin / 2;
+			ty = -y1 + margin / 2;
 		}
 
-        // Set the width and height
-        svgClone.setAttributeNS(null, 'width', width + margin);
-        svgClone.setAttributeNS(null, 'height', height + margin);
+		// Set the width and height
+		svgClone.setAttributeNS(null, 'width', width + margin);
+		svgClone.setAttributeNS(null, 'height', height + margin);
 
 		//remove scale factor
 		svgClone.childNodes[1].removeAttributeNS(null, 'transform');
 
-		try{
+		try {
 			var svgCont = svgClone.childNodes[1].childNodes[1];
 			svgCont.parentNode.removeChild(svgCont);
-		} catch(e) {}
+		} catch (e) {
+		}
 
-		if(escapeText) {
-			$A(svgClone.getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_SVG, 'tspan')).each(function(elem) {
+		if (escapeText) {
+			$A(svgClone.getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_SVG, 'tspan')).each(function (elem) {
 				elem.textContent = elem.textContent.escapeHTML();
 			});
 
-			$A(svgClone.getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_SVG, 'text')).each(function(elem) {
-				if(elem.childNodes.length == 0)
+			$A(svgClone.getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_SVG, 'text')).each(function (elem) {
+				if (elem.childNodes.length == 0)
 					elem.textContent = elem.textContent.escapeHTML();
 			});
 		}
 
 		// generating absolute urls for the pdf-exporter
-		$A(svgClone.getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_SVG, 'image')).each(function(elem) {
-			var href = elem.getAttributeNS("http://www.w3.org/1999/xlink","href");
+		$A(svgClone.getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_SVG, 'image')).each(function (elem) {
+			var href = elem.getAttributeNS("http://www.w3.org/1999/xlink", "href");
 
-			if(!href.match("^(http|https)://")) {
+			if (!href.match("^(http|https)://")) {
 				href = window.location.protocol + "//" + window.location.host + href;
 				elem.setAttributeNS("http://www.w3.org/1999/xlink", "href", href);
 			}
@@ -10721,22 +11013,22 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 
 
 		// escape all links
-		$A(svgClone.getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_SVG, 'a')).each(function(elem) {
-			elem.setAttributeNS("http://www.w3.org/1999/xlink", "xlink:href", (elem.getAttributeNS("http://www.w3.org/1999/xlink","href")||"").escapeHTML());
+		$A(svgClone.getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_SVG, 'a')).each(function (elem) {
+			elem.setAttributeNS("http://www.w3.org/1999/xlink", "xlink:href", (elem.getAttributeNS("http://www.w3.org/1999/xlink", "href") || "").escapeHTML());
 		});
 
-        return svgClone;
+		return svgClone;
 	},
 
 	/**
-	* Removes all nodes (and its children) that has the
-	* attribute visibility set to "hidden"
-	*/
-	_removeInvisibleElements: function(element) {
+	 * Removes all nodes (and its children) that has the
+	 * attribute visibility set to "hidden"
+	 */
+	_removeInvisibleElements: function (element) {
 		var index = 0;
-		while(index < element.childNodes.length) {
+		while (index < element.childNodes.length) {
 			var child = element.childNodes[index];
-			if(child.getAttributeNS &&
+			if (child.getAttributeNS &&
 				child.getAttributeNS(null, "visibility") === "hidden") {
 				element.removeChild(child);
 			} else {
@@ -10785,35 +11077,37 @@ ORYX.Core.Canvas = ORYX.Core.AbstractShape.extend({
 		}.bind(this));
 	},*/
 
-	_delegateEvent: function(event) {
-		if(this.eventHandlerCallback && ( event.target == this.rootNode || event.target == this.rootNode.parentNode )) {
+	_delegateEvent: function (event) {
+		if (this.eventHandlerCallback && (event.target == this.rootNode || event.target == this.rootNode.parentNode)) {
 			this.eventHandlerCallback(event, this);
 		}
 	},
 
-	toString: function() { return "Canvas " + this.id },
+	toString: function () {
+		return "Canvas " + this.id
+	},
 
-    /**
-     * Calls {@link ORYX.Core.AbstractShape#toJSON} and adds some stencil set information.
-     */
-    toJSON: function() {
-        var json = arguments.callee.$.toJSON.apply(this, arguments);
+	/**
+	 * Calls {@link ORYX.Core.AbstractShape#toJSON} and adds some stencil set information.
+	 */
+	toJSON: function () {
+		var json = arguments.callee.$.toJSON.apply(this, arguments);
 
 //		if(ORYX.CONFIG.STENCILSET_HANDLER.length > 0) {
 //			json.stencilset = {
 //				url: this.getStencil().stencilSet().namespace()
 //	        };
 //		} else {
-			json.stencilset = {
-				url: this.getStencil().stencilSet().source(),
-				namespace: this.getStencil().stencilSet().namespace()
-	        };
+		json.stencilset = {
+			url: this.getStencil().stencilSet().source(),
+			namespace: this.getStencil().stencilSet().namespace()
+		};
 //		}
 
 
-        return json;
-    }
- });/*
+		return json;
+	}
+});/*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
  * License rights for this program may be obtained from Alfresco Software, Ltd.
  * pursuant to a written agreement and any use of this program without such an
@@ -10833,24 +11127,26 @@ function init() {
 	// Hack for WebKit to set the SVGElement-Classes
 	ORYX.Editor.setMissingClasses();
 
-    // If someone wants to create the editor instance himself
-    if (window.onOryxResourcesLoaded) {
-        window.onOryxResourcesLoaded();
-    }
-    // Else fetch the model from server and display editor
-    else {
+	// If someone wants to create the editor instance himself
+	if (window.onOryxResourcesLoaded) {
+		window.onOryxResourcesLoaded();
+	}
+	// Else fetch the model from server and display editor
+	else {
 		var modelId = window.location.search.substring(4);
 		var modelUrl = "./service/model/" + modelId + "/json";
 
-        ORYX.Editor.createByUrl(modelUrl);
-    }
+		ORYX.Editor.createByUrl(modelUrl);
+	}
 }
 
 /**
-   @namespace Global Oryx name space
-   @name ORYX
-*/
-if(!ORYX) {var ORYX = {};}
+ @namespace Global Oryx name space
+ @name ORYX
+ */
+if (!ORYX) {
+	var ORYX = {};
+}
 
 /**
  * The Editor class.
@@ -10862,9 +11158,9 @@ if(!ORYX) {var ORYX = {};}
  * @param {String} config.stencilset.url Stencil set URL.
  * @param {String} [config.stencil.id] Stencil type used for creating the canvas.
  * @param {Object} config.properties Any properties applied to the canvas.
-*/
+ */
 ORYX.Editor = {
-    /** @lends ORYX.Editor.prototype */
+	/** @lends ORYX.Editor.prototype */
 	// Defines the global dom event listener
 	DOMEventListeners: new Hash(),
 
@@ -10872,14 +11168,14 @@ ORYX.Editor = {
 	selection: [],
 
 	// Defines the current zoom level
-	zoomLevel:1.0,
+	zoomLevel: 1.0,
 
-	construct: function(config) {
+	construct: function (config) {
 
 		// initialization.
-		this._eventsQueue 	= [];
-		this.loadedPlugins 	= [];
-		this.pluginsData 	= [];
+		this._eventsQueue = [];
+		this.loadedPlugins = [];
+		this.pluginsData = [];
 
 
 		//meta data about the model for the signavio warehouse
@@ -10891,30 +11187,30 @@ ORYX.Editor = {
 
 		this.id = model.modelId;
 
-		if(config.model) {
+		if (config.model) {
 			model = config.model;
 		}
 
-        if(!this.id) {
-        	this.id = model.id;
-        	if(!this.id) {
-        		this.id = ORYX.Editor.provideId();
-        	}
-        }
+		if (!this.id) {
+			this.id = model.id;
+			if (!this.id) {
+				this.id = ORYX.Editor.provideId();
+			}
+		}
 
-        // Defines if the editor should be fullscreen or not
+		// Defines if the editor should be fullscreen or not
 		this.fullscreen = config.fullscreen !== false;
 
 		// Initialize the eventlistener
 		this._initEventListener();
 
 		// Load particular stencilset
-		if(ORYX.CONFIG.BACKEND_SWITCH) {
-			var ssUrl = (model.stencilset.namespace||model.stencilset.url).replace("#", "%23");
-        	ORYX.Core.StencilSet.loadStencilSet(ssUrl, this.modelMetaData, this.id);
+		if (ORYX.CONFIG.BACKEND_SWITCH) {
+			var ssUrl = (model.stencilset.namespace || model.stencilset.url).replace("#", "%23");
+			ORYX.Core.StencilSet.loadStencilSet(ssUrl, this.modelMetaData, this.id);
 		} else {
 			var ssUrl = model.stencilset.url;
-        	ORYX.Core.StencilSet.loadStencilSet(ssUrl, this.modelMetaData, this.id);
+			ORYX.Core.StencilSet.loadStencilSet(ssUrl, this.modelMetaData, this.id);
 		}
 
 		// CREATES the canvas
@@ -10924,35 +11220,37 @@ ORYX.Editor = {
 		this._generateGUI();
 
 		// Initializing of a callback to check loading ends
-		var loadPluginFinished 	= false;
+		var loadPluginFinished = false;
 		var loadContentFinished = false;
-		var initFinished = function(){
-			if( !loadPluginFinished || !loadContentFinished ){ return }
+		var initFinished = function () {
+			if (!loadPluginFinished || !loadContentFinished) {
+				return
+			}
 			this._finishedLoading();
 		}.bind(this)
 
 		// LOAD the plugins
-		window.setTimeout(function(){
+		window.setTimeout(function () {
 			this.loadPlugins();
 			loadPluginFinished = true;
 			initFinished();
 		}.bind(this), 100);
 
 		// LOAD the content of the current editor instance
-		window.setTimeout(function(){
-            this.loadSerialized(model, true); // Request the meta data as well
-            this.getCanvas().update();
+		window.setTimeout(function () {
+			this.loadSerialized(model, true); // Request the meta data as well
+			this.getCanvas().update();
 			loadContentFinished = true;
 			initFinished();
 		}.bind(this), 200);
 	},
 
-	_finishedLoading: function() {
+	_finishedLoading: function () {
 		// Raise Loaded Event
-		this.handleEvents( {type:ORYX.CONFIG.EVENT_LOADED} )
+		this.handleEvents({type: ORYX.CONFIG.EVENT_LOADED})
 	},
 
-	_initEventListener: function(){
+	_initEventListener: function () {
 
 		// Register on Events
 
@@ -10960,13 +11258,13 @@ ORYX.Editor = {
 		document.documentElement.addEventListener(ORYX.CONFIG.EVENT_KEYUP, this.catchKeyUpEvents.bind(this), false);
 
 		// Enable Key up and down Event
-		this._keydownEnabled = 	true;
-		this._keyupEnabled =  	true;
+		this._keydownEnabled = true;
+		this._keyupEnabled = true;
 
 		this.DOMEventListeners[ORYX.CONFIG.EVENT_MOUSEDOWN] = [];
-		this.DOMEventListeners[ORYX.CONFIG.EVENT_MOUSEUP] 	= [];
+		this.DOMEventListeners[ORYX.CONFIG.EVENT_MOUSEUP] = [];
 		this.DOMEventListeners[ORYX.CONFIG.EVENT_MOUSEOVER] = [];
-		this.DOMEventListeners[ORYX.CONFIG.EVENT_MOUSEOUT] 	= [];
+		this.DOMEventListeners[ORYX.CONFIG.EVENT_MOUSEOUT] = [];
 		this.DOMEventListeners[ORYX.CONFIG.EVENT_SELECTION_CHANGED] = [];
 		this.DOMEventListeners[ORYX.CONFIG.EVENT_MOUSEMOVE] = [];
 
@@ -10977,54 +11275,54 @@ ORYX.Editor = {
 	 * Editor and initialized the Ext-Framework
 	 *
 	 */
-	_generateGUI: function() {
+	_generateGUI: function () {
 
 		// Defines the layout height if it's NOT fullscreen
-		var layoutHeight 	= ORYX.CONFIG.WINDOW_HEIGHT;
-		var canvasParent	= this.getCanvas().rootNode.parentNode;
+		var layoutHeight = ORYX.CONFIG.WINDOW_HEIGHT;
+		var canvasParent = this.getCanvas().rootNode.parentNode;
 
 		jQuery("#canvasSection").append(canvasParent);
 
 		// Set the editor to the center, and refresh the size
-	 	canvasParent.parentNode.setAttributeNS(null, 'align', 'center');
-	 	canvasParent.setAttributeNS(null, 'align', 'left');
+		canvasParent.parentNode.setAttributeNS(null, 'align', 'center');
+		canvasParent.setAttributeNS(null, 'align', 'left');
 		this.getCanvas().setSize({
-			width	: ORYX.CONFIG.CANVAS_WIDTH,
-			height	: ORYX.CONFIG.CANVAS_HEIGHT
+			width: ORYX.CONFIG.CANVAS_WIDTH,
+			height: ORYX.CONFIG.CANVAS_HEIGHT
 		});
 
 	},
 
-	getAvailablePlugins: function(){
-		var curAvailablePlugins=ORYX.availablePlugins.clone();
-		curAvailablePlugins.each(function(plugin){
-			if(this.loadedPlugins.find(function(loadedPlugin){
-				return loadedPlugin.type==this.name;
-			}.bind(plugin))){
-				plugin.engaged=true;
-			}else{
-				plugin.engaged=false;
+	getAvailablePlugins: function () {
+		var curAvailablePlugins = ORYX.availablePlugins.clone();
+		curAvailablePlugins.each(function (plugin) {
+			if (this.loadedPlugins.find(function (loadedPlugin) {
+				return loadedPlugin.type == this.name;
+			}.bind(plugin))) {
+				plugin.engaged = true;
+			} else {
+				plugin.engaged = false;
 			}
-			}.bind(this));
+		}.bind(this));
 		return curAvailablePlugins;
 	},
 
-	loadScript: function (url, callback){
-	    var script = document.createElement("script")
-	    script.type = "text/javascript";
-	    if (script.readyState){  //IE
-	        script.onreadystatechange = function(){
-	            if (script.readyState == "loaded" || script.readyState == "complete"){
-	                script.onreadystatechange = null;
-	                callback();
-	            }
-        	};
-    	} else {  //Others
-	        script.onload = function(){
-	            callback();
-	        };
-		}
-	    script.src = url;
+	loadScript: function (url, callback) {
+		var script = document.createElement("script")
+		script.type = "text/javascript";
+		if (script.readyState) {  //IE
+			script.onreadystatechange = function () {
+				if (script.readyState == "loaded" || script.readyState == "complete") {
+					script.onreadystatechange = null;
+					callback();
+				}
+			};
+		} else {  //Others
+			script.onload = function () {
+				callback();
+			};
+		}
+		script.src = url;
 		document.getElementsByTagName("head")[0].appendChild(script);
 	},
 	/**
@@ -11032,71 +11330,77 @@ ORYX.Editor = {
 	 *
 	 * @param {String} name
 	 * @param {Function} callback
-	 * 		callback(sucess, [errorCode])
-	 * 			errorCodes: NOTUSEINSTENCILSET, REQUIRESTENCILSET, NOTFOUND, YETACTIVATED
+	 *        callback(sucess, [errorCode])
+	 *            errorCodes: NOTUSEINSTENCILSET, REQUIRESTENCILSET, NOTFOUND, YETACTIVATED
 	 */
-	activatePluginByName: function(name, callback, loadTry){
+	activatePluginByName: function (name, callback, loadTry) {
 
-		var match=this.getAvailablePlugins().find(function(value){return value.name==name});
-		if(match && (!match.engaged || (match.engaged==='false'))){
-				var loadedStencilSetsNamespaces = this.getStencilSets().keys();
-				var facade = this._getPluginFacade();
-				var newPlugin;
-				var me=this;
-				ORYX.Log.debug("Initializing plugin '%0'", match.name);
+		var match = this.getAvailablePlugins().find(function (value) {
+			return value.name == name
+		});
+		if (match && (!match.engaged || (match.engaged === 'false'))) {
+			var loadedStencilSetsNamespaces = this.getStencilSets().keys();
+			var facade = this._getPluginFacade();
+			var newPlugin;
+			var me = this;
+			ORYX.Log.debug("Initializing plugin '%0'", match.name);
 
-					if (!match.requires 	|| !match.requires.namespaces 	|| match.requires.namespaces.any(function(req){ return loadedStencilSetsNamespaces.indexOf(req) >= 0 }) ){
-						if(!match.notUsesIn 	|| !match.notUsesIn.namespaces 	|| !match.notUsesIn.namespaces.any(function(req){ return loadedStencilSetsNamespaces.indexOf(req) >= 0 })){
+			if (!match.requires || !match.requires.namespaces || match.requires.namespaces.any(function (req) {
+				return loadedStencilSetsNamespaces.indexOf(req) >= 0
+			})) {
+				if (!match.notUsesIn || !match.notUsesIn.namespaces || !match.notUsesIn.namespaces.any(function (req) {
+					return loadedStencilSetsNamespaces.indexOf(req) >= 0
+				})) {
 
 					try {
 
-						var className 	= eval(match.name);
-							var newPlugin = new className(facade, match);
-							newPlugin.type = match.name;
-
-							// If there is an GUI-Plugin, they get all Plugins-Offer-Meta-Data
-							if (newPlugin.registryChanged)
-								newPlugin.registryChanged(me.pluginsData);
-
-							// If there have an onSelection-Method it will pushed to the Editor Event-Handler
-							if (newPlugin.onSelectionChanged)
-								me.registerOnEvent(ORYX.CONFIG.EVENT_SELECTION_CHANGED, newPlugin.onSelectionChanged.bind(newPlugin));
-							this.loadedPlugins.push(newPlugin);
-							this.loadedPlugins.each(function(loaded){
-								if(loaded.registryChanged)
-									loaded.registryChanged(this.pluginsData);
-							}.bind(me));
-							callback(true);
-
-					} catch(e) {
+						var className = eval(match.name);
+						var newPlugin = new className(facade, match);
+						newPlugin.type = match.name;
+
+						// If there is an GUI-Plugin, they get all Plugins-Offer-Meta-Data
+						if (newPlugin.registryChanged)
+							newPlugin.registryChanged(me.pluginsData);
+
+						// If there have an onSelection-Method it will pushed to the Editor Event-Handler
+						if (newPlugin.onSelectionChanged)
+							me.registerOnEvent(ORYX.CONFIG.EVENT_SELECTION_CHANGED, newPlugin.onSelectionChanged.bind(newPlugin));
+						this.loadedPlugins.push(newPlugin);
+						this.loadedPlugins.each(function (loaded) {
+							if (loaded.registryChanged)
+								loaded.registryChanged(this.pluginsData);
+						}.bind(me));
+						callback(true);
+
+					} catch (e) {
 						ORYX.Log.warn("Plugin %0 is not available", match.name);
-						if(!!loadTry){
-							callback(false,"INITFAILED");
+						if (!!loadTry) {
+							callback(false, "INITFAILED");
 							return;
 						}
-						this.loadScript("plugins/scripts/"+match.source, this.activatePluginByName.bind(this,match.name,callback,true));
-					}
-					}else{
-						callback(false,"NOTUSEINSTENCILSET");
-						ORYX.Log.info("Plugin need a stencilset which is not loaded'", match.name);
+						this.loadScript("plugins/scripts/" + match.source, this.activatePluginByName.bind(this, match.name, callback, true));
 					}
-
 				} else {
-					callback(false,"REQUIRESTENCILSET");
+					callback(false, "NOTUSEINSTENCILSET");
 					ORYX.Log.info("Plugin need a stencilset which is not loaded'", match.name);
 				}
 
-
-			}else{
-				callback(false, match?"NOTFOUND":"YETACTIVATED");
-				//TODO error handling
+			} else {
+				callback(false, "REQUIRESTENCILSET");
+				ORYX.Log.info("Plugin need a stencilset which is not loaded'", match.name);
 			}
+
+
+		} else {
+			callback(false, match ? "NOTFOUND" : "YETACTIVATED");
+			//TODO error handling
+		}
 	},
 
 	/**
 	 *  Laden der Plugins
 	 */
-	loadPlugins: function() {
+	loadPlugins: function () {
 
 		// if there should be plugins but still are none, try again.
 		// TODO this should wait for every plugin respectively.
@@ -11116,38 +11420,44 @@ ORYX.Editor = {
 
 		// If there is an Array where all plugins are described, than only take those
 		// (that comes from the usage of oryx with a mashup api)
-		if( ORYX.MashupAPI && ORYX.MashupAPI.loadablePlugins && ORYX.MashupAPI.loadablePlugins instanceof Array ){
+		if (ORYX.MashupAPI && ORYX.MashupAPI.loadablePlugins && ORYX.MashupAPI.loadablePlugins instanceof Array) {
 
 			// Get the plugins from the available plugins (those who are in the plugins.xml)
-			ORYX.availablePlugins = $A(ORYX.availablePlugins).findAll(function(value){
-										return ORYX.MashupAPI.loadablePlugins.include( value.name )
-									})
+			ORYX.availablePlugins = $A(ORYX.availablePlugins).findAll(function (value) {
+				return ORYX.MashupAPI.loadablePlugins.include(value.name)
+			})
 
 			// Add those plugins to the list, which are only in the loadablePlugins list
-			ORYX.MashupAPI.loadablePlugins.each(function( className ){
-				if( !(ORYX.availablePlugins.find(function(val){ return val.name == className }))){
-					ORYX.availablePlugins.push( {name: className } );
+			ORYX.MashupAPI.loadablePlugins.each(function (className) {
+				if (!(ORYX.availablePlugins.find(function (val) {
+					return val.name == className
+				}))) {
+					ORYX.availablePlugins.push({name: className});
 				}
 			})
 		}
 
 
-		ORYX.availablePlugins.each(function(value) {
+		ORYX.availablePlugins.each(function (value) {
 			ORYX.Log.debug("Initializing plugin '%0'", value.name);
-				if( (!value.requires 	|| !value.requires.namespaces 	|| value.requires.namespaces.any(function(req){ return loadedStencilSetsNamespaces.indexOf(req) >= 0 }) ) &&
-					(!value.notUsesIn 	|| !value.notUsesIn.namespaces 	|| !value.notUsesIn.namespaces.any(function(req){ return loadedStencilSetsNamespaces.indexOf(req) >= 0 }) )&&
-					/*only load activated plugins or undefined */
-					(value.engaged || (value.engaged===undefined)) ){
+			if ((!value.requires || !value.requires.namespaces || value.requires.namespaces.any(function (req) {
+					return loadedStencilSetsNamespaces.indexOf(req) >= 0
+				})) &&
+				(!value.notUsesIn || !value.notUsesIn.namespaces || !value.notUsesIn.namespaces.any(function (req) {
+					return loadedStencilSetsNamespaces.indexOf(req) >= 0
+				})) &&
+				/*only load activated plugins or undefined */
+				(value.engaged || (value.engaged === undefined))) {
 
 				try {
-					var className 	= eval(value.name);
-					if( className ){
-						var plugin		= new className(facade, value);
-						plugin.type		= value.name;
-						newPlugins.push( plugin );
-						plugin.engaged=true;
+					var className = eval(value.name);
+					if (className) {
+						var plugin = new className(facade, value);
+						plugin.type = value.name;
+						newPlugins.push(plugin);
+						plugin.engaged = true;
 					}
-				} catch(e) {
+				} catch (e) {
 					ORYX.Log.warn("Plugin %0 is not available %1", value.name, e);
 				}
 
@@ -11157,13 +11467,13 @@ ORYX.Editor = {
 
 		});
 
-		newPlugins.each(function(value) {
+		newPlugins.each(function (value) {
 			// If there is an GUI-Plugin, they get all Plugins-Offer-Meta-Data
-			if(value.registryChanged)
+			if (value.registryChanged)
 				value.registryChanged(me.pluginsData);
 
 			// If there have an onSelection-Method it will pushed to the Editor Event-Handler
-			if(value.onSelectionChanged)
+			if (value.onSelectionChanged)
 				me.registerOnEvent(ORYX.CONFIG.EVENT_SELECTION_CHANGED, value.onSelectionChanged.bind(value));
 		});
 
@@ -11180,17 +11490,16 @@ ORYX.Editor = {
 	 * @param {String} [stencilType] The stencil type used for creating the canvas. If not given, a stencil with myBeRoot = true from current stencil set is taken.
 	 * @param {Object} [canvasConfig] Any canvas properties (like language).
 	 */
-	_createCanvas: function(stencilType, canvasConfig) {
-        if (stencilType) {
-            // Add namespace to stencilType
-            if (stencilType.search(/^http/) === -1) {
-                stencilType = this.getStencilSets().values()[0].namespace() + stencilType;
-            }
-        }
-        else {
-            // Get any root stencil type
-            stencilType = this.getStencilSets().values()[0].findRootStencilName();
-        }
+	_createCanvas: function (stencilType, canvasConfig) {
+		if (stencilType) {
+			// Add namespace to stencilType
+			if (stencilType.search(/^http/) === -1) {
+				stencilType = this.getStencilSets().values()[0].namespace() + stencilType;
+			}
+		} else {
+			// Get any root stencil type
+			stencilType = this.getStencilSets().values()[0].findRootStencilName();
+		}
 
 		// get the stencil associated with the type
 		var canvasStencil = ORYX.Core.StencilSet.stencil(stencilType);
@@ -11206,27 +11515,27 @@ ORYX.Editor = {
 
 		// create the canvas
 		this._canvas = new ORYX.Core.Canvas({
-			width					: ORYX.CONFIG.CANVAS_WIDTH,
-			height					: ORYX.CONFIG.CANVAS_HEIGHT,
-			'eventHandlerCallback'	: this.handleEvents.bind(this),
-			id						: this.id,
-			parentNode				: div
+			width: ORYX.CONFIG.CANVAS_WIDTH,
+			height: ORYX.CONFIG.CANVAS_HEIGHT,
+			'eventHandlerCallback': this.handleEvents.bind(this),
+			id: this.id,
+			parentNode: div
 		}, canvasStencil, this._getPluginFacade());
 
-        if (canvasConfig) {
-          // Migrate canvasConfig to an RDF-like structure
-          //FIXME this isn't nice at all because we don't want rdf any longer
-          var properties = [];
-          for(field in canvasConfig){
-            properties.push({
-              prefix: 'oryx',
-              name: field,
-              value: canvasConfig[field]
-            });
-          }
-
-          this._canvas.deserialize(properties);
-        }
+		if (canvasConfig) {
+			// Migrate canvasConfig to an RDF-like structure
+			//FIXME this isn't nice at all because we don't want rdf any longer
+			var properties = [];
+			for (field in canvasConfig) {
+				properties.push({
+					prefix: 'oryx',
+					name: field,
+					value: canvasConfig[field]
+				});
+			}
+
+			this._canvas.deserialize(properties);
+		}
 
 	},
 
@@ -11234,53 +11543,55 @@ ORYX.Editor = {
 	 * Returns a per-editor singleton plugin facade.
 	 * To be used in plugin initialization.
 	 */
-	_getPluginFacade: function() {
+	_getPluginFacade: function () {
 
 		// if there is no pluginfacade already created:
-		if(!(this._pluginFacade))
+		if (!(this._pluginFacade))
 
 			// create it.
 			this._pluginFacade = {
 
-				activatePluginByName:		this.activatePluginByName.bind(this),
+				activatePluginByName: this.activatePluginByName.bind(this),
 				//deactivatePluginByName:		this.deactivatePluginByName.bind(this),
-				getAvailablePlugins:	this.getAvailablePlugins.bind(this),
-				offer:					this.offer.bind(this),
-				getStencilSets:			this.getStencilSets.bind(this),
-				getStencilSetExtensionDefinition:function(){ return Object.clone(this.ss_extensions_def||{})}.bind(this),
-				getRules:				this.getRules.bind(this),
-				loadStencilSet:			this.loadStencilSet.bind(this),
-				createShape:			this.createShape.bind(this),
-				deleteShape:			this.deleteShape.bind(this),
-				getSelection:			this.getSelection.bind(this),
-				setSelection:			this.setSelection.bind(this),
-				updateSelection:		this.updateSelection.bind(this),
-				getCanvas:				this.getCanvas.bind(this),
-
-				importJSON:				this.importJSON.bind(this),
-                getJSON:                this.getJSON.bind(this),
-                getSerializedJSON:      this.getSerializedJSON.bind(this),
-
-				executeCommands:		this.executeCommands.bind(this),
-				isExecutingCommands:	this.isExecutingCommands.bind(this),
-
-				registerOnEvent:		this.registerOnEvent.bind(this),
-				unregisterOnEvent:		this.unregisterOnEvent.bind(this),
-				raiseEvent:				this.handleEvents.bind(this),
-				enableEvent:			this.enableEvent.bind(this),
-				disableEvent:			this.disableEvent.bind(this),
-
-				eventCoordinates:		this.eventCoordinates.bind(this),
-				eventCoordinatesXY:		this.eventCoordinatesXY.bind(this),
-
-				getModelMetaData:		this.getModelMetaData.bind(this)
+				getAvailablePlugins: this.getAvailablePlugins.bind(this),
+				offer: this.offer.bind(this),
+				getStencilSets: this.getStencilSets.bind(this),
+				getStencilSetExtensionDefinition: function () {
+					return Object.clone(this.ss_extensions_def || {})
+				}.bind(this),
+				getRules: this.getRules.bind(this),
+				loadStencilSet: this.loadStencilSet.bind(this),
+				createShape: this.createShape.bind(this),
+				deleteShape: this.deleteShape.bind(this),
+				getSelection: this.getSelection.bind(this),
+				setSelection: this.setSelection.bind(this),
+				updateSelection: this.updateSelection.bind(this),
+				getCanvas: this.getCanvas.bind(this),
+
+				importJSON: this.importJSON.bind(this),
+				getJSON: this.getJSON.bind(this),
+				getSerializedJSON: this.getSerializedJSON.bind(this),
+
+				executeCommands: this.executeCommands.bind(this),
+				isExecutingCommands: this.isExecutingCommands.bind(this),
+
+				registerOnEvent: this.registerOnEvent.bind(this),
+				unregisterOnEvent: this.unregisterOnEvent.bind(this),
+				raiseEvent: this.handleEvents.bind(this),
+				enableEvent: this.enableEvent.bind(this),
+				disableEvent: this.disableEvent.bind(this),
+
+				eventCoordinates: this.eventCoordinates.bind(this),
+				eventCoordinatesXY: this.eventCoordinatesXY.bind(this),
+
+				getModelMetaData: this.getModelMetaData.bind(this)
 			};
 
 		// return it.
 		return this._pluginFacade;
 	},
 
-	isExecutingCommands: function(){
+	isExecutingCommands: function () {
 		return !!this.commandExecuting;
 	},
 
@@ -11291,27 +11602,29 @@ ORYX.Editor = {
 	 *
 	 * @param <Oryx.Core.Command>[] Array of commands
 	 */
-	executeCommands: function(commands){
+	executeCommands: function (commands) {
 
-		if (!this.commandStack){
+		if (!this.commandStack) {
 			this.commandStack = [];
 		}
-		if (!this.commandStackExecuted){
+		if (!this.commandStackExecuted) {
 			this.commandStackExecuted = [];
 		}
 
 
 		this.commandStack = [].concat(this.commandStack)
-							  .concat(commands);
+			.concat(commands);
 
 		// Check if already executes
-		if (this.commandExecuting){ return; }
+		if (this.commandExecuting) {
+			return;
+		}
 
 		// Start execution
 		this.commandExecuting = true;
 
 		// Iterate over all commands
-		while(this.commandStack.length > 0){
+		while (this.commandStack.length > 0) {
 			var command = this.commandStack.shift();
 			// and execute it
 			command.execute();
@@ -11320,8 +11633,8 @@ ORYX.Editor = {
 
 		// Raise event for executing commands
 		this.handleEvents({
-			type		: ORYX.CONFIG.EVENT_EXECUTE_COMMANDS,
-			commands	: this.commandStackExecuted
+			type: ORYX.CONFIG.EVENT_EXECUTE_COMMANDS,
+			commands: this.commandStackExecuted
 		});
 
 		// Remove temporary vars
@@ -11334,108 +11647,110 @@ ORYX.Editor = {
 
 	},
 
-    /**
-     * Returns JSON of underlying canvas (calls ORYX.Canvas#toJSON()).
-     * @return {Object} Returns JSON representation as JSON object.
-     */
-    getJSON: function(){
-    	delete Array.prototype.toJSON;
-        var canvasJSON = this.getCanvas().toJSON();
-        canvasJSON.ssextensions = this.getStencilSets().values()[0].extensions().keys().findAll(function(sse){ return !sse.endsWith('/meta#') });
-        return canvasJSON;
-    },
+	/**
+	 * Returns JSON of underlying canvas (calls ORYX.Canvas#toJSON()).
+	 * @return {Object} Returns JSON representation as JSON object.
+	 */
+	getJSON: function () {
+		delete Array.prototype.toJSON;
+		var canvasJSON = this.getCanvas().toJSON();
+		canvasJSON.ssextensions = this.getStencilSets().values()[0].extensions().keys().findAll(function (sse) {
+			return !sse.endsWith('/meta#')
+		});
+		return canvasJSON;
+	},
 
-    /**
-     * Serializes a call to toJSON().
-     * @return {String} Returns JSON representation as string.
-     */
-    getSerializedJSON: function(){
-        return JSON.stringify(this.getJSON());
-    },
+	/**
+	 * Serializes a call to toJSON().
+	 * @return {String} Returns JSON representation as string.
+	 */
+	getSerializedJSON: function () {
+		return JSON.stringify(this.getJSON());
+	},
 
 	/**
-	* Imports shapes in JSON as expected by {@link ORYX.Editor#loadSerialized}
-	* @param {Object|String} jsonObject The (serialized) json object to be imported
-	* @param {boolean } [noSelectionAfterImport=false] Set to true if no shapes should be selected after import
-	* @throws {SyntaxError} If the serialized json object contains syntax errors
-	*/
-	importJSON: function(jsonObject, noSelectionAfterImport) {
+	 * Imports shapes in JSON as expected by {@link ORYX.Editor#loadSerialized}
+	 * @param {Object|String} jsonObject The (serialized) json object to be imported
+	 * @param {boolean } [noSelectionAfterImport=false] Set to true if no shapes should be selected after import
+	 * @throws {SyntaxError} If the serialized json object contains syntax errors
+	 */
+	importJSON: function (jsonObject, noSelectionAfterImport) {
 
-        try {
-            jsonObject = this.renewResourceIds(jsonObject);
-        } catch(error){
-            throw error;
-        }
+		try {
+			jsonObject = this.renewResourceIds(jsonObject);
+		} catch (error) {
+			throw error;
+		}
 		//check, if the imported json model can be loaded in this editor
 		// (stencil set has to fit)
-		if(jsonObject.stencilset.namespace && jsonObject.stencilset.namespace !== this.getCanvas().getStencil().stencilSet().namespace()) {
+		if (jsonObject.stencilset.namespace && jsonObject.stencilset.namespace !== this.getCanvas().getStencil().stencilSet().namespace()) {
 			alert(String.format(ORYX.I18N.JSONImport.wrongSS, jsonObject.stencilset.namespace, this.getCanvas().getStencil().stencilSet().namespace()));
 			return null;
 		} else {
 			var commandClass = ORYX.Core.Command.extend({
-			construct: function(jsonObject, loadSerializedCB, noSelectionAfterImport, facade){
-				this.jsonObject = jsonObject;
-				this.noSelection = noSelectionAfterImport;
-				this.facade = facade;
-				this.shapes;
-				this.connections = [];
-				this.parents = new Hash();
-				this.selection = this.facade.getSelection();
-				this.loadSerialized = loadSerializedCB;
-			},
-			execute: function(){
+				construct: function (jsonObject, loadSerializedCB, noSelectionAfterImport, facade) {
+					this.jsonObject = jsonObject;
+					this.noSelection = noSelectionAfterImport;
+					this.facade = facade;
+					this.shapes;
+					this.connections = [];
+					this.parents = new Hash();
+					this.selection = this.facade.getSelection();
+					this.loadSerialized = loadSerializedCB;
+				},
+				execute: function () {
 
-				if (!this.shapes) {
-					// Import the shapes out of the serialization
-					this.shapes	= this.loadSerialized( this.jsonObject );
+					if (!this.shapes) {
+						// Import the shapes out of the serialization
+						this.shapes = this.loadSerialized(this.jsonObject);
 
-					//store all connections
-					this.shapes.each(function(shape) {
+						//store all connections
+						this.shapes.each(function (shape) {
 
-						if (shape.getDockers) {
-							var dockers = shape.getDockers();
-							if (dockers) {
-								if (dockers.length > 0) {
-									this.connections.push([dockers.first(), dockers.first().getDockedShape(), dockers.first().referencePoint]);
-								}
-								if (dockers.length > 1) {
-									this.connections.push([dockers.last(), dockers.last().getDockedShape(), dockers.last().referencePoint]);
+							if (shape.getDockers) {
+								var dockers = shape.getDockers();
+								if (dockers) {
+									if (dockers.length > 0) {
+										this.connections.push([dockers.first(), dockers.first().getDockedShape(), dockers.first().referencePoint]);
+									}
+									if (dockers.length > 1) {
+										this.connections.push([dockers.last(), dockers.last().getDockedShape(), dockers.last().referencePoint]);
+									}
 								}
 							}
-						}
 
-						//store parents
-						this.parents[shape.id] = shape.parent;
-					}.bind(this));
-				} else {
-					this.shapes.each(function(shape) {
-						this.parents[shape.id].add(shape);
-					}.bind(this));
+							//store parents
+							this.parents[shape.id] = shape.parent;
+						}.bind(this));
+					} else {
+						this.shapes.each(function (shape) {
+							this.parents[shape.id].add(shape);
+						}.bind(this));
 
-					this.connections.each(function(con) {
-						con[0].setDockedShape(con[1]);
-						con[0].setReferencePoint(con[2]);
-						con[0].update();
-					});
-				}
+						this.connections.each(function (con) {
+							con[0].setDockedShape(con[1]);
+							con[0].setReferencePoint(con[2]);
+							con[0].update();
+						});
+					}
 
-				//this.parents.values().uniq().invoke("update");
-				this.facade.getCanvas().update();
+					//this.parents.values().uniq().invoke("update");
+					this.facade.getCanvas().update();
 
-				if(!this.noSelection)
-					this.facade.setSelection(this.shapes);
-				else
-					this.facade.updateSelection();
+					if (!this.noSelection)
+						this.facade.setSelection(this.shapes);
+					else
+						this.facade.updateSelection();
 
-				// call updateSize again, because during loadSerialized the edges' bounds
-				// are not yet initialized properly
-				this.facade.getCanvas().updateSize();
+					// call updateSize again, because during loadSerialized the edges' bounds
+					// are not yet initialized properly
+					this.facade.getCanvas().updateSize();
 
 				},
-				rollback: function(){
+				rollback: function () {
 					var selection = this.facade.getSelection();
 
-					this.shapes.each(function(shape) {
+					this.shapes.each(function (shape) {
 						selection = selection.without(shape);
 						this.facade.deleteShape(shape);
 					}.bind(this));
@@ -11452,9 +11767,9 @@ ORYX.Editor = {
 			})
 
 			var command = new commandClass(jsonObject,
-											this.loadSerialized.bind(this),
-											noSelectionAfterImport,
-											this._getPluginFacade());
+				this.loadSerialized.bind(this),
+				noSelectionAfterImport,
+				this._getPluginFacade());
 
 			this.executeCommands([command]);
 
@@ -11462,90 +11777,90 @@ ORYX.Editor = {
 		}
 	},
 
-    /**
-     * This method renew all resource Ids and according references.
-     * Warning: The implementation performs a substitution on the serialized object for
-     * easier implementation. This results in a low performance which is acceptable if this
-     * is only used when importing models.
-     * @param {Object|String} jsonObject
-     * @throws {SyntaxError} If the serialized json object contains syntax errors.
-     * @return {Object} The jsonObject with renewed ids.
-     * @private
-     */
-    renewResourceIds: function(jsonObject){
-        // For renewing resource ids, a serialized and object version is needed
-        if(Object.prototype.toString.call(jsonObject) === "String"){
-            try {
-                var serJsonObject = jsonObject;
-                jsonObject = JSON.parse(jsonObject);
-            } catch(error){
-                throw new SyntaxError(error.message);
-            }
-        } else {
-            var serJsonObject = JSON.stringify(jsonObject);
-        }
+	/**
+	 * This method renew all resource Ids and according references.
+	 * Warning: The implementation performs a substitution on the serialized object for
+	 * easier implementation. This results in a low performance which is acceptable if this
+	 * is only used when importing models.
+	 * @param {Object|String} jsonObject
+	 * @throws {SyntaxError} If the serialized json object contains syntax errors.
+	 * @return {Object} The jsonObject with renewed ids.
+	 * @private
+	 */
+	renewResourceIds: function (jsonObject) {
+		// For renewing resource ids, a serialized and object version is needed
+		if (Object.prototype.toString.call(jsonObject) === "String") {
+			try {
+				var serJsonObject = jsonObject;
+				jsonObject = JSON.parse(jsonObject);
+			} catch (error) {
+				throw new SyntaxError(error.message);
+			}
+		} else {
+			var serJsonObject = JSON.stringify(jsonObject);
+		}
 
-        // collect all resourceIds recursively
-        var collectResourceIds = function(shapes){
-            if(!shapes) return [];
+		// collect all resourceIds recursively
+		var collectResourceIds = function (shapes) {
+			if (!shapes) return [];
 
-            return shapes.map(function(shape){
-                return collectResourceIds(shape.childShapes).concat(shape.resourceId);
-            }).flatten();
-        }
-        var resourceIds = collectResourceIds(jsonObject.childShapes);
-
-        // Replace each resource id by a new one
-        resourceIds.each(function(oldResourceId){
-            var newResourceId = ORYX.Editor.provideId();
-            serJsonObject = serJsonObject.replace(new RegExp(oldResourceId, 'g'), newResourceId);
-        });
-
-        return JSON.parse(serJsonObject);
-    },
-
-    /**
-     * Loads serialized model to the oryx.
-     * @example
-     * editor.loadSerialized({
-     *    resourceId: "mymodel1",
-     *    childShapes: [
-     *       {
-     *          stencil:{ id:"Subprocess" },
-     *          outgoing:[{resourceId: 'aShape'}],
-     *          target: {resourceId: 'aShape'},
-     *          bounds:{ lowerRight:{ y:510, x:633 }, upperLeft:{ y:146, x:210 } },
-     *          resourceId: "myshape1",
-     *          childShapes:[],
-     *          properties:{},
-     *       }
-     *    ],
-     *    properties:{
-     *       language: "English"
-     *    },
-     *    stencilset:{
-     *       url:"http://localhost:8080/oryx/stencilsets/bpmn1.1/bpmn1.1.json"
-     *    },
-     *    stencil:{
-     *       id:"BPMNDiagram"
-     *    }
-     * });
-     * @param {Object} model Description of the model to load.
-     * @param {Array} [model.ssextensions] List of stenctil set extensions.
-     * @param {String} model.stencilset.url
-     * @param {String} model.stencil.id
-     * @param {Array} model.childShapes
-     * @param {Array} [model.properties]
-     * @param {String} model.resourceId
-     * @return {ORYX.Core.Shape[]} List of created shapes
-     * @methodOf ORYX.Editor.prototype
-     */
-    loadSerialized: function(model, requestMeta){
-        var canvas  = this.getCanvas();
-
-        // Bugfix (cf. http://code.google.com/p/oryx-editor/issues/detail?id=240)
-        // Deserialize the canvas' stencil set extensions properties first!
-        this.loadSSExtensions(model.ssextensions);
+			return shapes.map(function (shape) {
+				return collectResourceIds(shape.childShapes).concat(shape.resourceId);
+			}).flatten();
+		}
+		var resourceIds = collectResourceIds(jsonObject.childShapes);
+
+		// Replace each resource id by a new one
+		resourceIds.each(function (oldResourceId) {
+			var newResourceId = ORYX.Editor.provideId();
+			serJsonObject = serJsonObject.replace(new RegExp(oldResourceId, 'g'), newResourceId);
+		});
+
+		return JSON.parse(serJsonObject);
+	},
+
+	/**
+	 * Loads serialized model to the oryx.
+	 * @example
+	 * editor.loadSerialized({
+	 *    resourceId: "mymodel1",
+	 *    childShapes: [
+	 *       {
+	 *          stencil:{ id:"Subprocess" },
+	 *          outgoing:[{resourceId: 'aShape'}],
+	 *          target: {resourceId: 'aShape'},
+	 *          bounds:{ lowerRight:{ y:510, x:633 }, upperLeft:{ y:146, x:210 } },
+	 *          resourceId: "myshape1",
+	 *          childShapes:[],
+	 *          properties:{},
+	 *       }
+	 *    ],
+	 *    properties:{
+	 *       language: "English"
+	 *    },
+	 *    stencilset:{
+	 *       url:"http://localhost:8080/oryx/stencilsets/bpmn1.1/bpmn1.1.json"
+	 *    },
+	 *    stencil:{
+	 *       id:"BPMNDiagram"
+	 *    }
+	 * });
+	 * @param {Object} model Description of the model to load.
+	 * @param {Array} [model.ssextensions] List of stenctil set extensions.
+	 * @param {String} model.stencilset.url
+	 * @param {String} model.stencil.id
+	 * @param {Array} model.childShapes
+	 * @param {Array} [model.properties]
+	 * @param {String} model.resourceId
+	 * @return {ORYX.Core.Shape[]} List of created shapes
+	 * @methodOf ORYX.Editor.prototype
+	 */
+	loadSerialized: function (model, requestMeta) {
+		var canvas = this.getCanvas();
+
+		// Bugfix (cf. http://code.google.com/p/oryx-editor/issues/detail?id=240)
+		// Deserialize the canvas' stencil set extensions properties first!
+		this.loadSSExtensions(model.ssextensions);
 
 		// Load Meta Data Extension if available
 		// #Signavio
@@ -11556,28 +11871,28 @@ ORYX.Editor = {
 			}
 		}
 
-        var shapes = this.getCanvas().addShapeObjects(model.childShapes, this.handleEvents.bind(this));
+		var shapes = this.getCanvas().addShapeObjects(model.childShapes, this.handleEvents.bind(this));
 
-        if(model.properties) {
-        	for(key in model.properties) {
-        		var value = model.properties[key];
-				var prop = this.getCanvas().getStencil().property("oryx-"+key);
-        		if (!(typeof value === "string") && (!prop || !prop.isList())) {
-        			value = JSON.stringify(value);
-        		}
-            	this.getCanvas().setProperty("oryx-" + key, value);
-            }
-        }
+		if (model.properties) {
+			for (key in model.properties) {
+				var value = model.properties[key];
+				var prop = this.getCanvas().getStencil().property("oryx-" + key);
+				if (!(typeof value === "string") && (!prop || !prop.isList())) {
+					value = JSON.stringify(value);
+				}
+				this.getCanvas().setProperty("oryx-" + key, value);
+			}
+		}
 
 
-        this.getCanvas().updateSize();
+		this.getCanvas().updateSize();
 
 		// Force to update the selection
 		this.selection = [null];
 		this.setSelection([]);
 
-        return shapes;
-    },
+		return shapes;
+	},
 
 	/**
 	 * Return the namespace of the extension which
@@ -11585,40 +11900,40 @@ ORYX.Editor = {
 	 * @return {String} Returns null if no extension is defined, otherwise the namespace
 	 *
 	 */
-	getExtensionForMetaData: function(){
-		if (!this.ss_extensions_def||!(this.ss_extensions_def.extensions instanceof Array)){
+	getExtensionForMetaData: function () {
+		if (!this.ss_extensions_def || !(this.ss_extensions_def.extensions instanceof Array)) {
 			return null;
 		}
 
 		var stencilsets = this.getStencilSets();
-		var extension = this.ss_extensions_def.extensions.find(function(ex){
-				return !!stencilsets[ex["extends"]] && ex.namespace.endsWith("/meta#");
-			});
+		var extension = this.ss_extensions_def.extensions.find(function (ex) {
+			return !!stencilsets[ex["extends"]] && ex.namespace.endsWith("/meta#");
+		});
 
 		return extension ? extension.namespace || null : null;
 	},
 
-    /**
-     * Calls ORYX.Editor.prototype.ss_extension_namespace for each element
-     * @param {Array} ss_extension_namespaces An array of stencil set extension namespaces.
-     */
-    loadSSExtensions: function(ss_extension_namespaces){
-        if(!ss_extension_namespaces) return;
+	/**
+	 * Calls ORYX.Editor.prototype.ss_extension_namespace for each element
+	 * @param {Array} ss_extension_namespaces An array of stencil set extension namespaces.
+	 */
+	loadSSExtensions: function (ss_extension_namespaces) {
+		if (!ss_extension_namespaces) return;
 
-        ss_extension_namespaces.each(function(ss_extension_namespace){
-            this.loadSSExtension(ss_extension_namespace);
-        }.bind(this));
-    },
+		ss_extension_namespaces.each(function (ss_extension_namespace) {
+			this.loadSSExtension(ss_extension_namespace);
+		}.bind(this));
+	},
 
 	/**
-	* Loads a stencil set extension.
-	* The stencil set extensions definiton file must already
-	* be loaded when the editor is initialized.
-	*/
-	loadSSExtension: function(ss_extension_namespace) {
+	 * Loads a stencil set extension.
+	 * The stencil set extensions definiton file must already
+	 * be loaded when the editor is initialized.
+	 */
+	loadSSExtension: function (ss_extension_namespace) {
 
 		if (this.ss_extensions_def) {
-			var extension = this.ss_extensions_def.extensions.find(function(ex){
+			var extension = this.ss_extensions_def.extensions.find(function (ex) {
 				return (ex.namespace == ss_extension_namespace);
 			});
 
@@ -11633,7 +11948,7 @@ ORYX.Editor = {
 			}
 
 			// Check if absolute or relative url
-			if ((extension["definition"]||"").startsWith("/")){
+			if ((extension["definition"] || "").startsWith("/")) {
 				stencilset.addExtension(extension["definition"])
 			} else {
 				stencilset.addExtension(ORYX.CONFIG.SS_EXTENSIONS_FOLDER + extension["definition"])
@@ -11649,29 +11964,29 @@ ORYX.Editor = {
 
 	},
 
-	disableEvent: function(eventType){
-		if(eventType == ORYX.CONFIG.EVENT_KEYDOWN) {
+	disableEvent: function (eventType) {
+		if (eventType == ORYX.CONFIG.EVENT_KEYDOWN) {
 			this._keydownEnabled = false;
 		}
-		if(eventType == ORYX.CONFIG.EVENT_KEYUP) {
+		if (eventType == ORYX.CONFIG.EVENT_KEYUP) {
 			this._keyupEnabled = false;
 		}
-		if(this.DOMEventListeners.keys().member(eventType)) {
+		if (this.DOMEventListeners.keys().member(eventType)) {
 			var value = this.DOMEventListeners.remove(eventType);
 			this.DOMEventListeners['disable_' + eventType] = value;
 		}
 	},
 
-	enableEvent: function(eventType){
-		if(eventType == ORYX.CONFIG.EVENT_KEYDOWN) {
+	enableEvent: function (eventType) {
+		if (eventType == ORYX.CONFIG.EVENT_KEYDOWN) {
 			this._keydownEnabled = true;
 		}
 
-		if(eventType == ORYX.CONFIG.EVENT_KEYUP) {
+		if (eventType == ORYX.CONFIG.EVENT_KEYUP) {
 			this._keyupEnabled = true;
 		}
 
-		if(this.DOMEventListeners.keys().member("disable_" + eventType)) {
+		if (this.DOMEventListeners.keys().member("disable_" + eventType)) {
 			var value = this.DOMEventListeners.remove("disable_" + eventType);
 			this.DOMEventListeners[eventType] = value;
 		}
@@ -11680,16 +11995,16 @@ ORYX.Editor = {
 	/**
 	 *  Methods for the PluginFacade
 	 */
-	registerOnEvent: function(eventType, callback) {
-		if(!(this.DOMEventListeners.keys().member(eventType))) {
+	registerOnEvent: function (eventType, callback) {
+		if (!(this.DOMEventListeners.keys().member(eventType))) {
 			this.DOMEventListeners[eventType] = [];
 		}
 
 		this.DOMEventListeners[eventType].push(callback);
 	},
 
-	unregisterOnEvent: function(eventType, callback) {
-		if(this.DOMEventListeners.keys().member(eventType)) {
+	unregisterOnEvent: function (eventType, callback) {
+		if (this.DOMEventListeners.keys().member(eventType)) {
 			this.DOMEventListeners[eventType] = this.DOMEventListeners[eventType].without(callback);
 		} else {
 			// Event is not supported
@@ -11697,29 +12012,29 @@ ORYX.Editor = {
 		}
 	},
 
-	getSelection: function() {
+	getSelection: function () {
 		return this.selection || [];
 	},
 
-	getStencilSets: function() {
+	getStencilSets: function () {
 		return ORYX.Core.StencilSet.stencilSets(this.id);
 	},
 
-	getRules: function() {
+	getRules: function () {
 		return ORYX.Core.StencilSet.rules(this.id);
 	},
 
-	loadStencilSet: function(source) {
+	loadStencilSet: function (source) {
 		try {
 			ORYX.Core.StencilSet.loadStencilSet(source, this.modelMetaData, this.id);
-			this.handleEvents({type:ORYX.CONFIG.EVENT_STENCIL_SET_LOADED});
+			this.handleEvents({type: ORYX.CONFIG.EVENT_STENCIL_SET_LOADED});
 		} catch (e) {
 			ORYX.Log.warn("Requesting stencil set file failed. (" + e + ")");
 		}
 	},
 
-	offer: function(pluginData) {
-		if(!this.pluginsData.member(pluginData)){
+	offer: function (pluginData) {
+		if (!this.pluginsData.member(pluginData)) {
 			this.pluginsData.push(pluginData);
 		}
 	},
@@ -11730,48 +12045,45 @@ ORYX.Editor = {
 	 * of the offer method.
 	 *
 	 * The new key down event fits the schema:
-	 * 		key.event[.metactrl][.alt][.shift].'thekeyCode'
+	 *        key.event[.metactrl][.alt][.shift].'thekeyCode'
 	 */
-	registerPluginsOnKeyEvents: function() {
-		this.pluginsData.each(function(pluginData) {
+	registerPluginsOnKeyEvents: function () {
+		this.pluginsData.each(function (pluginData) {
 
-			if(pluginData.keyCodes) {
+			if (pluginData.keyCodes) {
 
-				pluginData.keyCodes.each(function(keyComb) {
+				pluginData.keyCodes.each(function (keyComb) {
 					var eventName = "key.event";
 
 					/* Include key action */
 					eventName += '.' + keyComb.keyAction;
 
-					if(keyComb.metaKeys) {
+					if (keyComb.metaKeys) {
 						/* Register on ctrl or apple meta key as meta key */
-						if(keyComb.metaKeys.
-							indexOf(ORYX.CONFIG.META_KEY_META_CTRL) > -1) {
-								eventName += "." + ORYX.CONFIG.META_KEY_META_CTRL;
+						if (keyComb.metaKeys.indexOf(ORYX.CONFIG.META_KEY_META_CTRL) > -1) {
+							eventName += "." + ORYX.CONFIG.META_KEY_META_CTRL;
 						}
 
 						/* Register on alt key as meta key */
-						if(keyComb.metaKeys.
-							indexOf(ORYX.CONFIG.META_KEY_ALT) > -1) {
-								eventName += '.' + ORYX.CONFIG.META_KEY_ALT;
+						if (keyComb.metaKeys.indexOf(ORYX.CONFIG.META_KEY_ALT) > -1) {
+							eventName += '.' + ORYX.CONFIG.META_KEY_ALT;
 						}
 
 						/* Register on shift key as meta key */
-						if(keyComb.metaKeys.
-							indexOf(ORYX.CONFIG.META_KEY_SHIFT) > -1) {
-								eventName += '.' + ORYX.CONFIG.META_KEY_SHIFT;
+						if (keyComb.metaKeys.indexOf(ORYX.CONFIG.META_KEY_SHIFT) > -1) {
+							eventName += '.' + ORYX.CONFIG.META_KEY_SHIFT;
 						}
 					}
 
 					/* Register on the actual key */
-					if(keyComb.keyCode)	{
+					if (keyComb.keyCode) {
 						eventName += '.' + keyComb.keyCode;
 					}
 
 					/* Register the event */
 					ORYX.Log.debug("Register Plugin on Key Event: %0", eventName);
 					if (pluginData.toggle === true && pluginData.buttonInstance) {
-						this.registerOnEvent(eventName, function(){
+						this.registerOnEvent(eventName, function () {
 							pluginData.buttonInstance.toggle(!pluginData.buttonInstance.pressed); // Toggle
 							pluginData.functionality.call(pluginData, pluginData.buttonInstance, pluginData.buttonInstance.pressed); // Call function
 						});
@@ -11784,70 +12096,87 @@ ORYX.Editor = {
 		}.bind(this));
 	},
 
-	isEqual: function(a,b){
-		return a === b || (a.length === b.length && a.all(function(r){ return b.include(r) }))
+	isEqual: function (a, b) {
+		return a === b || (a.length === b.length && a.all(function (r) {
+			return b.include(r)
+		}))
 	},
 
-	isDirty: function(a){
-		return a.any(function(shape){ return shape.isPropertyChanged() })
+	isDirty: function (a) {
+		return a.any(function (shape) {
+			return shape.isPropertyChanged()
+		})
 	},
 
-	setSelection: function(elements, subSelectionElement, force) {
+	setSelection: function (elements, subSelectionElement, force) {
 
-		if (!elements) { elements = []; }
-		if (!(elements instanceof Array)) { elements = [elements]; }
+		if (!elements) {
+			elements = [];
+		}
+		if (!(elements instanceof Array)) {
+			elements = [elements];
+		}
 
-		elements = elements.findAll(function(n){ return n && n instanceof ORYX.Core.Shape });
+		elements = elements.findAll(function (n) {
+			return n && n instanceof ORYX.Core.Shape
+		});
 
 		if (elements[0] instanceof ORYX.Core.Canvas) {
 			elements = [];
 		}
 
-		if (!force && this.isEqual(this.selection, elements) && !this.isDirty(elements)){
+		if (!force && this.isEqual(this.selection, elements) && !this.isDirty(elements)) {
 			return;
 		}
 
 		this.selection = elements;
 		this._subSelection = subSelectionElement;
 
-		this.handleEvents({type:ORYX.CONFIG.EVENT_SELECTION_CHANGED, elements:elements, subSelection: subSelectionElement, force: !!force})
+		this.handleEvents({
+			type: ORYX.CONFIG.EVENT_SELECTION_CHANGED,
+			elements: elements,
+			subSelection: subSelectionElement,
+			force: !!force
+		})
 	},
 
-	updateSelection: function() {
+	updateSelection: function () {
 		this.setSelection(this.selection, this._subSelection, true);
 		/*var s = this.selection;
 		this.setSelection();
 		this.setSelection(s);*/
 	},
 
-	getCanvas: function() {
+	getCanvas: function () {
 		return this._canvas;
 	},
 
 
 	/**
-	*	option = {
-	*		type: string,
-	*		position: {x:int, y:int},
-	*		connectingType:	uiObj-Class
-	*		connectedShape: uiObj
-	*		draggin: bool
-	*		namespace: url
-	*       parent: ORYX.Core.AbstractShape
-	*		template: a template shape that the newly created inherits properties from.
-	*		}
-	*/
-	createShape: function(option) {
+	 *    option = {
+	 *		type: string,
+	 *		position: {x:int, y:int},
+	 *		connectingType:	uiObj-Class
+	 *		connectedShape: uiObj
+	 *		draggin: bool
+	 *		namespace: url
+	 *       parent: ORYX.Core.AbstractShape
+	 *		template: a template shape that the newly created inherits properties from.
+	 *		}
+	 */
+	createShape: function (option) {
 
-		if(option && option.serialize && option.serialize instanceof Array){
+		if (option && option.serialize && option.serialize instanceof Array) {
 
-			var type = option.serialize.find(function(obj){return (obj.prefix+"-"+obj.name) == "oryx-type"});
+			var type = option.serialize.find(function (obj) {
+				return (obj.prefix + "-" + obj.name) == "oryx-type"
+			});
 			var stencil = ORYX.Core.StencilSet.stencil(type.value);
 
-			if(stencil.type() == 'node'){
-				var newShapeObject = new ORYX.Core.Node({'eventHandlerCallback':this.handleEvents.bind(this)}, stencil, this._getPluginFacade());
+			if (stencil.type() == 'node') {
+				var newShapeObject = new ORYX.Core.Node({'eventHandlerCallback': this.handleEvents.bind(this)}, stencil, this._getPluginFacade());
 			} else {
-				var newShapeObject = new ORYX.Core.Edge({'eventHandlerCallback':this.handleEvents.bind(this)}, stencil, this._getPluginFacade());
+				var newShapeObject = new ORYX.Core.Edge({'eventHandlerCallback': this.handleEvents.bind(this)}, stencil, this._getPluginFacade());
 			}
 
 			this.getCanvas().add(newShapeObject);
@@ -11857,7 +12186,9 @@ ORYX.Editor = {
 		}
 
 		// If there is no argument, throw an exception
-		if(!option || !option.type || !option.namespace) { throw "To create a new shape you have to give an argument with type and namespace";}
+		if (!option || !option.type || !option.namespace) {
+			throw "To create a new shape you have to give an argument with type and namespace";
+		}
 
 		var canvas = this.getCanvas();
 		var newShapeObject;
@@ -11868,21 +12199,21 @@ ORYX.Editor = {
 		// Get the stencil set
 		var sset = ORYX.Core.StencilSet.stencilSet(option.namespace);
 		// Create an New Shape, dependents on an Edge or a Node
-		if(sset.stencil(shapetype).type() == "node") {
-			newShapeObject = new ORYX.Core.Node({'eventHandlerCallback':this.handleEvents.bind(this)}, sset.stencil(shapetype), this._getPluginFacade())
+		if (sset.stencil(shapetype).type() == "node") {
+			newShapeObject = new ORYX.Core.Node({'eventHandlerCallback': this.handleEvents.bind(this)}, sset.stencil(shapetype), this._getPluginFacade())
 		} else {
-			newShapeObject = new ORYX.Core.Edge({'eventHandlerCallback':this.handleEvents.bind(this)}, sset.stencil(shapetype), this._getPluginFacade())
+			newShapeObject = new ORYX.Core.Edge({'eventHandlerCallback': this.handleEvents.bind(this)}, sset.stencil(shapetype), this._getPluginFacade())
 		}
 
 		// when there is a template, inherit the properties.
-		if(option.template) {
+		if (option.template) {
 
 			newShapeObject._jsonStencil.properties = option.template._jsonStencil.properties;
 			newShapeObject.postProcessProperties();
 		}
 
 		// Add to the canvas
-		if(option.parent && newShapeObject instanceof ORYX.Core.Node) {
+		if (option.parent && newShapeObject instanceof ORYX.Core.Node) {
 			option.parent.add(newShapeObject);
 		} else {
 			canvas.add(newShapeObject);
@@ -11890,22 +12221,22 @@ ORYX.Editor = {
 
 
 		// Set the position
-		var point = option.position ? option.position : {x:100, y:200};
+		var point = option.position ? option.position : {x: 100, y: 200};
 
 
 		var con;
 		// If there is create a shape and in the argument there is given an ConnectingType and is instance of an edge
-		if(option.connectingType && option.connectedShape && !(newShapeObject instanceof ORYX.Core.Edge)) {
+		if (option.connectingType && option.connectedShape && !(newShapeObject instanceof ORYX.Core.Edge)) {
 
 			// there will be create a new Edge
-			con = new ORYX.Core.Edge({'eventHandlerCallback':this.handleEvents.bind(this)}, sset.stencil(option.connectingType));
+			con = new ORYX.Core.Edge({'eventHandlerCallback': this.handleEvents.bind(this)}, sset.stencil(option.connectingType));
 
 			// And both endings dockers will be referenced to the both shapes
 			con.dockers.first().setDockedShape(option.connectedShape);
 
 			var magnet = option.connectedShape.getDefaultMagnet()
 			var cPoint = magnet ? magnet.bounds.center() : option.connectedShape.bounds.midPoint();
-			con.dockers.first().setReferencePoint( cPoint );
+			con.dockers.first().setReferencePoint(cPoint);
 			con.dockers.last().setDockedShape(newShapeObject);
 			con.dockers.last().setReferencePoint(newShapeObject.getDefaultMagnet().bounds.center());
 
@@ -11916,11 +12247,11 @@ ORYX.Editor = {
 		}
 
 		// Move the new Shape to the position
-		if(newShapeObject instanceof ORYX.Core.Edge && option.connectedShape) {
+		if (newShapeObject instanceof ORYX.Core.Edge && option.connectedShape) {
 
 			newShapeObject.dockers.first().setDockedShape(option.connectedShape);
 
-			if( option.connectedShape instanceof ORYX.Core.Node ){
+			if (option.connectedShape instanceof ORYX.Core.Node) {
 				newShapeObject.dockers.first().setReferencePoint(option.connectedShape.getDefaultMagnet().bounds.center());
 				newShapeObject.dockers.last().bounds.centerMoveTo(point);
 			} else {
@@ -11928,33 +12259,33 @@ ORYX.Editor = {
 			}
 
 			var start = newShapeObject.dockers.first();
-        	var end = newShapeObject.dockers.last();
+			var end = newShapeObject.dockers.last();
 
-        	if(start.getDockedShape() && end.getDockedShape()) {
-        		var startPoint = start.getAbsoluteReferencePoint();
-        		var endPoint = end.getAbsoluteReferencePoint();
+			if (start.getDockedShape() && end.getDockedShape()) {
+				var startPoint = start.getAbsoluteReferencePoint();
+				var endPoint = end.getAbsoluteReferencePoint();
 
-        		var docker = newShapeObject.createDocker();
-        		docker.bounds.centerMoveTo({
-        			x: startPoint.x + (endPont.x - startPoint.x) / 2,
-        			y: startPoint.y + (endPont.y - startPoint.y) / 2
-        		});
-        	}
+				var docker = newShapeObject.createDocker();
+				docker.bounds.centerMoveTo({
+					x: startPoint.x + (endPont.x - startPoint.x) / 2,
+					y: startPoint.y + (endPont.y - startPoint.y) / 2
+				});
+			}
 
 		} else {
 
 			var b = newShapeObject.bounds
-			if( newShapeObject instanceof ORYX.Core.Node && newShapeObject.dockers.length == 1){
+			if (newShapeObject instanceof ORYX.Core.Node && newShapeObject.dockers.length == 1) {
 				b = newShapeObject.dockers.first().bounds
 			}
 
 			b.centerMoveTo(point);
 
 			var upL = b.upperLeft();
-			b.moveBy( -Math.min(upL.x, 0) , -Math.min(upL.y, 0) )
+			b.moveBy(-Math.min(upL.x, 0), -Math.min(upL.y, 0))
 
 			var lwR = b.lowerRight();
-			b.moveBy( -Math.max(lwR.x-canvas.bounds.width(), 0) , -Math.max(lwR.y-canvas.bounds.height(), 0) )
+			b.moveBy(-Math.max(lwR.x - canvas.bounds.width(), 0), -Math.max(lwR.y - canvas.bounds.height(), 0))
 
 		}
 
@@ -11964,46 +12295,48 @@ ORYX.Editor = {
 		}
 
 		// And refresh the selection
-		if(!(newShapeObject instanceof ORYX.Core.Edge)&&!(option.dontUpdateSelection)) {
+		if (!(newShapeObject instanceof ORYX.Core.Edge) && !(option.dontUpdateSelection)) {
 			this.setSelection([newShapeObject]);
 		}
 
-		if(con && con.alignDockers) {
+		if (con && con.alignDockers) {
 			//con.alignDockers();
 		}
-		if(newShapeObject.alignDockers) {
+		if (newShapeObject.alignDockers) {
 			newShapeObject.alignDockers();
 		}
 
 		return newShapeObject;
 	},
 
-	deleteShape: function(shape) {
+	deleteShape: function (shape) {
 
-		if (!shape || !shape.parent){ return }
+		if (!shape || !shape.parent) {
+			return
+		}
 
 		//remove shape from parent
 		// this also removes it from DOM
 		shape.parent.remove(shape);
 
 		//delete references to outgoing edges
-		shape.getOutgoingShapes().each(function(os) {
+		shape.getOutgoingShapes().each(function (os) {
 			var docker = os.getDockers().first();
-			if(docker && docker.getDockedShape() == shape) {
+			if (docker && docker.getDockedShape() == shape) {
 				docker.setDockedShape(undefined);
 			}
 		});
 
 		//delete references to incoming edges
-		shape.getIncomingShapes().each(function(is) {
+		shape.getIncomingShapes().each(function (is) {
 			var docker = is.getDockers().last();
-			if(docker && docker.getDockedShape() == shape) {
+			if (docker && docker.getDockedShape() == shape) {
 				docker.setDockedShape(undefined);
 			}
 		});
 
 		//delete references of the shape's dockers
-		shape.getDockers().each(function(docker) {
+		shape.getDockers().each(function (docker) {
 			docker.setDockedShape(undefined);
 		});
 	},
@@ -12016,27 +12349,27 @@ ORYX.Editor = {
 	 *
 	 * @return {Object} Meta data about the model
 	 */
-	getModelMetaData: function() {
+	getModelMetaData: function () {
 		return this.modelMetaData;
 	},
 
 	/* Event-Handler Methods */
 
 	/**
-	* Helper method to execute an event immediately. The event is not
-	* scheduled in the _eventsQueue. Needed to handle Layout-Callbacks.
-	*/
-	_executeEventImmediately: function(eventObj) {
-		if(this.DOMEventListeners.keys().member(eventObj.event.type)) {
-			this.DOMEventListeners[eventObj.event.type].each((function(value) {
+	 * Helper method to execute an event immediately. The event is not
+	 * scheduled in the _eventsQueue. Needed to handle Layout-Callbacks.
+	 */
+	_executeEventImmediately: function (eventObj) {
+		if (this.DOMEventListeners.keys().member(eventObj.event.type)) {
+			this.DOMEventListeners[eventObj.event.type].each((function (value) {
 				value(eventObj.event, eventObj.arg);
 			}).bind(this));
 		}
 	},
 
-	_executeEvents: function() {
+	_executeEvents: function () {
 		this._queueRunning = true;
-		while(this._eventsQueue.length > 0) {
+		while (this._eventsQueue.length > 0) {
 			var val = this._eventsQueue.shift();
 			this._executeEventImmediately(val);
 		}
@@ -12048,11 +12381,11 @@ ORYX.Editor = {
 	 * @param {Object} event Event , welches gefeuert wurde
 	 * @param {Object} uiObj Target-UiObj
 	 */
-	handleEvents: function(event, uiObj) {
+	handleEvents: function (event, uiObj) {
 
 		ORYX.Log.trace("Dispatching event type %0 on %1", event.type, uiObj);
 
-		switch(event.type) {
+		switch (event.type) {
 			case ORYX.CONFIG.EVENT_MOUSEDOWN:
 				this._handleMouseDown(event, uiObj);
 				break;
@@ -12070,13 +12403,13 @@ ORYX.Editor = {
 				break;
 		}
 		/* Force execution if necessary. Used while handle Layout-Callbacks. */
-		if(event.forceExecution) {
+		if (event.forceExecution) {
 			this._executeEventImmediately({event: event, arg: uiObj});
 		} else {
 			this._eventsQueue.push({event: event, arg: uiObj});
 		}
 
-		if(!this._queueRunning) {
+		if (!this._queueRunning) {
 			this._executeEvents();
 		}
 
@@ -12085,36 +12418,36 @@ ORYX.Editor = {
 		return false;
 	},
 
-	isValidEvent: function(e){
+	isValidEvent: function (e) {
 		try {
 			var isInput = ["INPUT", "TEXTAREA"].include(e.target.tagName.toUpperCase());
 			var gridHasFocus = e.target.className.include("x-grid3-focus") && !e.target.className.include("x-grid3-focus-canvas");
 			return !isInput && !gridHasFocus;
-		} catch(e){
+		} catch (e) {
 			return false;
 		}
 	},
 
-	catchKeyUpEvents: function(event) {
-		if(!this._keyupEnabled) {
+	catchKeyUpEvents: function (event) {
+		if (!this._keyupEnabled) {
 			return;
 		}
 		/* assure we have the current event. */
-        if (!event)
-            event = window.event;
+		if (!event)
+			event = window.event;
 
 		// Checks if the event comes from some input field
-		if (!this.isValidEvent(event)){
+		if (!this.isValidEvent(event)) {
 			return;
 		}
 
 		/* Create key up event type */
-		var keyUpEvent = this.createKeyCombEvent(event,	ORYX.CONFIG.KEY_ACTION_UP);
+		var keyUpEvent = this.createKeyCombEvent(event, ORYX.CONFIG.KEY_ACTION_UP);
 
 		ORYX.Log.debug("Key Event to handle: %0", keyUpEvent);
 
 		/* forward to dispatching. */
-		this.handleEvents({type: keyUpEvent, event:event});
+		this.handleEvents({type: keyUpEvent, event: event});
 	},
 
 	/**
@@ -12122,15 +12455,15 @@ ORYX.Editor = {
 	 * dispatching concerning to the pressed keys.
 	 *
 	 * @param {Event}
-	 * 		The key down event to handle
+	 *        The key down event to handle
 	 */
-	catchKeyDownEvents: function(event) {
-		if(!this._keydownEnabled) {
+	catchKeyDownEvents: function (event) {
+		if (!this._keydownEnabled) {
 			return;
 		}
 		/* Assure we have the current event. */
-        if (!event)
-            event = window.event;
+		if (!event)
+			event = window.event;
 
 		/* Fixed in FF3 */
 		// This is a mac-specific fix. The mozilla event object has no knowledge
@@ -12145,7 +12478,7 @@ ORYX.Editor = {
 		//this.__currentKey = pressedKey;
 
 		// Checks if the event comes from some input field
-		if (!this.isValidEvent(event)){
+		if (!this.isValidEvent(event)) {
 			return;
 		}
 
@@ -12155,49 +12488,49 @@ ORYX.Editor = {
 		ORYX.Log.debug("Key Event to handle: %0", keyDownEvent);
 
 		/* Forward to dispatching. */
-		this.handleEvents({type: keyDownEvent,event: event});
+		this.handleEvents({type: keyDownEvent, event: event});
 	},
 
 	/**
 	 * Creates the event type name concerning to the pressed keys.
 	 *
 	 * @param {Event} keyDownEvent
-	 * 		The source keyDownEvent to build up the event name
+	 *        The source keyDownEvent to build up the event name
 	 */
-	createKeyCombEvent: function(keyEvent, keyAction) {
+	createKeyCombEvent: function (keyEvent, keyAction) {
 
 		/* Get the currently pressed key code. */
-        var pressedKey = keyEvent.which || keyEvent.keyCode;
+		var pressedKey = keyEvent.which || keyEvent.keyCode;
 		//this.__currentKey = pressedKey;
 
 		/* Event name */
 		var eventName = "key.event";
 
 		/* Key action */
-		if(keyAction) {
+		if (keyAction) {
 			eventName += "." + keyAction;
 		}
 
 		/* Ctrl or apple meta key is pressed */
-		if(keyEvent.ctrlKey || keyEvent.metaKey) {
+		if (keyEvent.ctrlKey || keyEvent.metaKey) {
 			eventName += "." + ORYX.CONFIG.META_KEY_META_CTRL;
 		}
 
 		/* Alt key is pressed */
-		if(keyEvent.altKey) {
+		if (keyEvent.altKey) {
 			eventName += "." + ORYX.CONFIG.META_KEY_ALT;
 		}
 
 		/* Alt key is pressed */
-		if(keyEvent.shiftKey) {
+		if (keyEvent.shiftKey) {
 			eventName += "." + ORYX.CONFIG.META_KEY_SHIFT;
 		}
 
 		/* Return the composed event name */
-		return  eventName + "." + pressedKey;
+		return eventName + "." + pressedKey;
 	},
 
-	_handleMouseDown: function(event, uiObj) {
+	_handleMouseDown: function (event, uiObj) {
 
 		// get canvas.
 		var canvas = this.getCanvas();
@@ -12219,16 +12552,16 @@ ORYX.Editor = {
 
 
 		// Rule #1: When there is nothing selected, select the clicked object.
-		if(currentIsSelectable && noObjectsSelected) {
+		if (currentIsSelectable && noObjectsSelected) {
 
 			this.setSelection([elementController]);
 
 			ORYX.Log.trace("Rule #1 applied for mouse down on %0", element.id);
 
-		// Rule #3: When at least one element is selected, and there is no
-		// control key pressed, and the clicked object is not selected, select
-		// the clicked object.
-		} else if(currentIsSelectable && !noObjectsSelected &&
+			// Rule #3: When at least one element is selected, and there is no
+			// control key pressed, and the clicked object is not selected, select
+			// the clicked object.
+		} else if (currentIsSelectable && !noObjectsSelected &&
 			!modifierKeyPressed && !currentIsSelected) {
 
 			this.setSelection([elementController]);
@@ -12238,9 +12571,9 @@ ORYX.Editor = {
 
 			ORYX.Log.trace("Rule #3 applied for mouse down on %0", element.id);
 
-		// Rule #4: When the control key is pressed, and the current object is
-		// not selected, add it to the selection.
-		} else if(currentIsSelectable && modifierKeyPressed
+			// Rule #4: When the control key is pressed, and the current object is
+			// not selected, add it to the selection.
+		} else if (currentIsSelectable && modifierKeyPressed
 			&& !currentIsSelected) {
 
 			var newSelection = this.selection.clone();
@@ -12249,8 +12582,8 @@ ORYX.Editor = {
 
 			ORYX.Log.trace("Rule #4 applied for mouse down on %0", element.id);
 
-		// Rule #6
-		} else if(currentIsSelectable && currentIsSelected &&
+			// Rule #6
+		} else if (currentIsSelectable && currentIsSelected &&
 			modifierKeyPressed) {
 
 			var newSelection = this.selection.clone();
@@ -12258,16 +12591,16 @@ ORYX.Editor = {
 
 			ORYX.Log.trace("Rule #6 applied for mouse down on %0", elementController.id);
 
-		// Rule #5: When there is at least one object selected and no control
-		// key pressed, we're dragging.
-		/*} else if(currentIsSelectable && !noObjectsSelected
+			// Rule #5: When there is at least one object selected and no control
+			// key pressed, we're dragging.
+			/*} else if(currentIsSelectable && !noObjectsSelected
 			&& !modifierKeyPressed) {
 
 			if(this.log.isTraceEnabled())
 				this.log.trace("Rule #5 applied for mouse down on "+element.id);
 */
-		// Rule #2: When clicked on something that is neither
-		// selectable nor movable, clear the selection, and return.
+			// Rule #2: When clicked on something that is neither
+			// selectable nor movable, clear the selection, and return.
 		} else if (!currentIsSelectable && !currentIsMovable) {
 
 			this.setSelection([]);
@@ -12276,20 +12609,20 @@ ORYX.Editor = {
 
 			return;
 
-		// Rule #7: When the current object is not selectable but movable,
-		// it is probably a control. Leave the selection unchanged but set
-		// the movedObject to the current one and enable Drag. Dockers will
-		// be processed in the dragDocker plugin.
-		} else if(!currentIsSelectable && currentIsMovable && !(elementController instanceof ORYX.Core.Controls.Docker)) {
+			// Rule #7: When the current object is not selectable but movable,
+			// it is probably a control. Leave the selection unchanged but set
+			// the movedObject to the current one and enable Drag. Dockers will
+			// be processed in the dragDocker plugin.
+		} else if (!currentIsSelectable && currentIsMovable && !(elementController instanceof ORYX.Core.Controls.Docker)) {
 
 			// TODO: If there is any moveable elements, do this in a plugin
 			//ORYX.Core.UIEnableDrag(event, elementController);
 
 			ORYX.Log.trace("Rule #7 applied for mouse down on %0", element.id);
 
-		// Rule #8: When the element is selectable and is currently selected and no
-		// modifier key is pressed
-		} else if(currentIsSelectable && currentIsSelected &&
+			// Rule #8: When the element is selectable and is currently selected and no
+			// modifier key is pressed
+		} else if (currentIsSelectable && currentIsSelected &&
 			!modifierKeyPressed) {
 
 			this._subSelection = this._subSelection != elementController ? elementController : undefined;
@@ -12305,11 +12638,11 @@ ORYX.Editor = {
 		return;
 	},
 
-	_handleMouseMove: function(event, uiObj) {
+	_handleMouseMove: function (event, uiObj) {
 		return;
 	},
 
-	_handleMouseUp: function(event, uiObj) {
+	_handleMouseUp: function (event, uiObj) {
 		// get canvas.
 		var canvas = this.getCanvas();
 
@@ -12322,11 +12655,11 @@ ORYX.Editor = {
 		//Event.stop(event);
 	},
 
-	_handleMouseHover: function(event, uiObj) {
+	_handleMouseHover: function (event, uiObj) {
 		return;
 	},
 
-	_handleMouseOut: function(event, uiObj) {
+	_handleMouseOut: function (event, uiObj) {
 		return;
 	},
 
@@ -12335,7 +12668,7 @@ ORYX.Editor = {
 	 * @param {Event} event
 	 * @return {SVGPoint} The event coordinates in the SVG document
 	 */
-	eventCoordinates: function(event) {
+	eventCoordinates: function (event) {
 
 		var canvas = this.getCanvas();
 
@@ -12344,27 +12677,27 @@ ORYX.Editor = {
 		svgPoint.y = event.clientY;
 
 		var additionalIEZoom = 1;
-        if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
-            var ua = navigator.userAgent;
-            if (ua.indexOf('MSIE') >= 0) {
-                //IE 10 and below
-                var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
-                if (zoom !== 100) {
-                    additionalIEZoom = zoom / 100
-                }
-            }
-        }
+		if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
+			var ua = navigator.userAgent;
+			if (ua.indexOf('MSIE') >= 0) {
+				//IE 10 and below
+				var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
+				if (zoom !== 100) {
+					additionalIEZoom = zoom / 100
+				}
+			}
+		}
 
-        if (additionalIEZoom !== 1) {
-            svgPoint.x = svgPoint.x * additionalIEZoom;
-            svgPoint.y = svgPoint.y * additionalIEZoom;
-        }
+		if (additionalIEZoom !== 1) {
+			svgPoint.x = svgPoint.x * additionalIEZoom;
+			svgPoint.y = svgPoint.y * additionalIEZoom;
+		}
 
 		var matrix = canvas.node.getScreenCTM();
 		return svgPoint.matrixTransform(matrix.inverse());
 	},
 
-	eventCoordinatesXY: function(x, y) {
+	eventCoordinatesXY: function (x, y) {
 
 		var canvas = this.getCanvas();
 
@@ -12373,21 +12706,21 @@ ORYX.Editor = {
 		svgPoint.y = y;
 
 		var additionalIEZoom = 1;
-        if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
-            var ua = navigator.userAgent;
-            if (ua.indexOf('MSIE') >= 0) {
-                //IE 10 and below
-                var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
-                if (zoom !== 100) {
-                    additionalIEZoom = zoom / 100
-                }
-            }
-        }
+		if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
+			var ua = navigator.userAgent;
+			if (ua.indexOf('MSIE') >= 0) {
+				//IE 10 and below
+				var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
+				if (zoom !== 100) {
+					additionalIEZoom = zoom / 100
+				}
+			}
+		}
 
-        if (additionalIEZoom !== 1) {
-            svgPoint.x = svgPoint.x * additionalIEZoom;
-            svgPoint.y = svgPoint.y * additionalIEZoom;
-        }
+		if (additionalIEZoom !== 1) {
+			svgPoint.x = svgPoint.x * additionalIEZoom;
+			svgPoint.y = svgPoint.y * additionalIEZoom;
+		}
 
 		var matrix = canvas.node.getScreenCTM();
 		return svgPoint.matrixTransform(matrix.inverse());
@@ -12400,14 +12733,14 @@ ORYX.Editor = Clazz.extend(ORYX.Editor);
  * @param {String} modelUrl The JSON URL of a model.
  * @param {Object} config Editor config passed to the constructur, merged with the response of the request to modelUrl
  */
-ORYX.Editor.createByUrl = function(modelUrl){
-    new Ajax.Request(modelUrl, {
-      method: 'GET',
-      onSuccess: function(transport) {
-    	var editorConfig = JSON.parse(transport.responseText);
-        new ORYX.Editor(editorConfig);
-      }.bind(this)
-    });
+ORYX.Editor.createByUrl = function (modelUrl) {
+	new Ajax.Request(modelUrl, {
+		method: 'GET',
+		onSuccess: function (transport) {
+			var editorConfig = JSON.parse(transport.responseText);
+			new ORYX.Editor(editorConfig);
+		}.bind(this)
+	});
 }
 
 // TODO Implement namespace awareness on attribute level.
@@ -12422,67 +12755,69 @@ ORYX.Editor.createByUrl = function(modelUrl){
  * adding non-default attributes yourself or you'll have to enhance this
  * function. Latter, I would appreciate: martin???apfelfabrik.de
  * @param {Object} namespace The namespace in which
- * 					elements should be grafted.
+ *                    elements should be grafted.
  * @param {Object} parent The element that should contain the grafted
- * 					structure after the function returned.
+ *                    structure after the function returned.
  * @param {Object} t the crafting structure.
  * @param {Object} doc the document in which grafting is performed.
  */
-ORYX.Editor.graft = function(namespace, parent, t, doc) {
-
-    doc = (doc || (parent && parent.ownerDocument) || document);
-    var e;
-    if(t === undefined) {
-        throw "Can't graft an undefined value";
-    } else if(t.constructor == String) {
-        e = doc.createTextNode( t );
-    } else {
-        for(var i = 0; i < t.length; i++) {
-            if( i === 0 && t[i].constructor == String ) {
-                var snared;
-                snared = t[i].match( /^([a-z][a-z0-9]*)\.([^\s\.]+)$/i );
-                if( snared ) {
-                    e = doc.createElementNS(namespace, snared[1] );
-                    e.setAttributeNS(null, 'class', snared[2] );
-                    continue;
-                }
-                snared = t[i].match( /^([a-z][a-z0-9]*)$/i );
-                if( snared ) {
-                    e = doc.createElementNS(namespace, snared[1] );  // but no class
-                    continue;
-                }
-
-                // Otherwise:
-                e = doc.createElementNS(namespace, "span" );
-                e.setAttribute(null, "class", "namelessFromLOL" );
-            }
+ORYX.Editor.graft = function (namespace, parent, t, doc) {
+
+	doc = (doc || (parent && parent.ownerDocument) || document);
+	var e;
+	if (t === undefined) {
+		throw "Can't graft an undefined value";
+	} else if (t.constructor == String) {
+		e = doc.createTextNode(t);
+	} else {
+		for (var i = 0; i < t.length; i++) {
+			if (i === 0 && t[i].constructor == String) {
+				var snared;
+				snared = t[i].match(/^([a-z][a-z0-9]*)\.([^\s\.]+)$/i);
+				if (snared) {
+					e = doc.createElementNS(namespace, snared[1]);
+					e.setAttributeNS(null, 'class', snared[2]);
+					continue;
+				}
+				snared = t[i].match(/^([a-z][a-z0-9]*)$/i);
+				if (snared) {
+					e = doc.createElementNS(namespace, snared[1]);  // but no class
+					continue;
+				}
 
-            if( t[i] === undefined ) {
-                throw "Can't graft an undefined value in a list!";
-            } else if( t[i].constructor == String || t[i].constructor == Array ) {
-                this.graft(namespace, e, t[i], doc );
-            } else if(  t[i].constructor == Number ) {
-                this.graft(namespace, e, t[i].toString(), doc );
-            } else if(  t[i].constructor == Object ) {
-                // hash's properties => element's attributes
-                for(var k in t[i]) { e.setAttributeNS(null, k, t[i][k] ); }
-            } else {
+				// Otherwise:
+				e = doc.createElementNS(namespace, "span");
+				e.setAttribute(null, "class", "namelessFromLOL");
+			}
+
+			if (t[i] === undefined) {
+				throw "Can't graft an undefined value in a list!";
+			} else if (t[i].constructor == String || t[i].constructor == Array) {
+				this.graft(namespace, e, t[i], doc);
+			} else if (t[i].constructor == Number) {
+				this.graft(namespace, e, t[i].toString(), doc);
+			} else if (t[i].constructor == Object) {
+				// hash's properties => element's attributes
+				for (var k in t[i]) {
+					e.setAttributeNS(null, k, t[i][k]);
+				}
+			} else {
 
 			}
-        }
-    }
-	if(parent && parent.appendChild) {
-	    parent.appendChild( e );
+		}
+	}
+	if (parent && parent.appendChild) {
+		parent.appendChild(e);
 	} else {
 
 	}
-    return e; // return the topmost created node
+	return e; // return the topmost created node
 };
 
-ORYX.Editor.provideId = function() {
+ORYX.Editor.provideId = function () {
 	var res = [], hex = '0123456789ABCDEF';
 
-	for (var i = 0; i < 36; i++) res[i] = Math.floor(Math.random()*0x10);
+	for (var i = 0; i < 36; i++) res[i] = Math.floor(Math.random() * 0x10);
 
 	res[14] = 4;
 	res[19] = (res[19] & 0x3) | 0x8;
@@ -12500,11 +12835,11 @@ ORYX.Editor.provideId = function() {
  * resizeBugFix calls are ignored until the initially requested resize is
  * performed.
  */
-ORYX.Editor.resizeFix = function() {
+ORYX.Editor.resizeFix = function () {
 	if (!ORYX.Editor._resizeFixTimeout) {
-		ORYX.Editor._resizeFixTimeout = window.setTimeout(function() {
-			window.resizeBy(1,1);
-			window.resizeBy(-1,-1);
+		ORYX.Editor._resizeFixTimeout = window.setTimeout(function () {
+			window.resizeBy(1, 1);
+			window.resizeBy(-1, -1);
 			ORYX.Editor._resizefixTimeout = null;
 		}, 100);
 	}
@@ -12512,51 +12847,55 @@ ORYX.Editor.resizeFix = function() {
 
 ORYX.Editor.Cookie = {
 
-	callbacks:[],
+	callbacks: [],
 
-	onChange: function( callback, interval ){
+	onChange: function (callback, interval) {
 
 		this.callbacks.push(callback);
-		this.start( interval )
+		this.start(interval)
 
 	},
 
-	start: function( interval ){
+	start: function (interval) {
 
-		if( this.pe ){
+		if (this.pe) {
 			return;
 		}
 
 		var currentString = document.cookie;
 
-		this.pe = new PeriodicalExecuter( function(){
+		this.pe = new PeriodicalExecuter(function () {
 
-			if( currentString != document.cookie ){
+			if (currentString != document.cookie) {
 				currentString = document.cookie;
-				this.callbacks.each(function(callback){ callback(this.getParams()) }.bind(this));
+				this.callbacks.each(function (callback) {
+					callback(this.getParams())
+				}.bind(this));
 			}
 
-		}.bind(this), ( interval || 10000 ) / 1000);
+		}.bind(this), (interval || 10000) / 1000);
 	},
 
-	stop: function(){
+	stop: function () {
 
-		if( this.pe ){
+		if (this.pe) {
 			this.pe.stop();
 			this.pe = null;
 		}
 	},
 
-	getParams: function(){
+	getParams: function () {
 		var res = {};
 
 		var p = document.cookie;
-		p.split("; ").each(function(param){ res[param.split("=")[0]] = param.split("=")[1];});
+		p.split("; ").each(function (param) {
+			res[param.split("=")[0]] = param.split("=")[1];
+		});
 
 		return res;
 	},
 
-	toString: function(){
+	toString: function () {
 		return document.cookie;
 	}
 };
@@ -12568,31 +12907,31 @@ ORYX.Editor.Cookie = {
  *
  */
 ORYX.Editor.SVGClassElementsAreAvailable = true;
-ORYX.Editor.setMissingClasses = function() {
+ORYX.Editor.setMissingClasses = function () {
 
 	try {
 		SVGElement;
-	} catch(e) {
+	} catch (e) {
 		ORYX.Editor.SVGClassElementsAreAvailable = false;
-		SVGSVGElement 		= document.createElementNS('http://www.w3.org/2000/svg', 'svg').toString();
-		SVGGElement 		= document.createElementNS('http://www.w3.org/2000/svg', 'g').toString();
-		SVGPathElement 		= document.createElementNS('http://www.w3.org/2000/svg', 'path').toString();
-		SVGTextElement 		= document.createElementNS('http://www.w3.org/2000/svg', 'text').toString();
+		SVGSVGElement = document.createElementNS('http://www.w3.org/2000/svg', 'svg').toString();
+		SVGGElement = document.createElementNS('http://www.w3.org/2000/svg', 'g').toString();
+		SVGPathElement = document.createElementNS('http://www.w3.org/2000/svg', 'path').toString();
+		SVGTextElement = document.createElementNS('http://www.w3.org/2000/svg', 'text').toString();
 		//SVGMarkerElement 	= document.createElementNS('http://www.w3.org/2000/svg', 'marker').toString();
-		SVGRectElement 		= document.createElementNS('http://www.w3.org/2000/svg', 'rect').toString();
-		SVGImageElement 	= document.createElementNS('http://www.w3.org/2000/svg', 'image').toString();
-		SVGCircleElement 	= document.createElementNS('http://www.w3.org/2000/svg', 'circle').toString();
-		SVGEllipseElement 	= document.createElementNS('http://www.w3.org/2000/svg', 'ellipse').toString();
-		SVGLineElement	 	= document.createElementNS('http://www.w3.org/2000/svg', 'line').toString();
-		SVGPolylineElement 	= document.createElementNS('http://www.w3.org/2000/svg', 'polyline').toString();
-		SVGPolygonElement 	= document.createElementNS('http://www.w3.org/2000/svg', 'polygon').toString();
+		SVGRectElement = document.createElementNS('http://www.w3.org/2000/svg', 'rect').toString();
+		SVGImageElement = document.createElementNS('http://www.w3.org/2000/svg', 'image').toString();
+		SVGCircleElement = document.createElementNS('http://www.w3.org/2000/svg', 'circle').toString();
+		SVGEllipseElement = document.createElementNS('http://www.w3.org/2000/svg', 'ellipse').toString();
+		SVGLineElement = document.createElementNS('http://www.w3.org/2000/svg', 'line').toString();
+		SVGPolylineElement = document.createElementNS('http://www.w3.org/2000/svg', 'polyline').toString();
+		SVGPolygonElement = document.createElementNS('http://www.w3.org/2000/svg', 'polygon').toString();
 
 	}
 
 }
-ORYX.Editor.checkClassType = function( classInst, classType ) {
+ORYX.Editor.checkClassType = function (classInst, classType) {
 
-	if( ORYX.Editor.SVGClassElementsAreAvailable ){
+	if (ORYX.Editor.SVGClassElementsAreAvailable) {
 		return classInst instanceof classType
 	} else {
 		return classInst == classType
@@ -12611,27 +12950,32 @@ ORYX.Editor.checkClassType = function( classInst, classType ) {
 /**
  * Init namespaces
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
 
 
-new function(){
+new function () {
 
-	ORYX.Core.UIEnableDrag = function(event, uiObj, option) {
+	ORYX.Core.UIEnableDrag = function (event, uiObj, option) {
 
 		this.uiObj = uiObj;
 		var upL = uiObj.bounds.upperLeft();
 
 		var a = uiObj.node.getScreenCTM();
-		this.faktorXY= {x: a.a, y: a.d};
+		this.faktorXY = {x: a.a, y: a.d};
 
 		this.scrollNode = uiObj.node.ownerSVGElement.parentNode.parentNode;
 
-		this.offSetPosition =  {
+		this.offSetPosition = {
 			x: Event.pointerX(event) - (upL.x * this.faktorXY.x),
-			y: Event.pointerY(event) - (upL.y * this.faktorXY.y)};
+			y: Event.pointerY(event) - (upL.y * this.faktorXY.y)
+		};
 
-		this.offsetScroll	= {x:this.scrollNode.scrollLeft,y:this.scrollNode.scrollTop};
+		this.offsetScroll = {x: this.scrollNode.scrollLeft, y: this.scrollNode.scrollTop};
 
 		this.dragCallback = ORYX.Core.UIDragCallback.bind(this);
 		this.disableCallback = ORYX.Core.UIDisableDrag.bind(this);
@@ -12640,18 +12984,19 @@ new function(){
 		this.upCallback = option ? option.upCallback : undefined;
 
 		document.documentElement.addEventListener(ORYX.CONFIG.EVENT_MOUSEUP, this.disableCallback, true);
-		document.documentElement.addEventListener(ORYX.CONFIG.EVENT_MOUSEMOVE, 	this.dragCallback , false);
+		document.documentElement.addEventListener(ORYX.CONFIG.EVENT_MOUSEMOVE, this.dragCallback, false);
 
 	};
 
-	ORYX.Core.UIDragCallback = function(event) {
+	ORYX.Core.UIDragCallback = function (event) {
 
 		var position = {
 			x: Event.pointerX(event) - this.offSetPosition.x,
-			y: Event.pointerY(event) - this.offSetPosition.y}
+			y: Event.pointerY(event) - this.offSetPosition.y
+		}
 
-		position.x 	-= this.offsetScroll.x - this.scrollNode.scrollLeft;
-		position.y 	-= this.offsetScroll.y - this.scrollNode.scrollTop;
+		position.x -= this.offsetScroll.x - this.scrollNode.scrollLeft;
+		position.y -= this.offsetScroll.y - this.scrollNode.scrollTop;
 
 		position.x /= this.faktorXY.x;
 		position.y /= this.faktorXY.y;
@@ -12659,18 +13004,18 @@ new function(){
 		this.uiObj.bounds.moveTo(position);
 		//this.uiObj.update();
 
-		if(this.movedCallback)
+		if (this.movedCallback)
 			this.movedCallback(event);
 
 		//Event.stop(event);
 
 	};
 
-	ORYX.Core.UIDisableDrag = function(event) {
+	ORYX.Core.UIDisableDrag = function (event) {
 		document.documentElement.removeEventListener(ORYX.CONFIG.EVENT_MOUSEMOVE, this.dragCallback, false);
 		document.documentElement.removeEventListener(ORYX.CONFIG.EVENT_MOUSEUP, this.disableCallback, true);
 
-		if(this.upCallback)
+		if (this.upCallback)
 			this.upCallback(event);
 
 		this.upCallback = undefined;
@@ -12680,8 +13025,6 @@ new function(){
 	};
 
 
-
-
 	/**
 	 * Implements a command to move docker by an offset.
 	 *
@@ -12690,11 +13033,11 @@ new function(){
 	 *
 	 */
 	ORYX.Core.MoveDockersCommand = ORYX.Core.Command.extend({
-		construct: function(dockers){
-			this.dockers 	= $H(dockers);
-			this.edges 		= $H({});
+		construct: function (dockers) {
+			this.dockers = $H(dockers);
+			this.edges = $H({});
 		},
-		execute: function(){
+		execute: function () {
 			if (this.changes) {
 				this.executeAgain();
 				return;
@@ -12702,36 +13045,44 @@ new function(){
 				this.changes = $H({});
 			}
 
-			this.dockers.values().each(function(docker){
+			this.dockers.values().each(function (docker) {
 				var edge = docker.docker.parent;
-				if (!edge){ return }
+				if (!edge) {
+					return
+				}
 
 				if (!this.changes[edge.getId()]) {
 					this.changes[edge.getId()] = {
-						edge				: edge,
-						oldDockerPositions	: edge.dockers.map(function(r){ return r.bounds.center() })
+						edge: edge,
+						oldDockerPositions: edge.dockers.map(function (r) {
+							return r.bounds.center()
+						})
 					}
 				}
 				docker.docker.bounds.moveBy(docker.offset);
 				this.edges[edge.getId()] = edge;
 				docker.docker.update();
 			}.bind(this));
-			this.edges.each(function(edge){
+			this.edges.each(function (edge) {
 				this.updateEdge(edge.value);
 				if (this.changes[edge.value.getId()])
-					this.changes[edge.value.getId()].dockerPositions = edge.value.dockers.map(function(r){ return r.bounds.center() })
+					this.changes[edge.value.getId()].dockerPositions = edge.value.dockers.map(function (r) {
+						return r.bounds.center()
+					})
 			}.bind(this));
 		},
-		updateEdge: function(edge){
+		updateEdge: function (edge) {
 			edge._update(true);
 			[edge.getOutgoingShapes(), edge.getIncomingShapes()].flatten().invoke("_update", [true])
 		},
-		executeAgain: function(){
-			this.changes.values().each(function(change){
+		executeAgain: function () {
+			this.changes.values().each(function (change) {
 				// Reset the dockers
 				this.removeAllDocker(change.edge);
-				change.dockerPositions.each(function(pos, i){
-					if (i==0||i==change.dockerPositions.length-1){ return }
+				change.dockerPositions.each(function (pos, i) {
+					if (i == 0 || i == change.dockerPositions.length - 1) {
+						return
+					}
 					var docker = change.edge.createDocker(undefined, pos);
 					docker.bounds.centerMoveTo(pos);
 					docker.update();
@@ -12739,12 +13090,14 @@ new function(){
 				this.updateEdge(change.edge);
 			}.bind(this));
 		},
-		rollback: function(){
-			this.changes.values().each(function(change){
+		rollback: function () {
+			this.changes.values().each(function (change) {
 				// Reset the dockers
 				this.removeAllDocker(change.edge);
-				change.oldDockerPositions.each(function(pos, i){
-					if (i==0||i==change.oldDockerPositions.length-1){ return }
+				change.oldDockerPositions.each(function (pos, i) {
+					if (i == 0 || i == change.oldDockerPositions.length - 1) {
+						return
+					}
 					var docker = change.edge.createDocker(undefined, pos);
 					docker.bounds.centerMoveTo(pos);
 					docker.update();
@@ -12752,8 +13105,8 @@ new function(){
 				this.updateEdge(change.edge);
 			}.bind(this));
 		},
-		removeAllDocker: function(edge){
-			edge.dockers.slice(1, edge.dockers.length-1).each(function(docker){
+		removeAllDocker: function (edge) {
+			edge.dockers.slice(1, edge.dockers.length - 1).each(function (docker) {
 				edge.removeDocker(docker);
 			})
 		}
@@ -12773,8 +13126,12 @@ new function(){
 /**
  * Init namespaces
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
 
 /**
  * @classDescription Base class for Shapes.
@@ -12785,7 +13142,7 @@ ORYX.Core.Shape = {
 	/**
 	 * Constructor
 	 */
-	construct: function(options, stencil, facade) {
+	construct: function (options, stencil, facade) {
 		// call base class constructor
 		arguments.callee.$.construct.apply(this, arguments);
 
@@ -12808,10 +13165,10 @@ ORYX.Core.Shape = {
 		// create SVG node
 		this.node = ORYX.Editor.graft("http://www.w3.org/2000/svg",
 			null,
-			['g', {id:"svg-" + this.resourceId},
+			['g', {id: "svg-" + this.resourceId},
 				['g', {"class": "stencils"},
 					['g', {"class": "me"}],
-					['g', {"class": "children", style:"overflow:hidden"}],
+					['g', {"class": "children", style: "overflow:hidden"}],
 					['g', {"class": "edge"}]
 				],
 				['g', {"class": "controls"},
@@ -12824,16 +13181,16 @@ ORYX.Core.Shape = {
 	/**
 	 * If changed flag is set, refresh method is called.
 	 */
-	update: function() {
+	update: function () {
 		//if(this.isChanged) {
-			//this.layout();
+		//this.layout();
 		//}
 	},
 
 	/**
 	 * !!!Not called from any sub class!!!
 	 */
-	_update: function() {
+	_update: function () {
 
 	},
 
@@ -12841,26 +13198,26 @@ ORYX.Core.Shape = {
 	 * Calls the super class refresh method
 	 *  and updates the svg elements that are referenced by a property.
 	 */
-	refresh: function() {
+	refresh: function () {
 		//call base class refresh method
 		arguments.callee.$.refresh.apply(this, arguments);
 
-		if(this.node.ownerDocument) {
+		if (this.node.ownerDocument) {
 			//adjust SVG to properties' values
 			var me = this;
-			this.propertiesChanged.each((function(propChanged) {
-				if(propChanged.value) {
+			this.propertiesChanged.each((function (propChanged) {
+				if (propChanged.value) {
 					var prop = this.properties[propChanged.key];
 					var property = this.getStencil().property(propChanged.key);
 					if (property != undefined) {
 						this.propertiesChanged[propChanged.key] = false;
 
 						//handle choice properties
-						if(property.type() == ORYX.CONFIG.TYPE_CHOICE) {
+						if (property.type() == ORYX.CONFIG.TYPE_CHOICE) {
 							//iterate all references to SVG elements
-							property.refToView().each((function(ref) {
+							property.refToView().each((function (ref) {
 								//if property is referencing a label, update the label
-								if(ref !== "") {
+								if (ref !== "") {
 									var label = this._labels[this.id + ref];
 									if (label && property.item(prop)) {
 										label.text(property.item(prop).title());
@@ -12872,23 +13229,27 @@ ORYX.Core.Shape = {
 							// show the selected and hide all other referenced SVG
 							// elements
 							var refreshedSvgElements = new Hash();
-							property.items().each((function(item) {
-								item.refToView().each((function(itemRef) {
-									if(itemRef == "") { return; }
+							property.items().each((function (item) {
+								item.refToView().each((function (itemRef) {
+									if (itemRef == "") {
+										return;
+									}
 
 									var svgElem = this.node.ownerDocument.getElementById(this.id + itemRef);
 
-									if(!svgElem) { return; }
+									if (!svgElem) {
+										return;
+									}
 
 
 									/* Do not refresh the same svg element multiple times */
-									if(!refreshedSvgElements[svgElem.id] || prop == item.value()) {
+									if (!refreshedSvgElements[svgElem.id] || prop == item.value()) {
 										svgElem.setAttributeNS(null, 'display', ((prop == item.value()) ? 'inherit' : 'none'));
 										refreshedSvgElements[svgElem.id] = svgElem;
 									}
 
 									// Reload the href if there is an image-tag
-									if(ORYX.Editor.checkClassType(svgElem, SVGImageElement)) {
+									if (ORYX.Editor.checkClassType(svgElem, SVGImageElement)) {
 										svgElem.setAttributeNS('http://www.w3.org/1999/xlink', 'href', svgElem.getAttributeNS('http://www.w3.org/1999/xlink', 'href'));
 									}
 								}).bind(this));
@@ -12896,60 +13257,48 @@ ORYX.Core.Shape = {
 
 						} else { //handle properties that are not of type choice
 							//iterate all references to SVG elements
-							property.refToView().each((function(ref) {
+							property.refToView().each((function (ref) {
 								//if the property does not reference an SVG element,
 								// do nothing
 
-								if(ref === "") { return; }
+								if (ref === "") {
+									return;
+								}
 
 								var refId = this.id + ref;
 
-								if (property.type() === ORYX.CONFIG.TYPE_KISBPM_MULTIINSTANCE)
-								{
+								if (property.type() === ORYX.CONFIG.TYPE_KISBPM_MULTIINSTANCE) {
 									if (ref === "multiinstance") {
 
 										var svgElemParallel = this.node.ownerDocument.getElementById(this.id + 'parallel');
-										if(svgElemParallel)
-										{
-											if (prop === 'Parallel')
-											{
+										if (svgElemParallel) {
+											if (prop === 'Parallel') {
 												svgElemParallel.setAttributeNS(null, 'display', 'inherit');
-											}
-											else
-											{
+											} else {
 												svgElemParallel.setAttributeNS(null, 'display', 'none');
 											}
 										}
 
 										var svgElemSequential = this.node.ownerDocument.getElementById(this.id + 'sequential');
 
-										if(svgElemSequential)
-										{
-											if (prop === 'Sequential')
-											{
+										if (svgElemSequential) {
+											if (prop === 'Sequential') {
 												svgElemSequential.setAttributeNS(null, 'display', 'inherit');
-											}
-											else
-											{
+											} else {
 												svgElemSequential.setAttributeNS(null, 'display', 'none');
 											}
 										}
 									}
 									return;
 
-								}
-								else if (property.type() === "cancelactivity")
-								{
+								} else if (property.type() === "cancelactivity") {
 									var svgElemFrame = this.node.ownerDocument.getElementById(this.id + 'frame');
 									var svgElemFrame2 = this.node.ownerDocument.getElementById(this.id + 'frame2');
 
-									if (prop === 'true')
-									{
+									if (prop === 'true') {
 										svgElemFrame.setAttributeNS(null, 'display', 'inherit');
 										svgElemFrame2.setAttributeNS(null, 'display', 'inherit');
-									}
-									else
-									{
+									} else {
 										svgElemFrame.setAttributeNS(null, 'display', 'none');
 										svgElemFrame2.setAttributeNS(null, 'display', 'none');
 									}
@@ -12959,18 +13308,20 @@ ORYX.Core.Shape = {
 								var svgElem = this.node.ownerDocument.getElementById(refId);
 
 								//if the SVG element can not be found
-								if(!svgElem || !(svgElem.ownerSVGElement)) {
+								if (!svgElem || !(svgElem.ownerSVGElement)) {
 									//if the referenced SVG element is a SVGAElement, it cannot
 									// be found with getElementById (Firefox bug).
 									// this is a work around
-									if(property.type() === ORYX.CONFIG.TYPE_URL || property.type() === ORYX.CONFIG.TYPE_DIAGRAM_LINK) {
+									if (property.type() === ORYX.CONFIG.TYPE_URL || property.type() === ORYX.CONFIG.TYPE_DIAGRAM_LINK) {
 										var svgElems = this.node.ownerDocument.getElementsByTagNameNS('http://www.w3.org/2000/svg', 'a');
 
-										svgElem = $A(svgElems).find(function(elem) {
+										svgElem = $A(svgElems).find(function (elem) {
 											return elem.getAttributeNS(null, 'id') === refId;
 										});
 
-										if(!svgElem) { return; }
+										if (!svgElem) {
+											return;
+										}
 									} else {
 										//this.propertiesChanged[propChanged.key] = true;
 										return;
@@ -12981,43 +13332,43 @@ ORYX.Core.Shape = {
 									var label = this._labels[refId];
 									if (label) {
 										try {
-									    	propJson = prop.evalJSON();
-									    	var value = propJson[property.complexAttributeToView()]
-									    	label.text(value ? value : prop);
-									    } catch (e) {
-									    	label.text(prop);
-									    }
+											propJson = prop.evalJSON();
+											var value = propJson[property.complexAttributeToView()]
+											label.text(value ? value : prop);
+										} catch (e) {
+											label.text(prop);
+										}
 									}
 
 								} else {
 									switch (property.type()) {
 										case ORYX.CONFIG.TYPE_BOOLEAN:
-										    if (typeof prop == "string")
+											if (typeof prop == "string")
 												prop = prop === "true"
 
 											svgElem.setAttributeNS(null, 'display', (!(prop === property.inverseBoolean())) ? 'inherit' : 'none');
 
 											break;
 										case ORYX.CONFIG.TYPE_COLOR:
-											if(property.fill()) {
-												if (svgElem.tagName.toLowerCase() === "stop"){
-													if (prop){
+											if (property.fill()) {
+												if (svgElem.tagName.toLowerCase() === "stop") {
+													if (prop) {
 
-														if (property.lightness() &&  property.lightness() !== 1){
+														if (property.lightness() && property.lightness() !== 1) {
 															prop = ORYX.Utils.adjustLightness(prop, property.lightness());
 														}
 
 														svgElem.setAttributeNS(null, "stop-color", prop);
 
 														// Adjust stop color of the others
-														if (svgElem.parentNode.tagName.toLowerCase() === "radialgradient"){
+														if (svgElem.parentNode.tagName.toLowerCase() === "radialgradient") {
 															ORYX.Utils.adjustGradient(svgElem.parentNode, svgElem);
 														}
 													}
 
 													// If there is no value, set opaque
-													if (svgElem.parentNode.tagName.toLowerCase() === "radialgradient"){
-														$A(svgElem.parentNode.getElementsByTagName('stop')).each(function(stop){
+													if (svgElem.parentNode.tagName.toLowerCase() === "radialgradient") {
+														$A(svgElem.parentNode.getElementsByTagName('stop')).each(function (stop) {
 															stop.setAttributeNS(null, "stop-opacity", prop ? stop.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, 'default-stop-opacity') || 1 : 0);
 														}.bind(this))
 													}
@@ -13025,7 +13376,7 @@ ORYX.Core.Shape = {
 													svgElem.setAttributeNS(null, 'fill', prop);
 												}
 											}
-											if(property.stroke()) {
+											if (property.stroke()) {
 												svgElem.setAttributeNS(null, 'stroke', prop);
 											}
 											break;
@@ -13054,13 +13405,13 @@ ORYX.Core.Shape = {
 											}
 											break;
 										case ORYX.CONFIG.TYPE_FLOAT:
-											if(property.fillOpacity()) {
+											if (property.fillOpacity()) {
 												svgElem.setAttributeNS(null, 'fill-opacity', prop);
 											}
-											if(property.strokeOpacity()) {
+											if (property.strokeOpacity()) {
 												svgElem.setAttributeNS(null, 'stroke-opacity', prop);
 											}
-											if(!property.fillOpacity() && !property.strokeOpacity()) {
+											if (!property.fillOpacity() && !property.strokeOpacity()) {
 												var label = this._labels[refId];
 												if (label) {
 													label.text(prop);
@@ -13069,29 +13420,29 @@ ORYX.Core.Shape = {
 											break;
 
 										case ORYX.CONFIG.TYPE_FORM_LINK:
-	  										if (ref == "pimg") {
-	  											var onclickAttr = svgElem.getAttributeNodeNS('', 'onclick');
-	  											if(onclickAttr) {
-	  												if(prop && ("" + prop).length > 0) {
-	  													onclickAttr.textContent = "window.location = '../service/editor?id=" + prop + "_form'";
-	  							    	   			} else {
-	  							    	   				newFormFacade = this.facade;
-	  							    	   				onclickAttr.textContent = "displayNewFormDialog('" + this.resourceId + "');";
-	  							    		        }
-	  											}
-	  										} else if (ref == "linkIndicator") {
-	  											if (prop && prop.length > 0) {
-	  												svgElem.setAttributeNS(null, 'display', 'inherit');
-	  											} else {
-	  												svgElem.setAttributeNS(null, 'display', 'none');
-	  											}
-	  										}
-	  										break;
+											if (ref == "pimg") {
+												var onclickAttr = svgElem.getAttributeNodeNS('', 'onclick');
+												if (onclickAttr) {
+													if (prop && ("" + prop).length > 0) {
+														onclickAttr.textContent = "window.location = '../service/editor?id=" + prop + "_form'";
+													} else {
+														newFormFacade = this.facade;
+														onclickAttr.textContent = "displayNewFormDialog('" + this.resourceId + "');";
+													}
+												}
+											} else if (ref == "linkIndicator") {
+												if (prop && prop.length > 0) {
+													svgElem.setAttributeNS(null, 'display', 'inherit');
+												} else {
+													svgElem.setAttributeNS(null, 'display', 'none');
+												}
+											}
+											break;
 										case ORYX.CONFIG.TYPE_URL:
 										case ORYX.CONFIG.TYPE_DIAGRAM_LINK:
 											//TODO what is the dafault path?
 											var hrefAttr = svgElem.getAttributeNodeNS('http://www.w3.org/1999/xlink', 'xlink:href');
-											if(hrefAttr) {
+											if (hrefAttr) {
 												hrefAttr.textContent = prop;
 											} else {
 												svgElem.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:href', prop);
@@ -13110,17 +13461,17 @@ ORYX.Core.Shape = {
 			}).bind(this));
 
 			//update labels
-			this._labels.values().each(function(label) {
+			this._labels.values().each(function (label) {
 				label.update();
 			});
 		}
 	},
 
-	layout: function() {
+	layout: function () {
 		//this.getStencil().layout(this)
 		var layoutEvents = this.getStencil().layout()
 		if (layoutEvents) {
-			layoutEvents.each(function(event) {
+			layoutEvents.each(function (event) {
 
 				// setup additional attributes
 				event.shape = this;
@@ -13136,7 +13487,7 @@ ORYX.Core.Shape = {
 	/**
 	 * Returns an array of Label objects.
 	 */
-	getLabels: function() {
+	getLabels: function () {
 		return this._labels.values();
 	},
 
@@ -13144,20 +13495,20 @@ ORYX.Core.Shape = {
 	 * Returns the label for a given ref
 	 * @return {ORYX.Core.Label} Returns null if there is no label
 	 */
-	getLabel: function(ref){
-		if (!ref){
+	getLabel: function (ref) {
+		if (!ref) {
 			return null;
 		}
-		return (this._labels.find(function(o){
-				return o.key.endsWith(ref);
-			})||{}).value || null;
+		return (this._labels.find(function (o) {
+			return o.key.endsWith(ref);
+		}) || {}).value || null;
 	},
 
 	/**
 	 * Hides all related labels
 	 *
 	 */
-	hideLabels: function(){
+	hideLabels: function () {
 		this.getLabels().invoke("hide");
 	},
 
@@ -13165,19 +13516,19 @@ ORYX.Core.Shape = {
 	 * Shows all related labels
 	 *
 	 */
-	showLabels: function(){
+	showLabels: function () {
 		var labels = this.getLabels();
 		labels.invoke("show");
-		labels.each(function(label) {
-				label.update();
+		labels.each(function (label) {
+			label.update();
 		});
 	},
 
-	setOpacity: function(value, animate){
+	setOpacity: function (value, animate) {
 
 		value = Math.max(Math.min((typeof value == "number" ? value : 1.0), 1.0), 0.0);
 
-		if (value !== 1.0){
+		if (value !== 1.0) {
 			value = String(value);
 			this.node.setAttributeNS(null, "fill-opacity", value)
 			this.node.setAttributeNS(null, "stroke-opacity", value)
@@ -13190,16 +13541,16 @@ ORYX.Core.Shape = {
 	/**
 	 * Returns an array of dockers of this object.
 	 */
-	getDockers: function() {
+	getDockers: function () {
 		return this.dockers;
 	},
 
-	getMagnets: function() {
+	getMagnets: function () {
 		return this.magnets;
 	},
 
-	getDefaultMagnet: function() {
-		if(this._defaultMagnet) {
+	getDefaultMagnet: function () {
+		if (this._defaultMagnet) {
 			return this._defaultMagnet;
 		} else if (this.magnets.length > 0) {
 			return this.magnets[0];
@@ -13208,53 +13559,53 @@ ORYX.Core.Shape = {
 		}
 	},
 
-	getParentShape: function() {
+	getParentShape: function () {
 		return this.parent;
 	},
 
-	getIncomingShapes: function(iterator) {
-		if(iterator) {
+	getIncomingShapes: function (iterator) {
+		if (iterator) {
 			this.incoming.each(iterator);
 		}
 		return this.incoming;
 	},
 
-	getIncomingNodes: function(iterator) {
-        return this.incoming.select(function(incoming){
-            var isNode = (incoming instanceof ORYX.Core.Node);
-            if(isNode && iterator) iterator(incoming);
-            return isNode;
-        });
-    },
+	getIncomingNodes: function (iterator) {
+		return this.incoming.select(function (incoming) {
+			var isNode = (incoming instanceof ORYX.Core.Node);
+			if (isNode && iterator) iterator(incoming);
+			return isNode;
+		});
+	},
 
 
-	getOutgoingShapes: function(iterator) {
-		if(iterator) {
+	getOutgoingShapes: function (iterator) {
+		if (iterator) {
 			this.outgoing.each(iterator);
 		}
 		return this.outgoing;
 	},
 
-    getOutgoingNodes: function(iterator) {
-        return this.outgoing.select(function(out){
-            var isNode = (out instanceof ORYX.Core.Node);
-            if(isNode && iterator) iterator(out);
-            return isNode;
-        });
-    },
+	getOutgoingNodes: function (iterator) {
+		return this.outgoing.select(function (out) {
+			var isNode = (out instanceof ORYX.Core.Node);
+			if (isNode && iterator) iterator(out);
+			return isNode;
+		});
+	},
 
-	getAllDockedShapes: function(iterator) {
+	getAllDockedShapes: function (iterator) {
 		var result = this.incoming.concat(this.outgoing);
-		if(iterator) {
+		if (iterator) {
 			result.each(iterator);
 		}
 		return result
 	},
 
-	getCanvas: function() {
-		if(this.parent instanceof ORYX.Core.Canvas) {
+	getCanvas: function () {
+		if (this.parent instanceof ORYX.Core.Canvas) {
 			return this.parent;
-		} else if(this.parent instanceof ORYX.Core.Shape) {
+		} else if (this.parent instanceof ORYX.Core.Shape) {
 			return this.parent.getCanvas();
 		} else {
 			return undefined;
@@ -13266,19 +13617,21 @@ ORYX.Core.Shape = {
 	 * @param {Object} deep
 	 * @param {Object} iterator
 	 */
-	getChildNodes: function(deep, iterator) {
-		if(!deep && !iterator) {
+	getChildNodes: function (deep, iterator) {
+		if (!deep && !iterator) {
 			return this.nodes.clone();
 		} else {
 			var result = [];
-			this.nodes.each(function(uiObject) {
-				if(!uiObject.isVisible){return}
-				if(iterator) {
+			this.nodes.each(function (uiObject) {
+				if (!uiObject.isVisible) {
+					return
+				}
+				if (iterator) {
 					iterator(uiObject);
 				}
 				result.push(uiObject);
 
-				if(deep && uiObject instanceof ORYX.Core.Shape) {
+				if (deep && uiObject instanceof ORYX.Core.Shape) {
 					result = result.concat(uiObject.getChildNodes(deep, iterator));
 				}
 			});
@@ -13292,20 +13645,20 @@ ORYX.Core.Shape = {
 	 * @param {UIObject} uiObject
 	 * @param {Number} index
 	 */
-	add: function(uiObject, index, silent) {
+	add: function (uiObject, index, silent) {
 		//parameter has to be an UIObject, but
 		// must not be an Edge.
-		if(uiObject instanceof ORYX.Core.UIObject
+		if (uiObject instanceof ORYX.Core.UIObject
 			&& !(uiObject instanceof ORYX.Core.Edge)) {
 
 			if (!(this.children.member(uiObject))) {
 				//if uiObject is child of another parent, remove it from that parent.
-				if(uiObject.parent) {
+				if (uiObject.parent) {
 					uiObject.parent.remove(uiObject, true);
 				}
 
 				//add uiObject to this Shape
-				if(index != undefined)
+				if (index != undefined)
 					this.children.splice(index, 0, uiObject);
 				else
 					this.children.push(uiObject);
@@ -13315,19 +13668,19 @@ ORYX.Core.Shape = {
 
 				//add uiObject.node to this.node depending on the type of uiObject
 				var parent;
-				if(uiObject instanceof ORYX.Core.Node) {
+				if (uiObject instanceof ORYX.Core.Node) {
 					parent = this.node.childNodes[0].childNodes[1];
 					this.nodes.push(uiObject);
-				} else if(uiObject instanceof ORYX.Core.Controls.Control) {
+				} else if (uiObject instanceof ORYX.Core.Controls.Control) {
 					var ctrls = this.node.childNodes[1];
-					if(uiObject instanceof ORYX.Core.Controls.Docker) {
+					if (uiObject instanceof ORYX.Core.Controls.Docker) {
 						parent = ctrls.childNodes[0];
-						if (this.dockers.length >= 2){
-							this.dockers.splice(index!==undefined?Math.min(index, this.dockers.length-1):this.dockers.length-1, 0, uiObject);
+						if (this.dockers.length >= 2) {
+							this.dockers.splice(index !== undefined ? Math.min(index, this.dockers.length - 1) : this.dockers.length - 1, 0, uiObject);
 						} else {
 							this.dockers.push(uiObject);
 						}
-					} else if(uiObject instanceof ORYX.Core.Controls.Magnet) {
+					} else if (uiObject instanceof ORYX.Core.Controls.Magnet) {
 						parent = ctrls.childNodes[1];
 						this.magnets.push(uiObject);
 					} else {
@@ -13337,7 +13690,7 @@ ORYX.Core.Shape = {
 					parent = this.node;
 				}
 
-				if(index != undefined && index < parent.childNodes.length)
+				if (index != undefined && index < parent.childNodes.length)
 					uiObject.node = parent.insertBefore(uiObject.node, parent.childNodes[index]);
 				else
 					uiObject.node = parent.appendChild(uiObject.node);
@@ -13346,8 +13699,8 @@ ORYX.Core.Shape = {
 				//uiObject.bounds.registerCallback(this._changedCallback);
 
 
-				if(this.eventHandlerCallback && silent !== true)
-					this.eventHandlerCallback({type:ORYX.CONFIG.EVENT_SHAPEADDED,shape:uiObject})
+				if (this.eventHandlerCallback && silent !== true)
+					this.eventHandlerCallback({type: ORYX.CONFIG.EVENT_SHAPEADDED, shape: uiObject})
 
 			} else {
 
@@ -13363,7 +13716,7 @@ ORYX.Core.Shape = {
 	 * Overrides the UIObject.remove method. Removes uiObject.
 	 * @param {UIObject} uiObject
 	 */
-	remove: function(uiObject, silent) {
+	remove: function (uiObject, silent) {
 		//if uiObject is a child of this object, remove it.
 		if (this.children.member(uiObject)) {
 			//remove uiObject from children
@@ -13375,15 +13728,15 @@ ORYX.Core.Shape = {
 			uiObject.parent = undefined;
 
 			//delete uiObject.node from this.node
-			if(uiObject instanceof ORYX.Core.Shape) {
-				if(uiObject instanceof ORYX.Core.Edge) {
+			if (uiObject instanceof ORYX.Core.Shape) {
+				if (uiObject instanceof ORYX.Core.Edge) {
 					uiObject.removeMarkers();
 					uiObject.node = this.node.childNodes[0].childNodes[2].removeChild(uiObject.node);
 				} else {
 					uiObject.node = this.node.childNodes[0].childNodes[1].removeChild(uiObject.node);
 					this.nodes = this.nodes.without(uiObject);
 				}
-			} else if(uiObject instanceof ORYX.Core.Controls.Control) {
+			} else if (uiObject instanceof ORYX.Core.Controls.Control) {
 				if (uiObject instanceof ORYX.Core.Controls.Docker) {
 					uiObject.node = this.node.childNodes[1].childNodes[0].removeChild(uiObject.node);
 					this.dockers = this.dockers.without(uiObject);
@@ -13395,7 +13748,7 @@ ORYX.Core.Shape = {
 				}
 			}
 
-			if(this.eventHandlerCallback && silent !== true)
+			if (this.eventHandlerCallback && silent !== true)
 				this.eventHandlerCallback({type: ORYX.CONFIG.EVENT_SHAPEREMOVED, shape: uiObject, parent: parent});
 
 			this._changed();
@@ -13411,12 +13764,12 @@ ORYX.Core.Shape = {
 	 * @param {PointA}
 	 * @param {PointB}
 	 */
-	getIntersectionPoint: function() {
+	getIntersectionPoint: function () {
 
 		var pointAX, pointAY, pointBX, pointBY;
 
 		// Get the the two Points
-		switch(arguments.length) {
+		switch (arguments.length) {
 			case 2:
 				pointAX = arguments[0].x;
 				pointAY = arguments[0].y;
@@ -13434,13 +13787,12 @@ ORYX.Core.Shape = {
 		}
 
 
-
 		// Defined an include and exclude point
 		var includePointX, includePointY, excludePointX, excludePointY;
 
 		var bounds = this.absoluteBounds();
 
-		if(this.isPointIncluded(pointAX, pointAY, bounds)){
+		if (this.isPointIncluded(pointAX, pointAY, bounds)) {
 			includePointX = pointAX;
 			includePointY = pointAY;
 		} else {
@@ -13448,7 +13800,7 @@ ORYX.Core.Shape = {
 			excludePointY = pointAY;
 		}
 
-		if(this.isPointIncluded(pointBX, pointBY, bounds)){
+		if (this.isPointIncluded(pointBX, pointBY, bounds)) {
 			includePointX = pointBX;
 			includePointY = pointBY;
 		} else {
@@ -13457,7 +13809,7 @@ ORYX.Core.Shape = {
 		}
 
 		// If there is no inclue or exclude Shape, than return
-		if(!includePointX || !includePointY || !excludePointX || !excludePointY) {
+		if (!includePointX || !includePointY || !excludePointX || !excludePointY) {
 			return undefined;
 		}
 
@@ -13473,14 +13825,14 @@ ORYX.Core.Shape = {
 
 		var i = 0;
 
-		while(true) {
+		while (true) {
 			// Calculate the midpoint of the current to points
 			var midPointX = Math.min(includePointX, excludePointX) + ((Math.max(includePointX, excludePointX) - Math.min(includePointX, excludePointX)) / 2.0);
 			var midPointY = Math.min(includePointY, excludePointY) + ((Math.max(includePointY, excludePointY) - Math.min(includePointY, excludePointY)) / 2.0);
 
 
 			// Set the new midpoint by the means of the include of the bounds
-			if(this.isPointIncluded(midPointX, midPointY, bounds)){
+			if (this.isPointIncluded(midPointX, midPointY, bounds)) {
 				includePointX = midPointX;
 				includePointY = midPointY;
 			} else {
@@ -13492,11 +13844,11 @@ ORYX.Core.Shape = {
 			var length = Math.sqrt(Math.pow(includePointX - excludePointX, 2) + Math.pow(includePointY - excludePointY, 2))
 			// Calc a point one step from the include point
 			refPointX = includePointX + ((excludePointX - includePointX) / length),
-			refPointY = includePointY + ((excludePointY - includePointY) / length)
+				refPointY = includePointY + ((excludePointY - includePointY) / length)
 
 
 			// If the reference point not in the bounds, break
-			if(!this.isPointIncluded(refPointX, refPointY, bounds)) {
+			if (!this.isPointIncluded(refPointX, refPointY, bounds)) {
 				break
 			}
 
@@ -13504,18 +13856,17 @@ ORYX.Core.Shape = {
 		}
 
 		// Return the last includepoint
-		return {x:refPointX , y:refPointY};
+		return {x: refPointX, y: refPointY};
 	},
 
 
-
-    /**
-     * Calculate if the point is inside the Shape
-     * @param {PointX}
-     * @param {PointY}
-     */
-    isPointIncluded: function(){
-		return  false
+	/**
+	 * Calculate if the point is inside the Shape
+	 * @param {PointX}
+	 * @param {PointY}
+	 */
+	isPointIncluded: function () {
+		return false
 	},
 
 	/**
@@ -13525,10 +13876,10 @@ ORYX.Core.Shape = {
 	 * @return {Boolean}
 	 *
 	 */
-	containsNode: function(node){
+	containsNode: function (node) {
 		var me = this.node.firstChild.firstChild;
-		while(node){
-			if (node == me){
+		while (node) {
+			if (node == me) {
 				return true;
 			}
 			node = node.parentNode;
@@ -13536,15 +13887,15 @@ ORYX.Core.Shape = {
 		return false
 	},
 
-    /**
-     * Calculate if the point is over an special offset area
-     * @param {Point}
-     */
-    isPointOverOffset: function(){
-		return  this.isPointIncluded.apply( this , arguments )
+	/**
+	 * Calculate if the point is over an special offset area
+	 * @param {Point}
+	 */
+	isPointOverOffset: function () {
+		return this.isPointIncluded.apply(this, arguments)
 	},
 
-	_dockerChanged: function() {
+	_dockerChanged: function () {
 
 	},
 
@@ -13552,7 +13903,7 @@ ORYX.Core.Shape = {
 	 * Create a Docker for this Edge
 	 *
 	 */
-	createDocker: function(index, position) {
+	createDocker: function (index, position) {
 		var docker = new ORYX.Core.Controls.Docker({eventHandlerCallback: this.eventHandlerCallback});
 		docker.bounds.registerCallback(this._dockerChangedCallback);
 		if (position) {
@@ -13567,35 +13918,47 @@ ORYX.Core.Shape = {
 	 * Get the serialized object
 	 * return Array with hash-entrees (prefix, name, value)
 	 * Following values will given:
-	 * 		Bounds
-	 * 		Outgoing Shapes
-	 * 		Parent
+	 *        Bounds
+	 *        Outgoing Shapes
+	 *        Parent
 	 */
-	serialize: function() {
+	serialize: function () {
 		var serializedObject = arguments.callee.$.serialize.apply(this);
 
 		// Add the bounds
-		serializedObject.push({name: 'bounds', prefix:'oryx', value: this.bounds.serializeForERDF(), type: 'literal'});
+		serializedObject.push({name: 'bounds', prefix: 'oryx', value: this.bounds.serializeForERDF(), type: 'literal'});
 
 		// Add the outgoing shapes
-		this.getOutgoingShapes().each((function(followingShape){
-			serializedObject.push({name: 'outgoing', prefix:'raziel', value: '#'+ERDF.__stripHashes(followingShape.resourceId), type: 'resource'});
+		this.getOutgoingShapes().each((function (followingShape) {
+			serializedObject.push({
+				name: 'outgoing',
+				prefix: 'raziel',
+				value: '#' + ERDF.__stripHashes(followingShape.resourceId),
+				type: 'resource'
+			});
 		}).bind(this));
 
 		// Add the parent shape, if the parent not the canvas
 		//if(this.parent instanceof ORYX.Core.Shape){
-			serializedObject.push({name: 'parent', prefix:'raziel', value: '#'+ERDF.__stripHashes(this.parent.resourceId), type: 'resource'});
+		serializedObject.push({
+			name: 'parent',
+			prefix: 'raziel',
+			value: '#' + ERDF.__stripHashes(this.parent.resourceId),
+			type: 'resource'
+		});
 		//}
 
 		return serializedObject;
 	},
 
 
-	deserialize: function(serialize, json){
+	deserialize: function (serialize, json) {
 		arguments.callee.$.deserialize.apply(this, arguments);
 
 		// Set the Bounds
-		var bounds = serialize.find(function(ser){ return 'oryx-bounds' === (ser.prefix+"-"+ser.name) });
+		var bounds = serialize.find(function (ser) {
+			return 'oryx-bounds' === (ser.prefix + "-" + ser.name)
+		});
 		if (bounds) {
 			var b = bounds.value.replace(/,/g, " ").split(" ").without("");
 			if (this instanceof ORYX.Core.Edge) {
@@ -13608,29 +13971,29 @@ ORYX.Core.Shape = {
 			}
 		}
 
-		if (json && json.labels instanceof Array){
-			json.labels.each(function(slabel){
+		if (json && json.labels instanceof Array) {
+			json.labels.each(function (slabel) {
 				var label = this.getLabel(slabel.ref);
-				if (label){
+				if (label) {
 					label.deserialize(slabel, this);
 				}
 			}.bind(this))
 		}
 	},
 
-	toJSON: function(){
+	toJSON: function () {
 		var json = arguments.callee.$.toJSON.apply(this, arguments);
 
 		var labels = [], id = this.id;
-		this._labels.each(function(obj){
+		this._labels.each(function (obj) {
 			var slabel = obj.value.serialize();
-			if (slabel){
+			if (slabel) {
 				slabel.ref = obj.key.replace(id, '');
 				labels.push(slabel);
 			}
 		});
 
-		if (labels.length > 0){
+		if (labels.length > 0) {
 			json.labels = labels;
 		}
 		return json;
@@ -13646,15 +14009,15 @@ ORYX.Core.Shape = {
 	 * SVG representation.
 	 * @param {SVGDocument} svgDocument
 	 */
-	_init: function(svgDocument) {
+	_init: function (svgDocument) {
 		//adjust ids
 		this._adjustIds(svgDocument, 0);
 	},
 
-	_adjustIds: function(element, idIndex) {
-		if(element instanceof Element) {
+	_adjustIds: function (element, idIndex) {
+		if (element instanceof Element) {
 			var eid = element.getAttributeNS(null, 'id');
-			if(eid && eid !== "") {
+			if (eid && eid !== "") {
 				element.setAttributeNS(null, 'id', this.id + eid);
 			} else {
 				element.setAttributeNS(null, 'id', this.id + "_" + this.id + "_" + idIndex);
@@ -13663,13 +14026,13 @@ ORYX.Core.Shape = {
 
 			// Replace URL in fill attribute
 			var fill = element.getAttributeNS(null, 'fill');
-			if (fill&&fill.include("url(#")){
-				fill = fill.replace(/url\(#/g, 'url(#'+this.id);
+			if (fill && fill.include("url(#")) {
+				fill = fill.replace(/url\(#/g, 'url(#' + this.id);
 				element.setAttributeNS(null, 'fill', fill);
 			}
 
-			if(element.hasChildNodes()) {
-				for(var i = 0; i < element.childNodes.length; i++) {
+			if (element.hasChildNodes()) {
+				for (var i = 0; i < element.childNodes.length; i++) {
 					idIndex = this._adjustIds(element.childNodes[i], idIndex);
 				}
 			}
@@ -13677,7 +14040,9 @@ ORYX.Core.Shape = {
 		return idIndex;
 	},
 
-	toString: function() { return "ORYX.Core.Shape " + this.getId() }
+	toString: function () {
+		return "ORYX.Core.Shape " + this.getId()
+	}
 };
 ORYX.Core.Shape = ORYX.Core.AbstractShape.extend(ORYX.Core.Shape);/*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
@@ -13692,9 +14057,15 @@ ORYX.Core.Shape = ORYX.Core.AbstractShape.extend(ORYX.Core.Shape);/*
 /**
  * Init namespaces
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
-if(!ORYX.Core.Controls) {ORYX.Core.Controls = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
+if (!ORYX.Core.Controls) {
+	ORYX.Core.Controls = {};
+}
 
 
 /**
@@ -13702,8 +14073,10 @@ if(!ORYX.Core.Controls) {ORYX.Core.Controls = {};}
  */
 ORYX.Core.Controls.Control = ORYX.Core.UIObject.extend({
 
-	toString: function() { return "Control " + this.id; }
- });/*
+	toString: function () {
+		return "Control " + this.id;
+	}
+});/*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
  * License rights for this program may be obtained from Alfresco Software, Ltd.
  * pursuant to a written agreement and any use of this program without such an
@@ -13716,9 +14089,15 @@ ORYX.Core.Controls.Control = ORYX.Core.UIObject.extend({
 /**
  * Init namespaces
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
-if(!ORYX.Core.Controls) {ORYX.Core.Controls = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
+if (!ORYX.Core.Controls) {
+	ORYX.Core.Controls = {};
+}
 
 
 /**
@@ -13732,7 +14111,7 @@ ORYX.Core.Controls.Docker = ORYX.Core.Controls.Control.extend({
 	/**
 	 * Constructor
 	 */
-	construct: function() {
+	construct: function () {
 		arguments.callee.$.construct.apply(this, arguments);
 
 		this.isMovable = true;				// Enables movability
@@ -13756,16 +14135,22 @@ ORYX.Core.Controls.Docker = ORYX.Core.Controls.Control.extend({
 		// The DockerNode reprasentation
 		this._dockerNode = ORYX.Editor.graft("http://www.w3.org/2000/svg",
 			this.node,
-			['g', {"pointer-events":"all"},
-					['circle', {cx:"8", cy:"8", r:"8", stroke:"none", fill:"none"}],
-					['circle', {cx:"8", cy:"8", r:"3", stroke:"black", fill:"red", "stroke-width":"1"}]
-				]);
+			['g', {"pointer-events": "all"},
+				['circle', {cx: "8", cy: "8", r: "8", stroke: "none", fill: "none"}],
+				['circle', {cx: "8", cy: "8", r: "3", stroke: "black", fill: "red", "stroke-width": "1"}]
+			]);
 
 		// The ReferenzNode reprasentation
 		this._referencePointNode = ORYX.Editor.graft("http://www.w3.org/2000/svg",
 			this.node,
-			['g', {"pointer-events":"none"},
-				['circle', {cx: this.bounds.upperLeft().x, cy: this.bounds.upperLeft().y, r: 3, fill:"red", "fill-opacity":0.4}]]);
+			['g', {"pointer-events": "none"},
+				['circle', {
+					cx: this.bounds.upperLeft().x,
+					cy: this.bounds.upperLeft().y,
+					r: 3,
+					fill: "red",
+					"fill-opacity": 0.4
+				}]]);
 
 		// Hide the Docker
 		this.hide();
@@ -13777,22 +14162,22 @@ ORYX.Core.Controls.Docker = ORYX.Core.Controls.Control.extend({
 		this._updateCallback = this._changed.bind(this);
 	},
 
-	update: function() {
+	update: function () {
 		// If there have an DockedShape
-		if(this._dockedShape) {
-			if(this._dockedShapeBounds && this._dockedShape instanceof ORYX.Core.Node) {
+		if (this._dockedShape) {
+			if (this._dockedShapeBounds && this._dockedShape instanceof ORYX.Core.Node) {
 				// Calc the delta of width and height of the lastBounds and the current Bounds
 				var dswidth = this._dockedShapeBounds.width();
 				var dsheight = this._dockedShapeBounds.height();
-				if(!dswidth)
+				if (!dswidth)
 					dswidth = 1;
-				if(!dsheight)
+				if (!dsheight)
 					dsheight = 1;
-				var widthDelta = 	this._dockedShape.bounds.width() 	/ dswidth;
-				var heightDelta = 	this._dockedShape.bounds.height() 	/ dsheight;
+				var widthDelta = this._dockedShape.bounds.width() / dswidth;
+				var heightDelta = this._dockedShape.bounds.height() / dsheight;
 
 				// If there is an different
-				if(widthDelta !== 1.0 || heightDelta !== 1.0) {
+				if (widthDelta !== 1.0 || heightDelta !== 1.0) {
 					// Set the delta
 					this.referencePoint.x *= widthDelta;
 					this.referencePoint.y *= heightDelta;
@@ -13806,10 +14191,10 @@ ORYX.Core.Controls.Docker = ORYX.Core.Controls.Control.extend({
 			var dockerIndex = this.parent.dockers.indexOf(this)
 			var dock1 = this;
 			var dock2 = this.parent.dockers.length > 1 ?
-							(dockerIndex === 0?							// If there is the first element
-							 	this.parent.dockers[dockerIndex + 1]:	// then take the next docker
-								this.parent.dockers[dockerIndex - 1]):  // if not, then take the docker before
-							undefined;
+				(dockerIndex === 0 ?							// If there is the first element
+					this.parent.dockers[dockerIndex + 1] :	// then take the next docker
+					this.parent.dockers[dockerIndex - 1]) :  // if not, then take the docker before
+				undefined;
 
 			// Calculate the first absolute Refenzpoint
 			var absoluteReferenzPoint1 = dock1.getDockedShape() ?
@@ -13824,7 +14209,7 @@ ORYX.Core.Controls.Docker = ORYX.Core.Controls.Control.extend({
 					undefined;
 
 			// If there is no last absolute Referenzpoint
-			if(!absoluteReferenzPoint2) {
+			if (!absoluteReferenzPoint2) {
 				// Calculate from the middle of the DockedShape
 				var center = this._dockedShape.absoluteCenterXY();
 				var minDimension = this._dockedShape.bounds.width() * this._dockedShape.bounds.height();
@@ -13842,32 +14227,32 @@ ORYX.Core.Controls.Docker = ORYX.Core.Controls.Control.extend({
 				absoluteReferenzPoint2.x !== this._oldRefPoint2.x ||
 				absoluteReferenzPoint2.y !== this._oldRefPoint2.y) {*/
 
-				// Get the new point for the Docker, calucalted by the intersection point of the Shape and the two points
-				newPoint = this._dockedShape.getIntersectionPoint(absoluteReferenzPoint1, absoluteReferenzPoint2);
+			// Get the new point for the Docker, calucalted by the intersection point of the Shape and the two points
+			newPoint = this._dockedShape.getIntersectionPoint(absoluteReferenzPoint1, absoluteReferenzPoint2);
 
-				// If there is new point, take the referencepoint as the new point
-				if(!newPoint) {
-					newPoint = this.getAbsoluteReferencePoint();
-				}
+			// If there is new point, take the referencepoint as the new point
+			if (!newPoint) {
+				newPoint = this.getAbsoluteReferencePoint();
+			}
 
-				if(this.parent && this.parent.parent) {
-					var grandParentPos = this.parent.parent.absoluteXY();
-					newPoint.x -= grandParentPos.x;
-					newPoint.y -= grandParentPos.y;
-				}
+			if (this.parent && this.parent.parent) {
+				var grandParentPos = this.parent.parent.absoluteXY();
+				newPoint.x -= grandParentPos.x;
+				newPoint.y -= grandParentPos.y;
+			}
 
-				// Set the bounds to the new point
-				this.bounds.centerMoveTo(newPoint)
+			// Set the bounds to the new point
+			this.bounds.centerMoveTo(newPoint)
 
-				this._oldRefPoint1 = absoluteReferenzPoint1;
-				this._oldRefPoint2 = absoluteReferenzPoint2;
-			}
-			/*else {
+			this._oldRefPoint1 = absoluteReferenzPoint1;
+			this._oldRefPoint2 = absoluteReferenzPoint2;
+		}
+		/*else {
 				newPoint = this.bounds.center();
 			}*/
 
 
-	//	}
+		//	}
 
 		// Call the super class
 		arguments.callee.$.update.apply(this, arguments);
@@ -13876,19 +14261,19 @@ ORYX.Core.Controls.Docker = ORYX.Core.Controls.Control.extend({
 	/**
 	 * Calls the super class refresh method and updates the view of the docker.
 	 */
-	refresh: function() {
+	refresh: function () {
 		arguments.callee.$.refresh.apply(this, arguments);
 
 		// Refresh the dockers node
 		var p = this.bounds.upperLeft();
-		this._dockerNode.setAttributeNS(null, 'transform','translate(' + p.x + ', ' + p.y + ')');
+		this._dockerNode.setAttributeNS(null, 'transform', 'translate(' + p.x + ', ' + p.y + ')');
 
 		// Refresh the referencepoints node
 		p = Object.clone(this.referencePoint);
 
-		if(p && this._dockedShape){
+		if (p && this._dockedShape) {
 			var upL
-			if(this.parent instanceof ORYX.Core.Edge) {
+			if (this.parent instanceof ORYX.Core.Edge) {
 				upL = this._dockedShape.absoluteXY();
 			} else {
 				upL = this._dockedShape.bounds.upperLeft();
@@ -13899,20 +14284,20 @@ ORYX.Core.Controls.Docker = ORYX.Core.Controls.Control.extend({
 			p = this.bounds.center();
 		}
 
-		this._referencePointNode.setAttributeNS(null, 'transform','translate(' + p.x + ', ' + p.y + ')');
+		this._referencePointNode.setAttributeNS(null, 'transform', 'translate(' + p.x + ', ' + p.y + ')');
 	},
 
 	/**
 	 * Set the reference point
 	 * @param {Object} point
 	 */
-	setReferencePoint: function(point) {
+	setReferencePoint: function (point) {
 		// Set the referencepoint
-		if(this.referencePoint !== point &&
+		if (this.referencePoint !== point &&
 			(!this.referencePoint ||
-			!point ||
-			this.referencePoint.x !== point.x ||
-			this.referencePoint.y !== point.y)) {
+				!point ||
+				this.referencePoint.x !== point.x ||
+				this.referencePoint.y !== point.y)) {
 
 			this.referencePoint = point;
 			this._changed();
@@ -13926,15 +14311,15 @@ ORYX.Core.Controls.Docker = ORYX.Core.Controls.Control.extend({
 	/**
 	 * Get the absolute referencepoint
 	 */
-	getAbsoluteReferencePoint: function() {
-		if(!this.referencePoint || !this._dockedShape) {
+	getAbsoluteReferencePoint: function () {
+		if (!this.referencePoint || !this._dockedShape) {
 			return undefined;
 		} else {
 			var absUL = this._dockedShape.absoluteXY();
 			return {
-						x: this.referencePoint.x + absUL.x,
-						y: this.referencePoint.y + absUL.y
-					}
+				x: this.referencePoint.x + absUL.x,
+				y: this.referencePoint.y + absUL.y
+			}
 		}
 	},
 
@@ -13942,21 +14327,21 @@ ORYX.Core.Controls.Docker = ORYX.Core.Controls.Control.extend({
 	 * Set the docked Shape from the docker
 	 * @param {Object} shape
 	 */
-	setDockedShape: function(shape) {
+	setDockedShape: function (shape) {
 
 		// If there is an old docked Shape
-		if(this._dockedShape) {
+		if (this._dockedShape) {
 			this._dockedShape.bounds.unregisterCallback(this._updateCallback)
 
 			// Delete the Shapes from the incoming and outgoing array
 			// If this Docker the incoming of the Shape
-			if(this === this.parent.dockers.first()) {
+			if (this === this.parent.dockers.first()) {
 
 				this.parent.incoming = this.parent.incoming.without(this._dockedShape);
 				this._dockedShape.outgoing = this._dockedShape.outgoing.without(this.parent);
 
-			// If this Docker the outgoing of the Shape
-			} else if (this === this.parent.dockers.last()){
+				// If this Docker the outgoing of the Shape
+			} else if (this === this.parent.dockers.last()) {
 
 				this.parent.outgoing = this.parent.outgoing.without(this._dockedShape);
 				this._dockedShape.incoming = this._dockedShape.incoming.without(this.parent);
@@ -13972,17 +14357,17 @@ ORYX.Core.Controls.Docker = ORYX.Core.Controls.Control.extend({
 		var referencePoint = undefined;
 
 		// If there is an Shape, register the updateCallback if there are changes in the shape bounds
-		if(this._dockedShape) {
+		if (this._dockedShape) {
 
 			// Add the Shapes to the incoming and outgoing array
 			// If this Docker the incoming of the Shape
-			if(this === this.parent.dockers.first()) {
+			if (this === this.parent.dockers.first()) {
 
 				this.parent.incoming.push(shape);
 				shape.outgoing.push(this.parent);
 
-			// If this Docker the outgoing of the Shape
-			} else if (this === this.parent.dockers.last()){
+				// If this Docker the outgoing of the Shape
+			} else if (this === this.parent.dockers.last()) {
 
 				this.parent.outgoing.push(shape);
 				shape.incoming.push(this.parent);
@@ -14024,14 +14409,14 @@ ORYX.Core.Controls.Docker = ORYX.Core.Controls.Control.extend({
 	/**
 	 * Get the docked Shape
 	 */
-	getDockedShape: function() {
+	getDockedShape: function () {
 		return this._dockedShape;
 	},
 
 	/**
 	 * Returns TRUE if the docker has a docked shape
 	 */
-	isDocked: function() {
+	isDocked: function () {
 		return !!this._dockedShape;
 	},
 
@@ -14039,19 +14424,19 @@ ORYX.Core.Controls.Docker = ORYX.Core.Controls.Control.extend({
 	 * Set the Color of the Docker
 	 * @param {Object} color
 	 */
-	setDockerColor: function(color) {
+	setDockerColor: function (color) {
 		this._dockerNode.lastChild.setAttributeNS(null, "fill", color);
 	},
 
-	preventHiding: function(prevent){
-		this._preventHiding = Math.max(0, (this._preventHiding||0) + (prevent ? 1 : -1));
+	preventHiding: function (prevent) {
+		this._preventHiding = Math.max(0, (this._preventHiding || 0) + (prevent ? 1 : -1));
 	},
 
 	/**
 	 * Hides this UIObject and all its children.
 	 */
-	hide: function() {
-		if (this._preventHiding){
+	hide: function () {
+		if (this._preventHiding) {
 			return false;
 		}
 
@@ -14059,7 +14444,7 @@ ORYX.Core.Controls.Docker = ORYX.Core.Controls.Control.extend({
 		this.node.setAttributeNS(null, 'visibility', 'hidden');
 		this._referencePointNode.setAttributeNS(null, 'visibility', 'hidden');
 
-		this.children.each(function(uiObj) {
+		this.children.each(function (uiObj) {
 			uiObj.hide();
 		});
 	},
@@ -14067,23 +14452,25 @@ ORYX.Core.Controls.Docker = ORYX.Core.Controls.Control.extend({
 	/**
 	 * Enables visibility of this UIObject and all its children.
 	 */
-	show: function() {
+	show: function () {
 		// Show docker
 		this.node.setAttributeNS(null, 'visibility', 'visible');
 
 		// Hide reference point if the connected shape is an edge
-		if (this.getDockedShape() instanceof ORYX.Core.Edge){
+		if (this.getDockedShape() instanceof ORYX.Core.Edge) {
 			this._referencePointNode.setAttributeNS(null, 'visibility', 'hidden');
 		} else {
 			this._referencePointNode.setAttributeNS(null, 'visibility', 'visible');
 		}
 
-		this.children.each(function(uiObj) {
+		this.children.each(function (uiObj) {
 			uiObj.show();
 		});
 	},
 
-	toString: function() { return "Docker " + this.id }
+	toString: function () {
+		return "Docker " + this.id
+	}
 });/*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
  * License rights for this program may be obtained from Alfresco Software, Ltd.
@@ -14097,9 +14484,15 @@ ORYX.Core.Controls.Docker = ORYX.Core.Controls.Control.extend({
 /**
  * Init namespaces
  */
-if(!ORYX) {var ORYX = {};}
-if(!ORYX.Core) {ORYX.Core = {};}
-if(!ORYX.Core.Controls) {ORYX.Core.Controls = {};}
+if (!ORYX) {
+	var ORYX = {};
+}
+if (!ORYX.Core) {
+	ORYX.Core = {};
+}
+if (!ORYX.Core.Controls) {
+	ORYX.Core.Controls = {};
+}
 
 
 /**
@@ -14113,7 +14506,7 @@ ORYX.Core.Controls.Magnet = ORYX.Core.Controls.Control.extend({
 	/**
 	 * Constructor
 	 */
-	construct: function() {
+	construct: function () {
 		arguments.callee.$.construct.apply(this, arguments);
 
 		//this.anchors = [];
@@ -14127,26 +14520,26 @@ ORYX.Core.Controls.Magnet = ORYX.Core.Controls.Control.extend({
 		//graft magnet's root node into owner's control group.
 		this.node = ORYX.Editor.graft("http://www.w3.org/2000/svg",
 			null,
-			['g', {"pointer-events":"all"},
-					['circle', {cx:"8", cy:"8", r:"4", stroke:"none", fill:"red", "fill-opacity":"0.3"}],
-				]);
+			['g', {"pointer-events": "all"},
+				['circle', {cx: "8", cy: "8", r: "4", stroke: "none", fill: "red", "fill-opacity": "0.3"}],
+			]);
 
 		this.hide();
 	},
 
-	update: function() {
+	update: function () {
 		arguments.callee.$.update.apply(this, arguments);
 
 		//this.isChanged = true;
 	},
 
-	_update: function() {
+	_update: function () {
 		arguments.callee.$.update.apply(this, arguments);
 
 		//this.isChanged = true;
 	},
 
-	refresh: function() {
+	refresh: function () {
 		arguments.callee.$.refresh.apply(this, arguments);
 
 		var p = this.bounds.upperLeft();
@@ -14156,15 +14549,15 @@ ORYX.Core.Controls.Magnet = ORYX.Core.Controls.Control.extend({
 			p.y += parentPos.y;
 		}*/
 
-		this.node.setAttributeNS(null, 'transform','translate(' + p.x + ', ' + p.y + ')');
+		this.node.setAttributeNS(null, 'transform', 'translate(' + p.x + ', ' + p.y + ')');
 	},
 
-	show: function() {
+	show: function () {
 		//this.refresh();
 		arguments.callee.$.show.apply(this, arguments);
 	},
 
-	toString: function() {
+	toString: function () {
 		return "Magnet " + this.id;
 	}
 });
@@ -14182,10 +14575,10 @@ ORYX.Core.Controls.Magnet = ORYX.Core.Controls.Control.extend({
  * Init namespaces
  */
 if (!ORYX) {
-    var ORYX = {};
+	var ORYX = {};
 }
 if (!ORYX.Core) {
-    ORYX.Core = {};
+	ORYX.Core = {};
 }
 
 /**
@@ -14194,49 +14587,49 @@ if (!ORYX.Core) {
  */
 ORYX.Core.Node = {
 
-    /**
-     * Constructor
-     * @param options {Object} A container for arguments.
-     * @param stencil {Stencil}
-     */
-    construct: function(options, stencil, facade){
-        arguments.callee.$.construct.apply(this, arguments);
+	/**
+	 * Constructor
+	 * @param options {Object} A container for arguments.
+	 * @param stencil {Stencil}
+	 */
+	construct: function (options, stencil, facade) {
+		arguments.callee.$.construct.apply(this, arguments);
 
-        this.isSelectable = true;
-        this.isMovable = true;
+		this.isSelectable = true;
+		this.isMovable = true;
 		this._dockerUpdated = false;
 		this.facade = facade;
 
-        this._oldBounds = new ORYX.Core.Bounds(); //init bounds with undefined values
-        this._svgShapes = []; //array of all SVGShape objects of
-        // SVG representation
+		this._oldBounds = new ORYX.Core.Bounds(); //init bounds with undefined values
+		this._svgShapes = []; //array of all SVGShape objects of
+		// SVG representation
 
-        //TODO vielleicht in shape verschieben?
-        this.minimumSize = undefined; // {width:..., height:...}
-        this.maximumSize = undefined;
+		//TODO vielleicht in shape verschieben?
+		this.minimumSize = undefined; // {width:..., height:...}
+		this.maximumSize = undefined;
 
-        //TODO vielleicht in shape oder uiobject verschieben?
-        // vielleicht sogar isResizable ersetzen?
-        this.isHorizontallyResizable = false;
-        this.isVerticallyResizable = false;
+		//TODO vielleicht in shape oder uiobject verschieben?
+		// vielleicht sogar isResizable ersetzen?
+		this.isHorizontallyResizable = false;
+		this.isVerticallyResizable = false;
 
-        this.dataId = undefined;
+		this.dataId = undefined;
 
-        this._init(this._stencil.view());
-        this.forcedHeight = -1;
-    },
+		this._init(this._stencil.view());
+		this.forcedHeight = -1;
+	},
 
-    /**
-     * This method checks whether the shape is resized correctly and calls the
-     * super class update method.
-     */
-    _update: function(){
+	/**
+	 * This method checks whether the shape is resized correctly and calls the
+	 * super class update method.
+	 */
+	_update: function () {
 
 		this.dockers.invoke("update");
 		if (this.isChanged) {
 
 			var bounds = this.bounds;
-            var oldBounds = this._oldBounds;
+			var oldBounds = this._oldBounds;
 
 			if (this.isResized) {
 
@@ -14244,7 +14637,7 @@ ORYX.Core.Node = {
 				var heightDelta = bounds.height() / oldBounds.height();
 
 				//iterate over all relevant svg elements and resize them
-				this._svgShapes.each(function(svgShape){
+				this._svgShapes.each(function (svgShape) {
 					//adjust width
 					if (svgShape.isHorizontallyResizable) {
 						svgShape.width = svgShape.oldWidth * widthDelta;
@@ -14263,18 +14656,15 @@ ORYX.Core.Node = {
 						anchorOffset = oldBounds.width() - (svgShape.oldX + svgShape.oldWidth);
 						if (leftIncluded) {
 							svgShape.width = bounds.width() - svgShape.x - anchorOffset;
-						}
-						else {
+						} else {
 							svgShape.x = bounds.width() - (anchorOffset + svgShape.width);
 						}
-					}
-					else
-						if (!leftIncluded) {
-							svgShape.x = widthDelta * svgShape.oldX;
-							if (!svgShape.isHorizontallyResizable) {
-								svgShape.x = svgShape.x + svgShape.width * widthDelta / 2 - svgShape.width / 2;
-							}
+					} else if (!leftIncluded) {
+						svgShape.x = widthDelta * svgShape.oldX;
+						if (!svgShape.isHorizontallyResizable) {
+							svgShape.x = svgShape.x + svgShape.width * widthDelta / 2 - svgShape.width / 2;
 						}
+					}
 
 					var topIncluded = svgShape.anchorTop;
 					var bottomIncluded = svgShape.anchorBottom;
@@ -14283,21 +14673,18 @@ ORYX.Core.Node = {
 						anchorOffset = oldBounds.height() - (svgShape.oldY + svgShape.oldHeight);
 						if (topIncluded) {
 							svgShape.height = bounds.height() - svgShape.y - anchorOffset;
-						}
-						else {
+						} else {
 							// Hack for choreography task layouting
 							if (!svgShape._isYLocked) {
 								svgShape.y = bounds.height() - (anchorOffset + svgShape.height);
 							}
 						}
-					}
-					else
-						if (!topIncluded) {
-							svgShape.y = heightDelta * svgShape.oldY;
-							if (!svgShape.isVerticallyResizable) {
-								svgShape.y = svgShape.y + svgShape.height * heightDelta / 2 - svgShape.height / 2;
-							}
+					} else if (!topIncluded) {
+						svgShape.y = heightDelta * svgShape.oldY;
+						if (!svgShape.isVerticallyResizable) {
+							svgShape.y = svgShape.y + svgShape.height * heightDelta / 2 - svgShape.height / 2;
 						}
+					}
 				});
 
 				//check, if the current bounds is unallowed horizontally or vertically resized
@@ -14356,7 +14743,7 @@ ORYX.Core.Node = {
 
 				var leftIncluded, rightIncluded, topIncluded, bottomIncluded, center, newX, newY;
 
-				this.magnets.each(function(magnet){
+				this.magnets.each(function (magnet) {
 					leftIncluded = magnet.anchorLeft;
 					rightIncluded = magnet.anchorRight;
 					topIncluded = magnet.anchorTop;
@@ -14366,25 +14753,19 @@ ORYX.Core.Node = {
 
 					if (leftIncluded) {
 						newX = center.x;
+					} else if (rightIncluded) {
+						newX = bounds.width() - (oldBounds.width() - center.x)
+					} else {
+						newX = center.x * widthDelta;
 					}
-					else
-						if (rightIncluded) {
-							newX = bounds.width() - (oldBounds.width() - center.x)
-						}
-						else {
-							newX = center.x * widthDelta;
-						}
 
 					if (topIncluded) {
 						newY = center.y;
+					} else if (bottomIncluded) {
+						newY = bounds.height() - (oldBounds.height() - center.y);
+					} else {
+						newY = center.y * heightDelta;
 					}
-					else
-						if (bottomIncluded) {
-							newY = bounds.height() - (oldBounds.height() - center.y);
-						}
-						else {
-							newY = center.y * heightDelta;
-						}
 
 					if (center.x !== newX || center.y !== newY) {
 						magnet.bounds.centerMoveTo(newX, newY);
@@ -14392,26 +14773,26 @@ ORYX.Core.Node = {
 				});
 
 				//set new position of labels
-				this.getLabels().each(function(label){
+				this.getLabels().each(function (label) {
 					// Set the position dependings on it anchor
 					if (!label.isAnchorLeft()) {
 						if (label.isAnchorRight()) {
 							label.setX(bounds.width() - (oldBounds.width() - label.oldX))
 						} else {
-							label.setX((label.position?label.position.x:label.x) * widthDelta);
+							label.setX((label.position ? label.position.x : label.x) * widthDelta);
 						}
 					}
 					if (!label.isAnchorTop()) {
 						if (label.isAnchorBottom()) {
 							label.setY(bounds.height() - (oldBounds.height() - label.oldY));
 						} else {
-							label.setY((label.position?label.position.y:label.y) * heightDelta);
+							label.setY((label.position ? label.position.y : label.y) * heightDelta);
 						}
 					}
 
 					// If there is an position,
 					// set the origin position as well
-					if (label.position){
+					if (label.position) {
 						if (!label.isOriginAnchorLeft()) {
 							if (label.isOriginAnchorRight()) {
 								label.setOriginX(bounds.width() - (oldBounds.width() - label.oldX))
@@ -14444,21 +14825,21 @@ ORYX.Core.Node = {
 				this.isResized = false;
 			}
 
-            this.refresh();
+			this.refresh();
 
 			this.isChanged = false;
 
 			this._oldBounds = this.bounds.clone();
-        }
+		}
 
-		this.children.each(function(value) {
-			if(!(value instanceof ORYX.Core.Controls.Docker)) {
+		this.children.each(function (value) {
+			if (!(value instanceof ORYX.Core.Controls.Docker)) {
 				value._update();
 			}
 		});
 
-		if (this.dockers.length > 0&&!this.dockers.first().getDockedShape()) {
-			this.dockers.each(function(docker){
+		if (this.dockers.length > 0 && !this.dockers.first().getDockedShape()) {
+			this.dockers.each(function (docker) {
 				docker.bounds.centerMoveTo(this.bounds.center())
 			}.bind(this))
 		}
@@ -14472,132 +14853,131 @@ ORYX.Core.Node = {
 			if(!(this.dockers[0] && this.dockers[0].getDockedShape() instanceof ORYX.Core.Node))
 				edge._update(true);
 		}).bind(this)); */
-    },
+	},
 
-    /**
-     * This method repositions and resizes the SVG representation
-     * of the shape.
-     */
-    refresh: function(){
-        arguments.callee.$.refresh.apply(this, arguments);
+	/**
+	 * This method repositions and resizes the SVG representation
+	 * of the shape.
+	 */
+	refresh: function () {
+		arguments.callee.$.refresh.apply(this, arguments);
 
-        /** Movement */
-        var x = this.bounds.upperLeft().x;
-        var y = this.bounds.upperLeft().y;
+		/** Movement */
+		var x = this.bounds.upperLeft().x;
+		var y = this.bounds.upperLeft().y;
 
 		// Move owner element
 		this.node.firstChild.setAttributeNS(null, "transform", "translate(" + x + ", " + y + ")");
 		// Move magnets
 		this.node.childNodes[1].childNodes[1].setAttributeNS(null, "transform", "translate(" + x + ", " + y + ")");
 
-        /** Resize */
+		/** Resize */
 
-        //iterate over all relevant svg elements and update them
-        this._svgShapes.each(function(svgShape){
-            svgShape.update();
-        });
-    },
+		//iterate over all relevant svg elements and update them
+		this._svgShapes.each(function (svgShape) {
+			svgShape.update();
+		});
+	},
 
-    _dockerChanged: function(){
+	_dockerChanged: function () {
 		var docker = this.dockers[0];
 
-        //set the bounds of the the association
-        this.bounds.centerMoveTo(docker.bounds.center());
+		//set the bounds of the the association
+		this.bounds.centerMoveTo(docker.bounds.center());
 
 		this._dockerUpdated = true;
-        //this._update(true);
-    },
-
-    /**
-     * This method traverses a tree of SVGElements and returns
-     * all SVGShape objects. For each basic shape or path element
-     * a SVGShape object is initialized.
-     *
-     * @param svgNode {SVGElement}
-     * @return {Array} Array of SVGShape objects
-     */
-    _initSVGShapes: function(svgNode){
-        var svgShapes = [];
-        try {
-            var svgShape = new ORYX.Core.SVG.SVGShape(svgNode);
-            svgShapes.push(svgShape);
-        }
-        catch (e) {
-            //do nothing
-        }
+		//this._update(true);
+	},
 
-        if (svgNode.hasChildNodes()) {
-            for (var i = 0; i < svgNode.childNodes.length; i++) {
-                svgShapes = svgShapes.concat(this._initSVGShapes(svgNode.childNodes[i]));
-            }
-        }
+	/**
+	 * This method traverses a tree of SVGElements and returns
+	 * all SVGShape objects. For each basic shape or path element
+	 * a SVGShape object is initialized.
+	 *
+	 * @param svgNode {SVGElement}
+	 * @return {Array} Array of SVGShape objects
+	 */
+	_initSVGShapes: function (svgNode) {
+		var svgShapes = [];
+		try {
+			var svgShape = new ORYX.Core.SVG.SVGShape(svgNode);
+			svgShapes.push(svgShape);
+		} catch (e) {
+			//do nothing
+		}
+
+		if (svgNode.hasChildNodes()) {
+			for (var i = 0; i < svgNode.childNodes.length; i++) {
+				svgShapes = svgShapes.concat(this._initSVGShapes(svgNode.childNodes[i]));
+			}
+		}
 
-        return svgShapes;
-    },
+		return svgShapes;
+	},
 
-    /**
-     * Calculate if the point is inside the Shape
-     * @param {PointX}
-     * @param {PointY}
-     * @param {absoluteBounds} optional: for performance
-     */
-    isPointIncluded: function(pointX, pointY, absoluteBounds){
-        // If there is an arguments with the absoluteBounds
-        var absBounds = absoluteBounds && absoluteBounds instanceof ORYX.Core.Bounds ? absoluteBounds : this.absoluteBounds();
+	/**
+	 * Calculate if the point is inside the Shape
+	 * @param {PointX}
+	 * @param {PointY}
+	 * @param {absoluteBounds} optional: for performance
+	 */
+	isPointIncluded: function (pointX, pointY, absoluteBounds) {
+		// If there is an arguments with the absoluteBounds
+		var absBounds = absoluteBounds && absoluteBounds instanceof ORYX.Core.Bounds ? absoluteBounds : this.absoluteBounds();
 
-        if (!absBounds.isIncluded(pointX, pointY)) {
+		if (!absBounds.isIncluded(pointX, pointY)) {
 			return false;
 		} else {
 
 		}
 
 
-        //point = Object.clone(point);
-        var ul = absBounds.upperLeft();
-        var x = pointX - ul.x;
-        var y = pointY - ul.y;
+		//point = Object.clone(point);
+		var ul = absBounds.upperLeft();
+		var x = pointX - ul.x;
+		var y = pointY - ul.y;
 
-		var i=0;
+		var i = 0;
 		do {
-			var isPointIncluded = this._svgShapes[i++].isPointIncluded( x, y );
-		} while( !isPointIncluded && i < this._svgShapes.length)
+			var isPointIncluded = this._svgShapes[i++].isPointIncluded(x, y);
+		} while (!isPointIncluded && i < this._svgShapes.length)
 
 		return isPointIncluded;
 
-        /*return this._svgShapes.any(function(svgShape){
+		/*return this._svgShapes.any(function(svgShape){
             return svgShape.isPointIncluded(point);
         });*/
-    },
+	},
 
 
-    /**
-     * Calculate if the point is over an special offset area
-     * @param {Point}
-     */
-    isPointOverOffset: function( pointX, pointY ){
-		var isOverEl = arguments.callee.$.isPointOverOffset.apply( this , arguments );
+	/**
+	 * Calculate if the point is over an special offset area
+	 * @param {Point}
+	 */
+	isPointOverOffset: function (pointX, pointY) {
+		var isOverEl = arguments.callee.$.isPointOverOffset.apply(this, arguments);
 
 		if (isOverEl) {
 
-	        // If there is an arguments with the absoluteBounds
-	        var absBounds = this.absoluteBounds();
-	        absBounds.widen( - ORYX.CONFIG.BORDER_OFFSET );
+			// If there is an arguments with the absoluteBounds
+			var absBounds = this.absoluteBounds();
+			absBounds.widen(-ORYX.CONFIG.BORDER_OFFSET);
 
-	        if ( !absBounds.isIncluded( pointX, pointY )) {
-	            return true;
-	        }
+			if (!absBounds.isIncluded(pointX, pointY)) {
+				return true;
+			}
 		}
 
 		return false;
 
 	},
 
-    serialize: function(){
-        var result = arguments.callee.$.serialize.apply(this);
+	serialize: function () {
+		var result = arguments.callee.$.serialize.apply(this);
 
-        // Add the docker's bounds
-        // nodes only have at most one docker!
-        this.dockers.each((function(docker){
+		// Add the docker's bounds
+		// nodes only have at most one docker!
+		this.dockers.each((function (docker) {
 			if (docker.getDockedShape()) {
 				var center = docker.referencePoint;
 				center = center ? center : docker.bounds.center();
@@ -14608,11 +14988,11 @@ ORYX.Core.Node = {
 					type: 'literal'
 				});
 			}
-        }).bind(this));
+		}).bind(this));
 
-        // Get the spezific serialized object from the stencil
-        try {
-            //result = this.getStencil().serialize(this, result);
+		// Get the spezific serialized object from the stencil
+		try {
+			//result = this.getStencil().serialize(this, result);
 
 			var serializeEvent = this.getStencil().serialize();
 
@@ -14620,7 +15000,7 @@ ORYX.Core.Node = {
 			 * call serialize callback by reference, result should be found
 			 * in serializeEvent.result
 			 */
-			if(serializeEvent.type) {
+			if (serializeEvent.type) {
 				serializeEvent.shape = this;
 				serializeEvent.data = result;
 				serializeEvent.result = undefined;
@@ -14628,21 +15008,20 @@ ORYX.Core.Node = {
 
 				this._delegateEvent(serializeEvent);
 
-				if(serializeEvent.result) {
+				if (serializeEvent.result) {
 					result = serializeEvent.result;
 				}
 			}
-        }
-        catch (e) {
-        }
-        return result;
-    },
+		} catch (e) {
+		}
+		return result;
+	},
 
-    deserialize: function(data){
-    	arguments.callee.$.deserialize.apply(this, arguments);
+	deserialize: function (data) {
+		arguments.callee.$.deserialize.apply(this, arguments);
 
-	    try {
-            //data = this.getStencil().deserialize(this, data);
+		try {
+			//data = this.getStencil().deserialize(this, data);
 
 			var deserializeEvent = this.getStencil().deserialize();
 
@@ -14650,36 +15029,40 @@ ORYX.Core.Node = {
 			 * call serialize callback by reference, result should be found
 			 * in serializeEventInfo.result
 			 */
-			if(deserializeEvent.type) {
+			if (deserializeEvent.type) {
 				deserializeEvent.shape = this;
 				deserializeEvent.data = data;
 				deserializeEvent.result = undefined;
 				deserializeEvent.forceExecution = true;
 
 				this._delegateEvent(deserializeEvent);
-				if(deserializeEvent.result) {
+				if (deserializeEvent.result) {
 					data = deserializeEvent.result;
 				}
 			}
-        }
-        catch (e) {
-        }
+		} catch (e) {
+		}
 
 		// Set the outgoing shapes
-		var outgoing = data.findAll(function(ser){ return (ser.prefix+"-"+ser.name) == 'raziel-outgoing'});
-		outgoing.each((function(obj){
+		var outgoing = data.findAll(function (ser) {
+			return (ser.prefix + "-" + ser.name) == 'raziel-outgoing'
+		});
+		outgoing.each((function (obj) {
 			// TODO: Look at Canvas
-			if(!this.parent) {return};
+			if (!this.parent) {
+				return
+			}
+			;
 
 			// Set outgoing Shape
 			var next = this.getCanvas().getChildShapeByResourceId(obj.value);
 
-			if(next){
-				if(next instanceof ORYX.Core.Edge) {
+			if (next) {
+				if (next instanceof ORYX.Core.Edge) {
 					//Set the first docker of the next shape
 					next.dockers.first().setDockedShape(this);
 					next.dockers.first().setReferencePoint(next.dockers.first().bounds.center());
-				} else if(next.dockers.length > 0) { //next is a node and next has a docker
+				} else if (next.dockers.length > 0) { //next is a node and next has a docker
 					next.dockers.first().setDockedShape(this);
 					//next.dockers.first().setReferencePoint({x: this.bounds.width() / 2.0, y: this.bounds.height() / 2.0});
 				}
@@ -14687,196 +15070,194 @@ ORYX.Core.Node = {
 
 		}).bind(this));
 
-        if (this.dockers.length === 1) {
-            var dockerPos;
-            dockerPos = data.find(function(entry){
-                return (entry.prefix + "-" + entry.name === "oryx-dockers");
-            });
+		if (this.dockers.length === 1) {
+			var dockerPos;
+			dockerPos = data.find(function (entry) {
+				return (entry.prefix + "-" + entry.name === "oryx-dockers");
+			});
 
-            if (dockerPos) {
-                var points = dockerPos.value.replace(/,/g, " ").split(" ").without("").without("#");
+			if (dockerPos) {
+				var points = dockerPos.value.replace(/,/g, " ").split(" ").without("").without("#");
 				if (points.length === 2 && this.dockers[0].getDockedShape()) {
-                    this.dockers[0].setReferencePoint({
-                        x: parseFloat(points[0]),
-                        y: parseFloat(points[1])
-                    });
-                }
-                else {
-                    this.dockers[0].bounds.centerMoveTo(parseFloat(points[0]), parseFloat(points[1]));
-                }
-            }
-        }
-    },
-
-    /**
-     * This method excepts the SVGDoucment that is the SVG representation
-     * of this shape.
-     * The bounds of the shape are calculated, the SVG representation's upper left point
-     * is moved to 0,0 and it the method sets if this shape is resizable.
-     *
-     * @param {SVGDocument} svgDocument
-     */
-    _init: function(svgDocument){
-        arguments.callee.$._init.apply(this, arguments);
-
-        var svgNode = svgDocument.getElementsByTagName("g")[0]; //outer most g node
-        // set all required attributes
-        var attributeTitle = svgDocument.ownerDocument.createAttribute("title");
-        attributeTitle.nodeValue = this.getStencil().title();
-        svgNode.setAttributeNode(attributeTitle);
-
-        var attributeId = svgDocument.ownerDocument.createAttribute("id");
-        attributeId.nodeValue = this.id;
-        svgNode.setAttributeNode(attributeId);
-
-        //
-        var stencilTargetNode = this.node.childNodes[0].childNodes[0]; //<g class=me>"
-        svgNode = stencilTargetNode.appendChild(svgNode);
-
-        // Add to the EventHandler
-        this.addEventHandlers(svgNode.parentNode);
-
-        /**set minimum and maximum size*/
-        var minSizeAttr = svgNode.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, "minimumSize");
-        if (minSizeAttr) {
-            minSizeAttr = minSizeAttr.replace("/,/g", " ");
-            var minSizeValues = minSizeAttr.split(" ");
-            minSizeValues = minSizeValues.without("");
-
-            if (minSizeValues.length > 1) {
-                this.minimumSize = {
-                    width: parseFloat(minSizeValues[0]),
-                    height: parseFloat(minSizeValues[1])
-                };
-            }
-            else {
-                //set minimumSize to (1,1), so that width and height of the stencil can never be (0,0)
-                this.minimumSize = {
-                    width: 1,
-                    height: 1
-                };
-            }
-        }
-
-        var maxSizeAttr = svgNode.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, "maximumSize");
-        if (maxSizeAttr) {
-            maxSizeAttr = maxSizeAttr.replace("/,/g", " ");
-            var maxSizeValues = maxSizeAttr.split(" ");
-            maxSizeValues = maxSizeValues.without("");
-
-            if (maxSizeValues.length > 1) {
-                this.maximumSize = {
-                    width: parseFloat(maxSizeValues[0]),
-                    height: parseFloat(maxSizeValues[1])
-                };
-            }
-        }
+					this.dockers[0].setReferencePoint({
+						x: parseFloat(points[0]),
+						y: parseFloat(points[1])
+					});
+				} else {
+					this.dockers[0].bounds.centerMoveTo(parseFloat(points[0]), parseFloat(points[1]));
+				}
+			}
+		}
+	},
 
-        if (this.minimumSize && this.maximumSize &&
-        (this.minimumSize.width > this.maximumSize.width ||
-        this.minimumSize.height > this.maximumSize.height)) {
+	/**
+	 * This method excepts the SVGDoucment that is the SVG representation
+	 * of this shape.
+	 * The bounds of the shape are calculated, the SVG representation's upper left point
+	 * is moved to 0,0 and it the method sets if this shape is resizable.
+	 *
+	 * @param {SVGDocument} svgDocument
+	 */
+	_init: function (svgDocument) {
+		arguments.callee.$._init.apply(this, arguments);
 
-            //TODO wird verschluckt!!!
-            throw this + ": Minimum Size must be greater than maxiumSize.";
-        }
+		var svgNode = svgDocument.getElementsByTagName("g")[0]; //outer most g node
+		// set all required attributes
+		var attributeTitle = svgDocument.ownerDocument.createAttribute("title");
+		attributeTitle.nodeValue = this.getStencil().title();
+		svgNode.setAttributeNode(attributeTitle);
 
-        /**get current bounds and adjust it to upperLeft == (0,0)*/
-        //initialize all SVGShape objects
-        this._svgShapes = this._initSVGShapes(svgNode);
-
-        //get upperLeft and lowerRight of stencil
-        var upperLeft = {
-            x: undefined,
-            y: undefined
-        };
-        var lowerRight = {
-            x: undefined,
-            y: undefined
-        };
-        var me = this;
-        this._svgShapes.each(function(svgShape){
-            upperLeft.x = (upperLeft.x !== undefined) ? Math.min(upperLeft.x, svgShape.x) : svgShape.x;
-            upperLeft.y = (upperLeft.y !== undefined) ? Math.min(upperLeft.y, svgShape.y) : svgShape.y;
-            lowerRight.x = (lowerRight.x !== undefined) ? Math.max(lowerRight.x, svgShape.x + svgShape.width) : svgShape.x + svgShape.width;
-            lowerRight.y = (lowerRight.y !== undefined) ? Math.max(lowerRight.y, svgShape.y + svgShape.height) : svgShape.y + svgShape.height;
-
-            /** set if resizing is enabled */
-            //TODO isResizable durch die beiden anderen booleans ersetzen?
-            if (svgShape.isHorizontallyResizable) {
-                me.isHorizontallyResizable = true;
-                me.isResizable = true;
-            }
-            if (svgShape.isVerticallyResizable) {
-                me.isVerticallyResizable = true;
-                me.isResizable = true;
-            }
-            if (svgShape.anchorTop && svgShape.anchorBottom) {
-                me.isVerticallyResizable = true;
-                me.isResizable = true;
-            }
-            if (svgShape.anchorLeft && svgShape.anchorRight) {
-                me.isHorizontallyResizable = true;
-                me.isResizable = true;
-            }
-        });
-
-        //move all SVGShapes by -upperLeft
-        this._svgShapes.each(function(svgShape){
-            svgShape.x -= upperLeft.x;
-            svgShape.y -= upperLeft.y;
-            svgShape.update();
-        });
-
-        //set bounds of shape
-        //the offsets are also needed for positioning the magnets and the docker
-        var offsetX = upperLeft.x;
-        var offsetY = upperLeft.y;
-
-        lowerRight.x -= offsetX;
-        lowerRight.y -= offsetY;
-        upperLeft.x = 0;
-        upperLeft.y = 0;
-
-        //prevent that width or height of initial bounds is 0
-        if (lowerRight.x === 0) {
-            lowerRight.x = 1;
-        }
-        if (lowerRight.y === 0) {
-            lowerRight.y = 1;
-        }
+		var attributeId = svgDocument.ownerDocument.createAttribute("id");
+		attributeId.nodeValue = this.id;
+		svgNode.setAttributeNode(attributeId);
 
-        this._oldBounds.set(upperLeft, lowerRight);
-        this.bounds.set(upperLeft, lowerRight);
+		//
+		var stencilTargetNode = this.node.childNodes[0].childNodes[0]; //<g class=me>"
+		svgNode = stencilTargetNode.appendChild(svgNode);
+
+		// Add to the EventHandler
+		this.addEventHandlers(svgNode.parentNode);
+
+		/**set minimum and maximum size*/
+		var minSizeAttr = svgNode.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, "minimumSize");
+		if (minSizeAttr) {
+			minSizeAttr = minSizeAttr.replace("/,/g", " ");
+			var minSizeValues = minSizeAttr.split(" ");
+			minSizeValues = minSizeValues.without("");
+
+			if (minSizeValues.length > 1) {
+				this.minimumSize = {
+					width: parseFloat(minSizeValues[0]),
+					height: parseFloat(minSizeValues[1])
+				};
+			} else {
+				//set minimumSize to (1,1), so that width and height of the stencil can never be (0,0)
+				this.minimumSize = {
+					width: 1,
+					height: 1
+				};
+			}
+		}
 
-        /**initialize magnets */
+		var maxSizeAttr = svgNode.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, "maximumSize");
+		if (maxSizeAttr) {
+			maxSizeAttr = maxSizeAttr.replace("/,/g", " ");
+			var maxSizeValues = maxSizeAttr.split(" ");
+			maxSizeValues = maxSizeValues.without("");
 
-        var magnets = svgDocument.getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_ORYX, "magnets");
+			if (maxSizeValues.length > 1) {
+				this.maximumSize = {
+					width: parseFloat(maxSizeValues[0]),
+					height: parseFloat(maxSizeValues[1])
+				};
+			}
+		}
 
-        if (magnets && magnets.length > 0) {
+		if (this.minimumSize && this.maximumSize &&
+			(this.minimumSize.width > this.maximumSize.width ||
+				this.minimumSize.height > this.maximumSize.height)) {
 
-            magnets = $A(magnets[0].getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_ORYX, "magnet"));
+			//TODO wird verschluckt!!!
+			throw this + ": Minimum Size must be greater than maxiumSize.";
+		}
 
-            var me = this;
-            magnets.each(function(magnetElem){
-                var magnet = new ORYX.Core.Controls.Magnet({
-                    eventHandlerCallback: me.eventHandlerCallback
-                });
-                var cx = parseFloat(magnetElem.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, "cx"));
-                var cy = parseFloat(magnetElem.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, "cy"));
-                magnet.bounds.centerMoveTo({
-                    x: cx - offsetX,
-                    y: cy - offsetY
-                });
+		/**get current bounds and adjust it to upperLeft == (0,0)*/
+		//initialize all SVGShape objects
+		this._svgShapes = this._initSVGShapes(svgNode);
 
-                //get anchors
-                var anchors = magnetElem.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, "anchors");
-                if (anchors) {
-                    anchors = anchors.replace("/,/g", " ");
-                    anchors = anchors.split(" ").without("");
-                    for(var i = 0; i < anchors.length; i++) {
-						switch(anchors[i].toLowerCase()) {
-							case "left":
-								magnet.anchorLeft = true;
+		//get upperLeft and lowerRight of stencil
+		var upperLeft = {
+			x: undefined,
+			y: undefined
+		};
+		var lowerRight = {
+			x: undefined,
+			y: undefined
+		};
+		var me = this;
+		this._svgShapes.each(function (svgShape) {
+			upperLeft.x = (upperLeft.x !== undefined) ? Math.min(upperLeft.x, svgShape.x) : svgShape.x;
+			upperLeft.y = (upperLeft.y !== undefined) ? Math.min(upperLeft.y, svgShape.y) : svgShape.y;
+			lowerRight.x = (lowerRight.x !== undefined) ? Math.max(lowerRight.x, svgShape.x + svgShape.width) : svgShape.x + svgShape.width;
+			lowerRight.y = (lowerRight.y !== undefined) ? Math.max(lowerRight.y, svgShape.y + svgShape.height) : svgShape.y + svgShape.height;
+
+			/** set if resizing is enabled */
+			//TODO isResizable durch die beiden anderen booleans ersetzen?
+			if (svgShape.isHorizontallyResizable) {
+				me.isHorizontallyResizable = true;
+				me.isResizable = true;
+			}
+			if (svgShape.isVerticallyResizable) {
+				me.isVerticallyResizable = true;
+				me.isResizable = true;
+			}
+			if (svgShape.anchorTop && svgShape.anchorBottom) {
+				me.isVerticallyResizable = true;
+				me.isResizable = true;
+			}
+			if (svgShape.anchorLeft && svgShape.anchorRight) {
+				me.isHorizontallyResizable = true;
+				me.isResizable = true;
+			}
+		});
+
+		//move all SVGShapes by -upperLeft
+		this._svgShapes.each(function (svgShape) {
+			svgShape.x -= upperLeft.x;
+			svgShape.y -= upperLeft.y;
+			svgShape.update();
+		});
+
+		//set bounds of shape
+		//the offsets are also needed for positioning the magnets and the docker
+		var offsetX = upperLeft.x;
+		var offsetY = upperLeft.y;
+
+		lowerRight.x -= offsetX;
+		lowerRight.y -= offsetY;
+		upperLeft.x = 0;
+		upperLeft.y = 0;
+
+		//prevent that width or height of initial bounds is 0
+		if (lowerRight.x === 0) {
+			lowerRight.x = 1;
+		}
+		if (lowerRight.y === 0) {
+			lowerRight.y = 1;
+		}
+
+		this._oldBounds.set(upperLeft, lowerRight);
+		this.bounds.set(upperLeft, lowerRight);
+
+		/**initialize magnets */
+
+		var magnets = svgDocument.getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_ORYX, "magnets");
+
+		if (magnets && magnets.length > 0) {
+
+			magnets = $A(magnets[0].getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_ORYX, "magnet"));
+
+			var me = this;
+			magnets.each(function (magnetElem) {
+				var magnet = new ORYX.Core.Controls.Magnet({
+					eventHandlerCallback: me.eventHandlerCallback
+				});
+				var cx = parseFloat(magnetElem.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, "cx"));
+				var cy = parseFloat(magnetElem.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, "cy"));
+				magnet.bounds.centerMoveTo({
+					x: cx - offsetX,
+					y: cy - offsetY
+				});
+
+				//get anchors
+				var anchors = magnetElem.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, "anchors");
+				if (anchors) {
+					anchors = anchors.replace("/,/g", " ");
+					anchors = anchors.split(" ").without("");
+					for (var i = 0; i < anchors.length; i++) {
+						switch (anchors[i].toLowerCase()) {
+							case "left":
+								magnet.anchorLeft = true;
 								break;
 							case "right":
 								magnet.anchorRight = true;
@@ -14889,47 +15270,46 @@ ORYX.Core.Node = {
 								break;
 						}
 					}
-                }
+				}
 
-                me.add(magnet);
+				me.add(magnet);
 
-                //check, if magnet is default magnet
-                if (!this._defaultMagnet) {
-                    var defaultAttr = magnetElem.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, "default");
-                    if (defaultAttr && defaultAttr.toLowerCase() === "yes") {
-                        me._defaultMagnet = magnet;
-                    }
-                }
-            });
-        }
-        else {
-            // Add a Magnet in the Center of Shape
-            var magnet = new ORYX.Core.Controls.Magnet();
-            magnet.bounds.centerMoveTo(this.bounds.width() / 2, this.bounds.height() / 2);
-            this.add(magnet);
-        }
+				//check, if magnet is default magnet
+				if (!this._defaultMagnet) {
+					var defaultAttr = magnetElem.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, "default");
+					if (defaultAttr && defaultAttr.toLowerCase() === "yes") {
+						me._defaultMagnet = magnet;
+					}
+				}
+			});
+		} else {
+			// Add a Magnet in the Center of Shape
+			var magnet = new ORYX.Core.Controls.Magnet();
+			magnet.bounds.centerMoveTo(this.bounds.width() / 2, this.bounds.height() / 2);
+			this.add(magnet);
+		}
+
+		/**initialize docker */
+		var dockerElem = svgDocument.getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_ORYX, "docker");
+
+		if (dockerElem && dockerElem.length > 0) {
+			dockerElem = dockerElem[0];
+			var docker = this.createDocker();
+			var cx = parseFloat(dockerElem.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, "cx"));
+			var cy = parseFloat(dockerElem.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, "cy"));
+			docker.bounds.centerMoveTo({
+				x: cx - offsetX,
+				y: cy - offsetY
+			});
+
+			//get anchors
+			var anchors = dockerElem.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, "anchors");
+			if (anchors) {
+				anchors = anchors.replace("/,/g", " ");
+				anchors = anchors.split(" ").without("");
 
-        /**initialize docker */
-        var dockerElem = svgDocument.getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_ORYX, "docker");
-
-        if (dockerElem && dockerElem.length > 0) {
-            dockerElem = dockerElem[0];
-            var docker = this.createDocker();
-            var cx = parseFloat(dockerElem.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, "cx"));
-            var cy = parseFloat(dockerElem.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, "cy"));
-            docker.bounds.centerMoveTo({
-                x: cx - offsetX,
-                y: cy - offsetY
-            });
-
-            //get anchors
-            var anchors = dockerElem.getAttributeNS(ORYX.CONFIG.NAMESPACE_ORYX, "anchors");
-            if (anchors) {
-                anchors = anchors.replace("/,/g", " ");
-                anchors = anchors.split(" ").without("");
-
-				for(var i = 0; i < anchors.length; i++) {
-					switch(anchors[i].toLowerCase()) {
+				for (var i = 0; i < anchors.length; i++) {
+					switch (anchors[i].toLowerCase()) {
 						case "left":
 							docker.anchorLeft = true;
 							break;
@@ -14944,91 +15324,91 @@ ORYX.Core.Node = {
 							break;
 					}
 				}
-            }
-        }
+			}
+		}
 
-        /**initialize labels*/
-        var textElems = svgNode.getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_SVG, 'text');
-        $A(textElems).each((function(textElem){
-            var label = new ORYX.Core.SVG.Label({
-                textElement: textElem,
+		/**initialize labels*/
+		var textElems = svgNode.getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_SVG, 'text');
+		$A(textElems).each((function (textElem) {
+			var label = new ORYX.Core.SVG.Label({
+				textElement: textElem,
 				shapeId: this.id
-            });
-            label.x -= offsetX;
-            label.y -= offsetY;
-            this._labels[label.id] = label;
+			});
+			label.x -= offsetX;
+			label.y -= offsetY;
+			this._labels[label.id] = label;
 
 			label.registerOnChange(this.layout.bind(this));
 
 			// Only apply fitting on form-components
-			if(this._stencil.id().indexOf(ORYX.CONFIG.FORM_ELEMENT_ID_PREFIX) == 0) {
+			if (this._stencil.id().indexOf(ORYX.CONFIG.FORM_ELEMENT_ID_PREFIX) == 0) {
 				label.registerOnChange(this.fitToLabels.bind(this));
 			}
 
-        }).bind(this));
-    },
-
-    fitToLabels: function() {
-    	var y = 0;
-
-    	this.getLabels().each(function(label){
-    		var lr = label.getY() + label.getHeight();
-    		if(lr > y) {
-    			y = lr;
-    		}
-    	});
-
-    	var bounds = this.bounds;
-    	var boundsChanged = false;
-
-    	if(this.minimumSize) {
-    		// Check if y-value exceeds the min-value. If not, stick to this value.
-    		var minHeight = this.minimumSize.height;
-    		if(y < minHeight && bounds.height() > minHeight && minHeight > this.forcedHeight) {
-    			bounds.set(bounds.upperLeft().x, bounds.upperLeft().y, bounds.lowerRight().x, bounds.upperLeft().y + minHeight);
-    			boundsChanged = true;
-    		} else if(y > minHeight && bounds.height() != y && y > this.forcedHeight){
-    			bounds.set(bounds.upperLeft().x, bounds.upperLeft().y, bounds.lowerRight().x, bounds.upperLeft().y + y);
-    			boundsChanged = true;
-    		} else if(bounds.height() > this.forcedHeight && this.forcedHeight > 0) {
-    			bounds.set(bounds.upperLeft().x, bounds.upperLeft().y, bounds.lowerRight().x, bounds.upperLeft().y + this.forcedHeight);
-    			boundsChanged = true;
-    		}
-    	}
-
-    	if(boundsChanged) {
-    		// Force facade to re-layout since bounds are changed AFTER layout has been performed
-    		if(this.facade.getCanvas() != null) {
+		}).bind(this));
+	},
+
+	fitToLabels: function () {
+		var y = 0;
+
+		this.getLabels().each(function (label) {
+			var lr = label.getY() + label.getHeight();
+			if (lr > y) {
+				y = lr;
+			}
+		});
+
+		var bounds = this.bounds;
+		var boundsChanged = false;
+
+		if (this.minimumSize) {
+			// Check if y-value exceeds the min-value. If not, stick to this value.
+			var minHeight = this.minimumSize.height;
+			if (y < minHeight && bounds.height() > minHeight && minHeight > this.forcedHeight) {
+				bounds.set(bounds.upperLeft().x, bounds.upperLeft().y, bounds.lowerRight().x, bounds.upperLeft().y + minHeight);
+				boundsChanged = true;
+			} else if (y > minHeight && bounds.height() != y && y > this.forcedHeight) {
+				bounds.set(bounds.upperLeft().x, bounds.upperLeft().y, bounds.lowerRight().x, bounds.upperLeft().y + y);
+				boundsChanged = true;
+			} else if (bounds.height() > this.forcedHeight && this.forcedHeight > 0) {
+				bounds.set(bounds.upperLeft().x, bounds.upperLeft().y, bounds.lowerRight().x, bounds.upperLeft().y + this.forcedHeight);
+				boundsChanged = true;
+			}
+		}
+
+		if (boundsChanged) {
+			// Force facade to re-layout since bounds are changed AFTER layout has been performed
+			if (this.facade.getCanvas() != null) {
 				this.facade.getCanvas().update();
 			}
 
-    		// Re-select if needed to force the select
-    		if(this.facade.getSelection().member(this)) {
-    			var selectedNow = this.facade.getSelection();
-    			this.facade.setSelection([]);
-    			this.facade.setSelection(selectedNow);
-    		}
-    	}
-    },
+			// Re-select if needed to force the select
+			if (this.facade.getSelection().member(this)) {
+				var selectedNow = this.facade.getSelection();
+				this.facade.setSelection([]);
+				this.facade.setSelection(selectedNow);
+			}
+		}
+	},
 
 	/**
 	 * Override the Method, that a docker is not shown
 	 *
 	 */
-	createDocker: function() {
+	createDocker: function () {
 		var docker = new ORYX.Core.Controls.Docker({eventHandlerCallback: this.eventHandlerCallback});
 		docker.bounds.registerCallback(this._dockerChangedCallback);
 
-		this.dockers.push( docker );
+		this.dockers.push(docker);
 		docker.parent = this;
 		docker.bounds.registerCallback(this._changedCallback);
 
 		return docker
 	},
 
-    toString: function(){
-        return this._stencil.title() + " " + this.id
-    }
+	toString: function () {
+		return this._stencil.title() + " " + this.id
+	}
 };
 ORYX.Core.Node = ORYX.Core.Shape.extend(ORYX.Core.Node);
 /*
@@ -15049,10 +15429,10 @@ NAMESPACE_ORYX = "http://www.b3mn.org/oryx";
  * Init namespaces
  */
 if (!ORYX) {
-    var ORYX = {};
+	var ORYX = {};
 }
 if (!ORYX.Core) {
-    ORYX.Core = {};
+	ORYX.Core = {};
 }
 
 
@@ -15068,124 +15448,127 @@ if (!ORYX.Core) {
  *
  */
 ORYX.Core.Edge = {
-    /**
-     * Constructor
-     * @param {Object} options
-     * @param {Stencil} stencil
-     */
-    construct: function(options, stencil, facade){
-        arguments.callee.$.construct.apply(this, arguments);
+	/**
+	 * Constructor
+	 * @param {Object} options
+	 * @param {Stencil} stencil
+	 */
+	construct: function (options, stencil, facade) {
+		arguments.callee.$.construct.apply(this, arguments);
 
-        this.isMovable = true;
-        this.isSelectable = true;
+		this.isMovable = true;
+		this.isSelectable = true;
 
 		this._dockerUpdated = false;
 
-        this._markers = new Hash(); //a hash map of SVGMarker objects where keys are the marker ids
-        this._paths = [];
-        this._interactionPaths = [];
-        this._dockersByPath = new Hash();
-        this._markersByPath = new Hash();
+		this._markers = new Hash(); //a hash map of SVGMarker objects where keys are the marker ids
+		this._paths = [];
+		this._interactionPaths = [];
+		this._dockersByPath = new Hash();
+		this._markersByPath = new Hash();
 
 		/* Data structures to store positioning information of attached child nodes */
 		this.attachedNodePositionData = new Hash();
 
-        //TODO was muss hier initial erzeugt werden?
-        var stencilNode = this.node.childNodes[0].childNodes[0];
-        stencilNode = ORYX.Editor.graft("http://www.w3.org/2000/svg", stencilNode, ['g', {
-            "pointer-events": "painted"
-        }]);
+		//TODO was muss hier initial erzeugt werden?
+		var stencilNode = this.node.childNodes[0].childNodes[0];
+		stencilNode = ORYX.Editor.graft("http://www.w3.org/2000/svg", stencilNode, ['g', {
+			"pointer-events": "painted"
+		}]);
 
-        //Add to the EventHandler
-        this.addEventHandlers(stencilNode.parentNode);
+		//Add to the EventHandler
+		this.addEventHandlers(stencilNode.parentNode);
 
 
-        this._oldBounds = this.bounds.clone();
+		this._oldBounds = this.bounds.clone();
 
-        //load stencil
-        this._init(this._stencil.view());
+		//load stencil
+		this._init(this._stencil.view());
 
-        if (stencil instanceof Array) {
-            this.deserialize(stencil);
-        }
+		if (stencil instanceof Array) {
+			this.deserialize(stencil);
+		}
 
-    },
+	},
 
-    _update: function(force){
-        if(this._dockerUpdated || this.isChanged || force) {
+	_update: function (force) {
+		if (this._dockerUpdated || this.isChanged || force) {
 
 			this.dockers.invoke("update");
 
-	        if (false && (this.bounds.width() === 0 || this.bounds.height() === 0)) {
+			if (false && (this.bounds.width() === 0 || this.bounds.height() === 0)) {
 				var width = this.bounds.width();
 				var height = this.bounds.height();
-	            this.bounds.extend({
-	                x: width === 0 ? 2 : 0,
-	                y: height === 0 ? 2 : 0
-	            });
-	            this.bounds.moveBy({
-	                x: width === 0 ? -1 : 0,
-	                y: height === 0 ? -1 : 0
-	            });
-
-	        }
-
-	        // TODO: Bounds muss abhaengig des Eltern-Shapes gesetzt werden
-	        var upL = this.bounds.upperLeft();
-	        var oldUpL = this._oldBounds.upperLeft();
-	        var oldWidth = this._oldBounds.width() === 0 ? this.bounds.width() : this._oldBounds.width();
-	        var oldHeight = this._oldBounds.height() === 0 ? this.bounds.height() : this._oldBounds.height();
-	        var diffX = upL.x - oldUpL.x;
-	        var diffY = upL.y - oldUpL.y;
-	        var diffWidth = (this.bounds.width() / oldWidth) || 1;
-	        var diffHeight = (this.bounds.height() / oldHeight) || 1;
-
-	        this.dockers.each((function(docker){
-	            // Unregister on BoundsChangedCallback
-	            docker.bounds.unregisterCallback(this._dockerChangedCallback);
-
-	            // If there is any changes at the edge and is there is not an DockersUpdate
-	            // set the new bounds to the docker
-	            if (!this._dockerUpdated) {
-	                docker.bounds.moveBy(diffX, diffY);
-
-	                if (diffWidth !== 1 || diffHeight !== 1) {
-	                    var relX = docker.bounds.upperLeft().x - upL.x;
-	                    var relY = docker.bounds.upperLeft().y - upL.y;
-
-	                    docker.bounds.moveTo(upL.x + relX * diffWidth, upL.y + relY * diffHeight);
-	                }
-	            }
-	            // Do Docker update and register on DockersBoundChange
-	            docker.update();
-	            docker.bounds.registerCallback(this._dockerChangedCallback);
-
-	        }).bind(this));
-
-	        if (this._dockerUpdated) {
-	            var a = this.dockers.first().bounds.center();
-	            var b = this.dockers.first().bounds.center();
-
-	            this.dockers.each((function(docker){
-	                var center = docker.bounds.center();
-	                a.x = Math.min(a.x, center.x);
-	                a.y = Math.min(a.y, center.y);
-	                b.x = Math.max(b.x, center.x);
-	                b.y = Math.max(b.y, center.y);
-	            }).bind(this));
-
-	            //set the bounds of the the association
-	            this.bounds.set(Object.clone(a), Object.clone(b));
-	        }
-
-			upL = this.bounds.upperLeft(); oldUpL = this._oldBounds.upperLeft();
-			diffWidth = (this.bounds.width() / (oldWidth||this.bounds.width())); diffHeight = (this.bounds.height() / (oldHeight||this.bounds.height()));
-	        diffX = upL.x - oldUpL.x; diffY = upL.y - oldUpL.y;
+				this.bounds.extend({
+					x: width === 0 ? 2 : 0,
+					y: height === 0 ? 2 : 0
+				});
+				this.bounds.moveBy({
+					x: width === 0 ? -1 : 0,
+					y: height === 0 ? -1 : 0
+				});
+
+			}
+
+			// TODO: Bounds muss abhaengig des Eltern-Shapes gesetzt werden
+			var upL = this.bounds.upperLeft();
+			var oldUpL = this._oldBounds.upperLeft();
+			var oldWidth = this._oldBounds.width() === 0 ? this.bounds.width() : this._oldBounds.width();
+			var oldHeight = this._oldBounds.height() === 0 ? this.bounds.height() : this._oldBounds.height();
+			var diffX = upL.x - oldUpL.x;
+			var diffY = upL.y - oldUpL.y;
+			var diffWidth = (this.bounds.width() / oldWidth) || 1;
+			var diffHeight = (this.bounds.height() / oldHeight) || 1;
+
+			this.dockers.each((function (docker) {
+				// Unregister on BoundsChangedCallback
+				docker.bounds.unregisterCallback(this._dockerChangedCallback);
+
+				// If there is any changes at the edge and is there is not an DockersUpdate
+				// set the new bounds to the docker
+				if (!this._dockerUpdated) {
+					docker.bounds.moveBy(diffX, diffY);
+
+					if (diffWidth !== 1 || diffHeight !== 1) {
+						var relX = docker.bounds.upperLeft().x - upL.x;
+						var relY = docker.bounds.upperLeft().y - upL.y;
+
+						docker.bounds.moveTo(upL.x + relX * diffWidth, upL.y + relY * diffHeight);
+					}
+				}
+				// Do Docker update and register on DockersBoundChange
+				docker.update();
+				docker.bounds.registerCallback(this._dockerChangedCallback);
+
+			}).bind(this));
+
+			if (this._dockerUpdated) {
+				var a = this.dockers.first().bounds.center();
+				var b = this.dockers.first().bounds.center();
+
+				this.dockers.each((function (docker) {
+					var center = docker.bounds.center();
+					a.x = Math.min(a.x, center.x);
+					a.y = Math.min(a.y, center.y);
+					b.x = Math.max(b.x, center.x);
+					b.y = Math.max(b.y, center.y);
+				}).bind(this));
+
+				//set the bounds of the the association
+				this.bounds.set(Object.clone(a), Object.clone(b));
+			}
+
+			upL = this.bounds.upperLeft();
+			oldUpL = this._oldBounds.upperLeft();
+			diffWidth = (this.bounds.width() / (oldWidth || this.bounds.width()));
+			diffHeight = (this.bounds.height() / (oldHeight || this.bounds.height()));
+			diffX = upL.x - oldUpL.x;
+			diffY = upL.y - oldUpL.y;
 
 			//reposition labels
-			this.getLabels().each(function(label) {
+			this.getLabels().each(function (label) {
 
-				if (label.getReferencePoint()){
+				if (label.getReferencePoint()) {
 					var ref = label.getReferencePoint();
 					var from = ref.segment.from, to = ref.segment.to;
 					if (!from || !from.parent || !to || !to.parent) {
@@ -15195,7 +15578,7 @@ ORYX.Core.Edge = {
 					var fromPosition = from.bounds.center(), toPosition = to.bounds.center();
 
 					if (fromPosition.x === ref.segment.fromPosition.x && fromPosition.y === ref.segment.fromPosition.y &&
-						toPosition.x === ref.segment.toPosition.x && toPosition.y === ref.segment.toPosition.y && !ref.dirty){
+						toPosition.x === ref.segment.toPosition.x && toPosition.y === ref.segment.toPosition.y && !ref.dirty) {
 						return;
 					}
 
@@ -15206,40 +15589,48 @@ ORYX.Core.Edge = {
 						/**
 						 * Set position
 						 */
-						// Get the orthogonal identity vector of the current segment
+							// Get the orthogonal identity vector of the current segment
 						var oiv = ORYX.Core.Math.getOrthogonalIdentityVector(fromPosition, toPosition);
-						var isHor = Math.abs(oiv.y)===1, isVer = Math.abs(oiv.x)===1;
-						oiv.x *= ref.distance; oiv.y *= ref.distance; 				// vector * distance
-						oiv.x += newIntersection.x; oiv.y += newIntersection.y; 	// vector + the intersection point
-						var mx = isHor && ref.orientation && (ref.iorientation||ref.orientation).endsWith("r") ? -label.getWidth() : 0;
-						var my = isVer && ref.orientation && (ref.iorientation||ref.orientation).startsWith("l") ? -label.getHeight()+2 : 0;
-						label.setX(oiv.x+mx); label.setY(oiv.y+my);
+						var isHor = Math.abs(oiv.y) === 1, isVer = Math.abs(oiv.x) === 1;
+						oiv.x *= ref.distance;
+						oiv.y *= ref.distance; 				// vector * distance
+						oiv.x += newIntersection.x;
+						oiv.y += newIntersection.y; 	// vector + the intersection point
+						var mx = isHor && ref.orientation && (ref.iorientation || ref.orientation).endsWith("r") ? -label.getWidth() : 0;
+						var my = isVer && ref.orientation && (ref.iorientation || ref.orientation).startsWith("l") ? -label.getHeight() + 2 : 0;
+						label.setX(oiv.x + mx);
+						label.setY(oiv.y + my);
 
 						// Update the reference point
 						this.updateReferencePointOfLabel(label, newIntersection, from, to);
 					} else {
 						var oiv = ORYX.Core.Math.getOrthogonalIdentityVector(fromPosition, toPosition);
-						oiv.x *= ref.distance; oiv.y *= ref.distance; // vector * distance
-						oiv.x += ref.intersection.x; oiv.y += ref.intersection.y; // vector + the intersection point
-						label.setX(oiv.x); label.setY(oiv.y);
-						ref.segment.fromPosition = fromPosition; ref.segment.toPosition = toPosition;
+						oiv.x *= ref.distance;
+						oiv.y *= ref.distance; // vector * distance
+						oiv.x += ref.intersection.x;
+						oiv.y += ref.intersection.y; // vector + the intersection point
+						label.setX(oiv.x);
+						label.setY(oiv.y);
+						ref.segment.fromPosition = fromPosition;
+						ref.segment.toPosition = toPosition;
 					}
 
 					return;
 				}
 
 				// Update label position if no reference point is set
-				if (label.position && !this.parent.initializingShapes){
-					var x = label.position.x + (diffX * (diffWidth||1));
-					if (x > this.bounds.lowerRight().x){
-						x += this.bounds.width()-(this.bounds.width()/(diffWidth||1));
+				if (label.position && !this.parent.initializingShapes) {
+					var x = label.position.x + (diffX * (diffWidth || 1));
+					if (x > this.bounds.lowerRight().x) {
+						x += this.bounds.width() - (this.bounds.width() / (diffWidth || 1));
 					}
 
-					var y = label.position.y + (diffY * (diffHeight||1));
-					if (y > this.bounds.lowerRight().y){
-						y += this.bounds.height()-(this.bounds.height()/(diffHeight||1));
+					var y = label.position.y + (diffY * (diffHeight || 1));
+					if (y > this.bounds.lowerRight().y) {
+						y += this.bounds.height() - (this.bounds.height() / (diffHeight || 1));
 					}
-					label.setX(x);label.setY(y);
+					label.setX(x);
+					label.setY(y);
 					return;
 				}
 
@@ -15305,11 +15696,11 @@ ORYX.Core.Edge = {
 						break;
 					case "midtop":
 						var numOfDockers = this.dockers.length;
-						if(numOfDockers%2 == 0) {
-							var angle = this._getAngle(this.dockers[numOfDockers/2-1], this.dockers[numOfDockers/2])
-							var pos1 = this.dockers[numOfDockers/2-1].bounds.center();
-							var pos2 = this.dockers[numOfDockers/2].bounds.center();
-							var pos = {x:(pos1.x + pos2.x)/2.0, y:(pos1.y+pos2.y)/2.0};
+						if (numOfDockers % 2 == 0) {
+							var angle = this._getAngle(this.dockers[numOfDockers / 2 - 1], this.dockers[numOfDockers / 2])
+							var pos1 = this.dockers[numOfDockers / 2 - 1].bounds.center();
+							var pos2 = this.dockers[numOfDockers / 2].bounds.center();
+							var pos = {x: (pos1.x + pos2.x) / 2.0, y: (pos1.y + pos2.y) / 2.0};
 
 							label.horizontalAlign("center");
 							label.verticalAlign("bottom");
@@ -15322,8 +15713,8 @@ ORYX.Core.Edge = {
 								label.rotate(180 - angle, pos);
 							}
 						} else {
-							var index = parseInt(numOfDockers/2);
-							var angle = this._getAngle(this.dockers[index], this.dockers[index+1])
+							var index = parseInt(numOfDockers / 2);
+							var angle = this._getAngle(this.dockers[index], this.dockers[index + 1])
 							var pos = this.dockers[index].bounds.center();
 
 							if (angle <= 90 || angle > 270) {
@@ -15344,11 +15735,11 @@ ORYX.Core.Edge = {
 						break;
 					case "midbottom":
 						var numOfDockers = this.dockers.length;
-						if(numOfDockers%2 == 0) {
-							var angle = this._getAngle(this.dockers[numOfDockers/2-1], this.dockers[numOfDockers/2])
-							var pos1 = this.dockers[numOfDockers/2-1].bounds.center();
-							var pos2 = this.dockers[numOfDockers/2].bounds.center();
-							var pos = {x:(pos1.x + pos2.x)/2.0, y:(pos1.y+pos2.y)/2.0};
+						if (numOfDockers % 2 == 0) {
+							var angle = this._getAngle(this.dockers[numOfDockers / 2 - 1], this.dockers[numOfDockers / 2])
+							var pos1 = this.dockers[numOfDockers / 2 - 1].bounds.center();
+							var pos2 = this.dockers[numOfDockers / 2].bounds.center();
+							var pos = {x: (pos1.x + pos2.x) / 2.0, y: (pos1.y + pos2.y) / 2.0};
 
 							label.horizontalAlign("center");
 							label.verticalAlign("top");
@@ -15361,8 +15752,8 @@ ORYX.Core.Edge = {
 								label.rotate(180 - angle, pos);
 							}
 						} else {
-							var index = parseInt(numOfDockers/2);
-							var angle = this._getAngle(this.dockers[index], this.dockers[index+1])
+							var index = parseInt(numOfDockers / 2);
+							var angle = this._getAngle(this.dockers[index], this.dockers[index + 1])
 							var pos = this.dockers[index].bounds.center();
 
 							if (angle <= 90 || angle > 270) {
@@ -15383,7 +15774,7 @@ ORYX.Core.Edge = {
 						break;
 					case "endtop":
 						var length = this.dockers.length;
-						var angle = this._getAngle(this.dockers[length-2], this.dockers[length-1]);
+						var angle = this._getAngle(this.dockers[length - 2], this.dockers[length - 1]);
 						var pos = this.dockers.last().bounds.center();
 
 						if (angle <= 90 || angle > 270) {
@@ -15403,7 +15794,7 @@ ORYX.Core.Edge = {
 						break;
 					case "endbottom":
 						var length = this.dockers.length;
-						var angle = this._getAngle(this.dockers[length-2], this.dockers[length-1]);
+						var angle = this._getAngle(this.dockers[length - 2], this.dockers[length - 1]);
 						var pos = this.dockers.last().bounds.center();
 
 						if (angle <= 90 || angle > 270) {
@@ -15424,8 +15815,8 @@ ORYX.Core.Edge = {
 				}
 			}.bind(this));
 
-			this.children.each(function(value) {
-				if(value instanceof ORYX.Core.Node) {
+			this.children.each(function (value) {
+				if (value instanceof ORYX.Core.Node) {
 					this.calculatePositionOfAttachedChildNode.call(this, value);
 				}
 			}.bind(this));
@@ -15437,35 +15828,34 @@ ORYX.Core.Edge = {
 			this._dockerUpdated = false;
 
 			this._oldBounds = this.bounds.clone();
-        }
+		}
 
 
-  	    // IE10 specific fix, start and end-markes get left behind when moving path
+		// IE10 specific fix, start and end-markes get left behind when moving path
 		var userAgent = navigator.userAgent;
-		if (navigator.appVersion.indexOf("MSIE 10") !== -1 || (userAgent.indexOf('Trident') !== -1 && userAgent.indexOf('rv:11') !== -1))
-		{
+		if (navigator.appVersion.indexOf("MSIE 10") !== -1 || (userAgent.indexOf('Trident') !== -1 && userAgent.indexOf('rv:11') !== -1)) {
 			this.node.parentNode.insertBefore(this.node, this.node);
 		}
-    },
+	},
 
 	/**
 	 *  Moves a point to the upperLeft of a node's bounds.
 	 *
 	 *  @param {point} point
-	 *  	The point to move
+	 *    The point to move
 	 *  @param {ORYX.Core.Bounds} bounds
-	 *  	The Bounds of the related noe
+	 *    The Bounds of the related noe
 	 */
-	movePointToUpperLeftOfNode: function(point, bounds) {
-		point.x -= bounds.width()/2;
-		point.y -= bounds.height()/2;
+	movePointToUpperLeftOfNode: function (point, bounds) {
+		point.x -= bounds.width() / 2;
+		point.y -= bounds.height() / 2;
 	},
 
 	/**
 	 * Refreshes the visual representation of edge's attached nodes.
 	 */
-	refreshAttachedNodes: function() {
-		this.attachedNodePositionData.values().each(function(nodeData) {
+	refreshAttachedNodes: function () {
+		this.attachedNodePositionData.values().each(function (nodeData) {
 			var startPoint = nodeData.segment.docker1.bounds.center();
 			var endPoint = nodeData.segment.docker2.bounds.center();
 			this.relativizePoint(startPoint);
@@ -15475,13 +15865,13 @@ ORYX.Core.Edge = {
 
 			/* Calculate new x-coordinate */
 			newNodePosition.x = startPoint.x
-								+ nodeData.relativDistanceFromDocker1
-									* (endPoint.x - startPoint.x);
+				+ nodeData.relativDistanceFromDocker1
+				* (endPoint.x - startPoint.x);
 
 			/* Calculate new y-coordinate */
 			newNodePosition.y = startPoint.y
-								+ nodeData.relativDistanceFromDocker1
-									* (endPoint.y - startPoint.y);
+				+ nodeData.relativDistanceFromDocker1
+				* (endPoint.y - startPoint.y);
 
 			/* Convert new position to the upper left of the node */
 			this.movePointToUpperLeftOfNode(newNodePosition, nodeData.node.bounds);
@@ -15498,30 +15888,29 @@ ORYX.Core.Edge = {
 	 * the path of the edge.
 	 *
 	 * @param {node}
-	 * 		The node to calculate the new position
+	 *        The node to calculate the new position
 	 * @return {Point}
-	 * 		The calculated upper left point of the node's shape.
+	 *        The calculated upper left point of the node's shape.
 	 */
-	calculatePositionOfAttachedChildNode: function(node) {
+	calculatePositionOfAttachedChildNode: function (node) {
 		/* Initialize position */
 		var position = new Object();
 		position.x = 0;
 		position.y = 0;
 
 		/* Case: Node was just added */
-		if(!this.attachedNodePositionData[node.getId()]) {
+		if (!this.attachedNodePositionData[node.getId()]) {
 			this.attachedNodePositionData[node.getId()] = new Object();
 			this.attachedNodePositionData[node.getId()]
-					.relativDistanceFromDocker1 = 0;
+				.relativDistanceFromDocker1 = 0;
 			this.attachedNodePositionData[node.getId()].node = node;
 			this.attachedNodePositionData[node.getId()].segment = new Object();
 			this.findEdgeSegmentForNode(node);
-		}else if(node.isChanged) {
+		} else if (node.isChanged) {
 			this.findEdgeSegmentForNode(node);
 		}
 
 
-
 	},
 
 	/**
@@ -15529,34 +15918,34 @@ ORYX.Core.Edge = {
 	 * The segment is choosen, which has the smallest distance to the node.
 	 *
 	 * @param {ORYX.Core.Node} node
-	 * 		The concerning node
+	 *        The concerning node
 	 */
-	findEdgeSegmentForNode: function(node) {
+	findEdgeSegmentForNode: function (node) {
 		var length = this.dockers.length;
 		var smallestDistance = undefined;
 
-		for(i=1;i<length;i++) {
-			var lineP1 = this.dockers[i-1].bounds.center();
+		for (i = 1; i < length; i++) {
+			var lineP1 = this.dockers[i - 1].bounds.center();
 			var lineP2 = this.dockers[i].bounds.center();
 			this.relativizePoint(lineP1);
 			this.relativizePoint(lineP2);
 
 			var nodeCenterPoint = node.bounds.center();
 			var distance = ORYX.Core.Math.distancePointLinie(
-															lineP1,
-															lineP2,
-															nodeCenterPoint,
-															true);
+				lineP1,
+				lineP2,
+				nodeCenterPoint,
+				true);
 
-			if((distance || distance == 0) && ((!smallestDistance && smallestDistance != 0)
-						|| distance < smallestDistance)) {
+			if ((distance || distance == 0) && ((!smallestDistance && smallestDistance != 0)
+				|| distance < smallestDistance)) {
 
 				smallestDistance = distance;
 
 				this.attachedNodePositionData[node.getId()].segment.docker1 =
-													this.dockers[i-1];
+					this.dockers[i - 1];
 				this.attachedNodePositionData[node.getId()].segment.docker2 =
-													this.dockers[i];
+					this.dockers[i];
 
 			}
 
@@ -15566,22 +15955,22 @@ ORYX.Core.Edge = {
 			 * In this case choose the nearest docker as attaching point.
 			 *
 			 */
-			if(!distance && !smallestDistance && smallestDistance != 0) {
+			if (!distance && !smallestDistance && smallestDistance != 0) {
 				(ORYX.Core.Math.getDistancePointToPoint(nodeCenterPoint, lineP1)
 					< ORYX.Core.Math.getDistancePointToPoint(nodeCenterPoint, lineP2)) ?
 					this.attachedNodePositionData[node.getId()].relativDistanceFromDocker1 = 0 :
 					this.attachedNodePositionData[node.getId()].relativDistanceFromDocker1 = 1;
 				this.attachedNodePositionData[node.getId()].segment.docker1 =
-													this.dockers[i-1];
+					this.dockers[i - 1];
 				this.attachedNodePositionData[node.getId()].segment.docker2 =
-													this.dockers[i];
+					this.dockers[i];
 			}
 		}
 
 		/* Calculate position on edge segment for the node */
-		if(smallestDistance || smallestDistance == 0) {
+		if (smallestDistance || smallestDistance == 0) {
 			this.attachedNodePositionData[node.getId()].relativDistanceFromDocker1 =
-			this.getLineParameterForPosition(
+				this.getLineParameterForPosition(
 					this.attachedNodePositionData[node.getId()].segment.docker1,
 					this.attachedNodePositionData[node.getId()].segment.docker2,
 					node);
@@ -15594,7 +15983,7 @@ ORYX.Core.Edge = {
 	 * @param {ORYX.Core.Node|Object} node or position
 	 * @return {Object} An object with the following attribute: {ORYX.Core.Docker} fromDocker, {ORYX.Core.Docker} toDocker, {X/Y} position, {int} distance
 	 */
- 	findSegment: function(node){
+	findSegment: function (node) {
 
 		var length = this.dockers.length;
 		var result;
@@ -15624,26 +16013,26 @@ ORYX.Core.Edge = {
 	 * line defined by docker1 and docker2.
 	 *
 	 * @param {point} docker1
-	 * 		The docker that defines the start of the line segment
+	 *        The docker that defines the start of the line segment
 	 * @param {point} docker2
-	 * 		The docker that defines the end of the line segment
+	 *        The docker that defines the end of the line segment
 	 * @param {ORYX.Core.Node} node
-	 * 		The concerning node
+	 *        The concerning node
 	 *
 	 * @return {float} positionParameter
-	 * 		The scalar value to determine the position on the line
+	 *        The scalar value to determine the position on the line
 	 */
-	getLineParameterForPosition: function(docker1, docker2, node) {
+	getLineParameterForPosition: function (docker1, docker2, node) {
 		var dockerPoint1 = docker1.bounds.center();
 		var dockerPoint2 = docker2.bounds.center();
 		this.relativizePoint(dockerPoint1);
 		this.relativizePoint(dockerPoint2);
 
 		var intersectionPoint = ORYX.Core.Math.getPointOfIntersectionPointLine(
-									dockerPoint1,
-									dockerPoint2,
-									node.bounds.center(), true);
-		if(!intersectionPoint) {
+			dockerPoint1,
+			dockerPoint2,
+			node.bounds.center(), true);
+		if (!intersectionPoint) {
 			return 0;
 		}
 
@@ -15657,9 +16046,9 @@ ORYX.Core.Edge = {
 	 * Makes point relative to the upper left of the edge's bound.
 	 *
 	 * @param {point} point
-	 * 		The point to relativize
+	 *        The point to relativize
 	 */
-	relativizePoint: function(point) {
+	relativizePoint: function (point) {
 		point.x -= this.bounds.upperLeft().x;
 		point.y -= this.bounds.upperLeft().y;
 	},
@@ -15671,14 +16060,14 @@ ORYX.Core.Edge = {
 	 * moves.
 	 *
 	 */
-	optimizedUpdate: function(){
+	optimizedUpdate: function () {
 
-		var updateDocker = function(docker){
+		var updateDocker = function (docker) {
 			if (!docker._dockedShape || !docker._dockedShapeBounds)
 				return;
 			var off = {
-			    x: docker._dockedShape.bounds.a.x - docker._dockedShapeBounds.a.x,
-			    y: docker._dockedShape.bounds.a.y - docker._dockedShapeBounds.a.y
+				x: docker._dockedShape.bounds.a.x - docker._dockedShapeBounds.a.x,
+				y: docker._dockedShape.bounds.a.y - docker._dockedShapeBounds.a.y
 			};
 			docker.bounds.moveBy(off);
 			docker._dockedShapeBounds.moveBy(off);
@@ -15690,90 +16079,91 @@ ORYX.Core.Edge = {
 		this.refresh();
 	},
 
-    refresh: function(){
-        //call base class refresh method
-        arguments.callee.$.refresh.apply(this, arguments);
+	refresh: function () {
+		//call base class refresh method
+		arguments.callee.$.refresh.apply(this, arguments);
 
-        //TODO consider points for marker mids
-        var lastPoint;
-        this._paths.each((function(path, index){
-            var dockers = this._dockersByPath[path.id];
-            var c = undefined;
+		//TODO consider points for marker mids
+		var lastPoint;
+		this._paths.each((function (path, index) {
+			var dockers = this._dockersByPath[path.id];
+			var c = undefined;
 			var d = undefined;
-            if (lastPoint) {
-                d = "M" + lastPoint.x + " " + lastPoint.y;
-            }
-            else {
-                c = dockers[0].bounds.center();
-                lastPoint = c;
+			if (lastPoint) {
+				d = "M" + lastPoint.x + " " + lastPoint.y;
+			} else {
+				c = dockers[0].bounds.center();
+				lastPoint = c;
 
-                d = "M" + c.x + " " + c.y;
-            }
+				d = "M" + c.x + " " + c.y;
+			}
 
-            for (var i = 1; i < dockers.length; i++) {
-                // for each docker, draw a line to the center
-                c = dockers[i].bounds.center();
-                d = d + "L" + c.x + " " + c.y + " ";
-                lastPoint = c;
-            }
+			for (var i = 1; i < dockers.length; i++) {
+				// for each docker, draw a line to the center
+				c = dockers[i].bounds.center();
+				d = d + "L" + c.x + " " + c.y + " ";
+				lastPoint = c;
+			}
 
-            path.setAttributeNS(null, "d", d);
-            this._interactionPaths[index].setAttributeNS(null, "d", d);
+			path.setAttributeNS(null, "d", d);
+			this._interactionPaths[index].setAttributeNS(null, "d", d);
 
-        }).bind(this));
+		}).bind(this));
 
 
 		/* move child shapes of an edge */
-		if(this.getChildNodes().length > 0) {
-	        var x = this.bounds.upperLeft().x;
-	        var y = this.bounds.upperLeft().y;
+		if (this.getChildNodes().length > 0) {
+			var x = this.bounds.upperLeft().x;
+			var y = this.bounds.upperLeft().y;
 
 			this.node.firstChild.childNodes[1].setAttributeNS(null, "transform", "translate(" + x + ", " + y + ")");
 		}
 
-    },
+	},
 
-    /**
-     * Calculate the Border Intersection Point between two points
-     * @param {PointA}
-     * @param {PointB}
-     */
-    getIntersectionPoint: function(){
+	/**
+	 * Calculate the Border Intersection Point between two points
+	 * @param {PointA}
+	 * @param {PointB}
+	 */
+	getIntersectionPoint: function () {
 
-        var length = Math.floor(this.dockers.length / 2)
+		var length = Math.floor(this.dockers.length / 2)
 
-        return ORYX.Core.Math.midPoint(this.dockers[length - 1].bounds.center(), this.dockers[length].bounds.center())
-    },
+		return ORYX.Core.Math.midPoint(this.dockers[length - 1].bounds.center(), this.dockers[length].bounds.center())
+	},
 
 	/**
-     * Returns TRUE if the bounds is over the edge
-     * @param {Bounds}
-     *
-     */
-    isBoundsIncluded: function(bounds){
+	 * Returns TRUE if the bounds is over the edge
+	 * @param {Bounds}
+	 *
+	 */
+	isBoundsIncluded: function (bounds) {
 		var dockers = this.dockers, size = dockers.length;
-		return dockers.any(function(docker, i){
-			if (i == size-1){ return false; }
+		return dockers.any(function (docker, i) {
+			if (i == size - 1) {
+				return false;
+			}
 			var a = docker.bounds.center();
-			var b = dockers[i+1].bounds.center();
+			var b = dockers[i + 1].bounds.center();
 
 			return ORYX.Core.Math.isRectOverLine(a.x, a.y, b.x, b.y, bounds.a.x, bounds.a.y, bounds.b.x, bounds.b.y);
 		});
 	},
 
-    /**
-     * Calculate if the point is inside the Shape
-     * @param {PointX}
-     * @param {PointY}
-     */
-    isPointIncluded: function(pointX, pointY){
+	/**
+	 * Calculate if the point is inside the Shape
+	 * @param {PointX}
+	 * @param {PointY}
+	 */
+	isPointIncluded: function (pointX, pointY) {
 
-        var isbetweenAB = this.absoluteBounds().isIncluded(pointX, pointY,
-												ORYX.CONFIG.OFFSET_EDGE_BOUNDS);
+		var isbetweenAB = this.absoluteBounds().isIncluded(pointX, pointY,
+			ORYX.CONFIG.OFFSET_EDGE_BOUNDS);
 
 		var isPointIncluded = undefined;
 
-        if (isbetweenAB && this.dockers.length > 0) {
+		if (isbetweenAB && this.dockers.length > 0) {
 
 			var i = 0;
 			var point1, point2;
@@ -15785,9 +16175,9 @@ ORYX.Core.Edge = {
 				point2 = this.dockers[++i].bounds.center();
 
 				isPointIncluded = ORYX.Core.Math.isPointInLine(pointX, pointY,
-											point1.x, point1.y,
-											point2.x, point2.y,
-											ORYX.CONFIG.OFFSET_EDGE_BOUNDS);
+					point1.x, point1.y,
+					point2.x, point2.y,
+					ORYX.CONFIG.OFFSET_EDGE_BOUNDS);
 
 			} while (!isPointIncluded && i < this.dockers.length - 1)
 
@@ -15795,15 +16185,15 @@ ORYX.Core.Edge = {
 
 		return isPointIncluded;
 
-    },
+	},
 
 
-    /**
-     * Calculate if the point is over an special offset area
-     * @param {Point}
-     */
-    isPointOverOffset: function(){
-		return  false
+	/**
+	 * Calculate if the point is over an special offset area
+	 * @param {Point}
+	 */
+	isPointOverOffset: function () {
+		return false
 	},
 
 	/**
@@ -15813,51 +16203,51 @@ ORYX.Core.Edge = {
 	 * @return {Boolean}
 	 *
 	 */
-	containsNode: function(node){
+	containsNode: function (node) {
 		if (this._paths.include(node) ||
-       		this._interactionPaths.include(node)){
+			this._interactionPaths.include(node)) {
 			return true;
 		}
 		return false;
 	},
 
 	/**
-	* Returns the angle of the line between two dockers
-	* (0 - 359.99999999)
-	*/
-	_getAngle: function(docker1, docker2) {
+	 * Returns the angle of the line between two dockers
+	 * (0 - 359.99999999)
+	 */
+	_getAngle: function (docker1, docker2) {
 		var p1 = docker1 instanceof ORYX.Core.Controls.Docker ? docker1.absoluteCenterXY() : docker1;
 		var p2 = docker2 instanceof ORYX.Core.Controls.Docker ? docker2.absoluteCenterXY() : docker2;
 
 		return ORYX.Core.Math.getAngle(p1, p2);
 	},
 
-    alignDockers: function(){
-        this._update(true);
+	alignDockers: function () {
+		this._update(true);
 
-        var firstPoint = this.dockers.first().bounds.center();
-        var lastPoint = this.dockers.last().bounds.center();
+		var firstPoint = this.dockers.first().bounds.center();
+		var lastPoint = this.dockers.last().bounds.center();
 
-        var deltaX = lastPoint.x - firstPoint.x;
-        var deltaY = lastPoint.y - firstPoint.y;
+		var deltaX = lastPoint.x - firstPoint.x;
+		var deltaY = lastPoint.y - firstPoint.y;
 
-        var numOfDockers = this.dockers.length - 1;
+		var numOfDockers = this.dockers.length - 1;
 
-        this.dockers.each((function(docker, index){
-            var part = index / numOfDockers;
-            docker.bounds.unregisterCallback(this._dockerChangedCallback);
-            docker.bounds.moveTo(firstPoint.x + part * deltaX, firstPoint.y + part * deltaY);
-            docker.bounds.registerCallback(this._dockerChangedCallback);
-        }).bind(this));
+		this.dockers.each((function (docker, index) {
+			var part = index / numOfDockers;
+			docker.bounds.unregisterCallback(this._dockerChangedCallback);
+			docker.bounds.moveTo(firstPoint.x + part * deltaX, firstPoint.y + part * deltaY);
+			docker.bounds.registerCallback(this._dockerChangedCallback);
+		}).bind(this));
 
-        this._dockerChanged();
-    },
+		this._dockerChanged();
+	},
 
-	add: function(shape){
-        arguments.callee.$.add.apply(this, arguments);
+	add: function (shape) {
+		arguments.callee.$.add.apply(this, arguments);
 
 		// If the new shape is a Docker which is not contained
-		if (shape instanceof ORYX.Core.Controls.Docker && this.dockers.include(shape)){
+		if (shape instanceof ORYX.Core.Controls.Docker && this.dockers.include(shape)) {
 			// Add it to the dockers list ordered by paths
 			var pathArray = this._dockersByPath.values()[0];
 			if (pathArray) {
@@ -15873,40 +16263,44 @@ ORYX.Core.Edge = {
 	 * Performs nessary adjustments on the edge's child shapes.
 	 *
 	 * @param {ORYX.Core.Controls.Docker} docker
-	 * 		The added docker
+	 *        The added docker
 	 */
-	handleChildShapesAfterAddDocker: function(docker) {
+	handleChildShapesAfterAddDocker: function (docker) {
 		/* Ensure type of Docker */
-		if(!docker instanceof ORYX.Core.Controls.Docker) {return undefined;}
+		if (!docker instanceof ORYX.Core.Controls.Docker) {
+			return undefined;
+		}
 
 		var index = this.dockers.indexOf(docker);
-		if(!(0 < index && index < this.dockers.length - 1)) {
-		/* Exception: Expect added docker between first and last node of the edge */
+		if (!(0 < index && index < this.dockers.length - 1)) {
+			/* Exception: Expect added docker between first and last node of the edge */
 			return undefined;
 		}
 
 		/* Get child nodes concerning the segment of the new docker */
-		var startDocker = this.dockers[index-1];
-		var endDocker = this.dockers[index+1];
+		var startDocker = this.dockers[index - 1];
+		var endDocker = this.dockers[index + 1];
 
 		/* Adjust the position of edge's child nodes */
 		var segmentElements =
 			this.getAttachedNodePositionDataForSegment(startDocker, endDocker);
 
 		var lengthSegmentPart1 = ORYX.Core.Math.getDistancePointToPoint(
-										startDocker.bounds.center(),
-										docker.bounds.center());
+			startDocker.bounds.center(),
+			docker.bounds.center());
 		var lengthSegmentPart2 = ORYX.Core.Math.getDistancePointToPoint(
-										endDocker.bounds.center(),
-										docker.bounds.center());
+			endDocker.bounds.center(),
+			docker.bounds.center());
 
-		if(!(lengthSegmentPart1 + lengthSegmentPart2)) {return;}
+		if (!(lengthSegmentPart1 + lengthSegmentPart2)) {
+			return;
+		}
 
 		var relativDockerPosition = lengthSegmentPart1 / (lengthSegmentPart1 + lengthSegmentPart2);
 
-		segmentElements.each(function(nodePositionData) {
+		segmentElements.each(function (nodePositionData) {
 			/* Assign child node to the new segment */
-			if(nodePositionData.value.relativDistanceFromDocker1 < relativDockerPosition) {
+			if (nodePositionData.value.relativDistanceFromDocker1 < relativDockerPosition) {
 				/* Case: before added Docker */
 				nodePositionData.value.segment.docker2 = docker;
 				nodePositionData.value.relativDistanceFromDocker1 =
@@ -15916,40 +16310,40 @@ ORYX.Core.Edge = {
 				nodePositionData.value.segment.docker1 = docker;
 				var newFullDistance = 1 - relativDockerPosition;
 				var relativPartOfSegment =
-							nodePositionData.value.relativDistanceFromDocker1
-							- relativDockerPosition;
+					nodePositionData.value.relativDistanceFromDocker1
+					- relativDockerPosition;
 
 				nodePositionData.value.relativDistanceFromDocker1 =
-										relativPartOfSegment / newFullDistance;
+					relativPartOfSegment / newFullDistance;
 
 			}
 		})
 
 
 		// Update all labels reference points
-		this.getLabels().each(function(label){
+		this.getLabels().each(function (label) {
 
 			var ref = label.getReferencePoint();
 			if (!ref) {
 				return;
 			}
 			var index = this.dockers.indexOf(docker);
-			if (index >= ref.segment.fromIndex && index <= ref.segment.toIndex){
+			if (index >= ref.segment.fromIndex && index <= ref.segment.toIndex) {
 
 				var segment = this.findSegment(ref.intersection);
-				if (!segment){
+				if (!segment) {
 					// Choose whether the first of the last segment
-					segment.fromDocker = ref.segment.fromIndex >= (this.dockers.length/2) ? this.dockers[0] : this.dockers[this.dockers.length-2];
-					segment.toDocker = this.dockers[this.dockers.indexOf(from)+1]; // The next one if the to docker
+					segment.fromDocker = ref.segment.fromIndex >= (this.dockers.length / 2) ? this.dockers[0] : this.dockers[this.dockers.length - 2];
+					segment.toDocker = this.dockers[this.dockers.indexOf(from) + 1]; // The next one if the to docker
 				}
 
 				var fromPosition = segment.fromDocker.bounds.center(), toPosition = segment.toDocker.bounds.center();
 
 				var intersection = ORYX.Core.Math.getPointOfIntersectionPointLine(
-										fromPosition, 		// P1 - Center of the first docker
-										toPosition, 		// P2 - Center of the second docker
-										ref.intersection, 	// P3 - Center of the label
-										true);
+					fromPosition, 		// P1 - Center of the first docker
+					toPosition, 		// P2 - Center of the second docker
+					ref.intersection, 	// P3 - Center of the label
+					true);
 				//var oldDistance = ORYX.Core.Math.getDistanceBetweenTwoPoints(ref.segment.fromPosition, ref.segment.toPosition, ref.intersection);
 				//intersection = ORYX.Core.Math.getPointBetweenTwoPoints(fromPosition, toPosition, isNaN(oldDistance) ? 0.5 : (lengthOld*oldDistance)/lengthNew);
 
@@ -15963,33 +16357,35 @@ ORYX.Core.Edge = {
 	},
 
 	/**
-	 *	Returns elements from {@link attachedNodePositiondata} that match the
+	 *    Returns elements from {@link attachedNodePositiondata} that match the
 	 *  segement defined by startDocker and endDocker.
 	 *
 	 *  @param {ORYX.Core.Controls.Docker} startDocker
-	 *  	The docker defining the begin of the segment.
+	 *    The docker defining the begin of the segment.
 	 *  @param {ORYX.Core.Controls.Docker} endDocker
-	 *  	The docker defining the begin of the segment.
+	 *    The docker defining the begin of the segment.
 	 *
 	 *  @return {Hash} attachedNodePositionData
-	 *  	Child elements matching the segment
+	 *    Child elements matching the segment
 	 */
-	getAttachedNodePositionDataForSegment: function(startDocker, endDocker) {
+	getAttachedNodePositionDataForSegment: function (startDocker, endDocker) {
 		/* Ensure that the segment is defined correctly */
-		if(!((startDocker instanceof ORYX.Core.Controls.Docker)
+		if (!((startDocker instanceof ORYX.Core.Controls.Docker)
 			&& (endDocker instanceof ORYX.Core.Controls.Docker))) {
-				return [];
-			}
+			return [];
+		}
 
 		/* Get elements of the segment */
 		var elementsOfSegment =
-			this.attachedNodePositionData.findAll(function(nodePositionData) {
+			this.attachedNodePositionData.findAll(function (nodePositionData) {
 				return nodePositionData.value.segment.docker1 === startDocker &&
-						nodePositionData.value.segment.docker2 === endDocker;
+					nodePositionData.value.segment.docker2 === endDocker;
 			});
 
 		/* Return a Hash in each case */
-		if(!elementsOfSegment) {return [];}
+		if (!elementsOfSegment) {
+			return [];
+		}
 
 		return elementsOfSegment;
 	},
@@ -15997,20 +16393,20 @@ ORYX.Core.Edge = {
 	/**
 	 * Removes an edge's child shape
 	 */
-	remove: function(shape) {
+	remove: function (shape) {
 		arguments.callee.$.remove.apply(this, arguments);
 
-		if(this.attachedNodePositionData[shape.getId()]) {
+		if (this.attachedNodePositionData[shape.getId()]) {
 			delete this.attachedNodePositionData[shape.getId()];
 		}
 
 		/* Adjust child shapes if neccessary */
-		if(shape instanceof ORYX.Core.Controls.Docker) {
+		if (shape instanceof ORYX.Core.Controls.Docker) {
 			this.handleChildShapesAfterRemoveDocker(shape);
 		}
 	},
 
-	updateReferencePointOfLabel: function(label, intersection, from, to, dirty){
+	updateReferencePointOfLabel: function (label, intersection, from, to, dirty) {
 		if (!label.getReferencePoint() || !label.isVisible) {
 			return;
 		}
@@ -16018,105 +16414,110 @@ ORYX.Core.Edge = {
 		var ref = label.getReferencePoint();
 
 		//
-		if (ref.orientation && ref.orientation !== "ce"){
+		if (ref.orientation && ref.orientation !== "ce") {
 			var angle = this._getAngle(from, to);
-			if (ref.distance >= 0){
-				if(angle == 0){
+			if (ref.distance >= 0) {
+				if (angle == 0) {
 					label.horizontalAlign("left");//ref.orientation == "lr" ? "right" : "left");
 					label.verticalAlign("bottom");
-				} else if (angle > 0 && angle < 90){
+				} else if (angle > 0 && angle < 90) {
 					label.horizontalAlign("right");
 					label.verticalAlign("bottom");
-				} else if (angle == 90){
+				} else if (angle == 90) {
 					label.horizontalAlign("right");
 					label.verticalAlign("top");//ref.orientation == "lr" ? "bottom" : "top");
-				} else if (angle > 90 && angle < 180){
+				} else if (angle > 90 && angle < 180) {
 					label.horizontalAlign("right");
 					label.verticalAlign("top");
-				} else if (angle == 180){
+				} else if (angle == 180) {
 					label.horizontalAlign("left");//ref.orientation == "ur" ? "right" : "left");
 					label.verticalAlign("top");
-				} else if (angle > 180 && angle < 270){
+				} else if (angle > 180 && angle < 270) {
 					label.horizontalAlign("left");
 					label.verticalAlign("top");
-				} else if (angle == 270){
+				} else if (angle == 270) {
 					label.horizontalAlign("left");
 					label.verticalAlign("top");//ref.orientation == "ll" ? "bottom" : "top");
-				} else if (angle > 270 && angle <= 360){
+				} else if (angle > 270 && angle <= 360) {
 					label.horizontalAlign("left");
 					label.verticalAlign("bottom");
 				}
 			} else {
-				if(angle == 0){
+				if (angle == 0) {
 					label.horizontalAlign("left");//ref.orientation == "ur" ? "right" : "left");
 					label.verticalAlign("top");
-				} else if (angle > 0 && angle < 90){
+				} else if (angle > 0 && angle < 90) {
 					label.horizontalAlign("left");
 					label.verticalAlign("top");
-				} else if (angle == 90){
+				} else if (angle == 90) {
 					label.horizontalAlign("left");
 					label.verticalAlign("top");//ref.orientation == "ll" ? "bottom" : "top");
-				} else if (angle > 90 && angle < 180){
+				} else if (angle > 90 && angle < 180) {
 					label.horizontalAlign("left");
 					label.verticalAlign("bottom");
-				} else if (angle == 180){
+				} else if (angle == 180) {
 					label.horizontalAlign("left");//ref.orientation == "lr" ? "right" : "left");
 					label.verticalAlign("bottom");
-				} else if (angle > 180 && angle < 270){
+				} else if (angle > 180 && angle < 270) {
 					label.horizontalAlign("right");
 					label.verticalAlign("bottom");
-				} else if (angle == 270){
+				} else if (angle == 270) {
 					label.horizontalAlign("right");
 					label.verticalAlign("top");//ref.orientation == "lr" ? "bottom" : "top");
-				} else if (angle > 270 && angle <= 360){
+				} else if (angle > 270 && angle <= 360) {
 					label.horizontalAlign("right");
 					label.verticalAlign("top");
 				}
 			}
 			ref.iorientation = ref.iorientation || ref.orientation;
-			ref.orientation = (label.verticalAlign()=="top"?"u":"l") + (label.horizontalAlign()=="left"?"l":"r");
-		}
-
-		label.setReferencePoint(jQuery.extend({},{
-				intersection: intersection,
-				segment: {
-					from: from,
-					fromIndex: this.dockers.indexOf(from),
-					fromPosition: from.bounds.center(),
-					to: to,
-					toIndex: this.dockers.indexOf(to),
-					toPosition: to.bounds.center()
-				},
-				dirty: dirty || false
-			},ref))
+			ref.orientation = (label.verticalAlign() == "top" ? "u" : "l") + (label.horizontalAlign() == "left" ? "l" : "r");
+		}
+
+		label.setReferencePoint(jQuery.extend({}, {
+			intersection: intersection,
+			segment: {
+				from: from,
+				fromIndex: this.dockers.indexOf(from),
+				fromPosition: from.bounds.center(),
+				to: to,
+				toIndex: this.dockers.indexOf(to),
+				toPosition: to.bounds.center()
+			},
+			dirty: dirty || false
+		}, ref))
 	},
 	/**
-	 * 	Adjusts the child shapes of an edges after a docker was removed.
+	 *    Adjusts the child shapes of an edges after a docker was removed.
 	 *
 	 *  @param{ORYX.Core.Controls.Docker} docker
-	 *  	The removed docker.
+	 *    The removed docker.
 	 */
-	handleChildShapesAfterRemoveDocker: function(docker) {
+	handleChildShapesAfterRemoveDocker: function (docker) {
 		/* Ensure docker type */
-		if(!(docker instanceof ORYX.Core.Controls.Docker)) {return;}
+		if (!(docker instanceof ORYX.Core.Controls.Docker)) {
+			return;
+		}
 
-		this.attachedNodePositionData.each(function(nodePositionData) {
-			if(nodePositionData.value.segment.docker1 === docker) {
+		this.attachedNodePositionData.each(function (nodePositionData) {
+			if (nodePositionData.value.segment.docker1 === docker) {
 				/* The new start of the segment is the predecessor of docker2. */
 				var index = this.dockers.indexOf(nodePositionData.value.segment.docker2);
-				if(index == -1) {return;}
+				if (index == -1) {
+					return;
+				}
 				nodePositionData.value.segment.docker1 = this.dockers[index - 1];
-			}
-			else if(nodePositionData.value.segment.docker2 === docker) {
+			} else if (nodePositionData.value.segment.docker2 === docker) {
 				/* The new end of the segment is the successor of docker1. */
 				var index = this.dockers.indexOf(nodePositionData.value.segment.docker1);
-				if(index == -1) {return;}
+				if (index == -1) {
+					return;
+				}
 				nodePositionData.value.segment.docker2 = this.dockers[index + 1];
 			}
 		}.bind(this));
 
 		// Update all labels reference points
-		this.getLabels().each(function(label){
+		this.getLabels().each(function (label) {
 
 			var ref = label.getReferencePoint();
 			if (!ref) {
@@ -16125,17 +16526,17 @@ ORYX.Core.Edge = {
 			var from = ref.segment.from;
 			var to = ref.segment.to;
 
-			if (from !== docker && to !== docker){
+			if (from !== docker && to !== docker) {
 				return;
 			}
 
 			var segment = this.findSegment(ref.intersection);
-			if (!segment){
+			if (!segment) {
 				from = segment.fromDocker;
 				to = segment.toDocker;
 			} else {
-				from = from === docker ? this.dockers[this.dockers.indexOf(to)-1] : from;
-				to = this.dockers[this.dockers.indexOf(from)+1];
+				from = from === docker ? this.dockers[this.dockers.indexOf(to) - 1] : from;
+				to = this.dockers[this.dockers.indexOf(from) + 1];
 			}
 
 			var intersection = ORYX.Core.Math.getPointOfIntersectionPointLine(from.bounds.center(), to.bounds.center(), ref.intersection, true);
@@ -16148,85 +16549,82 @@ ORYX.Core.Edge = {
 	},
 
 	/**
-     *@deprecated Use the .createDocker() Method and set the point via the bounds
-     */
-    addDocker: function(position, exDocker){
-        var lastDocker;
+	 *@deprecated Use the .createDocker() Method and set the point via the bounds
+	 */
+	addDocker: function (position, exDocker) {
+		var lastDocker;
 		var result;
-        this._dockersByPath.any((function(pair){
-            return pair.value.any((function(docker, index){
-                if (!lastDocker) {
-                    lastDocker = docker;
-                    return false;
-                }
-                else {
-                    var point1 = lastDocker.bounds.center();
-                    var point2 = docker.bounds.center();
-
-                    var additionalIEZoom = 1;
-                    if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
-                        var ua = navigator.userAgent;
-                        if (ua.indexOf('MSIE') >= 0) {
-                            //IE 10 and below
-                            var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
-                            if (zoom !== 100) {
-                                additionalIEZoom = zoom / 100
-                            }
-                        }
-                    }
+		this._dockersByPath.any((function (pair) {
+			return pair.value.any((function (docker, index) {
+				if (!lastDocker) {
+					lastDocker = docker;
+					return false;
+				} else {
+					var point1 = lastDocker.bounds.center();
+					var point2 = docker.bounds.center();
+
+					var additionalIEZoom = 1;
+					if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
+						var ua = navigator.userAgent;
+						if (ua.indexOf('MSIE') >= 0) {
+							//IE 10 and below
+							var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
+							if (zoom !== 100) {
+								additionalIEZoom = zoom / 100
+							}
+						}
+					}
 
-                    if (additionalIEZoom !== 1) {
-                        position.x = position.x / additionalIEZoom;
-                        position.y = position.y / additionalIEZoom;
-                    }
+					if (additionalIEZoom !== 1) {
+						position.x = position.x / additionalIEZoom;
+						position.y = position.y / additionalIEZoom;
+					}
 
-                    if (ORYX.Core.Math.isPointInLine(position.x, position.y, point1.x, point1.y, point2.x, point2.y, 10)) {
-                        var path = this._paths.find(function(path){
-                            return path.id === pair.key;
-                        });
-                        if (path) {
-                            var allowAttr = path.getAttributeNS(NAMESPACE_ORYX, 'allowDockers');
-                            if (allowAttr && allowAttr.toLowerCase() === "no") {
-                                return true;
-                            }
-                        }
+					if (ORYX.Core.Math.isPointInLine(position.x, position.y, point1.x, point1.y, point2.x, point2.y, 10)) {
+						var path = this._paths.find(function (path) {
+							return path.id === pair.key;
+						});
+						if (path) {
+							var allowAttr = path.getAttributeNS(NAMESPACE_ORYX, 'allowDockers');
+							if (allowAttr && allowAttr.toLowerCase() === "no") {
+								return true;
+							}
+						}
 
-                        var newDocker = (exDocker) ? exDocker : this.createDocker(this.dockers.indexOf(lastDocker) + 1, position);
+						var newDocker = (exDocker) ? exDocker : this.createDocker(this.dockers.indexOf(lastDocker) + 1, position);
 						newDocker.bounds.centerMoveTo(position);
-                        if(exDocker)
+						if (exDocker)
 							this.add(newDocker, this.dockers.indexOf(lastDocker) + 1);
 						result = newDocker;
-                        return true;
-                    }
-                    else {
-                        lastDocker = docker;
-                        return false;
-                    }
-                }
-            }).bind(this));
-        }).bind(this));
+						return true;
+					} else {
+						lastDocker = docker;
+						return false;
+					}
+				}
+			}).bind(this));
+		}).bind(this));
 		return result;
-    },
-
-    removeDocker: function(docker){
-        if (this.dockers.length > 2 && !(this.dockers.first() === docker)) {
-            this._dockersByPath.any((function(pair){
-                if (pair.value.member(docker)) {
-                    if (docker === pair.value.last()) {
-                        return true;
-                    }
-                    else {
-                        this.remove(docker);
-                        this._dockersByPath[pair.key] = pair.value.without(docker);
-                        this.isChanged = true;
-                        this._dockerChanged();
-                        return true;
-                    }
-                }
-                return false;
-            }).bind(this));
-        }
-    },
+	},
+
+	removeDocker: function (docker) {
+		if (this.dockers.length > 2 && !(this.dockers.first() === docker)) {
+			this._dockersByPath.any((function (pair) {
+				if (pair.value.member(docker)) {
+					if (docker === pair.value.last()) {
+						return true;
+					} else {
+						this.remove(docker);
+						this._dockersByPath[pair.key] = pair.value.without(docker);
+						this.isChanged = true;
+						this._dockerChanged();
+						return true;
+					}
+				}
+				return false;
+			}).bind(this));
+		}
+	},
 
 	/**
 	 * Removes all dockers from the edge which are on
@@ -16234,153 +16632,154 @@ ORYX.Core.Edge = {
 	 * @return {Object} Removed dockers in an indicied array
 	 * (key is the removed position of the docker, value is docker themselve)
 	 */
-	removeUnusedDockers:function(){
+	removeUnusedDockers: function () {
 		var marked = $H({});
 
-		this.dockers.each(function(docker, i){
-			if (i==0||i==this.dockers.length-1){ return }
-			var previous = this.dockers[i-1];
+		this.dockers.each(function (docker, i) {
+			if (i == 0 || i == this.dockers.length - 1) {
+				return
+			}
+			var previous = this.dockers[i - 1];
 
 			/* Do not consider already removed dockers */
-			if(marked.values().indexOf(previous) != -1 && this.dockers[i-2]) {
-				previous = this.dockers[i-2];
+			if (marked.values().indexOf(previous) != -1 && this.dockers[i - 2]) {
+				previous = this.dockers[i - 2];
 			}
-			var next = this.dockers[i+1];
+			var next = this.dockers[i + 1];
 
 			var cp = previous.getDockedShape() && previous.referencePoint ? previous.getAbsoluteReferencePoint() : previous.bounds.center();
 			var cn = next.getDockedShape() && next.referencePoint ? next.getAbsoluteReferencePoint() : next.bounds.center();
 			var cd = docker.bounds.center();
 
-			if (ORYX.Core.Math.isPointInLine(cd.x, cd.y, cp.x, cp.y, cn.x, cn.y, 1)){
+			if (ORYX.Core.Math.isPointInLine(cd.x, cd.y, cp.x, cp.y, cn.x, cn.y, 1)) {
 				marked[i] = docker;
 			}
 		}.bind(this))
 
-		marked.each(function(docker){
+		marked.each(function (docker) {
 			this.removeDocker(docker.value);
 		}.bind(this))
 
-		if (marked.values().length > 0){
+		if (marked.values().length > 0) {
 			this._update(true);
 		}
 
 		return marked;
 	},
 
-    /**
-     * Initializes the Edge after loading the SVG representation of the edge.
-     * @param {SVGDocument} svgDocument
-     */
-    _init: function(svgDocument){
-        arguments.callee.$._init.apply(this, arguments);
-
-        var minPointX, minPointY, maxPointX, maxPointY;
-
-        //init markers
-        var defs = svgDocument.getElementsByTagNameNS(NAMESPACE_SVG, "defs");
-        if (defs.length > 0) {
-            defs = defs[0];
-            var markerElements = $A(defs.getElementsByTagNameNS(NAMESPACE_SVG, "marker"));
-            var marker;
-            var me = this;
-            markerElements.each(function(markerElement){
-                try {
-                    marker = new ORYX.Core.SVG.SVGMarker(markerElement.cloneNode(true));
-                    me._markers[marker.id] = marker;
-                    var textElements = $A(marker.element.getElementsByTagNameNS(NAMESPACE_SVG, "text"));
-                    var label;
-                    textElements.each(function(textElement){
-                        label = new ORYX.Core.SVG.Label({
-                            textElement: textElement,
+	/**
+	 * Initializes the Edge after loading the SVG representation of the edge.
+	 * @param {SVGDocument} svgDocument
+	 */
+	_init: function (svgDocument) {
+		arguments.callee.$._init.apply(this, arguments);
+
+		var minPointX, minPointY, maxPointX, maxPointY;
+
+		//init markers
+		var defs = svgDocument.getElementsByTagNameNS(NAMESPACE_SVG, "defs");
+		if (defs.length > 0) {
+			defs = defs[0];
+			var markerElements = $A(defs.getElementsByTagNameNS(NAMESPACE_SVG, "marker"));
+			var marker;
+			var me = this;
+			markerElements.each(function (markerElement) {
+				try {
+					marker = new ORYX.Core.SVG.SVGMarker(markerElement.cloneNode(true));
+					me._markers[marker.id] = marker;
+					var textElements = $A(marker.element.getElementsByTagNameNS(NAMESPACE_SVG, "text"));
+					var label;
+					textElements.each(function (textElement) {
+						label = new ORYX.Core.SVG.Label({
+							textElement: textElement,
 							shapeId: this.id
-                        });
-                        me._labels[label.id] = label;
-                    });
-                }
-                catch (e) {
-                }
-            });
-        }
+						});
+						me._labels[label.id] = label;
+					});
+				} catch (e) {
+				}
+			});
+		}
 
 
-        var gs = svgDocument.getElementsByTagNameNS(NAMESPACE_SVG, "g");
-        if (gs.length <= 0) {
-            throw "Edge: No g element found.";
-        }
-        var g = gs[0];
+		var gs = svgDocument.getElementsByTagNameNS(NAMESPACE_SVG, "g");
+		if (gs.length <= 0) {
+			throw "Edge: No g element found.";
+		}
+		var g = gs[0];
 
 
-        g.setAttributeNS(null, "id", null);
+		g.setAttributeNS(null, "id", null);
 
-        var isFirst = true;
+		var isFirst = true;
 
-        $A(g.childNodes).each((function(path, index){
-            if (ORYX.Editor.checkClassType(path, SVGPathElement)) {
-                path = path.cloneNode(false);
+		$A(g.childNodes).each((function (path, index) {
+			if (ORYX.Editor.checkClassType(path, SVGPathElement)) {
+				path = path.cloneNode(false);
 
-                var pathId = this.id + "_" + index;
-                path.setAttributeNS(null, "id", pathId);
-                this._paths.push(path);
+				var pathId = this.id + "_" + index;
+				path.setAttributeNS(null, "id", pathId);
+				this._paths.push(path);
 
-                //check, if markers are set and update the id
-                var markersByThisPath = [];
-                var markerUrl = path.getAttributeNS(null, "marker-start");
+				//check, if markers are set and update the id
+				var markersByThisPath = [];
+				var markerUrl = path.getAttributeNS(null, "marker-start");
 
-                if (markerUrl && markerUrl !== "") {
-                    markerUrl = markerUrl.strip();
-                    markerUrl = markerUrl.replace(/^url\(#/, '');
+				if (markerUrl && markerUrl !== "") {
+					markerUrl = markerUrl.strip();
+					markerUrl = markerUrl.replace(/^url\(#/, '');
 
-                    var markerStartId = this.getValidMarkerId(markerUrl);
-                    path.setAttributeNS(null, "marker-start", "url(#" + markerStartId + ")");
+					var markerStartId = this.getValidMarkerId(markerUrl);
+					path.setAttributeNS(null, "marker-start", "url(#" + markerStartId + ")");
 
-                    markersByThisPath.push(this._markers[markerStartId]);
-                }
+					markersByThisPath.push(this._markers[markerStartId]);
+				}
 
-                markerUrl = path.getAttributeNS(null, "marker-mid");
+				markerUrl = path.getAttributeNS(null, "marker-mid");
 
-                if (markerUrl && markerUrl !== "") {
-                    markerUrl = markerUrl.strip();
-                    markerUrl = markerUrl.replace(/^url\(#/, '');
-                    var markerMidId = this.getValidMarkerId(markerUrl);
-                    path.setAttributeNS(null, "marker-mid", "url(#" + markerMidId + ")");
+				if (markerUrl && markerUrl !== "") {
+					markerUrl = markerUrl.strip();
+					markerUrl = markerUrl.replace(/^url\(#/, '');
+					var markerMidId = this.getValidMarkerId(markerUrl);
+					path.setAttributeNS(null, "marker-mid", "url(#" + markerMidId + ")");
 
-                    markersByThisPath.push(this._markers[markerMidId]);
-                }
+					markersByThisPath.push(this._markers[markerMidId]);
+				}
 
-                markerUrl = path.getAttributeNS(null, "marker-end");
+				markerUrl = path.getAttributeNS(null, "marker-end");
 
-                if (markerUrl && markerUrl !== "") {
-                    markerUrl = markerUrl.strip();
+				if (markerUrl && markerUrl !== "") {
+					markerUrl = markerUrl.strip();
 
-                    var markerEndId = this.getValidMarkerId(markerUrl);
-                    path.setAttributeNS(null, "marker-end", "url(#" + markerEndId + ")");
+					var markerEndId = this.getValidMarkerId(markerUrl);
+					path.setAttributeNS(null, "marker-end", "url(#" + markerEndId + ")");
 
-                    markersByThisPath.push(this._markers[markerEndId]);
-                }
+					markersByThisPath.push(this._markers[markerEndId]);
+				}
 
-                this._markersByPath[pathId] = markersByThisPath;
+				this._markersByPath[pathId] = markersByThisPath;
 
-                //init dockers
-                var parser = new PathParser();
-                var handler = new ORYX.Core.SVG.PointsPathHandler();
-                parser.setHandler(handler);
-                parser.parsePath(path);
+				//init dockers
+				var parser = new PathParser();
+				var handler = new ORYX.Core.SVG.PointsPathHandler();
+				parser.setHandler(handler);
+				parser.parsePath(path);
 
-                if (handler.points.length < 4) {
-                    throw "Edge: Path has to have two or more points specified.";
-                }
+				if (handler.points.length < 4) {
+					throw "Edge: Path has to have two or more points specified.";
+				}
 
-                this._dockersByPath[pathId] = [];
+				this._dockersByPath[pathId] = [];
 
 				for (var i = 0; i < handler.points.length; i += 2) {
 					//handler.points.each((function(point, pIndex){
 					var x = handler.points[i];
-					var y = handler.points[i+1];
+					var y = handler.points[i + 1];
 					if (isFirst || i > 0) {
 						var docker = new ORYX.Core.Controls.Docker({
 							eventHandlerCallback: this.eventHandlerCallback
 						});
-						docker.bounds.centerMoveTo(x,y);
+						docker.bounds.centerMoveTo(x, y);
 						docker.bounds.registerCallback(this._dockerChangedCallback);
 						this.add(docker, this.dockers.length);
 
@@ -16390,8 +16789,7 @@ ORYX.Core.Edge = {
 						if (minPointX) {
 							minPointX = Math.min(x, minPointX);
 							minPointY = Math.min(y, minPointY);
-						}
-						else {
+						} else {
 							minPointX = x;
 							minPointY = y;
 						}
@@ -16399,168 +16797,166 @@ ORYX.Core.Edge = {
 						if (maxPointX) {
 							maxPointX = Math.max(x, maxPointX);
 							maxPointY = Math.max(y, maxPointY);
-						}
-						else {
+						} else {
 							maxPointX = x;
 							maxPointY = y;
 						}
 					}
 					//}).bind(this));
 				}
-                isFirst = false;
-            }
-        }).bind(this));
+				isFirst = false;
+			}
+		}).bind(this));
 
-        this.bounds.set(minPointX, minPointY, maxPointX, maxPointY);
+		this.bounds.set(minPointX, minPointY, maxPointX, maxPointY);
 
-        if (false&&(this.bounds.width() === 0 || this.bounds.height() === 0)) {
+		if (false && (this.bounds.width() === 0 || this.bounds.height() === 0)) {
 			var width = this.bounds.width();
 			var height = this.bounds.height();
 
-            this.bounds.extend({
-                x: width === 0 ? 2 : 0,
-                y: height === 0 ? 2 : 0
-            });
+			this.bounds.extend({
+				x: width === 0 ? 2 : 0,
+				y: height === 0 ? 2 : 0
+			});
 
-            this.bounds.moveBy({
-                x: width === 0 ? -1 : 0,
-                y: height === 0 ? -1 : 0
-            });
+			this.bounds.moveBy({
+				x: width === 0 ? -1 : 0,
+				y: height === 0 ? -1 : 0
+			});
 
-        }
+		}
 
-        this._oldBounds = this.bounds.clone();
+		this._oldBounds = this.bounds.clone();
 
-        //add paths to this.node
-        this._paths.reverse();
-        var paths = [];
-        this._paths.each((function(path){
-            paths.push(this.node.childNodes[0].childNodes[0].childNodes[0].appendChild(path));
-        }).bind(this));
+		//add paths to this.node
+		this._paths.reverse();
+		var paths = [];
+		this._paths.each((function (path) {
+			paths.push(this.node.childNodes[0].childNodes[0].childNodes[0].appendChild(path));
+		}).bind(this));
 
-        this._paths = paths;
+		this._paths = paths;
 
-        //init interaction path
-        this._paths.each((function(path){
-            var iPath = path.cloneNode(false);
+		//init interaction path
+		this._paths.each((function (path) {
+			var iPath = path.cloneNode(false);
 			iPath.setAttributeNS(null, "id", undefined);
-            iPath.setAttributeNS(null, "stroke-width", 10);
-            iPath.setAttributeNS(null, "visibility", "hidden");
-            iPath.setAttributeNS(null, "stroke-dasharray", null);
-            iPath.setAttributeNS(null, "stroke", "black");
-            iPath.setAttributeNS(null, "fill", "none");
+			iPath.setAttributeNS(null, "stroke-width", 10);
+			iPath.setAttributeNS(null, "visibility", "hidden");
+			iPath.setAttributeNS(null, "stroke-dasharray", null);
+			iPath.setAttributeNS(null, "stroke", "black");
+			iPath.setAttributeNS(null, "fill", "none");
 			iPath.setAttributeNS(null, "title", this.getStencil().title());
-            this._interactionPaths.push(this.node.childNodes[0].childNodes[0].childNodes[0].appendChild(iPath));
-        }).bind(this));
+			this._interactionPaths.push(this.node.childNodes[0].childNodes[0].childNodes[0].appendChild(iPath));
+		}).bind(this));
 
-        this._paths.reverse();
-        this._interactionPaths.reverse();
+		this._paths.reverse();
+		this._interactionPaths.reverse();
 
 		/**initialize labels*/
-        var textElems = svgDocument.getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_SVG, 'text');
+		var textElems = svgDocument.getElementsByTagNameNS(ORYX.CONFIG.NAMESPACE_SVG, 'text');
 
-		$A(textElems).each((function(textElem){
-            var label = new ORYX.Core.SVG.Label({
-                textElement: textElem,
+		$A(textElems).each((function (textElem) {
+			var label = new ORYX.Core.SVG.Label({
+				textElement: textElem,
 				shapeId: this.id
-            });
-            this.node.childNodes[0].childNodes[0].appendChild(label.node);
-            this._labels[label.id] = label;
+			});
+			this.node.childNodes[0].childNodes[0].appendChild(label.node);
+			this._labels[label.id] = label;
 
 			label.registerOnChange(this.layout.bind(this));
-        }).bind(this));
+		}).bind(this));
 
 
-        this.propertiesChanged.each(function(pair){
-            pair.value = true;
-        });
+		this.propertiesChanged.each(function (pair) {
+			pair.value = true;
+		});
 
 
-        //if(this.dockers.length == 2) {
+		//if(this.dockers.length == 2) {
 
 
+		//  }
 
-      //  }
+		//this._update(true);
+	},
 
-        //this._update(true);
-    },
+	getValidMarkerId: function (markerUrl) {
+		if (markerUrl.indexOf("url(\"#") >= 0) {
+			// Fix for IE9, additional quotes are added to the <id
+			var rawId = markerUrl.replace(/^url\(\"#/, "").replace(/\"\)$/, '');
+			return this.id + rawId;
+		} else {
+			markerUrl = markerUrl.replace(/^url\(#/, '');
+			return this.id.concat(markerUrl.replace(/\)$/, ''));
+		}
+	},
 
-    getValidMarkerId: function(markerUrl) {
-    	if(markerUrl.indexOf("url(\"#") >= 0) {
-            // Fix for IE9, additional quotes are added to the <id
-            var rawId = markerUrl.replace(/^url\(\"#/, "").replace(/\"\)$/, '');
-            return this.id + rawId;
-          } else {
-            markerUrl = markerUrl.replace(/^url\(#/, '');
-            return this.id.concat(markerUrl.replace(/\)$/, ''));
-          }
-    },
+	/**
+	 * Adds all necessary markers of this Edge to the SVG document.
+	 * Has to be called, while this.node is part of DOM.
+	 */
+	addMarkers: function (defs) {
+		this._markers.each(function (marker) {
+			if (!defs.ownerDocument.getElementById(marker.value.id)) {
+				marker.value.element = defs.appendChild(marker.value.element);
+			}
+		});
+	},
 
-    /**
-     * Adds all necessary markers of this Edge to the SVG document.
-     * Has to be called, while this.node is part of DOM.
-     */
-    addMarkers: function(defs){
-        this._markers.each(function(marker){
-            if (!defs.ownerDocument.getElementById(marker.value.id)) {
-                marker.value.element = defs.appendChild(marker.value.element);
-            }
-        });
-    },
-
-    /**
-     * Removes all necessary markers of this Edge from the SVG document.
-     * Has to be called, while this.node is part of DOM.
-     */
-    removeMarkers: function(){
-        var svgElement = this.node.ownerSVGElement;
-        if (svgElement) {
-            var defs = svgElement.getElementsByTagNameNS(NAMESPACE_SVG, "defs");
-            if (defs.length > 0) {
-                defs = defs[0];
-                this._markers.each(function(marker){
-                    var foundMarker = defs.ownerDocument.getElementById(marker.value.id);
-                    if (foundMarker) {
-                        marker.value.element = defs.removeChild(marker.value.element);
-                    }
-                });
-            }
-        }
-    },
+	/**
+	 * Removes all necessary markers of this Edge from the SVG document.
+	 * Has to be called, while this.node is part of DOM.
+	 */
+	removeMarkers: function () {
+		var svgElement = this.node.ownerSVGElement;
+		if (svgElement) {
+			var defs = svgElement.getElementsByTagNameNS(NAMESPACE_SVG, "defs");
+			if (defs.length > 0) {
+				defs = defs[0];
+				this._markers.each(function (marker) {
+					var foundMarker = defs.ownerDocument.getElementById(marker.value.id);
+					if (foundMarker) {
+						marker.value.element = defs.removeChild(marker.value.element);
+					}
+				});
+			}
+		}
+	},
 
-    /**
-     * Calls when a docker has changed
-     */
-    _dockerChanged: function(){
+	/**
+	 * Calls when a docker has changed
+	 */
+	_dockerChanged: function () {
 
-        //this._update(true);
+		//this._update(true);
 		this._dockerUpdated = true;
 
-    },
-
-    serialize: function(){
-        var result = arguments.callee.$.serialize.apply(this);
-
-        //add dockers triple
-        var value = "";
-        this._dockersByPath.each((function(pair){
-            pair.value.each(function(docker){
-                var position = docker.getDockedShape() && docker.referencePoint ? docker.referencePoint : docker.bounds.center();
-                value = value.concat(position.x + " " + position.y + " ");
-            });
-
-            value += " # ";
-        }).bind(this));
-        result.push({
-            name: 'dockers',
-            prefix: 'oryx',
-            value: value,
-            type: 'literal'
-        });
-
-        //add parent triple dependant on the dockedShapes
-        //TODO change this when canvas becomes a resource
-/*        var source = this.dockers.first().getDockedShape();
+	},
+
+	serialize: function () {
+		var result = arguments.callee.$.serialize.apply(this);
+
+		//add dockers triple
+		var value = "";
+		this._dockersByPath.each((function (pair) {
+			pair.value.each(function (docker) {
+				var position = docker.getDockedShape() && docker.referencePoint ? docker.referencePoint : docker.bounds.center();
+				value = value.concat(position.x + " " + position.y + " ");
+			});
+
+			value += " # ";
+		}).bind(this));
+		result.push({
+			name: 'dockers',
+			prefix: 'oryx',
+			value: value,
+			type: 'literal'
+		});
+
+		//add parent triple dependant on the dockedShapes
+		//TODO change this when canvas becomes a resource
+		/*        var source = this.dockers.first().getDockedShape();
         var target = this.dockers.last().getDockedShape();
         var sharedParent;
         if (source && target) {
@@ -16599,22 +16995,22 @@ ORYX.Core.Edge = {
                     sharedParent = target.parent;
                 }
 */
-        //if (sharedParent) {
-/*            result.push({
+		//if (sharedParent) {
+		/*            result.push({
                 name: 'parent',
                 prefix: 'raziel',
                 //value: '#' + ERDF.__stripHashes(sharedParent.resourceId),
                 value: '#' + ERDF.__stripHashes(this.getCanvas().resourceId),
                 type: 'resource'
             });*/
-        //}
+		//}
 
 		//serialize target and source
 		var lastDocker = this.dockers.last();
 
 		var target = lastDocker.getDockedShape();
 
-		if(target) {
+		if (target) {
 			result.push({
 				name: 'target',
 				prefix: 'raziel',
@@ -16623,15 +17019,15 @@ ORYX.Core.Edge = {
 			});
 		}
 
-        try {
-            //result = this.getStencil().serialize(this, result);
+		try {
+			//result = this.getStencil().serialize(this, result);
 			var serializeEvent = this.getStencil().serialize();
 
 			/*
 			 * call serialize callback by reference, result should be found
 			 * in serializeEvent.result
 			 */
-			if(serializeEvent.type) {
+			if (serializeEvent.type) {
 				serializeEvent.shape = this;
 				serializeEvent.data = result;
 				serializeEvent.result = undefined;
@@ -16639,19 +17035,18 @@ ORYX.Core.Edge = {
 
 				this._delegateEvent(serializeEvent);
 
-				if(serializeEvent.result) {
+				if (serializeEvent.result) {
 					result = serializeEvent.result;
 				}
 			}
-        }
-        catch (e) {
-        }
-        return result;
-    },
+		} catch (e) {
+		}
+		return result;
+	},
 
-    deserialize: function(data){
-        try {
-            //data = this.getStencil().deserialize(this, data);
+	deserialize: function (data) {
+		try {
+			//data = this.getStencil().deserialize(this, data);
 
 			var deserializeEvent = this.getStencil().deserialize();
 
@@ -16659,42 +17054,51 @@ ORYX.Core.Edge = {
 			 * call serialize callback by reference, result should be found
 			 * in serializeEventInfo.result
 			 */
-			if(deserializeEvent.type) {
+			if (deserializeEvent.type) {
 				deserializeEvent.shape = this;
 				deserializeEvent.data = data;
 				deserializeEvent.result = undefined;
 				deserializeEvent.forceExecution = true;
 
 				this._delegateEvent(deserializeEvent);
-				if(deserializeEvent.result) {
+				if (deserializeEvent.result) {
 					data = deserializeEvent.result;
 				}
 			}
-        }
-        catch (e) {
-        }
+		} catch (e) {
+		}
 
 		// Set the outgoing shapes
-		var target = data.find(function(ser) {return (ser.prefix+"-"+ser.name) == 'raziel-target'});
+		var target = data.find(function (ser) {
+			return (ser.prefix + "-" + ser.name) == 'raziel-target'
+		});
 		var targetShape;
-		if(target) {
+		if (target) {
 			targetShape = this.getCanvas().getChildShapeByResourceId(target.value);
 		}
 
-		var outgoing = data.findAll(function(ser){ return (ser.prefix+"-"+ser.name) == 'raziel-outgoing'});
-		outgoing.each((function(obj){
+		var outgoing = data.findAll(function (ser) {
+			return (ser.prefix + "-" + ser.name) == 'raziel-outgoing'
+		});
+		outgoing.each((function (obj) {
 			// TODO: Look at Canvas
-			if(!this.parent) {return};
+			if (!this.parent) {
+				return
+			}
+			;
 
 			// Set outgoing Shape
 			var next = this.getCanvas().getChildShapeByResourceId(obj.value);
 
-			if(next){
-				if(next == targetShape) {
+			if (next) {
+				if (next == targetShape) {
 					// If this is an edge, set the last docker to the next shape
 					this.dockers.last().setDockedShape(next);
-					this.dockers.last().setReferencePoint({x: next.bounds.width() / 2.0, y: next.bounds.height() / 2.0});
-				} else if(next instanceof ORYX.Core.Edge) {
+					this.dockers.last().setReferencePoint({
+						x: next.bounds.width() / 2.0,
+						y: next.bounds.height() / 2.0
+					});
+				} else if (next instanceof ORYX.Core.Edge) {
 					//Set the first docker of the next shape
 					next.dockers.first().setDockedShape(this);
 					//next.dockers.first().setReferencePoint({x: this.bounds.width() / 2.0, y: this.bounds.height() / 2.0});
@@ -16707,103 +17111,101 @@ ORYX.Core.Edge = {
 		}).bind(this));
 
 
-        var oryxDockers = data.find(function(obj){
-            return (obj.prefix === "oryx" &&
-            obj.name === "dockers");
-        });
+		var oryxDockers = data.find(function (obj) {
+			return (obj.prefix === "oryx" &&
+				obj.name === "dockers");
+		});
 
-        if (oryxDockers) {
-            var dataByPath = oryxDockers.value.split("#").without("").without(" ");
+		if (oryxDockers) {
+			var dataByPath = oryxDockers.value.split("#").without("").without(" ");
 
-            dataByPath.each((function(data, index){
-                var values = data.replace(/,/g, " ").split(" ").without("");
+			dataByPath.each((function (data, index) {
+				var values = data.replace(/,/g, " ").split(" ").without("");
 
-                //for each docker two values must be defined
-                if (values.length % 2 === 0) {
-                    var path = this._paths[index];
+				//for each docker two values must be defined
+				if (values.length % 2 === 0) {
+					var path = this._paths[index];
 
-                    if (path) {
-                        if (index === 0) {
-                            while (this._dockersByPath[path.id].length > 2) {
-                                this.removeDocker(this._dockersByPath[path.id][1]);
-                            }
-                        }
-                        else {
-                            while (this._dockersByPath[path.id].length > 1) {
-                                this.removeDocker(this._dockersByPath[path.id][0]);
-                            }
-                        }
+					if (path) {
+						if (index === 0) {
+							while (this._dockersByPath[path.id].length > 2) {
+								this.removeDocker(this._dockersByPath[path.id][1]);
+							}
+						} else {
+							while (this._dockersByPath[path.id].length > 1) {
+								this.removeDocker(this._dockersByPath[path.id][0]);
+							}
+						}
 
-                        var dockersByPath = this._dockersByPath[path.id];
-
-                        if (index === 0) {
-                            //set position of first docker
-                            var x = parseFloat(values.shift());
-                            var y = parseFloat(values.shift());
-
-                            if (dockersByPath.first().getDockedShape()) {
-                                dockersByPath.first().setReferencePoint({
-                                    x: x,
-                                    y: y
-                                });
-                            }
-                            else {
-                                dockersByPath.first().bounds.centerMoveTo(x, y);
-                            }
-                        }
+						var dockersByPath = this._dockersByPath[path.id];
 
-                        //set position of last docker
-                        y = parseFloat(values.pop());
-                        x = parseFloat(values.pop());
-
-                        if (dockersByPath.last().getDockedShape()) {
-                            dockersByPath.last().setReferencePoint({
-                                x: x,
-                                y: y
-                            });
-                        } else {
-                            dockersByPath.last().bounds.centerMoveTo(x, y);
-                        }
+						if (index === 0) {
+							//set position of first docker
+							var x = parseFloat(values.shift());
+							var y = parseFloat(values.shift());
+
+							if (dockersByPath.first().getDockedShape()) {
+								dockersByPath.first().setReferencePoint({
+									x: x,
+									y: y
+								});
+							} else {
+								dockersByPath.first().bounds.centerMoveTo(x, y);
+							}
+						}
 
-                        //add additional dockers
-                        for (var i = 0; i < values.length; i++) {
-                            x = parseFloat(values[i]);
-                            y = parseFloat(values[++i]);
+						//set position of last docker
+						y = parseFloat(values.pop());
+						x = parseFloat(values.pop());
 
-                            var newDocker = this.createDocker();
-                            newDocker.bounds.centerMoveTo(x, y);
+						if (dockersByPath.last().getDockedShape()) {
+							dockersByPath.last().setReferencePoint({
+								x: x,
+								y: y
+							});
+						} else {
+							dockersByPath.last().bounds.centerMoveTo(x, y);
+						}
+
+						//add additional dockers
+						for (var i = 0; i < values.length; i++) {
+							x = parseFloat(values[i]);
+							y = parseFloat(values[++i]);
 
-                            //this.dockers = this.dockers.without(newDocker);
-                            //this.dockers.splice(this.dockers.indexOf(dockersByPath.last()), 0, newDocker);
-                            //dockersByPath.splice(this.dockers.indexOf(dockersByPath.last()), 0, newDocker);
+							var newDocker = this.createDocker();
+							newDocker.bounds.centerMoveTo(x, y);
+
+							//this.dockers = this.dockers.without(newDocker);
+							//this.dockers.splice(this.dockers.indexOf(dockersByPath.last()), 0, newDocker);
+							//dockersByPath.splice(this.dockers.indexOf(dockersByPath.last()), 0, newDocker);
 						}
-                    }
-                }
-            }).bind(this));
-        } else {
-            this.alignDockers();
-        }
+					}
+				}
+			}).bind(this));
+		} else {
+			this.alignDockers();
+		}
 
-        arguments.callee.$.deserialize.apply(this, arguments);
+		arguments.callee.$.deserialize.apply(this, arguments);
 
 		this._changed();
-    },
+	},
 
-    toString: function(){
-        return this.getStencil().title() + " " + this.id;
-    },
+	toString: function () {
+		return this.getStencil().title() + " " + this.id;
+	},
 
-    /**
-     * @return {ORYX.Core.Shape} Returns last docked shape or null.
-     */
-    getTarget: function(){
-        return this.dockers.last() ? this.dockers.last().getDockedShape() : null;
-    },
+	/**
+	 * @return {ORYX.Core.Shape} Returns last docked shape or null.
+	 */
+	getTarget: function () {
+		return this.dockers.last() ? this.dockers.last().getDockedShape() : null;
+	},
 
 	/**
 	 * @return {ORYX.Core.Shape} Returns the first docked shape or null
 	 */
-	getSource: function() {
+	getSource: function () {
 		return this.dockers.first() ? this.dockers.first().getDockedShape() : null;
 	},
 
@@ -16812,10 +17214,10 @@ ORYX.Core.Edge = {
 	 *
 	 * @return {boolean} True if edge is docked
 	 */
-	isDocked: function() {
+	isDocked: function () {
 		var isDocked = false;
-		this.dockers.each(function(docker) {
-			if(docker.isDocked()) {
+		this.dockers.each(function (docker) {
+			if (docker.isDocked()) {
 				isDocked = true;
 				throw $break;
 			}
@@ -16823,20 +17225,20 @@ ORYX.Core.Edge = {
 		return isDocked;
 	},
 
-    /**
-     * Calls {@link ORYX.Core.AbstractShape#toJSON} and add a some stencil set information.
-     */
-    toJSON: function() {
-        var json = arguments.callee.$.toJSON.apply(this, arguments);
+	/**
+	 * Calls {@link ORYX.Core.AbstractShape#toJSON} and add a some stencil set information.
+	 */
+	toJSON: function () {
+		var json = arguments.callee.$.toJSON.apply(this, arguments);
 
-        if(this.getTarget()) {
-            json.target = {
-                resourceId: this.getTarget().resourceId
-            };
-        }
+		if (this.getTarget()) {
+			json.target = {
+				resourceId: this.getTarget().resourceId
+			};
+		}
 
-        return json;
-    }
+		return json;
+	}
 };
 ORYX.Core.Edge = ORYX.Core.Shape.extend(ORYX.Core.Edge);
 /*
@@ -16849,14 +17251,18 @@ ORYX.Core.Edge = ORYX.Core.Shape.extend(ORYX.Core.Edge);
  * All code Copyright 2013 KIS Consultancy all rights reserved
  */
 
-if(!ORYX){ var ORYX = {} }
-if(!ORYX.Plugins){ ORYX.Plugins = {} }
+if (!ORYX) {
+	var ORYX = {}
+}
+if (!ORYX.Plugins) {
+	ORYX.Plugins = {}
+}
 
 /**
-   This abstract plugin class can be used to build plugins on.
-   It provides some more basic functionality like registering events (on*-handlers)...
-   @example
-    ORYX.Plugins.MyPlugin = ORYX.Plugins.AbstractPlugin.extend({
+ This abstract plugin class can be used to build plugins on.
+ It provides some more basic functionality like registering events (on*-handlers)...
+ @example
+ ORYX.Plugins.MyPlugin = ORYX.Plugins.AbstractPlugin.extend({
         construct: function() {
             // Call super class constructor
             arguments.callee.$.construct.apply(this, arguments);
@@ -16866,142 +17272,144 @@ if(!ORYX.Plugins){ ORYX.Plugins = {} }
         [...]
     });
 
-   @class ORYX.Plugins.AbstractPlugin
-   @constructor Creates a new instance
-   @author Willi Tscheschner
-*/
+ @class ORYX.Plugins.AbstractPlugin
+ @constructor Creates a new instance
+ @author Willi Tscheschner
+ */
 ORYX.Plugins.AbstractPlugin = Clazz.extend({
-    /**
-     * The facade which offer editor-specific functionality
-     * @type Facade
-     * @memberOf ORYX.Plugins.AbstractPlugin.prototype
-     */
+	/**
+	 * The facade which offer editor-specific functionality
+	 * @type Facade
+	 * @memberOf ORYX.Plugins.AbstractPlugin.prototype
+	 */
 	facade: null,
 
-	construct: function( facade ){
+	construct: function (facade) {
 		this.facade = facade;
 
 		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_LOADED, this.onLoaded.bind(this));
 	},
 
-    /**
-       Overwrite to handle load event. TODO: Document params!!!
-       @methodOf ORYX.Plugins.AbstractPlugin.prototype
-    */
-	onLoaded: function(){},
-
-    /**
-       Overwrite to handle selection changed event. TODO: Document params!!!
-       @methodOf ORYX.Plugins.AbstractPlugin.prototype
-    */
-	onSelectionChanged: function(){},
-
-    /**
-       Show overlay on given shape.
-       @methodOf ORYX.Plugins.AbstractPlugin.prototype
-       @example
-       showOverlay(
-           myShape,
-           { stroke: "green" },
-           ORYX.Editor.graft("http://www.w3.org/2000/svg", null, ['path', {
+	/**
+     Overwrite to handle load event. TODO: Document params!!!
+     @methodOf ORYX.Plugins.AbstractPlugin.prototype
+	 */
+	onLoaded: function () {
+	},
+
+	/**
+     Overwrite to handle selection changed event. TODO: Document params!!!
+     @methodOf ORYX.Plugins.AbstractPlugin.prototype
+	 */
+	onSelectionChanged: function () {
+	},
+
+	/**
+     Show overlay on given shape.
+     @methodOf ORYX.Plugins.AbstractPlugin.prototype
+     @example
+     showOverlay(
+     myShape,
+     { stroke: "green" },
+     ORYX.Editor.graft("http://www.w3.org/2000/svg", null, ['path', {
                "title": "Click the element to execute it!",
                "stroke-width": 2.0,
                "stroke": "black",
                "d": "M0,-5 L5,0 L0,5 Z",
                "line-captions": "round"
            }])
-       )
-       @param {Oryx.XXX.Shape[]} shapes One shape or array of shapes the overlay should be put on
-       @param {Oryx.XXX.Attributes} attributes some attributes...
-       @param {Oryx.svg.node} svgNode The svg node which should be used as overlay
-       @param {String} [svgNode="NW"] The svg node position where the overlay should be placed
-    */
-	showOverlay: function(shapes, attributes, svgNode, svgNodePosition ){
-
-		if( !(shapes instanceof Array) ){
+     )
+     @param {Oryx.XXX.Shape[]} shapes One shape or array of shapes the overlay should be put on
+     @param {Oryx.XXX.Attributes} attributes some attributes...
+     @param {Oryx.svg.node} svgNode The svg node which should be used as overlay
+     @param {String} [svgNode="NW"] The svg node position where the overlay should be placed
+	 */
+	showOverlay: function (shapes, attributes, svgNode, svgNodePosition) {
+
+		if (!(shapes instanceof Array)) {
 			shapes = [shapes]
 		}
 
 		// Define Shapes
-		shapes = shapes.map(function(shape){
+		shapes = shapes.map(function (shape) {
 			var el = shape;
-			if( typeof shape == "string" ){
-				el = this.facade.getCanvas().getChildShapeByResourceId( shape );
-				el = el || this.facade.getCanvas().getChildById( shape, true );
+			if (typeof shape == "string") {
+				el = this.facade.getCanvas().getChildShapeByResourceId(shape);
+				el = el || this.facade.getCanvas().getChildById(shape, true);
 			}
 			return el;
 		}.bind(this)).compact();
 
 		// Define unified id
-		if( !this.overlayID ){
+		if (!this.overlayID) {
 			this.overlayID = this.type + ORYX.Editor.provideId();
 		}
 
 		this.facade.raiseEvent({
-			type		: ORYX.CONFIG.EVENT_OVERLAY_SHOW,
-			id			: this.overlayID,
-			shapes		: shapes,
-			attributes 	: attributes,
-			node		: svgNode,
+			type: ORYX.CONFIG.EVENT_OVERLAY_SHOW,
+			id: this.overlayID,
+			shapes: shapes,
+			attributes: attributes,
+			node: svgNode,
 			nodePosition: svgNodePosition || "NW"
 		});
 
 	},
 
-    /**
-       Hide current overlay.
-       @methodOf ORYX.Plugins.AbstractPlugin.prototype
-    */
-	hideOverlay: function(){
+	/**
+     Hide current overlay.
+     @methodOf ORYX.Plugins.AbstractPlugin.prototype
+	 */
+	hideOverlay: function () {
 		this.facade.raiseEvent({
-			type	: ORYX.CONFIG.EVENT_OVERLAY_HIDE,
-			id		: this.overlayID
+			type: ORYX.CONFIG.EVENT_OVERLAY_HIDE,
+			id: this.overlayID
 		});
 	},
 
-    /**
-       Does a transformation with the given xslt stylesheet.
-       @methodOf ORYX.Plugins.AbstractPlugin.prototype
-       @param {String} data The data (e.g. eRDF) which should be transformed
-       @param {String} stylesheet URL of a stylesheet which should be used for transforming data.
-    */
-	doTransform: function( data, stylesheet ) {
+	/**
+     Does a transformation with the given xslt stylesheet.
+     @methodOf ORYX.Plugins.AbstractPlugin.prototype
+     @param {String} data The data (e.g. eRDF) which should be transformed
+     @param {String} stylesheet URL of a stylesheet which should be used for transforming data.
+	 */
+	doTransform: function (data, stylesheet) {
 
-		if( !stylesheet || !data ){
+		if (!stylesheet || !data) {
 			return ""
 		}
 
-        var parser 		= new DOMParser();
-        var parsedData 	= parser.parseFromString(data, "text/xml");
-		source=stylesheet;
+		var parser = new DOMParser();
+		var parsedData = parser.parseFromString(data, "text/xml");
+		source = stylesheet;
 		new Ajax.Request(source, {
 			asynchronous: false,
 			method: 'get',
-			onSuccess: function(transport){
+			onSuccess: function (transport) {
 				xsl = transport.responseText
 			}.bind(this),
-			onFailure: (function(transport){
+			onFailure: (function (transport) {
 				ORYX.Log.error("XSL load failed" + transport);
 			}).bind(this)
 		});
-        var xsltProcessor = new XSLTProcessor();
+		var xsltProcessor = new XSLTProcessor();
 		var domParser = new DOMParser();
 		var xslObject = domParser.parseFromString(xsl, "text/xml");
-        xsltProcessor.importStylesheet(xslObject);
+		xsltProcessor.importStylesheet(xslObject);
 
-        try {
+		try {
 
-            var newData 		= xsltProcessor.transformToFragment(parsedData, document);
-            var serializedData 	= (new XMLSerializer()).serializeToString(newData);
+			var newData = xsltProcessor.transformToFragment(parsedData, document);
+			var serializedData = (new XMLSerializer()).serializeToString(newData);
 
-           	/* Firefox 2 to 3 problem?! */
-            serializedData = !serializedData.startsWith("<?xml") ? "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + serializedData : serializedData;
+			/* Firefox 2 to 3 problem?! */
+			serializedData = !serializedData.startsWith("<?xml") ? "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + serializedData : serializedData;
 
-            return serializedData;
+			return serializedData;
 
-        }catch (error) {
-            return -1;
-        }
+		} catch (error) {
+			return -1;
+		}
 
 	},
 
@@ -17012,22 +17420,22 @@ ORYX.Plugins.AbstractPlugin = Clazz.extend({
 	 * @example
 	 * openDownloadWindow( "my.xml", "<exampleXML />" );
 	 */
-	openXMLWindow: function(content) {
+	openXMLWindow: function (content) {
 		var win = window.open(
-		   'data:application/xml,' + encodeURIComponent(
-		     content
-		   ),
-		   '_blank', "resizable=yes,width=600,height=600,toolbar=0,scrollbars=yes"
+			'data:application/xml,' + encodeURIComponent(
+				content
+			),
+			'_blank', "resizable=yes,width=600,height=600,toolbar=0,scrollbars=yes"
 		);
 	},
 
-    /**
-     * Opens a download window for downloading the given content.
-     * @methodOf ORYX.Plugins.AbstractPlugin.prototype
-     * @param {String} filename The content's file name
-     * @param {String} content The content to download
-     */
-	openDownloadWindow: function(filename, content) {
+	/**
+	 * Opens a download window for downloading the given content.
+	 * @methodOf ORYX.Plugins.AbstractPlugin.prototype
+	 * @param {String} filename The content's file name
+	 * @param {String} content The content to download
+	 */
+	openDownloadWindow: function (filename, content) {
 		var win = window.open("");
 		if (win != null) {
 			win.document.open();
@@ -17035,107 +17443,107 @@ ORYX.Plugins.AbstractPlugin = Clazz.extend({
 			var submitForm = win.document.createElement("form");
 			win.document.body.appendChild(submitForm);
 
-			var createHiddenElement = function(name, value) {
+			var createHiddenElement = function (name, value) {
 				var newElement = document.createElement("input");
-				newElement.name=name;
-				newElement.type="hidden";
+				newElement.name = name;
+				newElement.type = "hidden";
 				newElement.value = value;
 				return newElement
 			}
 
-			submitForm.appendChild( createHiddenElement("download", content) );
-			submitForm.appendChild( createHiddenElement("file", filename) );
+			submitForm.appendChild(createHiddenElement("download", content));
+			submitForm.appendChild(createHiddenElement("file", filename));
 
 
 			submitForm.method = "POST";
 			win.document.write("</body></html>");
 			win.document.close();
-			submitForm.action= ORYX.PATH + "/download";
+			submitForm.action = ORYX.PATH + "/download";
 			submitForm.submit();
 		}
 	},
 
-    /**
-     * Serializes DOM.
-     * @methodOf ORYX.Plugins.AbstractPlugin.prototype
-     * @type {String} Serialized DOM
-     */
-    getSerializedDOM: function(){
-        // Force to set all resource IDs
-        var serializedDOM = DataManager.serializeDOM( this.facade );
-
-        //add namespaces
-        serializedDOM = '<?xml version="1.0" encoding="utf-8"?>' +
-        '<html xmlns="http://www.w3.org/1999/xhtml" ' +
-        'xmlns:b3mn="http://b3mn.org/2007/b3mn" ' +
-        'xmlns:ext="http://b3mn.org/2007/ext" ' +
-        'xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" ' +
-        'xmlns:atom="http://b3mn.org/2007/atom+xhtml">' +
-        '<head profile="http://purl.org/NET/erdf/profile">' +
-        '<link rel="schema.dc" href="http://purl.org/dc/elements/1.1/" />' +
-        '<link rel="schema.dcTerms" href="http://purl.org/dc/terms/ " />' +
-        '<link rel="schema.b3mn" href="http://b3mn.org" />' +
-        '<link rel="schema.oryx" href="http://oryx-editor.org/" />' +
-        '<link rel="schema.raziel" href="http://raziel.org/" />' +
-        '<base href="' +
-        location.href.split("?")[0] +
-        '" />' +
-        '</head><body>' +
-        serializedDOM +
-        '</body></html>';
-
-        return serializedDOM;
-    },
-
-    /**
-     * Sets the editor in read only mode: Edges/ dockers cannot be moved anymore,
-     * shapes cannot be selected anymore.
-     * @methodOf ORYX.Plugins.AbstractPlugin.prototype
-     */
-    enableReadOnlyMode: function(){
-        //Edges cannot be moved anymore
-        this.facade.disableEvent(ORYX.CONFIG.EVENT_MOUSEDOWN);
-
-        // Stop the user from editing the diagram while the plugin is active
-        this._stopSelectionChange = function(){
-            if(this.facade.getSelection().length > 0) {
-                this.facade.setSelection([]);
-            }
-        };
-        this.facade.registerOnEvent(ORYX.CONFIG.EVENT_SELECTION_CHANGED, this._stopSelectionChange.bind(this));
-    },
-    /**
-     * Disables read only mode, see @see
-     * @methodOf ORYX.Plugins.AbstractPlugin.prototype
-     * @see ORYX.Plugins.AbstractPlugin.prototype.enableReadOnlyMode
-     */
-    disableReadOnlyMode: function(){
-        // Edges can be moved now again
-        this.facade.enableEvent(ORYX.CONFIG.EVENT_MOUSEDOWN);
-
-        if (this._stopSelectionChange) {
-            this.facade.unregisterOnEvent(ORYX.CONFIG.EVENT_SELECTION_CHANGED, this._stopSelectionChange.bind(this));
-            this._stopSelectionChange = undefined;
-        }
-    },
-
-    /**
-     * Extracts RDF from DOM.
-     * @methodOf ORYX.Plugins.AbstractPlugin.prototype
-     * @type {String} Extracted RFD. Null if there are transformation errors.
-     */
-    getRDFFromDOM: function(){
-        //convert to RDF
+	/**
+	 * Serializes DOM.
+	 * @methodOf ORYX.Plugins.AbstractPlugin.prototype
+	 * @type {String} Serialized DOM
+	 */
+	getSerializedDOM: function () {
+		// Force to set all resource IDs
+		var serializedDOM = DataManager.serializeDOM(this.facade);
+
+		//add namespaces
+		serializedDOM = '<?xml version="1.0" encoding="utf-8"?>' +
+			'<html xmlns="http://www.w3.org/1999/xhtml" ' +
+			'xmlns:b3mn="http://b3mn.org/2007/b3mn" ' +
+			'xmlns:ext="http://b3mn.org/2007/ext" ' +
+			'xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" ' +
+			'xmlns:atom="http://b3mn.org/2007/atom+xhtml">' +
+			'<head profile="http://purl.org/NET/erdf/profile">' +
+			'<link rel="schema.dc" href="http://purl.org/dc/elements/1.1/" />' +
+			'<link rel="schema.dcTerms" href="http://purl.org/dc/terms/ " />' +
+			'<link rel="schema.b3mn" href="http://b3mn.org" />' +
+			'<link rel="schema.oryx" href="http://oryx-editor.org/" />' +
+			'<link rel="schema.raziel" href="http://raziel.org/" />' +
+			'<base href="' +
+			location.href.split("?")[0] +
+			'" />' +
+			'</head><body>' +
+			serializedDOM +
+			'</body></html>';
+
+		return serializedDOM;
+	},
+
+	/**
+	 * Sets the editor in read only mode: Edges/ dockers cannot be moved anymore,
+	 * shapes cannot be selected anymore.
+	 * @methodOf ORYX.Plugins.AbstractPlugin.prototype
+	 */
+	enableReadOnlyMode: function () {
+		//Edges cannot be moved anymore
+		this.facade.disableEvent(ORYX.CONFIG.EVENT_MOUSEDOWN);
+
+		// Stop the user from editing the diagram while the plugin is active
+		this._stopSelectionChange = function () {
+			if (this.facade.getSelection().length > 0) {
+				this.facade.setSelection([]);
+			}
+		};
+		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_SELECTION_CHANGED, this._stopSelectionChange.bind(this));
+	},
+	/**
+	 * Disables read only mode, see @see
+	 * @methodOf ORYX.Plugins.AbstractPlugin.prototype
+	 * @see ORYX.Plugins.AbstractPlugin.prototype.enableReadOnlyMode
+	 */
+	disableReadOnlyMode: function () {
+		// Edges can be moved now again
+		this.facade.enableEvent(ORYX.CONFIG.EVENT_MOUSEDOWN);
+
+		if (this._stopSelectionChange) {
+			this.facade.unregisterOnEvent(ORYX.CONFIG.EVENT_SELECTION_CHANGED, this._stopSelectionChange.bind(this));
+			this._stopSelectionChange = undefined;
+		}
+	},
+
+	/**
+	 * Extracts RDF from DOM.
+	 * @methodOf ORYX.Plugins.AbstractPlugin.prototype
+	 * @type {String} Extracted RFD. Null if there are transformation errors.
+	 */
+	getRDFFromDOM: function () {
+		//convert to RDF
 		try {
 			var xsl = "";
-			source=ORYX.PATH + "lib/extract-rdf.xsl";
+			source = ORYX.PATH + "lib/extract-rdf.xsl";
 			new Ajax.Request(source, {
 				asynchronous: false,
 				method: 'get',
-				onSuccess: function(transport){
+				onSuccess: function (transport) {
 					xsl = transport.responseText
 				}.bind(this),
-				onFailure: (function(transport){
+				onFailure: (function (transport) {
 					ORYX.Log.error("XSL load failed" + transport);
 				}).bind(this)
 			});
@@ -17150,23 +17558,23 @@ ORYX.Plugins.AbstractPlugin = Clazz.extend({
 			var serializer = new XMLSerializer();
 
 			return serializer.serializeToString(result);
-		} catch(e){
+		} catch (e) {
 			console.log("error serializing " + e);
 			return "";
 		}
 
 
-    },
+	},
 
-    /**
+	/**
 	 * Checks if a certain stencil set is loaded right now.
 	 *
 	 */
-	isStencilSetExtensionLoaded: function(stencilSetExtensionNamespace) {
+	isStencilSetExtensionLoaded: function (stencilSetExtensionNamespace) {
 		return this.facade.getStencilSets().values().any(
-			function(ss){
+			function (ss) {
 				return ss.extensions().keys().any(
-					function(extensionKey) {
+					function (extensionKey) {
 						return extensionKey == stencilSetExtensionNamespace;
 					}.bind(this)
 				);
@@ -17181,20 +17589,17 @@ ORYX.Plugins.AbstractPlugin = Clazz.extend({
 	 * class
 	 * @param {Object} shapes
 	 */
-	doLayout: function(shapes){
+	doLayout: function (shapes) {
 		// Raises a do layout event
-		if (this.facade.raiseEvent)
-		{
+		if (this.facade.raiseEvent) {
 			this.facade.raiseEvent({
-				type		: ORYX.CONFIG.EVENT_LAYOUT,
-				shapes		: shapes
+				type: ORYX.CONFIG.EVENT_LAYOUT,
+				shapes: shapes
 			});
-		}
-		else
-		{
+		} else {
 			this.facade.handleEvents({
-				type		: ORYX.CONFIG.EVENT_LAYOUT,
-				shapes		: shapes
+				type: ORYX.CONFIG.EVENT_LAYOUT,
+				shapes: shapes
 			});
 		}
 	},
@@ -17207,12 +17612,14 @@ ORYX.Plugins.AbstractPlugin = Clazz.extend({
 	 * @param {ORYX.Core.Node} node
 	 * @param {Array} edges
 	 */
-	layoutEdges : function(node, allEdges, offset){
+	layoutEdges: function (node, allEdges, offset) {
 
-		if (!this.facade.isExecutingCommands()){ return }
+		if (!this.facade.isExecutingCommands()) {
+			return
+		}
 
 		var Command = ORYX.Core.Command.extend({
-			construct: function(edges, node, offset, plugin){
+			construct: function (edges, node, offset, plugin) {
 				this.edges = edges;
 				this.node = node;
 				this.plugin = plugin;
@@ -17220,21 +17627,23 @@ ORYX.Plugins.AbstractPlugin = Clazz.extend({
 
 				// Get the new absolute center
 				var center = node.absoluteXY();
-				this.ulo = {x: center.x - offset.x, y:center.y - offset.y};
+				this.ulo = {x: center.x - offset.x, y: center.y - offset.y};
 
 
 			},
-			execute: function(){
+			execute: function () {
 
-				if (this.changes){
+				if (this.changes) {
 					this.executeAgain();
 					return;
 				} else {
 					this.changes = [];
-					this.edges.each(function(edge){
+					this.edges.each(function (edge) {
 						this.changes.push({
 							edge: edge,
-							oldDockerPositions: edge.dockers.map(function(r){ return r.bounds.center() })
+							oldDockerPositions: edge.dockers.map(function (r) {
+								return r.bounds.center()
+							})
 						})
 					}.bind(this));
 				}
@@ -17243,21 +17652,27 @@ ORYX.Plugins.AbstractPlugin = Clazz.extend({
 				// have more than two dockers
 				this.edges
 					// Find all edges with more than two dockers
-					.findAll(function(r){ return r.dockers.length > 2 }.bind(this))
+					.findAll(function (r) {
+						return r.dockers.length > 2
+					}.bind(this))
 					// For every edge, check second and one before last docker
 					// if there are horizontal/vertical on the same level
 					// and if so, align the the bounds
-					.each(function(edge){
-						if (edge.dockers.first().getDockedShape() === this.node){
+					.each(function (edge) {
+						if (edge.dockers.first().getDockedShape() === this.node) {
 							var second = edge.dockers[1];
-							if (this.align(second.bounds, edge.dockers.first())){ second.update(); }
+							if (this.align(second.bounds, edge.dockers.first())) {
+								second.update();
+							}
 						} else if (edge.dockers.last().getDockedShape() === this.node) {
-							var beforeLast = edge.dockers[edge.dockers.length-2];
-							if (this.align(beforeLast.bounds, edge.dockers.last())){ beforeLast.update(); }
+							var beforeLast = edge.dockers[edge.dockers.length - 2];
+							if (this.align(beforeLast.bounds, edge.dockers.last())) {
+								beforeLast.update();
+							}
 						}
 						edge._update(true);
 						edge.removeUnusedDockers();
-						if (this.isBendPointIncluded(edge)){
+						if (this.isBendPointIncluded(edge)) {
 							this.plugin.doLayout(edge);
 							return;
 						}
@@ -17269,19 +17684,21 @@ ORYX.Plugins.AbstractPlugin = Clazz.extend({
 				// Do layout with those edges
 				this.edges
 					// Find all edges with exactly two dockers
-					.each(function(edge){
-						if (edge.dockers.length == 2){
+					.each(function (edge) {
+						if (edge.dockers.length == 2) {
 							var p1 = edge.dockers.first().getAbsoluteReferencePoint() || edge.dockers.first().bounds.center();
 							var p2 = edge.dockers.last().getAbsoluteReferencePoint() || edge.dockers.first().bounds.center();
 							// Find all horizontal/vertical edges
-							if (Math.abs(-Math.abs(p1.x - p2.x) + Math.abs(this.offset.x)) < 2 || Math.abs(-Math.abs(p1.y - p2.y) + Math.abs(this.offset.y)) < 2){
+							if (Math.abs(-Math.abs(p1.x - p2.x) + Math.abs(this.offset.x)) < 2 || Math.abs(-Math.abs(p1.y - p2.y) + Math.abs(this.offset.y)) < 2) {
 								this.plugin.doLayout(edge);
 							}
 						}
 					}.bind(this));
 
-				this.edges.each(function(edge, i){
-					this.changes[i].dockerPositions = edge.dockers.map(function(r){ return r.bounds.center() });
+				this.edges.each(function (edge, i) {
+					this.changes[i].dockerPositions = edge.dockers.map(function (r) {
+						return r.bounds.center()
+					});
 				}.bind(this));
 
 			},
@@ -17291,30 +17708,30 @@ ORYX.Plugins.AbstractPlugin = Clazz.extend({
 			 * @params {Object} bounds
 			 * @params {Object} bounds2
 			 */
-			align: function(bounds, refDocker){
+			align: function (bounds, refDocker) {
 
 				var abRef = refDocker.getAbsoluteReferencePoint() || refDocker.bounds.center();
 
-				var xdif = bounds.center().x-abRef.x;
-				var ydif = bounds.center().y-abRef.y;
-				if (Math.abs(-Math.abs(xdif) + Math.abs(this.offset.x)) < 3 && this.offset.xs === undefined){
-					bounds.moveBy({x:-xdif, y:0})
+				var xdif = bounds.center().x - abRef.x;
+				var ydif = bounds.center().y - abRef.y;
+				if (Math.abs(-Math.abs(xdif) + Math.abs(this.offset.x)) < 3 && this.offset.xs === undefined) {
+					bounds.moveBy({x: -xdif, y: 0})
 				}
-				if (Math.abs(-Math.abs(ydif) + Math.abs(this.offset.y)) < 3 && this.offset.ys === undefined){
-					bounds.moveBy({y:-ydif, x:0})
+				if (Math.abs(-Math.abs(ydif) + Math.abs(this.offset.y)) < 3 && this.offset.ys === undefined) {
+					bounds.moveBy({y: -ydif, x: 0})
 				}
 
-				if (this.offset.xs !== undefined || this.offset.ys !== undefined){
+				if (this.offset.xs !== undefined || this.offset.ys !== undefined) {
 					var absPXY = refDocker.getDockedShape().absoluteXY();
-					xdif = bounds.center().x-(absPXY.x+((abRef.x-absPXY.x)/this.offset.xs));
-					ydif = bounds.center().y-(absPXY.y+((abRef.y-absPXY.y)/this.offset.ys));
+					xdif = bounds.center().x - (absPXY.x + ((abRef.x - absPXY.x) / this.offset.xs));
+					ydif = bounds.center().y - (absPXY.y + ((abRef.y - absPXY.y) / this.offset.ys));
 
-					if (Math.abs(-Math.abs(xdif) + Math.abs(this.offset.x)) < 3){
-						bounds.moveBy({x:-(bounds.center().x-abRef.x), y:0})
+					if (Math.abs(-Math.abs(xdif) + Math.abs(this.offset.x)) < 3) {
+						bounds.moveBy({x: -(bounds.center().x - abRef.x), y: 0})
 					}
 
-					if (Math.abs(-Math.abs(ydif) + Math.abs(this.offset.y)) < 3){
-						bounds.moveBy({y:-(bounds.center().y-abRef.y), x:0})
+					if (Math.abs(-Math.abs(ydif) + Math.abs(this.offset.y)) < 3) {
+						bounds.moveBy({y: -(bounds.center().y - abRef.y), x: 0})
 					}
 				}
 			},
@@ -17322,7 +17739,7 @@ ORYX.Plugins.AbstractPlugin = Clazz.extend({
 			/**
 			 * Returns a TRUE if there are bend point which overlay the shape
 			 */
-			isBendPointIncluded: function(edge){
+			isBendPointIncluded: function (edge) {
 				// Get absolute bounds
 				var ab = edge.dockers.first().getDockedShape();
 				var bb = edge.dockers.last().getDockedShape();
@@ -17338,26 +17755,28 @@ ORYX.Plugins.AbstractPlugin = Clazz.extend({
 				}
 
 				return edge.dockers
-						.any(function(docker, i){
-							var c = docker.bounds.center();
-									// Dont count first and last
-							return 	i != 0 && i != edge.dockers.length-1 &&
-									// Check if the point is included to the absolute bounds
-									((ab && ab.isIncluded(c)) || (bb && bb.isIncluded(c)))
-						})
+					.any(function (docker, i) {
+						var c = docker.bounds.center();
+						// Dont count first and last
+						return i != 0 && i != edge.dockers.length - 1 &&
+							// Check if the point is included to the absolute bounds
+							((ab && ab.isIncluded(c)) || (bb && bb.isIncluded(c)))
+					})
 			},
 
-			removeAllDocker: function(edge){
-				edge.dockers.slice(1, edge.dockers.length-1).each(function(docker){
+			removeAllDocker: function (edge) {
+				edge.dockers.slice(1, edge.dockers.length - 1).each(function (docker) {
 					edge.removeDocker(docker);
 				})
 			},
-			executeAgain: function(){
-				this.changes.each(function(change){
+			executeAgain: function () {
+				this.changes.each(function (change) {
 					// Reset the dockers
 					this.removeAllDocker(change.edge);
-					change.dockerPositions.each(function(pos, i){
-						if (i==0||i==change.dockerPositions.length-1){ return }
+					change.dockerPositions.each(function (pos, i) {
+						if (i == 0 || i == change.dockerPositions.length - 1) {
+							return
+						}
 						var docker = change.edge.createDocker(undefined, pos);
 						docker.bounds.centerMoveTo(pos);
 						docker.update();
@@ -17365,12 +17784,14 @@ ORYX.Plugins.AbstractPlugin = Clazz.extend({
 					change.edge._update(true);
 				}.bind(this));
 			},
-			rollback: function(){
-				this.changes.each(function(change){
+			rollback: function () {
+				this.changes.each(function (change) {
 					// Reset the dockers
 					this.removeAllDocker(change.edge);
-					change.oldDockerPositions.each(function(pos, i){
-						if (i==0||i==change.oldDockerPositions.length-1){ return }
+					change.oldDockerPositions.each(function (pos, i) {
+						if (i == 0 || i == change.oldDockerPositions.length - 1) {
+							return
+						}
 						var docker = change.edge.createDocker(undefined, pos);
 						docker.bounds.centerMoveTo(pos);
 						docker.update();
@@ -17393,16 +17814,20 @@ ORYX.Plugins.AbstractPlugin = Clazz.extend({
  * All code Copyright 2013 KIS Consultancy all rights reserved
  */
 
-if(!ORYX){ var ORYX = {} }
-if(!ORYX.Plugins){ ORYX.Plugins = {} }
+if (!ORYX) {
+	var ORYX = {}
+}
+if (!ORYX.Plugins) {
+	ORYX.Plugins = {}
+}
 
 /**
-   This abstract plugin implements the core behaviour of layout
+ This abstract plugin implements the core behaviour of layout
 
-   @class ORYX.Plugins.AbstractLayouter
-   @constructor Creates a new instance
-   @author Willi Tscheschner
-*/
+ @class ORYX.Plugins.AbstractLayouter
+ @constructor Creates a new instance
+ @author Willi Tscheschner
+ */
 ORYX.Plugins.AbstractLayouter = ORYX.Plugins.AbstractPlugin.extend({
 
 	/**
@@ -17410,17 +17835,17 @@ ORYX.Plugins.AbstractLayouter = ORYX.Plugins.AbstractPlugin.extend({
 	 * It can be one value or an array of values. The value
 	 * can be a Stencil ID (as String) or an class type of either
 	 * a ORYX.Core.Node or ORYX.Core.Edge
-     * @type Array|String|Object
-     * @memberOf ORYX.Plugins.AbstractLayouter.prototype
+	 * @type Array|String|Object
+	 * @memberOf ORYX.Plugins.AbstractLayouter.prototype
 	 */
-	layouted : [],
+	layouted: [],
 
 	/**
 	 * Constructor
 	 * @param {Object} facade
 	 * @memberOf ORYX.Plugins.AbstractLayouter.prototype
 	 */
-	construct: function( facade ){
+	construct: function (facade) {
 		arguments.callee.$.construct.apply(this, arguments);
 
 		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_LAYOUT, this._initLayout.bind(this));
@@ -17429,10 +17854,10 @@ ORYX.Plugins.AbstractLayouter = ORYX.Plugins.AbstractPlugin.extend({
 	/**
 	 * Proofs if this shape should be layouted or not
 	 * @param {Object} shape
-     * @memberOf ORYX.Plugins.AbstractLayouter.prototype
+	 * @memberOf ORYX.Plugins.AbstractLayouter.prototype
 	 */
-	isIncludedInLayout: function(shape){
-		if (!(this.layouted instanceof Array)){
+	isIncludedInLayout: function (shape) {
+		if (!(this.layouted instanceof Array)) {
 			this.layouted = [this.layouted].compact();
 		}
 
@@ -17444,7 +17869,7 @@ ORYX.Plugins.AbstractLayouter = ORYX.Plugins.AbstractPlugin.extend({
 
 		// Return TRUE if there is any correlation between
 		// the 'layouted' attribute and the shape themselve.
-		return this.layouted.any(function(s){
+		return this.layouted.any(function (s) {
 			if (typeof s == "string") {
 				return shape.getStencil().id().include(s);
 			} else {
@@ -17457,20 +17882,20 @@ ORYX.Plugins.AbstractLayouter = ORYX.Plugins.AbstractPlugin.extend({
 	 * Callback to start the layouting
 	 * @param {Object} event Layout event
 	 * @param {Object} shapes Given shapes
-     * @memberOf ORYX.Plugins.AbstractLayouter.prototype
+	 * @memberOf ORYX.Plugins.AbstractLayouter.prototype
 	 */
-	_initLayout: function(event){
+	_initLayout: function (event) {
 
 		// Get the shapes
 		var shapes = [event.shapes].flatten().compact();
 
 		// Find all shapes which should be layouted
-		var toLayout = shapes.findAll(function(shape){
+		var toLayout = shapes.findAll(function (shape) {
 			return this.isIncludedInLayout(shape)
 		}.bind(this))
 
 		// If there are shapes left
-		if (toLayout.length > 0){
+		if (toLayout.length > 0) {
 			// Do layout
 			this.layout(toLayout);
 		}
@@ -17479,9 +17904,9 @@ ORYX.Plugins.AbstractLayouter = ORYX.Plugins.AbstractPlugin.extend({
 	/**
 	 * Implementation of layouting a set on shapes
 	 * @param {Object} shapes Given shapes
-     * @memberOf ORYX.Plugins.AbstractLayouter.prototype
+	 * @memberOf ORYX.Plugins.AbstractLayouter.prototype
 	 */
-	layout: function(shapes){
+	layout: function (shapes) {
 		throw new Error("Layouter has to implement the layout function.")
 	}
 });/*
@@ -17495,90 +17920,90 @@ ORYX.Plugins.AbstractLayouter = ORYX.Plugins.AbstractPlugin.extend({
  */
 
 if (!ORYX.Plugins)
-    ORYX.Plugins = new Object();
+	ORYX.Plugins = new Object();
 
 ORYX.Plugins.Edit = Clazz.extend({
 
-    construct: function(facade){
+	construct: function (facade) {
 
-        this.facade = facade;
-        this.clipboard = new ORYX.Plugins.Edit.ClipBoard();
+		this.facade = facade;
+		this.clipboard = new ORYX.Plugins.Edit.ClipBoard();
 
-        //this.facade.registerOnEvent(ORYX.CONFIG.EVENT_KEYDOWN, this.keyHandler.bind(this));
+		//this.facade.registerOnEvent(ORYX.CONFIG.EVENT_KEYDOWN, this.keyHandler.bind(this));
 
-        this.facade.offer({
-         name: ORYX.I18N.Edit.cut,
-         description: ORYX.I18N.Edit.cutDesc,
-         icon: ORYX.PATH + "images/cut.png",
-		 keyCodes: [{
+		this.facade.offer({
+			name: ORYX.I18N.Edit.cut,
+			description: ORYX.I18N.Edit.cutDesc,
+			icon: ORYX.PATH + "images/cut.png",
+			keyCodes: [{
 				metaKeys: [ORYX.CONFIG.META_KEY_META_CTRL],
 				keyCode: 88,
 				keyAction: ORYX.CONFIG.KEY_ACTION_DOWN
 			}
-		 ],
-         functionality: this.callEdit.bind(this, this.editCut),
-         group: ORYX.I18N.Edit.group,
-         index: 1,
-         minShape: 1
-         });
-
-        this.facade.offer({
-         name: ORYX.I18N.Edit.copy,
-         description: ORYX.I18N.Edit.copyDesc,
-         icon: ORYX.PATH + "images/page_copy.png",
-		 keyCodes: [{
+			],
+			functionality: this.callEdit.bind(this, this.editCut),
+			group: ORYX.I18N.Edit.group,
+			index: 1,
+			minShape: 1
+		});
+
+		this.facade.offer({
+			name: ORYX.I18N.Edit.copy,
+			description: ORYX.I18N.Edit.copyDesc,
+			icon: ORYX.PATH + "images/page_copy.png",
+			keyCodes: [{
 				metaKeys: [ORYX.CONFIG.META_KEY_META_CTRL],
 				keyCode: 67,
 				keyAction: ORYX.CONFIG.KEY_ACTION_DOWN
 			}
-		 ],
-         functionality: this.callEdit.bind(this, this.editCopy, [true, false]),
-         group: ORYX.I18N.Edit.group,
-         index: 2,
-         minShape: 1
-         });
-
-        this.facade.offer({
-         name: ORYX.I18N.Edit.paste,
-         description: ORYX.I18N.Edit.pasteDesc,
-         icon: ORYX.PATH + "images/page_paste.png",
-		 keyCodes: [{
+			],
+			functionality: this.callEdit.bind(this, this.editCopy, [true, false]),
+			group: ORYX.I18N.Edit.group,
+			index: 2,
+			minShape: 1
+		});
+
+		this.facade.offer({
+			name: ORYX.I18N.Edit.paste,
+			description: ORYX.I18N.Edit.pasteDesc,
+			icon: ORYX.PATH + "images/page_paste.png",
+			keyCodes: [{
 				metaKeys: [ORYX.CONFIG.META_KEY_META_CTRL],
 				keyCode: 86,
 				keyAction: ORYX.CONFIG.KEY_ACTION_DOWN
 			}
-		 ],
-         functionality: this.callEdit.bind(this, this.editPaste),
-         isEnabled: this.clipboard.isOccupied.bind(this.clipboard),
-         group: ORYX.I18N.Edit.group,
-         index: 3,
-         minShape: 0,
-         maxShape: 0
-         });
-
-        this.facade.offer({
-            name: ORYX.I18N.Edit.del,
-            description: ORYX.I18N.Edit.delDesc,
-            icon: ORYX.PATH + "images/cross.png",
+			],
+			functionality: this.callEdit.bind(this, this.editPaste),
+			isEnabled: this.clipboard.isOccupied.bind(this.clipboard),
+			group: ORYX.I18N.Edit.group,
+			index: 3,
+			minShape: 0,
+			maxShape: 0
+		});
+
+		this.facade.offer({
+			name: ORYX.I18N.Edit.del,
+			description: ORYX.I18N.Edit.delDesc,
+			icon: ORYX.PATH + "images/cross.png",
 			keyCodes: [{
-					metaKeys: [ORYX.CONFIG.META_KEY_META_CTRL],
-					keyCode: 8,
-					keyAction: ORYX.CONFIG.KEY_ACTION_DOWN
-				},
+				metaKeys: [ORYX.CONFIG.META_KEY_META_CTRL],
+				keyCode: 8,
+				keyAction: ORYX.CONFIG.KEY_ACTION_DOWN
+			},
 				{
 					keyCode: 46,
 					keyAction: ORYX.CONFIG.KEY_ACTION_DOWN
 				}
 			],
-            functionality: this.callEdit.bind(this, this.editDelete),
-            group: ORYX.I18N.Edit.group,
-            index: 4,
-            minShape: 1
-        });
-    },
-
-	callEdit: function(fn, args){
-		window.setTimeout(function(){
+			functionality: this.callEdit.bind(this, this.editDelete),
+			group: ORYX.I18N.Edit.group,
+			index: 4,
+			minShape: 1
+		});
+	},
+
+	callEdit: function (fn, args) {
+		window.setTimeout(function () {
 			fn.apply(this, (args instanceof Array ? args : []));
 		}.bind(this), 1);
 	},
@@ -17587,8 +18012,8 @@ ORYX.Plugins.Edit = Clazz.extend({
 	 * Handles the mouse down event and starts the copy-move-paste action, if
 	 * control or meta key is pressed.
 	 */
-	handleMouseDown: function(event) {
-		if(this._controlPressed) {
+	handleMouseDown: function (event) {
+		if (this._controlPressed) {
 			this._controlPressed = false;
 			this.editCopy();
 //			console.log("copiedEle: %0",this.clipboard.shapesAsJson)
@@ -17600,14 +18025,14 @@ ORYX.Plugins.Edit = Clazz.extend({
 		}
 	},
 
-    /**
-     * The key handler for this plugin. Every action from the set of cut, copy,
-     * paste and delete should be accessible trough simple keyboard shortcuts.
-     * This method checks whether any event triggers one of those actions.
-     *
-     * @param {Object} event The keyboard event that should be analysed for
-     *     triggering of this plugin.
-     */
+	/**
+	 * The key handler for this plugin. Every action from the set of cut, copy,
+	 * paste and delete should be accessible trough simple keyboard shortcuts.
+	 * This method checks whether any event triggers one of those actions.
+	 *
+	 * @param {Object} event The keyboard event that should be analysed for
+	 *     triggering of this plugin.
+	 */
 //    keyHandler: function(event){
 //        //TODO document what event.which is.
 //
@@ -17656,314 +18081,322 @@ ORYX.Plugins.Edit = Clazz.extend({
 //         }
 //    },
 
-    /**
-     * Returns a list of shapes which should be considered while copying.
-     * Besides the shapes of given ones, edges and attached nodes are added to the result set.
-     * If one of the given shape is a child of another given shape, it is not put into the result.
-     */
-    getAllShapesToConsider: function(shapes){
-        var shapesToConsider = []; // only top-level shapes
-        var childShapesToConsider = []; // all child shapes of top-level shapes
-
-        shapes.each(function(shape){
-            //Throw away these shapes which have a parent in given shapes
-            isChildShapeOfAnother = shapes.any(function(s2){
-                return s2.hasChildShape(shape);
-            });
-            if(isChildShapeOfAnother) return;
-
-            // This shape should be considered
-            shapesToConsider.push(shape);
-            // Consider attached nodes (e.g. intermediate events)
-            if (shape instanceof ORYX.Core.Node) {
+	/**
+	 * Returns a list of shapes which should be considered while copying.
+	 * Besides the shapes of given ones, edges and attached nodes are added to the result set.
+	 * If one of the given shape is a child of another given shape, it is not put into the result.
+	 */
+	getAllShapesToConsider: function (shapes) {
+		var shapesToConsider = []; // only top-level shapes
+		var childShapesToConsider = []; // all child shapes of top-level shapes
+
+		shapes.each(function (shape) {
+			//Throw away these shapes which have a parent in given shapes
+			isChildShapeOfAnother = shapes.any(function (s2) {
+				return s2.hasChildShape(shape);
+			});
+			if (isChildShapeOfAnother) return;
+
+			// This shape should be considered
+			shapesToConsider.push(shape);
+			// Consider attached nodes (e.g. intermediate events)
+			if (shape instanceof ORYX.Core.Node) {
 				var attached = shape.getOutgoingNodes();
-				attached = attached.findAll(function(a){ return !shapes.include(a) });
-                shapesToConsider = shapesToConsider.concat(attached);
-            }
+				attached = attached.findAll(function (a) {
+					return !shapes.include(a)
+				});
+				shapesToConsider = shapesToConsider.concat(attached);
+			}
+
+			childShapesToConsider = childShapesToConsider.concat(shape.getChildShapes(true));
+		}.bind(this));
+
+		// All edges between considered child shapes should be considered
+		// Look for these edges having incoming and outgoing in childShapesToConsider
+		var edgesToConsider = this.facade.getCanvas().getChildEdges().select(function (edge) {
+			// Ignore if already added
+			if (shapesToConsider.include(edge)) return false;
+			// Ignore if there are no docked shapes
+			if (edge.getAllDockedShapes().size() === 0) return false;
+			// True if all docked shapes are in considered child shapes
+			return edge.getAllDockedShapes().all(function (shape) {
+				// Remember: Edges can have other edges on outgoing, that is why edges must not be included in childShapesToConsider
+				return shape instanceof ORYX.Core.Edge || childShapesToConsider.include(shape);
+			});
+		});
+		shapesToConsider = shapesToConsider.concat(edgesToConsider);
+
+		return shapesToConsider;
+	},
+
+	/**
+	 * Performs the cut operation by first copy-ing and then deleting the
+	 * current selection.
+	 */
+	editCut: function () {
+		//TODO document why this returns false.
+		//TODO document what the magic boolean parameters are supposed to do.
+
+		this.editCopy(false, true);
+		this.editDelete(true);
+		return false;
+	},
+
+	/**
+	 * Performs the copy operation.
+	 * @param {Object} will_not_update ??
+	 */
+	editCopy: function (will_update, useNoOffset) {
+		var selection = this.facade.getSelection();
+
+		//if the selection is empty, do not remove the previously copied elements
+		if (selection.length == 0) return;
+
+		this.clipboard.refresh(selection, this.getAllShapesToConsider(selection), this.facade.getCanvas().getStencil().stencilSet().namespace(), useNoOffset);
 
-            childShapesToConsider = childShapesToConsider.concat(shape.getChildShapes(true));
-        }.bind(this));
-
-        // All edges between considered child shapes should be considered
-        // Look for these edges having incoming and outgoing in childShapesToConsider
-        var edgesToConsider = this.facade.getCanvas().getChildEdges().select(function(edge){
-            // Ignore if already added
-            if(shapesToConsider.include(edge)) return false;
-            // Ignore if there are no docked shapes
-            if(edge.getAllDockedShapes().size() === 0) return false;
-            // True if all docked shapes are in considered child shapes
-            return edge.getAllDockedShapes().all(function(shape){
-                // Remember: Edges can have other edges on outgoing, that is why edges must not be included in childShapesToConsider
-                return shape instanceof ORYX.Core.Edge || childShapesToConsider.include(shape);
-            });
-        });
-        shapesToConsider = shapesToConsider.concat(edgesToConsider);
-
-        return shapesToConsider;
-    },
-
-    /**
-     * Performs the cut operation by first copy-ing and then deleting the
-     * current selection.
-     */
-    editCut: function(){
-        //TODO document why this returns false.
-        //TODO document what the magic boolean parameters are supposed to do.
-
-        this.editCopy(false, true);
-        this.editDelete(true);
-        return false;
-    },
-
-    /**
-     * Performs the copy operation.
-     * @param {Object} will_not_update ??
-     */
-    editCopy: function( will_update, useNoOffset ){
-        var selection = this.facade.getSelection();
-
-        //if the selection is empty, do not remove the previously copied elements
-        if(selection.length == 0) return;
-
-        this.clipboard.refresh(selection, this.getAllShapesToConsider(selection), this.facade.getCanvas().getStencil().stencilSet().namespace(), useNoOffset);
-
-        if( will_update ) this.facade.updateSelection();
-    },
-
-    /**
-     * Performs the paste operation.
-     */
-    editPaste: function(){
-        // Create a new canvas with childShapes
+		if (will_update) this.facade.updateSelection();
+	},
+
+	/**
+	 * Performs the paste operation.
+	 */
+	editPaste: function () {
+		// Create a new canvas with childShapes
 		//and stencilset namespace to be JSON Import conform
 		var canvas = {
-            childShapes: this.clipboard.shapesAsJson,
-			stencilset:{
-				namespace:this.clipboard.SSnamespace
+			childShapes: this.clipboard.shapesAsJson,
+			stencilset: {
+				namespace: this.clipboard.SSnamespace
 			}
-        };
-        // Apply json helper to iterate over json object
+		};
+		// Apply json helper to iterate over json object
 		jQuery.extend(canvas, ORYX.Core.AbstractShape.JSONHelper);
 
-        var childShapeResourceIds = canvas.getChildShapes(true).pluck("resourceId");
-        var outgoings = {};
-        // Iterate over all shapes
-        canvas.eachChild(function(shape, parent){
-            // Throw away these references where referenced shape isn't copied
-            shape.outgoing = shape.outgoing.select(function(out){
-                return childShapeResourceIds.include(out.resourceId);
-            });
-			shape.outgoing.each(function(out){
-				if (!outgoings[out.resourceId]){ outgoings[out.resourceId] = []; }
+		var childShapeResourceIds = canvas.getChildShapes(true).pluck("resourceId");
+		var outgoings = {};
+		// Iterate over all shapes
+		canvas.eachChild(function (shape, parent) {
+			// Throw away these references where referenced shape isn't copied
+			shape.outgoing = shape.outgoing.select(function (out) {
+				return childShapeResourceIds.include(out.resourceId);
+			});
+			shape.outgoing.each(function (out) {
+				if (!outgoings[out.resourceId]) {
+					outgoings[out.resourceId] = [];
+				}
 				outgoings[out.resourceId].push(shape);
 			});
 
-            return shape;
-        }.bind(this), true, true);
+			return shape;
+		}.bind(this), true, true);
 
 
-        // Iterate over all shapes
-        canvas.eachChild(function(shape, parent){
+		// Iterate over all shapes
+		canvas.eachChild(function (shape, parent) {
 
-        	// Check if there has a valid target
-            if(shape.target && !(childShapeResourceIds.include(shape.target.resourceId))){
-                shape.target = undefined;
-                shape.targetRemoved = true;
-            }
+			// Check if there has a valid target
+			if (shape.target && !(childShapeResourceIds.include(shape.target.resourceId))) {
+				shape.target = undefined;
+				shape.targetRemoved = true;
+			}
 
-    		// Check if the first docker is removed
-    		if(	shape.dockers &&
-    			shape.dockers.length >= 1 &&
-    			shape.dockers[0].getDocker &&
-    			((shape.dockers[0].getDocker().getDockedShape() &&
-    			!childShapeResourceIds.include(shape.dockers[0].getDocker().getDockedShape().resourceId)) ||
-    			!shape.getShape().dockers[0].getDockedShape()&&!outgoings[shape.resourceId])) {
-
-    			shape.sourceRemoved = true;
-    		}
-
-            return shape;
-        }.bind(this), true, true);
-
-
-        // Iterate over top-level shapes
-        canvas.eachChild(function(shape, parent){
-            // All top-level shapes should get an offset in their bounds
-            // Move the shape occording to COPY_MOVE_OFFSET
-        	if (this.clipboard.useOffset) {
-	            shape.bounds = {
-	                lowerRight: {
-	                    x: shape.bounds.lowerRight.x + ORYX.CONFIG.COPY_MOVE_OFFSET,
-	                    y: shape.bounds.lowerRight.y + ORYX.CONFIG.COPY_MOVE_OFFSET
-	                },
-	                upperLeft: {
-	                    x: shape.bounds.upperLeft.x + ORYX.CONFIG.COPY_MOVE_OFFSET,
-	                    y: shape.bounds.upperLeft.y + ORYX.CONFIG.COPY_MOVE_OFFSET
-	                }
-	            };
-        	}
-            // Only apply offset to shapes with a target
-            if (shape.dockers){
-                shape.dockers = shape.dockers.map(function(docker, i){
-                    // If shape had a target but the copied does not have anyone anymore,
-                    // migrate the relative dockers to absolute ones.
-                    if( (shape.targetRemoved === true && i == shape.dockers.length - 1&&docker.getDocker) ||
-						(shape.sourceRemoved === true && i == 0&&docker.getDocker)){
-
-                        docker = docker.getDocker().bounds.center();
-                    }
+			// Check if the first docker is removed
+			if (shape.dockers &&
+				shape.dockers.length >= 1 &&
+				shape.dockers[0].getDocker &&
+				((shape.dockers[0].getDocker().getDockedShape() &&
+						!childShapeResourceIds.include(shape.dockers[0].getDocker().getDockedShape().resourceId)) ||
+					!shape.getShape().dockers[0].getDockedShape() && !outgoings[shape.resourceId])) {
+
+				shape.sourceRemoved = true;
+			}
+
+			return shape;
+		}.bind(this), true, true);
+
+
+		// Iterate over top-level shapes
+		canvas.eachChild(function (shape, parent) {
+			// All top-level shapes should get an offset in their bounds
+			// Move the shape occording to COPY_MOVE_OFFSET
+			if (this.clipboard.useOffset) {
+				shape.bounds = {
+					lowerRight: {
+						x: shape.bounds.lowerRight.x + ORYX.CONFIG.COPY_MOVE_OFFSET,
+						y: shape.bounds.lowerRight.y + ORYX.CONFIG.COPY_MOVE_OFFSET
+					},
+					upperLeft: {
+						x: shape.bounds.upperLeft.x + ORYX.CONFIG.COPY_MOVE_OFFSET,
+						y: shape.bounds.upperLeft.y + ORYX.CONFIG.COPY_MOVE_OFFSET
+					}
+				};
+			}
+			// Only apply offset to shapes with a target
+			if (shape.dockers) {
+				shape.dockers = shape.dockers.map(function (docker, i) {
+					// If shape had a target but the copied does not have anyone anymore,
+					// migrate the relative dockers to absolute ones.
+					if ((shape.targetRemoved === true && i == shape.dockers.length - 1 && docker.getDocker) ||
+						(shape.sourceRemoved === true && i == 0 && docker.getDocker)) {
+
+						docker = docker.getDocker().bounds.center();
+					}
 
 					// If it is the first docker and it has a docked shape,
 					// just return the coordinates
-				   	if ((i == 0 && docker.getDocker instanceof Function &&
-				   		shape.sourceRemoved !== true && (docker.getDocker().getDockedShape() || ((outgoings[shape.resourceId]||[]).length > 0 && (!(shape.getShape() instanceof ORYX.Core.Node) || outgoings[shape.resourceId][0].getShape() instanceof ORYX.Core.Node)))) ||
+					if ((i == 0 && docker.getDocker instanceof Function &&
+							shape.sourceRemoved !== true && (docker.getDocker().getDockedShape() || ((outgoings[shape.resourceId] || []).length > 0 && (!(shape.getShape() instanceof ORYX.Core.Node) || outgoings[shape.resourceId][0].getShape() instanceof ORYX.Core.Node)))) ||
 						(i == shape.dockers.length - 1 && docker.getDocker instanceof Function &&
-						shape.targetRemoved !== true && (docker.getDocker().getDockedShape() || shape.target))){
+							shape.targetRemoved !== true && (docker.getDocker().getDockedShape() || shape.target))) {
 
 						return {
-                        	x: docker.x,
-                        	y: docker.y,
-                        	getDocker: docker.getDocker
+							x: docker.x,
+							y: docker.y,
+							getDocker: docker.getDocker
 						}
 					} else if (this.clipboard.useOffset) {
-	                    return {
-		                        x: docker.x + ORYX.CONFIG.COPY_MOVE_OFFSET,
-		                        y: docker.y + ORYX.CONFIG.COPY_MOVE_OFFSET,
-	                        	getDocker: docker.getDocker
-		                    };
-				   	} else {
-				   		return {
-                        	x: docker.x,
-                        	y: docker.y,
-                        	getDocker: docker.getDocker
+						return {
+							x: docker.x + ORYX.CONFIG.COPY_MOVE_OFFSET,
+							y: docker.y + ORYX.CONFIG.COPY_MOVE_OFFSET,
+							getDocker: docker.getDocker
+						};
+					} else {
+						return {
+							x: docker.x,
+							y: docker.y,
+							getDocker: docker.getDocker
 						};
-				   	}
-                }.bind(this));
+					}
+				}.bind(this));
 
-            } else if (shape.getShape() instanceof ORYX.Core.Node && shape.dockers && shape.dockers.length > 0 && (!shape.dockers.first().getDocker || shape.sourceRemoved === true || !(shape.dockers.first().getDocker().getDockedShape() || outgoings[shape.resourceId]))){
+			} else if (shape.getShape() instanceof ORYX.Core.Node && shape.dockers && shape.dockers.length > 0 && (!shape.dockers.first().getDocker || shape.sourceRemoved === true || !(shape.dockers.first().getDocker().getDockedShape() || outgoings[shape.resourceId]))) {
 
-            	shape.dockers = shape.dockers.map(function(docker, i){
+				shape.dockers = shape.dockers.map(function (docker, i) {
 
-                    if((shape.sourceRemoved === true && i == 0&&docker.getDocker)){
-                    	docker = docker.getDocker().bounds.center();
-                    }
+					if ((shape.sourceRemoved === true && i == 0 && docker.getDocker)) {
+						docker = docker.getDocker().bounds.center();
+					}
 
-                    if (this.clipboard.useOffset) {
-	            		return {
-	                        x: docker.x + ORYX.CONFIG.COPY_MOVE_OFFSET,
-	                        y: docker.y + ORYX.CONFIG.COPY_MOVE_OFFSET,
-	                    	getDocker: docker.getDocker
-	                    };
-                    } else {
-	            		return {
-	                        x: docker.x,
-	                        y: docker.y,
-	                    	getDocker: docker.getDocker
-	                    };
-                    }
-            	}.bind(this));
-            }
+					if (this.clipboard.useOffset) {
+						return {
+							x: docker.x + ORYX.CONFIG.COPY_MOVE_OFFSET,
+							y: docker.y + ORYX.CONFIG.COPY_MOVE_OFFSET,
+							getDocker: docker.getDocker
+						};
+					} else {
+						return {
+							x: docker.x,
+							y: docker.y,
+							getDocker: docker.getDocker
+						};
+					}
+				}.bind(this));
+			}
 
-            return shape;
-        }.bind(this), false, true);
+			return shape;
+		}.bind(this), false, true);
 
-        this.clipboard.useOffset = true;
-        this.facade.importJSON(canvas);
-    },
+		this.clipboard.useOffset = true;
+		this.facade.importJSON(canvas);
+	},
 
-    /**
-     * Performs the delete operation. No more asking.
-     */
-    editDelete: function(){
-        var selection = this.facade.getSelection();
+	/**
+	 * Performs the delete operation. No more asking.
+	 */
+	editDelete: function () {
+		var selection = this.facade.getSelection();
 
-        var clipboard = new ORYX.Plugins.Edit.ClipBoard();
-        clipboard.refresh(selection, this.getAllShapesToConsider(selection));
+		var clipboard = new ORYX.Plugins.Edit.ClipBoard();
+		clipboard.refresh(selection, this.getAllShapesToConsider(selection));
 
-		var command = new ORYX.Plugins.Edit.DeleteCommand(clipboard , this.facade);
+		var command = new ORYX.Plugins.Edit.DeleteCommand(clipboard, this.facade);
 
 		this.facade.executeCommands([command]);
-    }
+	}
 });
 
 ORYX.Plugins.Edit.ClipBoard = Clazz.extend({
-    construct: function(){
-        this.shapesAsJson = [];
-        this.selection = [];
-		this.SSnamespace="";
-		this.useOffset=true;
-    },
-    isOccupied: function(){
-        return this.shapesAsJson.length > 0;
-    },
-    refresh: function(selection, shapes, namespace, useNoOffset){
-        this.selection = selection;
-        this.SSnamespace=namespace;
-        // Store outgoings, targets and parents to restore them later on
-        this.outgoings = {};
-        this.parents = {};
-        this.targets = {};
-        this.useOffset = useNoOffset !== true;
-
-        this.shapesAsJson = shapes.map(function(shape){
-            var s = shape.toJSON();
-            s.parent = {resourceId : shape.getParentShape().resourceId};
-            s.parentIndex = shape.getParentShape().getChildShapes().indexOf(shape)
-            return s;
-        });
-    }
+	construct: function () {
+		this.shapesAsJson = [];
+		this.selection = [];
+		this.SSnamespace = "";
+		this.useOffset = true;
+	},
+	isOccupied: function () {
+		return this.shapesAsJson.length > 0;
+	},
+	refresh: function (selection, shapes, namespace, useNoOffset) {
+		this.selection = selection;
+		this.SSnamespace = namespace;
+		// Store outgoings, targets and parents to restore them later on
+		this.outgoings = {};
+		this.parents = {};
+		this.targets = {};
+		this.useOffset = useNoOffset !== true;
+
+		this.shapesAsJson = shapes.map(function (shape) {
+			var s = shape.toJSON();
+			s.parent = {resourceId: shape.getParentShape().resourceId};
+			s.parentIndex = shape.getParentShape().getChildShapes().indexOf(shape)
+			return s;
+		});
+	}
 });
 
 ORYX.Plugins.Edit.DeleteCommand = ORYX.Core.Command.extend({
-    construct: function(clipboard, facade){
-        this.clipboard          = clipboard;
-        this.shapesAsJson       = clipboard.shapesAsJson;
-        this.facade             = facade;
-
-        // Store dockers of deleted shapes to restore connections
-        this.dockers            = this.shapesAsJson.map(function(shapeAsJson) {
-            var shape = shapeAsJson.getShape();
-            var incomingDockers = shape.getIncomingShapes().map(function(s){return s.getDockers().last();});
-            var outgoingDockers = shape.getOutgoingShapes().map(function(s){return s.getDockers().first();});
-            var dockers = shape.getDockers().concat(incomingDockers, outgoingDockers).compact().map(function(docker){
-                return {
-                    object: docker,
-                    referencePoint: docker.referencePoint,
-                    dockedShape: docker.getDockedShape()
-                };
-            });
-            return dockers;
-        }).flatten();
-    },
-    execute: function(){
-        this.shapesAsJson.each(function(shapeAsJson){
-            // Delete shape
-            this.facade.deleteShape(shapeAsJson.getShape());
-        }.bind(this));
-
-        this.facade.setSelection([]);
-        this.facade.getCanvas().update();
+	construct: function (clipboard, facade) {
+		this.clipboard = clipboard;
+		this.shapesAsJson = clipboard.shapesAsJson;
+		this.facade = facade;
+
+		// Store dockers of deleted shapes to restore connections
+		this.dockers = this.shapesAsJson.map(function (shapeAsJson) {
+			var shape = shapeAsJson.getShape();
+			var incomingDockers = shape.getIncomingShapes().map(function (s) {
+				return s.getDockers().last();
+			});
+			var outgoingDockers = shape.getOutgoingShapes().map(function (s) {
+				return s.getDockers().first();
+			});
+			var dockers = shape.getDockers().concat(incomingDockers, outgoingDockers).compact().map(function (docker) {
+				return {
+					object: docker,
+					referencePoint: docker.referencePoint,
+					dockedShape: docker.getDockedShape()
+				};
+			});
+			return dockers;
+		}).flatten();
+	},
+	execute: function () {
+		this.shapesAsJson.each(function (shapeAsJson) {
+			// Delete shape
+			this.facade.deleteShape(shapeAsJson.getShape());
+		}.bind(this));
+
+		this.facade.setSelection([]);
+		this.facade.getCanvas().update();
 		this.facade.updateSelection();
 
-    },
-    rollback: function(){
-        this.shapesAsJson.each(function(shapeAsJson) {
-            var shape = shapeAsJson.getShape();
-            var parent = this.facade.getCanvas().getChildShapeByResourceId(shapeAsJson.parent.resourceId) || this.facade.getCanvas();
-            parent.add(shape, shape.parentIndex);
-        }.bind(this));
-
-        //reconnect shapes
-        this.dockers.each(function(d) {
-            d.object.setDockedShape(d.dockedShape);
-            d.object.setReferencePoint(d.referencePoint);
-        }.bind(this));
-
-        this.facade.setSelection(this.selectedShapes);
-        this.facade.getCanvas().update();
+	},
+	rollback: function () {
+		this.shapesAsJson.each(function (shapeAsJson) {
+			var shape = shapeAsJson.getShape();
+			var parent = this.facade.getCanvas().getChildShapeByResourceId(shapeAsJson.parent.resourceId) || this.facade.getCanvas();
+			parent.add(shape, shape.parentIndex);
+		}.bind(this));
+
+		//reconnect shapes
+		this.dockers.each(function (d) {
+			d.object.setDockedShape(d.dockedShape);
+			d.object.setReferencePoint(d.referencePoint);
+		}.bind(this));
+
+		this.facade.setSelection(this.selectedShapes);
+		this.facade.getCanvas().update();
 		this.facade.updateSelection();
 
-    }
+	}
 });/*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
  * License rights for this program may be obtained from Alfresco Software, Ltd.
@@ -17977,8 +18410,8 @@ ORYX.Plugins.Edit.DeleteCommand = ORYX.Core.Command.extend({
 /**
  * @namespace Oryx name space for plugins
  * @name ORYX.Plugins
-*/
-if(!ORYX.Plugins)
+ */
+if (!ORYX.Plugins)
 	ORYX.Plugins = new Object();
 
 /**
@@ -17988,34 +18421,42 @@ if(!ORYX.Plugins)
  * @class ORYX.Plugins.View
  * @extends Clazz
  * @param {Object} facade The editor facade for plugins.
-*/
+ */
 ORYX.Plugins.View = {
 	/** @lends ORYX.Plugins.View.prototype */
 	facade: undefined,
 
-	construct: function(facade, ownPluginData) {
+	construct: function (facade, ownPluginData) {
 		this.facade = facade;
 		//Standard Values
 		this.zoomLevel = 1.0;
-		this.maxFitToScreenLevel=1.5;
+		this.maxFitToScreenLevel = 1.5;
 		this.minZoomLevel = 0.1;
 		this.maxZoomLevel = 2.5;
-		this.diff=5; //difference between canvas and view port, s.th. like toolbar??
+		this.diff = 5; //difference between canvas and view port, s.th. like toolbar??
 
 		//Read properties
 		if (ownPluginData !== undefined && ownPluginData !== null) {
-			ownPluginData.properties.each( function(property) {
-				if (property.zoomLevel) {this.zoomLevel = Number(1.0);}
-				if (property.maxFitToScreenLevel) {this.maxFitToScreenLevel=Number(property.maxFitToScreenLevel);}
-				if (property.minZoomLevel) {this.minZoomLevel = Number(property.minZoomLevel);}
-				if (property.maxZoomLevel) {this.maxZoomLevel = Number(property.maxZoomLevel);}
+			ownPluginData.properties.each(function (property) {
+				if (property.zoomLevel) {
+					this.zoomLevel = Number(1.0);
+				}
+				if (property.maxFitToScreenLevel) {
+					this.maxFitToScreenLevel = Number(property.maxFitToScreenLevel);
+				}
+				if (property.minZoomLevel) {
+					this.minZoomLevel = Number(property.minZoomLevel);
+				}
+				if (property.maxZoomLevel) {
+					this.maxZoomLevel = Number(property.maxZoomLevel);
+				}
 			}.bind(this));
 		}
 
 
 		/* Register zoom in */
 		this.facade.offer({
-			'name':ORYX.I18N.View.zoomIn,
+			'name': ORYX.I18N.View.zoomIn,
 			'functionality': this.zoom.bind(this, [1.0 + ORYX.CONFIG.ZOOM_OFFSET]),
 			'group': ORYX.I18N.View.group,
 			'icon': ORYX.PATH + "images/magnifier_zoom_in.png",
@@ -18023,11 +18464,14 @@ ORYX.Plugins.View = {
 			'index': 1,
 			'minShape': 0,
 			'maxShape': 0,
-			'isEnabled': function(){return this.zoomLevel < this.maxZoomLevel }.bind(this)});
+			'isEnabled': function () {
+				return this.zoomLevel < this.maxZoomLevel
+			}.bind(this)
+		});
 
 		/* Register zoom out */
 		this.facade.offer({
-			'name':ORYX.I18N.View.zoomOut,
+			'name': ORYX.I18N.View.zoomOut,
 			'functionality': this.zoom.bind(this, [1.0 - ORYX.CONFIG.ZOOM_OFFSET]),
 			'group': ORYX.I18N.View.group,
 			'icon': ORYX.PATH + "images/magnifier_zoom_out.png",
@@ -18035,25 +18479,30 @@ ORYX.Plugins.View = {
 			'index': 2,
 			'minShape': 0,
 			'maxShape': 0,
-			'isEnabled': function(){ return this._checkSize() }.bind(this)});
+			'isEnabled': function () {
+				return this._checkSize()
+			}.bind(this)
+		});
 
 		/* Register zoom standard */
 		this.facade.offer({
-			'name':ORYX.I18N.View.zoomStandard,
+			'name': ORYX.I18N.View.zoomStandard,
 			'functionality': this.setAFixZoomLevel.bind(this, 1),
 			'group': ORYX.I18N.View.group,
 			'icon': ORYX.PATH + "images/zoom_standard.png",
-			'cls' : 'icon-large',
+			'cls': 'icon-large',
 			'description': ORYX.I18N.View.zoomStandardDesc,
 			'index': 3,
 			'minShape': 0,
 			'maxShape': 0,
-			'isEnabled': function(){return this.zoomLevel != 1}.bind(this)
+			'isEnabled': function () {
+				return this.zoomLevel != 1
+			}.bind(this)
 		});
 
 		/* Register zoom fit to model */
 		this.facade.offer({
-			'name':ORYX.I18N.View.zoomFitToModel,
+			'name': ORYX.I18N.View.zoomFitToModel,
 			'functionality': this.zoomFitToModel.bind(this),
 			'group': ORYX.I18N.View.group,
 			'icon': ORYX.PATH + "images/image.png",
@@ -18068,9 +18517,9 @@ ORYX.Plugins.View = {
 	 * It sets the zoom level to a fix value and call the zooming function.
 	 *
 	 * @param {Number} zoomLevel
-	 * 			the zoom level
+	 *            the zoom level
 	 */
-	setAFixZoomLevel : function(zoomLevel) {
+	setAFixZoomLevel: function (zoomLevel) {
 		this.zoomLevel = zoomLevel;
 		this._checkZoomLevelRange();
 		this.zoom(1);
@@ -18081,16 +18530,16 @@ ORYX.Plugins.View = {
 	 * and all to its child elements.
 	 *
 	 * @param {Number} factor
-	 * 		the factor to adjust the zoom level
+	 *        the factor to adjust the zoom level
 	 */
-	zoom: function(factor) {
+	zoom: function (factor) {
 		// TODO: Zoomen auf allen Objekten im SVG-DOM
 
 		this.zoomLevel *= factor;
-		var scrollNode 	= this.facade.getCanvas().getHTMLContainer().parentNode.parentNode;
-		var canvas 		= this.facade.getCanvas();
-		var newWidth 	= canvas.bounds.width()  * this.zoomLevel;
-		var newHeight 	= canvas.bounds.height() * this.zoomLevel;
+		var scrollNode = this.facade.getCanvas().getHTMLContainer().parentNode.parentNode;
+		var canvas = this.facade.getCanvas();
+		var newWidth = canvas.bounds.width() * this.zoomLevel;
+		var newHeight = canvas.bounds.height() * this.zoomLevel;
 
 		/* Set new top offset */
 		var offsetTop = (canvas.node.parentNode.parentNode.parentNode.offsetHeight - newHeight) / 2.0;
@@ -18100,19 +18549,19 @@ ORYX.Plugins.View = {
 		canvas.getHTMLContainer().style.top = offsetTop + "px";
 
 		/*readjust scrollbar*/
-		var newScrollTop=	scrollNode.scrollTop - Math.round((canvas.getHTMLContainer().parentNode.getHeight()-newHeight) / 2)+this.diff;
-		var newScrollLeft=	scrollNode.scrollLeft - Math.round((canvas.getHTMLContainer().parentNode.getWidth()-newWidth) / 2)+this.diff;
+		var newScrollTop = scrollNode.scrollTop - Math.round((canvas.getHTMLContainer().parentNode.getHeight() - newHeight) / 2) + this.diff;
+		var newScrollLeft = scrollNode.scrollLeft - Math.round((canvas.getHTMLContainer().parentNode.getWidth() - newWidth) / 2) + this.diff;
 
 		/* Set new Zoom-Level */
 		canvas.setSize({width: newWidth, height: newHeight}, true);
 
 		/* Set Scale-Factor */
-		canvas.node.setAttributeNS(null, "transform", "scale(" +this.zoomLevel+ ")");
+		canvas.node.setAttributeNS(null, "transform", "scale(" + this.zoomLevel + ")");
 
 		/* Refresh the Selection */
 		this.facade.updateSelection();
-		scrollNode.scrollTop=newScrollTop;
-		scrollNode.scrollLeft=newScrollLeft;
+		scrollNode.scrollTop = newScrollTop;
+		scrollNode.scrollLeft = newScrollLeft;
 
 		/* Update the zoom-level*/
 		canvas.zoomLevel = this.zoomLevel;
@@ -18125,35 +18574,37 @@ ORYX.Plugins.View = {
 	 * scroll bars are adjusted.
 	 *
 	 */
-	zoomFitToModel: function() {
+	zoomFitToModel: function () {
 
 		/* Get the size of the visible area of the canvas */
-		var scrollNode 	= this.facade.getCanvas().getHTMLContainer().parentNode.parentNode;
+		var scrollNode = this.facade.getCanvas().getHTMLContainer().parentNode.parentNode;
 		var visibleHeight = scrollNode.getHeight() - 30;
 		var visibleWidth = scrollNode.getWidth() - 30;
 
 		var nodes = this.facade.getCanvas().getChildShapes();
 
-		if(!nodes || nodes.length < 1) {
+		if (!nodes || nodes.length < 1) {
 			return false;
 		}
 
 		/* Calculate size of canvas to fit the model */
 		var bounds = nodes[0].absoluteBounds().clone();
-		nodes.each(function(node) {
+		nodes.each(function (node) {
 			bounds.include(node.absoluteBounds().clone());
 		});
 
 
 		/* Set new Zoom Level */
-		var scaleFactorWidth =  visibleWidth / bounds.width();
+		var scaleFactorWidth = visibleWidth / bounds.width();
 		var scaleFactorHeight = visibleHeight / bounds.height();
 
 		/* Choose the smaller zoom level to fit the whole model */
 		var zoomFactor = scaleFactorHeight < scaleFactorWidth ? scaleFactorHeight : scaleFactorWidth;
 
 		/*Test if maximum zoom is reached*/
-		if(zoomFactor>this.maxFitToScreenLevel){zoomFactor=this.maxFitToScreenLevel}
+		if (zoomFactor > this.maxFitToScreenLevel) {
+			zoomFactor = this.maxFitToScreenLevel
+		}
 		/* Do zooming */
 		this.setAFixZoomLevel(zoomFactor);
 
@@ -18169,9 +18620,9 @@ ORYX.Plugins.View = {
 	 *
 	 * @private
 	 */
-	_checkSize:function(){
-		var canvasParent=this.facade.getCanvas().getHTMLContainer().parentNode;
-		var minForCanvas= Math.min((canvasParent.parentNode.getWidth()/canvasParent.getWidth()),(canvasParent.parentNode.getHeight()/canvasParent.getHeight()));
+	_checkSize: function () {
+		var canvasParent = this.facade.getCanvas().getHTMLContainer().parentNode;
+		var minForCanvas = Math.min((canvasParent.parentNode.getWidth() / canvasParent.getWidth()), (canvasParent.parentNode.getHeight() / canvasParent.getHeight()));
 		return 1.05 > minForCanvas;
 
 	},
@@ -18181,17 +18632,17 @@ ORYX.Plugins.View = {
 	 *
 	 * @private
 	 */
-	_checkZoomLevelRange: function() {
+	_checkZoomLevelRange: function () {
 		/*var canvasParent=this.facade.getCanvas().getHTMLContainer().parentNode;
 		var maxForCanvas= Math.max((canvasParent.parentNode.getWidth()/canvasParent.getWidth()),(canvasParent.parentNode.getHeight()/canvasParent.getHeight()));
 		if(this.zoomLevel > maxForCanvas) {
 			this.zoomLevel = maxForCanvas;
 		}*/
-		if(this.zoomLevel < this.minZoomLevel) {
+		if (this.zoomLevel < this.minZoomLevel) {
 			this.zoomLevel = this.minZoomLevel;
 		}
 
-		if(this.zoomLevel > this.maxZoomLevel) {
+		if (this.zoomLevel > this.maxZoomLevel) {
 			this.zoomLevel = this.maxZoomLevel;
 		}
 	}
@@ -18204,10 +18655,16 @@ ORYX.Plugins.View = Clazz.extend(ORYX.Plugins.View);
  * pursuant to a written agreement and any use of this program without such an
  * agreement is prohibited.
  */
-if(!Signavio){ var Signavio = {} };
-	if (!Signavio.Core) { Signavio.Core = {} };
-	Signavio.Core.Version = "1.0";
-			/*
+if (!Signavio) {
+	var Signavio = {}
+}
+;
+if (!Signavio.Core) {
+	Signavio.Core = {}
+}
+;
+Signavio.Core.Version = "1.0";
+/*
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
  * License rights for this program may be obtained from Alfresco Software, Ltd.
  * pursuant to a written agreement and any use of this program without such an
@@ -18234,7 +18691,7 @@ if (!Signavio.Helper) {
 }
 
 
-new function() {
+new function () {
 
 	/**
 	 * Provides an uniq id
@@ -18242,10 +18699,10 @@ new function() {
 	 * @return {String}
 	 *
 	 */
-	ORYX.Editor.provideId = function() {
+	ORYX.Editor.provideId = function () {
 		var res = [], hex = '0123456789ABCDEF';
 
-		for (var i = 0; i < 36; i++) res[i] = Math.floor(Math.random()*0x10);
+		for (var i = 0; i < 36; i++) res[i] = Math.floor(Math.random() * 0x10);
 
 		res[14] = 4;
 		res[19] = (res[19] & 0x3) | 0x8;
@@ -18271,7 +18728,7 @@ new function() {
  */
 
 if (!ORYX.Plugins) {
-    ORYX.Plugins = new Object();
+	ORYX.Plugins = new Object();
 }
 
 /**
@@ -18282,44 +18739,44 @@ if (!ORYX.Plugins) {
  */
 ORYX.Plugins.Loading = {
 
-    construct: function(facade){
+	construct: function (facade) {
 
-        this.facade = facade;
+		this.facade = facade;
 
-        // The parent Node
-        this.node = ORYX.Editor.graft("http://www.w3.org/1999/xhtml", this.facade.getCanvas().getHTMLContainer().parentNode, ['div', {
-            'class': 'LoadingIndicator'
-        }, '']);
+		// The parent Node
+		this.node = ORYX.Editor.graft("http://www.w3.org/1999/xhtml", this.facade.getCanvas().getHTMLContainer().parentNode, ['div', {
+			'class': 'LoadingIndicator'
+		}, '']);
 
-        this.facade.registerOnEvent(ORYX.CONFIG.EVENT_LOADING_ENABLE, this.enableLoading.bind(this));
-        this.facade.registerOnEvent(ORYX.CONFIG.EVENT_LOADING_DISABLE, this.disableLoading.bind(this));
+		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_LOADING_ENABLE, this.enableLoading.bind(this));
+		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_LOADING_DISABLE, this.disableLoading.bind(this));
 		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_LOADING_STATUS, this.showStatus.bind(this));
 
-        this.disableLoading();
-    },
+		this.disableLoading();
+	},
 
-    enableLoading: function(options){
-		if(options.text)
+	enableLoading: function (options) {
+		if (options.text)
 			this.node.innerHTML = options.text + "...";
 		else
 			this.node.innerHTML = ORYX.I18N.Loading.waiting;
 		this.node.removeClassName('StatusIndicator');
 		this.node.addClassName('LoadingIndicator');
-        this.node.style.display = "block";
+		this.node.style.display = "block";
 
 		var pos = this.facade.getCanvas().rootNode.parentNode.parentNode.parentNode.parentNode;
 
-		this.node.style.top 		= pos.offsetTop + 'px';
-		this.node.style.left 		= pos.offsetLeft +'px';
+		this.node.style.top = pos.offsetTop + 'px';
+		this.node.style.left = pos.offsetLeft + 'px';
 
-    },
+	},
 
-    disableLoading: function(){
-        this.node.style.display = "none";
-    },
+	disableLoading: function () {
+		this.node.style.display = "none";
+	},
 
-	showStatus: function(options) {
-		if(options.text) {
+	showStatus: function (options) {
+		if (options.text) {
 			this.node.innerHTML = options.text;
 			this.node.addClassName('StatusIndicator');
 			this.node.removeClassName('LoadingIndicator');
@@ -18327,16 +18784,16 @@ ORYX.Plugins.Loading = {
 
 			var pos = this.facade.getCanvas().rootNode.parentNode.parentNode.parentNode.parentNode;
 
-			this.node.style.top 	= pos.offsetTop + 'px';
-			this.node.style.left 	= pos.offsetLeft +'px';
+			this.node.style.top = pos.offsetTop + 'px';
+			this.node.style.left = pos.offsetLeft + 'px';
 
 			var tout = options.timeout ? options.timeout : 2000;
 
-			window.setTimeout((function(){
+			window.setTimeout((function () {
 
-                this.disableLoading();
+				this.disableLoading();
 
-            }).bind(this), tout);
+			}).bind(this), tout);
 		}
 
 	}
@@ -18350,7 +18807,7 @@ ORYX.Plugins.Loading = Clazz.extend(ORYX.Plugins.Loading);
  * agreement is prohibited.
  */
 if (!ORYX.Plugins) {
-    ORYX.Plugins = new Object();
+	ORYX.Plugins = new Object();
 }
 
 /*
@@ -18363,106 +18820,124 @@ if (!ORYX.Plugins) {
  */
 ORYX.Plugins.CanvasResize = Clazz.extend({
 
-    construct: function(facade){
+	construct: function (facade) {
 
-        this.facade = facade;
-		new ORYX.Plugins.CanvasResizeButton( this.facade.getCanvas(), "N", this.resize.bind(this));
-		new ORYX.Plugins.CanvasResizeButton( this.facade.getCanvas(), "W", this.resize.bind(this));
-		new ORYX.Plugins.CanvasResizeButton( this.facade.getCanvas(), "E", this.resize.bind(this));
-		new ORYX.Plugins.CanvasResizeButton( this.facade.getCanvas(), "S", this.resize.bind(this));
+		this.facade = facade;
+		new ORYX.Plugins.CanvasResizeButton(this.facade.getCanvas(), "N", this.resize.bind(this));
+		new ORYX.Plugins.CanvasResizeButton(this.facade.getCanvas(), "W", this.resize.bind(this));
+		new ORYX.Plugins.CanvasResizeButton(this.facade.getCanvas(), "E", this.resize.bind(this));
+		new ORYX.Plugins.CanvasResizeButton(this.facade.getCanvas(), "S", this.resize.bind(this));
 
-		window.setTimeout(function(){jQuery(window).trigger('resize');});
+		window.setTimeout(function () {
+			jQuery(window).trigger('resize');
+		});
 
-    },
+	},
 
-    resize: function( position, shrink ){
+	resize: function (position, shrink) {
 
-    	resizeCanvas = function(position, extentionSize, facade) {
-        	var canvas 		= facade.getCanvas();
-    		var b 			= canvas.bounds;
-    		var scrollNode 	= facade.getCanvas().getHTMLContainer().parentNode.parentNode;
+		resizeCanvas = function (position, extentionSize, facade) {
+			var canvas = facade.getCanvas();
+			var b = canvas.bounds;
+			var scrollNode = facade.getCanvas().getHTMLContainer().parentNode.parentNode;
 
-    		if( position == "E" || position == "W"){
-    			canvas.setSize({width: (b.width() + extentionSize)*canvas.zoomLevel, height: (b.height())*canvas.zoomLevel})
+			if (position == "E" || position == "W") {
+				canvas.setSize({
+					width: (b.width() + extentionSize) * canvas.zoomLevel,
+					height: (b.height()) * canvas.zoomLevel
+				})
 
-    		} else if( position == "S" || position == "N"){
-    			canvas.setSize({width: (b.width())*canvas.zoomLevel, height: (b.height() + extentionSize)*canvas.zoomLevel})
-    		}
+			} else if (position == "S" || position == "N") {
+				canvas.setSize({
+					width: (b.width()) * canvas.zoomLevel,
+					height: (b.height() + extentionSize) * canvas.zoomLevel
+				})
+			}
 
-    		if( position == "N" || position == "W"){
+			if (position == "N" || position == "W") {
 
-    			var move = position == "N" ? {x: 0, y: extentionSize}: {x: extentionSize, y: 0 };
+				var move = position == "N" ? {x: 0, y: extentionSize} : {x: extentionSize, y: 0};
 
-    			// Move all children
-    			canvas.getChildNodes(false, function(shape){ shape.bounds.moveBy(move) })
-    			// Move all dockers, when the edge has at least one docked shape
-    			var edges = canvas.getChildEdges().findAll(function(edge){ return edge.getAllDockedShapes().length > 0})
-    			var dockers = edges.collect(function(edge){ return edge.dockers.findAll(function(docker){ return !docker.getDockedShape() })}).flatten();
-    			dockers.each(function(docker){ docker.bounds.moveBy(move)})
-    		} else if( position == "S" ){
-    			scrollNode.scrollTop += extentionSize;
-    		} else if( position == "E" ){
-    			scrollNode.scrollLeft += extentionSize;
-    		}
+				// Move all children
+				canvas.getChildNodes(false, function (shape) {
+					shape.bounds.moveBy(move)
+				})
+				// Move all dockers, when the edge has at least one docked shape
+				var edges = canvas.getChildEdges().findAll(function (edge) {
+					return edge.getAllDockedShapes().length > 0
+				})
+				var dockers = edges.collect(function (edge) {
+					return edge.dockers.findAll(function (docker) {
+						return !docker.getDockedShape()
+					})
+				}).flatten();
+				dockers.each(function (docker) {
+					docker.bounds.moveBy(move)
+				})
+			} else if (position == "S") {
+				scrollNode.scrollTop += extentionSize;
+			} else if (position == "E") {
+				scrollNode.scrollLeft += extentionSize;
+			}
 
-    		jQuery(window).trigger('resize');
+			jQuery(window).trigger('resize');
 
-    		canvas.update();
-    		facade.updateSelection();
-        }
+			canvas.update();
+			facade.updateSelection();
+		}
 
 		var commandClass = ORYX.Core.Command.extend({
-			construct: function(position, extentionSize, facade){
+			construct: function (position, extentionSize, facade) {
 				this.position = position;
 				this.extentionSize = extentionSize;
 				this.facade = facade;
 			},
-			execute: function(){
+			execute: function () {
 				resizeCanvas(this.position, this.extentionSize, this.facade);
 			},
-			rollback: function(){
+			rollback: function () {
 				resizeCanvas(this.position, -this.extentionSize, this.facade);
 			},
-			update:function(){
+			update: function () {
 			}
 		});
 
 		var extentionSize = ORYX.CONFIG.CANVAS_RESIZE_INTERVAL;
-		if(shrink) extentionSize = -extentionSize;
+		if (shrink) extentionSize = -extentionSize;
 		var command = new commandClass(position, extentionSize, this.facade);
 
 		this.facade.executeCommands([command]);
 
-    }
+	}
 
 });
 
 
 ORYX.Plugins.CanvasResizeButton = Clazz.extend({
 
-	construct: function(canvas, position, callback){
+	construct: function (canvas, position, callback) {
 		this.canvas = canvas;
 		var parentNode = canvas.getHTMLContainer().parentNode;
 
-		window.myParent=parentNode;
+		window.myParent = parentNode;
 
 		var actualScrollNode = jQuery('#canvasSection')[0];
-		var scrollNode 	= actualScrollNode;
+		var scrollNode = actualScrollNode;
 		var canvasNode = jQuery('#canvasSection').find(".ORYX_Editor")[0];
 		var svgRootNode = canvasNode.children[0];
 
 		var iconClass = 'glyphicon glyphicon-chevron-';
 		var iconClassShrink = 'glyphicon glyphicon-chevron-';
-		if(position == 'N') {
+		if (position == 'N') {
 			iconClass += 'up';
 			iconClassShrink += 'down';
-		} else if(position == 'S') {
+		} else if (position == 'S') {
 			iconClass += 'down';
 			iconClassShrink += 'up';
-		} else if(position == 'E') {
+		} else if (position == 'E') {
 			iconClass += 'right';
 			iconClassShrink += 'left';
-		} else if(position == 'W') {
+		} else if (position == 'W') {
 			iconClass += 'left';
 			iconClassShrink += 'right';
 		}
@@ -18471,98 +18946,126 @@ ORYX.Plugins.CanvasResizeButton = Clazz.extend({
 		var idGrow = 'canvas-shrink-' + position;
 		var idShrink = 'canvas-grow-' + position;
 
-		var buttonGrow 	= ORYX.Editor.graft("http://www.w3.org/1999/xhtml", parentNode, ['div', {'class': 'canvas_resize_indicator canvas_resize_indicator_grow' + ' ' + position, 'id': idGrow ,'title':ORYX.I18N.RESIZE.tipGrow+ORYX.I18N.RESIZE[position]},
-             ['i', {'class' : iconClass}]
+		var buttonGrow = ORYX.Editor.graft("http://www.w3.org/1999/xhtml", parentNode, ['div', {
+			'class': 'canvas_resize_indicator canvas_resize_indicator_grow' + ' ' + position,
+			'id': idGrow,
+			'title': ORYX.I18N.RESIZE.tipGrow + ORYX.I18N.RESIZE[position]
+		},
+			['i', {'class': iconClass}]
 		]);
-		var buttonShrink 	= ORYX.Editor.graft("http://www.w3.org/1999/xhtml", parentNode, ['div', {'class': 'canvas_resize_indicator canvas_resize_indicator_shrink' + ' ' + position, 'id': idShrink ,'title':ORYX.I18N.RESIZE.tipGrow+ORYX.I18N.RESIZE[position]},
-             ['i', {'class' : iconClassShrink}]
+		var buttonShrink = ORYX.Editor.graft("http://www.w3.org/1999/xhtml", parentNode, ['div', {
+			'class': 'canvas_resize_indicator canvas_resize_indicator_shrink' + ' ' + position,
+			'id': idShrink,
+			'title': ORYX.I18N.RESIZE.tipGrow + ORYX.I18N.RESIZE[position]
+		},
+			['i', {'class': iconClassShrink}]
 		]);
 		// Defines a callback which gives back
 		// a boolean if the current mouse event
 		// is over the particular button area
 		var offSetWidth = 60;
-		var isOverOffset = function(event) {
+		var isOverOffset = function (event) {
 
 			var isOverButton = event.target.id.indexOf("canvas-shrink") != -1
 				|| event.target.id.indexOf("canvas-grow") != -1
 				|| event.target.parentNode.id.indexOf("canvas-shrink") != -1
 				|| event.target.parentNode.id.indexOf("canvas-grow") != -1;
-			if(isOverButton) {
-				if(event.target.id == idGrow || event.target.id == idShrink ||
-						event.target.parentNode.id == idGrow || event.target.parentNode.id == idShrink ) {
+			if (isOverButton) {
+				if (event.target.id == idGrow || event.target.id == idShrink ||
+					event.target.parentNode.id == idGrow || event.target.parentNode.id == idShrink) {
 					return true;
 				} else {
 					return false;
 				}
 			}
 
-			if(event.target!=parentNode && event.target!=scrollNode&& event.target!=scrollNode.firstChild&& event.target!=svgRootNode&& event.target!=scrollNode){ return false; }
+			if (event.target != parentNode && event.target != scrollNode && event.target != scrollNode.firstChild && event.target != svgRootNode && event.target != scrollNode) {
+				return false;
+			}
 
 			//if(inCanvas){offSetWidth=30}else{offSetWidth=30*2}
 			//Safari work around
-			var X=event.offsetX !== undefined ? event.offsetX : event.layerX;
-			var Y=event.offsetY !== undefined ? event.offsetY : event.layerY;
+			var X = event.offsetX !== undefined ? event.offsetX : event.layerX;
+			var Y = event.offsetY !== undefined ? event.offsetY : event.layerY;
 
 			var canvasOffset = 0;
-			if(canvasNode.clientWidth < actualScrollNode.clientWidth) {
-              	var widthDiff = actualScrollNode.clientWidth -  canvasNode.clientWidth;
-              	canvasOffset = widthDiff / 2;
-            }
+			if (canvasNode.clientWidth < actualScrollNode.clientWidth) {
+				var widthDiff = actualScrollNode.clientWidth - canvasNode.clientWidth;
+				canvasOffset = widthDiff / 2;
+			}
 
-				// Adjust to relative location to the actual viewport
-				Y = Y - actualScrollNode.scrollTop;
-				X = X - actualScrollNode.scrollLeft;
+			// Adjust to relative location to the actual viewport
+			Y = Y - actualScrollNode.scrollTop;
+			X = X - actualScrollNode.scrollLeft;
 
 
-			if(position == "N"){
-				return  Y < offSetWidth;
-			} else if(position == "W"){
+			if (position == "N") {
+				return Y < offSetWidth;
+			} else if (position == "W") {
 				return X < offSetWidth + canvasOffset;
-			} else if(position == "E"){
+			} else if (position == "E") {
 				return actualScrollNode.clientWidth - X < offSetWidth + canvasOffset;
-			} else if(position == "S"){
+			} else if (position == "S") {
 				return actualScrollNode.clientHeight - Y < offSetWidth;
 			}
 
 			return false;
 		};
 
-		var showButtons = (function() {
+		var showButtons = (function () {
 			buttonGrow.show();
 
 			var w = canvas.bounds.width();
 			var h = canvas.bounds.height();
 
-			if(position=="N" && (h - ORYX.CONFIG.CANVAS_RESIZE_INTERVAL > ORYX.CONFIG.CANVAS_MIN_HEIGHT)) buttonShrink.show();
-			else if(position=="E" && (w - ORYX.CONFIG.CANVAS_RESIZE_INTERVAL > ORYX.CONFIG.CANVAS_MIN_WIDTH)) buttonShrink.show();
-			else if(position=="S" && (h - ORYX.CONFIG.CANVAS_RESIZE_INTERVAL > ORYX.CONFIG.CANVAS_MIN_HEIGHT)) buttonShrink.show();
-			else if(position=="W" && (w - ORYX.CONFIG.CANVAS_RESIZE_INTERVAL > ORYX.CONFIG.CANVAS_MIN_WIDTH)) buttonShrink.show();
+			if (position == "N" && (h - ORYX.CONFIG.CANVAS_RESIZE_INTERVAL > ORYX.CONFIG.CANVAS_MIN_HEIGHT)) buttonShrink.show();
+			else if (position == "E" && (w - ORYX.CONFIG.CANVAS_RESIZE_INTERVAL > ORYX.CONFIG.CANVAS_MIN_WIDTH)) buttonShrink.show();
+			else if (position == "S" && (h - ORYX.CONFIG.CANVAS_RESIZE_INTERVAL > ORYX.CONFIG.CANVAS_MIN_HEIGHT)) buttonShrink.show();
+			else if (position == "W" && (w - ORYX.CONFIG.CANVAS_RESIZE_INTERVAL > ORYX.CONFIG.CANVAS_MIN_WIDTH)) buttonShrink.show();
 			else buttonShrink.hide();
 
 
 		}).bind(this);
 
-		var hideButtons = function() {
+		var hideButtons = function () {
 			buttonGrow.hide();
 			buttonShrink.hide();
 		};
 
 		// If the mouse move is over the button area, show the button
-		parentNode.parentNode.addEventListener(	ORYX.CONFIG.EVENT_MOUSEMOVE, 	function(event){ if( isOverOffset(event) ){showButtons();} else {hideButtons()}} , false );
+		parentNode.parentNode.addEventListener(ORYX.CONFIG.EVENT_MOUSEMOVE, function (event) {
+			if (isOverOffset(event)) {
+				showButtons();
+			} else {
+				hideButtons()
+			}
+		}, false);
 		// If the mouse is over the button, show them
-		buttonGrow.addEventListener(		ORYX.CONFIG.EVENT_MOUSEOVER, 	function(event){showButtons();}, true );
-		buttonShrink.addEventListener(		ORYX.CONFIG.EVENT_MOUSEOVER, 	function(event){showButtons();}, true );
+		buttonGrow.addEventListener(ORYX.CONFIG.EVENT_MOUSEOVER, function (event) {
+			showButtons();
+		}, true);
+		buttonShrink.addEventListener(ORYX.CONFIG.EVENT_MOUSEOVER, function (event) {
+			showButtons();
+		}, true);
 		// If the mouse is out, hide the button
 		//scrollNode.addEventListener(		ORYX.CONFIG.EVENT_MOUSEOUT, 	function(event){button.hide()}, true )
-		parentNode.parentNode.addEventListener(	ORYX.CONFIG.EVENT_MOUSEOUT, 	function(event){hideButtons()} , true );
+		parentNode.parentNode.addEventListener(ORYX.CONFIG.EVENT_MOUSEOUT, function (event) {
+			hideButtons()
+		}, true);
 		//svgRootNode.addEventListener(	ORYX.CONFIG.EVENT_MOUSEOUT, 	function(event){ inCanvas = false } , true );
 
 		// Hide the button initialy
 		hideButtons();
 
 		// Add the callbacks
-	    buttonGrow.addEventListener('click', function(){callback( position ); showButtons();}, true);
-	    buttonShrink.addEventListener('click', function(){callback( position, true ); showButtons();}, true);
+		buttonGrow.addEventListener('click', function () {
+			callback(position);
+			showButtons();
+		}, true);
+		buttonShrink.addEventListener('click', function () {
+			callback(position, true);
+			showButtons();
+		}, true);
 
 	}
 
@@ -18580,121 +19083,140 @@ ORYX.Plugins.CanvasResizeButton = Clazz.extend({
  */
 
 if (!ORYX.Plugins)
-    ORYX.Plugins = new Object();
+	ORYX.Plugins = new Object();
 
 ORYX.Plugins.RenameShapes = Clazz.extend({
 
-    facade: undefined,
+	facade: undefined,
 
-    construct: function(facade){
+	construct: function (facade) {
 
-        this.facade = facade;
+		this.facade = facade;
 
-        this.facade.registerOnEvent(ORYX.CONFIG.EVENT_CANVAS_SCROLL, this.hideField.bind(this));
+		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_CANVAS_SCROLL, this.hideField.bind(this));
 		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_DBLCLICK, this.actOnDBLClick.bind(this));
 		this.facade.offer({
-		 keyCodes: [{
+			keyCodes: [{
 				keyCode: 113, // F2-Key
 				keyAction: ORYX.CONFIG.KEY_ACTION_DOWN
 			}
-		 ],
-         functionality: this.renamePerF2.bind(this)
-         });
+			],
+			functionality: this.renamePerF2.bind(this)
+		});
 
 
 		document.documentElement.addEventListener(ORYX.CONFIG.EVENT_MOUSEDOWN, this.hide.bind(this), true);
-    },
+	},
 
 	/**
 	 * This method handles the "F2" key down event. The selected shape are looked
 	 * up and the editing of title/name of it gets started.
 	 */
-	renamePerF2 : function() {
+	renamePerF2: function () {
 		var selectedShapes = this.facade.getSelection();
 		this.actOnDBLClick(undefined, selectedShapes.first());
 	},
 
-	actOnDBLClick: function(evt, shape){
+	actOnDBLClick: function (evt, shape) {
 
-		if( !(shape instanceof ORYX.Core.Shape) ){ return; }
+		if (!(shape instanceof ORYX.Core.Shape)) {
+			return;
+		}
 
 		// Destroys the old input, if there is one
 		this.destroy();
 
 		// Get all properties which where at least one ref to view is set
-		var props = shape.getStencil().properties().findAll(function(item){
+		var props = shape.getStencil().properties().findAll(function (item) {
 			return (item.refToView()
-					&&  item.refToView().length > 0
-					&&	item.directlyEditable());
+				&& item.refToView().length > 0
+				&& item.directlyEditable());
 		});
 		// from these, get all properties where write access are and the type is String or Expression
-		props = props.findAll(function(item){ return !item.readonly() &&  (item.type() == ORYX.CONFIG.TYPE_STRING || item.type() == ORYX.CONFIG.TYPE_EXPRESSION || item.type() == ORYX.CONFIG.TYPE_DATASOURCE); });
+		props = props.findAll(function (item) {
+			return !item.readonly() && (item.type() == ORYX.CONFIG.TYPE_STRING || item.type() == ORYX.CONFIG.TYPE_EXPRESSION || item.type() == ORYX.CONFIG.TYPE_DATASOURCE);
+		});
 
 		// Get all ref ids
-		var allRefToViews	= props.collect(function(prop){ return prop.refToView(); }).flatten().compact();
+		var allRefToViews = props.collect(function (prop) {
+			return prop.refToView();
+		}).flatten().compact();
 		// Get all labels from the shape with the ref ids
-		var labels			= shape.getLabels().findAll(function(label){ return allRefToViews.any(function(toView){ return label.id.endsWith(toView); }); });
+		var labels = shape.getLabels().findAll(function (label) {
+			return allRefToViews.any(function (toView) {
+				return label.id.endsWith(toView);
+			});
+		});
 
 		// If there are no referenced labels --> return
-		if( labels.length == 0 ){ return; }
+		if (labels.length == 0) {
+			return;
+		}
 
 		// Define the nearest label
-		var nearestLabel 	= labels.length <= 1 ? labels[0] : null;
-		if( !nearestLabel ){
-			nearestLabel = labels.find(function(label){ return label.node == evt.target || label.node == evt.target.parentNode; });
-			if( !nearestLabel ){
+		var nearestLabel = labels.length <= 1 ? labels[0] : null;
+		if (!nearestLabel) {
+			nearestLabel = labels.find(function (label) {
+				return label.node == evt.target || label.node == evt.target.parentNode;
+			});
+			if (!nearestLabel) {
 
-				var evtCoord 	= this.facade.eventCoordinates(evt);
+				var evtCoord = this.facade.eventCoordinates(evt);
 
 				var additionalIEZoom = 1;
-                if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
-                    var ua = navigator.userAgent;
-                    if (ua.indexOf('MSIE') >= 0) {
-                        //IE 10 and below
-                        var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
-                        if (zoom !== 100) {
-                            additionalIEZoom = zoom / 100
-                        }
-                    }
-                }
+				if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
+					var ua = navigator.userAgent;
+					if (ua.indexOf('MSIE') >= 0) {
+						//IE 10 and below
+						var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
+						if (zoom !== 100) {
+							additionalIEZoom = zoom / 100
+						}
+					}
+				}
 
-                if (additionalIEZoom !== 1) {
-                     evtCoord.x = evtCoord.x / additionalIEZoom;
-                     evtCoord.y = evtCoord.y / additionalIEZoom;
-                }
+				if (additionalIEZoom !== 1) {
+					evtCoord.x = evtCoord.x / additionalIEZoom;
+					evtCoord.y = evtCoord.y / additionalIEZoom;
+				}
 
 				evtCoord.y += $("editor-header").clientHeight - $("canvasSection").scrollTop - 5;
-				if (KISBPM.HEADER_CONFIG.showAppTitle == false)
-				{
+				if (KISBPM.HEADER_CONFIG.showAppTitle == false) {
 					evtCoord.y += 61;
 				}
 
 				evtCoord.x -= $("canvasSection").scrollLeft;
 
-				var trans		= this.facade.getCanvas().rootNode.lastChild.getScreenCTM();
-				evtCoord.x		*= trans.a;
-				evtCoord.y		*= trans.d;
+				var trans = this.facade.getCanvas().rootNode.lastChild.getScreenCTM();
+				evtCoord.x *= trans.a;
+				evtCoord.y *= trans.d;
 
-				var diff = labels.collect(function(label){
-							var center 	= this.getCenterPosition( label.node );
-							var len 	= Math.sqrt( Math.pow(center.x - evtCoord.x, 2) + Math.pow(center.y - evtCoord.y, 2));
-							return {diff: len, label: label};
-						}.bind(this));
+				var diff = labels.collect(function (label) {
+					var center = this.getCenterPosition(label.node);
+					var len = Math.sqrt(Math.pow(center.x - evtCoord.x, 2) + Math.pow(center.y - evtCoord.y, 2));
+					return {diff: len, label: label};
+				}.bind(this));
 
-				diff.sort(function(a, b){ return a.diff > b.diff; });
+				diff.sort(function (a, b) {
+					return a.diff > b.diff;
+				});
 
-				nearestLabel = 	diff[0].label;
+				nearestLabel = diff[0].label;
 
 			}
 		}
 		// Get the particular property for the label
-		var prop 			= props.find(function(item){ return item.refToView().any(function(toView){ return nearestLabel.id == shape.id + toView; });});
+		var prop = props.find(function (item) {
+			return item.refToView().any(function (toView) {
+				return nearestLabel.id == shape.id + toView;
+			});
+		});
 
 		// Get the center position from the nearest label
-		var width		= Math.min(Math.max(100, shape.bounds.width()), 200);
-		var center 		= this.getCenterPosition( nearestLabel.node, shape );
-		center.x		-= (width/2);
-		var propId		= prop.prefix() + "-" + prop.id();
+		var width = Math.min(Math.max(100, shape.bounds.width()), 200);
+		var center = this.getCenterPosition(nearestLabel.node, shape);
+		center.x -= (width / 2);
+		var propId = prop.prefix() + "-" + prop.id();
 		var textInput = document.createElement("textarea");
 		textInput.id = 'shapeTextInput';
 		textInput.style.position = 'absolute';
@@ -18709,28 +19231,28 @@ ORYX.Plugins.RenameShapes = Clazz.extend({
 
 
 		// Value change listener needs to be defined now since we reference it in the text field
-		this.updateValueFunction = function(newValue, oldValue) {
-			var currentEl 	= shape;
-			var facade		= this.facade;
+		this.updateValueFunction = function (newValue, oldValue) {
+			var currentEl = shape;
+			var facade = this.facade;
 
 			if (oldValue != newValue) {
 				// Implement the specific command for property change
 				var commandClass = ORYX.Core.Command.extend({
-					construct: function(){
+					construct: function () {
 						this.el = currentEl;
 						this.propId = propId;
 						this.oldValue = oldValue;
 						this.newValue = newValue;
 						this.facade = facade;
 					},
-					execute: function(){
+					execute: function () {
 						this.el.setProperty(this.propId, this.newValue);
 						//this.el.update();
 						this.facade.setSelection([this.el]);
 						this.facade.getCanvas().update();
 						this.facade.updateSelection();
 					},
-					rollback: function(){
+					rollback: function () {
 						this.el.setProperty(this.propId, this.oldValue);
 						//this.el.update();
 						this.facade.setSelection([this.el]);
@@ -18755,23 +19277,21 @@ ORYX.Plugins.RenameShapes = Clazz.extend({
 
 	},
 
-	getCenterPosition: function(svgNode, shape){
+	getCenterPosition: function (svgNode, shape) {
 
-		if (!svgNode) { return {x:0, y:0}; }
+		if (!svgNode) {
+			return {x: 0, y: 0};
+		}
 
 		var scale = this.facade.getCanvas().node.getScreenCTM();
 		var absoluteXY = shape.bounds.upperLeft();
 
 		var hasParent = true;
 		var searchShape = shape;
-		while (hasParent)
-		{
-			if (searchShape.getParentShape().getStencil().idWithoutNs() === 'BPMNDiagram')
-			{
+		while (hasParent) {
+			if (searchShape.getParentShape().getStencil().idWithoutNs() === 'BPMNDiagram') {
 				hasParent = false;
-			}
-			else
-			{
+			} else {
 				var parentXY = searchShape.getParentShape().bounds.upperLeft();
 				absoluteXY.x += parentXY.x;
 				absoluteXY.y += parentXY.y;
@@ -18787,59 +19307,58 @@ ORYX.Plugins.RenameShapes = Clazz.extend({
 		center.y *= scale.d;
 
 		var additionalIEZoom = 1;
-        if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
-            var ua = navigator.userAgent;
-            if (ua.indexOf('MSIE') >= 0) {
-                //IE 10 and below
-                var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
-                if (zoom !== 100) {
-                    additionalIEZoom = zoom / 100
-                }
-            }
-        }
+		if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
+			var ua = navigator.userAgent;
+			if (ua.indexOf('MSIE') >= 0) {
+				//IE 10 and below
+				var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
+				if (zoom !== 100) {
+					additionalIEZoom = zoom / 100
+				}
+			}
+		}
 
-        if (additionalIEZoom === 1) {
-             center.y = center.y - jQuery("#canvasSection").offset().top + 5;
-             center.x -= jQuery("#canvasSection").offset().left;
-
-        } else {
-             var canvasOffsetLeft = jQuery("#canvasSection").offset().left;
-             var canvasScrollLeft = jQuery("#canvasSection").scrollLeft();
-             var canvasScrollTop = jQuery("#canvasSection").scrollTop();
-
-             var offset = scale.e - (canvasOffsetLeft * additionalIEZoom);
-             var additionaloffset = 0;
-             if (offset > 10) {
-                 additionaloffset = (offset / additionalIEZoom) - offset;
-             }
-             center.y = center.y - (jQuery("#canvasSection").offset().top * additionalIEZoom) + 5 + ((canvasScrollTop * additionalIEZoom) - canvasScrollTop);
-             center.x = center.x - (canvasOffsetLeft * additionalIEZoom) + additionaloffset + ((canvasScrollLeft * additionalIEZoom) - canvasScrollLeft);
-        }
+		if (additionalIEZoom === 1) {
+			center.y = center.y - jQuery("#canvasSection").offset().top + 5;
+			center.x -= jQuery("#canvasSection").offset().left;
+
+		} else {
+			var canvasOffsetLeft = jQuery("#canvasSection").offset().left;
+			var canvasScrollLeft = jQuery("#canvasSection").scrollLeft();
+			var canvasScrollTop = jQuery("#canvasSection").scrollTop();
+
+			var offset = scale.e - (canvasOffsetLeft * additionalIEZoom);
+			var additionaloffset = 0;
+			if (offset > 10) {
+				additionaloffset = (offset / additionalIEZoom) - offset;
+			}
+			center.y = center.y - (jQuery("#canvasSection").offset().top * additionalIEZoom) + 5 + ((canvasScrollTop * additionalIEZoom) - canvasScrollTop);
+			center.x = center.x - (canvasOffsetLeft * additionalIEZoom) + additionaloffset + ((canvasScrollLeft * additionalIEZoom) - canvasScrollLeft);
+		}
 
 
 		return center;
 	},
 
-	hide: function(e){
+	hide: function (e) {
 		if (this.shownTextField && (!e || e.target !== this.shownTextField)) {
 			var newValue = this.shownTextField.value;
-			if (newValue !== this.oldValueText)
-			{
+			if (newValue !== this.oldValueText) {
 				this.updateValueFunction(newValue, this.oldValueText);
 			}
 			this.destroy();
 		}
 	},
 
-	hideField: function(e){
+	hideField: function (e) {
 		if (this.shownTextField) {
 			this.destroy();
 		}
 	},
 
-	destroy: function(e){
+	destroy: function (e) {
 		var textInputComp = jQuery("#shapeTextInput");
-		if( textInputComp ){
+		if (textInputComp) {
 			textInputComp.remove();
 			delete this.shownTextField;
 
@@ -18857,7 +19376,7 @@ ORYX.Plugins.RenameShapes = Clazz.extend({
  * All code Copyright 2013 KIS Consultancy all rights reserved
  */
 
-if(!ORYX.Plugins)
+if (!ORYX.Plugins)
 	ORYX.Plugins = new Object();
 
 /**
@@ -18873,11 +19392,11 @@ ORYX.Plugins.ProcessLink = Clazz.extend({
 	 * Offers the plugin functionality:
 	 *
 	 */
-	construct: function(facade) {
+	construct: function (facade) {
 
 		this.facade = facade;
 
-		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_PROPERTY_CHANGED, this.propertyChanged.bind(this) );
+		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_PROPERTY_CHANGED, this.propertyChanged.bind(this));
 
 	},
 
@@ -18886,18 +19405,20 @@ ORYX.Plugins.ProcessLink = Clazz.extend({
 	 *
 	 * @param {Object} option
 	 */
-	propertyChanged: function( option, node){
+	propertyChanged: function (option, node) {
 
-		if( option.name !== "oryx-refuri" || !node instanceof ORYX.Core.Node ){ return }
+		if (option.name !== "oryx-refuri" || !node instanceof ORYX.Core.Node) {
+			return
+		}
 
 
-		if( option.value && option.value.length > 0 && option.value != "undefined"){
+		if (option.value && option.value.length > 0 && option.value != "undefined") {
 
-			this.show( node, option.value );
+			this.show(node, option.value);
 
 		} else {
 
-			this.hide( node );
+			this.hide(node);
 
 		}
 
@@ -18909,27 +19430,44 @@ ORYX.Plugins.ProcessLink = Clazz.extend({
 	 * @param {Object} shape
 	 * @param {Object} url
 	 */
-	show: function( shape, url){
+	show: function (shape, url) {
 
 
 		// Generate the svg-representation of a link
-		var link  = ORYX.Editor.graft("http://www.w3.org/2000/svg", null ,
-					[ 'a',
-						{'target': '_blank'},
-						['path',
-							{ "stroke-width": 1.0, "stroke":"#00DD00", "fill": "#00AA00", "d":  "M3,3 l0,-2.5 l7.5,0 l0,-2.5 l7.5,4.5 l-7.5,3.5 l0,-2.5 l-8,0", "line-captions": "round"}
-						]
-					]);
+		var link = ORYX.Editor.graft("http://www.w3.org/2000/svg", null,
+			['a',
+				{'target': '_blank'},
+				['path',
+					{
+						"stroke-width": 1.0,
+						"stroke": "#00DD00",
+						"fill": "#00AA00",
+						"d": "M3,3 l0,-2.5 l7.5,0 l0,-2.5 l7.5,4.5 l-7.5,3.5 l0,-2.5 l-8,0",
+						"line-captions": "round"
+					}
+				]
+			]);
 
-		var link  = ORYX.Editor.graft("http://www.w3.org/2000/svg", null ,
-						[ 'a',
-							{'target': '_blank'},
-							['path', { "style": "fill:#92BFFC;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.72", "d": "M0 1.44 L0 15.05 L11.91 15.05 L11.91 5.98 L7.37 1.44 L0 1.44 Z"}],
-							['path', { "style": "stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.72;fill:none;", "transform": "translate(7.5, -8.5)", "d": "M0 10.51 L0 15.05 L4.54 15.05"}],
-							['path', { "style": "fill:#f28226;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.72", "transform": "translate(-3, -1)", "d": "M0 8.81 L0 13.06 L5.95 13.06 L5.95 15.05 A50.2313 50.2313 -175.57 0 0 10.77 11.08 A49.9128 49.9128 -1.28 0 0 5.95 6.54 L5.95 8.81 L0 8.81 Z"}],
-						]);
+		var link = ORYX.Editor.graft("http://www.w3.org/2000/svg", null,
+			['a',
+				{'target': '_blank'},
+				['path', {
+					"style": "fill:#92BFFC;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.72",
+					"d": "M0 1.44 L0 15.05 L11.91 15.05 L11.91 5.98 L7.37 1.44 L0 1.44 Z"
+				}],
+				['path', {
+					"style": "stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.72;fill:none;",
+					"transform": "translate(7.5, -8.5)",
+					"d": "M0 10.51 L0 15.05 L4.54 15.05"
+				}],
+				['path', {
+					"style": "fill:#f28226;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.72",
+					"transform": "translate(-3, -1)",
+					"d": "M0 8.81 L0 13.06 L5.95 13.06 L5.95 15.05 A50.2313 50.2313 -175.57 0 0 10.77 11.08 A49.9128 49.9128 -1.28 0 0 5.95 6.54 L5.95 8.81 L0 8.81 Z"
+				}],
+			]);
 
-	/*
+		/*
 	 *
 	 * 					[ 'a',
 						{'target': '_blank'},
@@ -18950,12 +19488,12 @@ ORYX.Plugins.ProcessLink = Clazz.extend({
 
 		// Shows the link in the overlay
 		this.facade.raiseEvent({
-					type: 			ORYX.CONFIG.EVENT_OVERLAY_SHOW,
-					id: 			"arissupport.urlref_" + shape.id,
-					shapes: 		[shape],
-					node:			link,
-					nodePosition:	"SE"
-				});
+			type: ORYX.CONFIG.EVENT_OVERLAY_SHOW,
+			id: "arissupport.urlref_" + shape.id,
+			shapes: [shape],
+			node: link,
+			nodePosition: "SE"
+		});
 
 	},
 
@@ -18964,12 +19502,12 @@ ORYX.Plugins.ProcessLink = Clazz.extend({
 	 *
 	 * @param {Object} shape
 	 */
-	hide: function( shape ){
+	hide: function (shape) {
 
 		this.facade.raiseEvent({
-					type: 			ORYX.CONFIG.EVENT_OVERLAY_HIDE,
-					id: 			"arissupport.urlref_" + shape.id
-				});
+			type: ORYX.CONFIG.EVENT_OVERLAY_HIDE,
+			id: "arissupport.urlref_" + shape.id
+		});
 
 	}
 });/*
@@ -18982,34 +19520,35 @@ ORYX.Plugins.ProcessLink = Clazz.extend({
  * All code Copyright 2013 KIS Consultancy all rights reserved
  */
 
-Array.prototype.insertFrom = function(from, to){
-	to 			= Math.max(0, to);
-	from 		= Math.min( Math.max(0, from), this.length-1 );
+Array.prototype.insertFrom = function (from, to) {
+	to = Math.max(0, to);
+	from = Math.min(Math.max(0, from), this.length - 1);
 
-	var el 		= this[from];
-	var old 	= this.without(el);
-	var newA 	= old.slice(0, to);
+	var el = this[from];
+	var old = this.without(el);
+	var newA = old.slice(0, to);
 	newA.push(el);
-	if(old.length > to ){
-		newA 	= newA.concat(old.slice(to))
-	};
+	if (old.length > to) {
+		newA = newA.concat(old.slice(to))
+	}
+	;
 	return newA;
 }
 
-if(!ORYX.Plugins)
+if (!ORYX.Plugins)
 	ORYX.Plugins = new Object();
 
 ORYX.Plugins.Arrangement = ORYX.Plugins.AbstractPlugin.extend({
 
 	facade: undefined,
 
-	construct: function(facade) {
+	construct: function (facade) {
 		this.facade = facade;
 
 		// Z-Ordering
 		/** Hide for SIGNAVIO
 
-		this.facade.offer({
+         this.facade.offer({
 			'name':ORYX.I18N.Arrangement.btf,
 			'functionality': this.setZLevel.bind(this, this.setToTop),
 			'group': ORYX.I18N.Arrangement.groupZ,
@@ -19018,7 +19557,7 @@ ORYX.Plugins.Arrangement = ORYX.Plugins.AbstractPlugin.extend({
 			'index': 1,
 			'minShape': 1});
 
-		this.facade.offer({
+         this.facade.offer({
 			'name':ORYX.I18N.Arrangement.btb,
 			'functionality': this.setZLevel.bind(this, this.setToBack),
 			'group': ORYX.I18N.Arrangement.groupZ,
@@ -19027,7 +19566,7 @@ ORYX.Plugins.Arrangement = ORYX.Plugins.AbstractPlugin.extend({
 			'index': 2,
 			'minShape': 1});
 
-		this.facade.offer({
+         this.facade.offer({
 			'name':ORYX.I18N.Arrangement.bf,
 			'functionality': this.setZLevel.bind(this, this.setForward),
 			'group': ORYX.I18N.Arrangement.groupZ,
@@ -19036,7 +19575,7 @@ ORYX.Plugins.Arrangement = ORYX.Plugins.AbstractPlugin.extend({
 			'index': 3,
 			'minShape': 1});
 
-		this.facade.offer({
+         this.facade.offer({
 			'name':ORYX.I18N.Arrangement.bb,
 			'functionality': this.setZLevel.bind(this, this.setBackward),
 			'group': ORYX.I18N.Arrangement.groupZ,
@@ -19045,8 +19584,8 @@ ORYX.Plugins.Arrangement = ORYX.Plugins.AbstractPlugin.extend({
 			'index': 4,
 			'minShape': 1});
 
-		// Aligment
-		this.facade.offer({
+         // Aligment
+         this.facade.offer({
 			'name':ORYX.I18N.Arrangement.ab,
 			'functionality': this.alignShapes.bind(this, [ORYX.CONFIG.EDITOR_ALIGN_BOTTOM]),
 			'group': ORYX.I18N.Arrangement.groupA,
@@ -19057,7 +19596,7 @@ ORYX.Plugins.Arrangement = ORYX.Plugins.AbstractPlugin.extend({
 
 
 
-		this.facade.offer({
+         this.facade.offer({
 			'name':ORYX.I18N.Arrangement.at,
 			'functionality': this.alignShapes.bind(this, [ORYX.CONFIG.EDITOR_ALIGN_TOP]),
 			'group': ORYX.I18N.Arrangement.groupA,
@@ -19066,7 +19605,7 @@ ORYX.Plugins.Arrangement = ORYX.Plugins.AbstractPlugin.extend({
 			'index': 3,
 			'minShape': 2});
 
-		this.facade.offer({
+         this.facade.offer({
 			'name':ORYX.I18N.Arrangement.al,
 			'functionality': this.alignShapes.bind(this, [ORYX.CONFIG.EDITOR_ALIGN_LEFT]),
 			'group': ORYX.I18N.Arrangement.groupA,
@@ -19075,7 +19614,7 @@ ORYX.Plugins.Arrangement = ORYX.Plugins.AbstractPlugin.extend({
 			'index': 4,
 			'minShape': 2});
 
-		this.facade.offer({
+         this.facade.offer({
 			'name':ORYX.I18N.Arrangement.ar,
 			'functionality': this.alignShapes.bind(this, [ORYX.CONFIG.EDITOR_ALIGN_RIGHT]),
 			'group': ORYX.I18N.Arrangement.groupA,
@@ -19084,127 +19623,131 @@ ORYX.Plugins.Arrangement = ORYX.Plugins.AbstractPlugin.extend({
 			'index': 6,
 			'minShape': 2});
 
-		**/
+		 **/
 
 		this.facade.offer({
-			'name':ORYX.I18N.Arrangement.am,
+			'name': ORYX.I18N.Arrangement.am,
 			'functionality': this.alignShapes.bind(this, [ORYX.CONFIG.EDITOR_ALIGN_MIDDLE]),
 			'group': ORYX.I18N.Arrangement.groupA,
 			'icon': ORYX.PATH + "images/shape_align_middle.png",
 			'description': ORYX.I18N.Arrangement.amDesc,
 			'index': 1,
-			'minShape': 2});
+			'minShape': 2
+		});
 
 		this.facade.offer({
-			'name':ORYX.I18N.Arrangement.ac,
+			'name': ORYX.I18N.Arrangement.ac,
 			'functionality': this.alignShapes.bind(this, [ORYX.CONFIG.EDITOR_ALIGN_CENTER]),
 			'group': ORYX.I18N.Arrangement.groupA,
 			'icon': ORYX.PATH + "images/shape_align_center.png",
 			'description': ORYX.I18N.Arrangement.acDesc,
 			'index': 2,
-			'minShape': 2});
+			'minShape': 2
+		});
 
 
 		this.facade.offer({
-			'name':ORYX.I18N.Arrangement.as,
+			'name': ORYX.I18N.Arrangement.as,
 			'functionality': this.alignShapes.bind(this, [ORYX.CONFIG.EDITOR_ALIGN_SIZE]),
 			'group': ORYX.I18N.Arrangement.groupA,
 			'icon': ORYX.PATH + "images/shape_align_size.png",
 			'description': ORYX.I18N.Arrangement.asDesc,
 			'index': 3,
-			'minShape': 2});
-
+			'minShape': 2
+		});
 
 
-		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_ARRANGEMENT_TOP, 	this.setZLevel.bind(this, this.setToTop)	);
-		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_ARRANGEMENT_BACK, 	this.setZLevel.bind(this, this.setToBack)	);
-		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_ARRANGEMENT_FORWARD, 	this.setZLevel.bind(this, this.setForward)	);
-		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_ARRANGEMENT_BACKWARD, 	this.setZLevel.bind(this, this.setBackward)	);
+		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_ARRANGEMENT_TOP, this.setZLevel.bind(this, this.setToTop));
+		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_ARRANGEMENT_BACK, this.setZLevel.bind(this, this.setToBack));
+		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_ARRANGEMENT_FORWARD, this.setZLevel.bind(this, this.setForward));
+		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_ARRANGEMENT_BACKWARD, this.setZLevel.bind(this, this.setBackward));
 
 
 	},
 
-	onSelectionChanged: function(elemnt){
+	onSelectionChanged: function (elemnt) {
 		var selection = this.facade.getSelection();
 		if (selection.length === 1 && selection[0] instanceof ORYX.Core.Edge) {
 			this.setToTop(selection);
 		}
 	},
 
-	setZLevel:function(callback, event){
+	setZLevel: function (callback, event) {
 
 		//Command-Pattern for dragging one docker
 		var zLevelCommand = ORYX.Core.Command.extend({
-			construct: function(callback, elements, facade){
-				this.callback 	= callback;
-				this.elements 	= elements;
+			construct: function (callback, elements, facade) {
+				this.callback = callback;
+				this.elements = elements;
 				// For redo, the previous elements get stored
-				this.elAndIndex	= elements.map(function(el){ return {el:el, previous:el.parent.children[el.parent.children.indexOf(el)-1]} })
-				this.facade		= facade;
+				this.elAndIndex = elements.map(function (el) {
+					return {el: el, previous: el.parent.children[el.parent.children.indexOf(el) - 1]}
+				})
+				this.facade = facade;
 			},
-			execute: function(){
+			execute: function () {
 
 				// Call the defined z-order callback with the elements
-				this.callback( this.elements )
-				this.facade.setSelection( this.elements )
+				this.callback(this.elements)
+				this.facade.setSelection(this.elements)
 			},
-			rollback: function(){
+			rollback: function () {
 
 				// Sort all elements on the index of there containment
-				var sortedEl =	this.elAndIndex.sortBy( function( el ) {
-									var value 	= el.el;
-									var t 		= $A(value.node.parentNode.childNodes);
-									return t.indexOf(value.node);
-								});
+				var sortedEl = this.elAndIndex.sortBy(function (el) {
+					var value = el.el;
+					var t = $A(value.node.parentNode.childNodes);
+					return t.indexOf(value.node);
+				});
 
 				// Every element get setted back bevor the old previous element
-				for(var i=0; i<sortedEl.length; i++){
-					var el			= sortedEl[i].el;
-					var p 			= el.parent;
-					var oldIndex 	= p.children.indexOf(el);
-					var newIndex 	= p.children.indexOf(sortedEl[i].previous);
-					newIndex		= newIndex || 0
-					p.children 	= p.children.insertFrom(oldIndex, newIndex)
-					el.node.parentNode.insertBefore(el.node, el.node.parentNode.childNodes[newIndex+1]);
+				for (var i = 0; i < sortedEl.length; i++) {
+					var el = sortedEl[i].el;
+					var p = el.parent;
+					var oldIndex = p.children.indexOf(el);
+					var newIndex = p.children.indexOf(sortedEl[i].previous);
+					newIndex = newIndex || 0
+					p.children = p.children.insertFrom(oldIndex, newIndex)
+					el.node.parentNode.insertBefore(el.node, el.node.parentNode.childNodes[newIndex + 1]);
 				}
 
 				// Reset the selection
-				this.facade.setSelection( this.elements )
+				this.facade.setSelection(this.elements)
 			}
 		});
 
 		// Instanziate the dockCommand
 		var command = new zLevelCommand(callback, this.facade.getSelection(), this.facade);
-		if( event.excludeCommand ){
+		if (event.excludeCommand) {
 			command.execute();
 		} else {
-			this.facade.executeCommands( [command] );
+			this.facade.executeCommands([command]);
 		}
 
 	},
 
-	setToTop: function(elements) {
+	setToTop: function (elements) {
 
 		// Sortieren des Arrays nach dem Index des SVGKnotens im Bezug auf dem Elternknoten.
-		var tmpElem =  elements.sortBy( function(value, index) {
+		var tmpElem = elements.sortBy(function (value, index) {
 			var t = $A(value.node.parentNode.childNodes);
 			return t.indexOf(value.node);
 		});
 		// Sortiertes Array wird nach oben verschoben.
-		tmpElem.each( function(value) {
+		tmpElem.each(function (value) {
 			var p = value.parent;
-			if (p.children.last() === value){
+			if (p.children.last() === value) {
 				return;
 			}
-			p.children = p.children.without( value )
+			p.children = p.children.without(value)
 			p.children.push(value);
 			value.node.parentNode.appendChild(value.node);
 		});
 	},
 
-	setToBack: function(elements) {
+	setToBack: function (elements) {
 		// Sortieren des Arrays nach dem Index des SVGKnotens im Bezug auf dem Elternknoten.
-		var tmpElem =  elements.sortBy( function(value, index) {
+		var tmpElem = elements.sortBy(function (value, index) {
 			var t = $A(value.node.parentNode.childNodes);
 			return t.indexOf(value.node);
 		});
@@ -19212,19 +19755,19 @@ ORYX.Plugins.Arrangement = ORYX.Plugins.AbstractPlugin.extend({
 		tmpElem = tmpElem.reverse();
 
 		// Sortiertes Array wird nach unten verschoben.
-		tmpElem.each( function(value) {
+		tmpElem.each(function (value) {
 			var p = value.parent
-			p.children = p.children.without( value )
-			p.children.unshift( value );
+			p.children = p.children.without(value)
+			p.children.unshift(value);
 			value.node.parentNode.insertBefore(value.node, value.node.parentNode.firstChild);
 		});
 
 
 	},
 
-	setBackward: function(elements) {
+	setBackward: function (elements) {
 		// Sortieren des Arrays nach dem Index des SVGKnotens im Bezug auf dem Elternknoten.
-		var tmpElem =  elements.sortBy( function(value, index) {
+		var tmpElem = elements.sortBy(function (value, index) {
 			var t = $A(value.node.parentNode.childNodes);
 			return t.indexOf(value.node);
 		});
@@ -19233,77 +19776,91 @@ ORYX.Plugins.Arrangement = ORYX.Plugins.AbstractPlugin.extend({
 		tmpElem = tmpElem.reverse();
 
 		// Delete all Nodes who are the next Node in the nodes-Array
-		var compactElem = tmpElem.findAll(function(el) {return !tmpElem.some(function(checkedEl){ return checkedEl.node == el.node.previousSibling})});
+		var compactElem = tmpElem.findAll(function (el) {
+			return !tmpElem.some(function (checkedEl) {
+				return checkedEl.node == el.node.previousSibling
+			})
+		});
 
 		// Sortiertes Array wird nach eine Ebene nach oben verschoben.
-		compactElem.each( function(el) {
-			if(el.node.previousSibling === null) { return; }
-			var p 		= el.parent;
-			var index 	= p.children.indexOf(el);
-			p.children 	= p.children.insertFrom(index, index-1)
+		compactElem.each(function (el) {
+			if (el.node.previousSibling === null) {
+				return;
+			}
+			var p = el.parent;
+			var index = p.children.indexOf(el);
+			p.children = p.children.insertFrom(index, index - 1)
 			el.node.parentNode.insertBefore(el.node, el.node.previousSibling);
 		});
 
 
 	},
 
-	setForward: function(elements) {
+	setForward: function (elements) {
 		// Sortieren des Arrays nach dem Index des SVGKnotens im Bezug auf dem Elternknoten.
-		var tmpElem =  elements.sortBy( function(value, index) {
+		var tmpElem = elements.sortBy(function (value, index) {
 			var t = $A(value.node.parentNode.childNodes);
 			return t.indexOf(value.node);
 		});
 
 
 		// Delete all Nodes who are the next Node in the nodes-Array
-		var compactElem = tmpElem.findAll(function(el) {return !tmpElem.some(function(checkedEl){ return checkedEl.node == el.node.nextSibling})});
+		var compactElem = tmpElem.findAll(function (el) {
+			return !tmpElem.some(function (checkedEl) {
+				return checkedEl.node == el.node.nextSibling
+			})
+		});
 
 
 		// Sortiertes Array wird eine Ebene nach unten verschoben.
-		compactElem.each( function(el) {
+		compactElem.each(function (el) {
 			var nextNode = el.node.nextSibling
-			if(nextNode === null) { return; }
-			var index 	= el.parent.children.indexOf(el);
-			var p 		= el.parent;
-			p.children 	= p.children.insertFrom(index, index+1)
+			if (nextNode === null) {
+				return;
+			}
+			var index = el.parent.children.indexOf(el);
+			var p = el.parent;
+			p.children = p.children.insertFrom(index, index + 1)
 			el.node.parentNode.insertBefore(nextNode, el.node);
 		});
 	},
 
 
-	alignShapes: function(way) {
+	alignShapes: function (way) {
 
 		var elements = this.facade.getSelection();
 
 		// Set the elements to all Top-Level elements
 		elements = this.facade.getCanvas().getShapesWithSharedParent(elements);
 		// Get only nodes
-		elements = elements.findAll(function(value) {
+		elements = elements.findAll(function (value) {
 			return (value instanceof ORYX.Core.Node)
 		});
 		// Delete all attached intermediate events from the array
-		elements = elements.findAll(function(value) {
+		elements = elements.findAll(function (value) {
 			var d = value.getIncomingShapes()
 			return d.length == 0 || !elements.include(d[0])
 		});
-		if(elements.length < 2) { return; }
+		if (elements.length < 2) {
+			return;
+		}
 
 		// get bounds of all shapes.
 		var bounds = elements[0].absoluteBounds().clone();
-		elements.each(function(shape) {
-		        bounds.include(shape.absoluteBounds().clone());
+		elements.each(function (shape) {
+			bounds.include(shape.absoluteBounds().clone());
 		});
 
 		// get biggest width and heigth
 		var maxWidth = 0;
 		var maxHeight = 0;
-		elements.each(function(shape){
+		elements.each(function (shape) {
 			maxWidth = Math.max(shape.bounds.width(), maxWidth);
 			maxHeight = Math.max(shape.bounds.height(), maxHeight);
 		});
 
 		var commandClass = ORYX.Core.Command.extend({
-			construct: function(elements, bounds, maxHeight, maxWidth, way, plugin){
+			construct: function (elements, bounds, maxHeight, maxWidth, way, plugin) {
 				this.elements = elements;
 				this.bounds = bounds;
 				this.maxHeight = maxHeight;
@@ -19313,47 +19870,53 @@ ORYX.Plugins.Arrangement = ORYX.Plugins.AbstractPlugin.extend({
 				this.plugin = plugin;
 				this.orgPos = [];
 			},
-			setBounds: function(shape, maxSize) {
-				if(!maxSize)
+			setBounds: function (shape, maxSize) {
+				if (!maxSize)
 					maxSize = {width: ORYX.CONFIG.MAXIMUM_SIZE, height: ORYX.CONFIG.MAXIMUM_SIZE};
 
-				if(!shape.bounds) { throw "Bounds not definined." }
+				if (!shape.bounds) {
+					throw "Bounds not definined."
+				}
 
 				var newBounds = {
-                    a: {x: shape.bounds.upperLeft().x - (this.maxWidth - shape.bounds.width())/2,
-                        y: shape.bounds.upperLeft().y - (this.maxHeight - shape.bounds.height())/2},
-                    b: {x: shape.bounds.lowerRight().x + (this.maxWidth - shape.bounds.width())/2,
-                        y: shape.bounds.lowerRight().y + (this.maxHeight - shape.bounds.height())/2}
-	            }
+					a: {
+						x: shape.bounds.upperLeft().x - (this.maxWidth - shape.bounds.width()) / 2,
+						y: shape.bounds.upperLeft().y - (this.maxHeight - shape.bounds.height()) / 2
+					},
+					b: {
+						x: shape.bounds.lowerRight().x + (this.maxWidth - shape.bounds.width()) / 2,
+						y: shape.bounds.lowerRight().y + (this.maxHeight - shape.bounds.height()) / 2
+					}
+				}
 
 				/* If the new width of shape exceeds the maximum width, set width value to maximum. */
-				if(this.maxWidth > maxSize.width) {
+				if (this.maxWidth > maxSize.width) {
 					newBounds.a.x = shape.bounds.upperLeft().x -
-									(maxSize.width - shape.bounds.width())/2;
+						(maxSize.width - shape.bounds.width()) / 2;
 
-					newBounds.b.x =	shape.bounds.lowerRight().x + (maxSize.width - shape.bounds.width())/2
+					newBounds.b.x = shape.bounds.lowerRight().x + (maxSize.width - shape.bounds.width()) / 2
 				}
 
 				/* If the new height of shape exceeds the maximum height, set height value to maximum. */
-				if(this.maxHeight > maxSize.height) {
+				if (this.maxHeight > maxSize.height) {
 					newBounds.a.y = shape.bounds.upperLeft().y -
-									(maxSize.height - shape.bounds.height())/2;
+						(maxSize.height - shape.bounds.height()) / 2;
 
-					newBounds.b.y =	shape.bounds.lowerRight().y + (maxSize.height - shape.bounds.height())/2
+					newBounds.b.y = shape.bounds.lowerRight().y + (maxSize.height - shape.bounds.height()) / 2
 				}
 
 				/* set bounds of shape */
 				shape.bounds.set(newBounds);
 
 			},
-			execute: function(){
+			execute: function () {
 				// align each shape according to the way that was specified.
-				this.elements.each(function(shape, index) {
+				this.elements.each(function (shape, index) {
 					this.orgPos[index] = shape.bounds.upperLeft();
 
 					var relBounds = this.bounds.clone();
 					var newCoordinates;
-					if (shape.parent && !(shape.parent instanceof ORYX.Core.Canvas) ) {
+					if (shape.parent && !(shape.parent instanceof ORYX.Core.Canvas)) {
 						var upL = shape.parent.absoluteBounds().upperLeft();
 						relBounds.moveBy(-upL.x, -upL.y);
 					}
@@ -19361,57 +19924,63 @@ ORYX.Plugins.Arrangement = ORYX.Plugins.AbstractPlugin.extend({
 					switch (this.way) {
 						// align the shapes in the requested way.
 						case ORYX.CONFIG.EDITOR_ALIGN_BOTTOM:
-			                newCoordinates = {
+							newCoordinates = {
 								x: shape.bounds.upperLeft().x,
 								y: relBounds.b.y - shape.bounds.height()
-							}; break;
+							};
+							break;
 
-				        case ORYX.CONFIG.EDITOR_ALIGN_MIDDLE:
-			                newCoordinates = {
+						case ORYX.CONFIG.EDITOR_ALIGN_MIDDLE:
+							newCoordinates = {
 								x: shape.bounds.upperLeft().x,
 								y: (relBounds.a.y + relBounds.b.y - shape.bounds.height()) / 2
-							}; break;
+							};
+							break;
 
-				        case ORYX.CONFIG.EDITOR_ALIGN_TOP:
-			                newCoordinates = {
+						case ORYX.CONFIG.EDITOR_ALIGN_TOP:
+							newCoordinates = {
 								x: shape.bounds.upperLeft().x,
 								y: relBounds.a.y
-							}; break;
+							};
+							break;
 
-				        case ORYX.CONFIG.EDITOR_ALIGN_LEFT:
-			                newCoordinates = {
+						case ORYX.CONFIG.EDITOR_ALIGN_LEFT:
+							newCoordinates = {
 								x: relBounds.a.x,
 								y: shape.bounds.upperLeft().y
-							}; break;
+							};
+							break;
 
-				        case ORYX.CONFIG.EDITOR_ALIGN_CENTER:
-			                newCoordinates = {
+						case ORYX.CONFIG.EDITOR_ALIGN_CENTER:
+							newCoordinates = {
 								x: (relBounds.a.x + relBounds.b.x - shape.bounds.width()) / 2,
 								y: shape.bounds.upperLeft().y
-							}; break;
+							};
+							break;
 
-				        case ORYX.CONFIG.EDITOR_ALIGN_RIGHT:
-			                newCoordinates = {
+						case ORYX.CONFIG.EDITOR_ALIGN_RIGHT:
+							newCoordinates = {
 								x: relBounds.b.x - shape.bounds.width(),
 								y: shape.bounds.upperLeft().y
-							}; break;
+							};
+							break;
 
 						case ORYX.CONFIG.EDITOR_ALIGN_SIZE:
-							if(shape.isResizable) {
+							if (shape.isResizable) {
 								this.orgPos[index] = {a: shape.bounds.upperLeft(), b: shape.bounds.lowerRight()};
 								this.setBounds(shape, shape.maximumSize);
 							}
 							break;
 					}
 
-					if (newCoordinates){
-						var offset =  {
+					if (newCoordinates) {
+						var offset = {
 							x: shape.bounds.upperLeft().x - newCoordinates.x,
 							y: shape.bounds.upperLeft().y - newCoordinates.y
 						}
 						// Set the new position
 						shape.bounds.moveTo(newCoordinates);
-						this.plugin.layoutEdges(shape, shape.getAllDockedShapes(),offset);
+						this.plugin.layoutEdges(shape, shape.getAllDockedShapes(), offset);
 						//shape.update()
 					}
 				}.bind(this));
@@ -19419,11 +19988,15 @@ ORYX.Plugins.Arrangement = ORYX.Plugins.AbstractPlugin.extend({
 				//this.facade.getCanvas().update();
 				//this.facade.updateSelection();
 			},
-			rollback: function(){
-				this.elements.each(function(shape, index) {
+			rollback: function () {
+				this.elements.each(function (shape, index) {
 					if (this.way == ORYX.CONFIG.EDITOR_ALIGN_SIZE) {
-						if(shape.isResizable) {shape.bounds.set(this.orgPos[index]);}
-					} else {shape.bounds.moveTo(this.orgPos[index]);}
+						if (shape.isResizable) {
+							shape.bounds.set(this.orgPos[index]);
+						}
+					} else {
+						shape.bounds.moveTo(this.orgPos[index]);
+					}
 				}.bind(this));
 
 				//this.facade.getCanvas().update();
@@ -19446,21 +20019,21 @@ ORYX.Plugins.Arrangement = ORYX.Plugins.AbstractPlugin.extend({
  */
 
 if (!ORYX.Plugins)
-    ORYX.Plugins = new Object();
+	ORYX.Plugins = new Object();
 
 ORYX.Plugins.Save = Clazz.extend({
 
-    facade: undefined,
+	facade: undefined,
 
 	processURI: undefined,
 
-	changeSymbol : "*",
+	changeSymbol: "*",
 
-    construct: function(facade){
+	construct: function (facade) {
 		this.facade = facade;
 
-		document.addEventListener("keydown", function(e){
-			if (e.ctrlKey&&e.keyCode === 83){
+		document.addEventListener("keydown", function (e) {
+			if (e.ctrlKey && e.keyCode === 83) {
 				Event.stop(e);
 			}
 		}, false);
@@ -19471,13 +20044,25 @@ ORYX.Plugins.Save = Clazz.extend({
 
 		// Register on event for executing commands --> store all commands in a stack
 		// --> Execute
-		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_UNDO_EXECUTE, function(){ this.changeDifference++; this.updateTitle(); }.bind(this) );
-		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_EXECUTE_COMMANDS, function(){ this.changeDifference++; this.updateTitle(); }.bind(this) );
+		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_UNDO_EXECUTE, function () {
+			this.changeDifference++;
+			this.updateTitle();
+		}.bind(this));
+		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_EXECUTE_COMMANDS, function () {
+			this.changeDifference++;
+			this.updateTitle();
+		}.bind(this));
 		// --> Saved from other places in the editor
-		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_SAVED, function(){ this.changeDifference = 0; this.updateTitle(); }.bind(this) );
+		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_SAVED, function () {
+			this.changeDifference = 0;
+			this.updateTitle();
+		}.bind(this));
 
 		// --> Rollback
-		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_UNDO_ROLLBACK, function(){ this.changeDifference--; this.updateTitle(); }.bind(this) );
+		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_UNDO_ROLLBACK, function () {
+			this.changeDifference--;
+			this.updateTitle();
+		}.bind(this));
 
 		//TODO very critical for load time performance!!!
 		//this.serializedDOM = DataManager.__persistDOM(this.facade);
@@ -19485,23 +20070,23 @@ ORYX.Plugins.Save = Clazz.extend({
 		this.hasChanges = this._hasChanges.bind(this);
 	},
 
-	updateTitle: function(){
+	updateTitle: function () {
 
 		var value = window.document.title || document.getElementsByTagName("title")[0].childNodes[0].nodeValue;
 
-		if (this.changeDifference === 0 && value.startsWith(this.changeSymbol)){
+		if (this.changeDifference === 0 && value.startsWith(this.changeSymbol)) {
 			window.document.title = value.slice(1);
-		} else if (this.changeDifference !== 0 && !value.startsWith(this.changeSymbol)){
+		} else if (this.changeDifference !== 0 && !value.startsWith(this.changeSymbol)) {
 			window.document.title = this.changeSymbol + "" + value;
 		}
 	},
 
-	_hasChanges: function() {
-	  return this.changeDifference !== 0 || (this.facade.getModelMetaData()['new'] && this.facade.getCanvas().getChildShapes().size() > 0);
+	_hasChanges: function () {
+		return this.changeDifference !== 0 || (this.facade.getModelMetaData()['new'] && this.facade.getCanvas().getChildShapes().size() > 0);
 	},
 
-	onUnLoad: function(){
-		if(this._hasChanges()) {
+	onUnLoad: function () {
+		if (this._hasChanges()) {
 			return ORYX.I18N.Save.unsavedData;
 		}
 	}
@@ -19516,35 +20101,35 @@ ORYX.Plugins.Save = Clazz.extend({
  * All code Copyright 2013 KIS Consultancy all rights reserved
  */
 
-if(!ORYX.Plugins)
+if (!ORYX.Plugins)
 	ORYX.Plugins = new Object();
 
 ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 
 	/**
-	 *	Constructor
-	 *	@param {Object} Facade: The Facade of the Editor
+	 *    Constructor
+	 *    @param {Object} Facade: The Facade of the Editor
 	 */
-	construct: function(facade) {
+	construct: function (facade) {
 		this.facade = facade;
 
 		// Initialize variables
-		this.currentShapes 		= [];			// Current selected Shapes
+		this.currentShapes = [];			// Current selected Shapes
 		//this.pluginsData 		= [];			// Available Plugins
-		this.toMoveShapes 		= [];			// Shapes there will be moved
-		this.distPoints 		= [];			// Distance Points for Snap on Grid
-		this.isResizing 		= false;		// Flag: If there was currently resized
-		this.dragEnable 		= false;		// Flag: If Dragging is enabled
-		this.dragIntialized 	= false;		// Flag: If the Dragging is initialized
-		this.edgesMovable		= true;			// Flag: If an edge is docked it is not movable
-		this.offSetPosition 	= {x: 0, y: 0};	// Offset of the Dragging
-		this.faktorXY 			= {x: 1, y: 1};	// The Current Zoom-Faktor
+		this.toMoveShapes = [];			// Shapes there will be moved
+		this.distPoints = [];			// Distance Points for Snap on Grid
+		this.isResizing = false;		// Flag: If there was currently resized
+		this.dragEnable = false;		// Flag: If Dragging is enabled
+		this.dragIntialized = false;		// Flag: If the Dragging is initialized
+		this.edgesMovable = true;			// Flag: If an edge is docked it is not movable
+		this.offSetPosition = {x: 0, y: 0};	// Offset of the Dragging
+		this.faktorXY = {x: 1, y: 1};	// The Current Zoom-Faktor
 		this.containmentParentNode;				// the current future parent node for the dragged shapes
-		this.isAddingAllowed 	= false;		// flag, if adding current selected shapes to containmentParentNode is allowed
+		this.isAddingAllowed = false;		// flag, if adding current selected shapes to containmentParentNode is allowed
 		this.isAttachingAllowed = false;		// flag, if attaching to the current shape is allowed
 
-		this.callbackMouseMove	= this.handleMouseMove.bind(this);
-		this.callbackMouseUp	= this.handleMouseUp.bind(this);
+		this.callbackMouseMove = this.handleMouseMove.bind(this);
+		this.callbackMouseUp = this.handleMouseUp.bind(this);
 
 		// Get the SVG-Containernode
 		var containerNode = this.facade.getCanvas().getSvgContainer();
@@ -19584,10 +20169,13 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 	 * On Mouse Down
 	 *
 	 */
-	handleMouseDown: function(event, uiObj) {
+	handleMouseDown: function (event, uiObj) {
 		// If the selection Bounds not intialized and the uiObj is not member of current selectio
 		// then return
-		if(!this.dragBounds || !this.currentShapes.member(uiObj) || !this.toMoveShapes.length) {return;};
+		if (!this.dragBounds || !this.currentShapes.member(uiObj) || !this.toMoveShapes.length) {
+			return;
+		}
+		;
 
 		// Start Dragging
 		this.dragEnable = true;
@@ -19604,11 +20192,12 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 
 		// Set the offset position of dragging
 		var upL = this.dragBounds.upperLeft();
-		this.offSetPosition =  {
+		this.offSetPosition = {
 			x: eventX - (upL.x * this.faktorXY.x),
-			y: eventY - (upL.y * this.faktorXY.y)};
+			y: eventY - (upL.y * this.faktorXY.y)
+		};
 
-		this.offsetScroll	= {x:this.scrollNode.scrollLeft,y:this.scrollNode.scrollTop};
+		this.offsetScroll = {x: this.scrollNode.scrollLeft, y: this.scrollNode.scrollTop};
 
 		// Register on Global Mouse-MOVE Event
 		document.documentElement.addEventListener(ORYX.CONFIG.EVENT_MOUSEMOVE, this.callbackMouseMove, false);
@@ -19622,77 +20211,76 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 	 * On Key Mouse Up
 	 *
 	 */
-	handleMouseUp: function(event) {
+	handleMouseUp: function (event) {
 
 		//disable containment highlighting
 		this.facade.raiseEvent({
-									type:ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
-									highlightId:"dragdropresize.contain"
-								});
+			type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
+			highlightId: "dragdropresize.contain"
+		});
 
 		this.facade.raiseEvent({
-									type:ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
-									highlightId:"dragdropresize.attached"
-								});
+			type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
+			highlightId: "dragdropresize.attached"
+		});
 
 		// If Dragging is finished
-		if(this.dragEnable) {
+		if (this.dragEnable) {
 
 			// and update the current selection
-			if(!this.dragIntialized) {
+			if (!this.dragIntialized) {
 
 				// Do Method after Dragging
 				this.afterDrag();
 
 				// Check if the Shape is allowed to dock to the other Shape
-				if ( 	this.isAttachingAllowed &&
-						this.toMoveShapes.length == 1 && this.toMoveShapes[0] instanceof ORYX.Core.Node  &&
-						this.toMoveShapes[0].dockers.length > 0) {
+				if (this.isAttachingAllowed &&
+					this.toMoveShapes.length == 1 && this.toMoveShapes[0] instanceof ORYX.Core.Node &&
+					this.toMoveShapes[0].dockers.length > 0) {
 
 					// Get the position and the docker
-					var position 	= this.facade.eventCoordinates( event );
-					var docker 		= this.toMoveShapes[0].dockers[0];
-
+					var position = this.facade.eventCoordinates(event);
+					var docker = this.toMoveShapes[0].dockers[0];
 
 
 					//Command-Pattern for dragging several Shapes
 					var dockCommand = ORYX.Core.Command.extend({
-						construct: function(docker, position, newDockedShape, facade){
-							this.docker 		= docker;
-							this.newPosition	= position;
+						construct: function (docker, position, newDockedShape, facade) {
+							this.docker = docker;
+							this.newPosition = position;
 							this.newDockedShape = newDockedShape;
-							this.newParent 		= newDockedShape.parent || facade.getCanvas();
-							this.oldPosition	= docker.parent.bounds.center();
-							this.oldDockedShape	= docker.getDockedShape();
-							this.oldParent 		= docker.parent.parent || facade.getCanvas();
-							this.facade			= facade;
+							this.newParent = newDockedShape.parent || facade.getCanvas();
+							this.oldPosition = docker.parent.bounds.center();
+							this.oldDockedShape = docker.getDockedShape();
+							this.oldParent = docker.parent.parent || facade.getCanvas();
+							this.facade = facade;
 
-							if( this.oldDockedShape ){
+							if (this.oldDockedShape) {
 								this.oldPosition = docker.parent.absoluteBounds().center();
 							}
 
 						},
-						execute: function(){
-							this.dock( this.newDockedShape, this.newParent,  this.newPosition );
+						execute: function () {
+							this.dock(this.newDockedShape, this.newParent, this.newPosition);
 
 							// Raise Event for having the docked shape on top of the other shape
-							this.facade.raiseEvent({type:ORYX.CONFIG.EVENT_ARRANGEMENT_TOP, excludeCommand: true})
+							this.facade.raiseEvent({type: ORYX.CONFIG.EVENT_ARRANGEMENT_TOP, excludeCommand: true})
 						},
-						rollback: function(){
-							this.dock( this.oldDockedShape, this.oldParent, this.oldPosition );
+						rollback: function () {
+							this.dock(this.oldDockedShape, this.oldParent, this.oldPosition);
 						},
-						dock:function( toDockShape, parent, pos ){
+						dock: function (toDockShape, parent, pos) {
 							// Add to the same parent Shape
-							parent.add( this.docker.parent )
+							parent.add(this.docker.parent)
 
 
 							// Set the Docker to the new Shape
-							this.docker.setDockedShape( undefined );
-							this.docker.bounds.centerMoveTo( pos )
-							this.docker.setDockedShape( toDockShape );
+							this.docker.setDockedShape(undefined);
+							this.docker.bounds.centerMoveTo(pos)
+							this.docker.setDockedShape(toDockShape);
 							//this.docker.update();
 
-							this.facade.setSelection( [this.docker.parent] );
+							this.facade.setSelection([this.docker.parent]);
 							this.facade.getCanvas().update();
 							this.facade.updateSelection();
 
@@ -19705,8 +20293,8 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 					this.facade.executeCommands(commands);
 
 
-				// Check if adding is allowed to the other Shape
-				} else if( this.isAddingAllowed ) {
+					// Check if adding is allowed to the other Shape
+				} else if (this.isAddingAllowed) {
 
 
 					// Refresh all Shapes --> Set the new Bounds
@@ -19718,7 +20306,7 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 
 				//this.currentShapes.each(function(shape) {shape.update()})
 				// Raise Event: Dragging is finished
-				this.facade.raiseEvent({type:ORYX.CONFIG.EVENT_DRAGDROP_END});
+				this.facade.raiseEvent({type: ORYX.CONFIG.EVENT_DRAGDROP_END});
 			}
 
 			if (this.vLine)
@@ -19739,16 +20327,19 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 	},
 
 	/**
-	* On Key Mouse Move
-	*
-	*/
-	handleMouseMove: function(event) {
+	 * On Key Mouse Move
+	 *
+	 */
+	handleMouseMove: function (event) {
 		// If dragging is not enabled, go return
-		if(!this.dragEnable) { return };
+		if (!this.dragEnable) {
+			return
+		}
+		;
 		// If Dragging is initialized
-		if(this.dragIntialized) {
+		if (this.dragIntialized) {
 			// Raise Event: Drag will be started
-			this.facade.raiseEvent({type:ORYX.CONFIG.EVENT_DRAGDROP_START});
+			this.facade.raiseEvent({type: ORYX.CONFIG.EVENT_DRAGDROP_START});
 			this.dragIntialized = false;
 
 			// And hide the resizers and the highlighting
@@ -19756,7 +20347,7 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 			this.resizerNW.hide();
 
 			// if only edges are selected, containmentParentNode must be the canvas
-			this._onlyEdges = this.currentShapes.all(function(currentShape) {
+			this._onlyEdges = this.currentShapes.all(function (currentShape) {
 				return (currentShape instanceof ORYX.Core.Edge);
 			});
 
@@ -19771,14 +20362,15 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 		// Calculate the new position
 		var position = {
 			x: Event.pointerX(event) - this.offSetPosition.x,
-			y: Event.pointerY(event) - this.offSetPosition.y}
+			y: Event.pointerY(event) - this.offSetPosition.y
+		}
 
-		position.x 	-= this.offsetScroll.x - this.scrollNode.scrollLeft;
-		position.y 	-= this.offsetScroll.y - this.scrollNode.scrollTop;
+		position.x -= this.offsetScroll.x - this.scrollNode.scrollLeft;
+		position.y -= this.offsetScroll.y - this.scrollNode.scrollTop;
 
 		// If not the Control-Key are pressed
 		var modifierKeyPressed = event.shiftKey || event.ctrlKey;
-		if(ORYX.CONFIG.GRID_ENABLED && !modifierKeyPressed) {
+		if (ORYX.CONFIG.GRID_ENABLED && !modifierKeyPressed) {
 			// Snap the current position to the nearest Snap-Point
 			position = this.snapToGrid(position);
 		} else {
@@ -19793,13 +20385,13 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 		position.y /= this.faktorXY.y;
 
 		// Set that the position is not lower than zero
-		position.x = Math.max( 0 , position.x)
-		position.y = Math.max( 0 , position.y)
+		position.x = Math.max(0, position.x)
+		position.y = Math.max(0, position.y)
 
 		// Set that the position is not bigger than the canvas
 		var c = this.facade.getCanvas();
-		position.x = Math.min( c.bounds.width() - this.dragBounds.width(), 		position.x)
-		position.y = Math.min( c.bounds.height() - this.dragBounds.height(), 	position.y)
+		position.x = Math.min(c.bounds.width() - this.dragBounds.width(), position.x)
+		position.y = Math.min(c.bounds.height() - this.dragBounds.height(), position.y)
 
 
 		// Drag this bounds
@@ -19815,35 +20407,37 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 		var eventCoordinates = this.facade.eventCoordinates(event);
 
 		var additionalIEZoom = 1;
-        if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
-            var ua = navigator.userAgent;
-            if (ua.indexOf('MSIE') >= 0) {
-                //IE 10 and below
-                var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
-                if (zoom !== 100) {
-                    additionalIEZoom = zoom / 100
-                }
-            }
-        }
+		if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
+			var ua = navigator.userAgent;
+			if (ua.indexOf('MSIE') >= 0) {
+				//IE 10 and below
+				var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
+				if (zoom !== 100) {
+					additionalIEZoom = zoom / 100
+				}
+			}
+		}
 
-        if (additionalIEZoom !== 1) {
-             eventCoordinates.x = eventCoordinates.x / additionalIEZoom;
-             eventCoordinates.y = eventCoordinates.y / additionalIEZoom;
-        }
+		if (additionalIEZoom !== 1) {
+			eventCoordinates.x = eventCoordinates.x / additionalIEZoom;
+			eventCoordinates.y = eventCoordinates.y / additionalIEZoom;
+		}
 
 		var underlyingNodes = $A(this.facade.getCanvas().getAbstractShapesAtPosition(eventCoordinates));
 
 		var checkIfAttachable = this.toMoveShapes.length == 1 && this.toMoveShapes[0] instanceof ORYX.Core.Node && this.toMoveShapes[0].dockers.length > 0
-		checkIfAttachable	= checkIfAttachable && underlyingNodes.length != 1
+		checkIfAttachable = checkIfAttachable && underlyingNodes.length != 1
 
 
 		if (!checkIfAttachable &&
-				underlyingNodes.length === this._currentUnderlyingNodes.length  &&
-				underlyingNodes.all(function(node, index){return this._currentUnderlyingNodes[index] === node}.bind(this))) {
+			underlyingNodes.length === this._currentUnderlyingNodes.length &&
+			underlyingNodes.all(function (node, index) {
+				return this._currentUnderlyingNodes[index] === node
+			}.bind(this))) {
 
 			return
 
-		} else if(this._onlyEdges) {
+		} else if (this._onlyEdges) {
 
 			this.isAddingAllowed = true;
 			this.containmentParentNode = this.facade.getCanvas();
@@ -19852,9 +20446,9 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 
 			/* Check the containment and connection rules */
 			var options = {
-				event : event,
-				underlyingNodes : underlyingNodes,
-				checkIfAttachable : checkIfAttachable
+				event: event,
+				underlyingNodes: underlyingNodes,
+				checkIfAttachable: checkIfAttachable
 			};
 			this.checkRules(options);
 
@@ -19863,49 +20457,49 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 		this._currentUnderlyingNodes = underlyingNodes.reverse();
 
 		//visualize the containment result
-		if( this.isAttachingAllowed ) {
+		if (this.isAttachingAllowed) {
 
 			this.facade.raiseEvent({
-									type: 			ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW,
-									highlightId: 	"dragdropresize.attached",
-									elements: 		[this.containmentParentNode],
-									style: 			ORYX.CONFIG.SELECTION_HIGHLIGHT_STYLE_RECTANGLE,
-									color: 			ORYX.CONFIG.SELECTION_VALID_COLOR
-								});
+				type: ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW,
+				highlightId: "dragdropresize.attached",
+				elements: [this.containmentParentNode],
+				style: ORYX.CONFIG.SELECTION_HIGHLIGHT_STYLE_RECTANGLE,
+				color: ORYX.CONFIG.SELECTION_VALID_COLOR
+			});
 
 		} else {
 
 			this.facade.raiseEvent({
-									type:ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
-									highlightId:"dragdropresize.attached"
-								});
+				type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
+				highlightId: "dragdropresize.attached"
+			});
 		}
 
-		if( !this.isAttachingAllowed ){
-			if( this.isAddingAllowed ) {
+		if (!this.isAttachingAllowed) {
+			if (this.isAddingAllowed) {
 
 				this.facade.raiseEvent({
-										type:ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW,
-										highlightId:"dragdropresize.contain",
-										elements:[this.containmentParentNode],
-										color: ORYX.CONFIG.SELECTION_VALID_COLOR
-									});
+					type: ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW,
+					highlightId: "dragdropresize.contain",
+					elements: [this.containmentParentNode],
+					color: ORYX.CONFIG.SELECTION_VALID_COLOR
+				});
 
 			} else {
 
 				this.facade.raiseEvent({
-										type:ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW,
-										highlightId:"dragdropresize.contain",
-										elements:[this.containmentParentNode],
-										color: ORYX.CONFIG.SELECTION_INVALID_COLOR
-									});
+					type: ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW,
+					highlightId: "dragdropresize.contain",
+					elements: [this.containmentParentNode],
+					color: ORYX.CONFIG.SELECTION_INVALID_COLOR
+				});
 
 			}
 		} else {
 			this.facade.raiseEvent({
-									type:ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
-									highlightId:"dragdropresize.contain"
-								});
+				type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
+				highlightId: "dragdropresize.contain"
+			});
 		}
 
 		// Stop the Event
@@ -19926,7 +20520,7 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 	/**
 	 *  Checks the containment and connection rules for the selected shapes.
 	 */
-	checkRules : function(options) {
+	checkRules: function (options) {
 		var event = options.event;
 		var underlyingNodes = options.underlyingNodes;
 		var checkIfAttachable = options.checkIfAttachable;
@@ -19935,42 +20529,44 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 		//get underlying node that is not the same than one of the currently selected shapes or
 		// a child of one of the selected shapes with the highest z Order.
 		// The result is a shape or the canvas
-		this.containmentParentNode = underlyingNodes.reverse().find((function(node) {
+		this.containmentParentNode = underlyingNodes.reverse().find((function (node) {
 			return (node instanceof ORYX.Core.Canvas) ||
-					(((node instanceof ORYX.Core.Node) || ((node instanceof ORYX.Core.Edge) && !noEdges))
+				(((node instanceof ORYX.Core.Node) || ((node instanceof ORYX.Core.Edge) && !noEdges))
 					&& (!(this.currentShapes.member(node) ||
-							this.currentShapes.any(function(shape) {
-								return (shape.children.length > 0 && shape.getChildNodes(true).member(node));
-							}))));
+						this.currentShapes.any(function (shape) {
+							return (shape.children.length > 0 && shape.getChildNodes(true).member(node));
+						}))));
 		}).bind(this));
 
-		if( checkIfAttachable ){
+		if (checkIfAttachable) {
 
-			this.isAttachingAllowed	= this.facade.getRules().canConnect({
-												sourceShape:	this.containmentParentNode,
-												edgeShape:		this.toMoveShapes[0],
-												targetShape:	this.toMoveShapes[0]
-												});
+			this.isAttachingAllowed = this.facade.getRules().canConnect({
+				sourceShape: this.containmentParentNode,
+				edgeShape: this.toMoveShapes[0],
+				targetShape: this.toMoveShapes[0]
+			});
 
-			if ( this.isAttachingAllowed	) {
+			if (this.isAttachingAllowed) {
 				var point = this.facade.eventCoordinates(event);
-				this.isAttachingAllowed	= this.containmentParentNode.isPointOverOffset( point.x, point.y );
+				this.isAttachingAllowed = this.containmentParentNode.isPointOverOffset(point.x, point.y);
 			}
 		}
 
-		if( !this.isAttachingAllowed ){
+		if (!this.isAttachingAllowed) {
 			//check all selected shapes, if they can be added to containmentParentNode
-			this.isAddingAllowed = this.toMoveShapes.all((function(currentShape) {
-				if(currentShape instanceof ORYX.Core.Edge ||
+			this.isAddingAllowed = this.toMoveShapes.all((function (currentShape) {
+				if (currentShape instanceof ORYX.Core.Edge ||
 					currentShape instanceof ORYX.Core.Controls.Docker ||
 					this.containmentParentNode === currentShape.parent) {
 					return true;
-				} else if(this.containmentParentNode !== currentShape) {
+				} else if (this.containmentParentNode !== currentShape) {
 
-					if(!(this.containmentParentNode instanceof ORYX.Core.Edge) || !noEdges) {
+					if (!(this.containmentParentNode instanceof ORYX.Core.Edge) || !noEdges) {
 
-						if(this.facade.getRules().canContain({containingShape:this.containmentParentNode,
-															  containedShape:currentShape})) {
+						if (this.facade.getRules().canContain({
+							containingShape: this.containmentParentNode,
+							containedShape: currentShape
+						})) {
 							return true;
 						}
 					}
@@ -19979,8 +20575,8 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 			}).bind(this));
 		}
 
-		if(!this.isAttachingAllowed && !this.isAddingAllowed &&
-				(this.containmentParentNode instanceof ORYX.Core.Edge)) {
+		if (!this.isAttachingAllowed && !this.isAddingAllowed &&
+			(this.containmentParentNode instanceof ORYX.Core.Edge)) {
 			options.noEdges = true;
 			options.underlyingNodes.reverse();
 			this.checkRules(options);
@@ -19991,28 +20587,31 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 	 * Redraw the selected Shapes.
 	 *
 	 */
-	refreshSelectedShapes: function() {
+	refreshSelectedShapes: function () {
 		// If the selection bounds not initialized, return
-		if(!this.dragBounds) {return}
+		if (!this.dragBounds) {
+			return
+		}
 
 		// Calculate the offset between the bounds and the old bounds
 		var upL = this.dragBounds.upperLeft();
 		var oldUpL = this.oldDragBounds.upperLeft();
 		var offset = {
 			x: upL.x - oldUpL.x,
-			y: upL.y - oldUpL.y };
+			y: upL.y - oldUpL.y
+		};
 
 		// Instanciate the dragCommand
 		var commands = [new ORYX.Core.Command.Move(this.toMoveShapes, offset, this.containmentParentNode, this.currentShapes, this)];
 		// If the undocked edges command is setted, add this command
-		if( this._undockedEdgesCommand instanceof ORYX.Core.Command ){
-			commands.unshift( this._undockedEdgesCommand );
+		if (this._undockedEdgesCommand instanceof ORYX.Core.Command) {
+			commands.unshift(this._undockedEdgesCommand);
 		}
 		// Execute the commands
-		this.facade.executeCommands( commands );
+		this.facade.executeCommands(commands);
 
 		// copy the bounds to the old bounds
-		if( this.dragBounds )
+		if (this.dragBounds)
 			this.oldDragBounds = this.dragBounds.clone();
 
 	},
@@ -20021,9 +20620,11 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 	 * Callback for Resize
 	 *
 	 */
-	onResize: function(bounds) {
+	onResize: function (bounds) {
 		// If the selection bounds not initialized, return
-		if(!this.dragBounds) {return}
+		if (!this.dragBounds) {
+			return
+		}
 
 		this.dragBounds = bounds;
 		this.isResizing = true;
@@ -20032,53 +20633,55 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 		this.resizeRectangle(this.dragBounds);
 	},
 
-	onResizeStart: function() {
-		this.facade.raiseEvent({type:ORYX.CONFIG.EVENT_RESIZE_START});
+	onResizeStart: function () {
+		this.facade.raiseEvent({type: ORYX.CONFIG.EVENT_RESIZE_START});
 	},
 
-	onResizeEnd: function() {
+	onResizeEnd: function () {
 
-		if (!(this.currentShapes instanceof Array)||this.currentShapes.length<=0) {
+		if (!(this.currentShapes instanceof Array) || this.currentShapes.length <= 0) {
 			return;
 		}
 
 		// If Resizing finished, the Shapes will be resize
-		if(this.isResizing) {
+		if (this.isResizing) {
 
 			var commandClass = ORYX.Core.Command.extend({
-				construct: function(shape, newBounds, plugin){
+				construct: function (shape, newBounds, plugin) {
 					this.shape = shape;
 					this.oldBounds = shape.bounds.clone();
 					this.newBounds = newBounds;
 					this.plugin = plugin;
 				},
-				execute: function(){
+				execute: function () {
 					this.shape.bounds.set(this.newBounds.a, this.newBounds.b);
 					this.update(this.getOffset(this.oldBounds, this.newBounds));
 
 				},
-				rollback: function(){
+				rollback: function () {
 					this.shape.bounds.set(this.oldBounds.a, this.oldBounds.b);
 					this.update(this.getOffset(this.newBounds, this.oldBounds))
 				},
 
-				getOffset:function(b1, b2){
+				getOffset: function (b1, b2) {
 					return {
 						x: b2.a.x - b1.a.x,
 						y: b2.a.y - b1.a.y,
-						xs: b2.width()/b1.width(),
-						ys: b2.height()/b1.height()
+						xs: b2.width() / b1.width(),
+						ys: b2.height() / b1.height()
 					}
 				},
-				update:function(offset){
-					this.shape.getLabels().each(function(label) {
+				update: function (offset) {
+					this.shape.getLabels().each(function (label) {
 						label.changed();
 					});
 
 					var allEdges = [].concat(this.shape.getIncomingShapes())
 						.concat(this.shape.getOutgoingShapes())
 						// Remove all edges which are included in the selection from the list
-						.findAll(function(r){ return r instanceof ORYX.Core.Edge }.bind(this))
+						.findAll(function (r) {
+							return r instanceof ORYX.Core.Edge
+						}.bind(this))
 
 					this.plugin.layoutEdges(this.shape, allEdges, offset);
 
@@ -20091,7 +20694,7 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 			var bounds = this.dragBounds.clone();
 			var shape = this.currentShapes[0];
 
-			if(shape.parent) {
+			if (shape.parent) {
 				var parentPosition = shape.parent.absoluteXY();
 				bounds.moveBy(-parentPosition.x, -parentPosition.y);
 			}
@@ -20102,7 +20705,7 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 
 			this.isResizing = false;
 
-			this.facade.raiseEvent({type:ORYX.CONFIG.EVENT_RESIZE_END});
+			this.facade.raiseEvent({type: ORYX.CONFIG.EVENT_RESIZE_END});
 		}
 	},
 
@@ -20111,19 +20714,25 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 	 * Prepare the Dragging
 	 *
 	 */
-	beforeDrag: function(){
+	beforeDrag: function () {
 
 		var undockEdgeCommand = ORYX.Core.Command.extend({
-			construct: function(moveShapes){
-				this.dockers = moveShapes.collect(function(shape){ return shape instanceof ORYX.Core.Controls.Docker ? {docker:shape, dockedShape:shape.getDockedShape(), refPoint:shape.referencePoint} : undefined }).compact();
+			construct: function (moveShapes) {
+				this.dockers = moveShapes.collect(function (shape) {
+					return shape instanceof ORYX.Core.Controls.Docker ? {
+						docker: shape,
+						dockedShape: shape.getDockedShape(),
+						refPoint: shape.referencePoint
+					} : undefined
+				}).compact();
 			},
-			execute: function(){
-				this.dockers.each(function(el){
+			execute: function () {
+				this.dockers.each(function (el) {
 					el.docker.setDockedShape(undefined);
 				})
 			},
-			rollback: function(){
-				this.dockers.each(function(el){
+			rollback: function () {
+				this.dockers.each(function (el) {
 					el.docker.setDockedShape(el.dockedShape);
 					el.docker.setReferencePoint(el.refPoint);
 					//el.docker.update();
@@ -20131,40 +20740,40 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 			}
 		});
 
-		this._undockedEdgesCommand = new undockEdgeCommand( this.toMoveShapes );
+		this._undockedEdgesCommand = new undockEdgeCommand(this.toMoveShapes);
 		this._undockedEdgesCommand.execute();
 
 	},
 
-	hideAllLabels: function(shape) {
+	hideAllLabels: function (shape) {
 
-			// Hide all labels from the shape
-			shape.getLabels().each(function(label) {
-				label.hide();
-			});
-			// Hide all labels from docked shapes
-			shape.getAllDockedShapes().each(function(dockedShape) {
-				var labels = dockedShape.getLabels();
-				if(labels.length > 0) {
-					labels.each(function(label) {
-						label.hide();
-					});
-				}
-			});
+		// Hide all labels from the shape
+		shape.getLabels().each(function (label) {
+			label.hide();
+		});
+		// Hide all labels from docked shapes
+		shape.getAllDockedShapes().each(function (dockedShape) {
+			var labels = dockedShape.getLabels();
+			if (labels.length > 0) {
+				labels.each(function (label) {
+					label.hide();
+				});
+			}
+		});
 
-			// Do this recursive for all child shapes
-			// EXP-NICO use getShapes
-			shape.getChildren().each((function(value) {
-				if(value instanceof ORYX.Core.Shape)
-					this.hideAllLabels(value);
-			}).bind(this));
+		// Do this recursive for all child shapes
+		// EXP-NICO use getShapes
+		shape.getChildren().each((function (value) {
+			if (value instanceof ORYX.Core.Shape)
+				this.hideAllLabels(value);
+		}).bind(this));
 	},
 
 	/**
 	 * Finished the Dragging
 	 *
 	 */
-	afterDrag: function(){
+	afterDrag: function () {
 
 	},
 
@@ -20172,34 +20781,34 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 	 * Show all Labels at these shape
 	 *
 	 */
-	showAllLabels: function(shape) {
-
-			// Show the label of these shape
-			//shape.getLabels().each(function(label) {
-			for(var i=0; i<shape.length ;i++){
-				var label = shape[i];
-				label.show();
-			}//);
-			// Show all labels at docked shapes
-			//shape.getAllDockedShapes().each(function(dockedShape) {
-			var allDockedShapes = shape.getAllDockedShapes()
-			for(var i=0; i<allDockedShapes.length ;i++){
-				var dockedShape = allDockedShapes[i];
-				var labels = dockedShape.getLabels();
-				if(labels.length > 0) {
-					labels.each(function(label) {
-						label.show();
-					});
-				}
-			}//);
+	showAllLabels: function (shape) {
 
-			// Do this recursive
-			//shape.children.each((function(value) {
-			for(var i=0; i<shape.children.length ;i++){
-				var value = shape.children[i];
-				if(value instanceof ORYX.Core.Shape)
-					this.showAllLabels(value);
-			}//).bind(this));
+		// Show the label of these shape
+		//shape.getLabels().each(function(label) {
+		for (var i = 0; i < shape.length; i++) {
+			var label = shape[i];
+			label.show();
+		}//);
+		// Show all labels at docked shapes
+		//shape.getAllDockedShapes().each(function(dockedShape) {
+		var allDockedShapes = shape.getAllDockedShapes()
+		for (var i = 0; i < allDockedShapes.length; i++) {
+			var dockedShape = allDockedShapes[i];
+			var labels = dockedShape.getLabels();
+			if (labels.length > 0) {
+				labels.each(function (label) {
+					label.show();
+				});
+			}
+		}//);
+
+		// Do this recursive
+		//shape.children.each((function(value) {
+		for (var i = 0; i < shape.children.length; i++) {
+			var value = shape.children[i];
+			if (value instanceof ORYX.Core.Shape)
+				this.showAllLabels(value);
+		}//).bind(this));
 	},
 
 	/**
@@ -20217,7 +20826,7 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 	 * On the Selection-Changed
 	 *
 	 */
-	onSelectionChanged: function(event) {
+	onSelectionChanged: function (event) {
 		var elements = event.elements;
 
 		// Reset the drag-variables
@@ -20227,7 +20836,7 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 		this.resizerNW.hide();
 
 		// If there is no elements
-		if(!elements || elements.length == 0) {
+		if (!elements || elements.length == 0) {
 			// Hide all things and reset all variables
 			this.selectedRect.hide();
 			this.currentShapes = [];
@@ -20243,11 +20852,15 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 			var topLevelElements = this.facade.getCanvas().getShapesWithSharedParent(elements);
 			this.toMoveShapes = topLevelElements;
 
-			this.toMoveShapes = this.toMoveShapes.findAll( function(shape) { return shape instanceof ORYX.Core.Node &&
-																			(shape.dockers.length === 0 || !elements.member(shape.dockers.first().getDockedShape()))});
+			this.toMoveShapes = this.toMoveShapes.findAll(function (shape) {
+				return shape instanceof ORYX.Core.Node &&
+					(shape.dockers.length === 0 || !elements.member(shape.dockers.first().getDockedShape()))
+			});
 
-			elements.each((function(shape){
-				if(!(shape instanceof ORYX.Core.Edge)) {return;}
+			elements.each((function (shape) {
+				if (!(shape instanceof ORYX.Core.Edge)) {
+					return;
+				}
 
 				var dks = shape.getDockers();
 
@@ -20261,39 +20874,40 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 //					this.toMoveShapes.push(dks.first())
 //				}
 				/* Enable movement of undocked edges */
-				if(!hasF && !hasL) {
+				if (!hasF && !hasL) {
 					var isUndocked = !dks.first().getDockedShape() && !dks.last().getDockedShape();
-					if(isUndocked) {
+					if (isUndocked) {
 						this.toMoveShapes = this.toMoveShapes.concat(dks);
 					}
 				}
 
-				if( shape.dockers.length > 2 && hasF && hasL){
-					this.toMoveShapes = this.toMoveShapes.concat(dks.findAll(function(el,index){ return index > 0 && index < dks.length-1}));
+				if (shape.dockers.length > 2 && hasF && hasL) {
+					this.toMoveShapes = this.toMoveShapes.concat(dks.findAll(function (el, index) {
+						return index > 0 && index < dks.length - 1
+					}));
 				}
 
 			}).bind(this));
 
 			// Calculate the new area-bounds of the selection
 			var newBounds = undefined;
-			this.toMoveShapes.each(function(value) {
+			this.toMoveShapes.each(function (value) {
 				var shape = value;
-				if(value instanceof ORYX.Core.Controls.Docker) {
+				if (value instanceof ORYX.Core.Controls.Docker) {
 					/* Get the Shape */
 					shape = value.parent;
 				}
 
-				if(!newBounds){
+				if (!newBounds) {
 					newBounds = shape.absoluteBounds();
-				}
-				else {
+				} else {
 					newBounds.include(shape.absoluteBounds());
 				}
 			}.bind(this));
 
-			if(!newBounds){
-				elements.each(function(value){
-					if(!newBounds) {
+			if (!newBounds) {
+				elements.each(function (value) {
+					if (!newBounds) {
 						newBounds = value.absoluteBounds();
 					} else {
 						newBounds.include(value.absoluteBounds());
@@ -20310,7 +20924,7 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 			this.selectedRect.show();
 
 			// Show the resize button, if there is only one element and this is resizeable
-			if(elements.length == 1 && elements[0].isResizable) {
+			if (elements.length == 1 && elements[0].isResizable) {
 				var aspectRatio = elements[0].getStencil().fixedAspectRatio() ? elements[0].bounds.width() / elements[0].bounds.height() : undefined;
 				this.resizerSE.setBounds(this.dragBounds, elements[0].minimumSize, elements[0].maximumSize, aspectRatio);
 				this.resizerSE.show();
@@ -20322,7 +20936,7 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 			}
 
 			// If Snap-To-Grid is enabled, the Snap-Point will be calculate
-			if(ORYX.CONFIG.GRID_ENABLED) {
+			if (ORYX.CONFIG.GRID_ENABLED) {
 
 				// Reset all points
 				this.distPoints = [];
@@ -20330,13 +20944,13 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 				if (this.distPointTimeout)
 					window.clearTimeout(this.distPointTimeout)
 
-				this.distPointTimeout = window.setTimeout(function(){
+				this.distPointTimeout = window.setTimeout(function () {
 					// Get all the shapes, there will consider at snapping
 					// Consider only those elements who shares the same parent element
-					var distShapes = this.facade.getCanvas().getChildShapes(true).findAll(function(value){
+					var distShapes = this.facade.getCanvas().getChildShapes(true).findAll(function (value) {
 						var parentShape = value.parent;
-						while(parentShape){
-							if(elements.member(parentShape)) return false;
+						while (parentShape) {
+							if (elements.member(parentShape)) return false;
 							parentShape = parentShape.parent
 						}
 						return true;
@@ -20348,8 +20962,8 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 					//});
 
 					// For all these shapes
-					distShapes.each((function(value) {
-						if(!(value instanceof ORYX.Core.Edge)) {
+					distShapes.each((function (value) {
+						if (!(value instanceof ORYX.Core.Edge)) {
 							var ul = value.absoluteXY();
 							var width = value.bounds.width();
 							var height = value.bounds.height();
@@ -20383,7 +20997,7 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 	 * Adjust an Point to the Snap Points
 	 *
 	 */
-	snapToGrid: function(position) {
+	snapToGrid: function (position) {
 
 		// Get the current Bounds
 		var bounds = this.dragBounds;
@@ -20396,19 +21010,19 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 
 		var scale = this.vLine ? this.vLine.getScale() : 1;
 
-		var ul = { x: (position.x/scale), y: (position.y/scale)};
-		var c = { x: (position.x/scale) + (bounds.width()/2), y: (position.y/scale) + (bounds.height()/2)};
-		var lr = { x: (position.x/scale) + (bounds.width()), y: (position.y/scale) + (bounds.height())};
+		var ul = {x: (position.x / scale), y: (position.y / scale)};
+		var c = {x: (position.x / scale) + (bounds.width() / 2), y: (position.y / scale) + (bounds.height() / 2)};
+		var lr = {x: (position.x / scale) + (bounds.width()), y: (position.y / scale) + (bounds.height())};
 
 		var offsetX, offsetY;
 		var gridX, gridY;
 
 		// For each distant point
-		this.distPoints.each(function(value) {
+		this.distPoints.each(function (value) {
 
 			var x, y, gx, gy;
-			if (Math.abs(value.c.x-c.x) < cThres){
-				x = value.c.x-c.x;
+			if (Math.abs(value.c.x - c.x) < cThres) {
+				x = value.c.x - c.x;
 				gx = value.c.x;
 			}/* else if (Math.abs(value.ul.x-ul.x) < ulThres){
 				x = value.ul.x-ul.x;
@@ -20419,8 +21033,8 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 			} */
 
 
-			if (Math.abs(value.c.y-c.y) < cThres){
-				y = value.c.y-c.y;
+			if (Math.abs(value.c.y - c.y) < cThres) {
+				y = value.c.y - c.y;
 				gy = value.c.y;
 			}/* else if (Math.abs(value.ul.y-ul.y) < ulThres){
 				y = value.ul.y-ul.y;
@@ -20447,10 +21061,10 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 		if (offsetX !== undefined) {
 			ul.x += offsetX;
 			ul.x *= scale;
-			if (this.vLine&&gridX)
+			if (this.vLine && gridX)
 				this.vLine.update(gridX);
 		} else {
-			ul.x = (position.x - (position.x % (ORYX.CONFIG.GRID_DISTANCE/2)));
+			ul.x = (position.x - (position.x % (ORYX.CONFIG.GRID_DISTANCE / 2)));
 			if (this.vLine)
 				this.vLine.hide()
 		}
@@ -20458,10 +21072,10 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 		if (offsetY !== undefined) {
 			ul.y += offsetY;
 			ul.y *= scale;
-			if (this.hLine&&gridY)
+			if (this.hLine && gridY)
 				this.hLine.update(gridY);
 		} else {
-			ul.y = (position.y - (position.y % (ORYX.CONFIG.GRID_DISTANCE/2)));
+			ul.y = (position.y - (position.y % (ORYX.CONFIG.GRID_DISTANCE / 2)));
 			if (this.hLine)
 				this.hLine.hide();
 		}
@@ -20469,7 +21083,7 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 		return ul;
 	},
 
-	showGridLine: function(){
+	showGridLine: function () {
 
 	},
 
@@ -20478,7 +21092,7 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 	 * Redraw of the Rectangle of the SelectedArea
 	 * @param {Object} bounds
 	 */
-	resizeRectangle: function(bounds) {
+	resizeRectangle: function (bounds) {
 		// Resize the Rectangle
 		this.selectedRect.resize(bounds);
 	}
@@ -20488,49 +21102,50 @@ ORYX.Plugins.DragDropResize = ORYX.Plugins.AbstractPlugin.extend({
 
 ORYX.Plugins.SelectedRect = Clazz.extend({
 
-	construct: function(parentId) {
+	construct: function (parentId) {
 
 		this.parentId = parentId;
 
 		this.node = ORYX.Editor.graft("http://www.w3.org/2000/svg", $(parentId),
-					['g']);
+			['g']);
 
 		this.dashedArea = ORYX.Editor.graft("http://www.w3.org/2000/svg", this.node,
-			['rect', {x: 0, y: 0,
+			['rect', {
+				x: 0, y: 0,
 				'stroke-width': 1, stroke: '#777777', fill: 'none',
 				'stroke-dasharray': '2,2',
-				'pointer-events': 'none'}]);
+				'pointer-events': 'none'
+			}]);
 
 		this.hide();
 
 	},
 
-	hide: function() {
+	hide: function () {
 		this.node.setAttributeNS(null, 'display', 'none');
 	},
 
-	show: function() {
+	show: function () {
 		this.node.setAttributeNS(null, 'display', '');
 	},
 
-	resize: function(bounds) {
+	resize: function (bounds) {
 		var upL = bounds.upperLeft();
 
 		var padding = ORYX.CONFIG.SELECTED_AREA_PADDING;
 
-		this.dashedArea.setAttributeNS(null, 'width', bounds.width() + 2*padding);
-		this.dashedArea.setAttributeNS(null, 'height', bounds.height() + 2*padding);
-		this.node.setAttributeNS(null, 'transform', "translate("+ (upL.x - padding) +", "+ (upL.y - padding) +")");
+		this.dashedArea.setAttributeNS(null, 'width', bounds.width() + 2 * padding);
+		this.dashedArea.setAttributeNS(null, 'height', bounds.height() + 2 * padding);
+		this.node.setAttributeNS(null, 'transform', "translate(" + (upL.x - padding) + ", " + (upL.y - padding) + ")");
 	}
 
 
 });
 
 
-
 ORYX.Plugins.GridLine = Clazz.extend({
 
-	construct: function(parentId, direction) {
+	construct: function (parentId, direction) {
 
 		if (ORYX.Plugins.GridLine.DIR_HORIZONTAL !== direction && ORYX.Plugins.GridLine.DIR_VERTICAL !== direction) {
 			direction = ORYX.Plugins.GridLine.DIR_HORIZONTAL
@@ -20540,44 +21155,45 @@ ORYX.Plugins.GridLine = Clazz.extend({
 		this.parent = $(parentId);
 		this.direction = direction;
 		this.node = ORYX.Editor.graft("http://www.w3.org/2000/svg", this.parent,
-					['g']);
+			['g']);
 
 		this.line = ORYX.Editor.graft("http://www.w3.org/2000/svg", this.node,
 			['path', {
 				'stroke-width': 1, stroke: 'silver', fill: 'none',
 				'stroke-dasharray': '5,5',
-				'pointer-events': 'none'}]);
+				'pointer-events': 'none'
+			}]);
 
 		this.hide();
 
 	},
 
-	hide: function() {
+	hide: function () {
 		this.node.setAttributeNS(null, 'display', 'none');
 	},
 
-	show: function() {
+	show: function () {
 		this.node.setAttributeNS(null, 'display', '');
 	},
 
-	getScale: function(){
+	getScale: function () {
 		try {
 			return this.parent.parentNode.transform.baseVal.getItem(0).matrix.a;
-		} catch(e) {
+		} catch (e) {
 			return 1;
 		}
 	},
 
-	update: function(pos) {
+	update: function (pos) {
 
 		if (this.direction === ORYX.Plugins.GridLine.DIR_HORIZONTAL) {
 			var y = pos instanceof Object ? pos.y : pos;
-			var cWidth = this.parent.parentNode.parentNode.width.baseVal.value/this.getScale();
-			this.line.setAttributeNS(null, 'd', 'M 0 '+y+ ' L '+cWidth+' '+y);
+			var cWidth = this.parent.parentNode.parentNode.width.baseVal.value / this.getScale();
+			this.line.setAttributeNS(null, 'd', 'M 0 ' + y + ' L ' + cWidth + ' ' + y);
 		} else {
 			var x = pos instanceof Object ? pos.x : pos;
-			var cHeight = this.parent.parentNode.parentNode.height.baseVal.value/this.getScale();
-			this.line.setAttributeNS(null, 'd', 'M'+x+ ' 0 L '+x+' '+cHeight);
+			var cHeight = this.parent.parentNode.parentNode.height.baseVal.value / this.getScale();
+			this.line.setAttributeNS(null, 'd', 'M' + x + ' 0 L ' + x + ' ' + cHeight);
 		}
 
 		this.show();
@@ -20591,18 +21207,18 @@ ORYX.Plugins.GridLine.DIR_VERTICAL = "ver";
 
 ORYX.Plugins.Resizer = Clazz.extend({
 
-	construct: function(parentId, orientation, facade) {
+	construct: function (parentId, orientation, facade) {
 
-		this.parentId 		= parentId;
-		this.orientation	= orientation;
-		this.facade			= facade;
+		this.parentId = parentId;
+		this.orientation = orientation;
+		this.facade = facade;
 
 		this.node = ORYX.Editor.graft("http://www.w3.org/1999/xhtml", $('canvasSection'),
-			['div', {'class': 'resizer_'+ this.orientation, style:'left:0px; top:0px;position:absolute;'}]);
+			['div', {'class': 'resizer_' + this.orientation, style: 'left:0px; top:0px;position:absolute;'}]);
 
 		this.node.addEventListener(ORYX.CONFIG.EVENT_MOUSEDOWN, this.handleMouseDown.bind(this), true);
-		document.documentElement.addEventListener(ORYX.CONFIG.EVENT_MOUSEUP, 	this.handleMouseUp.bind(this), 		true);
-		document.documentElement.addEventListener(ORYX.CONFIG.EVENT_MOUSEMOVE, 	this.handleMouseMove.bind(this), 	false);
+		document.documentElement.addEventListener(ORYX.CONFIG.EVENT_MOUSEUP, this.handleMouseUp.bind(this), true);
+		document.documentElement.addEventListener(ORYX.CONFIG.EVENT_MOUSEMOVE, this.handleMouseMove.bind(this), false);
 
 		this.dragEnable = false;
 		this.offSetPosition = {x: 0, y: 0};
@@ -20615,9 +21231,9 @@ ORYX.Plugins.Resizer = Clazz.extend({
 
 		this.aspectRatio = undefined;
 
-		this.resizeCallbacks 		= [];
-		this.resizeStartCallbacks 	= [];
-		this.resizeEndCallbacks 	= [];
+		this.resizeCallbacks = [];
+		this.resizeStartCallbacks = [];
+		this.resizeEndCallbacks = [];
 		this.hide();
 
 		// Calculate the Offset
@@ -20625,34 +21241,37 @@ ORYX.Plugins.Resizer = Clazz.extend({
 
 	},
 
-	handleMouseDown: function(event) {
+	handleMouseDown: function (event) {
 		this.dragEnable = true;
 
-		this.offsetScroll	= {x:this.scrollNode.scrollLeft,y:this.scrollNode.scrollTop};
+		this.offsetScroll = {x: this.scrollNode.scrollLeft, y: this.scrollNode.scrollTop};
 
-		this.offSetPosition =  {
+		this.offSetPosition = {
 			x: Event.pointerX(event) - this.position.x,
-			y: Event.pointerY(event) - this.position.y};
+			y: Event.pointerY(event) - this.position.y
+		};
 
-		this.resizeStartCallbacks.each((function(value) {
+		this.resizeStartCallbacks.each((function (value) {
 			value(this.bounds);
 		}).bind(this));
 
 	},
 
-	handleMouseUp: function(event) {
+	handleMouseUp: function (event) {
 		this.dragEnable = false;
 		this.containmentParentNode = null;
-		this.resizeEndCallbacks.each((function(value) {
+		this.resizeEndCallbacks.each((function (value) {
 			value(this.bounds);
 		}).bind(this));
 
 	},
 
-	handleMouseMove: function(event) {
-		if(!this.dragEnable) { return }
+	handleMouseMove: function (event) {
+		if (!this.dragEnable) {
+			return
+		}
 
-		if(event.shiftKey || event.ctrlKey) {
+		if (event.shiftKey || event.ctrlKey) {
 			this.aspectRatio = this.bounds.width() / this.bounds.height();
 		} else {
 			this.aspectRatio = undefined;
@@ -20660,79 +21279,80 @@ ORYX.Plugins.Resizer = Clazz.extend({
 
 		var position = {
 			x: Event.pointerX(event) - this.offSetPosition.x,
-			y: Event.pointerY(event) - this.offSetPosition.y};
+			y: Event.pointerY(event) - this.offSetPosition.y
+		};
 
 
-		position.x 	-= this.offsetScroll.x - this.scrollNode.scrollLeft;
-		position.y 	-= this.offsetScroll.y - this.scrollNode.scrollTop;
+		position.x -= this.offsetScroll.x - this.scrollNode.scrollLeft;
+		position.y -= this.offsetScroll.y - this.scrollNode.scrollTop;
 
-		position.x  = Math.min( position.x, this.facade.getCanvas().bounds.width());
-		position.y  = Math.min( position.y, this.facade.getCanvas().bounds.height());
+		position.x = Math.min(position.x, this.facade.getCanvas().bounds.width());
+		position.y = Math.min(position.y, this.facade.getCanvas().bounds.height());
 
 		var offset = {
 			x: position.x - this.position.x,
 			y: position.y - this.position.y
 		};
 
-		if(this.aspectRatio) {
+		if (this.aspectRatio) {
 			// fixed aspect ratio
-			newAspectRatio = (this.bounds.width()+offset.x) / (this.bounds.height()+offset.y);
-			if(newAspectRatio>this.aspectRatio) {
-				offset.x = this.aspectRatio * (this.bounds.height()+offset.y) - this.bounds.width();
-			} else if(newAspectRatio<this.aspectRatio) {
-				offset.y = (this.bounds.width()+offset.x) / this.aspectRatio - this.bounds.height();
+			newAspectRatio = (this.bounds.width() + offset.x) / (this.bounds.height() + offset.y);
+			if (newAspectRatio > this.aspectRatio) {
+				offset.x = this.aspectRatio * (this.bounds.height() + offset.y) - this.bounds.width();
+			} else if (newAspectRatio < this.aspectRatio) {
+				offset.y = (this.bounds.width() + offset.x) / this.aspectRatio - this.bounds.height();
 			}
 		}
 
 		// respect minimum and maximum sizes of stencil
-		if(this.orientation==="northwest") {
+		if (this.orientation === "northwest") {
 
-			if(this.bounds.width()-offset.x > this.maxSize.width) {
+			if (this.bounds.width() - offset.x > this.maxSize.width) {
 				offset.x = -(this.maxSize.width - this.bounds.width());
-				if(this.aspectRatio)
+				if (this.aspectRatio)
 					offset.y = this.aspectRatio * offset.x;
 			}
-			if(this.bounds.width()-offset.x < this.minSize.width) {
+			if (this.bounds.width() - offset.x < this.minSize.width) {
 				offset.x = -(this.minSize.width - this.bounds.width());
-				if(this.aspectRatio)
+				if (this.aspectRatio)
 					offset.y = this.aspectRatio * offset.x;
 			}
-			if(this.bounds.height()-offset.y > this.maxSize.height) {
+			if (this.bounds.height() - offset.y > this.maxSize.height) {
 				offset.y = -(this.maxSize.height - this.bounds.height());
-				if(this.aspectRatio)
+				if (this.aspectRatio)
 					offset.x = offset.y / this.aspectRatio;
 			}
-			if(this.bounds.height()-offset.y < this.minSize.height) {
+			if (this.bounds.height() - offset.y < this.minSize.height) {
 				offset.y = -(this.minSize.height - this.bounds.height());
-				if(this.aspectRatio)
+				if (this.aspectRatio)
 					offset.x = offset.y / this.aspectRatio;
 			}
 
 		} else { // defaults to southeast
-			if(this.bounds.width()+offset.x > this.maxSize.width) {
+			if (this.bounds.width() + offset.x > this.maxSize.width) {
 				offset.x = this.maxSize.width - this.bounds.width();
-				if(this.aspectRatio)
+				if (this.aspectRatio)
 					offset.y = this.aspectRatio * offset.x;
 			}
-			if(this.bounds.width()+offset.x < this.minSize.width) {
+			if (this.bounds.width() + offset.x < this.minSize.width) {
 				offset.x = this.minSize.width - this.bounds.width();
-				if(this.aspectRatio)
+				if (this.aspectRatio)
 					offset.y = this.aspectRatio * offset.x;
 			}
-			if(this.bounds.height()+offset.y > this.maxSize.height) {
+			if (this.bounds.height() + offset.y > this.maxSize.height) {
 				offset.y = this.maxSize.height - this.bounds.height();
-				if(this.aspectRatio)
+				if (this.aspectRatio)
 					offset.x = offset.y / this.aspectRatio;
 			}
-			if(this.bounds.height()+offset.y < this.minSize.height) {
+			if (this.bounds.height() + offset.y < this.minSize.height) {
 				offset.y = this.minSize.height - this.bounds.height();
-				if(this.aspectRatio)
+				if (this.aspectRatio)
 					offset.x = offset.y / this.aspectRatio;
 			}
 		}
 
-		if(this.orientation==="northwest") {
-			this.bounds.extend({x:-offset.x, y:-offset.y});
+		if (this.orientation === "northwest") {
+			this.bounds.extend({x: -offset.x, y: -offset.y});
 			this.bounds.moveBy(offset);
 		} else { // defaults to southeast
 			this.bounds.extend(offset);
@@ -20740,7 +21360,7 @@ ORYX.Plugins.Resizer = Clazz.extend({
 
 		this.update();
 
-		this.resizeCallbacks.each((function(value) {
+		this.resizeCallbacks.each((function (value) {
 			value(this.bounds);
 		}).bind(this));
 
@@ -20748,58 +21368,58 @@ ORYX.Plugins.Resizer = Clazz.extend({
 
 	},
 
-	registerOnResizeStart: function(callback) {
-		if(!this.resizeStartCallbacks.member(callback)) {
+	registerOnResizeStart: function (callback) {
+		if (!this.resizeStartCallbacks.member(callback)) {
 			this.resizeStartCallbacks.push(callback);
 		}
 	},
 
-	unregisterOnResizeStart: function(callback) {
-		if(this.resizeStartCallbacks.member(callback)) {
+	unregisterOnResizeStart: function (callback) {
+		if (this.resizeStartCallbacks.member(callback)) {
 			this.resizeStartCallbacks = this.resizeStartCallbacks.without(callback);
 		}
 	},
 
-	registerOnResizeEnd: function(callback) {
-		if(!this.resizeEndCallbacks.member(callback)) {
+	registerOnResizeEnd: function (callback) {
+		if (!this.resizeEndCallbacks.member(callback)) {
 			this.resizeEndCallbacks.push(callback);
 		}
 	},
 
-	unregisterOnResizeEnd: function(callback) {
-		if(this.resizeEndCallbacks.member(callback)) {
+	unregisterOnResizeEnd: function (callback) {
+		if (this.resizeEndCallbacks.member(callback)) {
 			this.resizeEndCallbacks = this.resizeEndCallbacks.without(callback);
 		}
 	},
 
-	registerOnResize: function(callback) {
-		if(!this.resizeCallbacks.member(callback)) {
+	registerOnResize: function (callback) {
+		if (!this.resizeCallbacks.member(callback)) {
 			this.resizeCallbacks.push(callback);
 		}
 	},
 
-	unregisterOnResize: function(callback) {
-		if(this.resizeCallbacks.member(callback)) {
+	unregisterOnResize: function (callback) {
+		if (this.resizeCallbacks.member(callback)) {
 			this.resizeCallbacks = this.resizeCallbacks.without(callback);
 		}
 	},
 
-	hide: function() {
+	hide: function () {
 		this.node.style.display = "none";
 	},
 
-	show: function() {
-		if(this.bounds)
+	show: function () {
+		if (this.bounds)
 			this.node.style.display = "";
 	},
 
-	setBounds: function(bounds, min, max, aspectRatio) {
+	setBounds: function (bounds, min, max, aspectRatio) {
 		this.bounds = bounds;
 
-		if(!min)
+		if (!min)
 			min = {width: ORYX.CONFIG.MINIMUM_SIZE, height: ORYX.CONFIG.MINIMUM_SIZE};
 
-		if(!max)
+		if (!max)
 			max = {width: ORYX.CONFIG.MAXIMUM_SIZE, height: ORYX.CONFIG.MAXIMUM_SIZE};
 
 		this.minSize = min;
@@ -20810,15 +21430,29 @@ ORYX.Plugins.Resizer = Clazz.extend({
 		this.update();
 	},
 
-	update: function() {
-		if(!this.bounds) { return; }
+	update: function () {
+		if (!this.bounds) {
+			return;
+		}
 
 		var upL = this.bounds.upperLeft();
 
-		if(this.bounds.width() < this.minSize.width)	{ this.bounds.set(upL.x, upL.y, upL.x + this.minSize.width, upL.y + this.bounds.height());};
-		if(this.bounds.height() < this.minSize.height)	{ this.bounds.set(upL.x, upL.y, upL.x + this.bounds.width(), upL.y + this.minSize.height);};
-		if(this.bounds.width() > this.maxSize.width)	{ this.bounds.set(upL.x, upL.y, upL.x + this.maxSize.width, upL.y + this.bounds.height());};
-		if(this.bounds.height() > this.maxSize.height)	{ this.bounds.set(upL.x, upL.y, upL.x + this.bounds.width(), upL.y + this.maxSize.height);};
+		if (this.bounds.width() < this.minSize.width) {
+			this.bounds.set(upL.x, upL.y, upL.x + this.minSize.width, upL.y + this.bounds.height());
+		}
+		;
+		if (this.bounds.height() < this.minSize.height) {
+			this.bounds.set(upL.x, upL.y, upL.x + this.bounds.width(), upL.y + this.minSize.height);
+		}
+		;
+		if (this.bounds.width() > this.maxSize.width) {
+			this.bounds.set(upL.x, upL.y, upL.x + this.maxSize.width, upL.y + this.bounds.height());
+		}
+		;
+		if (this.bounds.height() > this.maxSize.height) {
+			this.bounds.set(upL.x, upL.y, upL.x + this.bounds.width(), upL.y + this.maxSize.height);
+		}
+		;
 
 		var a = this.canvasNode.getScreenCTM();
 
@@ -20826,41 +21460,41 @@ ORYX.Plugins.Resizer = Clazz.extend({
 		upL.y *= a.d;
 
 		var additionalIEZoom = 1;
-        if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
-            var ua = navigator.userAgent;
-            if (ua.indexOf('MSIE') >= 0) {
-                //IE 10 and below
-                var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
-                if (zoom !== 100) {
-                    additionalIEZoom = zoom / 100
-                }
-            }
-        }
+		if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
+			var ua = navigator.userAgent;
+			if (ua.indexOf('MSIE') >= 0) {
+				//IE 10 and below
+				var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
+				if (zoom !== 100) {
+					additionalIEZoom = zoom / 100
+				}
+			}
+		}
 
-        if (additionalIEZoom === 1) {
-             upL.y = upL.y - jQuery("#canvasSection").offset().top + a.f;
-             upL.x = upL.x - jQuery("#canvasSection").offset().left + a.e;
-
-        } else {
-             var canvasOffsetLeft = jQuery("#canvasSection").offset().left;
-             var canvasScrollLeft = jQuery("#canvasSection").scrollLeft();
-             var canvasScrollTop = jQuery("#canvasSection").scrollTop();
-
-             var offset = a.e - (canvasOffsetLeft * additionalIEZoom);
-             var additionaloffset = 0;
-             if (offset > 10) {
-                 additionaloffset = (offset / additionalIEZoom) - offset;
-             }
-             upL.y = upL.y - (jQuery("#canvasSection").offset().top * additionalIEZoom) + ((canvasScrollTop * additionalIEZoom) - canvasScrollTop) + a.f;
-             upL.x = upL.x - (canvasOffsetLeft * additionalIEZoom) + additionaloffset + ((canvasScrollLeft * additionalIEZoom) - canvasScrollLeft) + a.e;
-        }
+		if (additionalIEZoom === 1) {
+			upL.y = upL.y - jQuery("#canvasSection").offset().top + a.f;
+			upL.x = upL.x - jQuery("#canvasSection").offset().left + a.e;
+
+		} else {
+			var canvasOffsetLeft = jQuery("#canvasSection").offset().left;
+			var canvasScrollLeft = jQuery("#canvasSection").scrollLeft();
+			var canvasScrollTop = jQuery("#canvasSection").scrollTop();
 
-		if(this.orientation==="northwest") {
+			var offset = a.e - (canvasOffsetLeft * additionalIEZoom);
+			var additionaloffset = 0;
+			if (offset > 10) {
+				additionaloffset = (offset / additionalIEZoom) - offset;
+			}
+			upL.y = upL.y - (jQuery("#canvasSection").offset().top * additionalIEZoom) + ((canvasScrollTop * additionalIEZoom) - canvasScrollTop) + a.f;
+			upL.x = upL.x - (canvasOffsetLeft * additionalIEZoom) + additionaloffset + ((canvasScrollLeft * additionalIEZoom) - canvasScrollLeft) + a.e;
+		}
+
+		if (this.orientation === "northwest") {
 			upL.x -= 13;
 			upL.y -= 13;
 		} else { // defaults to southeast
-			upL.x +=  (a.a * this.bounds.width()) + 3 ;
-			upL.y +=  (a.d * this.bounds.height())  + 3;
+			upL.x += (a.a * this.bounds.width()) + 3;
+			upL.y += (a.d * this.bounds.height()) + 3;
 		}
 
 		this.position = upL;
@@ -20871,39 +21505,50 @@ ORYX.Plugins.Resizer = Clazz.extend({
 });
 
 
-
 /**
  * Implements a Command to move shapes
  *
  */
 ORYX.Core.Command.Move = ORYX.Core.Command.extend({
-	construct: function(moveShapes, offset, parent, selectedShapes, plugin){
+	construct: function (moveShapes, offset, parent, selectedShapes, plugin) {
 		this.moveShapes = moveShapes;
 		this.selectedShapes = selectedShapes;
-		this.offset 	= offset;
-		this.plugin		= plugin;
+		this.offset = offset;
+		this.plugin = plugin;
 		// Defines the old/new parents for the particular shape
-		this.newParents	= moveShapes.collect(function(t){ return parent || t.parent });
-		this.oldParents	= moveShapes.collect(function(shape){ return shape.parent });
-		this.dockedNodes= moveShapes.findAll(function(shape){ return shape instanceof ORYX.Core.Node && shape.dockers.length == 1}).collect(function(shape){ return {docker:shape.dockers[0], dockedShape:shape.dockers[0].getDockedShape(), refPoint:shape.dockers[0].referencePoint} });
+		this.newParents = moveShapes.collect(function (t) {
+			return parent || t.parent
+		});
+		this.oldParents = moveShapes.collect(function (shape) {
+			return shape.parent
+		});
+		this.dockedNodes = moveShapes.findAll(function (shape) {
+			return shape instanceof ORYX.Core.Node && shape.dockers.length == 1
+		}).collect(function (shape) {
+			return {
+				docker: shape.dockers[0],
+				dockedShape: shape.dockers[0].getDockedShape(),
+				refPoint: shape.dockers[0].referencePoint
+			}
+		});
 	},
-	execute: function(){
+	execute: function () {
 		this.dockAllShapes()
 		// Moves by the offset
-		this.move( this.offset);
+		this.move(this.offset);
 		// Addes to the new parents
-		this.addShapeToParent( this.newParents );
+		this.addShapeToParent(this.newParents);
 		// Set the selection to the current selection
 		this.selectCurrentShapes();
 		this.plugin.facade.getCanvas().update();
 		this.plugin.facade.updateSelection();
 	},
-	rollback: function(){
+	rollback: function () {
 		// Moves by the inverted offset
-		var offset = { x:-this.offset.x, y:-this.offset.y };
-		this.move( offset );
+		var offset = {x: -this.offset.x, y: -this.offset.y};
+		this.move(offset);
 		// Addes to the old parents
-		this.addShapeToParent( this.oldParents );
+		this.addShapeToParent(this.oldParents);
 		this.dockAllShapes(true)
 
 		// Set the selection to the current selection
@@ -20912,16 +21557,16 @@ ORYX.Core.Command.Move = ORYX.Core.Command.extend({
 		this.plugin.facade.updateSelection();
 
 	},
-	move:function(offset, doLayout){
+	move: function (offset, doLayout) {
 
 		// Move all Shapes by these offset
-		for(var i=0; i<this.moveShapes.length ;i++){
+		for (var i = 0; i < this.moveShapes.length; i++) {
 			var value = this.moveShapes[i];
 			value.bounds.moveBy(offset);
 
 			if (value instanceof ORYX.Core.Node) {
 
-				(value.dockers||[]).each(function(d){
+				(value.dockers || []).each(function (d) {
 					d.bounds.moveBy(offset);
 				})
 
@@ -20944,10 +21589,16 @@ ORYX.Core.Command.Move = ORYX.Core.Command.extend({
 				var allEdges = [].concat(value.getIncomingShapes())
 					.concat(value.getOutgoingShapes())
 					// Remove all edges which are included in the selection from the list
-					.findAll(function(r){ return	r instanceof ORYX.Core.Edge && !this.moveShapes.any(function(d){ return d == r || (d instanceof ORYX.Core.Controls.Docker && d.parent == r)}) }.bind(this))
+					.findAll(function (r) {
+						return r instanceof ORYX.Core.Edge && !this.moveShapes.any(function (d) {
+							return d == r || (d instanceof ORYX.Core.Controls.Docker && d.parent == r)
+						})
+					}.bind(this))
 					// Remove all edges which are between the node and a node contained in the selection from the list
-					.findAll(function(r){ return 	(r.dockers.first().getDockedShape() == value || !this.moveShapes.include(r.dockers.first().getDockedShape())) &&
-													(r.dockers.last().getDockedShape() == value || !this.moveShapes.include(r.dockers.last().getDockedShape()))}.bind(this))
+					.findAll(function (r) {
+						return (r.dockers.first().getDockedShape() == value || !this.moveShapes.include(r.dockers.first().getDockedShape())) &&
+							(r.dockers.last().getDockedShape() == value || !this.moveShapes.include(r.dockers.last().getDockedShape()))
+					}.bind(this))
 
 				// Layout all outgoing/incoming edges
 				this.plugin.layoutEdges(value, allEdges, offset);
@@ -20956,12 +21607,18 @@ ORYX.Core.Command.Move = ORYX.Core.Command.extend({
 				var allSameEdges = [].concat(value.getIncomingShapes())
 					.concat(value.getOutgoingShapes())
 					// Remove all edges which are included in the selection from the list
-					.findAll(function(r){ return r instanceof ORYX.Core.Edge && r.dockers.first().isDocked() && r.dockers.last().isDocked() && !this.moveShapes.include(r) && !this.moveShapes.any(function(d){ return d == r || (d instanceof ORYX.Core.Controls.Docker && d.parent == r)}) }.bind(this))
+					.findAll(function (r) {
+						return r instanceof ORYX.Core.Edge && r.dockers.first().isDocked() && r.dockers.last().isDocked() && !this.moveShapes.include(r) && !this.moveShapes.any(function (d) {
+							return d == r || (d instanceof ORYX.Core.Controls.Docker && d.parent == r)
+						})
+					}.bind(this))
 					// Remove all edges which are included in the selection from the list
-					.findAll(function(r){ return this.moveShapes.indexOf(r.dockers.first().getDockedShape()) > i ||  this.moveShapes.indexOf(r.dockers.last().getDockedShape()) > i}.bind(this))
+					.findAll(function (r) {
+						return this.moveShapes.indexOf(r.dockers.first().getDockedShape()) > i || this.moveShapes.indexOf(r.dockers.last().getDockedShape()) > i
+					}.bind(this))
 
 				for (var j = 0; j < allSameEdges.length; j++) {
-					for (var k = 1; k < allSameEdges[j].dockers.length-1; k++) {
+					for (var k = 1; k < allSameEdges[j].dockers.length - 1; k++) {
 						var docker = allSameEdges[j].dockers[k];
 						if (!docker.getDockedShape() && !this.moveShapes.include(docker)) {
 							docker.bounds.moveBy(offset);
@@ -20985,12 +21642,12 @@ ORYX.Core.Command.Move = ORYX.Core.Command.extend({
 		}
 
 	},
-	dockAllShapes: function(shouldDocked){
+	dockAllShapes: function (shouldDocked) {
 		// Undock all Nodes
 		for (var i = 0; i < this.dockedNodes.length; i++) {
 			var docker = this.dockedNodes[i].docker;
 
-			docker.setDockedShape( shouldDocked ? this.dockedNodes[i].dockedShape : undefined )
+			docker.setDockedShape(shouldDocked ? this.dockedNodes[i].dockedShape : undefined)
 			if (docker.getDockedShape()) {
 				docker.setReferencePoint(this.dockedNodes[i].refPoint);
 				//docker.update();
@@ -20998,13 +21655,13 @@ ORYX.Core.Command.Move = ORYX.Core.Command.extend({
 		}
 	},
 
-	addShapeToParent:function( parents ){
+	addShapeToParent: function (parents) {
 
 		// For every Shape, add this and reset the position
-		for(var i=0; i<this.moveShapes.length ;i++){
+		for (var i = 0; i < this.moveShapes.length; i++) {
 			var currentShape = this.moveShapes[i];
-			if(currentShape instanceof ORYX.Core.Node &&
-			   currentShape.parent !== parents[i]) {
+			if (currentShape instanceof ORYX.Core.Node &&
+				currentShape.parent !== parents[i]) {
 
 				// Calc the new position
 				var unul = parents[i].absoluteXY();
@@ -21015,16 +21672,17 @@ ORYX.Core.Command.Move = ORYX.Core.Command.extend({
 				// Add the shape to the new contained shape
 				parents[i].add(currentShape);
 				// Add all attached shapes as well
-				currentShape.getOutgoingShapes((function(shape) {
-					if(shape instanceof ORYX.Core.Node && !this.moveShapes.member(shape)) {
+				currentShape.getOutgoingShapes((function (shape) {
+					if (shape instanceof ORYX.Core.Node && !this.moveShapes.member(shape)) {
 						parents[i].add(shape);
 					}
 				}).bind(this));
 
 				// Set the new position
-				if(currentShape instanceof ORYX.Core.Node && currentShape.dockers.length == 1){
+				if (currentShape instanceof ORYX.Core.Node && currentShape.dockers.length == 1) {
 					var b = currentShape.bounds;
-					x += b.width()/2;y += b.height()/2
+					x += b.width() / 2;
+					y += b.height() / 2
 					currentShape.dockers.first().bounds.centerMoveTo(x, y);
 				} else {
 					currentShape.bounds.moveTo(x, y);
@@ -21037,8 +21695,8 @@ ORYX.Core.Command.Move = ORYX.Core.Command.extend({
 
 		}
 	},
-	selectCurrentShapes:function(){
-		this.plugin.facade.setSelection( this.selectedShapes );
+	selectCurrentShapes: function () {
+		this.plugin.facade.setSelection(this.selectedShapes);
 	}
 });
 /*
@@ -21051,35 +21709,35 @@ ORYX.Core.Command.Move = ORYX.Core.Command.extend({
  * All code Copyright 2013 KIS Consultancy all rights reserved
  */
 
-if(!ORYX.Plugins)
+if (!ORYX.Plugins)
 	ORYX.Plugins = new Object();
 
 ORYX.Plugins.DragDocker = Clazz.extend({
 
 	/**
-	 *	Constructor
-	 *	@param {Object} Facade: The Facade of the Editor
+	 *    Constructor
+	 *    @param {Object} Facade: The Facade of the Editor
 	 */
-	construct: function(facade) {
+	construct: function (facade) {
 		this.facade = facade;
 
 		// Set the valid and invalid color
-		this.VALIDCOLOR 	= ORYX.CONFIG.SELECTION_VALID_COLOR;
-		this.INVALIDCOLOR 	= ORYX.CONFIG.SELECTION_INVALID_COLOR;
+		this.VALIDCOLOR = ORYX.CONFIG.SELECTION_VALID_COLOR;
+		this.INVALIDCOLOR = ORYX.CONFIG.SELECTION_INVALID_COLOR;
 
 		// Define Variables
 		this.shapeSelection = undefined;
-		this.docker 		= undefined;
-		this.dockerParent   = undefined;
-		this.dockerSource 	= undefined;
-		this.dockerTarget 	= undefined;
-		this.lastUIObj 		= undefined;
-		this.isStartDocker 	= undefined;
-		this.isEndDocker 	= undefined;
-		this.undockTreshold	= 10;
+		this.docker = undefined;
+		this.dockerParent = undefined;
+		this.dockerSource = undefined;
+		this.dockerTarget = undefined;
+		this.lastUIObj = undefined;
+		this.isStartDocker = undefined;
+		this.isEndDocker = undefined;
+		this.undockTreshold = 10;
 		this.initialDockerPosition = undefined;
 		this.outerDockerNotMoved = undefined;
-		this.isValid 		= false;
+		this.isValid = false;
 
 		// For the Drag and Drop
 		// Register on MouseDown-Event on a Docker
@@ -21098,12 +21756,12 @@ ORYX.Plugins.DragDocker = Clazz.extend({
 	 * MouseOut Handler
 	 *
 	 */
-	handleMouseOut: function(event, uiObj) {
+	handleMouseOut: function (event, uiObj) {
 		// If there is a Docker, hide this
-		if(!this.docker && uiObj instanceof ORYX.Core.Controls.Docker) {
+		if (!this.docker && uiObj instanceof ORYX.Core.Controls.Docker) {
 			uiObj.hide();
-		} else if(!this.docker && uiObj instanceof ORYX.Core.Edge) {
-			uiObj.dockers.each(function(docker){
+		} else if (!this.docker && uiObj instanceof ORYX.Core.Edge) {
+			uiObj.dockers.each(function (docker) {
 				docker.hide();
 			});
 		}
@@ -21113,12 +21771,12 @@ ORYX.Plugins.DragDocker = Clazz.extend({
 	 * MouseOver Handler
 	 *
 	 */
-	handleMouseOver: function(event, uiObj) {
+	handleMouseOver: function (event, uiObj) {
 		// If there is a Docker, show this
-		if(!this.docker && uiObj instanceof ORYX.Core.Controls.Docker) {
+		if (!this.docker && uiObj instanceof ORYX.Core.Controls.Docker) {
 			uiObj.show();
-		} else if(!this.docker && uiObj instanceof ORYX.Core.Edge) {
-			uiObj.dockers.each(function(docker){
+		} else if (!this.docker && uiObj instanceof ORYX.Core.Edge) {
+			uiObj.dockers.each(function (docker) {
 				docker.show();
 			});
 		}
@@ -21127,7 +21785,7 @@ ORYX.Plugins.DragDocker = Clazz.extend({
 	 * DockerDrag Handler
 	 * delegates the uiEvent of the drag event to the mouseDown function
 	 */
-	handleDockerDrag: function(event, uiObj) {
+	handleDockerDrag: function (event, uiObj) {
 		this.handleMouseDown(event.uiEvent, uiObj);
 	},
 
@@ -21135,9 +21793,9 @@ ORYX.Plugins.DragDocker = Clazz.extend({
 	 * MouseDown Handler
 	 *
 	 */
-	handleMouseDown: function(event, uiObj) {
+	handleMouseDown: function (event, uiObj) {
 		// If there is a Docker
-		if(uiObj instanceof ORYX.Core.Controls.Docker && uiObj.isMovable) {
+		if (uiObj instanceof ORYX.Core.Controls.Docker && uiObj.isMovable) {
 
 			/* Buffering shape selection and clear selection*/
 			this.shapeSelection = this.facade.getSelection();
@@ -21149,20 +21807,24 @@ ORYX.Plugins.DragDocker = Clazz.extend({
 			this.dockerParent = uiObj.parent;
 
 			// Define command arguments
-			this._commandArg = {docker:uiObj, dockedShape:uiObj.getDockedShape(), refPoint:uiObj.referencePoint || uiObj.bounds.center()};
+			this._commandArg = {
+				docker: uiObj,
+				dockedShape: uiObj.getDockedShape(),
+				refPoint: uiObj.referencePoint || uiObj.bounds.center()
+			};
 
 			// Show the Docker
 			this.docker.show();
 
 			// If the Dockers Parent is an Edge,
 			//  and the Docker is either the first or last Docker of the Edge
-			if(uiObj.parent instanceof ORYX.Core.Edge &&
-			   	(uiObj.parent.dockers.first() == uiObj || uiObj.parent.dockers.last() == uiObj)) {
+			if (uiObj.parent instanceof ORYX.Core.Edge &&
+				(uiObj.parent.dockers.first() == uiObj || uiObj.parent.dockers.last() == uiObj)) {
 
 				// Get the Edge Source or Target
-				if(uiObj.parent.dockers.first() == uiObj && uiObj.parent.dockers.last().getDockedShape()) {
+				if (uiObj.parent.dockers.first() == uiObj && uiObj.parent.dockers.last().getDockedShape()) {
 					this.dockerTarget = uiObj.parent.dockers.last().getDockedShape();
-				} else if(uiObj.parent.dockers.last() == uiObj && uiObj.parent.dockers.first().getDockedShape()) {
+				} else if (uiObj.parent.dockers.last() == uiObj && uiObj.parent.dockers.first().getDockedShape()) {
 					this.dockerSource = uiObj.parent.dockers.first().getDockedShape();
 				}
 
@@ -21179,27 +21841,27 @@ ORYX.Plugins.DragDocker = Clazz.extend({
 			this.facade.getCanvas().add(this.docker.parent);
 
 			// Hide all Labels from Docker
-			this.docker.parent.getLabels().each(function(label) {
+			this.docker.parent.getLabels().each(function (label) {
 				label.hide();
 			});
 
 			var eventCoordinates = this.facade.eventCoordinates(event);
 			var additionalIEZoom = 1;
-            if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
-                var ua = navigator.userAgent;
-                if (ua.indexOf('MSIE') >= 0) {
-                    //IE 10 and below
-                    var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
-                    if (zoom !== 100) {
-                        additionalIEZoom = zoom / 100
-                    }
-                }
-            }
+			if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
+				var ua = navigator.userAgent;
+				if (ua.indexOf('MSIE') >= 0) {
+					//IE 10 and below
+					var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
+					if (zoom !== 100) {
+						additionalIEZoom = zoom / 100
+					}
+				}
+			}
 
-            if (additionalIEZoom !== 1) {
-                eventCoordinates.x = eventCoordinates.x / additionalIEZoom;
-                eventCoordinates.y = eventCoordinates.y / additionalIEZoom;
-            }
+			if (additionalIEZoom !== 1) {
+				eventCoordinates.x = eventCoordinates.x / additionalIEZoom;
+				eventCoordinates.y = eventCoordinates.y / additionalIEZoom;
+			}
 
 			// Undocked the Docker from current Shape
 			if ((!this.isStartDocker && !this.isEndDocker) || !this.docker.isDocked()) {
@@ -21225,7 +21887,7 @@ ORYX.Plugins.DragDocker = Clazz.extend({
 	 * Docker MouseMove Handler
 	 *
 	 */
-	dockerMoved: function(event) {
+	dockerMoved: function (event) {
 		this.outerDockerNotMoved = false;
 		var snapToMagnet = undefined;
 
@@ -21236,27 +21898,27 @@ ORYX.Plugins.DragDocker = Clazz.extend({
 				var evPos = this.facade.eventCoordinates(event);
 
 				var additionalIEZoom = 1;
-	            if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
-	                var ua = navigator.userAgent;
-	                if (ua.indexOf('MSIE') >= 0) {
-	                    //IE 10 and below
-	                    var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
-	                    if (zoom !== 100) {
-	                        additionalIEZoom = zoom / 100
-	                    }
-	                }
-	            }
-
-	            if (additionalIEZoom !== 1) {
-	            	evPos.x = evPos.x / additionalIEZoom;
-	            	evPos.y = evPos.y / additionalIEZoom;
-	            }
-
-				if(this.docker.isDocked()) {
+				if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
+					var ua = navigator.userAgent;
+					if (ua.indexOf('MSIE') >= 0) {
+						//IE 10 and below
+						var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
+						if (zoom !== 100) {
+							additionalIEZoom = zoom / 100
+						}
+					}
+				}
+
+				if (additionalIEZoom !== 1) {
+					evPos.x = evPos.x / additionalIEZoom;
+					evPos.y = evPos.y / additionalIEZoom;
+				}
+
+				if (this.docker.isDocked()) {
 					/* Only consider start/end dockers if they are moved over a treshold */
 					var distanceDockerPointer =
 						ORYX.Core.Math.getDistancePointToPoint(evPos, this.initialDockerPosition);
-					if(distanceDockerPointer < this.undockTreshold) {
+					if (distanceDockerPointer < this.undockTreshold) {
 						this.outerDockerNotMoved = true;
 						return;
 					}
@@ -21278,101 +21940,95 @@ ORYX.Plugins.DragDocker = Clazz.extend({
 
 				// If the top level Shape the same as the last Shape, then return
 				if (this.lastUIObj == uiObj) {
-				//return;
+					//return;
 
-				// If the top level uiObj instance of Shape and this isn't the parent of the docker
-				}
-				else
-					if (uiObj instanceof ORYX.Core.Shape) {
+					// If the top level uiObj instance of Shape and this isn't the parent of the docker
+				} else if (uiObj instanceof ORYX.Core.Shape) {
 
-						// Ask by the StencilSet if the source, the edge and the target valid connections.
-						if (this.docker.parent instanceof ORYX.Core.Edge) {
+					// Ask by the StencilSet if the source, the edge and the target valid connections.
+					if (this.docker.parent instanceof ORYX.Core.Edge) {
 
-							var highestParent = this.getHighestParentBeforeCanvas(uiObj);
-							/* Ensure that the shape to dock is not a child shape
+						var highestParent = this.getHighestParentBeforeCanvas(uiObj);
+						/* Ensure that the shape to dock is not a child shape
 							 * of the same edge.
 							 */
-							if (highestParent instanceof ORYX.Core.Edge && this.docker.parent === highestParent)
-							{
-								this.isValid = false;
-								this.dockerParent._update();
-								return;
-							}
+						if (highestParent instanceof ORYX.Core.Edge && this.docker.parent === highestParent) {
 							this.isValid = false;
-							var curObj = uiObj, orgObj = uiObj;
-							while (!this.isValid && curObj && !(curObj instanceof ORYX.Core.Canvas))
-							{
-								uiObj = curObj;
-								this.isValid = this.facade.getRules().canConnect({
-											sourceShape: this.dockerSource ? // Is there a docked source
-															this.dockerSource : // than set this
-															(this.isStartDocker ? // if not and if the Docker is the start docker
-																uiObj : // take the last uiObj
-																undefined), // if not set it to undefined;
-											edgeShape: this.docker.parent,
-											targetShape: this.dockerTarget ? // Is there a docked target
-											this.dockerTarget : // than set this
-														(this.isEndDocker ? // if not and if the Docker is not the start docker
-															uiObj : // take the last uiObj
-															undefined) // if not set it to undefined;
-										});
-								curObj = curObj.parent;
-							}
-
-							// Reset uiObj if no
-							// valid parent is found
-							if (!this.isValid){
-								uiObj = orgObj;
-							}
-
+							this.dockerParent._update();
+							return;
 						}
-						else {
+						this.isValid = false;
+						var curObj = uiObj, orgObj = uiObj;
+						while (!this.isValid && curObj && !(curObj instanceof ORYX.Core.Canvas)) {
+							uiObj = curObj;
 							this.isValid = this.facade.getRules().canConnect({
-								sourceShape: uiObj,
+								sourceShape: this.dockerSource ? // Is there a docked source
+									this.dockerSource : // than set this
+									(this.isStartDocker ? // if not and if the Docker is the start docker
+										uiObj : // take the last uiObj
+										undefined), // if not set it to undefined;
 								edgeShape: this.docker.parent,
-								targetShape: this.docker.parent
+								targetShape: this.dockerTarget ? // Is there a docked target
+									this.dockerTarget : // than set this
+									(this.isEndDocker ? // if not and if the Docker is not the start docker
+										uiObj : // take the last uiObj
+										undefined) // if not set it to undefined;
 							});
+							curObj = curObj.parent;
 						}
 
-						// If there is a lastUIObj, hide the magnets
-						if (this.lastUIObj) {
-							this.hideMagnets(this.lastUIObj);
-						}
-
-						// If there is a valid connection, show the magnets
-						if (this.isValid) {
-							this.showMagnets(uiObj);
+						// Reset uiObj if no
+						// valid parent is found
+						if (!this.isValid) {
+							uiObj = orgObj;
 						}
 
-						// Set the Highlight Rectangle by these value
-						this.showHighlight(uiObj, this.isValid ? this.VALIDCOLOR : this.INVALIDCOLOR);
+					} else {
+						this.isValid = this.facade.getRules().canConnect({
+							sourceShape: uiObj,
+							edgeShape: this.docker.parent,
+							targetShape: this.docker.parent
+						});
+					}
 
-						// Buffer the current Shape
-						this.lastUIObj = uiObj;
+					// If there is a lastUIObj, hide the magnets
+					if (this.lastUIObj) {
+						this.hideMagnets(this.lastUIObj);
 					}
-					else {
-						// If there is no top level Shape, then hide the highligting of the last Shape
-						this.hideHighlight();
-						this.lastUIObj ? this.hideMagnets(this.lastUIObj) : null;
-						this.lastUIObj = undefined;
-						this.isValid = false;
+
+					// If there is a valid connection, show the magnets
+					if (this.isValid) {
+						this.showMagnets(uiObj);
 					}
 
+					// Set the Highlight Rectangle by these value
+					this.showHighlight(uiObj, this.isValid ? this.VALIDCOLOR : this.INVALIDCOLOR);
+
+					// Buffer the current Shape
+					this.lastUIObj = uiObj;
+				} else {
+					// If there is no top level Shape, then hide the highligting of the last Shape
+					this.hideHighlight();
+					this.lastUIObj ? this.hideMagnets(this.lastUIObj) : null;
+					this.lastUIObj = undefined;
+					this.isValid = false;
+				}
+
 				// Snap to the nearest Magnet
 				if (this.lastUIObj && this.isValid && !(event.shiftKey || event.ctrlKey)) {
-					snapToMagnet = this.lastUIObj.magnets.find(function(magnet){
+					snapToMagnet = this.lastUIObj.magnets.find(function (magnet) {
 						return magnet.absoluteBounds().isIncluded(evPos);
 					});
 
 					if (snapToMagnet) {
 						this.docker.bounds.centerMoveTo(snapToMagnet.absoluteCenterXY());
-					//this.docker.update()
+						//this.docker.update()
 					}
 				}
 			}
 		}
 		// Snap to on the nearest Docker of the same parent
-		if(!(event.shiftKey || event.ctrlKey) && !snapToMagnet) {
+		if (!(event.shiftKey || event.ctrlKey) && !snapToMagnet) {
 			var minOffset = ORYX.CONFIG.DOCKER_SNAP_OFFSET;
 			var nearestX = minOffset + 1;
 			var nearestY = minOffset + 1;
@@ -21381,10 +22037,11 @@ ORYX.Plugins.DragDocker = Clazz.extend({
 
 			if (this.docker.parent) {
 
-				this.docker.parent.dockers.each((function(docker){
+				this.docker.parent.dockers.each((function (docker) {
 					if (this.docker == docker) {
 						return
-					};
+					}
+					;
 
 					var center = docker.referencePoint ? docker.getAbsoluteReferencePoint() : docker.bounds.center();
 
@@ -21403,11 +22060,10 @@ ORYX.Plugins.DragDocker = Clazz.extend({
 				} else {
 
 
+					var previous = this.docker.parent.dockers[Math.max(this.docker.parent.dockers.indexOf(this.docker) - 1, 0)];
+					var next = this.docker.parent.dockers[Math.min(this.docker.parent.dockers.indexOf(this.docker) + 1, this.docker.parent.dockers.length - 1)];
 
-					var previous = this.docker.parent.dockers[Math.max(this.docker.parent.dockers.indexOf(this.docker)-1, 0)];
-					var next = this.docker.parent.dockers[Math.min(this.docker.parent.dockers.indexOf(this.docker)+1, this.docker.parent.dockers.length-1)];
-
-					if (previous && next && previous !== this.docker && next !== this.docker){
+					if (previous && next && previous !== this.docker && next !== this.docker) {
 						var cp = previous.bounds.center();
 						var cn = next.bounds.center();
 						var cd = this.docker.bounds.center();
@@ -21415,12 +22071,14 @@ ORYX.Plugins.DragDocker = Clazz.extend({
 						// Checks if the point is on the line between previous and next
 						if (ORYX.Core.Math.isPointInLine(cd.x, cd.y, cp.x, cp.y, cn.x, cn.y, 10)) {
 							// Get the rise
-							var raise = (Number(cn.y)-Number(cp.y))/(Number(cn.x)-Number(cp.x));
+							var raise = (Number(cn.y) - Number(cp.y)) / (Number(cn.x) - Number(cp.x));
 							// Calculate the intersection point
-							var intersecX = ((cp.y-(cp.x*raise))-(cd.y-(cd.x*(-Math.pow(raise,-1)))))/((-Math.pow(raise,-1))-raise);
-							var intersecY = (cp.y-(cp.x*raise))+(raise*intersecX);
+							var intersecX = ((cp.y - (cp.x * raise)) - (cd.y - (cd.x * (-Math.pow(raise, -1))))) / ((-Math.pow(raise, -1)) - raise);
+							var intersecY = (cp.y - (cp.x * raise)) + (raise * intersecX);
 
-							if(isNaN(intersecX) || isNaN(intersecY)) {return;}
+							if (isNaN(intersecX) || isNaN(intersecY)) {
+								return;
+							}
 
 							this.docker.bounds.centerMoveTo(intersecX, intersecY);
 						}
@@ -21437,7 +22095,7 @@ ORYX.Plugins.DragDocker = Clazz.extend({
 	 * Docker MouseUp Handler
 	 *
 	 */
-	dockerMovedFinished: function(event) {
+	dockerMovedFinished: function (event) {
 
 		/* Reset to buffered shape selection */
 		this.facade.setSelection(this.shapeSelection);
@@ -21446,23 +22104,23 @@ ORYX.Plugins.DragDocker = Clazz.extend({
 		this.hideHighlight();
 
 		// Show all Labels from Docker
-		this.dockerParent.getLabels().each(function(label){
+		this.dockerParent.getLabels().each(function (label) {
 			label.show();
 			//label.update();
 		});
 
 		// If there is a last top level Shape
-		if(this.lastUIObj && (this.isStartDocker || this.isEndDocker)){
+		if (this.lastUIObj && (this.isStartDocker || this.isEndDocker)) {
 			// If there is a valid connection, the set as a docked Shape to them
-			if(this.isValid) {
+			if (this.isValid) {
 
 				this.docker.setDockedShape(this.lastUIObj);
 
 				this.facade.raiseEvent({
-					type 	:ORYX.CONFIG.EVENT_DRAGDOCKER_DOCKED,
-					docker	: this.docker,
-					parent	: this.docker.parent,
-					target	: this.lastUIObj
+					type: ORYX.CONFIG.EVENT_DRAGDOCKER_DOCKED,
+					docker: this.docker,
+					parent: this.docker.parent,
+					target: this.lastUIObj
 				});
 			}
 
@@ -21472,13 +22130,13 @@ ORYX.Plugins.DragDocker = Clazz.extend({
 		// Hide the Docker
 		this.docker.hide();
 
-		if(this.outerDockerNotMoved) {
+		if (this.outerDockerNotMoved) {
 			// Get the EventPosition and all Shapes on these point
 			var evPos = this.facade.eventCoordinates(event);
 			var shapes = this.facade.getCanvas().getAbstractShapesAtPosition(evPos);
 
 			/* Remove edges from selection */
-			var shapeWithoutEdges = shapes.findAll(function(node) {
+			var shapeWithoutEdges = shapes.findAll(function (node) {
 				return node instanceof ORYX.Core.Node;
 			});
 			shapes = shapeWithoutEdges.length ? shapeWithoutEdges : shapes;
@@ -21486,44 +22144,44 @@ ORYX.Plugins.DragDocker = Clazz.extend({
 		} else {
 			//Command-Pattern for dragging one docker
 			var dragDockerCommand = ORYX.Core.Command.extend({
-				construct: function(docker, newPos, oldPos, newDockedShape, oldDockedShape, facade){
-					this.docker 		= docker;
-					this.index			= docker.parent.dockers.indexOf(docker);
-					this.newPosition	= newPos;
+				construct: function (docker, newPos, oldPos, newDockedShape, oldDockedShape, facade) {
+					this.docker = docker;
+					this.index = docker.parent.dockers.indexOf(docker);
+					this.newPosition = newPos;
 					this.newDockedShape = newDockedShape;
-					this.oldPosition	= oldPos;
-					this.oldDockedShape	= oldDockedShape;
-					this.facade			= facade;
-					this.index			= docker.parent.dockers.indexOf(docker);
-					this.shape			= docker.parent;
+					this.oldPosition = oldPos;
+					this.oldDockedShape = oldDockedShape;
+					this.facade = facade;
+					this.index = docker.parent.dockers.indexOf(docker);
+					this.shape = docker.parent;
 
 				},
-				execute: function(){
-					if (!this.docker.parent){
+				execute: function () {
+					if (!this.docker.parent) {
 						this.docker = this.shape.dockers[this.index];
 					}
-					this.dock( this.newDockedShape, this.newPosition );
+					this.dock(this.newDockedShape, this.newPosition);
 					this.removedDockers = this.shape.removeUnusedDockers();
 					this.facade.updateSelection();
 				},
-				rollback: function(){
-					this.dock( this.oldDockedShape, this.oldPosition );
-					(this.removedDockers||$H({})).each(function(d){
+				rollback: function () {
+					this.dock(this.oldDockedShape, this.oldPosition);
+					(this.removedDockers || $H({})).each(function (d) {
 						this.shape.add(d.value, Number(d.key));
 						this.shape._update(true);
 					}.bind(this));
 					this.facade.updateSelection();
 				},
-				dock:function( toDockShape, pos ){
+				dock: function (toDockShape, pos) {
 					// Set the Docker to the new Shape
-					this.docker.setDockedShape( undefined );
-					if( toDockShape ){
-						this.docker.setDockedShape( toDockShape );
-						this.docker.setReferencePoint( pos );
+					this.docker.setDockedShape(undefined);
+					if (toDockShape) {
+						this.docker.setDockedShape(toDockShape);
+						this.docker.setReferencePoint(pos);
 						//this.docker.update();
 						//this.docker.parent._update();
 					} else {
-						this.docker.bounds.centerMoveTo( pos );
+						this.docker.bounds.centerMoveTo(pos);
 					}
 
 					this.facade.getCanvas().update();
@@ -21531,10 +22189,10 @@ ORYX.Plugins.DragDocker = Clazz.extend({
 			});
 
 
-			if (this.docker.parent){
+			if (this.docker.parent) {
 				// Instanziate the dockCommand
 				var command = new dragDockerCommand(this.docker, this.docker.getDockedShape() ? this.docker.referencePoint : this.docker.bounds.center(), this._commandArg.refPoint, this.docker.getDockedShape(), this._commandArg.dockedShape, this.facade);
-				this.facade.executeCommands( [command] );
+				this.facade.executeCommands([command]);
 			}
 		}
 
@@ -21542,51 +22200,53 @@ ORYX.Plugins.DragDocker = Clazz.extend({
 		//this.facade.updateSelection();
 
 		// Undefined all variables
-		this.docker 		= undefined;
-		this.dockerParent   = undefined;
-		this.dockerSource 	= undefined;
-		this.dockerTarget 	= undefined;
-		this.lastUIObj 		= undefined;
+		this.docker = undefined;
+		this.dockerParent = undefined;
+		this.dockerSource = undefined;
+		this.dockerTarget = undefined;
+		this.lastUIObj = undefined;
 	},
 
 	/**
 	 * Hide the highlighting
 	 */
-	hideHighlight: function() {
-		this.facade.raiseEvent({type:ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE, highlightId:'validDockedShape'});
+	hideHighlight: function () {
+		this.facade.raiseEvent({type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE, highlightId: 'validDockedShape'});
 	},
 
 	/**
 	 * Show the highlighting
 	 *
 	 */
-	showHighlight: function(uiObj, color) {
+	showHighlight: function (uiObj, color) {
 
 		this.facade.raiseEvent({
-										type:		ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW,
-										highlightId:'validDockedShape',
-										elements:	[uiObj],
-										color:		color
-									});
+			type: ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW,
+			highlightId: 'validDockedShape',
+			elements: [uiObj],
+			color: color
+		});
 	},
 
-	showMagnets: function(uiObj){
-		uiObj.magnets.each(function(magnet) {
+	showMagnets: function (uiObj) {
+		uiObj.magnets.each(function (magnet) {
 			magnet.show();
 		});
 	},
 
-	hideMagnets: function(uiObj){
-		uiObj.magnets.each(function(magnet) {
+	hideMagnets: function (uiObj) {
+		uiObj.magnets.each(function (magnet) {
 			magnet.hide();
 		});
 	},
 
-	getHighestParentBeforeCanvas: function(shape) {
-		if(!(shape instanceof ORYX.Core.Shape)) {return undefined;}
+	getHighestParentBeforeCanvas: function (shape) {
+		if (!(shape instanceof ORYX.Core.Shape)) {
+			return undefined;
+		}
 
 		var parent = shape.parent;
-		while(parent && !(parent.parent instanceof ORYX.Core.Canvas)) {
+		while (parent && !(parent.parent instanceof ORYX.Core.Canvas)) {
 			parent = parent.parent;
 		}
 
@@ -21605,16 +22265,16 @@ ORYX.Plugins.DragDocker = Clazz.extend({
  * All code Copyright 2013 KIS Consultancy all rights reserved
  */
 
-if(!ORYX.Plugins)
+if (!ORYX.Plugins)
 	ORYX.Plugins = new Object();
 
 ORYX.Plugins.AddDocker = Clazz.extend({
 
 	/**
-	 *	Constructor
-	 *	@param {Object} Facade: The Facade of the Editor
+	 *    Constructor
+	 *    @param {Object} Facade: The Facade of the Editor
 	 */
-	construct: function(facade) {
+	construct: function (facade) {
 		this.facade = facade;
 		this.enableAdd = false;
 		this.enableRemove = false;
@@ -21622,109 +22282,107 @@ ORYX.Plugins.AddDocker = Clazz.extend({
 		this.facade.registerOnEvent(ORYX.CONFIG.EVENT_MOUSEDOWN, this.handleMouseDown.bind(this));
 	},
 
-	setEnableAdd: function(enable){
+	setEnableAdd: function (enable) {
 		this.enableAdd = enable;
 
-		if(this.enableAdd) {
-    		jQuery("#add-bendpoint-button").addClass('pressed');
-    	} else {
-    		jQuery("#add-bendpoint-button").removeClass('pressed');
-    		jQuery("#add-bendpoint-button").blur();
-    	}
+		if (this.enableAdd) {
+			jQuery("#add-bendpoint-button").addClass('pressed');
+		} else {
+			jQuery("#add-bendpoint-button").removeClass('pressed');
+			jQuery("#add-bendpoint-button").blur();
+		}
 	},
-	setEnableRemove: function(enable){
+	setEnableRemove: function (enable) {
 		this.enableRemove = enable;
 
-		if(this.enableRemove) {
-    		jQuery("#remove-bendpoint-button").addClass('pressed');
-    	} else {
-    		jQuery("#remove-bendpoint-button").removeClass('pressed');
-    		jQuery("#remove-bendpoint-button").blur();
-    	}
+		if (this.enableRemove) {
+			jQuery("#remove-bendpoint-button").addClass('pressed');
+		} else {
+			jQuery("#remove-bendpoint-button").removeClass('pressed');
+			jQuery("#remove-bendpoint-button").blur();
+		}
 	},
 
-    enabledAdd: function(enable){
-        return this.enableAdd;
-    },
-    enabledRemove: function(){
-        return this.enableRemove;
-    },
+	enabledAdd: function (enable) {
+		return this.enableAdd;
+	},
+	enabledRemove: function () {
+		return this.enableRemove;
+	},
 
 	/**
 	 * MouseDown Handler
 	 *
 	 */
-	handleMouseDown: function(event, uiObj) {
+	handleMouseDown: function (event, uiObj) {
 		if (this.enabledAdd() && uiObj instanceof ORYX.Core.Edge) {
-            this.newDockerCommand({
-                edge: uiObj,
-                position: this.facade.eventCoordinates(event)
-            });
-            this.setEnableAdd(false);
+			this.newDockerCommand({
+				edge: uiObj,
+				position: this.facade.eventCoordinates(event)
+			});
+			this.setEnableAdd(false);
 
 		} else if (this.enabledRemove() &&
-				   uiObj instanceof ORYX.Core.Controls.Docker &&
-				   uiObj.parent instanceof ORYX.Core.Edge) {
-            this.newDockerCommand({
-                edge: uiObj.parent,
-                docker: uiObj
-            });
-            this.setEnableRemove(false);
-        }
+			uiObj instanceof ORYX.Core.Controls.Docker &&
+			uiObj.parent instanceof ORYX.Core.Edge) {
+			this.newDockerCommand({
+				edge: uiObj.parent,
+				docker: uiObj
+			});
+			this.setEnableRemove(false);
+		}
 		document.body.style.cursor = 'default';
 	},
 
-    // Options: edge (required), position (required if add), docker (required if delete)
-    newDockerCommand: function(options){
-        if(!options.edge)
-            return;
-
-        var commandClass = ORYX.Core.Command.extend({
-            construct: function(addEnabled, deleteEnabled, edge, docker, pos, facade){
-                this.addEnabled = addEnabled;
-                this.deleteEnabled = deleteEnabled;
-                this.edge = edge;
-                this.docker = docker;
-                this.pos = pos;
-                this.facade = facade;
-            },
-            execute: function(){
-                if (this.addEnabled) {
-					if (!this.docker){
-                    	this.docker = this.edge.addDocker(this.pos);
+	// Options: edge (required), position (required if add), docker (required if delete)
+	newDockerCommand: function (options) {
+		if (!options.edge)
+			return;
+
+		var commandClass = ORYX.Core.Command.extend({
+			construct: function (addEnabled, deleteEnabled, edge, docker, pos, facade) {
+				this.addEnabled = addEnabled;
+				this.deleteEnabled = deleteEnabled;
+				this.edge = edge;
+				this.docker = docker;
+				this.pos = pos;
+				this.facade = facade;
+			},
+			execute: function () {
+				if (this.addEnabled) {
+					if (!this.docker) {
+						this.docker = this.edge.addDocker(this.pos);
 						this.index = this.edge.dockers.indexOf(this.docker);
 					} else {
-                    	this.edge.add(this.docker, this.index);
+						this.edge.add(this.docker, this.index);
 					}
-                }
-                else if (this.deleteEnabled) {
+				} else if (this.deleteEnabled) {
 					this.index = this.edge.dockers.indexOf(this.docker);
-                    this.pos = this.docker.bounds.center();
-                    this.edge.removeDocker(this.docker);
-                }
-                this.edge.getLabels().invoke("show");
-                this.facade.getCanvas().update();
-                this.facade.updateSelection();
-            },
-            rollback: function(){
-                if (this.addEnabled) {
-                    if (this.docker instanceof ORYX.Core.Controls.Docker) {
-                        this.edge.removeDocker(this.docker);
-                    }
-                }
-                else if (this.deleteEnabled) {
-                    this.edge.add(this.docker, this.index);
-                }
-                this.edge.getLabels().invoke("show");
-                this.facade.getCanvas().update();
-                this.facade.updateSelection();
-            }
-        })
+					this.pos = this.docker.bounds.center();
+					this.edge.removeDocker(this.docker);
+				}
+				this.edge.getLabels().invoke("show");
+				this.facade.getCanvas().update();
+				this.facade.updateSelection();
+			},
+			rollback: function () {
+				if (this.addEnabled) {
+					if (this.docker instanceof ORYX.Core.Controls.Docker) {
+						this.edge.removeDocker(this.docker);
+					}
+				} else if (this.deleteEnabled) {
+					this.edge.add(this.docker, this.index);
+				}
+				this.edge.getLabels().invoke("show");
+				this.facade.getCanvas().update();
+				this.facade.updateSelection();
+			}
+		})
 
-        var command = new commandClass(this.enabledAdd(), this.enabledRemove(), options.edge, options.docker, options.position, this.facade);
+		var command = new commandClass(this.enabledAdd(), this.enabledRemove(), options.edge, options.docker, options.position, this.facade);
 
-        this.facade.executeCommands([command]);
-    }
+		this.facade.executeCommands([command]);
+	}
 });
 
 /*
@@ -21737,12 +22395,12 @@ ORYX.Plugins.AddDocker = Clazz.extend({
  * All code Copyright 2013 KIS Consultancy all rights reserved
  */
 
-if(!ORYX.Plugins)
+if (!ORYX.Plugins)
 	ORYX.Plugins = new Object();
 
- ORYX.Plugins.SelectionFrame = Clazz.extend({
+ORYX.Plugins.SelectionFrame = Clazz.extend({
 
-	construct: function(facade) {
+	construct: function (facade) {
 		this.facade = facade;
 
 		// Register on MouseEvents
@@ -21750,23 +22408,23 @@ if(!ORYX.Plugins)
 		document.documentElement.addEventListener(ORYX.CONFIG.EVENT_MOUSEUP, this.handleMouseUp.bind(this), true);
 
 		// Some initiale variables
-		this.position 		= {x:0, y:0};
-		this.size 			= {width:0, height:0};
+		this.position = {x: 0, y: 0};
+		this.size = {width: 0, height: 0};
 		this.offsetPosition = {x: 0, y: 0};
 
 		// (Un)Register Mouse-Move Event
-		this.moveCallback 	= undefined;
-		this.offsetScroll	= {x:0,y:0};
+		this.moveCallback = undefined;
+		this.offsetScroll = {x: 0, y: 0};
 		// HTML-Node of Selection-Frame
 		this.node = ORYX.Editor.graft("http://www.w3.org/1999/xhtml", $('canvasSection'),
-			['div', {'class':'Oryx_SelectionFrame'}]);
+			['div', {'class': 'Oryx_SelectionFrame'}]);
 
 		this.hide();
 	},
 
-	handleMouseDown: function(event, uiObj) {
+	handleMouseDown: function (event, uiObj) {
 		// If there is the Canvas
-		if( uiObj instanceof ORYX.Core.Canvas ) {
+		if (uiObj instanceof ORYX.Core.Canvas) {
 			// Calculate the Offset
 			var scrollNode = uiObj.rootNode.parentNode.parentNode;
 
@@ -21778,18 +22436,18 @@ if(!ORYX.Plugins)
 
 			// Set the new Position
 			this.setPos({
-			    x: Event.pointerX(event) - jQuery("#canvasSection").offset().left,
+				x: Event.pointerX(event) - jQuery("#canvasSection").offset().left,
 				y: Event.pointerY(event) - jQuery("#canvasSection").offset().top + 5
 			});
 
 			// Reset the size
-			this.resize({width:0, height:0});
+			this.resize({width: 0, height: 0});
 			this.moveCallback = this.handleMouseMove.bind(this);
 
 			// Register Mouse-Move Event
 			document.documentElement.addEventListener(ORYX.CONFIG.EVENT_MOUSEMOVE, this.moveCallback, false);
 
-			this.offsetScroll		= {x:scrollNode.scrollLeft,y:scrollNode.scrollTop};
+			this.offsetScroll = {x: scrollNode.scrollLeft, y: scrollNode.scrollTop};
 
 			// Show the Frame
 			this.show();
@@ -21798,9 +22456,9 @@ if(!ORYX.Plugins)
 		Event.stop(event);
 	},
 
-	handleMouseUp: function(event) {
+	handleMouseUp: function (event) {
 		// If there was an MouseMoving
-		if(this.moveCallback) {
+		if (this.moveCallback) {
 			// Hide the Frame
 			this.hide();
 
@@ -21823,54 +22481,55 @@ if(!ORYX.Plugins)
 			};
 
 			var additionalIEZoom = 1;
-            if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
-                var ua = navigator.userAgent;
-                if (ua.indexOf('MSIE') >= 0) {
-                    //IE 10 and below
-                    var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
-                    if (zoom !== 100) {
-                        additionalIEZoom = zoom / 100
-                    }
-                }
-            }
+			if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
+				var ua = navigator.userAgent;
+				if (ua.indexOf('MSIE') >= 0) {
+					//IE 10 and below
+					var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
+					if (zoom !== 100) {
+						additionalIEZoom = zoom / 100
+					}
+				}
+			}
 
-            if (additionalIEZoom === 1) {
-                a.x = a.x - (corrSVG.e - jQuery("#canvasSection").offset().left);
-                a.y = a.y - (corrSVG.f - jQuery("#canvasSection").offset().top);
-                b.x = b.x - (corrSVG.e - jQuery("#canvasSection").offset().left);
-                b.y = b.y - (corrSVG.f - jQuery("#canvasSection").offset().top);
-
-            } else {
-                 var canvasOffsetLeft = jQuery("#canvasSection").offset().left;
-                 var canvasScrollLeft = jQuery("#canvasSection").scrollLeft();
-                 var canvasScrollTop = jQuery("#canvasSection").scrollTop();
-
-                 var offset = a.e - (canvasOffsetLeft * additionalIEZoom);
-                 var additionaloffset = 0;
-                 if (offset > 10) {
-                     additionaloffset = (offset / additionalIEZoom) - offset;
-                 }
-
-                 a.x = a.x - (corrSVG.e - (canvasOffsetLeft * additionalIEZoom) + additionaloffset + ((canvasScrollLeft * additionalIEZoom) - canvasScrollLeft));
-                 a.y = a.y - (corrSVG.f - (jQuery("#canvasSection").offset().top * additionalIEZoom) + ((canvasScrollTop * additionalIEZoom) - canvasScrollTop));
-                 b.x = b.x - (corrSVG.e - (canvasOffsetLeft * additionalIEZoom) + additionaloffset + ((canvasScrollLeft * additionalIEZoom) - canvasScrollLeft));
-                 b.y = b.y - (corrSVG.f - (jQuery("#canvasSection").offset().top * additionalIEZoom) + ((canvasScrollTop * additionalIEZoom) - canvasScrollTop));
-            }
+			if (additionalIEZoom === 1) {
+				a.x = a.x - (corrSVG.e - jQuery("#canvasSection").offset().left);
+				a.y = a.y - (corrSVG.f - jQuery("#canvasSection").offset().top);
+				b.x = b.x - (corrSVG.e - jQuery("#canvasSection").offset().left);
+				b.y = b.y - (corrSVG.f - jQuery("#canvasSection").offset().top);
+
+			} else {
+				var canvasOffsetLeft = jQuery("#canvasSection").offset().left;
+				var canvasScrollLeft = jQuery("#canvasSection").scrollLeft();
+				var canvasScrollTop = jQuery("#canvasSection").scrollTop();
+
+				var offset = a.e - (canvasOffsetLeft * additionalIEZoom);
+				var additionaloffset = 0;
+				if (offset > 10) {
+					additionaloffset = (offset / additionalIEZoom) - offset;
+				}
 
+				a.x = a.x - (corrSVG.e - (canvasOffsetLeft * additionalIEZoom) + additionaloffset + ((canvasScrollLeft * additionalIEZoom) - canvasScrollLeft));
+				a.y = a.y - (corrSVG.f - (jQuery("#canvasSection").offset().top * additionalIEZoom) + ((canvasScrollTop * additionalIEZoom) - canvasScrollTop));
+				b.x = b.x - (corrSVG.e - (canvasOffsetLeft * additionalIEZoom) + additionaloffset + ((canvasScrollLeft * additionalIEZoom) - canvasScrollLeft));
+				b.y = b.y - (corrSVG.f - (jQuery("#canvasSection").offset().top * additionalIEZoom) + ((canvasScrollTop * additionalIEZoom) - canvasScrollTop));
+			}
 
 
 			// Fit to SVG-Coordinates
-			a.x /= corrSVG.a; a.y /= corrSVG.d;
-			b.x /= corrSVG.a; b.y /= corrSVG.d;
+			a.x /= corrSVG.a;
+			a.y /= corrSVG.d;
+			b.x /= corrSVG.a;
+			b.y /= corrSVG.d;
 
 			// Calculate the elements from the childs of the canvas
-			var elements = this.facade.getCanvas().getChildShapes(true).findAll(function(value) {
+			var elements = this.facade.getCanvas().getChildShapes(true).findAll(function (value) {
 				var absBounds = value.absoluteBounds();
 
 				var bA = absBounds.upperLeft();
 				var bB = absBounds.lowerRight();
 
-				if(bA.x > a.x && bA.y > a.y && bB.x < b.x && bB.y < b.y)
+				if (bA.x > a.x && bA.y > a.y && bB.x < b.x && bB.y < b.y)
 					return true;
 				return false;
 			});
@@ -21880,16 +22539,16 @@ if(!ORYX.Plugins)
 		}
 	},
 
-	handleMouseMove: function(event) {
+	handleMouseMove: function (event) {
 		// Calculate the size
 		var size = {
-			width	: Event.pointerX(event) - this.position.x - jQuery("#canvasSection").offset().left,
-			height	: Event.pointerY(event) - this.position.y - jQuery("#canvasSection").offset().top + 5
+			width: Event.pointerX(event) - this.position.x - jQuery("#canvasSection").offset().left,
+			height: Event.pointerY(event) - this.position.y - jQuery("#canvasSection").offset().top + 5
 		};
 
-		var scrollNode 	= this.facade.getCanvas().rootNode.parentNode.parentNode;
-		size.width 		-= this.offsetScroll.x - scrollNode.scrollLeft;
-		size.height 	-= this.offsetScroll.y - scrollNode.scrollTop;
+		var scrollNode = this.facade.getCanvas().rootNode.parentNode.parentNode;
+		size.width -= this.offsetScroll.x - scrollNode.scrollLeft;
+		size.height -= this.offsetScroll.y - scrollNode.scrollTop;
 
 		// Set the size
 		this.resize(size);
@@ -21897,34 +22556,34 @@ if(!ORYX.Plugins)
 		Event.stop(event);
 	},
 
-	hide: function() {
+	hide: function () {
 		this.node.style.display = "none";
 	},
 
-	show: function() {
+	show: function () {
 		this.node.style.display = "";
 	},
 
-	setPos: function(pos) {
+	setPos: function (pos) {
 		// Set the Position
 		this.node.style.top = pos.y + "px";
 		this.node.style.left = pos.x + "px";
 		this.position = pos;
 	},
 
-	resize: function(size) {
+	resize: function (size) {
 
 		// Calculate the negative offset
 		this.setPos(this.position);
 		this.size = Object.clone(size);
 
-		if(size.width < 0) {
+		if (size.width < 0) {
 			this.node.style.left = (this.position.x + size.width) + "px";
-			size.width = - size.width;
+			size.width = -size.width;
 		}
-		if(size.height < 0) {
+		if (size.height < 0) {
 			this.node.style.top = (this.position.y + size.height) + "px";
-			size.height = - size.height;
+			size.height = -size.height;
 		}
 
 		// Set the size
@@ -21945,18 +22604,18 @@ if(!ORYX.Plugins)
  * All code Copyright 2013 KIS Consultancy all rights reserved
  */
 
-if(!ORYX.Plugins)
+if (!ORYX.Plugins)
 	ORYX.Plugins = new Object();
 
 ORYX.Plugins.ShapeHighlighting = Clazz.extend({
 
-	construct: function(facade) {
+	construct: function (facade) {
 
 		this.parentNode = facade.getCanvas().getSvgContainer();
 
 		// The parent Node
 		this.node = ORYX.Editor.graft("http://www.w3.org/2000/svg", this.parentNode,
-					['g']);
+			['g']);
 
 		this.highlightNodes = {};
 
@@ -21965,22 +22624,22 @@ ORYX.Plugins.ShapeHighlighting = Clazz.extend({
 
 	},
 
-	setHighlight: function(options) {
-		if(options && options.highlightId){
+	setHighlight: function (options) {
+		if (options && options.highlightId) {
 			var node = this.highlightNodes[options.highlightId];
 
-			if(!node){
-				node= ORYX.Editor.graft("http://www.w3.org/2000/svg", this.node,
+			if (!node) {
+				node = ORYX.Editor.graft("http://www.w3.org/2000/svg", this.node,
 					['path', {
-						"stroke-width": 2.0, "fill":"none"
-						}]);
+						"stroke-width": 2.0, "fill": "none"
+					}]);
 
 				this.highlightNodes[options.highlightId] = node;
 			}
 
-			if(options.elements && options.elements.length > 0) {
+			if (options.elements && options.elements.length > 0) {
 
-				this.setAttributesByStyle( node, options );
+				this.setAttributesByStyle(node, options);
 				this.show(node);
 
 			} else {
@@ -21992,65 +22651,65 @@ ORYX.Plugins.ShapeHighlighting = Clazz.extend({
 		}
 	},
 
-	hideHighlight: function(options) {
-		if(options && options.highlightId && this.highlightNodes[options.highlightId]){
+	hideHighlight: function (options) {
+		if (options && options.highlightId && this.highlightNodes[options.highlightId]) {
 			this.hide(this.highlightNodes[options.highlightId]);
 		}
 	},
 
-	hide: function(node) {
+	hide: function (node) {
 		node.setAttributeNS(null, 'display', 'none');
 	},
 
-	show: function(node) {
+	show: function (node) {
 		node.setAttributeNS(null, 'display', '');
 	},
 
-	setAttributesByStyle: function( node, options ){
+	setAttributesByStyle: function (node, options) {
 
 		// If the style say, that it should look like a rectangle
-		if( options.style && options.style == ORYX.CONFIG.SELECTION_HIGHLIGHT_STYLE_RECTANGLE ){
+		if (options.style && options.style == ORYX.CONFIG.SELECTION_HIGHLIGHT_STYLE_RECTANGLE) {
 
 			// Set like this
 			var bo = options.elements[0].absoluteBounds();
 
-			var strWidth = options.strokewidth ? options.strokewidth 	: ORYX.CONFIG.BORDER_OFFSET
+			var strWidth = options.strokewidth ? options.strokewidth : ORYX.CONFIG.BORDER_OFFSET
 
-			node.setAttributeNS(null, "d", this.getPathRectangle( bo.a, bo.b , strWidth ) );
-			node.setAttributeNS(null, "stroke", 		options.color 		? options.color 		: ORYX.CONFIG.SELECTION_HIGHLIGHT_COLOR);
-			node.setAttributeNS(null, "stroke-opacity", options.opacity 	? options.opacity 		: 0.2);
-			node.setAttributeNS(null, "stroke-width", 	strWidth);
+			node.setAttributeNS(null, "d", this.getPathRectangle(bo.a, bo.b, strWidth));
+			node.setAttributeNS(null, "stroke", options.color ? options.color : ORYX.CONFIG.SELECTION_HIGHLIGHT_COLOR);
+			node.setAttributeNS(null, "stroke-opacity", options.opacity ? options.opacity : 0.2);
+			node.setAttributeNS(null, "stroke-width", strWidth);
 
-		} else if(options.elements.length == 1
-					&& options.elements[0] instanceof ORYX.Core.Edge &&
-					options.highlightId != "selection") {
+		} else if (options.elements.length == 1
+			&& options.elements[0] instanceof ORYX.Core.Edge &&
+			options.highlightId != "selection") {
 
 			/* Highlight containment of edge's childs */
 			var path = this.getPathEdge(options.elements[0].dockers);
-			if (path && path.length > 0)
-			{
+			if (path && path.length > 0) {
 				node.setAttributeNS(null, "d", path);
 			}
 			node.setAttributeNS(null, "stroke", options.color ? options.color : ORYX.CONFIG.SELECTION_HIGHLIGHT_COLOR);
 			node.setAttributeNS(null, "stroke-opacity", options.opacity ? options.opacity : 0.2);
-			node.setAttributeNS(null, "stroke-width", 	ORYX.CONFIG.OFFSET_EDGE_BOUNDS);
+			node.setAttributeNS(null, "stroke-width", ORYX.CONFIG.OFFSET_EDGE_BOUNDS);
 
-		}else {
+		} else {
 			// If not, set just the corners
 			var path = this.getPathByElements(options.elements);
-			if (path && path.length > 0)
-			{
+			if (path && path.length > 0) {
 				node.setAttributeNS(null, "d", path);
 			}
 			node.setAttributeNS(null, "stroke", options.color ? options.color : ORYX.CONFIG.SELECTION_HIGHLIGHT_COLOR);
 			node.setAttributeNS(null, "stroke-opacity", options.opacity ? options.opacity : 1.0);
-			node.setAttributeNS(null, "stroke-width", 	options.strokewidth ? options.strokewidth 	: 2.0);
+			node.setAttributeNS(null, "stroke-width", options.strokewidth ? options.strokewidth : 2.0);
 
 		}
 	},
 
-	getPathByElements: function(elements){
-		if(!elements || elements.length <= 0) {return undefined}
+	getPathByElements: function (elements) {
+		if (!elements || elements.length <= 0) {
+			return undefined
+		}
 
 		// Get the padding and the size
 		var padding = ORYX.CONFIG.SELECTED_AREA_PADDING;
@@ -22058,15 +22717,17 @@ ORYX.Plugins.ShapeHighlighting = Clazz.extend({
 		var path = ""
 
 		// Get thru all Elements
-		elements.each((function(element) {
-			if(!element) {return}
+		elements.each((function (element) {
+			if (!element) {
+				return
+			}
 			// Get the absolute Bounds and the two Points
 			var bounds = element.absoluteBounds();
 			bounds.widen(padding)
 			var a = bounds.upperLeft();
 			var b = bounds.lowerRight();
 
-			path = path + this.getPath(a ,b);
+			path = path + this.getPath(a, b);
 
 		}).bind(this));
 
@@ -22074,13 +22735,13 @@ ORYX.Plugins.ShapeHighlighting = Clazz.extend({
 
 	},
 
-	getPath: function(a, b){
+	getPath: function (a, b) {
 
 		return this.getPathCorners(a, b);
 
 	},
 
-	getPathCorners: function(a, b){
+	getPathCorners: function (a, b) {
 
 		var size = ORYX.CONFIG.SELECTION_HIGHLIGHT_SIZE;
 
@@ -22098,12 +22759,12 @@ ORYX.Plugins.ShapeHighlighting = Clazz.extend({
 		return path;
 	},
 
-	getPathRectangle: function(a, b, strokeWidth){
+	getPathRectangle: function (a, b, strokeWidth) {
 
 		var size = ORYX.CONFIG.SELECTION_HIGHLIGHT_SIZE;
 
-		var path 	= ""
-		var offset 	= strokeWidth / 2.0;
+		var path = ""
+		var offset = strokeWidth / 2.0;
 
 		// Set: Upper left
 		path = path + "M" + (a.x + offset) + " " + (a.y);
@@ -22115,14 +22776,14 @@ ORYX.Plugins.ShapeHighlighting = Clazz.extend({
 		return path;
 	},
 
-	getPathEdge: function(edgeDockers) {
+	getPathEdge: function (edgeDockers) {
 		var length = edgeDockers.length;
 		var path = "M" + edgeDockers[0].bounds.center().x + " "
-					+  edgeDockers[0].bounds.center().y;
+			+ edgeDockers[0].bounds.center().y;
 
-		for(i=1; i<length; i++) {
+		for (i = 1; i < length; i++) {
 			var dockerPoint = edgeDockers[i].bounds.center();
-			path = path + " L" + dockerPoint.x + " " +  dockerPoint.y;
+			path = path + " L" + dockerPoint.x + " " + dockerPoint.y;
 		}
 
 		return path;
@@ -22133,7 +22794,7 @@ ORYX.Plugins.ShapeHighlighting = Clazz.extend({
 
 ORYX.Plugins.HighlightingSelectedShapes = Clazz.extend({
 
-	construct: function(facade) {
+	construct: function (facade) {
 		this.facade = facade;
 		this.opacityFull = 0.9;
 		this.opacityLow = 0.4;
@@ -22147,31 +22808,31 @@ ORYX.Plugins.HighlightingSelectedShapes = Clazz.extend({
 	 * On the Selection-Changed
 	 *
 	 */
-	onSelectionChanged: function(event) {
-		if(event.elements && event.elements.length > 1) {
+	onSelectionChanged: function (event) {
+		if (event.elements && event.elements.length > 1) {
 			this.facade.raiseEvent({
-										type:		ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW,
-										highlightId:'selection',
-										elements:	event.elements.without(event.subSelection),
-										color:		ORYX.CONFIG.SELECTION_HIGHLIGHT_COLOR,
-										opacity: 	!event.subSelection ? this.opacityFull : this.opacityLow
-									});
+				type: ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW,
+				highlightId: 'selection',
+				elements: event.elements.without(event.subSelection),
+				color: ORYX.CONFIG.SELECTION_HIGHLIGHT_COLOR,
+				opacity: !event.subSelection ? this.opacityFull : this.opacityLow
+			});
 
-			if(event.subSelection){
+			if (event.subSelection) {
 				this.facade.raiseEvent({
-											type:		ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW,
-											highlightId:'subselection',
-											elements:	[event.subSelection],
-											color:		ORYX.CONFIG.SELECTION_HIGHLIGHT_COLOR,
-											opacity: 	this.opacityFull
-										});
+					type: ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW,
+					highlightId: 'subselection',
+					elements: [event.subSelection],
+					color: ORYX.CONFIG.SELECTION_HIGHLIGHT_COLOR,
+					opacity: this.opacityFull
+				});
 			} else {
-				this.facade.raiseEvent({type:ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE, highlightId:'subselection'});
+				this.facade.raiseEvent({type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE, highlightId: 'subselection'});
 			}
 
 		} else {
-			this.facade.raiseEvent({type:ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE, highlightId:'selection'});
-			this.facade.raiseEvent({type:ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE, highlightId:'subselection'});
+			this.facade.raiseEvent({type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE, highlightId: 'selection'});
+			this.facade.raiseEvent({type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE, highlightId: 'subselection'});
 		}
 	}
 });/*
@@ -22185,17 +22846,17 @@ ORYX.Plugins.HighlightingSelectedShapes = Clazz.extend({
  */
 
 if (!ORYX.Plugins)
-    ORYX.Plugins = new Object();
+	ORYX.Plugins = new Object();
 
 ORYX.Plugins.Overlay = Clazz.extend({
 
-    facade: undefined,
+	facade: undefined,
 
 	styleNode: undefined,
 
-    construct: function(facade){
+	construct: function (facade) {
 
-        this.facade = facade;
+		this.facade = facade;
 
 		this.changes = [];
 
@@ -22205,28 +22866,28 @@ ORYX.Plugins.Overlay = Clazz.extend({
 		this.styleNode = document.createElement('style')
 		this.styleNode.setAttributeNS(null, 'type', 'text/css')
 
-		document.getElementsByTagName('head')[0].appendChild( this.styleNode )
+		document.getElementsByTagName('head')[0].appendChild(this.styleNode)
 
-    },
+	},
 
 	/**
 	 * Show the overlay for specific nodes
 	 * @param {Object} options
 	 *
-	 * 	String				options.id		- MUST - Define the id of the overlay (is needed for the hiding of this overlay)
-	 *	ORYX.Core.Shape[] 	options.shapes 	- MUST - Define the Shapes for the changes
-	 * 	attr-name:value		options.changes	- Defines all the changes which should be shown
+	 *    String                options.id        - MUST - Define the id of the overlay (is needed for the hiding of this overlay)
+	 *    ORYX.Core.Shape[]    options.shapes    - MUST - Define the Shapes for the changes
+	 *    attr-name:value        options.changes    - Defines all the changes which should be shown
 	 *
 	 *
 	 */
-	show: function( options ){
+	show: function (options) {
 
 		// Checks if all arguments are available
-		if( 	!options ||
-				!options.shapes || !options.shapes instanceof Array ||
-				!options.id	|| !options.id instanceof String || options.id.length == 0) {
+		if (!options ||
+			!options.shapes || !options.shapes instanceof Array ||
+			!options.id || !options.id instanceof String || options.id.length == 0) {
 
-					return
+			return
 
 		}
 
@@ -22236,15 +22897,17 @@ ORYX.Plugins.Overlay = Clazz.extend({
 
 
 		// Checked if attributes are setted
-		if( options.attributes ){
+		if (options.attributes) {
 
 			// FOR EACH - Shape
-			options.shapes.each(function(el){
+			options.shapes.each(function (el) {
 
 				// Checks if the node is a Shape
-				if( !el instanceof ORYX.Core.Shape){ return }
+				if (!el instanceof ORYX.Core.Shape) {
+					return
+				}
 
-				this.setAttributes( el.node , options.attributes )
+				this.setAttributes(el.node, options.attributes)
 
 			}.bind(this))
 
@@ -22253,24 +22916,27 @@ ORYX.Plugins.Overlay = Clazz.extend({
 		var isSVG = true
 		try {
 			isSVG = options.node && options.node instanceof SVGElement;
-		} catch(e){}
+		} catch (e) {
+		}
 
 		// Checks if node is setted and if this is an SVGElement
-		if ( options.node && isSVG) {
+		if (options.node && isSVG) {
 
 			options["_temps"] = []
 
 			// FOR EACH - Node
-			options.shapes.each(function(el, index){
+			options.shapes.each(function (el, index) {
 
 				// Checks if the node is a Shape
-				if( !el instanceof ORYX.Core.Shape){ return }
+				if (!el instanceof ORYX.Core.Shape) {
+					return
+				}
 
 				var _temp = {}
-				_temp.svg = options.dontCloneNode ? options.node : options.node.cloneNode( true );
+				_temp.svg = options.dontCloneNode ? options.node : options.node.cloneNode(true);
 
 				// Add the svg node to the ORYX-Shape
-				el.node.firstChild.appendChild( _temp.svg )
+				el.node.firstChild.appendChild(_temp.svg)
 
 				// If
 				if (el instanceof ORYX.Core.Edge && !options.nodePosition) {
@@ -22278,52 +22944,58 @@ ORYX.Plugins.Overlay = Clazz.extend({
 				}
 
 				// If the node position is setted, it has to be transformed
-				if( options.nodePosition ){
+				if (options.nodePosition) {
 
 					var b = el.bounds;
 					var p = options.nodePosition.toUpperCase();
 
 					// Check the values of START and END
-					if( el instanceof ORYX.Core.Node && p == "START"){
+					if (el instanceof ORYX.Core.Node && p == "START") {
 						p = "NW";
-					} else if(el instanceof ORYX.Core.Node && p == "END"){
+					} else if (el instanceof ORYX.Core.Node && p == "END") {
 						p = "SE";
-					} else if(el instanceof ORYX.Core.Edge && p == "START"){
+					} else if (el instanceof ORYX.Core.Edge && p == "START") {
 						b = el.getDockers().first().bounds
-					} else if(el instanceof ORYX.Core.Edge && p == "END"){
+					} else if (el instanceof ORYX.Core.Edge && p == "END") {
 						b = el.getDockers().last().bounds
 					}
 
 					// Create a callback for the changing the position
 					// depending on the position string
-					_temp.callback = function(){
+					_temp.callback = function () {
 
-						var x = 0; var y = 0;
+						var x = 0;
+						var y = 0;
 
-						if( p == "NW" ){
+						if (p == "NW") {
 							// Do Nothing
-						} else if( p == "N" ) {
+						} else if (p == "N") {
 							x = b.width() / 2;
-						} else if( p == "NE" ) {
+						} else if (p == "NE") {
+							x = b.width();
+						} else if (p == "E") {
+							x = b.width();
+							y = b.height() / 2;
+						} else if (p == "SE") {
 							x = b.width();
-						} else if( p == "E" ) {
-							x = b.width(); y = b.height() / 2;
-						} else if( p == "SE" ) {
-							x = b.width(); y = b.height();
-						} else if( p == "S" ) {
-							x = b.width() / 2; y = b.height();
-						} else if( p == "SW" ) {
 							y = b.height();
-						} else if( p == "W" ) {
+						} else if (p == "S") {
+							x = b.width() / 2;
+							y = b.height();
+						} else if (p == "SW") {
+							y = b.height();
+						} else if (p == "W") {
+							y = b.height() / 2;
+						} else if (p == "START" || p == "END") {
+							x = b.width() / 2;
 							y = b.height() / 2;
-						} else if( p == "START" || p == "END") {
-							x = b.width() / 2; y = b.height() / 2;
 						} else {
 							return
 						}
 
-						if( el instanceof ORYX.Core.Edge){
-							x  += b.upperLeft().x ; y  += b.upperLeft().y ;
+						if (el instanceof ORYX.Core.Edge) {
+							x += b.upperLeft().x;
+							y += b.upperLeft().y;
 						}
 
 						_temp.svg.setAttributeNS(null, "transform", "translate(" + x + ", " + y + ")")
@@ -22333,26 +23005,25 @@ ORYX.Plugins.Overlay = Clazz.extend({
 					_temp.element = el;
 					_temp.callback();
 
-					b.registerCallback( _temp.callback );
+					b.registerCallback(_temp.callback);
 
 				}
 
 
-				options._temps.push( _temp )
+				options._temps.push(_temp)
 
 			}.bind(this))
 
 
-
 		}
 
 
 		// Store the changes
-		if( !this.changes[options.id] ){
+		if (!this.changes[options.id]) {
 			this.changes[options.id] = [];
 		}
 
-		this.changes[options.id].push( options );
+		this.changes[options.id].push(options);
 
 	},
 
@@ -22360,44 +23031,46 @@ ORYX.Plugins.Overlay = Clazz.extend({
 	 * Hide the overlay with the spefic id
 	 * @param {Object} options
 	 */
-	hide: function( options ){
+	hide: function (options) {
 
 		// Checks if all arguments are available
-		if( 	!options ||
-				!options.id	|| !options.id instanceof String || options.id.length == 0 ||
-				!this.changes[options.id]) {
+		if (!options ||
+			!options.id || !options.id instanceof String || options.id.length == 0 ||
+			!this.changes[options.id]) {
 
-					return
+			return
 
 		}
 
 
 		// Delete all added attributes
 		// FOR EACH - Shape
-		this.changes[options.id].each(function(option){
+		this.changes[options.id].each(function (option) {
 
-			option.shapes.each(function(el, index){
+			option.shapes.each(function (el, index) {
 
 				// Checks if the node is a Shape
-				if( !el instanceof ORYX.Core.Shape){ return }
+				if (!el instanceof ORYX.Core.Shape) {
+					return
+				}
 
-				this.deleteAttributes( el.node )
+				this.deleteAttributes(el.node)
 
 			}.bind(this));
 
 
-			if( option._temps ){
+			if (option._temps) {
 
-				option._temps.each(function(tmp){
+				option._temps.each(function (tmp) {
 					// Delete the added Node, if there is one
-					if( tmp.svg && tmp.svg.parentNode ){
-						tmp.svg.parentNode.removeChild( tmp.svg )
+					if (tmp.svg && tmp.svg.parentNode) {
+						tmp.svg.parentNode.removeChild(tmp.svg)
 					}
 
 					// If
-					if( tmp.callback && tmp.element){
+					if (tmp.callback && tmp.element) {
 						// It has to be unregistered from the edge
-						tmp.element.bounds.unregisterCallback( tmp.callback )
+						tmp.element.bounds.unregisterCallback(tmp.callback)
 					}
 
 				}.bind(this))
@@ -22419,36 +23092,46 @@ ORYX.Plugins.Overlay = Clazz.extend({
 	 * @param {HTMLElement} node
 	 * @param {Object} attributes
 	 */
-	setAttributes: function( node, attributes ) {
+	setAttributes: function (node, attributes) {
 
 
 		// Get all the childs from ME
-		var childs = this.getAllChilds( node.firstChild.firstChild )
+		var childs = this.getAllChilds(node.firstChild.firstChild)
 
 		var ids = []
 
 		// Add all Attributes which have relation to another node in this document and concate the pure id out of it
 		// This is for example important for the markers of a edge
-		childs.each(function(e){ ids.push( $A(e.attributes).findAll(function(attr){ return attr.nodeValue.startsWith('url(#')}) )})
+		childs.each(function (e) {
+			ids.push($A(e.attributes).findAll(function (attr) {
+				return attr.nodeValue.startsWith('url(#')
+			}))
+		})
 		ids = ids.flatten().compact();
-		ids = ids.collect(function(s){return s.nodeValue}).uniq();
-		ids = ids.collect(function(s){return s.slice(5, s.length-1)})
+		ids = ids.collect(function (s) {
+			return s.nodeValue
+		}).uniq();
+		ids = ids.collect(function (s) {
+			return s.slice(5, s.length - 1)
+		})
 
 		// Add the node ID to the id
-		ids.unshift( node.id + ' .me')
-
-		var attr				= $H(attributes);
-        var attrValue			= attr.toJSON().gsub(',', ';').gsub('"', '');
-        var attrMarkerValue		= attributes.stroke ? attrValue.slice(0, attrValue.length-1) + "; fill:" + attributes.stroke + ";}" : attrValue;
-        var attrTextValue;
-        if( attributes.fill ){
-            var copyAttr        = Object.clone(attributes);
-        	copyAttr.fill		= "black";
-        	attrTextValue		= $H(copyAttr).toJSON().gsub(',', ';').gsub('"', '');
-        }
+		ids.unshift(node.id + ' .me')
+
+		var attr = $H(attributes);
+		var attrValue = attr.toJSON().gsub(',', ';').gsub('"', '');
+		var attrMarkerValue = attributes.stroke ? attrValue.slice(0, attrValue.length - 1) + "; fill:" + attributes.stroke + ";}" : attrValue;
+		var attrTextValue;
+		if (attributes.fill) {
+			var copyAttr = Object.clone(attributes);
+			copyAttr.fill = "black";
+			attrTextValue = $H(copyAttr).toJSON().gsub(',', ';').gsub('"', '');
+		}
 
-        // Create the CSS-Tags Style out of the ids and the attributes
-        csstags = ids.collect(function(s, i){return "#" + s + " * " + (!i? attrValue : attrMarkerValue) + "" + (attrTextValue ? " #" + s + " text * " + attrTextValue : "") })
+		// Create the CSS-Tags Style out of the ids and the attributes
+		csstags = ids.collect(function (s, i) {
+			return "#" + s + " * " + (!i ? attrValue : attrMarkerValue) + "" + (attrTextValue ? " #" + s + " text * " + attrTextValue : "")
+		})
 
 		// Join all the tags
 		var s = csstags.join(" ") + "\n"
@@ -22464,27 +23147,29 @@ ORYX.Plugins.Overlay = Clazz.extend({
 	 * added in a special style sheet for that node
 	 * @param {HTMLElement} node
 	 */
-	deleteAttributes: function( node ) {
+	deleteAttributes: function (node) {
 
 		// Get all children which contains the node id
 		var delEl = $A(this.styleNode.childNodes)
-					 .findAll(function(e){ return e.textContent.include( '#' + node.id ) });
+			.findAll(function (e) {
+				return e.textContent.include('#' + node.id)
+			});
 
 		// Remove all of them
-		delEl.each(function(el){
+		delEl.each(function (el) {
 			el.parentNode.removeChild(el);
 		});
 	},
 
-	getAllChilds: function( node ){
+	getAllChilds: function (node) {
 
 		var childs = $A(node.childNodes)
 
-		$A(node.childNodes).each(function( e ){
-		        childs.push( this.getAllChilds( e ) )
+		$A(node.childNodes).each(function (e) {
+			childs.push(this.getAllChilds(e))
 		}.bind(this))
 
-    	return childs.flatten();
+		return childs.flatten();
 	}
 
 
@@ -22500,147 +23185,147 @@ ORYX.Plugins.Overlay = Clazz.extend({
  */
 
 if (!ORYX.Plugins)
-    ORYX.Plugins = new Object();
+	ORYX.Plugins = new Object();
 
 ORYX.Plugins.KeysMove = ORYX.Plugins.AbstractPlugin.extend({
 
-    facade: undefined,
+	facade: undefined,
 
-    construct: function(facade){
+	construct: function (facade) {
 
-        this.facade = facade;
-        this.copyElements = [];
+		this.facade = facade;
+		this.copyElements = [];
 
-        //this.facade.registerOnEvent(ORYX.CONFIG.EVENT_KEYDOWN, this.keyHandler.bind(this));
+		//this.facade.registerOnEvent(ORYX.CONFIG.EVENT_KEYDOWN, this.keyHandler.bind(this));
 
 		// SELECT ALL
 		this.facade.offer({
-		keyCodes: [{
-		 		metaKeys: [ORYX.CONFIG.META_KEY_META_CTRL],
+			keyCodes: [{
+				metaKeys: [ORYX.CONFIG.META_KEY_META_CTRL],
 				keyCode: 65,
 				keyAction: ORYX.CONFIG.KEY_ACTION_DOWN
 			}
-		 ],
-         functionality: this.selectAll.bind(this)
-         });
+			],
+			functionality: this.selectAll.bind(this)
+		});
 
 		// MOVE LEFT SMALL
 		this.facade.offer({
-		keyCodes: [{
-		 		metaKeys: [ORYX.CONFIG.META_KEY_META_CTRL],
+			keyCodes: [{
+				metaKeys: [ORYX.CONFIG.META_KEY_META_CTRL],
 				keyCode: ORYX.CONFIG.KEY_CODE_LEFT,
 				keyAction: ORYX.CONFIG.KEY_ACTION_DOWN
 			}
-		 ],
-         functionality: this.move.bind(this, ORYX.CONFIG.KEY_CODE_LEFT, false)
-         });
+			],
+			functionality: this.move.bind(this, ORYX.CONFIG.KEY_CODE_LEFT, false)
+		});
 
-		 // MOVE LEFT
-		 this.facade.offer({
-		 keyCodes: [{
+		// MOVE LEFT
+		this.facade.offer({
+			keyCodes: [{
 				keyCode: ORYX.CONFIG.KEY_CODE_LEFT,
 				keyAction: ORYX.CONFIG.KEY_ACTION_DOWN
 			}
-		 ],
-         functionality: this.move.bind(this, ORYX.CONFIG.KEY_CODE_LEFT, true)
-         });
+			],
+			functionality: this.move.bind(this, ORYX.CONFIG.KEY_CODE_LEFT, true)
+		});
 
 		// MOVE RIGHT SMALL
-		 this.facade.offer({
-		 keyCodes: [{
-		 		metaKeys: [ORYX.CONFIG.META_KEY_META_CTRL],
+		this.facade.offer({
+			keyCodes: [{
+				metaKeys: [ORYX.CONFIG.META_KEY_META_CTRL],
 				keyCode: ORYX.CONFIG.KEY_CODE_RIGHT,
 				keyAction: ORYX.CONFIG.KEY_ACTION_DOWN
 			}
-		 ],
-         functionality: this.move.bind(this, ORYX.CONFIG.KEY_CODE_RIGHT, false)
-         });
+			],
+			functionality: this.move.bind(this, ORYX.CONFIG.KEY_CODE_RIGHT, false)
+		});
 
 		// MOVE RIGHT
-		 this.facade.offer({
-		 keyCodes: [{
+		this.facade.offer({
+			keyCodes: [{
 				keyCode: ORYX.CONFIG.KEY_CODE_RIGHT,
 				keyAction: ORYX.CONFIG.KEY_ACTION_DOWN
 			}
-		 ],
-         functionality: this.move.bind(this, ORYX.CONFIG.KEY_CODE_RIGHT, true)
-         });
+			],
+			functionality: this.move.bind(this, ORYX.CONFIG.KEY_CODE_RIGHT, true)
+		});
 
 		// MOVE UP SMALL
-		 this.facade.offer({
-		 keyCodes: [{
-		 		metaKeys: [ORYX.CONFIG.META_KEY_META_CTRL],
+		this.facade.offer({
+			keyCodes: [{
+				metaKeys: [ORYX.CONFIG.META_KEY_META_CTRL],
 				keyCode: ORYX.CONFIG.KEY_CODE_UP,
 				keyAction: ORYX.CONFIG.KEY_ACTION_DOWN
 			}
-		 ],
-         functionality: this.move.bind(this, ORYX.CONFIG.KEY_CODE_UP, false)
-         });
+			],
+			functionality: this.move.bind(this, ORYX.CONFIG.KEY_CODE_UP, false)
+		});
 
 		// MOVE UP
-		 this.facade.offer({
-		 keyCodes: [{
+		this.facade.offer({
+			keyCodes: [{
 				keyCode: ORYX.CONFIG.KEY_CODE_UP,
 				keyAction: ORYX.CONFIG.KEY_ACTION_DOWN
 			}
-		 ],
-         functionality: this.move.bind(this, ORYX.CONFIG.KEY_CODE_UP, true)
-         });
+			],
+			functionality: this.move.bind(this, ORYX.CONFIG.KEY_CODE_UP, true)
+		});
 
 		// MOVE DOWN SMALL
-		 this.facade.offer({
-		 keyCodes: [{
-		 		metaKeys: [ORYX.CONFIG.META_KEY_META_CTRL],
+		this.facade.offer({
+			keyCodes: [{
+				metaKeys: [ORYX.CONFIG.META_KEY_META_CTRL],
 				keyCode: ORYX.CONFIG.KEY_CODE_DOWN,
 				keyAction: ORYX.CONFIG.KEY_ACTION_DOWN
 			}
-		 ],
-         functionality: this.move.bind(this, ORYX.CONFIG.KEY_CODE_DOWN, false)
-         });
+			],
+			functionality: this.move.bind(this, ORYX.CONFIG.KEY_CODE_DOWN, false)
+		});
 
 		// MOVE DOWN
-		 this.facade.offer({
-		 keyCodes: [{
+		this.facade.offer({
+			keyCodes: [{
 				keyCode: ORYX.CONFIG.KEY_CODE_DOWN,
 				keyAction: ORYX.CONFIG.KEY_ACTION_DOWN
 			}
-		 ],
-         functionality: this.move.bind(this, ORYX.CONFIG.KEY_CODE_DOWN, true)
-         });
+			],
+			functionality: this.move.bind(this, ORYX.CONFIG.KEY_CODE_DOWN, true)
+		});
 
 
-    },
+	},
 
 	/**
 	 * Select all shapes in the editor
 	 *
 	 */
-	selectAll: function(e){
-    	Event.stop(e.event);
+	selectAll: function (e) {
+		Event.stop(e.event);
 		this.facade.setSelection(this.facade.getCanvas().getChildShapes(true))
 	},
 
-	move: function(key, far, e) {
+	move: function (key, far, e) {
 
-    	Event.stop(e.event);
+		Event.stop(e.event);
 
 		// calculate the distance to move the objects and get the selection.
-		var distance = far? 20 : 5;
+		var distance = far ? 20 : 5;
 		var selection = this.facade.getSelection();
 		var currentSelection = this.facade.getSelection();
 		var p = {x: 0, y: 0};
 
 		// switch on the key pressed and populate the point to move by.
-		switch(key) {
+		switch (key) {
 
 			case ORYX.CONFIG.KEY_CODE_LEFT:
-				p.x = -1*distance;
+				p.x = -1 * distance;
 				break;
 			case ORYX.CONFIG.KEY_CODE_RIGHT:
 				p.x = distance;
 				break;
 			case ORYX.CONFIG.KEY_CODE_UP:
-				p.y = -1*distance;
+				p.y = -1 * distance;
 				break;
 			case ORYX.CONFIG.KEY_CODE_DOWN:
 				p.y = distance;
@@ -22648,19 +23333,19 @@ ORYX.Plugins.KeysMove = ORYX.Plugins.AbstractPlugin.extend({
 		}
 
 		// move each shape in the selection by the point calculated and update it.
-		selection = selection.findAll(function(shape){
+		selection = selection.findAll(function (shape) {
 			// Check if this shape is docked to an shape in the selection
-			if(shape instanceof ORYX.Core.Node && shape.dockers.length == 1 && selection.include( shape.dockers.first().getDockedShape() )){
+			if (shape instanceof ORYX.Core.Node && shape.dockers.length == 1 && selection.include(shape.dockers.first().getDockedShape())) {
 				return false
 			}
 
 			// Check if any of the parent shape is included in the selection
 			var s = shape.parent;
-			do{
-				if(selection.include(s)){
+			do {
+				if (selection.include(s)) {
 					return false
 				}
-			}while(s = s.parent);
+			} while (s = s.parent);
 
 			// Otherwise, return true
 			return true;
@@ -22671,9 +23356,9 @@ ORYX.Plugins.KeysMove = ORYX.Plugins.AbstractPlugin.extend({
 		 * one of them is docked.
 		 */
 		var edgesMovable = true;
-		var onlyEdgesSelected = selection.all(function(shape) {
-			if(shape instanceof ORYX.Core.Edge) {
-				if(shape.isDocked()) {
+		var onlyEdgesSelected = selection.all(function (shape) {
+			if (shape instanceof ORYX.Core.Edge) {
+				if (shape.isDocked()) {
 					edgesMovable = false;
 				}
 				return true;
@@ -22681,28 +23366,28 @@ ORYX.Plugins.KeysMove = ORYX.Plugins.AbstractPlugin.extend({
 			return false;
 		});
 
-		if(onlyEdgesSelected && !edgesMovable) {
+		if (onlyEdgesSelected && !edgesMovable) {
 			/* Abort moving shapes */
 			return;
 		}
 
-		selection = selection.map(function(shape){
-			if( shape instanceof ORYX.Core.Node ){
+		selection = selection.map(function (shape) {
+			if (shape instanceof ORYX.Core.Node) {
 				/*if( shape.dockers.length == 1 ){
 					return shape.dockers.first()
 				} else {*/
-					return shape
+				return shape
 				//}
-			} else if( shape instanceof ORYX.Core.Edge ) {
+			} else if (shape instanceof ORYX.Core.Edge) {
 
 				var dockers = shape.dockers;
 
-				if( selection.include( shape.dockers.first().getDockedShape() ) ){
-					dockers = dockers.without( shape.dockers.first() )
+				if (selection.include(shape.dockers.first().getDockedShape())) {
+					dockers = dockers.without(shape.dockers.first())
 				}
 
-				if( selection.include( shape.dockers.last().getDockedShape() ) ){
-					dockers = dockers.without( shape.dockers.last() )
+				if (selection.include(shape.dockers.last().getDockedShape())) {
+					dockers = dockers.without(shape.dockers.last())
 				}
 
 				return dockers
@@ -22716,26 +23401,26 @@ ORYX.Plugins.KeysMove = ORYX.Plugins.AbstractPlugin.extend({
 		if (selection.size() > 0) {
 
 			//Stop moving at canvas borders
-			var selectionBounds = [ this.facade.getCanvas().bounds.lowerRight().x,
-			                        this.facade.getCanvas().bounds.lowerRight().y,
-			                        0,
-			                        0 ];
-			selection.each(function(s) {
+			var selectionBounds = [this.facade.getCanvas().bounds.lowerRight().x,
+				this.facade.getCanvas().bounds.lowerRight().y,
+				0,
+				0];
+			selection.each(function (s) {
 				selectionBounds[0] = Math.min(selectionBounds[0], s.bounds.upperLeft().x);
 				selectionBounds[1] = Math.min(selectionBounds[1], s.bounds.upperLeft().y);
 				selectionBounds[2] = Math.max(selectionBounds[2], s.bounds.lowerRight().x);
 				selectionBounds[3] = Math.max(selectionBounds[3], s.bounds.lowerRight().y);
 			});
-			if(selectionBounds[0]+p.x < 0)
+			if (selectionBounds[0] + p.x < 0)
 				p.x = -selectionBounds[0];
-			if(selectionBounds[1]+p.y < 0)
+			if (selectionBounds[1] + p.y < 0)
 				p.y = -selectionBounds[1];
-			if(selectionBounds[2]+p.x > this.facade.getCanvas().bounds.lowerRight().x)
+			if (selectionBounds[2] + p.x > this.facade.getCanvas().bounds.lowerRight().x)
 				p.x = this.facade.getCanvas().bounds.lowerRight().x - selectionBounds[2];
-			if(selectionBounds[3]+p.y > this.facade.getCanvas().bounds.lowerRight().y)
+			if (selectionBounds[3] + p.y > this.facade.getCanvas().bounds.lowerRight().y)
 				p.y = this.facade.getCanvas().bounds.lowerRight().y - selectionBounds[3];
 
-			if(p.x!=0 || p.y!=0) {
+			if (p.x != 0 || p.y != 0) {
 				// Instantiate the moveCommand
 				var commands = [new ORYX.Core.Command.Move(selection, p, null, currentSelection, this)];
 				// Execute the commands
@@ -22745,19 +23430,25 @@ ORYX.Plugins.KeysMove = ORYX.Plugins.AbstractPlugin.extend({
 		}
 	},
 
-	getUndockedCommant: function(shapes){
+	getUndockedCommant: function (shapes) {
 
 		var undockEdgeCommand = ORYX.Core.Command.extend({
-			construct: function(moveShapes){
-				this.dockers = moveShapes.collect(function(shape){ return shape instanceof ORYX.Core.Controls.Docker ? {docker:shape, dockedShape:shape.getDockedShape(), refPoint:shape.referencePoint} : undefined }).compact();
+			construct: function (moveShapes) {
+				this.dockers = moveShapes.collect(function (shape) {
+					return shape instanceof ORYX.Core.Controls.Docker ? {
+						docker: shape,
+						dockedShape: shape.getDockedShape(),
+						refPoint: shape.referencePoint
+					} : undefined
+				}).compact();
 			},
-			execute: function(){
-				this.dockers.each(function(el){
+			execute: function () {
+				this.dockers.each(function (el) {
 					el.docker.setDockedShape(undefined);
 				})
 			},
-			rollback: function(){
-				this.dockers.each(function(el){
+			rollback: function () {
+				this.dockers.each(function (el) {
 					el.docker.setDockedShape(el.dockedShape);
 					el.docker.setReferencePoint(el.refPoint);
 					//el.docker.update();
@@ -22765,7 +23456,7 @@ ORYX.Plugins.KeysMove = ORYX.Plugins.AbstractPlugin.extend({
 			}
 		});
 
-		command = new undockEdgeCommand( shapes );
+		command = new undockEdgeCommand(shapes);
 		command.execute();
 		return command;
 	},
@@ -22812,10 +23503,14 @@ ORYX.Plugins.KeysMove = ORYX.Plugins.AbstractPlugin.extend({
  * All code Copyright 2013 KIS Consultancy all rights reserved
  */
 
-if(!ORYX.Plugins) { ORYX.Plugins = {} }
-if(!ORYX.Plugins.Layouter) { ORYX.Plugins.Layouter = {} }
+if (!ORYX.Plugins) {
+	ORYX.Plugins = {}
+}
+if (!ORYX.Plugins.Layouter) {
+	ORYX.Plugins.Layouter = {}
+}
 
-new function(){
+new function () {
 
 	/**
 	 * Edge layouter is an implementation to layout an edge
@@ -22827,25 +23522,25 @@ new function(){
 		/**
 		 * Layout only Edges
 		 */
-		layouted : [	"http://b3mn.org/stencilset/bpmn1.1#SequenceFlow",
-						"http://b3mn.org/stencilset/bpmn1.1#MessageFlow",
-						"http://b3mn.org/stencilset/timjpdl3#SequenceFlow",
-						"http://b3mn.org/stencilset/jbpm4#SequenceFlow",
-						"http://b3mn.org/stencilset/bpmn2.0#MessageFlow",
-						"http://b3mn.org/stencilset/bpmn2.0#SequenceFlow",
-						"http://b3mn.org/stencilset/bpmn2.0choreography#MessageFlow",
-						"http://b3mn.org/stencilset/bpmn2.0choreography#SequenceFlow",
-						"http://b3mn.org/stencilset/bpmn2.0conversation#ConversationLink",
-						"http://b3mn.org/stencilset/epc#ControlFlow",
-						"http://www.signavio.com/stencilsets/processmap#ProcessLink",
-						"http://www.signavio.com/stencilsets/organigram#connection"],
+		layouted: ["http://b3mn.org/stencilset/bpmn1.1#SequenceFlow",
+			"http://b3mn.org/stencilset/bpmn1.1#MessageFlow",
+			"http://b3mn.org/stencilset/timjpdl3#SequenceFlow",
+			"http://b3mn.org/stencilset/jbpm4#SequenceFlow",
+			"http://b3mn.org/stencilset/bpmn2.0#MessageFlow",
+			"http://b3mn.org/stencilset/bpmn2.0#SequenceFlow",
+			"http://b3mn.org/stencilset/bpmn2.0choreography#MessageFlow",
+			"http://b3mn.org/stencilset/bpmn2.0choreography#SequenceFlow",
+			"http://b3mn.org/stencilset/bpmn2.0conversation#ConversationLink",
+			"http://b3mn.org/stencilset/epc#ControlFlow",
+			"http://www.signavio.com/stencilsets/processmap#ProcessLink",
+			"http://www.signavio.com/stencilsets/organigram#connection"],
 
 		/**
 		 * Layout a set on edges
 		 * @param {Object} edges
 		 */
-		layout: function(edges){
-			edges.each(function(edge){
+		layout: function (edges) {
+			edges.each(function (edge) {
 				this.doLayout(edge)
 			}.bind(this))
 		},
@@ -22854,17 +23549,19 @@ new function(){
 		 * Layout one edge
 		 * @param {Object} edge
 		 */
-		doLayout: function(edge){
+		doLayout: function (edge) {
 			// Get from and to node
-			var from 	= edge.getIncomingNodes()[0];
-			var to 		= edge.getOutgoingNodes()[0];
+			var from = edge.getIncomingNodes()[0];
+			var to = edge.getOutgoingNodes()[0];
 
 			// Return if one is null
-			if (!from || !to) { return }
+			if (!from || !to) {
+				return
+			}
 
 			var positions = this.getPositions(from, to, edge);
 
-			if (positions.length > 0){
+			if (positions.length > 0) {
 				this.setDockers(edge, positions[0].a, positions[0].b);
 			}
 
@@ -22877,7 +23574,7 @@ new function(){
 		 * @param {Object} to Shape where the edge is leading to
 		 * @param {Object} edge Edge between from and to
 		 */
-		getPositions : function(from, to, edge){
+		getPositions: function (from, to, edge) {
 
 			// Get absolute bounds
 			var ab = from.absoluteBounds();
@@ -22901,7 +23598,7 @@ new function(){
 			// or  |
 			//     V
 			// Do nothing
-			if (Math.abs(aFirst.x-aLast.x) < 1 || Math.abs(aFirst.y-aLast.y) < 1) {
+			if (Math.abs(aFirst.x - aLast.x) < 1 || Math.abs(aFirst.y - aLast.y) < 1) {
 				return []
 			}
 
@@ -22909,12 +23606,12 @@ new function(){
 			// depending on there weight
 			var m = {}
 			m.x = a.x < b.x ?
-					(((b.x - bb.width()/2) - (a.x + ab.width()/2))/2) + (a.x + ab.width()/2):
-					(((a.x - ab.width()/2) - (b.x + bb.width()/2))/2) + (b.x + bb.width()/2);
+				(((b.x - bb.width() / 2) - (a.x + ab.width() / 2)) / 2) + (a.x + ab.width() / 2) :
+				(((a.x - ab.width() / 2) - (b.x + bb.width() / 2)) / 2) + (b.x + bb.width() / 2);
 
 			m.y = a.y < b.y ?
-					(((b.y - bb.height()/2) - (a.y + ab.height()/2))/2) + (a.y + ab.height()/2):
-					(((a.y - ab.height()/2) - (b.y + bb.height()/2))/2) + (b.y + bb.height()/2);
+				(((b.y - bb.height() / 2) - (a.y + ab.height() / 2)) / 2) + (a.y + ab.height() / 2) :
+				(((a.y - ab.height() / 2) - (b.y + bb.height() / 2)) / 2) + (b.y + bb.height() / 2);
 
 
 			// Enlarge both bounds with 10
@@ -22927,30 +23624,30 @@ new function(){
 			// Checks ----+
 			//            |
 			//            V
-			if (!ab.isIncluded(b.x, a.y)&&!bb.isIncluded(b.x, a.y)) {
+			if (!ab.isIncluded(b.x, a.y) && !bb.isIncluded(b.x, a.y)) {
 				positions.push({
-					a : {x:b.x+off(last,bm,"x"),y:a.y+off(first,am,"y")},
-					z : this.getWeight(from, a.x < b.x ? "r" : "l", to, a.y < b.y ? "t" : "b", edge)
+					a: {x: b.x + off(last, bm, "x"), y: a.y + off(first, am, "y")},
+					z: this.getWeight(from, a.x < b.x ? "r" : "l", to, a.y < b.y ? "t" : "b", edge)
 				});
 			}
 
 			// Checks |
 			//        +--->
-			if (!ab.isIncluded(a.x, b.y)&&!bb.isIncluded(a.x, b.y)) {
+			if (!ab.isIncluded(a.x, b.y) && !bb.isIncluded(a.x, b.y)) {
 				positions.push({
-					a : {x:a.x+off(first,am,"x"),y:b.y+off(last,bm,"y")},
-					z : this.getWeight(from, a.y < b.y ? "b" : "t", to, a.x < b.x ? "l" : "r", edge)
+					a: {x: a.x + off(first, am, "x"), y: b.y + off(last, bm, "y")},
+					z: this.getWeight(from, a.y < b.y ? "b" : "t", to, a.x < b.x ? "l" : "r", edge)
 				});
 			}
 
 			// Checks  --+
 			//           |
 			//           +--->
-			if (!ab.isIncluded(m.x, a.y)&&!bb.isIncluded(m.x, b.y)) {
+			if (!ab.isIncluded(m.x, a.y) && !bb.isIncluded(m.x, b.y)) {
 				positions.push({
-					a : {x:m.x,y:a.y+off(first,am,"y")},
-					b : {x:m.x,y:b.y+off(last,bm,"y")},
-					z : this.getWeight(from, "r", to, "l", edge, a.x > b.x)
+					a: {x: m.x, y: a.y + off(first, am, "y")},
+					b: {x: m.x, y: b.y + off(last, bm, "y")},
+					z: this.getWeight(from, "r", to, "l", edge, a.x > b.x)
 				});
 			}
 
@@ -22958,16 +23655,18 @@ new function(){
 			//        +---+
 			//            |
 			//            V
-			if (!ab.isIncluded(a.x, m.y)&&!bb.isIncluded(b.x, m.y)) {
+			if (!ab.isIncluded(a.x, m.y) && !bb.isIncluded(b.x, m.y)) {
 				positions.push({
-					a : {x:a.x+off(first,am,"x"),y:m.y},
-					b : {x:b.x+off(last,bm,"x"),y:m.y},
-					z : this.getWeight(from, "b", to, "t", edge, a.y > b.y)
+					a: {x: a.x + off(first, am, "x"), y: m.y},
+					b: {x: b.x + off(last, bm, "x"), y: m.y},
+					z: this.getWeight(from, "b", to, "t", edge, a.y > b.y)
 				});
 			}
 
 			// Sort DESC of weights
-			return positions.sort(function(a,b){ return a.z < b.z ? 1 : (a.z == b.z ? -1 : -1)});
+			return positions.sort(function (a, b) {
+				return a.z < b.z ? 1 : (a.z == b.z ? -1 : -1)
+			});
 		},
 
 		/**
@@ -22977,7 +23676,7 @@ new function(){
 		 * @param {Object} pos2
 		 * @param {String} dir Direction x|y
 		 */
-		getOffset: function(pos, pos2, dir){
+		getOffset: function (pos, pos2, dir) {
 			return pos[dir] - pos2[dir];
 		},
 
@@ -22991,19 +23690,23 @@ new function(){
 		 * @param {Object} edge Edge between from and to
 		 * @param {Boolean} reverse Reverse the direction (e.g. "r" -> "l")
 		 */
-		getWeight: function(from, d1, to, d2, edge, reverse){
+		getWeight: function (from, d1, to, d2, edge, reverse) {
 
-			d1 = (d1||"").toLowerCase();
-			d2 = (d2||"").toLowerCase();
+			d1 = (d1 || "").toLowerCase();
+			d2 = (d2 || "").toLowerCase();
 
-			if (!["t","r","b","l"].include(d1)){ d1 = "r"}
-			if (!["t","r","b","l"].include(d2)){ d1 = "l"}
+			if (!["t", "r", "b", "l"].include(d1)) {
+				d1 = "r"
+			}
+			if (!["t", "r", "b", "l"].include(d2)) {
+				d1 = "l"
+			}
 
 			// If reverse is set
 			if (reverse) {
 				// Reverse d1 and d2
-				d1 = d1=="t"?"b":(d1=="r"?"l":(d1=="b"?"t":(d1=="l"?"r":"r")))
-				d2 = d2=="t"?"b":(d2=="r"?"l":(d2=="b"?"t":(d2=="l"?"r":"r")))
+				d1 = d1 == "t" ? "b" : (d1 == "r" ? "l" : (d1 == "b" ? "t" : (d1 == "l" ? "r" : "r")))
+				d2 = d2 == "t" ? "b" : (d2 == "r" ? "l" : (d2 == "b" ? "t" : (d2 == "l" ? "r" : "r")))
 			}
 
 
@@ -23022,38 +23725,47 @@ new function(){
 			 * @param {Object} center1
 			 * @param {Object} center2
 			 */
-			var sameDirection = function(direction, center1, center2){
-				switch(direction){
-					case "t": return Math.abs(center1.x - center2.x) < 2 && center1.y < center2.y
-					case "r": return center1.x > center2.x && Math.abs(center1.y - center2.y) < 2
-					case "b": return Math.abs(center1.x - center2.x) < 2 && center1.y > center2.y
-					case "l": return center1.x < center2.x && Math.abs(center1.y - center2.y) < 2
-					default: return false;
+			var sameDirection = function (direction, center1, center2) {
+				switch (direction) {
+					case "t":
+						return Math.abs(center1.x - center2.x) < 2 && center1.y < center2.y
+					case "r":
+						return center1.x > center2.x && Math.abs(center1.y - center2.y) < 2
+					case "b":
+						return Math.abs(center1.x - center2.x) < 2 && center1.y > center2.y
+					case "l":
+						return center1.x < center2.x && Math.abs(center1.y - center2.y) < 2
+					default:
+						return false;
 				}
 			}
 
 			// Check if there are same incoming edges from 'from'
 			var sameIncomingFrom = from
-								.getIncomingShapes()
-								.findAll(function(a){ return a instanceof ORYX.Core.Edge})
-								.any(function(e){
-									return sameDirection(d1, e.dockers[e.dockers.length-2].bounds.center(), e.dockers.last().bounds.center());
-								});
+				.getIncomingShapes()
+				.findAll(function (a) {
+					return a instanceof ORYX.Core.Edge
+				})
+				.any(function (e) {
+					return sameDirection(d1, e.dockers[e.dockers.length - 2].bounds.center(), e.dockers.last().bounds.center());
+				});
 
 			// Check if there are same outgoing edges from 'to'
 			var sameOutgoingTo = to
-								.getOutgoingShapes()
-								.findAll(function(a){ return a instanceof ORYX.Core.Edge})
-								.any(function(e){
-									return sameDirection(d2, e.dockers[1].bounds.center(), e.dockers.first().bounds.center());
-								});
+				.getOutgoingShapes()
+				.findAll(function (a) {
+					return a instanceof ORYX.Core.Edge
+				})
+				.any(function (e) {
+					return sameDirection(d2, e.dockers[1].bounds.center(), e.dockers.first().bounds.center());
+				});
 
 			// If there are equivalent edges, set 0
 			//fromWeight = sameIncomingFrom ? 0 : fromWeight;
 			//toWeight = sameOutgoingTo ? 0 : toWeight;
 
 			// Get the sum of "out" and the direction plus "in" and the direction
-			return (sameIncomingFrom||sameOutgoingTo?0:fromWeight+toWeight);
+			return (sameIncomingFrom || sameOutgoingTo ? 0 : fromWeight + toWeight);
 		},
 
 		/**
@@ -23064,24 +23776,26 @@ new function(){
 		 * @param {Object} a
 		 * @param {Object} b
 		 */
-		setDockers: function(edge, a, b){
-			if (!edge){ return }
+		setDockers: function (edge, a, b) {
+			if (!edge) {
+				return
+			}
 
 			// Remove all dockers (implicit,
 			// start and end dockers will not removed)
-			edge.dockers.each(function(r){
+			edge.dockers.each(function (r) {
 				edge.removeDocker(r);
 			});
 
 			// For a and b (if exists), create
 			// a new docker and set position
-			[a, b].compact().each(function(pos){
+			[a, b].compact().each(function (pos) {
 				var docker = edge.createDocker(undefined, pos);
 				docker.bounds.centerMoveTo(pos);
 			});
 
 			// Update all dockers from the edge
-			edge.dockers.each(function(docker){
+			edge.dockers.each(function (docker) {
 				docker.update()
 			})
 
@@ -23104,18 +23818,18 @@ new function(){
  * All code Copyright 2013 KIS Consultancy all rights reserved
  */
 
-if(!ORYX.Plugins)
+if (!ORYX.Plugins)
 	ORYX.Plugins = new Object();
 
-new function(){
+new function () {
 
 	ORYX.Plugins.BPMN2_0 = {
 
 		/**
-		 *	Constructor
-		 *	@param {Object} Facade: The Facade of the Editor
+		 *    Constructor
+		 *    @param {Object} Facade: The Facade of the Editor
 		 */
-		construct: function(facade){
+		construct: function (facade) {
 			this.facade = facade;
 
 			this.facade.registerOnEvent(ORYX.CONFIG.EVENT_DRAGDOCKER_DOCKED, this.handleDockerDocked.bind(this));
@@ -23131,161 +23845,172 @@ new function(){
 		},
 
 		/**
-         * Force to update every pool
-         */
-        afterLoad: function(){
-                this.facade.getCanvas().getChildNodes().each(function(shape){
-                        if (shape.getStencil().id().endsWith("Pool")) {
-                                this.handleLayoutPool({
-                                        shape: shape
-                                });
-                        }
-                }.bind(this))
-        },
+		 * Force to update every pool
+		 */
+		afterLoad: function () {
+			this.facade.getCanvas().getChildNodes().each(function (shape) {
+				if (shape.getStencil().id().endsWith("Pool")) {
+					this.handleLayoutPool({
+						shape: shape
+					});
+				}
+			}.bind(this))
+		},
 
-        /**
-         * If a pool is selected and contains no lane,
-         * a lane is created automagically
-         */
-        onSelectionChanged: function(event) {
-                var selection = event.elements;
-
-                if(selection && selection.length === 1) {
-                        var namespace = this.getNamespace();
-                        var shape = selection[0];
-                        if(shape.getStencil().idWithoutNs() === "Pool") {
-                                if(shape.getChildNodes().length === 0) {
-                                        // create a lane inside the selected pool
-                                        var option = {
-                                                        type:namespace + "Lane",
-                                                        position:{x:0,y:0},
-                                                        namespace:shape.getStencil().namespace(),
-                                                        parent:shape
-                                        };
-                                        this.facade.createShape(option);
-                                        this.facade.getCanvas().update();
-                                        this.facade.setSelection([shape]);
-                                }
-                        }
-                }
+		/**
+		 * If a pool is selected and contains no lane,
+		 * a lane is created automagically
+		 */
+		onSelectionChanged: function (event) {
+			var selection = event.elements;
+
+			if (selection && selection.length === 1) {
+				var namespace = this.getNamespace();
+				var shape = selection[0];
+				if (shape.getStencil().idWithoutNs() === "Pool") {
+					if (shape.getChildNodes().length === 0) {
+						// create a lane inside the selected pool
+						var option = {
+							type: namespace + "Lane",
+							position: {x: 0, y: 0},
+							namespace: shape.getStencil().namespace(),
+							parent: shape
+						};
+						this.facade.createShape(option);
+						this.facade.getCanvas().update();
+						this.facade.setSelection([shape]);
+					}
+				}
+			}
 
-                // Preventing selection of all lanes but not the pool
-                if(selection.any(function(s){ return s instanceof ORYX.Core.Node && s.getStencil().id().endsWith("Lane")})){
-                        var lanes = selection.findAll(function(s){
-                                return s instanceof ORYX.Core.Node && s.getStencil().id().endsWith("Lane")
-                        });
-
-                        var pools = [];
-                        var unselectLanes = [];
-                        lanes.each(function(lane){
-                                pools.push(this.getParentPool(lane))
-                        }.bind(this));
-
-                        pools = pools.uniq().findAll(function(pool){
-                                var childLanes = this.getLanes(pool, true);
-                                if (childLanes.all(function(lane){ return lanes.include(lane)})){
-                                        unselectLanes = unselectLanes.concat(childLanes);
-                                        return true;
-                                } else if (selection.include(pool) && childLanes.any(function(lane){ return lanes.include(lane)})) {
-                                        unselectLanes = unselectLanes.concat(childLanes);
-                                        return true;
-                                } else {
-                                        return false;
-                                }
-                        }.bind(this))
-
-                        if (unselectLanes.length > 0 && pools.length > 0){
-                                selection = selection.without.apply(selection, unselectLanes);
-                                selection = selection.concat(pools);
-                                this.facade.setSelection(selection.uniq());
-                        }
-                }
-        },
+			// Preventing selection of all lanes but not the pool
+			if (selection.any(function (s) {
+				return s instanceof ORYX.Core.Node && s.getStencil().id().endsWith("Lane")
+			})) {
+				var lanes = selection.findAll(function (s) {
+					return s instanceof ORYX.Core.Node && s.getStencil().id().endsWith("Lane")
+				});
 
-        handleShapeRemove: function(option) {
-
-                var sh                          = option.shape;
-                var parent                      = option.parent;
-
-                if (sh instanceof ORYX.Core.Node && sh.getStencil().idWithoutNs() === "Lane" && this.facade.isExecutingCommands()) {
-
-                        var pool = this.getParentPool(parent);
-                        if (pool&&pool.parent){
-
-                                var isLeafFn = function(leaf){
-                                        return !leaf.getChildNodes().any(function(r){ return r.getStencil().idWithoutNs() === "Lane"});
-                                }
-
-                                var isLeaf = isLeafFn(sh);
-                                var parentHasMoreLanes = parent.getChildNodes().any(function(r){ return r.getStencil().idWithoutNs() === "Lane"});
-
-                                if (isLeaf && parentHasMoreLanes){
-
-                                        var command = new ResizeLanesCommand(sh, parent, pool, this);
-                                        this.facade.executeCommands([command]);
-
-                                } else if(      !isLeaf &&
-                                                        !this.facade.getSelection().any(function(select){ // Find one of the selection, which is a lane and child of "sh" and is a leaf lane
-                                                                        return  select instanceof ORYX.Core.Node && select.getStencil().idWithoutNs() === "Lane" &&
-                                                                                        select.isParent(sh) && isLeafFn(select);})) {
-
-                                        var Command = ORYX.Core.Command.extend({
-                                                construct: function(shape, facade) {
-                                                        this.children = shape.getChildNodes(true);
-                                                        this.facade = facade;
-                                                },
-                                                execute: function() {
-                                                        this.children.each(function(child){
-                                                                child.bounds.moveBy(30,0)
-                                                        });
-                                                        //this.facade.getCanvas().update();
-                                                },
-                                                rollback: function() {
-                                                        this.children.each(function(child){
-                                                                child.bounds.moveBy(-30,0)
-                                                        })
-                                                        //this.facade.getCanvas().update();
-                                                }
-                                        });
-                                        this.facade.executeCommands([new Command(sh, this.facade)]);
+				var pools = [];
+				var unselectLanes = [];
+				lanes.each(function (lane) {
+					pools.push(this.getParentPool(lane))
+				}.bind(this));
 
-                                } else if (isLeaf&&!parentHasMoreLanes&&parent == pool){
-                                        parent.add(sh);
-                                }
-                        }
+				pools = pools.uniq().findAll(function (pool) {
+					var childLanes = this.getLanes(pool, true);
+					if (childLanes.all(function (lane) {
+						return lanes.include(lane)
+					})) {
+						unselectLanes = unselectLanes.concat(childLanes);
+						return true;
+					} else if (selection.include(pool) && childLanes.any(function (lane) {
+						return lanes.include(lane)
+					})) {
+						unselectLanes = unselectLanes.concat(childLanes);
+						return true;
+					} else {
+						return false;
+					}
+				}.bind(this))
 
-                }
+				if (unselectLanes.length > 0 && pools.length > 0) {
+					selection = selection.without.apply(selection, unselectLanes);
+					selection = selection.concat(pools);
+					this.facade.setSelection(selection.uniq());
+				}
+			}
+		},
 
-        },
+		handleShapeRemove: function (option) {
 
+			var sh = option.shape;
+			var parent = option.parent;
 
-		hashedSubProcesses: {},
+			if (sh instanceof ORYX.Core.Node && sh.getStencil().idWithoutNs() === "Lane" && this.facade.isExecutingCommands()) {
 
-		hashChildShapes: function(shape){
-			var children = shape.getChildNodes();
-			children.each(function(child){
-				if (this.hashedSubProcesses[child.id]){
-					this.hashedSubProcesses[child.id] = child.absoluteXY();
-					this.hashedSubProcesses[child.id].width 	= child.bounds.width();
-					this.hashedSubProcesses[child.id].height 	= child.bounds.height();
-					this.hashChildShapes(child);
-				}
-			}.bind(this));
-		},
+				var pool = this.getParentPool(parent);
+				if (pool && pool.parent) {
 
-		/**
-		 * Handle the layouting of a sub process.
-		 * Mainly to adjust the child dockers of a sub process.
+					var isLeafFn = function (leaf) {
+						return !leaf.getChildNodes().any(function (r) {
+							return r.getStencil().idWithoutNs() === "Lane"
+						});
+					}
+
+					var isLeaf = isLeafFn(sh);
+					var parentHasMoreLanes = parent.getChildNodes().any(function (r) {
+						return r.getStencil().idWithoutNs() === "Lane"
+					});
+
+					if (isLeaf && parentHasMoreLanes) {
+
+						var command = new ResizeLanesCommand(sh, parent, pool, this);
+						this.facade.executeCommands([command]);
+
+					} else if (!isLeaf &&
+						!this.facade.getSelection().any(function (select) { // Find one of the selection, which is a lane and child of "sh" and is a leaf lane
+							return select instanceof ORYX.Core.Node && select.getStencil().idWithoutNs() === "Lane" &&
+								select.isParent(sh) && isLeafFn(select);
+						})) {
+
+						var Command = ORYX.Core.Command.extend({
+							construct: function (shape, facade) {
+								this.children = shape.getChildNodes(true);
+								this.facade = facade;
+							},
+							execute: function () {
+								this.children.each(function (child) {
+									child.bounds.moveBy(30, 0)
+								});
+								//this.facade.getCanvas().update();
+							},
+							rollback: function () {
+								this.children.each(function (child) {
+									child.bounds.moveBy(-30, 0)
+								})
+								//this.facade.getCanvas().update();
+							}
+						});
+						this.facade.executeCommands([new Command(sh, this.facade)]);
+
+					} else if (isLeaf && !parentHasMoreLanes && parent == pool) {
+						parent.add(sh);
+					}
+				}
+
+			}
+
+		},
+
+
+		hashedSubProcesses: {},
+
+		hashChildShapes: function (shape) {
+			var children = shape.getChildNodes();
+			children.each(function (child) {
+				if (this.hashedSubProcesses[child.id]) {
+					this.hashedSubProcesses[child.id] = child.absoluteXY();
+					this.hashedSubProcesses[child.id].width = child.bounds.width();
+					this.hashedSubProcesses[child.id].height = child.bounds.height();
+					this.hashChildShapes(child);
+				}
+			}.bind(this));
+		},
+
+		/**
+		 * Handle the layouting of a sub process.
+		 * Mainly to adjust the child dockers of a sub process.
 		 *
 		 */
-		handleSubProcess : function(option) {
+		handleSubProcess: function (option) {
 
 			var sh = option.shape;
 
 			if (!this.hashedSubProcesses[sh.id]) {
 				this.hashedSubProcesses[sh.id] = sh.absoluteXY();
-				this.hashedSubProcesses[sh.id].width 	= sh.bounds.width();
-				this.hashedSubProcesses[sh.id].height 	= sh.bounds.height();
+				this.hashedSubProcesses[sh.id].width = sh.bounds.width();
+				this.hashedSubProcesses[sh.id].height = sh.bounds.height();
 				return;
 			}
 
@@ -23296,18 +24021,18 @@ new function(){
 			var resized = this.hashedSubProcesses[sh.id].width !== sh.bounds.width() || this.hashedSubProcesses[sh.id].height !== sh.bounds.height();
 
 			this.hashedSubProcesses[sh.id] = sh.absoluteXY();
-			this.hashedSubProcesses[sh.id].width 	= sh.bounds.width();
-			this.hashedSubProcesses[sh.id].height 	= sh.bounds.height();
+			this.hashedSubProcesses[sh.id].width = sh.bounds.width();
+			this.hashedSubProcesses[sh.id].height = sh.bounds.height();
 			this.hashChildShapes(sh);
 
 
 			// Move dockers only if currently is not resizing
-			if (this.facade.isExecutingCommands()&&!resized) {
+			if (this.facade.isExecutingCommands() && !resized) {
 				this.moveChildDockers(sh, offset);
 			}
 		},
 
-		moveChildDockers: function(shape, offset){
+		moveChildDockers: function (shape, offset) {
 
 			if (!offset.x && !offset.y) {
 				return;
@@ -23318,19 +24043,19 @@ new function(){
 			// Get all nodes
 			var dockers = children
 				// Get all incoming and outgoing edges
-				.map(function(node){
+				.map(function (node) {
 					return [].concat(node.getIncomingShapes())
-							.concat(node.getOutgoingShapes())
+						.concat(node.getOutgoingShapes())
 				})
 				// Flatten all including arrays into one
 				.flatten()
 				// Get every edge only once
 				.uniq()
 				// Get all dockers
-				.map(function(edge){
+				.map(function (edge) {
 					return edge.dockers.length > 2 ?
-							edge.dockers.slice(1, edge.dockers.length-1) :
-							[];
+						edge.dockers.slice(1, edge.dockers.length - 1) :
+						[];
 				})
 				// Flatten the dockers lists
 				.flatten();
@@ -23338,32 +24063,34 @@ new function(){
 			var abs = shape.absoluteBounds();
 			abs.moveBy(-offset.x, -offset.y)
 			var obj = {};
-			dockers.each(function(docker){
+			dockers.each(function (docker) {
 
-				if (docker.isChanged){
+				if (docker.isChanged) {
 					return;
 				}
 
 				var off = Object.clone(offset);
 
-				if (!abs.isIncluded(docker.bounds.center())){
-					var index 	= docker.parent.dockers.indexOf(docker);
-					var size	= docker.parent.dockers.length;
-					var from 	= docker.parent.getSource();
-					var to 		= docker.parent.getTarget();
+				if (!abs.isIncluded(docker.bounds.center())) {
+					var index = docker.parent.dockers.indexOf(docker);
+					var size = docker.parent.dockers.length;
+					var from = docker.parent.getSource();
+					var to = docker.parent.getTarget();
 
 					var bothAreIncluded = children.include(from) && children.include(to);
 
-					if (!bothAreIncluded){
-						var previousIsOver = index !== 0 ? abs.isIncluded(docker.parent.dockers[index-1].bounds.center()) : false;
-						var nextIsOver = index !== size-1 ? abs.isIncluded(docker.parent.dockers[index+1].bounds.center()) : false;
+					if (!bothAreIncluded) {
+						var previousIsOver = index !== 0 ? abs.isIncluded(docker.parent.dockers[index - 1].bounds.center()) : false;
+						var nextIsOver = index !== size - 1 ? abs.isIncluded(docker.parent.dockers[index + 1].bounds.center()) : false;
 
-						if (!previousIsOver && !nextIsOver){ return; }
+						if (!previousIsOver && !nextIsOver) {
+							return;
+						}
 
-						var ref = docker.parent.dockers[previousIsOver ? index-1 : index+1];
-						if (Math.abs(-Math.abs(ref.bounds.center().x-docker.bounds.center().x)) < 2){
+						var ref = docker.parent.dockers[previousIsOver ? index - 1 : index + 1];
+						if (Math.abs(-Math.abs(ref.bounds.center().x - docker.bounds.center().x)) < 2) {
 							off.y = 0;
-						} else if(Math.abs(-Math.abs(ref.bounds.center().y-docker.bounds.center().y)) < 2){
+						} else if (Math.abs(-Math.abs(ref.bounds.center().y - docker.bounds.center().y)) < 2) {
 							off.x = 0;
 						} else {
 							return;
@@ -23373,8 +24100,8 @@ new function(){
 				}
 
 				obj[docker.getId()] = {
-					docker:docker,
-					offset:off
+					docker: docker,
+					offset: off
 				}
 			})
 
@@ -23387,18 +24114,18 @@ new function(){
 		 * DragDocker.Docked Handler
 		 *
 		 */
-		handleDockerDocked: function(options) {
+		handleDockerDocked: function (options) {
 			var namespace = this.getNamespace();
 
 			var edge = options.parent;
 			var edgeSource = options.target;
 
-			if(edge.getStencil().id() === namespace + "SequenceFlow") {
-				var isGateway = edgeSource.getStencil().groups().find(function(group) {
-						if(group == "Gateways")
-							return group;
-					});
-				if(!isGateway && (edge.properties["oryx-conditiontype"] == "Expression"))
+			if (edge.getStencil().id() === namespace + "SequenceFlow") {
+				var isGateway = edgeSource.getStencil().groups().find(function (group) {
+					if (group == "Gateways")
+						return group;
+				});
+				if (!isGateway && (edge.properties["oryx-conditiontype"] == "Expression"))
 					// show diamond on edge source
 					edge.setProperty("oryx-showdiamondmarker", true);
 				else
@@ -23415,7 +24142,7 @@ new function(){
 		/**
 		 * PropertyWindow.PropertyChanged Handler
 		 */
-		handlePropertyChanged: function(option) {
+		handlePropertyChanged: function (option) {
 			var namespace = this.getNamespace();
 
 			var shapes = option.elements;
@@ -23423,30 +24150,30 @@ new function(){
 			var propertyValue = option.value;
 
 			var changed = false;
-			shapes.each(function(shape){
-				if((shape.getStencil().id() === namespace + "SequenceFlow") &&
+			shapes.each(function (shape) {
+				if ((shape.getStencil().id() === namespace + "SequenceFlow") &&
 					(propertyKey === "oryx-conditiontype")) {
 
-					if(propertyValue != "Expression")
+					if (propertyValue != "Expression")
 						// Do not show the Diamond
 						shape.setProperty("oryx-showdiamondmarker", false);
 					else {
 						var incomingShapes = shape.getIncomingShapes();
 
-						if(!incomingShapes) {
+						if (!incomingShapes) {
 							shape.setProperty("oryx-showdiamondmarker", true);
 						}
 
-						var incomingGateway = incomingShapes.find(function(aShape) {
-							var foundGateway = aShape.getStencil().groups().find(function(group) {
-								if(group == "Gateways")
+						var incomingGateway = incomingShapes.find(function (aShape) {
+							var foundGateway = aShape.getStencil().groups().find(function (group) {
+								if (group == "Gateways")
 									return group;
 							});
-							if(foundGateway)
+							if (foundGateway)
 								return foundGateway;
 						});
 
-						if(!incomingGateway)
+						if (!incomingGateway)
 							// show diamond on edge source
 							shape.setProperty("oryx-showdiamondmarker", true);
 						else
@@ -23458,487 +24185,503 @@ new function(){
 				}
 			}.bind(this));
 
-			if(changed) {this.facade.getCanvas().update();}
+			if (changed) {
+				this.facade.getCanvas().update();
+			}
 
 		},
 
-		hashedPoolPositions : {},
-		hashedLaneDepth : {},
-		hashedBounds : {},
+		hashedPoolPositions: {},
+		hashedLaneDepth: {},
+		hashedBounds: {},
 		hashedPositions: {},
 
 		/**
-         * Handler for layouting event 'layout.bpmn2_0.pool'
-         * @param {Object} event
-         */
-        handleLayoutPool: function(event){
+		 * Handler for layouting event 'layout.bpmn2_0.pool'
+		 * @param {Object} event
+		 */
+		handleLayoutPool: function (event) {
 
 
-                var pool = event.shape;
-                var selection = this.facade.getSelection();
-                var currentShape = selection.include(pool) ? pool : selection.first();
+			var pool = event.shape;
+			var selection = this.facade.getSelection();
+			var currentShape = selection.include(pool) ? pool : selection.first();
 
-                currentShape = currentShape || pool;
+			currentShape = currentShape || pool;
 
-                this.currentPool = pool;
+			this.currentPool = pool;
 
-                // Check if it is a pool or a lane
-                if (!(currentShape.getStencil().id().endsWith("Pool") || currentShape.getStencil().id().endsWith("Lane"))) {
-                        return;
-                }
+			// Check if it is a pool or a lane
+			if (!(currentShape.getStencil().id().endsWith("Pool") || currentShape.getStencil().id().endsWith("Lane"))) {
+				return;
+			}
 
-                // Check if the lane is within the pool and is not removed lately
-                if (currentShape !== pool && !currentShape.isParent(pool) && !this.hashedBounds[pool.id][currentShape.id]){
-                        return;
-                }
+			// Check if the lane is within the pool and is not removed lately
+			if (currentShape !== pool && !currentShape.isParent(pool) && !this.hashedBounds[pool.id][currentShape.id]) {
+				return;
+			}
 
 
-                if (!this.hashedBounds[pool.id]) {
-                        this.hashedBounds[pool.id] = {};
-                }
+			if (!this.hashedBounds[pool.id]) {
+				this.hashedBounds[pool.id] = {};
+			}
 
-                // Find all child lanes
-                var lanes = this.getLanes(pool);
+			// Find all child lanes
+			var lanes = this.getLanes(pool);
 
-                if (lanes.length <= 0) {
-                        return
-                }
+			if (lanes.length <= 0) {
+				return
+			}
 
-                var allLanes = this.getLanes(pool, true), hp;
-                var considerForDockers = allLanes.clone();
+			var allLanes = this.getLanes(pool, true), hp;
+			var considerForDockers = allLanes.clone();
 
-                var hashedPositions = $H({});
-                allLanes.each(function(lane){
-                        hashedPositions[lane.id] = lane.bounds.upperLeft();
-                })
+			var hashedPositions = $H({});
+			allLanes.each(function (lane) {
+				hashedPositions[lane.id] = lane.bounds.upperLeft();
+			})
 
 
+			// Show/hide caption regarding the number of lanes
+			if (lanes.length === 1 && this.getLanes(lanes.first()).length <= 0) {
+				// TRUE if there is a caption
+				lanes.first().setProperty("oryx-showcaption", lanes.first().properties["oryx-name"].trim().length > 0);
+				var rect = lanes.first().node.getElementsByTagName("rect");
+				rect[0].setAttributeNS(null, "display", "none");
+			} else {
+				allLanes.invoke("setProperty", "oryx-showcaption", true);
+				allLanes.each(function (lane) {
+					var rect = lane.node.getElementsByTagName("rect");
+					rect[0].removeAttributeNS(null, "display");
+				})
+			}
 
-                // Show/hide caption regarding the number of lanes
-                if (lanes.length === 1 && this.getLanes(lanes.first()).length <= 0) {
-                        // TRUE if there is a caption
-                        lanes.first().setProperty("oryx-showcaption", lanes.first().properties["oryx-name"].trim().length > 0);
-                        var rect = lanes.first().node.getElementsByTagName("rect");
-                        rect[0].setAttributeNS(null, "display", "none");
-                } else {
-                        allLanes.invoke("setProperty", "oryx-showcaption", true);
-                        allLanes.each(function(lane){
-                                var rect = lane.node.getElementsByTagName("rect");
-                                rect[0].removeAttributeNS(null, "display");
-                        })
-                }
+			var deletedLanes = [];
+			var addedLanes = [];
 
-                var deletedLanes = [];
-                var addedLanes = [];
+			// Get all new lanes
+			var i = -1;
+			while (++i < allLanes.length) {
+				if (!this.hashedBounds[pool.id][allLanes[i].id]) {
+					addedLanes.push(allLanes[i])
+				}
+			}
 
-                // Get all new lanes
-                var i=-1;
-                while (++i<allLanes.length) {
-                        if (!this.hashedBounds[pool.id][allLanes[i].id]){
-                                addedLanes.push(allLanes[i])
-                        }
-                }
+			if (addedLanes.length > 0) {
+				currentShape = addedLanes.first();
+			}
 
-                if (addedLanes.length > 0){
-                        currentShape = addedLanes.first();
-                }
 
+			// Get all deleted lanes
+			var resourceIds = $H(this.hashedBounds[pool.id]).keys();
+			var i = -1;
+			while (++i < resourceIds.length) {
+				if (!allLanes.any(function (lane) {
+					return lane.id == resourceIds[i]
+				})) {
+					deletedLanes.push(this.hashedBounds[pool.id][resourceIds[i]]);
+					selection = selection.without(function (r) {
+						return r.id == resourceIds[i]
+					});
+				}
+			}
 
-                // Get all deleted lanes
-                var resourceIds = $H(this.hashedBounds[pool.id]).keys();
-                var i=-1;
-                while (++i<resourceIds.length) {
-                        if (!allLanes.any(function(lane){ return lane.id == resourceIds[i]})){
-                                deletedLanes.push(this.hashedBounds[pool.id][resourceIds[i]]);
-                                selection = selection.without(function(r){ return r.id == resourceIds[i] });
-                        }
-                }
+			var height, width, x, y;
 
-                var height, width, x, y;
+			if (deletedLanes.length > 0 || addedLanes.length > 0) {
 
-                if (deletedLanes.length > 0 || addedLanes.length > 0) {
+				if (addedLanes.length === 1 && this.getLanes(addedLanes[0].parent).length === 1) {
+					// Set height from the pool
+					height = this.adjustHeight(lanes, addedLanes[0].parent);
+				} else {
+					// Set height from the pool
+					height = this.updateHeight(pool);
+				}
+				// Set width from the pool
+				width = this.adjustWidth(lanes, pool.bounds.width());
 
-                        if (addedLanes.length === 1 && this.getLanes(addedLanes[0].parent).length === 1){
-                                // Set height from the pool
-                                height = this.adjustHeight(lanes, addedLanes[0].parent);
-                        } else {
-                                // Set height from the pool
-                                height = this.updateHeight(pool);
-                        }
-                        // Set width from the pool
-                        width = this.adjustWidth(lanes, pool.bounds.width());
+				pool.update();
+			}
 
-                        pool.update();
-                }
+			/**
+			 * Set width/height depending on the pool
+			 */
+			else if (pool == currentShape) {
+
+				if (selection.length === 1 && this.isResized(pool, this.hashedPoolPositions[pool.id])) {
+					var oldXY = this.hashedPoolPositions[pool.id].upperLeft();
+					var xy = pool.bounds.upperLeft();
+					var scale = 0;
+					if (this.shouldScale(pool)) {
+						var old = this.hashedPoolPositions[pool.id];
+						scale = old.height() / pool.bounds.height();
+					}
 
-                /**
-                 * Set width/height depending on the pool
-                 */
-                else if (pool == currentShape) {
-
-                        if (selection.length === 1 && this.isResized(pool, this.hashedPoolPositions[pool.id])) {
-                                var oldXY = this.hashedPoolPositions[pool.id].upperLeft();
-                                var xy = pool.bounds.upperLeft();
-                                var scale = 0;
-                                if (this.shouldScale(pool)){
-                                        var old = this.hashedPoolPositions[pool.id];
-                                        scale = old.height()/pool.bounds.height();
-                                }
-
-                                this.adjustLanes(pool, allLanes, oldXY.x - xy.x, oldXY.y - xy.y, scale);
-                        }
+					this.adjustLanes(pool, allLanes, oldXY.x - xy.x, oldXY.y - xy.y, scale);
+				}
 
-                        // Set height from the pool
-                        height = this.adjustHeight(lanes, undefined, pool.bounds.height());
-                        // Set width from the pool
-                        width = this.adjustWidth(lanes, pool.bounds.width());
-                }
+				// Set height from the pool
+				height = this.adjustHeight(lanes, undefined, pool.bounds.height());
+				// Set width from the pool
+				width = this.adjustWidth(lanes, pool.bounds.width());
+			}
 
-                /**???
-                 * Set width/height depending on containing lanes
-                 */
-                else {
+			/**???
+			 * Set width/height depending on containing lanes
+			 */
+			else {
 
-                        // Reposition the pool if one shape is selected and the upperleft has changed
-                        if (selection.length === 1 && this.isResized(currentShape, this.hashedBounds[pool.id][currentShape.id])){
-                                var oldXY = this.hashedBounds[pool.id][currentShape.id].upperLeft();
-                                var xy = currentShape.absoluteXY();
-                                x = oldXY.x - xy.x;
-                                y = oldXY.y - xy.y;
-
-                                // Adjust all other lanes beneath this lane
-                                if (x||y){
-                                        considerForDockers = considerForDockers.without(currentShape);
-                                        this.adjustLanes(pool, this.getAllExcludedLanes(pool, currentShape), x, 0);
-                                }
-
-                                // Adjust all child lanes
-                                var childLanes = this.getLanes(currentShape, true);
-                                if (childLanes.length > 0){
-                                        if (this.shouldScale(currentShape)){
-                                                var old = this.hashedBounds[pool.id][currentShape.id];
-                                                var scale = old.height()/currentShape.bounds.height();
-                                                this.adjustLanes(pool, childLanes, x, y, scale);
-                                        } else {
-                                                this.adjustLanes(pool, childLanes, x, y, 0);
-                                        }
-                                }
-                        }
+				// Reposition the pool if one shape is selected and the upperleft has changed
+				if (selection.length === 1 && this.isResized(currentShape, this.hashedBounds[pool.id][currentShape.id])) {
+					var oldXY = this.hashedBounds[pool.id][currentShape.id].upperLeft();
+					var xy = currentShape.absoluteXY();
+					x = oldXY.x - xy.x;
+					y = oldXY.y - xy.y;
+
+					// Adjust all other lanes beneath this lane
+					if (x || y) {
+						considerForDockers = considerForDockers.without(currentShape);
+						this.adjustLanes(pool, this.getAllExcludedLanes(pool, currentShape), x, 0);
+					}
 
-                        // Cache all bounds
-                        var changes = allLanes.map(function(lane){ return {
-                                shape: lane,
-                                bounds: lane.bounds.clone()
-                        } });
+					// Adjust all child lanes
+					var childLanes = this.getLanes(currentShape, true);
+					if (childLanes.length > 0) {
+						if (this.shouldScale(currentShape)) {
+							var old = this.hashedBounds[pool.id][currentShape.id];
+							var scale = old.height() / currentShape.bounds.height();
+							this.adjustLanes(pool, childLanes, x, y, scale);
+						} else {
+							this.adjustLanes(pool, childLanes, x, y, 0);
+						}
+					}
+				}
 
-                        // Get height and adjust child heights
-                        height = this.adjustHeight(lanes, currentShape);
-                        // Check if something has changed and maybe create a command
-                        this.checkForChanges(allLanes, changes);
+				// Cache all bounds
+				var changes = allLanes.map(function (lane) {
+					return {
+						shape: lane,
+						bounds: lane.bounds.clone()
+					}
+				});
 
-                        // Set width from the current shape
-                        width = this.adjustWidth(lanes, currentShape.bounds.width()+(this.getDepth(currentShape,pool)*30));
-                }
+				// Get height and adjust child heights
+				height = this.adjustHeight(lanes, currentShape);
+				// Check if something has changed and maybe create a command
+				this.checkForChanges(allLanes, changes);
 
-                this.setDimensions(pool, width, height, x, y);
-
-
-                if (this.facade.isExecutingCommands() && (deletedLanes.length === 0 || addedLanes.length !== 0)){
-                        // Update all dockers
-                        this.updateDockers(considerForDockers, pool);
-
-                        // Check if the order has changed
-                        if (this.hashedPositions[pool.id] && this.hashedPositions[pool.id].keys().any(function(key, i){
-                                        return (allLanes[i]||{}).id     !== key;
-                                })){
-
-                                var LanesHasBeenReordered = ORYX.Core.Command.extend({
-                                        construct: function(originPosition, newPosition, lanes, plugin, poolId) {
-                                                this.originPosition = Object.clone(originPosition);
-                                                this.newPosition = Object.clone(newPosition);
-                                                this.lanes = lanes;
-                                                this.plugin = plugin;
-                                                this.pool = poolId;
-                                        },
-                                        execute: function(){
-                                                if (!this.executed){
-                                                        this.executed = true;
-                                                        this.lanes.each(function(lane){
-                                                                if (this.newPosition[lane.id])
-                                                                        lane.bounds.moveTo(this.newPosition[lane.id])
-                                                        }.bind(this));
-                                                        this.plugin.hashedPositions[this.pool] = Object.clone(this.newPosition);
-                                                }
-                                        },
-                                        rollback: function(){
-                                                this.lanes.each(function(lane){
-                                                        if (this.originPosition[lane.id])
-                                                                lane.bounds.moveTo(this.originPosition[lane.id])
-                                                }.bind(this));
-                                                this.plugin.hashedPositions[this.pool] = Object.clone(this.originPosition);
-                                        }
-                                });
-
-                                var hp2 = $H({});
-                                allLanes.each(function(lane){
-                                        hp2[lane.id] = lane.bounds.upperLeft();
-                                })
-
-                                var command = new LanesHasBeenReordered(hashedPositions, hp2, allLanes, this, pool.id);
-                                this.facade.executeCommands([command]);
+				// Set width from the current shape
+				width = this.adjustWidth(lanes, currentShape.bounds.width() + (this.getDepth(currentShape, pool) * 30));
+			}
 
-                        }
-                }
+			this.setDimensions(pool, width, height, x, y);
 
-                this.hashedBounds[pool.id] = {};
-                this.hashedPositions[pool.id] = hashedPositions;
 
-                var i=-1;
-                while (++i < allLanes.length) {
-                        // Cache positions
-                        this.hashedBounds[pool.id][allLanes[i].id] = allLanes[i].absoluteBounds();
+			if (this.facade.isExecutingCommands() && (deletedLanes.length === 0 || addedLanes.length !== 0)) {
+				// Update all dockers
+				this.updateDockers(considerForDockers, pool);
 
-                        // Cache also the bounds of child shapes, mainly for child subprocesses
-                        this.hashChildShapes(allLanes[i]);
+				// Check if the order has changed
+				if (this.hashedPositions[pool.id] && this.hashedPositions[pool.id].keys().any(function (key, i) {
+					return (allLanes[i] || {}).id !== key;
+				})) {
 
-                        this.hashedLaneDepth[allLanes[i].id] = this.getDepth(allLanes[i], pool);
+					var LanesHasBeenReordered = ORYX.Core.Command.extend({
+						construct: function (originPosition, newPosition, lanes, plugin, poolId) {
+							this.originPosition = Object.clone(originPosition);
+							this.newPosition = Object.clone(newPosition);
+							this.lanes = lanes;
+							this.plugin = plugin;
+							this.pool = poolId;
+						},
+						execute: function () {
+							if (!this.executed) {
+								this.executed = true;
+								this.lanes.each(function (lane) {
+									if (this.newPosition[lane.id])
+										lane.bounds.moveTo(this.newPosition[lane.id])
+								}.bind(this));
+								this.plugin.hashedPositions[this.pool] = Object.clone(this.newPosition);
+							}
+						},
+						rollback: function () {
+							this.lanes.each(function (lane) {
+								if (this.originPosition[lane.id])
+									lane.bounds.moveTo(this.originPosition[lane.id])
+							}.bind(this));
+							this.plugin.hashedPositions[this.pool] = Object.clone(this.originPosition);
+						}
+					});
 
-                        this.forceToUpdateLane(allLanes[i]);
-                }
+					var hp2 = $H({});
+					allLanes.each(function (lane) {
+						hp2[lane.id] = lane.bounds.upperLeft();
+					})
 
-                this.hashedPoolPositions[pool.id] = pool.bounds.clone();
+					var command = new LanesHasBeenReordered(hashedPositions, hp2, allLanes, this, pool.id);
+					this.facade.executeCommands([command]);
 
+				}
+			}
 
-                // Update selection
-                //this.facade.setSelection(selection);
-        },
+			this.hashedBounds[pool.id] = {};
+			this.hashedPositions[pool.id] = hashedPositions;
 
-        shouldScale: function(element){
-                var childLanes = element.getChildNodes().findAll(function(shape){ return shape.getStencil().id().endsWith("Lane") })
-                return childLanes.length > 1 || childLanes.any(function(lane){ return this.shouldScale(lane) }.bind(this))
-        },
+			var i = -1;
+			while (++i < allLanes.length) {
+				// Cache positions
+				this.hashedBounds[pool.id][allLanes[i].id] = allLanes[i].absoluteBounds();
 
-        /**
-         * Lookup if some bounds has changed
-         * @param {Object} lanes
-         * @param {Object} changes
-         */
-        checkForChanges: function(lanes, changes){
-                // Check if something has changed
-                if (this.facade.isExecutingCommands() && changes.any(function(change){
-                        return change.shape.bounds.toString() !== change.bounds.toString();
-                })){
-
-                        var Command = ORYX.Core.Command.extend({
-                                                construct: function(changes) {
-                                                        this.oldState = changes;
-                                                        this.newState = changes.map(function(s){ return {shape:s.shape, bounds:s.bounds.clone()}});
-                                                },
-                                                execute: function(){
-                                                        if (this.executed){
-                                                                this.applyState(this.newState);
-                                                        }
-                                                        this.executed = true;
-                                                },
-                                                rollback: function(){
-                                                        this.applyState(this.oldState);
-                                                },
-                                                applyState: function(state){
-                                                        state.each(function(s){
-                                                                s.shape.bounds.set(s.bounds.upperLeft(), s.bounds.lowerRight());
-                                                        })
-                                                }
-                                        });
+				// Cache also the bounds of child shapes, mainly for child subprocesses
+				this.hashChildShapes(allLanes[i]);
 
-                        this.facade.executeCommands([new Command(changes)]);
-                }
-        },
+				this.hashedLaneDepth[allLanes[i].id] = this.getDepth(allLanes[i], pool);
 
-        isResized: function(shape, bounds){
+				this.forceToUpdateLane(allLanes[i]);
+			}
 
-                if (!bounds||!shape){
-                        return false;
-                }
+			this.hashedPoolPositions[pool.id] = pool.bounds.clone();
 
-                var oldB = bounds;
-                //var oldXY = oldB.upperLeft();
-                //var xy = shape.absoluteXY();
-                return Math.round(oldB.width() - shape.bounds.width()) !== 0 || Math.round(oldB.height() - shape.bounds.height()) !== 0
-        },
 
-        adjustLanes: function(pool, lanes, x, y, scale){
+			// Update selection
+			//this.facade.setSelection(selection);
+		},
 
-                scale = scale || 0;
+		shouldScale: function (element) {
+			var childLanes = element.getChildNodes().findAll(function (shape) {
+				return shape.getStencil().id().endsWith("Lane")
+			})
+			return childLanes.length > 1 || childLanes.any(function (lane) {
+				return this.shouldScale(lane)
+			}.bind(this))
+		},
 
-                // For every lane, adjust the child nodes with the offset
-                lanes.each(function(l){
-                        l.getChildNodes().each(function(child){
-                                if (!child.getStencil().id().endsWith("Lane")){
-                                        var cy = scale ? child.bounds.center().y - (child.bounds.center().y/scale) : -y;
-                                        child.bounds.moveBy((x||0), -cy);
+		/**
+		 * Lookup if some bounds has changed
+		 * @param {Object} lanes
+		 * @param {Object} changes
+		 */
+		checkForChanges: function (lanes, changes) {
+			// Check if something has changed
+			if (this.facade.isExecutingCommands() && changes.any(function (change) {
+				return change.shape.bounds.toString() !== change.bounds.toString();
+			})) {
+
+				var Command = ORYX.Core.Command.extend({
+					construct: function (changes) {
+						this.oldState = changes;
+						this.newState = changes.map(function (s) {
+							return {shape: s.shape, bounds: s.bounds.clone()}
+						});
+					},
+					execute: function () {
+						if (this.executed) {
+							this.applyState(this.newState);
+						}
+						this.executed = true;
+					},
+					rollback: function () {
+						this.applyState(this.oldState);
+					},
+					applyState: function (state) {
+						state.each(function (s) {
+							s.shape.bounds.set(s.bounds.upperLeft(), s.bounds.lowerRight());
+						})
+					}
+				});
 
-                                        if (scale&&child.getStencil().id().endsWith("Subprocess")) {
-                                                this.moveChildDockers(child, {x:(0), y:-cy});
-                                        }
+				this.facade.executeCommands([new Command(changes)]);
+			}
+		},
 
-                                }
-                        }.bind(this));
-                        this.hashedBounds[pool.id][l.id].moveBy(-(x||0), !scale?-y:0);
-                        if (scale) {
-                                l.isScaled = true;
-                        }
-                }.bind(this))
+		isResized: function (shape, bounds) {
 
-        },
+			if (!bounds || !shape) {
+				return false;
+			}
 
-        getAllExcludedLanes: function(parent, lane){
-                var lanes = [];
-                parent.getChildNodes().each(function(shape){
-                        if ((!lane || shape !== lane) && shape.getStencil().id().endsWith("Lane")){
-                                lanes.push(shape);
-                                lanes = lanes.concat(this.getAllExcludedLanes(shape, lane));
-                        }
-                }.bind(this));
-                return lanes;
-        },
+			var oldB = bounds;
+			//var oldXY = oldB.upperLeft();
+			//var xy = shape.absoluteXY();
+			return Math.round(oldB.width() - shape.bounds.width()) !== 0 || Math.round(oldB.height() - shape.bounds.height()) !== 0
+		},
 
+		adjustLanes: function (pool, lanes, x, y, scale) {
 
-        forceToUpdateLane: function(lane){
+			scale = scale || 0;
 
-                if (lane.bounds.height() !== lane._svgShapes[0].height) {
-                        lane.isChanged = true;
-                        lane.isResized = true;
-                        lane._update();
-                }
-        },
+			// For every lane, adjust the child nodes with the offset
+			lanes.each(function (l) {
+				l.getChildNodes().each(function (child) {
+					if (!child.getStencil().id().endsWith("Lane")) {
+						var cy = scale ? child.bounds.center().y - (child.bounds.center().y / scale) : -y;
+						child.bounds.moveBy((x || 0), -cy);
 
-        getDepth: function(child, parent){
+						if (scale && child.getStencil().id().endsWith("Subprocess")) {
+							this.moveChildDockers(child, {x: (0), y: -cy});
+						}
 
-                var i=0;
-                while(child && child.parent && child !== parent){
-                        child = child.parent;
-                        ++i
-                }
-                return i;
-        },
+					}
+				}.bind(this));
+				this.hashedBounds[pool.id][l.id].moveBy(-(x || 0), !scale ? -y : 0);
+				if (scale) {
+					l.isScaled = true;
+				}
+			}.bind(this))
 
-        updateDepth: function(lane, fromDepth, toDepth){
+		},
 
-                var xOffset = (fromDepth - toDepth) * 30;
+		getAllExcludedLanes: function (parent, lane) {
+			var lanes = [];
+			parent.getChildNodes().each(function (shape) {
+				if ((!lane || shape !== lane) && shape.getStencil().id().endsWith("Lane")) {
+					lanes.push(shape);
+					lanes = lanes.concat(this.getAllExcludedLanes(shape, lane));
+				}
+			}.bind(this));
+			return lanes;
+		},
 
-                lane.getChildNodes().each(function(shape){
-                        shape.bounds.moveBy(xOffset, 0);
 
-                        [].concat(children[j].getIncomingShapes())
-                                        .concat(children[j].getOutgoingShapes())
+		forceToUpdateLane: function (lane) {
 
-                })
+			if (lane.bounds.height() !== lane._svgShapes[0].height) {
+				lane.isChanged = true;
+				lane.isResized = true;
+				lane._update();
+			}
+		},
 
-        },
+		getDepth: function (child, parent) {
 
-        setDimensions: function(shape, width, height, x, y){
-                var isLane = shape.getStencil().id().endsWith("Lane");
-                // Set the bounds
-                shape.bounds.set(
-                                isLane  ? 30 : (shape.bounds.a.x - (x || 0)),
-                                isLane  ? shape.bounds.a.y : (shape.bounds.a.y - (y || 0)),
-                                width   ? shape.bounds.a.x + width - (isLane?30:(x||0)) : shape.bounds.b.x,
-                                height  ? shape.bounds.a.y + height - (isLane?0:(y||0)) : shape.bounds.b.y
-                        );
-        },
+			var i = 0;
+			while (child && child.parent && child !== parent) {
+				child = child.parent;
+				++i
+			}
+			return i;
+		},
 
-        setLanePosition: function(shape, y){
+		updateDepth: function (lane, fromDepth, toDepth) {
 
-                shape.bounds.moveTo(30, y);
+			var xOffset = (fromDepth - toDepth) * 30;
 
-        },
+			lane.getChildNodes().each(function (shape) {
+				shape.bounds.moveBy(xOffset, 0);
 
-        adjustWidth: function(lanes, width) {
+				[].concat(children[j].getIncomingShapes())
+					.concat(children[j].getOutgoingShapes())
 
-                // Set width to each lane
-                (lanes||[]).each(function(lane){
-                        this.setDimensions(lane, width);
-                        this.adjustWidth(this.getLanes(lane), width-30);
-                }.bind(this));
+			})
 
-                return width;
-        },
+		},
 
+		setDimensions: function (shape, width, height, x, y) {
+			var isLane = shape.getStencil().id().endsWith("Lane");
+			// Set the bounds
+			shape.bounds.set(
+				isLane ? 30 : (shape.bounds.a.x - (x || 0)),
+				isLane ? shape.bounds.a.y : (shape.bounds.a.y - (y || 0)),
+				width ? shape.bounds.a.x + width - (isLane ? 30 : (x || 0)) : shape.bounds.b.x,
+				height ? shape.bounds.a.y + height - (isLane ? 0 : (y || 0)) : shape.bounds.b.y
+			);
+		},
 
-        adjustHeight: function(lanes, changedLane, propagateHeight){
+		setLanePosition: function (shape, y) {
 
-                var oldHeight = 0;
-                if (!changedLane && propagateHeight){
-                        var i=-1;
-                        while (++i<lanes.length){
-                                oldHeight += lanes[i].bounds.height();
-                        }
-                }
+			shape.bounds.moveTo(30, y);
 
-                var i=-1;
-                var height = 0;
-
-                // Iterate trough every lane
-                while (++i<lanes.length){
-
-                        if (lanes[i] === changedLane) {
-                                // Propagate new height down to the children
-                                this.adjustHeight(this.getLanes(lanes[i]), undefined, lanes[i].bounds.height());
-
-                                lanes[i].bounds.set({x:30, y:height}, {x:lanes[i].bounds.width()+30, y:lanes[i].bounds.height()+height})
-
-                        } else if (!changedLane && propagateHeight) {
-
-                                var tempHeight = (lanes[i].bounds.height() * propagateHeight) / oldHeight;
-                                // Propagate height
-                                this.adjustHeight(this.getLanes(lanes[i]), undefined, tempHeight);
-                                // Set height propotional to the propagated and old height
-                                this.setDimensions(lanes[i], null, tempHeight);
-                                this.setLanePosition(lanes[i], height);
-                        } else {
-                                // Get height from children
-                                var tempHeight = this.adjustHeight(this.getLanes(lanes[i]), changedLane, propagateHeight);
-                                if (!tempHeight) {
-                                        tempHeight = lanes[i].bounds.height();
-                                }
-                                this.setDimensions(lanes[i], null, tempHeight);
-                                this.setLanePosition(lanes[i], height);
-                        }
+		},
 
-                        height += lanes[i].bounds.height();
-                }
+		adjustWidth: function (lanes, width) {
 
-                return height;
+			// Set width to each lane
+			(lanes || []).each(function (lane) {
+				this.setDimensions(lane, width);
+				this.adjustWidth(this.getLanes(lane), width - 30);
+			}.bind(this));
 
-        },
+			return width;
+		},
 
 
-        updateHeight: function(root){
+		adjustHeight: function (lanes, changedLane, propagateHeight) {
 
-                var lanes = this.getLanes(root);
+			var oldHeight = 0;
+			if (!changedLane && propagateHeight) {
+				var i = -1;
+				while (++i < lanes.length) {
+					oldHeight += lanes[i].bounds.height();
+				}
+			}
 
-                if (lanes.length == 0){
-                        return root.bounds.height();
-                }
+			var i = -1;
+			var height = 0;
 
-                var height = 0;
-                var i=-1;
-                while (++i < lanes.length) {
-                        this.setLanePosition(lanes[i], height);
-                        height += this.updateHeight(lanes[i]);
-                }
+			// Iterate trough every lane
+			while (++i < lanes.length) {
 
-                this.setDimensions(root, null, height);
+				if (lanes[i] === changedLane) {
+					// Propagate new height down to the children
+					this.adjustHeight(this.getLanes(lanes[i]), undefined, lanes[i].bounds.height());
 
-                return height;
-        },
+					lanes[i].bounds.set({x: 30, y: height}, {
+						x: lanes[i].bounds.width() + 30,
+						y: lanes[i].bounds.height() + height
+					})
+
+				} else if (!changedLane && propagateHeight) {
+
+					var tempHeight = (lanes[i].bounds.height() * propagateHeight) / oldHeight;
+					// Propagate height
+					this.adjustHeight(this.getLanes(lanes[i]), undefined, tempHeight);
+					// Set height propotional to the propagated and old height
+					this.setDimensions(lanes[i], null, tempHeight);
+					this.setLanePosition(lanes[i], height);
+				} else {
+					// Get height from children
+					var tempHeight = this.adjustHeight(this.getLanes(lanes[i]), changedLane, propagateHeight);
+					if (!tempHeight) {
+						tempHeight = lanes[i].bounds.height();
+					}
+					this.setDimensions(lanes[i], null, tempHeight);
+					this.setLanePosition(lanes[i], height);
+				}
+
+				height += lanes[i].bounds.height();
+			}
+
+			return height;
 
-        getOffset: function(lane, includePool, pool){
+		},
+
+
+		updateHeight: function (root) {
+
+			var lanes = this.getLanes(root);
+
+			if (lanes.length == 0) {
+				return root.bounds.height();
+			}
+
+			var height = 0;
+			var i = -1;
+			while (++i < lanes.length) {
+				this.setLanePosition(lanes[i], height);
+				height += this.updateHeight(lanes[i]);
+			}
+
+			this.setDimensions(root, null, height);
+
+			return height;
+		},
 
-                var offset = {x:0,y:0};
+		getOffset: function (lane, includePool, pool) {
 
+			var offset = {x: 0, y: 0};
 
-                /*var parent = lane;
+
+			/*var parent = lane;
                  while(parent) {
 
 
@@ -23957,126 +24700,128 @@ new function(){
                         parent = parent.parent;
                 }       */
 
-                var offset = lane.absoluteXY();
+			var offset = lane.absoluteXY();
 
-                var hashed = this.hashedBounds[pool.id][lane.id] ||(includePool === true ? this.hashedPoolPositions[lane.id] : undefined);
-                if (hashed) {
-                        offset.x -= hashed.upperLeft().x;
-                        offset.y -= hashed.upperLeft().y;
-                } else {
-                        return {x:0,y:0}
-                }
-                return offset;
-        },
+			var hashed = this.hashedBounds[pool.id][lane.id] || (includePool === true ? this.hashedPoolPositions[lane.id] : undefined);
+			if (hashed) {
+				offset.x -= hashed.upperLeft().x;
+				offset.y -= hashed.upperLeft().y;
+			} else {
+				return {x: 0, y: 0}
+			}
+			return offset;
+		},
 
-        getNextLane: function(shape){
-                while(shape && !shape.getStencil().id().endsWith("Lane")){
-                        if (shape instanceof ORYX.Core.Canvas) {
-                                return null;
-                        }
-                        shape = shape.parent;
-                }
-                return shape;
-        },
+		getNextLane: function (shape) {
+			while (shape && !shape.getStencil().id().endsWith("Lane")) {
+				if (shape instanceof ORYX.Core.Canvas) {
+					return null;
+				}
+				shape = shape.parent;
+			}
+			return shape;
+		},
 
-        getParentPool: function(shape){
-                while(shape && !shape.getStencil().id().endsWith("Pool")){
-                        if (shape instanceof ORYX.Core.Canvas) {
-                                return null;
-                        }
-                        shape = shape.parent;
-                }
-                return shape;
-        },
+		getParentPool: function (shape) {
+			while (shape && !shape.getStencil().id().endsWith("Pool")) {
+				if (shape instanceof ORYX.Core.Canvas) {
+					return null;
+				}
+				shape = shape.parent;
+			}
+			return shape;
+		},
 
-        updateDockers: function(lanes, pool){
+		updateDockers: function (lanes, pool) {
 
-                var absPool = pool.absoluteBounds(), movedShapes = [];
-                var oldPool = (this.hashedPoolPositions[pool.id]||absPool).clone();
+			var absPool = pool.absoluteBounds(), movedShapes = [];
+			var oldPool = (this.hashedPoolPositions[pool.id] || absPool).clone();
 
-                var i=-1, j=-1, k=-1, l=-1, docker;
-                var dockers = {};
+			var i = -1, j = -1, k = -1, l = -1, docker;
+			var dockers = {};
 
-                while (++i < lanes.length) {
+			while (++i < lanes.length) {
 
-                        if (!this.hashedBounds[pool.id][lanes[i].id]) {
-                                continue;
-                        }
+				if (!this.hashedBounds[pool.id][lanes[i].id]) {
+					continue;
+				}
 
-                        var isScaled = lanes[i].isScaled;
-                        delete lanes[i].isScaled;
-                        var children = lanes[i].getChildNodes();
-                        var absBounds = lanes[i].absoluteBounds();
-                        var oldBounds = (this.hashedBounds[pool.id][lanes[i].id]||absBounds);
-                        //oldBounds.moveBy((absBounds.upperLeft().x-lanes[i].bounds.upperLeft().x), (absBounds.upperLeft().y-lanes[i].bounds.upperLeft().y));
-                        var offset = this.getOffset(lanes[i], true, pool);
-                        var xOffsetDepth = 0;
-
-                        var depth = this.getDepth(lanes[i], pool);
-                        if ( this.hashedLaneDepth[lanes[i].id] !== undefined &&  this.hashedLaneDepth[lanes[i].id] !== depth) {
-                                xOffsetDepth = (this.hashedLaneDepth[lanes[i].id] - depth) * 30;
-                                offset.x += xOffsetDepth;
-                        }
+				var isScaled = lanes[i].isScaled;
+				delete lanes[i].isScaled;
+				var children = lanes[i].getChildNodes();
+				var absBounds = lanes[i].absoluteBounds();
+				var oldBounds = (this.hashedBounds[pool.id][lanes[i].id] || absBounds);
+				//oldBounds.moveBy((absBounds.upperLeft().x-lanes[i].bounds.upperLeft().x), (absBounds.upperLeft().y-lanes[i].bounds.upperLeft().y));
+				var offset = this.getOffset(lanes[i], true, pool);
+				var xOffsetDepth = 0;
+
+				var depth = this.getDepth(lanes[i], pool);
+				if (this.hashedLaneDepth[lanes[i].id] !== undefined && this.hashedLaneDepth[lanes[i].id] !== depth) {
+					xOffsetDepth = (this.hashedLaneDepth[lanes[i].id] - depth) * 30;
+					offset.x += xOffsetDepth;
+				}
 
-                        j=-1;
+				j = -1;
 
-                        while (++j < children.length) {
+				while (++j < children.length) {
 
-                                if (xOffsetDepth && !children[j].getStencil().id().endsWith("Lane")) {
-                                        movedShapes.push({xOffset:xOffsetDepth, shape: children[j]});
-                                        children[j].bounds.moveBy(xOffsetDepth, 0);
-                                }
+					if (xOffsetDepth && !children[j].getStencil().id().endsWith("Lane")) {
+						movedShapes.push({xOffset: xOffsetDepth, shape: children[j]});
+						children[j].bounds.moveBy(xOffsetDepth, 0);
+					}
 
-                                if (children[j].getStencil().id().endsWith("Subprocess")) {
-                                        this.moveChildDockers(children[j], offset);
-                                }
+					if (children[j].getStencil().id().endsWith("Subprocess")) {
+						this.moveChildDockers(children[j], offset);
+					}
 
-                                var edges = [].concat(children[j].getIncomingShapes())
-                                        .concat(children[j].getOutgoingShapes())
-                                        // Remove all edges which are included in the selection from the list
-                                        .findAll(function(r){ return r instanceof ORYX.Core.Edge })
+					var edges = [].concat(children[j].getIncomingShapes())
+						.concat(children[j].getOutgoingShapes())
+						// Remove all edges which are included in the selection from the list
+						.findAll(function (r) {
+							return r instanceof ORYX.Core.Edge
+						})
 
-                                k=-1;
-                                while (++k < edges.length) {
+					k = -1;
+					while (++k < edges.length) {
 
-                                        if (edges[k].getStencil().id().endsWith("MessageFlow")) {
-                                                this.layoutEdges(children[j], [edges[k]], offset);
-                                                continue;
-                                        }
+						if (edges[k].getStencil().id().endsWith("MessageFlow")) {
+							this.layoutEdges(children[j], [edges[k]], offset);
+							continue;
+						}
 
-                                        l=-1;
-                                        while (++l < edges[k].dockers.length) {
+						l = -1;
+						while (++l < edges[k].dockers.length) {
 
-                                                docker = edges[k].dockers[l];
+							docker = edges[k].dockers[l];
 
-                                                if (docker.getDockedShape()||docker.isChanged){
-                                                        continue;
-                                                }
+							if (docker.getDockedShape() || docker.isChanged) {
+								continue;
+							}
 
 
-                                                pos = docker.bounds.center();
+							pos = docker.bounds.center();
 
-                                                // Check if the modified center included the new position
-                                                var isOverLane = oldBounds.isIncluded(pos);
-                                                // Check if the original center is over the pool
-                                                var isOutSidePool = !oldPool.isIncluded(pos);
-                                                var previousIsOverLane = l == 0 ? isOverLane : oldBounds.isIncluded(edges[k].dockers[l-1].bounds.center());
-                                                var nextIsOverLane = l == edges[k].dockers.length-1 ? isOverLane : oldBounds.isIncluded(edges[k].dockers[l+1].bounds.center());
-                                                var off = Object.clone(offset);
+							// Check if the modified center included the new position
+							var isOverLane = oldBounds.isIncluded(pos);
+							// Check if the original center is over the pool
+							var isOutSidePool = !oldPool.isIncluded(pos);
+							var previousIsOverLane = l == 0 ? isOverLane : oldBounds.isIncluded(edges[k].dockers[l - 1].bounds.center());
+							var nextIsOverLane = l == edges[k].dockers.length - 1 ? isOverLane : oldBounds.isIncluded(edges[k].dockers[l + 1].bounds.center());
+							var off = Object.clone(offset);
 
-                                                // If the
-                                                if (isScaled && isOverLane && this.isResized(lanes[i], this.hashedBounds[pool.id][lanes[i].id])){
-                                                        var relY = (pos.y - absBounds.upperLeft().y + off.y);
-                                                        off.y -= (relY - (relY * (absBounds.height()/oldBounds.height())));
-                                                }
+							// If the
+							if (isScaled && isOverLane && this.isResized(lanes[i], this.hashedBounds[pool.id][lanes[i].id])) {
+								var relY = (pos.y - absBounds.upperLeft().y + off.y);
+								off.y -= (relY - (relY * (absBounds.height() / oldBounds.height())));
+							}
 
-                                                // Check if the previous dockers docked shape is from this lane
-                                                // Otherwise, check if the docker is over the lane OR is outside the lane
-                                                // but the previous/next was over this lane
-                                                if (isOverLane){
-                                                        dockers[docker.id] = {docker: docker, offset:off};
-                                                }
-                                                /*else if (l == 1 && edges[k].dockers.length>2 && edges[k].dockers[l-1].isDocked()){
+							// Check if the previous dockers docked shape is from this lane
+							// Otherwise, check if the docker is over the lane OR is outside the lane
+							// but the previous/next was over this lane
+							if (isOverLane) {
+								dockers[docker.id] = {docker: docker, offset: off};
+							}
+							/*else if (l == 1 && edges[k].dockers.length>2 && edges[k].dockers[l-1].isDocked()){
                                                         var dockedLane = this.getNextLane(edges[k].dockers[l-1].getDockedShape());
                                                         if (dockedLane != lanes[i])
                                                                 continue;
@@ -24095,416 +24840,421 @@ new function(){
                                                 }*/
 
 
-                                        }
-                                }
+						}
+					}
 
-                        }
-                }
+				}
+			}
 
-                // Move the moved children
-                var MoveChildCommand = ORYX.Core.Command.extend({
-                        construct: function(state){
-                                this.state = state;
-                        },
-                        execute: function(){
-                                if (this.executed){
-                                        this.state.each(function(s){
-                                                s.shape.bounds.moveBy(s.xOffset, 0);
-                                        });
-                                }
-                                this.executed = true;
-                        },
-                        rollback: function(){
-                                this.state.each(function(s){
-                                        s.shape.bounds.moveBy(-s.xOffset, 0);
-                                });
-                        }
-                })
+			// Move the moved children
+			var MoveChildCommand = ORYX.Core.Command.extend({
+				construct: function (state) {
+					this.state = state;
+				},
+				execute: function () {
+					if (this.executed) {
+						this.state.each(function (s) {
+							s.shape.bounds.moveBy(s.xOffset, 0);
+						});
+					}
+					this.executed = true;
+				},
+				rollback: function () {
+					this.state.each(function (s) {
+						s.shape.bounds.moveBy(-s.xOffset, 0);
+					});
+				}
+			})
 
 
-                // Set dockers
-                this.facade.executeCommands([new ORYX.Core.MoveDockersCommand(dockers), new MoveChildCommand(movedShapes)]);
+			// Set dockers
+			this.facade.executeCommands([new ORYX.Core.MoveDockersCommand(dockers), new MoveChildCommand(movedShapes)]);
 
-        },
+		},
 
-        moveBy: function(pos, offset){
-                pos.x += offset.x;
-                pos.y += offset.y;
-                return pos;
-        },
+		moveBy: function (pos, offset) {
+			pos.x += offset.x;
+			pos.y += offset.y;
+			return pos;
+		},
 
-        getHashedBounds: function(shape){
-                return this.currentPool && this.hashedBounds[this.currentPool.id][shape.id] ? this.hashedBounds[this.currentPool.id][shape.id] : shape.absoluteBounds();
-        },
+		getHashedBounds: function (shape) {
+			return this.currentPool && this.hashedBounds[this.currentPool.id][shape.id] ? this.hashedBounds[this.currentPool.id][shape.id] : shape.absoluteBounds();
+		},
 
-        /**
-         * Returns a set on all child lanes for the given Shape. If recursive is TRUE, also indirect children will be returned (default is FALSE)
-         * The set is sorted with first child the lowest y-coordinate and the last one the highest.
-         * @param {ORYX.Core.Shape} shape
-         * @param {boolean} recursive
-         */
-        getLanes: function(shape, recursive){
-                var namespace = this.getNamespace();
-
-                // Get all the child lanes
-                var lanes = shape.getChildNodes(recursive||false).findAll(function(node) { return (node.getStencil().id() === namespace + "Lane"); });
-
-                // Sort all lanes by there y coordinate
-                lanes = lanes.sort(function(a, b){
-
-                                        // Get y coordinates for upper left and lower right
-                                        var auy = Math.round(a.bounds.upperLeft().y);
-                                        var buy = Math.round(b.bounds.upperLeft().y);
-                                        var aly = Math.round(a.bounds.lowerRight().y);
-                                        var bly = Math.round(b.bounds.lowerRight().y);
-
-                                        var ha  = this.getHashedBounds(a);
-                                        var hb  = this.getHashedBounds(b);
-
-                                        // Get the old y coordinates
-                                        var oauy = Math.round(ha.upperLeft().y);
-                                        var obuy = Math.round(hb.upperLeft().y);
-                                        var oaly = Math.round(ha.lowerRight().y);
-                                        var obly = Math.round(hb.lowerRight().y);
-
-                                        // If equal, than use the old one
-                                        if (auy == buy && aly == bly) {
-                                                auy = oauy; buy = obuy; aly = oaly; bly = obly;
-                                        }
-
-                                        if (Math.round(a.bounds.height()-ha.height()) === 0 && Math.round(b.bounds.height()-hb.height()) === 0){
-                                                return auy < buy ? -1 : (auy > buy ? 1: 0);
-                                        }
-
-                                        // Check if upper left and lower right is completely above/below
-                                        var above = auy < buy && aly < bly;
-                                        var below = auy > buy && aly > bly;
-                                        // Check if a is above b including the old values
-                                        var slightlyAboveBottom = auy < buy && aly >= bly && oaly < obly;
-                                        var slightlyAboveTop = auy >= buy && aly < bly && oauy < obuy;
-                                        // Check if a is below b including the old values
-                                        var slightlyBelowBottom = auy > buy && aly <= bly && oaly > obly;
-                                        var slightlyBelowTop = auy <= buy && aly > bly && oauy > obuy;
-
-                                        // Return -1 if a is above b, 1 if b is above a, or 0 otherwise
-                                        return  (above || slightlyAboveBottom || slightlyAboveTop ? -1 : (below || slightlyBelowBottom || slightlyBelowTop ? 1 : 0))
-                                }.bind(this));
-
-                // Return lanes
-                return lanes;
-        },
+		/**
+		 * Returns a set on all child lanes for the given Shape. If recursive is TRUE, also indirect children will be returned (default is FALSE)
+		 * The set is sorted with first child the lowest y-coordinate and the last one the highest.
+		 * @param {ORYX.Core.Shape} shape
+		 * @param {boolean} recursive
+		 */
+		getLanes: function (shape, recursive) {
+			var namespace = this.getNamespace();
 
-        getNamespace: function() {
-                if(!this.namespace) {
-                        var stencilsets = this.facade.getStencilSets();
-                        if(stencilsets.keys()) {
-                                this.namespace = stencilsets.keys()[0];
-                        } else {
-                                return undefined;
-                        }
-                }
-                return this.namespace;
-        }
+			// Get all the child lanes
+			var lanes = shape.getChildNodes(recursive || false).findAll(function (node) {
+				return (node.getStencil().id() === namespace + "Lane");
+			});
+
+			// Sort all lanes by there y coordinate
+			lanes = lanes.sort(function (a, b) {
+
+				// Get y coordinates for upper left and lower right
+				var auy = Math.round(a.bounds.upperLeft().y);
+				var buy = Math.round(b.bounds.upperLeft().y);
+				var aly = Math.round(a.bounds.lowerRight().y);
+				var bly = Math.round(b.bounds.lowerRight().y);
+
+				var ha = this.getHashedBounds(a);
+				var hb = this.getHashedBounds(b);
+
+				// Get the old y coordinates
+				var oauy = Math.round(ha.upperLeft().y);
+				var obuy = Math.round(hb.upperLeft().y);
+				var oaly = Math.round(ha.lowerRight().y);
+				var obly = Math.round(hb.lowerRight().y);
+
+				// If equal, than use the old one
+				if (auy == buy && aly == bly) {
+					auy = oauy;
+					buy = obuy;
+					aly = oaly;
+					bly = obly;
+				}
+
+				if (Math.round(a.bounds.height() - ha.height()) === 0 && Math.round(b.bounds.height() - hb.height()) === 0) {
+					return auy < buy ? -1 : (auy > buy ? 1 : 0);
+				}
+
+				// Check if upper left and lower right is completely above/below
+				var above = auy < buy && aly < bly;
+				var below = auy > buy && aly > bly;
+				// Check if a is above b including the old values
+				var slightlyAboveBottom = auy < buy && aly >= bly && oaly < obly;
+				var slightlyAboveTop = auy >= buy && aly < bly && oauy < obuy;
+				// Check if a is below b including the old values
+				var slightlyBelowBottom = auy > buy && aly <= bly && oaly > obly;
+				var slightlyBelowTop = auy <= buy && aly > bly && oauy > obuy;
+
+				// Return -1 if a is above b, 1 if b is above a, or 0 otherwise
+				return (above || slightlyAboveBottom || slightlyAboveTop ? -1 : (below || slightlyBelowBottom || slightlyBelowTop ? 1 : 0))
+			}.bind(this));
+
+			// Return lanes
+			return lanes;
+		},
+
+		getNamespace: function () {
+			if (!this.namespace) {
+				var stencilsets = this.facade.getStencilSets();
+				if (stencilsets.keys()) {
+					this.namespace = stencilsets.keys()[0];
+				} else {
+					return undefined;
+				}
+			}
+			return this.namespace;
+		}
 	};
 
 	var ResizeLanesCommand = ORYX.Core.Command.extend({
 
-        construct: function(shape, parent, pool, plugin) {
+		construct: function (shape, parent, pool, plugin) {
 
-                this.facade  = plugin.facade;
-                this.plugin  = plugin;
-                this.shape       = shape;
-                this.changes;
+			this.facade = plugin.facade;
+			this.plugin = plugin;
+			this.shape = shape;
+			this.changes;
 
-                this.pool       = pool;
+			this.pool = pool;
 
-                this.parent     = parent;
+			this.parent = parent;
 
 
-                this.shapeChildren = [];
+			this.shapeChildren = [];
 
-                /*
+			/*
                  * The Bounds have to be stored
                  * separate because they would
                  * otherwise also be influenced
                  */
-                this.shape.getChildShapes().each(function(childShape) {
-                        this.shapeChildren.push({
-                                shape: childShape,
-                                bounds: {
-                                        a: {
-                                                x: childShape.bounds.a.x,
-                                                y: childShape.bounds.a.y
-                                        },
-                                        b: {
-                                                x: childShape.bounds.b.x,
-                                                y: childShape.bounds.b.y
-                                        }
-                                }
-                        });
-                }.bind(this));
-
-                this.shapeUpperLeft = this.shape.bounds.upperLeft();
-
-                // If there is no parent,
-                // correct the abs position with the parents abs.
-                /*if (!this.shape.parent) {
+			this.shape.getChildShapes().each(function (childShape) {
+				this.shapeChildren.push({
+					shape: childShape,
+					bounds: {
+						a: {
+							x: childShape.bounds.a.x,
+							y: childShape.bounds.a.y
+						},
+						b: {
+							x: childShape.bounds.b.x,
+							y: childShape.bounds.b.y
+						}
+					}
+				});
+			}.bind(this));
+
+			this.shapeUpperLeft = this.shape.bounds.upperLeft();
+
+			// If there is no parent,
+			// correct the abs position with the parents abs.
+			/*if (!this.shape.parent) {
                         var pAbs = parent.absoluteXY();
                         this.shapeUpperLeft.x += pAbs.x;
                         this.shapeUpperLeft.y += pAbs.y;
                 }*/
-                this.parentHeight       = this.parent.bounds.height();
+			this.parentHeight = this.parent.bounds.height();
 
-        },
+		},
 
-        getLeafLanes: function(lane){
-                var childLanes = this.plugin.getLanes(lane).map(function(child){
-                        return this.getLeafLanes(child);
-                }.bind(this)).flatten();
-                return childLanes.length > 0 ? childLanes : [lane];
-        },
+		getLeafLanes: function (lane) {
+			var childLanes = this.plugin.getLanes(lane).map(function (child) {
+				return this.getLeafLanes(child);
+			}.bind(this)).flatten();
+			return childLanes.length > 0 ? childLanes : [lane];
+		},
 
-        findNewLane: function(){
+		findNewLane: function () {
 
-                var lanes = this.plugin.getLanes(this.parent);
+			var lanes = this.plugin.getLanes(this.parent);
 
-                var leafLanes = this.getLeafLanes(this.parent);
-                /*leafLanes = leafLanes.sort(function(a,b){
+			var leafLanes = this.getLeafLanes(this.parent);
+			/*leafLanes = leafLanes.sort(function(a,b){
                         var aupl = a.absoluteXY().y;
                         var bupl = b.absoluteXY().y;
                         return aupl < bupl ? -1 : (aupl > bupl ? 1 : 0)
                 })*/
-                this.lane = leafLanes.find(function(l){ return l.bounds.upperLeft().y >= this.shapeUpperLeft.y }.bind(this)) || leafLanes.last();
-                this.laneUpperLeft = this.lane.bounds.upperLeft();
-        },
+			this.lane = leafLanes.find(function (l) {
+				return l.bounds.upperLeft().y >= this.shapeUpperLeft.y
+			}.bind(this)) || leafLanes.last();
+			this.laneUpperLeft = this.lane.bounds.upperLeft();
+		},
 
-        execute: function() {
+		execute: function () {
 
-                if(this.changes) {
-                        this.executeAgain();
-                        return;
-                }
+			if (this.changes) {
+				this.executeAgain();
+				return;
+			}
 
-                /*
+			/*
                  * Rescue all ChildShapes of the deleted
                  * Shape into the lane that takes its
                  * place
                  */
 
-                if (!this.lane){
-                        this.findNewLane();
-                }
+			if (!this.lane) {
+				this.findNewLane();
+			}
 
-                if(this.lane) {
+			if (this.lane) {
 
-                        var laUpL = this.laneUpperLeft;
-                        var shUpL = this.shapeUpperLeft;
+				var laUpL = this.laneUpperLeft;
+				var shUpL = this.shapeUpperLeft;
 
-                        var depthChange = this.plugin.getDepth(this.lane, this.parent)-1;
+				var depthChange = this.plugin.getDepth(this.lane, this.parent) - 1;
 
-                        this.changes = $H({});
+				this.changes = $H({});
 
-                        // Selected lane is BELOW the removed lane
-                        if (laUpL.y >= shUpL.y) {
-                                this.lane.getChildShapes().each(function(childShape) {
+				// Selected lane is BELOW the removed lane
+				if (laUpL.y >= shUpL.y) {
+					this.lane.getChildShapes().each(function (childShape) {
 
-                                        /*
+						/*
                                          * Cache the changes for rollback
                                          */
-                                        if(!this.changes[childShape.getId()]) {
-                                                this.changes[childShape.getId()] = this.computeChanges(childShape, this.lane, this.lane, this.shape.bounds.height());
-                                        }
+						if (!this.changes[childShape.getId()]) {
+							this.changes[childShape.getId()] = this.computeChanges(childShape, this.lane, this.lane, this.shape.bounds.height());
+						}
 
-                                        childShape.bounds.moveBy(0, this.shape.bounds.height());
-                                }.bind(this));
+						childShape.bounds.moveBy(0, this.shape.bounds.height());
+					}.bind(this));
 
-                                this.plugin.hashChildShapes(this.lane);
+					this.plugin.hashChildShapes(this.lane);
 
-                                this.shapeChildren.each(function(shapeChild) {
-                                        shapeChild.shape.bounds.set(shapeChild.bounds);
-                                        shapeChild.shape.bounds.moveBy((shUpL.x-30)-(depthChange*30), 0);
+					this.shapeChildren.each(function (shapeChild) {
+						shapeChild.shape.bounds.set(shapeChild.bounds);
+						shapeChild.shape.bounds.moveBy((shUpL.x - 30) - (depthChange * 30), 0);
 
-                                        /*
+						/*
                                          * Cache the changes for rollback
                                          */
-                                        if(!this.changes[shapeChild.shape.getId()]) {
-                                                this.changes[shapeChild.shape.getId()] = this.computeChanges(shapeChild.shape, this.shape, this.lane, 0);
-                                        }
+						if (!this.changes[shapeChild.shape.getId()]) {
+							this.changes[shapeChild.shape.getId()] = this.computeChanges(shapeChild.shape, this.shape, this.lane, 0);
+						}
 
-                                        this.lane.add(shapeChild.shape);
+						this.lane.add(shapeChild.shape);
 
-                                }.bind(this));
+					}.bind(this));
 
-                                this.lane.bounds.moveBy(0, shUpL.y-laUpL.y);
+					this.lane.bounds.moveBy(0, shUpL.y - laUpL.y);
 
-                        // Selected lane is ABOVE the removed lane
-                        } else if(shUpL.y > laUpL.y){
+					// Selected lane is ABOVE the removed lane
+				} else if (shUpL.y > laUpL.y) {
 
-                                this.shapeChildren.each(function(shapeChild) {
-                                        shapeChild.shape.bounds.set(shapeChild.bounds);
-                                        shapeChild.shape.bounds.moveBy((shUpL.x-30)-(depthChange*30), this.lane.bounds.height());
+					this.shapeChildren.each(function (shapeChild) {
+						shapeChild.shape.bounds.set(shapeChild.bounds);
+						shapeChild.shape.bounds.moveBy((shUpL.x - 30) - (depthChange * 30), this.lane.bounds.height());
 
-                                        /*
+						/*
                                          * Cache the changes for rollback
                                          */
-                                        if(!this.changes[shapeChild.shape.getId()]) {
-                                                this.changes[shapeChild.shape.getId()] = this.computeChanges(shapeChild.shape, this.shape, this.lane, 0);
-                                        }
-
-                                        this.lane.add(shapeChild.shape);
-
-                                }.bind(this));
-                        }
+						if (!this.changes[shapeChild.shape.getId()]) {
+							this.changes[shapeChild.shape.getId()] = this.computeChanges(shapeChild.shape, this.shape, this.lane, 0);
+						}
 
+						this.lane.add(shapeChild.shape);
 
+					}.bind(this));
+				}
 
 
-                }
+			}
 
-                /*
+			/*
                  * Adjust the height of the lanes
                  */
-                // Get the height values
-                var oldHeight   = this.lane.bounds.height();
-                var newHeight   = this.lane.length === 1 ? this.parentHeight : this.lane.bounds.height() + this.shape.bounds.height();
-
-                // Set height
-                this.setHeight(newHeight, oldHeight, this.parent, this.parentHeight, true);
-
-                // Cache all sibling lanes
-                //this.changes[this.shape.getId()] = this.computeChanges(this.shape, this.parent, this.parent, 0);
-                this.plugin.getLanes(this.parent).each(function(childLane){
-                        if(!this.changes[childLane.getId()] && childLane !== this.lane && childLane !== this.shape) {
-                                this.changes[childLane.getId()] = this.computeChanges(childLane, this.parent, this.parent, 0);
-                        }
-                }.bind(this))
+			// Get the height values
+			var oldHeight = this.lane.bounds.height();
+			var newHeight = this.lane.length === 1 ? this.parentHeight : this.lane.bounds.height() + this.shape.bounds.height();
+
+			// Set height
+			this.setHeight(newHeight, oldHeight, this.parent, this.parentHeight, true);
+
+			// Cache all sibling lanes
+			//this.changes[this.shape.getId()] = this.computeChanges(this.shape, this.parent, this.parent, 0);
+			this.plugin.getLanes(this.parent).each(function (childLane) {
+				if (!this.changes[childLane.getId()] && childLane !== this.lane && childLane !== this.shape) {
+					this.changes[childLane.getId()] = this.computeChanges(childLane, this.parent, this.parent, 0);
+				}
+			}.bind(this))
 
-                // Update
-                this.update();
-        },
+			// Update
+			this.update();
+		},
 
-        setHeight: function(newHeight, oldHeight, parent, parentHeight, store){
+		setHeight: function (newHeight, oldHeight, parent, parentHeight, store) {
 
-                // Set heigh of the lane
-                this.plugin.setDimensions(this.lane, this.lane.bounds.width(), newHeight);
-                this.plugin.hashedBounds[this.pool.id][this.lane.id] = this.lane.absoluteBounds();
+			// Set heigh of the lane
+			this.plugin.setDimensions(this.lane, this.lane.bounds.width(), newHeight);
+			this.plugin.hashedBounds[this.pool.id][this.lane.id] = this.lane.absoluteBounds();
 
-                // Adjust child lanes
-                this.plugin.adjustHeight(this.plugin.getLanes(parent), this.lane);
+			// Adjust child lanes
+			this.plugin.adjustHeight(this.plugin.getLanes(parent), this.lane);
 
-                if (store === true){
-                        // Store changes
-                        this.changes[this.shape.getId()] = this.computeChanges(this.shape, parent, parent, 0, oldHeight, newHeight);
-                }
+			if (store === true) {
+				// Store changes
+				this.changes[this.shape.getId()] = this.computeChanges(this.shape, parent, parent, 0, oldHeight, newHeight);
+			}
 
-                // Set parents height
-                this.plugin.setDimensions(parent, parent.bounds.width(), parentHeight);
+			// Set parents height
+			this.plugin.setDimensions(parent, parent.bounds.width(), parentHeight);
 
-                if (parent !== this.pool){
-                        this.plugin.setDimensions(this.pool, this.pool.bounds.width(), this.pool.bounds.height() + (newHeight-oldHeight));
-                }
-        },
+			if (parent !== this.pool) {
+				this.plugin.setDimensions(this.pool, this.pool.bounds.width(), this.pool.bounds.height() + (newHeight - oldHeight));
+			}
+		},
 
-        update: function(){
+		update: function () {
 
-                // Hack to prevent the updating of the dockers
-                this.plugin.hashedBounds[this.pool.id]["REMOVED"] = true;
-                // Update
-                //this.facade.getCanvas().update();
-        },
+			// Hack to prevent the updating of the dockers
+			this.plugin.hashedBounds[this.pool.id]["REMOVED"] = true;
+			// Update
+			//this.facade.getCanvas().update();
+		},
 
-        rollback: function() {
+		rollback: function () {
 
-                var laUpL = this.laneUpperLeft;
-                var shUpL = this.shapeUpperLeft;
+			var laUpL = this.laneUpperLeft;
+			var shUpL = this.shapeUpperLeft;
 
-                this.changes.each(function(pair) {
+			this.changes.each(function (pair) {
 
-                        var parent                      = pair.value.oldParent;
-                        var shape                       = pair.value.shape;
-                        var parentHeight        = pair.value.parentHeight;
-                        var oldHeight           = pair.value.oldHeight;
-                        var newHeight           = pair.value.newHeight;
+				var parent = pair.value.oldParent;
+				var shape = pair.value.shape;
+				var parentHeight = pair.value.parentHeight;
+				var oldHeight = pair.value.oldHeight;
+				var newHeight = pair.value.newHeight;
 
-                        // Move siblings
-                        if (shape.getStencil().id().endsWith("Lane")){
-                                shape.bounds.moveTo(pair.value.oldPosition);
-                        }
+				// Move siblings
+				if (shape.getStencil().id().endsWith("Lane")) {
+					shape.bounds.moveTo(pair.value.oldPosition);
+				}
 
-                        // If lane
-                        if(oldHeight) {
-                                this.setHeight(oldHeight, newHeight, parent, parent.bounds.height() + (oldHeight - newHeight));
-                                if (laUpL.y >= shUpL.y) {
-                                        this.lane.bounds.moveBy(0, this.shape.bounds.height()-1);
-                                }
-                        } else {
-                                parent.add(shape);
-                                shape.bounds.moveTo(pair.value.oldPosition);
+				// If lane
+				if (oldHeight) {
+					this.setHeight(oldHeight, newHeight, parent, parent.bounds.height() + (oldHeight - newHeight));
+					if (laUpL.y >= shUpL.y) {
+						this.lane.bounds.moveBy(0, this.shape.bounds.height() - 1);
+					}
+				} else {
+					parent.add(shape);
+					shape.bounds.moveTo(pair.value.oldPosition);
 
-                        }
+				}
 
 
-                }.bind(this));
+			}.bind(this));
 
-                // Update
-                //this.update();
+			// Update
+			//this.update();
 
-        },
+		},
 
-        executeAgain: function() {
-
-                this.changes.each(function(pair) {
-                        var parent        = pair.value.newParent;
-                        var shape         = pair.value.shape;
-                        var newHeight = pair.value.newHeight;
-                        var oldHeight = pair.value.oldHeight;
-
-                        // If lane
-                        if(newHeight) {
-                                var laUpL = this.laneUpperLeft.y;
-                                var shUpL = this.shapeUpperLeft.y;
-
-                                if (laUpL >= shUpL) {
-                                        this.lane.bounds.moveBy(0, shUpL - laUpL);
-                                }
-                                this.setHeight(newHeight, oldHeight, parent, parent.bounds.height() + (newHeight-oldHeight));
-                        } else {
-                                parent.add(shape);
-                                shape.bounds.moveTo(pair.value.newPosition);
-                        }
+		executeAgain: function () {
 
-                }.bind(this));
+			this.changes.each(function (pair) {
+				var parent = pair.value.newParent;
+				var shape = pair.value.shape;
+				var newHeight = pair.value.newHeight;
+				var oldHeight = pair.value.oldHeight;
 
-                // Update
-                this.update();
-        },
+				// If lane
+				if (newHeight) {
+					var laUpL = this.laneUpperLeft.y;
+					var shUpL = this.shapeUpperLeft.y;
 
-        computeChanges: function(shape, oldParent, parent, yOffset, oldHeight, newHeight) {
+					if (laUpL >= shUpL) {
+						this.lane.bounds.moveBy(0, shUpL - laUpL);
+					}
+					this.setHeight(newHeight, oldHeight, parent, parent.bounds.height() + (newHeight - oldHeight));
+				} else {
+					parent.add(shape);
+					shape.bounds.moveTo(pair.value.newPosition);
+				}
 
-                oldParent = this.changes[shape.getId()] ? this.changes[shape.getId()].oldParent : oldParent;
-                var oldPosition = this.changes[shape.getId()] ? this.changes[shape.getId()].oldPosition : shape.bounds.upperLeft();
+			}.bind(this));
 
-                var sUl = shape.bounds.upperLeft();
+			// Update
+			this.update();
+		},
 
-                var pos = {x: sUl.x, y: sUl.y + yOffset};
+		computeChanges: function (shape, oldParent, parent, yOffset, oldHeight, newHeight) {
 
-                var changes = {
-                        shape           : shape,
-                        parentHeight: oldParent.bounds.height(),
-                        oldParent       : oldParent,
-                        oldPosition     : oldPosition,
-                        oldHeight       : oldHeight,
-                        newParent       : parent,
-                        newPosition : pos,
-                        newHeight       : newHeight
-                };
+			oldParent = this.changes[shape.getId()] ? this.changes[shape.getId()].oldParent : oldParent;
+			var oldPosition = this.changes[shape.getId()] ? this.changes[shape.getId()].oldPosition : shape.bounds.upperLeft();
 
-                return changes;
-        }
+			var sUl = shape.bounds.upperLeft();
+
+			var pos = {x: sUl.x, y: sUl.y + yOffset};
+
+			var changes = {
+				shape: shape,
+				parentHeight: oldParent.bounds.height(),
+				oldParent: oldParent,
+				oldPosition: oldPosition,
+				oldHeight: oldHeight,
+				newParent: parent,
+				newPosition: pos,
+				newHeight: newHeight
+			};
+
+			return changes;
+		}
 
 	});
 
 
 	ORYX.Plugins.BPMN2_0 = ORYX.Plugins.AbstractPlugin.extend(ORYX.Plugins.BPMN2_0);
 
-}()
\ No newline at end of file
+}()
diff --git a/len-activiti/src/main/resources/static/editor-app/eventbus.js b/len-activiti/src/main/resources/static/editor-app/eventbus.js
index d679910..41eb40f 100644
--- a/len-activiti/src/main/resources/static/editor-app/eventbus.js
+++ b/len-activiti/src/main/resources/static/editor-app/eventbus.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -21,113 +21,113 @@ var KISBPM = KISBPM || {};
 /** Inspired by https://github.com/krasimir/EventBus/blob/master/src/EventBus.js */
 KISBPM.eventBus = {
 
-    /** Event fired when the editor is loaded and ready */
-    EVENT_TYPE_EDITOR_READY: 'event-type-editor-ready',
-
-    /** Event fired when a selection is made on the canvas. */
-    EVENT_TYPE_SELECTION_CHANGE: 'event-type-selection-change',
-
-    /** Event fired when a toolbar button has been clicked. */
-    EVENT_TYPE_TOOLBAR_BUTTON_CLICKED: 'event-type-toolbar-button-clicked',
-
-    /** Event fired when a stencil item is dropped on the canvas. */
-    EVENT_TYPE_ITEM_DROPPED: 'event-type-item-dropped',
-
-    /** Event fired when a property value is changed. */
-    EVENT_TYPE_PROPERTY_VALUE_CHANGED: 'event-type-property-value-changed',
-
-    /** Event fired on double click in canvas. */
-    EVENT_TYPE_DOUBLE_CLICK: 'event-type-double-click',
-
-    /** Event fired on a mouse out */
-    EVENT_TYPE_MOUSE_OUT: 'event-type-mouse-out',
-
-    /** Event fired on a mouse over */
-    EVENT_TYPE_MOUSE_OVER: 'event-type-mouse-over',
-
-    /** Event fired when a model is saved. */
-    EVENT_TYPE_MODEL_SAVED: 'event-type-model-saved',
-    
-    /** Event fired when the quick menu buttons should be hidden. */
-    EVENT_TYPE_HIDE_SHAPE_BUTTONS: 'event-type-hide-shape-buttons',
-
-    /** A mapping for storing the listeners*/
-    listeners: {},
-
-    /** The Oryx editor, which is stored locally to send events to */
-    editor: null,
-
-    /**
-     * Add an event listener to the event bus, listening to the event with the provided type.
-     * Type and callback are mandatory parameters.
-     *
-     * Provide scope parameter if it is important that the callback is executed
-     * within a specific scope.
-     */
-    addListener: function (type, callback, scope) {
-
-        // Add to the listeners map
-        if (typeof this.listeners[type] !== "undefined") {
-            this.listeners[type].push({scope: scope, callback: callback});
-        } else {
-            this.listeners[type] = [
-                {scope: scope, callback: callback}
-            ];
-        }
-    },
-
-    /**
-     * Removes the provided event listener.
-     */
-    removeListener: function (type, callback, scope) {
-        if (typeof this.listeners[type] != "undefined") {
-            var numOfCallbacks = this.listeners[type].length;
-            var newArray = [];
-            for (var i = 0; i < numOfCallbacks; i++) {
-                var listener = this.listeners[type][i];
-                if (listener.scope === scope && listener.callback === callback) {
-                    // Do nothing, this is the listener and doesn't need to survive
-                } else {
-                    newArray.push(listener);
-                }
-            }
-            this.listeners[type] = newArray;
-        }
-    },
-
-    hasListener:function(type, callback, scope) {
-        if(typeof this.listeners[type] != "undefined") {
-            var numOfCallbacks = this.listeners[type].length;
-            if(callback === undefined && scope === undefined){
-                return numOfCallbacks > 0;
-            }
-            for(var i=0; i<numOfCallbacks; i++) {
-                var listener = this.listeners[type][i];
-                if(listener.scope == scope && listener.callback == callback) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    },
-
-    /**
-     * Dispatch an event to all event listeners registered to that specific type.
-     */
-    dispatch:function(type, event) {
-        if(typeof this.listeners[type] != "undefined") {
-            var numOfCallbacks = this.listeners[type].length;
-            for(var i=0; i<numOfCallbacks; i++) {
-                var listener = this.listeners[type][i];
-                if(listener && listener.callback) {
-                    listener.callback.apply(listener.scope, [event]);
-                }
-            }
-        }
-    },
-
-    dispatchOryxEvent: function(event, uiObject) {
-        KISBPM.eventBus.editor.handleEvents(event, uiObject);
-    }
-
-};
\ No newline at end of file
+	/** Event fired when the editor is loaded and ready */
+	EVENT_TYPE_EDITOR_READY: 'event-type-editor-ready',
+
+	/** Event fired when a selection is made on the canvas. */
+	EVENT_TYPE_SELECTION_CHANGE: 'event-type-selection-change',
+
+	/** Event fired when a toolbar button has been clicked. */
+	EVENT_TYPE_TOOLBAR_BUTTON_CLICKED: 'event-type-toolbar-button-clicked',
+
+	/** Event fired when a stencil item is dropped on the canvas. */
+	EVENT_TYPE_ITEM_DROPPED: 'event-type-item-dropped',
+
+	/** Event fired when a property value is changed. */
+	EVENT_TYPE_PROPERTY_VALUE_CHANGED: 'event-type-property-value-changed',
+
+	/** Event fired on double click in canvas. */
+	EVENT_TYPE_DOUBLE_CLICK: 'event-type-double-click',
+
+	/** Event fired on a mouse out */
+	EVENT_TYPE_MOUSE_OUT: 'event-type-mouse-out',
+
+	/** Event fired on a mouse over */
+	EVENT_TYPE_MOUSE_OVER: 'event-type-mouse-over',
+
+	/** Event fired when a model is saved. */
+	EVENT_TYPE_MODEL_SAVED: 'event-type-model-saved',
+
+	/** Event fired when the quick menu buttons should be hidden. */
+	EVENT_TYPE_HIDE_SHAPE_BUTTONS: 'event-type-hide-shape-buttons',
+
+	/** A mapping for storing the listeners*/
+	listeners: {},
+
+	/** The Oryx editor, which is stored locally to send events to */
+	editor: null,
+
+	/**
+	 * Add an event listener to the event bus, listening to the event with the provided type.
+	 * Type and callback are mandatory parameters.
+	 *
+	 * Provide scope parameter if it is important that the callback is executed
+	 * within a specific scope.
+	 */
+	addListener: function (type, callback, scope) {
+
+		// Add to the listeners map
+		if (typeof this.listeners[type] !== "undefined") {
+			this.listeners[type].push({scope: scope, callback: callback});
+		} else {
+			this.listeners[type] = [
+				{scope: scope, callback: callback}
+			];
+		}
+	},
+
+	/**
+	 * Removes the provided event listener.
+	 */
+	removeListener: function (type, callback, scope) {
+		if (typeof this.listeners[type] != "undefined") {
+			var numOfCallbacks = this.listeners[type].length;
+			var newArray = [];
+			for (var i = 0; i < numOfCallbacks; i++) {
+				var listener = this.listeners[type][i];
+				if (listener.scope === scope && listener.callback === callback) {
+					// Do nothing, this is the listener and doesn't need to survive
+				} else {
+					newArray.push(listener);
+				}
+			}
+			this.listeners[type] = newArray;
+		}
+	},
+
+	hasListener: function (type, callback, scope) {
+		if (typeof this.listeners[type] != "undefined") {
+			var numOfCallbacks = this.listeners[type].length;
+			if (callback === undefined && scope === undefined) {
+				return numOfCallbacks > 0;
+			}
+			for (var i = 0; i < numOfCallbacks; i++) {
+				var listener = this.listeners[type][i];
+				if (listener.scope == scope && listener.callback == callback) {
+					return true;
+				}
+			}
+		}
+		return false;
+	},
+
+	/**
+	 * Dispatch an event to all event listeners registered to that specific type.
+	 */
+	dispatch: function (type, event) {
+		if (typeof this.listeners[type] != "undefined") {
+			var numOfCallbacks = this.listeners[type].length;
+			for (var i = 0; i < numOfCallbacks; i++) {
+				var listener = this.listeners[type][i];
+				if (listener && listener.callback) {
+					listener.callback.apply(listener.scope, [event]);
+				}
+			}
+		}
+	},
+
+	dispatchOryxEvent: function (event, uiObject) {
+		KISBPM.eventBus.editor.handleEvents(event, uiObject);
+	}
+
+};
diff --git a/len-activiti/src/main/resources/static/editor-app/fonts/activiti-admin-webfont.svg b/len-activiti/src/main/resources/static/editor-app/fonts/activiti-admin-webfont.svg
index bc3439c..6a47edb 100644
--- a/len-activiti/src/main/resources/static/editor-app/fonts/activiti-admin-webfont.svg
+++ b/len-activiti/src/main/resources/static/editor-app/fonts/activiti-admin-webfont.svg
@@ -1,43 +1,61 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="activitimodelerregular" horiz-adv-x="2048" >
-<font-face units-per-em="2048" ascent="1638" descent="-410" />
-<missing-glyph horiz-adv-x="500" />
-<glyph horiz-adv-x="0" />
-<glyph unicode="&#xd;" />
-<glyph unicode="a" d="M0 128q0 -34 23 -57t57 -23h1840q22 0 40 11t29 29t11 40v760v640q0 14 -7 31t-17 27l-440 440q-10 8 -26 15t-30 7h-1400h-1h-3h-4q-30 -2 -51 -26t-21 -54v-1840zM160 208v1680h160v-520q0 -32 16 -60t44 -44t60 -16h800q32 0 60 16t44 44t16 60v520h88l392 -392v-608 v-680h-160v600q0 34 -23 57t-57 23h-1200h-4h-4q-30 -2 -51 -26t-21 -54v-600h-160zM480 208v520h1040v-520h-1040zM960 1448v400q0 16 12 28t28 12h160q16 0 28 -12t12 -28v-400q0 -10 -5 -20t-15 -15t-20 -5h-160q-10 0 -20 5t-15 15t-5 20z" />
-<glyph unicode="b" d="M80 128l522 264l-258 258zM472 780l260 -260l914 916l-258 258zM1518 1828l262 -262l62 66q28 28 28 65t-28 65l-128 128q-10 10 -21 16t-23 9t-24 3q-34 0 -62 -28z" />
-<glyph unicode="c" d="M41 1513q11 -69 55 -135q82 -126 244 -205q138 -67 267 -67q23 0 45 2q70 6 128 36q22 -8 41 -15l38 -14t35 -13t26 -10q0 -2 1 -8t1 -8v-14v-16v-2v-10v-12v-10l-1 -6t-1 -8q-14 -6 -34 -14t-56 -20t-52 -18q-56 28 -126 34q-24 3 -48 3q-51 0 -105 -12 q-79 -17 -159 -55q-162 -78 -244 -204q-60 -91 -60 -175q0 -53 24 -103q32 -64 96 -100t144 -44q23 -2 46 -2q130 0 266 66q160 78 244 206q59 89 59 171q0 44 -17 87q28 26 49 45t35 33q458 -296 826 -486q26 -14 54 -4t49 25t37 33q24 30 27 73v8q0 38 -25 69 q-232 200 -542 430q146 106 280 214t262 216q14 16 21 37q5 16 5 32v9q-2 20 -10 39t-18 33q-54 63 -108 63l-12 -1q-8 0 -20 -6q-368 -190 -826 -486q-10 8 -24 22t-28 26t-32 28q16 40 16 81v9q-2 46 -16 88t-42 82q-84 128 -244 206q-136 66 -266 66h-8t-38 -4 q-80 -6 -144 -42t-96 -102q-22 -53 -22 -104q0 -18 3 -37zM233 1535q-2 10 -2 17q0 12 5 18q2 2 5 6t7 8t9 7t12 6t14 5t17 4t22 4q13 1 25 1q87 0 183 -47q112 -52 164 -132q27 -41 27 -71q0 -13 -5 -23q-8 -14 -28 -26t-58 -14q-15 -2 -30 -1q-83 0 -178 45 q-110 54 -164 136q-20 32 -25 57zM236 518q-5 11 -5 23q0 30 27 71q54 80 164 134q82 40 164 46q24 2 44 0q38 -4 58 -15t28 -25q2 -8 3 -16t0 -20t-7 -27t-18 -31q-52 -80 -164 -134q-93 -46 -177 -45q-16 0 -31 1q-70 6 -86 38zM1074 1056q0 28 20 48t48 20t48 -20t20 -48 q0 -18 -9 -34t-25 -25t-34 -9q-28 0 -48 20t-20 48z" />
-<glyph unicode="d" d="M80 668q0 -40 30 -70t70 -30h638v-340q0 -26 14 -49t37 -37t49 -14h902q40 0 70 30t30 70v1200q0 40 -30 70t-70 30h-462q-16 0 -32 -8q-10 -6 -12 -8q-6 -4 -22 -18q-18 -16 -58 -54q-8 -6 -27 -25l-25 -25v478q0 40 -30 70t-70 30h-462q-18 0 -32 -8q-10 -6 -12 -8 q-6 -4 -22 -18q-18 -16 -58 -54q-84 -78 -168 -160q-82 -82 -160 -166q-40 -42 -54 -60q-14 -14 -18 -22q-4 -6 -8 -10q-8 -16 -8 -34v-760zM200 688v660h420h80v500h362v-576q-80 -78 -154 -158q-40 -42 -56 -60q-12 -14 -16 -22q-6 -6 -8 -10q-10 -16 -10 -34v-300h-618z M252 1468l2 2v2q60 62 160 162t162 158l2 2l2 2v-328h-328zM938 248v660h420h80v500h362v-1160h-862zM990 1028l1 1l3 3q58 62 158 162t162 158l2 2l2 2v-328h-328z" />
-<glyph unicode="e" d="M80 528q0 -50 35 -85t85 -35h618v-180q0 -26 14 -49t37 -37t49 -14h902q40 0 70 30t30 70v1200q0 40 -30 70t-70 30h-380v320q0 50 -35 85t-85 35h-1120q-50 0 -85 -35t-35 -85v-1320zM360 1768v40q0 16 12 28t28 12h720q16 0 28 -12t12 -28v-40q0 -16 -12 -28t-28 -12 h-720q-16 0 -28 12t-12 28zM938 248v660h420h80v500h362v-1160h-862zM990 1028l1 1l3 3q58 62 158 162t162 158l2 2l2 2v-328h-328z" />
-<glyph unicode="f" d="M280 1518q0 -10 5 -20t15 -15t20 -5h80v-1026q0 -72 49 -123t119 -51h864q70 0 119 51t49 123v1026h80q16 0 28 12t12 28v40q0 10 -5 20t-15 15t-20 5h-276q0 2 -2 2l-200 200q-6 8 -19 13t-23 5h-320h-4h-2q-22 -2 -36 -18l-200 -200q-2 0 -2 -2h-276q-10 0 -20 -5 t-15 -15t-5 -20v-40zM520 452v1026h960v-1026q0 -24 -14 -39t-34 -15h-864q-10 0 -19 4t-15 11t-10 17t-4 22zM640 618q0 -24 18 -42t42 -18h40q24 0 42 18t18 42v640q0 24 -18 42t-42 18h-40q-24 0 -42 -18t-18 -42v-640zM764 1598l100 100h272l100 -100h-472zM920 618 q0 -24 18 -42t42 -18h40q24 0 42 18t18 42v640q0 24 -18 42t-42 18h-40q-24 0 -42 -18t-18 -42v-640zM1200 618q0 -24 18 -42t42 -18h40q24 0 42 18t18 42v640q0 24 -18 42t-42 18h-40q-24 0 -42 -18t-18 -42v-640z" />
-<glyph unicode="g" d="M240 1188q0 -24 18 -42t42 -18h442q40 0 54 36q6 14 6 26q0 22 -18 40l-144 144q92 108 230 152q74 24 149 24q65 0 131 -18q202 -54 305 -233q68 -117 68 -244q0 -67 -19 -136q-54 -201 -233 -305q-118 -68 -245 -68q-66 0 -134 18q-128 34 -224 130l-172 -168 q142 -142 334 -192q96 -26 192 -26t191 26q191 52 331 191t192 333q24 100 24 199q0 17 -1 35q-5 116 -49 224t-113 196t-169 154t-216 98q-94 24 -192 24h-28q-150 -6 -285 -70t-235 -174l-130 130q-20 20 -48 16q-22 -2 -38 -20t-16 -40v-442z" />
-<glyph unicode="h" d="M264 857q-26 96 -26 192.5t26 191.5q52 191 191 331t333 192q18 4 37 8t37 7t37 5t37 3t36 1h36q150 -6 285 -70t235 -174l130 130q20 20 48 16q22 -2 38 -20t16 -40v-442q0 -24 -18 -42t-42 -18h-442q-40 0 -54 36q-6 14 -6 26q0 22 18 40l144 144q-92 108 -230 152 q-74 24 -149 24q-65 0 -131 -18q-202 -54 -305 -233q-68 -117 -68 -244q0 -67 19 -136q54 -201 233 -305q118 -68 245 -68q66 0 134 18q128 34 224 130l172 -168q-142 -142 -334 -192q-96 -26 -192 -26t-191 26q-191 52 -331 191t-192 332z" />
-<glyph unicode="i" d="M80 1344q0 -56 40 -96t96 -40h184l-40 120h-144q-16 0 -16 16v264v186q0 14 16 14h104h344q16 0 16 -14v-190l120 -36v226q0 54 -40 94t-96 40h-448q-56 0 -96 -40t-40 -94v-450zM412 1522l106 -356q4 -16 23 -19t29 9l68 94l156 -156q18 -18 42 -18t40 16l6 8 q16 16 16 40t-18 40l-156 156l92 66q12 10 9 29t-19 23l-356 106h-8h-6q-14 -2 -21 -14q-4 -8 -4 -15q0 -5 1 -9zM1063 931q-1 -6 -1 -13q0 -9 2 -17q4 -15 16 -25l156 -156l-92 -66q-12 -10 -9 -29t19 -23l356 -106h4h4h6q14 2 21 14t3 24l-106 356q-4 16 -23 19t-29 -9 l-68 -94l-156 156q-18 18 -42 18h-5q-21 0 -35 -16l-6 -8q-12 -10 -15 -25zM1160 264q0 -56 40 -96t96 -40h448q56 0 96 40t40 96v448q0 36 -18 68t-49 50t-69 18h-184l40 -120h144q16 0 16 -16v-264v-184q0 -16 -16 -16h-104h-344q-16 0 -16 16v188l-120 36v-224z" />
-<glyph unicode="j" d="M120 306q0 -56 41 -97t97 -41h1484q38 0 70 19t50 51t18 68v1484q0 58 -40 98t-98 40h-1484q-58 0 -98 -40t-40 -98v-1484zM240 306v1484q0 18 18 18h1484q18 0 18 -18v-1484q0 -18 -18 -18h-1484q-18 0 -18 18zM322 1676l140 -480q6 -22 32 -26t40 14l90 126l162 -162 q16 -16 36 -21t40 -1t36 20l8 8q22 22 22 54t-24 56l-162 162l122 88q18 14 14 40t-26 32l-480 140q-8 4 -11 4t-9 -2q-18 -4 -27 -20q-5 -10 -5 -19q0 -7 2 -13zM1098 830l162 -162l-122 -88q-18 -12 -14 -38t24 -32l482 -142q7 -3 13 -3l7 1q16 4 26 20q6 10 6 20 q0 6 -2 12l-142 480q-6 22 -32 26t-38 -14l-90 -126l-164 162q-22 24 -55 25h-3q-31 0 -52 -21l-10 -10q-21 -21 -21 -51q0 -34 25 -59z" />
-<glyph unicode="k" d="M120 1148q0 -200 99 -370t269 -269t370 -99q230 0 420 132l6 -6l208 -208l112 -112q20 -20 54 -34t62 -14q66 0 113 47t47 113q0 28 -14 61t-34 53l-114 112l-206 208q-8 8 -16 14q102 172 102 372q0 150 -59 287t-158 236t-236 157t-287 58t-286 -58t-235 -157 t-158 -236t-59 -287zM358 1148q0 208 146 355t354 147q138 0 253 -67t182 -183t67 -252q0 -208 -147 -355t-355 -147t-354 147t-146 355zM518 1088q0 -16 12 -28t28 -12h200v-200q0 -16 12 -28t28 -12h120q18 0 29 12t11 28v200h200q18 0 29 12t11 28v120q0 16 -11 28 t-29 12h-200v200q0 16 -11 28t-29 12h-120q-16 0 -28 -12t-12 -28v-200h-200q-16 0 -28 -12t-12 -28v-120z" />
-<glyph unicode="l" d="M120 1148q0 -200 99 -370t269 -269t370 -99q230 0 420 132l6 -6l208 -208l112 -112q48 -48 114 -48t114 46q22 22 35 52t13 62q0 66 -48 114l-114 112l-206 208q-8 8 -16 14q102 172 102 372q0 150 -59 287t-158 236t-236 157t-287 58t-286 -58t-235 -157t-158 -236 t-59 -287zM358 1148q0 208 146 355t354 147q138 0 253 -67t182 -183t67 -252q0 -208 -147 -355t-355 -147t-354 147t-146 355zM518 1088q0 -16 12 -28t28 -12h600q18 0 29 12t11 28v120q0 16 -11 28t-29 12h-600q-16 0 -28 -12t-12 -28v-120z" />
-<glyph unicode="m" d="M120 1146q0 -200 99 -370t269 -269t370 -99q230 0 420 132l6 -6l208 -208l112 -112q46 -46 115 -46t114 44t45 113t-46 115l-114 112l-206 208q-8 6 -16 14q102 172 102 372t-99 370t-269 269t-371 99t-371 -99t-269 -269t-99 -370zM358 1146q0 208 146 355t354 147 q138 0 253 -67t182 -183t67 -252q0 -208 -147 -355t-355 -147t-354 147t-146 355zM638 1246q142 22 192 44h8v-524h160v760h-160q-10 -54 -38 -87t-67 -48t-95 -21v-124z" />
-<glyph unicode="n" d="M200 510q0 -108 77 -185t184 -77t184 77t77 185q0 26 -5 51t-15 48t-24 44t-31 39t-39 32l72 406h2q98 0 168 69t72 167l386 108q16 -32 41 -59t54 -46t65 -30t74 -11q106 0 183 77t77 184t-77 184t-183 77q-64 0 -120 -29t-92 -79t-46 -112l-414 -114q-72 94 -188 94 q-100 0 -170 -71t-70 -169q0 -112 86 -184l-74 -416q-52 -2 -99 -23t-81 -56t-54 -83t-20 -98zM362 510q0 42 29 70t71 28t70 -28t28 -70t-28 -71t-70 -29t-71 29t-29 71zM992 658q0 -20 14 -34t36 -14h240v-252q0 -20 14 -34t34 -14h142q14 0 25 6t18 17t7 25v252h240 q20 0 34 14t14 34v142q0 20 -14 35t-34 15h-240v244q0 20 -15 35t-35 15h-142q-20 0 -34 -15t-14 -35v-244h-240q-22 0 -36 -15t-14 -35v-142zM1442 1589q0 27 13 50t36 36t50 13t50 -13t36 -36t13 -50t-13 -50t-36 -36t-50 -13t-50 13t-36 36t-13 50z" />
-<glyph unicode="o" d="M200 510q0 -108 77 -185t184 -77t184 77t77 185q0 26 -5 51t-15 48t-24 44t-31 39t-39 32l72 406h2q98 0 168 69t72 167l386 108q16 -32 41 -59t54 -46t65 -30t74 -11q106 0 183 77t77 184t-77 184t-183 77q-64 0 -120 -29t-92 -79t-46 -112l-414 -114q-72 94 -188 94 q-100 0 -170 -71t-70 -169q0 -112 86 -184l-74 -416q-52 -2 -99 -23t-81 -56t-54 -83t-20 -98zM362 510q0 42 29 70t71 28t70 -28t28 -70t-28 -71t-70 -29t-71 29t-29 71zM992 658q0 -20 14 -34t36 -14h720q20 0 34 14t14 34v142q0 20 -14 35t-34 15h-720q-22 0 -36 -15 t-14 -35v-142zM1442 1589q0 27 13 50t36 36t50 13t50 -13t36 -36t13 -50t-13 -50t-36 -36t-50 -13t-50 13t-36 36t-13 50z" />
-<glyph unicode="p" d="M200 1008q0 -16 12 -28t28 -12h160v-240q0 -34 23 -57t57 -23h240q34 0 57 23t23 57v240h240v-520q0 -66 47 -113t113 -47h240q66 0 113 47t47 113v520h160q16 0 28 12t12 28v80q0 16 -12 28t-28 12h-160v520q0 66 -47 113t-113 47h-240q-66 0 -113 -47t-47 -113v-520 h-240v240q0 34 -23 57t-57 23h-240q-34 0 -57 -23t-23 -57v-240h-160q-16 0 -28 -12t-12 -28v-80zM1200 448v1200h240v-1200h-240z" />
-<glyph unicode="q" d="M240 608q0 -66 47 -113t113 -47h520v-160q0 -16 12 -28t28 -12h80q16 0 28 12t12 28v160h520q66 0 113 47t47 113v240q0 66 -47 113t-113 47h-520v240h240q34 0 57 23t23 57v240q0 34 -23 57t-57 23h-240v160q0 16 -12 28t-28 12h-80q-16 0 -28 -12t-12 -28v-160h-240 q-34 0 -57 -23t-23 -57v-240q0 -34 23 -57t57 -23h240v-240h-520q-66 0 -113 -47t-47 -113v-240zM400 608v240h1200v-240h-1200z" />
-<glyph unicode="&#x2000;" horiz-adv-x="1024" />
-<glyph unicode="&#x2001;" />
-<glyph unicode="&#x2002;" horiz-adv-x="1024" />
-<glyph unicode="&#x2003;" />
-<glyph unicode="&#x2004;" horiz-adv-x="682" />
-<glyph unicode="&#x2005;" horiz-adv-x="512" />
-<glyph unicode="&#x2006;" horiz-adv-x="341" />
-<glyph unicode="&#x2007;" horiz-adv-x="341" />
-<glyph unicode="&#x2008;" horiz-adv-x="256" />
-<glyph unicode="&#x2009;" horiz-adv-x="409" />
-<glyph unicode="&#x200a;" horiz-adv-x="113" />
-<glyph unicode="&#x202f;" horiz-adv-x="409" />
-<glyph unicode="&#x205f;" horiz-adv-x="512" />
-<glyph unicode="&#x25fc;" horiz-adv-x="1000" d="M0 0z" />
-</font>
-</defs></svg> 
\ No newline at end of file
+	<metadata></metadata>
+	<defs>
+		<font id="activitimodelerregular" horiz-adv-x="2048">
+			<font-face units-per-em="2048" ascent="1638" descent="-410"/>
+			<missing-glyph horiz-adv-x="500"/>
+			<glyph horiz-adv-x="0"/>
+			<glyph unicode="&#xd;"/>
+			<glyph unicode="a"
+				   d="M0 128q0 -34 23 -57t57 -23h1840q22 0 40 11t29 29t11 40v760v640q0 14 -7 31t-17 27l-440 440q-10 8 -26 15t-30 7h-1400h-1h-3h-4q-30 -2 -51 -26t-21 -54v-1840zM160 208v1680h160v-520q0 -32 16 -60t44 -44t60 -16h800q32 0 60 16t44 44t16 60v520h88l392 -392v-608 v-680h-160v600q0 34 -23 57t-57 23h-1200h-4h-4q-30 -2 -51 -26t-21 -54v-600h-160zM480 208v520h1040v-520h-1040zM960 1448v400q0 16 12 28t28 12h160q16 0 28 -12t12 -28v-400q0 -10 -5 -20t-15 -15t-20 -5h-160q-10 0 -20 5t-15 15t-5 20z"/>
+			<glyph unicode="b"
+				   d="M80 128l522 264l-258 258zM472 780l260 -260l914 916l-258 258zM1518 1828l262 -262l62 66q28 28 28 65t-28 65l-128 128q-10 10 -21 16t-23 9t-24 3q-34 0 -62 -28z"/>
+			<glyph unicode="c"
+				   d="M41 1513q11 -69 55 -135q82 -126 244 -205q138 -67 267 -67q23 0 45 2q70 6 128 36q22 -8 41 -15l38 -14t35 -13t26 -10q0 -2 1 -8t1 -8v-14v-16v-2v-10v-12v-10l-1 -6t-1 -8q-14 -6 -34 -14t-56 -20t-52 -18q-56 28 -126 34q-24 3 -48 3q-51 0 -105 -12 q-79 -17 -159 -55q-162 -78 -244 -204q-60 -91 -60 -175q0 -53 24 -103q32 -64 96 -100t144 -44q23 -2 46 -2q130 0 266 66q160 78 244 206q59 89 59 171q0 44 -17 87q28 26 49 45t35 33q458 -296 826 -486q26 -14 54 -4t49 25t37 33q24 30 27 73v8q0 38 -25 69 q-232 200 -542 430q146 106 280 214t262 216q14 16 21 37q5 16 5 32v9q-2 20 -10 39t-18 33q-54 63 -108 63l-12 -1q-8 0 -20 -6q-368 -190 -826 -486q-10 8 -24 22t-28 26t-32 28q16 40 16 81v9q-2 46 -16 88t-42 82q-84 128 -244 206q-136 66 -266 66h-8t-38 -4 q-80 -6 -144 -42t-96 -102q-22 -53 -22 -104q0 -18 3 -37zM233 1535q-2 10 -2 17q0 12 5 18q2 2 5 6t7 8t9 7t12 6t14 5t17 4t22 4q13 1 25 1q87 0 183 -47q112 -52 164 -132q27 -41 27 -71q0 -13 -5 -23q-8 -14 -28 -26t-58 -14q-15 -2 -30 -1q-83 0 -178 45 q-110 54 -164 136q-20 32 -25 57zM236 518q-5 11 -5 23q0 30 27 71q54 80 164 134q82 40 164 46q24 2 44 0q38 -4 58 -15t28 -25q2 -8 3 -16t0 -20t-7 -27t-18 -31q-52 -80 -164 -134q-93 -46 -177 -45q-16 0 -31 1q-70 6 -86 38zM1074 1056q0 28 20 48t48 20t48 -20t20 -48 q0 -18 -9 -34t-25 -25t-34 -9q-28 0 -48 20t-20 48z"/>
+			<glyph unicode="d"
+				   d="M80 668q0 -40 30 -70t70 -30h638v-340q0 -26 14 -49t37 -37t49 -14h902q40 0 70 30t30 70v1200q0 40 -30 70t-70 30h-462q-16 0 -32 -8q-10 -6 -12 -8q-6 -4 -22 -18q-18 -16 -58 -54q-8 -6 -27 -25l-25 -25v478q0 40 -30 70t-70 30h-462q-18 0 -32 -8q-10 -6 -12 -8 q-6 -4 -22 -18q-18 -16 -58 -54q-84 -78 -168 -160q-82 -82 -160 -166q-40 -42 -54 -60q-14 -14 -18 -22q-4 -6 -8 -10q-8 -16 -8 -34v-760zM200 688v660h420h80v500h362v-576q-80 -78 -154 -158q-40 -42 -56 -60q-12 -14 -16 -22q-6 -6 -8 -10q-10 -16 -10 -34v-300h-618z M252 1468l2 2v2q60 62 160 162t162 158l2 2l2 2v-328h-328zM938 248v660h420h80v500h362v-1160h-862zM990 1028l1 1l3 3q58 62 158 162t162 158l2 2l2 2v-328h-328z"/>
+			<glyph unicode="e"
+				   d="M80 528q0 -50 35 -85t85 -35h618v-180q0 -26 14 -49t37 -37t49 -14h902q40 0 70 30t30 70v1200q0 40 -30 70t-70 30h-380v320q0 50 -35 85t-85 35h-1120q-50 0 -85 -35t-35 -85v-1320zM360 1768v40q0 16 12 28t28 12h720q16 0 28 -12t12 -28v-40q0 -16 -12 -28t-28 -12 h-720q-16 0 -28 12t-12 28zM938 248v660h420h80v500h362v-1160h-862zM990 1028l1 1l3 3q58 62 158 162t162 158l2 2l2 2v-328h-328z"/>
+			<glyph unicode="f"
+				   d="M280 1518q0 -10 5 -20t15 -15t20 -5h80v-1026q0 -72 49 -123t119 -51h864q70 0 119 51t49 123v1026h80q16 0 28 12t12 28v40q0 10 -5 20t-15 15t-20 5h-276q0 2 -2 2l-200 200q-6 8 -19 13t-23 5h-320h-4h-2q-22 -2 -36 -18l-200 -200q-2 0 -2 -2h-276q-10 0 -20 -5 t-15 -15t-5 -20v-40zM520 452v1026h960v-1026q0 -24 -14 -39t-34 -15h-864q-10 0 -19 4t-15 11t-10 17t-4 22zM640 618q0 -24 18 -42t42 -18h40q24 0 42 18t18 42v640q0 24 -18 42t-42 18h-40q-24 0 -42 -18t-18 -42v-640zM764 1598l100 100h272l100 -100h-472zM920 618 q0 -24 18 -42t42 -18h40q24 0 42 18t18 42v640q0 24 -18 42t-42 18h-40q-24 0 -42 -18t-18 -42v-640zM1200 618q0 -24 18 -42t42 -18h40q24 0 42 18t18 42v640q0 24 -18 42t-42 18h-40q-24 0 -42 -18t-18 -42v-640z"/>
+			<glyph unicode="g"
+				   d="M240 1188q0 -24 18 -42t42 -18h442q40 0 54 36q6 14 6 26q0 22 -18 40l-144 144q92 108 230 152q74 24 149 24q65 0 131 -18q202 -54 305 -233q68 -117 68 -244q0 -67 -19 -136q-54 -201 -233 -305q-118 -68 -245 -68q-66 0 -134 18q-128 34 -224 130l-172 -168 q142 -142 334 -192q96 -26 192 -26t191 26q191 52 331 191t192 333q24 100 24 199q0 17 -1 35q-5 116 -49 224t-113 196t-169 154t-216 98q-94 24 -192 24h-28q-150 -6 -285 -70t-235 -174l-130 130q-20 20 -48 16q-22 -2 -38 -20t-16 -40v-442z"/>
+			<glyph unicode="h"
+				   d="M264 857q-26 96 -26 192.5t26 191.5q52 191 191 331t333 192q18 4 37 8t37 7t37 5t37 3t36 1h36q150 -6 285 -70t235 -174l130 130q20 20 48 16q22 -2 38 -20t16 -40v-442q0 -24 -18 -42t-42 -18h-442q-40 0 -54 36q-6 14 -6 26q0 22 18 40l144 144q-92 108 -230 152 q-74 24 -149 24q-65 0 -131 -18q-202 -54 -305 -233q-68 -117 -68 -244q0 -67 19 -136q54 -201 233 -305q118 -68 245 -68q66 0 134 18q128 34 224 130l172 -168q-142 -142 -334 -192q-96 -26 -192 -26t-191 26q-191 52 -331 191t-192 332z"/>
+			<glyph unicode="i"
+				   d="M80 1344q0 -56 40 -96t96 -40h184l-40 120h-144q-16 0 -16 16v264v186q0 14 16 14h104h344q16 0 16 -14v-190l120 -36v226q0 54 -40 94t-96 40h-448q-56 0 -96 -40t-40 -94v-450zM412 1522l106 -356q4 -16 23 -19t29 9l68 94l156 -156q18 -18 42 -18t40 16l6 8 q16 16 16 40t-18 40l-156 156l92 66q12 10 9 29t-19 23l-356 106h-8h-6q-14 -2 -21 -14q-4 -8 -4 -15q0 -5 1 -9zM1063 931q-1 -6 -1 -13q0 -9 2 -17q4 -15 16 -25l156 -156l-92 -66q-12 -10 -9 -29t19 -23l356 -106h4h4h6q14 2 21 14t3 24l-106 356q-4 16 -23 19t-29 -9 l-68 -94l-156 156q-18 18 -42 18h-5q-21 0 -35 -16l-6 -8q-12 -10 -15 -25zM1160 264q0 -56 40 -96t96 -40h448q56 0 96 40t40 96v448q0 36 -18 68t-49 50t-69 18h-184l40 -120h144q16 0 16 -16v-264v-184q0 -16 -16 -16h-104h-344q-16 0 -16 16v188l-120 36v-224z"/>
+			<glyph unicode="j"
+				   d="M120 306q0 -56 41 -97t97 -41h1484q38 0 70 19t50 51t18 68v1484q0 58 -40 98t-98 40h-1484q-58 0 -98 -40t-40 -98v-1484zM240 306v1484q0 18 18 18h1484q18 0 18 -18v-1484q0 -18 -18 -18h-1484q-18 0 -18 18zM322 1676l140 -480q6 -22 32 -26t40 14l90 126l162 -162 q16 -16 36 -21t40 -1t36 20l8 8q22 22 22 54t-24 56l-162 162l122 88q18 14 14 40t-26 32l-480 140q-8 4 -11 4t-9 -2q-18 -4 -27 -20q-5 -10 -5 -19q0 -7 2 -13zM1098 830l162 -162l-122 -88q-18 -12 -14 -38t24 -32l482 -142q7 -3 13 -3l7 1q16 4 26 20q6 10 6 20 q0 6 -2 12l-142 480q-6 22 -32 26t-38 -14l-90 -126l-164 162q-22 24 -55 25h-3q-31 0 -52 -21l-10 -10q-21 -21 -21 -51q0 -34 25 -59z"/>
+			<glyph unicode="k"
+				   d="M120 1148q0 -200 99 -370t269 -269t370 -99q230 0 420 132l6 -6l208 -208l112 -112q20 -20 54 -34t62 -14q66 0 113 47t47 113q0 28 -14 61t-34 53l-114 112l-206 208q-8 8 -16 14q102 172 102 372q0 150 -59 287t-158 236t-236 157t-287 58t-286 -58t-235 -157 t-158 -236t-59 -287zM358 1148q0 208 146 355t354 147q138 0 253 -67t182 -183t67 -252q0 -208 -147 -355t-355 -147t-354 147t-146 355zM518 1088q0 -16 12 -28t28 -12h200v-200q0 -16 12 -28t28 -12h120q18 0 29 12t11 28v200h200q18 0 29 12t11 28v120q0 16 -11 28 t-29 12h-200v200q0 16 -11 28t-29 12h-120q-16 0 -28 -12t-12 -28v-200h-200q-16 0 -28 -12t-12 -28v-120z"/>
+			<glyph unicode="l"
+				   d="M120 1148q0 -200 99 -370t269 -269t370 -99q230 0 420 132l6 -6l208 -208l112 -112q48 -48 114 -48t114 46q22 22 35 52t13 62q0 66 -48 114l-114 112l-206 208q-8 8 -16 14q102 172 102 372q0 150 -59 287t-158 236t-236 157t-287 58t-286 -58t-235 -157t-158 -236 t-59 -287zM358 1148q0 208 146 355t354 147q138 0 253 -67t182 -183t67 -252q0 -208 -147 -355t-355 -147t-354 147t-146 355zM518 1088q0 -16 12 -28t28 -12h600q18 0 29 12t11 28v120q0 16 -11 28t-29 12h-600q-16 0 -28 -12t-12 -28v-120z"/>
+			<glyph unicode="m"
+				   d="M120 1146q0 -200 99 -370t269 -269t370 -99q230 0 420 132l6 -6l208 -208l112 -112q46 -46 115 -46t114 44t45 113t-46 115l-114 112l-206 208q-8 6 -16 14q102 172 102 372t-99 370t-269 269t-371 99t-371 -99t-269 -269t-99 -370zM358 1146q0 208 146 355t354 147 q138 0 253 -67t182 -183t67 -252q0 -208 -147 -355t-355 -147t-354 147t-146 355zM638 1246q142 22 192 44h8v-524h160v760h-160q-10 -54 -38 -87t-67 -48t-95 -21v-124z"/>
+			<glyph unicode="n"
+				   d="M200 510q0 -108 77 -185t184 -77t184 77t77 185q0 26 -5 51t-15 48t-24 44t-31 39t-39 32l72 406h2q98 0 168 69t72 167l386 108q16 -32 41 -59t54 -46t65 -30t74 -11q106 0 183 77t77 184t-77 184t-183 77q-64 0 -120 -29t-92 -79t-46 -112l-414 -114q-72 94 -188 94 q-100 0 -170 -71t-70 -169q0 -112 86 -184l-74 -416q-52 -2 -99 -23t-81 -56t-54 -83t-20 -98zM362 510q0 42 29 70t71 28t70 -28t28 -70t-28 -71t-70 -29t-71 29t-29 71zM992 658q0 -20 14 -34t36 -14h240v-252q0 -20 14 -34t34 -14h142q14 0 25 6t18 17t7 25v252h240 q20 0 34 14t14 34v142q0 20 -14 35t-34 15h-240v244q0 20 -15 35t-35 15h-142q-20 0 -34 -15t-14 -35v-244h-240q-22 0 -36 -15t-14 -35v-142zM1442 1589q0 27 13 50t36 36t50 13t50 -13t36 -36t13 -50t-13 -50t-36 -36t-50 -13t-50 13t-36 36t-13 50z"/>
+			<glyph unicode="o"
+				   d="M200 510q0 -108 77 -185t184 -77t184 77t77 185q0 26 -5 51t-15 48t-24 44t-31 39t-39 32l72 406h2q98 0 168 69t72 167l386 108q16 -32 41 -59t54 -46t65 -30t74 -11q106 0 183 77t77 184t-77 184t-183 77q-64 0 -120 -29t-92 -79t-46 -112l-414 -114q-72 94 -188 94 q-100 0 -170 -71t-70 -169q0 -112 86 -184l-74 -416q-52 -2 -99 -23t-81 -56t-54 -83t-20 -98zM362 510q0 42 29 70t71 28t70 -28t28 -70t-28 -71t-70 -29t-71 29t-29 71zM992 658q0 -20 14 -34t36 -14h720q20 0 34 14t14 34v142q0 20 -14 35t-34 15h-720q-22 0 -36 -15 t-14 -35v-142zM1442 1589q0 27 13 50t36 36t50 13t50 -13t36 -36t13 -50t-13 -50t-36 -36t-50 -13t-50 13t-36 36t-13 50z"/>
+			<glyph unicode="p"
+				   d="M200 1008q0 -16 12 -28t28 -12h160v-240q0 -34 23 -57t57 -23h240q34 0 57 23t23 57v240h240v-520q0 -66 47 -113t113 -47h240q66 0 113 47t47 113v520h160q16 0 28 12t12 28v80q0 16 -12 28t-28 12h-160v520q0 66 -47 113t-113 47h-240q-66 0 -113 -47t-47 -113v-520 h-240v240q0 34 -23 57t-57 23h-240q-34 0 -57 -23t-23 -57v-240h-160q-16 0 -28 -12t-12 -28v-80zM1200 448v1200h240v-1200h-240z"/>
+			<glyph unicode="q"
+				   d="M240 608q0 -66 47 -113t113 -47h520v-160q0 -16 12 -28t28 -12h80q16 0 28 12t12 28v160h520q66 0 113 47t47 113v240q0 66 -47 113t-113 47h-520v240h240q34 0 57 23t23 57v240q0 34 -23 57t-57 23h-240v160q0 16 -12 28t-28 12h-80q-16 0 -28 -12t-12 -28v-160h-240 q-34 0 -57 -23t-23 -57v-240q0 -34 23 -57t57 -23h240v-240h-520q-66 0 -113 -47t-47 -113v-240zM400 608v240h1200v-240h-1200z"/>
+			<glyph unicode="&#x2000;" horiz-adv-x="1024"/>
+			<glyph unicode="&#x2001;"/>
+			<glyph unicode="&#x2002;" horiz-adv-x="1024"/>
+			<glyph unicode="&#x2003;"/>
+			<glyph unicode="&#x2004;" horiz-adv-x="682"/>
+			<glyph unicode="&#x2005;" horiz-adv-x="512"/>
+			<glyph unicode="&#x2006;" horiz-adv-x="341"/>
+			<glyph unicode="&#x2007;" horiz-adv-x="341"/>
+			<glyph unicode="&#x2008;" horiz-adv-x="256"/>
+			<glyph unicode="&#x2009;" horiz-adv-x="409"/>
+			<glyph unicode="&#x200a;" horiz-adv-x="113"/>
+			<glyph unicode="&#x202f;" horiz-adv-x="409"/>
+			<glyph unicode="&#x205f;" horiz-adv-x="512"/>
+			<glyph unicode="&#x25fc;" horiz-adv-x="1000" d="M0 0z"/>
+		</font>
+	</defs>
+</svg>
diff --git a/len-activiti/src/main/resources/static/editor-app/fonts/glyphicons-halflings-regular.svg b/len-activiti/src/main/resources/static/editor-app/fonts/glyphicons-halflings-regular.svg
index 4469488..8b77398 100644
--- a/len-activiti/src/main/resources/static/editor-app/fonts/glyphicons-halflings-regular.svg
+++ b/len-activiti/src/main/resources/static/editor-app/fonts/glyphicons-halflings-regular.svg
@@ -1,229 +1,410 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
-<font-face units-per-em="1200" ascent="960" descent="-240" />
-<missing-glyph horiz-adv-x="500" />
-<glyph />
-<glyph />
-<glyph unicode="&#xd;" />
-<glyph unicode=" " />
-<glyph unicode="*" d="M100 500v200h259l-183 183l141 141l183 -183v259h200v-259l183 183l141 -141l-183 -183h259v-200h-259l183 -183l-141 -141l-183 183v-259h-200v259l-183 -183l-141 141l183 183h-259z" />
-<glyph unicode="+" d="M0 400v300h400v400h300v-400h400v-300h-400v-400h-300v400h-400z" />
-<glyph unicode="&#xa0;" />
-<glyph unicode="&#x2000;" horiz-adv-x="652" />
-<glyph unicode="&#x2001;" horiz-adv-x="1304" />
-<glyph unicode="&#x2002;" horiz-adv-x="652" />
-<glyph unicode="&#x2003;" horiz-adv-x="1304" />
-<glyph unicode="&#x2004;" horiz-adv-x="434" />
-<glyph unicode="&#x2005;" horiz-adv-x="326" />
-<glyph unicode="&#x2006;" horiz-adv-x="217" />
-<glyph unicode="&#x2007;" horiz-adv-x="217" />
-<glyph unicode="&#x2008;" horiz-adv-x="163" />
-<glyph unicode="&#x2009;" horiz-adv-x="260" />
-<glyph unicode="&#x200a;" horiz-adv-x="72" />
-<glyph unicode="&#x202f;" horiz-adv-x="260" />
-<glyph unicode="&#x205f;" horiz-adv-x="326" />
-<glyph unicode="&#x20ac;" d="M100 500l100 100h113q0 47 5 100h-218l100 100h135q37 167 112 257q117 141 297 141q242 0 354 -189q60 -103 66 -209h-181q0 55 -25.5 99t-63.5 68t-75 36.5t-67 12.5q-24 0 -52.5 -10t-62.5 -32t-65.5 -67t-50.5 -107h379l-100 -100h-300q-6 -46 -6 -100h406l-100 -100 h-300q9 -74 33 -132t52.5 -91t62 -54.5t59 -29t46.5 -7.5q29 0 66 13t75 37t63.5 67.5t25.5 96.5h174q-31 -172 -128 -278q-107 -117 -274 -117q-205 0 -324 158q-36 46 -69 131.5t-45 205.5h-217z" />
-<glyph unicode="&#x2212;" d="M200 400h900v300h-900v-300z" />
-<glyph unicode="&#x2601;" d="M-14 494q0 -80 56.5 -137t135.5 -57h750q120 0 205 86t85 208q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5z" />
-<glyph unicode="&#x2709;" d="M0 100l400 400l200 -200l200 200l400 -400h-1200zM0 300v600l300 -300zM0 1100l600 -603l600 603h-1200zM900 600l300 300v-600z" />
-<glyph unicode="&#x270f;" d="M-13 -13l333 112l-223 223zM187 403l214 -214l614 614l-214 214zM887 1103l214 -214l99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13 -33 13t-33 -13z" />
-<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#xe001;" d="M0 1200h1200l-500 -550v-550h300v-100h-800v100h300v550z" />
-<glyph unicode="&#xe002;" d="M14 84q18 -55 86 -75.5t147 5.5q65 21 109 69t44 90v606l600 155v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q17 -55 85.5 -75.5t147.5 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10 -3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7 q-79 -25 -122.5 -82t-25.5 -112z" />
-<glyph unicode="&#xe003;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233z" />
-<glyph unicode="&#xe005;" d="M100 784q0 64 28 123t73 100.5t104.5 64t119 20.5t120 -38.5t104.5 -104.5q48 69 109.5 105t121.5 38t118.5 -20.5t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-149.5 152.5t-126.5 127.5 t-94 124.5t-33.5 117.5z" />
-<glyph unicode="&#xe006;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1z" />
-<glyph unicode="&#xe007;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1zM237 700l196 -142l-73 -226l192 140l195 -141l-74 229l193 140h-235l-77 211l-78 -211h-239z" />
-<glyph unicode="&#xe008;" d="M0 0v143l400 257v100q-37 0 -68.5 74.5t-31.5 125.5v200q0 124 88 212t212 88t212 -88t88 -212v-200q0 -51 -31.5 -125.5t-68.5 -74.5v-100l400 -257v-143h-1200z" />
-<glyph unicode="&#xe009;" d="M0 0v1100h1200v-1100h-1200zM100 100h100v100h-100v-100zM100 300h100v100h-100v-100zM100 500h100v100h-100v-100zM100 700h100v100h-100v-100zM100 900h100v100h-100v-100zM300 100h600v400h-600v-400zM300 600h600v400h-600v-400zM1000 100h100v100h-100v-100z M1000 300h100v100h-100v-100zM1000 500h100v100h-100v-100zM1000 700h100v100h-100v-100zM1000 900h100v100h-100v-100z" />
-<glyph unicode="&#xe010;" d="M0 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM0 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5zM600 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM600 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe011;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 450v200q0 21 14.5 35.5t35.5 14.5h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe012;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v200q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5 t-14.5 -35.5v-200zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe013;" d="M29 454l419 -420l818 820l-212 212l-607 -607l-206 207z" />
-<glyph unicode="&#xe014;" d="M106 318l282 282l-282 282l212 212l282 -282l282 282l212 -212l-282 -282l282 -282l-212 -212l-282 282l-282 -282z" />
-<glyph unicode="&#xe015;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233zM300 600v200h100v100h200v-100h100v-200h-100v-100h-200v100h-100z" />
-<glyph unicode="&#xe016;" d="M23 694q0 200 142 342t342 142t342 -142t142 -342q0 -141 -78 -262l300 -299q7 -7 7 -18t-7 -18l-109 -109q-8 -8 -18 -8t-18 8l-300 299q-120 -77 -261 -77q-200 0 -342 142t-142 342zM176 694q0 -136 97 -233t234 -97t233.5 97t96.5 233t-96.5 233t-233.5 97t-234 -97 t-97 -233zM300 601h400v200h-400v-200z" />
-<glyph unicode="&#xe017;" d="M23 600q0 183 105 331t272 210v-166q-103 -55 -165 -155t-62 -220q0 -177 125 -302t302 -125t302 125t125 302q0 120 -62 220t-165 155v166q167 -62 272 -210t105 -331q0 -118 -45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5 zM500 750q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v400q0 21 -14.5 35.5t-35.5 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-400z" />
-<glyph unicode="&#xe018;" d="M100 1h200v300h-200v-300zM400 1v500h200v-500h-200zM700 1v800h200v-800h-200zM1000 1v1200h200v-1200h-200z" />
-<glyph unicode="&#xe019;" d="M26 601q0 -33 6 -74l151 -38l2 -6q14 -49 38 -93l3 -5l-80 -134q45 -59 105 -105l133 81l5 -3q45 -26 94 -39l5 -2l38 -151q40 -5 74 -5q27 0 74 5l38 151l6 2q46 13 93 39l5 3l134 -81q56 44 104 105l-80 134l3 5q24 44 39 93l1 6l152 38q5 40 5 74q0 28 -5 73l-152 38 l-1 6q-16 51 -39 93l-3 5l80 134q-44 58 -104 105l-134 -81l-5 3q-45 25 -93 39l-6 1l-38 152q-40 5 -74 5q-27 0 -74 -5l-38 -152l-5 -1q-50 -14 -94 -39l-5 -3l-133 81q-59 -47 -105 -105l80 -134l-3 -5q-25 -47 -38 -93l-2 -6l-151 -38q-6 -48 -6 -73zM385 601 q0 88 63 151t152 63t152 -63t63 -151q0 -89 -63 -152t-152 -63t-152 63t-63 152z" />
-<glyph unicode="&#xe020;" d="M100 1025v50q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-50q0 -11 -7 -18t-18 -7h-1050q-11 0 -18 7t-7 18zM200 100v800h900v-800q0 -41 -29.5 -71t-70.5 -30h-700q-41 0 -70.5 30 t-29.5 71zM300 100h100v700h-100v-700zM500 100h100v700h-100v-700zM500 1100h300v100h-300v-100zM700 100h100v700h-100v-700zM900 100h100v700h-100v-700z" />
-<glyph unicode="&#xe021;" d="M1 601l656 644l644 -644h-200v-600h-300v400h-300v-400h-300v600h-200z" />
-<glyph unicode="&#xe022;" d="M100 25v1150q0 11 7 18t18 7h475v-500h400v-675q0 -11 -7 -18t-18 -7h-850q-11 0 -18 7t-7 18zM700 800v300l300 -300h-300z" />
-<glyph unicode="&#xe023;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 500v400h100 v-300h200v-100h-300z" />
-<glyph unicode="&#xe024;" d="M-100 0l431 1200h209l-21 -300h162l-20 300h208l431 -1200h-538l-41 400h-242l-40 -400h-539zM488 500h224l-27 300h-170z" />
-<glyph unicode="&#xe025;" d="M0 0v400h490l-290 300h200v500h300v-500h200l-290 -300h490v-400h-1100zM813 200h175v100h-175v-100z" />
-<glyph unicode="&#xe026;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM188 600q0 -170 121 -291t291 -121t291 121t121 291t-121 291t-291 121 t-291 -121t-121 -291zM350 600h150v300h200v-300h150l-250 -300z" />
-<glyph unicode="&#xe027;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM350 600l250 300 l250 -300h-150v-300h-200v300h-150z" />
-<glyph unicode="&#xe028;" d="M0 25v475l200 700h800q199 -700 200 -700v-475q0 -11 -7 -18t-18 -7h-1150q-11 0 -18 7t-7 18zM200 500h200l50 -200h300l50 200h200l-97 500h-606z" />
-<glyph unicode="&#xe029;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 397v401 l297 -200z" />
-<glyph unicode="&#xe030;" d="M23 600q0 -118 45.5 -224.5t123 -184t184 -123t224.5 -45.5t224.5 45.5t184 123t123 184t45.5 224.5h-150q0 -177 -125 -302t-302 -125t-302 125t-125 302t125 302t302 125q136 0 246 -81l-146 -146h400v400l-145 -145q-157 122 -355 122q-118 0 -224.5 -45.5t-184 -123 t-123 -184t-45.5 -224.5z" />
-<glyph unicode="&#xe031;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5q198 0 355 -122l145 145v-400h-400l147 147q-112 80 -247 80q-177 0 -302 -125t-125 -302h-150zM100 0v400h400l-147 -147q112 -80 247 -80q177 0 302 125t125 302h150q0 -118 -45.5 -224.5t-123 -184t-184 -123 t-224.5 -45.5q-198 0 -355 122z" />
-<glyph unicode="&#xe032;" d="M100 0h1100v1200h-1100v-1200zM200 100v900h900v-900h-900zM300 200v100h100v-100h-100zM300 400v100h100v-100h-100zM300 600v100h100v-100h-100zM300 800v100h100v-100h-100zM500 200h500v100h-500v-100zM500 400v100h500v-100h-500zM500 600v100h500v-100h-500z M500 800v100h500v-100h-500z" />
-<glyph unicode="&#xe033;" d="M0 100v600q0 41 29.5 70.5t70.5 29.5h100v200q0 82 59 141t141 59h300q82 0 141 -59t59 -141v-200h100q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-900q-41 0 -70.5 29.5t-29.5 70.5zM400 800h300v150q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-150z" />
-<glyph unicode="&#xe034;" d="M100 0v1100h100v-1100h-100zM300 400q60 60 127.5 84t127.5 17.5t122 -23t119 -30t110 -11t103 42t91 120.5v500q-40 -81 -101.5 -115.5t-127.5 -29.5t-138 25t-139.5 40t-125.5 25t-103 -29.5t-65 -115.5v-500z" />
-<glyph unicode="&#xe035;" d="M0 275q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 127 70.5 231.5t184.5 161.5t245 57t245 -57t184.5 -161.5t70.5 -231.5v-300q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 116 -49.5 227t-131 192.5t-192.5 131t-227 49.5t-227 -49.5t-192.5 -131t-131 -192.5 t-49.5 -227v-300zM200 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14zM800 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14z" />
-<glyph unicode="&#xe036;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM688 459l141 141l-141 141l71 71l141 -141l141 141l71 -71l-141 -141l141 -141l-71 -71l-141 141l-141 -141z" />
-<glyph unicode="&#xe037;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM700 857l69 53q111 -135 111 -310q0 -169 -106 -302l-67 54q86 110 86 248q0 146 -93 257z" />
-<glyph unicode="&#xe038;" d="M0 401v400h300l300 200v-800l-300 200h-300zM702 858l69 53q111 -135 111 -310q0 -170 -106 -303l-67 55q86 110 86 248q0 145 -93 257zM889 951l7 -8q123 -151 123 -344q0 -189 -119 -339l-7 -8l81 -66l6 8q142 178 142 405q0 230 -144 408l-6 8z" />
-<glyph unicode="&#xe039;" d="M0 0h500v500h-200v100h-100v-100h-200v-500zM0 600h100v100h400v100h100v100h-100v300h-500v-600zM100 100v300h300v-300h-300zM100 800v300h300v-300h-300zM200 200v100h100v-100h-100zM200 900h100v100h-100v-100zM500 500v100h300v-300h200v-100h-100v-100h-200v100 h-100v100h100v200h-200zM600 0v100h100v-100h-100zM600 1000h100v-300h200v-300h300v200h-200v100h200v500h-600v-200zM800 800v300h300v-300h-300zM900 0v100h300v-100h-300zM900 900v100h100v-100h-100zM1100 200v100h100v-100h-100z" />
-<glyph unicode="&#xe040;" d="M0 200h100v1000h-100v-1000zM100 0v100h300v-100h-300zM200 200v1000h100v-1000h-100zM500 0v91h100v-91h-100zM500 200v1000h200v-1000h-200zM700 0v91h100v-91h-100zM800 200v1000h100v-1000h-100zM900 0v91h200v-91h-200zM1000 200v1000h200v-1000h-200z" />
-<glyph unicode="&#xe041;" d="M1 700v475q0 10 7.5 17.5t17.5 7.5h474l700 -700l-500 -500zM148 953q0 -42 29 -71q30 -30 71.5 -30t71.5 30q29 29 29 71t-29 71q-30 30 -71.5 30t-71.5 -30q-29 -29 -29 -71z" />
-<glyph unicode="&#xe042;" d="M2 700v475q0 11 7 18t18 7h474l700 -700l-500 -500zM148 953q0 -42 30 -71q29 -30 71 -30t71 30q30 29 30 71t-30 71q-29 30 -71 30t-71 -30q-30 -29 -30 -71zM701 1200h100l700 -700l-500 -500l-50 50l450 450z" />
-<glyph unicode="&#xe043;" d="M100 0v1025l175 175h925v-1000l-100 -100v1000h-750l-100 -100h750v-1000h-900z" />
-<glyph unicode="&#xe044;" d="M200 0l450 444l450 -443v1150q0 20 -14.5 35t-35.5 15h-800q-21 0 -35.5 -15t-14.5 -35v-1151z" />
-<glyph unicode="&#xe045;" d="M0 100v700h200l100 -200h600l100 200h200v-700h-200v200h-800v-200h-200zM253 829l40 -124h592l62 124l-94 346q-2 11 -10 18t-18 7h-450q-10 0 -18 -7t-10 -18zM281 24l38 152q2 10 11.5 17t19.5 7h500q10 0 19.5 -7t11.5 -17l38 -152q2 -10 -3.5 -17t-15.5 -7h-600 q-10 0 -15.5 7t-3.5 17z" />
-<glyph unicode="&#xe046;" d="M0 200q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-150q-4 8 -11.5 21.5t-33 48t-53 61t-69 48t-83.5 21.5h-200q-41 0 -82 -20.5t-70 -50t-52 -59t-34 -50.5l-12 -20h-150q-41 0 -70.5 -29.5t-29.5 -70.5v-600z M356 500q0 100 72 172t172 72t172 -72t72 -172t-72 -172t-172 -72t-172 72t-72 172zM494 500q0 -44 31 -75t75 -31t75 31t31 75t-31 75t-75 31t-75 -31t-31 -75zM900 700v100h100v-100h-100z" />
-<glyph unicode="&#xe047;" d="M53 0h365v66q-41 0 -72 11t-49 38t1 71l92 234h391l82 -222q16 -45 -5.5 -88.5t-74.5 -43.5v-66h417v66q-34 1 -74 43q-18 19 -33 42t-21 37l-6 13l-385 998h-93l-399 -1006q-24 -48 -52 -75q-12 -12 -33 -25t-36 -20l-15 -7v-66zM416 521l178 457l46 -140l116 -317h-340 z" />
-<glyph unicode="&#xe048;" d="M100 0v89q41 7 70.5 32.5t29.5 65.5v827q0 28 -1 39.5t-5.5 26t-15.5 21t-29 14t-49 14.5v70h471q120 0 213 -88t93 -228q0 -55 -11.5 -101.5t-28 -74t-33.5 -47.5t-28 -28l-12 -7q8 -3 21.5 -9t48 -31.5t60.5 -58t47.5 -91.5t21.5 -129q0 -84 -59 -156.5t-142 -111 t-162 -38.5h-500zM400 200h161q89 0 153 48.5t64 132.5q0 90 -62.5 154.5t-156.5 64.5h-159v-400zM400 700h139q76 0 130 61.5t54 138.5q0 82 -84 130.5t-239 48.5v-379z" />
-<glyph unicode="&#xe049;" d="M200 0v57q77 7 134.5 40.5t65.5 80.5l173 849q10 56 -10 74t-91 37q-6 1 -10.5 2.5t-9.5 2.5v57h425l2 -57q-33 -8 -62 -25.5t-46 -37t-29.5 -38t-17.5 -30.5l-5 -12l-128 -825q-10 -52 14 -82t95 -36v-57h-500z" />
-<glyph unicode="&#xe050;" d="M-75 200h75v800h-75l125 167l125 -167h-75v-800h75l-125 -167zM300 900v300h150h700h150v-300h-50q0 29 -8 48.5t-18.5 30t-33.5 15t-39.5 5.5t-50.5 1h-200v-850l100 -50v-100h-400v100l100 50v850h-200q-34 0 -50.5 -1t-40 -5.5t-33.5 -15t-18.5 -30t-8.5 -48.5h-49z " />
-<glyph unicode="&#xe051;" d="M33 51l167 125v-75h800v75l167 -125l-167 -125v75h-800v-75zM100 901v300h150h700h150v-300h-50q0 29 -8 48.5t-18 30t-33.5 15t-40 5.5t-50.5 1h-200v-650l100 -50v-100h-400v100l100 50v650h-200q-34 0 -50.5 -1t-39.5 -5.5t-33.5 -15t-18.5 -30t-8 -48.5h-50z" />
-<glyph unicode="&#xe052;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 350q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM0 650q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1000q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 950q0 -20 14.5 -35t35.5 -15h600q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-600q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
-<glyph unicode="&#xe053;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 650q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM200 350q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM200 950q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
-<glyph unicode="&#xe054;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1000q-21 0 -35.5 15 t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-600 q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe055;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100 q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe056;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM300 50v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800 q-21 0 -35.5 15t-14.5 35zM300 650v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 950v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15 h-800q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe057;" d="M-101 500v100h201v75l166 -125l-166 -125v75h-201zM300 0h100v1100h-100v-1100zM500 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35 v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 650q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100 q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100z" />
-<glyph unicode="&#xe058;" d="M1 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 650 q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM801 0v1100h100v-1100 h-100zM934 550l167 -125v75h200v100h-200v75z" />
-<glyph unicode="&#xe059;" d="M0 275v650q0 31 22 53t53 22h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53zM900 600l300 300v-600z" />
-<glyph unicode="&#xe060;" d="M0 44v1012q0 18 13 31t31 13h1112q19 0 31.5 -13t12.5 -31v-1012q0 -18 -12.5 -31t-31.5 -13h-1112q-18 0 -31 13t-13 31zM100 263l247 182l298 -131l-74 156l293 318l236 -288v500h-1000v-737zM208 750q0 56 39 95t95 39t95 -39t39 -95t-39 -95t-95 -39t-95 39t-39 95z " />
-<glyph unicode="&#xe062;" d="M148 745q0 124 60.5 231.5t165 172t226.5 64.5q123 0 227 -63t164.5 -169.5t60.5 -229.5t-73 -272q-73 -114 -166.5 -237t-150.5 -189l-57 -66q-10 9 -27 26t-66.5 70.5t-96 109t-104 135.5t-100.5 155q-63 139 -63 262zM342 772q0 -107 75.5 -182.5t181.5 -75.5 q107 0 182.5 75.5t75.5 182.5t-75.5 182t-182.5 75t-182 -75.5t-75 -181.5z" />
-<glyph unicode="&#xe063;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM173 600q0 -177 125.5 -302t301.5 -125v854q-176 0 -301.5 -125 t-125.5 -302z" />
-<glyph unicode="&#xe064;" d="M117 406q0 94 34 186t88.5 172.5t112 159t115 177t87.5 194.5q21 -71 57.5 -142.5t76 -130.5t83 -118.5t82 -117t70 -116t50 -125.5t18.5 -136q0 -89 -39 -165.5t-102 -126.5t-140 -79.5t-156 -33.5q-114 6 -211.5 53t-161.5 138.5t-64 210.5zM243 414q14 -82 59.5 -136 t136.5 -80l16 98q-7 6 -18 17t-34 48t-33 77q-15 73 -14 143.5t10 122.5l9 51q-92 -110 -119.5 -185t-12.5 -156z" />
-<glyph unicode="&#xe065;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5q366 -6 397 -14l-186 -186h-311q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v125l200 200v-225q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM436 341l161 50l412 412l-114 113l-405 -405zM995 1015l113 -113l113 113l-21 85l-92 28z" />
-<glyph unicode="&#xe066;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h261l2 -80q-133 -32 -218 -120h-145q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-53q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5 zM423 524q30 38 81.5 64t103 35.5t99 14t77.5 3.5l29 -1v-209l360 324l-359 318v-216q-7 0 -19 -1t-48 -8t-69.5 -18.5t-76.5 -37t-76.5 -59t-62 -88t-39.5 -121.5z" />
-<glyph unicode="&#xe067;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-169q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM342 632l283 -284l566 567l-136 137l-430 -431l-147 147z" />
-<glyph unicode="&#xe068;" d="M0 603l300 296v-198h200v200h-200l300 300l295 -300h-195v-200h200v198l300 -296l-300 -300v198h-200v-200h195l-295 -300l-300 300h200v200h-200v-198z" />
-<glyph unicode="&#xe069;" d="M200 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-1100l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe070;" d="M0 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-487l500 487v-1100l-500 488v-488l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe071;" d="M136 550l564 550v-487l500 487v-1100l-500 488v-488z" />
-<glyph unicode="&#xe072;" d="M200 0l900 550l-900 550v-1100z" />
-<glyph unicode="&#xe073;" d="M200 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5t-14.5 -35.5v-800zM600 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
-<glyph unicode="&#xe074;" d="M200 150q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v800q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
-<glyph unicode="&#xe075;" d="M0 0v1100l500 -487v487l564 -550l-564 -550v488z" />
-<glyph unicode="&#xe076;" d="M0 0v1100l500 -487v487l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-500 -488v488z" />
-<glyph unicode="&#xe077;" d="M300 0v1100l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438z" />
-<glyph unicode="&#xe078;" d="M100 250v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5zM100 500h1100l-550 564z" />
-<glyph unicode="&#xe079;" d="M185 599l592 -592l240 240l-353 353l353 353l-240 240z" />
-<glyph unicode="&#xe080;" d="M272 194l353 353l-353 353l241 240l572 -571l21 -22l-1 -1v-1l-592 -591z" />
-<glyph unicode="&#xe081;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM300 500h200v-200h200v200h200v200h-200v200h-200v-200h-200v-200z" />
-<glyph unicode="&#xe082;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM300 500h600v200h-600v-200z" />
-<glyph unicode="&#xe083;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM246 459l213 -213l141 142l141 -142l213 213l-142 141l142 141l-213 212l-141 -141l-141 142l-212 -213l141 -141z" />
-<glyph unicode="&#xe084;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM270 551l276 -277l411 411l-175 174l-236 -236l-102 102z" />
-<glyph unicode="&#xe085;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM363 700h144q4 0 11.5 -1t11 -1t6.5 3t3 9t1 11t3.5 8.5t3.5 6t5.5 4t6.5 2.5t9 1.5t9 0.5h11.5h12.5q19 0 30 -10t11 -26 q0 -22 -4 -28t-27 -22q-5 -1 -12.5 -3t-27 -13.5t-34 -27t-26.5 -46t-11 -68.5h200q5 3 14 8t31.5 25.5t39.5 45.5t31 69t14 94q0 51 -17.5 89t-42 58t-58.5 32t-58.5 15t-51.5 3q-105 0 -172 -56t-67 -183zM500 300h200v100h-200v-100z" />
-<glyph unicode="&#xe086;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM400 300h400v100h-100v300h-300v-100h100v-200h-100v-100zM500 800h200v100h-200v-100z" />
-<glyph unicode="&#xe087;" d="M0 500v200h194q15 60 36 104.5t55.5 86t88 69t126.5 40.5v200h200v-200q54 -20 113 -60t112.5 -105.5t71.5 -134.5h203v-200h-203q-25 -102 -116.5 -186t-180.5 -117v-197h-200v197q-140 27 -208 102.5t-98 200.5h-194zM290 500q24 -73 79.5 -127.5t130.5 -78.5v206h200 v-206q149 48 201 206h-201v200h200q-25 74 -76 127.5t-124 76.5v-204h-200v203q-75 -24 -130 -77.5t-79 -125.5h209v-200h-210z" />
-<glyph unicode="&#xe088;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM356 465l135 135 l-135 135l109 109l135 -135l135 135l109 -109l-135 -135l135 -135l-109 -109l-135 135l-135 -135z" />
-<glyph unicode="&#xe089;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM322 537l141 141 l87 -87l204 205l142 -142l-346 -345z" />
-<glyph unicode="&#xe090;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -115 62 -215l568 567q-100 62 -216 62q-171 0 -292.5 -121.5t-121.5 -292.5zM391 245q97 -59 209 -59q171 0 292.5 121.5t121.5 292.5 q0 112 -59 209z" />
-<glyph unicode="&#xe091;" d="M0 547l600 453v-300h600v-300h-600v-301z" />
-<glyph unicode="&#xe092;" d="M0 400v300h600v300l600 -453l-600 -448v301h-600z" />
-<glyph unicode="&#xe093;" d="M204 600l450 600l444 -600h-298v-600h-300v600h-296z" />
-<glyph unicode="&#xe094;" d="M104 600h296v600h300v-600h298l-449 -600z" />
-<glyph unicode="&#xe095;" d="M0 200q6 132 41 238.5t103.5 193t184 138t271.5 59.5v271l600 -453l-600 -448v301q-95 -2 -183 -20t-170 -52t-147 -92.5t-100 -135.5z" />
-<glyph unicode="&#xe096;" d="M0 0v400l129 -129l294 294l142 -142l-294 -294l129 -129h-400zM635 777l142 -142l294 294l129 -129v400h-400l129 -129z" />
-<glyph unicode="&#xe097;" d="M34 176l295 295l-129 129h400v-400l-129 130l-295 -295zM600 600v400l129 -129l295 295l142 -141l-295 -295l129 -130h-400z" />
-<glyph unicode="&#xe101;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM456 851l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5 t21.5 34.5l58 302q4 20 -8 34.5t-33 14.5h-207q-20 0 -32 -14.5t-8 -34.5zM500 300h200v100h-200v-100z" />
-<glyph unicode="&#xe102;" d="M0 800h100v-200h400v300h200v-300h400v200h100v100h-111v6t-1 15t-3 18l-34 172q-11 39 -41.5 63t-69.5 24q-32 0 -61 -17l-239 -144q-22 -13 -40 -35q-19 24 -40 36l-238 144q-33 18 -62 18q-39 0 -69.5 -23t-40.5 -61l-35 -177q-2 -8 -3 -18t-1 -15v-6h-111v-100z M100 0h400v400h-400v-400zM200 900q-3 0 14 48t35 96l18 47l214 -191h-281zM700 0v400h400v-400h-400zM731 900l202 197q5 -12 12 -32.5t23 -64t25 -72t7 -28.5h-269z" />
-<glyph unicode="&#xe103;" d="M0 -22v143l216 193q-9 53 -13 83t-5.5 94t9 113t38.5 114t74 124q47 60 99.5 102.5t103 68t127.5 48t145.5 37.5t184.5 43.5t220 58.5q0 -189 -22 -343t-59 -258t-89 -181.5t-108.5 -120t-122 -68t-125.5 -30t-121.5 -1.5t-107.5 12.5t-87.5 17t-56.5 7.5l-99 -55z M238.5 300.5q19.5 -6.5 86.5 76.5q55 66 367 234q70 38 118.5 69.5t102 79t99 111.5t86.5 148q22 50 24 60t-6 19q-7 5 -17 5t-26.5 -14.5t-33.5 -39.5q-35 -51 -113.5 -108.5t-139.5 -89.5l-61 -32q-369 -197 -458 -401q-48 -111 -28.5 -117.5z" />
-<glyph unicode="&#xe104;" d="M111 408q0 -33 5 -63q9 -56 44 -119.5t105 -108.5q31 -21 64 -16t62 23.5t57 49.5t48 61.5t35 60.5q32 66 39 184.5t-13 157.5q79 -80 122 -164t26 -184q-5 -33 -20.5 -69.5t-37.5 -80.5q-10 -19 -14.5 -29t-12 -26t-9 -23.5t-3 -19t2.5 -15.5t11 -9.5t19.5 -5t30.5 2.5 t42 8q57 20 91 34t87.5 44.5t87 64t65.5 88.5t47 122q38 172 -44.5 341.5t-246.5 278.5q22 -44 43 -129q39 -159 -32 -154q-15 2 -33 9q-79 33 -120.5 100t-44 175.5t48.5 257.5q-13 -8 -34 -23.5t-72.5 -66.5t-88.5 -105.5t-60 -138t-8 -166.5q2 -12 8 -41.5t8 -43t6 -39.5 t3.5 -39.5t-1 -33.5t-6 -31.5t-13.5 -24t-21 -20.5t-31 -12q-38 -10 -67 13t-40.5 61.5t-15 81.5t10.5 75q-52 -46 -83.5 -101t-39 -107t-7.5 -85z" />
-<glyph unicode="&#xe105;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5t145.5 -23.5t132.5 -59t116.5 -83.5t97 -90t74.5 -85.5t49 -63.5t20 -30l26 -40l-26 -40q-6 -10 -20 -30t-49 -63.5t-74.5 -85.5t-97 -90t-116.5 -83.5t-132.5 -59t-145.5 -23.5 t-145.5 23.5t-132.5 59t-116.5 83.5t-97 90t-74.5 85.5t-49 63.5t-20 30zM120 600q7 -10 40.5 -58t56 -78.5t68 -77.5t87.5 -75t103 -49.5t125 -21.5t123.5 20t100.5 45.5t85.5 71.5t66.5 75.5t58 81.5t47 66q-1 1 -28.5 37.5t-42 55t-43.5 53t-57.5 63.5t-58.5 54 q49 -74 49 -163q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l105 105q-37 24 -75 72t-57 84l-20 36z" />
-<glyph unicode="&#xe106;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5q61 0 121 -17l37 142h148l-314 -1200h-148l37 143q-82 21 -165 71.5t-140 102t-109.5 112t-72 88.5t-29.5 43zM120 600q210 -282 393 -336l37 141q-107 18 -178.5 101.5t-71.5 193.5 q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l47 47l23 87q-30 28 -59 69t-44 68l-14 26zM780 161l38 145q22 15 44.5 34t46 44t40.5 44t41 50.5t33.5 43.5t33 44t24.5 34q-97 127 -140 175l39 146q67 -54 131.5 -125.5t87.5 -103.5t36 -52l26 -40l-26 -40 q-7 -12 -25.5 -38t-63.5 -79.5t-95.5 -102.5t-124 -100t-146.5 -79z" />
-<glyph unicode="&#xe107;" d="M-97.5 34q13.5 -34 50.5 -34h1294q37 0 50.5 35.5t-7.5 67.5l-642 1056q-20 33 -48 36t-48 -29l-642 -1066q-21 -32 -7.5 -66zM155 200l445 723l445 -723h-345v100h-200v-100h-345zM500 600l100 -300l100 300v100h-200v-100z" />
-<glyph unicode="&#xe108;" d="M100 262v41q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44t106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -91 100 -113v-64q0 -21 -13 -29t-32 1l-94 78h-222l-94 -78q-19 -9 -32 -1t-13 29v64 q0 22 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5z" />
-<glyph unicode="&#xe109;" d="M0 50q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v750h-1100v-750zM0 900h1100v150q0 21 -14.5 35.5t-35.5 14.5h-150v100h-100v-100h-500v100h-100v-100h-150q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 100v100h100v-100h-100zM100 300v100h100v-100h-100z M100 500v100h100v-100h-100zM300 100v100h100v-100h-100zM300 300v100h100v-100h-100zM300 500v100h100v-100h-100zM500 100v100h100v-100h-100zM500 300v100h100v-100h-100zM500 500v100h100v-100h-100zM700 100v100h100v-100h-100zM700 300v100h100v-100h-100zM700 500 v100h100v-100h-100zM900 100v100h100v-100h-100zM900 300v100h100v-100h-100zM900 500v100h100v-100h-100z" />
-<glyph unicode="&#xe110;" d="M0 200v200h259l600 600h241v198l300 -295l-300 -300v197h-159l-600 -600h-341zM0 800h259l122 -122l141 142l-181 180h-341v-200zM678 381l141 142l122 -123h159v198l300 -295l-300 -300v197h-241z" />
-<glyph unicode="&#xe111;" d="M0 400v600q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5z" />
-<glyph unicode="&#xe112;" d="M100 600v200h300v-250q0 -113 6 -145q17 -92 102 -117q39 -11 92 -11q37 0 66.5 5.5t50 15.5t36 24t24 31.5t14 37.5t7 42t2.5 45t0 47v25v250h300v-200q0 -42 -3 -83t-15 -104t-31.5 -116t-58 -109.5t-89 -96.5t-129 -65.5t-174.5 -25.5t-174.5 25.5t-129 65.5t-89 96.5 t-58 109.5t-31.5 116t-15 104t-3 83zM100 900v300h300v-300h-300zM800 900v300h300v-300h-300z" />
-<glyph unicode="&#xe113;" d="M-30 411l227 -227l352 353l353 -353l226 227l-578 579z" />
-<glyph unicode="&#xe114;" d="M70 797l580 -579l578 579l-226 227l-353 -353l-352 353z" />
-<glyph unicode="&#xe115;" d="M-198 700l299 283l300 -283h-203v-400h385l215 -200h-800v600h-196zM402 1000l215 -200h381v-400h-198l299 -283l299 283h-200v600h-796z" />
-<glyph unicode="&#xe116;" d="M18 939q-5 24 10 42q14 19 39 19h896l38 162q5 17 18.5 27.5t30.5 10.5h94q20 0 35 -14.5t15 -35.5t-15 -35.5t-35 -14.5h-54l-201 -961q-2 -4 -6 -10.5t-19 -17.5t-33 -11h-31v-50q0 -20 -14.5 -35t-35.5 -15t-35.5 15t-14.5 35v50h-300v-50q0 -20 -14.5 -35t-35.5 -15 t-35.5 15t-14.5 35v50h-50q-21 0 -35.5 15t-14.5 35q0 21 14.5 35.5t35.5 14.5h535l48 200h-633q-32 0 -54.5 21t-27.5 43z" />
-<glyph unicode="&#xe117;" d="M0 0v800h1200v-800h-1200zM0 900v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-100h-1200z" />
-<glyph unicode="&#xe118;" d="M1 0l300 700h1200l-300 -700h-1200zM1 400v600h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-200h-1000z" />
-<glyph unicode="&#xe119;" d="M302 300h198v600h-198l298 300l298 -300h-198v-600h198l-298 -300z" />
-<glyph unicode="&#xe120;" d="M0 600l300 298v-198h600v198l300 -298l-300 -297v197h-600v-197z" />
-<glyph unicode="&#xe121;" d="M0 100v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM31 400l172 739q5 22 23 41.5t38 19.5h672q19 0 37.5 -22.5t23.5 -45.5l172 -732h-1138zM800 100h100v100h-100v-100z M1000 100h100v100h-100v-100z" />
-<glyph unicode="&#xe122;" d="M-101 600v50q0 24 25 49t50 38l25 13v-250l-11 5.5t-24 14t-30 21.5t-24 27.5t-11 31.5zM99 500v250v5q0 13 0.5 18.5t2.5 13t8 10.5t15 3h200l675 250v-850l-675 200h-38l47 -276q2 -12 -3 -17.5t-11 -6t-21 -0.5h-8h-83q-20 0 -34.5 14t-18.5 35q-56 337 -56 351z M1100 200v850q0 21 14.5 35.5t35.5 14.5q20 0 35 -14.5t15 -35.5v-850q0 -20 -15 -35t-35 -15q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe123;" d="M74 350q0 21 13.5 35.5t33.5 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3 32t29 13h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q20 0 33.5 -14.5t13.5 -35.5q0 -20 -13 -40t-31 -27q-22 -9 -63 -23t-167.5 -37 t-251.5 -23t-245.5 20.5t-178.5 41.5l-58 20q-18 7 -31 27.5t-13 40.5zM497 110q12 -49 40 -79.5t63 -30.5t63 30.5t39 79.5q-48 -6 -102 -6t-103 6z" />
-<glyph unicode="&#xe124;" d="M21 445l233 -45l-78 -224l224 78l45 -233l155 179l155 -179l45 233l224 -78l-78 224l234 45l-180 155l180 156l-234 44l78 225l-224 -78l-45 233l-155 -180l-155 180l-45 -233l-224 78l78 -225l-233 -44l179 -156z" />
-<glyph unicode="&#xe125;" d="M0 200h200v600h-200v-600zM300 275q0 -75 100 -75h61q123 -100 139 -100h250q46 0 83 57l238 344q29 31 29 74v100q0 44 -30.5 84.5t-69.5 40.5h-328q28 118 28 125v150q0 44 -30.5 84.5t-69.5 40.5h-50q-27 0 -51 -20t-38 -48l-96 -198l-145 -196q-20 -26 -20 -63v-400z M400 300v375l150 212l100 213h50v-175l-50 -225h450v-125l-250 -375h-214l-136 100h-100z" />
-<glyph unicode="&#xe126;" d="M0 400v600h200v-600h-200zM300 525v400q0 75 100 75h61q123 100 139 100h250q46 0 83 -57l238 -344q29 -31 29 -74v-100q0 -44 -30.5 -84.5t-69.5 -40.5h-328q28 -118 28 -125v-150q0 -44 -30.5 -84.5t-69.5 -40.5h-50q-27 0 -51 20t-38 48l-96 198l-145 196 q-20 26 -20 63zM400 525l150 -212l100 -213h50v175l-50 225h450v125l-250 375h-214l-136 -100h-100v-375z" />
-<glyph unicode="&#xe127;" d="M8 200v600h200v-600h-200zM308 275v525q0 17 14 35.5t28 28.5l14 9l362 230q14 6 25 6q17 0 29 -12l109 -112q14 -14 14 -34q0 -18 -11 -32l-85 -121h302q85 0 138.5 -38t53.5 -110t-54.5 -111t-138.5 -39h-107l-130 -339q-7 -22 -20.5 -41.5t-28.5 -19.5h-341 q-7 0 -90 81t-83 94zM408 289l100 -89h293l131 339q6 21 19.5 41t28.5 20h203q16 0 25 15t9 36q0 20 -9 34.5t-25 14.5h-457h-6.5h-7.5t-6.5 0.5t-6 1t-5 1.5t-5.5 2.5t-4 4t-4 5.5q-5 12 -5 20q0 14 10 27l147 183l-86 83l-339 -236v-503z" />
-<glyph unicode="&#xe128;" d="M-101 651q0 72 54 110t139 37h302l-85 121q-11 16 -11 32q0 21 14 34l109 113q13 12 29 12q11 0 25 -6l365 -230q7 -4 16.5 -10.5t26 -26t16.5 -36.5v-526q0 -13 -85.5 -93.5t-93.5 -80.5h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-84 0 -139 39t-55 111zM-1 601h222 q15 0 28.5 -20.5t19.5 -40.5l131 -339h293l106 89v502l-342 237l-87 -83l145 -184q10 -11 10 -26q0 -11 -5 -20q-1 -3 -3.5 -5.5l-4 -4t-5 -2.5t-5.5 -1.5t-6.5 -1t-6.5 -0.5h-7.5h-6.5h-476v-100zM999 201v600h200v-600h-200z" />
-<glyph unicode="&#xe129;" d="M97 719l230 -363q4 -6 10.5 -15.5t26 -25t36.5 -15.5h525q13 0 94 83t81 90v342q0 15 -20 28.5t-41 19.5l-339 131v106q0 84 -39 139t-111 55t-110 -53.5t-38 -138.5v-302l-121 84q-15 12 -33.5 11.5t-32.5 -13.5l-112 -110q-22 -22 -6 -53zM172 739l83 86l183 -146 q22 -18 47 -5q3 1 5.5 3.5l4 4t2.5 5t1.5 5.5t1 6.5t0.5 6v7.5v7v456q0 22 25 31t50 -0.5t25 -30.5v-202q0 -16 20 -29.5t41 -19.5l339 -130v-294l-89 -100h-503zM400 0v200h600v-200h-600z" />
-<glyph unicode="&#xe130;" d="M1 585q-15 -31 7 -53l112 -110q13 -13 32 -13.5t34 10.5l121 85l-1 -302q0 -84 38.5 -138t110.5 -54t111 55t39 139v106l339 131q20 6 40.5 19.5t20.5 28.5v342q0 7 -81 90t-94 83h-525q-17 0 -35.5 -14t-28.5 -28l-10 -15zM76 565l237 339h503l89 -100v-294l-340 -130 q-20 -6 -40 -20t-20 -29v-202q0 -22 -25 -31t-50 0t-25 31v456v14.5t-1.5 11.5t-5 12t-9.5 7q-24 13 -46 -5l-184 -146zM305 1104v200h600v-200h-600z" />
-<glyph unicode="&#xe131;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 500h300l-2 -194l402 294l-402 298v-197h-298v-201z" />
-<glyph unicode="&#xe132;" d="M0 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t231.5 47.5q122 0 232.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-218 -217.5t-300 -80t-299.5 80t-217.5 217.5t-80 299.5zM200 600l400 -294v194h302v201h-300v197z" />
-<glyph unicode="&#xe133;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600h200v-300h200v300h200l-300 400z" />
-<glyph unicode="&#xe134;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600l300 -400l300 400h-200v300h-200v-300h-200z" />
-<glyph unicode="&#xe135;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM254 780q-8 -34 5.5 -93t7.5 -87q0 -9 17 -44t16 -60q12 0 23 -5.5 t23 -15t20 -13.5q20 -10 108 -42q22 -8 53 -31.5t59.5 -38.5t57.5 -11q8 -18 -15 -55.5t-20 -57.5q12 -21 22.5 -34.5t28 -27t36.5 -17.5q0 -6 -3 -15.5t-3.5 -14.5t4.5 -17q101 -2 221 111q31 30 47 48t34 49t21 62q-14 9 -37.5 9.5t-35.5 7.5q-14 7 -49 15t-52 19 q-9 0 -39.5 -0.5t-46.5 -1.5t-39 -6.5t-39 -16.5q-50 -35 -66 -12q-4 2 -3.5 25.5t0.5 25.5q-6 13 -26.5 17t-24.5 7q2 22 -2 41t-16.5 28t-38.5 -20q-23 -25 -42 4q-19 28 -8 58q8 16 22 22q6 -1 26 -1.5t33.5 -4.5t19.5 -13q12 -19 32 -37.5t34 -27.5l14 -8q0 3 9.5 39.5 t5.5 57.5q-4 23 14.5 44.5t22.5 31.5q5 14 10 35t8.5 31t15.5 22.5t34 21.5q-6 18 10 37q8 0 23.5 -1.5t24.5 -1.5t20.5 4.5t20.5 15.5q-10 23 -30.5 42.5t-38 30t-49 26.5t-43.5 23q11 41 1 44q31 -13 58.5 -14.5t39.5 3.5l11 4q6 36 -17 53.5t-64 28.5t-56 23 q-19 -3 -37 0q-15 -12 -36.5 -21t-34.5 -12t-44 -8t-39 -6q-15 -3 -46 0t-45 -3q-20 -6 -51.5 -25.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79zM518 915q3 12 16 30.5t16 25.5q10 -10 18.5 -10t14 6t14.5 14.5t16 12.5q0 -18 8 -42.5t16.5 -44 t9.5 -23.5q-6 1 -39 5t-53.5 10t-36.5 16z" />
-<glyph unicode="&#xe136;" d="M0 164.5q0 21.5 15 37.5l600 599q-33 101 6 201.5t135 154.5q164 92 306 -9l-259 -138l145 -232l251 126q13 -175 -151 -267q-123 -70 -253 -23l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5z" />
-<glyph unicode="&#xe137;" horiz-adv-x="1220" d="M0 196v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 596v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5zM0 996v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM600 596h500v100h-500v-100zM800 196h300v100h-300v-100zM900 996h200v100h-200v-100z" />
-<glyph unicode="&#xe138;" d="M100 1100v100h1000v-100h-1000zM150 1000h900l-350 -500v-300l-200 -200v500z" />
-<glyph unicode="&#xe139;" d="M0 200v200h1200v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500z M500 1000h200v100h-200v-100z" />
-<glyph unicode="&#xe140;" d="M0 0v400l129 -129l200 200l142 -142l-200 -200l129 -129h-400zM0 800l129 129l200 -200l142 142l-200 200l129 129h-400v-400zM729 329l142 142l200 -200l129 129v-400h-400l129 129zM729 871l200 200l-129 129h400v-400l-129 129l-200 -200z" />
-<glyph unicode="&#xe141;" d="M0 596q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 596q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM291 655 q0 23 15.5 38.5t38.5 15.5t39 -16t16 -38q0 -23 -16 -39t-39 -16q-22 0 -38 16t-16 39zM400 850q0 22 16 38.5t39 16.5q22 0 38 -16t16 -39t-16 -39t-38 -16q-23 0 -39 16.5t-16 38.5zM513 609q0 32 21 56.5t52 29.5l122 126l1 1q-9 14 -9 28q0 22 16 38.5t39 16.5 q22 0 38 -16t16 -39t-16 -39t-38 -16q-16 0 -29 10l-55 -145q17 -22 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5q-37 0 -62.5 25.5t-25.5 61.5zM800 655q0 22 16 38t39 16t38.5 -15.5t15.5 -38.5t-16 -39t-38 -16q-23 0 -39 16t-16 39z" />
-<glyph unicode="&#xe142;" d="M-40 375q-13 -95 35 -173q35 -57 94 -89t129 -32q63 0 119 28q33 16 65 40.5t52.5 45.5t59.5 64q40 44 57 61l394 394q35 35 47 84t-3 96q-27 87 -117 104q-20 2 -29 2q-46 0 -79.5 -17t-67.5 -51l-388 -396l-7 -7l69 -67l377 373q20 22 39 38q23 23 50 23q38 0 53 -36 q16 -39 -20 -75l-547 -547q-52 -52 -125 -52q-55 0 -100 33t-54 96q-5 35 2.5 66t31.5 63t42 50t56 54q24 21 44 41l348 348q52 52 82.5 79.5t84 54t107.5 26.5q25 0 48 -4q95 -17 154 -94.5t51 -175.5q-7 -101 -98 -192l-252 -249l-253 -256l7 -7l69 -60l517 511 q67 67 95 157t11 183q-16 87 -67 154t-130 103q-69 33 -152 33q-107 0 -197 -55q-40 -24 -111 -95l-512 -512q-68 -68 -81 -163z" />
-<glyph unicode="&#xe143;" d="M79 784q0 131 99 229.5t230 98.5q144 0 242 -129q103 129 245 129q130 0 227 -98.5t97 -229.5q0 -46 -17.5 -91t-61 -99t-77 -89.5t-104.5 -105.5q-197 -191 -293 -322l-17 -23l-16 23q-43 58 -100 122.5t-92 99.5t-101 100l-84.5 84.5t-68 74t-60 78t-33.5 70.5t-15 78z M250 784q0 -27 30.5 -70t61.5 -75.5t95 -94.5l22 -22q93 -90 190 -201q82 92 195 203l12 12q64 62 97.5 97t64.5 79t31 72q0 71 -48 119.5t-106 48.5q-73 0 -131 -83l-118 -171l-114 174q-51 80 -124 80q-59 0 -108.5 -49.5t-49.5 -118.5z" />
-<glyph unicode="&#xe144;" d="M57 353q0 -94 66 -160l141 -141q66 -66 159 -66q95 0 159 66l283 283q66 66 66 159t-66 159l-141 141q-12 12 -19 17l-105 -105l212 -212l-389 -389l-247 248l95 95l-18 18q-46 45 -75 101l-55 -55q-66 -66 -66 -159zM269 706q0 -93 66 -159l141 -141l19 -17l105 105 l-212 212l389 389l247 -247l-95 -96l18 -18q46 -46 77 -99l29 29q35 35 62.5 88t27.5 96q0 93 -66 159l-141 141q-66 66 -159 66q-95 0 -159 -66l-283 -283q-66 -64 -66 -159z" />
-<glyph unicode="&#xe145;" d="M200 100v953q0 21 30 46t81 48t129 38t163 15t162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5zM300 300h600v700h-600v-700zM496 150q0 -43 30.5 -73.5t73.5 -30.5t73.5 30.5t30.5 73.5t-30.5 73.5t-73.5 30.5 t-73.5 -30.5t-30.5 -73.5z" />
-<glyph unicode="&#xe146;" d="M0 0l303 380l207 208l-210 212h300l267 279l-35 36q-15 14 -15 35t15 35q14 15 35 15t35 -15l283 -282q15 -15 15 -36t-15 -35q-14 -15 -35 -15t-35 15l-36 35l-279 -267v-300l-212 210l-208 -207z" />
-<glyph unicode="&#xe148;" d="M295 433h139q5 -77 48.5 -126.5t117.5 -64.5v335l-27 7q-46 14 -79 26.5t-72 36t-62.5 52t-40 72.5t-16.5 99q0 92 44 159.5t109 101t144 40.5v78h100v-79q38 -4 72.5 -13.5t75.5 -31.5t71 -53.5t51.5 -84t24.5 -118.5h-159q-8 72 -35 109.5t-101 50.5v-307l64 -14 q34 -7 64 -16.5t70 -31.5t67.5 -52t47.5 -80.5t20 -112.5q0 -139 -89 -224t-244 -96v-77h-100v78q-152 17 -237 104q-40 40 -52.5 93.5t-15.5 139.5zM466 889q0 -29 8 -51t16.5 -34t29.5 -22.5t31 -13.5t38 -10q7 -2 11 -3v274q-61 -8 -97.5 -37.5t-36.5 -102.5zM700 237 q170 18 170 151q0 64 -44 99.5t-126 60.5v-311z" />
-<glyph unicode="&#xe149;" d="M100 600v100h166q-24 49 -44 104q-10 26 -14.5 55.5t-3 72.5t25 90t68.5 87q97 88 263 88q129 0 230 -89t101 -208h-153q0 52 -34 89.5t-74 51.5t-76 14q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -11 2.5 -24.5t5.5 -24t9.5 -26.5t10.5 -25t14 -27.5t14 -25.5 t15.5 -27t13.5 -24h242v-100h-197q8 -50 -2.5 -115t-31.5 -94q-41 -59 -99 -113q35 11 84 18t70 7q32 1 102 -16t104 -17q76 0 136 30l50 -147q-41 -25 -80.5 -36.5t-59 -13t-61.5 -1.5q-23 0 -128 33t-155 29q-39 -4 -82 -17t-66 -25l-24 -11l-55 145l16.5 11t15.5 10 t13.5 9.5t14.5 12t14.5 14t17.5 18.5q48 55 54 126.5t-30 142.5h-221z" />
-<glyph unicode="&#xe150;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM602 900l298 300l298 -300h-198v-900h-200v900h-198z" />
-<glyph unicode="&#xe151;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v200h100v-100h200v-100h-300zM700 400v100h300v-200h-99v-100h-100v100h99v100h-200zM700 700v500h300v-500h-100v100h-100v-100h-100zM801 900h100v200h-100v-200z" />
-<glyph unicode="&#xe152;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v500h300v-500h-100v100h-100v-100h-100zM700 700v200h100v-100h200v-100h-300zM700 1100v100h300v-200h-99v-100h-100v100h99v100h-200zM801 200h100v200h-100v-200z" />
-<glyph unicode="&#xe153;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 100v400h300v-500h-100v100h-200zM800 1100v100h200v-500h-100v400h-100zM901 200h100v200h-100v-200z" />
-<glyph unicode="&#xe154;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 400v100h200v-500h-100v400h-100zM800 800v400h300v-500h-100v100h-200zM901 900h100v200h-100v-200z" />
-<glyph unicode="&#xe155;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h500v-200h-500zM700 400v200h400v-200h-400zM700 700v200h300v-200h-300zM700 1000v200h200v-200h-200z" />
-<glyph unicode="&#xe156;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h200v-200h-200zM700 400v200h300v-200h-300zM700 700v200h400v-200h-400zM700 1000v200h500v-200h-500z" />
-<glyph unicode="&#xe157;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q162 0 281 -118.5t119 -281.5v-300q0 -165 -118.5 -282.5t-281.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500z" />
-<glyph unicode="&#xe158;" d="M0 400v300q0 163 119 281.5t281 118.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-163 0 -281.5 117.5t-118.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM400 300l333 250l-333 250v-500z" />
-<glyph unicode="&#xe159;" d="M0 400v300q0 163 117.5 281.5t282.5 118.5h300q163 0 281.5 -119t118.5 -281v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 700l250 -333l250 333h-500z" />
-<glyph unicode="&#xe160;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -162 -118.5 -281t-281.5 -119h-300q-165 0 -282.5 118.5t-117.5 281.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 400h500l-250 333z" />
-<glyph unicode="&#xe161;" d="M0 400v300h300v200l400 -350l-400 -350v200h-300zM500 0v200h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-500v200h400q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-400z" />
-<glyph unicode="&#xe162;" d="M216 519q10 -19 32 -19h302q-155 -438 -160 -458q-5 -21 4 -32l9 -8l9 -1q13 0 26 16l538 630q15 19 6 36q-8 18 -32 16h-300q1 4 78 219.5t79 227.5q2 17 -6 27l-8 8h-9q-16 0 -25 -15q-4 -5 -98.5 -111.5t-228 -257t-209.5 -238.5q-17 -19 -7 -40z" />
-<glyph unicode="&#xe163;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q47 0 100 15v185h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h500v185q-14 4 -114 7.5t-193 5.5l-93 2q-165 0 -282.5 -117.5t-117.5 -282.5v-300zM600 400v300h300v200l400 -350l-400 -350v200h-300z " />
-<glyph unicode="&#xe164;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q163 0 281.5 117.5t118.5 282.5v98l-78 73l-122 -123v-148q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h156l118 122l-74 78h-100q-165 0 -282.5 -117.5t-117.5 -282.5 v-300zM496 709l353 342l-149 149h500v-500l-149 149l-342 -353z" />
-<glyph unicode="&#xe165;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM406 600 q0 80 57 137t137 57t137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137z" />
-<glyph unicode="&#xe166;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 800l445 -500l450 500h-295v400h-300v-400h-300zM900 150h100v50h-100v-50z" />
-<glyph unicode="&#xe167;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 700h300v-300h300v300h295l-445 500zM900 150h100v50h-100v-50z" />
-<glyph unicode="&#xe168;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 705l305 -305l596 596l-154 155l-442 -442l-150 151zM900 150h100v50h-100v-50z" />
-<glyph unicode="&#xe169;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 988l97 -98l212 213l-97 97zM200 401h700v699l-250 -239l-149 149l-212 -212l149 -149zM900 150h100v50h-100v-50z" />
-<glyph unicode="&#xe170;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM200 612l212 -212l98 97l-213 212zM300 1200l239 -250l-149 -149l212 -212l149 148l248 -237v700h-699zM900 150h100v50h-100v-50z" />
-<glyph unicode="&#xe171;" d="M23 415l1177 784v-1079l-475 272l-310 -393v416h-392zM494 210l672 938l-672 -712v-226z" />
-<glyph unicode="&#xe172;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-850q0 -21 -15 -35.5t-35 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200z" />
-<glyph unicode="&#xe173;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-218l-276 -275l-120 120l-126 -127h-378v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM581 306l123 123l120 -120l353 352l123 -123l-475 -476zM600 1000h100v200h-100v-200z" />
-<glyph unicode="&#xe174;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-269l-103 -103l-170 170l-298 -298h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200zM700 133l170 170l-170 170l127 127l170 -170l170 170l127 -128l-170 -169l170 -170 l-127 -127l-170 170l-170 -170z" />
-<glyph unicode="&#xe175;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-300h-400v-200h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300l300 -300l300 300h-200v300h-200v-300h-200zM600 1000v200h100v-200h-100z" />
-<glyph unicode="&#xe176;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-402l-200 200l-298 -298h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300h200v-300h200v300h200l-300 300zM600 1000v200h100v-200h-100z" />
-<glyph unicode="&#xe177;" d="M0 250q0 -21 14.5 -35.5t35.5 -14.5h1100q21 0 35.5 14.5t14.5 35.5v550h-1200v-550zM0 900h1200v150q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 300v200h400v-200h-400z" />
-<glyph unicode="&#xe178;" d="M0 400l300 298v-198h400v-200h-400v-198zM100 800v200h100v-200h-100zM300 800v200h100v-200h-100zM500 800v200h400v198l300 -298l-300 -298v198h-400zM800 300v200h100v-200h-100zM1000 300h100v200h-100v-200z" />
-<glyph unicode="&#xe179;" d="M100 700v400l50 100l50 -100v-300h100v300l50 100l50 -100v-300h100v300l50 100l50 -100v-400l-100 -203v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447zM800 597q0 -29 10.5 -55.5t25 -43t29 -28.5t25.5 -18l10 -5v-397q0 -21 14.5 -35.5 t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v1106q0 31 -18 40.5t-44 -7.5l-276 -117q-25 -16 -43.5 -50.5t-18.5 -65.5v-359z" />
-<glyph unicode="&#xe180;" d="M100 0h400v56q-75 0 -87.5 6t-12.5 44v394h500v-394q0 -38 -12.5 -44t-87.5 -6v-56h400v56q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v888q0 22 25 34.5t50 13.5l25 2v56h-400v-56q75 0 87.5 -6t12.5 -44v-394h-500v394q0 38 12.5 44t87.5 6v56h-400v-56q4 0 11 -0.5 t24 -3t30 -7t24 -15t11 -24.5v-888q0 -22 -25 -34.5t-50 -13.5l-25 -2v-56z" />
-<glyph unicode="&#xe181;" d="M0 300q0 -41 29.5 -70.5t70.5 -29.5h300q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-300q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM100 100h400l200 200h105l295 98v-298h-425l-100 -100h-375zM100 300v200h300v-200h-300zM100 600v200h300v-200h-300z M100 1000h400l200 -200v-98l295 98h105v200h-425l-100 100h-375zM700 402v163l400 133v-163z" />
-<glyph unicode="&#xe182;" d="M16.5 974.5q0.5 -21.5 16 -90t46.5 -140t104 -177.5t175 -208q103 -103 207.5 -176t180 -103.5t137 -47t92.5 -16.5l31 1l163 162q16 17 13 40.5t-22 37.5l-192 136q-19 14 -45 12t-42 -19l-119 -118q-143 103 -267 227q-126 126 -227 268l118 118q17 17 20 41.5 t-11 44.5l-139 194q-14 19 -36.5 22t-40.5 -14l-162 -162q-1 -11 -0.5 -32.5z" />
-<glyph unicode="&#xe183;" d="M0 50v212q0 20 10.5 45.5t24.5 39.5l365 303v50q0 4 1 10.5t12 22.5t30 28.5t60 23t97 10.5t97 -10t60 -23.5t30 -27.5t12 -24l1 -10v-50l365 -303q14 -14 24.5 -39.5t10.5 -45.5v-212q0 -21 -15 -35.5t-35 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5zM0 712 q0 -21 14.5 -33.5t34.5 -8.5l202 33q20 4 34.5 21t14.5 38v146q141 24 300 24t300 -24v-146q0 -21 14.5 -38t34.5 -21l202 -33q20 -4 34.5 8.5t14.5 33.5v200q-6 8 -19 20.5t-63 45t-112 57t-171 45t-235 20.5q-92 0 -175 -10.5t-141.5 -27t-108.5 -36.5t-81.5 -40 t-53.5 -36.5t-31 -27.5l-9 -10v-200z" />
-<glyph unicode="&#xe184;" d="M100 0v100h1100v-100h-1100zM175 200h950l-125 150v250l100 100v400h-100v-200h-100v200h-200v-200h-100v200h-200v-200h-100v200h-100v-400l100 -100v-250z" />
-<glyph unicode="&#xe185;" d="M100 0h300v400q0 41 -29.5 70.5t-70.5 29.5h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-400zM500 0v1000q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-1000h-300zM900 0v700q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-700h-300z" />
-<glyph unicode="&#xe186;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
-<glyph unicode="&#xe187;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h100v200h100v-200h100v500h-100v-200h-100v200h-100v-500zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
-<glyph unicode="&#xe188;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v100h-200v300h200v100h-300v-500zM600 300h300v100h-200v300h200v100h-300v-500z" />
-<glyph unicode="&#xe189;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 550l300 -150v300zM600 400l300 150l-300 150v-300z" />
-<glyph unicode="&#xe190;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300v500h700v-500h-700zM300 400h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130v-300zM575 549 q0 -65 27 -107t68 -42h130v300h-130q-38 0 -66.5 -43t-28.5 -108z" />
-<glyph unicode="&#xe191;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
-<glyph unicode="&#xe192;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v400h-200v100h-100v-500zM301 400v200h100v-200h-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
-<glyph unicode="&#xe193;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 700v100h300v-300h-99v-100h-100v100h99v200h-200zM201 300v100h100v-100h-100zM601 300v100h100v-100h-100z M700 700v100h200v-500h-100v400h-100z" />
-<glyph unicode="&#xe194;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 500v200 l100 100h300v-100h-300v-200h300v-100h-300z" />
-<glyph unicode="&#xe195;" d="M0 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 400v400h300 l100 -100v-100h-100v100h-200v-100h200v-100h-200v-100h-100zM700 400v100h100v-100h-100z" />
-<glyph unicode="&#xe197;" d="M-14 494q0 -80 56.5 -137t135.5 -57h222v300h400v-300h128q120 0 205 86t85 208q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200h200v300h200v-300 h200l-300 -300z" />
-<glyph unicode="&#xe198;" d="M-14 494q0 -80 56.5 -137t135.5 -57h8l414 414l403 -403q94 26 154.5 104t60.5 178q0 121 -85 207.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200l300 300 l300 -300h-200v-300h-200v300h-200z" />
-<glyph unicode="&#xe199;" d="M100 200h400v-155l-75 -45h350l-75 45v155h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170z" />
-<glyph unicode="&#xe200;" d="M121 700q0 -53 28.5 -97t75.5 -65q-4 -16 -4 -38q0 -74 52.5 -126.5t126.5 -52.5q56 0 100 30v-306l-75 -45h350l-75 45v306q46 -30 100 -30q74 0 126.5 52.5t52.5 126.5q0 24 -9 55q50 32 79.5 83t29.5 112q0 90 -61.5 155.5t-150.5 71.5q-26 89 -99.5 145.5 t-167.5 56.5q-116 0 -197.5 -81.5t-81.5 -197.5q0 -4 1 -12t1 -11q-14 2 -23 2q-74 0 -126.5 -52.5t-52.5 -126.5z" />
-</font>
-</defs></svg> 
\ No newline at end of file
+	<metadata></metadata>
+	<defs>
+		<font id="glyphicons_halflingsregular" horiz-adv-x="1200">
+			<font-face units-per-em="1200" ascent="960" descent="-240"/>
+			<missing-glyph horiz-adv-x="500"/>
+			<glyph/>
+			<glyph/>
+			<glyph unicode="&#xd;"/>
+			<glyph unicode=" "/>
+			<glyph unicode="*"
+				   d="M100 500v200h259l-183 183l141 141l183 -183v259h200v-259l183 183l141 -141l-183 -183h259v-200h-259l183 -183l-141 -141l-183 183v-259h-200v259l-183 -183l-141 141l183 183h-259z"/>
+			<glyph unicode="+" d="M0 400v300h400v400h300v-400h400v-300h-400v-400h-300v400h-400z"/>
+			<glyph unicode="&#xa0;"/>
+			<glyph unicode="&#x2000;" horiz-adv-x="652"/>
+			<glyph unicode="&#x2001;" horiz-adv-x="1304"/>
+			<glyph unicode="&#x2002;" horiz-adv-x="652"/>
+			<glyph unicode="&#x2003;" horiz-adv-x="1304"/>
+			<glyph unicode="&#x2004;" horiz-adv-x="434"/>
+			<glyph unicode="&#x2005;" horiz-adv-x="326"/>
+			<glyph unicode="&#x2006;" horiz-adv-x="217"/>
+			<glyph unicode="&#x2007;" horiz-adv-x="217"/>
+			<glyph unicode="&#x2008;" horiz-adv-x="163"/>
+			<glyph unicode="&#x2009;" horiz-adv-x="260"/>
+			<glyph unicode="&#x200a;" horiz-adv-x="72"/>
+			<glyph unicode="&#x202f;" horiz-adv-x="260"/>
+			<glyph unicode="&#x205f;" horiz-adv-x="326"/>
+			<glyph unicode="&#x20ac;"
+				   d="M100 500l100 100h113q0 47 5 100h-218l100 100h135q37 167 112 257q117 141 297 141q242 0 354 -189q60 -103 66 -209h-181q0 55 -25.5 99t-63.5 68t-75 36.5t-67 12.5q-24 0 -52.5 -10t-62.5 -32t-65.5 -67t-50.5 -107h379l-100 -100h-300q-6 -46 -6 -100h406l-100 -100 h-300q9 -74 33 -132t52.5 -91t62 -54.5t59 -29t46.5 -7.5q29 0 66 13t75 37t63.5 67.5t25.5 96.5h174q-31 -172 -128 -278q-107 -117 -274 -117q-205 0 -324 158q-36 46 -69 131.5t-45 205.5h-217z"/>
+			<glyph unicode="&#x2212;" d="M200 400h900v300h-900v-300z"/>
+			<glyph unicode="&#x2601;"
+				   d="M-14 494q0 -80 56.5 -137t135.5 -57h750q120 0 205 86t85 208q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5z"/>
+			<glyph unicode="&#x2709;"
+				   d="M0 100l400 400l200 -200l200 200l400 -400h-1200zM0 300v600l300 -300zM0 1100l600 -603l600 603h-1200zM900 600l300 300v-600z"/>
+			<glyph unicode="&#x270f;"
+				   d="M-13 -13l333 112l-223 223zM187 403l214 -214l614 614l-214 214zM887 1103l214 -214l99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13 -33 13t-33 -13z"/>
+			<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0z"/>
+			<glyph unicode="&#xe001;" d="M0 1200h1200l-500 -550v-550h300v-100h-800v100h300v550z"/>
+			<glyph unicode="&#xe002;"
+				   d="M14 84q18 -55 86 -75.5t147 5.5q65 21 109 69t44 90v606l600 155v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q17 -55 85.5 -75.5t147.5 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10 -3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7 q-79 -25 -122.5 -82t-25.5 -112z"/>
+			<glyph unicode="&#xe003;"
+				   d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233z"/>
+			<glyph unicode="&#xe005;"
+				   d="M100 784q0 64 28 123t73 100.5t104.5 64t119 20.5t120 -38.5t104.5 -104.5q48 69 109.5 105t121.5 38t118.5 -20.5t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-149.5 152.5t-126.5 127.5 t-94 124.5t-33.5 117.5z"/>
+			<glyph unicode="&#xe006;"
+				   d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1z"/>
+			<glyph unicode="&#xe007;"
+				   d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1zM237 700l196 -142l-73 -226l192 140l195 -141l-74 229l193 140h-235l-77 211l-78 -211h-239z"/>
+			<glyph unicode="&#xe008;"
+				   d="M0 0v143l400 257v100q-37 0 -68.5 74.5t-31.5 125.5v200q0 124 88 212t212 88t212 -88t88 -212v-200q0 -51 -31.5 -125.5t-68.5 -74.5v-100l400 -257v-143h-1200z"/>
+			<glyph unicode="&#xe009;"
+				   d="M0 0v1100h1200v-1100h-1200zM100 100h100v100h-100v-100zM100 300h100v100h-100v-100zM100 500h100v100h-100v-100zM100 700h100v100h-100v-100zM100 900h100v100h-100v-100zM300 100h600v400h-600v-400zM300 600h600v400h-600v-400zM1000 100h100v100h-100v-100z M1000 300h100v100h-100v-100zM1000 500h100v100h-100v-100zM1000 700h100v100h-100v-100zM1000 900h100v100h-100v-100z"/>
+			<glyph unicode="&#xe010;"
+				   d="M0 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM0 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5zM600 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM600 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5z"/>
+			<glyph unicode="&#xe011;"
+				   d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 450v200q0 21 14.5 35.5t35.5 14.5h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5z"/>
+			<glyph unicode="&#xe012;"
+				   d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v200q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5 t-14.5 -35.5v-200zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5z"/>
+			<glyph unicode="&#xe013;" d="M29 454l419 -420l818 820l-212 212l-607 -607l-206 207z"/>
+			<glyph unicode="&#xe014;"
+				   d="M106 318l282 282l-282 282l212 212l282 -282l282 282l212 -212l-282 -282l282 -282l-212 -212l-282 282l-282 -282z"/>
+			<glyph unicode="&#xe015;"
+				   d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233zM300 600v200h100v100h200v-100h100v-200h-100v-100h-200v100h-100z"/>
+			<glyph unicode="&#xe016;"
+				   d="M23 694q0 200 142 342t342 142t342 -142t142 -342q0 -141 -78 -262l300 -299q7 -7 7 -18t-7 -18l-109 -109q-8 -8 -18 -8t-18 8l-300 299q-120 -77 -261 -77q-200 0 -342 142t-142 342zM176 694q0 -136 97 -233t234 -97t233.5 97t96.5 233t-96.5 233t-233.5 97t-234 -97 t-97 -233zM300 601h400v200h-400v-200z"/>
+			<glyph unicode="&#xe017;"
+				   d="M23 600q0 183 105 331t272 210v-166q-103 -55 -165 -155t-62 -220q0 -177 125 -302t302 -125t302 125t125 302q0 120 -62 220t-165 155v166q167 -62 272 -210t105 -331q0 -118 -45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5 zM500 750q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v400q0 21 -14.5 35.5t-35.5 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-400z"/>
+			<glyph unicode="&#xe018;"
+				   d="M100 1h200v300h-200v-300zM400 1v500h200v-500h-200zM700 1v800h200v-800h-200zM1000 1v1200h200v-1200h-200z"/>
+			<glyph unicode="&#xe019;"
+				   d="M26 601q0 -33 6 -74l151 -38l2 -6q14 -49 38 -93l3 -5l-80 -134q45 -59 105 -105l133 81l5 -3q45 -26 94 -39l5 -2l38 -151q40 -5 74 -5q27 0 74 5l38 151l6 2q46 13 93 39l5 3l134 -81q56 44 104 105l-80 134l3 5q24 44 39 93l1 6l152 38q5 40 5 74q0 28 -5 73l-152 38 l-1 6q-16 51 -39 93l-3 5l80 134q-44 58 -104 105l-134 -81l-5 3q-45 25 -93 39l-6 1l-38 152q-40 5 -74 5q-27 0 -74 -5l-38 -152l-5 -1q-50 -14 -94 -39l-5 -3l-133 81q-59 -47 -105 -105l80 -134l-3 -5q-25 -47 -38 -93l-2 -6l-151 -38q-6 -48 -6 -73zM385 601 q0 88 63 151t152 63t152 -63t63 -151q0 -89 -63 -152t-152 -63t-152 63t-63 152z"/>
+			<glyph unicode="&#xe020;"
+				   d="M100 1025v50q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-50q0 -11 -7 -18t-18 -7h-1050q-11 0 -18 7t-7 18zM200 100v800h900v-800q0 -41 -29.5 -71t-70.5 -30h-700q-41 0 -70.5 30 t-29.5 71zM300 100h100v700h-100v-700zM500 100h100v700h-100v-700zM500 1100h300v100h-300v-100zM700 100h100v700h-100v-700zM900 100h100v700h-100v-700z"/>
+			<glyph unicode="&#xe021;" d="M1 601l656 644l644 -644h-200v-600h-300v400h-300v-400h-300v600h-200z"/>
+			<glyph unicode="&#xe022;"
+				   d="M100 25v1150q0 11 7 18t18 7h475v-500h400v-675q0 -11 -7 -18t-18 -7h-850q-11 0 -18 7t-7 18zM700 800v300l300 -300h-300z"/>
+			<glyph unicode="&#xe023;"
+				   d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 500v400h100 v-300h200v-100h-300z"/>
+			<glyph unicode="&#xe024;"
+				   d="M-100 0l431 1200h209l-21 -300h162l-20 300h208l431 -1200h-538l-41 400h-242l-40 -400h-539zM488 500h224l-27 300h-170z"/>
+			<glyph unicode="&#xe025;"
+				   d="M0 0v400h490l-290 300h200v500h300v-500h200l-290 -300h490v-400h-1100zM813 200h175v100h-175v-100z"/>
+			<glyph unicode="&#xe026;"
+				   d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM188 600q0 -170 121 -291t291 -121t291 121t121 291t-121 291t-291 121 t-291 -121t-121 -291zM350 600h150v300h200v-300h150l-250 -300z"/>
+			<glyph unicode="&#xe027;"
+				   d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM350 600l250 300 l250 -300h-150v-300h-200v300h-150z"/>
+			<glyph unicode="&#xe028;"
+				   d="M0 25v475l200 700h800q199 -700 200 -700v-475q0 -11 -7 -18t-18 -7h-1150q-11 0 -18 7t-7 18zM200 500h200l50 -200h300l50 200h200l-97 500h-606z"/>
+			<glyph unicode="&#xe029;"
+				   d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 397v401 l297 -200z"/>
+			<glyph unicode="&#xe030;"
+				   d="M23 600q0 -118 45.5 -224.5t123 -184t184 -123t224.5 -45.5t224.5 45.5t184 123t123 184t45.5 224.5h-150q0 -177 -125 -302t-302 -125t-302 125t-125 302t125 302t302 125q136 0 246 -81l-146 -146h400v400l-145 -145q-157 122 -355 122q-118 0 -224.5 -45.5t-184 -123 t-123 -184t-45.5 -224.5z"/>
+			<glyph unicode="&#xe031;"
+				   d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5q198 0 355 -122l145 145v-400h-400l147 147q-112 80 -247 80q-177 0 -302 -125t-125 -302h-150zM100 0v400h400l-147 -147q112 -80 247 -80q177 0 302 125t125 302h150q0 -118 -45.5 -224.5t-123 -184t-184 -123 t-224.5 -45.5q-198 0 -355 122z"/>
+			<glyph unicode="&#xe032;"
+				   d="M100 0h1100v1200h-1100v-1200zM200 100v900h900v-900h-900zM300 200v100h100v-100h-100zM300 400v100h100v-100h-100zM300 600v100h100v-100h-100zM300 800v100h100v-100h-100zM500 200h500v100h-500v-100zM500 400v100h500v-100h-500zM500 600v100h500v-100h-500z M500 800v100h500v-100h-500z"/>
+			<glyph unicode="&#xe033;"
+				   d="M0 100v600q0 41 29.5 70.5t70.5 29.5h100v200q0 82 59 141t141 59h300q82 0 141 -59t59 -141v-200h100q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-900q-41 0 -70.5 29.5t-29.5 70.5zM400 800h300v150q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-150z"/>
+			<glyph unicode="&#xe034;"
+				   d="M100 0v1100h100v-1100h-100zM300 400q60 60 127.5 84t127.5 17.5t122 -23t119 -30t110 -11t103 42t91 120.5v500q-40 -81 -101.5 -115.5t-127.5 -29.5t-138 25t-139.5 40t-125.5 25t-103 -29.5t-65 -115.5v-500z"/>
+			<glyph unicode="&#xe035;"
+				   d="M0 275q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 127 70.5 231.5t184.5 161.5t245 57t245 -57t184.5 -161.5t70.5 -231.5v-300q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 116 -49.5 227t-131 192.5t-192.5 131t-227 49.5t-227 -49.5t-192.5 -131t-131 -192.5 t-49.5 -227v-300zM200 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14zM800 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14z"/>
+			<glyph unicode="&#xe036;"
+				   d="M0 400h300l300 -200v800l-300 -200h-300v-400zM688 459l141 141l-141 141l71 71l141 -141l141 141l71 -71l-141 -141l141 -141l-71 -71l-141 141l-141 -141z"/>
+			<glyph unicode="&#xe037;"
+				   d="M0 400h300l300 -200v800l-300 -200h-300v-400zM700 857l69 53q111 -135 111 -310q0 -169 -106 -302l-67 54q86 110 86 248q0 146 -93 257z"/>
+			<glyph unicode="&#xe038;"
+				   d="M0 401v400h300l300 200v-800l-300 200h-300zM702 858l69 53q111 -135 111 -310q0 -170 -106 -303l-67 55q86 110 86 248q0 145 -93 257zM889 951l7 -8q123 -151 123 -344q0 -189 -119 -339l-7 -8l81 -66l6 8q142 178 142 405q0 230 -144 408l-6 8z"/>
+			<glyph unicode="&#xe039;"
+				   d="M0 0h500v500h-200v100h-100v-100h-200v-500zM0 600h100v100h400v100h100v100h-100v300h-500v-600zM100 100v300h300v-300h-300zM100 800v300h300v-300h-300zM200 200v100h100v-100h-100zM200 900h100v100h-100v-100zM500 500v100h300v-300h200v-100h-100v-100h-200v100 h-100v100h100v200h-200zM600 0v100h100v-100h-100zM600 1000h100v-300h200v-300h300v200h-200v100h200v500h-600v-200zM800 800v300h300v-300h-300zM900 0v100h300v-100h-300zM900 900v100h100v-100h-100zM1100 200v100h100v-100h-100z"/>
+			<glyph unicode="&#xe040;"
+				   d="M0 200h100v1000h-100v-1000zM100 0v100h300v-100h-300zM200 200v1000h100v-1000h-100zM500 0v91h100v-91h-100zM500 200v1000h200v-1000h-200zM700 0v91h100v-91h-100zM800 200v1000h100v-1000h-100zM900 0v91h200v-91h-200zM1000 200v1000h200v-1000h-200z"/>
+			<glyph unicode="&#xe041;"
+				   d="M1 700v475q0 10 7.5 17.5t17.5 7.5h474l700 -700l-500 -500zM148 953q0 -42 29 -71q30 -30 71.5 -30t71.5 30q29 29 29 71t-29 71q-30 30 -71.5 30t-71.5 -30q-29 -29 -29 -71z"/>
+			<glyph unicode="&#xe042;"
+				   d="M2 700v475q0 11 7 18t18 7h474l700 -700l-500 -500zM148 953q0 -42 30 -71q29 -30 71 -30t71 30q30 29 30 71t-30 71q-29 30 -71 30t-71 -30q-30 -29 -30 -71zM701 1200h100l700 -700l-500 -500l-50 50l450 450z"/>
+			<glyph unicode="&#xe043;" d="M100 0v1025l175 175h925v-1000l-100 -100v1000h-750l-100 -100h750v-1000h-900z"/>
+			<glyph unicode="&#xe044;"
+				   d="M200 0l450 444l450 -443v1150q0 20 -14.5 35t-35.5 15h-800q-21 0 -35.5 -15t-14.5 -35v-1151z"/>
+			<glyph unicode="&#xe045;"
+				   d="M0 100v700h200l100 -200h600l100 200h200v-700h-200v200h-800v-200h-200zM253 829l40 -124h592l62 124l-94 346q-2 11 -10 18t-18 7h-450q-10 0 -18 -7t-10 -18zM281 24l38 152q2 10 11.5 17t19.5 7h500q10 0 19.5 -7t11.5 -17l38 -152q2 -10 -3.5 -17t-15.5 -7h-600 q-10 0 -15.5 7t-3.5 17z"/>
+			<glyph unicode="&#xe046;"
+				   d="M0 200q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-150q-4 8 -11.5 21.5t-33 48t-53 61t-69 48t-83.5 21.5h-200q-41 0 -82 -20.5t-70 -50t-52 -59t-34 -50.5l-12 -20h-150q-41 0 -70.5 -29.5t-29.5 -70.5v-600z M356 500q0 100 72 172t172 72t172 -72t72 -172t-72 -172t-172 -72t-172 72t-72 172zM494 500q0 -44 31 -75t75 -31t75 31t31 75t-31 75t-75 31t-75 -31t-31 -75zM900 700v100h100v-100h-100z"/>
+			<glyph unicode="&#xe047;"
+				   d="M53 0h365v66q-41 0 -72 11t-49 38t1 71l92 234h391l82 -222q16 -45 -5.5 -88.5t-74.5 -43.5v-66h417v66q-34 1 -74 43q-18 19 -33 42t-21 37l-6 13l-385 998h-93l-399 -1006q-24 -48 -52 -75q-12 -12 -33 -25t-36 -20l-15 -7v-66zM416 521l178 457l46 -140l116 -317h-340 z"/>
+			<glyph unicode="&#xe048;"
+				   d="M100 0v89q41 7 70.5 32.5t29.5 65.5v827q0 28 -1 39.5t-5.5 26t-15.5 21t-29 14t-49 14.5v70h471q120 0 213 -88t93 -228q0 -55 -11.5 -101.5t-28 -74t-33.5 -47.5t-28 -28l-12 -7q8 -3 21.5 -9t48 -31.5t60.5 -58t47.5 -91.5t21.5 -129q0 -84 -59 -156.5t-142 -111 t-162 -38.5h-500zM400 200h161q89 0 153 48.5t64 132.5q0 90 -62.5 154.5t-156.5 64.5h-159v-400zM400 700h139q76 0 130 61.5t54 138.5q0 82 -84 130.5t-239 48.5v-379z"/>
+			<glyph unicode="&#xe049;"
+				   d="M200 0v57q77 7 134.5 40.5t65.5 80.5l173 849q10 56 -10 74t-91 37q-6 1 -10.5 2.5t-9.5 2.5v57h425l2 -57q-33 -8 -62 -25.5t-46 -37t-29.5 -38t-17.5 -30.5l-5 -12l-128 -825q-10 -52 14 -82t95 -36v-57h-500z"/>
+			<glyph unicode="&#xe050;"
+				   d="M-75 200h75v800h-75l125 167l125 -167h-75v-800h75l-125 -167zM300 900v300h150h700h150v-300h-50q0 29 -8 48.5t-18.5 30t-33.5 15t-39.5 5.5t-50.5 1h-200v-850l100 -50v-100h-400v100l100 50v850h-200q-34 0 -50.5 -1t-40 -5.5t-33.5 -15t-18.5 -30t-8.5 -48.5h-49z "/>
+			<glyph unicode="&#xe051;"
+				   d="M33 51l167 125v-75h800v75l167 -125l-167 -125v75h-800v-75zM100 901v300h150h700h150v-300h-50q0 29 -8 48.5t-18 30t-33.5 15t-40 5.5t-50.5 1h-200v-650l100 -50v-100h-400v100l100 50v650h-200q-34 0 -50.5 -1t-39.5 -5.5t-33.5 -15t-18.5 -30t-8 -48.5h-50z"/>
+			<glyph unicode="&#xe052;"
+				   d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 350q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM0 650q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1000q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 950q0 -20 14.5 -35t35.5 -15h600q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-600q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z"/>
+			<glyph unicode="&#xe053;"
+				   d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 650q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM200 350q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM200 950q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z"/>
+			<glyph unicode="&#xe054;"
+				   d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1000q-21 0 -35.5 15 t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-600 q-21 0 -35.5 15t-14.5 35z"/>
+			<glyph unicode="&#xe055;"
+				   d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100 q-21 0 -35.5 15t-14.5 35z"/>
+			<glyph unicode="&#xe056;"
+				   d="M0 50v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM300 50v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800 q-21 0 -35.5 15t-14.5 35zM300 650v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 950v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15 h-800q-21 0 -35.5 15t-14.5 35z"/>
+			<glyph unicode="&#xe057;"
+				   d="M-101 500v100h201v75l166 -125l-166 -125v75h-201zM300 0h100v1100h-100v-1100zM500 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35 v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 650q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100 q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100z"/>
+			<glyph unicode="&#xe058;"
+				   d="M1 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 650 q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM801 0v1100h100v-1100 h-100zM934 550l167 -125v75h200v100h-200v75z"/>
+			<glyph unicode="&#xe059;"
+				   d="M0 275v650q0 31 22 53t53 22h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53zM900 600l300 300v-600z"/>
+			<glyph unicode="&#xe060;"
+				   d="M0 44v1012q0 18 13 31t31 13h1112q19 0 31.5 -13t12.5 -31v-1012q0 -18 -12.5 -31t-31.5 -13h-1112q-18 0 -31 13t-13 31zM100 263l247 182l298 -131l-74 156l293 318l236 -288v500h-1000v-737zM208 750q0 56 39 95t95 39t95 -39t39 -95t-39 -95t-95 -39t-95 39t-39 95z "/>
+			<glyph unicode="&#xe062;"
+				   d="M148 745q0 124 60.5 231.5t165 172t226.5 64.5q123 0 227 -63t164.5 -169.5t60.5 -229.5t-73 -272q-73 -114 -166.5 -237t-150.5 -189l-57 -66q-10 9 -27 26t-66.5 70.5t-96 109t-104 135.5t-100.5 155q-63 139 -63 262zM342 772q0 -107 75.5 -182.5t181.5 -75.5 q107 0 182.5 75.5t75.5 182.5t-75.5 182t-182.5 75t-182 -75.5t-75 -181.5z"/>
+			<glyph unicode="&#xe063;"
+				   d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM173 600q0 -177 125.5 -302t301.5 -125v854q-176 0 -301.5 -125 t-125.5 -302z"/>
+			<glyph unicode="&#xe064;"
+				   d="M117 406q0 94 34 186t88.5 172.5t112 159t115 177t87.5 194.5q21 -71 57.5 -142.5t76 -130.5t83 -118.5t82 -117t70 -116t50 -125.5t18.5 -136q0 -89 -39 -165.5t-102 -126.5t-140 -79.5t-156 -33.5q-114 6 -211.5 53t-161.5 138.5t-64 210.5zM243 414q14 -82 59.5 -136 t136.5 -80l16 98q-7 6 -18 17t-34 48t-33 77q-15 73 -14 143.5t10 122.5l9 51q-92 -110 -119.5 -185t-12.5 -156z"/>
+			<glyph unicode="&#xe065;"
+				   d="M0 400v300q0 165 117.5 282.5t282.5 117.5q366 -6 397 -14l-186 -186h-311q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v125l200 200v-225q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM436 341l161 50l412 412l-114 113l-405 -405zM995 1015l113 -113l113 113l-21 85l-92 28z"/>
+			<glyph unicode="&#xe066;"
+				   d="M0 400v300q0 165 117.5 282.5t282.5 117.5h261l2 -80q-133 -32 -218 -120h-145q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-53q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5 zM423 524q30 38 81.5 64t103 35.5t99 14t77.5 3.5l29 -1v-209l360 324l-359 318v-216q-7 0 -19 -1t-48 -8t-69.5 -18.5t-76.5 -37t-76.5 -59t-62 -88t-39.5 -121.5z"/>
+			<glyph unicode="&#xe067;"
+				   d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-169q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM342 632l283 -284l566 567l-136 137l-430 -431l-147 147z"/>
+			<glyph unicode="&#xe068;"
+				   d="M0 603l300 296v-198h200v200h-200l300 300l295 -300h-195v-200h200v198l300 -296l-300 -300v198h-200v-200h195l-295 -300l-300 300h200v200h-200v-198z"/>
+			<glyph unicode="&#xe069;"
+				   d="M200 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-1100l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z"/>
+			<glyph unicode="&#xe070;"
+				   d="M0 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-487l500 487v-1100l-500 488v-488l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z"/>
+			<glyph unicode="&#xe071;" d="M136 550l564 550v-487l500 487v-1100l-500 488v-488z"/>
+			<glyph unicode="&#xe072;" d="M200 0l900 550l-900 550v-1100z"/>
+			<glyph unicode="&#xe073;"
+				   d="M200 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5t-14.5 -35.5v-800zM600 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-800z"/>
+			<glyph unicode="&#xe074;"
+				   d="M200 150q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v800q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5v-800z"/>
+			<glyph unicode="&#xe075;" d="M0 0v1100l500 -487v487l564 -550l-564 -550v488z"/>
+			<glyph unicode="&#xe076;"
+				   d="M0 0v1100l500 -487v487l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-500 -488v488z"/>
+			<glyph unicode="&#xe077;"
+				   d="M300 0v1100l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438z"/>
+			<glyph unicode="&#xe078;"
+				   d="M100 250v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5zM100 500h1100l-550 564z"/>
+			<glyph unicode="&#xe079;" d="M185 599l592 -592l240 240l-353 353l353 353l-240 240z"/>
+			<glyph unicode="&#xe080;" d="M272 194l353 353l-353 353l241 240l572 -571l21 -22l-1 -1v-1l-592 -591z"/>
+			<glyph unicode="&#xe081;"
+				   d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM300 500h200v-200h200v200h200v200h-200v200h-200v-200h-200v-200z"/>
+			<glyph unicode="&#xe082;"
+				   d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM300 500h600v200h-600v-200z"/>
+			<glyph unicode="&#xe083;"
+				   d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM246 459l213 -213l141 142l141 -142l213 213l-142 141l142 141l-213 212l-141 -141l-141 142l-212 -213l141 -141z"/>
+			<glyph unicode="&#xe084;"
+				   d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM270 551l276 -277l411 411l-175 174l-236 -236l-102 102z"/>
+			<glyph unicode="&#xe085;"
+				   d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM363 700h144q4 0 11.5 -1t11 -1t6.5 3t3 9t1 11t3.5 8.5t3.5 6t5.5 4t6.5 2.5t9 1.5t9 0.5h11.5h12.5q19 0 30 -10t11 -26 q0 -22 -4 -28t-27 -22q-5 -1 -12.5 -3t-27 -13.5t-34 -27t-26.5 -46t-11 -68.5h200q5 3 14 8t31.5 25.5t39.5 45.5t31 69t14 94q0 51 -17.5 89t-42 58t-58.5 32t-58.5 15t-51.5 3q-105 0 -172 -56t-67 -183zM500 300h200v100h-200v-100z"/>
+			<glyph unicode="&#xe086;"
+				   d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM400 300h400v100h-100v300h-300v-100h100v-200h-100v-100zM500 800h200v100h-200v-100z"/>
+			<glyph unicode="&#xe087;"
+				   d="M0 500v200h194q15 60 36 104.5t55.5 86t88 69t126.5 40.5v200h200v-200q54 -20 113 -60t112.5 -105.5t71.5 -134.5h203v-200h-203q-25 -102 -116.5 -186t-180.5 -117v-197h-200v197q-140 27 -208 102.5t-98 200.5h-194zM290 500q24 -73 79.5 -127.5t130.5 -78.5v206h200 v-206q149 48 201 206h-201v200h200q-25 74 -76 127.5t-124 76.5v-204h-200v203q-75 -24 -130 -77.5t-79 -125.5h209v-200h-210z"/>
+			<glyph unicode="&#xe088;"
+				   d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM356 465l135 135 l-135 135l109 109l135 -135l135 135l109 -109l-135 -135l135 -135l-109 -109l-135 135l-135 -135z"/>
+			<glyph unicode="&#xe089;"
+				   d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM322 537l141 141 l87 -87l204 205l142 -142l-346 -345z"/>
+			<glyph unicode="&#xe090;"
+				   d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -115 62 -215l568 567q-100 62 -216 62q-171 0 -292.5 -121.5t-121.5 -292.5zM391 245q97 -59 209 -59q171 0 292.5 121.5t121.5 292.5 q0 112 -59 209z"/>
+			<glyph unicode="&#xe091;" d="M0 547l600 453v-300h600v-300h-600v-301z"/>
+			<glyph unicode="&#xe092;" d="M0 400v300h600v300l600 -453l-600 -448v301h-600z"/>
+			<glyph unicode="&#xe093;" d="M204 600l450 600l444 -600h-298v-600h-300v600h-296z"/>
+			<glyph unicode="&#xe094;" d="M104 600h296v600h300v-600h298l-449 -600z"/>
+			<glyph unicode="&#xe095;"
+				   d="M0 200q6 132 41 238.5t103.5 193t184 138t271.5 59.5v271l600 -453l-600 -448v301q-95 -2 -183 -20t-170 -52t-147 -92.5t-100 -135.5z"/>
+			<glyph unicode="&#xe096;"
+				   d="M0 0v400l129 -129l294 294l142 -142l-294 -294l129 -129h-400zM635 777l142 -142l294 294l129 -129v400h-400l129 -129z"/>
+			<glyph unicode="&#xe097;"
+				   d="M34 176l295 295l-129 129h400v-400l-129 130l-295 -295zM600 600v400l129 -129l295 295l142 -141l-295 -295l129 -130h-400z"/>
+			<glyph unicode="&#xe101;"
+				   d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM456 851l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5 t21.5 34.5l58 302q4 20 -8 34.5t-33 14.5h-207q-20 0 -32 -14.5t-8 -34.5zM500 300h200v100h-200v-100z"/>
+			<glyph unicode="&#xe102;"
+				   d="M0 800h100v-200h400v300h200v-300h400v200h100v100h-111v6t-1 15t-3 18l-34 172q-11 39 -41.5 63t-69.5 24q-32 0 -61 -17l-239 -144q-22 -13 -40 -35q-19 24 -40 36l-238 144q-33 18 -62 18q-39 0 -69.5 -23t-40.5 -61l-35 -177q-2 -8 -3 -18t-1 -15v-6h-111v-100z M100 0h400v400h-400v-400zM200 900q-3 0 14 48t35 96l18 47l214 -191h-281zM700 0v400h400v-400h-400zM731 900l202 197q5 -12 12 -32.5t23 -64t25 -72t7 -28.5h-269z"/>
+			<glyph unicode="&#xe103;"
+				   d="M0 -22v143l216 193q-9 53 -13 83t-5.5 94t9 113t38.5 114t74 124q47 60 99.5 102.5t103 68t127.5 48t145.5 37.5t184.5 43.5t220 58.5q0 -189 -22 -343t-59 -258t-89 -181.5t-108.5 -120t-122 -68t-125.5 -30t-121.5 -1.5t-107.5 12.5t-87.5 17t-56.5 7.5l-99 -55z M238.5 300.5q19.5 -6.5 86.5 76.5q55 66 367 234q70 38 118.5 69.5t102 79t99 111.5t86.5 148q22 50 24 60t-6 19q-7 5 -17 5t-26.5 -14.5t-33.5 -39.5q-35 -51 -113.5 -108.5t-139.5 -89.5l-61 -32q-369 -197 -458 -401q-48 -111 -28.5 -117.5z"/>
+			<glyph unicode="&#xe104;"
+				   d="M111 408q0 -33 5 -63q9 -56 44 -119.5t105 -108.5q31 -21 64 -16t62 23.5t57 49.5t48 61.5t35 60.5q32 66 39 184.5t-13 157.5q79 -80 122 -164t26 -184q-5 -33 -20.5 -69.5t-37.5 -80.5q-10 -19 -14.5 -29t-12 -26t-9 -23.5t-3 -19t2.5 -15.5t11 -9.5t19.5 -5t30.5 2.5 t42 8q57 20 91 34t87.5 44.5t87 64t65.5 88.5t47 122q38 172 -44.5 341.5t-246.5 278.5q22 -44 43 -129q39 -159 -32 -154q-15 2 -33 9q-79 33 -120.5 100t-44 175.5t48.5 257.5q-13 -8 -34 -23.5t-72.5 -66.5t-88.5 -105.5t-60 -138t-8 -166.5q2 -12 8 -41.5t8 -43t6 -39.5 t3.5 -39.5t-1 -33.5t-6 -31.5t-13.5 -24t-21 -20.5t-31 -12q-38 -10 -67 13t-40.5 61.5t-15 81.5t10.5 75q-52 -46 -83.5 -101t-39 -107t-7.5 -85z"/>
+			<glyph unicode="&#xe105;"
+				   d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5t145.5 -23.5t132.5 -59t116.5 -83.5t97 -90t74.5 -85.5t49 -63.5t20 -30l26 -40l-26 -40q-6 -10 -20 -30t-49 -63.5t-74.5 -85.5t-97 -90t-116.5 -83.5t-132.5 -59t-145.5 -23.5 t-145.5 23.5t-132.5 59t-116.5 83.5t-97 90t-74.5 85.5t-49 63.5t-20 30zM120 600q7 -10 40.5 -58t56 -78.5t68 -77.5t87.5 -75t103 -49.5t125 -21.5t123.5 20t100.5 45.5t85.5 71.5t66.5 75.5t58 81.5t47 66q-1 1 -28.5 37.5t-42 55t-43.5 53t-57.5 63.5t-58.5 54 q49 -74 49 -163q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l105 105q-37 24 -75 72t-57 84l-20 36z"/>
+			<glyph unicode="&#xe106;"
+				   d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5q61 0 121 -17l37 142h148l-314 -1200h-148l37 143q-82 21 -165 71.5t-140 102t-109.5 112t-72 88.5t-29.5 43zM120 600q210 -282 393 -336l37 141q-107 18 -178.5 101.5t-71.5 193.5 q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l47 47l23 87q-30 28 -59 69t-44 68l-14 26zM780 161l38 145q22 15 44.5 34t46 44t40.5 44t41 50.5t33.5 43.5t33 44t24.5 34q-97 127 -140 175l39 146q67 -54 131.5 -125.5t87.5 -103.5t36 -52l26 -40l-26 -40 q-7 -12 -25.5 -38t-63.5 -79.5t-95.5 -102.5t-124 -100t-146.5 -79z"/>
+			<glyph unicode="&#xe107;"
+				   d="M-97.5 34q13.5 -34 50.5 -34h1294q37 0 50.5 35.5t-7.5 67.5l-642 1056q-20 33 -48 36t-48 -29l-642 -1066q-21 -32 -7.5 -66zM155 200l445 723l445 -723h-345v100h-200v-100h-345zM500 600l100 -300l100 300v100h-200v-100z"/>
+			<glyph unicode="&#xe108;"
+				   d="M100 262v41q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44t106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -91 100 -113v-64q0 -21 -13 -29t-32 1l-94 78h-222l-94 -78q-19 -9 -32 -1t-13 29v64 q0 22 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5z"/>
+			<glyph unicode="&#xe109;"
+				   d="M0 50q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v750h-1100v-750zM0 900h1100v150q0 21 -14.5 35.5t-35.5 14.5h-150v100h-100v-100h-500v100h-100v-100h-150q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 100v100h100v-100h-100zM100 300v100h100v-100h-100z M100 500v100h100v-100h-100zM300 100v100h100v-100h-100zM300 300v100h100v-100h-100zM300 500v100h100v-100h-100zM500 100v100h100v-100h-100zM500 300v100h100v-100h-100zM500 500v100h100v-100h-100zM700 100v100h100v-100h-100zM700 300v100h100v-100h-100zM700 500 v100h100v-100h-100zM900 100v100h100v-100h-100zM900 300v100h100v-100h-100zM900 500v100h100v-100h-100z"/>
+			<glyph unicode="&#xe110;"
+				   d="M0 200v200h259l600 600h241v198l300 -295l-300 -300v197h-159l-600 -600h-341zM0 800h259l122 -122l141 142l-181 180h-341v-200zM678 381l141 142l122 -123h159v198l300 -295l-300 -300v197h-241z"/>
+			<glyph unicode="&#xe111;"
+				   d="M0 400v600q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5z"/>
+			<glyph unicode="&#xe112;"
+				   d="M100 600v200h300v-250q0 -113 6 -145q17 -92 102 -117q39 -11 92 -11q37 0 66.5 5.5t50 15.5t36 24t24 31.5t14 37.5t7 42t2.5 45t0 47v25v250h300v-200q0 -42 -3 -83t-15 -104t-31.5 -116t-58 -109.5t-89 -96.5t-129 -65.5t-174.5 -25.5t-174.5 25.5t-129 65.5t-89 96.5 t-58 109.5t-31.5 116t-15 104t-3 83zM100 900v300h300v-300h-300zM800 900v300h300v-300h-300z"/>
+			<glyph unicode="&#xe113;" d="M-30 411l227 -227l352 353l353 -353l226 227l-578 579z"/>
+			<glyph unicode="&#xe114;" d="M70 797l580 -579l578 579l-226 227l-353 -353l-352 353z"/>
+			<glyph unicode="&#xe115;"
+				   d="M-198 700l299 283l300 -283h-203v-400h385l215 -200h-800v600h-196zM402 1000l215 -200h381v-400h-198l299 -283l299 283h-200v600h-796z"/>
+			<glyph unicode="&#xe116;"
+				   d="M18 939q-5 24 10 42q14 19 39 19h896l38 162q5 17 18.5 27.5t30.5 10.5h94q20 0 35 -14.5t15 -35.5t-15 -35.5t-35 -14.5h-54l-201 -961q-2 -4 -6 -10.5t-19 -17.5t-33 -11h-31v-50q0 -20 -14.5 -35t-35.5 -15t-35.5 15t-14.5 35v50h-300v-50q0 -20 -14.5 -35t-35.5 -15 t-35.5 15t-14.5 35v50h-50q-21 0 -35.5 15t-14.5 35q0 21 14.5 35.5t35.5 14.5h535l48 200h-633q-32 0 -54.5 21t-27.5 43z"/>
+			<glyph unicode="&#xe117;"
+				   d="M0 0v800h1200v-800h-1200zM0 900v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-100h-1200z"/>
+			<glyph unicode="&#xe118;"
+				   d="M1 0l300 700h1200l-300 -700h-1200zM1 400v600h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-200h-1000z"/>
+			<glyph unicode="&#xe119;" d="M302 300h198v600h-198l298 300l298 -300h-198v-600h198l-298 -300z"/>
+			<glyph unicode="&#xe120;" d="M0 600l300 298v-198h600v198l300 -298l-300 -297v197h-600v-197z"/>
+			<glyph unicode="&#xe121;"
+				   d="M0 100v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM31 400l172 739q5 22 23 41.5t38 19.5h672q19 0 37.5 -22.5t23.5 -45.5l172 -732h-1138zM800 100h100v100h-100v-100z M1000 100h100v100h-100v-100z"/>
+			<glyph unicode="&#xe122;"
+				   d="M-101 600v50q0 24 25 49t50 38l25 13v-250l-11 5.5t-24 14t-30 21.5t-24 27.5t-11 31.5zM99 500v250v5q0 13 0.5 18.5t2.5 13t8 10.5t15 3h200l675 250v-850l-675 200h-38l47 -276q2 -12 -3 -17.5t-11 -6t-21 -0.5h-8h-83q-20 0 -34.5 14t-18.5 35q-56 337 -56 351z M1100 200v850q0 21 14.5 35.5t35.5 14.5q20 0 35 -14.5t15 -35.5v-850q0 -20 -15 -35t-35 -15q-21 0 -35.5 15t-14.5 35z"/>
+			<glyph unicode="&#xe123;"
+				   d="M74 350q0 21 13.5 35.5t33.5 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3 32t29 13h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q20 0 33.5 -14.5t13.5 -35.5q0 -20 -13 -40t-31 -27q-22 -9 -63 -23t-167.5 -37 t-251.5 -23t-245.5 20.5t-178.5 41.5l-58 20q-18 7 -31 27.5t-13 40.5zM497 110q12 -49 40 -79.5t63 -30.5t63 30.5t39 79.5q-48 -6 -102 -6t-103 6z"/>
+			<glyph unicode="&#xe124;"
+				   d="M21 445l233 -45l-78 -224l224 78l45 -233l155 179l155 -179l45 233l224 -78l-78 224l234 45l-180 155l180 156l-234 44l78 225l-224 -78l-45 233l-155 -180l-155 180l-45 -233l-224 78l78 -225l-233 -44l179 -156z"/>
+			<glyph unicode="&#xe125;"
+				   d="M0 200h200v600h-200v-600zM300 275q0 -75 100 -75h61q123 -100 139 -100h250q46 0 83 57l238 344q29 31 29 74v100q0 44 -30.5 84.5t-69.5 40.5h-328q28 118 28 125v150q0 44 -30.5 84.5t-69.5 40.5h-50q-27 0 -51 -20t-38 -48l-96 -198l-145 -196q-20 -26 -20 -63v-400z M400 300v375l150 212l100 213h50v-175l-50 -225h450v-125l-250 -375h-214l-136 100h-100z"/>
+			<glyph unicode="&#xe126;"
+				   d="M0 400v600h200v-600h-200zM300 525v400q0 75 100 75h61q123 100 139 100h250q46 0 83 -57l238 -344q29 -31 29 -74v-100q0 -44 -30.5 -84.5t-69.5 -40.5h-328q28 -118 28 -125v-150q0 -44 -30.5 -84.5t-69.5 -40.5h-50q-27 0 -51 20t-38 48l-96 198l-145 196 q-20 26 -20 63zM400 525l150 -212l100 -213h50v175l-50 225h450v125l-250 375h-214l-136 -100h-100v-375z"/>
+			<glyph unicode="&#xe127;"
+				   d="M8 200v600h200v-600h-200zM308 275v525q0 17 14 35.5t28 28.5l14 9l362 230q14 6 25 6q17 0 29 -12l109 -112q14 -14 14 -34q0 -18 -11 -32l-85 -121h302q85 0 138.5 -38t53.5 -110t-54.5 -111t-138.5 -39h-107l-130 -339q-7 -22 -20.5 -41.5t-28.5 -19.5h-341 q-7 0 -90 81t-83 94zM408 289l100 -89h293l131 339q6 21 19.5 41t28.5 20h203q16 0 25 15t9 36q0 20 -9 34.5t-25 14.5h-457h-6.5h-7.5t-6.5 0.5t-6 1t-5 1.5t-5.5 2.5t-4 4t-4 5.5q-5 12 -5 20q0 14 10 27l147 183l-86 83l-339 -236v-503z"/>
+			<glyph unicode="&#xe128;"
+				   d="M-101 651q0 72 54 110t139 37h302l-85 121q-11 16 -11 32q0 21 14 34l109 113q13 12 29 12q11 0 25 -6l365 -230q7 -4 16.5 -10.5t26 -26t16.5 -36.5v-526q0 -13 -85.5 -93.5t-93.5 -80.5h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-84 0 -139 39t-55 111zM-1 601h222 q15 0 28.5 -20.5t19.5 -40.5l131 -339h293l106 89v502l-342 237l-87 -83l145 -184q10 -11 10 -26q0 -11 -5 -20q-1 -3 -3.5 -5.5l-4 -4t-5 -2.5t-5.5 -1.5t-6.5 -1t-6.5 -0.5h-7.5h-6.5h-476v-100zM999 201v600h200v-600h-200z"/>
+			<glyph unicode="&#xe129;"
+				   d="M97 719l230 -363q4 -6 10.5 -15.5t26 -25t36.5 -15.5h525q13 0 94 83t81 90v342q0 15 -20 28.5t-41 19.5l-339 131v106q0 84 -39 139t-111 55t-110 -53.5t-38 -138.5v-302l-121 84q-15 12 -33.5 11.5t-32.5 -13.5l-112 -110q-22 -22 -6 -53zM172 739l83 86l183 -146 q22 -18 47 -5q3 1 5.5 3.5l4 4t2.5 5t1.5 5.5t1 6.5t0.5 6v7.5v7v456q0 22 25 31t50 -0.5t25 -30.5v-202q0 -16 20 -29.5t41 -19.5l339 -130v-294l-89 -100h-503zM400 0v200h600v-200h-600z"/>
+			<glyph unicode="&#xe130;"
+				   d="M1 585q-15 -31 7 -53l112 -110q13 -13 32 -13.5t34 10.5l121 85l-1 -302q0 -84 38.5 -138t110.5 -54t111 55t39 139v106l339 131q20 6 40.5 19.5t20.5 28.5v342q0 7 -81 90t-94 83h-525q-17 0 -35.5 -14t-28.5 -28l-10 -15zM76 565l237 339h503l89 -100v-294l-340 -130 q-20 -6 -40 -20t-20 -29v-202q0 -22 -25 -31t-50 0t-25 31v456v14.5t-1.5 11.5t-5 12t-9.5 7q-24 13 -46 -5l-184 -146zM305 1104v200h600v-200h-600z"/>
+			<glyph unicode="&#xe131;"
+				   d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 500h300l-2 -194l402 294l-402 298v-197h-298v-201z"/>
+			<glyph unicode="&#xe132;"
+				   d="M0 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t231.5 47.5q122 0 232.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-218 -217.5t-300 -80t-299.5 80t-217.5 217.5t-80 299.5zM200 600l400 -294v194h302v201h-300v197z"/>
+			<glyph unicode="&#xe133;"
+				   d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600h200v-300h200v300h200l-300 400z"/>
+			<glyph unicode="&#xe134;"
+				   d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600l300 -400l300 400h-200v300h-200v-300h-200z"/>
+			<glyph unicode="&#xe135;"
+				   d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM254 780q-8 -34 5.5 -93t7.5 -87q0 -9 17 -44t16 -60q12 0 23 -5.5 t23 -15t20 -13.5q20 -10 108 -42q22 -8 53 -31.5t59.5 -38.5t57.5 -11q8 -18 -15 -55.5t-20 -57.5q12 -21 22.5 -34.5t28 -27t36.5 -17.5q0 -6 -3 -15.5t-3.5 -14.5t4.5 -17q101 -2 221 111q31 30 47 48t34 49t21 62q-14 9 -37.5 9.5t-35.5 7.5q-14 7 -49 15t-52 19 q-9 0 -39.5 -0.5t-46.5 -1.5t-39 -6.5t-39 -16.5q-50 -35 -66 -12q-4 2 -3.5 25.5t0.5 25.5q-6 13 -26.5 17t-24.5 7q2 22 -2 41t-16.5 28t-38.5 -20q-23 -25 -42 4q-19 28 -8 58q8 16 22 22q6 -1 26 -1.5t33.5 -4.5t19.5 -13q12 -19 32 -37.5t34 -27.5l14 -8q0 3 9.5 39.5 t5.5 57.5q-4 23 14.5 44.5t22.5 31.5q5 14 10 35t8.5 31t15.5 22.5t34 21.5q-6 18 10 37q8 0 23.5 -1.5t24.5 -1.5t20.5 4.5t20.5 15.5q-10 23 -30.5 42.5t-38 30t-49 26.5t-43.5 23q11 41 1 44q31 -13 58.5 -14.5t39.5 3.5l11 4q6 36 -17 53.5t-64 28.5t-56 23 q-19 -3 -37 0q-15 -12 -36.5 -21t-34.5 -12t-44 -8t-39 -6q-15 -3 -46 0t-45 -3q-20 -6 -51.5 -25.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79zM518 915q3 12 16 30.5t16 25.5q10 -10 18.5 -10t14 6t14.5 14.5t16 12.5q0 -18 8 -42.5t16.5 -44 t9.5 -23.5q-6 1 -39 5t-53.5 10t-36.5 16z"/>
+			<glyph unicode="&#xe136;"
+				   d="M0 164.5q0 21.5 15 37.5l600 599q-33 101 6 201.5t135 154.5q164 92 306 -9l-259 -138l145 -232l251 126q13 -175 -151 -267q-123 -70 -253 -23l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5z"/>
+			<glyph unicode="&#xe137;" horiz-adv-x="1220"
+				   d="M0 196v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 596v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5zM0 996v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM600 596h500v100h-500v-100zM800 196h300v100h-300v-100zM900 996h200v100h-200v-100z"/>
+			<glyph unicode="&#xe138;" d="M100 1100v100h1000v-100h-1000zM150 1000h900l-350 -500v-300l-200 -200v500z"/>
+			<glyph unicode="&#xe139;"
+				   d="M0 200v200h1200v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500z M500 1000h200v100h-200v-100z"/>
+			<glyph unicode="&#xe140;"
+				   d="M0 0v400l129 -129l200 200l142 -142l-200 -200l129 -129h-400zM0 800l129 129l200 -200l142 142l-200 200l129 129h-400v-400zM729 329l142 142l200 -200l129 129v-400h-400l129 129zM729 871l200 200l-129 129h400v-400l-129 129l-200 -200z"/>
+			<glyph unicode="&#xe141;"
+				   d="M0 596q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 596q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM291 655 q0 23 15.5 38.5t38.5 15.5t39 -16t16 -38q0 -23 -16 -39t-39 -16q-22 0 -38 16t-16 39zM400 850q0 22 16 38.5t39 16.5q22 0 38 -16t16 -39t-16 -39t-38 -16q-23 0 -39 16.5t-16 38.5zM513 609q0 32 21 56.5t52 29.5l122 126l1 1q-9 14 -9 28q0 22 16 38.5t39 16.5 q22 0 38 -16t16 -39t-16 -39t-38 -16q-16 0 -29 10l-55 -145q17 -22 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5q-37 0 -62.5 25.5t-25.5 61.5zM800 655q0 22 16 38t39 16t38.5 -15.5t15.5 -38.5t-16 -39t-38 -16q-23 0 -39 16t-16 39z"/>
+			<glyph unicode="&#xe142;"
+				   d="M-40 375q-13 -95 35 -173q35 -57 94 -89t129 -32q63 0 119 28q33 16 65 40.5t52.5 45.5t59.5 64q40 44 57 61l394 394q35 35 47 84t-3 96q-27 87 -117 104q-20 2 -29 2q-46 0 -79.5 -17t-67.5 -51l-388 -396l-7 -7l69 -67l377 373q20 22 39 38q23 23 50 23q38 0 53 -36 q16 -39 -20 -75l-547 -547q-52 -52 -125 -52q-55 0 -100 33t-54 96q-5 35 2.5 66t31.5 63t42 50t56 54q24 21 44 41l348 348q52 52 82.5 79.5t84 54t107.5 26.5q25 0 48 -4q95 -17 154 -94.5t51 -175.5q-7 -101 -98 -192l-252 -249l-253 -256l7 -7l69 -60l517 511 q67 67 95 157t11 183q-16 87 -67 154t-130 103q-69 33 -152 33q-107 0 -197 -55q-40 -24 -111 -95l-512 -512q-68 -68 -81 -163z"/>
+			<glyph unicode="&#xe143;"
+				   d="M79 784q0 131 99 229.5t230 98.5q144 0 242 -129q103 129 245 129q130 0 227 -98.5t97 -229.5q0 -46 -17.5 -91t-61 -99t-77 -89.5t-104.5 -105.5q-197 -191 -293 -322l-17 -23l-16 23q-43 58 -100 122.5t-92 99.5t-101 100l-84.5 84.5t-68 74t-60 78t-33.5 70.5t-15 78z M250 784q0 -27 30.5 -70t61.5 -75.5t95 -94.5l22 -22q93 -90 190 -201q82 92 195 203l12 12q64 62 97.5 97t64.5 79t31 72q0 71 -48 119.5t-106 48.5q-73 0 -131 -83l-118 -171l-114 174q-51 80 -124 80q-59 0 -108.5 -49.5t-49.5 -118.5z"/>
+			<glyph unicode="&#xe144;"
+				   d="M57 353q0 -94 66 -160l141 -141q66 -66 159 -66q95 0 159 66l283 283q66 66 66 159t-66 159l-141 141q-12 12 -19 17l-105 -105l212 -212l-389 -389l-247 248l95 95l-18 18q-46 45 -75 101l-55 -55q-66 -66 -66 -159zM269 706q0 -93 66 -159l141 -141l19 -17l105 105 l-212 212l389 389l247 -247l-95 -96l18 -18q46 -46 77 -99l29 29q35 35 62.5 88t27.5 96q0 93 -66 159l-141 141q-66 66 -159 66q-95 0 -159 -66l-283 -283q-66 -64 -66 -159z"/>
+			<glyph unicode="&#xe145;"
+				   d="M200 100v953q0 21 30 46t81 48t129 38t163 15t162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5zM300 300h600v700h-600v-700zM496 150q0 -43 30.5 -73.5t73.5 -30.5t73.5 30.5t30.5 73.5t-30.5 73.5t-73.5 30.5 t-73.5 -30.5t-30.5 -73.5z"/>
+			<glyph unicode="&#xe146;"
+				   d="M0 0l303 380l207 208l-210 212h300l267 279l-35 36q-15 14 -15 35t15 35q14 15 35 15t35 -15l283 -282q15 -15 15 -36t-15 -35q-14 -15 -35 -15t-35 15l-36 35l-279 -267v-300l-212 210l-208 -207z"/>
+			<glyph unicode="&#xe148;"
+				   d="M295 433h139q5 -77 48.5 -126.5t117.5 -64.5v335l-27 7q-46 14 -79 26.5t-72 36t-62.5 52t-40 72.5t-16.5 99q0 92 44 159.5t109 101t144 40.5v78h100v-79q38 -4 72.5 -13.5t75.5 -31.5t71 -53.5t51.5 -84t24.5 -118.5h-159q-8 72 -35 109.5t-101 50.5v-307l64 -14 q34 -7 64 -16.5t70 -31.5t67.5 -52t47.5 -80.5t20 -112.5q0 -139 -89 -224t-244 -96v-77h-100v78q-152 17 -237 104q-40 40 -52.5 93.5t-15.5 139.5zM466 889q0 -29 8 -51t16.5 -34t29.5 -22.5t31 -13.5t38 -10q7 -2 11 -3v274q-61 -8 -97.5 -37.5t-36.5 -102.5zM700 237 q170 18 170 151q0 64 -44 99.5t-126 60.5v-311z"/>
+			<glyph unicode="&#xe149;"
+				   d="M100 600v100h166q-24 49 -44 104q-10 26 -14.5 55.5t-3 72.5t25 90t68.5 87q97 88 263 88q129 0 230 -89t101 -208h-153q0 52 -34 89.5t-74 51.5t-76 14q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -11 2.5 -24.5t5.5 -24t9.5 -26.5t10.5 -25t14 -27.5t14 -25.5 t15.5 -27t13.5 -24h242v-100h-197q8 -50 -2.5 -115t-31.5 -94q-41 -59 -99 -113q35 11 84 18t70 7q32 1 102 -16t104 -17q76 0 136 30l50 -147q-41 -25 -80.5 -36.5t-59 -13t-61.5 -1.5q-23 0 -128 33t-155 29q-39 -4 -82 -17t-66 -25l-24 -11l-55 145l16.5 11t15.5 10 t13.5 9.5t14.5 12t14.5 14t17.5 18.5q48 55 54 126.5t-30 142.5h-221z"/>
+			<glyph unicode="&#xe150;"
+				   d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM602 900l298 300l298 -300h-198v-900h-200v900h-198z"/>
+			<glyph unicode="&#xe151;"
+				   d="M2 300h198v900h200v-900h198l-298 -300zM700 0v200h100v-100h200v-100h-300zM700 400v100h300v-200h-99v-100h-100v100h99v100h-200zM700 700v500h300v-500h-100v100h-100v-100h-100zM801 900h100v200h-100v-200z"/>
+			<glyph unicode="&#xe152;"
+				   d="M2 300h198v900h200v-900h198l-298 -300zM700 0v500h300v-500h-100v100h-100v-100h-100zM700 700v200h100v-100h200v-100h-300zM700 1100v100h300v-200h-99v-100h-100v100h99v100h-200zM801 200h100v200h-100v-200z"/>
+			<glyph unicode="&#xe153;"
+				   d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 100v400h300v-500h-100v100h-200zM800 1100v100h200v-500h-100v400h-100zM901 200h100v200h-100v-200z"/>
+			<glyph unicode="&#xe154;"
+				   d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 400v100h200v-500h-100v400h-100zM800 800v400h300v-500h-100v100h-200zM901 900h100v200h-100v-200z"/>
+			<glyph unicode="&#xe155;"
+				   d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h500v-200h-500zM700 400v200h400v-200h-400zM700 700v200h300v-200h-300zM700 1000v200h200v-200h-200z"/>
+			<glyph unicode="&#xe156;"
+				   d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h200v-200h-200zM700 400v200h300v-200h-300zM700 700v200h400v-200h-400zM700 1000v200h500v-200h-500z"/>
+			<glyph unicode="&#xe157;"
+				   d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q162 0 281 -118.5t119 -281.5v-300q0 -165 -118.5 -282.5t-281.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500z"/>
+			<glyph unicode="&#xe158;"
+				   d="M0 400v300q0 163 119 281.5t281 118.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-163 0 -281.5 117.5t-118.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM400 300l333 250l-333 250v-500z"/>
+			<glyph unicode="&#xe159;"
+				   d="M0 400v300q0 163 117.5 281.5t282.5 118.5h300q163 0 281.5 -119t118.5 -281v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 700l250 -333l250 333h-500z"/>
+			<glyph unicode="&#xe160;"
+				   d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -162 -118.5 -281t-281.5 -119h-300q-165 0 -282.5 118.5t-117.5 281.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 400h500l-250 333z"/>
+			<glyph unicode="&#xe161;"
+				   d="M0 400v300h300v200l400 -350l-400 -350v200h-300zM500 0v200h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-500v200h400q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-400z"/>
+			<glyph unicode="&#xe162;"
+				   d="M216 519q10 -19 32 -19h302q-155 -438 -160 -458q-5 -21 4 -32l9 -8l9 -1q13 0 26 16l538 630q15 19 6 36q-8 18 -32 16h-300q1 4 78 219.5t79 227.5q2 17 -6 27l-8 8h-9q-16 0 -25 -15q-4 -5 -98.5 -111.5t-228 -257t-209.5 -238.5q-17 -19 -7 -40z"/>
+			<glyph unicode="&#xe163;"
+				   d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q47 0 100 15v185h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h500v185q-14 4 -114 7.5t-193 5.5l-93 2q-165 0 -282.5 -117.5t-117.5 -282.5v-300zM600 400v300h300v200l400 -350l-400 -350v200h-300z "/>
+			<glyph unicode="&#xe164;"
+				   d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q163 0 281.5 117.5t118.5 282.5v98l-78 73l-122 -123v-148q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h156l118 122l-74 78h-100q-165 0 -282.5 -117.5t-117.5 -282.5 v-300zM496 709l353 342l-149 149h500v-500l-149 149l-342 -353z"/>
+			<glyph unicode="&#xe165;"
+				   d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM406 600 q0 80 57 137t137 57t137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137z"/>
+			<glyph unicode="&#xe166;"
+				   d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 800l445 -500l450 500h-295v400h-300v-400h-300zM900 150h100v50h-100v-50z"/>
+			<glyph unicode="&#xe167;"
+				   d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 700h300v-300h300v300h295l-445 500zM900 150h100v50h-100v-50z"/>
+			<glyph unicode="&#xe168;"
+				   d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 705l305 -305l596 596l-154 155l-442 -442l-150 151zM900 150h100v50h-100v-50z"/>
+			<glyph unicode="&#xe169;"
+				   d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 988l97 -98l212 213l-97 97zM200 401h700v699l-250 -239l-149 149l-212 -212l149 -149zM900 150h100v50h-100v-50z"/>
+			<glyph unicode="&#xe170;"
+				   d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM200 612l212 -212l98 97l-213 212zM300 1200l239 -250l-149 -149l212 -212l149 148l248 -237v700h-699zM900 150h100v50h-100v-50z"/>
+			<glyph unicode="&#xe171;"
+				   d="M23 415l1177 784v-1079l-475 272l-310 -393v416h-392zM494 210l672 938l-672 -712v-226z"/>
+			<glyph unicode="&#xe172;"
+				   d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-850q0 -21 -15 -35.5t-35 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200z"/>
+			<glyph unicode="&#xe173;"
+				   d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-218l-276 -275l-120 120l-126 -127h-378v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM581 306l123 123l120 -120l353 352l123 -123l-475 -476zM600 1000h100v200h-100v-200z"/>
+			<glyph unicode="&#xe174;"
+				   d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-269l-103 -103l-170 170l-298 -298h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200zM700 133l170 170l-170 170l127 127l170 -170l170 170l127 -128l-170 -169l170 -170 l-127 -127l-170 170l-170 -170z"/>
+			<glyph unicode="&#xe175;"
+				   d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-300h-400v-200h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300l300 -300l300 300h-200v300h-200v-300h-200zM600 1000v200h100v-200h-100z"/>
+			<glyph unicode="&#xe176;"
+				   d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-402l-200 200l-298 -298h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300h200v-300h200v300h200l-300 300zM600 1000v200h100v-200h-100z"/>
+			<glyph unicode="&#xe177;"
+				   d="M0 250q0 -21 14.5 -35.5t35.5 -14.5h1100q21 0 35.5 14.5t14.5 35.5v550h-1200v-550zM0 900h1200v150q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 300v200h400v-200h-400z"/>
+			<glyph unicode="&#xe178;"
+				   d="M0 400l300 298v-198h400v-200h-400v-198zM100 800v200h100v-200h-100zM300 800v200h100v-200h-100zM500 800v200h400v198l300 -298l-300 -298v198h-400zM800 300v200h100v-200h-100zM1000 300h100v200h-100v-200z"/>
+			<glyph unicode="&#xe179;"
+				   d="M100 700v400l50 100l50 -100v-300h100v300l50 100l50 -100v-300h100v300l50 100l50 -100v-400l-100 -203v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447zM800 597q0 -29 10.5 -55.5t25 -43t29 -28.5t25.5 -18l10 -5v-397q0 -21 14.5 -35.5 t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v1106q0 31 -18 40.5t-44 -7.5l-276 -117q-25 -16 -43.5 -50.5t-18.5 -65.5v-359z"/>
+			<glyph unicode="&#xe180;"
+				   d="M100 0h400v56q-75 0 -87.5 6t-12.5 44v394h500v-394q0 -38 -12.5 -44t-87.5 -6v-56h400v56q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v888q0 22 25 34.5t50 13.5l25 2v56h-400v-56q75 0 87.5 -6t12.5 -44v-394h-500v394q0 38 12.5 44t87.5 6v56h-400v-56q4 0 11 -0.5 t24 -3t30 -7t24 -15t11 -24.5v-888q0 -22 -25 -34.5t-50 -13.5l-25 -2v-56z"/>
+			<glyph unicode="&#xe181;"
+				   d="M0 300q0 -41 29.5 -70.5t70.5 -29.5h300q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-300q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM100 100h400l200 200h105l295 98v-298h-425l-100 -100h-375zM100 300v200h300v-200h-300zM100 600v200h300v-200h-300z M100 1000h400l200 -200v-98l295 98h105v200h-425l-100 100h-375zM700 402v163l400 133v-163z"/>
+			<glyph unicode="&#xe182;"
+				   d="M16.5 974.5q0.5 -21.5 16 -90t46.5 -140t104 -177.5t175 -208q103 -103 207.5 -176t180 -103.5t137 -47t92.5 -16.5l31 1l163 162q16 17 13 40.5t-22 37.5l-192 136q-19 14 -45 12t-42 -19l-119 -118q-143 103 -267 227q-126 126 -227 268l118 118q17 17 20 41.5 t-11 44.5l-139 194q-14 19 -36.5 22t-40.5 -14l-162 -162q-1 -11 -0.5 -32.5z"/>
+			<glyph unicode="&#xe183;"
+				   d="M0 50v212q0 20 10.5 45.5t24.5 39.5l365 303v50q0 4 1 10.5t12 22.5t30 28.5t60 23t97 10.5t97 -10t60 -23.5t30 -27.5t12 -24l1 -10v-50l365 -303q14 -14 24.5 -39.5t10.5 -45.5v-212q0 -21 -15 -35.5t-35 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5zM0 712 q0 -21 14.5 -33.5t34.5 -8.5l202 33q20 4 34.5 21t14.5 38v146q141 24 300 24t300 -24v-146q0 -21 14.5 -38t34.5 -21l202 -33q20 -4 34.5 8.5t14.5 33.5v200q-6 8 -19 20.5t-63 45t-112 57t-171 45t-235 20.5q-92 0 -175 -10.5t-141.5 -27t-108.5 -36.5t-81.5 -40 t-53.5 -36.5t-31 -27.5l-9 -10v-200z"/>
+			<glyph unicode="&#xe184;"
+				   d="M100 0v100h1100v-100h-1100zM175 200h950l-125 150v250l100 100v400h-100v-200h-100v200h-200v-200h-100v200h-200v-200h-100v200h-100v-400l100 -100v-250z"/>
+			<glyph unicode="&#xe185;"
+				   d="M100 0h300v400q0 41 -29.5 70.5t-70.5 29.5h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-400zM500 0v1000q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-1000h-300zM900 0v700q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-700h-300z"/>
+			<glyph unicode="&#xe186;"
+				   d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z"/>
+			<glyph unicode="&#xe187;"
+				   d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h100v200h100v-200h100v500h-100v-200h-100v200h-100v-500zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z"/>
+			<glyph unicode="&#xe188;"
+				   d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v100h-200v300h200v100h-300v-500zM600 300h300v100h-200v300h200v100h-300v-500z"/>
+			<glyph unicode="&#xe189;"
+				   d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 550l300 -150v300zM600 400l300 150l-300 150v-300z"/>
+			<glyph unicode="&#xe190;"
+				   d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300v500h700v-500h-700zM300 400h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130v-300zM575 549 q0 -65 27 -107t68 -42h130v300h-130q-38 0 -66.5 -43t-28.5 -108z"/>
+			<glyph unicode="&#xe191;"
+				   d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z"/>
+			<glyph unicode="&#xe192;"
+				   d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v400h-200v100h-100v-500zM301 400v200h100v-200h-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z"/>
+			<glyph unicode="&#xe193;"
+				   d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 700v100h300v-300h-99v-100h-100v100h99v200h-200zM201 300v100h100v-100h-100zM601 300v100h100v-100h-100z M700 700v100h200v-500h-100v400h-100z"/>
+			<glyph unicode="&#xe194;"
+				   d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 500v200 l100 100h300v-100h-300v-200h300v-100h-300z"/>
+			<glyph unicode="&#xe195;"
+				   d="M0 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 400v400h300 l100 -100v-100h-100v100h-200v-100h200v-100h-200v-100h-100zM700 400v100h100v-100h-100z"/>
+			<glyph unicode="&#xe197;"
+				   d="M-14 494q0 -80 56.5 -137t135.5 -57h222v300h400v-300h128q120 0 205 86t85 208q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200h200v300h200v-300 h200l-300 -300z"/>
+			<glyph unicode="&#xe198;"
+				   d="M-14 494q0 -80 56.5 -137t135.5 -57h8l414 414l403 -403q94 26 154.5 104t60.5 178q0 121 -85 207.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200l300 300 l300 -300h-200v-300h-200v300h-200z"/>
+			<glyph unicode="&#xe199;"
+				   d="M100 200h400v-155l-75 -45h350l-75 45v155h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170z"/>
+			<glyph unicode="&#xe200;"
+				   d="M121 700q0 -53 28.5 -97t75.5 -65q-4 -16 -4 -38q0 -74 52.5 -126.5t126.5 -52.5q56 0 100 30v-306l-75 -45h350l-75 45v306q46 -30 100 -30q74 0 126.5 52.5t52.5 126.5q0 24 -9 55q50 32 79.5 83t29.5 112q0 90 -61.5 155.5t-150.5 71.5q-26 89 -99.5 145.5 t-167.5 56.5q-116 0 -197.5 -81.5t-81.5 -197.5q0 -4 1 -12t1 -11q-14 2 -23 2q-74 0 -126.5 -52.5t-52.5 -126.5z"/>
+		</font>
+	</defs>
+</svg>
diff --git a/len-activiti/src/main/resources/static/editor-app/header-controller.js b/len-activiti/src/main/resources/static/editor-app/header-controller.js
index 97a570d..ef221b3 100644
--- a/len-activiti/src/main/resources/static/editor-app/header-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/header-controller.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -19,13 +19,13 @@
 'use strict';
 
 angular.module('activitiModeler')
-    .controller('HeaderController', ['$rootScope', '$scope', '$http', '$timeout', function ($rootScope, $scope, $http, $timeout) {
-    	
-    	// Add reference to global header-config
-    	$scope.headerConfig = KISBPM.HEADER_CONFIG;
-    	
-    	// TODO: generate setting-menu items
-    	
-    	// TODO: generate user-menu items
+	.controller('HeaderController', ['$rootScope', '$scope', '$http', '$timeout', function ($rootScope, $scope, $http, $timeout) {
+
+		// Add reference to global header-config
+		$scope.headerConfig = KISBPM.HEADER_CONFIG;
+
+		// TODO: generate setting-menu items
+
+		// TODO: generate user-menu items
 
-}]);
\ No newline at end of file
+	}]);
diff --git a/len-activiti/src/main/resources/static/editor-app/i18n/en.json b/len-activiti/src/main/resources/static/editor-app/i18n/en.json
index 02806ea..2ed628b 100644
--- a/len-activiti/src/main/resources/static/editor-app/i18n/en.json
+++ b/len-activiti/src/main/resources/static/editor-app/i18n/en.json
@@ -1,286 +1,259 @@
 {
-    "HEADER.BRAND" : "Activiti编辑",
-    "HEADER.BRAND_TAGLINE" : "powered by Alfresco",
-    "PAGE.HEADER" : "Orchestration Details",
-
-    "ACTION.OK" : "确认",
-    "ACTION.SAVE" : "保存",
-    "ACTION.SAVE-AND-CLOSE" : "保存并关闭",
-    "ACTION.SEND" : "发送",
-    "ACTION.CANCEL" : "取消",
-    "ACTION.SELECT" : "选择",
-    "ACTION.ADD" : "添加",
-    "ACTION.REMOVE" : "清除",
-    "ACTION.MOVE.UP" : "上移",
-    "ACTION.MOVE.DOWN" : "下移",
-
-    "MAIN_NAVIGATION_ORCHESTRATIONS" : "业务流程",
-    "MAIN_NAVIGATION_DISPATCH_RULES" : "调度规则",
-    "MAIN_NAVIGATION_ASSET_GROUPS" : "审批组",
-    "MAIN_NAVIGATION_SOLUTIONS" : "解决",
-
-    "TOOLBAR.ACTION.CLOSE" : "Close the editor and go back to the overview page",
-    "TOOLBAR.ACTION.SAVE" : "保存",
-    "TOOLBAR.ACTION.VALIDATE": "校验",
-    "TOOLBAR.ACTION.CUT" : "剪切",
-    "TOOLBAR.ACTION.COPY" : "复制",
-    "TOOLBAR.ACTION.PASTE" : "粘贴",
-    "TOOLBAR.ACTION.DELETE" : "删除",
-    "TOOLBAR.ACTION.UNDO" : "撤销",
-    "TOOLBAR.ACTION.REDO" : "重复",
-    "TOOLBAR.ACTION.ZOOMIN" : "放大",
-    "TOOLBAR.ACTION.ZOOMOUT" : "缩小",
-    "TOOLBAR.ACTION.ZOOMACTUAL" : "实际大小 ",
-    "TOOLBAR.ACTION.ZOOMFIT" : "适应屏幕",
-    "TOOLBAR.ACTION.MOVE" : "移动",
-    "TOOLBAR.ACTION.IMPORT" : "导入",
-    "TOOLBAR.ACTION.EXPORT" : "导出",
-    "TOOLBAR.ACTION.BENDPOINT.ADD" : "为选定的流程连线添加弯曲点",
-    "TOOLBAR.ACTION.BENDPOINT.REMOVE" : "为选定的流程连线删除弯曲点",
-    "TOOLBAR.ACTION.ALIGNHORIZONTAL" : "水平对齐",
-    "TOOLBAR.ACTION.ALIGNVERTICAL" : "垂直对齐",
-    "TOOLBAR.ACTION.SAMESIZE" : "Same size",
-    "TOOLBAR.ACTION.HELP": "Start the guided tour",
-    "TOOLBAR.ACTION.FEEDBACK": "Provide feedback",
-
-    "KICKSTART.PROCESS_TOOLBAR.ACTION.SAVE" : "保存",
-    "KICKSTART.PROCESS_TOOLBAR.ACTION.VALIDATE": "校验模型",
-    "KICKSTART.PROCESS_TOOLBAR.ACTION.HELP": "预览",
-    "KICKSTART.PROCESS_TOOLBAR.ACTION.FEEDBACK": "反馈",
-
-    "FORM_TOOLBAR.ACTION.SAVE" : "保存",
-    "FORM_TOOLBAR.ACTION.VALIDATE": "校验模型",
-    "FORM_TOOLBAR.ACTION.HELP": "预览",
-    "FORM_TOOLBAR.ACTION.FEEDBACK": "反馈",
-
-    "APP_DEFINITION_TOOLBAR.ACTION.SAVE" : "保存",
-    "APP_DEFINITION_TOOLBAR.ACTION.VALIDATE" : "校验模型",
-    "APP_DEFINITION_TOOLBAR.ACTION.HELP" : "预览",
-    "APP_DEFINITION_TOOLBAR.ACTION.FEEDBACK" : "反馈",
-
-    "BUTTON.ACTION.DELETE.TOOLTIP": "从模型中删除元素",
-    "BUTTON.ACTION.MORPH.TOOLTIP": "更改元素类型",
-
-    "ELEMENT.AUTHOR" : "作者",
-    "ELEMENT.DATE_CREATED" : "创建日期",
-    "ELEMENT.SELECTED_EMPTY_TITLE" : "(输入名称)",
-
-    "PROPERTY.REMOVED" : "清除",
-    "PROPERTY.EMPTY" : "",
-    "PROPERTY.PROPERTY.EDIT.TITLE" : "修改 \"{{title}}\"",
-
-    "PROPERTY.FEEDBACK.TITLE" : "请填写您的反馈意见",
-
-    "PROPERTY.ASSIGNMENT.TITLE" : "指派",
-    "PROPERTY.ASSIGNMENT.TYPE" : "类型",
-    "PROPERTY.ASSIGNMENT.TYPE.IDENTITYSTORE" : "Identity store",
-    "PROPERTY.ASSIGNMENT.TYPE.STATIC" : "静态值",
-    "PROPERTY.ASSIGNMENT.ASSIGNEE" : "代理人",
-    "PROPERTY.ASSIGNMENT.MATCHING" : "使用上下方向键选择并按回车键确认或使用鼠标",
-    "PROPERTY.ASSIGNMENT.ASSIGNEE_PLACEHOLDER" : "请输入代理人",
-    "PROPERTY.ASSIGNMENT.EMPTY" : "无代理人",
-    "PROPERTY.ASSIGNMENT.ASSIGNEE_DISPLAY" : "代理人 {{assignee}}",
-    "PROPERTY.ASSIGNMENT.CANDIDATE_USERS_DISPLAY" : "{{length}}候选人",
-    "PROPERTY.ASSIGNMENT.CANDIDATE_USERS" : "候选人",
-    "PROPERTY.ASSIGNMENT.CANDIDATE_GROUPS_DISPLAY" :  "{{length}}候选组",
-    "PROPERTY.ASSIGNMENT.CANDIDATE_GROUPS" :  "候选组",
-    "PROPERTY.ASSIGNMENT.USER_IDM_DISPLAY": "用户{{firstName}} {{lastName}}",
-    "PROPERTY.ASSIGNMENT.USER_IDM_EMAIL_DISPLAY": "用户{{email}}",
-    "PROPERTY.ASSIGNMENT.IDM_EMPTY" : "发起人",
-    "PROPERTY.ASSIGNMENT.IDM.TYPE" : "任务",
-    "PROPERTY.ASSIGNMENT.IDM.NO_CANDIDATE_USERS" : "没有选择候选人...",
-    "PROPERTY.ASSIGNMENT.IDM.NO_CANDIDATE_GROUPS" : "没有选择候选组...",
-    "PROPERTY.ASSIGNMENT.IDM.DROPDOWN.INITIATOR" : "分派给发起人",
-    "PROPERTY.ASSIGNMENT.IDM.DROPDOWN.USER" : "分派给一个用户",
-    "PROPERTY.ASSIGNMENT.IDM.DROPDOWN.USERS" : "候选人s",
-    "PROPERTY.ASSIGNMENT.IDM.DROPDOWN.GROUPS" : "候选组",
-    "PROPERTY.ASSIGNMENT.EMAIL.HELP" : "键入一个电子邮件地址，然后按回车键继续 ",
-
-    "PROPERTY.EXECUTIONLISTENERS.DISPLAY" : "{{length}}执行监听",
-    "PROPERTY.EXECUTIONLISTENERS.EMPTY" : "没有配置执行监听",
-    "PROPERTY.EXECUTIONLISTENERS.EVENT" : "事件",
-    "PROPERTY.EXECUTIONLISTENERS.CLASS" : "类",
-    "PROPERTY.EXECUTIONLISTENERS.CLASS.PLACEHOLDER" : "输入类名",
-    "PROPERTY.EXECUTIONLISTENERS.EXPRESSION" : "表达式",
-    "PROPERTY.EXECUTIONLISTENERS.EXPRESSION.PLACEHOLDER" : "输入表达式",
-    "PROPERTY.EXECUTIONLISTENERS.DELEGATEEXPRESSION" : "委托表达式",
-    "PROPERTY.EXECUTIONLISTENERS.DELEGATEEXPRESSION.PLACEHOLDER" : "输入委托表达式",
-    "PROPERTY.EXECUTIONLISTENERS.UNSELECTED" : "没有配置执行监听",
-    "PROPERTY.EXECUTIONLISTENERS.FIELDS.NAME" : "名称",
-    "PROPERTY.EXECUTIONLISTENERS.FIELDS.NAME.PLACEHOLDER" : "输入名称",
-    "PROPERTY.EXECUTIONLISTENERS.FIELDS.EXPRESSION" : "表达式",
-    "PROPERTY.EXECUTIONLISTENERS.FIELDS.EXPRESSION.PLACEHOLDER" : "输入表达式",
-    "PROPERTY.EXECUTIONLISTENERS.FIELDS.STRINGVALUE" : "字符串",
-    "PROPERTY.EXECUTIONLISTENERS.FIELDS.STRINGVALUE.PLACEHOLDER" : "输入字符串",
-    "PROPERTY.EXECUTIONLISTENERS.FIELDS.STRING" : "字符串",
-    "PROPERTY.EXECUTIONLISTENERS.FIELDS.STRING.PLACEHOLDER" : "输入字符串",
-    "PROPERTY.EXECUTIONLISTENERS.FIELDS.IMPLEMENTATION" : "实现类",
-    "PROPERTY.EXECUTIONLISTENERS.FIELDS.EMPTY" : "没有选择字段",
-
-    "PROPERTY.FIELDS" : "{{length}}字段",
-    "PROPERTY.FIELDS.EMPTY" : "没有选择字段",
-    "PROPERTY.FIELDS.NAME" : "名称",
-    "PROPERTY.FIELDS.NAME.PLACEHOLDER" : "输入名称",
-    "PROPERTY.FIELDS.EXPRESSION" : "表达式",
-    "PROPERTY.FIELDS.EXPRESSION.PLACEHOLDER" : "输入表达式",
-    "PROPERTY.FIELDS.STRINGVALUE" : "字符串",
-    "PROPERTY.FIELDS.STRINGVALUE.PLACEHOLDER" : "输入字符串",
-    "PROPERTY.FIELDS.STRING" : "字符串",
-    "PROPERTY.FIELDS.STRING.PLACEHOLDER" : "输入字符串",
-    "PROPERTY.FIELDS.IMPLEMENTATION" : "实现类",
-    "PROPERTY.FIELDS.UNSELECTED" : "没有选择字段",
-
-    "PROPERTY.FORMPROPERTIES.VALUE" : "{{length}}表单属性",
-    "PROPERTY.FORMPROPERTIES.EMPTY" : "没有配置表单",
-    "PROPERTY.FORMPROPERTIES.ID" : "活动编号",
-    "PROPERTY.FORMPROPERTIES.ID.PLACEHOLDER" : "输入活动编号",
-    "PROPERTY.FORMPROPERTIES.NAME" : "名称",
-    "PROPERTY.FORMPROPERTIES.NAME.PLACEHOLDER" : "输入名称",
-    "PROPERTY.FORMPROPERTIES.TYPE" : "类型",
-    "PROPERTY.FORMPROPERTIES.DATEPATTERN" : "时间选择框",
-    "PROPERTY.FORMPROPERTIES.DATEPATTERN.PLACEHOLDER" : "输入日期",
-    "PROPERTY.FORMPROPERTIES.VALUES" : "值",
-    "PROPERTY.FORMPROPERTIES.EXPRESSION" : "表达式",
-    "PROPERTY.FORMPROPERTIES.EXPRESSION.PLACEHOLDER" : "输入表达式",
-    "PROPERTY.FORMPROPERTIES.VARIABLE" : "变量",
-    "PROPERTY.FORMPROPERTIES.VARIABLE.PLACEHOLDER" : "输入变量",
-    "PROPERTY.FORMPROPERTIES.REQUIRED" : "必输",
-    "PROPERTY.FORMPROPERTIES.READABLE" : "可读",
-    "PROPERTY.FORMPROPERTIES.WRITABLE" : "可写",
-
-    "PROPERTY.INPARAMETERS.VALUE" : "{{length}}输入参数",
-    "PROPERTY.INPARAMETERS.EMPTY" : "没有配置输入参数",
-
-    "PROPERTY.OUTPARAMETERS.VALUE" : "{{length}}返回参数",
-    "PROPERTY.OUTPARAMETERS.EMPTY" : "没有配置返回参数",
-
-    "PROPERTY.PARAMETER.SOURCE" : "源",
-    "PROPERTY.PARAMETER.SOURCE.PLACEHOLDER" : "输入源",
-    "PROPERTY.PARAMETER.SOURCEEXPRESSION" : "源表达式",
-    "PROPERTY.PARAMETER.SOURCEEXPRESSION.PLACEHOLDER" : "输入源表达式",
-    "PROPERTY.PARAMETER.TARGET" : "目标",
-    "PROPERTY.PARAMETER.TARGET.PLACEHOLDER" : "输入目标",
-    "PROPERTY.PARAMETER.EMPTY" : "没有选择参数",
-
-    "PROPERTY.SUBPROCESSREFERENCE.EMPTY" : "没有引用子流程",
-    "PROPERTY.SUBPROCESSREFERENCE.TITLE" : "引用错误的子流程",
-    "PROPERTY.SUBPROCESSREFERENCE.ERROR.SUBPROCESS" : "子流程加载错误.请稍后再试",
-    "PROPERTY.SUBPROCESSREFERENCE.FOLDER.ROOT" : "文件夹",
-    "PROPERTY.SUBPROCESSREFERENCE.FOLDER.LOADING" : "文件夹加载中...",
-    "PROPERTY.SUBPROCESSREFERENCE.FOLDER.EMPTY" : "文件夹未包含子文件夹",
-    "PROPERTY.SUBPROCESSREFERENCE.SUBPROCESS.LOADING" : "子流程加载中...",
-    "PROPERTY.SUBPROCESSREFERENCE.SUBPROCESS.EMPTY" : "文件夹包含子文件夹",
-
-    "PROPERTY.FORMREFERENCE.EMPTY" : "没有引用表单",
-    "PROPERTY.FORMREFERENCE.TITLE" : "表单引用",
-    "PROPERTY.FORMREFERENCE.ERROR.FORM" : "表单加载错误.请稍后再试!",
-    "PROPERTY.FORMREFERENCE.FOLDER.ROOT" : "文件夹",
-    "PROPERTY.FORMREFERENCE.FOLDER.LOADING" : "文件夹加载中...",
-    "PROPERTY.FORMREFERENCE.FOLDER.EMPTY" : "文件夹未包含子文件夹",
-    "PROPERTY.FORMREFERENCE.FORM.LOADING" : "表单加载中...",
-    "PROPERTY.FORMREFERENCE.FORM.EMPTY" : "文件夹包含子文件夹",
-
-    "PROPERTY.TASKLISTENERS.VALUE" : "{{length}}任务监听",
-    "PROPERTY.TASKLISTENERS.EMPTY" : "未配置任务监听",
-    "PROPERTY.TASKLISTENERS.EVENT" : "事件",
-    "PROPERTY.TASKLISTENERS.CLASS" : "类",
-    "PROPERTY.TASKLISTENERS.CLASS.PLACEHOLDER" : "输入类名",
-    "PROPERTY.TASKLISTENERS.EXPRESSION" : "表达式",
-    "PROPERTY.TASKLISTENERS.EXPRESSION.PLACEHOLDER" : "请输入表达式",
-    "PROPERTY.TASKLISTENERS.DELEGATEEXPRESSION" : "委托表达式",
-    "PROPERTY.TASKLISTENERS.DELEGATEEXPRESSION.PLACEHOLDER" : "请输入委托表达式",
-    "PROPERTY.TASKLISTENERS.UNSELECTED" : "没有选择任务监听",
-    "PROPERTY.TASKLISTENERS.FIELDS.NAME" : "名称",
-    "PROPERTY.TASKLISTENERS.FIELDS.NAME.PLACEHOLDER" : "请输入名称",
-    "PROPERTY.TASKLISTENERS.FIELDS.EXPRESSION" : "表达式",
-    "PROPERTY.TASKLISTENERS.FIELDS.EXPRESSION.PLACEHOLDER" : "请输入表达式",
-    "PROPERTY.TASKLISTENERS.FIELDS.STRINGVALUE" : "字符串",
-    "PROPERTY.TASKLISTENERS.FIELDS.STRINGVALUE.PLACEHOLDER" : "请输入字符串",
-    "PROPERTY.TASKLISTENERS.FIELDS.STRING" : "字符串",
-    "PROPERTY.TASKLISTENERS.FIELDS.STRING.PLACEHOLDER" : "请输入字符串",
-    "PROPERTY.TASKLISTENERS.FIELDS.IMPLEMENTATION" : "执行",
-    "PROPERTY.TASKLISTENERS.FIELDS.EMPTY" : "未选择字段",
-
-    "PROPERTY.EVENTLISTENERS.DISPLAY" : "{{length}}事件监听",
-    "PROPERTY.EVENTLISTENERS.EMPTY" : "未配置事件监听",
-    "PROPERTY.EVENTLISTENERS.EVENTS": "事件",
-    "PROPERTY.EVENTLISTENERS.RETHROW": "抛出事件?",
-    "PROPERTY.EVENTLISTENERS.CLASS" : "类",
-    "PROPERTY.EVENTLISTENERS.CLASS.PLACEHOLDER" : "输入类名",
-    "PROPERTY.EVENTLISTENERS.DELEGATEEXPRESSION" : "委托表达式",
-    "PROPERTY.EVENTLISTENERS.DELEGATEEXPRESSION.PLACEHOLDER" : "请输入委托表达式",
-    "PROPERTY.EVENTLISTENERS.ENTITYTYPE" : "类型",
-    "PROPERTY.EVENTLISTENERS.ENTITYTYPE.PLACEHOLDER" : "请输入类型",
-    "PROPERTY.EVENTLISTENERS.RETHROWTYPE": "抛出事件类型",
-    "PROPERTY.EVENTLISTENERS.ERRORCODE" : "错误代码",
-    "PROPERTY.EVENTLISTENERS.ERRORCODE.PLACEHOLDER" : "请输入错误代码",
-    "PROPERTY.EVENTLISTENERS.MESSAGENAME" : "消息名称",
-    "PROPERTY.EVENTLISTENERS.MESSAGENAME.PLACEHOLDER" : "请输入消息名称",
-    "PROPERTY.EVENTLISTENERS.SIGNALNAME" : "信号名称",
-    "PROPERTY.EVENTLISTENERS.SIGNALNAME.PLACEHOLDER" : "请输入信号名称",
-    "PROPERTY.EVENTLISTENERS.UNSELECTED" : "没有选择事件监听",
-
-    "PROPERTY.SIGNALDEFINITIONS.DISPLAY" : "{{length}}信号定义",
-    "PROPERTY.SIGNALDEFINITIONS.EMPTY" : "没有配置信号定义",
-    "PROPERTY.SIGNALDEFINITIONS.SCOPE-GLOBAL": "全局",
-    "PROPERTY.SIGNALDEFINITIONS.SCOPE-PROCESSINSTANCE": "流程初始化",
-    "PROPERTY.SIGNALDEFINITIONS.ID" : "编号",
-    "PROPERTY.SIGNALDEFINITIONS.NAME" : "名称",
-    "PROPERTY.SIGNALDEFINITIONS.SCOPE" : "Scope",
-
-    "PROPERTY.MESSAGEDEFINITIONS.DISPLAY" : "{{length}}消息定义",
-    "PROPERTY.MESSAGEDEFINITIONS.EMPTY" : "没有配置消息定义",
-    "PROPERTY.MESSAGEDEFINITIONS.ID" : "编号",
-    "PROPERTY.MESSAGEDEFINITIONS.NAME" : "名称",
-
-    "PROPERTY.SEQUENCEFLOW.ORDER.EMPTY" : "没有确定顺序流排序",
-    "PROPERTY.SEQUENCEFLOW.ORDER.NOT.EMPTY" : "顺序流排序",
-    "PROPERTY.SEQUENCEFLOW.ORDER.NO.OUTGOING.SEQUENCEFLOW.FOUND" : "没有输出顺序流.",
-    "PROPERTY.SEQUENCEFLOW.ORDER.DESCRIPTION" : "不能设置已经被使用的编号:",
-    "PROPERTY.SEQUENCEFLOW.ORDER.SEQUENCEFLOW.VALUE" : "顺序流{{targetType}} {{targetTitle}}",
-
-    "PROPERTY.SEQUENCEFLOW.CONDITION.TITLE" : "条件",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.TYPE.TITLE" : "条件类型",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.TYPE.VARIABLE" : "选择的变量",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.TYPE.STATIC" : "静态值",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.STATIC" : "条件表达式",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.STATIC_PLACEHOLDER" : "输入表达式值",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.TYPE" : "变量类型",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.NO-CONDITION" : "没有条件",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.FORM-FIELD" : "表单字段",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.FORM-OUTCOME" : "表单输出",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.SELECT-FIELD" : "选择的字段",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.NO-FIELDS-AVAILABLE" : "没有字段变量",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.SELECT-FORM" : "选择表单",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.NO-FORMS-AVAILABLE" : "没有表单变量",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.SELECT-OPERATOR" : "选择操作",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.EQUALS" : "等于",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.NOTEQUALS" : "不等于",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.LESSTHAN" : "小于",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.GREATERTHAN" : "大于",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.SELECT-OUTCOME" : "选择输出",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.NO-OUTCOMES-AVAILABLE" : "没有输出变量",
-    "PROPERTY.SEQUENCEFLOW.CONDITION.NO-CONDITION-DISPLAY" : "没有条件",
-
-    "MODEL.SAVE.TITLE" : "保存模型",
-    "MODEL.NAME" : "名称",
-    "MODEL.DESCRIPTION" : "描述",
-    "MODEL.SAVE.NEWVERSION" : "保存为新版本? 这样你可以随时回到以前的版本",
-    "MODEL.SAVE.COMMENT" : "注释",
-    "MODEL.SAVE.SAVING" : "保存",
-    "MODEL.LASTMODIFIEDDATE" : "上次保存时间",
-    "MODEL.SAVE.ERROR": "未知错误:保存失败!",
-
-    "EVENT_TYPE.ACTIVITY.COMPENSATE.TOOLTIP": "一个活动被另外一个活动替代执行",
-    "EVENT_TYPE.ACTIVITY.COMPLETED.TOOLTIP": "一个活动被成功的执行",
-    "EVENT_TYPE.ACTIVITY.ERROR.RECEIVED.TOOLTIP": "在收到活动错误之前,活动已收到错误事件",
-    "EVENT_TYPE.MEMBERSHIP.CREATED.TOOLTIP": "一个唯一的成员被创建",
-    "EVENT_TYPE.MEMBERSHIP.DELETED.TOOLTIP": "一个唯一的成员被删除",
-    "EVENT_TYPE.MEMBERSHIPS.DELETED.TOOLTIP": "所有成员都被删除.可能是由于没有事件被分配",
-    "EVENT_TYPE.TASK.ASSIGNED.TOOLTIP": "在ENTITY_UPDATED事件抛出时，任务已经被分配",
-    "EVENT_TYPE.TASK.COMPLETED.TOOLTIP": "在任务实体删除前任务已经被完成",
-    "EVENT_TYPE.UNCAUGHT.BPMNERROR.TOOLTIP": "一个BPMN被抛出,但没有捕获",
-    "EVENT_TYPE.VARIABLE.CREATED.TOOLTIP": "一个变量被创建",
-    "EVENT_TYPE.VARIABLE.DELETED.TOOLTIP": "一个变量被删除",
-    "EVENT_TYPE.VARIABLE.UPDATED.TOOLTIP": "一个变量被更新"
+  "HEADER.BRAND": "Activiti编辑",
+  "HEADER.BRAND_TAGLINE": "powered by Alfresco",
+  "PAGE.HEADER": "Orchestration Details",
+  "ACTION.OK": "确认",
+  "ACTION.SAVE": "保存",
+  "ACTION.SAVE-AND-CLOSE": "保存并关闭",
+  "ACTION.SEND": "发送",
+  "ACTION.CANCEL": "取消",
+  "ACTION.SELECT": "选择",
+  "ACTION.ADD": "添加",
+  "ACTION.REMOVE": "清除",
+  "ACTION.MOVE.UP": "上移",
+  "ACTION.MOVE.DOWN": "下移",
+  "MAIN_NAVIGATION_ORCHESTRATIONS": "业务流程",
+  "MAIN_NAVIGATION_DISPATCH_RULES": "调度规则",
+  "MAIN_NAVIGATION_ASSET_GROUPS": "审批组",
+  "MAIN_NAVIGATION_SOLUTIONS": "解决",
+  "TOOLBAR.ACTION.CLOSE": "Close the editor and go back to the overview page",
+  "TOOLBAR.ACTION.SAVE": "保存",
+  "TOOLBAR.ACTION.VALIDATE": "校验",
+  "TOOLBAR.ACTION.CUT": "剪切",
+  "TOOLBAR.ACTION.COPY": "复制",
+  "TOOLBAR.ACTION.PASTE": "粘贴",
+  "TOOLBAR.ACTION.DELETE": "删除",
+  "TOOLBAR.ACTION.UNDO": "撤销",
+  "TOOLBAR.ACTION.REDO": "重复",
+  "TOOLBAR.ACTION.ZOOMIN": "放大",
+  "TOOLBAR.ACTION.ZOOMOUT": "缩小",
+  "TOOLBAR.ACTION.ZOOMACTUAL": "实际大小 ",
+  "TOOLBAR.ACTION.ZOOMFIT": "适应屏幕",
+  "TOOLBAR.ACTION.MOVE": "移动",
+  "TOOLBAR.ACTION.IMPORT": "导入",
+  "TOOLBAR.ACTION.EXPORT": "导出",
+  "TOOLBAR.ACTION.BENDPOINT.ADD": "为选定的流程连线添加弯曲点",
+  "TOOLBAR.ACTION.BENDPOINT.REMOVE": "为选定的流程连线删除弯曲点",
+  "TOOLBAR.ACTION.ALIGNHORIZONTAL": "水平对齐",
+  "TOOLBAR.ACTION.ALIGNVERTICAL": "垂直对齐",
+  "TOOLBAR.ACTION.SAMESIZE": "Same size",
+  "TOOLBAR.ACTION.HELP": "Start the guided tour",
+  "TOOLBAR.ACTION.FEEDBACK": "Provide feedback",
+  "KICKSTART.PROCESS_TOOLBAR.ACTION.SAVE": "保存",
+  "KICKSTART.PROCESS_TOOLBAR.ACTION.VALIDATE": "校验模型",
+  "KICKSTART.PROCESS_TOOLBAR.ACTION.HELP": "预览",
+  "KICKSTART.PROCESS_TOOLBAR.ACTION.FEEDBACK": "反馈",
+  "FORM_TOOLBAR.ACTION.SAVE": "保存",
+  "FORM_TOOLBAR.ACTION.VALIDATE": "校验模型",
+  "FORM_TOOLBAR.ACTION.HELP": "预览",
+  "FORM_TOOLBAR.ACTION.FEEDBACK": "反馈",
+  "APP_DEFINITION_TOOLBAR.ACTION.SAVE": "保存",
+  "APP_DEFINITION_TOOLBAR.ACTION.VALIDATE": "校验模型",
+  "APP_DEFINITION_TOOLBAR.ACTION.HELP": "预览",
+  "APP_DEFINITION_TOOLBAR.ACTION.FEEDBACK": "反馈",
+  "BUTTON.ACTION.DELETE.TOOLTIP": "从模型中删除元素",
+  "BUTTON.ACTION.MORPH.TOOLTIP": "更改元素类型",
+  "ELEMENT.AUTHOR": "作者",
+  "ELEMENT.DATE_CREATED": "创建日期",
+  "ELEMENT.SELECTED_EMPTY_TITLE": "(输入名称)",
+  "PROPERTY.REMOVED": "清除",
+  "PROPERTY.EMPTY": "",
+  "PROPERTY.PROPERTY.EDIT.TITLE": "修改 \"{{title}}\"",
+  "PROPERTY.FEEDBACK.TITLE": "请填写您的反馈意见",
+  "PROPERTY.ASSIGNMENT.TITLE": "指派",
+  "PROPERTY.ASSIGNMENT.TYPE": "类型",
+  "PROPERTY.ASSIGNMENT.TYPE.IDENTITYSTORE": "Identity store",
+  "PROPERTY.ASSIGNMENT.TYPE.STATIC": "静态值",
+  "PROPERTY.ASSIGNMENT.ASSIGNEE": "代理人",
+  "PROPERTY.ASSIGNMENT.MATCHING": "使用上下方向键选择并按回车键确认或使用鼠标",
+  "PROPERTY.ASSIGNMENT.ASSIGNEE_PLACEHOLDER": "请输入代理人",
+  "PROPERTY.ASSIGNMENT.EMPTY": "无代理人",
+  "PROPERTY.ASSIGNMENT.ASSIGNEE_DISPLAY": "代理人 {{assignee}}",
+  "PROPERTY.ASSIGNMENT.CANDIDATE_USERS_DISPLAY": "{{length}}候选人",
+  "PROPERTY.ASSIGNMENT.CANDIDATE_USERS": "候选人",
+  "PROPERTY.ASSIGNMENT.CANDIDATE_GROUPS_DISPLAY": "{{length}}候选组",
+  "PROPERTY.ASSIGNMENT.CANDIDATE_GROUPS": "候选组",
+  "PROPERTY.ASSIGNMENT.USER_IDM_DISPLAY": "用户{{firstName}} {{lastName}}",
+  "PROPERTY.ASSIGNMENT.USER_IDM_EMAIL_DISPLAY": "用户{{email}}",
+  "PROPERTY.ASSIGNMENT.IDM_EMPTY": "发起人",
+  "PROPERTY.ASSIGNMENT.IDM.TYPE": "任务",
+  "PROPERTY.ASSIGNMENT.IDM.NO_CANDIDATE_USERS": "没有选择候选人...",
+  "PROPERTY.ASSIGNMENT.IDM.NO_CANDIDATE_GROUPS": "没有选择候选组...",
+  "PROPERTY.ASSIGNMENT.IDM.DROPDOWN.INITIATOR": "分派给发起人",
+  "PROPERTY.ASSIGNMENT.IDM.DROPDOWN.USER": "分派给一个用户",
+  "PROPERTY.ASSIGNMENT.IDM.DROPDOWN.USERS": "候选人s",
+  "PROPERTY.ASSIGNMENT.IDM.DROPDOWN.GROUPS": "候选组",
+  "PROPERTY.ASSIGNMENT.EMAIL.HELP": "键入一个电子邮件地址，然后按回车键继续 ",
+  "PROPERTY.EXECUTIONLISTENERS.DISPLAY": "{{length}}执行监听",
+  "PROPERTY.EXECUTIONLISTENERS.EMPTY": "没有配置执行监听",
+  "PROPERTY.EXECUTIONLISTENERS.EVENT": "事件",
+  "PROPERTY.EXECUTIONLISTENERS.CLASS": "类",
+  "PROPERTY.EXECUTIONLISTENERS.CLASS.PLACEHOLDER": "输入类名",
+  "PROPERTY.EXECUTIONLISTENERS.EXPRESSION": "表达式",
+  "PROPERTY.EXECUTIONLISTENERS.EXPRESSION.PLACEHOLDER": "输入表达式",
+  "PROPERTY.EXECUTIONLISTENERS.DELEGATEEXPRESSION": "委托表达式",
+  "PROPERTY.EXECUTIONLISTENERS.DELEGATEEXPRESSION.PLACEHOLDER": "输入委托表达式",
+  "PROPERTY.EXECUTIONLISTENERS.UNSELECTED": "没有配置执行监听",
+  "PROPERTY.EXECUTIONLISTENERS.FIELDS.NAME": "名称",
+  "PROPERTY.EXECUTIONLISTENERS.FIELDS.NAME.PLACEHOLDER": "输入名称",
+  "PROPERTY.EXECUTIONLISTENERS.FIELDS.EXPRESSION": "表达式",
+  "PROPERTY.EXECUTIONLISTENERS.FIELDS.EXPRESSION.PLACEHOLDER": "输入表达式",
+  "PROPERTY.EXECUTIONLISTENERS.FIELDS.STRINGVALUE": "字符串",
+  "PROPERTY.EXECUTIONLISTENERS.FIELDS.STRINGVALUE.PLACEHOLDER": "输入字符串",
+  "PROPERTY.EXECUTIONLISTENERS.FIELDS.STRING": "字符串",
+  "PROPERTY.EXECUTIONLISTENERS.FIELDS.STRING.PLACEHOLDER": "输入字符串",
+  "PROPERTY.EXECUTIONLISTENERS.FIELDS.IMPLEMENTATION": "实现类",
+  "PROPERTY.EXECUTIONLISTENERS.FIELDS.EMPTY": "没有选择字段",
+  "PROPERTY.FIELDS": "{{length}}字段",
+  "PROPERTY.FIELDS.EMPTY": "没有选择字段",
+  "PROPERTY.FIELDS.NAME": "名称",
+  "PROPERTY.FIELDS.NAME.PLACEHOLDER": "输入名称",
+  "PROPERTY.FIELDS.EXPRESSION": "表达式",
+  "PROPERTY.FIELDS.EXPRESSION.PLACEHOLDER": "输入表达式",
+  "PROPERTY.FIELDS.STRINGVALUE": "字符串",
+  "PROPERTY.FIELDS.STRINGVALUE.PLACEHOLDER": "输入字符串",
+  "PROPERTY.FIELDS.STRING": "字符串",
+  "PROPERTY.FIELDS.STRING.PLACEHOLDER": "输入字符串",
+  "PROPERTY.FIELDS.IMPLEMENTATION": "实现类",
+  "PROPERTY.FIELDS.UNSELECTED": "没有选择字段",
+  "PROPERTY.FORMPROPERTIES.VALUE": "{{length}}表单属性",
+  "PROPERTY.FORMPROPERTIES.EMPTY": "没有配置表单",
+  "PROPERTY.FORMPROPERTIES.ID": "活动编号",
+  "PROPERTY.FORMPROPERTIES.ID.PLACEHOLDER": "输入活动编号",
+  "PROPERTY.FORMPROPERTIES.NAME": "名称",
+  "PROPERTY.FORMPROPERTIES.NAME.PLACEHOLDER": "输入名称",
+  "PROPERTY.FORMPROPERTIES.TYPE": "类型",
+  "PROPERTY.FORMPROPERTIES.DATEPATTERN": "时间选择框",
+  "PROPERTY.FORMPROPERTIES.DATEPATTERN.PLACEHOLDER": "输入日期",
+  "PROPERTY.FORMPROPERTIES.VALUES": "值",
+  "PROPERTY.FORMPROPERTIES.EXPRESSION": "表达式",
+  "PROPERTY.FORMPROPERTIES.EXPRESSION.PLACEHOLDER": "输入表达式",
+  "PROPERTY.FORMPROPERTIES.VARIABLE": "变量",
+  "PROPERTY.FORMPROPERTIES.VARIABLE.PLACEHOLDER": "输入变量",
+  "PROPERTY.FORMPROPERTIES.REQUIRED": "必输",
+  "PROPERTY.FORMPROPERTIES.READABLE": "可读",
+  "PROPERTY.FORMPROPERTIES.WRITABLE": "可写",
+  "PROPERTY.INPARAMETERS.VALUE": "{{length}}输入参数",
+  "PROPERTY.INPARAMETERS.EMPTY": "没有配置输入参数",
+  "PROPERTY.OUTPARAMETERS.VALUE": "{{length}}返回参数",
+  "PROPERTY.OUTPARAMETERS.EMPTY": "没有配置返回参数",
+  "PROPERTY.PARAMETER.SOURCE": "源",
+  "PROPERTY.PARAMETER.SOURCE.PLACEHOLDER": "输入源",
+  "PROPERTY.PARAMETER.SOURCEEXPRESSION": "源表达式",
+  "PROPERTY.PARAMETER.SOURCEEXPRESSION.PLACEHOLDER": "输入源表达式",
+  "PROPERTY.PARAMETER.TARGET": "目标",
+  "PROPERTY.PARAMETER.TARGET.PLACEHOLDER": "输入目标",
+  "PROPERTY.PARAMETER.EMPTY": "没有选择参数",
+  "PROPERTY.SUBPROCESSREFERENCE.EMPTY": "没有引用子流程",
+  "PROPERTY.SUBPROCESSREFERENCE.TITLE": "引用错误的子流程",
+  "PROPERTY.SUBPROCESSREFERENCE.ERROR.SUBPROCESS": "子流程加载错误.请稍后再试",
+  "PROPERTY.SUBPROCESSREFERENCE.FOLDER.ROOT": "文件夹",
+  "PROPERTY.SUBPROCESSREFERENCE.FOLDER.LOADING": "文件夹加载中...",
+  "PROPERTY.SUBPROCESSREFERENCE.FOLDER.EMPTY": "文件夹未包含子文件夹",
+  "PROPERTY.SUBPROCESSREFERENCE.SUBPROCESS.LOADING": "子流程加载中...",
+  "PROPERTY.SUBPROCESSREFERENCE.SUBPROCESS.EMPTY": "文件夹包含子文件夹",
+  "PROPERTY.FORMREFERENCE.EMPTY": "没有引用表单",
+  "PROPERTY.FORMREFERENCE.TITLE": "表单引用",
+  "PROPERTY.FORMREFERENCE.ERROR.FORM": "表单加载错误.请稍后再试!",
+  "PROPERTY.FORMREFERENCE.FOLDER.ROOT": "文件夹",
+  "PROPERTY.FORMREFERENCE.FOLDER.LOADING": "文件夹加载中...",
+  "PROPERTY.FORMREFERENCE.FOLDER.EMPTY": "文件夹未包含子文件夹",
+  "PROPERTY.FORMREFERENCE.FORM.LOADING": "表单加载中...",
+  "PROPERTY.FORMREFERENCE.FORM.EMPTY": "文件夹包含子文件夹",
+  "PROPERTY.TASKLISTENERS.VALUE": "{{length}}任务监听",
+  "PROPERTY.TASKLISTENERS.EMPTY": "未配置任务监听",
+  "PROPERTY.TASKLISTENERS.EVENT": "事件",
+  "PROPERTY.TASKLISTENERS.CLASS": "类",
+  "PROPERTY.TASKLISTENERS.CLASS.PLACEHOLDER": "输入类名",
+  "PROPERTY.TASKLISTENERS.EXPRESSION": "表达式",
+  "PROPERTY.TASKLISTENERS.EXPRESSION.PLACEHOLDER": "请输入表达式",
+  "PROPERTY.TASKLISTENERS.DELEGATEEXPRESSION": "委托表达式",
+  "PROPERTY.TASKLISTENERS.DELEGATEEXPRESSION.PLACEHOLDER": "请输入委托表达式",
+  "PROPERTY.TASKLISTENERS.UNSELECTED": "没有选择任务监听",
+  "PROPERTY.TASKLISTENERS.FIELDS.NAME": "名称",
+  "PROPERTY.TASKLISTENERS.FIELDS.NAME.PLACEHOLDER": "请输入名称",
+  "PROPERTY.TASKLISTENERS.FIELDS.EXPRESSION": "表达式",
+  "PROPERTY.TASKLISTENERS.FIELDS.EXPRESSION.PLACEHOLDER": "请输入表达式",
+  "PROPERTY.TASKLISTENERS.FIELDS.STRINGVALUE": "字符串",
+  "PROPERTY.TASKLISTENERS.FIELDS.STRINGVALUE.PLACEHOLDER": "请输入字符串",
+  "PROPERTY.TASKLISTENERS.FIELDS.STRING": "字符串",
+  "PROPERTY.TASKLISTENERS.FIELDS.STRING.PLACEHOLDER": "请输入字符串",
+  "PROPERTY.TASKLISTENERS.FIELDS.IMPLEMENTATION": "执行",
+  "PROPERTY.TASKLISTENERS.FIELDS.EMPTY": "未选择字段",
+  "PROPERTY.EVENTLISTENERS.DISPLAY": "{{length}}事件监听",
+  "PROPERTY.EVENTLISTENERS.EMPTY": "未配置事件监听",
+  "PROPERTY.EVENTLISTENERS.EVENTS": "事件",
+  "PROPERTY.EVENTLISTENERS.RETHROW": "抛出事件?",
+  "PROPERTY.EVENTLISTENERS.CLASS": "类",
+  "PROPERTY.EVENTLISTENERS.CLASS.PLACEHOLDER": "输入类名",
+  "PROPERTY.EVENTLISTENERS.DELEGATEEXPRESSION": "委托表达式",
+  "PROPERTY.EVENTLISTENERS.DELEGATEEXPRESSION.PLACEHOLDER": "请输入委托表达式",
+  "PROPERTY.EVENTLISTENERS.ENTITYTYPE": "类型",
+  "PROPERTY.EVENTLISTENERS.ENTITYTYPE.PLACEHOLDER": "请输入类型",
+  "PROPERTY.EVENTLISTENERS.RETHROWTYPE": "抛出事件类型",
+  "PROPERTY.EVENTLISTENERS.ERRORCODE": "错误代码",
+  "PROPERTY.EVENTLISTENERS.ERRORCODE.PLACEHOLDER": "请输入错误代码",
+  "PROPERTY.EVENTLISTENERS.MESSAGENAME": "消息名称",
+  "PROPERTY.EVENTLISTENERS.MESSAGENAME.PLACEHOLDER": "请输入消息名称",
+  "PROPERTY.EVENTLISTENERS.SIGNALNAME": "信号名称",
+  "PROPERTY.EVENTLISTENERS.SIGNALNAME.PLACEHOLDER": "请输入信号名称",
+  "PROPERTY.EVENTLISTENERS.UNSELECTED": "没有选择事件监听",
+  "PROPERTY.SIGNALDEFINITIONS.DISPLAY": "{{length}}信号定义",
+  "PROPERTY.SIGNALDEFINITIONS.EMPTY": "没有配置信号定义",
+  "PROPERTY.SIGNALDEFINITIONS.SCOPE-GLOBAL": "全局",
+  "PROPERTY.SIGNALDEFINITIONS.SCOPE-PROCESSINSTANCE": "流程初始化",
+  "PROPERTY.SIGNALDEFINITIONS.ID": "编号",
+  "PROPERTY.SIGNALDEFINITIONS.NAME": "名称",
+  "PROPERTY.SIGNALDEFINITIONS.SCOPE": "Scope",
+  "PROPERTY.MESSAGEDEFINITIONS.DISPLAY": "{{length}}消息定义",
+  "PROPERTY.MESSAGEDEFINITIONS.EMPTY": "没有配置消息定义",
+  "PROPERTY.MESSAGEDEFINITIONS.ID": "编号",
+  "PROPERTY.MESSAGEDEFINITIONS.NAME": "名称",
+  "PROPERTY.SEQUENCEFLOW.ORDER.EMPTY": "没有确定顺序流排序",
+  "PROPERTY.SEQUENCEFLOW.ORDER.NOT.EMPTY": "顺序流排序",
+  "PROPERTY.SEQUENCEFLOW.ORDER.NO.OUTGOING.SEQUENCEFLOW.FOUND": "没有输出顺序流.",
+  "PROPERTY.SEQUENCEFLOW.ORDER.DESCRIPTION": "不能设置已经被使用的编号:",
+  "PROPERTY.SEQUENCEFLOW.ORDER.SEQUENCEFLOW.VALUE": "顺序流{{targetType}} {{targetTitle}}",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.TITLE": "条件",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.TYPE.TITLE": "条件类型",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.TYPE.VARIABLE": "选择的变量",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.TYPE.STATIC": "静态值",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.STATIC": "条件表达式",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.STATIC_PLACEHOLDER": "输入表达式值",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.TYPE": "变量类型",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.NO-CONDITION": "没有条件",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.FORM-FIELD": "表单字段",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.FORM-OUTCOME": "表单输出",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.SELECT-FIELD": "选择的字段",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.NO-FIELDS-AVAILABLE": "没有字段变量",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.SELECT-FORM": "选择表单",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.NO-FORMS-AVAILABLE": "没有表单变量",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.SELECT-OPERATOR": "选择操作",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.EQUALS": "等于",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.NOTEQUALS": "不等于",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.LESSTHAN": "小于",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.GREATERTHAN": "大于",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.SELECT-OUTCOME": "选择输出",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.VARIABLE.NO-OUTCOMES-AVAILABLE": "没有输出变量",
+  "PROPERTY.SEQUENCEFLOW.CONDITION.NO-CONDITION-DISPLAY": "没有条件",
+  "MODEL.SAVE.TITLE": "保存模型",
+  "MODEL.NAME": "名称",
+  "MODEL.DESCRIPTION": "描述",
+  "MODEL.SAVE.NEWVERSION": "保存为新版本? 这样你可以随时回到以前的版本",
+  "MODEL.SAVE.COMMENT": "注释",
+  "MODEL.SAVE.SAVING": "保存",
+  "MODEL.LASTMODIFIEDDATE": "上次保存时间",
+  "MODEL.SAVE.ERROR": "未知错误:保存失败!",
+  "EVENT_TYPE.ACTIVITY.COMPENSATE.TOOLTIP": "一个活动被另外一个活动替代执行",
+  "EVENT_TYPE.ACTIVITY.COMPLETED.TOOLTIP": "一个活动被成功的执行",
+  "EVENT_TYPE.ACTIVITY.ERROR.RECEIVED.TOOLTIP": "在收到活动错误之前,活动已收到错误事件",
+  "EVENT_TYPE.MEMBERSHIP.CREATED.TOOLTIP": "一个唯一的成员被创建",
+  "EVENT_TYPE.MEMBERSHIP.DELETED.TOOLTIP": "一个唯一的成员被删除",
+  "EVENT_TYPE.MEMBERSHIPS.DELETED.TOOLTIP": "所有成员都被删除.可能是由于没有事件被分配",
+  "EVENT_TYPE.TASK.ASSIGNED.TOOLTIP": "在ENTITY_UPDATED事件抛出时，任务已经被分配",
+  "EVENT_TYPE.TASK.COMPLETED.TOOLTIP": "在任务实体删除前任务已经被完成",
+  "EVENT_TYPE.UNCAUGHT.BPMNERROR.TOOLTIP": "一个BPMN被抛出,但没有捕获",
+  "EVENT_TYPE.VARIABLE.CREATED.TOOLTIP": "一个变量被创建",
+  "EVENT_TYPE.VARIABLE.DELETED.TOOLTIP": "一个变量被删除",
+  "EVENT_TYPE.VARIABLE.UPDATED.TOOLTIP": "一个变量被更新"
 }
\ No newline at end of file
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/angular-mocks_1.2.13/angular-mocks.js b/len-activiti/src/main/resources/static/editor-app/libs/angular-mocks_1.2.13/angular-mocks.js
index 1100f79..7a4a2b3 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/angular-mocks_1.2.13/angular-mocks.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/angular-mocks_1.2.13/angular-mocks.js
@@ -3,986 +3,1000 @@
  * (c) 2010-2014 Google, Inc. http://angularjs.org
  * License: MIT
  */
-(function(window, angular, undefined) {
-
-'use strict';
-
-/**
- * @ngdoc overview
- * @name angular.mock
- * @description
- *
- * Namespace from 'angular-mocks.js' which contains testing related code.
- */
-angular.mock = {};
-
-/**
- * ! This is a private undocumented service !
- *
- * @name ngMock.$browser
- *
- * @description
- * This service is a mock implementation of {@link ng.$browser}. It provides fake
- * implementation for commonly used browser apis that are hard to test, e.g. setTimeout, xhr,
- * cookies, etc...
- *
- * The api of this service is the same as that of the real {@link ng.$browser $browser}, except
- * that there are several helper methods available which can be used in tests.
- */
-angular.mock.$BrowserProvider = function() {
-  this.$get = function() {
-    return new angular.mock.$Browser();
-  };
-};
-
-angular.mock.$Browser = function() {
-  var self = this;
-
-  this.isMock = true;
-  self.$$url = "http://server/";
-  self.$$lastUrl = self.$$url; // used by url polling fn
-  self.pollFns = [];
-
-  // TODO(vojta): remove this temporary api
-  self.$$completeOutstandingRequest = angular.noop;
-  self.$$incOutstandingRequestCount = angular.noop;
-
-
-  // register url polling fn
-
-  self.onUrlChange = function(listener) {
-    self.pollFns.push(
-      function() {
-        if (self.$$lastUrl != self.$$url) {
-          self.$$lastUrl = self.$$url;
-          listener(self.$$url);
-        }
-      }
-    );
-
-    return listener;
-  };
-
-  self.cookieHash = {};
-  self.lastCookieHash = {};
-  self.deferredFns = [];
-  self.deferredNextId = 0;
-
-  self.defer = function(fn, delay) {
-    delay = delay || 0;
-    self.deferredFns.push({time:(self.defer.now + delay), fn:fn, id: self.deferredNextId});
-    self.deferredFns.sort(function(a,b){ return a.time - b.time;});
-    return self.deferredNextId++;
-  };
-
-
-  /**
-   * @name ngMock.$browser#defer.now
-   * @propertyOf ngMock.$browser
-   *
-   * @description
-   * Current milliseconds mock time.
-   */
-  self.defer.now = 0;
-
-
-  self.defer.cancel = function(deferId) {
-    var fnIndex;
-
-    angular.forEach(self.deferredFns, function(fn, index) {
-      if (fn.id === deferId) fnIndex = index;
-    });
-
-    if (fnIndex !== undefined) {
-      self.deferredFns.splice(fnIndex, 1);
-      return true;
-    }
-
-    return false;
-  };
-
-
-  /**
-   * @name ngMock.$browser#defer.flush
-   * @methodOf ngMock.$browser
-   *
-   * @description
-   * Flushes all pending requests and executes the defer callbacks.
-   *
-   * @param {number=} number of milliseconds to flush. See {@link #defer.now}
-   */
-  self.defer.flush = function(delay) {
-    if (angular.isDefined(delay)) {
-      self.defer.now += delay;
-    } else {
-      if (self.deferredFns.length) {
-        self.defer.now = self.deferredFns[self.deferredFns.length-1].time;
-      } else {
-        throw new Error('No deferred tasks to be flushed');
-      }
-    }
-
-    while (self.deferredFns.length && self.deferredFns[0].time <= self.defer.now) {
-      self.deferredFns.shift().fn();
-    }
-  };
-
-  self.$$baseHref = '';
-  self.baseHref = function() {
-    return this.$$baseHref;
-  };
-};
-angular.mock.$Browser.prototype = {
-
-/**
-  * @name ngMock.$browser#poll
-  * @methodOf ngMock.$browser
-  *
-  * @description
-  * run all fns in pollFns
-  */
-  poll: function poll() {
-    angular.forEach(this.pollFns, function(pollFn){
-      pollFn();
-    });
-  },
-
-  addPollFn: function(pollFn) {
-    this.pollFns.push(pollFn);
-    return pollFn;
-  },
-
-  url: function(url, replace) {
-    if (url) {
-      this.$$url = url;
-      return this;
-    }
-
-    return this.$$url;
-  },
-
-  cookies:  function(name, value) {
-    if (name) {
-      if (angular.isUndefined(value)) {
-        delete this.cookieHash[name];
-      } else {
-        if (angular.isString(value) &&       //strings only
-            value.length <= 4096) {          //strict cookie storage limits
-          this.cookieHash[name] = value;
-        }
-      }
-    } else {
-      if (!angular.equals(this.cookieHash, this.lastCookieHash)) {
-        this.lastCookieHash = angular.copy(this.cookieHash);
-        this.cookieHash = angular.copy(this.cookieHash);
-      }
-      return this.cookieHash;
-    }
-  },
-
-  notifyWhenNoOutstandingRequests: function(fn) {
-    fn();
-  }
-};
-
-
-/**
- * @ngdoc object
- * @name ngMock.$exceptionHandlerProvider
- *
- * @description
- * Configures the mock implementation of {@link ng.$exceptionHandler} to rethrow or to log errors
- * passed into the `$exceptionHandler`.
- */
-
-/**
- * @ngdoc object
- * @name ngMock.$exceptionHandler
- *
- * @description
- * Mock implementation of {@link ng.$exceptionHandler} that rethrows or logs errors passed
- * into it. See {@link ngMock.$exceptionHandlerProvider $exceptionHandlerProvider} for configuration
- * information.
- *
- *
- * <pre>
- *   describe('$exceptionHandlerProvider', function() {
- *
- *     it('should capture log messages and exceptions', function() {
- *
- *       module(function($exceptionHandlerProvider) {
- *         $exceptionHandlerProvider.mode('log');
- *       });
- *
- *       inject(function($log, $exceptionHandler, $timeout) {
- *         $timeout(function() { $log.log(1); });
- *         $timeout(function() { $log.log(2); throw 'banana peel'; });
- *         $timeout(function() { $log.log(3); });
- *         expect($exceptionHandler.errors).toEqual([]);
- *         expect($log.assertEmpty());
- *         $timeout.flush();
- *         expect($exceptionHandler.errors).toEqual(['banana peel']);
- *         expect($log.log.logs).toEqual([[1], [2], [3]]);
- *       });
- *     });
- *   });
- * </pre>
- */
-
-angular.mock.$ExceptionHandlerProvider = function() {
-  var handler;
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$exceptionHandlerProvider#mode
-   * @methodOf ngMock.$exceptionHandlerProvider
-   *
-   * @description
-   * Sets the logging mode.
-   *
-   * @param {string} mode Mode of operation, defaults to `rethrow`.
-   *
-   *   - `rethrow`: If any errors are passed into the handler in tests, it typically
-   *                means that there is a bug in the application or test, so this mock will
-   *                make these tests fail.
-   *   - `log`: Sometimes it is desirable to test that an error is thrown, for this case the `log`
-   *            mode stores an array of errors in `$exceptionHandler.errors`, to allow later
-   *            assertion of them. See {@link ngMock.$log#assertEmpty assertEmpty()} and
-   *            {@link ngMock.$log#reset reset()}
-   */
-  this.mode = function(mode) {
-    switch(mode) {
-      case 'rethrow':
-        handler = function(e) {
-          throw e;
-        };
-        break;
-      case 'log':
-        var errors = [];
-
-        handler = function(e) {
-          if (arguments.length == 1) {
-            errors.push(e);
-          } else {
-            errors.push([].slice.call(arguments, 0));
-          }
-        };
-
-        handler.errors = errors;
-        break;
-      default:
-        throw new Error("Unknown mode '" + mode + "', only 'log'/'rethrow' modes are allowed!");
-    }
-  };
-
-  this.$get = function() {
-    return handler;
-  };
-
-  this.mode('rethrow');
-};
-
-
-/**
- * @ngdoc service
- * @name ngMock.$log
- *
- * @description
- * Mock implementation of {@link ng.$log} that gathers all logged messages in arrays
- * (one array per logging level). These arrays are exposed as `logs` property of each of the
- * level-specific log function, e.g. for level `error` the array is exposed as `$log.error.logs`.
- *
- */
-angular.mock.$LogProvider = function() {
-  var debug = true;
-
-  function concat(array1, array2, index) {
-    return array1.concat(Array.prototype.slice.call(array2, index));
-  }
-
-  this.debugEnabled = function(flag) {
-    if (angular.isDefined(flag)) {
-      debug = flag;
-      return this;
-    } else {
-      return debug;
-    }
-  };
-
-  this.$get = function () {
-    var $log = {
-      log: function() { $log.log.logs.push(concat([], arguments, 0)); },
-      warn: function() { $log.warn.logs.push(concat([], arguments, 0)); },
-      info: function() { $log.info.logs.push(concat([], arguments, 0)); },
-      error: function() { $log.error.logs.push(concat([], arguments, 0)); },
-      debug: function() {
-        if (debug) {
-          $log.debug.logs.push(concat([], arguments, 0));
-        }
-      }
-    };
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$log#reset
-     * @methodOf ngMock.$log
-     *
-     * @description
-     * Reset all of the logging arrays to empty.
-     */
-    $log.reset = function () {
-      /**
-       * @ngdoc property
-       * @name ngMock.$log#log.logs
-       * @propertyOf ngMock.$log
-       *
-       * @description
-       * Array of messages logged using {@link ngMock.$log#log}.
-       *
-       * @example
-       * <pre>
-       * $log.log('Some Log');
-       * var first = $log.log.logs.unshift();
-       * </pre>
-       */
-      $log.log.logs = [];
-      /**
-       * @ngdoc property
-       * @name ngMock.$log#info.logs
-       * @propertyOf ngMock.$log
-       *
-       * @description
-       * Array of messages logged using {@link ngMock.$log#info}.
-       *
-       * @example
-       * <pre>
-       * $log.info('Some Info');
-       * var first = $log.info.logs.unshift();
-       * </pre>
-       */
-      $log.info.logs = [];
-      /**
-       * @ngdoc property
-       * @name ngMock.$log#warn.logs
-       * @propertyOf ngMock.$log
-       *
-       * @description
-       * Array of messages logged using {@link ngMock.$log#warn}.
-       *
-       * @example
-       * <pre>
-       * $log.warn('Some Warning');
-       * var first = $log.warn.logs.unshift();
-       * </pre>
-       */
-      $log.warn.logs = [];
-      /**
-       * @ngdoc property
-       * @name ngMock.$log#error.logs
-       * @propertyOf ngMock.$log
-       *
-       * @description
-       * Array of messages logged using {@link ngMock.$log#error}.
-       *
-       * @example
-       * <pre>
-       * $log.error('Some Error');
-       * var first = $log.error.logs.unshift();
-       * </pre>
-       */
-      $log.error.logs = [];
-        /**
-       * @ngdoc property
-       * @name ngMock.$log#debug.logs
-       * @propertyOf ngMock.$log
-       *
-       * @description
-       * Array of messages logged using {@link ngMock.$log#debug}.
-       *
-       * @example
-       * <pre>
-       * $log.debug('Some Error');
-       * var first = $log.debug.logs.unshift();
-       * </pre>
-       */
-      $log.debug.logs = [];
-    };
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$log#assertEmpty
-     * @methodOf ngMock.$log
-     *
-     * @description
-     * Assert that the all of the logging methods have no logged messages. If messages present, an
-     * exception is thrown.
-     */
-    $log.assertEmpty = function() {
-      var errors = [];
-      angular.forEach(['error', 'warn', 'info', 'log', 'debug'], function(logLevel) {
-        angular.forEach($log[logLevel].logs, function(log) {
-          angular.forEach(log, function (logItem) {
-            errors.push('MOCK $log (' + logLevel + '): ' + String(logItem) + '\n' +
-                        (logItem.stack || ''));
-          });
-        });
-      });
-      if (errors.length) {
-        errors.unshift("Expected $log to be empty! Either a message was logged unexpectedly, or "+
-          "an expected log message was not checked and removed:");
-        errors.push('');
-        throw new Error(errors.join('\n---------\n'));
-      }
-    };
-
-    $log.reset();
-    return $log;
-  };
-};
-
-
-/**
- * @ngdoc service
- * @name ngMock.$interval
- *
- * @description
- * Mock implementation of the $interval service.
- *
- * Use {@link ngMock.$interval#methods_flush `$interval.flush(millis)`} to
- * move forward by `millis` milliseconds and trigger any functions scheduled to run in that
- * time.
- *
- * @param {function()} fn A function that should be called repeatedly.
- * @param {number} delay Number of milliseconds between each function call.
- * @param {number=} [count=0] Number of times to repeat. If not set, or 0, will repeat
- *   indefinitely.
- * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
- *   will invoke `fn` within the {@link ng.$rootScope.Scope#methods_$apply $apply} block.
- * @returns {promise} A promise which will be notified on each iteration.
- */
-angular.mock.$IntervalProvider = function() {
-  this.$get = ['$rootScope', '$q',
-       function($rootScope,   $q) {
-    var repeatFns = [],
-        nextRepeatId = 0,
-        now = 0;
-
-    var $interval = function(fn, delay, count, invokeApply) {
-      var deferred = $q.defer(),
-          promise = deferred.promise,
-          iteration = 0,
-          skipApply = (angular.isDefined(invokeApply) && !invokeApply);
-
-      count = (angular.isDefined(count)) ? count : 0,
-      promise.then(null, null, fn);
-
-      promise.$$intervalId = nextRepeatId;
-
-      function tick() {
-        deferred.notify(iteration++);
-
-        if (count > 0 && iteration >= count) {
-          var fnIndex;
-          deferred.resolve(iteration);
-
-          angular.forEach(repeatFns, function(fn, index) {
-            if (fn.id === promise.$$intervalId) fnIndex = index;
-          });
-
-          if (fnIndex !== undefined) {
-            repeatFns.splice(fnIndex, 1);
-          }
-        }
-
-        if (!skipApply) $rootScope.$apply();
-      }
-
-      repeatFns.push({
-        nextTime:(now + delay),
-        delay: delay,
-        fn: tick,
-        id: nextRepeatId,
-        deferred: deferred
-      });
-      repeatFns.sort(function(a,b){ return a.nextTime - b.nextTime;});
-
-      nextRepeatId++;
-      return promise;
-    };
-
-    $interval.cancel = function(promise) {
-      if(!promise) return false;
-      var fnIndex;
-
-      angular.forEach(repeatFns, function(fn, index) {
-        if (fn.id === promise.$$intervalId) fnIndex = index;
-      });
-
-      if (fnIndex !== undefined) {
-        repeatFns[fnIndex].deferred.reject('canceled');
-        repeatFns.splice(fnIndex, 1);
-        return true;
-      }
-
-      return false;
-    };
-
-    /**
-     * @ngdoc method
-     * @name ngMock.$interval#flush
-     * @methodOf ngMock.$interval
-     * @description
-     *
-     * Runs interval tasks scheduled to be run in the next `millis` milliseconds.
-     *
-     * @param {number=} millis maximum timeout amount to flush up until.
-     *
-     * @return {number} The amount of time moved forward.
-     */
-    $interval.flush = function(millis) {
-      now += millis;
-      while (repeatFns.length && repeatFns[0].nextTime <= now) {
-        var task = repeatFns[0];
-        task.fn();
-        task.nextTime += task.delay;
-        repeatFns.sort(function(a,b){ return a.nextTime - b.nextTime;});
-      }
-      return millis;
-    };
-
-    return $interval;
-  }];
-};
-
-
-/* jshint -W101 */
-/* The R_ISO8061_STR regex is never going to fit into the 100 char limit!
- * This directive should go inside the anonymous function but a bug in JSHint means that it would
- * not be enacted early enough to prevent the warning.
- */
-var R_ISO8061_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?:\:?(\d\d)(?:\:?(\d\d)(?:\.(\d{3}))?)?)?(Z|([+-])(\d\d):?(\d\d)))?$/;
-
-function jsonStringToDate(string) {
-  var match;
-  if (match = string.match(R_ISO8061_STR)) {
-    var date = new Date(0),
-        tzHour = 0,
-        tzMin  = 0;
-    if (match[9]) {
-      tzHour = int(match[9] + match[10]);
-      tzMin = int(match[9] + match[11]);
-    }
-    date.setUTCFullYear(int(match[1]), int(match[2]) - 1, int(match[3]));
-    date.setUTCHours(int(match[4]||0) - tzHour,
-                     int(match[5]||0) - tzMin,
-                     int(match[6]||0),
-                     int(match[7]||0));
-    return date;
-  }
-  return string;
-}
-
-function int(str) {
-  return parseInt(str, 10);
-}
-
-function padNumber(num, digits, trim) {
-  var neg = '';
-  if (num < 0) {
-    neg =  '-';
-    num = -num;
-  }
-  num = '' + num;
-  while(num.length < digits) num = '0' + num;
-  if (trim)
-    num = num.substr(num.length - digits);
-  return neg + num;
-}
-
-
-/**
- * @ngdoc object
- * @name angular.mock.TzDate
- * @description
- *
- * *NOTE*: this is not an injectable instance, just a globally available mock class of `Date`.
- *
- * Mock of the Date type which has its timezone specified via constructor arg.
- *
- * The main purpose is to create Date-like instances with timezone fixed to the specified timezone
- * offset, so that we can test code that depends on local timezone settings without dependency on
- * the time zone settings of the machine where the code is running.
- *
- * @param {number} offset Offset of the *desired* timezone in hours (fractions will be honored)
- * @param {(number|string)} timestamp Timestamp representing the desired time in *UTC*
- *
- * @example
- * !!!! WARNING !!!!!
- * This is not a complete Date object so only methods that were implemented can be called safely.
- * To make matters worse, TzDate instances inherit stuff from Date via a prototype.
- *
- * We do our best to intercept calls to "unimplemented" methods, but since the list of methods is
- * incomplete we might be missing some non-standard methods. This can result in errors like:
- * "Date.prototype.foo called on incompatible Object".
- *
- * <pre>
- * var newYearInBratislava = new TzDate(-1, '2009-12-31T23:00:00Z');
- * newYearInBratislava.getTimezoneOffset() => -60;
- * newYearInBratislava.getFullYear() => 2010;
- * newYearInBratislava.getMonth() => 0;
- * newYearInBratislava.getDate() => 1;
- * newYearInBratislava.getHours() => 0;
- * newYearInBratislava.getMinutes() => 0;
- * newYearInBratislava.getSeconds() => 0;
- * </pre>
- *
- */
-angular.mock.TzDate = function (offset, timestamp) {
-  var self = new Date(0);
-  if (angular.isString(timestamp)) {
-    var tsStr = timestamp;
-
-    self.origDate = jsonStringToDate(timestamp);
-
-    timestamp = self.origDate.getTime();
-    if (isNaN(timestamp))
-      throw {
-        name: "Illegal Argument",
-        message: "Arg '" + tsStr + "' passed into TzDate constructor is not a valid date string"
-      };
-  } else {
-    self.origDate = new Date(timestamp);
-  }
-
-  var localOffset = new Date(timestamp).getTimezoneOffset();
-  self.offsetDiff = localOffset*60*1000 - offset*1000*60*60;
-  self.date = new Date(timestamp + self.offsetDiff);
-
-  self.getTime = function() {
-    return self.date.getTime() - self.offsetDiff;
-  };
-
-  self.toLocaleDateString = function() {
-    return self.date.toLocaleDateString();
-  };
-
-  self.getFullYear = function() {
-    return self.date.getFullYear();
-  };
-
-  self.getMonth = function() {
-    return self.date.getMonth();
-  };
-
-  self.getDate = function() {
-    return self.date.getDate();
-  };
-
-  self.getHours = function() {
-    return self.date.getHours();
-  };
-
-  self.getMinutes = function() {
-    return self.date.getMinutes();
-  };
-
-  self.getSeconds = function() {
-    return self.date.getSeconds();
-  };
-
-  self.getMilliseconds = function() {
-    return self.date.getMilliseconds();
-  };
-
-  self.getTimezoneOffset = function() {
-    return offset * 60;
-  };
-
-  self.getUTCFullYear = function() {
-    return self.origDate.getUTCFullYear();
-  };
-
-  self.getUTCMonth = function() {
-    return self.origDate.getUTCMonth();
-  };
-
-  self.getUTCDate = function() {
-    return self.origDate.getUTCDate();
-  };
-
-  self.getUTCHours = function() {
-    return self.origDate.getUTCHours();
-  };
-
-  self.getUTCMinutes = function() {
-    return self.origDate.getUTCMinutes();
-  };
-
-  self.getUTCSeconds = function() {
-    return self.origDate.getUTCSeconds();
-  };
-
-  self.getUTCMilliseconds = function() {
-    return self.origDate.getUTCMilliseconds();
-  };
-
-  self.getDay = function() {
-    return self.date.getDay();
-  };
-
-  // provide this method only on browsers that already have it
-  if (self.toISOString) {
-    self.toISOString = function() {
-      return padNumber(self.origDate.getUTCFullYear(), 4) + '-' +
-            padNumber(self.origDate.getUTCMonth() + 1, 2) + '-' +
-            padNumber(self.origDate.getUTCDate(), 2) + 'T' +
-            padNumber(self.origDate.getUTCHours(), 2) + ':' +
-            padNumber(self.origDate.getUTCMinutes(), 2) + ':' +
-            padNumber(self.origDate.getUTCSeconds(), 2) + '.' +
-            padNumber(self.origDate.getUTCMilliseconds(), 3) + 'Z';
-    };
-  }
-
-  //hide all methods not implemented in this mock that the Date prototype exposes
-  var unimplementedMethods = ['getUTCDay',
-      'getYear', 'setDate', 'setFullYear', 'setHours', 'setMilliseconds',
-      'setMinutes', 'setMonth', 'setSeconds', 'setTime', 'setUTCDate', 'setUTCFullYear',
-      'setUTCHours', 'setUTCMilliseconds', 'setUTCMinutes', 'setUTCMonth', 'setUTCSeconds',
-      'setYear', 'toDateString', 'toGMTString', 'toJSON', 'toLocaleFormat', 'toLocaleString',
-      'toLocaleTimeString', 'toSource', 'toString', 'toTimeString', 'toUTCString', 'valueOf'];
-
-  angular.forEach(unimplementedMethods, function(methodName) {
-    self[methodName] = function() {
-      throw new Error("Method '" + methodName + "' is not implemented in the TzDate mock");
-    };
-  });
-
-  return self;
-};
+(function (window, angular, undefined) {
+
+	'use strict';
+
+	/**
+	 * @ngdoc overview
+	 * @name angular.mock
+	 * @description
+	 *
+	 * Namespace from 'angular-mocks.js' which contains testing related code.
+	 */
+	angular.mock = {};
+
+	/**
+	 * ! This is a private undocumented service !
+	 *
+	 * @name ngMock.$browser
+	 *
+	 * @description
+	 * This service is a mock implementation of {@link ng.$browser}. It provides fake
+	 * implementation for commonly used browser apis that are hard to test, e.g. setTimeout, xhr,
+	 * cookies, etc...
+	 *
+	 * The api of this service is the same as that of the real {@link ng.$browser $browser}, except
+	 * that there are several helper methods available which can be used in tests.
+	 */
+	angular.mock.$BrowserProvider = function () {
+		this.$get = function () {
+			return new angular.mock.$Browser();
+		};
+	};
+
+	angular.mock.$Browser = function () {
+		var self = this;
+
+		this.isMock = true;
+		self.$$url = "http://server/";
+		self.$$lastUrl = self.$$url; // used by url polling fn
+		self.pollFns = [];
+
+		// TODO(vojta): remove this temporary api
+		self.$$completeOutstandingRequest = angular.noop;
+		self.$$incOutstandingRequestCount = angular.noop;
+
+
+		// register url polling fn
+
+		self.onUrlChange = function (listener) {
+			self.pollFns.push(
+				function () {
+					if (self.$$lastUrl != self.$$url) {
+						self.$$lastUrl = self.$$url;
+						listener(self.$$url);
+					}
+				}
+			);
+
+			return listener;
+		};
+
+		self.cookieHash = {};
+		self.lastCookieHash = {};
+		self.deferredFns = [];
+		self.deferredNextId = 0;
+
+		self.defer = function (fn, delay) {
+			delay = delay || 0;
+			self.deferredFns.push({time: (self.defer.now + delay), fn: fn, id: self.deferredNextId});
+			self.deferredFns.sort(function (a, b) {
+				return a.time - b.time;
+			});
+			return self.deferredNextId++;
+		};
+
+
+		/**
+		 * @name ngMock.$browser#defer.now
+		 * @propertyOf ngMock.$browser
+		 *
+		 * @description
+		 * Current milliseconds mock time.
+		 */
+		self.defer.now = 0;
+
+
+		self.defer.cancel = function (deferId) {
+			var fnIndex;
+
+			angular.forEach(self.deferredFns, function (fn, index) {
+				if (fn.id === deferId) fnIndex = index;
+			});
+
+			if (fnIndex !== undefined) {
+				self.deferredFns.splice(fnIndex, 1);
+				return true;
+			}
+
+			return false;
+		};
+
+
+		/**
+		 * @name ngMock.$browser#defer.flush
+		 * @methodOf ngMock.$browser
+		 *
+		 * @description
+		 * Flushes all pending requests and executes the defer callbacks.
+		 *
+		 * @param {number=} number of milliseconds to flush. See {@link #defer.now}
+		 */
+		self.defer.flush = function (delay) {
+			if (angular.isDefined(delay)) {
+				self.defer.now += delay;
+			} else {
+				if (self.deferredFns.length) {
+					self.defer.now = self.deferredFns[self.deferredFns.length - 1].time;
+				} else {
+					throw new Error('No deferred tasks to be flushed');
+				}
+			}
+
+			while (self.deferredFns.length && self.deferredFns[0].time <= self.defer.now) {
+				self.deferredFns.shift().fn();
+			}
+		};
+
+		self.$$baseHref = '';
+		self.baseHref = function () {
+			return this.$$baseHref;
+		};
+	};
+	angular.mock.$Browser.prototype = {
+
+		/**
+		 * @name ngMock.$browser#poll
+		 * @methodOf ngMock.$browser
+		 *
+		 * @description
+		 * run all fns in pollFns
+		 */
+		poll: function poll() {
+			angular.forEach(this.pollFns, function (pollFn) {
+				pollFn();
+			});
+		},
+
+		addPollFn: function (pollFn) {
+			this.pollFns.push(pollFn);
+			return pollFn;
+		},
+
+		url: function (url, replace) {
+			if (url) {
+				this.$$url = url;
+				return this;
+			}
+
+			return this.$$url;
+		},
+
+		cookies: function (name, value) {
+			if (name) {
+				if (angular.isUndefined(value)) {
+					delete this.cookieHash[name];
+				} else {
+					if (angular.isString(value) &&       //strings only
+						value.length <= 4096) {          //strict cookie storage limits
+						this.cookieHash[name] = value;
+					}
+				}
+			} else {
+				if (!angular.equals(this.cookieHash, this.lastCookieHash)) {
+					this.lastCookieHash = angular.copy(this.cookieHash);
+					this.cookieHash = angular.copy(this.cookieHash);
+				}
+				return this.cookieHash;
+			}
+		},
+
+		notifyWhenNoOutstandingRequests: function (fn) {
+			fn();
+		}
+	};
+
+
+	/**
+	 * @ngdoc object
+	 * @name ngMock.$exceptionHandlerProvider
+	 *
+	 * @description
+	 * Configures the mock implementation of {@link ng.$exceptionHandler} to rethrow or to log errors
+	 * passed into the `$exceptionHandler`.
+	 */
+
+	/**
+	 * @ngdoc object
+	 * @name ngMock.$exceptionHandler
+	 *
+	 * @description
+	 * Mock implementation of {@link ng.$exceptionHandler} that rethrows or logs errors passed
+	 * into it. See {@link ngMock.$exceptionHandlerProvider $exceptionHandlerProvider} for configuration
+	 * information.
+	 *
+	 *
+	 * <pre>
+	 *   describe('$exceptionHandlerProvider', function() {
+	 *
+	 *     it('should capture log messages and exceptions', function() {
+	 *
+	 *       module(function($exceptionHandlerProvider) {
+	 *         $exceptionHandlerProvider.mode('log');
+	 *       });
+	 *
+	 *       inject(function($log, $exceptionHandler, $timeout) {
+	 *         $timeout(function() { $log.log(1); });
+	 *         $timeout(function() { $log.log(2); throw 'banana peel'; });
+	 *         $timeout(function() { $log.log(3); });
+	 *         expect($exceptionHandler.errors).toEqual([]);
+	 *         expect($log.assertEmpty());
+	 *         $timeout.flush();
+	 *         expect($exceptionHandler.errors).toEqual(['banana peel']);
+	 *         expect($log.log.logs).toEqual([[1], [2], [3]]);
+	 *       });
+	 *     });
+	 *   });
+	 * </pre>
+	 */
+
+	angular.mock.$ExceptionHandlerProvider = function () {
+		var handler;
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$exceptionHandlerProvider#mode
+		 * @methodOf ngMock.$exceptionHandlerProvider
+		 *
+		 * @description
+		 * Sets the logging mode.
+		 *
+		 * @param {string} mode Mode of operation, defaults to `rethrow`.
+		 *
+		 *   - `rethrow`: If any errors are passed into the handler in tests, it typically
+		 *                means that there is a bug in the application or test, so this mock will
+		 *                make these tests fail.
+		 *   - `log`: Sometimes it is desirable to test that an error is thrown, for this case the `log`
+		 *            mode stores an array of errors in `$exceptionHandler.errors`, to allow later
+		 *            assertion of them. See {@link ngMock.$log#assertEmpty assertEmpty()} and
+		 *            {@link ngMock.$log#reset reset()}
+		 */
+		this.mode = function (mode) {
+			switch (mode) {
+				case 'rethrow':
+					handler = function (e) {
+						throw e;
+					};
+					break;
+				case 'log':
+					var errors = [];
+
+					handler = function (e) {
+						if (arguments.length == 1) {
+							errors.push(e);
+						} else {
+							errors.push([].slice.call(arguments, 0));
+						}
+					};
+
+					handler.errors = errors;
+					break;
+				default:
+					throw new Error("Unknown mode '" + mode + "', only 'log'/'rethrow' modes are allowed!");
+			}
+		};
+
+		this.$get = function () {
+			return handler;
+		};
+
+		this.mode('rethrow');
+	};
+
+
+	/**
+	 * @ngdoc service
+	 * @name ngMock.$log
+	 *
+	 * @description
+	 * Mock implementation of {@link ng.$log} that gathers all logged messages in arrays
+	 * (one array per logging level). These arrays are exposed as `logs` property of each of the
+	 * level-specific log function, e.g. for level `error` the array is exposed as `$log.error.logs`.
+	 *
+	 */
+	angular.mock.$LogProvider = function () {
+		var debug = true;
+
+		function concat(array1, array2, index) {
+			return array1.concat(Array.prototype.slice.call(array2, index));
+		}
+
+		this.debugEnabled = function (flag) {
+			if (angular.isDefined(flag)) {
+				debug = flag;
+				return this;
+			} else {
+				return debug;
+			}
+		};
+
+		this.$get = function () {
+			var $log = {
+				log: function () {
+					$log.log.logs.push(concat([], arguments, 0));
+				},
+				warn: function () {
+					$log.warn.logs.push(concat([], arguments, 0));
+				},
+				info: function () {
+					$log.info.logs.push(concat([], arguments, 0));
+				},
+				error: function () {
+					$log.error.logs.push(concat([], arguments, 0));
+				},
+				debug: function () {
+					if (debug) {
+						$log.debug.logs.push(concat([], arguments, 0));
+					}
+				}
+			};
+
+			/**
+			 * @ngdoc method
+			 * @name ngMock.$log#reset
+			 * @methodOf ngMock.$log
+			 *
+			 * @description
+			 * Reset all of the logging arrays to empty.
+			 */
+			$log.reset = function () {
+				/**
+				 * @ngdoc property
+				 * @name ngMock.$log#log.logs
+				 * @propertyOf ngMock.$log
+				 *
+				 * @description
+				 * Array of messages logged using {@link ngMock.$log#log}.
+				 *
+				 * @example
+				 * <pre>
+				 * $log.log('Some Log');
+				 * var first = $log.log.logs.unshift();
+				 * </pre>
+				 */
+				$log.log.logs = [];
+				/**
+				 * @ngdoc property
+				 * @name ngMock.$log#info.logs
+				 * @propertyOf ngMock.$log
+				 *
+				 * @description
+				 * Array of messages logged using {@link ngMock.$log#info}.
+				 *
+				 * @example
+				 * <pre>
+				 * $log.info('Some Info');
+				 * var first = $log.info.logs.unshift();
+				 * </pre>
+				 */
+				$log.info.logs = [];
+				/**
+				 * @ngdoc property
+				 * @name ngMock.$log#warn.logs
+				 * @propertyOf ngMock.$log
+				 *
+				 * @description
+				 * Array of messages logged using {@link ngMock.$log#warn}.
+				 *
+				 * @example
+				 * <pre>
+				 * $log.warn('Some Warning');
+				 * var first = $log.warn.logs.unshift();
+				 * </pre>
+				 */
+				$log.warn.logs = [];
+				/**
+				 * @ngdoc property
+				 * @name ngMock.$log#error.logs
+				 * @propertyOf ngMock.$log
+				 *
+				 * @description
+				 * Array of messages logged using {@link ngMock.$log#error}.
+				 *
+				 * @example
+				 * <pre>
+				 * $log.error('Some Error');
+				 * var first = $log.error.logs.unshift();
+				 * </pre>
+				 */
+				$log.error.logs = [];
+				/**
+				 * @ngdoc property
+				 * @name ngMock.$log#debug.logs
+				 * @propertyOf ngMock.$log
+				 *
+				 * @description
+				 * Array of messages logged using {@link ngMock.$log#debug}.
+				 *
+				 * @example
+				 * <pre>
+				 * $log.debug('Some Error');
+				 * var first = $log.debug.logs.unshift();
+				 * </pre>
+				 */
+				$log.debug.logs = [];
+			};
+
+			/**
+			 * @ngdoc method
+			 * @name ngMock.$log#assertEmpty
+			 * @methodOf ngMock.$log
+			 *
+			 * @description
+			 * Assert that the all of the logging methods have no logged messages. If messages present, an
+			 * exception is thrown.
+			 */
+			$log.assertEmpty = function () {
+				var errors = [];
+				angular.forEach(['error', 'warn', 'info', 'log', 'debug'], function (logLevel) {
+					angular.forEach($log[logLevel].logs, function (log) {
+						angular.forEach(log, function (logItem) {
+							errors.push('MOCK $log (' + logLevel + '): ' + String(logItem) + '\n' +
+								(logItem.stack || ''));
+						});
+					});
+				});
+				if (errors.length) {
+					errors.unshift("Expected $log to be empty! Either a message was logged unexpectedly, or " +
+						"an expected log message was not checked and removed:");
+					errors.push('');
+					throw new Error(errors.join('\n---------\n'));
+				}
+			};
+
+			$log.reset();
+			return $log;
+		};
+	};
+
+
+	/**
+	 * @ngdoc service
+	 * @name ngMock.$interval
+	 *
+	 * @description
+	 * Mock implementation of the $interval service.
+	 *
+	 * Use {@link ngMock.$interval#methods_flush `$interval.flush(millis)`} to
+	 * move forward by `millis` milliseconds and trigger any functions scheduled to run in that
+	 * time.
+	 *
+	 * @param {function()} fn A function that should be called repeatedly.
+	 * @param {number} delay Number of milliseconds between each function call.
+	 * @param {number=} [count=0] Number of times to repeat. If not set, or 0, will repeat
+	 *   indefinitely.
+	 * @param {boolean=} [invokeApply=true] If set to `false` skips model dirty checking, otherwise
+	 *   will invoke `fn` within the {@link ng.$rootScope.Scope#methods_$apply $apply} block.
+	 * @returns {promise} A promise which will be notified on each iteration.
+	 */
+	angular.mock.$IntervalProvider = function () {
+		this.$get = ['$rootScope', '$q',
+			function ($rootScope, $q) {
+				var repeatFns = [],
+					nextRepeatId = 0,
+					now = 0;
+
+				var $interval = function (fn, delay, count, invokeApply) {
+					var deferred = $q.defer(),
+						promise = deferred.promise,
+						iteration = 0,
+						skipApply = (angular.isDefined(invokeApply) && !invokeApply);
+
+					count = (angular.isDefined(count)) ? count : 0,
+						promise.then(null, null, fn);
+
+					promise.$$intervalId = nextRepeatId;
+
+					function tick() {
+						deferred.notify(iteration++);
+
+						if (count > 0 && iteration >= count) {
+							var fnIndex;
+							deferred.resolve(iteration);
+
+							angular.forEach(repeatFns, function (fn, index) {
+								if (fn.id === promise.$$intervalId) fnIndex = index;
+							});
+
+							if (fnIndex !== undefined) {
+								repeatFns.splice(fnIndex, 1);
+							}
+						}
+
+						if (!skipApply) $rootScope.$apply();
+					}
+
+					repeatFns.push({
+						nextTime: (now + delay),
+						delay: delay,
+						fn: tick,
+						id: nextRepeatId,
+						deferred: deferred
+					});
+					repeatFns.sort(function (a, b) {
+						return a.nextTime - b.nextTime;
+					});
+
+					nextRepeatId++;
+					return promise;
+				};
+
+				$interval.cancel = function (promise) {
+					if (!promise) return false;
+					var fnIndex;
+
+					angular.forEach(repeatFns, function (fn, index) {
+						if (fn.id === promise.$$intervalId) fnIndex = index;
+					});
+
+					if (fnIndex !== undefined) {
+						repeatFns[fnIndex].deferred.reject('canceled');
+						repeatFns.splice(fnIndex, 1);
+						return true;
+					}
+
+					return false;
+				};
+
+				/**
+				 * @ngdoc method
+				 * @name ngMock.$interval#flush
+				 * @methodOf ngMock.$interval
+				 * @description
+				 *
+				 * Runs interval tasks scheduled to be run in the next `millis` milliseconds.
+				 *
+				 * @param {number=} millis maximum timeout amount to flush up until.
+				 *
+				 * @return {number} The amount of time moved forward.
+				 */
+				$interval.flush = function (millis) {
+					now += millis;
+					while (repeatFns.length && repeatFns[0].nextTime <= now) {
+						var task = repeatFns[0];
+						task.fn();
+						task.nextTime += task.delay;
+						repeatFns.sort(function (a, b) {
+							return a.nextTime - b.nextTime;
+						});
+					}
+					return millis;
+				};
+
+				return $interval;
+			}];
+	};
+
+
+	/* jshint -W101 */
+	/* The R_ISO8061_STR regex is never going to fit into the 100 char limit!
+	 * This directive should go inside the anonymous function but a bug in JSHint means that it would
+	 * not be enacted early enough to prevent the warning.
+	 */
+	var R_ISO8061_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?:\:?(\d\d)(?:\:?(\d\d)(?:\.(\d{3}))?)?)?(Z|([+-])(\d\d):?(\d\d)))?$/;
+
+	function jsonStringToDate(string) {
+		var match;
+		if (match = string.match(R_ISO8061_STR)) {
+			var date = new Date(0),
+				tzHour = 0,
+				tzMin = 0;
+			if (match[9]) {
+				tzHour = int(match[9] + match[10]);
+				tzMin = int(match[9] + match[11]);
+			}
+			date.setUTCFullYear(int(match[1]), int(match[2]) - 1, int(match[3]));
+			date.setUTCHours(int(match[4] || 0) - tzHour,
+				int(match[5] || 0) - tzMin,
+				int(match[6] || 0),
+				int(match[7] || 0));
+			return date;
+		}
+		return string;
+	}
+
+	function int(str) {
+		return parseInt(str, 10);
+	}
+
+	function padNumber(num, digits, trim) {
+		var neg = '';
+		if (num < 0) {
+			neg = '-';
+			num = -num;
+		}
+		num = '' + num;
+		while (num.length < digits) num = '0' + num;
+		if (trim)
+			num = num.substr(num.length - digits);
+		return neg + num;
+	}
+
+
+	/**
+	 * @ngdoc object
+	 * @name angular.mock.TzDate
+	 * @description
+	 *
+	 * *NOTE*: this is not an injectable instance, just a globally available mock class of `Date`.
+	 *
+	 * Mock of the Date type which has its timezone specified via constructor arg.
+	 *
+	 * The main purpose is to create Date-like instances with timezone fixed to the specified timezone
+	 * offset, so that we can test code that depends on local timezone settings without dependency on
+	 * the time zone settings of the machine where the code is running.
+	 *
+	 * @param {number} offset Offset of the *desired* timezone in hours (fractions will be honored)
+	 * @param {(number|string)} timestamp Timestamp representing the desired time in *UTC*
+	 *
+	 * @example
+	 * !!!! WARNING !!!!!
+	 * This is not a complete Date object so only methods that were implemented can be called safely.
+	 * To make matters worse, TzDate instances inherit stuff from Date via a prototype.
+	 *
+	 * We do our best to intercept calls to "unimplemented" methods, but since the list of methods is
+	 * incomplete we might be missing some non-standard methods. This can result in errors like:
+	 * "Date.prototype.foo called on incompatible Object".
+	 *
+	 * <pre>
+	 * var newYearInBratislava = new TzDate(-1, '2009-12-31T23:00:00Z');
+	 * newYearInBratislava.getTimezoneOffset() => -60;
+	 * newYearInBratislava.getFullYear() => 2010;
+	 * newYearInBratislava.getMonth() => 0;
+	 * newYearInBratislava.getDate() => 1;
+	 * newYearInBratislava.getHours() => 0;
+	 * newYearInBratislava.getMinutes() => 0;
+	 * newYearInBratislava.getSeconds() => 0;
+	 * </pre>
+	 *
+	 */
+	angular.mock.TzDate = function (offset, timestamp) {
+		var self = new Date(0);
+		if (angular.isString(timestamp)) {
+			var tsStr = timestamp;
+
+			self.origDate = jsonStringToDate(timestamp);
+
+			timestamp = self.origDate.getTime();
+			if (isNaN(timestamp))
+				throw {
+					name: "Illegal Argument",
+					message: "Arg '" + tsStr + "' passed into TzDate constructor is not a valid date string"
+				};
+		} else {
+			self.origDate = new Date(timestamp);
+		}
+
+		var localOffset = new Date(timestamp).getTimezoneOffset();
+		self.offsetDiff = localOffset * 60 * 1000 - offset * 1000 * 60 * 60;
+		self.date = new Date(timestamp + self.offsetDiff);
+
+		self.getTime = function () {
+			return self.date.getTime() - self.offsetDiff;
+		};
+
+		self.toLocaleDateString = function () {
+			return self.date.toLocaleDateString();
+		};
+
+		self.getFullYear = function () {
+			return self.date.getFullYear();
+		};
+
+		self.getMonth = function () {
+			return self.date.getMonth();
+		};
+
+		self.getDate = function () {
+			return self.date.getDate();
+		};
+
+		self.getHours = function () {
+			return self.date.getHours();
+		};
+
+		self.getMinutes = function () {
+			return self.date.getMinutes();
+		};
+
+		self.getSeconds = function () {
+			return self.date.getSeconds();
+		};
+
+		self.getMilliseconds = function () {
+			return self.date.getMilliseconds();
+		};
+
+		self.getTimezoneOffset = function () {
+			return offset * 60;
+		};
+
+		self.getUTCFullYear = function () {
+			return self.origDate.getUTCFullYear();
+		};
+
+		self.getUTCMonth = function () {
+			return self.origDate.getUTCMonth();
+		};
+
+		self.getUTCDate = function () {
+			return self.origDate.getUTCDate();
+		};
+
+		self.getUTCHours = function () {
+			return self.origDate.getUTCHours();
+		};
+
+		self.getUTCMinutes = function () {
+			return self.origDate.getUTCMinutes();
+		};
+
+		self.getUTCSeconds = function () {
+			return self.origDate.getUTCSeconds();
+		};
+
+		self.getUTCMilliseconds = function () {
+			return self.origDate.getUTCMilliseconds();
+		};
+
+		self.getDay = function () {
+			return self.date.getDay();
+		};
+
+		// provide this method only on browsers that already have it
+		if (self.toISOString) {
+			self.toISOString = function () {
+				return padNumber(self.origDate.getUTCFullYear(), 4) + '-' +
+					padNumber(self.origDate.getUTCMonth() + 1, 2) + '-' +
+					padNumber(self.origDate.getUTCDate(), 2) + 'T' +
+					padNumber(self.origDate.getUTCHours(), 2) + ':' +
+					padNumber(self.origDate.getUTCMinutes(), 2) + ':' +
+					padNumber(self.origDate.getUTCSeconds(), 2) + '.' +
+					padNumber(self.origDate.getUTCMilliseconds(), 3) + 'Z';
+			};
+		}
+
+		//hide all methods not implemented in this mock that the Date prototype exposes
+		var unimplementedMethods = ['getUTCDay',
+			'getYear', 'setDate', 'setFullYear', 'setHours', 'setMilliseconds',
+			'setMinutes', 'setMonth', 'setSeconds', 'setTime', 'setUTCDate', 'setUTCFullYear',
+			'setUTCHours', 'setUTCMilliseconds', 'setUTCMinutes', 'setUTCMonth', 'setUTCSeconds',
+			'setYear', 'toDateString', 'toGMTString', 'toJSON', 'toLocaleFormat', 'toLocaleString',
+			'toLocaleTimeString', 'toSource', 'toString', 'toTimeString', 'toUTCString', 'valueOf'];
+
+		angular.forEach(unimplementedMethods, function (methodName) {
+			self[methodName] = function () {
+				throw new Error("Method '" + methodName + "' is not implemented in the TzDate mock");
+			};
+		});
+
+		return self;
+	};
 
 //make "tzDateInstance instanceof Date" return true
-angular.mock.TzDate.prototype = Date.prototype;
-/* jshint +W101 */
-
-angular.mock.animate = angular.module('ngAnimateMock', ['ng'])
-
-  .config(['$provide', function($provide) {
-    var reflowQueue = [];
-
-    $provide.value('$$animateReflow', function(fn) {
-      reflowQueue.push(fn);
-      return angular.noop;
-    });
-
-    $provide.decorator('$animate', function($delegate) {
-      var animate = {
-        queue : [],
-        enabled : $delegate.enabled,
-        triggerReflow : function() {
-          if(reflowQueue.length === 0) {
-            throw new Error('No animation reflows present');
-          }
-          angular.forEach(reflowQueue, function(fn) {
-            fn();
-          });
-          reflowQueue = [];
-        }
-      };
-
-      angular.forEach(
-        ['enter','leave','move','addClass','removeClass','setClass'], function(method) {
-        animate[method] = function() {
-          animate.queue.push({
-            event : method,
-            element : arguments[0],
-            args : arguments
-          });
-          $delegate[method].apply($delegate, arguments);
-        };
-      });
-
-      return animate;
-    });
-
-  }]);
-
-
-/**
- * @ngdoc function
- * @name angular.mock.dump
- * @description
- *
- * *NOTE*: this is not an injectable instance, just a globally available function.
- *
- * Method for serializing util angular objects (scope, elements, etc..) into strings, useful for
- * debugging.
- *
- * This method is also available on window, where it can be used to display objects on debug
- * console.
- *
- * @param {*} object - any object to turn into string.
- * @return {string} a serialized string of the argument
- */
-angular.mock.dump = function(object) {
-  return serialize(object);
-
-  function serialize(object) {
-    var out;
-
-    if (angular.isElement(object)) {
-      object = angular.element(object);
-      out = angular.element('<div></div>');
-      angular.forEach(object, function(element) {
-        out.append(angular.element(element).clone());
-      });
-      out = out.html();
-    } else if (angular.isArray(object)) {
-      out = [];
-      angular.forEach(object, function(o) {
-        out.push(serialize(o));
-      });
-      out = '[ ' + out.join(', ') + ' ]';
-    } else if (angular.isObject(object)) {
-      if (angular.isFunction(object.$eval) && angular.isFunction(object.$apply)) {
-        out = serializeScope(object);
-      } else if (object instanceof Error) {
-        out = object.stack || ('' + object.name + ': ' + object.message);
-      } else {
-        // TODO(i): this prevents methods being logged,
-        // we should have a better way to serialize objects
-        out = angular.toJson(object, true);
-      }
-    } else {
-      out = String(object);
-    }
-
-    return out;
-  }
-
-  function serializeScope(scope, offset) {
-    offset = offset ||  '  ';
-    var log = [offset + 'Scope(' + scope.$id + '): {'];
-    for ( var key in scope ) {
-      if (Object.prototype.hasOwnProperty.call(scope, key) && !key.match(/^(\$|this)/)) {
-        log.push('  ' + key + ': ' + angular.toJson(scope[key]));
-      }
-    }
-    var child = scope.$$childHead;
-    while(child) {
-      log.push(serializeScope(child, offset + '  '));
-      child = child.$$nextSibling;
-    }
-    log.push('}');
-    return log.join('\n' + offset);
-  }
-};
-
-/**
- * @ngdoc object
- * @name ngMock.$httpBackend
- * @description
- * Fake HTTP backend implementation suitable for unit testing applications that use the
- * {@link ng.$http $http service}.
- *
- * *Note*: For fake HTTP backend implementation suitable for end-to-end testing or backend-less
- * development please see {@link ngMockE2E.$httpBackend e2e $httpBackend mock}.
- *
- * During unit testing, we want our unit tests to run quickly and have no external dependencies so
- * we don’t want to send {@link https://developer.mozilla.org/en/xmlhttprequest XHR} or
- * {@link http://en.wikipedia.org/wiki/JSONP JSONP} requests to a real server. All we really need is
- * to verify whether a certain request has been sent or not, or alternatively just let the
- * application make requests, respond with pre-trained responses and assert that the end result is
- * what we expect it to be.
- *
- * This mock implementation can be used to respond with static or dynamic responses via the
- * `expect` and `when` apis and their shortcuts (`expectGET`, `whenPOST`, etc).
- *
- * When an Angular application needs some data from a server, it calls the $http service, which
- * sends the request to a real server using $httpBackend service. With dependency injection, it is
- * easy to inject $httpBackend mock (which has the same API as $httpBackend) and use it to verify
- * the requests and respond with some testing data without sending a request to real server.
- *
- * There are two ways to specify what test data should be returned as http responses by the mock
- * backend when the code under test makes http requests:
- *
- * - `$httpBackend.expect` - specifies a request expectation
- * - `$httpBackend.when` - specifies a backend definition
- *
- *
- * # Request Expectations vs Backend Definitions
- *
- * Request expectations provide a way to make assertions about requests made by the application and
- * to define responses for those requests. The test will fail if the expected requests are not made
- * or they are made in the wrong order.
- *
- * Backend definitions allow you to define a fake backend for your application which doesn't assert
- * if a particular request was made or not, it just returns a trained response if a request is made.
- * The test will pass whether or not the request gets made during testing.
- *
- *
- * <table class="table">
- *   <tr><th width="220px"></th><th>Request expectations</th><th>Backend definitions</th></tr>
- *   <tr>
- *     <th>Syntax</th>
- *     <td>.expect(...).respond(...)</td>
- *     <td>.when(...).respond(...)</td>
- *   </tr>
- *   <tr>
- *     <th>Typical usage</th>
- *     <td>strict unit tests</td>
- *     <td>loose (black-box) unit testing</td>
- *   </tr>
- *   <tr>
- *     <th>Fulfills multiple requests</th>
- *     <td>NO</td>
- *     <td>YES</td>
- *   </tr>
- *   <tr>
- *     <th>Order of requests matters</th>
- *     <td>YES</td>
- *     <td>NO</td>
- *   </tr>
- *   <tr>
- *     <th>Request required</th>
- *     <td>YES</td>
- *     <td>NO</td>
- *   </tr>
- *   <tr>
- *     <th>Response required</th>
- *     <td>optional (see below)</td>
- *     <td>YES</td>
- *   </tr>
- * </table>
- *
- * In cases where both backend definitions and request expectations are specified during unit
- * testing, the request expectations are evaluated first.
- *
- * If a request expectation has no response specified, the algorithm will search your backend
- * definitions for an appropriate response.
- *
- * If a request didn't match any expectation or if the expectation doesn't have the response
- * defined, the backend definitions are evaluated in sequential order to see if any of them match
- * the request. The response from the first matched definition is returned.
- *
- *
- * # Flushing HTTP requests
- *
- * The $httpBackend used in production always responds to requests with responses asynchronously.
- * If we preserved this behavior in unit testing we'd have to create async unit tests, which are
- * hard to write, understand, and maintain. However, the testing mock can't respond
- * synchronously because that would change the execution of the code under test. For this reason the
- * mock $httpBackend has a `flush()` method, which allows the test to explicitly flush pending
- * requests and thus preserve the async api of the backend while allowing the test to execute
- * synchronously.
- *
- *
- * # Unit testing with mock $httpBackend
- * The following code shows how to setup and use the mock backend when unit testing a controller.
- * First we create the controller under test:
- *
-  <pre>
-  // The controller code
-  function MyController($scope, $http) {
+	angular.mock.TzDate.prototype = Date.prototype;
+	/* jshint +W101 */
+
+	angular.mock.animate = angular.module('ngAnimateMock', ['ng'])
+
+		.config(['$provide', function ($provide) {
+			var reflowQueue = [];
+
+			$provide.value('$$animateReflow', function (fn) {
+				reflowQueue.push(fn);
+				return angular.noop;
+			});
+
+			$provide.decorator('$animate', function ($delegate) {
+				var animate = {
+					queue: [],
+					enabled: $delegate.enabled,
+					triggerReflow: function () {
+						if (reflowQueue.length === 0) {
+							throw new Error('No animation reflows present');
+						}
+						angular.forEach(reflowQueue, function (fn) {
+							fn();
+						});
+						reflowQueue = [];
+					}
+				};
+
+				angular.forEach(
+					['enter', 'leave', 'move', 'addClass', 'removeClass', 'setClass'], function (method) {
+						animate[method] = function () {
+							animate.queue.push({
+								event: method,
+								element: arguments[0],
+								args: arguments
+							});
+							$delegate[method].apply($delegate, arguments);
+						};
+					});
+
+				return animate;
+			});
+
+		}]);
+
+
+	/**
+	 * @ngdoc function
+	 * @name angular.mock.dump
+	 * @description
+	 *
+	 * *NOTE*: this is not an injectable instance, just a globally available function.
+	 *
+	 * Method for serializing util angular objects (scope, elements, etc..) into strings, useful for
+	 * debugging.
+	 *
+	 * This method is also available on window, where it can be used to display objects on debug
+	 * console.
+	 *
+	 * @param {*} object - any object to turn into string.
+	 * @return {string} a serialized string of the argument
+	 */
+	angular.mock.dump = function (object) {
+		return serialize(object);
+
+		function serialize(object) {
+			var out;
+
+			if (angular.isElement(object)) {
+				object = angular.element(object);
+				out = angular.element('<div></div>');
+				angular.forEach(object, function (element) {
+					out.append(angular.element(element).clone());
+				});
+				out = out.html();
+			} else if (angular.isArray(object)) {
+				out = [];
+				angular.forEach(object, function (o) {
+					out.push(serialize(o));
+				});
+				out = '[ ' + out.join(', ') + ' ]';
+			} else if (angular.isObject(object)) {
+				if (angular.isFunction(object.$eval) && angular.isFunction(object.$apply)) {
+					out = serializeScope(object);
+				} else if (object instanceof Error) {
+					out = object.stack || ('' + object.name + ': ' + object.message);
+				} else {
+					// TODO(i): this prevents methods being logged,
+					// we should have a better way to serialize objects
+					out = angular.toJson(object, true);
+				}
+			} else {
+				out = String(object);
+			}
+
+			return out;
+		}
+
+		function serializeScope(scope, offset) {
+			offset = offset || '  ';
+			var log = [offset + 'Scope(' + scope.$id + '): {'];
+			for (var key in scope) {
+				if (Object.prototype.hasOwnProperty.call(scope, key) && !key.match(/^(\$|this)/)) {
+					log.push('  ' + key + ': ' + angular.toJson(scope[key]));
+				}
+			}
+			var child = scope.$$childHead;
+			while (child) {
+				log.push(serializeScope(child, offset + '  '));
+				child = child.$$nextSibling;
+			}
+			log.push('}');
+			return log.join('\n' + offset);
+		}
+	};
+
+	/**
+	 * @ngdoc object
+	 * @name ngMock.$httpBackend
+	 * @description
+	 * Fake HTTP backend implementation suitable for unit testing applications that use the
+	 * {@link ng.$http $http service}.
+	 *
+	 * *Note*: For fake HTTP backend implementation suitable for end-to-end testing or backend-less
+	 * development please see {@link ngMockE2E.$httpBackend e2e $httpBackend mock}.
+	 *
+	 * During unit testing, we want our unit tests to run quickly and have no external dependencies so
+	 * we don’t want to send {@link https://developer.mozilla.org/en/xmlhttprequest XHR} or
+	 * {@link http://en.wikipedia.org/wiki/JSONP JSONP} requests to a real server. All we really need is
+	 * to verify whether a certain request has been sent or not, or alternatively just let the
+	 * application make requests, respond with pre-trained responses and assert that the end result is
+	 * what we expect it to be.
+	 *
+	 * This mock implementation can be used to respond with static or dynamic responses via the
+	 * `expect` and `when` apis and their shortcuts (`expectGET`, `whenPOST`, etc).
+	 *
+	 * When an Angular application needs some data from a server, it calls the $http service, which
+	 * sends the request to a real server using $httpBackend service. With dependency injection, it is
+	 * easy to inject $httpBackend mock (which has the same API as $httpBackend) and use it to verify
+	 * the requests and respond with some testing data without sending a request to real server.
+	 *
+	 * There are two ways to specify what test data should be returned as http responses by the mock
+	 * backend when the code under test makes http requests:
+	 *
+	 * - `$httpBackend.expect` - specifies a request expectation
+	 * - `$httpBackend.when` - specifies a backend definition
+	 *
+	 *
+	 * # Request Expectations vs Backend Definitions
+	 *
+	 * Request expectations provide a way to make assertions about requests made by the application and
+	 * to define responses for those requests. The test will fail if the expected requests are not made
+	 * or they are made in the wrong order.
+	 *
+	 * Backend definitions allow you to define a fake backend for your application which doesn't assert
+	 * if a particular request was made or not, it just returns a trained response if a request is made.
+	 * The test will pass whether or not the request gets made during testing.
+	 *
+	 *
+	 * <table class="table">
+	 *   <tr><th width="220px"></th><th>Request expectations</th><th>Backend definitions</th></tr>
+	 *   <tr>
+	 *     <th>Syntax</th>
+	 *     <td>.expect(...).respond(...)</td>
+	 *     <td>.when(...).respond(...)</td>
+	 *   </tr>
+	 *   <tr>
+	 *     <th>Typical usage</th>
+	 *     <td>strict unit tests</td>
+	 *     <td>loose (black-box) unit testing</td>
+	 *   </tr>
+	 *   <tr>
+	 *     <th>Fulfills multiple requests</th>
+	 *     <td>NO</td>
+	 *     <td>YES</td>
+	 *   </tr>
+	 *   <tr>
+	 *     <th>Order of requests matters</th>
+	 *     <td>YES</td>
+	 *     <td>NO</td>
+	 *   </tr>
+	 *   <tr>
+	 *     <th>Request required</th>
+	 *     <td>YES</td>
+	 *     <td>NO</td>
+	 *   </tr>
+	 *   <tr>
+	 *     <th>Response required</th>
+	 *     <td>optional (see below)</td>
+	 *     <td>YES</td>
+	 *   </tr>
+	 * </table>
+	 *
+	 * In cases where both backend definitions and request expectations are specified during unit
+	 * testing, the request expectations are evaluated first.
+	 *
+	 * If a request expectation has no response specified, the algorithm will search your backend
+	 * definitions for an appropriate response.
+	 *
+	 * If a request didn't match any expectation or if the expectation doesn't have the response
+	 * defined, the backend definitions are evaluated in sequential order to see if any of them match
+	 * the request. The response from the first matched definition is returned.
+	 *
+	 *
+	 * # Flushing HTTP requests
+	 *
+	 * The $httpBackend used in production always responds to requests with responses asynchronously.
+	 * If we preserved this behavior in unit testing we'd have to create async unit tests, which are
+	 * hard to write, understand, and maintain. However, the testing mock can't respond
+	 * synchronously because that would change the execution of the code under test. For this reason the
+	 * mock $httpBackend has a `flush()` method, which allows the test to explicitly flush pending
+	 * requests and thus preserve the async api of the backend while allowing the test to execute
+	 * synchronously.
+	 *
+	 *
+	 * # Unit testing with mock $httpBackend
+	 * The following code shows how to setup and use the mock backend when unit testing a controller.
+	 * First we create the controller under test:
+	 *
+     <pre>
+     // The controller code
+     function MyController($scope, $http) {
     var authToken;
 
     $http.get('/auth.py').success(function(data, status, headers) {
@@ -1001,13 +1015,13 @@ angular.mock.dump = function(object) {
       });
     };
   }
-  </pre>
- *
- * Now we setup the mock backend and create the test specs:
- *
-  <pre>
-    // testing controller
-    describe('MyController', function() {
+     </pre>
+	 *
+	 * Now we setup the mock backend and create the test specs:
+	 *
+     <pre>
+     // testing controller
+     describe('MyController', function() {
        var $httpBackend, $rootScope, createController;
 
        beforeEach(inject(function($injector) {
@@ -1071,1066 +1085,1068 @@ angular.mock.dump = function(object) {
          $httpBackend.flush();
        });
     });
-   </pre>
- */
-angular.mock.$HttpBackendProvider = function() {
-  this.$get = ['$rootScope', createHttpBackendMock];
-};
-
-/**
- * General factory function for $httpBackend mock.
- * Returns instance for unit testing (when no arguments specified):
- *   - passing through is disabled
- *   - auto flushing is disabled
- *
- * Returns instance for e2e testing (when `$delegate` and `$browser` specified):
- *   - passing through (delegating request to real backend) is enabled
- *   - auto flushing is enabled
- *
- * @param {Object=} $delegate Real $httpBackend instance (allow passing through if specified)
- * @param {Object=} $browser Auto-flushing enabled if specified
- * @return {Object} Instance of $httpBackend mock
- */
-function createHttpBackendMock($rootScope, $delegate, $browser) {
-  var definitions = [],
-      expectations = [],
-      responses = [],
-      responsesPush = angular.bind(responses, responses.push),
-      copy = angular.copy;
-
-  function createResponse(status, data, headers) {
-    if (angular.isFunction(status)) return status;
-
-    return function() {
-      return angular.isNumber(status)
-          ? [status, data, headers]
-          : [200, status, data];
-    };
-  }
-
-  // TODO(vojta): change params to: method, url, data, headers, callback
-  function $httpBackend(method, url, data, callback, headers, timeout, withCredentials) {
-    var xhr = new MockXhr(),
-        expectation = expectations[0],
-        wasExpected = false;
-
-    function prettyPrint(data) {
-      return (angular.isString(data) || angular.isFunction(data) || data instanceof RegExp)
-          ? data
-          : angular.toJson(data);
-    }
-
-    function wrapResponse(wrapped) {
-      if (!$browser && timeout && timeout.then) timeout.then(handleTimeout);
-
-      return handleResponse;
-
-      function handleResponse() {
-        var response = wrapped.response(method, url, data, headers);
-        xhr.$$respHeaders = response[2];
-        callback(copy(response[0]), copy(response[1]), xhr.getAllResponseHeaders());
-      }
-
-      function handleTimeout() {
-        for (var i = 0, ii = responses.length; i < ii; i++) {
-          if (responses[i] === handleResponse) {
-            responses.splice(i, 1);
-            callback(-1, undefined, '');
-            break;
-          }
-        }
-      }
-    }
-
-    if (expectation && expectation.match(method, url)) {
-      if (!expectation.matchData(data))
-        throw new Error('Expected ' + expectation + ' with different data\n' +
-            'EXPECTED: ' + prettyPrint(expectation.data) + '\nGOT:      ' + data);
-
-      if (!expectation.matchHeaders(headers))
-        throw new Error('Expected ' + expectation + ' with different headers\n' +
-                        'EXPECTED: ' + prettyPrint(expectation.headers) + '\nGOT:      ' +
-                        prettyPrint(headers));
-
-      expectations.shift();
-
-      if (expectation.response) {
-        responses.push(wrapResponse(expectation));
-        return;
-      }
-      wasExpected = true;
-    }
-
-    var i = -1, definition;
-    while ((definition = definitions[++i])) {
-      if (definition.match(method, url, data, headers || {})) {
-        if (definition.response) {
-          // if $browser specified, we do auto flush all requests
-          ($browser ? $browser.defer : responsesPush)(wrapResponse(definition));
-        } else if (definition.passThrough) {
-          $delegate(method, url, data, callback, headers, timeout, withCredentials);
-        } else throw new Error('No response defined !');
-        return;
-      }
-    }
-    throw wasExpected ?
-        new Error('No response defined !') :
-        new Error('Unexpected request: ' + method + ' ' + url + '\n' +
-                  (expectation ? 'Expected ' + expectation : 'No more request expected'));
-  }
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$httpBackend#when
-   * @methodOf ngMock.$httpBackend
-   * @description
-   * Creates a new backend definition.
-   *
-   * @param {string} method HTTP method.
-   * @param {string|RegExp} url HTTP url.
-   * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives
-   *   data string and returns true if the data is as expected.
-   * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header
-   *   object and returns true if the headers match the current definition.
-   * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
-   *   request is handled.
-   *
-   *  - respond –
-   *      `{function([status,] data[, headers])|function(function(method, url, data, headers)}`
-   *    – The respond method takes a set of static data to be returned or a function that can return
-   *    an array containing response status (number), response data (string) and response headers
-   *    (Object).
-   */
-  $httpBackend.when = function(method, url, data, headers) {
-    var definition = new MockHttpExpectation(method, url, data, headers),
-        chain = {
-          respond: function(status, data, headers) {
-            definition.response = createResponse(status, data, headers);
-          }
-        };
-
-    if ($browser) {
-      chain.passThrough = function() {
-        definition.passThrough = true;
-      };
-    }
-
-    definitions.push(definition);
-    return chain;
-  };
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$httpBackend#whenGET
-   * @methodOf ngMock.$httpBackend
-   * @description
-   * Creates a new backend definition for GET requests. For more info see `when()`.
-   *
-   * @param {string|RegExp} url HTTP url.
-   * @param {(Object|function(Object))=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-   * request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$httpBackend#whenHEAD
-   * @methodOf ngMock.$httpBackend
-   * @description
-   * Creates a new backend definition for HEAD requests. For more info see `when()`.
-   *
-   * @param {string|RegExp} url HTTP url.
-   * @param {(Object|function(Object))=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-   * request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$httpBackend#whenDELETE
-   * @methodOf ngMock.$httpBackend
-   * @description
-   * Creates a new backend definition for DELETE requests. For more info see `when()`.
-   *
-   * @param {string|RegExp} url HTTP url.
-   * @param {(Object|function(Object))=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-   * request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$httpBackend#whenPOST
-   * @methodOf ngMock.$httpBackend
-   * @description
-   * Creates a new backend definition for POST requests. For more info see `when()`.
-   *
-   * @param {string|RegExp} url HTTP url.
-   * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives
-   *   data string and returns true if the data is as expected.
-   * @param {(Object|function(Object))=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-   * request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$httpBackend#whenPUT
-   * @methodOf ngMock.$httpBackend
-   * @description
-   * Creates a new backend definition for PUT requests.  For more info see `when()`.
-   *
-   * @param {string|RegExp} url HTTP url.
-   * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives
-   *   data string and returns true if the data is as expected.
-   * @param {(Object|function(Object))=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-   * request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$httpBackend#whenJSONP
-   * @methodOf ngMock.$httpBackend
-   * @description
-   * Creates a new backend definition for JSONP requests. For more info see `when()`.
-   *
-   * @param {string|RegExp} url HTTP url.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-   * request is handled.
-   */
-  createShortMethods('when');
-
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$httpBackend#expect
-   * @methodOf ngMock.$httpBackend
-   * @description
-   * Creates a new request expectation.
-   *
-   * @param {string} method HTTP method.
-   * @param {string|RegExp} url HTTP url.
-   * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that
-   *  receives data string and returns true if the data is as expected, or Object if request body
-   *  is in JSON format.
-   * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header
-   *   object and returns true if the headers match the current expectation.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-   *  request is handled.
-   *
-   *  - respond –
-   *    `{function([status,] data[, headers])|function(function(method, url, data, headers)}`
-   *    – The respond method takes a set of static data to be returned or a function that can return
-   *    an array containing response status (number), response data (string) and response headers
-   *    (Object).
-   */
-  $httpBackend.expect = function(method, url, data, headers) {
-    var expectation = new MockHttpExpectation(method, url, data, headers);
-    expectations.push(expectation);
-    return {
-      respond: function(status, data, headers) {
-        expectation.response = createResponse(status, data, headers);
-      }
-    };
-  };
-
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$httpBackend#expectGET
-   * @methodOf ngMock.$httpBackend
-   * @description
-   * Creates a new request expectation for GET requests. For more info see `expect()`.
-   *
-   * @param {string|RegExp} url HTTP url.
-   * @param {Object=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-   * request is handled. See #expect for more info.
-   */
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$httpBackend#expectHEAD
-   * @methodOf ngMock.$httpBackend
-   * @description
-   * Creates a new request expectation for HEAD requests. For more info see `expect()`.
-   *
-   * @param {string|RegExp} url HTTP url.
-   * @param {Object=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-   *   request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$httpBackend#expectDELETE
-   * @methodOf ngMock.$httpBackend
-   * @description
-   * Creates a new request expectation for DELETE requests. For more info see `expect()`.
-   *
-   * @param {string|RegExp} url HTTP url.
-   * @param {Object=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-   *   request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$httpBackend#expectPOST
-   * @methodOf ngMock.$httpBackend
-   * @description
-   * Creates a new request expectation for POST requests. For more info see `expect()`.
-   *
-   * @param {string|RegExp} url HTTP url.
-   * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that
-   *  receives data string and returns true if the data is as expected, or Object if request body
-   *  is in JSON format.
-   * @param {Object=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-   *   request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$httpBackend#expectPUT
-   * @methodOf ngMock.$httpBackend
-   * @description
-   * Creates a new request expectation for PUT requests. For more info see `expect()`.
-   *
-   * @param {string|RegExp} url HTTP url.
-   * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that
-   *  receives data string and returns true if the data is as expected, or Object if request body
-   *  is in JSON format.
-   * @param {Object=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-   *   request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$httpBackend#expectPATCH
-   * @methodOf ngMock.$httpBackend
-   * @description
-   * Creates a new request expectation for PATCH requests. For more info see `expect()`.
-   *
-   * @param {string|RegExp} url HTTP url.
-   * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that
-   *  receives data string and returns true if the data is as expected, or Object if request body
-   *  is in JSON format.
-   * @param {Object=} headers HTTP headers.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-   *   request is handled.
-   */
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$httpBackend#expectJSONP
-   * @methodOf ngMock.$httpBackend
-   * @description
-   * Creates a new request expectation for JSONP requests. For more info see `expect()`.
-   *
-   * @param {string|RegExp} url HTTP url.
-   * @returns {requestHandler} Returns an object with `respond` method that control how a matched
-   *   request is handled.
-   */
-  createShortMethods('expect');
-
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$httpBackend#flush
-   * @methodOf ngMock.$httpBackend
-   * @description
-   * Flushes all pending requests using the trained responses.
-   *
-   * @param {number=} count Number of responses to flush (in the order they arrived). If undefined,
-   *   all pending requests will be flushed. If there are no pending requests when the flush method
-   *   is called an exception is thrown (as this typically a sign of programming error).
-   */
-  $httpBackend.flush = function(count) {
-    $rootScope.$digest();
-    if (!responses.length) throw new Error('No pending request to flush !');
-
-    if (angular.isDefined(count)) {
-      while (count--) {
-        if (!responses.length) throw new Error('No more pending request to flush !');
-        responses.shift()();
-      }
-    } else {
-      while (responses.length) {
-        responses.shift()();
-      }
-    }
-    $httpBackend.verifyNoOutstandingExpectation();
-  };
-
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$httpBackend#verifyNoOutstandingExpectation
-   * @methodOf ngMock.$httpBackend
-   * @description
-   * Verifies that all of the requests defined via the `expect` api were made. If any of the
-   * requests were not made, verifyNoOutstandingExpectation throws an exception.
-   *
-   * Typically, you would call this method following each test case that asserts requests using an
-   * "afterEach" clause.
-   *
-   * <pre>
-   *   afterEach($httpBackend.verifyNoOutstandingExpectation);
-   * </pre>
-   */
-  $httpBackend.verifyNoOutstandingExpectation = function() {
-    $rootScope.$digest();
-    if (expectations.length) {
-      throw new Error('Unsatisfied requests: ' + expectations.join(', '));
-    }
-  };
-
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$httpBackend#verifyNoOutstandingRequest
-   * @methodOf ngMock.$httpBackend
-   * @description
-   * Verifies that there are no outstanding requests that need to be flushed.
-   *
-   * Typically, you would call this method following each test case that asserts requests using an
-   * "afterEach" clause.
-   *
-   * <pre>
-   *   afterEach($httpBackend.verifyNoOutstandingRequest);
-   * </pre>
-   */
-  $httpBackend.verifyNoOutstandingRequest = function() {
-    if (responses.length) {
-      throw new Error('Unflushed requests: ' + responses.length);
-    }
-  };
-
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$httpBackend#resetExpectations
-   * @methodOf ngMock.$httpBackend
-   * @description
-   * Resets all request expectations, but preserves all backend definitions. Typically, you would
-   * call resetExpectations during a multiple-phase test when you want to reuse the same instance of
-   * $httpBackend mock.
-   */
-  $httpBackend.resetExpectations = function() {
-    expectations.length = 0;
-    responses.length = 0;
-  };
-
-  return $httpBackend;
-
-
-  function createShortMethods(prefix) {
-    angular.forEach(['GET', 'DELETE', 'JSONP'], function(method) {
-     $httpBackend[prefix + method] = function(url, headers) {
-       return $httpBackend[prefix](method, url, undefined, headers);
-     };
-    });
-
-    angular.forEach(['PUT', 'POST', 'PATCH'], function(method) {
-      $httpBackend[prefix + method] = function(url, data, headers) {
-        return $httpBackend[prefix](method, url, data, headers);
-      };
-    });
-  }
-}
-
-function MockHttpExpectation(method, url, data, headers) {
-
-  this.data = data;
-  this.headers = headers;
-
-  this.match = function(m, u, d, h) {
-    if (method != m) return false;
-    if (!this.matchUrl(u)) return false;
-    if (angular.isDefined(d) && !this.matchData(d)) return false;
-    if (angular.isDefined(h) && !this.matchHeaders(h)) return false;
-    return true;
-  };
-
-  this.matchUrl = function(u) {
-    if (!url) return true;
-    if (angular.isFunction(url.test)) return url.test(u);
-    return url == u;
-  };
-
-  this.matchHeaders = function(h) {
-    if (angular.isUndefined(headers)) return true;
-    if (angular.isFunction(headers)) return headers(h);
-    return angular.equals(headers, h);
-  };
-
-  this.matchData = function(d) {
-    if (angular.isUndefined(data)) return true;
-    if (data && angular.isFunction(data.test)) return data.test(d);
-    if (data && angular.isFunction(data)) return data(d);
-    if (data && !angular.isString(data)) return angular.equals(data, angular.fromJson(d));
-    return data == d;
-  };
-
-  this.toString = function() {
-    return method + ' ' + url;
-  };
-}
-
-function createMockXhr() {
-  return new MockXhr();
-}
-
-function MockXhr() {
-
-  // hack for testing $http, $httpBackend
-  MockXhr.$$lastInstance = this;
-
-  this.open = function(method, url, async) {
-    this.$$method = method;
-    this.$$url = url;
-    this.$$async = async;
-    this.$$reqHeaders = {};
-    this.$$respHeaders = {};
-  };
-
-  this.send = function(data) {
-    this.$$data = data;
-  };
-
-  this.setRequestHeader = function(key, value) {
-    this.$$reqHeaders[key] = value;
-  };
-
-  this.getResponseHeader = function(name) {
-    // the lookup must be case insensitive,
-    // that's why we try two quick lookups first and full scan last
-    var header = this.$$respHeaders[name];
-    if (header) return header;
-
-    name = angular.lowercase(name);
-    header = this.$$respHeaders[name];
-    if (header) return header;
-
-    header = undefined;
-    angular.forEach(this.$$respHeaders, function(headerVal, headerName) {
-      if (!header && angular.lowercase(headerName) == name) header = headerVal;
-    });
-    return header;
-  };
-
-  this.getAllResponseHeaders = function() {
-    var lines = [];
-
-    angular.forEach(this.$$respHeaders, function(value, key) {
-      lines.push(key + ': ' + value);
-    });
-    return lines.join('\n');
-  };
-
-  this.abort = angular.noop;
-}
-
-
-/**
- * @ngdoc function
- * @name ngMock.$timeout
- * @description
- *
- * This service is just a simple decorator for {@link ng.$timeout $timeout} service
- * that adds a "flush" and "verifyNoPendingTasks" methods.
- */
-
-angular.mock.$TimeoutDecorator = function($delegate, $browser) {
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$timeout#flush
-   * @methodOf ngMock.$timeout
-   * @description
-   *
-   * Flushes the queue of pending tasks.
-   *
-   * @param {number=} delay maximum timeout amount to flush up until
-   */
-  $delegate.flush = function(delay) {
-    $browser.defer.flush(delay);
-  };
-
-  /**
-   * @ngdoc method
-   * @name ngMock.$timeout#verifyNoPendingTasks
-   * @methodOf ngMock.$timeout
-   * @description
-   *
-   * Verifies that there are no pending tasks that need to be flushed.
-   */
-  $delegate.verifyNoPendingTasks = function() {
-    if ($browser.deferredFns.length) {
-      throw new Error('Deferred tasks to flush (' + $browser.deferredFns.length + '): ' +
-          formatPendingTasksAsString($browser.deferredFns));
-    }
-  };
-
-  function formatPendingTasksAsString(tasks) {
-    var result = [];
-    angular.forEach(tasks, function(task) {
-      result.push('{id: ' + task.id + ', ' + 'time: ' + task.time + '}');
-    });
-
-    return result.join(', ');
-  }
-
-  return $delegate;
-};
-
-/**
- *
- */
-angular.mock.$RootElementProvider = function() {
-  this.$get = function() {
-    return angular.element('<div ng-app></div>');
-  };
-};
-
-/**
- * @ngdoc overview
- * @name ngMock
- * @description
- *
- * # ngMock
- *
- * The `ngMock` module providers support to inject and mock Angular services into unit tests.
- * In addition, ngMock also extends various core ng services such that they can be
- * inspected and controlled in a synchronous manner within test code.
- *
- * {@installModule mock}
- *
- * <div doc-module-components="ngMock"></div>
- *
- */
-angular.module('ngMock', ['ng']).provider({
-  $browser: angular.mock.$BrowserProvider,
-  $exceptionHandler: angular.mock.$ExceptionHandlerProvider,
-  $log: angular.mock.$LogProvider,
-  $interval: angular.mock.$IntervalProvider,
-  $httpBackend: angular.mock.$HttpBackendProvider,
-  $rootElement: angular.mock.$RootElementProvider
-}).config(['$provide', function($provide) {
-  $provide.decorator('$timeout', angular.mock.$TimeoutDecorator);
-}]);
-
-/**
- * @ngdoc overview
- * @name ngMockE2E
- * @description
- *
- * The `ngMockE2E` is an angular module which contains mocks suitable for end-to-end testing.
- * Currently there is only one mock present in this module -
- * the {@link ngMockE2E.$httpBackend e2e $httpBackend} mock.
- */
-angular.module('ngMockE2E', ['ng']).config(['$provide', function($provide) {
-  $provide.decorator('$httpBackend', angular.mock.e2e.$httpBackendDecorator);
-}]);
-
-/**
- * @ngdoc object
- * @name ngMockE2E.$httpBackend
- * @description
- * Fake HTTP backend implementation suitable for end-to-end testing or backend-less development of
- * applications that use the {@link ng.$http $http service}.
- *
- * *Note*: For fake http backend implementation suitable for unit testing please see
- * {@link ngMock.$httpBackend unit-testing $httpBackend mock}.
- *
- * This implementation can be used to respond with static or dynamic responses via the `when` api
- * and its shortcuts (`whenGET`, `whenPOST`, etc) and optionally pass through requests to the
- * real $httpBackend for specific requests (e.g. to interact with certain remote apis or to fetch
- * templates from a webserver).
- *
- * As opposed to unit-testing, in an end-to-end testing scenario or in scenario when an application
- * is being developed with the real backend api replaced with a mock, it is often desirable for
- * certain category of requests to bypass the mock and issue a real http request (e.g. to fetch
- * templates or static files from the webserver). To configure the backend with this behavior
- * use the `passThrough` request handler of `when` instead of `respond`.
- *
- * Additionally, we don't want to manually have to flush mocked out requests like we do during unit
- * testing. For this reason the e2e $httpBackend automatically flushes mocked out requests
- * automatically, closely simulating the behavior of the XMLHttpRequest object.
- *
- * To setup the application to run with this http backend, you have to create a module that depends
- * on the `ngMockE2E` and your application modules and defines the fake backend:
- *
- * <pre>
- *   myAppDev = angular.module('myAppDev', ['myApp', 'ngMockE2E']);
- *   myAppDev.run(function($httpBackend) {
- *     phones = [{name: 'phone1'}, {name: 'phone2'}];
- *
- *     // returns the current list of phones
- *     $httpBackend.whenGET('/phones').respond(phones);
- *
- *     // adds a new phone to the phones array
- *     $httpBackend.whenPOST('/phones').respond(function(method, url, data) {
- *       phones.push(angular.fromJson(data));
- *     });
- *     $httpBackend.whenGET(/^\/templates\//).passThrough();
- *     //...
- *   });
- * </pre>
- *
- * Afterwards, bootstrap your app with this new module.
- */
-
-/**
- * @ngdoc method
- * @name ngMockE2E.$httpBackend#when
- * @methodOf ngMockE2E.$httpBackend
- * @description
- * Creates a new backend definition.
- *
- * @param {string} method HTTP method.
- * @param {string|RegExp} url HTTP url.
- * @param {(string|RegExp)=} data HTTP request body.
- * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header
- *   object and returns true if the headers match the current definition.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled.
- *
- *  - respond –
- *    `{function([status,] data[, headers])|function(function(method, url, data, headers)}`
- *    – The respond method takes a set of static data to be returned or a function that can return
- *    an array containing response status (number), response data (string) and response headers
- *    (Object).
- *  - passThrough – `{function()}` – Any request matching a backend definition with `passThrough`
- *    handler, will be pass through to the real backend (an XHR request will be made to the
- *    server.
- */
-
-/**
- * @ngdoc method
- * @name ngMockE2E.$httpBackend#whenGET
- * @methodOf ngMockE2E.$httpBackend
- * @description
- * Creates a new backend definition for GET requests. For more info see `when()`.
- *
- * @param {string|RegExp} url HTTP url.
- * @param {(Object|function(Object))=} headers HTTP headers.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled.
- */
-
-/**
- * @ngdoc method
- * @name ngMockE2E.$httpBackend#whenHEAD
- * @methodOf ngMockE2E.$httpBackend
- * @description
- * Creates a new backend definition for HEAD requests. For more info see `when()`.
- *
- * @param {string|RegExp} url HTTP url.
- * @param {(Object|function(Object))=} headers HTTP headers.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled.
- */
-
-/**
- * @ngdoc method
- * @name ngMockE2E.$httpBackend#whenDELETE
- * @methodOf ngMockE2E.$httpBackend
- * @description
- * Creates a new backend definition for DELETE requests. For more info see `when()`.
- *
- * @param {string|RegExp} url HTTP url.
- * @param {(Object|function(Object))=} headers HTTP headers.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled.
- */
-
-/**
- * @ngdoc method
- * @name ngMockE2E.$httpBackend#whenPOST
- * @methodOf ngMockE2E.$httpBackend
- * @description
- * Creates a new backend definition for POST requests. For more info see `when()`.
- *
- * @param {string|RegExp} url HTTP url.
- * @param {(string|RegExp)=} data HTTP request body.
- * @param {(Object|function(Object))=} headers HTTP headers.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled.
- */
-
-/**
- * @ngdoc method
- * @name ngMockE2E.$httpBackend#whenPUT
- * @methodOf ngMockE2E.$httpBackend
- * @description
- * Creates a new backend definition for PUT requests.  For more info see `when()`.
- *
- * @param {string|RegExp} url HTTP url.
- * @param {(string|RegExp)=} data HTTP request body.
- * @param {(Object|function(Object))=} headers HTTP headers.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled.
- */
-
-/**
- * @ngdoc method
- * @name ngMockE2E.$httpBackend#whenPATCH
- * @methodOf ngMockE2E.$httpBackend
- * @description
- * Creates a new backend definition for PATCH requests.  For more info see `when()`.
- *
- * @param {string|RegExp} url HTTP url.
- * @param {(string|RegExp)=} data HTTP request body.
- * @param {(Object|function(Object))=} headers HTTP headers.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled.
- */
-
-/**
- * @ngdoc method
- * @name ngMockE2E.$httpBackend#whenJSONP
- * @methodOf ngMockE2E.$httpBackend
- * @description
- * Creates a new backend definition for JSONP requests. For more info see `when()`.
- *
- * @param {string|RegExp} url HTTP url.
- * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
- *   control how a matched request is handled.
- */
-angular.mock.e2e = {};
-angular.mock.e2e.$httpBackendDecorator =
-  ['$rootScope', '$delegate', '$browser', createHttpBackendMock];
-
-
-angular.mock.clearDataCache = function() {
-  var key,
-      cache = angular.element.cache;
-
-  for(key in cache) {
-    if (Object.prototype.hasOwnProperty.call(cache,key)) {
-      var handle = cache[key].handle;
-
-      handle && angular.element(handle.elem).off();
-      delete cache[key];
-    }
-  }
-};
-
-
-if(window.jasmine || window.mocha) {
-
-  var currentSpec = null,
-      isSpecRunning = function() {
-        return !!currentSpec;
-      };
-
-
-  beforeEach(function() {
-    currentSpec = this;
-  });
-
-  afterEach(function() {
-    var injector = currentSpec.$injector;
-
-    currentSpec.$injector = null;
-    currentSpec.$modules = null;
-    currentSpec = null;
-
-    if (injector) {
-      injector.get('$rootElement').off();
-      injector.get('$browser').pollFns.length = 0;
-    }
-
-    angular.mock.clearDataCache();
-
-    // clean up jquery's fragment cache
-    angular.forEach(angular.element.fragments, function(val, key) {
-      delete angular.element.fragments[key];
-    });
-
-    MockXhr.$$lastInstance = null;
-
-    angular.forEach(angular.callbacks, function(val, key) {
-      delete angular.callbacks[key];
-    });
-    angular.callbacks.counter = 0;
-  });
-
-  /**
-   * @ngdoc function
-   * @name angular.mock.module
-   * @description
-   *
-   * *NOTE*: This function is also published on window for easy access.<br>
-   *
-   * This function registers a module configuration code. It collects the configuration information
-   * which will be used when the injector is created by {@link angular.mock.inject inject}.
-   *
-   * See {@link angular.mock.inject inject} for usage example
-   *
-   * @param {...(string|Function|Object)} fns any number of modules which are represented as string
-   *        aliases or as anonymous module initialization functions. The modules are used to
-   *        configure the injector. The 'ng' and 'ngMock' modules are automatically loaded. If an
-   *        object literal is passed they will be register as values in the module, the key being
-   *        the module name and the value being what is returned.
-   */
-  window.module = angular.mock.module = function() {
-    var moduleFns = Array.prototype.slice.call(arguments, 0);
-    return isSpecRunning() ? workFn() : workFn;
-    /////////////////////
-    function workFn() {
-      if (currentSpec.$injector) {
-        throw new Error('Injector already created, can not register a module!');
-      } else {
-        var modules = currentSpec.$modules || (currentSpec.$modules = []);
-        angular.forEach(moduleFns, function(module) {
-          if (angular.isObject(module) && !angular.isArray(module)) {
-            modules.push(function($provide) {
-              angular.forEach(module, function(value, key) {
-                $provide.value(key, value);
-              });
-            });
-          } else {
-            modules.push(module);
-          }
-        });
-      }
-    }
-  };
-
-  /**
-   * @ngdoc function
-   * @name angular.mock.inject
-   * @description
-   *
-   * *NOTE*: This function is also published on window for easy access.<br>
-   *
-   * The inject function wraps a function into an injectable function. The inject() creates new
-   * instance of {@link AUTO.$injector $injector} per test, which is then used for
-   * resolving references.
-   *
-   *
-   * ## Resolving References (Underscore Wrapping)
-   * Often, we would like to inject a reference once, in a `beforeEach()` block and reuse this
-   * in multiple `it()` clauses. To be able to do this we must assign the reference to a variable
-   * that is declared in the scope of the `describe()` block. Since we would, most likely, want
-   * the variable to have the same name of the reference we have a problem, since the parameter
-   * to the `inject()` function would hide the outer variable.
-   *
-   * To help with this, the injected parameters can, optionally, be enclosed with underscores.
-   * These are ignored by the injector when the reference name is resolved.
-   *
-   * For example, the parameter `_myService_` would be resolved as the reference `myService`.
-   * Since it is available in the function body as _myService_, we can then assign it to a variable
-   * defined in an outer scope.
-   *
-   * ```
-   * // Defined out reference variable outside
-   * var myService;
-   *
-   * // Wrap the parameter in underscores
-   * beforeEach( inject( function(_myService_){
-   *   myService = _myService_;
-   * }));
-   *
-   * // Use myService in a series of tests.
-   * it('makes use of myService', function() {
-   *   myService.doStuff();
-   * });
-   *
-   * ```
-   *
-   * See also {@link angular.mock.module angular.mock.module}
-   *
-   * ## Example
-   * Example of what a typical jasmine tests looks like with the inject method.
-   * <pre>
-   *
-   *   angular.module('myApplicationModule', [])
-   *       .value('mode', 'app')
-   *       .value('version', 'v1.0.1');
-   *
-   *
-   *   describe('MyApp', function() {
-   *
-   *     // You need to load modules that you want to test,
-   *     // it loads only the "ng" module by default.
-   *     beforeEach(module('myApplicationModule'));
-   *
-   *
-   *     // inject() is used to inject arguments of all given functions
-   *     it('should provide a version', inject(function(mode, version) {
-   *       expect(version).toEqual('v1.0.1');
-   *       expect(mode).toEqual('app');
-   *     }));
-   *
-   *
-   *     // The inject and module method can also be used inside of the it or beforeEach
-   *     it('should override a version and test the new version is injected', function() {
-   *       // module() takes functions or strings (module aliases)
-   *       module(function($provide) {
-   *         $provide.value('version', 'overridden'); // override version here
-   *       });
-   *
-   *       inject(function(version) {
-   *         expect(version).toEqual('overridden');
-   *       });
-   *     });
-   *   });
-   *
-   * </pre>
-   *
-   * @param {...Function} fns any number of functions which will be injected using the injector.
-   */
-
-
-
-  var ErrorAddingDeclarationLocationStack = function(e, errorForStack) {
-    this.message = e.message;
-    this.name = e.name;
-    if (e.line) this.line = e.line;
-    if (e.sourceId) this.sourceId = e.sourceId;
-    if (e.stack && errorForStack)
-      this.stack = e.stack + '\n' + errorForStack.stack;
-    if (e.stackArray) this.stackArray = e.stackArray;
-  };
-  ErrorAddingDeclarationLocationStack.prototype.toString = Error.prototype.toString;
-
-  window.inject = angular.mock.inject = function() {
-    var blockFns = Array.prototype.slice.call(arguments, 0);
-    var errorForStack = new Error('Declaration Location');
-    return isSpecRunning() ? workFn.call(currentSpec) : workFn;
-    /////////////////////
-    function workFn() {
-      var modules = currentSpec.$modules || [];
-
-      modules.unshift('ngMock');
-      modules.unshift('ng');
-      var injector = currentSpec.$injector;
-      if (!injector) {
-        injector = currentSpec.$injector = angular.injector(modules);
-      }
-      for(var i = 0, ii = blockFns.length; i < ii; i++) {
-        try {
-          /* jshint -W040 *//* Jasmine explicitly provides a `this` object when calling functions */
-          injector.invoke(blockFns[i] || angular.noop, this);
-          /* jshint +W040 */
-        } catch (e) {
-          if (e.stack && errorForStack) {
-            throw new ErrorAddingDeclarationLocationStack(e, errorForStack);
-          }
-          throw e;
-        } finally {
-          errorForStack = null;
-        }
-      }
-    }
-  };
-}
-
-
-})(window, window.angular);
\ No newline at end of file
+     </pre>
+	 */
+	angular.mock.$HttpBackendProvider = function () {
+		this.$get = ['$rootScope', createHttpBackendMock];
+	};
+
+	/**
+	 * General factory function for $httpBackend mock.
+	 * Returns instance for unit testing (when no arguments specified):
+	 *   - passing through is disabled
+	 *   - auto flushing is disabled
+	 *
+	 * Returns instance for e2e testing (when `$delegate` and `$browser` specified):
+	 *   - passing through (delegating request to real backend) is enabled
+	 *   - auto flushing is enabled
+	 *
+	 * @param {Object=} $delegate Real $httpBackend instance (allow passing through if specified)
+	 * @param {Object=} $browser Auto-flushing enabled if specified
+	 * @return {Object} Instance of $httpBackend mock
+	 */
+	function createHttpBackendMock($rootScope, $delegate, $browser) {
+		var definitions = [],
+			expectations = [],
+			responses = [],
+			responsesPush = angular.bind(responses, responses.push),
+			copy = angular.copy;
+
+		function createResponse(status, data, headers) {
+			if (angular.isFunction(status)) return status;
+
+			return function () {
+				return angular.isNumber(status)
+					? [status, data, headers]
+					: [200, status, data];
+			};
+		}
+
+		// TODO(vojta): change params to: method, url, data, headers, callback
+		function $httpBackend(method, url, data, callback, headers, timeout, withCredentials) {
+			var xhr = new MockXhr(),
+				expectation = expectations[0],
+				wasExpected = false;
+
+			function prettyPrint(data) {
+				return (angular.isString(data) || angular.isFunction(data) || data instanceof RegExp)
+					? data
+					: angular.toJson(data);
+			}
+
+			function wrapResponse(wrapped) {
+				if (!$browser && timeout && timeout.then) timeout.then(handleTimeout);
+
+				return handleResponse;
+
+				function handleResponse() {
+					var response = wrapped.response(method, url, data, headers);
+					xhr.$$respHeaders = response[2];
+					callback(copy(response[0]), copy(response[1]), xhr.getAllResponseHeaders());
+				}
+
+				function handleTimeout() {
+					for (var i = 0, ii = responses.length; i < ii; i++) {
+						if (responses[i] === handleResponse) {
+							responses.splice(i, 1);
+							callback(-1, undefined, '');
+							break;
+						}
+					}
+				}
+			}
+
+			if (expectation && expectation.match(method, url)) {
+				if (!expectation.matchData(data))
+					throw new Error('Expected ' + expectation + ' with different data\n' +
+						'EXPECTED: ' + prettyPrint(expectation.data) + '\nGOT:      ' + data);
+
+				if (!expectation.matchHeaders(headers))
+					throw new Error('Expected ' + expectation + ' with different headers\n' +
+						'EXPECTED: ' + prettyPrint(expectation.headers) + '\nGOT:      ' +
+						prettyPrint(headers));
+
+				expectations.shift();
+
+				if (expectation.response) {
+					responses.push(wrapResponse(expectation));
+					return;
+				}
+				wasExpected = true;
+			}
+
+			var i = -1, definition;
+			while ((definition = definitions[++i])) {
+				if (definition.match(method, url, data, headers || {})) {
+					if (definition.response) {
+						// if $browser specified, we do auto flush all requests
+						($browser ? $browser.defer : responsesPush)(wrapResponse(definition));
+					} else if (definition.passThrough) {
+						$delegate(method, url, data, callback, headers, timeout, withCredentials);
+					} else throw new Error('No response defined !');
+					return;
+				}
+			}
+			throw wasExpected ?
+				new Error('No response defined !') :
+				new Error('Unexpected request: ' + method + ' ' + url + '\n' +
+					(expectation ? 'Expected ' + expectation : 'No more request expected'));
+		}
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$httpBackend#when
+		 * @methodOf ngMock.$httpBackend
+		 * @description
+		 * Creates a new backend definition.
+		 *
+		 * @param {string} method HTTP method.
+		 * @param {string|RegExp} url HTTP url.
+		 * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives
+		 *   data string and returns true if the data is as expected.
+		 * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header
+		 *   object and returns true if the headers match the current definition.
+		 * @returns {requestHandler} Returns an object with `respond` method that controls how a matched
+		 *   request is handled.
+		 *
+		 *  - respond –
+		 *      `{function([status,] data[, headers])|function(function(method, url, data, headers)}`
+		 *    – The respond method takes a set of static data to be returned or a function that can return
+		 *    an array containing response status (number), response data (string) and response headers
+		 *    (Object).
+		 */
+		$httpBackend.when = function (method, url, data, headers) {
+			var definition = new MockHttpExpectation(method, url, data, headers),
+				chain = {
+					respond: function (status, data, headers) {
+						definition.response = createResponse(status, data, headers);
+					}
+				};
+
+			if ($browser) {
+				chain.passThrough = function () {
+					definition.passThrough = true;
+				};
+			}
+
+			definitions.push(definition);
+			return chain;
+		};
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$httpBackend#whenGET
+		 * @methodOf ngMock.$httpBackend
+		 * @description
+		 * Creates a new backend definition for GET requests. For more info see `when()`.
+		 *
+		 * @param {string|RegExp} url HTTP url.
+		 * @param {(Object|function(Object))=} headers HTTP headers.
+		 * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+		 * request is handled.
+		 */
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$httpBackend#whenHEAD
+		 * @methodOf ngMock.$httpBackend
+		 * @description
+		 * Creates a new backend definition for HEAD requests. For more info see `when()`.
+		 *
+		 * @param {string|RegExp} url HTTP url.
+		 * @param {(Object|function(Object))=} headers HTTP headers.
+		 * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+		 * request is handled.
+		 */
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$httpBackend#whenDELETE
+		 * @methodOf ngMock.$httpBackend
+		 * @description
+		 * Creates a new backend definition for DELETE requests. For more info see `when()`.
+		 *
+		 * @param {string|RegExp} url HTTP url.
+		 * @param {(Object|function(Object))=} headers HTTP headers.
+		 * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+		 * request is handled.
+		 */
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$httpBackend#whenPOST
+		 * @methodOf ngMock.$httpBackend
+		 * @description
+		 * Creates a new backend definition for POST requests. For more info see `when()`.
+		 *
+		 * @param {string|RegExp} url HTTP url.
+		 * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives
+		 *   data string and returns true if the data is as expected.
+		 * @param {(Object|function(Object))=} headers HTTP headers.
+		 * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+		 * request is handled.
+		 */
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$httpBackend#whenPUT
+		 * @methodOf ngMock.$httpBackend
+		 * @description
+		 * Creates a new backend definition for PUT requests.  For more info see `when()`.
+		 *
+		 * @param {string|RegExp} url HTTP url.
+		 * @param {(string|RegExp|function(string))=} data HTTP request body or function that receives
+		 *   data string and returns true if the data is as expected.
+		 * @param {(Object|function(Object))=} headers HTTP headers.
+		 * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+		 * request is handled.
+		 */
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$httpBackend#whenJSONP
+		 * @methodOf ngMock.$httpBackend
+		 * @description
+		 * Creates a new backend definition for JSONP requests. For more info see `when()`.
+		 *
+		 * @param {string|RegExp} url HTTP url.
+		 * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+		 * request is handled.
+		 */
+		createShortMethods('when');
+
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$httpBackend#expect
+		 * @methodOf ngMock.$httpBackend
+		 * @description
+		 * Creates a new request expectation.
+		 *
+		 * @param {string} method HTTP method.
+		 * @param {string|RegExp} url HTTP url.
+		 * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that
+		 *  receives data string and returns true if the data is as expected, or Object if request body
+		 *  is in JSON format.
+		 * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header
+		 *   object and returns true if the headers match the current expectation.
+		 * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+		 *  request is handled.
+		 *
+		 *  - respond –
+		 *    `{function([status,] data[, headers])|function(function(method, url, data, headers)}`
+		 *    – The respond method takes a set of static data to be returned or a function that can return
+		 *    an array containing response status (number), response data (string) and response headers
+		 *    (Object).
+		 */
+		$httpBackend.expect = function (method, url, data, headers) {
+			var expectation = new MockHttpExpectation(method, url, data, headers);
+			expectations.push(expectation);
+			return {
+				respond: function (status, data, headers) {
+					expectation.response = createResponse(status, data, headers);
+				}
+			};
+		};
+
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$httpBackend#expectGET
+		 * @methodOf ngMock.$httpBackend
+		 * @description
+		 * Creates a new request expectation for GET requests. For more info see `expect()`.
+		 *
+		 * @param {string|RegExp} url HTTP url.
+		 * @param {Object=} headers HTTP headers.
+		 * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+		 * request is handled. See #expect for more info.
+		 */
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$httpBackend#expectHEAD
+		 * @methodOf ngMock.$httpBackend
+		 * @description
+		 * Creates a new request expectation for HEAD requests. For more info see `expect()`.
+		 *
+		 * @param {string|RegExp} url HTTP url.
+		 * @param {Object=} headers HTTP headers.
+		 * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+		 *   request is handled.
+		 */
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$httpBackend#expectDELETE
+		 * @methodOf ngMock.$httpBackend
+		 * @description
+		 * Creates a new request expectation for DELETE requests. For more info see `expect()`.
+		 *
+		 * @param {string|RegExp} url HTTP url.
+		 * @param {Object=} headers HTTP headers.
+		 * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+		 *   request is handled.
+		 */
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$httpBackend#expectPOST
+		 * @methodOf ngMock.$httpBackend
+		 * @description
+		 * Creates a new request expectation for POST requests. For more info see `expect()`.
+		 *
+		 * @param {string|RegExp} url HTTP url.
+		 * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that
+		 *  receives data string and returns true if the data is as expected, or Object if request body
+		 *  is in JSON format.
+		 * @param {Object=} headers HTTP headers.
+		 * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+		 *   request is handled.
+		 */
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$httpBackend#expectPUT
+		 * @methodOf ngMock.$httpBackend
+		 * @description
+		 * Creates a new request expectation for PUT requests. For more info see `expect()`.
+		 *
+		 * @param {string|RegExp} url HTTP url.
+		 * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that
+		 *  receives data string and returns true if the data is as expected, or Object if request body
+		 *  is in JSON format.
+		 * @param {Object=} headers HTTP headers.
+		 * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+		 *   request is handled.
+		 */
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$httpBackend#expectPATCH
+		 * @methodOf ngMock.$httpBackend
+		 * @description
+		 * Creates a new request expectation for PATCH requests. For more info see `expect()`.
+		 *
+		 * @param {string|RegExp} url HTTP url.
+		 * @param {(string|RegExp|function(string)|Object)=} data HTTP request body or function that
+		 *  receives data string and returns true if the data is as expected, or Object if request body
+		 *  is in JSON format.
+		 * @param {Object=} headers HTTP headers.
+		 * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+		 *   request is handled.
+		 */
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$httpBackend#expectJSONP
+		 * @methodOf ngMock.$httpBackend
+		 * @description
+		 * Creates a new request expectation for JSONP requests. For more info see `expect()`.
+		 *
+		 * @param {string|RegExp} url HTTP url.
+		 * @returns {requestHandler} Returns an object with `respond` method that control how a matched
+		 *   request is handled.
+		 */
+		createShortMethods('expect');
+
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$httpBackend#flush
+		 * @methodOf ngMock.$httpBackend
+		 * @description
+		 * Flushes all pending requests using the trained responses.
+		 *
+		 * @param {number=} count Number of responses to flush (in the order they arrived). If undefined,
+		 *   all pending requests will be flushed. If there are no pending requests when the flush method
+		 *   is called an exception is thrown (as this typically a sign of programming error).
+		 */
+		$httpBackend.flush = function (count) {
+			$rootScope.$digest();
+			if (!responses.length) throw new Error('No pending request to flush !');
+
+			if (angular.isDefined(count)) {
+				while (count--) {
+					if (!responses.length) throw new Error('No more pending request to flush !');
+					responses.shift()();
+				}
+			} else {
+				while (responses.length) {
+					responses.shift()();
+				}
+			}
+			$httpBackend.verifyNoOutstandingExpectation();
+		};
+
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$httpBackend#verifyNoOutstandingExpectation
+		 * @methodOf ngMock.$httpBackend
+		 * @description
+		 * Verifies that all of the requests defined via the `expect` api were made. If any of the
+		 * requests were not made, verifyNoOutstandingExpectation throws an exception.
+		 *
+		 * Typically, you would call this method following each test case that asserts requests using an
+		 * "afterEach" clause.
+		 *
+		 * <pre>
+		 *   afterEach($httpBackend.verifyNoOutstandingExpectation);
+		 * </pre>
+		 */
+		$httpBackend.verifyNoOutstandingExpectation = function () {
+			$rootScope.$digest();
+			if (expectations.length) {
+				throw new Error('Unsatisfied requests: ' + expectations.join(', '));
+			}
+		};
+
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$httpBackend#verifyNoOutstandingRequest
+		 * @methodOf ngMock.$httpBackend
+		 * @description
+		 * Verifies that there are no outstanding requests that need to be flushed.
+		 *
+		 * Typically, you would call this method following each test case that asserts requests using an
+		 * "afterEach" clause.
+		 *
+		 * <pre>
+		 *   afterEach($httpBackend.verifyNoOutstandingRequest);
+		 * </pre>
+		 */
+		$httpBackend.verifyNoOutstandingRequest = function () {
+			if (responses.length) {
+				throw new Error('Unflushed requests: ' + responses.length);
+			}
+		};
+
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$httpBackend#resetExpectations
+		 * @methodOf ngMock.$httpBackend
+		 * @description
+		 * Resets all request expectations, but preserves all backend definitions. Typically, you would
+		 * call resetExpectations during a multiple-phase test when you want to reuse the same instance of
+		 * $httpBackend mock.
+		 */
+		$httpBackend.resetExpectations = function () {
+			expectations.length = 0;
+			responses.length = 0;
+		};
+
+		return $httpBackend;
+
+
+		function createShortMethods(prefix) {
+			angular.forEach(['GET', 'DELETE', 'JSONP'], function (method) {
+				$httpBackend[prefix + method] = function (url, headers) {
+					return $httpBackend[prefix](method, url, undefined, headers);
+				};
+			});
+
+			angular.forEach(['PUT', 'POST', 'PATCH'], function (method) {
+				$httpBackend[prefix + method] = function (url, data, headers) {
+					return $httpBackend[prefix](method, url, data, headers);
+				};
+			});
+		}
+	}
+
+	function MockHttpExpectation(method, url, data, headers) {
+
+		this.data = data;
+		this.headers = headers;
+
+		this.match = function (m, u, d, h) {
+			if (method != m) return false;
+			if (!this.matchUrl(u)) return false;
+			if (angular.isDefined(d) && !this.matchData(d)) return false;
+			if (angular.isDefined(h) && !this.matchHeaders(h)) return false;
+			return true;
+		};
+
+		this.matchUrl = function (u) {
+			if (!url) return true;
+			if (angular.isFunction(url.test)) return url.test(u);
+			return url == u;
+		};
+
+		this.matchHeaders = function (h) {
+			if (angular.isUndefined(headers)) return true;
+			if (angular.isFunction(headers)) return headers(h);
+			return angular.equals(headers, h);
+		};
+
+		this.matchData = function (d) {
+			if (angular.isUndefined(data)) return true;
+			if (data && angular.isFunction(data.test)) return data.test(d);
+			if (data && angular.isFunction(data)) return data(d);
+			if (data && !angular.isString(data)) return angular.equals(data, angular.fromJson(d));
+			return data == d;
+		};
+
+		this.toString = function () {
+			return method + ' ' + url;
+		};
+	}
+
+	function createMockXhr() {
+		return new MockXhr();
+	}
+
+	function MockXhr() {
+
+		// hack for testing $http, $httpBackend
+		MockXhr.$$lastInstance = this;
+
+		this.open = function (method, url, async) {
+			this.$$method = method;
+			this.$$url = url;
+			this.$$async = async;
+			this.$$reqHeaders = {};
+			this.$$respHeaders = {};
+		};
+
+		this.send = function (data) {
+			this.$$data = data;
+		};
+
+		this.setRequestHeader = function (key, value) {
+			this.$$reqHeaders[key] = value;
+		};
+
+		this.getResponseHeader = function (name) {
+			// the lookup must be case insensitive,
+			// that's why we try two quick lookups first and full scan last
+			var header = this.$$respHeaders[name];
+			if (header) return header;
+
+			name = angular.lowercase(name);
+			header = this.$$respHeaders[name];
+			if (header) return header;
+
+			header = undefined;
+			angular.forEach(this.$$respHeaders, function (headerVal, headerName) {
+				if (!header && angular.lowercase(headerName) == name) header = headerVal;
+			});
+			return header;
+		};
+
+		this.getAllResponseHeaders = function () {
+			var lines = [];
+
+			angular.forEach(this.$$respHeaders, function (value, key) {
+				lines.push(key + ': ' + value);
+			});
+			return lines.join('\n');
+		};
+
+		this.abort = angular.noop;
+	}
+
+
+	/**
+	 * @ngdoc function
+	 * @name ngMock.$timeout
+	 * @description
+	 *
+	 * This service is just a simple decorator for {@link ng.$timeout $timeout} service
+	 * that adds a "flush" and "verifyNoPendingTasks" methods.
+	 */
+
+	angular.mock.$TimeoutDecorator = function ($delegate, $browser) {
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$timeout#flush
+		 * @methodOf ngMock.$timeout
+		 * @description
+		 *
+		 * Flushes the queue of pending tasks.
+		 *
+		 * @param {number=} delay maximum timeout amount to flush up until
+		 */
+		$delegate.flush = function (delay) {
+			$browser.defer.flush(delay);
+		};
+
+		/**
+		 * @ngdoc method
+		 * @name ngMock.$timeout#verifyNoPendingTasks
+		 * @methodOf ngMock.$timeout
+		 * @description
+		 *
+		 * Verifies that there are no pending tasks that need to be flushed.
+		 */
+		$delegate.verifyNoPendingTasks = function () {
+			if ($browser.deferredFns.length) {
+				throw new Error('Deferred tasks to flush (' + $browser.deferredFns.length + '): ' +
+					formatPendingTasksAsString($browser.deferredFns));
+			}
+		};
+
+		function formatPendingTasksAsString(tasks) {
+			var result = [];
+			angular.forEach(tasks, function (task) {
+				result.push('{id: ' + task.id + ', ' + 'time: ' + task.time + '}');
+			});
+
+			return result.join(', ');
+		}
+
+		return $delegate;
+	};
+
+	/**
+	 *
+	 */
+	angular.mock.$RootElementProvider = function () {
+		this.$get = function () {
+			return angular.element('<div ng-app></div>');
+		};
+	};
+
+	/**
+	 * @ngdoc overview
+	 * @name ngMock
+	 * @description
+	 *
+	 * # ngMock
+	 *
+	 * The `ngMock` module providers support to inject and mock Angular services into unit tests.
+	 * In addition, ngMock also extends various core ng services such that they can be
+	 * inspected and controlled in a synchronous manner within test code.
+	 *
+	 * {@installModule mock}
+	 *
+	 * <div doc-module-components="ngMock"></div>
+	 *
+	 */
+	angular.module('ngMock', ['ng']).provider({
+		$browser: angular.mock.$BrowserProvider,
+		$exceptionHandler: angular.mock.$ExceptionHandlerProvider,
+		$log: angular.mock.$LogProvider,
+		$interval: angular.mock.$IntervalProvider,
+		$httpBackend: angular.mock.$HttpBackendProvider,
+		$rootElement: angular.mock.$RootElementProvider
+	}).config(['$provide', function ($provide) {
+		$provide.decorator('$timeout', angular.mock.$TimeoutDecorator);
+	}]);
+
+	/**
+	 * @ngdoc overview
+	 * @name ngMockE2E
+	 * @description
+	 *
+	 * The `ngMockE2E` is an angular module which contains mocks suitable for end-to-end testing.
+	 * Currently there is only one mock present in this module -
+	 * the {@link ngMockE2E.$httpBackend e2e $httpBackend} mock.
+	 */
+	angular.module('ngMockE2E', ['ng']).config(['$provide', function ($provide) {
+		$provide.decorator('$httpBackend', angular.mock.e2e.$httpBackendDecorator);
+	}]);
+
+	/**
+	 * @ngdoc object
+	 * @name ngMockE2E.$httpBackend
+	 * @description
+	 * Fake HTTP backend implementation suitable for end-to-end testing or backend-less development of
+	 * applications that use the {@link ng.$http $http service}.
+	 *
+	 * *Note*: For fake http backend implementation suitable for unit testing please see
+	 * {@link ngMock.$httpBackend unit-testing $httpBackend mock}.
+	 *
+	 * This implementation can be used to respond with static or dynamic responses via the `when` api
+	 * and its shortcuts (`whenGET`, `whenPOST`, etc) and optionally pass through requests to the
+	 * real $httpBackend for specific requests (e.g. to interact with certain remote apis or to fetch
+	 * templates from a webserver).
+	 *
+	 * As opposed to unit-testing, in an end-to-end testing scenario or in scenario when an application
+	 * is being developed with the real backend api replaced with a mock, it is often desirable for
+	 * certain category of requests to bypass the mock and issue a real http request (e.g. to fetch
+	 * templates or static files from the webserver). To configure the backend with this behavior
+	 * use the `passThrough` request handler of `when` instead of `respond`.
+	 *
+	 * Additionally, we don't want to manually have to flush mocked out requests like we do during unit
+	 * testing. For this reason the e2e $httpBackend automatically flushes mocked out requests
+	 * automatically, closely simulating the behavior of the XMLHttpRequest object.
+	 *
+	 * To setup the application to run with this http backend, you have to create a module that depends
+	 * on the `ngMockE2E` and your application modules and defines the fake backend:
+	 *
+	 * <pre>
+	 *   myAppDev = angular.module('myAppDev', ['myApp', 'ngMockE2E']);
+	 *   myAppDev.run(function($httpBackend) {
+	 *     phones = [{name: 'phone1'}, {name: 'phone2'}];
+	 *
+	 *     // returns the current list of phones
+	 *     $httpBackend.whenGET('/phones').respond(phones);
+	 *
+	 *     // adds a new phone to the phones array
+	 *     $httpBackend.whenPOST('/phones').respond(function(method, url, data) {
+	 *       phones.push(angular.fromJson(data));
+	 *     });
+	 *     $httpBackend.whenGET(/^\/templates\//).passThrough();
+	 *     //...
+	 *   });
+	 * </pre>
+	 *
+	 * Afterwards, bootstrap your app with this new module.
+	 */
+
+	/**
+	 * @ngdoc method
+	 * @name ngMockE2E.$httpBackend#when
+	 * @methodOf ngMockE2E.$httpBackend
+	 * @description
+	 * Creates a new backend definition.
+	 *
+	 * @param {string} method HTTP method.
+	 * @param {string|RegExp} url HTTP url.
+	 * @param {(string|RegExp)=} data HTTP request body.
+	 * @param {(Object|function(Object))=} headers HTTP headers or function that receives http header
+	 *   object and returns true if the headers match the current definition.
+	 * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
+	 *   control how a matched request is handled.
+	 *
+	 *  - respond –
+	 *    `{function([status,] data[, headers])|function(function(method, url, data, headers)}`
+	 *    – The respond method takes a set of static data to be returned or a function that can return
+	 *    an array containing response status (number), response data (string) and response headers
+	 *    (Object).
+	 *  - passThrough – `{function()}` – Any request matching a backend definition with `passThrough`
+	 *    handler, will be pass through to the real backend (an XHR request will be made to the
+	 *    server.
+	 */
+
+	/**
+	 * @ngdoc method
+	 * @name ngMockE2E.$httpBackend#whenGET
+	 * @methodOf ngMockE2E.$httpBackend
+	 * @description
+	 * Creates a new backend definition for GET requests. For more info see `when()`.
+	 *
+	 * @param {string|RegExp} url HTTP url.
+	 * @param {(Object|function(Object))=} headers HTTP headers.
+	 * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
+	 *   control how a matched request is handled.
+	 */
+
+	/**
+	 * @ngdoc method
+	 * @name ngMockE2E.$httpBackend#whenHEAD
+	 * @methodOf ngMockE2E.$httpBackend
+	 * @description
+	 * Creates a new backend definition for HEAD requests. For more info see `when()`.
+	 *
+	 * @param {string|RegExp} url HTTP url.
+	 * @param {(Object|function(Object))=} headers HTTP headers.
+	 * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
+	 *   control how a matched request is handled.
+	 */
+
+	/**
+	 * @ngdoc method
+	 * @name ngMockE2E.$httpBackend#whenDELETE
+	 * @methodOf ngMockE2E.$httpBackend
+	 * @description
+	 * Creates a new backend definition for DELETE requests. For more info see `when()`.
+	 *
+	 * @param {string|RegExp} url HTTP url.
+	 * @param {(Object|function(Object))=} headers HTTP headers.
+	 * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
+	 *   control how a matched request is handled.
+	 */
+
+	/**
+	 * @ngdoc method
+	 * @name ngMockE2E.$httpBackend#whenPOST
+	 * @methodOf ngMockE2E.$httpBackend
+	 * @description
+	 * Creates a new backend definition for POST requests. For more info see `when()`.
+	 *
+	 * @param {string|RegExp} url HTTP url.
+	 * @param {(string|RegExp)=} data HTTP request body.
+	 * @param {(Object|function(Object))=} headers HTTP headers.
+	 * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
+	 *   control how a matched request is handled.
+	 */
+
+	/**
+	 * @ngdoc method
+	 * @name ngMockE2E.$httpBackend#whenPUT
+	 * @methodOf ngMockE2E.$httpBackend
+	 * @description
+	 * Creates a new backend definition for PUT requests.  For more info see `when()`.
+	 *
+	 * @param {string|RegExp} url HTTP url.
+	 * @param {(string|RegExp)=} data HTTP request body.
+	 * @param {(Object|function(Object))=} headers HTTP headers.
+	 * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
+	 *   control how a matched request is handled.
+	 */
+
+	/**
+	 * @ngdoc method
+	 * @name ngMockE2E.$httpBackend#whenPATCH
+	 * @methodOf ngMockE2E.$httpBackend
+	 * @description
+	 * Creates a new backend definition for PATCH requests.  For more info see `when()`.
+	 *
+	 * @param {string|RegExp} url HTTP url.
+	 * @param {(string|RegExp)=} data HTTP request body.
+	 * @param {(Object|function(Object))=} headers HTTP headers.
+	 * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
+	 *   control how a matched request is handled.
+	 */
+
+	/**
+	 * @ngdoc method
+	 * @name ngMockE2E.$httpBackend#whenJSONP
+	 * @methodOf ngMockE2E.$httpBackend
+	 * @description
+	 * Creates a new backend definition for JSONP requests. For more info see `when()`.
+	 *
+	 * @param {string|RegExp} url HTTP url.
+	 * @returns {requestHandler} Returns an object with `respond` and `passThrough` methods that
+	 *   control how a matched request is handled.
+	 */
+	angular.mock.e2e = {};
+	angular.mock.e2e.$httpBackendDecorator =
+		['$rootScope', '$delegate', '$browser', createHttpBackendMock];
+
+
+	angular.mock.clearDataCache = function () {
+		var key,
+			cache = angular.element.cache;
+
+		for (key in cache) {
+			if (Object.prototype.hasOwnProperty.call(cache, key)) {
+				var handle = cache[key].handle;
+
+				handle && angular.element(handle.elem).off();
+				delete cache[key];
+			}
+		}
+	};
+
+
+	if (window.jasmine || window.mocha) {
+
+		var currentSpec = null,
+			isSpecRunning = function () {
+				return !!currentSpec;
+			};
+
+
+		beforeEach(function () {
+			currentSpec = this;
+		});
+
+		afterEach(function () {
+			var injector = currentSpec.$injector;
+
+			currentSpec.$injector = null;
+			currentSpec.$modules = null;
+			currentSpec = null;
+
+			if (injector) {
+				injector.get('$rootElement').off();
+				injector.get('$browser').pollFns.length = 0;
+			}
+
+			angular.mock.clearDataCache();
+
+			// clean up jquery's fragment cache
+			angular.forEach(angular.element.fragments, function (val, key) {
+				delete angular.element.fragments[key];
+			});
+
+			MockXhr.$$lastInstance = null;
+
+			angular.forEach(angular.callbacks, function (val, key) {
+				delete angular.callbacks[key];
+			});
+			angular.callbacks.counter = 0;
+		});
+
+		/**
+		 * @ngdoc function
+		 * @name angular.mock.module
+		 * @description
+		 *
+		 * *NOTE*: This function is also published on window for easy access.<br>
+		 *
+		 * This function registers a module configuration code. It collects the configuration information
+		 * which will be used when the injector is created by {@link angular.mock.inject inject}.
+		 *
+		 * See {@link angular.mock.inject inject} for usage example
+		 *
+		 * @param {...(string|Function|Object)} fns any number of modules which are represented as string
+		 *        aliases or as anonymous module initialization functions. The modules are used to
+		 *        configure the injector. The 'ng' and 'ngMock' modules are automatically loaded. If an
+		 *        object literal is passed they will be register as values in the module, the key being
+		 *        the module name and the value being what is returned.
+		 */
+		window.module = angular.mock.module = function () {
+			var moduleFns = Array.prototype.slice.call(arguments, 0);
+			return isSpecRunning() ? workFn() : workFn;
+
+			/////////////////////
+			function workFn() {
+				if (currentSpec.$injector) {
+					throw new Error('Injector already created, can not register a module!');
+				} else {
+					var modules = currentSpec.$modules || (currentSpec.$modules = []);
+					angular.forEach(moduleFns, function (module) {
+						if (angular.isObject(module) && !angular.isArray(module)) {
+							modules.push(function ($provide) {
+								angular.forEach(module, function (value, key) {
+									$provide.value(key, value);
+								});
+							});
+						} else {
+							modules.push(module);
+						}
+					});
+				}
+			}
+		};
+
+		/**
+		 * @ngdoc function
+		 * @name angular.mock.inject
+		 * @description
+		 *
+		 * *NOTE*: This function is also published on window for easy access.<br>
+		 *
+		 * The inject function wraps a function into an injectable function. The inject() creates new
+		 * instance of {@link AUTO.$injector $injector} per test, which is then used for
+		 * resolving references.
+		 *
+		 *
+		 * ## Resolving References (Underscore Wrapping)
+		 * Often, we would like to inject a reference once, in a `beforeEach()` block and reuse this
+		 * in multiple `it()` clauses. To be able to do this we must assign the reference to a variable
+		 * that is declared in the scope of the `describe()` block. Since we would, most likely, want
+		 * the variable to have the same name of the reference we have a problem, since the parameter
+		 * to the `inject()` function would hide the outer variable.
+		 *
+		 * To help with this, the injected parameters can, optionally, be enclosed with underscores.
+		 * These are ignored by the injector when the reference name is resolved.
+		 *
+		 * For example, the parameter `_myService_` would be resolved as the reference `myService`.
+		 * Since it is available in the function body as _myService_, we can then assign it to a variable
+		 * defined in an outer scope.
+		 *
+		 * ```
+		 * // Defined out reference variable outside
+		 * var myService;
+		 *
+		 * // Wrap the parameter in underscores
+		 * beforeEach( inject( function(_myService_){
+		 *   myService = _myService_;
+		 * }));
+		 *
+		 * // Use myService in a series of tests.
+		 * it('makes use of myService', function() {
+		 *   myService.doStuff();
+		 * });
+		 *
+		 * ```
+		 *
+		 * See also {@link angular.mock.module angular.mock.module}
+		 *
+		 * ## Example
+		 * Example of what a typical jasmine tests looks like with the inject method.
+		 * <pre>
+		 *
+		 *   angular.module('myApplicationModule', [])
+		 *       .value('mode', 'app')
+		 *       .value('version', 'v1.0.1');
+		 *
+		 *
+		 *   describe('MyApp', function() {
+		 *
+		 *     // You need to load modules that you want to test,
+		 *     // it loads only the "ng" module by default.
+		 *     beforeEach(module('myApplicationModule'));
+		 *
+		 *
+		 *     // inject() is used to inject arguments of all given functions
+		 *     it('should provide a version', inject(function(mode, version) {
+		 *       expect(version).toEqual('v1.0.1');
+		 *       expect(mode).toEqual('app');
+		 *     }));
+		 *
+		 *
+		 *     // The inject and module method can also be used inside of the it or beforeEach
+		 *     it('should override a version and test the new version is injected', function() {
+		 *       // module() takes functions or strings (module aliases)
+		 *       module(function($provide) {
+		 *         $provide.value('version', 'overridden'); // override version here
+		 *       });
+		 *
+		 *       inject(function(version) {
+		 *         expect(version).toEqual('overridden');
+		 *       });
+		 *     });
+		 *   });
+		 *
+		 * </pre>
+		 *
+		 * @param {...Function} fns any number of functions which will be injected using the injector.
+		 */
+
+
+
+		var ErrorAddingDeclarationLocationStack = function (e, errorForStack) {
+			this.message = e.message;
+			this.name = e.name;
+			if (e.line) this.line = e.line;
+			if (e.sourceId) this.sourceId = e.sourceId;
+			if (e.stack && errorForStack)
+				this.stack = e.stack + '\n' + errorForStack.stack;
+			if (e.stackArray) this.stackArray = e.stackArray;
+		};
+		ErrorAddingDeclarationLocationStack.prototype.toString = Error.prototype.toString;
+
+		window.inject = angular.mock.inject = function () {
+			var blockFns = Array.prototype.slice.call(arguments, 0);
+			var errorForStack = new Error('Declaration Location');
+			return isSpecRunning() ? workFn.call(currentSpec) : workFn;
+
+			/////////////////////
+			function workFn() {
+				var modules = currentSpec.$modules || [];
+
+				modules.unshift('ngMock');
+				modules.unshift('ng');
+				var injector = currentSpec.$injector;
+				if (!injector) {
+					injector = currentSpec.$injector = angular.injector(modules);
+				}
+				for (var i = 0, ii = blockFns.length; i < ii; i++) {
+					try {
+						/* jshint -W040 *//* Jasmine explicitly provides a `this` object when calling functions */
+						injector.invoke(blockFns[i] || angular.noop, this);
+						/* jshint +W040 */
+					} catch (e) {
+						if (e.stack && errorForStack) {
+							throw new ErrorAddingDeclarationLocationStack(e, errorForStack);
+						}
+						throw e;
+					} finally {
+						errorForStack = null;
+					}
+				}
+			}
+		};
+	}
+
+
+})(window, window.angular);
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/angular-resource_1.2.13/angular-resource.js b/len-activiti/src/main/resources/static/editor-app/libs/angular-resource_1.2.13/angular-resource.js
index 36b34b4..f9f83b2 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/angular-resource_1.2.13/angular-resource.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/angular-resource_1.2.13/angular-resource.js
@@ -3,218 +3,219 @@
  * (c) 2010-2014 Google, Inc. http://angularjs.org
  * License: MIT
  */
-(function(window, angular, undefined) {'use strict';
+(function (window, angular, undefined) {
+	'use strict';
 
-var $resourceMinErr = angular.$$minErr('$resource');
+	var $resourceMinErr = angular.$$minErr('$resource');
 
 // Helper functions and regex to lookup a dotted path on an object
 // stopping at undefined/null.  The path must be composed of ASCII
 // identifiers (just like $parse)
-var MEMBER_NAME_REGEX = /^(\.[a-zA-Z_$][0-9a-zA-Z_$]*)+$/;
-
-function isValidDottedPath(path) {
-  return (path != null && path !== '' && path !== 'hasOwnProperty' &&
-      MEMBER_NAME_REGEX.test('.' + path));
-}
-
-function lookupDottedPath(obj, path) {
-  if (!isValidDottedPath(path)) {
-    throw $resourceMinErr('badmember', 'Dotted member path "@{0}" is invalid.', path);
-  }
-  var keys = path.split('.');
-  for (var i = 0, ii = keys.length; i < ii && obj !== undefined; i++) {
-    var key = keys[i];
-    obj = (obj !== null) ? obj[key] : undefined;
-  }
-  return obj;
-}
-
-/**
- * Create a shallow copy of an object and clear other fields from the destination
- */
-function shallowClearAndCopy(src, dst) {
-  dst = dst || {};
-
-  angular.forEach(dst, function(value, key){
-    delete dst[key];
-  });
-
-  for (var key in src) {
-    if (src.hasOwnProperty(key) && !(key.charAt(0) === '$' && key.charAt(1) === '$')) {
-      dst[key] = src[key];
-    }
-  }
-
-  return dst;
-}
-
-/**
- * @ngdoc overview
- * @name ngResource
- * @description
- *
- * # ngResource
- *
- * The `ngResource` module provides interaction support with RESTful services
- * via the $resource service.
- *
- * {@installModule resource}
- *
- * <div doc-module-components="ngResource"></div>
- *
- * See {@link ngResource.$resource `$resource`} for usage.
- */
-
-/**
- * @ngdoc object
- * @name ngResource.$resource
- * @requires $http
- *
- * @description
- * A factory which creates a resource object that lets you interact with
- * [RESTful](http://en.wikipedia.org/wiki/Representational_State_Transfer) server-side data sources.
- *
- * The returned resource object has action methods which provide high-level behaviors without
- * the need to interact with the low level {@link ng.$http $http} service.
- *
- * Requires the {@link ngResource `ngResource`} module to be installed.
- *
- * @param {string} url A parametrized URL template with parameters prefixed by `:` as in
- *   `/user/:username`. If you are using a URL with a port number (e.g.
- *   `http://example.com:8080/api`), it will be respected.
- *
- *   If you are using a url with a suffix, just add the suffix, like this:
- *   `$resource('http://example.com/resource.json')` or `$resource('http://example.com/:id.json')`
- *   or even `$resource('http://example.com/resource/:resource_id.:format')`
- *   If the parameter before the suffix is empty, :resource_id in this case, then the `/.` will be
- *   collapsed down to a single `.`.  If you need this sequence to appear and not collapse then you
- *   can escape it with `/\.`.
- *
- * @param {Object=} paramDefaults Default values for `url` parameters. These can be overridden in
- *   `actions` methods. If any of the parameter value is a function, it will be executed every time
- *   when a param value needs to be obtained for a request (unless the param was overridden).
- *
- *   Each key value in the parameter object is first bound to url template if present and then any
- *   excess keys are appended to the url search query after the `?`.
- *
- *   Given a template `/path/:verb` and parameter `{verb:'greet', salutation:'Hello'}` results in
- *   URL `/path/greet?salutation=Hello`.
- *
- *   If the parameter value is prefixed with `@` then the value of that parameter is extracted from
- *   the data object (useful for non-GET operations).
- *
- * @param {Object.<Object>=} actions Hash with declaration of custom action that should extend the
- *   default set of resource actions. The declaration should be created in the format of {@link
- *   ng.$http#usage_parameters $http.config}:
- *
- *       {action1: {method:?, params:?, isArray:?, headers:?, ...},
- *        action2: {method:?, params:?, isArray:?, headers:?, ...},
- *        ...}
- *
- *   Where:
- *
- *   - **`action`** – {string} – The name of action. This name becomes the name of the method on
- *     your resource object.
- *   - **`method`** – {string} – HTTP request method. Valid methods are: `GET`, `POST`, `PUT`,
- *     `DELETE`, and `JSONP`.
- *   - **`params`** – {Object=} – Optional set of pre-bound parameters for this action. If any of
- *     the parameter value is a function, it will be executed every time when a param value needs to
- *     be obtained for a request (unless the param was overridden).
- *   - **`url`** – {string} – action specific `url` override. The url templating is supported just
- *     like for the resource-level urls.
- *   - **`isArray`** – {boolean=} – If true then the returned object for this action is an array,
- *     see `returns` section.
- *   - **`transformRequest`** –
- *     `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
- *     transform function or an array of such functions. The transform function takes the http
- *     request body and headers and returns its transformed (typically serialized) version.
- *   - **`transformResponse`** –
- *     `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
- *     transform function or an array of such functions. The transform function takes the http
- *     response body and headers and returns its transformed (typically deserialized) version.
- *   - **`cache`** – `{boolean|Cache}` – If true, a default $http cache will be used to cache the
- *     GET request, otherwise if a cache instance built with
- *     {@link ng.$cacheFactory $cacheFactory}, this cache will be used for
- *     caching.
- *   - **`timeout`** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise} that
- *     should abort the request when resolved.
- *   - **`withCredentials`** - `{boolean}` - whether to set the `withCredentials` flag on the
- *     XHR object. See {@link https://developer.mozilla.org/en/http_access_control#section_5
+	var MEMBER_NAME_REGEX = /^(\.[a-zA-Z_$][0-9a-zA-Z_$]*)+$/;
+
+	function isValidDottedPath(path) {
+		return (path != null && path !== '' && path !== 'hasOwnProperty' &&
+			MEMBER_NAME_REGEX.test('.' + path));
+	}
+
+	function lookupDottedPath(obj, path) {
+		if (!isValidDottedPath(path)) {
+			throw $resourceMinErr('badmember', 'Dotted member path "@{0}" is invalid.', path);
+		}
+		var keys = path.split('.');
+		for (var i = 0, ii = keys.length; i < ii && obj !== undefined; i++) {
+			var key = keys[i];
+			obj = (obj !== null) ? obj[key] : undefined;
+		}
+		return obj;
+	}
+
+	/**
+	 * Create a shallow copy of an object and clear other fields from the destination
+	 */
+	function shallowClearAndCopy(src, dst) {
+		dst = dst || {};
+
+		angular.forEach(dst, function (value, key) {
+			delete dst[key];
+		});
+
+		for (var key in src) {
+			if (src.hasOwnProperty(key) && !(key.charAt(0) === '$' && key.charAt(1) === '$')) {
+				dst[key] = src[key];
+			}
+		}
+
+		return dst;
+	}
+
+	/**
+	 * @ngdoc overview
+	 * @name ngResource
+	 * @description
+	 *
+	 * # ngResource
+	 *
+	 * The `ngResource` module provides interaction support with RESTful services
+	 * via the $resource service.
+	 *
+	 * {@installModule resource}
+	 *
+	 * <div doc-module-components="ngResource"></div>
+	 *
+	 * See {@link ngResource.$resource `$resource`} for usage.
+	 */
+
+	/**
+	 * @ngdoc object
+	 * @name ngResource.$resource
+	 * @requires $http
+	 *
+	 * @description
+	 * A factory which creates a resource object that lets you interact with
+	 * [RESTful](http://en.wikipedia.org/wiki/Representational_State_Transfer) server-side data sources.
+	 *
+	 * The returned resource object has action methods which provide high-level behaviors without
+	 * the need to interact with the low level {@link ng.$http $http} service.
+	 *
+	 * Requires the {@link ngResource `ngResource`} module to be installed.
+	 *
+	 * @param {string} url A parametrized URL template with parameters prefixed by `:` as in
+	 *   `/user/:username`. If you are using a URL with a port number (e.g.
+	 *   `http://example.com:8080/api`), it will be respected.
+	 *
+	 *   If you are using a url with a suffix, just add the suffix, like this:
+	 *   `$resource('http://example.com/resource.json')` or `$resource('http://example.com/:id.json')`
+	 *   or even `$resource('http://example.com/resource/:resource_id.:format')`
+	 *   If the parameter before the suffix is empty, :resource_id in this case, then the `/.` will be
+	 *   collapsed down to a single `.`.  If you need this sequence to appear and not collapse then you
+	 *   can escape it with `/\.`.
+	 *
+	 * @param {Object=} paramDefaults Default values for `url` parameters. These can be overridden in
+	 *   `actions` methods. If any of the parameter value is a function, it will be executed every time
+	 *   when a param value needs to be obtained for a request (unless the param was overridden).
+	 *
+	 *   Each key value in the parameter object is first bound to url template if present and then any
+	 *   excess keys are appended to the url search query after the `?`.
+	 *
+	 *   Given a template `/path/:verb` and parameter `{verb:'greet', salutation:'Hello'}` results in
+	 *   URL `/path/greet?salutation=Hello`.
+	 *
+	 *   If the parameter value is prefixed with `@` then the value of that parameter is extracted from
+	 *   the data object (useful for non-GET operations).
+	 *
+	 * @param {Object.<Object>=} actions Hash with declaration of custom action that should extend the
+	 *   default set of resource actions. The declaration should be created in the format of {@link
+		*   ng.$http#usage_parameters $http.config}:
+	 *
+	 *       {action1: {method:?, params:?, isArray:?, headers:?, ...},
+	 *        action2: {method:?, params:?, isArray:?, headers:?, ...},
+	 *        ...}
+	 *
+	 *   Where:
+	 *
+	 *   - **`action`** – {string} – The name of action. This name becomes the name of the method on
+	 *     your resource object.
+	 *   - **`method`** – {string} – HTTP request method. Valid methods are: `GET`, `POST`, `PUT`,
+	 *     `DELETE`, and `JSONP`.
+	 *   - **`params`** – {Object=} – Optional set of pre-bound parameters for this action. If any of
+	 *     the parameter value is a function, it will be executed every time when a param value needs to
+	 *     be obtained for a request (unless the param was overridden).
+	 *   - **`url`** – {string} – action specific `url` override. The url templating is supported just
+	 *     like for the resource-level urls.
+	 *   - **`isArray`** – {boolean=} – If true then the returned object for this action is an array,
+	 *     see `returns` section.
+	 *   - **`transformRequest`** –
+	 *     `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
+	 *     transform function or an array of such functions. The transform function takes the http
+	 *     request body and headers and returns its transformed (typically serialized) version.
+	 *   - **`transformResponse`** –
+	 *     `{function(data, headersGetter)|Array.<function(data, headersGetter)>}` –
+	 *     transform function or an array of such functions. The transform function takes the http
+	 *     response body and headers and returns its transformed (typically deserialized) version.
+	 *   - **`cache`** – `{boolean|Cache}` – If true, a default $http cache will be used to cache the
+	 *     GET request, otherwise if a cache instance built with
+	 *     {@link ng.$cacheFactory $cacheFactory}, this cache will be used for
+	 *     caching.
+	 *   - **`timeout`** – `{number|Promise}` – timeout in milliseconds, or {@link ng.$q promise} that
+	 *     should abort the request when resolved.
+	 *   - **`withCredentials`** - `{boolean}` - whether to set the `withCredentials` flag on the
+	 *     XHR object. See {@link https://developer.mozilla.org/en/http_access_control#section_5
  *     requests with credentials} for more information.
- *   - **`responseType`** - `{string}` - see {@link
- *     https://developer.mozilla.org/en-US/docs/DOM/XMLHttpRequest#responseType requestType}.
- *   - **`interceptor`** - `{Object=}` - The interceptor object has two optional methods -
- *     `response` and `responseError`. Both `response` and `responseError` interceptors get called
- *     with `http response` object. See {@link ng.$http $http interceptors}.
- *
- * @returns {Object} A resource "class" object with methods for the default set of resource actions
- *   optionally extended with custom `actions`. The default set contains these actions:
- *
- *       { 'get':    {method:'GET'},
- *         'save':   {method:'POST'},
- *         'query':  {method:'GET', isArray:true},
- *         'remove': {method:'DELETE'},
- *         'delete': {method:'DELETE'} };
- *
- *   Calling these methods invoke an {@link ng.$http} with the specified http method,
- *   destination and parameters. When the data is returned from the server then the object is an
- *   instance of the resource class. The actions `save`, `remove` and `delete` are available on it
- *   as  methods with the `$` prefix. This allows you to easily perform CRUD operations (create,
- *   read, update, delete) on server-side data like this:
- *   <pre>
-        var User = $resource('/user/:userId', {userId:'@id'});
-        var user = User.get({userId:123}, function() {
+	 *   - **`responseType`** - `{string}` - see {@link
+		*     https://developer.mozilla.org/en-US/docs/DOM/XMLHttpRequest#responseType requestType}.
+	 *   - **`interceptor`** - `{Object=}` - The interceptor object has two optional methods -
+	 *     `response` and `responseError`. Both `response` and `responseError` interceptors get called
+	 *     with `http response` object. See {@link ng.$http $http interceptors}.
+	 *
+	 * @returns {Object} A resource "class" object with methods for the default set of resource actions
+	 *   optionally extended with custom `actions`. The default set contains these actions:
+	 *
+	 *       { 'get':    {method:'GET'},
+	 *         'save':   {method:'POST'},
+	 *         'query':  {method:'GET', isArray:true},
+	 *         'remove': {method:'DELETE'},
+	 *         'delete': {method:'DELETE'} };
+	 *
+	 *   Calling these methods invoke an {@link ng.$http} with the specified http method,
+	 *   destination and parameters. When the data is returned from the server then the object is an
+	 *   instance of the resource class. The actions `save`, `remove` and `delete` are available on it
+	 *   as  methods with the `$` prefix. This allows you to easily perform CRUD operations (create,
+	 *   read, update, delete) on server-side data like this:
+	 *   <pre>
+     var User = $resource('/user/:userId', {userId:'@id'});
+     var user = User.get({userId:123}, function() {
           user.abc = true;
           user.$save();
         });
      </pre>
- *
- *   It is important to realize that invoking a $resource object method immediately returns an
- *   empty reference (object or array depending on `isArray`). Once the data is returned from the
- *   server the existing reference is populated with the actual data. This is a useful trick since
- *   usually the resource is assigned to a model which is then rendered by the view. Having an empty
- *   object results in no rendering, once the data arrives from the server then the object is
- *   populated with the data and the view automatically re-renders itself showing the new data. This
- *   means that in most cases one never has to write a callback function for the action methods.
- *
- *   The action methods on the class object or instance object can be invoked with the following
- *   parameters:
- *
- *   - HTTP GET "class" actions: `Resource.action([parameters], [success], [error])`
- *   - non-GET "class" actions: `Resource.action([parameters], postData, [success], [error])`
- *   - non-GET instance actions:  `instance.$action([parameters], [success], [error])`
- *
- *   Success callback is called with (value, responseHeaders) arguments. Error callback is called
- *   with (httpResponse) argument.
- *
- *   Class actions return empty instance (with additional properties below).
- *   Instance actions return promise of the action.
- *
- *   The Resource instances and collection have these additional properties:
- *
- *   - `$promise`: the {@link ng.$q promise} of the original server interaction that created this
- *     instance or collection.
- *
- *     On success, the promise is resolved with the same resource instance or collection object,
- *     updated with data from server. This makes it easy to use in
- *     {@link ngRoute.$routeProvider resolve section of $routeProvider.when()} to defer view
- *     rendering until the resource(s) are loaded.
- *
- *     On failure, the promise is resolved with the {@link ng.$http http response} object, without
- *     the `resource` property.
- *
- *   - `$resolved`: `true` after first server interaction is completed (either with success or
- *      rejection), `false` before that. Knowing if the Resource has been resolved is useful in
- *      data-binding.
- *
- * @example
- *
- * # Credit card resource
- *
- * <pre>
+	 *
+	 *   It is important to realize that invoking a $resource object method immediately returns an
+	 *   empty reference (object or array depending on `isArray`). Once the data is returned from the
+	 *   server the existing reference is populated with the actual data. This is a useful trick since
+	 *   usually the resource is assigned to a model which is then rendered by the view. Having an empty
+	 *   object results in no rendering, once the data arrives from the server then the object is
+	 *   populated with the data and the view automatically re-renders itself showing the new data. This
+	 *   means that in most cases one never has to write a callback function for the action methods.
+	 *
+	 *   The action methods on the class object or instance object can be invoked with the following
+	 *   parameters:
+	 *
+	 *   - HTTP GET "class" actions: `Resource.action([parameters], [success], [error])`
+	 *   - non-GET "class" actions: `Resource.action([parameters], postData, [success], [error])`
+	 *   - non-GET instance actions:  `instance.$action([parameters], [success], [error])`
+	 *
+	 *   Success callback is called with (value, responseHeaders) arguments. Error callback is called
+	 *   with (httpResponse) argument.
+	 *
+	 *   Class actions return empty instance (with additional properties below).
+	 *   Instance actions return promise of the action.
+	 *
+	 *   The Resource instances and collection have these additional properties:
+	 *
+	 *   - `$promise`: the {@link ng.$q promise} of the original server interaction that created this
+	 *     instance or collection.
+	 *
+	 *     On success, the promise is resolved with the same resource instance or collection object,
+	 *     updated with data from server. This makes it easy to use in
+	 *     {@link ngRoute.$routeProvider resolve section of $routeProvider.when()} to defer view
+	 *     rendering until the resource(s) are loaded.
+	 *
+	 *     On failure, the promise is resolved with the {@link ng.$http http response} object, without
+	 *     the `resource` property.
+	 *
+	 *   - `$resolved`: `true` after first server interaction is completed (either with success or
+	 *      rejection), `false` before that. Knowing if the Resource has been resolved is useful in
+	 *      data-binding.
+	 *
+	 * @example
+	 *
+	 * # Credit card resource
+	 *
+	 * <pre>
      // Define CreditCard class
      var CreditCard = $resource('/user/:userId/card/:cardId',
-      {userId:123, cardId:'@id'}, {
+     {userId:123, cardId:'@id'}, {
        charge: {method:'POST', params:{charge:true}}
       });
 
@@ -244,30 +245,30 @@ function shallowClearAndCopy(src, dst) {
      // POST: /user/123/card {number:'0123', name:'Mike Smith'}
      // server returns: {id:789, number:'0123', name: 'Mike Smith'};
      expect(newCard.id).toEqual(789);
- * </pre>
- *
- * The object returned from this function execution is a resource "class" which has "static" method
- * for each action in the definition.
- *
- * Calling these methods invoke `$http` on the `url` template with the given `method`, `params` and
- * `headers`.
- * When the data is returned from the server then the object is an instance of the resource type and
- * all of the non-GET methods are available with `$` prefix. This allows you to easily support CRUD
- * operations (create, read, update, delete) on server-side data.
-
-   <pre>
+	 * </pre>
+	 *
+	 * The object returned from this function execution is a resource "class" which has "static" method
+	 * for each action in the definition.
+	 *
+	 * Calling these methods invoke `$http` on the `url` template with the given `method`, `params` and
+	 * `headers`.
+	 * When the data is returned from the server then the object is an instance of the resource type and
+	 * all of the non-GET methods are available with `$` prefix. This allows you to easily support CRUD
+	 * operations (create, read, update, delete) on server-side data.
+
+     <pre>
      var User = $resource('/user/:userId', {userId:'@id'});
      var user = User.get({userId:123}, function() {
        user.abc = true;
        user.$save();
      });
-   </pre>
- *
- * It's worth noting that the success callback for `get`, `query` and other methods gets passed
- * in the response that came from the server as well as $http header getter function, so one
- * could rewrite the above example and get access to http headers as:
- *
-   <pre>
+     </pre>
+	 *
+	 * It's worth noting that the success callback for `get`, `query` and other methods gets passed
+	 * in the response that came from the server as well as $http header getter function, so one
+	 * could rewrite the above example and get access to http headers as:
+	 *
+     <pre>
      var User = $resource('/user/:userId', {userId:'@id'});
      User.get({userId:123}, function(u, getResponseHeaders){
        u.abc = true;
@@ -276,321 +277,317 @@ function shallowClearAndCopy(src, dst) {
          //putResponseHeaders => $http header getter
        });
      });
-   </pre>
-
- * # Creating a custom 'PUT' request
- * In this example we create a custom method on our resource to make a PUT request
- * <pre>
- *		var app = angular.module('app', ['ngResource', 'ngRoute']);
- *
- *		// Some APIs expect a PUT request in the format URL/object/ID
- *		// Here we are creating an 'update' method 
- *		app.factory('Notes', ['$resource', function($resource) {
- *    return $resource('/notes/:id', null,
- *        {
- *            'update': { method:'PUT' }
- *        });
- *		}]);
- *
- *		// In our controller we get the ID from the URL using ngRoute and $routeParams
- *		// We pass in $routeParams and our Notes factory along with $scope
- *		app.controller('NotesCtrl', ['$scope', '$routeParams', 'Notes',
-                                      function($scope, $routeParams, Notes) {
- *    // First get a note object from the factory
- *    var note = Notes.get({ id:$routeParams.id });
- *    $id = note.id;
- *
- *    // Now call update passing in the ID first then the object you are updating
- *    Notes.update({ id:$id }, note);
- *
- *    // This will PUT /notes/ID with the note object in the request payload
- *		}]);
- * </pre>
- */
-angular.module('ngResource', ['ng']).
-  factory('$resource', ['$http', '$q', function($http, $q) {
-
-    var DEFAULT_ACTIONS = {
-      'get':    {method:'GET'},
-      'save':   {method:'POST'},
-      'query':  {method:'GET', isArray:true},
-      'remove': {method:'DELETE'},
-      'delete': {method:'DELETE'}
-    };
-    var noop = angular.noop,
-        forEach = angular.forEach,
-        extend = angular.extend,
-        copy = angular.copy,
-        isFunction = angular.isFunction;
-
-    /**
-     * We need our custom method because encodeURIComponent is too aggressive and doesn't follow
-     * http://www.ietf.org/rfc/rfc3986.txt with regards to the character set (pchar) allowed in path
-     * segments:
-     *    segment       = *pchar
-     *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
-     *    pct-encoded   = "%" HEXDIG HEXDIG
-     *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
-     *    sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
-     *                     / "*" / "+" / "," / ";" / "="
-     */
-    function encodeUriSegment(val) {
-      return encodeUriQuery(val, true).
-        replace(/%26/gi, '&').
-        replace(/%3D/gi, '=').
-        replace(/%2B/gi, '+');
-    }
-
-
-    /**
-     * This method is intended for encoding *key* or *value* parts of query component. We need a
-     * custom method because encodeURIComponent is too aggressive and encodes stuff that doesn't
-     * have to be encoded per http://tools.ietf.org/html/rfc3986:
-     *    query       = *( pchar / "/" / "?" )
-     *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
-     *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
-     *    pct-encoded   = "%" HEXDIG HEXDIG
-     *    sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
-     *                     / "*" / "+" / "," / ";" / "="
-     */
-    function encodeUriQuery(val, pctEncodeSpaces) {
-      return encodeURIComponent(val).
-        replace(/%40/gi, '@').
-        replace(/%3A/gi, ':').
-        replace(/%24/g, '$').
-        replace(/%2C/gi, ',').
-        replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
-    }
-
-    function Route(template, defaults) {
-      this.template = template;
-      this.defaults = defaults || {};
-      this.urlParams = {};
-    }
-
-    Route.prototype = {
-      setUrlParams: function(config, params, actionUrl) {
-        var self = this,
-            url = actionUrl || self.template,
-            val,
-            encodedVal;
-
-        var urlParams = self.urlParams = {};
-        forEach(url.split(/\W/), function(param){
-          if (param === 'hasOwnProperty') {
-            throw $resourceMinErr('badname', "hasOwnProperty is not a valid parameter name.");
-          }
-          if (!(new RegExp("^\\d+$").test(param)) && param &&
-               (new RegExp("(^|[^\\\\]):" + param + "(\\W|$)").test(url))) {
-            urlParams[param] = true;
-          }
-        });
-        url = url.replace(/\\:/g, ':');
-
-        params = params || {};
-        forEach(self.urlParams, function(_, urlParam){
-          val = params.hasOwnProperty(urlParam) ? params[urlParam] : self.defaults[urlParam];
-          if (angular.isDefined(val) && val !== null) {
-            encodedVal = encodeUriSegment(val);
-            url = url.replace(new RegExp(":" + urlParam + "(\\W|$)", "g"), function(match, p1) {
-              return encodedVal + p1;
-            });
-          } else {
-            url = url.replace(new RegExp("(\/?):" + urlParam + "(\\W|$)", "g"), function(match,
-                leadingSlashes, tail) {
-              if (tail.charAt(0) == '/') {
-                return tail;
-              } else {
-                return leadingSlashes + tail;
-              }
-            });
-          }
-        });
-
-        // strip trailing slashes and set the url
-        url = url.replace(/\/+$/, '') || '/';
-        // then replace collapse `/.` if found in the last URL path segment before the query
-        // E.g. `http://url.com/id./format?q=x` becomes `http://url.com/id.format?q=x`
-        url = url.replace(/\/\.(?=\w+($|\?))/, '.');
-        // replace escaped `/\.` with `/.`
-        config.url = url.replace(/\/\\\./, '/.');
-
-
-        // set params - delegate param encoding to $http
-        forEach(params, function(value, key){
-          if (!self.urlParams[key]) {
-            config.params = config.params || {};
-            config.params[key] = value;
-          }
-        });
-      }
-    };
-
-
-    function resourceFactory(url, paramDefaults, actions) {
-      var route = new Route(url);
-
-      actions = extend({}, DEFAULT_ACTIONS, actions);
-
-      function extractParams(data, actionParams){
-        var ids = {};
-        actionParams = extend({}, paramDefaults, actionParams);
-        forEach(actionParams, function(value, key){
-          if (isFunction(value)) { value = value(); }
-          ids[key] = value && value.charAt && value.charAt(0) == '@' ?
-            lookupDottedPath(data, value.substr(1)) : value;
-        });
-        return ids;
-      }
-
-      function defaultResponseInterceptor(response) {
-        return response.resource;
-      }
-
-      function Resource(value){
-        shallowClearAndCopy(value || {}, this);
-      }
-
-      forEach(actions, function(action, name) {
-        var hasBody = /^(POST|PUT|PATCH)$/i.test(action.method);
-
-        Resource[name] = function(a1, a2, a3, a4) {
-          var params = {}, data, success, error;
-
-          /* jshint -W086 */ /* (purposefully fall through case statements) */
-          switch(arguments.length) {
-          case 4:
-            error = a4;
-            success = a3;
-            //fallthrough
-          case 3:
-          case 2:
-            if (isFunction(a2)) {
-              if (isFunction(a1)) {
-                success = a1;
-                error = a2;
-                break;
-              }
-
-              success = a2;
-              error = a3;
-              //fallthrough
-            } else {
-              params = a1;
-              data = a2;
-              success = a3;
-              break;
-            }
-          case 1:
-            if (isFunction(a1)) success = a1;
-            else if (hasBody) data = a1;
-            else params = a1;
-            break;
-          case 0: break;
-          default:
-            throw $resourceMinErr('badargs',
-              "Expected up to 4 arguments [params, data, success, error], got {0} arguments",
-              arguments.length);
-          }
-          /* jshint +W086 */ /* (purposefully fall through case statements) */
-
-          var isInstanceCall = this instanceof Resource;
-          var value = isInstanceCall ? data : (action.isArray ? [] : new Resource(data));
-          var httpConfig = {};
-          var responseInterceptor = action.interceptor && action.interceptor.response ||
-                                    defaultResponseInterceptor;
-          var responseErrorInterceptor = action.interceptor && action.interceptor.responseError ||
-                                    undefined;
-
-          forEach(action, function(value, key) {
-            if (key != 'params' && key != 'isArray' && key != 'interceptor') {
-              httpConfig[key] = copy(value);
-            }
-          });
-
-          if (hasBody) httpConfig.data = data;
-          route.setUrlParams(httpConfig,
-                             extend({}, extractParams(data, action.params || {}), params),
-                             action.url);
-
-          var promise = $http(httpConfig).then(function(response) {
-            var data = response.data,
-                promise = value.$promise;
-
-            if (data) {
-              // Need to convert action.isArray to boolean in case it is undefined
-              // jshint -W018
-              if (angular.isArray(data) !== (!!action.isArray)) {
-                throw $resourceMinErr('badcfg', 'Error in resource configuration. Expected ' +
-                  'response to contain an {0} but got an {1}',
-                  action.isArray?'array':'object', angular.isArray(data)?'array':'object');
-              }
-              // jshint +W018
-              if (action.isArray) {
-                value.length = 0;
-                forEach(data, function(item) {
-                  value.push(new Resource(item));
-                });
-              } else {
-                shallowClearAndCopy(data, value);
-                value.$promise = promise;
-              }
-            }
-
-            value.$resolved = true;
-
-            response.resource = value;
-
-            return response;
-          }, function(response) {
-            value.$resolved = true;
-
-            (error||noop)(response);
-
-            return $q.reject(response);
-          });
-
-          promise = promise.then(
-              function(response) {
-                var value = responseInterceptor(response);
-                (success||noop)(value, response.headers);
-                return value;
-              },
-              responseErrorInterceptor);
-
-          if (!isInstanceCall) {
-            // we are creating instance / collection
-            // - set the initial promise
-            // - return the instance / collection
-            value.$promise = promise;
-            value.$resolved = false;
-
-            return value;
-          }
-
-          // instance call
-          return promise;
-        };
-
-
-        Resource.prototype['$' + name] = function(params, success, error) {
-          if (isFunction(params)) {
-            error = success; success = params; params = {};
-          }
-          var result = Resource[name].call(this, params, this, success, error);
-          return result.$promise || result;
-        };
-      });
-
-      Resource.bind = function(additionalParamDefaults){
-        return resourceFactory(url, extend({}, paramDefaults, additionalParamDefaults), actions);
-      };
-
-      return Resource;
-    }
+     </pre>
 
-    return resourceFactory;
-  }]);
+	 * # Creating a custom 'PUT' request
+	 * In this example we create a custom method on our resource to make a PUT request
+	 * <pre>
+	 *        var app = angular.module('app', ['ngResource', 'ngRoute']);
+	 *
+	 *        // Some APIs expect a PUT request in the format URL/object/ID
+	 *        // Here we are creating an 'update' method
+	 *        app.factory('Notes', ['$resource', function($resource) {
+	 *    return $resource('/notes/:id', null,
+	 *        {
+	 *            'update': { method:'PUT' }
+	 *        });
+	 *		}]);
+	 *
+	 *        // In our controller we get the ID from the URL using ngRoute and $routeParams
+	 *        // We pass in $routeParams and our Notes factory along with $scope
+	 *        app.controller('NotesCtrl', ['$scope', '$routeParams', 'Notes',
+     function($scope, $routeParams, Notes) {
+	 *    // First get a note object from the factory
+	 *    var note = Notes.get({ id:$routeParams.id });
+	 *    $id = note.id;
+	 *
+	 *    // Now call update passing in the ID first then the object you are updating
+	 *    Notes.update({ id:$id }, note);
+	 *
+	 *    // This will PUT /notes/ID with the note object in the request payload
+	 *		}]);
+	 * </pre>
+	 */
+	angular.module('ngResource', ['ng']).factory('$resource', ['$http', '$q', function ($http, $q) {
+
+		var DEFAULT_ACTIONS = {
+			'get': {method: 'GET'},
+			'save': {method: 'POST'},
+			'query': {method: 'GET', isArray: true},
+			'remove': {method: 'DELETE'},
+			'delete': {method: 'DELETE'}
+		};
+		var noop = angular.noop,
+			forEach = angular.forEach,
+			extend = angular.extend,
+			copy = angular.copy,
+			isFunction = angular.isFunction;
+
+		/**
+		 * We need our custom method because encodeURIComponent is too aggressive and doesn't follow
+		 * http://www.ietf.org/rfc/rfc3986.txt with regards to the character set (pchar) allowed in path
+		 * segments:
+		 *    segment       = *pchar
+		 *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
+		 *    pct-encoded   = "%" HEXDIG HEXDIG
+		 *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
+		 *    sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
+		 *                     / "*" / "+" / "," / ";" / "="
+		 */
+		function encodeUriSegment(val) {
+			return encodeUriQuery(val, true).replace(/%26/gi, '&').replace(/%3D/gi, '=').replace(/%2B/gi, '+');
+		}
+
+
+		/**
+		 * This method is intended for encoding *key* or *value* parts of query component. We need a
+		 * custom method because encodeURIComponent is too aggressive and encodes stuff that doesn't
+		 * have to be encoded per http://tools.ietf.org/html/rfc3986:
+		 *    query       = *( pchar / "/" / "?" )
+		 *    pchar         = unreserved / pct-encoded / sub-delims / ":" / "@"
+		 *    unreserved    = ALPHA / DIGIT / "-" / "." / "_" / "~"
+		 *    pct-encoded   = "%" HEXDIG HEXDIG
+		 *    sub-delims    = "!" / "$" / "&" / "'" / "(" / ")"
+		 *                     / "*" / "+" / "," / ";" / "="
+		 */
+		function encodeUriQuery(val, pctEncodeSpaces) {
+			return encodeURIComponent(val).replace(/%40/gi, '@').replace(/%3A/gi, ':').replace(/%24/g, '$').replace(/%2C/gi, ',').replace(/%20/g, (pctEncodeSpaces ? '%20' : '+'));
+		}
+
+		function Route(template, defaults) {
+			this.template = template;
+			this.defaults = defaults || {};
+			this.urlParams = {};
+		}
+
+		Route.prototype = {
+			setUrlParams: function (config, params, actionUrl) {
+				var self = this,
+					url = actionUrl || self.template,
+					val,
+					encodedVal;
+
+				var urlParams = self.urlParams = {};
+				forEach(url.split(/\W/), function (param) {
+					if (param === 'hasOwnProperty') {
+						throw $resourceMinErr('badname', "hasOwnProperty is not a valid parameter name.");
+					}
+					if (!(new RegExp("^\\d+$").test(param)) && param &&
+						(new RegExp("(^|[^\\\\]):" + param + "(\\W|$)").test(url))) {
+						urlParams[param] = true;
+					}
+				});
+				url = url.replace(/\\:/g, ':');
+
+				params = params || {};
+				forEach(self.urlParams, function (_, urlParam) {
+					val = params.hasOwnProperty(urlParam) ? params[urlParam] : self.defaults[urlParam];
+					if (angular.isDefined(val) && val !== null) {
+						encodedVal = encodeUriSegment(val);
+						url = url.replace(new RegExp(":" + urlParam + "(\\W|$)", "g"), function (match, p1) {
+							return encodedVal + p1;
+						});
+					} else {
+						url = url.replace(new RegExp("(\/?):" + urlParam + "(\\W|$)", "g"), function (match,
+																									  leadingSlashes, tail) {
+							if (tail.charAt(0) == '/') {
+								return tail;
+							} else {
+								return leadingSlashes + tail;
+							}
+						});
+					}
+				});
+
+				// strip trailing slashes and set the url
+				url = url.replace(/\/+$/, '') || '/';
+				// then replace collapse `/.` if found in the last URL path segment before the query
+				// E.g. `http://url.com/id./format?q=x` becomes `http://url.com/id.format?q=x`
+				url = url.replace(/\/\.(?=\w+($|\?))/, '.');
+				// replace escaped `/\.` with `/.`
+				config.url = url.replace(/\/\\\./, '/.');
+
+
+				// set params - delegate param encoding to $http
+				forEach(params, function (value, key) {
+					if (!self.urlParams[key]) {
+						config.params = config.params || {};
+						config.params[key] = value;
+					}
+				});
+			}
+		};
+
+
+		function resourceFactory(url, paramDefaults, actions) {
+			var route = new Route(url);
+
+			actions = extend({}, DEFAULT_ACTIONS, actions);
+
+			function extractParams(data, actionParams) {
+				var ids = {};
+				actionParams = extend({}, paramDefaults, actionParams);
+				forEach(actionParams, function (value, key) {
+					if (isFunction(value)) {
+						value = value();
+					}
+					ids[key] = value && value.charAt && value.charAt(0) == '@' ?
+						lookupDottedPath(data, value.substr(1)) : value;
+				});
+				return ids;
+			}
+
+			function defaultResponseInterceptor(response) {
+				return response.resource;
+			}
+
+			function Resource(value) {
+				shallowClearAndCopy(value || {}, this);
+			}
+
+			forEach(actions, function (action, name) {
+				var hasBody = /^(POST|PUT|PATCH)$/i.test(action.method);
+
+				Resource[name] = function (a1, a2, a3, a4) {
+					var params = {}, data, success, error;
+
+					/* jshint -W086 */ /* (purposefully fall through case statements) */
+					switch (arguments.length) {
+						case 4:
+							error = a4;
+							success = a3;
+						//fallthrough
+						case 3:
+						case 2:
+							if (isFunction(a2)) {
+								if (isFunction(a1)) {
+									success = a1;
+									error = a2;
+									break;
+								}
+
+								success = a2;
+								error = a3;
+								//fallthrough
+							} else {
+								params = a1;
+								data = a2;
+								success = a3;
+								break;
+							}
+						case 1:
+							if (isFunction(a1)) success = a1;
+							else if (hasBody) data = a1;
+							else params = a1;
+							break;
+						case 0:
+							break;
+						default:
+							throw $resourceMinErr('badargs',
+								"Expected up to 4 arguments [params, data, success, error], got {0} arguments",
+								arguments.length);
+					}
+					/* jshint +W086 */ /* (purposefully fall through case statements) */
+
+					var isInstanceCall = this instanceof Resource;
+					var value = isInstanceCall ? data : (action.isArray ? [] : new Resource(data));
+					var httpConfig = {};
+					var responseInterceptor = action.interceptor && action.interceptor.response ||
+						defaultResponseInterceptor;
+					var responseErrorInterceptor = action.interceptor && action.interceptor.responseError ||
+						undefined;
+
+					forEach(action, function (value, key) {
+						if (key != 'params' && key != 'isArray' && key != 'interceptor') {
+							httpConfig[key] = copy(value);
+						}
+					});
+
+					if (hasBody) httpConfig.data = data;
+					route.setUrlParams(httpConfig,
+						extend({}, extractParams(data, action.params || {}), params),
+						action.url);
+
+					var promise = $http(httpConfig).then(function (response) {
+						var data = response.data,
+							promise = value.$promise;
+
+						if (data) {
+							// Need to convert action.isArray to boolean in case it is undefined
+							// jshint -W018
+							if (angular.isArray(data) !== (!!action.isArray)) {
+								throw $resourceMinErr('badcfg', 'Error in resource configuration. Expected ' +
+									'response to contain an {0} but got an {1}',
+									action.isArray ? 'array' : 'object', angular.isArray(data) ? 'array' : 'object');
+							}
+							// jshint +W018
+							if (action.isArray) {
+								value.length = 0;
+								forEach(data, function (item) {
+									value.push(new Resource(item));
+								});
+							} else {
+								shallowClearAndCopy(data, value);
+								value.$promise = promise;
+							}
+						}
+
+						value.$resolved = true;
+
+						response.resource = value;
+
+						return response;
+					}, function (response) {
+						value.$resolved = true;
+
+						(error || noop)(response);
+
+						return $q.reject(response);
+					});
+
+					promise = promise.then(
+						function (response) {
+							var value = responseInterceptor(response);
+							(success || noop)(value, response.headers);
+							return value;
+						},
+						responseErrorInterceptor);
+
+					if (!isInstanceCall) {
+						// we are creating instance / collection
+						// - set the initial promise
+						// - return the instance / collection
+						value.$promise = promise;
+						value.$resolved = false;
+
+						return value;
+					}
+
+					// instance call
+					return promise;
+				};
+
+
+				Resource.prototype['$' + name] = function (params, success, error) {
+					if (isFunction(params)) {
+						error = success;
+						success = params;
+						params = {};
+					}
+					var result = Resource[name].call(this, params, this, success, error);
+					return result.$promise || result;
+				};
+			});
+
+			Resource.bind = function (additionalParamDefaults) {
+				return resourceFactory(url, extend({}, paramDefaults, additionalParamDefaults), actions);
+			};
+
+			return Resource;
+		}
+
+		return resourceFactory;
+	}]);
 
 
 })(window, window.angular);
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/angular-route_1.2.13/angular-route.js b/len-activiti/src/main/resources/static/editor-app/libs/angular-route_1.2.13/angular-route.js
index 9bb5af1..8788ef3 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/angular-route_1.2.13/angular-route.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/angular-route_1.2.13/angular-route.js
@@ -3,315 +3,316 @@
  * (c) 2010-2014 Google, Inc. http://angularjs.org
  * License: MIT
  */
-(function(window, angular, undefined) {'use strict';
-
-/**
- * @ngdoc overview
- * @name ngRoute
- * @description
- *
- * # ngRoute
- *
- * The `ngRoute` module provides routing and deeplinking services and directives for angular apps.
- *
- * ## Example
- * See {@link ngRoute.$route#example $route} for an example of configuring and using `ngRoute`.
- * 
- * {@installModule route}
- *
- * <div doc-module-components="ngRoute"></div>
- */
- /* global -ngRouteModule */
-var ngRouteModule = angular.module('ngRoute', ['ng']).
-                        provider('$route', $RouteProvider);
-
-/**
- * @ngdoc object
- * @name ngRoute.$routeProvider
- * @function
- *
- * @description
- *
- * Used for configuring routes.
- * 
- * ## Example
- * See {@link ngRoute.$route#example $route} for an example of configuring and using `ngRoute`.
- *
- * ## Dependencies
- * Requires the {@link ngRoute `ngRoute`} module to be installed.
- */
-function $RouteProvider(){
-  function inherit(parent, extra) {
-    return angular.extend(new (angular.extend(function() {}, {prototype:parent}))(), extra);
-  }
-
-  var routes = {};
-
-  /**
-   * @ngdoc method
-   * @name ngRoute.$routeProvider#when
-   * @methodOf ngRoute.$routeProvider
-   *
-   * @param {string} path Route path (matched against `$location.path`). If `$location.path`
-   *    contains redundant trailing slash or is missing one, the route will still match and the
-   *    `$location.path` will be updated to add or drop the trailing slash to exactly match the
-   *    route definition.
-   *
-   *      * `path` can contain named groups starting with a colon: e.g. `:name`. All characters up
-   *        to the next slash are matched and stored in `$routeParams` under the given `name`
-   *        when the route matches.
-   *      * `path` can contain named groups starting with a colon and ending with a star:
-   *        e.g.`:name*`. All characters are eagerly stored in `$routeParams` under the given `name`
-   *        when the route matches.
-   *      * `path` can contain optional named groups with a question mark: e.g.`:name?`.
-   *
-   *    For example, routes like `/color/:color/largecode/:largecode*\/edit` will match
-   *    `/color/brown/largecode/code/with/slashs/edit` and extract:
-   *
-   *      * `color: brown`
-   *      * `largecode: code/with/slashs`.
-   *
-   *
-   * @param {Object} route Mapping information to be assigned to `$route.current` on route
-   *    match.
-   *
-   *    Object properties:
-   *
-   *    - `controller` – `{(string|function()=}` – Controller fn that should be associated with
-   *      newly created scope or the name of a {@link angular.Module#controller registered
+(function (window, angular, undefined) {
+	'use strict';
+
+	/**
+	 * @ngdoc overview
+	 * @name ngRoute
+	 * @description
+	 *
+	 * # ngRoute
+	 *
+	 * The `ngRoute` module provides routing and deeplinking services and directives for angular apps.
+	 *
+	 * ## Example
+	 * See {@link ngRoute.$route#example $route} for an example of configuring and using `ngRoute`.
+	 *
+	 * {@installModule route}
+	 *
+	 * <div doc-module-components="ngRoute"></div>
+	 */
+	/* global -ngRouteModule */
+	var ngRouteModule = angular.module('ngRoute', ['ng']).provider('$route', $RouteProvider);
+
+	/**
+	 * @ngdoc object
+	 * @name ngRoute.$routeProvider
+	 * @function
+	 *
+	 * @description
+	 *
+	 * Used for configuring routes.
+	 *
+	 * ## Example
+	 * See {@link ngRoute.$route#example $route} for an example of configuring and using `ngRoute`.
+	 *
+	 * ## Dependencies
+	 * Requires the {@link ngRoute `ngRoute`} module to be installed.
+	 */
+	function $RouteProvider() {
+		function inherit(parent, extra) {
+			return angular.extend(new (angular.extend(function () {
+			}, {prototype: parent}))(), extra);
+		}
+
+		var routes = {};
+
+		/**
+		 * @ngdoc method
+		 * @name ngRoute.$routeProvider#when
+		 * @methodOf ngRoute.$routeProvider
+		 *
+		 * @param {string} path Route path (matched against `$location.path`). If `$location.path`
+		 *    contains redundant trailing slash or is missing one, the route will still match and the
+		 *    `$location.path` will be updated to add or drop the trailing slash to exactly match the
+		 *    route definition.
+		 *
+		 *      * `path` can contain named groups starting with a colon: e.g. `:name`. All characters up
+		 *        to the next slash are matched and stored in `$routeParams` under the given `name`
+		 *        when the route matches.
+		 *      * `path` can contain named groups starting with a colon and ending with a star:
+		 *        e.g.`:name*`. All characters are eagerly stored in `$routeParams` under the given `name`
+		 *        when the route matches.
+		 *      * `path` can contain optional named groups with a question mark: e.g.`:name?`.
+		 *
+		 *    For example, routes like `/color/:color/largecode/:largecode*\/edit` will match
+		 *    `/color/brown/largecode/code/with/slashs/edit` and extract:
+		 *
+		 *      * `color: brown`
+		 *      * `largecode: code/with/slashs`.
+		 *
+		 *
+		 * @param {Object} route Mapping information to be assigned to `$route.current` on route
+		 *    match.
+		 *
+		 *    Object properties:
+		 *
+		 *    - `controller` – `{(string|function()=}` – Controller fn that should be associated with
+		 *      newly created scope or the name of a {@link angular.Module#controller registered
    *      controller} if passed as a string.
-   *    - `controllerAs` – `{string=}` – A controller alias name. If present the controller will be
-   *      published to scope under the `controllerAs` name.
-   *    - `template` – `{string=|function()=}` – html template as a string or a function that
-   *      returns an html template as a string which should be used by {@link
-   *      ngRoute.directive:ngView ngView} or {@link ng.directive:ngInclude ngInclude} directives.
-   *      This property takes precedence over `templateUrl`.
-   *
-   *      If `template` is a function, it will be called with the following parameters:
-   *
-   *      - `{Array.<Object>}` - route parameters extracted from the current
-   *        `$location.path()` by applying the current route
-   *
-   *    - `templateUrl` – `{string=|function()=}` – path or function that returns a path to an html
-   *      template that should be used by {@link ngRoute.directive:ngView ngView}.
-   *
-   *      If `templateUrl` is a function, it will be called with the following parameters:
-   *
-   *      - `{Array.<Object>}` - route parameters extracted from the current
-   *        `$location.path()` by applying the current route
-   *
-   *    - `resolve` - `{Object.<string, function>=}` - An optional map of dependencies which should
-   *      be injected into the controller. If any of these dependencies are promises, the router
-   *      will wait for them all to be resolved or one to be rejected before the controller is
-   *      instantiated.
-   *      If all the promises are resolved successfully, the values of the resolved promises are
-   *      injected and {@link ngRoute.$route#$routeChangeSuccess $routeChangeSuccess} event is
-   *      fired. If any of the promises are rejected the
-   *      {@link ngRoute.$route#$routeChangeError $routeChangeError} event is fired. The map object
-   *      is:
-   *
-   *      - `key` – `{string}`: a name of a dependency to be injected into the controller.
-   *      - `factory` - `{string|function}`: If `string` then it is an alias for a service.
-   *        Otherwise if function, then it is {@link api/AUTO.$injector#invoke injected}
-   *        and the return value is treated as the dependency. If the result is a promise, it is
-   *        resolved before its value is injected into the controller. Be aware that
-   *        `ngRoute.$routeParams` will still refer to the previous route within these resolve
-   *        functions.  Use `$route.current.params` to access the new route parameters, instead.
-   *
-   *    - `redirectTo` – {(string|function())=} – value to update
-   *      {@link ng.$location $location} path with and trigger route redirection.
-   *
-   *      If `redirectTo` is a function, it will be called with the following parameters:
-   *
-   *      - `{Object.<string>}` - route parameters extracted from the current
-   *        `$location.path()` by applying the current route templateUrl.
-   *      - `{string}` - current `$location.path()`
-   *      - `{Object}` - current `$location.search()`
-   *
-   *      The custom `redirectTo` function is expected to return a string which will be used
-   *      to update `$location.path()` and `$location.search()`.
-   *
-   *    - `[reloadOnSearch=true]` - {boolean=} - reload route when only `$location.search()`
-   *      or `$location.hash()` changes.
-   *
-   *      If the option is set to `false` and url in the browser changes, then
-   *      `$routeUpdate` event is broadcasted on the root scope.
-   *
-   *    - `[caseInsensitiveMatch=false]` - {boolean=} - match routes without being case sensitive
-   *
-   *      If the option is set to `true`, then the particular route can be matched without being
-   *      case sensitive
-   *
-   * @returns {Object} self
-   *
-   * @description
-   * Adds a new route definition to the `$route` service.
-   */
-  this.when = function(path, route) {
-    routes[path] = angular.extend(
-      {reloadOnSearch: true},
-      route,
-      path && pathRegExp(path, route)
-    );
-
-    // create redirection for trailing slashes
-    if (path) {
-      var redirectPath = (path[path.length-1] == '/')
-            ? path.substr(0, path.length-1)
-            : path +'/';
-
-      routes[redirectPath] = angular.extend(
-        {redirectTo: path},
-        pathRegExp(redirectPath, route)
-      );
-    }
-
-    return this;
-  };
-
-   /**
-    * @param path {string} path
-    * @param opts {Object} options
-    * @return {?Object}
-    *
-    * @description
-    * Normalizes the given path, returning a regular expression
-    * and the original path.
-    *
-    * Inspired by pathRexp in visionmedia/express/lib/utils.js.
-    */
-  function pathRegExp(path, opts) {
-    var insensitive = opts.caseInsensitiveMatch,
-        ret = {
-          originalPath: path,
-          regexp: path
-        },
-        keys = ret.keys = [];
-
-    path = path
-      .replace(/([().])/g, '\\$1')
-      .replace(/(\/)?:(\w+)([\?\*])?/g, function(_, slash, key, option){
-        var optional = option === '?' ? option : null;
-        var star = option === '*' ? option : null;
-        keys.push({ name: key, optional: !!optional });
-        slash = slash || '';
-        return ''
-          + (optional ? '' : slash)
-          + '(?:'
-          + (optional ? slash : '')
-          + (star && '(.+?)' || '([^/]+)')
-          + (optional || '')
-          + ')'
-          + (optional || '');
-      })
-      .replace(/([\/$\*])/g, '\\$1');
-
-    ret.regexp = new RegExp('^' + path + '$', insensitive ? 'i' : '');
-    return ret;
-  }
-
-  /**
-   * @ngdoc method
-   * @name ngRoute.$routeProvider#otherwise
-   * @methodOf ngRoute.$routeProvider
-   *
-   * @description
-   * Sets route definition that will be used on route change when no other route definition
-   * is matched.
-   *
-   * @param {Object} params Mapping information to be assigned to `$route.current`.
-   * @returns {Object} self
-   */
-  this.otherwise = function(params) {
-    this.when(null, params);
-    return this;
-  };
-
-
-  this.$get = ['$rootScope',
-               '$location',
-               '$routeParams',
-               '$q',
-               '$injector',
-               '$http',
-               '$templateCache',
-               '$sce',
-      function($rootScope, $location, $routeParams, $q, $injector, $http, $templateCache, $sce) {
-
-    /**
-     * @ngdoc object
-     * @name ngRoute.$route
-     * @requires $location
-     * @requires $routeParams
-     *
-     * @property {Object} current Reference to the current route definition.
-     * The route definition contains:
-     *
-     *   - `controller`: The controller constructor as define in route definition.
-     *   - `locals`: A map of locals which is used by {@link ng.$controller $controller} service for
-     *     controller instantiation. The `locals` contain
-     *     the resolved values of the `resolve` map. Additionally the `locals` also contain:
-     *
-     *     - `$scope` - The current route scope.
-     *     - `$template` - The current route template HTML.
-     *
-     * @property {Array.<Object>} routes Array of all configured routes.
-     *
-     * @description
-     * `$route` is used for deep-linking URLs to controllers and views (HTML partials).
-     * It watches `$location.url()` and tries to map the path to an existing route definition.
-     *
-     * Requires the {@link ngRoute `ngRoute`} module to be installed.
-     *
-     * You can define routes through {@link ngRoute.$routeProvider $routeProvider}'s API.
-     *
-     * The `$route` service is typically used in conjunction with the
-     * {@link ngRoute.directive:ngView `ngView`} directive and the
-     * {@link ngRoute.$routeParams `$routeParams`} service.
-     *
-     * @example
-       This example shows how changing the URL hash causes the `$route` to match a route against the
-       URL, and the `ngView` pulls in the partial.
-
-       Note that this example is using {@link ng.directive:script inlined templates}
-       to get it working on jsfiddle as well.
-
-     <example module="ngViewExample" deps="angular-route.js">
-       <file name="index.html">
-         <div ng-controller="MainCntl">
-           Choose:
-           <a href="Book/Moby">Moby</a> |
-           <a href="Book/Moby/ch/1">Moby: Ch1</a> |
-           <a href="Book/Gatsby">Gatsby</a> |
-           <a href="Book/Gatsby/ch/4?key=value">Gatsby: Ch4</a> |
-           <a href="Book/Scarlet">Scarlet Letter</a><br/>
-
-           <div ng-view></div>
-           <hr />
-
-           <pre>$location.path() = {{$location.path()}}</pre>
-           <pre>$route.current.templateUrl = {{$route.current.templateUrl}}</pre>
-           <pre>$route.current.params = {{$route.current.params}}</pre>
-           <pre>$route.current.scope.name = {{$route.current.scope.name}}</pre>
-           <pre>$routeParams = {{$routeParams}}</pre>
-         </div>
-       </file>
-
-       <file name="book.html">
-         controller: {{name}}<br />
-         Book Id: {{params.bookId}}<br />
-       </file>
-
-       <file name="chapter.html">
-         controller: {{name}}<br />
-         Book Id: {{params.bookId}}<br />
-         Chapter Id: {{params.chapterId}}
-       </file>
-
-       <file name="script.js">
-         angular.module('ngViewExample', ['ngRoute'])
-
-         .config(function($routeProvider, $locationProvider) {
+		 *    - `controllerAs` – `{string=}` – A controller alias name. If present the controller will be
+		 *      published to scope under the `controllerAs` name.
+		 *    - `template` – `{string=|function()=}` – html template as a string or a function that
+		 *      returns an html template as a string which should be used by {@link
+			*      ngRoute.directive:ngView ngView} or {@link ng.directive:ngInclude ngInclude} directives.
+		 *      This property takes precedence over `templateUrl`.
+		 *
+		 *      If `template` is a function, it will be called with the following parameters:
+		 *
+		 *      - `{Array.<Object>}` - route parameters extracted from the current
+		 *        `$location.path()` by applying the current route
+		 *
+		 *    - `templateUrl` – `{string=|function()=}` – path or function that returns a path to an html
+		 *      template that should be used by {@link ngRoute.directive:ngView ngView}.
+		 *
+		 *      If `templateUrl` is a function, it will be called with the following parameters:
+		 *
+		 *      - `{Array.<Object>}` - route parameters extracted from the current
+		 *        `$location.path()` by applying the current route
+		 *
+		 *    - `resolve` - `{Object.<string, function>=}` - An optional map of dependencies which should
+		 *      be injected into the controller. If any of these dependencies are promises, the router
+		 *      will wait for them all to be resolved or one to be rejected before the controller is
+		 *      instantiated.
+		 *      If all the promises are resolved successfully, the values of the resolved promises are
+		 *      injected and {@link ngRoute.$route#$routeChangeSuccess $routeChangeSuccess} event is
+		 *      fired. If any of the promises are rejected the
+		 *      {@link ngRoute.$route#$routeChangeError $routeChangeError} event is fired. The map object
+		 *      is:
+		 *
+		 *      - `key` – `{string}`: a name of a dependency to be injected into the controller.
+		 *      - `factory` - `{string|function}`: If `string` then it is an alias for a service.
+		 *        Otherwise if function, then it is {@link api/AUTO.$injector#invoke injected}
+		 *        and the return value is treated as the dependency. If the result is a promise, it is
+		 *        resolved before its value is injected into the controller. Be aware that
+		 *        `ngRoute.$routeParams` will still refer to the previous route within these resolve
+		 *        functions.  Use `$route.current.params` to access the new route parameters, instead.
+		 *
+		 *    - `redirectTo` – {(string|function())=} – value to update
+		 *      {@link ng.$location $location} path with and trigger route redirection.
+		 *
+		 *      If `redirectTo` is a function, it will be called with the following parameters:
+		 *
+		 *      - `{Object.<string>}` - route parameters extracted from the current
+		 *        `$location.path()` by applying the current route templateUrl.
+		 *      - `{string}` - current `$location.path()`
+		 *      - `{Object}` - current `$location.search()`
+		 *
+		 *      The custom `redirectTo` function is expected to return a string which will be used
+		 *      to update `$location.path()` and `$location.search()`.
+		 *
+		 *    - `[reloadOnSearch=true]` - {boolean=} - reload route when only `$location.search()`
+		 *      or `$location.hash()` changes.
+		 *
+		 *      If the option is set to `false` and url in the browser changes, then
+		 *      `$routeUpdate` event is broadcasted on the root scope.
+		 *
+		 *    - `[caseInsensitiveMatch=false]` - {boolean=} - match routes without being case sensitive
+		 *
+		 *      If the option is set to `true`, then the particular route can be matched without being
+		 *      case sensitive
+		 *
+		 * @returns {Object} self
+		 *
+		 * @description
+		 * Adds a new route definition to the `$route` service.
+		 */
+		this.when = function (path, route) {
+			routes[path] = angular.extend(
+				{reloadOnSearch: true},
+				route,
+				path && pathRegExp(path, route)
+			);
+
+			// create redirection for trailing slashes
+			if (path) {
+				var redirectPath = (path[path.length - 1] == '/')
+					? path.substr(0, path.length - 1)
+					: path + '/';
+
+				routes[redirectPath] = angular.extend(
+					{redirectTo: path},
+					pathRegExp(redirectPath, route)
+				);
+			}
+
+			return this;
+		};
+
+		/**
+		 * @param path {string} path
+		 * @param opts {Object} options
+		 * @return {?Object}
+		 *
+		 * @description
+		 * Normalizes the given path, returning a regular expression
+		 * and the original path.
+		 *
+		 * Inspired by pathRexp in visionmedia/express/lib/utils.js.
+		 */
+		function pathRegExp(path, opts) {
+			var insensitive = opts.caseInsensitiveMatch,
+				ret = {
+					originalPath: path,
+					regexp: path
+				},
+				keys = ret.keys = [];
+
+			path = path
+				.replace(/([().])/g, '\\$1')
+				.replace(/(\/)?:(\w+)([\?\*])?/g, function (_, slash, key, option) {
+					var optional = option === '?' ? option : null;
+					var star = option === '*' ? option : null;
+					keys.push({name: key, optional: !!optional});
+					slash = slash || '';
+					return ''
+						+ (optional ? '' : slash)
+						+ '(?:'
+						+ (optional ? slash : '')
+						+ (star && '(.+?)' || '([^/]+)')
+						+ (optional || '')
+						+ ')'
+						+ (optional || '');
+				})
+				.replace(/([\/$\*])/g, '\\$1');
+
+			ret.regexp = new RegExp('^' + path + '$', insensitive ? 'i' : '');
+			return ret;
+		}
+
+		/**
+		 * @ngdoc method
+		 * @name ngRoute.$routeProvider#otherwise
+		 * @methodOf ngRoute.$routeProvider
+		 *
+		 * @description
+		 * Sets route definition that will be used on route change when no other route definition
+		 * is matched.
+		 *
+		 * @param {Object} params Mapping information to be assigned to `$route.current`.
+		 * @returns {Object} self
+		 */
+		this.otherwise = function (params) {
+			this.when(null, params);
+			return this;
+		};
+
+
+		this.$get = ['$rootScope',
+			'$location',
+			'$routeParams',
+			'$q',
+			'$injector',
+			'$http',
+			'$templateCache',
+			'$sce',
+			function ($rootScope, $location, $routeParams, $q, $injector, $http, $templateCache, $sce) {
+
+				/**
+				 * @ngdoc object
+				 * @name ngRoute.$route
+				 * @requires $location
+				 * @requires $routeParams
+				 *
+				 * @property {Object} current Reference to the current route definition.
+				 * The route definition contains:
+				 *
+				 *   - `controller`: The controller constructor as define in route definition.
+				 *   - `locals`: A map of locals which is used by {@link ng.$controller $controller} service for
+				 *     controller instantiation. The `locals` contain
+				 *     the resolved values of the `resolve` map. Additionally the `locals` also contain:
+				 *
+				 *     - `$scope` - The current route scope.
+				 *     - `$template` - The current route template HTML.
+				 *
+				 * @property {Array.<Object>} routes Array of all configured routes.
+				 *
+				 * @description
+				 * `$route` is used for deep-linking URLs to controllers and views (HTML partials).
+				 * It watches `$location.url()` and tries to map the path to an existing route definition.
+				 *
+				 * Requires the {@link ngRoute `ngRoute`} module to be installed.
+				 *
+				 * You can define routes through {@link ngRoute.$routeProvider $routeProvider}'s API.
+				 *
+				 * The `$route` service is typically used in conjunction with the
+				 * {@link ngRoute.directive:ngView `ngView`} directive and the
+				 * {@link ngRoute.$routeParams `$routeParams`} service.
+				 *
+				 * @example
+                 This example shows how changing the URL hash causes the `$route` to match a route against the
+                 URL, and the `ngView` pulls in the partial.
+
+                 Note that this example is using {@link ng.directive:script inlined templates}
+                 to get it working on jsfiddle as well.
+
+                 <example module="ngViewExample" deps="angular-route.js">
+                 <file name="index.html">
+                 <div ng-controller="MainCntl">
+                 Choose:
+                 <a href="Book/Moby">Moby</a> |
+                 <a href="Book/Moby/ch/1">Moby: Ch1</a> |
+                 <a href="Book/Gatsby">Gatsby</a> |
+                 <a href="Book/Gatsby/ch/4?key=value">Gatsby: Ch4</a> |
+                 <a href="Book/Scarlet">Scarlet Letter</a><br/>
+
+                 <div ng-view></div>
+                 <hr />
+
+                 <pre>$location.path() = {{$location.path()}}</pre>
+                 <pre>$route.current.templateUrl = {{$route.current.templateUrl}}</pre>
+                 <pre>$route.current.params = {{$route.current.params}}</pre>
+                 <pre>$route.current.scope.name = {{$route.current.scope.name}}</pre>
+                 <pre>$routeParams = {{$routeParams}}</pre>
+                 </div>
+                 </file>
+
+                 <file name="book.html">
+                 controller: {{name}}<br />
+                 Book Id: {{params.bookId}}<br />
+                 </file>
+
+                 <file name="chapter.html">
+                 controller: {{name}}<br />
+                 Book Id: {{params.bookId}}<br />
+                 Chapter Id: {{params.chapterId}}
+                 </file>
+
+                 <file name="script.js">
+                 angular.module('ngViewExample', ['ngRoute'])
+
+                 .config(function($routeProvider, $locationProvider) {
            $routeProvider.when('/Book/:bookId', {
              templateUrl: 'book.html',
              controller: BookCntl,
@@ -333,25 +334,25 @@ function $RouteProvider(){
            $locationProvider.html5Mode(true);
          });
 
-         function MainCntl($scope, $route, $routeParams, $location) {
+                 function MainCntl($scope, $route, $routeParams, $location) {
            $scope.$route = $route;
            $scope.$location = $location;
            $scope.$routeParams = $routeParams;
          }
 
-         function BookCntl($scope, $routeParams) {
+                 function BookCntl($scope, $routeParams) {
            $scope.name = "BookCntl";
            $scope.params = $routeParams;
          }
 
-         function ChapterCntl($scope, $routeParams) {
+                 function ChapterCntl($scope, $routeParams) {
            $scope.name = "ChapterCntl";
            $scope.params = $routeParams;
          }
-       </file>
+                 </file>
 
-       <file name="protractorTest.js">
-         it('should load and compile correct template', function() {
+                 <file name="protractorTest.js">
+                 it('should load and compile correct template', function() {
            element(by.linkText('Moby: Ch1')).click();
            var content = element(by.css('.doc-example-live [ng-view]')).getText();
            expect(content).toMatch(/controller\: ChapterCntl/);
@@ -364,361 +365,364 @@ function $RouteProvider(){
            expect(content).toMatch(/controller\: BookCntl/);
            expect(content).toMatch(/Book Id\: Scarlet/);
          });
-       </file>
-     </example>
-     */
-
-    /**
-     * @ngdoc event
-     * @name ngRoute.$route#$routeChangeStart
-     * @eventOf ngRoute.$route
-     * @eventType broadcast on root scope
-     * @description
-     * Broadcasted before a route change. At this  point the route services starts
-     * resolving all of the dependencies needed for the route change to occur.
-     * Typically this involves fetching the view template as well as any dependencies
-     * defined in `resolve` route property. Once  all of the dependencies are resolved
-     * `$routeChangeSuccess` is fired.
-     *
-     * @param {Object} angularEvent Synthetic event object.
-     * @param {Route} next Future route information.
-     * @param {Route} current Current route information.
-     */
-
-    /**
-     * @ngdoc event
-     * @name ngRoute.$route#$routeChangeSuccess
-     * @eventOf ngRoute.$route
-     * @eventType broadcast on root scope
-     * @description
-     * Broadcasted after a route dependencies are resolved.
-     * {@link ngRoute.directive:ngView ngView} listens for the directive
-     * to instantiate the controller and render the view.
-     *
-     * @param {Object} angularEvent Synthetic event object.
-     * @param {Route} current Current route information.
-     * @param {Route|Undefined} previous Previous route information, or undefined if current is
-     * first route entered.
-     */
-
-    /**
-     * @ngdoc event
-     * @name ngRoute.$route#$routeChangeError
-     * @eventOf ngRoute.$route
-     * @eventType broadcast on root scope
-     * @description
-     * Broadcasted if any of the resolve promises are rejected.
-     *
-     * @param {Object} angularEvent Synthetic event object
-     * @param {Route} current Current route information.
-     * @param {Route} previous Previous route information.
-     * @param {Route} rejection Rejection of the promise. Usually the error of the failed promise.
-     */
-
-    /**
-     * @ngdoc event
-     * @name ngRoute.$route#$routeUpdate
-     * @eventOf ngRoute.$route
-     * @eventType broadcast on root scope
-     * @description
-     *
-     * The `reloadOnSearch` property has been set to false, and we are reusing the same
-     * instance of the Controller.
-     */
-
-    var forceReload = false,
-        $route = {
-          routes: routes,
-
-          /**
-           * @ngdoc method
-           * @name ngRoute.$route#reload
-           * @methodOf ngRoute.$route
-           *
-           * @description
-           * Causes `$route` service to reload the current route even if
-           * {@link ng.$location $location} hasn't changed.
-           *
-           * As a result of that, {@link ngRoute.directive:ngView ngView}
-           * creates new scope, reinstantiates the controller.
-           */
-          reload: function() {
-            forceReload = true;
-            $rootScope.$evalAsync(updateRoute);
-          }
-        };
-
-    $rootScope.$on('$locationChangeSuccess', updateRoute);
-
-    return $route;
-
-    /////////////////////////////////////////////////////
-
-    /**
-     * @param on {string} current url
-     * @param route {Object} route regexp to match the url against
-     * @return {?Object}
-     *
-     * @description
-     * Check if the route matches the current url.
-     *
-     * Inspired by match in
-     * visionmedia/express/lib/router/router.js.
-     */
-    function switchRouteMatcher(on, route) {
-      var keys = route.keys,
-          params = {};
-
-      if (!route.regexp) return null;
-
-      var m = route.regexp.exec(on);
-      if (!m) return null;
-
-      for (var i = 1, len = m.length; i < len; ++i) {
-        var key = keys[i - 1];
-
-        var val = 'string' == typeof m[i]
-              ? decodeURIComponent(m[i])
-              : m[i];
-
-        if (key && val) {
-          params[key.name] = val;
-        }
-      }
-      return params;
-    }
-
-    function updateRoute() {
-      var next = parseRoute(),
-          last = $route.current;
-
-      if (next && last && next.$$route === last.$$route
-          && angular.equals(next.pathParams, last.pathParams)
-          && !next.reloadOnSearch && !forceReload) {
-        last.params = next.params;
-        angular.copy(last.params, $routeParams);
-        $rootScope.$broadcast('$routeUpdate', last);
-      } else if (next || last) {
-        forceReload = false;
-        $rootScope.$broadcast('$routeChangeStart', next, last);
-        $route.current = next;
-        if (next) {
-          if (next.redirectTo) {
-            if (angular.isString(next.redirectTo)) {
-              $location.path(interpolate(next.redirectTo, next.params)).search(next.params)
-                       .replace();
-            } else {
-              $location.url(next.redirectTo(next.pathParams, $location.path(), $location.search()))
-                       .replace();
-            }
-          }
-        }
-
-        $q.when(next).
-          then(function() {
-            if (next) {
-              var locals = angular.extend({}, next.resolve),
-                  template, templateUrl;
-
-              angular.forEach(locals, function(value, key) {
-                locals[key] = angular.isString(value) ?
-                    $injector.get(value) : $injector.invoke(value);
-              });
-
-              if (angular.isDefined(template = next.template)) {
-                if (angular.isFunction(template)) {
-                  template = template(next.params);
-                }
-              } else if (angular.isDefined(templateUrl = next.templateUrl)) {
-                if (angular.isFunction(templateUrl)) {
-                  templateUrl = templateUrl(next.params);
-                }
-                templateUrl = $sce.getTrustedResourceUrl(templateUrl);
-                if (angular.isDefined(templateUrl)) {
-                  next.loadedTemplateUrl = templateUrl;
-                  template = $http.get(templateUrl, {cache: $templateCache}).
-                      then(function(response) { return response.data; });
-                }
-              }
-              if (angular.isDefined(template)) {
-                locals['$template'] = template;
-              }
-              return $q.all(locals);
-            }
-          }).
-          // after route change
-          then(function(locals) {
-            if (next == $route.current) {
-              if (next) {
-                next.locals = locals;
-                angular.copy(next.params, $routeParams);
-              }
-              $rootScope.$broadcast('$routeChangeSuccess', next, last);
-            }
-          }, function(error) {
-            if (next == $route.current) {
-              $rootScope.$broadcast('$routeChangeError', next, last, error);
-            }
-          });
-      }
-    }
-
-
-    /**
-     * @returns the current active route, by matching it against the URL
-     */
-    function parseRoute() {
-      // Match a route
-      var params, match;
-      angular.forEach(routes, function(route, path) {
-        if (!match && (params = switchRouteMatcher($location.path(), route))) {
-          match = inherit(route, {
-            params: angular.extend({}, $location.search(), params),
-            pathParams: params});
-          match.$$route = route;
-        }
-      });
-      // No route matched; fallback to "otherwise" route
-      return match || routes[null] && inherit(routes[null], {params: {}, pathParams:{}});
-    }
-
-    /**
-     * @returns interpolation of the redirect path with the parameters
-     */
-    function interpolate(string, params) {
-      var result = [];
-      angular.forEach((string||'').split(':'), function(segment, i) {
-        if (i === 0) {
-          result.push(segment);
-        } else {
-          var segmentMatch = segment.match(/(\w+)(.*)/);
-          var key = segmentMatch[1];
-          result.push(params[key]);
-          result.push(segmentMatch[2] || '');
-          delete params[key];
-        }
-      });
-      return result.join('');
-    }
-  }];
-}
-
-ngRouteModule.provider('$routeParams', $RouteParamsProvider);
-
-
-/**
- * @ngdoc object
- * @name ngRoute.$routeParams
- * @requires $route
- *
- * @description
- * The `$routeParams` service allows you to retrieve the current set of route parameters.
- *
- * Requires the {@link ngRoute `ngRoute`} module to be installed.
- *
- * The route parameters are a combination of {@link ng.$location `$location`}'s
- * {@link ng.$location#methods_search `search()`} and {@link ng.$location#methods_path `path()`}.
- * The `path` parameters are extracted when the {@link ngRoute.$route `$route`} path is matched.
- *
- * In case of parameter name collision, `path` params take precedence over `search` params.
- *
- * The service guarantees that the identity of the `$routeParams` object will remain unchanged
- * (but its properties will likely change) even when a route change occurs.
- *
- * Note that the `$routeParams` are only updated *after* a route change completes successfully.
- * This means that you cannot rely on `$routeParams` being correct in route resolve functions.
- * Instead you can use `$route.current.params` to access the new route's parameters.
- *
- * @example
- * <pre>
- *  // Given:
- *  // URL: http://server.com/index.html#/Chapter/1/Section/2?search=moby
- *  // Route: /Chapter/:chapterId/Section/:sectionId
- *  //
- *  // Then
- *  $routeParams ==> {chapterId:1, sectionId:2, search:'moby'}
- * </pre>
- */
-function $RouteParamsProvider() {
-  this.$get = function() { return {}; };
-}
-
-ngRouteModule.directive('ngView', ngViewFactory);
-ngRouteModule.directive('ngView', ngViewFillContentFactory);
-
-
-/**
- * @ngdoc directive
- * @name ngRoute.directive:ngView
- * @restrict ECA
- *
- * @description
- * # Overview
- * `ngView` is a directive that complements the {@link ngRoute.$route $route} service by
- * including the rendered template of the current route into the main layout (`index.html`) file.
- * Every time the current route changes, the included view changes with it according to the
- * configuration of the `$route` service.
- *
- * Requires the {@link ngRoute `ngRoute`} module to be installed.
- *
- * @animations
- * enter - animation is used to bring new content into the browser.
- * leave - animation is used to animate existing content away.
- *
- * The enter and leave animation occur concurrently.
- *
- * @scope
- * @priority 400
- * @param {string=} onload Expression to evaluate whenever the view updates.
- *
- * @param {string=} autoscroll Whether `ngView` should call {@link ng.$anchorScroll
+                 </file>
+                 </example>
+				 */
+
+				/**
+				 * @ngdoc event
+				 * @name ngRoute.$route#$routeChangeStart
+				 * @eventOf ngRoute.$route
+				 * @eventType broadcast on root scope
+				 * @description
+				 * Broadcasted before a route change. At this  point the route services starts
+				 * resolving all of the dependencies needed for the route change to occur.
+				 * Typically this involves fetching the view template as well as any dependencies
+				 * defined in `resolve` route property. Once  all of the dependencies are resolved
+				 * `$routeChangeSuccess` is fired.
+				 *
+				 * @param {Object} angularEvent Synthetic event object.
+				 * @param {Route} next Future route information.
+				 * @param {Route} current Current route information.
+				 */
+
+				/**
+				 * @ngdoc event
+				 * @name ngRoute.$route#$routeChangeSuccess
+				 * @eventOf ngRoute.$route
+				 * @eventType broadcast on root scope
+				 * @description
+				 * Broadcasted after a route dependencies are resolved.
+				 * {@link ngRoute.directive:ngView ngView} listens for the directive
+				 * to instantiate the controller and render the view.
+				 *
+				 * @param {Object} angularEvent Synthetic event object.
+				 * @param {Route} current Current route information.
+				 * @param {Route|Undefined} previous Previous route information, or undefined if current is
+				 * first route entered.
+				 */
+
+				/**
+				 * @ngdoc event
+				 * @name ngRoute.$route#$routeChangeError
+				 * @eventOf ngRoute.$route
+				 * @eventType broadcast on root scope
+				 * @description
+				 * Broadcasted if any of the resolve promises are rejected.
+				 *
+				 * @param {Object} angularEvent Synthetic event object
+				 * @param {Route} current Current route information.
+				 * @param {Route} previous Previous route information.
+				 * @param {Route} rejection Rejection of the promise. Usually the error of the failed promise.
+				 */
+
+				/**
+				 * @ngdoc event
+				 * @name ngRoute.$route#$routeUpdate
+				 * @eventOf ngRoute.$route
+				 * @eventType broadcast on root scope
+				 * @description
+				 *
+				 * The `reloadOnSearch` property has been set to false, and we are reusing the same
+				 * instance of the Controller.
+				 */
+
+				var forceReload = false,
+					$route = {
+						routes: routes,
+
+						/**
+						 * @ngdoc method
+						 * @name ngRoute.$route#reload
+						 * @methodOf ngRoute.$route
+						 *
+						 * @description
+						 * Causes `$route` service to reload the current route even if
+						 * {@link ng.$location $location} hasn't changed.
+						 *
+						 * As a result of that, {@link ngRoute.directive:ngView ngView}
+						 * creates new scope, reinstantiates the controller.
+						 */
+						reload: function () {
+							forceReload = true;
+							$rootScope.$evalAsync(updateRoute);
+						}
+					};
+
+				$rootScope.$on('$locationChangeSuccess', updateRoute);
+
+				return $route;
+
+				/////////////////////////////////////////////////////
+
+				/**
+				 * @param on {string} current url
+				 * @param route {Object} route regexp to match the url against
+				 * @return {?Object}
+				 *
+				 * @description
+				 * Check if the route matches the current url.
+				 *
+				 * Inspired by match in
+				 * visionmedia/express/lib/router/router.js.
+				 */
+				function switchRouteMatcher(on, route) {
+					var keys = route.keys,
+						params = {};
+
+					if (!route.regexp) return null;
+
+					var m = route.regexp.exec(on);
+					if (!m) return null;
+
+					for (var i = 1, len = m.length; i < len; ++i) {
+						var key = keys[i - 1];
+
+						var val = 'string' == typeof m[i]
+							? decodeURIComponent(m[i])
+							: m[i];
+
+						if (key && val) {
+							params[key.name] = val;
+						}
+					}
+					return params;
+				}
+
+				function updateRoute() {
+					var next = parseRoute(),
+						last = $route.current;
+
+					if (next && last && next.$$route === last.$$route
+						&& angular.equals(next.pathParams, last.pathParams)
+						&& !next.reloadOnSearch && !forceReload) {
+						last.params = next.params;
+						angular.copy(last.params, $routeParams);
+						$rootScope.$broadcast('$routeUpdate', last);
+					} else if (next || last) {
+						forceReload = false;
+						$rootScope.$broadcast('$routeChangeStart', next, last);
+						$route.current = next;
+						if (next) {
+							if (next.redirectTo) {
+								if (angular.isString(next.redirectTo)) {
+									$location.path(interpolate(next.redirectTo, next.params)).search(next.params)
+										.replace();
+								} else {
+									$location.url(next.redirectTo(next.pathParams, $location.path(), $location.search()))
+										.replace();
+								}
+							}
+						}
+
+						$q.when(next).then(function () {
+							if (next) {
+								var locals = angular.extend({}, next.resolve),
+									template, templateUrl;
+
+								angular.forEach(locals, function (value, key) {
+									locals[key] = angular.isString(value) ?
+										$injector.get(value) : $injector.invoke(value);
+								});
+
+								if (angular.isDefined(template = next.template)) {
+									if (angular.isFunction(template)) {
+										template = template(next.params);
+									}
+								} else if (angular.isDefined(templateUrl = next.templateUrl)) {
+									if (angular.isFunction(templateUrl)) {
+										templateUrl = templateUrl(next.params);
+									}
+									templateUrl = $sce.getTrustedResourceUrl(templateUrl);
+									if (angular.isDefined(templateUrl)) {
+										next.loadedTemplateUrl = templateUrl;
+										template = $http.get(templateUrl, {cache: $templateCache}).then(function (response) {
+											return response.data;
+										});
+									}
+								}
+								if (angular.isDefined(template)) {
+									locals['$template'] = template;
+								}
+								return $q.all(locals);
+							}
+						}).
+							// after route change
+							then(function (locals) {
+								if (next == $route.current) {
+									if (next) {
+										next.locals = locals;
+										angular.copy(next.params, $routeParams);
+									}
+									$rootScope.$broadcast('$routeChangeSuccess', next, last);
+								}
+							}, function (error) {
+								if (next == $route.current) {
+									$rootScope.$broadcast('$routeChangeError', next, last, error);
+								}
+							});
+					}
+				}
+
+
+				/**
+				 * @returns the current active route, by matching it against the URL
+				 */
+				function parseRoute() {
+					// Match a route
+					var params, match;
+					angular.forEach(routes, function (route, path) {
+						if (!match && (params = switchRouteMatcher($location.path(), route))) {
+							match = inherit(route, {
+								params: angular.extend({}, $location.search(), params),
+								pathParams: params
+							});
+							match.$$route = route;
+						}
+					});
+					// No route matched; fallback to "otherwise" route
+					return match || routes[null] && inherit(routes[null], {params: {}, pathParams: {}});
+				}
+
+				/**
+				 * @returns interpolation of the redirect path with the parameters
+				 */
+				function interpolate(string, params) {
+					var result = [];
+					angular.forEach((string || '').split(':'), function (segment, i) {
+						if (i === 0) {
+							result.push(segment);
+						} else {
+							var segmentMatch = segment.match(/(\w+)(.*)/);
+							var key = segmentMatch[1];
+							result.push(params[key]);
+							result.push(segmentMatch[2] || '');
+							delete params[key];
+						}
+					});
+					return result.join('');
+				}
+			}];
+	}
+
+	ngRouteModule.provider('$routeParams', $RouteParamsProvider);
+
+
+	/**
+	 * @ngdoc object
+	 * @name ngRoute.$routeParams
+	 * @requires $route
+	 *
+	 * @description
+	 * The `$routeParams` service allows you to retrieve the current set of route parameters.
+	 *
+	 * Requires the {@link ngRoute `ngRoute`} module to be installed.
+	 *
+	 * The route parameters are a combination of {@link ng.$location `$location`}'s
+	 * {@link ng.$location#methods_search `search()`} and {@link ng.$location#methods_path `path()`}.
+	 * The `path` parameters are extracted when the {@link ngRoute.$route `$route`} path is matched.
+	 *
+	 * In case of parameter name collision, `path` params take precedence over `search` params.
+	 *
+	 * The service guarantees that the identity of the `$routeParams` object will remain unchanged
+	 * (but its properties will likely change) even when a route change occurs.
+	 *
+	 * Note that the `$routeParams` are only updated *after* a route change completes successfully.
+	 * This means that you cannot rely on `$routeParams` being correct in route resolve functions.
+	 * Instead you can use `$route.current.params` to access the new route's parameters.
+	 *
+	 * @example
+	 * <pre>
+	 *  // Given:
+	 *  // URL: http://server.com/index.html#/Chapter/1/Section/2?search=moby
+	 *  // Route: /Chapter/:chapterId/Section/:sectionId
+	 *  //
+	 *  // Then
+	 *  $routeParams ==> {chapterId:1, sectionId:2, search:'moby'}
+	 * </pre>
+	 */
+	function $RouteParamsProvider() {
+		this.$get = function () {
+			return {};
+		};
+	}
+
+	ngRouteModule.directive('ngView', ngViewFactory);
+	ngRouteModule.directive('ngView', ngViewFillContentFactory);
+
+
+	/**
+	 * @ngdoc directive
+	 * @name ngRoute.directive:ngView
+	 * @restrict ECA
+	 *
+	 * @description
+	 * # Overview
+	 * `ngView` is a directive that complements the {@link ngRoute.$route $route} service by
+	 * including the rendered template of the current route into the main layout (`index.html`) file.
+	 * Every time the current route changes, the included view changes with it according to the
+	 * configuration of the `$route` service.
+	 *
+	 * Requires the {@link ngRoute `ngRoute`} module to be installed.
+	 *
+	 * @animations
+	 * enter - animation is used to bring new content into the browser.
+	 * leave - animation is used to animate existing content away.
+	 *
+	 * The enter and leave animation occur concurrently.
+	 *
+	 * @scope
+	 * @priority 400
+	 * @param {string=} onload Expression to evaluate whenever the view updates.
+	 *
+	 * @param {string=} autoscroll Whether `ngView` should call {@link ng.$anchorScroll
  *                  $anchorScroll} to scroll the viewport after the view is updated.
- *
- *                  - If the attribute is not set, disable scrolling.
- *                  - If the attribute is set without value, enable scrolling.
- *                  - Otherwise enable scrolling only if the `autoscroll` attribute value evaluated
- *                    as an expression yields a truthy value.
- * @example
-    <example module="ngViewExample" deps="angular-route.js" animations="true">
-      <file name="index.html">
-        <div ng-controller="MainCntl as main">
-          Choose:
-          <a href="Book/Moby">Moby</a> |
-          <a href="Book/Moby/ch/1">Moby: Ch1</a> |
-          <a href="Book/Gatsby">Gatsby</a> |
-          <a href="Book/Gatsby/ch/4?key=value">Gatsby: Ch4</a> |
-          <a href="Book/Scarlet">Scarlet Letter</a><br/>
-
-          <div class="view-animate-container">
-            <div ng-view class="view-animate"></div>
-          </div>
-          <hr />
-
-          <pre>$location.path() = {{main.$location.path()}}</pre>
-          <pre>$route.current.templateUrl = {{main.$route.current.templateUrl}}</pre>
-          <pre>$route.current.params = {{main.$route.current.params}}</pre>
-          <pre>$route.current.scope.name = {{main.$route.current.scope.name}}</pre>
-          <pre>$routeParams = {{main.$routeParams}}</pre>
-        </div>
-      </file>
-
-      <file name="book.html">
-        <div>
-          controller: {{book.name}}<br />
-          Book Id: {{book.params.bookId}}<br />
-        </div>
-      </file>
-
-      <file name="chapter.html">
-        <div>
-          controller: {{chapter.name}}<br />
-          Book Id: {{chapter.params.bookId}}<br />
-          Chapter Id: {{chapter.params.chapterId}}
-        </div>
-      </file>
-
-      <file name="animations.css">
-        .view-animate-container {
+	 *
+	 *                  - If the attribute is not set, disable scrolling.
+	 *                  - If the attribute is set without value, enable scrolling.
+	 *                  - Otherwise enable scrolling only if the `autoscroll` attribute value evaluated
+	 *                    as an expression yields a truthy value.
+	 * @example
+     <example module="ngViewExample" deps="angular-route.js" animations="true">
+     <file name="index.html">
+     <div ng-controller="MainCntl as main">
+     Choose:
+     <a href="Book/Moby">Moby</a> |
+     <a href="Book/Moby/ch/1">Moby: Ch1</a> |
+     <a href="Book/Gatsby">Gatsby</a> |
+     <a href="Book/Gatsby/ch/4?key=value">Gatsby: Ch4</a> |
+     <a href="Book/Scarlet">Scarlet Letter</a><br/>
+
+     <div class="view-animate-container">
+     <div ng-view class="view-animate"></div>
+     </div>
+     <hr />
+
+     <pre>$location.path() = {{main.$location.path()}}</pre>
+     <pre>$route.current.templateUrl = {{main.$route.current.templateUrl}}</pre>
+     <pre>$route.current.params = {{main.$route.current.params}}</pre>
+     <pre>$route.current.scope.name = {{main.$route.current.scope.name}}</pre>
+     <pre>$routeParams = {{main.$routeParams}}</pre>
+     </div>
+     </file>
+
+     <file name="book.html">
+     <div>
+     controller: {{book.name}}<br />
+     Book Id: {{book.params.bookId}}<br />
+     </div>
+     </file>
+
+     <file name="chapter.html">
+     <div>
+     controller: {{chapter.name}}<br />
+     Book Id: {{chapter.params.bookId}}<br />
+     Chapter Id: {{chapter.params.chapterId}}
+     </div>
+     </file>
+
+     <file name="animations.css">
+     .view-animate-container {
           position:relative;
           height:100px!important;
           position:relative;
@@ -728,11 +732,11 @@ ngRouteModule.directive('ngView', ngViewFillContentFactory);
           overflow:hidden;
         }
 
-        .view-animate {
+     .view-animate {
           padding:10px;
         }
 
-        .view-animate.ng-enter, .view-animate.ng-leave {
+     .view-animate.ng-enter, .view-animate.ng-leave {
           -webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 1.5s;
           transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 1.5s;
 
@@ -748,20 +752,20 @@ ngRouteModule.directive('ngView', ngViewFillContentFactory);
           padding:10px;
         }
 
-        .view-animate.ng-enter {
+     .view-animate.ng-enter {
           left:100%;
         }
-        .view-animate.ng-enter.ng-enter-active {
+     .view-animate.ng-enter.ng-enter-active {
           left:0;
         }
-        .view-animate.ng-leave.ng-leave-active {
+     .view-animate.ng-leave.ng-leave-active {
           left:-100%;
         }
-      </file>
+     </file>
 
-      <file name="script.js">
-        angular.module('ngViewExample', ['ngRoute', 'ngAnimate'],
-          function($routeProvider, $locationProvider) {
+     <file name="script.js">
+     angular.module('ngViewExample', ['ngRoute', 'ngAnimate'],
+     function($routeProvider, $locationProvider) {
             $routeProvider.when('/Book/:bookId', {
               templateUrl: 'book.html',
               controller: BookCntl,
@@ -777,25 +781,25 @@ ngRouteModule.directive('ngView', ngViewFillContentFactory);
             $locationProvider.html5Mode(true);
         });
 
-        function MainCntl($route, $routeParams, $location) {
+     function MainCntl($route, $routeParams, $location) {
           this.$route = $route;
           this.$location = $location;
           this.$routeParams = $routeParams;
         }
 
-        function BookCntl($routeParams) {
+     function BookCntl($routeParams) {
           this.name = "BookCntl";
           this.params = $routeParams;
         }
 
-        function ChapterCntl($routeParams) {
+     function ChapterCntl($routeParams) {
           this.name = "ChapterCntl";
           this.params = $routeParams;
         }
-      </file>
+     </file>
 
-      <file name="protractorTest.js">
-        it('should load and compile correct template', function() {
+     <file name="protractorTest.js">
+     it('should load and compile correct template', function() {
           element(by.linkText('Moby: Ch1')).click();
           var content = element(by.css('.doc-example-live [ng-view]')).getText();
           expect(content).toMatch(/controller\: ChapterCntl/);
@@ -808,114 +812,116 @@ ngRouteModule.directive('ngView', ngViewFillContentFactory);
           expect(content).toMatch(/controller\: BookCntl/);
           expect(content).toMatch(/Book Id\: Scarlet/);
         });
-      </file>
-    </example>
- */
-
-
-/**
- * @ngdoc event
- * @name ngRoute.directive:ngView#$viewContentLoaded
- * @eventOf ngRoute.directive:ngView
- * @eventType emit on the current ngView scope
- * @description
- * Emitted every time the ngView content is reloaded.
- */
-ngViewFactory.$inject = ['$route', '$anchorScroll', '$animate'];
-function ngViewFactory(   $route,   $anchorScroll,   $animate) {
-  return {
-    restrict: 'ECA',
-    terminal: true,
-    priority: 400,
-    transclude: 'element',
-    link: function(scope, $element, attr, ctrl, $transclude) {
-        var currentScope,
-            currentElement,
-            autoScrollExp = attr.autoscroll,
-            onloadExp = attr.onload || '';
-
-        scope.$on('$routeChangeSuccess', update);
-        update();
-
-        function cleanupLastView() {
-          if (currentScope) {
-            currentScope.$destroy();
-            currentScope = null;
-          }
-          if(currentElement) {
-            $animate.leave(currentElement);
-            currentElement = null;
-          }
-        }
-
-        function update() {
-          var locals = $route.current && $route.current.locals,
-              template = locals && locals.$template;
-
-          if (angular.isDefined(template)) {
-            var newScope = scope.$new();
-            var current = $route.current;
-
-            // Note: This will also link all children of ng-view that were contained in the original
-            // html. If that content contains controllers, ... they could pollute/change the scope.
-            // However, using ng-view on an element with additional content does not make sense...
-            // Note: We can't remove them in the cloneAttchFn of $transclude as that
-            // function is called before linking the content, which would apply child
-            // directives to non existing elements.
-            var clone = $transclude(newScope, function(clone) {
-              $animate.enter(clone, null, currentElement || $element, function onNgViewEnter () {
-                if (angular.isDefined(autoScrollExp)
-                  && (!autoScrollExp || scope.$eval(autoScrollExp))) {
-                  $anchorScroll();
-                }
-              });
-              cleanupLastView();
-            });
-
-            currentElement = clone;
-            currentScope = current.scope = newScope;
-            currentScope.$emit('$viewContentLoaded');
-            currentScope.$eval(onloadExp);
-          } else {
-            cleanupLastView();
-          }
-        }
-    }
-  };
-}
+     </file>
+     </example>
+	 */
+
+
+	/**
+	 * @ngdoc event
+	 * @name ngRoute.directive:ngView#$viewContentLoaded
+	 * @eventOf ngRoute.directive:ngView
+	 * @eventType emit on the current ngView scope
+	 * @description
+	 * Emitted every time the ngView content is reloaded.
+	 */
+	ngViewFactory.$inject = ['$route', '$anchorScroll', '$animate'];
+
+	function ngViewFactory($route, $anchorScroll, $animate) {
+		return {
+			restrict: 'ECA',
+			terminal: true,
+			priority: 400,
+			transclude: 'element',
+			link: function (scope, $element, attr, ctrl, $transclude) {
+				var currentScope,
+					currentElement,
+					autoScrollExp = attr.autoscroll,
+					onloadExp = attr.onload || '';
+
+				scope.$on('$routeChangeSuccess', update);
+				update();
+
+				function cleanupLastView() {
+					if (currentScope) {
+						currentScope.$destroy();
+						currentScope = null;
+					}
+					if (currentElement) {
+						$animate.leave(currentElement);
+						currentElement = null;
+					}
+				}
+
+				function update() {
+					var locals = $route.current && $route.current.locals,
+						template = locals && locals.$template;
+
+					if (angular.isDefined(template)) {
+						var newScope = scope.$new();
+						var current = $route.current;
+
+						// Note: This will also link all children of ng-view that were contained in the original
+						// html. If that content contains controllers, ... they could pollute/change the scope.
+						// However, using ng-view on an element with additional content does not make sense...
+						// Note: We can't remove them in the cloneAttchFn of $transclude as that
+						// function is called before linking the content, which would apply child
+						// directives to non existing elements.
+						var clone = $transclude(newScope, function (clone) {
+							$animate.enter(clone, null, currentElement || $element, function onNgViewEnter() {
+								if (angular.isDefined(autoScrollExp)
+									&& (!autoScrollExp || scope.$eval(autoScrollExp))) {
+									$anchorScroll();
+								}
+							});
+							cleanupLastView();
+						});
+
+						currentElement = clone;
+						currentScope = current.scope = newScope;
+						currentScope.$emit('$viewContentLoaded');
+						currentScope.$eval(onloadExp);
+					} else {
+						cleanupLastView();
+					}
+				}
+			}
+		};
+	}
 
 // This directive is called during the $transclude call of the first `ngView` directive.
 // It will replace and compile the content of the element with the loaded template.
 // We need this directive so that the element content is already filled when
 // the link function of another directive on the same element as ngView
 // is called.
-ngViewFillContentFactory.$inject = ['$compile', '$controller', '$route'];
-function ngViewFillContentFactory($compile, $controller, $route) {
-  return {
-    restrict: 'ECA',
-    priority: -400,
-    link: function(scope, $element) {
-      var current = $route.current,
-          locals = current.locals;
-
-      $element.html(locals.$template);
-
-      var link = $compile($element.contents());
-
-      if (current.controller) {
-        locals.$scope = scope;
-        var controller = $controller(current.controller, locals);
-        if (current.controllerAs) {
-          scope[current.controllerAs] = controller;
-        }
-        $element.data('$ngControllerController', controller);
-        $element.children().data('$ngControllerController', controller);
-      }
-
-      link(scope);
-    }
-  };
-}
+	ngViewFillContentFactory.$inject = ['$compile', '$controller', '$route'];
+
+	function ngViewFillContentFactory($compile, $controller, $route) {
+		return {
+			restrict: 'ECA',
+			priority: -400,
+			link: function (scope, $element) {
+				var current = $route.current,
+					locals = current.locals;
+
+				$element.html(locals.$template);
+
+				var link = $compile($element.contents());
+
+				if (current.controller) {
+					locals.$scope = scope;
+					var controller = $controller(current.controller, locals);
+					if (current.controllerAs) {
+						scope[current.controllerAs] = controller;
+					}
+					$element.data('$ngControllerController', controller);
+					$element.children().data('$ngControllerController', controller);
+				}
+
+				link(scope);
+			}
+		};
+	}
 
 
 })(window, window.angular);
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.js b/len-activiti/src/main/resources/static/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.js
index 9259ca2..3252924 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/angular-sanitize_1.2.13/angular-sanitize.js
@@ -3,65 +3,66 @@
  * (c) 2010-2014 Google, Inc. http://angularjs.org
  * License: MIT
  */
-(function(window, angular, undefined) {'use strict';
-
-var $sanitizeMinErr = angular.$$minErr('$sanitize');
-
-/**
- * @ngdoc overview
- * @name ngSanitize
- * @description
- *
- * # ngSanitize
- *
- * The `ngSanitize` module provides functionality to sanitize HTML.
- *
- * {@installModule sanitize}
- *
- * <div doc-module-components="ngSanitize"></div>
- *
- * See {@link ngSanitize.$sanitize `$sanitize`} for usage.
- */
-
-/*
- * HTML Parser By Misko Hevery (misko@hevery.com)
- * based on:  HTML Parser By John Resig (ejohn.org)
- * Original code by Erik Arvidsson, Mozilla Public License
- * http://erik.eae.net/simplehtmlparser/simplehtmlparser.js
- *
- * // Use like so:
- * htmlParser(htmlString, {
- *     start: function(tag, attrs, unary) {},
- *     end: function(tag) {},
- *     chars: function(text) {},
- *     comment: function(text) {}
- * });
- *
- */
-
-
-/**
- * @ngdoc service
- * @name ngSanitize.$sanitize
- * @function
- *
- * @description
- *   The input is sanitized by parsing the html into tokens. All safe tokens (from a whitelist) are
- *   then serialized back to properly escaped html string. This means that no unsafe input can make
- *   it into the returned string, however, since our parser is more strict than a typical browser
- *   parser, it's possible that some obscure input, which would be recognized as valid HTML by a
- *   browser, won't make it through the sanitizer.
- *   The whitelist is configured using the functions `aHrefSanitizationWhitelist` and
- *   `imgSrcSanitizationWhitelist` of {@link ng.$compileProvider `$compileProvider`}.
- *
- * @param {string} html Html input.
- * @returns {string} Sanitized html.
- *
- * @example
-   <doc:example module="ngSanitize">
-   <doc:source>
+(function (window, angular, undefined) {
+	'use strict';
+
+	var $sanitizeMinErr = angular.$$minErr('$sanitize');
+
+	/**
+	 * @ngdoc overview
+	 * @name ngSanitize
+	 * @description
+	 *
+	 * # ngSanitize
+	 *
+	 * The `ngSanitize` module provides functionality to sanitize HTML.
+	 *
+	 * {@installModule sanitize}
+	 *
+	 * <div doc-module-components="ngSanitize"></div>
+	 *
+	 * See {@link ngSanitize.$sanitize `$sanitize`} for usage.
+	 */
+
+	/*
+	 * HTML Parser By Misko Hevery (misko@hevery.com)
+	 * based on:  HTML Parser By John Resig (ejohn.org)
+	 * Original code by Erik Arvidsson, Mozilla Public License
+	 * http://erik.eae.net/simplehtmlparser/simplehtmlparser.js
+	 *
+	 * // Use like so:
+	 * htmlParser(htmlString, {
+	 *     start: function(tag, attrs, unary) {},
+	 *     end: function(tag) {},
+	 *     chars: function(text) {},
+	 *     comment: function(text) {}
+	 * });
+	 *
+	 */
+
+
+	/**
+	 * @ngdoc service
+	 * @name ngSanitize.$sanitize
+	 * @function
+	 *
+	 * @description
+	 *   The input is sanitized by parsing the html into tokens. All safe tokens (from a whitelist) are
+	 *   then serialized back to properly escaped html string. This means that no unsafe input can make
+	 *   it into the returned string, however, since our parser is more strict than a typical browser
+	 *   parser, it's possible that some obscure input, which would be recognized as valid HTML by a
+	 *   browser, won't make it through the sanitizer.
+	 *   The whitelist is configured using the functions `aHrefSanitizationWhitelist` and
+	 *   `imgSrcSanitizationWhitelist` of {@link ng.$compileProvider `$compileProvider`}.
+	 *
+	 * @param {string} html Html input.
+	 * @returns {string} Sanitized html.
+	 *
+	 * @example
+     <doc:example module="ngSanitize">
+     <doc:source>
      <script>
-       function Ctrl($scope, $sce) {
+     function Ctrl($scope, $sce) {
          $scope.snippet =
            '<p style="color:blue">an html\n' +
            '<em onmouseover="this.textContent=\'PWN3D!\'">click here</em>\n' +
@@ -72,39 +73,39 @@ var $sanitizeMinErr = angular.$$minErr('$sanitize');
        }
      </script>
      <div ng-controller="Ctrl">
-        Snippet: <textarea ng-model="snippet" cols="60" rows="3"></textarea>
-       <table>
-         <tr>
-           <td>Directive</td>
-           <td>How</td>
-           <td>Source</td>
-           <td>Rendered</td>
-         </tr>
-         <tr id="bind-html-with-sanitize">
-           <td>ng-bind-html</td>
-           <td>Automatically uses $sanitize</td>
-           <td><pre>&lt;div ng-bind-html="snippet"&gt;<br/>&lt;/div&gt;</pre></td>
-           <td><div ng-bind-html="snippet"></div></td>
-         </tr>
-         <tr id="bind-html-with-trust">
-           <td>ng-bind-html</td>
-           <td>Bypass $sanitize by explicitly trusting the dangerous value</td>
-           <td>
-           <pre>&lt;div ng-bind-html="deliberatelyTrustDangerousSnippet()"&gt;
-&lt;/div&gt;</pre>
-           </td>
-           <td><div ng-bind-html="deliberatelyTrustDangerousSnippet()"></div></td>
-         </tr>
-         <tr id="bind-default">
-           <td>ng-bind</td>
-           <td>Automatically escapes</td>
-           <td><pre>&lt;div ng-bind="snippet"&gt;<br/>&lt;/div&gt;</pre></td>
-           <td><div ng-bind="snippet"></div></td>
-         </tr>
-       </table>
-       </div>
-   </doc:source>
-   <doc:protractor>
+     Snippet: <textarea ng-model="snippet" cols="60" rows="3"></textarea>
+     <table>
+     <tr>
+     <td>Directive</td>
+     <td>How</td>
+     <td>Source</td>
+     <td>Rendered</td>
+     </tr>
+     <tr id="bind-html-with-sanitize">
+     <td>ng-bind-html</td>
+     <td>Automatically uses $sanitize</td>
+     <td><pre>&lt;div ng-bind-html="snippet"&gt;<br/>&lt;/div&gt;</pre></td>
+     <td><div ng-bind-html="snippet"></div></td>
+     </tr>
+     <tr id="bind-html-with-trust">
+     <td>ng-bind-html</td>
+     <td>Bypass $sanitize by explicitly trusting the dangerous value</td>
+     <td>
+     <pre>&lt;div ng-bind-html="deliberatelyTrustDangerousSnippet()"&gt;
+     &lt;/div&gt;</pre>
+     </td>
+     <td><div ng-bind-html="deliberatelyTrustDangerousSnippet()"></div></td>
+     </tr>
+     <tr id="bind-default">
+     <td>ng-bind</td>
+     <td>Automatically escapes</td>
+     <td><pre>&lt;div ng-bind="snippet"&gt;<br/>&lt;/div&gt;</pre></td>
+     <td><div ng-bind="snippet"></div></td>
+     </tr>
+     </table>
+     </div>
+     </doc:source>
+     <doc:protractor>
      it('should sanitize the html snippet by default', function() {
        expect(element(by.css('#bind-html-with-sanitize div')).getInnerHtml()).
          toBe('<p>an html\n<em>click here</em>\nsnippet</p>');
@@ -134,41 +135,41 @@ var $sanitizeMinErr = angular.$$minErr('$sanitize');
        expect(element(by.css('#bind-default div')).getInnerHtml()).toBe(
          "new &lt;b onclick=\"alert(1)\"&gt;text&lt;/b&gt;");
      });
-   </doc:protractor>
-   </doc:example>
- */
-function $SanitizeProvider() {
-  this.$get = ['$$sanitizeUri', function($$sanitizeUri) {
-    return function(html) {
-      var buf = [];
-      htmlParser(html, htmlSanitizeWriter(buf, function(uri, isImage) {
-        return !/^unsafe/.test($$sanitizeUri(uri, isImage));
-      }));
-      return buf.join('');
-    };
-  }];
-}
-
-function sanitizeText(chars) {
-  var buf = [];
-  var writer = htmlSanitizeWriter(buf, angular.noop);
-  writer.chars(chars);
-  return buf.join('');
-}
+     </doc:protractor>
+     </doc:example>
+	 */
+	function $SanitizeProvider() {
+		this.$get = ['$$sanitizeUri', function ($$sanitizeUri) {
+			return function (html) {
+				var buf = [];
+				htmlParser(html, htmlSanitizeWriter(buf, function (uri, isImage) {
+					return !/^unsafe/.test($$sanitizeUri(uri, isImage));
+				}));
+				return buf.join('');
+			};
+		}];
+	}
+
+	function sanitizeText(chars) {
+		var buf = [];
+		var writer = htmlSanitizeWriter(buf, angular.noop);
+		writer.chars(chars);
+		return buf.join('');
+	}
 
 
 // Regular Expressions for parsing tags and attributes
-var START_TAG_REGEXP =
-       /^<\s*([\w:-]+)((?:\s+[\w:-]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)\s*>/,
-  END_TAG_REGEXP = /^<\s*\/\s*([\w:-]+)[^>]*>/,
-  ATTR_REGEXP = /([\w:-]+)(?:\s*=\s*(?:(?:"((?:[^"])*)")|(?:'((?:[^'])*)')|([^>\s]+)))?/g,
-  BEGIN_TAG_REGEXP = /^</,
-  BEGING_END_TAGE_REGEXP = /^<\s*\//,
-  COMMENT_REGEXP = /<!--(.*?)-->/g,
-  DOCTYPE_REGEXP = /<!DOCTYPE([^>]*?)>/i,
-  CDATA_REGEXP = /<!\[CDATA\[(.*?)]]>/g,
-  // Match everything outside of normal chars and " (quote character)
-  NON_ALPHANUMERIC_REGEXP = /([^\#-~| |!])/g;
+	var START_TAG_REGEXP =
+			/^<\s*([\w:-]+)((?:\s+[\w:-]+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)\s*>/,
+		END_TAG_REGEXP = /^<\s*\/\s*([\w:-]+)[^>]*>/,
+		ATTR_REGEXP = /([\w:-]+)(?:\s*=\s*(?:(?:"((?:[^"])*)")|(?:'((?:[^'])*)')|([^>\s]+)))?/g,
+		BEGIN_TAG_REGEXP = /^</,
+		BEGING_END_TAGE_REGEXP = /^<\s*\//,
+		COMMENT_REGEXP = /<!--(.*?)-->/g,
+		DOCTYPE_REGEXP = /<!DOCTYPE([^>]*?)>/i,
+		CDATA_REGEXP = /<!\[CDATA\[(.*?)]]>/g,
+		// Match everything outside of normal chars and " (quote character)
+		NON_ALPHANUMERIC_REGEXP = /([^\#-~| |!])/g;
 
 
 // Good source of info about elements and attributes
@@ -177,326 +178,327 @@ var START_TAG_REGEXP =
 
 // Safe Void Elements - HTML5
 // http://dev.w3.org/html5/spec/Overview.html#void-elements
-var voidElements = makeMap("area,br,col,hr,img,wbr");
+	var voidElements = makeMap("area,br,col,hr,img,wbr");
 
 // Elements that you can, intentionally, leave open (and which close themselves)
 // http://dev.w3.org/html5/spec/Overview.html#optional-tags
-var optionalEndTagBlockElements = makeMap("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr"),
-    optionalEndTagInlineElements = makeMap("rp,rt"),
-    optionalEndTagElements = angular.extend({},
-                                            optionalEndTagInlineElements,
-                                            optionalEndTagBlockElements);
+	var optionalEndTagBlockElements = makeMap("colgroup,dd,dt,li,p,tbody,td,tfoot,th,thead,tr"),
+		optionalEndTagInlineElements = makeMap("rp,rt"),
+		optionalEndTagElements = angular.extend({},
+			optionalEndTagInlineElements,
+			optionalEndTagBlockElements);
 
 // Safe Block Elements - HTML5
-var blockElements = angular.extend({}, optionalEndTagBlockElements, makeMap("address,article," +
-        "aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5," +
-        "h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,script,section,table,ul"));
+	var blockElements = angular.extend({}, optionalEndTagBlockElements, makeMap("address,article," +
+		"aside,blockquote,caption,center,del,dir,div,dl,figure,figcaption,footer,h1,h2,h3,h4,h5," +
+		"h6,header,hgroup,hr,ins,map,menu,nav,ol,pre,script,section,table,ul"));
 
 // Inline Elements - HTML5
-var inlineElements = angular.extend({}, optionalEndTagInlineElements, makeMap("a,abbr,acronym,b," +
-        "bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s," +
-        "samp,small,span,strike,strong,sub,sup,time,tt,u,var"));
+	var inlineElements = angular.extend({}, optionalEndTagInlineElements, makeMap("a,abbr,acronym,b," +
+		"bdi,bdo,big,br,cite,code,del,dfn,em,font,i,img,ins,kbd,label,map,mark,q,ruby,rp,rt,s," +
+		"samp,small,span,strike,strong,sub,sup,time,tt,u,var"));
 
 
 // Special Elements (can contain anything)
-var specialElements = makeMap("script,style");
+	var specialElements = makeMap("script,style");
 
-var validElements = angular.extend({},
-                                   voidElements,
-                                   blockElements,
-                                   inlineElements,
-                                   optionalEndTagElements);
+	var validElements = angular.extend({},
+		voidElements,
+		blockElements,
+		inlineElements,
+		optionalEndTagElements);
 
 //Attributes that have href and hence need to be sanitized
-var uriAttrs = makeMap("background,cite,href,longdesc,src,usemap");
-var validAttrs = angular.extend({}, uriAttrs, makeMap(
-    'abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,'+
-    'color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,'+
-    'ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,'+
-    'scope,scrolling,shape,size,span,start,summary,target,title,type,'+
-    'valign,value,vspace,width'));
-
-function makeMap(str) {
-  var obj = {}, items = str.split(','), i;
-  for (i = 0; i < items.length; i++) obj[items[i]] = true;
-  return obj;
-}
-
-
-/**
- * @example
- * htmlParser(htmlString, {
- *     start: function(tag, attrs, unary) {},
- *     end: function(tag) {},
- *     chars: function(text) {},
- *     comment: function(text) {}
- * });
- *
- * @param {string} html string
- * @param {object} handler
- */
-function htmlParser( html, handler ) {
-  var index, chars, match, stack = [], last = html;
-  stack.last = function() { return stack[ stack.length - 1 ]; };
-
-  while ( html ) {
-    chars = true;
-
-    // Make sure we're not in a script or style element
-    if ( !stack.last() || !specialElements[ stack.last() ] ) {
-
-      // Comment
-      if ( html.indexOf("<!--") === 0 ) {
-        // comments containing -- are not allowed unless they terminate the comment
-        index = html.indexOf("--", 4);
-
-        if ( index >= 0 && html.lastIndexOf("-->", index) === index) {
-          if (handler.comment) handler.comment( html.substring( 4, index ) );
-          html = html.substring( index + 3 );
-          chars = false;
-        }
-      // DOCTYPE
-      } else if ( DOCTYPE_REGEXP.test(html) ) {
-        match = html.match( DOCTYPE_REGEXP );
-
-        if ( match ) {
-          html = html.replace( match[0] , '');
-          chars = false;
-        }
-      // end tag
-      } else if ( BEGING_END_TAGE_REGEXP.test(html) ) {
-        match = html.match( END_TAG_REGEXP );
-
-        if ( match ) {
-          html = html.substring( match[0].length );
-          match[0].replace( END_TAG_REGEXP, parseEndTag );
-          chars = false;
-        }
-
-      // start tag
-      } else if ( BEGIN_TAG_REGEXP.test(html) ) {
-        match = html.match( START_TAG_REGEXP );
-
-        if ( match ) {
-          html = html.substring( match[0].length );
-          match[0].replace( START_TAG_REGEXP, parseStartTag );
-          chars = false;
-        }
-      }
-
-      if ( chars ) {
-        index = html.indexOf("<");
-
-        var text = index < 0 ? html : html.substring( 0, index );
-        html = index < 0 ? "" : html.substring( index );
-
-        if (handler.chars) handler.chars( decodeEntities(text) );
-      }
-
-    } else {
-      html = html.replace(new RegExp("(.*)<\\s*\\/\\s*" + stack.last() + "[^>]*>", 'i'),
-        function(all, text){
-          text = text.replace(COMMENT_REGEXP, "$1").replace(CDATA_REGEXP, "$1");
-
-          if (handler.chars) handler.chars( decodeEntities(text) );
-
-          return "";
-      });
-
-      parseEndTag( "", stack.last() );
-    }
-
-    if ( html == last ) {
-      throw $sanitizeMinErr('badparse', "The sanitizer was unable to parse the following block " +
-                                        "of html: {0}", html);
-    }
-    last = html;
-  }
-
-  // Clean up any remaining tags
-  parseEndTag();
-
-  function parseStartTag( tag, tagName, rest, unary ) {
-    tagName = angular.lowercase(tagName);
-    if ( blockElements[ tagName ] ) {
-      while ( stack.last() && inlineElements[ stack.last() ] ) {
-        parseEndTag( "", stack.last() );
-      }
-    }
-
-    if ( optionalEndTagElements[ tagName ] && stack.last() == tagName ) {
-      parseEndTag( "", tagName );
-    }
-
-    unary = voidElements[ tagName ] || !!unary;
-
-    if ( !unary )
-      stack.push( tagName );
-
-    var attrs = {};
-
-    rest.replace(ATTR_REGEXP,
-      function(match, name, doubleQuotedValue, singleQuotedValue, unquotedValue) {
-        var value = doubleQuotedValue
-          || singleQuotedValue
-          || unquotedValue
-          || '';
-
-        attrs[name] = decodeEntities(value);
-    });
-    if (handler.start) handler.start( tagName, attrs, unary );
-  }
-
-  function parseEndTag( tag, tagName ) {
-    var pos = 0, i;
-    tagName = angular.lowercase(tagName);
-    if ( tagName )
-      // Find the closest opened tag of the same type
-      for ( pos = stack.length - 1; pos >= 0; pos-- )
-        if ( stack[ pos ] == tagName )
-          break;
-
-    if ( pos >= 0 ) {
-      // Close all the open elements, up the stack
-      for ( i = stack.length - 1; i >= pos; i-- )
-        if (handler.end) handler.end( stack[ i ] );
-
-      // Remove the open elements from the stack
-      stack.length = pos;
-    }
-  }
-}
-
-var hiddenPre=document.createElement("pre");
-var spaceRe = /^(\s*)([\s\S]*?)(\s*)$/;
-/**
- * decodes all entities into regular string
- * @param value
- * @returns {string} A string with decoded entities.
- */
-function decodeEntities(value) {
-  if (!value) { return ''; }
-
-  // Note: IE8 does not preserve spaces at the start/end of innerHTML
-  // so we must capture them and reattach them afterward
-  var parts = spaceRe.exec(value);
-  var spaceBefore = parts[1];
-  var spaceAfter = parts[3];
-  var content = parts[2];
-  if (content) {
-    hiddenPre.innerHTML=content.replace(/</g,"&lt;");
-    // innerText depends on styling as it doesn't display hidden elements.
-    // Therefore, it's better to use textContent not to cause unnecessary
-    // reflows. However, IE<9 don't support textContent so the innerText
-    // fallback is necessary.
-    content = 'textContent' in hiddenPre ?
-      hiddenPre.textContent : hiddenPre.innerText;
-  }
-  return spaceBefore + content + spaceAfter;
-}
-
-/**
- * Escapes all potentially dangerous characters, so that the
- * resulting string can be safely inserted into attribute or
- * element text.
- * @param value
- * @returns escaped text
- */
-function encodeEntities(value) {
-  return value.
-    replace(/&/g, '&amp;').
-    replace(NON_ALPHANUMERIC_REGEXP, function(value){
-      return '&#' + value.charCodeAt(0) + ';';
-    }).
-    replace(/</g, '&lt;').
-    replace(/>/g, '&gt;');
-}
-
-/**
- * create an HTML/XML writer which writes to buffer
- * @param {Array} buf use buf.jain('') to get out sanitized html string
- * @returns {object} in the form of {
- *     start: function(tag, attrs, unary) {},
- *     end: function(tag) {},
- *     chars: function(text) {},
- *     comment: function(text) {}
- * }
- */
-function htmlSanitizeWriter(buf, uriValidator){
-  var ignore = false;
-  var out = angular.bind(buf, buf.push);
-  return {
-    start: function(tag, attrs, unary){
-      tag = angular.lowercase(tag);
-      if (!ignore && specialElements[tag]) {
-        ignore = tag;
-      }
-      if (!ignore && validElements[tag] === true) {
-        out('<');
-        out(tag);
-        angular.forEach(attrs, function(value, key){
-          var lkey=angular.lowercase(key);
-          var isImage = (tag === 'img' && lkey === 'src') || (lkey === 'background');
-          if (validAttrs[lkey] === true &&
-            (uriAttrs[lkey] !== true || uriValidator(value, isImage))) {
-            out(' ');
-            out(key);
-            out('="');
-            out(encodeEntities(value));
-            out('"');
-          }
-        });
-        out(unary ? '/>' : '>');
-      }
-    },
-    end: function(tag){
-        tag = angular.lowercase(tag);
-        if (!ignore && validElements[tag] === true) {
-          out('</');
-          out(tag);
-          out('>');
-        }
-        if (tag == ignore) {
-          ignore = false;
-        }
-      },
-    chars: function(chars){
-        if (!ignore) {
-          out(encodeEntities(chars));
-        }
-      }
-  };
-}
+	var uriAttrs = makeMap("background,cite,href,longdesc,src,usemap");
+	var validAttrs = angular.extend({}, uriAttrs, makeMap(
+		'abbr,align,alt,axis,bgcolor,border,cellpadding,cellspacing,class,clear,' +
+		'color,cols,colspan,compact,coords,dir,face,headers,height,hreflang,hspace,' +
+		'ismap,lang,language,nohref,nowrap,rel,rev,rows,rowspan,rules,' +
+		'scope,scrolling,shape,size,span,start,summary,target,title,type,' +
+		'valign,value,vspace,width'));
+
+	function makeMap(str) {
+		var obj = {}, items = str.split(','), i;
+		for (i = 0; i < items.length; i++) obj[items[i]] = true;
+		return obj;
+	}
+
+
+	/**
+	 * @example
+	 * htmlParser(htmlString, {
+	 *     start: function(tag, attrs, unary) {},
+	 *     end: function(tag) {},
+	 *     chars: function(text) {},
+	 *     comment: function(text) {}
+	 * });
+	 *
+	 * @param {string} html string
+	 * @param {object} handler
+	 */
+	function htmlParser(html, handler) {
+		var index, chars, match, stack = [], last = html;
+		stack.last = function () {
+			return stack[stack.length - 1];
+		};
+
+		while (html) {
+			chars = true;
+
+			// Make sure we're not in a script or style element
+			if (!stack.last() || !specialElements[stack.last()]) {
+
+				// Comment
+				if (html.indexOf("<!--") === 0) {
+					// comments containing -- are not allowed unless they terminate the comment
+					index = html.indexOf("--", 4);
+
+					if (index >= 0 && html.lastIndexOf("-->", index) === index) {
+						if (handler.comment) handler.comment(html.substring(4, index));
+						html = html.substring(index + 3);
+						chars = false;
+					}
+					// DOCTYPE
+				} else if (DOCTYPE_REGEXP.test(html)) {
+					match = html.match(DOCTYPE_REGEXP);
+
+					if (match) {
+						html = html.replace(match[0], '');
+						chars = false;
+					}
+					// end tag
+				} else if (BEGING_END_TAGE_REGEXP.test(html)) {
+					match = html.match(END_TAG_REGEXP);
+
+					if (match) {
+						html = html.substring(match[0].length);
+						match[0].replace(END_TAG_REGEXP, parseEndTag);
+						chars = false;
+					}
+
+					// start tag
+				} else if (BEGIN_TAG_REGEXP.test(html)) {
+					match = html.match(START_TAG_REGEXP);
+
+					if (match) {
+						html = html.substring(match[0].length);
+						match[0].replace(START_TAG_REGEXP, parseStartTag);
+						chars = false;
+					}
+				}
+
+				if (chars) {
+					index = html.indexOf("<");
+
+					var text = index < 0 ? html : html.substring(0, index);
+					html = index < 0 ? "" : html.substring(index);
+
+					if (handler.chars) handler.chars(decodeEntities(text));
+				}
+
+			} else {
+				html = html.replace(new RegExp("(.*)<\\s*\\/\\s*" + stack.last() + "[^>]*>", 'i'),
+					function (all, text) {
+						text = text.replace(COMMENT_REGEXP, "$1").replace(CDATA_REGEXP, "$1");
+
+						if (handler.chars) handler.chars(decodeEntities(text));
+
+						return "";
+					});
+
+				parseEndTag("", stack.last());
+			}
+
+			if (html == last) {
+				throw $sanitizeMinErr('badparse', "The sanitizer was unable to parse the following block " +
+					"of html: {0}", html);
+			}
+			last = html;
+		}
+
+		// Clean up any remaining tags
+		parseEndTag();
+
+		function parseStartTag(tag, tagName, rest, unary) {
+			tagName = angular.lowercase(tagName);
+			if (blockElements[tagName]) {
+				while (stack.last() && inlineElements[stack.last()]) {
+					parseEndTag("", stack.last());
+				}
+			}
+
+			if (optionalEndTagElements[tagName] && stack.last() == tagName) {
+				parseEndTag("", tagName);
+			}
+
+			unary = voidElements[tagName] || !!unary;
+
+			if (!unary)
+				stack.push(tagName);
+
+			var attrs = {};
+
+			rest.replace(ATTR_REGEXP,
+				function (match, name, doubleQuotedValue, singleQuotedValue, unquotedValue) {
+					var value = doubleQuotedValue
+						|| singleQuotedValue
+						|| unquotedValue
+						|| '';
+
+					attrs[name] = decodeEntities(value);
+				});
+			if (handler.start) handler.start(tagName, attrs, unary);
+		}
+
+		function parseEndTag(tag, tagName) {
+			var pos = 0, i;
+			tagName = angular.lowercase(tagName);
+			if (tagName)
+				// Find the closest opened tag of the same type
+				for (pos = stack.length - 1; pos >= 0; pos--)
+					if (stack[pos] == tagName)
+						break;
+
+			if (pos >= 0) {
+				// Close all the open elements, up the stack
+				for (i = stack.length - 1; i >= pos; i--)
+					if (handler.end) handler.end(stack[i]);
+
+				// Remove the open elements from the stack
+				stack.length = pos;
+			}
+		}
+	}
+
+	var hiddenPre = document.createElement("pre");
+	var spaceRe = /^(\s*)([\s\S]*?)(\s*)$/;
+
+	/**
+	 * decodes all entities into regular string
+	 * @param value
+	 * @returns {string} A string with decoded entities.
+	 */
+	function decodeEntities(value) {
+		if (!value) {
+			return '';
+		}
+
+		// Note: IE8 does not preserve spaces at the start/end of innerHTML
+		// so we must capture them and reattach them afterward
+		var parts = spaceRe.exec(value);
+		var spaceBefore = parts[1];
+		var spaceAfter = parts[3];
+		var content = parts[2];
+		if (content) {
+			hiddenPre.innerHTML = content.replace(/</g, "&lt;");
+			// innerText depends on styling as it doesn't display hidden elements.
+			// Therefore, it's better to use textContent not to cause unnecessary
+			// reflows. However, IE<9 don't support textContent so the innerText
+			// fallback is necessary.
+			content = 'textContent' in hiddenPre ?
+				hiddenPre.textContent : hiddenPre.innerText;
+		}
+		return spaceBefore + content + spaceAfter;
+	}
+
+	/**
+	 * Escapes all potentially dangerous characters, so that the
+	 * resulting string can be safely inserted into attribute or
+	 * element text.
+	 * @param value
+	 * @returns escaped text
+	 */
+	function encodeEntities(value) {
+		return value.replace(/&/g, '&amp;').replace(NON_ALPHANUMERIC_REGEXP, function (value) {
+			return '&#' + value.charCodeAt(0) + ';';
+		}).replace(/</g, '&lt;').replace(/>/g, '&gt;');
+	}
+
+	/**
+	 * create an HTML/XML writer which writes to buffer
+	 * @param {Array} buf use buf.jain('') to get out sanitized html string
+	 * @returns {object} in the form of {
+	 *     start: function(tag, attrs, unary) {},
+	 *     end: function(tag) {},
+	 *     chars: function(text) {},
+	 *     comment: function(text) {}
+	 * }
+	 */
+	function htmlSanitizeWriter(buf, uriValidator) {
+		var ignore = false;
+		var out = angular.bind(buf, buf.push);
+		return {
+			start: function (tag, attrs, unary) {
+				tag = angular.lowercase(tag);
+				if (!ignore && specialElements[tag]) {
+					ignore = tag;
+				}
+				if (!ignore && validElements[tag] === true) {
+					out('<');
+					out(tag);
+					angular.forEach(attrs, function (value, key) {
+						var lkey = angular.lowercase(key);
+						var isImage = (tag === 'img' && lkey === 'src') || (lkey === 'background');
+						if (validAttrs[lkey] === true &&
+							(uriAttrs[lkey] !== true || uriValidator(value, isImage))) {
+							out(' ');
+							out(key);
+							out('="');
+							out(encodeEntities(value));
+							out('"');
+						}
+					});
+					out(unary ? '/>' : '>');
+				}
+			},
+			end: function (tag) {
+				tag = angular.lowercase(tag);
+				if (!ignore && validElements[tag] === true) {
+					out('</');
+					out(tag);
+					out('>');
+				}
+				if (tag == ignore) {
+					ignore = false;
+				}
+			},
+			chars: function (chars) {
+				if (!ignore) {
+					out(encodeEntities(chars));
+				}
+			}
+		};
+	}
 
 
 // define ngSanitize module and register $sanitize service
-angular.module('ngSanitize', []).provider('$sanitize', $SanitizeProvider);
-
-/* global sanitizeText: false */
-
-/**
- * @ngdoc filter
- * @name ngSanitize.filter:linky
- * @function
- *
- * @description
- * Finds links in text input and turns them into html links. Supports http/https/ftp/mailto and
- * plain email address links.
- *
- * Requires the {@link ngSanitize `ngSanitize`} module to be installed.
- *
- * @param {string} text Input text.
- * @param {string} target Window (_blank|_self|_parent|_top) or named frame to open links in.
- * @returns {string} Html-linkified text.
- *
- * @usage
-   <span ng-bind-html="linky_expression | linky"></span>
- *
- * @example
-   <doc:example module="ngSanitize">
+	angular.module('ngSanitize', []).provider('$sanitize', $SanitizeProvider);
+
+	/* global sanitizeText: false */
+
+	/**
+	 * @ngdoc filter
+	 * @name ngSanitize.filter:linky
+	 * @function
+	 *
+	 * @description
+	 * Finds links in text input and turns them into html links. Supports http/https/ftp/mailto and
+	 * plain email address links.
+	 *
+	 * Requires the {@link ngSanitize `ngSanitize`} module to be installed.
+	 *
+	 * @param {string} text Input text.
+	 * @param {string} target Window (_blank|_self|_parent|_top) or named frame to open links in.
+	 * @returns {string} Html-linkified text.
+	 *
+	 * @usage
+     <span ng-bind-html="linky_expression | linky"></span>
+	 *
+	 * @example
+     <doc:example module="ngSanitize">
      <doc:source>
-       <script>
-         function Ctrl($scope) {
+     <script>
+     function Ctrl($scope) {
            $scope.snippet =
              'Pretty text with some links:\n'+
              'http://angularjs.org/,\n'+
@@ -505,56 +507,56 @@ angular.module('ngSanitize', []).provider('$sanitize', $SanitizeProvider);
              'and one more: ftp://127.0.0.1/.';
            $scope.snippetWithTarget = 'http://angularjs.org/';
          }
-       </script>
-       <div ng-controller="Ctrl">
-       Snippet: <textarea ng-model="snippet" cols="60" rows="3"></textarea>
-       <table>
-         <tr>
-           <td>Filter</td>
-           <td>Source</td>
-           <td>Rendered</td>
-         </tr>
-         <tr id="linky-filter">
-           <td>linky filter</td>
-           <td>
-             <pre>&lt;div ng-bind-html="snippet | linky"&gt;<br>&lt;/div&gt;</pre>
-           </td>
-           <td>
-             <div ng-bind-html="snippet | linky"></div>
-           </td>
-         </tr>
-         <tr id="linky-target">
-          <td>linky target</td>
-          <td>
-            <pre>&lt;div ng-bind-html="snippetWithTarget | linky:'_blank'"&gt;<br>&lt;/div&gt;</pre>
-          </td>
-          <td>
-            <div ng-bind-html="snippetWithTarget | linky:'_blank'"></div>
-          </td>
-         </tr>
-         <tr id="escaped-html">
-           <td>no filter</td>
-           <td><pre>&lt;div ng-bind="snippet"&gt;<br>&lt;/div&gt;</pre></td>
-           <td><div ng-bind="snippet"></div></td>
-         </tr>
-       </table>
+     </script>
+     <div ng-controller="Ctrl">
+     Snippet: <textarea ng-model="snippet" cols="60" rows="3"></textarea>
+     <table>
+     <tr>
+     <td>Filter</td>
+     <td>Source</td>
+     <td>Rendered</td>
+     </tr>
+     <tr id="linky-filter">
+     <td>linky filter</td>
+     <td>
+     <pre>&lt;div ng-bind-html="snippet | linky"&gt;<br>&lt;/div&gt;</pre>
+     </td>
+     <td>
+     <div ng-bind-html="snippet | linky"></div>
+     </td>
+     </tr>
+     <tr id="linky-target">
+     <td>linky target</td>
+     <td>
+     <pre>&lt;div ng-bind-html="snippetWithTarget | linky:'_blank'"&gt;<br>&lt;/div&gt;</pre>
+     </td>
+     <td>
+     <div ng-bind-html="snippetWithTarget | linky:'_blank'"></div>
+     </td>
+     </tr>
+     <tr id="escaped-html">
+     <td>no filter</td>
+     <td><pre>&lt;div ng-bind="snippet"&gt;<br>&lt;/div&gt;</pre></td>
+     <td><div ng-bind="snippet"></div></td>
+     </tr>
+     </table>
      </doc:source>
      <doc:protractor>
-       it('should linkify the snippet with urls', function() {
+     it('should linkify the snippet with urls', function() {
          expect(element(by.id('linky-filter')).element(by.binding('snippet | linky')).getText()).
              toBe('Pretty text with some links: http://angularjs.org/, us@somewhere.org, ' +
                   'another@somewhere.org, and one more: ftp://127.0.0.1/.');
          expect(element.all(by.css('#linky-filter a')).count()).toEqual(4);
        });
 
-       it('should not linkify snippet without the linky filter', function() {
+     it('should not linkify snippet without the linky filter', function() {
          expect(element(by.id('escaped-html')).element(by.binding('snippet')).getText()).
              toBe('Pretty text with some links: http://angularjs.org/, mailto:us@somewhere.org, ' +
                   'another@somewhere.org, and one more: ftp://127.0.0.1/.');
          expect(element.all(by.css('#escaped-html a')).count()).toEqual(0);
        });
 
-       it('should update', function() {
+     it('should update', function() {
          element(by.model('snippet')).clear();
          element(by.model('snippet')).sendKeys('new http://link.');
          expect(element(by.id('linky-filter')).element(by.binding('snippet | linky')).getText()).
@@ -564,62 +566,62 @@ angular.module('ngSanitize', []).provider('$sanitize', $SanitizeProvider);
              .toBe('new http://link.');
        });
 
-       it('should work with the target property', function() {
+     it('should work with the target property', function() {
         expect(element(by.id('linky-target')).
             element(by.binding("snippetWithTarget | linky:'_blank'")).getText()).
             toBe('http://angularjs.org/');
         expect(element(by.css('#linky-target a')).getAttribute('target')).toEqual('_blank');
        });
      </doc:protractor>
-   </doc:example>
- */
-angular.module('ngSanitize').filter('linky', ['$sanitize', function($sanitize) {
-  var LINKY_URL_REGEXP =
-        /((ftp|https?):\/\/|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>]/,
-      MAILTO_REGEXP = /^mailto:/;
-
-  return function(text, target) {
-    if (!text) return text;
-    var match;
-    var raw = text;
-    var html = [];
-    var url;
-    var i;
-    while ((match = raw.match(LINKY_URL_REGEXP))) {
-      // We can not end in these as they are sometimes found at the end of the sentence
-      url = match[0];
-      // if we did not match ftp/http/mailto then assume mailto
-      if (match[2] == match[3]) url = 'mailto:' + url;
-      i = match.index;
-      addText(raw.substr(0, i));
-      addLink(url, match[0].replace(MAILTO_REGEXP, ''));
-      raw = raw.substring(i + match[0].length);
-    }
-    addText(raw);
-    return $sanitize(html.join(''));
-
-    function addText(text) {
-      if (!text) {
-        return;
-      }
-      html.push(sanitizeText(text));
-    }
-
-    function addLink(url, text) {
-      html.push('<a ');
-      if (angular.isDefined(target)) {
-        html.push('target="');
-        html.push(target);
-        html.push('" ');
-      }
-      html.push('href="');
-      html.push(url);
-      html.push('">');
-      addText(text);
-      html.push('</a>');
-    }
-  };
-}]);
+     </doc:example>
+	 */
+	angular.module('ngSanitize').filter('linky', ['$sanitize', function ($sanitize) {
+		var LINKY_URL_REGEXP =
+				/((ftp|https?):\/\/|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>]/,
+			MAILTO_REGEXP = /^mailto:/;
+
+		return function (text, target) {
+			if (!text) return text;
+			var match;
+			var raw = text;
+			var html = [];
+			var url;
+			var i;
+			while ((match = raw.match(LINKY_URL_REGEXP))) {
+				// We can not end in these as they are sometimes found at the end of the sentence
+				url = match[0];
+				// if we did not match ftp/http/mailto then assume mailto
+				if (match[2] == match[3]) url = 'mailto:' + url;
+				i = match.index;
+				addText(raw.substr(0, i));
+				addLink(url, match[0].replace(MAILTO_REGEXP, ''));
+				raw = raw.substring(i + match[0].length);
+			}
+			addText(raw);
+			return $sanitize(html.join(''));
+
+			function addText(text) {
+				if (!text) {
+					return;
+				}
+				html.push(sanitizeText(text));
+			}
+
+			function addLink(url, text) {
+				html.push('<a ');
+				if (angular.isDefined(target)) {
+					html.push('target="');
+					html.push(target);
+					html.push('" ');
+				}
+				html.push('href="');
+				html.push(url);
+				html.push('">');
+				addText(text);
+				html.push('</a>');
+			}
+		};
+	}]);
 
 
 })(window, window.angular);
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.js b/len-activiti/src/main/resources/static/editor-app/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.js
index ee3303e..458da34 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/angular-translate-loader-static-files/angular-translate-loader-static-files.js
@@ -4,28 +4,28 @@
  * Copyright (c) 2014 ; Licensed MIT
  */
 angular.module('pascalprecht.translate').factory('$translateStaticFilesLoader', [
-  '$q',
-  '$http',
-  function ($q, $http) {
-    return function (options) {
-      if (!options || (!angular.isString(options.prefix) || !angular.isString(options.suffix))) {
-        throw new Error('Couldn\'t load static files, no prefix or suffix specified!');
-      }
-      var deferred = $q.defer();
-      $http(angular.extend({
-        url: [
-          options.prefix,
-          options.key,
-          options.suffix
-        ].join(''),
-        method: 'GET',
-        params: ''
-      }, options.$http)).success(function (data) {
-        deferred.resolve(data);
-      }).error(function (data) {
-        deferred.reject(options.key);
-      });
-      return deferred.promise;
-    };
-  }
-]);
\ No newline at end of file
+	'$q',
+	'$http',
+	function ($q, $http) {
+		return function (options) {
+			if (!options || (!angular.isString(options.prefix) || !angular.isString(options.suffix))) {
+				throw new Error('Couldn\'t load static files, no prefix or suffix specified!');
+			}
+			var deferred = $q.defer();
+			$http(angular.extend({
+				url: [
+					options.prefix,
+					options.key,
+					options.suffix
+				].join(''),
+				method: 'GET',
+				params: ''
+			}, options.$http)).success(function (data) {
+				deferred.resolve(data);
+			}).error(function (data) {
+				deferred.reject(options.key);
+			});
+			return deferred.promise;
+		};
+	}
+]);
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.js b/len-activiti/src/main/resources/static/editor-app/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.js
index 34f180b..382c46d 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/angular-translate-storage-cookie/angular-translate-storage-cookie.js
@@ -4,16 +4,16 @@
  * Copyright (c) 2014 ; Licensed MIT
  */
 angular.module('pascalprecht.translate').factory('$translateCookieStorage', [
-  '$cookieStore',
-  function ($cookieStore) {
-    var $translateCookieStorage = {
-        get: function (name) {
-          return $cookieStore.get(name);
-        },
-        set: function (name, value) {
-          $cookieStore.put(name, value);
-        }
-      };
-    return $translateCookieStorage;
-  }
-]);
\ No newline at end of file
+	'$cookieStore',
+	function ($cookieStore) {
+		var $translateCookieStorage = {
+			get: function (name) {
+				return $cookieStore.get(name);
+			},
+			set: function (name, value) {
+				$cookieStore.put(name, value);
+			}
+		};
+		return $translateCookieStorage;
+	}
+]);
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/angular-translate_2.4.2/angular-translate.js b/len-activiti/src/main/resources/static/editor-app/libs/angular-translate_2.4.2/angular-translate.js
index 46bcb55..20dfb69 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/angular-translate_2.4.2/angular-translate.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/angular-translate_2.4.2/angular-translate.js
@@ -4,957 +4,971 @@
  * Copyright (c) 2014 ; Licensed MIT
  */
 angular.module('pascalprecht.translate', ['ng']).run([
-  '$translate',
-  function ($translate) {
-    var key = $translate.storageKey(), storage = $translate.storage();
-    if (storage) {
-      if (!storage.get(key)) {
-        if (angular.isString($translate.preferredLanguage())) {
-          $translate.use($translate.preferredLanguage());
-        } else {
-          storage.set(key, $translate.use());
-        }
-      } else {
-        $translate.use(storage.get(key));
-      }
-    } else if (angular.isString($translate.preferredLanguage())) {
-      $translate.use($translate.preferredLanguage());
-    }
-  }
+	'$translate',
+	function ($translate) {
+		var key = $translate.storageKey(), storage = $translate.storage();
+		if (storage) {
+			if (!storage.get(key)) {
+				if (angular.isString($translate.preferredLanguage())) {
+					$translate.use($translate.preferredLanguage());
+				} else {
+					storage.set(key, $translate.use());
+				}
+			} else {
+				$translate.use(storage.get(key));
+			}
+		} else if (angular.isString($translate.preferredLanguage())) {
+			$translate.use($translate.preferredLanguage());
+		}
+	}
 ]);
 angular.module('pascalprecht.translate').provider('$translate', [
-  '$STORAGE_KEY',
-  function ($STORAGE_KEY) {
-    var $translationTable = {}, $preferredLanguage, $availableLanguageKeys = [], $languageKeyAliases, $fallbackLanguage, $fallbackWasString, $uses, $nextLang, $storageFactory, $storageKey = $STORAGE_KEY, $storagePrefix, $missingTranslationHandlerFactory, $interpolationFactory, $interpolatorFactories = [], $interpolationSanitizationStrategy = false, $loaderFactory, $cloakClassName = 'translate-cloak', $loaderOptions, $notFoundIndicatorLeft, $notFoundIndicatorRight, $postCompilingEnabled = false, NESTED_OBJECT_DELIMITER = '.', loaderCache;
-    var version = '2.4.2';
-    var getLocale = function () {
-      var nav = window.navigator;
-      return ((angular.isArray(nav.languages) ? nav.languages[0] : nav.language || nav.browserLanguage || nav.systemLanguage || nav.userLanguage) || '').split('-').join('_');
-    };
-    var indexOf = function (array, searchElement) {
-      for (var i = 0, len = array.length; i < len; i++) {
-        if (array[i] === searchElement) {
-          return i;
-        }
-      }
-      return -1;
-    };
-    var trim = function () {
-      return this.replace(/^\s+|\s+$/g, '');
-    };
-    var negotiateLocale = function (preferred) {
-      var avail = [], locale = angular.lowercase(preferred), i = 0, n = $availableLanguageKeys.length;
-      for (; i < n; i++) {
-        avail.push(angular.lowercase($availableLanguageKeys[i]));
-      }
-      if (indexOf(avail, locale) > -1) {
-        return preferred;
-      }
-      if ($languageKeyAliases) {
-        var alias;
-        for (var langKeyAlias in $languageKeyAliases) {
-          var hasWildcardKey = false;
-          var hasExactKey = Object.prototype.hasOwnProperty.call($languageKeyAliases, langKeyAlias) && angular.lowercase(langKeyAlias) === angular.lowercase(preferred);
-          if (langKeyAlias.slice(-1) === '*') {
-            hasWildcardKey = langKeyAlias.slice(0, -1) === preferred.slice(0, langKeyAlias.length - 1);
-          }
-          if (hasExactKey || hasWildcardKey) {
-            alias = $languageKeyAliases[langKeyAlias];
-            if (indexOf(avail, angular.lowercase(alias)) > -1) {
-              return alias;
-            }
-          }
-        }
-      }
-      var parts = preferred.split('_');
-      if (parts.length > 1 && indexOf(avail, angular.lowercase(parts[0])) > -1) {
-        return parts[0];
-      }
-      return preferred;
-    };
-    var translations = function (langKey, translationTable) {
-      if (!langKey && !translationTable) {
-        return $translationTable;
-      }
-      if (langKey && !translationTable) {
-        if (angular.isString(langKey)) {
-          return $translationTable[langKey];
-        }
-      } else {
-        if (!angular.isObject($translationTable[langKey])) {
-          $translationTable[langKey] = {};
-        }
-        angular.extend($translationTable[langKey], flatObject(translationTable));
-      }
-      return this;
-    };
-    this.translations = translations;
-    this.cloakClassName = function (name) {
-      if (!name) {
-        return $cloakClassName;
-      }
-      $cloakClassName = name;
-      return this;
-    };
-    var flatObject = function (data, path, result, prevKey) {
-      var key, keyWithPath, keyWithShortPath, val;
-      if (!path) {
-        path = [];
-      }
-      if (!result) {
-        result = {};
-      }
-      for (key in data) {
-        if (!Object.prototype.hasOwnProperty.call(data, key)) {
-          continue;
-        }
-        val = data[key];
-        if (angular.isObject(val)) {
-          flatObject(val, path.concat(key), result, key);
-        } else {
-          keyWithPath = path.length ? '' + path.join(NESTED_OBJECT_DELIMITER) + NESTED_OBJECT_DELIMITER + key : key;
-          if (path.length && key === prevKey) {
-            keyWithShortPath = '' + path.join(NESTED_OBJECT_DELIMITER);
-            result[keyWithShortPath] = '@:' + keyWithPath;
-          }
-          result[keyWithPath] = val;
-        }
-      }
-      return result;
-    };
-    this.addInterpolation = function (factory) {
-      $interpolatorFactories.push(factory);
-      return this;
-    };
-    this.useMessageFormatInterpolation = function () {
-      return this.useInterpolation('$translateMessageFormatInterpolation');
-    };
-    this.useInterpolation = function (factory) {
-      $interpolationFactory = factory;
-      return this;
-    };
-    this.useSanitizeValueStrategy = function (value) {
-      $interpolationSanitizationStrategy = value;
-      return this;
-    };
-    this.preferredLanguage = function (langKey) {
-      setupPreferredLanguage(langKey);
-      return this;
-    };
-    var setupPreferredLanguage = function (langKey) {
-      if (langKey) {
-        $preferredLanguage = langKey;
-      }
-      return $preferredLanguage;
-    };
-    this.translationNotFoundIndicator = function (indicator) {
-      this.translationNotFoundIndicatorLeft(indicator);
-      this.translationNotFoundIndicatorRight(indicator);
-      return this;
-    };
-    this.translationNotFoundIndicatorLeft = function (indicator) {
-      if (!indicator) {
-        return $notFoundIndicatorLeft;
-      }
-      $notFoundIndicatorLeft = indicator;
-      return this;
-    };
-    this.translationNotFoundIndicatorRight = function (indicator) {
-      if (!indicator) {
-        return $notFoundIndicatorRight;
-      }
-      $notFoundIndicatorRight = indicator;
-      return this;
-    };
-    this.fallbackLanguage = function (langKey) {
-      fallbackStack(langKey);
-      return this;
-    };
-    var fallbackStack = function (langKey) {
-      if (langKey) {
-        if (angular.isString(langKey)) {
-          $fallbackWasString = true;
-          $fallbackLanguage = [langKey];
-        } else if (angular.isArray(langKey)) {
-          $fallbackWasString = false;
-          $fallbackLanguage = langKey;
-        }
-        if (angular.isString($preferredLanguage) && indexOf($fallbackLanguage, $preferredLanguage) < 0) {
-          $fallbackLanguage.push($preferredLanguage);
-        }
-        return this;
-      } else {
-        if ($fallbackWasString) {
-          return $fallbackLanguage[0];
-        } else {
-          return $fallbackLanguage;
-        }
-      }
-    };
-    this.use = function (langKey) {
-      if (langKey) {
-        if (!$translationTable[langKey] && !$loaderFactory) {
-          throw new Error('$translateProvider couldn\'t find translationTable for langKey: \'' + langKey + '\'');
-        }
-        $uses = langKey;
-        return this;
-      }
-      return $uses;
-    };
-    var storageKey = function (key) {
-      if (!key) {
-        if ($storagePrefix) {
-          return $storagePrefix + $storageKey;
-        }
-        return $storageKey;
-      }
-      $storageKey = key;
-    };
-    this.storageKey = storageKey;
-    this.useUrlLoader = function (url, options) {
-      return this.useLoader('$translateUrlLoader', angular.extend({ url: url }, options));
-    };
-    this.useStaticFilesLoader = function (options) {
-      return this.useLoader('$translateStaticFilesLoader', options);
-    };
-    this.useLoader = function (loaderFactory, options) {
-      $loaderFactory = loaderFactory;
-      $loaderOptions = options || {};
-      return this;
-    };
-    this.useLocalStorage = function () {
-      return this.useStorage('$translateLocalStorage');
-    };
-    this.useCookieStorage = function () {
-      return this.useStorage('$translateCookieStorage');
-    };
-    this.useStorage = function (storageFactory) {
-      $storageFactory = storageFactory;
-      return this;
-    };
-    this.storagePrefix = function (prefix) {
-      if (!prefix) {
-        return prefix;
-      }
-      $storagePrefix = prefix;
-      return this;
-    };
-    this.useMissingTranslationHandlerLog = function () {
-      return this.useMissingTranslationHandler('$translateMissingTranslationHandlerLog');
-    };
-    this.useMissingTranslationHandler = function (factory) {
-      $missingTranslationHandlerFactory = factory;
-      return this;
-    };
-    this.usePostCompiling = function (value) {
-      $postCompilingEnabled = !!value;
-      return this;
-    };
-    this.determinePreferredLanguage = function (fn) {
-      var locale = fn && angular.isFunction(fn) ? fn() : getLocale();
-      if (!$availableLanguageKeys.length) {
-        $preferredLanguage = locale;
-      } else {
-        $preferredLanguage = negotiateLocale(locale);
-      }
-      return this;
-    };
-    this.registerAvailableLanguageKeys = function (languageKeys, aliases) {
-      if (languageKeys) {
-        $availableLanguageKeys = languageKeys;
-        if (aliases) {
-          $languageKeyAliases = aliases;
-        }
-        return this;
-      }
-      return $availableLanguageKeys;
-    };
-    this.useLoaderCache = function (cache) {
-      if (cache === false) {
-        loaderCache = undefined;
-      } else if (cache === true) {
-        loaderCache = true;
-      } else if (typeof cache === 'undefined') {
-        loaderCache = '$translationCache';
-      } else if (cache) {
-        loaderCache = cache;
-      }
-      return this;
-    };
-    this.$get = [
-      '$log',
-      '$injector',
-      '$rootScope',
-      '$q',
-      function ($log, $injector, $rootScope, $q) {
-        var Storage, defaultInterpolator = $injector.get($interpolationFactory || '$translateDefaultInterpolation'), pendingLoader = false, interpolatorHashMap = {}, langPromises = {}, fallbackIndex, startFallbackIteration;
-        var $translate = function (translationId, interpolateParams, interpolationId) {
-          if (angular.isArray(translationId)) {
-            var translateAll = function (translationIds) {
-              var results = {};
-              var promises = [];
-              var translate = function (translationId) {
-                var deferred = $q.defer();
-                var regardless = function (value) {
-                  results[translationId] = value;
-                  deferred.resolve([
-                    translationId,
-                    value
-                  ]);
-                };
-                $translate(translationId, interpolateParams, interpolationId).then(regardless, regardless);
-                return deferred.promise;
-              };
-              for (var i = 0, c = translationIds.length; i < c; i++) {
-                promises.push(translate(translationIds[i]));
-              }
-              return $q.all(promises).then(function () {
-                return results;
-              });
-            };
-            return translateAll(translationId);
-          }
-          var deferred = $q.defer();
-          if (translationId) {
-            translationId = trim.apply(translationId);
-          }
-          var promiseToWaitFor = function () {
-              var promise = $preferredLanguage ? langPromises[$preferredLanguage] : langPromises[$uses];
-              fallbackIndex = 0;
-              if ($storageFactory && !promise) {
-                var langKey = Storage.get($storageKey);
-                promise = langPromises[langKey];
-                if ($fallbackLanguage && $fallbackLanguage.length) {
-                  var index = indexOf($fallbackLanguage, langKey);
-                  fallbackIndex = index === 0 ? 1 : 0;
-                  if (indexOf($fallbackLanguage, $preferredLanguage) < 0) {
-                    $fallbackLanguage.push($preferredLanguage);
-                  }
-                }
-              }
-              return promise;
-            }();
-          if (!promiseToWaitFor) {
-            determineTranslation(translationId, interpolateParams, interpolationId).then(deferred.resolve, deferred.reject);
-          } else {
-            promiseToWaitFor.then(function () {
-              determineTranslation(translationId, interpolateParams, interpolationId).then(deferred.resolve, deferred.reject);
-            }, deferred.reject);
-          }
-          return deferred.promise;
-        };
-        var applyNotFoundIndicators = function (translationId) {
-          if ($notFoundIndicatorLeft) {
-            translationId = [
-              $notFoundIndicatorLeft,
-              translationId
-            ].join(' ');
-          }
-          if ($notFoundIndicatorRight) {
-            translationId = [
-              translationId,
-              $notFoundIndicatorRight
-            ].join(' ');
-          }
-          return translationId;
-        };
-        var useLanguage = function (key) {
-          $uses = key;
-          $rootScope.$emit('$translateChangeSuccess', { language: key });
-          if ($storageFactory) {
-            Storage.set($translate.storageKey(), $uses);
-          }
-          defaultInterpolator.setLocale($uses);
-          angular.forEach(interpolatorHashMap, function (interpolator, id) {
-            interpolatorHashMap[id].setLocale($uses);
-          });
-          $rootScope.$emit('$translateChangeEnd', { language: key });
-        };
-        var loadAsync = function (key) {
-          if (!key) {
-            throw 'No language key specified for loading.';
-          }
-          var deferred = $q.defer();
-          $rootScope.$emit('$translateLoadingStart', { language: key });
-          pendingLoader = true;
-          var cache = loaderCache;
-          if (typeof cache === 'string') {
-            cache = $injector.get(cache);
-          }
-          var loaderOptions = angular.extend({}, $loaderOptions, {
-              key: key,
-              $http: angular.extend({}, { cache: cache }, $loaderOptions.$http)
-            });
-          $injector.get($loaderFactory)(loaderOptions).then(function (data) {
-            var translationTable = {};
-            $rootScope.$emit('$translateLoadingSuccess', { language: key });
-            if (angular.isArray(data)) {
-              angular.forEach(data, function (table) {
-                angular.extend(translationTable, flatObject(table));
-              });
-            } else {
-              angular.extend(translationTable, flatObject(data));
-            }
-            pendingLoader = false;
-            deferred.resolve({
-              key: key,
-              table: translationTable
-            });
-            $rootScope.$emit('$translateLoadingEnd', { language: key });
-          }, function (key) {
-            $rootScope.$emit('$translateLoadingError', { language: key });
-            deferred.reject(key);
-            $rootScope.$emit('$translateLoadingEnd', { language: key });
-          });
-          return deferred.promise;
-        };
-        if ($storageFactory) {
-          Storage = $injector.get($storageFactory);
-          if (!Storage.get || !Storage.set) {
-            throw new Error('Couldn\'t use storage \'' + $storageFactory + '\', missing get() or set() method!');
-          }
-        }
-        if (angular.isFunction(defaultInterpolator.useSanitizeValueStrategy)) {
-          defaultInterpolator.useSanitizeValueStrategy($interpolationSanitizationStrategy);
-        }
-        if ($interpolatorFactories.length) {
-          angular.forEach($interpolatorFactories, function (interpolatorFactory) {
-            var interpolator = $injector.get(interpolatorFactory);
-            interpolator.setLocale($preferredLanguage || $uses);
-            if (angular.isFunction(interpolator.useSanitizeValueStrategy)) {
-              interpolator.useSanitizeValueStrategy($interpolationSanitizationStrategy);
-            }
-            interpolatorHashMap[interpolator.getInterpolationIdentifier()] = interpolator;
-          });
-        }
-        var getTranslationTable = function (langKey) {
-          var deferred = $q.defer();
-          if (Object.prototype.hasOwnProperty.call($translationTable, langKey)) {
-            deferred.resolve($translationTable[langKey]);
-          } else if (langPromises[langKey]) {
-            langPromises[langKey].then(function (data) {
-              translations(data.key, data.table);
-              deferred.resolve(data.table);
-            }, deferred.reject);
-          } else {
-            deferred.reject();
-          }
-          return deferred.promise;
-        };
-        var getFallbackTranslation = function (langKey, translationId, interpolateParams, Interpolator) {
-          var deferred = $q.defer();
-          getTranslationTable(langKey).then(function (translationTable) {
-            if (Object.prototype.hasOwnProperty.call(translationTable, translationId)) {
-              Interpolator.setLocale(langKey);
-              deferred.resolve(Interpolator.interpolate(translationTable[translationId], interpolateParams));
-              Interpolator.setLocale($uses);
-            } else {
-              deferred.reject();
-            }
-          }, deferred.reject);
-          return deferred.promise;
-        };
-        var getFallbackTranslationInstant = function (langKey, translationId, interpolateParams, Interpolator) {
-          var result, translationTable = $translationTable[langKey];
-          if (Object.prototype.hasOwnProperty.call(translationTable, translationId)) {
-            Interpolator.setLocale(langKey);
-            result = Interpolator.interpolate(translationTable[translationId], interpolateParams);
-            Interpolator.setLocale($uses);
-          }
-          return result;
-        };
-        var translateByHandler = function (translationId) {
-          if ($missingTranslationHandlerFactory) {
-            var resultString = $injector.get($missingTranslationHandlerFactory)(translationId, $uses);
-            if (resultString !== undefined) {
-              return resultString;
-            } else {
-              return translationId;
-            }
-          } else {
-            return translationId;
-          }
-        };
-        var resolveForFallbackLanguage = function (fallbackLanguageIndex, translationId, interpolateParams, Interpolator) {
-          var deferred = $q.defer();
-          if (fallbackLanguageIndex < $fallbackLanguage.length) {
-            var langKey = $fallbackLanguage[fallbackLanguageIndex];
-            getFallbackTranslation(langKey, translationId, interpolateParams, Interpolator).then(deferred.resolve, function () {
-              resolveForFallbackLanguage(fallbackLanguageIndex + 1, translationId, interpolateParams, Interpolator).then(deferred.resolve);
-            });
-          } else {
-            deferred.resolve(translateByHandler(translationId));
-          }
-          return deferred.promise;
-        };
-        var resolveForFallbackLanguageInstant = function (fallbackLanguageIndex, translationId, interpolateParams, Interpolator) {
-          var result;
-          if (fallbackLanguageIndex < $fallbackLanguage.length) {
-            var langKey = $fallbackLanguage[fallbackLanguageIndex];
-            result = getFallbackTranslationInstant(langKey, translationId, interpolateParams, Interpolator);
-            if (!result) {
-              result = resolveForFallbackLanguageInstant(fallbackLanguageIndex + 1, translationId, interpolateParams, Interpolator);
-            }
-          }
-          return result;
-        };
-        var fallbackTranslation = function (translationId, interpolateParams, Interpolator) {
-          return resolveForFallbackLanguage(startFallbackIteration > 0 ? startFallbackIteration : fallbackIndex, translationId, interpolateParams, Interpolator);
-        };
-        var fallbackTranslationInstant = function (translationId, interpolateParams, Interpolator) {
-          return resolveForFallbackLanguageInstant(startFallbackIteration > 0 ? startFallbackIteration : fallbackIndex, translationId, interpolateParams, Interpolator);
-        };
-        var determineTranslation = function (translationId, interpolateParams, interpolationId) {
-          var deferred = $q.defer();
-          var table = $uses ? $translationTable[$uses] : $translationTable, Interpolator = interpolationId ? interpolatorHashMap[interpolationId] : defaultInterpolator;
-          if (table && Object.prototype.hasOwnProperty.call(table, translationId)) {
-            var translation = table[translationId];
-            if (translation.substr(0, 2) === '@:') {
-              $translate(translation.substr(2), interpolateParams, interpolationId).then(deferred.resolve, deferred.reject);
-            } else {
-              deferred.resolve(Interpolator.interpolate(translation, interpolateParams));
-            }
-          } else {
-            var missingTranslationHandlerTranslation;
-            if ($missingTranslationHandlerFactory && !pendingLoader) {
-              missingTranslationHandlerTranslation = translateByHandler(translationId);
-            }
-            if ($uses && $fallbackLanguage && $fallbackLanguage.length) {
-              fallbackTranslation(translationId, interpolateParams, Interpolator).then(function (translation) {
-                deferred.resolve(translation);
-              }, function (_translationId) {
-                deferred.reject(applyNotFoundIndicators(_translationId));
-              });
-            } else if ($missingTranslationHandlerFactory && !pendingLoader && missingTranslationHandlerTranslation) {
-              deferred.resolve(missingTranslationHandlerTranslation);
-            } else {
-              deferred.reject(applyNotFoundIndicators(translationId));
-            }
-          }
-          return deferred.promise;
-        };
-        var determineTranslationInstant = function (translationId, interpolateParams, interpolationId) {
-          var result, table = $uses ? $translationTable[$uses] : $translationTable, Interpolator = interpolationId ? interpolatorHashMap[interpolationId] : defaultInterpolator;
-          if (table && Object.prototype.hasOwnProperty.call(table, translationId)) {
-            var translation = table[translationId];
-            if (translation.substr(0, 2) === '@:') {
-              result = determineTranslationInstant(translation.substr(2), interpolateParams, interpolationId);
-            } else {
-              result = Interpolator.interpolate(translation, interpolateParams);
-            }
-          } else {
-            var missingTranslationHandlerTranslation;
-            if ($missingTranslationHandlerFactory && !pendingLoader) {
-              missingTranslationHandlerTranslation = translateByHandler(translationId);
-            }
-            if ($uses && $fallbackLanguage && $fallbackLanguage.length) {
-              fallbackIndex = 0;
-              result = fallbackTranslationInstant(translationId, interpolateParams, Interpolator);
-            } else if ($missingTranslationHandlerFactory && !pendingLoader && missingTranslationHandlerTranslation) {
-              result = missingTranslationHandlerTranslation;
-            } else {
-              result = applyNotFoundIndicators(translationId);
-            }
-          }
-          return result;
-        };
-        $translate.preferredLanguage = function (langKey) {
-          if (langKey) {
-            setupPreferredLanguage(langKey);
-          }
-          return $preferredLanguage;
-        };
-        $translate.cloakClassName = function () {
-          return $cloakClassName;
-        };
-        $translate.fallbackLanguage = function (langKey) {
-          if (langKey !== undefined && langKey !== null) {
-            fallbackStack(langKey);
-            if ($loaderFactory) {
-              if ($fallbackLanguage && $fallbackLanguage.length) {
-                for (var i = 0, len = $fallbackLanguage.length; i < len; i++) {
-                  if (!langPromises[$fallbackLanguage[i]]) {
-                    langPromises[$fallbackLanguage[i]] = loadAsync($fallbackLanguage[i]);
-                  }
-                }
-              }
-            }
-            $translate.use($translate.use());
-          }
-          if ($fallbackWasString) {
-            return $fallbackLanguage[0];
-          } else {
-            return $fallbackLanguage;
-          }
-        };
-        $translate.useFallbackLanguage = function (langKey) {
-          if (langKey !== undefined && langKey !== null) {
-            if (!langKey) {
-              startFallbackIteration = 0;
-            } else {
-              var langKeyPosition = indexOf($fallbackLanguage, langKey);
-              if (langKeyPosition > -1) {
-                startFallbackIteration = langKeyPosition;
-              }
-            }
-          }
-        };
-        $translate.proposedLanguage = function () {
-          return $nextLang;
-        };
-        $translate.storage = function () {
-          return Storage;
-        };
-        $translate.use = function (key) {
-          if (!key) {
-            return $uses;
-          }
-          var deferred = $q.defer();
-          $rootScope.$emit('$translateChangeStart', { language: key });
-          var aliasedKey = negotiateLocale(key);
-          if (aliasedKey) {
-            key = aliasedKey;
-          }
-          if (!$translationTable[key] && $loaderFactory && !langPromises[key]) {
-            $nextLang = key;
-            langPromises[key] = loadAsync(key).then(function (translation) {
-              translations(translation.key, translation.table);
-              deferred.resolve(translation.key);
-              useLanguage(translation.key);
-              if ($nextLang === key) {
-                $nextLang = undefined;
-              }
-            }, function (key) {
-              if ($nextLang === key) {
-                $nextLang = undefined;
-              }
-              $rootScope.$emit('$translateChangeError', { language: key });
-              deferred.reject(key);
-              $rootScope.$emit('$translateChangeEnd', { language: key });
-            });
-          } else {
-            deferred.resolve(key);
-            useLanguage(key);
-          }
-          return deferred.promise;
-        };
-        $translate.storageKey = function () {
-          return storageKey();
-        };
-        $translate.isPostCompilingEnabled = function () {
-          return $postCompilingEnabled;
-        };
-        $translate.refresh = function (langKey) {
-          if (!$loaderFactory) {
-            throw new Error('Couldn\'t refresh translation table, no loader registered!');
-          }
-          var deferred = $q.defer();
-          function resolve() {
-            deferred.resolve();
-            $rootScope.$emit('$translateRefreshEnd', { language: langKey });
-          }
-          function reject() {
-            deferred.reject();
-            $rootScope.$emit('$translateRefreshEnd', { language: langKey });
-          }
-          $rootScope.$emit('$translateRefreshStart', { language: langKey });
-          if (!langKey) {
-            var tables = [], loadingKeys = {};
-            if ($fallbackLanguage && $fallbackLanguage.length) {
-              for (var i = 0, len = $fallbackLanguage.length; i < len; i++) {
-                tables.push(loadAsync($fallbackLanguage[i]));
-                loadingKeys[$fallbackLanguage[i]] = true;
-              }
-            }
-            if ($uses && !loadingKeys[$uses]) {
-              tables.push(loadAsync($uses));
-            }
-            $q.all(tables).then(function (tableData) {
-              angular.forEach(tableData, function (data) {
-                if ($translationTable[data.key]) {
-                  delete $translationTable[data.key];
-                }
-                translations(data.key, data.table);
-              });
-              if ($uses) {
-                useLanguage($uses);
-              }
-              resolve();
-            });
-          } else if ($translationTable[langKey]) {
-            loadAsync(langKey).then(function (data) {
-              translations(data.key, data.table);
-              if (langKey === $uses) {
-                useLanguage($uses);
-              }
-              resolve();
-            }, reject);
-          } else {
-            reject();
-          }
-          return deferred.promise;
-        };
-        $translate.instant = function (translationId, interpolateParams, interpolationId) {
-          if (translationId === null || angular.isUndefined(translationId)) {
-            return translationId;
-          }
-          if (angular.isArray(translationId)) {
-            var results = {};
-            for (var i = 0, c = translationId.length; i < c; i++) {
-              results[translationId[i]] = $translate.instant(translationId[i], interpolateParams, interpolationId);
-            }
-            return results;
-          }
-          if (angular.isString(translationId) && translationId.length < 1) {
-            return translationId;
-          }
-          if (translationId) {
-            translationId = trim.apply(translationId);
-          }
-          var result, possibleLangKeys = [];
-          if ($preferredLanguage) {
-            possibleLangKeys.push($preferredLanguage);
-          }
-          if ($uses) {
-            possibleLangKeys.push($uses);
-          }
-          if ($fallbackLanguage && $fallbackLanguage.length) {
-            possibleLangKeys = possibleLangKeys.concat($fallbackLanguage);
-          }
-          for (var j = 0, d = possibleLangKeys.length; j < d; j++) {
-            var possibleLangKey = possibleLangKeys[j];
-            if ($translationTable[possibleLangKey]) {
-              if (typeof $translationTable[possibleLangKey][translationId] !== 'undefined') {
-                result = determineTranslationInstant(translationId, interpolateParams, interpolationId);
-              }
-            }
-            if (typeof result !== 'undefined') {
-              break;
-            }
-          }
-          if (!result && result !== '') {
-            result = defaultInterpolator.interpolate(translationId, interpolateParams);
-            if ($missingTranslationHandlerFactory && !pendingLoader) {
-              result = translateByHandler(translationId);
-            }
-          }
-          return result;
-        };
-        $translate.versionInfo = function () {
-          return version;
-        };
-        $translate.loaderCache = function () {
-          return loaderCache;
-        };
-        if ($loaderFactory) {
-          if (angular.equals($translationTable, {})) {
-            $translate.use($translate.use());
-          }
-          if ($fallbackLanguage && $fallbackLanguage.length) {
-            var processAsyncResult = function (translation) {
-              translations(translation.key, translation.table);
-              $rootScope.$emit('$translateChangeEnd', { language: translation.key });
-            };
-            for (var i = 0, len = $fallbackLanguage.length; i < len; i++) {
-              langPromises[$fallbackLanguage[i]] = loadAsync($fallbackLanguage[i]).then(processAsyncResult);
-            }
-          }
-        }
-        return $translate;
-      }
-    ];
-  }
+	'$STORAGE_KEY',
+	function ($STORAGE_KEY) {
+		var $translationTable = {}, $preferredLanguage, $availableLanguageKeys = [], $languageKeyAliases,
+			$fallbackLanguage, $fallbackWasString, $uses, $nextLang, $storageFactory, $storageKey = $STORAGE_KEY,
+			$storagePrefix, $missingTranslationHandlerFactory, $interpolationFactory, $interpolatorFactories = [],
+			$interpolationSanitizationStrategy = false, $loaderFactory, $cloakClassName = 'translate-cloak',
+			$loaderOptions, $notFoundIndicatorLeft, $notFoundIndicatorRight, $postCompilingEnabled = false,
+			NESTED_OBJECT_DELIMITER = '.', loaderCache;
+		var version = '2.4.2';
+		var getLocale = function () {
+			var nav = window.navigator;
+			return ((angular.isArray(nav.languages) ? nav.languages[0] : nav.language || nav.browserLanguage || nav.systemLanguage || nav.userLanguage) || '').split('-').join('_');
+		};
+		var indexOf = function (array, searchElement) {
+			for (var i = 0, len = array.length; i < len; i++) {
+				if (array[i] === searchElement) {
+					return i;
+				}
+			}
+			return -1;
+		};
+		var trim = function () {
+			return this.replace(/^\s+|\s+$/g, '');
+		};
+		var negotiateLocale = function (preferred) {
+			var avail = [], locale = angular.lowercase(preferred), i = 0, n = $availableLanguageKeys.length;
+			for (; i < n; i++) {
+				avail.push(angular.lowercase($availableLanguageKeys[i]));
+			}
+			if (indexOf(avail, locale) > -1) {
+				return preferred;
+			}
+			if ($languageKeyAliases) {
+				var alias;
+				for (var langKeyAlias in $languageKeyAliases) {
+					var hasWildcardKey = false;
+					var hasExactKey = Object.prototype.hasOwnProperty.call($languageKeyAliases, langKeyAlias) && angular.lowercase(langKeyAlias) === angular.lowercase(preferred);
+					if (langKeyAlias.slice(-1) === '*') {
+						hasWildcardKey = langKeyAlias.slice(0, -1) === preferred.slice(0, langKeyAlias.length - 1);
+					}
+					if (hasExactKey || hasWildcardKey) {
+						alias = $languageKeyAliases[langKeyAlias];
+						if (indexOf(avail, angular.lowercase(alias)) > -1) {
+							return alias;
+						}
+					}
+				}
+			}
+			var parts = preferred.split('_');
+			if (parts.length > 1 && indexOf(avail, angular.lowercase(parts[0])) > -1) {
+				return parts[0];
+			}
+			return preferred;
+		};
+		var translations = function (langKey, translationTable) {
+			if (!langKey && !translationTable) {
+				return $translationTable;
+			}
+			if (langKey && !translationTable) {
+				if (angular.isString(langKey)) {
+					return $translationTable[langKey];
+				}
+			} else {
+				if (!angular.isObject($translationTable[langKey])) {
+					$translationTable[langKey] = {};
+				}
+				angular.extend($translationTable[langKey], flatObject(translationTable));
+			}
+			return this;
+		};
+		this.translations = translations;
+		this.cloakClassName = function (name) {
+			if (!name) {
+				return $cloakClassName;
+			}
+			$cloakClassName = name;
+			return this;
+		};
+		var flatObject = function (data, path, result, prevKey) {
+			var key, keyWithPath, keyWithShortPath, val;
+			if (!path) {
+				path = [];
+			}
+			if (!result) {
+				result = {};
+			}
+			for (key in data) {
+				if (!Object.prototype.hasOwnProperty.call(data, key)) {
+					continue;
+				}
+				val = data[key];
+				if (angular.isObject(val)) {
+					flatObject(val, path.concat(key), result, key);
+				} else {
+					keyWithPath = path.length ? '' + path.join(NESTED_OBJECT_DELIMITER) + NESTED_OBJECT_DELIMITER + key : key;
+					if (path.length && key === prevKey) {
+						keyWithShortPath = '' + path.join(NESTED_OBJECT_DELIMITER);
+						result[keyWithShortPath] = '@:' + keyWithPath;
+					}
+					result[keyWithPath] = val;
+				}
+			}
+			return result;
+		};
+		this.addInterpolation = function (factory) {
+			$interpolatorFactories.push(factory);
+			return this;
+		};
+		this.useMessageFormatInterpolation = function () {
+			return this.useInterpolation('$translateMessageFormatInterpolation');
+		};
+		this.useInterpolation = function (factory) {
+			$interpolationFactory = factory;
+			return this;
+		};
+		this.useSanitizeValueStrategy = function (value) {
+			$interpolationSanitizationStrategy = value;
+			return this;
+		};
+		this.preferredLanguage = function (langKey) {
+			setupPreferredLanguage(langKey);
+			return this;
+		};
+		var setupPreferredLanguage = function (langKey) {
+			if (langKey) {
+				$preferredLanguage = langKey;
+			}
+			return $preferredLanguage;
+		};
+		this.translationNotFoundIndicator = function (indicator) {
+			this.translationNotFoundIndicatorLeft(indicator);
+			this.translationNotFoundIndicatorRight(indicator);
+			return this;
+		};
+		this.translationNotFoundIndicatorLeft = function (indicator) {
+			if (!indicator) {
+				return $notFoundIndicatorLeft;
+			}
+			$notFoundIndicatorLeft = indicator;
+			return this;
+		};
+		this.translationNotFoundIndicatorRight = function (indicator) {
+			if (!indicator) {
+				return $notFoundIndicatorRight;
+			}
+			$notFoundIndicatorRight = indicator;
+			return this;
+		};
+		this.fallbackLanguage = function (langKey) {
+			fallbackStack(langKey);
+			return this;
+		};
+		var fallbackStack = function (langKey) {
+			if (langKey) {
+				if (angular.isString(langKey)) {
+					$fallbackWasString = true;
+					$fallbackLanguage = [langKey];
+				} else if (angular.isArray(langKey)) {
+					$fallbackWasString = false;
+					$fallbackLanguage = langKey;
+				}
+				if (angular.isString($preferredLanguage) && indexOf($fallbackLanguage, $preferredLanguage) < 0) {
+					$fallbackLanguage.push($preferredLanguage);
+				}
+				return this;
+			} else {
+				if ($fallbackWasString) {
+					return $fallbackLanguage[0];
+				} else {
+					return $fallbackLanguage;
+				}
+			}
+		};
+		this.use = function (langKey) {
+			if (langKey) {
+				if (!$translationTable[langKey] && !$loaderFactory) {
+					throw new Error('$translateProvider couldn\'t find translationTable for langKey: \'' + langKey + '\'');
+				}
+				$uses = langKey;
+				return this;
+			}
+			return $uses;
+		};
+		var storageKey = function (key) {
+			if (!key) {
+				if ($storagePrefix) {
+					return $storagePrefix + $storageKey;
+				}
+				return $storageKey;
+			}
+			$storageKey = key;
+		};
+		this.storageKey = storageKey;
+		this.useUrlLoader = function (url, options) {
+			return this.useLoader('$translateUrlLoader', angular.extend({url: url}, options));
+		};
+		this.useStaticFilesLoader = function (options) {
+			return this.useLoader('$translateStaticFilesLoader', options);
+		};
+		this.useLoader = function (loaderFactory, options) {
+			$loaderFactory = loaderFactory;
+			$loaderOptions = options || {};
+			return this;
+		};
+		this.useLocalStorage = function () {
+			return this.useStorage('$translateLocalStorage');
+		};
+		this.useCookieStorage = function () {
+			return this.useStorage('$translateCookieStorage');
+		};
+		this.useStorage = function (storageFactory) {
+			$storageFactory = storageFactory;
+			return this;
+		};
+		this.storagePrefix = function (prefix) {
+			if (!prefix) {
+				return prefix;
+			}
+			$storagePrefix = prefix;
+			return this;
+		};
+		this.useMissingTranslationHandlerLog = function () {
+			return this.useMissingTranslationHandler('$translateMissingTranslationHandlerLog');
+		};
+		this.useMissingTranslationHandler = function (factory) {
+			$missingTranslationHandlerFactory = factory;
+			return this;
+		};
+		this.usePostCompiling = function (value) {
+			$postCompilingEnabled = !!value;
+			return this;
+		};
+		this.determinePreferredLanguage = function (fn) {
+			var locale = fn && angular.isFunction(fn) ? fn() : getLocale();
+			if (!$availableLanguageKeys.length) {
+				$preferredLanguage = locale;
+			} else {
+				$preferredLanguage = negotiateLocale(locale);
+			}
+			return this;
+		};
+		this.registerAvailableLanguageKeys = function (languageKeys, aliases) {
+			if (languageKeys) {
+				$availableLanguageKeys = languageKeys;
+				if (aliases) {
+					$languageKeyAliases = aliases;
+				}
+				return this;
+			}
+			return $availableLanguageKeys;
+		};
+		this.useLoaderCache = function (cache) {
+			if (cache === false) {
+				loaderCache = undefined;
+			} else if (cache === true) {
+				loaderCache = true;
+			} else if (typeof cache === 'undefined') {
+				loaderCache = '$translationCache';
+			} else if (cache) {
+				loaderCache = cache;
+			}
+			return this;
+		};
+		this.$get = [
+			'$log',
+			'$injector',
+			'$rootScope',
+			'$q',
+			function ($log, $injector, $rootScope, $q) {
+				var Storage,
+					defaultInterpolator = $injector.get($interpolationFactory || '$translateDefaultInterpolation'),
+					pendingLoader = false, interpolatorHashMap = {}, langPromises = {}, fallbackIndex,
+					startFallbackIteration;
+				var $translate = function (translationId, interpolateParams, interpolationId) {
+					if (angular.isArray(translationId)) {
+						var translateAll = function (translationIds) {
+							var results = {};
+							var promises = [];
+							var translate = function (translationId) {
+								var deferred = $q.defer();
+								var regardless = function (value) {
+									results[translationId] = value;
+									deferred.resolve([
+										translationId,
+										value
+									]);
+								};
+								$translate(translationId, interpolateParams, interpolationId).then(regardless, regardless);
+								return deferred.promise;
+							};
+							for (var i = 0, c = translationIds.length; i < c; i++) {
+								promises.push(translate(translationIds[i]));
+							}
+							return $q.all(promises).then(function () {
+								return results;
+							});
+						};
+						return translateAll(translationId);
+					}
+					var deferred = $q.defer();
+					if (translationId) {
+						translationId = trim.apply(translationId);
+					}
+					var promiseToWaitFor = function () {
+						var promise = $preferredLanguage ? langPromises[$preferredLanguage] : langPromises[$uses];
+						fallbackIndex = 0;
+						if ($storageFactory && !promise) {
+							var langKey = Storage.get($storageKey);
+							promise = langPromises[langKey];
+							if ($fallbackLanguage && $fallbackLanguage.length) {
+								var index = indexOf($fallbackLanguage, langKey);
+								fallbackIndex = index === 0 ? 1 : 0;
+								if (indexOf($fallbackLanguage, $preferredLanguage) < 0) {
+									$fallbackLanguage.push($preferredLanguage);
+								}
+							}
+						}
+						return promise;
+					}();
+					if (!promiseToWaitFor) {
+						determineTranslation(translationId, interpolateParams, interpolationId).then(deferred.resolve, deferred.reject);
+					} else {
+						promiseToWaitFor.then(function () {
+							determineTranslation(translationId, interpolateParams, interpolationId).then(deferred.resolve, deferred.reject);
+						}, deferred.reject);
+					}
+					return deferred.promise;
+				};
+				var applyNotFoundIndicators = function (translationId) {
+					if ($notFoundIndicatorLeft) {
+						translationId = [
+							$notFoundIndicatorLeft,
+							translationId
+						].join(' ');
+					}
+					if ($notFoundIndicatorRight) {
+						translationId = [
+							translationId,
+							$notFoundIndicatorRight
+						].join(' ');
+					}
+					return translationId;
+				};
+				var useLanguage = function (key) {
+					$uses = key;
+					$rootScope.$emit('$translateChangeSuccess', {language: key});
+					if ($storageFactory) {
+						Storage.set($translate.storageKey(), $uses);
+					}
+					defaultInterpolator.setLocale($uses);
+					angular.forEach(interpolatorHashMap, function (interpolator, id) {
+						interpolatorHashMap[id].setLocale($uses);
+					});
+					$rootScope.$emit('$translateChangeEnd', {language: key});
+				};
+				var loadAsync = function (key) {
+					if (!key) {
+						throw 'No language key specified for loading.';
+					}
+					var deferred = $q.defer();
+					$rootScope.$emit('$translateLoadingStart', {language: key});
+					pendingLoader = true;
+					var cache = loaderCache;
+					if (typeof cache === 'string') {
+						cache = $injector.get(cache);
+					}
+					var loaderOptions = angular.extend({}, $loaderOptions, {
+						key: key,
+						$http: angular.extend({}, {cache: cache}, $loaderOptions.$http)
+					});
+					$injector.get($loaderFactory)(loaderOptions).then(function (data) {
+						var translationTable = {};
+						$rootScope.$emit('$translateLoadingSuccess', {language: key});
+						if (angular.isArray(data)) {
+							angular.forEach(data, function (table) {
+								angular.extend(translationTable, flatObject(table));
+							});
+						} else {
+							angular.extend(translationTable, flatObject(data));
+						}
+						pendingLoader = false;
+						deferred.resolve({
+							key: key,
+							table: translationTable
+						});
+						$rootScope.$emit('$translateLoadingEnd', {language: key});
+					}, function (key) {
+						$rootScope.$emit('$translateLoadingError', {language: key});
+						deferred.reject(key);
+						$rootScope.$emit('$translateLoadingEnd', {language: key});
+					});
+					return deferred.promise;
+				};
+				if ($storageFactory) {
+					Storage = $injector.get($storageFactory);
+					if (!Storage.get || !Storage.set) {
+						throw new Error('Couldn\'t use storage \'' + $storageFactory + '\', missing get() or set() method!');
+					}
+				}
+				if (angular.isFunction(defaultInterpolator.useSanitizeValueStrategy)) {
+					defaultInterpolator.useSanitizeValueStrategy($interpolationSanitizationStrategy);
+				}
+				if ($interpolatorFactories.length) {
+					angular.forEach($interpolatorFactories, function (interpolatorFactory) {
+						var interpolator = $injector.get(interpolatorFactory);
+						interpolator.setLocale($preferredLanguage || $uses);
+						if (angular.isFunction(interpolator.useSanitizeValueStrategy)) {
+							interpolator.useSanitizeValueStrategy($interpolationSanitizationStrategy);
+						}
+						interpolatorHashMap[interpolator.getInterpolationIdentifier()] = interpolator;
+					});
+				}
+				var getTranslationTable = function (langKey) {
+					var deferred = $q.defer();
+					if (Object.prototype.hasOwnProperty.call($translationTable, langKey)) {
+						deferred.resolve($translationTable[langKey]);
+					} else if (langPromises[langKey]) {
+						langPromises[langKey].then(function (data) {
+							translations(data.key, data.table);
+							deferred.resolve(data.table);
+						}, deferred.reject);
+					} else {
+						deferred.reject();
+					}
+					return deferred.promise;
+				};
+				var getFallbackTranslation = function (langKey, translationId, interpolateParams, Interpolator) {
+					var deferred = $q.defer();
+					getTranslationTable(langKey).then(function (translationTable) {
+						if (Object.prototype.hasOwnProperty.call(translationTable, translationId)) {
+							Interpolator.setLocale(langKey);
+							deferred.resolve(Interpolator.interpolate(translationTable[translationId], interpolateParams));
+							Interpolator.setLocale($uses);
+						} else {
+							deferred.reject();
+						}
+					}, deferred.reject);
+					return deferred.promise;
+				};
+				var getFallbackTranslationInstant = function (langKey, translationId, interpolateParams, Interpolator) {
+					var result, translationTable = $translationTable[langKey];
+					if (Object.prototype.hasOwnProperty.call(translationTable, translationId)) {
+						Interpolator.setLocale(langKey);
+						result = Interpolator.interpolate(translationTable[translationId], interpolateParams);
+						Interpolator.setLocale($uses);
+					}
+					return result;
+				};
+				var translateByHandler = function (translationId) {
+					if ($missingTranslationHandlerFactory) {
+						var resultString = $injector.get($missingTranslationHandlerFactory)(translationId, $uses);
+						if (resultString !== undefined) {
+							return resultString;
+						} else {
+							return translationId;
+						}
+					} else {
+						return translationId;
+					}
+				};
+				var resolveForFallbackLanguage = function (fallbackLanguageIndex, translationId, interpolateParams, Interpolator) {
+					var deferred = $q.defer();
+					if (fallbackLanguageIndex < $fallbackLanguage.length) {
+						var langKey = $fallbackLanguage[fallbackLanguageIndex];
+						getFallbackTranslation(langKey, translationId, interpolateParams, Interpolator).then(deferred.resolve, function () {
+							resolveForFallbackLanguage(fallbackLanguageIndex + 1, translationId, interpolateParams, Interpolator).then(deferred.resolve);
+						});
+					} else {
+						deferred.resolve(translateByHandler(translationId));
+					}
+					return deferred.promise;
+				};
+				var resolveForFallbackLanguageInstant = function (fallbackLanguageIndex, translationId, interpolateParams, Interpolator) {
+					var result;
+					if (fallbackLanguageIndex < $fallbackLanguage.length) {
+						var langKey = $fallbackLanguage[fallbackLanguageIndex];
+						result = getFallbackTranslationInstant(langKey, translationId, interpolateParams, Interpolator);
+						if (!result) {
+							result = resolveForFallbackLanguageInstant(fallbackLanguageIndex + 1, translationId, interpolateParams, Interpolator);
+						}
+					}
+					return result;
+				};
+				var fallbackTranslation = function (translationId, interpolateParams, Interpolator) {
+					return resolveForFallbackLanguage(startFallbackIteration > 0 ? startFallbackIteration : fallbackIndex, translationId, interpolateParams, Interpolator);
+				};
+				var fallbackTranslationInstant = function (translationId, interpolateParams, Interpolator) {
+					return resolveForFallbackLanguageInstant(startFallbackIteration > 0 ? startFallbackIteration : fallbackIndex, translationId, interpolateParams, Interpolator);
+				};
+				var determineTranslation = function (translationId, interpolateParams, interpolationId) {
+					var deferred = $q.defer();
+					var table = $uses ? $translationTable[$uses] : $translationTable,
+						Interpolator = interpolationId ? interpolatorHashMap[interpolationId] : defaultInterpolator;
+					if (table && Object.prototype.hasOwnProperty.call(table, translationId)) {
+						var translation = table[translationId];
+						if (translation.substr(0, 2) === '@:') {
+							$translate(translation.substr(2), interpolateParams, interpolationId).then(deferred.resolve, deferred.reject);
+						} else {
+							deferred.resolve(Interpolator.interpolate(translation, interpolateParams));
+						}
+					} else {
+						var missingTranslationHandlerTranslation;
+						if ($missingTranslationHandlerFactory && !pendingLoader) {
+							missingTranslationHandlerTranslation = translateByHandler(translationId);
+						}
+						if ($uses && $fallbackLanguage && $fallbackLanguage.length) {
+							fallbackTranslation(translationId, interpolateParams, Interpolator).then(function (translation) {
+								deferred.resolve(translation);
+							}, function (_translationId) {
+								deferred.reject(applyNotFoundIndicators(_translationId));
+							});
+						} else if ($missingTranslationHandlerFactory && !pendingLoader && missingTranslationHandlerTranslation) {
+							deferred.resolve(missingTranslationHandlerTranslation);
+						} else {
+							deferred.reject(applyNotFoundIndicators(translationId));
+						}
+					}
+					return deferred.promise;
+				};
+				var determineTranslationInstant = function (translationId, interpolateParams, interpolationId) {
+					var result, table = $uses ? $translationTable[$uses] : $translationTable,
+						Interpolator = interpolationId ? interpolatorHashMap[interpolationId] : defaultInterpolator;
+					if (table && Object.prototype.hasOwnProperty.call(table, translationId)) {
+						var translation = table[translationId];
+						if (translation.substr(0, 2) === '@:') {
+							result = determineTranslationInstant(translation.substr(2), interpolateParams, interpolationId);
+						} else {
+							result = Interpolator.interpolate(translation, interpolateParams);
+						}
+					} else {
+						var missingTranslationHandlerTranslation;
+						if ($missingTranslationHandlerFactory && !pendingLoader) {
+							missingTranslationHandlerTranslation = translateByHandler(translationId);
+						}
+						if ($uses && $fallbackLanguage && $fallbackLanguage.length) {
+							fallbackIndex = 0;
+							result = fallbackTranslationInstant(translationId, interpolateParams, Interpolator);
+						} else if ($missingTranslationHandlerFactory && !pendingLoader && missingTranslationHandlerTranslation) {
+							result = missingTranslationHandlerTranslation;
+						} else {
+							result = applyNotFoundIndicators(translationId);
+						}
+					}
+					return result;
+				};
+				$translate.preferredLanguage = function (langKey) {
+					if (langKey) {
+						setupPreferredLanguage(langKey);
+					}
+					return $preferredLanguage;
+				};
+				$translate.cloakClassName = function () {
+					return $cloakClassName;
+				};
+				$translate.fallbackLanguage = function (langKey) {
+					if (langKey !== undefined && langKey !== null) {
+						fallbackStack(langKey);
+						if ($loaderFactory) {
+							if ($fallbackLanguage && $fallbackLanguage.length) {
+								for (var i = 0, len = $fallbackLanguage.length; i < len; i++) {
+									if (!langPromises[$fallbackLanguage[i]]) {
+										langPromises[$fallbackLanguage[i]] = loadAsync($fallbackLanguage[i]);
+									}
+								}
+							}
+						}
+						$translate.use($translate.use());
+					}
+					if ($fallbackWasString) {
+						return $fallbackLanguage[0];
+					} else {
+						return $fallbackLanguage;
+					}
+				};
+				$translate.useFallbackLanguage = function (langKey) {
+					if (langKey !== undefined && langKey !== null) {
+						if (!langKey) {
+							startFallbackIteration = 0;
+						} else {
+							var langKeyPosition = indexOf($fallbackLanguage, langKey);
+							if (langKeyPosition > -1) {
+								startFallbackIteration = langKeyPosition;
+							}
+						}
+					}
+				};
+				$translate.proposedLanguage = function () {
+					return $nextLang;
+				};
+				$translate.storage = function () {
+					return Storage;
+				};
+				$translate.use = function (key) {
+					if (!key) {
+						return $uses;
+					}
+					var deferred = $q.defer();
+					$rootScope.$emit('$translateChangeStart', {language: key});
+					var aliasedKey = negotiateLocale(key);
+					if (aliasedKey) {
+						key = aliasedKey;
+					}
+					if (!$translationTable[key] && $loaderFactory && !langPromises[key]) {
+						$nextLang = key;
+						langPromises[key] = loadAsync(key).then(function (translation) {
+							translations(translation.key, translation.table);
+							deferred.resolve(translation.key);
+							useLanguage(translation.key);
+							if ($nextLang === key) {
+								$nextLang = undefined;
+							}
+						}, function (key) {
+							if ($nextLang === key) {
+								$nextLang = undefined;
+							}
+							$rootScope.$emit('$translateChangeError', {language: key});
+							deferred.reject(key);
+							$rootScope.$emit('$translateChangeEnd', {language: key});
+						});
+					} else {
+						deferred.resolve(key);
+						useLanguage(key);
+					}
+					return deferred.promise;
+				};
+				$translate.storageKey = function () {
+					return storageKey();
+				};
+				$translate.isPostCompilingEnabled = function () {
+					return $postCompilingEnabled;
+				};
+				$translate.refresh = function (langKey) {
+					if (!$loaderFactory) {
+						throw new Error('Couldn\'t refresh translation table, no loader registered!');
+					}
+					var deferred = $q.defer();
+
+					function resolve() {
+						deferred.resolve();
+						$rootScope.$emit('$translateRefreshEnd', {language: langKey});
+					}
+
+					function reject() {
+						deferred.reject();
+						$rootScope.$emit('$translateRefreshEnd', {language: langKey});
+					}
+
+					$rootScope.$emit('$translateRefreshStart', {language: langKey});
+					if (!langKey) {
+						var tables = [], loadingKeys = {};
+						if ($fallbackLanguage && $fallbackLanguage.length) {
+							for (var i = 0, len = $fallbackLanguage.length; i < len; i++) {
+								tables.push(loadAsync($fallbackLanguage[i]));
+								loadingKeys[$fallbackLanguage[i]] = true;
+							}
+						}
+						if ($uses && !loadingKeys[$uses]) {
+							tables.push(loadAsync($uses));
+						}
+						$q.all(tables).then(function (tableData) {
+							angular.forEach(tableData, function (data) {
+								if ($translationTable[data.key]) {
+									delete $translationTable[data.key];
+								}
+								translations(data.key, data.table);
+							});
+							if ($uses) {
+								useLanguage($uses);
+							}
+							resolve();
+						});
+					} else if ($translationTable[langKey]) {
+						loadAsync(langKey).then(function (data) {
+							translations(data.key, data.table);
+							if (langKey === $uses) {
+								useLanguage($uses);
+							}
+							resolve();
+						}, reject);
+					} else {
+						reject();
+					}
+					return deferred.promise;
+				};
+				$translate.instant = function (translationId, interpolateParams, interpolationId) {
+					if (translationId === null || angular.isUndefined(translationId)) {
+						return translationId;
+					}
+					if (angular.isArray(translationId)) {
+						var results = {};
+						for (var i = 0, c = translationId.length; i < c; i++) {
+							results[translationId[i]] = $translate.instant(translationId[i], interpolateParams, interpolationId);
+						}
+						return results;
+					}
+					if (angular.isString(translationId) && translationId.length < 1) {
+						return translationId;
+					}
+					if (translationId) {
+						translationId = trim.apply(translationId);
+					}
+					var result, possibleLangKeys = [];
+					if ($preferredLanguage) {
+						possibleLangKeys.push($preferredLanguage);
+					}
+					if ($uses) {
+						possibleLangKeys.push($uses);
+					}
+					if ($fallbackLanguage && $fallbackLanguage.length) {
+						possibleLangKeys = possibleLangKeys.concat($fallbackLanguage);
+					}
+					for (var j = 0, d = possibleLangKeys.length; j < d; j++) {
+						var possibleLangKey = possibleLangKeys[j];
+						if ($translationTable[possibleLangKey]) {
+							if (typeof $translationTable[possibleLangKey][translationId] !== 'undefined') {
+								result = determineTranslationInstant(translationId, interpolateParams, interpolationId);
+							}
+						}
+						if (typeof result !== 'undefined') {
+							break;
+						}
+					}
+					if (!result && result !== '') {
+						result = defaultInterpolator.interpolate(translationId, interpolateParams);
+						if ($missingTranslationHandlerFactory && !pendingLoader) {
+							result = translateByHandler(translationId);
+						}
+					}
+					return result;
+				};
+				$translate.versionInfo = function () {
+					return version;
+				};
+				$translate.loaderCache = function () {
+					return loaderCache;
+				};
+				if ($loaderFactory) {
+					if (angular.equals($translationTable, {})) {
+						$translate.use($translate.use());
+					}
+					if ($fallbackLanguage && $fallbackLanguage.length) {
+						var processAsyncResult = function (translation) {
+							translations(translation.key, translation.table);
+							$rootScope.$emit('$translateChangeEnd', {language: translation.key});
+						};
+						for (var i = 0, len = $fallbackLanguage.length; i < len; i++) {
+							langPromises[$fallbackLanguage[i]] = loadAsync($fallbackLanguage[i]).then(processAsyncResult);
+						}
+					}
+				}
+				return $translate;
+			}
+		];
+	}
 ]);
 angular.module('pascalprecht.translate').factory('$translateDefaultInterpolation', [
-  '$interpolate',
-  function ($interpolate) {
-    var $translateInterpolator = {}, $locale, $identifier = 'default', $sanitizeValueStrategy = null, sanitizeValueStrategies = {
-        escaped: function (params) {
-          var result = {};
-          for (var key in params) {
-            if (Object.prototype.hasOwnProperty.call(params, key)) {
-              result[key] = angular.element('<div></div>').text(params[key]).html();
-            }
-          }
-          return result;
-        }
-      };
-    var sanitizeParams = function (params) {
-      var result;
-      if (angular.isFunction(sanitizeValueStrategies[$sanitizeValueStrategy])) {
-        result = sanitizeValueStrategies[$sanitizeValueStrategy](params);
-      } else {
-        result = params;
-      }
-      return result;
-    };
-    $translateInterpolator.setLocale = function (locale) {
-      $locale = locale;
-    };
-    $translateInterpolator.getInterpolationIdentifier = function () {
-      return $identifier;
-    };
-    $translateInterpolator.useSanitizeValueStrategy = function (value) {
-      $sanitizeValueStrategy = value;
-      return this;
-    };
-    $translateInterpolator.interpolate = function (string, interpolateParams) {
-      if ($sanitizeValueStrategy) {
-        interpolateParams = sanitizeParams(interpolateParams);
-      }
-      return $interpolate(string)(interpolateParams || {});
-    };
-    return $translateInterpolator;
-  }
+	'$interpolate',
+	function ($interpolate) {
+		var $translateInterpolator = {}, $locale, $identifier = 'default', $sanitizeValueStrategy = null,
+			sanitizeValueStrategies = {
+				escaped: function (params) {
+					var result = {};
+					for (var key in params) {
+						if (Object.prototype.hasOwnProperty.call(params, key)) {
+							result[key] = angular.element('<div></div>').text(params[key]).html();
+						}
+					}
+					return result;
+				}
+			};
+		var sanitizeParams = function (params) {
+			var result;
+			if (angular.isFunction(sanitizeValueStrategies[$sanitizeValueStrategy])) {
+				result = sanitizeValueStrategies[$sanitizeValueStrategy](params);
+			} else {
+				result = params;
+			}
+			return result;
+		};
+		$translateInterpolator.setLocale = function (locale) {
+			$locale = locale;
+		};
+		$translateInterpolator.getInterpolationIdentifier = function () {
+			return $identifier;
+		};
+		$translateInterpolator.useSanitizeValueStrategy = function (value) {
+			$sanitizeValueStrategy = value;
+			return this;
+		};
+		$translateInterpolator.interpolate = function (string, interpolateParams) {
+			if ($sanitizeValueStrategy) {
+				interpolateParams = sanitizeParams(interpolateParams);
+			}
+			return $interpolate(string)(interpolateParams || {});
+		};
+		return $translateInterpolator;
+	}
 ]);
 angular.module('pascalprecht.translate').constant('$STORAGE_KEY', 'NG_TRANSLATE_LANG_KEY');
 angular.module('pascalprecht.translate').directive('translate', [
-  '$translate',
-  '$q',
-  '$interpolate',
-  '$compile',
-  '$parse',
-  '$rootScope',
-  function ($translate, $q, $interpolate, $compile, $parse, $rootScope) {
-    return {
-      restrict: 'AE',
-      scope: true,
-      compile: function (tElement, tAttr) {
-        var translateValuesExist = tAttr.translateValues ? tAttr.translateValues : undefined;
-        var translateInterpolation = tAttr.translateInterpolation ? tAttr.translateInterpolation : undefined;
-        var translateValueExist = tElement[0].outerHTML.match(/translate-value-+/i);
-        var interpolateRegExp = '^(.*)(' + $interpolate.startSymbol() + '.*' + $interpolate.endSymbol() + ')(.*)';
-        return function linkFn(scope, iElement, iAttr) {
-          scope.interpolateParams = {};
-          scope.preText = '';
-          scope.postText = '';
-          iAttr.$observe('translate', function (translationId) {
-            if (angular.equals(translationId, '') || !angular.isDefined(translationId)) {
-              var interpolateMatches = iElement.text().match(interpolateRegExp);
-              if (angular.isArray(interpolateMatches)) {
-                scope.preText = interpolateMatches[1];
-                scope.postText = interpolateMatches[3];
-                scope.translationId = $interpolate(interpolateMatches[2])(scope.$parent);
-              } else {
-                scope.translationId = iElement.text().replace(/^\s+|\s+$/g, '');
-              }
-            } else {
-              scope.translationId = translationId;
-            }
-          });
-          iAttr.$observe('translateDefault', function (value) {
-            scope.defaultText = value;
-          });
-          if (translateValuesExist) {
-            iAttr.$observe('translateValues', function (interpolateParams) {
-              if (interpolateParams) {
-                scope.$parent.$watch(function () {
-                  angular.extend(scope.interpolateParams, $parse(interpolateParams)(scope.$parent));
-                });
-              }
-            });
-          }
-          if (translateValueExist) {
-            var fn = function (attrName) {
-              iAttr.$observe(attrName, function (value) {
-                scope.interpolateParams[angular.lowercase(attrName.substr(14, 1)) + attrName.substr(15)] = value;
-              });
-            };
-            for (var attr in iAttr) {
-              if (Object.prototype.hasOwnProperty.call(iAttr, attr) && attr.substr(0, 14) === 'translateValue' && attr !== 'translateValues') {
-                fn(attr);
-              }
-            }
-          }
-          var applyElementContent = function (value, scope, successful) {
-            if (!successful && typeof scope.defaultText !== 'undefined') {
-              value = scope.defaultText;
-            }
-            iElement.html(scope.preText + value + scope.postText);
-            var globallyEnabled = $translate.isPostCompilingEnabled();
-            var locallyDefined = typeof tAttr.translateCompile !== 'undefined';
-            var locallyEnabled = locallyDefined && tAttr.translateCompile !== 'false';
-            if (globallyEnabled && !locallyDefined || locallyEnabled) {
-              $compile(iElement.contents())(scope);
-            }
-          };
-          var updateTranslationFn = function () {
-              if (!translateValuesExist && !translateValueExist) {
-                return function () {
-                  var unwatch = scope.$watch('translationId', function (value) {
-                      if (scope.translationId && value) {
-                        $translate(value, {}, translateInterpolation).then(function (translation) {
-                          applyElementContent(translation, scope, true);
-                          unwatch();
-                        }, function (translationId) {
-                          applyElementContent(translationId, scope, false);
-                          unwatch();
-                        });
-                      }
-                    }, true);
-                };
-              } else {
-                return function () {
-                  var updateTranslations = function () {
-                    if (scope.translationId && scope.interpolateParams) {
-                      $translate(scope.translationId, scope.interpolateParams, translateInterpolation).then(function (translation) {
-                        applyElementContent(translation, scope, true);
-                      }, function (translationId) {
-                        applyElementContent(translationId, scope, false);
-                      });
-                    }
-                  };
-                  scope.$watch('interpolateParams', updateTranslations, true);
-                  scope.$watch('translationId', updateTranslations);
-                };
-              }
-            }();
-          var unbind = $rootScope.$on('$translateChangeSuccess', updateTranslationFn);
-          updateTranslationFn();
-          scope.$on('$destroy', unbind);
-        };
-      }
-    };
-  }
+	'$translate',
+	'$q',
+	'$interpolate',
+	'$compile',
+	'$parse',
+	'$rootScope',
+	function ($translate, $q, $interpolate, $compile, $parse, $rootScope) {
+		return {
+			restrict: 'AE',
+			scope: true,
+			compile: function (tElement, tAttr) {
+				var translateValuesExist = tAttr.translateValues ? tAttr.translateValues : undefined;
+				var translateInterpolation = tAttr.translateInterpolation ? tAttr.translateInterpolation : undefined;
+				var translateValueExist = tElement[0].outerHTML.match(/translate-value-+/i);
+				var interpolateRegExp = '^(.*)(' + $interpolate.startSymbol() + '.*' + $interpolate.endSymbol() + ')(.*)';
+				return function linkFn(scope, iElement, iAttr) {
+					scope.interpolateParams = {};
+					scope.preText = '';
+					scope.postText = '';
+					iAttr.$observe('translate', function (translationId) {
+						if (angular.equals(translationId, '') || !angular.isDefined(translationId)) {
+							var interpolateMatches = iElement.text().match(interpolateRegExp);
+							if (angular.isArray(interpolateMatches)) {
+								scope.preText = interpolateMatches[1];
+								scope.postText = interpolateMatches[3];
+								scope.translationId = $interpolate(interpolateMatches[2])(scope.$parent);
+							} else {
+								scope.translationId = iElement.text().replace(/^\s+|\s+$/g, '');
+							}
+						} else {
+							scope.translationId = translationId;
+						}
+					});
+					iAttr.$observe('translateDefault', function (value) {
+						scope.defaultText = value;
+					});
+					if (translateValuesExist) {
+						iAttr.$observe('translateValues', function (interpolateParams) {
+							if (interpolateParams) {
+								scope.$parent.$watch(function () {
+									angular.extend(scope.interpolateParams, $parse(interpolateParams)(scope.$parent));
+								});
+							}
+						});
+					}
+					if (translateValueExist) {
+						var fn = function (attrName) {
+							iAttr.$observe(attrName, function (value) {
+								scope.interpolateParams[angular.lowercase(attrName.substr(14, 1)) + attrName.substr(15)] = value;
+							});
+						};
+						for (var attr in iAttr) {
+							if (Object.prototype.hasOwnProperty.call(iAttr, attr) && attr.substr(0, 14) === 'translateValue' && attr !== 'translateValues') {
+								fn(attr);
+							}
+						}
+					}
+					var applyElementContent = function (value, scope, successful) {
+						if (!successful && typeof scope.defaultText !== 'undefined') {
+							value = scope.defaultText;
+						}
+						iElement.html(scope.preText + value + scope.postText);
+						var globallyEnabled = $translate.isPostCompilingEnabled();
+						var locallyDefined = typeof tAttr.translateCompile !== 'undefined';
+						var locallyEnabled = locallyDefined && tAttr.translateCompile !== 'false';
+						if (globallyEnabled && !locallyDefined || locallyEnabled) {
+							$compile(iElement.contents())(scope);
+						}
+					};
+					var updateTranslationFn = function () {
+						if (!translateValuesExist && !translateValueExist) {
+							return function () {
+								var unwatch = scope.$watch('translationId', function (value) {
+									if (scope.translationId && value) {
+										$translate(value, {}, translateInterpolation).then(function (translation) {
+											applyElementContent(translation, scope, true);
+											unwatch();
+										}, function (translationId) {
+											applyElementContent(translationId, scope, false);
+											unwatch();
+										});
+									}
+								}, true);
+							};
+						} else {
+							return function () {
+								var updateTranslations = function () {
+									if (scope.translationId && scope.interpolateParams) {
+										$translate(scope.translationId, scope.interpolateParams, translateInterpolation).then(function (translation) {
+											applyElementContent(translation, scope, true);
+										}, function (translationId) {
+											applyElementContent(translationId, scope, false);
+										});
+									}
+								};
+								scope.$watch('interpolateParams', updateTranslations, true);
+								scope.$watch('translationId', updateTranslations);
+							};
+						}
+					}();
+					var unbind = $rootScope.$on('$translateChangeSuccess', updateTranslationFn);
+					updateTranslationFn();
+					scope.$on('$destroy', unbind);
+				};
+			}
+		};
+	}
 ]);
 angular.module('pascalprecht.translate').directive('translateCloak', [
-  '$rootScope',
-  '$translate',
-  function ($rootScope, $translate) {
-    return {
-      compile: function (tElement) {
-        var applyCloak = function () {
-            tElement.addClass($translate.cloakClassName());
-          }, removeCloak = function () {
-            tElement.removeClass($translate.cloakClassName());
-          }, removeListener = $rootScope.$on('$translateChangeEnd', function () {
-            removeCloak();
-            removeListener();
-            removeListener = null;
-          });
-        applyCloak();
-        return function linkFn(scope, iElement, iAttr) {
-          if (iAttr.translateCloak && iAttr.translateCloak.length) {
-            iAttr.$observe('translateCloak', function (translationId) {
-              $translate(translationId).then(removeCloak, applyCloak);
-            });
-          }
-        };
-      }
-    };
-  }
+	'$rootScope',
+	'$translate',
+	function ($rootScope, $translate) {
+		return {
+			compile: function (tElement) {
+				var applyCloak = function () {
+					tElement.addClass($translate.cloakClassName());
+				}, removeCloak = function () {
+					tElement.removeClass($translate.cloakClassName());
+				}, removeListener = $rootScope.$on('$translateChangeEnd', function () {
+					removeCloak();
+					removeListener();
+					removeListener = null;
+				});
+				applyCloak();
+				return function linkFn(scope, iElement, iAttr) {
+					if (iAttr.translateCloak && iAttr.translateCloak.length) {
+						iAttr.$observe('translateCloak', function (translationId) {
+							$translate(translationId).then(removeCloak, applyCloak);
+						});
+					}
+				};
+			}
+		};
+	}
 ]);
 angular.module('pascalprecht.translate').filter('translate', [
-  '$parse',
-  '$translate',
-  function ($parse, $translate) {
-    var translateFilter = function (translationId, interpolateParams, interpolation) {
-      if (!angular.isObject(interpolateParams)) {
-        interpolateParams = $parse(interpolateParams)(this);
-      }
-      return $translate.instant(translationId, interpolateParams, interpolation);
-    };
-    translateFilter.$stateful = true;
-    return translateFilter;
-  }
-]);
\ No newline at end of file
+	'$parse',
+	'$translate',
+	function ($parse, $translate) {
+		var translateFilter = function (translationId, interpolateParams, interpolation) {
+			if (!angular.isObject(interpolateParams)) {
+				interpolateParams = $parse(interpolateParams)(this);
+			}
+			return $translate.instant(translationId, interpolateParams, interpolation);
+		};
+		translateFilter.$stateful = true;
+		return translateFilter;
+	}
+]);
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker-bs3.css b/len-activiti/src/main/resources/static/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker-bs3.css
index abcaa46..11d14b4 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker-bs3.css
+++ b/len-activiti/src/main/resources/static/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker-bs3.css
@@ -9,259 +9,259 @@
  */
 
 .daterangepicker.dropdown-menu {
-    max-width: none;
-    z-index: 3000;
+	max-width: none;
+	z-index: 3000;
 }
 
 .daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar {
-    float: left;
-    margin: 4px;
+	float: left;
+	margin: 4px;
 }
 
 .daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar {
-    float: right;
-    margin: 4px;
+	float: right;
+	margin: 4px;
 }
 
 .daterangepicker .ranges {
-    width: 160px;
-    text-align: left;
+	width: 160px;
+	text-align: left;
 }
 
-.daterangepicker .ranges .range_inputs>div {
-    float: left;
+.daterangepicker .ranges .range_inputs > div {
+	float: left;
 }
 
-.daterangepicker .ranges .range_inputs>div:nth-child(2) {
-    padding-left: 11px;
+.daterangepicker .ranges .range_inputs > div:nth-child(2) {
+	padding-left: 11px;
 }
 
 .daterangepicker .calendar {
-    display: none;
-    max-width: 270px;
+	display: none;
+	max-width: 270px;
 }
 
 .daterangepicker.show-calendar .calendar {
-    display: block;
+	display: block;
 }
 
 .daterangepicker .calendar.single .calendar-date {
-    border: none;
+	border: none;
 }
 
 .daterangepicker .calendar th, .daterangepicker .calendar td {
-    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-    white-space: nowrap;
-    text-align: center;
-    min-width: 32px;
+	font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+	white-space: nowrap;
+	text-align: center;
+	min-width: 32px;
 }
 
 .daterangepicker .daterangepicker_start_input label,
 .daterangepicker .daterangepicker_end_input label {
-    color: #333;
-    display: block;
-    font-size: 11px;
-    font-weight: normal;
-    height: 20px;
-    line-height: 20px;
-    margin-bottom: 2px;
-    text-shadow: #fff 1px 1px 0px;
-    text-transform: uppercase;
-    width: 74px;
+	color: #333;
+	display: block;
+	font-size: 11px;
+	font-weight: normal;
+	height: 20px;
+	line-height: 20px;
+	margin-bottom: 2px;
+	text-shadow: #fff 1px 1px 0px;
+	text-transform: uppercase;
+	width: 74px;
 }
 
 .daterangepicker .ranges input {
-    font-size: 11px;
+	font-size: 11px;
 }
 
 .daterangepicker .ranges .input-mini {
-    background-color: #eee;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    color: #555;
-    display: block;
-    font-size: 11px;
-    height: 30px;
-    line-height: 30px;
-    vertical-align: middle;
-    margin: 0 0 10px 0;
-    padding: 0 6px;
-    width: 74px;
+	background-color: #eee;
+	border: 1px solid #ccc;
+	border-radius: 4px;
+	color: #555;
+	display: block;
+	font-size: 11px;
+	height: 30px;
+	line-height: 30px;
+	vertical-align: middle;
+	margin: 0 0 10px 0;
+	padding: 0 6px;
+	width: 74px;
 }
 
 .daterangepicker .ranges ul {
-    list-style: none;
-    margin: 0;
-    padding: 0;
+	list-style: none;
+	margin: 0;
+	padding: 0;
 }
 
 .daterangepicker .ranges li {
-    font-size: 13px;
-    background: #f5f5f5;
-    border: 1px solid #f5f5f5;
-    color: #08c;
-    padding: 3px 12px;
-    margin-bottom: 8px;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    cursor: pointer;
+	font-size: 13px;
+	background: #f5f5f5;
+	border: 1px solid #f5f5f5;
+	color: #08c;
+	padding: 3px 12px;
+	margin-bottom: 8px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	cursor: pointer;
 }
 
 .daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
-    background: #08c;
-    border: 1px solid #08c;
-    color: #fff;
+	background: #08c;
+	border: 1px solid #08c;
+	color: #fff;
 }
 
 .daterangepicker .calendar-date {
-    border: 1px solid #ddd;
-    padding: 4px;
-    border-radius: 4px;
-    background: #fff;
+	border: 1px solid #ddd;
+	padding: 4px;
+	border-radius: 4px;
+	background: #fff;
 }
 
 .daterangepicker .calendar-time {
-    text-align: center;
-    margin: 8px auto 0 auto;
-    line-height: 30px;
+	text-align: center;
+	margin: 8px auto 0 auto;
+	line-height: 30px;
 }
 
 .daterangepicker {
-    position: absolute;
-    background: #fff;
-    top: 100px;
-    left: 20px;
-    padding: 4px;
-    margin-top: 1px;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
+	position: absolute;
+	background: #fff;
+	top: 100px;
+	left: 20px;
+	padding: 4px;
+	margin-top: 1px;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
 }
 
 .daterangepicker.opensleft:before {
-    position: absolute;
-    top: -7px;
-    right: 9px;
-    display: inline-block;
-    border-right: 7px solid transparent;
-    border-bottom: 7px solid #ccc;
-    border-left: 7px solid transparent;
-    border-bottom-color: rgba(0, 0, 0, 0.2);
-    content: '';
+	position: absolute;
+	top: -7px;
+	right: 9px;
+	display: inline-block;
+	border-right: 7px solid transparent;
+	border-bottom: 7px solid #ccc;
+	border-left: 7px solid transparent;
+	border-bottom-color: rgba(0, 0, 0, 0.2);
+	content: '';
 }
 
 .daterangepicker.opensleft:after {
-    position: absolute;
-    top: -6px;
-    right: 10px;
-    display: inline-block;
-    border-right: 6px solid transparent;
-    border-bottom: 6px solid #fff;
-    border-left: 6px solid transparent;
-    content: '';
+	position: absolute;
+	top: -6px;
+	right: 10px;
+	display: inline-block;
+	border-right: 6px solid transparent;
+	border-bottom: 6px solid #fff;
+	border-left: 6px solid transparent;
+	content: '';
 }
 
 .daterangepicker.opensright:before {
-    position: absolute;
-    top: -7px;
-    left: 9px;
-    display: inline-block;
-    border-right: 7px solid transparent;
-    border-bottom: 7px solid #ccc;
-    border-left: 7px solid transparent;
-    border-bottom-color: rgba(0, 0, 0, 0.2);
-    content: '';
+	position: absolute;
+	top: -7px;
+	left: 9px;
+	display: inline-block;
+	border-right: 7px solid transparent;
+	border-bottom: 7px solid #ccc;
+	border-left: 7px solid transparent;
+	border-bottom-color: rgba(0, 0, 0, 0.2);
+	content: '';
 }
 
 .daterangepicker.opensright:after {
-    position: absolute;
-    top: -6px;
-    left: 10px;
-    display: inline-block;
-    border-right: 6px solid transparent;
-    border-bottom: 6px solid #fff;
-    border-left: 6px solid transparent;
-    content: '';
+	position: absolute;
+	top: -6px;
+	left: 10px;
+	display: inline-block;
+	border-right: 6px solid transparent;
+	border-bottom: 6px solid #fff;
+	border-left: 6px solid transparent;
+	content: '';
 }
 
 .daterangepicker table {
-    width: 100%;
-    margin: 0;
+	width: 100%;
+	margin: 0;
 }
 
 .daterangepicker td, .daterangepicker th {
-    text-align: center;
-    width: 20px;
-    height: 20px;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    cursor: pointer;
-    white-space: nowrap;
+	text-align: center;
+	width: 20px;
+	height: 20px;
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	cursor: pointer;
+	white-space: nowrap;
 }
 
 .daterangepicker td.off {
-    color: #999;
+	color: #999;
 }
 
 .daterangepicker td.disabled {
-    color: #999;
+	color: #999;
 }
 
 .daterangepicker td.available:hover, .daterangepicker th.available:hover {
-    background: #eee;
+	background: #eee;
 }
 
 .daterangepicker td.in-range {
-    background: #ebf4f8;
-    -webkit-border-radius: 0;
-    -moz-border-radius: 0;
-    border-radius: 0;
+	background: #ebf4f8;
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
 }
 
 .daterangepicker td.active, .daterangepicker td.active:hover {
-    background-color: #357ebd;
-    border-color: #3071a9;
-    color: #fff;
+	background-color: #357ebd;
+	border-color: #3071a9;
+	color: #fff;
 }
 
 .daterangepicker td.week, .daterangepicker th.week {
-    font-size: 80%;
-    color: #ccc;
+	font-size: 80%;
+	color: #ccc;
 }
 
 .daterangepicker select.monthselect, .daterangepicker select.yearselect {
-    font-size: 12px;
-    padding: 1px;
-    height: auto;
-    margin: 0;
-    cursor: default;
+	font-size: 12px;
+	padding: 1px;
+	height: auto;
+	margin: 0;
+	cursor: default;
 }
 
 .daterangepicker select.monthselect {
-    margin-right: 2%;
-    width: 56%;
+	margin-right: 2%;
+	width: 56%;
 }
 
 .daterangepicker select.yearselect {
-    width: 40%;
+	width: 40%;
 }
 
 .daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.ampmselect {
-    width: 50px;
-    margin-bottom: 0;
+	width: 50px;
+	margin-bottom: 0;
 }
 
 .daterangepicker_start_input {
-    float: left;
+	float: left;
 }
 
 .daterangepicker_end_input {
-    float: left;
-    padding-left: 11px
+	float: left;
+	padding-left: 11px
 }
 
 .daterangepicker th.month {
-    width: auto;
-}
\ No newline at end of file
+	width: auto;
+}
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker.js b/len-activiti/src/main/resources/static/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker.js
index 579e875..1b7c735 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/bootstrap-daterangepicker_1.3.7/daterangepicker.js
@@ -8,1019 +8,1026 @@
  */
 !function ($, moment) {
 
-    var DateRangePicker = function (element, options, cb) {
-
-        // by default, the daterangepicker element is placed at the bottom of HTML body
-        this.parentEl = 'body';
-
-        //element that triggered the date range picker
-        this.element = $(element);
-
-        //create the picker HTML object
-        var DRPTemplate = '<div class="daterangepicker dropdown-menu">' +
-            '<div class="calendar left"></div>' +
-            '<div class="calendar right"></div>' +
-            '<div class="ranges">' +
-            '<div class="range_inputs">' +
-            '<div class="daterangepicker_start_input">' +
-            '<label for="daterangepicker_start"></label>' +
-            '<input class="input-mini" type="text" name="daterangepicker_start" value="" disabled="disabled" />' +
-            '</div>' +
-            '<div class="daterangepicker_end_input">' +
-            '<label for="daterangepicker_end"></label>' +
-            '<input class="input-mini" type="text" name="daterangepicker_end" value="" disabled="disabled" />' +
-            '</div>' +
-            '<button class="applyBtn" disabled="disabled"></button>&nbsp;' +
-            '<button class="cancelBtn"></button>' +
-            '</div>' +
-            '</div>' +
-            '</div>';
-
-        //custom options
-        if (typeof options !== 'object' || options === null)
-            options = {};
-
-        this.parentEl = (typeof options === 'object' && options.parentEl && $(options.parentEl).length) ? $(options.parentEl) : $(this.parentEl);
-        this.container = $(DRPTemplate).appendTo(this.parentEl);
-
-        this.setOptions(options, cb);
-
-        //apply CSS classes and labels to buttons
-        var c = this.container;
-        $.each(this.buttonClasses, function (idx, val) {
-            c.find('button').addClass(val);
-        });
-        this.container.find('.daterangepicker_start_input label').html(this.locale.fromLabel);
-        this.container.find('.daterangepicker_end_input label').html(this.locale.toLabel);
-        if (this.applyClass.length)
-            this.container.find('.applyBtn').addClass(this.applyClass);
-        if (this.cancelClass.length)
-            this.container.find('.cancelBtn').addClass(this.cancelClass);
-        this.container.find('.applyBtn').html(this.locale.applyLabel);
-        this.container.find('.cancelBtn').html(this.locale.cancelLabel);
-
-        //event listeners
-
-        this.container.find('.calendar')
-            .on('click.daterangepicker', '.prev', $.proxy(this.clickPrev, this))
-            .on('click.daterangepicker', '.next', $.proxy(this.clickNext, this))
-            .on('click.daterangepicker', 'td.available', $.proxy(this.clickDate, this))
-            .on('mouseenter.daterangepicker', 'td.available', $.proxy(this.enterDate, this))
-            .on('mouseleave.daterangepicker', 'td.available', $.proxy(this.updateFormInputs, this))
-            .on('change.daterangepicker', 'select.yearselect', $.proxy(this.updateMonthYear, this))
-            .on('change.daterangepicker', 'select.monthselect', $.proxy(this.updateMonthYear, this))
-            .on('change.daterangepicker', 'select.hourselect,select.minuteselect,select.ampmselect', $.proxy(this.updateTime, this));
-
-        this.container.find('.ranges')
-            .on('click.daterangepicker', 'button.applyBtn', $.proxy(this.clickApply, this))
-            .on('click.daterangepicker', 'button.cancelBtn', $.proxy(this.clickCancel, this))
-            .on('click.daterangepicker', '.daterangepicker_start_input,.daterangepicker_end_input', $.proxy(this.showCalendars, this))
-            .on('click.daterangepicker', 'li', $.proxy(this.clickRange, this))
-            .on('mouseenter.daterangepicker', 'li', $.proxy(this.enterRange, this))
-            .on('mouseleave.daterangepicker', 'li', $.proxy(this.updateFormInputs, this));
-
-        if (this.element.is('input')) {
-            this.element.on({
-                'click.daterangepicker': $.proxy(this.show, this),
-                'focus.daterangepicker': $.proxy(this.show, this),
-                'keyup.daterangepicker': $.proxy(this.updateFromControl, this)
-            });
-        } else {
-            this.element.on('click.daterangepicker', $.proxy(this.toggle, this));
-        }
-
-    };
-
-    DateRangePicker.prototype = {
-
-        constructor: DateRangePicker,
-
-        setOptions: function(options, callback) {
-
-            this.startDate = moment().startOf('day');
-            this.endDate = moment().endOf('day');
-            this.minDate = false;
-            this.maxDate = false;
-            this.dateLimit = false;
-
-            this.showDropdowns = false;
-            this.showWeekNumbers = false;
-            this.timePicker = false;
-            this.timePickerIncrement = 30;
-            this.timePicker12Hour = true;
-            this.singleDatePicker = false;
-            this.ranges = {};
-
-            this.opens = 'right';
-            if (this.element.hasClass('pull-right'))
-                this.opens = 'left';
-
-            this.buttonClasses = ['btn', 'btn-small'];
-            this.applyClass = 'btn-success';
-            this.cancelClass = 'btn-default';
-
-            this.format = 'MM/DD/YYYY';
-            this.separator = ' - ';
-
-            this.locale = {
-                applyLabel: 'Apply',
-                cancelLabel: 'Cancel',
-                fromLabel: 'From',
-                toLabel: 'To',
-                weekLabel: 'W',
-                customRangeLabel: 'Custom Range',
-                daysOfWeek: moment()._lang._weekdaysMin.slice(),
-                monthNames: moment()._lang._monthsShort.slice(),
-                firstDay: 0
-            };
-
-            this.cb = function () { };
-
-            if (typeof options.format === 'string')
-                this.format = options.format;
-
-            if (typeof options.separator === 'string')
-                this.separator = options.separator;
-
-            if (typeof options.startDate === 'string')
-                this.startDate = moment(options.startDate, this.format);
-
-            if (typeof options.endDate === 'string')
-                this.endDate = moment(options.endDate, this.format);
-
-            if (typeof options.minDate === 'string')
-                this.minDate = moment(options.minDate, this.format);
-
-            if (typeof options.maxDate === 'string')
-                this.maxDate = moment(options.maxDate, this.format);
-
-            if (typeof options.startDate === 'object')
-                this.startDate = moment(options.startDate);
-
-            if (typeof options.endDate === 'object')
-                this.endDate = moment(options.endDate);
-
-            if (typeof options.minDate === 'object')
-                this.minDate = moment(options.minDate);
-
-            if (typeof options.maxDate === 'object')
-                this.maxDate = moment(options.maxDate);
-
-            if (typeof options.applyClass === 'string')
-                this.applyClass = options.applyClass;
-
-            if (typeof options.cancelClass === 'string')
-                this.cancelClass = options.cancelClass;
-
-            if (typeof options.dateLimit === 'object')
-                this.dateLimit = options.dateLimit;
-
-            // update day names order to firstDay
-            if (typeof options.locale === 'object') {
-
-                if (typeof options.locale.daysOfWeek === 'object') {
-                    // Create a copy of daysOfWeek to avoid modification of original
-                    // options object for reusability in multiple daterangepicker instances
-                    this.locale.daysOfWeek = options.locale.daysOfWeek.slice();
-                }
-
-                if (typeof options.locale.monthNames === 'object') {
-                    this.locale.monthNames = options.locale.monthNames.slice();
-                }
-
-                if (typeof options.locale.firstDay === 'number') {
-                    this.locale.firstDay = options.locale.firstDay;
-                    var iterator = options.locale.firstDay;
-                    while (iterator > 0) {
-                        this.locale.daysOfWeek.push(this.locale.daysOfWeek.shift());
-                        iterator--;
-                    }
-                }
-
-                if (typeof options.locale.applyLabel === 'string') {
-                    this.locale.applyLabel = options.locale.applyLabel;
-                }
-
-                if (typeof options.locale.cancelLabel === 'string') {
-                    this.locale.cancelLabel = options.locale.cancelLabel;
-                }
-
-                if (typeof options.locale.fromLabel === 'string') {
-                    this.locale.fromLabel = options.locale.fromLabel;
-                }
-
-                if (typeof options.locale.toLabel === 'string') {
-                    this.locale.toLabel = options.locale.toLabel;
-                }
-
-                if (typeof options.locale.weekLabel === 'string') {
-                    this.locale.weekLabel = options.locale.weekLabel;
-                }
-
-                if (typeof options.locale.customRangeLabel === 'string') {
-                    this.locale.customRangeLabel = options.locale.customRangeLabel;
-                }
-            }
-
-            if (typeof options.opens === 'string')
-                this.opens = options.opens;
-
-            if (typeof options.showWeekNumbers === 'boolean') {
-                this.showWeekNumbers = options.showWeekNumbers;
-            }
-
-            if (typeof options.buttonClasses === 'string') {
-                this.buttonClasses = [options.buttonClasses];
-            }
-
-            if (typeof options.buttonClasses === 'object') {
-                this.buttonClasses = options.buttonClasses;
-            }
-
-            if (typeof options.showDropdowns === 'boolean') {
-                this.showDropdowns = options.showDropdowns;
-            }
-
-            if (typeof options.singleDatePicker === 'boolean') {
-                this.singleDatePicker = options.singleDatePicker;
-            }
-
-            if (typeof options.timePicker === 'boolean') {
-                this.timePicker = options.timePicker;
-            }
-
-            if (typeof options.timePickerIncrement === 'number') {
-                this.timePickerIncrement = options.timePickerIncrement;
-            }
-
-            if (typeof options.timePicker12Hour === 'boolean') {
-                this.timePicker12Hour = options.timePicker12Hour;
-            }
-
-            var start, end, range;
-
-            //if no start/end dates set, check if an input element contains initial values
-            if (typeof options.startDate === 'undefined' && typeof options.endDate === 'undefined') {
-                if ($(this.element).is('input[type=text]')) {
-                    var val = $(this.element).val();
-                    var split = val.split(this.separator);
-                    start = end = null;
-                    if (split.length == 2) {
-                        start = moment(split[0], this.format);
-                        end = moment(split[1], this.format);
-                    } else if (this.singleDatePicker) {
-                        start = moment(val, this.format);
-                        end = moment(val, this.format);
-                    }
-                    if (start !== null && end !== null) {
-                        this.startDate = start;
-                        this.endDate = end;
-                    }
-                }
-            }
-
-            if (typeof options.ranges === 'object') {
-                for (range in options.ranges) {
-
-                    start = moment(options.ranges[range][0]);
-                    end = moment(options.ranges[range][1]);
-
-                    // If we have a min/max date set, bound this range
-                    // to it, but only if it would otherwise fall
-                    // outside of the min/max.
-                    if (this.minDate && start.isBefore(this.minDate))
-                        start = moment(this.minDate);
-
-                    if (this.maxDate && end.isAfter(this.maxDate))
-                        end = moment(this.maxDate);
-
-                    // If the end of the range is before the minimum (if min is set) OR
-                    // the start of the range is after the max (also if set) don't display this
-                    // range option.
-                    if ((this.minDate && end.isBefore(this.minDate)) || (this.maxDate && start.isAfter(this.maxDate))) {
-                        continue;
-                    }
-
-                    this.ranges[range] = [start, end];
-                }
-
-                var list = '<ul>';
-                for (range in this.ranges) {
-                    list += '<li>' + range + '</li>';
-                }
-                list += '<li>' + this.locale.customRangeLabel + '</li>';
-                list += '</ul>';
-                this.container.find('.ranges ul').remove();
-                this.container.find('.ranges').prepend(list);
-            }
-
-            if (typeof callback === 'function') {
-                this.cb = callback;
-            }
-
-            if (!this.timePicker) {
-                this.startDate = this.startDate.startOf('day');
-                this.endDate = this.endDate.endOf('day');
-            }
-
-            if (this.singleDatePicker) {
-                this.opens = 'right';
-                this.container.find('.calendar.right').show();
-                this.container.find('.calendar.left').hide();
-                this.container.find('.ranges').hide();
-                if (!this.container.find('.calendar.right').hasClass('single'))
-                    this.container.find('.calendar.right').addClass('single');
-            } else {
-                this.container.find('.calendar.right').removeClass('single');
-                this.container.find('.ranges').show();
-            }
-
-            this.oldStartDate = this.startDate.clone();
-            this.oldEndDate = this.endDate.clone();
-            this.oldChosenLabel = this.chosenLabel;
-
-            this.leftCalendar = {
-                month: moment([this.startDate.year(), this.startDate.month(), 1, this.startDate.hour(), this.startDate.minute()]),
-                calendar: []
-            };
-
-            this.rightCalendar = {
-                month: moment([this.endDate.year(), this.endDate.month(), 1, this.endDate.hour(), this.endDate.minute()]),
-                calendar: []
-            };
-
-            if (this.opens == 'right') {
-                //swap calendar positions
-                var left = this.container.find('.calendar.left');
-                var right = this.container.find('.calendar.right');
-                left.removeClass('left').addClass('right');
-                right.removeClass('right').addClass('left');
-            }
-
-            if (typeof options.ranges === 'undefined' && !this.singleDatePicker) {
-                this.container.addClass('show-calendar');
-            }
-
-            this.container.addClass('opens' + this.opens);
-
-            this.updateView();
-            this.updateCalendars();
-
-        },
-
-        setStartDate: function(startDate) {
-            if (typeof startDate === 'string')
-                this.startDate = moment(startDate, this.format);
-
-            if (typeof startDate === 'object')
-                this.startDate = moment(startDate);
-
-            if (!this.timePicker)
-                this.startDate = this.startDate.startOf('day');
-
-            this.oldStartDate = this.startDate.clone();
-
-            this.updateView();
-            this.updateCalendars();
-        },
-
-        setEndDate: function(endDate) {
-            if (typeof endDate === 'string')
-                this.endDate = moment(endDate, this.format);
-
-            if (typeof endDate === 'object')
-                this.endDate = moment(endDate);
-
-            if (!this.timePicker)
-                this.endDate = this.endDate.endOf('day');
-
-            this.oldEndDate = this.endDate.clone();
-
-            this.updateView();
-            this.updateCalendars();
-        },
-
-        updateView: function () {
-            this.leftCalendar.month.month(this.startDate.month()).year(this.startDate.year());
-            this.rightCalendar.month.month(this.endDate.month()).year(this.endDate.year());
-            this.updateFormInputs();
-        },
-
-        updateFormInputs: function () {
-            this.container.find('input[name=daterangepicker_start]').val(this.startDate.format(this.format));
-            this.container.find('input[name=daterangepicker_end]').val(this.endDate.format(this.format));
-
-            if (this.startDate.isSame(this.endDate) || this.startDate.isBefore(this.endDate)) {
-                this.container.find('button.applyBtn').removeAttr('disabled');
-            } else {
-                this.container.find('button.applyBtn').attr('disabled', 'disabled');
-            }
-        },
-
-        updateFromControl: function () {
-            if (!this.element.is('input')) return;
-            if (!this.element.val().length) return;
-
-            var dateString = this.element.val().split(this.separator),
-                start = null,
-                end = null;
-
-            if(dateString.length === 2) {
-                start = moment(dateString[0], this.format);
-                end = moment(dateString[1], this.format);
-            }
-
-            if (this.singleDatePicker || start === null || end === null) {
-                start = moment(this.element.val(), this.format);
-                end = start;
-            }
-
-            if (end.isBefore(start)) return;
-
-            this.oldStartDate = this.startDate.clone();
-            this.oldEndDate = this.endDate.clone();
-
-            this.startDate = start;
-            this.endDate = end;
-
-            if (!this.startDate.isSame(this.oldStartDate) || !this.endDate.isSame(this.oldEndDate))
-                this.notify();
-
-            this.updateCalendars();
-        },
-
-        notify: function () {
-            this.updateView();
-            this.cb(this.startDate, this.endDate, this.chosenLabel);
-        },
-
-        move: function () {
-            var parentOffset = { top: 0, left: 0 };
-            if (!this.parentEl.is('body')) {
-                parentOffset = {
-                    top: this.parentEl.offset().top - this.parentEl.scrollTop(),
-                    left: this.parentEl.offset().left - this.parentEl.scrollLeft()
-                };
-            }
-
-            if (this.opens == 'left') {
-                this.container.css({
-                    top: this.element.offset().top + this.element.outerHeight() - parentOffset.top,
-                    right: $(window).width() - this.element.offset().left - this.element.outerWidth() - parentOffset.left,
-                    left: 'auto'
-                });
-                if (this.container.offset().left < 0) {
-                    this.container.css({
-                        right: 'auto',
-                        left: 9
-                    });
-                }
-            } else {
-                this.container.css({
-                    top: this.element.offset().top + this.element.outerHeight() - parentOffset.top,
-                    left: this.element.offset().left - parentOffset.left,
-                    right: 'auto'
-                });
-                if (this.container.offset().left + this.container.outerWidth() > $(window).width()) {
-                    this.container.css({
-                        left: 'auto',
-                        right: 0
-                    });
-                }
-            }
-        },
-
-        toggle: function (e) {
-            if (this.element.hasClass('active')) {
-                this.hide();
-            } else {
-                this.show();
-            }
-        },
-
-        show: function (e) {
-            this.element.addClass('active');
-            this.container.show();
-            this.move();
-
-            // Create a click proxy that is private to this instance of datepicker, for unbinding
-            this._outsideClickProxy = $.proxy(function (e) { this.outsideClick(e); }, this);
-            // Bind global datepicker mousedown for hiding and
-            $(document)
-                .on('mousedown.daterangepicker', this._outsideClickProxy)
-                // also explicitly play nice with Bootstrap dropdowns, which stopPropagation when clicking them
-                .on('click.daterangepicker', '[data-toggle=dropdown]', this._outsideClickProxy)
-                // and also close when focus changes to outside the picker (eg. tabbing between controls)
-                .on('focusin.daterangepicker', this._outsideClickProxy);
-
-            this.element.trigger('show.daterangepicker', this);
-        },
-
-        outsideClick: function (e) {
-            var target = $(e.target);
-            // if the page is clicked anywhere except within the daterangerpicker/button
-            // itself then call this.hide()
-            if (
-                target.closest(this.element).length ||
-                target.closest(this.container).length ||
-                target.closest('.calendar-date').length
-                ) return;
-            this.hide();
-        },
-
-        hide: function (e) {
-            $(document)
-                .off('mousedown.daterangepicker', this._outsideClickProxy)
-                .off('click.daterangepicker', this._outsideClickProxy)
-                .off('focusin.daterangepicker', this._outsideClickProxy);
-
-            this.element.removeClass('active');
-            this.container.hide();
-
-            if (!this.startDate.isSame(this.oldStartDate) || !this.endDate.isSame(this.oldEndDate))
-                this.notify();
-
-            this.oldStartDate = this.startDate.clone();
-            this.oldEndDate = this.endDate.clone();
-
-            this.element.trigger('hide.daterangepicker', this);
-        },
-
-        enterRange: function (e) {
-            // mouse pointer has entered a range label
-            var label = e.target.innerHTML;
-            if (label == this.locale.customRangeLabel) {
-                this.updateView();
-            } else {
-                var dates = this.ranges[label];
-                this.container.find('input[name=daterangepicker_start]').val(dates[0].format(this.format));
-                this.container.find('input[name=daterangepicker_end]').val(dates[1].format(this.format));
-            }
-        },
-
-        showCalendars: function() {
-            this.container.addClass('show-calendar');
-            this.move();
-        },
-
-        hideCalendars: function() {
-            this.container.removeClass('show-calendar');
-        },
-
-        updateInputText: function() {
-            if (this.element.is('input') && !this.singleDatePicker) {
-                this.element.val(this.startDate.format(this.format) + this.separator + this.endDate.format(this.format));
-            } else if (this.element.is('input')) {
-                this.element.val(this.startDate.format(this.format));
-            }
-        },
-
-        clickRange: function (e) {
-            var label = e.target.innerHTML;
-            this.chosenLabel = label;
-            if (label == this.locale.customRangeLabel) {
-                this.showCalendars();
-            } else {
-                var dates = this.ranges[label];
-
-                this.startDate = dates[0];
-                this.endDate = dates[1];
-
-                if (!this.timePicker) {
-                    this.startDate.startOf('day');
-                    this.endDate.endOf('day');
-                }
-
-                this.leftCalendar.month.month(this.startDate.month()).year(this.startDate.year()).hour(this.startDate.hour()).minute(this.startDate.minute());
-                this.rightCalendar.month.month(this.endDate.month()).year(this.endDate.year()).hour(this.endDate.hour()).minute(this.endDate.minute());
-                this.updateCalendars();
-
-                this.updateInputText();
-
-                this.hideCalendars();
-                this.hide();
-                this.element.trigger('apply.daterangepicker', this);
-            }
-        },
-
-        clickPrev: function (e) {
-            var cal = $(e.target).parents('.calendar');
-            if (cal.hasClass('left')) {
-                this.leftCalendar.month.subtract('month', 1);
-            } else {
-                this.rightCalendar.month.subtract('month', 1);
-            }
-            this.updateCalendars();
-        },
-
-        clickNext: function (e) {
-            var cal = $(e.target).parents('.calendar');
-            if (cal.hasClass('left')) {
-                this.leftCalendar.month.add('month', 1);
-            } else {
-                this.rightCalendar.month.add('month', 1);
-            }
-            this.updateCalendars();
-        },
-
-        enterDate: function (e) {
-
-            var title = $(e.target).attr('data-title');
-            var row = title.substr(1, 1);
-            var col = title.substr(3, 1);
-            var cal = $(e.target).parents('.calendar');
-
-            if (cal.hasClass('left')) {
-                this.container.find('input[name=daterangepicker_start]').val(this.leftCalendar.calendar[row][col].format(this.format));
-            } else {
-                this.container.find('input[name=daterangepicker_end]').val(this.rightCalendar.calendar[row][col].format(this.format));
-            }
-
-        },
-
-        clickDate: function (e) {
-            var title = $(e.target).attr('data-title');
-            var row = title.substr(1, 1);
-            var col = title.substr(3, 1);
-            var cal = $(e.target).parents('.calendar');
-
-            var startDate, endDate;
-            if (cal.hasClass('left')) {
-                startDate = this.leftCalendar.calendar[row][col];
-                endDate = this.endDate;
-                if (typeof this.dateLimit === 'object') {
-                    var maxDate = moment(startDate).add(this.dateLimit).startOf('day');
-                    if (endDate.isAfter(maxDate)) {
-                        endDate = maxDate;
-                    }
-                }
-            } else {
-                startDate = this.startDate;
-                endDate = this.rightCalendar.calendar[row][col];
-                if (typeof this.dateLimit === 'object') {
-                    var minDate = moment(endDate).subtract(this.dateLimit).startOf('day');
-                    if (startDate.isBefore(minDate)) {
-                        startDate = minDate;
-                    }
-                }
-            }
-
-            if (this.singleDatePicker && cal.hasClass('left')) {
-                endDate = startDate.clone();
-            } else if (this.singleDatePicker && cal.hasClass('right')) {
-                startDate = endDate.clone();
-            }
-
-            cal.find('td').removeClass('active');
-
-            if (startDate.isSame(endDate) || startDate.isBefore(endDate)) {
-                $(e.target).addClass('active');
-                this.startDate = startDate;
-                this.endDate = endDate;
-                this.chosenLabel = this.locale.customRangeLabel;
-            } else if (startDate.isAfter(endDate)) {
-                $(e.target).addClass('active');
-                var difference = this.endDate.diff(this.startDate);
-                this.startDate = startDate;
-                this.endDate = moment(startDate).add('ms', difference);
-                this.chosenLabel = this.locale.customRangeLabel;
-            }
-
-            this.leftCalendar.month.month(this.startDate.month()).year(this.startDate.year());
-            this.rightCalendar.month.month(this.endDate.month()).year(this.endDate.year());
-            this.updateCalendars();
-
-            if (!this.timePicker)
-                endDate.endOf('day');
-
-            if (this.singleDatePicker)
-                this.clickApply();
-        },
-
-        clickApply: function (e) {
-            this.updateInputText();
-            this.hide();
-            this.element.trigger('apply.daterangepicker', this);
-        },
-
-        clickCancel: function (e) {
-            this.startDate = this.oldStartDate;
-            this.endDate = this.oldEndDate;
-            this.chosenLabel = this.oldChosenLabel;
-            this.updateView();
-            this.updateCalendars();
-            this.hide();
-            this.element.trigger('cancel.daterangepicker', this);
-        },
-
-        updateMonthYear: function (e) {
-            var isLeft = $(e.target).closest('.calendar').hasClass('left'),
-                leftOrRight = isLeft ? 'left' : 'right',
-                cal = this.container.find('.calendar.'+leftOrRight);
-
-            // Month must be Number for new moment versions
-            var month = parseInt(cal.find('.monthselect').val(), 10);
-            var year = cal.find('.yearselect').val();
-
-            this[leftOrRight+'Calendar'].month.month(month).year(year);
-            this.updateCalendars();
-        },
-
-        updateTime: function(e) {
-
-            var cal = $(e.target).closest('.calendar'),
-                isLeft = cal.hasClass('left');
-
-            var hour = parseInt(cal.find('.hourselect').val(), 10);
-            var minute = parseInt(cal.find('.minuteselect').val(), 10);
-
-            if (this.timePicker12Hour) {
-                var ampm = cal.find('.ampmselect').val();
-                if (ampm === 'PM' && hour < 12)
-                    hour += 12;
-                if (ampm === 'AM' && hour === 12)
-                    hour = 0;
-            }
-
-            if (isLeft) {
-                var start = this.startDate.clone();
-                start.hour(hour);
-                start.minute(minute);
-                this.startDate = start;
-                this.leftCalendar.month.hour(hour).minute(minute);
-            } else {
-                var end = this.endDate.clone();
-                end.hour(hour);
-                end.minute(minute);
-                this.endDate = end;
-                this.rightCalendar.month.hour(hour).minute(minute);
-            }
-
-            this.updateCalendars();
-        },
-
-        updateCalendars: function () {
-            this.leftCalendar.calendar = this.buildCalendar(this.leftCalendar.month.month(), this.leftCalendar.month.year(), this.leftCalendar.month.hour(), this.leftCalendar.month.minute(), 'left');
-            this.rightCalendar.calendar = this.buildCalendar(this.rightCalendar.month.month(), this.rightCalendar.month.year(), this.rightCalendar.month.hour(), this.rightCalendar.month.minute(), 'right');
-            this.container.find('.calendar.left').empty().html(this.renderCalendar(this.leftCalendar.calendar, this.startDate, this.minDate, this.maxDate));
-            this.container.find('.calendar.right').empty().html(this.renderCalendar(this.rightCalendar.calendar, this.endDate, this.startDate, this.maxDate));
-
-            this.container.find('.ranges li').removeClass('active');
-            var customRange = true;
-            var i = 0;
-            for (var range in this.ranges) {
-                if (this.timePicker) {
-                    if (this.startDate.isSame(this.ranges[range][0]) && this.endDate.isSame(this.ranges[range][1])) {
-                        customRange = false;
-                        this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')')
-                            .addClass('active').html();
-                    }
-                } else {
-                    //ignore times when comparing dates if time picker is not enabled
-                    if (this.startDate.format('YYYY-MM-DD') == this.ranges[range][0].format('YYYY-MM-DD') && this.endDate.format('YYYY-MM-DD') == this.ranges[range][1].format('YYYY-MM-DD')) {
-                        customRange = false;
-                        this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')')
-                            .addClass('active').html();
-                    }
-                }
-                i++;
-            }
-            if (customRange) {
-                this.chosenLabel = this.container.find('.ranges li:last')
-                    .addClass('active').html();
-            }
-        },
-
-        buildCalendar: function (month, year, hour, minute, side) {
-            var firstDay = moment([year, month, 1]);
-            var lastMonth = moment(firstDay).subtract('month', 1).month();
-            var lastYear = moment(firstDay).subtract('month', 1).year();
-
-            var daysInLastMonth = moment([lastYear, lastMonth]).daysInMonth();
-
-            var dayOfWeek = firstDay.day();
-
-            var i;
-
-            //initialize a 6 rows x 7 columns array for the calendar
-            var calendar = [];
-            for (i = 0; i < 6; i++) {
-                calendar[i] = [];
-            }
-
-            //populate the calendar with date objects
-            var startDay = daysInLastMonth - dayOfWeek + this.locale.firstDay + 1;
-            if (startDay > daysInLastMonth)
-                startDay -= 7;
-
-            if (dayOfWeek == this.locale.firstDay)
-                startDay = daysInLastMonth - 6;
-
-            var curDate = moment([lastYear, lastMonth, startDay, 12, minute]);
-            var col, row;
-            for (i = 0, col = 0, row = 0; i < 42; i++, col++, curDate = moment(curDate).add('hour', 24)) {
-                if (i > 0 && col % 7 === 0) {
-                    col = 0;
-                    row++;
-                }
-                calendar[row][col] = curDate.clone().hour(hour);
-                curDate.hour(12);
-            }
-
-            return calendar;
-        },
-
-        renderDropdowns: function (selected, minDate, maxDate) {
-            var currentMonth = selected.month();
-            var monthHtml = '<select class="monthselect">';
-            var inMinYear = false;
-            var inMaxYear = false;
-
-            for (var m = 0; m < 12; m++) {
-                if ((!inMinYear || m >= minDate.month()) && (!inMaxYear || m <= maxDate.month())) {
-                    monthHtml += "<option value='" + m + "'" +
-                        (m === currentMonth ? " selected='selected'" : "") +
-                        ">" + this.locale.monthNames[m] + "</option>";
-                }
-            }
-            monthHtml += "</select>";
-
-            var currentYear = selected.year();
-            var maxYear = (maxDate && maxDate.year()) || (currentYear + 5);
-            var minYear = (minDate && minDate.year()) || (currentYear - 50);
-            var yearHtml = '<select class="yearselect">';
-
-            for (var y = minYear; y <= maxYear; y++) {
-                yearHtml += '<option value="' + y + '"' +
-                    (y === currentYear ? ' selected="selected"' : '') +
-                    '>' + y + '</option>';
-            }
-
-            yearHtml += '</select>';
-
-            return monthHtml + yearHtml;
-        },
-
-        renderCalendar: function (calendar, selected, minDate, maxDate) {
-
-            var html = '<div class="calendar-date">';
-            html += '<table class="table-condensed">';
-            html += '<thead>';
-            html += '<tr>';
-
-            // add empty cell for week number
-            if (this.showWeekNumbers)
-                html += '<th></th>';
-
-            if (!minDate || minDate.isBefore(calendar[1][1])) {
-                html += '<th class="prev available"><i class="fa fa-arrow-left icon-arrow-left glyphicon glyphicon-arrow-left"></i></th>';
-            } else {
-                html += '<th></th>';
-            }
-
-            var dateHtml = this.locale.monthNames[calendar[1][1].month()] + calendar[1][1].format(" YYYY");
-
-            if (this.showDropdowns) {
-                dateHtml = this.renderDropdowns(calendar[1][1], minDate, maxDate);
-            }
-
-            html += '<th colspan="5" class="month">' + dateHtml + '</th>';
-            if (!maxDate || maxDate.isAfter(calendar[1][1])) {
-                html += '<th class="next available"><i class="fa fa-arrow-right icon-arrow-right glyphicon glyphicon-arrow-right"></i></th>';
-            } else {
-                html += '<th></th>';
-            }
-
-            html += '</tr>';
-            html += '<tr>';
-
-            // add week number label
-            if (this.showWeekNumbers)
-                html += '<th class="week">' + this.locale.weekLabel + '</th>';
-
-            $.each(this.locale.daysOfWeek, function (index, dayOfWeek) {
-                html += '<th>' + dayOfWeek + '</th>';
-            });
-
-            html += '</tr>';
-            html += '</thead>';
-            html += '<tbody>';
-
-            for (var row = 0; row < 6; row++) {
-                html += '<tr>';
-
-                // add week number
-                if (this.showWeekNumbers)
-                    html += '<td class="week">' + calendar[row][0].week() + '</td>';
-
-                for (var col = 0; col < 7; col++) {
-                    var cname = 'available ';
-                    cname += (calendar[row][col].month() == calendar[1][1].month()) ? '' : 'off';
-
-                    if ((minDate && calendar[row][col].isBefore(minDate, 'day')) || (maxDate && calendar[row][col].isAfter(maxDate, 'day'))) {
-                        cname = ' off disabled ';
-                    } else if (calendar[row][col].format('YYYY-MM-DD') == selected.format('YYYY-MM-DD')) {
-                        cname += ' active ';
-                        if (calendar[row][col].format('YYYY-MM-DD') == this.startDate.format('YYYY-MM-DD')) {
-                            cname += ' start-date ';
-                        }
-                        if (calendar[row][col].format('YYYY-MM-DD') == this.endDate.format('YYYY-MM-DD')) {
-                            cname += ' end-date ';
-                        }
-                    } else if (calendar[row][col] >= this.startDate && calendar[row][col] <= this.endDate) {
-                        cname += ' in-range ';
-                        if (calendar[row][col].isSame(this.startDate)) { cname += ' start-date '; }
-                        if (calendar[row][col].isSame(this.endDate)) { cname += ' end-date '; }
-                    }
-
-                    var title = 'r' + row + 'c' + col;
-                    html += '<td class="' + cname.replace(/\s+/g, ' ').replace(/^\s?(.*?)\s?$/, '$1') + '" data-title="' + title + '">' + calendar[row][col].date() + '</td>';
-                }
-                html += '</tr>';
-            }
-
-            html += '</tbody>';
-            html += '</table>';
-            html += '</div>';
-
-            var i;
-            if (this.timePicker) {
-
-                html += '<div class="calendar-time">';
-                html += '<select class="hourselect">';
-                var start = 0;
-                var end = 23;
-                var selected_hour = selected.hour();
-                if (this.timePicker12Hour) {
-                    start = 1;
-                    end = 12;
-                    if (selected_hour >= 12)
-                        selected_hour -= 12;
-                    if (selected_hour === 0)
-                        selected_hour = 12;
-                }
-
-                for (i = start; i <= end; i++) {
-                    if (i == selected_hour) {
-                        html += '<option value="' + i + '" selected="selected">' + i + '</option>';
-                    } else {
-                        html += '<option value="' + i + '">' + i + '</option>';
-                    }
-                }
-
-                html += '</select> : ';
-
-                html += '<select class="minuteselect">';
-
-                for (i = 0; i < 60; i += this.timePickerIncrement) {
-                    var num = i;
-                    if (num < 10)
-                        num = '0' + num;
-                    if (i == selected.minute()) {
-                        html += '<option value="' + i + '" selected="selected">' + num + '</option>';
-                    } else {
-                        html += '<option value="' + i + '">' + num + '</option>';
-                    }
-                }
-
-                html += '</select> ';
-
-                if (this.timePicker12Hour) {
-                    html += '<select class="ampmselect">';
-                    if (selected.hour() >= 12) {
-                        html += '<option value="AM">AM</option><option value="PM" selected="selected">PM</option>';
-                    } else {
-                        html += '<option value="AM" selected="selected">AM</option><option value="PM">PM</option>';
-                    }
-                    html += '</select>';
-                }
-
-                html += '</div>';
-
-            }
-
-            return html;
-
-        },
-
-        remove: function() {
-
-            this.container.remove();
-            this.element.off('.daterangepicker');
-            this.element.removeData('daterangepicker');
-
-        }
-
-    };
-
-    $.fn.daterangepicker = function (options, cb) {
-        this.each(function () {
-            var el = $(this);
-            if (el.data('daterangepicker'))
-                el.data('daterangepicker').remove();
-            el.data('daterangepicker', new DateRangePicker(el, options, cb));
-        });
-        return this;
-    };
-
-}(window.jQuery, window.moment);
\ No newline at end of file
+	var DateRangePicker = function (element, options, cb) {
+
+		// by default, the daterangepicker element is placed at the bottom of HTML body
+		this.parentEl = 'body';
+
+		//element that triggered the date range picker
+		this.element = $(element);
+
+		//create the picker HTML object
+		var DRPTemplate = '<div class="daterangepicker dropdown-menu">' +
+			'<div class="calendar left"></div>' +
+			'<div class="calendar right"></div>' +
+			'<div class="ranges">' +
+			'<div class="range_inputs">' +
+			'<div class="daterangepicker_start_input">' +
+			'<label for="daterangepicker_start"></label>' +
+			'<input class="input-mini" type="text" name="daterangepicker_start" value="" disabled="disabled" />' +
+			'</div>' +
+			'<div class="daterangepicker_end_input">' +
+			'<label for="daterangepicker_end"></label>' +
+			'<input class="input-mini" type="text" name="daterangepicker_end" value="" disabled="disabled" />' +
+			'</div>' +
+			'<button class="applyBtn" disabled="disabled"></button>&nbsp;' +
+			'<button class="cancelBtn"></button>' +
+			'</div>' +
+			'</div>' +
+			'</div>';
+
+		//custom options
+		if (typeof options !== 'object' || options === null)
+			options = {};
+
+		this.parentEl = (typeof options === 'object' && options.parentEl && $(options.parentEl).length) ? $(options.parentEl) : $(this.parentEl);
+		this.container = $(DRPTemplate).appendTo(this.parentEl);
+
+		this.setOptions(options, cb);
+
+		//apply CSS classes and labels to buttons
+		var c = this.container;
+		$.each(this.buttonClasses, function (idx, val) {
+			c.find('button').addClass(val);
+		});
+		this.container.find('.daterangepicker_start_input label').html(this.locale.fromLabel);
+		this.container.find('.daterangepicker_end_input label').html(this.locale.toLabel);
+		if (this.applyClass.length)
+			this.container.find('.applyBtn').addClass(this.applyClass);
+		if (this.cancelClass.length)
+			this.container.find('.cancelBtn').addClass(this.cancelClass);
+		this.container.find('.applyBtn').html(this.locale.applyLabel);
+		this.container.find('.cancelBtn').html(this.locale.cancelLabel);
+
+		//event listeners
+
+		this.container.find('.calendar')
+			.on('click.daterangepicker', '.prev', $.proxy(this.clickPrev, this))
+			.on('click.daterangepicker', '.next', $.proxy(this.clickNext, this))
+			.on('click.daterangepicker', 'td.available', $.proxy(this.clickDate, this))
+			.on('mouseenter.daterangepicker', 'td.available', $.proxy(this.enterDate, this))
+			.on('mouseleave.daterangepicker', 'td.available', $.proxy(this.updateFormInputs, this))
+			.on('change.daterangepicker', 'select.yearselect', $.proxy(this.updateMonthYear, this))
+			.on('change.daterangepicker', 'select.monthselect', $.proxy(this.updateMonthYear, this))
+			.on('change.daterangepicker', 'select.hourselect,select.minuteselect,select.ampmselect', $.proxy(this.updateTime, this));
+
+		this.container.find('.ranges')
+			.on('click.daterangepicker', 'button.applyBtn', $.proxy(this.clickApply, this))
+			.on('click.daterangepicker', 'button.cancelBtn', $.proxy(this.clickCancel, this))
+			.on('click.daterangepicker', '.daterangepicker_start_input,.daterangepicker_end_input', $.proxy(this.showCalendars, this))
+			.on('click.daterangepicker', 'li', $.proxy(this.clickRange, this))
+			.on('mouseenter.daterangepicker', 'li', $.proxy(this.enterRange, this))
+			.on('mouseleave.daterangepicker', 'li', $.proxy(this.updateFormInputs, this));
+
+		if (this.element.is('input')) {
+			this.element.on({
+				'click.daterangepicker': $.proxy(this.show, this),
+				'focus.daterangepicker': $.proxy(this.show, this),
+				'keyup.daterangepicker': $.proxy(this.updateFromControl, this)
+			});
+		} else {
+			this.element.on('click.daterangepicker', $.proxy(this.toggle, this));
+		}
+
+	};
+
+	DateRangePicker.prototype = {
+
+		constructor: DateRangePicker,
+
+		setOptions: function (options, callback) {
+
+			this.startDate = moment().startOf('day');
+			this.endDate = moment().endOf('day');
+			this.minDate = false;
+			this.maxDate = false;
+			this.dateLimit = false;
+
+			this.showDropdowns = false;
+			this.showWeekNumbers = false;
+			this.timePicker = false;
+			this.timePickerIncrement = 30;
+			this.timePicker12Hour = true;
+			this.singleDatePicker = false;
+			this.ranges = {};
+
+			this.opens = 'right';
+			if (this.element.hasClass('pull-right'))
+				this.opens = 'left';
+
+			this.buttonClasses = ['btn', 'btn-small'];
+			this.applyClass = 'btn-success';
+			this.cancelClass = 'btn-default';
+
+			this.format = 'MM/DD/YYYY';
+			this.separator = ' - ';
+
+			this.locale = {
+				applyLabel: 'Apply',
+				cancelLabel: 'Cancel',
+				fromLabel: 'From',
+				toLabel: 'To',
+				weekLabel: 'W',
+				customRangeLabel: 'Custom Range',
+				daysOfWeek: moment()._lang._weekdaysMin.slice(),
+				monthNames: moment()._lang._monthsShort.slice(),
+				firstDay: 0
+			};
+
+			this.cb = function () {
+			};
+
+			if (typeof options.format === 'string')
+				this.format = options.format;
+
+			if (typeof options.separator === 'string')
+				this.separator = options.separator;
+
+			if (typeof options.startDate === 'string')
+				this.startDate = moment(options.startDate, this.format);
+
+			if (typeof options.endDate === 'string')
+				this.endDate = moment(options.endDate, this.format);
+
+			if (typeof options.minDate === 'string')
+				this.minDate = moment(options.minDate, this.format);
+
+			if (typeof options.maxDate === 'string')
+				this.maxDate = moment(options.maxDate, this.format);
+
+			if (typeof options.startDate === 'object')
+				this.startDate = moment(options.startDate);
+
+			if (typeof options.endDate === 'object')
+				this.endDate = moment(options.endDate);
+
+			if (typeof options.minDate === 'object')
+				this.minDate = moment(options.minDate);
+
+			if (typeof options.maxDate === 'object')
+				this.maxDate = moment(options.maxDate);
+
+			if (typeof options.applyClass === 'string')
+				this.applyClass = options.applyClass;
+
+			if (typeof options.cancelClass === 'string')
+				this.cancelClass = options.cancelClass;
+
+			if (typeof options.dateLimit === 'object')
+				this.dateLimit = options.dateLimit;
+
+			// update day names order to firstDay
+			if (typeof options.locale === 'object') {
+
+				if (typeof options.locale.daysOfWeek === 'object') {
+					// Create a copy of daysOfWeek to avoid modification of original
+					// options object for reusability in multiple daterangepicker instances
+					this.locale.daysOfWeek = options.locale.daysOfWeek.slice();
+				}
+
+				if (typeof options.locale.monthNames === 'object') {
+					this.locale.monthNames = options.locale.monthNames.slice();
+				}
+
+				if (typeof options.locale.firstDay === 'number') {
+					this.locale.firstDay = options.locale.firstDay;
+					var iterator = options.locale.firstDay;
+					while (iterator > 0) {
+						this.locale.daysOfWeek.push(this.locale.daysOfWeek.shift());
+						iterator--;
+					}
+				}
+
+				if (typeof options.locale.applyLabel === 'string') {
+					this.locale.applyLabel = options.locale.applyLabel;
+				}
+
+				if (typeof options.locale.cancelLabel === 'string') {
+					this.locale.cancelLabel = options.locale.cancelLabel;
+				}
+
+				if (typeof options.locale.fromLabel === 'string') {
+					this.locale.fromLabel = options.locale.fromLabel;
+				}
+
+				if (typeof options.locale.toLabel === 'string') {
+					this.locale.toLabel = options.locale.toLabel;
+				}
+
+				if (typeof options.locale.weekLabel === 'string') {
+					this.locale.weekLabel = options.locale.weekLabel;
+				}
+
+				if (typeof options.locale.customRangeLabel === 'string') {
+					this.locale.customRangeLabel = options.locale.customRangeLabel;
+				}
+			}
+
+			if (typeof options.opens === 'string')
+				this.opens = options.opens;
+
+			if (typeof options.showWeekNumbers === 'boolean') {
+				this.showWeekNumbers = options.showWeekNumbers;
+			}
+
+			if (typeof options.buttonClasses === 'string') {
+				this.buttonClasses = [options.buttonClasses];
+			}
+
+			if (typeof options.buttonClasses === 'object') {
+				this.buttonClasses = options.buttonClasses;
+			}
+
+			if (typeof options.showDropdowns === 'boolean') {
+				this.showDropdowns = options.showDropdowns;
+			}
+
+			if (typeof options.singleDatePicker === 'boolean') {
+				this.singleDatePicker = options.singleDatePicker;
+			}
+
+			if (typeof options.timePicker === 'boolean') {
+				this.timePicker = options.timePicker;
+			}
+
+			if (typeof options.timePickerIncrement === 'number') {
+				this.timePickerIncrement = options.timePickerIncrement;
+			}
+
+			if (typeof options.timePicker12Hour === 'boolean') {
+				this.timePicker12Hour = options.timePicker12Hour;
+			}
+
+			var start, end, range;
+
+			//if no start/end dates set, check if an input element contains initial values
+			if (typeof options.startDate === 'undefined' && typeof options.endDate === 'undefined') {
+				if ($(this.element).is('input[type=text]')) {
+					var val = $(this.element).val();
+					var split = val.split(this.separator);
+					start = end = null;
+					if (split.length == 2) {
+						start = moment(split[0], this.format);
+						end = moment(split[1], this.format);
+					} else if (this.singleDatePicker) {
+						start = moment(val, this.format);
+						end = moment(val, this.format);
+					}
+					if (start !== null && end !== null) {
+						this.startDate = start;
+						this.endDate = end;
+					}
+				}
+			}
+
+			if (typeof options.ranges === 'object') {
+				for (range in options.ranges) {
+
+					start = moment(options.ranges[range][0]);
+					end = moment(options.ranges[range][1]);
+
+					// If we have a min/max date set, bound this range
+					// to it, but only if it would otherwise fall
+					// outside of the min/max.
+					if (this.minDate && start.isBefore(this.minDate))
+						start = moment(this.minDate);
+
+					if (this.maxDate && end.isAfter(this.maxDate))
+						end = moment(this.maxDate);
+
+					// If the end of the range is before the minimum (if min is set) OR
+					// the start of the range is after the max (also if set) don't display this
+					// range option.
+					if ((this.minDate && end.isBefore(this.minDate)) || (this.maxDate && start.isAfter(this.maxDate))) {
+						continue;
+					}
+
+					this.ranges[range] = [start, end];
+				}
+
+				var list = '<ul>';
+				for (range in this.ranges) {
+					list += '<li>' + range + '</li>';
+				}
+				list += '<li>' + this.locale.customRangeLabel + '</li>';
+				list += '</ul>';
+				this.container.find('.ranges ul').remove();
+				this.container.find('.ranges').prepend(list);
+			}
+
+			if (typeof callback === 'function') {
+				this.cb = callback;
+			}
+
+			if (!this.timePicker) {
+				this.startDate = this.startDate.startOf('day');
+				this.endDate = this.endDate.endOf('day');
+			}
+
+			if (this.singleDatePicker) {
+				this.opens = 'right';
+				this.container.find('.calendar.right').show();
+				this.container.find('.calendar.left').hide();
+				this.container.find('.ranges').hide();
+				if (!this.container.find('.calendar.right').hasClass('single'))
+					this.container.find('.calendar.right').addClass('single');
+			} else {
+				this.container.find('.calendar.right').removeClass('single');
+				this.container.find('.ranges').show();
+			}
+
+			this.oldStartDate = this.startDate.clone();
+			this.oldEndDate = this.endDate.clone();
+			this.oldChosenLabel = this.chosenLabel;
+
+			this.leftCalendar = {
+				month: moment([this.startDate.year(), this.startDate.month(), 1, this.startDate.hour(), this.startDate.minute()]),
+				calendar: []
+			};
+
+			this.rightCalendar = {
+				month: moment([this.endDate.year(), this.endDate.month(), 1, this.endDate.hour(), this.endDate.minute()]),
+				calendar: []
+			};
+
+			if (this.opens == 'right') {
+				//swap calendar positions
+				var left = this.container.find('.calendar.left');
+				var right = this.container.find('.calendar.right');
+				left.removeClass('left').addClass('right');
+				right.removeClass('right').addClass('left');
+			}
+
+			if (typeof options.ranges === 'undefined' && !this.singleDatePicker) {
+				this.container.addClass('show-calendar');
+			}
+
+			this.container.addClass('opens' + this.opens);
+
+			this.updateView();
+			this.updateCalendars();
+
+		},
+
+		setStartDate: function (startDate) {
+			if (typeof startDate === 'string')
+				this.startDate = moment(startDate, this.format);
+
+			if (typeof startDate === 'object')
+				this.startDate = moment(startDate);
+
+			if (!this.timePicker)
+				this.startDate = this.startDate.startOf('day');
+
+			this.oldStartDate = this.startDate.clone();
+
+			this.updateView();
+			this.updateCalendars();
+		},
+
+		setEndDate: function (endDate) {
+			if (typeof endDate === 'string')
+				this.endDate = moment(endDate, this.format);
+
+			if (typeof endDate === 'object')
+				this.endDate = moment(endDate);
+
+			if (!this.timePicker)
+				this.endDate = this.endDate.endOf('day');
+
+			this.oldEndDate = this.endDate.clone();
+
+			this.updateView();
+			this.updateCalendars();
+		},
+
+		updateView: function () {
+			this.leftCalendar.month.month(this.startDate.month()).year(this.startDate.year());
+			this.rightCalendar.month.month(this.endDate.month()).year(this.endDate.year());
+			this.updateFormInputs();
+		},
+
+		updateFormInputs: function () {
+			this.container.find('input[name=daterangepicker_start]').val(this.startDate.format(this.format));
+			this.container.find('input[name=daterangepicker_end]').val(this.endDate.format(this.format));
+
+			if (this.startDate.isSame(this.endDate) || this.startDate.isBefore(this.endDate)) {
+				this.container.find('button.applyBtn').removeAttr('disabled');
+			} else {
+				this.container.find('button.applyBtn').attr('disabled', 'disabled');
+			}
+		},
+
+		updateFromControl: function () {
+			if (!this.element.is('input')) return;
+			if (!this.element.val().length) return;
+
+			var dateString = this.element.val().split(this.separator),
+				start = null,
+				end = null;
+
+			if (dateString.length === 2) {
+				start = moment(dateString[0], this.format);
+				end = moment(dateString[1], this.format);
+			}
+
+			if (this.singleDatePicker || start === null || end === null) {
+				start = moment(this.element.val(), this.format);
+				end = start;
+			}
+
+			if (end.isBefore(start)) return;
+
+			this.oldStartDate = this.startDate.clone();
+			this.oldEndDate = this.endDate.clone();
+
+			this.startDate = start;
+			this.endDate = end;
+
+			if (!this.startDate.isSame(this.oldStartDate) || !this.endDate.isSame(this.oldEndDate))
+				this.notify();
+
+			this.updateCalendars();
+		},
+
+		notify: function () {
+			this.updateView();
+			this.cb(this.startDate, this.endDate, this.chosenLabel);
+		},
+
+		move: function () {
+			var parentOffset = {top: 0, left: 0};
+			if (!this.parentEl.is('body')) {
+				parentOffset = {
+					top: this.parentEl.offset().top - this.parentEl.scrollTop(),
+					left: this.parentEl.offset().left - this.parentEl.scrollLeft()
+				};
+			}
+
+			if (this.opens == 'left') {
+				this.container.css({
+					top: this.element.offset().top + this.element.outerHeight() - parentOffset.top,
+					right: $(window).width() - this.element.offset().left - this.element.outerWidth() - parentOffset.left,
+					left: 'auto'
+				});
+				if (this.container.offset().left < 0) {
+					this.container.css({
+						right: 'auto',
+						left: 9
+					});
+				}
+			} else {
+				this.container.css({
+					top: this.element.offset().top + this.element.outerHeight() - parentOffset.top,
+					left: this.element.offset().left - parentOffset.left,
+					right: 'auto'
+				});
+				if (this.container.offset().left + this.container.outerWidth() > $(window).width()) {
+					this.container.css({
+						left: 'auto',
+						right: 0
+					});
+				}
+			}
+		},
+
+		toggle: function (e) {
+			if (this.element.hasClass('active')) {
+				this.hide();
+			} else {
+				this.show();
+			}
+		},
+
+		show: function (e) {
+			this.element.addClass('active');
+			this.container.show();
+			this.move();
+
+			// Create a click proxy that is private to this instance of datepicker, for unbinding
+			this._outsideClickProxy = $.proxy(function (e) {
+				this.outsideClick(e);
+			}, this);
+			// Bind global datepicker mousedown for hiding and
+			$(document)
+				.on('mousedown.daterangepicker', this._outsideClickProxy)
+				// also explicitly play nice with Bootstrap dropdowns, which stopPropagation when clicking them
+				.on('click.daterangepicker', '[data-toggle=dropdown]', this._outsideClickProxy)
+				// and also close when focus changes to outside the picker (eg. tabbing between controls)
+				.on('focusin.daterangepicker', this._outsideClickProxy);
+
+			this.element.trigger('show.daterangepicker', this);
+		},
+
+		outsideClick: function (e) {
+			var target = $(e.target);
+			// if the page is clicked anywhere except within the daterangerpicker/button
+			// itself then call this.hide()
+			if (
+				target.closest(this.element).length ||
+				target.closest(this.container).length ||
+				target.closest('.calendar-date').length
+			) return;
+			this.hide();
+		},
+
+		hide: function (e) {
+			$(document)
+				.off('mousedown.daterangepicker', this._outsideClickProxy)
+				.off('click.daterangepicker', this._outsideClickProxy)
+				.off('focusin.daterangepicker', this._outsideClickProxy);
+
+			this.element.removeClass('active');
+			this.container.hide();
+
+			if (!this.startDate.isSame(this.oldStartDate) || !this.endDate.isSame(this.oldEndDate))
+				this.notify();
+
+			this.oldStartDate = this.startDate.clone();
+			this.oldEndDate = this.endDate.clone();
+
+			this.element.trigger('hide.daterangepicker', this);
+		},
+
+		enterRange: function (e) {
+			// mouse pointer has entered a range label
+			var label = e.target.innerHTML;
+			if (label == this.locale.customRangeLabel) {
+				this.updateView();
+			} else {
+				var dates = this.ranges[label];
+				this.container.find('input[name=daterangepicker_start]').val(dates[0].format(this.format));
+				this.container.find('input[name=daterangepicker_end]').val(dates[1].format(this.format));
+			}
+		},
+
+		showCalendars: function () {
+			this.container.addClass('show-calendar');
+			this.move();
+		},
+
+		hideCalendars: function () {
+			this.container.removeClass('show-calendar');
+		},
+
+		updateInputText: function () {
+			if (this.element.is('input') && !this.singleDatePicker) {
+				this.element.val(this.startDate.format(this.format) + this.separator + this.endDate.format(this.format));
+			} else if (this.element.is('input')) {
+				this.element.val(this.startDate.format(this.format));
+			}
+		},
+
+		clickRange: function (e) {
+			var label = e.target.innerHTML;
+			this.chosenLabel = label;
+			if (label == this.locale.customRangeLabel) {
+				this.showCalendars();
+			} else {
+				var dates = this.ranges[label];
+
+				this.startDate = dates[0];
+				this.endDate = dates[1];
+
+				if (!this.timePicker) {
+					this.startDate.startOf('day');
+					this.endDate.endOf('day');
+				}
+
+				this.leftCalendar.month.month(this.startDate.month()).year(this.startDate.year()).hour(this.startDate.hour()).minute(this.startDate.minute());
+				this.rightCalendar.month.month(this.endDate.month()).year(this.endDate.year()).hour(this.endDate.hour()).minute(this.endDate.minute());
+				this.updateCalendars();
+
+				this.updateInputText();
+
+				this.hideCalendars();
+				this.hide();
+				this.element.trigger('apply.daterangepicker', this);
+			}
+		},
+
+		clickPrev: function (e) {
+			var cal = $(e.target).parents('.calendar');
+			if (cal.hasClass('left')) {
+				this.leftCalendar.month.subtract('month', 1);
+			} else {
+				this.rightCalendar.month.subtract('month', 1);
+			}
+			this.updateCalendars();
+		},
+
+		clickNext: function (e) {
+			var cal = $(e.target).parents('.calendar');
+			if (cal.hasClass('left')) {
+				this.leftCalendar.month.add('month', 1);
+			} else {
+				this.rightCalendar.month.add('month', 1);
+			}
+			this.updateCalendars();
+		},
+
+		enterDate: function (e) {
+
+			var title = $(e.target).attr('data-title');
+			var row = title.substr(1, 1);
+			var col = title.substr(3, 1);
+			var cal = $(e.target).parents('.calendar');
+
+			if (cal.hasClass('left')) {
+				this.container.find('input[name=daterangepicker_start]').val(this.leftCalendar.calendar[row][col].format(this.format));
+			} else {
+				this.container.find('input[name=daterangepicker_end]').val(this.rightCalendar.calendar[row][col].format(this.format));
+			}
+
+		},
+
+		clickDate: function (e) {
+			var title = $(e.target).attr('data-title');
+			var row = title.substr(1, 1);
+			var col = title.substr(3, 1);
+			var cal = $(e.target).parents('.calendar');
+
+			var startDate, endDate;
+			if (cal.hasClass('left')) {
+				startDate = this.leftCalendar.calendar[row][col];
+				endDate = this.endDate;
+				if (typeof this.dateLimit === 'object') {
+					var maxDate = moment(startDate).add(this.dateLimit).startOf('day');
+					if (endDate.isAfter(maxDate)) {
+						endDate = maxDate;
+					}
+				}
+			} else {
+				startDate = this.startDate;
+				endDate = this.rightCalendar.calendar[row][col];
+				if (typeof this.dateLimit === 'object') {
+					var minDate = moment(endDate).subtract(this.dateLimit).startOf('day');
+					if (startDate.isBefore(minDate)) {
+						startDate = minDate;
+					}
+				}
+			}
+
+			if (this.singleDatePicker && cal.hasClass('left')) {
+				endDate = startDate.clone();
+			} else if (this.singleDatePicker && cal.hasClass('right')) {
+				startDate = endDate.clone();
+			}
+
+			cal.find('td').removeClass('active');
+
+			if (startDate.isSame(endDate) || startDate.isBefore(endDate)) {
+				$(e.target).addClass('active');
+				this.startDate = startDate;
+				this.endDate = endDate;
+				this.chosenLabel = this.locale.customRangeLabel;
+			} else if (startDate.isAfter(endDate)) {
+				$(e.target).addClass('active');
+				var difference = this.endDate.diff(this.startDate);
+				this.startDate = startDate;
+				this.endDate = moment(startDate).add('ms', difference);
+				this.chosenLabel = this.locale.customRangeLabel;
+			}
+
+			this.leftCalendar.month.month(this.startDate.month()).year(this.startDate.year());
+			this.rightCalendar.month.month(this.endDate.month()).year(this.endDate.year());
+			this.updateCalendars();
+
+			if (!this.timePicker)
+				endDate.endOf('day');
+
+			if (this.singleDatePicker)
+				this.clickApply();
+		},
+
+		clickApply: function (e) {
+			this.updateInputText();
+			this.hide();
+			this.element.trigger('apply.daterangepicker', this);
+		},
+
+		clickCancel: function (e) {
+			this.startDate = this.oldStartDate;
+			this.endDate = this.oldEndDate;
+			this.chosenLabel = this.oldChosenLabel;
+			this.updateView();
+			this.updateCalendars();
+			this.hide();
+			this.element.trigger('cancel.daterangepicker', this);
+		},
+
+		updateMonthYear: function (e) {
+			var isLeft = $(e.target).closest('.calendar').hasClass('left'),
+				leftOrRight = isLeft ? 'left' : 'right',
+				cal = this.container.find('.calendar.' + leftOrRight);
+
+			// Month must be Number for new moment versions
+			var month = parseInt(cal.find('.monthselect').val(), 10);
+			var year = cal.find('.yearselect').val();
+
+			this[leftOrRight + 'Calendar'].month.month(month).year(year);
+			this.updateCalendars();
+		},
+
+		updateTime: function (e) {
+
+			var cal = $(e.target).closest('.calendar'),
+				isLeft = cal.hasClass('left');
+
+			var hour = parseInt(cal.find('.hourselect').val(), 10);
+			var minute = parseInt(cal.find('.minuteselect').val(), 10);
+
+			if (this.timePicker12Hour) {
+				var ampm = cal.find('.ampmselect').val();
+				if (ampm === 'PM' && hour < 12)
+					hour += 12;
+				if (ampm === 'AM' && hour === 12)
+					hour = 0;
+			}
+
+			if (isLeft) {
+				var start = this.startDate.clone();
+				start.hour(hour);
+				start.minute(minute);
+				this.startDate = start;
+				this.leftCalendar.month.hour(hour).minute(minute);
+			} else {
+				var end = this.endDate.clone();
+				end.hour(hour);
+				end.minute(minute);
+				this.endDate = end;
+				this.rightCalendar.month.hour(hour).minute(minute);
+			}
+
+			this.updateCalendars();
+		},
+
+		updateCalendars: function () {
+			this.leftCalendar.calendar = this.buildCalendar(this.leftCalendar.month.month(), this.leftCalendar.month.year(), this.leftCalendar.month.hour(), this.leftCalendar.month.minute(), 'left');
+			this.rightCalendar.calendar = this.buildCalendar(this.rightCalendar.month.month(), this.rightCalendar.month.year(), this.rightCalendar.month.hour(), this.rightCalendar.month.minute(), 'right');
+			this.container.find('.calendar.left').empty().html(this.renderCalendar(this.leftCalendar.calendar, this.startDate, this.minDate, this.maxDate));
+			this.container.find('.calendar.right').empty().html(this.renderCalendar(this.rightCalendar.calendar, this.endDate, this.startDate, this.maxDate));
+
+			this.container.find('.ranges li').removeClass('active');
+			var customRange = true;
+			var i = 0;
+			for (var range in this.ranges) {
+				if (this.timePicker) {
+					if (this.startDate.isSame(this.ranges[range][0]) && this.endDate.isSame(this.ranges[range][1])) {
+						customRange = false;
+						this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')')
+							.addClass('active').html();
+					}
+				} else {
+					//ignore times when comparing dates if time picker is not enabled
+					if (this.startDate.format('YYYY-MM-DD') == this.ranges[range][0].format('YYYY-MM-DD') && this.endDate.format('YYYY-MM-DD') == this.ranges[range][1].format('YYYY-MM-DD')) {
+						customRange = false;
+						this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')')
+							.addClass('active').html();
+					}
+				}
+				i++;
+			}
+			if (customRange) {
+				this.chosenLabel = this.container.find('.ranges li:last')
+					.addClass('active').html();
+			}
+		},
+
+		buildCalendar: function (month, year, hour, minute, side) {
+			var firstDay = moment([year, month, 1]);
+			var lastMonth = moment(firstDay).subtract('month', 1).month();
+			var lastYear = moment(firstDay).subtract('month', 1).year();
+
+			var daysInLastMonth = moment([lastYear, lastMonth]).daysInMonth();
+
+			var dayOfWeek = firstDay.day();
+
+			var i;
+
+			//initialize a 6 rows x 7 columns array for the calendar
+			var calendar = [];
+			for (i = 0; i < 6; i++) {
+				calendar[i] = [];
+			}
+
+			//populate the calendar with date objects
+			var startDay = daysInLastMonth - dayOfWeek + this.locale.firstDay + 1;
+			if (startDay > daysInLastMonth)
+				startDay -= 7;
+
+			if (dayOfWeek == this.locale.firstDay)
+				startDay = daysInLastMonth - 6;
+
+			var curDate = moment([lastYear, lastMonth, startDay, 12, minute]);
+			var col, row;
+			for (i = 0, col = 0, row = 0; i < 42; i++, col++, curDate = moment(curDate).add('hour', 24)) {
+				if (i > 0 && col % 7 === 0) {
+					col = 0;
+					row++;
+				}
+				calendar[row][col] = curDate.clone().hour(hour);
+				curDate.hour(12);
+			}
+
+			return calendar;
+		},
+
+		renderDropdowns: function (selected, minDate, maxDate) {
+			var currentMonth = selected.month();
+			var monthHtml = '<select class="monthselect">';
+			var inMinYear = false;
+			var inMaxYear = false;
+
+			for (var m = 0; m < 12; m++) {
+				if ((!inMinYear || m >= minDate.month()) && (!inMaxYear || m <= maxDate.month())) {
+					monthHtml += "<option value='" + m + "'" +
+						(m === currentMonth ? " selected='selected'" : "") +
+						">" + this.locale.monthNames[m] + "</option>";
+				}
+			}
+			monthHtml += "</select>";
+
+			var currentYear = selected.year();
+			var maxYear = (maxDate && maxDate.year()) || (currentYear + 5);
+			var minYear = (minDate && minDate.year()) || (currentYear - 50);
+			var yearHtml = '<select class="yearselect">';
+
+			for (var y = minYear; y <= maxYear; y++) {
+				yearHtml += '<option value="' + y + '"' +
+					(y === currentYear ? ' selected="selected"' : '') +
+					'>' + y + '</option>';
+			}
+
+			yearHtml += '</select>';
+
+			return monthHtml + yearHtml;
+		},
+
+		renderCalendar: function (calendar, selected, minDate, maxDate) {
+
+			var html = '<div class="calendar-date">';
+			html += '<table class="table-condensed">';
+			html += '<thead>';
+			html += '<tr>';
+
+			// add empty cell for week number
+			if (this.showWeekNumbers)
+				html += '<th></th>';
+
+			if (!minDate || minDate.isBefore(calendar[1][1])) {
+				html += '<th class="prev available"><i class="fa fa-arrow-left icon-arrow-left glyphicon glyphicon-arrow-left"></i></th>';
+			} else {
+				html += '<th></th>';
+			}
+
+			var dateHtml = this.locale.monthNames[calendar[1][1].month()] + calendar[1][1].format(" YYYY");
+
+			if (this.showDropdowns) {
+				dateHtml = this.renderDropdowns(calendar[1][1], minDate, maxDate);
+			}
+
+			html += '<th colspan="5" class="month">' + dateHtml + '</th>';
+			if (!maxDate || maxDate.isAfter(calendar[1][1])) {
+				html += '<th class="next available"><i class="fa fa-arrow-right icon-arrow-right glyphicon glyphicon-arrow-right"></i></th>';
+			} else {
+				html += '<th></th>';
+			}
+
+			html += '</tr>';
+			html += '<tr>';
+
+			// add week number label
+			if (this.showWeekNumbers)
+				html += '<th class="week">' + this.locale.weekLabel + '</th>';
+
+			$.each(this.locale.daysOfWeek, function (index, dayOfWeek) {
+				html += '<th>' + dayOfWeek + '</th>';
+			});
+
+			html += '</tr>';
+			html += '</thead>';
+			html += '<tbody>';
+
+			for (var row = 0; row < 6; row++) {
+				html += '<tr>';
+
+				// add week number
+				if (this.showWeekNumbers)
+					html += '<td class="week">' + calendar[row][0].week() + '</td>';
+
+				for (var col = 0; col < 7; col++) {
+					var cname = 'available ';
+					cname += (calendar[row][col].month() == calendar[1][1].month()) ? '' : 'off';
+
+					if ((minDate && calendar[row][col].isBefore(minDate, 'day')) || (maxDate && calendar[row][col].isAfter(maxDate, 'day'))) {
+						cname = ' off disabled ';
+					} else if (calendar[row][col].format('YYYY-MM-DD') == selected.format('YYYY-MM-DD')) {
+						cname += ' active ';
+						if (calendar[row][col].format('YYYY-MM-DD') == this.startDate.format('YYYY-MM-DD')) {
+							cname += ' start-date ';
+						}
+						if (calendar[row][col].format('YYYY-MM-DD') == this.endDate.format('YYYY-MM-DD')) {
+							cname += ' end-date ';
+						}
+					} else if (calendar[row][col] >= this.startDate && calendar[row][col] <= this.endDate) {
+						cname += ' in-range ';
+						if (calendar[row][col].isSame(this.startDate)) {
+							cname += ' start-date ';
+						}
+						if (calendar[row][col].isSame(this.endDate)) {
+							cname += ' end-date ';
+						}
+					}
+
+					var title = 'r' + row + 'c' + col;
+					html += '<td class="' + cname.replace(/\s+/g, ' ').replace(/^\s?(.*?)\s?$/, '$1') + '" data-title="' + title + '">' + calendar[row][col].date() + '</td>';
+				}
+				html += '</tr>';
+			}
+
+			html += '</tbody>';
+			html += '</table>';
+			html += '</div>';
+
+			var i;
+			if (this.timePicker) {
+
+				html += '<div class="calendar-time">';
+				html += '<select class="hourselect">';
+				var start = 0;
+				var end = 23;
+				var selected_hour = selected.hour();
+				if (this.timePicker12Hour) {
+					start = 1;
+					end = 12;
+					if (selected_hour >= 12)
+						selected_hour -= 12;
+					if (selected_hour === 0)
+						selected_hour = 12;
+				}
+
+				for (i = start; i <= end; i++) {
+					if (i == selected_hour) {
+						html += '<option value="' + i + '" selected="selected">' + i + '</option>';
+					} else {
+						html += '<option value="' + i + '">' + i + '</option>';
+					}
+				}
+
+				html += '</select> : ';
+
+				html += '<select class="minuteselect">';
+
+				for (i = 0; i < 60; i += this.timePickerIncrement) {
+					var num = i;
+					if (num < 10)
+						num = '0' + num;
+					if (i == selected.minute()) {
+						html += '<option value="' + i + '" selected="selected">' + num + '</option>';
+					} else {
+						html += '<option value="' + i + '">' + num + '</option>';
+					}
+				}
+
+				html += '</select> ';
+
+				if (this.timePicker12Hour) {
+					html += '<select class="ampmselect">';
+					if (selected.hour() >= 12) {
+						html += '<option value="AM">AM</option><option value="PM" selected="selected">PM</option>';
+					} else {
+						html += '<option value="AM" selected="selected">AM</option><option value="PM">PM</option>';
+					}
+					html += '</select>';
+				}
+
+				html += '</div>';
+
+			}
+
+			return html;
+
+		},
+
+		remove: function () {
+
+			this.container.remove();
+			this.element.off('.daterangepicker');
+			this.element.removeData('daterangepicker');
+
+		}
+
+	};
+
+	$.fn.daterangepicker = function (options, cb) {
+		this.each(function () {
+			var el = $(this);
+			if (el.data('daterangepicker'))
+				el.data('daterangepicker').remove();
+			el.data('daterangepicker', new DateRangePicker(el, options, cb));
+		});
+		return this;
+	};
+
+}(window.jQuery, window.moment);
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.css b/len-activiti/src/main/resources/static/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.css
index a406992..fd7fb66 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.css
+++ b/len-activiti/src/main/resources/static/editor-app/libs/bootstrap_3.1.1/css/bootstrap-theme.css
@@ -10,10 +10,11 @@
 .btn-info,
 .btn-warning,
 .btn-danger {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, .2);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
+	text-shadow: 0 -1px 0 rgba(0, 0, 0, .2);
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
 }
+
 .btn-default:active,
 .btn-primary:active,
 .btn-success:active,
@@ -26,322 +27,373 @@
 .btn-info.active,
 .btn-warning.active,
 .btn-danger.active {
-  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+	-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+	box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
 }
+
 .btn:active,
 .btn.active {
-  background-image: none;
+	background-image: none;
 }
+
 .btn-default {
-  text-shadow: 0 1px 0 #fff;
-  background-image: -webkit-linear-gradient(top, #fff 0%, #e0e0e0 100%);
-  background-image:         linear-gradient(to bottom, #fff 0%, #e0e0e0 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #dbdbdb;
-  border-color: #ccc;
+	text-shadow: 0 1px 0 #fff;
+	background-image: -webkit-linear-gradient(top, #fff 0%, #e0e0e0 100%);
+	background-image: linear-gradient(to bottom, #fff 0%, #e0e0e0 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+	background-repeat: repeat-x;
+	border-color: #dbdbdb;
+	border-color: #ccc;
 }
+
 .btn-default:hover,
 .btn-default:focus {
-  background-color: #e0e0e0;
-  background-position: 0 -15px;
+	background-color: #e0e0e0;
+	background-position: 0 -15px;
 }
+
 .btn-default:active,
 .btn-default.active {
-  background-color: #e0e0e0;
-  border-color: #dbdbdb;
+	background-color: #e0e0e0;
+	border-color: #dbdbdb;
 }
+
 .btn-primary {
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
-  background-image:         linear-gradient(to bottom, #428bca 0%, #2d6ca2 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #2b669a;
+	background-image: -webkit-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
+	background-image: linear-gradient(to bottom, #428bca 0%, #2d6ca2 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+	background-repeat: repeat-x;
+	border-color: #2b669a;
 }
+
 .btn-primary:hover,
 .btn-primary:focus {
-  background-color: #2d6ca2;
-  background-position: 0 -15px;
+	background-color: #2d6ca2;
+	background-position: 0 -15px;
 }
+
 .btn-primary:active,
 .btn-primary.active {
-  background-color: #2d6ca2;
-  border-color: #2b669a;
+	background-color: #2d6ca2;
+	border-color: #2b669a;
 }
+
 .btn-success {
-  background-image: -webkit-linear-gradient(top, #5cb85c 0%, #419641 100%);
-  background-image:         linear-gradient(to bottom, #5cb85c 0%, #419641 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #3e8f3e;
+	background-image: -webkit-linear-gradient(top, #5cb85c 0%, #419641 100%);
+	background-image: linear-gradient(to bottom, #5cb85c 0%, #419641 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+	background-repeat: repeat-x;
+	border-color: #3e8f3e;
 }
+
 .btn-success:hover,
 .btn-success:focus {
-  background-color: #419641;
-  background-position: 0 -15px;
+	background-color: #419641;
+	background-position: 0 -15px;
 }
+
 .btn-success:active,
 .btn-success.active {
-  background-color: #419641;
-  border-color: #3e8f3e;
+	background-color: #419641;
+	border-color: #3e8f3e;
 }
+
 .btn-info {
-  background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
-  background-image:         linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #28a4c9;
+	background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
+	background-image: linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+	background-repeat: repeat-x;
+	border-color: #28a4c9;
 }
+
 .btn-info:hover,
 .btn-info:focus {
-  background-color: #2aabd2;
-  background-position: 0 -15px;
+	background-color: #2aabd2;
+	background-position: 0 -15px;
 }
+
 .btn-info:active,
 .btn-info.active {
-  background-color: #2aabd2;
-  border-color: #28a4c9;
+	background-color: #2aabd2;
+	border-color: #28a4c9;
 }
+
 .btn-warning {
-  background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
-  background-image:         linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #e38d13;
+	background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
+	background-image: linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+	background-repeat: repeat-x;
+	border-color: #e38d13;
 }
+
 .btn-warning:hover,
 .btn-warning:focus {
-  background-color: #eb9316;
-  background-position: 0 -15px;
+	background-color: #eb9316;
+	background-position: 0 -15px;
 }
+
 .btn-warning:active,
 .btn-warning.active {
-  background-color: #eb9316;
-  border-color: #e38d13;
+	background-color: #eb9316;
+	border-color: #e38d13;
 }
+
 .btn-danger {
-  background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
-  background-image:         linear-gradient(to bottom, #d9534f 0%, #c12e2a 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-color: #b92c28;
+	background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
+	background-image: linear-gradient(to bottom, #d9534f 0%, #c12e2a 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+	background-repeat: repeat-x;
+	border-color: #b92c28;
 }
+
 .btn-danger:hover,
 .btn-danger:focus {
-  background-color: #c12e2a;
-  background-position: 0 -15px;
+	background-color: #c12e2a;
+	background-position: 0 -15px;
 }
+
 .btn-danger:active,
 .btn-danger.active {
-  background-color: #c12e2a;
-  border-color: #b92c28;
+	background-color: #c12e2a;
+	border-color: #b92c28;
 }
+
 .thumbnail,
 .img-thumbnail {
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
+	-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
+	box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
 }
+
 .dropdown-menu > li > a:hover,
 .dropdown-menu > li > a:focus {
-  background-color: #e8e8e8;
-  background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image:         linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
-  background-repeat: repeat-x;
+	background-color: #e8e8e8;
+	background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
+	background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
+	background-repeat: repeat-x;
 }
+
 .dropdown-menu > .active > a,
 .dropdown-menu > .active > a:hover,
 .dropdown-menu > .active > a:focus {
-  background-color: #357ebd;
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
-  background-image:         linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
-  background-repeat: repeat-x;
+	background-color: #357ebd;
+	background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
+	background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
+	background-repeat: repeat-x;
 }
+
 .navbar-default {
-  background-image: -webkit-linear-gradient(top, #fff 0%, #f8f8f8 100%);
-  background-image:         linear-gradient(to bottom, #fff 0%, #f8f8f8 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
+	background-image: -webkit-linear-gradient(top, #fff 0%, #f8f8f8 100%);
+	background-image: linear-gradient(to bottom, #fff 0%, #f8f8f8 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+	background-repeat: repeat-x;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
 }
+
 .navbar-default .navbar-nav > .active > a {
-  background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%);
-  background-image:         linear-gradient(to bottom, #ebebeb 0%, #f3f3f3 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);
-  background-repeat: repeat-x;
-  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
+	background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%);
+	background-image: linear-gradient(to bottom, #ebebeb 0%, #f3f3f3 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);
+	background-repeat: repeat-x;
+	-webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
+	box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
 }
+
 .navbar-brand,
 .navbar-nav > li > a {
-  text-shadow: 0 1px 0 rgba(255, 255, 255, .25);
+	text-shadow: 0 1px 0 rgba(255, 255, 255, .25);
 }
+
 .navbar-inverse {
-  background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #222 100%);
-  background-image:         linear-gradient(to bottom, #3c3c3c 0%, #222 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  background-repeat: repeat-x;
+	background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #222 100%);
+	background-image: linear-gradient(to bottom, #3c3c3c 0%, #222 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+	background-repeat: repeat-x;
 }
+
 .navbar-inverse .navbar-nav > .active > a {
-  background-image: -webkit-linear-gradient(top, #222 0%, #282828 100%);
-  background-image:         linear-gradient(to bottom, #222 0%, #282828 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);
-  background-repeat: repeat-x;
-  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
-          box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
+	background-image: -webkit-linear-gradient(top, #222 0%, #282828 100%);
+	background-image: linear-gradient(to bottom, #222 0%, #282828 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);
+	background-repeat: repeat-x;
+	-webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
+	box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
 }
+
 .navbar-inverse .navbar-brand,
 .navbar-inverse .navbar-nav > li > a {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, .25);
+	text-shadow: 0 -1px 0 rgba(0, 0, 0, .25);
 }
+
 .navbar-static-top,
 .navbar-fixed-top,
 .navbar-fixed-bottom {
-  border-radius: 0;
+	border-radius: 0;
 }
+
 .alert {
-  text-shadow: 0 1px 0 rgba(255, 255, 255, .2);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
+	text-shadow: 0 1px 0 rgba(255, 255, 255, .2);
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
 }
+
 .alert-success {
-  background-image: -webkit-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
-  background-image:         linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #b2dba1;
+	background-image: -webkit-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
+	background-image: linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
+	background-repeat: repeat-x;
+	border-color: #b2dba1;
 }
+
 .alert-info {
-  background-image: -webkit-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
-  background-image:         linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #9acfea;
+	background-image: -webkit-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
+	background-image: linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
+	background-repeat: repeat-x;
+	border-color: #9acfea;
 }
+
 .alert-warning {
-  background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
-  background-image:         linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #f5e79e;
+	background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
+	background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
+	background-repeat: repeat-x;
+	border-color: #f5e79e;
 }
+
 .alert-danger {
-  background-image: -webkit-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
-  background-image:         linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #dca7a7;
+	background-image: -webkit-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
+	background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
+	background-repeat: repeat-x;
+	border-color: #dca7a7;
 }
+
 .progress {
-  background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
-  background-image:         linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
-  background-repeat: repeat-x;
+	background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
+	background-image: linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
+	background-repeat: repeat-x;
 }
+
 .progress-bar {
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #3071a9 100%);
-  background-image:         linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
-  background-repeat: repeat-x;
+	background-image: -webkit-linear-gradient(top, #428bca 0%, #3071a9 100%);
+	background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
+	background-repeat: repeat-x;
 }
+
 .progress-bar-success {
-  background-image: -webkit-linear-gradient(top, #5cb85c 0%, #449d44 100%);
-  background-image:         linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
-  background-repeat: repeat-x;
+	background-image: -webkit-linear-gradient(top, #5cb85c 0%, #449d44 100%);
+	background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
+	background-repeat: repeat-x;
 }
+
 .progress-bar-info {
-  background-image: -webkit-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
-  background-image:         linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
-  background-repeat: repeat-x;
+	background-image: -webkit-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
+	background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
+	background-repeat: repeat-x;
 }
+
 .progress-bar-warning {
-  background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
-  background-image:         linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
-  background-repeat: repeat-x;
+	background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
+	background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
+	background-repeat: repeat-x;
 }
+
 .progress-bar-danger {
-  background-image: -webkit-linear-gradient(top, #d9534f 0%, #c9302c 100%);
-  background-image:         linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
-  background-repeat: repeat-x;
+	background-image: -webkit-linear-gradient(top, #d9534f 0%, #c9302c 100%);
+	background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
+	background-repeat: repeat-x;
 }
+
 .list-group {
-  border-radius: 4px;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
+	border-radius: 4px;
+	-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
+	box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
 }
+
 .list-group-item.active,
 .list-group-item.active:hover,
 .list-group-item.active:focus {
-  text-shadow: 0 -1px 0 #3071a9;
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #3278b3 100%);
-  background-image:         linear-gradient(to bottom, #428bca 0%, #3278b3 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #3278b3;
+	text-shadow: 0 -1px 0 #3071a9;
+	background-image: -webkit-linear-gradient(top, #428bca 0%, #3278b3 100%);
+	background-image: linear-gradient(to bottom, #428bca 0%, #3278b3 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);
+	background-repeat: repeat-x;
+	border-color: #3278b3;
 }
+
 .panel {
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
+	-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
+	box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
 }
+
 .panel-default > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image:         linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
-  background-repeat: repeat-x;
+	background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
+	background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
+	background-repeat: repeat-x;
 }
+
 .panel-primary > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
-  background-image:         linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
-  background-repeat: repeat-x;
+	background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
+	background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
+	background-repeat: repeat-x;
 }
+
 .panel-success > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
-  background-image:         linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
-  background-repeat: repeat-x;
+	background-image: -webkit-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
+	background-image: linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
+	background-repeat: repeat-x;
 }
+
 .panel-info > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
-  background-image:         linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
-  background-repeat: repeat-x;
+	background-image: -webkit-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
+	background-image: linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
+	background-repeat: repeat-x;
 }
+
 .panel-warning > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
-  background-image:         linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
-  background-repeat: repeat-x;
+	background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
+	background-image: linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
+	background-repeat: repeat-x;
 }
+
 .panel-danger > .panel-heading {
-  background-image: -webkit-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
-  background-image:         linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
-  background-repeat: repeat-x;
+	background-image: -webkit-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
+	background-image: linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
+	background-repeat: repeat-x;
 }
+
 .well {
-  background-image: -webkit-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
-  background-image:         linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
-  background-repeat: repeat-x;
-  border-color: #dcdcdc;
-  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
-          box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
+	background-image: -webkit-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
+	background-image: linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
+	background-repeat: repeat-x;
+	border-color: #dcdcdc;
+	-webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
+	box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
 }
+
 /*# sourceMappingURL=bootstrap-theme.css.map */
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/bootstrap_3.1.1/css/bootstrap.css b/len-activiti/src/main/resources/static/editor-app/libs/bootstrap_3.1.1/css/bootstrap.css
index 4e3da79..f45ce91 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/bootstrap_3.1.1/css/bootstrap.css
+++ b/len-activiti/src/main/resources/static/editor-app/libs/bootstrap_3.1.1/css/bootstrap.css
@@ -6,13 +6,15 @@
 
 /*! normalize.css v3.0.0 | MIT License | git.io/normalize */
 html {
-  font-family: sans-serif;
-  -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
+	font-family: sans-serif;
+	-webkit-text-size-adjust: 100%;
+	-ms-text-size-adjust: 100%;
 }
+
 body {
-  margin: 0;
+	margin: 0;
 }
+
 article,
 aside,
 details,
@@ -25,331 +27,403 @@ main,
 nav,
 section,
 summary {
-  display: block;
+	display: block;
 }
+
 audio,
 canvas,
 progress,
 video {
-  display: inline-block;
-  vertical-align: baseline;
+	display: inline-block;
+	vertical-align: baseline;
 }
+
 audio:not([controls]) {
-  display: none;
-  height: 0;
+	display: none;
+	height: 0;
 }
+
 [hidden],
 template {
-  display: none;
+	display: none;
 }
+
 a {
-  background: transparent;
+	background: transparent;
 }
+
 a:active,
 a:hover {
-  outline: 0;
+	outline: 0;
 }
+
 abbr[title] {
-  border-bottom: 1px dotted;
+	border-bottom: 1px dotted;
 }
+
 b,
 strong {
-  font-weight: bold;
+	font-weight: bold;
 }
+
 dfn {
-  font-style: italic;
+	font-style: italic;
 }
+
 h1 {
-  margin: .67em 0;
-  font-size: 2em;
+	margin: .67em 0;
+	font-size: 2em;
 }
+
 mark {
-  color: #000;
-  background: #ff0;
+	color: #000;
+	background: #ff0;
 }
+
 small {
-  font-size: 80%;
+	font-size: 80%;
 }
+
 sub,
 sup {
-  position: relative;
-  font-size: 75%;
-  line-height: 0;
-  vertical-align: baseline;
+	position: relative;
+	font-size: 75%;
+	line-height: 0;
+	vertical-align: baseline;
 }
+
 sup {
-  top: -.5em;
+	top: -.5em;
 }
+
 sub {
-  bottom: -.25em;
+	bottom: -.25em;
 }
+
 img {
-  border: 0;
+	border: 0;
 }
+
 svg:not(:root) {
-  overflow: hidden;
+	overflow: hidden;
 }
+
 figure {
-  margin: 1em 40px;
+	margin: 1em 40px;
 }
+
 hr {
-  height: 0;
-  -moz-box-sizing: content-box;
-       box-sizing: content-box;
+	height: 0;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
 }
+
 pre {
-  overflow: auto;
+	overflow: auto;
 }
+
 code,
 kbd,
 pre,
 samp {
-  font-family: monospace, monospace;
-  font-size: 1em;
+	font-family: monospace, monospace;
+	font-size: 1em;
 }
+
 button,
 input,
 optgroup,
 select,
 textarea {
-  margin: 0;
-  font: inherit;
-  color: inherit;
+	margin: 0;
+	font: inherit;
+	color: inherit;
 }
+
 button {
-  overflow: visible;
+	overflow: visible;
 }
+
 button,
 select {
-  text-transform: none;
+	text-transform: none;
 }
+
 button,
 html input[type="button"],
 input[type="reset"],
 input[type="submit"] {
-  -webkit-appearance: button;
-  cursor: pointer;
+	-webkit-appearance: button;
+	cursor: pointer;
 }
+
 button[disabled],
 html input[disabled] {
-  cursor: default;
+	cursor: default;
 }
+
 button::-moz-focus-inner,
 input::-moz-focus-inner {
-  padding: 0;
-  border: 0;
+	padding: 0;
+	border: 0;
 }
+
 input {
-  line-height: normal;
+	line-height: normal;
 }
+
 input[type="checkbox"],
 input[type="radio"] {
-  box-sizing: border-box;
-  padding: 0;
+	box-sizing: border-box;
+	padding: 0;
 }
+
 input[type="number"]::-webkit-inner-spin-button,
 input[type="number"]::-webkit-outer-spin-button {
-  height: auto;
+	height: auto;
 }
+
 input[type="search"] {
-  -webkit-box-sizing: content-box;
-     -moz-box-sizing: content-box;
-          box-sizing: content-box;
-  -webkit-appearance: textfield;
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
+	-webkit-appearance: textfield;
 }
+
 input[type="search"]::-webkit-search-cancel-button,
 input[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none;
+	-webkit-appearance: none;
 }
+
 fieldset {
-  padding: .35em .625em .75em;
-  margin: 0 2px;
-  border: 1px solid #c0c0c0;
+	padding: .35em .625em .75em;
+	margin: 0 2px;
+	border: 1px solid #c0c0c0;
 }
+
 legend {
-  padding: 0;
-  border: 0;
+	padding: 0;
+	border: 0;
 }
+
 textarea {
-  overflow: auto;
+	overflow: auto;
 }
+
 optgroup {
-  font-weight: bold;
+	font-weight: bold;
 }
+
 table {
-  border-spacing: 0;
-  border-collapse: collapse;
+	border-spacing: 0;
+	border-collapse: collapse;
 }
+
 td,
 th {
-  padding: 0;
+	padding: 0;
 }
+
 @media print {
-  * {
-    color: #000 !important;
-    text-shadow: none !important;
-    background: transparent !important;
-    box-shadow: none !important;
-  }
-  a,
-  a:visited {
-    text-decoration: underline;
-  }
-  a[href]:after {
-    content: " (" attr(href) ")";
-  }
-  abbr[title]:after {
-    content: " (" attr(title) ")";
-  }
-  a[href^="javascript:"]:after,
-  a[href^="#"]:after {
-    content: "";
-  }
-  pre,
-  blockquote {
-    border: 1px solid #999;
-
-    page-break-inside: avoid;
-  }
-  thead {
-    display: table-header-group;
-  }
-  tr,
-  img {
-    page-break-inside: avoid;
-  }
-  img {
-    max-width: 100% !important;
-  }
-  p,
-  h2,
-  h3 {
-    orphans: 3;
-    widows: 3;
-  }
-  h2,
-  h3 {
-    page-break-after: avoid;
-  }
-  select {
-    background: #fff !important;
-  }
-  .navbar {
-    display: none;
-  }
-  .table td,
-  .table th {
-    background-color: #fff !important;
-  }
-  .btn > .caret,
-  .dropup > .btn > .caret {
-    border-top-color: #000 !important;
-  }
-  .label {
-    border: 1px solid #000;
-  }
-  .table {
-    border-collapse: collapse !important;
-  }
-  .table-bordered th,
-  .table-bordered td {
-    border: 1px solid #ddd !important;
-  }
+	* {
+		color: #000 !important;
+		text-shadow: none !important;
+		background: transparent !important;
+		box-shadow: none !important;
+	}
+
+	a,
+	a:visited {
+		text-decoration: underline;
+	}
+
+	a[href]:after {
+		content: " (" attr(href) ")";
+	}
+
+	abbr[title]:after {
+		content: " (" attr(title) ")";
+	}
+
+	a[href^="javascript:"]:after,
+	a[href^="#"]:after {
+		content: "";
+	}
+
+	pre,
+	blockquote {
+		border: 1px solid #999;
+
+		page-break-inside: avoid;
+	}
+
+	thead {
+		display: table-header-group;
+	}
+
+	tr,
+	img {
+		page-break-inside: avoid;
+	}
+
+	img {
+		max-width: 100% !important;
+	}
+
+	p,
+	h2,
+	h3 {
+		orphans: 3;
+		widows: 3;
+	}
+
+	h2,
+	h3 {
+		page-break-after: avoid;
+	}
+
+	select {
+		background: #fff !important;
+	}
+
+	.navbar {
+		display: none;
+	}
+
+	.table td,
+	.table th {
+		background-color: #fff !important;
+	}
+
+	.btn > .caret,
+	.dropup > .btn > .caret {
+		border-top-color: #000 !important;
+	}
+
+	.label {
+		border: 1px solid #000;
+	}
+
+	.table {
+		border-collapse: collapse !important;
+	}
+
+	.table-bordered th,
+	.table-bordered td {
+		border: 1px solid #ddd !important;
+	}
 }
+
 * {
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
 }
+
 *:before,
 *:after {
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
 }
+
 html {
-  font-size: 62.5%;
+	font-size: 62.5%;
 
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+	-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }
+
 body {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 14px;
-  line-height: 1.42857143;
-  color: #333;
-  background-color: #fff;
+	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+	font-size: 14px;
+	line-height: 1.42857143;
+	color: #333;
+	background-color: #fff;
 }
+
 input,
 button,
 select,
 textarea {
-  font-family: inherit;
-  font-size: inherit;
-  line-height: inherit;
+	font-family: inherit;
+	font-size: inherit;
+	line-height: inherit;
 }
+
 a {
-  color: #428bca;
-  text-decoration: none;
+	color: #428bca;
+	text-decoration: none;
 }
+
 a:hover,
 a:focus {
-  color: #2a6496;
-  text-decoration: underline;
+	color: #2a6496;
+	text-decoration: underline;
 }
+
 a:focus {
-  outline: thin dotted;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
+	outline: thin dotted;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
 }
+
 figure {
-  margin: 0;
+	margin: 0;
 }
+
 img {
-  vertical-align: middle;
+	vertical-align: middle;
 }
+
 .img-responsive,
 .thumbnail > img,
 .thumbnail a > img,
 .carousel-inner > .item > img,
 .carousel-inner > .item > a > img {
-  display: block;
-  max-width: 100%;
-  height: auto;
+	display: block;
+	max-width: 100%;
+	height: auto;
 }
+
 .img-rounded {
-  border-radius: 6px;
+	border-radius: 6px;
 }
+
 .img-thumbnail {
-  display: inline-block;
-  max-width: 100%;
-  height: auto;
-  padding: 4px;
-  line-height: 1.42857143;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  border-radius: 4px;
-  -webkit-transition: all .2s ease-in-out;
-          transition: all .2s ease-in-out;
+	display: inline-block;
+	max-width: 100%;
+	height: auto;
+	padding: 4px;
+	line-height: 1.42857143;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-radius: 4px;
+	-webkit-transition: all .2s ease-in-out;
+	transition: all .2s ease-in-out;
 }
+
 .img-circle {
-  border-radius: 50%;
+	border-radius: 50%;
 }
+
 hr {
-  margin-top: 20px;
-  margin-bottom: 20px;
-  border: 0;
-  border-top: 1px solid #eee;
+	margin-top: 20px;
+	margin-bottom: 20px;
+	border: 0;
+	border-top: 1px solid #eee;
 }
+
 .sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  margin: -1px;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  border: 0;
+	position: absolute;
+	width: 1px;
+	height: 1px;
+	padding: 0;
+	margin: -1px;
+	overflow: hidden;
+	clip: rect(0, 0, 0, 0);
+	border: 0;
 }
+
 h1,
 h2,
 h3,
@@ -362,11 +436,12 @@ h6,
 .h4,
 .h5,
 .h6 {
-  font-family: inherit;
-  font-weight: 500;
-  line-height: 1.1;
-  color: inherit;
+	font-family: inherit;
+	font-weight: 500;
+	line-height: 1.1;
+	color: inherit;
 }
+
 h1 small,
 h2 small,
 h3 small,
@@ -391,19 +466,21 @@ h6 .small,
 .h4 .small,
 .h5 .small,
 .h6 .small {
-  font-weight: normal;
-  line-height: 1;
-  color: #999;
+	font-weight: normal;
+	line-height: 1;
+	color: #999;
 }
+
 h1,
 .h1,
 h2,
 .h2,
 h3,
 .h3 {
-  margin-top: 20px;
-  margin-bottom: 10px;
+	margin-top: 20px;
+	margin-bottom: 10px;
 }
+
 h1 small,
 .h1 small,
 h2 small,
@@ -416,17 +493,19 @@ h2 .small,
 .h2 .small,
 h3 .small,
 .h3 .small {
-  font-size: 65%;
+	font-size: 65%;
 }
+
 h4,
 .h4,
 h5,
 .h5,
 h6,
 .h6 {
-  margin-top: 10px;
-  margin-bottom: 10px;
+	margin-top: 10px;
+	margin-bottom: 10px;
 }
+
 h4 small,
 .h4 small,
 h5 small,
@@ -439,1049 +518,1346 @@ h5 .small,
 .h5 .small,
 h6 .small,
 .h6 .small {
-  font-size: 75%;
+	font-size: 75%;
 }
+
 h1,
 .h1 {
-  font-size: 36px;
+	font-size: 36px;
 }
+
 h2,
 .h2 {
-  font-size: 30px;
+	font-size: 30px;
 }
+
 h3,
 .h3 {
-  font-size: 24px;
+	font-size: 24px;
 }
+
 h4,
 .h4 {
-  font-size: 18px;
+	font-size: 18px;
 }
+
 h5,
 .h5 {
-  font-size: 14px;
+	font-size: 14px;
 }
+
 h6,
 .h6 {
-  font-size: 12px;
+	font-size: 12px;
 }
+
 p {
-  margin: 0 0 10px;
+	margin: 0 0 10px;
 }
+
 .lead {
-  margin-bottom: 20px;
-  font-size: 16px;
-  font-weight: 200;
-  line-height: 1.4;
+	margin-bottom: 20px;
+	font-size: 16px;
+	font-weight: 200;
+	line-height: 1.4;
 }
+
 @media (min-width: 768px) {
-  .lead {
-    font-size: 21px;
-  }
+	.lead {
+		font-size: 21px;
+	}
 }
+
 small,
 .small {
-  font-size: 85%;
+	font-size: 85%;
 }
+
 cite {
-  font-style: normal;
+	font-style: normal;
 }
+
 .text-left {
-  text-align: left;
+	text-align: left;
 }
+
 .text-right {
-  text-align: right;
+	text-align: right;
 }
+
 .text-center {
-  text-align: center;
+	text-align: center;
 }
+
 .text-justify {
-  text-align: justify;
+	text-align: justify;
 }
+
 .text-muted {
-  color: #999;
+	color: #999;
 }
+
 .text-primary {
-  color: #428bca;
+	color: #428bca;
 }
+
 a.text-primary:hover {
-  color: #3071a9;
+	color: #3071a9;
 }
+
 .text-success {
-  color: #3c763d;
+	color: #3c763d;
 }
+
 a.text-success:hover {
-  color: #2b542c;
+	color: #2b542c;
 }
+
 .text-info {
-  color: #31708f;
+	color: #31708f;
 }
+
 a.text-info:hover {
-  color: #245269;
+	color: #245269;
 }
+
 .text-warning {
-  color: #8a6d3b;
+	color: #8a6d3b;
 }
+
 a.text-warning:hover {
-  color: #66512c;
+	color: #66512c;
 }
+
 .text-danger {
-  color: #a94442;
+	color: #a94442;
 }
+
 a.text-danger:hover {
-  color: #843534;
+	color: #843534;
 }
+
 .bg-primary {
-  color: #fff;
-  background-color: #428bca;
+	color: #fff;
+	background-color: #428bca;
 }
+
 a.bg-primary:hover {
-  background-color: #3071a9;
+	background-color: #3071a9;
 }
+
 .bg-success {
-  background-color: #dff0d8;
+	background-color: #dff0d8;
 }
+
 a.bg-success:hover {
-  background-color: #c1e2b3;
+	background-color: #c1e2b3;
 }
+
 .bg-info {
-  background-color: #d9edf7;
+	background-color: #d9edf7;
 }
+
 a.bg-info:hover {
-  background-color: #afd9ee;
+	background-color: #afd9ee;
 }
+
 .bg-warning {
-  background-color: #fcf8e3;
+	background-color: #fcf8e3;
 }
+
 a.bg-warning:hover {
-  background-color: #f7ecb5;
+	background-color: #f7ecb5;
 }
+
 .bg-danger {
-  background-color: #f2dede;
+	background-color: #f2dede;
 }
+
 a.bg-danger:hover {
-  background-color: #e4b9b9;
+	background-color: #e4b9b9;
 }
+
 .page-header {
-  padding-bottom: 9px;
-  margin: 40px 0 20px;
-  border-bottom: 1px solid #eee;
+	padding-bottom: 9px;
+	margin: 40px 0 20px;
+	border-bottom: 1px solid #eee;
 }
+
 ul,
 ol {
-  margin-top: 0;
-  margin-bottom: 10px;
+	margin-top: 0;
+	margin-bottom: 10px;
 }
+
 ul ul,
 ol ul,
 ul ol,
 ol ol {
-  margin-bottom: 0;
+	margin-bottom: 0;
 }
+
 .list-unstyled {
-  padding-left: 0;
-  list-style: none;
+	padding-left: 0;
+	list-style: none;
 }
+
 .list-inline {
-  padding-left: 0;
-  margin-left: -5px;
-  list-style: none;
+	padding-left: 0;
+	margin-left: -5px;
+	list-style: none;
 }
+
 .list-inline > li {
-  display: inline-block;
-  padding-right: 5px;
-  padding-left: 5px;
+	display: inline-block;
+	padding-right: 5px;
+	padding-left: 5px;
 }
+
 dl {
-  margin-top: 0;
-  margin-bottom: 20px;
+	margin-top: 0;
+	margin-bottom: 20px;
 }
+
 dt,
 dd {
-  line-height: 1.42857143;
+	line-height: 1.42857143;
 }
+
 dt {
-  font-weight: bold;
+	font-weight: bold;
 }
+
 dd {
-  margin-left: 0;
+	margin-left: 0;
 }
+
 @media (min-width: 768px) {
-  .dl-horizontal dt {
-    float: left;
-    width: 160px;
-    overflow: hidden;
-    clear: left;
-    text-align: right;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  .dl-horizontal dd {
-    margin-left: 180px;
-  }
+	.dl-horizontal dt {
+		float: left;
+		width: 160px;
+		overflow: hidden;
+		clear: left;
+		text-align: right;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.dl-horizontal dd {
+		margin-left: 180px;
+	}
 }
+
 abbr[title],
 abbr[data-original-title] {
-  cursor: help;
-  border-bottom: 1px dotted #999;
+	cursor: help;
+	border-bottom: 1px dotted #999;
 }
+
 .initialism {
-  font-size: 90%;
-  text-transform: uppercase;
+	font-size: 90%;
+	text-transform: uppercase;
 }
+
 blockquote {
-  padding: 10px 20px;
-  margin: 0 0 20px;
-  font-size: 17.5px;
-  border-left: 5px solid #eee;
+	padding: 10px 20px;
+	margin: 0 0 20px;
+	font-size: 17.5px;
+	border-left: 5px solid #eee;
 }
+
 blockquote p:last-child,
 blockquote ul:last-child,
 blockquote ol:last-child {
-  margin-bottom: 0;
+	margin-bottom: 0;
 }
+
 blockquote footer,
 blockquote small,
 blockquote .small {
-  display: block;
-  font-size: 80%;
-  line-height: 1.42857143;
-  color: #999;
+	display: block;
+	font-size: 80%;
+	line-height: 1.42857143;
+	color: #999;
 }
+
 blockquote footer:before,
 blockquote small:before,
 blockquote .small:before {
-  content: '\2014 \00A0';
+	content: '\2014 \00A0';
 }
+
 .blockquote-reverse,
 blockquote.pull-right {
-  padding-right: 15px;
-  padding-left: 0;
-  text-align: right;
-  border-right: 5px solid #eee;
-  border-left: 0;
+	padding-right: 15px;
+	padding-left: 0;
+	text-align: right;
+	border-right: 5px solid #eee;
+	border-left: 0;
 }
+
 .blockquote-reverse footer:before,
 blockquote.pull-right footer:before,
 .blockquote-reverse small:before,
 blockquote.pull-right small:before,
 .blockquote-reverse .small:before,
 blockquote.pull-right .small:before {
-  content: '';
+	content: '';
 }
+
 .blockquote-reverse footer:after,
 blockquote.pull-right footer:after,
 .blockquote-reverse small:after,
 blockquote.pull-right small:after,
 .blockquote-reverse .small:after,
 blockquote.pull-right .small:after {
-  content: '\00A0 \2014';
+	content: '\00A0 \2014';
 }
+
 blockquote:before,
 blockquote:after {
-  content: "";
+	content: "";
 }
+
 address {
-  margin-bottom: 20px;
-  font-style: normal;
-  line-height: 1.42857143;
+	margin-bottom: 20px;
+	font-style: normal;
+	line-height: 1.42857143;
 }
+
 code,
 kbd,
 pre,
 samp {
-  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+	font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
 }
+
 code {
-  padding: 2px 4px;
-  font-size: 90%;
-  color: #c7254e;
-  white-space: nowrap;
-  background-color: #f9f2f4;
-  border-radius: 4px;
+	padding: 2px 4px;
+	font-size: 90%;
+	color: #c7254e;
+	white-space: nowrap;
+	background-color: #f9f2f4;
+	border-radius: 4px;
 }
+
 kbd {
-  padding: 2px 4px;
-  font-size: 90%;
-  color: #fff;
-  background-color: #333;
-  border-radius: 3px;
-  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);
+	padding: 2px 4px;
+	font-size: 90%;
+	color: #fff;
+	background-color: #333;
+	border-radius: 3px;
+	box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);
 }
+
 pre {
-  display: block;
-  padding: 9.5px;
-  margin: 0 0 10px;
-  font-size: 13px;
-  line-height: 1.42857143;
-  color: #333;
-  word-break: break-all;
-  word-wrap: break-word;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc;
-  border-radius: 4px;
+	display: block;
+	padding: 9.5px;
+	margin: 0 0 10px;
+	font-size: 13px;
+	line-height: 1.42857143;
+	color: #333;
+	word-break: break-all;
+	word-wrap: break-word;
+	background-color: #f5f5f5;
+	border: 1px solid #ccc;
+	border-radius: 4px;
 }
+
 pre code {
-  padding: 0;
-  font-size: inherit;
-  color: inherit;
-  white-space: pre-wrap;
-  background-color: transparent;
-  border-radius: 0;
+	padding: 0;
+	font-size: inherit;
+	color: inherit;
+	white-space: pre-wrap;
+	background-color: transparent;
+	border-radius: 0;
 }
+
 .pre-scrollable {
-  max-height: 340px;
-  overflow-y: scroll;
+	max-height: 340px;
+	overflow-y: scroll;
 }
+
 .container {
-  padding-right: 15px;
-  padding-left: 15px;
-  margin-right: auto;
-  margin-left: auto;
+	padding-right: 15px;
+	padding-left: 15px;
+	margin-right: auto;
+	margin-left: auto;
 }
+
 @media (min-width: 768px) {
-  .container {
-    width: 750px;
-  }
+	.container {
+		width: 750px;
+	}
 }
+
 @media (min-width: 992px) {
-  .container {
-    width: 970px;
-  }
+	.container {
+		width: 970px;
+	}
 }
+
 @media (min-width: 1200px) {
-  .container {
-    width: 1170px;
-  }
+	.container {
+		width: 1170px;
+	}
 }
+
 .container-fluid {
-  padding-right: 15px;
-  padding-left: 15px;
-  margin-right: auto;
-  margin-left: auto;
+	padding-right: 15px;
+	padding-left: 15px;
+	margin-right: auto;
+	margin-left: auto;
 }
+
 .row {
-  margin-right: -15px;
-  margin-left: -15px;
+	margin-right: -15px;
+	margin-left: -15px;
 }
+
 .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
-  position: relative;
-  min-height: 1px;
-  padding-right: 15px;
-  padding-left: 15px;
+	position: relative;
+	min-height: 1px;
+	padding-right: 15px;
+	padding-left: 15px;
 }
+
 .col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 {
-  float: left;
+	float: left;
 }
+
 .col-xs-12 {
-  width: 100%;
+	width: 100%;
 }
+
 .col-xs-11 {
-  width: 91.66666667%;
+	width: 91.66666667%;
 }
+
 .col-xs-10 {
-  width: 83.33333333%;
+	width: 83.33333333%;
 }
+
 .col-xs-9 {
-  width: 75%;
+	width: 75%;
 }
+
 .col-xs-8 {
-  width: 66.66666667%;
+	width: 66.66666667%;
 }
+
 .col-xs-7 {
-  width: 58.33333333%;
+	width: 58.33333333%;
 }
+
 .col-xs-6 {
-  width: 50%;
+	width: 50%;
 }
+
 .col-xs-5 {
-  width: 41.66666667%;
+	width: 41.66666667%;
 }
+
 .col-xs-4 {
-  width: 33.33333333%;
+	width: 33.33333333%;
 }
+
 .col-xs-3 {
-  width: 25%;
+	width: 25%;
 }
+
 .col-xs-2 {
-  width: 16.66666667%;
+	width: 16.66666667%;
 }
+
 .col-xs-1 {
-  width: 8.33333333%;
+	width: 8.33333333%;
 }
+
 .col-xs-pull-12 {
-  right: 100%;
+	right: 100%;
 }
+
 .col-xs-pull-11 {
-  right: 91.66666667%;
+	right: 91.66666667%;
 }
+
 .col-xs-pull-10 {
-  right: 83.33333333%;
+	right: 83.33333333%;
 }
+
 .col-xs-pull-9 {
-  right: 75%;
+	right: 75%;
 }
+
 .col-xs-pull-8 {
-  right: 66.66666667%;
+	right: 66.66666667%;
 }
+
 .col-xs-pull-7 {
-  right: 58.33333333%;
+	right: 58.33333333%;
 }
+
 .col-xs-pull-6 {
-  right: 50%;
+	right: 50%;
 }
+
 .col-xs-pull-5 {
-  right: 41.66666667%;
+	right: 41.66666667%;
 }
+
 .col-xs-pull-4 {
-  right: 33.33333333%;
+	right: 33.33333333%;
 }
+
 .col-xs-pull-3 {
-  right: 25%;
+	right: 25%;
 }
+
 .col-xs-pull-2 {
-  right: 16.66666667%;
+	right: 16.66666667%;
 }
+
 .col-xs-pull-1 {
-  right: 8.33333333%;
+	right: 8.33333333%;
 }
+
 .col-xs-pull-0 {
-  right: 0;
+	right: 0;
 }
+
 .col-xs-push-12 {
-  left: 100%;
+	left: 100%;
 }
+
 .col-xs-push-11 {
-  left: 91.66666667%;
+	left: 91.66666667%;
 }
+
 .col-xs-push-10 {
-  left: 83.33333333%;
+	left: 83.33333333%;
 }
+
 .col-xs-push-9 {
-  left: 75%;
+	left: 75%;
 }
+
 .col-xs-push-8 {
-  left: 66.66666667%;
+	left: 66.66666667%;
 }
+
 .col-xs-push-7 {
-  left: 58.33333333%;
+	left: 58.33333333%;
 }
+
 .col-xs-push-6 {
-  left: 50%;
+	left: 50%;
 }
+
 .col-xs-push-5 {
-  left: 41.66666667%;
+	left: 41.66666667%;
 }
+
 .col-xs-push-4 {
-  left: 33.33333333%;
+	left: 33.33333333%;
 }
+
 .col-xs-push-3 {
-  left: 25%;
+	left: 25%;
 }
+
 .col-xs-push-2 {
-  left: 16.66666667%;
+	left: 16.66666667%;
 }
+
 .col-xs-push-1 {
-  left: 8.33333333%;
+	left: 8.33333333%;
 }
+
 .col-xs-push-0 {
-  left: 0;
+	left: 0;
 }
+
 .col-xs-offset-12 {
-  margin-left: 100%;
+	margin-left: 100%;
 }
+
 .col-xs-offset-11 {
-  margin-left: 91.66666667%;
+	margin-left: 91.66666667%;
 }
+
 .col-xs-offset-10 {
-  margin-left: 83.33333333%;
+	margin-left: 83.33333333%;
 }
+
 .col-xs-offset-9 {
-  margin-left: 75%;
+	margin-left: 75%;
 }
+
 .col-xs-offset-8 {
-  margin-left: 66.66666667%;
+	margin-left: 66.66666667%;
 }
+
 .col-xs-offset-7 {
-  margin-left: 58.33333333%;
+	margin-left: 58.33333333%;
 }
+
 .col-xs-offset-6 {
-  margin-left: 50%;
+	margin-left: 50%;
 }
+
 .col-xs-offset-5 {
-  margin-left: 41.66666667%;
+	margin-left: 41.66666667%;
 }
+
 .col-xs-offset-4 {
-  margin-left: 33.33333333%;
+	margin-left: 33.33333333%;
 }
+
 .col-xs-offset-3 {
-  margin-left: 25%;
+	margin-left: 25%;
 }
+
 .col-xs-offset-2 {
-  margin-left: 16.66666667%;
+	margin-left: 16.66666667%;
 }
+
 .col-xs-offset-1 {
-  margin-left: 8.33333333%;
+	margin-left: 8.33333333%;
 }
+
 .col-xs-offset-0 {
-  margin-left: 0;
+	margin-left: 0;
 }
+
 @media (min-width: 768px) {
-  .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
-    float: left;
-  }
-  .col-sm-12 {
-    width: 100%;
-  }
-  .col-sm-11 {
-    width: 91.66666667%;
-  }
-  .col-sm-10 {
-    width: 83.33333333%;
-  }
-  .col-sm-9 {
-    width: 75%;
-  }
-  .col-sm-8 {
-    width: 66.66666667%;
-  }
-  .col-sm-7 {
-    width: 58.33333333%;
-  }
-  .col-sm-6 {
-    width: 50%;
-  }
-  .col-sm-5 {
-    width: 41.66666667%;
-  }
-  .col-sm-4 {
-    width: 33.33333333%;
-  }
-  .col-sm-3 {
-    width: 25%;
-  }
-  .col-sm-2 {
-    width: 16.66666667%;
-  }
-  .col-sm-1 {
-    width: 8.33333333%;
-  }
-  .col-sm-pull-12 {
-    right: 100%;
-  }
-  .col-sm-pull-11 {
-    right: 91.66666667%;
-  }
-  .col-sm-pull-10 {
-    right: 83.33333333%;
-  }
-  .col-sm-pull-9 {
-    right: 75%;
-  }
-  .col-sm-pull-8 {
-    right: 66.66666667%;
-  }
-  .col-sm-pull-7 {
-    right: 58.33333333%;
-  }
-  .col-sm-pull-6 {
-    right: 50%;
-  }
-  .col-sm-pull-5 {
-    right: 41.66666667%;
-  }
-  .col-sm-pull-4 {
-    right: 33.33333333%;
-  }
-  .col-sm-pull-3 {
-    right: 25%;
-  }
-  .col-sm-pull-2 {
-    right: 16.66666667%;
-  }
-  .col-sm-pull-1 {
-    right: 8.33333333%;
-  }
-  .col-sm-pull-0 {
-    right: 0;
-  }
-  .col-sm-push-12 {
-    left: 100%;
-  }
-  .col-sm-push-11 {
-    left: 91.66666667%;
-  }
-  .col-sm-push-10 {
-    left: 83.33333333%;
-  }
-  .col-sm-push-9 {
-    left: 75%;
-  }
-  .col-sm-push-8 {
-    left: 66.66666667%;
-  }
-  .col-sm-push-7 {
-    left: 58.33333333%;
-  }
-  .col-sm-push-6 {
-    left: 50%;
-  }
-  .col-sm-push-5 {
-    left: 41.66666667%;
-  }
-  .col-sm-push-4 {
-    left: 33.33333333%;
-  }
-  .col-sm-push-3 {
-    left: 25%;
-  }
-  .col-sm-push-2 {
-    left: 16.66666667%;
-  }
-  .col-sm-push-1 {
-    left: 8.33333333%;
-  }
-  .col-sm-push-0 {
-    left: 0;
-  }
-  .col-sm-offset-12 {
-    margin-left: 100%;
-  }
-  .col-sm-offset-11 {
-    margin-left: 91.66666667%;
-  }
-  .col-sm-offset-10 {
-    margin-left: 83.33333333%;
-  }
-  .col-sm-offset-9 {
-    margin-left: 75%;
-  }
-  .col-sm-offset-8 {
-    margin-left: 66.66666667%;
-  }
-  .col-sm-offset-7 {
-    margin-left: 58.33333333%;
-  }
-  .col-sm-offset-6 {
-    margin-left: 50%;
-  }
-  .col-sm-offset-5 {
-    margin-left: 41.66666667%;
-  }
-  .col-sm-offset-4 {
-    margin-left: 33.33333333%;
-  }
-  .col-sm-offset-3 {
-    margin-left: 25%;
-  }
-  .col-sm-offset-2 {
-    margin-left: 16.66666667%;
-  }
-  .col-sm-offset-1 {
-    margin-left: 8.33333333%;
-  }
-  .col-sm-offset-0 {
-    margin-left: 0;
-  }
+	.col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
+		float: left;
+	}
+
+	.col-sm-12 {
+		width: 100%;
+	}
+
+	.col-sm-11 {
+		width: 91.66666667%;
+	}
+
+	.col-sm-10 {
+		width: 83.33333333%;
+	}
+
+	.col-sm-9 {
+		width: 75%;
+	}
+
+	.col-sm-8 {
+		width: 66.66666667%;
+	}
+
+	.col-sm-7 {
+		width: 58.33333333%;
+	}
+
+	.col-sm-6 {
+		width: 50%;
+	}
+
+	.col-sm-5 {
+		width: 41.66666667%;
+	}
+
+	.col-sm-4 {
+		width: 33.33333333%;
+	}
+
+	.col-sm-3 {
+		width: 25%;
+	}
+
+	.col-sm-2 {
+		width: 16.66666667%;
+	}
+
+	.col-sm-1 {
+		width: 8.33333333%;
+	}
+
+	.col-sm-pull-12 {
+		right: 100%;
+	}
+
+	.col-sm-pull-11 {
+		right: 91.66666667%;
+	}
+
+	.col-sm-pull-10 {
+		right: 83.33333333%;
+	}
+
+	.col-sm-pull-9 {
+		right: 75%;
+	}
+
+	.col-sm-pull-8 {
+		right: 66.66666667%;
+	}
+
+	.col-sm-pull-7 {
+		right: 58.33333333%;
+	}
+
+	.col-sm-pull-6 {
+		right: 50%;
+	}
+
+	.col-sm-pull-5 {
+		right: 41.66666667%;
+	}
+
+	.col-sm-pull-4 {
+		right: 33.33333333%;
+	}
+
+	.col-sm-pull-3 {
+		right: 25%;
+	}
+
+	.col-sm-pull-2 {
+		right: 16.66666667%;
+	}
+
+	.col-sm-pull-1 {
+		right: 8.33333333%;
+	}
+
+	.col-sm-pull-0 {
+		right: 0;
+	}
+
+	.col-sm-push-12 {
+		left: 100%;
+	}
+
+	.col-sm-push-11 {
+		left: 91.66666667%;
+	}
+
+	.col-sm-push-10 {
+		left: 83.33333333%;
+	}
+
+	.col-sm-push-9 {
+		left: 75%;
+	}
+
+	.col-sm-push-8 {
+		left: 66.66666667%;
+	}
+
+	.col-sm-push-7 {
+		left: 58.33333333%;
+	}
+
+	.col-sm-push-6 {
+		left: 50%;
+	}
+
+	.col-sm-push-5 {
+		left: 41.66666667%;
+	}
+
+	.col-sm-push-4 {
+		left: 33.33333333%;
+	}
+
+	.col-sm-push-3 {
+		left: 25%;
+	}
+
+	.col-sm-push-2 {
+		left: 16.66666667%;
+	}
+
+	.col-sm-push-1 {
+		left: 8.33333333%;
+	}
+
+	.col-sm-push-0 {
+		left: 0;
+	}
+
+	.col-sm-offset-12 {
+		margin-left: 100%;
+	}
+
+	.col-sm-offset-11 {
+		margin-left: 91.66666667%;
+	}
+
+	.col-sm-offset-10 {
+		margin-left: 83.33333333%;
+	}
+
+	.col-sm-offset-9 {
+		margin-left: 75%;
+	}
+
+	.col-sm-offset-8 {
+		margin-left: 66.66666667%;
+	}
+
+	.col-sm-offset-7 {
+		margin-left: 58.33333333%;
+	}
+
+	.col-sm-offset-6 {
+		margin-left: 50%;
+	}
+
+	.col-sm-offset-5 {
+		margin-left: 41.66666667%;
+	}
+
+	.col-sm-offset-4 {
+		margin-left: 33.33333333%;
+	}
+
+	.col-sm-offset-3 {
+		margin-left: 25%;
+	}
+
+	.col-sm-offset-2 {
+		margin-left: 16.66666667%;
+	}
+
+	.col-sm-offset-1 {
+		margin-left: 8.33333333%;
+	}
+
+	.col-sm-offset-0 {
+		margin-left: 0;
+	}
 }
+
 @media (min-width: 992px) {
-  .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
-    float: left;
-  }
-  .col-md-12 {
-    width: 100%;
-  }
-  .col-md-11 {
-    width: 91.66666667%;
-  }
-  .col-md-10 {
-    width: 83.33333333%;
-  }
-  .col-md-9 {
-    width: 75%;
-  }
-  .col-md-8 {
-    width: 66.66666667%;
-  }
-  .col-md-7 {
-    width: 58.33333333%;
-  }
-  .col-md-6 {
-    width: 50%;
-  }
-  .col-md-5 {
-    width: 41.66666667%;
-  }
-  .col-md-4 {
-    width: 33.33333333%;
-  }
-  .col-md-3 {
-    width: 25%;
-  }
-  .col-md-2 {
-    width: 16.66666667%;
-  }
-  .col-md-1 {
-    width: 8.33333333%;
-  }
-  .col-md-pull-12 {
-    right: 100%;
-  }
-  .col-md-pull-11 {
-    right: 91.66666667%;
-  }
-  .col-md-pull-10 {
-    right: 83.33333333%;
-  }
-  .col-md-pull-9 {
-    right: 75%;
-  }
-  .col-md-pull-8 {
-    right: 66.66666667%;
-  }
-  .col-md-pull-7 {
-    right: 58.33333333%;
-  }
-  .col-md-pull-6 {
-    right: 50%;
-  }
-  .col-md-pull-5 {
-    right: 41.66666667%;
-  }
-  .col-md-pull-4 {
-    right: 33.33333333%;
-  }
-  .col-md-pull-3 {
-    right: 25%;
-  }
-  .col-md-pull-2 {
-    right: 16.66666667%;
-  }
-  .col-md-pull-1 {
-    right: 8.33333333%;
-  }
-  .col-md-pull-0 {
-    right: 0;
-  }
-  .col-md-push-12 {
-    left: 100%;
-  }
-  .col-md-push-11 {
-    left: 91.66666667%;
-  }
-  .col-md-push-10 {
-    left: 83.33333333%;
-  }
-  .col-md-push-9 {
-    left: 75%;
-  }
-  .col-md-push-8 {
-    left: 66.66666667%;
-  }
-  .col-md-push-7 {
-    left: 58.33333333%;
-  }
-  .col-md-push-6 {
-    left: 50%;
-  }
-  .col-md-push-5 {
-    left: 41.66666667%;
-  }
-  .col-md-push-4 {
-    left: 33.33333333%;
-  }
-  .col-md-push-3 {
-    left: 25%;
-  }
-  .col-md-push-2 {
-    left: 16.66666667%;
-  }
-  .col-md-push-1 {
-    left: 8.33333333%;
-  }
-  .col-md-push-0 {
-    left: 0;
-  }
-  .col-md-offset-12 {
-    margin-left: 100%;
-  }
-  .col-md-offset-11 {
-    margin-left: 91.66666667%;
-  }
-  .col-md-offset-10 {
-    margin-left: 83.33333333%;
-  }
-  .col-md-offset-9 {
-    margin-left: 75%;
-  }
-  .col-md-offset-8 {
-    margin-left: 66.66666667%;
-  }
-  .col-md-offset-7 {
-    margin-left: 58.33333333%;
-  }
-  .col-md-offset-6 {
-    margin-left: 50%;
-  }
-  .col-md-offset-5 {
-    margin-left: 41.66666667%;
-  }
-  .col-md-offset-4 {
-    margin-left: 33.33333333%;
-  }
-  .col-md-offset-3 {
-    margin-left: 25%;
-  }
-  .col-md-offset-2 {
-    margin-left: 16.66666667%;
-  }
-  .col-md-offset-1 {
-    margin-left: 8.33333333%;
-  }
-  .col-md-offset-0 {
-    margin-left: 0;
-  }
+	.col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
+		float: left;
+	}
+
+	.col-md-12 {
+		width: 100%;
+	}
+
+	.col-md-11 {
+		width: 91.66666667%;
+	}
+
+	.col-md-10 {
+		width: 83.33333333%;
+	}
+
+	.col-md-9 {
+		width: 75%;
+	}
+
+	.col-md-8 {
+		width: 66.66666667%;
+	}
+
+	.col-md-7 {
+		width: 58.33333333%;
+	}
+
+	.col-md-6 {
+		width: 50%;
+	}
+
+	.col-md-5 {
+		width: 41.66666667%;
+	}
+
+	.col-md-4 {
+		width: 33.33333333%;
+	}
+
+	.col-md-3 {
+		width: 25%;
+	}
+
+	.col-md-2 {
+		width: 16.66666667%;
+	}
+
+	.col-md-1 {
+		width: 8.33333333%;
+	}
+
+	.col-md-pull-12 {
+		right: 100%;
+	}
+
+	.col-md-pull-11 {
+		right: 91.66666667%;
+	}
+
+	.col-md-pull-10 {
+		right: 83.33333333%;
+	}
+
+	.col-md-pull-9 {
+		right: 75%;
+	}
+
+	.col-md-pull-8 {
+		right: 66.66666667%;
+	}
+
+	.col-md-pull-7 {
+		right: 58.33333333%;
+	}
+
+	.col-md-pull-6 {
+		right: 50%;
+	}
+
+	.col-md-pull-5 {
+		right: 41.66666667%;
+	}
+
+	.col-md-pull-4 {
+		right: 33.33333333%;
+	}
+
+	.col-md-pull-3 {
+		right: 25%;
+	}
+
+	.col-md-pull-2 {
+		right: 16.66666667%;
+	}
+
+	.col-md-pull-1 {
+		right: 8.33333333%;
+	}
+
+	.col-md-pull-0 {
+		right: 0;
+	}
+
+	.col-md-push-12 {
+		left: 100%;
+	}
+
+	.col-md-push-11 {
+		left: 91.66666667%;
+	}
+
+	.col-md-push-10 {
+		left: 83.33333333%;
+	}
+
+	.col-md-push-9 {
+		left: 75%;
+	}
+
+	.col-md-push-8 {
+		left: 66.66666667%;
+	}
+
+	.col-md-push-7 {
+		left: 58.33333333%;
+	}
+
+	.col-md-push-6 {
+		left: 50%;
+	}
+
+	.col-md-push-5 {
+		left: 41.66666667%;
+	}
+
+	.col-md-push-4 {
+		left: 33.33333333%;
+	}
+
+	.col-md-push-3 {
+		left: 25%;
+	}
+
+	.col-md-push-2 {
+		left: 16.66666667%;
+	}
+
+	.col-md-push-1 {
+		left: 8.33333333%;
+	}
+
+	.col-md-push-0 {
+		left: 0;
+	}
+
+	.col-md-offset-12 {
+		margin-left: 100%;
+	}
+
+	.col-md-offset-11 {
+		margin-left: 91.66666667%;
+	}
+
+	.col-md-offset-10 {
+		margin-left: 83.33333333%;
+	}
+
+	.col-md-offset-9 {
+		margin-left: 75%;
+	}
+
+	.col-md-offset-8 {
+		margin-left: 66.66666667%;
+	}
+
+	.col-md-offset-7 {
+		margin-left: 58.33333333%;
+	}
+
+	.col-md-offset-6 {
+		margin-left: 50%;
+	}
+
+	.col-md-offset-5 {
+		margin-left: 41.66666667%;
+	}
+
+	.col-md-offset-4 {
+		margin-left: 33.33333333%;
+	}
+
+	.col-md-offset-3 {
+		margin-left: 25%;
+	}
+
+	.col-md-offset-2 {
+		margin-left: 16.66666667%;
+	}
+
+	.col-md-offset-1 {
+		margin-left: 8.33333333%;
+	}
+
+	.col-md-offset-0 {
+		margin-left: 0;
+	}
 }
+
 @media (min-width: 1200px) {
-  .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {
-    float: left;
-  }
-  .col-lg-12 {
-    width: 100%;
-  }
-  .col-lg-11 {
-    width: 91.66666667%;
-  }
-  .col-lg-10 {
-    width: 83.33333333%;
-  }
-  .col-lg-9 {
-    width: 75%;
-  }
-  .col-lg-8 {
-    width: 66.66666667%;
-  }
-  .col-lg-7 {
-    width: 58.33333333%;
-  }
-  .col-lg-6 {
-    width: 50%;
-  }
-  .col-lg-5 {
-    width: 41.66666667%;
-  }
-  .col-lg-4 {
-    width: 33.33333333%;
-  }
-  .col-lg-3 {
-    width: 25%;
-  }
-  .col-lg-2 {
-    width: 16.66666667%;
-  }
-  .col-lg-1 {
-    width: 8.33333333%;
-  }
-  .col-lg-pull-12 {
-    right: 100%;
-  }
-  .col-lg-pull-11 {
-    right: 91.66666667%;
-  }
-  .col-lg-pull-10 {
-    right: 83.33333333%;
-  }
-  .col-lg-pull-9 {
-    right: 75%;
-  }
-  .col-lg-pull-8 {
-    right: 66.66666667%;
-  }
-  .col-lg-pull-7 {
-    right: 58.33333333%;
-  }
-  .col-lg-pull-6 {
-    right: 50%;
-  }
-  .col-lg-pull-5 {
-    right: 41.66666667%;
-  }
-  .col-lg-pull-4 {
-    right: 33.33333333%;
-  }
-  .col-lg-pull-3 {
-    right: 25%;
-  }
-  .col-lg-pull-2 {
-    right: 16.66666667%;
-  }
-  .col-lg-pull-1 {
-    right: 8.33333333%;
-  }
-  .col-lg-pull-0 {
-    right: 0;
-  }
-  .col-lg-push-12 {
-    left: 100%;
-  }
-  .col-lg-push-11 {
-    left: 91.66666667%;
-  }
-  .col-lg-push-10 {
-    left: 83.33333333%;
-  }
-  .col-lg-push-9 {
-    left: 75%;
-  }
-  .col-lg-push-8 {
-    left: 66.66666667%;
-  }
-  .col-lg-push-7 {
-    left: 58.33333333%;
-  }
-  .col-lg-push-6 {
-    left: 50%;
-  }
-  .col-lg-push-5 {
-    left: 41.66666667%;
-  }
-  .col-lg-push-4 {
-    left: 33.33333333%;
-  }
-  .col-lg-push-3 {
-    left: 25%;
-  }
-  .col-lg-push-2 {
-    left: 16.66666667%;
-  }
-  .col-lg-push-1 {
-    left: 8.33333333%;
-  }
-  .col-lg-push-0 {
-    left: 0;
-  }
-  .col-lg-offset-12 {
-    margin-left: 100%;
-  }
-  .col-lg-offset-11 {
-    margin-left: 91.66666667%;
-  }
-  .col-lg-offset-10 {
-    margin-left: 83.33333333%;
-  }
-  .col-lg-offset-9 {
-    margin-left: 75%;
-  }
-  .col-lg-offset-8 {
-    margin-left: 66.66666667%;
-  }
-  .col-lg-offset-7 {
-    margin-left: 58.33333333%;
-  }
-  .col-lg-offset-6 {
-    margin-left: 50%;
-  }
-  .col-lg-offset-5 {
-    margin-left: 41.66666667%;
-  }
-  .col-lg-offset-4 {
-    margin-left: 33.33333333%;
-  }
-  .col-lg-offset-3 {
-    margin-left: 25%;
-  }
-  .col-lg-offset-2 {
-    margin-left: 16.66666667%;
-  }
-  .col-lg-offset-1 {
-    margin-left: 8.33333333%;
-  }
-  .col-lg-offset-0 {
-    margin-left: 0;
-  }
+	.col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {
+		float: left;
+	}
+
+	.col-lg-12 {
+		width: 100%;
+	}
+
+	.col-lg-11 {
+		width: 91.66666667%;
+	}
+
+	.col-lg-10 {
+		width: 83.33333333%;
+	}
+
+	.col-lg-9 {
+		width: 75%;
+	}
+
+	.col-lg-8 {
+		width: 66.66666667%;
+	}
+
+	.col-lg-7 {
+		width: 58.33333333%;
+	}
+
+	.col-lg-6 {
+		width: 50%;
+	}
+
+	.col-lg-5 {
+		width: 41.66666667%;
+	}
+
+	.col-lg-4 {
+		width: 33.33333333%;
+	}
+
+	.col-lg-3 {
+		width: 25%;
+	}
+
+	.col-lg-2 {
+		width: 16.66666667%;
+	}
+
+	.col-lg-1 {
+		width: 8.33333333%;
+	}
+
+	.col-lg-pull-12 {
+		right: 100%;
+	}
+
+	.col-lg-pull-11 {
+		right: 91.66666667%;
+	}
+
+	.col-lg-pull-10 {
+		right: 83.33333333%;
+	}
+
+	.col-lg-pull-9 {
+		right: 75%;
+	}
+
+	.col-lg-pull-8 {
+		right: 66.66666667%;
+	}
+
+	.col-lg-pull-7 {
+		right: 58.33333333%;
+	}
+
+	.col-lg-pull-6 {
+		right: 50%;
+	}
+
+	.col-lg-pull-5 {
+		right: 41.66666667%;
+	}
+
+	.col-lg-pull-4 {
+		right: 33.33333333%;
+	}
+
+	.col-lg-pull-3 {
+		right: 25%;
+	}
+
+	.col-lg-pull-2 {
+		right: 16.66666667%;
+	}
+
+	.col-lg-pull-1 {
+		right: 8.33333333%;
+	}
+
+	.col-lg-pull-0 {
+		right: 0;
+	}
+
+	.col-lg-push-12 {
+		left: 100%;
+	}
+
+	.col-lg-push-11 {
+		left: 91.66666667%;
+	}
+
+	.col-lg-push-10 {
+		left: 83.33333333%;
+	}
+
+	.col-lg-push-9 {
+		left: 75%;
+	}
+
+	.col-lg-push-8 {
+		left: 66.66666667%;
+	}
+
+	.col-lg-push-7 {
+		left: 58.33333333%;
+	}
+
+	.col-lg-push-6 {
+		left: 50%;
+	}
+
+	.col-lg-push-5 {
+		left: 41.66666667%;
+	}
+
+	.col-lg-push-4 {
+		left: 33.33333333%;
+	}
+
+	.col-lg-push-3 {
+		left: 25%;
+	}
+
+	.col-lg-push-2 {
+		left: 16.66666667%;
+	}
+
+	.col-lg-push-1 {
+		left: 8.33333333%;
+	}
+
+	.col-lg-push-0 {
+		left: 0;
+	}
+
+	.col-lg-offset-12 {
+		margin-left: 100%;
+	}
+
+	.col-lg-offset-11 {
+		margin-left: 91.66666667%;
+	}
+
+	.col-lg-offset-10 {
+		margin-left: 83.33333333%;
+	}
+
+	.col-lg-offset-9 {
+		margin-left: 75%;
+	}
+
+	.col-lg-offset-8 {
+		margin-left: 66.66666667%;
+	}
+
+	.col-lg-offset-7 {
+		margin-left: 58.33333333%;
+	}
+
+	.col-lg-offset-6 {
+		margin-left: 50%;
+	}
+
+	.col-lg-offset-5 {
+		margin-left: 41.66666667%;
+	}
+
+	.col-lg-offset-4 {
+		margin-left: 33.33333333%;
+	}
+
+	.col-lg-offset-3 {
+		margin-left: 25%;
+	}
+
+	.col-lg-offset-2 {
+		margin-left: 16.66666667%;
+	}
+
+	.col-lg-offset-1 {
+		margin-left: 8.33333333%;
+	}
+
+	.col-lg-offset-0 {
+		margin-left: 0;
+	}
 }
+
 table {
-  max-width: 100%;
-  background-color: transparent;
+	max-width: 100%;
+	background-color: transparent;
 }
+
 th {
-  text-align: left;
+	text-align: left;
 }
+
 .table {
-  width: 100%;
-  margin-bottom: 20px;
+	width: 100%;
+	margin-bottom: 20px;
 }
+
 .table > thead > tr > th,
 .table > tbody > tr > th,
 .table > tfoot > tr > th,
 .table > thead > tr > td,
 .table > tbody > tr > td,
 .table > tfoot > tr > td {
-  padding: 8px;
-  line-height: 1.42857143;
-  vertical-align: top;
-  border-top: 1px solid #ddd;
+	padding: 8px;
+	line-height: 1.42857143;
+	vertical-align: top;
+	border-top: 1px solid #ddd;
 }
+
 .table > thead > tr > th {
-  vertical-align: bottom;
-  border-bottom: 2px solid #ddd;
+	vertical-align: bottom;
+	border-bottom: 2px solid #ddd;
 }
+
 .table > caption + thead > tr:first-child > th,
 .table > colgroup + thead > tr:first-child > th,
 .table > thead:first-child > tr:first-child > th,
 .table > caption + thead > tr:first-child > td,
 .table > colgroup + thead > tr:first-child > td,
 .table > thead:first-child > tr:first-child > td {
-  border-top: 0;
+	border-top: 0;
 }
+
 .table > tbody + tbody {
-  border-top: 2px solid #ddd;
+	border-top: 2px solid #ddd;
 }
+
 .table .table {
-  background-color: #fff;
+	background-color: #fff;
 }
+
 .table-condensed > thead > tr > th,
 .table-condensed > tbody > tr > th,
 .table-condensed > tfoot > tr > th,
 .table-condensed > thead > tr > td,
 .table-condensed > tbody > tr > td,
 .table-condensed > tfoot > tr > td {
-  padding: 5px;
+	padding: 5px;
 }
+
 .table-bordered {
-  border: 1px solid #ddd;
+	border: 1px solid #ddd;
 }
+
 .table-bordered > thead > tr > th,
 .table-bordered > tbody > tr > th,
 .table-bordered > tfoot > tr > th,
 .table-bordered > thead > tr > td,
 .table-bordered > tbody > tr > td,
 .table-bordered > tfoot > tr > td {
-  border: 1px solid #ddd;
+	border: 1px solid #ddd;
 }
+
 .table-bordered > thead > tr > th,
 .table-bordered > thead > tr > td {
-  border-bottom-width: 2px;
+	border-bottom-width: 2px;
 }
+
 .table-striped > tbody > tr:nth-child(odd) > td,
 .table-striped > tbody > tr:nth-child(odd) > th {
-  background-color: #f9f9f9;
+	background-color: #f9f9f9;
 }
+
 .table-hover > tbody > tr:hover > td,
 .table-hover > tbody > tr:hover > th {
-  background-color: #f5f5f5;
+	background-color: #f5f5f5;
 }
+
 table col[class*="col-"] {
-  position: static;
-  display: table-column;
-  float: none;
+	position: static;
+	display: table-column;
+	float: none;
 }
+
 table td[class*="col-"],
 table th[class*="col-"] {
-  position: static;
-  display: table-cell;
-  float: none;
+	position: static;
+	display: table-cell;
+	float: none;
 }
+
 .table > thead > tr > td.active,
 .table > tbody > tr > td.active,
 .table > tfoot > tr > td.active,
@@ -1494,14 +1870,16 @@ table th[class*="col-"] {
 .table > thead > tr.active > th,
 .table > tbody > tr.active > th,
 .table > tfoot > tr.active > th {
-  background-color: #f5f5f5;
+	background-color: #f5f5f5;
 }
+
 .table-hover > tbody > tr > td.active:hover,
 .table-hover > tbody > tr > th.active:hover,
 .table-hover > tbody > tr.active:hover > td,
 .table-hover > tbody > tr.active:hover > th {
-  background-color: #e8e8e8;
+	background-color: #e8e8e8;
 }
+
 .table > thead > tr > td.success,
 .table > tbody > tr > td.success,
 .table > tfoot > tr > td.success,
@@ -1514,14 +1892,16 @@ table th[class*="col-"] {
 .table > thead > tr.success > th,
 .table > tbody > tr.success > th,
 .table > tfoot > tr.success > th {
-  background-color: #dff0d8;
+	background-color: #dff0d8;
 }
+
 .table-hover > tbody > tr > td.success:hover,
 .table-hover > tbody > tr > th.success:hover,
 .table-hover > tbody > tr.success:hover > td,
 .table-hover > tbody > tr.success:hover > th {
-  background-color: #d0e9c6;
+	background-color: #d0e9c6;
 }
+
 .table > thead > tr > td.info,
 .table > tbody > tr > td.info,
 .table > tfoot > tr > td.info,
@@ -1534,14 +1914,16 @@ table th[class*="col-"] {
 .table > thead > tr.info > th,
 .table > tbody > tr.info > th,
 .table > tfoot > tr.info > th {
-  background-color: #d9edf7;
+	background-color: #d9edf7;
 }
+
 .table-hover > tbody > tr > td.info:hover,
 .table-hover > tbody > tr > th.info:hover,
 .table-hover > tbody > tr.info:hover > td,
 .table-hover > tbody > tr.info:hover > th {
-  background-color: #c4e3f3;
+	background-color: #c4e3f3;
 }
+
 .table > thead > tr > td.warning,
 .table > tbody > tr > td.warning,
 .table > tfoot > tr > td.warning,
@@ -1554,14 +1936,16 @@ table th[class*="col-"] {
 .table > thead > tr.warning > th,
 .table > tbody > tr.warning > th,
 .table > tfoot > tr.warning > th {
-  background-color: #fcf8e3;
+	background-color: #fcf8e3;
 }
+
 .table-hover > tbody > tr > td.warning:hover,
 .table-hover > tbody > tr > th.warning:hover,
 .table-hover > tbody > tr.warning:hover > td,
 .table-hover > tbody > tr.warning:hover > th {
-  background-color: #faf2cc;
+	background-color: #faf2cc;
 }
+
 .table > thead > tr > td.danger,
 .table > tbody > tr > td.danger,
 .table > tfoot > tr > td.danger,
@@ -1574,211 +1958,246 @@ table th[class*="col-"] {
 .table > thead > tr.danger > th,
 .table > tbody > tr.danger > th,
 .table > tfoot > tr.danger > th {
-  background-color: #f2dede;
+	background-color: #f2dede;
 }
+
 .table-hover > tbody > tr > td.danger:hover,
 .table-hover > tbody > tr > th.danger:hover,
 .table-hover > tbody > tr.danger:hover > td,
 .table-hover > tbody > tr.danger:hover > th {
-  background-color: #ebcccc;
+	background-color: #ebcccc;
 }
+
 @media (max-width: 767px) {
-  .table-responsive {
-    width: 100%;
-    margin-bottom: 15px;
-    overflow-x: scroll;
-    overflow-y: hidden;
-    -webkit-overflow-scrolling: touch;
-    -ms-overflow-style: -ms-autohiding-scrollbar;
-    border: 1px solid #ddd;
-  }
-  .table-responsive > .table {
-    margin-bottom: 0;
-  }
-  .table-responsive > .table > thead > tr > th,
-  .table-responsive > .table > tbody > tr > th,
-  .table-responsive > .table > tfoot > tr > th,
-  .table-responsive > .table > thead > tr > td,
-  .table-responsive > .table > tbody > tr > td,
-  .table-responsive > .table > tfoot > tr > td {
-    white-space: nowrap;
-  }
-  .table-responsive > .table-bordered {
-    border: 0;
-  }
-  .table-responsive > .table-bordered > thead > tr > th:first-child,
-  .table-responsive > .table-bordered > tbody > tr > th:first-child,
-  .table-responsive > .table-bordered > tfoot > tr > th:first-child,
-  .table-responsive > .table-bordered > thead > tr > td:first-child,
-  .table-responsive > .table-bordered > tbody > tr > td:first-child,
-  .table-responsive > .table-bordered > tfoot > tr > td:first-child {
-    border-left: 0;
-  }
-  .table-responsive > .table-bordered > thead > tr > th:last-child,
-  .table-responsive > .table-bordered > tbody > tr > th:last-child,
-  .table-responsive > .table-bordered > tfoot > tr > th:last-child,
-  .table-responsive > .table-bordered > thead > tr > td:last-child,
-  .table-responsive > .table-bordered > tbody > tr > td:last-child,
-  .table-responsive > .table-bordered > tfoot > tr > td:last-child {
-    border-right: 0;
-  }
-  .table-responsive > .table-bordered > tbody > tr:last-child > th,
-  .table-responsive > .table-bordered > tfoot > tr:last-child > th,
-  .table-responsive > .table-bordered > tbody > tr:last-child > td,
-  .table-responsive > .table-bordered > tfoot > tr:last-child > td {
-    border-bottom: 0;
-  }
+	.table-responsive {
+		width: 100%;
+		margin-bottom: 15px;
+		overflow-x: scroll;
+		overflow-y: hidden;
+		-webkit-overflow-scrolling: touch;
+		-ms-overflow-style: -ms-autohiding-scrollbar;
+		border: 1px solid #ddd;
+	}
+
+	.table-responsive > .table {
+		margin-bottom: 0;
+	}
+
+	.table-responsive > .table > thead > tr > th,
+	.table-responsive > .table > tbody > tr > th,
+	.table-responsive > .table > tfoot > tr > th,
+	.table-responsive > .table > thead > tr > td,
+	.table-responsive > .table > tbody > tr > td,
+	.table-responsive > .table > tfoot > tr > td {
+		white-space: nowrap;
+	}
+
+	.table-responsive > .table-bordered {
+		border: 0;
+	}
+
+	.table-responsive > .table-bordered > thead > tr > th:first-child,
+	.table-responsive > .table-bordered > tbody > tr > th:first-child,
+	.table-responsive > .table-bordered > tfoot > tr > th:first-child,
+	.table-responsive > .table-bordered > thead > tr > td:first-child,
+	.table-responsive > .table-bordered > tbody > tr > td:first-child,
+	.table-responsive > .table-bordered > tfoot > tr > td:first-child {
+		border-left: 0;
+	}
+
+	.table-responsive > .table-bordered > thead > tr > th:last-child,
+	.table-responsive > .table-bordered > tbody > tr > th:last-child,
+	.table-responsive > .table-bordered > tfoot > tr > th:last-child,
+	.table-responsive > .table-bordered > thead > tr > td:last-child,
+	.table-responsive > .table-bordered > tbody > tr > td:last-child,
+	.table-responsive > .table-bordered > tfoot > tr > td:last-child {
+		border-right: 0;
+	}
+
+	.table-responsive > .table-bordered > tbody > tr:last-child > th,
+	.table-responsive > .table-bordered > tfoot > tr:last-child > th,
+	.table-responsive > .table-bordered > tbody > tr:last-child > td,
+	.table-responsive > .table-bordered > tfoot > tr:last-child > td {
+		border-bottom: 0;
+	}
 }
+
 fieldset {
-  min-width: 0;
-  padding: 0;
-  margin: 0;
-  border: 0;
+	min-width: 0;
+	padding: 0;
+	margin: 0;
+	border: 0;
 }
+
 legend {
-  display: block;
-  width: 100%;
-  padding: 0;
-  margin-bottom: 20px;
-  font-size: 21px;
-  line-height: inherit;
-  color: #333;
-  border: 0;
-  border-bottom: 1px solid #e5e5e5;
+	display: block;
+	width: 100%;
+	padding: 0;
+	margin-bottom: 20px;
+	font-size: 21px;
+	line-height: inherit;
+	color: #333;
+	border: 0;
+	border-bottom: 1px solid #e5e5e5;
 }
+
 label {
-  display: inline-block;
-  margin-bottom: 5px;
-  font-weight: bold;
+	display: inline-block;
+	margin-bottom: 5px;
+	font-weight: bold;
 }
+
 input[type="search"] {
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
 }
+
 input[type="radio"],
 input[type="checkbox"] {
-  margin: 4px 0 0;
-  margin-top: 1px \9;
-  /* IE8-9 */
-  line-height: normal;
+	margin: 4px 0 0;
+	margin-top: 1px \9;
+	/* IE8-9 */
+	line-height: normal;
 }
+
 input[type="file"] {
-  display: block;
+	display: block;
 }
+
 input[type="range"] {
-  display: block;
-  width: 100%;
+	display: block;
+	width: 100%;
 }
+
 select[multiple],
 select[size] {
-  height: auto;
+	height: auto;
 }
+
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus {
-  outline: thin dotted;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
+	outline: thin dotted;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
 }
+
 output {
-  display: block;
-  padding-top: 7px;
-  font-size: 14px;
-  line-height: 1.42857143;
-  color: #555;
+	display: block;
+	padding-top: 7px;
+	font-size: 14px;
+	line-height: 1.42857143;
+	color: #555;
 }
+
 .form-control {
-  display: block;
-  width: 100%;
-  height: 34px;
-  padding: 6px 12px;
-  font-size: 14px;
-  line-height: 1.42857143;
-  color: #555;
-  background-color: #fff;
-  background-image: none;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-  -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-          transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+	display: block;
+	width: 100%;
+	height: 34px;
+	padding: 6px 12px;
+	font-size: 14px;
+	line-height: 1.42857143;
+	color: #555;
+	background-color: #fff;
+	background-image: none;
+	border: 1px solid #ccc;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	-webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+	transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
 }
+
 .form-control:focus {
-  border-color: #66afe9;
-  outline: 0;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
-          box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
+	border-color: #66afe9;
+	outline: 0;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6);
 }
+
 .form-control::-moz-placeholder {
-  color: #999;
-  opacity: 1;
+	color: #999;
+	opacity: 1;
 }
+
 .form-control:-ms-input-placeholder {
-  color: #999;
+	color: #999;
 }
+
 .form-control::-webkit-input-placeholder {
-  color: #999;
+	color: #999;
 }
+
 .form-control[disabled],
 .form-control[readonly],
 fieldset[disabled] .form-control {
-  cursor: not-allowed;
-  background-color: #eee;
-  opacity: 1;
+	cursor: not-allowed;
+	background-color: #eee;
+	opacity: 1;
 }
+
 textarea.form-control {
-  height: auto;
+	height: auto;
 }
+
 input[type="search"] {
-  -webkit-appearance: none;
+	-webkit-appearance: none;
 }
+
 input[type="date"] {
-  line-height: 34px;
+	line-height: 34px;
 }
+
 .form-group {
-  margin-bottom: 15px;
+	margin-bottom: 15px;
 }
+
 .radio,
 .checkbox {
-  display: block;
-  min-height: 20px;
-  padding-left: 20px;
-  margin-top: 10px;
-  margin-bottom: 10px;
+	display: block;
+	min-height: 20px;
+	padding-left: 20px;
+	margin-top: 10px;
+	margin-bottom: 10px;
 }
+
 .radio label,
 .checkbox label {
-  display: inline;
-  font-weight: normal;
-  cursor: pointer;
+	display: inline;
+	font-weight: normal;
+	cursor: pointer;
 }
+
 .radio input[type="radio"],
 .radio-inline input[type="radio"],
 .checkbox input[type="checkbox"],
 .checkbox-inline input[type="checkbox"] {
-  float: left;
-  margin-left: -20px;
+	float: left;
+	margin-left: -20px;
 }
+
 .radio + .radio,
 .checkbox + .checkbox {
-  margin-top: -5px;
+	margin-top: -5px;
 }
+
 .radio-inline,
 .checkbox-inline {
-  display: inline-block;
-  padding-left: 20px;
-  margin-bottom: 0;
-  font-weight: normal;
-  vertical-align: middle;
-  cursor: pointer;
+	display: inline-block;
+	padding-left: 20px;
+	margin-bottom: 0;
+	font-weight: normal;
+	vertical-align: middle;
+	cursor: pointer;
 }
+
 .radio-inline + .radio-inline,
 .checkbox-inline + .checkbox-inline {
-  margin-top: 0;
-  margin-left: 10px;
+	margin-top: 0;
+	margin-left: 10px;
 }
+
 input[type="radio"][disabled],
 input[type="checkbox"][disabled],
 .radio[disabled],
@@ -1791,272 +2210,320 @@ fieldset[disabled] .radio,
 fieldset[disabled] .radio-inline,
 fieldset[disabled] .checkbox,
 fieldset[disabled] .checkbox-inline {
-  cursor: not-allowed;
+	cursor: not-allowed;
 }
+
 .input-sm {
-  height: 30px;
-  padding: 5px 10px;
-  font-size: 12px;
-  line-height: 1.5;
-  border-radius: 3px;
+	height: 30px;
+	padding: 5px 10px;
+	font-size: 12px;
+	line-height: 1.5;
+	border-radius: 3px;
 }
+
 select.input-sm {
-  height: 30px;
-  line-height: 30px;
+	height: 30px;
+	line-height: 30px;
 }
+
 textarea.input-sm,
 select[multiple].input-sm {
-  height: auto;
+	height: auto;
 }
+
 .input-lg {
-  height: 46px;
-  padding: 10px 16px;
-  font-size: 18px;
-  line-height: 1.33;
-  border-radius: 6px;
+	height: 46px;
+	padding: 10px 16px;
+	font-size: 18px;
+	line-height: 1.33;
+	border-radius: 6px;
 }
+
 select.input-lg {
-  height: 46px;
-  line-height: 46px;
+	height: 46px;
+	line-height: 46px;
 }
+
 textarea.input-lg,
 select[multiple].input-lg {
-  height: auto;
+	height: auto;
 }
+
 .has-feedback {
-  position: relative;
+	position: relative;
 }
+
 .has-feedback .form-control {
-  padding-right: 42.5px;
+	padding-right: 42.5px;
 }
+
 .has-feedback .form-control-feedback {
-  position: absolute;
-  top: 25px;
-  right: 0;
-  display: block;
-  width: 34px;
-  height: 34px;
-  line-height: 34px;
-  text-align: center;
+	position: absolute;
+	top: 25px;
+	right: 0;
+	display: block;
+	width: 34px;
+	height: 34px;
+	line-height: 34px;
+	text-align: center;
 }
+
 .has-success .help-block,
 .has-success .control-label,
 .has-success .radio,
 .has-success .checkbox,
 .has-success .radio-inline,
 .has-success .checkbox-inline {
-  color: #3c763d;
+	color: #3c763d;
 }
+
 .has-success .form-control {
-  border-color: #3c763d;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	border-color: #3c763d;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
 }
+
 .has-success .form-control:focus {
-  border-color: #2b542c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
+	border-color: #2b542c;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
 }
+
 .has-success .input-group-addon {
-  color: #3c763d;
-  background-color: #dff0d8;
-  border-color: #3c763d;
+	color: #3c763d;
+	background-color: #dff0d8;
+	border-color: #3c763d;
 }
+
 .has-success .form-control-feedback {
-  color: #3c763d;
+	color: #3c763d;
 }
+
 .has-warning .help-block,
 .has-warning .control-label,
 .has-warning .radio,
 .has-warning .checkbox,
 .has-warning .radio-inline,
 .has-warning .checkbox-inline {
-  color: #8a6d3b;
+	color: #8a6d3b;
 }
+
 .has-warning .form-control {
-  border-color: #8a6d3b;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	border-color: #8a6d3b;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
 }
+
 .has-warning .form-control:focus {
-  border-color: #66512c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
+	border-color: #66512c;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
 }
+
 .has-warning .input-group-addon {
-  color: #8a6d3b;
-  background-color: #fcf8e3;
-  border-color: #8a6d3b;
+	color: #8a6d3b;
+	background-color: #fcf8e3;
+	border-color: #8a6d3b;
 }
+
 .has-warning .form-control-feedback {
-  color: #8a6d3b;
+	color: #8a6d3b;
 }
+
 .has-error .help-block,
 .has-error .control-label,
 .has-error .radio,
 .has-error .checkbox,
 .has-error .radio-inline,
 .has-error .checkbox-inline {
-  color: #a94442;
+	color: #a94442;
 }
+
 .has-error .form-control {
-  border-color: #a94442;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	border-color: #a94442;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
 }
+
 .has-error .form-control:focus {
-  border-color: #843534;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
+	border-color: #843534;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
 }
+
 .has-error .input-group-addon {
-  color: #a94442;
-  background-color: #f2dede;
-  border-color: #a94442;
+	color: #a94442;
+	background-color: #f2dede;
+	border-color: #a94442;
 }
+
 .has-error .form-control-feedback {
-  color: #a94442;
+	color: #a94442;
 }
+
 .form-control-static {
-  margin-bottom: 0;
+	margin-bottom: 0;
 }
+
 .help-block {
-  display: block;
-  margin-top: 5px;
-  margin-bottom: 10px;
-  color: #737373;
+	display: block;
+	margin-top: 5px;
+	margin-bottom: 10px;
+	color: #737373;
 }
+
 @media (min-width: 768px) {
-  .form-inline .form-group {
-    display: inline-block;
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  .form-inline .form-control {
-    display: inline-block;
-    width: auto;
-    vertical-align: middle;
-  }
-  .form-inline .input-group > .form-control {
-    width: 100%;
-  }
-  .form-inline .control-label {
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  .form-inline .radio,
-  .form-inline .checkbox {
-    display: inline-block;
-    padding-left: 0;
-    margin-top: 0;
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  .form-inline .radio input[type="radio"],
-  .form-inline .checkbox input[type="checkbox"] {
-    float: none;
-    margin-left: 0;
-  }
-  .form-inline .has-feedback .form-control-feedback {
-    top: 0;
-  }
+	.form-inline .form-group {
+		display: inline-block;
+		margin-bottom: 0;
+		vertical-align: middle;
+	}
+
+	.form-inline .form-control {
+		display: inline-block;
+		width: auto;
+		vertical-align: middle;
+	}
+
+	.form-inline .input-group > .form-control {
+		width: 100%;
+	}
+
+	.form-inline .control-label {
+		margin-bottom: 0;
+		vertical-align: middle;
+	}
+
+	.form-inline .radio,
+	.form-inline .checkbox {
+		display: inline-block;
+		padding-left: 0;
+		margin-top: 0;
+		margin-bottom: 0;
+		vertical-align: middle;
+	}
+
+	.form-inline .radio input[type="radio"],
+	.form-inline .checkbox input[type="checkbox"] {
+		float: none;
+		margin-left: 0;
+	}
+
+	.form-inline .has-feedback .form-control-feedback {
+		top: 0;
+	}
 }
+
 .form-horizontal .control-label,
 .form-horizontal .radio,
 .form-horizontal .checkbox,
 .form-horizontal .radio-inline,
 .form-horizontal .checkbox-inline {
-  padding-top: 7px;
-  margin-top: 0;
-  margin-bottom: 0;
+	padding-top: 7px;
+	margin-top: 0;
+	margin-bottom: 0;
 }
+
 .form-horizontal .radio,
 .form-horizontal .checkbox {
-  min-height: 27px;
+	min-height: 27px;
 }
+
 .form-horizontal .form-group {
-  margin-right: -15px;
-  margin-left: -15px;
+	margin-right: -15px;
+	margin-left: -15px;
 }
+
 .form-horizontal .form-control-static {
-  padding-top: 7px;
+	padding-top: 7px;
 }
+
 @media (min-width: 768px) {
-  .form-horizontal .control-label {
-    text-align: right;
-  }
+	.form-horizontal .control-label {
+		text-align: right;
+	}
 }
+
 .form-horizontal .has-feedback .form-control-feedback {
-  top: 0;
-  right: 15px;
+	top: 0;
+	right: 15px;
 }
+
 .btn {
-  display: inline-block;
-  padding: 6px 12px;
-  margin-bottom: 0;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 1.42857143;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: middle;
-  cursor: pointer;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none;
-  background-image: none;
-  border: 1px solid transparent;
-  border-radius: 4px;
+	display: inline-block;
+	padding: 6px 12px;
+	margin-bottom: 0;
+	font-size: 14px;
+	font-weight: normal;
+	line-height: 1.42857143;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: middle;
+	cursor: pointer;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	background-image: none;
+	border: 1px solid transparent;
+	border-radius: 4px;
 }
+
 .btn:focus,
 .btn:active:focus,
 .btn.active:focus {
-  outline: thin dotted;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
+	outline: thin dotted;
+	outline: 5px auto -webkit-focus-ring-color;
+	outline-offset: -2px;
 }
+
 .btn:hover,
 .btn:focus {
-  color: #333;
-  text-decoration: none;
+	color: #333;
+	text-decoration: none;
 }
+
 .btn:active,
 .btn.active {
-  background-image: none;
-  outline: 0;
-  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+	background-image: none;
+	outline: 0;
+	-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+	box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
 }
+
 .btn.disabled,
 .btn[disabled],
 fieldset[disabled] .btn {
-  pointer-events: none;
-  cursor: not-allowed;
-  filter: alpha(opacity=65);
-  -webkit-box-shadow: none;
-          box-shadow: none;
-  opacity: .65;
+	pointer-events: none;
+	cursor: not-allowed;
+	filter: alpha(opacity=65);
+	-webkit-box-shadow: none;
+	box-shadow: none;
+	opacity: .65;
 }
+
 .btn-default {
-  color: #333;
-  background-color: #fff;
-  border-color: #ccc;
+	color: #333;
+	background-color: #fff;
+	border-color: #ccc;
 }
+
 .btn-default:hover,
 .btn-default:focus,
 .btn-default:active,
 .btn-default.active,
 .open .dropdown-toggle.btn-default {
-  color: #333;
-  background-color: #ebebeb;
-  border-color: #adadad;
+	color: #333;
+	background-color: #ebebeb;
+	border-color: #adadad;
 }
+
 .btn-default:active,
 .btn-default.active,
 .open .dropdown-toggle.btn-default {
-  background-image: none;
+	background-image: none;
 }
+
 .btn-default.disabled,
 .btn-default[disabled],
 fieldset[disabled] .btn-default,
@@ -2072,32 +2539,37 @@ fieldset[disabled] .btn-default:active,
 .btn-default.disabled.active,
 .btn-default[disabled].active,
 fieldset[disabled] .btn-default.active {
-  background-color: #fff;
-  border-color: #ccc;
+	background-color: #fff;
+	border-color: #ccc;
 }
+
 .btn-default .badge {
-  color: #fff;
-  background-color: #333;
+	color: #fff;
+	background-color: #333;
 }
+
 .btn-primary {
-  color: #fff;
-  background-color: #428bca;
-  border-color: #357ebd;
+	color: #fff;
+	background-color: #428bca;
+	border-color: #357ebd;
 }
+
 .btn-primary:hover,
 .btn-primary:focus,
 .btn-primary:active,
 .btn-primary.active,
 .open .dropdown-toggle.btn-primary {
-  color: #fff;
-  background-color: #3276b1;
-  border-color: #285e8e;
+	color: #fff;
+	background-color: #3276b1;
+	border-color: #285e8e;
 }
+
 .btn-primary:active,
 .btn-primary.active,
 .open .dropdown-toggle.btn-primary {
-  background-image: none;
+	background-image: none;
 }
+
 .btn-primary.disabled,
 .btn-primary[disabled],
 fieldset[disabled] .btn-primary,
@@ -2113,32 +2585,37 @@ fieldset[disabled] .btn-primary:active,
 .btn-primary.disabled.active,
 .btn-primary[disabled].active,
 fieldset[disabled] .btn-primary.active {
-  background-color: #428bca;
-  border-color: #357ebd;
+	background-color: #428bca;
+	border-color: #357ebd;
 }
+
 .btn-primary .badge {
-  color: #428bca;
-  background-color: #fff;
+	color: #428bca;
+	background-color: #fff;
 }
+
 .btn-success {
-  color: #fff;
-  background-color: #5cb85c;
-  border-color: #4cae4c;
+	color: #fff;
+	background-color: #5cb85c;
+	border-color: #4cae4c;
 }
+
 .btn-success:hover,
 .btn-success:focus,
 .btn-success:active,
 .btn-success.active,
 .open .dropdown-toggle.btn-success {
-  color: #fff;
-  background-color: #47a447;
-  border-color: #398439;
+	color: #fff;
+	background-color: #47a447;
+	border-color: #398439;
 }
+
 .btn-success:active,
 .btn-success.active,
 .open .dropdown-toggle.btn-success {
-  background-image: none;
+	background-image: none;
 }
+
 .btn-success.disabled,
 .btn-success[disabled],
 fieldset[disabled] .btn-success,
@@ -2154,32 +2631,37 @@ fieldset[disabled] .btn-success:active,
 .btn-success.disabled.active,
 .btn-success[disabled].active,
 fieldset[disabled] .btn-success.active {
-  background-color: #5cb85c;
-  border-color: #4cae4c;
+	background-color: #5cb85c;
+	border-color: #4cae4c;
 }
+
 .btn-success .badge {
-  color: #5cb85c;
-  background-color: #fff;
+	color: #5cb85c;
+	background-color: #fff;
 }
+
 .btn-info {
-  color: #fff;
-  background-color: #5bc0de;
-  border-color: #46b8da;
+	color: #fff;
+	background-color: #5bc0de;
+	border-color: #46b8da;
 }
+
 .btn-info:hover,
 .btn-info:focus,
 .btn-info:active,
 .btn-info.active,
 .open .dropdown-toggle.btn-info {
-  color: #fff;
-  background-color: #39b3d7;
-  border-color: #269abc;
+	color: #fff;
+	background-color: #39b3d7;
+	border-color: #269abc;
 }
+
 .btn-info:active,
 .btn-info.active,
 .open .dropdown-toggle.btn-info {
-  background-image: none;
+	background-image: none;
 }
+
 .btn-info.disabled,
 .btn-info[disabled],
 fieldset[disabled] .btn-info,
@@ -2195,32 +2677,37 @@ fieldset[disabled] .btn-info:active,
 .btn-info.disabled.active,
 .btn-info[disabled].active,
 fieldset[disabled] .btn-info.active {
-  background-color: #5bc0de;
-  border-color: #46b8da;
+	background-color: #5bc0de;
+	border-color: #46b8da;
 }
+
 .btn-info .badge {
-  color: #5bc0de;
-  background-color: #fff;
+	color: #5bc0de;
+	background-color: #fff;
 }
+
 .btn-warning {
-  color: #fff;
-  background-color: #f0ad4e;
-  border-color: #eea236;
+	color: #fff;
+	background-color: #f0ad4e;
+	border-color: #eea236;
 }
+
 .btn-warning:hover,
 .btn-warning:focus,
 .btn-warning:active,
 .btn-warning.active,
 .open .dropdown-toggle.btn-warning {
-  color: #fff;
-  background-color: #ed9c28;
-  border-color: #d58512;
+	color: #fff;
+	background-color: #ed9c28;
+	border-color: #d58512;
 }
+
 .btn-warning:active,
 .btn-warning.active,
 .open .dropdown-toggle.btn-warning {
-  background-image: none;
+	background-image: none;
 }
+
 .btn-warning.disabled,
 .btn-warning[disabled],
 fieldset[disabled] .btn-warning,
@@ -2236,32 +2723,37 @@ fieldset[disabled] .btn-warning:active,
 .btn-warning.disabled.active,
 .btn-warning[disabled].active,
 fieldset[disabled] .btn-warning.active {
-  background-color: #f0ad4e;
-  border-color: #eea236;
+	background-color: #f0ad4e;
+	border-color: #eea236;
 }
+
 .btn-warning .badge {
-  color: #f0ad4e;
-  background-color: #fff;
+	color: #f0ad4e;
+	background-color: #fff;
 }
+
 .btn-danger {
-  color: #fff;
-  background-color: #d9534f;
-  border-color: #d43f3a;
+	color: #fff;
+	background-color: #d9534f;
+	border-color: #d43f3a;
 }
+
 .btn-danger:hover,
 .btn-danger:focus,
 .btn-danger:active,
 .btn-danger.active,
 .open .dropdown-toggle.btn-danger {
-  color: #fff;
-  background-color: #d2322d;
-  border-color: #ac2925;
+	color: #fff;
+	background-color: #d2322d;
+	border-color: #ac2925;
 }
+
 .btn-danger:active,
 .btn-danger.active,
 .open .dropdown-toggle.btn-danger {
-  background-image: none;
+	background-image: none;
 }
+
 .btn-danger.disabled,
 .btn-danger[disabled],
 fieldset[disabled] .btn-danger,
@@ -2277,868 +2769,1112 @@ fieldset[disabled] .btn-danger:active,
 .btn-danger.disabled.active,
 .btn-danger[disabled].active,
 fieldset[disabled] .btn-danger.active {
-  background-color: #d9534f;
-  border-color: #d43f3a;
+	background-color: #d9534f;
+	border-color: #d43f3a;
 }
+
 .btn-danger .badge {
-  color: #d9534f;
-  background-color: #fff;
+	color: #d9534f;
+	background-color: #fff;
 }
+
 .btn-link {
-  font-weight: normal;
-  color: #428bca;
-  cursor: pointer;
-  border-radius: 0;
+	font-weight: normal;
+	color: #428bca;
+	cursor: pointer;
+	border-radius: 0;
 }
+
 .btn-link,
 .btn-link:active,
 .btn-link[disabled],
 fieldset[disabled] .btn-link {
-  background-color: transparent;
-  -webkit-box-shadow: none;
-          box-shadow: none;
+	background-color: transparent;
+	-webkit-box-shadow: none;
+	box-shadow: none;
 }
+
 .btn-link,
 .btn-link:hover,
 .btn-link:focus,
 .btn-link:active {
-  border-color: transparent;
+	border-color: transparent;
 }
+
 .btn-link:hover,
 .btn-link:focus {
-  color: #2a6496;
-  text-decoration: underline;
-  background-color: transparent;
+	color: #2a6496;
+	text-decoration: underline;
+	background-color: transparent;
 }
+
 .btn-link[disabled]:hover,
 fieldset[disabled] .btn-link:hover,
 .btn-link[disabled]:focus,
 fieldset[disabled] .btn-link:focus {
-  color: #999;
-  text-decoration: none;
+	color: #999;
+	text-decoration: none;
 }
+
 .btn-lg,
 .btn-group-lg > .btn {
-  padding: 10px 16px;
-  font-size: 18px;
-  line-height: 1.33;
-  border-radius: 6px;
+	padding: 10px 16px;
+	font-size: 18px;
+	line-height: 1.33;
+	border-radius: 6px;
 }
+
 .btn-sm,
 .btn-group-sm > .btn {
-  padding: 5px 10px;
-  font-size: 12px;
-  line-height: 1.5;
-  border-radius: 3px;
+	padding: 5px 10px;
+	font-size: 12px;
+	line-height: 1.5;
+	border-radius: 3px;
 }
+
 .btn-xs,
 .btn-group-xs > .btn {
-  padding: 1px 5px;
-  font-size: 12px;
-  line-height: 1.5;
-  border-radius: 3px;
+	padding: 1px 5px;
+	font-size: 12px;
+	line-height: 1.5;
+	border-radius: 3px;
 }
+
 .btn-block {
-  display: block;
-  width: 100%;
-  padding-right: 0;
-  padding-left: 0;
+	display: block;
+	width: 100%;
+	padding-right: 0;
+	padding-left: 0;
 }
+
 .btn-block + .btn-block {
-  margin-top: 5px;
+	margin-top: 5px;
 }
+
 input[type="submit"].btn-block,
 input[type="reset"].btn-block,
 input[type="button"].btn-block {
-  width: 100%;
+	width: 100%;
 }
+
 .fade {
-  opacity: 0;
-  -webkit-transition: opacity .15s linear;
-          transition: opacity .15s linear;
+	opacity: 0;
+	-webkit-transition: opacity .15s linear;
+	transition: opacity .15s linear;
 }
+
 .fade.in {
-  opacity: 1;
+	opacity: 1;
 }
+
 .collapse {
-  display: none;
+	display: none;
 }
+
 .collapse.in {
-  display: block;
+	display: block;
 }
+
 .collapsing {
-  position: relative;
-  height: 0;
-  overflow: hidden;
-  -webkit-transition: height .35s ease;
-          transition: height .35s ease;
+	position: relative;
+	height: 0;
+	overflow: hidden;
+	-webkit-transition: height .35s ease;
+	transition: height .35s ease;
 }
+
 @font-face {
-  font-family: 'Glyphicons Halflings';
+	font-family: 'Glyphicons Halflings';
 
-  src: url('../fonts/glyphicons-halflings-regular.eot');
-  src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
+	src: url('../fonts/glyphicons-halflings-regular.eot');
+	src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
 }
+
 .glyphicon {
-  position: relative;
-  top: 1px;
-  display: inline-block;
-  font-family: 'Glyphicons Halflings';
-  font-style: normal;
-  font-weight: normal;
-  line-height: 1;
+	position: relative;
+	top: 1px;
+	display: inline-block;
+	font-family: 'Glyphicons Halflings';
+	font-style: normal;
+	font-weight: normal;
+	line-height: 1;
 
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
 }
+
 .glyphicon-asterisk:before {
-  content: "\2a";
+	content: "\2a";
 }
+
 .glyphicon-plus:before {
-  content: "\2b";
+	content: "\2b";
 }
+
 .glyphicon-euro:before {
-  content: "\20ac";
+	content: "\20ac";
 }
+
 .glyphicon-minus:before {
-  content: "\2212";
+	content: "\2212";
 }
+
 .glyphicon-cloud:before {
-  content: "\2601";
+	content: "\2601";
 }
+
 .glyphicon-envelope:before {
-  content: "\2709";
+	content: "\2709";
 }
+
 .glyphicon-pencil:before {
-  content: "\270f";
+	content: "\270f";
 }
+
 .glyphicon-glass:before {
-  content: "\e001";
+	content: "\e001";
 }
+
 .glyphicon-music:before {
-  content: "\e002";
+	content: "\e002";
 }
+
 .glyphicon-search:before {
-  content: "\e003";
+	content: "\e003";
 }
+
 .glyphicon-heart:before {
-  content: "\e005";
+	content: "\e005";
 }
+
 .glyphicon-star:before {
-  content: "\e006";
+	content: "\e006";
 }
+
 .glyphicon-star-empty:before {
-  content: "\e007";
+	content: "\e007";
 }
+
 .glyphicon-user:before {
-  content: "\e008";
+	content: "\e008";
 }
+
 .glyphicon-film:before {
-  content: "\e009";
+	content: "\e009";
 }
+
 .glyphicon-th-large:before {
-  content: "\e010";
+	content: "\e010";
 }
+
 .glyphicon-th:before {
-  content: "\e011";
+	content: "\e011";
 }
+
 .glyphicon-th-list:before {
-  content: "\e012";
+	content: "\e012";
 }
+
 .glyphicon-ok:before {
-  content: "\e013";
+	content: "\e013";
 }
+
 .glyphicon-remove:before {
-  content: "\e014";
+	content: "\e014";
 }
+
 .glyphicon-zoom-in:before {
-  content: "\e015";
+	content: "\e015";
 }
+
 .glyphicon-zoom-out:before {
-  content: "\e016";
+	content: "\e016";
 }
+
 .glyphicon-off:before {
-  content: "\e017";
+	content: "\e017";
 }
+
 .glyphicon-signal:before {
-  content: "\e018";
+	content: "\e018";
 }
+
 .glyphicon-cog:before {
-  content: "\e019";
+	content: "\e019";
 }
+
 .glyphicon-trash:before {
-  content: "\e020";
+	content: "\e020";
 }
+
 .glyphicon-home:before {
-  content: "\e021";
+	content: "\e021";
 }
+
 .glyphicon-file:before {
-  content: "\e022";
+	content: "\e022";
 }
+
 .glyphicon-time:before {
-  content: "\e023";
+	content: "\e023";
 }
+
 .glyphicon-road:before {
-  content: "\e024";
+	content: "\e024";
 }
+
 .glyphicon-download-alt:before {
-  content: "\e025";
+	content: "\e025";
 }
+
 .glyphicon-download:before {
-  content: "\e026";
+	content: "\e026";
 }
+
 .glyphicon-upload:before {
-  content: "\e027";
+	content: "\e027";
 }
+
 .glyphicon-inbox:before {
-  content: "\e028";
+	content: "\e028";
 }
+
 .glyphicon-play-circle:before {
-  content: "\e029";
+	content: "\e029";
 }
+
 .glyphicon-repeat:before {
-  content: "\e030";
+	content: "\e030";
 }
+
 .glyphicon-refresh:before {
-  content: "\e031";
+	content: "\e031";
 }
+
 .glyphicon-list-alt:before {
-  content: "\e032";
+	content: "\e032";
 }
+
 .glyphicon-lock:before {
-  content: "\e033";
+	content: "\e033";
 }
+
 .glyphicon-flag:before {
-  content: "\e034";
+	content: "\e034";
 }
+
 .glyphicon-headphones:before {
-  content: "\e035";
+	content: "\e035";
 }
+
 .glyphicon-volume-off:before {
-  content: "\e036";
+	content: "\e036";
 }
+
 .glyphicon-volume-down:before {
-  content: "\e037";
+	content: "\e037";
 }
+
 .glyphicon-volume-up:before {
-  content: "\e038";
+	content: "\e038";
 }
+
 .glyphicon-qrcode:before {
-  content: "\e039";
+	content: "\e039";
 }
+
 .glyphicon-barcode:before {
-  content: "\e040";
+	content: "\e040";
 }
+
 .glyphicon-tag:before {
-  content: "\e041";
+	content: "\e041";
 }
+
 .glyphicon-tags:before {
-  content: "\e042";
+	content: "\e042";
 }
+
 .glyphicon-book:before {
-  content: "\e043";
+	content: "\e043";
 }
+
 .glyphicon-bookmark:before {
-  content: "\e044";
+	content: "\e044";
 }
+
 .glyphicon-print:before {
-  content: "\e045";
+	content: "\e045";
 }
+
 .glyphicon-camera:before {
-  content: "\e046";
+	content: "\e046";
 }
+
 .glyphicon-font:before {
-  content: "\e047";
+	content: "\e047";
 }
+
 .glyphicon-bold:before {
-  content: "\e048";
+	content: "\e048";
 }
+
 .glyphicon-italic:before {
-  content: "\e049";
+	content: "\e049";
 }
+
 .glyphicon-text-height:before {
-  content: "\e050";
+	content: "\e050";
 }
+
 .glyphicon-text-width:before {
-  content: "\e051";
+	content: "\e051";
 }
+
 .glyphicon-align-left:before {
-  content: "\e052";
+	content: "\e052";
 }
+
 .glyphicon-align-center:before {
-  content: "\e053";
+	content: "\e053";
 }
+
 .glyphicon-align-right:before {
-  content: "\e054";
+	content: "\e054";
 }
+
 .glyphicon-align-justify:before {
-  content: "\e055";
+	content: "\e055";
 }
+
 .glyphicon-list:before {
-  content: "\e056";
+	content: "\e056";
 }
+
 .glyphicon-indent-left:before {
-  content: "\e057";
+	content: "\e057";
 }
+
 .glyphicon-indent-right:before {
-  content: "\e058";
+	content: "\e058";
 }
+
 .glyphicon-facetime-video:before {
-  content: "\e059";
+	content: "\e059";
 }
+
 .glyphicon-picture:before {
-  content: "\e060";
+	content: "\e060";
 }
+
 .glyphicon-map-marker:before {
-  content: "\e062";
+	content: "\e062";
 }
+
 .glyphicon-adjust:before {
-  content: "\e063";
+	content: "\e063";
 }
+
 .glyphicon-tint:before {
-  content: "\e064";
+	content: "\e064";
 }
+
 .glyphicon-edit:before {
-  content: "\e065";
+	content: "\e065";
 }
+
 .glyphicon-share:before {
-  content: "\e066";
+	content: "\e066";
 }
+
 .glyphicon-check:before {
-  content: "\e067";
+	content: "\e067";
 }
+
 .glyphicon-move:before {
-  content: "\e068";
+	content: "\e068";
 }
+
 .glyphicon-step-backward:before {
-  content: "\e069";
+	content: "\e069";
 }
+
 .glyphicon-fast-backward:before {
-  content: "\e070";
+	content: "\e070";
 }
+
 .glyphicon-backward:before {
-  content: "\e071";
+	content: "\e071";
 }
+
 .glyphicon-play:before {
-  content: "\e072";
+	content: "\e072";
 }
+
 .glyphicon-pause:before {
-  content: "\e073";
+	content: "\e073";
 }
+
 .glyphicon-stop:before {
-  content: "\e074";
+	content: "\e074";
 }
+
 .glyphicon-forward:before {
-  content: "\e075";
+	content: "\e075";
 }
+
 .glyphicon-fast-forward:before {
-  content: "\e076";
+	content: "\e076";
 }
+
 .glyphicon-step-forward:before {
-  content: "\e077";
+	content: "\e077";
 }
+
 .glyphicon-eject:before {
-  content: "\e078";
+	content: "\e078";
 }
+
 .glyphicon-chevron-left:before {
-  content: "\e079";
+	content: "\e079";
 }
+
 .glyphicon-chevron-right:before {
-  content: "\e080";
+	content: "\e080";
 }
+
 .glyphicon-plus-sign:before {
-  content: "\e081";
+	content: "\e081";
 }
+
 .glyphicon-minus-sign:before {
-  content: "\e082";
+	content: "\e082";
 }
+
 .glyphicon-remove-sign:before {
-  content: "\e083";
+	content: "\e083";
 }
+
 .glyphicon-ok-sign:before {
-  content: "\e084";
+	content: "\e084";
 }
+
 .glyphicon-question-sign:before {
-  content: "\e085";
+	content: "\e085";
 }
+
 .glyphicon-info-sign:before {
-  content: "\e086";
+	content: "\e086";
 }
+
 .glyphicon-screenshot:before {
-  content: "\e087";
+	content: "\e087";
 }
+
 .glyphicon-remove-circle:before {
-  content: "\e088";
+	content: "\e088";
 }
+
 .glyphicon-ok-circle:before {
-  content: "\e089";
+	content: "\e089";
 }
+
 .glyphicon-ban-circle:before {
-  content: "\e090";
+	content: "\e090";
 }
+
 .glyphicon-arrow-left:before {
-  content: "\e091";
+	content: "\e091";
 }
+
 .glyphicon-arrow-right:before {
-  content: "\e092";
+	content: "\e092";
 }
+
 .glyphicon-arrow-up:before {
-  content: "\e093";
+	content: "\e093";
 }
+
 .glyphicon-arrow-down:before {
-  content: "\e094";
+	content: "\e094";
 }
+
 .glyphicon-share-alt:before {
-  content: "\e095";
+	content: "\e095";
 }
+
 .glyphicon-resize-full:before {
-  content: "\e096";
+	content: "\e096";
 }
+
 .glyphicon-resize-small:before {
-  content: "\e097";
+	content: "\e097";
 }
+
 .glyphicon-exclamation-sign:before {
-  content: "\e101";
+	content: "\e101";
 }
+
 .glyphicon-gift:before {
-  content: "\e102";
+	content: "\e102";
 }
+
 .glyphicon-leaf:before {
-  content: "\e103";
+	content: "\e103";
 }
+
 .glyphicon-fire:before {
-  content: "\e104";
+	content: "\e104";
 }
+
 .glyphicon-eye-open:before {
-  content: "\e105";
+	content: "\e105";
 }
+
 .glyphicon-eye-close:before {
-  content: "\e106";
+	content: "\e106";
 }
+
 .glyphicon-warning-sign:before {
-  content: "\e107";
+	content: "\e107";
 }
+
 .glyphicon-plane:before {
-  content: "\e108";
+	content: "\e108";
 }
+
 .glyphicon-calendar:before {
-  content: "\e109";
+	content: "\e109";
 }
+
 .glyphicon-random:before {
-  content: "\e110";
+	content: "\e110";
 }
+
 .glyphicon-comment:before {
-  content: "\e111";
+	content: "\e111";
 }
+
 .glyphicon-magnet:before {
-  content: "\e112";
+	content: "\e112";
 }
+
 .glyphicon-chevron-up:before {
-  content: "\e113";
+	content: "\e113";
 }
+
 .glyphicon-chevron-down:before {
-  content: "\e114";
+	content: "\e114";
 }
+
 .glyphicon-retweet:before {
-  content: "\e115";
+	content: "\e115";
 }
+
 .glyphicon-shopping-cart:before {
-  content: "\e116";
+	content: "\e116";
 }
+
 .glyphicon-folder-close:before {
-  content: "\e117";
+	content: "\e117";
 }
+
 .glyphicon-folder-open:before {
-  content: "\e118";
+	content: "\e118";
 }
+
 .glyphicon-resize-vertical:before {
-  content: "\e119";
+	content: "\e119";
 }
+
 .glyphicon-resize-horizontal:before {
-  content: "\e120";
+	content: "\e120";
 }
+
 .glyphicon-hdd:before {
-  content: "\e121";
+	content: "\e121";
 }
+
 .glyphicon-bullhorn:before {
-  content: "\e122";
+	content: "\e122";
 }
+
 .glyphicon-bell:before {
-  content: "\e123";
+	content: "\e123";
 }
+
 .glyphicon-certificate:before {
-  content: "\e124";
+	content: "\e124";
 }
+
 .glyphicon-thumbs-up:before {
-  content: "\e125";
+	content: "\e125";
 }
+
 .glyphicon-thumbs-down:before {
-  content: "\e126";
+	content: "\e126";
 }
+
 .glyphicon-hand-right:before {
-  content: "\e127";
+	content: "\e127";
 }
+
 .glyphicon-hand-left:before {
-  content: "\e128";
+	content: "\e128";
 }
+
 .glyphicon-hand-up:before {
-  content: "\e129";
+	content: "\e129";
 }
+
 .glyphicon-hand-down:before {
-  content: "\e130";
+	content: "\e130";
 }
+
 .glyphicon-circle-arrow-right:before {
-  content: "\e131";
+	content: "\e131";
 }
+
 .glyphicon-circle-arrow-left:before {
-  content: "\e132";
+	content: "\e132";
 }
+
 .glyphicon-circle-arrow-up:before {
-  content: "\e133";
+	content: "\e133";
 }
+
 .glyphicon-circle-arrow-down:before {
-  content: "\e134";
+	content: "\e134";
 }
+
 .glyphicon-globe:before {
-  content: "\e135";
+	content: "\e135";
 }
+
 .glyphicon-wrench:before {
-  content: "\e136";
+	content: "\e136";
 }
+
 .glyphicon-tasks:before {
-  content: "\e137";
+	content: "\e137";
 }
+
 .glyphicon-filter:before {
-  content: "\e138";
+	content: "\e138";
 }
+
 .glyphicon-briefcase:before {
-  content: "\e139";
+	content: "\e139";
 }
+
 .glyphicon-fullscreen:before {
-  content: "\e140";
+	content: "\e140";
 }
+
 .glyphicon-dashboard:before {
-  content: "\e141";
+	content: "\e141";
 }
+
 .glyphicon-paperclip:before {
-  content: "\e142";
+	content: "\e142";
 }
+
 .glyphicon-heart-empty:before {
-  content: "\e143";
+	content: "\e143";
 }
+
 .glyphicon-link:before {
-  content: "\e144";
+	content: "\e144";
 }
+
 .glyphicon-phone:before {
-  content: "\e145";
+	content: "\e145";
 }
+
 .glyphicon-pushpin:before {
-  content: "\e146";
+	content: "\e146";
 }
+
 .glyphicon-usd:before {
-  content: "\e148";
+	content: "\e148";
 }
+
 .glyphicon-gbp:before {
-  content: "\e149";
+	content: "\e149";
 }
+
 .glyphicon-sort:before {
-  content: "\e150";
+	content: "\e150";
 }
+
 .glyphicon-sort-by-alphabet:before {
-  content: "\e151";
+	content: "\e151";
 }
+
 .glyphicon-sort-by-alphabet-alt:before {
-  content: "\e152";
+	content: "\e152";
 }
+
 .glyphicon-sort-by-order:before {
-  content: "\e153";
+	content: "\e153";
 }
+
 .glyphicon-sort-by-order-alt:before {
-  content: "\e154";
+	content: "\e154";
 }
+
 .glyphicon-sort-by-attributes:before {
-  content: "\e155";
+	content: "\e155";
 }
+
 .glyphicon-sort-by-attributes-alt:before {
-  content: "\e156";
+	content: "\e156";
 }
+
 .glyphicon-unchecked:before {
-  content: "\e157";
+	content: "\e157";
 }
+
 .glyphicon-expand:before {
-  content: "\e158";
+	content: "\e158";
 }
+
 .glyphicon-collapse-down:before {
-  content: "\e159";
+	content: "\e159";
 }
+
 .glyphicon-collapse-up:before {
-  content: "\e160";
+	content: "\e160";
 }
+
 .glyphicon-log-in:before {
-  content: "\e161";
+	content: "\e161";
 }
+
 .glyphicon-flash:before {
-  content: "\e162";
+	content: "\e162";
 }
+
 .glyphicon-log-out:before {
-  content: "\e163";
+	content: "\e163";
 }
+
 .glyphicon-new-window:before {
-  content: "\e164";
+	content: "\e164";
 }
+
 .glyphicon-record:before {
-  content: "\e165";
+	content: "\e165";
 }
+
 .glyphicon-save:before {
-  content: "\e166";
+	content: "\e166";
 }
+
 .glyphicon-open:before {
-  content: "\e167";
+	content: "\e167";
 }
+
 .glyphicon-saved:before {
-  content: "\e168";
+	content: "\e168";
 }
+
 .glyphicon-import:before {
-  content: "\e169";
+	content: "\e169";
 }
+
 .glyphicon-export:before {
-  content: "\e170";
+	content: "\e170";
 }
+
 .glyphicon-send:before {
-  content: "\e171";
+	content: "\e171";
 }
+
 .glyphicon-floppy-disk:before {
-  content: "\e172";
+	content: "\e172";
 }
+
 .glyphicon-floppy-saved:before {
-  content: "\e173";
+	content: "\e173";
 }
+
 .glyphicon-floppy-remove:before {
-  content: "\e174";
+	content: "\e174";
 }
+
 .glyphicon-floppy-save:before {
-  content: "\e175";
+	content: "\e175";
 }
+
 .glyphicon-floppy-open:before {
-  content: "\e176";
+	content: "\e176";
 }
+
 .glyphicon-credit-card:before {
-  content: "\e177";
+	content: "\e177";
 }
+
 .glyphicon-transfer:before {
-  content: "\e178";
+	content: "\e178";
 }
+
 .glyphicon-cutlery:before {
-  content: "\e179";
+	content: "\e179";
 }
+
 .glyphicon-header:before {
-  content: "\e180";
+	content: "\e180";
 }
+
 .glyphicon-compressed:before {
-  content: "\e181";
+	content: "\e181";
 }
+
 .glyphicon-earphone:before {
-  content: "\e182";
+	content: "\e182";
 }
+
 .glyphicon-phone-alt:before {
-  content: "\e183";
+	content: "\e183";
 }
+
 .glyphicon-tower:before {
-  content: "\e184";
+	content: "\e184";
 }
+
 .glyphicon-stats:before {
-  content: "\e185";
+	content: "\e185";
 }
+
 .glyphicon-sd-video:before {
-  content: "\e186";
+	content: "\e186";
 }
+
 .glyphicon-hd-video:before {
-  content: "\e187";
+	content: "\e187";
 }
+
 .glyphicon-subtitles:before {
-  content: "\e188";
+	content: "\e188";
 }
+
 .glyphicon-sound-stereo:before {
-  content: "\e189";
+	content: "\e189";
 }
+
 .glyphicon-sound-dolby:before {
-  content: "\e190";
+	content: "\e190";
 }
+
 .glyphicon-sound-5-1:before {
-  content: "\e191";
+	content: "\e191";
 }
+
 .glyphicon-sound-6-1:before {
-  content: "\e192";
+	content: "\e192";
 }
+
 .glyphicon-sound-7-1:before {
-  content: "\e193";
+	content: "\e193";
 }
+
 .glyphicon-copyright-mark:before {
-  content: "\e194";
+	content: "\e194";
 }
+
 .glyphicon-registration-mark:before {
-  content: "\e195";
+	content: "\e195";
 }
+
 .glyphicon-cloud-download:before {
-  content: "\e197";
+	content: "\e197";
 }
+
 .glyphicon-cloud-upload:before {
-  content: "\e198";
+	content: "\e198";
 }
+
 .glyphicon-tree-conifer:before {
-  content: "\e199";
+	content: "\e199";
 }
+
 .glyphicon-tree-deciduous:before {
-  content: "\e200";
+	content: "\e200";
 }
+
 .caret {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  margin-left: 2px;
-  vertical-align: middle;
-  border-top: 4px solid;
-  border-right: 4px solid transparent;
-  border-left: 4px solid transparent;
+	display: inline-block;
+	width: 0;
+	height: 0;
+	margin-left: 2px;
+	vertical-align: middle;
+	border-top: 4px solid;
+	border-right: 4px solid transparent;
+	border-left: 4px solid transparent;
 }
+
 .dropdown {
-  position: relative;
+	position: relative;
 }
+
 .dropdown-toggle:focus {
-  outline: 0;
+	outline: 0;
 }
+
 .dropdown-menu {
-  position: absolute;
-  top: 100%;
-  left: 0;
-  z-index: 1000;
-  display: none;
-  float: left;
-  min-width: 160px;
-  padding: 5px 0;
-  margin: 2px 0 0;
-  font-size: 14px;
-  list-style: none;
-  background-color: #fff;
-  background-clip: padding-box;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, .15);
-  border-radius: 4px;
-  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
-          box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+	position: absolute;
+	top: 100%;
+	left: 0;
+	z-index: 1000;
+	display: none;
+	float: left;
+	min-width: 160px;
+	padding: 5px 0;
+	margin: 2px 0 0;
+	font-size: 14px;
+	list-style: none;
+	background-color: #fff;
+	background-clip: padding-box;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0, 0, 0, .15);
+	border-radius: 4px;
+	-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+	box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
 }
+
 .dropdown-menu.pull-right {
-  right: 0;
-  left: auto;
+	right: 0;
+	left: auto;
 }
+
 .dropdown-menu .divider {
-  height: 1px;
-  margin: 9px 0;
-  overflow: hidden;
-  background-color: #e5e5e5;
+	height: 1px;
+	margin: 9px 0;
+	overflow: hidden;
+	background-color: #e5e5e5;
 }
+
 .dropdown-menu > li > a {
-  display: block;
-  padding: 3px 20px;
-  clear: both;
-  font-weight: normal;
-  line-height: 1.42857143;
-  color: #333;
-  white-space: nowrap;
+	display: block;
+	padding: 3px 20px;
+	clear: both;
+	font-weight: normal;
+	line-height: 1.42857143;
+	color: #333;
+	white-space: nowrap;
 }
+
 .dropdown-menu > li > a:hover,
 .dropdown-menu > li > a:focus {
-  color: #262626;
-  text-decoration: none;
-  background-color: #f5f5f5;
+	color: #262626;
+	text-decoration: none;
+	background-color: #f5f5f5;
 }
+
 .dropdown-menu > .active > a,
 .dropdown-menu > .active > a:hover,
 .dropdown-menu > .active > a:focus {
-  color: #fff;
-  text-decoration: none;
-  background-color: #428bca;
-  outline: 0;
+	color: #fff;
+	text-decoration: none;
+	background-color: #428bca;
+	outline: 0;
 }
+
 .dropdown-menu > .disabled > a,
 .dropdown-menu > .disabled > a:hover,
 .dropdown-menu > .disabled > a:focus {
-  color: #999;
+	color: #999;
 }
+
 .dropdown-menu > .disabled > a:hover,
 .dropdown-menu > .disabled > a:focus {
-  text-decoration: none;
-  cursor: not-allowed;
-  background-color: transparent;
-  background-image: none;
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+	text-decoration: none;
+	cursor: not-allowed;
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 }
+
 .open > .dropdown-menu {
-  display: block;
+	display: block;
 }
+
 .open > a {
-  outline: 0;
+	outline: 0;
 }
+
 .dropdown-menu-right {
-  right: 0;
-  left: auto;
+	right: 0;
+	left: auto;
 }
+
 .dropdown-menu-left {
-  right: auto;
-  left: 0;
+	right: auto;
+	left: 0;
 }
+
 .dropdown-header {
-  display: block;
-  padding: 3px 20px;
-  font-size: 12px;
-  line-height: 1.42857143;
-  color: #999;
+	display: block;
+	padding: 3px 20px;
+	font-size: 12px;
+	line-height: 1.42857143;
+	color: #999;
 }
+
 .dropdown-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 990;
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	z-index: 990;
 }
+
 .pull-right > .dropdown-menu {
-  right: 0;
-  left: auto;
+	right: 0;
+	left: auto;
 }
+
 .dropup .caret,
 .navbar-fixed-bottom .dropdown .caret {
-  content: "";
-  border-top: 0;
-  border-bottom: 4px solid;
+	content: "";
+	border-top: 0;
+	border-bottom: 4px solid;
 }
+
 .dropup .dropdown-menu,
 .navbar-fixed-bottom .dropdown .dropdown-menu {
-  top: auto;
-  bottom: 100%;
-  margin-bottom: 1px;
+	top: auto;
+	bottom: 100%;
+	margin-bottom: 1px;
 }
+
 @media (min-width: 768px) {
-  .navbar-right .dropdown-menu {
-    right: 0;
-    left: auto;
-  }
-  .navbar-right .dropdown-menu-left {
-    right: auto;
-    left: 0;
-  }
+	.navbar-right .dropdown-menu {
+		right: 0;
+		left: auto;
+	}
+
+	.navbar-right .dropdown-menu-left {
+		right: auto;
+		left: 0;
+	}
 }
+
 .btn-group,
 .btn-group-vertical {
-  position: relative;
-  display: inline-block;
-  vertical-align: middle;
+	position: relative;
+	display: inline-block;
+	vertical-align: middle;
 }
+
 .btn-group > .btn,
 .btn-group-vertical > .btn {
-  position: relative;
-  float: left;
+	position: relative;
+	float: left;
 }
+
 .btn-group > .btn:hover,
 .btn-group-vertical > .btn:hover,
 .btn-group > .btn:focus,
@@ -3147,256 +3883,307 @@ input[type="button"].btn-block {
 .btn-group-vertical > .btn:active,
 .btn-group > .btn.active,
 .btn-group-vertical > .btn.active {
-  z-index: 2;
+	z-index: 2;
 }
+
 .btn-group > .btn:focus,
 .btn-group-vertical > .btn:focus {
-  outline: none;
+	outline: none;
 }
+
 .btn-group .btn + .btn,
 .btn-group .btn + .btn-group,
 .btn-group .btn-group + .btn,
 .btn-group .btn-group + .btn-group {
-  margin-left: -1px;
+	margin-left: -1px;
 }
+
 .btn-toolbar {
-  margin-left: -5px;
+	margin-left: -5px;
 }
+
 .btn-toolbar .btn-group,
 .btn-toolbar .input-group {
-  float: left;
+	float: left;
 }
+
 .btn-toolbar > .btn,
 .btn-toolbar > .btn-group,
 .btn-toolbar > .input-group {
-  margin-left: 5px;
+	margin-left: 5px;
 }
+
 .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
-  border-radius: 0;
+	border-radius: 0;
 }
+
 .btn-group > .btn:first-child {
-  margin-left: 0;
+	margin-left: 0;
 }
+
 .btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0;
 }
+
 .btn-group > .btn:last-child:not(:first-child),
 .btn-group > .dropdown-toggle:not(:first-child) {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0;
 }
+
 .btn-group > .btn-group {
-  float: left;
+	float: left;
 }
+
 .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
-  border-radius: 0;
+	border-radius: 0;
 }
+
 .btn-group > .btn-group:first-child > .btn:last-child,
 .btn-group > .btn-group:first-child > .dropdown-toggle {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0;
 }
+
 .btn-group > .btn-group:last-child > .btn:first-child {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0;
 }
+
 .btn-group .dropdown-toggle:active,
 .btn-group.open .dropdown-toggle {
-  outline: 0;
+	outline: 0;
 }
+
 .btn-group > .btn + .dropdown-toggle {
-  padding-right: 8px;
-  padding-left: 8px;
+	padding-right: 8px;
+	padding-left: 8px;
 }
+
 .btn-group > .btn-lg + .dropdown-toggle {
-  padding-right: 12px;
-  padding-left: 12px;
+	padding-right: 12px;
+	padding-left: 12px;
 }
+
 .btn-group.open .dropdown-toggle {
-  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
-          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+	-webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+	box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
 }
+
 .btn-group.open .dropdown-toggle.btn-link {
-  -webkit-box-shadow: none;
-          box-shadow: none;
+	-webkit-box-shadow: none;
+	box-shadow: none;
 }
+
 .btn .caret {
-  margin-left: 0;
+	margin-left: 0;
 }
+
 .btn-lg .caret {
-  border-width: 5px 5px 0;
-  border-bottom-width: 0;
+	border-width: 5px 5px 0;
+	border-bottom-width: 0;
 }
+
 .dropup .btn-lg .caret {
-  border-width: 0 5px 5px;
+	border-width: 0 5px 5px;
 }
+
 .btn-group-vertical > .btn,
 .btn-group-vertical > .btn-group,
 .btn-group-vertical > .btn-group > .btn {
-  display: block;
-  float: none;
-  width: 100%;
-  max-width: 100%;
+	display: block;
+	float: none;
+	width: 100%;
+	max-width: 100%;
 }
+
 .btn-group-vertical > .btn-group > .btn {
-  float: none;
+	float: none;
 }
+
 .btn-group-vertical > .btn + .btn,
 .btn-group-vertical > .btn + .btn-group,
 .btn-group-vertical > .btn-group + .btn,
 .btn-group-vertical > .btn-group + .btn-group {
-  margin-top: -1px;
-  margin-left: 0;
+	margin-top: -1px;
+	margin-left: 0;
 }
+
 .btn-group-vertical > .btn:not(:first-child):not(:last-child) {
-  border-radius: 0;
+	border-radius: 0;
 }
+
 .btn-group-vertical > .btn:first-child:not(:last-child) {
-  border-top-right-radius: 4px;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 0;
+	border-top-right-radius: 4px;
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 0;
 }
+
 .btn-group-vertical > .btn:last-child:not(:first-child) {
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
-  border-bottom-left-radius: 4px;
+	border-top-left-radius: 0;
+	border-top-right-radius: 0;
+	border-bottom-left-radius: 4px;
 }
+
 .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
-  border-radius: 0;
+	border-radius: 0;
 }
+
 .btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
 .btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 0;
 }
+
 .btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
+	border-top-left-radius: 0;
+	border-top-right-radius: 0;
 }
+
 .btn-group-justified {
-  display: table;
-  width: 100%;
-  table-layout: fixed;
-  border-collapse: separate;
+	display: table;
+	width: 100%;
+	table-layout: fixed;
+	border-collapse: separate;
 }
+
 .btn-group-justified > .btn,
 .btn-group-justified > .btn-group {
-  display: table-cell;
-  float: none;
-  width: 1%;
+	display: table-cell;
+	float: none;
+	width: 1%;
 }
+
 .btn-group-justified > .btn-group .btn {
-  width: 100%;
+	width: 100%;
 }
+
 [data-toggle="buttons"] > .btn > input[type="radio"],
 [data-toggle="buttons"] > .btn > input[type="checkbox"] {
-  display: none;
+	display: none;
 }
+
 .input-group {
-  position: relative;
-  display: table;
-  border-collapse: separate;
+	position: relative;
+	display: table;
+	border-collapse: separate;
 }
+
 .input-group[class*="col-"] {
-  float: none;
-  padding-right: 0;
-  padding-left: 0;
+	float: none;
+	padding-right: 0;
+	padding-left: 0;
 }
+
 .input-group .form-control {
-  position: relative;
-  z-index: 2;
-  float: left;
-  width: 100%;
-  margin-bottom: 0;
+	position: relative;
+	z-index: 2;
+	float: left;
+	width: 100%;
+	margin-bottom: 0;
 }
+
 .input-group-lg > .form-control,
 .input-group-lg > .input-group-addon,
 .input-group-lg > .input-group-btn > .btn {
-  height: 46px;
-  padding: 10px 16px;
-  font-size: 18px;
-  line-height: 1.33;
-  border-radius: 6px;
+	height: 46px;
+	padding: 10px 16px;
+	font-size: 18px;
+	line-height: 1.33;
+	border-radius: 6px;
 }
+
 select.input-group-lg > .form-control,
 select.input-group-lg > .input-group-addon,
 select.input-group-lg > .input-group-btn > .btn {
-  height: 46px;
-  line-height: 46px;
+	height: 46px;
+	line-height: 46px;
 }
+
 textarea.input-group-lg > .form-control,
 textarea.input-group-lg > .input-group-addon,
 textarea.input-group-lg > .input-group-btn > .btn,
 select[multiple].input-group-lg > .form-control,
 select[multiple].input-group-lg > .input-group-addon,
 select[multiple].input-group-lg > .input-group-btn > .btn {
-  height: auto;
+	height: auto;
 }
+
 .input-group-sm > .form-control,
 .input-group-sm > .input-group-addon,
 .input-group-sm > .input-group-btn > .btn {
-  height: 30px;
-  padding: 5px 10px;
-  font-size: 12px;
-  line-height: 1.5;
-  border-radius: 3px;
+	height: 30px;
+	padding: 5px 10px;
+	font-size: 12px;
+	line-height: 1.5;
+	border-radius: 3px;
 }
+
 select.input-group-sm > .form-control,
 select.input-group-sm > .input-group-addon,
 select.input-group-sm > .input-group-btn > .btn {
-  height: 30px;
-  line-height: 30px;
+	height: 30px;
+	line-height: 30px;
 }
+
 textarea.input-group-sm > .form-control,
 textarea.input-group-sm > .input-group-addon,
 textarea.input-group-sm > .input-group-btn > .btn,
 select[multiple].input-group-sm > .form-control,
 select[multiple].input-group-sm > .input-group-addon,
 select[multiple].input-group-sm > .input-group-btn > .btn {
-  height: auto;
+	height: auto;
 }
+
 .input-group-addon,
 .input-group-btn,
 .input-group .form-control {
-  display: table-cell;
+	display: table-cell;
 }
+
 .input-group-addon:not(:first-child):not(:last-child),
 .input-group-btn:not(:first-child):not(:last-child),
 .input-group .form-control:not(:first-child):not(:last-child) {
-  border-radius: 0;
+	border-radius: 0;
 }
+
 .input-group-addon,
 .input-group-btn {
-  width: 1%;
-  white-space: nowrap;
-  vertical-align: middle;
+	width: 1%;
+	white-space: nowrap;
+	vertical-align: middle;
 }
+
 .input-group-addon {
-  padding: 6px 12px;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 1;
-  color: #555;
-  text-align: center;
-  background-color: #eee;
-  border: 1px solid #ccc;
-  border-radius: 4px;
+	padding: 6px 12px;
+	font-size: 14px;
+	font-weight: normal;
+	line-height: 1;
+	color: #555;
+	text-align: center;
+	background-color: #eee;
+	border: 1px solid #ccc;
+	border-radius: 4px;
 }
+
 .input-group-addon.input-sm {
-  padding: 5px 10px;
-  font-size: 12px;
-  border-radius: 3px;
+	padding: 5px 10px;
+	font-size: 12px;
+	border-radius: 3px;
 }
+
 .input-group-addon.input-lg {
-  padding: 10px 16px;
-  font-size: 18px;
-  border-radius: 6px;
+	padding: 10px 16px;
+	font-size: 18px;
+	border-radius: 6px;
 }
+
 .input-group-addon input[type="radio"],
 .input-group-addon input[type="checkbox"] {
-  margin-top: 0;
+	margin-top: 0;
 }
+
 .input-group .form-control:first-child,
 .input-group-addon:first-child,
 .input-group-btn:first-child > .btn,
@@ -3404,12 +4191,14 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
 .input-group-btn:first-child > .dropdown-toggle,
 .input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
 .input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0;
 }
+
 .input-group-addon:first-child {
-  border-right: 0;
+	border-right: 0;
 }
+
 .input-group .form-control:last-child,
 .input-group-addon:last-child,
 .input-group-btn:last-child > .btn,
@@ -3417,1407 +4206,1704 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
 .input-group-btn:last-child > .dropdown-toggle,
 .input-group-btn:first-child > .btn:not(:first-child),
 .input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0;
 }
+
 .input-group-addon:last-child {
-  border-left: 0;
+	border-left: 0;
 }
+
 .input-group-btn {
-  position: relative;
-  font-size: 0;
-  white-space: nowrap;
+	position: relative;
+	font-size: 0;
+	white-space: nowrap;
 }
+
 .input-group-btn > .btn {
-  position: relative;
+	position: relative;
 }
+
 .input-group-btn > .btn + .btn {
-  margin-left: -1px;
+	margin-left: -1px;
 }
+
 .input-group-btn > .btn:hover,
 .input-group-btn > .btn:focus,
 .input-group-btn > .btn:active {
-  z-index: 2;
+	z-index: 2;
 }
+
 .input-group-btn:first-child > .btn,
 .input-group-btn:first-child > .btn-group {
-  margin-right: -1px;
+	margin-right: -1px;
 }
+
 .input-group-btn:last-child > .btn,
 .input-group-btn:last-child > .btn-group {
-  margin-left: -1px;
+	margin-left: -1px;
 }
+
 .nav {
-  padding-left: 0;
-  margin-bottom: 0;
-  list-style: none;
+	padding-left: 0;
+	margin-bottom: 0;
+	list-style: none;
 }
+
 .nav > li {
-  position: relative;
-  display: block;
+	position: relative;
+	display: block;
 }
+
 .nav > li > a {
-  position: relative;
-  display: block;
-  padding: 10px 15px;
+	position: relative;
+	display: block;
+	padding: 10px 15px;
 }
+
 .nav > li > a:hover,
 .nav > li > a:focus {
-  text-decoration: none;
-  background-color: #eee;
+	text-decoration: none;
+	background-color: #eee;
 }
+
 .nav > li.disabled > a {
-  color: #999;
+	color: #999;
 }
+
 .nav > li.disabled > a:hover,
 .nav > li.disabled > a:focus {
-  color: #999;
-  text-decoration: none;
-  cursor: not-allowed;
-  background-color: transparent;
+	color: #999;
+	text-decoration: none;
+	cursor: not-allowed;
+	background-color: transparent;
 }
+
 .nav .open > a,
 .nav .open > a:hover,
 .nav .open > a:focus {
-  background-color: #eee;
-  border-color: #428bca;
+	background-color: #eee;
+	border-color: #428bca;
 }
+
 .nav .nav-divider {
-  height: 1px;
-  margin: 9px 0;
-  overflow: hidden;
-  background-color: #e5e5e5;
+	height: 1px;
+	margin: 9px 0;
+	overflow: hidden;
+	background-color: #e5e5e5;
 }
+
 .nav > li > a > img {
-  max-width: none;
+	max-width: none;
 }
+
 .nav-tabs {
-  border-bottom: 1px solid #ddd;
+	border-bottom: 1px solid #ddd;
 }
+
 .nav-tabs > li {
-  float: left;
-  margin-bottom: -1px;
+	float: left;
+	margin-bottom: -1px;
 }
+
 .nav-tabs > li > a {
-  margin-right: 2px;
-  line-height: 1.42857143;
-  border: 1px solid transparent;
-  border-radius: 4px 4px 0 0;
+	margin-right: 2px;
+	line-height: 1.42857143;
+	border: 1px solid transparent;
+	border-radius: 4px 4px 0 0;
 }
+
 .nav-tabs > li > a:hover {
-  border-color: #eee #eee #ddd;
+	border-color: #eee #eee #ddd;
 }
+
 .nav-tabs > li.active > a,
 .nav-tabs > li.active > a:hover,
 .nav-tabs > li.active > a:focus {
-  color: #555;
-  cursor: default;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  border-bottom-color: transparent;
+	color: #555;
+	cursor: default;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-bottom-color: transparent;
 }
+
 .nav-tabs.nav-justified {
-  width: 100%;
-  border-bottom: 0;
+	width: 100%;
+	border-bottom: 0;
 }
+
 .nav-tabs.nav-justified > li {
-  float: none;
+	float: none;
 }
+
 .nav-tabs.nav-justified > li > a {
-  margin-bottom: 5px;
-  text-align: center;
+	margin-bottom: 5px;
+	text-align: center;
 }
+
 .nav-tabs.nav-justified > .dropdown .dropdown-menu {
-  top: auto;
-  left: auto;
+	top: auto;
+	left: auto;
 }
+
 @media (min-width: 768px) {
-  .nav-tabs.nav-justified > li {
-    display: table-cell;
-    width: 1%;
-  }
-  .nav-tabs.nav-justified > li > a {
-    margin-bottom: 0;
-  }
+	.nav-tabs.nav-justified > li {
+		display: table-cell;
+		width: 1%;
+	}
+
+	.nav-tabs.nav-justified > li > a {
+		margin-bottom: 0;
+	}
 }
+
 .nav-tabs.nav-justified > li > a {
-  margin-right: 0;
-  border-radius: 4px;
+	margin-right: 0;
+	border-radius: 4px;
 }
+
 .nav-tabs.nav-justified > .active > a,
 .nav-tabs.nav-justified > .active > a:hover,
 .nav-tabs.nav-justified > .active > a:focus {
-  border: 1px solid #ddd;
+	border: 1px solid #ddd;
 }
+
 @media (min-width: 768px) {
-  .nav-tabs.nav-justified > li > a {
-    border-bottom: 1px solid #ddd;
-    border-radius: 4px 4px 0 0;
-  }
-  .nav-tabs.nav-justified > .active > a,
-  .nav-tabs.nav-justified > .active > a:hover,
-  .nav-tabs.nav-justified > .active > a:focus {
-    border-bottom-color: #fff;
-  }
+	.nav-tabs.nav-justified > li > a {
+		border-bottom: 1px solid #ddd;
+		border-radius: 4px 4px 0 0;
+	}
+
+	.nav-tabs.nav-justified > .active > a,
+	.nav-tabs.nav-justified > .active > a:hover,
+	.nav-tabs.nav-justified > .active > a:focus {
+		border-bottom-color: #fff;
+	}
 }
+
 .nav-pills > li {
-  float: left;
+	float: left;
 }
+
 .nav-pills > li > a {
-  border-radius: 4px;
+	border-radius: 4px;
 }
+
 .nav-pills > li + li {
-  margin-left: 2px;
+	margin-left: 2px;
 }
+
 .nav-pills > li.active > a,
 .nav-pills > li.active > a:hover,
 .nav-pills > li.active > a:focus {
-  color: #fff;
-  background-color: #428bca;
+	color: #fff;
+	background-color: #428bca;
 }
+
 .nav-stacked > li {
-  float: none;
+	float: none;
 }
+
 .nav-stacked > li + li {
-  margin-top: 2px;
-  margin-left: 0;
+	margin-top: 2px;
+	margin-left: 0;
 }
+
 .nav-justified {
-  width: 100%;
+	width: 100%;
 }
+
 .nav-justified > li {
-  float: none;
+	float: none;
 }
+
 .nav-justified > li > a {
-  margin-bottom: 5px;
-  text-align: center;
+	margin-bottom: 5px;
+	text-align: center;
 }
+
 .nav-justified > .dropdown .dropdown-menu {
-  top: auto;
-  left: auto;
+	top: auto;
+	left: auto;
 }
+
 @media (min-width: 768px) {
-  .nav-justified > li {
-    display: table-cell;
-    width: 1%;
-  }
-  .nav-justified > li > a {
-    margin-bottom: 0;
-  }
+	.nav-justified > li {
+		display: table-cell;
+		width: 1%;
+	}
+
+	.nav-justified > li > a {
+		margin-bottom: 0;
+	}
 }
+
 .nav-tabs-justified {
-  border-bottom: 0;
+	border-bottom: 0;
 }
+
 .nav-tabs-justified > li > a {
-  margin-right: 0;
-  border-radius: 4px;
+	margin-right: 0;
+	border-radius: 4px;
 }
+
 .nav-tabs-justified > .active > a,
 .nav-tabs-justified > .active > a:hover,
 .nav-tabs-justified > .active > a:focus {
-  border: 1px solid #ddd;
+	border: 1px solid #ddd;
 }
+
 @media (min-width: 768px) {
-  .nav-tabs-justified > li > a {
-    border-bottom: 1px solid #ddd;
-    border-radius: 4px 4px 0 0;
-  }
-  .nav-tabs-justified > .active > a,
-  .nav-tabs-justified > .active > a:hover,
-  .nav-tabs-justified > .active > a:focus {
-    border-bottom-color: #fff;
-  }
+	.nav-tabs-justified > li > a {
+		border-bottom: 1px solid #ddd;
+		border-radius: 4px 4px 0 0;
+	}
+
+	.nav-tabs-justified > .active > a,
+	.nav-tabs-justified > .active > a:hover,
+	.nav-tabs-justified > .active > a:focus {
+		border-bottom-color: #fff;
+	}
 }
+
 .tab-content > .tab-pane {
-  display: none;
+	display: none;
 }
+
 .tab-content > .active {
-  display: block;
+	display: block;
 }
+
 .nav-tabs .dropdown-menu {
-  margin-top: -1px;
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
+	margin-top: -1px;
+	border-top-left-radius: 0;
+	border-top-right-radius: 0;
 }
+
 .navbar {
-  position: relative;
-  min-height: 50px;
-  margin-bottom: 20px;
-  border: 1px solid transparent;
+	position: relative;
+	min-height: 50px;
+	margin-bottom: 20px;
+	border: 1px solid transparent;
 }
+
 @media (min-width: 768px) {
-  .navbar {
-    border-radius: 4px;
-  }
+	.navbar {
+		border-radius: 4px;
+	}
 }
+
 @media (min-width: 768px) {
-  .navbar-header {
-    float: left;
-  }
+	.navbar-header {
+		float: left;
+	}
 }
+
 .navbar-collapse {
-  max-height: 340px;
-  padding-right: 15px;
-  padding-left: 15px;
-  overflow-x: visible;
-  -webkit-overflow-scrolling: touch;
-  border-top: 1px solid transparent;
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
+	max-height: 340px;
+	padding-right: 15px;
+	padding-left: 15px;
+	overflow-x: visible;
+	-webkit-overflow-scrolling: touch;
+	border-top: 1px solid transparent;
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
 }
+
 .navbar-collapse.in {
-  overflow-y: auto;
+	overflow-y: auto;
 }
+
 @media (min-width: 768px) {
-  .navbar-collapse {
-    width: auto;
-    border-top: 0;
-    box-shadow: none;
-  }
-  .navbar-collapse.collapse {
-    display: block !important;
-    height: auto !important;
-    padding-bottom: 0;
-    overflow: visible !important;
-  }
-  .navbar-collapse.in {
-    overflow-y: visible;
-  }
-  .navbar-fixed-top .navbar-collapse,
-  .navbar-static-top .navbar-collapse,
-  .navbar-fixed-bottom .navbar-collapse {
-    padding-right: 0;
-    padding-left: 0;
-  }
+	.navbar-collapse {
+		width: auto;
+		border-top: 0;
+		box-shadow: none;
+	}
+
+	.navbar-collapse.collapse {
+		display: block !important;
+		height: auto !important;
+		padding-bottom: 0;
+		overflow: visible !important;
+	}
+
+	.navbar-collapse.in {
+		overflow-y: visible;
+	}
+
+	.navbar-fixed-top .navbar-collapse,
+	.navbar-static-top .navbar-collapse,
+	.navbar-fixed-bottom .navbar-collapse {
+		padding-right: 0;
+		padding-left: 0;
+	}
 }
+
 .container > .navbar-header,
 .container-fluid > .navbar-header,
 .container > .navbar-collapse,
 .container-fluid > .navbar-collapse {
-  margin-right: -15px;
-  margin-left: -15px;
+	margin-right: -15px;
+	margin-left: -15px;
 }
+
 @media (min-width: 768px) {
-  .container > .navbar-header,
-  .container-fluid > .navbar-header,
-  .container > .navbar-collapse,
-  .container-fluid > .navbar-collapse {
-    margin-right: 0;
-    margin-left: 0;
-  }
+	.container > .navbar-header,
+	.container-fluid > .navbar-header,
+	.container > .navbar-collapse,
+	.container-fluid > .navbar-collapse {
+		margin-right: 0;
+		margin-left: 0;
+	}
 }
+
 .navbar-static-top {
-  z-index: 1000;
-  border-width: 0 0 1px;
+	z-index: 1000;
+	border-width: 0 0 1px;
 }
+
 @media (min-width: 768px) {
-  .navbar-static-top {
-    border-radius: 0;
-  }
+	.navbar-static-top {
+		border-radius: 0;
+	}
 }
+
 .navbar-fixed-top,
 .navbar-fixed-bottom {
-  position: fixed;
-  right: 0;
-  left: 0;
-  z-index: 1030;
+	position: fixed;
+	right: 0;
+	left: 0;
+	z-index: 1030;
 }
+
 @media (min-width: 768px) {
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    border-radius: 0;
-  }
+	.navbar-fixed-top,
+	.navbar-fixed-bottom {
+		border-radius: 0;
+	}
 }
+
 .navbar-fixed-top {
-  top: 0;
-  border-width: 0 0 1px;
+	top: 0;
+	border-width: 0 0 1px;
 }
+
 .navbar-fixed-bottom {
-  bottom: 0;
-  margin-bottom: 0;
-  border-width: 1px 0 0;
+	bottom: 0;
+	margin-bottom: 0;
+	border-width: 1px 0 0;
 }
+
 .navbar-brand {
-  float: left;
-  height: 50px;
-  padding: 15px 15px;
-  font-size: 18px;
-  line-height: 20px;
+	float: left;
+	height: 50px;
+	padding: 15px 15px;
+	font-size: 18px;
+	line-height: 20px;
 }
+
 .navbar-brand:hover,
 .navbar-brand:focus {
-  text-decoration: none;
+	text-decoration: none;
 }
+
 @media (min-width: 768px) {
-  .navbar > .container .navbar-brand,
-  .navbar > .container-fluid .navbar-brand {
-    margin-left: -15px;
-  }
+	.navbar > .container .navbar-brand,
+	.navbar > .container-fluid .navbar-brand {
+		margin-left: -15px;
+	}
 }
+
 .navbar-toggle {
-  position: relative;
-  float: right;
-  padding: 9px 10px;
-  margin-top: 8px;
-  margin-right: 15px;
-  margin-bottom: 8px;
-  background-color: transparent;
-  background-image: none;
-  border: 1px solid transparent;
-  border-radius: 4px;
+	position: relative;
+	float: right;
+	padding: 9px 10px;
+	margin-top: 8px;
+	margin-right: 15px;
+	margin-bottom: 8px;
+	background-color: transparent;
+	background-image: none;
+	border: 1px solid transparent;
+	border-radius: 4px;
 }
+
 .navbar-toggle:focus {
-  outline: none;
+	outline: none;
 }
+
 .navbar-toggle .icon-bar {
-  display: block;
-  width: 22px;
-  height: 2px;
-  border-radius: 1px;
+	display: block;
+	width: 22px;
+	height: 2px;
+	border-radius: 1px;
 }
+
 .navbar-toggle .icon-bar + .icon-bar {
-  margin-top: 4px;
+	margin-top: 4px;
 }
+
 @media (min-width: 768px) {
-  .navbar-toggle {
-    display: none;
-  }
+	.navbar-toggle {
+		display: none;
+	}
 }
+
 .navbar-nav {
-  margin: 7.5px -15px;
+	margin: 7.5px -15px;
 }
+
 .navbar-nav > li > a {
-  padding-top: 10px;
-  padding-bottom: 10px;
-  line-height: 20px;
+	padding-top: 10px;
+	padding-bottom: 10px;
+	line-height: 20px;
 }
+
 @media (max-width: 767px) {
-  .navbar-nav .open .dropdown-menu {
-    position: static;
-    float: none;
-    width: auto;
-    margin-top: 0;
-    background-color: transparent;
-    border: 0;
-    box-shadow: none;
-  }
-  .navbar-nav .open .dropdown-menu > li > a,
-  .navbar-nav .open .dropdown-menu .dropdown-header {
-    padding: 5px 15px 5px 25px;
-  }
-  .navbar-nav .open .dropdown-menu > li > a {
-    line-height: 20px;
-  }
-  .navbar-nav .open .dropdown-menu > li > a:hover,
-  .navbar-nav .open .dropdown-menu > li > a:focus {
-    background-image: none;
-  }
+	.navbar-nav .open .dropdown-menu {
+		position: static;
+		float: none;
+		width: auto;
+		margin-top: 0;
+		background-color: transparent;
+		border: 0;
+		box-shadow: none;
+	}
+
+	.navbar-nav .open .dropdown-menu > li > a,
+	.navbar-nav .open .dropdown-menu .dropdown-header {
+		padding: 5px 15px 5px 25px;
+	}
+
+	.navbar-nav .open .dropdown-menu > li > a {
+		line-height: 20px;
+	}
+
+	.navbar-nav .open .dropdown-menu > li > a:hover,
+	.navbar-nav .open .dropdown-menu > li > a:focus {
+		background-image: none;
+	}
 }
+
 @media (min-width: 768px) {
-  .navbar-nav {
-    float: left;
-    margin: 0;
-  }
-  .navbar-nav > li {
-    float: left;
-  }
-  .navbar-nav > li > a {
-    padding-top: 15px;
-    padding-bottom: 15px;
-  }
-  .navbar-nav.navbar-right:last-child {
-    margin-right: -15px;
-  }
+	.navbar-nav {
+		float: left;
+		margin: 0;
+	}
+
+	.navbar-nav > li {
+		float: left;
+	}
+
+	.navbar-nav > li > a {
+		padding-top: 15px;
+		padding-bottom: 15px;
+	}
+
+	.navbar-nav.navbar-right:last-child {
+		margin-right: -15px;
+	}
 }
+
 @media (min-width: 768px) {
-  .navbar-left {
-    float: left !important;
-  }
-  .navbar-right {
-    float: right !important;
-  }
+	.navbar-left {
+		float: left !important;
+	}
+
+	.navbar-right {
+		float: right !important;
+	}
 }
+
 .navbar-form {
-  padding: 10px 15px;
-  margin-top: 8px;
-  margin-right: -15px;
-  margin-bottom: 8px;
-  margin-left: -15px;
-  border-top: 1px solid transparent;
-  border-bottom: 1px solid transparent;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
+	padding: 10px 15px;
+	margin-top: 8px;
+	margin-right: -15px;
+	margin-bottom: 8px;
+	margin-left: -15px;
+	border-top: 1px solid transparent;
+	border-bottom: 1px solid transparent;
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
 }
+
 @media (min-width: 768px) {
-  .navbar-form .form-group {
-    display: inline-block;
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  .navbar-form .form-control {
-    display: inline-block;
-    width: auto;
-    vertical-align: middle;
-  }
-  .navbar-form .input-group > .form-control {
-    width: 100%;
-  }
-  .navbar-form .control-label {
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  .navbar-form .radio,
-  .navbar-form .checkbox {
-    display: inline-block;
-    padding-left: 0;
-    margin-top: 0;
-    margin-bottom: 0;
-    vertical-align: middle;
-  }
-  .navbar-form .radio input[type="radio"],
-  .navbar-form .checkbox input[type="checkbox"] {
-    float: none;
-    margin-left: 0;
-  }
-  .navbar-form .has-feedback .form-control-feedback {
-    top: 0;
-  }
+	.navbar-form .form-group {
+		display: inline-block;
+		margin-bottom: 0;
+		vertical-align: middle;
+	}
+
+	.navbar-form .form-control {
+		display: inline-block;
+		width: auto;
+		vertical-align: middle;
+	}
+
+	.navbar-form .input-group > .form-control {
+		width: 100%;
+	}
+
+	.navbar-form .control-label {
+		margin-bottom: 0;
+		vertical-align: middle;
+	}
+
+	.navbar-form .radio,
+	.navbar-form .checkbox {
+		display: inline-block;
+		padding-left: 0;
+		margin-top: 0;
+		margin-bottom: 0;
+		vertical-align: middle;
+	}
+
+	.navbar-form .radio input[type="radio"],
+	.navbar-form .checkbox input[type="checkbox"] {
+		float: none;
+		margin-left: 0;
+	}
+
+	.navbar-form .has-feedback .form-control-feedback {
+		top: 0;
+	}
 }
+
 @media (max-width: 767px) {
-  .navbar-form .form-group {
-    margin-bottom: 5px;
-  }
+	.navbar-form .form-group {
+		margin-bottom: 5px;
+	}
 }
+
 @media (min-width: 768px) {
-  .navbar-form {
-    width: auto;
-    padding-top: 0;
-    padding-bottom: 0;
-    margin-right: 0;
-    margin-left: 0;
-    border: 0;
-    -webkit-box-shadow: none;
-            box-shadow: none;
-  }
-  .navbar-form.navbar-right:last-child {
-    margin-right: -15px;
-  }
+	.navbar-form {
+		width: auto;
+		padding-top: 0;
+		padding-bottom: 0;
+		margin-right: 0;
+		margin-left: 0;
+		border: 0;
+		-webkit-box-shadow: none;
+		box-shadow: none;
+	}
+
+	.navbar-form.navbar-right:last-child {
+		margin-right: -15px;
+	}
 }
+
 .navbar-nav > li > .dropdown-menu {
-  margin-top: 0;
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
+	margin-top: 0;
+	border-top-left-radius: 0;
+	border-top-right-radius: 0;
 }
+
 .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 0;
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 0;
 }
+
 .navbar-btn {
-  margin-top: 8px;
-  margin-bottom: 8px;
+	margin-top: 8px;
+	margin-bottom: 8px;
 }
+
 .navbar-btn.btn-sm {
-  margin-top: 10px;
-  margin-bottom: 10px;
+	margin-top: 10px;
+	margin-bottom: 10px;
 }
+
 .navbar-btn.btn-xs {
-  margin-top: 14px;
-  margin-bottom: 14px;
+	margin-top: 14px;
+	margin-bottom: 14px;
 }
+
 .navbar-text {
-  margin-top: 15px;
-  margin-bottom: 15px;
+	margin-top: 15px;
+	margin-bottom: 15px;
 }
+
 @media (min-width: 768px) {
-  .navbar-text {
-    float: left;
-    margin-right: 15px;
-    margin-left: 15px;
-  }
-  .navbar-text.navbar-right:last-child {
-    margin-right: 0;
-  }
+	.navbar-text {
+		float: left;
+		margin-right: 15px;
+		margin-left: 15px;
+	}
+
+	.navbar-text.navbar-right:last-child {
+		margin-right: 0;
+	}
 }
+
 .navbar-default {
-  background-color: #f8f8f8;
-  border-color: #e7e7e7;
+	background-color: #f8f8f8;
+	border-color: #e7e7e7;
 }
+
 .navbar-default .navbar-brand {
-  color: #777;
+	color: #777;
 }
+
 .navbar-default .navbar-brand:hover,
 .navbar-default .navbar-brand:focus {
-  color: #5e5e5e;
-  background-color: transparent;
+	color: #5e5e5e;
+	background-color: transparent;
 }
+
 .navbar-default .navbar-text {
-  color: #777;
+	color: #777;
 }
+
 .navbar-default .navbar-nav > li > a {
-  color: #777;
+	color: #777;
 }
+
 .navbar-default .navbar-nav > li > a:hover,
 .navbar-default .navbar-nav > li > a:focus {
-  color: #333;
-  background-color: transparent;
+	color: #333;
+	background-color: transparent;
 }
+
 .navbar-default .navbar-nav > .active > a,
 .navbar-default .navbar-nav > .active > a:hover,
 .navbar-default .navbar-nav > .active > a:focus {
-  color: #555;
-  background-color: #e7e7e7;
+	color: #555;
+	background-color: #e7e7e7;
 }
+
 .navbar-default .navbar-nav > .disabled > a,
 .navbar-default .navbar-nav > .disabled > a:hover,
 .navbar-default .navbar-nav > .disabled > a:focus {
-  color: #ccc;
-  background-color: transparent;
+	color: #ccc;
+	background-color: transparent;
 }
+
 .navbar-default .navbar-toggle {
-  border-color: #ddd;
+	border-color: #ddd;
 }
+
 .navbar-default .navbar-toggle:hover,
 .navbar-default .navbar-toggle:focus {
-  background-color: #ddd;
+	background-color: #ddd;
 }
+
 .navbar-default .navbar-toggle .icon-bar {
-  background-color: #888;
+	background-color: #888;
 }
+
 .navbar-default .navbar-collapse,
 .navbar-default .navbar-form {
-  border-color: #e7e7e7;
+	border-color: #e7e7e7;
 }
+
 .navbar-default .navbar-nav > .open > a,
 .navbar-default .navbar-nav > .open > a:hover,
 .navbar-default .navbar-nav > .open > a:focus {
-  color: #555;
-  background-color: #e7e7e7;
+	color: #555;
+	background-color: #e7e7e7;
 }
+
 @media (max-width: 767px) {
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
-    color: #777;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover,
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
-    color: #333;
-    background-color: transparent;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > .active > a,
-  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover,
-  .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #555;
-    background-color: #e7e7e7;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a,
-  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover,
-  .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus {
-    color: #ccc;
-    background-color: transparent;
-  }
+	.navbar-default .navbar-nav .open .dropdown-menu > li > a {
+		color: #777;
+	}
+
+	.navbar-default .navbar-nav .open .dropdown-menu > li > a:hover,
+	.navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
+		color: #333;
+		background-color: transparent;
+	}
+
+	.navbar-default .navbar-nav .open .dropdown-menu > .active > a,
+	.navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover,
+	.navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
+		color: #555;
+		background-color: #e7e7e7;
+	}
+
+	.navbar-default .navbar-nav .open .dropdown-menu > .disabled > a,
+	.navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover,
+	.navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus {
+		color: #ccc;
+		background-color: transparent;
+	}
 }
+
 .navbar-default .navbar-link {
-  color: #777;
+	color: #777;
 }
+
 .navbar-default .navbar-link:hover {
-  color: #333;
+	color: #333;
 }
+
 .navbar-inverse {
-  background-color: #222;
-  border-color: #080808;
+	background-color: #222;
+	border-color: #080808;
 }
+
 .navbar-inverse .navbar-brand {
-  color: #999;
+	color: #999;
 }
+
 .navbar-inverse .navbar-brand:hover,
 .navbar-inverse .navbar-brand:focus {
-  color: #fff;
-  background-color: transparent;
+	color: #fff;
+	background-color: transparent;
 }
+
 .navbar-inverse .navbar-text {
-  color: #999;
+	color: #999;
 }
+
 .navbar-inverse .navbar-nav > li > a {
-  color: #999;
+	color: #999;
 }
+
 .navbar-inverse .navbar-nav > li > a:hover,
 .navbar-inverse .navbar-nav > li > a:focus {
-  color: #fff;
-  background-color: transparent;
+	color: #fff;
+	background-color: transparent;
 }
+
 .navbar-inverse .navbar-nav > .active > a,
 .navbar-inverse .navbar-nav > .active > a:hover,
 .navbar-inverse .navbar-nav > .active > a:focus {
-  color: #fff;
-  background-color: #080808;
+	color: #fff;
+	background-color: #080808;
 }
+
 .navbar-inverse .navbar-nav > .disabled > a,
 .navbar-inverse .navbar-nav > .disabled > a:hover,
 .navbar-inverse .navbar-nav > .disabled > a:focus {
-  color: #444;
-  background-color: transparent;
+	color: #444;
+	background-color: transparent;
 }
+
 .navbar-inverse .navbar-toggle {
-  border-color: #333;
+	border-color: #333;
 }
+
 .navbar-inverse .navbar-toggle:hover,
 .navbar-inverse .navbar-toggle:focus {
-  background-color: #333;
+	background-color: #333;
 }
+
 .navbar-inverse .navbar-toggle .icon-bar {
-  background-color: #fff;
+	background-color: #fff;
 }
+
 .navbar-inverse .navbar-collapse,
 .navbar-inverse .navbar-form {
-  border-color: #101010;
+	border-color: #101010;
 }
+
 .navbar-inverse .navbar-nav > .open > a,
 .navbar-inverse .navbar-nav > .open > a:hover,
 .navbar-inverse .navbar-nav > .open > a:focus {
-  color: #fff;
-  background-color: #080808;
+	color: #fff;
+	background-color: #080808;
 }
+
 @media (max-width: 767px) {
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
-    border-color: #080808;
-  }
-  .navbar-inverse .navbar-nav .open .dropdown-menu .divider {
-    background-color: #080808;
-  }
-  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
-    color: #999;
-  }
-  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,
-  .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
-    color: #fff;
-    background-color: transparent;
-  }
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a,
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover,
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #fff;
-    background-color: #080808;
-  }
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a,
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover,
-  .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus {
-    color: #444;
-    background-color: transparent;
-  }
+	.navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
+		border-color: #080808;
+	}
+
+	.navbar-inverse .navbar-nav .open .dropdown-menu .divider {
+		background-color: #080808;
+	}
+
+	.navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
+		color: #999;
+	}
+
+	.navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,
+	.navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
+		color: #fff;
+		background-color: transparent;
+	}
+
+	.navbar-inverse .navbar-nav .open .dropdown-menu > .active > a,
+	.navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover,
+	.navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus {
+		color: #fff;
+		background-color: #080808;
+	}
+
+	.navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a,
+	.navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover,
+	.navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus {
+		color: #444;
+		background-color: transparent;
+	}
 }
+
 .navbar-inverse .navbar-link {
-  color: #999;
+	color: #999;
 }
+
 .navbar-inverse .navbar-link:hover {
-  color: #fff;
+	color: #fff;
 }
+
 .breadcrumb {
-  padding: 8px 15px;
-  margin-bottom: 20px;
-  list-style: none;
-  background-color: #f5f5f5;
-  border-radius: 4px;
+	padding: 8px 15px;
+	margin-bottom: 20px;
+	list-style: none;
+	background-color: #f5f5f5;
+	border-radius: 4px;
 }
+
 .breadcrumb > li {
-  display: inline-block;
+	display: inline-block;
 }
+
 .breadcrumb > li + li:before {
-  padding: 0 5px;
-  color: #ccc;
-  content: "/\00a0";
+	padding: 0 5px;
+	color: #ccc;
+	content: "/\00a0";
 }
+
 .breadcrumb > .active {
-  color: #999;
+	color: #999;
 }
+
 .pagination {
-  display: inline-block;
-  padding-left: 0;
-  margin: 20px 0;
-  border-radius: 4px;
+	display: inline-block;
+	padding-left: 0;
+	margin: 20px 0;
+	border-radius: 4px;
 }
+
 .pagination > li {
-  display: inline;
+	display: inline;
 }
+
 .pagination > li > a,
 .pagination > li > span {
-  position: relative;
-  float: left;
-  padding: 6px 12px;
-  margin-left: -1px;
-  line-height: 1.42857143;
-  color: #428bca;
-  text-decoration: none;
-  background-color: #fff;
-  border: 1px solid #ddd;
+	position: relative;
+	float: left;
+	padding: 6px 12px;
+	margin-left: -1px;
+	line-height: 1.42857143;
+	color: #428bca;
+	text-decoration: none;
+	background-color: #fff;
+	border: 1px solid #ddd;
 }
+
 .pagination > li:first-child > a,
 .pagination > li:first-child > span {
-  margin-left: 0;
-  border-top-left-radius: 4px;
-  border-bottom-left-radius: 4px;
+	margin-left: 0;
+	border-top-left-radius: 4px;
+	border-bottom-left-radius: 4px;
 }
+
 .pagination > li:last-child > a,
 .pagination > li:last-child > span {
-  border-top-right-radius: 4px;
-  border-bottom-right-radius: 4px;
+	border-top-right-radius: 4px;
+	border-bottom-right-radius: 4px;
 }
+
 .pagination > li > a:hover,
 .pagination > li > span:hover,
 .pagination > li > a:focus,
 .pagination > li > span:focus {
-  color: #2a6496;
-  background-color: #eee;
-  border-color: #ddd;
+	color: #2a6496;
+	background-color: #eee;
+	border-color: #ddd;
 }
+
 .pagination > .active > a,
 .pagination > .active > span,
 .pagination > .active > a:hover,
 .pagination > .active > span:hover,
 .pagination > .active > a:focus,
 .pagination > .active > span:focus {
-  z-index: 2;
-  color: #fff;
-  cursor: default;
-  background-color: #428bca;
-  border-color: #428bca;
+	z-index: 2;
+	color: #fff;
+	cursor: default;
+	background-color: #428bca;
+	border-color: #428bca;
 }
+
 .pagination > .disabled > span,
 .pagination > .disabled > span:hover,
 .pagination > .disabled > span:focus,
 .pagination > .disabled > a,
 .pagination > .disabled > a:hover,
 .pagination > .disabled > a:focus {
-  color: #999;
-  cursor: not-allowed;
-  background-color: #fff;
-  border-color: #ddd;
+	color: #999;
+	cursor: not-allowed;
+	background-color: #fff;
+	border-color: #ddd;
 }
+
 .pagination-lg > li > a,
 .pagination-lg > li > span {
-  padding: 10px 16px;
-  font-size: 18px;
+	padding: 10px 16px;
+	font-size: 18px;
 }
+
 .pagination-lg > li:first-child > a,
 .pagination-lg > li:first-child > span {
-  border-top-left-radius: 6px;
-  border-bottom-left-radius: 6px;
+	border-top-left-radius: 6px;
+	border-bottom-left-radius: 6px;
 }
+
 .pagination-lg > li:last-child > a,
 .pagination-lg > li:last-child > span {
-  border-top-right-radius: 6px;
-  border-bottom-right-radius: 6px;
+	border-top-right-radius: 6px;
+	border-bottom-right-radius: 6px;
 }
+
 .pagination-sm > li > a,
 .pagination-sm > li > span {
-  padding: 5px 10px;
-  font-size: 12px;
+	padding: 5px 10px;
+	font-size: 12px;
 }
+
 .pagination-sm > li:first-child > a,
 .pagination-sm > li:first-child > span {
-  border-top-left-radius: 3px;
-  border-bottom-left-radius: 3px;
+	border-top-left-radius: 3px;
+	border-bottom-left-radius: 3px;
 }
+
 .pagination-sm > li:last-child > a,
 .pagination-sm > li:last-child > span {
-  border-top-right-radius: 3px;
-  border-bottom-right-radius: 3px;
+	border-top-right-radius: 3px;
+	border-bottom-right-radius: 3px;
 }
+
 .pager {
-  padding-left: 0;
-  margin: 20px 0;
-  text-align: center;
-  list-style: none;
+	padding-left: 0;
+	margin: 20px 0;
+	text-align: center;
+	list-style: none;
 }
+
 .pager li {
-  display: inline;
+	display: inline;
 }
+
 .pager li > a,
 .pager li > span {
-  display: inline-block;
-  padding: 5px 14px;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  border-radius: 15px;
+	display: inline-block;
+	padding: 5px 14px;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-radius: 15px;
 }
+
 .pager li > a:hover,
 .pager li > a:focus {
-  text-decoration: none;
-  background-color: #eee;
+	text-decoration: none;
+	background-color: #eee;
 }
+
 .pager .next > a,
 .pager .next > span {
-  float: right;
+	float: right;
 }
+
 .pager .previous > a,
 .pager .previous > span {
-  float: left;
+	float: left;
 }
+
 .pager .disabled > a,
 .pager .disabled > a:hover,
 .pager .disabled > a:focus,
 .pager .disabled > span {
-  color: #999;
-  cursor: not-allowed;
-  background-color: #fff;
+	color: #999;
+	cursor: not-allowed;
+	background-color: #fff;
 }
+
 .label {
-  display: inline;
-  padding: .2em .6em .3em;
-  font-size: 75%;
-  font-weight: bold;
-  line-height: 1;
-  color: #fff;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: baseline;
-  border-radius: .25em;
+	display: inline;
+	padding: .2em .6em .3em;
+	font-size: 75%;
+	font-weight: bold;
+	line-height: 1;
+	color: #fff;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: baseline;
+	border-radius: .25em;
 }
+
 .label[href]:hover,
 .label[href]:focus {
-  color: #fff;
-  text-decoration: none;
-  cursor: pointer;
+	color: #fff;
+	text-decoration: none;
+	cursor: pointer;
 }
+
 .label:empty {
-  display: none;
+	display: none;
 }
+
 .btn .label {
-  position: relative;
-  top: -1px;
+	position: relative;
+	top: -1px;
 }
+
 .label-default {
-  background-color: #999;
+	background-color: #999;
 }
+
 .label-default[href]:hover,
 .label-default[href]:focus {
-  background-color: #808080;
+	background-color: #808080;
 }
+
 .label-primary {
-  background-color: #428bca;
+	background-color: #428bca;
 }
+
 .label-primary[href]:hover,
 .label-primary[href]:focus {
-  background-color: #3071a9;
+	background-color: #3071a9;
 }
+
 .label-success {
-  background-color: #5cb85c;
+	background-color: #5cb85c;
 }
+
 .label-success[href]:hover,
 .label-success[href]:focus {
-  background-color: #449d44;
+	background-color: #449d44;
 }
+
 .label-info {
-  background-color: #5bc0de;
+	background-color: #5bc0de;
 }
+
 .label-info[href]:hover,
 .label-info[href]:focus {
-  background-color: #31b0d5;
+	background-color: #31b0d5;
 }
+
 .label-warning {
-  background-color: #f0ad4e;
+	background-color: #f0ad4e;
 }
+
 .label-warning[href]:hover,
 .label-warning[href]:focus {
-  background-color: #ec971f;
+	background-color: #ec971f;
 }
+
 .label-danger {
-  background-color: #d9534f;
+	background-color: #d9534f;
 }
+
 .label-danger[href]:hover,
 .label-danger[href]:focus {
-  background-color: #c9302c;
+	background-color: #c9302c;
 }
+
 .badge {
-  display: inline-block;
-  min-width: 10px;
-  padding: 3px 7px;
-  font-size: 12px;
-  font-weight: bold;
-  line-height: 1;
-  color: #fff;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: baseline;
-  background-color: #999;
-  border-radius: 10px;
+	display: inline-block;
+	min-width: 10px;
+	padding: 3px 7px;
+	font-size: 12px;
+	font-weight: bold;
+	line-height: 1;
+	color: #fff;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: baseline;
+	background-color: #999;
+	border-radius: 10px;
 }
+
 .badge:empty {
-  display: none;
+	display: none;
 }
+
 .btn .badge {
-  position: relative;
-  top: -1px;
+	position: relative;
+	top: -1px;
 }
+
 .btn-xs .badge {
-  top: 0;
-  padding: 1px 5px;
+	top: 0;
+	padding: 1px 5px;
 }
+
 a.badge:hover,
 a.badge:focus {
-  color: #fff;
-  text-decoration: none;
-  cursor: pointer;
+	color: #fff;
+	text-decoration: none;
+	cursor: pointer;
 }
+
 a.list-group-item.active > .badge,
 .nav-pills > .active > a > .badge {
-  color: #428bca;
-  background-color: #fff;
+	color: #428bca;
+	background-color: #fff;
 }
+
 .nav-pills > li > a > .badge {
-  margin-left: 3px;
+	margin-left: 3px;
 }
+
 .jumbotron {
-  padding: 30px;
-  margin-bottom: 30px;
-  color: inherit;
-  background-color: #eee;
+	padding: 30px;
+	margin-bottom: 30px;
+	color: inherit;
+	background-color: #eee;
 }
+
 .jumbotron h1,
 .jumbotron .h1 {
-  color: inherit;
+	color: inherit;
 }
+
 .jumbotron p {
-  margin-bottom: 15px;
-  font-size: 21px;
-  font-weight: 200;
+	margin-bottom: 15px;
+	font-size: 21px;
+	font-weight: 200;
 }
+
 .container .jumbotron {
-  border-radius: 6px;
+	border-radius: 6px;
 }
+
 .jumbotron .container {
-  max-width: 100%;
+	max-width: 100%;
 }
+
 @media screen and (min-width: 768px) {
-  .jumbotron {
-    padding-top: 48px;
-    padding-bottom: 48px;
-  }
-  .container .jumbotron {
-    padding-right: 60px;
-    padding-left: 60px;
-  }
-  .jumbotron h1,
-  .jumbotron .h1 {
-    font-size: 63px;
-  }
+	.jumbotron {
+		padding-top: 48px;
+		padding-bottom: 48px;
+	}
+
+	.container .jumbotron {
+		padding-right: 60px;
+		padding-left: 60px;
+	}
+
+	.jumbotron h1,
+	.jumbotron .h1 {
+		font-size: 63px;
+	}
 }
+
 .thumbnail {
-  display: block;
-  padding: 4px;
-  margin-bottom: 20px;
-  line-height: 1.42857143;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  border-radius: 4px;
-  -webkit-transition: all .2s ease-in-out;
-          transition: all .2s ease-in-out;
+	display: block;
+	padding: 4px;
+	margin-bottom: 20px;
+	line-height: 1.42857143;
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-radius: 4px;
+	-webkit-transition: all .2s ease-in-out;
+	transition: all .2s ease-in-out;
 }
+
 .thumbnail > img,
 .thumbnail a > img {
-  margin-right: auto;
-  margin-left: auto;
+	margin-right: auto;
+	margin-left: auto;
 }
+
 a.thumbnail:hover,
 a.thumbnail:focus,
 a.thumbnail.active {
-  border-color: #428bca;
+	border-color: #428bca;
 }
+
 .thumbnail .caption {
-  padding: 9px;
-  color: #333;
+	padding: 9px;
+	color: #333;
 }
+
 .alert {
-  padding: 15px;
-  margin-bottom: 20px;
-  border: 1px solid transparent;
-  border-radius: 4px;
+	padding: 15px;
+	margin-bottom: 20px;
+	border: 1px solid transparent;
+	border-radius: 4px;
 }
+
 .alert h4 {
-  margin-top: 0;
-  color: inherit;
+	margin-top: 0;
+	color: inherit;
 }
+
 .alert .alert-link {
-  font-weight: bold;
+	font-weight: bold;
 }
+
 .alert > p,
 .alert > ul {
-  margin-bottom: 0;
+	margin-bottom: 0;
 }
+
 .alert > p + p {
-  margin-top: 5px;
+	margin-top: 5px;
 }
+
 .alert-dismissable {
-  padding-right: 35px;
+	padding-right: 35px;
 }
+
 .alert-dismissable .close {
-  position: relative;
-  top: -2px;
-  right: -21px;
-  color: inherit;
+	position: relative;
+	top: -2px;
+	right: -21px;
+	color: inherit;
 }
+
 .alert-success {
-  color: #3c763d;
-  background-color: #dff0d8;
-  border-color: #d6e9c6;
+	color: #3c763d;
+	background-color: #dff0d8;
+	border-color: #d6e9c6;
 }
+
 .alert-success hr {
-  border-top-color: #c9e2b3;
+	border-top-color: #c9e2b3;
 }
+
 .alert-success .alert-link {
-  color: #2b542c;
+	color: #2b542c;
 }
+
 .alert-info {
-  color: #31708f;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
+	color: #31708f;
+	background-color: #d9edf7;
+	border-color: #bce8f1;
 }
+
 .alert-info hr {
-  border-top-color: #a6e1ec;
+	border-top-color: #a6e1ec;
 }
+
 .alert-info .alert-link {
-  color: #245269;
+	color: #245269;
 }
+
 .alert-warning {
-  color: #8a6d3b;
-  background-color: #fcf8e3;
-  border-color: #faebcc;
+	color: #8a6d3b;
+	background-color: #fcf8e3;
+	border-color: #faebcc;
 }
+
 .alert-warning hr {
-  border-top-color: #f7e1b5;
+	border-top-color: #f7e1b5;
 }
+
 .alert-warning .alert-link {
-  color: #66512c;
+	color: #66512c;
 }
+
 .alert-danger {
-  color: #a94442;
-  background-color: #f2dede;
-  border-color: #ebccd1;
+	color: #a94442;
+	background-color: #f2dede;
+	border-color: #ebccd1;
 }
+
 .alert-danger hr {
-  border-top-color: #e4b9c0;
+	border-top-color: #e4b9c0;
 }
+
 .alert-danger .alert-link {
-  color: #843534;
+	color: #843534;
 }
+
 @-webkit-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
+	from {
+		background-position: 40px 0;
+	}
+	to {
+		background-position: 0 0;
+	}
 }
+
 @keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
+	from {
+		background-position: 40px 0;
+	}
+	to {
+		background-position: 0 0;
+	}
 }
+
 .progress {
-  height: 20px;
-  margin-bottom: 20px;
-  overflow: hidden;
-  background-color: #f5f5f5;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);
+	height: 20px;
+	margin-bottom: 20px;
+	overflow: hidden;
+	background-color: #f5f5f5;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);
+	box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);
 }
+
 .progress-bar {
-  float: left;
-  width: 0;
-  height: 100%;
-  font-size: 12px;
-  line-height: 20px;
-  color: #fff;
-  text-align: center;
-  background-color: #428bca;
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
-          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
-  -webkit-transition: width .6s ease;
-          transition: width .6s ease;
+	float: left;
+	width: 0;
+	height: 100%;
+	font-size: 12px;
+	line-height: 20px;
+	color: #fff;
+	text-align: center;
+	background-color: #428bca;
+	-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
+	box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
+	-webkit-transition: width .6s ease;
+	transition: width .6s ease;
 }
+
 .progress-striped .progress-bar {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-size: 40px 40px;
+	background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-size: 40px 40px;
 }
+
 .progress.active .progress-bar {
-  -webkit-animation: progress-bar-stripes 2s linear infinite;
-          animation: progress-bar-stripes 2s linear infinite;
+	-webkit-animation: progress-bar-stripes 2s linear infinite;
+	animation: progress-bar-stripes 2s linear infinite;
 }
+
 .progress-bar-success {
-  background-color: #5cb85c;
+	background-color: #5cb85c;
 }
+
 .progress-striped .progress-bar-success {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
 }
+
 .progress-bar-info {
-  background-color: #5bc0de;
+	background-color: #5bc0de;
 }
+
 .progress-striped .progress-bar-info {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
 }
+
 .progress-bar-warning {
-  background-color: #f0ad4e;
+	background-color: #f0ad4e;
 }
+
 .progress-striped .progress-bar-warning {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
 }
+
 .progress-bar-danger {
-  background-color: #d9534f;
+	background-color: #d9534f;
 }
+
 .progress-striped .progress-bar-danger {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
-  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+	background-image: linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
 }
+
 .media,
 .media-body {
-  overflow: hidden;
-  zoom: 1;
+	overflow: hidden;
+	zoom: 1;
 }
+
 .media,
 .media .media {
-  margin-top: 15px;
+	margin-top: 15px;
 }
+
 .media:first-child {
-  margin-top: 0;
+	margin-top: 0;
 }
+
 .media-object {
-  display: block;
+	display: block;
 }
+
 .media-heading {
-  margin: 0 0 5px;
+	margin: 0 0 5px;
 }
+
 .media > .pull-left {
-  margin-right: 10px;
+	margin-right: 10px;
 }
+
 .media > .pull-right {
-  margin-left: 10px;
+	margin-left: 10px;
 }
+
 .media-list {
-  padding-left: 0;
-  list-style: none;
+	padding-left: 0;
+	list-style: none;
 }
+
 .list-group {
-  padding-left: 0;
-  margin-bottom: 20px;
+	padding-left: 0;
+	margin-bottom: 20px;
 }
+
 .list-group-item {
-  position: relative;
-  display: block;
-  padding: 10px 15px;
-  margin-bottom: -1px;
-  background-color: #fff;
-  border: 1px solid #ddd;
+	position: relative;
+	display: block;
+	padding: 10px 15px;
+	margin-bottom: -1px;
+	background-color: #fff;
+	border: 1px solid #ddd;
 }
+
 .list-group-item:first-child {
-  border-top-left-radius: 4px;
-  border-top-right-radius: 4px;
+	border-top-left-radius: 4px;
+	border-top-right-radius: 4px;
 }
+
 .list-group-item:last-child {
-  margin-bottom: 0;
-  border-bottom-right-radius: 4px;
-  border-bottom-left-radius: 4px;
+	margin-bottom: 0;
+	border-bottom-right-radius: 4px;
+	border-bottom-left-radius: 4px;
 }
+
 .list-group-item > .badge {
-  float: right;
+	float: right;
 }
+
 .list-group-item > .badge + .badge {
-  margin-right: 5px;
+	margin-right: 5px;
 }
+
 a.list-group-item {
-  color: #555;
+	color: #555;
 }
+
 a.list-group-item .list-group-item-heading {
-  color: #333;
+	color: #333;
 }
+
 a.list-group-item:hover,
 a.list-group-item:focus {
-  text-decoration: none;
-  background-color: #f5f5f5;
+	text-decoration: none;
+	background-color: #f5f5f5;
 }
+
 a.list-group-item.active,
 a.list-group-item.active:hover,
 a.list-group-item.active:focus {
-  z-index: 2;
-  color: #fff;
-  background-color: #428bca;
-  border-color: #428bca;
+	z-index: 2;
+	color: #fff;
+	background-color: #428bca;
+	border-color: #428bca;
 }
+
 a.list-group-item.active .list-group-item-heading,
 a.list-group-item.active:hover .list-group-item-heading,
 a.list-group-item.active:focus .list-group-item-heading {
-  color: inherit;
+	color: inherit;
 }
+
 a.list-group-item.active .list-group-item-text,
 a.list-group-item.active:hover .list-group-item-text,
 a.list-group-item.active:focus .list-group-item-text {
-  color: #e1edf7;
+	color: #e1edf7;
 }
+
 .list-group-item-success {
-  color: #3c763d;
-  background-color: #dff0d8;
+	color: #3c763d;
+	background-color: #dff0d8;
 }
+
 a.list-group-item-success {
-  color: #3c763d;
+	color: #3c763d;
 }
+
 a.list-group-item-success .list-group-item-heading {
-  color: inherit;
+	color: inherit;
 }
+
 a.list-group-item-success:hover,
 a.list-group-item-success:focus {
-  color: #3c763d;
-  background-color: #d0e9c6;
+	color: #3c763d;
+	background-color: #d0e9c6;
 }
+
 a.list-group-item-success.active,
 a.list-group-item-success.active:hover,
 a.list-group-item-success.active:focus {
-  color: #fff;
-  background-color: #3c763d;
-  border-color: #3c763d;
+	color: #fff;
+	background-color: #3c763d;
+	border-color: #3c763d;
 }
+
 .list-group-item-info {
-  color: #31708f;
-  background-color: #d9edf7;
+	color: #31708f;
+	background-color: #d9edf7;
 }
+
 a.list-group-item-info {
-  color: #31708f;
+	color: #31708f;
 }
+
 a.list-group-item-info .list-group-item-heading {
-  color: inherit;
+	color: inherit;
 }
+
 a.list-group-item-info:hover,
 a.list-group-item-info:focus {
-  color: #31708f;
-  background-color: #c4e3f3;
+	color: #31708f;
+	background-color: #c4e3f3;
 }
+
 a.list-group-item-info.active,
 a.list-group-item-info.active:hover,
 a.list-group-item-info.active:focus {
-  color: #fff;
-  background-color: #31708f;
-  border-color: #31708f;
+	color: #fff;
+	background-color: #31708f;
+	border-color: #31708f;
 }
+
 .list-group-item-warning {
-  color: #8a6d3b;
-  background-color: #fcf8e3;
+	color: #8a6d3b;
+	background-color: #fcf8e3;
 }
+
 a.list-group-item-warning {
-  color: #8a6d3b;
+	color: #8a6d3b;
 }
+
 a.list-group-item-warning .list-group-item-heading {
-  color: inherit;
+	color: inherit;
 }
+
 a.list-group-item-warning:hover,
 a.list-group-item-warning:focus {
-  color: #8a6d3b;
-  background-color: #faf2cc;
+	color: #8a6d3b;
+	background-color: #faf2cc;
 }
+
 a.list-group-item-warning.active,
 a.list-group-item-warning.active:hover,
 a.list-group-item-warning.active:focus {
-  color: #fff;
-  background-color: #8a6d3b;
-  border-color: #8a6d3b;
+	color: #fff;
+	background-color: #8a6d3b;
+	border-color: #8a6d3b;
 }
+
 .list-group-item-danger {
-  color: #a94442;
-  background-color: #f2dede;
+	color: #a94442;
+	background-color: #f2dede;
 }
+
 a.list-group-item-danger {
-  color: #a94442;
+	color: #a94442;
 }
+
 a.list-group-item-danger .list-group-item-heading {
-  color: inherit;
+	color: inherit;
 }
+
 a.list-group-item-danger:hover,
 a.list-group-item-danger:focus {
-  color: #a94442;
-  background-color: #ebcccc;
+	color: #a94442;
+	background-color: #ebcccc;
 }
+
 a.list-group-item-danger.active,
 a.list-group-item-danger.active:hover,
 a.list-group-item-danger.active:focus {
-  color: #fff;
-  background-color: #a94442;
-  border-color: #a94442;
+	color: #fff;
+	background-color: #a94442;
+	border-color: #a94442;
 }
+
 .list-group-item-heading {
-  margin-top: 0;
-  margin-bottom: 5px;
+	margin-top: 0;
+	margin-bottom: 5px;
 }
+
 .list-group-item-text {
-  margin-bottom: 0;
-  line-height: 1.3;
+	margin-bottom: 0;
+	line-height: 1.3;
 }
+
 .panel {
-  margin-bottom: 20px;
-  background-color: #fff;
-  border: 1px solid transparent;
-  border-radius: 4px;
-  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
-          box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
+	margin-bottom: 20px;
+	background-color: #fff;
+	border: 1px solid transparent;
+	border-radius: 4px;
+	-webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
+	box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
 }
+
 .panel-body {
-  padding: 15px;
+	padding: 15px;
 }
+
 .panel-heading {
-  padding: 10px 15px;
-  border-bottom: 1px solid transparent;
-  border-top-left-radius: 3px;
-  border-top-right-radius: 3px;
+	padding: 10px 15px;
+	border-bottom: 1px solid transparent;
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px;
 }
+
 .panel-heading > .dropdown .dropdown-toggle {
-  color: inherit;
+	color: inherit;
 }
+
 .panel-title {
-  margin-top: 0;
-  margin-bottom: 0;
-  font-size: 16px;
-  color: inherit;
+	margin-top: 0;
+	margin-bottom: 0;
+	font-size: 16px;
+	color: inherit;
 }
+
 .panel-title > a {
-  color: inherit;
+	color: inherit;
 }
+
 .panel-footer {
-  padding: 10px 15px;
-  background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
-  border-bottom-right-radius: 3px;
-  border-bottom-left-radius: 3px;
+	padding: 10px 15px;
+	background-color: #f5f5f5;
+	border-top: 1px solid #ddd;
+	border-bottom-right-radius: 3px;
+	border-bottom-left-radius: 3px;
 }
+
 .panel > .list-group {
-  margin-bottom: 0;
+	margin-bottom: 0;
 }
+
 .panel > .list-group .list-group-item {
-  border-width: 1px 0;
-  border-radius: 0;
+	border-width: 1px 0;
+	border-radius: 0;
 }
+
 .panel > .list-group:first-child .list-group-item:first-child {
-  border-top: 0;
-  border-top-left-radius: 3px;
-  border-top-right-radius: 3px;
+	border-top: 0;
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px;
 }
+
 .panel > .list-group:last-child .list-group-item:last-child {
-  border-bottom: 0;
-  border-bottom-right-radius: 3px;
-  border-bottom-left-radius: 3px;
+	border-bottom: 0;
+	border-bottom-right-radius: 3px;
+	border-bottom-left-radius: 3px;
 }
+
 .panel-heading + .list-group .list-group-item:first-child {
-  border-top-width: 0;
+	border-top-width: 0;
 }
+
 .panel > .table,
 .panel > .table-responsive > .table {
-  margin-bottom: 0;
+	margin-bottom: 0;
 }
+
 .panel > .table:first-child,
 .panel > .table-responsive:first-child > .table:first-child {
-  border-top-left-radius: 3px;
-  border-top-right-radius: 3px;
+	border-top-left-radius: 3px;
+	border-top-right-radius: 3px;
 }
+
 .panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
 .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
 .panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
@@ -4826,8 +5912,9 @@ a.list-group-item-danger.active:focus {
 .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,
 .panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,
 .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {
-  border-top-left-radius: 3px;
+	border-top-left-radius: 3px;
 }
+
 .panel > .table:first-child > thead:first-child > tr:first-child td:last-child,
 .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,
 .panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,
@@ -4836,13 +5923,15 @@ a.list-group-item-danger.active:focus {
 .panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,
 .panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,
 .panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {
-  border-top-right-radius: 3px;
+	border-top-right-radius: 3px;
 }
+
 .panel > .table:last-child,
 .panel > .table-responsive:last-child > .table:last-child {
-  border-bottom-right-radius: 3px;
-  border-bottom-left-radius: 3px;
+	border-bottom-right-radius: 3px;
+	border-bottom-left-radius: 3px;
 }
+
 .panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
 .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
 .panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
@@ -4851,8 +5940,9 @@ a.list-group-item-danger.active:focus {
 .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,
 .panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,
 .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {
-  border-bottom-left-radius: 3px;
+	border-bottom-left-radius: 3px;
 }
+
 .panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,
 .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,
 .panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
@@ -4861,20 +5951,24 @@ a.list-group-item-danger.active:focus {
 .panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,
 .panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,
 .panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {
-  border-bottom-right-radius: 3px;
+	border-bottom-right-radius: 3px;
 }
+
 .panel > .panel-body + .table,
 .panel > .panel-body + .table-responsive {
-  border-top: 1px solid #ddd;
+	border-top: 1px solid #ddd;
 }
+
 .panel > .table > tbody:first-child > tr:first-child th,
 .panel > .table > tbody:first-child > tr:first-child td {
-  border-top: 0;
+	border-top: 0;
 }
+
 .panel > .table-bordered,
 .panel > .table-responsive > .table-bordered {
-  border: 0;
+	border: 0;
 }
+
 .panel > .table-bordered > thead > tr > th:first-child,
 .panel > .table-responsive > .table-bordered > thead > tr > th:first-child,
 .panel > .table-bordered > tbody > tr > th:first-child,
@@ -4887,8 +5981,9 @@ a.list-group-item-danger.active:focus {
 .panel > .table-responsive > .table-bordered > tbody > tr > td:first-child,
 .panel > .table-bordered > tfoot > tr > td:first-child,
 .panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child {
-  border-left: 0;
+	border-left: 0;
 }
+
 .panel > .table-bordered > thead > tr > th:last-child,
 .panel > .table-responsive > .table-bordered > thead > tr > th:last-child,
 .panel > .table-bordered > tbody > tr > th:last-child,
@@ -4901,8 +5996,9 @@ a.list-group-item-danger.active:focus {
 .panel > .table-responsive > .table-bordered > tbody > tr > td:last-child,
 .panel > .table-bordered > tfoot > tr > td:last-child,
 .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
-  border-right: 0;
+	border-right: 0;
 }
+
 .panel > .table-bordered > thead > tr:first-child > td,
 .panel > .table-responsive > .table-bordered > thead > tr:first-child > td,
 .panel > .table-bordered > tbody > tr:first-child > td,
@@ -4911,8 +6007,9 @@ a.list-group-item-danger.active:focus {
 .panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
 .panel > .table-bordered > tbody > tr:first-child > th,
 .panel > .table-responsive > .table-bordered > tbody > tr:first-child > th {
-  border-bottom: 0;
+	border-bottom: 0;
 }
+
 .panel > .table-bordered > tbody > tr:last-child > td,
 .panel > .table-responsive > .table-bordered > tbody > tr:last-child > td,
 .panel > .table-bordered > tfoot > tr:last-child > td,
@@ -4921,674 +6018,799 @@ a.list-group-item-danger.active:focus {
 .panel > .table-responsive > .table-bordered > tbody > tr:last-child > th,
 .panel > .table-bordered > tfoot > tr:last-child > th,
 .panel > .table-responsive > .table-bordered > tfoot > tr:last-child > th {
-  border-bottom: 0;
+	border-bottom: 0;
 }
+
 .panel > .table-responsive {
-  margin-bottom: 0;
-  border: 0;
+	margin-bottom: 0;
+	border: 0;
 }
+
 .panel-group {
-  margin-bottom: 20px;
+	margin-bottom: 20px;
 }
+
 .panel-group .panel {
-  margin-bottom: 0;
-  overflow: hidden;
-  border-radius: 4px;
+	margin-bottom: 0;
+	overflow: hidden;
+	border-radius: 4px;
 }
+
 .panel-group .panel + .panel {
-  margin-top: 5px;
+	margin-top: 5px;
 }
+
 .panel-group .panel-heading {
-  border-bottom: 0;
+	border-bottom: 0;
 }
+
 .panel-group .panel-heading + .panel-collapse .panel-body {
-  border-top: 1px solid #ddd;
+	border-top: 1px solid #ddd;
 }
+
 .panel-group .panel-footer {
-  border-top: 0;
+	border-top: 0;
 }
+
 .panel-group .panel-footer + .panel-collapse .panel-body {
-  border-bottom: 1px solid #ddd;
+	border-bottom: 1px solid #ddd;
 }
+
 .panel-default {
-  border-color: #ddd;
+	border-color: #ddd;
 }
+
 .panel-default > .panel-heading {
-  color: #333;
-  background-color: #f5f5f5;
-  border-color: #ddd;
+	color: #333;
+	background-color: #f5f5f5;
+	border-color: #ddd;
 }
+
 .panel-default > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #ddd;
+	border-top-color: #ddd;
 }
+
 .panel-default > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #ddd;
+	border-bottom-color: #ddd;
 }
+
 .panel-primary {
-  border-color: #428bca;
+	border-color: #428bca;
 }
+
 .panel-primary > .panel-heading {
-  color: #fff;
-  background-color: #428bca;
-  border-color: #428bca;
+	color: #fff;
+	background-color: #428bca;
+	border-color: #428bca;
 }
+
 .panel-primary > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #428bca;
+	border-top-color: #428bca;
 }
+
 .panel-primary > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #428bca;
+	border-bottom-color: #428bca;
 }
+
 .panel-success {
-  border-color: #d6e9c6;
+	border-color: #d6e9c6;
 }
+
 .panel-success > .panel-heading {
-  color: #3c763d;
-  background-color: #dff0d8;
-  border-color: #d6e9c6;
+	color: #3c763d;
+	background-color: #dff0d8;
+	border-color: #d6e9c6;
 }
+
 .panel-success > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #d6e9c6;
+	border-top-color: #d6e9c6;
 }
+
 .panel-success > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #d6e9c6;
+	border-bottom-color: #d6e9c6;
 }
+
 .panel-info {
-  border-color: #bce8f1;
+	border-color: #bce8f1;
 }
+
 .panel-info > .panel-heading {
-  color: #31708f;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
+	color: #31708f;
+	background-color: #d9edf7;
+	border-color: #bce8f1;
 }
+
 .panel-info > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #bce8f1;
+	border-top-color: #bce8f1;
 }
+
 .panel-info > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #bce8f1;
+	border-bottom-color: #bce8f1;
 }
+
 .panel-warning {
-  border-color: #faebcc;
+	border-color: #faebcc;
 }
+
 .panel-warning > .panel-heading {
-  color: #8a6d3b;
-  background-color: #fcf8e3;
-  border-color: #faebcc;
+	color: #8a6d3b;
+	background-color: #fcf8e3;
+	border-color: #faebcc;
 }
+
 .panel-warning > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #faebcc;
+	border-top-color: #faebcc;
 }
+
 .panel-warning > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #faebcc;
+	border-bottom-color: #faebcc;
 }
+
 .panel-danger {
-  border-color: #ebccd1;
+	border-color: #ebccd1;
 }
+
 .panel-danger > .panel-heading {
-  color: #a94442;
-  background-color: #f2dede;
-  border-color: #ebccd1;
+	color: #a94442;
+	background-color: #f2dede;
+	border-color: #ebccd1;
 }
+
 .panel-danger > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #ebccd1;
+	border-top-color: #ebccd1;
 }
+
 .panel-danger > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #ebccd1;
+	border-bottom-color: #ebccd1;
 }
+
 .well {
-  min-height: 20px;
-  padding: 19px;
-  margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border: 1px solid #e3e3e3;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
+	min-height: 20px;
+	padding: 19px;
+	margin-bottom: 20px;
+	background-color: #f5f5f5;
+	border: 1px solid #e3e3e3;
+	border-radius: 4px;
+	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
+	box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
 }
+
 .well blockquote {
-  border-color: #ddd;
-  border-color: rgba(0, 0, 0, .15);
+	border-color: #ddd;
+	border-color: rgba(0, 0, 0, .15);
 }
+
 .well-lg {
-  padding: 24px;
-  border-radius: 6px;
+	padding: 24px;
+	border-radius: 6px;
 }
+
 .well-sm {
-  padding: 9px;
-  border-radius: 3px;
+	padding: 9px;
+	border-radius: 3px;
 }
+
 .close {
-  float: right;
-  font-size: 21px;
-  font-weight: bold;
-  line-height: 1;
-  color: #000;
-  text-shadow: 0 1px 0 #fff;
-  filter: alpha(opacity=20);
-  opacity: .2;
+	float: right;
+	font-size: 21px;
+	font-weight: bold;
+	line-height: 1;
+	color: #000;
+	text-shadow: 0 1px 0 #fff;
+	filter: alpha(opacity=20);
+	opacity: .2;
 }
+
 .close:hover,
 .close:focus {
-  color: #000;
-  text-decoration: none;
-  cursor: pointer;
-  filter: alpha(opacity=50);
-  opacity: .5;
+	color: #000;
+	text-decoration: none;
+	cursor: pointer;
+	filter: alpha(opacity=50);
+	opacity: .5;
 }
+
 button.close {
-  -webkit-appearance: none;
-  padding: 0;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
+	-webkit-appearance: none;
+	padding: 0;
+	cursor: pointer;
+	background: transparent;
+	border: 0;
 }
+
 .modal-open {
-  overflow: hidden;
+	overflow: hidden;
 }
+
 .modal {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1050;
-  display: none;
-  overflow: auto;
-  overflow-y: scroll;
-  -webkit-overflow-scrolling: touch;
-  outline: 0;
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	z-index: 1050;
+	display: none;
+	overflow: auto;
+	overflow-y: scroll;
+	-webkit-overflow-scrolling: touch;
+	outline: 0;
 }
+
 .modal.fade .modal-dialog {
-  -webkit-transition: -webkit-transform .3s ease-out;
-     -moz-transition:    -moz-transform .3s ease-out;
-       -o-transition:      -o-transform .3s ease-out;
-          transition:         transform .3s ease-out;
-  -webkit-transform: translate(0, -25%);
-      -ms-transform: translate(0, -25%);
-          transform: translate(0, -25%);
+	-webkit-transition: -webkit-transform .3s ease-out;
+	-moz-transition: -moz-transform .3s ease-out;
+	-o-transition: -o-transform .3s ease-out;
+	transition: transform .3s ease-out;
+	-webkit-transform: translate(0, -25%);
+	-ms-transform: translate(0, -25%);
+	transform: translate(0, -25%);
 }
+
 .modal.in .modal-dialog {
-  -webkit-transform: translate(0, 0);
-      -ms-transform: translate(0, 0);
-          transform: translate(0, 0);
+	-webkit-transform: translate(0, 0);
+	-ms-transform: translate(0, 0);
+	transform: translate(0, 0);
 }
+
 .modal-dialog {
-  position: relative;
-  width: auto;
-  margin: 10px;
+	position: relative;
+	width: auto;
+	margin: 10px;
 }
+
 .modal-content {
-  position: relative;
-  background-color: #fff;
-  background-clip: padding-box;
-  border: 1px solid #999;
-  border: 1px solid rgba(0, 0, 0, .2);
-  border-radius: 6px;
-  outline: none;
-  -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
-          box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
+	position: relative;
+	background-color: #fff;
+	background-clip: padding-box;
+	border: 1px solid #999;
+	border: 1px solid rgba(0, 0, 0, .2);
+	border-radius: 6px;
+	outline: none;
+	-webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
+	box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
 }
+
 .modal-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1040;
-  background-color: #000;
+	position: fixed;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	left: 0;
+	z-index: 1040;
+	background-color: #000;
 }
+
 .modal-backdrop.fade {
-  filter: alpha(opacity=0);
-  opacity: 0;
+	filter: alpha(opacity=0);
+	opacity: 0;
 }
+
 .modal-backdrop.in {
-  filter: alpha(opacity=50);
-  opacity: .5;
+	filter: alpha(opacity=50);
+	opacity: .5;
 }
+
 .modal-header {
-  min-height: 16.42857143px;
-  padding: 15px;
-  border-bottom: 1px solid #e5e5e5;
+	min-height: 16.42857143px;
+	padding: 15px;
+	border-bottom: 1px solid #e5e5e5;
 }
+
 .modal-header .close {
-  margin-top: -2px;
+	margin-top: -2px;
 }
+
 .modal-title {
-  margin: 0;
-  line-height: 1.42857143;
+	margin: 0;
+	line-height: 1.42857143;
 }
+
 .modal-body {
-  position: relative;
-  padding: 20px;
+	position: relative;
+	padding: 20px;
 }
+
 .modal-footer {
-  padding: 19px 20px 20px;
-  margin-top: 15px;
-  text-align: right;
-  border-top: 1px solid #e5e5e5;
+	padding: 19px 20px 20px;
+	margin-top: 15px;
+	text-align: right;
+	border-top: 1px solid #e5e5e5;
 }
+
 .modal-footer .btn + .btn {
-  margin-bottom: 0;
-  margin-left: 5px;
+	margin-bottom: 0;
+	margin-left: 5px;
 }
+
 .modal-footer .btn-group .btn + .btn {
-  margin-left: -1px;
+	margin-left: -1px;
 }
+
 .modal-footer .btn-block + .btn-block {
-  margin-left: 0;
+	margin-left: 0;
 }
+
 @media (min-width: 768px) {
-  .modal-dialog {
-    width: 600px;
-    margin: 30px auto;
-  }
-  .modal-content {
-    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
-            box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
-  }
-  .modal-sm {
-    width: 300px;
-  }
+	.modal-dialog {
+		width: 600px;
+		margin: 30px auto;
+	}
+
+	.modal-content {
+		-webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
+		box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
+	}
+
+	.modal-sm {
+		width: 300px;
+	}
 }
+
 @media (min-width: 992px) {
-  .modal-lg {
-    width: 900px;
-  }
+	.modal-lg {
+		width: 900px;
+	}
 }
+
 .tooltip {
-  position: absolute;
-  z-index: 1030;
-  display: block;
-  font-size: 12px;
-  line-height: 1.4;
-  visibility: visible;
-  filter: alpha(opacity=0);
-  opacity: 0;
+	position: absolute;
+	z-index: 1030;
+	display: block;
+	font-size: 12px;
+	line-height: 1.4;
+	visibility: visible;
+	filter: alpha(opacity=0);
+	opacity: 0;
 }
+
 .tooltip.in {
-  filter: alpha(opacity=90);
-  opacity: .9;
+	filter: alpha(opacity=90);
+	opacity: .9;
 }
+
 .tooltip.top {
-  padding: 5px 0;
-  margin-top: -3px;
+	padding: 5px 0;
+	margin-top: -3px;
 }
+
 .tooltip.right {
-  padding: 0 5px;
-  margin-left: 3px;
+	padding: 0 5px;
+	margin-left: 3px;
 }
+
 .tooltip.bottom {
-  padding: 5px 0;
-  margin-top: 3px;
+	padding: 5px 0;
+	margin-top: 3px;
 }
+
 .tooltip.left {
-  padding: 0 5px;
-  margin-left: -3px;
+	padding: 0 5px;
+	margin-left: -3px;
 }
+
 .tooltip-inner {
-  max-width: 200px;
-  padding: 3px 8px;
-  color: #fff;
-  text-align: center;
-  text-decoration: none;
-  background-color: #000;
-  border-radius: 4px;
+	max-width: 200px;
+	padding: 3px 8px;
+	color: #fff;
+	text-align: center;
+	text-decoration: none;
+	background-color: #000;
+	border-radius: 4px;
 }
+
 .tooltip-arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
+	position: absolute;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
 }
+
 .tooltip.top .tooltip-arrow {
-  bottom: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-width: 5px 5px 0;
-  border-top-color: #000;
+	bottom: 0;
+	left: 50%;
+	margin-left: -5px;
+	border-width: 5px 5px 0;
+	border-top-color: #000;
 }
+
 .tooltip.top-left .tooltip-arrow {
-  bottom: 0;
-  left: 5px;
-  border-width: 5px 5px 0;
-  border-top-color: #000;
+	bottom: 0;
+	left: 5px;
+	border-width: 5px 5px 0;
+	border-top-color: #000;
 }
+
 .tooltip.top-right .tooltip-arrow {
-  right: 5px;
-  bottom: 0;
-  border-width: 5px 5px 0;
-  border-top-color: #000;
+	right: 5px;
+	bottom: 0;
+	border-width: 5px 5px 0;
+	border-top-color: #000;
 }
+
 .tooltip.right .tooltip-arrow {
-  top: 50%;
-  left: 0;
-  margin-top: -5px;
-  border-width: 5px 5px 5px 0;
-  border-right-color: #000;
+	top: 50%;
+	left: 0;
+	margin-top: -5px;
+	border-width: 5px 5px 5px 0;
+	border-right-color: #000;
 }
+
 .tooltip.left .tooltip-arrow {
-  top: 50%;
-  right: 0;
-  margin-top: -5px;
-  border-width: 5px 0 5px 5px;
-  border-left-color: #000;
+	top: 50%;
+	right: 0;
+	margin-top: -5px;
+	border-width: 5px 0 5px 5px;
+	border-left-color: #000;
 }
+
 .tooltip.bottom .tooltip-arrow {
-  top: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-width: 0 5px 5px;
-  border-bottom-color: #000;
+	top: 0;
+	left: 50%;
+	margin-left: -5px;
+	border-width: 0 5px 5px;
+	border-bottom-color: #000;
 }
+
 .tooltip.bottom-left .tooltip-arrow {
-  top: 0;
-  left: 5px;
-  border-width: 0 5px 5px;
-  border-bottom-color: #000;
+	top: 0;
+	left: 5px;
+	border-width: 0 5px 5px;
+	border-bottom-color: #000;
 }
+
 .tooltip.bottom-right .tooltip-arrow {
-  top: 0;
-  right: 5px;
-  border-width: 0 5px 5px;
-  border-bottom-color: #000;
+	top: 0;
+	right: 5px;
+	border-width: 0 5px 5px;
+	border-bottom-color: #000;
 }
+
 .popover {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 1010;
-  display: none;
-  max-width: 276px;
-  padding: 1px;
-  text-align: left;
-  white-space: normal;
-  background-color: #fff;
-  background-clip: padding-box;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, .2);
-  border-radius: 6px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
-          box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 1010;
+	display: none;
+	max-width: 276px;
+	padding: 1px;
+	text-align: left;
+	white-space: normal;
+	background-color: #fff;
+	background-clip: padding-box;
+	border: 1px solid #ccc;
+	border: 1px solid rgba(0, 0, 0, .2);
+	border-radius: 6px;
+	-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
+	box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
 }
+
 .popover.top {
-  margin-top: -10px;
+	margin-top: -10px;
 }
+
 .popover.right {
-  margin-left: 10px;
+	margin-left: 10px;
 }
+
 .popover.bottom {
-  margin-top: 10px;
+	margin-top: 10px;
 }
+
 .popover.left {
-  margin-left: -10px;
+	margin-left: -10px;
 }
+
 .popover-title {
-  padding: 8px 14px;
-  margin: 0;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 18px;
-  background-color: #f7f7f7;
-  border-bottom: 1px solid #ebebeb;
-  border-radius: 5px 5px 0 0;
+	padding: 8px 14px;
+	margin: 0;
+	font-size: 14px;
+	font-weight: normal;
+	line-height: 18px;
+	background-color: #f7f7f7;
+	border-bottom: 1px solid #ebebeb;
+	border-radius: 5px 5px 0 0;
 }
+
 .popover-content {
-  padding: 9px 14px;
+	padding: 9px 14px;
 }
+
 .popover > .arrow,
 .popover > .arrow:after {
-  position: absolute;
-  display: block;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
+	position: absolute;
+	display: block;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
 }
+
 .popover > .arrow {
-  border-width: 11px;
+	border-width: 11px;
 }
+
 .popover > .arrow:after {
-  content: "";
-  border-width: 10px;
+	content: "";
+	border-width: 10px;
 }
+
 .popover.top > .arrow {
-  bottom: -11px;
-  left: 50%;
-  margin-left: -11px;
-  border-top-color: #999;
-  border-top-color: rgba(0, 0, 0, .25);
-  border-bottom-width: 0;
+	bottom: -11px;
+	left: 50%;
+	margin-left: -11px;
+	border-top-color: #999;
+	border-top-color: rgba(0, 0, 0, .25);
+	border-bottom-width: 0;
 }
+
 .popover.top > .arrow:after {
-  bottom: 1px;
-  margin-left: -10px;
-  content: " ";
-  border-top-color: #fff;
-  border-bottom-width: 0;
+	bottom: 1px;
+	margin-left: -10px;
+	content: " ";
+	border-top-color: #fff;
+	border-bottom-width: 0;
 }
+
 .popover.right > .arrow {
-  top: 50%;
-  left: -11px;
-  margin-top: -11px;
-  border-right-color: #999;
-  border-right-color: rgba(0, 0, 0, .25);
-  border-left-width: 0;
+	top: 50%;
+	left: -11px;
+	margin-top: -11px;
+	border-right-color: #999;
+	border-right-color: rgba(0, 0, 0, .25);
+	border-left-width: 0;
 }
+
 .popover.right > .arrow:after {
-  bottom: -10px;
-  left: 1px;
-  content: " ";
-  border-right-color: #fff;
-  border-left-width: 0;
+	bottom: -10px;
+	left: 1px;
+	content: " ";
+	border-right-color: #fff;
+	border-left-width: 0;
 }
+
 .popover.bottom > .arrow {
-  top: -11px;
-  left: 50%;
-  margin-left: -11px;
-  border-top-width: 0;
-  border-bottom-color: #999;
-  border-bottom-color: rgba(0, 0, 0, .25);
+	top: -11px;
+	left: 50%;
+	margin-left: -11px;
+	border-top-width: 0;
+	border-bottom-color: #999;
+	border-bottom-color: rgba(0, 0, 0, .25);
 }
+
 .popover.bottom > .arrow:after {
-  top: 1px;
-  margin-left: -10px;
-  content: " ";
-  border-top-width: 0;
-  border-bottom-color: #fff;
+	top: 1px;
+	margin-left: -10px;
+	content: " ";
+	border-top-width: 0;
+	border-bottom-color: #fff;
 }
+
 .popover.left > .arrow {
-  top: 50%;
-  right: -11px;
-  margin-top: -11px;
-  border-right-width: 0;
-  border-left-color: #999;
-  border-left-color: rgba(0, 0, 0, .25);
+	top: 50%;
+	right: -11px;
+	margin-top: -11px;
+	border-right-width: 0;
+	border-left-color: #999;
+	border-left-color: rgba(0, 0, 0, .25);
 }
+
 .popover.left > .arrow:after {
-  right: 1px;
-  bottom: -10px;
-  content: " ";
-  border-right-width: 0;
-  border-left-color: #fff;
+	right: 1px;
+	bottom: -10px;
+	content: " ";
+	border-right-width: 0;
+	border-left-color: #fff;
 }
+
 .carousel {
-  position: relative;
+	position: relative;
 }
+
 .carousel-inner {
-  position: relative;
-  width: 100%;
-  overflow: hidden;
+	position: relative;
+	width: 100%;
+	overflow: hidden;
 }
+
 .carousel-inner > .item {
-  position: relative;
-  display: none;
-  -webkit-transition: .6s ease-in-out left;
-          transition: .6s ease-in-out left;
+	position: relative;
+	display: none;
+	-webkit-transition: .6s ease-in-out left;
+	transition: .6s ease-in-out left;
 }
+
 .carousel-inner > .item > img,
 .carousel-inner > .item > a > img {
-  line-height: 1;
+	line-height: 1;
 }
+
 .carousel-inner > .active,
 .carousel-inner > .next,
 .carousel-inner > .prev {
-  display: block;
+	display: block;
 }
+
 .carousel-inner > .active {
-  left: 0;
+	left: 0;
 }
+
 .carousel-inner > .next,
 .carousel-inner > .prev {
-  position: absolute;
-  top: 0;
-  width: 100%;
+	position: absolute;
+	top: 0;
+	width: 100%;
 }
+
 .carousel-inner > .next {
-  left: 100%;
+	left: 100%;
 }
+
 .carousel-inner > .prev {
-  left: -100%;
+	left: -100%;
 }
+
 .carousel-inner > .next.left,
 .carousel-inner > .prev.right {
-  left: 0;
+	left: 0;
 }
+
 .carousel-inner > .active.left {
-  left: -100%;
+	left: -100%;
 }
+
 .carousel-inner > .active.right {
-  left: 100%;
+	left: 100%;
 }
+
 .carousel-control {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  width: 15%;
-  font-size: 20px;
-  color: #fff;
-  text-align: center;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
-  filter: alpha(opacity=50);
-  opacity: .5;
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	width: 15%;
+	font-size: 20px;
+	color: #fff;
+	text-align: center;
+	text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
+	filter: alpha(opacity=50);
+	opacity: .5;
 }
+
 .carousel-control.left {
-  background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, .5) 0%), color-stop(rgba(0, 0, 0, .0001) 100%));
-  background-image:         linear-gradient(to right, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);
-  background-repeat: repeat-x;
+	background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, .5) 0%), color-stop(rgba(0, 0, 0, .0001) 100%));
+	background-image: linear-gradient(to right, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);
+	background-repeat: repeat-x;
 }
+
 .carousel-control.right {
-  right: 0;
-  left: auto;
-  background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, .0001) 0%), color-stop(rgba(0, 0, 0, .5) 100%));
-  background-image:         linear-gradient(to right, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);
-  background-repeat: repeat-x;
+	right: 0;
+	left: auto;
+	background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, .0001) 0%), color-stop(rgba(0, 0, 0, .5) 100%));
+	background-image: linear-gradient(to right, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);
+	background-repeat: repeat-x;
 }
+
 .carousel-control:hover,
 .carousel-control:focus {
-  color: #fff;
-  text-decoration: none;
-  filter: alpha(opacity=90);
-  outline: none;
-  opacity: .9;
+	color: #fff;
+	text-decoration: none;
+	filter: alpha(opacity=90);
+	outline: none;
+	opacity: .9;
 }
+
 .carousel-control .icon-prev,
 .carousel-control .icon-next,
 .carousel-control .glyphicon-chevron-left,
 .carousel-control .glyphicon-chevron-right {
-  position: absolute;
-  top: 0%;
-  z-index: 5;
-  display: inline-block;
+	position: absolute;
+	top: 0%;
+	z-index: 5;
+	display: inline-block;
 }
+
 .carousel-control .icon-prev,
 .carousel-control .glyphicon-chevron-left {
-  left: 50%;
+	left: 50%;
 }
+
 .carousel-control .icon-next,
 .carousel-control .glyphicon-chevron-right {
-  right: 50%;
+	right: 50%;
 }
+
 .carousel-control .icon-prev,
 .carousel-control .icon-next {
-  width: 20px;
-  height: 20px;
-  margin-top: -10px;
-  margin-left: -10px;
-  font-family: serif;
+	width: 20px;
+	height: 20px;
+	margin-top: -10px;
+	margin-left: -10px;
+	font-family: serif;
 }
+
 .carousel-control .icon-prev:before {
-  content: '\2039';
+	content: '\2039';
 }
+
 .carousel-control .icon-next:before {
-  content: '\203a';
+	content: '\203a';
 }
+
 .carousel-indicators {
-  position: absolute;
-  bottom: 10px;
-  left: 50%;
-  z-index: 15;
-  width: 60%;
-  padding-left: 0;
-  margin-left: -30%;
-  text-align: center;
-  list-style: none;
+	position: absolute;
+	bottom: 10px;
+	left: 50%;
+	z-index: 15;
+	width: 60%;
+	padding-left: 0;
+	margin-left: -30%;
+	text-align: center;
+	list-style: none;
 }
+
 .carousel-indicators li {
-  display: inline-block;
-  width: 10px;
-  height: 10px;
-  margin: 1px;
-  text-indent: -999px;
-  cursor: pointer;
-  background-color: #000 \9;
-  background-color: rgba(0, 0, 0, 0);
-  border: 1px solid #fff;
-  border-radius: 10px;
+	display: inline-block;
+	width: 10px;
+	height: 10px;
+	margin: 1px;
+	text-indent: -999px;
+	cursor: pointer;
+	background-color: #000 \9;
+	background-color: rgba(0, 0, 0, 0);
+	border: 1px solid #fff;
+	border-radius: 10px;
 }
+
 .carousel-indicators .active {
-  width: 12px;
-  height: 12px;
-  margin: 0;
-  background-color: #fff;
+	width: 12px;
+	height: 12px;
+	margin: 0;
+	background-color: #fff;
 }
+
 .carousel-caption {
-  position: absolute;
-  right: 15%;
-  bottom: 20px;
-  left: 15%;
-  z-index: 10;
-  padding-top: 20px;
-  padding-bottom: 20px;
-  color: #fff;
-  text-align: center;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
+	position: absolute;
+	right: 15%;
+	bottom: 20px;
+	left: 15%;
+	z-index: 10;
+	padding-top: 20px;
+	padding-bottom: 20px;
+	color: #fff;
+	text-align: center;
+	text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
 }
+
 .carousel-caption .btn {
-  text-shadow: none;
+	text-shadow: none;
 }
+
 @media screen and (min-width: 768px) {
-  .carousel-control .glyphicon-chevron-left,
-  .carousel-control .glyphicon-chevron-right,
-  .carousel-control .icon-prev,
-  .carousel-control .icon-next {
-    width: 30px;
-    height: 30px;
-    margin-top: -15px;
-    margin-left: -15px;
-    font-size: 30px;
-  }
-  .carousel-caption {
-    right: 20%;
-    left: 20%;
-    padding-bottom: 30px;
-  }
-  .carousel-indicators {
-    bottom: 20px;
-  }
+	.carousel-control .glyphicon-chevron-left,
+	.carousel-control .glyphicon-chevron-right,
+	.carousel-control .icon-prev,
+	.carousel-control .icon-next {
+		width: 30px;
+		height: 30px;
+		margin-top: -15px;
+		margin-left: -15px;
+		font-size: 30px;
+	}
+
+	.carousel-caption {
+		right: 20%;
+		left: 20%;
+		padding-bottom: 30px;
+	}
+
+	.carousel-indicators {
+		bottom: 20px;
+	}
 }
+
 .clearfix:before,
 .clearfix:after,
 .container:before,
@@ -5617,9 +6839,10 @@ button.close {
 .panel-body:after,
 .modal-footer:before,
 .modal-footer:after {
-  display: table;
-  content: " ";
+	display: table;
+	content: " ";
 }
+
 .clearfix:after,
 .container:after,
 .container-fluid:after,
@@ -5634,152 +6857,190 @@ button.close {
 .pager:after,
 .panel-body:after,
 .modal-footer:after {
-  clear: both;
+	clear: both;
 }
+
 .center-block {
-  display: block;
-  margin-right: auto;
-  margin-left: auto;
+	display: block;
+	margin-right: auto;
+	margin-left: auto;
 }
+
 .pull-right {
-  float: right !important;
+	float: right !important;
 }
+
 .pull-left {
-  float: left !important;
+	float: left !important;
 }
+
 .hide {
-  display: none !important;
+	display: none !important;
 }
+
 .show {
-  display: block !important;
+	display: block !important;
 }
+
 .invisible {
-  visibility: hidden;
+	visibility: hidden;
 }
+
 .text-hide {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
+	font: 0/0 a;
+	color: transparent;
+	text-shadow: none;
+	background-color: transparent;
+	border: 0;
 }
+
 .hidden {
-  display: none !important;
-  visibility: hidden !important;
+	display: none !important;
+	visibility: hidden !important;
 }
+
 .affix {
-  position: fixed;
+	position: fixed;
 }
+
 @-ms-viewport {
-  width: device-width;
+	width: device-width;
 }
+
 .visible-xs,
 .visible-sm,
 .visible-md,
 .visible-lg {
-  display: none !important;
+	display: none !important;
 }
+
 @media (max-width: 767px) {
-  .visible-xs {
-    display: block !important;
-  }
-  table.visible-xs {
-    display: table;
-  }
-  tr.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-xs,
-  td.visible-xs {
-    display: table-cell !important;
-  }
+	.visible-xs {
+		display: block !important;
+	}
+
+	table.visible-xs {
+		display: table;
+	}
+
+	tr.visible-xs {
+		display: table-row !important;
+	}
+
+	th.visible-xs,
+	td.visible-xs {
+		display: table-cell !important;
+	}
 }
+
 @media (min-width: 768px) and (max-width: 991px) {
-  .visible-sm {
-    display: block !important;
-  }
-  table.visible-sm {
-    display: table;
-  }
-  tr.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-sm,
-  td.visible-sm {
-    display: table-cell !important;
-  }
+	.visible-sm {
+		display: block !important;
+	}
+
+	table.visible-sm {
+		display: table;
+	}
+
+	tr.visible-sm {
+		display: table-row !important;
+	}
+
+	th.visible-sm,
+	td.visible-sm {
+		display: table-cell !important;
+	}
 }
+
 @media (min-width: 992px) and (max-width: 1199px) {
-  .visible-md {
-    display: block !important;
-  }
-  table.visible-md {
-    display: table;
-  }
-  tr.visible-md {
-    display: table-row !important;
-  }
-  th.visible-md,
-  td.visible-md {
-    display: table-cell !important;
-  }
+	.visible-md {
+		display: block !important;
+	}
+
+	table.visible-md {
+		display: table;
+	}
+
+	tr.visible-md {
+		display: table-row !important;
+	}
+
+	th.visible-md,
+	td.visible-md {
+		display: table-cell !important;
+	}
 }
+
 @media (min-width: 1200px) {
-  .visible-lg {
-    display: block !important;
-  }
-  table.visible-lg {
-    display: table;
-  }
-  tr.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-lg,
-  td.visible-lg {
-    display: table-cell !important;
-  }
+	.visible-lg {
+		display: block !important;
+	}
+
+	table.visible-lg {
+		display: table;
+	}
+
+	tr.visible-lg {
+		display: table-row !important;
+	}
+
+	th.visible-lg,
+	td.visible-lg {
+		display: table-cell !important;
+	}
 }
+
 @media (max-width: 767px) {
-  .hidden-xs {
-    display: none !important;
-  }
+	.hidden-xs {
+		display: none !important;
+	}
 }
+
 @media (min-width: 768px) and (max-width: 991px) {
-  .hidden-sm {
-    display: none !important;
-  }
+	.hidden-sm {
+		display: none !important;
+	}
 }
+
 @media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-md {
-    display: none !important;
-  }
+	.hidden-md {
+		display: none !important;
+	}
 }
+
 @media (min-width: 1200px) {
-  .hidden-lg {
-    display: none !important;
-  }
+	.hidden-lg {
+		display: none !important;
+	}
 }
+
 .visible-print {
-  display: none !important;
+	display: none !important;
 }
+
 @media print {
-  .visible-print {
-    display: block !important;
-  }
-  table.visible-print {
-    display: table;
-  }
-  tr.visible-print {
-    display: table-row !important;
-  }
-  th.visible-print,
-  td.visible-print {
-    display: table-cell !important;
-  }
+	.visible-print {
+		display: block !important;
+	}
+
+	table.visible-print {
+		display: table;
+	}
+
+	tr.visible-print {
+		display: table-row !important;
+	}
+
+	th.visible-print,
+	td.visible-print {
+		display: table-cell !important;
+	}
 }
+
 @media print {
-  .hidden-print {
-    display: none !important;
-  }
+	.hidden-print {
+		display: none !important;
+	}
 }
+
 /*# sourceMappingURL=bootstrap.css.map */
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.svg b/len-activiti/src/main/resources/static/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.svg
index e3e2dc7..3d52033 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.svg
+++ b/len-activiti/src/main/resources/static/editor-app/libs/bootstrap_3.1.1/fonts/glyphicons-halflings-regular.svg
@@ -1,229 +1,410 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
-<font-face units-per-em="1200" ascent="960" descent="-240" />
-<missing-glyph horiz-adv-x="500" />
-<glyph />
-<glyph />
-<glyph unicode="&#xd;" />
-<glyph unicode=" " />
-<glyph unicode="*" d="M100 500v200h259l-183 183l141 141l183 -183v259h200v-259l183 183l141 -141l-183 -183h259v-200h-259l183 -183l-141 -141l-183 183v-259h-200v259l-183 -183l-141 141l183 183h-259z" />
-<glyph unicode="+" d="M0 400v300h400v400h300v-400h400v-300h-400v-400h-300v400h-400z" />
-<glyph unicode="&#xa0;" />
-<glyph unicode="&#x2000;" horiz-adv-x="652" />
-<glyph unicode="&#x2001;" horiz-adv-x="1304" />
-<glyph unicode="&#x2002;" horiz-adv-x="652" />
-<glyph unicode="&#x2003;" horiz-adv-x="1304" />
-<glyph unicode="&#x2004;" horiz-adv-x="434" />
-<glyph unicode="&#x2005;" horiz-adv-x="326" />
-<glyph unicode="&#x2006;" horiz-adv-x="217" />
-<glyph unicode="&#x2007;" horiz-adv-x="217" />
-<glyph unicode="&#x2008;" horiz-adv-x="163" />
-<glyph unicode="&#x2009;" horiz-adv-x="260" />
-<glyph unicode="&#x200a;" horiz-adv-x="72" />
-<glyph unicode="&#x202f;" horiz-adv-x="260" />
-<glyph unicode="&#x205f;" horiz-adv-x="326" />
-<glyph unicode="&#x20ac;" d="M100 500l100 100h113q0 47 5 100h-218l100 100h135q37 167 112 257q117 141 297 141q242 0 354 -189q60 -103 66 -209h-181q0 55 -25.5 99t-63.5 68t-75 36.5t-67 12.5q-24 0 -52.5 -10t-62.5 -32t-65.5 -67t-50.5 -107h379l-100 -100h-300q-6 -46 -6 -100h406l-100 -100 h-300q9 -74 33 -132t52.5 -91t62 -54.5t59 -29t46.5 -7.5q29 0 66 13t75 37t63.5 67.5t25.5 96.5h174q-31 -172 -128 -278q-107 -117 -274 -117q-205 0 -324 158q-36 46 -69 131.5t-45 205.5h-217z" />
-<glyph unicode="&#x2212;" d="M200 400h900v300h-900v-300z" />
-<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#x2601;" d="M-14 494q0 -80 56.5 -137t135.5 -57h750q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5z" />
-<glyph unicode="&#x2709;" d="M0 100l400 400l200 -200l200 200l400 -400h-1200zM0 300v600l300 -300zM0 1100l600 -603l600 603h-1200zM900 600l300 300v-600z" />
-<glyph unicode="&#x270f;" d="M-13 -13l333 112l-223 223zM187 403l214 -214l614 614l-214 214zM887 1103l214 -214l99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13 -33 13t-33 -13z" />
-<glyph unicode="&#xe001;" d="M0 1200h1200l-500 -550v-550h300v-100h-800v100h300v550z" />
-<glyph unicode="&#xe002;" d="M14 84q18 -55 86 -75.5t147 5.5q65 21 109 69t44 90v606l600 155v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q18 -55 86 -75.5t147 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10 -3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7 q-79 -25 -122.5 -82t-25.5 -112z" />
-<glyph unicode="&#xe003;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233z" />
-<glyph unicode="&#xe005;" d="M100 784q0 64 28 123t73 100.5t104.5 64t119 20.5t120 -38.5t104.5 -104.5q48 69 109.5 105t121.5 38t118.5 -20.5t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-149.5 152.5t-126.5 127.5 t-94 124.5t-33.5 117.5z" />
-<glyph unicode="&#xe006;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1z" />
-<glyph unicode="&#xe007;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1zM237 700l196 -142l-73 -226l192 140l195 -141l-74 229l193 140h-235l-77 211l-78 -211h-239z" />
-<glyph unicode="&#xe008;" d="M0 0v143l400 257v100q-37 0 -68.5 74.5t-31.5 125.5v200q0 124 88 212t212 88t212 -88t88 -212v-200q0 -51 -31.5 -125.5t-68.5 -74.5v-100l400 -257v-143h-1200z" />
-<glyph unicode="&#xe009;" d="M0 0v1100h1200v-1100h-1200zM100 100h100v100h-100v-100zM100 300h100v100h-100v-100zM100 500h100v100h-100v-100zM100 700h100v100h-100v-100zM100 900h100v100h-100v-100zM300 100h600v400h-600v-400zM300 600h600v400h-600v-400zM1000 100h100v100h-100v-100z M1000 300h100v100h-100v-100zM1000 500h100v100h-100v-100zM1000 700h100v100h-100v-100zM1000 900h100v100h-100v-100z" />
-<glyph unicode="&#xe010;" d="M0 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM0 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5zM600 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM600 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe011;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 450v200q0 21 14.5 35.5t35.5 14.5h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe012;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v200q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5 t-14.5 -35.5v-200zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe013;" d="M29 454l419 -420l818 820l-212 212l-607 -607l-206 207z" />
-<glyph unicode="&#xe014;" d="M106 318l282 282l-282 282l212 212l282 -282l282 282l212 -212l-282 -282l282 -282l-212 -212l-282 282l-282 -282z" />
-<glyph unicode="&#xe015;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233zM300 600v200h100v100h200v-100h100v-200h-100v-100h-200v100h-100z" />
-<glyph unicode="&#xe016;" d="M23 694q0 200 142 342t342 142t342 -142t142 -342q0 -141 -78 -262l300 -299q7 -7 7 -18t-7 -18l-109 -109q-8 -8 -18 -8t-18 8l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 694q0 -136 97 -233t234 -97t233.5 97t96.5 233t-96.5 233t-233.5 97t-234 -97 t-97 -233zM300 601h400v200h-400v-200z" />
-<glyph unicode="&#xe017;" d="M23 600q0 183 105 331t272 210v-166q-103 -55 -165 -155t-62 -220q0 -177 125 -302t302 -125t302 125t125 302q0 120 -62 220t-165 155v166q167 -62 272 -210t105 -331q0 -118 -45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5 zM500 750q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v400q0 21 -14.5 35.5t-35.5 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-400z" />
-<glyph unicode="&#xe018;" d="M100 1h200v300h-200v-300zM400 1v500h200v-500h-200zM700 1v800h200v-800h-200zM1000 1v1200h200v-1200h-200z" />
-<glyph unicode="&#xe019;" d="M26 601q0 -33 6 -74l151 -38l2 -6q14 -49 38 -93l3 -5l-80 -134q45 -59 105 -105l133 81l5 -3q45 -26 94 -39l5 -2l38 -151q40 -5 74 -5q27 0 74 5l38 151l6 2q46 13 93 39l5 3l134 -81q56 44 104 105l-80 134l3 5q24 44 39 93l1 6l152 38q5 40 5 74q0 28 -5 73l-152 38 l-1 6q-16 51 -39 93l-3 5l80 134q-44 58 -104 105l-134 -81l-5 3q-45 25 -93 39l-6 1l-38 152q-40 5 -74 5q-27 0 -74 -5l-38 -152l-5 -1q-50 -14 -94 -39l-5 -3l-133 81q-59 -47 -105 -105l80 -134l-3 -5q-25 -47 -38 -93l-2 -6l-151 -38q-6 -48 -6 -73zM385 601 q0 88 63 151t152 63t152 -63t63 -151q0 -89 -63 -152t-152 -63t-152 63t-63 152z" />
-<glyph unicode="&#xe020;" d="M100 1025v50q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-50q0 -11 -7 -18t-18 -7h-1050q-11 0 -18 7t-7 18zM200 100v800h900v-800q0 -41 -29.5 -71t-70.5 -30h-700q-41 0 -70.5 30 t-29.5 71zM300 100h100v700h-100v-700zM500 100h100v700h-100v-700zM500 1100h300v100h-300v-100zM700 100h100v700h-100v-700zM900 100h100v700h-100v-700z" />
-<glyph unicode="&#xe021;" d="M1 601l656 644l644 -644h-200v-600h-300v400h-300v-400h-300v600h-200z" />
-<glyph unicode="&#xe022;" d="M100 25v1150q0 11 7 18t18 7h475v-500h400v-675q0 -11 -7 -18t-18 -7h-850q-11 0 -18 7t-7 18zM700 800v300l300 -300h-300z" />
-<glyph unicode="&#xe023;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 500v400h100 v-300h200v-100h-300z" />
-<glyph unicode="&#xe024;" d="M-100 0l431 1200h209l-21 -300h162l-20 300h208l431 -1200h-538l-41 400h-242l-40 -400h-539zM488 500h224l-27 300h-170z" />
-<glyph unicode="&#xe025;" d="M0 0v400h490l-290 300h200v500h300v-500h200l-290 -300h490v-400h-1100zM813 200h175v100h-175v-100z" />
-<glyph unicode="&#xe026;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM188 600q0 -170 121 -291t291 -121t291 121t121 291t-121 291t-291 121 t-291 -121t-121 -291zM350 600h150v300h200v-300h150l-250 -300z" />
-<glyph unicode="&#xe027;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM350 600l250 300 l250 -300h-150v-300h-200v300h-150z" />
-<glyph unicode="&#xe028;" d="M0 25v475l200 700h800l199 -700l1 -475q0 -11 -7 -18t-18 -7h-1150q-11 0 -18 7t-7 18zM200 500h200l50 -200h300l50 200h200l-97 500h-606z" />
-<glyph unicode="&#xe029;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 397v401 l297 -200z" />
-<glyph unicode="&#xe030;" d="M23 600q0 -118 45.5 -224.5t123 -184t184 -123t224.5 -45.5t224.5 45.5t184 123t123 184t45.5 224.5h-150q0 -177 -125 -302t-302 -125t-302 125t-125 302t125 302t302 125q136 0 246 -81l-146 -146h400v400l-145 -145q-157 122 -355 122q-118 0 -224.5 -45.5t-184 -123 t-123 -184t-45.5 -224.5z" />
-<glyph unicode="&#xe031;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5q198 0 355 -122l145 145v-400h-400l147 147q-112 80 -247 80q-177 0 -302 -125t-125 -302h-150zM100 0v400h400l-147 -147q112 -80 247 -80q177 0 302 125t125 302h150q0 -118 -45.5 -224.5t-123 -184t-184 -123 t-224.5 -45.5q-198 0 -355 122z" />
-<glyph unicode="&#xe032;" d="M100 0h1100v1200h-1100v-1200zM200 100v900h900v-900h-900zM300 200v100h100v-100h-100zM300 400v100h100v-100h-100zM300 600v100h100v-100h-100zM300 800v100h100v-100h-100zM500 200h500v100h-500v-100zM500 400v100h500v-100h-500zM500 600v100h500v-100h-500z M500 800v100h500v-100h-500z" />
-<glyph unicode="&#xe033;" d="M0 100v600q0 41 29.5 70.5t70.5 29.5h100v200q0 82 59 141t141 59h300q82 0 141 -59t59 -141v-200h100q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-900q-41 0 -70.5 29.5t-29.5 70.5zM400 800h300v150q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-150z" />
-<glyph unicode="&#xe034;" d="M100 0v1100h100v-1100h-100zM300 400q60 60 127.5 84t127.5 17.5t122 -23t119 -30t110 -11t103 42t91 120.5v500q-40 -81 -101.5 -115.5t-127.5 -29.5t-138 25t-139.5 40t-125.5 25t-103 -29.5t-65 -115.5v-500z" />
-<glyph unicode="&#xe035;" d="M0 275q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 127 70.5 231.5t184.5 161.5t245 57t245 -57t184.5 -161.5t70.5 -231.5v-300q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 116 -49.5 227t-131 192.5t-192.5 131t-227 49.5t-227 -49.5t-192.5 -131t-131 -192.5 t-49.5 -227v-300zM200 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14zM800 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14z" />
-<glyph unicode="&#xe036;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM688 459l141 141l-141 141l71 71l141 -141l141 141l71 -71l-141 -141l141 -141l-71 -71l-141 141l-141 -141z" />
-<glyph unicode="&#xe037;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM700 857l69 53q111 -135 111 -310q0 -169 -106 -302l-67 54q86 110 86 248q0 146 -93 257z" />
-<glyph unicode="&#xe038;" d="M0 401v400h300l300 200v-800l-300 200h-300zM702 858l69 53q111 -135 111 -310q0 -170 -106 -303l-67 55q86 110 86 248q0 145 -93 257zM889 951l7 -8q123 -151 123 -344q0 -189 -119 -339l-7 -8l81 -66l6 8q142 178 142 405q0 230 -144 408l-6 8z" />
-<glyph unicode="&#xe039;" d="M0 0h500v500h-200v100h-100v-100h-200v-500zM0 600h100v100h400v100h100v100h-100v300h-500v-600zM100 100v300h300v-300h-300zM100 800v300h300v-300h-300zM200 200v100h100v-100h-100zM200 900h100v100h-100v-100zM500 500v100h300v-300h200v-100h-100v-100h-200v100 h-100v100h100v200h-200zM600 0v100h100v-100h-100zM600 1000h100v-300h200v-300h300v200h-200v100h200v500h-600v-200zM800 800v300h300v-300h-300zM900 0v100h300v-100h-300zM900 900v100h100v-100h-100zM1100 200v100h100v-100h-100z" />
-<glyph unicode="&#xe040;" d="M0 200h100v1000h-100v-1000zM100 0v100h300v-100h-300zM200 200v1000h100v-1000h-100zM500 0v91h100v-91h-100zM500 200v1000h200v-1000h-200zM700 0v91h100v-91h-100zM800 200v1000h100v-1000h-100zM900 0v91h200v-91h-200zM1000 200v1000h200v-1000h-200z" />
-<glyph unicode="&#xe041;" d="M0 700l1 475q0 10 7.5 17.5t17.5 7.5h474l700 -700l-500 -500zM148 953q0 -42 29 -71q30 -30 71.5 -30t71.5 30q29 29 29 71t-29 71q-30 30 -71.5 30t-71.5 -30q-29 -29 -29 -71z" />
-<glyph unicode="&#xe042;" d="M1 700l1 475q0 11 7 18t18 7h474l700 -700l-500 -500zM148 953q0 -42 30 -71q29 -30 71 -30t71 30q30 29 30 71t-30 71q-29 30 -71 30t-71 -30q-30 -29 -30 -71zM701 1200h100l700 -700l-500 -500l-50 50l450 450z" />
-<glyph unicode="&#xe043;" d="M100 0v1025l175 175h925v-1000l-100 -100v1000h-750l-100 -100h750v-1000h-900z" />
-<glyph unicode="&#xe044;" d="M200 0l450 444l450 -443v1150q0 20 -14.5 35t-35.5 15h-800q-21 0 -35.5 -15t-14.5 -35v-1151z" />
-<glyph unicode="&#xe045;" d="M0 100v700h200l100 -200h600l100 200h200v-700h-200v200h-800v-200h-200zM253 829l40 -124h592l62 124l-94 346q-2 11 -10 18t-18 7h-450q-10 0 -18 -7t-10 -18zM281 24l38 152q2 10 11.5 17t19.5 7h500q10 0 19.5 -7t11.5 -17l38 -152q2 -10 -3.5 -17t-15.5 -7h-600 q-10 0 -15.5 7t-3.5 17z" />
-<glyph unicode="&#xe046;" d="M0 200q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-150q-4 8 -11.5 21.5t-33 48t-53 61t-69 48t-83.5 21.5h-200q-41 0 -82 -20.5t-70 -50t-52 -59t-34 -50.5l-12 -20h-150q-41 0 -70.5 -29.5t-29.5 -70.5v-600z M356 500q0 100 72 172t172 72t172 -72t72 -172t-72 -172t-172 -72t-172 72t-72 172zM494 500q0 -44 31 -75t75 -31t75 31t31 75t-31 75t-75 31t-75 -31t-31 -75zM900 700v100h100v-100h-100z" />
-<glyph unicode="&#xe047;" d="M53 0h365v66q-41 0 -72 11t-49 38t1 71l92 234h391l82 -222q16 -45 -5.5 -88.5t-74.5 -43.5v-66h417v66q-34 1 -74 43q-18 19 -33 42t-21 37l-6 13l-385 998h-93l-399 -1006q-24 -48 -52 -75q-12 -12 -33 -25t-36 -20l-15 -7v-66zM416 521l178 457l46 -140l116 -317h-340 z" />
-<glyph unicode="&#xe048;" d="M100 0v89q41 7 70.5 32.5t29.5 65.5v827q0 28 -1 39.5t-5.5 26t-15.5 21t-29 14t-49 14.5v71l471 -1q120 0 213 -88t93 -228q0 -55 -11.5 -101.5t-28 -74t-33.5 -47.5t-28 -28l-12 -7q8 -3 21.5 -9t48 -31.5t60.5 -58t47.5 -91.5t21.5 -129q0 -84 -59 -156.5t-142 -111 t-162 -38.5h-500zM400 200h161q89 0 153 48.5t64 132.5q0 90 -62.5 154.5t-156.5 64.5h-159v-400zM400 700h139q76 0 130 61.5t54 138.5q0 82 -84 130.5t-239 48.5v-379z" />
-<glyph unicode="&#xe049;" d="M200 0v57q77 7 134.5 40.5t65.5 80.5l173 849q10 56 -10 74t-91 37q-6 1 -10.5 2.5t-9.5 2.5v57h425l2 -57q-33 -8 -62 -25.5t-46 -37t-29.5 -38t-17.5 -30.5l-5 -12l-128 -825q-10 -52 14 -82t95 -36v-57h-500z" />
-<glyph unicode="&#xe050;" d="M-75 200h75v800h-75l125 167l125 -167h-75v-800h75l-125 -167zM300 900v300h150h700h150v-300h-50q0 29 -8 48.5t-18.5 30t-33.5 15t-39.5 5.5t-50.5 1h-200v-850l100 -50v-100h-400v100l100 50v850h-200q-34 0 -50.5 -1t-40 -5.5t-33.5 -15t-18.5 -30t-8.5 -48.5h-49z " />
-<glyph unicode="&#xe051;" d="M33 51l167 125v-75h800v75l167 -125l-167 -125v75h-800v-75zM100 901v300h150h700h150v-300h-50q0 29 -8 48.5t-18 30t-33.5 15t-40 5.5t-50.5 1h-200v-650l100 -50v-100h-400v100l100 50v650h-200q-34 0 -50.5 -1t-39.5 -5.5t-33.5 -15t-18.5 -30t-8 -48.5h-50z" />
-<glyph unicode="&#xe052;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 350q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM0 650q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1000q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 950q0 -20 14.5 -35t35.5 -15h600q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-600q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
-<glyph unicode="&#xe053;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 650q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM200 350q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM200 950q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
-<glyph unicode="&#xe054;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1000q-21 0 -35.5 15 t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-600 q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe055;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100 q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe056;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM300 50v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800 q-21 0 -35.5 15t-14.5 35zM300 650v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 950v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15 h-800q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe057;" d="M-101 500v100h201v75l166 -125l-166 -125v75h-201zM300 0h100v1100h-100v-1100zM500 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35 v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 650q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100 q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100z" />
-<glyph unicode="&#xe058;" d="M1 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 650 q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM801 0v1100h100v-1100 h-100zM934 550l167 -125v75h200v100h-200v75z" />
-<glyph unicode="&#xe059;" d="M0 275v650q0 31 22 53t53 22h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53zM900 600l300 300v-600z" />
-<glyph unicode="&#xe060;" d="M0 44v1012q0 18 13 31t31 13h1112q19 0 31.5 -13t12.5 -31v-1012q0 -18 -12.5 -31t-31.5 -13h-1112q-18 0 -31 13t-13 31zM100 263l247 182l298 -131l-74 156l293 318l236 -288v500h-1000v-737zM208 750q0 56 39 95t95 39t95 -39t39 -95t-39 -95t-95 -39t-95 39t-39 95z " />
-<glyph unicode="&#xe062;" d="M148 745q0 124 60.5 231.5t165 172t226.5 64.5q123 0 227 -63t164.5 -169.5t60.5 -229.5t-73 -272q-73 -114 -166.5 -237t-150.5 -189l-57 -66q-10 9 -27 26t-66.5 70.5t-96 109t-104 135.5t-100.5 155q-63 139 -63 262zM342 772q0 -107 75.5 -182.5t181.5 -75.5 q107 0 182.5 75.5t75.5 182.5t-75.5 182t-182.5 75t-182 -75.5t-75 -181.5z" />
-<glyph unicode="&#xe063;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM173 600q0 -177 125.5 -302t301.5 -125v854q-176 0 -301.5 -125 t-125.5 -302z" />
-<glyph unicode="&#xe064;" d="M117 406q0 94 34 186t88.5 172.5t112 159t115 177t87.5 194.5q21 -71 57.5 -142.5t76 -130.5t83 -118.5t82 -117t70 -116t50 -125.5t18.5 -136q0 -89 -39 -165.5t-102 -126.5t-140 -79.5t-156 -33.5q-114 6 -211.5 53t-161.5 139t-64 210zM243 414q14 -82 59.5 -136 t136.5 -80l16 98q-7 6 -18 17t-34 48t-33 77q-15 73 -14 143.5t10 122.5l9 51q-92 -110 -119.5 -185t-12.5 -156z" />
-<glyph unicode="&#xe065;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5q366 -6 397 -14l-186 -186h-311q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v125l200 200v-225q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM436 341l161 50l412 412l-114 113l-405 -405zM995 1015l113 -113l113 113l-21 85l-92 28z" />
-<glyph unicode="&#xe066;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h261l2 -80q-133 -32 -218 -120h-145q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-53q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5 zM423 524q30 38 81.5 64t103 35.5t99 14t77.5 3.5l29 -1v-209l360 324l-359 318v-216q-7 0 -19 -1t-48 -8t-69.5 -18.5t-76.5 -37t-76.5 -59t-62 -88t-39.5 -121.5z" />
-<glyph unicode="&#xe067;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q61 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-169q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM342 632l283 -284l567 567l-137 137l-430 -431l-146 147z" />
-<glyph unicode="&#xe068;" d="M0 603l300 296v-198h200v200h-200l300 300l295 -300h-195v-200h200v198l300 -296l-300 -300v198h-200v-200h195l-295 -300l-300 300h200v200h-200v-198z" />
-<glyph unicode="&#xe069;" d="M200 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-1100l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe070;" d="M0 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-487l500 487v-1100l-500 488v-488l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
-<glyph unicode="&#xe071;" d="M136 550l564 550v-487l500 487v-1100l-500 488v-488z" />
-<glyph unicode="&#xe072;" d="M200 0l900 550l-900 550v-1100z" />
-<glyph unicode="&#xe073;" d="M200 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5t-14.5 -35.5v-800zM600 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
-<glyph unicode="&#xe074;" d="M200 150q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v800q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
-<glyph unicode="&#xe075;" d="M0 0v1100l500 -487v487l564 -550l-564 -550v488z" />
-<glyph unicode="&#xe076;" d="M0 0v1100l500 -487v487l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-500 -488v488z" />
-<glyph unicode="&#xe077;" d="M300 0v1100l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438z" />
-<glyph unicode="&#xe078;" d="M100 250v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5zM100 500h1100l-550 564z" />
-<glyph unicode="&#xe079;" d="M185 599l592 -592l240 240l-353 353l353 353l-240 240z" />
-<glyph unicode="&#xe080;" d="M272 194l353 353l-353 353l241 240l572 -571l21 -22l-1 -1v-1l-592 -591z" />
-<glyph unicode="&#xe081;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h200v-200h200v200h200v200h-200v200h-200v-200h-200v-200z" />
-<glyph unicode="&#xe082;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h600v200h-600v-200z" />
-<glyph unicode="&#xe083;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM246 459l213 -213l141 142l141 -142l213 213l-142 141l142 141l-213 212l-141 -141l-141 142l-212 -213l141 -141 z" />
-<glyph unicode="&#xe084;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM270 551l276 -277l411 411l-175 174l-236 -236l-102 102z" />
-<glyph unicode="&#xe085;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM364 700h143q4 0 11.5 -1t11 -1t6.5 3t3 9t1 11t3.5 8.5t3.5 6t5.5 4t6.5 2.5t9 1.5t9 0.5h11.5h12.5 q19 0 30 -10t11 -26q0 -22 -4 -28t-27 -22q-5 -1 -12.5 -3t-27 -13.5t-34 -27t-26.5 -46t-11 -68.5h200q5 3 14 8t31.5 25.5t39.5 45.5t31 69t14 94q0 51 -17.5 89t-42 58t-58.5 32t-58.5 15t-51.5 3q-50 0 -90.5 -12t-75 -38.5t-53.5 -74.5t-19 -114zM500 300h200v100h-200 v-100z" />
-<glyph unicode="&#xe086;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM400 300h400v100h-100v300h-300v-100h100v-200h-100v-100zM500 800h200v100h-200v-100z" />
-<glyph unicode="&#xe087;" d="M0 500v200h195q31 125 98.5 199.5t206.5 100.5v200h200v-200q54 -20 113 -60t112.5 -105.5t71.5 -134.5h203v-200h-203q-25 -102 -116.5 -186t-180.5 -117v-197h-200v197q-140 27 -208 102.5t-98 200.5h-194zM290 500q24 -73 79.5 -127.5t130.5 -78.5v206h200v-206 q149 48 201 206h-201v200h200q-25 74 -75.5 127t-124.5 77v-204h-200v203q-75 -23 -130 -77t-79 -126h209v-200h-210z" />
-<glyph unicode="&#xe088;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM356 465l135 135 l-135 135l109 109l135 -135l135 135l109 -109l-135 -135l135 -135l-109 -109l-135 135l-135 -135z" />
-<glyph unicode="&#xe089;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM322 537l141 141 l87 -87l204 205l142 -142l-346 -345z" />
-<glyph unicode="&#xe090;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -115 62 -215l568 567q-100 62 -216 62q-171 0 -292.5 -121.5t-121.5 -292.5zM391 245q97 -59 209 -59q171 0 292.5 121.5t121.5 292.5 q0 112 -59 209z" />
-<glyph unicode="&#xe091;" d="M0 547l600 453v-300h600v-300h-600v-301z" />
-<glyph unicode="&#xe092;" d="M0 400v300h600v300l600 -453l-600 -448v301h-600z" />
-<glyph unicode="&#xe093;" d="M204 600l450 600l444 -600h-298v-600h-300v600h-296z" />
-<glyph unicode="&#xe094;" d="M104 600h296v600h300v-600h298l-449 -600z" />
-<glyph unicode="&#xe095;" d="M0 200q6 132 41 238.5t103.5 193t184 138t271.5 59.5v271l600 -453l-600 -448v301q-95 -2 -183 -20t-170 -52t-147 -92.5t-100 -135.5z" />
-<glyph unicode="&#xe096;" d="M0 0v400l129 -129l294 294l142 -142l-294 -294l129 -129h-400zM635 777l142 -142l294 294l129 -129v400h-400l129 -129z" />
-<glyph unicode="&#xe097;" d="M34 176l295 295l-129 129h400v-400l-129 130l-295 -295zM600 600v400l129 -129l295 295l142 -141l-295 -295l129 -130h-400z" />
-<glyph unicode="&#xe101;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM456 851l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5 t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5h-207q-21 0 -33 -14.5t-8 -34.5zM500 300h200v100h-200v-100z" />
-<glyph unicode="&#xe102;" d="M0 800h100v-200h400v300h200v-300h400v200h100v100h-111q1 1 1 6.5t-1.5 15t-3.5 17.5l-34 172q-11 39 -41.5 63t-69.5 24q-32 0 -61 -17l-239 -144q-22 -13 -40 -35q-19 24 -40 36l-238 144q-33 18 -62 18q-39 0 -69.5 -23t-40.5 -61l-35 -177q-2 -8 -3 -18t-1 -15v-6 h-111v-100zM100 0h400v400h-400v-400zM200 900q-3 0 14 48t36 96l18 47l213 -191h-281zM700 0v400h400v-400h-400zM731 900l202 197q5 -12 12 -32.5t23 -64t25 -72t7 -28.5h-269z" />
-<glyph unicode="&#xe103;" d="M0 -22v143l216 193q-9 53 -13 83t-5.5 94t9 113t38.5 114t74 124q47 60 99.5 102.5t103 68t127.5 48t145.5 37.5t184.5 43.5t220 58.5q0 -189 -22 -343t-59 -258t-89 -181.5t-108.5 -120t-122 -68t-125.5 -30t-121.5 -1.5t-107.5 12.5t-87.5 17t-56.5 7.5l-99 -55z M238.5 300.5q19.5 -6.5 86.5 76.5q55 66 367 234q70 38 118.5 69.5t102 79t99 111.5t86.5 148q22 50 24 60t-6 19q-7 5 -17 5t-26.5 -14.5t-33.5 -39.5q-35 -51 -113.5 -108.5t-139.5 -89.5l-61 -32q-369 -197 -458 -401q-48 -111 -28.5 -117.5z" />
-<glyph unicode="&#xe104;" d="M111 408q0 -33 5 -63q9 -56 44 -119.5t105 -108.5q31 -21 64 -16t62 23.5t57 49.5t48 61.5t35 60.5q32 66 39 184.5t-13 157.5q79 -80 122 -164t26 -184q-5 -33 -20.5 -69.5t-37.5 -80.5q-10 -19 -14.5 -29t-12 -26t-9 -23.5t-3 -19t2.5 -15.5t11 -9.5t19.5 -5t30.5 2.5 t42 8q57 20 91 34t87.5 44.5t87 64t65.5 88.5t47 122q38 172 -44.5 341.5t-246.5 278.5q22 -44 43 -129q39 -159 -32 -154q-15 2 -33 9q-79 33 -120.5 100t-44 175.5t48.5 257.5q-13 -8 -34 -23.5t-72.5 -66.5t-88.5 -105.5t-60 -138t-8 -166.5q2 -12 8 -41.5t8 -43t6 -39.5 t3.5 -39.5t-1 -33.5t-6 -31.5t-13.5 -24t-21 -20.5t-31 -12q-38 -10 -67 13t-40.5 61.5t-15 81.5t10.5 75q-52 -46 -83.5 -101t-39 -107t-7.5 -85z" />
-<glyph unicode="&#xe105;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5t145.5 -23.5t132.5 -59t116.5 -83.5t97 -90t74.5 -85.5t49 -63.5t20 -30l26 -40l-26 -40q-6 -10 -20 -30t-49 -63.5t-74.5 -85.5t-97 -90t-116.5 -83.5t-132.5 -59t-145.5 -23.5 t-145.5 23.5t-132.5 59t-116.5 83.5t-97 90t-74.5 85.5t-49 63.5t-20 30zM120 600q7 -10 40.5 -58t56 -78.5t68 -77.5t87.5 -75t103 -49.5t125 -21.5t123.5 20t100.5 45.5t85.5 71.5t66.5 75.5t58 81.5t47 66q-1 1 -28.5 37.5t-42 55t-43.5 53t-57.5 63.5t-58.5 54 q49 -74 49 -163q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l105 105q-37 24 -75 72t-57 84l-20 36z" />
-<glyph unicode="&#xe106;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5q61 0 121 -17l37 142h148l-314 -1200h-148l37 143q-82 21 -165 71.5t-140 102t-109.5 112t-72 88.5t-29.5 43zM120 600q210 -282 393 -336l37 141q-107 18 -178.5 101.5t-71.5 193.5 q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l47 47l23 87q-30 28 -59 69t-44 68l-14 26zM780 161l38 145q22 15 44.5 34t46 44t40.5 44t41 50.5t33.5 43.5t33 44t24.5 34q-97 127 -140 175l39 146q67 -54 131.5 -125.5t87.5 -103.5t36 -52l26 -40l-26 -40 q-7 -12 -25.5 -38t-63.5 -79.5t-95.5 -102.5t-124 -100t-146.5 -79z" />
-<glyph unicode="&#xe107;" d="M-97.5 34q13.5 -34 50.5 -34h1294q37 0 50.5 35.5t-7.5 67.5l-642 1056q-20 34 -48 36.5t-48 -29.5l-642 -1066q-21 -32 -7.5 -66zM155 200l445 723l445 -723h-345v100h-200v-100h-345zM500 600l100 -300l100 300v100h-200v-100z" />
-<glyph unicode="&#xe108;" d="M100 262v41q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44t106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -91 100 -113v-64q0 -20 -13 -28.5t-32 0.5l-94 78h-222l-94 -78q-19 -9 -32 -0.5t-13 28.5 v64q0 22 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5z" />
-<glyph unicode="&#xe109;" d="M0 50q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v750h-1100v-750zM0 900h1100v150q0 21 -14.5 35.5t-35.5 14.5h-150v100h-100v-100h-500v100h-100v-100h-150q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 100v100h100v-100h-100zM100 300v100h100v-100h-100z M100 500v100h100v-100h-100zM300 100v100h100v-100h-100zM300 300v100h100v-100h-100zM300 500v100h100v-100h-100zM500 100v100h100v-100h-100zM500 300v100h100v-100h-100zM500 500v100h100v-100h-100zM700 100v100h100v-100h-100zM700 300v100h100v-100h-100zM700 500 v100h100v-100h-100zM900 100v100h100v-100h-100zM900 300v100h100v-100h-100zM900 500v100h100v-100h-100z" />
-<glyph unicode="&#xe110;" d="M0 200v200h259l600 600h241v198l300 -295l-300 -300v197h-159l-600 -600h-341zM0 800h259l122 -122l141 142l-181 180h-341v-200zM678 381l141 142l122 -123h159v198l300 -295l-300 -300v197h-241z" />
-<glyph unicode="&#xe111;" d="M0 400v600q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5z" />
-<glyph unicode="&#xe112;" d="M100 600v200h300v-250q0 -113 6 -145q17 -92 102 -117q39 -11 92 -11q37 0 66.5 5.5t50 15.5t36 24t24 31.5t14 37.5t7 42t2.5 45t0 47v25v250h300v-200q0 -42 -3 -83t-15 -104t-31.5 -116t-58 -109.5t-89 -96.5t-129 -65.5t-174.5 -25.5t-174.5 25.5t-129 65.5t-89 96.5 t-58 109.5t-31.5 116t-15 104t-3 83zM100 900v300h300v-300h-300zM800 900v300h300v-300h-300z" />
-<glyph unicode="&#xe113;" d="M-30 411l227 -227l352 353l353 -353l226 227l-578 579z" />
-<glyph unicode="&#xe114;" d="M70 797l580 -579l578 579l-226 227l-353 -353l-352 353z" />
-<glyph unicode="&#xe115;" d="M-198 700l299 283l300 -283h-203v-400h385l215 -200h-800v600h-196zM402 1000l215 -200h381v-400h-198l299 -283l299 283h-200v600h-796z" />
-<glyph unicode="&#xe116;" d="M18 939q-5 24 10 42q14 19 39 19h896l38 162q5 17 18.5 27.5t30.5 10.5h94q20 0 35 -14.5t15 -35.5t-15 -35.5t-35 -14.5h-54l-201 -961q-2 -4 -6 -10.5t-19 -17.5t-33 -11h-31v-50q0 -20 -14.5 -35t-35.5 -15t-35.5 15t-14.5 35v50h-300v-50q0 -20 -14.5 -35t-35.5 -15 t-35.5 15t-14.5 35v50h-50q-21 0 -35.5 15t-14.5 35q0 21 14.5 35.5t35.5 14.5h535l48 200h-633q-32 0 -54.5 21t-27.5 43z" />
-<glyph unicode="&#xe117;" d="M0 0v800h1200v-800h-1200zM0 900v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-100h-1200z" />
-<glyph unicode="&#xe118;" d="M1 0l300 700h1200l-300 -700h-1200zM1 400v600h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-200h-1000z" />
-<glyph unicode="&#xe119;" d="M302 300h198v600h-198l298 300l298 -300h-198v-600h198l-298 -300z" />
-<glyph unicode="&#xe120;" d="M0 600l300 298v-198h600v198l300 -298l-300 -297v197h-600v-197z" />
-<glyph unicode="&#xe121;" d="M0 100v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM31 400l172 739q5 22 23 41.5t38 19.5h672q19 0 37.5 -22.5t23.5 -45.5l172 -732h-1138zM800 100h100v100h-100v-100z M1000 100h100v100h-100v-100z" />
-<glyph unicode="&#xe122;" d="M-101 600v50q0 24 25 49t50 38l25 13v-250l-11 5.5t-24 14t-30 21.5t-24 27.5t-11 31.5zM100 500v250v8v8v7t0.5 7t1.5 5.5t2 5t3 4t4.5 3.5t6 1.5t7.5 0.5h200l675 250v-850l-675 200h-38l47 -276q2 -12 -3 -17.5t-11 -6t-21 -0.5h-8h-83q-20 0 -34.5 14t-18.5 35 q-55 337 -55 351zM1100 200v850q0 21 14.5 35.5t35.5 14.5q20 0 35 -14.5t15 -35.5v-850q0 -20 -15 -35t-35 -15q-21 0 -35.5 15t-14.5 35z" />
-<glyph unicode="&#xe123;" d="M74 350q0 21 13.5 35.5t33.5 14.5h18l117 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3 32t29 13h94q20 0 29 -10.5t3 -29.5q-18 -36 -18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q20 0 33.5 -14.5t13.5 -35.5q0 -20 -13 -40t-31 -27q-8 -3 -23 -8.5 t-65 -20t-103 -25t-132.5 -19.5t-158.5 -9q-125 0 -245.5 20.5t-178.5 40.5l-58 20q-18 7 -31 27.5t-13 40.5zM497 110q12 -49 40 -79.5t63 -30.5t63 30.5t39 79.5q-48 -6 -102 -6t-103 6z" />
-<glyph unicode="&#xe124;" d="M21 445l233 -45l-78 -224l224 78l45 -233l155 179l155 -179l45 233l224 -78l-78 224l234 45l-180 155l180 156l-234 44l78 225l-224 -78l-45 233l-155 -180l-155 180l-45 -233l-224 78l78 -225l-233 -44l179 -156z" />
-<glyph unicode="&#xe125;" d="M0 200h200v600h-200v-600zM300 275q0 -75 100 -75h61q124 -100 139 -100h250q46 0 83 57l238 344q29 31 29 74v100q0 44 -30.5 84.5t-69.5 40.5h-328q28 118 28 125v150q0 44 -30.5 84.5t-69.5 40.5h-50q-27 0 -51 -20t-38 -48l-96 -198l-145 -196q-20 -26 -20 -63v-400z M400 300v375l150 213l100 212h50v-175l-50 -225h450v-125l-250 -375h-214l-136 100h-100z" />
-<glyph unicode="&#xe126;" d="M0 400v600h200v-600h-200zM300 525v400q0 75 100 75h61q124 100 139 100h250q46 0 83 -57l238 -344q29 -31 29 -74v-100q0 -44 -30.5 -84.5t-69.5 -40.5h-328q28 -118 28 -125v-150q0 -44 -30.5 -84.5t-69.5 -40.5h-50q-27 0 -51 20t-38 48l-96 198l-145 196 q-20 26 -20 63zM400 525l150 -212l100 -213h50v175l-50 225h450v125l-250 375h-214l-136 -100h-100v-375z" />
-<glyph unicode="&#xe127;" d="M8 200v600h200v-600h-200zM308 275v525q0 17 14 35.5t28 28.5l14 9l362 230q14 6 25 6q17 0 29 -12l109 -112q14 -14 14 -34q0 -18 -11 -32l-85 -121h302q85 0 138.5 -38t53.5 -110t-54.5 -111t-138.5 -39h-107l-130 -339q-7 -22 -20.5 -41.5t-28.5 -19.5h-341 q-7 0 -90 81t-83 94zM408 289l100 -89h293l131 339q6 21 19.5 41t28.5 20h203q16 0 25 15t9 36q0 20 -9 34.5t-25 14.5h-457h-6.5h-7.5t-6.5 0.5t-6 1t-5 1.5t-5.5 2.5t-4 4t-4 5.5q-5 12 -5 20q0 14 10 27l147 183l-86 83l-339 -236v-503z" />
-<glyph unicode="&#xe128;" d="M-101 651q0 72 54 110t139 38l302 -1l-85 121q-11 16 -11 32q0 21 14 34l109 113q13 12 29 12q11 0 25 -6l365 -230q7 -4 17 -10.5t26.5 -26t16.5 -36.5v-526q0 -13 -86 -93.5t-94 -80.5h-341q-16 0 -29.5 20t-19.5 41l-130 339h-107q-84 0 -139 39t-55 111zM-1 601h222 q15 0 28.5 -20.5t19.5 -40.5l131 -339h293l107 89v502l-343 237l-87 -83l145 -184q10 -11 10 -26q0 -11 -5 -20q-1 -3 -3.5 -5.5l-4 -4t-5 -2.5t-5.5 -1.5t-6.5 -1t-6.5 -0.5h-7.5h-6.5h-476v-100zM1000 201v600h200v-600h-200z" />
-<glyph unicode="&#xe129;" d="M97 719l230 -363q4 -6 10.5 -15.5t26 -25t36.5 -15.5h525q13 0 94 83t81 90v342q0 15 -20 28.5t-41 19.5l-339 131v106q0 84 -39 139t-111 55t-110 -53.5t-38 -138.5v-302l-121 84q-15 12 -33.5 11.5t-32.5 -13.5l-112 -110q-22 -22 -6 -53zM172 739l83 86l183 -146 q22 -18 47 -5q3 1 5.5 3.5l4 4t2.5 5t1.5 5.5t1 6.5t0.5 6.5v7.5v6.5v456q0 22 25 31t50 -0.5t25 -30.5v-202q0 -16 20 -29.5t41 -19.5l339 -130v-294l-89 -100h-503zM400 0v200h600v-200h-600z" />
-<glyph unicode="&#xe130;" d="M2 585q-16 -31 6 -53l112 -110q13 -13 32 -13.5t34 10.5l121 85q0 -51 -0.5 -153.5t-0.5 -148.5q0 -84 38.5 -138t110.5 -54t111 55t39 139v106l339 131q20 6 40.5 19.5t20.5 28.5v342q0 7 -81 90t-94 83h-525q-17 0 -35.5 -14t-28.5 -28l-10 -15zM77 565l236 339h503 l89 -100v-294l-340 -130q-20 -6 -40 -20t-20 -29v-202q0 -22 -25 -31t-50 0t-25 31v456v14.5t-1.5 11.5t-5 12t-9.5 7q-24 13 -46 -5l-184 -146zM305 1104v200h600v-200h-600z" />
-<glyph unicode="&#xe131;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM298 701l2 -201h300l-2 -194l402 294l-402 298v-197h-300z" />
-<glyph unicode="&#xe132;" d="M0 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t231.5 47.5q122 0 232.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-218 -217.5t-300 -80t-299.5 80t-217.5 217.5t-80 299.5zM200 600l402 -294l-2 194h300l2 201h-300v197z" />
-<glyph unicode="&#xe133;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600h200v-300h200v300h200l-300 400z" />
-<glyph unicode="&#xe134;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600l300 -400l300 400h-200v300h-200v-300h-200z" />
-<glyph unicode="&#xe135;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM254 780q-8 -33 5.5 -92.5t7.5 -87.5q0 -9 17 -44t16 -60 q12 0 23 -5.5t23 -15t20 -13.5q24 -12 108 -42q22 -8 53 -31.5t59.5 -38.5t57.5 -11q8 -18 -15 -55t-20 -57q42 -71 87 -80q0 -6 -3 -15.5t-3.5 -14.5t4.5 -17q104 -3 221 112q30 29 47 47t34.5 49t20.5 62q-14 9 -37 9.5t-36 7.5q-14 7 -49 15t-52 19q-9 0 -39.5 -0.5 t-46.5 -1.5t-39 -6.5t-39 -16.5q-50 -35 -66 -12q-4 2 -3.5 25.5t0.5 25.5q-6 13 -26.5 17t-24.5 7q2 22 -2 41t-16.5 28t-38.5 -20q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q12 -19 32 -37.5t34 -27.5l14 -8q0 3 9.5 39.5t5.5 57.5 q-4 23 14.5 44.5t22.5 31.5q5 14 10 35t8.5 31t15.5 22.5t34 21.5q-6 18 10 37q8 0 23.5 -1.5t24.5 -1.5t20.5 4.5t20.5 15.5q-10 23 -30.5 42.5t-38 30t-49 26.5t-43.5 23q11 39 2 44q31 -13 58 -14.5t39 3.5l11 4q7 36 -16.5 53.5t-64.5 28.5t-56 23q-19 -3 -37 0 q-15 -12 -36.5 -21t-34.5 -12t-44 -8t-39 -6q-15 -3 -45.5 0.5t-45.5 -2.5q-21 -7 -52 -26.5t-34 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -90.5t-29.5 -79.5zM518 916q3 12 16 30t16 25q10 -10 18.5 -10t14 6t14.5 14.5t16 12.5q0 -24 17 -66.5t17 -43.5 q-9 2 -31 5t-36 5t-32 8t-30 14zM692 1003h1h-1z" />
-<glyph unicode="&#xe136;" d="M0 164.5q0 21.5 15 37.5l600 599q-33 101 6 201.5t135 154.5q164 92 306 -9l-259 -138l145 -232l251 126q13 -175 -151 -267q-123 -70 -253 -23l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5z" />
-<glyph unicode="&#xe137;" horiz-adv-x="1220" d="M0 196v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 596v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5zM0 996v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM600 596h500v100h-500v-100zM800 196h300v100h-300v-100zM900 996h200v100h-200v-100z" />
-<glyph unicode="&#xe138;" d="M100 1100v100h1000v-100h-1000zM150 1000h900l-350 -500v-300l-200 -200v500z" />
-<glyph unicode="&#xe139;" d="M0 200v200h1200v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500z M500 1000h200v100h-200v-100z" />
-<glyph unicode="&#xe140;" d="M0 0v400l129 -129l200 200l142 -142l-200 -200l129 -129h-400zM0 800l129 129l200 -200l142 142l-200 200l129 129h-400v-400zM729 329l142 142l200 -200l129 129v-400h-400l129 129zM729 871l200 200l-129 129h400v-400l-129 129l-200 -200z" />
-<glyph unicode="&#xe141;" d="M0 596q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 596q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM291 655 q0 23 15.5 38.5t38.5 15.5t39 -16t16 -38q0 -23 -16 -39t-39 -16q-22 0 -38 16t-16 39zM400 850q0 22 16 38.5t39 16.5q22 0 38 -16t16 -39t-16 -39t-38 -16q-23 0 -39 16.5t-16 38.5zM514 609q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 22 16 38.5t39 16.5 q22 0 38 -16t16 -39t-16 -39t-38 -16q-14 0 -29 10l-55 -145q17 -22 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5zM800 655q0 22 16 38t39 16t38.5 -15.5t15.5 -38.5t-16 -39t-38 -16q-23 0 -39 16t-16 39z" />
-<glyph unicode="&#xe142;" d="M-40 375q-13 -95 35 -173q35 -57 94 -89t129 -32q63 0 119 28q33 16 65 40.5t52.5 45.5t59.5 64q40 44 57 61l394 394q35 35 47 84t-3 96q-27 87 -117 104q-20 2 -29 2q-46 0 -78.5 -16.5t-67.5 -51.5l-389 -396l-7 -7l69 -67l377 373q20 22 39 38q23 23 50 23 q38 0 53 -36q16 -39 -20 -75l-547 -547q-52 -52 -125 -52q-55 0 -100 33t-54 96q-5 35 2.5 66t31.5 63t42 50t56 54q24 21 44 41l348 348q52 52 82.5 79.5t84 54t107.5 26.5q25 0 48 -4q95 -17 154 -94.5t51 -175.5q-7 -101 -98 -192l-252 -249l-253 -256l7 -7l69 -60 l517 511q67 67 95 157t11 183q-16 87 -67 154t-130 103q-69 33 -152 33q-107 0 -197 -55q-40 -24 -111 -95l-512 -512q-68 -68 -81 -163z" />
-<glyph unicode="&#xe143;" d="M80 784q0 131 98.5 229.5t230.5 98.5q143 0 241 -129q103 129 246 129q129 0 226 -98.5t97 -229.5q0 -46 -17.5 -91t-61 -99t-77 -89.5t-104.5 -105.5q-197 -191 -293 -322l-17 -23l-16 23q-43 58 -100 122.5t-92 99.5t-101 100q-71 70 -104.5 105.5t-77 89.5t-61 99 t-17.5 91zM250 784q0 -27 30.5 -70t61.5 -75.5t95 -94.5l22 -22q93 -90 190 -201q82 92 195 203l12 12q64 62 97.5 97t64.5 79t31 72q0 71 -48 119.5t-105 48.5q-74 0 -132 -83l-118 -171l-114 174q-51 80 -123 80q-60 0 -109.5 -49.5t-49.5 -118.5z" />
-<glyph unicode="&#xe144;" d="M57 353q0 -95 66 -159l141 -142q68 -66 159 -66q93 0 159 66l283 283q66 66 66 159t-66 159l-141 141q-8 9 -19 17l-105 -105l212 -212l-389 -389l-247 248l95 95l-18 18q-46 45 -75 101l-55 -55q-66 -66 -66 -159zM269 706q0 -93 66 -159l141 -141q7 -7 19 -17l105 105 l-212 212l389 389l247 -247l-95 -96l18 -17q47 -49 77 -100l29 29q35 35 62.5 88t27.5 96q0 93 -66 159l-141 141q-66 66 -159 66q-95 0 -159 -66l-283 -283q-66 -64 -66 -159z" />
-<glyph unicode="&#xe145;" d="M200 100v953q0 21 30 46t81 48t129 38t163 15t162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5zM300 300h600v700h-600v-700zM496 150q0 -43 30.5 -73.5t73.5 -30.5t73.5 30.5t30.5 73.5t-30.5 73.5t-73.5 30.5 t-73.5 -30.5t-30.5 -73.5z" />
-<glyph unicode="&#xe146;" d="M0 0l303 380l207 208l-210 212h300l267 279l-35 36q-15 14 -15 35t15 35q14 15 35 15t35 -15l283 -282q15 -15 15 -36t-15 -35q-14 -15 -35 -15t-35 15l-36 35l-279 -267v-300l-212 210l-208 -207z" />
-<glyph unicode="&#xe148;" d="M295 433h139q5 -77 48.5 -126.5t117.5 -64.5v335q-6 1 -15.5 4t-11.5 3q-46 14 -79 26.5t-72 36t-62.5 52t-40 72.5t-16.5 99q0 92 44 159.5t109 101t144 40.5v78h100v-79q38 -4 72.5 -13.5t75.5 -31.5t71 -53.5t51.5 -84t24.5 -118.5h-159q-8 72 -35 109.5t-101 50.5 v-307l64 -14q34 -7 64 -16.5t70 -31.5t67.5 -52t47.5 -80.5t20 -112.5q0 -139 -89 -224t-244 -96v-77h-100v78q-152 17 -237 104q-40 40 -52.5 93.5t-15.5 139.5zM466 889q0 -29 8 -51t16.5 -34t29.5 -22.5t31 -13.5t38 -10q7 -2 11 -3v274q-61 -8 -97.5 -37.5t-36.5 -102.5 zM700 237q170 18 170 151q0 64 -44 99.5t-126 60.5v-311z" />
-<glyph unicode="&#xe149;" d="M100 600v100h166q-24 49 -44 104q-10 26 -14.5 55.5t-3 72.5t25 90t68.5 87q97 88 263 88q129 0 230 -89t101 -208h-153q0 52 -34 89.5t-74 51.5t-76 14q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -28 16.5 -69.5t28 -62.5t41.5 -72h241v-100h-197q8 -50 -2.5 -115 t-31.5 -94q-41 -59 -99 -113q35 11 84 18t70 7q33 1 103 -16t103 -17q76 0 136 30l50 -147q-41 -25 -80.5 -36.5t-59 -13t-61.5 -1.5q-23 0 -128 33t-155 29q-39 -4 -82 -17t-66 -25l-24 -11l-55 145l16.5 11t15.5 10t13.5 9.5t14.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221z" />
-<glyph unicode="&#xe150;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM602 900l298 300l298 -300h-198v-900h-200v900h-198z" />
-<glyph unicode="&#xe151;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v200h100v-100h200v-100h-300zM700 400v100h300v-200h-99v-100h-100v100h99v100h-200zM700 700v500h300v-500h-100v100h-100v-100h-100zM801 900h100v200h-100v-200z" />
-<glyph unicode="&#xe152;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v500h300v-500h-100v100h-100v-100h-100zM700 700v200h100v-100h200v-100h-300zM700 1100v100h300v-200h-99v-100h-100v100h99v100h-200zM801 200h100v200h-100v-200z" />
-<glyph unicode="&#xe153;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 100v400h300v-500h-100v100h-200zM800 1100v100h200v-500h-100v400h-100zM901 200h100v200h-100v-200z" />
-<glyph unicode="&#xe154;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 400v100h200v-500h-100v400h-100zM800 800v400h300v-500h-100v100h-200zM901 900h100v200h-100v-200z" />
-<glyph unicode="&#xe155;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h500v-200h-500zM700 400v200h400v-200h-400zM700 700v200h300v-200h-300zM700 1000v200h200v-200h-200z" />
-<glyph unicode="&#xe156;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h200v-200h-200zM700 400v200h300v-200h-300zM700 700v200h400v-200h-400zM700 1000v200h500v-200h-500z" />
-<glyph unicode="&#xe157;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q162 0 281 -118.5t119 -281.5v-300q0 -165 -118.5 -282.5t-281.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500z" />
-<glyph unicode="&#xe158;" d="M0 400v300q0 163 119 281.5t281 118.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-163 0 -281.5 117.5t-118.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM400 300l333 250l-333 250v-500z" />
-<glyph unicode="&#xe159;" d="M0 400v300q0 163 117.5 281.5t282.5 118.5h300q163 0 281.5 -119t118.5 -281v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 700l250 -333l250 333h-500z" />
-<glyph unicode="&#xe160;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -162 -118.5 -281t-281.5 -119h-300q-165 0 -282.5 118.5t-117.5 281.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 400h500l-250 333z" />
-<glyph unicode="&#xe161;" d="M0 400v300h300v200l400 -350l-400 -350v200h-300zM500 0v200h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-500v200h400q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-400z" />
-<glyph unicode="&#xe162;" d="M217 519q8 -19 31 -19h302q-155 -438 -160 -458q-5 -21 4 -32l9 -8h9q14 0 26 15q11 13 274.5 321.5t264.5 308.5q14 19 5 36q-8 17 -31 17l-301 -1q1 4 78 219.5t79 227.5q2 15 -5 27l-9 9h-9q-15 0 -25 -16q-4 -6 -98 -111.5t-228.5 -257t-209.5 -237.5q-16 -19 -6 -41 z" />
-<glyph unicode="&#xe163;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q47 0 100 15v185h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h500v185q-14 4 -114 7.5t-193 5.5l-93 2q-165 0 -282.5 -117.5t-117.5 -282.5v-300zM600 400v300h300v200l400 -350l-400 -350v200h-300z " />
-<glyph unicode="&#xe164;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q163 0 281.5 117.5t118.5 282.5v98l-78 73l-122 -123v-148q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h156l118 122l-74 78h-100q-165 0 -282.5 -117.5t-117.5 -282.5 v-300zM496 709l353 342l-149 149h500v-500l-149 149l-342 -353z" />
-<glyph unicode="&#xe165;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM406 600 q0 80 57 137t137 57t137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137z" />
-<glyph unicode="&#xe166;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 800l445 -500l450 500h-295v400h-300v-400h-300zM900 150h100v50h-100v-50z" />
-<glyph unicode="&#xe167;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 700h300v-300h300v300h295l-445 500zM900 150h100v50h-100v-50z" />
-<glyph unicode="&#xe168;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 705l305 -305l596 596l-154 155l-442 -442l-150 151zM900 150h100v50h-100v-50z" />
-<glyph unicode="&#xe169;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 988l97 -98l212 213l-97 97zM200 400l697 1l3 699l-250 -239l-149 149l-212 -212l149 -149zM900 150h100v50h-100v-50z" />
-<glyph unicode="&#xe170;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM200 612l212 -212l98 97l-213 212zM300 1200l239 -250l-149 -149l212 -212l149 148l249 -237l-1 697zM900 150h100v50h-100v-50z" />
-<glyph unicode="&#xe171;" d="M23 415l1177 784v-1079l-475 272l-310 -393v416h-392zM494 210l672 938l-672 -712v-226z" />
-<glyph unicode="&#xe172;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-850q0 -21 -15 -35.5t-35 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200z" />
-<glyph unicode="&#xe173;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-218l-276 -275l-120 120l-126 -127h-378v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM581 306l123 123l120 -120l353 352l123 -123l-475 -476zM600 1000h100v200h-100v-200z" />
-<glyph unicode="&#xe174;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-269l-103 -103l-170 170l-298 -298h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200zM700 133l170 170l-170 170l127 127l170 -170l170 170l127 -128l-170 -169l170 -170 l-127 -127l-170 170l-170 -170z" />
-<glyph unicode="&#xe175;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-300h-400v-200h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300l300 -300l300 300h-200v300h-200v-300h-200zM600 1000v200h100v-200h-100z" />
-<glyph unicode="&#xe176;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-402l-200 200l-298 -298h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300h200v-300h200v300h200l-300 300zM600 1000v200h100v-200h-100z" />
-<glyph unicode="&#xe177;" d="M0 250q0 -21 14.5 -35.5t35.5 -14.5h1100q21 0 35.5 14.5t14.5 35.5v550h-1200v-550zM0 900h1200v150q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 300v200h400v-200h-400z" />
-<glyph unicode="&#xe178;" d="M0 400l300 298v-198h400v-200h-400v-198zM100 800v200h100v-200h-100zM300 800v200h100v-200h-100zM500 800v200h400v198l300 -298l-300 -298v198h-400zM800 300v200h100v-200h-100zM1000 300h100v200h-100v-200z" />
-<glyph unicode="&#xe179;" d="M100 700v400l50 100l50 -100v-300h100v300l50 100l50 -100v-300h100v300l50 100l50 -100v-400l-100 -203v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447zM800 597q0 -29 10.5 -55.5t25 -43t29 -28.5t25.5 -18l10 -5v-397q0 -21 14.5 -35.5 t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v1106q0 31 -18 40.5t-44 -7.5l-276 -116q-25 -17 -43.5 -51.5t-18.5 -65.5v-359z" />
-<glyph unicode="&#xe180;" d="M100 0h400v56q-75 0 -87.5 6t-12.5 44v394h500v-394q0 -38 -12.5 -44t-87.5 -6v-56h400v56q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v888q0 22 25 34.5t50 13.5l25 2v56h-400v-56q75 0 87.5 -6t12.5 -44v-394h-500v394q0 38 12.5 44t87.5 6v56h-400v-56q4 0 11 -0.5 t24 -3t30 -7t24 -15t11 -24.5v-888q0 -22 -25 -34.5t-50 -13.5l-25 -2v-56z" />
-<glyph unicode="&#xe181;" d="M0 300q0 -41 29.5 -70.5t70.5 -29.5h300q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-300q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM100 100h400l200 200h105l295 98v-298h-425l-100 -100h-375zM100 300v200h300v-200h-300zM100 600v200h300v-200h-300z M100 1000h400l200 -200v-98l295 98h105v200h-425l-100 100h-375zM700 402v163l400 133v-163z" />
-<glyph unicode="&#xe182;" d="M16.5 974.5q0.5 -21.5 16 -90t46.5 -140t104 -177.5t175 -208q103 -103 207.5 -176t180 -103.5t137 -47t92.5 -16.5l31 1l163 162q17 18 13.5 41t-22.5 37l-192 136q-19 14 -45 12t-42 -19l-118 -118q-142 101 -268 227t-227 268l118 118q17 17 20 41.5t-11 44.5 l-139 194q-14 19 -36.5 22t-40.5 -14l-162 -162q-1 -11 -0.5 -32.5z" />
-<glyph unicode="&#xe183;" d="M0 50v212q0 20 10.5 45.5t24.5 39.5l365 303v50q0 4 1 10.5t12 22.5t30 28.5t60 23t97 10.5t97 -10t60 -23.5t30 -27.5t12 -24l1 -10v-50l365 -303q14 -14 24.5 -39.5t10.5 -45.5v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-20 0 -35 14.5t-15 35.5zM0 712 q0 -21 14.5 -33.5t34.5 -8.5l202 33q20 4 34.5 21t14.5 38v146q141 24 300 24t300 -24v-146q0 -21 14.5 -38t34.5 -21l202 -33q20 -4 34.5 8.5t14.5 33.5v200q-6 8 -19 20.5t-63 45t-112 57t-171 45t-235 20.5q-92 0 -175 -10.5t-141.5 -27t-108.5 -36.5t-81.5 -40 t-53.5 -36.5t-31 -27.5l-9 -10v-200z" />
-<glyph unicode="&#xe184;" d="M100 0v100h1100v-100h-1100zM175 200h950l-125 150v250l100 100v400h-100v-200h-100v200h-200v-200h-100v200h-200v-200h-100v200h-100v-400l100 -100v-250z" />
-<glyph unicode="&#xe185;" d="M100 0h300v400q0 41 -29.5 70.5t-70.5 29.5h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-400zM500 0v1000q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-1000h-300zM900 0v700q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-700h-300z" />
-<glyph unicode="&#xe186;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
-<glyph unicode="&#xe187;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h100v200h100v-200h100v500h-100v-200h-100v200h-100v-500zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
-<glyph unicode="&#xe188;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v100h-200v300h200v100h-300v-500zM600 300h300v100h-200v300h200v100h-300v-500z" />
-<glyph unicode="&#xe189;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 550l300 -150v300zM600 400l300 150l-300 150v-300z" />
-<glyph unicode="&#xe190;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300v500h700v-500h-700zM300 400h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130v-300zM575 549 q0 -65 27 -107t68 -42h130v300h-130q-38 0 -66.5 -43t-28.5 -108z" />
-<glyph unicode="&#xe191;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
-<glyph unicode="&#xe192;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v400h-200v100h-100v-500zM301 400v200h100v-200h-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
-<glyph unicode="&#xe193;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 700v100h300v-300h-99v-100h-100v100h99v200h-200zM201 300v100h100v-100h-100zM601 300v100h100v-100h-100z M700 700v100h200v-500h-100v400h-100z" />
-<glyph unicode="&#xe194;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 500v200 l100 100h300v-100h-300v-200h300v-100h-300z" />
-<glyph unicode="&#xe195;" d="M0 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 400v400h300 l100 -100v-100h-100v100h-200v-100h200v-100h-200v-100h-100zM700 400v100h100v-100h-100z" />
-<glyph unicode="&#xe197;" d="M-14 494q0 -80 56.5 -137t135.5 -57h222v300h400v-300h128q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200h200v300h200v-300h200 l-300 -300z" />
-<glyph unicode="&#xe198;" d="M-14 494q0 -80 56.5 -137t135.5 -57h8l414 414l403 -403q94 26 154.5 104.5t60.5 178.5q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200l300 300 l300 -300h-200v-300h-200v300h-200z" />
-<glyph unicode="&#xe199;" d="M100 200h400v-155l-75 -45h350l-75 45v155h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170z" />
-<glyph unicode="&#xe200;" d="M121 700q0 -53 28.5 -97t75.5 -65q-4 -16 -4 -38q0 -74 52.5 -126.5t126.5 -52.5q56 0 100 30v-306l-75 -45h350l-75 45v306q46 -30 100 -30q74 0 126.5 52.5t52.5 126.5q0 24 -9 55q50 32 79.5 83t29.5 112q0 90 -61.5 155.5t-150.5 71.5q-26 89 -99.5 145.5 t-167.5 56.5q-116 0 -197.5 -81.5t-81.5 -197.5q0 -4 1 -11.5t1 -11.5q-14 2 -23 2q-74 0 -126.5 -52.5t-52.5 -126.5z" />
-</font>
-</defs></svg> 
\ No newline at end of file
+	<metadata></metadata>
+	<defs>
+		<font id="glyphicons_halflingsregular" horiz-adv-x="1200">
+			<font-face units-per-em="1200" ascent="960" descent="-240"/>
+			<missing-glyph horiz-adv-x="500"/>
+			<glyph/>
+			<glyph/>
+			<glyph unicode="&#xd;"/>
+			<glyph unicode=" "/>
+			<glyph unicode="*"
+				   d="M100 500v200h259l-183 183l141 141l183 -183v259h200v-259l183 183l141 -141l-183 -183h259v-200h-259l183 -183l-141 -141l-183 183v-259h-200v259l-183 -183l-141 141l183 183h-259z"/>
+			<glyph unicode="+" d="M0 400v300h400v400h300v-400h400v-300h-400v-400h-300v400h-400z"/>
+			<glyph unicode="&#xa0;"/>
+			<glyph unicode="&#x2000;" horiz-adv-x="652"/>
+			<glyph unicode="&#x2001;" horiz-adv-x="1304"/>
+			<glyph unicode="&#x2002;" horiz-adv-x="652"/>
+			<glyph unicode="&#x2003;" horiz-adv-x="1304"/>
+			<glyph unicode="&#x2004;" horiz-adv-x="434"/>
+			<glyph unicode="&#x2005;" horiz-adv-x="326"/>
+			<glyph unicode="&#x2006;" horiz-adv-x="217"/>
+			<glyph unicode="&#x2007;" horiz-adv-x="217"/>
+			<glyph unicode="&#x2008;" horiz-adv-x="163"/>
+			<glyph unicode="&#x2009;" horiz-adv-x="260"/>
+			<glyph unicode="&#x200a;" horiz-adv-x="72"/>
+			<glyph unicode="&#x202f;" horiz-adv-x="260"/>
+			<glyph unicode="&#x205f;" horiz-adv-x="326"/>
+			<glyph unicode="&#x20ac;"
+				   d="M100 500l100 100h113q0 47 5 100h-218l100 100h135q37 167 112 257q117 141 297 141q242 0 354 -189q60 -103 66 -209h-181q0 55 -25.5 99t-63.5 68t-75 36.5t-67 12.5q-24 0 -52.5 -10t-62.5 -32t-65.5 -67t-50.5 -107h379l-100 -100h-300q-6 -46 -6 -100h406l-100 -100 h-300q9 -74 33 -132t52.5 -91t62 -54.5t59 -29t46.5 -7.5q29 0 66 13t75 37t63.5 67.5t25.5 96.5h174q-31 -172 -128 -278q-107 -117 -274 -117q-205 0 -324 158q-36 46 -69 131.5t-45 205.5h-217z"/>
+			<glyph unicode="&#x2212;" d="M200 400h900v300h-900v-300z"/>
+			<glyph unicode="&#x25fc;" horiz-adv-x="500" d="M0 0z"/>
+			<glyph unicode="&#x2601;"
+				   d="M-14 494q0 -80 56.5 -137t135.5 -57h750q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5z"/>
+			<glyph unicode="&#x2709;"
+				   d="M0 100l400 400l200 -200l200 200l400 -400h-1200zM0 300v600l300 -300zM0 1100l600 -603l600 603h-1200zM900 600l300 300v-600z"/>
+			<glyph unicode="&#x270f;"
+				   d="M-13 -13l333 112l-223 223zM187 403l214 -214l614 614l-214 214zM887 1103l214 -214l99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13 -33 13t-33 -13z"/>
+			<glyph unicode="&#xe001;" d="M0 1200h1200l-500 -550v-550h300v-100h-800v100h300v550z"/>
+			<glyph unicode="&#xe002;"
+				   d="M14 84q18 -55 86 -75.5t147 5.5q65 21 109 69t44 90v606l600 155v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q18 -55 86 -75.5t147 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10 -3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7 q-79 -25 -122.5 -82t-25.5 -112z"/>
+			<glyph unicode="&#xe003;"
+				   d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233z"/>
+			<glyph unicode="&#xe005;"
+				   d="M100 784q0 64 28 123t73 100.5t104.5 64t119 20.5t120 -38.5t104.5 -104.5q48 69 109.5 105t121.5 38t118.5 -20.5t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-149.5 152.5t-126.5 127.5 t-94 124.5t-33.5 117.5z"/>
+			<glyph unicode="&#xe006;"
+				   d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1z"/>
+			<glyph unicode="&#xe007;"
+				   d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1zM237 700l196 -142l-73 -226l192 140l195 -141l-74 229l193 140h-235l-77 211l-78 -211h-239z"/>
+			<glyph unicode="&#xe008;"
+				   d="M0 0v143l400 257v100q-37 0 -68.5 74.5t-31.5 125.5v200q0 124 88 212t212 88t212 -88t88 -212v-200q0 -51 -31.5 -125.5t-68.5 -74.5v-100l400 -257v-143h-1200z"/>
+			<glyph unicode="&#xe009;"
+				   d="M0 0v1100h1200v-1100h-1200zM100 100h100v100h-100v-100zM100 300h100v100h-100v-100zM100 500h100v100h-100v-100zM100 700h100v100h-100v-100zM100 900h100v100h-100v-100zM300 100h600v400h-600v-400zM300 600h600v400h-600v-400zM1000 100h100v100h-100v-100z M1000 300h100v100h-100v-100zM1000 500h100v100h-100v-100zM1000 700h100v100h-100v-100zM1000 900h100v100h-100v-100z"/>
+			<glyph unicode="&#xe010;"
+				   d="M0 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM0 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5zM600 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM600 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5z"/>
+			<glyph unicode="&#xe011;"
+				   d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 450v200q0 21 14.5 35.5t35.5 14.5h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5z"/>
+			<glyph unicode="&#xe012;"
+				   d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v200q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5 t-14.5 -35.5v-200zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5z"/>
+			<glyph unicode="&#xe013;" d="M29 454l419 -420l818 820l-212 212l-607 -607l-206 207z"/>
+			<glyph unicode="&#xe014;"
+				   d="M106 318l282 282l-282 282l212 212l282 -282l282 282l212 -212l-282 -282l282 -282l-212 -212l-282 282l-282 -282z"/>
+			<glyph unicode="&#xe015;"
+				   d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233zM300 600v200h100v100h200v-100h100v-200h-100v-100h-200v100h-100z"/>
+			<glyph unicode="&#xe016;"
+				   d="M23 694q0 200 142 342t342 142t342 -142t142 -342q0 -141 -78 -262l300 -299q7 -7 7 -18t-7 -18l-109 -109q-8 -8 -18 -8t-18 8l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 694q0 -136 97 -233t234 -97t233.5 97t96.5 233t-96.5 233t-233.5 97t-234 -97 t-97 -233zM300 601h400v200h-400v-200z"/>
+			<glyph unicode="&#xe017;"
+				   d="M23 600q0 183 105 331t272 210v-166q-103 -55 -165 -155t-62 -220q0 -177 125 -302t302 -125t302 125t125 302q0 120 -62 220t-165 155v166q167 -62 272 -210t105 -331q0 -118 -45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5 zM500 750q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v400q0 21 -14.5 35.5t-35.5 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-400z"/>
+			<glyph unicode="&#xe018;"
+				   d="M100 1h200v300h-200v-300zM400 1v500h200v-500h-200zM700 1v800h200v-800h-200zM1000 1v1200h200v-1200h-200z"/>
+			<glyph unicode="&#xe019;"
+				   d="M26 601q0 -33 6 -74l151 -38l2 -6q14 -49 38 -93l3 -5l-80 -134q45 -59 105 -105l133 81l5 -3q45 -26 94 -39l5 -2l38 -151q40 -5 74 -5q27 0 74 5l38 151l6 2q46 13 93 39l5 3l134 -81q56 44 104 105l-80 134l3 5q24 44 39 93l1 6l152 38q5 40 5 74q0 28 -5 73l-152 38 l-1 6q-16 51 -39 93l-3 5l80 134q-44 58 -104 105l-134 -81l-5 3q-45 25 -93 39l-6 1l-38 152q-40 5 -74 5q-27 0 -74 -5l-38 -152l-5 -1q-50 -14 -94 -39l-5 -3l-133 81q-59 -47 -105 -105l80 -134l-3 -5q-25 -47 -38 -93l-2 -6l-151 -38q-6 -48 -6 -73zM385 601 q0 88 63 151t152 63t152 -63t63 -151q0 -89 -63 -152t-152 -63t-152 63t-63 152z"/>
+			<glyph unicode="&#xe020;"
+				   d="M100 1025v50q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-50q0 -11 -7 -18t-18 -7h-1050q-11 0 -18 7t-7 18zM200 100v800h900v-800q0 -41 -29.5 -71t-70.5 -30h-700q-41 0 -70.5 30 t-29.5 71zM300 100h100v700h-100v-700zM500 100h100v700h-100v-700zM500 1100h300v100h-300v-100zM700 100h100v700h-100v-700zM900 100h100v700h-100v-700z"/>
+			<glyph unicode="&#xe021;" d="M1 601l656 644l644 -644h-200v-600h-300v400h-300v-400h-300v600h-200z"/>
+			<glyph unicode="&#xe022;"
+				   d="M100 25v1150q0 11 7 18t18 7h475v-500h400v-675q0 -11 -7 -18t-18 -7h-850q-11 0 -18 7t-7 18zM700 800v300l300 -300h-300z"/>
+			<glyph unicode="&#xe023;"
+				   d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 500v400h100 v-300h200v-100h-300z"/>
+			<glyph unicode="&#xe024;"
+				   d="M-100 0l431 1200h209l-21 -300h162l-20 300h208l431 -1200h-538l-41 400h-242l-40 -400h-539zM488 500h224l-27 300h-170z"/>
+			<glyph unicode="&#xe025;"
+				   d="M0 0v400h490l-290 300h200v500h300v-500h200l-290 -300h490v-400h-1100zM813 200h175v100h-175v-100z"/>
+			<glyph unicode="&#xe026;"
+				   d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM188 600q0 -170 121 -291t291 -121t291 121t121 291t-121 291t-291 121 t-291 -121t-121 -291zM350 600h150v300h200v-300h150l-250 -300z"/>
+			<glyph unicode="&#xe027;"
+				   d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM350 600l250 300 l250 -300h-150v-300h-200v300h-150z"/>
+			<glyph unicode="&#xe028;"
+				   d="M0 25v475l200 700h800l199 -700l1 -475q0 -11 -7 -18t-18 -7h-1150q-11 0 -18 7t-7 18zM200 500h200l50 -200h300l50 200h200l-97 500h-606z"/>
+			<glyph unicode="&#xe029;"
+				   d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 397v401 l297 -200z"/>
+			<glyph unicode="&#xe030;"
+				   d="M23 600q0 -118 45.5 -224.5t123 -184t184 -123t224.5 -45.5t224.5 45.5t184 123t123 184t45.5 224.5h-150q0 -177 -125 -302t-302 -125t-302 125t-125 302t125 302t302 125q136 0 246 -81l-146 -146h400v400l-145 -145q-157 122 -355 122q-118 0 -224.5 -45.5t-184 -123 t-123 -184t-45.5 -224.5z"/>
+			<glyph unicode="&#xe031;"
+				   d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5q198 0 355 -122l145 145v-400h-400l147 147q-112 80 -247 80q-177 0 -302 -125t-125 -302h-150zM100 0v400h400l-147 -147q112 -80 247 -80q177 0 302 125t125 302h150q0 -118 -45.5 -224.5t-123 -184t-184 -123 t-224.5 -45.5q-198 0 -355 122z"/>
+			<glyph unicode="&#xe032;"
+				   d="M100 0h1100v1200h-1100v-1200zM200 100v900h900v-900h-900zM300 200v100h100v-100h-100zM300 400v100h100v-100h-100zM300 600v100h100v-100h-100zM300 800v100h100v-100h-100zM500 200h500v100h-500v-100zM500 400v100h500v-100h-500zM500 600v100h500v-100h-500z M500 800v100h500v-100h-500z"/>
+			<glyph unicode="&#xe033;"
+				   d="M0 100v600q0 41 29.5 70.5t70.5 29.5h100v200q0 82 59 141t141 59h300q82 0 141 -59t59 -141v-200h100q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-900q-41 0 -70.5 29.5t-29.5 70.5zM400 800h300v150q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-150z"/>
+			<glyph unicode="&#xe034;"
+				   d="M100 0v1100h100v-1100h-100zM300 400q60 60 127.5 84t127.5 17.5t122 -23t119 -30t110 -11t103 42t91 120.5v500q-40 -81 -101.5 -115.5t-127.5 -29.5t-138 25t-139.5 40t-125.5 25t-103 -29.5t-65 -115.5v-500z"/>
+			<glyph unicode="&#xe035;"
+				   d="M0 275q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 127 70.5 231.5t184.5 161.5t245 57t245 -57t184.5 -161.5t70.5 -231.5v-300q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 116 -49.5 227t-131 192.5t-192.5 131t-227 49.5t-227 -49.5t-192.5 -131t-131 -192.5 t-49.5 -227v-300zM200 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14zM800 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14z"/>
+			<glyph unicode="&#xe036;"
+				   d="M0 400h300l300 -200v800l-300 -200h-300v-400zM688 459l141 141l-141 141l71 71l141 -141l141 141l71 -71l-141 -141l141 -141l-71 -71l-141 141l-141 -141z"/>
+			<glyph unicode="&#xe037;"
+				   d="M0 400h300l300 -200v800l-300 -200h-300v-400zM700 857l69 53q111 -135 111 -310q0 -169 -106 -302l-67 54q86 110 86 248q0 146 -93 257z"/>
+			<glyph unicode="&#xe038;"
+				   d="M0 401v400h300l300 200v-800l-300 200h-300zM702 858l69 53q111 -135 111 -310q0 -170 -106 -303l-67 55q86 110 86 248q0 145 -93 257zM889 951l7 -8q123 -151 123 -344q0 -189 -119 -339l-7 -8l81 -66l6 8q142 178 142 405q0 230 -144 408l-6 8z"/>
+			<glyph unicode="&#xe039;"
+				   d="M0 0h500v500h-200v100h-100v-100h-200v-500zM0 600h100v100h400v100h100v100h-100v300h-500v-600zM100 100v300h300v-300h-300zM100 800v300h300v-300h-300zM200 200v100h100v-100h-100zM200 900h100v100h-100v-100zM500 500v100h300v-300h200v-100h-100v-100h-200v100 h-100v100h100v200h-200zM600 0v100h100v-100h-100zM600 1000h100v-300h200v-300h300v200h-200v100h200v500h-600v-200zM800 800v300h300v-300h-300zM900 0v100h300v-100h-300zM900 900v100h100v-100h-100zM1100 200v100h100v-100h-100z"/>
+			<glyph unicode="&#xe040;"
+				   d="M0 200h100v1000h-100v-1000zM100 0v100h300v-100h-300zM200 200v1000h100v-1000h-100zM500 0v91h100v-91h-100zM500 200v1000h200v-1000h-200zM700 0v91h100v-91h-100zM800 200v1000h100v-1000h-100zM900 0v91h200v-91h-200zM1000 200v1000h200v-1000h-200z"/>
+			<glyph unicode="&#xe041;"
+				   d="M0 700l1 475q0 10 7.5 17.5t17.5 7.5h474l700 -700l-500 -500zM148 953q0 -42 29 -71q30 -30 71.5 -30t71.5 30q29 29 29 71t-29 71q-30 30 -71.5 30t-71.5 -30q-29 -29 -29 -71z"/>
+			<glyph unicode="&#xe042;"
+				   d="M1 700l1 475q0 11 7 18t18 7h474l700 -700l-500 -500zM148 953q0 -42 30 -71q29 -30 71 -30t71 30q30 29 30 71t-30 71q-29 30 -71 30t-71 -30q-30 -29 -30 -71zM701 1200h100l700 -700l-500 -500l-50 50l450 450z"/>
+			<glyph unicode="&#xe043;" d="M100 0v1025l175 175h925v-1000l-100 -100v1000h-750l-100 -100h750v-1000h-900z"/>
+			<glyph unicode="&#xe044;"
+				   d="M200 0l450 444l450 -443v1150q0 20 -14.5 35t-35.5 15h-800q-21 0 -35.5 -15t-14.5 -35v-1151z"/>
+			<glyph unicode="&#xe045;"
+				   d="M0 100v700h200l100 -200h600l100 200h200v-700h-200v200h-800v-200h-200zM253 829l40 -124h592l62 124l-94 346q-2 11 -10 18t-18 7h-450q-10 0 -18 -7t-10 -18zM281 24l38 152q2 10 11.5 17t19.5 7h500q10 0 19.5 -7t11.5 -17l38 -152q2 -10 -3.5 -17t-15.5 -7h-600 q-10 0 -15.5 7t-3.5 17z"/>
+			<glyph unicode="&#xe046;"
+				   d="M0 200q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-150q-4 8 -11.5 21.5t-33 48t-53 61t-69 48t-83.5 21.5h-200q-41 0 -82 -20.5t-70 -50t-52 -59t-34 -50.5l-12 -20h-150q-41 0 -70.5 -29.5t-29.5 -70.5v-600z M356 500q0 100 72 172t172 72t172 -72t72 -172t-72 -172t-172 -72t-172 72t-72 172zM494 500q0 -44 31 -75t75 -31t75 31t31 75t-31 75t-75 31t-75 -31t-31 -75zM900 700v100h100v-100h-100z"/>
+			<glyph unicode="&#xe047;"
+				   d="M53 0h365v66q-41 0 -72 11t-49 38t1 71l92 234h391l82 -222q16 -45 -5.5 -88.5t-74.5 -43.5v-66h417v66q-34 1 -74 43q-18 19 -33 42t-21 37l-6 13l-385 998h-93l-399 -1006q-24 -48 -52 -75q-12 -12 -33 -25t-36 -20l-15 -7v-66zM416 521l178 457l46 -140l116 -317h-340 z"/>
+			<glyph unicode="&#xe048;"
+				   d="M100 0v89q41 7 70.5 32.5t29.5 65.5v827q0 28 -1 39.5t-5.5 26t-15.5 21t-29 14t-49 14.5v71l471 -1q120 0 213 -88t93 -228q0 -55 -11.5 -101.5t-28 -74t-33.5 -47.5t-28 -28l-12 -7q8 -3 21.5 -9t48 -31.5t60.5 -58t47.5 -91.5t21.5 -129q0 -84 -59 -156.5t-142 -111 t-162 -38.5h-500zM400 200h161q89 0 153 48.5t64 132.5q0 90 -62.5 154.5t-156.5 64.5h-159v-400zM400 700h139q76 0 130 61.5t54 138.5q0 82 -84 130.5t-239 48.5v-379z"/>
+			<glyph unicode="&#xe049;"
+				   d="M200 0v57q77 7 134.5 40.5t65.5 80.5l173 849q10 56 -10 74t-91 37q-6 1 -10.5 2.5t-9.5 2.5v57h425l2 -57q-33 -8 -62 -25.5t-46 -37t-29.5 -38t-17.5 -30.5l-5 -12l-128 -825q-10 -52 14 -82t95 -36v-57h-500z"/>
+			<glyph unicode="&#xe050;"
+				   d="M-75 200h75v800h-75l125 167l125 -167h-75v-800h75l-125 -167zM300 900v300h150h700h150v-300h-50q0 29 -8 48.5t-18.5 30t-33.5 15t-39.5 5.5t-50.5 1h-200v-850l100 -50v-100h-400v100l100 50v850h-200q-34 0 -50.5 -1t-40 -5.5t-33.5 -15t-18.5 -30t-8.5 -48.5h-49z "/>
+			<glyph unicode="&#xe051;"
+				   d="M33 51l167 125v-75h800v75l167 -125l-167 -125v75h-800v-75zM100 901v300h150h700h150v-300h-50q0 29 -8 48.5t-18 30t-33.5 15t-40 5.5t-50.5 1h-200v-650l100 -50v-100h-400v100l100 50v650h-200q-34 0 -50.5 -1t-39.5 -5.5t-33.5 -15t-18.5 -30t-8 -48.5h-50z"/>
+			<glyph unicode="&#xe052;"
+				   d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 350q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM0 650q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1000q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 950q0 -20 14.5 -35t35.5 -15h600q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-600q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z"/>
+			<glyph unicode="&#xe053;"
+				   d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 650q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM200 350q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM200 950q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z"/>
+			<glyph unicode="&#xe054;"
+				   d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1000q-21 0 -35.5 15 t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-600 q-21 0 -35.5 15t-14.5 35z"/>
+			<glyph unicode="&#xe055;"
+				   d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100 q-21 0 -35.5 15t-14.5 35z"/>
+			<glyph unicode="&#xe056;"
+				   d="M0 50v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM300 50v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800 q-21 0 -35.5 15t-14.5 35zM300 650v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 950v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15 h-800q-21 0 -35.5 15t-14.5 35z"/>
+			<glyph unicode="&#xe057;"
+				   d="M-101 500v100h201v75l166 -125l-166 -125v75h-201zM300 0h100v1100h-100v-1100zM500 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35 v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 650q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100 q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100z"/>
+			<glyph unicode="&#xe058;"
+				   d="M1 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 650 q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM801 0v1100h100v-1100 h-100zM934 550l167 -125v75h200v100h-200v75z"/>
+			<glyph unicode="&#xe059;"
+				   d="M0 275v650q0 31 22 53t53 22h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53zM900 600l300 300v-600z"/>
+			<glyph unicode="&#xe060;"
+				   d="M0 44v1012q0 18 13 31t31 13h1112q19 0 31.5 -13t12.5 -31v-1012q0 -18 -12.5 -31t-31.5 -13h-1112q-18 0 -31 13t-13 31zM100 263l247 182l298 -131l-74 156l293 318l236 -288v500h-1000v-737zM208 750q0 56 39 95t95 39t95 -39t39 -95t-39 -95t-95 -39t-95 39t-39 95z "/>
+			<glyph unicode="&#xe062;"
+				   d="M148 745q0 124 60.5 231.5t165 172t226.5 64.5q123 0 227 -63t164.5 -169.5t60.5 -229.5t-73 -272q-73 -114 -166.5 -237t-150.5 -189l-57 -66q-10 9 -27 26t-66.5 70.5t-96 109t-104 135.5t-100.5 155q-63 139 -63 262zM342 772q0 -107 75.5 -182.5t181.5 -75.5 q107 0 182.5 75.5t75.5 182.5t-75.5 182t-182.5 75t-182 -75.5t-75 -181.5z"/>
+			<glyph unicode="&#xe063;"
+				   d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM173 600q0 -177 125.5 -302t301.5 -125v854q-176 0 -301.5 -125 t-125.5 -302z"/>
+			<glyph unicode="&#xe064;"
+				   d="M117 406q0 94 34 186t88.5 172.5t112 159t115 177t87.5 194.5q21 -71 57.5 -142.5t76 -130.5t83 -118.5t82 -117t70 -116t50 -125.5t18.5 -136q0 -89 -39 -165.5t-102 -126.5t-140 -79.5t-156 -33.5q-114 6 -211.5 53t-161.5 139t-64 210zM243 414q14 -82 59.5 -136 t136.5 -80l16 98q-7 6 -18 17t-34 48t-33 77q-15 73 -14 143.5t10 122.5l9 51q-92 -110 -119.5 -185t-12.5 -156z"/>
+			<glyph unicode="&#xe065;"
+				   d="M0 400v300q0 165 117.5 282.5t282.5 117.5q366 -6 397 -14l-186 -186h-311q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v125l200 200v-225q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM436 341l161 50l412 412l-114 113l-405 -405zM995 1015l113 -113l113 113l-21 85l-92 28z"/>
+			<glyph unicode="&#xe066;"
+				   d="M0 400v300q0 165 117.5 282.5t282.5 117.5h261l2 -80q-133 -32 -218 -120h-145q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-53q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5 zM423 524q30 38 81.5 64t103 35.5t99 14t77.5 3.5l29 -1v-209l360 324l-359 318v-216q-7 0 -19 -1t-48 -8t-69.5 -18.5t-76.5 -37t-76.5 -59t-62 -88t-39.5 -121.5z"/>
+			<glyph unicode="&#xe067;"
+				   d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q61 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-169q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM342 632l283 -284l567 567l-137 137l-430 -431l-146 147z"/>
+			<glyph unicode="&#xe068;"
+				   d="M0 603l300 296v-198h200v200h-200l300 300l295 -300h-195v-200h200v198l300 -296l-300 -300v198h-200v-200h195l-295 -300l-300 300h200v200h-200v-198z"/>
+			<glyph unicode="&#xe069;"
+				   d="M200 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-1100l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z"/>
+			<glyph unicode="&#xe070;"
+				   d="M0 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-487l500 487v-1100l-500 488v-488l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z"/>
+			<glyph unicode="&#xe071;" d="M136 550l564 550v-487l500 487v-1100l-500 488v-488z"/>
+			<glyph unicode="&#xe072;" d="M200 0l900 550l-900 550v-1100z"/>
+			<glyph unicode="&#xe073;"
+				   d="M200 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5t-14.5 -35.5v-800zM600 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-800z"/>
+			<glyph unicode="&#xe074;"
+				   d="M200 150q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v800q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5v-800z"/>
+			<glyph unicode="&#xe075;" d="M0 0v1100l500 -487v487l564 -550l-564 -550v488z"/>
+			<glyph unicode="&#xe076;"
+				   d="M0 0v1100l500 -487v487l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-500 -488v488z"/>
+			<glyph unicode="&#xe077;"
+				   d="M300 0v1100l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438z"/>
+			<glyph unicode="&#xe078;"
+				   d="M100 250v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5zM100 500h1100l-550 564z"/>
+			<glyph unicode="&#xe079;" d="M185 599l592 -592l240 240l-353 353l353 353l-240 240z"/>
+			<glyph unicode="&#xe080;" d="M272 194l353 353l-353 353l241 240l572 -571l21 -22l-1 -1v-1l-592 -591z"/>
+			<glyph unicode="&#xe081;"
+				   d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h200v-200h200v200h200v200h-200v200h-200v-200h-200v-200z"/>
+			<glyph unicode="&#xe082;"
+				   d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM300 500h600v200h-600v-200z"/>
+			<glyph unicode="&#xe083;"
+				   d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM246 459l213 -213l141 142l141 -142l213 213l-142 141l142 141l-213 212l-141 -141l-141 142l-212 -213l141 -141 z"/>
+			<glyph unicode="&#xe084;"
+				   d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM270 551l276 -277l411 411l-175 174l-236 -236l-102 102z"/>
+			<glyph unicode="&#xe085;"
+				   d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM364 700h143q4 0 11.5 -1t11 -1t6.5 3t3 9t1 11t3.5 8.5t3.5 6t5.5 4t6.5 2.5t9 1.5t9 0.5h11.5h12.5 q19 0 30 -10t11 -26q0 -22 -4 -28t-27 -22q-5 -1 -12.5 -3t-27 -13.5t-34 -27t-26.5 -46t-11 -68.5h200q5 3 14 8t31.5 25.5t39.5 45.5t31 69t14 94q0 51 -17.5 89t-42 58t-58.5 32t-58.5 15t-51.5 3q-50 0 -90.5 -12t-75 -38.5t-53.5 -74.5t-19 -114zM500 300h200v100h-200 v-100z"/>
+			<glyph unicode="&#xe086;"
+				   d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM400 300h400v100h-100v300h-300v-100h100v-200h-100v-100zM500 800h200v100h-200v-100z"/>
+			<glyph unicode="&#xe087;"
+				   d="M0 500v200h195q31 125 98.5 199.5t206.5 100.5v200h200v-200q54 -20 113 -60t112.5 -105.5t71.5 -134.5h203v-200h-203q-25 -102 -116.5 -186t-180.5 -117v-197h-200v197q-140 27 -208 102.5t-98 200.5h-194zM290 500q24 -73 79.5 -127.5t130.5 -78.5v206h200v-206 q149 48 201 206h-201v200h200q-25 74 -75.5 127t-124.5 77v-204h-200v203q-75 -23 -130 -77t-79 -126h209v-200h-210z"/>
+			<glyph unicode="&#xe088;"
+				   d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM356 465l135 135 l-135 135l109 109l135 -135l135 135l109 -109l-135 -135l135 -135l-109 -109l-135 135l-135 -135z"/>
+			<glyph unicode="&#xe089;"
+				   d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM322 537l141 141 l87 -87l204 205l142 -142l-346 -345z"/>
+			<glyph unicode="&#xe090;"
+				   d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -115 62 -215l568 567q-100 62 -216 62q-171 0 -292.5 -121.5t-121.5 -292.5zM391 245q97 -59 209 -59q171 0 292.5 121.5t121.5 292.5 q0 112 -59 209z"/>
+			<glyph unicode="&#xe091;" d="M0 547l600 453v-300h600v-300h-600v-301z"/>
+			<glyph unicode="&#xe092;" d="M0 400v300h600v300l600 -453l-600 -448v301h-600z"/>
+			<glyph unicode="&#xe093;" d="M204 600l450 600l444 -600h-298v-600h-300v600h-296z"/>
+			<glyph unicode="&#xe094;" d="M104 600h296v600h300v-600h298l-449 -600z"/>
+			<glyph unicode="&#xe095;"
+				   d="M0 200q6 132 41 238.5t103.5 193t184 138t271.5 59.5v271l600 -453l-600 -448v301q-95 -2 -183 -20t-170 -52t-147 -92.5t-100 -135.5z"/>
+			<glyph unicode="&#xe096;"
+				   d="M0 0v400l129 -129l294 294l142 -142l-294 -294l129 -129h-400zM635 777l142 -142l294 294l129 -129v400h-400l129 -129z"/>
+			<glyph unicode="&#xe097;"
+				   d="M34 176l295 295l-129 129h400v-400l-129 130l-295 -295zM600 600v400l129 -129l295 295l142 -141l-295 -295l129 -130h-400z"/>
+			<glyph unicode="&#xe101;"
+				   d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM456 851l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5 t21.5 34.5l58 302q4 20 -8 34.5t-32 14.5h-207q-21 0 -33 -14.5t-8 -34.5zM500 300h200v100h-200v-100z"/>
+			<glyph unicode="&#xe102;"
+				   d="M0 800h100v-200h400v300h200v-300h400v200h100v100h-111q1 1 1 6.5t-1.5 15t-3.5 17.5l-34 172q-11 39 -41.5 63t-69.5 24q-32 0 -61 -17l-239 -144q-22 -13 -40 -35q-19 24 -40 36l-238 144q-33 18 -62 18q-39 0 -69.5 -23t-40.5 -61l-35 -177q-2 -8 -3 -18t-1 -15v-6 h-111v-100zM100 0h400v400h-400v-400zM200 900q-3 0 14 48t36 96l18 47l213 -191h-281zM700 0v400h400v-400h-400zM731 900l202 197q5 -12 12 -32.5t23 -64t25 -72t7 -28.5h-269z"/>
+			<glyph unicode="&#xe103;"
+				   d="M0 -22v143l216 193q-9 53 -13 83t-5.5 94t9 113t38.5 114t74 124q47 60 99.5 102.5t103 68t127.5 48t145.5 37.5t184.5 43.5t220 58.5q0 -189 -22 -343t-59 -258t-89 -181.5t-108.5 -120t-122 -68t-125.5 -30t-121.5 -1.5t-107.5 12.5t-87.5 17t-56.5 7.5l-99 -55z M238.5 300.5q19.5 -6.5 86.5 76.5q55 66 367 234q70 38 118.5 69.5t102 79t99 111.5t86.5 148q22 50 24 60t-6 19q-7 5 -17 5t-26.5 -14.5t-33.5 -39.5q-35 -51 -113.5 -108.5t-139.5 -89.5l-61 -32q-369 -197 -458 -401q-48 -111 -28.5 -117.5z"/>
+			<glyph unicode="&#xe104;"
+				   d="M111 408q0 -33 5 -63q9 -56 44 -119.5t105 -108.5q31 -21 64 -16t62 23.5t57 49.5t48 61.5t35 60.5q32 66 39 184.5t-13 157.5q79 -80 122 -164t26 -184q-5 -33 -20.5 -69.5t-37.5 -80.5q-10 -19 -14.5 -29t-12 -26t-9 -23.5t-3 -19t2.5 -15.5t11 -9.5t19.5 -5t30.5 2.5 t42 8q57 20 91 34t87.5 44.5t87 64t65.5 88.5t47 122q38 172 -44.5 341.5t-246.5 278.5q22 -44 43 -129q39 -159 -32 -154q-15 2 -33 9q-79 33 -120.5 100t-44 175.5t48.5 257.5q-13 -8 -34 -23.5t-72.5 -66.5t-88.5 -105.5t-60 -138t-8 -166.5q2 -12 8 -41.5t8 -43t6 -39.5 t3.5 -39.5t-1 -33.5t-6 -31.5t-13.5 -24t-21 -20.5t-31 -12q-38 -10 -67 13t-40.5 61.5t-15 81.5t10.5 75q-52 -46 -83.5 -101t-39 -107t-7.5 -85z"/>
+			<glyph unicode="&#xe105;"
+				   d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5t145.5 -23.5t132.5 -59t116.5 -83.5t97 -90t74.5 -85.5t49 -63.5t20 -30l26 -40l-26 -40q-6 -10 -20 -30t-49 -63.5t-74.5 -85.5t-97 -90t-116.5 -83.5t-132.5 -59t-145.5 -23.5 t-145.5 23.5t-132.5 59t-116.5 83.5t-97 90t-74.5 85.5t-49 63.5t-20 30zM120 600q7 -10 40.5 -58t56 -78.5t68 -77.5t87.5 -75t103 -49.5t125 -21.5t123.5 20t100.5 45.5t85.5 71.5t66.5 75.5t58 81.5t47 66q-1 1 -28.5 37.5t-42 55t-43.5 53t-57.5 63.5t-58.5 54 q49 -74 49 -163q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l105 105q-37 24 -75 72t-57 84l-20 36z"/>
+			<glyph unicode="&#xe106;"
+				   d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5q61 0 121 -17l37 142h148l-314 -1200h-148l37 143q-82 21 -165 71.5t-140 102t-109.5 112t-72 88.5t-29.5 43zM120 600q210 -282 393 -336l37 141q-107 18 -178.5 101.5t-71.5 193.5 q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l47 47l23 87q-30 28 -59 69t-44 68l-14 26zM780 161l38 145q22 15 44.5 34t46 44t40.5 44t41 50.5t33.5 43.5t33 44t24.5 34q-97 127 -140 175l39 146q67 -54 131.5 -125.5t87.5 -103.5t36 -52l26 -40l-26 -40 q-7 -12 -25.5 -38t-63.5 -79.5t-95.5 -102.5t-124 -100t-146.5 -79z"/>
+			<glyph unicode="&#xe107;"
+				   d="M-97.5 34q13.5 -34 50.5 -34h1294q37 0 50.5 35.5t-7.5 67.5l-642 1056q-20 34 -48 36.5t-48 -29.5l-642 -1066q-21 -32 -7.5 -66zM155 200l445 723l445 -723h-345v100h-200v-100h-345zM500 600l100 -300l100 300v100h-200v-100z"/>
+			<glyph unicode="&#xe108;"
+				   d="M100 262v41q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44t106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -91 100 -113v-64q0 -20 -13 -28.5t-32 0.5l-94 78h-222l-94 -78q-19 -9 -32 -0.5t-13 28.5 v64q0 22 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5z"/>
+			<glyph unicode="&#xe109;"
+				   d="M0 50q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v750h-1100v-750zM0 900h1100v150q0 21 -14.5 35.5t-35.5 14.5h-150v100h-100v-100h-500v100h-100v-100h-150q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 100v100h100v-100h-100zM100 300v100h100v-100h-100z M100 500v100h100v-100h-100zM300 100v100h100v-100h-100zM300 300v100h100v-100h-100zM300 500v100h100v-100h-100zM500 100v100h100v-100h-100zM500 300v100h100v-100h-100zM500 500v100h100v-100h-100zM700 100v100h100v-100h-100zM700 300v100h100v-100h-100zM700 500 v100h100v-100h-100zM900 100v100h100v-100h-100zM900 300v100h100v-100h-100zM900 500v100h100v-100h-100z"/>
+			<glyph unicode="&#xe110;"
+				   d="M0 200v200h259l600 600h241v198l300 -295l-300 -300v197h-159l-600 -600h-341zM0 800h259l122 -122l141 142l-181 180h-341v-200zM678 381l141 142l122 -123h159v198l300 -295l-300 -300v197h-241z"/>
+			<glyph unicode="&#xe111;"
+				   d="M0 400v600q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5z"/>
+			<glyph unicode="&#xe112;"
+				   d="M100 600v200h300v-250q0 -113 6 -145q17 -92 102 -117q39 -11 92 -11q37 0 66.5 5.5t50 15.5t36 24t24 31.5t14 37.5t7 42t2.5 45t0 47v25v250h300v-200q0 -42 -3 -83t-15 -104t-31.5 -116t-58 -109.5t-89 -96.5t-129 -65.5t-174.5 -25.5t-174.5 25.5t-129 65.5t-89 96.5 t-58 109.5t-31.5 116t-15 104t-3 83zM100 900v300h300v-300h-300zM800 900v300h300v-300h-300z"/>
+			<glyph unicode="&#xe113;" d="M-30 411l227 -227l352 353l353 -353l226 227l-578 579z"/>
+			<glyph unicode="&#xe114;" d="M70 797l580 -579l578 579l-226 227l-353 -353l-352 353z"/>
+			<glyph unicode="&#xe115;"
+				   d="M-198 700l299 283l300 -283h-203v-400h385l215 -200h-800v600h-196zM402 1000l215 -200h381v-400h-198l299 -283l299 283h-200v600h-796z"/>
+			<glyph unicode="&#xe116;"
+				   d="M18 939q-5 24 10 42q14 19 39 19h896l38 162q5 17 18.5 27.5t30.5 10.5h94q20 0 35 -14.5t15 -35.5t-15 -35.5t-35 -14.5h-54l-201 -961q-2 -4 -6 -10.5t-19 -17.5t-33 -11h-31v-50q0 -20 -14.5 -35t-35.5 -15t-35.5 15t-14.5 35v50h-300v-50q0 -20 -14.5 -35t-35.5 -15 t-35.5 15t-14.5 35v50h-50q-21 0 -35.5 15t-14.5 35q0 21 14.5 35.5t35.5 14.5h535l48 200h-633q-32 0 -54.5 21t-27.5 43z"/>
+			<glyph unicode="&#xe117;"
+				   d="M0 0v800h1200v-800h-1200zM0 900v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-100h-1200z"/>
+			<glyph unicode="&#xe118;"
+				   d="M1 0l300 700h1200l-300 -700h-1200zM1 400v600h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-200h-1000z"/>
+			<glyph unicode="&#xe119;" d="M302 300h198v600h-198l298 300l298 -300h-198v-600h198l-298 -300z"/>
+			<glyph unicode="&#xe120;" d="M0 600l300 298v-198h600v198l300 -298l-300 -297v197h-600v-197z"/>
+			<glyph unicode="&#xe121;"
+				   d="M0 100v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM31 400l172 739q5 22 23 41.5t38 19.5h672q19 0 37.5 -22.5t23.5 -45.5l172 -732h-1138zM800 100h100v100h-100v-100z M1000 100h100v100h-100v-100z"/>
+			<glyph unicode="&#xe122;"
+				   d="M-101 600v50q0 24 25 49t50 38l25 13v-250l-11 5.5t-24 14t-30 21.5t-24 27.5t-11 31.5zM100 500v250v8v8v7t0.5 7t1.5 5.5t2 5t3 4t4.5 3.5t6 1.5t7.5 0.5h200l675 250v-850l-675 200h-38l47 -276q2 -12 -3 -17.5t-11 -6t-21 -0.5h-8h-83q-20 0 -34.5 14t-18.5 35 q-55 337 -55 351zM1100 200v850q0 21 14.5 35.5t35.5 14.5q20 0 35 -14.5t15 -35.5v-850q0 -20 -15 -35t-35 -15q-21 0 -35.5 15t-14.5 35z"/>
+			<glyph unicode="&#xe123;"
+				   d="M74 350q0 21 13.5 35.5t33.5 14.5h18l117 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3 32t29 13h94q20 0 29 -10.5t3 -29.5q-18 -36 -18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q20 0 33.5 -14.5t13.5 -35.5q0 -20 -13 -40t-31 -27q-8 -3 -23 -8.5 t-65 -20t-103 -25t-132.5 -19.5t-158.5 -9q-125 0 -245.5 20.5t-178.5 40.5l-58 20q-18 7 -31 27.5t-13 40.5zM497 110q12 -49 40 -79.5t63 -30.5t63 30.5t39 79.5q-48 -6 -102 -6t-103 6z"/>
+			<glyph unicode="&#xe124;"
+				   d="M21 445l233 -45l-78 -224l224 78l45 -233l155 179l155 -179l45 233l224 -78l-78 224l234 45l-180 155l180 156l-234 44l78 225l-224 -78l-45 233l-155 -180l-155 180l-45 -233l-224 78l78 -225l-233 -44l179 -156z"/>
+			<glyph unicode="&#xe125;"
+				   d="M0 200h200v600h-200v-600zM300 275q0 -75 100 -75h61q124 -100 139 -100h250q46 0 83 57l238 344q29 31 29 74v100q0 44 -30.5 84.5t-69.5 40.5h-328q28 118 28 125v150q0 44 -30.5 84.5t-69.5 40.5h-50q-27 0 -51 -20t-38 -48l-96 -198l-145 -196q-20 -26 -20 -63v-400z M400 300v375l150 213l100 212h50v-175l-50 -225h450v-125l-250 -375h-214l-136 100h-100z"/>
+			<glyph unicode="&#xe126;"
+				   d="M0 400v600h200v-600h-200zM300 525v400q0 75 100 75h61q124 100 139 100h250q46 0 83 -57l238 -344q29 -31 29 -74v-100q0 -44 -30.5 -84.5t-69.5 -40.5h-328q28 -118 28 -125v-150q0 -44 -30.5 -84.5t-69.5 -40.5h-50q-27 0 -51 20t-38 48l-96 198l-145 196 q-20 26 -20 63zM400 525l150 -212l100 -213h50v175l-50 225h450v125l-250 375h-214l-136 -100h-100v-375z"/>
+			<glyph unicode="&#xe127;"
+				   d="M8 200v600h200v-600h-200zM308 275v525q0 17 14 35.5t28 28.5l14 9l362 230q14 6 25 6q17 0 29 -12l109 -112q14 -14 14 -34q0 -18 -11 -32l-85 -121h302q85 0 138.5 -38t53.5 -110t-54.5 -111t-138.5 -39h-107l-130 -339q-7 -22 -20.5 -41.5t-28.5 -19.5h-341 q-7 0 -90 81t-83 94zM408 289l100 -89h293l131 339q6 21 19.5 41t28.5 20h203q16 0 25 15t9 36q0 20 -9 34.5t-25 14.5h-457h-6.5h-7.5t-6.5 0.5t-6 1t-5 1.5t-5.5 2.5t-4 4t-4 5.5q-5 12 -5 20q0 14 10 27l147 183l-86 83l-339 -236v-503z"/>
+			<glyph unicode="&#xe128;"
+				   d="M-101 651q0 72 54 110t139 38l302 -1l-85 121q-11 16 -11 32q0 21 14 34l109 113q13 12 29 12q11 0 25 -6l365 -230q7 -4 17 -10.5t26.5 -26t16.5 -36.5v-526q0 -13 -86 -93.5t-94 -80.5h-341q-16 0 -29.5 20t-19.5 41l-130 339h-107q-84 0 -139 39t-55 111zM-1 601h222 q15 0 28.5 -20.5t19.5 -40.5l131 -339h293l107 89v502l-343 237l-87 -83l145 -184q10 -11 10 -26q0 -11 -5 -20q-1 -3 -3.5 -5.5l-4 -4t-5 -2.5t-5.5 -1.5t-6.5 -1t-6.5 -0.5h-7.5h-6.5h-476v-100zM1000 201v600h200v-600h-200z"/>
+			<glyph unicode="&#xe129;"
+				   d="M97 719l230 -363q4 -6 10.5 -15.5t26 -25t36.5 -15.5h525q13 0 94 83t81 90v342q0 15 -20 28.5t-41 19.5l-339 131v106q0 84 -39 139t-111 55t-110 -53.5t-38 -138.5v-302l-121 84q-15 12 -33.5 11.5t-32.5 -13.5l-112 -110q-22 -22 -6 -53zM172 739l83 86l183 -146 q22 -18 47 -5q3 1 5.5 3.5l4 4t2.5 5t1.5 5.5t1 6.5t0.5 6.5v7.5v6.5v456q0 22 25 31t50 -0.5t25 -30.5v-202q0 -16 20 -29.5t41 -19.5l339 -130v-294l-89 -100h-503zM400 0v200h600v-200h-600z"/>
+			<glyph unicode="&#xe130;"
+				   d="M2 585q-16 -31 6 -53l112 -110q13 -13 32 -13.5t34 10.5l121 85q0 -51 -0.5 -153.5t-0.5 -148.5q0 -84 38.5 -138t110.5 -54t111 55t39 139v106l339 131q20 6 40.5 19.5t20.5 28.5v342q0 7 -81 90t-94 83h-525q-17 0 -35.5 -14t-28.5 -28l-10 -15zM77 565l236 339h503 l89 -100v-294l-340 -130q-20 -6 -40 -20t-20 -29v-202q0 -22 -25 -31t-50 0t-25 31v456v14.5t-1.5 11.5t-5 12t-9.5 7q-24 13 -46 -5l-184 -146zM305 1104v200h600v-200h-600z"/>
+			<glyph unicode="&#xe131;"
+				   d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM298 701l2 -201h300l-2 -194l402 294l-402 298v-197h-300z"/>
+			<glyph unicode="&#xe132;"
+				   d="M0 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t231.5 47.5q122 0 232.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-218 -217.5t-300 -80t-299.5 80t-217.5 217.5t-80 299.5zM200 600l402 -294l-2 194h300l2 201h-300v197z"/>
+			<glyph unicode="&#xe133;"
+				   d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600h200v-300h200v300h200l-300 400z"/>
+			<glyph unicode="&#xe134;"
+				   d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600l300 -400l300 400h-200v300h-200v-300h-200z"/>
+			<glyph unicode="&#xe135;"
+				   d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM254 780q-8 -33 5.5 -92.5t7.5 -87.5q0 -9 17 -44t16 -60 q12 0 23 -5.5t23 -15t20 -13.5q24 -12 108 -42q22 -8 53 -31.5t59.5 -38.5t57.5 -11q8 -18 -15 -55t-20 -57q42 -71 87 -80q0 -6 -3 -15.5t-3.5 -14.5t4.5 -17q104 -3 221 112q30 29 47 47t34.5 49t20.5 62q-14 9 -37 9.5t-36 7.5q-14 7 -49 15t-52 19q-9 0 -39.5 -0.5 t-46.5 -1.5t-39 -6.5t-39 -16.5q-50 -35 -66 -12q-4 2 -3.5 25.5t0.5 25.5q-6 13 -26.5 17t-24.5 7q2 22 -2 41t-16.5 28t-38.5 -20q-23 -25 -42 4q-19 28 -8 58q6 16 22 22q6 -1 26 -1.5t33.5 -4t19.5 -13.5q12 -19 32 -37.5t34 -27.5l14 -8q0 3 9.5 39.5t5.5 57.5 q-4 23 14.5 44.5t22.5 31.5q5 14 10 35t8.5 31t15.5 22.5t34 21.5q-6 18 10 37q8 0 23.5 -1.5t24.5 -1.5t20.5 4.5t20.5 15.5q-10 23 -30.5 42.5t-38 30t-49 26.5t-43.5 23q11 39 2 44q31 -13 58 -14.5t39 3.5l11 4q7 36 -16.5 53.5t-64.5 28.5t-56 23q-19 -3 -37 0 q-15 -12 -36.5 -21t-34.5 -12t-44 -8t-39 -6q-15 -3 -45.5 0.5t-45.5 -2.5q-21 -7 -52 -26.5t-34 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -90.5t-29.5 -79.5zM518 916q3 12 16 30t16 25q10 -10 18.5 -10t14 6t14.5 14.5t16 12.5q0 -24 17 -66.5t17 -43.5 q-9 2 -31 5t-36 5t-32 8t-30 14zM692 1003h1h-1z"/>
+			<glyph unicode="&#xe136;"
+				   d="M0 164.5q0 21.5 15 37.5l600 599q-33 101 6 201.5t135 154.5q164 92 306 -9l-259 -138l145 -232l251 126q13 -175 -151 -267q-123 -70 -253 -23l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5z"/>
+			<glyph unicode="&#xe137;" horiz-adv-x="1220"
+				   d="M0 196v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 596v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5zM0 996v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM600 596h500v100h-500v-100zM800 196h300v100h-300v-100zM900 996h200v100h-200v-100z"/>
+			<glyph unicode="&#xe138;" d="M100 1100v100h1000v-100h-1000zM150 1000h900l-350 -500v-300l-200 -200v500z"/>
+			<glyph unicode="&#xe139;"
+				   d="M0 200v200h1200v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500z M500 1000h200v100h-200v-100z"/>
+			<glyph unicode="&#xe140;"
+				   d="M0 0v400l129 -129l200 200l142 -142l-200 -200l129 -129h-400zM0 800l129 129l200 -200l142 142l-200 200l129 129h-400v-400zM729 329l142 142l200 -200l129 129v-400h-400l129 129zM729 871l200 200l-129 129h400v-400l-129 129l-200 -200z"/>
+			<glyph unicode="&#xe141;"
+				   d="M0 596q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 596q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM291 655 q0 23 15.5 38.5t38.5 15.5t39 -16t16 -38q0 -23 -16 -39t-39 -16q-22 0 -38 16t-16 39zM400 850q0 22 16 38.5t39 16.5q22 0 38 -16t16 -39t-16 -39t-38 -16q-23 0 -39 16.5t-16 38.5zM514 609q0 32 20.5 56.5t51.5 29.5l122 126l1 1q-9 14 -9 28q0 22 16 38.5t39 16.5 q22 0 38 -16t16 -39t-16 -39t-38 -16q-14 0 -29 10l-55 -145q17 -22 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5t-61.5 25.5t-25.5 61.5zM800 655q0 22 16 38t39 16t38.5 -15.5t15.5 -38.5t-16 -39t-38 -16q-23 0 -39 16t-16 39z"/>
+			<glyph unicode="&#xe142;"
+				   d="M-40 375q-13 -95 35 -173q35 -57 94 -89t129 -32q63 0 119 28q33 16 65 40.5t52.5 45.5t59.5 64q40 44 57 61l394 394q35 35 47 84t-3 96q-27 87 -117 104q-20 2 -29 2q-46 0 -78.5 -16.5t-67.5 -51.5l-389 -396l-7 -7l69 -67l377 373q20 22 39 38q23 23 50 23 q38 0 53 -36q16 -39 -20 -75l-547 -547q-52 -52 -125 -52q-55 0 -100 33t-54 96q-5 35 2.5 66t31.5 63t42 50t56 54q24 21 44 41l348 348q52 52 82.5 79.5t84 54t107.5 26.5q25 0 48 -4q95 -17 154 -94.5t51 -175.5q-7 -101 -98 -192l-252 -249l-253 -256l7 -7l69 -60 l517 511q67 67 95 157t11 183q-16 87 -67 154t-130 103q-69 33 -152 33q-107 0 -197 -55q-40 -24 -111 -95l-512 -512q-68 -68 -81 -163z"/>
+			<glyph unicode="&#xe143;"
+				   d="M80 784q0 131 98.5 229.5t230.5 98.5q143 0 241 -129q103 129 246 129q129 0 226 -98.5t97 -229.5q0 -46 -17.5 -91t-61 -99t-77 -89.5t-104.5 -105.5q-197 -191 -293 -322l-17 -23l-16 23q-43 58 -100 122.5t-92 99.5t-101 100q-71 70 -104.5 105.5t-77 89.5t-61 99 t-17.5 91zM250 784q0 -27 30.5 -70t61.5 -75.5t95 -94.5l22 -22q93 -90 190 -201q82 92 195 203l12 12q64 62 97.5 97t64.5 79t31 72q0 71 -48 119.5t-105 48.5q-74 0 -132 -83l-118 -171l-114 174q-51 80 -123 80q-60 0 -109.5 -49.5t-49.5 -118.5z"/>
+			<glyph unicode="&#xe144;"
+				   d="M57 353q0 -95 66 -159l141 -142q68 -66 159 -66q93 0 159 66l283 283q66 66 66 159t-66 159l-141 141q-8 9 -19 17l-105 -105l212 -212l-389 -389l-247 248l95 95l-18 18q-46 45 -75 101l-55 -55q-66 -66 -66 -159zM269 706q0 -93 66 -159l141 -141q7 -7 19 -17l105 105 l-212 212l389 389l247 -247l-95 -96l18 -17q47 -49 77 -100l29 29q35 35 62.5 88t27.5 96q0 93 -66 159l-141 141q-66 66 -159 66q-95 0 -159 -66l-283 -283q-66 -64 -66 -159z"/>
+			<glyph unicode="&#xe145;"
+				   d="M200 100v953q0 21 30 46t81 48t129 38t163 15t162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5zM300 300h600v700h-600v-700zM496 150q0 -43 30.5 -73.5t73.5 -30.5t73.5 30.5t30.5 73.5t-30.5 73.5t-73.5 30.5 t-73.5 -30.5t-30.5 -73.5z"/>
+			<glyph unicode="&#xe146;"
+				   d="M0 0l303 380l207 208l-210 212h300l267 279l-35 36q-15 14 -15 35t15 35q14 15 35 15t35 -15l283 -282q15 -15 15 -36t-15 -35q-14 -15 -35 -15t-35 15l-36 35l-279 -267v-300l-212 210l-208 -207z"/>
+			<glyph unicode="&#xe148;"
+				   d="M295 433h139q5 -77 48.5 -126.5t117.5 -64.5v335q-6 1 -15.5 4t-11.5 3q-46 14 -79 26.5t-72 36t-62.5 52t-40 72.5t-16.5 99q0 92 44 159.5t109 101t144 40.5v78h100v-79q38 -4 72.5 -13.5t75.5 -31.5t71 -53.5t51.5 -84t24.5 -118.5h-159q-8 72 -35 109.5t-101 50.5 v-307l64 -14q34 -7 64 -16.5t70 -31.5t67.5 -52t47.5 -80.5t20 -112.5q0 -139 -89 -224t-244 -96v-77h-100v78q-152 17 -237 104q-40 40 -52.5 93.5t-15.5 139.5zM466 889q0 -29 8 -51t16.5 -34t29.5 -22.5t31 -13.5t38 -10q7 -2 11 -3v274q-61 -8 -97.5 -37.5t-36.5 -102.5 zM700 237q170 18 170 151q0 64 -44 99.5t-126 60.5v-311z"/>
+			<glyph unicode="&#xe149;"
+				   d="M100 600v100h166q-24 49 -44 104q-10 26 -14.5 55.5t-3 72.5t25 90t68.5 87q97 88 263 88q129 0 230 -89t101 -208h-153q0 52 -34 89.5t-74 51.5t-76 14q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -28 16.5 -69.5t28 -62.5t41.5 -72h241v-100h-197q8 -50 -2.5 -115 t-31.5 -94q-41 -59 -99 -113q35 11 84 18t70 7q33 1 103 -16t103 -17q76 0 136 30l50 -147q-41 -25 -80.5 -36.5t-59 -13t-61.5 -1.5q-23 0 -128 33t-155 29q-39 -4 -82 -17t-66 -25l-24 -11l-55 145l16.5 11t15.5 10t13.5 9.5t14.5 12t14.5 14t17.5 18.5q48 55 54 126.5 t-30 142.5h-221z"/>
+			<glyph unicode="&#xe150;"
+				   d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM602 900l298 300l298 -300h-198v-900h-200v900h-198z"/>
+			<glyph unicode="&#xe151;"
+				   d="M2 300h198v900h200v-900h198l-298 -300zM700 0v200h100v-100h200v-100h-300zM700 400v100h300v-200h-99v-100h-100v100h99v100h-200zM700 700v500h300v-500h-100v100h-100v-100h-100zM801 900h100v200h-100v-200z"/>
+			<glyph unicode="&#xe152;"
+				   d="M2 300h198v900h200v-900h198l-298 -300zM700 0v500h300v-500h-100v100h-100v-100h-100zM700 700v200h100v-100h200v-100h-300zM700 1100v100h300v-200h-99v-100h-100v100h99v100h-200zM801 200h100v200h-100v-200z"/>
+			<glyph unicode="&#xe153;"
+				   d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 100v400h300v-500h-100v100h-200zM800 1100v100h200v-500h-100v400h-100zM901 200h100v200h-100v-200z"/>
+			<glyph unicode="&#xe154;"
+				   d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 400v100h200v-500h-100v400h-100zM800 800v400h300v-500h-100v100h-200zM901 900h100v200h-100v-200z"/>
+			<glyph unicode="&#xe155;"
+				   d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h500v-200h-500zM700 400v200h400v-200h-400zM700 700v200h300v-200h-300zM700 1000v200h200v-200h-200z"/>
+			<glyph unicode="&#xe156;"
+				   d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h200v-200h-200zM700 400v200h300v-200h-300zM700 700v200h400v-200h-400zM700 1000v200h500v-200h-500z"/>
+			<glyph unicode="&#xe157;"
+				   d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q162 0 281 -118.5t119 -281.5v-300q0 -165 -118.5 -282.5t-281.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500z"/>
+			<glyph unicode="&#xe158;"
+				   d="M0 400v300q0 163 119 281.5t281 118.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-163 0 -281.5 117.5t-118.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM400 300l333 250l-333 250v-500z"/>
+			<glyph unicode="&#xe159;"
+				   d="M0 400v300q0 163 117.5 281.5t282.5 118.5h300q163 0 281.5 -119t118.5 -281v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 700l250 -333l250 333h-500z"/>
+			<glyph unicode="&#xe160;"
+				   d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -162 -118.5 -281t-281.5 -119h-300q-165 0 -282.5 118.5t-117.5 281.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 400h500l-250 333z"/>
+			<glyph unicode="&#xe161;"
+				   d="M0 400v300h300v200l400 -350l-400 -350v200h-300zM500 0v200h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-500v200h400q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-400z"/>
+			<glyph unicode="&#xe162;"
+				   d="M217 519q8 -19 31 -19h302q-155 -438 -160 -458q-5 -21 4 -32l9 -8h9q14 0 26 15q11 13 274.5 321.5t264.5 308.5q14 19 5 36q-8 17 -31 17l-301 -1q1 4 78 219.5t79 227.5q2 15 -5 27l-9 9h-9q-15 0 -25 -16q-4 -6 -98 -111.5t-228.5 -257t-209.5 -237.5q-16 -19 -6 -41 z"/>
+			<glyph unicode="&#xe163;"
+				   d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q47 0 100 15v185h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h500v185q-14 4 -114 7.5t-193 5.5l-93 2q-165 0 -282.5 -117.5t-117.5 -282.5v-300zM600 400v300h300v200l400 -350l-400 -350v200h-300z "/>
+			<glyph unicode="&#xe164;"
+				   d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q163 0 281.5 117.5t118.5 282.5v98l-78 73l-122 -123v-148q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h156l118 122l-74 78h-100q-165 0 -282.5 -117.5t-117.5 -282.5 v-300zM496 709l353 342l-149 149h500v-500l-149 149l-342 -353z"/>
+			<glyph unicode="&#xe165;"
+				   d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM406 600 q0 80 57 137t137 57t137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137z"/>
+			<glyph unicode="&#xe166;"
+				   d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 800l445 -500l450 500h-295v400h-300v-400h-300zM900 150h100v50h-100v-50z"/>
+			<glyph unicode="&#xe167;"
+				   d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 700h300v-300h300v300h295l-445 500zM900 150h100v50h-100v-50z"/>
+			<glyph unicode="&#xe168;"
+				   d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 705l305 -305l596 596l-154 155l-442 -442l-150 151zM900 150h100v50h-100v-50z"/>
+			<glyph unicode="&#xe169;"
+				   d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 988l97 -98l212 213l-97 97zM200 400l697 1l3 699l-250 -239l-149 149l-212 -212l149 -149zM900 150h100v50h-100v-50z"/>
+			<glyph unicode="&#xe170;"
+				   d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM200 612l212 -212l98 97l-213 212zM300 1200l239 -250l-149 -149l212 -212l149 148l249 -237l-1 697zM900 150h100v50h-100v-50z"/>
+			<glyph unicode="&#xe171;"
+				   d="M23 415l1177 784v-1079l-475 272l-310 -393v416h-392zM494 210l672 938l-672 -712v-226z"/>
+			<glyph unicode="&#xe172;"
+				   d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-850q0 -21 -15 -35.5t-35 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200z"/>
+			<glyph unicode="&#xe173;"
+				   d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-218l-276 -275l-120 120l-126 -127h-378v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM581 306l123 123l120 -120l353 352l123 -123l-475 -476zM600 1000h100v200h-100v-200z"/>
+			<glyph unicode="&#xe174;"
+				   d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-269l-103 -103l-170 170l-298 -298h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200zM700 133l170 170l-170 170l127 127l170 -170l170 170l127 -128l-170 -169l170 -170 l-127 -127l-170 170l-170 -170z"/>
+			<glyph unicode="&#xe175;"
+				   d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-300h-400v-200h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300l300 -300l300 300h-200v300h-200v-300h-200zM600 1000v200h100v-200h-100z"/>
+			<glyph unicode="&#xe176;"
+				   d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-402l-200 200l-298 -298h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300h200v-300h200v300h200l-300 300zM600 1000v200h100v-200h-100z"/>
+			<glyph unicode="&#xe177;"
+				   d="M0 250q0 -21 14.5 -35.5t35.5 -14.5h1100q21 0 35.5 14.5t14.5 35.5v550h-1200v-550zM0 900h1200v150q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 300v200h400v-200h-400z"/>
+			<glyph unicode="&#xe178;"
+				   d="M0 400l300 298v-198h400v-200h-400v-198zM100 800v200h100v-200h-100zM300 800v200h100v-200h-100zM500 800v200h400v198l300 -298l-300 -298v198h-400zM800 300v200h100v-200h-100zM1000 300h100v200h-100v-200z"/>
+			<glyph unicode="&#xe179;"
+				   d="M100 700v400l50 100l50 -100v-300h100v300l50 100l50 -100v-300h100v300l50 100l50 -100v-400l-100 -203v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447zM800 597q0 -29 10.5 -55.5t25 -43t29 -28.5t25.5 -18l10 -5v-397q0 -21 14.5 -35.5 t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v1106q0 31 -18 40.5t-44 -7.5l-276 -116q-25 -17 -43.5 -51.5t-18.5 -65.5v-359z"/>
+			<glyph unicode="&#xe180;"
+				   d="M100 0h400v56q-75 0 -87.5 6t-12.5 44v394h500v-394q0 -38 -12.5 -44t-87.5 -6v-56h400v56q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v888q0 22 25 34.5t50 13.5l25 2v56h-400v-56q75 0 87.5 -6t12.5 -44v-394h-500v394q0 38 12.5 44t87.5 6v56h-400v-56q4 0 11 -0.5 t24 -3t30 -7t24 -15t11 -24.5v-888q0 -22 -25 -34.5t-50 -13.5l-25 -2v-56z"/>
+			<glyph unicode="&#xe181;"
+				   d="M0 300q0 -41 29.5 -70.5t70.5 -29.5h300q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-300q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM100 100h400l200 200h105l295 98v-298h-425l-100 -100h-375zM100 300v200h300v-200h-300zM100 600v200h300v-200h-300z M100 1000h400l200 -200v-98l295 98h105v200h-425l-100 100h-375zM700 402v163l400 133v-163z"/>
+			<glyph unicode="&#xe182;"
+				   d="M16.5 974.5q0.5 -21.5 16 -90t46.5 -140t104 -177.5t175 -208q103 -103 207.5 -176t180 -103.5t137 -47t92.5 -16.5l31 1l163 162q17 18 13.5 41t-22.5 37l-192 136q-19 14 -45 12t-42 -19l-118 -118q-142 101 -268 227t-227 268l118 118q17 17 20 41.5t-11 44.5 l-139 194q-14 19 -36.5 22t-40.5 -14l-162 -162q-1 -11 -0.5 -32.5z"/>
+			<glyph unicode="&#xe183;"
+				   d="M0 50v212q0 20 10.5 45.5t24.5 39.5l365 303v50q0 4 1 10.5t12 22.5t30 28.5t60 23t97 10.5t97 -10t60 -23.5t30 -27.5t12 -24l1 -10v-50l365 -303q14 -14 24.5 -39.5t10.5 -45.5v-212q0 -21 -14.5 -35.5t-35.5 -14.5h-1100q-20 0 -35 14.5t-15 35.5zM0 712 q0 -21 14.5 -33.5t34.5 -8.5l202 33q20 4 34.5 21t14.5 38v146q141 24 300 24t300 -24v-146q0 -21 14.5 -38t34.5 -21l202 -33q20 -4 34.5 8.5t14.5 33.5v200q-6 8 -19 20.5t-63 45t-112 57t-171 45t-235 20.5q-92 0 -175 -10.5t-141.5 -27t-108.5 -36.5t-81.5 -40 t-53.5 -36.5t-31 -27.5l-9 -10v-200z"/>
+			<glyph unicode="&#xe184;"
+				   d="M100 0v100h1100v-100h-1100zM175 200h950l-125 150v250l100 100v400h-100v-200h-100v200h-200v-200h-100v200h-200v-200h-100v200h-100v-400l100 -100v-250z"/>
+			<glyph unicode="&#xe185;"
+				   d="M100 0h300v400q0 41 -29.5 70.5t-70.5 29.5h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-400zM500 0v1000q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-1000h-300zM900 0v700q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-700h-300z"/>
+			<glyph unicode="&#xe186;"
+				   d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z"/>
+			<glyph unicode="&#xe187;"
+				   d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h100v200h100v-200h100v500h-100v-200h-100v200h-100v-500zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z"/>
+			<glyph unicode="&#xe188;"
+				   d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v100h-200v300h200v100h-300v-500zM600 300h300v100h-200v300h200v100h-300v-500z"/>
+			<glyph unicode="&#xe189;"
+				   d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 550l300 -150v300zM600 400l300 150l-300 150v-300z"/>
+			<glyph unicode="&#xe190;"
+				   d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300v500h700v-500h-700zM300 400h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130v-300zM575 549 q0 -65 27 -107t68 -42h130v300h-130q-38 0 -66.5 -43t-28.5 -108z"/>
+			<glyph unicode="&#xe191;"
+				   d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z"/>
+			<glyph unicode="&#xe192;"
+				   d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v400h-200v100h-100v-500zM301 400v200h100v-200h-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z"/>
+			<glyph unicode="&#xe193;"
+				   d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 700v100h300v-300h-99v-100h-100v100h99v200h-200zM201 300v100h100v-100h-100zM601 300v100h100v-100h-100z M700 700v100h200v-500h-100v400h-100z"/>
+			<glyph unicode="&#xe194;"
+				   d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 500v200 l100 100h300v-100h-300v-200h300v-100h-300z"/>
+			<glyph unicode="&#xe195;"
+				   d="M0 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 400v400h300 l100 -100v-100h-100v100h-200v-100h200v-100h-200v-100h-100zM700 400v100h100v-100h-100z"/>
+			<glyph unicode="&#xe197;"
+				   d="M-14 494q0 -80 56.5 -137t135.5 -57h222v300h400v-300h128q120 0 205 86.5t85 207.5t-85 207t-205 86q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200h200v300h200v-300h200 l-300 -300z"/>
+			<glyph unicode="&#xe198;"
+				   d="M-14 494q0 -80 56.5 -137t135.5 -57h8l414 414l403 -403q94 26 154.5 104.5t60.5 178.5q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200l300 300 l300 -300h-200v-300h-200v300h-200z"/>
+			<glyph unicode="&#xe199;"
+				   d="M100 200h400v-155l-75 -45h350l-75 45v155h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170z"/>
+			<glyph unicode="&#xe200;"
+				   d="M121 700q0 -53 28.5 -97t75.5 -65q-4 -16 -4 -38q0 -74 52.5 -126.5t126.5 -52.5q56 0 100 30v-306l-75 -45h350l-75 45v306q46 -30 100 -30q74 0 126.5 52.5t52.5 126.5q0 24 -9 55q50 32 79.5 83t29.5 112q0 90 -61.5 155.5t-150.5 71.5q-26 89 -99.5 145.5 t-167.5 56.5q-116 0 -197.5 -81.5t-81.5 -197.5q0 -4 1 -11.5t1 -11.5q-14 2 -23 2q-74 0 -126.5 -52.5t-52.5 -126.5z"/>
+		</font>
+	</defs>
+</svg>
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/bootstrap_3.1.1/js/bootstrap.js b/len-activiti/src/main/resources/static/editor-app/libs/bootstrap_3.1.1/js/bootstrap.js
index 8ae571b..5b8a0b1 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/bootstrap_3.1.1/js/bootstrap.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/bootstrap_3.1.1/js/bootstrap.js
@@ -4,7 +4,9 @@
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
-if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript requires jQuery') }
+if (typeof jQuery === 'undefined') {
+	throw new Error('Bootstrap\'s JavaScript requires jQuery')
+}
 
 /* ========================================================================
  * Bootstrap: transition.js v3.1.1
@@ -16,42 +18,46 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
 
 
 +function ($) {
-  'use strict';
-
-  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
-  // ============================================================
-
-  function transitionEnd() {
-    var el = document.createElement('bootstrap')
-
-    var transEndEventNames = {
-      'WebkitTransition' : 'webkitTransitionEnd',
-      'MozTransition'    : 'transitionend',
-      'OTransition'      : 'oTransitionEnd otransitionend',
-      'transition'       : 'transitionend'
-    }
-
-    for (var name in transEndEventNames) {
-      if (el.style[name] !== undefined) {
-        return { end: transEndEventNames[name] }
-      }
-    }
-
-    return false // explicit for ie8 (  ._.)
-  }
-
-  // http://blog.alexmaccaw.com/css-transitions
-  $.fn.emulateTransitionEnd = function (duration) {
-    var called = false, $el = this
-    $(this).one($.support.transition.end, function () { called = true })
-    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
-    setTimeout(callback, duration)
-    return this
-  }
-
-  $(function () {
-    $.support.transition = transitionEnd()
-  })
+	'use strict';
+
+	// CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
+	// ============================================================
+
+	function transitionEnd() {
+		var el = document.createElement('bootstrap')
+
+		var transEndEventNames = {
+			'WebkitTransition': 'webkitTransitionEnd',
+			'MozTransition': 'transitionend',
+			'OTransition': 'oTransitionEnd otransitionend',
+			'transition': 'transitionend'
+		}
+
+		for (var name in transEndEventNames) {
+			if (el.style[name] !== undefined) {
+				return {end: transEndEventNames[name]}
+			}
+		}
+
+		return false // explicit for ie8 (  ._.)
+	}
+
+	// http://blog.alexmaccaw.com/css-transitions
+	$.fn.emulateTransitionEnd = function (duration) {
+		var called = false, $el = this
+		$(this).one($.support.transition.end, function () {
+			called = true
+		})
+		var callback = function () {
+			if (!called) $($el).trigger($.support.transition.end)
+		}
+		setTimeout(callback, duration)
+		return this
+	}
+
+	$(function () {
+		$.support.transition = transitionEnd()
+	})
 
 }(jQuery);
 
@@ -65,82 +71,82 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
 
 
 +function ($) {
-  'use strict';
+	'use strict';
 
-  // ALERT CLASS DEFINITION
-  // ======================
+	// ALERT CLASS DEFINITION
+	// ======================
 
-  var dismiss = '[data-dismiss="alert"]'
-  var Alert   = function (el) {
-    $(el).on('click', dismiss, this.close)
-  }
+	var dismiss = '[data-dismiss="alert"]'
+	var Alert = function (el) {
+		$(el).on('click', dismiss, this.close)
+	}
 
-  Alert.prototype.close = function (e) {
-    var $this    = $(this)
-    var selector = $this.attr('data-target')
+	Alert.prototype.close = function (e) {
+		var $this = $(this)
+		var selector = $this.attr('data-target')
 
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
-    }
+		if (!selector) {
+			selector = $this.attr('href')
+			selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
+		}
 
-    var $parent = $(selector)
+		var $parent = $(selector)
 
-    if (e) e.preventDefault()
+		if (e) e.preventDefault()
 
-    if (!$parent.length) {
-      $parent = $this.hasClass('alert') ? $this : $this.parent()
-    }
+		if (!$parent.length) {
+			$parent = $this.hasClass('alert') ? $this : $this.parent()
+		}
 
-    $parent.trigger(e = $.Event('close.bs.alert'))
+		$parent.trigger(e = $.Event('close.bs.alert'))
 
-    if (e.isDefaultPrevented()) return
+		if (e.isDefaultPrevented()) return
 
-    $parent.removeClass('in')
+		$parent.removeClass('in')
 
-    function removeElement() {
-      $parent.trigger('closed.bs.alert').remove()
-    }
+		function removeElement() {
+			$parent.trigger('closed.bs.alert').remove()
+		}
 
-    $.support.transition && $parent.hasClass('fade') ?
-      $parent
-        .one($.support.transition.end, removeElement)
-        .emulateTransitionEnd(150) :
-      removeElement()
-  }
+		$.support.transition && $parent.hasClass('fade') ?
+			$parent
+				.one($.support.transition.end, removeElement)
+				.emulateTransitionEnd(150) :
+			removeElement()
+	}
 
 
-  // ALERT PLUGIN DEFINITION
-  // =======================
+	// ALERT PLUGIN DEFINITION
+	// =======================
 
-  var old = $.fn.alert
+	var old = $.fn.alert
 
-  $.fn.alert = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.alert')
+	$.fn.alert = function (option) {
+		return this.each(function () {
+			var $this = $(this)
+			var data = $this.data('bs.alert')
 
-      if (!data) $this.data('bs.alert', (data = new Alert(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
+			if (!data) $this.data('bs.alert', (data = new Alert(this)))
+			if (typeof option == 'string') data[option].call($this)
+		})
+	}
 
-  $.fn.alert.Constructor = Alert
+	$.fn.alert.Constructor = Alert
 
 
-  // ALERT NO CONFLICT
-  // =================
+	// ALERT NO CONFLICT
+	// =================
 
-  $.fn.alert.noConflict = function () {
-    $.fn.alert = old
-    return this
-  }
+	$.fn.alert.noConflict = function () {
+		$.fn.alert = old
+		return this
+	}
 
 
-  // ALERT DATA-API
-  // ==============
+	// ALERT DATA-API
+	// ==============
 
-  $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
+	$(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
 
 }(jQuery);
 
@@ -154,101 +160,101 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
 
 
 +function ($) {
-  'use strict';
+	'use strict';
 
-  // BUTTON PUBLIC CLASS DEFINITION
-  // ==============================
+	// BUTTON PUBLIC CLASS DEFINITION
+	// ==============================
 
-  var Button = function (element, options) {
-    this.$element  = $(element)
-    this.options   = $.extend({}, Button.DEFAULTS, options)
-    this.isLoading = false
-  }
+	var Button = function (element, options) {
+		this.$element = $(element)
+		this.options = $.extend({}, Button.DEFAULTS, options)
+		this.isLoading = false
+	}
 
-  Button.DEFAULTS = {
-    loadingText: 'loading...'
-  }
+	Button.DEFAULTS = {
+		loadingText: 'loading...'
+	}
 
-  Button.prototype.setState = function (state) {
-    var d    = 'disabled'
-    var $el  = this.$element
-    var val  = $el.is('input') ? 'val' : 'html'
-    var data = $el.data()
+	Button.prototype.setState = function (state) {
+		var d = 'disabled'
+		var $el = this.$element
+		var val = $el.is('input') ? 'val' : 'html'
+		var data = $el.data()
 
-    state = state + 'Text'
+		state = state + 'Text'
 
-    if (!data.resetText) $el.data('resetText', $el[val]())
+		if (!data.resetText) $el.data('resetText', $el[val]())
 
-    $el[val](data[state] || this.options[state])
+		$el[val](data[state] || this.options[state])
 
-    // push to event loop to allow forms to submit
-    setTimeout($.proxy(function () {
-      if (state == 'loadingText') {
-        this.isLoading = true
-        $el.addClass(d).attr(d, d)
-      } else if (this.isLoading) {
-        this.isLoading = false
-        $el.removeClass(d).removeAttr(d)
-      }
-    }, this), 0)
-  }
+		// push to event loop to allow forms to submit
+		setTimeout($.proxy(function () {
+			if (state == 'loadingText') {
+				this.isLoading = true
+				$el.addClass(d).attr(d, d)
+			} else if (this.isLoading) {
+				this.isLoading = false
+				$el.removeClass(d).removeAttr(d)
+			}
+		}, this), 0)
+	}
 
-  Button.prototype.toggle = function () {
-    var changed = true
-    var $parent = this.$element.closest('[data-toggle="buttons"]')
+	Button.prototype.toggle = function () {
+		var changed = true
+		var $parent = this.$element.closest('[data-toggle="buttons"]')
 
-    if ($parent.length) {
-      var $input = this.$element.find('input')
-      if ($input.prop('type') == 'radio') {
-        if ($input.prop('checked') && this.$element.hasClass('active')) changed = false
-        else $parent.find('.active').removeClass('active')
-      }
-      if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
-    }
+		if ($parent.length) {
+			var $input = this.$element.find('input')
+			if ($input.prop('type') == 'radio') {
+				if ($input.prop('checked') && this.$element.hasClass('active')) changed = false
+				else $parent.find('.active').removeClass('active')
+			}
+			if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
+		}
 
-    if (changed) this.$element.toggleClass('active')
-  }
+		if (changed) this.$element.toggleClass('active')
+	}
 
 
-  // BUTTON PLUGIN DEFINITION
-  // ========================
+	// BUTTON PLUGIN DEFINITION
+	// ========================
 
-  var old = $.fn.button
+	var old = $.fn.button
 
-  $.fn.button = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.button')
-      var options = typeof option == 'object' && option
+	$.fn.button = function (option) {
+		return this.each(function () {
+			var $this = $(this)
+			var data = $this.data('bs.button')
+			var options = typeof option == 'object' && option
 
-      if (!data) $this.data('bs.button', (data = new Button(this, options)))
+			if (!data) $this.data('bs.button', (data = new Button(this, options)))
 
-      if (option == 'toggle') data.toggle()
-      else if (option) data.setState(option)
-    })
-  }
+			if (option == 'toggle') data.toggle()
+			else if (option) data.setState(option)
+		})
+	}
 
-  $.fn.button.Constructor = Button
+	$.fn.button.Constructor = Button
 
 
-  // BUTTON NO CONFLICT
-  // ==================
+	// BUTTON NO CONFLICT
+	// ==================
 
-  $.fn.button.noConflict = function () {
-    $.fn.button = old
-    return this
-  }
+	$.fn.button.noConflict = function () {
+		$.fn.button = old
+		return this
+	}
 
 
-  // BUTTON DATA-API
-  // ===============
+	// BUTTON DATA-API
+	// ===============
 
-  $(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) {
-    var $btn = $(e.target)
-    if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
-    $btn.button('toggle')
-    e.preventDefault()
-  })
+	$(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) {
+		var $btn = $(e.target)
+		if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+		$btn.button('toggle')
+		e.preventDefault()
+	})
 
 }(jQuery);
 
@@ -262,199 +268,203 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
 
 
 +function ($) {
-  'use strict';
+	'use strict';
 
-  // CAROUSEL CLASS DEFINITION
-  // =========================
+	// CAROUSEL CLASS DEFINITION
+	// =========================
 
-  var Carousel = function (element, options) {
-    this.$element    = $(element)
-    this.$indicators = this.$element.find('.carousel-indicators')
-    this.options     = options
-    this.paused      =
-    this.sliding     =
-    this.interval    =
-    this.$active     =
-    this.$items      = null
+	var Carousel = function (element, options) {
+		this.$element = $(element)
+		this.$indicators = this.$element.find('.carousel-indicators')
+		this.options = options
+		this.paused =
+			this.sliding =
+				this.interval =
+					this.$active =
+						this.$items = null
 
-    this.options.pause == 'hover' && this.$element
-      .on('mouseenter', $.proxy(this.pause, this))
-      .on('mouseleave', $.proxy(this.cycle, this))
-  }
-
-  Carousel.DEFAULTS = {
-    interval: 5000,
-    pause: 'hover',
-    wrap: true
-  }
-
-  Carousel.prototype.cycle =  function (e) {
-    e || (this.paused = false)
-
-    this.interval && clearInterval(this.interval)
-
-    this.options.interval
-      && !this.paused
-      && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
-
-    return this
-  }
-
-  Carousel.prototype.getActiveIndex = function () {
-    this.$active = this.$element.find('.item.active')
-    this.$items  = this.$active.parent().children()
-
-    return this.$items.index(this.$active)
-  }
-
-  Carousel.prototype.to = function (pos) {
-    var that        = this
-    var activeIndex = this.getActiveIndex()
-
-    if (pos > (this.$items.length - 1) || pos < 0) return
-
-    if (this.sliding)       return this.$element.one('slid.bs.carousel', function () { that.to(pos) })
-    if (activeIndex == pos) return this.pause().cycle()
-
-    return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
-  }
-
-  Carousel.prototype.pause = function (e) {
-    e || (this.paused = true)
-
-    if (this.$element.find('.next, .prev').length && $.support.transition) {
-      this.$element.trigger($.support.transition.end)
-      this.cycle(true)
-    }
-
-    this.interval = clearInterval(this.interval)
-
-    return this
-  }
-
-  Carousel.prototype.next = function () {
-    if (this.sliding) return
-    return this.slide('next')
-  }
-
-  Carousel.prototype.prev = function () {
-    if (this.sliding) return
-    return this.slide('prev')
-  }
-
-  Carousel.prototype.slide = function (type, next) {
-    var $active   = this.$element.find('.item.active')
-    var $next     = next || $active[type]()
-    var isCycling = this.interval
-    var direction = type == 'next' ? 'left' : 'right'
-    var fallback  = type == 'next' ? 'first' : 'last'
-    var that      = this
-
-    if (!$next.length) {
-      if (!this.options.wrap) return
-      $next = this.$element.find('.item')[fallback]()
-    }
-
-    if ($next.hasClass('active')) return this.sliding = false
-
-    var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction })
-    this.$element.trigger(e)
-    if (e.isDefaultPrevented()) return
-
-    this.sliding = true
-
-    isCycling && this.pause()
-
-    if (this.$indicators.length) {
-      this.$indicators.find('.active').removeClass('active')
-      this.$element.one('slid.bs.carousel', function () {
-        var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
-        $nextIndicator && $nextIndicator.addClass('active')
-      })
-    }
-
-    if ($.support.transition && this.$element.hasClass('slide')) {
-      $next.addClass(type)
-      $next[0].offsetWidth // force reflow
-      $active.addClass(direction)
-      $next.addClass(direction)
-      $active
-        .one($.support.transition.end, function () {
-          $next.removeClass([type, direction].join(' ')).addClass('active')
-          $active.removeClass(['active', direction].join(' '))
-          that.sliding = false
-          setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
-        })
-        .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000)
-    } else {
-      $active.removeClass('active')
-      $next.addClass('active')
-      this.sliding = false
-      this.$element.trigger('slid.bs.carousel')
-    }
-
-    isCycling && this.cycle()
-
-    return this
-  }
-
-
-  // CAROUSEL PLUGIN DEFINITION
-  // ==========================
-
-  var old = $.fn.carousel
-
-  $.fn.carousel = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.carousel')
-      var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option)
-      var action  = typeof option == 'string' ? option : options.slide
-
-      if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)))
-      if (typeof option == 'number') data.to(option)
-      else if (action) data[action]()
-      else if (options.interval) data.pause().cycle()
-    })
-  }
-
-  $.fn.carousel.Constructor = Carousel
-
-
-  // CAROUSEL NO CONFLICT
-  // ====================
-
-  $.fn.carousel.noConflict = function () {
-    $.fn.carousel = old
-    return this
-  }
-
-
-  // CAROUSEL DATA-API
-  // =================
-
-  $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
-    var $this   = $(this), href
-    var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-    var options = $.extend({}, $target.data(), $this.data())
-    var slideIndex = $this.attr('data-slide-to')
-    if (slideIndex) options.interval = false
-
-    $target.carousel(options)
-
-    if (slideIndex = $this.attr('data-slide-to')) {
-      $target.data('bs.carousel').to(slideIndex)
-    }
-
-    e.preventDefault()
-  })
-
-  $(window).on('load', function () {
-    $('[data-ride="carousel"]').each(function () {
-      var $carousel = $(this)
-      $carousel.carousel($carousel.data())
-    })
-  })
+		this.options.pause == 'hover' && this.$element
+			.on('mouseenter', $.proxy(this.pause, this))
+			.on('mouseleave', $.proxy(this.cycle, this))
+	}
+
+	Carousel.DEFAULTS = {
+		interval: 5000,
+		pause: 'hover',
+		wrap: true
+	}
+
+	Carousel.prototype.cycle = function (e) {
+		e || (this.paused = false)
+
+		this.interval && clearInterval(this.interval)
+
+		this.options.interval
+		&& !this.paused
+		&& (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
+
+		return this
+	}
+
+	Carousel.prototype.getActiveIndex = function () {
+		this.$active = this.$element.find('.item.active')
+		this.$items = this.$active.parent().children()
+
+		return this.$items.index(this.$active)
+	}
+
+	Carousel.prototype.to = function (pos) {
+		var that = this
+		var activeIndex = this.getActiveIndex()
+
+		if (pos > (this.$items.length - 1) || pos < 0) return
+
+		if (this.sliding) return this.$element.one('slid.bs.carousel', function () {
+			that.to(pos)
+		})
+		if (activeIndex == pos) return this.pause().cycle()
+
+		return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
+	}
+
+	Carousel.prototype.pause = function (e) {
+		e || (this.paused = true)
+
+		if (this.$element.find('.next, .prev').length && $.support.transition) {
+			this.$element.trigger($.support.transition.end)
+			this.cycle(true)
+		}
+
+		this.interval = clearInterval(this.interval)
+
+		return this
+	}
+
+	Carousel.prototype.next = function () {
+		if (this.sliding) return
+		return this.slide('next')
+	}
+
+	Carousel.prototype.prev = function () {
+		if (this.sliding) return
+		return this.slide('prev')
+	}
+
+	Carousel.prototype.slide = function (type, next) {
+		var $active = this.$element.find('.item.active')
+		var $next = next || $active[type]()
+		var isCycling = this.interval
+		var direction = type == 'next' ? 'left' : 'right'
+		var fallback = type == 'next' ? 'first' : 'last'
+		var that = this
+
+		if (!$next.length) {
+			if (!this.options.wrap) return
+			$next = this.$element.find('.item')[fallback]()
+		}
+
+		if ($next.hasClass('active')) return this.sliding = false
+
+		var e = $.Event('slide.bs.carousel', {relatedTarget: $next[0], direction: direction})
+		this.$element.trigger(e)
+		if (e.isDefaultPrevented()) return
+
+		this.sliding = true
+
+		isCycling && this.pause()
+
+		if (this.$indicators.length) {
+			this.$indicators.find('.active').removeClass('active')
+			this.$element.one('slid.bs.carousel', function () {
+				var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
+				$nextIndicator && $nextIndicator.addClass('active')
+			})
+		}
+
+		if ($.support.transition && this.$element.hasClass('slide')) {
+			$next.addClass(type)
+			$next[0].offsetWidth // force reflow
+			$active.addClass(direction)
+			$next.addClass(direction)
+			$active
+				.one($.support.transition.end, function () {
+					$next.removeClass([type, direction].join(' ')).addClass('active')
+					$active.removeClass(['active', direction].join(' '))
+					that.sliding = false
+					setTimeout(function () {
+						that.$element.trigger('slid.bs.carousel')
+					}, 0)
+				})
+				.emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000)
+		} else {
+			$active.removeClass('active')
+			$next.addClass('active')
+			this.sliding = false
+			this.$element.trigger('slid.bs.carousel')
+		}
+
+		isCycling && this.cycle()
+
+		return this
+	}
+
+
+	// CAROUSEL PLUGIN DEFINITION
+	// ==========================
+
+	var old = $.fn.carousel
+
+	$.fn.carousel = function (option) {
+		return this.each(function () {
+			var $this = $(this)
+			var data = $this.data('bs.carousel')
+			var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option)
+			var action = typeof option == 'string' ? option : options.slide
+
+			if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)))
+			if (typeof option == 'number') data.to(option)
+			else if (action) data[action]()
+			else if (options.interval) data.pause().cycle()
+		})
+	}
+
+	$.fn.carousel.Constructor = Carousel
+
+
+	// CAROUSEL NO CONFLICT
+	// ====================
+
+	$.fn.carousel.noConflict = function () {
+		$.fn.carousel = old
+		return this
+	}
+
+
+	// CAROUSEL DATA-API
+	// =================
+
+	$(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
+		var $this = $(this), href
+		var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+		var options = $.extend({}, $target.data(), $this.data())
+		var slideIndex = $this.attr('data-slide-to')
+		if (slideIndex) options.interval = false
+
+		$target.carousel(options)
+
+		if (slideIndex = $this.attr('data-slide-to')) {
+			$target.data('bs.carousel').to(slideIndex)
+		}
+
+		e.preventDefault()
+	})
+
+	$(window).on('load', function () {
+		$('[data-ride="carousel"]').each(function () {
+			var $carousel = $(this)
+			$carousel.carousel($carousel.data())
+		})
+	})
 
 }(jQuery);
 
@@ -468,164 +478,164 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
 
 
 +function ($) {
-  'use strict';
+	'use strict';
 
-  // COLLAPSE PUBLIC CLASS DEFINITION
-  // ================================
+	// COLLAPSE PUBLIC CLASS DEFINITION
+	// ================================
 
-  var Collapse = function (element, options) {
-    this.$element      = $(element)
-    this.options       = $.extend({}, Collapse.DEFAULTS, options)
-    this.transitioning = null
+	var Collapse = function (element, options) {
+		this.$element = $(element)
+		this.options = $.extend({}, Collapse.DEFAULTS, options)
+		this.transitioning = null
 
-    if (this.options.parent) this.$parent = $(this.options.parent)
-    if (this.options.toggle) this.toggle()
-  }
+		if (this.options.parent) this.$parent = $(this.options.parent)
+		if (this.options.toggle) this.toggle()
+	}
 
-  Collapse.DEFAULTS = {
-    toggle: true
-  }
+	Collapse.DEFAULTS = {
+		toggle: true
+	}
 
-  Collapse.prototype.dimension = function () {
-    var hasWidth = this.$element.hasClass('width')
-    return hasWidth ? 'width' : 'height'
-  }
+	Collapse.prototype.dimension = function () {
+		var hasWidth = this.$element.hasClass('width')
+		return hasWidth ? 'width' : 'height'
+	}
 
-  Collapse.prototype.show = function () {
-    if (this.transitioning || this.$element.hasClass('in')) return
+	Collapse.prototype.show = function () {
+		if (this.transitioning || this.$element.hasClass('in')) return
 
-    var startEvent = $.Event('show.bs.collapse')
-    this.$element.trigger(startEvent)
-    if (startEvent.isDefaultPrevented()) return
+		var startEvent = $.Event('show.bs.collapse')
+		this.$element.trigger(startEvent)
+		if (startEvent.isDefaultPrevented()) return
 
-    var actives = this.$parent && this.$parent.find('> .panel > .in')
+		var actives = this.$parent && this.$parent.find('> .panel > .in')
 
-    if (actives && actives.length) {
-      var hasData = actives.data('bs.collapse')
-      if (hasData && hasData.transitioning) return
-      actives.collapse('hide')
-      hasData || actives.data('bs.collapse', null)
-    }
+		if (actives && actives.length) {
+			var hasData = actives.data('bs.collapse')
+			if (hasData && hasData.transitioning) return
+			actives.collapse('hide')
+			hasData || actives.data('bs.collapse', null)
+		}
 
-    var dimension = this.dimension()
+		var dimension = this.dimension()
 
-    this.$element
-      .removeClass('collapse')
-      .addClass('collapsing')
-      [dimension](0)
+		this.$element
+			.removeClass('collapse')
+			.addClass('collapsing')
+			[dimension](0)
 
-    this.transitioning = 1
+		this.transitioning = 1
 
-    var complete = function () {
-      this.$element
-        .removeClass('collapsing')
-        .addClass('collapse in')
-        [dimension]('auto')
-      this.transitioning = 0
-      this.$element.trigger('shown.bs.collapse')
-    }
+		var complete = function () {
+			this.$element
+				.removeClass('collapsing')
+				.addClass('collapse in')
+				[dimension]('auto')
+			this.transitioning = 0
+			this.$element.trigger('shown.bs.collapse')
+		}
 
-    if (!$.support.transition) return complete.call(this)
+		if (!$.support.transition) return complete.call(this)
 
-    var scrollSize = $.camelCase(['scroll', dimension].join('-'))
+		var scrollSize = $.camelCase(['scroll', dimension].join('-'))
 
-    this.$element
-      .one($.support.transition.end, $.proxy(complete, this))
-      .emulateTransitionEnd(350)
-      [dimension](this.$element[0][scrollSize])
-  }
+		this.$element
+			.one($.support.transition.end, $.proxy(complete, this))
+			.emulateTransitionEnd(350)
+			[dimension](this.$element[0][scrollSize])
+	}
 
-  Collapse.prototype.hide = function () {
-    if (this.transitioning || !this.$element.hasClass('in')) return
+	Collapse.prototype.hide = function () {
+		if (this.transitioning || !this.$element.hasClass('in')) return
 
-    var startEvent = $.Event('hide.bs.collapse')
-    this.$element.trigger(startEvent)
-    if (startEvent.isDefaultPrevented()) return
+		var startEvent = $.Event('hide.bs.collapse')
+		this.$element.trigger(startEvent)
+		if (startEvent.isDefaultPrevented()) return
 
-    var dimension = this.dimension()
+		var dimension = this.dimension()
 
-    this.$element
-      [dimension](this.$element[dimension]())
-      [0].offsetHeight
+		this.$element
+			[dimension](this.$element[dimension]())
+			[0].offsetHeight
 
-    this.$element
-      .addClass('collapsing')
-      .removeClass('collapse')
-      .removeClass('in')
+		this.$element
+			.addClass('collapsing')
+			.removeClass('collapse')
+			.removeClass('in')
 
-    this.transitioning = 1
+		this.transitioning = 1
 
-    var complete = function () {
-      this.transitioning = 0
-      this.$element
-        .trigger('hidden.bs.collapse')
-        .removeClass('collapsing')
-        .addClass('collapse')
-    }
+		var complete = function () {
+			this.transitioning = 0
+			this.$element
+				.trigger('hidden.bs.collapse')
+				.removeClass('collapsing')
+				.addClass('collapse')
+		}
 
-    if (!$.support.transition) return complete.call(this)
+		if (!$.support.transition) return complete.call(this)
 
-    this.$element
-      [dimension](0)
-      .one($.support.transition.end, $.proxy(complete, this))
-      .emulateTransitionEnd(350)
-  }
+		this.$element
+			[dimension](0)
+			.one($.support.transition.end, $.proxy(complete, this))
+			.emulateTransitionEnd(350)
+	}
 
-  Collapse.prototype.toggle = function () {
-    this[this.$element.hasClass('in') ? 'hide' : 'show']()
-  }
+	Collapse.prototype.toggle = function () {
+		this[this.$element.hasClass('in') ? 'hide' : 'show']()
+	}
 
 
-  // COLLAPSE PLUGIN DEFINITION
-  // ==========================
+	// COLLAPSE PLUGIN DEFINITION
+	// ==========================
 
-  var old = $.fn.collapse
+	var old = $.fn.collapse
 
-  $.fn.collapse = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.collapse')
-      var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
+	$.fn.collapse = function (option) {
+		return this.each(function () {
+			var $this = $(this)
+			var data = $this.data('bs.collapse')
+			var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
 
-      if (!data && options.toggle && option == 'show') option = !option
-      if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
+			if (!data && options.toggle && option == 'show') option = !option
+			if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
+			if (typeof option == 'string') data[option]()
+		})
+	}
 
-  $.fn.collapse.Constructor = Collapse
+	$.fn.collapse.Constructor = Collapse
 
 
-  // COLLAPSE NO CONFLICT
-  // ====================
+	// COLLAPSE NO CONFLICT
+	// ====================
 
-  $.fn.collapse.noConflict = function () {
-    $.fn.collapse = old
-    return this
-  }
+	$.fn.collapse.noConflict = function () {
+		$.fn.collapse = old
+		return this
+	}
 
 
-  // COLLAPSE DATA-API
-  // =================
+	// COLLAPSE DATA-API
+	// =================
 
-  $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) {
-    var $this   = $(this), href
-    var target  = $this.attr('data-target')
-        || e.preventDefault()
-        || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
-    var $target = $(target)
-    var data    = $target.data('bs.collapse')
-    var option  = data ? 'toggle' : $this.data()
-    var parent  = $this.attr('data-parent')
-    var $parent = parent && $(parent)
+	$(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) {
+		var $this = $(this), href
+		var target = $this.attr('data-target')
+			|| e.preventDefault()
+			|| (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
+		var $target = $(target)
+		var data = $target.data('bs.collapse')
+		var option = data ? 'toggle' : $this.data()
+		var parent = $this.attr('data-parent')
+		var $parent = parent && $(parent)
 
-    if (!data || !data.transitioning) {
-      if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed')
-      $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
-    }
+		if (!data || !data.transitioning) {
+			if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed')
+			$this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
+		}
 
-    $target.collapse(option)
-  })
+		$target.collapse(option)
+	})
 
 }(jQuery);
 
@@ -639,141 +649,143 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
 
 
 +function ($) {
-  'use strict';
+	'use strict';
 
-  // DROPDOWN CLASS DEFINITION
-  // =========================
+	// DROPDOWN CLASS DEFINITION
+	// =========================
 
-  var backdrop = '.dropdown-backdrop'
-  var toggle   = '[data-toggle=dropdown]'
-  var Dropdown = function (element) {
-    $(element).on('click.bs.dropdown', this.toggle)
-  }
+	var backdrop = '.dropdown-backdrop'
+	var toggle = '[data-toggle=dropdown]'
+	var Dropdown = function (element) {
+		$(element).on('click.bs.dropdown', this.toggle)
+	}
 
-  Dropdown.prototype.toggle = function (e) {
-    var $this = $(this)
+	Dropdown.prototype.toggle = function (e) {
+		var $this = $(this)
 
-    if ($this.is('.disabled, :disabled')) return
+		if ($this.is('.disabled, :disabled')) return
 
-    var $parent  = getParent($this)
-    var isActive = $parent.hasClass('open')
+		var $parent = getParent($this)
+		var isActive = $parent.hasClass('open')
 
-    clearMenus()
+		clearMenus()
 
-    if (!isActive) {
-      if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
-        // if mobile we use a backdrop because click events don't delegate
-        $('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
-      }
+		if (!isActive) {
+			if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
+				// if mobile we use a backdrop because click events don't delegate
+				$('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
+			}
 
-      var relatedTarget = { relatedTarget: this }
-      $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget))
+			var relatedTarget = {relatedTarget: this}
+			$parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget))
 
-      if (e.isDefaultPrevented()) return
+			if (e.isDefaultPrevented()) return
 
-      $parent
-        .toggleClass('open')
-        .trigger('shown.bs.dropdown', relatedTarget)
+			$parent
+				.toggleClass('open')
+				.trigger('shown.bs.dropdown', relatedTarget)
 
-      $this.focus()
-    }
+			$this.focus()
+		}
 
-    return false
-  }
+		return false
+	}
 
-  Dropdown.prototype.keydown = function (e) {
-    if (!/(38|40|27)/.test(e.keyCode)) return
+	Dropdown.prototype.keydown = function (e) {
+		if (!/(38|40|27)/.test(e.keyCode)) return
 
-    var $this = $(this)
+		var $this = $(this)
 
-    e.preventDefault()
-    e.stopPropagation()
+		e.preventDefault()
+		e.stopPropagation()
 
-    if ($this.is('.disabled, :disabled')) return
+		if ($this.is('.disabled, :disabled')) return
 
-    var $parent  = getParent($this)
-    var isActive = $parent.hasClass('open')
+		var $parent = getParent($this)
+		var isActive = $parent.hasClass('open')
 
-    if (!isActive || (isActive && e.keyCode == 27)) {
-      if (e.which == 27) $parent.find(toggle).focus()
-      return $this.click()
-    }
+		if (!isActive || (isActive && e.keyCode == 27)) {
+			if (e.which == 27) $parent.find(toggle).focus()
+			return $this.click()
+		}
 
-    var desc = ' li:not(.divider):visible a'
-    var $items = $parent.find('[role=menu]' + desc + ', [role=listbox]' + desc)
+		var desc = ' li:not(.divider):visible a'
+		var $items = $parent.find('[role=menu]' + desc + ', [role=listbox]' + desc)
 
-    if (!$items.length) return
+		if (!$items.length) return
 
-    var index = $items.index($items.filter(':focus'))
+		var index = $items.index($items.filter(':focus'))
 
-    if (e.keyCode == 38 && index > 0)                 index--                        // up
-    if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
-    if (!~index)                                      index = 0
+		if (e.keyCode == 38 && index > 0) index--                        // up
+		if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
+		if (!~index) index = 0
 
-    $items.eq(index).focus()
-  }
+		$items.eq(index).focus()
+	}
 
-  function clearMenus(e) {
-    $(backdrop).remove()
-    $(toggle).each(function () {
-      var $parent = getParent($(this))
-      var relatedTarget = { relatedTarget: this }
-      if (!$parent.hasClass('open')) return
-      $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
-      if (e.isDefaultPrevented()) return
-      $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
-    })
-  }
+	function clearMenus(e) {
+		$(backdrop).remove()
+		$(toggle).each(function () {
+			var $parent = getParent($(this))
+			var relatedTarget = {relatedTarget: this}
+			if (!$parent.hasClass('open')) return
+			$parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
+			if (e.isDefaultPrevented()) return
+			$parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
+		})
+	}
 
-  function getParent($this) {
-    var selector = $this.attr('data-target')
+	function getParent($this) {
+		var selector = $this.attr('data-target')
 
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-    }
+		if (!selector) {
+			selector = $this.attr('href')
+			selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+		}
 
-    var $parent = selector && $(selector)
+		var $parent = selector && $(selector)
 
-    return $parent && $parent.length ? $parent : $this.parent()
-  }
+		return $parent && $parent.length ? $parent : $this.parent()
+	}
 
 
-  // DROPDOWN PLUGIN DEFINITION
-  // ==========================
+	// DROPDOWN PLUGIN DEFINITION
+	// ==========================
 
-  var old = $.fn.dropdown
+	var old = $.fn.dropdown
 
-  $.fn.dropdown = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.dropdown')
+	$.fn.dropdown = function (option) {
+		return this.each(function () {
+			var $this = $(this)
+			var data = $this.data('bs.dropdown')
 
-      if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
+			if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
+			if (typeof option == 'string') data[option].call($this)
+		})
+	}
 
-  $.fn.dropdown.Constructor = Dropdown
+	$.fn.dropdown.Constructor = Dropdown
 
 
-  // DROPDOWN NO CONFLICT
-  // ====================
+	// DROPDOWN NO CONFLICT
+	// ====================
 
-  $.fn.dropdown.noConflict = function () {
-    $.fn.dropdown = old
-    return this
-  }
+	$.fn.dropdown.noConflict = function () {
+		$.fn.dropdown = old
+		return this
+	}
 
 
-  // APPLY TO STANDARD DROPDOWN ELEMENTS
-  // ===================================
+	// APPLY TO STANDARD DROPDOWN ELEMENTS
+	// ===================================
 
-  $(document)
-    .on('click.bs.dropdown.data-api', clearMenus)
-    .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
-    .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu], [role=listbox]', Dropdown.prototype.keydown)
+	$(document)
+		.on('click.bs.dropdown.data-api', clearMenus)
+		.on('click.bs.dropdown.data-api', '.dropdown form', function (e) {
+			e.stopPropagation()
+		})
+		.on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
+		.on('keydown.bs.dropdown.data-api', toggle + ', [role=menu], [role=listbox]', Dropdown.prototype.keydown)
 
 }(jQuery);
 
@@ -787,237 +799,241 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
 
 
 +function ($) {
-  'use strict';
-
-  // MODAL CLASS DEFINITION
-  // ======================
-
-  var Modal = function (element, options) {
-    this.options   = options
-    this.$element  = $(element)
-    this.$backdrop =
-    this.isShown   = null
-
-    if (this.options.remote) {
-      this.$element
-        .find('.modal-content')
-        .load(this.options.remote, $.proxy(function () {
-          this.$element.trigger('loaded.bs.modal')
-        }, this))
-    }
-  }
-
-  Modal.DEFAULTS = {
-    backdrop: true,
-    keyboard: true,
-    show: true
-  }
-
-  Modal.prototype.toggle = function (_relatedTarget) {
-    return this[!this.isShown ? 'show' : 'hide'](_relatedTarget)
-  }
-
-  Modal.prototype.show = function (_relatedTarget) {
-    var that = this
-    var e    = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
-
-    this.$element.trigger(e)
-
-    if (this.isShown || e.isDefaultPrevented()) return
-
-    this.isShown = true
-
-    this.escape()
-
-    this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
-
-    this.backdrop(function () {
-      var transition = $.support.transition && that.$element.hasClass('fade')
-
-      if (!that.$element.parent().length) {
-        that.$element.appendTo(document.body) // don't move modals dom position
-      }
-
-      that.$element
-        .show()
-        .scrollTop(0)
-
-      if (transition) {
-        that.$element[0].offsetWidth // force reflow
-      }
-
-      that.$element
-        .addClass('in')
-        .attr('aria-hidden', false)
+	'use strict';
 
-      that.enforceFocus()
-
-      var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
+	// MODAL CLASS DEFINITION
+	// ======================
 
-      transition ?
-        that.$element.find('.modal-dialog') // wait for modal to slide in
-          .one($.support.transition.end, function () {
-            that.$element.focus().trigger(e)
-          })
-          .emulateTransitionEnd(300) :
-        that.$element.focus().trigger(e)
-    })
-  }
-
-  Modal.prototype.hide = function (e) {
-    if (e) e.preventDefault()
-
-    e = $.Event('hide.bs.modal')
+	var Modal = function (element, options) {
+		this.options = options
+		this.$element = $(element)
+		this.$backdrop =
+			this.isShown = null
 
-    this.$element.trigger(e)
+		if (this.options.remote) {
+			this.$element
+				.find('.modal-content')
+				.load(this.options.remote, $.proxy(function () {
+					this.$element.trigger('loaded.bs.modal')
+				}, this))
+		}
+	}
 
-    if (!this.isShown || e.isDefaultPrevented()) return
+	Modal.DEFAULTS = {
+		backdrop: true,
+		keyboard: true,
+		show: true
+	}
 
-    this.isShown = false
+	Modal.prototype.toggle = function (_relatedTarget) {
+		return this[!this.isShown ? 'show' : 'hide'](_relatedTarget)
+	}
+
+	Modal.prototype.show = function (_relatedTarget) {
+		var that = this
+		var e = $.Event('show.bs.modal', {relatedTarget: _relatedTarget})
+
+		this.$element.trigger(e)
+
+		if (this.isShown || e.isDefaultPrevented()) return
+
+		this.isShown = true
+
+		this.escape()
+
+		this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
+
+		this.backdrop(function () {
+			var transition = $.support.transition && that.$element.hasClass('fade')
 
-    this.escape()
+			if (!that.$element.parent().length) {
+				that.$element.appendTo(document.body) // don't move modals dom position
+			}
+
+			that.$element
+				.show()
+				.scrollTop(0)
+
+			if (transition) {
+				that.$element[0].offsetWidth // force reflow
+			}
 
-    $(document).off('focusin.bs.modal')
+			that.$element
+				.addClass('in')
+				.attr('aria-hidden', false)
 
-    this.$element
-      .removeClass('in')
-      .attr('aria-hidden', true)
-      .off('click.dismiss.bs.modal')
-
-    $.support.transition && this.$element.hasClass('fade') ?
-      this.$element
-        .one($.support.transition.end, $.proxy(this.hideModal, this))
-        .emulateTransitionEnd(300) :
-      this.hideModal()
-  }
+			that.enforceFocus()
+
+			var e = $.Event('shown.bs.modal', {relatedTarget: _relatedTarget})
 
-  Modal.prototype.enforceFocus = function () {
-    $(document)
-      .off('focusin.bs.modal') // guard against infinite focus loop
-      .on('focusin.bs.modal', $.proxy(function (e) {
-        if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
-          this.$element.focus()
-        }
-      }, this))
-  }
+			transition ?
+				that.$element.find('.modal-dialog') // wait for modal to slide in
+					.one($.support.transition.end, function () {
+						that.$element.focus().trigger(e)
+					})
+					.emulateTransitionEnd(300) :
+				that.$element.focus().trigger(e)
+		})
+	}
+
+	Modal.prototype.hide = function (e) {
+		if (e) e.preventDefault()
+
+		e = $.Event('hide.bs.modal')
 
-  Modal.prototype.escape = function () {
-    if (this.isShown && this.options.keyboard) {
-      this.$element.on('keyup.dismiss.bs.modal', $.proxy(function (e) {
-        e.which == 27 && this.hide()
-      }, this))
-    } else if (!this.isShown) {
-      this.$element.off('keyup.dismiss.bs.modal')
-    }
-  }
+		this.$element.trigger(e)
 
-  Modal.prototype.hideModal = function () {
-    var that = this
-    this.$element.hide()
-    this.backdrop(function () {
-      that.removeBackdrop()
-      that.$element.trigger('hidden.bs.modal')
-    })
-  }
+		if (!this.isShown || e.isDefaultPrevented()) return
 
-  Modal.prototype.removeBackdrop = function () {
-    this.$backdrop && this.$backdrop.remove()
-    this.$backdrop = null
-  }
+		this.isShown = false
 
-  Modal.prototype.backdrop = function (callback) {
-    var animate = this.$element.hasClass('fade') ? 'fade' : ''
+		this.escape()
 
-    if (this.isShown && this.options.backdrop) {
-      var doAnimate = $.support.transition && animate
+		$(document).off('focusin.bs.modal')
 
-      this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
-        .appendTo(document.body)
+		this.$element
+			.removeClass('in')
+			.attr('aria-hidden', true)
+			.off('click.dismiss.bs.modal')
+
+		$.support.transition && this.$element.hasClass('fade') ?
+			this.$element
+				.one($.support.transition.end, $.proxy(this.hideModal, this))
+				.emulateTransitionEnd(300) :
+			this.hideModal()
+	}
 
-      this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
-        if (e.target !== e.currentTarget) return
-        this.options.backdrop == 'static'
-          ? this.$element[0].focus.call(this.$element[0])
-          : this.hide.call(this)
-      }, this))
+	Modal.prototype.enforceFocus = function () {
+		$(document)
+			.off('focusin.bs.modal') // guard against infinite focus loop
+			.on('focusin.bs.modal', $.proxy(function (e) {
+				if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
+					this.$element.focus()
+				}
+			}, this))
+	}
 
-      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+	Modal.prototype.escape = function () {
+		if (this.isShown && this.options.keyboard) {
+			this.$element.on('keyup.dismiss.bs.modal', $.proxy(function (e) {
+				e.which == 27 && this.hide()
+			}, this))
+		} else if (!this.isShown) {
+			this.$element.off('keyup.dismiss.bs.modal')
+		}
+	}
 
-      this.$backdrop.addClass('in')
+	Modal.prototype.hideModal = function () {
+		var that = this
+		this.$element.hide()
+		this.backdrop(function () {
+			that.removeBackdrop()
+			that.$element.trigger('hidden.bs.modal')
+		})
+	}
 
-      if (!callback) return
+	Modal.prototype.removeBackdrop = function () {
+		this.$backdrop && this.$backdrop.remove()
+		this.$backdrop = null
+	}
 
-      doAnimate ?
-        this.$backdrop
-          .one($.support.transition.end, callback)
-          .emulateTransitionEnd(150) :
-        callback()
+	Modal.prototype.backdrop = function (callback) {
+		var animate = this.$element.hasClass('fade') ? 'fade' : ''
 
-    } else if (!this.isShown && this.$backdrop) {
-      this.$backdrop.removeClass('in')
-
-      $.support.transition && this.$element.hasClass('fade') ?
-        this.$backdrop
-          .one($.support.transition.end, callback)
-          .emulateTransitionEnd(150) :
-        callback()
+		if (this.isShown && this.options.backdrop) {
+			var doAnimate = $.support.transition && animate
 
-    } else if (callback) {
-      callback()
-    }
-  }
+			this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
+				.appendTo(document.body)
 
+			this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
+				if (e.target !== e.currentTarget) return
+				this.options.backdrop == 'static'
+					? this.$element[0].focus.call(this.$element[0])
+					: this.hide.call(this)
+			}, this))
 
-  // MODAL PLUGIN DEFINITION
-  // =======================
+			if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+
+			this.$backdrop.addClass('in')
 
-  var old = $.fn.modal
-
-  $.fn.modal = function (option, _relatedTarget) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.modal')
-      var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
-
-      if (!data) $this.data('bs.modal', (data = new Modal(this, options)))
-      if (typeof option == 'string') data[option](_relatedTarget)
-      else if (options.show) data.show(_relatedTarget)
-    })
-  }
-
-  $.fn.modal.Constructor = Modal
-
-
-  // MODAL NO CONFLICT
-  // =================
-
-  $.fn.modal.noConflict = function () {
-    $.fn.modal = old
-    return this
-  }
+			if (!callback) return
+
+			doAnimate ?
+				this.$backdrop
+					.one($.support.transition.end, callback)
+					.emulateTransitionEnd(150) :
+				callback()
+
+		} else if (!this.isShown && this.$backdrop) {
+			this.$backdrop.removeClass('in')
+
+			$.support.transition && this.$element.hasClass('fade') ?
+				this.$backdrop
+					.one($.support.transition.end, callback)
+					.emulateTransitionEnd(150) :
+				callback()
 
+		} else if (callback) {
+			callback()
+		}
+	}
 
-  // MODAL DATA-API
-  // ==============
 
-  $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) {
-    var $this   = $(this)
-    var href    = $this.attr('href')
-    var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
-    var option  = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
+	// MODAL PLUGIN DEFINITION
+	// =======================
+
+	var old = $.fn.modal
+
+	$.fn.modal = function (option, _relatedTarget) {
+		return this.each(function () {
+			var $this = $(this)
+			var data = $this.data('bs.modal')
+			var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
+
+			if (!data) $this.data('bs.modal', (data = new Modal(this, options)))
+			if (typeof option == 'string') data[option](_relatedTarget)
+			else if (options.show) data.show(_relatedTarget)
+		})
+	}
+
+	$.fn.modal.Constructor = Modal
+
+
+	// MODAL NO CONFLICT
+	// =================
+
+	$.fn.modal.noConflict = function () {
+		$.fn.modal = old
+		return this
+	}
+
+
+	// MODAL DATA-API
+	// ==============
+
+	$(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) {
+		var $this = $(this)
+		var href = $this.attr('href')
+		var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
+		var option = $target.data('bs.modal') ? 'toggle' : $.extend({remote: !/#/.test(href) && href}, $target.data(), $this.data())
+
+		if ($this.is('a')) e.preventDefault()
 
-    if ($this.is('a')) e.preventDefault()
+		$target
+			.modal(option, this)
+			.one('hide', function () {
+				$this.is(':visible') && $this.focus()
+			})
+	})
 
-    $target
-      .modal(option, this)
-      .one('hide', function () {
-        $this.is(':visible') && $this.focus()
-      })
-  })
-
-  $(document)
-    .on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
-    .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
+	$(document)
+		.on('show.bs.modal', '.modal', function () {
+			$(document.body).addClass('modal-open')
+		})
+		.on('hidden.bs.modal', '.modal', function () {
+			$(document.body).removeClass('modal-open')
+		})
 
 }(jQuery);
 
@@ -1032,392 +1048,395 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
 
 
 +function ($) {
-  'use strict';
-
-  // TOOLTIP PUBLIC CLASS DEFINITION
-  // ===============================
-
-  var Tooltip = function (element, options) {
-    this.type       =
-    this.options    =
-    this.enabled    =
-    this.timeout    =
-    this.hoverState =
-    this.$element   = null
-
-    this.init('tooltip', element, options)
-  }
-
-  Tooltip.DEFAULTS = {
-    animation: true,
-    placement: 'top',
-    selector: false,
-    template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',
-    trigger: 'hover focus',
-    title: '',
-    delay: 0,
-    html: false,
-    container: false
-  }
-
-  Tooltip.prototype.init = function (type, element, options) {
-    this.enabled  = true
-    this.type     = type
-    this.$element = $(element)
-    this.options  = this.getOptions(options)
-
-    var triggers = this.options.trigger.split(' ')
-
-    for (var i = triggers.length; i--;) {
-      var trigger = triggers[i]
-
-      if (trigger == 'click') {
-        this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
-      } else if (trigger != 'manual') {
-        var eventIn  = trigger == 'hover' ? 'mouseenter' : 'focusin'
-        var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout'
-
-        this.$element.on(eventIn  + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
-        this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
-      }
-    }
-
-    this.options.selector ?
-      (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
-      this.fixTitle()
-  }
-
-  Tooltip.prototype.getDefaults = function () {
-    return Tooltip.DEFAULTS
-  }
-
-  Tooltip.prototype.getOptions = function (options) {
-    options = $.extend({}, this.getDefaults(), this.$element.data(), options)
-
-    if (options.delay && typeof options.delay == 'number') {
-      options.delay = {
-        show: options.delay,
-        hide: options.delay
-      }
-    }
-
-    return options
-  }
+	'use strict';
+
+	// TOOLTIP PUBLIC CLASS DEFINITION
+	// ===============================
+
+	var Tooltip = function (element, options) {
+		this.type =
+			this.options =
+				this.enabled =
+					this.timeout =
+						this.hoverState =
+							this.$element = null
 
-  Tooltip.prototype.getDelegateOptions = function () {
-    var options  = {}
-    var defaults = this.getDefaults()
+		this.init('tooltip', element, options)
+	}
 
-    this._options && $.each(this._options, function (key, value) {
-      if (defaults[key] != value) options[key] = value
-    })
+	Tooltip.DEFAULTS = {
+		animation: true,
+		placement: 'top',
+		selector: false,
+		template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',
+		trigger: 'hover focus',
+		title: '',
+		delay: 0,
+		html: false,
+		container: false
+	}
 
-    return options
-  }
+	Tooltip.prototype.init = function (type, element, options) {
+		this.enabled = true
+		this.type = type
+		this.$element = $(element)
+		this.options = this.getOptions(options)
 
-  Tooltip.prototype.enter = function (obj) {
-    var self = obj instanceof this.constructor ?
-      obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
+		var triggers = this.options.trigger.split(' ')
 
-    clearTimeout(self.timeout)
+		for (var i = triggers.length; i--;) {
+			var trigger = triggers[i]
 
-    self.hoverState = 'in'
+			if (trigger == 'click') {
+				this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
+			} else if (trigger != 'manual') {
+				var eventIn = trigger == 'hover' ? 'mouseenter' : 'focusin'
+				var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout'
 
-    if (!self.options.delay || !self.options.delay.show) return self.show()
+				this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
+				this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
+			}
+		}
 
-    self.timeout = setTimeout(function () {
-      if (self.hoverState == 'in') self.show()
-    }, self.options.delay.show)
-  }
+		this.options.selector ?
+			(this._options = $.extend({}, this.options, {trigger: 'manual', selector: ''})) :
+			this.fixTitle()
+	}
 
-  Tooltip.prototype.leave = function (obj) {
-    var self = obj instanceof this.constructor ?
-      obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
+	Tooltip.prototype.getDefaults = function () {
+		return Tooltip.DEFAULTS
+	}
 
-    clearTimeout(self.timeout)
+	Tooltip.prototype.getOptions = function (options) {
+		options = $.extend({}, this.getDefaults(), this.$element.data(), options)
 
-    self.hoverState = 'out'
-
-    if (!self.options.delay || !self.options.delay.hide) return self.hide()
-
-    self.timeout = setTimeout(function () {
-      if (self.hoverState == 'out') self.hide()
-    }, self.options.delay.hide)
-  }
+		if (options.delay && typeof options.delay == 'number') {
+			options.delay = {
+				show: options.delay,
+				hide: options.delay
+			}
+		}
 
-  Tooltip.prototype.show = function () {
-    var e = $.Event('show.bs.' + this.type)
+		return options
+	}
 
-    if (this.hasContent() && this.enabled) {
-      this.$element.trigger(e)
+	Tooltip.prototype.getDelegateOptions = function () {
+		var options = {}
+		var defaults = this.getDefaults()
 
-      if (e.isDefaultPrevented()) return
-      var that = this;
+		this._options && $.each(this._options, function (key, value) {
+			if (defaults[key] != value) options[key] = value
+		})
 
-      var $tip = this.tip()
+		return options
+	}
 
-      this.setContent()
+	Tooltip.prototype.enter = function (obj) {
+		var self = obj instanceof this.constructor ?
+			obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
 
-      if (this.options.animation) $tip.addClass('fade')
+		clearTimeout(self.timeout)
 
-      var placement = typeof this.options.placement == 'function' ?
-        this.options.placement.call(this, $tip[0], this.$element[0]) :
-        this.options.placement
+		self.hoverState = 'in'
 
-      var autoToken = /\s?auto?\s?/i
-      var autoPlace = autoToken.test(placement)
-      if (autoPlace) placement = placement.replace(autoToken, '') || 'top'
+		if (!self.options.delay || !self.options.delay.show) return self.show()
 
-      $tip
-        .detach()
-        .css({ top: 0, left: 0, display: 'block' })
-        .addClass(placement)
+		self.timeout = setTimeout(function () {
+			if (self.hoverState == 'in') self.show()
+		}, self.options.delay.show)
+	}
 
-      this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
+	Tooltip.prototype.leave = function (obj) {
+		var self = obj instanceof this.constructor ?
+			obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
 
-      var pos          = this.getPosition()
-      var actualWidth  = $tip[0].offsetWidth
-      var actualHeight = $tip[0].offsetHeight
+		clearTimeout(self.timeout)
 
-      if (autoPlace) {
-        var $parent = this.$element.parent()
+		self.hoverState = 'out'
+
+		if (!self.options.delay || !self.options.delay.hide) return self.hide()
+
+		self.timeout = setTimeout(function () {
+			if (self.hoverState == 'out') self.hide()
+		}, self.options.delay.hide)
+	}
 
-        var orgPlacement = placement
-        var docScroll    = document.documentElement.scrollTop || document.body.scrollTop
-        var parentWidth  = this.options.container == 'body' ? window.innerWidth  : $parent.outerWidth()
-        var parentHeight = this.options.container == 'body' ? window.innerHeight : $parent.outerHeight()
-        var parentLeft   = this.options.container == 'body' ? 0 : $parent.offset().left
+	Tooltip.prototype.show = function () {
+		var e = $.Event('show.bs.' + this.type)
 
-        placement = placement == 'bottom' && pos.top   + pos.height  + actualHeight - docScroll > parentHeight  ? 'top'    :
-                    placement == 'top'    && pos.top   - docScroll   - actualHeight < 0                         ? 'bottom' :
-                    placement == 'right'  && pos.right + actualWidth > parentWidth                              ? 'left'   :
-                    placement == 'left'   && pos.left  - actualWidth < parentLeft                               ? 'right'  :
-                    placement
+		if (this.hasContent() && this.enabled) {
+			this.$element.trigger(e)
 
-        $tip
-          .removeClass(orgPlacement)
-          .addClass(placement)
-      }
+			if (e.isDefaultPrevented()) return
+			var that = this;
 
-      var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
+			var $tip = this.tip()
 
-      this.applyPlacement(calculatedOffset, placement)
-      this.hoverState = null
+			this.setContent()
 
-      var complete = function() {
-        that.$element.trigger('shown.bs.' + that.type)
-      }
+			if (this.options.animation) $tip.addClass('fade')
 
-      $.support.transition && this.$tip.hasClass('fade') ?
-        $tip
-          .one($.support.transition.end, complete)
-          .emulateTransitionEnd(150) :
-        complete()
-    }
-  }
+			var placement = typeof this.options.placement == 'function' ?
+				this.options.placement.call(this, $tip[0], this.$element[0]) :
+				this.options.placement
 
-  Tooltip.prototype.applyPlacement = function (offset, placement) {
-    var replace
-    var $tip   = this.tip()
-    var width  = $tip[0].offsetWidth
-    var height = $tip[0].offsetHeight
+			var autoToken = /\s?auto?\s?/i
+			var autoPlace = autoToken.test(placement)
+			if (autoPlace) placement = placement.replace(autoToken, '') || 'top'
 
-    // manually read margins because getBoundingClientRect includes difference
-    var marginTop = parseInt($tip.css('margin-top'), 10)
-    var marginLeft = parseInt($tip.css('margin-left'), 10)
+			$tip
+				.detach()
+				.css({top: 0, left: 0, display: 'block'})
+				.addClass(placement)
 
-    // we must check for NaN for ie 8/9
-    if (isNaN(marginTop))  marginTop  = 0
-    if (isNaN(marginLeft)) marginLeft = 0
+			this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
 
-    offset.top  = offset.top  + marginTop
-    offset.left = offset.left + marginLeft
+			var pos = this.getPosition()
+			var actualWidth = $tip[0].offsetWidth
+			var actualHeight = $tip[0].offsetHeight
 
-    // $.fn.offset doesn't round pixel values
-    // so we use setOffset directly with our own function B-0
-    $.offset.setOffset($tip[0], $.extend({
-      using: function (props) {
-        $tip.css({
-          top: Math.round(props.top),
-          left: Math.round(props.left)
-        })
-      }
-    }, offset), 0)
-
-    $tip.addClass('in')
-
-    // check to see if placing tip in new offset caused the tip to resize itself
-    var actualWidth  = $tip[0].offsetWidth
-    var actualHeight = $tip[0].offsetHeight
-
-    if (placement == 'top' && actualHeight != height) {
-      replace = true
-      offset.top = offset.top + height - actualHeight
-    }
-
-    if (/bottom|top/.test(placement)) {
-      var delta = 0
-
-      if (offset.left < 0) {
-        delta       = offset.left * -2
-        offset.left = 0
-
-        $tip.offset(offset)
-
-        actualWidth  = $tip[0].offsetWidth
-        actualHeight = $tip[0].offsetHeight
-      }
-
-      this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
-    } else {
-      this.replaceArrow(actualHeight - height, actualHeight, 'top')
-    }
-
-    if (replace) $tip.offset(offset)
-  }
-
-  Tooltip.prototype.replaceArrow = function (delta, dimension, position) {
-    this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '')
-  }
-
-  Tooltip.prototype.setContent = function () {
-    var $tip  = this.tip()
-    var title = this.getTitle()
-
-    $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
-    $tip.removeClass('fade in top bottom left right')
-  }
-
-  Tooltip.prototype.hide = function () {
-    var that = this
-    var $tip = this.tip()
-    var e    = $.Event('hide.bs.' + this.type)
-
-    function complete() {
-      if (that.hoverState != 'in') $tip.detach()
-      that.$element.trigger('hidden.bs.' + that.type)
-    }
-
-    this.$element.trigger(e)
-
-    if (e.isDefaultPrevented()) return
-
-    $tip.removeClass('in')
-
-    $.support.transition && this.$tip.hasClass('fade') ?
-      $tip
-        .one($.support.transition.end, complete)
-        .emulateTransitionEnd(150) :
-      complete()
-
-    this.hoverState = null
-
-    return this
-  }
-
-  Tooltip.prototype.fixTitle = function () {
-    var $e = this.$element
-    if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
-      $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
-    }
-  }
+			if (autoPlace) {
+				var $parent = this.$element.parent()
 
-  Tooltip.prototype.hasContent = function () {
-    return this.getTitle()
-  }
+				var orgPlacement = placement
+				var docScroll = document.documentElement.scrollTop || document.body.scrollTop
+				var parentWidth = this.options.container == 'body' ? window.innerWidth : $parent.outerWidth()
+				var parentHeight = this.options.container == 'body' ? window.innerHeight : $parent.outerHeight()
+				var parentLeft = this.options.container == 'body' ? 0 : $parent.offset().left
 
-  Tooltip.prototype.getPosition = function () {
-    var el = this.$element[0]
-    return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
-      width: el.offsetWidth,
-      height: el.offsetHeight
-    }, this.$element.offset())
-  }
-
-  Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
-    return placement == 'bottom' ? { top: pos.top + pos.height,   left: pos.left + pos.width / 2 - actualWidth / 2  } :
-           placement == 'top'    ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2  } :
-           placement == 'left'   ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
-        /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width   }
-  }
+				placement = placement == 'bottom' && pos.top + pos.height + actualHeight - docScroll > parentHeight ? 'top' :
+					placement == 'top' && pos.top - docScroll - actualHeight < 0 ? 'bottom' :
+						placement == 'right' && pos.right + actualWidth > parentWidth ? 'left' :
+							placement == 'left' && pos.left - actualWidth < parentLeft ? 'right' :
+								placement
 
-  Tooltip.prototype.getTitle = function () {
-    var title
-    var $e = this.$element
-    var o  = this.options
+				$tip
+					.removeClass(orgPlacement)
+					.addClass(placement)
+			}
 
-    title = $e.attr('data-original-title')
-      || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+			var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
 
-    return title
-  }
+			this.applyPlacement(calculatedOffset, placement)
+			this.hoverState = null
 
-  Tooltip.prototype.tip = function () {
-    return this.$tip = this.$tip || $(this.options.template)
-  }
+			var complete = function () {
+				that.$element.trigger('shown.bs.' + that.type)
+			}
 
-  Tooltip.prototype.arrow = function () {
-    return this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')
-  }
+			$.support.transition && this.$tip.hasClass('fade') ?
+				$tip
+					.one($.support.transition.end, complete)
+					.emulateTransitionEnd(150) :
+				complete()
+		}
+	}
 
-  Tooltip.prototype.validate = function () {
-    if (!this.$element[0].parentNode) {
-      this.hide()
-      this.$element = null
-      this.options  = null
-    }
-  }
+	Tooltip.prototype.applyPlacement = function (offset, placement) {
+		var replace
+		var $tip = this.tip()
+		var width = $tip[0].offsetWidth
+		var height = $tip[0].offsetHeight
 
-  Tooltip.prototype.enable = function () {
-    this.enabled = true
-  }
+		// manually read margins because getBoundingClientRect includes difference
+		var marginTop = parseInt($tip.css('margin-top'), 10)
+		var marginLeft = parseInt($tip.css('margin-left'), 10)
 
-  Tooltip.prototype.disable = function () {
-    this.enabled = false
-  }
+		// we must check for NaN for ie 8/9
+		if (isNaN(marginTop)) marginTop = 0
+		if (isNaN(marginLeft)) marginLeft = 0
 
-  Tooltip.prototype.toggleEnabled = function () {
-    this.enabled = !this.enabled
-  }
+		offset.top = offset.top + marginTop
+		offset.left = offset.left + marginLeft
 
-  Tooltip.prototype.toggle = function (e) {
-    var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) : this
-    self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
-  }
+		// $.fn.offset doesn't round pixel values
+		// so we use setOffset directly with our own function B-0
+		$.offset.setOffset($tip[0], $.extend({
+			using: function (props) {
+				$tip.css({
+					top: Math.round(props.top),
+					left: Math.round(props.left)
+				})
+			}
+		}, offset), 0)
+
+		$tip.addClass('in')
+
+		// check to see if placing tip in new offset caused the tip to resize itself
+		var actualWidth = $tip[0].offsetWidth
+		var actualHeight = $tip[0].offsetHeight
+
+		if (placement == 'top' && actualHeight != height) {
+			replace = true
+			offset.top = offset.top + height - actualHeight
+		}
+
+		if (/bottom|top/.test(placement)) {
+			var delta = 0
+
+			if (offset.left < 0) {
+				delta = offset.left * -2
+				offset.left = 0
+
+				$tip.offset(offset)
+
+				actualWidth = $tip[0].offsetWidth
+				actualHeight = $tip[0].offsetHeight
+			}
+
+			this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
+		} else {
+			this.replaceArrow(actualHeight - height, actualHeight, 'top')
+		}
+
+		if (replace) $tip.offset(offset)
+	}
+
+	Tooltip.prototype.replaceArrow = function (delta, dimension, position) {
+		this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '')
+	}
+
+	Tooltip.prototype.setContent = function () {
+		var $tip = this.tip()
+		var title = this.getTitle()
+
+		$tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
+		$tip.removeClass('fade in top bottom left right')
+	}
+
+	Tooltip.prototype.hide = function () {
+		var that = this
+		var $tip = this.tip()
+		var e = $.Event('hide.bs.' + this.type)
+
+		function complete() {
+			if (that.hoverState != 'in') $tip.detach()
+			that.$element.trigger('hidden.bs.' + that.type)
+		}
+
+		this.$element.trigger(e)
+
+		if (e.isDefaultPrevented()) return
+
+		$tip.removeClass('in')
+
+		$.support.transition && this.$tip.hasClass('fade') ?
+			$tip
+				.one($.support.transition.end, complete)
+				.emulateTransitionEnd(150) :
+			complete()
+
+		this.hoverState = null
+
+		return this
+	}
+
+	Tooltip.prototype.fixTitle = function () {
+		var $e = this.$element
+		if ($e.attr('title') || typeof ($e.attr('data-original-title')) != 'string') {
+			$e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
+		}
+	}
+
+	Tooltip.prototype.hasContent = function () {
+		return this.getTitle()
+	}
+
+	Tooltip.prototype.getPosition = function () {
+		var el = this.$element[0]
+		return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
+			width: el.offsetWidth,
+			height: el.offsetHeight
+		}, this.$element.offset())
+	}
+
+	Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
+		return placement == 'bottom' ? {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} :
+			placement == 'top' ? {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} :
+				placement == 'left' ? {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} :
+					/* placement == 'right' */ {
+						top: pos.top + pos.height / 2 - actualHeight / 2,
+						left: pos.left + pos.width
+					}
+	}
 
-  Tooltip.prototype.destroy = function () {
-    clearTimeout(this.timeout)
-    this.hide().$element.off('.' + this.type).removeData('bs.' + this.type)
-  }
+	Tooltip.prototype.getTitle = function () {
+		var title
+		var $e = this.$element
+		var o = this.options
 
+		title = $e.attr('data-original-title')
+			|| (typeof o.title == 'function' ? o.title.call($e[0]) : o.title)
 
-  // TOOLTIP PLUGIN DEFINITION
-  // =========================
+		return title
+	}
 
-  var old = $.fn.tooltip
+	Tooltip.prototype.tip = function () {
+		return this.$tip = this.$tip || $(this.options.template)
+	}
+
+	Tooltip.prototype.arrow = function () {
+		return this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')
+	}
+
+	Tooltip.prototype.validate = function () {
+		if (!this.$element[0].parentNode) {
+			this.hide()
+			this.$element = null
+			this.options = null
+		}
+	}
+
+	Tooltip.prototype.enable = function () {
+		this.enabled = true
+	}
+
+	Tooltip.prototype.disable = function () {
+		this.enabled = false
+	}
+
+	Tooltip.prototype.toggleEnabled = function () {
+		this.enabled = !this.enabled
+	}
+
+	Tooltip.prototype.toggle = function (e) {
+		var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) : this
+		self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
+	}
 
-  $.fn.tooltip = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.tooltip')
-      var options = typeof option == 'object' && option
+	Tooltip.prototype.destroy = function () {
+		clearTimeout(this.timeout)
+		this.hide().$element.off('.' + this.type).removeData('bs.' + this.type)
+	}
 
-      if (!data && option == 'destroy') return
-      if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.tooltip.Constructor = Tooltip
 
-
-  // TOOLTIP NO CONFLICT
-  // ===================
-
-  $.fn.tooltip.noConflict = function () {
-    $.fn.tooltip = old
-    return this
-  }
+	// TOOLTIP PLUGIN DEFINITION
+	// =========================
+
+	var old = $.fn.tooltip
+
+	$.fn.tooltip = function (option) {
+		return this.each(function () {
+			var $this = $(this)
+			var data = $this.data('bs.tooltip')
+			var options = typeof option == 'object' && option
+
+			if (!data && option == 'destroy') return
+			if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
+			if (typeof option == 'string') data[option]()
+		})
+	}
+
+	$.fn.tooltip.Constructor = Tooltip
+
+
+	// TOOLTIP NO CONFLICT
+	// ===================
+
+	$.fn.tooltip.noConflict = function () {
+		$.fn.tooltip = old
+		return this
+	}
 
 }(jQuery);
 
@@ -1431,104 +1450,104 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
 
 
 +function ($) {
-  'use strict';
+	'use strict';
 
-  // POPOVER PUBLIC CLASS DEFINITION
-  // ===============================
+	// POPOVER PUBLIC CLASS DEFINITION
+	// ===============================
 
-  var Popover = function (element, options) {
-    this.init('popover', element, options)
-  }
+	var Popover = function (element, options) {
+		this.init('popover', element, options)
+	}
 
-  if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
+	if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
 
-  Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
-    placement: 'right',
-    trigger: 'click',
-    content: '',
-    template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
-  })
+	Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
+		placement: 'right',
+		trigger: 'click',
+		content: '',
+		template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
+	})
 
 
-  // NOTE: POPOVER EXTENDS tooltip.js
-  // ================================
+	// NOTE: POPOVER EXTENDS tooltip.js
+	// ================================
 
-  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
+	Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
 
-  Popover.prototype.constructor = Popover
+	Popover.prototype.constructor = Popover
 
-  Popover.prototype.getDefaults = function () {
-    return Popover.DEFAULTS
-  }
+	Popover.prototype.getDefaults = function () {
+		return Popover.DEFAULTS
+	}
 
-  Popover.prototype.setContent = function () {
-    var $tip    = this.tip()
-    var title   = this.getTitle()
-    var content = this.getContent()
+	Popover.prototype.setContent = function () {
+		var $tip = this.tip()
+		var title = this.getTitle()
+		var content = this.getContent()
 
-    $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
-    $tip.find('.popover-content')[ // we use append for html objects to maintain js events
-      this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
-    ](content)
+		$tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
+		$tip.find('.popover-content')[ // we use append for html objects to maintain js events
+			this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
+			](content)
 
-    $tip.removeClass('fade top bottom left right in')
+		$tip.removeClass('fade top bottom left right in')
 
-    // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
-    // this manually by checking the contents.
-    if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
-  }
+		// IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
+		// this manually by checking the contents.
+		if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
+	}
 
-  Popover.prototype.hasContent = function () {
-    return this.getTitle() || this.getContent()
-  }
+	Popover.prototype.hasContent = function () {
+		return this.getTitle() || this.getContent()
+	}
 
-  Popover.prototype.getContent = function () {
-    var $e = this.$element
-    var o  = this.options
+	Popover.prototype.getContent = function () {
+		var $e = this.$element
+		var o = this.options
 
-    return $e.attr('data-content')
-      || (typeof o.content == 'function' ?
-            o.content.call($e[0]) :
-            o.content)
-  }
+		return $e.attr('data-content')
+			|| (typeof o.content == 'function' ?
+				o.content.call($e[0]) :
+				o.content)
+	}
 
-  Popover.prototype.arrow = function () {
-    return this.$arrow = this.$arrow || this.tip().find('.arrow')
-  }
+	Popover.prototype.arrow = function () {
+		return this.$arrow = this.$arrow || this.tip().find('.arrow')
+	}
 
-  Popover.prototype.tip = function () {
-    if (!this.$tip) this.$tip = $(this.options.template)
-    return this.$tip
-  }
+	Popover.prototype.tip = function () {
+		if (!this.$tip) this.$tip = $(this.options.template)
+		return this.$tip
+	}
 
 
-  // POPOVER PLUGIN DEFINITION
-  // =========================
+	// POPOVER PLUGIN DEFINITION
+	// =========================
 
-  var old = $.fn.popover
+	var old = $.fn.popover
 
-  $.fn.popover = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.popover')
-      var options = typeof option == 'object' && option
+	$.fn.popover = function (option) {
+		return this.each(function () {
+			var $this = $(this)
+			var data = $this.data('bs.popover')
+			var options = typeof option == 'object' && option
 
-      if (!data && option == 'destroy') return
-      if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
+			if (!data && option == 'destroy') return
+			if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
+			if (typeof option == 'string') data[option]()
+		})
+	}
 
-  $.fn.popover.Constructor = Popover
+	$.fn.popover.Constructor = Popover
 
 
-  // POPOVER NO CONFLICT
-  // ===================
+	// POPOVER NO CONFLICT
+	// ===================
 
-  $.fn.popover.noConflict = function () {
-    $.fn.popover = old
-    return this
-  }
+	$.fn.popover.noConflict = function () {
+		$.fn.popover = old
+		return this
+	}
 
 }(jQuery);
 
@@ -1542,147 +1561,149 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
 
 
 +function ($) {
-  'use strict';
-
-  // SCROLLSPY CLASS DEFINITION
-  // ==========================
-
-  function ScrollSpy(element, options) {
-    var href
-    var process  = $.proxy(this.process, this)
-
-    this.$element       = $(element).is('body') ? $(window) : $(element)
-    this.$body          = $('body')
-    this.$scrollElement = this.$element.on('scroll.bs.scroll-spy.data-api', process)
-    this.options        = $.extend({}, ScrollSpy.DEFAULTS, options)
-    this.selector       = (this.options.target
-      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-      || '') + ' .nav li > a'
-    this.offsets        = $([])
-    this.targets        = $([])
-    this.activeTarget   = null
-
-    this.refresh()
-    this.process()
-  }
-
-  ScrollSpy.DEFAULTS = {
-    offset: 10
-  }
-
-  ScrollSpy.prototype.refresh = function () {
-    var offsetMethod = this.$element[0] == window ? 'offset' : 'position'
-
-    this.offsets = $([])
-    this.targets = $([])
-
-    var self     = this
-    var $targets = this.$body
-      .find(this.selector)
-      .map(function () {
-        var $el   = $(this)
-        var href  = $el.data('target') || $el.attr('href')
-        var $href = /^#./.test(href) && $(href)
-
-        return ($href
-          && $href.length
-          && $href.is(':visible')
-          && [[ $href[offsetMethod]().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
-      })
-      .sort(function (a, b) { return a[0] - b[0] })
-      .each(function () {
-        self.offsets.push(this[0])
-        self.targets.push(this[1])
-      })
-  }
-
-  ScrollSpy.prototype.process = function () {
-    var scrollTop    = this.$scrollElement.scrollTop() + this.options.offset
-    var scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
-    var maxScroll    = scrollHeight - this.$scrollElement.height()
-    var offsets      = this.offsets
-    var targets      = this.targets
-    var activeTarget = this.activeTarget
-    var i
-
-    if (scrollTop >= maxScroll) {
-      return activeTarget != (i = targets.last()[0]) && this.activate(i)
-    }
-
-    if (activeTarget && scrollTop <= offsets[0]) {
-      return activeTarget != (i = targets[0]) && this.activate(i)
-    }
-
-    for (i = offsets.length; i--;) {
-      activeTarget != targets[i]
-        && scrollTop >= offsets[i]
-        && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
-        && this.activate( targets[i] )
-    }
-  }
-
-  ScrollSpy.prototype.activate = function (target) {
-    this.activeTarget = target
-
-    $(this.selector)
-      .parentsUntil(this.options.target, '.active')
-      .removeClass('active')
-
-    var selector = this.selector +
-        '[data-target="' + target + '"],' +
-        this.selector + '[href="' + target + '"]'
-
-    var active = $(selector)
-      .parents('li')
-      .addClass('active')
-
-    if (active.parent('.dropdown-menu').length) {
-      active = active
-        .closest('li.dropdown')
-        .addClass('active')
-    }
-
-    active.trigger('activate.bs.scrollspy')
-  }
-
-
-  // SCROLLSPY PLUGIN DEFINITION
-  // ===========================
-
-  var old = $.fn.scrollspy
-
-  $.fn.scrollspy = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.scrollspy')
-      var options = typeof option == 'object' && option
-
-      if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.scrollspy.Constructor = ScrollSpy
-
-
-  // SCROLLSPY NO CONFLICT
-  // =====================
-
-  $.fn.scrollspy.noConflict = function () {
-    $.fn.scrollspy = old
-    return this
-  }
-
-
-  // SCROLLSPY DATA-API
-  // ==================
-
-  $(window).on('load', function () {
-    $('[data-spy="scroll"]').each(function () {
-      var $spy = $(this)
-      $spy.scrollspy($spy.data())
-    })
-  })
+	'use strict';
+
+	// SCROLLSPY CLASS DEFINITION
+	// ==========================
+
+	function ScrollSpy(element, options) {
+		var href
+		var process = $.proxy(this.process, this)
+
+		this.$element = $(element).is('body') ? $(window) : $(element)
+		this.$body = $('body')
+		this.$scrollElement = this.$element.on('scroll.bs.scroll-spy.data-api', process)
+		this.options = $.extend({}, ScrollSpy.DEFAULTS, options)
+		this.selector = (this.options.target
+			|| ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+			|| '') + ' .nav li > a'
+		this.offsets = $([])
+		this.targets = $([])
+		this.activeTarget = null
+
+		this.refresh()
+		this.process()
+	}
+
+	ScrollSpy.DEFAULTS = {
+		offset: 10
+	}
+
+	ScrollSpy.prototype.refresh = function () {
+		var offsetMethod = this.$element[0] == window ? 'offset' : 'position'
+
+		this.offsets = $([])
+		this.targets = $([])
+
+		var self = this
+		var $targets = this.$body
+			.find(this.selector)
+			.map(function () {
+				var $el = $(this)
+				var href = $el.data('target') || $el.attr('href')
+				var $href = /^#./.test(href) && $(href)
+
+				return ($href
+					&& $href.length
+					&& $href.is(':visible')
+					&& [[$href[offsetMethod]().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href]]) || null
+			})
+			.sort(function (a, b) {
+				return a[0] - b[0]
+			})
+			.each(function () {
+				self.offsets.push(this[0])
+				self.targets.push(this[1])
+			})
+	}
+
+	ScrollSpy.prototype.process = function () {
+		var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
+		var scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
+		var maxScroll = scrollHeight - this.$scrollElement.height()
+		var offsets = this.offsets
+		var targets = this.targets
+		var activeTarget = this.activeTarget
+		var i
+
+		if (scrollTop >= maxScroll) {
+			return activeTarget != (i = targets.last()[0]) && this.activate(i)
+		}
+
+		if (activeTarget && scrollTop <= offsets[0]) {
+			return activeTarget != (i = targets[0]) && this.activate(i)
+		}
+
+		for (i = offsets.length; i--;) {
+			activeTarget != targets[i]
+			&& scrollTop >= offsets[i]
+			&& (!offsets[i + 1] || scrollTop <= offsets[i + 1])
+			&& this.activate(targets[i])
+		}
+	}
+
+	ScrollSpy.prototype.activate = function (target) {
+		this.activeTarget = target
+
+		$(this.selector)
+			.parentsUntil(this.options.target, '.active')
+			.removeClass('active')
+
+		var selector = this.selector +
+			'[data-target="' + target + '"],' +
+			this.selector + '[href="' + target + '"]'
+
+		var active = $(selector)
+			.parents('li')
+			.addClass('active')
+
+		if (active.parent('.dropdown-menu').length) {
+			active = active
+				.closest('li.dropdown')
+				.addClass('active')
+		}
+
+		active.trigger('activate.bs.scrollspy')
+	}
+
+
+	// SCROLLSPY PLUGIN DEFINITION
+	// ===========================
+
+	var old = $.fn.scrollspy
+
+	$.fn.scrollspy = function (option) {
+		return this.each(function () {
+			var $this = $(this)
+			var data = $this.data('bs.scrollspy')
+			var options = typeof option == 'object' && option
+
+			if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)))
+			if (typeof option == 'string') data[option]()
+		})
+	}
+
+	$.fn.scrollspy.Constructor = ScrollSpy
+
+
+	// SCROLLSPY NO CONFLICT
+	// =====================
+
+	$.fn.scrollspy.noConflict = function () {
+		$.fn.scrollspy = old
+		return this
+	}
+
+
+	// SCROLLSPY DATA-API
+	// ==================
+
+	$(window).on('load', function () {
+		$('[data-spy="scroll"]').each(function () {
+			var $spy = $(this)
+			$spy.scrollspy($spy.data())
+		})
+	})
 
 }(jQuery);
 
@@ -1696,119 +1717,119 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
 
 
 +function ($) {
-  'use strict';
+	'use strict';
 
-  // TAB CLASS DEFINITION
-  // ====================
+	// TAB CLASS DEFINITION
+	// ====================
 
-  var Tab = function (element) {
-    this.element = $(element)
-  }
+	var Tab = function (element) {
+		this.element = $(element)
+	}
 
-  Tab.prototype.show = function () {
-    var $this    = this.element
-    var $ul      = $this.closest('ul:not(.dropdown-menu)')
-    var selector = $this.data('target')
+	Tab.prototype.show = function () {
+		var $this = this.element
+		var $ul = $this.closest('ul:not(.dropdown-menu)')
+		var selector = $this.data('target')
 
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-    }
+		if (!selector) {
+			selector = $this.attr('href')
+			selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+		}
 
-    if ($this.parent('li').hasClass('active')) return
+		if ($this.parent('li').hasClass('active')) return
 
-    var previous = $ul.find('.active:last a')[0]
-    var e        = $.Event('show.bs.tab', {
-      relatedTarget: previous
-    })
+		var previous = $ul.find('.active:last a')[0]
+		var e = $.Event('show.bs.tab', {
+			relatedTarget: previous
+		})
 
-    $this.trigger(e)
+		$this.trigger(e)
 
-    if (e.isDefaultPrevented()) return
+		if (e.isDefaultPrevented()) return
 
-    var $target = $(selector)
+		var $target = $(selector)
 
-    this.activate($this.parent('li'), $ul)
-    this.activate($target, $target.parent(), function () {
-      $this.trigger({
-        type: 'shown.bs.tab',
-        relatedTarget: previous
-      })
-    })
-  }
+		this.activate($this.parent('li'), $ul)
+		this.activate($target, $target.parent(), function () {
+			$this.trigger({
+				type: 'shown.bs.tab',
+				relatedTarget: previous
+			})
+		})
+	}
 
-  Tab.prototype.activate = function (element, container, callback) {
-    var $active    = container.find('> .active')
-    var transition = callback
-      && $.support.transition
-      && $active.hasClass('fade')
+	Tab.prototype.activate = function (element, container, callback) {
+		var $active = container.find('> .active')
+		var transition = callback
+			&& $.support.transition
+			&& $active.hasClass('fade')
 
-    function next() {
-      $active
-        .removeClass('active')
-        .find('> .dropdown-menu > .active')
-        .removeClass('active')
+		function next() {
+			$active
+				.removeClass('active')
+				.find('> .dropdown-menu > .active')
+				.removeClass('active')
 
-      element.addClass('active')
+			element.addClass('active')
 
-      if (transition) {
-        element[0].offsetWidth // reflow for transition
-        element.addClass('in')
-      } else {
-        element.removeClass('fade')
-      }
+			if (transition) {
+				element[0].offsetWidth // reflow for transition
+				element.addClass('in')
+			} else {
+				element.removeClass('fade')
+			}
 
-      if (element.parent('.dropdown-menu')) {
-        element.closest('li.dropdown').addClass('active')
-      }
+			if (element.parent('.dropdown-menu')) {
+				element.closest('li.dropdown').addClass('active')
+			}
 
-      callback && callback()
-    }
+			callback && callback()
+		}
 
-    transition ?
-      $active
-        .one($.support.transition.end, next)
-        .emulateTransitionEnd(150) :
-      next()
+		transition ?
+			$active
+				.one($.support.transition.end, next)
+				.emulateTransitionEnd(150) :
+			next()
 
-    $active.removeClass('in')
-  }
+		$active.removeClass('in')
+	}
 
 
-  // TAB PLUGIN DEFINITION
-  // =====================
+	// TAB PLUGIN DEFINITION
+	// =====================
 
-  var old = $.fn.tab
+	var old = $.fn.tab
 
-  $.fn.tab = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-      var data  = $this.data('bs.tab')
+	$.fn.tab = function (option) {
+		return this.each(function () {
+			var $this = $(this)
+			var data = $this.data('bs.tab')
 
-      if (!data) $this.data('bs.tab', (data = new Tab(this)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
+			if (!data) $this.data('bs.tab', (data = new Tab(this)))
+			if (typeof option == 'string') data[option]()
+		})
+	}
 
-  $.fn.tab.Constructor = Tab
+	$.fn.tab.Constructor = Tab
 
 
-  // TAB NO CONFLICT
-  // ===============
+	// TAB NO CONFLICT
+	// ===============
 
-  $.fn.tab.noConflict = function () {
-    $.fn.tab = old
-    return this
-  }
+	$.fn.tab.noConflict = function () {
+		$.fn.tab = old
+		return this
+	}
 
 
-  // TAB DATA-API
-  // ============
+	// TAB DATA-API
+	// ============
 
-  $(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
-    e.preventDefault()
-    $(this).tab('show')
-  })
+	$(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
+		e.preventDefault()
+		$(this).tab('show')
+	})
 
 }(jQuery);
 
@@ -1822,130 +1843,130 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
 
 
 +function ($) {
-  'use strict';
+	'use strict';
 
-  // AFFIX CLASS DEFINITION
-  // ======================
+	// AFFIX CLASS DEFINITION
+	// ======================
 
-  var Affix = function (element, options) {
-    this.options = $.extend({}, Affix.DEFAULTS, options)
-    this.$window = $(window)
-      .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
-      .on('click.bs.affix.data-api',  $.proxy(this.checkPositionWithEventLoop, this))
+	var Affix = function (element, options) {
+		this.options = $.extend({}, Affix.DEFAULTS, options)
+		this.$window = $(window)
+			.on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
+			.on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this))
 
-    this.$element     = $(element)
-    this.affixed      =
-    this.unpin        =
-    this.pinnedOffset = null
+		this.$element = $(element)
+		this.affixed =
+			this.unpin =
+				this.pinnedOffset = null
 
-    this.checkPosition()
-  }
+		this.checkPosition()
+	}
 
-  Affix.RESET = 'affix affix-top affix-bottom'
+	Affix.RESET = 'affix affix-top affix-bottom'
 
-  Affix.DEFAULTS = {
-    offset: 0
-  }
+	Affix.DEFAULTS = {
+		offset: 0
+	}
 
-  Affix.prototype.getPinnedOffset = function () {
-    if (this.pinnedOffset) return this.pinnedOffset
-    this.$element.removeClass(Affix.RESET).addClass('affix')
-    var scrollTop = this.$window.scrollTop()
-    var position  = this.$element.offset()
-    return (this.pinnedOffset = position.top - scrollTop)
-  }
+	Affix.prototype.getPinnedOffset = function () {
+		if (this.pinnedOffset) return this.pinnedOffset
+		this.$element.removeClass(Affix.RESET).addClass('affix')
+		var scrollTop = this.$window.scrollTop()
+		var position = this.$element.offset()
+		return (this.pinnedOffset = position.top - scrollTop)
+	}
 
-  Affix.prototype.checkPositionWithEventLoop = function () {
-    setTimeout($.proxy(this.checkPosition, this), 1)
-  }
+	Affix.prototype.checkPositionWithEventLoop = function () {
+		setTimeout($.proxy(this.checkPosition, this), 1)
+	}
 
-  Affix.prototype.checkPosition = function () {
-    if (!this.$element.is(':visible')) return
+	Affix.prototype.checkPosition = function () {
+		if (!this.$element.is(':visible')) return
 
-    var scrollHeight = $(document).height()
-    var scrollTop    = this.$window.scrollTop()
-    var position     = this.$element.offset()
-    var offset       = this.options.offset
-    var offsetTop    = offset.top
-    var offsetBottom = offset.bottom
+		var scrollHeight = $(document).height()
+		var scrollTop = this.$window.scrollTop()
+		var position = this.$element.offset()
+		var offset = this.options.offset
+		var offsetTop = offset.top
+		var offsetBottom = offset.bottom
 
-    if (this.affixed == 'top') position.top += scrollTop
+		if (this.affixed == 'top') position.top += scrollTop
 
-    if (typeof offset != 'object')         offsetBottom = offsetTop = offset
-    if (typeof offsetTop == 'function')    offsetTop    = offset.top(this.$element)
-    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
+		if (typeof offset != 'object') offsetBottom = offsetTop = offset
+		if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element)
+		if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
 
-    var affix = this.unpin   != null && (scrollTop + this.unpin <= position.top) ? false :
-                offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' :
-                offsetTop    != null && (scrollTop <= offsetTop) ? 'top' : false
+		var affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? false :
+			offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' :
+				offsetTop != null && (scrollTop <= offsetTop) ? 'top' : false
 
-    if (this.affixed === affix) return
-    if (this.unpin) this.$element.css('top', '')
+		if (this.affixed === affix) return
+		if (this.unpin) this.$element.css('top', '')
 
-    var affixType = 'affix' + (affix ? '-' + affix : '')
-    var e         = $.Event(affixType + '.bs.affix')
+		var affixType = 'affix' + (affix ? '-' + affix : '')
+		var e = $.Event(affixType + '.bs.affix')
 
-    this.$element.trigger(e)
+		this.$element.trigger(e)
 
-    if (e.isDefaultPrevented()) return
+		if (e.isDefaultPrevented()) return
 
-    this.affixed = affix
-    this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
+		this.affixed = affix
+		this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
 
-    this.$element
-      .removeClass(Affix.RESET)
-      .addClass(affixType)
-      .trigger($.Event(affixType.replace('affix', 'affixed')))
+		this.$element
+			.removeClass(Affix.RESET)
+			.addClass(affixType)
+			.trigger($.Event(affixType.replace('affix', 'affixed')))
 
-    if (affix == 'bottom') {
-      this.$element.offset({ top: scrollHeight - offsetBottom - this.$element.height() })
-    }
-  }
+		if (affix == 'bottom') {
+			this.$element.offset({top: scrollHeight - offsetBottom - this.$element.height()})
+		}
+	}
 
 
-  // AFFIX PLUGIN DEFINITION
-  // =======================
+	// AFFIX PLUGIN DEFINITION
+	// =======================
 
-  var old = $.fn.affix
+	var old = $.fn.affix
 
-  $.fn.affix = function (option) {
-    return this.each(function () {
-      var $this   = $(this)
-      var data    = $this.data('bs.affix')
-      var options = typeof option == 'object' && option
+	$.fn.affix = function (option) {
+		return this.each(function () {
+			var $this = $(this)
+			var data = $this.data('bs.affix')
+			var options = typeof option == 'object' && option
 
-      if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
+			if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
+			if (typeof option == 'string') data[option]()
+		})
+	}
 
-  $.fn.affix.Constructor = Affix
+	$.fn.affix.Constructor = Affix
 
 
-  // AFFIX NO CONFLICT
-  // =================
+	// AFFIX NO CONFLICT
+	// =================
 
-  $.fn.affix.noConflict = function () {
-    $.fn.affix = old
-    return this
-  }
+	$.fn.affix.noConflict = function () {
+		$.fn.affix = old
+		return this
+	}
 
 
-  // AFFIX DATA-API
-  // ==============
+	// AFFIX DATA-API
+	// ==============
 
-  $(window).on('load', function () {
-    $('[data-spy="affix"]').each(function () {
-      var $spy = $(this)
-      var data = $spy.data()
+	$(window).on('load', function () {
+		$('[data-spy="affix"]').each(function () {
+			var $spy = $(this)
+			var data = $spy.data()
 
-      data.offset = data.offset || {}
+			data.offset = data.offset || {}
 
-      if (data.offsetBottom) data.offset.bottom = data.offsetBottom
-      if (data.offsetTop)    data.offset.top    = data.offsetTop
+			if (data.offsetBottom) data.offset.bottom = data.offsetBottom
+			if (data.offsetTop) data.offset.top = data.offsetTop
 
-      $spy.affix(data)
-    })
-  })
+			$spy.affix(data)
+		})
+	})
 
 }(jQuery);
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/CONTRIBUTORS.md b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/CONTRIBUTORS.md
index f1a3354..b386e6e 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/CONTRIBUTORS.md
+++ b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/CONTRIBUTORS.md
@@ -1,25 +1,24 @@
-
--   kriskowal Kris Kowal Copyright (C) 2009-2011 MIT License
--   tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal
-    Project)
--   dantman Daniel Friesen Copyright (C) 2010 XXX TODO License or CLA
--   fschaefer Florian Schäfer Copyright (C) 2010 MIT License
--   Gozala Irakli Gozalishvili Copyright (C) 2010 MIT License
--   kitcambridge Kit Cambridge Copyright (C) 2011 MIT License
--   kossnocorp Sasha Koss XXX TODO License or CLA
--   bryanforbes Bryan Forbes XXX TODO License or CLA
--   killdream Quildreen Motta Copyright (C) 2011 MIT Licence
--   michaelficarra Michael Ficarra Copyright (C) 2011 3-clause BSD
-    License
--   sharkbrainguy Gerard Paapu Copyright (C) 2011 MIT License
--   bbqsrc Brendan Molloy (C) 2011 Creative Commons Zero (public domain)
--   iwyg XXX TODO License or CLA
--   DomenicDenicola Domenic Denicola Copyright (C) 2011 MIT License
--   xavierm02 Montillet Xavier Copyright (C) 2011 MIT License
--   Raynos Jake Verbaten Copyright (C) 2011 MIT Licence
--   samsonjs Sami Samhuri Copyright (C) 2010 MIT License
--   rwldrn Rick Waldron Copyright (C) 2011 MIT License
--   lexer Alexey Zakharov XXX TODO License or CLA
--   280 North Inc. (Now Motorola LLC, a subsidiary of Google Inc.)
-    Copyright (C) 2009 MIT License
--   Steven Levithan Copyright (C) 2012 MIT License
+- kriskowal Kris Kowal Copyright (C) 2009-2011 MIT License
+- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal
+  Project)
+- dantman Daniel Friesen Copyright (C) 2010 XXX TODO License or CLA
+- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
+- Gozala Irakli Gozalishvili Copyright (C) 2010 MIT License
+- kitcambridge Kit Cambridge Copyright (C) 2011 MIT License
+- kossnocorp Sasha Koss XXX TODO License or CLA
+- bryanforbes Bryan Forbes XXX TODO License or CLA
+- killdream Quildreen Motta Copyright (C) 2011 MIT Licence
+- michaelficarra Michael Ficarra Copyright (C) 2011 3-clause BSD
+  License
+- sharkbrainguy Gerard Paapu Copyright (C) 2011 MIT License
+- bbqsrc Brendan Molloy (C) 2011 Creative Commons Zero (public domain)
+- iwyg XXX TODO License or CLA
+- DomenicDenicola Domenic Denicola Copyright (C) 2011 MIT License
+- xavierm02 Montillet Xavier Copyright (C) 2011 MIT License
+- Raynos Jake Verbaten Copyright (C) 2011 MIT Licence
+- samsonjs Sami Samhuri Copyright (C) 2010 MIT License
+- rwldrn Rick Waldron Copyright (C) 2011 MIT License
+- lexer Alexey Zakharov XXX TODO License or CLA
+- 280 North Inc. (Now Motorola LLC, a subsidiary of Google Inc.)
+  Copyright (C) 2009 MIT License
+- Steven Levithan Copyright (C) 2012 MIT License
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/README.md b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/README.md
index 9a1945d..90c4bba 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/README.md
+++ b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/README.md
@@ -1,22 +1,20 @@
-
 `es5-shim.js` and `es5-shim.min.js` monkey-patch a JavaScript context to
 contain all EcmaScript 5 methods that can be faithfully emulated with a
 legacy JavaScript engine.
 
 `es5-sham.js` and `es5-sham.min.js` monkey-patch other ES5 methods as
-closely as possible.  For these methods, as closely as possible to ES5
-is not very close.  Many of these shams are intended only to allow code
+closely as possible. For these methods, as closely as possible to ES5
+is not very close. Many of these shams are intended only to allow code
 to be written to ES5 without causing run-time errors in older engines.
 In many cases, this means that these shams cause many ES5 methods to
-silently fail.  Decide carefully whether this is what you want.
-
+silently fail. Decide carefully whether this is what you want.
 
 ## Tests
 
 The tests are written with the Jasmine BDD test framework.
-To run the tests, navigate to <root-folder>/tests/. 
+To run the tests, navigate to <root-folder>/tests/.
 
-In order to run against the shim-code, the tests attempt to kill the current 
+In order to run against the shim-code, the tests attempt to kill the current
 implementation of the missing methods. This happens in <root-folder>/tests/helpers/h-kill.js.
 So in order to run the tests against the built-in methods, invalidate that file somehow
 (comment-out, delete the file, delete the script-tag, etc.).
@@ -38,12 +36,12 @@ So in order to run the tests against the built-in methods, invalidate that file
 * Date.now
 * Date.prototype.toJSON
 * Function.prototype.bind
-    * /!\ Caveat: the bound function's length is always 0.
-    * /!\ Caveat: the bound function has a prototype property.
-    * /!\ Caveat: bound functions do not try too hard to keep you
-      from manipulating their ``arguments`` and ``caller`` properties.
-    * /!\ Caveat: bound functions don't have checks in ``call`` and
-      ``apply`` to avoid executing as a constructor.
+	* /!\ Caveat: the bound function's length is always 0.
+	* /!\ Caveat: the bound function has a prototype property.
+	* /!\ Caveat: bound functions do not try too hard to keep you
+	  from manipulating their ``arguments`` and ``caller`` properties.
+	* /!\ Caveat: bound functions don't have checks in ``call`` and
+	  ``apply`` to avoid executing as a constructor.
 * Object.keys
 * String.prototype.trim
 
@@ -56,106 +54,106 @@ So in order to run the tests against the built-in methods, invalidate that file
 
 * /?\ Object.create
 
-    For the case of simply "begetting" an object that
-    inherits prototypically from another, this should work
-    fine across legacy engines.
+  For the case of simply "begetting" an object that
+  inherits prototypically from another, this should work
+  fine across legacy engines.
 
-    /!\ Object.create(null) will work only in browsers that
-    support prototype assignment.  This creates an object
-    that does not have any properties inherited from
-    Object.prototype.  It will silently fail otherwise.
+  /!\ Object.create(null) will work only in browsers that
+  support prototype assignment. This creates an object
+  that does not have any properties inherited from
+  Object.prototype. It will silently fail otherwise.
 
-    /!\ The second argument is passed to
-    Object.defineProperties which will probably fail
-    silently.
+  /!\ The second argument is passed to
+  Object.defineProperties which will probably fail
+  silently.
 
 * /?\ Object.getPrototypeOf
 
-    This will return "undefined" in some cases.  It uses
-    __proto__ if it's available.  Failing that, it uses
-    constructor.prototype, which depends on the constructor
-    property of the object's prototype having not been
-    replaced.  If your object was created like this, it
-    won't work:
+  This will return "undefined" in some cases. It uses
+  __proto__ if it's available. Failing that, it uses
+  constructor.prototype, which depends on the constructor
+  property of the object's prototype having not been
+  replaced. If your object was created like this, it
+  won't work:
 
         function Foo() {
         }
         Foo.prototype = {};
 
-    Because the prototype reassignment destroys the
-    constructor property.
+  Because the prototype reassignment destroys the
+  constructor property.
 
-    This will work for all objects that were created using
-    `Object.create` implemented with this library.
+  This will work for all objects that were created using
+  `Object.create` implemented with this library.
 
 * /!\ Object.getOwnPropertyNames
 
-    This method uses Object.keys, so it will not be accurate
-    on legacy engines.
+  This method uses Object.keys, so it will not be accurate
+  on legacy engines.
 
 * Object.isSealed
 
-    Returns "false" in all legacy engines for all objects,
-    which is conveniently guaranteed to be accurate.
+  Returns "false" in all legacy engines for all objects,
+  which is conveniently guaranteed to be accurate.
 
 * Object.isFrozen
 
-    Returns "false" in all legacy engines for all objects,
-    which is conveniently guaranteed to be accurate.
+  Returns "false" in all legacy engines for all objects,
+  which is conveniently guaranteed to be accurate.
 
 * Object.isExtensible
 
-    Works like a charm, by trying very hard to extend the
-    object then redacting the extension.
+  Works like a charm, by trying very hard to extend the
+  object then redacting the extension.
 
 ### Fail silently
 
 * /!\ Object.getOwnPropertyDescriptor
-    
-    The behavior of this shim does not conform to ES5.  It
-    should probably not be used at this time, until its
-    behavior has been reviewed and been confirmed to be
-    useful in legacy engines.
+
+  The behavior of this shim does not conform to ES5. It
+  should probably not be used at this time, until its
+  behavior has been reviewed and been confirmed to be
+  useful in legacy engines.
 
 * /!\ Object.defineProperty
 
-    This method will silently fail to set "writable",
-    "enumerable", and "configurable" properties.
-    
-    Providing a getter or setter with "get" or "set" on a
-    descriptor will silently fail on engines that lack
-    "__defineGetter__" and "__defineSetter__", which include
-    all versions of IE up to version 8 so far.
+  This method will silently fail to set "writable",
+  "enumerable", and "configurable" properties.
+
+  Providing a getter or setter with "get" or "set" on a
+  descriptor will silently fail on engines that lack
+  "__defineGetter__" and "__defineSetter__", which include
+  all versions of IE up to version 8 so far.
 
-    IE 8 provides a version of this method but it only works
-    on DOM objects.  Thus, the shim will not get installed
-    and attempts to set "value" properties will fail
-    silently on non-DOM objects.
+  IE 8 provides a version of this method but it only works
+  on DOM objects. Thus, the shim will not get installed
+  and attempts to set "value" properties will fail
+  silently on non-DOM objects.
 
-    https://github.com/kriskowal/es5-shim/issues#issue/5
+  https://github.com/kriskowal/es5-shim/issues#issue/5
 
 * /!\ Object.defineProperties
 
-    This uses the Object.defineProperty shim
+  This uses the Object.defineProperty shim
 
 * Object.seal
 
-    Silently fails on all legacy engines.  This should be
-    fine unless you are depending on the safety and security
-    provisions of this method, which you cannot possibly
-    obtain in legacy engines.
+  Silently fails on all legacy engines. This should be
+  fine unless you are depending on the safety and security
+  provisions of this method, which you cannot possibly
+  obtain in legacy engines.
 
 * Object.freeze
 
-    Silently fails on all legacy engines.  This should be
-    fine unless you are depending on the safety and security
-    provisions of this method, which you cannot possibly
-    obtain in legacy engines.
+  Silently fails on all legacy engines. This should be
+  fine unless you are depending on the safety and security
+  provisions of this method, which you cannot possibly
+  obtain in legacy engines.
 
 * Object.preventExtensions
 
-    Silently fails on all legacy engines.  This should be
-    fine unless you are depending on the safety and security
-    provisions of this method, which you cannot possibly
-    obtain in legacy engines.
+  Silently fails on all legacy engines. This should be
+  fine unless you are depending on the safety and security
+  provisions of this method, which you cannot possibly
+  obtain in legacy engines.
 
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/es5-sham.js b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/es5-sham.js
index d8d8905..60e706f 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/es5-sham.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/es5-sham.js
@@ -3,230 +3,234 @@
 
 // Module systems magic dance
 (function (definition) {
-    // RequireJS
-    if (typeof define == "function") {
-        define(definition);
-    // YUI3
-    } else if (typeof YUI == "function") {
-        YUI.add("es5-sham", definition);
-    // CommonJS and <script>
-    } else {
-        definition();
-    }
+	// RequireJS
+	if (typeof define == "function") {
+		define(definition);
+		// YUI3
+	} else if (typeof YUI == "function") {
+		YUI.add("es5-sham", definition);
+		// CommonJS and <script>
+	} else {
+		definition();
+	}
 })(function () {
 
 
-var call = Function.prototype.call;
-var prototypeOfObject = Object.prototype;
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
+	var call = Function.prototype.call;
+	var prototypeOfObject = Object.prototype;
+	var owns = call.bind(prototypeOfObject.hasOwnProperty);
 
 // If JS engine supports accessors creating shortcuts.
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
+	var defineGetter;
+	var defineSetter;
+	var lookupGetter;
+	var lookupSetter;
+	var supportsAccessors;
+	if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
+		defineGetter = call.bind(prototypeOfObject.__defineGetter__);
+		defineSetter = call.bind(prototypeOfObject.__defineSetter__);
+		lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
+		lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
+	}
 
 // ES5 15.2.3.2
 // http://es5.github.com/#x15.2.3.2
-if (!Object.getPrototypeOf) {
-    // https://github.com/kriskowal/es5-shim/issues#issue/2
-    // http://ejohn.org/blog/objectgetprototypeof/
-    // recommended by fschaefer on github
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor
-                ? object.constructor.prototype
-                : prototypeOfObject
-        );
-    };
-}
+	if (!Object.getPrototypeOf) {
+		// https://github.com/kriskowal/es5-shim/issues#issue/2
+		// http://ejohn.org/blog/objectgetprototypeof/
+		// recommended by fschaefer on github
+		Object.getPrototypeOf = function getPrototypeOf(object) {
+			return object.__proto__ || (
+				object.constructor
+					? object.constructor.prototype
+					: prototypeOfObject
+			);
+		};
+	}
 
 //ES5 15.2.3.3
 //http://es5.github.com/#x15.2.3.3
 
-function doesGetOwnPropertyDescriptorWork(object) {
-    try {
-        object.sentinel = 0;
-        return Object.getOwnPropertyDescriptor(
-                object,
-                "sentinel"
-        ).value === 0;
-    } catch (exception) {
-        // returns falsy
-    }
-}
+	function doesGetOwnPropertyDescriptorWork(object) {
+		try {
+			object.sentinel = 0;
+			return Object.getOwnPropertyDescriptor(
+				object,
+				"sentinel"
+			).value === 0;
+		} catch (exception) {
+			// returns falsy
+		}
+	}
 
 //check whether getOwnPropertyDescriptor works if it's given. Otherwise,
 //shim partially.
-if (Object.defineProperty) {
-    var getOwnPropertyDescriptorWorksOnObject = 
-        doesGetOwnPropertyDescriptorWork({});
-    var getOwnPropertyDescriptorWorksOnDom = typeof document == "undefined" ||
-    doesGetOwnPropertyDescriptorWork(document.createElement("div"));
-    if (!getOwnPropertyDescriptorWorksOnDom || 
-            !getOwnPropertyDescriptorWorksOnObject
-    ) {
-        var getOwnPropertyDescriptorFallback = Object.getOwnPropertyDescriptor;
-    }
-}
-
-if (!Object.getOwnPropertyDescriptor || getOwnPropertyDescriptorFallback) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a non-object: ";
-
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null) {
-            throw new TypeError(ERR_NON_OBJECT + object);
-        }
-
-        // make a valiant attempt to use the real getOwnPropertyDescriptor
-        // for I8's DOM elements.
-        if (getOwnPropertyDescriptorFallback) {
-            try {
-                return getOwnPropertyDescriptorFallback.call(Object, object, property);
-            } catch (exception) {
-                // try the shim if the real one doesn't work
-            }
-        }
-
-        // If object does not owns property return undefined immediately.
-        if (!owns(object, property)) {
-            return;
-        }
-
-        // If object has a property then it's for sure both `enumerable` and
-        // `configurable`.
-        var descriptor =  { enumerable: true, configurable: true };
-
-        // If JS engine supports accessor properties then property may be a
-        // getter or setter.
-        if (supportsAccessors) {
-            // Unfortunately `__lookupGetter__` will return a getter even
-            // if object has own non getter property along with a same named
-            // inherited getter. To avoid misbehavior we temporary remove
-            // `__proto__` so that `__lookupGetter__` will return getter only
-            // if it's owned by an object.
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-
-            // Once we have getter and setter we can put values back.
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) {
-                    descriptor.get = getter;
-                }
-                if (setter) {
-                    descriptor.set = setter;
-                }
-                // If it was accessor property we're done and return here
-                // in order to avoid adding `value` to the descriptor.
-                return descriptor;
-            }
-        }
-
-        // If we got this far we know that object has an own property that is
-        // not an accessor so we set it as a value and return descriptor.
-        descriptor.value = object[property];
-        descriptor.writable = true;
-        return descriptor;
-    };
-}
+	if (Object.defineProperty) {
+		var getOwnPropertyDescriptorWorksOnObject =
+			doesGetOwnPropertyDescriptorWork({});
+		var getOwnPropertyDescriptorWorksOnDom = typeof document == "undefined" ||
+			doesGetOwnPropertyDescriptorWork(document.createElement("div"));
+		if (!getOwnPropertyDescriptorWorksOnDom ||
+			!getOwnPropertyDescriptorWorksOnObject
+		) {
+			var getOwnPropertyDescriptorFallback = Object.getOwnPropertyDescriptor;
+		}
+	}
+
+	if (!Object.getOwnPropertyDescriptor || getOwnPropertyDescriptorFallback) {
+		var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a non-object: ";
+
+		Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
+			if ((typeof object != "object" && typeof object != "function") || object === null) {
+				throw new TypeError(ERR_NON_OBJECT + object);
+			}
+
+			// make a valiant attempt to use the real getOwnPropertyDescriptor
+			// for I8's DOM elements.
+			if (getOwnPropertyDescriptorFallback) {
+				try {
+					return getOwnPropertyDescriptorFallback.call(Object, object, property);
+				} catch (exception) {
+					// try the shim if the real one doesn't work
+				}
+			}
+
+			// If object does not owns property return undefined immediately.
+			if (!owns(object, property)) {
+				return;
+			}
+
+			// If object has a property then it's for sure both `enumerable` and
+			// `configurable`.
+			var descriptor = {enumerable: true, configurable: true};
+
+			// If JS engine supports accessor properties then property may be a
+			// getter or setter.
+			if (supportsAccessors) {
+				// Unfortunately `__lookupGetter__` will return a getter even
+				// if object has own non getter property along with a same named
+				// inherited getter. To avoid misbehavior we temporary remove
+				// `__proto__` so that `__lookupGetter__` will return getter only
+				// if it's owned by an object.
+				var prototype = object.__proto__;
+				object.__proto__ = prototypeOfObject;
+
+				var getter = lookupGetter(object, property);
+				var setter = lookupSetter(object, property);
+
+				// Once we have getter and setter we can put values back.
+				object.__proto__ = prototype;
+
+				if (getter || setter) {
+					if (getter) {
+						descriptor.get = getter;
+					}
+					if (setter) {
+						descriptor.set = setter;
+					}
+					// If it was accessor property we're done and return here
+					// in order to avoid adding `value` to the descriptor.
+					return descriptor;
+				}
+			}
+
+			// If we got this far we know that object has an own property that is
+			// not an accessor so we set it as a value and return descriptor.
+			descriptor.value = object[property];
+			descriptor.writable = true;
+			return descriptor;
+		};
+	}
 
 // ES5 15.2.3.4
 // http://es5.github.com/#x15.2.3.4
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
+	if (!Object.getOwnPropertyNames) {
+		Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
+			return Object.keys(object);
+		};
+	}
 
 // ES5 15.2.3.5
 // http://es5.github.com/#x15.2.3.5
-if (!Object.create) {
-
-    // Contributed by Brandon Benvie, October, 2012
-    var createEmpty;
-    var supportsProto = Object.prototype.__proto__ === null;
-    if (supportsProto || typeof document == 'undefined') {
-        createEmpty = function () {
-            return { "__proto__": null };
-        };
-    } else {
-        // In old IE __proto__ can't be used to manually set `null`, nor does
-        // any other method exist to make an object that inherits from nothing,
-        // aside from Object.prototype itself. Instead, create a new global
-        // object and *steal* its Object.prototype and strip it bare. This is
-        // used as the prototype to create nullary objects.
-        createEmpty = function () {
-            var iframe = document.createElement('iframe');
-            var parent = document.body || document.documentElement;
-            iframe.style.display = 'none';
-            parent.appendChild(iframe);
-            iframe.src = 'javascript:';
-            var empty = iframe.contentWindow.Object.prototype;
-            parent.removeChild(iframe);
-            iframe = null;
-            delete empty.constructor;
-            delete empty.hasOwnProperty;
-            delete empty.propertyIsEnumerable;
-            delete empty.isPrototypeOf;
-            delete empty.toLocaleString;
-            delete empty.toString;
-            delete empty.valueOf;
-            empty.__proto__ = null;
-
-            function Empty() {}
-            Empty.prototype = empty;
-            // short-circuit future calls
-            createEmpty = function () {
-                return new Empty();
-            };
-            return new Empty();
-        };
-    }
-
-    Object.create = function create(prototype, properties) {
-
-        var object;
-        function Type() {}  // An empty constructor.
-
-        if (prototype === null) {
-            object = createEmpty();
-        } else {
-            if (typeof prototype !== "object" && typeof prototype !== "function") {
-                // In the native implementation `parent` can be `null`
-                // OR *any* `instanceof Object`  (Object|Function|Array|RegExp|etc)
-                // Use `typeof` tho, b/c in old IE, DOM elements are not `instanceof Object`
-                // like they are in modern browsers. Using `Object.create` on DOM elements
-                // is...err...probably inappropriate, but the native version allows for it.
-                throw new TypeError("Object prototype may only be an Object or null"); // same msg as Chrome
-            }
-            Type.prototype = prototype;
-            object = new Type();
-            // IE has no built-in implementation of `Object.getPrototypeOf`
-            // neither `__proto__`, but this manually setting `__proto__` will
-            // guarantee that `Object.getPrototypeOf` will work as expected with
-            // objects created using `Object.create`
-            object.__proto__ = prototype;
-        }
-
-        if (properties !== void 0) {
-            Object.defineProperties(object, properties);
-        }
-
-        return object;
-    };
-}
+	if (!Object.create) {
+
+		// Contributed by Brandon Benvie, October, 2012
+		var createEmpty;
+		var supportsProto = Object.prototype.__proto__ === null;
+		if (supportsProto || typeof document == 'undefined') {
+			createEmpty = function () {
+				return {"__proto__": null};
+			};
+		} else {
+			// In old IE __proto__ can't be used to manually set `null`, nor does
+			// any other method exist to make an object that inherits from nothing,
+			// aside from Object.prototype itself. Instead, create a new global
+			// object and *steal* its Object.prototype and strip it bare. This is
+			// used as the prototype to create nullary objects.
+			createEmpty = function () {
+				var iframe = document.createElement('iframe');
+				var parent = document.body || document.documentElement;
+				iframe.style.display = 'none';
+				parent.appendChild(iframe);
+				iframe.src = 'javascript:';
+				var empty = iframe.contentWindow.Object.prototype;
+				parent.removeChild(iframe);
+				iframe = null;
+				delete empty.constructor;
+				delete empty.hasOwnProperty;
+				delete empty.propertyIsEnumerable;
+				delete empty.isPrototypeOf;
+				delete empty.toLocaleString;
+				delete empty.toString;
+				delete empty.valueOf;
+				empty.__proto__ = null;
+
+				function Empty() {
+				}
+
+				Empty.prototype = empty;
+				// short-circuit future calls
+				createEmpty = function () {
+					return new Empty();
+				};
+				return new Empty();
+			};
+		}
+
+		Object.create = function create(prototype, properties) {
+
+			var object;
+
+			function Type() {
+			}  // An empty constructor.
+
+			if (prototype === null) {
+				object = createEmpty();
+			} else {
+				if (typeof prototype !== "object" && typeof prototype !== "function") {
+					// In the native implementation `parent` can be `null`
+					// OR *any* `instanceof Object`  (Object|Function|Array|RegExp|etc)
+					// Use `typeof` tho, b/c in old IE, DOM elements are not `instanceof Object`
+					// like they are in modern browsers. Using `Object.create` on DOM elements
+					// is...err...probably inappropriate, but the native version allows for it.
+					throw new TypeError("Object prototype may only be an Object or null"); // same msg as Chrome
+				}
+				Type.prototype = prototype;
+				object = new Type();
+				// IE has no built-in implementation of `Object.getPrototypeOf`
+				// neither `__proto__`, but this manually setting `__proto__` will
+				// guarantee that `Object.getPrototypeOf` will work as expected with
+				// objects created using `Object.create`
+				object.__proto__ = prototype;
+			}
+
+			if (properties !== void 0) {
+				Object.defineProperties(object, properties);
+			}
+
+			return object;
+		};
+	}
 
 // ES5 15.2.3.6
 // http://es5.github.com/#x15.2.3.6
@@ -240,205 +244,205 @@ if (!Object.create) {
 // WebKit Bugs:
 //     https://bugs.webkit.org/show_bug.cgi?id=36423
 
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-        // returns falsy
-    }
-}
+	function doesDefinePropertyWork(object) {
+		try {
+			Object.defineProperty(object, "sentinel", {});
+			return "sentinel" in object;
+		} catch (exception) {
+			// returns falsy
+		}
+	}
 
 // check whether defineProperty works if it's given. Otherwise,
 // shim partially.
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty,
-            definePropertiesFallback = Object.defineProperties;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null) {
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        }
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null) {
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-        }
-        // make a valiant attempt to use the real defineProperty
-        // for I8's DOM elements.
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-                // try the shim if the real one doesn't work
-            }
-        }
-
-        // If it's a data property.
-        if (owns(descriptor, "value")) {
-            // fail silently if "writable", "enumerable", or "configurable"
-            // are requested but not supported
-            /*
-            // alternate approach:
-            if ( // can't implement these features; allow false but not true
-                !(owns(descriptor, "writable") ? descriptor.writable : true) ||
-                !(owns(descriptor, "enumerable") ? descriptor.enumerable : true) ||
-                !(owns(descriptor, "configurable") ? descriptor.configurable : true)
-            )
-                throw new RangeError(
-                    "This implementation of Object.defineProperty does not " +
-                    "support configurable, enumerable, or writable."
-                );
-            */
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                // As accessors are supported only on engines implementing
-                // `__proto__` we can safely override `__proto__` while defining
-                // a property to make sure that we don't hit an inherited
-                // accessor.
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                // Deleting a property anyway since getter / setter may be
-                // defined on object itself.
-                delete object[property];
-                object[property] = descriptor.value;
-                // Setting original `__proto__` back now.
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors) {
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            }
-            // If we got that far then getters and setters can be defined !!
-            if (owns(descriptor, "get")) {
-                defineGetter(object, property, descriptor.get);
-            }
-            if (owns(descriptor, "set")) {
-                defineSetter(object, property, descriptor.set);
-            }
-        }
-        return object;
-    };
-}
+	if (Object.defineProperty) {
+		var definePropertyWorksOnObject = doesDefinePropertyWork({});
+		var definePropertyWorksOnDom = typeof document == "undefined" ||
+			doesDefinePropertyWork(document.createElement("div"));
+		if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
+			var definePropertyFallback = Object.defineProperty,
+				definePropertiesFallback = Object.defineProperties;
+		}
+	}
+
+	if (!Object.defineProperty || definePropertyFallback) {
+		var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
+		var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
+		var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
+			"on this javascript engine";
+
+		Object.defineProperty = function defineProperty(object, property, descriptor) {
+			if ((typeof object != "object" && typeof object != "function") || object === null) {
+				throw new TypeError(ERR_NON_OBJECT_TARGET + object);
+			}
+			if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null) {
+				throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
+			}
+			// make a valiant attempt to use the real defineProperty
+			// for I8's DOM elements.
+			if (definePropertyFallback) {
+				try {
+					return definePropertyFallback.call(Object, object, property, descriptor);
+				} catch (exception) {
+					// try the shim if the real one doesn't work
+				}
+			}
+
+			// If it's a data property.
+			if (owns(descriptor, "value")) {
+				// fail silently if "writable", "enumerable", or "configurable"
+				// are requested but not supported
+				/*
+				// alternate approach:
+				if ( // can't implement these features; allow false but not true
+					!(owns(descriptor, "writable") ? descriptor.writable : true) ||
+					!(owns(descriptor, "enumerable") ? descriptor.enumerable : true) ||
+					!(owns(descriptor, "configurable") ? descriptor.configurable : true)
+				)
+					throw new RangeError(
+						"This implementation of Object.defineProperty does not " +
+						"support configurable, enumerable, or writable."
+					);
+				*/
+
+				if (supportsAccessors && (lookupGetter(object, property) ||
+					lookupSetter(object, property))) {
+					// As accessors are supported only on engines implementing
+					// `__proto__` we can safely override `__proto__` while defining
+					// a property to make sure that we don't hit an inherited
+					// accessor.
+					var prototype = object.__proto__;
+					object.__proto__ = prototypeOfObject;
+					// Deleting a property anyway since getter / setter may be
+					// defined on object itself.
+					delete object[property];
+					object[property] = descriptor.value;
+					// Setting original `__proto__` back now.
+					object.__proto__ = prototype;
+				} else {
+					object[property] = descriptor.value;
+				}
+			} else {
+				if (!supportsAccessors) {
+					throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
+				}
+				// If we got that far then getters and setters can be defined !!
+				if (owns(descriptor, "get")) {
+					defineGetter(object, property, descriptor.get);
+				}
+				if (owns(descriptor, "set")) {
+					defineSetter(object, property, descriptor.set);
+				}
+			}
+			return object;
+		};
+	}
 
 // ES5 15.2.3.7
 // http://es5.github.com/#x15.2.3.7
-if (!Object.defineProperties || definePropertiesFallback) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        // make a valiant attempt to use the real defineProperties
-        if (definePropertiesFallback) {
-            try {
-                return definePropertiesFallback.call(Object, object, properties);
-            } catch (exception) {
-                // try the shim if the real one doesn't work
-            }
-        }
-
-        for (var property in properties) {
-            if (owns(properties, property) && property != "__proto__") {
-                Object.defineProperty(object, property, properties[property]);
-            }
-        }
-        return object;
-    };
-}
+	if (!Object.defineProperties || definePropertiesFallback) {
+		Object.defineProperties = function defineProperties(object, properties) {
+			// make a valiant attempt to use the real defineProperties
+			if (definePropertiesFallback) {
+				try {
+					return definePropertiesFallback.call(Object, object, properties);
+				} catch (exception) {
+					// try the shim if the real one doesn't work
+				}
+			}
+
+			for (var property in properties) {
+				if (owns(properties, property) && property != "__proto__") {
+					Object.defineProperty(object, property, properties[property]);
+				}
+			}
+			return object;
+		};
+	}
 
 // ES5 15.2.3.8
 // http://es5.github.com/#x15.2.3.8
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
+	if (!Object.seal) {
+		Object.seal = function seal(object) {
+			// this is misleading and breaks feature-detection, but
+			// allows "securable" code to "gracefully" degrade to working
+			// but insecure code.
+			return object;
+		};
+	}
 
 // ES5 15.2.3.9
 // http://es5.github.com/#x15.2.3.9
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
+	if (!Object.freeze) {
+		Object.freeze = function freeze(object) {
+			// this is misleading and breaks feature-detection, but
+			// allows "securable" code to "gracefully" degrade to working
+			// but insecure code.
+			return object;
+		};
+	}
 
 // detect a Rhino bug and patch it
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
+	try {
+		Object.freeze(function () {
+		});
+	} catch (exception) {
+		Object.freeze = (function freeze(freezeObject) {
+			return function freeze(object) {
+				if (typeof object == "function") {
+					return object;
+				} else {
+					return freezeObject(object);
+				}
+			};
+		})(Object.freeze);
+	}
 
 // ES5 15.2.3.10
 // http://es5.github.com/#x15.2.3.10
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
+	if (!Object.preventExtensions) {
+		Object.preventExtensions = function preventExtensions(object) {
+			// this is misleading and breaks feature-detection, but
+			// allows "securable" code to "gracefully" degrade to working
+			// but insecure code.
+			return object;
+		};
+	}
 
 // ES5 15.2.3.11
 // http://es5.github.com/#x15.2.3.11
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
+	if (!Object.isSealed) {
+		Object.isSealed = function isSealed(object) {
+			return false;
+		};
+	}
 
 // ES5 15.2.3.12
 // http://es5.github.com/#x15.2.3.12
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
+	if (!Object.isFrozen) {
+		Object.isFrozen = function isFrozen(object) {
+			return false;
+		};
+	}
 
 // ES5 15.2.3.13
 // http://es5.github.com/#x15.2.3.13
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        // 1. If Type(O) is not Object throw a TypeError exception.
-        if (Object(object) !== object) {
-            throw new TypeError(); // TODO message
-        }
-        // 2. Return the Boolean value of the [[Extensible]] internal property of O.
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
+	if (!Object.isExtensible) {
+		Object.isExtensible = function isExtensible(object) {
+			// 1. If Type(O) is not Object throw a TypeError exception.
+			if (Object(object) !== object) {
+				throw new TypeError(); // TODO message
+			}
+			// 2. Return the Boolean value of the [[Extensible]] internal property of O.
+			var name = '';
+			while (owns(object, name)) {
+				name += '?';
+			}
+			object[name] = true;
+			var returnValue = owns(object, name);
+			delete object[name];
+			return returnValue;
+		};
+	}
 
 });
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/es5-shim.js b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/es5-shim.js
index 2bb8756..2fdf53f 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/es5-shim.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/es5-shim.js
@@ -3,26 +3,26 @@
 
 // Module systems magic dance
 (function (definition) {
-    // RequireJS
-    if (typeof define == "function") {
-        define(definition);
-    // YUI3
-    } else if (typeof YUI == "function") {
-        YUI.add("es5", definition);
-    // CommonJS and <script>
-    } else {
-        definition();
-    }
+	// RequireJS
+	if (typeof define == "function") {
+		define(definition);
+		// YUI3
+	} else if (typeof YUI == "function") {
+		YUI.add("es5", definition);
+		// CommonJS and <script>
+	} else {
+		definition();
+	}
 })(function () {
 
-/**
- * Brings an environment as close to ECMAScript 5 compliance
- * as is possible with the facilities of erstwhile engines.
- *
- * Annotated ES5: http://es5.github.com/ (specific links below)
- * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
- * Required reading: http://javascriptweblog.wordpress.com/2011/12/05/extending-javascript-natives/
- */
+	/**
+	 * Brings an environment as close to ECMAScript 5 compliance
+	 * as is possible with the facilities of erstwhile engines.
+	 *
+	 * Annotated ES5: http://es5.github.com/ (specific links below)
+	 * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
+	 * Required reading: http://javascriptweblog.wordpress.com/2011/12/05/extending-javascript-natives/
+	 */
 
 //
 // Function
@@ -32,150 +32,151 @@
 // ES-5 15.3.4.5
 // http://es5.github.com/#x15.3.4.5
 
-function Empty() {}
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        // 1. Let Target be the this value.
-        var target = this;
-        // 2. If IsCallable(Target) is false, throw a TypeError exception.
-        if (typeof target != "function") {
-            throw new TypeError("Function.prototype.bind called on incompatible " + target);
-        }
-        // 3. Let A be a new (possibly empty) internal list of all of the
-        //   argument values provided after thisArg (arg1, arg2 etc), in order.
-        // XXX slicedArgs will stand in for "A" if used
-        var args = _Array_slice_.call(arguments, 1); // for normal call
-        // 4. Let F be a new native ECMAScript object.
-        // 11. Set the [[Prototype]] internal property of F to the standard
-        //   built-in Function prototype object as specified in 15.3.3.1.
-        // 12. Set the [[Call]] internal property of F as described in
-        //   15.3.4.5.1.
-        // 13. Set the [[Construct]] internal property of F as described in
-        //   15.3.4.5.2.
-        // 14. Set the [[HasInstance]] internal property of F as described in
-        //   15.3.4.5.3.
-        var bound = function () {
-
-            if (this instanceof bound) {
-                // 15.3.4.5.2 [[Construct]]
-                // When the [[Construct]] internal method of a function object,
-                // F that was created using the bind function is called with a
-                // list of arguments ExtraArgs, the following steps are taken:
-                // 1. Let target be the value of F's [[TargetFunction]]
-                //   internal property.
-                // 2. If target has no [[Construct]] internal method, a
-                //   TypeError exception is thrown.
-                // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the
-                //   list boundArgs in the same order followed by the same
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Construct]] internal
-                //   method of target providing args as the arguments.
-
-                var result = target.apply(
-                    this,
-                    args.concat(_Array_slice_.call(arguments))
-                );
-                if (Object(result) === result) {
-                    return result;
-                }
-                return this;
-
-            } else {
-                // 15.3.4.5.1 [[Call]]
-                // When the [[Call]] internal method of a function object, F,
-                // which was created using the bind function is called with a
-                // this value and a list of arguments ExtraArgs, the following
-                // steps are taken:
-                // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 2. Let boundThis be the value of F's [[BoundThis]] internal
-                //   property.
-                // 3. Let target be the value of F's [[TargetFunction]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the
-                //   list boundArgs in the same order followed by the same
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Call]] internal method
-                //   of target providing boundThis as the this value and
-                //   providing args as the arguments.
-
-                // equiv: target.call(this, ...boundArgs, ...args)
-                return target.apply(
-                    that,
-                    args.concat(_Array_slice_.call(arguments))
-                );
-
-            }
-
-        };
-        if(target.prototype) {
-            Empty.prototype = target.prototype;
-            bound.prototype = new Empty();
-            // Clean up dangling references.
-            Empty.prototype = null;
-        }
-        // XXX bound.length is never writable, so don't even try
-        //
-        // 15. If the [[Class]] internal property of Target is "Function", then
-        //     a. Let L be the length property of Target minus the length of A.
-        //     b. Set the length own property of F to either 0 or L, whichever is
-        //       larger.
-        // 16. Else set the length own property of F to 0.
-        // 17. Set the attributes of the length own property of F to the values
-        //   specified in 15.3.5.1.
-
-        // TODO
-        // 18. Set the [[Extensible]] internal property of F to true.
-
-        // TODO
-        // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
-        // 20. Call the [[DefineOwnProperty]] internal method of F with
-        //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
-        //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and
-        //   false.
-        // 21. Call the [[DefineOwnProperty]] internal method of F with
-        //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower,
-        //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
-        //   and false.
-
-        // TODO
-        // NOTE Function objects created using Function.prototype.bind do not
-        // have a prototype property or the [[Code]], [[FormalParameters]], and
-        // [[Scope]] internal properties.
-        // XXX can't delete prototype in pure-js.
-
-        // 22. Return F.
-        return bound;
-    };
-}
+	function Empty() {
+	}
+
+	if (!Function.prototype.bind) {
+		Function.prototype.bind = function bind(that) { // .length is 1
+			// 1. Let Target be the this value.
+			var target = this;
+			// 2. If IsCallable(Target) is false, throw a TypeError exception.
+			if (typeof target != "function") {
+				throw new TypeError("Function.prototype.bind called on incompatible " + target);
+			}
+			// 3. Let A be a new (possibly empty) internal list of all of the
+			//   argument values provided after thisArg (arg1, arg2 etc), in order.
+			// XXX slicedArgs will stand in for "A" if used
+			var args = _Array_slice_.call(arguments, 1); // for normal call
+			// 4. Let F be a new native ECMAScript object.
+			// 11. Set the [[Prototype]] internal property of F to the standard
+			//   built-in Function prototype object as specified in 15.3.3.1.
+			// 12. Set the [[Call]] internal property of F as described in
+			//   15.3.4.5.1.
+			// 13. Set the [[Construct]] internal property of F as described in
+			//   15.3.4.5.2.
+			// 14. Set the [[HasInstance]] internal property of F as described in
+			//   15.3.4.5.3.
+			var bound = function () {
+
+				if (this instanceof bound) {
+					// 15.3.4.5.2 [[Construct]]
+					// When the [[Construct]] internal method of a function object,
+					// F that was created using the bind function is called with a
+					// list of arguments ExtraArgs, the following steps are taken:
+					// 1. Let target be the value of F's [[TargetFunction]]
+					//   internal property.
+					// 2. If target has no [[Construct]] internal method, a
+					//   TypeError exception is thrown.
+					// 3. Let boundArgs be the value of F's [[BoundArgs]] internal
+					//   property.
+					// 4. Let args be a new list containing the same values as the
+					//   list boundArgs in the same order followed by the same
+					//   values as the list ExtraArgs in the same order.
+					// 5. Return the result of calling the [[Construct]] internal
+					//   method of target providing args as the arguments.
+
+					var result = target.apply(
+						this,
+						args.concat(_Array_slice_.call(arguments))
+					);
+					if (Object(result) === result) {
+						return result;
+					}
+					return this;
+
+				} else {
+					// 15.3.4.5.1 [[Call]]
+					// When the [[Call]] internal method of a function object, F,
+					// which was created using the bind function is called with a
+					// this value and a list of arguments ExtraArgs, the following
+					// steps are taken:
+					// 1. Let boundArgs be the value of F's [[BoundArgs]] internal
+					//   property.
+					// 2. Let boundThis be the value of F's [[BoundThis]] internal
+					//   property.
+					// 3. Let target be the value of F's [[TargetFunction]] internal
+					//   property.
+					// 4. Let args be a new list containing the same values as the
+					//   list boundArgs in the same order followed by the same
+					//   values as the list ExtraArgs in the same order.
+					// 5. Return the result of calling the [[Call]] internal method
+					//   of target providing boundThis as the this value and
+					//   providing args as the arguments.
+
+					// equiv: target.call(this, ...boundArgs, ...args)
+					return target.apply(
+						that,
+						args.concat(_Array_slice_.call(arguments))
+					);
+
+				}
+
+			};
+			if (target.prototype) {
+				Empty.prototype = target.prototype;
+				bound.prototype = new Empty();
+				// Clean up dangling references.
+				Empty.prototype = null;
+			}
+			// XXX bound.length is never writable, so don't even try
+			//
+			// 15. If the [[Class]] internal property of Target is "Function", then
+			//     a. Let L be the length property of Target minus the length of A.
+			//     b. Set the length own property of F to either 0 or L, whichever is
+			//       larger.
+			// 16. Else set the length own property of F to 0.
+			// 17. Set the attributes of the length own property of F to the values
+			//   specified in 15.3.5.1.
+
+			// TODO
+			// 18. Set the [[Extensible]] internal property of F to true.
+
+			// TODO
+			// 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
+			// 20. Call the [[DefineOwnProperty]] internal method of F with
+			//   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
+			//   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and
+			//   false.
+			// 21. Call the [[DefineOwnProperty]] internal method of F with
+			//   arguments "arguments", PropertyDescriptor {[[Get]]: thrower,
+			//   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
+			//   and false.
+
+			// TODO
+			// NOTE Function objects created using Function.prototype.bind do not
+			// have a prototype property or the [[Code]], [[FormalParameters]], and
+			// [[Scope]] internal properties.
+			// XXX can't delete prototype in pure-js.
+
+			// 22. Return F.
+			return bound;
+		};
+	}
 
 // Shortcut to an often accessed properties, in order to avoid multiple
 // dereference that costs universally.
 // _Please note: Shortcuts are defined after `Function.prototype.bind` as we
 // us it in defining shortcuts.
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var _Array_slice_ = prototypeOfArray.slice;
+	var call = Function.prototype.call;
+	var prototypeOfArray = Array.prototype;
+	var prototypeOfObject = Object.prototype;
+	var _Array_slice_ = prototypeOfArray.slice;
 // Having a toString local variable name breaks in Opera so use _toString.
-var _toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
+	var _toString = call.bind(prototypeOfObject.toString);
+	var owns = call.bind(prototypeOfObject.hasOwnProperty);
 
 // If JS engine supports accessors creating shortcuts.
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
+	var defineGetter;
+	var defineSetter;
+	var lookupGetter;
+	var lookupSetter;
+	var supportsAccessors;
+	if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
+		defineGetter = call.bind(prototypeOfObject.__defineGetter__);
+		defineSetter = call.bind(prototypeOfObject.__defineSetter__);
+		lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
+		lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
+	}
 
 //
 // Array
@@ -187,117 +188,116 @@ if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
 // Default value for second param
 // [bugfix, ielt9, old browsers]
 // IE < 9 bug: [1,2].splice(0).join("") == "" but should be "12"
-if ([1,2].splice(0).length != 2) {
-    var array_splice = Array.prototype.splice;
-
-    if(function() { // test IE < 9 to splice bug - see issue #138
-        function makeArray(l) {
-            var a = [];
-            while (l--) {
-                a.unshift(l)
-            }
-            return a
-        }
-
-        var array = []
-            , lengthBefore
-        ;
-
-        array.splice.bind(array, 0, 0).apply(null, makeArray(20));
-        array.splice.bind(array, 0, 0).apply(null, makeArray(26));
-
-        lengthBefore = array.length; //20
-        array.splice(5, 0, "XXX"); // add one element
-
-        if(lengthBefore + 1 == array.length) {
-            return true;// has right splice implementation without bugs
-        }
-        // else {
-        //    IE8 bug
-        // }
-    }()) {//IE 6/7
-        Array.prototype.splice = function(start, deleteCount) {
-            if (!arguments.length) {
-                return [];
-            } else {
-                return array_splice.apply(this, [
-                    start === void 0 ? 0 : start,
-                    deleteCount === void 0 ? (this.length - start) : deleteCount
-                ].concat(_Array_slice_.call(arguments, 2)))
-            }
-        };
-    }
-    else {//IE8
-        Array.prototype.splice = function(start, deleteCount) {
-            var result
-                , args = _Array_slice_.call(arguments, 2)
-                , addElementsCount = args.length
-            ;
-
-            if(!arguments.length) {
-                return [];
-            }
-
-            if(start === void 0) { // default
-                start = 0;
-            }
-            if(deleteCount === void 0) { // default
-                deleteCount = this.length - start;
-            }
-
-            if(addElementsCount > 0) {
-                if(deleteCount <= 0) {
-                    if(start == this.length) { // tiny optimisation #1
-                        this.push.apply(this, args);
-                        return [];
-                    }
-
-                    if(start == 0) { // tiny optimisation #2
-                        this.unshift.apply(this, args);
-                        return [];
-                    }
-                }
-
-                // Array.prototype.splice implementation
-                result = _Array_slice_.call(this, start, start + deleteCount);// delete part
-                args.push.apply(args, _Array_slice_.call(this, start + deleteCount, this.length));// right part
-                args.unshift.apply(args, _Array_slice_.call(this, 0, start));// left part
-
-                // delete all items from this array and replace it to 'left part' + _Array_slice_.call(arguments, 2) + 'right part'
-                args.unshift(0, this.length);
-
-                array_splice.apply(this, args);
-
-                return result;
-            }
-
-            return array_splice.call(this, start, deleteCount);
-        }
-
-    }
-}
+	if ([1, 2].splice(0).length != 2) {
+		var array_splice = Array.prototype.splice;
+
+		if (function () { // test IE < 9 to splice bug - see issue #138
+			function makeArray(l) {
+				var a = [];
+				while (l--) {
+					a.unshift(l)
+				}
+				return a
+			}
+
+			var array = []
+				, lengthBefore
+			;
+
+			array.splice.bind(array, 0, 0).apply(null, makeArray(20));
+			array.splice.bind(array, 0, 0).apply(null, makeArray(26));
+
+			lengthBefore = array.length; //20
+			array.splice(5, 0, "XXX"); // add one element
+
+			if (lengthBefore + 1 == array.length) {
+				return true;// has right splice implementation without bugs
+			}
+			// else {
+			//    IE8 bug
+			// }
+		}()) {//IE 6/7
+			Array.prototype.splice = function (start, deleteCount) {
+				if (!arguments.length) {
+					return [];
+				} else {
+					return array_splice.apply(this, [
+						start === void 0 ? 0 : start,
+						deleteCount === void 0 ? (this.length - start) : deleteCount
+					].concat(_Array_slice_.call(arguments, 2)))
+				}
+			};
+		} else {//IE8
+			Array.prototype.splice = function (start, deleteCount) {
+				var result
+					, args = _Array_slice_.call(arguments, 2)
+					, addElementsCount = args.length
+				;
+
+				if (!arguments.length) {
+					return [];
+				}
+
+				if (start === void 0) { // default
+					start = 0;
+				}
+				if (deleteCount === void 0) { // default
+					deleteCount = this.length - start;
+				}
+
+				if (addElementsCount > 0) {
+					if (deleteCount <= 0) {
+						if (start == this.length) { // tiny optimisation #1
+							this.push.apply(this, args);
+							return [];
+						}
+
+						if (start == 0) { // tiny optimisation #2
+							this.unshift.apply(this, args);
+							return [];
+						}
+					}
+
+					// Array.prototype.splice implementation
+					result = _Array_slice_.call(this, start, start + deleteCount);// delete part
+					args.push.apply(args, _Array_slice_.call(this, start + deleteCount, this.length));// right part
+					args.unshift.apply(args, _Array_slice_.call(this, 0, start));// left part
+
+					// delete all items from this array and replace it to 'left part' + _Array_slice_.call(arguments, 2) + 'right part'
+					args.unshift(0, this.length);
+
+					array_splice.apply(this, args);
+
+					return result;
+				}
+
+				return array_splice.call(this, start, deleteCount);
+			}
+
+		}
+	}
 
 // ES5 15.4.4.12
 // http://es5.github.com/#x15.4.4.13
 // Return len+argCount.
 // [bugfix, ielt8]
 // IE < 8 bug: [].unshift(0) == undefined but should be "1"
-if ([].unshift(0) != 1) {
-    var array_unshift = Array.prototype.unshift;
-    Array.prototype.unshift = function() {
-        array_unshift.apply(this, arguments);
-        return this.length;
-    };
-}
+	if ([].unshift(0) != 1) {
+		var array_unshift = Array.prototype.unshift;
+		Array.prototype.unshift = function () {
+			array_unshift.apply(this, arguments);
+			return this.length;
+		};
+	}
 
 // ES5 15.4.3.2
 // http://es5.github.com/#x15.4.3.2
 // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return _toString(obj) == "[object Array]";
-    };
-}
+	if (!Array.isArray) {
+		Array.isArray = function isArray(obj) {
+			return _toString(obj) == "[object Array]";
+		};
+	}
 
 // The IsCallable() check in the Array functions
 // has been replaced with a strict check on the
@@ -317,302 +317,302 @@ if (!Array.isArray) {
 
 // Check failure of by-index access of string characters (IE < 9)
 // and failure of `0 in boxedString` (Rhino)
-var boxedString = Object("a"),
-    splitString = boxedString[0] != "a" || !(0 in boxedString);
-
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            thisp = arguments[1],
-            i = -1,
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (++i < length) {
-            if (i in self) {
-                // Invoke the callback function with call, passing arguments:
-                // context, property value, property key, thisArg object
-                // context
-                fun.call(thisp, self[i], i, object);
-            }
-        }
-    };
-}
+	var boxedString = Object("a"),
+		splitString = boxedString[0] != "a" || !(0 in boxedString);
+
+	if (!Array.prototype.forEach) {
+		Array.prototype.forEach = function forEach(fun /*, thisp*/) {
+			var object = toObject(this),
+				self = splitString && _toString(this) == "[object String]" ?
+					this.split("") :
+					object,
+				thisp = arguments[1],
+				i = -1,
+				length = self.length >>> 0;
+
+			// If no callback function or if callback is not a callable function
+			if (_toString(fun) != "[object Function]") {
+				throw new TypeError(); // TODO message
+			}
+
+			while (++i < length) {
+				if (i in self) {
+					// Invoke the callback function with call, passing arguments:
+					// context, property value, property key, thisArg object
+					// context
+					fun.call(thisp, self[i], i, object);
+				}
+			}
+		};
+	}
 
 // ES5 15.4.4.19
 // http://es5.github.com/#x15.4.4.19
 // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, object);
-        }
-        return result;
-    };
-}
+	if (!Array.prototype.map) {
+		Array.prototype.map = function map(fun /*, thisp*/) {
+			var object = toObject(this),
+				self = splitString && _toString(this) == "[object String]" ?
+					this.split("") :
+					object,
+				length = self.length >>> 0,
+				result = Array(length),
+				thisp = arguments[1];
+
+			// If no callback function or if callback is not a callable function
+			if (_toString(fun) != "[object Function]") {
+				throw new TypeError(fun + " is not a function");
+			}
+
+			for (var i = 0; i < length; i++) {
+				if (i in self)
+					result[i] = fun.call(thisp, self[i], i, object);
+			}
+			return result;
+		};
+	}
 
 // ES5 15.4.4.20
 // http://es5.github.com/#x15.4.4.20
 // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                    object,
-            length = self.length >>> 0,
-            result = [],
-            value,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self) {
-                value = self[i];
-                if (fun.call(thisp, value, i, object)) {
-                    result.push(value);
-                }
-            }
-        }
-        return result;
-    };
-}
+	if (!Array.prototype.filter) {
+		Array.prototype.filter = function filter(fun /*, thisp */) {
+			var object = toObject(this),
+				self = splitString && _toString(this) == "[object String]" ?
+					this.split("") :
+					object,
+				length = self.length >>> 0,
+				result = [],
+				value,
+				thisp = arguments[1];
+
+			// If no callback function or if callback is not a callable function
+			if (_toString(fun) != "[object Function]") {
+				throw new TypeError(fun + " is not a function");
+			}
+
+			for (var i = 0; i < length; i++) {
+				if (i in self) {
+					value = self[i];
+					if (fun.call(thisp, value, i, object)) {
+						result.push(value);
+					}
+				}
+			}
+			return result;
+		};
+	}
 
 // ES5 15.4.4.16
 // http://es5.github.com/#x15.4.4.16
 // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, object)) {
-                return false;
-            }
-        }
-        return true;
-    };
-}
+	if (!Array.prototype.every) {
+		Array.prototype.every = function every(fun /*, thisp */) {
+			var object = toObject(this),
+				self = splitString && _toString(this) == "[object String]" ?
+					this.split("") :
+					object,
+				length = self.length >>> 0,
+				thisp = arguments[1];
+
+			// If no callback function or if callback is not a callable function
+			if (_toString(fun) != "[object Function]") {
+				throw new TypeError(fun + " is not a function");
+			}
+
+			for (var i = 0; i < length; i++) {
+				if (i in self && !fun.call(thisp, self[i], i, object)) {
+					return false;
+				}
+			}
+			return true;
+		};
+	}
 
 // ES5 15.4.4.17
 // http://es5.github.com/#x15.4.4.17
 // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, object)) {
-                return true;
-            }
-        }
-        return false;
-    };
-}
+	if (!Array.prototype.some) {
+		Array.prototype.some = function some(fun /*, thisp */) {
+			var object = toObject(this),
+				self = splitString && _toString(this) == "[object String]" ?
+					this.split("") :
+					object,
+				length = self.length >>> 0,
+				thisp = arguments[1];
+
+			// If no callback function or if callback is not a callable function
+			if (_toString(fun) != "[object Function]") {
+				throw new TypeError(fun + " is not a function");
+			}
+
+			for (var i = 0; i < length; i++) {
+				if (i in self && fun.call(thisp, self[i], i, object)) {
+					return true;
+				}
+			}
+			return false;
+		};
+	}
 
 // ES5 15.4.4.21
 // http://es5.github.com/#x15.4.4.21
 // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        // no value to return if no initial value and an empty array
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduce of empty array with no initial value");
-        }
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (++i >= length) {
-                    throw new TypeError("reduce of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        }
-
-        return result;
-    };
-}
+	if (!Array.prototype.reduce) {
+		Array.prototype.reduce = function reduce(fun /*, initial*/) {
+			var object = toObject(this),
+				self = splitString && _toString(this) == "[object String]" ?
+					this.split("") :
+					object,
+				length = self.length >>> 0;
+
+			// If no callback function or if callback is not a callable function
+			if (_toString(fun) != "[object Function]") {
+				throw new TypeError(fun + " is not a function");
+			}
+
+			// no value to return if no initial value and an empty array
+			if (!length && arguments.length == 1) {
+				throw new TypeError("reduce of empty array with no initial value");
+			}
+
+			var i = 0;
+			var result;
+			if (arguments.length >= 2) {
+				result = arguments[1];
+			} else {
+				do {
+					if (i in self) {
+						result = self[i++];
+						break;
+					}
+
+					// if array contains no values, no initial value to return
+					if (++i >= length) {
+						throw new TypeError("reduce of empty array with no initial value");
+					}
+				} while (true);
+			}
+
+			for (; i < length; i++) {
+				if (i in self) {
+					result = fun.call(void 0, result, self[i], i, object);
+				}
+			}
+
+			return result;
+		};
+	}
 
 // ES5 15.4.4.22
 // http://es5.github.com/#x15.4.4.22
 // https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        // no value to return if no initial value, empty array
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduceRight of empty array with no initial value");
-        }
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (--i < 0) {
-                    throw new TypeError("reduceRight of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        if (i < 0) {
-            return result;
-        }
-
-        do {
-            if (i in this) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        } while (i--);
-
-        return result;
-    };
-}
+	if (!Array.prototype.reduceRight) {
+		Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
+			var object = toObject(this),
+				self = splitString && _toString(this) == "[object String]" ?
+					this.split("") :
+					object,
+				length = self.length >>> 0;
+
+			// If no callback function or if callback is not a callable function
+			if (_toString(fun) != "[object Function]") {
+				throw new TypeError(fun + " is not a function");
+			}
+
+			// no value to return if no initial value, empty array
+			if (!length && arguments.length == 1) {
+				throw new TypeError("reduceRight of empty array with no initial value");
+			}
+
+			var result, i = length - 1;
+			if (arguments.length >= 2) {
+				result = arguments[1];
+			} else {
+				do {
+					if (i in self) {
+						result = self[i--];
+						break;
+					}
+
+					// if array contains no values, no initial value to return
+					if (--i < 0) {
+						throw new TypeError("reduceRight of empty array with no initial value");
+					}
+				} while (true);
+			}
+
+			if (i < 0) {
+				return result;
+			}
+
+			do {
+				if (i in this) {
+					result = fun.call(void 0, result, self[i], i, object);
+				}
+			} while (i--);
+
+			return result;
+		};
+	}
 
 // ES5 15.4.4.14
 // http://es5.github.com/#x15.4.4.14
 // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
-if (!Array.prototype.indexOf || ([0, 1].indexOf(1, 2) != -1)) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-
-        var i = 0;
-        if (arguments.length > 1) {
-            i = toInteger(arguments[1]);
-        }
-
-        // handle negative indices
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
+	if (!Array.prototype.indexOf || ([0, 1].indexOf(1, 2) != -1)) {
+		Array.prototype.indexOf = function indexOf(sought /*, fromIndex */) {
+			var self = splitString && _toString(this) == "[object String]" ?
+					this.split("") :
+					toObject(this),
+				length = self.length >>> 0;
+
+			if (!length) {
+				return -1;
+			}
+
+			var i = 0;
+			if (arguments.length > 1) {
+				i = toInteger(arguments[1]);
+			}
+
+			// handle negative indices
+			i = i >= 0 ? i : Math.max(0, length + i);
+			for (; i < length; i++) {
+				if (i in self && self[i] === sought) {
+					return i;
+				}
+			}
+			return -1;
+		};
+	}
 
 // ES5 15.4.4.15
 // http://es5.github.com/#x15.4.4.15
 // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
-if (!Array.prototype.lastIndexOf || ([0, 1].lastIndexOf(0, -3) != -1)) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-        var i = length - 1;
-        if (arguments.length > 1) {
-            i = Math.min(i, toInteger(arguments[1]));
-        }
-        // handle negative indices
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i]) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
+	if (!Array.prototype.lastIndexOf || ([0, 1].lastIndexOf(0, -3) != -1)) {
+		Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
+			var self = splitString && _toString(this) == "[object String]" ?
+					this.split("") :
+					toObject(this),
+				length = self.length >>> 0;
+
+			if (!length) {
+				return -1;
+			}
+			var i = length - 1;
+			if (arguments.length > 1) {
+				i = Math.min(i, toInteger(arguments[1]));
+			}
+			// handle negative indices
+			i = i >= 0 ? i : length - Math.abs(i);
+			for (; i >= 0; i--) {
+				if (i in self && sought === self[i]) {
+					return i;
+				}
+			}
+			return -1;
+		};
+	}
 
 //
 // Object
@@ -621,52 +621,52 @@ if (!Array.prototype.lastIndexOf || ([0, 1].lastIndexOf(0, -3) != -1)) {
 
 // ES5 15.2.3.14
 // http://es5.github.com/#x15.2.3.14
-if (!Object.keys) {
-    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null}) {
-        hasDontEnumBug = false;
-    }
-
-    Object.keys = function keys(object) {
-
-        if (
-            (typeof object != "object" && typeof object != "function") ||
-            object === null
-        ) {
-            throw new TypeError("Object.keys called on a non-object");
-        }
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-        return keys;
-    };
-
-}
+	if (!Object.keys) {
+		// http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
+		var hasDontEnumBug = true,
+			dontEnums = [
+				"toString",
+				"toLocaleString",
+				"valueOf",
+				"hasOwnProperty",
+				"isPrototypeOf",
+				"propertyIsEnumerable",
+				"constructor"
+			],
+			dontEnumsLength = dontEnums.length;
+
+		for (var key in {"toString": null}) {
+			hasDontEnumBug = false;
+		}
+
+		Object.keys = function keys(object) {
+
+			if (
+				(typeof object != "object" && typeof object != "function") ||
+				object === null
+			) {
+				throw new TypeError("Object.keys called on a non-object");
+			}
+
+			var keys = [];
+			for (var name in object) {
+				if (owns(object, name)) {
+					keys.push(name);
+				}
+			}
+
+			if (hasDontEnumBug) {
+				for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
+					var dontEnum = dontEnums[i];
+					if (owns(object, dontEnum)) {
+						keys.push(dontEnum);
+					}
+				}
+			}
+			return keys;
+		};
+
+	}
 
 //
 // Date
@@ -680,256 +680,256 @@ if (!Object.keys) {
 // string format defined in 15.9.1.15. All fields are present in the String.
 // The time zone is always UTC, denoted by the suffix Z. If the time value of
 // this object is not a finite Number a RangeError exception is thrown.
-var negativeDate = -62198755200000,
-    negativeYearString = "-000001";
-if (
-    !Date.prototype.toISOString ||
-    (new Date(negativeDate).toISOString().indexOf(negativeYearString) === -1)
-) {
-    Date.prototype.toISOString = function toISOString() {
-        var result, length, value, year, month;
-        if (!isFinite(this)) {
-            throw new RangeError("Date.prototype.toISOString called on non-finite value.");
-        }
-
-        year = this.getUTCFullYear();
-
-        month = this.getUTCMonth();
-        // see https://github.com/kriskowal/es5-shim/issues/111
-        year += Math.floor(month / 12);
-        month = (month % 12 + 12) % 12;
-
-        // the date time string format is specified in 15.9.1.15.
-        result = [month + 1, this.getUTCDate(),
-            this.getUTCHours(), this.getUTCMinutes(), this.getUTCSeconds()];
-        year = (
-            (year < 0 ? "-" : (year > 9999 ? "+" : "")) +
-            ("00000" + Math.abs(year))
-            .slice(0 <= year && year <= 9999 ? -4 : -6)
-        );
-
-        length = result.length;
-        while (length--) {
-            value = result[length];
-            // pad months, days, hours, minutes, and seconds to have two
-            // digits.
-            if (value < 10) {
-                result[length] = "0" + value;
-            }
-        }
-        // pad milliseconds to have three digits.
-        return (
-            year + "-" + result.slice(0, 2).join("-") +
-            "T" + result.slice(2).join(":") + "." +
-            ("000" + this.getUTCMilliseconds()).slice(-3) + "Z"
-        );
-    };
-}
+	var negativeDate = -62198755200000,
+		negativeYearString = "-000001";
+	if (
+		!Date.prototype.toISOString ||
+		(new Date(negativeDate).toISOString().indexOf(negativeYearString) === -1)
+	) {
+		Date.prototype.toISOString = function toISOString() {
+			var result, length, value, year, month;
+			if (!isFinite(this)) {
+				throw new RangeError("Date.prototype.toISOString called on non-finite value.");
+			}
+
+			year = this.getUTCFullYear();
+
+			month = this.getUTCMonth();
+			// see https://github.com/kriskowal/es5-shim/issues/111
+			year += Math.floor(month / 12);
+			month = (month % 12 + 12) % 12;
+
+			// the date time string format is specified in 15.9.1.15.
+			result = [month + 1, this.getUTCDate(),
+				this.getUTCHours(), this.getUTCMinutes(), this.getUTCSeconds()];
+			year = (
+				(year < 0 ? "-" : (year > 9999 ? "+" : "")) +
+				("00000" + Math.abs(year))
+					.slice(0 <= year && year <= 9999 ? -4 : -6)
+			);
+
+			length = result.length;
+			while (length--) {
+				value = result[length];
+				// pad months, days, hours, minutes, and seconds to have two
+				// digits.
+				if (value < 10) {
+					result[length] = "0" + value;
+				}
+			}
+			// pad milliseconds to have three digits.
+			return (
+				year + "-" + result.slice(0, 2).join("-") +
+				"T" + result.slice(2).join(":") + "." +
+				("000" + this.getUTCMilliseconds()).slice(-3) + "Z"
+			);
+		};
+	}
 
 
 // ES5 15.9.5.44
 // http://es5.github.com/#x15.9.5.44
 // This function provides a String representation of a Date object for use by
 // JSON.stringify (15.12.3).
-var dateToJSONIsSupported = false;
-try {
-    dateToJSONIsSupported = (
-        Date.prototype.toJSON &&
-        new Date(NaN).toJSON() === null &&
-        new Date(negativeDate).toJSON().indexOf(negativeYearString) !== -1 &&
-        Date.prototype.toJSON.call({ // generic
-            toISOString: function () {
-                return true;
-            }
-        })
-    );
-} catch (e) {
-}
-if (!dateToJSONIsSupported) {
-    Date.prototype.toJSON = function toJSON(key) {
-        // When the toJSON method is called with argument key, the following
-        // steps are taken:
-
-        // 1.  Let O be the result of calling ToObject, giving it the this
-        // value as its argument.
-        // 2. Let tv be toPrimitive(O, hint Number).
-        var o = Object(this),
-            tv = toPrimitive(o),
-            toISO;
-        // 3. If tv is a Number and is not finite, return null.
-        if (typeof tv === "number" && !isFinite(tv)) {
-            return null;
-        }
-        // 4. Let toISO be the result of calling the [[Get]] internal method of
-        // O with argument "toISOString".
-        toISO = o.toISOString;
-        // 5. If IsCallable(toISO) is false, throw a TypeError exception.
-        if (typeof toISO != "function") {
-            throw new TypeError("toISOString property is not callable");
-        }
-        // 6. Return the result of calling the [[Call]] internal method of
-        //  toISO with O as the this value and an empty argument list.
-        return toISO.call(o);
-
-        // NOTE 1 The argument is ignored.
-
-        // NOTE 2 The toJSON function is intentionally generic; it does not
-        // require that its this value be a Date object. Therefore, it can be
-        // transferred to other kinds of objects for use as a method. However,
-        // it does require that any such object have a toISOString method. An
-        // object is free to use the argument key to filter its
-        // stringification.
-    };
-}
+	var dateToJSONIsSupported = false;
+	try {
+		dateToJSONIsSupported = (
+			Date.prototype.toJSON &&
+			new Date(NaN).toJSON() === null &&
+			new Date(negativeDate).toJSON().indexOf(negativeYearString) !== -1 &&
+			Date.prototype.toJSON.call({ // generic
+				toISOString: function () {
+					return true;
+				}
+			})
+		);
+	} catch (e) {
+	}
+	if (!dateToJSONIsSupported) {
+		Date.prototype.toJSON = function toJSON(key) {
+			// When the toJSON method is called with argument key, the following
+			// steps are taken:
+
+			// 1.  Let O be the result of calling ToObject, giving it the this
+			// value as its argument.
+			// 2. Let tv be toPrimitive(O, hint Number).
+			var o = Object(this),
+				tv = toPrimitive(o),
+				toISO;
+			// 3. If tv is a Number and is not finite, return null.
+			if (typeof tv === "number" && !isFinite(tv)) {
+				return null;
+			}
+			// 4. Let toISO be the result of calling the [[Get]] internal method of
+			// O with argument "toISOString".
+			toISO = o.toISOString;
+			// 5. If IsCallable(toISO) is false, throw a TypeError exception.
+			if (typeof toISO != "function") {
+				throw new TypeError("toISOString property is not callable");
+			}
+			// 6. Return the result of calling the [[Call]] internal method of
+			//  toISO with O as the this value and an empty argument list.
+			return toISO.call(o);
+
+			// NOTE 1 The argument is ignored.
+
+			// NOTE 2 The toJSON function is intentionally generic; it does not
+			// require that its this value be a Date object. Therefore, it can be
+			// transferred to other kinds of objects for use as a method. However,
+			// it does require that any such object have a toISOString method. An
+			// object is free to use the argument key to filter its
+			// stringification.
+		};
+	}
 
 // ES5 15.9.4.2
 // http://es5.github.com/#x15.9.4.2
 // based on work shared by Daniel Friesen (dantman)
 // http://gist.github.com/303249
-if (!Date.parse || "Date.parse is buggy") {
-    // XXX global assignment won't work in embeddings that use
-    // an alternate object for the context.
-    Date = (function(NativeDate) {
-
-        // Date.length === 7
-        function Date(Y, M, D, h, m, s, ms) {
-            var length = arguments.length;
-            if (this instanceof NativeDate) {
-                var date = length == 1 && String(Y) === Y ? // isString(Y)
-                    // We explicitly pass it through parse:
-                    new NativeDate(Date.parse(Y)) :
-                    // We have to manually make calls depending on argument
-                    // length here
-                    length >= 7 ? new NativeDate(Y, M, D, h, m, s, ms) :
-                    length >= 6 ? new NativeDate(Y, M, D, h, m, s) :
-                    length >= 5 ? new NativeDate(Y, M, D, h, m) :
-                    length >= 4 ? new NativeDate(Y, M, D, h) :
-                    length >= 3 ? new NativeDate(Y, M, D) :
-                    length >= 2 ? new NativeDate(Y, M) :
-                    length >= 1 ? new NativeDate(Y) :
-                                  new NativeDate();
-                // Prevent mixups with unfixed Date object
-                date.constructor = Date;
-                return date;
-            }
-            return NativeDate.apply(this, arguments);
-        };
-
-        // 15.9.1.15 Date Time String Format.
-        var isoDateExpression = new RegExp("^" +
-            "(\\d{4}|[\+\-]\\d{6})" + // four-digit year capture or sign +
-                                      // 6-digit extended year
-            "(?:-(\\d{2})" + // optional month capture
-            "(?:-(\\d{2})" + // optional day capture
-            "(?:" + // capture hours:minutes:seconds.milliseconds
-                "T(\\d{2})" + // hours capture
-                ":(\\d{2})" + // minutes capture
-                "(?:" + // optional :seconds.milliseconds
-                    ":(\\d{2})" + // seconds capture
-                    "(?:(\\.\\d{1,}))?" + // milliseconds capture
-                ")?" +
-            "(" + // capture UTC offset component
-                "Z|" + // UTC capture
-                "(?:" + // offset specifier +/-hours:minutes
-                    "([-+])" + // sign capture
-                    "(\\d{2})" + // hours offset capture
-                    ":(\\d{2})" + // minutes offset capture
-                ")" +
-            ")?)?)?)?" +
-        "$");
-
-        var months = [
-            0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365
-        ];
-
-        function dayFromMonth(year, month) {
-            var t = month > 1 ? 1 : 0;
-            return (
-                months[month] +
-                Math.floor((year - 1969 + t) / 4) -
-                Math.floor((year - 1901 + t) / 100) +
-                Math.floor((year - 1601 + t) / 400) +
-                365 * (year - 1970)
-            );
-        }
-
-        // Copy any custom methods a 3rd party library may have added
-        for (var key in NativeDate) {
-            Date[key] = NativeDate[key];
-        }
-
-        // Copy "native" methods explicitly; they may be non-enumerable
-        Date.now = NativeDate.now;
-        Date.UTC = NativeDate.UTC;
-        Date.prototype = NativeDate.prototype;
-        Date.prototype.constructor = Date;
-
-        // Upgrade Date.parse to handle simplified ISO 8601 strings
-        Date.parse = function parse(string) {
-            var match = isoDateExpression.exec(string);
-            if (match) {
-                // parse months, days, hours, minutes, seconds, and milliseconds
-                // provide default values if necessary
-                // parse the UTC offset component
-                var year = Number(match[1]),
-                    month = Number(match[2] || 1) - 1,
-                    day = Number(match[3] || 1) - 1,
-                    hour = Number(match[4] || 0),
-                    minute = Number(match[5] || 0),
-                    second = Number(match[6] || 0),
-                    millisecond = Math.floor(Number(match[7] || 0) * 1000),
-                    // When time zone is missed, local offset should be used
-                    // (ES 5.1 bug)
-                    // see https://bugs.ecmascript.org/show_bug.cgi?id=112
-                    offset = !match[4] || match[8] ?
-                        0 : Number(new NativeDate(1970, 0)),
-                    signOffset = match[9] === "-" ? 1 : -1,
-                    hourOffset = Number(match[10] || 0),
-                    minuteOffset = Number(match[11] || 0),
-                    result;
-                if (
-                    hour < (
-                        minute > 0 || second > 0 || millisecond > 0 ?
-                        24 : 25
-                    ) &&
-                    minute < 60 && second < 60 && millisecond < 1000 &&
-                    month > -1 && month < 12 && hourOffset < 24 &&
-                    minuteOffset < 60 && // detect invalid offsets
-                    day > -1 &&
-                    day < (
-                        dayFromMonth(year, month + 1) -
-                        dayFromMonth(year, month)
-                    )
-                ) {
-                    result = (
-                        (dayFromMonth(year, month) + day) * 24 +
-                        hour +
-                        hourOffset * signOffset
-                    ) * 60;
-                    result = (
-                        (result + minute + minuteOffset * signOffset) * 60 +
-                        second
-                    ) * 1000 + millisecond + offset;
-                    if (-8.64e15 <= result && result <= 8.64e15) {
-                        return result;
-                    }
-                }
-                return NaN;
-            }
-            return NativeDate.parse.apply(this, arguments);
-        };
-
-        return Date;
-    })(Date);
-}
+	if (!Date.parse || "Date.parse is buggy") {
+		// XXX global assignment won't work in embeddings that use
+		// an alternate object for the context.
+		Date = (function (NativeDate) {
+
+			// Date.length === 7
+			function Date(Y, M, D, h, m, s, ms) {
+				var length = arguments.length;
+				if (this instanceof NativeDate) {
+					var date = length == 1 && String(Y) === Y ? // isString(Y)
+						// We explicitly pass it through parse:
+						new NativeDate(Date.parse(Y)) :
+						// We have to manually make calls depending on argument
+						// length here
+						length >= 7 ? new NativeDate(Y, M, D, h, m, s, ms) :
+							length >= 6 ? new NativeDate(Y, M, D, h, m, s) :
+								length >= 5 ? new NativeDate(Y, M, D, h, m) :
+									length >= 4 ? new NativeDate(Y, M, D, h) :
+										length >= 3 ? new NativeDate(Y, M, D) :
+											length >= 2 ? new NativeDate(Y, M) :
+												length >= 1 ? new NativeDate(Y) :
+													new NativeDate();
+					// Prevent mixups with unfixed Date object
+					date.constructor = Date;
+					return date;
+				}
+				return NativeDate.apply(this, arguments);
+			};
+
+			// 15.9.1.15 Date Time String Format.
+			var isoDateExpression = new RegExp("^" +
+				"(\\d{4}|[\+\-]\\d{6})" + // four-digit year capture or sign +
+				// 6-digit extended year
+				"(?:-(\\d{2})" + // optional month capture
+				"(?:-(\\d{2})" + // optional day capture
+				"(?:" + // capture hours:minutes:seconds.milliseconds
+				"T(\\d{2})" + // hours capture
+				":(\\d{2})" + // minutes capture
+				"(?:" + // optional :seconds.milliseconds
+				":(\\d{2})" + // seconds capture
+				"(?:(\\.\\d{1,}))?" + // milliseconds capture
+				")?" +
+				"(" + // capture UTC offset component
+				"Z|" + // UTC capture
+				"(?:" + // offset specifier +/-hours:minutes
+				"([-+])" + // sign capture
+				"(\\d{2})" + // hours offset capture
+				":(\\d{2})" + // minutes offset capture
+				")" +
+				")?)?)?)?" +
+				"$");
+
+			var months = [
+				0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365
+			];
+
+			function dayFromMonth(year, month) {
+				var t = month > 1 ? 1 : 0;
+				return (
+					months[month] +
+					Math.floor((year - 1969 + t) / 4) -
+					Math.floor((year - 1901 + t) / 100) +
+					Math.floor((year - 1601 + t) / 400) +
+					365 * (year - 1970)
+				);
+			}
+
+			// Copy any custom methods a 3rd party library may have added
+			for (var key in NativeDate) {
+				Date[key] = NativeDate[key];
+			}
+
+			// Copy "native" methods explicitly; they may be non-enumerable
+			Date.now = NativeDate.now;
+			Date.UTC = NativeDate.UTC;
+			Date.prototype = NativeDate.prototype;
+			Date.prototype.constructor = Date;
+
+			// Upgrade Date.parse to handle simplified ISO 8601 strings
+			Date.parse = function parse(string) {
+				var match = isoDateExpression.exec(string);
+				if (match) {
+					// parse months, days, hours, minutes, seconds, and milliseconds
+					// provide default values if necessary
+					// parse the UTC offset component
+					var year = Number(match[1]),
+						month = Number(match[2] || 1) - 1,
+						day = Number(match[3] || 1) - 1,
+						hour = Number(match[4] || 0),
+						minute = Number(match[5] || 0),
+						second = Number(match[6] || 0),
+						millisecond = Math.floor(Number(match[7] || 0) * 1000),
+						// When time zone is missed, local offset should be used
+						// (ES 5.1 bug)
+						// see https://bugs.ecmascript.org/show_bug.cgi?id=112
+						offset = !match[4] || match[8] ?
+							0 : Number(new NativeDate(1970, 0)),
+						signOffset = match[9] === "-" ? 1 : -1,
+						hourOffset = Number(match[10] || 0),
+						minuteOffset = Number(match[11] || 0),
+						result;
+					if (
+						hour < (
+							minute > 0 || second > 0 || millisecond > 0 ?
+								24 : 25
+						) &&
+						minute < 60 && second < 60 && millisecond < 1000 &&
+						month > -1 && month < 12 && hourOffset < 24 &&
+						minuteOffset < 60 && // detect invalid offsets
+						day > -1 &&
+						day < (
+							dayFromMonth(year, month + 1) -
+							dayFromMonth(year, month)
+						)
+					) {
+						result = (
+							(dayFromMonth(year, month) + day) * 24 +
+							hour +
+							hourOffset * signOffset
+						) * 60;
+						result = (
+							(result + minute + minuteOffset * signOffset) * 60 +
+							second
+						) * 1000 + millisecond + offset;
+						if (-8.64e15 <= result && result <= 8.64e15) {
+							return result;
+						}
+					}
+					return NaN;
+				}
+				return NativeDate.parse.apply(this, arguments);
+			};
+
+			return Date;
+		})(Date);
+	}
 
 // ES5 15.9.4.4
 // http://es5.github.com/#x15.9.4.4
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
+	if (!Date.now) {
+		Date.now = function now() {
+			return new Date().getTime();
+		};
+	}
 
 
 //
@@ -939,152 +939,152 @@ if (!Date.now) {
 
 // ES5.1 15.7.4.5
 // http://es5.github.com/#x15.7.4.5
-if (!Number.prototype.toFixed || (0.00008).toFixed(3) !== '0.000' || (0.9).toFixed(0) === '0' || (1.255).toFixed(2) !== '1.25' || (1000000000000000128).toFixed(0) !== "1000000000000000128") {
-    // Hide these variables and functions
-    (function () {
-        var base, size, data, i;
-
-        base = 1e7;
-        size = 6;
-        data = [0, 0, 0, 0, 0, 0];
-
-        function multiply(n, c) {
-            var i = -1;
-            while (++i < size) {
-                c += n * data[i];
-                data[i] = c % base;
-                c = Math.floor(c / base);
-            }
-        }
-
-        function divide(n) {
-            var i = size, c = 0;
-            while (--i >= 0) {
-                c += data[i];
-                data[i] = Math.floor(c / n);
-                c = (c % n) * base;
-            }
-        }
-
-        function toString() {
-            var i = size;
-            var s = '';
-            while (--i >= 0) {
-                if (s !== '' || i === 0 || data[i] !== 0) {
-                    var t = String(data[i]);
-                    if (s === '') {
-                        s = t;
-                    } else {
-                        s += '0000000'.slice(0, 7 - t.length) + t;
-                    }
-                }
-            }
-            return s;
-        }
-
-        function pow(x, n, acc) {
-            return (n === 0 ? acc : (n % 2 === 1 ? pow(x, n - 1, acc * x) : pow(x * x, n / 2, acc)));
-        }
-
-        function log(x) {
-            var n = 0;
-            while (x >= 4096) {
-                n += 12;
-                x /= 4096;
-            }
-            while (x >= 2) {
-                n += 1;
-                x /= 2;
-            }
-            return n;
-        }
-
-        Number.prototype.toFixed = function (fractionDigits) {
-            var f, x, s, m, e, z, j, k;
-
-            // Test for NaN and round fractionDigits down
-            f = Number(fractionDigits);
-            f = f !== f ? 0 : Math.floor(f);
-
-            if (f < 0 || f > 20) {
-                throw new RangeError("Number.toFixed called with invalid number of decimals");
-            }
-
-            x = Number(this);
-
-            // Test for NaN
-            if (x !== x) {
-                return "NaN";
-            }
-
-            // If it is too big or small, return the string value of the number
-            if (x <= -1e21 || x >= 1e21) {
-                return String(x);
-            }
-
-            s = "";
-
-            if (x < 0) {
-                s = "-";
-                x = -x;
-            }
-
-            m = "0";
-
-            if (x > 1e-21) {
-                // 1e-21 < x < 1e21
-                // -70 < log2(x) < 70
-                e = log(x * pow(2, 69, 1)) - 69;
-                z = (e < 0 ? x * pow(2, -e, 1) : x / pow(2, e, 1));
-                z *= 0x10000000000000; // Math.pow(2, 52);
-                e = 52 - e;
-
-                // -18 < e < 122
-                // x = z / 2 ^ e
-                if (e > 0) {
-                    multiply(0, z);
-                    j = f;
-
-                    while (j >= 7) {
-                        multiply(1e7, 0);
-                        j -= 7;
-                    }
-
-                    multiply(pow(10, j, 1), 0);
-                    j = e - 1;
-
-                    while (j >= 23) {
-                        divide(1 << 23);
-                        j -= 23;
-                    }
-
-                    divide(1 << j);
-                    multiply(1, 1);
-                    divide(2);
-                    m = toString();
-                } else {
-                    multiply(0, z);
-                    multiply(1 << (-e), 0);
-                    m = toString() + '0.00000000000000000000'.slice(2, 2 + f);
-                }
-            }
-
-            if (f > 0) {
-                k = m.length;
-
-                if (k <= f) {
-                    m = s + '0.0000000000000000000'.slice(0, f - k + 2) + m;
-                } else {
-                    m = s + m.slice(0, k - f) + '.' + m.slice(k - f);
-                }
-            } else {
-                m = s + m;
-            }
-
-            return m;
-        }
-    }());
-}
+	if (!Number.prototype.toFixed || (0.00008).toFixed(3) !== '0.000' || (0.9).toFixed(0) === '0' || (1.255).toFixed(2) !== '1.25' || (1000000000000000128).toFixed(0) !== "1000000000000000128") {
+		// Hide these variables and functions
+		(function () {
+			var base, size, data, i;
+
+			base = 1e7;
+			size = 6;
+			data = [0, 0, 0, 0, 0, 0];
+
+			function multiply(n, c) {
+				var i = -1;
+				while (++i < size) {
+					c += n * data[i];
+					data[i] = c % base;
+					c = Math.floor(c / base);
+				}
+			}
+
+			function divide(n) {
+				var i = size, c = 0;
+				while (--i >= 0) {
+					c += data[i];
+					data[i] = Math.floor(c / n);
+					c = (c % n) * base;
+				}
+			}
+
+			function toString() {
+				var i = size;
+				var s = '';
+				while (--i >= 0) {
+					if (s !== '' || i === 0 || data[i] !== 0) {
+						var t = String(data[i]);
+						if (s === '') {
+							s = t;
+						} else {
+							s += '0000000'.slice(0, 7 - t.length) + t;
+						}
+					}
+				}
+				return s;
+			}
+
+			function pow(x, n, acc) {
+				return (n === 0 ? acc : (n % 2 === 1 ? pow(x, n - 1, acc * x) : pow(x * x, n / 2, acc)));
+			}
+
+			function log(x) {
+				var n = 0;
+				while (x >= 4096) {
+					n += 12;
+					x /= 4096;
+				}
+				while (x >= 2) {
+					n += 1;
+					x /= 2;
+				}
+				return n;
+			}
+
+			Number.prototype.toFixed = function (fractionDigits) {
+				var f, x, s, m, e, z, j, k;
+
+				// Test for NaN and round fractionDigits down
+				f = Number(fractionDigits);
+				f = f !== f ? 0 : Math.floor(f);
+
+				if (f < 0 || f > 20) {
+					throw new RangeError("Number.toFixed called with invalid number of decimals");
+				}
+
+				x = Number(this);
+
+				// Test for NaN
+				if (x !== x) {
+					return "NaN";
+				}
+
+				// If it is too big or small, return the string value of the number
+				if (x <= -1e21 || x >= 1e21) {
+					return String(x);
+				}
+
+				s = "";
+
+				if (x < 0) {
+					s = "-";
+					x = -x;
+				}
+
+				m = "0";
+
+				if (x > 1e-21) {
+					// 1e-21 < x < 1e21
+					// -70 < log2(x) < 70
+					e = log(x * pow(2, 69, 1)) - 69;
+					z = (e < 0 ? x * pow(2, -e, 1) : x / pow(2, e, 1));
+					z *= 0x10000000000000; // Math.pow(2, 52);
+					e = 52 - e;
+
+					// -18 < e < 122
+					// x = z / 2 ^ e
+					if (e > 0) {
+						multiply(0, z);
+						j = f;
+
+						while (j >= 7) {
+							multiply(1e7, 0);
+							j -= 7;
+						}
+
+						multiply(pow(10, j, 1), 0);
+						j = e - 1;
+
+						while (j >= 23) {
+							divide(1 << 23);
+							j -= 23;
+						}
+
+						divide(1 << j);
+						multiply(1, 1);
+						divide(2);
+						m = toString();
+					} else {
+						multiply(0, z);
+						multiply(1 << (-e), 0);
+						m = toString() + '0.00000000000000000000'.slice(2, 2 + f);
+					}
+				}
+
+				if (f > 0) {
+					k = m.length;
+
+					if (k <= f) {
+						m = s + '0.0000000000000000000'.slice(0, f - k + 2) + m;
+					} else {
+						m = s + m.slice(0, k - f) + '.' + m.slice(k - f);
+					}
+				} else {
+					m = s + m;
+				}
+
+				return m;
+			}
+		}());
+	}
 
 
 //
@@ -1108,90 +1108,90 @@ if (!Number.prototype.toFixed || (0.00008).toFixed(3) !== '0.000' || (0.9).toFix
 //    ''.split(/.?/) should be [], not [""]
 //    '.'.split(/()()/) should be ["."], not ["", "", "."]
 
-var string_split = String.prototype.split;
-if (
-    'ab'.split(/(?:ab)*/).length !== 2 ||
-    '.'.split(/(.?)(.?)/).length !== 4 ||
-    'tesst'.split(/(s)*/)[1] === "t" ||
-    ''.split(/.?/).length === 0 ||
-    '.'.split(/()()/).length > 1
-) {
-    (function () {
-        var compliantExecNpcg = /()??/.exec("")[1] === void 0; // NPCG: nonparticipating capturing group
-
-        String.prototype.split = function (separator, limit) {
-            var string = this;
-            if (separator === void 0 && limit === 0)
-                return [];
-
-            // If `separator` is not a regex, use native split
-            if (Object.prototype.toString.call(separator) !== "[object RegExp]") {
-                return string_split.apply(this, arguments);
-            }
-
-            var output = [],
-                flags = (separator.ignoreCase ? "i" : "") +
-                        (separator.multiline  ? "m" : "") +
-                        (separator.extended   ? "x" : "") + // Proposed for ES6
-                        (separator.sticky     ? "y" : ""), // Firefox 3+
-                lastLastIndex = 0,
-                // Make `global` and avoid `lastIndex` issues by working with a copy
-                separator = new RegExp(separator.source, flags + "g"),
-                separator2, match, lastIndex, lastLength;
-            string += ""; // Type-convert
-            if (!compliantExecNpcg) {
-                // Doesn't need flags gy, but they don't hurt
-                separator2 = new RegExp("^" + separator.source + "$(?!\\s)", flags);
-            }
-            /* Values for `limit`, per the spec:
-             * If undefined: 4294967295 // Math.pow(2, 32) - 1
-             * If 0, Infinity, or NaN: 0
-             * If positive number: limit = Math.floor(limit); if (limit > 4294967295) limit -= 4294967296;
-             * If negative number: 4294967296 - Math.floor(Math.abs(limit))
-             * If other: Type-convert, then use the above rules
-             */
-            limit = limit === void 0 ?
-                -1 >>> 0 : // Math.pow(2, 32) - 1
-                limit >>> 0; // ToUint32(limit)
-            while (match = separator.exec(string)) {
-                // `separator.lastIndex` is not reliable cross-browser
-                lastIndex = match.index + match[0].length;
-                if (lastIndex > lastLastIndex) {
-                    output.push(string.slice(lastLastIndex, match.index));
-                    // Fix browsers whose `exec` methods don't consistently return `undefined` for
-                    // nonparticipating capturing groups
-                    if (!compliantExecNpcg && match.length > 1) {
-                        match[0].replace(separator2, function () {
-                            for (var i = 1; i < arguments.length - 2; i++) {
-                                if (arguments[i] === void 0) {
-                                    match[i] = void 0;
-                                }
-                            }
-                        });
-                    }
-                    if (match.length > 1 && match.index < string.length) {
-                        Array.prototype.push.apply(output, match.slice(1));
-                    }
-                    lastLength = match[0].length;
-                    lastLastIndex = lastIndex;
-                    if (output.length >= limit) {
-                        break;
-                    }
-                }
-                if (separator.lastIndex === match.index) {
-                    separator.lastIndex++; // Avoid an infinite loop
-                }
-            }
-            if (lastLastIndex === string.length) {
-                if (lastLength || !separator.test("")) {
-                    output.push("");
-                }
-            } else {
-                output.push(string.slice(lastLastIndex));
-            }
-            return output.length > limit ? output.slice(0, limit) : output;
-        };
-    }());
+	var string_split = String.prototype.split;
+	if (
+		'ab'.split(/(?:ab)*/).length !== 2 ||
+		'.'.split(/(.?)(.?)/).length !== 4 ||
+		'tesst'.split(/(s)*/)[1] === "t" ||
+		''.split(/.?/).length === 0 ||
+		'.'.split(/()()/).length > 1
+	) {
+		(function () {
+			var compliantExecNpcg = /()??/.exec("")[1] === void 0; // NPCG: nonparticipating capturing group
+
+			String.prototype.split = function (separator, limit) {
+				var string = this;
+				if (separator === void 0 && limit === 0)
+					return [];
+
+				// If `separator` is not a regex, use native split
+				if (Object.prototype.toString.call(separator) !== "[object RegExp]") {
+					return string_split.apply(this, arguments);
+				}
+
+				var output = [],
+					flags = (separator.ignoreCase ? "i" : "") +
+						(separator.multiline ? "m" : "") +
+						(separator.extended ? "x" : "") + // Proposed for ES6
+						(separator.sticky ? "y" : ""), // Firefox 3+
+					lastLastIndex = 0,
+					// Make `global` and avoid `lastIndex` issues by working with a copy
+					separator = new RegExp(separator.source, flags + "g"),
+					separator2, match, lastIndex, lastLength;
+				string += ""; // Type-convert
+				if (!compliantExecNpcg) {
+					// Doesn't need flags gy, but they don't hurt
+					separator2 = new RegExp("^" + separator.source + "$(?!\\s)", flags);
+				}
+				/* Values for `limit`, per the spec:
+				 * If undefined: 4294967295 // Math.pow(2, 32) - 1
+				 * If 0, Infinity, or NaN: 0
+				 * If positive number: limit = Math.floor(limit); if (limit > 4294967295) limit -= 4294967296;
+				 * If negative number: 4294967296 - Math.floor(Math.abs(limit))
+				 * If other: Type-convert, then use the above rules
+				 */
+				limit = limit === void 0 ?
+					-1 >>> 0 : // Math.pow(2, 32) - 1
+					limit >>> 0; // ToUint32(limit)
+				while (match = separator.exec(string)) {
+					// `separator.lastIndex` is not reliable cross-browser
+					lastIndex = match.index + match[0].length;
+					if (lastIndex > lastLastIndex) {
+						output.push(string.slice(lastLastIndex, match.index));
+						// Fix browsers whose `exec` methods don't consistently return `undefined` for
+						// nonparticipating capturing groups
+						if (!compliantExecNpcg && match.length > 1) {
+							match[0].replace(separator2, function () {
+								for (var i = 1; i < arguments.length - 2; i++) {
+									if (arguments[i] === void 0) {
+										match[i] = void 0;
+									}
+								}
+							});
+						}
+						if (match.length > 1 && match.index < string.length) {
+							Array.prototype.push.apply(output, match.slice(1));
+						}
+						lastLength = match[0].length;
+						lastLastIndex = lastIndex;
+						if (output.length >= limit) {
+							break;
+						}
+					}
+					if (separator.lastIndex === match.index) {
+						separator.lastIndex++; // Avoid an infinite loop
+					}
+				}
+				if (lastLastIndex === string.length) {
+					if (lastLength || !separator.test("")) {
+						output.push("");
+					}
+				} else {
+					output.push(string.slice(lastLastIndex));
+				}
+				return output.length > limit ? output.slice(0, limit) : output;
+			};
+		}());
 
 // [bugfix, chrome]
 // If separator is undefined, then the result array contains just one String,
@@ -1199,12 +1199,12 @@ if (
 // then the output array is truncated so that it contains no more than limit
 // elements.
 // "0".split(undefined, 0) -> []
-} else if ("0".split(void 0, 0).length) {
-    String.prototype.split = function(separator, limit) {
-        if (separator === void 0 && limit === 0) return [];
-        return string_split.apply(this, arguments);
-    }
-}
+	} else if ("0".split(void 0, 0).length) {
+		String.prototype.split = function (separator, limit) {
+			if (separator === void 0 && limit === 0) return [];
+			return string_split.apply(this, arguments);
+		}
+	}
 
 
 // ECMA-262, 3rd B.2.3
@@ -1212,43 +1212,43 @@ if (
 // non-normative section suggesting uniform semantics and it should be
 // normalized across all browsers
 // [bugfix, IE lt 9] IE < 9 substr() with negative value not working in IE
-if("".substr && "0b".substr(-1) !== "b") {
-    var string_substr = String.prototype.substr;
-    /**
-     *  Get the substring of a string
-     *  @param  {integer}  start   where to start the substring
-     *  @param  {integer}  length  how many characters to return
-     *  @return {string}
-     */
-    String.prototype.substr = function(start, length) {
-        return string_substr.call(
-            this,
-            start < 0 ? ((start = this.length + start) < 0 ? 0 : start) : start,
-            length
-        );
-    }
-}
+	if ("".substr && "0b".substr(-1) !== "b") {
+		var string_substr = String.prototype.substr;
+		/**
+		 *  Get the substring of a string
+		 *  @param  {integer}  start   where to start the substring
+		 *  @param  {integer}  length  how many characters to return
+		 *  @return {string}
+		 */
+		String.prototype.substr = function (start, length) {
+			return string_substr.call(
+				this,
+				start < 0 ? ((start = this.length + start) < 0 ? 0 : start) : start,
+				length
+			);
+		}
+	}
 
 // ES5 15.5.4.20
 // http://es5.github.com/#x15.5.4.20
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim || ws.trim()) {
-    // http://blog.stevenlevithan.com/archives/faster-trim-javascript
-    // http://perfectionkills.com/whitespace-deviations/
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        if (this === void 0 || this === null) {
-            throw new TypeError("can't convert "+this+" to object");
-        }
-        return String(this)
-            .replace(trimBeginRegexp, "")
-            .replace(trimEndRegexp, "");
-    };
-}
+	var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003" +
+		"\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
+		"\u2029\uFEFF";
+	if (!String.prototype.trim || ws.trim()) {
+		// http://blog.stevenlevithan.com/archives/faster-trim-javascript
+		// http://perfectionkills.com/whitespace-deviations/
+		ws = "[" + ws + "]";
+		var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
+			trimEndRegexp = new RegExp(ws + ws + "*$");
+		String.prototype.trim = function trim() {
+			if (this === void 0 || this === null) {
+				throw new TypeError("can't convert " + this + " to object");
+			}
+			return String(this)
+				.replace(trimBeginRegexp, "")
+				.replace(trimEndRegexp, "");
+		};
+	}
 
 //
 // Util
@@ -1259,56 +1259,56 @@ if (!String.prototype.trim || ws.trim()) {
 // http://es5.github.com/#x9.4
 // http://jsperf.com/to-integer
 
-function toInteger(n) {
-    n = +n;
-    if (n !== n) { // isNaN
-        n = 0;
-    } else if (n !== 0 && n !== (1/0) && n !== -(1/0)) {
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    }
-    return n;
-}
-
-function isPrimitive(input) {
-    var type = typeof input;
-    return (
-        input === null ||
-        type === "undefined" ||
-        type === "boolean" ||
-        type === "number" ||
-        type === "string"
-    );
-}
-
-function toPrimitive(input) {
-    var val, valueOf, toString;
-    if (isPrimitive(input)) {
-        return input;
-    }
-    valueOf = input.valueOf;
-    if (typeof valueOf === "function") {
-        val = valueOf.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    toString = input.toString;
-    if (typeof toString === "function") {
-        val = toString.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    throw new TypeError();
-}
+	function toInteger(n) {
+		n = +n;
+		if (n !== n) { // isNaN
+			n = 0;
+		} else if (n !== 0 && n !== (1 / 0) && n !== -(1 / 0)) {
+			n = (n > 0 || -1) * Math.floor(Math.abs(n));
+		}
+		return n;
+	}
+
+	function isPrimitive(input) {
+		var type = typeof input;
+		return (
+			input === null ||
+			type === "undefined" ||
+			type === "boolean" ||
+			type === "number" ||
+			type === "string"
+		);
+	}
+
+	function toPrimitive(input) {
+		var val, valueOf, toString;
+		if (isPrimitive(input)) {
+			return input;
+		}
+		valueOf = input.valueOf;
+		if (typeof valueOf === "function") {
+			val = valueOf.call(input);
+			if (isPrimitive(val)) {
+				return val;
+			}
+		}
+		toString = input.toString;
+		if (typeof toString === "function") {
+			val = toString.call(input);
+			if (isPrimitive(val)) {
+				return val;
+			}
+		}
+		throw new TypeError();
+	}
 
 // ES5 9.9
 // http://es5.github.com/#x9.9
-var toObject = function (o) {
-    if (o == null) { // this matches both null and undefined
-        throw new TypeError("can't convert "+o+" to object");
-    }
-    return Object(o);
-};
+	var toObject = function (o) {
+		if (o == null) { // this matches both null and undefined
+			throw new TypeError("can't convert " + o + " to object");
+		}
+		return Object(o);
+	};
 
 });
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-kill.js b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-kill.js
index 172ccdd..126e966 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-kill.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-kill.js
@@ -1,64 +1,64 @@
 // This methods allows the killing of built-in functions,
 // so the shim can take over with that implementation
-var HLP = (function() {
-    "use strict";
-    var kill;
+var HLP = (function () {
+	"use strict";
+	var kill;
 
-    kill = function(_class, methods) {
-        /*if(!Array.isArray(methods))
-            return;*/
-        if(!_class.originals)
-            _class.originals = {};
+	kill = function (_class, methods) {
+		/*if(!Array.isArray(methods))
+			return;*/
+		if (!_class.originals)
+			_class.originals = {};
 
-        for (var i = 0, len = methods.length; i < len; i++) {
-            var obj = methods[i];
-            _class.originals[obj] = _class[obj];
-            delete _class[obj];
-            if (obj in _class) {
-                // try something more aggressive since V8 at least
-                // appears to ignore the delete.
-                _class[obj] = null;
-                if (_class[obj]) {
-                    console.log("Couln't overwrite", obj, "of", _class);
-                }
-            }
-        }
-    };
-    return { kill: kill };
+		for (var i = 0, len = methods.length; i < len; i++) {
+			var obj = methods[i];
+			_class.originals[obj] = _class[obj];
+			delete _class[obj];
+			if (obj in _class) {
+				// try something more aggressive since V8 at least
+				// appears to ignore the delete.
+				_class[obj] = null;
+				if (_class[obj]) {
+					console.log("Couln't overwrite", obj, "of", _class);
+				}
+			}
+		}
+	};
+	return {kill: kill};
 }());
 
 HLP.kill(Function.prototype, [
-    'bind'
+	'bind'
 ]);
 
 HLP.kill(Array, [
-    'isArray'
+	'isArray'
 ]);
 
 HLP.kill(String.prototype, [
-    "trim"
+	"trim"
 ]);
 
 HLP.kill(Object, [
-    'keys'
+	'keys'
 ]);
 
 HLP.kill(Number.prototype, [
-    'toFixed'
+	'toFixed'
 ]);
 
 HLP.kill(Date, [
-    'now', 'parse'
+	'now', 'parse'
 ]);
 
 HLP.kill(Date.prototype, [
-    "toJSON", "toISOString"
+	"toJSON", "toISOString"
 ]);
 
 HLP.kill(Array.prototype, [
-    'forEach', 'some', 'every',
-    'indexOf', 'lastIndexOf',
-    'map', 'filter',
-    'reduce', 'reduceRight'
+	'forEach', 'some', 'every',
+	'indexOf', 'lastIndexOf',
+	'map', 'filter',
+	'reduce', 'reduceRight'
 ]);
 
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-matchers.js b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-matchers.js
index dda7513..d377926 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-matchers.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h-matchers.js
@@ -1,34 +1,34 @@
-beforeEach(function() {
-    this.addMatchers({
-        toExactlyMatch: function(expected) {
-            var a1, a2,
-                l, i,
-                key,
-                actual = this.actual;
-            
-            var getKeys = function(o) {
-                var a = [];
-                for(key in o) {
-                    if(o.hasOwnProperty(key)) {
-                        a.push(key);
-                    }
-                }
-                return a;
-            }
-            a1 = getKeys(actual);
-            a2 = getKeys(expected);
-            
-            l = a1.length;
-            if(l !== a2.length) {
-                return false;
-            }
-            for(i = 0; i < l; i++) {
-                key = a1[i];
-                expect(key).toEqual(a2[i]);
-                expect(actual[key]).toEqual(expected[key]);
-            }
-            
-            return true;
-        }
-    })
+beforeEach(function () {
+	this.addMatchers({
+		toExactlyMatch: function (expected) {
+			var a1, a2,
+				l, i,
+				key,
+				actual = this.actual;
+
+			var getKeys = function (o) {
+				var a = [];
+				for (key in o) {
+					if (o.hasOwnProperty(key)) {
+						a.push(key);
+					}
+				}
+				return a;
+			}
+			a1 = getKeys(actual);
+			a2 = getKeys(expected);
+
+			l = a1.length;
+			if (l !== a2.length) {
+				return false;
+			}
+			for (i = 0; i < l; i++) {
+				key = a1[i];
+				expect(key).toEqual(a2[i]);
+				expect(actual[key]).toEqual(expected[key]);
+			}
+
+			return true;
+		}
+	})
 });
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h.js b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h.js
index ede51ef..df1c270 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/helpers/h.js
@@ -1,3 +1,3 @@
 function implement() {
-    throw 'Not implemented';
-}
\ No newline at end of file
+	throw 'Not implemented';
+}
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/index.html b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/index.html
index 6539476..b6d2af3 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/index.html
+++ b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/index.html
@@ -3,12 +3,12 @@
 <head>
 	<title>Jasmine Spec Runner</title>
 
-	<link rel="shortcut icon" type="image/png" href="lib/jasmine_favicon.png">
+	<link href="lib/jasmine_favicon.png" rel="shortcut icon" type="image/png">
 
-	<link rel="stylesheet" type="text/css" href="lib/jasmine.css">
-	<script type="text/javascript" src="lib/jasmine.js"></script>
-	<script type="text/javascript" src="lib/jasmine-html.js"></script>
-	<script type="text/javascript" src="lib/json2.js"></script>
+	<link href="lib/jasmine.css" rel="stylesheet" type="text/css">
+	<script src="lib/jasmine.js" type="text/javascript"></script>
+	<script src="lib/jasmine-html.js" type="text/javascript"></script>
+	<script src="lib/json2.js" type="text/javascript"></script>
 
 	<!-- include helper files here... -->
 	<script src="helpers/h.js"></script>
@@ -17,7 +17,7 @@
 
 	<!-- include source files here... -->
 	<script src="../es5-shim.js"></script>
-    <script src="../es5-sham.js"></script>
+	<script src="../es5-sham.js"></script>
 
 	<!-- include spec files here... -->
 	<script src="spec/s-array.js"></script>
@@ -29,7 +29,7 @@
 
 
 	<script type="text/javascript">
-		(function() {
+		(function () {
 			var jasmineEnv = jasmine.getEnv();
 			jasmineEnv.updateInterval = 1000;
 
@@ -37,13 +37,13 @@
 
 			jasmineEnv.addReporter(trivialReporter);
 
-			jasmineEnv.specFilter = function(spec) {
+			jasmineEnv.specFilter = function (spec) {
 				return trivialReporter.specFilter(spec);
 			};
 
 			var currentWindowOnload = window.onload;
 
-			window.onload = function() {
+			window.onload = function () {
 				if (currentWindowOnload) {
 					currentWindowOnload();
 				}
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/index.min.html b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/index.min.html
index 65e590a..30d8337 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/index.min.html
+++ b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/index.min.html
@@ -3,12 +3,12 @@
 <head>
 	<title>Jasmine Spec Runner</title>
 
-	<link rel="shortcut icon" type="image/png" href="lib/jasmine_favicon.png">
+	<link href="lib/jasmine_favicon.png" rel="shortcut icon" type="image/png">
 
-	<link rel="stylesheet" type="text/css" href="lib/jasmine.css">
-	<script type="text/javascript" src="lib/jasmine.js"></script>
-	<script type="text/javascript" src="lib/jasmine-html.js"></script>
-	<script type="text/javascript" src="lib/json2.js"></script>
+	<link href="lib/jasmine.css" rel="stylesheet" type="text/css">
+	<script src="lib/jasmine.js" type="text/javascript"></script>
+	<script src="lib/jasmine-html.js" type="text/javascript"></script>
+	<script src="lib/json2.js" type="text/javascript"></script>
 
 	<!-- include helper files here... -->
 	<script src="helpers/h.js"></script>
@@ -28,7 +28,7 @@
 
 
 	<script type="text/javascript">
-		(function() {
+		(function () {
 			var jasmineEnv = jasmine.getEnv();
 			jasmineEnv.updateInterval = 1000;
 
@@ -36,13 +36,13 @@
 
 			jasmineEnv.addReporter(trivialReporter);
 
-			jasmineEnv.specFilter = function(spec) {
+			jasmineEnv.specFilter = function (spec) {
 				return trivialReporter.specFilter(spec);
 			};
 
 			var currentWindowOnload = window.onload;
 
-			window.onload = function() {
+			window.onload = function () {
 				if (currentWindowOnload) {
 					currentWindowOnload();
 				}
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine-html.js b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine-html.js
index 7383401..731c6ee 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine-html.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine-html.js
@@ -1,190 +1,204 @@
-jasmine.TrivialReporter = function(doc) {
-  this.document = doc || document;
-  this.suiteDivs = {};
-  this.logRunningSpecs = false;
+jasmine.TrivialReporter = function (doc) {
+	this.document = doc || document;
+	this.suiteDivs = {};
+	this.logRunningSpecs = false;
 };
 
-jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarArgs) {
-  var el = document.createElement(type);
-
-  for (var i = 2; i < arguments.length; i++) {
-    var child = arguments[i];
-
-    if (typeof child === 'string') {
-      el.appendChild(document.createTextNode(child));
-    } else {
-      if (child) { el.appendChild(child); }
-    }
-  }
-
-  for (var attr in attrs) {
-    if (attr == "className") {
-      el[attr] = attrs[attr];
-    } else {
-      el.setAttribute(attr, attrs[attr]);
-    }
-  }
-
-  return el;
+jasmine.TrivialReporter.prototype.createDom = function (type, attrs, childrenVarArgs) {
+	var el = document.createElement(type);
+
+	for (var i = 2; i < arguments.length; i++) {
+		var child = arguments[i];
+
+		if (typeof child === 'string') {
+			el.appendChild(document.createTextNode(child));
+		} else {
+			if (child) {
+				el.appendChild(child);
+			}
+		}
+	}
+
+	for (var attr in attrs) {
+		if (attr == "className") {
+			el[attr] = attrs[attr];
+		} else {
+			el.setAttribute(attr, attrs[attr]);
+		}
+	}
+
+	return el;
 };
 
-jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) {
-  var showPassed, showSkipped;
-
-  this.outerDiv = this.createDom('div', { className: 'jasmine_reporter' },
-      this.createDom('div', { className: 'banner' },
-        this.createDom('div', { className: 'logo' },
-            this.createDom('span', { className: 'title' }, "Jasmine"),
-            this.createDom('span', { className: 'version' }, runner.env.versionString())),
-        this.createDom('div', { className: 'options' },
-            "Show ",
-            showPassed = this.createDom('input', { id: "__jasmine_TrivialReporter_showPassed__", type: 'checkbox' }),
-            this.createDom('label', { "for": "__jasmine_TrivialReporter_showPassed__" }, " passed "),
-            showSkipped = this.createDom('input', { id: "__jasmine_TrivialReporter_showSkipped__", type: 'checkbox' }),
-            this.createDom('label', { "for": "__jasmine_TrivialReporter_showSkipped__" }, " skipped")
-            )
-          ),
-
-      this.runnerDiv = this.createDom('div', { className: 'runner running' },
-          this.createDom('a', { className: 'run_spec', href: '?' }, "run all"),
-          this.runnerMessageSpan = this.createDom('span', {}, "Running..."),
-          this.finishedAtSpan = this.createDom('span', { className: 'finished-at' }, ""))
-      );
-
-  this.document.body.appendChild(this.outerDiv);
-
-  var suites = runner.suites();
-  for (var i = 0; i < suites.length; i++) {
-    var suite = suites[i];
-    var suiteDiv = this.createDom('div', { className: 'suite' },
-        this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, "run"),
-        this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, suite.description));
-    this.suiteDivs[suite.id] = suiteDiv;
-    var parentDiv = this.outerDiv;
-    if (suite.parentSuite) {
-      parentDiv = this.suiteDivs[suite.parentSuite.id];
-    }
-    parentDiv.appendChild(suiteDiv);
-  }
-
-  this.startedAt = new Date();
-
-  var self = this;
-  showPassed.onclick = function(evt) {
-    if (showPassed.checked) {
-      self.outerDiv.className += ' show-passed';
-    } else {
-      self.outerDiv.className = self.outerDiv.className.replace(/ show-passed/, '');
-    }
-  };
-
-  showSkipped.onclick = function(evt) {
-    if (showSkipped.checked) {
-      self.outerDiv.className += ' show-skipped';
-    } else {
-      self.outerDiv.className = self.outerDiv.className.replace(/ show-skipped/, '');
-    }
-  };
+jasmine.TrivialReporter.prototype.reportRunnerStarting = function (runner) {
+	var showPassed, showSkipped;
+
+	this.outerDiv = this.createDom('div', {className: 'jasmine_reporter'},
+		this.createDom('div', {className: 'banner'},
+			this.createDom('div', {className: 'logo'},
+				this.createDom('span', {className: 'title'}, "Jasmine"),
+				this.createDom('span', {className: 'version'}, runner.env.versionString())),
+			this.createDom('div', {className: 'options'},
+				"Show ",
+				showPassed = this.createDom('input', {id: "__jasmine_TrivialReporter_showPassed__", type: 'checkbox'}),
+				this.createDom('label', {"for": "__jasmine_TrivialReporter_showPassed__"}, " passed "),
+				showSkipped = this.createDom('input', {
+					id: "__jasmine_TrivialReporter_showSkipped__",
+					type: 'checkbox'
+				}),
+				this.createDom('label', {"for": "__jasmine_TrivialReporter_showSkipped__"}, " skipped")
+			)
+		),
+
+		this.runnerDiv = this.createDom('div', {className: 'runner running'},
+			this.createDom('a', {className: 'run_spec', href: '?'}, "run all"),
+			this.runnerMessageSpan = this.createDom('span', {}, "Running..."),
+			this.finishedAtSpan = this.createDom('span', {className: 'finished-at'}, ""))
+	);
+
+	this.document.body.appendChild(this.outerDiv);
+
+	var suites = runner.suites();
+	for (var i = 0; i < suites.length; i++) {
+		var suite = suites[i];
+		var suiteDiv = this.createDom('div', {className: 'suite'},
+			this.createDom('a', {
+				className: 'run_spec',
+				href: '?spec=' + encodeURIComponent(suite.getFullName())
+			}, "run"),
+			this.createDom('a', {
+				className: 'description',
+				href: '?spec=' + encodeURIComponent(suite.getFullName())
+			}, suite.description));
+		this.suiteDivs[suite.id] = suiteDiv;
+		var parentDiv = this.outerDiv;
+		if (suite.parentSuite) {
+			parentDiv = this.suiteDivs[suite.parentSuite.id];
+		}
+		parentDiv.appendChild(suiteDiv);
+	}
+
+	this.startedAt = new Date();
+
+	var self = this;
+	showPassed.onclick = function (evt) {
+		if (showPassed.checked) {
+			self.outerDiv.className += ' show-passed';
+		} else {
+			self.outerDiv.className = self.outerDiv.className.replace(/ show-passed/, '');
+		}
+	};
+
+	showSkipped.onclick = function (evt) {
+		if (showSkipped.checked) {
+			self.outerDiv.className += ' show-skipped';
+		} else {
+			self.outerDiv.className = self.outerDiv.className.replace(/ show-skipped/, '');
+		}
+	};
 };
 
-jasmine.TrivialReporter.prototype.reportRunnerResults = function(runner) {
-  var results = runner.results();
-  var className = (results.failedCount > 0) ? "runner failed" : "runner passed";
-  this.runnerDiv.setAttribute("class", className);
-  //do it twice for IE
-  this.runnerDiv.setAttribute("className", className);
-  var specs = runner.specs();
-  var specCount = 0;
-  for (var i = 0; i < specs.length; i++) {
-    if (this.specFilter(specs[i])) {
-      specCount++;
-    }
-  }
-  var message = "" + specCount + " spec" + (specCount == 1 ? "" : "s" ) + ", " + results.failedCount + " failure" + ((results.failedCount == 1) ? "" : "s");
-  message += " in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s";
-  this.runnerMessageSpan.replaceChild(this.createDom('a', { className: 'description', href: '?'}, message), this.runnerMessageSpan.firstChild);
-
-  this.finishedAtSpan.appendChild(document.createTextNode("Finished at " + new Date().toString()));
+jasmine.TrivialReporter.prototype.reportRunnerResults = function (runner) {
+	var results = runner.results();
+	var className = (results.failedCount > 0) ? "runner failed" : "runner passed";
+	this.runnerDiv.setAttribute("class", className);
+	//do it twice for IE
+	this.runnerDiv.setAttribute("className", className);
+	var specs = runner.specs();
+	var specCount = 0;
+	for (var i = 0; i < specs.length; i++) {
+		if (this.specFilter(specs[i])) {
+			specCount++;
+		}
+	}
+	var message = "" + specCount + " spec" + (specCount == 1 ? "" : "s") + ", " + results.failedCount + " failure" + ((results.failedCount == 1) ? "" : "s");
+	message += " in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s";
+	this.runnerMessageSpan.replaceChild(this.createDom('a', {
+		className: 'description',
+		href: '?'
+	}, message), this.runnerMessageSpan.firstChild);
+
+	this.finishedAtSpan.appendChild(document.createTextNode("Finished at " + new Date().toString()));
 };
 
-jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) {
-  var results = suite.results();
-  var status = results.passed() ? 'passed' : 'failed';
-  if (results.totalCount === 0) { // todo: change this to check results.skipped
-    status = 'skipped';
-  }
-  this.suiteDivs[suite.id].className += " " + status;
+jasmine.TrivialReporter.prototype.reportSuiteResults = function (suite) {
+	var results = suite.results();
+	var status = results.passed() ? 'passed' : 'failed';
+	if (results.totalCount === 0) { // todo: change this to check results.skipped
+		status = 'skipped';
+	}
+	this.suiteDivs[suite.id].className += " " + status;
 };
 
-jasmine.TrivialReporter.prototype.reportSpecStarting = function(spec) {
-  if (this.logRunningSpecs) {
-    this.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...');
-  }
+jasmine.TrivialReporter.prototype.reportSpecStarting = function (spec) {
+	if (this.logRunningSpecs) {
+		this.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...');
+	}
 };
 
-jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) {
-  var results = spec.results();
-  var status = results.passed() ? 'passed' : 'failed';
-  if (results.skipped) {
-    status = 'skipped';
-  }
-  var specDiv = this.createDom('div', { className: 'spec '  + status },
-      this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, "run"),
-      this.createDom('a', {
-        className: 'description',
-        href: '?spec=' + encodeURIComponent(spec.getFullName()),
-        title: spec.getFullName()
-      }, spec.description));
-
-
-  var resultItems = results.getItems();
-  var messagesDiv = this.createDom('div', { className: 'messages' });
-  for (var i = 0; i < resultItems.length; i++) {
-    var result = resultItems[i];
-
-    if (result.type == 'log') {
-      messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage log'}, result.toString()));
-    } else if (result.type == 'expect' && result.passed && !result.passed()) {
-      messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message));
-
-      if (result.trace.stack) {
-        messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack));
-      }
-    }
-  }
-
-  if (messagesDiv.childNodes.length > 0) {
-    specDiv.appendChild(messagesDiv);
-  }
-
-  this.suiteDivs[spec.suite.id].appendChild(specDiv);
+jasmine.TrivialReporter.prototype.reportSpecResults = function (spec) {
+	var results = spec.results();
+	var status = results.passed() ? 'passed' : 'failed';
+	if (results.skipped) {
+		status = 'skipped';
+	}
+	var specDiv = this.createDom('div', {className: 'spec ' + status},
+		this.createDom('a', {className: 'run_spec', href: '?spec=' + encodeURIComponent(spec.getFullName())}, "run"),
+		this.createDom('a', {
+			className: 'description',
+			href: '?spec=' + encodeURIComponent(spec.getFullName()),
+			title: spec.getFullName()
+		}, spec.description));
+
+
+	var resultItems = results.getItems();
+	var messagesDiv = this.createDom('div', {className: 'messages'});
+	for (var i = 0; i < resultItems.length; i++) {
+		var result = resultItems[i];
+
+		if (result.type == 'log') {
+			messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage log'}, result.toString()));
+		} else if (result.type == 'expect' && result.passed && !result.passed()) {
+			messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message));
+
+			if (result.trace.stack) {
+				messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack));
+			}
+		}
+	}
+
+	if (messagesDiv.childNodes.length > 0) {
+		specDiv.appendChild(messagesDiv);
+	}
+
+	this.suiteDivs[spec.suite.id].appendChild(specDiv);
 };
 
-jasmine.TrivialReporter.prototype.log = function() {
-  var console = jasmine.getGlobal().console;
-  if (console && console.log) {
-    if (console.log.apply) {
-      console.log.apply(console, arguments);
-    } else {
-      console.log(arguments); // ie fix: console.log.apply doesn't exist on ie
-    }
-  }
+jasmine.TrivialReporter.prototype.log = function () {
+	var console = jasmine.getGlobal().console;
+	if (console && console.log) {
+		if (console.log.apply) {
+			console.log.apply(console, arguments);
+		} else {
+			console.log(arguments); // ie fix: console.log.apply doesn't exist on ie
+		}
+	}
 };
 
-jasmine.TrivialReporter.prototype.getLocation = function() {
-  return this.document.location;
+jasmine.TrivialReporter.prototype.getLocation = function () {
+	return this.document.location;
 };
 
-jasmine.TrivialReporter.prototype.specFilter = function(spec) {
-  var paramMap = {};
-  var params = this.getLocation().search.substring(1).split('&');
-  for (var i = 0; i < params.length; i++) {
-    var p = params[i].split('=');
-    paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]);
-  }
-
-  if (!paramMap.spec) {
-    return true;
-  }
-  return spec.getFullName().indexOf(paramMap.spec) === 0;
+jasmine.TrivialReporter.prototype.specFilter = function (spec) {
+	var paramMap = {};
+	var params = this.getLocation().search.substring(1).split('&');
+	for (var i = 0; i < params.length; i++) {
+		var p = params[i].split('=');
+		paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]);
+	}
+
+	if (!paramMap.spec) {
+		return true;
+	}
+	return spec.getFullName().indexOf(paramMap.spec) === 0;
 };
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.css b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.css
index 6583fe7..24293ac 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.css
+++ b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.css
@@ -1,166 +1,164 @@
 body {
-  font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif;
+	font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif;
 }
 
 
 .jasmine_reporter a:visited, .jasmine_reporter a {
-  color: #303; 
+	color: #303;
 }
 
 .jasmine_reporter a:hover, .jasmine_reporter a:active {
-  color: blue; 
+	color: blue;
 }
 
 .run_spec {
-  float:right;
-  padding-right: 5px;
-  font-size: .8em;
-  text-decoration: none;
+	float: right;
+	padding-right: 5px;
+	font-size: .8em;
+	text-decoration: none;
 }
 
 .jasmine_reporter {
-  margin: 0 5px;
+	margin: 0 5px;
 }
 
 .banner {
-  color: #303;
-  background-color: #fef;
-  padding: 5px;
+	color: #303;
+	background-color: #fef;
+	padding: 5px;
 }
 
 .logo {
-  float: left;
-  font-size: 1.1em;
-  padding-left: 5px;
+	float: left;
+	font-size: 1.1em;
+	padding-left: 5px;
 }
 
 .logo .version {
-  font-size: .6em;
-  padding-left: 1em;
+	font-size: .6em;
+	padding-left: 1em;
 }
 
 .runner.running {
-  background-color: yellow;
+	background-color: yellow;
 }
 
 
 .options {
-  text-align: right;
-  font-size: .8em;
+	text-align: right;
+	font-size: .8em;
 }
 
 
-
-
 .suite {
-  border: 1px outset gray;
-  margin: 5px 0;
-  padding-left: 1em;
+	border: 1px outset gray;
+	margin: 5px 0;
+	padding-left: 1em;
 }
 
 .suite .suite {
-  margin: 5px; 
+	margin: 5px;
 }
 
 .suite.passed {
-  background-color: #dfd;
+	background-color: #dfd;
 }
 
 .suite.failed {
-  background-color: #fdd;
+	background-color: #fdd;
 }
 
 .spec {
-  margin: 5px;
-  padding-left: 1em;
-  clear: both;
+	margin: 5px;
+	padding-left: 1em;
+	clear: both;
 }
 
 .spec.failed, .spec.passed, .spec.skipped {
-  padding-bottom: 5px;
-  border: 1px solid gray;
+	padding-bottom: 5px;
+	border: 1px solid gray;
 }
 
 .spec.failed {
-  background-color: #fbb;
-  border-color: red;
+	background-color: #fbb;
+	border-color: red;
 }
 
 .spec.passed {
-  background-color: #bfb;
-  border-color: green;
+	background-color: #bfb;
+	border-color: green;
 }
 
 .spec.skipped {
-  background-color: #bbb;
+	background-color: #bbb;
 }
 
 .messages {
-  border-left: 1px dashed gray;
-  padding-left: 1em;
-  padding-right: 1em;
+	border-left: 1px dashed gray;
+	padding-left: 1em;
+	padding-right: 1em;
 }
 
 .passed {
-  background-color: #cfc;
-  display: none;
+	background-color: #cfc;
+	display: none;
 }
 
 .failed {
-  background-color: #fbb;
+	background-color: #fbb;
 }
 
 .skipped {
-  color: #777;
-  background-color: #eee;
-  display: none;
+	color: #777;
+	background-color: #eee;
+	display: none;
 }
 
 
 /*.resultMessage {*/
-  /*white-space: pre;*/
+/*white-space: pre;*/
 /*}*/
 
 .resultMessage span.result {
-  display: block;
-  line-height: 2em;
-  color: black;
+	display: block;
+	line-height: 2em;
+	color: black;
 }
 
 .resultMessage .mismatch {
-  color: black;
+	color: black;
 }
 
 .stackTrace {
-  white-space: pre;
-  font-size: .8em;
-  margin-left: 10px;
-  max-height: 5em;
-  overflow: auto;
-  border: 1px inset red;
-  padding: 1em;
-  background: #eef;
+	white-space: pre;
+	font-size: .8em;
+	margin-left: 10px;
+	max-height: 5em;
+	overflow: auto;
+	border: 1px inset red;
+	padding: 1em;
+	background: #eef;
 }
 
 .finished-at {
-  padding-left: 1em;
-  font-size: .6em;
+	padding-left: 1em;
+	font-size: .6em;
 }
 
 .show-passed .passed,
 .show-skipped .skipped {
-  display: block;
+	display: block;
 }
 
 
 #jasmine_content {
-  position:fixed;
-  right: 100%;
+	position: fixed;
+	right: 100%;
 }
 
 .runner {
-  border: 1px solid gray;
-  display: block;
-  margin: 5px 0;
-  padding: 2px 0 2px 10px;
+	border: 1px solid gray;
+	display: block;
+	margin: 5px 0;
+	padding: 2px 0 2px 10px;
 }
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.js b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.js
index e84909b..c2b5e08 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/lib/jasmine.js
@@ -10,8 +10,8 @@ if (isCommonJS) exports.jasmine = jasmine;
 /**
  * @private
  */
-jasmine.unimplementedMethod_ = function() {
-  throw new Error("unimplemented method");
+jasmine.unimplementedMethod_ = function () {
+	throw new Error("unimplemented method");
 };
 
 /**
@@ -39,12 +39,12 @@ jasmine.DEFAULT_UPDATE_INTERVAL = 250;
  */
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000;
 
-jasmine.getGlobal = function() {
-  function getGlobal() {
-    return this;
-  }
+jasmine.getGlobal = function () {
+	function getGlobal() {
+		return this;
+	}
 
-  return getGlobal();
+	return getGlobal();
 };
 
 /**
@@ -55,16 +55,16 @@ jasmine.getGlobal = function() {
  * @param base {Object} bound 'this' for the function
  * @param name {Function} function to find
  */
-jasmine.bindOriginal_ = function(base, name) {
-  var original = base[name];
-  if (original.apply) {
-    return function() {
-      return original.apply(base, arguments);
-    };
-  } else {
-    // IE support
-    return jasmine.getGlobal()[name];
-  }
+jasmine.bindOriginal_ = function (base, name) {
+	var original = base[name];
+	if (original.apply) {
+		return function () {
+			return original.apply(base, arguments);
+		};
+	} else {
+		// IE support
+		return jasmine.getGlobal()[name];
+	}
 };
 
 jasmine.setTimeout = jasmine.bindOriginal_(jasmine.getGlobal(), 'setTimeout');
@@ -72,51 +72,51 @@ jasmine.clearTimeout = jasmine.bindOriginal_(jasmine.getGlobal(), 'clearTimeout'
 jasmine.setInterval = jasmine.bindOriginal_(jasmine.getGlobal(), 'setInterval');
 jasmine.clearInterval = jasmine.bindOriginal_(jasmine.getGlobal(), 'clearInterval');
 
-jasmine.MessageResult = function(values) {
-  this.type = 'log';
-  this.values = values;
-  this.trace = new Error(); // todo: test better
+jasmine.MessageResult = function (values) {
+	this.type = 'log';
+	this.values = values;
+	this.trace = new Error(); // todo: test better
 };
 
-jasmine.MessageResult.prototype.toString = function() {
-  var text = "";
-  for (var i = 0; i < this.values.length; i++) {
-    if (i > 0) text += " ";
-    if (jasmine.isString_(this.values[i])) {
-      text += this.values[i];
-    } else {
-      text += jasmine.pp(this.values[i]);
-    }
-  }
-  return text;
+jasmine.MessageResult.prototype.toString = function () {
+	var text = "";
+	for (var i = 0; i < this.values.length; i++) {
+		if (i > 0) text += " ";
+		if (jasmine.isString_(this.values[i])) {
+			text += this.values[i];
+		} else {
+			text += jasmine.pp(this.values[i]);
+		}
+	}
+	return text;
 };
 
-jasmine.ExpectationResult = function(params) {
-  this.type = 'expect';
-  this.matcherName = params.matcherName;
-  this.passed_ = params.passed;
-  this.expected = params.expected;
-  this.actual = params.actual;
-  this.message = this.passed_ ? 'Passed.' : params.message;
+jasmine.ExpectationResult = function (params) {
+	this.type = 'expect';
+	this.matcherName = params.matcherName;
+	this.passed_ = params.passed;
+	this.expected = params.expected;
+	this.actual = params.actual;
+	this.message = this.passed_ ? 'Passed.' : params.message;
 
-  var trace = (params.trace || new Error(this.message));
-  this.trace = this.passed_ ? '' : trace;
+	var trace = (params.trace || new Error(this.message));
+	this.trace = this.passed_ ? '' : trace;
 };
 
 jasmine.ExpectationResult.prototype.toString = function () {
-  return this.message;
+	return this.message;
 };
 
 jasmine.ExpectationResult.prototype.passed = function () {
-  return this.passed_;
+	return this.passed_;
 };
 
 /**
  * Getter for the Jasmine environment. Ensures one gets created
  */
-jasmine.getEnv = function() {
-  var env = jasmine.currentEnv_ = jasmine.currentEnv_ || new jasmine.Env();
-  return env;
+jasmine.getEnv = function () {
+	var env = jasmine.currentEnv_ = jasmine.currentEnv_ || new jasmine.Env();
+	return env;
 };
 
 /**
@@ -125,8 +125,8 @@ jasmine.getEnv = function() {
  * @param value
  * @returns {Boolean}
  */
-jasmine.isArray_ = function(value) {
-  return jasmine.isA_("Array", value);
+jasmine.isArray_ = function (value) {
+	return jasmine.isA_("Array", value);
 };
 
 /**
@@ -135,8 +135,8 @@ jasmine.isArray_ = function(value) {
  * @param value
  * @returns {Boolean}
  */
-jasmine.isString_ = function(value) {
-  return jasmine.isA_("String", value);
+jasmine.isString_ = function (value) {
+	return jasmine.isA_("String", value);
 };
 
 /**
@@ -145,8 +145,8 @@ jasmine.isString_ = function(value) {
  * @param value
  * @returns {Boolean}
  */
-jasmine.isNumber_ = function(value) {
-  return jasmine.isA_("Number", value);
+jasmine.isNumber_ = function (value) {
+	return jasmine.isA_("Number", value);
 };
 
 /**
@@ -156,8 +156,8 @@ jasmine.isNumber_ = function(value) {
  * @param value
  * @returns {Boolean}
  */
-jasmine.isA_ = function(typeName, value) {
-  return Object.prototype.toString.apply(value) === '[object ' + typeName + ']';
+jasmine.isA_ = function (typeName, value) {
+	return Object.prototype.toString.apply(value) === '[object ' + typeName + ']';
 };
 
 /**
@@ -166,10 +166,10 @@ jasmine.isA_ = function(typeName, value) {
  * @param value {Object} an object to be outputted
  * @returns {String}
  */
-jasmine.pp = function(value) {
-  var stringPrettyPrinter = new jasmine.StringPrettyPrinter();
-  stringPrettyPrinter.format(value);
-  return stringPrettyPrinter.string;
+jasmine.pp = function (value) {
+	var stringPrettyPrinter = new jasmine.StringPrettyPrinter();
+	stringPrettyPrinter.format(value);
+	return stringPrettyPrinter.string;
 };
 
 /**
@@ -178,8 +178,8 @@ jasmine.pp = function(value) {
  * @param {Object} obj object to check
  * @returns {Boolean}
  */
-jasmine.isDomNode = function(obj) {
-  return obj.nodeType > 0;
+jasmine.isDomNode = function (obj) {
+	return obj.nodeType > 0;
 };
 
 /**
@@ -192,8 +192,8 @@ jasmine.isDomNode = function(obj) {
  * @param {Class} clazz
  * @returns matchable object of the type clazz
  */
-jasmine.any = function(clazz) {
-  return new jasmine.Matchers.Any(clazz);
+jasmine.any = function (clazz) {
+	return new jasmine.Matchers.Any(clazz);
 };
 
 /**
@@ -240,41 +240,41 @@ jasmine.any = function(clazz) {
  * @see spyOn, jasmine.createSpy, jasmine.createSpyObj
  * @param {String} name
  */
-jasmine.Spy = function(name) {
-  /**
-   * The name of the spy, if provided.
-   */
-  this.identity = name || 'unknown';
-  /**
-   *  Is this Object a spy?
-   */
-  this.isSpy = true;
-  /**
-   * The actual function this spy stubs.
-   */
-  this.plan = function() {
-  };
-  /**
-   * Tracking of the most recent call to the spy.
-   * @example
-   * var mySpy = jasmine.createSpy('foo');
-   * mySpy(1, 2);
-   * mySpy.mostRecentCall.args = [1, 2];
-   */
-  this.mostRecentCall = {};
-
-  /**
-   * Holds arguments for each call to the spy, indexed by call count
-   * @example
-   * var mySpy = jasmine.createSpy('foo');
-   * mySpy(1, 2);
-   * mySpy(7, 8);
-   * mySpy.mostRecentCall.args = [7, 8];
-   * mySpy.argsForCall[0] = [1, 2];
-   * mySpy.argsForCall[1] = [7, 8];
-   */
-  this.argsForCall = [];
-  this.calls = [];
+jasmine.Spy = function (name) {
+	/**
+	 * The name of the spy, if provided.
+	 */
+	this.identity = name || 'unknown';
+	/**
+	 *  Is this Object a spy?
+	 */
+	this.isSpy = true;
+	/**
+	 * The actual function this spy stubs.
+	 */
+	this.plan = function () {
+	};
+	/**
+	 * Tracking of the most recent call to the spy.
+	 * @example
+	 * var mySpy = jasmine.createSpy('foo');
+	 * mySpy(1, 2);
+	 * mySpy.mostRecentCall.args = [1, 2];
+	 */
+	this.mostRecentCall = {};
+
+	/**
+	 * Holds arguments for each call to the spy, indexed by call count
+	 * @example
+	 * var mySpy = jasmine.createSpy('foo');
+	 * mySpy(1, 2);
+	 * mySpy(7, 8);
+	 * mySpy.mostRecentCall.args = [7, 8];
+	 * mySpy.argsForCall[0] = [1, 2];
+	 * mySpy.argsForCall[1] = [7, 8];
+	 */
+	this.argsForCall = [];
+	this.calls = [];
 };
 
 /**
@@ -288,9 +288,9 @@ jasmine.Spy = function(name) {
  * // defining a spy on an existing property: foo.bar
  * spyOn(foo, 'bar').andCallThrough();
  */
-jasmine.Spy.prototype.andCallThrough = function() {
-  this.plan = this.originalValue;
-  return this;
+jasmine.Spy.prototype.andCallThrough = function () {
+	this.plan = this.originalValue;
+	return this;
 };
 
 /**
@@ -305,11 +305,11 @@ jasmine.Spy.prototype.andCallThrough = function() {
  *
  * @param {Object} value
  */
-jasmine.Spy.prototype.andReturn = function(value) {
-  this.plan = function() {
-    return value;
-  };
-  return this;
+jasmine.Spy.prototype.andReturn = function (value) {
+	this.plan = function () {
+		return value;
+	};
+	return this;
 };
 
 /**
@@ -324,11 +324,11 @@ jasmine.Spy.prototype.andReturn = function(value) {
  *
  * @param {String} exceptionMsg
  */
-jasmine.Spy.prototype.andThrow = function(exceptionMsg) {
-  this.plan = function() {
-    throw exceptionMsg;
-  };
-  return this;
+jasmine.Spy.prototype.andThrow = function (exceptionMsg) {
+	this.plan = function () {
+		throw exceptionMsg;
+	};
+	return this;
 };
 
 /**
@@ -346,9 +346,9 @@ jasmine.Spy.prototype.andThrow = function(exceptionMsg) {
  *
  * @param {Function} fakeFunc
  */
-jasmine.Spy.prototype.andCallFake = function(fakeFunc) {
-  this.plan = fakeFunc;
-  return this;
+jasmine.Spy.prototype.andCallFake = function (fakeFunc) {
+	this.plan = fakeFunc;
+	return this;
 };
 
 /**
@@ -365,36 +365,36 @@ jasmine.Spy.prototype.andCallFake = function(fakeFunc) {
  *
  * expect(foo.bar.callCount).toEqual(0);
  */
-jasmine.Spy.prototype.reset = function() {
-  this.wasCalled = false;
-  this.callCount = 0;
-  this.argsForCall = [];
-  this.calls = [];
-  this.mostRecentCall = {};
+jasmine.Spy.prototype.reset = function () {
+	this.wasCalled = false;
+	this.callCount = 0;
+	this.argsForCall = [];
+	this.calls = [];
+	this.mostRecentCall = {};
 };
 
-jasmine.createSpy = function(name) {
+jasmine.createSpy = function (name) {
 
-  var spyObj = function() {
-    spyObj.wasCalled = true;
-    spyObj.callCount++;
-    var args = jasmine.util.argsToArray(arguments);
-    spyObj.mostRecentCall.object = this;
-    spyObj.mostRecentCall.args = args;
-    spyObj.argsForCall.push(args);
-    spyObj.calls.push({object: this, args: args});
-    return spyObj.plan.apply(this, arguments);
-  };
+	var spyObj = function () {
+		spyObj.wasCalled = true;
+		spyObj.callCount++;
+		var args = jasmine.util.argsToArray(arguments);
+		spyObj.mostRecentCall.object = this;
+		spyObj.mostRecentCall.args = args;
+		spyObj.argsForCall.push(args);
+		spyObj.calls.push({object: this, args: args});
+		return spyObj.plan.apply(this, arguments);
+	};
 
-  var spy = new jasmine.Spy(name);
+	var spy = new jasmine.Spy(name);
 
-  for (var prop in spy) {
-    spyObj[prop] = spy[prop];
-  }
+	for (var prop in spy) {
+		spyObj[prop] = spy[prop];
+	}
 
-  spyObj.reset();
+	spyObj.reset();
 
-  return spyObj;
+	return spyObj;
 };
 
 /**
@@ -403,8 +403,8 @@ jasmine.createSpy = function(name) {
  * @param {jasmine.Spy|Object} putativeSpy
  * @returns {Boolean}
  */
-jasmine.isSpy = function(putativeSpy) {
-  return putativeSpy && putativeSpy.isSpy;
+jasmine.isSpy = function (putativeSpy) {
+	return putativeSpy && putativeSpy.isSpy;
 };
 
 /**
@@ -414,15 +414,15 @@ jasmine.isSpy = function(putativeSpy) {
  * @param {String} baseName name of spy class
  * @param {Array} methodNames array of names of methods to make spies
  */
-jasmine.createSpyObj = function(baseName, methodNames) {
-  if (!jasmine.isArray_(methodNames) || methodNames.length === 0) {
-    throw new Error('createSpyObj requires a non-empty array of method names to create spies for');
-  }
-  var obj = {};
-  for (var i = 0; i < methodNames.length; i++) {
-    obj[methodNames[i]] = jasmine.createSpy(baseName + '.' + methodNames[i]);
-  }
-  return obj;
+jasmine.createSpyObj = function (baseName, methodNames) {
+	if (!jasmine.isArray_(methodNames) || methodNames.length === 0) {
+		throw new Error('createSpyObj requires a non-empty array of method names to create spies for');
+	}
+	var obj = {};
+	for (var i = 0; i < methodNames.length; i++) {
+		obj[methodNames[i]] = jasmine.createSpy(baseName + '.' + methodNames[i]);
+	}
+	return obj;
 };
 
 /**
@@ -430,9 +430,9 @@ jasmine.createSpyObj = function(baseName, methodNames) {
  *
  * Be careful not to leave calls to <code>jasmine.log</code> in production code.
  */
-jasmine.log = function() {
-  var spec = jasmine.getEnv().currentSpec;
-  spec.log.apply(spec, arguments);
+jasmine.log = function () {
+	var spec = jasmine.getEnv().currentSpec;
+	spec.log.apply(spec, arguments);
 };
 
 /**
@@ -450,8 +450,8 @@ jasmine.log = function() {
  * @param methodName
  * @returns a Jasmine spy that can be chained with all spy methods
  */
-var spyOn = function(obj, methodName) {
-  return jasmine.getEnv().currentSpec.spyOn(obj, methodName);
+var spyOn = function (obj, methodName) {
+	return jasmine.getEnv().currentSpec.spyOn(obj, methodName);
 };
 if (isCommonJS) exports.spyOn = spyOn;
 
@@ -468,8 +468,8 @@ if (isCommonJS) exports.spyOn = spyOn;
  * @param {String} desc description of this specification
  * @param {Function} func defines the preconditions and expectations of the spec
  */
-var it = function(desc, func) {
-  return jasmine.getEnv().it(desc, func);
+var it = function (desc, func) {
+	return jasmine.getEnv().it(desc, func);
 };
 if (isCommonJS) exports.it = it;
 
@@ -481,8 +481,8 @@ if (isCommonJS) exports.it = it;
  * @param {String} desc description of this specification
  * @param {Function} func defines the preconditions and expectations of the spec
  */
-var xit = function(desc, func) {
-  return jasmine.getEnv().xit(desc, func);
+var xit = function (desc, func) {
+	return jasmine.getEnv().xit(desc, func);
 };
 if (isCommonJS) exports.xit = xit;
 
@@ -494,8 +494,8 @@ if (isCommonJS) exports.xit = xit;
  *
  * @param {Object} actual Actual value to test against and expected value
  */
-var expect = function(actual) {
-  return jasmine.getEnv().currentSpec.expect(actual);
+var expect = function (actual) {
+	return jasmine.getEnv().currentSpec.expect(actual);
 };
 if (isCommonJS) exports.expect = expect;
 
@@ -504,8 +504,8 @@ if (isCommonJS) exports.expect = expect;
  *
  * @param {Function} func Function that defines part of a jasmine spec.
  */
-var runs = function(func) {
-  jasmine.getEnv().currentSpec.runs(func);
+var runs = function (func) {
+	jasmine.getEnv().currentSpec.runs(func);
 };
 if (isCommonJS) exports.runs = runs;
 
@@ -515,8 +515,8 @@ if (isCommonJS) exports.runs = runs;
  * @deprecated Use waitsFor() instead
  * @param {Number} timeout milliseconds to wait
  */
-var waits = function(timeout) {
-  jasmine.getEnv().currentSpec.waits(timeout);
+var waits = function (timeout) {
+	jasmine.getEnv().currentSpec.waits(timeout);
 };
 if (isCommonJS) exports.waits = waits;
 
@@ -527,8 +527,8 @@ if (isCommonJS) exports.waits = waits;
  * @param {String} optional_timeoutMessage
  * @param {Number} optional_timeout
  */
-var waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) {
-  jasmine.getEnv().currentSpec.waitsFor.apply(jasmine.getEnv().currentSpec, arguments);
+var waitsFor = function (latchFunction, optional_timeoutMessage, optional_timeout) {
+	jasmine.getEnv().currentSpec.waitsFor.apply(jasmine.getEnv().currentSpec, arguments);
 };
 if (isCommonJS) exports.waitsFor = waitsFor;
 
@@ -539,8 +539,8 @@ if (isCommonJS) exports.waitsFor = waitsFor;
  *
  * @param {Function} beforeEachFunction
  */
-var beforeEach = function(beforeEachFunction) {
-  jasmine.getEnv().beforeEach(beforeEachFunction);
+var beforeEach = function (beforeEachFunction) {
+	jasmine.getEnv().beforeEach(beforeEachFunction);
 };
 if (isCommonJS) exports.beforeEach = beforeEach;
 
@@ -551,8 +551,8 @@ if (isCommonJS) exports.beforeEach = beforeEach;
  *
  * @param {Function} afterEachFunction
  */
-var afterEach = function(afterEachFunction) {
-  jasmine.getEnv().afterEach(afterEachFunction);
+var afterEach = function (afterEachFunction) {
+	jasmine.getEnv().afterEach(afterEachFunction);
 };
 if (isCommonJS) exports.afterEach = afterEach;
 
@@ -571,8 +571,8 @@ if (isCommonJS) exports.afterEach = afterEach;
  * @param {String} description A string, usually the class under test.
  * @param {Function} specDefinitions function that defines several specs.
  */
-var describe = function(description, specDefinitions) {
-  return jasmine.getEnv().describe(description, specDefinitions);
+var describe = function (description, specDefinitions) {
+	return jasmine.getEnv().describe(description, specDefinitions);
 };
 if (isCommonJS) exports.describe = describe;
 
@@ -582,38 +582,38 @@ if (isCommonJS) exports.describe = describe;
  * @param {String} description A string, usually the class under test.
  * @param {Function} specDefinitions function that defines several specs.
  */
-var xdescribe = function(description, specDefinitions) {
-  return jasmine.getEnv().xdescribe(description, specDefinitions);
+var xdescribe = function (description, specDefinitions) {
+	return jasmine.getEnv().xdescribe(description, specDefinitions);
 };
 if (isCommonJS) exports.xdescribe = xdescribe;
 
 
 // Provide the XMLHttpRequest class for IE 5.x-6.x:
-jasmine.XmlHttpRequest = (typeof XMLHttpRequest == "undefined") ? function() {
-  function tryIt(f) {
-    try {
-      return f();
-    } catch(e) {
-    }
-    return null;
-  }
-
-  var xhr = tryIt(function() {
-    return new ActiveXObject("Msxml2.XMLHTTP.6.0");
-  }) ||
-    tryIt(function() {
-      return new ActiveXObject("Msxml2.XMLHTTP.3.0");
-    }) ||
-    tryIt(function() {
-      return new ActiveXObject("Msxml2.XMLHTTP");
-    }) ||
-    tryIt(function() {
-      return new ActiveXObject("Microsoft.XMLHTTP");
-    });
-
-  if (!xhr) throw new Error("This browser does not support XMLHttpRequest.");
-
-  return xhr;
+jasmine.XmlHttpRequest = (typeof XMLHttpRequest == "undefined") ? function () {
+	function tryIt(f) {
+		try {
+			return f();
+		} catch (e) {
+		}
+		return null;
+	}
+
+	var xhr = tryIt(function () {
+			return new ActiveXObject("Msxml2.XMLHTTP.6.0");
+		}) ||
+		tryIt(function () {
+			return new ActiveXObject("Msxml2.XMLHTTP.3.0");
+		}) ||
+		tryIt(function () {
+			return new ActiveXObject("Msxml2.XMLHTTP");
+		}) ||
+		tryIt(function () {
+			return new ActiveXObject("Microsoft.XMLHTTP");
+		});
+
+	if (!xhr) throw new Error("This browser does not support XMLHttpRequest.");
+
+	return xhr;
 } : XMLHttpRequest;
 /**
  * @namespace
@@ -627,59 +627,57 @@ jasmine.util = {};
  * @param {Function} childClass
  * @param {Function} parentClass
  */
-jasmine.util.inherit = function(childClass, parentClass) {
-  /**
-   * @private
-   */
-  var subclass = function() {
-  };
-  subclass.prototype = parentClass.prototype;
-  childClass.prototype = new subclass();
+jasmine.util.inherit = function (childClass, parentClass) {
+	/**
+	 * @private
+	 */
+	var subclass = function () {
+	};
+	subclass.prototype = parentClass.prototype;
+	childClass.prototype = new subclass();
 };
 
-jasmine.util.formatException = function(e) {
-  var lineNumber;
-  if (e.line) {
-    lineNumber = e.line;
-  }
-  else if (e.lineNumber) {
-    lineNumber = e.lineNumber;
-  }
+jasmine.util.formatException = function (e) {
+	var lineNumber;
+	if (e.line) {
+		lineNumber = e.line;
+	} else if (e.lineNumber) {
+		lineNumber = e.lineNumber;
+	}
 
-  var file;
+	var file;
 
-  if (e.sourceURL) {
-    file = e.sourceURL;
-  }
-  else if (e.fileName) {
-    file = e.fileName;
-  }
+	if (e.sourceURL) {
+		file = e.sourceURL;
+	} else if (e.fileName) {
+		file = e.fileName;
+	}
 
-  var message = (e.name && e.message) ? (e.name + ': ' + e.message) : e.toString();
+	var message = (e.name && e.message) ? (e.name + ': ' + e.message) : e.toString();
 
-  if (file && lineNumber) {
-    message += ' in ' + file + ' (line ' + lineNumber + ')';
-  }
+	if (file && lineNumber) {
+		message += ' in ' + file + ' (line ' + lineNumber + ')';
+	}
 
-  return message;
+	return message;
 };
 
-jasmine.util.htmlEscape = function(str) {
-  if (!str) return str;
-  return str.replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;');
+jasmine.util.htmlEscape = function (str) {
+	if (!str) return str;
+	return str.replace(/&/g, '&amp;')
+		.replace(/</g, '&lt;')
+		.replace(/>/g, '&gt;');
 };
 
-jasmine.util.argsToArray = function(args) {
-  var arrayOfArgs = [];
-  for (var i = 0; i < args.length; i++) arrayOfArgs.push(args[i]);
-  return arrayOfArgs;
+jasmine.util.argsToArray = function (args) {
+	var arrayOfArgs = [];
+	for (var i = 0; i < args.length; i++) arrayOfArgs.push(args[i]);
+	return arrayOfArgs;
 };
 
-jasmine.util.extend = function(destination, source) {
-  for (var property in source) destination[property] = source[property];
-  return destination;
+jasmine.util.extend = function (destination, source) {
+	for (var property in source) destination[property] = source[property];
+	return destination;
 };
 
 /**
@@ -687,31 +685,31 @@ jasmine.util.extend = function(destination, source) {
  *
  * @constructor
  */
-jasmine.Env = function() {
-  this.currentSpec = null;
-  this.currentSuite = null;
-  this.currentRunner_ = new jasmine.Runner(this);
+jasmine.Env = function () {
+	this.currentSpec = null;
+	this.currentSuite = null;
+	this.currentRunner_ = new jasmine.Runner(this);
 
-  this.reporter = new jasmine.MultiReporter();
+	this.reporter = new jasmine.MultiReporter();
 
-  this.updateInterval = jasmine.DEFAULT_UPDATE_INTERVAL;
-  this.defaultTimeoutInterval = jasmine.DEFAULT_TIMEOUT_INTERVAL;
-  this.lastUpdate = 0;
-  this.specFilter = function() {
-    return true;
-  };
+	this.updateInterval = jasmine.DEFAULT_UPDATE_INTERVAL;
+	this.defaultTimeoutInterval = jasmine.DEFAULT_TIMEOUT_INTERVAL;
+	this.lastUpdate = 0;
+	this.specFilter = function () {
+		return true;
+	};
 
-  this.nextSpecId_ = 0;
-  this.nextSuiteId_ = 0;
-  this.equalityTesters_ = [];
+	this.nextSpecId_ = 0;
+	this.nextSuiteId_ = 0;
+	this.equalityTesters_ = [];
 
-  // wrap matchers
-  this.matchersClass = function() {
-    jasmine.Matchers.apply(this, arguments);
-  };
-  jasmine.util.inherit(this.matchersClass, jasmine.Matchers);
+	// wrap matchers
+	this.matchersClass = function () {
+		jasmine.Matchers.apply(this, arguments);
+	};
+	jasmine.util.inherit(this.matchersClass, jasmine.Matchers);
 
-  jasmine.Matchers.wrapInto_(jasmine.Matchers.prototype, this.matchersClass);
+	jasmine.Matchers.wrapInto_(jasmine.Matchers.prototype, this.matchersClass);
 };
 
 
@@ -724,262 +722,262 @@ jasmine.Env.prototype.clearInterval = jasmine.clearInterval;
  * @returns an object containing jasmine version build info, if set.
  */
 jasmine.Env.prototype.version = function () {
-  if (jasmine.version_) {
-    return jasmine.version_;
-  } else {
-    throw new Error('Version not set');
-  }
+	if (jasmine.version_) {
+		return jasmine.version_;
+	} else {
+		throw new Error('Version not set');
+	}
 };
 
 /**
  * @returns string containing jasmine version build info, if set.
  */
-jasmine.Env.prototype.versionString = function() {
-  if (!jasmine.version_) {
-    return "version unknown";
-  }
+jasmine.Env.prototype.versionString = function () {
+	if (!jasmine.version_) {
+		return "version unknown";
+	}
 
-  var version = this.version();
-  var versionString = version.major + "." + version.minor + "." + version.build;
-  if (version.release_candidate) {
-    versionString += ".rc" + version.release_candidate
-  }
-  versionString += " revision " + version.revision;
-  return versionString;
+	var version = this.version();
+	var versionString = version.major + "." + version.minor + "." + version.build;
+	if (version.release_candidate) {
+		versionString += ".rc" + version.release_candidate
+	}
+	versionString += " revision " + version.revision;
+	return versionString;
 };
 
 /**
  * @returns a sequential integer starting at 0
  */
 jasmine.Env.prototype.nextSpecId = function () {
-  return this.nextSpecId_++;
+	return this.nextSpecId_++;
 };
 
 /**
  * @returns a sequential integer starting at 0
  */
 jasmine.Env.prototype.nextSuiteId = function () {
-  return this.nextSuiteId_++;
+	return this.nextSuiteId_++;
 };
 
 /**
  * Register a reporter to receive status updates from Jasmine.
  * @param {jasmine.Reporter} reporter An object which will receive status updates.
  */
-jasmine.Env.prototype.addReporter = function(reporter) {
-  this.reporter.addReporter(reporter);
+jasmine.Env.prototype.addReporter = function (reporter) {
+	this.reporter.addReporter(reporter);
 };
 
-jasmine.Env.prototype.execute = function() {
-  this.currentRunner_.execute();
+jasmine.Env.prototype.execute = function () {
+	this.currentRunner_.execute();
 };
 
-jasmine.Env.prototype.describe = function(description, specDefinitions) {
-  var suite = new jasmine.Suite(this, description, specDefinitions, this.currentSuite);
+jasmine.Env.prototype.describe = function (description, specDefinitions) {
+	var suite = new jasmine.Suite(this, description, specDefinitions, this.currentSuite);
 
-  var parentSuite = this.currentSuite;
-  if (parentSuite) {
-    parentSuite.add(suite);
-  } else {
-    this.currentRunner_.add(suite);
-  }
+	var parentSuite = this.currentSuite;
+	if (parentSuite) {
+		parentSuite.add(suite);
+	} else {
+		this.currentRunner_.add(suite);
+	}
 
-  this.currentSuite = suite;
+	this.currentSuite = suite;
 
-  var declarationError = null;
-  try {
-    specDefinitions.call(suite);
-  } catch(e) {
-    declarationError = e;
-  }
+	var declarationError = null;
+	try {
+		specDefinitions.call(suite);
+	} catch (e) {
+		declarationError = e;
+	}
 
-  if (declarationError) {
-    this.it("encountered a declaration exception", function() {
-      throw declarationError;
-    });
-  }
+	if (declarationError) {
+		this.it("encountered a declaration exception", function () {
+			throw declarationError;
+		});
+	}
 
-  this.currentSuite = parentSuite;
+	this.currentSuite = parentSuite;
 
-  return suite;
+	return suite;
 };
 
-jasmine.Env.prototype.beforeEach = function(beforeEachFunction) {
-  if (this.currentSuite) {
-    this.currentSuite.beforeEach(beforeEachFunction);
-  } else {
-    this.currentRunner_.beforeEach(beforeEachFunction);
-  }
+jasmine.Env.prototype.beforeEach = function (beforeEachFunction) {
+	if (this.currentSuite) {
+		this.currentSuite.beforeEach(beforeEachFunction);
+	} else {
+		this.currentRunner_.beforeEach(beforeEachFunction);
+	}
 };
 
 jasmine.Env.prototype.currentRunner = function () {
-  return this.currentRunner_;
+	return this.currentRunner_;
 };
 
-jasmine.Env.prototype.afterEach = function(afterEachFunction) {
-  if (this.currentSuite) {
-    this.currentSuite.afterEach(afterEachFunction);
-  } else {
-    this.currentRunner_.afterEach(afterEachFunction);
-  }
+jasmine.Env.prototype.afterEach = function (afterEachFunction) {
+	if (this.currentSuite) {
+		this.currentSuite.afterEach(afterEachFunction);
+	} else {
+		this.currentRunner_.afterEach(afterEachFunction);
+	}
 
 };
 
-jasmine.Env.prototype.xdescribe = function(desc, specDefinitions) {
-  return {
-    execute: function() {
-    }
-  };
+jasmine.Env.prototype.xdescribe = function (desc, specDefinitions) {
+	return {
+		execute: function () {
+		}
+	};
 };
 
-jasmine.Env.prototype.it = function(description, func) {
-  var spec = new jasmine.Spec(this, this.currentSuite, description);
-  this.currentSuite.add(spec);
-  this.currentSpec = spec;
+jasmine.Env.prototype.it = function (description, func) {
+	var spec = new jasmine.Spec(this, this.currentSuite, description);
+	this.currentSuite.add(spec);
+	this.currentSpec = spec;
 
-  if (func) {
-    spec.runs(func);
-  }
+	if (func) {
+		spec.runs(func);
+	}
 
-  return spec;
+	return spec;
 };
 
-jasmine.Env.prototype.xit = function(desc, func) {
-  return {
-    id: this.nextSpecId(),
-    runs: function() {
-    }
-  };
+jasmine.Env.prototype.xit = function (desc, func) {
+	return {
+		id: this.nextSpecId(),
+		runs: function () {
+		}
+	};
 };
 
-jasmine.Env.prototype.compareObjects_ = function(a, b, mismatchKeys, mismatchValues) {
-  if (a.__Jasmine_been_here_before__ === b && b.__Jasmine_been_here_before__ === a) {
-    return true;
-  }
+jasmine.Env.prototype.compareObjects_ = function (a, b, mismatchKeys, mismatchValues) {
+	if (a.__Jasmine_been_here_before__ === b && b.__Jasmine_been_here_before__ === a) {
+		return true;
+	}
 
-  a.__Jasmine_been_here_before__ = b;
-  b.__Jasmine_been_here_before__ = a;
+	a.__Jasmine_been_here_before__ = b;
+	b.__Jasmine_been_here_before__ = a;
 
-  var hasKey = function(obj, keyName) {
-    return obj !== null && obj[keyName] !== jasmine.undefined;
-  };
+	var hasKey = function (obj, keyName) {
+		return obj !== null && obj[keyName] !== jasmine.undefined;
+	};
 
-  for (var property in b) {
-    if (!hasKey(a, property) && hasKey(b, property)) {
-      mismatchKeys.push("expected has key '" + property + "', but missing from actual.");
-    }
-  }
-  for (property in a) {
-    if (!hasKey(b, property) && hasKey(a, property)) {
-      mismatchKeys.push("expected missing key '" + property + "', but present in actual.");
-    }
-  }
-  for (property in b) {
-    if (property == '__Jasmine_been_here_before__') continue;
-    if (!this.equals_(a[property], b[property], mismatchKeys, mismatchValues)) {
-      mismatchValues.push("'" + property + "' was '" + (b[property] ? jasmine.util.htmlEscape(b[property].toString()) : b[property]) + "' in expected, but was '" + (a[property] ? jasmine.util.htmlEscape(a[property].toString()) : a[property]) + "' in actual.");
-    }
-  }
+	for (var property in b) {
+		if (!hasKey(a, property) && hasKey(b, property)) {
+			mismatchKeys.push("expected has key '" + property + "', but missing from actual.");
+		}
+	}
+	for (property in a) {
+		if (!hasKey(b, property) && hasKey(a, property)) {
+			mismatchKeys.push("expected missing key '" + property + "', but present in actual.");
+		}
+	}
+	for (property in b) {
+		if (property == '__Jasmine_been_here_before__') continue;
+		if (!this.equals_(a[property], b[property], mismatchKeys, mismatchValues)) {
+			mismatchValues.push("'" + property + "' was '" + (b[property] ? jasmine.util.htmlEscape(b[property].toString()) : b[property]) + "' in expected, but was '" + (a[property] ? jasmine.util.htmlEscape(a[property].toString()) : a[property]) + "' in actual.");
+		}
+	}
 
-  if (jasmine.isArray_(a) && jasmine.isArray_(b) && a.length != b.length) {
-    mismatchValues.push("arrays were not the same length");
-  }
+	if (jasmine.isArray_(a) && jasmine.isArray_(b) && a.length != b.length) {
+		mismatchValues.push("arrays were not the same length");
+	}
 
-  delete a.__Jasmine_been_here_before__;
-  delete b.__Jasmine_been_here_before__;
-  return (mismatchKeys.length === 0 && mismatchValues.length === 0);
+	delete a.__Jasmine_been_here_before__;
+	delete b.__Jasmine_been_here_before__;
+	return (mismatchKeys.length === 0 && mismatchValues.length === 0);
 };
 
-jasmine.Env.prototype.equals_ = function(a, b, mismatchKeys, mismatchValues) {
-  mismatchKeys = mismatchKeys || [];
-  mismatchValues = mismatchValues || [];
+jasmine.Env.prototype.equals_ = function (a, b, mismatchKeys, mismatchValues) {
+	mismatchKeys = mismatchKeys || [];
+	mismatchValues = mismatchValues || [];
 
-  for (var i = 0; i < this.equalityTesters_.length; i++) {
-    var equalityTester = this.equalityTesters_[i];
-    var result = equalityTester(a, b, this, mismatchKeys, mismatchValues);
-    if (result !== jasmine.undefined) return result;
-  }
+	for (var i = 0; i < this.equalityTesters_.length; i++) {
+		var equalityTester = this.equalityTesters_[i];
+		var result = equalityTester(a, b, this, mismatchKeys, mismatchValues);
+		if (result !== jasmine.undefined) return result;
+	}
 
-  if (a === b) return true;
+	if (a === b) return true;
 
-  if (a === jasmine.undefined || a === null || b === jasmine.undefined || b === null) {
-    return (a == jasmine.undefined && b == jasmine.undefined);
-  }
+	if (a === jasmine.undefined || a === null || b === jasmine.undefined || b === null) {
+		return (a == jasmine.undefined && b == jasmine.undefined);
+	}
 
-  if (jasmine.isDomNode(a) && jasmine.isDomNode(b)) {
-    return a === b;
-  }
+	if (jasmine.isDomNode(a) && jasmine.isDomNode(b)) {
+		return a === b;
+	}
 
-  if (a instanceof Date && b instanceof Date) {
-    return a.getTime() == b.getTime();
-  }
+	if (a instanceof Date && b instanceof Date) {
+		return a.getTime() == b.getTime();
+	}
 
-  if (a instanceof jasmine.Matchers.Any) {
-    return a.matches(b);
-  }
+	if (a instanceof jasmine.Matchers.Any) {
+		return a.matches(b);
+	}
 
-  if (b instanceof jasmine.Matchers.Any) {
-    return b.matches(a);
-  }
+	if (b instanceof jasmine.Matchers.Any) {
+		return b.matches(a);
+	}
 
-  if (jasmine.isString_(a) && jasmine.isString_(b)) {
-    return (a == b);
-  }
+	if (jasmine.isString_(a) && jasmine.isString_(b)) {
+		return (a == b);
+	}
 
-  if (jasmine.isNumber_(a) && jasmine.isNumber_(b)) {
-    return (a == b);
-  }
+	if (jasmine.isNumber_(a) && jasmine.isNumber_(b)) {
+		return (a == b);
+	}
 
-  if (typeof a === "object" && typeof b === "object") {
-    return this.compareObjects_(a, b, mismatchKeys, mismatchValues);
-  }
+	if (typeof a === "object" && typeof b === "object") {
+		return this.compareObjects_(a, b, mismatchKeys, mismatchValues);
+	}
 
-  //Straight check
-  return (a === b);
+	//Straight check
+	return (a === b);
 };
 
-jasmine.Env.prototype.contains_ = function(haystack, needle) {
-  if (jasmine.isArray_(haystack)) {
-    for (var i = 0; i < haystack.length; i++) {
-      if (this.equals_(haystack[i], needle)) return true;
-    }
-    return false;
-  }
-  return haystack.indexOf(needle) >= 0;
-};
-
-jasmine.Env.prototype.addEqualityTester = function(equalityTester) {
-  this.equalityTesters_.push(equalityTester);
+jasmine.Env.prototype.contains_ = function (haystack, needle) {
+	if (jasmine.isArray_(haystack)) {
+		for (var i = 0; i < haystack.length; i++) {
+			if (this.equals_(haystack[i], needle)) return true;
+		}
+		return false;
+	}
+	return haystack.indexOf(needle) >= 0;
+};
+
+jasmine.Env.prototype.addEqualityTester = function (equalityTester) {
+	this.equalityTesters_.push(equalityTester);
 };
 /** No-op base class for Jasmine reporters.
  *
  * @constructor
  */
-jasmine.Reporter = function() {
+jasmine.Reporter = function () {
 };
 
 //noinspection JSUnusedLocalSymbols
-jasmine.Reporter.prototype.reportRunnerStarting = function(runner) {
+jasmine.Reporter.prototype.reportRunnerStarting = function (runner) {
 };
 
 //noinspection JSUnusedLocalSymbols
-jasmine.Reporter.prototype.reportRunnerResults = function(runner) {
+jasmine.Reporter.prototype.reportRunnerResults = function (runner) {
 };
 
 //noinspection JSUnusedLocalSymbols
-jasmine.Reporter.prototype.reportSuiteResults = function(suite) {
+jasmine.Reporter.prototype.reportSuiteResults = function (suite) {
 };
 
 //noinspection JSUnusedLocalSymbols
-jasmine.Reporter.prototype.reportSpecStarting = function(spec) {
+jasmine.Reporter.prototype.reportSpecStarting = function (spec) {
 };
 
 //noinspection JSUnusedLocalSymbols
-jasmine.Reporter.prototype.reportSpecResults = function(spec) {
+jasmine.Reporter.prototype.reportSpecResults = function (spec) {
 };
 
 //noinspection JSUnusedLocalSymbols
-jasmine.Reporter.prototype.log = function(str) {
+jasmine.Reporter.prototype.log = function (str) {
 };
 
 /**
@@ -990,120 +988,120 @@ jasmine.Reporter.prototype.log = function(str) {
  * @param {Function} func
  * @param {jasmine.Spec} spec
  */
-jasmine.Block = function(env, func, spec) {
-  this.env = env;
-  this.func = func;
-  this.spec = spec;
+jasmine.Block = function (env, func, spec) {
+	this.env = env;
+	this.func = func;
+	this.spec = spec;
 };
 
-jasmine.Block.prototype.execute = function(onComplete) {  
-  try {
-    this.func.apply(this.spec);
-  } catch (e) {
-    this.spec.fail(e);
-  }
-  onComplete();
+jasmine.Block.prototype.execute = function (onComplete) {
+	try {
+		this.func.apply(this.spec);
+	} catch (e) {
+		this.spec.fail(e);
+	}
+	onComplete();
 };
 /** JavaScript API reporter.
  *
  * @constructor
  */
-jasmine.JsApiReporter = function() {
-  this.started = false;
-  this.finished = false;
-  this.suites_ = [];
-  this.results_ = {};
+jasmine.JsApiReporter = function () {
+	this.started = false;
+	this.finished = false;
+	this.suites_ = [];
+	this.results_ = {};
 };
 
-jasmine.JsApiReporter.prototype.reportRunnerStarting = function(runner) {
-  this.started = true;
-  var suites = runner.topLevelSuites();
-  for (var i = 0; i < suites.length; i++) {
-    var suite = suites[i];
-    this.suites_.push(this.summarize_(suite));
-  }
+jasmine.JsApiReporter.prototype.reportRunnerStarting = function (runner) {
+	this.started = true;
+	var suites = runner.topLevelSuites();
+	for (var i = 0; i < suites.length; i++) {
+		var suite = suites[i];
+		this.suites_.push(this.summarize_(suite));
+	}
 };
 
-jasmine.JsApiReporter.prototype.suites = function() {
-  return this.suites_;
+jasmine.JsApiReporter.prototype.suites = function () {
+	return this.suites_;
 };
 
-jasmine.JsApiReporter.prototype.summarize_ = function(suiteOrSpec) {
-  var isSuite = suiteOrSpec instanceof jasmine.Suite;
-  var summary = {
-    id: suiteOrSpec.id,
-    name: suiteOrSpec.description,
-    type: isSuite ? 'suite' : 'spec',
-    children: []
-  };
-  
-  if (isSuite) {
-    var children = suiteOrSpec.children();
-    for (var i = 0; i < children.length; i++) {
-      summary.children.push(this.summarize_(children[i]));
-    }
-  }
-  return summary;
+jasmine.JsApiReporter.prototype.summarize_ = function (suiteOrSpec) {
+	var isSuite = suiteOrSpec instanceof jasmine.Suite;
+	var summary = {
+		id: suiteOrSpec.id,
+		name: suiteOrSpec.description,
+		type: isSuite ? 'suite' : 'spec',
+		children: []
+	};
+
+	if (isSuite) {
+		var children = suiteOrSpec.children();
+		for (var i = 0; i < children.length; i++) {
+			summary.children.push(this.summarize_(children[i]));
+		}
+	}
+	return summary;
 };
 
-jasmine.JsApiReporter.prototype.results = function() {
-  return this.results_;
+jasmine.JsApiReporter.prototype.results = function () {
+	return this.results_;
 };
 
-jasmine.JsApiReporter.prototype.resultsForSpec = function(specId) {
-  return this.results_[specId];
+jasmine.JsApiReporter.prototype.resultsForSpec = function (specId) {
+	return this.results_[specId];
 };
 
 //noinspection JSUnusedLocalSymbols
-jasmine.JsApiReporter.prototype.reportRunnerResults = function(runner) {
-  this.finished = true;
+jasmine.JsApiReporter.prototype.reportRunnerResults = function (runner) {
+	this.finished = true;
 };
 
 //noinspection JSUnusedLocalSymbols
-jasmine.JsApiReporter.prototype.reportSuiteResults = function(suite) {
+jasmine.JsApiReporter.prototype.reportSuiteResults = function (suite) {
 };
 
 //noinspection JSUnusedLocalSymbols
-jasmine.JsApiReporter.prototype.reportSpecResults = function(spec) {
-  this.results_[spec.id] = {
-    messages: spec.results().getItems(),
-    result: spec.results().failedCount > 0 ? "failed" : "passed"
-  };
+jasmine.JsApiReporter.prototype.reportSpecResults = function (spec) {
+	this.results_[spec.id] = {
+		messages: spec.results().getItems(),
+		result: spec.results().failedCount > 0 ? "failed" : "passed"
+	};
 };
 
 //noinspection JSUnusedLocalSymbols
-jasmine.JsApiReporter.prototype.log = function(str) {
+jasmine.JsApiReporter.prototype.log = function (str) {
 };
 
-jasmine.JsApiReporter.prototype.resultsForSpecs = function(specIds){
-  var results = {};
-  for (var i = 0; i < specIds.length; i++) {
-    var specId = specIds[i];
-    results[specId] = this.summarizeResult_(this.results_[specId]);
-  }
-  return results;
+jasmine.JsApiReporter.prototype.resultsForSpecs = function (specIds) {
+	var results = {};
+	for (var i = 0; i < specIds.length; i++) {
+		var specId = specIds[i];
+		results[specId] = this.summarizeResult_(this.results_[specId]);
+	}
+	return results;
 };
 
-jasmine.JsApiReporter.prototype.summarizeResult_ = function(result){
-  var summaryMessages = [];
-  var messagesLength = result.messages.length;
-  for (var messageIndex = 0; messageIndex < messagesLength; messageIndex++) {
-    var resultMessage = result.messages[messageIndex];
-    summaryMessages.push({
-      text: resultMessage.type == 'log' ? resultMessage.toString() : jasmine.undefined,
-      passed: resultMessage.passed ? resultMessage.passed() : true,
-      type: resultMessage.type,
-      message: resultMessage.message,
-      trace: {
-        stack: resultMessage.passed && !resultMessage.passed() ? resultMessage.trace.stack : jasmine.undefined
-      }
-    });
-  }
+jasmine.JsApiReporter.prototype.summarizeResult_ = function (result) {
+	var summaryMessages = [];
+	var messagesLength = result.messages.length;
+	for (var messageIndex = 0; messageIndex < messagesLength; messageIndex++) {
+		var resultMessage = result.messages[messageIndex];
+		summaryMessages.push({
+			text: resultMessage.type == 'log' ? resultMessage.toString() : jasmine.undefined,
+			passed: resultMessage.passed ? resultMessage.passed() : true,
+			type: resultMessage.type,
+			message: resultMessage.message,
+			trace: {
+				stack: resultMessage.passed && !resultMessage.passed() ? resultMessage.trace.stack : jasmine.undefined
+			}
+		});
+	}
 
-  return {
-    result : result.result,
-    messages : summaryMessages
-  };
+	return {
+		result: result.result,
+		messages: summaryMessages
+	};
 };
 
 /**
@@ -1112,83 +1110,83 @@ jasmine.JsApiReporter.prototype.summarizeResult_ = function(result){
  * @param actual
  * @param {jasmine.Spec} spec
  */
-jasmine.Matchers = function(env, actual, spec, opt_isNot) {
-  this.env = env;
-  this.actual = actual;
-  this.spec = spec;
-  this.isNot = opt_isNot || false;
-  this.reportWasCalled_ = false;
+jasmine.Matchers = function (env, actual, spec, opt_isNot) {
+	this.env = env;
+	this.actual = actual;
+	this.spec = spec;
+	this.isNot = opt_isNot || false;
+	this.reportWasCalled_ = false;
 };
 
 // todo: @deprecated as of Jasmine 0.11, remove soon [xw]
-jasmine.Matchers.pp = function(str) {
-  throw new Error("jasmine.Matchers.pp() is no longer supported, please use jasmine.pp() instead!");
+jasmine.Matchers.pp = function (str) {
+	throw new Error("jasmine.Matchers.pp() is no longer supported, please use jasmine.pp() instead!");
 };
 
 // todo: @deprecated Deprecated as of Jasmine 0.10. Rewrite your custom matchers to return true or false. [xw]
-jasmine.Matchers.prototype.report = function(result, failing_message, details) {
-  throw new Error("As of jasmine 0.11, custom matchers must be implemented differently -- please see jasmine docs");
-};
-
-jasmine.Matchers.wrapInto_ = function(prototype, matchersClass) {
-  for (var methodName in prototype) {
-    if (methodName == 'report') continue;
-    var orig = prototype[methodName];
-    matchersClass.prototype[methodName] = jasmine.Matchers.matcherFn_(methodName, orig);
-  }
-};
-
-jasmine.Matchers.matcherFn_ = function(matcherName, matcherFunction) {
-  return function() {
-    var matcherArgs = jasmine.util.argsToArray(arguments);
-    var result = matcherFunction.apply(this, arguments);
-
-    if (this.isNot) {
-      result = !result;
-    }
-
-    if (this.reportWasCalled_) return result;
-
-    var message;
-    if (!result) {
-      if (this.message) {
-        message = this.message.apply(this, arguments);
-        if (jasmine.isArray_(message)) {
-          message = message[this.isNot ? 1 : 0];
-        }
-      } else {
-        var englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { return ' ' + s.toLowerCase(); });
-        message = "Expected " + jasmine.pp(this.actual) + (this.isNot ? " not " : " ") + englishyPredicate;
-        if (matcherArgs.length > 0) {
-          for (var i = 0; i < matcherArgs.length; i++) {
-            if (i > 0) message += ",";
-            message += " " + jasmine.pp(matcherArgs[i]);
-          }
-        }
-        message += ".";
-      }
-    }
-    var expectationResult = new jasmine.ExpectationResult({
-      matcherName: matcherName,
-      passed: result,
-      expected: matcherArgs.length > 1 ? matcherArgs : matcherArgs[0],
-      actual: this.actual,
-      message: message
-    });
-    this.spec.addMatcherResult(expectationResult);
-    return jasmine.undefined;
-  };
+jasmine.Matchers.prototype.report = function (result, failing_message, details) {
+	throw new Error("As of jasmine 0.11, custom matchers must be implemented differently -- please see jasmine docs");
+};
+
+jasmine.Matchers.wrapInto_ = function (prototype, matchersClass) {
+	for (var methodName in prototype) {
+		if (methodName == 'report') continue;
+		var orig = prototype[methodName];
+		matchersClass.prototype[methodName] = jasmine.Matchers.matcherFn_(methodName, orig);
+	}
+};
+
+jasmine.Matchers.matcherFn_ = function (matcherName, matcherFunction) {
+	return function () {
+		var matcherArgs = jasmine.util.argsToArray(arguments);
+		var result = matcherFunction.apply(this, arguments);
+
+		if (this.isNot) {
+			result = !result;
+		}
+
+		if (this.reportWasCalled_) return result;
+
+		var message;
+		if (!result) {
+			if (this.message) {
+				message = this.message.apply(this, arguments);
+				if (jasmine.isArray_(message)) {
+					message = message[this.isNot ? 1 : 0];
+				}
+			} else {
+				var englishyPredicate = matcherName.replace(/[A-Z]/g, function (s) {
+					return ' ' + s.toLowerCase();
+				});
+				message = "Expected " + jasmine.pp(this.actual) + (this.isNot ? " not " : " ") + englishyPredicate;
+				if (matcherArgs.length > 0) {
+					for (var i = 0; i < matcherArgs.length; i++) {
+						if (i > 0) message += ",";
+						message += " " + jasmine.pp(matcherArgs[i]);
+					}
+				}
+				message += ".";
+			}
+		}
+		var expectationResult = new jasmine.ExpectationResult({
+			matcherName: matcherName,
+			passed: result,
+			expected: matcherArgs.length > 1 ? matcherArgs : matcherArgs[0],
+			actual: this.actual,
+			message: message
+		});
+		this.spec.addMatcherResult(expectationResult);
+		return jasmine.undefined;
+	};
 };
 
 
-
-
 /**
  * toBe: compares the actual to the expected using ===
  * @param expected
  */
-jasmine.Matchers.prototype.toBe = function(expected) {
-  return this.actual === expected;
+jasmine.Matchers.prototype.toBe = function (expected) {
+	return this.actual === expected;
 };
 
 /**
@@ -1196,8 +1194,8 @@ jasmine.Matchers.prototype.toBe = function(expected) {
  * @param expected
  * @deprecated as of 1.0. Use not.toBe() instead.
  */
-jasmine.Matchers.prototype.toNotBe = function(expected) {
-  return this.actual !== expected;
+jasmine.Matchers.prototype.toNotBe = function (expected) {
+	return this.actual !== expected;
 };
 
 /**
@@ -1205,8 +1203,8 @@ jasmine.Matchers.prototype.toNotBe = function(expected) {
  *
  * @param expected
  */
-jasmine.Matchers.prototype.toEqual = function(expected) {
-  return this.env.equals_(this.actual, expected);
+jasmine.Matchers.prototype.toEqual = function (expected) {
+	return this.env.equals_(this.actual, expected);
 };
 
 /**
@@ -1214,8 +1212,8 @@ jasmine.Matchers.prototype.toEqual = function(expected) {
  * @param expected
  * @deprecated as of 1.0. Use not.toNotEqual() instead.
  */
-jasmine.Matchers.prototype.toNotEqual = function(expected) {
-  return !this.env.equals_(this.actual, expected);
+jasmine.Matchers.prototype.toNotEqual = function (expected) {
+	return !this.env.equals_(this.actual, expected);
 };
 
 /**
@@ -1224,8 +1222,8 @@ jasmine.Matchers.prototype.toNotEqual = function(expected) {
  *
  * @param expected
  */
-jasmine.Matchers.prototype.toMatch = function(expected) {
-  return new RegExp(expected).test(this.actual);
+jasmine.Matchers.prototype.toMatch = function (expected) {
+	return new RegExp(expected).test(this.actual);
 };
 
 /**
@@ -1233,67 +1231,67 @@ jasmine.Matchers.prototype.toMatch = function(expected) {
  * @param expected
  * @deprecated as of 1.0. Use not.toMatch() instead.
  */
-jasmine.Matchers.prototype.toNotMatch = function(expected) {
-  return !(new RegExp(expected).test(this.actual));
+jasmine.Matchers.prototype.toNotMatch = function (expected) {
+	return !(new RegExp(expected).test(this.actual));
 };
 
 /**
  * Matcher that compares the actual to jasmine.undefined.
  */
-jasmine.Matchers.prototype.toBeDefined = function() {
-  return (this.actual !== jasmine.undefined);
+jasmine.Matchers.prototype.toBeDefined = function () {
+	return (this.actual !== jasmine.undefined);
 };
 
 /**
  * Matcher that compares the actual to jasmine.undefined.
  */
-jasmine.Matchers.prototype.toBeUndefined = function() {
-  return (this.actual === jasmine.undefined);
+jasmine.Matchers.prototype.toBeUndefined = function () {
+	return (this.actual === jasmine.undefined);
 };
 
 /**
  * Matcher that compares the actual to null.
  */
-jasmine.Matchers.prototype.toBeNull = function() {
-  return (this.actual === null);
+jasmine.Matchers.prototype.toBeNull = function () {
+	return (this.actual === null);
 };
 
 /**
  * Matcher that boolean not-nots the actual.
  */
-jasmine.Matchers.prototype.toBeTruthy = function() {
-  return !!this.actual;
+jasmine.Matchers.prototype.toBeTruthy = function () {
+	return !!this.actual;
 };
 
 
 /**
  * Matcher that boolean nots the actual.
  */
-jasmine.Matchers.prototype.toBeFalsy = function() {
-  return !this.actual;
+jasmine.Matchers.prototype.toBeFalsy = function () {
+	return !this.actual;
 };
 
 
 /**
  * Matcher that checks to see if the actual, a Jasmine spy, was called.
  */
-jasmine.Matchers.prototype.toHaveBeenCalled = function() {
-  if (arguments.length > 0) {
-    throw new Error('toHaveBeenCalled does not take arguments, use toHaveBeenCalledWith');
-  }
+jasmine.Matchers.prototype.toHaveBeenCalled = function () {
+	if (arguments.length > 0) {
+		throw new Error('toHaveBeenCalled does not take arguments, use toHaveBeenCalledWith');
+	}
 
-  if (!jasmine.isSpy(this.actual)) {
-    throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
-  }
+	if (!jasmine.isSpy(this.actual)) {
+		throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
+	}
 
-  this.message = function() {
-    return [
-      "Expected spy " + this.actual.identity + " to have been called.",
-      "Expected spy " + this.actual.identity + " not to have been called."
-    ];
-  };
+	this.message = function () {
+		return [
+			"Expected spy " + this.actual.identity + " to have been called.",
+			"Expected spy " + this.actual.identity + " not to have been called."
+		];
+	};
 
-  return this.actual.wasCalled;
+	return this.actual.wasCalled;
 };
 
 /** @deprecated Use expect(xxx).toHaveBeenCalled() instead */
@@ -1304,23 +1302,23 @@ jasmine.Matchers.prototype.wasCalled = jasmine.Matchers.prototype.toHaveBeenCall
  *
  * @deprecated Use expect(xxx).not.toHaveBeenCalled() instead
  */
-jasmine.Matchers.prototype.wasNotCalled = function() {
-  if (arguments.length > 0) {
-    throw new Error('wasNotCalled does not take arguments');
-  }
+jasmine.Matchers.prototype.wasNotCalled = function () {
+	if (arguments.length > 0) {
+		throw new Error('wasNotCalled does not take arguments');
+	}
 
-  if (!jasmine.isSpy(this.actual)) {
-    throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
-  }
+	if (!jasmine.isSpy(this.actual)) {
+		throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
+	}
 
-  this.message = function() {
-    return [
-      "Expected spy " + this.actual.identity + " to not have been called.",
-      "Expected spy " + this.actual.identity + " to have been called."
-    ];
-  };
+	this.message = function () {
+		return [
+			"Expected spy " + this.actual.identity + " to not have been called.",
+			"Expected spy " + this.actual.identity + " to have been called."
+		];
+	};
 
-  return !this.actual.wasCalled;
+	return !this.actual.wasCalled;
 };
 
 /**
@@ -1329,47 +1327,47 @@ jasmine.Matchers.prototype.wasNotCalled = function() {
  * @example
  *
  */
-jasmine.Matchers.prototype.toHaveBeenCalledWith = function() {
-  var expectedArgs = jasmine.util.argsToArray(arguments);
-  if (!jasmine.isSpy(this.actual)) {
-    throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
-  }
-  this.message = function() {
-    if (this.actual.callCount === 0) {
-      // todo: what should the failure message for .not.toHaveBeenCalledWith() be? is this right? test better. [xw]
-      return [
-        "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but it was never called.",
-        "Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but it was."
-      ];
-    } else {
-      return [
-        "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall),
-        "Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall)
-      ];
-    }
-  };
-
-  return this.env.contains_(this.actual.argsForCall, expectedArgs);
+jasmine.Matchers.prototype.toHaveBeenCalledWith = function () {
+	var expectedArgs = jasmine.util.argsToArray(arguments);
+	if (!jasmine.isSpy(this.actual)) {
+		throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
+	}
+	this.message = function () {
+		if (this.actual.callCount === 0) {
+			// todo: what should the failure message for .not.toHaveBeenCalledWith() be? is this right? test better. [xw]
+			return [
+				"Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but it was never called.",
+				"Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but it was."
+			];
+		} else {
+			return [
+				"Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall),
+				"Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall)
+			];
+		}
+	};
+
+	return this.env.contains_(this.actual.argsForCall, expectedArgs);
 };
 
 /** @deprecated Use expect(xxx).toHaveBeenCalledWith() instead */
 jasmine.Matchers.prototype.wasCalledWith = jasmine.Matchers.prototype.toHaveBeenCalledWith;
 
 /** @deprecated Use expect(xxx).not.toHaveBeenCalledWith() instead */
-jasmine.Matchers.prototype.wasNotCalledWith = function() {
-  var expectedArgs = jasmine.util.argsToArray(arguments);
-  if (!jasmine.isSpy(this.actual)) {
-    throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
-  }
+jasmine.Matchers.prototype.wasNotCalledWith = function () {
+	var expectedArgs = jasmine.util.argsToArray(arguments);
+	if (!jasmine.isSpy(this.actual)) {
+		throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.');
+	}
 
-  this.message = function() {
-    return [
-      "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was",
-      "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was"
-    ];
-  };
+	this.message = function () {
+		return [
+			"Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was",
+			"Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was"
+		];
+	};
 
-  return !this.env.contains_(this.actual.argsForCall, expectedArgs);
+	return !this.env.contains_(this.actual.argsForCall, expectedArgs);
 };
 
 /**
@@ -1377,8 +1375,8 @@ jasmine.Matchers.prototype.wasNotCalledWith = function() {
  *
  * @param {Object} expected
  */
-jasmine.Matchers.prototype.toContain = function(expected) {
-  return this.env.contains_(this.actual, expected);
+jasmine.Matchers.prototype.toContain = function (expected) {
+	return this.env.contains_(this.actual, expected);
 };
 
 /**
@@ -1387,16 +1385,16 @@ jasmine.Matchers.prototype.toContain = function(expected) {
  * @param {Object} expected
  * @deprecated as of 1.0. Use not.toNotContain() instead.
  */
-jasmine.Matchers.prototype.toNotContain = function(expected) {
-  return !this.env.contains_(this.actual, expected);
+jasmine.Matchers.prototype.toNotContain = function (expected) {
+	return !this.env.contains_(this.actual, expected);
 };
 
-jasmine.Matchers.prototype.toBeLessThan = function(expected) {
-  return this.actual < expected;
+jasmine.Matchers.prototype.toBeLessThan = function (expected) {
+	return this.actual < expected;
 };
 
-jasmine.Matchers.prototype.toBeGreaterThan = function(expected) {
-  return this.actual > expected;
+jasmine.Matchers.prototype.toBeGreaterThan = function (expected) {
+	return this.actual > expected;
 };
 
 /**
@@ -1406,14 +1404,14 @@ jasmine.Matchers.prototype.toBeGreaterThan = function(expected) {
  * @param {Number} expected
  * @param {Number} precision
  */
-jasmine.Matchers.prototype.toBeCloseTo = function(expected, precision) {
-  if (!(precision === 0)) {
-    precision = precision || 2;
-  }
-  var multiplier = Math.pow(10, precision);
-  var actual = Math.round(this.actual * multiplier);
-  expected = Math.round(expected * multiplier);
-  return expected == actual;
+jasmine.Matchers.prototype.toBeCloseTo = function (expected, precision) {
+	if (!(precision === 0)) {
+		precision = precision || 2;
+	}
+	var multiplier = Math.pow(10, precision);
+	var actual = Math.round(this.actual * multiplier);
+	expected = Math.round(expected * multiplier);
+	return expected == actual;
 };
 
 /**
@@ -1421,123 +1419,123 @@ jasmine.Matchers.prototype.toBeCloseTo = function(expected, precision) {
  *
  * @param {String} expected
  */
-jasmine.Matchers.prototype.toThrow = function(expected) {
-  var result = false;
-  var exception;
-  if (typeof this.actual != 'function') {
-    throw new Error('Actual is not a function');
-  }
-  try {
-    this.actual();
-  } catch (e) {
-    exception = e;
-  }
-  if (exception) {
-    result = (expected === jasmine.undefined || this.env.equals_(exception.message || exception, expected.message || expected));
-  }
+jasmine.Matchers.prototype.toThrow = function (expected) {
+	var result = false;
+	var exception;
+	if (typeof this.actual != 'function') {
+		throw new Error('Actual is not a function');
+	}
+	try {
+		this.actual();
+	} catch (e) {
+		exception = e;
+	}
+	if (exception) {
+		result = (expected === jasmine.undefined || this.env.equals_(exception.message || exception, expected.message || expected));
+	}
 
-  var not = this.isNot ? "not " : "";
+	var not = this.isNot ? "not " : "";
 
-  this.message = function() {
-    if (exception && (expected === jasmine.undefined || !this.env.equals_(exception.message || exception, expected.message || expected))) {
-      return ["Expected function " + not + "to throw", expected ? expected.message || expected : "an exception", ", but it threw", exception.message || exception].join(' ');
-    } else {
-      return "Expected function to throw an exception.";
-    }
-  };
+	this.message = function () {
+		if (exception && (expected === jasmine.undefined || !this.env.equals_(exception.message || exception, expected.message || expected))) {
+			return ["Expected function " + not + "to throw", expected ? expected.message || expected : "an exception", ", but it threw", exception.message || exception].join(' ');
+		} else {
+			return "Expected function to throw an exception.";
+		}
+	};
 
-  return result;
+	return result;
 };
 
-jasmine.Matchers.Any = function(expectedClass) {
-  this.expectedClass = expectedClass;
+jasmine.Matchers.Any = function (expectedClass) {
+	this.expectedClass = expectedClass;
 };
 
-jasmine.Matchers.Any.prototype.matches = function(other) {
-  if (this.expectedClass == String) {
-    return typeof other == 'string' || other instanceof String;
-  }
+jasmine.Matchers.Any.prototype.matches = function (other) {
+	if (this.expectedClass == String) {
+		return typeof other == 'string' || other instanceof String;
+	}
 
-  if (this.expectedClass == Number) {
-    return typeof other == 'number' || other instanceof Number;
-  }
+	if (this.expectedClass == Number) {
+		return typeof other == 'number' || other instanceof Number;
+	}
 
-  if (this.expectedClass == Function) {
-    return typeof other == 'function' || other instanceof Function;
-  }
+	if (this.expectedClass == Function) {
+		return typeof other == 'function' || other instanceof Function;
+	}
 
-  if (this.expectedClass == Object) {
-    return typeof other == 'object';
-  }
+	if (this.expectedClass == Object) {
+		return typeof other == 'object';
+	}
 
-  return other instanceof this.expectedClass;
+	return other instanceof this.expectedClass;
 };
 
-jasmine.Matchers.Any.prototype.toString = function() {
-  return '<jasmine.any(' + this.expectedClass + ')>';
+jasmine.Matchers.Any.prototype.toString = function () {
+	return '<jasmine.any(' + this.expectedClass + ')>';
 };
 
 /**
  * @constructor
  */
-jasmine.MultiReporter = function() {
-  this.subReporters_ = [];
+jasmine.MultiReporter = function () {
+	this.subReporters_ = [];
 };
 jasmine.util.inherit(jasmine.MultiReporter, jasmine.Reporter);
 
-jasmine.MultiReporter.prototype.addReporter = function(reporter) {
-  this.subReporters_.push(reporter);
-};
-
-(function() {
-  var functionNames = [
-    "reportRunnerStarting",
-    "reportRunnerResults",
-    "reportSuiteResults",
-    "reportSpecStarting",
-    "reportSpecResults",
-    "log"
-  ];
-  for (var i = 0; i < functionNames.length; i++) {
-    var functionName = functionNames[i];
-    jasmine.MultiReporter.prototype[functionName] = (function(functionName) {
-      return function() {
-        for (var j = 0; j < this.subReporters_.length; j++) {
-          var subReporter = this.subReporters_[j];
-          if (subReporter[functionName]) {
-            subReporter[functionName].apply(subReporter, arguments);
-          }
-        }
-      };
-    })(functionName);
-  }
+jasmine.MultiReporter.prototype.addReporter = function (reporter) {
+	this.subReporters_.push(reporter);
+};
+
+(function () {
+	var functionNames = [
+		"reportRunnerStarting",
+		"reportRunnerResults",
+		"reportSuiteResults",
+		"reportSpecStarting",
+		"reportSpecResults",
+		"log"
+	];
+	for (var i = 0; i < functionNames.length; i++) {
+		var functionName = functionNames[i];
+		jasmine.MultiReporter.prototype[functionName] = (function (functionName) {
+			return function () {
+				for (var j = 0; j < this.subReporters_.length; j++) {
+					var subReporter = this.subReporters_[j];
+					if (subReporter[functionName]) {
+						subReporter[functionName].apply(subReporter, arguments);
+					}
+				}
+			};
+		})(functionName);
+	}
 })();
 /**
  * Holds results for a set of Jasmine spec. Allows for the results array to hold another jasmine.NestedResults
  *
  * @constructor
  */
-jasmine.NestedResults = function() {
-  /**
-   * The total count of results
-   */
-  this.totalCount = 0;
-  /**
-   * Number of passed results
-   */
-  this.passedCount = 0;
-  /**
-   * Number of failed results
-   */
-  this.failedCount = 0;
-  /**
-   * Was this suite/spec skipped?
-   */
-  this.skipped = false;
-  /**
-   * @ignore
-   */
-  this.items_ = [];
+jasmine.NestedResults = function () {
+	/**
+	 * The total count of results
+	 */
+	this.totalCount = 0;
+	/**
+	 * Number of passed results
+	 */
+	this.passedCount = 0;
+	/**
+	 * Number of failed results
+	 */
+	this.failedCount = 0;
+	/**
+	 * Was this suite/spec skipped?
+	 */
+	this.skipped = false;
+	/**
+	 * @ignore
+	 */
+	this.items_ = [];
 };
 
 /**
@@ -1545,58 +1543,58 @@ jasmine.NestedResults = function() {
  *
  * @param result
  */
-jasmine.NestedResults.prototype.rollupCounts = function(result) {
-  this.totalCount += result.totalCount;
-  this.passedCount += result.passedCount;
-  this.failedCount += result.failedCount;
+jasmine.NestedResults.prototype.rollupCounts = function (result) {
+	this.totalCount += result.totalCount;
+	this.passedCount += result.passedCount;
+	this.failedCount += result.failedCount;
 };
 
 /**
  * Adds a log message.
  * @param values Array of message parts which will be concatenated later.
  */
-jasmine.NestedResults.prototype.log = function(values) {
-  this.items_.push(new jasmine.MessageResult(values));
+jasmine.NestedResults.prototype.log = function (values) {
+	this.items_.push(new jasmine.MessageResult(values));
 };
 
 /**
  * Getter for the results: message & results.
  */
-jasmine.NestedResults.prototype.getItems = function() {
-  return this.items_;
+jasmine.NestedResults.prototype.getItems = function () {
+	return this.items_;
 };
 
 /**
  * Adds a result, tracking counts (total, passed, & failed)
  * @param {jasmine.ExpectationResult|jasmine.NestedResults} result
  */
-jasmine.NestedResults.prototype.addResult = function(result) {
-  if (result.type != 'log') {
-    if (result.items_) {
-      this.rollupCounts(result);
-    } else {
-      this.totalCount++;
-      if (result.passed()) {
-        this.passedCount++;
-      } else {
-        this.failedCount++;
-      }
-    }
-  }
-  this.items_.push(result);
+jasmine.NestedResults.prototype.addResult = function (result) {
+	if (result.type != 'log') {
+		if (result.items_) {
+			this.rollupCounts(result);
+		} else {
+			this.totalCount++;
+			if (result.passed()) {
+				this.passedCount++;
+			} else {
+				this.failedCount++;
+			}
+		}
+	}
+	this.items_.push(result);
 };
 
 /**
  * @returns {Boolean} True if <b>everything</b> below passed
  */
-jasmine.NestedResults.prototype.passed = function() {
-  return this.passedCount === this.totalCount;
+jasmine.NestedResults.prototype.passed = function () {
+	return this.passedCount === this.totalCount;
 };
 /**
  * Base class for pretty printing for expectation results.
  */
-jasmine.PrettyPrinter = function() {
-  this.ppNestLevel_ = 0;
+jasmine.PrettyPrinter = function () {
+	this.ppNestLevel_ = 0;
 };
 
 /**
@@ -1604,57 +1602,57 @@ jasmine.PrettyPrinter = function() {
  *
  * @param value
  */
-jasmine.PrettyPrinter.prototype.format = function(value) {
-  if (this.ppNestLevel_ > 40) {
-    throw new Error('jasmine.PrettyPrinter: format() nested too deeply!');
-  }
-
-  this.ppNestLevel_++;
-  try {
-    if (value === jasmine.undefined) {
-      this.emitScalar('undefined');
-    } else if (value === null) {
-      this.emitScalar('null');
-    } else if (value === jasmine.getGlobal()) {
-      this.emitScalar('<global>');
-    } else if (value instanceof jasmine.Matchers.Any) {
-      this.emitScalar(value.toString());
-    } else if (typeof value === 'string') {
-      this.emitString(value);
-    } else if (jasmine.isSpy(value)) {
-      this.emitScalar("spy on " + value.identity);
-    } else if (value instanceof RegExp) {
-      this.emitScalar(value.toString());
-    } else if (typeof value === 'function') {
-      this.emitScalar('Function');
-    } else if (typeof value.nodeType === 'number') {
-      this.emitScalar('HTMLNode');
-    } else if (value instanceof Date) {
-      this.emitScalar('Date(' + value + ')');
-    } else if (value.__Jasmine_been_here_before__) {
-      this.emitScalar('<circular reference: ' + (jasmine.isArray_(value) ? 'Array' : 'Object') + '>');
-    } else if (jasmine.isArray_(value) || typeof value == 'object') {
-      value.__Jasmine_been_here_before__ = true;
-      if (jasmine.isArray_(value)) {
-        this.emitArray(value);
-      } else {
-        this.emitObject(value);
-      }
-      delete value.__Jasmine_been_here_before__;
-    } else {
-      this.emitScalar(value.toString());
-    }
-  } finally {
-    this.ppNestLevel_--;
-  }
-};
-
-jasmine.PrettyPrinter.prototype.iterateObject = function(obj, fn) {
-  for (var property in obj) {
-    if (property == '__Jasmine_been_here_before__') continue;
-    fn(property, obj.__lookupGetter__ ? (obj.__lookupGetter__(property) !== jasmine.undefined && 
-                                         obj.__lookupGetter__(property) !== null) : false);
-  }
+jasmine.PrettyPrinter.prototype.format = function (value) {
+	if (this.ppNestLevel_ > 40) {
+		throw new Error('jasmine.PrettyPrinter: format() nested too deeply!');
+	}
+
+	this.ppNestLevel_++;
+	try {
+		if (value === jasmine.undefined) {
+			this.emitScalar('undefined');
+		} else if (value === null) {
+			this.emitScalar('null');
+		} else if (value === jasmine.getGlobal()) {
+			this.emitScalar('<global>');
+		} else if (value instanceof jasmine.Matchers.Any) {
+			this.emitScalar(value.toString());
+		} else if (typeof value === 'string') {
+			this.emitString(value);
+		} else if (jasmine.isSpy(value)) {
+			this.emitScalar("spy on " + value.identity);
+		} else if (value instanceof RegExp) {
+			this.emitScalar(value.toString());
+		} else if (typeof value === 'function') {
+			this.emitScalar('Function');
+		} else if (typeof value.nodeType === 'number') {
+			this.emitScalar('HTMLNode');
+		} else if (value instanceof Date) {
+			this.emitScalar('Date(' + value + ')');
+		} else if (value.__Jasmine_been_here_before__) {
+			this.emitScalar('<circular reference: ' + (jasmine.isArray_(value) ? 'Array' : 'Object') + '>');
+		} else if (jasmine.isArray_(value) || typeof value == 'object') {
+			value.__Jasmine_been_here_before__ = true;
+			if (jasmine.isArray_(value)) {
+				this.emitArray(value);
+			} else {
+				this.emitObject(value);
+			}
+			delete value.__Jasmine_been_here_before__;
+		} else {
+			this.emitScalar(value.toString());
+		}
+	} finally {
+		this.ppNestLevel_--;
+	}
+};
+
+jasmine.PrettyPrinter.prototype.iterateObject = function (obj, fn) {
+	for (var property in obj) {
+		if (property == '__Jasmine_been_here_before__') continue;
+		fn(property, obj.__lookupGetter__ ? (obj.__lookupGetter__(property) !== jasmine.undefined &&
+			obj.__lookupGetter__(property) !== null) : false);
+	}
 };
 
 jasmine.PrettyPrinter.prototype.emitArray = jasmine.unimplementedMethod_;
@@ -1662,155 +1660,155 @@ jasmine.PrettyPrinter.prototype.emitObject = jasmine.unimplementedMethod_;
 jasmine.PrettyPrinter.prototype.emitScalar = jasmine.unimplementedMethod_;
 jasmine.PrettyPrinter.prototype.emitString = jasmine.unimplementedMethod_;
 
-jasmine.StringPrettyPrinter = function() {
-  jasmine.PrettyPrinter.call(this);
+jasmine.StringPrettyPrinter = function () {
+	jasmine.PrettyPrinter.call(this);
 
-  this.string = '';
+	this.string = '';
 };
 jasmine.util.inherit(jasmine.StringPrettyPrinter, jasmine.PrettyPrinter);
 
-jasmine.StringPrettyPrinter.prototype.emitScalar = function(value) {
-  this.append(value);
+jasmine.StringPrettyPrinter.prototype.emitScalar = function (value) {
+	this.append(value);
 };
 
-jasmine.StringPrettyPrinter.prototype.emitString = function(value) {
-  this.append("'" + value + "'");
+jasmine.StringPrettyPrinter.prototype.emitString = function (value) {
+	this.append("'" + value + "'");
 };
 
-jasmine.StringPrettyPrinter.prototype.emitArray = function(array) {
-  this.append('[ ');
-  for (var i = 0; i < array.length; i++) {
-    if (i > 0) {
-      this.append(', ');
-    }
-    this.format(array[i]);
-  }
-  this.append(' ]');
+jasmine.StringPrettyPrinter.prototype.emitArray = function (array) {
+	this.append('[ ');
+	for (var i = 0; i < array.length; i++) {
+		if (i > 0) {
+			this.append(', ');
+		}
+		this.format(array[i]);
+	}
+	this.append(' ]');
 };
 
-jasmine.StringPrettyPrinter.prototype.emitObject = function(obj) {
-  var self = this;
-  this.append('{ ');
-  var first = true;
+jasmine.StringPrettyPrinter.prototype.emitObject = function (obj) {
+	var self = this;
+	this.append('{ ');
+	var first = true;
 
-  this.iterateObject(obj, function(property, isGetter) {
-    if (first) {
-      first = false;
-    } else {
-      self.append(', ');
-    }
+	this.iterateObject(obj, function (property, isGetter) {
+		if (first) {
+			first = false;
+		} else {
+			self.append(', ');
+		}
 
-    self.append(property);
-    self.append(' : ');
-    if (isGetter) {
-      self.append('<getter>');
-    } else {
-      self.format(obj[property]);
-    }
-  });
+		self.append(property);
+		self.append(' : ');
+		if (isGetter) {
+			self.append('<getter>');
+		} else {
+			self.format(obj[property]);
+		}
+	});
 
-  this.append(' }');
+	this.append(' }');
 };
 
-jasmine.StringPrettyPrinter.prototype.append = function(value) {
-  this.string += value;
+jasmine.StringPrettyPrinter.prototype.append = function (value) {
+	this.string += value;
 };
-jasmine.Queue = function(env) {
-  this.env = env;
-  this.blocks = [];
-  this.running = false;
-  this.index = 0;
-  this.offset = 0;
-  this.abort = false;
+jasmine.Queue = function (env) {
+	this.env = env;
+	this.blocks = [];
+	this.running = false;
+	this.index = 0;
+	this.offset = 0;
+	this.abort = false;
 };
 
-jasmine.Queue.prototype.addBefore = function(block) {
-  this.blocks.unshift(block);
+jasmine.Queue.prototype.addBefore = function (block) {
+	this.blocks.unshift(block);
 };
 
-jasmine.Queue.prototype.add = function(block) {
-  this.blocks.push(block);
+jasmine.Queue.prototype.add = function (block) {
+	this.blocks.push(block);
 };
 
-jasmine.Queue.prototype.insertNext = function(block) {
-  this.blocks.splice((this.index + this.offset + 1), 0, block);
-  this.offset++;
+jasmine.Queue.prototype.insertNext = function (block) {
+	this.blocks.splice((this.index + this.offset + 1), 0, block);
+	this.offset++;
 };
 
-jasmine.Queue.prototype.start = function(onComplete) {
-  this.running = true;
-  this.onComplete = onComplete;
-  this.next_();
+jasmine.Queue.prototype.start = function (onComplete) {
+	this.running = true;
+	this.onComplete = onComplete;
+	this.next_();
 };
 
-jasmine.Queue.prototype.isRunning = function() {
-  return this.running;
+jasmine.Queue.prototype.isRunning = function () {
+	return this.running;
 };
 
 jasmine.Queue.LOOP_DONT_RECURSE = true;
 
-jasmine.Queue.prototype.next_ = function() {
-  var self = this;
-  var goAgain = true;
-
-  while (goAgain) {
-    goAgain = false;
-    
-    if (self.index < self.blocks.length && !this.abort) {
-      var calledSynchronously = true;
-      var completedSynchronously = false;
-
-      var onComplete = function () {
-        if (jasmine.Queue.LOOP_DONT_RECURSE && calledSynchronously) {
-          completedSynchronously = true;
-          return;
-        }
-
-        if (self.blocks[self.index].abort) {
-          self.abort = true;
-        }
-
-        self.offset = 0;
-        self.index++;
-
-        var now = new Date().getTime();
-        if (self.env.updateInterval && now - self.env.lastUpdate > self.env.updateInterval) {
-          self.env.lastUpdate = now;
-          self.env.setTimeout(function() {
-            self.next_();
-          }, 0);
-        } else {
-          if (jasmine.Queue.LOOP_DONT_RECURSE && completedSynchronously) {
-            goAgain = true;
-          } else {
-            self.next_();
-          }
-        }
-      };
-      self.blocks[self.index].execute(onComplete);
-
-      calledSynchronously = false;
-      if (completedSynchronously) {
-        onComplete();
-      }
-      
-    } else {
-      self.running = false;
-      if (self.onComplete) {
-        self.onComplete();
-      }
-    }
-  }
-};
-
-jasmine.Queue.prototype.results = function() {
-  var results = new jasmine.NestedResults();
-  for (var i = 0; i < this.blocks.length; i++) {
-    if (this.blocks[i].results) {
-      results.addResult(this.blocks[i].results());
-    }
-  }
-  return results;
+jasmine.Queue.prototype.next_ = function () {
+	var self = this;
+	var goAgain = true;
+
+	while (goAgain) {
+		goAgain = false;
+
+		if (self.index < self.blocks.length && !this.abort) {
+			var calledSynchronously = true;
+			var completedSynchronously = false;
+
+			var onComplete = function () {
+				if (jasmine.Queue.LOOP_DONT_RECURSE && calledSynchronously) {
+					completedSynchronously = true;
+					return;
+				}
+
+				if (self.blocks[self.index].abort) {
+					self.abort = true;
+				}
+
+				self.offset = 0;
+				self.index++;
+
+				var now = new Date().getTime();
+				if (self.env.updateInterval && now - self.env.lastUpdate > self.env.updateInterval) {
+					self.env.lastUpdate = now;
+					self.env.setTimeout(function () {
+						self.next_();
+					}, 0);
+				} else {
+					if (jasmine.Queue.LOOP_DONT_RECURSE && completedSynchronously) {
+						goAgain = true;
+					} else {
+						self.next_();
+					}
+				}
+			};
+			self.blocks[self.index].execute(onComplete);
+
+			calledSynchronously = false;
+			if (completedSynchronously) {
+				onComplete();
+			}
+
+		} else {
+			self.running = false;
+			if (self.onComplete) {
+				self.onComplete();
+			}
+		}
+	}
+};
+
+jasmine.Queue.prototype.results = function () {
+	var results = new jasmine.NestedResults();
+	for (var i = 0; i < this.blocks.length; i++) {
+		if (this.blocks[i].results) {
+			results.addResult(this.blocks[i].results());
+		}
+	}
+	return results;
 };
 
 
@@ -1820,76 +1818,76 @@ jasmine.Queue.prototype.results = function() {
  * @constructor
  * @param {jasmine.Env} env
  */
-jasmine.Runner = function(env) {
-  var self = this;
-  self.env = env;
-  self.queue = new jasmine.Queue(env);
-  self.before_ = [];
-  self.after_ = [];
-  self.suites_ = [];
+jasmine.Runner = function (env) {
+	var self = this;
+	self.env = env;
+	self.queue = new jasmine.Queue(env);
+	self.before_ = [];
+	self.after_ = [];
+	self.suites_ = [];
 };
 
-jasmine.Runner.prototype.execute = function() {
-  var self = this;
-  if (self.env.reporter.reportRunnerStarting) {
-    self.env.reporter.reportRunnerStarting(this);
-  }
-  self.queue.start(function () {
-    self.finishCallback();
-  });
+jasmine.Runner.prototype.execute = function () {
+	var self = this;
+	if (self.env.reporter.reportRunnerStarting) {
+		self.env.reporter.reportRunnerStarting(this);
+	}
+	self.queue.start(function () {
+		self.finishCallback();
+	});
 };
 
-jasmine.Runner.prototype.beforeEach = function(beforeEachFunction) {
-  beforeEachFunction.typeName = 'beforeEach';
-  this.before_.splice(0,0,beforeEachFunction);
+jasmine.Runner.prototype.beforeEach = function (beforeEachFunction) {
+	beforeEachFunction.typeName = 'beforeEach';
+	this.before_.splice(0, 0, beforeEachFunction);
 };
 
-jasmine.Runner.prototype.afterEach = function(afterEachFunction) {
-  afterEachFunction.typeName = 'afterEach';
-  this.after_.splice(0,0,afterEachFunction);
+jasmine.Runner.prototype.afterEach = function (afterEachFunction) {
+	afterEachFunction.typeName = 'afterEach';
+	this.after_.splice(0, 0, afterEachFunction);
 };
 
 
-jasmine.Runner.prototype.finishCallback = function() {
-  this.env.reporter.reportRunnerResults(this);
+jasmine.Runner.prototype.finishCallback = function () {
+	this.env.reporter.reportRunnerResults(this);
 };
 
-jasmine.Runner.prototype.addSuite = function(suite) {
-  this.suites_.push(suite);
+jasmine.Runner.prototype.addSuite = function (suite) {
+	this.suites_.push(suite);
 };
 
-jasmine.Runner.prototype.add = function(block) {
-  if (block instanceof jasmine.Suite) {
-    this.addSuite(block);
-  }
-  this.queue.add(block);
+jasmine.Runner.prototype.add = function (block) {
+	if (block instanceof jasmine.Suite) {
+		this.addSuite(block);
+	}
+	this.queue.add(block);
 };
 
 jasmine.Runner.prototype.specs = function () {
-  var suites = this.suites();
-  var specs = [];
-  for (var i = 0; i < suites.length; i++) {
-    specs = specs.concat(suites[i].specs());
-  }
-  return specs;
+	var suites = this.suites();
+	var specs = [];
+	for (var i = 0; i < suites.length; i++) {
+		specs = specs.concat(suites[i].specs());
+	}
+	return specs;
 };
 
-jasmine.Runner.prototype.suites = function() {
-  return this.suites_;
+jasmine.Runner.prototype.suites = function () {
+	return this.suites_;
 };
 
-jasmine.Runner.prototype.topLevelSuites = function() {
-  var topLevelSuites = [];
-  for (var i = 0; i < this.suites_.length; i++) {
-    if (!this.suites_[i].parentSuite) {
-      topLevelSuites.push(this.suites_[i]);
-    }
-  }
-  return topLevelSuites;
+jasmine.Runner.prototype.topLevelSuites = function () {
+	var topLevelSuites = [];
+	for (var i = 0; i < this.suites_.length; i++) {
+		if (!this.suites_[i].parentSuite) {
+			topLevelSuites.push(this.suites_[i]);
+		}
+	}
+	return topLevelSuites;
 };
 
-jasmine.Runner.prototype.results = function() {
-  return this.queue.results();
+jasmine.Runner.prototype.results = function () {
+	return this.queue.results();
 };
 /**
  * Internal representation of a Jasmine specification, or test.
@@ -1899,35 +1897,35 @@ jasmine.Runner.prototype.results = function() {
  * @param {jasmine.Suite} suite
  * @param {String} description
  */
-jasmine.Spec = function(env, suite, description) {
-  if (!env) {
-    throw new Error('jasmine.Env() required');
-  }
-  if (!suite) {
-    throw new Error('jasmine.Suite() required');
-  }
-  var spec = this;
-  spec.id = env.nextSpecId ? env.nextSpecId() : null;
-  spec.env = env;
-  spec.suite = suite;
-  spec.description = description;
-  spec.queue = new jasmine.Queue(env);
+jasmine.Spec = function (env, suite, description) {
+	if (!env) {
+		throw new Error('jasmine.Env() required');
+	}
+	if (!suite) {
+		throw new Error('jasmine.Suite() required');
+	}
+	var spec = this;
+	spec.id = env.nextSpecId ? env.nextSpecId() : null;
+	spec.env = env;
+	spec.suite = suite;
+	spec.description = description;
+	spec.queue = new jasmine.Queue(env);
 
-  spec.afterCallbacks = [];
-  spec.spies_ = [];
+	spec.afterCallbacks = [];
+	spec.spies_ = [];
 
-  spec.results_ = new jasmine.NestedResults();
-  spec.results_.description = description;
-  spec.matchersClass = null;
+	spec.results_ = new jasmine.NestedResults();
+	spec.results_.description = description;
+	spec.matchersClass = null;
 };
 
-jasmine.Spec.prototype.getFullName = function() {
-  return this.suite.getFullName() + ' ' + this.description + '.';
+jasmine.Spec.prototype.getFullName = function () {
+	return this.suite.getFullName() + ' ' + this.description + '.';
 };
 
 
-jasmine.Spec.prototype.results = function() {
-  return this.results_;
+jasmine.Spec.prototype.results = function () {
+	return this.results_;
 };
 
 /**
@@ -1935,35 +1933,35 @@ jasmine.Spec.prototype.results = function() {
  *
  * Be careful not to leave calls to <code>jasmine.log</code> in production code.
  */
-jasmine.Spec.prototype.log = function() {
-  return this.results_.log(arguments);
+jasmine.Spec.prototype.log = function () {
+	return this.results_.log(arguments);
 };
 
 jasmine.Spec.prototype.runs = function (func) {
-  var block = new jasmine.Block(this.env, func, this);
-  this.addToQueue(block);
-  return this;
+	var block = new jasmine.Block(this.env, func, this);
+	this.addToQueue(block);
+	return this;
 };
 
 jasmine.Spec.prototype.addToQueue = function (block) {
-  if (this.queue.isRunning()) {
-    this.queue.insertNext(block);
-  } else {
-    this.queue.add(block);
-  }
+	if (this.queue.isRunning()) {
+		this.queue.insertNext(block);
+	} else {
+		this.queue.add(block);
+	}
 };
 
 /**
  * @param {jasmine.ExpectationResult} result
  */
-jasmine.Spec.prototype.addMatcherResult = function(result) {
-  this.results_.addResult(result);
+jasmine.Spec.prototype.addMatcherResult = function (result) {
+	this.results_.addResult(result);
 };
 
-jasmine.Spec.prototype.expect = function(actual) {
-  var positive = new (this.getMatchersClass_())(this.env, actual, this);
-  positive.not = new (this.getMatchersClass_())(this.env, actual, this, true);
-  return positive;
+jasmine.Spec.prototype.expect = function (actual) {
+	var positive = new (this.getMatchersClass_())(this.env, actual, this);
+	positive.not = new (this.getMatchersClass_())(this.env, actual, this, true);
+	return positive;
 };
 
 /**
@@ -1972,10 +1970,10 @@ jasmine.Spec.prototype.expect = function(actual) {
  * @deprecated Use waitsFor() instead
  * @param {Number} timeout milliseconds to wait
  */
-jasmine.Spec.prototype.waits = function(timeout) {
-  var waitsFunc = new jasmine.WaitsBlock(this.env, timeout, this);
-  this.addToQueue(waitsFunc);
-  return this;
+jasmine.Spec.prototype.waits = function (timeout) {
+	var waitsFunc = new jasmine.WaitsBlock(this.env, timeout, this);
+	this.addToQueue(waitsFunc);
+	return this;
 };
 
 /**
@@ -1985,153 +1983,153 @@ jasmine.Spec.prototype.waits = function(timeout) {
  * @param {String} optional_timeoutMessage
  * @param {Number} optional_timeout
  */
-jasmine.Spec.prototype.waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) {
-  var latchFunction_ = null;
-  var optional_timeoutMessage_ = null;
-  var optional_timeout_ = null;
-
-  for (var i = 0; i < arguments.length; i++) {
-    var arg = arguments[i];
-    switch (typeof arg) {
-      case 'function':
-        latchFunction_ = arg;
-        break;
-      case 'string':
-        optional_timeoutMessage_ = arg;
-        break;
-      case 'number':
-        optional_timeout_ = arg;
-        break;
-    }
-  }
-
-  var waitsForFunc = new jasmine.WaitsForBlock(this.env, optional_timeout_, latchFunction_, optional_timeoutMessage_, this);
-  this.addToQueue(waitsForFunc);
-  return this;
+jasmine.Spec.prototype.waitsFor = function (latchFunction, optional_timeoutMessage, optional_timeout) {
+	var latchFunction_ = null;
+	var optional_timeoutMessage_ = null;
+	var optional_timeout_ = null;
+
+	for (var i = 0; i < arguments.length; i++) {
+		var arg = arguments[i];
+		switch (typeof arg) {
+			case 'function':
+				latchFunction_ = arg;
+				break;
+			case 'string':
+				optional_timeoutMessage_ = arg;
+				break;
+			case 'number':
+				optional_timeout_ = arg;
+				break;
+		}
+	}
+
+	var waitsForFunc = new jasmine.WaitsForBlock(this.env, optional_timeout_, latchFunction_, optional_timeoutMessage_, this);
+	this.addToQueue(waitsForFunc);
+	return this;
 };
 
 jasmine.Spec.prototype.fail = function (e) {
-  var expectationResult = new jasmine.ExpectationResult({
-    passed: false,
-    message: e ? jasmine.util.formatException(e) : 'Exception',
-    trace: { stack: e.stack }
-  });
-  this.results_.addResult(expectationResult);
+	var expectationResult = new jasmine.ExpectationResult({
+		passed: false,
+		message: e ? jasmine.util.formatException(e) : 'Exception',
+		trace: {stack: e.stack}
+	});
+	this.results_.addResult(expectationResult);
 };
 
-jasmine.Spec.prototype.getMatchersClass_ = function() {
-  return this.matchersClass || this.env.matchersClass;
+jasmine.Spec.prototype.getMatchersClass_ = function () {
+	return this.matchersClass || this.env.matchersClass;
 };
 
-jasmine.Spec.prototype.addMatchers = function(matchersPrototype) {
-  var parent = this.getMatchersClass_();
-  var newMatchersClass = function() {
-    parent.apply(this, arguments);
-  };
-  jasmine.util.inherit(newMatchersClass, parent);
-  jasmine.Matchers.wrapInto_(matchersPrototype, newMatchersClass);
-  this.matchersClass = newMatchersClass;
+jasmine.Spec.prototype.addMatchers = function (matchersPrototype) {
+	var parent = this.getMatchersClass_();
+	var newMatchersClass = function () {
+		parent.apply(this, arguments);
+	};
+	jasmine.util.inherit(newMatchersClass, parent);
+	jasmine.Matchers.wrapInto_(matchersPrototype, newMatchersClass);
+	this.matchersClass = newMatchersClass;
 };
 
-jasmine.Spec.prototype.finishCallback = function() {
-  this.env.reporter.reportSpecResults(this);
+jasmine.Spec.prototype.finishCallback = function () {
+	this.env.reporter.reportSpecResults(this);
 };
 
-jasmine.Spec.prototype.finish = function(onComplete) {
-  this.removeAllSpies();
-  this.finishCallback();
-  if (onComplete) {
-    onComplete();
-  }
+jasmine.Spec.prototype.finish = function (onComplete) {
+	this.removeAllSpies();
+	this.finishCallback();
+	if (onComplete) {
+		onComplete();
+	}
 };
 
-jasmine.Spec.prototype.after = function(doAfter) {
-  if (this.queue.isRunning()) {
-    this.queue.add(new jasmine.Block(this.env, doAfter, this));
-  } else {
-    this.afterCallbacks.unshift(doAfter);
-  }
+jasmine.Spec.prototype.after = function (doAfter) {
+	if (this.queue.isRunning()) {
+		this.queue.add(new jasmine.Block(this.env, doAfter, this));
+	} else {
+		this.afterCallbacks.unshift(doAfter);
+	}
 };
 
-jasmine.Spec.prototype.execute = function(onComplete) {
-  var spec = this;
-  if (!spec.env.specFilter(spec)) {
-    spec.results_.skipped = true;
-    spec.finish(onComplete);
-    return;
-  }
+jasmine.Spec.prototype.execute = function (onComplete) {
+	var spec = this;
+	if (!spec.env.specFilter(spec)) {
+		spec.results_.skipped = true;
+		spec.finish(onComplete);
+		return;
+	}
 
-  this.env.reporter.reportSpecStarting(this);
+	this.env.reporter.reportSpecStarting(this);
 
-  spec.env.currentSpec = spec;
+	spec.env.currentSpec = spec;
 
-  spec.addBeforesAndAftersToQueue();
+	spec.addBeforesAndAftersToQueue();
 
-  spec.queue.start(function () {
-    spec.finish(onComplete);
-  });
+	spec.queue.start(function () {
+		spec.finish(onComplete);
+	});
 };
 
-jasmine.Spec.prototype.addBeforesAndAftersToQueue = function() {
-  var runner = this.env.currentRunner();
-  var i;
+jasmine.Spec.prototype.addBeforesAndAftersToQueue = function () {
+	var runner = this.env.currentRunner();
+	var i;
 
-  for (var suite = this.suite; suite; suite = suite.parentSuite) {
-    for (i = 0; i < suite.before_.length; i++) {
-      this.queue.addBefore(new jasmine.Block(this.env, suite.before_[i], this));
-    }
-  }
-  for (i = 0; i < runner.before_.length; i++) {
-    this.queue.addBefore(new jasmine.Block(this.env, runner.before_[i], this));
-  }
-  for (i = 0; i < this.afterCallbacks.length; i++) {
-    this.queue.add(new jasmine.Block(this.env, this.afterCallbacks[i], this));
-  }
-  for (suite = this.suite; suite; suite = suite.parentSuite) {
-    for (i = 0; i < suite.after_.length; i++) {
-      this.queue.add(new jasmine.Block(this.env, suite.after_[i], this));
-    }
-  }
-  for (i = 0; i < runner.after_.length; i++) {
-    this.queue.add(new jasmine.Block(this.env, runner.after_[i], this));
-  }
+	for (var suite = this.suite; suite; suite = suite.parentSuite) {
+		for (i = 0; i < suite.before_.length; i++) {
+			this.queue.addBefore(new jasmine.Block(this.env, suite.before_[i], this));
+		}
+	}
+	for (i = 0; i < runner.before_.length; i++) {
+		this.queue.addBefore(new jasmine.Block(this.env, runner.before_[i], this));
+	}
+	for (i = 0; i < this.afterCallbacks.length; i++) {
+		this.queue.add(new jasmine.Block(this.env, this.afterCallbacks[i], this));
+	}
+	for (suite = this.suite; suite; suite = suite.parentSuite) {
+		for (i = 0; i < suite.after_.length; i++) {
+			this.queue.add(new jasmine.Block(this.env, suite.after_[i], this));
+		}
+	}
+	for (i = 0; i < runner.after_.length; i++) {
+		this.queue.add(new jasmine.Block(this.env, runner.after_[i], this));
+	}
 };
 
-jasmine.Spec.prototype.explodes = function() {
-  throw 'explodes function should not have been called';
+jasmine.Spec.prototype.explodes = function () {
+	throw 'explodes function should not have been called';
 };
 
-jasmine.Spec.prototype.spyOn = function(obj, methodName, ignoreMethodDoesntExist) {
-  if (obj == jasmine.undefined) {
-    throw "spyOn could not find an object to spy upon for " + methodName + "()";
-  }
+jasmine.Spec.prototype.spyOn = function (obj, methodName, ignoreMethodDoesntExist) {
+	if (obj == jasmine.undefined) {
+		throw "spyOn could not find an object to spy upon for " + methodName + "()";
+	}
 
-  if (!ignoreMethodDoesntExist && obj[methodName] === jasmine.undefined) {
-    throw methodName + '() method does not exist';
-  }
+	if (!ignoreMethodDoesntExist && obj[methodName] === jasmine.undefined) {
+		throw methodName + '() method does not exist';
+	}
 
-  if (!ignoreMethodDoesntExist && obj[methodName] && obj[methodName].isSpy) {
-    throw new Error(methodName + ' has already been spied upon');
-  }
+	if (!ignoreMethodDoesntExist && obj[methodName] && obj[methodName].isSpy) {
+		throw new Error(methodName + ' has already been spied upon');
+	}
 
-  var spyObj = jasmine.createSpy(methodName);
+	var spyObj = jasmine.createSpy(methodName);
 
-  this.spies_.push(spyObj);
-  spyObj.baseObj = obj;
-  spyObj.methodName = methodName;
-  spyObj.originalValue = obj[methodName];
+	this.spies_.push(spyObj);
+	spyObj.baseObj = obj;
+	spyObj.methodName = methodName;
+	spyObj.originalValue = obj[methodName];
 
-  obj[methodName] = spyObj;
+	obj[methodName] = spyObj;
 
-  return spyObj;
+	return spyObj;
 };
 
-jasmine.Spec.prototype.removeAllSpies = function() {
-  for (var i = 0; i < this.spies_.length; i++) {
-    var spy = this.spies_[i];
-    spy.baseObj[spy.methodName] = spy.originalValue;
-  }
-  this.spies_ = [];
+jasmine.Spec.prototype.removeAllSpies = function () {
+	for (var i = 0; i < this.spies_.length; i++) {
+		var spy = this.spies_[i];
+		spy.baseObj[spy.methodName] = spy.originalValue;
+	}
+	this.spies_ = [];
 };
 
 /**
@@ -2143,93 +2141,93 @@ jasmine.Spec.prototype.removeAllSpies = function() {
  * @param {Function} specDefinitions
  * @param {jasmine.Suite} parentSuite
  */
-jasmine.Suite = function(env, description, specDefinitions, parentSuite) {
-  var self = this;
-  self.id = env.nextSuiteId ? env.nextSuiteId() : null;
-  self.description = description;
-  self.queue = new jasmine.Queue(env);
-  self.parentSuite = parentSuite;
-  self.env = env;
-  self.before_ = [];
-  self.after_ = [];
-  self.children_ = [];
-  self.suites_ = [];
-  self.specs_ = [];
+jasmine.Suite = function (env, description, specDefinitions, parentSuite) {
+	var self = this;
+	self.id = env.nextSuiteId ? env.nextSuiteId() : null;
+	self.description = description;
+	self.queue = new jasmine.Queue(env);
+	self.parentSuite = parentSuite;
+	self.env = env;
+	self.before_ = [];
+	self.after_ = [];
+	self.children_ = [];
+	self.suites_ = [];
+	self.specs_ = [];
 };
 
-jasmine.Suite.prototype.getFullName = function() {
-  var fullName = this.description;
-  for (var parentSuite = this.parentSuite; parentSuite; parentSuite = parentSuite.parentSuite) {
-    fullName = parentSuite.description + ' ' + fullName;
-  }
-  return fullName;
+jasmine.Suite.prototype.getFullName = function () {
+	var fullName = this.description;
+	for (var parentSuite = this.parentSuite; parentSuite; parentSuite = parentSuite.parentSuite) {
+		fullName = parentSuite.description + ' ' + fullName;
+	}
+	return fullName;
 };
 
-jasmine.Suite.prototype.finish = function(onComplete) {
-  this.env.reporter.reportSuiteResults(this);
-  this.finished = true;
-  if (typeof(onComplete) == 'function') {
-    onComplete();
-  }
+jasmine.Suite.prototype.finish = function (onComplete) {
+	this.env.reporter.reportSuiteResults(this);
+	this.finished = true;
+	if (typeof (onComplete) == 'function') {
+		onComplete();
+	}
 };
 
-jasmine.Suite.prototype.beforeEach = function(beforeEachFunction) {
-  beforeEachFunction.typeName = 'beforeEach';
-  this.before_.unshift(beforeEachFunction);
+jasmine.Suite.prototype.beforeEach = function (beforeEachFunction) {
+	beforeEachFunction.typeName = 'beforeEach';
+	this.before_.unshift(beforeEachFunction);
 };
 
-jasmine.Suite.prototype.afterEach = function(afterEachFunction) {
-  afterEachFunction.typeName = 'afterEach';
-  this.after_.unshift(afterEachFunction);
+jasmine.Suite.prototype.afterEach = function (afterEachFunction) {
+	afterEachFunction.typeName = 'afterEach';
+	this.after_.unshift(afterEachFunction);
 };
 
-jasmine.Suite.prototype.results = function() {
-  return this.queue.results();
+jasmine.Suite.prototype.results = function () {
+	return this.queue.results();
 };
 
-jasmine.Suite.prototype.add = function(suiteOrSpec) {
-  this.children_.push(suiteOrSpec);
-  if (suiteOrSpec instanceof jasmine.Suite) {
-    this.suites_.push(suiteOrSpec);
-    this.env.currentRunner().addSuite(suiteOrSpec);
-  } else {
-    this.specs_.push(suiteOrSpec);
-  }
-  this.queue.add(suiteOrSpec);
+jasmine.Suite.prototype.add = function (suiteOrSpec) {
+	this.children_.push(suiteOrSpec);
+	if (suiteOrSpec instanceof jasmine.Suite) {
+		this.suites_.push(suiteOrSpec);
+		this.env.currentRunner().addSuite(suiteOrSpec);
+	} else {
+		this.specs_.push(suiteOrSpec);
+	}
+	this.queue.add(suiteOrSpec);
 };
 
-jasmine.Suite.prototype.specs = function() {
-  return this.specs_;
+jasmine.Suite.prototype.specs = function () {
+	return this.specs_;
 };
 
-jasmine.Suite.prototype.suites = function() {
-  return this.suites_;
+jasmine.Suite.prototype.suites = function () {
+	return this.suites_;
 };
 
-jasmine.Suite.prototype.children = function() {
-  return this.children_;
+jasmine.Suite.prototype.children = function () {
+	return this.children_;
 };
 
-jasmine.Suite.prototype.execute = function(onComplete) {
-  var self = this;
-  this.queue.start(function () {
-    self.finish(onComplete);
-  });
+jasmine.Suite.prototype.execute = function (onComplete) {
+	var self = this;
+	this.queue.start(function () {
+		self.finish(onComplete);
+	});
 };
-jasmine.WaitsBlock = function(env, timeout, spec) {
-  this.timeout = timeout;
-  jasmine.Block.call(this, env, null, spec);
+jasmine.WaitsBlock = function (env, timeout, spec) {
+	this.timeout = timeout;
+	jasmine.Block.call(this, env, null, spec);
 };
 
 jasmine.util.inherit(jasmine.WaitsBlock, jasmine.Block);
 
 jasmine.WaitsBlock.prototype.execute = function (onComplete) {
-  if (jasmine.VERBOSE) {
-    this.env.reporter.log('>> Jasmine waiting for ' + this.timeout + ' ms...');
-  }
-  this.env.setTimeout(function () {
-    onComplete();
-  }, this.timeout);
+	if (jasmine.VERBOSE) {
+		this.env.reporter.log('>> Jasmine waiting for ' + this.timeout + ' ms...');
+	}
+	this.env.setTimeout(function () {
+		onComplete();
+	}, this.timeout);
 };
 /**
  * A block which waits for some condition to become true, with timeout.
@@ -2242,236 +2240,236 @@ jasmine.WaitsBlock.prototype.execute = function (onComplete) {
  * @param {String} message The message to display if the desired condition hasn't been met within the given time period.
  * @param {jasmine.Spec} spec The Jasmine spec.
  */
-jasmine.WaitsForBlock = function(env, timeout, latchFunction, message, spec) {
-  this.timeout = timeout || env.defaultTimeoutInterval;
-  this.latchFunction = latchFunction;
-  this.message = message;
-  this.totalTimeSpentWaitingForLatch = 0;
-  jasmine.Block.call(this, env, null, spec);
+jasmine.WaitsForBlock = function (env, timeout, latchFunction, message, spec) {
+	this.timeout = timeout || env.defaultTimeoutInterval;
+	this.latchFunction = latchFunction;
+	this.message = message;
+	this.totalTimeSpentWaitingForLatch = 0;
+	jasmine.Block.call(this, env, null, spec);
 };
 jasmine.util.inherit(jasmine.WaitsForBlock, jasmine.Block);
 
 jasmine.WaitsForBlock.TIMEOUT_INCREMENT = 10;
 
-jasmine.WaitsForBlock.prototype.execute = function(onComplete) {
-  if (jasmine.VERBOSE) {
-    this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen'));
-  }
-  var latchFunctionResult;
-  try {
-    latchFunctionResult = this.latchFunction.apply(this.spec);
-  } catch (e) {
-    this.spec.fail(e);
-    onComplete();
-    return;
-  }
-
-  if (latchFunctionResult) {
-    onComplete();
-  } else if (this.totalTimeSpentWaitingForLatch >= this.timeout) {
-    var message = 'timed out after ' + this.timeout + ' msec waiting for ' + (this.message || 'something to happen');
-    this.spec.fail({
-      name: 'timeout',
-      message: message
-    });
-
-    this.abort = true;
-    onComplete();
-  } else {
-    this.totalTimeSpentWaitingForLatch += jasmine.WaitsForBlock.TIMEOUT_INCREMENT;
-    var self = this;
-    this.env.setTimeout(function() {
-      self.execute(onComplete);
-    }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT);
-  }
+jasmine.WaitsForBlock.prototype.execute = function (onComplete) {
+	if (jasmine.VERBOSE) {
+		this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen'));
+	}
+	var latchFunctionResult;
+	try {
+		latchFunctionResult = this.latchFunction.apply(this.spec);
+	} catch (e) {
+		this.spec.fail(e);
+		onComplete();
+		return;
+	}
+
+	if (latchFunctionResult) {
+		onComplete();
+	} else if (this.totalTimeSpentWaitingForLatch >= this.timeout) {
+		var message = 'timed out after ' + this.timeout + ' msec waiting for ' + (this.message || 'something to happen');
+		this.spec.fail({
+			name: 'timeout',
+			message: message
+		});
+
+		this.abort = true;
+		onComplete();
+	} else {
+		this.totalTimeSpentWaitingForLatch += jasmine.WaitsForBlock.TIMEOUT_INCREMENT;
+		var self = this;
+		this.env.setTimeout(function () {
+			self.execute(onComplete);
+		}, jasmine.WaitsForBlock.TIMEOUT_INCREMENT);
+	}
 };
 // Mock setTimeout, clearTimeout
 // Contributed by Pivotal Computer Systems, www.pivotalsf.com
 
-jasmine.FakeTimer = function() {
-  this.reset();
-
-  var self = this;
-  self.setTimeout = function(funcToCall, millis) {
-    self.timeoutsMade++;
-    self.scheduleFunction(self.timeoutsMade, funcToCall, millis, false);
-    return self.timeoutsMade;
-  };
-
-  self.setInterval = function(funcToCall, millis) {
-    self.timeoutsMade++;
-    self.scheduleFunction(self.timeoutsMade, funcToCall, millis, true);
-    return self.timeoutsMade;
-  };
-
-  self.clearTimeout = function(timeoutKey) {
-    self.scheduledFunctions[timeoutKey] = jasmine.undefined;
-  };
-
-  self.clearInterval = function(timeoutKey) {
-    self.scheduledFunctions[timeoutKey] = jasmine.undefined;
-  };
-
-};
-
-jasmine.FakeTimer.prototype.reset = function() {
-  this.timeoutsMade = 0;
-  this.scheduledFunctions = {};
-  this.nowMillis = 0;
-};
-
-jasmine.FakeTimer.prototype.tick = function(millis) {
-  var oldMillis = this.nowMillis;
-  var newMillis = oldMillis + millis;
-  this.runFunctionsWithinRange(oldMillis, newMillis);
-  this.nowMillis = newMillis;
-};
-
-jasmine.FakeTimer.prototype.runFunctionsWithinRange = function(oldMillis, nowMillis) {
-  var scheduledFunc;
-  var funcsToRun = [];
-  for (var timeoutKey in this.scheduledFunctions) {
-    scheduledFunc = this.scheduledFunctions[timeoutKey];
-    if (scheduledFunc != jasmine.undefined &&
-        scheduledFunc.runAtMillis >= oldMillis &&
-        scheduledFunc.runAtMillis <= nowMillis) {
-      funcsToRun.push(scheduledFunc);
-      this.scheduledFunctions[timeoutKey] = jasmine.undefined;
-    }
-  }
-
-  if (funcsToRun.length > 0) {
-    funcsToRun.sort(function(a, b) {
-      return a.runAtMillis - b.runAtMillis;
-    });
-    for (var i = 0; i < funcsToRun.length; ++i) {
-      try {
-        var funcToRun = funcsToRun[i];
-        this.nowMillis = funcToRun.runAtMillis;
-        funcToRun.funcToCall();
-        if (funcToRun.recurring) {
-          this.scheduleFunction(funcToRun.timeoutKey,
-              funcToRun.funcToCall,
-              funcToRun.millis,
-              true);
-        }
-      } catch(e) {
-      }
-    }
-    this.runFunctionsWithinRange(oldMillis, nowMillis);
-  }
-};
-
-jasmine.FakeTimer.prototype.scheduleFunction = function(timeoutKey, funcToCall, millis, recurring) {
-  this.scheduledFunctions[timeoutKey] = {
-    runAtMillis: this.nowMillis + millis,
-    funcToCall: funcToCall,
-    recurring: recurring,
-    timeoutKey: timeoutKey,
-    millis: millis
-  };
+jasmine.FakeTimer = function () {
+	this.reset();
+
+	var self = this;
+	self.setTimeout = function (funcToCall, millis) {
+		self.timeoutsMade++;
+		self.scheduleFunction(self.timeoutsMade, funcToCall, millis, false);
+		return self.timeoutsMade;
+	};
+
+	self.setInterval = function (funcToCall, millis) {
+		self.timeoutsMade++;
+		self.scheduleFunction(self.timeoutsMade, funcToCall, millis, true);
+		return self.timeoutsMade;
+	};
+
+	self.clearTimeout = function (timeoutKey) {
+		self.scheduledFunctions[timeoutKey] = jasmine.undefined;
+	};
+
+	self.clearInterval = function (timeoutKey) {
+		self.scheduledFunctions[timeoutKey] = jasmine.undefined;
+	};
+
+};
+
+jasmine.FakeTimer.prototype.reset = function () {
+	this.timeoutsMade = 0;
+	this.scheduledFunctions = {};
+	this.nowMillis = 0;
+};
+
+jasmine.FakeTimer.prototype.tick = function (millis) {
+	var oldMillis = this.nowMillis;
+	var newMillis = oldMillis + millis;
+	this.runFunctionsWithinRange(oldMillis, newMillis);
+	this.nowMillis = newMillis;
+};
+
+jasmine.FakeTimer.prototype.runFunctionsWithinRange = function (oldMillis, nowMillis) {
+	var scheduledFunc;
+	var funcsToRun = [];
+	for (var timeoutKey in this.scheduledFunctions) {
+		scheduledFunc = this.scheduledFunctions[timeoutKey];
+		if (scheduledFunc != jasmine.undefined &&
+			scheduledFunc.runAtMillis >= oldMillis &&
+			scheduledFunc.runAtMillis <= nowMillis) {
+			funcsToRun.push(scheduledFunc);
+			this.scheduledFunctions[timeoutKey] = jasmine.undefined;
+		}
+	}
+
+	if (funcsToRun.length > 0) {
+		funcsToRun.sort(function (a, b) {
+			return a.runAtMillis - b.runAtMillis;
+		});
+		for (var i = 0; i < funcsToRun.length; ++i) {
+			try {
+				var funcToRun = funcsToRun[i];
+				this.nowMillis = funcToRun.runAtMillis;
+				funcToRun.funcToCall();
+				if (funcToRun.recurring) {
+					this.scheduleFunction(funcToRun.timeoutKey,
+						funcToRun.funcToCall,
+						funcToRun.millis,
+						true);
+				}
+			} catch (e) {
+			}
+		}
+		this.runFunctionsWithinRange(oldMillis, nowMillis);
+	}
+};
+
+jasmine.FakeTimer.prototype.scheduleFunction = function (timeoutKey, funcToCall, millis, recurring) {
+	this.scheduledFunctions[timeoutKey] = {
+		runAtMillis: this.nowMillis + millis,
+		funcToCall: funcToCall,
+		recurring: recurring,
+		timeoutKey: timeoutKey,
+		millis: millis
+	};
 };
 
 /**
  * @namespace
  */
 jasmine.Clock = {
-  defaultFakeTimer: new jasmine.FakeTimer(),
-
-  reset: function() {
-    jasmine.Clock.assertInstalled();
-    jasmine.Clock.defaultFakeTimer.reset();
-  },
-
-  tick: function(millis) {
-    jasmine.Clock.assertInstalled();
-    jasmine.Clock.defaultFakeTimer.tick(millis);
-  },
-
-  runFunctionsWithinRange: function(oldMillis, nowMillis) {
-    jasmine.Clock.defaultFakeTimer.runFunctionsWithinRange(oldMillis, nowMillis);
-  },
-
-  scheduleFunction: function(timeoutKey, funcToCall, millis, recurring) {
-    jasmine.Clock.defaultFakeTimer.scheduleFunction(timeoutKey, funcToCall, millis, recurring);
-  },
-
-  useMock: function() {
-    if (!jasmine.Clock.isInstalled()) {
-      var spec = jasmine.getEnv().currentSpec;
-      spec.after(jasmine.Clock.uninstallMock);
-
-      jasmine.Clock.installMock();
-    }
-  },
-
-  installMock: function() {
-    jasmine.Clock.installed = jasmine.Clock.defaultFakeTimer;
-  },
-
-  uninstallMock: function() {
-    jasmine.Clock.assertInstalled();
-    jasmine.Clock.installed = jasmine.Clock.real;
-  },
-
-  real: {
-    setTimeout: jasmine.getGlobal().setTimeout,
-    clearTimeout: jasmine.getGlobal().clearTimeout,
-    setInterval: jasmine.getGlobal().setInterval,
-    clearInterval: jasmine.getGlobal().clearInterval
-  },
-
-  assertInstalled: function() {
-    if (!jasmine.Clock.isInstalled()) {
-      throw new Error("Mock clock is not installed, use jasmine.Clock.useMock()");
-    }
-  },
-
-  isInstalled: function() {
-    return jasmine.Clock.installed == jasmine.Clock.defaultFakeTimer;
-  },
-
-  installed: null
+	defaultFakeTimer: new jasmine.FakeTimer(),
+
+	reset: function () {
+		jasmine.Clock.assertInstalled();
+		jasmine.Clock.defaultFakeTimer.reset();
+	},
+
+	tick: function (millis) {
+		jasmine.Clock.assertInstalled();
+		jasmine.Clock.defaultFakeTimer.tick(millis);
+	},
+
+	runFunctionsWithinRange: function (oldMillis, nowMillis) {
+		jasmine.Clock.defaultFakeTimer.runFunctionsWithinRange(oldMillis, nowMillis);
+	},
+
+	scheduleFunction: function (timeoutKey, funcToCall, millis, recurring) {
+		jasmine.Clock.defaultFakeTimer.scheduleFunction(timeoutKey, funcToCall, millis, recurring);
+	},
+
+	useMock: function () {
+		if (!jasmine.Clock.isInstalled()) {
+			var spec = jasmine.getEnv().currentSpec;
+			spec.after(jasmine.Clock.uninstallMock);
+
+			jasmine.Clock.installMock();
+		}
+	},
+
+	installMock: function () {
+		jasmine.Clock.installed = jasmine.Clock.defaultFakeTimer;
+	},
+
+	uninstallMock: function () {
+		jasmine.Clock.assertInstalled();
+		jasmine.Clock.installed = jasmine.Clock.real;
+	},
+
+	real: {
+		setTimeout: jasmine.getGlobal().setTimeout,
+		clearTimeout: jasmine.getGlobal().clearTimeout,
+		setInterval: jasmine.getGlobal().setInterval,
+		clearInterval: jasmine.getGlobal().clearInterval
+	},
+
+	assertInstalled: function () {
+		if (!jasmine.Clock.isInstalled()) {
+			throw new Error("Mock clock is not installed, use jasmine.Clock.useMock()");
+		}
+	},
+
+	isInstalled: function () {
+		return jasmine.Clock.installed == jasmine.Clock.defaultFakeTimer;
+	},
+
+	installed: null
 };
 jasmine.Clock.installed = jasmine.Clock.real;
 
 //else for IE support
-jasmine.getGlobal().setTimeout = function(funcToCall, millis) {
-  if (jasmine.Clock.installed.setTimeout.apply) {
-    return jasmine.Clock.installed.setTimeout.apply(this, arguments);
-  } else {
-    return jasmine.Clock.installed.setTimeout(funcToCall, millis);
-  }
-};
-
-jasmine.getGlobal().setInterval = function(funcToCall, millis) {
-  if (jasmine.Clock.installed.setInterval.apply) {
-    return jasmine.Clock.installed.setInterval.apply(this, arguments);
-  } else {
-    return jasmine.Clock.installed.setInterval(funcToCall, millis);
-  }
-};
-
-jasmine.getGlobal().clearTimeout = function(timeoutKey) {
-  if (jasmine.Clock.installed.clearTimeout.apply) {
-    return jasmine.Clock.installed.clearTimeout.apply(this, arguments);
-  } else {
-    return jasmine.Clock.installed.clearTimeout(timeoutKey);
-  }
-};
-
-jasmine.getGlobal().clearInterval = function(timeoutKey) {
-  if (jasmine.Clock.installed.clearTimeout.apply) {
-    return jasmine.Clock.installed.clearInterval.apply(this, arguments);
-  } else {
-    return jasmine.Clock.installed.clearInterval(timeoutKey);
-  }
-};
-
-jasmine.version_= {
-  "major": 1,
-  "minor": 1,
-  "build": 0,
-  "revision": 1308618948,
-  "release_candidate": 1
+jasmine.getGlobal().setTimeout = function (funcToCall, millis) {
+	if (jasmine.Clock.installed.setTimeout.apply) {
+		return jasmine.Clock.installed.setTimeout.apply(this, arguments);
+	} else {
+		return jasmine.Clock.installed.setTimeout(funcToCall, millis);
+	}
+};
+
+jasmine.getGlobal().setInterval = function (funcToCall, millis) {
+	if (jasmine.Clock.installed.setInterval.apply) {
+		return jasmine.Clock.installed.setInterval.apply(this, arguments);
+	} else {
+		return jasmine.Clock.installed.setInterval(funcToCall, millis);
+	}
+};
+
+jasmine.getGlobal().clearTimeout = function (timeoutKey) {
+	if (jasmine.Clock.installed.clearTimeout.apply) {
+		return jasmine.Clock.installed.clearTimeout.apply(this, arguments);
+	} else {
+		return jasmine.Clock.installed.clearTimeout(timeoutKey);
+	}
+};
+
+jasmine.getGlobal().clearInterval = function (timeoutKey) {
+	if (jasmine.Clock.installed.clearTimeout.apply) {
+		return jasmine.Clock.installed.clearInterval.apply(this, arguments);
+	} else {
+		return jasmine.Clock.installed.clearInterval(timeoutKey);
+	}
+};
+
+jasmine.version_ = {
+	"major": 1,
+	"minor": 1,
+	"build": 0,
+	"revision": 1308618948,
+	"release_candidate": 1
 };
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/lib/json2.js b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/lib/json2.js
index ac58079..9bb7b92 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/lib/json2.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/lib/json2.js
@@ -159,284 +159,284 @@
 // methods in a closure to avoid creating global variables.
 
 if (!this.JSON) {
-    this.JSON = {};
+	this.JSON = {};
 }
 
 (function () {
 
-    function f(n) {
-        // Format integers to have at least two digits.
-        return n < 10 ? '0' + n : n;
-    }
-
-    if (typeof Date.prototype.toJSON !== 'function') {
-
-        Date.prototype.toJSON = function (key) {
-
-            return isFinite(this.valueOf()) ?
-                   this.getUTCFullYear()   + '-' +
-                 f(this.getUTCMonth() + 1) + '-' +
-                 f(this.getUTCDate())      + 'T' +
-                 f(this.getUTCHours())     + ':' +
-                 f(this.getUTCMinutes())   + ':' +
-                 f(this.getUTCSeconds())   + 'Z' : null;
-        };
-
-        String.prototype.toJSON =
-        Number.prototype.toJSON =
-        Boolean.prototype.toJSON = function (key) {
-            return this.valueOf();
-        };
-    }
-
-    var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-        escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-        gap,
-        indent,
-        meta = {    // table of character substitutions
-            '\b': '\\b',
-            '\t': '\\t',
-            '\n': '\\n',
-            '\f': '\\f',
-            '\r': '\\r',
-            '"' : '\\"',
-            '\\': '\\\\'
-        },
-        rep;
-
-
-    function quote(string) {
+	function f(n) {
+		// Format integers to have at least two digits.
+		return n < 10 ? '0' + n : n;
+	}
+
+	if (typeof Date.prototype.toJSON !== 'function') {
+
+		Date.prototype.toJSON = function (key) {
+
+			return isFinite(this.valueOf()) ?
+				this.getUTCFullYear() + '-' +
+				f(this.getUTCMonth() + 1) + '-' +
+				f(this.getUTCDate()) + 'T' +
+				f(this.getUTCHours()) + ':' +
+				f(this.getUTCMinutes()) + ':' +
+				f(this.getUTCSeconds()) + 'Z' : null;
+		};
+
+		String.prototype.toJSON =
+			Number.prototype.toJSON =
+				Boolean.prototype.toJSON = function (key) {
+					return this.valueOf();
+				};
+	}
+
+	var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+		escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+		gap,
+		indent,
+		meta = {    // table of character substitutions
+			'\b': '\\b',
+			'\t': '\\t',
+			'\n': '\\n',
+			'\f': '\\f',
+			'\r': '\\r',
+			'"': '\\"',
+			'\\': '\\\\'
+		},
+		rep;
+
+
+	function quote(string) {
 
 // If the string contains no control characters, no quote characters, and no
 // backslash characters, then we can safely slap some quotes around it.
 // Otherwise we must also replace the offending characters with safe escape
 // sequences.
 
-        escapable.lastIndex = 0;
-        return escapable.test(string) ?
-            '"' + string.replace(escapable, function (a) {
-                var c = meta[a];
-                return typeof c === 'string' ? c :
-                    '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-            }) + '"' :
-            '"' + string + '"';
-    }
+		escapable.lastIndex = 0;
+		return escapable.test(string) ?
+			'"' + string.replace(escapable, function (a) {
+				var c = meta[a];
+				return typeof c === 'string' ? c :
+					'\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+			}) + '"' :
+			'"' + string + '"';
+	}
 
 
-    function str(key, holder) {
+	function str(key, holder) {
 // Produce a string from holder[key].
 
-        var i,          // The loop counter.
-            k,          // The member key.
-            v,          // The member value.
-            length,
-            mind = gap,
-            partial,
-            value = holder[key];
+		var i,          // The loop counter.
+			k,          // The member key.
+			v,          // The member value.
+			length,
+			mind = gap,
+			partial,
+			value = holder[key];
 
 // If the value has a toJSON method, call it to obtain a replacement value.
 
-        if (value && typeof value === 'object' &&
-                typeof value.toJSON === 'function') {
-            value = value.toJSON(key);
-        }
+		if (value && typeof value === 'object' &&
+			typeof value.toJSON === 'function') {
+			value = value.toJSON(key);
+		}
 
 // If we were called with a replacer function, then call the replacer to
 // obtain a replacement value.
 
-        if (typeof rep === 'function') {
-            value = rep.call(holder, key, value);
-        }
+		if (typeof rep === 'function') {
+			value = rep.call(holder, key, value);
+		}
 
 // What happens next depends on the value's type.
 
-        switch (typeof value) {
-        case 'string':
-            return quote(value);
+		switch (typeof value) {
+			case 'string':
+				return quote(value);
 
-        case 'number':
+			case 'number':
 
 // JSON numbers must be finite. Encode non-finite numbers as null.
 
-            return isFinite(value) ? String(value) : 'null';
+				return isFinite(value) ? String(value) : 'null';
 
-        case 'boolean':
-        case 'null':
+			case 'boolean':
+			case 'null':
 
 // If the value is a boolean or null, convert it to a string. Note:
 // typeof null does not produce 'null'. The case is included here in
 // the remote chance that this gets fixed someday.
 
-            return String(value);
+				return String(value);
 
 // If the type is 'object', we might be dealing with an object or an array or
 // null.
 
-        case 'object':
+			case 'object':
 
 // Due to a specification blunder in ECMAScript, typeof null is 'object',
 // so watch out for that case.
 
-            if (!value) {
-                return 'null';
-            }
+				if (!value) {
+					return 'null';
+				}
 
 // Make an array to hold the partial results of stringifying this object value.
 
-            gap += indent;
-            partial = [];
+				gap += indent;
+				partial = [];
 
 // Is the value an array?
 
-            if (Object.prototype.toString.apply(value) === '[object Array]') {
+				if (Object.prototype.toString.apply(value) === '[object Array]') {
 
 // The value is an array. Stringify every element. Use null as a placeholder
 // for non-JSON values.
 
-                length = value.length;
-                for (i = 0; i < length; i += 1) {
-                    partial[i] = str(i, value) || 'null';
-                }
+					length = value.length;
+					for (i = 0; i < length; i += 1) {
+						partial[i] = str(i, value) || 'null';
+					}
 
 // Join all of the elements together, separated with commas, and wrap them in
 // brackets.
 
-                v = partial.length === 0 ? '[]' :
-                    gap ? '[\n' + gap +
-                            partial.join(',\n' + gap) + '\n' +
-                                mind + ']' :
-                          '[' + partial.join(',') + ']';
-                gap = mind;
-                return v;
-            }
+					v = partial.length === 0 ? '[]' :
+						gap ? '[\n' + gap +
+							partial.join(',\n' + gap) + '\n' +
+							mind + ']' :
+							'[' + partial.join(',') + ']';
+					gap = mind;
+					return v;
+				}
 
 // If the replacer is an array, use it to select the members to be stringified.
 
-            if (rep && typeof rep === 'object') {
-                length = rep.length;
-                for (i = 0; i < length; i += 1) {
-                    k = rep[i];
-                    if (typeof k === 'string') {
-                        v = str(k, value);
-                        if (v) {
-                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
-                        }
-                    }
-                }
-            } else {
+				if (rep && typeof rep === 'object') {
+					length = rep.length;
+					for (i = 0; i < length; i += 1) {
+						k = rep[i];
+						if (typeof k === 'string') {
+							v = str(k, value);
+							if (v) {
+								partial.push(quote(k) + (gap ? ': ' : ':') + v);
+							}
+						}
+					}
+				} else {
 
 // Otherwise, iterate through all of the keys in the object.
 
-                for (k in value) {
-                    if (Object.hasOwnProperty.call(value, k)) {
-                        v = str(k, value);
-                        if (v) {
-                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
-                        }
-                    }
-                }
-            }
+					for (k in value) {
+						if (Object.hasOwnProperty.call(value, k)) {
+							v = str(k, value);
+							if (v) {
+								partial.push(quote(k) + (gap ? ': ' : ':') + v);
+							}
+						}
+					}
+				}
 
 // Join all of the member texts together, separated with commas,
 // and wrap them in braces.
 
-            v = partial.length === 0 ? '{}' :
-                gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' +
-                        mind + '}' : '{' + partial.join(',') + '}';
-            gap = mind;
-            return v;
-        }
-    }
+				v = partial.length === 0 ? '{}' :
+					gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' +
+						mind + '}' : '{' + partial.join(',') + '}';
+				gap = mind;
+				return v;
+		}
+	}
 
 // If the JSON object does not yet have a stringify method, give it one.
 
-    if (typeof JSON.stringify !== 'function') {
-        JSON.stringify = function (value, replacer, space) {
+	if (typeof JSON.stringify !== 'function') {
+		JSON.stringify = function (value, replacer, space) {
 // The stringify method takes a value and an optional replacer, and an optional
 // space parameter, and returns a JSON text. The replacer can be a function
 // that can replace values, or an array of strings that will select the keys.
 // A default replacer method can be provided. Use of the space parameter can
 // produce text that is more easily readable.
 
-            var i;
-            gap = '';
-            indent = '';
+			var i;
+			gap = '';
+			indent = '';
 
 // If the space parameter is a number, make an indent string containing that
 // many spaces.
 
-            if (typeof space === 'number') {
-                for (i = 0; i < space; i += 1) {
-                    indent += ' ';
-                }
+			if (typeof space === 'number') {
+				for (i = 0; i < space; i += 1) {
+					indent += ' ';
+				}
 
 // If the space parameter is a string, it will be used as the indent string.
 
-            } else if (typeof space === 'string') {
-                indent = space;
-            }
+			} else if (typeof space === 'string') {
+				indent = space;
+			}
 
 // If there is a replacer, it must be a function or an array.
 // Otherwise, throw an error.
 
-            rep = replacer;
-            if (replacer && typeof replacer !== 'function' &&
-                    (typeof replacer !== 'object' ||
-                     typeof replacer.length !== 'number')) {
-                throw new Error('JSON.stringify');
-            }
+			rep = replacer;
+			if (replacer && typeof replacer !== 'function' &&
+				(typeof replacer !== 'object' ||
+					typeof replacer.length !== 'number')) {
+				throw new Error('JSON.stringify');
+			}
 
 // Make a fake root object containing our value under the key of ''.
 // Return the result of stringifying the value.
 
-            return str('', {'': value});
-        };
-    }
+			return str('', {'': value});
+		};
+	}
 
 
 // If the JSON object does not yet have a parse method, give it one.
 
-    if (typeof JSON.parse !== 'function') {
-        JSON.parse = function (text, reviver) {
+	if (typeof JSON.parse !== 'function') {
+		JSON.parse = function (text, reviver) {
 
 // The parse method takes a text and an optional reviver function, and returns
 // a JavaScript value if the text is a valid JSON text.
 
-            var j;
+			var j;
 
-            function walk(holder, key) {
+			function walk(holder, key) {
 
 // The walk method is used to recursively walk the resulting structure so
 // that modifications can be made.
 
-                var k, v, value = holder[key];
-                if (value && typeof value === 'object') {
-                    for (k in value) {
-                        if (Object.hasOwnProperty.call(value, k)) {
-                            v = walk(value, k);
-                            if (v !== undefined) {
-                                value[k] = v;
-                            } else {
-                                delete value[k];
-                            }
-                        }
-                    }
-                }
-                return reviver.call(holder, key, value);
-            }
+				var k, v, value = holder[key];
+				if (value && typeof value === 'object') {
+					for (k in value) {
+						if (Object.hasOwnProperty.call(value, k)) {
+							v = walk(value, k);
+							if (v !== undefined) {
+								value[k] = v;
+							} else {
+								delete value[k];
+							}
+						}
+					}
+				}
+				return reviver.call(holder, key, value);
+			}
 
 
 // Parsing happens in four stages. In the first stage, we replace certain
 // Unicode characters with escape sequences. JavaScript handles many characters
 // incorrectly, either silently deleting them, or treating them as line endings.
 
-            cx.lastIndex = 0;
-            if (cx.test(text)) {
-                text = text.replace(cx, function (a) {
-                    return '\\u' +
-                        ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-                });
-            }
+			cx.lastIndex = 0;
+			if (cx.test(text)) {
+				text = text.replace(cx, function (a) {
+					return '\\u' +
+						('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+				});
+			}
 
 // In the second stage, we run the text against regular expressions that look
 // for non-JSON patterns. We are especially concerned with '()' and 'new'
@@ -451,28 +451,25 @@ if (!this.JSON) {
 // we look to see that the remaining characters are only whitespace or ']' or
 // ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
 
-            if (/^[\],:{}\s]*$/.
-test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
-replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
-replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+			if (/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
 
 // In the third stage we use the eval function to compile the text into a
 // JavaScript structure. The '{' operator is subject to a syntactic ambiguity
 // in JavaScript: it can begin a block or an object literal. We wrap the text
 // in parens to eliminate the ambiguity.
 
-                j = eval('(' + text + ')');
+				j = eval('(' + text + ')');
 
 // In the optional fourth stage, we recursively walk the new structure, passing
 // each name/value pair to a reviver function for possible transformation.
 
-                return typeof reviver === 'function' ?
-                    walk({'': j}, '') : j;
-            }
+				return typeof reviver === 'function' ?
+					walk({'': j}, '') : j;
+			}
 
 // If the text is not JSON parseable, then a SyntaxError is thrown.
 
-            throw new SyntaxError('JSON.parse');
-        };
-    }
+			throw new SyntaxError('JSON.parse');
+		};
+	}
 }());
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-array.js b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-array.js
index 3a44f31..42afcae 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-array.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-array.js
@@ -1,1223 +1,1269 @@
-describe('Array', function() {
-    var testSubject;
-    beforeEach(function() {
-        testSubject = [2, 3, undefined, true, 'hej', null, false, 0];
-        delete testSubject[1];
-    });
-    function createArrayLikeFromArray(arr) {
-        var o = {};
-        Array.prototype.forEach.call(arr, function(e, i) {
-            o[i]=e;
-        });
-        o.length = arr.length;
-        return o;
-    };
-
-    describe('forEach', function() {
-        "use strict";
-        var expected, actual;
-
-        beforeEach(function() {
-            expected = {0:2, 2: undefined, 3:true, 4: 'hej', 5:null, 6:false, 7:0 };
-            actual = {};
-        });
-        it('should pass the right parameters', function() {
-            var callback = jasmine.createSpy('callback'),
-                array = ['1'];
-            array.forEach(callback);
-            expect(callback).toHaveBeenCalledWith('1', 0, array);
-        });
-        it('should not affect elements added to the array after it has begun', function() {
-            var arr = [1,2,3],
-                i = 0;
-            arr.forEach(function(a) {
-                i++;
-                arr.push(a+3);
-            });
-            expect(arr).toEqual([1,2,3,4,5,6]);
-            expect(i).toBe(3);
-        });
-
-        it('should set the right context when given none', function() {
-            var context;
-            [1].forEach(function() {context = this;});
-            expect(context).toBe(function() {return this}.call());
-        });
-        it('should iterate all', function() {
-            testSubject.forEach(function(obj, index) {
-                actual[index] = obj;
-            });
-            expect(actual).toExactlyMatch(expected);
-        });
-        it('should iterate all using a context', function() {
-            var o = { a: actual };
-
-            testSubject.forEach(function(obj, index) {
-                this.a[index] = obj;
-            }, o);
-            expect(actual).toExactlyMatch(expected);
-        });
-
-        it('should iterate all in an array-like object', function() {
-            var ts = createArrayLikeFromArray(testSubject);
-            Array.prototype.forEach.call(ts, function(obj, index) {
-                actual[index] = obj;
-            });
-            expect(actual).toExactlyMatch(expected);
-        });
-        it('should iterate all in an array-like object using a context', function() {
-            var ts = createArrayLikeFromArray(testSubject),
-                o = { a: actual };
-
-            Array.prototype.forEach.call(ts, function(obj, index) {
-                this.a[index] = obj;
-            }, o);
-            expect(actual).toExactlyMatch(expected);
-        });
-
-        describe('strings', function() {
-            var str = 'Hello, World!',
-                toString = Object.prototype.toString;
-            it('should iterate all in a string', function() {
-                actual = [];
-                Array.prototype.forEach.call(str, function(item, index) {
-                    actual[index] = item;
-                });
-                expect(actual).toExactlyMatch(str.split(''));
-            });
-            it('should iterate all in a string using a context', function() {
-                actual = [];
-                var o = { a: actual };
-                Array.prototype.forEach.call(str, function(item, index) {
-                    this.a[index] = item;
-                }, o);
-                expect(actual).toExactlyMatch(str.split(''));
-            });
-            it('should have String object for third argument of callback', function() {
-                Array.prototype.forEach.call(str, function(item, index, obj) {
-                    actual = obj;
-                });
-                expect(typeof actual).toBe("object");
-                expect(toString.call(actual)).toBe("[object String]");
-            });
-        });
-    });
-    describe('some', function() {
-        var actual, expected, numberOfRuns;
-
-        beforeEach(function() {
-            expected = {0:2, 2: undefined, 3:true };
-            actual = {};
-            numberOfRuns = 0;
-        });
-
-        it('should pass the correct values along to the callback', function() {
-            var callback = jasmine.createSpy('callback');
-            var array = ['1'];
-            array.some(callback);
-            expect(callback).toHaveBeenCalledWith('1', 0, array);
-        });
-        it('should not affect elements added to the array after it has begun', function() {
-            var arr = [1,2,3],
-                i = 0;
-            arr.some(function(a) {
-                i++;
-                arr.push(a+3);
-                return i > 3;
-            });
-            expect(arr).toEqual([1,2,3,4,5,6]);
-            expect(i).toBe(3);
-        });
-        it('should set the right context when given none', function() {
-            var context;
-            [1].some(function() {context = this;});
-            expect(context).toBe(function() {return this}.call());
-        });
-
-        it('should return false if it runs to the end', function() {
-            actual = testSubject.some(function() {});
-            expect(actual).toBeFalsy();
-        });
-        it('should return true if it is stopped somewhere', function() {
-            actual = testSubject.some(function() { return true; });
-            expect(actual).toBeTruthy();
-        });
-        it('should return false if there are no elements', function() {
-            actual = [].some(function() { return true; });
-            expect(actual).toBeFalsy();
-        });
-
-        it('should stop after 3 elements', function() {
-            testSubject.some(function(obj, index) {
-                actual[index] = obj;
-                numberOfRuns += 1;
-                if(numberOfRuns == 3) {
-                    return true;
-                }
-                return false;
-            });
-            expect(actual).toExactlyMatch(expected);
-        });
-        it('should stop after 3 elements using a context', function() {
-            var o = { a: actual };
-            testSubject.some(function(obj, index) {
-                this.a[index] = obj;
-                numberOfRuns += 1;
-                if(numberOfRuns == 3) {
-                    return true;
-                }
-                return false;
-            }, o);
-            expect(actual).toExactlyMatch(expected);
-        });
-
-        it('should stop after 3 elements in an array-like object', function() {
-            var ts = createArrayLikeFromArray(testSubject);
-            Array.prototype.some.call(ts, function(obj, index) {
-                actual[index] = obj;
-                numberOfRuns += 1;
-                if(numberOfRuns == 3) {
-                    return true;
-                }
-                return false;
-            });
-            expect(actual).toExactlyMatch(expected);
-        });
-        it('should stop after 3 elements in an array-like object using a context', function() {
-            var ts = createArrayLikeFromArray(testSubject);
-            var o = { a: actual };
-            Array.prototype.some.call(ts, function(obj, index) {
-                this.a[index] = obj;
-                numberOfRuns += 1;
-                if(numberOfRuns == 3) {
-                    return true;
-                }
-                return false;
-            }, o);
-            expect(actual).toExactlyMatch(expected);
-        });
-    });
-    describe('every', function() {
-        var actual, expected, numberOfRuns;
-
-        beforeEach(function() {
-            expected = {0:2, 2: undefined, 3:true };
-            actual = {};
-            numberOfRuns = 0;
-        });
-
-        it('should pass the correct values along to the callback', function() {
-            var callback = jasmine.createSpy('callback');
-            var array = ['1'];
-            array.every(callback);
-            expect(callback).toHaveBeenCalledWith('1', 0, array);
-        });
-        it('should not affect elements added to the array after it has begun', function() {
-            var arr = [1,2,3],
-                i = 0;
-            arr.every(function(a) {
-                i++;
-                arr.push(a+3);
-                return i <= 3;
-            });
-            expect(arr).toEqual([1,2,3,4,5,6]);
-            expect(i).toBe(3);
-        });
-        it('should set the right context when given none', function() {
-            var context;
-            [1].every(function() {context = this;});
-            expect(context).toBe(function() {return this}.call());
-        });
-
-        it('should return true if the array is empty', function() {
-            actual = [].every(function() { return true; });
-            expect(actual).toBeTruthy();
-
-            actual = [].every(function() { return false; });
-            expect(actual).toBeTruthy();
-        });
-        it('should return true if it runs to the end', function() {
-            actual = [1,2,3].every(function() { return true; });
-            expect(actual).toBeTruthy();
-        });
-        it('should return false if it is stopped before the end', function() {
-            actual = [1,2,3].every(function() { return false; });
-            expect(actual).toBeFalsy();
-        });
-
-        it('should return after 3 elements', function() {
-            testSubject.every(function(obj, index) {
-                actual[index] = obj;
-                numberOfRuns += 1;
-                if(numberOfRuns == 3) {
-                    return false;
-                }
-                return true;
-            });
-            expect(actual).toExactlyMatch(expected);
-        });
-        it('should stop after 3 elements using a context', function() {
-            var o = { a: actual };
-            testSubject.every(function(obj, index) {
-                this.a[index] = obj;
-                numberOfRuns += 1;
-                if(numberOfRuns == 3) {
-                    return false;
-                }
-                return true;
-            }, o);
-            expect(actual).toExactlyMatch(expected);
-        });
-
-        it('should stop after 3 elements in an array-like object', function() {
-            var ts = createArrayLikeFromArray(testSubject);
-            Array.prototype.every.call(ts, function(obj, index) {
-                actual[index] = obj;
-                numberOfRuns += 1;
-                if(numberOfRuns == 3) {
-                    return false;
-                }
-                return true;
-            });
-            expect(actual).toExactlyMatch(expected);
-        });
-        it('should stop after 3 elements in an array-like object using a context', function() {
-            var ts = createArrayLikeFromArray(testSubject);
-            var o = { a: actual };
-            Array.prototype.every.call(ts, function(obj, index) {
-                this.a[index] = obj;
-                numberOfRuns += 1;
-                if(numberOfRuns == 3) {
-                    return false;
-                }
-                return true;
-            }, o);
-            expect(actual).toExactlyMatch(expected);
-        });
-    });
-
-    describe('indexOf', function() {
-        "use strict";
-        var actual, expected, testSubject;
-
-        beforeEach(function() {
-            testSubject = [2, 3, undefined, true, 'hej', null, 2, false, 0];
-            delete testSubject[1];
-
-        });
-
-        it('should find the element', function() {
-            expected = 4;
-            actual = testSubject.indexOf('hej');
-            expect(actual).toEqual(expected);
-        });
-        it('should not find the element', function() {
-            expected = -1;
-            actual = testSubject.indexOf('mus');
-            expect(actual).toEqual(expected);
-        });
-        it('should find undefined as well', function() {
-            expected = -1;
-            actual = testSubject.indexOf(undefined);
-            expect(actual).not.toEqual(expected);
-        });
-        it('should skip unset indexes', function() {
-            expected = 2;
-            actual = testSubject.indexOf(undefined);
-            expect(actual).toEqual(expected);
-        });
-        it('should use a strict test', function() {
-            actual = testSubject.indexOf(null);
-            expect(actual).toEqual(5);
-
-            actual = testSubject.indexOf('2');
-            expect(actual).toEqual(-1);
-        });
-        it('should skip the first if fromIndex is set', function() {
-            expect(testSubject.indexOf(2, 2)).toEqual(6);
-            expect(testSubject.indexOf(2, 0)).toEqual(0);
-            expect(testSubject.indexOf(2, 6)).toEqual(6);
-        });
-        it('should work with negative fromIndex', function() {
-            expect(testSubject.indexOf(2, -3)).toEqual(6);
-            expect(testSubject.indexOf(2, -9)).toEqual(0);
-        });
-        it('should work with fromIndex being greater than the length', function() {
-            expect(testSubject.indexOf(0, 20)).toEqual(-1);
-        });
-        it('should work with fromIndex being negative and greater than the length', function() {
-            expect(testSubject.indexOf('hej', -20)).toEqual(4);
-        });
-
-        describe('Array-like', function ArrayLike() {
-            var indexOf = Array.prototype.indexOf,
-                testAL;
-            beforeEach(function beforeEach() {
-                testAL = {};
-                testSubject = [2, 3, undefined, true, 'hej', null, 2, false, 0];
-                testSubject.forEach(function (o,i) {
-                    testAL[i] = o;
-                });
-                testAL.length = testSubject.length;
-            });
-            it('should find the element (array-like)', function() {
-                expected = 4;
-                actual = indexOf.call(testAL, 'hej');
-                expect(actual).toEqual(expected);
-            });
-            it('should not find the element (array-like)', function() {
-                expected = -1;
-                actual = indexOf.call(testAL, 'mus');
-                expect(actual).toEqual(expected);
-            });
-            it('should find undefined as well (array-like)', function() {
-                expected = -1;
-                actual = indexOf.call(testAL, undefined);
-                expect(actual).not.toEqual(expected);
-            });
-            it('should skip unset indexes (array-like)', function() {
-                expected = 2;
-                actual = indexOf.call(testAL, undefined);
-                expect(actual).toEqual(expected);
-            });
-            it('should use a strict test (array-like)', function() {
-                actual = Array.prototype.indexOf.call(testAL, null);
-                expect(actual).toEqual(5);
-
-                actual = Array.prototype.indexOf.call(testAL, '2');
-                expect(actual).toEqual(-1);
-            });
-            it('should skip the first if fromIndex is set (array-like)', function() {
-                expect(indexOf.call(testAL, 2, 2)).toEqual(6);
-                expect(indexOf.call(testAL, 2, 0)).toEqual(0);
-                expect(indexOf.call(testAL, 2, 6)).toEqual(6);
-            });
-            it('should work with negative fromIndex (array-like)', function() {
-                expect(indexOf.call(testAL, 2, -3)).toEqual(6);
-                expect(indexOf.call(testAL, 2, -9)).toEqual(0);
-            });
-            it('should work with fromIndex being greater than the length (array-like)', function() {
-                expect(indexOf.call(testAL, 0, 20)).toEqual(-1);
-            });
-            it('should work with fromIndex being negative and greater than the length (array-like)', function() {
-                expect(indexOf.call(testAL, 'hej', -20)).toEqual(4);
-            });
-        });
-    });
-    describe('lastIndexOf', function() {
-        "use strict";
-        var actual, expected, testSubject, testAL;
-
-        beforeEach(function() {
-            testSubject = [2, 3, undefined, true, 'hej', null, 2, 3, false, 0];
-            delete testSubject[1];
-            delete testSubject[7];
-        });
-        describe('Array', function() {
-            it('should find the element', function() {
-                expected = 4;
-                actual = testSubject.lastIndexOf('hej');
-                expect(actual).toEqual(expected);
-            });
-            it('should not find the element', function() {
-                expected = -1;
-                actual = testSubject.lastIndexOf('mus');
-                expect(actual).toEqual(expected);
-            });
-            it('should find undefined as well', function() {
-                expected = -1;
-                actual = testSubject.lastIndexOf(undefined);
-                expect(actual).not.toEqual(expected);
-            });
-            it('should skip unset indexes', function() {
-                expected = 2;
-                actual = testSubject.lastIndexOf(undefined);
-                expect(actual).toEqual(expected);
-            });
-            it('should use a strict test', function() {
-                actual = testSubject.lastIndexOf(null);
-                expect(actual).toEqual(5);
-
-                actual = testSubject.lastIndexOf('2');
-                expect(actual).toEqual(-1);
-            });
-            it('should skip the first if fromIndex is set', function() {
-                expect(testSubject.lastIndexOf(2, 2)).toEqual(0);
-                expect(testSubject.lastIndexOf(2, 0)).toEqual(0);
-                expect(testSubject.lastIndexOf(2, 6)).toEqual(6);
-            });
-            it('should work with negative fromIndex', function() {
-                expect(testSubject.lastIndexOf(2, -3)).toEqual(6);
-                expect(testSubject.lastIndexOf(2, -9)).toEqual(0);
-            });
-            it('should work with fromIndex being greater than the length', function() {
-                expect(testSubject.lastIndexOf(2, 20)).toEqual(6);
-            });
-            it('should work with fromIndex being negative and greater than the length', function() {
-                expect(testSubject.lastIndexOf(2, -20)).toEqual(-1);
-            });
-        });
-
-        describe('Array like', function() {
-            var lastIndexOf = Array.prototype.lastIndexOf,
-                testAL;
-            beforeEach(function() {
-                testAL = {};
-                testSubject.forEach(function (o,i) {
-                    testAL[i] = o;
-                });
-                testAL.length = testSubject.length;
-            });
-            it('should find the element (array-like)', function() {
-                expected = 4;
-                actual = lastIndexOf.call(testAL, 'hej');
-                expect(actual).toEqual(expected);
-            });
-            it('should not find the element (array-like)', function() {
-                expected = -1;
-                actual = lastIndexOf.call(testAL, 'mus');
-                expect(actual).toEqual(expected);
-            });
-            it('should find undefined as well (array-like)', function() {
-                expected = -1;
-                actual = lastIndexOf.call(testAL, undefined);
-                expect(actual).not.toEqual(expected);
-            });
-            it('should skip unset indexes (array-like)', function() {
-                expected = 2;
-                actual = lastIndexOf.call(testAL, undefined);
-                expect(actual).toEqual(expected);
-            });
-            it('should use a strict test (array-like)', function() {
-                actual = lastIndexOf.call(testAL, null);
-                expect(actual).toEqual(5);
-
-                actual = lastIndexOf.call(testAL, '2');
-                expect(actual).toEqual(-1);
-            });
-            it('should skip the first if fromIndex is set', function() {
-                expect(lastIndexOf.call(testAL, 2, 2)).toEqual(0);
-                expect(lastIndexOf.call(testAL, 2, 0)).toEqual(0);
-                expect(lastIndexOf.call(testAL, 2, 6)).toEqual(6);
-            });
-            it('should work with negative fromIndex', function() {
-                expect(lastIndexOf.call(testAL, 2, -3)).toEqual(6);
-                expect(lastIndexOf.call(testAL, 2, -9)).toEqual(0);
-            });
-            it('should work with fromIndex being greater than the length', function() {
-                expect(lastIndexOf.call(testAL, 2, 20)).toEqual(6);
-            });
-            it('should work with fromIndex being negative and greater than the length', function() {
-                expect(lastIndexOf.call(testAL, 2, -20)).toEqual(-1);
-            });
-        });
-    });
-
-    describe('filter', function() {
-        var filteredArray,
-            callback = function callback(o, i, arr) {
-                return (
-                    i != 3 && i != 5
-                );
-            };
-
-        beforeEach(function() {
-            testSubject = [2, 3, undefined, true, 'hej', 3, null, false, 0];
-            delete testSubject[1];
-            filteredArray = [2, undefined, 'hej', null, false, 0];
-        });
-        describe('Array object', function() {
-
-            it('should call the callback with the proper arguments', function() {
-                var callback = jasmine.createSpy('callback'),
-                    arr = ['1'];
-                arr.filter(callback);
-                expect(callback).toHaveBeenCalledWith('1', 0, arr);
-            });
-            it('should not affect elements added to the array after it has begun', function() {
-                var arr = [1,2,3],
-                    i = 0;
-                arr.filter(function(a) {
-                    i++;
-                    if(i <= 4) {
-                        arr.push(a+3);
-                    }
-                    return true;
-                });
-                expect(arr).toEqual([1,2,3,4,5,6]);
-                expect(i).toBe(3);
-            });
-            it('should skip non-set values', function() {
-                var passedValues = {};
-                testSubject = [1,2,3,4];
-                delete testSubject[1];
-                testSubject.filter(function(o, i) {
-                    passedValues[i] = o;
-                    return true;
-                });
-                expect(passedValues).toExactlyMatch(testSubject);
-            });
-            it('should pass the right context to the filter', function() {
-                var passedValues = {};
-                testSubject = [1,2,3,4];
-                delete testSubject[1];
-                testSubject.filter(function(o, i) {
-                    this[i] = o;
-                    return true;
-                }, passedValues);
-                expect(passedValues).toExactlyMatch(testSubject);
-            });
-            it('should set the right context when given none', function() {
-                var context;
-                [1].filter(function() {context = this;});
-                expect(context).toBe(function() {return this}.call());
-            });
-            it('should remove only the values for which the callback returns false', function() {
-                var result = testSubject.filter(callback);
-                expect(result).toExactlyMatch(filteredArray);
-            });
-            it('should leave the original array untouched', function() {
-                var copy = testSubject.slice();
-                testSubject.filter(callback);
-                expect(testSubject).toExactlyMatch(copy);
-            });
-            it('should not be affected by same-index mutation', function () {
-                var results = [1, 2, 3]
-                .filter(function (value, index, array) {
-                    array[index] = 'a';
-                    return true;
-                });
-                expect(results).toEqual([1, 2, 3]);
-            });
-        });
-        describe('Array like', function() {
-            beforeEach(function() {
-                testSubject = createArrayLikeFromArray(testSubject);
-            });
-            it('should call the callback with the proper arguments', function() {
-                var callback = jasmine.createSpy('callback'),
-                    arr = createArrayLikeFromArray(['1']);
-                Array.prototype.filter.call(arr, callback);
-                expect(callback).toHaveBeenCalledWith('1', 0, arr);
-            });
-            it('should not affect elements added to the array after it has begun', function() {
-                var arr = createArrayLikeFromArray([1,2,3]),
-                    i = 0;
-                Array.prototype.filter.call(arr, function(a) {
-                    i++;
-                    if(i <= 4) {
-                        arr[i+2] = a+3;
-                    }
-                    return true;
-                });
-                delete arr.length;
-                expect(arr).toExactlyMatch([1,2,3,4,5,6]);
-                expect(i).toBe(3);
-            });
-            it('should skip non-set values', function() {
-                var passedValues = {};
-                testSubject = createArrayLikeFromArray([1,2,3,4]);
-                delete testSubject[1];
-                Array.prototype.filter.call(testSubject, function(o, i) {
-                    passedValues[i] = o;
-                    return true;
-                });
-                delete testSubject.length;
-                expect(passedValues).toExactlyMatch(testSubject);
-            });
-            it('should set the right context when given none', function() {
-                var context;
-                Array.prototype.filter.call(createArrayLikeFromArray([1]), function() {context = this;}, undefined);
-                expect(context).toBe(function() {return this}.call());
-            });
-            it('should pass the right context to the filter', function() {
-                var passedValues = {};
-                testSubject = createArrayLikeFromArray([1,2,3,4]);
-                delete testSubject[1];
-                Array.prototype.filter.call(testSubject, function(o, i) {
-                    this[i] = o;
-                    return true;
-                }, passedValues);
-                delete testSubject.length;
-                expect(passedValues).toExactlyMatch(testSubject);
-            });
-            it('should remove only the values for which the callback returns false', function() {
-                var result = Array.prototype.filter.call(testSubject, callback);
-                expect(result).toExactlyMatch(filteredArray);
-            });
-            it('should leave the original array untouched', function() {
-                var copy = createArrayLikeFromArray(testSubject);
-                Array.prototype.filter.call(testSubject, callback);
-                expect(testSubject).toExactlyMatch(copy);
-            });
-        });
-    });
-    describe('map', function() {
-        var callback;
-        beforeEach(function() {
-            var i = 0;
-            callback = function() {
-                return i++;
-            };
-        });
-        describe('Array object', function() {
-            it('should call callback with the right parameters', function() {
-                var callback = jasmine.createSpy('callback'),
-                    array = [1];
-                array.map(callback);
-                expect(callback).toHaveBeenCalledWith(1, 0, array);
-            });
-            it('should set the context correctly', function() {
-                var context = {};
-                testSubject.map(function(o,i) {
-                    this[i] = o;
-                }, context);
-                expect(context).toExactlyMatch(testSubject);
-            });
-            it('should set the right context when given none', function() {
-                var context;
-                [1].map(function() {context = this;});
-                expect(context).toBe(function() {return this}.call());
-            });
-            it('should not change the array it is called on', function() {
-                var copy = testSubject.slice();
-                testSubject.map(callback);
-                expect(testSubject).toExactlyMatch(copy);
-            });
-            it('should only run for the number of objects in the array when it started', function() {
-                var arr = [1,2,3],
-                    i = 0;
-                arr.map(function(o) {
-                    arr.push(o+3);
-                    i++;
-                    return o;
-                });
-                expect(arr).toExactlyMatch([1,2,3,4,5,6]);
-                expect(i).toBe(3);
-            });
-            it('should properly translate the values as according to the callback', function() {
-                var result = testSubject.map(callback),
-                    expected = [0,0,1,2,3,4,5,6];
-                delete expected[1];
-                expect(result).toExactlyMatch(expected);
-            });
-            it('should skip non-existing values', function() {
-                var array = [1,2,3,4],
-                    i = 0;
-                delete array[2];
-                array.map(function() {
-                    i++;
-                });
-                expect(i).toBe(3);
-            });
-        });
-        describe('Array-like', function() {
-            beforeEach(function() {
-                testSubject = createArrayLikeFromArray(testSubject);
-            });
-            it('should call callback with the right parameters', function() {
-                var callback = jasmine.createSpy('callback'),
-                    array = createArrayLikeFromArray([1]);
-                Array.prototype.map.call(array, callback);
-                expect(callback).toHaveBeenCalledWith(1, 0, array);
-            });
-            it('should set the context correctly', function() {
-                var context = {};
-                Array.prototype.map.call(testSubject, function(o,i) {
-                    this[i] = o;
-                }, context);
-                delete testSubject.length;
-                expect(context).toExactlyMatch(testSubject);
-            });
-            it('should set the right context when given none', function() {
-                var context;
-                Array.prototype.map.call(createArrayLikeFromArray([1]), function() {context = this;});
-                expect(context).toBe(function() {return this}.call());
-            });
-            it('should not change the array it is called on', function() {
-                var copy = createArrayLikeFromArray(testSubject);
-                Array.prototype.map.call(testSubject, callback);
-                expect(testSubject).toExactlyMatch(copy);
-            });
-            it('should only run for the number of objects in the array when it started', function() {
-                var arr = createArrayLikeFromArray([1,2,3]),
-                    i = 0;
-                Array.prototype.map.call(arr, function(o) {
-                    Array.prototype.push.call(arr, o+3);
-                    i++;
-                    return o;
-                });
-                delete arr.length;
-                expect(arr).toExactlyMatch([1,2,3,4,5,6]);
-                expect(i).toBe(3);
-            });
-            it('should properly translate the values as according to the callback', function() {
-                var result = Array.prototype.map.call(testSubject, callback),
-                    expected = [0,0,1,2,3,4,5,6];
-                delete expected[1];
-                expect(result).toExactlyMatch(expected);
-            });
-            it('should skip non-existing values', function() {
-                var array = createArrayLikeFromArray([1,2,3,4]),
-                    i = 0;
-                delete array[2];
-                Array.prototype.map.call(array, function() {
-                    i++;
-                });
-                expect(i).toBe(3);
-            });
-        });
-    });
-
-    describe('reduce', function() {
-        beforeEach(function() {
-            testSubject = [1,2,3];
-        });
-
-        describe('Array', function() {
-            it('should pass the correct arguments to the callback', function() {
-                var spy = jasmine.createSpy().andReturn(0);
-                testSubject.reduce(spy);
-                expect(spy.calls[0].args).toExactlyMatch([1, 2, 1, testSubject]);
-            });
-            it('should start with the right initialValue', function() {
-                var spy = jasmine.createSpy().andReturn(0);
-                testSubject.reduce(spy, 0);
-                expect(spy.calls[0].args).toExactlyMatch([0, 1, 0, testSubject]);
-            });
-            it('should not affect elements added to the array after it has begun', function() {
-                var arr = [1,2,3],
-                    i = 0;
-                arr.reduce(function(a, b) {
-                    i++;
-                    if(i <= 4) {
-                        arr.push(a+3);
-                    };
-                    return b;
-                });
-                expect(arr).toEqual([1,2,3,4,5]);
-                expect(i).toBe(2);
-            });
-            it('should work as expected for empty arrays', function() {
-                var spy = jasmine.createSpy();
-                expect(function() {
-                    [].reduce(spy);
-                }).toThrow();
-                expect(spy).not.toHaveBeenCalled();
-            });
-            it('should throw correctly if no callback is given', function() {
-                expect(function() {
-                    testSubject.reduce();
-                }).toThrow();
-            });
-            it('should return the expected result', function() {
-                expect(testSubject.reduce(function(a,b) {
-                    return (a||'').toString()+(b||'').toString();
-                })).toEqual(testSubject.join(''));
-            });
-            it('should not directly affect the passed array', function() {
-                var copy = testSubject.slice();
-                testSubject.reduce(function(a,b) {
-                    return a+b;
-                });
-                expect(testSubject).toEqual(copy);
-            });
-            it('should skip non-set values', function() {
-                delete testSubject[1];
-                var visited = {};
-                testSubject.reduce(function(a,b) {
-                    if(a)
-                        visited[a] = true;
-                    if(b)
-                        visited[b] = true;
-                    return 0;
-                });
-
-                expect(visited).toEqual({ '1': true, '3': true });
-            });
-            it('should have the right length', function() {
-                expect(testSubject.reduce.length).toBe(1);
-            });
-        });
-        describe('Array-like objects', function() {
-            beforeEach(function() {
-                testSubject = createArrayLikeFromArray(testSubject);
-                testSubject.reduce = Array.prototype.reduce;
-            });
-            it('should pass the correct arguments to the callback', function() {
-                var spy = jasmine.createSpy().andReturn(0);
-                testSubject.reduce(spy);
-                expect(spy.calls[0].args).toExactlyMatch([1, 2, 1, testSubject]);
-            });
-            it('should start with the right initialValue', function() {
-                var spy = jasmine.createSpy().andReturn(0);
-                testSubject.reduce(spy, 0);
-                expect(spy.calls[0].args).toExactlyMatch([0, 1, 0, testSubject]);
-            });
-            it('should not affect elements added to the array after it has begun', function() {
-                var arr = createArrayLikeFromArray([1,2,3]),
-                    i = 0;
-                Array.prototype.reduce.call(arr, function(a, b) {
-                    i++;
-                    if(i <= 4) {
-                        arr[i+2] = a+3;
-                    };
-                    return b;
-                });
-                expect(arr).toEqual({
-                    0: 1,
-                    1: 2,
-                    2: 3,
-                    3: 4,
-                    4: 5,
-                    length: 3
-                });
-                expect(i).toBe(2);
-            });
-            it('should work as expected for empty arrays', function() {
-                var spy = jasmine.createSpy();
-                expect(function() {
-                    Array.prototype.reduce.call({length: 0}, spy);
-                }).toThrow();
-                expect(spy).not.toHaveBeenCalled();
-            });
-            it('should throw correctly if no callback is given', function() {
-                expect(function() {
-                    testSubject.reduce();
-                }).toThrow();
-            });
-            it('should return the expected result', function() {
-                expect(testSubject.reduce(function(a,b) {
-                    return (a||'').toString()+(b||'').toString();
-                })).toEqual('123');
-            });
-            it('should not directly affect the passed array', function() {
-                var copy = createArrayLikeFromArray(testSubject);
-                testSubject.reduce(function(a,b) {
-                    return a+b;
-                });
-                delete(testSubject.reduce);
-                expect(testSubject).toEqual(copy);
-            });
-            it('should skip non-set values', function() {
-                delete testSubject[1];
-                var visited = {};
-                testSubject.reduce(function(a,b) {
-                    if(a)
-                        visited[a] = true;
-                    if(b)
-                        visited[b] = true;
-                    return 0;
-                });
-
-                expect(visited).toEqual({ '1': true, '3': true });
-            });
-            it('should have the right length', function() {
-                expect(testSubject.reduce.length).toBe(1);
-            });
-        });
-    });
-    describe('reduceRight', function() {
-        beforeEach(function() {
-            testSubject = [1,2,3];
-        });
-
-        describe('Array', function() {
-            it('should pass the correct arguments to the callback', function() {
-                var spy = jasmine.createSpy().andReturn(0);
-                testSubject.reduceRight(spy);
-                expect(spy.calls[0].args).toExactlyMatch([3, 2, 1, testSubject]);
-            });
-            it('should start with the right initialValue', function() {
-                var spy = jasmine.createSpy().andReturn(0);
-                testSubject.reduceRight(spy, 0);
-                expect(spy.calls[0].args).toExactlyMatch([0, 3, 2, testSubject]);
-            });
-            it('should not affect elements added to the array after it has begun', function() {
-                var arr = [1,2,3],
-                    i = 0;
-                arr.reduceRight(function(a, b) {
-                    i++;
-                    if(i <= 4) {
-                        arr.push(a+3);
-                    };
-                    return b;
-                });
-                expect(arr).toEqual([1,2,3,6,5]);
-                expect(i).toBe(2);
-            });
-            it('should work as expected for empty arrays', function() {
-                var spy = jasmine.createSpy();
-                expect(function() {
-                    [].reduceRight(spy);
-                }).toThrow();
-                expect(spy).not.toHaveBeenCalled();
-            });
-            it('should work as expected for empty arrays with an initial value', function() {
-                var spy = jasmine.createSpy(),
-                    result;
-
-                result = [].reduceRight(spy, '');
-                expect(spy).not.toHaveBeenCalled();
-                expect(result).toBe('');
-            });
-            it('should throw correctly if no callback is given', function() {
-                expect(function() {
-                    testSubject.reduceRight();
-                }).toThrow();
-            });
-            it('should return the expected result', function() {
-                expect(testSubject.reduceRight(function(a,b) {
-                    return (a||'').toString()+(b||'').toString();
-                })).toEqual('321');
-            });
-            it('should not directly affect the passed array', function() {
-                var copy = testSubject.slice();
-                testSubject.reduceRight(function(a,b) {
-                    return a+b;
-                });
-                expect(testSubject).toEqual(copy);
-            });
-            it('should skip non-set values', function() {
-                delete testSubject[1];
-                var visited = {};
-                testSubject.reduceRight(function(a,b) {
-                    if(a)
-                        visited[a] = true;
-                    if(b)
-                        visited[b] = true;
-                    return 0;
-                });
-
-                expect(visited).toEqual({ '1': true, '3': true });
-            });
-            it('should have the right length', function() {
-                expect(testSubject.reduceRight.length).toBe(1);
-            });
-        });
-        describe('Array-like objects', function() {
-            beforeEach(function() {
-                testSubject = createArrayLikeFromArray(testSubject);
-                testSubject.reduceRight = Array.prototype.reduceRight;
-            });
-            it('should pass the correct arguments to the callback', function() {
-                var spy = jasmine.createSpy().andReturn(0);
-                testSubject.reduceRight(spy);
-                expect(spy.calls[0].args).toExactlyMatch([3, 2, 1, testSubject]);
-            });
-            it('should start with the right initialValue', function() {
-                var spy = jasmine.createSpy().andReturn(0);
-                testSubject.reduceRight(spy, 0);
-                expect(spy.calls[0].args).toExactlyMatch([0, 3, 2, testSubject]);
-            });
-            it('should not affect elements added to the array after it has begun', function() {
-                var arr = createArrayLikeFromArray([1,2,3]),
-                    i = 0;
-                Array.prototype.reduceRight.call(arr, function(a, b) {
-                    i++;
-                    if(i <= 4) {
-                        arr[i+2] = a+3;
-                    };
-                    return b;
-                });
-                expect(arr).toEqual({
-                    0: 1,
-                    1: 2,
-                    2: 3,
-                    3: 6,
-                    4: 5,
-                    length: 3 // does not get updated on property assignment
-                });
-                expect(i).toBe(2);
-            });
-            it('should work as expected for empty arrays', function() {
-                var spy = jasmine.createSpy();
-                expect(function() {
-                    Array.prototype.reduceRight.call({length:0}, spy);
-                }).toThrow();
-                expect(spy).not.toHaveBeenCalled();
-            });
-            it('should throw correctly if no callback is given', function() {
-                expect(function() {
-                    testSubject.reduceRight();
-                }).toThrow();
-            });
-            it('should return the expected result', function() {
-                expect(testSubject.reduceRight(function(a,b) {
-                    return (a||'').toString()+(b||'').toString();
-                })).toEqual('321');
-            });
-            it('should not directly affect the passed array', function() {
-                var copy = createArrayLikeFromArray(testSubject);
-                testSubject.reduceRight(function(a,b) {
-                    return a+b;
-                });
-                delete(testSubject.reduceRight);
-                expect(testSubject).toEqual(copy);
-            });
-            it('should skip non-set values', function() {
-                delete testSubject[1];
-                var visited = {};
-                testSubject.reduceRight(function(a,b) {
-                    if(a)
-                        visited[a] = true;
-                    if(b)
-                        visited[b] = true;
-                    return 0;
-                });
-
-                expect(visited).toEqual({ '1': true, '3': true });
-            });
-            it('should have the right length', function() {
-                expect(testSubject.reduceRight.length).toBe(1);
-            });
-        });
-    });
-
-    describe('isArray', function () {
-        it('should work for Array', function () {
-            var ret = Array.isArray([]);
-
-            expect(ret).toBe(true);
-        });
-
-        it('should fail for other objects', function () {
-            var objects = [
-                "someString",
-                true,
-                false,
-                42,
-                0,
-                {},
-                Object.create && Object.create(null) || null,
-                /foo/,
-                arguments,
-                document.getElementsByTagName("div")
-            ];
-
-            objects.forEach(function (v) {
-                expect(Array.isArray(v)).toBe(false);
-            });
-        });
-    });
-
-    describe('unshift', function () {
-        it('should return length', function () {
-            expect([].unshift(0)).toEqual(1);
-        });
-    });
-
-    describe('splice', function () {
-        var b = ["b"],
-            a = [1, "a", b],
-            test;
-
-        var makeArray = function(l, prefix) {
-            prefix = prefix || "";
-            var a = [];
-            while (l--) {
-                a.unshift(prefix + Array(l + 1).join(" ") + l)
-            }
-            return a
-        };
-
-        beforeEach(function() {
-            test = a.slice(0);
-        });
-
-        it('basic implementation test 1', function () {
-            expect(test.splice(0)).toEqual(a);
-        });
-        it('basic implementation test 2', function () {
-            test.splice(0, 2);
-            expect(test).toEqual([b]);
-        });
-
-        it('should return right result 1', function () {
-            expect((function() {
-                var array = [];
-
-                array.splice(0, 0, 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20);
-                array.splice(1, 0, "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16", "F17", "F18", "F19", "F20", "F21","F22", "F23", "F24", "F25", "F26");
-                array.splice(5, 0, "XXX");
-
-                return array.join("|");
-            }())).toBe("1|F1|F2|F3|F4|XXX|F5|F6|F7|F8|F9|F10|F11|F12|F13|F14|F15|F16|F17|F18|F19|F20|F21|F22|F23|F24|F25|F26|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20");
-        });
-
-        it('should return right result 2', function () {
-            expect((function() {
-                var array = makeArray(6);
-
-                array.splice(array.length - 1, 1, "");
-                array.splice(0, 1, 1,2,3,4);
-                array.splice(0, 0, 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20, 21, 22, 23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45);
-
-                array.splice(4, 0, "99999999999999");
-                return array.join("|");
-            }())).toBe("1|2|3|4|99999999999999|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|1|2|3|4| 1|  2|   3|    4|");
-        });
-
-        it('should return right result 3', function () {
-            expect((function() {
-                var array = [1,2,3];
-
-                array.splice(0);
-                array.splice(0, 1, 1,2,3,4,5,6,7,8,9,10);
-                array.splice(1, 1, "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16", "F17", "F18", "F19", "F20", "F21","F22", "F23", "F24", "F25", "F26");
-                array.splice(5, 1, "YYY", "XXX");
-                array.splice(0, 1);
-                array.splice(0, 2);
-                array.pop();
-                array.push.apply(array, makeArray(10, "-"));
-                array.splice(array.length - 2, 10);
-                array.splice();
-                array.splice(1, 1, 1,2,3,4,5,6,7,8,9,10,1,2,3,4,5,6,7,8,9);
-                array.splice(1, 1, "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16", "F17", "F18", "F19", "F20", "F21","F22", "F23", "F24", "F25", "F26",1,23,4,5,6,7,8);
-                array.splice(30, 10);
-                array.splice(30, 1);
-                array.splice(30, 0);
-                array.splice(2, 5, 1,2,3,"P", "LLL", "CCC", "YYY", "XXX");
-                array.push(1,2,3,4,5,6);
-                array.splice(1, 6, 1,2,3,4,5,6,7,8,9,4,5,6,7,8,9);
-                array.splice(3, 7);
-                array.unshift(7,8,9,10,11);
-                array.pop();
-                array.splice(5, 2);
-                array.pop();
-                array.unshift.apply(array, makeArray(8, "~"));
-                array.pop();
-                array.splice(3, 1, "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16", "F17", "F18", "F19", "F20", "F21","F22", "F23", "F24", "F25", "F26",1,23,4,5,6,7,8);
-                array.splice(4, 5, "P", "LLL", "CCC", "YYY", "XXX");
-
-                return array.join("|");
-            }())).toBe("~0|~ 1|~  2|F1|P|LLL|CCC|YYY|XXX|F7|F8|F9|F10|F11|F12|F13|F14|F15|F16|F17|F18|F19|F20|F21|F22|F23|F24|F25|F26|1|23|4|5|6|7|8|~    4|~     5|~      6|~       7|7|8|9|10|11|2|4|5|6|7|8|9|CCC|YYY|XXX|F7|F8|F9|F10|F11|F12|F13|F14|F15|F16|F17|F18|F19|F20|F21|F22|F23|F24|F25|F26|1|23|4|9|10|1|2|3|4|5|6|7|8|9|YYY|XXX|F6|F7|F8|F9|F10|F11|F12|F13|F14|F15|F16|F17|F18|F19|F20|F21|F22|F23|F24|F25|F26|3|4|5|6|7|8|9|-0|- 1|-  2|-   3|-    4|-     5|-      6|-       7|1|2|3");
-        });
-
-
-        it('should do nothing if method called with no arguments', function () {
-            expect(test.splice()).toEqual([]);
-            expect(test).toEqual(a);
-        });
-        //TODO:: Is this realy TRUE behavior?
-        it('should set first argument to 0 if first argument is set but undefined', function () {
-            var test2 = test.slice(0);
-            expect(test.splice(void 0, 2)).toEqual(test2.splice(0, 2));
-            expect(test).toEqual(test2);
-        });
-
-        it('should deleted and return all items after "start" when second argument is undefined', function () {
-            expect(test.splice(0)).toEqual(a);
-            expect(test).toEqual([]);
-        });
-        it('should deleted and return all items after "start" when second argument is undefined', function () {
-            expect(test.splice(2)).toEqual([b]);
-            expect(test).toEqual([1, "a"]);
-        });
-        it('runshould have the right length', function () {
-            expect(test.splice.length).toBe(2);
-        });
-    });
+describe('Array', function () {
+	var testSubject;
+	beforeEach(function () {
+		testSubject = [2, 3, undefined, true, 'hej', null, false, 0];
+		delete testSubject[1];
+	});
+
+	function createArrayLikeFromArray(arr) {
+		var o = {};
+		Array.prototype.forEach.call(arr, function (e, i) {
+			o[i] = e;
+		});
+		o.length = arr.length;
+		return o;
+	};
+
+	describe('forEach', function () {
+		"use strict";
+		var expected, actual;
+
+		beforeEach(function () {
+			expected = {0: 2, 2: undefined, 3: true, 4: 'hej', 5: null, 6: false, 7: 0};
+			actual = {};
+		});
+		it('should pass the right parameters', function () {
+			var callback = jasmine.createSpy('callback'),
+				array = ['1'];
+			array.forEach(callback);
+			expect(callback).toHaveBeenCalledWith('1', 0, array);
+		});
+		it('should not affect elements added to the array after it has begun', function () {
+			var arr = [1, 2, 3],
+				i = 0;
+			arr.forEach(function (a) {
+				i++;
+				arr.push(a + 3);
+			});
+			expect(arr).toEqual([1, 2, 3, 4, 5, 6]);
+			expect(i).toBe(3);
+		});
+
+		it('should set the right context when given none', function () {
+			var context;
+			[1].forEach(function () {
+				context = this;
+			});
+			expect(context).toBe(function () {
+				return this
+			}.call());
+		});
+		it('should iterate all', function () {
+			testSubject.forEach(function (obj, index) {
+				actual[index] = obj;
+			});
+			expect(actual).toExactlyMatch(expected);
+		});
+		it('should iterate all using a context', function () {
+			var o = {a: actual};
+
+			testSubject.forEach(function (obj, index) {
+				this.a[index] = obj;
+			}, o);
+			expect(actual).toExactlyMatch(expected);
+		});
+
+		it('should iterate all in an array-like object', function () {
+			var ts = createArrayLikeFromArray(testSubject);
+			Array.prototype.forEach.call(ts, function (obj, index) {
+				actual[index] = obj;
+			});
+			expect(actual).toExactlyMatch(expected);
+		});
+		it('should iterate all in an array-like object using a context', function () {
+			var ts = createArrayLikeFromArray(testSubject),
+				o = {a: actual};
+
+			Array.prototype.forEach.call(ts, function (obj, index) {
+				this.a[index] = obj;
+			}, o);
+			expect(actual).toExactlyMatch(expected);
+		});
+
+		describe('strings', function () {
+			var str = 'Hello, World!',
+				toString = Object.prototype.toString;
+			it('should iterate all in a string', function () {
+				actual = [];
+				Array.prototype.forEach.call(str, function (item, index) {
+					actual[index] = item;
+				});
+				expect(actual).toExactlyMatch(str.split(''));
+			});
+			it('should iterate all in a string using a context', function () {
+				actual = [];
+				var o = {a: actual};
+				Array.prototype.forEach.call(str, function (item, index) {
+					this.a[index] = item;
+				}, o);
+				expect(actual).toExactlyMatch(str.split(''));
+			});
+			it('should have String object for third argument of callback', function () {
+				Array.prototype.forEach.call(str, function (item, index, obj) {
+					actual = obj;
+				});
+				expect(typeof actual).toBe("object");
+				expect(toString.call(actual)).toBe("[object String]");
+			});
+		});
+	});
+	describe('some', function () {
+		var actual, expected, numberOfRuns;
+
+		beforeEach(function () {
+			expected = {0: 2, 2: undefined, 3: true};
+			actual = {};
+			numberOfRuns = 0;
+		});
+
+		it('should pass the correct values along to the callback', function () {
+			var callback = jasmine.createSpy('callback');
+			var array = ['1'];
+			array.some(callback);
+			expect(callback).toHaveBeenCalledWith('1', 0, array);
+		});
+		it('should not affect elements added to the array after it has begun', function () {
+			var arr = [1, 2, 3],
+				i = 0;
+			arr.some(function (a) {
+				i++;
+				arr.push(a + 3);
+				return i > 3;
+			});
+			expect(arr).toEqual([1, 2, 3, 4, 5, 6]);
+			expect(i).toBe(3);
+		});
+		it('should set the right context when given none', function () {
+			var context;
+			[1].some(function () {
+				context = this;
+			});
+			expect(context).toBe(function () {
+				return this
+			}.call());
+		});
+
+		it('should return false if it runs to the end', function () {
+			actual = testSubject.some(function () {
+			});
+			expect(actual).toBeFalsy();
+		});
+		it('should return true if it is stopped somewhere', function () {
+			actual = testSubject.some(function () {
+				return true;
+			});
+			expect(actual).toBeTruthy();
+		});
+		it('should return false if there are no elements', function () {
+			actual = [].some(function () {
+				return true;
+			});
+			expect(actual).toBeFalsy();
+		});
+
+		it('should stop after 3 elements', function () {
+			testSubject.some(function (obj, index) {
+				actual[index] = obj;
+				numberOfRuns += 1;
+				if (numberOfRuns == 3) {
+					return true;
+				}
+				return false;
+			});
+			expect(actual).toExactlyMatch(expected);
+		});
+		it('should stop after 3 elements using a context', function () {
+			var o = {a: actual};
+			testSubject.some(function (obj, index) {
+				this.a[index] = obj;
+				numberOfRuns += 1;
+				if (numberOfRuns == 3) {
+					return true;
+				}
+				return false;
+			}, o);
+			expect(actual).toExactlyMatch(expected);
+		});
+
+		it('should stop after 3 elements in an array-like object', function () {
+			var ts = createArrayLikeFromArray(testSubject);
+			Array.prototype.some.call(ts, function (obj, index) {
+				actual[index] = obj;
+				numberOfRuns += 1;
+				if (numberOfRuns == 3) {
+					return true;
+				}
+				return false;
+			});
+			expect(actual).toExactlyMatch(expected);
+		});
+		it('should stop after 3 elements in an array-like object using a context', function () {
+			var ts = createArrayLikeFromArray(testSubject);
+			var o = {a: actual};
+			Array.prototype.some.call(ts, function (obj, index) {
+				this.a[index] = obj;
+				numberOfRuns += 1;
+				if (numberOfRuns == 3) {
+					return true;
+				}
+				return false;
+			}, o);
+			expect(actual).toExactlyMatch(expected);
+		});
+	});
+	describe('every', function () {
+		var actual, expected, numberOfRuns;
+
+		beforeEach(function () {
+			expected = {0: 2, 2: undefined, 3: true};
+			actual = {};
+			numberOfRuns = 0;
+		});
+
+		it('should pass the correct values along to the callback', function () {
+			var callback = jasmine.createSpy('callback');
+			var array = ['1'];
+			array.every(callback);
+			expect(callback).toHaveBeenCalledWith('1', 0, array);
+		});
+		it('should not affect elements added to the array after it has begun', function () {
+			var arr = [1, 2, 3],
+				i = 0;
+			arr.every(function (a) {
+				i++;
+				arr.push(a + 3);
+				return i <= 3;
+			});
+			expect(arr).toEqual([1, 2, 3, 4, 5, 6]);
+			expect(i).toBe(3);
+		});
+		it('should set the right context when given none', function () {
+			var context;
+			[1].every(function () {
+				context = this;
+			});
+			expect(context).toBe(function () {
+				return this
+			}.call());
+		});
+
+		it('should return true if the array is empty', function () {
+			actual = [].every(function () {
+				return true;
+			});
+			expect(actual).toBeTruthy();
+
+			actual = [].every(function () {
+				return false;
+			});
+			expect(actual).toBeTruthy();
+		});
+		it('should return true if it runs to the end', function () {
+			actual = [1, 2, 3].every(function () {
+				return true;
+			});
+			expect(actual).toBeTruthy();
+		});
+		it('should return false if it is stopped before the end', function () {
+			actual = [1, 2, 3].every(function () {
+				return false;
+			});
+			expect(actual).toBeFalsy();
+		});
+
+		it('should return after 3 elements', function () {
+			testSubject.every(function (obj, index) {
+				actual[index] = obj;
+				numberOfRuns += 1;
+				if (numberOfRuns == 3) {
+					return false;
+				}
+				return true;
+			});
+			expect(actual).toExactlyMatch(expected);
+		});
+		it('should stop after 3 elements using a context', function () {
+			var o = {a: actual};
+			testSubject.every(function (obj, index) {
+				this.a[index] = obj;
+				numberOfRuns += 1;
+				if (numberOfRuns == 3) {
+					return false;
+				}
+				return true;
+			}, o);
+			expect(actual).toExactlyMatch(expected);
+		});
+
+		it('should stop after 3 elements in an array-like object', function () {
+			var ts = createArrayLikeFromArray(testSubject);
+			Array.prototype.every.call(ts, function (obj, index) {
+				actual[index] = obj;
+				numberOfRuns += 1;
+				if (numberOfRuns == 3) {
+					return false;
+				}
+				return true;
+			});
+			expect(actual).toExactlyMatch(expected);
+		});
+		it('should stop after 3 elements in an array-like object using a context', function () {
+			var ts = createArrayLikeFromArray(testSubject);
+			var o = {a: actual};
+			Array.prototype.every.call(ts, function (obj, index) {
+				this.a[index] = obj;
+				numberOfRuns += 1;
+				if (numberOfRuns == 3) {
+					return false;
+				}
+				return true;
+			}, o);
+			expect(actual).toExactlyMatch(expected);
+		});
+	});
+
+	describe('indexOf', function () {
+		"use strict";
+		var actual, expected, testSubject;
+
+		beforeEach(function () {
+			testSubject = [2, 3, undefined, true, 'hej', null, 2, false, 0];
+			delete testSubject[1];
+
+		});
+
+		it('should find the element', function () {
+			expected = 4;
+			actual = testSubject.indexOf('hej');
+			expect(actual).toEqual(expected);
+		});
+		it('should not find the element', function () {
+			expected = -1;
+			actual = testSubject.indexOf('mus');
+			expect(actual).toEqual(expected);
+		});
+		it('should find undefined as well', function () {
+			expected = -1;
+			actual = testSubject.indexOf(undefined);
+			expect(actual).not.toEqual(expected);
+		});
+		it('should skip unset indexes', function () {
+			expected = 2;
+			actual = testSubject.indexOf(undefined);
+			expect(actual).toEqual(expected);
+		});
+		it('should use a strict test', function () {
+			actual = testSubject.indexOf(null);
+			expect(actual).toEqual(5);
+
+			actual = testSubject.indexOf('2');
+			expect(actual).toEqual(-1);
+		});
+		it('should skip the first if fromIndex is set', function () {
+			expect(testSubject.indexOf(2, 2)).toEqual(6);
+			expect(testSubject.indexOf(2, 0)).toEqual(0);
+			expect(testSubject.indexOf(2, 6)).toEqual(6);
+		});
+		it('should work with negative fromIndex', function () {
+			expect(testSubject.indexOf(2, -3)).toEqual(6);
+			expect(testSubject.indexOf(2, -9)).toEqual(0);
+		});
+		it('should work with fromIndex being greater than the length', function () {
+			expect(testSubject.indexOf(0, 20)).toEqual(-1);
+		});
+		it('should work with fromIndex being negative and greater than the length', function () {
+			expect(testSubject.indexOf('hej', -20)).toEqual(4);
+		});
+
+		describe('Array-like', function ArrayLike() {
+			var indexOf = Array.prototype.indexOf,
+				testAL;
+			beforeEach(function beforeEach() {
+				testAL = {};
+				testSubject = [2, 3, undefined, true, 'hej', null, 2, false, 0];
+				testSubject.forEach(function (o, i) {
+					testAL[i] = o;
+				});
+				testAL.length = testSubject.length;
+			});
+			it('should find the element (array-like)', function () {
+				expected = 4;
+				actual = indexOf.call(testAL, 'hej');
+				expect(actual).toEqual(expected);
+			});
+			it('should not find the element (array-like)', function () {
+				expected = -1;
+				actual = indexOf.call(testAL, 'mus');
+				expect(actual).toEqual(expected);
+			});
+			it('should find undefined as well (array-like)', function () {
+				expected = -1;
+				actual = indexOf.call(testAL, undefined);
+				expect(actual).not.toEqual(expected);
+			});
+			it('should skip unset indexes (array-like)', function () {
+				expected = 2;
+				actual = indexOf.call(testAL, undefined);
+				expect(actual).toEqual(expected);
+			});
+			it('should use a strict test (array-like)', function () {
+				actual = Array.prototype.indexOf.call(testAL, null);
+				expect(actual).toEqual(5);
+
+				actual = Array.prototype.indexOf.call(testAL, '2');
+				expect(actual).toEqual(-1);
+			});
+			it('should skip the first if fromIndex is set (array-like)', function () {
+				expect(indexOf.call(testAL, 2, 2)).toEqual(6);
+				expect(indexOf.call(testAL, 2, 0)).toEqual(0);
+				expect(indexOf.call(testAL, 2, 6)).toEqual(6);
+			});
+			it('should work with negative fromIndex (array-like)', function () {
+				expect(indexOf.call(testAL, 2, -3)).toEqual(6);
+				expect(indexOf.call(testAL, 2, -9)).toEqual(0);
+			});
+			it('should work with fromIndex being greater than the length (array-like)', function () {
+				expect(indexOf.call(testAL, 0, 20)).toEqual(-1);
+			});
+			it('should work with fromIndex being negative and greater than the length (array-like)', function () {
+				expect(indexOf.call(testAL, 'hej', -20)).toEqual(4);
+			});
+		});
+	});
+	describe('lastIndexOf', function () {
+		"use strict";
+		var actual, expected, testSubject, testAL;
+
+		beforeEach(function () {
+			testSubject = [2, 3, undefined, true, 'hej', null, 2, 3, false, 0];
+			delete testSubject[1];
+			delete testSubject[7];
+		});
+		describe('Array', function () {
+			it('should find the element', function () {
+				expected = 4;
+				actual = testSubject.lastIndexOf('hej');
+				expect(actual).toEqual(expected);
+			});
+			it('should not find the element', function () {
+				expected = -1;
+				actual = testSubject.lastIndexOf('mus');
+				expect(actual).toEqual(expected);
+			});
+			it('should find undefined as well', function () {
+				expected = -1;
+				actual = testSubject.lastIndexOf(undefined);
+				expect(actual).not.toEqual(expected);
+			});
+			it('should skip unset indexes', function () {
+				expected = 2;
+				actual = testSubject.lastIndexOf(undefined);
+				expect(actual).toEqual(expected);
+			});
+			it('should use a strict test', function () {
+				actual = testSubject.lastIndexOf(null);
+				expect(actual).toEqual(5);
+
+				actual = testSubject.lastIndexOf('2');
+				expect(actual).toEqual(-1);
+			});
+			it('should skip the first if fromIndex is set', function () {
+				expect(testSubject.lastIndexOf(2, 2)).toEqual(0);
+				expect(testSubject.lastIndexOf(2, 0)).toEqual(0);
+				expect(testSubject.lastIndexOf(2, 6)).toEqual(6);
+			});
+			it('should work with negative fromIndex', function () {
+				expect(testSubject.lastIndexOf(2, -3)).toEqual(6);
+				expect(testSubject.lastIndexOf(2, -9)).toEqual(0);
+			});
+			it('should work with fromIndex being greater than the length', function () {
+				expect(testSubject.lastIndexOf(2, 20)).toEqual(6);
+			});
+			it('should work with fromIndex being negative and greater than the length', function () {
+				expect(testSubject.lastIndexOf(2, -20)).toEqual(-1);
+			});
+		});
+
+		describe('Array like', function () {
+			var lastIndexOf = Array.prototype.lastIndexOf,
+				testAL;
+			beforeEach(function () {
+				testAL = {};
+				testSubject.forEach(function (o, i) {
+					testAL[i] = o;
+				});
+				testAL.length = testSubject.length;
+			});
+			it('should find the element (array-like)', function () {
+				expected = 4;
+				actual = lastIndexOf.call(testAL, 'hej');
+				expect(actual).toEqual(expected);
+			});
+			it('should not find the element (array-like)', function () {
+				expected = -1;
+				actual = lastIndexOf.call(testAL, 'mus');
+				expect(actual).toEqual(expected);
+			});
+			it('should find undefined as well (array-like)', function () {
+				expected = -1;
+				actual = lastIndexOf.call(testAL, undefined);
+				expect(actual).not.toEqual(expected);
+			});
+			it('should skip unset indexes (array-like)', function () {
+				expected = 2;
+				actual = lastIndexOf.call(testAL, undefined);
+				expect(actual).toEqual(expected);
+			});
+			it('should use a strict test (array-like)', function () {
+				actual = lastIndexOf.call(testAL, null);
+				expect(actual).toEqual(5);
+
+				actual = lastIndexOf.call(testAL, '2');
+				expect(actual).toEqual(-1);
+			});
+			it('should skip the first if fromIndex is set', function () {
+				expect(lastIndexOf.call(testAL, 2, 2)).toEqual(0);
+				expect(lastIndexOf.call(testAL, 2, 0)).toEqual(0);
+				expect(lastIndexOf.call(testAL, 2, 6)).toEqual(6);
+			});
+			it('should work with negative fromIndex', function () {
+				expect(lastIndexOf.call(testAL, 2, -3)).toEqual(6);
+				expect(lastIndexOf.call(testAL, 2, -9)).toEqual(0);
+			});
+			it('should work with fromIndex being greater than the length', function () {
+				expect(lastIndexOf.call(testAL, 2, 20)).toEqual(6);
+			});
+			it('should work with fromIndex being negative and greater than the length', function () {
+				expect(lastIndexOf.call(testAL, 2, -20)).toEqual(-1);
+			});
+		});
+	});
+
+	describe('filter', function () {
+		var filteredArray,
+			callback = function callback(o, i, arr) {
+				return (
+					i != 3 && i != 5
+				);
+			};
+
+		beforeEach(function () {
+			testSubject = [2, 3, undefined, true, 'hej', 3, null, false, 0];
+			delete testSubject[1];
+			filteredArray = [2, undefined, 'hej', null, false, 0];
+		});
+		describe('Array object', function () {
+
+			it('should call the callback with the proper arguments', function () {
+				var callback = jasmine.createSpy('callback'),
+					arr = ['1'];
+				arr.filter(callback);
+				expect(callback).toHaveBeenCalledWith('1', 0, arr);
+			});
+			it('should not affect elements added to the array after it has begun', function () {
+				var arr = [1, 2, 3],
+					i = 0;
+				arr.filter(function (a) {
+					i++;
+					if (i <= 4) {
+						arr.push(a + 3);
+					}
+					return true;
+				});
+				expect(arr).toEqual([1, 2, 3, 4, 5, 6]);
+				expect(i).toBe(3);
+			});
+			it('should skip non-set values', function () {
+				var passedValues = {};
+				testSubject = [1, 2, 3, 4];
+				delete testSubject[1];
+				testSubject.filter(function (o, i) {
+					passedValues[i] = o;
+					return true;
+				});
+				expect(passedValues).toExactlyMatch(testSubject);
+			});
+			it('should pass the right context to the filter', function () {
+				var passedValues = {};
+				testSubject = [1, 2, 3, 4];
+				delete testSubject[1];
+				testSubject.filter(function (o, i) {
+					this[i] = o;
+					return true;
+				}, passedValues);
+				expect(passedValues).toExactlyMatch(testSubject);
+			});
+			it('should set the right context when given none', function () {
+				var context;
+				[1].filter(function () {
+					context = this;
+				});
+				expect(context).toBe(function () {
+					return this
+				}.call());
+			});
+			it('should remove only the values for which the callback returns false', function () {
+				var result = testSubject.filter(callback);
+				expect(result).toExactlyMatch(filteredArray);
+			});
+			it('should leave the original array untouched', function () {
+				var copy = testSubject.slice();
+				testSubject.filter(callback);
+				expect(testSubject).toExactlyMatch(copy);
+			});
+			it('should not be affected by same-index mutation', function () {
+				var results = [1, 2, 3]
+					.filter(function (value, index, array) {
+						array[index] = 'a';
+						return true;
+					});
+				expect(results).toEqual([1, 2, 3]);
+			});
+		});
+		describe('Array like', function () {
+			beforeEach(function () {
+				testSubject = createArrayLikeFromArray(testSubject);
+			});
+			it('should call the callback with the proper arguments', function () {
+				var callback = jasmine.createSpy('callback'),
+					arr = createArrayLikeFromArray(['1']);
+				Array.prototype.filter.call(arr, callback);
+				expect(callback).toHaveBeenCalledWith('1', 0, arr);
+			});
+			it('should not affect elements added to the array after it has begun', function () {
+				var arr = createArrayLikeFromArray([1, 2, 3]),
+					i = 0;
+				Array.prototype.filter.call(arr, function (a) {
+					i++;
+					if (i <= 4) {
+						arr[i + 2] = a + 3;
+					}
+					return true;
+				});
+				delete arr.length;
+				expect(arr).toExactlyMatch([1, 2, 3, 4, 5, 6]);
+				expect(i).toBe(3);
+			});
+			it('should skip non-set values', function () {
+				var passedValues = {};
+				testSubject = createArrayLikeFromArray([1, 2, 3, 4]);
+				delete testSubject[1];
+				Array.prototype.filter.call(testSubject, function (o, i) {
+					passedValues[i] = o;
+					return true;
+				});
+				delete testSubject.length;
+				expect(passedValues).toExactlyMatch(testSubject);
+			});
+			it('should set the right context when given none', function () {
+				var context;
+				Array.prototype.filter.call(createArrayLikeFromArray([1]), function () {
+					context = this;
+				}, undefined);
+				expect(context).toBe(function () {
+					return this
+				}.call());
+			});
+			it('should pass the right context to the filter', function () {
+				var passedValues = {};
+				testSubject = createArrayLikeFromArray([1, 2, 3, 4]);
+				delete testSubject[1];
+				Array.prototype.filter.call(testSubject, function (o, i) {
+					this[i] = o;
+					return true;
+				}, passedValues);
+				delete testSubject.length;
+				expect(passedValues).toExactlyMatch(testSubject);
+			});
+			it('should remove only the values for which the callback returns false', function () {
+				var result = Array.prototype.filter.call(testSubject, callback);
+				expect(result).toExactlyMatch(filteredArray);
+			});
+			it('should leave the original array untouched', function () {
+				var copy = createArrayLikeFromArray(testSubject);
+				Array.prototype.filter.call(testSubject, callback);
+				expect(testSubject).toExactlyMatch(copy);
+			});
+		});
+	});
+	describe('map', function () {
+		var callback;
+		beforeEach(function () {
+			var i = 0;
+			callback = function () {
+				return i++;
+			};
+		});
+		describe('Array object', function () {
+			it('should call callback with the right parameters', function () {
+				var callback = jasmine.createSpy('callback'),
+					array = [1];
+				array.map(callback);
+				expect(callback).toHaveBeenCalledWith(1, 0, array);
+			});
+			it('should set the context correctly', function () {
+				var context = {};
+				testSubject.map(function (o, i) {
+					this[i] = o;
+				}, context);
+				expect(context).toExactlyMatch(testSubject);
+			});
+			it('should set the right context when given none', function () {
+				var context;
+				[1].map(function () {
+					context = this;
+				});
+				expect(context).toBe(function () {
+					return this
+				}.call());
+			});
+			it('should not change the array it is called on', function () {
+				var copy = testSubject.slice();
+				testSubject.map(callback);
+				expect(testSubject).toExactlyMatch(copy);
+			});
+			it('should only run for the number of objects in the array when it started', function () {
+				var arr = [1, 2, 3],
+					i = 0;
+				arr.map(function (o) {
+					arr.push(o + 3);
+					i++;
+					return o;
+				});
+				expect(arr).toExactlyMatch([1, 2, 3, 4, 5, 6]);
+				expect(i).toBe(3);
+			});
+			it('should properly translate the values as according to the callback', function () {
+				var result = testSubject.map(callback),
+					expected = [0, 0, 1, 2, 3, 4, 5, 6];
+				delete expected[1];
+				expect(result).toExactlyMatch(expected);
+			});
+			it('should skip non-existing values', function () {
+				var array = [1, 2, 3, 4],
+					i = 0;
+				delete array[2];
+				array.map(function () {
+					i++;
+				});
+				expect(i).toBe(3);
+			});
+		});
+		describe('Array-like', function () {
+			beforeEach(function () {
+				testSubject = createArrayLikeFromArray(testSubject);
+			});
+			it('should call callback with the right parameters', function () {
+				var callback = jasmine.createSpy('callback'),
+					array = createArrayLikeFromArray([1]);
+				Array.prototype.map.call(array, callback);
+				expect(callback).toHaveBeenCalledWith(1, 0, array);
+			});
+			it('should set the context correctly', function () {
+				var context = {};
+				Array.prototype.map.call(testSubject, function (o, i) {
+					this[i] = o;
+				}, context);
+				delete testSubject.length;
+				expect(context).toExactlyMatch(testSubject);
+			});
+			it('should set the right context when given none', function () {
+				var context;
+				Array.prototype.map.call(createArrayLikeFromArray([1]), function () {
+					context = this;
+				});
+				expect(context).toBe(function () {
+					return this
+				}.call());
+			});
+			it('should not change the array it is called on', function () {
+				var copy = createArrayLikeFromArray(testSubject);
+				Array.prototype.map.call(testSubject, callback);
+				expect(testSubject).toExactlyMatch(copy);
+			});
+			it('should only run for the number of objects in the array when it started', function () {
+				var arr = createArrayLikeFromArray([1, 2, 3]),
+					i = 0;
+				Array.prototype.map.call(arr, function (o) {
+					Array.prototype.push.call(arr, o + 3);
+					i++;
+					return o;
+				});
+				delete arr.length;
+				expect(arr).toExactlyMatch([1, 2, 3, 4, 5, 6]);
+				expect(i).toBe(3);
+			});
+			it('should properly translate the values as according to the callback', function () {
+				var result = Array.prototype.map.call(testSubject, callback),
+					expected = [0, 0, 1, 2, 3, 4, 5, 6];
+				delete expected[1];
+				expect(result).toExactlyMatch(expected);
+			});
+			it('should skip non-existing values', function () {
+				var array = createArrayLikeFromArray([1, 2, 3, 4]),
+					i = 0;
+				delete array[2];
+				Array.prototype.map.call(array, function () {
+					i++;
+				});
+				expect(i).toBe(3);
+			});
+		});
+	});
+
+	describe('reduce', function () {
+		beforeEach(function () {
+			testSubject = [1, 2, 3];
+		});
+
+		describe('Array', function () {
+			it('should pass the correct arguments to the callback', function () {
+				var spy = jasmine.createSpy().andReturn(0);
+				testSubject.reduce(spy);
+				expect(spy.calls[0].args).toExactlyMatch([1, 2, 1, testSubject]);
+			});
+			it('should start with the right initialValue', function () {
+				var spy = jasmine.createSpy().andReturn(0);
+				testSubject.reduce(spy, 0);
+				expect(spy.calls[0].args).toExactlyMatch([0, 1, 0, testSubject]);
+			});
+			it('should not affect elements added to the array after it has begun', function () {
+				var arr = [1, 2, 3],
+					i = 0;
+				arr.reduce(function (a, b) {
+					i++;
+					if (i <= 4) {
+						arr.push(a + 3);
+					}
+					;
+					return b;
+				});
+				expect(arr).toEqual([1, 2, 3, 4, 5]);
+				expect(i).toBe(2);
+			});
+			it('should work as expected for empty arrays', function () {
+				var spy = jasmine.createSpy();
+				expect(function () {
+					[].reduce(spy);
+				}).toThrow();
+				expect(spy).not.toHaveBeenCalled();
+			});
+			it('should throw correctly if no callback is given', function () {
+				expect(function () {
+					testSubject.reduce();
+				}).toThrow();
+			});
+			it('should return the expected result', function () {
+				expect(testSubject.reduce(function (a, b) {
+					return (a || '').toString() + (b || '').toString();
+				})).toEqual(testSubject.join(''));
+			});
+			it('should not directly affect the passed array', function () {
+				var copy = testSubject.slice();
+				testSubject.reduce(function (a, b) {
+					return a + b;
+				});
+				expect(testSubject).toEqual(copy);
+			});
+			it('should skip non-set values', function () {
+				delete testSubject[1];
+				var visited = {};
+				testSubject.reduce(function (a, b) {
+					if (a)
+						visited[a] = true;
+					if (b)
+						visited[b] = true;
+					return 0;
+				});
+
+				expect(visited).toEqual({'1': true, '3': true});
+			});
+			it('should have the right length', function () {
+				expect(testSubject.reduce.length).toBe(1);
+			});
+		});
+		describe('Array-like objects', function () {
+			beforeEach(function () {
+				testSubject = createArrayLikeFromArray(testSubject);
+				testSubject.reduce = Array.prototype.reduce;
+			});
+			it('should pass the correct arguments to the callback', function () {
+				var spy = jasmine.createSpy().andReturn(0);
+				testSubject.reduce(spy);
+				expect(spy.calls[0].args).toExactlyMatch([1, 2, 1, testSubject]);
+			});
+			it('should start with the right initialValue', function () {
+				var spy = jasmine.createSpy().andReturn(0);
+				testSubject.reduce(spy, 0);
+				expect(spy.calls[0].args).toExactlyMatch([0, 1, 0, testSubject]);
+			});
+			it('should not affect elements added to the array after it has begun', function () {
+				var arr = createArrayLikeFromArray([1, 2, 3]),
+					i = 0;
+				Array.prototype.reduce.call(arr, function (a, b) {
+					i++;
+					if (i <= 4) {
+						arr[i + 2] = a + 3;
+					}
+					;
+					return b;
+				});
+				expect(arr).toEqual({
+					0: 1,
+					1: 2,
+					2: 3,
+					3: 4,
+					4: 5,
+					length: 3
+				});
+				expect(i).toBe(2);
+			});
+			it('should work as expected for empty arrays', function () {
+				var spy = jasmine.createSpy();
+				expect(function () {
+					Array.prototype.reduce.call({length: 0}, spy);
+				}).toThrow();
+				expect(spy).not.toHaveBeenCalled();
+			});
+			it('should throw correctly if no callback is given', function () {
+				expect(function () {
+					testSubject.reduce();
+				}).toThrow();
+			});
+			it('should return the expected result', function () {
+				expect(testSubject.reduce(function (a, b) {
+					return (a || '').toString() + (b || '').toString();
+				})).toEqual('123');
+			});
+			it('should not directly affect the passed array', function () {
+				var copy = createArrayLikeFromArray(testSubject);
+				testSubject.reduce(function (a, b) {
+					return a + b;
+				});
+				delete (testSubject.reduce);
+				expect(testSubject).toEqual(copy);
+			});
+			it('should skip non-set values', function () {
+				delete testSubject[1];
+				var visited = {};
+				testSubject.reduce(function (a, b) {
+					if (a)
+						visited[a] = true;
+					if (b)
+						visited[b] = true;
+					return 0;
+				});
+
+				expect(visited).toEqual({'1': true, '3': true});
+			});
+			it('should have the right length', function () {
+				expect(testSubject.reduce.length).toBe(1);
+			});
+		});
+	});
+	describe('reduceRight', function () {
+		beforeEach(function () {
+			testSubject = [1, 2, 3];
+		});
+
+		describe('Array', function () {
+			it('should pass the correct arguments to the callback', function () {
+				var spy = jasmine.createSpy().andReturn(0);
+				testSubject.reduceRight(spy);
+				expect(spy.calls[0].args).toExactlyMatch([3, 2, 1, testSubject]);
+			});
+			it('should start with the right initialValue', function () {
+				var spy = jasmine.createSpy().andReturn(0);
+				testSubject.reduceRight(spy, 0);
+				expect(spy.calls[0].args).toExactlyMatch([0, 3, 2, testSubject]);
+			});
+			it('should not affect elements added to the array after it has begun', function () {
+				var arr = [1, 2, 3],
+					i = 0;
+				arr.reduceRight(function (a, b) {
+					i++;
+					if (i <= 4) {
+						arr.push(a + 3);
+					}
+					;
+					return b;
+				});
+				expect(arr).toEqual([1, 2, 3, 6, 5]);
+				expect(i).toBe(2);
+			});
+			it('should work as expected for empty arrays', function () {
+				var spy = jasmine.createSpy();
+				expect(function () {
+					[].reduceRight(spy);
+				}).toThrow();
+				expect(spy).not.toHaveBeenCalled();
+			});
+			it('should work as expected for empty arrays with an initial value', function () {
+				var spy = jasmine.createSpy(),
+					result;
+
+				result = [].reduceRight(spy, '');
+				expect(spy).not.toHaveBeenCalled();
+				expect(result).toBe('');
+			});
+			it('should throw correctly if no callback is given', function () {
+				expect(function () {
+					testSubject.reduceRight();
+				}).toThrow();
+			});
+			it('should return the expected result', function () {
+				expect(testSubject.reduceRight(function (a, b) {
+					return (a || '').toString() + (b || '').toString();
+				})).toEqual('321');
+			});
+			it('should not directly affect the passed array', function () {
+				var copy = testSubject.slice();
+				testSubject.reduceRight(function (a, b) {
+					return a + b;
+				});
+				expect(testSubject).toEqual(copy);
+			});
+			it('should skip non-set values', function () {
+				delete testSubject[1];
+				var visited = {};
+				testSubject.reduceRight(function (a, b) {
+					if (a)
+						visited[a] = true;
+					if (b)
+						visited[b] = true;
+					return 0;
+				});
+
+				expect(visited).toEqual({'1': true, '3': true});
+			});
+			it('should have the right length', function () {
+				expect(testSubject.reduceRight.length).toBe(1);
+			});
+		});
+		describe('Array-like objects', function () {
+			beforeEach(function () {
+				testSubject = createArrayLikeFromArray(testSubject);
+				testSubject.reduceRight = Array.prototype.reduceRight;
+			});
+			it('should pass the correct arguments to the callback', function () {
+				var spy = jasmine.createSpy().andReturn(0);
+				testSubject.reduceRight(spy);
+				expect(spy.calls[0].args).toExactlyMatch([3, 2, 1, testSubject]);
+			});
+			it('should start with the right initialValue', function () {
+				var spy = jasmine.createSpy().andReturn(0);
+				testSubject.reduceRight(spy, 0);
+				expect(spy.calls[0].args).toExactlyMatch([0, 3, 2, testSubject]);
+			});
+			it('should not affect elements added to the array after it has begun', function () {
+				var arr = createArrayLikeFromArray([1, 2, 3]),
+					i = 0;
+				Array.prototype.reduceRight.call(arr, function (a, b) {
+					i++;
+					if (i <= 4) {
+						arr[i + 2] = a + 3;
+					}
+					;
+					return b;
+				});
+				expect(arr).toEqual({
+					0: 1,
+					1: 2,
+					2: 3,
+					3: 6,
+					4: 5,
+					length: 3 // does not get updated on property assignment
+				});
+				expect(i).toBe(2);
+			});
+			it('should work as expected for empty arrays', function () {
+				var spy = jasmine.createSpy();
+				expect(function () {
+					Array.prototype.reduceRight.call({length: 0}, spy);
+				}).toThrow();
+				expect(spy).not.toHaveBeenCalled();
+			});
+			it('should throw correctly if no callback is given', function () {
+				expect(function () {
+					testSubject.reduceRight();
+				}).toThrow();
+			});
+			it('should return the expected result', function () {
+				expect(testSubject.reduceRight(function (a, b) {
+					return (a || '').toString() + (b || '').toString();
+				})).toEqual('321');
+			});
+			it('should not directly affect the passed array', function () {
+				var copy = createArrayLikeFromArray(testSubject);
+				testSubject.reduceRight(function (a, b) {
+					return a + b;
+				});
+				delete (testSubject.reduceRight);
+				expect(testSubject).toEqual(copy);
+			});
+			it('should skip non-set values', function () {
+				delete testSubject[1];
+				var visited = {};
+				testSubject.reduceRight(function (a, b) {
+					if (a)
+						visited[a] = true;
+					if (b)
+						visited[b] = true;
+					return 0;
+				});
+
+				expect(visited).toEqual({'1': true, '3': true});
+			});
+			it('should have the right length', function () {
+				expect(testSubject.reduceRight.length).toBe(1);
+			});
+		});
+	});
+
+	describe('isArray', function () {
+		it('should work for Array', function () {
+			var ret = Array.isArray([]);
+
+			expect(ret).toBe(true);
+		});
+
+		it('should fail for other objects', function () {
+			var objects = [
+				"someString",
+				true,
+				false,
+				42,
+				0,
+				{},
+				Object.create && Object.create(null) || null,
+				/foo/,
+				arguments,
+				document.getElementsByTagName("div")
+			];
+
+			objects.forEach(function (v) {
+				expect(Array.isArray(v)).toBe(false);
+			});
+		});
+	});
+
+	describe('unshift', function () {
+		it('should return length', function () {
+			expect([].unshift(0)).toEqual(1);
+		});
+	});
+
+	describe('splice', function () {
+		var b = ["b"],
+			a = [1, "a", b],
+			test;
+
+		var makeArray = function (l, prefix) {
+			prefix = prefix || "";
+			var a = [];
+			while (l--) {
+				a.unshift(prefix + Array(l + 1).join(" ") + l)
+			}
+			return a
+		};
+
+		beforeEach(function () {
+			test = a.slice(0);
+		});
+
+		it('basic implementation test 1', function () {
+			expect(test.splice(0)).toEqual(a);
+		});
+		it('basic implementation test 2', function () {
+			test.splice(0, 2);
+			expect(test).toEqual([b]);
+		});
+
+		it('should return right result 1', function () {
+			expect((function () {
+				var array = [];
+
+				array.splice(0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20);
+				array.splice(1, 0, "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16", "F17", "F18", "F19", "F20", "F21", "F22", "F23", "F24", "F25", "F26");
+				array.splice(5, 0, "XXX");
+
+				return array.join("|");
+			}())).toBe("1|F1|F2|F3|F4|XXX|F5|F6|F7|F8|F9|F10|F11|F12|F13|F14|F15|F16|F17|F18|F19|F20|F21|F22|F23|F24|F25|F26|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20");
+		});
+
+		it('should return right result 2', function () {
+			expect((function () {
+				var array = makeArray(6);
+
+				array.splice(array.length - 1, 1, "");
+				array.splice(0, 1, 1, 2, 3, 4);
+				array.splice(0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45);
+
+				array.splice(4, 0, "99999999999999");
+				return array.join("|");
+			}())).toBe("1|2|3|4|99999999999999|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|1|2|3|4| 1|  2|   3|    4|");
+		});
+
+		it('should return right result 3', function () {
+			expect((function () {
+				var array = [1, 2, 3];
+
+				array.splice(0);
+				array.splice(0, 1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+				array.splice(1, 1, "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16", "F17", "F18", "F19", "F20", "F21", "F22", "F23", "F24", "F25", "F26");
+				array.splice(5, 1, "YYY", "XXX");
+				array.splice(0, 1);
+				array.splice(0, 2);
+				array.pop();
+				array.push.apply(array, makeArray(10, "-"));
+				array.splice(array.length - 2, 10);
+				array.splice();
+				array.splice(1, 1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9);
+				array.splice(1, 1, "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16", "F17", "F18", "F19", "F20", "F21", "F22", "F23", "F24", "F25", "F26", 1, 23, 4, 5, 6, 7, 8);
+				array.splice(30, 10);
+				array.splice(30, 1);
+				array.splice(30, 0);
+				array.splice(2, 5, 1, 2, 3, "P", "LLL", "CCC", "YYY", "XXX");
+				array.push(1, 2, 3, 4, 5, 6);
+				array.splice(1, 6, 1, 2, 3, 4, 5, 6, 7, 8, 9, 4, 5, 6, 7, 8, 9);
+				array.splice(3, 7);
+				array.unshift(7, 8, 9, 10, 11);
+				array.pop();
+				array.splice(5, 2);
+				array.pop();
+				array.unshift.apply(array, makeArray(8, "~"));
+				array.pop();
+				array.splice(3, 1, "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16", "F17", "F18", "F19", "F20", "F21", "F22", "F23", "F24", "F25", "F26", 1, 23, 4, 5, 6, 7, 8);
+				array.splice(4, 5, "P", "LLL", "CCC", "YYY", "XXX");
+
+				return array.join("|");
+			}())).toBe("~0|~ 1|~  2|F1|P|LLL|CCC|YYY|XXX|F7|F8|F9|F10|F11|F12|F13|F14|F15|F16|F17|F18|F19|F20|F21|F22|F23|F24|F25|F26|1|23|4|5|6|7|8|~    4|~     5|~      6|~       7|7|8|9|10|11|2|4|5|6|7|8|9|CCC|YYY|XXX|F7|F8|F9|F10|F11|F12|F13|F14|F15|F16|F17|F18|F19|F20|F21|F22|F23|F24|F25|F26|1|23|4|9|10|1|2|3|4|5|6|7|8|9|YYY|XXX|F6|F7|F8|F9|F10|F11|F12|F13|F14|F15|F16|F17|F18|F19|F20|F21|F22|F23|F24|F25|F26|3|4|5|6|7|8|9|-0|- 1|-  2|-   3|-    4|-     5|-      6|-       7|1|2|3");
+		});
+
+
+		it('should do nothing if method called with no arguments', function () {
+			expect(test.splice()).toEqual([]);
+			expect(test).toEqual(a);
+		});
+		//TODO:: Is this realy TRUE behavior?
+		it('should set first argument to 0 if first argument is set but undefined', function () {
+			var test2 = test.slice(0);
+			expect(test.splice(void 0, 2)).toEqual(test2.splice(0, 2));
+			expect(test).toEqual(test2);
+		});
+
+		it('should deleted and return all items after "start" when second argument is undefined', function () {
+			expect(test.splice(0)).toEqual(a);
+			expect(test).toEqual([]);
+		});
+		it('should deleted and return all items after "start" when second argument is undefined', function () {
+			expect(test.splice(2)).toEqual([b]);
+			expect(test).toEqual([1, "a"]);
+		});
+		it('runshould have the right length', function () {
+			expect(test.splice.length).toBe(2);
+		});
+	});
 
 
 });
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-date.js b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-date.js
index a2e288c..38867f1 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-date.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-date.js
@@ -1,152 +1,153 @@
 describe('Date', function () {
-    
-    describe('now', function () {
-        it('should be the current time', function () {
-            expect(Date.now() === new Date().getTime()).toBe(true);
-        });
-    });
-
-    describe("parse", function () {
-        // TODO: Write the rest of the test.
-
-        it('should support extended years', function () {
-
-            expect(Date.parse('0001-01-01T00:00:00Z')).toBe(-62135596800000);
-            expect(Date.parse('+275760-09-13T00:00:00.000Z')).toBe(8.64e15);
-            expect(Date.parse('+033658-09-27T01:46:40.000Z')).toBe(1e15);
-            expect(Date.parse('-000001-01-01T00:00:00Z')).toBe(-62198755200000);
-            expect(Date.parse('+002009-12-15T00:00:00Z')).toBe(1260835200000);
-
-        });
-
-        it('should work', function () {
-                                                                                  //Chrome 19     Opera 12      Firefox 11    IE 9          Safari 5.1.1
-            expect(Date.parse("2012-11-31T23:59:59.000Z")).toBeFalsy();           //1354406399000 NaN           NaN           1354406399000 NaN
-            expect(Date.parse("2012-12-31T23:59:59.000Z")).toBe(1356998399000);   //1356998399000 1356998399000 1356998399000 1356998399000 1356998399000
-            expect(Date.parse("2012-12-31T23:59:60.000Z")).toBeFalsy();           //NaN           NaN           NaN           NaN           1356998400000
-            expect(Date.parse("2012-04-04T05:02:02.170Z")).toBe(1333515722170);   //1333515722170 1333515722170 1333515722170 1333515722170 1333515722170
-            expect(Date.parse("2012-04-04T05:02:02.170999Z")).toBe(1333515722170);   //1333515722170 1333515722170 1333515722170 1333515722170 1333515722170
-            expect(Date.parse("2012-04-04T05:02:02.17Z")).toBe(1333515722170);    //1333515722170 1333515722170 1333515722170 1333515722170 1333515722170
-            expect(Date.parse("2012-04-04T05:02:02.1Z")).toBe(1333515722100);     //1333515722170 1333515722170 1333515722170 1333515722170 1333515722170
-            expect(Date.parse("2012-04-04T24:00:00.000Z")).toBe(1333584000000);   //NaN           1333584000000 1333584000000 1333584000000 1333584000000
-            expect(Date.parse("2012-04-04T24:00:00.500Z")).toBeFalsy();           //NaN           NaN           1333584000500 1333584000500 NaN
-            expect(Date.parse("2012-12-31T10:08:60.000Z")).toBeFalsy();           //NaN           NaN           NaN           NaN           1356948540000
-            expect(Date.parse("2012-13-01T12:00:00.000Z")).toBeFalsy();           //NaN           NaN           NaN           NaN           NaN
-            expect(Date.parse("2012-12-32T12:00:00.000Z")).toBeFalsy();           //NaN           NaN           NaN           NaN           NaN
-            expect(Date.parse("2012-12-31T25:00:00.000Z")).toBeFalsy();           //NaN           NaN           NaN           NaN           NaN
-            expect(Date.parse("2012-12-31T24:01:00.000Z")).toBeFalsy();           //NaN           NaN           NaN           1356998460000 NaN
-            expect(Date.parse("2012-12-31T12:60:00.000Z")).toBeFalsy();           //NaN           NaN           NaN           NaN           NaN
-            expect(Date.parse("2012-12-31T12:00:60.000Z")).toBeFalsy();           //NaN           NaN           NaN           NaN           1356955260000
-            expect(Date.parse("2012-00-31T23:59:59.000Z")).toBeFalsy();           //NaN           NaN           NaN           NaN           NaN
-            expect(Date.parse("2012-12-00T23:59:59.000Z")).toBeFalsy();           //NaN           NaN           NaN           NaN           NaN
-            expect(Date.parse("2012-02-29T12:00:00.000Z")).toBe(1330516800000);   //1330516800000 1330516800000 1330516800000 1330516800000 1330516800000
-            expect(Date.parse("2011-02-29T12:00:00.000Z")).toBeFalsy();           //1298980800000 NaN           NaN           1298980800000 NaN
-            expect(Date.parse("2011-03-01T12:00:00.000Z")).toBe(1298980800000);   //1298980800000 1298980800000 1298980800000 1298980800000 1298980800000
-
-            // extended years:
-            expect(Date.parse("0000-01-01T00:00:00.000Z")).toBe(-621672192e5);    //-621672192e5  -621672192e5  -621672192e5  -621672192e5  -621672192e5
-            expect(Date.parse("+275760-09-13T00:00:00.000Z")).toBe(8.64e15);      //8.64e15       NaN           8.64e15       8.64e15       8.64e15
-            expect(Date.parse("-271821-04-20T00:00:00.000Z")).toBe(-8.64e15);     //-8.64e15      NaN           -8.64e15      -8.64e15      -8.6400000864e15
-            expect(Date.parse("+275760-09-13T00:00:00.001Z")).toBeFalsy();        //NaN           NaN           NaN           8.64e15 + 1   8.64e15 + 1
-            expect(Date.parse("-271821-04-19T23:59:59.999Z")).toBeFalsy();        //NaN           NaN           NaN           -8.64e15 - 1  -8.6400000864e15 - 1
-
-            // https://github.com/kriskowal/es5-shim/issues/80 Safari bug with leap day
-            expect(Date.parse("2034-03-01T00:00:00.000Z") -
-                        Date.parse("2034-02-27T23:59:59.999Z")).toBe(86400001);   //86400001      86400001       86400001       86400001      1
-
-            // Time Zone Offset
-            expect(Date.parse("2012-01-29T12:00:00.000+01:00")).toBe(132783480e4);//132783480e4 132783480e4  132783480e4  132783480e4     132783480e4
-            expect(Date.parse("2012-01-29T12:00:00.000-00:00")).toBe(132783840e4);//132783840e4 132783840e4  132783840e4  132783840e4     132783840e4
-            expect(Date.parse("2012-01-29T12:00:00.000+00:00")).toBe(132783840e4);//132783840e4 132783840e4  132783840e4  132783840e4     132783840e4
-            expect(Date.parse("2012-01-29T12:00:00.000+23:59")).toBe(132775206e4);//132775206e4 132775206e4  132775206e4  132775206e4     132775206e4
-            expect(Date.parse("2012-01-29T12:00:00.000-23:59")).toBe(132792474e4);//132792474e4 132792474e4  132792474e4  132792474e4     132792474e4
-            expect(Date.parse("2012-01-29T12:00:00.000+24:00")).toBeFalsy();      //NaN         1327752e6    NaN          1327752000000   1327752000000
-            expect(Date.parse("2012-01-29T12:00:00.000+24:01")).toBeFalsy();      //NaN         NaN          NaN          1327751940000   1327751940000
-            expect(Date.parse("2012-01-29T12:00:00.000+24:59")).toBeFalsy();      //NaN         NaN          NaN          1327748460000   1327748460000
-            expect(Date.parse("2012-01-29T12:00:00.000+25:00")).toBeFalsy();      //NaN         NaN          NaN          NaN             NaN
-            expect(Date.parse("2012-01-29T12:00:00.000+00:60")).toBeFalsy();      //NaN         NaN          NaN          NaN             NaN
-            expect(Date.parse("-271821-04-20T00:00:00.000+00:01")).toBeFalsy();   //NaN         NaN          NaN          -864000000006e4 -864000008646e4
-            expect(Date.parse("-271821-04-20T00:01:00.000+00:01")).toBe(-8.64e15);//-8.64e15    NaN          -8.64e15     -8.64e15        -864000008640e4
-
-            // When time zone is missed, local offset should be used (ES 5.1 bug)
-            // see https://bugs.ecmascript.org/show_bug.cgi?id=112
-            var tzOffset = Number(new Date(1970, 0));
-            // same as (new Date().getTimezoneOffset() * 60000)
-            expect(Date.parse('1970-01-01T00:00:00')).toBe(tzOffset);             //tzOffset    0            0            0               NaN
-        });
-
-        it("should be able to coerce to a number", function(){
-            var actual = Number(new Date(1970, 0));
-            var expected = parseInt(actual, 10);
-            expect(actual).toBeDefined();
-            expect(actual).toEqual(expected);
-            expect(isNaN(actual)).toBeFalsy();
-        });
-
-    });
-
-    describe("toString", function(){
-        var actual = (new Date(1970, 0)).toString();
-        beforeEach(function(){
-            actual = (new Date(1970, 0)).toString();
-        });
-        it("should show correct date info for "+actual, function(){
-            expect(actual).toMatch(/1970/);
-            expect(actual).toMatch(/jan/i);
-            expect(actual).toMatch(/thu/i);
-            expect(actual).toMatch(/00:00:00/);
-        });
-    });
-
-    describe("valueOf", function(){
-        var actual = (new Date(1970, 0));
-        beforeEach(function(){
-            actual = (new Date(1970, 0)).valueOf();
-        });
-        it("should give an int value", function(){
-            expect(parseInt(actual, 10)).toBeTruthy();
-        });
-    });
-
-    describe("toISOString", function () {
-        // TODO: write the rest of the test.
-       
-        it('should support extended years', function () {
-            expect(new Date(-62198755200000).toISOString().indexOf('-000001-01-01')).toBe(0);
-            expect(new Date(8.64e15).toISOString().indexOf('+275760-09-13')).toBe(0);
-        });
-
-        it('should return correct dates', function () {
-            expect(new Date(-1).toISOString()).toBe('1969-12-31T23:59:59.999Z');// Safari 5.1.5 "1969-12-31T23:59:59.-01Z"
-            expect(new Date(-3509827334573292).toISOString()).toBe('-109252-01-01T10:37:06.708Z'); // Opera 11.61/Opera 12 bug with Date#getUTCMonth
-        });
-
-    });
-
-    describe("toJSON", function () {
-
-        // Opera 11.6x/12 bug
-        it('should call toISOString', function () {
-          var date = new Date(0);
-          date.toISOString = function () {
-            return 1;
-          };
-          expect(date.toJSON()).toBe(1);
-        });
-
-        it('should return null for not finite dates', function () {
-          var date = new Date(NaN),
-              json;
-          try {
-            json = date.toJSON();
-          } catch (e) {}
-          expect(json).toBe(null);
-        });
-
-        it('should return the isoString when stringified', function () {
-            var date = new Date();
-            expect(JSON.stringify(date.toISOString())).toBe(JSON.stringify(date));
-        }) 
-    });
-
-});
\ No newline at end of file
+
+	describe('now', function () {
+		it('should be the current time', function () {
+			expect(Date.now() === new Date().getTime()).toBe(true);
+		});
+	});
+
+	describe("parse", function () {
+		// TODO: Write the rest of the test.
+
+		it('should support extended years', function () {
+
+			expect(Date.parse('0001-01-01T00:00:00Z')).toBe(-62135596800000);
+			expect(Date.parse('+275760-09-13T00:00:00.000Z')).toBe(8.64e15);
+			expect(Date.parse('+033658-09-27T01:46:40.000Z')).toBe(1e15);
+			expect(Date.parse('-000001-01-01T00:00:00Z')).toBe(-62198755200000);
+			expect(Date.parse('+002009-12-15T00:00:00Z')).toBe(1260835200000);
+
+		});
+
+		it('should work', function () {
+			//Chrome 19     Opera 12      Firefox 11    IE 9          Safari 5.1.1
+			expect(Date.parse("2012-11-31T23:59:59.000Z")).toBeFalsy();           //1354406399000 NaN           NaN           1354406399000 NaN
+			expect(Date.parse("2012-12-31T23:59:59.000Z")).toBe(1356998399000);   //1356998399000 1356998399000 1356998399000 1356998399000 1356998399000
+			expect(Date.parse("2012-12-31T23:59:60.000Z")).toBeFalsy();           //NaN           NaN           NaN           NaN           1356998400000
+			expect(Date.parse("2012-04-04T05:02:02.170Z")).toBe(1333515722170);   //1333515722170 1333515722170 1333515722170 1333515722170 1333515722170
+			expect(Date.parse("2012-04-04T05:02:02.170999Z")).toBe(1333515722170);   //1333515722170 1333515722170 1333515722170 1333515722170 1333515722170
+			expect(Date.parse("2012-04-04T05:02:02.17Z")).toBe(1333515722170);    //1333515722170 1333515722170 1333515722170 1333515722170 1333515722170
+			expect(Date.parse("2012-04-04T05:02:02.1Z")).toBe(1333515722100);     //1333515722170 1333515722170 1333515722170 1333515722170 1333515722170
+			expect(Date.parse("2012-04-04T24:00:00.000Z")).toBe(1333584000000);   //NaN           1333584000000 1333584000000 1333584000000 1333584000000
+			expect(Date.parse("2012-04-04T24:00:00.500Z")).toBeFalsy();           //NaN           NaN           1333584000500 1333584000500 NaN
+			expect(Date.parse("2012-12-31T10:08:60.000Z")).toBeFalsy();           //NaN           NaN           NaN           NaN           1356948540000
+			expect(Date.parse("2012-13-01T12:00:00.000Z")).toBeFalsy();           //NaN           NaN           NaN           NaN           NaN
+			expect(Date.parse("2012-12-32T12:00:00.000Z")).toBeFalsy();           //NaN           NaN           NaN           NaN           NaN
+			expect(Date.parse("2012-12-31T25:00:00.000Z")).toBeFalsy();           //NaN           NaN           NaN           NaN           NaN
+			expect(Date.parse("2012-12-31T24:01:00.000Z")).toBeFalsy();           //NaN           NaN           NaN           1356998460000 NaN
+			expect(Date.parse("2012-12-31T12:60:00.000Z")).toBeFalsy();           //NaN           NaN           NaN           NaN           NaN
+			expect(Date.parse("2012-12-31T12:00:60.000Z")).toBeFalsy();           //NaN           NaN           NaN           NaN           1356955260000
+			expect(Date.parse("2012-00-31T23:59:59.000Z")).toBeFalsy();           //NaN           NaN           NaN           NaN           NaN
+			expect(Date.parse("2012-12-00T23:59:59.000Z")).toBeFalsy();           //NaN           NaN           NaN           NaN           NaN
+			expect(Date.parse("2012-02-29T12:00:00.000Z")).toBe(1330516800000);   //1330516800000 1330516800000 1330516800000 1330516800000 1330516800000
+			expect(Date.parse("2011-02-29T12:00:00.000Z")).toBeFalsy();           //1298980800000 NaN           NaN           1298980800000 NaN
+			expect(Date.parse("2011-03-01T12:00:00.000Z")).toBe(1298980800000);   //1298980800000 1298980800000 1298980800000 1298980800000 1298980800000
+
+			// extended years:
+			expect(Date.parse("0000-01-01T00:00:00.000Z")).toBe(-621672192e5);    //-621672192e5  -621672192e5  -621672192e5  -621672192e5  -621672192e5
+			expect(Date.parse("+275760-09-13T00:00:00.000Z")).toBe(8.64e15);      //8.64e15       NaN           8.64e15       8.64e15       8.64e15
+			expect(Date.parse("-271821-04-20T00:00:00.000Z")).toBe(-8.64e15);     //-8.64e15      NaN           -8.64e15      -8.64e15      -8.6400000864e15
+			expect(Date.parse("+275760-09-13T00:00:00.001Z")).toBeFalsy();        //NaN           NaN           NaN           8.64e15 + 1   8.64e15 + 1
+			expect(Date.parse("-271821-04-19T23:59:59.999Z")).toBeFalsy();        //NaN           NaN           NaN           -8.64e15 - 1  -8.6400000864e15 - 1
+
+			// https://github.com/kriskowal/es5-shim/issues/80 Safari bug with leap day
+			expect(Date.parse("2034-03-01T00:00:00.000Z") -
+				Date.parse("2034-02-27T23:59:59.999Z")).toBe(86400001);   //86400001      86400001       86400001       86400001      1
+
+			// Time Zone Offset
+			expect(Date.parse("2012-01-29T12:00:00.000+01:00")).toBe(132783480e4);//132783480e4 132783480e4  132783480e4  132783480e4     132783480e4
+			expect(Date.parse("2012-01-29T12:00:00.000-00:00")).toBe(132783840e4);//132783840e4 132783840e4  132783840e4  132783840e4     132783840e4
+			expect(Date.parse("2012-01-29T12:00:00.000+00:00")).toBe(132783840e4);//132783840e4 132783840e4  132783840e4  132783840e4     132783840e4
+			expect(Date.parse("2012-01-29T12:00:00.000+23:59")).toBe(132775206e4);//132775206e4 132775206e4  132775206e4  132775206e4     132775206e4
+			expect(Date.parse("2012-01-29T12:00:00.000-23:59")).toBe(132792474e4);//132792474e4 132792474e4  132792474e4  132792474e4     132792474e4
+			expect(Date.parse("2012-01-29T12:00:00.000+24:00")).toBeFalsy();      //NaN         1327752e6    NaN          1327752000000   1327752000000
+			expect(Date.parse("2012-01-29T12:00:00.000+24:01")).toBeFalsy();      //NaN         NaN          NaN          1327751940000   1327751940000
+			expect(Date.parse("2012-01-29T12:00:00.000+24:59")).toBeFalsy();      //NaN         NaN          NaN          1327748460000   1327748460000
+			expect(Date.parse("2012-01-29T12:00:00.000+25:00")).toBeFalsy();      //NaN         NaN          NaN          NaN             NaN
+			expect(Date.parse("2012-01-29T12:00:00.000+00:60")).toBeFalsy();      //NaN         NaN          NaN          NaN             NaN
+			expect(Date.parse("-271821-04-20T00:00:00.000+00:01")).toBeFalsy();   //NaN         NaN          NaN          -864000000006e4 -864000008646e4
+			expect(Date.parse("-271821-04-20T00:01:00.000+00:01")).toBe(-8.64e15);//-8.64e15    NaN          -8.64e15     -8.64e15        -864000008640e4
+
+			// When time zone is missed, local offset should be used (ES 5.1 bug)
+			// see https://bugs.ecmascript.org/show_bug.cgi?id=112
+			var tzOffset = Number(new Date(1970, 0));
+			// same as (new Date().getTimezoneOffset() * 60000)
+			expect(Date.parse('1970-01-01T00:00:00')).toBe(tzOffset);             //tzOffset    0            0            0               NaN
+		});
+
+		it("should be able to coerce to a number", function () {
+			var actual = Number(new Date(1970, 0));
+			var expected = parseInt(actual, 10);
+			expect(actual).toBeDefined();
+			expect(actual).toEqual(expected);
+			expect(isNaN(actual)).toBeFalsy();
+		});
+
+	});
+
+	describe("toString", function () {
+		var actual = (new Date(1970, 0)).toString();
+		beforeEach(function () {
+			actual = (new Date(1970, 0)).toString();
+		});
+		it("should show correct date info for " + actual, function () {
+			expect(actual).toMatch(/1970/);
+			expect(actual).toMatch(/jan/i);
+			expect(actual).toMatch(/thu/i);
+			expect(actual).toMatch(/00:00:00/);
+		});
+	});
+
+	describe("valueOf", function () {
+		var actual = (new Date(1970, 0));
+		beforeEach(function () {
+			actual = (new Date(1970, 0)).valueOf();
+		});
+		it("should give an int value", function () {
+			expect(parseInt(actual, 10)).toBeTruthy();
+		});
+	});
+
+	describe("toISOString", function () {
+		// TODO: write the rest of the test.
+
+		it('should support extended years', function () {
+			expect(new Date(-62198755200000).toISOString().indexOf('-000001-01-01')).toBe(0);
+			expect(new Date(8.64e15).toISOString().indexOf('+275760-09-13')).toBe(0);
+		});
+
+		it('should return correct dates', function () {
+			expect(new Date(-1).toISOString()).toBe('1969-12-31T23:59:59.999Z');// Safari 5.1.5 "1969-12-31T23:59:59.-01Z"
+			expect(new Date(-3509827334573292).toISOString()).toBe('-109252-01-01T10:37:06.708Z'); // Opera 11.61/Opera 12 bug with Date#getUTCMonth
+		});
+
+	});
+
+	describe("toJSON", function () {
+
+		// Opera 11.6x/12 bug
+		it('should call toISOString', function () {
+			var date = new Date(0);
+			date.toISOString = function () {
+				return 1;
+			};
+			expect(date.toJSON()).toBe(1);
+		});
+
+		it('should return null for not finite dates', function () {
+			var date = new Date(NaN),
+				json;
+			try {
+				json = date.toJSON();
+			} catch (e) {
+			}
+			expect(json).toBe(null);
+		});
+
+		it('should return the isoString when stringified', function () {
+			var date = new Date();
+			expect(JSON.stringify(date.toISOString())).toBe(JSON.stringify(date));
+		})
+	});
+
+});
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-function.js b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-function.js
index aa4361e..ceff3d2 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-function.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-function.js
@@ -1,147 +1,155 @@
+describe('Function', function () {
+	"use strict";
+	describe('bind', function () {
+		var actual, expected,
+			testSubject;
 
-describe('Function', function() {
-    "use strict";
-    describe('bind', function() {
-        var actual, expected,
-            testSubject;
-        
-        testSubject = {
-            push: function(o) {
-                this.a.push(o);
-            }
-        };
-        
-        function func() {
-            Array.prototype.forEach.call(arguments, function(a) {
-                this.push(a);
-            }, this);
-            return this;
-        };
-        
-        beforeEach(function() {
-            actual = [];
-            testSubject.a = [];
-        });
-        
-        it('binds properly without a context', function() {
-            var context;
-            testSubject.func = function() {
-                context = this;
-            }.bind();
-            testSubject.func();
-            expect(context).toBe(function() {return this}.call());
-        });
-        it('binds properly without a context, and still supplies bound arguments', function() {
-            var a, context;
-            testSubject.func = function() {
-                a = Array.prototype.slice.call(arguments);
-                context = this;
-            }.bind(undefined, 1,2,3);
-            testSubject.func(1,2,3);
-            expect(a).toEqual([1,2,3,1,2,3]);
-            expect(context).toBe(function() {return this}.call());
-        });
-        it('binds a context properly', function() {
-            testSubject.func = func.bind(actual);
-            testSubject.func(1,2,3);
-            expect(actual).toEqual([1,2,3]);
-            expect(testSubject.a).toEqual([]);
-        });
-        it('binds a context and supplies bound arguments', function() {
-            testSubject.func = func.bind(actual, 1,2,3);
-            testSubject.func(4,5,6);
-            expect(actual).toEqual([1,2,3,4,5,6]);
-            expect(testSubject.a).toEqual([]);
-        });
-        
-        it('returns properly without binding a context', function() {
-            testSubject.func = function() {
-                return this;
-            }.bind();
-            var context = testSubject.func();
-            expect(context).toBe(function() {return this}.call());
-        });
-        it('returns properly without binding a context, and still supplies bound arguments', function() {
-            var context;
-            testSubject.func = function() {
-                context = this;
-                return Array.prototype.slice.call(arguments);
-            }.bind(undefined, 1,2,3);
-            actual = testSubject.func(1,2,3);
-            expect(context).toBe(function() {return this}.call());
-            expect(actual).toEqual([1,2,3,1,2,3]);
-        });
-        it('returns properly while binding a context properly', function() {
-            var ret;
-            testSubject.func = func.bind(actual);
-            ret = testSubject.func(1,2,3);
-            expect(ret).toBe(actual);
-            expect(ret).not.toBe(testSubject);
-        });
-        it('returns properly while binding a context and supplies bound arguments', function() {
-            var ret;
-            testSubject.func = func.bind(actual, 1,2,3);
-            ret = testSubject.func(4,5,6);
-            expect(ret).toBe(actual);
-            expect(ret).not.toBe(testSubject);
-        });
-        it('passes the correct arguments as a constructor', function() {
-            var ret, expected = { name: "Correct" };
-            testSubject.func = function(arg) {
-                return arg;
-            }.bind({ name: "Incorrect" });
-            ret = new testSubject.func(expected);
-            expect(ret).toBe(expected);
-        });
-        it('returns the return value of the bound function when called as a constructor', function () {
-            var oracle = [1, 2, 3];
-            var subject = function () {
-                return oracle;
-            }.bind(null);
-            var result = new subject;
-            expect(result).toBe(oracle);
-        });
-        it('returns the correct value if constructor returns primitive', function() {
-            var oracle = [1, 2, 3];
-            var subject = function () {
-                return oracle;
-            }.bind(null);
-            var result = new subject;
-            expect(result).toBe(oracle);
+		testSubject = {
+			push: function (o) {
+				this.a.push(o);
+			}
+		};
 
-            oracle = {};
-            result = new subject;
-            expect(result).toBe(oracle);
+		function func() {
+			Array.prototype.forEach.call(arguments, function (a) {
+				this.push(a);
+			}, this);
+			return this;
+		};
 
-            oracle = function(){};
-            result = new subject;
-            expect(result).toBe(oracle);
+		beforeEach(function () {
+			actual = [];
+			testSubject.a = [];
+		});
 
-            oracle = "asdf";
-            result = new subject;
-            expect(result).not.toBe(oracle);
+		it('binds properly without a context', function () {
+			var context;
+			testSubject.func = function () {
+				context = this;
+			}.bind();
+			testSubject.func();
+			expect(context).toBe(function () {
+				return this
+			}.call());
+		});
+		it('binds properly without a context, and still supplies bound arguments', function () {
+			var a, context;
+			testSubject.func = function () {
+				a = Array.prototype.slice.call(arguments);
+				context = this;
+			}.bind(undefined, 1, 2, 3);
+			testSubject.func(1, 2, 3);
+			expect(a).toEqual([1, 2, 3, 1, 2, 3]);
+			expect(context).toBe(function () {
+				return this
+			}.call());
+		});
+		it('binds a context properly', function () {
+			testSubject.func = func.bind(actual);
+			testSubject.func(1, 2, 3);
+			expect(actual).toEqual([1, 2, 3]);
+			expect(testSubject.a).toEqual([]);
+		});
+		it('binds a context and supplies bound arguments', function () {
+			testSubject.func = func.bind(actual, 1, 2, 3);
+			testSubject.func(4, 5, 6);
+			expect(actual).toEqual([1, 2, 3, 4, 5, 6]);
+			expect(testSubject.a).toEqual([]);
+		});
 
-            oracle = null;
-            result = new subject;
-            expect(result).not.toBe(oracle);
+		it('returns properly without binding a context', function () {
+			testSubject.func = function () {
+				return this;
+			}.bind();
+			var context = testSubject.func();
+			expect(context).toBe(function () {
+				return this
+			}.call());
+		});
+		it('returns properly without binding a context, and still supplies bound arguments', function () {
+			var context;
+			testSubject.func = function () {
+				context = this;
+				return Array.prototype.slice.call(arguments);
+			}.bind(undefined, 1, 2, 3);
+			actual = testSubject.func(1, 2, 3);
+			expect(context).toBe(function () {
+				return this
+			}.call());
+			expect(actual).toEqual([1, 2, 3, 1, 2, 3]);
+		});
+		it('returns properly while binding a context properly', function () {
+			var ret;
+			testSubject.func = func.bind(actual);
+			ret = testSubject.func(1, 2, 3);
+			expect(ret).toBe(actual);
+			expect(ret).not.toBe(testSubject);
+		});
+		it('returns properly while binding a context and supplies bound arguments', function () {
+			var ret;
+			testSubject.func = func.bind(actual, 1, 2, 3);
+			ret = testSubject.func(4, 5, 6);
+			expect(ret).toBe(actual);
+			expect(ret).not.toBe(testSubject);
+		});
+		it('passes the correct arguments as a constructor', function () {
+			var ret, expected = {name: "Correct"};
+			testSubject.func = function (arg) {
+				return arg;
+			}.bind({name: "Incorrect"});
+			ret = new testSubject.func(expected);
+			expect(ret).toBe(expected);
+		});
+		it('returns the return value of the bound function when called as a constructor', function () {
+			var oracle = [1, 2, 3];
+			var subject = function () {
+				return oracle;
+			}.bind(null);
+			var result = new subject;
+			expect(result).toBe(oracle);
+		});
+		it('returns the correct value if constructor returns primitive', function () {
+			var oracle = [1, 2, 3];
+			var subject = function () {
+				return oracle;
+			}.bind(null);
+			var result = new subject;
+			expect(result).toBe(oracle);
 
-            oracle = true;
-            result = new subject;
-            expect(result).not.toBe(oracle);
+			oracle = {};
+			result = new subject;
+			expect(result).toBe(oracle);
 
-            oracle = 1;
-            result = new subject;
-            expect(result).not.toBe(oracle);
-        });
-        it('returns the value that instance of original "class" when called as a constructor', function() {
-            var classA = function(x) {
-                this.name = x || "A";
-            }
-            var classB = classA.bind(null, "B");
-            
-            var result = new classB;
-            expect(result instanceof classA).toBe(true);
-            expect(result instanceof classB).toBe(true);
-        });
-    });
+			oracle = function () {
+			};
+			result = new subject;
+			expect(result).toBe(oracle);
+
+			oracle = "asdf";
+			result = new subject;
+			expect(result).not.toBe(oracle);
+
+			oracle = null;
+			result = new subject;
+			expect(result).not.toBe(oracle);
+
+			oracle = true;
+			result = new subject;
+			expect(result).not.toBe(oracle);
+
+			oracle = 1;
+			result = new subject;
+			expect(result).not.toBe(oracle);
+		});
+		it('returns the value that instance of original "class" when called as a constructor', function () {
+			var classA = function (x) {
+				this.name = x || "A";
+			}
+			var classB = classA.bind(null, "B");
+
+			var result = new classB;
+			expect(result instanceof classA).toBe(true);
+			expect(result instanceof classB).toBe(true);
+		});
+	});
 });
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-number.js b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-number.js
index b09ae2b..a95ff6f 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-number.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-number.js
@@ -1,14 +1,14 @@
 describe('Number', function () {
-    'use strict';
-    
-    describe('toFixed', function () {
-        it('should convert numbers correctly', function () {
-            expect((0.00008).toFixed(3)).toBe('0.000');
-            expect((0.9).toFixed(0)).toBe('1');
-            expect((1.255).toFixed(2)).toBe('1.25');
-            expect((1843654265.0774949).toFixed(5)).toBe('1843654265.07749');
-            expect((1000000000000000128).toFixed(0)).toBe('1000000000000000128');
-        });
-    });
+	'use strict';
+
+	describe('toFixed', function () {
+		it('should convert numbers correctly', function () {
+			expect((0.00008).toFixed(3)).toBe('0.000');
+			expect((0.9).toFixed(0)).toBe('1');
+			expect((1.255).toFixed(2)).toBe('1.25');
+			expect((1843654265.0774949).toFixed(5)).toBe('1843654265.07749');
+			expect((1000000000000000128).toFixed(0)).toBe('1000000000000000128');
+		});
+	});
 
 });
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-object.js b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-object.js
index 4c540bf..a731e55 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-object.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-object.js
@@ -1,181 +1,181 @@
 describe('Object', function () {
-    "use strict";
-
-    describe("Object.keys", function () {
-        var obj = {
-            "str": "boz",
-            "obj": { },
-            "arr": [],
-            "bool": true,
-            "num": 42,
-            "null": null,
-            "undefined": undefined
-        };
-
-        var loopedValues = [];
-        for (var k in obj) {
-            loopedValues.push(k);
-        }
-
-        var keys = Object.keys(obj);
-        it('should have correct length', function () {
-            expect(keys.length).toBe(7);
-        });
-
-        it('should return an Array', function () {
-            expect(Array.isArray(keys)).toBe(true);
-        });
-
-        it('should return names which are own properties', function () {
-            keys.forEach(function (name) {
-                expect(obj.hasOwnProperty(name)).toBe(true);
-            });
-        });
-
-        it('should return names which are enumerable', function () {
-            keys.forEach(function (name) {
-                expect(loopedValues.indexOf(name)).toNotBe(-1);
-            })
-        });
-
-        it('should throw error for non object', function () {
-            var e = {};
-            expect(function () {
-                try {
-                    Object.keys(42)
-                } catch (err) {
-                    throw e;
-                }
-            }).toThrow(e);
-        });
-    });
+	"use strict";
+
+	describe("Object.keys", function () {
+		var obj = {
+			"str": "boz",
+			"obj": {},
+			"arr": [],
+			"bool": true,
+			"num": 42,
+			"null": null,
+			"undefined": undefined
+		};
+
+		var loopedValues = [];
+		for (var k in obj) {
+			loopedValues.push(k);
+		}
+
+		var keys = Object.keys(obj);
+		it('should have correct length', function () {
+			expect(keys.length).toBe(7);
+		});
+
+		it('should return an Array', function () {
+			expect(Array.isArray(keys)).toBe(true);
+		});
+
+		it('should return names which are own properties', function () {
+			keys.forEach(function (name) {
+				expect(obj.hasOwnProperty(name)).toBe(true);
+			});
+		});
+
+		it('should return names which are enumerable', function () {
+			keys.forEach(function (name) {
+				expect(loopedValues.indexOf(name)).toNotBe(-1);
+			})
+		});
+
+		it('should throw error for non object', function () {
+			var e = {};
+			expect(function () {
+				try {
+					Object.keys(42)
+				} catch (err) {
+					throw e;
+				}
+			}).toThrow(e);
+		});
+	});
 
 	describe("Object.isExtensible", function () {
-        var obj = { };
-
-        it('should return true if object is extensible', function () {
-            expect(Object.isExtensible(obj)).toBe(true);
-        });
-
-        it('should return false if object is not extensible', function () {
-            expect(Object.isExtensible(Object.preventExtensions(obj))).toBe(false);
-        });
-
-        it('should return false if object is seal', function () {
-            expect(Object.isExtensible(Object.seal(obj))).toBe(false);
-        });
-
-        it('should return false if object is freeze', function () {
-            expect(Object.isExtensible(Object.freeze(obj))).toBe(false);
-        });
-
-        it('should throw error for non object', function () {
-            var e1 = {};
-            expect(function () {
-                try {
-                    Object.isExtensible(42)
-                } catch (err) {
-                    throw e1;
-                }
-            }).toThrow(e1);
-        });
-    });
+		var obj = {};
+
+		it('should return true if object is extensible', function () {
+			expect(Object.isExtensible(obj)).toBe(true);
+		});
+
+		it('should return false if object is not extensible', function () {
+			expect(Object.isExtensible(Object.preventExtensions(obj))).toBe(false);
+		});
+
+		it('should return false if object is seal', function () {
+			expect(Object.isExtensible(Object.seal(obj))).toBe(false);
+		});
+
+		it('should return false if object is freeze', function () {
+			expect(Object.isExtensible(Object.freeze(obj))).toBe(false);
+		});
+
+		it('should throw error for non object', function () {
+			var e1 = {};
+			expect(function () {
+				try {
+					Object.isExtensible(42)
+				} catch (err) {
+					throw e1;
+				}
+			}).toThrow(e1);
+		});
+	});
 
 	describe("Object.defineProperty", function () {
-        var obj;
-
-        beforeEach(function() {
-           obj = {};
-
-           Object.defineProperty(obj, 'name', {
-               value : 'Testing',
-               configurable: true,
-               enumerable: true,
-               writable: true
-           });
-        });
-
-        it('should return the initial value', function () {
-            expect(obj.hasOwnProperty('name')).toBeTruthy();
-            expect(obj.name).toBe('Testing');
-        });
-
-        it('should be setable', function () {
-            obj.name = 'Other';
-            expect(obj.name).toBe('Other');
-        });
-
-        it('should return the parent initial value', function () {
-            var child = Object.create(obj, {});
-
-            expect(child.name).toBe('Testing');
-            expect(child.hasOwnProperty('name')).toBeFalsy();
-        });
-
-        it('should not override the parent value', function () {
-            var child = Object.create(obj, {});
-
-            Object.defineProperty(child, 'name', {
-                value : 'Other'
-            });
-
-            expect(obj.name).toBe('Testing');
-            expect(child.name).toBe('Other');
-        });
-
-        it('should throw error for non object', function () {
-            expect(function () {
-                Object.defineProperty(42, 'name', {});
-            }).toThrow();
-        });
-    });
+		var obj;
+
+		beforeEach(function () {
+			obj = {};
+
+			Object.defineProperty(obj, 'name', {
+				value: 'Testing',
+				configurable: true,
+				enumerable: true,
+				writable: true
+			});
+		});
+
+		it('should return the initial value', function () {
+			expect(obj.hasOwnProperty('name')).toBeTruthy();
+			expect(obj.name).toBe('Testing');
+		});
+
+		it('should be setable', function () {
+			obj.name = 'Other';
+			expect(obj.name).toBe('Other');
+		});
+
+		it('should return the parent initial value', function () {
+			var child = Object.create(obj, {});
+
+			expect(child.name).toBe('Testing');
+			expect(child.hasOwnProperty('name')).toBeFalsy();
+		});
+
+		it('should not override the parent value', function () {
+			var child = Object.create(obj, {});
+
+			Object.defineProperty(child, 'name', {
+				value: 'Other'
+			});
+
+			expect(obj.name).toBe('Testing');
+			expect(child.name).toBe('Other');
+		});
+
+		it('should throw error for non object', function () {
+			expect(function () {
+				Object.defineProperty(42, 'name', {});
+			}).toThrow();
+		});
+	});
 
 	describe("Object.getOwnPropertyDescriptor", function () {
-        it('should return undefined because the object does not own the property', function () {
-            var descr = Object.getOwnPropertyDescriptor({}, 'name');
-
-            expect(descr).toBeUndefined()
-        });
-
-        it('should return a data descriptor', function () {
-            var descr = Object.getOwnPropertyDescriptor({name: 'Testing'}, 'name');
-
-            expect(descr).not.toBeUndefined();
-            expect(descr.value).toBe('Testing');
-            expect(descr.writable).toBe(true);
-            expect(descr.enumerable).toBe(true);
-            expect(descr.configurable).toBe(true);
-        });
-
-        it('should return undefined because the object does not own the property', function () {
-            var descr = Object.getOwnPropertyDescriptor(Object.create({name: 'Testing'}, {}), 'name');
-
-            expect(descr).toBeUndefined()
-        });
-
-        it('should return a data descriptor', function () {
-            var obj = Object.create({}, {
-                name: {
-                    value : 'Testing',
-                    configurable: true,
-                    enumerable: true,
-                    writable: true
-                }
-            });
-
-            var descr = Object.getOwnPropertyDescriptor(obj, 'name');
-
-            expect(descr).not.toBeUndefined();
-            expect(descr.value).toBe('Testing');
-            expect(descr.writable).toBe(true);
-            expect(descr.enumerable).toBe(true);
-            expect(descr.configurable).toBe(true);
-        });
-
-    	it('should throw error for non object', function () {
-            expect(function () {
-                Object.getOwnPropertyDescriptor(42, 'name');
-            }).toThrow();
-        });
-    });
+		it('should return undefined because the object does not own the property', function () {
+			var descr = Object.getOwnPropertyDescriptor({}, 'name');
+
+			expect(descr).toBeUndefined()
+		});
+
+		it('should return a data descriptor', function () {
+			var descr = Object.getOwnPropertyDescriptor({name: 'Testing'}, 'name');
+
+			expect(descr).not.toBeUndefined();
+			expect(descr.value).toBe('Testing');
+			expect(descr.writable).toBe(true);
+			expect(descr.enumerable).toBe(true);
+			expect(descr.configurable).toBe(true);
+		});
+
+		it('should return undefined because the object does not own the property', function () {
+			var descr = Object.getOwnPropertyDescriptor(Object.create({name: 'Testing'}, {}), 'name');
+
+			expect(descr).toBeUndefined()
+		});
+
+		it('should return a data descriptor', function () {
+			var obj = Object.create({}, {
+				name: {
+					value: 'Testing',
+					configurable: true,
+					enumerable: true,
+					writable: true
+				}
+			});
+
+			var descr = Object.getOwnPropertyDescriptor(obj, 'name');
+
+			expect(descr).not.toBeUndefined();
+			expect(descr.value).toBe('Testing');
+			expect(descr.writable).toBe(true);
+			expect(descr.enumerable).toBe(true);
+			expect(descr.configurable).toBe(true);
+		});
+
+		it('should throw error for non object', function () {
+			expect(function () {
+				Object.getOwnPropertyDescriptor(42, 'name');
+			}).toThrow();
+		});
+	});
 });
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-string.js b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-string.js
index 9b6910d..0e69007 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-string.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/es5-shim-15.3.4.5/tests/spec/s-string.js
@@ -1,204 +1,204 @@
-describe('String', function() {
-    "use strict";
-    describe("trim", function() {
-        var test = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFFHello, World!\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFF";
+describe('String', function () {
+	"use strict";
+	describe("trim", function () {
+		var test = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFFHello, World!\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028\u2029\uFEFF";
 
-        it('trims all ES5 whitespace', function() {
-            expect(test.trim()).toEqual("Hello, World!");
-            expect(test.trim().length).toEqual(13);
-        });
-    });
+		it('trims all ES5 whitespace', function () {
+			expect(test.trim()).toEqual("Hello, World!");
+			expect(test.trim().length).toEqual(13);
+		});
+	});
 
-    describe("split", function() {
-        var test = "ab";
+	describe("split", function () {
+		var test = "ab";
 
-        it('If "separator" is undefined must return Array with one String - "this" string', function() {
-            expect(test.split()).toEqual([test]);
-            expect(test.split(void 0)).toEqual([test]);
-        });
+		it('If "separator" is undefined must return Array with one String - "this" string', function () {
+			expect(test.split()).toEqual([test]);
+			expect(test.split(void 0)).toEqual([test]);
+		});
 
-        it('If "separator" is undefined and "limit" set to 0 must return Array[]', function() {
-            expect(test.split(void 0, 0)).toEqual([]);
-        });
+		it('If "separator" is undefined and "limit" set to 0 must return Array[]', function () {
+			expect(test.split(void 0, 0)).toEqual([]);
+		});
 
-        describe('Tests from Steven Levithan', function () {
-            it("''.split() results in ['']", function () {
-                expect(''.split()).toEqual(['']);
-            });
-            it("''.split(/./) results in ['']", function () {
-                expect(''.split(/./)).toEqual(['']);
-            });
-            it("''.split(/.?/) results in []", function () {
-                expect(''.split(/.?/)).toEqual([]);
-            });
-            it("''.split(/.??/) results in []", function () {
-                expect(''.split(/.??/)).toEqual([]);
-            });
-            it("'ab'.split(/a*/) results in ['', 'b']", function () {
-                expect('ab'.split(/a*/)).toEqual(['', 'b']);
-            });
-            it("'ab'.split(/a*?/) results in ['a', 'b']", function () {
-                expect('ab'.split(/a*?/)).toEqual(['a', 'b']);
-            });
-            it("'ab'.split(/(?:ab)/) results in ['', '']", function () {
-                expect('ab'.split(/(?:ab)/)).toEqual(['', '']);
-            });
-            it("'ab'.split(/(?:ab)*/) results in ['', '']", function () {
-                expect('ab'.split(/(?:ab)*/)).toEqual(['', '']);
-            });
-            it("'ab'.split(/(?:ab)*?/) results in ['a', 'b']", function () {
-                expect('ab'.split(/(?:ab)*?/)).toEqual(['a', 'b']);
-            });
-            it("'test'.split('') results in ['t', 'e', 's', 't']", function () {
-                expect('test'.split('')).toEqual(['t', 'e', 's', 't']);
-            });
-            it("'test'.split() results in ['test']", function () {
-                expect('test'.split()).toEqual(['test']);
-            });
-            it("'111'.split(1) results in ['', '', '', '']", function () {
-                expect('111'.split(1)).toEqual(['', '', '', '']);
-            });
-            it("'test'.split(/(?:)/, 2) results in ['t', 'e']", function () {
-                expect('test'.split(/(?:)/, 2)).toEqual(['t', 'e']);
-            });
-            it("'test'.split(/(?:)/, -1) results in ['t', 'e', 's', 't']", function () {
-                expect('test'.split(/(?:)/, -1)).toEqual(['t', 'e', 's', 't']);
-            });
-            it("'test'.split(/(?:)/, undefined) results in ['t', 'e', 's', 't']", function () {
-                expect('test'.split(/(?:)/, undefined)).toEqual(['t', 'e', 's', 't']);
-            });
-            it("'test'.split(/(?:)/, null) results in []", function () {
-                expect('test'.split(/(?:)/, null)).toEqual([]);
-            });
-            it("'test'.split(/(?:)/, NaN) results in []", function () {
-                expect('test'.split(/(?:)/, NaN)).toEqual([]);
-            });
-            it("'test'.split(/(?:)/, true) results in ['t']", function () {
-                expect('test'.split(/(?:)/, true)).toEqual(['t']);
-            });
-            it("'test'.split(/(?:)/, '2') results in ['t', 'e']", function () {
-                expect('test'.split(/(?:)/, '2')).toEqual(['t', 'e']);
-            });
-            it("'test'.split(/(?:)/, 'two') results in []", function () {
-                expect('test'.split(/(?:)/, 'two')).toEqual([]);
-            });
-            it("'a'.split(/-/) results in ['a']", function () {
-                expect('a'.split(/-/)).toEqual(['a']);
-            });
-            it("'a'.split(/-?/) results in ['a']", function () {
-                expect('a'.split(/-?/)).toEqual(['a']);
-            });
-            it("'a'.split(/-??/) results in ['a']", function () {
-                expect('a'.split(/-??/)).toEqual(['a']);
-            });
-            it("'a'.split(/a/) results in ['', '']", function () {
-                expect('a'.split(/a/)).toEqual(['', '']);
-            });
-            it("'a'.split(/a?/) results in ['', '']", function () {
-                expect('a'.split(/a?/)).toEqual(['', '']);
-            });
-            it("'a'.split(/a??/) results in ['a']", function () {
-                expect('a'.split(/a??/)).toEqual(['a']);
-            });
-            it("'ab'.split(/-/) results in ['ab']", function () {
-                expect('ab'.split(/-/)).toEqual(['ab']);
-            });
-            it("'ab'.split(/-?/) results in ['a', 'b']", function () {
-                expect('ab'.split(/-?/)).toEqual(['a', 'b']);
-            });
-            it("'ab'.split(/-??/) results in ['a', 'b']", function () {
-                expect('ab'.split(/-??/)).toEqual(['a', 'b']);
-            });
-            it("'a-b'.split(/-/) results in ['a', 'b']", function () {
-                expect('a-b'.split(/-/)).toEqual(['a', 'b']);
-            });
-            it("'a-b'.split(/-?/) results in ['a', 'b']", function () {
-                expect('a-b'.split(/-?/)).toEqual(['a', 'b']);
-            });
-            it("'a-b'.split(/-??/) results in ['a', '-', 'b']", function () {
-                expect('a-b'.split(/-??/)).toEqual(['a', '-', 'b']);
-            });
-            it("'a--b'.split(/-/) results in ['a', '', 'b']", function () {
-                expect('a--b'.split(/-/)).toEqual(['a', '', 'b']);
-            });
-            it("'a--b'.split(/-?/) results in ['a', '', 'b']", function () {
-                expect('a--b'.split(/-?/)).toEqual(['a', '', 'b']);
-            });
-            it("'a--b'.split(/-??/) results in ['a', '-', '-', 'b']", function () {
-                expect('a--b'.split(/-??/)).toEqual(['a', '-', '-', 'b']);
-            });
-            it("''.split(/()()/) results in []", function () {
-                expect(''.split(/()()/)).toEqual([]);
-            });
-            it("'.'.split(/()()/) results in ['.']", function () {
-                expect('.'.split(/()()/)).toEqual(['.']);
-            });
-            it("'.'.split(/(.?)(.?)/) results in ['', '.', '', '']", function () {
-                expect('.'.split(/(.?)(.?)/)).toEqual(['', '.', '', '']);
-            });
-            it("'.'.split(/(.??)(.??)/) results in ['.']", function () {
-                expect('.'.split(/(.??)(.??)/)).toEqual(['.']);
-            });
-            it("'.'.split(/(.)?(.)?/) results in ['', '.', undefined, '']", function () {
-                expect('.'.split(/(.)?(.)?/)).toEqual(['', '.', undefined, '']);
-            });
-            it("'A<B>bold</B>and<CODE>coded</CODE>'.split(/<(\\/)?([^<>]+)>/) results in ['A', undefined, 'B', 'bold', '/', 'B', 'and', undefined, 'CODE', 'coded', '/', 'CODE', '']", function () {
-                expect('A<B>bold</B>and<CODE>coded</CODE>'.split(/<(\/)?([^<>]+)>/)).toEqual(['A', undefined, 'B', 'bold', '/', 'B', 'and', undefined, 'CODE', 'coded', '/', 'CODE', '']);
-            });
-            it("'tesst'.split(/(s)*/) results in ['t', undefined, 'e', 's', 't']", function () {
-                expect('tesst'.split(/(s)*/)).toEqual(['t', undefined, 'e', 's', 't']);
-            });
-            it("'tesst'.split(/(s)*?/) results in ['t', undefined, 'e', undefined, 's', undefined, 's', undefined, 't']", function () {
-                expect('tesst'.split(/(s)*?/)).toEqual(['t', undefined, 'e', undefined, 's', undefined, 's', undefined, 't']);
-            });
-            it("'tesst'.split(/(s*)/) results in ['t', '', 'e', 'ss', 't']", function () {
-                expect('tesst'.split(/(s*)/)).toEqual(['t', '', 'e', 'ss', 't']);
-            });
-            it("'tesst'.split(/(s*?)/) results in ['t', '', 'e', '', 's', '', 's', '', 't']", function () {
-                expect('tesst'.split(/(s*?)/)).toEqual(['t', '', 'e', '', 's', '', 's', '', 't']);
-            });
-            it("'tesst'.split(/(?:s)*/) results in ['t', 'e', 't']", function () {
-                expect('tesst'.split(/(?:s)*/)).toEqual(['t', 'e', 't']);
-            });
-            it("'tesst'.split(/(?=s+)/) results in ['te', 's', 'st']", function () {
-                expect('tesst'.split(/(?=s+)/)).toEqual(['te', 's', 'st']);
-            });
-            it("'test'.split('t') results in ['', 'es', '']", function () {
-                expect('test'.split('t')).toEqual(['', 'es', '']);
-            });
-            it("'test'.split('es') results in ['t', 't']", function () {
-                expect('test'.split('es')).toEqual(['t', 't']);
-            });
-            it("'test'.split(/t/) results in ['', 'es', '']", function () {
-                expect('test'.split(/t/)).toEqual(['', 'es', '']);
-            });
-            it("'test'.split(/es/) results in ['t', 't']", function () {
-                expect('test'.split(/es/)).toEqual(['t', 't']);
-            });
-            it("'test'.split(/(t)/) results in ['', 't', 'es', 't', '']", function () {
-                expect('test'.split(/(t)/)).toEqual(['', 't', 'es', 't', '']);
-            });
-            it("'test'.split(/(es)/) results in ['t', 'es', 't']", function () {
-                expect('test'.split(/(es)/)).toEqual(['t', 'es', 't']);
-            });
-            it("'test'.split(/(t)(e)(s)(t)/) results in ['', 't', 'e', 's', 't', '']", function () {
-                expect('test'.split(/(t)(e)(s)(t)/)).toEqual(['', 't', 'e', 's', 't', '']);
-            });
-            it("'.'.split(/(((.((.??)))))/) results in ['', '.', '.', '.', '', '', '']", function () {
-                expect('.'.split(/(((.((.??)))))/)).toEqual(['', '.', '.', '.', '', '', '']);
-            });
-            it("'.'.split(/(((((.??)))))/) results in ['.']", function () {
-                expect('.'.split(/(((((.??)))))/)).toEqual(['.']);
-            });
-            it("'a b c d'.split(/ /, -(Math.pow(2, 32) - 1)) results in ['a']", function () {
-                expect('a b c d'.split(/ /, -(Math.pow(2, 32) - 1))).toEqual(['a']);
-            });
-            it("'a b c d'.split(/ /, Math.pow(2, 32) + 1) results in ['a']", function () {
-                expect('a b c d'.split(/ /, Math.pow(2, 32) + 1)).toEqual(['a']);
-            });
-            it("'a b c d'.split(/ /, Infinity) results in []", function () {
-                expect('a b c d'.split(/ /, Infinity)).toEqual([]);
-            });
-        });
-    });
+		describe('Tests from Steven Levithan', function () {
+			it("''.split() results in ['']", function () {
+				expect(''.split()).toEqual(['']);
+			});
+			it("''.split(/./) results in ['']", function () {
+				expect(''.split(/./)).toEqual(['']);
+			});
+			it("''.split(/.?/) results in []", function () {
+				expect(''.split(/.?/)).toEqual([]);
+			});
+			it("''.split(/.??/) results in []", function () {
+				expect(''.split(/.??/)).toEqual([]);
+			});
+			it("'ab'.split(/a*/) results in ['', 'b']", function () {
+				expect('ab'.split(/a*/)).toEqual(['', 'b']);
+			});
+			it("'ab'.split(/a*?/) results in ['a', 'b']", function () {
+				expect('ab'.split(/a*?/)).toEqual(['a', 'b']);
+			});
+			it("'ab'.split(/(?:ab)/) results in ['', '']", function () {
+				expect('ab'.split(/(?:ab)/)).toEqual(['', '']);
+			});
+			it("'ab'.split(/(?:ab)*/) results in ['', '']", function () {
+				expect('ab'.split(/(?:ab)*/)).toEqual(['', '']);
+			});
+			it("'ab'.split(/(?:ab)*?/) results in ['a', 'b']", function () {
+				expect('ab'.split(/(?:ab)*?/)).toEqual(['a', 'b']);
+			});
+			it("'test'.split('') results in ['t', 'e', 's', 't']", function () {
+				expect('test'.split('')).toEqual(['t', 'e', 's', 't']);
+			});
+			it("'test'.split() results in ['test']", function () {
+				expect('test'.split()).toEqual(['test']);
+			});
+			it("'111'.split(1) results in ['', '', '', '']", function () {
+				expect('111'.split(1)).toEqual(['', '', '', '']);
+			});
+			it("'test'.split(/(?:)/, 2) results in ['t', 'e']", function () {
+				expect('test'.split(/(?:)/, 2)).toEqual(['t', 'e']);
+			});
+			it("'test'.split(/(?:)/, -1) results in ['t', 'e', 's', 't']", function () {
+				expect('test'.split(/(?:)/, -1)).toEqual(['t', 'e', 's', 't']);
+			});
+			it("'test'.split(/(?:)/, undefined) results in ['t', 'e', 's', 't']", function () {
+				expect('test'.split(/(?:)/, undefined)).toEqual(['t', 'e', 's', 't']);
+			});
+			it("'test'.split(/(?:)/, null) results in []", function () {
+				expect('test'.split(/(?:)/, null)).toEqual([]);
+			});
+			it("'test'.split(/(?:)/, NaN) results in []", function () {
+				expect('test'.split(/(?:)/, NaN)).toEqual([]);
+			});
+			it("'test'.split(/(?:)/, true) results in ['t']", function () {
+				expect('test'.split(/(?:)/, true)).toEqual(['t']);
+			});
+			it("'test'.split(/(?:)/, '2') results in ['t', 'e']", function () {
+				expect('test'.split(/(?:)/, '2')).toEqual(['t', 'e']);
+			});
+			it("'test'.split(/(?:)/, 'two') results in []", function () {
+				expect('test'.split(/(?:)/, 'two')).toEqual([]);
+			});
+			it("'a'.split(/-/) results in ['a']", function () {
+				expect('a'.split(/-/)).toEqual(['a']);
+			});
+			it("'a'.split(/-?/) results in ['a']", function () {
+				expect('a'.split(/-?/)).toEqual(['a']);
+			});
+			it("'a'.split(/-??/) results in ['a']", function () {
+				expect('a'.split(/-??/)).toEqual(['a']);
+			});
+			it("'a'.split(/a/) results in ['', '']", function () {
+				expect('a'.split(/a/)).toEqual(['', '']);
+			});
+			it("'a'.split(/a?/) results in ['', '']", function () {
+				expect('a'.split(/a?/)).toEqual(['', '']);
+			});
+			it("'a'.split(/a??/) results in ['a']", function () {
+				expect('a'.split(/a??/)).toEqual(['a']);
+			});
+			it("'ab'.split(/-/) results in ['ab']", function () {
+				expect('ab'.split(/-/)).toEqual(['ab']);
+			});
+			it("'ab'.split(/-?/) results in ['a', 'b']", function () {
+				expect('ab'.split(/-?/)).toEqual(['a', 'b']);
+			});
+			it("'ab'.split(/-??/) results in ['a', 'b']", function () {
+				expect('ab'.split(/-??/)).toEqual(['a', 'b']);
+			});
+			it("'a-b'.split(/-/) results in ['a', 'b']", function () {
+				expect('a-b'.split(/-/)).toEqual(['a', 'b']);
+			});
+			it("'a-b'.split(/-?/) results in ['a', 'b']", function () {
+				expect('a-b'.split(/-?/)).toEqual(['a', 'b']);
+			});
+			it("'a-b'.split(/-??/) results in ['a', '-', 'b']", function () {
+				expect('a-b'.split(/-??/)).toEqual(['a', '-', 'b']);
+			});
+			it("'a--b'.split(/-/) results in ['a', '', 'b']", function () {
+				expect('a--b'.split(/-/)).toEqual(['a', '', 'b']);
+			});
+			it("'a--b'.split(/-?/) results in ['a', '', 'b']", function () {
+				expect('a--b'.split(/-?/)).toEqual(['a', '', 'b']);
+			});
+			it("'a--b'.split(/-??/) results in ['a', '-', '-', 'b']", function () {
+				expect('a--b'.split(/-??/)).toEqual(['a', '-', '-', 'b']);
+			});
+			it("''.split(/()()/) results in []", function () {
+				expect(''.split(/()()/)).toEqual([]);
+			});
+			it("'.'.split(/()()/) results in ['.']", function () {
+				expect('.'.split(/()()/)).toEqual(['.']);
+			});
+			it("'.'.split(/(.?)(.?)/) results in ['', '.', '', '']", function () {
+				expect('.'.split(/(.?)(.?)/)).toEqual(['', '.', '', '']);
+			});
+			it("'.'.split(/(.??)(.??)/) results in ['.']", function () {
+				expect('.'.split(/(.??)(.??)/)).toEqual(['.']);
+			});
+			it("'.'.split(/(.)?(.)?/) results in ['', '.', undefined, '']", function () {
+				expect('.'.split(/(.)?(.)?/)).toEqual(['', '.', undefined, '']);
+			});
+			it("'A<B>bold</B>and<CODE>coded</CODE>'.split(/<(\\/)?([^<>]+)>/) results in ['A', undefined, 'B', 'bold', '/', 'B', 'and', undefined, 'CODE', 'coded', '/', 'CODE', '']", function () {
+				expect('A<B>bold</B>and<CODE>coded</CODE>'.split(/<(\/)?([^<>]+)>/)).toEqual(['A', undefined, 'B', 'bold', '/', 'B', 'and', undefined, 'CODE', 'coded', '/', 'CODE', '']);
+			});
+			it("'tesst'.split(/(s)*/) results in ['t', undefined, 'e', 's', 't']", function () {
+				expect('tesst'.split(/(s)*/)).toEqual(['t', undefined, 'e', 's', 't']);
+			});
+			it("'tesst'.split(/(s)*?/) results in ['t', undefined, 'e', undefined, 's', undefined, 's', undefined, 't']", function () {
+				expect('tesst'.split(/(s)*?/)).toEqual(['t', undefined, 'e', undefined, 's', undefined, 's', undefined, 't']);
+			});
+			it("'tesst'.split(/(s*)/) results in ['t', '', 'e', 'ss', 't']", function () {
+				expect('tesst'.split(/(s*)/)).toEqual(['t', '', 'e', 'ss', 't']);
+			});
+			it("'tesst'.split(/(s*?)/) results in ['t', '', 'e', '', 's', '', 's', '', 't']", function () {
+				expect('tesst'.split(/(s*?)/)).toEqual(['t', '', 'e', '', 's', '', 's', '', 't']);
+			});
+			it("'tesst'.split(/(?:s)*/) results in ['t', 'e', 't']", function () {
+				expect('tesst'.split(/(?:s)*/)).toEqual(['t', 'e', 't']);
+			});
+			it("'tesst'.split(/(?=s+)/) results in ['te', 's', 'st']", function () {
+				expect('tesst'.split(/(?=s+)/)).toEqual(['te', 's', 'st']);
+			});
+			it("'test'.split('t') results in ['', 'es', '']", function () {
+				expect('test'.split('t')).toEqual(['', 'es', '']);
+			});
+			it("'test'.split('es') results in ['t', 't']", function () {
+				expect('test'.split('es')).toEqual(['t', 't']);
+			});
+			it("'test'.split(/t/) results in ['', 'es', '']", function () {
+				expect('test'.split(/t/)).toEqual(['', 'es', '']);
+			});
+			it("'test'.split(/es/) results in ['t', 't']", function () {
+				expect('test'.split(/es/)).toEqual(['t', 't']);
+			});
+			it("'test'.split(/(t)/) results in ['', 't', 'es', 't', '']", function () {
+				expect('test'.split(/(t)/)).toEqual(['', 't', 'es', 't', '']);
+			});
+			it("'test'.split(/(es)/) results in ['t', 'es', 't']", function () {
+				expect('test'.split(/(es)/)).toEqual(['t', 'es', 't']);
+			});
+			it("'test'.split(/(t)(e)(s)(t)/) results in ['', 't', 'e', 's', 't', '']", function () {
+				expect('test'.split(/(t)(e)(s)(t)/)).toEqual(['', 't', 'e', 's', 't', '']);
+			});
+			it("'.'.split(/(((.((.??)))))/) results in ['', '.', '.', '.', '', '', '']", function () {
+				expect('.'.split(/(((.((.??)))))/)).toEqual(['', '.', '.', '.', '', '', '']);
+			});
+			it("'.'.split(/(((((.??)))))/) results in ['.']", function () {
+				expect('.'.split(/(((((.??)))))/)).toEqual(['.']);
+			});
+			it("'a b c d'.split(/ /, -(Math.pow(2, 32) - 1)) results in ['a']", function () {
+				expect('a b c d'.split(/ /, -(Math.pow(2, 32) - 1))).toEqual(['a']);
+			});
+			it("'a b c d'.split(/ /, Math.pow(2, 32) + 1) results in ['a']", function () {
+				expect('a b c d'.split(/ /, Math.pow(2, 32) + 1)).toEqual(['a']);
+			});
+			it("'a b c d'.split(/ /, Infinity) results in []", function () {
+				expect('a b c d'.split(/ /, Infinity)).toEqual([]);
+			});
+		});
+	});
 });
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/jquery.autogrow-textarea.js b/len-activiti/src/main/resources/static/editor-app/libs/jquery.autogrow-textarea.js
index 2ae9cc3..5709e1d 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/jquery.autogrow-textarea.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/jquery.autogrow-textarea.js
@@ -1,61 +1,58 @@
-(function($)
-{
-    /**
-     * Auto-growing textareas; technique ripped from Facebook
-     *
-     * http://github.com/jaz303/jquery-grab-bag/tree/master/javascripts/jquery.autogrow-textarea.js
-     */
-    $.fn.autogrow = function(options)
-    {
-        return this.filter('textarea').each(function()
-        {
-            var self         = this;
-            var $self        = $(self);
-            var minHeight    = $self.height();
-            var noFlickerPad = $self.hasClass('autogrow-short') ? 0 : parseInt($self.css('lineHeight')) || 0;
+(function ($) {
+	/**
+	 * Auto-growing textareas; technique ripped from Facebook
+	 *
+	 * http://github.com/jaz303/jquery-grab-bag/tree/master/javascripts/jquery.autogrow-textarea.js
+	 */
+	$.fn.autogrow = function (options) {
+		return this.filter('textarea').each(function () {
+			var self = this;
+			var $self = $(self);
+			var minHeight = $self.height();
+			var noFlickerPad = $self.hasClass('autogrow-short') ? 0 : parseInt($self.css('lineHeight')) || 0;
 
-            var shadow = $('<div></div>').css({
-                position:    'absolute',
-                top:         -10000,
-                left:        -10000,
-                width:       $self.width(),
-                fontSize:    $self.css('fontSize'),
-                fontFamily:  $self.css('fontFamily'),
-                fontWeight:  $self.css('fontWeight'),
-                lineHeight:  $self.css('lineHeight'),
-                resize:      'none',
-                            'word-wrap': 'break-word'
-            }).appendTo(document.body);
+			var shadow = $('<div></div>').css({
+				position: 'absolute',
+				top: -10000,
+				left: -10000,
+				width: $self.width(),
+				fontSize: $self.css('fontSize'),
+				fontFamily: $self.css('fontFamily'),
+				fontWeight: $self.css('fontWeight'),
+				lineHeight: $self.css('lineHeight'),
+				resize: 'none',
+				'word-wrap': 'break-word'
+			}).appendTo(document.body);
 
-            var update = function(event)
-            {
-                var times = function(string, number)
-                {
-                    for (var i=0, r=''; i<number; i++) r += string;
-                    return r;
-                };
+			var update = function (event) {
+				var times = function (string, number) {
+					for (var i = 0, r = ''; i < number; i++) r += string;
+					return r;
+				};
 
-                var val = self.value.replace(/</g, '&lt;')
-                                    .replace(/>/g, '&gt;')
-                                    .replace(/&/g, '&amp;')
-                                    .replace(/\n$/, '<br/>&nbsp;')
-                                    .replace(/\n/g, '<br/>')
-                                    .replace(/ {2,}/g, function(space){ return times('&nbsp;', space.length - 1) + ' ' });
+				var val = self.value.replace(/</g, '&lt;')
+					.replace(/>/g, '&gt;')
+					.replace(/&/g, '&amp;')
+					.replace(/\n$/, '<br/>&nbsp;')
+					.replace(/\n/g, '<br/>')
+					.replace(/ {2,}/g, function (space) {
+						return times('&nbsp;', space.length - 1) + ' '
+					});
 
-                                // Did enter get pressed?  Resize in this keydown event so that the flicker doesn't occur.
-                                if (event && event.data && event.data.event === 'keydown' && event.keyCode === 13) {
-                                        val += '<br />';
-                                }
+				// Did enter get pressed?  Resize in this keydown event so that the flicker doesn't occur.
+				if (event && event.data && event.data.event === 'keydown' && event.keyCode === 13) {
+					val += '<br />';
+				}
 
-                shadow.css('width', $self.width());
-                shadow.html(val + (noFlickerPad === 0 ? '...' : '')); // Append '...' to resize pre-emptively.
-                $self.height(Math.max(shadow.height() + noFlickerPad, minHeight));
-            }
+				shadow.css('width', $self.width());
+				shadow.html(val + (noFlickerPad === 0 ? '...' : '')); // Append '...' to resize pre-emptively.
+				$self.height(Math.max(shadow.height() + noFlickerPad, minHeight));
+			}
 
-            $self.change(update).keyup(update).keydown({event:'keydown'},update);
-            $(window).resize(update);
+			$self.change(update).keyup(update).keydown({event: 'keydown'}, update);
+			$(window).resize(update);
 
-            update();
-        });
-    };
-})(jQuery);
\ No newline at end of file
+			update();
+		});
+	};
+})(jQuery);
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/jquery_1.11.0/jquery.js b/len-activiti/src/main/resources/static/editor-app/libs/jquery_1.11.0/jquery.js
index a492c3a..dadd619 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/jquery_1.11.0/jquery.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/jquery_1.11.0/jquery.js
@@ -11,995 +11,998 @@
  *
  * Date: 2013-07-03T13:48Z
  */
-(function( window, undefined ) {
+(function (window, undefined) {
 
 // Can't do this because several apps including ASP.NET trace
 // the stack via arguments.caller.callee and Firefox dies if
 // you try to trace through "use strict" call chains. (#13335)
 // Support: Firefox 18+
 //"use strict";
-var
-	// The deferred used on DOM ready
-	readyList,
-
-	// A central reference to the root jQuery(document)
-	rootjQuery,
-
-	// Support: IE<10
-	// For `typeof xmlNode.method` instead of `xmlNode.method !== undefined`
-	core_strundefined = typeof undefined,
-
-	// Use the correct document accordingly with window argument (sandbox)
-	location = window.location,
-	document = window.document,
-	docElem = document.documentElement,
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$,
-
-	// [[Class]] -> type pairs
-	class2type = {},
-
-	// List of deleted data cache ids, so we can reuse them
-	core_deletedIds = [],
-
-	core_version = "1.10.2",
-
-	// Save a reference to some core methods
-	core_concat = core_deletedIds.concat,
-	core_push = core_deletedIds.push,
-	core_slice = core_deletedIds.slice,
-	core_indexOf = core_deletedIds.indexOf,
-	core_toString = class2type.toString,
-	core_hasOwn = class2type.hasOwnProperty,
-	core_trim = core_version.trim,
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context, rootjQuery );
-	},
-
-	// Used for matching numbers
-	core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,
-
-	// Used for splitting on whitespace
-	core_rnotwhite = /\S+/g,
-
-	// Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
-
-	// JSON RegExp
-	rvalidchars = /^[\],:{}\s]*$/,
-	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-	rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
-	rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	},
-
-	// The ready event handler
-	completed = function( event ) {
-
-		// readyState === "complete" is good enough for us to call the dom ready in oldIE
-		if ( document.addEventListener || event.type === "load" || document.readyState === "complete" ) {
-			detach();
-			jQuery.ready();
-		}
-	},
-	// Clean-up method for dom ready events
-	detach = function() {
-		if ( document.addEventListener ) {
-			document.removeEventListener( "DOMContentLoaded", completed, false );
-			window.removeEventListener( "load", completed, false );
+	var
+		// The deferred used on DOM ready
+		readyList,
 
-		} else {
-			document.detachEvent( "onreadystatechange", completed );
-			window.detachEvent( "onload", completed );
-		}
-	};
-
-jQuery.fn = jQuery.prototype = {
-	// The current version of jQuery being used
-	jquery: core_version,
+		// A central reference to the root jQuery(document)
+		rootjQuery,
 
-	constructor: jQuery,
-	init: function( selector, context, rootjQuery ) {
-		var match, elem;
+		// Support: IE<10
+		// For `typeof xmlNode.method` instead of `xmlNode.method !== undefined`
+		core_strundefined = typeof undefined,
 
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
+		// Use the correct document accordingly with window argument (sandbox)
+		location = window.location,
+		document = window.document,
+		docElem = document.documentElement,
 
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
+		// Map over jQuery in case of overwrite
+		_jQuery = window.jQuery,
 
-			// Match html or make sure no context is specified for #id
-			if ( match && (match[1] || !context) ) {
+		// Map over the $ in case of overwrite
+		_$ = window.$,
 
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
+		// [[Class]] -> type pairs
+		class2type = {},
 
-					// scripts is true for back-compat
-					jQuery.merge( this, jQuery.parseHTML(
-						match[1],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
+		// List of deleted data cache ids, so we can reuse them
+		core_deletedIds = [],
 
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
+		core_version = "1.10.2",
 
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
+		// Save a reference to some core methods
+		core_concat = core_deletedIds.concat,
+		core_push = core_deletedIds.push,
+		core_slice = core_deletedIds.slice,
+		core_indexOf = core_deletedIds.indexOf,
+		core_toString = class2type.toString,
+		core_hasOwn = class2type.hasOwnProperty,
+		core_trim = core_version.trim,
 
-					return this;
+		// Define a local copy of jQuery
+		jQuery = function (selector, context) {
+			// The jQuery object is actually just the init constructor 'enhanced'
+			return new jQuery.fn.init(selector, context, rootjQuery);
+		},
 
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
+		// Used for matching numbers
+		core_pnum = /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,
 
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
+		// Used for splitting on whitespace
+		core_rnotwhite = /\S+/g,
 
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
+		// Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
+		rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
 
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
+		// A simple way to check for HTML strings
+		// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+		// Strict HTML recognition (#11290: must start with <)
+		rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
 
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
+		// Match a standalone tag
+		rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
 
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
+		// JSON RegExp
+		rvalidchars = /^[\],:{}\s]*$/,
+		rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
+		rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
+		rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,
 
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
+		// Matches dashed string for camelizing
+		rmsPrefix = /^-ms-/,
+		rdashAlpha = /-([\da-z])/gi,
 
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
+		// Used by jQuery.camelCase as callback to replace()
+		fcamelCase = function (all, letter) {
+			return letter.toUpperCase();
+		},
 
-		return jQuery.makeArray( selector, this );
-	},
+		// The ready event handler
+		completed = function (event) {
 
-	// Start with an empty selector
-	selector: "",
+			// readyState === "complete" is good enough for us to call the dom ready in oldIE
+			if (document.addEventListener || event.type === "load" || document.readyState === "complete") {
+				detach();
+				jQuery.ready();
+			}
+		},
+		// Clean-up method for dom ready events
+		detach = function () {
+			if (document.addEventListener) {
+				document.removeEventListener("DOMContentLoaded", completed, false);
+				window.removeEventListener("load", completed, false);
 
-	// The default length of a jQuery object is 0
-	length: 0,
+			} else {
+				document.detachEvent("onreadystatechange", completed);
+				window.detachEvent("onload", completed);
+			}
+		};
 
-	toArray: function() {
-		return core_slice.call( this );
-	},
+	jQuery.fn = jQuery.prototype = {
+		// The current version of jQuery being used
+		jquery: core_version,
 
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == null ?
+		constructor: jQuery,
+		init: function (selector, context, rootjQuery) {
+			var match, elem;
 
-			// Return a 'clean' array
-			this.toArray() :
+			// HANDLE: $(""), $(null), $(undefined), $(false)
+			if (!selector) {
+				return this;
+			}
 
-			// Return just the object
-			( num < 0 ? this[ this.length + num ] : this[ num ] );
-	},
+			// Handle HTML strings
+			if (typeof selector === "string") {
+				if (selector.charAt(0) === "<" && selector.charAt(selector.length - 1) === ">" && selector.length >= 3) {
+					// Assume that strings that start and end with <> are HTML and skip the regex check
+					match = [null, selector, null];
 
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
+				} else {
+					match = rquickExpr.exec(selector);
+				}
 
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
+				// Match html or make sure no context is specified for #id
+				if (match && (match[1] || !context)) {
 
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-		ret.context = this.context;
+					// HANDLE: $(html) -> $(array)
+					if (match[1]) {
+						context = context instanceof jQuery ? context[0] : context;
 
-		// Return the newly-formed element set
-		return ret;
-	},
+						// scripts is true for back-compat
+						jQuery.merge(this, jQuery.parseHTML(
+							match[1],
+							context && context.nodeType ? context.ownerDocument || context : document,
+							true
+						));
 
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
+						// HANDLE: $(html, props)
+						if (rsingleTag.test(match[1]) && jQuery.isPlainObject(context)) {
+							for (match in context) {
+								// Properties of context are called as methods if possible
+								if (jQuery.isFunction(this[match])) {
+									this[match](context[match]);
 
-	ready: function( fn ) {
-		// Add the callback
-		jQuery.ready.promise().done( fn );
+									// ...and otherwise set as attributes
+								} else {
+									this.attr(match, context[match]);
+								}
+							}
+						}
 
-		return this;
-	},
-
-	slice: function() {
-		return this.pushStack( core_slice.apply( this, arguments ) );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	eq: function( i ) {
-		var len = this.length,
-			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: core_push,
-	sort: [].sort,
-	splice: [].splice
-};
+						return this;
 
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var src, copyIsArray, copy, name, options, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
+						// HANDLE: $(#id)
+					} else {
+						elem = document.getElementById(match[2]);
+
+						// Check parentNode to catch when Blackberry 4.6 returns
+						// nodes that are no longer in the document #6963
+						if (elem && elem.parentNode) {
+							// Handle the case where IE and Opera return items
+							// by name instead of ID
+							if (elem.id !== match[2]) {
+								return rootjQuery.find(selector);
+							}
 
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
+							// Otherwise, we inject the element directly into the jQuery object
+							this.length = 1;
+							this[0] = elem;
+						}
 
-	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
-		target = this;
-		--i;
-	}
+						this.context = document;
+						this.selector = selector;
+						return this;
+					}
 
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
+					// HANDLE: $(expr, $(...))
+				} else if (!context || context.jquery) {
+					return (context || rootjQuery).find(selector);
 
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
+					// HANDLE: $(expr, context)
+					// (which is just equivalent to: $(context).find(expr)
+				} else {
+					return this.constructor(context).find(selector);
 				}
 
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
+				// HANDLE: $(DOMElement)
+			} else if (selector.nodeType) {
+				this.context = this[0] = selector;
+				this.length = 1;
+				return this;
 
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
+				// HANDLE: $(function)
+				// Shortcut for document ready
+			} else if (jQuery.isFunction(selector)) {
+				return rootjQuery.ready(selector);
+			}
 
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
+			if (selector.selector !== undefined) {
+				this.selector = selector.selector;
+				this.context = selector.context;
 			}
-		}
-	}
 
-	// Return the modified object
-	return target;
-};
+			return jQuery.makeArray(selector, this);
+		},
+
+		// Start with an empty selector
+		selector: "",
 
-jQuery.extend({
-	// Unique for each copy of jQuery on the page
-	// Non-digits removed to match rinlinejQuery
-	expando: "jQuery" + ( core_version + Math.random() ).replace( /\D/g, "" ),
+		// The default length of a jQuery object is 0
+		length: 0,
 
-	noConflict: function( deep ) {
-		if ( window.$ === jQuery ) {
-			window.$ = _$;
-		}
+		toArray: function () {
+			return core_slice.call(this);
+		},
 
-		if ( deep && window.jQuery === jQuery ) {
-			window.jQuery = _jQuery;
-		}
+		// Get the Nth element in the matched element set OR
+		// Get the whole matched element set as a clean array
+		get: function (num) {
+			return num == null ?
 
-		return jQuery;
-	},
+				// Return a 'clean' array
+				this.toArray() :
 
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
+				// Return just the object
+				(num < 0 ? this[this.length + num] : this[num]);
+		},
 
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
+		// Take an array of elements and push it onto the stack
+		// (returning the new matched element set)
+		pushStack: function (elems) {
 
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
+			// Build a new jQuery matched element set
+			var ret = jQuery.merge(this.constructor(), elems);
 
-	// Handle when the DOM is ready
-	ready: function( wait ) {
+			// Add the old object onto the stack (as a reference)
+			ret.prevObject = this;
+			ret.context = this.context;
 
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
+			// Return the newly-formed element set
+			return ret;
+		},
 
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( !document.body ) {
-			return setTimeout( jQuery.ready );
-		}
+		// Execute a callback for every element in the matched set.
+		// (You can seed the arguments with an array of args, but this is
+		// only used internally.)
+		each: function (callback, args) {
+			return jQuery.each(this, callback, args);
+		},
 
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
+		ready: function (fn) {
+			// Add the callback
+			jQuery.ready.promise().done(fn);
 
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
+			return this;
+		},
 
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
+		slice: function () {
+			return this.pushStack(core_slice.apply(this, arguments));
+		},
 
-		// Trigger any bound ready events
-		if ( jQuery.fn.trigger ) {
-			jQuery( document ).trigger("ready").off("ready");
-		}
-	},
+		first: function () {
+			return this.eq(0);
+		},
 
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
+		last: function () {
+			return this.eq(-1);
+		},
 
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
-	},
+		eq: function (i) {
+			var len = this.length,
+				j = +i + (i < 0 ? len : 0);
+			return this.pushStack(j >= 0 && j < len ? [this[j]] : []);
+		},
 
-	isWindow: function( obj ) {
-		/* jshint eqeqeq: false */
-		return obj != null && obj == obj.window;
-	},
+		map: function (callback) {
+			return this.pushStack(jQuery.map(this, function (elem, i) {
+				return callback.call(elem, i, elem);
+			}));
+		},
 
-	isNumeric: function( obj ) {
-		return !isNaN( parseFloat(obj) ) && isFinite( obj );
-	},
+		end: function () {
+			return this.prevObject || this.constructor(null);
+		},
 
-	type: function( obj ) {
-		if ( obj == null ) {
-			return String( obj );
-		}
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ core_toString.call(obj) ] || "object" :
-			typeof obj;
-	},
+		// For internal use only.
+		// Behaves like an Array's method, not like a jQuery method.
+		push: core_push,
+		sort: [].sort,
+		splice: [].splice
+	};
 
-	isPlainObject: function( obj ) {
-		var key;
+// Give the init function the jQuery prototype for later instantiation
+	jQuery.fn.init.prototype = jQuery.fn;
 
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
+	jQuery.extend = jQuery.fn.extend = function () {
+		var src, copyIsArray, copy, name, options, clone,
+			target = arguments[0] || {},
+			i = 1,
+			length = arguments.length,
+			deep = false;
 
-		try {
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!core_hasOwn.call(obj, "constructor") &&
-				!core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-				return false;
-			}
-		} catch ( e ) {
-			// IE8,9 Will throw exceptions on certain host objects #9897
-			return false;
+		// Handle a deep copy situation
+		if (typeof target === "boolean") {
+			deep = target;
+			target = arguments[1] || {};
+			// skip the boolean and the target
+			i = 2;
 		}
 
-		// Support: IE<9
-		// Handle iteration over inherited properties before own properties.
-		if ( jQuery.support.ownLast ) {
-			for ( key in obj ) {
-				return core_hasOwn.call( obj, key );
-			}
+		// Handle case when target is a string or something (possible in deep copy)
+		if (typeof target !== "object" && !jQuery.isFunction(target)) {
+			target = {};
 		}
 
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-		for ( key in obj ) {}
-
-		return key === undefined || core_hasOwn.call( obj, key );
-	},
-
-	isEmptyObject: function( obj ) {
-		var name;
-		for ( name in obj ) {
-			return false;
+		// extend jQuery itself if only one argument is passed
+		if (length === i) {
+			target = this;
+			--i;
 		}
-		return true;
-	},
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
 
-	// data: string of html
-	// context (optional): If specified, the fragment will be created in this context, defaults to document
-	// keepScripts (optional): If true, will include scripts passed in the html string
-	parseHTML: function( data, context, keepScripts ) {
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		if ( typeof context === "boolean" ) {
-			keepScripts = context;
-			context = false;
-		}
-		context = context || document;
+		for (; i < length; i++) {
+			// Only deal with non-null/undefined values
+			if ((options = arguments[i]) != null) {
+				// Extend the base object
+				for (name in options) {
+					src = target[name];
+					copy = options[name];
 
-		var parsed = rsingleTag.exec( data ),
-			scripts = !keepScripts && [];
+					// Prevent never-ending loop
+					if (target === copy) {
+						continue;
+					}
 
-		// Single tag
-		if ( parsed ) {
-			return [ context.createElement( parsed[1] ) ];
-		}
+					// Recurse if we're merging plain objects or arrays
+					if (deep && copy && (jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)))) {
+						if (copyIsArray) {
+							copyIsArray = false;
+							clone = src && jQuery.isArray(src) ? src : [];
 
-		parsed = jQuery.buildFragment( [ data ], context, scripts );
-		if ( scripts ) {
-			jQuery( scripts ).remove();
-		}
-		return jQuery.merge( [], parsed.childNodes );
-	},
+						} else {
+							clone = src && jQuery.isPlainObject(src) ? src : {};
+						}
 
-	parseJSON: function( data ) {
-		// Attempt to parse using the native JSON parser first
-		if ( window.JSON && window.JSON.parse ) {
-			return window.JSON.parse( data );
-		}
+						// Never move original objects, clone them
+						target[name] = jQuery.extend(deep, clone, copy);
 
-		if ( data === null ) {
-			return data;
+						// Don't bring in undefined values
+					} else if (copy !== undefined) {
+						target[name] = copy;
+					}
+				}
+			}
 		}
 
-		if ( typeof data === "string" ) {
+		// Return the modified object
+		return target;
+	};
 
-			// Make sure leading/trailing whitespace is removed (IE can't handle it)
-			data = jQuery.trim( data );
+	jQuery.extend({
+		// Unique for each copy of jQuery on the page
+		// Non-digits removed to match rinlinejQuery
+		expando: "jQuery" + (core_version + Math.random()).replace(/\D/g, ""),
 
-			if ( data ) {
-				// Make sure the incoming data is actual JSON
-				// Logic borrowed from http://json.org/json2.js
-				if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-					.replace( rvalidtokens, "]" )
-					.replace( rvalidbraces, "")) ) {
+		noConflict: function (deep) {
+			if (window.$ === jQuery) {
+				window.$ = _$;
+			}
 
-					return ( new Function( "return " + data ) )();
-				}
+			if (deep && window.jQuery === jQuery) {
+				window.jQuery = _jQuery;
 			}
-		}
 
-		jQuery.error( "Invalid JSON: " + data );
-	},
+			return jQuery;
+		},
 
-	// Cross-browser xml parsing
-	parseXML: function( data ) {
-		var xml, tmp;
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		try {
-			if ( window.DOMParser ) { // Standard
-				tmp = new DOMParser();
-				xml = tmp.parseFromString( data , "text/xml" );
-			} else { // IE
-				xml = new ActiveXObject( "Microsoft.XMLDOM" );
-				xml.async = "false";
-				xml.loadXML( data );
-			}
-		} catch( e ) {
-			xml = undefined;
-		}
-		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-			jQuery.error( "Invalid XML: " + data );
-		}
-		return xml;
-	},
-
-	noop: function() {},
-
-	// Evaluates a script in a global context
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-	globalEval: function( data ) {
-		if ( data && jQuery.trim( data ) ) {
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
-			} )( data );
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-	},
-
-	// args is for internal usage only
-	each: function( obj, callback, args ) {
-		var value,
-			i = 0,
-			length = obj.length,
-			isArray = isArraylike( obj );
+		// Is the DOM ready to be used? Set to true once it occurs.
+		isReady: false,
 
-		if ( args ) {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.apply( obj[ i ], args );
+		// A counter to track how many items to wait for before
+		// the ready event fires. See #6781
+		readyWait: 1,
 
-					if ( value === false ) {
-						break;
-					}
-				}
+		// Hold (or release) the ready event
+		holdReady: function (hold) {
+			if (hold) {
+				jQuery.readyWait++;
 			} else {
-				for ( i in obj ) {
-					value = callback.apply( obj[ i ], args );
+				jQuery.ready(true);
+			}
+		},
 
-					if ( value === false ) {
-						break;
-					}
-				}
+		// Handle when the DOM is ready
+		ready: function (wait) {
+
+			// Abort if there are pending holds or we're already ready
+			if (wait === true ? --jQuery.readyWait : jQuery.isReady) {
+				return;
 			}
 
-		// A special, fast, case for the most util use of each
-		} else {
-			if ( isArray ) {
-				for ( ; i < length; i++ ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
+			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+			if (!document.body) {
+				return setTimeout(jQuery.ready);
+			}
 
-					if ( value === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( i in obj ) {
-					value = callback.call( obj[ i ], i, obj[ i ] );
+			// Remember that the DOM is ready
+			jQuery.isReady = true;
 
-					if ( value === false ) {
-						break;
-					}
-				}
+			// If a normal DOM Ready event fired, decrement, and wait if need be
+			if (wait !== true && --jQuery.readyWait > 0) {
+				return;
 			}
-		}
 
-		return obj;
-	},
+			// If there are functions bound, to execute
+			readyList.resolveWith(document, [jQuery]);
 
-	// Use native String.trim function wherever possible
-	trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
-		function( text ) {
-			return text == null ?
-				"" :
-				core_trim.call( text );
-		} :
+			// Trigger any bound ready events
+			if (jQuery.fn.trigger) {
+				jQuery(document).trigger("ready").off("ready");
+			}
+		},
 
-		// Otherwise use our own trimming functionality
-		function( text ) {
-			return text == null ?
-				"" :
-				( text + "" ).replace( rtrim, "" );
+		// See test/unit/core.js for details concerning isFunction.
+		// Since version 1.3, DOM methods and functions like alert
+		// aren't supported. They return false on IE (#2968).
+		isFunction: function (obj) {
+			return jQuery.type(obj) === "function";
 		},
 
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var ret = results || [];
+		isArray: Array.isArray || function (obj) {
+			return jQuery.type(obj) === "array";
+		},
 
-		if ( arr != null ) {
-			if ( isArraylike( Object(arr) ) ) {
-				jQuery.merge( ret,
-					typeof arr === "string" ?
-					[ arr ] : arr
-				);
-			} else {
-				core_push.call( ret, arr );
-			}
-		}
+		isWindow: function (obj) {
+			/* jshint eqeqeq: false */
+			return obj != null && obj == obj.window;
+		},
 
-		return ret;
-	},
+		isNumeric: function (obj) {
+			return !isNaN(parseFloat(obj)) && isFinite(obj);
+		},
+
+		type: function (obj) {
+			if (obj == null) {
+				return String(obj);
+			}
+			return typeof obj === "object" || typeof obj === "function" ?
+				class2type[core_toString.call(obj)] || "object" :
+				typeof obj;
+		},
 
-	inArray: function( elem, arr, i ) {
-		var len;
+		isPlainObject: function (obj) {
+			var key;
 
-		if ( arr ) {
-			if ( core_indexOf ) {
-				return core_indexOf.call( arr, elem, i );
+			// Must be an Object.
+			// Because of IE, we also have to check the presence of the constructor property.
+			// Make sure that DOM nodes and window objects don't pass through, as well
+			if (!obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow(obj)) {
+				return false;
 			}
 
-			len = arr.length;
-			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
+			try {
+				// Not own constructor property must be Object
+				if (obj.constructor &&
+					!core_hasOwn.call(obj, "constructor") &&
+					!core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf")) {
+					return false;
+				}
+			} catch (e) {
+				// IE8,9 Will throw exceptions on certain host objects #9897
+				return false;
+			}
 
-			for ( ; i < len; i++ ) {
-				// Skip accessing in sparse arrays
-				if ( i in arr && arr[ i ] === elem ) {
-					return i;
+			// Support: IE<9
+			// Handle iteration over inherited properties before own properties.
+			if (jQuery.support.ownLast) {
+				for (key in obj) {
+					return core_hasOwn.call(obj, key);
 				}
 			}
-		}
 
-		return -1;
-	},
+			// Own properties are enumerated firstly, so to speed up,
+			// if last one is own, then all properties are own.
+			for (key in obj) {
+			}
 
-	merge: function( first, second ) {
-		var l = second.length,
-			i = first.length,
-			j = 0;
+			return key === undefined || core_hasOwn.call(obj, key);
+		},
 
-		if ( typeof l === "number" ) {
-			for ( ; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
+		isEmptyObject: function (obj) {
+			var name;
+			for (name in obj) {
+				return false;
 			}
-		} else {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
+			return true;
+		},
+
+		error: function (msg) {
+			throw new Error(msg);
+		},
+
+		// data: string of html
+		// context (optional): If specified, the fragment will be created in this context, defaults to document
+		// keepScripts (optional): If true, will include scripts passed in the html string
+		parseHTML: function (data, context, keepScripts) {
+			if (!data || typeof data !== "string") {
+				return null;
 			}
-		}
+			if (typeof context === "boolean") {
+				keepScripts = context;
+				context = false;
+			}
+			context = context || document;
 
-		first.length = i;
+			var parsed = rsingleTag.exec(data),
+				scripts = !keepScripts && [];
 
-		return first;
-	},
+			// Single tag
+			if (parsed) {
+				return [context.createElement(parsed[1])];
+			}
 
-	grep: function( elems, callback, inv ) {
-		var retVal,
-			ret = [],
-			i = 0,
-			length = elems.length;
-		inv = !!inv;
+			parsed = jQuery.buildFragment([data], context, scripts);
+			if (scripts) {
+				jQuery(scripts).remove();
+			}
+			return jQuery.merge([], parsed.childNodes);
+		},
 
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			retVal = !!callback( elems[ i ], i );
-			if ( inv !== retVal ) {
-				ret.push( elems[ i ] );
+		parseJSON: function (data) {
+			// Attempt to parse using the native JSON parser first
+			if (window.JSON && window.JSON.parse) {
+				return window.JSON.parse(data);
 			}
-		}
 
-		return ret;
-	},
+			if (data === null) {
+				return data;
+			}
 
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value,
-			i = 0,
-			length = elems.length,
-			isArray = isArraylike( elems ),
-			ret = [];
+			if (typeof data === "string") {
+
+				// Make sure leading/trailing whitespace is removed (IE can't handle it)
+				data = jQuery.trim(data);
 
-		// Go through the array, translating each of the items to their
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
+				if (data) {
+					// Make sure the incoming data is actual JSON
+					// Logic borrowed from http://json.org/json2.js
+					if (rvalidchars.test(data.replace(rvalidescape, "@")
+						.replace(rvalidtokens, "]")
+						.replace(rvalidbraces, ""))) {
 
-				if ( value != null ) {
-					ret[ ret.length ] = value;
+						return (new Function("return " + data))();
+					}
 				}
 			}
 
-		// Go through every key on the object,
-		} else {
-			for ( i in elems ) {
-				value = callback( elems[ i ], i, arg );
+			jQuery.error("Invalid JSON: " + data);
+		},
 
-				if ( value != null ) {
-					ret[ ret.length ] = value;
+		// Cross-browser xml parsing
+		parseXML: function (data) {
+			var xml, tmp;
+			if (!data || typeof data !== "string") {
+				return null;
+			}
+			try {
+				if (window.DOMParser) { // Standard
+					tmp = new DOMParser();
+					xml = tmp.parseFromString(data, "text/xml");
+				} else { // IE
+					xml = new ActiveXObject("Microsoft.XMLDOM");
+					xml.async = "false";
+					xml.loadXML(data);
 				}
+			} catch (e) {
+				xml = undefined;
 			}
-		}
+			if (!xml || !xml.documentElement || xml.getElementsByTagName("parsererror").length) {
+				jQuery.error("Invalid XML: " + data);
+			}
+			return xml;
+		},
 
-		// Flatten any nested arrays
-		return core_concat.apply( [], ret );
-	},
+		noop: function () {
+		},
 
-	// A global GUID counter for objects
-	guid: 1,
+		// Evaluates a script in a global context
+		// Workarounds based on findings by Jim Driscoll
+		// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
+		globalEval: function (data) {
+			if (data && jQuery.trim(data)) {
+				// We use execScript on Internet Explorer
+				// We use an anonymous function so that context is window
+				// rather than jQuery in Firefox
+				(window.execScript || function (data) {
+					window["eval"].call(window, data);
+				})(data);
+			}
+		},
 
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var args, proxy, tmp;
+		// Convert dashed to camelCase; used by the css and data modules
+		// Microsoft forgot to hump their vendor prefix (#9572)
+		camelCase: function (string) {
+			return string.replace(rmsPrefix, "ms-").replace(rdashAlpha, fcamelCase);
+		},
 
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
+		nodeName: function (elem, name) {
+			return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+		},
 
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
+		// args is for internal usage only
+		each: function (obj, callback, args) {
+			var value,
+				i = 0,
+				length = obj.length,
+				isArray = isArraylike(obj);
 
-		// Simulated bind
-		args = core_slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context || this, args.concat( core_slice.call( arguments ) ) );
-		};
+			if (args) {
+				if (isArray) {
+					for (; i < length; i++) {
+						value = callback.apply(obj[i], args);
+
+						if (value === false) {
+							break;
+						}
+					}
+				} else {
+					for (i in obj) {
+						value = callback.apply(obj[i], args);
 
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
+						if (value === false) {
+							break;
+						}
+					}
+				}
 
-		return proxy;
-	},
+				// A special, fast, case for the most util use of each
+			} else {
+				if (isArray) {
+					for (; i < length; i++) {
+						value = callback.call(obj[i], i, obj[i]);
 
-	// Multifunctional method to get and set values of a collection
-	// The value/s can optionally be executed if it's a function
-	access: function( elems, fn, key, value, chainable, emptyGet, raw ) {
-		var i = 0,
-			length = elems.length,
-			bulk = key == null;
+						if (value === false) {
+							break;
+						}
+					}
+				} else {
+					for (i in obj) {
+						value = callback.call(obj[i], i, obj[i]);
 
-		// Sets many values
-		if ( jQuery.type( key ) === "object" ) {
-			chainable = true;
-			for ( i in key ) {
-				jQuery.access( elems, fn, i, key[i], true, emptyGet, raw );
+						if (value === false) {
+							break;
+						}
+					}
+				}
 			}
 
-		// Sets one value
-		} else if ( value !== undefined ) {
-			chainable = true;
+			return obj;
+		},
 
-			if ( !jQuery.isFunction( value ) ) {
-				raw = true;
-			}
+		// Use native String.trim function wherever possible
+		trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
+			function (text) {
+				return text == null ?
+					"" :
+					core_trim.call(text);
+			} :
+
+			// Otherwise use our own trimming functionality
+			function (text) {
+				return text == null ?
+					"" :
+					(text + "").replace(rtrim, "");
+			},
 
-			if ( bulk ) {
-				// Bulk operations run against the entire set
-				if ( raw ) {
-					fn.call( elems, value );
-					fn = null;
+		// results is for internal usage only
+		makeArray: function (arr, results) {
+			var ret = results || [];
 
-				// ...except when executing function values
+			if (arr != null) {
+				if (isArraylike(Object(arr))) {
+					jQuery.merge(ret,
+						typeof arr === "string" ?
+							[arr] : arr
+					);
 				} else {
-					bulk = fn;
-					fn = function( elem, key, value ) {
-						return bulk.call( jQuery( elem ), value );
-					};
+					core_push.call(ret, arr);
 				}
 			}
 
-			if ( fn ) {
-				for ( ; i < length; i++ ) {
-					fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) );
-				}
-			}
-		}
+			return ret;
+		},
 
-		return chainable ?
-			elems :
+		inArray: function (elem, arr, i) {
+			var len;
 
-			// Gets
-			bulk ?
-				fn.call( elems ) :
-				length ? fn( elems[0], key ) : emptyGet;
-	},
+			if (arr) {
+				if (core_indexOf) {
+					return core_indexOf.call(arr, elem, i);
+				}
 
-	now: function() {
-		return ( new Date() ).getTime();
-	},
+				len = arr.length;
+				i = i ? i < 0 ? Math.max(0, len + i) : i : 0;
 
-	// A method for quickly swapping in/out CSS properties to get correct calculations.
-	// Note: this method belongs to the css module but it's needed here for the support module.
-	// If support gets modularized, this method should be moved back to the css module.
-	swap: function( elem, options, callback, args ) {
-		var ret, name,
-			old = {};
+				for (; i < len; i++) {
+					// Skip accessing in sparse arrays
+					if (i in arr && arr[i] === elem) {
+						return i;
+					}
+				}
+			}
 
-		// Remember the old values, and insert the new ones
-		for ( name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
+			return -1;
+		},
 
-		ret = callback.apply( elem, args || [] );
+		merge: function (first, second) {
+			var l = second.length,
+				i = first.length,
+				j = 0;
 
-		// Revert the old values
-		for ( name in options ) {
-			elem.style[ name ] = old[ name ];
-		}
+			if (typeof l === "number") {
+				for (; j < l; j++) {
+					first[i++] = second[j];
+				}
+			} else {
+				while (second[j] !== undefined) {
+					first[i++] = second[j++];
+				}
+			}
 
-		return ret;
-	}
-});
+			first.length = i;
 
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
+			return first;
+		},
 
-		readyList = jQuery.Deferred();
+		grep: function (elems, callback, inv) {
+			var retVal,
+				ret = [],
+				i = 0,
+				length = elems.length;
+			inv = !!inv;
 
-		// Catch cases where $(document).ready() is called after the browser event has already occurred.
-		// we once tried to use readyState "interactive" here, but it caused issues like the one
-		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			setTimeout( jQuery.ready );
+			// Go through the array, only saving the items
+			// that pass the validator function
+			for (; i < length; i++) {
+				retVal = !!callback(elems[i], i);
+				if (inv !== retVal) {
+					ret.push(elems[i]);
+				}
+			}
 
-		// Standards-based browsers support DOMContentLoaded
-		} else if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", completed, false );
+			return ret;
+		},
 
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", completed, false );
+		// arg is for internal usage only
+		map: function (elems, callback, arg) {
+			var value,
+				i = 0,
+				length = elems.length,
+				isArray = isArraylike(elems),
+				ret = [];
 
-		// If IE event model is used
-		} else {
-			// Ensure firing before onload, maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", completed );
+			// Go through the array, translating each of the items to their
+			if (isArray) {
+				for (; i < length; i++) {
+					value = callback(elems[i], i, arg);
 
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", completed );
+					if (value != null) {
+						ret[ret.length] = value;
+					}
+				}
 
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var top = false;
+				// Go through every key on the object,
+			} else {
+				for (i in elems) {
+					value = callback(elems[i], i, arg);
 
-			try {
-				top = window.frameElement == null && document.documentElement;
-			} catch(e) {}
+					if (value != null) {
+						ret[ret.length] = value;
+					}
+				}
+			}
 
-			if ( top && top.doScroll ) {
-				(function doScrollCheck() {
-					if ( !jQuery.isReady ) {
+			// Flatten any nested arrays
+			return core_concat.apply([], ret);
+		},
 
-						try {
-							// Use the trick by Diego Perini
-							// http://javascript.nwbox.com/IEContentLoaded/
-							top.doScroll("left");
-						} catch(e) {
-							return setTimeout( doScrollCheck, 50 );
-						}
+		// A global GUID counter for objects
+		guid: 1,
+
+		// Bind a function to a context, optionally partially applying any
+		// arguments.
+		proxy: function (fn, context) {
+			var args, proxy, tmp;
+
+			if (typeof context === "string") {
+				tmp = fn[context];
+				context = fn;
+				fn = tmp;
+			}
 
-						// detach all dom ready events
-						detach();
+			// Quick check to determine if target is callable, in the spec
+			// this throws a TypeError, but we will just return undefined.
+			if (!jQuery.isFunction(fn)) {
+				return undefined;
+			}
+
+			// Simulated bind
+			args = core_slice.call(arguments, 2);
+			proxy = function () {
+				return fn.apply(context || this, args.concat(core_slice.call(arguments)));
+			};
 
-						// and execute any waiting functions
-						jQuery.ready();
+			// Set the guid of unique handler to the same of original handler, so it can be removed
+			proxy.guid = fn.guid = fn.guid || jQuery.guid++;
+
+			return proxy;
+		},
+
+		// Multifunctional method to get and set values of a collection
+		// The value/s can optionally be executed if it's a function
+		access: function (elems, fn, key, value, chainable, emptyGet, raw) {
+			var i = 0,
+				length = elems.length,
+				bulk = key == null;
+
+			// Sets many values
+			if (jQuery.type(key) === "object") {
+				chainable = true;
+				for (i in key) {
+					jQuery.access(elems, fn, i, key[i], true, emptyGet, raw);
+				}
+
+				// Sets one value
+			} else if (value !== undefined) {
+				chainable = true;
+
+				if (!jQuery.isFunction(value)) {
+					raw = true;
+				}
+
+				if (bulk) {
+					// Bulk operations run against the entire set
+					if (raw) {
+						fn.call(elems, value);
+						fn = null;
+
+						// ...except when executing function values
+					} else {
+						bulk = fn;
+						fn = function (elem, key, value) {
+							return bulk.call(jQuery(elem), value);
+						};
 					}
-				})();
+				}
+
+				if (fn) {
+					for (; i < length; i++) {
+						fn(elems[i], key, raw ? value : value.call(elems[i], i, fn(elems[i], key)));
+					}
+				}
+			}
+
+			return chainable ?
+				elems :
+
+				// Gets
+				bulk ?
+					fn.call(elems) :
+					length ? fn(elems[0], key) : emptyGet;
+		},
+
+		now: function () {
+			return (new Date()).getTime();
+		},
+
+		// A method for quickly swapping in/out CSS properties to get correct calculations.
+		// Note: this method belongs to the css module but it's needed here for the support module.
+		// If support gets modularized, this method should be moved back to the css module.
+		swap: function (elem, options, callback, args) {
+			var ret, name,
+				old = {};
+
+			// Remember the old values, and insert the new ones
+			for (name in options) {
+				old[name] = elem.style[name];
+				elem.style[name] = options[name];
+			}
+
+			ret = callback.apply(elem, args || []);
+
+			// Revert the old values
+			for (name in options) {
+				elem.style[name] = old[name];
 			}
+
+			return ret;
 		}
-	}
-	return readyList.promise( obj );
-};
+	});
+
+	jQuery.ready.promise = function (obj) {
+		if (!readyList) {
+
+			readyList = jQuery.Deferred();
+
+			// Catch cases where $(document).ready() is called after the browser event has already occurred.
+			// we once tried to use readyState "interactive" here, but it caused issues like the one
+			// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
+			if (document.readyState === "complete") {
+				// Handle it asynchronously to allow scripts the opportunity to delay ready
+				setTimeout(jQuery.ready);
+
+				// Standards-based browsers support DOMContentLoaded
+			} else if (document.addEventListener) {
+				// Use the handy event callback
+				document.addEventListener("DOMContentLoaded", completed, false);
+
+				// A fallback to window.onload, that will always work
+				window.addEventListener("load", completed, false);
+
+				// If IE event model is used
+			} else {
+				// Ensure firing before onload, maybe late but safe also for iframes
+				document.attachEvent("onreadystatechange", completed);
+
+				// A fallback to window.onload, that will always work
+				window.attachEvent("onload", completed);
+
+				// If IE and not a frame
+				// continually check to see if the document is ready
+				var top = false;
+
+				try {
+					top = window.frameElement == null && document.documentElement;
+				} catch (e) {
+				}
+
+				if (top && top.doScroll) {
+					(function doScrollCheck() {
+						if (!jQuery.isReady) {
+
+							try {
+								// Use the trick by Diego Perini
+								// http://javascript.nwbox.com/IEContentLoaded/
+								top.doScroll("left");
+							} catch (e) {
+								return setTimeout(doScrollCheck, 50);
+							}
+
+							// detach all dom ready events
+							detach();
+
+							// and execute any waiting functions
+							jQuery.ready();
+						}
+					})();
+				}
+			}
+		}
+		return readyList.promise(obj);
+	};
 
 // Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
+	jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function (i, name) {
+		class2type["[object " + name + "]"] = name.toLowerCase();
+	});
 
-function isArraylike( obj ) {
-	var length = obj.length,
-		type = jQuery.type( obj );
+	function isArraylike(obj) {
+		var length = obj.length,
+			type = jQuery.type(obj);
 
-	if ( jQuery.isWindow( obj ) ) {
-		return false;
-	}
+		if (jQuery.isWindow(obj)) {
+			return false;
+		}
 
-	if ( obj.nodeType === 1 && length ) {
-		return true;
-	}
+		if (obj.nodeType === 1 && length) {
+			return true;
+		}
 
-	return type === "array" || type !== "function" &&
-		( length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj );
-}
+		return type === "array" || type !== "function" &&
+			(length === 0 ||
+				typeof length === "number" && length > 0 && (length - 1) in obj);
+	}
 
 // All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-/*!
+	rootjQuery = jQuery(document);
+	/*!
  * Sizzle CSS Selector Engine v1.10.2
  * http://sizzlejs.com/
  *
@@ -1009,947 +1012,951 @@ rootjQuery = jQuery(document);
  *
  * Date: 2013-07-03
  */
-(function( window, undefined ) {
-
-var i,
-	support,
-	cachedruns,
-	Expr,
-	getText,
-	isXML,
-	compile,
-	outermostContext,
-	sortInput,
-
-	// Local document vars
-	setDocument,
-	document,
-	docElem,
-	documentIsHTML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-
-	// Instance-specific data
-	expando = "sizzle" + -(new Date()),
-	preferredDoc = window.document,
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-	hasDuplicate = false,
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-		return 0;
-	},
-
-	// General-purpose constants
-	strundefined = typeof undefined,
-	MAX_NEGATIVE = 1 << 31,
-
-	// Instance methods
-	hasOwn = ({}).hasOwnProperty,
-	arr = [],
-	pop = arr.pop,
-	push_native = arr.push,
-	push = arr.push,
-	slice = arr.slice,
-	// Use a stripped-down indexOf if we can't use a native one
-	indexOf = arr.indexOf || function( elem ) {
-		var i = 0,
-			len = this.length;
-		for ( ; i < len; i++ ) {
-			if ( this[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
-
-	// Regular expressions
-
-	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-	// http://www.w3.org/TR/css3-syntax/#characters
-	characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
-	// Loosely modeled on CSS identifier characters
-	// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
-	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = characterEncoding.replace( "w", "w#" ),
-
-	// Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
-		"*(?:([*^$|!~]?=)" + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
-
-	// Prefer arguments quoted,
-	//   then not containing pseudos/brackets,
-	//   then attribute selectors/non-parenthetical expressions,
-	//   then anything else
-	// These preferences are here to reduce the number of selectors
-	//   needing tokenize in the PSEUDO preFilter
-	pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace( 3, 8 ) + ")*)|.*)\\)|)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
-
-	rsibling = new RegExp( whitespace + "*[+~]" ),
-	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*)" + whitespace + "*\\]", "g" ),
-
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
-		// For use in libraries implementing .is()
-		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rnative = /^[^{]+\{\s*\[native \w/,
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rescape = /'|\\/g,
-
-	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
-	funescape = function( _, escaped, escapedWhitespace ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		// Support: Firefox
-		// Workaround erroneous numeric interpretation of +"0x"
-		return high !== high || escapedWhitespace ?
-			escaped :
-			// BMP codepoint
-			high < 0 ?
-				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	};
+	(function (window, undefined) {
+
+		var i,
+			support,
+			cachedruns,
+			Expr,
+			getText,
+			isXML,
+			compile,
+			outermostContext,
+			sortInput,
+
+			// Local document vars
+			setDocument,
+			document,
+			docElem,
+			documentIsHTML,
+			rbuggyQSA,
+			rbuggyMatches,
+			matches,
+			contains,
+
+			// Instance-specific data
+			expando = "sizzle" + -(new Date()),
+			preferredDoc = window.document,
+			dirruns = 0,
+			done = 0,
+			classCache = createCache(),
+			tokenCache = createCache(),
+			compilerCache = createCache(),
+			hasDuplicate = false,
+			sortOrder = function (a, b) {
+				if (a === b) {
+					hasDuplicate = true;
+					return 0;
+				}
+				return 0;
+			},
+
+			// General-purpose constants
+			strundefined = typeof undefined,
+			MAX_NEGATIVE = 1 << 31,
+
+			// Instance methods
+			hasOwn = ({}).hasOwnProperty,
+			arr = [],
+			pop = arr.pop,
+			push_native = arr.push,
+			push = arr.push,
+			slice = arr.slice,
+			// Use a stripped-down indexOf if we can't use a native one
+			indexOf = arr.indexOf || function (elem) {
+				var i = 0,
+					len = this.length;
+				for (; i < len; i++) {
+					if (this[i] === elem) {
+						return i;
+					}
+				}
+				return -1;
+			},
+
+			booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
+
+			// Regular expressions
+
+			// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
+			whitespace = "[\\x20\\t\\r\\n\\f]",
+			// http://www.w3.org/TR/css3-syntax/#characters
+			characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
+
+			// Loosely modeled on CSS identifier characters
+			// An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors
+			// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
+			identifier = characterEncoding.replace("w", "w#"),
+
+			// Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
+			attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
+				"*(?:([*^$|!~]?=)" + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
+
+			// Prefer arguments quoted,
+			//   then not containing pseudos/brackets,
+			//   then attribute selectors/non-parenthetical expressions,
+			//   then anything else
+			// These preferences are here to reduce the number of selectors
+			//   needing tokenize in the PSEUDO preFilter
+			pseudos = ":(" + characterEncoding + ")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|" + attributes.replace(3, 8) + ")*)|.*)\\)|)",
+
+			// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
+			rtrim = new RegExp("^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g"),
+
+			rcomma = new RegExp("^" + whitespace + "*," + whitespace + "*"),
+			rcombinators = new RegExp("^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*"),
+
+			rsibling = new RegExp(whitespace + "*[+~]"),
+			rattributeQuotes = new RegExp("=" + whitespace + "*([^\\]'\"]*)" + whitespace + "*\\]", "g"),
+
+			rpseudo = new RegExp(pseudos),
+			ridentifier = new RegExp("^" + identifier + "$"),
+
+			matchExpr = {
+				"ID": new RegExp("^#(" + characterEncoding + ")"),
+				"CLASS": new RegExp("^\\.(" + characterEncoding + ")"),
+				"TAG": new RegExp("^(" + characterEncoding.replace("w", "w*") + ")"),
+				"ATTR": new RegExp("^" + attributes),
+				"PSEUDO": new RegExp("^" + pseudos),
+				"CHILD": new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
+					"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
+					"*(\\d+)|))" + whitespace + "*\\)|)", "i"),
+				"bool": new RegExp("^(?:" + booleans + ")$", "i"),
+				// For use in libraries implementing .is()
+				// We use this for POS matching in `select`
+				"needsContext": new RegExp("^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
+					whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i")
+			},
+
+			rnative = /^[^{]+\{\s*\[native \w/,
+
+			// Easily-parseable/retrievable ID or TAG or CLASS selectors
+			rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
+
+			rinputs = /^(?:input|select|textarea|button)$/i,
+			rheader = /^h\d$/i,
+
+			rescape = /'|\\/g,
+
+			// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
+			runescape = new RegExp("\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig"),
+			funescape = function (_, escaped, escapedWhitespace) {
+				var high = "0x" + escaped - 0x10000;
+				// NaN means non-codepoint
+				// Support: Firefox
+				// Workaround erroneous numeric interpretation of +"0x"
+				return high !== high || escapedWhitespace ?
+					escaped :
+					// BMP codepoint
+					high < 0 ?
+						String.fromCharCode(high + 0x10000) :
+						// Supplemental Plane codepoint (surrogate pair)
+						String.fromCharCode(high >> 10 | 0xD800, high & 0x3FF | 0xDC00);
+			};
 
 // Optimize for push.apply( _, NodeList )
-try {
-	push.apply(
-		(arr = slice.call( preferredDoc.childNodes )),
-		preferredDoc.childNodes
-	);
-	// Support: Android<4.0
-	// Detect silently failing push.apply
-	arr[ preferredDoc.childNodes.length ].nodeType;
-} catch ( e ) {
-	push = { apply: arr.length ?
-
-		// Leverage slice if possible
-		function( target, els ) {
-			push_native.apply( target, slice.call(els) );
-		} :
+		try {
+			push.apply(
+				(arr = slice.call(preferredDoc.childNodes)),
+				preferredDoc.childNodes
+			);
+			// Support: Android<4.0
+			// Detect silently failing push.apply
+			arr[preferredDoc.childNodes.length].nodeType;
+		} catch (e) {
+			push = {
+				apply: arr.length ?
+
+					// Leverage slice if possible
+					function (target, els) {
+						push_native.apply(target, slice.call(els));
+					} :
 
-		// Support: IE<9
-		// Otherwise append directly
-		function( target, els ) {
-			var j = target.length,
-				i = 0;
-			// Can't trust NodeList.length
-			while ( (target[j++] = els[i++]) ) {}
-			target.length = j - 1;
+					// Support: IE<9
+					// Otherwise append directly
+					function (target, els) {
+						var j = target.length,
+							i = 0;
+						// Can't trust NodeList.length
+						while ((target[j++] = els[i++])) {
+						}
+						target.length = j - 1;
+					}
+			};
 		}
-	};
-}
 
-function Sizzle( selector, context, results, seed ) {
-	var match, elem, m, nodeType,
-		// QSA vars
-		i, groups, old, nid, newContext, newSelector;
+		function Sizzle(selector, context, results, seed) {
+			var match, elem, m, nodeType,
+				// QSA vars
+				i, groups, old, nid, newContext, newSelector;
 
-	if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-		setDocument( context );
-	}
+			if ((context ? context.ownerDocument || context : preferredDoc) !== document) {
+				setDocument(context);
+			}
 
-	context = context || document;
-	results = results || [];
+			context = context || document;
+			results = results || [];
 
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
+			if (!selector || typeof selector !== "string") {
+				return results;
+			}
 
-	if ( (nodeType = context.nodeType) !== 1 && nodeType !== 9 ) {
-		return [];
-	}
+			if ((nodeType = context.nodeType) !== 1 && nodeType !== 9) {
+				return [];
+			}
 
-	if ( documentIsHTML && !seed ) {
-
-		// Shortcuts
-		if ( (match = rquickExpr.exec( selector )) ) {
-			// Speed-up: Sizzle("#ID")
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE, Opera, and Webkit return items
-						// by name instead of ID
-						if ( elem.id === m ) {
-							results.push( elem );
-							return results;
+			if (documentIsHTML && !seed) {
+
+				// Shortcuts
+				if ((match = rquickExpr.exec(selector))) {
+					// Speed-up: Sizzle("#ID")
+					if ((m = match[1])) {
+						if (nodeType === 9) {
+							elem = context.getElementById(m);
+							// Check parentNode to catch when Blackberry 4.6 returns
+							// nodes that are no longer in the document #6963
+							if (elem && elem.parentNode) {
+								// Handle the case where IE, Opera, and Webkit return items
+								// by name instead of ID
+								if (elem.id === m) {
+									results.push(elem);
+									return results;
+								}
+							} else {
+								return results;
+							}
+						} else {
+							// Context is not a document
+							if (context.ownerDocument && (elem = context.ownerDocument.getElementById(m)) &&
+								contains(context, elem) && elem.id === m) {
+								results.push(elem);
+								return results;
+							}
 						}
-					} else {
+
+						// Speed-up: Sizzle("TAG")
+					} else if (match[2]) {
+						push.apply(results, context.getElementsByTagName(selector));
 						return results;
-					}
-				} else {
-					// Context is not a document
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
+
+						// Speed-up: Sizzle(".CLASS")
+					} else if ((m = match[3]) && support.getElementsByClassName && context.getElementsByClassName) {
+						push.apply(results, context.getElementsByClassName(m));
 						return results;
 					}
 				}
 
-			// Speed-up: Sizzle("TAG")
-			} else if ( match[2] ) {
-				push.apply( results, context.getElementsByTagName( selector ) );
-				return results;
-
-			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && support.getElementsByClassName && context.getElementsByClassName ) {
-				push.apply( results, context.getElementsByClassName( m ) );
-				return results;
-			}
-		}
-
-		// QSA path
-		if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-			nid = old = expando;
-			newContext = context;
-			newSelector = nodeType === 9 && selector;
+				// QSA path
+				if (support.qsa && (!rbuggyQSA || !rbuggyQSA.test(selector))) {
+					nid = old = expando;
+					newContext = context;
+					newSelector = nodeType === 9 && selector;
 
-			// qSA works strangely on Element-rooted queries
-			// We can work around this by specifying an extra ID on the root
-			// and working up from there (Thanks to Andrew Dupont for the technique)
-			// IE 8 doesn't work on object elements
-			if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-				groups = tokenize( selector );
+					// qSA works strangely on Element-rooted queries
+					// We can work around this by specifying an extra ID on the root
+					// and working up from there (Thanks to Andrew Dupont for the technique)
+					// IE 8 doesn't work on object elements
+					if (nodeType === 1 && context.nodeName.toLowerCase() !== "object") {
+						groups = tokenize(selector);
 
-				if ( (old = context.getAttribute("id")) ) {
-					nid = old.replace( rescape, "\\$&" );
-				} else {
-					context.setAttribute( "id", nid );
-				}
-				nid = "[id='" + nid + "'] ";
+						if ((old = context.getAttribute("id"))) {
+							nid = old.replace(rescape, "\\$&");
+						} else {
+							context.setAttribute("id", nid);
+						}
+						nid = "[id='" + nid + "'] ";
 
-				i = groups.length;
-				while ( i-- ) {
-					groups[i] = nid + toSelector( groups[i] );
-				}
-				newContext = rsibling.test( selector ) && context.parentNode || context;
-				newSelector = groups.join(",");
-			}
+						i = groups.length;
+						while (i--) {
+							groups[i] = nid + toSelector(groups[i]);
+						}
+						newContext = rsibling.test(selector) && context.parentNode || context;
+						newSelector = groups.join(",");
+					}
 
-			if ( newSelector ) {
-				try {
-					push.apply( results,
-						newContext.querySelectorAll( newSelector )
-					);
-					return results;
-				} catch(qsaError) {
-				} finally {
-					if ( !old ) {
-						context.removeAttribute("id");
+					if (newSelector) {
+						try {
+							push.apply(results,
+								newContext.querySelectorAll(newSelector)
+							);
+							return results;
+						} catch (qsaError) {
+						} finally {
+							if (!old) {
+								context.removeAttribute("id");
+							}
+						}
 					}
 				}
 			}
+
+			// All others
+			return select(selector.replace(rtrim, "$1"), context, results, seed);
 		}
-	}
 
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
+		/**
+		 * Create key-value caches of limited size
+		 * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
+		 *    property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
+		 *    deleting the oldest entry
+		 */
+		function createCache() {
+			var keys = [];
 
-/**
- * Create key-value caches of limited size
- * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var keys = [];
+			function cache(key, value) {
+				// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
+				if (keys.push(key += " ") > Expr.cacheLength) {
+					// Only keep the most recent entries
+					delete cache[keys.shift()];
+				}
+				return (cache[key] = value);
+			}
 
-	function cache( key, value ) {
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key += " " ) > Expr.cacheLength ) {
-			// Only keep the most recent entries
-			delete cache[ keys.shift() ];
+			return cache;
 		}
-		return (cache[ key ] = value);
-	}
-	return cache;
-}
 
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
- */
-function assert( fn ) {
-	var div = document.createElement("div");
-
-	try {
-		return !!fn( div );
-	} catch (e) {
-		return false;
-	} finally {
-		// Remove from its parent by default
-		if ( div.parentNode ) {
-			div.parentNode.removeChild( div );
+		/**
+		 * Mark a function for special use by Sizzle
+		 * @param {Function} fn The function to mark
+		 */
+		function markFunction(fn) {
+			fn[expando] = true;
+			return fn;
 		}
-		// release memory in IE
-		div = null;
-	}
-}
 
-/**
- * Adds the same handler for all of the specified attrs
- * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied
- */
-function addHandle( attrs, handler ) {
-	var arr = attrs.split("|"),
-		i = attrs.length;
-
-	while ( i-- ) {
-		Expr.attrHandle[ arr[i] ] = handler;
-	}
-}
+		/**
+		 * Support testing using an element
+		 * @param {Function} fn Passed the created div and expects a boolean result
+		 */
+		function assert(fn) {
+			var div = document.createElement("div");
 
-/**
- * Checks document order of two siblings
- * @param {Element} a
- * @param {Element} b
- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
- */
-function siblingCheck( a, b ) {
-	var cur = b && a,
-		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-			( ~b.sourceIndex || MAX_NEGATIVE ) -
-			( ~a.sourceIndex || MAX_NEGATIVE );
-
-	// Use IE sourceIndex if available on both nodes
-	if ( diff ) {
-		return diff;
-	}
-
-	// Check if b follows a
-	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
-			if ( cur === b ) {
-				return -1;
+			try {
+				return !!fn(div);
+			} catch (e) {
+				return false;
+			} finally {
+				// Remove from its parent by default
+				if (div.parentNode) {
+					div.parentNode.removeChild(div);
+				}
+				// release memory in IE
+				div = null;
 			}
 		}
-	}
 
-	return a ? 1 : -1;
-}
+		/**
+		 * Adds the same handler for all of the specified attrs
+		 * @param {String} attrs Pipe-separated list of attributes
+		 * @param {Function} handler The method that will be applied
+		 */
+		function addHandle(attrs, handler) {
+			var arr = attrs.split("|"),
+				i = attrs.length;
 
-/**
- * Returns a function to use in pseudos for input types
- * @param {String} type
- */
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
+			while (i--) {
+				Expr.attrHandle[arr[i]] = handler;
+			}
+		}
 
-/**
- * Returns a function to use in pseudos for buttons
- * @param {String} type
- */
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
+		/**
+		 * Checks document order of two siblings
+		 * @param {Element} a
+		 * @param {Element} b
+		 * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
+		 */
+		function siblingCheck(a, b) {
+			var cur = b && a,
+				diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
+					(~b.sourceIndex || MAX_NEGATIVE) -
+					(~a.sourceIndex || MAX_NEGATIVE);
 
-/**
- * Returns a function to use in pseudos for positionals
- * @param {Function} fn
- */
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
+			// Use IE sourceIndex if available on both nodes
+			if (diff) {
+				return diff;
+			}
 
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
+			// Check if b follows a
+			if (cur) {
+				while ((cur = cur.nextSibling)) {
+					if (cur === b) {
+						return -1;
+					}
 				}
 			}
-		});
-	});
-}
 
-/**
- * Detect xml
- * @param {Element|Object} elem An element or a document
- */
-isXML = Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-// Expose support vars for convenience
-support = Sizzle.support = {};
+			return a ? 1 : -1;
+		}
 
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var doc = node ? node.ownerDocument || node : preferredDoc,
-		parent = doc.defaultView;
+		/**
+		 * Returns a function to use in pseudos for input types
+		 * @param {String} type
+		 */
+		function createInputPseudo(type) {
+			return function (elem) {
+				var name = elem.nodeName.toLowerCase();
+				return name === "input" && elem.type === type;
+			};
+		}
 
-	// If no document and documentElement is available, return
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
+		/**
+		 * Returns a function to use in pseudos for buttons
+		 * @param {String} type
+		 */
+		function createButtonPseudo(type) {
+			return function (elem) {
+				var name = elem.nodeName.toLowerCase();
+				return (name === "input" || name === "button") && elem.type === type;
+			};
+		}
 
-	// Set our document
-	document = doc;
-	docElem = doc.documentElement;
+		/**
+		 * Returns a function to use in pseudos for positionals
+		 * @param {Function} fn
+		 */
+		function createPositionalPseudo(fn) {
+			return markFunction(function (argument) {
+				argument = +argument;
+				return markFunction(function (seed, matches) {
+					var j,
+						matchIndexes = fn([], seed.length, argument),
+						i = matchIndexes.length;
+
+					// Match elements found at the specified indexes
+					while (i--) {
+						if (seed[(j = matchIndexes[i])]) {
+							seed[j] = !(matches[j] = seed[j]);
+						}
+					}
+				});
+			});
+		}
 
-	// Support tests
-	documentIsHTML = !isXML( doc );
+		/**
+		 * Detect xml
+		 * @param {Element|Object} elem An element or a document
+		 */
+		isXML = Sizzle.isXML = function (elem) {
+			// documentElement is verified for cases where it doesn't yet exist
+			// (such as loading iframes in IE - #4833)
+			var documentElement = elem && (elem.ownerDocument || elem).documentElement;
+			return documentElement ? documentElement.nodeName !== "HTML" : false;
+		};
 
-	// Support: IE>8
-	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
-	// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
-	// IE6-8 do not support the defaultView property so parent will be undefined
-	if ( parent && parent.attachEvent && parent !== parent.top ) {
-		parent.attachEvent( "onbeforeunload", function() {
-			setDocument();
-		});
-	}
+// Expose support vars for convenience
+		support = Sizzle.support = {};
+
+		/**
+		 * Sets document-related variables once based on the current document
+		 * @param {Element|Object} [doc] An element or document object to use to set the document
+		 * @returns {Object} Returns the current document
+		 */
+		setDocument = Sizzle.setDocument = function (node) {
+			var doc = node ? node.ownerDocument || node : preferredDoc,
+				parent = doc.defaultView;
+
+			// If no document and documentElement is available, return
+			if (doc === document || doc.nodeType !== 9 || !doc.documentElement) {
+				return document;
+			}
+
+			// Set our document
+			document = doc;
+			docElem = doc.documentElement;
+
+			// Support tests
+			documentIsHTML = !isXML(doc);
+
+			// Support: IE>8
+			// If iframe document is assigned to "document" variable and if iframe has been reloaded,
+			// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
+			// IE6-8 do not support the defaultView property so parent will be undefined
+			if (parent && parent.attachEvent && parent !== parent.top) {
+				parent.attachEvent("onbeforeunload", function () {
+					setDocument();
+				});
+			}
 
-	/* Attributes
+			/* Attributes
 	---------------------------------------------------------------------- */
 
-	// Support: IE<8
-	// Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans)
-	support.attributes = assert(function( div ) {
-		div.className = "i";
-		return !div.getAttribute("className");
-	});
+			// Support: IE<8
+			// Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans)
+			support.attributes = assert(function (div) {
+				div.className = "i";
+				return !div.getAttribute("className");
+			});
 
-	/* getElement(s)By*
+			/* getElement(s)By*
 	---------------------------------------------------------------------- */
 
-	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert(function( div ) {
-		div.appendChild( doc.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	});
+			// Check if getElementsByTagName("*") returns only elements
+			support.getElementsByTagName = assert(function (div) {
+				div.appendChild(doc.createComment(""));
+				return !div.getElementsByTagName("*").length;
+			});
 
-	// Check if getElementsByClassName can be trusted
-	support.getElementsByClassName = assert(function( div ) {
-		div.innerHTML = "<div class='a'></div><div class='a i'></div>";
+			// Check if getElementsByClassName can be trusted
+			support.getElementsByClassName = assert(function (div) {
+				div.innerHTML = "<div class='a'></div><div class='a i'></div>";
 
-		// Support: Safari<4
-		// Catch class over-caching
-		div.firstChild.className = "i";
-		// Support: Opera<10
-		// Catch gEBCN failure to find non-leading classes
-		return div.getElementsByClassName("i").length === 2;
-	});
-
-	// Support: IE<10
-	// Check if getElementById returns elements by name
-	// The broken getElementById methods don't pick up programatically-set names,
-	// so use a roundabout getElementsByName test
-	support.getById = assert(function( div ) {
-		docElem.appendChild( div ).id = expando;
-		return !doc.getElementsByName || !doc.getElementsByName( expando ).length;
-	});
+				// Support: Safari<4
+				// Catch class over-caching
+				div.firstChild.className = "i";
+				// Support: Opera<10
+				// Catch gEBCN failure to find non-leading classes
+				return div.getElementsByClassName("i").length === 2;
+			});
 
-	// ID find and filter
-	if ( support.getById ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== strundefined && documentIsHTML ) {
-				var m = context.getElementById( id );
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [m] : [];
-			}
-		};
-		Expr.filter["ID"] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
-			};
-		};
-	} else {
-		// Support: IE6/7
-		// getElementById is not reliable as a find shortcut
-		delete Expr.find["ID"];
-
-		Expr.filter["ID"] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
-				return node && node.value === attrId;
-			};
-		};
-	}
+			// Support: IE<10
+			// Check if getElementById returns elements by name
+			// The broken getElementById methods don't pick up programatically-set names,
+			// so use a roundabout getElementsByName test
+			support.getById = assert(function (div) {
+				docElem.appendChild(div).id = expando;
+				return !doc.getElementsByName || !doc.getElementsByName(expando).length;
+			});
 
-	// Tag
-	Expr.find["TAG"] = support.getElementsByTagName ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== strundefined ) {
-				return context.getElementsByTagName( tag );
+			// ID find and filter
+			if (support.getById) {
+				Expr.find["ID"] = function (id, context) {
+					if (typeof context.getElementById !== strundefined && documentIsHTML) {
+						var m = context.getElementById(id);
+						// Check parentNode to catch when Blackberry 4.6 returns
+						// nodes that are no longer in the document #6963
+						return m && m.parentNode ? [m] : [];
+					}
+				};
+				Expr.filter["ID"] = function (id) {
+					var attrId = id.replace(runescape, funescape);
+					return function (elem) {
+						return elem.getAttribute("id") === attrId;
+					};
+				};
+			} else {
+				// Support: IE6/7
+				// getElementById is not reliable as a find shortcut
+				delete Expr.find["ID"];
+
+				Expr.filter["ID"] = function (id) {
+					var attrId = id.replace(runescape, funescape);
+					return function (elem) {
+						var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
+						return node && node.value === attrId;
+					};
+				};
 			}
-		} :
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-				results = context.getElementsByTagName( tag );
 
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
+			// Tag
+			Expr.find["TAG"] = support.getElementsByTagName ?
+				function (tag, context) {
+					if (typeof context.getElementsByTagName !== strundefined) {
+						return context.getElementsByTagName(tag);
 					}
-				}
+				} :
+				function (tag, context) {
+					var elem,
+						tmp = [],
+						i = 0,
+						results = context.getElementsByTagName(tag);
+
+					// Filter out possible comments
+					if (tag === "*") {
+						while ((elem = results[i++])) {
+							if (elem.nodeType === 1) {
+								tmp.push(elem);
+							}
+						}
 
-				return tmp;
-			}
-			return results;
-		};
+						return tmp;
+					}
+					return results;
+				};
 
-	// Class
-	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== strundefined && documentIsHTML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
+			// Class
+			Expr.find["CLASS"] = support.getElementsByClassName && function (className, context) {
+				if (typeof context.getElementsByClassName !== strundefined && documentIsHTML) {
+					return context.getElementsByClassName(className);
+				}
+			};
 
-	/* QSA/matchesSelector
+			/* QSA/matchesSelector
 	---------------------------------------------------------------------- */
 
-	// QSA and matchesSelector support
-
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21)
-	// We allow this because of a bug in IE8/9 that throws an error
-	// whenever `document.activeElement` is accessed on an iframe
-	// So, we allow :focus to pass through QSA all the time to avoid the IE error
-	// See http://bugs.jquery.com/ticket/13378
-	rbuggyQSA = [];
-
-	if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explicitly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			div.innerHTML = "<select><option selected=''></option></select>";
+			// QSA and matchesSelector support
+
+			// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
+			rbuggyMatches = [];
+
+			// qSa(:focus) reports false when true (Chrome 21)
+			// We allow this because of a bug in IE8/9 that throws an error
+			// whenever `document.activeElement` is accessed on an iframe
+			// So, we allow :focus to pass through QSA all the time to avoid the IE error
+			// See http://bugs.jquery.com/ticket/13378
+			rbuggyQSA = [];
+
+			if ((support.qsa = rnative.test(doc.querySelectorAll))) {
+				// Build QSA regex
+				// Regex strategy adopted from Diego Perini
+				assert(function (div) {
+					// Select is set to empty string on purpose
+					// This is to test IE's treatment of not explicitly
+					// setting a boolean content attribute,
+					// since its presence should be enough
+					// http://bugs.jquery.com/ticket/12359
+					div.innerHTML = "<select><option selected=''></option></select>";
+
+					// Support: IE8
+					// Boolean attributes and "value" are not treated correctly
+					if (!div.querySelectorAll("[selected]").length) {
+						rbuggyQSA.push("\\[" + whitespace + "*(?:value|" + booleans + ")");
+					}
 
-			// Support: IE8
-			// Boolean attributes and "value" are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
-			}
+					// Webkit/Opera - :checked should return selected option elements
+					// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+					// IE8 throws error here and will not see later tests
+					if (!div.querySelectorAll(":checked").length) {
+						rbuggyQSA.push(":checked");
+					}
+				});
 
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-		});
+				assert(function (div) {
 
-		assert(function( div ) {
+					// Support: Opera 10-12/IE8
+					// ^= $= *= and empty values
+					// Should not select anything
+					// Support: Windows 8 Native Apps
+					// The type attribute is restricted during .innerHTML assignment
+					var input = doc.createElement("input");
+					input.setAttribute("type", "hidden");
+					div.appendChild(input).setAttribute("t", "");
 
-			// Support: Opera 10-12/IE8
-			// ^= $= *= and empty values
-			// Should not select anything
-			// Support: Windows 8 Native Apps
-			// The type attribute is restricted during .innerHTML assignment
-			var input = doc.createElement("input");
-			input.setAttribute( "type", "hidden" );
-			div.appendChild( input ).setAttribute( "t", "" );
+					if (div.querySelectorAll("[t^='']").length) {
+						rbuggyQSA.push("[*^$]=" + whitespace + "*(?:''|\"\")");
+					}
 
-			if ( div.querySelectorAll("[t^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
-			}
+					// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
+					// IE8 throws error here and will not see later tests
+					if (!div.querySelectorAll(":enabled").length) {
+						rbuggyQSA.push(":enabled", ":disabled");
+					}
 
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
+					// Opera 10-11 does not throw on post-comma invalid pseudos
+					div.querySelectorAll("*,:x");
+					rbuggyQSA.push(",.*:");
+				});
 			}
 
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			div.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
-	}
+			if ((support.matchesSelector = rnative.test((matches = docElem.webkitMatchesSelector ||
+				docElem.mozMatchesSelector ||
+				docElem.oMatchesSelector ||
+				docElem.msMatchesSelector)))) {
 
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.webkitMatchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
+				assert(function (div) {
+					// Check to see if it's possible to do matchesSelector
+					// on a disconnected node (IE 9)
+					support.disconnectedMatch = matches.call(div, "div");
 
-		assert(function( div ) {
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( div, "div" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( div, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		});
-	}
+					// This should fail with an exception
+					// Gecko does not error, returns false instead
+					matches.call(div, "[s!='']:x");
+					rbuggyMatches.push("!=", pseudos);
+				});
+			}
 
-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
+			rbuggyQSA = rbuggyQSA.length && new RegExp(rbuggyQSA.join("|"));
+			rbuggyMatches = rbuggyMatches.length && new RegExp(rbuggyMatches.join("|"));
 
-	/* Contains
+			/* Contains
 	---------------------------------------------------------------------- */
 
-	// Element contains another
-	// Purposefully does not implement inclusive descendent
-	// As in, an element does not contain itself
-	contains = rnative.test( docElem.contains ) || docElem.compareDocumentPosition ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( (b = b.parentNode) ) {
-					if ( b === a ) {
-						return true;
+			// Element contains another
+			// Purposefully does not implement inclusive descendent
+			// As in, an element does not contain itself
+			contains = rnative.test(docElem.contains) || docElem.compareDocumentPosition ?
+				function (a, b) {
+					var adown = a.nodeType === 9 ? a.documentElement : a,
+						bup = b && b.parentNode;
+					return a === bup || !!(bup && bup.nodeType === 1 && (
+						adown.contains ?
+							adown.contains(bup) :
+							a.compareDocumentPosition && a.compareDocumentPosition(bup) & 16
+					));
+				} :
+				function (a, b) {
+					if (b) {
+						while ((b = b.parentNode)) {
+							if (b === a) {
+								return true;
+							}
+						}
 					}
-				}
-			}
-			return false;
-		};
+					return false;
+				};
 
-	/* Sorting
+			/* Sorting
 	---------------------------------------------------------------------- */
 
-	// Document order sorting
-	sortOrder = docElem.compareDocumentPosition ?
-	function( a, b ) {
+			// Document order sorting
+			sortOrder = docElem.compareDocumentPosition ?
+				function (a, b) {
 
-		// Flag for duplicate removal
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
+					// Flag for duplicate removal
+					if (a === b) {
+						hasDuplicate = true;
+						return 0;
+					}
 
-		var compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition( b );
+					var compare = b.compareDocumentPosition && a.compareDocumentPosition && a.compareDocumentPosition(b);
 
-		if ( compare ) {
-			// Disconnected nodes
-			if ( compare & 1 ||
-				(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
+					if (compare) {
+						// Disconnected nodes
+						if (compare & 1 ||
+							(!support.sortDetached && b.compareDocumentPosition(a) === compare)) {
 
-				// Choose the first element that is related to our preferred document
-				if ( a === doc || contains(preferredDoc, a) ) {
-					return -1;
-				}
-				if ( b === doc || contains(preferredDoc, b) ) {
-					return 1;
-				}
+							// Choose the first element that is related to our preferred document
+							if (a === doc || contains(preferredDoc, a)) {
+								return -1;
+							}
+							if (b === doc || contains(preferredDoc, b)) {
+								return 1;
+							}
 
-				// Maintain original order
-				return sortInput ?
-					( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
-					0;
-			}
+							// Maintain original order
+							return sortInput ?
+								(indexOf.call(sortInput, a) - indexOf.call(sortInput, b)) :
+								0;
+						}
 
-			return compare & 4 ? -1 : 1;
-		}
+						return compare & 4 ? -1 : 1;
+					}
 
-		// Not directly comparable, sort on existence of method
-		return a.compareDocumentPosition ? -1 : 1;
-	} :
-	function( a, b ) {
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-
-		// Parentless nodes are either documents or disconnected
-		} else if ( !aup || !bup ) {
-			return a === doc ? -1 :
-				b === doc ? 1 :
-				aup ? -1 :
-				bup ? 1 :
-				sortInput ?
-				( indexOf.call( sortInput, a ) - indexOf.call( sortInput, b ) ) :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( (cur = cur.parentNode) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( (cur = cur.parentNode) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
-			i++;
-		}
-
-		return i ?
-			// Do a sibling check if the nodes have a util ancestor
-			siblingCheck( ap[i], bp[i] ) :
-
-			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
-			0;
-	};
+					// Not directly comparable, sort on existence of method
+					return a.compareDocumentPosition ? -1 : 1;
+				} :
+				function (a, b) {
+					var cur,
+						i = 0,
+						aup = a.parentNode,
+						bup = b.parentNode,
+						ap = [a],
+						bp = [b];
+
+					// Exit early if the nodes are identical
+					if (a === b) {
+						hasDuplicate = true;
+						return 0;
+
+						// Parentless nodes are either documents or disconnected
+					} else if (!aup || !bup) {
+						return a === doc ? -1 :
+							b === doc ? 1 :
+								aup ? -1 :
+									bup ? 1 :
+										sortInput ?
+											(indexOf.call(sortInput, a) - indexOf.call(sortInput, b)) :
+											0;
+
+						// If the nodes are siblings, we can do a quick check
+					} else if (aup === bup) {
+						return siblingCheck(a, b);
+					}
 
-	return doc;
-};
+					// Otherwise we need full lists of their ancestors for comparison
+					cur = a;
+					while ((cur = cur.parentNode)) {
+						ap.unshift(cur);
+					}
+					cur = b;
+					while ((cur = cur.parentNode)) {
+						bp.unshift(cur);
+					}
 
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
+					// Walk down the tree looking for a discrepancy
+					while (ap[i] === bp[i]) {
+						i++;
+					}
 
-Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
+					return i ?
+						// Do a sibling check if the nodes have a util ancestor
+						siblingCheck(ap[i], bp[i]) :
 
-	// Make sure that attribute selectors are quoted
-	expr = expr.replace( rattributeQuotes, "='$1']" );
+						// Otherwise nodes in our document sort first
+						ap[i] === preferredDoc ? -1 :
+							bp[i] === preferredDoc ? 1 :
+								0;
+				};
 
-	if ( support.matchesSelector && documentIsHTML &&
-		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
-		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
+			return doc;
+		};
 
-		try {
-			var ret = matches.call( elem, expr );
+		Sizzle.matches = function (expr, elements) {
+			return Sizzle(expr, null, null, elements);
+		};
 
-			// IE 9's matchesSelector returns false on disconnected nodes
-			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
+		Sizzle.matchesSelector = function (elem, expr) {
+			// Set document vars if needed
+			if ((elem.ownerDocument || elem) !== document) {
+				setDocument(elem);
 			}
-		} catch(e) {}
-	}
 
-	return Sizzle( expr, document, null, [elem] ).length > 0;
-};
+			// Make sure that attribute selectors are quoted
+			expr = expr.replace(rattributeQuotes, "='$1']");
 
-Sizzle.contains = function( context, elem ) {
-	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
+			if (support.matchesSelector && documentIsHTML &&
+				(!rbuggyMatches || !rbuggyMatches.test(expr)) &&
+				(!rbuggyQSA || !rbuggyQSA.test(expr))) {
 
-Sizzle.attr = function( elem, name ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
+				try {
+					var ret = matches.call(elem, expr);
+
+					// IE 9's matchesSelector returns false on disconnected nodes
+					if (ret || support.disconnectedMatch ||
+						// As well, disconnected nodes are said to be in a document
+						// fragment in IE 9
+						elem.document && elem.document.nodeType !== 11) {
+						return ret;
+					}
+				} catch (e) {
+				}
+			}
 
-	var fn = Expr.attrHandle[ name.toLowerCase() ],
-		// Don't get fooled by Object.prototype properties (jQuery #13807)
-		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
-			fn( elem, name, !documentIsHTML ) :
-			undefined;
-
-	return val === undefined ?
-		support.attributes || !documentIsHTML ?
-			elem.getAttribute( name ) :
-			(val = elem.getAttributeNode(name)) && val.specified ?
-				val.value :
-				null :
-		val;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Document sorting and removing duplicates
- * @param {ArrayLike} results
- */
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		j = 0,
-		i = 0;
+			return Sizzle(expr, document, null, [elem]).length > 0;
+		};
 
-	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	sortInput = !support.sortStable && results.slice( 0 );
-	results.sort( sortOrder );
+		Sizzle.contains = function (context, elem) {
+			// Set document vars if needed
+			if ((context.ownerDocument || context) !== document) {
+				setDocument(context);
+			}
+			return contains(context, elem);
+		};
 
-	if ( hasDuplicate ) {
-		while ( (elem = results[i++]) ) {
-			if ( elem === results[ i ] ) {
-				j = duplicates.push( i );
+		Sizzle.attr = function (elem, name) {
+			// Set document vars if needed
+			if ((elem.ownerDocument || elem) !== document) {
+				setDocument(elem);
 			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
 
-	return results;
-};
+			var fn = Expr.attrHandle[name.toLowerCase()],
+				// Don't get fooled by Object.prototype properties (jQuery #13807)
+				val = fn && hasOwn.call(Expr.attrHandle, name.toLowerCase()) ?
+					fn(elem, name, !documentIsHTML) :
+					undefined;
 
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-		// If no nodeType, this is expected to be an array
-		for ( ; (node = elem[i]); i++ ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (see #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
+			return val === undefined ?
+				support.attributes || !documentIsHTML ?
+					elem.getAttribute(name) :
+					(val = elem.getAttributeNode(name)) && val.specified ?
+						val.value :
+						null :
+				val;
+		};
+
+		Sizzle.error = function (msg) {
+			throw new Error("Syntax error, unrecognized expression: " + msg);
+		};
+
+		/**
+		 * Document sorting and removing duplicates
+		 * @param {ArrayLike} results
+		 */
+		Sizzle.uniqueSort = function (results) {
+			var elem,
+				duplicates = [],
+				j = 0,
+				i = 0;
+
+			// Unless we *know* we can detect duplicates, assume their presence
+			hasDuplicate = !support.detectDuplicates;
+			sortInput = !support.sortStable && results.slice(0);
+			results.sort(sortOrder);
+
+			if (hasDuplicate) {
+				while ((elem = results[i++])) {
+					if (elem === results[i]) {
+						j = duplicates.push(i);
+					}
+				}
+				while (j--) {
+					results.splice(duplicates[j], 1);
+				}
 			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-	// Do not include comment or processing instruction nodes
 
-	return ret;
-};
+			return results;
+		};
 
-Expr = Sizzle.selectors = {
+		/**
+		 * Utility function for retrieving the text value of an array of DOM nodes
+		 * @param {Array|Element} elem
+		 */
+		getText = Sizzle.getText = function (elem) {
+			var node,
+				ret = "",
+				i = 0,
+				nodeType = elem.nodeType;
+
+			if (!nodeType) {
+				// If no nodeType, this is expected to be an array
+				for (; (node = elem[i]); i++) {
+					// Do not traverse comment nodes
+					ret += getText(node);
+				}
+			} else if (nodeType === 1 || nodeType === 9 || nodeType === 11) {
+				// Use textContent for elements
+				// innerText usage removed for consistency of new lines (see #11153)
+				if (typeof elem.textContent === "string") {
+					return elem.textContent;
+				} else {
+					// Traverse its children
+					for (elem = elem.firstChild; elem; elem = elem.nextSibling) {
+						ret += getText(elem);
+					}
+				}
+			} else if (nodeType === 3 || nodeType === 4) {
+				return elem.nodeValue;
+			}
+			// Do not include comment or processing instruction nodes
 
-	// Can be adjusted by the user
-	cacheLength: 50,
+			return ret;
+		};
 
-	createPseudo: markFunction,
+		Expr = Sizzle.selectors = {
 
-	match: matchExpr,
+			// Can be adjusted by the user
+			cacheLength: 50,
 
-	attrHandle: {},
+			createPseudo: markFunction,
 
-	find: {},
+			match: matchExpr,
 
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
+			attrHandle: {},
 
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
+			find: {},
 
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[4] || match[5] || "" ).replace( runescape, funescape );
+			relative: {
+				">": {dir: "parentNode", first: true},
+				" ": {dir: "parentNode"},
+				"+": {dir: "previousSibling", first: true},
+				"~": {dir: "previousSibling"}
+			},
 
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
+			preFilter: {
+				"ATTR": function (match) {
+					match[1] = match[1].replace(runescape, funescape);
 
-			return match.slice( 0, 4 );
-		},
+					// Move the given value to match[3] whether quoted or unquoted
+					match[3] = (match[4] || match[5] || "").replace(runescape, funescape);
 
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
+					if (match[2] === "~=") {
+						match[3] = " " + match[3] + " ";
+					}
+
+					return match.slice(0, 4);
+				},
+
+				"CHILD": function (match) {
+					/* matches from matchExpr["CHILD"]
 				1 type (only|nth|...)
 				2 what (child|of-type)
 				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
@@ -1959,1038 +1966,1042 @@ Expr = Sizzle.selectors = {
 				7 sign of y-component
 				8 y of y-component
 			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
-				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
+					match[1] = match[1].toLowerCase();
 
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[5] && match[2];
-
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			// Accept quoted arguments as-is
-			if ( match[3] && match[4] !== undefined ) {
-				match[2] = match[4];
+					if (match[1].slice(0, 3) === "nth") {
+						// nth-* requires argument
+						if (!match[3]) {
+							Sizzle.error(match[0]);
+						}
 
-			// Strip excess characters from unquoted arguments
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
-				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
+						// numeric x and y parameters for Expr.filter.CHILD
+						// remember that false/true cast respectively to 0/1
+						match[4] = +(match[4] ? match[5] + (match[6] || 1) : 2 * (match[3] === "even" || match[3] === "odd"));
+						match[5] = +((match[7] + match[8]) || match[3] === "odd");
 
-				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
-			}
+						// other types prohibit arguments
+					} else if (match[3]) {
+						Sizzle.error(match[0]);
+					}
 
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
+					return match;
+				},
 
-	filter: {
+				"PSEUDO": function (match) {
+					var excess,
+						unquoted = !match[5] && match[2];
 
-		"TAG": function( nodeNameSelector ) {
-			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
-			return nodeNameSelector === "*" ?
-				function() { return true; } :
-				function( elem ) {
-					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-				};
-		},
+					if (matchExpr["CHILD"].test(match[0])) {
+						return null;
+					}
 
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
+					// Accept quoted arguments as-is
+					if (match[3] && match[4] !== undefined) {
+						match[2] = match[4];
 
-			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "" );
-				});
-		},
+						// Strip excess characters from unquoted arguments
+					} else if (unquoted && rpseudo.test(unquoted) &&
+						// Get excess from tokenize (recursively)
+						(excess = tokenize(unquoted, true)) &&
+						// advance to the next closing parenthesis
+						(excess = unquoted.indexOf(")", unquoted.length - excess) - unquoted.length)) {
 
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
+						// excess is a negative index
+						match[0] = match[0].slice(0, excess);
+						match[2] = unquoted.slice(0, excess);
+					}
 
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
+					// Return only captures needed by the pseudo filter method (type and argument)
+					return match.slice(0, 3);
 				}
+			},
 
-				result += "";
+			filter: {
 
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
+				"TAG": function (nodeNameSelector) {
+					var nodeName = nodeNameSelector.replace(runescape, funescape).toLowerCase();
+					return nodeNameSelector === "*" ?
+						function () {
+							return true;
+						} :
+						function (elem) {
+							return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
+						};
+				},
 
-		"CHILD": function( type, what, argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
+				"CLASS": function (className) {
+					var pattern = classCache[className + " "];
 
-			return first === 1 && last === 0 ?
+					return pattern ||
+						(pattern = new RegExp("(^|" + whitespace + ")" + className + "(" + whitespace + "|$)")) &&
+						classCache(className, function (elem) {
+							return pattern.test(typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== strundefined && elem.getAttribute("class") || "");
+						});
+				},
 
-				// Shortcut for :nth-*(n)
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
+				"ATTR": function (name, operator, check) {
+					return function (elem) {
+						var result = Sizzle.attr(elem, name);
 
-				function( elem, context, xml ) {
-					var cache, outerCache, node, diff, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType;
-
-					if ( parent ) {
-
-						// :(first|last|only)-(child|of-type)
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( (node = node[ dir ]) ) {
-									if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) {
-										return false;
-									}
-								}
-								// Reverse direction for :only-* (if we haven't yet done so)
-								start = dir = type === "only" && !start && "nextSibling";
-							}
+						if (result == null) {
+							return operator === "!=";
+						}
+						if (!operator) {
 							return true;
 						}
 
-						start = [ forward ? parent.firstChild : parent.lastChild ];
+						result += "";
+
+						return operator === "=" ? result === check :
+							operator === "!=" ? result !== check :
+								operator === "^=" ? check && result.indexOf(check) === 0 :
+									operator === "*=" ? check && result.indexOf(check) > -1 :
+										operator === "$=" ? check && result.slice(-check.length) === check :
+											operator === "~=" ? (" " + result + " ").indexOf(check) > -1 :
+												operator === "|=" ? result === check || result.slice(0, check.length + 1) === check + "-" :
+													false;
+					};
+				},
 
-						// non-xml :nth-child(...) stores cache data on `parent`
-						if ( forward && useCache ) {
-							// Seek `elem` from a previously-cached index
-							outerCache = parent[ expando ] || (parent[ expando ] = {});
-							cache = outerCache[ type ] || [];
-							nodeIndex = cache[0] === dirruns && cache[1];
-							diff = cache[0] === dirruns && cache[2];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
+				"CHILD": function (type, what, argument, first, last) {
+					var simple = type.slice(0, 3) !== "nth",
+						forward = type.slice(-4) !== "last",
+						ofType = what === "of-type";
+
+					return first === 1 && last === 0 ?
+
+						// Shortcut for :nth-*(n)
+						function (elem) {
+							return !!elem.parentNode;
+						} :
+
+						function (elem, context, xml) {
+							var cache, outerCache, node, diff, nodeIndex, start,
+								dir = simple !== forward ? "nextSibling" : "previousSibling",
+								parent = elem.parentNode,
+								name = ofType && elem.nodeName.toLowerCase(),
+								useCache = !xml && !ofType;
+
+							if (parent) {
+
+								// :(first|last|only)-(child|of-type)
+								if (simple) {
+									while (dir) {
+										node = elem;
+										while ((node = node[dir])) {
+											if (ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1) {
+												return false;
+											}
+										}
+										// Reverse direction for :only-* (if we haven't yet done so)
+										start = dir = type === "only" && !start && "nextSibling";
+									}
+									return true;
+								}
 
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
+								start = [forward ? parent.firstChild : parent.lastChild];
 
-								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
+								// non-xml :nth-child(...) stores cache data on `parent`
+								if (forward && useCache) {
+									// Seek `elem` from a previously-cached index
+									outerCache = parent[expando] || (parent[expando] = {});
+									cache = outerCache[type] || [];
+									nodeIndex = cache[0] === dirruns && cache[1];
+									diff = cache[0] === dirruns && cache[2];
+									node = nodeIndex && parent.childNodes[nodeIndex];
 
-								// When found, cache indexes on `parent` and break
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									outerCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
+									while ((node = ++nodeIndex && node && node[dir] ||
 
-						// Use previously-cached element index if available
-						} else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) {
-							diff = cache[1];
+										// Fallback to seeking `elem` from the start
+										(diff = nodeIndex = 0) || start.pop())) {
 
-						// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
-						} else {
-							// Use the same loop as above to seek `elem` from the start
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) {
-									// Cache the index of each encountered element
-									if ( useCache ) {
-										(node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ];
+										// When found, cache indexes on `parent` and break
+										if (node.nodeType === 1 && ++diff && node === elem) {
+											outerCache[type] = [dirruns, nodeIndex, diff];
+											break;
+										}
 									}
 
-									if ( node === elem ) {
-										break;
+									// Use previously-cached element index if available
+								} else if (useCache && (cache = (elem[expando] || (elem[expando] = {}))[type]) && cache[0] === dirruns) {
+									diff = cache[1];
+
+									// xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...)
+								} else {
+									// Use the same loop as above to seek `elem` from the start
+									while ((node = ++nodeIndex && node && node[dir] ||
+										(diff = nodeIndex = 0) || start.pop())) {
+
+										if ((ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1) && ++diff) {
+											// Cache the index of each encountered element
+											if (useCache) {
+												(node[expando] || (node[expando] = {}))[type] = [dirruns, diff];
+											}
+
+											if (node === elem) {
+												break;
+											}
+										}
 									}
 								}
+
+								// Incorporate the offset, then check against cycle size
+								diff -= last;
+								return diff === first || (diff % first === 0 && diff / first >= 0);
 							}
-						}
+						};
+				},
 
-						// Incorporate the offset, then check against cycle size
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
+				"PSEUDO": function (pseudo, argument) {
+					// pseudo-class names are case-insensitive
+					// http://www.w3.org/TR/selectors/#pseudo-classes
+					// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
+					// Remember that setFilters inherits from pseudos
+					var args,
+						fn = Expr.pseudos[pseudo] || Expr.setFilters[pseudo.toLowerCase()] ||
+							Sizzle.error("unsupported pseudo: " + pseudo);
+
+					// The user may use createPseudo to indicate that
+					// arguments are needed to create the filter function
+					// just as Sizzle does
+					if (fn[expando]) {
+						return fn(argument);
 					}
-				};
-		},
 
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf.call( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
+					// But maintain support for old signatures
+					if (fn.length > 1) {
+						args = [pseudo, pseudo, "", argument];
+						return Expr.setFilters.hasOwnProperty(pseudo.toLowerCase()) ?
+							markFunction(function (seed, matches) {
+								var idx,
+									matched = fn(seed, argument),
+									i = matched.length;
+								while (i--) {
+									idx = indexOf.call(seed, matched[i]);
+									seed[idx] = !(matches[idx] = matched[i]);
+								}
+							}) :
+							function (elem) {
+								return fn(elem, 0, args);
+							};
+					}
 
-	pseudos: {
-		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
+					return fn;
+				}
+			},
 
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
+			pseudos: {
+				// Potentially complex pseudos
+				"not": markFunction(function (selector) {
+					// Trim the selector passed to compile
+					// to avoid treating leading and trailing
+					// spaces as combinators
+					var input = [],
+						results = [],
+						matcher = compile(selector.replace(rtrim, "$1"));
+
+					return matcher[expando] ?
+						markFunction(function (seed, matches, context, xml) {
+							var elem,
+								unmatched = matcher(seed, null, xml, []),
+								i = seed.length;
+
+							// Match elements unmatched by `matcher`
+							while (i--) {
+								if ((elem = unmatched[i])) {
+									seed[i] = !(matches[i] = elem);
+								}
+							}
+						}) :
+						function (elem, context, xml) {
+							input[0] = elem;
+							matcher(input, null, xml, results);
+							return !results.pop();
+						};
+				}),
+
+				"has": markFunction(function (selector) {
+					return function (elem) {
+						return Sizzle(selector, elem).length > 0;
+					};
+				}),
 
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
+				"contains": markFunction(function (text) {
+					return function (elem) {
+						return (elem.textContent || elem.innerText || getText(elem)).indexOf(text) > -1;
+					};
+				}),
+
+				// "Whether an element is represented by a :lang() selector
+				// is based solely on the element's language value
+				// being equal to the identifier C,
+				// or beginning with the identifier C immediately followed by "-".
+				// The matching of C against the element's language value is performed case-insensitively.
+				// The identifier C does not have to be a valid language name."
+				// http://www.w3.org/TR/selectors/#lang-pseudo
+				"lang": markFunction(function (lang) {
+					// lang value must be a valid identifier
+					if (!ridentifier.test(lang || "")) {
+						Sizzle.error("unsupported lang: " + lang);
 					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		// "Whether an element is represented by a :lang() selector
-		// is based solely on the element's language value
-		// being equal to the identifier C,
-		// or beginning with the identifier C immediately followed by "-".
-		// The matching of C against the element's language value is performed case-insensitively.
-		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
-			// lang value must be a valid identifier
-			if ( !ridentifier.test(lang || "") ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( (elemLang = documentIsHTML ?
-						elem.lang :
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-				return false;
-			};
-		}),
+					lang = lang.replace(runescape, funescape).toLowerCase();
+					return function (elem) {
+						var elemLang;
+						do {
+							if ((elemLang = documentIsHTML ?
+								elem.lang :
+								elem.getAttribute("xml:lang") || elem.getAttribute("lang"))) {
+
+								elemLang = elemLang.toLowerCase();
+								return elemLang === lang || elemLang.indexOf(lang + "-") === 0;
+							}
+						} while ((elem = elem.parentNode) && elem.nodeType === 1);
+						return false;
+					};
+				}),
 
-		// Miscellaneous
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
+				// Miscellaneous
+				"target": function (elem) {
+					var hash = window.location && window.location.hash;
+					return hash && hash.slice(1) === elem.id;
+				},
 
-		"root": function( elem ) {
-			return elem === docElem;
-		},
+				"root": function (elem) {
+					return elem === docElem;
+				},
 
-		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-		},
+				"focus": function (elem) {
+					return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
+				},
 
-		// Boolean properties
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
+				// Boolean properties
+				"enabled": function (elem) {
+					return elem.disabled === false;
+				},
 
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
+				"disabled": function (elem) {
+					return elem.disabled === true;
+				},
 
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
+				"checked": function (elem) {
+					// In CSS3, :checked should return both checked and selected elements
+					// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
+					var nodeName = elem.nodeName.toLowerCase();
+					return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
+				},
 
-		"selected": function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
+				"selected": function (elem) {
+					// Accessing this property makes selected-by-default
+					// options in Safari work properly
+					if (elem.parentNode) {
+						elem.parentNode.selectedIndex;
+					}
 
-			return elem.selected === true;
-		},
+					return elem.selected === true;
+				},
 
-		// Contents
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is only affected by element nodes and content nodes(including text(3), cdata(4)),
-			//   not comment, processing instructions, or others
-			// Thanks to Diego Perini for the nodeName shortcut
-			//   Greater than "@" means alpha characters (specifically not starting with "#" or "?")
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeName > "@" || elem.nodeType === 3 || elem.nodeType === 4 ) {
-					return false;
-				}
-			}
-			return true;
-		},
+				// Contents
+				"empty": function (elem) {
+					// http://www.w3.org/TR/selectors/#empty-pseudo
+					// :empty is only affected by element nodes and content nodes(including text(3), cdata(4)),
+					//   not comment, processing instructions, or others
+					// Thanks to Diego Perini for the nodeName shortcut
+					//   Greater than "@" means alpha characters (specifically not starting with "#" or "?")
+					for (elem = elem.firstChild; elem; elem = elem.nextSibling) {
+						if (elem.nodeName > "@" || elem.nodeType === 3 || elem.nodeType === 4) {
+							return false;
+						}
+					}
+					return true;
+				},
 
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
+				"parent": function (elem) {
+					return !Expr.pseudos["empty"](elem);
+				},
 
-		// Element/input types
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
+				// Element/input types
+				"header": function (elem) {
+					return rheader.test(elem.nodeName);
+				},
 
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
+				"input": function (elem) {
+					return rinputs.test(elem.nodeName);
+				},
 
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
+				"button": function (elem) {
+					var name = elem.nodeName.toLowerCase();
+					return name === "input" && elem.type === "button" || name === "button";
+				},
 
-		"text": function( elem ) {
-			var attr;
-			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
-			// use getAttribute instead to test this case
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === elem.type );
-		},
+				"text": function (elem) {
+					var attr;
+					// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
+					// use getAttribute instead to test this case
+					return elem.nodeName.toLowerCase() === "input" &&
+						elem.type === "text" &&
+						((attr = elem.getAttribute("type")) == null || attr.toLowerCase() === elem.type);
+				},
 
-		// Position-in-collection
-		"first": createPositionalPseudo(function() {
-			return [ 0 ];
-		}),
+				// Position-in-collection
+				"first": createPositionalPseudo(function () {
+					return [0];
+				}),
 
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
-			return [ length - 1 ];
-		}),
+				"last": createPositionalPseudo(function (matchIndexes, length) {
+					return [length - 1];
+				}),
 
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
+				"eq": createPositionalPseudo(function (matchIndexes, length, argument) {
+					return [argument < 0 ? argument + length : argument];
+				}),
 
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
+				"even": createPositionalPseudo(function (matchIndexes, length) {
+					var i = 0;
+					for (; i < length; i += 2) {
+						matchIndexes.push(i);
+					}
+					return matchIndexes;
+				}),
 
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
+				"odd": createPositionalPseudo(function (matchIndexes, length) {
+					var i = 1;
+					for (; i < length; i += 2) {
+						matchIndexes.push(i);
+					}
+					return matchIndexes;
+				}),
 
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
+				"lt": createPositionalPseudo(function (matchIndexes, length, argument) {
+					var i = argument < 0 ? argument + length : argument;
+					for (; --i >= 0;) {
+						matchIndexes.push(i);
+					}
+					return matchIndexes;
+				}),
 
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
+				"gt": createPositionalPseudo(function (matchIndexes, length, argument) {
+					var i = argument < 0 ? argument + length : argument;
+					for (; ++i < length;) {
+						matchIndexes.push(i);
+					}
+					return matchIndexes;
+				})
 			}
-			return matchIndexes;
-		})
-	}
-};
+		};
 
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
+		Expr.pseudos["nth"] = Expr.pseudos["eq"];
 
 // Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
+		for (i in {radio: true, checkbox: true, file: true, password: true, image: true}) {
+			Expr.pseudos[i] = createInputPseudo(i);
+		}
+		for (i in {submit: true, reset: true}) {
+			Expr.pseudos[i] = createButtonPseudo(i);
+		}
 
 // Easy API for creating new setFilters
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
+		function setFilters() {
+		}
 
-function tokenize( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
+		setFilters.prototype = Expr.filters = Expr.pseudos;
+		Expr.setFilters = new setFilters();
 
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
+		function tokenize(selector, parseOnly) {
+			var matched, match, tokens, type,
+				soFar, groups, preFilters,
+				cached = tokenCache[selector + " "];
 
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
+			if (cached) {
+				return parseOnly ? 0 : cached.slice(0);
+			}
 
-	while ( soFar ) {
+			soFar = selector;
+			groups = [];
+			preFilters = Expr.preFilter;
 
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
-			}
-			groups.push( tokens = [] );
-		}
+			while (soFar) {
 
-		matched = false;
+				// Comma and first run
+				if (!matched || (match = rcomma.exec(soFar))) {
+					if (match) {
+						// Don't consume trailing commas as valid
+						soFar = soFar.slice(match[0].length) || soFar;
+					}
+					groups.push(tokens = []);
+				}
 
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			matched = match.shift();
-			tokens.push({
-				value: matched,
-				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			});
-			soFar = soFar.slice( matched.length );
-		}
+				matched = false;
 
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
-				matched = match.shift();
-				tokens.push({
-					value: matched,
-					type: type,
-					matches: match
-				});
-				soFar = soFar.slice( matched.length );
+				// Combinators
+				if ((match = rcombinators.exec(soFar))) {
+					matched = match.shift();
+					tokens.push({
+						value: matched,
+						// Cast descendant combinators to space
+						type: match[0].replace(rtrim, " ")
+					});
+					soFar = soFar.slice(matched.length);
+				}
+
+				// Filters
+				for (type in Expr.filter) {
+					if ((match = matchExpr[type].exec(soFar)) && (!preFilters[type] ||
+						(match = preFilters[type](match)))) {
+						matched = match.shift();
+						tokens.push({
+							value: matched,
+							type: type,
+							matches: match
+						});
+						soFar = soFar.slice(matched.length);
+					}
+				}
+
+				if (!matched) {
+					break;
+				}
 			}
-		}
 
-		if ( !matched ) {
-			break;
+			// Return the length of the invalid excess
+			// if we're just parsing
+			// Otherwise, throw an error or return tokens
+			return parseOnly ?
+				soFar.length :
+				soFar ?
+					Sizzle.error(selector) :
+					// Cache the tokens
+					tokenCache(selector, groups).slice(0);
 		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-}
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && dir === "parentNode",
-		doneName = done++;
 
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
+		function toSelector(tokens) {
+			var i = 0,
+				len = tokens.length,
+				selector = "";
+			for (; i < len; i++) {
+				selector += tokens[i].value;
 			}
-		} :
+			return selector;
+		}
 
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			var data, cache, outerCache,
-				dirkey = dirruns + " " + doneName;
+		function addCombinator(matcher, combinator, base) {
+			var dir = combinator.dir,
+				checkNonElements = base && dir === "parentNode",
+				doneName = done++;
 
-			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
-			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
+			return combinator.first ?
+				// Check against closest ancestor/preceding element
+				function (elem, context, xml) {
+					while ((elem = elem[dir])) {
+						if (elem.nodeType === 1 || checkNonElements) {
+							return matcher(elem, context, xml);
 						}
 					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
-						if ( (cache = outerCache[ dir ]) && cache[0] === dirkey ) {
-							if ( (data = cache[1]) === true || data === cachedruns ) {
-								return data === true;
+				} :
+
+				// Check against all ancestor/preceding elements
+				function (elem, context, xml) {
+					var data, cache, outerCache,
+						dirkey = dirruns + " " + doneName;
+
+					// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
+					if (xml) {
+						while ((elem = elem[dir])) {
+							if (elem.nodeType === 1 || checkNonElements) {
+								if (matcher(elem, context, xml)) {
+									return true;
+								}
 							}
-						} else {
-							cache = outerCache[ dir ] = [ dirkey ];
-							cache[1] = matcher( elem, context, xml ) || cachedruns;
-							if ( cache[1] === true ) {
-								return true;
+						}
+					} else {
+						while ((elem = elem[dir])) {
+							if (elem.nodeType === 1 || checkNonElements) {
+								outerCache = elem[expando] || (elem[expando] = {});
+								if ((cache = outerCache[dir]) && cache[0] === dirkey) {
+									if ((data = cache[1]) === true || data === cachedruns) {
+										return data === true;
+									}
+								} else {
+									cache = outerCache[dir] = [dirkey];
+									cache[1] = matcher(elem, context, xml) || cachedruns;
+									if (cache[1] === true) {
+										return true;
+									}
+								}
 							}
 						}
 					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
+				};
+		}
 
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
+		function elementMatcher(matchers) {
+			return matchers.length > 1 ?
+				function (elem, context, xml) {
+					var i = matchers.length;
+					while (i--) {
+						if (!matchers[i](elem, context, xml)) {
+							return false;
+						}
+					}
+					return true;
+				} :
+				matchers[0];
+		}
 
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
+		function condense(unmatched, map, filter, context, xml) {
+			var elem,
+				newUnmatched = [],
+				i = 0,
+				len = unmatched.length,
+				mapped = map != null;
+
+			for (; i < len; i++) {
+				if ((elem = unmatched[i])) {
+					if (!filter || filter(elem, context, xml)) {
+						newUnmatched.push(elem);
+						if (mapped) {
+							map.push(i);
+						}
+					}
 				}
 			}
-		}
-	}
-
-	return newUnmatched;
-}
 
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
+			return newUnmatched;
+		}
 
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
+		function setMatcher(preFilter, selector, matcher, postFilter, postFinder, postSelector) {
+			if (postFilter && !postFilter[expando]) {
+				postFilter = setMatcher(postFilter);
+			}
+			if (postFinder && !postFinder[expando]) {
+				postFinder = setMatcher(postFinder, postSelector);
+			}
+			return markFunction(function (seed, results, context, xml) {
+				var temp, i, elem,
+					preMap = [],
+					postMap = [],
+					preexisting = results.length,
 
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
+					// Get initial elements from seed or context
+					elems = seed || multipleContexts(selector || "*", context.nodeType ? [context] : context, []),
 
-					// ...intermediate processing is necessary
-					[] :
+					// Prefilter to get matcher input, preserving a map for seed-results synchronization
+					matcherIn = preFilter && (seed || !selector) ?
+						condense(elems, preMap, preFilter, context, xml) :
+						elems,
 
-					// ...otherwise use results directly
-					results :
-				matcherIn;
+					matcherOut = matcher ?
+						// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
+						postFinder || (seed ? preFilter : preexisting || postFilter) ?
 
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
+							// ...intermediate processing is necessary
+							[] :
 
-		// Apply postFilter
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
+							// ...otherwise use results directly
+							results :
+						matcherIn;
 
-			// Un-match failing elements by moving them back to matcherIn
-			i = temp.length;
-			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
+				// Find primary matches
+				if (matcher) {
+					matcher(matcherIn, matcherOut, context, xml);
 				}
-			}
-		}
 
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
-							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
+				// Apply postFilter
+				if (postFilter) {
+					temp = condense(matcherOut, postMap);
+					postFilter(temp, [], context, xml);
+
+					// Un-match failing elements by moving them back to matcherIn
+					i = temp.length;
+					while (i--) {
+						if ((elem = temp[i])) {
+							matcherOut[postMap[i]] = !(matcherIn[postMap[i]] = elem);
 						}
 					}
-					postFinder( null, (matcherOut = []), temp, xml );
 				}
 
-				// Move matched elements from seed to results to keep them synchronized
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf.call( seed, elem ) : preMap[i]) > -1 ) {
+				if (seed) {
+					if (postFinder || preFilter) {
+						if (postFinder) {
+							// Get the final matcherOut by condensing this intermediate into postFinder contexts
+							temp = [];
+							i = matcherOut.length;
+							while (i--) {
+								if ((elem = matcherOut[i])) {
+									// Restore matcherIn since elem is not yet a final match
+									temp.push((matcherIn[i] = elem));
+								}
+							}
+							postFinder(null, (matcherOut = []), temp, xml);
+						}
+
+						// Move matched elements from seed to results to keep them synchronized
+						i = matcherOut.length;
+						while (i--) {
+							if ((elem = matcherOut[i]) &&
+								(temp = postFinder ? indexOf.call(seed, elem) : preMap[i]) > -1) {
 
-						seed[temp] = !(results[temp] = elem);
+								seed[temp] = !(results[temp] = elem);
+							}
+						}
 					}
-				}
-			}
 
-		// Add elements to results, through postFinder if defined
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf.call( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
+					// Add elements to results, through postFinder if defined
+				} else {
+					matcherOut = condense(
+						matcherOut === results ?
+							matcherOut.splice(preexisting, matcherOut.length) :
+							matcherOut
+					);
+					if (postFinder) {
+						postFinder(null, results, matcherOut, xml);
+					} else {
+						push.apply(results, matcherOut);
 					}
 				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector(
-						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
-						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
-					).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
+			});
 		}
-	}
 
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	// A counter to specify which element is currently being matched
-	var matcherCachedRuns = 0,
-		bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, expandContext ) {
-			var elem, j, matcher,
-				setMatched = [],
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				outermost = expandContext != null,
-				contextBackup = outermostContext,
-				// We must always have either seed elements or context
-				elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ),
-				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1);
-
-			if ( outermost ) {
-				outermostContext = context !== document && context;
-				cachedruns = matcherCachedRuns;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
-			for ( ; (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					j = 0;
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context, xml ) ) {
-							results.push( elem );
-							break;
+		function matcherFromTokens(tokens) {
+			var checkContext, matcher, j,
+				len = tokens.length,
+				leadingRelative = Expr.relative[tokens[0].type],
+				implicitRelative = leadingRelative || Expr.relative[" "],
+				i = leadingRelative ? 1 : 0,
+
+				// The foundational matcher ensures that elements are reachable from top-level context(s)
+				matchContext = addCombinator(function (elem) {
+					return elem === checkContext;
+				}, implicitRelative, true),
+				matchAnyContext = addCombinator(function (elem) {
+					return indexOf.call(checkContext, elem) > -1;
+				}, implicitRelative, true),
+				matchers = [function (elem, context, xml) {
+					return (!leadingRelative && (xml || context !== outermostContext)) || (
+						(checkContext = context).nodeType ?
+							matchContext(elem, context, xml) :
+							matchAnyContext(elem, context, xml));
+				}];
+
+			for (; i < len; i++) {
+				if ((matcher = Expr.relative[tokens[i].type])) {
+					matchers = [addCombinator(elementMatcher(matchers), matcher)];
+				} else {
+					matcher = Expr.filter[tokens[i].type].apply(null, tokens[i].matches);
+
+					// Return special upon seeing a positional matcher
+					if (matcher[expando]) {
+						// Find the next relative operator (if any) for proper handling
+						j = ++i;
+						for (; j < len; j++) {
+							if (Expr.relative[tokens[j].type]) {
+								break;
+							}
 						}
+						return setMatcher(
+							i > 1 && elementMatcher(matchers),
+							i > 1 && toSelector(
+								// If the preceding token was a descendant combinator, insert an implicit any-element `*`
+								tokens.slice(0, i - 1).concat({value: tokens[i - 2].type === " " ? "*" : ""})
+							).replace(rtrim, "$1"),
+							matcher,
+							i < j && matcherFromTokens(tokens.slice(i, j)),
+							j < len && matcherFromTokens((tokens = tokens.slice(j))),
+							j < len && toSelector(tokens)
+						);
 					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-						cachedruns = ++matcherCachedRuns;
+					matchers.push(matcher);
+				}
+			}
+
+			return elementMatcher(matchers);
+		}
+
+		function matcherFromGroupMatchers(elementMatchers, setMatchers) {
+			// A counter to specify which element is currently being matched
+			var matcherCachedRuns = 0,
+				bySet = setMatchers.length > 0,
+				byElement = elementMatchers.length > 0,
+				superMatcher = function (seed, context, xml, results, expandContext) {
+					var elem, j, matcher,
+						setMatched = [],
+						matchedCount = 0,
+						i = "0",
+						unmatched = seed && [],
+						outermost = expandContext != null,
+						contextBackup = outermostContext,
+						// We must always have either seed elements or context
+						elems = seed || byElement && Expr.find["TAG"]("*", expandContext && context.parentNode || context),
+						// Use integer dirruns iff this is the outermost matcher
+						dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1);
+
+					if (outermost) {
+						outermostContext = context !== document && context;
+						cachedruns = matcherCachedRuns;
 					}
-				}
 
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
+					// Add elements passing elementMatchers directly to results
+					// Keep `i` a string if there are no elements so `matchedCount` will be "00" below
+					for (; (elem = elems[i]) != null; i++) {
+						if (byElement && elem) {
+							j = 0;
+							while ((matcher = elementMatchers[j++])) {
+								if (matcher(elem, context, xml)) {
+									results.push(elem);
+									break;
+								}
+							}
+							if (outermost) {
+								dirruns = dirrunsUnique;
+								cachedruns = ++matcherCachedRuns;
+							}
+						}
+
+						// Track unmatched elements for set filters
+						if (bySet) {
+							// They will have gone through all possible matchers
+							if ((elem = !matcher && elem)) {
+								matchedCount--;
+							}
 
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
+							// Lengthen the array for every element, matched or not
+							if (seed) {
+								unmatched.push(elem);
+							}
+						}
 					}
-				}
-			}
 
-			// Apply set filters to unmatched elements
-			matchedCount += i;
-			if ( bySet && i !== matchedCount ) {
-				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
+					// Apply set filters to unmatched elements
+					matchedCount += i;
+					if (bySet && i !== matchedCount) {
+						j = 0;
+						while ((matcher = setMatchers[j++])) {
+							matcher(unmatched, setMatched, context, xml);
+						}
 
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
+						if (seed) {
+							// Reintegrate element matches to eliminate the need for sorting
+							if (matchedCount > 0) {
+								while (i--) {
+									if (!(unmatched[i] || setMatched[i])) {
+										setMatched[i] = pop.call(results);
+									}
+								}
 							}
+
+							// Discard index placeholder values to get only actual matches
+							setMatched = condense(setMatched);
+						}
+
+						// Add matches to results
+						push.apply(results, setMatched);
+
+						// Seedless set matches succeeding multiple successful matchers stipulate sorting
+						if (outermost && !seed && setMatched.length > 0 &&
+							(matchedCount + setMatchers.length) > 1) {
+
+							Sizzle.uniqueSort(results);
 						}
 					}
 
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
+					// Override manipulation of globals by nested matchers
+					if (outermost) {
+						dirruns = dirrunsUnique;
+						outermostContext = contextBackup;
+					}
+
+					return unmatched;
+				};
 
-				// Add matches to results
-				push.apply( results, setMatched );
+			return bySet ?
+				markFunction(superMatcher) :
+				superMatcher;
+		}
 
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
+		compile = Sizzle.compile = function (selector, group /* Internal Use Only */) {
+			var i,
+				setMatchers = [],
+				elementMatchers = [],
+				cached = compilerCache[selector + " "];
 
-					Sizzle.uniqueSort( results );
+			if (!cached) {
+				// Generate a function of recursive functions that can be used to check each element
+				if (!group) {
+					group = tokenize(selector);
+				}
+				i = group.length;
+				while (i--) {
+					cached = matcherFromTokens(group[i]);
+					if (cached[expando]) {
+						setMatchers.push(cached);
+					} else {
+						elementMatchers.push(cached);
+					}
 				}
-			}
 
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
+				// Cache the compiled function
+				cached = compilerCache(selector, matcherFromGroupMatchers(elementMatchers, setMatchers));
 			}
-
-			return unmatched;
+			return cached;
 		};
 
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !group ) {
-			group = tokenize( selector );
-		}
-		i = group.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( group[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
+		function multipleContexts(selector, contexts, results) {
+			var i = 0,
+				len = contexts.length;
+			for (; i < len; i++) {
+				Sizzle(selector, contexts[i], results);
 			}
+			return results;
 		}
 
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-	}
-	return cached;
-};
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
+		function select(selector, context, results, seed) {
+			var i, tokens, token, type, find,
+				match = tokenize(selector);
 
-function select( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		match = tokenize( selector );
+			if (!seed) {
+				// Try to minimize operations if there is only one group
+				if (match.length === 1) {
 
-	if ( !seed ) {
-		// Try to minimize operations if there is only one group
-		if ( match.length === 1 ) {
+					// Take a shortcut and set the context if the root selector is an ID
+					tokens = match[0] = match[0].slice(0);
+					if (tokens.length > 2 && (token = tokens[0]).type === "ID" &&
+						support.getById && context.nodeType === 9 && documentIsHTML &&
+						Expr.relative[tokens[1].type]) {
 
-			// Take a shortcut and set the context if the root selector is an ID
-			tokens = match[0] = match[0].slice( 0 );
-			if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-					support.getById && context.nodeType === 9 && documentIsHTML &&
-					Expr.relative[ tokens[1].type ] ) {
-
-				context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
-				if ( !context ) {
-					return results;
-				}
-				selector = selector.slice( tokens.shift().value.length );
-			}
+						context = (Expr.find["ID"](token.matches[0].replace(runescape, funescape), context) || [])[0];
+						if (!context) {
+							return results;
+						}
+						selector = selector.slice(tokens.shift().value.length);
+					}
 
-			// Fetch a seed set for right-to-left matching
-			i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-			while ( i-- ) {
-				token = tokens[i];
+					// Fetch a seed set for right-to-left matching
+					i = matchExpr["needsContext"].test(selector) ? 0 : tokens.length;
+					while (i--) {
+						token = tokens[i];
 
-				// Abort if we hit a combinator
-				if ( Expr.relative[ (type = token.type) ] ) {
-					break;
-				}
-				if ( (find = Expr.find[ type ]) ) {
-					// Search, expanding context for leading sibling combinators
-					if ( (seed = find(
-						token.matches[0].replace( runescape, funescape ),
-						rsibling.test( tokens[0].type ) && context.parentNode || context
-					)) ) {
-
-						// If seed is empty or no tokens remain, we can return early
-						tokens.splice( i, 1 );
-						selector = seed.length && toSelector( tokens );
-						if ( !selector ) {
-							push.apply( results, seed );
-							return results;
+						// Abort if we hit a combinator
+						if (Expr.relative[(type = token.type)]) {
+							break;
 						}
+						if ((find = Expr.find[type])) {
+							// Search, expanding context for leading sibling combinators
+							if ((seed = find(
+								token.matches[0].replace(runescape, funescape),
+								rsibling.test(tokens[0].type) && context.parentNode || context
+							))) {
+
+								// If seed is empty or no tokens remain, we can return early
+								tokens.splice(i, 1);
+								selector = seed.length && toSelector(tokens);
+								if (!selector) {
+									push.apply(results, seed);
+									return results;
+								}
 
-						break;
+								break;
+							}
+						}
 					}
 				}
 			}
-		}
-	}
 
-	// Compile and execute a filtering function
-	// Provide `match` to avoid retokenization if we modified the selector above
-	compile( selector, match )(
-		seed,
-		context,
-		!documentIsHTML,
-		results,
-		rsibling.test( selector )
-	);
-	return results;
-}
+			// Compile and execute a filtering function
+			// Provide `match` to avoid retokenization if we modified the selector above
+			compile(selector, match)(
+				seed,
+				context,
+				!documentIsHTML,
+				results,
+				rsibling.test(selector)
+			);
+			return results;
+		}
 
 // One-time assignments
 
 // Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
+		support.sortStable = expando.split("").sort(sortOrder).join("") === expando;
 
 // Support: Chrome<14
 // Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = hasDuplicate;
+		support.detectDuplicates = hasDuplicate;
 
 // Initialize against the default document
-setDocument();
+		setDocument();
 
 // Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
 // Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( div1 ) {
-	// Should return 1, but returns 4 (following)
-	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
-});
+		support.sortDetached = assert(function (div1) {
+			// Should return 1, but returns 4 (following)
+			return div1.compareDocumentPosition(document.createElement("div")) & 1;
+		});
 
 // Support: IE<8
 // Prevent attribute/property "interpolation"
 // http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( div ) {
-	div.innerHTML = "<a href='#'></a>";
-	return div.firstChild.getAttribute("href") === "#" ;
-}) ) {
-	addHandle( "type|href|height|width", function( elem, name, isXML ) {
-		if ( !isXML ) {
-			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
+		if (!assert(function (div) {
+			div.innerHTML = "<a href='#'></a>";
+			return div.firstChild.getAttribute("href") === "#";
+		})) {
+			addHandle("type|href|height|width", function (elem, name, isXML) {
+				if (!isXML) {
+					return elem.getAttribute(name, name.toLowerCase() === "type" ? 1 : 2);
+				}
+			});
 		}
-	});
-}
 
 // Support: IE<9
 // Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( div ) {
-	div.innerHTML = "<input/>";
-	div.firstChild.setAttribute( "value", "" );
-	return div.firstChild.getAttribute( "value" ) === "";
-}) ) {
-	addHandle( "value", function( elem, name, isXML ) {
-		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
-			return elem.defaultValue;
+		if (!support.attributes || !assert(function (div) {
+			div.innerHTML = "<input/>";
+			div.firstChild.setAttribute("value", "");
+			return div.firstChild.getAttribute("value") === "";
+		})) {
+			addHandle("value", function (elem, name, isXML) {
+				if (!isXML && elem.nodeName.toLowerCase() === "input") {
+					return elem.defaultValue;
+				}
+			});
 		}
-	});
-}
 
 // Support: IE<9
 // Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( div ) {
-	return div.getAttribute("disabled") == null;
-}) ) {
-	addHandle( booleans, function( elem, name, isXML ) {
-		var val;
-		if ( !isXML ) {
-			return (val = elem.getAttributeNode( name )) && val.specified ?
-				val.value :
-				elem[ name ] === true ? name.toLowerCase() : null;
+		if (!assert(function (div) {
+			return div.getAttribute("disabled") == null;
+		})) {
+			addHandle(booleans, function (elem, name, isXML) {
+				var val;
+				if (!isXML) {
+					return (val = elem.getAttributeNode(name)) && val.specified ?
+						val.value :
+						elem[name] === true ? name.toLowerCase() : null;
+				}
+			});
 		}
-	});
-}
 
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
+		jQuery.find = Sizzle;
+		jQuery.expr = Sizzle.selectors;
+		jQuery.expr[":"] = jQuery.expr.pseudos;
+		jQuery.unique = Sizzle.uniqueSort;
+		jQuery.text = Sizzle.getText;
+		jQuery.isXMLDoc = Sizzle.isXML;
+		jQuery.contains = Sizzle.contains;
 
 
-})( window );
+	})(window);
 // String to Object options format cache
-var optionsCache = {};
+	var optionsCache = {};
 
 // Convert String-formatted options into Object-formatted ones and store in cache
-function createOptions( options ) {
-	var object = optionsCache[ options ] = {};
-	jQuery.each( options.match( core_rnotwhite ) || [], function( _, flag ) {
-		object[ flag ] = true;
-	});
-	return object;
-}
+	function createOptions(options) {
+		var object = optionsCache[options] = {};
+		jQuery.each(options.match(core_rnotwhite) || [], function (_, flag) {
+			object[flag] = true;
+		});
+		return object;
+	}
 
-/*
+	/*
  * Create a callback list using the following parameters:
  *
  *	options: an optional list of space-separated options that will change how
@@ -3012,4597 +3023,4606 @@ function createOptions( options ) {
  *	stopOnFalse:	interrupt callings when a callback returns false
  *
  */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		( optionsCache[ options ] || createOptions( options ) ) :
-		jQuery.extend( {}, options );
-
-	var // Flag to know if list is currently firing
-		firing,
-		// Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list was already fired
-		fired,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = !options.once && [],
-		// Fire callbacks
-		fire = function( data ) {
-			memory = options.memory && data;
-			fired = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			firing = true;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-					memory = false; // To prevent further calls using add
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( stack ) {
-					if ( stack.length ) {
-						fire( stack.shift() );
-					}
-				} else if ( memory ) {
-					list = [];
-				} else {
-					self.disable();
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					// First, we save the current length
-					var start = list.length;
-					(function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							var type = jQuery.type( arg );
-							if ( type === "function" ) {
-								if ( !options.unique || !self.has( arg ) ) {
-									list.push( arg );
-								}
-							} else if ( arg && arg.length && type !== "string" ) {
-								// Inspect recursively
-								add( arg );
-							}
-						});
-					})( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away
-					} else if ( memory ) {
-						firingStart = start;
-						fire( memory );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					jQuery.each( arguments, function( _, arg ) {
-						var index;
-						while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-							list.splice( index, 1 );
-							// Handle firing indexes
-							if ( firing ) {
-								if ( index <= firingLength ) {
-									firingLength--;
-								}
-								if ( index <= firingIndex ) {
-									firingIndex--;
-								}
-							}
-						}
-					});
-				}
-				return this;
-			},
-			// Check if a given callback is in the list.
-			// If no argument is given, return whether or not list has callbacks attached.
-			has: function( fn ) {
-				return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length );
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				firingLength = 0;
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},
-			// Lock the list in its current state
-			lock: function() {
-				stack = undefined;
-				if ( !memory ) {
-					self.disable();
-				}
-				return this;
-			},
-			// Is it locked?
-			locked: function() {
-				return !stack;
-			},
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				if ( list && ( !fired || stack ) ) {
-					args = args || [];
-					args = [ context, args.slice ? args.slice() : args ];
-					if ( firing ) {
-						stack.push( args );
+	jQuery.Callbacks = function (options) {
+
+		// Convert options from String-formatted to Object-formatted if needed
+		// (we check in cache first)
+		options = typeof options === "string" ?
+			(optionsCache[options] || createOptions(options)) :
+			jQuery.extend({}, options);
+
+		var // Flag to know if list is currently firing
+			firing,
+			// Last fire value (for non-forgettable lists)
+			memory,
+			// Flag to know if list was already fired
+			fired,
+			// End of the loop when firing
+			firingLength,
+			// Index of currently firing callback (modified by remove if needed)
+			firingIndex,
+			// First callback to fire (used internally by add and fireWith)
+			firingStart,
+			// Actual callback list
+			list = [],
+			// Stack of fire calls for repeatable lists
+			stack = !options.once && [],
+			// Fire callbacks
+			fire = function (data) {
+				memory = options.memory && data;
+				fired = true;
+				firingIndex = firingStart || 0;
+				firingStart = 0;
+				firingLength = list.length;
+				firing = true;
+				for (; list && firingIndex < firingLength; firingIndex++) {
+					if (list[firingIndex].apply(data[0], data[1]) === false && options.stopOnFalse) {
+						memory = false; // To prevent further calls using add
+						break;
+					}
+				}
+				firing = false;
+				if (list) {
+					if (stack) {
+						if (stack.length) {
+							fire(stack.shift());
+						}
+					} else if (memory) {
+						list = [];
 					} else {
-						fire( args );
+						self.disable();
 					}
 				}
-				return this;
 			},
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-jQuery.extend({
-
-	Deferred: function( func ) {
-		var tuples = [
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory") ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
+			// Actual Callbacks object
+			self = {
+				// Add a callback or a collection of callbacks to the list
+				add: function () {
+					if (list) {
+						// First, we save the current length
+						var start = list.length;
+						(function add(args) {
+							jQuery.each(args, function (_, arg) {
+								var type = jQuery.type(arg);
+								if (type === "function") {
+									if (!options.unique || !self.has(arg)) {
+										list.push(arg);
+									}
+								} else if (arg && arg.length && type !== "string") {
+									// Inspect recursively
+									add(arg);
+								}
+							});
+						})(arguments);
+						// Do we need to add the callbacks to the
+						// current firing batch?
+						if (firing) {
+							firingLength = list.length;
+							// With memory, if we're not firing then
+							// we should call right away
+						} else if (memory) {
+							firingStart = start;
+							fire(memory);
+						}
+					}
 					return this;
 				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-							var action = tuple[ 0 ],
-								fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ](function() {
-								var returned = fn && fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise()
-										.done( newDefer.resolve )
-										.fail( newDefer.reject )
-										.progress( newDefer.notify );
-								} else {
-									newDefer[ action + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments );
+				// Remove a callback from the list
+				remove: function () {
+					if (list) {
+						jQuery.each(arguments, function (_, arg) {
+							var index;
+							while ((index = jQuery.inArray(arg, list, index)) > -1) {
+								list.splice(index, 1);
+								// Handle firing indexes
+								if (firing) {
+									if (index <= firingLength) {
+										firingLength--;
+									}
+									if (index <= firingIndex) {
+										firingIndex--;
+									}
 								}
-							});
+							}
 						});
-						fns = null;
-					}).promise();
+					}
+					return this;
+				},
+				// Check if a given callback is in the list.
+				// If no argument is given, return whether or not list has callbacks attached.
+				has: function (fn) {
+					return fn ? jQuery.inArray(fn, list) > -1 : !!(list && list.length);
+				},
+				// Remove all callbacks from the list
+				empty: function () {
+					list = [];
+					firingLength = 0;
+					return this;
+				},
+				// Have the list do nothing anymore
+				disable: function () {
+					list = stack = memory = undefined;
+					return this;
+				},
+				// Is it disabled?
+				disabled: function () {
+					return !list;
+				},
+				// Lock the list in its current state
+				lock: function () {
+					stack = undefined;
+					if (!memory) {
+						self.disable();
+					}
+					return this;
 				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
+				// Is it locked?
+				locked: function () {
+					return !stack;
+				},
+				// Call all callbacks with the given context and arguments
+				fireWith: function (context, args) {
+					if (list && (!fired || stack)) {
+						args = args || [];
+						args = [context, args.slice ? args.slice() : args];
+						if (firing) {
+							stack.push(args);
+						} else {
+							fire(args);
+						}
+					}
+					return this;
+				},
+				// Call all the callbacks with the given arguments
+				fire: function () {
+					self.fireWith(this, arguments);
+					return this;
+				},
+				// To know if the callbacks have already been called at least once
+				fired: function () {
+					return !!fired;
 				}
-			},
-			deferred = {};
-
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
+			};
 
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
+		return self;
+	};
+	jQuery.extend({
+
+		Deferred: function (func) {
+			var tuples = [
+					// action, add listener, listener list, final state
+					["resolve", "done", jQuery.Callbacks("once memory"), "resolved"],
+					["reject", "fail", jQuery.Callbacks("once memory"), "rejected"],
+					["notify", "progress", jQuery.Callbacks("memory")]
+				],
+				state = "pending",
+				promise = {
+					state: function () {
+						return state;
+					},
+					always: function () {
+						deferred.done(arguments).fail(arguments);
+						return this;
+					},
+					then: function ( /* fnDone, fnFail, fnProgress */) {
+						var fns = arguments;
+						return jQuery.Deferred(function (newDefer) {
+							jQuery.each(tuples, function (i, tuple) {
+								var action = tuple[0],
+									fn = jQuery.isFunction(fns[i]) && fns[i];
+								// deferred[ done | fail | progress ] for forwarding actions to newDefer
+								deferred[tuple[1]](function () {
+									var returned = fn && fn.apply(this, arguments);
+									if (returned && jQuery.isFunction(returned.promise)) {
+										returned.promise()
+											.done(newDefer.resolve)
+											.fail(newDefer.reject)
+											.progress(newDefer.notify);
+									} else {
+										newDefer[action + "With"](this === promise ? newDefer.promise() : this, fn ? [returned] : arguments);
+									}
+								});
+							});
+							fns = null;
+						}).promise();
+					},
+					// Get a promise for this deferred
+					// If obj is provided, the promise aspect is added to the object
+					promise: function (obj) {
+						return obj != null ? jQuery.extend(obj, promise) : promise;
+					}
+				},
+				deferred = {};
 
-			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[1] ] = list.add;
+			// Keep pipe for back-compat
+			promise.pipe = promise.then;
 
-			// Handle state
-			if ( stateString ) {
-				list.add(function() {
-					// state = [ resolved | rejected ]
-					state = stateString;
+			// Add list-specific methods
+			jQuery.each(tuples, function (i, tuple) {
+				var list = tuple[2],
+					stateString = tuple[3];
 
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-			}
+				// promise[ done | fail | progress ] = list.add
+				promise[tuple[1]] = list.add;
 
-			// deferred[ resolve | reject | notify ]
-			deferred[ tuple[0] ] = function() {
-				deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments );
-				return this;
-			};
-			deferred[ tuple[0] + "With" ] = list.fireWith;
-		});
+				// Handle state
+				if (stateString) {
+					list.add(function () {
+						// state = [ resolved | rejected ]
+						state = stateString;
 
-		// Make the deferred a promise
-		promise.promise( deferred );
+						// [ reject_list | resolve_list ].disable; progress_list.lock
+					}, tuples[i ^ 1][2].disable, tuples[2][2].lock);
+				}
 
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
+				// deferred[ resolve | reject | notify ]
+				deferred[tuple[0]] = function () {
+					deferred[tuple[0] + "With"](this === deferred ? promise : this, arguments);
+					return this;
+				};
+				deferred[tuple[0] + "With"] = list.fireWith;
+			});
 
-		// All done!
-		return deferred;
-	},
+			// Make the deferred a promise
+			promise.promise(deferred);
 
-	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
-			resolveValues = core_slice.call( arguments ),
-			length = resolveValues.length,
+			// Call given func if any
+			if (func) {
+				func.call(deferred, deferred);
+			}
 
-			// the count of uncompleted subordinates
-			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
+			// All done!
+			return deferred;
+		},
 
-			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
+		// Deferred helper
+		when: function (subordinate /* , ..., subordinateN */) {
+			var i = 0,
+				resolveValues = core_slice.call(arguments),
+				length = resolveValues.length,
+
+				// the count of uncompleted subordinates
+				remaining = length !== 1 || (subordinate && jQuery.isFunction(subordinate.promise)) ? length : 0,
+
+				// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
+				deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
+
+				// Update function for both resolve and progress values
+				updateFunc = function (i, contexts, values) {
+					return function (value) {
+						contexts[i] = this;
+						values[i] = arguments.length > 1 ? core_slice.call(arguments) : value;
+						if (values === progressValues) {
+							deferred.notifyWith(contexts, values);
+						} else if (!(--remaining)) {
+							deferred.resolveWith(contexts, values);
+						}
+					};
+				},
 
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
-				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value;
-					if( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-					} else if ( !( --remaining ) ) {
-						deferred.resolveWith( contexts, values );
+				progressValues, progressContexts, resolveContexts;
+
+			// add listeners to Deferred subordinates; treat others as resolved
+			if (length > 1) {
+				progressValues = new Array(length);
+				progressContexts = new Array(length);
+				resolveContexts = new Array(length);
+				for (; i < length; i++) {
+					if (resolveValues[i] && jQuery.isFunction(resolveValues[i].promise)) {
+						resolveValues[i].promise()
+							.done(updateFunc(i, resolveContexts, resolveValues))
+							.fail(deferred.reject)
+							.progress(updateFunc(i, progressContexts, progressValues));
+					} else {
+						--remaining;
 					}
-				};
-			},
-
-			progressValues, progressContexts, resolveContexts;
-
-		// add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject )
-						.progress( updateFunc( i, progressContexts, progressValues ) );
-				} else {
-					--remaining;
 				}
 			}
-		}
 
-		// if we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
+			// if we're not waiting on anything, resolve the master
+			if (!remaining) {
+				deferred.resolveWith(resolveContexts, resolveValues);
+			}
+
+			return deferred.promise();
 		}
+	});
+	jQuery.support = (function (support) {
 
-		return deferred.promise();
-	}
-});
-jQuery.support = (function( support ) {
+		var all, a, input, select, fragment, opt, eventName, isSupported, i,
+			div = document.createElement("div");
 
-	var all, a, input, select, fragment, opt, eventName, isSupported, i,
-		div = document.createElement("div");
+		// Setup
+		div.setAttribute("className", "t");
+		div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
 
-	// Setup
-	div.setAttribute( "className", "t" );
-	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
+		// Finish early in limited (non-browser) environments
+		all = div.getElementsByTagName("*") || [];
+		a = div.getElementsByTagName("a")[0];
+		if (!a || !a.style || !all.length) {
+			return support;
+		}
 
-	// Finish early in limited (non-browser) environments
-	all = div.getElementsByTagName("*") || [];
-	a = div.getElementsByTagName("a")[ 0 ];
-	if ( !a || !a.style || !all.length ) {
-		return support;
-	}
+		// First batch of tests
+		select = document.createElement("select");
+		opt = select.appendChild(document.createElement("option"));
+		input = div.getElementsByTagName("input")[0];
 
-	// First batch of tests
-	select = document.createElement("select");
-	opt = select.appendChild( document.createElement("option") );
-	input = div.getElementsByTagName("input")[ 0 ];
+		a.style.cssText = "top:1px;float:left;opacity:.5";
 
-	a.style.cssText = "top:1px;float:left;opacity:.5";
+		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
+		support.getSetAttribute = div.className !== "t";
 
-	// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-	support.getSetAttribute = div.className !== "t";
+		// IE strips leading whitespace when .innerHTML is used
+		support.leadingWhitespace = div.firstChild.nodeType === 3;
 
-	// IE strips leading whitespace when .innerHTML is used
-	support.leadingWhitespace = div.firstChild.nodeType === 3;
+		// Make sure that tbody elements aren't automatically inserted
+		// IE will insert them into empty tables
+		support.tbody = !div.getElementsByTagName("tbody").length;
 
-	// Make sure that tbody elements aren't automatically inserted
-	// IE will insert them into empty tables
-	support.tbody = !div.getElementsByTagName("tbody").length;
+		// Make sure that link elements get serialized correctly by innerHTML
+		// This requires a wrapper element in IE
+		support.htmlSerialize = !!div.getElementsByTagName("link").length;
 
-	// Make sure that link elements get serialized correctly by innerHTML
-	// This requires a wrapper element in IE
-	support.htmlSerialize = !!div.getElementsByTagName("link").length;
+		// Get the style information from getAttribute
+		// (IE uses .cssText instead)
+		support.style = /top/.test(a.getAttribute("style"));
 
-	// Get the style information from getAttribute
-	// (IE uses .cssText instead)
-	support.style = /top/.test( a.getAttribute("style") );
+		// Make sure that URLs aren't manipulated
+		// (IE normalizes it by default)
+		support.hrefNormalized = a.getAttribute("href") === "/a";
 
-	// Make sure that URLs aren't manipulated
-	// (IE normalizes it by default)
-	support.hrefNormalized = a.getAttribute("href") === "/a";
+		// Make sure that element opacity exists
+		// (IE uses filter instead)
+		// Use a regex to work around a WebKit issue. See #5145
+		support.opacity = /^0.5/.test(a.style.opacity);
 
-	// Make sure that element opacity exists
-	// (IE uses filter instead)
-	// Use a regex to work around a WebKit issue. See #5145
-	support.opacity = /^0.5/.test( a.style.opacity );
+		// Verify style float existence
+		// (IE uses styleFloat instead of cssFloat)
+		support.cssFloat = !!a.style.cssFloat;
 
-	// Verify style float existence
-	// (IE uses styleFloat instead of cssFloat)
-	support.cssFloat = !!a.style.cssFloat;
+		// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
+		support.checkOn = !!input.value;
 
-	// Check the default checkbox/radio value ("" on WebKit; "on" elsewhere)
-	support.checkOn = !!input.value;
+		// Make sure that a selected-by-default option has a working selected property.
+		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+		support.optSelected = opt.selected;
 
-	// Make sure that a selected-by-default option has a working selected property.
-	// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-	support.optSelected = opt.selected;
+		// Tests for enctype support on a form (#6743)
+		support.enctype = !!document.createElement("form").enctype;
 
-	// Tests for enctype support on a form (#6743)
-	support.enctype = !!document.createElement("form").enctype;
+		// Makes sure cloning an html5 element does not cause problems
+		// Where outerHTML is undefined, this still works
+		support.html5Clone = document.createElement("nav").cloneNode(true).outerHTML !== "<:nav></:nav>";
 
-	// Makes sure cloning an html5 element does not cause problems
-	// Where outerHTML is undefined, this still works
-	support.html5Clone = document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>";
+		// Will be defined later
+		support.inlineBlockNeedsLayout = false;
+		support.shrinkWrapBlocks = false;
+		support.pixelPosition = false;
+		support.deleteExpando = true;
+		support.noCloneEvent = true;
+		support.reliableMarginRight = true;
+		support.boxSizingReliable = true;
 
-	// Will be defined later
-	support.inlineBlockNeedsLayout = false;
-	support.shrinkWrapBlocks = false;
-	support.pixelPosition = false;
-	support.deleteExpando = true;
-	support.noCloneEvent = true;
-	support.reliableMarginRight = true;
-	support.boxSizingReliable = true;
+		// Make sure checked status is properly cloned
+		input.checked = true;
+		support.noCloneChecked = input.cloneNode(true).checked;
 
-	// Make sure checked status is properly cloned
-	input.checked = true;
-	support.noCloneChecked = input.cloneNode( true ).checked;
+		// Make sure that the options inside disabled selects aren't marked as disabled
+		// (WebKit marks them as disabled)
+		select.disabled = true;
+		support.optDisabled = !opt.disabled;
 
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
+		// Support: IE<9
+		try {
+			delete div.test;
+		} catch (e) {
+			support.deleteExpando = false;
+		}
 
-	// Support: IE<9
-	try {
-		delete div.test;
-	} catch( e ) {
-		support.deleteExpando = false;
-	}
+		// Check if we can trust getAttribute("value")
+		input = document.createElement("input");
+		input.setAttribute("value", "");
+		support.input = input.getAttribute("value") === "";
 
-	// Check if we can trust getAttribute("value")
-	input = document.createElement("input");
-	input.setAttribute( "value", "" );
-	support.input = input.getAttribute( "value" ) === "";
+		// Check if an input maintains its value after becoming a radio
+		input.value = "t";
+		input.setAttribute("type", "radio");
+		support.radioValue = input.value === "t";
 
-	// Check if an input maintains its value after becoming a radio
-	input.value = "t";
-	input.setAttribute( "type", "radio" );
-	support.radioValue = input.value === "t";
+		// #11217 - WebKit loses check when the name is after the checked attribute
+		input.setAttribute("checked", "t");
+		input.setAttribute("name", "t");
 
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	input.setAttribute( "checked", "t" );
-	input.setAttribute( "name", "t" );
+		fragment = document.createDocumentFragment();
+		fragment.appendChild(input);
 
-	fragment = document.createDocumentFragment();
-	fragment.appendChild( input );
+		// Check if a disconnected checkbox will retain its checked
+		// value of true after appended to the DOM (IE6/7)
+		support.appendChecked = input.checked;
 
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	support.appendChecked = input.checked;
+		// WebKit doesn't clone checked state correctly in fragments
+		support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked;
 
-	// WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
+		// Support: IE<9
+		// Opera does not clone events (and typeof div.attachEvent === undefined).
+		// IE9-10 clones events bound via attachEvent, but they don't trigger with .click()
+		if (div.attachEvent) {
+			div.attachEvent("onclick", function () {
+				support.noCloneEvent = false;
+			});
 
-	// Support: IE<9
-	// Opera does not clone events (and typeof div.attachEvent === undefined).
-	// IE9-10 clones events bound via attachEvent, but they don't trigger with .click()
-	if ( div.attachEvent ) {
-		div.attachEvent( "onclick", function() {
-			support.noCloneEvent = false;
-		});
+			div.cloneNode(true).click();
+		}
 
-		div.cloneNode( true ).click();
-	}
+		// Support: IE<9 (lack submit/change bubble), Firefox 17+ (lack focusin event)
+		// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP)
+		for (i in {submit: true, change: true, focusin: true}) {
+			div.setAttribute(eventName = "on" + i, "t");
 
-	// Support: IE<9 (lack submit/change bubble), Firefox 17+ (lack focusin event)
-	// Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP)
-	for ( i in { submit: true, change: true, focusin: true }) {
-		div.setAttribute( eventName = "on" + i, "t" );
+			support[i + "Bubbles"] = eventName in window || div.attributes[eventName].expando === false;
+		}
 
-		support[ i + "Bubbles" ] = eventName in window || div.attributes[ eventName ].expando === false;
-	}
+		div.style.backgroundClip = "content-box";
+		div.cloneNode(true).style.backgroundClip = "";
+		support.clearCloneStyle = div.style.backgroundClip === "content-box";
 
-	div.style.backgroundClip = "content-box";
-	div.cloneNode( true ).style.backgroundClip = "";
-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
+		// Support: IE<9
+		// Iteration over object's inherited properties before its own.
+		for (i in jQuery(support)) {
+			break;
+		}
+		support.ownLast = i !== "0";
 
-	// Support: IE<9
-	// Iteration over object's inherited properties before its own.
-	for ( i in jQuery( support ) ) {
-		break;
-	}
-	support.ownLast = i !== "0";
+		// Run tests that need a body at doc ready
+		jQuery(function () {
+			var container, marginDiv, tds,
+				divReset = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",
+				body = document.getElementsByTagName("body")[0];
 
-	// Run tests that need a body at doc ready
-	jQuery(function() {
-		var container, marginDiv, tds,
-			divReset = "padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",
-			body = document.getElementsByTagName("body")[0];
+			if (!body) {
+				// Return for frameset docs that don't have a body
+				return;
+			}
 
-		if ( !body ) {
-			// Return for frameset docs that don't have a body
-			return;
-		}
+			container = document.createElement("div");
+			container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px";
 
-		container = document.createElement("div");
-		container.style.cssText = "border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px";
+			body.appendChild(container).appendChild(div);
 
-		body.appendChild( container ).appendChild( div );
+			// Support: IE8
+			// Check if table cells still have offsetWidth/Height when they are set
+			// to display:none and there are still other visible table cells in a
+			// table row; if so, offsetWidth/Height are not reliable for use when
+			// determining if an element has been hidden directly using
+			// display:none (it is still safe to use offsets if a parent element is
+			// hidden; don safety goggles and see bug #4512 for more information).
+			div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
+			tds = div.getElementsByTagName("td");
+			tds[0].style.cssText = "padding:0;margin:0;border:0;display:none";
+			isSupported = (tds[0].offsetHeight === 0);
+
+			tds[0].style.display = "";
+			tds[1].style.display = "none";
 
-		// Support: IE8
-		// Check if table cells still have offsetWidth/Height when they are set
-		// to display:none and there are still other visible table cells in a
-		// table row; if so, offsetWidth/Height are not reliable for use when
-		// determining if an element has been hidden directly using
-		// display:none (it is still safe to use offsets if a parent element is
-		// hidden; don safety goggles and see bug #4512 for more information).
-		div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
-		tds = div.getElementsByTagName("td");
-		tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none";
-		isSupported = ( tds[ 0 ].offsetHeight === 0 );
+			// Support: IE8
+			// Check if empty table cells still have offsetWidth/Height
+			support.reliableHiddenOffsets = isSupported && (tds[0].offsetHeight === 0);
 
-		tds[ 0 ].style.display = "";
-		tds[ 1 ].style.display = "none";
+			// Check box-sizing and margin behavior.
+			div.innerHTML = "";
+			div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
 
-		// Support: IE8
-		// Check if empty table cells still have offsetWidth/Height
-		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
+			// Workaround failing boxSizing test due to offsetWidth returning wrong value
+			// with some non-1 values of body zoom, ticket #13543
+			jQuery.swap(body, body.style.zoom != null ? {zoom: 1} : {}, function () {
+				support.boxSizing = div.offsetWidth === 4;
+			});
 
-		// Check box-sizing and margin behavior.
-		div.innerHTML = "";
-		div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
+			// Use window.getComputedStyle because jsdom on node.js will break without it.
+			if (window.getComputedStyle) {
+				support.pixelPosition = (window.getComputedStyle(div, null) || {}).top !== "1%";
+				support.boxSizingReliable = (window.getComputedStyle(div, null) || {width: "4px"}).width === "4px";
 
-		// Workaround failing boxSizing test due to offsetWidth returning wrong value
-		// with some non-1 values of body zoom, ticket #13543
-		jQuery.swap( body, body.style.zoom != null ? { zoom: 1 } : {}, function() {
-			support.boxSizing = div.offsetWidth === 4;
-		});
+				// Check if div with explicit width and no margin-right incorrectly
+				// gets computed margin-right based on width of container. (#3333)
+				// Fails in WebKit before Feb 2011 nightlies
+				// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+				marginDiv = div.appendChild(document.createElement("div"));
+				marginDiv.style.cssText = div.style.cssText = divReset;
+				marginDiv.style.marginRight = marginDiv.style.width = "0";
+				div.style.width = "1px";
 
-		// Use window.getComputedStyle because jsdom on node.js will break without it.
-		if ( window.getComputedStyle ) {
-			support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
-			support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
+				support.reliableMarginRight =
+					!parseFloat((window.getComputedStyle(marginDiv, null) || {}).marginRight);
+			}
 
-			// Check if div with explicit width and no margin-right incorrectly
-			// gets computed margin-right based on width of container. (#3333)
-			// Fails in WebKit before Feb 2011 nightlies
-			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-			marginDiv = div.appendChild( document.createElement("div") );
-			marginDiv.style.cssText = div.style.cssText = divReset;
-			marginDiv.style.marginRight = marginDiv.style.width = "0";
-			div.style.width = "1px";
+			if (typeof div.style.zoom !== core_strundefined) {
+				// Support: IE<8
+				// Check if natively block-level elements act like inline-block
+				// elements when setting their display to 'inline' and giving
+				// them layout
+				div.innerHTML = "";
+				div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
+				support.inlineBlockNeedsLayout = (div.offsetWidth === 3);
 
-			support.reliableMarginRight =
-				!parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight );
-		}
+				// Support: IE6
+				// Check if elements with layout shrink-wrap their children
+				div.style.display = "block";
+				div.innerHTML = "<div></div>";
+				div.firstChild.style.width = "5px";
+				support.shrinkWrapBlocks = (div.offsetWidth !== 3);
 
-		if ( typeof div.style.zoom !== core_strundefined ) {
-			// Support: IE<8
-			// Check if natively block-level elements act like inline-block
-			// elements when setting their display to 'inline' and giving
-			// them layout
-			div.innerHTML = "";
-			div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
-			support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
-
-			// Support: IE6
-			// Check if elements with layout shrink-wrap their children
-			div.style.display = "block";
-			div.innerHTML = "<div></div>";
-			div.firstChild.style.width = "5px";
-			support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
-
-			if ( support.inlineBlockNeedsLayout ) {
-				// Prevent IE 6 from affecting layout for positioned elements #11048
-				// Prevent IE from shrinking the body in IE 7 mode #12869
-				// Support: IE<8
-				body.style.zoom = 1;
+				if (support.inlineBlockNeedsLayout) {
+					// Prevent IE 6 from affecting layout for positioned elements #11048
+					// Prevent IE from shrinking the body in IE 7 mode #12869
+					// Support: IE<8
+					body.style.zoom = 1;
+				}
 			}
-		}
 
-		body.removeChild( container );
+			body.removeChild(container);
 
-		// Null elements to avoid leaks in IE
-		container = div = tds = marginDiv = null;
-	});
+			// Null elements to avoid leaks in IE
+			container = div = tds = marginDiv = null;
+		});
 
-	// Null elements to avoid leaks in IE
-	all = select = fragment = opt = a = input = null;
+		// Null elements to avoid leaks in IE
+		all = select = fragment = opt = a = input = null;
 
-	return support;
-})({});
+		return support;
+	})({});
 
-var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
-	rmultiDash = /([A-Z])/g;
+	var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
+		rmultiDash = /([A-Z])/g;
 
-function internalData( elem, name, data, pvt /* Internal Use Only */ ){
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
-	}
+	function internalData(elem, name, data, pvt /* Internal Use Only */) {
+		if (!jQuery.acceptData(elem)) {
+			return;
+		}
 
-	var ret, thisCache,
-		internalKey = jQuery.expando,
+		var ret, thisCache,
+			internalKey = jQuery.expando,
 
-		// We have to handle DOM nodes and JS objects differently because IE6-7
-		// can't GC object references properly across the DOM-JS boundary
-		isNode = elem.nodeType,
+			// We have to handle DOM nodes and JS objects differently because IE6-7
+			// can't GC object references properly across the DOM-JS boundary
+			isNode = elem.nodeType,
 
-		// Only DOM nodes need the global jQuery cache; JS object data is
-		// attached directly to the object so GC can occur automatically
-		cache = isNode ? jQuery.cache : elem,
+			// Only DOM nodes need the global jQuery cache; JS object data is
+			// attached directly to the object so GC can occur automatically
+			cache = isNode ? jQuery.cache : elem,
 
-		// Only defining an ID for JS objects if its cache already exists allows
-		// the code to shortcut on the same path as a DOM node with no cache
-		id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
+			// Only defining an ID for JS objects if its cache already exists allows
+			// the code to shortcut on the same path as a DOM node with no cache
+			id = isNode ? elem[internalKey] : elem[internalKey] && internalKey;
 
-	// Avoid doing any more work than we need to when trying to get data on an
-	// object that has no data at all
-	if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && data === undefined && typeof name === "string" ) {
-		return;
-	}
+		// Avoid doing any more work than we need to when trying to get data on an
+		// object that has no data at all
+		if ((!id || !cache[id] || (!pvt && !cache[id].data)) && data === undefined && typeof name === "string") {
+			return;
+		}
 
-	if ( !id ) {
-		// Only DOM nodes need a new unique ID for each element since their data
-		// ends up in the global cache
-		if ( isNode ) {
-			id = elem[ internalKey ] = core_deletedIds.pop() || jQuery.guid++;
-		} else {
-			id = internalKey;
+		if (!id) {
+			// Only DOM nodes need a new unique ID for each element since their data
+			// ends up in the global cache
+			if (isNode) {
+				id = elem[internalKey] = core_deletedIds.pop() || jQuery.guid++;
+			} else {
+				id = internalKey;
+			}
 		}
-	}
 
-	if ( !cache[ id ] ) {
-		// Avoid exposing jQuery metadata on plain JS objects when the object
-		// is serialized using JSON.stringify
-		cache[ id ] = isNode ? {} : { toJSON: jQuery.noop };
-	}
+		if (!cache[id]) {
+			// Avoid exposing jQuery metadata on plain JS objects when the object
+			// is serialized using JSON.stringify
+			cache[id] = isNode ? {} : {toJSON: jQuery.noop};
+		}
 
-	// An object can be passed to jQuery.data instead of a key/value pair; this gets
-	// shallow copied over onto the existing cache
-	if ( typeof name === "object" || typeof name === "function" ) {
-		if ( pvt ) {
-			cache[ id ] = jQuery.extend( cache[ id ], name );
-		} else {
-			cache[ id ].data = jQuery.extend( cache[ id ].data, name );
+		// An object can be passed to jQuery.data instead of a key/value pair; this gets
+		// shallow copied over onto the existing cache
+		if (typeof name === "object" || typeof name === "function") {
+			if (pvt) {
+				cache[id] = jQuery.extend(cache[id], name);
+			} else {
+				cache[id].data = jQuery.extend(cache[id].data, name);
+			}
 		}
-	}
 
-	thisCache = cache[ id ];
+		thisCache = cache[id];
 
-	// jQuery data() is stored in a separate object inside the object's internal data
-	// cache in order to avoid key collisions between internal data and user-defined
-	// data.
-	if ( !pvt ) {
-		if ( !thisCache.data ) {
-			thisCache.data = {};
-		}
+		// jQuery data() is stored in a separate object inside the object's internal data
+		// cache in order to avoid key collisions between internal data and user-defined
+		// data.
+		if (!pvt) {
+			if (!thisCache.data) {
+				thisCache.data = {};
+			}
 
-		thisCache = thisCache.data;
-	}
+			thisCache = thisCache.data;
+		}
 
-	if ( data !== undefined ) {
-		thisCache[ jQuery.camelCase( name ) ] = data;
-	}
+		if (data !== undefined) {
+			thisCache[jQuery.camelCase(name)] = data;
+		}
 
-	// Check for both converted-to-camel and non-converted data property names
-	// If a data property was specified
-	if ( typeof name === "string" ) {
+		// Check for both converted-to-camel and non-converted data property names
+		// If a data property was specified
+		if (typeof name === "string") {
 
-		// First Try to find as-is property data
-		ret = thisCache[ name ];
+			// First Try to find as-is property data
+			ret = thisCache[name];
 
-		// Test for null|undefined property data
-		if ( ret == null ) {
+			// Test for null|undefined property data
+			if (ret == null) {
 
-			// Try to find the camelCased property
-			ret = thisCache[ jQuery.camelCase( name ) ];
+				// Try to find the camelCased property
+				ret = thisCache[jQuery.camelCase(name)];
+			}
+		} else {
+			ret = thisCache;
 		}
-	} else {
-		ret = thisCache;
-	}
-
-	return ret;
-}
 
-function internalRemoveData( elem, name, pvt ) {
-	if ( !jQuery.acceptData( elem ) ) {
-		return;
+		return ret;
 	}
 
-	var thisCache, i,
-		isNode = elem.nodeType,
+	function internalRemoveData(elem, name, pvt) {
+		if (!jQuery.acceptData(elem)) {
+			return;
+		}
 
-		// See jQuery.data for more information
-		cache = isNode ? jQuery.cache : elem,
-		id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
+		var thisCache, i,
+			isNode = elem.nodeType,
 
-	// If there is already no cache entry for this object, there is no
-	// purpose in continuing
-	if ( !cache[ id ] ) {
-		return;
-	}
+			// See jQuery.data for more information
+			cache = isNode ? jQuery.cache : elem,
+			id = isNode ? elem[jQuery.expando] : jQuery.expando;
 
-	if ( name ) {
+		// If there is already no cache entry for this object, there is no
+		// purpose in continuing
+		if (!cache[id]) {
+			return;
+		}
 
-		thisCache = pvt ? cache[ id ] : cache[ id ].data;
+		if (name) {
 
-		if ( thisCache ) {
+			thisCache = pvt ? cache[id] : cache[id].data;
 
-			// Support array or space separated string names for data keys
-			if ( !jQuery.isArray( name ) ) {
+			if (thisCache) {
 
-				// try the string as a key before any manipulation
-				if ( name in thisCache ) {
-					name = [ name ];
-				} else {
+				// Support array or space separated string names for data keys
+				if (!jQuery.isArray(name)) {
 
-					// split the camel cased version by spaces unless a key with the spaces exists
-					name = jQuery.camelCase( name );
-					if ( name in thisCache ) {
-						name = [ name ];
+					// try the string as a key before any manipulation
+					if (name in thisCache) {
+						name = [name];
 					} else {
-						name = name.split(" ");
+
+						// split the camel cased version by spaces unless a key with the spaces exists
+						name = jQuery.camelCase(name);
+						if (name in thisCache) {
+							name = [name];
+						} else {
+							name = name.split(" ");
+						}
 					}
+				} else {
+					// If "name" is an array of keys...
+					// When data is initially created, via ("key", "val") signature,
+					// keys will be converted to camelCase.
+					// Since there is no way to tell _how_ a key was added, remove
+					// both plain key and camelCase key. #12786
+					// This will only penalize the array argument path.
+					name = name.concat(jQuery.map(name, jQuery.camelCase));
 				}
-			} else {
-				// If "name" is an array of keys...
-				// When data is initially created, via ("key", "val") signature,
-				// keys will be converted to camelCase.
-				// Since there is no way to tell _how_ a key was added, remove
-				// both plain key and camelCase key. #12786
-				// This will only penalize the array argument path.
-				name = name.concat( jQuery.map( name, jQuery.camelCase ) );
-			}
 
-			i = name.length;
-			while ( i-- ) {
-				delete thisCache[ name[i] ];
+				i = name.length;
+				while (i--) {
+					delete thisCache[name[i]];
+				}
+
+				// If there is no data left in the cache, we want to continue
+				// and let the cache object itself get destroyed
+				if (pvt ? !isEmptyDataObject(thisCache) : !jQuery.isEmptyObject(thisCache)) {
+					return;
+				}
 			}
+		}
+
+		// See jQuery.data for more information
+		if (!pvt) {
+			delete cache[id].data;
 
-			// If there is no data left in the cache, we want to continue
-			// and let the cache object itself get destroyed
-			if ( pvt ? !isEmptyDataObject(thisCache) : !jQuery.isEmptyObject(thisCache) ) {
+			// Don't destroy the parent cache unless the internal data object
+			// had been the only thing left in it
+			if (!isEmptyDataObject(cache[id])) {
 				return;
 			}
 		}
-	}
 
-	// See jQuery.data for more information
-	if ( !pvt ) {
-		delete cache[ id ].data;
+		// Destroy the cache
+		if (isNode) {
+			jQuery.cleanData([elem], true);
 
-		// Don't destroy the parent cache unless the internal data object
-		// had been the only thing left in it
-		if ( !isEmptyDataObject( cache[ id ] ) ) {
-			return;
+			// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
+			/* jshint eqeqeq: false */
+		} else if (jQuery.support.deleteExpando || cache != cache.window) {
+			/* jshint eqeqeq: true */
+			delete cache[id];
+
+			// When all else fails, null
+		} else {
+			cache[id] = null;
 		}
 	}
 
-	// Destroy the cache
-	if ( isNode ) {
-		jQuery.cleanData( [ elem ], true );
+	jQuery.extend({
+		cache: {},
 
-	// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
-	/* jshint eqeqeq: false */
-	} else if ( jQuery.support.deleteExpando || cache != cache.window ) {
-		/* jshint eqeqeq: true */
-		delete cache[ id ];
+		// The following elements throw uncatchable exceptions if you
+		// attempt to add expando properties to them.
+		noData: {
+			"applet": true,
+			"embed": true,
+			// Ban all objects except for Flash (which handle expandos)
+			"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+		},
 
-	// When all else fails, null
-	} else {
-		cache[ id ] = null;
-	}
-}
-
-jQuery.extend({
-	cache: {},
-
-	// The following elements throw uncatchable exceptions if you
-	// attempt to add expando properties to them.
-	noData: {
-		"applet": true,
-		"embed": true,
-		// Ban all objects except for Flash (which handle expandos)
-		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-	},
-
-	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
-		return !!elem && !isEmptyDataObject( elem );
-	},
-
-	data: function( elem, name, data ) {
-		return internalData( elem, name, data );
-	},
-
-	removeData: function( elem, name ) {
-		return internalRemoveData( elem, name );
-	},
-
-	// For internal use only.
-	_data: function( elem, name, data ) {
-		return internalData( elem, name, data, true );
-	},
-
-	_removeData: function( elem, name ) {
-		return internalRemoveData( elem, name, true );
-	},
-
-	// A method for determining if a DOM node can handle the data expando
-	acceptData: function( elem ) {
-		// Do not set data on non-element because it will not be cleared (#8335).
-		if ( elem.nodeType && elem.nodeType !== 1 && elem.nodeType !== 9 ) {
-			return false;
-		}
+		hasData: function (elem) {
+			elem = elem.nodeType ? jQuery.cache[elem[jQuery.expando]] : elem[jQuery.expando];
+			return !!elem && !isEmptyDataObject(elem);
+		},
 
-		var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ];
+		data: function (elem, name, data) {
+			return internalData(elem, name, data);
+		},
 
-		// nodes accept data unless otherwise specified; rejection can be conditional
-		return !noData || noData !== true && elem.getAttribute("classid") === noData;
-	}
-});
+		removeData: function (elem, name) {
+			return internalRemoveData(elem, name);
+		},
 
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var attrs, name,
-			data = null,
-			i = 0,
-			elem = this[0];
+		// For internal use only.
+		_data: function (elem, name, data) {
+			return internalData(elem, name, data, true);
+		},
+
+		_removeData: function (elem, name) {
+			return internalRemoveData(elem, name, true);
+		},
+
+		// A method for determining if a DOM node can handle the data expando
+		acceptData: function (elem) {
+			// Do not set data on non-element because it will not be cleared (#8335).
+			if (elem.nodeType && elem.nodeType !== 1 && elem.nodeType !== 9) {
+				return false;
+			}
 
-		// Special expections of .data basically thwart jQuery.access,
-		// so implement the relevant behavior ourselves
+			var noData = elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()];
 
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = jQuery.data( elem );
+			// nodes accept data unless otherwise specified; rejection can be conditional
+			return !noData || noData !== true && elem.getAttribute("classid") === noData;
+		}
+	});
+
+	jQuery.fn.extend({
+		data: function (key, value) {
+			var attrs, name,
+				data = null,
+				i = 0,
+				elem = this[0];
 
-				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
-					attrs = elem.attributes;
-					for ( ; i < attrs.length; i++ ) {
-						name = attrs[i].name;
+			// Special expections of .data basically thwart jQuery.access,
+			// so implement the relevant behavior ourselves
 
-						if ( name.indexOf("data-") === 0 ) {
-							name = jQuery.camelCase( name.slice(5) );
+			// Gets all values
+			if (key === undefined) {
+				if (this.length) {
+					data = jQuery.data(elem);
 
-							dataAttr( elem, name, data[ name ] );
+					if (elem.nodeType === 1 && !jQuery._data(elem, "parsedAttrs")) {
+						attrs = elem.attributes;
+						for (; i < attrs.length; i++) {
+							name = attrs[i].name;
+
+							if (name.indexOf("data-") === 0) {
+								name = jQuery.camelCase(name.slice(5));
+
+								dataAttr(elem, name, data[name]);
+							}
 						}
+						jQuery._data(elem, "parsedAttrs", true);
 					}
-					jQuery._data( elem, "parsedAttrs", true );
 				}
+
+				return data;
 			}
 
-			return data;
-		}
+			// Sets multiple values
+			if (typeof key === "object") {
+				return this.each(function () {
+					jQuery.data(this, key);
+				});
+			}
 
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each(function() {
-				jQuery.data( this, key );
-			});
-		}
+			return arguments.length > 1 ?
 
-		return arguments.length > 1 ?
+				// Sets one value
+				this.each(function () {
+					jQuery.data(this, key, value);
+				}) :
 
-			// Sets one value
-			this.each(function() {
-				jQuery.data( this, key, value );
-			}) :
+				// Gets one value
+				// Try to fetch any internally stored data first
+				elem ? dataAttr(elem, key, jQuery.data(elem, key)) : null;
+		},
 
-			// Gets one value
-			// Try to fetch any internally stored data first
-			elem ? dataAttr( elem, key, jQuery.data( elem, key ) ) : null;
-	},
+		removeData: function (key) {
+			return this.each(function () {
+				jQuery.removeData(this, key);
+			});
+		}
+	});
 
-	removeData: function( key ) {
-		return this.each(function() {
-			jQuery.removeData( this, key );
-		});
-	}
-});
+	function dataAttr(elem, key, data) {
+		// If nothing was found internally, try to fetch any
+		// data from the HTML5 data-* attribute
+		if (data === undefined && elem.nodeType === 1) {
 
-function dataAttr( elem, key, data ) {
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
+			var name = "data-" + key.replace(rmultiDash, "-$1").toLowerCase();
 
-		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
+			data = elem.getAttribute(name);
 
-		data = elem.getAttribute( name );
+			if (typeof data === "string") {
+				try {
+					data = data === "true" ? true :
+						data === "false" ? false :
+							data === "null" ? null :
+								// Only convert to a number if it doesn't change the string
+								+data + "" === data ? +data :
+									rbrace.test(data) ? jQuery.parseJSON(data) :
+										data;
+				} catch (e) {
+				}
 
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-					data === "false" ? false :
-					data === "null" ? null :
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-						data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
+				// Make sure we set the data so it isn't changed later
+				jQuery.data(elem, key, data);
 
-		} else {
-			data = undefined;
+			} else {
+				data = undefined;
+			}
 		}
-	}
 
-	return data;
-}
+		return data;
+	}
 
 // checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
-	var name;
-	for ( name in obj ) {
+	function isEmptyDataObject(obj) {
+		var name;
+		for (name in obj) {
 
-		// if the public data object is empty, the private is still empty
-		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
-			continue;
-		}
-		if ( name !== "toJSON" ) {
-			return false;
+			// if the public data object is empty, the private is still empty
+			if (name === "data" && jQuery.isEmptyObject(obj[name])) {
+				continue;
+			}
+			if (name !== "toJSON") {
+				return false;
+			}
 		}
+
+		return true;
 	}
 
-	return true;
-}
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		var queue;
+	jQuery.extend({
+		queue: function (elem, type, data) {
+			var queue;
 
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = jQuery._data( elem, type );
+			if (elem) {
+				type = (type || "fx") + "queue";
+				queue = jQuery._data(elem, type);
 
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray(data) ) {
-					queue = jQuery._data( elem, type, jQuery.makeArray(data) );
-				} else {
-					queue.push( data );
+				// Speed up dequeue by getting out quickly if this is just a lookup
+				if (data) {
+					if (!queue || jQuery.isArray(data)) {
+						queue = jQuery._data(elem, type, jQuery.makeArray(data));
+					} else {
+						queue.push(data);
+					}
 				}
+				return queue || [];
 			}
-			return queue || [];
-		}
-	},
+		},
 
-	dequeue: function( elem, type ) {
-		type = type || "fx";
+		dequeue: function (elem, type) {
+			type = type || "fx";
 
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
+			var queue = jQuery.queue(elem, type),
+				startLength = queue.length,
+				fn = queue.shift(),
+				hooks = jQuery._queueHooks(elem, type),
+				next = function () {
+					jQuery.dequeue(elem, type);
+				};
 
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
+			// If the fx queue is dequeued, always remove the progress sentinel
+			if (fn === "inprogress") {
+				fn = queue.shift();
+				startLength--;
+			}
 
-		if ( fn ) {
+			if (fn) {
 
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
+				// Add a progress sentinel to prevent the fx queue from being
+				// automatically dequeued
+				if (type === "fx") {
+					queue.unshift("inprogress");
+				}
+
+				// clear up the last queue stop function
+				delete hooks.stop;
+				fn.call(elem, next, hooks);
 			}
 
-			// clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
+			if (!startLength && hooks) {
+				hooks.empty.fire();
+			}
+		},
 
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
+		// not intended for public consumption - generates a queueHooks object, or returns the current one
+		_queueHooks: function (elem, type) {
+			var key = type + "queueHooks";
+			return jQuery._data(elem, key) || jQuery._data(elem, key, {
+				empty: jQuery.Callbacks("once memory").add(function () {
+					jQuery._removeData(elem, type + "queue");
+					jQuery._removeData(elem, key);
+				})
+			});
 		}
-	},
+	});
 
-	// not intended for public consumption - generates a queueHooks object, or returns the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
-			empty: jQuery.Callbacks("once memory").add(function() {
-				jQuery._removeData( elem, type + "queue" );
-				jQuery._removeData( elem, key );
-			})
-		});
-	}
-});
+	jQuery.fn.extend({
+		queue: function (type, data) {
+			var setter = 2;
+
+			if (typeof type !== "string") {
+				data = type;
+				type = "fx";
+				setter--;
+			}
+
+			if (arguments.length < setter) {
+				return jQuery.queue(this[0], type);
+			}
+
+			return data === undefined ?
+				this :
+				this.each(function () {
+					var queue = jQuery.queue(this, type, data);
+
+					// ensure a hooks for this queue
+					jQuery._queueHooks(this, type);
 
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		var setter = 2;
+					if (type === "fx" && queue[0] !== "inprogress") {
+						jQuery.dequeue(this, type);
+					}
+				});
+		},
+		dequeue: function (type) {
+			return this.each(function () {
+				jQuery.dequeue(this, type);
+			});
+		},
+		// Based off of the plugin by Clint Helfers, with permission.
+		// http://blindsignals.com/index.php/2009/07/jquery-delay/
+		delay: function (time, type) {
+			time = jQuery.fx ? jQuery.fx.speeds[time] || time : time;
+			type = type || "fx";
+
+			return this.queue(type, function (next, hooks) {
+				var timeout = setTimeout(next, time);
+				hooks.stop = function () {
+					clearTimeout(timeout);
+				};
+			});
+		},
+		clearQueue: function (type) {
+			return this.queue(type || "fx", []);
+		},
+		// Get a promise resolved when queues of a certain type
+		// are emptied (fx is the type by default)
+		promise: function (type, obj) {
+			var tmp,
+				count = 1,
+				defer = jQuery.Deferred(),
+				elements = this,
+				i = this.length,
+				resolve = function () {
+					if (!(--count)) {
+						defer.resolveWith(elements, [elements]);
+					}
+				};
 
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
+			if (typeof type !== "string") {
+				obj = type;
+				type = undefined;
+			}
+			type = type || "fx";
 
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[0], type );
+			while (i--) {
+				tmp = jQuery._data(elements[i], type + "queueHooks");
+				if (tmp && tmp.empty) {
+					count++;
+					tmp.empty.add(resolve);
+				}
+			}
+			resolve();
+			return defer.promise(obj);
 		}
+	});
+	var nodeHook, boolHook,
+		rclass = /[\t\r\n\f]/g,
+		rreturn = /\r/g,
+		rfocusable = /^(?:input|select|textarea|button|object)$/i,
+		rclickable = /^(?:a|area)$/i,
+		ruseDefault = /^(?:checked|selected)$/i,
+		getSetAttribute = jQuery.support.getSetAttribute,
+		getSetInput = jQuery.support.input;
+
+	jQuery.fn.extend({
+		attr: function (name, value) {
+			return jQuery.access(this, jQuery.attr, name, value, arguments.length > 1);
+		},
 
-		return data === undefined ?
-			this :
-			this.each(function() {
-				var queue = jQuery.queue( this, type, data );
+		removeAttr: function (name) {
+			return this.each(function () {
+				jQuery.removeAttr(this, name);
+			});
+		},
 
-				// ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
+		prop: function (name, value) {
+			return jQuery.access(this, jQuery.prop, name, value, arguments.length > 1);
+		},
 
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
+		removeProp: function (name) {
+			name = jQuery.propFix[name] || name;
+			return this.each(function () {
+				// try/catch handles cases where IE balks (such as removing a property on window)
+				try {
+					this[name] = undefined;
+					delete this[name];
+				} catch (e) {
 				}
 			});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	// Based off of the plugin by Clint Helfers, with permission.
-	// http://blindsignals.com/index.php/2009/07/jquery-delay/
-	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-		type = type || "fx";
-
-		return this.queue( type, function( next, hooks ) {
-			var timeout = setTimeout( next, time );
-			hooks.stop = function() {
-				clearTimeout( timeout );
-			};
-		});
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
+		},
 
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
+		addClass: function (value) {
+			var classes, elem, cur, clazz, j,
+				i = 0,
+				len = this.length,
+				proceed = typeof value === "string" && value;
 
-		while( i-- ) {
-			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
+			if (jQuery.isFunction(value)) {
+				return this.each(function (j) {
+					jQuery(this).addClass(value.call(this, j, this.className));
+				});
 			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-});
-var nodeHook, boolHook,
-	rclass = /[\t\r\n\f]/g,
-	rreturn = /\r/g,
-	rfocusable = /^(?:input|select|textarea|button|object)$/i,
-	rclickable = /^(?:a|area)$/i,
-	ruseDefault = /^(?:checked|selected)$/i,
-	getSetAttribute = jQuery.support.getSetAttribute,
-	getSetInput = jQuery.support.input;
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	},
-
-	prop: function( name, value ) {
-		return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		name = jQuery.propFix[ name ] || name;
-		return this.each(function() {
-			// try/catch handles cases where IE balks (such as removing a property on window)
-			try {
-				this[ name ] = undefined;
-				delete this[ name ];
-			} catch( e ) {}
-		});
-	},
 
-	addClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = typeof value === "string" && value;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call( this, j, this.className ) );
-			});
-		}
+			if (proceed) {
+				// The disjunction here is for better compressibility (see removeClass)
+				classes = (value || "").match(core_rnotwhite) || [];
 
-		if ( proceed ) {
-			// The disjunction here is for better compressibility (see removeClass)
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
-
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					" "
-				);
+				for (; i < len; i++) {
+					elem = this[i];
+					cur = elem.nodeType === 1 && (elem.className ?
+							(" " + elem.className + " ").replace(rclass, " ") :
+							" "
+					);
 
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-							cur += clazz + " ";
+					if (cur) {
+						j = 0;
+						while ((clazz = classes[j++])) {
+							if (cur.indexOf(" " + clazz + " ") < 0) {
+								cur += clazz + " ";
+							}
 						}
-					}
-					elem.className = jQuery.trim( cur );
+						elem.className = jQuery.trim(cur);
 
+					}
 				}
 			}
-		}
 
-		return this;
-	},
+			return this;
+		},
 
-	removeClass: function( value ) {
-		var classes, elem, cur, clazz, j,
-			i = 0,
-			len = this.length,
-			proceed = arguments.length === 0 || typeof value === "string" && value;
+		removeClass: function (value) {
+			var classes, elem, cur, clazz, j,
+				i = 0,
+				len = this.length,
+				proceed = arguments.length === 0 || typeof value === "string" && value;
 
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, this.className ) );
-			});
-		}
-		if ( proceed ) {
-			classes = ( value || "" ).match( core_rnotwhite ) || [];
+			if (jQuery.isFunction(value)) {
+				return this.each(function (j) {
+					jQuery(this).removeClass(value.call(this, j, this.className));
+				});
+			}
+			if (proceed) {
+				classes = (value || "").match(core_rnotwhite) || [];
 
-			for ( ; i < len; i++ ) {
-				elem = this[ i ];
-				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 && ( elem.className ?
-					( " " + elem.className + " " ).replace( rclass, " " ) :
-					""
-				);
+				for (; i < len; i++) {
+					elem = this[i];
+					// This expression is here for better compressibility (see addClass)
+					cur = elem.nodeType === 1 && (elem.className ?
+							(" " + elem.className + " ").replace(rclass, " ") :
+							""
+					);
 
-				if ( cur ) {
-					j = 0;
-					while ( (clazz = classes[j++]) ) {
-						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) >= 0 ) {
-							cur = cur.replace( " " + clazz + " ", " " );
+					if (cur) {
+						j = 0;
+						while ((clazz = classes[j++])) {
+							// Remove *all* instances
+							while (cur.indexOf(" " + clazz + " ") >= 0) {
+								cur = cur.replace(" " + clazz + " ", " ");
+							}
 						}
+						elem.className = value ? jQuery.trim(cur) : "";
 					}
-					elem.className = value ? jQuery.trim( cur ) : "";
 				}
 			}
-		}
 
-		return this;
-	},
+			return this;
+		},
 
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value;
+		toggleClass: function (value, stateVal) {
+			var type = typeof value;
 
-		if ( typeof stateVal === "boolean" && type === "string" ) {
-			return stateVal ? this.addClass( value ) : this.removeClass( value );
-		}
+			if (typeof stateVal === "boolean" && type === "string") {
+				return stateVal ? this.addClass(value) : this.removeClass(value);
+			}
 
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-			});
-		}
+			if (jQuery.isFunction(value)) {
+				return this.each(function (i) {
+					jQuery(this).toggleClass(value.call(this, i, this.className, stateVal), stateVal);
+				});
+			}
 
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					classNames = value.match( core_rnotwhite ) || [];
+			return this.each(function () {
+				if (type === "string") {
+					// toggle individual class names
+					var className,
+						i = 0,
+						self = jQuery(this),
+						classNames = value.match(core_rnotwhite) || [];
 
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space separated list
-					if ( self.hasClass( className ) ) {
-						self.removeClass( className );
-					} else {
-						self.addClass( className );
+					while ((className = classNames[i++])) {
+						// check each className given, space separated list
+						if (self.hasClass(className)) {
+							self.removeClass(className);
+						} else {
+							self.addClass(className);
+						}
 					}
-				}
 
-			// Toggle whole class name
-			} else if ( type === core_strundefined || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery._data( this, "__className__", this.className );
+					// Toggle whole class name
+				} else if (type === core_strundefined || type === "boolean") {
+					if (this.className) {
+						// store className if set
+						jQuery._data(this, "__className__", this.className);
+					}
+
+					// If the element has a class name or if we're passed "false",
+					// then remove the whole classname (if there was one, the above saved it).
+					// Otherwise bring back whatever was previously saved (if anything),
+					// falling back to the empty string if nothing was stored.
+					this.className = this.className || value === false ? "" : jQuery._data(this, "__className__") || "";
 				}
+			});
+		},
 
-				// If the element has a class name or if we're passed "false",
-				// then remove the whole classname (if there was one, the above saved it).
-				// Otherwise bring back whatever was previously saved (if anything),
-				// falling back to the empty string if nothing was stored.
-				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
+		hasClass: function (selector) {
+			var className = " " + selector + " ",
+				i = 0,
+				l = this.length;
+			for (; i < l; i++) {
+				if (this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf(className) >= 0) {
+					return true;
+				}
 			}
-		});
-	},
 
-	hasClass: function( selector ) {
-		var className = " " + selector + " ",
-			i = 0,
-			l = this.length;
-		for ( ; i < l; i++ ) {
-			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
-				return true;
-			}
-		}
+			return false;
+		},
 
-		return false;
-	},
+		val: function (value) {
+			var ret, hooks, isFunction,
+				elem = this[0];
+
+			if (!arguments.length) {
+				if (elem) {
+					hooks = jQuery.valHooks[elem.type] || jQuery.valHooks[elem.nodeName.toLowerCase()];
 
-	val: function( value ) {
-		var ret, hooks, isFunction,
-			elem = this[0];
+					if (hooks && "get" in hooks && (ret = hooks.get(elem, "value")) !== undefined) {
+						return ret;
+					}
 
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
+					ret = elem.value;
 
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
+					return typeof ret === "string" ?
+						// handle most util string cases
+						ret.replace(rreturn, "") :
+						// handle cases where value is null/undef or number
+						ret == null ? "" : ret;
 				}
 
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-					// handle most util string cases
-					ret.replace(rreturn, "") :
-					// handle cases where value is null/undef or number
-					ret == null ? "" : ret;
+				return;
 			}
 
-			return;
-		}
+			isFunction = jQuery.isFunction(value);
 
-		isFunction = jQuery.isFunction( value );
+			return this.each(function (i) {
+				var val;
 
-		return this.each(function( i ) {
-			var val;
+				if (this.nodeType !== 1) {
+					return;
+				}
 
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
+				if (isFunction) {
+					val = value.call(this, i, jQuery(this).val());
+				} else {
+					val = value;
+				}
 
-			if ( isFunction ) {
-				val = value.call( this, i, jQuery( this ).val() );
-			} else {
-				val = value;
-			}
+				// Treat null/undefined as ""; convert numbers to string
+				if (val == null) {
+					val = "";
+				} else if (typeof val === "number") {
+					val += "";
+				} else if (jQuery.isArray(val)) {
+					val = jQuery.map(val, function (value) {
+						return value == null ? "" : value + "";
+					});
+				}
 
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
-				val += "";
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map(val, function ( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
+				hooks = jQuery.valHooks[this.type] || jQuery.valHooks[this.nodeName.toLowerCase()];
 
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
+				// If set returns undefined, fall back to normal setting
+				if (!hooks || !("set" in hooks) || hooks.set(this, val, "value") === undefined) {
+					this.value = val;
+				}
+			});
+		}
+	});
 
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				// Use proper attribute retrieval(#6932, #12072)
-				var val = jQuery.find.attr( elem, "value" );
-				return val != null ?
-					val :
-					elem.text;
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, option,
-					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one" || index < 0,
-					values = one ? null : [],
-					max = one ? index + 1 : options.length,
-					i = index < 0 ?
-						max :
-						one ? index : 0;
-
-				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// oldIE doesn't update selected after form reset (#2551)
-					if ( ( option.selected || i === index ) &&
+	jQuery.extend({
+		valHooks: {
+			option: {
+				get: function (elem) {
+					// Use proper attribute retrieval(#6932, #12072)
+					var val = jQuery.find.attr(elem, "value");
+					return val != null ?
+						val :
+						elem.text;
+				}
+			},
+			select: {
+				get: function (elem) {
+					var value, option,
+						options = elem.options,
+						index = elem.selectedIndex,
+						one = elem.type === "select-one" || index < 0,
+						values = one ? null : [],
+						max = one ? index + 1 : options.length,
+						i = index < 0 ?
+							max :
+							one ? index : 0;
+
+					// Loop through all the selected options
+					for (; i < max; i++) {
+						option = options[i];
+
+						// oldIE doesn't update selected after form reset (#2551)
+						if ((option.selected || i === index) &&
 							// Don't return options that are disabled or in a disabled optgroup
-							( jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null ) &&
-							( !option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
+							(jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
+							(!option.parentNode.disabled || !jQuery.nodeName(option.parentNode, "optgroup"))) {
 
-						// Get the specific value for the option
-						value = jQuery( option ).val();
+							// Get the specific value for the option
+							value = jQuery(option).val();
 
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
+							// We don't need an array for one selects
+							if (one) {
+								return value;
+							}
 
-						// Multi-Selects return an array
-						values.push( value );
+							// Multi-Selects return an array
+							values.push(value);
+						}
 					}
-				}
 
-				return values;
-			},
+					return values;
+				},
 
-			set: function( elem, value ) {
-				var optionSet, option,
-					options = elem.options,
-					values = jQuery.makeArray( value ),
-					i = options.length;
+				set: function (elem, value) {
+					var optionSet, option,
+						options = elem.options,
+						values = jQuery.makeArray(value),
+						i = options.length;
 
-				while ( i-- ) {
-					option = options[ i ];
-					if ( (option.selected = jQuery.inArray( jQuery(option).val(), values ) >= 0) ) {
-						optionSet = true;
+					while (i--) {
+						option = options[i];
+						if ((option.selected = jQuery.inArray(jQuery(option).val(), values) >= 0)) {
+							optionSet = true;
+						}
 					}
-				}
 
-				// force browsers to behave consistently when non-matching value is set
-				if ( !optionSet ) {
-					elem.selectedIndex = -1;
+					// force browsers to behave consistently when non-matching value is set
+					if (!optionSet) {
+						elem.selectedIndex = -1;
+					}
+					return values;
 				}
-				return values;
 			}
-		}
-	},
-
-	attr: function( elem, name, value ) {
-		var hooks, ret,
-			nType = elem.nodeType;
+		},
 
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
+		attr: function (elem, name, value) {
+			var hooks, ret,
+				nType = elem.nodeType;
 
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === core_strundefined ) {
-			return jQuery.prop( elem, name, value );
-		}
+			// don't get/set attributes on text, comment and attribute nodes
+			if (!elem || nType === 3 || nType === 8 || nType === 2) {
+				return;
+			}
 
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] ||
-				( jQuery.expr.match.bool.test( name ) ? boolHook : nodeHook );
-		}
+			// Fallback to prop when attributes are not supported
+			if (typeof elem.getAttribute === core_strundefined) {
+				return jQuery.prop(elem, name, value);
+			}
 
-		if ( value !== undefined ) {
+			// All attributes are lowercase
+			// Grab necessary hook if one is defined
+			if (nType !== 1 || !jQuery.isXMLDoc(elem)) {
+				name = name.toLowerCase();
+				hooks = jQuery.attrHooks[name] ||
+					(jQuery.expr.match.bool.test(name) ? boolHook : nodeHook);
+			}
 
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
+			if (value !== undefined) {
 
-			} else if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
+				if (value === null) {
+					jQuery.removeAttr(elem, name);
 
-			} else {
-				elem.setAttribute( name, value + "" );
-				return value;
-			}
+				} else if (hooks && "set" in hooks && (ret = hooks.set(elem, value, name)) !== undefined) {
+					return ret;
 
-		} else if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-			return ret;
+				} else {
+					elem.setAttribute(name, value + "");
+					return value;
+				}
 
-		} else {
-			ret = jQuery.find.attr( elem, name );
+			} else if (hooks && "get" in hooks && (ret = hooks.get(elem, name)) !== null) {
+				return ret;
 
-			// Non-existent attributes return null, we normalize to undefined
-			return ret == null ?
-				undefined :
-				ret;
-		}
-	},
+			} else {
+				ret = jQuery.find.attr(elem, name);
 
-	removeAttr: function( elem, value ) {
-		var name, propName,
-			i = 0,
-			attrNames = value && value.match( core_rnotwhite );
+				// Non-existent attributes return null, we normalize to undefined
+				return ret == null ?
+					undefined :
+					ret;
+			}
+		},
 
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( (name = attrNames[i++]) ) {
-				propName = jQuery.propFix[ name ] || name;
+		removeAttr: function (elem, value) {
+			var name, propName,
+				i = 0,
+				attrNames = value && value.match(core_rnotwhite);
+
+			if (attrNames && elem.nodeType === 1) {
+				while ((name = attrNames[i++])) {
+					propName = jQuery.propFix[name] || name;
+
+					// Boolean attributes get special treatment (#10870)
+					if (jQuery.expr.match.bool.test(name)) {
+						// Set corresponding property to false
+						if (getSetInput && getSetAttribute || !ruseDefault.test(name)) {
+							elem[propName] = false;
+							// Support: IE<9
+							// Also clear defaultChecked/defaultSelected (if appropriate)
+						} else {
+							elem[jQuery.camelCase("default-" + name)] =
+								elem[propName] = false;
+						}
 
-				// Boolean attributes get special treatment (#10870)
-				if ( jQuery.expr.match.bool.test( name ) ) {
-					// Set corresponding property to false
-					if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-						elem[ propName ] = false;
-					// Support: IE<9
-					// Also clear defaultChecked/defaultSelected (if appropriate)
+						// See #9699 for explanation of this approach (setting first, then removal)
 					} else {
-						elem[ jQuery.camelCase( "default-" + name ) ] =
-							elem[ propName ] = false;
+						jQuery.attr(elem, name, "");
 					}
 
-				// See #9699 for explanation of this approach (setting first, then removal)
-				} else {
-					jQuery.attr( elem, name, "" );
+					elem.removeAttribute(getSetAttribute ? name : propName);
 				}
-
-				elem.removeAttribute( getSetAttribute ? name : propName );
 			}
-		}
-	},
+		},
 
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// Setting the type on a radio button after the value resets the value in IE6-9
-					// Reset value to default in case type is set after value during creation
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
+		attrHooks: {
+			type: {
+				set: function (elem, value) {
+					if (!jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input")) {
+						// Setting the type on a radio button after the value resets the value in IE6-9
+						// Reset value to default in case type is set after value during creation
+						var val = elem.value;
+						elem.setAttribute("type", value);
+						if (val) {
+							elem.value = val;
+						}
+						return value;
 					}
-					return value;
 				}
 			}
-		}
-	},
+		},
 
-	propFix: {
-		"for": "htmlFor",
-		"class": "className"
-	},
+		propFix: {
+			"for": "htmlFor",
+			"class": "className"
+		},
 
-	prop: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
+		prop: function (elem, name, value) {
+			var ret, hooks, notxml,
+				nType = elem.nodeType;
 
-		// don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
+			// don't get/set properties on text, comment and attribute nodes
+			if (!elem || nType === 3 || nType === 8 || nType === 2) {
+				return;
+			}
 
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+			notxml = nType !== 1 || !jQuery.isXMLDoc(elem);
 
-		if ( notxml ) {
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
+			if (notxml) {
+				// Fix name and attach hooks
+				name = jQuery.propFix[name] || name;
+				hooks = jQuery.propHooks[name];
+			}
 
-		if ( value !== undefined ) {
-			return hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ?
-				ret :
-				( elem[ name ] = value );
+			if (value !== undefined) {
+				return hooks && "set" in hooks && (ret = hooks.set(elem, value, name)) !== undefined ?
+					ret :
+					(elem[name] = value);
 
-		} else {
-			return hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ?
-				ret :
-				elem[ name ];
-		}
-	},
+			} else {
+				return hooks && "get" in hooks && (ret = hooks.get(elem, name)) !== null ?
+					ret :
+					elem[name];
+			}
+		},
 
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				// Use proper attribute retrieval(#12072)
-				var tabindex = jQuery.find.attr( elem, "tabindex" );
+		propHooks: {
+			tabIndex: {
+				get: function (elem) {
+					// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+					// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+					// Use proper attribute retrieval(#12072)
+					var tabindex = jQuery.find.attr(elem, "tabindex");
 
-				return tabindex ?
-					parseInt( tabindex, 10 ) :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						-1;
+					return tabindex ?
+						parseInt(tabindex, 10) :
+						rfocusable.test(elem.nodeName) || rclickable.test(elem.nodeName) && elem.href ?
+							0 :
+							-1;
+				}
 			}
 		}
-	}
-});
+	});
 
 // Hooks for boolean attributes
-boolHook = {
-	set: function( elem, value, name ) {
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else if ( getSetInput && getSetAttribute || !ruseDefault.test( name ) ) {
-			// IE<8 needs the *property* name
-			elem.setAttribute( !getSetAttribute && jQuery.propFix[ name ] || name, name );
-
-		// Use defaultChecked and defaultSelected for oldIE
-		} else {
-			elem[ jQuery.camelCase( "default-" + name ) ] = elem[ name ] = true;
-		}
+	boolHook = {
+		set: function (elem, value, name) {
+			if (value === false) {
+				// Remove boolean attributes when set to false
+				jQuery.removeAttr(elem, name);
+			} else if (getSetInput && getSetAttribute || !ruseDefault.test(name)) {
+				// IE<8 needs the *property* name
+				elem.setAttribute(!getSetAttribute && jQuery.propFix[name] || name, name);
+
+				// Use defaultChecked and defaultSelected for oldIE
+			} else {
+				elem[jQuery.camelCase("default-" + name)] = elem[name] = true;
+			}
 
-		return name;
-	}
-};
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
-	var getter = jQuery.expr.attrHandle[ name ] || jQuery.find.attr;
-
-	jQuery.expr.attrHandle[ name ] = getSetInput && getSetAttribute || !ruseDefault.test( name ) ?
-		function( elem, name, isXML ) {
-			var fn = jQuery.expr.attrHandle[ name ],
-				ret = isXML ?
+			return name;
+		}
+	};
+	jQuery.each(jQuery.expr.match.bool.source.match(/\w+/g), function (i, name) {
+		var getter = jQuery.expr.attrHandle[name] || jQuery.find.attr;
+
+		jQuery.expr.attrHandle[name] = getSetInput && getSetAttribute || !ruseDefault.test(name) ?
+			function (elem, name, isXML) {
+				var fn = jQuery.expr.attrHandle[name],
+					ret = isXML ?
+						undefined :
+						/* jshint eqeqeq: false */
+						(jQuery.expr.attrHandle[name] = undefined) !=
+						getter(elem, name, isXML) ?
+
+							name.toLowerCase() :
+							null;
+				jQuery.expr.attrHandle[name] = fn;
+				return ret;
+			} :
+			function (elem, name, isXML) {
+				return isXML ?
 					undefined :
-					/* jshint eqeqeq: false */
-					(jQuery.expr.attrHandle[ name ] = undefined) !=
-						getter( elem, name, isXML ) ?
-
+					elem[jQuery.camelCase("default-" + name)] ?
 						name.toLowerCase() :
 						null;
-			jQuery.expr.attrHandle[ name ] = fn;
-			return ret;
-		} :
-		function( elem, name, isXML ) {
-			return isXML ?
-				undefined :
-				elem[ jQuery.camelCase( "default-" + name ) ] ?
-					name.toLowerCase() :
-					null;
-		};
-});
+			};
+	});
 
 // fix oldIE attroperties
-if ( !getSetInput || !getSetAttribute ) {
-	jQuery.attrHooks.value = {
-		set: function( elem, value, name ) {
-			if ( jQuery.nodeName( elem, "input" ) ) {
-				// Does not return so that setAttribute is also used
-				elem.defaultValue = value;
-			} else {
-				// Use nodeHook if defined (#1954); otherwise setAttribute is fine
-				return nodeHook && nodeHook.set( elem, value, name );
+	if (!getSetInput || !getSetAttribute) {
+		jQuery.attrHooks.value = {
+			set: function (elem, value, name) {
+				if (jQuery.nodeName(elem, "input")) {
+					// Does not return so that setAttribute is also used
+					elem.defaultValue = value;
+				} else {
+					// Use nodeHook if defined (#1954); otherwise setAttribute is fine
+					return nodeHook && nodeHook.set(elem, value, name);
+				}
 			}
-		}
-	};
-}
+		};
+	}
 
 // IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !getSetAttribute ) {
-
-	// Use this for any attribute in IE6/7
-	// This fixes almost every IE6/7 issue
-	nodeHook = {
-		set: function( elem, value, name ) {
-			// Set the existing or create a new attribute node
-			var ret = elem.getAttributeNode( name );
-			if ( !ret ) {
-				elem.setAttributeNode(
-					(ret = elem.ownerDocument.createAttribute( name ))
-				);
-			}
+	if (!getSetAttribute) {
+
+		// Use this for any attribute in IE6/7
+		// This fixes almost every IE6/7 issue
+		nodeHook = {
+			set: function (elem, value, name) {
+				// Set the existing or create a new attribute node
+				var ret = elem.getAttributeNode(name);
+				if (!ret) {
+					elem.setAttributeNode(
+						(ret = elem.ownerDocument.createAttribute(name))
+					);
+				}
 
-			ret.value = value += "";
+				ret.value = value += "";
 
-			// Break association with cloned elements by also using setAttribute (#9646)
-			return name === "value" || value === elem.getAttribute( name ) ?
-				value :
-				undefined;
-		}
-	};
-	jQuery.expr.attrHandle.id = jQuery.expr.attrHandle.name = jQuery.expr.attrHandle.coords =
-		// Some attributes are constructed with empty-string values when not defined
-		function( elem, name, isXML ) {
-			var ret;
-			return isXML ?
-				undefined :
-				(ret = elem.getAttributeNode( name )) && ret.value !== "" ?
+				// Break association with cloned elements by also using setAttribute (#9646)
+				return name === "value" || value === elem.getAttribute(name) ?
+					value :
+					undefined;
+			}
+		};
+		jQuery.expr.attrHandle.id = jQuery.expr.attrHandle.name = jQuery.expr.attrHandle.coords =
+			// Some attributes are constructed with empty-string values when not defined
+			function (elem, name, isXML) {
+				var ret;
+				return isXML ?
+					undefined :
+					(ret = elem.getAttributeNode(name)) && ret.value !== "" ?
+						ret.value :
+						null;
+			};
+		jQuery.valHooks.button = {
+			get: function (elem, name) {
+				var ret = elem.getAttributeNode(name);
+				return ret && ret.specified ?
 					ret.value :
-					null;
+					undefined;
+			},
+			set: nodeHook.set
 		};
-	jQuery.valHooks.button = {
-		get: function( elem, name ) {
-			var ret = elem.getAttributeNode( name );
-			return ret && ret.specified ?
-				ret.value :
-				undefined;
-		},
-		set: nodeHook.set
-	};
-
-	// Set contenteditable to false on removals(#10429)
-	// Setting to empty string throws an error as an invalid value
-	jQuery.attrHooks.contenteditable = {
-		set: function( elem, value, name ) {
-			nodeHook.set( elem, value === "" ? false : value, name );
-		}
-	};
 
-	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
-	// This is for removals
-	jQuery.each([ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = {
-			set: function( elem, value ) {
-				if ( value === "" ) {
-					elem.setAttribute( name, "auto" );
-					return value;
-				}
+		// Set contenteditable to false on removals(#10429)
+		// Setting to empty string throws an error as an invalid value
+		jQuery.attrHooks.contenteditable = {
+			set: function (elem, value, name) {
+				nodeHook.set(elem, value === "" ? false : value, name);
 			}
 		};
-	});
-}
+
+		// Set width and height to auto instead of 0 on empty string( Bug #8150 )
+		// This is for removals
+		jQuery.each(["width", "height"], function (i, name) {
+			jQuery.attrHooks[name] = {
+				set: function (elem, value) {
+					if (value === "") {
+						elem.setAttribute(name, "auto");
+						return value;
+					}
+				}
+			};
+		});
+	}
 
 
 // Some attributes require a special call on IE
 // http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !jQuery.support.hrefNormalized ) {
-	// href/src property should get the full normalized URL (#10299/#12915)
-	jQuery.each([ "href", "src" ], function( i, name ) {
-		jQuery.propHooks[ name ] = {
-			get: function( elem ) {
-				return elem.getAttribute( name, 4 );
+	if (!jQuery.support.hrefNormalized) {
+		// href/src property should get the full normalized URL (#10299/#12915)
+		jQuery.each(["href", "src"], function (i, name) {
+			jQuery.propHooks[name] = {
+				get: function (elem) {
+					return elem.getAttribute(name, 4);
+				}
+			};
+		});
+	}
+
+	if (!jQuery.support.style) {
+		jQuery.attrHooks.style = {
+			get: function (elem) {
+				// Return undefined in the case of empty string
+				// Note: IE uppercases css property names, but if we were to .toLowerCase()
+				// .cssText, that would destroy case senstitivity in URL's, like in "background"
+				return elem.style.cssText || undefined;
+			},
+			set: function (elem, value) {
+				return (elem.style.cssText = value + "");
 			}
 		};
-	});
-}
-
-if ( !jQuery.support.style ) {
-	jQuery.attrHooks.style = {
-		get: function( elem ) {
-			// Return undefined in the case of empty string
-			// Note: IE uppercases css property names, but if we were to .toLowerCase()
-			// .cssText, that would destroy case senstitivity in URL's, like in "background"
-			return elem.style.cssText || undefined;
-		},
-		set: function( elem, value ) {
-			return ( elem.style.cssText = value + "" );
-		}
-	};
-}
+	}
 
 // Safari mis-reports the default selected property of an option
 // Accessing the parent's selectedIndex property fixes it
-if ( !jQuery.support.optSelected ) {
-	jQuery.propHooks.selected = {
-		get: function( elem ) {
-			var parent = elem.parentNode;
+	if (!jQuery.support.optSelected) {
+		jQuery.propHooks.selected = {
+			get: function (elem) {
+				var parent = elem.parentNode;
 
-			if ( parent ) {
-				parent.selectedIndex;
+				if (parent) {
+					parent.selectedIndex;
 
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
+					// Make sure that it also works with optgroups, see #5701
+					if (parent.parentNode) {
+						parent.parentNode.selectedIndex;
+					}
+				}
+				return null;
+			}
+		};
+	}
+
+	jQuery.each([
+		"tabIndex",
+		"readOnly",
+		"maxLength",
+		"cellSpacing",
+		"cellPadding",
+		"rowSpan",
+		"colSpan",
+		"useMap",
+		"frameBorder",
+		"contentEditable"
+	], function () {
+		jQuery.propFix[this.toLowerCase()] = this;
+	});
+
+// IE6/7 call enctype encoding
+	if (!jQuery.support.enctype) {
+		jQuery.propFix.enctype = "encoding";
+	}
+
+// Radios and checkboxes getter/setter
+	jQuery.each(["radio", "checkbox"], function () {
+		jQuery.valHooks[this] = {
+			set: function (elem, value) {
+				if (jQuery.isArray(value)) {
+					return (elem.checked = jQuery.inArray(jQuery(elem).val(), value) >= 0);
 				}
 			}
-			return null;
+		};
+		if (!jQuery.support.checkOn) {
+			jQuery.valHooks[this].get = function (elem) {
+				// Support: Webkit
+				// "" is returned instead of "on" if a value isn't specified
+				return elem.getAttribute("value") === null ? "on" : elem.value;
+			};
 		}
-	};
-}
-
-jQuery.each([
-	"tabIndex",
-	"readOnly",
-	"maxLength",
-	"cellSpacing",
-	"cellPadding",
-	"rowSpan",
-	"colSpan",
-	"useMap",
-	"frameBorder",
-	"contentEditable"
-], function() {
-	jQuery.propFix[ this.toLowerCase() ] = this;
-});
+	});
+	var rformElems = /^(?:input|select|textarea)$/i,
+		rkeyEvent = /^key/,
+		rmouseEvent = /^(?:mouse|contextmenu)|click/,
+		rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
+		rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
 
-// IE6/7 call enctype encoding
-if ( !jQuery.support.enctype ) {
-	jQuery.propFix.enctype = "encoding";
-}
+	function returnTrue() {
+		return true;
+	}
 
-// Radios and checkboxes getter/setter
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-			}
+	function returnFalse() {
+		return false;
+	}
+
+	function safeActiveElement() {
+		try {
+			return document.activeElement;
+		} catch (err) {
 		}
-	};
-	if ( !jQuery.support.checkOn ) {
-		jQuery.valHooks[ this ].get = function( elem ) {
-			// Support: Webkit
-			// "" is returned instead of "on" if a value isn't specified
-			return elem.getAttribute("value") === null ? "on" : elem.value;
-		};
 	}
-});
-var rformElems = /^(?:input|select|textarea)$/i,
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|contextmenu)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
-
-function returnTrue() {
-	return true;
-}
-
-function returnFalse() {
-	return false;
-}
-
-function safeActiveElement() {
-	try {
-		return document.activeElement;
-	} catch ( err ) { }
-}
 
-/*
+	/*
  * Helper functions for managing events -- not part of the public interface.
  * Props to Dean Edwards' addEvent library for many of the ideas.
  */
-jQuery.event = {
-
-	global: {},
-
-	add: function( elem, types, handler, data, selector ) {
-		var tmp, events, t, handleObjIn,
-			special, eventHandle, handleObj,
-			handlers, type, namespaces, origType,
-			elemData = jQuery._data( elem );
-
-		// Don't attach events to noData or text/comment nodes (but allow plain objects)
-		if ( !elemData ) {
-			return;
-		}
+	jQuery.event = {
 
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
+		global: {},
 
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
+		add: function (elem, types, handler, data, selector) {
+			var tmp, events, t, handleObjIn,
+				special, eventHandle, handleObj,
+				handlers, type, namespaces, origType,
+				elemData = jQuery._data(elem);
 
-		// Init the element's event structure and main handler, if this is the first
-		if ( !(events = elemData.events) ) {
-			events = elemData.events = {};
-		}
-		if ( !(eventHandle = elemData.handle) ) {
-			eventHandle = elemData.handle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== core_strundefined && (!e || jQuery.event.triggered !== e.type) ?
-					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
-			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
-			eventHandle.elem = elem;
-		}
+			// Don't attach events to noData or text/comment nodes (but allow plain objects)
+			if (!elemData) {
+				return;
+			}
 
-		// Handle multiple events separated by a space
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
+			// Caller can pass in an object of custom data in lieu of the handler
+			if (handler.handler) {
+				handleObjIn = handler;
+				handler = handleObjIn.handler;
+				selector = handleObjIn.selector;
+			}
 
-			// There *must* be a type, no attaching namespace-only handlers
-			if ( !type ) {
-				continue;
+			// Make sure that the handler has a unique ID, used to find/remove it later
+			if (!handler.guid) {
+				handler.guid = jQuery.guid++;
 			}
 
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
+			// Init the element's event structure and main handler, if this is the first
+			if (!(events = elemData.events)) {
+				events = elemData.events = {};
+			}
+			if (!(eventHandle = elemData.handle)) {
+				eventHandle = elemData.handle = function (e) {
+					// Discard the second event of a jQuery.event.trigger() and
+					// when an event is called after a page has unloaded
+					return typeof jQuery !== core_strundefined && (!e || jQuery.event.triggered !== e.type) ?
+						jQuery.event.dispatch.apply(eventHandle.elem, arguments) :
+						undefined;
+				};
+				// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
+				eventHandle.elem = elem;
+			}
 
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
+			// Handle multiple events separated by a space
+			types = (types || "").match(core_rnotwhite) || [""];
+			t = types.length;
+			while (t--) {
+				tmp = rtypenamespace.exec(types[t]) || [];
+				type = origType = tmp[1];
+				namespaces = (tmp[2] || "").split(".").sort();
 
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
+				// There *must* be a type, no attaching namespace-only handlers
+				if (!type) {
+					continue;
+				}
 
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
-				type: type,
-				origType: origType,
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join(".")
-			}, handleObjIn );
+				// If event changes its type, use the special event handlers for the changed type
+				special = jQuery.event.special[type] || {};
 
-			// Init the event handler queue if we're the first
-			if ( !(handlers = events[ type ]) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
+				// If selector defined, determine special event api type, otherwise given type
+				type = (selector ? special.delegateType : special.bindType) || type;
 
-				// Only use addEventListener/attachEvent if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					// Bind the global event handler to the element
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
+				// Update special based on newly reset type
+				special = jQuery.event.special[type] || {};
 
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
+				// handleObj is passed to all event handlers
+				handleObj = jQuery.extend({
+					type: type,
+					origType: origType,
+					data: data,
+					handler: handler,
+					guid: handler.guid,
+					selector: selector,
+					needsContext: selector && jQuery.expr.match.needsContext.test(selector),
+					namespace: namespaces.join(".")
+				}, handleObjIn);
+
+				// Init the event handler queue if we're the first
+				if (!(handlers = events[type])) {
+					handlers = events[type] = [];
+					handlers.delegateCount = 0;
+
+					// Only use addEventListener/attachEvent if the special events handler returns false
+					if (!special.setup || special.setup.call(elem, data, namespaces, eventHandle) === false) {
+						// Bind the global event handler to the element
+						if (elem.addEventListener) {
+							elem.addEventListener(type, eventHandle, false);
+
+						} else if (elem.attachEvent) {
+							elem.attachEvent("on" + type, eventHandle);
+						}
 					}
 				}
-			}
 
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
+				if (special.add) {
+					special.add.call(elem, handleObj);
 
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
+					if (!handleObj.handler.guid) {
+						handleObj.handler.guid = handler.guid;
+					}
 				}
-			}
 
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
+				// Add to the element's handler list, delegates in front
+				if (selector) {
+					handlers.splice(handlers.delegateCount++, 0, handleObj);
+				} else {
+					handlers.push(handleObj);
+				}
 
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
+				// Keep track of which events have ever been used, for event optimization
+				jQuery.event.global[type] = true;
+			}
 
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
+			// Nullify elem to prevent memory leaks in IE
+			elem = null;
+		},
 
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-		var j, handleObj, tmp,
-			origCount, t, events,
-			special, handlers, type,
-			namespaces, origType,
-			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
+		// Detach an event or set of events from an element
+		remove: function (elem, types, handler, selector, mappedTypes) {
+			var j, handleObj, tmp,
+				origCount, t, events,
+				special, handlers, type,
+				namespaces, origType,
+				elemData = jQuery.hasData(elem) && jQuery._data(elem);
 
-		if ( !elemData || !(events = elemData.events) ) {
-			return;
-		}
+			if (!elemData || !(events = elemData.events)) {
+				return;
+			}
 
-		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( core_rnotwhite ) || [""];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[1];
-			namespaces = ( tmp[2] || "" ).split( "." ).sort();
+			// Once for each type.namespace in types; type may be omitted
+			types = (types || "").match(core_rnotwhite) || [""];
+			t = types.length;
+			while (t--) {
+				tmp = rtypenamespace.exec(types[t]) || [];
+				type = origType = tmp[1];
+				namespaces = (tmp[2] || "").split(".").sort();
 
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
+				// Unbind all events (on this namespace, if provided) for the element
+				if (!type) {
+					for (type in events) {
+						jQuery.event.remove(elem, type + types[t], handler, selector, true);
+					}
+					continue;
 				}
-				continue;
-			}
 
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-			handlers = events[ type ] || [];
-			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
+				special = jQuery.event.special[type] || {};
+				type = (selector ? special.delegateType : special.bindType) || type;
+				handlers = events[type] || [];
+				tmp = tmp[2] && new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)");
 
-			// Remove matching events
-			origCount = j = handlers.length;
-			while ( j-- ) {
-				handleObj = handlers[ j ];
+				// Remove matching events
+				origCount = j = handlers.length;
+				while (j--) {
+					handleObj = handlers[j];
 
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-					handlers.splice( j, 1 );
+					if ((mappedTypes || origType === handleObj.origType) &&
+						(!handler || handler.guid === handleObj.guid) &&
+						(!tmp || tmp.test(handleObj.namespace)) &&
+						(!selector || selector === handleObj.selector || selector === "**" && handleObj.selector)) {
+						handlers.splice(j, 1);
 
-					if ( handleObj.selector ) {
-						handlers.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
+						if (handleObj.selector) {
+							handlers.delegateCount--;
+						}
+						if (special.remove) {
+							special.remove.call(elem, handleObj);
+						}
 					}
 				}
-			}
 
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( origCount && !handlers.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
+				// Remove generic event handler if we removed something and no more handlers exist
+				// (avoids potential for endless recursion during removal of special event handlers)
+				if (origCount && !handlers.length) {
+					if (!special.teardown || special.teardown.call(elem, namespaces, elemData.handle) === false) {
+						jQuery.removeEvent(elem, type, elemData.handle);
+					}
 
-				delete events[ type ];
+					delete events[type];
+				}
 			}
-		}
 
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			delete elemData.handle;
+			// Remove the expando if it's no longer used
+			if (jQuery.isEmptyObject(events)) {
+				delete elemData.handle;
 
-			// removeData also checks for emptiness and clears the expando if empty
-			// so use it instead of delete
-			jQuery._removeData( elem, "events" );
-		}
-	},
+				// removeData also checks for emptiness and clears the expando if empty
+				// so use it instead of delete
+				jQuery._removeData(elem, "events");
+			}
+		},
 
-	trigger: function( event, data, elem, onlyHandlers ) {
-		var handle, ontype, cur,
-			bubbleType, special, tmp, i,
-			eventPath = [ elem || document ],
-			type = core_hasOwn.call( event, "type" ) ? event.type : event,
-			namespaces = core_hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
+		trigger: function (event, data, elem, onlyHandlers) {
+			var handle, ontype, cur,
+				bubbleType, special, tmp, i,
+				eventPath = [elem || document],
+				type = core_hasOwn.call(event, "type") ? event.type : event,
+				namespaces = core_hasOwn.call(event, "namespace") ? event.namespace.split(".") : [];
 
-		cur = tmp = elem = elem || document;
+			cur = tmp = elem = elem || document;
 
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
+			// Don't do events on text and comment nodes
+			if (elem.nodeType === 3 || elem.nodeType === 8) {
+				return;
+			}
 
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
+			// focus/blur morphs to focusin/out; ensure we're not firing them right now
+			if (rfocusMorph.test(type + jQuery.event.triggered)) {
+				return;
+			}
 
-		if ( type.indexOf(".") >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-		ontype = type.indexOf(":") < 0 && "on" + type;
+			if (type.indexOf(".") >= 0) {
+				// Namespaced trigger; create a regexp to match event type in handle()
+				namespaces = type.split(".");
+				type = namespaces.shift();
+				namespaces.sort();
+			}
+			ontype = type.indexOf(":") < 0 && "on" + type;
 
-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
-		event = event[ jQuery.expando ] ?
-			event :
-			new jQuery.Event( type, typeof event === "object" && event );
+			// Caller can pass in a jQuery.Event object, Object, or just an event type string
+			event = event[jQuery.expando] ?
+				event :
+				new jQuery.Event(type, typeof event === "object" && event);
 
-		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
-		event.isTrigger = onlyHandlers ? 2 : 3;
-		event.namespace = namespaces.join(".");
-		event.namespace_re = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
-			null;
+			// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
+			event.isTrigger = onlyHandlers ? 2 : 3;
+			event.namespace = namespaces.join(".");
+			event.namespace_re = event.namespace ?
+				new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)") :
+				null;
 
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
+			// Clean up the event in case it is being reused
+			event.result = undefined;
+			if (!event.target) {
+				event.target = elem;
+			}
 
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data == null ?
-			[ event ] :
-			jQuery.makeArray( data, [ event ] );
+			// Clone any incoming data and prepend the event, creating the handler arg list
+			data = data == null ?
+				[event] :
+				jQuery.makeArray(data, [event]);
 
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
+			// Allow special events to draw outside the lines
+			special = jQuery.event.special[type] || {};
+			if (!onlyHandlers && special.trigger && special.trigger.apply(elem, data) === false) {
+				return;
+			}
 
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
+			// Determine event propagation path in advance, per W3C events spec (#9951)
+			// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
+			if (!onlyHandlers && !special.noBubble && !jQuery.isWindow(elem)) {
 
-			bubbleType = special.delegateType || type;
-			if ( !rfocusMorph.test( bubbleType + type ) ) {
-				cur = cur.parentNode;
-			}
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push( cur );
-				tmp = cur;
-			}
+				bubbleType = special.delegateType || type;
+				if (!rfocusMorph.test(bubbleType + type)) {
+					cur = cur.parentNode;
+				}
+				for (; cur; cur = cur.parentNode) {
+					eventPath.push(cur);
+					tmp = cur;
+				}
 
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === (elem.ownerDocument || document) ) {
-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
+				// Only add window if we got to document (e.g., not plain obj or detached DOM)
+				if (tmp === (elem.ownerDocument || document)) {
+					eventPath.push(tmp.defaultView || tmp.parentWindow || window);
+				}
 			}
-		}
 
-		// Fire handlers on the event path
-		i = 0;
-		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
+			// Fire handlers on the event path
+			i = 0;
+			while ((cur = eventPath[i++]) && !event.isPropagationStopped()) {
 
-			event.type = i > 1 ?
-				bubbleType :
-				special.bindType || type;
+				event.type = i > 1 ?
+					bubbleType :
+					special.bindType || type;
 
-			// jQuery handler
-			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
+				// jQuery handler
+				handle = (jQuery._data(cur, "events") || {})[event.type] && jQuery._data(cur, "handle");
+				if (handle) {
+					handle.apply(cur, data);
+				}
 
-			// Native handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) {
-				event.preventDefault();
+				// Native handler
+				handle = ontype && cur[ontype];
+				if (handle && jQuery.acceptData(cur) && handle.apply && handle.apply(cur, data) === false) {
+					event.preventDefault();
+				}
 			}
-		}
-		event.type = type;
+			event.type = type;
 
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
+			// If nobody prevented the default action, do it now
+			if (!onlyHandlers && !event.isDefaultPrevented()) {
 
-			if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) &&
-				jQuery.acceptData( elem ) ) {
+				if ((!special._default || special._default.apply(eventPath.pop(), data) === false) &&
+					jQuery.acceptData(elem)) {
 
-				// Call a native DOM method on the target with the same name name as the event.
-				// Can't use an .isFunction() check here because IE6/7 fails that test.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) {
+					// Call a native DOM method on the target with the same name name as the event.
+					// Can't use an .isFunction() check here because IE6/7 fails that test.
+					// Don't do default actions on window, that's where global variables be (#6170)
+					if (ontype && elem[type] && !jQuery.isWindow(elem)) {
 
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					tmp = elem[ ontype ];
+						// Don't re-trigger an onFOO event when we call its FOO() method
+						tmp = elem[ontype];
 
-					if ( tmp ) {
-						elem[ ontype ] = null;
-					}
+						if (tmp) {
+							elem[ontype] = null;
+						}
 
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					try {
-						elem[ type ]();
-					} catch ( e ) {
-						// IE<9 dies on focus/blur to hidden element (#1486,#12518)
-						// only reproducible on winXP IE8 native, not IE9 in IE8 mode
-					}
-					jQuery.event.triggered = undefined;
+						// Prevent re-triggering of the same event, since we already bubbled it above
+						jQuery.event.triggered = type;
+						try {
+							elem[type]();
+						} catch (e) {
+							// IE<9 dies on focus/blur to hidden element (#1486,#12518)
+							// only reproducible on winXP IE8 native, not IE9 in IE8 mode
+						}
+						jQuery.event.triggered = undefined;
 
-					if ( tmp ) {
-						elem[ ontype ] = tmp;
+						if (tmp) {
+							elem[ontype] = tmp;
+						}
 					}
 				}
 			}
-		}
 
-		return event.result;
-	},
+			return event.result;
+		},
 
-	dispatch: function( event ) {
+		dispatch: function (event) {
 
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event );
+			// Make a writable jQuery.Event from the native event object
+			event = jQuery.event.fix(event);
 
-		var i, ret, handleObj, matched, j,
-			handlerQueue = [],
-			args = core_slice.call( arguments ),
-			handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
+			var i, ret, handleObj, matched, j,
+				handlerQueue = [],
+				args = core_slice.call(arguments),
+				handlers = (jQuery._data(this, "events") || {})[event.type] || [],
+				special = jQuery.event.special[event.type] || {};
 
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
-		event.delegateTarget = this;
+			// Use the fix-ed jQuery.Event rather than the (read-only) native event
+			args[0] = event;
+			event.delegateTarget = this;
 
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
+			// Call the preDispatch hook for the mapped type, and let it bail if desired
+			if (special.preDispatch && special.preDispatch.call(this, event) === false) {
+				return;
+			}
 
-		// Determine handlers
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
+			// Determine handlers
+			handlerQueue = jQuery.event.handlers.call(this, event, handlers);
 
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
+			// Run delegates first; they may want to stop propagation beneath us
+			i = 0;
+			while ((matched = handlerQueue[i++]) && !event.isPropagationStopped()) {
+				event.currentTarget = matched.elem;
 
-			j = 0;
-			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
+				j = 0;
+				while ((handleObj = matched.handlers[j++]) && !event.isImmediatePropagationStopped()) {
 
-				// Triggered event must either 1) have no namespace, or
-				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
+					// Triggered event must either 1) have no namespace, or
+					// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
+					if (!event.namespace_re || event.namespace_re.test(handleObj.namespace)) {
 
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
+						event.handleObj = handleObj;
+						event.data = handleObj.data;
 
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
+						ret = ((jQuery.event.special[handleObj.origType] || {}).handle || handleObj.handler)
+							.apply(matched.elem, args);
 
-					if ( ret !== undefined ) {
-						if ( (event.result = ret) === false ) {
-							event.preventDefault();
-							event.stopPropagation();
+						if (ret !== undefined) {
+							if ((event.result = ret) === false) {
+								event.preventDefault();
+								event.stopPropagation();
+							}
 						}
 					}
 				}
 			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
 
-	handlers: function( event, handlers ) {
-		var sel, handleObj, matches, i,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
+			// Call the postDispatch hook for the mapped type
+			if (special.postDispatch) {
+				special.postDispatch.call(this, event);
+			}
 
-		// Find delegate handlers
-		// Black-hole SVG <use> instance trees (#13180)
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
+			return event.result;
+		},
 
-			/* jshint eqeqeq: false */
-			for ( ; cur != this; cur = cur.parentNode || this ) {
-				/* jshint eqeqeq: true */
-
-				// Don't check non-elements (#13208)
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click") ) {
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
+		handlers: function (event, handlers) {
+			var sel, handleObj, matches, i,
+				handlerQueue = [],
+				delegateCount = handlers.delegateCount,
+				cur = event.target;
+
+			// Find delegate handlers
+			// Black-hole SVG <use> instance trees (#13180)
+			// Avoid non-left-click bubbling in Firefox (#3861)
+			if (delegateCount && cur.nodeType && (!event.button || event.type !== "click")) {
+
+				/* jshint eqeqeq: false */
+				for (; cur != this; cur = cur.parentNode || this) {
+					/* jshint eqeqeq: true */
+
+					// Don't check non-elements (#13208)
+					// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
+					if (cur.nodeType === 1 && (cur.disabled !== true || event.type !== "click")) {
+						matches = [];
+						for (i = 0; i < delegateCount; i++) {
+							handleObj = handlers[i];
+
+							// Don't conflict with Object.prototype properties (#13203)
+							sel = handleObj.selector + " ";
+
+							if (matches[sel] === undefined) {
+								matches[sel] = handleObj.needsContext ?
+									jQuery(sel, this).index(cur) >= 0 :
+									jQuery.find(sel, this, null, [cur]).length;
+							}
+							if (matches[sel]) {
+								matches.push(handleObj);
+							}
 						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
+						if (matches.length) {
+							handlerQueue.push({elem: cur, handlers: matches});
 						}
 					}
-					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, handlers: matches });
-					}
 				}
 			}
-		}
 
-		// Add the remaining (directly-bound) handlers
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
-		}
+			// Add the remaining (directly-bound) handlers
+			if (delegateCount < handlers.length) {
+				handlerQueue.push({elem: this, handlers: handlers.slice(delegateCount)});
+			}
 
-		return handlerQueue;
-	},
+			return handlerQueue;
+		},
 
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
+		fix: function (event) {
+			if (event[jQuery.expando]) {
+				return event;
+			}
 
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop, copy,
-			type = event.type,
-			originalEvent = event,
-			fixHook = this.fixHooks[ type ];
+			// Create a writable copy of the event object and normalize some properties
+			var i, prop, copy,
+				type = event.type,
+				originalEvent = event,
+				fixHook = this.fixHooks[type];
 
-		if ( !fixHook ) {
-			this.fixHooks[ type ] = fixHook =
-				rmouseEvent.test( type ) ? this.mouseHooks :
-				rkeyEvent.test( type ) ? this.keyHooks :
-				{};
-		}
-		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
+			if (!fixHook) {
+				this.fixHooks[type] = fixHook =
+					rmouseEvent.test(type) ? this.mouseHooks :
+						rkeyEvent.test(type) ? this.keyHooks :
+							{};
+			}
+			copy = fixHook.props ? this.props.concat(fixHook.props) : this.props;
 
-		event = new jQuery.Event( originalEvent );
+			event = new jQuery.Event(originalEvent);
 
-		i = copy.length;
-		while ( i-- ) {
-			prop = copy[ i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
+			i = copy.length;
+			while (i--) {
+				prop = copy[i];
+				event[prop] = originalEvent[prop];
+			}
 
-		// Support: IE<9
-		// Fix target property (#1925)
-		if ( !event.target ) {
-			event.target = originalEvent.srcElement || document;
-		}
+			// Support: IE<9
+			// Fix target property (#1925)
+			if (!event.target) {
+				event.target = originalEvent.srcElement || document;
+			}
 
-		// Support: Chrome 23+, Safari?
-		// Target should not be a text node (#504, #13143)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
+			// Support: Chrome 23+, Safari?
+			// Target should not be a text node (#504, #13143)
+			if (event.target.nodeType === 3) {
+				event.target = event.target.parentNode;
+			}
 
-		// Support: IE<9
-		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
-		event.metaKey = !!event.metaKey;
+			// Support: IE<9
+			// For mouse/key events, metaKey==false if it's undefined (#3368, #11328)
+			event.metaKey = !!event.metaKey;
+
+			return fixHook.filter ? fixHook.filter(event, originalEvent) : event;
+		},
 
-		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-	},
+		// Includes some event props shared by KeyEvent and MouseEvent
+		props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
 
-	// Includes some event props shared by KeyEvent and MouseEvent
-	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
+		fixHooks: {},
 
-	fixHooks: {},
+		keyHooks: {
+			props: "char charCode key keyCode".split(" "),
+			filter: function (event, original) {
 
-	keyHooks: {
-		props: "char charCode key keyCode".split(" "),
-		filter: function( event, original ) {
+				// Add which for key events
+				if (event.which == null) {
+					event.which = original.charCode != null ? original.charCode : original.keyCode;
+				}
 
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
+				return event;
 			}
+		},
 
-			return event;
-		}
-	},
+		mouseHooks: {
+			props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
+			filter: function (event, original) {
+				var body, eventDoc, doc,
+					button = original.button,
+					fromElement = original.fromElement;
 
-	mouseHooks: {
-		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-		filter: function( event, original ) {
-			var body, eventDoc, doc,
-				button = original.button,
-				fromElement = original.fromElement;
+				// Calculate pageX/Y if missing and clientX/Y available
+				if (event.pageX == null && original.clientX != null) {
+					eventDoc = event.target.ownerDocument || document;
+					doc = eventDoc.documentElement;
+					body = eventDoc.body;
 
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
+					event.pageX = original.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
+					event.pageY = original.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc && doc.clientTop || body && body.clientTop || 0);
+				}
 
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
+				// Add relatedTarget, if necessary
+				if (!event.relatedTarget && fromElement) {
+					event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
+				}
 
-			// Add relatedTarget, if necessary
-			if ( !event.relatedTarget && fromElement ) {
-				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
-			}
+				// Add which for click: 1 === left; 2 === middle; 3 === right
+				// Note: button is not normalized, so don't use it
+				if (!event.which && button !== undefined) {
+					event.which = (button & 1 ? 1 : (button & 2 ? 3 : (button & 4 ? 2 : 0)));
+				}
 
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
+				return event;
 			}
-
-			return event;
-		}
-	},
-
-	special: {
-		load: {
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
 		},
-		focus: {
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== safeActiveElement() && this.focus ) {
-					try {
-						this.focus();
+
+		special: {
+			load: {
+				// Prevent triggered image.load events from bubbling to window.load
+				noBubble: true
+			},
+			focus: {
+				// Fire native event if possible so blur/focus sequence is correct
+				trigger: function () {
+					if (this !== safeActiveElement() && this.focus) {
+						try {
+							this.focus();
+							return false;
+						} catch (e) {
+							// Support: IE<9
+							// If we error on focus to hidden element (#1486, #12518),
+							// let .trigger() run the handlers
+						}
+					}
+				},
+				delegateType: "focusin"
+			},
+			blur: {
+				trigger: function () {
+					if (this === safeActiveElement() && this.blur) {
+						this.blur();
 						return false;
-					} catch ( e ) {
-						// Support: IE<9
-						// If we error on focus to hidden element (#1486, #12518),
-						// let .trigger() run the handlers
 					}
-				}
+				},
+				delegateType: "focusout"
 			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === safeActiveElement() && this.blur ) {
-					this.blur();
-					return false;
+			click: {
+				// For checkbox, fire native event so checked state will be right
+				trigger: function () {
+					if (jQuery.nodeName(this, "input") && this.type === "checkbox" && this.click) {
+						this.click();
+						return false;
+					}
+				},
+
+				// For cross-browser consistency, don't fire native .click() on links
+				_default: function (event) {
+					return jQuery.nodeName(event.target, "a");
 				}
 			},
-			delegateType: "focusout"
+
+			beforeunload: {
+				postDispatch: function (event) {
+
+					// Even when returnValue equals to undefined Firefox will still show alert
+					if (event.result !== undefined) {
+						event.originalEvent.returnValue = event.result;
+					}
+				}
+			}
 		},
-		click: {
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) {
-					this.click();
-					return false;
+
+		simulate: function (type, elem, event, bubble) {
+			// Piggyback on a donor event to simulate a different one.
+			// Fake originalEvent to avoid donor's stopPropagation, but if the
+			// simulated event prevents default then we do the same on the donor.
+			var e = jQuery.extend(
+				new jQuery.Event(),
+				event,
+				{
+					type: type,
+					isSimulated: true,
+					originalEvent: {}
 				}
-			},
+			);
+			if (bubble) {
+				jQuery.event.trigger(e, null, elem);
+			} else {
+				jQuery.event.dispatch.call(elem, e);
+			}
+			if (e.isDefaultPrevented()) {
+				event.preventDefault();
+			}
+		}
+	};
 
-			// For cross-browser consistency, don't fire native .click() on links
-			_default: function( event ) {
-				return jQuery.nodeName( event.target, "a" );
+	jQuery.removeEvent = document.removeEventListener ?
+		function (elem, type, handle) {
+			if (elem.removeEventListener) {
+				elem.removeEventListener(type, handle, false);
 			}
-		},
+		} :
+		function (elem, type, handle) {
+			var name = "on" + type;
 
-		beforeunload: {
-			postDispatch: function( event ) {
+			if (elem.detachEvent) {
 
-				// Even when returnValue equals to undefined Firefox will still show alert
-				if ( event.result !== undefined ) {
-					event.originalEvent.returnValue = event.result;
+				// #8545, #7054, preventing memory leaks for custom events in IE6-8
+				// detachEvent needed property on element, by name of that event, to properly expose it to GC
+				if (typeof elem[name] === core_strundefined) {
+					elem[name] = null;
 				}
+
+				elem.detachEvent(name, handle);
 			}
+		};
+
+	jQuery.Event = function (src, props) {
+		// Allow instantiation without the 'new' keyword
+		if (!(this instanceof jQuery.Event)) {
+			return new jQuery.Event(src, props);
 		}
-	},
 
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{
-				type: type,
-				isSimulated: true,
-				originalEvent: {}
-			}
-		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
+		// Event object
+		if (src && src.type) {
+			this.originalEvent = src;
+			this.type = src.type;
+
+			// Events bubbling up the document may have been marked as prevented
+			// by a handler lower down the tree; reflect the correct value.
+			this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false ||
+				src.getPreventDefault && src.getPreventDefault()) ? returnTrue : returnFalse;
+
+			// Event type
 		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
+			this.type = src;
 		}
-	}
-};
 
-jQuery.removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle, false );
+		// Put explicitly provided properties onto the event object
+		if (props) {
+			jQuery.extend(this, props);
 		}
-	} :
-	function( elem, type, handle ) {
-		var name = "on" + type;
 
-		if ( elem.detachEvent ) {
+		// Create a timestamp if incoming event doesn't have one
+		this.timeStamp = src && src.timeStamp || jQuery.now();
+
+		// Mark it as fixed
+		this[jQuery.expando] = true;
+	};
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+	jQuery.Event.prototype = {
+		isDefaultPrevented: returnFalse,
+		isPropagationStopped: returnFalse,
+		isImmediatePropagationStopped: returnFalse,
+
+		preventDefault: function () {
+			var e = this.originalEvent;
+
+			this.isDefaultPrevented = returnTrue;
+			if (!e) {
+				return;
+			}
+
+			// If preventDefault exists, run it on the original event
+			if (e.preventDefault) {
+				e.preventDefault();
+
+				// Support: IE
+				// Otherwise set the returnValue property of the original event to false
+			} else {
+				e.returnValue = false;
+			}
+		},
+		stopPropagation: function () {
+			var e = this.originalEvent;
 
-			// #8545, #7054, preventing memory leaks for custom events in IE6-8
-			// detachEvent needed property on element, by name of that event, to properly expose it to GC
-			if ( typeof elem[ name ] === core_strundefined ) {
-				elem[ name ] = null;
+			this.isPropagationStopped = returnTrue;
+			if (!e) {
+				return;
+			}
+			// If stopPropagation exists, run it on the original event
+			if (e.stopPropagation) {
+				e.stopPropagation();
 			}
 
-			elem.detachEvent( name, handle );
+			// Support: IE
+			// Set the cancelBubble property of the original event to true
+			e.cancelBubble = true;
+		},
+		stopImmediatePropagation: function () {
+			this.isImmediatePropagationStopped = returnTrue;
+			this.stopPropagation();
 		}
 	};
 
-jQuery.Event = function( src, props ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
-		return new jQuery.Event( src, props );
-	}
+// Create mouseenter/leave events using mouseover/out and event-time checks
+	jQuery.each({
+		mouseenter: "mouseover",
+		mouseleave: "mouseout"
+	}, function (orig, fix) {
+		jQuery.event.special[orig] = {
+			delegateType: fix,
+			bindType: fix,
+
+			handle: function (event) {
+				var ret,
+					target = this,
+					related = event.relatedTarget,
+					handleObj = event.handleObj;
+
+				// For mousenter/leave call the handler if related is outside the target.
+				// NB: No relatedTarget if the mouse left/entered the browser window
+				if (!related || (related !== target && !jQuery.contains(target, related))) {
+					event.type = handleObj.origType;
+					ret = handleObj.handler.apply(this, arguments);
+					event.type = fix;
+				}
+				return ret;
+			}
+		};
+	});
 
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
+// IE submit delegation
+	if (!jQuery.support.submitBubbles) {
 
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
-			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
+		jQuery.event.special.submit = {
+			setup: function () {
+				// Only need this for delegated form submit events
+				if (jQuery.nodeName(this, "form")) {
+					return false;
+				}
 
-	// Event type
-	} else {
-		this.type = src;
-	}
+				// Lazy-add a submit handler when a descendant form may potentially be submitted
+				jQuery.event.add(this, "click._submit keypress._submit", function (e) {
+					// Node name check avoids a VML-related crash in IE (#9807)
+					var elem = e.target,
+						form = jQuery.nodeName(elem, "input") || jQuery.nodeName(elem, "button") ? elem.form : undefined;
+					if (form && !jQuery._data(form, "submitBubbles")) {
+						jQuery.event.add(form, "submit._submit", function (event) {
+							event._submit_bubble = true;
+						});
+						jQuery._data(form, "submitBubbles", true);
+					}
+				});
+				// return undefined since we don't need an event listener
+			},
+
+			postDispatch: function (event) {
+				// If form was submitted by the user, bubble the event up the tree
+				if (event._submit_bubble) {
+					delete event._submit_bubble;
+					if (this.parentNode && !event.isTrigger) {
+						jQuery.event.simulate("submit", this.parentNode, event, true);
+					}
+				}
+			},
 
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
+			teardown: function () {
+				// Only need this for delegated form submit events
+				if (jQuery.nodeName(this, "form")) {
+					return false;
+				}
+
+				// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
+				jQuery.event.remove(this, "._submit");
+			}
+		};
 	}
 
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
+// IE change delegation and checkbox/radio fix
+	if (!jQuery.support.changeBubbles) {
 
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
+		jQuery.event.special.change = {
 
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
+			setup: function () {
 
-	preventDefault: function() {
-		var e = this.originalEvent;
+				if (rformElems.test(this.nodeName)) {
+					// IE doesn't fire change on a check/radio until blur; trigger it on click
+					// after a propertychange. Eat the blur-change in special.change.handle.
+					// This still fires onchange a second time for check/radio after blur.
+					if (this.type === "checkbox" || this.type === "radio") {
+						jQuery.event.add(this, "propertychange._change", function (event) {
+							if (event.originalEvent.propertyName === "checked") {
+								this._just_changed = true;
+							}
+						});
+						jQuery.event.add(this, "click._change", function (event) {
+							if (this._just_changed && !event.isTrigger) {
+								this._just_changed = false;
+							}
+							// Allow triggered, simulated change events (#11500)
+							jQuery.event.simulate("change", this, event, true);
+						});
+					}
+					return false;
+				}
+				// Delegated event; lazy-add a change handler on descendant inputs
+				jQuery.event.add(this, "beforeactivate._change", function (e) {
+					var elem = e.target;
+
+					if (rformElems.test(elem.nodeName) && !jQuery._data(elem, "changeBubbles")) {
+						jQuery.event.add(elem, "change._change", function (event) {
+							if (this.parentNode && !event.isSimulated && !event.isTrigger) {
+								jQuery.event.simulate("change", this.parentNode, event, true);
+							}
+						});
+						jQuery._data(elem, "changeBubbles", true);
+					}
+				});
+			},
+
+			handle: function (event) {
+				var elem = event.target;
+
+				// Swallow native change events from checkbox/radio, we already triggered them above
+				if (this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox")) {
+					return event.handleObj.handler.apply(this, arguments);
+				}
+			},
 
-		this.isDefaultPrevented = returnTrue;
-		if ( !e ) {
-			return;
-		}
+			teardown: function () {
+				jQuery.event.remove(this, "._change");
 
-		// If preventDefault exists, run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
+				return !rformElems.test(this.nodeName);
+			}
+		};
+	}
 
-		// Support: IE
-		// Otherwise set the returnValue property of the original event to false
-		} else {
-			e.returnValue = false;
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
+// Create "bubbling" focus and blur events
+	if (!jQuery.support.focusinBubbles) {
+		jQuery.each({focus: "focusin", blur: "focusout"}, function (orig, fix) {
 
-		this.isPropagationStopped = returnTrue;
-		if ( !e ) {
-			return;
-		}
-		// If stopPropagation exists, run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
+			// Attach a single capturing handler while someone wants focusin/focusout
+			var attaches = 0,
+				handler = function (event) {
+					jQuery.event.simulate(fix, event.target, jQuery.event.fix(event), true);
+				};
 
-		// Support: IE
-		// Set the cancelBubble property of the original event to true
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		this.isImmediatePropagationStopped = returnTrue;
-		this.stopPropagation();
+			jQuery.event.special[fix] = {
+				setup: function () {
+					if (attaches++ === 0) {
+						document.addEventListener(orig, handler, true);
+					}
+				},
+				teardown: function () {
+					if (--attaches === 0) {
+						document.removeEventListener(orig, handler, true);
+					}
+				}
+			};
+		});
 	}
-};
 
-// Create mouseenter/leave events using mouseover/out and event-time checks
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// For mousenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-});
+	jQuery.fn.extend({
 
-// IE submit delegation
-if ( !jQuery.support.submitBubbles ) {
+		on: function (types, selector, data, fn, /*INTERNAL*/ one) {
+			var type, origFn;
 
-	jQuery.event.special.submit = {
-		setup: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
+			// Types can be a map of types/handlers
+			if (typeof types === "object") {
+				// ( types-Object, selector, data )
+				if (typeof selector !== "string") {
+					// ( types-Object, data )
+					data = data || selector;
+					selector = undefined;
+				}
+				for (type in types) {
+					this.on(type, selector, data, types[type], one);
+				}
+				return this;
 			}
 
-			// Lazy-add a submit handler when a descendant form may potentially be submitted
-			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
-				// Node name check avoids a VML-related crash in IE (#9807)
-				var elem = e.target,
-					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
-				if ( form && !jQuery._data( form, "submitBubbles" ) ) {
-					jQuery.event.add( form, "submit._submit", function( event ) {
-						event._submit_bubble = true;
-					});
-					jQuery._data( form, "submitBubbles", true );
+			if (data == null && fn == null) {
+				// ( types, fn )
+				fn = selector;
+				data = selector = undefined;
+			} else if (fn == null) {
+				if (typeof selector === "string") {
+					// ( types, selector, fn )
+					fn = data;
+					data = undefined;
+				} else {
+					// ( types, data, fn )
+					fn = data;
+					data = selector;
+					selector = undefined;
 				}
+			}
+			if (fn === false) {
+				fn = returnFalse;
+			} else if (!fn) {
+				return this;
+			}
+
+			if (one === 1) {
+				origFn = fn;
+				fn = function (event) {
+					// Can use an empty set, since event contains the info
+					jQuery().off(event);
+					return origFn.apply(this, arguments);
+				};
+				// Use same guid so caller can remove using origFn
+				fn.guid = origFn.guid || (origFn.guid = jQuery.guid++);
+			}
+			return this.each(function () {
+				jQuery.event.add(this, types, fn, data, selector);
 			});
-			// return undefined since we don't need an event listener
 		},
-
-		postDispatch: function( event ) {
-			// If form was submitted by the user, bubble the event up the tree
-			if ( event._submit_bubble ) {
-				delete event._submit_bubble;
-				if ( this.parentNode && !event.isTrigger ) {
-					jQuery.event.simulate( "submit", this.parentNode, event, true );
+		one: function (types, selector, data, fn) {
+			return this.on(types, selector, data, fn, 1);
+		},
+		off: function (types, selector, fn) {
+			var handleObj, type;
+			if (types && types.preventDefault && types.handleObj) {
+				// ( event )  dispatched jQuery.Event
+				handleObj = types.handleObj;
+				jQuery(types.delegateTarget).off(
+					handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
+					handleObj.selector,
+					handleObj.handler
+				);
+				return this;
+			}
+			if (typeof types === "object") {
+				// ( types-object [, selector] )
+				for (type in types) {
+					this.off(type, selector, types[type]);
 				}
+				return this;
+			}
+			if (selector === false || typeof selector === "function") {
+				// ( types [, fn] )
+				fn = selector;
+				selector = undefined;
+			}
+			if (fn === false) {
+				fn = returnFalse;
 			}
+			return this.each(function () {
+				jQuery.event.remove(this, types, fn, selector);
+			});
 		},
 
-		teardown: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
+		trigger: function (type, data) {
+			return this.each(function () {
+				jQuery.event.trigger(type, data, this);
+			});
+		},
+		triggerHandler: function (type, data) {
+			var elem = this[0];
+			if (elem) {
+				return jQuery.event.trigger(type, data, elem, true);
 			}
-
-			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
-			jQuery.event.remove( this, "._submit" );
 		}
-	};
-}
+	});
+	var isSimple = /^.[^:#\[\.,]*$/,
+		rparentsprev = /^(?:parents|prev(?:Until|All))/,
+		rneedsContext = jQuery.expr.match.needsContext,
+		// methods guaranteed to produce a unique set when starting from a unique set
+		guaranteedUnique = {
+			children: true,
+			contents: true,
+			next: true,
+			prev: true
+		};
 
-// IE change delegation and checkbox/radio fix
-if ( !jQuery.support.changeBubbles ) {
+	jQuery.fn.extend({
+		find: function (selector) {
+			var i,
+				ret = [],
+				self = this,
+				len = self.length;
+
+			if (typeof selector !== "string") {
+				return this.pushStack(jQuery(selector).filter(function () {
+					for (i = 0; i < len; i++) {
+						if (jQuery.contains(self[i], this)) {
+							return true;
+						}
+					}
+				}));
+			}
 
-	jQuery.event.special.change = {
+			for (i = 0; i < len; i++) {
+				jQuery.find(selector, self[i], ret);
+			}
 
-		setup: function() {
+			// Needed because $( selector, context ) becomes $( context ).find( selector )
+			ret = this.pushStack(len > 1 ? jQuery.unique(ret) : ret);
+			ret.selector = this.selector ? this.selector + " " + selector : selector;
+			return ret;
+		},
 
-			if ( rformElems.test( this.nodeName ) ) {
-				// IE doesn't fire change on a check/radio until blur; trigger it on click
-				// after a propertychange. Eat the blur-change in special.change.handle.
-				// This still fires onchange a second time for check/radio after blur.
-				if ( this.type === "checkbox" || this.type === "radio" ) {
-					jQuery.event.add( this, "propertychange._change", function( event ) {
-						if ( event.originalEvent.propertyName === "checked" ) {
-							this._just_changed = true;
-						}
-					});
-					jQuery.event.add( this, "click._change", function( event ) {
-						if ( this._just_changed && !event.isTrigger ) {
-							this._just_changed = false;
-						}
-						// Allow triggered, simulated change events (#11500)
-						jQuery.event.simulate( "change", this, event, true );
-					});
-				}
-				return false;
-			}
-			// Delegated event; lazy-add a change handler on descendant inputs
-			jQuery.event.add( this, "beforeactivate._change", function( e ) {
-				var elem = e.target;
+		has: function (target) {
+			var i,
+				targets = jQuery(target, this),
+				len = targets.length;
 
-				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "changeBubbles" ) ) {
-					jQuery.event.add( elem, "change._change", function( event ) {
-						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
-							jQuery.event.simulate( "change", this.parentNode, event, true );
-						}
-					});
-					jQuery._data( elem, "changeBubbles", true );
+			return this.filter(function () {
+				for (i = 0; i < len; i++) {
+					if (jQuery.contains(this, targets[i])) {
+						return true;
+					}
 				}
 			});
 		},
 
-		handle: function( event ) {
-			var elem = event.target;
+		not: function (selector) {
+			return this.pushStack(winnow(this, selector || [], true));
+		},
 
-			// Swallow native change events from checkbox/radio, we already triggered them above
-			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
-				return event.handleObj.handler.apply( this, arguments );
-			}
+		filter: function (selector) {
+			return this.pushStack(winnow(this, selector || [], false));
 		},
 
-		teardown: function() {
-			jQuery.event.remove( this, "._change" );
+		is: function (selector) {
+			return !!winnow(
+				this,
+
+				// If this is a positional/relative selector, check membership in the returned set
+				// so $("p:first").is("p:last") won't return true for a doc with two "p".
+				typeof selector === "string" && rneedsContext.test(selector) ?
+					jQuery(selector) :
+					selector || [],
+				false
+			).length;
+		},
 
-			return !rformElems.test( this.nodeName );
-		}
-	};
-}
+		closest: function (selectors, context) {
+			var cur,
+				i = 0,
+				l = this.length,
+				ret = [],
+				pos = rneedsContext.test(selectors) || typeof selectors !== "string" ?
+					jQuery(selectors, context || this.context) :
+					0;
 
-// Create "bubbling" focus and blur events
-if ( !jQuery.support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+			for (; i < l; i++) {
+				for (cur = this[i]; cur && cur !== context; cur = cur.parentNode) {
+					// Always skip document fragments
+					if (cur.nodeType < 11 && (pos ?
+						pos.index(cur) > -1 :
 
-		// Attach a single capturing handler while someone wants focusin/focusout
-		var attaches = 0,
-			handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
+						// Don't pass non-elements to Sizzle
+						cur.nodeType === 1 &&
+						jQuery.find.matchesSelector(cur, selectors))) {
 
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				if ( attaches++ === 0 ) {
-					document.addEventListener( orig, handler, true );
-				}
-			},
-			teardown: function() {
-				if ( --attaches === 0 ) {
-					document.removeEventListener( orig, handler, true );
+						cur = ret.push(cur);
+						break;
+					}
 				}
 			}
-		};
-	});
-}
 
-jQuery.fn.extend({
+			return this.pushStack(ret.length > 1 ? jQuery.unique(ret) : ret);
+		},
 
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var type, origFn;
+		// Determine the position of an element within
+		// the matched set of elements
+		index: function (elem) {
 
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) {
-				// ( types-Object, data )
-				data = data || selector;
-				selector = undefined;
+			// No argument, return index in parent
+			if (!elem) {
+				return (this[0] && this[0].parentNode) ? this.first().prevAll().length : -1;
 			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
-			}
-			return this;
-		}
 
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
-				selector = undefined;
+			// index in selector
+			if (typeof elem === "string") {
+				return jQuery.inArray(this[0], jQuery(elem));
 			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
 
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
-	},
-	one: function( types, selector, data, fn ) {
-		return this.on( types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each(function() {
-			jQuery.event.remove( this, types, fn, selector );
-		});
-	},
+			// Locate the position of the desired element
+			return jQuery.inArray(
+				// If it receives a jQuery object, the first element is used
+				elem.jquery ? elem[0] : elem, this);
+		},
 
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-	triggerHandler: function( type, data ) {
-		var elem = this[0];
-		if ( elem ) {
-			return jQuery.event.trigger( type, data, elem, true );
-		}
-	}
-});
-var isSimple = /^.[^:#\[\.,]*$/,
-	rparentsprev = /^(?:parents|prev(?:Until|All))/,
-	rneedsContext = jQuery.expr.match.needsContext,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
+		add: function (selector, context) {
+			var set = typeof selector === "string" ?
+					jQuery(selector, context) :
+					jQuery.makeArray(selector && selector.nodeType ? [selector] : selector),
+				all = jQuery.merge(this.get(), set);
 
-jQuery.fn.extend({
-	find: function( selector ) {
-		var i,
-			ret = [],
-			self = this,
-			len = self.length;
+			return this.pushStack(jQuery.unique(all));
+		},
 
-		if ( typeof selector !== "string" ) {
-			return this.pushStack( jQuery( selector ).filter(function() {
-				for ( i = 0; i < len; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			}) );
+		addBack: function (selector) {
+			return this.add(selector == null ?
+				this.prevObject : this.prevObject.filter(selector)
+			);
 		}
+	});
 
-		for ( i = 0; i < len; i++ ) {
-			jQuery.find( selector, self[ i ], ret );
-		}
+	function sibling(cur, dir) {
+		do {
+			cur = cur[dir];
+		} while (cur && cur.nodeType !== 1);
 
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-		ret.selector = this.selector ? this.selector + " " + selector : selector;
-		return ret;
-	},
+		return cur;
+	}
 
-	has: function( target ) {
-		var i,
-			targets = jQuery( target, this ),
-			len = targets.length;
+	jQuery.each({
+		parent: function (elem) {
+			var parent = elem.parentNode;
+			return parent && parent.nodeType !== 11 ? parent : null;
+		},
+		parents: function (elem) {
+			return jQuery.dir(elem, "parentNode");
+		},
+		parentsUntil: function (elem, i, until) {
+			return jQuery.dir(elem, "parentNode", until);
+		},
+		next: function (elem) {
+			return sibling(elem, "nextSibling");
+		},
+		prev: function (elem) {
+			return sibling(elem, "previousSibling");
+		},
+		nextAll: function (elem) {
+			return jQuery.dir(elem, "nextSibling");
+		},
+		prevAll: function (elem) {
+			return jQuery.dir(elem, "previousSibling");
+		},
+		nextUntil: function (elem, i, until) {
+			return jQuery.dir(elem, "nextSibling", until);
+		},
+		prevUntil: function (elem, i, until) {
+			return jQuery.dir(elem, "previousSibling", until);
+		},
+		siblings: function (elem) {
+			return jQuery.sibling((elem.parentNode || {}).firstChild, elem);
+		},
+		children: function (elem) {
+			return jQuery.sibling(elem.firstChild);
+		},
+		contents: function (elem) {
+			return jQuery.nodeName(elem, "iframe") ?
+				elem.contentDocument || elem.contentWindow.document :
+				jQuery.merge([], elem.childNodes);
+		}
+	}, function (name, fn) {
+		jQuery.fn[name] = function (until, selector) {
+			var ret = jQuery.map(this, fn, until);
 
-		return this.filter(function() {
-			for ( i = 0; i < len; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
+			if (name.slice(-5) !== "Until") {
+				selector = until;
 			}
-		});
-	},
-
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], true) );
-	},
-
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector || [], false) );
-	},
-
-	is: function( selector ) {
-		return !!winnow(
-			this,
-
-			// If this is a positional/relative selector, check membership in the returned set
-			// so $("p:first").is("p:last") won't return true for a doc with two "p".
-			typeof selector === "string" && rneedsContext.test( selector ) ?
-				jQuery( selector ) :
-				selector || [],
-			false
-		).length;
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			ret = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) {
-				// Always skip document fragments
-				if ( cur.nodeType < 11 && (pos ?
-					pos.index(cur) > -1 :
-
-					// Don't pass non-elements to Sizzle
-					cur.nodeType === 1 &&
-						jQuery.find.matchesSelector(cur, selectors)) ) {
-
-					cur = ret.push( cur );
-					break;
-				}
-			}
-		}
 
-		return this.pushStack( ret.length > 1 ? jQuery.unique( ret ) : ret );
-	},
+			if (selector && typeof selector === "string") {
+				ret = jQuery.filter(selector, ret);
+			}
 
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
+			if (this.length > 1) {
+				// Remove duplicates
+				if (!guaranteedUnique[name]) {
+					ret = jQuery.unique(ret);
+				}
 
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[0] && this[0].parentNode ) ? this.first().prevAll().length : -1;
-		}
+				// Reverse order for parents* and prev-derivatives
+				if (rparentsprev.test(name)) {
+					ret = ret.reverse();
+				}
+			}
 
-		// index in selector
-		if ( typeof elem === "string" ) {
-			return jQuery.inArray( this[0], jQuery( elem ) );
-		}
+			return this.pushStack(ret);
+		};
+	});
 
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
+	jQuery.extend({
+		filter: function (expr, elems, not) {
+			var elem = elems[0];
 
-	add: function( selector, context ) {
-		var set = typeof selector === "string" ?
-				jQuery( selector, context ) :
-				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
-			all = jQuery.merge( this.get(), set );
+			if (not) {
+				expr = ":not(" + expr + ")";
+			}
 
-		return this.pushStack( jQuery.unique(all) );
-	},
+			return elems.length === 1 && elem.nodeType === 1 ?
+				jQuery.find.matchesSelector(elem, expr) ? [elem] : [] :
+				jQuery.find.matches(expr, jQuery.grep(elems, function (elem) {
+					return elem.nodeType === 1;
+				}));
+		},
 
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter(selector)
-		);
-	}
-});
-
-function sibling( cur, dir ) {
-	do {
-		cur = cur[ dir ];
-	} while ( cur && cur.nodeType !== 1 );
-
-	return cur;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
+		dir: function (elem, dir, until) {
+			var matched = [],
+				cur = elem[dir];
 
-		if ( name.slice( -5 ) !== "Until" ) {
-			selector = until;
-		}
+			while (cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery(cur).is(until))) {
+				if (cur.nodeType === 1) {
+					matched.push(cur);
+				}
+				cur = cur[dir];
+			}
+			return matched;
+		},
 
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
+		sibling: function (n, elem) {
+			var r = [];
 
-		if ( this.length > 1 ) {
-			// Remove duplicates
-			if ( !guaranteedUnique[ name ] ) {
-				ret = jQuery.unique( ret );
+			for (; n; n = n.nextSibling) {
+				if (n.nodeType === 1 && n !== elem) {
+					r.push(n);
+				}
 			}
 
-			// Reverse order for parents* and prev-derivatives
-			if ( rparentsprev.test( name ) ) {
-				ret = ret.reverse();
-			}
+			return r;
 		}
+	});
 
-		return this.pushStack( ret );
-	};
-});
-
-jQuery.extend({
-	filter: function( expr, elems, not ) {
-		var elem = elems[ 0 ];
+// Implement the identical functionality for filter and not
+	function winnow(elements, qualifier, not) {
+		if (jQuery.isFunction(qualifier)) {
+			return jQuery.grep(elements, function (elem, i) {
+				/* jshint -W018 */
+				return !!qualifier.call(elem, i, elem) !== not;
+			});
 
-		if ( not ) {
-			expr = ":not(" + expr + ")";
 		}
 
-		return elems.length === 1 && elem.nodeType === 1 ?
-			jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
-			jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-				return elem.nodeType === 1;
-			}));
-	},
-
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			cur = elem[ dir ];
+		if (qualifier.nodeType) {
+			return jQuery.grep(elements, function (elem) {
+				return (elem === qualifier) !== not;
+			});
 
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			if ( cur.nodeType === 1 ) {
-				matched.push( cur );
-			}
-			cur = cur[dir];
 		}
-		return matched;
-	},
 
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				r.push( n );
+		if (typeof qualifier === "string") {
+			if (isSimple.test(qualifier)) {
+				return jQuery.filter(qualifier, elements, not);
 			}
-		}
 
-		return r;
-	}
-});
+			qualifier = jQuery.filter(qualifier, elements);
+		}
 
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, not ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep( elements, function( elem, i ) {
-			/* jshint -W018 */
-			return !!qualifier.call( elem, i, elem ) !== not;
+		return jQuery.grep(elements, function (elem) {
+			return (jQuery.inArray(elem, qualifier) >= 0) !== not;
 		});
-
 	}
 
-	if ( qualifier.nodeType ) {
-		return jQuery.grep( elements, function( elem ) {
-			return ( elem === qualifier ) !== not;
-		});
-
-	}
+	function createSafeFragment(document) {
+		var list = nodeNames.split("|"),
+			safeFrag = document.createDocumentFragment();
 
-	if ( typeof qualifier === "string" ) {
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter( qualifier, elements, not );
+		if (safeFrag.createElement) {
+			while (list.length) {
+				safeFrag.createElement(
+					list.pop()
+				);
+			}
 		}
+		return safeFrag;
+	}
+
+	var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
+			"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
+		rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
+		rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
+		rleadingWhitespace = /^\s+/,
+		rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
+		rtagName = /<([\w:]+)/,
+		rtbody = /<tbody/i,
+		rhtml = /<|&#?\w+;/,
+		rnoInnerhtml = /<(?:script|style|link)/i,
+		manipulation_rcheckableType = /^(?:checkbox|radio)$/i,
+		// checked="checked" or checked
+		rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+		rscriptType = /^$|\/(?:java|ecma)script/i,
+		rscriptTypeMasked = /^true\/(.*)/,
+		rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
+
+		// We have to close these tags to support XHTML (#13200)
+		wrapMap = {
+			option: [1, "<select multiple='multiple'>", "</select>"],
+			legend: [1, "<fieldset>", "</fieldset>"],
+			area: [1, "<map>", "</map>"],
+			param: [1, "<object>", "</object>"],
+			thead: [1, "<table>", "</table>"],
+			tr: [2, "<table><tbody>", "</tbody></table>"],
+			col: [2, "<table><tbody></tbody><colgroup>", "</colgroup></table>"],
+			td: [3, "<table><tbody><tr>", "</tr></tbody></table>"],
+
+			// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
+			// unless wrapped in a div with non-breaking characters in front of it.
+			_default: jQuery.support.htmlSerialize ? [0, "", ""] : [1, "X<div>", "</div>"]
+		},
+		safeFragment = createSafeFragment(document),
+		fragmentDiv = safeFragment.appendChild(document.createElement("div"));
 
-		qualifier = jQuery.filter( qualifier, elements );
-	}
+	wrapMap.optgroup = wrapMap.option;
+	wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+	wrapMap.th = wrapMap.td;
 
-	return jQuery.grep( elements, function( elem ) {
-		return ( jQuery.inArray( elem, qualifier ) >= 0 ) !== not;
-	});
-}
-function createSafeFragment( document ) {
-	var list = nodeNames.split( "|" ),
-		safeFrag = document.createDocumentFragment();
-
-	if ( safeFrag.createElement ) {
-		while ( list.length ) {
-			safeFrag.createElement(
-				list.pop()
-			);
-		}
-	}
-	return safeFrag;
-}
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
-		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
-	rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
-	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-	rtagName = /<([\w:]+)/,
-	rtbody = /<tbody/i,
-	rhtml = /<|&#?\w+;/,
-	rnoInnerhtml = /<(?:script|style|link)/i,
-	manipulation_rcheckableType = /^(?:checkbox|radio)$/i,
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /^$|\/(?:java|ecma)script/i,
-	rscriptTypeMasked = /^true\/(.*)/,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,
-
-	// We have to close these tags to support XHTML (#13200)
-	wrapMap = {
-		option: [ 1, "<select multiple='multiple'>", "</select>" ],
-		legend: [ 1, "<fieldset>", "</fieldset>" ],
-		area: [ 1, "<map>", "</map>" ],
-		param: [ 1, "<object>", "</object>" ],
-		thead: [ 1, "<table>", "</table>" ],
-		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-
-		// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
-		// unless wrapped in a div with non-breaking characters in front of it.
-		_default: jQuery.support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X<div>", "</div>"  ]
-	},
-	safeFragment = createSafeFragment( document ),
-	fragmentDiv = safeFragment.appendChild( document.createElement("div") );
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-jQuery.fn.extend({
-	text: function( value ) {
-		return jQuery.access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
-		}, null, value, arguments.length );
-	},
-
-	append: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.appendChild( elem );
-			}
-		});
-	},
+	jQuery.fn.extend({
+		text: function (value) {
+			return jQuery.access(this, function (value) {
+				return value === undefined ?
+					jQuery.text(this) :
+					this.empty().append((this[0] && this[0].ownerDocument || document).createTextNode(value));
+			}, null, value, arguments.length);
+		},
 
-	prepend: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.insertBefore( elem, target.firstChild );
-			}
-		});
-	},
+		append: function () {
+			return this.domManip(arguments, function (elem) {
+				if (this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9) {
+					var target = manipulationTarget(this, elem);
+					target.appendChild(elem);
+				}
+			});
+		},
 
-	before: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		});
-	},
+		prepend: function () {
+			return this.domManip(arguments, function (elem) {
+				if (this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9) {
+					var target = manipulationTarget(this, elem);
+					target.insertBefore(elem, target.firstChild);
+				}
+			});
+		},
 
-	after: function() {
-		return this.domManip( arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		});
-	},
+		before: function () {
+			return this.domManip(arguments, function (elem) {
+				if (this.parentNode) {
+					this.parentNode.insertBefore(elem, this);
+				}
+			});
+		},
 
-	// keepData is for internal use only--do not document
-	remove: function( selector, keepData ) {
-		var elem,
-			elems = selector ? jQuery.filter( selector, this ) : this,
-			i = 0;
+		after: function () {
+			return this.domManip(arguments, function (elem) {
+				if (this.parentNode) {
+					this.parentNode.insertBefore(elem, this.nextSibling);
+				}
+			});
+		},
 
-		for ( ; (elem = elems[i]) != null; i++ ) {
+		// keepData is for internal use only--do not document
+		remove: function (selector, keepData) {
+			var elem,
+				elems = selector ? jQuery.filter(selector, this) : this,
+				i = 0;
 
-			if ( !keepData && elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem ) );
-			}
+			for (; (elem = elems[i]) != null; i++) {
 
-			if ( elem.parentNode ) {
-				if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) {
-					setGlobalEval( getAll( elem, "script" ) );
+				if (!keepData && elem.nodeType === 1) {
+					jQuery.cleanData(getAll(elem));
+				}
+
+				if (elem.parentNode) {
+					if (keepData && jQuery.contains(elem.ownerDocument, elem)) {
+						setGlobalEval(getAll(elem, "script"));
+					}
+					elem.parentNode.removeChild(elem);
 				}
-				elem.parentNode.removeChild( elem );
 			}
-		}
 
-		return this;
-	},
+			return this;
+		},
 
-	empty: function() {
-		var elem,
-			i = 0;
+		empty: function () {
+			var elem,
+				i = 0;
 
-		for ( ; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( getAll( elem, false ) );
-			}
+			for (; (elem = this[i]) != null; i++) {
+				// Remove element nodes and prevent memory leaks
+				if (elem.nodeType === 1) {
+					jQuery.cleanData(getAll(elem, false));
+				}
 
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
+				// Remove any remaining nodes
+				while (elem.firstChild) {
+					elem.removeChild(elem.firstChild);
+				}
 
-			// If this is a select, ensure that it displays empty (#12336)
-			// Support: IE<9
-			if ( elem.options && jQuery.nodeName( elem, "select" ) ) {
-				elem.options.length = 0;
+				// If this is a select, ensure that it displays empty (#12336)
+				// Support: IE<9
+				if (elem.options && jQuery.nodeName(elem, "select")) {
+					elem.options.length = 0;
+				}
 			}
-		}
 
-		return this;
-	},
+			return this;
+		},
 
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+		clone: function (dataAndEvents, deepDataAndEvents) {
+			dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+			deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
 
-		return this.map( function () {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
+			return this.map(function () {
+				return jQuery.clone(this, dataAndEvents, deepDataAndEvents);
+			});
+		},
 
-	html: function( value ) {
-		return jQuery.access( this, function( value ) {
-			var elem = this[0] || {},
-				i = 0,
-				l = this.length;
+		html: function (value) {
+			return jQuery.access(this, function (value) {
+				var elem = this[0] || {},
+					i = 0,
+					l = this.length;
 
-			if ( value === undefined ) {
-				return elem.nodeType === 1 ?
-					elem.innerHTML.replace( rinlinejQuery, "" ) :
-					undefined;
-			}
+				if (value === undefined) {
+					return elem.nodeType === 1 ?
+						elem.innerHTML.replace(rinlinejQuery, "") :
+						undefined;
+				}
 
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				( jQuery.support.htmlSerialize || !rnoshimcache.test( value )  ) &&
-				( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
-				!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
+				// See if we can take a shortcut and just use innerHTML
+				if (typeof value === "string" && !rnoInnerhtml.test(value) &&
+					(jQuery.support.htmlSerialize || !rnoshimcache.test(value)) &&
+					(jQuery.support.leadingWhitespace || !rleadingWhitespace.test(value)) &&
+					!wrapMap[(rtagName.exec(value) || ["", ""])[1].toLowerCase()]) {
 
-				value = value.replace( rxhtmlTag, "<$1></$2>" );
+					value = value.replace(rxhtmlTag, "<$1></$2>");
 
-				try {
-					for (; i < l; i++ ) {
-						// Remove element nodes and prevent memory leaks
-						elem = this[i] || {};
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
+					try {
+						for (; i < l; i++) {
+							// Remove element nodes and prevent memory leaks
+							elem = this[i] || {};
+							if (elem.nodeType === 1) {
+								jQuery.cleanData(getAll(elem, false));
+								elem.innerHTML = value;
+							}
 						}
-					}
 
-					elem = 0;
+						elem = 0;
 
-				// If using innerHTML throws an exception, use the fallback method
-				} catch(e) {}
-			}
+						// If using innerHTML throws an exception, use the fallback method
+					} catch (e) {
+					}
+				}
 
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
+				if (elem) {
+					this.empty().append(value);
+				}
+			}, null, value, arguments.length);
+		},
 
-	replaceWith: function() {
-		var
-			// Snapshot the DOM in case .domManip sweeps something relevant into its fragment
-			args = jQuery.map( this, function( elem ) {
-				return [ elem.nextSibling, elem.parentNode ];
-			}),
-			i = 0;
+		replaceWith: function () {
+			var
+				// Snapshot the DOM in case .domManip sweeps something relevant into its fragment
+				args = jQuery.map(this, function (elem) {
+					return [elem.nextSibling, elem.parentNode];
+				}),
+				i = 0;
 
-		// Make the changes, replacing each context element with the new content
-		this.domManip( arguments, function( elem ) {
-			var next = args[ i++ ],
-				parent = args[ i++ ];
+			// Make the changes, replacing each context element with the new content
+			this.domManip(arguments, function (elem) {
+				var next = args[i++],
+					parent = args[i++];
 
-			if ( parent ) {
-				// Don't use the snapshot next if it has moved (#13810)
-				if ( next && next.parentNode !== parent ) {
-					next = this.nextSibling;
+				if (parent) {
+					// Don't use the snapshot next if it has moved (#13810)
+					if (next && next.parentNode !== parent) {
+						next = this.nextSibling;
+					}
+					jQuery(this).remove();
+					parent.insertBefore(elem, next);
 				}
-				jQuery( this ).remove();
-				parent.insertBefore( elem, next );
-			}
-		// Allow new content to include elements from the context set
-		}, true );
+				// Allow new content to include elements from the context set
+			}, true);
 
-		// Force removal if there was no new content (e.g., from empty arguments)
-		return i ? this : this.remove();
-	},
+			// Force removal if there was no new content (e.g., from empty arguments)
+			return i ? this : this.remove();
+		},
 
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
+		detach: function (selector) {
+			return this.remove(selector, true);
+		},
 
-	domManip: function( args, callback, allowIntersection ) {
+		domManip: function (args, callback, allowIntersection) {
 
-		// Flatten any nested arrays
-		args = core_concat.apply( [], args );
+			// Flatten any nested arrays
+			args = core_concat.apply([], args);
 
-		var first, node, hasScripts,
-			scripts, doc, fragment,
-			i = 0,
-			l = this.length,
-			set = this,
-			iNoClone = l - 1,
-			value = args[0],
-			isFunction = jQuery.isFunction( value );
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( isFunction || !( l <= 1 || typeof value !== "string" || jQuery.support.checkClone || !rchecked.test( value ) ) ) {
-			return this.each(function( index ) {
-				var self = set.eq( index );
-				if ( isFunction ) {
-					args[0] = value.call( this, index, self.html() );
-				}
-				self.domManip( args, callback, allowIntersection );
-			});
-		}
+			var first, node, hasScripts,
+				scripts, doc, fragment,
+				i = 0,
+				l = this.length,
+				set = this,
+				iNoClone = l - 1,
+				value = args[0],
+				isFunction = jQuery.isFunction(value);
+
+			// We can't cloneNode fragments that contain checked, in WebKit
+			if (isFunction || !(l <= 1 || typeof value !== "string" || jQuery.support.checkClone || !rchecked.test(value))) {
+				return this.each(function (index) {
+					var self = set.eq(index);
+					if (isFunction) {
+						args[0] = value.call(this, index, self.html());
+					}
+					self.domManip(args, callback, allowIntersection);
+				});
+			}
 
-		if ( l ) {
-			fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, !allowIntersection && this );
-			first = fragment.firstChild;
+			if (l) {
+				fragment = jQuery.buildFragment(args, this[0].ownerDocument, false, !allowIntersection && this);
+				first = fragment.firstChild;
 
-			if ( fragment.childNodes.length === 1 ) {
-				fragment = first;
-			}
+				if (fragment.childNodes.length === 1) {
+					fragment = first;
+				}
 
-			if ( first ) {
-				scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-				hasScripts = scripts.length;
+				if (first) {
+					scripts = jQuery.map(getAll(fragment, "script"), disableScript);
+					hasScripts = scripts.length;
 
-				// Use the original fragment for the last item instead of the first because it can end up
-				// being emptied incorrectly in certain situations (#8070).
-				for ( ; i < l; i++ ) {
-					node = fragment;
+					// Use the original fragment for the last item instead of the first because it can end up
+					// being emptied incorrectly in certain situations (#8070).
+					for (; i < l; i++) {
+						node = fragment;
 
-					if ( i !== iNoClone ) {
-						node = jQuery.clone( node, true, true );
+						if (i !== iNoClone) {
+							node = jQuery.clone(node, true, true);
 
-						// Keep references to cloned scripts for later restoration
-						if ( hasScripts ) {
-							jQuery.merge( scripts, getAll( node, "script" ) );
+							// Keep references to cloned scripts for later restoration
+							if (hasScripts) {
+								jQuery.merge(scripts, getAll(node, "script"));
+							}
 						}
-					}
 
-					callback.call( this[i], node, i );
-				}
+						callback.call(this[i], node, i);
+					}
 
-				if ( hasScripts ) {
-					doc = scripts[ scripts.length - 1 ].ownerDocument;
+					if (hasScripts) {
+						doc = scripts[scripts.length - 1].ownerDocument;
 
-					// Reenable scripts
-					jQuery.map( scripts, restoreScript );
+						// Reenable scripts
+						jQuery.map(scripts, restoreScript);
 
-					// Evaluate executable scripts on first document insertion
-					for ( i = 0; i < hasScripts; i++ ) {
-						node = scripts[ i ];
-						if ( rscriptType.test( node.type || "" ) &&
-							!jQuery._data( node, "globalEval" ) && jQuery.contains( doc, node ) ) {
+						// Evaluate executable scripts on first document insertion
+						for (i = 0; i < hasScripts; i++) {
+							node = scripts[i];
+							if (rscriptType.test(node.type || "") &&
+								!jQuery._data(node, "globalEval") && jQuery.contains(doc, node)) {
 
-							if ( node.src ) {
-								// Hope ajax is available...
-								jQuery._evalUrl( node.src );
-							} else {
-								jQuery.globalEval( ( node.text || node.textContent || node.innerHTML || "" ).replace( rcleanScript, "" ) );
+								if (node.src) {
+									// Hope ajax is available...
+									jQuery._evalUrl(node.src);
+								} else {
+									jQuery.globalEval((node.text || node.textContent || node.innerHTML || "").replace(rcleanScript, ""));
+								}
 							}
 						}
 					}
-				}
 
-				// Fix #11809: Avoid leaking memory
-				fragment = first = null;
+					// Fix #11809: Avoid leaking memory
+					fragment = first = null;
+				}
 			}
-		}
 
-		return this;
-	}
-});
+			return this;
+		}
+	});
 
 // Support: IE<8
 // Manipulating tables requires a tbody
-function manipulationTarget( elem, content ) {
-	return jQuery.nodeName( elem, "table" ) &&
-		jQuery.nodeName( content.nodeType === 1 ? content : content.firstChild, "tr" ) ?
+	function manipulationTarget(elem, content) {
+		return jQuery.nodeName(elem, "table") &&
+		jQuery.nodeName(content.nodeType === 1 ? content : content.firstChild, "tr") ?
 
-		elem.getElementsByTagName("tbody")[0] ||
-			elem.appendChild( elem.ownerDocument.createElement("tbody") ) :
-		elem;
-}
+			elem.getElementsByTagName("tbody")[0] ||
+			elem.appendChild(elem.ownerDocument.createElement("tbody")) :
+			elem;
+	}
 
 // Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	elem.type = (jQuery.find.attr( elem, "type" ) !== null) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-	if ( match ) {
-		elem.type = match[1];
-	} else {
-		elem.removeAttribute("type");
+	function disableScript(elem) {
+		elem.type = (jQuery.find.attr(elem, "type") !== null) + "/" + elem.type;
+		return elem;
+	}
+
+	function restoreScript(elem) {
+		var match = rscriptTypeMasked.exec(elem.type);
+		if (match) {
+			elem.type = match[1];
+		} else {
+			elem.removeAttribute("type");
+		}
+		return elem;
 	}
-	return elem;
-}
 
 // Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var elem,
-		i = 0;
-	for ( ; (elem = elems[i]) != null; i++ ) {
-		jQuery._data( elem, "globalEval", !refElements || jQuery._data( refElements[i], "globalEval" ) );
+	function setGlobalEval(elems, refElements) {
+		var elem,
+			i = 0;
+		for (; (elem = elems[i]) != null; i++) {
+			jQuery._data(elem, "globalEval", !refElements || jQuery._data(refElements[i], "globalEval"));
+		}
 	}
-}
 
-function cloneCopyEvent( src, dest ) {
+	function cloneCopyEvent(src, dest) {
 
-	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
-		return;
-	}
+		if (dest.nodeType !== 1 || !jQuery.hasData(src)) {
+			return;
+		}
 
-	var type, i, l,
-		oldData = jQuery._data( src ),
-		curData = jQuery._data( dest, oldData ),
-		events = oldData.events;
+		var type, i, l,
+			oldData = jQuery._data(src),
+			curData = jQuery._data(dest, oldData),
+			events = oldData.events;
 
-	if ( events ) {
-		delete curData.handle;
-		curData.events = {};
+		if (events) {
+			delete curData.handle;
+			curData.events = {};
 
-		for ( type in events ) {
-			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-				jQuery.event.add( dest, type, events[ type ][ i ] );
+			for (type in events) {
+				for (i = 0, l = events[type].length; i < l; i++) {
+					jQuery.event.add(dest, type, events[type][i]);
+				}
 			}
 		}
-	}
 
-	// make the cloned public data object a copy from the original
-	if ( curData.data ) {
-		curData.data = jQuery.extend( {}, curData.data );
+		// make the cloned public data object a copy from the original
+		if (curData.data) {
+			curData.data = jQuery.extend({}, curData.data);
+		}
 	}
-}
 
-function fixCloneNodeIssues( src, dest ) {
-	var nodeName, e, data;
+	function fixCloneNodeIssues(src, dest) {
+		var nodeName, e, data;
 
-	// We do not need to do anything for non-Elements
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
+		// We do not need to do anything for non-Elements
+		if (dest.nodeType !== 1) {
+			return;
+		}
+
+		nodeName = dest.nodeName.toLowerCase();
 
-	nodeName = dest.nodeName.toLowerCase();
+		// IE6-8 copies events bound via attachEvent when using cloneNode.
+		if (!jQuery.support.noCloneEvent && dest[jQuery.expando]) {
+			data = jQuery._data(dest);
 
-	// IE6-8 copies events bound via attachEvent when using cloneNode.
-	if ( !jQuery.support.noCloneEvent && dest[ jQuery.expando ] ) {
-		data = jQuery._data( dest );
+			for (e in data.events) {
+				jQuery.removeEvent(dest, e, data.handle);
+			}
 
-		for ( e in data.events ) {
-			jQuery.removeEvent( dest, e, data.handle );
+			// Event data gets referenced instead of copied if the expando gets copied too
+			dest.removeAttribute(jQuery.expando);
 		}
 
-		// Event data gets referenced instead of copied if the expando gets copied too
-		dest.removeAttribute( jQuery.expando );
-	}
+		// IE blanks contents when cloning scripts, and tries to evaluate newly-set text
+		if (nodeName === "script" && dest.text !== src.text) {
+			disableScript(dest).text = src.text;
+			restoreScript(dest);
 
-	// IE blanks contents when cloning scripts, and tries to evaluate newly-set text
-	if ( nodeName === "script" && dest.text !== src.text ) {
-		disableScript( dest ).text = src.text;
-		restoreScript( dest );
+			// IE6-10 improperly clones children of object elements using classid.
+			// IE10 throws NoModificationAllowedError if parent is null, #12132.
+		} else if (nodeName === "object") {
+			if (dest.parentNode) {
+				dest.outerHTML = src.outerHTML;
+			}
 
-	// IE6-10 improperly clones children of object elements using classid.
-	// IE10 throws NoModificationAllowedError if parent is null, #12132.
-	} else if ( nodeName === "object" ) {
-		if ( dest.parentNode ) {
-			dest.outerHTML = src.outerHTML;
-		}
+			// This path appears unavoidable for IE9. When cloning an object
+			// element in IE9, the outerHTML strategy above is not sufficient.
+			// If the src has innerHTML and the destination does not,
+			// copy the src.innerHTML into the dest.innerHTML. #10324
+			if (jQuery.support.html5Clone && (src.innerHTML && !jQuery.trim(dest.innerHTML))) {
+				dest.innerHTML = src.innerHTML;
+			}
 
-		// This path appears unavoidable for IE9. When cloning an object
-		// element in IE9, the outerHTML strategy above is not sufficient.
-		// If the src has innerHTML and the destination does not,
-		// copy the src.innerHTML into the dest.innerHTML. #10324
-		if ( jQuery.support.html5Clone && ( src.innerHTML && !jQuery.trim(dest.innerHTML) ) ) {
-			dest.innerHTML = src.innerHTML;
-		}
+		} else if (nodeName === "input" && manipulation_rcheckableType.test(src.type)) {
+			// IE6-8 fails to persist the checked state of a cloned checkbox
+			// or radio button. Worse, IE6-7 fail to give the cloned element
+			// a checked appearance if the defaultChecked value isn't also set
 
-	} else if ( nodeName === "input" && manipulation_rcheckableType.test( src.type ) ) {
-		// IE6-8 fails to persist the checked state of a cloned checkbox
-		// or radio button. Worse, IE6-7 fail to give the cloned element
-		// a checked appearance if the defaultChecked value isn't also set
+			dest.defaultChecked = dest.checked = src.checked;
 
-		dest.defaultChecked = dest.checked = src.checked;
+			// IE6-7 get confused and end up setting the value of a cloned
+			// checkbox/radio button to an empty string instead of "on"
+			if (dest.value !== src.value) {
+				dest.value = src.value;
+			}
+
+			// IE6-8 fails to return the selected option to the default selected
+			// state when cloning options
+		} else if (nodeName === "option") {
+			dest.defaultSelected = dest.selected = src.defaultSelected;
 
-		// IE6-7 get confused and end up setting the value of a cloned
-		// checkbox/radio button to an empty string instead of "on"
-		if ( dest.value !== src.value ) {
-			dest.value = src.value;
+			// IE6-8 fails to set the defaultValue to the correct value when
+			// cloning other types of input fields
+		} else if (nodeName === "input" || nodeName === "textarea") {
+			dest.defaultValue = src.defaultValue;
 		}
+	}
 
-	// IE6-8 fails to return the selected option to the default selected
-	// state when cloning options
-	} else if ( nodeName === "option" ) {
-		dest.defaultSelected = dest.selected = src.defaultSelected;
+	jQuery.each({
+		appendTo: "append",
+		prependTo: "prepend",
+		insertBefore: "before",
+		insertAfter: "after",
+		replaceAll: "replaceWith"
+	}, function (name, original) {
+		jQuery.fn[name] = function (selector) {
+			var elems,
+				i = 0,
+				ret = [],
+				insert = jQuery(selector),
+				last = insert.length - 1;
 
-	// IE6-8 fails to set the defaultValue to the correct value when
-	// cloning other types of input fields
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			i = 0,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1;
+			for (; i <= last; i++) {
+				elems = i === last ? this : this.clone(true);
+				jQuery(insert[i])[original](elems);
 
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone(true);
-			jQuery( insert[i] )[ original ]( elems );
+				// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
+				core_push.apply(ret, elems.get());
+			}
 
-			// Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get()
-			core_push.apply( ret, elems.get() );
-		}
+			return this.pushStack(ret);
+		};
+	});
 
-		return this.pushStack( ret );
-	};
-});
-
-function getAll( context, tag ) {
-	var elems, elem,
-		i = 0,
-		found = typeof context.getElementsByTagName !== core_strundefined ? context.getElementsByTagName( tag || "*" ) :
-			typeof context.querySelectorAll !== core_strundefined ? context.querySelectorAll( tag || "*" ) :
-			undefined;
-
-	if ( !found ) {
-		for ( found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++ ) {
-			if ( !tag || jQuery.nodeName( elem, tag ) ) {
-				found.push( elem );
-			} else {
-				jQuery.merge( found, getAll( elem, tag ) );
+	function getAll(context, tag) {
+		var elems, elem,
+			i = 0,
+			found = typeof context.getElementsByTagName !== core_strundefined ? context.getElementsByTagName(tag || "*") :
+				typeof context.querySelectorAll !== core_strundefined ? context.querySelectorAll(tag || "*") :
+					undefined;
+
+		if (!found) {
+			for (found = [], elems = context.childNodes || context; (elem = elems[i]) != null; i++) {
+				if (!tag || jQuery.nodeName(elem, tag)) {
+					found.push(elem);
+				} else {
+					jQuery.merge(found, getAll(elem, tag));
+				}
 			}
 		}
-	}
 
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], found ) :
-		found;
-}
+		return tag === undefined || tag && jQuery.nodeName(context, tag) ?
+			jQuery.merge([context], found) :
+			found;
+	}
 
 // Used in buildFragment, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
-	if ( manipulation_rcheckableType.test( elem.type ) ) {
-		elem.defaultChecked = elem.checked;
+	function fixDefaultChecked(elem) {
+		if (manipulation_rcheckableType.test(elem.type)) {
+			elem.defaultChecked = elem.checked;
+		}
 	}
-}
 
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var destElements, node, clone, i, srcElements,
-			inPage = jQuery.contains( elem.ownerDocument, elem );
+	jQuery.extend({
+		clone: function (elem, dataAndEvents, deepDataAndEvents) {
+			var destElements, node, clone, i, srcElements,
+				inPage = jQuery.contains(elem.ownerDocument, elem);
 
-		if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
-			clone = elem.cloneNode( true );
+			if (jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test("<" + elem.nodeName + ">")) {
+				clone = elem.cloneNode(true);
 
-		// IE<=8 does not properly clone detached, unknown element nodes
-		} else {
-			fragmentDiv.innerHTML = elem.outerHTML;
-			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
-		}
+				// IE<=8 does not properly clone detached, unknown element nodes
+			} else {
+				fragmentDiv.innerHTML = elem.outerHTML;
+				fragmentDiv.removeChild(clone = fragmentDiv.firstChild);
+			}
 
-		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
-				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
+			if ((!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
+				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem)) {
 
-			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
+				// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
+				destElements = getAll(clone);
+				srcElements = getAll(elem);
 
-			// Fix all IE cloning issues
-			for ( i = 0; (node = srcElements[i]) != null; ++i ) {
-				// Ensure that the destination node is not null; Fixes #9587
-				if ( destElements[i] ) {
-					fixCloneNodeIssues( node, destElements[i] );
+				// Fix all IE cloning issues
+				for (i = 0; (node = srcElements[i]) != null; ++i) {
+					// Ensure that the destination node is not null; Fixes #9587
+					if (destElements[i]) {
+						fixCloneNodeIssues(node, destElements[i]);
+					}
 				}
 			}
-		}
 
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
+			// Copy the events from the original to the clone
+			if (dataAndEvents) {
+				if (deepDataAndEvents) {
+					srcElements = srcElements || getAll(elem);
+					destElements = destElements || getAll(clone);
 
-				for ( i = 0; (node = srcElements[i]) != null; i++ ) {
-					cloneCopyEvent( node, destElements[i] );
+					for (i = 0; (node = srcElements[i]) != null; i++) {
+						cloneCopyEvent(node, destElements[i]);
+					}
+				} else {
+					cloneCopyEvent(elem, clone);
 				}
-			} else {
-				cloneCopyEvent( elem, clone );
 			}
-		}
 
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
+			// Preserve script evaluation history
+			destElements = getAll(clone, "script");
+			if (destElements.length > 0) {
+				setGlobalEval(destElements, !inPage && getAll(elem, "script"));
+			}
 
-		destElements = srcElements = node = null;
+			destElements = srcElements = node = null;
 
-		// Return the cloned set
-		return clone;
-	},
+			// Return the cloned set
+			return clone;
+		},
 
-	buildFragment: function( elems, context, scripts, selection ) {
-		var j, elem, contains,
-			tmp, tag, tbody, wrap,
-			l = elems.length,
+		buildFragment: function (elems, context, scripts, selection) {
+			var j, elem, contains,
+				tmp, tag, tbody, wrap,
+				l = elems.length,
 
-			// Ensure a safe fragment
-			safe = createSafeFragment( context ),
+				// Ensure a safe fragment
+				safe = createSafeFragment(context),
 
-			nodes = [],
-			i = 0;
+				nodes = [],
+				i = 0;
 
-		for ( ; i < l; i++ ) {
-			elem = elems[ i ];
+			for (; i < l; i++) {
+				elem = elems[i];
 
-			if ( elem || elem === 0 ) {
+				if (elem || elem === 0) {
 
-				// Add nodes directly
-				if ( jQuery.type( elem ) === "object" ) {
-					jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
+					// Add nodes directly
+					if (jQuery.type(elem) === "object") {
+						jQuery.merge(nodes, elem.nodeType ? [elem] : elem);
 
-				// Convert non-html into a text node
-				} else if ( !rhtml.test( elem ) ) {
-					nodes.push( context.createTextNode( elem ) );
+						// Convert non-html into a text node
+					} else if (!rhtml.test(elem)) {
+						nodes.push(context.createTextNode(elem));
 
-				// Convert html into DOM nodes
-				} else {
-					tmp = tmp || safe.appendChild( context.createElement("div") );
+						// Convert html into DOM nodes
+					} else {
+						tmp = tmp || safe.appendChild(context.createElement("div"));
 
-					// Deserialize a standard representation
-					tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
-					wrap = wrapMap[ tag ] || wrapMap._default;
+						// Deserialize a standard representation
+						tag = (rtagName.exec(elem) || ["", ""])[1].toLowerCase();
+						wrap = wrapMap[tag] || wrapMap._default;
 
-					tmp.innerHTML = wrap[1] + elem.replace( rxhtmlTag, "<$1></$2>" ) + wrap[2];
+						tmp.innerHTML = wrap[1] + elem.replace(rxhtmlTag, "<$1></$2>") + wrap[2];
 
-					// Descend through wrappers to the right content
-					j = wrap[0];
-					while ( j-- ) {
-						tmp = tmp.lastChild;
-					}
+						// Descend through wrappers to the right content
+						j = wrap[0];
+						while (j--) {
+							tmp = tmp.lastChild;
+						}
 
-					// Manually add leading whitespace removed by IE
-					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-						nodes.push( context.createTextNode( rleadingWhitespace.exec( elem )[0] ) );
-					}
+						// Manually add leading whitespace removed by IE
+						if (!jQuery.support.leadingWhitespace && rleadingWhitespace.test(elem)) {
+							nodes.push(context.createTextNode(rleadingWhitespace.exec(elem)[0]));
+						}
 
-					// Remove IE's autoinserted <tbody> from table fragments
-					if ( !jQuery.support.tbody ) {
+						// Remove IE's autoinserted <tbody> from table fragments
+						if (!jQuery.support.tbody) {
 
-						// String was a <table>, *may* have spurious <tbody>
-						elem = tag === "table" && !rtbody.test( elem ) ?
-							tmp.firstChild :
+							// String was a <table>, *may* have spurious <tbody>
+							elem = tag === "table" && !rtbody.test(elem) ?
+								tmp.firstChild :
 
-							// String was a bare <thead> or <tfoot>
-							wrap[1] === "<table>" && !rtbody.test( elem ) ?
-								tmp :
-								0;
+								// String was a bare <thead> or <tfoot>
+								wrap[1] === "<table>" && !rtbody.test(elem) ?
+									tmp :
+									0;
 
-						j = elem && elem.childNodes.length;
-						while ( j-- ) {
-							if ( jQuery.nodeName( (tbody = elem.childNodes[j]), "tbody" ) && !tbody.childNodes.length ) {
-								elem.removeChild( tbody );
+							j = elem && elem.childNodes.length;
+							while (j--) {
+								if (jQuery.nodeName((tbody = elem.childNodes[j]), "tbody") && !tbody.childNodes.length) {
+									elem.removeChild(tbody);
+								}
 							}
 						}
-					}
 
-					jQuery.merge( nodes, tmp.childNodes );
+						jQuery.merge(nodes, tmp.childNodes);
 
-					// Fix #12392 for WebKit and IE > 9
-					tmp.textContent = "";
+						// Fix #12392 for WebKit and IE > 9
+						tmp.textContent = "";
 
-					// Fix #12392 for oldIE
-					while ( tmp.firstChild ) {
-						tmp.removeChild( tmp.firstChild );
-					}
+						// Fix #12392 for oldIE
+						while (tmp.firstChild) {
+							tmp.removeChild(tmp.firstChild);
+						}
 
-					// Remember the top-level container for proper cleanup
-					tmp = safe.lastChild;
+						// Remember the top-level container for proper cleanup
+						tmp = safe.lastChild;
+					}
 				}
 			}
-		}
 
-		// Fix #11356: Clear elements from fragment
-		if ( tmp ) {
-			safe.removeChild( tmp );
-		}
+			// Fix #11356: Clear elements from fragment
+			if (tmp) {
+				safe.removeChild(tmp);
+			}
 
-		// Reset defaultChecked for any radios and checkboxes
-		// about to be appended to the DOM in IE 6/7 (#8060)
-		if ( !jQuery.support.appendChecked ) {
-			jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked );
-		}
+			// Reset defaultChecked for any radios and checkboxes
+			// about to be appended to the DOM in IE 6/7 (#8060)
+			if (!jQuery.support.appendChecked) {
+				jQuery.grep(getAll(nodes, "input"), fixDefaultChecked);
+			}
 
-		i = 0;
-		while ( (elem = nodes[ i++ ]) ) {
+			i = 0;
+			while ((elem = nodes[i++])) {
 
-			// #4087 - If origin and destination elements are the same, and this is
-			// that element, do not do anything
-			if ( selection && jQuery.inArray( elem, selection ) !== -1 ) {
-				continue;
-			}
+				// #4087 - If origin and destination elements are the same, and this is
+				// that element, do not do anything
+				if (selection && jQuery.inArray(elem, selection) !== -1) {
+					continue;
+				}
 
-			contains = jQuery.contains( elem.ownerDocument, elem );
+				contains = jQuery.contains(elem.ownerDocument, elem);
 
-			// Append to fragment
-			tmp = getAll( safe.appendChild( elem ), "script" );
+				// Append to fragment
+				tmp = getAll(safe.appendChild(elem), "script");
 
-			// Preserve script evaluation history
-			if ( contains ) {
-				setGlobalEval( tmp );
-			}
+				// Preserve script evaluation history
+				if (contains) {
+					setGlobalEval(tmp);
+				}
 
-			// Capture executables
-			if ( scripts ) {
-				j = 0;
-				while ( (elem = tmp[ j++ ]) ) {
-					if ( rscriptType.test( elem.type || "" ) ) {
-						scripts.push( elem );
+				// Capture executables
+				if (scripts) {
+					j = 0;
+					while ((elem = tmp[j++])) {
+						if (rscriptType.test(elem.type || "")) {
+							scripts.push(elem);
+						}
 					}
 				}
 			}
-		}
 
-		tmp = null;
+			tmp = null;
 
-		return safe;
-	},
+			return safe;
+		},
 
-	cleanData: function( elems, /* internal */ acceptData ) {
-		var elem, type, id, data,
-			i = 0,
-			internalKey = jQuery.expando,
-			cache = jQuery.cache,
-			deleteExpando = jQuery.support.deleteExpando,
-			special = jQuery.event.special;
+		cleanData: function (elems, /* internal */ acceptData) {
+			var elem, type, id, data,
+				i = 0,
+				internalKey = jQuery.expando,
+				cache = jQuery.cache,
+				deleteExpando = jQuery.support.deleteExpando,
+				special = jQuery.event.special;
 
-		for ( ; (elem = elems[i]) != null; i++ ) {
+			for (; (elem = elems[i]) != null; i++) {
 
-			if ( acceptData || jQuery.acceptData( elem ) ) {
+				if (acceptData || jQuery.acceptData(elem)) {
 
-				id = elem[ internalKey ];
-				data = id && cache[ id ];
+					id = elem[internalKey];
+					data = id && cache[id];
 
-				if ( data ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
+					if (data) {
+						if (data.events) {
+							for (type in data.events) {
+								if (special[type]) {
+									jQuery.event.remove(elem, type);
 
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
+									// This is a shortcut to avoid jQuery.event.remove's overhead
+								} else {
+									jQuery.removeEvent(elem, type, data.handle);
+								}
 							}
 						}
-					}
 
-					// Remove cache only if it was not already removed by jQuery.event.remove
-					if ( cache[ id ] ) {
+						// Remove cache only if it was not already removed by jQuery.event.remove
+						if (cache[id]) {
 
-						delete cache[ id ];
+							delete cache[id];
 
-						// IE does not allow us to delete expando properties from nodes,
-						// nor does it have a removeAttribute function on Document nodes;
-						// we must handle all of these cases
-						if ( deleteExpando ) {
-							delete elem[ internalKey ];
+							// IE does not allow us to delete expando properties from nodes,
+							// nor does it have a removeAttribute function on Document nodes;
+							// we must handle all of these cases
+							if (deleteExpando) {
+								delete elem[internalKey];
 
-						} else if ( typeof elem.removeAttribute !== core_strundefined ) {
-							elem.removeAttribute( internalKey );
+							} else if (typeof elem.removeAttribute !== core_strundefined) {
+								elem.removeAttribute(internalKey);
 
-						} else {
-							elem[ internalKey ] = null;
-						}
+							} else {
+								elem[internalKey] = null;
+							}
 
-						core_deletedIds.push( id );
+							core_deletedIds.push(id);
+						}
 					}
 				}
 			}
-		}
-	},
+		},
 
-	_evalUrl: function( url ) {
-		return jQuery.ajax({
-			url: url,
-			type: "GET",
-			dataType: "script",
-			async: false,
-			global: false,
-			"throws": true
-		});
-	}
-});
-jQuery.fn.extend({
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
+		_evalUrl: function (url) {
+			return jQuery.ajax({
+				url: url,
+				type: "GET",
+				dataType: "script",
+				async: false,
+				global: false,
+				"throws": true
 			});
 		}
-
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
+	});
+	jQuery.fn.extend({
+		wrapAll: function (html) {
+			if (jQuery.isFunction(html)) {
+				return this.each(function (i) {
+					jQuery(this).wrapAll(html.call(this, i));
+				});
 			}
 
-			wrap.map(function() {
-				var elem = this;
+			if (this[0]) {
+				// The elements to wrap the target around
+				var wrap = jQuery(html, this[0].ownerDocument).eq(0).clone(true);
 
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
+				if (this[0].parentNode) {
+					wrap.insertBefore(this[0]);
 				}
 
-				return elem;
-			}).append( this );
-		}
-
-		return this;
-	},
+				wrap.map(function () {
+					var elem = this;
 
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
-			});
-		}
+					while (elem.firstChild && elem.firstChild.nodeType === 1) {
+						elem = elem.firstChild;
+					}
 
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
+					return elem;
+				}).append(this);
+			}
 
-			if ( contents.length ) {
-				contents.wrapAll( html );
+			return this;
+		},
 
-			} else {
-				self.append( html );
+		wrapInner: function (html) {
+			if (jQuery.isFunction(html)) {
+				return this.each(function (i) {
+					jQuery(this).wrapInner(html.call(this, i));
+				});
 			}
-		});
-	},
 
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
+			return this.each(function () {
+				var self = jQuery(this),
+					contents = self.contents();
 
-		return this.each(function(i) {
-			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-		});
-	},
+				if (contents.length) {
+					contents.wrapAll(html);
 
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	}
-});
-var iframe, getStyles, curCSS,
-	ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity\s*=\s*([^)]*)/,
-	rposition = /^(top|right|bottom|left)$/,
-	// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
-	// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rmargin = /^margin/,
-	rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ),
-	rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ),
-	rrelNum = new RegExp( "^([+-])=(" + core_pnum + ")", "i" ),
-	elemdisplay = { BODY: "block" },
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: 0,
-		fontWeight: 400
-	},
-
-	cssExpand = [ "Top", "Right", "Bottom", "Left" ],
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ];
+				} else {
+					self.append(html);
+				}
+			});
+		},
 
-// return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( style, name ) {
+		wrap: function (html) {
+			var isFunction = jQuery.isFunction(html);
 
-	// shortcut for names that are not vendor prefixed
-	if ( name in style ) {
-		return name;
-	}
+			return this.each(function (i) {
+				jQuery(this).wrapAll(isFunction ? html.call(this, i) : html);
+			});
+		},
+
+		unwrap: function () {
+			return this.parent().each(function () {
+				if (!jQuery.nodeName(this, "body")) {
+					jQuery(this).replaceWith(this.childNodes);
+				}
+			}).end();
+		}
+	});
+	var iframe, getStyles, curCSS,
+		ralpha = /alpha\([^)]*\)/i,
+		ropacity = /opacity\s*=\s*([^)]*)/,
+		rposition = /^(top|right|bottom|left)$/,
+		// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
+		// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
+		rdisplayswap = /^(none|table(?!-c[ea]).+)/,
+		rmargin = /^margin/,
+		rnumsplit = new RegExp("^(" + core_pnum + ")(.*)$", "i"),
+		rnumnonpx = new RegExp("^(" + core_pnum + ")(?!px)[a-z%]+$", "i"),
+		rrelNum = new RegExp("^([+-])=(" + core_pnum + ")", "i"),
+		elemdisplay = {BODY: "block"},
+
+		cssShow = {position: "absolute", visibility: "hidden", display: "block"},
+		cssNormalTransform = {
+			letterSpacing: 0,
+			fontWeight: 400
+		},
+
+		cssExpand = ["Top", "Right", "Bottom", "Left"],
+		cssPrefixes = ["Webkit", "O", "Moz", "ms"];
 
-	// check for vendor prefixed names
-	var capName = name.charAt(0).toUpperCase() + name.slice(1),
-		origName = name,
-		i = cssPrefixes.length;
+// return a css property mapped to a potentially vendor prefixed property
+	function vendorPropName(style, name) {
 
-	while ( i-- ) {
-		name = cssPrefixes[ i ] + capName;
-		if ( name in style ) {
+		// shortcut for names that are not vendor prefixed
+		if (name in style) {
 			return name;
 		}
-	}
 
-	return origName;
-}
+		// check for vendor prefixed names
+		var capName = name.charAt(0).toUpperCase() + name.slice(1),
+			origName = name,
+			i = cssPrefixes.length;
+
+		while (i--) {
+			name = cssPrefixes[i] + capName;
+			if (name in style) {
+				return name;
+			}
+		}
 
-function isHidden( elem, el ) {
-	// isHidden might be called from jQuery#filter function;
-	// in that case, element will be second argument
-	elem = el || elem;
-	return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
-}
+		return origName;
+	}
 
-function showHide( elements, show ) {
-	var display, elem, hidden,
-		values = [],
-		index = 0,
-		length = elements.length;
+	function isHidden(elem, el) {
+		// isHidden might be called from jQuery#filter function;
+		// in that case, element will be second argument
+		elem = el || elem;
+		return jQuery.css(elem, "display") === "none" || !jQuery.contains(elem.ownerDocument, elem);
+	}
 
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
+	function showHide(elements, show) {
+		var display, elem, hidden,
+			values = [],
+			index = 0,
+			length = elements.length;
 
-		values[ index ] = jQuery._data( elem, "olddisplay" );
-		display = elem.style.display;
-		if ( show ) {
-			// Reset the inline display of this element to learn if it is
-			// being hidden by cascaded rules or not
-			if ( !values[ index ] && display === "none" ) {
-				elem.style.display = "";
+		for (; index < length; index++) {
+			elem = elements[index];
+			if (!elem.style) {
+				continue;
 			}
 
-			// Set elements which have been overridden with display: none
-			// in a stylesheet to whatever the default browser style is
-			// for such an element
-			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
-			}
-		} else {
+			values[index] = jQuery._data(elem, "olddisplay");
+			display = elem.style.display;
+			if (show) {
+				// Reset the inline display of this element to learn if it is
+				// being hidden by cascaded rules or not
+				if (!values[index] && display === "none") {
+					elem.style.display = "";
+				}
+
+				// Set elements which have been overridden with display: none
+				// in a stylesheet to whatever the default browser style is
+				// for such an element
+				if (elem.style.display === "" && isHidden(elem)) {
+					values[index] = jQuery._data(elem, "olddisplay", css_defaultDisplay(elem.nodeName));
+				}
+			} else {
 
-			if ( !values[ index ] ) {
-				hidden = isHidden( elem );
+				if (!values[index]) {
+					hidden = isHidden(elem);
 
-				if ( display && display !== "none" || !hidden ) {
-					jQuery._data( elem, "olddisplay", hidden ? display : jQuery.css( elem, "display" ) );
+					if (display && display !== "none" || !hidden) {
+						jQuery._data(elem, "olddisplay", hidden ? display : jQuery.css(elem, "display"));
+					}
 				}
 			}
 		}
-	}
 
-	// Set the display of most of the elements in a second loop
-	// to avoid the constant reflow
-	for ( index = 0; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-			elem.style.display = show ? values[ index ] || "" : "none";
+		// Set the display of most of the elements in a second loop
+		// to avoid the constant reflow
+		for (index = 0; index < length; index++) {
+			elem = elements[index];
+			if (!elem.style) {
+				continue;
+			}
+			if (!show || elem.style.display === "none" || elem.style.display === "") {
+				elem.style.display = show ? values[index] || "" : "none";
+			}
 		}
+
+		return elements;
 	}
 
-	return elements;
-}
+	jQuery.fn.extend({
+		css: function (name, value) {
+			return jQuery.access(this, function (elem, name, value) {
+				var len, styles,
+					map = {},
+					i = 0;
 
-jQuery.fn.extend({
-	css: function( name, value ) {
-		return jQuery.access( this, function( elem, name, value ) {
-			var len, styles,
-				map = {},
-				i = 0;
+				if (jQuery.isArray(name)) {
+					styles = getStyles(elem);
+					len = name.length;
 
-			if ( jQuery.isArray( name ) ) {
-				styles = getStyles( elem );
-				len = name.length;
+					for (; i < len; i++) {
+						map[name[i]] = jQuery.css(elem, name[i], false, styles);
+					}
 
-				for ( ; i < len; i++ ) {
-					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
+					return map;
 				}
 
-				return map;
+				return value !== undefined ?
+					jQuery.style(elem, name, value) :
+					jQuery.css(elem, name);
+			}, name, value, arguments.length > 1);
+		},
+		show: function () {
+			return showHide(this, true);
+		},
+		hide: function () {
+			return showHide(this);
+		},
+		toggle: function (state) {
+			if (typeof state === "boolean") {
+				return state ? this.show() : this.hide();
 			}
 
-			return value !== undefined ?
-				jQuery.style( elem, name, value ) :
-				jQuery.css( elem, name );
-		}, name, value, arguments.length > 1 );
-	},
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state ) {
-		if ( typeof state === "boolean" ) {
-			return state ? this.show() : this.hide();
+			return this.each(function () {
+				if (isHidden(this)) {
+					jQuery(this).show();
+				} else {
+					jQuery(this).hide();
+				}
+			});
 		}
+	});
 
-		return this.each(function() {
-			if ( isHidden( this ) ) {
-				jQuery( this ).show();
-			} else {
-				jQuery( this ).hide();
+	jQuery.extend({
+		// Add in style property hooks for overriding the default
+		// behavior of getting and setting a style property
+		cssHooks: {
+			opacity: {
+				get: function (elem, computed) {
+					if (computed) {
+						// We should always get a number back from opacity
+						var ret = curCSS(elem, "opacity");
+						return ret === "" ? "1" : ret;
+					}
+				}
 			}
-		});
-	}
-});
-
-jQuery.extend({
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-				}
-			}
-		}
-	},
-
-	// Don't automatically add "px" to these possibly-unitless properties
-	cssNumber: {
-		"columnCount": true,
-		"fillOpacity": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"order": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		// normalize float css property
-		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
+		},
+
+		// Don't automatically add "px" to these possibly-unitless properties
+		cssNumber: {
+			"columnCount": true,
+			"fillOpacity": true,
+			"fontWeight": true,
+			"lineHeight": true,
+			"opacity": true,
+			"order": true,
+			"orphans": true,
+			"widows": true,
+			"zIndex": true,
+			"zoom": true
+		},
+
+		// Add in properties whose names you wish to fix before
+		// setting or getting the value
+		cssProps: {
+			// normalize float css property
+			"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
+		},
 
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
+		// Get and set the style property on a DOM Node
+		style: function (elem, name, value, extra) {
+			// Don't set styles on text and comment nodes
+			if (!elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style) {
+				return;
+			}
 
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
+			// Make sure that we're working with the right name
+			var ret, type, hooks,
+				origName = jQuery.camelCase(name),
+				style = elem.style;
 
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+			name = jQuery.cssProps[origName] || (jQuery.cssProps[origName] = vendorPropName(style, origName));
 
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
+			// gets hook for the prefixed version
+			// followed by the unprefixed version
+			hooks = jQuery.cssHooks[name] || jQuery.cssHooks[origName];
 
-			// convert relative number strings (+= or -=) to relative numbers. #7345
-			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
-				// Fixes bug #9237
-				type = "number";
-			}
+			// Check if we're setting a value
+			if (value !== undefined) {
+				type = typeof value;
 
-			// Make sure that NaN and null values aren't set. See: #7116
-			if ( value == null || type === "number" && isNaN( value ) ) {
-				return;
-			}
+				// convert relative number strings (+= or -=) to relative numbers. #7345
+				if (type === "string" && (ret = rrelNum.exec(value))) {
+					value = (ret[1] + 1) * ret[2] + parseFloat(jQuery.css(elem, name));
+					// Fixes bug #9237
+					type = "number";
+				}
 
-			// If a number was passed in, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
+				// Make sure that NaN and null values aren't set. See: #7116
+				if (value == null || type === "number" && isNaN(value)) {
+					return;
+				}
 
-			// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
-			// but it would mean to define eight (for every problematic property) identical functions
-			if ( !jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0 ) {
-				style[ name ] = "inherit";
-			}
+				// If a number was passed in, add 'px' to the (except for certain CSS properties)
+				if (type === "number" && !jQuery.cssNumber[origName]) {
+					value += "px";
+				}
 
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
+				// Fixes #8908, it can be done more correctly by specifing setters in cssHooks,
+				// but it would mean to define eight (for every problematic property) identical functions
+				if (!jQuery.support.clearCloneStyle && value === "" && name.indexOf("background") === 0) {
+					style[name] = "inherit";
+				}
 
-				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
-				// Fixes bug #5509
-				try {
-					style[ name ] = value;
-				} catch(e) {}
-			}
+				// If a hook was provided, use that value, otherwise just set the specified value
+				if (!hooks || !("set" in hooks) || (value = hooks.set(elem, value, extra)) !== undefined) {
 
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
+					// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
+					// Fixes bug #5509
+					try {
+						style[name] = value;
+					} catch (e) {
+					}
+				}
 
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
+			} else {
+				// If a hook was provided get the non-computed value from there
+				if (hooks && "get" in hooks && (ret = hooks.get(elem, false, extra)) !== undefined) {
+					return ret;
+				}
 
-	css: function( elem, name, extra, styles ) {
-		var num, val, hooks,
-			origName = jQuery.camelCase( name );
+				// Otherwise just get the value from the style object
+				return style[name];
+			}
+		},
 
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
+		css: function (elem, name, extra, styles) {
+			var num, val, hooks,
+				origName = jQuery.camelCase(name);
 
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
+			// Make sure that we're working with the right name
+			name = jQuery.cssProps[origName] || (jQuery.cssProps[origName] = vendorPropName(elem.style, origName));
 
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
+			// gets hook for the prefixed version
+			// followed by the unprefixed version
+			hooks = jQuery.cssHooks[name] || jQuery.cssHooks[origName];
 
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name, styles );
-		}
+			// If a hook was provided get the computed value from there
+			if (hooks && "get" in hooks) {
+				val = hooks.get(elem, true, extra);
+			}
 
-		//convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
+			// Otherwise, if a way to get the computed value exists, use that
+			if (val === undefined) {
+				val = curCSS(elem, name, styles);
+			}
+
+			//convert "normal" to computed value
+			if (val === "normal" && name in cssNormalTransform) {
+				val = cssNormalTransform[name];
+			}
 
-		// Return, converting to number if forced or a qualifier was provided and val looks numeric
-		if ( extra === "" || extra ) {
-			num = parseFloat( val );
-			return extra === true || jQuery.isNumeric( num ) ? num || 0 : val;
+			// Return, converting to number if forced or a qualifier was provided and val looks numeric
+			if (extra === "" || extra) {
+				num = parseFloat(val);
+				return extra === true || jQuery.isNumeric(num) ? num || 0 : val;
+			}
+			return val;
 		}
-		return val;
-	}
-});
+	});
 
 // NOTE: we've included the "window" in window.getComputedStyle
 // because jsdom on node.js will break without it.
-if ( window.getComputedStyle ) {
-	getStyles = function( elem ) {
-		return window.getComputedStyle( elem, null );
-	};
+	if (window.getComputedStyle) {
+		getStyles = function (elem) {
+			return window.getComputedStyle(elem, null);
+		};
 
-	curCSS = function( elem, name, _computed ) {
-		var width, minWidth, maxWidth,
-			computed = _computed || getStyles( elem ),
+		curCSS = function (elem, name, _computed) {
+			var width, minWidth, maxWidth,
+				computed = _computed || getStyles(elem),
 
-			// getPropertyValue is only needed for .css('filter') in IE9, see #12537
-			ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined,
-			style = elem.style;
+				// getPropertyValue is only needed for .css('filter') in IE9, see #12537
+				ret = computed ? computed.getPropertyValue(name) || computed[name] : undefined,
+				style = elem.style;
 
-		if ( computed ) {
+			if (computed) {
 
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
+				if (ret === "" && !jQuery.contains(elem.ownerDocument, elem)) {
+					ret = jQuery.style(elem, name);
+				}
 
-			// A tribute to the "awesome hack by Dean Edwards"
-			// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
-			// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
-			// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-			if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
+				// A tribute to the "awesome hack by Dean Edwards"
+				// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
+				// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
+				// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
+				if (rnumnonpx.test(ret) && rmargin.test(name)) {
 
-				// Remember the original values
-				width = style.width;
-				minWidth = style.minWidth;
-				maxWidth = style.maxWidth;
+					// Remember the original values
+					width = style.width;
+					minWidth = style.minWidth;
+					maxWidth = style.maxWidth;
 
-				// Put in the new values to get a computed value out
-				style.minWidth = style.maxWidth = style.width = ret;
-				ret = computed.width;
+					// Put in the new values to get a computed value out
+					style.minWidth = style.maxWidth = style.width = ret;
+					ret = computed.width;
 
-				// Revert the changed values
-				style.width = width;
-				style.minWidth = minWidth;
-				style.maxWidth = maxWidth;
+					// Revert the changed values
+					style.width = width;
+					style.minWidth = minWidth;
+					style.maxWidth = maxWidth;
+				}
 			}
-		}
 
-		return ret;
-	};
-} else if ( document.documentElement.currentStyle ) {
-	getStyles = function( elem ) {
-		return elem.currentStyle;
-	};
+			return ret;
+		};
+	} else if (document.documentElement.currentStyle) {
+		getStyles = function (elem) {
+			return elem.currentStyle;
+		};
 
-	curCSS = function( elem, name, _computed ) {
-		var left, rs, rsLeft,
-			computed = _computed || getStyles( elem ),
-			ret = computed ? computed[ name ] : undefined,
-			style = elem.style;
+		curCSS = function (elem, name, _computed) {
+			var left, rs, rsLeft,
+				computed = _computed || getStyles(elem),
+				ret = computed ? computed[name] : undefined,
+				style = elem.style;
 
-		// Avoid setting ret to empty string here
-		// so we don't default to auto
-		if ( ret == null && style && style[ name ] ) {
-			ret = style[ name ];
-		}
+			// Avoid setting ret to empty string here
+			// so we don't default to auto
+			if (ret == null && style && style[name]) {
+				ret = style[name];
+			}
 
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+			// From the awesome hack by Dean Edwards
+			// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
 
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		// but not position css attributes, as those are proportional to the parent element instead
-		// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
-		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
+			// If we're not dealing with a regular pixel number
+			// but a number that has a weird ending, we need to convert it to pixels
+			// but not position css attributes, as those are proportional to the parent element instead
+			// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
+			if (rnumnonpx.test(ret) && !rposition.test(name)) {
 
-			// Remember the original values
-			left = style.left;
-			rs = elem.runtimeStyle;
-			rsLeft = rs && rs.left;
+				// Remember the original values
+				left = style.left;
+				rs = elem.runtimeStyle;
+				rsLeft = rs && rs.left;
 
-			// Put in the new values to get a computed value out
-			if ( rsLeft ) {
-				rs.left = elem.currentStyle.left;
-			}
-			style.left = name === "fontSize" ? "1em" : ret;
-			ret = style.pixelLeft + "px";
+				// Put in the new values to get a computed value out
+				if (rsLeft) {
+					rs.left = elem.currentStyle.left;
+				}
+				style.left = name === "fontSize" ? "1em" : ret;
+				ret = style.pixelLeft + "px";
 
-			// Revert the changed values
-			style.left = left;
-			if ( rsLeft ) {
-				rs.left = rsLeft;
+				// Revert the changed values
+				style.left = left;
+				if (rsLeft) {
+					rs.left = rsLeft;
+				}
 			}
-		}
-
-		return ret === "" ? "auto" : ret;
-	};
-}
 
-function setPositiveNumber( elem, value, subtract ) {
-	var matches = rnumsplit.exec( value );
-	return matches ?
-		// Guard against undefined "subtract", e.g., when used as in cssHooks
-		Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-		value;
-}
+			return ret === "" ? "auto" : ret;
+		};
+	}
 
-function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-		// If we already have the right measurement, avoid augmentation
-		4 :
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
+	function setPositiveNumber(elem, value, subtract) {
+		var matches = rnumsplit.exec(value);
+		return matches ?
+			// Guard against undefined "subtract", e.g., when used as in cssHooks
+			Math.max(0, matches[1] - (subtract || 0)) + (matches[2] || "px") :
+			value;
+	}
 
-		val = 0;
+	function augmentWidthOrHeight(elem, name, extra, isBorderBox, styles) {
+		var i = extra === (isBorderBox ? "border" : "content") ?
+				// If we already have the right measurement, avoid augmentation
+				4 :
+				// Otherwise initialize for horizontal or vertical properties
+				name === "width" ? 1 : 0,
 
-	for ( ; i < 4; i += 2 ) {
-		// both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
-		}
+			val = 0;
 
-		if ( isBorderBox ) {
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+		for (; i < 4; i += 2) {
+			// both box models exclude margin, so add it if we want it
+			if (extra === "margin") {
+				val += jQuery.css(elem, extra + cssExpand[i], true, styles);
 			}
 
-			// at this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		} else {
-			// at this point, extra isn't content, so add padding
-			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
+			if (isBorderBox) {
+				// border-box includes padding, so remove it if we want content
+				if (extra === "content") {
+					val -= jQuery.css(elem, "padding" + cssExpand[i], true, styles);
+				}
+
+				// at this point, extra isn't border nor margin, so remove border
+				if (extra !== "margin") {
+					val -= jQuery.css(elem, "border" + cssExpand[i] + "Width", true, styles);
+				}
+			} else {
+				// at this point, extra isn't content, so add padding
+				val += jQuery.css(elem, "padding" + cssExpand[i], true, styles);
 
-			// at this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
+				// at this point, extra isn't content nor padding, so add border
+				if (extra !== "padding") {
+					val += jQuery.css(elem, "border" + cssExpand[i] + "Width", true, styles);
+				}
 			}
 		}
+
+		return val;
 	}
 
-	return val;
-}
+	function getWidthOrHeight(elem, name, extra) {
 
-function getWidthOrHeight( elem, name, extra ) {
+		// Start with offset property, which is equivalent to the border-box value
+		var valueIsBorderBox = true,
+			val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+			styles = getStyles(elem),
+			isBorderBox = jQuery.support.boxSizing && jQuery.css(elem, "boxSizing", false, styles) === "border-box";
 
-	// Start with offset property, which is equivalent to the border-box value
-	var valueIsBorderBox = true,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		styles = getStyles( elem ),
-		isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
+		// some non-html elements return undefined for offsetWidth, so check for null/undefined
+		// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
+		// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
+		if (val <= 0 || val == null) {
+			// Fall back to computed then uncomputed css if necessary
+			val = curCSS(elem, name, styles);
+			if (val < 0 || val == null) {
+				val = elem.style[name];
+			}
 
-	// some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name, styles );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
+			// Computed unit is not pixels. Stop here and return.
+			if (rnumnonpx.test(val)) {
+				return val;
+			}
 
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test(val) ) {
-			return val;
-		}
+			// we need the check for style in case a browser which returns unreliable values
+			// for getComputedStyle silently falls back to the reliable elem.style
+			valueIsBorderBox = isBorderBox && (jQuery.support.boxSizingReliable || val === elem.style[name]);
 
-		// we need the check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] );
+			// Normalize "", auto, and prepare for extra
+			val = parseFloat(val) || 0;
+		}
 
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
+		// use the active box-sizing model to add/subtract irrelevant styles
+		return (val +
+			augmentWidthOrHeight(
+				elem,
+				name,
+				extra || (isBorderBox ? "border" : "content"),
+				valueIsBorderBox,
+				styles
+			)
+		) + "px";
 	}
 
-	// use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox,
-			styles
-		)
-	) + "px";
-}
-
 // Try to determine the default display value of an element
-function css_defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
+	function css_defaultDisplay(nodeName) {
+		var doc = document,
+			display = elemdisplay[nodeName];
 
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
+		if (!display) {
+			display = actualDisplay(nodeName, doc);
 
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-			// Use the already-created iframe if possible
-			iframe = ( iframe ||
-				jQuery("<iframe frameborder='0' width='0' height='0'/>")
-				.css( "cssText", "display:block !important" )
-			).appendTo( doc.documentElement );
+			// If the simple way fails, read from inside an iframe
+			if (display === "none" || !display) {
+				// Use the already-created iframe if possible
+				iframe = (iframe ||
+					jQuery("<iframe frameborder='0' width='0' height='0'/>")
+						.css("cssText", "display:block !important")
+				).appendTo(doc.documentElement);
 
-			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
-			doc = ( iframe[0].contentWindow || iframe[0].contentDocument ).document;
-			doc.write("<!doctype html><html><body>");
-			doc.close();
+				// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
+				doc = (iframe[0].contentWindow || iframe[0].contentDocument).document;
+				doc.write("<!doctype html><html><body>");
+				doc.close();
 
-			display = actualDisplay( nodeName, doc );
-			iframe.detach();
+				display = actualDisplay(nodeName, doc);
+				iframe.detach();
+			}
+
+			// Store the correct default display
+			elemdisplay[nodeName] = display;
 		}
 
-		// Store the correct default display
-		elemdisplay[ nodeName ] = display;
+		return display;
 	}
 
-	return display;
-}
-
 // Called ONLY from within css_defaultDisplay
-function actualDisplay( name, doc ) {
-	var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
-		display = jQuery.css( elem[0], "display" );
-	elem.remove();
-	return display;
-}
-
-jQuery.each([ "height", "width" ], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			if ( computed ) {
-				// certain elements can have dimension info if we invisibly show them
-				// however, it must have a current display style that would benefit from this
-				return elem.offsetWidth === 0 && rdisplayswap.test( jQuery.css( elem, "display" ) ) ?
-					jQuery.swap( elem, cssShow, function() {
-						return getWidthOrHeight( elem, name, extra );
-					}) :
-					getWidthOrHeight( elem, name, extra );
-			}
-		},
-
-		set: function( elem, value, extra ) {
-			var styles = extra && getStyles( elem );
-			return setPositiveNumber( elem, value, extra ?
-				augmentWidthOrHeight(
-					elem,
-					name,
-					extra,
-					jQuery.support.boxSizing && jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-					styles
-				) : 0
-			);
-		}
-	};
-});
-
-if ( !jQuery.support.opacity ) {
-	jQuery.cssHooks.opacity = {
-		get: function( elem, computed ) {
-			// IE uses filters for opacity
-			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
-				( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
-				computed ? "1" : "";
-		},
-
-		set: function( elem, value ) {
-			var style = elem.style,
-				currentStyle = elem.currentStyle,
-				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
-				filter = currentStyle && currentStyle.filter || style.filter || "";
-
-			// IE has trouble with opacity if it does not have layout
-			// Force it by setting the zoom level
-			style.zoom = 1;
-
-			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
-			// if value === "", then remove inline opacity #12685
-			if ( ( value >= 1 || value === "" ) &&
-					jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
-					style.removeAttribute ) {
-
-				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
-				// if "filter:" is present at all, clearType is disabled, we want to avoid this
-				// style.removeAttribute is IE Only, but so apparently is this code path...
-				style.removeAttribute( "filter" );
-
-				// if there is no filter style applied in a css rule or unset inline opacity, we are done
-				if ( value === "" || currentStyle && !currentStyle.filter ) {
-					return;
+	function actualDisplay(name, doc) {
+		var elem = jQuery(doc.createElement(name)).appendTo(doc.body),
+			display = jQuery.css(elem[0], "display");
+		elem.remove();
+		return display;
+	}
+
+	jQuery.each(["height", "width"], function (i, name) {
+		jQuery.cssHooks[name] = {
+			get: function (elem, computed, extra) {
+				if (computed) {
+					// certain elements can have dimension info if we invisibly show them
+					// however, it must have a current display style that would benefit from this
+					return elem.offsetWidth === 0 && rdisplayswap.test(jQuery.css(elem, "display")) ?
+						jQuery.swap(elem, cssShow, function () {
+							return getWidthOrHeight(elem, name, extra);
+						}) :
+						getWidthOrHeight(elem, name, extra);
 				}
+			},
+
+			set: function (elem, value, extra) {
+				var styles = extra && getStyles(elem);
+				return setPositiveNumber(elem, value, extra ?
+					augmentWidthOrHeight(
+						elem,
+						name,
+						extra,
+						jQuery.support.boxSizing && jQuery.css(elem, "boxSizing", false, styles) === "border-box",
+						styles
+					) : 0
+				);
 			}
+		};
+	});
 
-			// otherwise, set new filter values
-			style.filter = ralpha.test( filter ) ?
-				filter.replace( ralpha, opacity ) :
-				filter + " " + opacity;
-		}
-	};
-}
+	if (!jQuery.support.opacity) {
+		jQuery.cssHooks.opacity = {
+			get: function (elem, computed) {
+				// IE uses filters for opacity
+				return ropacity.test((computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "") ?
+					(0.01 * parseFloat(RegExp.$1)) + "" :
+					computed ? "1" : "";
+			},
 
-// These hooks cannot be added until DOM ready because the support test
-// for it is not run until after DOM ready
-jQuery(function() {
-	if ( !jQuery.support.reliableMarginRight ) {
-		jQuery.cssHooks.marginRight = {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-					// Work around by temporarily setting element display to inline-block
-					return jQuery.swap( elem, { "display": "inline-block" },
-						curCSS, [ elem, "marginRight" ] );
+			set: function (elem, value) {
+				var style = elem.style,
+					currentStyle = elem.currentStyle,
+					opacity = jQuery.isNumeric(value) ? "alpha(opacity=" + value * 100 + ")" : "",
+					filter = currentStyle && currentStyle.filter || style.filter || "";
+
+				// IE has trouble with opacity if it does not have layout
+				// Force it by setting the zoom level
+				style.zoom = 1;
+
+				// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
+				// if value === "", then remove inline opacity #12685
+				if ((value >= 1 || value === "") &&
+					jQuery.trim(filter.replace(ralpha, "")) === "" &&
+					style.removeAttribute) {
+
+					// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
+					// if "filter:" is present at all, clearType is disabled, we want to avoid this
+					// style.removeAttribute is IE Only, but so apparently is this code path...
+					style.removeAttribute("filter");
+
+					// if there is no filter style applied in a css rule or unset inline opacity, we are done
+					if (value === "" || currentStyle && !currentStyle.filter) {
+						return;
+					}
 				}
+
+				// otherwise, set new filter values
+				style.filter = ralpha.test(filter) ?
+					filter.replace(ralpha, opacity) :
+					filter + " " + opacity;
 			}
 		};
 	}
 
-	// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-	// getComputedStyle returns percent when specified for top/left/bottom/right
-	// rather than make the css module depend on the offset module, we just check for it here
-	if ( !jQuery.support.pixelPosition && jQuery.fn.position ) {
-		jQuery.each( [ "top", "left" ], function( i, prop ) {
-			jQuery.cssHooks[ prop ] = {
-				get: function( elem, computed ) {
-					if ( computed ) {
-						computed = curCSS( elem, prop );
-						// if curCSS returns percentage, fallback to offset
-						return rnumnonpx.test( computed ) ?
-							jQuery( elem ).position()[ prop ] + "px" :
-							computed;
+// These hooks cannot be added until DOM ready because the support test
+// for it is not run until after DOM ready
+	jQuery(function () {
+		if (!jQuery.support.reliableMarginRight) {
+			jQuery.cssHooks.marginRight = {
+				get: function (elem, computed) {
+					if (computed) {
+						// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+						// Work around by temporarily setting element display to inline-block
+						return jQuery.swap(elem, {"display": "inline-block"},
+							curCSS, [elem, "marginRight"]);
 					}
 				}
 			};
-		});
-	}
+		}
 
-});
+		// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
+		// getComputedStyle returns percent when specified for top/left/bottom/right
+		// rather than make the css module depend on the offset module, we just check for it here
+		if (!jQuery.support.pixelPosition && jQuery.fn.position) {
+			jQuery.each(["top", "left"], function (i, prop) {
+				jQuery.cssHooks[prop] = {
+					get: function (elem, computed) {
+						if (computed) {
+							computed = curCSS(elem, prop);
+							// if curCSS returns percentage, fallback to offset
+							return rnumnonpx.test(computed) ?
+								jQuery(elem).position()[prop] + "px" :
+								computed;
+						}
+					}
+				};
+			});
+		}
 
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.hidden = function( elem ) {
-		// Support: Opera <= 12.12
-		// Opera reports offsetWidths and offsetHeights less than zero on some elements
-		return elem.offsetWidth <= 0 && elem.offsetHeight <= 0 ||
-			(!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
-	};
+	});
 
-	jQuery.expr.filters.visible = function( elem ) {
-		return !jQuery.expr.filters.hidden( elem );
-	};
-}
+	if (jQuery.expr && jQuery.expr.filters) {
+		jQuery.expr.filters.hidden = function (elem) {
+			// Support: Opera <= 12.12
+			// Opera reports offsetWidths and offsetHeights less than zero on some elements
+			return elem.offsetWidth <= 0 && elem.offsetHeight <= 0 ||
+				(!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css(elem, "display")) === "none");
+		};
+
+		jQuery.expr.filters.visible = function (elem) {
+			return !jQuery.expr.filters.hidden(elem);
+		};
+	}
 
 // These hooks are used by animate to expand properties
-jQuery.each({
-	margin: "",
-	padding: "",
-	border: "Width"
-}, function( prefix, suffix ) {
-	jQuery.cssHooks[ prefix + suffix ] = {
-		expand: function( value ) {
-			var i = 0,
-				expanded = {},
+	jQuery.each({
+		margin: "",
+		padding: "",
+		border: "Width"
+	}, function (prefix, suffix) {
+		jQuery.cssHooks[prefix + suffix] = {
+			expand: function (value) {
+				var i = 0,
+					expanded = {},
 
-				// assumes a single number if not a string
-				parts = typeof value === "string" ? value.split(" ") : [ value ];
+					// assumes a single number if not a string
+					parts = typeof value === "string" ? value.split(" ") : [value];
+
+				for (; i < 4; i++) {
+					expanded[prefix + cssExpand[i] + suffix] =
+						parts[i] || parts[i - 2] || parts[0];
+				}
 
-			for ( ; i < 4; i++ ) {
-				expanded[ prefix + cssExpand[ i ] + suffix ] =
-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
+				return expanded;
 			}
+		};
 
-			return expanded;
+		if (!rmargin.test(prefix)) {
+			jQuery.cssHooks[prefix + suffix].set = setPositiveNumber;
 		}
-	};
-
-	if ( !rmargin.test( prefix ) ) {
-		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-	}
-});
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
-	rsubmittable = /^(?:input|select|textarea|keygen)/i;
-
-jQuery.fn.extend({
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-	serializeArray: function() {
-		return this.map(function(){
-			// Can add propHook for "elements" to filter or add form elements
-			var elements = jQuery.prop( this, "elements" );
-			return elements ? jQuery.makeArray( elements ) : this;
-		})
-		.filter(function(){
-			var type = this.type;
-			// Use .is(":disabled") so that fieldset[disabled] works
-			return this.name && !jQuery( this ).is( ":disabled" ) &&
-				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
-				( this.checked || !manipulation_rcheckableType.test( type ) );
-		})
-		.map(function( i, elem ){
-			var val = jQuery( this ).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val ){
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					}) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		}).get();
-	}
-});
+	});
+	var r20 = /%20/g,
+		rbracket = /\[\]$/,
+		rCRLF = /\r?\n/g,
+		rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
+		rsubmittable = /^(?:input|select|textarea|keygen)/i;
+
+	jQuery.fn.extend({
+		serialize: function () {
+			return jQuery.param(this.serializeArray());
+		},
+		serializeArray: function () {
+			return this.map(function () {
+				// Can add propHook for "elements" to filter or add form elements
+				var elements = jQuery.prop(this, "elements");
+				return elements ? jQuery.makeArray(elements) : this;
+			})
+				.filter(function () {
+					var type = this.type;
+					// Use .is(":disabled") so that fieldset[disabled] works
+					return this.name && !jQuery(this).is(":disabled") &&
+						rsubmittable.test(this.nodeName) && !rsubmitterTypes.test(type) &&
+						(this.checked || !manipulation_rcheckableType.test(type));
+				})
+				.map(function (i, elem) {
+					var val = jQuery(this).val();
+
+					return val == null ?
+						null :
+						jQuery.isArray(val) ?
+							jQuery.map(val, function (val) {
+								return {name: elem.name, value: val.replace(rCRLF, "\r\n")};
+							}) :
+							{name: elem.name, value: val.replace(rCRLF, "\r\n")};
+				}).get();
+		}
+	});
 
 //Serialize an array of form elements or a set of
 //key/values into a query string
-jQuery.param = function( a, traditional ) {
-	var prefix,
-		s = [],
-		add = function( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
-			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-		};
+	jQuery.param = function (a, traditional) {
+		var prefix,
+			s = [],
+			add = function (key, value) {
+				// If value is a function, invoke it and return its value
+				value = jQuery.isFunction(value) ? value() : (value == null ? "" : value);
+				s[s.length] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
+			};
 
-	// Set traditional to true for jQuery <= 1.3.2 behavior.
-	if ( traditional === undefined ) {
-		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-	}
+		// Set traditional to true for jQuery <= 1.3.2 behavior.
+		if (traditional === undefined) {
+			traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
+		}
 
-	// If an array was passed in, assume that it is an array of form elements.
-	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-		// Serialize the form elements
-		jQuery.each( a, function() {
-			add( this.name, this.value );
-		});
+		// If an array was passed in, assume that it is an array of form elements.
+		if (jQuery.isArray(a) || (a.jquery && !jQuery.isPlainObject(a))) {
+			// Serialize the form elements
+			jQuery.each(a, function () {
+				add(this.name, this.value);
+			});
 
-	} else {
-		// If traditional, encode the "old" way (the way 1.3.2 or older
-		// did it), otherwise encode params recursively.
-		for ( prefix in a ) {
-			buildParams( prefix, a[ prefix ], traditional, add );
+		} else {
+			// If traditional, encode the "old" way (the way 1.3.2 or older
+			// did it), otherwise encode params recursively.
+			for (prefix in a) {
+				buildParams(prefix, a[prefix], traditional, add);
+			}
 		}
-	}
 
-	// Return the resulting serialization
-	return s.join( "&" ).replace( r20, "+" );
-};
+		// Return the resulting serialization
+		return s.join("&").replace(r20, "+");
+	};
 
-function buildParams( prefix, obj, traditional, add ) {
-	var name;
+	function buildParams(prefix, obj, traditional, add) {
+		var name;
 
-	if ( jQuery.isArray( obj ) ) {
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-				// Treat each array item as a scalar.
-				add( prefix, v );
+		if (jQuery.isArray(obj)) {
+			// Serialize array item.
+			jQuery.each(obj, function (i, v) {
+				if (traditional || rbracket.test(prefix)) {
+					// Treat each array item as a scalar.
+					add(prefix, v);
 
-			} else {
-				// Item is non-scalar (array or object), encode its numeric index.
-				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
+				} else {
+					// Item is non-scalar (array or object), encode its numeric index.
+					buildParams(prefix + "[" + (typeof v === "object" ? i : "") + "]", v, traditional, add);
+				}
+			});
+
+		} else if (!traditional && jQuery.type(obj) === "object") {
+			// Serialize object item.
+			for (name in obj) {
+				buildParams(prefix + "[" + name + "]", obj[name], traditional, add);
 			}
-		});
 
-	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
-		// Serialize object item.
-		for ( name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+		} else {
+			// Serialize scalar item.
+			add(prefix, obj);
 		}
-
-	} else {
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
-	};
-});
-
-jQuery.fn.extend({
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	},
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
 	}
-});
-var
-	// Document location
-	ajaxLocParts,
-	ajaxLocation,
-	ajax_nonce = jQuery.now(),
-
-	ajax_rquery = /\?/,
-	rhash = /#.*$/,
-	rts = /([?&])_=[^&]*/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
-	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rprotocol = /^\/\//,
-	rurl = /^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,
-
-	// Keep a copy of the old load method
-	_load = jQuery.fn.load,
-
-	/* Prefilters
+
+	jQuery.each(("blur focus focusin focusout load resize scroll unload click dblclick " +
+		"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+		"change select submit keydown keypress keyup error contextmenu").split(" "), function (i, name) {
+
+		// Handle event binding
+		jQuery.fn[name] = function (data, fn) {
+			return arguments.length > 0 ?
+				this.on(name, null, data, fn) :
+				this.trigger(name);
+		};
+	});
+
+	jQuery.fn.extend({
+		hover: function (fnOver, fnOut) {
+			return this.mouseenter(fnOver).mouseleave(fnOut || fnOver);
+		},
+
+		bind: function (types, data, fn) {
+			return this.on(types, null, data, fn);
+		},
+		unbind: function (types, fn) {
+			return this.off(types, null, fn);
+		},
+
+		delegate: function (selector, types, data, fn) {
+			return this.on(types, selector, data, fn);
+		},
+		undelegate: function (selector, types, fn) {
+			// ( namespace ) or ( selector, types [, fn] )
+			return arguments.length === 1 ? this.off(selector, "**") : this.off(types, selector || "**", fn);
+		}
+	});
+	var
+		// Document location
+		ajaxLocParts,
+		ajaxLocation,
+		ajax_nonce = jQuery.now(),
+
+		ajax_rquery = /\?/,
+		rhash = /#.*$/,
+		rts = /([?&])_=[^&]*/,
+		rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
+		// #7653, #8125, #8152: local protocol detection
+		rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
+		rnoContent = /^(?:GET|HEAD)$/,
+		rprotocol = /^\/\//,
+		rurl = /^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,
+
+		// Keep a copy of the old load method
+		_load = jQuery.fn.load,
+
+		/* Prefilters
 	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
 	 * 2) These are called:
 	 *    - BEFORE asking for a transport
@@ -7611,191 +7631,191 @@ var
 	 * 4) the catchall symbol "*" can be used
 	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
 	 */
-	prefilters = {},
+		prefilters = {},
 
-	/* Transports bindings
+		/* Transports bindings
 	 * 1) key is the dataType
 	 * 2) the catchall symbol "*" can be used
 	 * 3) selection will start with transport dataType and THEN go to "*" if needed
 	 */
-	transports = {},
+		transports = {},
 
-	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-	allTypes = "*/".concat("*");
+		// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
+		allTypes = "*/".concat("*");
 
 // #8138, IE may throw an exception when accessing
 // a field from window.location if document.domain has been set
-try {
-	ajaxLocation = location.href;
-} catch( e ) {
-	// Use the href attribute of an A element
-	// since IE will modify it given document.location
-	ajaxLocation = document.createElement( "a" );
-	ajaxLocation.href = "";
-	ajaxLocation = ajaxLocation.href;
-}
+	try {
+		ajaxLocation = location.href;
+	} catch (e) {
+		// Use the href attribute of an A element
+		// since IE will modify it given document.location
+		ajaxLocation = document.createElement("a");
+		ajaxLocation.href = "";
+		ajaxLocation = ajaxLocation.href;
+	}
 
 // Segment location into parts
-ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
+	ajaxLocParts = rurl.exec(ajaxLocation.toLowerCase()) || [];
 
 // Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
+	function addToPrefiltersOrTransports(structure) {
 
-	// dataTypeExpression is optional and defaults to "*"
-	return function( dataTypeExpression, func ) {
+		// dataTypeExpression is optional and defaults to "*"
+		return function (dataTypeExpression, func) {
 
-		if ( typeof dataTypeExpression !== "string" ) {
-			func = dataTypeExpression;
-			dataTypeExpression = "*";
-		}
+			if (typeof dataTypeExpression !== "string") {
+				func = dataTypeExpression;
+				dataTypeExpression = "*";
+			}
 
-		var dataType,
-			i = 0,
-			dataTypes = dataTypeExpression.toLowerCase().match( core_rnotwhite ) || [];
+			var dataType,
+				i = 0,
+				dataTypes = dataTypeExpression.toLowerCase().match(core_rnotwhite) || [];
 
-		if ( jQuery.isFunction( func ) ) {
-			// For each dataType in the dataTypeExpression
-			while ( (dataType = dataTypes[i++]) ) {
-				// Prepend if requested
-				if ( dataType[0] === "+" ) {
-					dataType = dataType.slice( 1 ) || "*";
-					(structure[ dataType ] = structure[ dataType ] || []).unshift( func );
+			if (jQuery.isFunction(func)) {
+				// For each dataType in the dataTypeExpression
+				while ((dataType = dataTypes[i++])) {
+					// Prepend if requested
+					if (dataType[0] === "+") {
+						dataType = dataType.slice(1) || "*";
+						(structure[dataType] = structure[dataType] || []).unshift(func);
 
-				// Otherwise append
-				} else {
-					(structure[ dataType ] = structure[ dataType ] || []).push( func );
+						// Otherwise append
+					} else {
+						(structure[dataType] = structure[dataType] || []).push(func);
+					}
 				}
 			}
-		}
-	};
-}
+		};
+	}
 
 // Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
-
-	var inspected = {},
-		seekingTransport = ( structure === transports );
-
-	function inspect( dataType ) {
-		var selected;
-		inspected[ dataType ] = true;
-		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
-			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
-			if( typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[ dataTypeOrTransport ] ) {
-				options.dataTypes.unshift( dataTypeOrTransport );
-				inspect( dataTypeOrTransport );
-				return false;
-			} else if ( seekingTransport ) {
-				return !( selected = dataTypeOrTransport );
-			}
-		});
-		return selected;
-	}
+	function inspectPrefiltersOrTransports(structure, options, originalOptions, jqXHR) {
+
+		var inspected = {},
+			seekingTransport = (structure === transports);
+
+		function inspect(dataType) {
+			var selected;
+			inspected[dataType] = true;
+			jQuery.each(structure[dataType] || [], function (_, prefilterOrFactory) {
+				var dataTypeOrTransport = prefilterOrFactory(options, originalOptions, jqXHR);
+				if (typeof dataTypeOrTransport === "string" && !seekingTransport && !inspected[dataTypeOrTransport]) {
+					options.dataTypes.unshift(dataTypeOrTransport);
+					inspect(dataTypeOrTransport);
+					return false;
+				} else if (seekingTransport) {
+					return !(selected = dataTypeOrTransport);
+				}
+			});
+			return selected;
+		}
 
-	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
-}
+		return inspect(options.dataTypes[0]) || !inspected["*"] && inspect("*");
+	}
 
 // A special extend for ajax options
 // that takes "flat" options (not to be deep extended)
 // Fixes #9887
-function ajaxExtend( target, src ) {
-	var deep, key,
-		flatOptions = jQuery.ajaxSettings.flatOptions || {};
+	function ajaxExtend(target, src) {
+		var deep, key,
+			flatOptions = jQuery.ajaxSettings.flatOptions || {};
 
-	for ( key in src ) {
-		if ( src[ key ] !== undefined ) {
-			( flatOptions[ key ] ? target : ( deep || (deep = {}) ) )[ key ] = src[ key ];
+		for (key in src) {
+			if (src[key] !== undefined) {
+				(flatOptions[key] ? target : (deep || (deep = {})))[key] = src[key];
+			}
+		}
+		if (deep) {
+			jQuery.extend(true, target, deep);
 		}
-	}
-	if ( deep ) {
-		jQuery.extend( true, target, deep );
-	}
-
-	return target;
-}
 
-jQuery.fn.load = function( url, params, callback ) {
-	if ( typeof url !== "string" && _load ) {
-		return _load.apply( this, arguments );
+		return target;
 	}
 
-	var selector, response, type,
-		self = this,
-		off = url.indexOf(" ");
+	jQuery.fn.load = function (url, params, callback) {
+		if (typeof url !== "string" && _load) {
+			return _load.apply(this, arguments);
+		}
 
-	if ( off >= 0 ) {
-		selector = url.slice( off, url.length );
-		url = url.slice( 0, off );
-	}
+		var selector, response, type,
+			self = this,
+			off = url.indexOf(" ");
+
+		if (off >= 0) {
+			selector = url.slice(off, url.length);
+			url = url.slice(0, off);
+		}
 
-	// If it's a function
-	if ( jQuery.isFunction( params ) ) {
+		// If it's a function
+		if (jQuery.isFunction(params)) {
 
-		// We assume that it's the callback
-		callback = params;
-		params = undefined;
+			// We assume that it's the callback
+			callback = params;
+			params = undefined;
 
-	// Otherwise, build a param string
-	} else if ( params && typeof params === "object" ) {
-		type = "POST";
-	}
+			// Otherwise, build a param string
+		} else if (params && typeof params === "object") {
+			type = "POST";
+		}
 
-	// If we have elements to modify, make the request
-	if ( self.length > 0 ) {
-		jQuery.ajax({
-			url: url,
+		// If we have elements to modify, make the request
+		if (self.length > 0) {
+			jQuery.ajax({
+				url: url,
 
-			// if "type" variable is undefined, then "GET" method will be used
-			type: type,
-			dataType: "html",
-			data: params
-		}).done(function( responseText ) {
+				// if "type" variable is undefined, then "GET" method will be used
+				type: type,
+				dataType: "html",
+				data: params
+			}).done(function (responseText) {
 
-			// Save response for use in complete callback
-			response = arguments;
+				// Save response for use in complete callback
+				response = arguments;
 
-			self.html( selector ?
+				self.html(selector ?
 
-				// If a selector was specified, locate the right elements in a dummy div
-				// Exclude scripts to avoid IE 'Permission Denied' errors
-				jQuery("<div>").append( jQuery.parseHTML( responseText ) ).find( selector ) :
+					// If a selector was specified, locate the right elements in a dummy div
+					// Exclude scripts to avoid IE 'Permission Denied' errors
+					jQuery("<div>").append(jQuery.parseHTML(responseText)).find(selector) :
 
-				// Otherwise use the full result
-				responseText );
+					// Otherwise use the full result
+					responseText);
 
-		}).complete( callback && function( jqXHR, status ) {
-			self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
-		});
-	}
+			}).complete(callback && function (jqXHR, status) {
+				self.each(callback, response || [jqXHR.responseText, status, jqXHR]);
+			});
+		}
 
-	return this;
-};
+		return this;
+	};
 
 // Attach a bunch of functions for handling util AJAX events
-jQuery.each( [ "ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend" ], function( i, type ){
-	jQuery.fn[ type ] = function( fn ){
-		return this.on( type, fn );
-	};
-});
-
-jQuery.extend({
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {},
-
-	ajaxSettings: {
-		url: ajaxLocation,
-		type: "GET",
-		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
-		global: true,
-		processData: true,
-		async: true,
-		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-		/*
+	jQuery.each(["ajaxStart", "ajaxStop", "ajaxComplete", "ajaxError", "ajaxSuccess", "ajaxSend"], function (i, type) {
+		jQuery.fn[type] = function (fn) {
+			return this.on(type, fn);
+		};
+	});
+
+	jQuery.extend({
+
+		// Counter for holding the number of active queries
+		active: 0,
+
+		// Last-Modified header cache for next request
+		lastModified: {},
+		etag: {},
+
+		ajaxSettings: {
+			url: ajaxLocation,
+			type: "GET",
+			isLocal: rlocalProtocol.test(ajaxLocParts[1]),
+			global: true,
+			processData: true,
+			async: true,
+			contentType: "application/x-www-form-urlencoded; charset=UTF-8",
+			/*
 		timeout: 0,
 		data: null,
 		dataType: null,
@@ -7807,1983 +7827,1994 @@ jQuery.extend({
 		headers: {},
 		*/
 
-		accepts: {
-			"*": allTypes,
-			text: "text/plain",
-			html: "text/html",
-			xml: "application/xml, text/xml",
-			json: "application/json, text/javascript"
-		},
+			accepts: {
+				"*": allTypes,
+				text: "text/plain",
+				html: "text/html",
+				xml: "application/xml, text/xml",
+				json: "application/json, text/javascript"
+			},
 
-		contents: {
-			xml: /xml/,
-			html: /html/,
-			json: /json/
-		},
+			contents: {
+				xml: /xml/,
+				html: /html/,
+				json: /json/
+			},
 
-		responseFields: {
-			xml: "responseXML",
-			text: "responseText",
-			json: "responseJSON"
-		},
+			responseFields: {
+				xml: "responseXML",
+				text: "responseText",
+				json: "responseJSON"
+			},
 
-		// Data converters
-		// Keys separate source (or catchall "*") and destination types with a single space
-		converters: {
+			// Data converters
+			// Keys separate source (or catchall "*") and destination types with a single space
+			converters: {
 
-			// Convert anything to text
-			"* text": String,
-
-			// Text to html (true = no transformation)
-			"text html": true,
-
-			// Evaluate text as a json expression
-			"text json": jQuery.parseJSON,
-
-			// Parse text as xml
-			"text xml": jQuery.parseXML
-		},
-
-		// For options that shouldn't be deep extended:
-		// you can add your own custom options here if
-		// and when you create one that shouldn't be
-		// deep extended (see ajaxExtend)
-		flatOptions: {
-			url: true,
-			context: true
-		}
-	},
-
-	// Creates a full fledged settings object into target
-	// with both ajaxSettings and settings fields.
-	// If target is omitted, writes into ajaxSettings.
-	ajaxSetup: function( target, settings ) {
-		return settings ?
-
-			// Building a settings object
-			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
-
-			// Extending ajaxSettings
-			ajaxExtend( jQuery.ajaxSettings, target );
-	},
-
-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-	ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-	// Main method
-	ajax: function( url, options ) {
-
-		// If url is an object, simulate pre-1.5 signature
-		if ( typeof url === "object" ) {
-			options = url;
-			url = undefined;
-		}
-
-		// Force options to be an object
-		options = options || {};
-
-		var // Cross-domain detection vars
-			parts,
-			// Loop variable
-			i,
-			// URL without anti-cache param
-			cacheURL,
-			// Response headers as string
-			responseHeadersString,
-			// timeout handle
-			timeoutTimer,
-
-			// To know if global events are to be dispatched
-			fireGlobals,
-
-			transport,
-			// Response headers
-			responseHeaders,
-			// Create the final options object
-			s = jQuery.ajaxSetup( {}, options ),
-			// Callbacks context
-			callbackContext = s.context || s,
-			// Context for global events is callbackContext if it is a DOM node or jQuery collection
-			globalEventContext = s.context && ( callbackContext.nodeType || callbackContext.jquery ) ?
-				jQuery( callbackContext ) :
-				jQuery.event,
-			// Deferreds
-			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery.Callbacks("once memory"),
-			// Status-dependent callbacks
-			statusCode = s.statusCode || {},
-			// Headers (they are sent all at once)
-			requestHeaders = {},
-			requestHeadersNames = {},
-			// The jqXHR state
-			state = 0,
-			// Default abort message
-			strAbort = "canceled",
-			// Fake xhr
-			jqXHR = {
-				readyState: 0,
-
-				// Builds headers hashtable if needed
-				getResponseHeader: function( key ) {
-					var match;
-					if ( state === 2 ) {
-						if ( !responseHeaders ) {
-							responseHeaders = {};
-							while ( (match = rheaders.exec( responseHeadersString )) ) {
-								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
-							}
-						}
-						match = responseHeaders[ key.toLowerCase() ];
-					}
-					return match == null ? null : match;
-				},
+				// Convert anything to text
+				"* text": String,
 
-				// Raw string
-				getAllResponseHeaders: function() {
-					return state === 2 ? responseHeadersString : null;
-				},
+				// Text to html (true = no transformation)
+				"text html": true,
 
-				// Caches the header
-				setRequestHeader: function( name, value ) {
-					var lname = name.toLowerCase();
-					if ( !state ) {
-						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
-						requestHeaders[ name ] = value;
-					}
-					return this;
-				},
+				// Evaluate text as a json expression
+				"text json": jQuery.parseJSON,
 
-				// Overrides response content-type header
-				overrideMimeType: function( type ) {
-					if ( !state ) {
-						s.mimeType = type;
-					}
-					return this;
-				},
+				// Parse text as xml
+				"text xml": jQuery.parseXML
+			},
+
+			// For options that shouldn't be deep extended:
+			// you can add your own custom options here if
+			// and when you create one that shouldn't be
+			// deep extended (see ajaxExtend)
+			flatOptions: {
+				url: true,
+				context: true
+			}
+		},
 
+		// Creates a full fledged settings object into target
+		// with both ajaxSettings and settings fields.
+		// If target is omitted, writes into ajaxSettings.
+		ajaxSetup: function (target, settings) {
+			return settings ?
+
+				// Building a settings object
+				ajaxExtend(ajaxExtend(target, jQuery.ajaxSettings), settings) :
+
+				// Extending ajaxSettings
+				ajaxExtend(jQuery.ajaxSettings, target);
+		},
+
+		ajaxPrefilter: addToPrefiltersOrTransports(prefilters),
+		ajaxTransport: addToPrefiltersOrTransports(transports),
+
+		// Main method
+		ajax: function (url, options) {
+
+			// If url is an object, simulate pre-1.5 signature
+			if (typeof url === "object") {
+				options = url;
+				url = undefined;
+			}
+
+			// Force options to be an object
+			options = options || {};
+
+			var // Cross-domain detection vars
+				parts,
+				// Loop variable
+				i,
+				// URL without anti-cache param
+				cacheURL,
+				// Response headers as string
+				responseHeadersString,
+				// timeout handle
+				timeoutTimer,
+
+				// To know if global events are to be dispatched
+				fireGlobals,
+
+				transport,
+				// Response headers
+				responseHeaders,
+				// Create the final options object
+				s = jQuery.ajaxSetup({}, options),
+				// Callbacks context
+				callbackContext = s.context || s,
+				// Context for global events is callbackContext if it is a DOM node or jQuery collection
+				globalEventContext = s.context && (callbackContext.nodeType || callbackContext.jquery) ?
+					jQuery(callbackContext) :
+					jQuery.event,
+				// Deferreds
+				deferred = jQuery.Deferred(),
+				completeDeferred = jQuery.Callbacks("once memory"),
 				// Status-dependent callbacks
-				statusCode: function( map ) {
-					var code;
-					if ( map ) {
-						if ( state < 2 ) {
-							for ( code in map ) {
-								// Lazy-add the new callback in a way that preserves old ones
-								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
+				statusCode = s.statusCode || {},
+				// Headers (they are sent all at once)
+				requestHeaders = {},
+				requestHeadersNames = {},
+				// The jqXHR state
+				state = 0,
+				// Default abort message
+				strAbort = "canceled",
+				// Fake xhr
+				jqXHR = {
+					readyState: 0,
+
+					// Builds headers hashtable if needed
+					getResponseHeader: function (key) {
+						var match;
+						if (state === 2) {
+							if (!responseHeaders) {
+								responseHeaders = {};
+								while ((match = rheaders.exec(responseHeadersString))) {
+									responseHeaders[match[1].toLowerCase()] = match[2];
+								}
 							}
-						} else {
-							// Execute the appropriate callbacks
-							jqXHR.always( map[ jqXHR.status ] );
+							match = responseHeaders[key.toLowerCase()];
 						}
-					}
-					return this;
-				},
+						return match == null ? null : match;
+					},
+
+					// Raw string
+					getAllResponseHeaders: function () {
+						return state === 2 ? responseHeadersString : null;
+					},
+
+					// Caches the header
+					setRequestHeader: function (name, value) {
+						var lname = name.toLowerCase();
+						if (!state) {
+							name = requestHeadersNames[lname] = requestHeadersNames[lname] || name;
+							requestHeaders[name] = value;
+						}
+						return this;
+					},
 
-				// Cancel the request
-				abort: function( statusText ) {
-					var finalText = statusText || strAbort;
-					if ( transport ) {
-						transport.abort( finalText );
+					// Overrides response content-type header
+					overrideMimeType: function (type) {
+						if (!state) {
+							s.mimeType = type;
+						}
+						return this;
+					},
+
+					// Status-dependent callbacks
+					statusCode: function (map) {
+						var code;
+						if (map) {
+							if (state < 2) {
+								for (code in map) {
+									// Lazy-add the new callback in a way that preserves old ones
+									statusCode[code] = [statusCode[code], map[code]];
+								}
+							} else {
+								// Execute the appropriate callbacks
+								jqXHR.always(map[jqXHR.status]);
+							}
+						}
+						return this;
+					},
+
+					// Cancel the request
+					abort: function (statusText) {
+						var finalText = statusText || strAbort;
+						if (transport) {
+							transport.abort(finalText);
+						}
+						done(0, finalText);
+						return this;
 					}
-					done( 0, finalText );
-					return this;
-				}
-			};
+				};
 
-		// Attach deferreds
-		deferred.promise( jqXHR ).complete = completeDeferred.add;
-		jqXHR.success = jqXHR.done;
-		jqXHR.error = jqXHR.fail;
-
-		// Remove hash character (#7531: and string promotion)
-		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
-		// Handle falsy url in the settings object (#10093: consistency with old signature)
-		// We also use the url parameter if available
-		s.url = ( ( url || s.url || ajaxLocation ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
-
-		// Alias method option to type as per ticket #12004
-		s.type = options.method || options.type || s.method || s.type;
-
-		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( core_rnotwhite ) || [""];
-
-		// A cross-domain request is in order when we have a protocol:host:port mismatch
-		if ( s.crossDomain == null ) {
-			parts = rurl.exec( s.url.toLowerCase() );
-			s.crossDomain = !!( parts &&
-				( parts[ 1 ] !== ajaxLocParts[ 1 ] || parts[ 2 ] !== ajaxLocParts[ 2 ] ||
-					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? "80" : "443" ) ) !==
-						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? "80" : "443" ) ) )
-			);
-		}
+			// Attach deferreds
+			deferred.promise(jqXHR).complete = completeDeferred.add;
+			jqXHR.success = jqXHR.done;
+			jqXHR.error = jqXHR.fail;
+
+			// Remove hash character (#7531: and string promotion)
+			// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
+			// Handle falsy url in the settings object (#10093: consistency with old signature)
+			// We also use the url parameter if available
+			s.url = ((url || s.url || ajaxLocation) + "").replace(rhash, "").replace(rprotocol, ajaxLocParts[1] + "//");
+
+			// Alias method option to type as per ticket #12004
+			s.type = options.method || options.type || s.method || s.type;
+
+			// Extract dataTypes list
+			s.dataTypes = jQuery.trim(s.dataType || "*").toLowerCase().match(core_rnotwhite) || [""];
+
+			// A cross-domain request is in order when we have a protocol:host:port mismatch
+			if (s.crossDomain == null) {
+				parts = rurl.exec(s.url.toLowerCase());
+				s.crossDomain = !!(parts &&
+					(parts[1] !== ajaxLocParts[1] || parts[2] !== ajaxLocParts[2] ||
+						(parts[3] || (parts[1] === "http:" ? "80" : "443")) !==
+						(ajaxLocParts[3] || (ajaxLocParts[1] === "http:" ? "80" : "443")))
+				);
+			}
 
-		// Convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
+			// Convert data if not already a string
+			if (s.data && s.processData && typeof s.data !== "string") {
+				s.data = jQuery.param(s.data, s.traditional);
+			}
 
-		// Apply prefilters
-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+			// Apply prefilters
+			inspectPrefiltersOrTransports(prefilters, s, options, jqXHR);
 
-		// If request was aborted inside a prefilter, stop there
-		if ( state === 2 ) {
-			return jqXHR;
-		}
+			// If request was aborted inside a prefilter, stop there
+			if (state === 2) {
+				return jqXHR;
+			}
 
-		// We can fire global events as of now if asked to
-		fireGlobals = s.global;
+			// We can fire global events as of now if asked to
+			fireGlobals = s.global;
 
-		// Watch for a new set of requests
-		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger("ajaxStart");
-		}
+			// Watch for a new set of requests
+			if (fireGlobals && jQuery.active++ === 0) {
+				jQuery.event.trigger("ajaxStart");
+			}
 
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
+			// Uppercase the type
+			s.type = s.type.toUpperCase();
 
-		// Determine if request has content
-		s.hasContent = !rnoContent.test( s.type );
+			// Determine if request has content
+			s.hasContent = !rnoContent.test(s.type);
 
-		// Save the URL in case we're toying with the If-Modified-Since
-		// and/or If-None-Match header later on
-		cacheURL = s.url;
+			// Save the URL in case we're toying with the If-Modified-Since
+			// and/or If-None-Match header later on
+			cacheURL = s.url;
 
-		// More options handling for requests with no content
-		if ( !s.hasContent ) {
+			// More options handling for requests with no content
+			if (!s.hasContent) {
 
-			// If data is available, append data to url
-			if ( s.data ) {
-				cacheURL = ( s.url += ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
-				// #9682: remove data so that it's not used in an eventual retry
-				delete s.data;
-			}
+				// If data is available, append data to url
+				if (s.data) {
+					cacheURL = (s.url += (ajax_rquery.test(cacheURL) ? "&" : "?") + s.data);
+					// #9682: remove data so that it's not used in an eventual retry
+					delete s.data;
+				}
 
-			// Add anti-cache in url if needed
-			if ( s.cache === false ) {
-				s.url = rts.test( cacheURL ) ?
+				// Add anti-cache in url if needed
+				if (s.cache === false) {
+					s.url = rts.test(cacheURL) ?
 
-					// If there is already a '_' parameter, set its value
-					cacheURL.replace( rts, "$1_=" + ajax_nonce++ ) :
+						// If there is already a '_' parameter, set its value
+						cacheURL.replace(rts, "$1_=" + ajax_nonce++) :
 
-					// Otherwise add one to the end
-					cacheURL + ( ajax_rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ajax_nonce++;
+						// Otherwise add one to the end
+						cacheURL + (ajax_rquery.test(cacheURL) ? "&" : "?") + "_=" + ajax_nonce++;
+				}
 			}
-		}
 
-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-		if ( s.ifModified ) {
-			if ( jQuery.lastModified[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
-			}
-			if ( jQuery.etag[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
+			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+			if (s.ifModified) {
+				if (jQuery.lastModified[cacheURL]) {
+					jqXHR.setRequestHeader("If-Modified-Since", jQuery.lastModified[cacheURL]);
+				}
+				if (jQuery.etag[cacheURL]) {
+					jqXHR.setRequestHeader("If-None-Match", jQuery.etag[cacheURL]);
+				}
 			}
-		}
 
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
+			// Set the correct header, if data is being sent
+			if (s.data && s.hasContent && s.contentType !== false || options.contentType) {
+				jqXHR.setRequestHeader("Content-Type", s.contentType);
+			}
 
-		// Set the Accepts header for the server, depending on the dataType
-		jqXHR.setRequestHeader(
-			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
-				s.accepts[ "*" ]
-		);
+			// Set the Accepts header for the server, depending on the dataType
+			jqXHR.setRequestHeader(
+				"Accept",
+				s.dataTypes[0] && s.accepts[s.dataTypes[0]] ?
+					s.accepts[s.dataTypes[0]] + (s.dataTypes[0] !== "*" ? ", " + allTypes + "; q=0.01" : "") :
+					s.accepts["*"]
+			);
 
-		// Check for headers option
-		for ( i in s.headers ) {
-			jqXHR.setRequestHeader( i, s.headers[ i ] );
-		}
+			// Check for headers option
+			for (i in s.headers) {
+				jqXHR.setRequestHeader(i, s.headers[i]);
+			}
 
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
-			// Abort if not done already and return
-			return jqXHR.abort();
-		}
+			// Allow custom headers/mimetypes and early abort
+			if (s.beforeSend && (s.beforeSend.call(callbackContext, jqXHR, s) === false || state === 2)) {
+				// Abort if not done already and return
+				return jqXHR.abort();
+			}
 
-		// aborting is no longer a cancellation
-		strAbort = "abort";
+			// aborting is no longer a cancellation
+			strAbort = "abort";
 
-		// Install callbacks on deferreds
-		for ( i in { success: 1, error: 1, complete: 1 } ) {
-			jqXHR[ i ]( s[ i ] );
-		}
+			// Install callbacks on deferreds
+			for (i in {success: 1, error: 1, complete: 1}) {
+				jqXHR[i](s[i]);
+			}
 
-		// Get transport
-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+			// Get transport
+			transport = inspectPrefiltersOrTransports(transports, s, options, jqXHR);
 
-		// If no transport, we auto-abort
-		if ( !transport ) {
-			done( -1, "No Transport" );
-		} else {
-			jqXHR.readyState = 1;
+			// If no transport, we auto-abort
+			if (!transport) {
+				done(-1, "No Transport");
+			} else {
+				jqXHR.readyState = 1;
 
-			// Send global event
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-			}
-			// Timeout
-			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = setTimeout(function() {
-					jqXHR.abort("timeout");
-				}, s.timeout );
-			}
+				// Send global event
+				if (fireGlobals) {
+					globalEventContext.trigger("ajaxSend", [jqXHR, s]);
+				}
+				// Timeout
+				if (s.async && s.timeout > 0) {
+					timeoutTimer = setTimeout(function () {
+						jqXHR.abort("timeout");
+					}, s.timeout);
+				}
 
-			try {
-				state = 1;
-				transport.send( requestHeaders, done );
-			} catch ( e ) {
-				// Propagate exception as error if not done
-				if ( state < 2 ) {
-					done( -1, e );
-				// Simply rethrow otherwise
-				} else {
-					throw e;
+				try {
+					state = 1;
+					transport.send(requestHeaders, done);
+				} catch (e) {
+					// Propagate exception as error if not done
+					if (state < 2) {
+						done(-1, e);
+						// Simply rethrow otherwise
+					} else {
+						throw e;
+					}
 				}
 			}
-		}
 
-		// Callback for when everything is done
-		function done( status, nativeStatusText, responses, headers ) {
-			var isSuccess, success, error, response, modified,
-				statusText = nativeStatusText;
+			// Callback for when everything is done
+			function done(status, nativeStatusText, responses, headers) {
+				var isSuccess, success, error, response, modified,
+					statusText = nativeStatusText;
 
-			// Called once
-			if ( state === 2 ) {
-				return;
-			}
+				// Called once
+				if (state === 2) {
+					return;
+				}
 
-			// State is "done" now
-			state = 2;
+				// State is "done" now
+				state = 2;
 
-			// Clear timeout if it exists
-			if ( timeoutTimer ) {
-				clearTimeout( timeoutTimer );
-			}
+				// Clear timeout if it exists
+				if (timeoutTimer) {
+					clearTimeout(timeoutTimer);
+				}
 
-			// Dereference transport for early garbage collection
-			// (no matter how long the jqXHR object will be used)
-			transport = undefined;
+				// Dereference transport for early garbage collection
+				// (no matter how long the jqXHR object will be used)
+				transport = undefined;
 
-			// Cache response headers
-			responseHeadersString = headers || "";
+				// Cache response headers
+				responseHeadersString = headers || "";
 
-			// Set readyState
-			jqXHR.readyState = status > 0 ? 4 : 0;
+				// Set readyState
+				jqXHR.readyState = status > 0 ? 4 : 0;
 
-			// Determine if successful
-			isSuccess = status >= 200 && status < 300 || status === 304;
+				// Determine if successful
+				isSuccess = status >= 200 && status < 300 || status === 304;
 
-			// Get response data
-			if ( responses ) {
-				response = ajaxHandleResponses( s, jqXHR, responses );
-			}
+				// Get response data
+				if (responses) {
+					response = ajaxHandleResponses(s, jqXHR, responses);
+				}
 
-			// Convert no matter what (that way responseXXX fields are always set)
-			response = ajaxConvert( s, response, jqXHR, isSuccess );
+				// Convert no matter what (that way responseXXX fields are always set)
+				response = ajaxConvert(s, response, jqXHR, isSuccess);
 
-			// If successful, handle type chaining
-			if ( isSuccess ) {
+				// If successful, handle type chaining
+				if (isSuccess) {
 
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
-					modified = jqXHR.getResponseHeader("Last-Modified");
-					if ( modified ) {
-						jQuery.lastModified[ cacheURL ] = modified;
-					}
-					modified = jqXHR.getResponseHeader("etag");
-					if ( modified ) {
-						jQuery.etag[ cacheURL ] = modified;
+					// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+					if (s.ifModified) {
+						modified = jqXHR.getResponseHeader("Last-Modified");
+						if (modified) {
+							jQuery.lastModified[cacheURL] = modified;
+						}
+						modified = jqXHR.getResponseHeader("etag");
+						if (modified) {
+							jQuery.etag[cacheURL] = modified;
+						}
 					}
-				}
 
-				// if no content
-				if ( status === 204 || s.type === "HEAD" ) {
-					statusText = "nocontent";
+					// if no content
+					if (status === 204 || s.type === "HEAD") {
+						statusText = "nocontent";
 
-				// if not modified
-				} else if ( status === 304 ) {
-					statusText = "notmodified";
+						// if not modified
+					} else if (status === 304) {
+						statusText = "notmodified";
 
-				// If we have data, let's convert it
+						// If we have data, let's convert it
+					} else {
+						statusText = response.state;
+						success = response.data;
+						error = response.error;
+						isSuccess = !error;
+					}
 				} else {
-					statusText = response.state;
-					success = response.data;
-					error = response.error;
-					isSuccess = !error;
-				}
-			} else {
-				// We extract error from statusText
-				// then normalize statusText and status for non-aborts
-				error = statusText;
-				if ( status || !statusText ) {
-					statusText = "error";
-					if ( status < 0 ) {
-						status = 0;
+					// We extract error from statusText
+					// then normalize statusText and status for non-aborts
+					error = statusText;
+					if (status || !statusText) {
+						statusText = "error";
+						if (status < 0) {
+							status = 0;
+						}
 					}
 				}
-			}
 
-			// Set data for the fake xhr object
-			jqXHR.status = status;
-			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
+				// Set data for the fake xhr object
+				jqXHR.status = status;
+				jqXHR.statusText = (nativeStatusText || statusText) + "";
 
-			// Success/Error
-			if ( isSuccess ) {
-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-			} else {
-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-			}
+				// Success/Error
+				if (isSuccess) {
+					deferred.resolveWith(callbackContext, [success, statusText, jqXHR]);
+				} else {
+					deferred.rejectWith(callbackContext, [jqXHR, statusText, error]);
+				}
 
-			// Status-dependent callbacks
-			jqXHR.statusCode( statusCode );
-			statusCode = undefined;
+				// Status-dependent callbacks
+				jqXHR.statusCode(statusCode);
+				statusCode = undefined;
 
-			if ( fireGlobals ) {
-				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
-					[ jqXHR, s, isSuccess ? success : error ] );
-			}
+				if (fireGlobals) {
+					globalEventContext.trigger(isSuccess ? "ajaxSuccess" : "ajaxError",
+						[jqXHR, s, isSuccess ? success : error]);
+				}
 
-			// Complete
-			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
+				// Complete
+				completeDeferred.fireWith(callbackContext, [jqXHR, statusText]);
 
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
-				// Handle the global AJAX counter
-				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger("ajaxStop");
+				if (fireGlobals) {
+					globalEventContext.trigger("ajaxComplete", [jqXHR, s]);
+					// Handle the global AJAX counter
+					if (!(--jQuery.active)) {
+						jQuery.event.trigger("ajaxStop");
+					}
 				}
 			}
-		}
 
-		return jqXHR;
-	},
+			return jqXHR;
+		},
 
-	getJSON: function( url, data, callback ) {
-		return jQuery.get( url, data, callback, "json" );
-	},
+		getJSON: function (url, data, callback) {
+			return jQuery.get(url, data, callback, "json");
+		},
 
-	getScript: function( url, callback ) {
-		return jQuery.get( url, undefined, callback, "script" );
-	}
-});
-
-jQuery.each( [ "get", "post" ], function( i, method ) {
-	jQuery[ method ] = function( url, data, callback, type ) {
-		// shift arguments if data argument was omitted
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = undefined;
-		}
-
-		return jQuery.ajax({
-			url: url,
-			type: method,
-			dataType: type,
-			data: data,
-			success: callback
-		});
-	};
-});
+		getScript: function (url, callback) {
+			return jQuery.get(url, undefined, callback, "script");
+		}
+	});
+
+	jQuery.each(["get", "post"], function (i, method) {
+		jQuery[method] = function (url, data, callback, type) {
+			// shift arguments if data argument was omitted
+			if (jQuery.isFunction(data)) {
+				type = type || callback;
+				callback = data;
+				data = undefined;
+			}
+
+			return jQuery.ajax({
+				url: url,
+				type: method,
+				dataType: type,
+				data: data,
+				success: callback
+			});
+		};
+	});
 
-/* Handles responses to an ajax request:
+	/* Handles responses to an ajax request:
  * - finds the right dataType (mediates between content-type and expected dataType)
  * - returns the corresponding response
  */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-	var firstDataType, ct, finalDataType, type,
-		contents = s.contents,
-		dataTypes = s.dataTypes;
+	function ajaxHandleResponses(s, jqXHR, responses) {
+		var firstDataType, ct, finalDataType, type,
+			contents = s.contents,
+			dataTypes = s.dataTypes;
 
-	// Remove auto dataType and get content-type in the process
-	while( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
+		// Remove auto dataType and get content-type in the process
+		while (dataTypes[0] === "*") {
+			dataTypes.shift();
+			if (ct === undefined) {
+				ct = s.mimeType || jqXHR.getResponseHeader("Content-Type");
+			}
 		}
-	}
 
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
+		// Check if we're dealing with a known content-type
+		if (ct) {
+			for (type in contents) {
+				if (contents[type] && contents[type].test(ct)) {
+					dataTypes.unshift(type);
+					break;
+				}
 			}
 		}
-	}
 
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
-	} else {
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
+		// Check to see if we have a response for the expected dataType
+		if (dataTypes[0] in responses) {
+			finalDataType = dataTypes[0];
+		} else {
+			// Try convertible dataTypes
+			for (type in responses) {
+				if (!dataTypes[0] || s.converters[type + " " + dataTypes[0]]) {
+					finalDataType = type;
+					break;
+				}
+				if (!firstDataType) {
+					firstDataType = type;
+				}
 			}
+			// Or just use first one
+			finalDataType = finalDataType || firstDataType;
 		}
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
 
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
+		// If we found a dataType
+		// We add the dataType to the list if needed
+		// and return the corresponding response
+		if (finalDataType) {
+			if (finalDataType !== dataTypes[0]) {
+				dataTypes.unshift(finalDataType);
+			}
+			return responses[finalDataType];
 		}
-		return responses[ finalDataType ];
 	}
-}
 
-/* Chain conversions given the request and the original response
+	/* Chain conversions given the request and the original response
  * Also sets the responseXXX fields on the jqXHR instance
  */
-function ajaxConvert( s, response, jqXHR, isSuccess ) {
-	var conv2, current, conv, tmp, prev,
-		converters = {},
-		// Work with a copy of dataTypes in case we need to modify it for conversion
-		dataTypes = s.dataTypes.slice();
+	function ajaxConvert(s, response, jqXHR, isSuccess) {
+		var conv2, current, conv, tmp, prev,
+			converters = {},
+			// Work with a copy of dataTypes in case we need to modify it for conversion
+			dataTypes = s.dataTypes.slice();
 
-	// Create converters map with lowercased keys
-	if ( dataTypes[ 1 ] ) {
-		for ( conv in s.converters ) {
-			converters[ conv.toLowerCase() ] = s.converters[ conv ];
+		// Create converters map with lowercased keys
+		if (dataTypes[1]) {
+			for (conv in s.converters) {
+				converters[conv.toLowerCase()] = s.converters[conv];
+			}
 		}
-	}
 
-	current = dataTypes.shift();
+		current = dataTypes.shift();
 
-	// Convert to each sequential dataType
-	while ( current ) {
+		// Convert to each sequential dataType
+		while (current) {
 
-		if ( s.responseFields[ current ] ) {
-			jqXHR[ s.responseFields[ current ] ] = response;
-		}
+			if (s.responseFields[current]) {
+				jqXHR[s.responseFields[current]] = response;
+			}
 
-		// Apply the dataFilter if provided
-		if ( !prev && isSuccess && s.dataFilter ) {
-			response = s.dataFilter( response, s.dataType );
-		}
+			// Apply the dataFilter if provided
+			if (!prev && isSuccess && s.dataFilter) {
+				response = s.dataFilter(response, s.dataType);
+			}
 
-		prev = current;
-		current = dataTypes.shift();
+			prev = current;
+			current = dataTypes.shift();
 
-		if ( current ) {
+			if (current) {
 
-			// There's only work to do if current dataType is non-auto
-			if ( current === "*" ) {
+				// There's only work to do if current dataType is non-auto
+				if (current === "*") {
 
-				current = prev;
+					current = prev;
 
-			// Convert response if prev dataType is non-auto and differs from current
-			} else if ( prev !== "*" && prev !== current ) {
+					// Convert response if prev dataType is non-auto and differs from current
+				} else if (prev !== "*" && prev !== current) {
 
-				// Seek a direct converter
-				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
+					// Seek a direct converter
+					conv = converters[prev + " " + current] || converters["* " + current];
 
-				// If none found, seek a pair
-				if ( !conv ) {
-					for ( conv2 in converters ) {
+					// If none found, seek a pair
+					if (!conv) {
+						for (conv2 in converters) {
 
-						// If conv2 outputs current
-						tmp = conv2.split( " " );
-						if ( tmp[ 1 ] === current ) {
+							// If conv2 outputs current
+							tmp = conv2.split(" ");
+							if (tmp[1] === current) {
 
-							// If prev can be converted to accepted input
-							conv = converters[ prev + " " + tmp[ 0 ] ] ||
-								converters[ "* " + tmp[ 0 ] ];
-							if ( conv ) {
-								// Condense equivalence converters
-								if ( conv === true ) {
-									conv = converters[ conv2 ];
+								// If prev can be converted to accepted input
+								conv = converters[prev + " " + tmp[0]] ||
+									converters["* " + tmp[0]];
+								if (conv) {
+									// Condense equivalence converters
+									if (conv === true) {
+										conv = converters[conv2];
 
-								// Otherwise, insert the intermediate dataType
-								} else if ( converters[ conv2 ] !== true ) {
-									current = tmp[ 0 ];
-									dataTypes.unshift( tmp[ 1 ] );
+										// Otherwise, insert the intermediate dataType
+									} else if (converters[conv2] !== true) {
+										current = tmp[0];
+										dataTypes.unshift(tmp[1]);
+									}
+									break;
 								}
-								break;
 							}
 						}
 					}
-				}
 
-				// Apply converter (if not an equivalence)
-				if ( conv !== true ) {
+					// Apply converter (if not an equivalence)
+					if (conv !== true) {
 
-					// Unless errors are allowed to bubble, catch and return them
-					if ( conv && s[ "throws" ] ) {
-						response = conv( response );
-					} else {
-						try {
-							response = conv( response );
-						} catch ( e ) {
-							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
+						// Unless errors are allowed to bubble, catch and return them
+						if (conv && s["throws"]) {
+							response = conv(response);
+						} else {
+							try {
+								response = conv(response);
+							} catch (e) {
+								return {
+									state: "parsererror",
+									error: conv ? e : "No conversion from " + prev + " to " + current
+								};
+							}
 						}
 					}
 				}
 			}
 		}
+
+		return {state: "success", data: response};
 	}
 
-	return { state: "success", data: response };
-}
 // Install script dataType
-jQuery.ajaxSetup({
-	accepts: {
-		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
-	},
-	contents: {
-		script: /(?:java|ecma)script/
-	},
-	converters: {
-		"text script": function( text ) {
-			jQuery.globalEval( text );
-			return text;
+	jQuery.ajaxSetup({
+		accepts: {
+			script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+		},
+		contents: {
+			script: /(?:java|ecma)script/
+		},
+		converters: {
+			"text script": function (text) {
+				jQuery.globalEval(text);
+				return text;
+			}
 		}
-	}
-});
+	});
 
 // Handle cache's special case and global
-jQuery.ajaxPrefilter( "script", function( s ) {
-	if ( s.cache === undefined ) {
-		s.cache = false;
-	}
-	if ( s.crossDomain ) {
-		s.type = "GET";
-		s.global = false;
-	}
-});
+	jQuery.ajaxPrefilter("script", function (s) {
+		if (s.cache === undefined) {
+			s.cache = false;
+		}
+		if (s.crossDomain) {
+			s.type = "GET";
+			s.global = false;
+		}
+	});
 
 // Bind script tag hack transport
-jQuery.ajaxTransport( "script", function(s) {
+	jQuery.ajaxTransport("script", function (s) {
 
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
+		// This transport only deals with cross domain requests
+		if (s.crossDomain) {
 
-		var script,
-			head = document.head || jQuery("head")[0] || document.documentElement;
+			var script,
+				head = document.head || jQuery("head")[0] || document.documentElement;
 
-		return {
+			return {
 
-			send: function( _, callback ) {
+				send: function (_, callback) {
 
-				script = document.createElement("script");
+					script = document.createElement("script");
 
-				script.async = true;
+					script.async = true;
 
-				if ( s.scriptCharset ) {
-					script.charset = s.scriptCharset;
-				}
+					if (s.scriptCharset) {
+						script.charset = s.scriptCharset;
+					}
 
-				script.src = s.url;
+					script.src = s.url;
 
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function( _, isAbort ) {
+					// Attach handlers for all browsers
+					script.onload = script.onreadystatechange = function (_, isAbort) {
 
-					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
+						if (isAbort || !script.readyState || /loaded|complete/.test(script.readyState)) {
 
-						// Handle memory leak in IE
-						script.onload = script.onreadystatechange = null;
+							// Handle memory leak in IE
+							script.onload = script.onreadystatechange = null;
 
-						// Remove the script
-						if ( script.parentNode ) {
-							script.parentNode.removeChild( script );
-						}
+							// Remove the script
+							if (script.parentNode) {
+								script.parentNode.removeChild(script);
+							}
 
-						// Dereference the script
-						script = null;
+							// Dereference the script
+							script = null;
 
-						// Callback if not abort
-						if ( !isAbort ) {
-							callback( 200, "success" );
+							// Callback if not abort
+							if (!isAbort) {
+								callback(200, "success");
+							}
 						}
-					}
-				};
+					};
 
-				// Circumvent IE6 bugs with base elements (#2709 and #4378) by prepending
-				// Use native DOM manipulation to avoid our domManip AJAX trickery
-				head.insertBefore( script, head.firstChild );
-			},
+					// Circumvent IE6 bugs with base elements (#2709 and #4378) by prepending
+					// Use native DOM manipulation to avoid our domManip AJAX trickery
+					head.insertBefore(script, head.firstChild);
+				},
 
-			abort: function() {
-				if ( script ) {
-					script.onload( undefined, true );
+				abort: function () {
+					if (script) {
+						script.onload(undefined, true);
+					}
 				}
-			}
-		};
-	}
-});
-var oldCallbacks = [],
-	rjsonp = /(=)\?(?=&|$)|\?\?/;
+			};
+		}
+	});
+	var oldCallbacks = [],
+		rjsonp = /(=)\?(?=&|$)|\?\?/;
 
 // Default jsonp settings
-jQuery.ajaxSetup({
-	jsonp: "callback",
-	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( ajax_nonce++ ) );
-		this[ callback ] = true;
-		return callback;
-	}
-});
+	jQuery.ajaxSetup({
+		jsonp: "callback",
+		jsonpCallback: function () {
+			var callback = oldCallbacks.pop() || (jQuery.expando + "_" + (ajax_nonce++));
+			this[callback] = true;
+			return callback;
+		}
+	});
 
 // Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-	var callbackName, overwritten, responseContainer,
-		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
-			"url" :
-			typeof s.data === "string" && !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") && rjsonp.test( s.data ) && "data"
-		);
+	jQuery.ajaxPrefilter("json jsonp", function (s, originalSettings, jqXHR) {
 
-	// Handle iff the expected data type is "jsonp" or we have a parameter to set
-	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
+		var callbackName, overwritten, responseContainer,
+			jsonProp = s.jsonp !== false && (rjsonp.test(s.url) ?
+					"url" :
+					typeof s.data === "string" && !(s.contentType || "").indexOf("application/x-www-form-urlencoded") && rjsonp.test(s.data) && "data"
+			);
 
-		// Get callback name, remembering preexisting value associated with it
-		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
-			s.jsonpCallback() :
-			s.jsonpCallback;
+		// Handle iff the expected data type is "jsonp" or we have a parameter to set
+		if (jsonProp || s.dataTypes[0] === "jsonp") {
 
-		// Insert callback into url or form data
-		if ( jsonProp ) {
-			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
-		} else if ( s.jsonp !== false ) {
-			s.url += ( ajax_rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
-		}
+			// Get callback name, remembering preexisting value associated with it
+			callbackName = s.jsonpCallback = jQuery.isFunction(s.jsonpCallback) ?
+				s.jsonpCallback() :
+				s.jsonpCallback;
 
-		// Use data converter to retrieve json after script execution
-		s.converters["script json"] = function() {
-			if ( !responseContainer ) {
-				jQuery.error( callbackName + " was not called" );
+			// Insert callback into url or form data
+			if (jsonProp) {
+				s[jsonProp] = s[jsonProp].replace(rjsonp, "$1" + callbackName);
+			} else if (s.jsonp !== false) {
+				s.url += (ajax_rquery.test(s.url) ? "&" : "?") + s.jsonp + "=" + callbackName;
 			}
-			return responseContainer[ 0 ];
-		};
 
-		// force json dataType
-		s.dataTypes[ 0 ] = "json";
+			// Use data converter to retrieve json after script execution
+			s.converters["script json"] = function () {
+				if (!responseContainer) {
+					jQuery.error(callbackName + " was not called");
+				}
+				return responseContainer[0];
+			};
 
-		// Install callback
-		overwritten = window[ callbackName ];
-		window[ callbackName ] = function() {
-			responseContainer = arguments;
-		};
+			// force json dataType
+			s.dataTypes[0] = "json";
 
-		// Clean-up function (fires after converters)
-		jqXHR.always(function() {
-			// Restore preexisting value
-			window[ callbackName ] = overwritten;
+			// Install callback
+			overwritten = window[callbackName];
+			window[callbackName] = function () {
+				responseContainer = arguments;
+			};
 
-			// Save back as free
-			if ( s[ callbackName ] ) {
-				// make sure that re-using the options doesn't screw things around
-				s.jsonpCallback = originalSettings.jsonpCallback;
+			// Clean-up function (fires after converters)
+			jqXHR.always(function () {
+				// Restore preexisting value
+				window[callbackName] = overwritten;
 
-				// save the callback name for future use
-				oldCallbacks.push( callbackName );
-			}
+				// Save back as free
+				if (s[callbackName]) {
+					// make sure that re-using the options doesn't screw things around
+					s.jsonpCallback = originalSettings.jsonpCallback;
 
-			// Call if it was a function and we have a response
-			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
-				overwritten( responseContainer[ 0 ] );
-			}
+					// save the callback name for future use
+					oldCallbacks.push(callbackName);
+				}
 
-			responseContainer = overwritten = undefined;
-		});
+				// Call if it was a function and we have a response
+				if (responseContainer && jQuery.isFunction(overwritten)) {
+					overwritten(responseContainer[0]);
+				}
 
-		// Delegate to script
-		return "script";
-	}
-});
-var xhrCallbacks, xhrSupported,
-	xhrId = 0,
-	// #5280: Internet Explorer will keep connections alive if we don't abort on unload
-	xhrOnUnloadAbort = window.ActiveXObject && function() {
-		// Abort all pending requests
-		var key;
-		for ( key in xhrCallbacks ) {
-			xhrCallbacks[ key ]( undefined, true );
+				responseContainer = overwritten = undefined;
+			});
+
+			// Delegate to script
+			return "script";
 		}
-	};
+	});
+	var xhrCallbacks, xhrSupported,
+		xhrId = 0,
+		// #5280: Internet Explorer will keep connections alive if we don't abort on unload
+		xhrOnUnloadAbort = window.ActiveXObject && function () {
+			// Abort all pending requests
+			var key;
+			for (key in xhrCallbacks) {
+				xhrCallbacks[key](undefined, true);
+			}
+		};
 
 // Functions to create xhrs
-function createStandardXHR() {
-	try {
-		return new window.XMLHttpRequest();
-	} catch( e ) {}
-}
+	function createStandardXHR() {
+		try {
+			return new window.XMLHttpRequest();
+		} catch (e) {
+		}
+	}
 
-function createActiveXHR() {
-	try {
-		return new window.ActiveXObject("Microsoft.XMLHTTP");
-	} catch( e ) {}
-}
+	function createActiveXHR() {
+		try {
+			return new window.ActiveXObject("Microsoft.XMLHTTP");
+		} catch (e) {
+		}
+	}
 
 // Create the request object
 // (This is still attached to ajaxSettings for backward compatibility)
-jQuery.ajaxSettings.xhr = window.ActiveXObject ?
-	/* Microsoft failed to properly
+	jQuery.ajaxSettings.xhr = window.ActiveXObject ?
+		/* Microsoft failed to properly
 	 * implement the XMLHttpRequest in IE7 (can't request local files),
 	 * so we use the ActiveXObject when it is available
 	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
 	 * we need a fallback.
 	 */
-	function() {
-		return !this.isLocal && createStandardXHR() || createActiveXHR();
-	} :
-	// For all other browsers, use the standard XMLHttpRequest object
-	createStandardXHR;
+		function () {
+			return !this.isLocal && createStandardXHR() || createActiveXHR();
+		} :
+		// For all other browsers, use the standard XMLHttpRequest object
+		createStandardXHR;
 
 // Determine support properties
-xhrSupported = jQuery.ajaxSettings.xhr();
-jQuery.support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
-xhrSupported = jQuery.support.ajax = !!xhrSupported;
+	xhrSupported = jQuery.ajaxSettings.xhr();
+	jQuery.support.cors = !!xhrSupported && ("withCredentials" in xhrSupported);
+	xhrSupported = jQuery.support.ajax = !!xhrSupported;
 
 // Create transport if the browser can provide an xhr
-if ( xhrSupported ) {
-
-	jQuery.ajaxTransport(function( s ) {
-		// Cross domain only allowed if supported through XMLHttpRequest
-		if ( !s.crossDomain || jQuery.support.cors ) {
+	if (xhrSupported) {
 
-			var callback;
+		jQuery.ajaxTransport(function (s) {
+			// Cross domain only allowed if supported through XMLHttpRequest
+			if (!s.crossDomain || jQuery.support.cors) {
 
-			return {
-				send: function( headers, complete ) {
+				var callback;
 
-					// Get a new xhr
-					var handle, i,
-						xhr = s.xhr();
+				return {
+					send: function (headers, complete) {
 
-					// Open the socket
-					// Passing null username, generates a login popup on Opera (#2865)
-					if ( s.username ) {
-						xhr.open( s.type, s.url, s.async, s.username, s.password );
-					} else {
-						xhr.open( s.type, s.url, s.async );
-					}
+						// Get a new xhr
+						var handle, i,
+							xhr = s.xhr();
 
-					// Apply custom fields if provided
-					if ( s.xhrFields ) {
-						for ( i in s.xhrFields ) {
-							xhr[ i ] = s.xhrFields[ i ];
+						// Open the socket
+						// Passing null username, generates a login popup on Opera (#2865)
+						if (s.username) {
+							xhr.open(s.type, s.url, s.async, s.username, s.password);
+						} else {
+							xhr.open(s.type, s.url, s.async);
 						}
-					}
-
-					// Override mime type if needed
-					if ( s.mimeType && xhr.overrideMimeType ) {
-						xhr.overrideMimeType( s.mimeType );
-					}
-
-					// X-Requested-With header
-					// For cross-domain requests, seeing as conditions for a preflight are
-					// akin to a jigsaw puzzle, we simply never set it to be sure.
-					// (it can always be set on a per-request basis or even using ajaxSetup)
-					// For same-domain requests, won't change header if already provided.
-					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
-						headers["X-Requested-With"] = "XMLHttpRequest";
-					}
 
-					// Need an extra try/catch for cross domain requests in Firefox 3
-					try {
-						for ( i in headers ) {
-							xhr.setRequestHeader( i, headers[ i ] );
+						// Apply custom fields if provided
+						if (s.xhrFields) {
+							for (i in s.xhrFields) {
+								xhr[i] = s.xhrFields[i];
+							}
 						}
-					} catch( err ) {}
 
-					// Do send the request
-					// This may raise an exception which is actually
-					// handled in jQuery.ajax (so no try/catch here)
-					xhr.send( ( s.hasContent && s.data ) || null );
+						// Override mime type if needed
+						if (s.mimeType && xhr.overrideMimeType) {
+							xhr.overrideMimeType(s.mimeType);
+						}
 
-					// Listener
-					callback = function( _, isAbort ) {
-						var status, responseHeaders, statusText, responses;
+						// X-Requested-With header
+						// For cross-domain requests, seeing as conditions for a preflight are
+						// akin to a jigsaw puzzle, we simply never set it to be sure.
+						// (it can always be set on a per-request basis or even using ajaxSetup)
+						// For same-domain requests, won't change header if already provided.
+						if (!s.crossDomain && !headers["X-Requested-With"]) {
+							headers["X-Requested-With"] = "XMLHttpRequest";
+						}
 
-						// Firefox throws exceptions when accessing properties
-						// of an xhr when a network error occurred
-						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
+						// Need an extra try/catch for cross domain requests in Firefox 3
 						try {
+							for (i in headers) {
+								xhr.setRequestHeader(i, headers[i]);
+							}
+						} catch (err) {
+						}
 
-							// Was never called and is aborted or complete
-							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
+						// Do send the request
+						// This may raise an exception which is actually
+						// handled in jQuery.ajax (so no try/catch here)
+						xhr.send((s.hasContent && s.data) || null);
 
-								// Only called once
-								callback = undefined;
+						// Listener
+						callback = function (_, isAbort) {
+							var status, responseHeaders, statusText, responses;
 
-								// Do not keep as active anymore
-								if ( handle ) {
-									xhr.onreadystatechange = jQuery.noop;
-									if ( xhrOnUnloadAbort ) {
-										delete xhrCallbacks[ handle ];
-									}
-								}
+							// Firefox throws exceptions when accessing properties
+							// of an xhr when a network error occurred
+							// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
+							try {
 
-								// If it's an abort
-								if ( isAbort ) {
-									// Abort it manually if needed
-									if ( xhr.readyState !== 4 ) {
-										xhr.abort();
-									}
-								} else {
-									responses = {};
-									status = xhr.status;
-									responseHeaders = xhr.getAllResponseHeaders();
-
-									// When requesting binary data, IE6-9 will throw an exception
-									// on any attempt to access responseText (#11426)
-									if ( typeof xhr.responseText === "string" ) {
-										responses.text = xhr.responseText;
-									}
+								// Was never called and is aborted or complete
+								if (callback && (isAbort || xhr.readyState === 4)) {
 
-									// Firefox throws an exception when accessing
-									// statusText for faulty cross-domain requests
-									try {
-										statusText = xhr.statusText;
-									} catch( e ) {
-										// We normalize with Webkit giving an empty statusText
-										statusText = "";
-									}
+									// Only called once
+									callback = undefined;
 
-									// Filter status for non standard behaviors
+									// Do not keep as active anymore
+									if (handle) {
+										xhr.onreadystatechange = jQuery.noop;
+										if (xhrOnUnloadAbort) {
+											delete xhrCallbacks[handle];
+										}
+									}
 
-									// If the request is local and we have data: assume a success
-									// (success with no data won't get notified, that's the best we
-									// can do given current implementations)
-									if ( !status && s.isLocal && !s.crossDomain ) {
-										status = responses.text ? 200 : 404;
-									// IE - #1450: sometimes returns 1223 when it should be 204
-									} else if ( status === 1223 ) {
-										status = 204;
+									// If it's an abort
+									if (isAbort) {
+										// Abort it manually if needed
+										if (xhr.readyState !== 4) {
+											xhr.abort();
+										}
+									} else {
+										responses = {};
+										status = xhr.status;
+										responseHeaders = xhr.getAllResponseHeaders();
+
+										// When requesting binary data, IE6-9 will throw an exception
+										// on any attempt to access responseText (#11426)
+										if (typeof xhr.responseText === "string") {
+											responses.text = xhr.responseText;
+										}
+
+										// Firefox throws an exception when accessing
+										// statusText for faulty cross-domain requests
+										try {
+											statusText = xhr.statusText;
+										} catch (e) {
+											// We normalize with Webkit giving an empty statusText
+											statusText = "";
+										}
+
+										// Filter status for non standard behaviors
+
+										// If the request is local and we have data: assume a success
+										// (success with no data won't get notified, that's the best we
+										// can do given current implementations)
+										if (!status && s.isLocal && !s.crossDomain) {
+											status = responses.text ? 200 : 404;
+											// IE - #1450: sometimes returns 1223 when it should be 204
+										} else if (status === 1223) {
+											status = 204;
+										}
 									}
 								}
+							} catch (firefoxAccessException) {
+								if (!isAbort) {
+									complete(-1, firefoxAccessException);
+								}
 							}
-						} catch( firefoxAccessException ) {
-							if ( !isAbort ) {
-								complete( -1, firefoxAccessException );
-							}
-						}
-
-						// Call complete if needed
-						if ( responses ) {
-							complete( status, statusText, responses, responseHeaders );
-						}
-					};
 
-					if ( !s.async ) {
-						// if we're in sync mode we fire the callback
-						callback();
-					} else if ( xhr.readyState === 4 ) {
-						// (IE6 & IE7) if it's in cache and has been
-						// retrieved directly we need to fire the callback
-						setTimeout( callback );
-					} else {
-						handle = ++xhrId;
-						if ( xhrOnUnloadAbort ) {
-							// Create the active xhrs callbacks list if needed
-							// and attach the unload handler
-							if ( !xhrCallbacks ) {
-								xhrCallbacks = {};
-								jQuery( window ).unload( xhrOnUnloadAbort );
+							// Call complete if needed
+							if (responses) {
+								complete(status, statusText, responses, responseHeaders);
+							}
+						};
+
+						if (!s.async) {
+							// if we're in sync mode we fire the callback
+							callback();
+						} else if (xhr.readyState === 4) {
+							// (IE6 & IE7) if it's in cache and has been
+							// retrieved directly we need to fire the callback
+							setTimeout(callback);
+						} else {
+							handle = ++xhrId;
+							if (xhrOnUnloadAbort) {
+								// Create the active xhrs callbacks list if needed
+								// and attach the unload handler
+								if (!xhrCallbacks) {
+									xhrCallbacks = {};
+									jQuery(window).unload(xhrOnUnloadAbort);
+								}
+								// Add to list of active xhrs callbacks
+								xhrCallbacks[handle] = callback;
 							}
-							// Add to list of active xhrs callbacks
-							xhrCallbacks[ handle ] = callback;
+							xhr.onreadystatechange = callback;
 						}
-						xhr.onreadystatechange = callback;
-					}
-				},
+					},
 
-				abort: function() {
-					if ( callback ) {
-						callback( undefined, true );
+					abort: function () {
+						if (callback) {
+							callback(undefined, true);
+						}
 					}
+				};
+			}
+		});
+	}
+	var fxNow, timerId,
+		rfxtypes = /^(?:toggle|show|hide)$/,
+		rfxnum = new RegExp("^(?:([+-])=|)(" + core_pnum + ")([a-z%]*)$", "i"),
+		rrun = /queueHooks$/,
+		animationPrefilters = [defaultPrefilter],
+		tweeners = {
+			"*": [function (prop, value) {
+				var tween = this.createTween(prop, value),
+					target = tween.cur(),
+					parts = rfxnum.exec(value),
+					unit = parts && parts[3] || (jQuery.cssNumber[prop] ? "" : "px"),
+
+					// Starting value computation is required for potential unit mismatches
+					start = (jQuery.cssNumber[prop] || unit !== "px" && +target) &&
+						rfxnum.exec(jQuery.css(tween.elem, prop)),
+					scale = 1,
+					maxIterations = 20;
+
+				if (start && start[3] !== unit) {
+					// Trust units reported by jQuery.css
+					unit = unit || start[3];
+
+					// Make sure we update the tween properties later on
+					parts = parts || [];
+
+					// Iteratively approximate from a nonzero starting point
+					start = +target || 1;
+
+					do {
+						// If previous iteration zeroed out, double until we get *something*
+						// Use a string for doubling factor so we don't accidentally see scale as unchanged below
+						scale = scale || ".5";
+
+						// Adjust and apply
+						start = start / scale;
+						jQuery.style(tween.elem, prop, start + unit);
+
+						// Update scale, tolerating zero or NaN from tween.cur()
+						// And breaking the loop if scale is unchanged or perfect, or if we've just had enough
+					} while (scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations);
+				}
+
+				// Update tween properties
+				if (parts) {
+					start = tween.start = +start || +target || 0;
+					tween.unit = unit;
+					// If a +=/-= token was provided, we're doing a relative animation
+					tween.end = parts[1] ?
+						start + (parts[1] + 1) * parts[2] :
+						+parts[2];
 				}
-			};
-		}
-	});
-}
-var fxNow, timerId,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rfxnum = new RegExp( "^(?:([+-])=|)(" + core_pnum + ")([a-z%]*)$", "i" ),
-	rrun = /queueHooks$/,
-	animationPrefilters = [ defaultPrefilter ],
-	tweeners = {
-		"*": [function( prop, value ) {
-			var tween = this.createTween( prop, value ),
-				target = tween.cur(),
-				parts = rfxnum.exec( value ),
-				unit = parts && parts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
-
-				// Starting value computation is required for potential unit mismatches
-				start = ( jQuery.cssNumber[ prop ] || unit !== "px" && +target ) &&
-					rfxnum.exec( jQuery.css( tween.elem, prop ) ),
-				scale = 1,
-				maxIterations = 20;
-
-			if ( start && start[ 3 ] !== unit ) {
-				// Trust units reported by jQuery.css
-				unit = unit || start[ 3 ];
-
-				// Make sure we update the tween properties later on
-				parts = parts || [];
-
-				// Iteratively approximate from a nonzero starting point
-				start = +target || 1;
-
-				do {
-					// If previous iteration zeroed out, double until we get *something*
-					// Use a string for doubling factor so we don't accidentally see scale as unchanged below
-					scale = scale || ".5";
-
-					// Adjust and apply
-					start = start / scale;
-					jQuery.style( tween.elem, prop, start + unit );
-
-				// Update scale, tolerating zero or NaN from tween.cur()
-				// And breaking the loop if scale is unchanged or perfect, or if we've just had enough
-				} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
-			}
-
-			// Update tween properties
-			if ( parts ) {
-				start = tween.start = +start || +target || 0;
-				tween.unit = unit;
-				// If a +=/-= token was provided, we're doing a relative animation
-				tween.end = parts[ 1 ] ?
-					start + ( parts[ 1 ] + 1 ) * parts[ 2 ] :
-					+parts[ 2 ];
-			}
-
-			return tween;
-		}]
-	};
+
+				return tween;
+			}]
+		};
 
 // Animations created synchronously will run synchronously
-function createFxNow() {
-	setTimeout(function() {
-		fxNow = undefined;
-	});
-	return ( fxNow = jQuery.now() );
-}
+	function createFxNow() {
+		setTimeout(function () {
+			fxNow = undefined;
+		});
+		return (fxNow = jQuery.now());
+	}
 
-function createTween( value, prop, animation ) {
-	var tween,
-		collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
-		index = 0,
-		length = collection.length;
-	for ( ; index < length; index++ ) {
-		if ( (tween = collection[ index ].call( animation, prop, value )) ) {
+	function createTween(value, prop, animation) {
+		var tween,
+			collection = (tweeners[prop] || []).concat(tweeners["*"]),
+			index = 0,
+			length = collection.length;
+		for (; index < length; index++) {
+			if ((tween = collection[index].call(animation, prop, value))) {
 
-			// we're done with this property
-			return tween;
+				// we're done with this property
+				return tween;
+			}
 		}
 	}
-}
-
-function Animation( elem, properties, options ) {
-	var result,
-		stopped,
-		index = 0,
-		length = animationPrefilters.length,
-		deferred = jQuery.Deferred().always( function() {
-			// don't match elem in the :animated selector
-			delete tick.elem;
-		}),
-		tick = function() {
-			if ( stopped ) {
-				return false;
-			}
-			var currentTime = fxNow || createFxNow(),
-				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-				// archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
-				temp = remaining / animation.duration || 0,
-				percent = 1 - temp,
-				index = 0,
-				length = animation.tweens.length;
 
-			for ( ; index < length ; index++ ) {
-				animation.tweens[ index ].run( percent );
-			}
+	function Animation(elem, properties, options) {
+		var result,
+			stopped,
+			index = 0,
+			length = animationPrefilters.length,
+			deferred = jQuery.Deferred().always(function () {
+				// don't match elem in the :animated selector
+				delete tick.elem;
+			}),
+			tick = function () {
+				if (stopped) {
+					return false;
+				}
+				var currentTime = fxNow || createFxNow(),
+					remaining = Math.max(0, animation.startTime + animation.duration - currentTime),
+					// archaic crash bug won't allow us to use 1 - ( 0.5 || 0 ) (#12497)
+					temp = remaining / animation.duration || 0,
+					percent = 1 - temp,
+					index = 0,
+					length = animation.tweens.length;
 
-			deferred.notifyWith( elem, [ animation, percent, remaining ]);
+				for (; index < length; index++) {
+					animation.tweens[index].run(percent);
+				}
 
-			if ( percent < 1 && length ) {
-				return remaining;
-			} else {
-				deferred.resolveWith( elem, [ animation ] );
-				return false;
-			}
-		},
-		animation = deferred.promise({
-			elem: elem,
-			props: jQuery.extend( {}, properties ),
-			opts: jQuery.extend( true, { specialEasing: {} }, options ),
-			originalProperties: properties,
-			originalOptions: options,
-			startTime: fxNow || createFxNow(),
-			duration: options.duration,
-			tweens: [],
-			createTween: function( prop, end ) {
-				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
-				animation.tweens.push( tween );
-				return tween;
+				deferred.notifyWith(elem, [animation, percent, remaining]);
+
+				if (percent < 1 && length) {
+					return remaining;
+				} else {
+					deferred.resolveWith(elem, [animation]);
+					return false;
+				}
 			},
-			stop: function( gotoEnd ) {
-				var index = 0,
-					// if we are going to the end, we want to run all the tweens
-					// otherwise we skip this part
-					length = gotoEnd ? animation.tweens.length : 0;
-				if ( stopped ) {
+			animation = deferred.promise({
+				elem: elem,
+				props: jQuery.extend({}, properties),
+				opts: jQuery.extend(true, {specialEasing: {}}, options),
+				originalProperties: properties,
+				originalOptions: options,
+				startTime: fxNow || createFxNow(),
+				duration: options.duration,
+				tweens: [],
+				createTween: function (prop, end) {
+					var tween = jQuery.Tween(elem, animation.opts, prop, end,
+						animation.opts.specialEasing[prop] || animation.opts.easing);
+					animation.tweens.push(tween);
+					return tween;
+				},
+				stop: function (gotoEnd) {
+					var index = 0,
+						// if we are going to the end, we want to run all the tweens
+						// otherwise we skip this part
+						length = gotoEnd ? animation.tweens.length : 0;
+					if (stopped) {
+						return this;
+					}
+					stopped = true;
+					for (; index < length; index++) {
+						animation.tweens[index].run(1);
+					}
+
+					// resolve when we played the last frame
+					// otherwise, reject
+					if (gotoEnd) {
+						deferred.resolveWith(elem, [animation, gotoEnd]);
+					} else {
+						deferred.rejectWith(elem, [animation, gotoEnd]);
+					}
 					return this;
 				}
-				stopped = true;
-				for ( ; index < length ; index++ ) {
-					animation.tweens[ index ].run( 1 );
-				}
+			}),
+			props = animation.props;
 
-				// resolve when we played the last frame
-				// otherwise, reject
-				if ( gotoEnd ) {
-					deferred.resolveWith( elem, [ animation, gotoEnd ] );
-				} else {
-					deferred.rejectWith( elem, [ animation, gotoEnd ] );
-				}
-				return this;
+		propFilter(props, animation.opts.specialEasing);
+
+		for (; index < length; index++) {
+			result = animationPrefilters[index].call(animation, elem, props, animation.opts);
+			if (result) {
+				return result;
+			}
+		}
+
+		jQuery.map(props, createTween, animation);
+
+		if (jQuery.isFunction(animation.opts.start)) {
+			animation.opts.start.call(elem, animation);
+		}
+
+		jQuery.fx.timer(
+			jQuery.extend(tick, {
+				elem: elem,
+				anim: animation,
+				queue: animation.opts.queue
+			})
+		);
+
+		// attach callbacks from options
+		return animation.progress(animation.opts.progress)
+			.done(animation.opts.done, animation.opts.complete)
+			.fail(animation.opts.fail)
+			.always(animation.opts.always);
+	}
+
+	function propFilter(props, specialEasing) {
+		var index, name, easing, value, hooks;
+
+		// camelCase, specialEasing and expand cssHook pass
+		for (index in props) {
+			name = jQuery.camelCase(index);
+			easing = specialEasing[name];
+			value = props[index];
+			if (jQuery.isArray(value)) {
+				easing = value[1];
+				value = props[index] = value[0];
+			}
+
+			if (index !== name) {
+				props[name] = value;
+				delete props[index];
 			}
-		}),
-		props = animation.props;
 
-	propFilter( props, animation.opts.specialEasing );
+			hooks = jQuery.cssHooks[name];
+			if (hooks && "expand" in hooks) {
+				value = hooks.expand(value);
+				delete props[name];
 
-	for ( ; index < length ; index++ ) {
-		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
-		if ( result ) {
-			return result;
+				// not quite $.extend, this wont overwrite keys already present.
+				// also - reusing 'index' from above because we have the correct "name"
+				for (index in value) {
+					if (!(index in props)) {
+						props[index] = value[index];
+						specialEasing[index] = easing;
+					}
+				}
+			} else {
+				specialEasing[name] = easing;
+			}
 		}
 	}
 
-	jQuery.map( props, createTween, animation );
-
-	if ( jQuery.isFunction( animation.opts.start ) ) {
-		animation.opts.start.call( elem, animation );
-	}
+	jQuery.Animation = jQuery.extend(Animation, {
 
-	jQuery.fx.timer(
-		jQuery.extend( tick, {
-			elem: elem,
-			anim: animation,
-			queue: animation.opts.queue
-		})
-	);
+		tweener: function (props, callback) {
+			if (jQuery.isFunction(props)) {
+				callback = props;
+				props = ["*"];
+			} else {
+				props = props.split(" ");
+			}
 
-	// attach callbacks from options
-	return animation.progress( animation.opts.progress )
-		.done( animation.opts.done, animation.opts.complete )
-		.fail( animation.opts.fail )
-		.always( animation.opts.always );
-}
+			var prop,
+				index = 0,
+				length = props.length;
 
-function propFilter( props, specialEasing ) {
-	var index, name, easing, value, hooks;
+			for (; index < length; index++) {
+				prop = props[index];
+				tweeners[prop] = tweeners[prop] || [];
+				tweeners[prop].unshift(callback);
+			}
+		},
 
-	// camelCase, specialEasing and expand cssHook pass
-	for ( index in props ) {
-		name = jQuery.camelCase( index );
-		easing = specialEasing[ name ];
-		value = props[ index ];
-		if ( jQuery.isArray( value ) ) {
-			easing = value[ 1 ];
-			value = props[ index ] = value[ 0 ];
+		prefilter: function (callback, prepend) {
+			if (prepend) {
+				animationPrefilters.unshift(callback);
+			} else {
+				animationPrefilters.push(callback);
+			}
 		}
+	});
+
+	function defaultPrefilter(elem, props, opts) {
+		/* jshint validthis: true */
+		var prop, value, toggle, tween, hooks, oldfire,
+			anim = this,
+			orig = {},
+			style = elem.style,
+			hidden = elem.nodeType && isHidden(elem),
+			dataShow = jQuery._data(elem, "fxshow");
+
+		// handle queue: false promises
+		if (!opts.queue) {
+			hooks = jQuery._queueHooks(elem, "fx");
+			if (hooks.unqueued == null) {
+				hooks.unqueued = 0;
+				oldfire = hooks.empty.fire;
+				hooks.empty.fire = function () {
+					if (!hooks.unqueued) {
+						oldfire();
+					}
+				};
+			}
+			hooks.unqueued++;
 
-		if ( index !== name ) {
-			props[ name ] = value;
-			delete props[ index ];
+			anim.always(function () {
+				// doing this makes sure that the complete handler will be called
+				// before this completes
+				anim.always(function () {
+					hooks.unqueued--;
+					if (!jQuery.queue(elem, "fx").length) {
+						hooks.empty.fire();
+					}
+				});
+			});
 		}
 
-		hooks = jQuery.cssHooks[ name ];
-		if ( hooks && "expand" in hooks ) {
-			value = hooks.expand( value );
-			delete props[ name ];
+		// height/width overflow pass
+		if (elem.nodeType === 1 && ("height" in props || "width" in props)) {
+			// Make sure that nothing sneaks out
+			// Record all 3 overflow attributes because IE does not
+			// change the overflow attribute when overflowX and
+			// overflowY are set to the same value
+			opts.overflow = [style.overflow, style.overflowX, style.overflowY];
+
+			// Set display property to inline-block for height/width
+			// animations on inline elements that are having width/height animated
+			if (jQuery.css(elem, "display") === "inline" &&
+				jQuery.css(elem, "float") === "none") {
+
+				// inline-level elements accept inline-block;
+				// block-level elements need to be inline with layout
+				if (!jQuery.support.inlineBlockNeedsLayout || css_defaultDisplay(elem.nodeName) === "inline") {
+					style.display = "inline-block";
 
-			// not quite $.extend, this wont overwrite keys already present.
-			// also - reusing 'index' from above because we have the correct "name"
-			for ( index in value ) {
-				if ( !( index in props ) ) {
-					props[ index ] = value[ index ];
-					specialEasing[ index ] = easing;
+				} else {
+					style.zoom = 1;
 				}
 			}
-		} else {
-			specialEasing[ name ] = easing;
 		}
-	}
-}
-
-jQuery.Animation = jQuery.extend( Animation, {
 
-	tweener: function( props, callback ) {
-		if ( jQuery.isFunction( props ) ) {
-			callback = props;
-			props = [ "*" ];
-		} else {
-			props = props.split(" ");
+		if (opts.overflow) {
+			style.overflow = "hidden";
+			if (!jQuery.support.shrinkWrapBlocks) {
+				anim.always(function () {
+					style.overflow = opts.overflow[0];
+					style.overflowX = opts.overflow[1];
+					style.overflowY = opts.overflow[2];
+				});
+			}
 		}
 
-		var prop,
-			index = 0,
-			length = props.length;
-
-		for ( ; index < length ; index++ ) {
-			prop = props[ index ];
-			tweeners[ prop ] = tweeners[ prop ] || [];
-			tweeners[ prop ].unshift( callback );
-		}
-	},
 
-	prefilter: function( callback, prepend ) {
-		if ( prepend ) {
-			animationPrefilters.unshift( callback );
-		} else {
-			animationPrefilters.push( callback );
-		}
-	}
-});
-
-function defaultPrefilter( elem, props, opts ) {
-	/* jshint validthis: true */
-	var prop, value, toggle, tween, hooks, oldfire,
-		anim = this,
-		orig = {},
-		style = elem.style,
-		hidden = elem.nodeType && isHidden( elem ),
-		dataShow = jQuery._data( elem, "fxshow" );
-
-	// handle queue: false promises
-	if ( !opts.queue ) {
-		hooks = jQuery._queueHooks( elem, "fx" );
-		if ( hooks.unqueued == null ) {
-			hooks.unqueued = 0;
-			oldfire = hooks.empty.fire;
-			hooks.empty.fire = function() {
-				if ( !hooks.unqueued ) {
-					oldfire();
+		// show/hide pass
+		for (prop in props) {
+			value = props[prop];
+			if (rfxtypes.exec(value)) {
+				delete props[prop];
+				toggle = toggle || value === "toggle";
+				if (value === (hidden ? "hide" : "show")) {
+					continue;
 				}
-			};
+				orig[prop] = dataShow && dataShow[prop] || jQuery.style(elem, prop);
+			}
 		}
-		hooks.unqueued++;
 
-		anim.always(function() {
-			// doing this makes sure that the complete handler will be called
-			// before this completes
-			anim.always(function() {
-				hooks.unqueued--;
-				if ( !jQuery.queue( elem, "fx" ).length ) {
-					hooks.empty.fire();
+		if (!jQuery.isEmptyObject(orig)) {
+			if (dataShow) {
+				if ("hidden" in dataShow) {
+					hidden = dataShow.hidden;
 				}
-			});
-		});
-	}
-
-	// height/width overflow pass
-	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
-		// Make sure that nothing sneaks out
-		// Record all 3 overflow attributes because IE does not
-		// change the overflow attribute when overflowX and
-		// overflowY are set to the same value
-		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-		// Set display property to inline-block for height/width
-		// animations on inline elements that are having width/height animated
-		if ( jQuery.css( elem, "display" ) === "inline" &&
-				jQuery.css( elem, "float" ) === "none" ) {
-
-			// inline-level elements accept inline-block;
-			// block-level elements need to be inline with layout
-			if ( !jQuery.support.inlineBlockNeedsLayout || css_defaultDisplay( elem.nodeName ) === "inline" ) {
-				style.display = "inline-block";
+			} else {
+				dataShow = jQuery._data(elem, "fxshow", {});
+			}
 
+			// store state if its toggle - enables .stop().toggle() to "reverse"
+			if (toggle) {
+				dataShow.hidden = !hidden;
+			}
+			if (hidden) {
+				jQuery(elem).show();
 			} else {
-				style.zoom = 1;
+				anim.done(function () {
+					jQuery(elem).hide();
+				});
+			}
+			anim.done(function () {
+				var prop;
+				jQuery._removeData(elem, "fxshow");
+				for (prop in orig) {
+					jQuery.style(elem, prop, orig[prop]);
+				}
+			});
+			for (prop in orig) {
+				tween = createTween(hidden ? dataShow[prop] : 0, prop, anim);
+
+				if (!(prop in dataShow)) {
+					dataShow[prop] = tween.start;
+					if (hidden) {
+						tween.end = tween.start;
+						tween.start = prop === "width" || prop === "height" ? 1 : 0;
+					}
+				}
 			}
 		}
 	}
 
-	if ( opts.overflow ) {
-		style.overflow = "hidden";
-		if ( !jQuery.support.shrinkWrapBlocks ) {
-			anim.always(function() {
-				style.overflow = opts.overflow[ 0 ];
-				style.overflowX = opts.overflow[ 1 ];
-				style.overflowY = opts.overflow[ 2 ];
-			});
-		}
+	function Tween(elem, options, prop, end, easing) {
+		return new Tween.prototype.init(elem, options, prop, end, easing);
 	}
 
+	jQuery.Tween = Tween;
 
-	// show/hide pass
-	for ( prop in props ) {
-		value = props[ prop ];
-		if ( rfxtypes.exec( value ) ) {
-			delete props[ prop ];
-			toggle = toggle || value === "toggle";
-			if ( value === ( hidden ? "hide" : "show" ) ) {
-				continue;
-			}
-			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
-		}
-	}
+	Tween.prototype = {
+		constructor: Tween,
+		init: function (elem, options, prop, end, easing, unit) {
+			this.elem = elem;
+			this.prop = prop;
+			this.easing = easing || "swing";
+			this.options = options;
+			this.start = this.now = this.cur();
+			this.end = end;
+			this.unit = unit || (jQuery.cssNumber[prop] ? "" : "px");
+		},
+		cur: function () {
+			var hooks = Tween.propHooks[this.prop];
+
+			return hooks && hooks.get ?
+				hooks.get(this) :
+				Tween.propHooks._default.get(this);
+		},
+		run: function (percent) {
+			var eased,
+				hooks = Tween.propHooks[this.prop];
 
-	if ( !jQuery.isEmptyObject( orig ) ) {
-		if ( dataShow ) {
-			if ( "hidden" in dataShow ) {
-				hidden = dataShow.hidden;
+			if (this.options.duration) {
+				this.pos = eased = jQuery.easing[this.easing](
+					percent, this.options.duration * percent, 0, 1, this.options.duration
+				);
+			} else {
+				this.pos = eased = percent;
 			}
-		} else {
-			dataShow = jQuery._data( elem, "fxshow", {} );
-		}
+			this.now = (this.end - this.start) * eased + this.start;
 
-		// store state if its toggle - enables .stop().toggle() to "reverse"
-		if ( toggle ) {
-			dataShow.hidden = !hidden;
-		}
-		if ( hidden ) {
-			jQuery( elem ).show();
-		} else {
-			anim.done(function() {
-				jQuery( elem ).hide();
-			});
-		}
-		anim.done(function() {
-			var prop;
-			jQuery._removeData( elem, "fxshow" );
-			for ( prop in orig ) {
-				jQuery.style( elem, prop, orig[ prop ] );
+			if (this.options.step) {
+				this.options.step.call(this.elem, this.now, this);
 			}
-		});
-		for ( prop in orig ) {
-			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
 
-			if ( !( prop in dataShow ) ) {
-				dataShow[ prop ] = tween.start;
-				if ( hidden ) {
-					tween.end = tween.start;
-					tween.start = prop === "width" || prop === "height" ? 1 : 0;
-				}
+			if (hooks && hooks.set) {
+				hooks.set(this);
+			} else {
+				Tween.propHooks._default.set(this);
 			}
+			return this;
 		}
-	}
-}
-
-function Tween( elem, options, prop, end, easing ) {
-	return new Tween.prototype.init( elem, options, prop, end, easing );
-}
-jQuery.Tween = Tween;
-
-Tween.prototype = {
-	constructor: Tween,
-	init: function( elem, options, prop, end, easing, unit ) {
-		this.elem = elem;
-		this.prop = prop;
-		this.easing = easing || "swing";
-		this.options = options;
-		this.start = this.now = this.cur();
-		this.end = end;
-		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-	},
-	cur: function() {
-		var hooks = Tween.propHooks[ this.prop ];
-
-		return hooks && hooks.get ?
-			hooks.get( this ) :
-			Tween.propHooks._default.get( this );
-	},
-	run: function( percent ) {
-		var eased,
-			hooks = Tween.propHooks[ this.prop ];
-
-		if ( this.options.duration ) {
-			this.pos = eased = jQuery.easing[ this.easing ](
-				percent, this.options.duration * percent, 0, 1, this.options.duration
-			);
-		} else {
-			this.pos = eased = percent;
-		}
-		this.now = ( this.end - this.start ) * eased + this.start;
+	};
 
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
+	Tween.prototype.init.prototype = Tween.prototype;
 
-		if ( hooks && hooks.set ) {
-			hooks.set( this );
-		} else {
-			Tween.propHooks._default.set( this );
-		}
-		return this;
-	}
-};
-
-Tween.prototype.init.prototype = Tween.prototype;
-
-Tween.propHooks = {
-	_default: {
-		get: function( tween ) {
-			var result;
-
-			if ( tween.elem[ tween.prop ] != null &&
-				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
-				return tween.elem[ tween.prop ];
-			}
-
-			// passing an empty string as a 3rd parameter to .css will automatically
-			// attempt a parseFloat and fallback to a string if the parse fails
-			// so, simple values such as "10px" are parsed to Float.
-			// complex values such as "rotate(1rad)" are returned as is.
-			result = jQuery.css( tween.elem, tween.prop, "" );
-			// Empty strings, null, undefined and "auto" are converted to 0.
-			return !result || result === "auto" ? 0 : result;
-		},
-		set: function( tween ) {
-			// use step hook for back compat - use cssHook if its there - use .style if its
-			// available and use plain properties where available
-			if ( jQuery.fx.step[ tween.prop ] ) {
-				jQuery.fx.step[ tween.prop ]( tween );
-			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
-				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-			} else {
-				tween.elem[ tween.prop ] = tween.now;
+	Tween.propHooks = {
+		_default: {
+			get: function (tween) {
+				var result;
+
+				if (tween.elem[tween.prop] != null &&
+					(!tween.elem.style || tween.elem.style[tween.prop] == null)) {
+					return tween.elem[tween.prop];
+				}
+
+				// passing an empty string as a 3rd parameter to .css will automatically
+				// attempt a parseFloat and fallback to a string if the parse fails
+				// so, simple values such as "10px" are parsed to Float.
+				// complex values such as "rotate(1rad)" are returned as is.
+				result = jQuery.css(tween.elem, tween.prop, "");
+				// Empty strings, null, undefined and "auto" are converted to 0.
+				return !result || result === "auto" ? 0 : result;
+			},
+			set: function (tween) {
+				// use step hook for back compat - use cssHook if its there - use .style if its
+				// available and use plain properties where available
+				if (jQuery.fx.step[tween.prop]) {
+					jQuery.fx.step[tween.prop](tween);
+				} else if (tween.elem.style && (tween.elem.style[jQuery.cssProps[tween.prop]] != null || jQuery.cssHooks[tween.prop])) {
+					jQuery.style(tween.elem, tween.prop, tween.now + tween.unit);
+				} else {
+					tween.elem[tween.prop] = tween.now;
+				}
 			}
 		}
-	}
-};
+	};
 
 // Support: IE <=9
 // Panic based approach to setting things on disconnected nodes
 
-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-	set: function( tween ) {
-		if ( tween.elem.nodeType && tween.elem.parentNode ) {
-			tween.elem[ tween.prop ] = tween.now;
+	Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
+		set: function (tween) {
+			if (tween.elem.nodeType && tween.elem.parentNode) {
+				tween.elem[tween.prop] = tween.now;
+			}
 		}
-	}
-};
-
-jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
-	var cssFn = jQuery.fn[ name ];
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return speed == null || typeof speed === "boolean" ?
-			cssFn.apply( this, arguments ) :
-			this.animate( genFx( name, true ), speed, easing, callback );
 	};
-});
 
-jQuery.fn.extend({
-	fadeTo: function( speed, to, easing, callback ) {
+	jQuery.each(["toggle", "show", "hide"], function (i, name) {
+		var cssFn = jQuery.fn[name];
+		jQuery.fn[name] = function (speed, easing, callback) {
+			return speed == null || typeof speed === "boolean" ?
+				cssFn.apply(this, arguments) :
+				this.animate(genFx(name, true), speed, easing, callback);
+		};
+	});
 
-		// show any hidden elements after setting opacity to 0
-		return this.filter( isHidden ).css( "opacity", 0 ).show()
+	jQuery.fn.extend({
+		fadeTo: function (speed, to, easing, callback) {
 
-			// animate to the value specified
-			.end().animate({ opacity: to }, speed, easing, callback );
-	},
-	animate: function( prop, speed, easing, callback ) {
-		var empty = jQuery.isEmptyObject( prop ),
-			optall = jQuery.speed( speed, easing, callback ),
-			doAnimation = function() {
-				// Operate on a copy of prop so per-property easing won't be lost
-				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
+			// show any hidden elements after setting opacity to 0
+			return this.filter(isHidden).css("opacity", 0).show()
 
-				// Empty animations, or finishing resolves immediately
-				if ( empty || jQuery._data( this, "finish" ) ) {
-					anim.stop( true );
-				}
-			};
+				// animate to the value specified
+				.end().animate({opacity: to}, speed, easing, callback);
+		},
+		animate: function (prop, speed, easing, callback) {
+			var empty = jQuery.isEmptyObject(prop),
+				optall = jQuery.speed(speed, easing, callback),
+				doAnimation = function () {
+					// Operate on a copy of prop so per-property easing won't be lost
+					var anim = Animation(this, jQuery.extend({}, prop), optall);
+
+					// Empty animations, or finishing resolves immediately
+					if (empty || jQuery._data(this, "finish")) {
+						anim.stop(true);
+					}
+				};
 			doAnimation.finish = doAnimation;
 
-		return empty || optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
-	stop: function( type, clearQueue, gotoEnd ) {
-		var stopQueue = function( hooks ) {
-			var stop = hooks.stop;
-			delete hooks.stop;
-			stop( gotoEnd );
-		};
+			return empty || optall.queue === false ?
+				this.each(doAnimation) :
+				this.queue(optall.queue, doAnimation);
+		},
+		stop: function (type, clearQueue, gotoEnd) {
+			var stopQueue = function (hooks) {
+				var stop = hooks.stop;
+				delete hooks.stop;
+				stop(gotoEnd);
+			};
 
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue && type !== false ) {
-			this.queue( type || "fx", [] );
-		}
+			if (typeof type !== "string") {
+				gotoEnd = clearQueue;
+				clearQueue = type;
+				type = undefined;
+			}
+			if (clearQueue && type !== false) {
+				this.queue(type || "fx", []);
+			}
 
-		return this.each(function() {
-			var dequeue = true,
-				index = type != null && type + "queueHooks",
-				timers = jQuery.timers,
-				data = jQuery._data( this );
+			return this.each(function () {
+				var dequeue = true,
+					index = type != null && type + "queueHooks",
+					timers = jQuery.timers,
+					data = jQuery._data(this);
 
-			if ( index ) {
-				if ( data[ index ] && data[ index ].stop ) {
-					stopQueue( data[ index ] );
-				}
-			} else {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-						stopQueue( data[ index ] );
+				if (index) {
+					if (data[index] && data[index].stop) {
+						stopQueue(data[index]);
+					}
+				} else {
+					for (index in data) {
+						if (data[index] && data[index].stop && rrun.test(index)) {
+							stopQueue(data[index]);
+						}
 					}
 				}
-			}
 
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
-					timers[ index ].anim.stop( gotoEnd );
-					dequeue = false;
-					timers.splice( index, 1 );
+				for (index = timers.length; index--;) {
+					if (timers[index].elem === this && (type == null || timers[index].queue === type)) {
+						timers[index].anim.stop(gotoEnd);
+						dequeue = false;
+						timers.splice(index, 1);
+					}
 				}
-			}
 
-			// start the next in the queue if the last step wasn't forced
-			// timers currently will call their complete callbacks, which will dequeue
-			// but only if they were gotoEnd
-			if ( dequeue || !gotoEnd ) {
-				jQuery.dequeue( this, type );
+				// start the next in the queue if the last step wasn't forced
+				// timers currently will call their complete callbacks, which will dequeue
+				// but only if they were gotoEnd
+				if (dequeue || !gotoEnd) {
+					jQuery.dequeue(this, type);
+				}
+			});
+		},
+		finish: function (type) {
+			if (type !== false) {
+				type = type || "fx";
 			}
-		});
-	},
-	finish: function( type ) {
-		if ( type !== false ) {
-			type = type || "fx";
-		}
-		return this.each(function() {
-			var index,
-				data = jQuery._data( this ),
-				queue = data[ type + "queue" ],
-				hooks = data[ type + "queueHooks" ],
-				timers = jQuery.timers,
-				length = queue ? queue.length : 0;
+			return this.each(function () {
+				var index,
+					data = jQuery._data(this),
+					queue = data[type + "queue"],
+					hooks = data[type + "queueHooks"],
+					timers = jQuery.timers,
+					length = queue ? queue.length : 0;
 
-			// enable finishing flag on private data
-			data.finish = true;
+				// enable finishing flag on private data
+				data.finish = true;
 
-			// empty the queue first
-			jQuery.queue( this, type, [] );
+				// empty the queue first
+				jQuery.queue(this, type, []);
 
-			if ( hooks && hooks.stop ) {
-				hooks.stop.call( this, true );
-			}
+				if (hooks && hooks.stop) {
+					hooks.stop.call(this, true);
+				}
 
-			// look for any active animations, and finish them
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
-					timers[ index ].anim.stop( true );
-					timers.splice( index, 1 );
+				// look for any active animations, and finish them
+				for (index = timers.length; index--;) {
+					if (timers[index].elem === this && timers[index].queue === type) {
+						timers[index].anim.stop(true);
+						timers.splice(index, 1);
+					}
 				}
-			}
 
-			// look for any animations in the old queue and finish them
-			for ( index = 0; index < length; index++ ) {
-				if ( queue[ index ] && queue[ index ].finish ) {
-					queue[ index ].finish.call( this );
+				// look for any animations in the old queue and finish them
+				for (index = 0; index < length; index++) {
+					if (queue[index] && queue[index].finish) {
+						queue[index].finish.call(this);
+					}
 				}
-			}
 
-			// turn off finishing flag
-			delete data.finish;
-		});
-	}
-});
+				// turn off finishing flag
+				delete data.finish;
+			});
+		}
+	});
 
 // Generate parameters to create a standard animation
-function genFx( type, includeWidth ) {
-	var which,
-		attrs = { height: type },
-		i = 0;
-
-	// if we include width, step value is 1 to do all cssExpand values,
-	// if we don't include width, step value is 2 to skip over Left and Right
-	includeWidth = includeWidth? 1 : 0;
-	for( ; i < 4 ; i += 2 - includeWidth ) {
-		which = cssExpand[ i ];
-		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-	}
+	function genFx(type, includeWidth) {
+		var which,
+			attrs = {height: type},
+			i = 0;
 
-	if ( includeWidth ) {
-		attrs.opacity = attrs.width = type;
-	}
+		// if we include width, step value is 1 to do all cssExpand values,
+		// if we don't include width, step value is 2 to skip over Left and Right
+		includeWidth = includeWidth ? 1 : 0;
+		for (; i < 4; i += 2 - includeWidth) {
+			which = cssExpand[i];
+			attrs["margin" + which] = attrs["padding" + which] = type;
+		}
 
-	return attrs;
-}
+		if (includeWidth) {
+			attrs.opacity = attrs.width = type;
+		}
 
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show"),
-	slideUp: genFx("hide"),
-	slideToggle: genFx("toggle"),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-});
-
-jQuery.speed = function( speed, easing, fn ) {
-	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-		complete: fn || !fn && easing ||
-			jQuery.isFunction( speed ) && speed,
-		duration: speed,
-		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-	};
+		return attrs;
+	}
 
-	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
+// Generate shortcuts for custom animations
+	jQuery.each({
+		slideDown: genFx("show"),
+		slideUp: genFx("hide"),
+		slideToggle: genFx("toggle"),
+		fadeIn: {opacity: "show"},
+		fadeOut: {opacity: "hide"},
+		fadeToggle: {opacity: "toggle"}
+	}, function (name, props) {
+		jQuery.fn[name] = function (speed, easing, callback) {
+			return this.animate(props, speed, easing, callback);
+		};
+	});
 
-	// normalize opt.queue - true/undefined/null -> "fx"
-	if ( opt.queue == null || opt.queue === true ) {
-		opt.queue = "fx";
-	}
+	jQuery.speed = function (speed, easing, fn) {
+		var opt = speed && typeof speed === "object" ? jQuery.extend({}, speed) : {
+			complete: fn || !fn && easing ||
+				jQuery.isFunction(speed) && speed,
+			duration: speed,
+			easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
+		};
 
-	// Queueing
-	opt.old = opt.complete;
+		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+			opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[opt.duration] : jQuery.fx.speeds._default;
 
-	opt.complete = function() {
-		if ( jQuery.isFunction( opt.old ) ) {
-			opt.old.call( this );
+		// normalize opt.queue - true/undefined/null -> "fx"
+		if (opt.queue == null || opt.queue === true) {
+			opt.queue = "fx";
 		}
 
-		if ( opt.queue ) {
-			jQuery.dequeue( this, opt.queue );
-		}
-	};
+		// Queueing
+		opt.old = opt.complete;
 
-	return opt;
-};
+		opt.complete = function () {
+			if (jQuery.isFunction(opt.old)) {
+				opt.old.call(this);
+			}
 
-jQuery.easing = {
-	linear: function( p ) {
-		return p;
-	},
-	swing: function( p ) {
-		return 0.5 - Math.cos( p*Math.PI ) / 2;
-	}
-};
+			if (opt.queue) {
+				jQuery.dequeue(this, opt.queue);
+			}
+		};
+
+		return opt;
+	};
+
+	jQuery.easing = {
+		linear: function (p) {
+			return p;
+		},
+		swing: function (p) {
+			return 0.5 - Math.cos(p * Math.PI) / 2;
+		}
+	};
 
-jQuery.timers = [];
-jQuery.fx = Tween.prototype.init;
-jQuery.fx.tick = function() {
-	var timer,
-		timers = jQuery.timers,
-		i = 0;
+	jQuery.timers = [];
+	jQuery.fx = Tween.prototype.init;
+	jQuery.fx.tick = function () {
+		var timer,
+			timers = jQuery.timers,
+			i = 0;
 
-	fxNow = jQuery.now();
+		fxNow = jQuery.now();
 
-	for ( ; i < timers.length; i++ ) {
-		timer = timers[ i ];
-		// Checks the timer has not already been removed
-		if ( !timer() && timers[ i ] === timer ) {
-			timers.splice( i--, 1 );
+		for (; i < timers.length; i++) {
+			timer = timers[i];
+			// Checks the timer has not already been removed
+			if (!timer() && timers[i] === timer) {
+				timers.splice(i--, 1);
+			}
 		}
-	}
 
-	if ( !timers.length ) {
-		jQuery.fx.stop();
-	}
-	fxNow = undefined;
-};
+		if (!timers.length) {
+			jQuery.fx.stop();
+		}
+		fxNow = undefined;
+	};
 
-jQuery.fx.timer = function( timer ) {
-	if ( timer() && jQuery.timers.push( timer ) ) {
-		jQuery.fx.start();
-	}
-};
+	jQuery.fx.timer = function (timer) {
+		if (timer() && jQuery.timers.push(timer)) {
+			jQuery.fx.start();
+		}
+	};
 
-jQuery.fx.interval = 13;
+	jQuery.fx.interval = 13;
 
-jQuery.fx.start = function() {
-	if ( !timerId ) {
-		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
-	}
-};
+	jQuery.fx.start = function () {
+		if (!timerId) {
+			timerId = setInterval(jQuery.fx.tick, jQuery.fx.interval);
+		}
+	};
 
-jQuery.fx.stop = function() {
-	clearInterval( timerId );
-	timerId = null;
-};
+	jQuery.fx.stop = function () {
+		clearInterval(timerId);
+		timerId = null;
+	};
 
-jQuery.fx.speeds = {
-	slow: 600,
-	fast: 200,
-	// Default speed
-	_default: 400
-};
+	jQuery.fx.speeds = {
+		slow: 600,
+		fast: 200,
+		// Default speed
+		_default: 400
+	};
 
 // Back Compat <1.8 extension point
-jQuery.fx.step = {};
+	jQuery.fx.step = {};
 
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.animated = function( elem ) {
-		return jQuery.grep(jQuery.timers, function( fn ) {
-			return elem === fn.elem;
-		}).length;
-	};
-}
-jQuery.fn.offset = function( options ) {
-	if ( arguments.length ) {
-		return options === undefined ?
-			this :
-			this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
+	if (jQuery.expr && jQuery.expr.filters) {
+		jQuery.expr.filters.animated = function (elem) {
+			return jQuery.grep(jQuery.timers, function (fn) {
+				return elem === fn.elem;
+			}).length;
+		};
 	}
+	jQuery.fn.offset = function (options) {
+		if (arguments.length) {
+			return options === undefined ?
+				this :
+				this.each(function (i) {
+					jQuery.offset.setOffset(this, options, i);
+				});
+		}
 
-	var docElem, win,
-		box = { top: 0, left: 0 },
-		elem = this[ 0 ],
-		doc = elem && elem.ownerDocument;
+		var docElem, win,
+			box = {top: 0, left: 0},
+			elem = this[0],
+			doc = elem && elem.ownerDocument;
 
-	if ( !doc ) {
-		return;
-	}
+		if (!doc) {
+			return;
+		}
 
-	docElem = doc.documentElement;
+		docElem = doc.documentElement;
 
-	// Make sure it's not a disconnected DOM node
-	if ( !jQuery.contains( docElem, elem ) ) {
-		return box;
-	}
+		// Make sure it's not a disconnected DOM node
+		if (!jQuery.contains(docElem, elem)) {
+			return box;
+		}
 
-	// If we don't have gBCR, just use 0,0 rather than error
-	// BlackBerry 5, iOS 3 (original iPhone)
-	if ( typeof elem.getBoundingClientRect !== core_strundefined ) {
-		box = elem.getBoundingClientRect();
-	}
-	win = getWindow( doc );
-	return {
-		top: box.top  + ( win.pageYOffset || docElem.scrollTop )  - ( docElem.clientTop  || 0 ),
-		left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
+		// If we don't have gBCR, just use 0,0 rather than error
+		// BlackBerry 5, iOS 3 (original iPhone)
+		if (typeof elem.getBoundingClientRect !== core_strundefined) {
+			box = elem.getBoundingClientRect();
+		}
+		win = getWindow(doc);
+		return {
+			top: box.top + (win.pageYOffset || docElem.scrollTop) - (docElem.clientTop || 0),
+			left: box.left + (win.pageXOffset || docElem.scrollLeft) - (docElem.clientLeft || 0)
+		};
 	};
-};
 
-jQuery.offset = {
+	jQuery.offset = {
 
-	setOffset: function( elem, options, i ) {
-		var position = jQuery.css( elem, "position" );
+		setOffset: function (elem, options, i) {
+			var position = jQuery.css(elem, "position");
 
-		// set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
-			elem.style.position = "relative";
-		}
+			// set position first, in-case top/left are set even on static elem
+			if (position === "static") {
+				elem.style.position = "relative";
+			}
 
-		var curElem = jQuery( elem ),
-			curOffset = curElem.offset(),
-			curCSSTop = jQuery.css( elem, "top" ),
-			curCSSLeft = jQuery.css( elem, "left" ),
-			calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
-			props = {}, curPosition = {}, curTop, curLeft;
+			var curElem = jQuery(elem),
+				curOffset = curElem.offset(),
+				curCSSTop = jQuery.css(elem, "top"),
+				curCSSLeft = jQuery.css(elem, "left"),
+				calculatePosition = (position === "absolute" || position === "fixed") && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
+				props = {}, curPosition = {}, curTop, curLeft;
 
-		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-			curTop = curPosition.top;
-			curLeft = curPosition.left;
-		} else {
-			curTop = parseFloat( curCSSTop ) || 0;
-			curLeft = parseFloat( curCSSLeft ) || 0;
-		}
+			// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
+			if (calculatePosition) {
+				curPosition = curElem.position();
+				curTop = curPosition.top;
+				curLeft = curPosition.left;
+			} else {
+				curTop = parseFloat(curCSSTop) || 0;
+				curLeft = parseFloat(curCSSLeft) || 0;
+			}
 
-		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
-		}
+			if (jQuery.isFunction(options)) {
+				options = options.call(elem, i, curOffset);
+			}
 
-		if ( options.top != null ) {
-			props.top = ( options.top - curOffset.top ) + curTop;
-		}
-		if ( options.left != null ) {
-			props.left = ( options.left - curOffset.left ) + curLeft;
-		}
+			if (options.top != null) {
+				props.top = (options.top - curOffset.top) + curTop;
+			}
+			if (options.left != null) {
+				props.left = (options.left - curOffset.left) + curLeft;
+			}
 
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-		} else {
-			curElem.css( props );
+			if ("using" in options) {
+				options.using.call(elem, props);
+			} else {
+				curElem.css(props);
+			}
 		}
-	}
-};
+	};
 
 
-jQuery.fn.extend({
+	jQuery.fn.extend({
 
-	position: function() {
-		if ( !this[ 0 ] ) {
-			return;
-		}
+		position: function () {
+			if (!this[0]) {
+				return;
+			}
 
-		var offsetParent, offset,
-			parentOffset = { top: 0, left: 0 },
-			elem = this[ 0 ];
+			var offsetParent, offset,
+				parentOffset = {top: 0, left: 0},
+				elem = this[0];
 
-		// fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is it's only offset parent
-		if ( jQuery.css( elem, "position" ) === "fixed" ) {
-			// we assume that getBoundingClientRect is available when computed position is fixed
-			offset = elem.getBoundingClientRect();
-		} else {
-			// Get *real* offsetParent
-			offsetParent = this.offsetParent();
+			// fixed elements are offset from window (parentOffset = {top:0, left: 0}, because it is it's only offset parent
+			if (jQuery.css(elem, "position") === "fixed") {
+				// we assume that getBoundingClientRect is available when computed position is fixed
+				offset = elem.getBoundingClientRect();
+			} else {
+				// Get *real* offsetParent
+				offsetParent = this.offsetParent();
+
+				// Get correct offsets
+				offset = this.offset();
+				if (!jQuery.nodeName(offsetParent[0], "html")) {
+					parentOffset = offsetParent.offset();
+				}
 
-			// Get correct offsets
-			offset = this.offset();
-			if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
-				parentOffset = offsetParent.offset();
+				// Add offsetParent borders
+				parentOffset.top += jQuery.css(offsetParent[0], "borderTopWidth", true);
+				parentOffset.left += jQuery.css(offsetParent[0], "borderLeftWidth", true);
 			}
 
-			// Add offsetParent borders
-			parentOffset.top  += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
-			parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
+			// Subtract parent offsets and element margins
+			// note: when an element has margin: auto the offsetLeft and marginLeft
+			// are the same in Safari causing offset.left to incorrectly be 0
+			return {
+				top: offset.top - parentOffset.top - jQuery.css(elem, "marginTop", true),
+				left: offset.left - parentOffset.left - jQuery.css(elem, "marginLeft", true)
+			};
+		},
+
+		offsetParent: function () {
+			return this.map(function () {
+				var offsetParent = this.offsetParent || docElem;
+				while (offsetParent && (!jQuery.nodeName(offsetParent, "html") && jQuery.css(offsetParent, "position") === "static")) {
+					offsetParent = offsetParent.offsetParent;
+				}
+				return offsetParent || docElem;
+			});
 		}
+	});
 
-		// Subtract parent offsets and element margins
-		// note: when an element has margin: auto the offsetLeft and marginLeft
-		// are the same in Safari causing offset.left to incorrectly be 0
-		return {
-			top:  offset.top  - parentOffset.top - jQuery.css( elem, "marginTop", true ),
-			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true)
-		};
-	},
 
-	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || docElem;
-			while ( offsetParent && ( !jQuery.nodeName( offsetParent, "html" ) && jQuery.css( offsetParent, "position") === "static" ) ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-			return offsetParent || docElem;
-		});
-	}
-});
+// Create scrollLeft and scrollTop methods
+	jQuery.each({scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function (method, prop) {
+		var top = /Y/.test(prop);
 
+		jQuery.fn[method] = function (val) {
+			return jQuery.access(this, function (elem, method, val) {
+				var win = getWindow(elem);
 
-// Create scrollLeft and scrollTop methods
-jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
-	var top = /Y/.test( prop );
+				if (val === undefined) {
+					return win ? (prop in win) ? win[prop] :
+							win.document.documentElement[method] :
+						elem[method];
+				}
 
-	jQuery.fn[ method ] = function( val ) {
-		return jQuery.access( this, function( elem, method, val ) {
-			var win = getWindow( elem );
+				if (win) {
+					win.scrollTo(
+						!top ? val : jQuery(win).scrollLeft(),
+						top ? val : jQuery(win).scrollTop()
+					);
 
-			if ( val === undefined ) {
-				return win ? (prop in win) ? win[ prop ] :
-					win.document.documentElement[ method ] :
-					elem[ method ];
-			}
+				} else {
+					elem[method] = val;
+				}
+			}, method, val, arguments.length, null);
+		};
+	});
 
-			if ( win ) {
-				win.scrollTo(
-					!top ? val : jQuery( win ).scrollLeft(),
-					top ? val : jQuery( win ).scrollTop()
-				);
+	function getWindow(elem) {
+		return jQuery.isWindow(elem) ?
+			elem :
+			elem.nodeType === 9 ?
+				elem.defaultView || elem.parentWindow :
+				false;
+	}
 
-			} else {
-				elem[ method ] = val;
-			}
-		}, method, val, arguments.length, null );
-	};
-});
-
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ?
-		elem :
-		elem.nodeType === 9 ?
-			elem.defaultView || elem.parentWindow :
-			false;
-}
 // Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
-jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
-		// margin is only for outerHeight, outerWidth
-		jQuery.fn[ funcName ] = function( margin, value ) {
-			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
-				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
-
-			return jQuery.access( this, function( elem, type, value ) {
-				var doc;
-
-				if ( jQuery.isWindow( elem ) ) {
-					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
-					// isn't a whole lot we can do. See pull request at this URL for discussion:
-					// https://github.com/jquery/jquery/pull/764
-					return elem.document.documentElement[ "client" + name ];
-				}
-
-				// Get document width or height
-				if ( elem.nodeType === 9 ) {
-					doc = elem.documentElement;
-
-					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
-					// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
-					return Math.max(
-						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
-						elem.body[ "offset" + name ], doc[ "offset" + name ],
-						doc[ "client" + name ]
-					);
-				}
+	jQuery.each({Height: "height", Width: "width"}, function (name, type) {
+		jQuery.each({padding: "inner" + name, content: type, "": "outer" + name}, function (defaultExtra, funcName) {
+			// margin is only for outerHeight, outerWidth
+			jQuery.fn[funcName] = function (margin, value) {
+				var chainable = arguments.length && (defaultExtra || typeof margin !== "boolean"),
+					extra = defaultExtra || (margin === true || value === true ? "margin" : "border");
+
+				return jQuery.access(this, function (elem, type, value) {
+					var doc;
+
+					if (jQuery.isWindow(elem)) {
+						// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
+						// isn't a whole lot we can do. See pull request at this URL for discussion:
+						// https://github.com/jquery/jquery/pull/764
+						return elem.document.documentElement["client" + name];
+					}
 
-				return value === undefined ?
-					// Get width or height on the element, requesting but not forcing parseFloat
-					jQuery.css( elem, type, extra ) :
+					// Get document width or height
+					if (elem.nodeType === 9) {
+						doc = elem.documentElement;
+
+						// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
+						// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
+						return Math.max(
+							elem.body["scroll" + name], doc["scroll" + name],
+							elem.body["offset" + name], doc["offset" + name],
+							doc["client" + name]
+						);
+					}
 
-					// Set width or height on the element
-					jQuery.style( elem, type, value, extra );
-			}, type, chainable ? margin : undefined, chainable, null );
-		};
+					return value === undefined ?
+						// Get width or height on the element, requesting but not forcing parseFloat
+						jQuery.css(elem, type, extra) :
+
+						// Set width or height on the element
+						jQuery.style(elem, type, value, extra);
+				}, type, chainable ? margin : undefined, chainable, null);
+			};
+		});
 	});
-});
 // Limit scope pollution from any deprecated API
 // (function() {
 
 // The number of elements contained in the matched element set
-jQuery.fn.size = function() {
-	return this.length;
-};
+	jQuery.fn.size = function () {
+		return this.length;
+	};
 
-jQuery.fn.andSelf = jQuery.fn.addBack;
+	jQuery.fn.andSelf = jQuery.fn.addBack;
 
 // })();
-if ( typeof module === "object" && module && typeof module.exports === "object" ) {
-	// Expose jQuery as module.exports in loaders that implement the Node
-	// module pattern (including browserify). Do not create the global, since
-	// the user will be storing it themselves locally, and globals are frowned
-	// upon in the Node module world.
-	module.exports = jQuery;
-} else {
-	// Otherwise expose jQuery to the global object as usual
-	window.jQuery = window.$ = jQuery;
-
-	// Register as a named AMD module, since jQuery can be concatenated with other
-	// files that may use define, but not via a proper concatenation script that
-	// understands anonymous AMD modules. A named AMD is safest and most robust
-	// way to register. Lowercase jquery is used because AMD module names are
-	// derived from file names, and jQuery is normally delivered in a lowercase
-	// file name. Do this after creating the global so that if an AMD module wants
-	// to call noConflict to hide this version of jQuery, it will work.
-	if ( typeof define === "function" && define.amd ) {
-		define( "jquery", [], function () { return jQuery; } );
+	if (typeof module === "object" && module && typeof module.exports === "object") {
+		// Expose jQuery as module.exports in loaders that implement the Node
+		// module pattern (including browserify). Do not create the global, since
+		// the user will be storing it themselves locally, and globals are frowned
+		// upon in the Node module world.
+		module.exports = jQuery;
+	} else {
+		// Otherwise expose jQuery to the global object as usual
+		window.jQuery = window.$ = jQuery;
+
+		// Register as a named AMD module, since jQuery can be concatenated with other
+		// files that may use define, but not via a proper concatenation script that
+		// understands anonymous AMD modules. A named AMD is safest and most robust
+		// way to register. Lowercase jquery is used because AMD module names are
+		// derived from file names, and jQuery is normally delivered in a lowercase
+		// file name. Do this after creating the global so that if an AMD module wants
+		// to call noConflict to hide this version of jQuery, it will work.
+		if (typeof define === "function" && define.amd) {
+			define("jquery", [], function () {
+				return jQuery;
+			});
+		}
 	}
-}
 
-})( window );
+})(window);
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/json3_3.2.6/lib/json3.js b/len-activiti/src/main/resources/static/editor-app/libs/json3_3.2.6/lib/json3.js
index 2d366a3..76cefdb 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/json3_3.2.6/lib/json3.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/json3_3.2.6/lib/json3.js
@@ -1,861 +1,888 @@
 /*! JSON v3.2.6 | http://bestiejs.github.io/json3 | Copyright 2012-2013, Kit Cambridge | http://kit.mit-license.org */
 ;(function (window) {
-  // Convenience aliases.
-  var getClass = {}.toString, isProperty, forEach, undef;
-
-  // Detect the `define` function exposed by asynchronous module loaders. The
-  // strict `define` check is necessary for compatibility with `r.js`.
-  var isLoader = typeof define === "function" && define.amd;
-
-  // Detect native implementations.
-  var nativeJSON = typeof JSON == "object" && JSON;
-
-  // Set up the JSON 3 namespace, preferring the CommonJS `exports` object if
-  // available.
-  var JSON3 = typeof exports == "object" && exports && !exports.nodeType && exports;
-
-  if (JSON3 && nativeJSON) {
-    // Explicitly delegate to the native `stringify` and `parse`
-    // implementations in CommonJS environments.
-    JSON3.stringify = nativeJSON.stringify;
-    JSON3.parse = nativeJSON.parse;
-  } else {
-    // Export for web browsers, JavaScript engines, and asynchronous module
-    // loaders, using the global `JSON` object if available.
-    JSON3 = window.JSON = nativeJSON || {};
-  }
-
-  // Test the `Date#getUTC*` methods. Based on work by @Yaffle.
-  var isExtended = new Date(-3509827334573292);
-  try {
-    // The `getUTCFullYear`, `Month`, and `Date` methods return nonsensical
-    // results for certain dates in Opera >= 10.53.
-    isExtended = isExtended.getUTCFullYear() == -109252 && isExtended.getUTCMonth() === 0 && isExtended.getUTCDate() === 1 &&
-      // Safari < 2.0.2 stores the internal millisecond time value correctly,
-      // but clips the values returned by the date methods to the range of
-      // signed 32-bit integers ([-2 ** 31, 2 ** 31 - 1]).
-      isExtended.getUTCHours() == 10 && isExtended.getUTCMinutes() == 37 && isExtended.getUTCSeconds() == 6 && isExtended.getUTCMilliseconds() == 708;
-  } catch (exception) {}
-
-  // Internal: Determines whether the native `JSON.stringify` and `parse`
-  // implementations are spec-compliant. Based on work by Ken Snyder.
-  function has(name) {
-    if (has[name] !== undef) {
-      // Return cached feature test result.
-      return has[name];
-    }
-
-    var isSupported;
-    if (name == "bug-string-char-index") {
-      // IE <= 7 doesn't support accessing string characters using square
-      // bracket notation. IE 8 only supports this for primitives.
-      isSupported = "a"[0] != "a";
-    } else if (name == "json") {
-      // Indicates whether both `JSON.stringify` and `JSON.parse` are
-      // supported.
-      isSupported = has("json-stringify") && has("json-parse");
-    } else {
-      var value, serialized = '{"a":[1,true,false,null,"\\u0000\\b\\n\\f\\r\\t"]}';
-      // Test `JSON.stringify`.
-      if (name == "json-stringify") {
-        var stringify = JSON3.stringify, stringifySupported = typeof stringify == "function" && isExtended;
-        if (stringifySupported) {
-          // A test function object with a custom `toJSON` method.
-          (value = function () {
-            return 1;
-          }).toJSON = value;
-          try {
-            stringifySupported =
-              // Firefox 3.1b1 and b2 serialize string, number, and boolean
-              // primitives as object literals.
-              stringify(0) === "0" &&
-              // FF 3.1b1, b2, and JSON 2 serialize wrapped primitives as object
-              // literals.
-              stringify(new Number()) === "0" &&
-              stringify(new String()) == '""' &&
-              // FF 3.1b1, 2 throw an error if the value is `null`, `undefined`, or
-              // does not define a canonical JSON representation (this applies to
-              // objects with `toJSON` properties as well, *unless* they are nested
-              // within an object or array).
-              stringify(getClass) === undef &&
-              // IE 8 serializes `undefined` as `"undefined"`. Safari <= 5.1.7 and
-              // FF 3.1b3 pass this test.
-              stringify(undef) === undef &&
-              // Safari <= 5.1.7 and FF 3.1b3 throw `Error`s and `TypeError`s,
-              // respectively, if the value is omitted entirely.
-              stringify() === undef &&
-              // FF 3.1b1, 2 throw an error if the given value is not a number,
-              // string, array, object, Boolean, or `null` literal. This applies to
-              // objects with custom `toJSON` methods as well, unless they are nested
-              // inside object or array literals. YUI 3.0.0b1 ignores custom `toJSON`
-              // methods entirely.
-              stringify(value) === "1" &&
-              stringify([value]) == "[1]" &&
-              // Prototype <= 1.6.1 serializes `[undefined]` as `"[]"` instead of
-              // `"[null]"`.
-              stringify([undef]) == "[null]" &&
-              // YUI 3.0.0b1 fails to serialize `null` literals.
-              stringify(null) == "null" &&
-              // FF 3.1b1, 2 halts serialization if an array contains a function:
-              // `[1, true, getClass, 1]` serializes as "[1,true,],". FF 3.1b3
-              // elides non-JSON values from objects and arrays, unless they
-              // define custom `toJSON` methods.
-              stringify([undef, getClass, null]) == "[null,null,null]" &&
-              // Simple serialization test. FF 3.1b1 uses Unicode escape sequences
-              // where character escape codes are expected (e.g., `\b` => `\u0008`).
-              stringify({ "a": [value, true, false, null, "\x00\b\n\f\r\t"] }) == serialized &&
-              // FF 3.1b1 and b2 ignore the `filter` and `width` arguments.
-              stringify(null, value) === "1" &&
-              stringify([1, 2], null, 1) == "[\n 1,\n 2\n]" &&
-              // JSON 2, Prototype <= 1.7, and older WebKit builds incorrectly
-              // serialize extended years.
-              stringify(new Date(-8.64e15)) == '"-271821-04-20T00:00:00.000Z"' &&
-              // The milliseconds are optional in ES 5, but required in 5.1.
-              stringify(new Date(8.64e15)) == '"+275760-09-13T00:00:00.000Z"' &&
-              // Firefox <= 11.0 incorrectly serializes years prior to 0 as negative
-              // four-digit years instead of six-digit years. Credits: @Yaffle.
-              stringify(new Date(-621987552e5)) == '"-000001-01-01T00:00:00.000Z"' &&
-              // Safari <= 5.1.5 and Opera >= 10.53 incorrectly serialize millisecond
-              // values less than 1000. Credits: @Yaffle.
-              stringify(new Date(-1)) == '"1969-12-31T23:59:59.999Z"';
-          } catch (exception) {
-            stringifySupported = false;
-          }
-        }
-        isSupported = stringifySupported;
-      }
-      // Test `JSON.parse`.
-      if (name == "json-parse") {
-        var parse = JSON3.parse;
-        if (typeof parse == "function") {
-          try {
-            // FF 3.1b1, b2 will throw an exception if a bare literal is provided.
-            // Conforming implementations should also coerce the initial argument to
-            // a string prior to parsing.
-            if (parse("0") === 0 && !parse(false)) {
-              // Simple parsing test.
-              value = parse(serialized);
-              var parseSupported = value["a"].length == 5 && value["a"][0] === 1;
-              if (parseSupported) {
-                try {
-                  // Safari <= 5.1.2 and FF 3.1b1 allow unescaped tabs in strings.
-                  parseSupported = !parse('"\t"');
-                } catch (exception) {}
-                if (parseSupported) {
-                  try {
-                    // FF 4.0 and 4.0.1 allow leading `+` signs and leading
-                    // decimal points. FF 4.0, 4.0.1, and IE 9-10 also allow
-                    // certain octal literals.
-                    parseSupported = parse("01") !== 1;
-                  } catch (exception) {}
-                }
-                if (parseSupported) {
-                  try {
-                    // FF 4.0, 4.0.1, and Rhino 1.7R3-R4 allow trailing decimal
-                    // points. These environments, along with FF 3.1b1 and 2,
-                    // also allow trailing commas in JSON objects and arrays.
-                    parseSupported = parse("1.") !== 1;
-                  } catch (exception) {}
-                }
-              }
-            }
-          } catch (exception) {
-            parseSupported = false;
-          }
-        }
-        isSupported = parseSupported;
-      }
-    }
-    return has[name] = !!isSupported;
-  }
-
-  if (!has("json")) {
-    // Common `[[Class]]` name aliases.
-    var functionClass = "[object Function]";
-    var dateClass = "[object Date]";
-    var numberClass = "[object Number]";
-    var stringClass = "[object String]";
-    var arrayClass = "[object Array]";
-    var booleanClass = "[object Boolean]";
-
-    // Detect incomplete support for accessing string characters by index.
-    var charIndexBuggy = has("bug-string-char-index");
-
-    // Define additional utility methods if the `Date` methods are buggy.
-    if (!isExtended) {
-      var floor = Math.floor;
-      // A mapping between the months of the year and the number of days between
-      // January 1st and the first of the respective month.
-      var Months = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334];
-      // Internal: Calculates the number of days between the Unix epoch and the
-      // first day of the given month.
-      var getDay = function (year, month) {
-        return Months[month] + 365 * (year - 1970) + floor((year - 1969 + (month = +(month > 1))) / 4) - floor((year - 1901 + month) / 100) + floor((year - 1601 + month) / 400);
-      };
-    }
-
-    // Internal: Determines if a property is a direct property of the given
-    // object. Delegates to the native `Object#hasOwnProperty` method.
-    if (!(isProperty = {}.hasOwnProperty)) {
-      isProperty = function (property) {
-        var members = {}, constructor;
-        if ((members.__proto__ = null, members.__proto__ = {
-          // The *proto* property cannot be set multiple times in recent
-          // versions of Firefox and SeaMonkey.
-          "toString": 1
-        }, members).toString != getClass) {
-          // Safari <= 2.0.3 doesn't implement `Object#hasOwnProperty`, but
-          // supports the mutable *proto* property.
-          isProperty = function (property) {
-            // Capture and break the object's prototype chain (see section 8.6.2
-            // of the ES 5.1 spec). The parenthesized expression prevents an
-            // unsafe transformation by the Closure Compiler.
-            var original = this.__proto__, result = property in (this.__proto__ = null, this);
-            // Restore the original prototype chain.
-            this.__proto__ = original;
-            return result;
-          };
-        } else {
-          // Capture a reference to the top-level `Object` constructor.
-          constructor = members.constructor;
-          // Use the `constructor` property to simulate `Object#hasOwnProperty` in
-          // other environments.
-          isProperty = function (property) {
-            var parent = (this.constructor || constructor).prototype;
-            return property in this && !(property in parent && this[property] === parent[property]);
-          };
-        }
-        members = null;
-        return isProperty.call(this, property);
-      };
-    }
-
-    // Internal: A set of primitive types used by `isHostType`.
-    var PrimitiveTypes = {
-      'boolean': 1,
-      'number': 1,
-      'string': 1,
-      'undefined': 1
-    };
-
-    // Internal: Determines if the given object `property` value is a
-    // non-primitive.
-    var isHostType = function (object, property) {
-      var type = typeof object[property];
-      return type == 'object' ? !!object[property] : !PrimitiveTypes[type];
-    };
-
-    // Internal: Normalizes the `for...in` iteration algorithm across
-    // environments. Each enumerated key is yielded to a `callback` function.
-    forEach = function (object, callback) {
-      var size = 0, Properties, members, property;
-
-      // Tests for bugs in the current environment's `for...in` algorithm. The
-      // `valueOf` property inherits the non-enumerable flag from
-      // `Object.prototype` in older versions of IE, Netscape, and Mozilla.
-      (Properties = function () {
-        this.valueOf = 0;
-      }).prototype.valueOf = 0;
-
-      // Iterate over a new instance of the `Properties` class.
-      members = new Properties();
-      for (property in members) {
-        // Ignore all properties inherited from `Object.prototype`.
-        if (isProperty.call(members, property)) {
-          size++;
-        }
-      }
-      Properties = members = null;
-
-      // Normalize the iteration algorithm.
-      if (!size) {
-        // A list of non-enumerable properties inherited from `Object.prototype`.
-        members = ["valueOf", "toString", "toLocaleString", "propertyIsEnumerable", "isPrototypeOf", "hasOwnProperty", "constructor"];
-        // IE <= 8, Mozilla 1.0, and Netscape 6.2 ignore shadowed non-enumerable
-        // properties.
-        forEach = function (object, callback) {
-          var isFunction = getClass.call(object) == functionClass, property, length;
-          var hasProperty = !isFunction && typeof object.constructor != 'function' && isHostType(object, 'hasOwnProperty') ? object.hasOwnProperty : isProperty;
-          for (property in object) {
-            // Gecko <= 1.0 enumerates the `prototype` property of functions under
-            // certain conditions; IE does not.
-            if (!(isFunction && property == "prototype") && hasProperty.call(object, property)) {
-              callback(property);
-            }
-          }
-          // Manually invoke the callback for each non-enumerable property.
-          for (length = members.length; property = members[--length]; hasProperty.call(object, property) && callback(property));
-        };
-      } else if (size == 2) {
-        // Safari <= 2.0.4 enumerates shadowed properties twice.
-        forEach = function (object, callback) {
-          // Create a set of iterated properties.
-          var members = {}, isFunction = getClass.call(object) == functionClass, property;
-          for (property in object) {
-            // Store each property name to prevent double enumeration. The
-            // `prototype` property of functions is not enumerated due to cross-
-            // environment inconsistencies.
-            if (!(isFunction && property == "prototype") && !isProperty.call(members, property) && (members[property] = 1) && isProperty.call(object, property)) {
-              callback(property);
-            }
-          }
-        };
-      } else {
-        // No bugs detected; use the standard `for...in` algorithm.
-        forEach = function (object, callback) {
-          var isFunction = getClass.call(object) == functionClass, property, isConstructor;
-          for (property in object) {
-            if (!(isFunction && property == "prototype") && isProperty.call(object, property) && !(isConstructor = property === "constructor")) {
-              callback(property);
-            }
-          }
-          // Manually invoke the callback for the `constructor` property due to
-          // cross-environment inconsistencies.
-          if (isConstructor || isProperty.call(object, (property = "constructor"))) {
-            callback(property);
-          }
-        };
-      }
-      return forEach(object, callback);
-    };
-
-    // Public: Serializes a JavaScript `value` as a JSON string. The optional
-    // `filter` argument may specify either a function that alters how object and
-    // array members are serialized, or an array of strings and numbers that
-    // indicates which properties should be serialized. The optional `width`
-    // argument may be either a string or number that specifies the indentation
-    // level of the output.
-    if (!has("json-stringify")) {
-      // Internal: A map of control characters and their escaped equivalents.
-      var Escapes = {
-        92: "\\\\",
-        34: '\\"',
-        8: "\\b",
-        12: "\\f",
-        10: "\\n",
-        13: "\\r",
-        9: "\\t"
-      };
-
-      // Internal: Converts `value` into a zero-padded string such that its
-      // length is at least equal to `width`. The `width` must be <= 6.
-      var leadingZeroes = "000000";
-      var toPaddedString = function (width, value) {
-        // The `|| 0` expression is necessary to work around a bug in
-        // Opera <= 7.54u2 where `0 == -0`, but `String(-0) !== "0"`.
-        return (leadingZeroes + (value || 0)).slice(-width);
-      };
-
-      // Internal: Double-quotes a string `value`, replacing all ASCII control
-      // characters (characters with code unit values between 0 and 31) with
-      // their escaped equivalents. This is an implementation of the
-      // `Quote(value)` operation defined in ES 5.1 section 15.12.3.
-      var unicodePrefix = "\\u00";
-      var quote = function (value) {
-        var result = '"', index = 0, length = value.length, isLarge = length > 10 && charIndexBuggy, symbols;
-        if (isLarge) {
-          symbols = value.split("");
-        }
-        for (; index < length; index++) {
-          var charCode = value.charCodeAt(index);
-          // If the character is a control character, append its Unicode or
-          // shorthand escape sequence; otherwise, append the character as-is.
-          switch (charCode) {
-            case 8: case 9: case 10: case 12: case 13: case 34: case 92:
-              result += Escapes[charCode];
-              break;
-            default:
-              if (charCode < 32) {
-                result += unicodePrefix + toPaddedString(2, charCode.toString(16));
-                break;
-              }
-              result += isLarge ? symbols[index] : charIndexBuggy ? value.charAt(index) : value[index];
-          }
-        }
-        return result + '"';
-      };
-
-      // Internal: Recursively serializes an object. Implements the
-      // `Str(key, holder)`, `JO(value)`, and `JA(value)` operations.
-      var serialize = function (property, object, callback, properties, whitespace, indentation, stack) {
-        var value, className, year, month, date, time, hours, minutes, seconds, milliseconds, results, element, index, length, prefix, result;
-        try {
-          // Necessary for host object support.
-          value = object[property];
-        } catch (exception) {}
-        if (typeof value == "object" && value) {
-          className = getClass.call(value);
-          if (className == dateClass && !isProperty.call(value, "toJSON")) {
-            if (value > -1 / 0 && value < 1 / 0) {
-              // Dates are serialized according to the `Date#toJSON` method
-              // specified in ES 5.1 section 15.9.5.44. See section 15.9.1.15
-              // for the ISO 8601 date time string format.
-              if (getDay) {
-                // Manually compute the year, month, date, hours, minutes,
-                // seconds, and milliseconds if the `getUTC*` methods are
-                // buggy. Adapted from @Yaffle's `date-shim` project.
-                date = floor(value / 864e5);
-                for (year = floor(date / 365.2425) + 1970 - 1; getDay(year + 1, 0) <= date; year++);
-                for (month = floor((date - getDay(year, 0)) / 30.42); getDay(year, month + 1) <= date; month++);
-                date = 1 + date - getDay(year, month);
-                // The `time` value specifies the time within the day (see ES
-                // 5.1 section 15.9.1.2). The formula `(A % B + B) % B` is used
-                // to compute `A modulo B`, as the `%` operator does not
-                // correspond to the `modulo` operation for negative numbers.
-                time = (value % 864e5 + 864e5) % 864e5;
-                // The hours, minutes, seconds, and milliseconds are obtained by
-                // decomposing the time within the day. See section 15.9.1.10.
-                hours = floor(time / 36e5) % 24;
-                minutes = floor(time / 6e4) % 60;
-                seconds = floor(time / 1e3) % 60;
-                milliseconds = time % 1e3;
-              } else {
-                year = value.getUTCFullYear();
-                month = value.getUTCMonth();
-                date = value.getUTCDate();
-                hours = value.getUTCHours();
-                minutes = value.getUTCMinutes();
-                seconds = value.getUTCSeconds();
-                milliseconds = value.getUTCMilliseconds();
-              }
-              // Serialize extended years correctly.
-              value = (year <= 0 || year >= 1e4 ? (year < 0 ? "-" : "+") + toPaddedString(6, year < 0 ? -year : year) : toPaddedString(4, year)) +
-                "-" + toPaddedString(2, month + 1) + "-" + toPaddedString(2, date) +
-                // Months, dates, hours, minutes, and seconds should have two
-                // digits; milliseconds should have three.
-                "T" + toPaddedString(2, hours) + ":" + toPaddedString(2, minutes) + ":" + toPaddedString(2, seconds) +
-                // Milliseconds are optional in ES 5.0, but required in 5.1.
-                "." + toPaddedString(3, milliseconds) + "Z";
-            } else {
-              value = null;
-            }
-          } else if (typeof value.toJSON == "function" && ((className != numberClass && className != stringClass && className != arrayClass) || isProperty.call(value, "toJSON"))) {
-            // Prototype <= 1.6.1 adds non-standard `toJSON` methods to the
-            // `Number`, `String`, `Date`, and `Array` prototypes. JSON 3
-            // ignores all `toJSON` methods on these objects unless they are
-            // defined directly on an instance.
-            value = value.toJSON(property);
-          }
-        }
-        if (callback) {
-          // If a replacement function was provided, call it to obtain the value
-          // for serialization.
-          value = callback.call(object, property, value);
-        }
-        if (value === null) {
-          return "null";
-        }
-        className = getClass.call(value);
-        if (className == booleanClass) {
-          // Booleans are represented literally.
-          return "" + value;
-        } else if (className == numberClass) {
-          // JSON numbers must be finite. `Infinity` and `NaN` are serialized as
-          // `"null"`.
-          return value > -1 / 0 && value < 1 / 0 ? "" + value : "null";
-        } else if (className == stringClass) {
-          // Strings are double-quoted and escaped.
-          return quote("" + value);
-        }
-        // Recursively serialize objects and arrays.
-        if (typeof value == "object") {
-          // Check for cyclic structures. This is a linear search; performance
-          // is inversely proportional to the number of unique nested objects.
-          for (length = stack.length; length--;) {
-            if (stack[length] === value) {
-              // Cyclic structures cannot be serialized by `JSON.stringify`.
-              throw TypeError();
-            }
-          }
-          // Add the object to the stack of traversed objects.
-          stack.push(value);
-          results = [];
-          // Save the current indentation level and indent one additional level.
-          prefix = indentation;
-          indentation += whitespace;
-          if (className == arrayClass) {
-            // Recursively serialize array elements.
-            for (index = 0, length = value.length; index < length; index++) {
-              element = serialize(index, value, callback, properties, whitespace, indentation, stack);
-              results.push(element === undef ? "null" : element);
-            }
-            result = results.length ? (whitespace ? "[\n" + indentation + results.join(",\n" + indentation) + "\n" + prefix + "]" : ("[" + results.join(",") + "]")) : "[]";
-          } else {
-            // Recursively serialize object members. Members are selected from
-            // either a user-specified list of property names, or the object
-            // itself.
-            forEach(properties || value, function (property) {
-              var element = serialize(property, value, callback, properties, whitespace, indentation, stack);
-              if (element !== undef) {
-                // According to ES 5.1 section 15.12.3: "If `gap` {whitespace}
-                // is not the empty string, let `member` {quote(property) + ":"}
-                // be the concatenation of `member` and the `space` character."
-                // The "`space` character" refers to the literal space
-                // character, not the `space` {width} argument provided to
-                // `JSON.stringify`.
-                results.push(quote(property) + ":" + (whitespace ? " " : "") + element);
-              }
-            });
-            result = results.length ? (whitespace ? "{\n" + indentation + results.join(",\n" + indentation) + "\n" + prefix + "}" : ("{" + results.join(",") + "}")) : "{}";
-          }
-          // Remove the object from the traversed object stack.
-          stack.pop();
-          return result;
-        }
-      };
-
-      // Public: `JSON.stringify`. See ES 5.1 section 15.12.3.
-      JSON3.stringify = function (source, filter, width) {
-        var whitespace, callback, properties, className;
-        if (typeof filter == "function" || typeof filter == "object" && filter) {
-          if ((className = getClass.call(filter)) == functionClass) {
-            callback = filter;
-          } else if (className == arrayClass) {
-            // Convert the property names array into a makeshift set.
-            properties = {};
-            for (var index = 0, length = filter.length, value; index < length; value = filter[index++], ((className = getClass.call(value)), className == stringClass || className == numberClass) && (properties[value] = 1));
-          }
-        }
-        if (width) {
-          if ((className = getClass.call(width)) == numberClass) {
-            // Convert the `width` to an integer and create a string containing
-            // `width` number of space characters.
-            if ((width -= width % 1) > 0) {
-              for (whitespace = "", width > 10 && (width = 10); whitespace.length < width; whitespace += " ");
-            }
-          } else if (className == stringClass) {
-            whitespace = width.length <= 10 ? width : width.slice(0, 10);
-          }
-        }
-        // Opera <= 7.54u2 discards the values associated with empty string keys
-        // (`""`) only if they are used directly within an object member list
-        // (e.g., `!("" in { "": 1})`).
-        return serialize("", (value = {}, value[""] = source, value), callback, properties, whitespace, "", []);
-      };
-    }
-
-    // Public: Parses a JSON source string.
-    if (!has("json-parse")) {
-      var fromCharCode = String.fromCharCode;
-
-      // Internal: A map of escaped control characters and their unescaped
-      // equivalents.
-      var Unescapes = {
-        92: "\\",
-        34: '"',
-        47: "/",
-        98: "\b",
-        116: "\t",
-        110: "\n",
-        102: "\f",
-        114: "\r"
-      };
-
-      // Internal: Stores the parser state.
-      var Index, Source;
-
-      // Internal: Resets the parser state and throws a `SyntaxError`.
-      var abort = function() {
-        Index = Source = null;
-        throw SyntaxError();
-      };
-
-      // Internal: Returns the next token, or `"$"` if the parser has reached
-      // the end of the source string. A token may be a string, number, `null`
-      // literal, or Boolean literal.
-      var lex = function () {
-        var source = Source, length = source.length, value, begin, position, isSigned, charCode;
-        while (Index < length) {
-          charCode = source.charCodeAt(Index);
-          switch (charCode) {
-            case 9: case 10: case 13: case 32:
-              // Skip whitespace tokens, including tabs, carriage returns, line
-              // feeds, and space characters.
-              Index++;
-              break;
-            case 123: case 125: case 91: case 93: case 58: case 44:
-              // Parse a punctuator token (`{`, `}`, `[`, `]`, `:`, or `,`) at
-              // the current position.
-              value = charIndexBuggy ? source.charAt(Index) : source[Index];
-              Index++;
-              return value;
-            case 34:
-              // `"` delimits a JSON string; advance to the next character and
-              // begin parsing the string. String tokens are prefixed with the
-              // sentinel `@` character to distinguish them from punctuators and
-              // end-of-string tokens.
-              for (value = "@", Index++; Index < length;) {
-                charCode = source.charCodeAt(Index);
-                if (charCode < 32) {
-                  // Unescaped ASCII control characters (those with a code unit
-                  // less than the space character) are not permitted.
-                  abort();
-                } else if (charCode == 92) {
-                  // A reverse solidus (`\`) marks the beginning of an escaped
-                  // control character (including `"`, `\`, and `/`) or Unicode
-                  // escape sequence.
-                  charCode = source.charCodeAt(++Index);
-                  switch (charCode) {
-                    case 92: case 34: case 47: case 98: case 116: case 110: case 102: case 114:
-                      // Revive escaped control characters.
-                      value += Unescapes[charCode];
-                      Index++;
-                      break;
-                    case 117:
-                      // `\u` marks the beginning of a Unicode escape sequence.
-                      // Advance to the first character and validate the
-                      // four-digit code point.
-                      begin = ++Index;
-                      for (position = Index + 4; Index < position; Index++) {
-                        charCode = source.charCodeAt(Index);
-                        // A valid sequence comprises four hexdigits (case-
-                        // insensitive) that form a single hexadecimal value.
-                        if (!(charCode >= 48 && charCode <= 57 || charCode >= 97 && charCode <= 102 || charCode >= 65 && charCode <= 70)) {
-                          // Invalid Unicode escape sequence.
-                          abort();
-                        }
-                      }
-                      // Revive the escaped character.
-                      value += fromCharCode("0x" + source.slice(begin, Index));
-                      break;
-                    default:
-                      // Invalid escape sequence.
-                      abort();
-                  }
-                } else {
-                  if (charCode == 34) {
-                    // An unescaped double-quote character marks the end of the
-                    // string.
-                    break;
-                  }
-                  charCode = source.charCodeAt(Index);
-                  begin = Index;
-                  // Optimize for the util case where a string is valid.
-                  while (charCode >= 32 && charCode != 92 && charCode != 34) {
-                    charCode = source.charCodeAt(++Index);
-                  }
-                  // Append the string as-is.
-                  value += source.slice(begin, Index);
-                }
-              }
-              if (source.charCodeAt(Index) == 34) {
-                // Advance to the next character and return the revived string.
-                Index++;
-                return value;
-              }
-              // Unterminated string.
-              abort();
-            default:
-              // Parse numbers and literals.
-              begin = Index;
-              // Advance past the negative sign, if one is specified.
-              if (charCode == 45) {
-                isSigned = true;
-                charCode = source.charCodeAt(++Index);
-              }
-              // Parse an integer or floating-point value.
-              if (charCode >= 48 && charCode <= 57) {
-                // Leading zeroes are interpreted as octal literals.
-                if (charCode == 48 && ((charCode = source.charCodeAt(Index + 1)), charCode >= 48 && charCode <= 57)) {
-                  // Illegal octal literal.
-                  abort();
-                }
-                isSigned = false;
-                // Parse the integer component.
-                for (; Index < length && ((charCode = source.charCodeAt(Index)), charCode >= 48 && charCode <= 57); Index++);
-                // Floats cannot contain a leading decimal point; however, this
-                // case is already accounted for by the parser.
-                if (source.charCodeAt(Index) == 46) {
-                  position = ++Index;
-                  // Parse the decimal component.
-                  for (; position < length && ((charCode = source.charCodeAt(position)), charCode >= 48 && charCode <= 57); position++);
-                  if (position == Index) {
-                    // Illegal trailing decimal.
-                    abort();
-                  }
-                  Index = position;
-                }
-                // Parse exponents. The `e` denoting the exponent is
-                // case-insensitive.
-                charCode = source.charCodeAt(Index);
-                if (charCode == 101 || charCode == 69) {
-                  charCode = source.charCodeAt(++Index);
-                  // Skip past the sign following the exponent, if one is
-                  // specified.
-                  if (charCode == 43 || charCode == 45) {
-                    Index++;
-                  }
-                  // Parse the exponential component.
-                  for (position = Index; position < length && ((charCode = source.charCodeAt(position)), charCode >= 48 && charCode <= 57); position++);
-                  if (position == Index) {
-                    // Illegal empty exponent.
-                    abort();
-                  }
-                  Index = position;
-                }
-                // Coerce the parsed value to a JavaScript number.
-                return +source.slice(begin, Index);
-              }
-              // A negative sign may only precede numbers.
-              if (isSigned) {
-                abort();
-              }
-              // `true`, `false`, and `null` literals.
-              if (source.slice(Index, Index + 4) == "true") {
-                Index += 4;
-                return true;
-              } else if (source.slice(Index, Index + 5) == "false") {
-                Index += 5;
-                return false;
-              } else if (source.slice(Index, Index + 4) == "null") {
-                Index += 4;
-                return null;
-              }
-              // Unrecognized token.
-              abort();
-          }
-        }
-        // Return the sentinel `$` character if the parser has reached the end
-        // of the source string.
-        return "$";
-      };
-
-      // Internal: Parses a JSON `value` token.
-      var get = function (value) {
-        var results, hasMembers;
-        if (value == "$") {
-          // Unexpected end of input.
-          abort();
-        }
-        if (typeof value == "string") {
-          if ((charIndexBuggy ? value.charAt(0) : value[0]) == "@") {
-            // Remove the sentinel `@` character.
-            return value.slice(1);
-          }
-          // Parse object and array literals.
-          if (value == "[") {
-            // Parses a JSON array, returning a new JavaScript array.
-            results = [];
-            for (;; hasMembers || (hasMembers = true)) {
-              value = lex();
-              // A closing square bracket marks the end of the array literal.
-              if (value == "]") {
-                break;
-              }
-              // If the array literal contains elements, the current token
-              // should be a comma separating the previous element from the
-              // next.
-              if (hasMembers) {
-                if (value == ",") {
-                  value = lex();
-                  if (value == "]") {
-                    // Unexpected trailing `,` in array literal.
-                    abort();
-                  }
-                } else {
-                  // A `,` must separate each array element.
-                  abort();
-                }
-              }
-              // Elisions and leading commas are not permitted.
-              if (value == ",") {
-                abort();
-              }
-              results.push(get(value));
-            }
-            return results;
-          } else if (value == "{") {
-            // Parses a JSON object, returning a new JavaScript object.
-            results = {};
-            for (;; hasMembers || (hasMembers = true)) {
-              value = lex();
-              // A closing curly brace marks the end of the object literal.
-              if (value == "}") {
-                break;
-              }
-              // If the object literal contains members, the current token
-              // should be a comma separator.
-              if (hasMembers) {
-                if (value == ",") {
-                  value = lex();
-                  if (value == "}") {
-                    // Unexpected trailing `,` in object literal.
-                    abort();
-                  }
-                } else {
-                  // A `,` must separate each object member.
-                  abort();
-                }
-              }
-              // Leading commas are not permitted, object property names must be
-              // double-quoted strings, and a `:` must separate each property
-              // name and value.
-              if (value == "," || typeof value != "string" || (charIndexBuggy ? value.charAt(0) : value[0]) != "@" || lex() != ":") {
-                abort();
-              }
-              results[value.slice(1)] = get(lex());
-            }
-            return results;
-          }
-          // Unexpected token encountered.
-          abort();
-        }
-        return value;
-      };
-
-      // Internal: Updates a traversed object member.
-      var update = function(source, property, callback) {
-        var element = walk(source, property, callback);
-        if (element === undef) {
-          delete source[property];
-        } else {
-          source[property] = element;
-        }
-      };
-
-      // Internal: Recursively traverses a parsed JSON object, invoking the
-      // `callback` function for each value. This is an implementation of the
-      // `Walk(holder, name)` operation defined in ES 5.1 section 15.12.2.
-      var walk = function (source, property, callback) {
-        var value = source[property], length;
-        if (typeof value == "object" && value) {
-          // `forEach` can't be used to traverse an array in Opera <= 8.54
-          // because its `Object#hasOwnProperty` implementation returns `false`
-          // for array indices (e.g., `![1, 2, 3].hasOwnProperty("0")`).
-          if (getClass.call(value) == arrayClass) {
-            for (length = value.length; length--;) {
-              update(value, length, callback);
-            }
-          } else {
-            forEach(value, function (property) {
-              update(value, property, callback);
-            });
-          }
-        }
-        return callback.call(source, property, value);
-      };
-
-      // Public: `JSON.parse`. See ES 5.1 section 15.12.2.
-      JSON3.parse = function (source, callback) {
-        var result, value;
-        Index = 0;
-        Source = "" + source;
-        result = get(lex());
-        // If a JSON string contains multiple tokens, it is invalid.
-        if (lex() != "$") {
-          abort();
-        }
-        // Reset the parser state.
-        Index = Source = null;
-        return callback && getClass.call(callback) == functionClass ? walk((value = {}, value[""] = result, value), "", callback) : result;
-      };
-    }
-  }
-
-  // Export for asynchronous module loaders.
-  if (isLoader) {
-    define(function () {
-      return JSON3;
-    });
-  }
+	// Convenience aliases.
+	var getClass = {}.toString, isProperty, forEach, undef;
+
+	// Detect the `define` function exposed by asynchronous module loaders. The
+	// strict `define` check is necessary for compatibility with `r.js`.
+	var isLoader = typeof define === "function" && define.amd;
+
+	// Detect native implementations.
+	var nativeJSON = typeof JSON == "object" && JSON;
+
+	// Set up the JSON 3 namespace, preferring the CommonJS `exports` object if
+	// available.
+	var JSON3 = typeof exports == "object" && exports && !exports.nodeType && exports;
+
+	if (JSON3 && nativeJSON) {
+		// Explicitly delegate to the native `stringify` and `parse`
+		// implementations in CommonJS environments.
+		JSON3.stringify = nativeJSON.stringify;
+		JSON3.parse = nativeJSON.parse;
+	} else {
+		// Export for web browsers, JavaScript engines, and asynchronous module
+		// loaders, using the global `JSON` object if available.
+		JSON3 = window.JSON = nativeJSON || {};
+	}
+
+	// Test the `Date#getUTC*` methods. Based on work by @Yaffle.
+	var isExtended = new Date(-3509827334573292);
+	try {
+		// The `getUTCFullYear`, `Month`, and `Date` methods return nonsensical
+		// results for certain dates in Opera >= 10.53.
+		isExtended = isExtended.getUTCFullYear() == -109252 && isExtended.getUTCMonth() === 0 && isExtended.getUTCDate() === 1 &&
+			// Safari < 2.0.2 stores the internal millisecond time value correctly,
+			// but clips the values returned by the date methods to the range of
+			// signed 32-bit integers ([-2 ** 31, 2 ** 31 - 1]).
+			isExtended.getUTCHours() == 10 && isExtended.getUTCMinutes() == 37 && isExtended.getUTCSeconds() == 6 && isExtended.getUTCMilliseconds() == 708;
+	} catch (exception) {
+	}
+
+	// Internal: Determines whether the native `JSON.stringify` and `parse`
+	// implementations are spec-compliant. Based on work by Ken Snyder.
+	function has(name) {
+		if (has[name] !== undef) {
+			// Return cached feature test result.
+			return has[name];
+		}
+
+		var isSupported;
+		if (name == "bug-string-char-index") {
+			// IE <= 7 doesn't support accessing string characters using square
+			// bracket notation. IE 8 only supports this for primitives.
+			isSupported = "a"[0] != "a";
+		} else if (name == "json") {
+			// Indicates whether both `JSON.stringify` and `JSON.parse` are
+			// supported.
+			isSupported = has("json-stringify") && has("json-parse");
+		} else {
+			var value, serialized = '{"a":[1,true,false,null,"\\u0000\\b\\n\\f\\r\\t"]}';
+			// Test `JSON.stringify`.
+			if (name == "json-stringify") {
+				var stringify = JSON3.stringify, stringifySupported = typeof stringify == "function" && isExtended;
+				if (stringifySupported) {
+					// A test function object with a custom `toJSON` method.
+					(value = function () {
+						return 1;
+					}).toJSON = value;
+					try {
+						stringifySupported =
+							// Firefox 3.1b1 and b2 serialize string, number, and boolean
+							// primitives as object literals.
+							stringify(0) === "0" &&
+							// FF 3.1b1, b2, and JSON 2 serialize wrapped primitives as object
+							// literals.
+							stringify(new Number()) === "0" &&
+							stringify(new String()) == '""' &&
+							// FF 3.1b1, 2 throw an error if the value is `null`, `undefined`, or
+							// does not define a canonical JSON representation (this applies to
+							// objects with `toJSON` properties as well, *unless* they are nested
+							// within an object or array).
+							stringify(getClass) === undef &&
+							// IE 8 serializes `undefined` as `"undefined"`. Safari <= 5.1.7 and
+							// FF 3.1b3 pass this test.
+							stringify(undef) === undef &&
+							// Safari <= 5.1.7 and FF 3.1b3 throw `Error`s and `TypeError`s,
+							// respectively, if the value is omitted entirely.
+							stringify() === undef &&
+							// FF 3.1b1, 2 throw an error if the given value is not a number,
+							// string, array, object, Boolean, or `null` literal. This applies to
+							// objects with custom `toJSON` methods as well, unless they are nested
+							// inside object or array literals. YUI 3.0.0b1 ignores custom `toJSON`
+							// methods entirely.
+							stringify(value) === "1" &&
+							stringify([value]) == "[1]" &&
+							// Prototype <= 1.6.1 serializes `[undefined]` as `"[]"` instead of
+							// `"[null]"`.
+							stringify([undef]) == "[null]" &&
+							// YUI 3.0.0b1 fails to serialize `null` literals.
+							stringify(null) == "null" &&
+							// FF 3.1b1, 2 halts serialization if an array contains a function:
+							// `[1, true, getClass, 1]` serializes as "[1,true,],". FF 3.1b3
+							// elides non-JSON values from objects and arrays, unless they
+							// define custom `toJSON` methods.
+							stringify([undef, getClass, null]) == "[null,null,null]" &&
+							// Simple serialization test. FF 3.1b1 uses Unicode escape sequences
+							// where character escape codes are expected (e.g., `\b` => `\u0008`).
+							stringify({"a": [value, true, false, null, "\x00\b\n\f\r\t"]}) == serialized &&
+							// FF 3.1b1 and b2 ignore the `filter` and `width` arguments.
+							stringify(null, value) === "1" &&
+							stringify([1, 2], null, 1) == "[\n 1,\n 2\n]" &&
+							// JSON 2, Prototype <= 1.7, and older WebKit builds incorrectly
+							// serialize extended years.
+							stringify(new Date(-8.64e15)) == '"-271821-04-20T00:00:00.000Z"' &&
+							// The milliseconds are optional in ES 5, but required in 5.1.
+							stringify(new Date(8.64e15)) == '"+275760-09-13T00:00:00.000Z"' &&
+							// Firefox <= 11.0 incorrectly serializes years prior to 0 as negative
+							// four-digit years instead of six-digit years. Credits: @Yaffle.
+							stringify(new Date(-621987552e5)) == '"-000001-01-01T00:00:00.000Z"' &&
+							// Safari <= 5.1.5 and Opera >= 10.53 incorrectly serialize millisecond
+							// values less than 1000. Credits: @Yaffle.
+							stringify(new Date(-1)) == '"1969-12-31T23:59:59.999Z"';
+					} catch (exception) {
+						stringifySupported = false;
+					}
+				}
+				isSupported = stringifySupported;
+			}
+			// Test `JSON.parse`.
+			if (name == "json-parse") {
+				var parse = JSON3.parse;
+				if (typeof parse == "function") {
+					try {
+						// FF 3.1b1, b2 will throw an exception if a bare literal is provided.
+						// Conforming implementations should also coerce the initial argument to
+						// a string prior to parsing.
+						if (parse("0") === 0 && !parse(false)) {
+							// Simple parsing test.
+							value = parse(serialized);
+							var parseSupported = value["a"].length == 5 && value["a"][0] === 1;
+							if (parseSupported) {
+								try {
+									// Safari <= 5.1.2 and FF 3.1b1 allow unescaped tabs in strings.
+									parseSupported = !parse('"\t"');
+								} catch (exception) {
+								}
+								if (parseSupported) {
+									try {
+										// FF 4.0 and 4.0.1 allow leading `+` signs and leading
+										// decimal points. FF 4.0, 4.0.1, and IE 9-10 also allow
+										// certain octal literals.
+										parseSupported = parse("01") !== 1;
+									} catch (exception) {
+									}
+								}
+								if (parseSupported) {
+									try {
+										// FF 4.0, 4.0.1, and Rhino 1.7R3-R4 allow trailing decimal
+										// points. These environments, along with FF 3.1b1 and 2,
+										// also allow trailing commas in JSON objects and arrays.
+										parseSupported = parse("1.") !== 1;
+									} catch (exception) {
+									}
+								}
+							}
+						}
+					} catch (exception) {
+						parseSupported = false;
+					}
+				}
+				isSupported = parseSupported;
+			}
+		}
+		return has[name] = !!isSupported;
+	}
+
+	if (!has("json")) {
+		// Common `[[Class]]` name aliases.
+		var functionClass = "[object Function]";
+		var dateClass = "[object Date]";
+		var numberClass = "[object Number]";
+		var stringClass = "[object String]";
+		var arrayClass = "[object Array]";
+		var booleanClass = "[object Boolean]";
+
+		// Detect incomplete support for accessing string characters by index.
+		var charIndexBuggy = has("bug-string-char-index");
+
+		// Define additional utility methods if the `Date` methods are buggy.
+		if (!isExtended) {
+			var floor = Math.floor;
+			// A mapping between the months of the year and the number of days between
+			// January 1st and the first of the respective month.
+			var Months = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334];
+			// Internal: Calculates the number of days between the Unix epoch and the
+			// first day of the given month.
+			var getDay = function (year, month) {
+				return Months[month] + 365 * (year - 1970) + floor((year - 1969 + (month = +(month > 1))) / 4) - floor((year - 1901 + month) / 100) + floor((year - 1601 + month) / 400);
+			};
+		}
+
+		// Internal: Determines if a property is a direct property of the given
+		// object. Delegates to the native `Object#hasOwnProperty` method.
+		if (!(isProperty = {}.hasOwnProperty)) {
+			isProperty = function (property) {
+				var members = {}, constructor;
+				if ((members.__proto__ = null, members.__proto__ = {
+					// The *proto* property cannot be set multiple times in recent
+					// versions of Firefox and SeaMonkey.
+					"toString": 1
+				}, members).toString != getClass) {
+					// Safari <= 2.0.3 doesn't implement `Object#hasOwnProperty`, but
+					// supports the mutable *proto* property.
+					isProperty = function (property) {
+						// Capture and break the object's prototype chain (see section 8.6.2
+						// of the ES 5.1 spec). The parenthesized expression prevents an
+						// unsafe transformation by the Closure Compiler.
+						var original = this.__proto__, result = property in (this.__proto__ = null, this);
+						// Restore the original prototype chain.
+						this.__proto__ = original;
+						return result;
+					};
+				} else {
+					// Capture a reference to the top-level `Object` constructor.
+					constructor = members.constructor;
+					// Use the `constructor` property to simulate `Object#hasOwnProperty` in
+					// other environments.
+					isProperty = function (property) {
+						var parent = (this.constructor || constructor).prototype;
+						return property in this && !(property in parent && this[property] === parent[property]);
+					};
+				}
+				members = null;
+				return isProperty.call(this, property);
+			};
+		}
+
+		// Internal: A set of primitive types used by `isHostType`.
+		var PrimitiveTypes = {
+			'boolean': 1,
+			'number': 1,
+			'string': 1,
+			'undefined': 1
+		};
+
+		// Internal: Determines if the given object `property` value is a
+		// non-primitive.
+		var isHostType = function (object, property) {
+			var type = typeof object[property];
+			return type == 'object' ? !!object[property] : !PrimitiveTypes[type];
+		};
+
+		// Internal: Normalizes the `for...in` iteration algorithm across
+		// environments. Each enumerated key is yielded to a `callback` function.
+		forEach = function (object, callback) {
+			var size = 0, Properties, members, property;
+
+			// Tests for bugs in the current environment's `for...in` algorithm. The
+			// `valueOf` property inherits the non-enumerable flag from
+			// `Object.prototype` in older versions of IE, Netscape, and Mozilla.
+			(Properties = function () {
+				this.valueOf = 0;
+			}).prototype.valueOf = 0;
+
+			// Iterate over a new instance of the `Properties` class.
+			members = new Properties();
+			for (property in members) {
+				// Ignore all properties inherited from `Object.prototype`.
+				if (isProperty.call(members, property)) {
+					size++;
+				}
+			}
+			Properties = members = null;
+
+			// Normalize the iteration algorithm.
+			if (!size) {
+				// A list of non-enumerable properties inherited from `Object.prototype`.
+				members = ["valueOf", "toString", "toLocaleString", "propertyIsEnumerable", "isPrototypeOf", "hasOwnProperty", "constructor"];
+				// IE <= 8, Mozilla 1.0, and Netscape 6.2 ignore shadowed non-enumerable
+				// properties.
+				forEach = function (object, callback) {
+					var isFunction = getClass.call(object) == functionClass, property, length;
+					var hasProperty = !isFunction && typeof object.constructor != 'function' && isHostType(object, 'hasOwnProperty') ? object.hasOwnProperty : isProperty;
+					for (property in object) {
+						// Gecko <= 1.0 enumerates the `prototype` property of functions under
+						// certain conditions; IE does not.
+						if (!(isFunction && property == "prototype") && hasProperty.call(object, property)) {
+							callback(property);
+						}
+					}
+					// Manually invoke the callback for each non-enumerable property.
+					for (length = members.length; property = members[--length]; hasProperty.call(object, property) && callback(property)) ;
+				};
+			} else if (size == 2) {
+				// Safari <= 2.0.4 enumerates shadowed properties twice.
+				forEach = function (object, callback) {
+					// Create a set of iterated properties.
+					var members = {}, isFunction = getClass.call(object) == functionClass, property;
+					for (property in object) {
+						// Store each property name to prevent double enumeration. The
+						// `prototype` property of functions is not enumerated due to cross-
+						// environment inconsistencies.
+						if (!(isFunction && property == "prototype") && !isProperty.call(members, property) && (members[property] = 1) && isProperty.call(object, property)) {
+							callback(property);
+						}
+					}
+				};
+			} else {
+				// No bugs detected; use the standard `for...in` algorithm.
+				forEach = function (object, callback) {
+					var isFunction = getClass.call(object) == functionClass, property, isConstructor;
+					for (property in object) {
+						if (!(isFunction && property == "prototype") && isProperty.call(object, property) && !(isConstructor = property === "constructor")) {
+							callback(property);
+						}
+					}
+					// Manually invoke the callback for the `constructor` property due to
+					// cross-environment inconsistencies.
+					if (isConstructor || isProperty.call(object, (property = "constructor"))) {
+						callback(property);
+					}
+				};
+			}
+			return forEach(object, callback);
+		};
+
+		// Public: Serializes a JavaScript `value` as a JSON string. The optional
+		// `filter` argument may specify either a function that alters how object and
+		// array members are serialized, or an array of strings and numbers that
+		// indicates which properties should be serialized. The optional `width`
+		// argument may be either a string or number that specifies the indentation
+		// level of the output.
+		if (!has("json-stringify")) {
+			// Internal: A map of control characters and their escaped equivalents.
+			var Escapes = {
+				92: "\\\\",
+				34: '\\"',
+				8: "\\b",
+				12: "\\f",
+				10: "\\n",
+				13: "\\r",
+				9: "\\t"
+			};
+
+			// Internal: Converts `value` into a zero-padded string such that its
+			// length is at least equal to `width`. The `width` must be <= 6.
+			var leadingZeroes = "000000";
+			var toPaddedString = function (width, value) {
+				// The `|| 0` expression is necessary to work around a bug in
+				// Opera <= 7.54u2 where `0 == -0`, but `String(-0) !== "0"`.
+				return (leadingZeroes + (value || 0)).slice(-width);
+			};
+
+			// Internal: Double-quotes a string `value`, replacing all ASCII control
+			// characters (characters with code unit values between 0 and 31) with
+			// their escaped equivalents. This is an implementation of the
+			// `Quote(value)` operation defined in ES 5.1 section 15.12.3.
+			var unicodePrefix = "\\u00";
+			var quote = function (value) {
+				var result = '"', index = 0, length = value.length, isLarge = length > 10 && charIndexBuggy, symbols;
+				if (isLarge) {
+					symbols = value.split("");
+				}
+				for (; index < length; index++) {
+					var charCode = value.charCodeAt(index);
+					// If the character is a control character, append its Unicode or
+					// shorthand escape sequence; otherwise, append the character as-is.
+					switch (charCode) {
+						case 8:
+						case 9:
+						case 10:
+						case 12:
+						case 13:
+						case 34:
+						case 92:
+							result += Escapes[charCode];
+							break;
+						default:
+							if (charCode < 32) {
+								result += unicodePrefix + toPaddedString(2, charCode.toString(16));
+								break;
+							}
+							result += isLarge ? symbols[index] : charIndexBuggy ? value.charAt(index) : value[index];
+					}
+				}
+				return result + '"';
+			};
+
+			// Internal: Recursively serializes an object. Implements the
+			// `Str(key, holder)`, `JO(value)`, and `JA(value)` operations.
+			var serialize = function (property, object, callback, properties, whitespace, indentation, stack) {
+				var value, className, year, month, date, time, hours, minutes, seconds, milliseconds, results, element,
+					index, length, prefix, result;
+				try {
+					// Necessary for host object support.
+					value = object[property];
+				} catch (exception) {
+				}
+				if (typeof value == "object" && value) {
+					className = getClass.call(value);
+					if (className == dateClass && !isProperty.call(value, "toJSON")) {
+						if (value > -1 / 0 && value < 1 / 0) {
+							// Dates are serialized according to the `Date#toJSON` method
+							// specified in ES 5.1 section 15.9.5.44. See section 15.9.1.15
+							// for the ISO 8601 date time string format.
+							if (getDay) {
+								// Manually compute the year, month, date, hours, minutes,
+								// seconds, and milliseconds if the `getUTC*` methods are
+								// buggy. Adapted from @Yaffle's `date-shim` project.
+								date = floor(value / 864e5);
+								for (year = floor(date / 365.2425) + 1970 - 1; getDay(year + 1, 0) <= date; year++) ;
+								for (month = floor((date - getDay(year, 0)) / 30.42); getDay(year, month + 1) <= date; month++) ;
+								date = 1 + date - getDay(year, month);
+								// The `time` value specifies the time within the day (see ES
+								// 5.1 section 15.9.1.2). The formula `(A % B + B) % B` is used
+								// to compute `A modulo B`, as the `%` operator does not
+								// correspond to the `modulo` operation for negative numbers.
+								time = (value % 864e5 + 864e5) % 864e5;
+								// The hours, minutes, seconds, and milliseconds are obtained by
+								// decomposing the time within the day. See section 15.9.1.10.
+								hours = floor(time / 36e5) % 24;
+								minutes = floor(time / 6e4) % 60;
+								seconds = floor(time / 1e3) % 60;
+								milliseconds = time % 1e3;
+							} else {
+								year = value.getUTCFullYear();
+								month = value.getUTCMonth();
+								date = value.getUTCDate();
+								hours = value.getUTCHours();
+								minutes = value.getUTCMinutes();
+								seconds = value.getUTCSeconds();
+								milliseconds = value.getUTCMilliseconds();
+							}
+							// Serialize extended years correctly.
+							value = (year <= 0 || year >= 1e4 ? (year < 0 ? "-" : "+") + toPaddedString(6, year < 0 ? -year : year) : toPaddedString(4, year)) +
+								"-" + toPaddedString(2, month + 1) + "-" + toPaddedString(2, date) +
+								// Months, dates, hours, minutes, and seconds should have two
+								// digits; milliseconds should have three.
+								"T" + toPaddedString(2, hours) + ":" + toPaddedString(2, minutes) + ":" + toPaddedString(2, seconds) +
+								// Milliseconds are optional in ES 5.0, but required in 5.1.
+								"." + toPaddedString(3, milliseconds) + "Z";
+						} else {
+							value = null;
+						}
+					} else if (typeof value.toJSON == "function" && ((className != numberClass && className != stringClass && className != arrayClass) || isProperty.call(value, "toJSON"))) {
+						// Prototype <= 1.6.1 adds non-standard `toJSON` methods to the
+						// `Number`, `String`, `Date`, and `Array` prototypes. JSON 3
+						// ignores all `toJSON` methods on these objects unless they are
+						// defined directly on an instance.
+						value = value.toJSON(property);
+					}
+				}
+				if (callback) {
+					// If a replacement function was provided, call it to obtain the value
+					// for serialization.
+					value = callback.call(object, property, value);
+				}
+				if (value === null) {
+					return "null";
+				}
+				className = getClass.call(value);
+				if (className == booleanClass) {
+					// Booleans are represented literally.
+					return "" + value;
+				} else if (className == numberClass) {
+					// JSON numbers must be finite. `Infinity` and `NaN` are serialized as
+					// `"null"`.
+					return value > -1 / 0 && value < 1 / 0 ? "" + value : "null";
+				} else if (className == stringClass) {
+					// Strings are double-quoted and escaped.
+					return quote("" + value);
+				}
+				// Recursively serialize objects and arrays.
+				if (typeof value == "object") {
+					// Check for cyclic structures. This is a linear search; performance
+					// is inversely proportional to the number of unique nested objects.
+					for (length = stack.length; length--;) {
+						if (stack[length] === value) {
+							// Cyclic structures cannot be serialized by `JSON.stringify`.
+							throw TypeError();
+						}
+					}
+					// Add the object to the stack of traversed objects.
+					stack.push(value);
+					results = [];
+					// Save the current indentation level and indent one additional level.
+					prefix = indentation;
+					indentation += whitespace;
+					if (className == arrayClass) {
+						// Recursively serialize array elements.
+						for (index = 0, length = value.length; index < length; index++) {
+							element = serialize(index, value, callback, properties, whitespace, indentation, stack);
+							results.push(element === undef ? "null" : element);
+						}
+						result = results.length ? (whitespace ? "[\n" + indentation + results.join(",\n" + indentation) + "\n" + prefix + "]" : ("[" + results.join(",") + "]")) : "[]";
+					} else {
+						// Recursively serialize object members. Members are selected from
+						// either a user-specified list of property names, or the object
+						// itself.
+						forEach(properties || value, function (property) {
+							var element = serialize(property, value, callback, properties, whitespace, indentation, stack);
+							if (element !== undef) {
+								// According to ES 5.1 section 15.12.3: "If `gap` {whitespace}
+								// is not the empty string, let `member` {quote(property) + ":"}
+								// be the concatenation of `member` and the `space` character."
+								// The "`space` character" refers to the literal space
+								// character, not the `space` {width} argument provided to
+								// `JSON.stringify`.
+								results.push(quote(property) + ":" + (whitespace ? " " : "") + element);
+							}
+						});
+						result = results.length ? (whitespace ? "{\n" + indentation + results.join(",\n" + indentation) + "\n" + prefix + "}" : ("{" + results.join(",") + "}")) : "{}";
+					}
+					// Remove the object from the traversed object stack.
+					stack.pop();
+					return result;
+				}
+			};
+
+			// Public: `JSON.stringify`. See ES 5.1 section 15.12.3.
+			JSON3.stringify = function (source, filter, width) {
+				var whitespace, callback, properties, className;
+				if (typeof filter == "function" || typeof filter == "object" && filter) {
+					if ((className = getClass.call(filter)) == functionClass) {
+						callback = filter;
+					} else if (className == arrayClass) {
+						// Convert the property names array into a makeshift set.
+						properties = {};
+						for (var index = 0, length = filter.length, value; index < length; value = filter[index++], ((className = getClass.call(value)), className == stringClass || className == numberClass) && (properties[value] = 1)) ;
+					}
+				}
+				if (width) {
+					if ((className = getClass.call(width)) == numberClass) {
+						// Convert the `width` to an integer and create a string containing
+						// `width` number of space characters.
+						if ((width -= width % 1) > 0) {
+							for (whitespace = "", width > 10 && (width = 10); whitespace.length < width; whitespace += " ") ;
+						}
+					} else if (className == stringClass) {
+						whitespace = width.length <= 10 ? width : width.slice(0, 10);
+					}
+				}
+				// Opera <= 7.54u2 discards the values associated with empty string keys
+				// (`""`) only if they are used directly within an object member list
+				// (e.g., `!("" in { "": 1})`).
+				return serialize("", (value = {}, value[""] = source, value), callback, properties, whitespace, "", []);
+			};
+		}
+
+		// Public: Parses a JSON source string.
+		if (!has("json-parse")) {
+			var fromCharCode = String.fromCharCode;
+
+			// Internal: A map of escaped control characters and their unescaped
+			// equivalents.
+			var Unescapes = {
+				92: "\\",
+				34: '"',
+				47: "/",
+				98: "\b",
+				116: "\t",
+				110: "\n",
+				102: "\f",
+				114: "\r"
+			};
+
+			// Internal: Stores the parser state.
+			var Index, Source;
+
+			// Internal: Resets the parser state and throws a `SyntaxError`.
+			var abort = function () {
+				Index = Source = null;
+				throw SyntaxError();
+			};
+
+			// Internal: Returns the next token, or `"$"` if the parser has reached
+			// the end of the source string. A token may be a string, number, `null`
+			// literal, or Boolean literal.
+			var lex = function () {
+				var source = Source, length = source.length, value, begin, position, isSigned, charCode;
+				while (Index < length) {
+					charCode = source.charCodeAt(Index);
+					switch (charCode) {
+						case 9:
+						case 10:
+						case 13:
+						case 32:
+							// Skip whitespace tokens, including tabs, carriage returns, line
+							// feeds, and space characters.
+							Index++;
+							break;
+						case 123:
+						case 125:
+						case 91:
+						case 93:
+						case 58:
+						case 44:
+							// Parse a punctuator token (`{`, `}`, `[`, `]`, `:`, or `,`) at
+							// the current position.
+							value = charIndexBuggy ? source.charAt(Index) : source[Index];
+							Index++;
+							return value;
+						case 34:
+							// `"` delimits a JSON string; advance to the next character and
+							// begin parsing the string. String tokens are prefixed with the
+							// sentinel `@` character to distinguish them from punctuators and
+							// end-of-string tokens.
+							for (value = "@", Index++; Index < length;) {
+								charCode = source.charCodeAt(Index);
+								if (charCode < 32) {
+									// Unescaped ASCII control characters (those with a code unit
+									// less than the space character) are not permitted.
+									abort();
+								} else if (charCode == 92) {
+									// A reverse solidus (`\`) marks the beginning of an escaped
+									// control character (including `"`, `\`, and `/`) or Unicode
+									// escape sequence.
+									charCode = source.charCodeAt(++Index);
+									switch (charCode) {
+										case 92:
+										case 34:
+										case 47:
+										case 98:
+										case 116:
+										case 110:
+										case 102:
+										case 114:
+											// Revive escaped control characters.
+											value += Unescapes[charCode];
+											Index++;
+											break;
+										case 117:
+											// `\u` marks the beginning of a Unicode escape sequence.
+											// Advance to the first character and validate the
+											// four-digit code point.
+											begin = ++Index;
+											for (position = Index + 4; Index < position; Index++) {
+												charCode = source.charCodeAt(Index);
+												// A valid sequence comprises four hexdigits (case-
+												// insensitive) that form a single hexadecimal value.
+												if (!(charCode >= 48 && charCode <= 57 || charCode >= 97 && charCode <= 102 || charCode >= 65 && charCode <= 70)) {
+													// Invalid Unicode escape sequence.
+													abort();
+												}
+											}
+											// Revive the escaped character.
+											value += fromCharCode("0x" + source.slice(begin, Index));
+											break;
+										default:
+											// Invalid escape sequence.
+											abort();
+									}
+								} else {
+									if (charCode == 34) {
+										// An unescaped double-quote character marks the end of the
+										// string.
+										break;
+									}
+									charCode = source.charCodeAt(Index);
+									begin = Index;
+									// Optimize for the util case where a string is valid.
+									while (charCode >= 32 && charCode != 92 && charCode != 34) {
+										charCode = source.charCodeAt(++Index);
+									}
+									// Append the string as-is.
+									value += source.slice(begin, Index);
+								}
+							}
+							if (source.charCodeAt(Index) == 34) {
+								// Advance to the next character and return the revived string.
+								Index++;
+								return value;
+							}
+							// Unterminated string.
+							abort();
+						default:
+							// Parse numbers and literals.
+							begin = Index;
+							// Advance past the negative sign, if one is specified.
+							if (charCode == 45) {
+								isSigned = true;
+								charCode = source.charCodeAt(++Index);
+							}
+							// Parse an integer or floating-point value.
+							if (charCode >= 48 && charCode <= 57) {
+								// Leading zeroes are interpreted as octal literals.
+								if (charCode == 48 && ((charCode = source.charCodeAt(Index + 1)), charCode >= 48 && charCode <= 57)) {
+									// Illegal octal literal.
+									abort();
+								}
+								isSigned = false;
+								// Parse the integer component.
+								for (; Index < length && ((charCode = source.charCodeAt(Index)), charCode >= 48 && charCode <= 57); Index++) ;
+								// Floats cannot contain a leading decimal point; however, this
+								// case is already accounted for by the parser.
+								if (source.charCodeAt(Index) == 46) {
+									position = ++Index;
+									// Parse the decimal component.
+									for (; position < length && ((charCode = source.charCodeAt(position)), charCode >= 48 && charCode <= 57); position++) ;
+									if (position == Index) {
+										// Illegal trailing decimal.
+										abort();
+									}
+									Index = position;
+								}
+								// Parse exponents. The `e` denoting the exponent is
+								// case-insensitive.
+								charCode = source.charCodeAt(Index);
+								if (charCode == 101 || charCode == 69) {
+									charCode = source.charCodeAt(++Index);
+									// Skip past the sign following the exponent, if one is
+									// specified.
+									if (charCode == 43 || charCode == 45) {
+										Index++;
+									}
+									// Parse the exponential component.
+									for (position = Index; position < length && ((charCode = source.charCodeAt(position)), charCode >= 48 && charCode <= 57); position++) ;
+									if (position == Index) {
+										// Illegal empty exponent.
+										abort();
+									}
+									Index = position;
+								}
+								// Coerce the parsed value to a JavaScript number.
+								return +source.slice(begin, Index);
+							}
+							// A negative sign may only precede numbers.
+							if (isSigned) {
+								abort();
+							}
+							// `true`, `false`, and `null` literals.
+							if (source.slice(Index, Index + 4) == "true") {
+								Index += 4;
+								return true;
+							} else if (source.slice(Index, Index + 5) == "false") {
+								Index += 5;
+								return false;
+							} else if (source.slice(Index, Index + 4) == "null") {
+								Index += 4;
+								return null;
+							}
+							// Unrecognized token.
+							abort();
+					}
+				}
+				// Return the sentinel `$` character if the parser has reached the end
+				// of the source string.
+				return "$";
+			};
+
+			// Internal: Parses a JSON `value` token.
+			var get = function (value) {
+				var results, hasMembers;
+				if (value == "$") {
+					// Unexpected end of input.
+					abort();
+				}
+				if (typeof value == "string") {
+					if ((charIndexBuggy ? value.charAt(0) : value[0]) == "@") {
+						// Remove the sentinel `@` character.
+						return value.slice(1);
+					}
+					// Parse object and array literals.
+					if (value == "[") {
+						// Parses a JSON array, returning a new JavaScript array.
+						results = [];
+						for (; ; hasMembers || (hasMembers = true)) {
+							value = lex();
+							// A closing square bracket marks the end of the array literal.
+							if (value == "]") {
+								break;
+							}
+							// If the array literal contains elements, the current token
+							// should be a comma separating the previous element from the
+							// next.
+							if (hasMembers) {
+								if (value == ",") {
+									value = lex();
+									if (value == "]") {
+										// Unexpected trailing `,` in array literal.
+										abort();
+									}
+								} else {
+									// A `,` must separate each array element.
+									abort();
+								}
+							}
+							// Elisions and leading commas are not permitted.
+							if (value == ",") {
+								abort();
+							}
+							results.push(get(value));
+						}
+						return results;
+					} else if (value == "{") {
+						// Parses a JSON object, returning a new JavaScript object.
+						results = {};
+						for (; ; hasMembers || (hasMembers = true)) {
+							value = lex();
+							// A closing curly brace marks the end of the object literal.
+							if (value == "}") {
+								break;
+							}
+							// If the object literal contains members, the current token
+							// should be a comma separator.
+							if (hasMembers) {
+								if (value == ",") {
+									value = lex();
+									if (value == "}") {
+										// Unexpected trailing `,` in object literal.
+										abort();
+									}
+								} else {
+									// A `,` must separate each object member.
+									abort();
+								}
+							}
+							// Leading commas are not permitted, object property names must be
+							// double-quoted strings, and a `:` must separate each property
+							// name and value.
+							if (value == "," || typeof value != "string" || (charIndexBuggy ? value.charAt(0) : value[0]) != "@" || lex() != ":") {
+								abort();
+							}
+							results[value.slice(1)] = get(lex());
+						}
+						return results;
+					}
+					// Unexpected token encountered.
+					abort();
+				}
+				return value;
+			};
+
+			// Internal: Updates a traversed object member.
+			var update = function (source, property, callback) {
+				var element = walk(source, property, callback);
+				if (element === undef) {
+					delete source[property];
+				} else {
+					source[property] = element;
+				}
+			};
+
+			// Internal: Recursively traverses a parsed JSON object, invoking the
+			// `callback` function for each value. This is an implementation of the
+			// `Walk(holder, name)` operation defined in ES 5.1 section 15.12.2.
+			var walk = function (source, property, callback) {
+				var value = source[property], length;
+				if (typeof value == "object" && value) {
+					// `forEach` can't be used to traverse an array in Opera <= 8.54
+					// because its `Object#hasOwnProperty` implementation returns `false`
+					// for array indices (e.g., `![1, 2, 3].hasOwnProperty("0")`).
+					if (getClass.call(value) == arrayClass) {
+						for (length = value.length; length--;) {
+							update(value, length, callback);
+						}
+					} else {
+						forEach(value, function (property) {
+							update(value, property, callback);
+						});
+					}
+				}
+				return callback.call(source, property, value);
+			};
+
+			// Public: `JSON.parse`. See ES 5.1 section 15.12.2.
+			JSON3.parse = function (source, callback) {
+				var result, value;
+				Index = 0;
+				Source = "" + source;
+				result = get(lex());
+				// If a JSON string contains multiple tokens, it is invalid.
+				if (lex() != "$") {
+					abort();
+				}
+				// Reset the parser state.
+				Index = Source = null;
+				return callback && getClass.call(callback) == functionClass ? walk((value = {}, value[""] = result, value), "", callback) : result;
+			};
+		}
+	}
+
+	// Export for asynchronous module loaders.
+	if (isLoader) {
+		define(function () {
+			return JSON3;
+		});
+	}
 }(this));
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/pagination/tm.pagination.js b/len-activiti/src/main/resources/static/editor-app/libs/pagination/tm.pagination.js
index 69fb0c3..79bcb33 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/pagination/tm.pagination.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/pagination/tm.pagination.js
@@ -2,202 +2,204 @@
  * name: tm.pagination
  * Version: 0.0.2
  */
-angular.module('tm.pagination', []).directive('tmPagination',[function(){
-    return {
-        restrict: 'EA',
-        template: '<div class="page-list">' +
-        '<ul class="pagination" ng-show="conf.totalItems > 0">' +
-        '<li ng-class="{disabled: conf.currentPage == 1}" ng-click="prevPage()"><span>&laquo;</span></li>' +
-        '<li ng-repeat="item in pageList track by $index" ng-class="{active: item == conf.currentPage, separate: item == \'...\'}" ' +
-        'ng-click="changeCurrentPage(item)">' +
-        '<span>{{ item }}</span>' +
-        '</li>' +
-        '<li ng-class="{disabled: conf.currentPage == conf.numberOfPages}" ng-click="nextPage()"><span>&raquo;</span></li>' +
-        '</ul>' +
-        '<div class="page-total" ng-show="conf.totalItems > 0">' +
-        '第<input type="text" ng-model="jumpPageNum"  ng-keyup="jumpToPage($event)"/>页 ' +
-        '每页<select ng-model="conf.itemsPerPage" ng-options="option for option in conf.perPageOptions " ng-change="changeItemsPerPage()"></select>' +
-        '/共<strong>{{ conf.totalItems }}</strong>条' +
-        '</div>' +
-        '<div class="no-items" ng-show="conf.totalItems <= 0">暂无数据</div>' +
-        '</div>',
-        replace: true,
-        scope: {
-            conf: '='
-        },
-        link: function(scope, element, attrs){
-
-            // 变更当前页
-            scope.changeCurrentPage = function(item){
-                if(item == '...'){
-                    return;
-                }else{
-                    scope.conf.currentPage = item;
-                }
-            };
-
-            // 定义分页的长度必须为奇数 (default:9)
-            scope.conf.pagesLength = parseInt(scope.conf.pagesLength) ? parseInt(scope.conf.pagesLength) : 9 ;
-            if(scope.conf.pagesLength % 2 === 0){
-                // 如果不是奇数的时候处理一下
-                scope.conf.pagesLength = scope.conf.pagesLength -1;
-            }
-
-            // conf.erPageOptions
-            if(!scope.conf.perPageOptions){
-                scope.conf.perPageOptions = [10, 15, 20, 30, 50];
-            }
-
-            // pageList数组
-            function getPagination(){
-                // conf.currentPage
-                scope.conf.currentPage = parseInt(scope.conf.currentPage) ? parseInt(scope.conf.currentPage) : 1;
-                // conf.totalItems
-                scope.conf.totalItems = parseInt(scope.conf.totalItems);
-
-                // conf.itemsPerPage (default:15)
-                // 先判断一下本地存储中有没有这个值
-                if(scope.conf.rememberPerPage){
-                    if(!parseInt(localStorage[scope.conf.rememberPerPage])){
-                        localStorage[scope.conf.rememberPerPage] = parseInt(scope.conf.itemsPerPage) ? parseInt(scope.conf.itemsPerPage) : 15;
-                    }
-
-                    scope.conf.itemsPerPage = parseInt(localStorage[scope.conf.rememberPerPage]);
-
-
-                }else{
-                    scope.conf.itemsPerPage = parseInt(scope.conf.itemsPerPage) ? parseInt(scope.conf.itemsPerPage) : 15;
-                }
-
-                // numberOfPages
-                scope.conf.numberOfPages = Math.ceil(scope.conf.totalItems/scope.conf.itemsPerPage);
-
-                // judge currentPage > scope.numberOfPages
-                if(scope.conf.currentPage < 1){
-                    scope.conf.currentPage = 1;
-                }
-
-                if(scope.conf.currentPage > scope.conf.numberOfPages){
-                    scope.conf.currentPage = scope.conf.numberOfPages;
-                }
-
-                // jumpPageNum
-                scope.jumpPageNum = scope.conf.currentPage;
-
-                // 如果itemsPerPage在不在perPageOptions数组中，就把itemsPerPage加入这个数组中
-                var perPageOptionsLength = scope.conf.perPageOptions.length;
-                // 定义状态
-                var perPageOptionsStatus;
-                for(var i = 0; i < perPageOptionsLength; i++){
-                    if(scope.conf.perPageOptions[i] == scope.conf.itemsPerPage){
-                        perPageOptionsStatus = true;
-                    }
-                }
-                // 如果itemsPerPage在不在perPageOptions数组中，就把itemsPerPage加入这个数组中
-                if(!perPageOptionsStatus){
-                    scope.conf.perPageOptions.push(scope.conf.itemsPerPage);
-                }
-
-                // 对选项进行sort
-                scope.conf.perPageOptions.sort(function(a, b){return a-b});
-
-                scope.pageList = [];
-                if(scope.conf.numberOfPages <= scope.conf.pagesLength){
-                    // 判断总页数如果小于等于分页的长度，若小于则直接显示
-                    for(i =1; i <= scope.conf.numberOfPages; i++){
-                        scope.pageList.push(i);
-                    }
-                }else{
-                    // 总页数大于分页长度（此时分为三种情况：1.左边没有...2.右边没有...3.左右都有...）
-                    // 计算中心偏移量
-                    var offset = (scope.conf.pagesLength - 1)/2;
-                    if(scope.conf.currentPage <= offset){
-                        // 左边没有...
-                        for(i =1; i <= offset +1; i++){
-                            scope.pageList.push(i);
-                        }
-                        scope.pageList.push('...');
-                        scope.pageList.push(scope.conf.numberOfPages);
-                    }else if(scope.conf.currentPage > scope.conf.numberOfPages - offset){
-                        scope.pageList.push(1);
-                        scope.pageList.push('...');
-                        for(i = offset + 1; i >= 1; i--){
-                            scope.pageList.push(scope.conf.numberOfPages - i);
-                        }
-                        scope.pageList.push(scope.conf.numberOfPages);
-                    }else{
-                        // 最后一种情况，两边都有...
-                        scope.pageList.push(1);
-                        scope.pageList.push('...');
-
-                        for(i = Math.ceil(offset/2) ; i >= 1; i--){
-                            scope.pageList.push(scope.conf.currentPage - i);
-                        }
-                        scope.pageList.push(scope.conf.currentPage);
-                        for(i = 1; i <= offset/2; i++){
-                            scope.pageList.push(scope.conf.currentPage + i);
-                        }
-
-                        scope.pageList.push('...');
-                        scope.pageList.push(scope.conf.numberOfPages);
-                    }
-                }
-
-                if(scope.conf.onChange){
-                    scope.conf.onChange();
-                }
-                scope.$parent.conf = scope.conf;
-            }
-
-            // prevPage
-            scope.prevPage = function(){
-                if(scope.conf.currentPage > 1){
-                    scope.conf.currentPage -= 1;
-                }
-            };
-            // nextPage
-            scope.nextPage = function(){
-                if(scope.conf.currentPage < scope.conf.numberOfPages){
-                    scope.conf.currentPage += 1;
-                }
-            };
-
-            // 跳转页
-            scope.jumpToPage = function(){
-                scope.jumpPageNum = scope.jumpPageNum.replace(/[^0-9]/g,'');
-                if(scope.jumpPageNum !== ''){
-                    scope.conf.currentPage = scope.jumpPageNum;
-                }
-            };
-
-            // 修改每页显示的条数
-            scope.changeItemsPerPage = function(){
-                // 清除本地存储的值方便重新设置
-                if(scope.conf.rememberPerPage){
-                    localStorage.removeItem(scope.conf.rememberPerPage);
-                }
-            };
-
-            scope.$watch(function(){
-                var newValue = scope.conf.currentPage + ' ' + scope.conf.totalItems + ' ';
-                // 如果直接watch perPage变化的时候，因为记住功能的原因，所以一开始可能调用两次。
-                //所以用了如下方式处理
-                if(scope.conf.rememberPerPage){
-                    // 由于记住的时候需要特别处理一下，不然可能造成反复请求
-                    // 之所以不监控localStorage[scope.conf.rememberPerPage]是因为在删除的时候会undefind
-                    // 然后又一次请求
-                    if(localStorage[scope.conf.rememberPerPage]){
-                        newValue += localStorage[scope.conf.rememberPerPage];
-                    }else{
-                        newValue += scope.conf.itemsPerPage;
-                    }
-                }else{
-                    newValue += scope.conf.itemsPerPage;
-                }
-                return newValue;
-
-            }, getPagination);
-
-        }
-    };
+angular.module('tm.pagination', []).directive('tmPagination', [function () {
+	return {
+		restrict: 'EA',
+		template: '<div class="page-list">' +
+			'<ul class="pagination" ng-show="conf.totalItems > 0">' +
+			'<li ng-class="{disabled: conf.currentPage == 1}" ng-click="prevPage()"><span>&laquo;</span></li>' +
+			'<li ng-repeat="item in pageList track by $index" ng-class="{active: item == conf.currentPage, separate: item == \'...\'}" ' +
+			'ng-click="changeCurrentPage(item)">' +
+			'<span>{{ item }}</span>' +
+			'</li>' +
+			'<li ng-class="{disabled: conf.currentPage == conf.numberOfPages}" ng-click="nextPage()"><span>&raquo;</span></li>' +
+			'</ul>' +
+			'<div class="page-total" ng-show="conf.totalItems > 0">' +
+			'第<input type="text" ng-model="jumpPageNum"  ng-keyup="jumpToPage($event)"/>页 ' +
+			'每页<select ng-model="conf.itemsPerPage" ng-options="option for option in conf.perPageOptions " ng-change="changeItemsPerPage()"></select>' +
+			'/共<strong>{{ conf.totalItems }}</strong>条' +
+			'</div>' +
+			'<div class="no-items" ng-show="conf.totalItems <= 0">暂无数据</div>' +
+			'</div>',
+		replace: true,
+		scope: {
+			conf: '='
+		},
+		link: function (scope, element, attrs) {
+
+			// 变更当前页
+			scope.changeCurrentPage = function (item) {
+				if (item == '...') {
+					return;
+				} else {
+					scope.conf.currentPage = item;
+				}
+			};
+
+			// 定义分页的长度必须为奇数 (default:9)
+			scope.conf.pagesLength = parseInt(scope.conf.pagesLength) ? parseInt(scope.conf.pagesLength) : 9;
+			if (scope.conf.pagesLength % 2 === 0) {
+				// 如果不是奇数的时候处理一下
+				scope.conf.pagesLength = scope.conf.pagesLength - 1;
+			}
+
+			// conf.erPageOptions
+			if (!scope.conf.perPageOptions) {
+				scope.conf.perPageOptions = [10, 15, 20, 30, 50];
+			}
+
+			// pageList数组
+			function getPagination() {
+				// conf.currentPage
+				scope.conf.currentPage = parseInt(scope.conf.currentPage) ? parseInt(scope.conf.currentPage) : 1;
+				// conf.totalItems
+				scope.conf.totalItems = parseInt(scope.conf.totalItems);
+
+				// conf.itemsPerPage (default:15)
+				// 先判断一下本地存储中有没有这个值
+				if (scope.conf.rememberPerPage) {
+					if (!parseInt(localStorage[scope.conf.rememberPerPage])) {
+						localStorage[scope.conf.rememberPerPage] = parseInt(scope.conf.itemsPerPage) ? parseInt(scope.conf.itemsPerPage) : 15;
+					}
+
+					scope.conf.itemsPerPage = parseInt(localStorage[scope.conf.rememberPerPage]);
+
+
+				} else {
+					scope.conf.itemsPerPage = parseInt(scope.conf.itemsPerPage) ? parseInt(scope.conf.itemsPerPage) : 15;
+				}
+
+				// numberOfPages
+				scope.conf.numberOfPages = Math.ceil(scope.conf.totalItems / scope.conf.itemsPerPage);
+
+				// judge currentPage > scope.numberOfPages
+				if (scope.conf.currentPage < 1) {
+					scope.conf.currentPage = 1;
+				}
+
+				if (scope.conf.currentPage > scope.conf.numberOfPages) {
+					scope.conf.currentPage = scope.conf.numberOfPages;
+				}
+
+				// jumpPageNum
+				scope.jumpPageNum = scope.conf.currentPage;
+
+				// 如果itemsPerPage在不在perPageOptions数组中，就把itemsPerPage加入这个数组中
+				var perPageOptionsLength = scope.conf.perPageOptions.length;
+				// 定义状态
+				var perPageOptionsStatus;
+				for (var i = 0; i < perPageOptionsLength; i++) {
+					if (scope.conf.perPageOptions[i] == scope.conf.itemsPerPage) {
+						perPageOptionsStatus = true;
+					}
+				}
+				// 如果itemsPerPage在不在perPageOptions数组中，就把itemsPerPage加入这个数组中
+				if (!perPageOptionsStatus) {
+					scope.conf.perPageOptions.push(scope.conf.itemsPerPage);
+				}
+
+				// 对选项进行sort
+				scope.conf.perPageOptions.sort(function (a, b) {
+					return a - b
+				});
+
+				scope.pageList = [];
+				if (scope.conf.numberOfPages <= scope.conf.pagesLength) {
+					// 判断总页数如果小于等于分页的长度，若小于则直接显示
+					for (i = 1; i <= scope.conf.numberOfPages; i++) {
+						scope.pageList.push(i);
+					}
+				} else {
+					// 总页数大于分页长度（此时分为三种情况：1.左边没有...2.右边没有...3.左右都有...）
+					// 计算中心偏移量
+					var offset = (scope.conf.pagesLength - 1) / 2;
+					if (scope.conf.currentPage <= offset) {
+						// 左边没有...
+						for (i = 1; i <= offset + 1; i++) {
+							scope.pageList.push(i);
+						}
+						scope.pageList.push('...');
+						scope.pageList.push(scope.conf.numberOfPages);
+					} else if (scope.conf.currentPage > scope.conf.numberOfPages - offset) {
+						scope.pageList.push(1);
+						scope.pageList.push('...');
+						for (i = offset + 1; i >= 1; i--) {
+							scope.pageList.push(scope.conf.numberOfPages - i);
+						}
+						scope.pageList.push(scope.conf.numberOfPages);
+					} else {
+						// 最后一种情况，两边都有...
+						scope.pageList.push(1);
+						scope.pageList.push('...');
+
+						for (i = Math.ceil(offset / 2); i >= 1; i--) {
+							scope.pageList.push(scope.conf.currentPage - i);
+						}
+						scope.pageList.push(scope.conf.currentPage);
+						for (i = 1; i <= offset / 2; i++) {
+							scope.pageList.push(scope.conf.currentPage + i);
+						}
+
+						scope.pageList.push('...');
+						scope.pageList.push(scope.conf.numberOfPages);
+					}
+				}
+
+				if (scope.conf.onChange) {
+					scope.conf.onChange();
+				}
+				scope.$parent.conf = scope.conf;
+			}
+
+			// prevPage
+			scope.prevPage = function () {
+				if (scope.conf.currentPage > 1) {
+					scope.conf.currentPage -= 1;
+				}
+			};
+			// nextPage
+			scope.nextPage = function () {
+				if (scope.conf.currentPage < scope.conf.numberOfPages) {
+					scope.conf.currentPage += 1;
+				}
+			};
+
+			// 跳转页
+			scope.jumpToPage = function () {
+				scope.jumpPageNum = scope.jumpPageNum.replace(/[^0-9]/g, '');
+				if (scope.jumpPageNum !== '') {
+					scope.conf.currentPage = scope.jumpPageNum;
+				}
+			};
+
+			// 修改每页显示的条数
+			scope.changeItemsPerPage = function () {
+				// 清除本地存储的值方便重新设置
+				if (scope.conf.rememberPerPage) {
+					localStorage.removeItem(scope.conf.rememberPerPage);
+				}
+			};
+
+			scope.$watch(function () {
+				var newValue = scope.conf.currentPage + ' ' + scope.conf.totalItems + ' ';
+				// 如果直接watch perPage变化的时候，因为记住功能的原因，所以一开始可能调用两次。
+				//所以用了如下方式处理
+				if (scope.conf.rememberPerPage) {
+					// 由于记住的时候需要特别处理一下，不然可能造成反复请求
+					// 之所以不监控localStorage[scope.conf.rememberPerPage]是因为在删除的时候会undefind
+					// 然后又一次请求
+					if (localStorage[scope.conf.rememberPerPage]) {
+						newValue += localStorage[scope.conf.rememberPerPage];
+					} else {
+						newValue += scope.conf.itemsPerPage;
+					}
+				} else {
+					newValue += scope.conf.itemsPerPage;
+				}
+				return newValue;
+
+			}, getPagination);
+
+		}
+	};
 }]);
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/path_parser.js b/len-activiti/src/main/resources/static/editor-app/libs/path_parser.js
index 0711437..919b3c5 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/path_parser.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/path_parser.js
@@ -1,30 +1,145 @@
 /*****
-*
-*   The contents of this file were written by Kevin Lindsey
-*   copyright 2002-2003 Kevin Lindsey
-*
-*   This file was compacted by jscompact
-*   A Perl utility written by Kevin Lindsey (kevin@kevlindev.com)
-*
-*****/
-
-Svg.VERSION=1.0;
-Svg.NAMESPACE="http://www.w3.org/2000/svg";
-function Svg(){}
-PathParser.PARAMCOUNT={A:7,C:6,H:1,L:2,M:2,Q:4,S:4,T:2,V:1,Z:0};
-PathParser.METHODNAME={A:"arcAbs",a:"arcRel",C:"curvetoCubicAbs",c:"curvetoCubicRel",H:"linetoHorizontalAbs",h:"linetoHorizontalRel",L:"linetoAbs",l:"linetoRel",M:"movetoAbs",m:"movetoRel",Q:"curvetoQuadraticAbs",q:"curvetoQuadraticRel",S:"curvetoCubicSmoothAbs",s:"curvetoCubicSmoothRel",T:"curvetoQuadraticSmoothAbs",t:"curvetoQuadraticSmoothRel",V:"linetoVerticalAbs",v:"linetoVerticalRel",Z:"closePath",z:"closePath"}
-function PathParser(){this._lexer=new PathLexer();this._handler=null;}
-PathParser.prototype.parsePath=function(path){if(path==null||path.namespaceURI!=Svg.NAMESPACE||path.localName!="path")throw new Error("PathParser.parsePath: The first parameter must be an SVG path element");this.parseData(path.getAttributeNS(null,"d"));};
-PathParser.prototype.parseData=function(pathData){if(typeof(pathData)!="string")throw new Error("PathParser.parseData: The first parameter must be a string");if(this._handler!=null&&this._handler.beginParse!=null)this._handler.beginParse();var lexer=this._lexer;lexer.setPathData(pathData);var mode="BOP";var token=lexer.getNextToken();while(!token.typeis(PathToken.EOD)){var param_count;var params=new Array();switch(token.type){case PathToken.COMMAND:if(mode=="BOP"&&token.text!="M"&&token.text!="m")throw new Error("PathParser.parseData: a path must begin with a moveto command");mode=token.text;param_count=PathParser.PARAMCOUNT[token.text.toUpperCase()];token=lexer.getNextToken();break;case PathToken.NUMBER:break;default:throw new Error("PathParser.parseData: unrecognized token type: "+token.type);}for(var i=0;i<param_count;i++){switch(token.type){case PathToken.COMMAND:throw new Error("PathParser.parseData: parameter must be a number: "+token.text);case PathToken.NUMBER:params[i]=token.text-0;break;default:throw new Errot("PathParser.parseData: unrecognized token type: "+token.type);}token=lexer.getNextToken();}if(this._handler!=null){var handler=this._handler;var method=PathParser.METHODNAME[mode];if(handler[method]!=null)handler[method].apply(handler,params);}if(mode=="M")mode="L";if(mode=="m")mode="l";}};
-PathParser.prototype.setHandler=function(handler){this._handler=handler;};
-PathLexer.VERSION=1.0;
-function PathLexer(pathData){if(pathData==null)pathData="";this.setPathData(pathData);}
-PathLexer.prototype.setPathData=function(pathData){if(typeof(pathData)!="string")throw new Error("PathLexer.setPathData: The first parameter must be a string");this._pathData=pathData;};
-PathLexer.prototype.getNextToken=function(){var result=null;var d=this._pathData;while(result==null){if(d==null||d==""){result=new PathToken(PathToken.EOD,"");}else if(d.match(/^([ \t\r\n,]+)/)){d=d.substr(RegExp.$1.length);}else if(d.match(/^([AaCcHhLlMmQqSsTtVvZz])/)){result=new PathToken(PathToken.COMMAND,RegExp.$1);d=d.substr(RegExp.$1.length);}else if(d.match(/^(([-+]?[0-9]+(\.[0-9]*)?|[-+]?\.[0-9]+)([eE][-+]?[0-9]+)?)/)){result=new PathToken(PathToken.NUMBER,parseFloat(RegExp.$1));d=d.substr(RegExp.$1.length);}else{throw new Error("PathLexer.getNextToken: unrecognized path data "+d);}}this._pathData=d;return result;};
-PathToken.UNDEFINED=0;
-PathToken.COMMAND=1;
-PathToken.NUMBER=2;
-PathToken.EOD=3;
-function PathToken(type,text){if(arguments.length>0){this.init(type,text);}}
-PathToken.prototype.init=function(type,text){this.type=type;this.text=text;};
-PathToken.prototype.typeis=function(type){return this.type==type;}
\ No newline at end of file
+ *
+ *   The contents of this file were written by Kevin Lindsey
+ *   copyright 2002-2003 Kevin Lindsey
+ *
+ *   This file was compacted by jscompact
+ *   A Perl utility written by Kevin Lindsey (kevin@kevlindev.com)
+ *
+ *****/
+
+Svg.VERSION = 1.0;
+Svg.NAMESPACE = "http://www.w3.org/2000/svg";
+
+function Svg() {
+}
+
+PathParser.PARAMCOUNT = {A: 7, C: 6, H: 1, L: 2, M: 2, Q: 4, S: 4, T: 2, V: 1, Z: 0};
+PathParser.METHODNAME = {
+	A: "arcAbs",
+	a: "arcRel",
+	C: "curvetoCubicAbs",
+	c: "curvetoCubicRel",
+	H: "linetoHorizontalAbs",
+	h: "linetoHorizontalRel",
+	L: "linetoAbs",
+	l: "linetoRel",
+	M: "movetoAbs",
+	m: "movetoRel",
+	Q: "curvetoQuadraticAbs",
+	q: "curvetoQuadraticRel",
+	S: "curvetoCubicSmoothAbs",
+	s: "curvetoCubicSmoothRel",
+	T: "curvetoQuadraticSmoothAbs",
+	t: "curvetoQuadraticSmoothRel",
+	V: "linetoVerticalAbs",
+	v: "linetoVerticalRel",
+	Z: "closePath",
+	z: "closePath"
+}
+
+function PathParser() {
+	this._lexer = new PathLexer();
+	this._handler = null;
+}
+
+PathParser.prototype.parsePath = function (path) {
+	if (path == null || path.namespaceURI != Svg.NAMESPACE || path.localName != "path") throw new Error("PathParser.parsePath: The first parameter must be an SVG path element");
+	this.parseData(path.getAttributeNS(null, "d"));
+};
+PathParser.prototype.parseData = function (pathData) {
+	if (typeof (pathData) != "string") throw new Error("PathParser.parseData: The first parameter must be a string");
+	if (this._handler != null && this._handler.beginParse != null) this._handler.beginParse();
+	var lexer = this._lexer;
+	lexer.setPathData(pathData);
+	var mode = "BOP";
+	var token = lexer.getNextToken();
+	while (!token.typeis(PathToken.EOD)) {
+		var param_count;
+		var params = new Array();
+		switch (token.type) {
+			case PathToken.COMMAND:
+				if (mode == "BOP" && token.text != "M" && token.text != "m") throw new Error("PathParser.parseData: a path must begin with a moveto command");
+				mode = token.text;
+				param_count = PathParser.PARAMCOUNT[token.text.toUpperCase()];
+				token = lexer.getNextToken();
+				break;
+			case PathToken.NUMBER:
+				break;
+			default:
+				throw new Error("PathParser.parseData: unrecognized token type: " + token.type);
+		}
+		for (var i = 0; i < param_count; i++) {
+			switch (token.type) {
+				case PathToken.COMMAND:
+					throw new Error("PathParser.parseData: parameter must be a number: " + token.text);
+				case PathToken.NUMBER:
+					params[i] = token.text - 0;
+					break;
+				default:
+					throw new Errot("PathParser.parseData: unrecognized token type: " + token.type);
+			}
+			token = lexer.getNextToken();
+		}
+		if (this._handler != null) {
+			var handler = this._handler;
+			var method = PathParser.METHODNAME[mode];
+			if (handler[method] != null) handler[method].apply(handler, params);
+		}
+		if (mode == "M") mode = "L";
+		if (mode == "m") mode = "l";
+	}
+};
+PathParser.prototype.setHandler = function (handler) {
+	this._handler = handler;
+};
+PathLexer.VERSION = 1.0;
+
+function PathLexer(pathData) {
+	if (pathData == null) pathData = "";
+	this.setPathData(pathData);
+}
+
+PathLexer.prototype.setPathData = function (pathData) {
+	if (typeof (pathData) != "string") throw new Error("PathLexer.setPathData: The first parameter must be a string");
+	this._pathData = pathData;
+};
+PathLexer.prototype.getNextToken = function () {
+	var result = null;
+	var d = this._pathData;
+	while (result == null) {
+		if (d == null || d == "") {
+			result = new PathToken(PathToken.EOD, "");
+		} else if (d.match(/^([ \t\r\n,]+)/)) {
+			d = d.substr(RegExp.$1.length);
+		} else if (d.match(/^([AaCcHhLlMmQqSsTtVvZz])/)) {
+			result = new PathToken(PathToken.COMMAND, RegExp.$1);
+			d = d.substr(RegExp.$1.length);
+		} else if (d.match(/^(([-+]?[0-9]+(\.[0-9]*)?|[-+]?\.[0-9]+)([eE][-+]?[0-9]+)?)/)) {
+			result = new PathToken(PathToken.NUMBER, parseFloat(RegExp.$1));
+			d = d.substr(RegExp.$1.length);
+		} else {
+			throw new Error("PathLexer.getNextToken: unrecognized path data " + d);
+		}
+	}
+	this._pathData = d;
+	return result;
+};
+PathToken.UNDEFINED = 0;
+PathToken.COMMAND = 1;
+PathToken.NUMBER = 2;
+PathToken.EOD = 3;
+
+function PathToken(type, text) {
+	if (arguments.length > 0) {
+		this.init(type, text);
+	}
+}
+
+PathToken.prototype.init = function (type, text) {
+	this.type = type;
+	this.text = text;
+};
+PathToken.prototype.typeis = function (type) {
+	return this.type == type;
+}
diff --git a/len-activiti/src/main/resources/static/editor-app/libs/prototype-1.5.1.js b/len-activiti/src/main/resources/static/editor-app/libs/prototype-1.5.1.js
index b3f19f4..05ae1f8 100644
--- a/len-activiti/src/main/resources/static/editor-app/libs/prototype-1.5.1.js
+++ b/len-activiti/src/main/resources/static/editor-app/libs/prototype-1.5.1.js
@@ -7,414 +7,426 @@
 /*--------------------------------------------------------------------------*/
 
 var Prototype = {
-  Version: '1.5.1',
-
-  Browser: {
-    IE:     !!(window.attachEvent && !window.opera),
-    Opera:  !!window.opera,
-    WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
-    Gecko:  navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') == -1
-  },
-
-  BrowserFeatures: {
-    XPath: !!document.evaluate,
-    ElementExtensions: !!window.HTMLElement,
-    SpecificElementExtensions:
-      (document.createElement('div').__proto__ !==
-       document.createElement('form').__proto__)
-  },
-
-  ScriptFragment: '<script[^>]*>([\u0001-\uFFFF]*?)</script>',
-  JSONFilter: /^\/\*-secure-\s*(.*)\s*\*\/\s*$/,
-
-  emptyFunction: function() { },
-  K: function(x) { return x }
+	Version: '1.5.1',
+
+	Browser: {
+		IE: !!(window.attachEvent && !window.opera),
+		Opera: !!window.opera,
+		WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
+		Gecko: navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') == -1
+	},
+
+	BrowserFeatures: {
+		XPath: !!document.evaluate,
+		ElementExtensions: !!window.HTMLElement,
+		SpecificElementExtensions:
+			(document.createElement('div').__proto__ !==
+				document.createElement('form').__proto__)
+	},
+
+	ScriptFragment: '<script[^>]*>([\u0001-\uFFFF]*?)</script>',
+	JSONFilter: /^\/\*-secure-\s*(.*)\s*\*\/\s*$/,
+
+	emptyFunction: function () {
+	},
+	K: function (x) {
+		return x
+	}
 }
 
 var Class = {
-  create: function() {
-    return function() {
-      this.initialize.apply(this, arguments);
-    }
-  }
+	create: function () {
+		return function () {
+			this.initialize.apply(this, arguments);
+		}
+	}
 }
 
 var Abstract = new Object();
 
-Object.extend = function(destination, source) {
-  for (var property in source) {
-    destination[property] = source[property];
-  }
-  return destination;
+Object.extend = function (destination, source) {
+	for (var property in source) {
+		destination[property] = source[property];
+	}
+	return destination;
 }
 
 Object.extend(Object, {
-  inspect: function(object) {
-    try {
-      if (object === undefined) return 'undefined';
-      if (object === null) return 'null';
-      return object.inspect ? object.inspect() : object.toString();
-    } catch (e) {
-      if (e instanceof RangeError) return '...';
-      throw e;
-    }
-  },
-
-  toJSON: function(object) {
-    var type = typeof object;
-    switch(type) {
-      case 'undefined':
-      case 'function':
-      case 'unknown': return;
-      case 'boolean': return object.toString();
-    }
-    if (object === null) return 'null';
-    if (object.toJSON) return object.toJSON();
-    if (object.ownerDocument === document) return;
-    var results = [];
-    for (var property in object) {
-      var value = Object.toJSON(object[property]);
-      if (value !== undefined)
-        results.push(property.toJSON() + ': ' + value);
-    }
-    return '{' + results.join(', ') + '}';
-  },
-
-  keys: function(object) {
-    var keys = [];
-    for (var property in object)
-      keys.push(property);
-    return keys;
-  },
-
-  values: function(object) {
-    var values = [];
-    for (var property in object)
-      values.push(object[property]);
-    return values;
-  },
-
-  clone: function(object) {
-    return Object.extend({}, object);
-  }
+	inspect: function (object) {
+		try {
+			if (object === undefined) return 'undefined';
+			if (object === null) return 'null';
+			return object.inspect ? object.inspect() : object.toString();
+		} catch (e) {
+			if (e instanceof RangeError) return '...';
+			throw e;
+		}
+	},
+
+	toJSON: function (object) {
+		var type = typeof object;
+		switch (type) {
+			case 'undefined':
+			case 'function':
+			case 'unknown':
+				return;
+			case 'boolean':
+				return object.toString();
+		}
+		if (object === null) return 'null';
+		if (object.toJSON) return object.toJSON();
+		if (object.ownerDocument === document) return;
+		var results = [];
+		for (var property in object) {
+			var value = Object.toJSON(object[property]);
+			if (value !== undefined)
+				results.push(property.toJSON() + ': ' + value);
+		}
+		return '{' + results.join(', ') + '}';
+	},
+
+	keys: function (object) {
+		var keys = [];
+		for (var property in object)
+			keys.push(property);
+		return keys;
+	},
+
+	values: function (object) {
+		var values = [];
+		for (var property in object)
+			values.push(object[property]);
+		return values;
+	},
+
+	clone: function (object) {
+		return Object.extend({}, object);
+	}
 });
 
-Function.prototype.bind = function() {
-  var __method = this, args = $A(arguments), object = args.shift();
-  return function() {
-    return __method.apply(object, args.concat($A(arguments)));
-  }
+Function.prototype.bind = function () {
+	var __method = this, args = $A(arguments), object = args.shift();
+	return function () {
+		return __method.apply(object, args.concat($A(arguments)));
+	}
 }
 
-Function.prototype.bindAsEventListener = function(object) {
-  var __method = this, args = $A(arguments), object = args.shift();
-  return function(event) {
-    return __method.apply(object, [event || window.event].concat(args));
-  }
+Function.prototype.bindAsEventListener = function (object) {
+	var __method = this, args = $A(arguments), object = args.shift();
+	return function (event) {
+		return __method.apply(object, [event || window.event].concat(args));
+	}
 }
 
 Object.extend(Number.prototype, {
-  toColorPart: function() {
-    return this.toPaddedString(2, 16);
-  },
-
-  succ: function() {
-    return this + 1;
-  },
-
-  times: function(iterator) {
-    $R(0, this, true).each(iterator);
-    return this;
-  },
-
-  toPaddedString: function(length, radix) {
-    var string = this.toString(radix || 10);
-    return '0'.times(length - string.length) + string;
-  },
-
-  toJSON: function() {
-    return isFinite(this) ? this.toString() : 'null';
-  }
+	toColorPart: function () {
+		return this.toPaddedString(2, 16);
+	},
+
+	succ: function () {
+		return this + 1;
+	},
+
+	times: function (iterator) {
+		$R(0, this, true).each(iterator);
+		return this;
+	},
+
+	toPaddedString: function (length, radix) {
+		var string = this.toString(radix || 10);
+		return '0'.times(length - string.length) + string;
+	},
+
+	toJSON: function () {
+		return isFinite(this) ? this.toString() : 'null';
+	}
 });
 
-Date.prototype.toJSON = function() {
-  return '"' + this.getFullYear() + '-' +
-    (this.getMonth() + 1).toPaddedString(2) + '-' +
-    this.getDate().toPaddedString(2) + 'T' +
-    this.getHours().toPaddedString(2) + ':' +
-    this.getMinutes().toPaddedString(2) + ':' +
-    this.getSeconds().toPaddedString(2) + '"';
+Date.prototype.toJSON = function () {
+	return '"' + this.getFullYear() + '-' +
+		(this.getMonth() + 1).toPaddedString(2) + '-' +
+		this.getDate().toPaddedString(2) + 'T' +
+		this.getHours().toPaddedString(2) + ':' +
+		this.getMinutes().toPaddedString(2) + ':' +
+		this.getSeconds().toPaddedString(2) + '"';
 };
 
 var Try = {
-  these: function() {
-    var returnValue;
-
-    for (var i = 0, length = arguments.length; i < length; i++) {
-      var lambda = arguments[i];
-      try {
-        returnValue = lambda();
-        break;
-      } catch (e) {}
-    }
-
-    return returnValue;
-  }
+	these: function () {
+		var returnValue;
+
+		for (var i = 0, length = arguments.length; i < length; i++) {
+			var lambda = arguments[i];
+			try {
+				returnValue = lambda();
+				break;
+			} catch (e) {
+			}
+		}
+
+		return returnValue;
+	}
 }
 
 /*--------------------------------------------------------------------------*/
 
 var PeriodicalExecuter = Class.create();
 PeriodicalExecuter.prototype = {
-  initialize: function(callback, frequency) {
-    this.callback = callback;
-    this.frequency = frequency;
-    this.currentlyExecuting = false;
-
-    this.registerCallback();
-  },
-
-  registerCallback: function() {
-    this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
-  },
-
-  stop: function() {
-    if (!this.timer) return;
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-
-  onTimerEvent: function() {
-    if (!this.currentlyExecuting) {
-      try {
-        this.currentlyExecuting = true;
-        this.callback(this);
-      } finally {
-        this.currentlyExecuting = false;
-      }
-    }
-  }
+	initialize: function (callback, frequency) {
+		this.callback = callback;
+		this.frequency = frequency;
+		this.currentlyExecuting = false;
+
+		this.registerCallback();
+	},
+
+	registerCallback: function () {
+		this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
+	},
+
+	stop: function () {
+		if (!this.timer) return;
+		clearInterval(this.timer);
+		this.timer = null;
+	},
+
+	onTimerEvent: function () {
+		if (!this.currentlyExecuting) {
+			try {
+				this.currentlyExecuting = true;
+				this.callback(this);
+			} finally {
+				this.currentlyExecuting = false;
+			}
+		}
+	}
 }
 Object.extend(String, {
-  interpret: function(value) {
-    return value == null ? '' : String(value);
-  },
-  specialChar: {
-    '\b': '\\b',
-    '\t': '\\t',
-    '\n': '\\n',
-    '\f': '\\f',
-    '\r': '\\r',
-    '\\': '\\\\'
-  }
+	interpret: function (value) {
+		return value == null ? '' : String(value);
+	},
+	specialChar: {
+		'\b': '\\b',
+		'\t': '\\t',
+		'\n': '\\n',
+		'\f': '\\f',
+		'\r': '\\r',
+		'\\': '\\\\'
+	}
 });
 
 Object.extend(String.prototype, {
-  gsub: function(pattern, replacement) {
-    var result = '', source = this, match;
-    replacement = arguments.callee.prepareReplacement(replacement);
-
-    while (source.length > 0) {
-      if (match = source.match(pattern)) {
-        result += source.slice(0, match.index);
-        result += String.interpret(replacement(match));
-        source  = source.slice(match.index + match[0].length);
-      } else {
-        result += source, source = '';
-      }
-    }
-    return result;
-  },
-
-  sub: function(pattern, replacement, count) {
-    replacement = this.gsub.prepareReplacement(replacement);
-    count = count === undefined ? 1 : count;
-
-    return this.gsub(pattern, function(match) {
-      if (--count < 0) return match[0];
-      return replacement(match);
-    });
-  },
-
-  scan: function(pattern, iterator) {
-    this.gsub(pattern, iterator);
-    return this;
-  },
-
-  truncate: function(length, truncation) {
-    length = length || 30;
-    truncation = truncation === undefined ? '...' : truncation;
-    return this.length > length ?
-      this.slice(0, length - truncation.length) + truncation : this;
-  },
-
-  strip: function() {
-    return this.replace(/^\s+/, '').replace(/\s+$/, '');
-  },
-
-  stripTags: function() {
-    return this.replace(/<\/?[^>]+>/gi, '');
-  },
-
-  stripScripts: function() {
-    return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
-  },
-
-  extractScripts: function() {
-    var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
-    var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
-    return (this.match(matchAll) || []).map(function(scriptTag) {
-      return (scriptTag.match(matchOne) || ['', ''])[1];
-    });
-  },
-
-  evalScripts: function() {
-    return this.extractScripts().map(function(script) { return eval(script) });
-  },
-
-  escapeHTML: function() {
-    var self = arguments.callee;
-    self.text.data = this;
-    return self.div.innerHTML;
-  },
-
-  unescapeHTML: function() {
-    var div = document.createElement('div');
-    div.innerHTML = this.stripTags();
-    return div.childNodes[0] ? (div.childNodes.length > 1 ?
-      $A(div.childNodes).inject('', function(memo, node) { return memo+node.nodeValue }) :
-      div.childNodes[0].nodeValue) : '';
-  },
-
-  toQueryParams: function(separator) {
-    var match = this.strip().match(/([^?#]*)(#.*)?$/);
-    if (!match) return {};
-
-    return match[1].split(separator || '&').inject({}, function(hash, pair) {
-      if ((pair = pair.split('='))[0]) {
-        var key = decodeURIComponent(pair.shift());
-        var value = pair.length > 1 ? pair.join('=') : pair[0];
-        if (value != undefined) value = decodeURIComponent(value);
-
-        if (key in hash) {
-          if (hash[key].constructor != Array) hash[key] = [hash[key]];
-          hash[key].push(value);
-        }
-        else hash[key] = value;
-      }
-      return hash;
-    });
-  },
-
-  toArray: function() {
-    return this.split('');
-  },
-
-  succ: function() {
-    return this.slice(0, this.length - 1) +
-      String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
-  },
-
-  times: function(count) {
-    var result = '';
-    for (var i = 0; i < count; i++) result += this;
-    return result;
-  },
-
-  camelize: function() {
-    var parts = this.split('-'), len = parts.length;
-    if (len == 1) return parts[0];
-
-    var camelized = this.charAt(0) == '-'
-      ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1)
-      : parts[0];
-
-    for (var i = 1; i < len; i++)
-      camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1);
-
-    return camelized;
-  },
-
-  capitalize: function() {
-    return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
-  },
-
-  underscore: function() {
-    return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'#{1}_#{2}').gsub(/([a-z\d])([A-Z])/,'#{1}_#{2}').gsub(/-/,'_').toLowerCase();
-  },
-
-  dasherize: function() {
-    return this.gsub(/_/,'-');
-  },
-
-  inspect: function(useDoubleQuotes) {
-    var escapedString = this.gsub(/[\x00-\x1f\\]/, function(match) {
-      var character = String.specialChar[match[0]];
-      return character ? character : '\\u00' + match[0].charCodeAt().toPaddedString(2, 16);
-    });
-    if (useDoubleQuotes) return '"' + escapedString.replace(/"/g, '\\"') + '"';
-    return "'" + escapedString.replace(/'/g, '\\\'') + "'";
-  },
-
-  toJSON: function() {
-    return this.inspect(true);
-  },
-
-  unfilterJSON: function(filter) {
-    return this.sub(filter || Prototype.JSONFilter, '#{1}');
-  },
-
-  evalJSON: function(sanitize) {
-    var json = this.unfilterJSON();
-    try {
-      if (!sanitize || (/^("(\\.|[^"\\\n\r])*?"|[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t])+?$/.test(json)))
-        return eval('(' + json + ')');
-    } catch (e) { }
-    throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
-  },
-
-  include: function(pattern) {
-    return this.indexOf(pattern) > -1;
-  },
-
-  startsWith: function(pattern) {
-    return this.indexOf(pattern) === 0;
-  },
-
-  endsWith: function(pattern) {
-    var d = this.length - pattern.length;
-    return d >= 0 && this.lastIndexOf(pattern) === d;
-  },
-
-  empty: function() {
-    return this == '';
-  },
-
-  blank: function() {
-    return /^\s*$/.test(this);
-  }
+	gsub: function (pattern, replacement) {
+		var result = '', source = this, match;
+		replacement = arguments.callee.prepareReplacement(replacement);
+
+		while (source.length > 0) {
+			if (match = source.match(pattern)) {
+				result += source.slice(0, match.index);
+				result += String.interpret(replacement(match));
+				source = source.slice(match.index + match[0].length);
+			} else {
+				result += source, source = '';
+			}
+		}
+		return result;
+	},
+
+	sub: function (pattern, replacement, count) {
+		replacement = this.gsub.prepareReplacement(replacement);
+		count = count === undefined ? 1 : count;
+
+		return this.gsub(pattern, function (match) {
+			if (--count < 0) return match[0];
+			return replacement(match);
+		});
+	},
+
+	scan: function (pattern, iterator) {
+		this.gsub(pattern, iterator);
+		return this;
+	},
+
+	truncate: function (length, truncation) {
+		length = length || 30;
+		truncation = truncation === undefined ? '...' : truncation;
+		return this.length > length ?
+			this.slice(0, length - truncation.length) + truncation : this;
+	},
+
+	strip: function () {
+		return this.replace(/^\s+/, '').replace(/\s+$/, '');
+	},
+
+	stripTags: function () {
+		return this.replace(/<\/?[^>]+>/gi, '');
+	},
+
+	stripScripts: function () {
+		return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
+	},
+
+	extractScripts: function () {
+		var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
+		var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
+		return (this.match(matchAll) || []).map(function (scriptTag) {
+			return (scriptTag.match(matchOne) || ['', ''])[1];
+		});
+	},
+
+	evalScripts: function () {
+		return this.extractScripts().map(function (script) {
+			return eval(script)
+		});
+	},
+
+	escapeHTML: function () {
+		var self = arguments.callee;
+		self.text.data = this;
+		return self.div.innerHTML;
+	},
+
+	unescapeHTML: function () {
+		var div = document.createElement('div');
+		div.innerHTML = this.stripTags();
+		return div.childNodes[0] ? (div.childNodes.length > 1 ?
+			$A(div.childNodes).inject('', function (memo, node) {
+				return memo + node.nodeValue
+			}) :
+			div.childNodes[0].nodeValue) : '';
+	},
+
+	toQueryParams: function (separator) {
+		var match = this.strip().match(/([^?#]*)(#.*)?$/);
+		if (!match) return {};
+
+		return match[1].split(separator || '&').inject({}, function (hash, pair) {
+			if ((pair = pair.split('='))[0]) {
+				var key = decodeURIComponent(pair.shift());
+				var value = pair.length > 1 ? pair.join('=') : pair[0];
+				if (value != undefined) value = decodeURIComponent(value);
+
+				if (key in hash) {
+					if (hash[key].constructor != Array) hash[key] = [hash[key]];
+					hash[key].push(value);
+				} else hash[key] = value;
+			}
+			return hash;
+		});
+	},
+
+	toArray: function () {
+		return this.split('');
+	},
+
+	succ: function () {
+		return this.slice(0, this.length - 1) +
+			String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
+	},
+
+	times: function (count) {
+		var result = '';
+		for (var i = 0; i < count; i++) result += this;
+		return result;
+	},
+
+	camelize: function () {
+		var parts = this.split('-'), len = parts.length;
+		if (len == 1) return parts[0];
+
+		var camelized = this.charAt(0) == '-'
+			? parts[0].charAt(0).toUpperCase() + parts[0].substring(1)
+			: parts[0];
+
+		for (var i = 1; i < len; i++)
+			camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1);
+
+		return camelized;
+	},
+
+	capitalize: function () {
+		return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
+	},
+
+	underscore: function () {
+		return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/, '#{1}_#{2}').gsub(/([a-z\d])([A-Z])/, '#{1}_#{2}').gsub(/-/, '_').toLowerCase();
+	},
+
+	dasherize: function () {
+		return this.gsub(/_/, '-');
+	},
+
+	inspect: function (useDoubleQuotes) {
+		var escapedString = this.gsub(/[\x00-\x1f\\]/, function (match) {
+			var character = String.specialChar[match[0]];
+			return character ? character : '\\u00' + match[0].charCodeAt().toPaddedString(2, 16);
+		});
+		if (useDoubleQuotes) return '"' + escapedString.replace(/"/g, '\\"') + '"';
+		return "'" + escapedString.replace(/'/g, '\\\'') + "'";
+	},
+
+	toJSON: function () {
+		return this.inspect(true);
+	},
+
+	unfilterJSON: function (filter) {
+		return this.sub(filter || Prototype.JSONFilter, '#{1}');
+	},
+
+	evalJSON: function (sanitize) {
+		var json = this.unfilterJSON();
+		try {
+			if (!sanitize || (/^("(\\.|[^"\\\n\r])*?"|[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t])+?$/.test(json)))
+				return eval('(' + json + ')');
+		} catch (e) {
+		}
+		throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
+	},
+
+	include: function (pattern) {
+		return this.indexOf(pattern) > -1;
+	},
+
+	startsWith: function (pattern) {
+		return this.indexOf(pattern) === 0;
+	},
+
+	endsWith: function (pattern) {
+		var d = this.length - pattern.length;
+		return d >= 0 && this.lastIndexOf(pattern) === d;
+	},
+
+	empty: function () {
+		return this == '';
+	},
+
+	blank: function () {
+		return /^\s*$/.test(this);
+	}
 });
 
 if (Prototype.Browser.WebKit || Prototype.Browser.IE) Object.extend(String.prototype, {
-  escapeHTML: function() {
-    return this.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
-  },
-  unescapeHTML: function() {
-    return this.replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>');
-  }
+	escapeHTML: function () {
+		return this.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+	},
+	unescapeHTML: function () {
+		return this.replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>');
+	}
 });
 
-String.prototype.gsub.prepareReplacement = function(replacement) {
-  if (typeof replacement == 'function') return replacement;
-  var template = new Template(replacement);
-  return function(match) { return template.evaluate(match) };
+String.prototype.gsub.prepareReplacement = function (replacement) {
+	if (typeof replacement == 'function') return replacement;
+	var template = new Template(replacement);
+	return function (match) {
+		return template.evaluate(match)
+	};
 }
 
 String.prototype.parseQuery = String.prototype.toQueryParams;
 
 Object.extend(String.prototype.escapeHTML, {
-  div:  document.createElement('div'),
-  text: document.createTextNode('')
+	div: document.createElement('div'),
+	text: document.createTextNode('')
 });
 
 with (String.prototype.escapeHTML) div.appendChild(text);
@@ -422,1395 +434,1423 @@ with (String.prototype.escapeHTML) div.appendChild(text);
 var Template = Class.create();
 Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
 Template.prototype = {
-  initialize: function(template, pattern) {
-    this.template = template.toString();
-    this.pattern  = pattern || Template.Pattern;
-  },
-
-  evaluate: function(object) {
-    return this.template.gsub(this.pattern, function(match) {
-      var before = match[1];
-      if (before == '\\') return match[2];
-      return before + String.interpret(object[match[3]]);
-    });
-  }
+	initialize: function (template, pattern) {
+		this.template = template.toString();
+		this.pattern = pattern || Template.Pattern;
+	},
+
+	evaluate: function (object) {
+		return this.template.gsub(this.pattern, function (match) {
+			var before = match[1];
+			if (before == '\\') return match[2];
+			return before + String.interpret(object[match[3]]);
+		});
+	}
 }
 
 var $break = {}, $continue = new Error('"throw $continue" is deprecated, use "return" instead');
 
 var Enumerable = {
-  each: function(iterator) {
-    var index = 0;
-    try {
-      this._each(function(value) {
-        iterator(value, index++);
-      });
-    } catch (e) {
-      if (e != $break) 
-    	  throw e;
-    }
-    return this;
-  },
-
-  eachSlice: function(number, iterator) {
-    var index = -number, slices = [], array = this.toArray();
-    while ((index += number) < array.length)
-      slices.push(array.slice(index, index+number));
-    return slices.map(iterator);
-  },
-
-  all: function(iterator) {
-    var result = true;
-    this.each(function(value, index) {
-      result = result && !!(iterator || Prototype.K)(value, index);
-      if (!result) throw $break;
-    });
-    return result;
-  },
-
-  any: function(iterator) {
-    var result = false;
-    this.each(function(value, index) {
-      if (result = !!(iterator || Prototype.K)(value, index))
-        throw $break;
-    });
-    return result;
-  },
-
-  collect: function(iterator) {
-    var results = [];
-    this.each(function(value, index) {
-      results.push((iterator || Prototype.K)(value, index));
-    });
-    return results;
-  },
-
-  detect: function(iterator) {
-    var result;
-    this.each(function(value, index) {
-      if (iterator(value, index)) {
-        result = value;
-        throw $break;
-      }
-    });
-    return result;
-  },
-
-  findAll: function(iterator) {
-    var results = [];
-    this.each(function(value, index) {
-      if (iterator(value, index))
-        results.push(value);
-    });
-    return results;
-  },
-
-  grep: function(pattern, iterator) {
-    var results = [];
-    this.each(function(value, index) {
-      var stringValue = value.toString();
-      if (stringValue.match(pattern))
-        results.push((iterator || Prototype.K)(value, index));
-    })
-    return results;
-  },
-
-  include: function(object) {
-    var found = false;
-    this.each(function(value) {
-      if (value == object) {
-        found = true;
-        throw $break;
-      }
-    });
-    return found;
-  },
-
-  inGroupsOf: function(number, fillWith) {
-    fillWith = fillWith === undefined ? null : fillWith;
-    return this.eachSlice(number, function(slice) {
-      while(slice.length < number) slice.push(fillWith);
-      return slice;
-    });
-  },
-
-  inject: function(memo, iterator) {
-    this.each(function(value, index) {
-      memo = iterator(memo, value, index);
-    });
-    return memo;
-  },
-
-  invoke: function(method) {
-    var args = $A(arguments).slice(1);
-    return this.map(function(value) {
-      return value[method].apply(value, args);
-    });
-  },
-
-  max: function(iterator) {
-    var result;
-    this.each(function(value, index) {
-      value = (iterator || Prototype.K)(value, index);
-      if (result == undefined || value >= result)
-        result = value;
-    });
-    return result;
-  },
-
-  min: function(iterator) {
-    var result;
-    this.each(function(value, index) {
-      value = (iterator || Prototype.K)(value, index);
-      if (result == undefined || value < result)
-        result = value;
-    });
-    return result;
-  },
-
-  partition: function(iterator) {
-    var trues = [], falses = [];
-    this.each(function(value, index) {
-      ((iterator || Prototype.K)(value, index) ?
-        trues : falses).push(value);
-    });
-    return [trues, falses];
-  },
-
-  pluck: function(property) {
-    var results = [];
-    this.each(function(value, index) {
-      results.push(value[property]);
-    });
-    return results;
-  },
-
-  reject: function(iterator) {
-    var results = [];
-    this.each(function(value, index) {
-      if (!iterator(value, index))
-        results.push(value);
-    });
-    return results;
-  },
-
-  sortBy: function(iterator) {
-    return this.map(function(value, index) {
-      return {value: value, criteria: iterator(value, index)};
-    }).sort(function(left, right) {
-      var a = left.criteria, b = right.criteria;
-      return a < b ? -1 : a > b ? 1 : 0;
-    }).pluck('value');
-  },
-
-  toArray: function() {
-    return this.map();
-  },
-
-  zip: function() {
-    var iterator = Prototype.K, args = $A(arguments);
-    if (typeof args.last() == 'function')
-      iterator = args.pop();
-
-    var collections = [this].concat(args).map($A);
-    return this.map(function(value, index) {
-      return iterator(collections.pluck(index));
-    });
-  },
-
-  size: function() {
-    return this.toArray().length;
-  },
-
-  inspect: function() {
-    return '#<Enumerable:' + this.toArray().inspect() + '>';
-  }
+	each: function (iterator) {
+		var index = 0;
+		try {
+			this._each(function (value) {
+				iterator(value, index++);
+			});
+		} catch (e) {
+			if (e != $break)
+				throw e;
+		}
+		return this;
+	},
+
+	eachSlice: function (number, iterator) {
+		var index = -number, slices = [], array = this.toArray();
+		while ((index += number) < array.length)
+			slices.push(array.slice(index, index + number));
+		return slices.map(iterator);
+	},
+
+	all: function (iterator) {
+		var result = true;
+		this.each(function (value, index) {
+			result = result && !!(iterator || Prototype.K)(value, index);
+			if (!result) throw $break;
+		});
+		return result;
+	},
+
+	any: function (iterator) {
+		var result = false;
+		this.each(function (value, index) {
+			if (result = !!(iterator || Prototype.K)(value, index))
+				throw $break;
+		});
+		return result;
+	},
+
+	collect: function (iterator) {
+		var results = [];
+		this.each(function (value, index) {
+			results.push((iterator || Prototype.K)(value, index));
+		});
+		return results;
+	},
+
+	detect: function (iterator) {
+		var result;
+		this.each(function (value, index) {
+			if (iterator(value, index)) {
+				result = value;
+				throw $break;
+			}
+		});
+		return result;
+	},
+
+	findAll: function (iterator) {
+		var results = [];
+		this.each(function (value, index) {
+			if (iterator(value, index))
+				results.push(value);
+		});
+		return results;
+	},
+
+	grep: function (pattern, iterator) {
+		var results = [];
+		this.each(function (value, index) {
+			var stringValue = value.toString();
+			if (stringValue.match(pattern))
+				results.push((iterator || Prototype.K)(value, index));
+		})
+		return results;
+	},
+
+	include: function (object) {
+		var found = false;
+		this.each(function (value) {
+			if (value == object) {
+				found = true;
+				throw $break;
+			}
+		});
+		return found;
+	},
+
+	inGroupsOf: function (number, fillWith) {
+		fillWith = fillWith === undefined ? null : fillWith;
+		return this.eachSlice(number, function (slice) {
+			while (slice.length < number) slice.push(fillWith);
+			return slice;
+		});
+	},
+
+	inject: function (memo, iterator) {
+		this.each(function (value, index) {
+			memo = iterator(memo, value, index);
+		});
+		return memo;
+	},
+
+	invoke: function (method) {
+		var args = $A(arguments).slice(1);
+		return this.map(function (value) {
+			return value[method].apply(value, args);
+		});
+	},
+
+	max: function (iterator) {
+		var result;
+		this.each(function (value, index) {
+			value = (iterator || Prototype.K)(value, index);
+			if (result == undefined || value >= result)
+				result = value;
+		});
+		return result;
+	},
+
+	min: function (iterator) {
+		var result;
+		this.each(function (value, index) {
+			value = (iterator || Prototype.K)(value, index);
+			if (result == undefined || value < result)
+				result = value;
+		});
+		return result;
+	},
+
+	partition: function (iterator) {
+		var trues = [], falses = [];
+		this.each(function (value, index) {
+			((iterator || Prototype.K)(value, index) ?
+				trues : falses).push(value);
+		});
+		return [trues, falses];
+	},
+
+	pluck: function (property) {
+		var results = [];
+		this.each(function (value, index) {
+			results.push(value[property]);
+		});
+		return results;
+	},
+
+	reject: function (iterator) {
+		var results = [];
+		this.each(function (value, index) {
+			if (!iterator(value, index))
+				results.push(value);
+		});
+		return results;
+	},
+
+	sortBy: function (iterator) {
+		return this.map(function (value, index) {
+			return {value: value, criteria: iterator(value, index)};
+		}).sort(function (left, right) {
+			var a = left.criteria, b = right.criteria;
+			return a < b ? -1 : a > b ? 1 : 0;
+		}).pluck('value');
+	},
+
+	toArray: function () {
+		return this.map();
+	},
+
+	zip: function () {
+		var iterator = Prototype.K, args = $A(arguments);
+		if (typeof args.last() == 'function')
+			iterator = args.pop();
+
+		var collections = [this].concat(args).map($A);
+		return this.map(function (value, index) {
+			return iterator(collections.pluck(index));
+		});
+	},
+
+	size: function () {
+		return this.toArray().length;
+	},
+
+	inspect: function () {
+		return '#<Enumerable:' + this.toArray().inspect() + '>';
+	}
 }
 
 Object.extend(Enumerable, {
-  map:     Enumerable.collect,
-  find:    Enumerable.detect,
-  select:  Enumerable.findAll,
-  member:  Enumerable.include,
-  entries: Enumerable.toArray
+	map: Enumerable.collect,
+	find: Enumerable.detect,
+	select: Enumerable.findAll,
+	member: Enumerable.include,
+	entries: Enumerable.toArray
 });
-var $A = Array.from = function(iterable) {
-  if (!iterable) return [];
-  if (iterable.toArray) {
-    return iterable.toArray();
-  } else {
-    var results = [];
-    for (var i = 0, length = iterable.length; i < length; i++)
-      results.push(iterable[i]);
-    return results;
-  }
+var $A = Array.from = function (iterable) {
+	if (!iterable) return [];
+	if (iterable.toArray) {
+		return iterable.toArray();
+	} else {
+		var results = [];
+		for (var i = 0, length = iterable.length; i < length; i++)
+			results.push(iterable[i]);
+		return results;
+	}
 }
 
 if (Prototype.Browser.WebKit) {
-  $A = Array.from = function(iterable) {
-    if (!iterable) return [];
-    if (!(typeof iterable == 'function' && iterable == '[object NodeList]') &&
-      iterable.toArray) {
-      return iterable.toArray();
-    } else {
-      var results = [];
-      for (var i = 0, length = iterable.length; i < length; i++)
-        results.push(iterable[i]);
-      return results;
-    }
-  }
+	$A = Array.from = function (iterable) {
+		if (!iterable) return [];
+		if (!(typeof iterable == 'function' && iterable == '[object NodeList]') &&
+			iterable.toArray) {
+			return iterable.toArray();
+		} else {
+			var results = [];
+			for (var i = 0, length = iterable.length; i < length; i++)
+				results.push(iterable[i]);
+			return results;
+		}
+	}
 }
 
 Object.extend(Array.prototype, Enumerable);
 
 if (!Array.prototype._reverse)
-  Array.prototype._reverse = Array.prototype.reverse;
+	Array.prototype._reverse = Array.prototype.reverse;
 
 Object.extend(Array.prototype, {
-  _each: function(iterator) {
-    for (var i = 0, length = this.length; i < length; i++)
-      iterator(this[i]);
-  },
-
-  clear: function() {
-    this.length = 0;
-    return this;
-  },
-
-  first: function() {
-    return this[0];
-  },
-
-  last: function() {
-    return this[this.length - 1];
-  },
-
-  compact: function() {
-    return this.select(function(value) {
-      return value != null;
-    });
-  },
-
-  flatten: function() {
-    return this.inject([], function(array, value) {
-      return array.concat(value && value.constructor == Array ?
-        value.flatten() : [value]);
-    });
-  },
-
-  without: function() {
-    var values = $A(arguments);
-    return this.select(function(value) {
-      return !values.include(value);
-    });
-  },
-
-  indexOf: function(object) {
-    for (var i = 0, length = this.length; i < length; i++)
-      if (this[i] == object) return i;
-    return -1;
-  },
-
-  reverse: function(inline) {
-    return (inline !== false ? this : this.toArray())._reverse();
-  },
-
-  reduce: function() {
-    return this.length > 1 ? this : this[0];
-  },
-
-  uniq: function(sorted) {
-    return this.inject([], function(array, value, index) {
-      if (0 == index || (sorted ? array.last() != value : !array.include(value)))
-        array.push(value);
-      return array;
-    });
-  },
-
-  clone: function() {
-    return [].concat(this);
-  },
-
-  size: function() {
-    return this.length;
-  },
-
-  inspect: function() {
-    return '[' + this.map(Object.inspect).join(', ') + ']';
-  },
-
-  toJSON: function() {
-    var results = [];
-    this.each(function(object) {
-      var value = Object.toJSON(object);
-      if (value !== undefined) results.push(value);
-    });
-    return '[' + results.join(', ') + ']';
-  }
+	_each: function (iterator) {
+		for (var i = 0, length = this.length; i < length; i++)
+			iterator(this[i]);
+	},
+
+	clear: function () {
+		this.length = 0;
+		return this;
+	},
+
+	first: function () {
+		return this[0];
+	},
+
+	last: function () {
+		return this[this.length - 1];
+	},
+
+	compact: function () {
+		return this.select(function (value) {
+			return value != null;
+		});
+	},
+
+	flatten: function () {
+		return this.inject([], function (array, value) {
+			return array.concat(value && value.constructor == Array ?
+				value.flatten() : [value]);
+		});
+	},
+
+	without: function () {
+		var values = $A(arguments);
+		return this.select(function (value) {
+			return !values.include(value);
+		});
+	},
+
+	indexOf: function (object) {
+		for (var i = 0, length = this.length; i < length; i++)
+			if (this[i] == object) return i;
+		return -1;
+	},
+
+	reverse: function (inline) {
+		return (inline !== false ? this : this.toArray())._reverse();
+	},
+
+	reduce: function () {
+		return this.length > 1 ? this : this[0];
+	},
+
+	uniq: function (sorted) {
+		return this.inject([], function (array, value, index) {
+			if (0 == index || (sorted ? array.last() != value : !array.include(value)))
+				array.push(value);
+			return array;
+		});
+	},
+
+	clone: function () {
+		return [].concat(this);
+	},
+
+	size: function () {
+		return this.length;
+	},
+
+	inspect: function () {
+		return '[' + this.map(Object.inspect).join(', ') + ']';
+	},
+
+	toJSON: function () {
+		var results = [];
+		this.each(function (object) {
+			var value = Object.toJSON(object);
+			if (value !== undefined) results.push(value);
+		});
+		return '[' + results.join(', ') + ']';
+	}
 });
 
 Array.prototype.toArray = Array.prototype.clone;
 
 function $w(string) {
-  string = string.strip();
-  return string ? string.split(/\s+/) : [];
+	string = string.strip();
+	return string ? string.split(/\s+/) : [];
 }
 
-if (Prototype.Browser.Opera){
-  Array.prototype.concat = function() {
-    var array = [];
-    for (var i = 0, length = this.length; i < length; i++) array.push(this[i]);
-    for (var i = 0, length = arguments.length; i < length; i++) {
-      if (arguments[i].constructor == Array) {
-        for (var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++)
-          array.push(arguments[i][j]);
-      } else {
-        array.push(arguments[i]);
-      }
-    }
-    return array;
-  }
+if (Prototype.Browser.Opera) {
+	Array.prototype.concat = function () {
+		var array = [];
+		for (var i = 0, length = this.length; i < length; i++) array.push(this[i]);
+		for (var i = 0, length = arguments.length; i < length; i++) {
+			if (arguments[i].constructor == Array) {
+				for (var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++)
+					array.push(arguments[i][j]);
+			} else {
+				array.push(arguments[i]);
+			}
+		}
+		return array;
+	}
 }
-var Hash = function(object) {
-  if (object instanceof Hash) this.merge(object);
-  else Object.extend(this, object || {});
+var Hash = function (object) {
+	if (object instanceof Hash) this.merge(object);
+	else Object.extend(this, object || {});
 };
 
 Object.extend(Hash, {
-  toQueryString: function(obj) {
-    var parts = [];
-    parts.add = arguments.callee.addPair;
-
-    this.prototype._each.call(obj, function(pair) {
-      if (!pair.key) return;
-      var value = pair.value;
-
-      if (value && typeof value == 'object') {
-        if (value.constructor == Array) value.each(function(value) {
-          parts.add(pair.key, value);
-        });
-        return;
-      }
-      parts.add(pair.key, value);
-    });
-
-    return parts.join('&');
-  },
-
-  toJSON: function(object) {
-    var results = [];
-    this.prototype._each.call(object, function(pair) {
-      var value = Object.toJSON(pair.value);
-      if (value !== undefined) results.push(pair.key.toJSON() + ': ' + value);
-    });
-    return '{' + results.join(', ') + '}';
-  }
+	toQueryString: function (obj) {
+		var parts = [];
+		parts.add = arguments.callee.addPair;
+
+		this.prototype._each.call(obj, function (pair) {
+			if (!pair.key) return;
+			var value = pair.value;
+
+			if (value && typeof value == 'object') {
+				if (value.constructor == Array) value.each(function (value) {
+					parts.add(pair.key, value);
+				});
+				return;
+			}
+			parts.add(pair.key, value);
+		});
+
+		return parts.join('&');
+	},
+
+	toJSON: function (object) {
+		var results = [];
+		this.prototype._each.call(object, function (pair) {
+			var value = Object.toJSON(pair.value);
+			if (value !== undefined) results.push(pair.key.toJSON() + ': ' + value);
+		});
+		return '{' + results.join(', ') + '}';
+	}
 });
 
-Hash.toQueryString.addPair = function(key, value, prefix) {
-  key = encodeURIComponent(key);
-  if (value === undefined) this.push(key);
-  else this.push(key + '=' + (value == null ? '' : encodeURIComponent(value)));
+Hash.toQueryString.addPair = function (key, value, prefix) {
+	key = encodeURIComponent(key);
+	if (value === undefined) this.push(key);
+	else this.push(key + '=' + (value == null ? '' : encodeURIComponent(value)));
 }
 
 Object.extend(Hash.prototype, Enumerable);
 Object.extend(Hash.prototype, {
-  _each: function(iterator) {
-    for (var key in this) {
-      var value = this[key];
-      if (value && value == Hash.prototype[key]) continue;
-
-      var pair = [key, value];
-      pair.key = key;
-      pair.value = value;
-      iterator(pair);
-    }
-  },
-
-  keys: function() {
-    return this.pluck('key');
-  },
-
-  values: function() {
-    return this.pluck('value');
-  },
-
-  merge: function(hash) {
-    return $H(hash).inject(this, function(mergedHash, pair) {
-      mergedHash[pair.key] = pair.value;
-      return mergedHash;
-    });
-  },
-
-  remove: function() {
-    var result;
-    for(var i = 0, length = arguments.length; i < length; i++) {
-      var value = this[arguments[i]];
-      if (value !== undefined){
-        if (result === undefined) result = value;
-        else {
-          if (result.constructor != Array) result = [result];
-          result.push(value)
-        }
-      }
-      delete this[arguments[i]];
-    }
-    return result;
-  },
-
-  toQueryString: function() {
-    return Hash.toQueryString(this);
-  },
-
-  inspect: function() {
-    return '#<Hash:{' + this.map(function(pair) {
-      return pair.map(Object.inspect).join(': ');
-    }).join(', ') + '}>';
-  },
-
-  toJSON: function() {
-    return Hash.toJSON(this);
-  }
+	_each: function (iterator) {
+		for (var key in this) {
+			var value = this[key];
+			if (value && value == Hash.prototype[key]) continue;
+
+			var pair = [key, value];
+			pair.key = key;
+			pair.value = value;
+			iterator(pair);
+		}
+	},
+
+	keys: function () {
+		return this.pluck('key');
+	},
+
+	values: function () {
+		return this.pluck('value');
+	},
+
+	merge: function (hash) {
+		return $H(hash).inject(this, function (mergedHash, pair) {
+			mergedHash[pair.key] = pair.value;
+			return mergedHash;
+		});
+	},
+
+	remove: function () {
+		var result;
+		for (var i = 0, length = arguments.length; i < length; i++) {
+			var value = this[arguments[i]];
+			if (value !== undefined) {
+				if (result === undefined) result = value;
+				else {
+					if (result.constructor != Array) result = [result];
+					result.push(value)
+				}
+			}
+			delete this[arguments[i]];
+		}
+		return result;
+	},
+
+	toQueryString: function () {
+		return Hash.toQueryString(this);
+	},
+
+	inspect: function () {
+		return '#<Hash:{' + this.map(function (pair) {
+			return pair.map(Object.inspect).join(': ');
+		}).join(', ') + '}>';
+	},
+
+	toJSON: function () {
+		return Hash.toJSON(this);
+	}
 });
 
 function $H(object) {
-  if (object instanceof Hash) return object;
-  return new Hash(object);
+	if (object instanceof Hash) return object;
+	return new Hash(object);
 };
 
 // Safari iterates over shadowed properties
-if (function() {
-  var i = 0, Test = function(value) { this.key = value };
-  Test.prototype.key = 'foo';
-  for (var property in new Test('bar')) i++;
-  return i > 1;
-}()) Hash.prototype._each = function(iterator) {
-  var cache = [];
-  for (var key in this) {
-    var value = this[key];
-    if ((value && value == Hash.prototype[key]) || cache.include(key)) continue;
-    cache.push(key);
-    var pair = [key, value];
-    pair.key = key;
-    pair.value = value;
-    iterator(pair);
-  }
+if (function () {
+	var i = 0, Test = function (value) {
+		this.key = value
+	};
+	Test.prototype.key = 'foo';
+	for (var property in new Test('bar')) i++;
+	return i > 1;
+}()) Hash.prototype._each = function (iterator) {
+	var cache = [];
+	for (var key in this) {
+		var value = this[key];
+		if ((value && value == Hash.prototype[key]) || cache.include(key)) continue;
+		cache.push(key);
+		var pair = [key, value];
+		pair.key = key;
+		pair.value = value;
+		iterator(pair);
+	}
 };
 ObjectRange = Class.create();
 Object.extend(ObjectRange.prototype, Enumerable);
 Object.extend(ObjectRange.prototype, {
-  initialize: function(start, end, exclusive) {
-    this.start = start;
-    this.end = end;
-    this.exclusive = exclusive;
-  },
-
-  _each: function(iterator) {
-    var value = this.start;
-    while (this.include(value)) {
-      iterator(value);
-      value = value.succ();
-    }
-  },
-
-  include: function(value) {
-    if (value < this.start)
-      return false;
-    if (this.exclusive)
-      return value < this.end;
-    return value <= this.end;
-  }
+	initialize: function (start, end, exclusive) {
+		this.start = start;
+		this.end = end;
+		this.exclusive = exclusive;
+	},
+
+	_each: function (iterator) {
+		var value = this.start;
+		while (this.include(value)) {
+			iterator(value);
+			value = value.succ();
+		}
+	},
+
+	include: function (value) {
+		if (value < this.start)
+			return false;
+		if (this.exclusive)
+			return value < this.end;
+		return value <= this.end;
+	}
 });
 
-var $R = function(start, end, exclusive) {
-  return new ObjectRange(start, end, exclusive);
+var $R = function (start, end, exclusive) {
+	return new ObjectRange(start, end, exclusive);
 }
 
 var Ajax = {
-  getTransport: function() {
-    return Try.these(
-      function() {return new XMLHttpRequest()},
-      function() {return new ActiveXObject('Msxml2.XMLHTTP')},
-      function() {return new ActiveXObject('Microsoft.XMLHTTP')}
-    ) || false;
-  },
-
-  activeRequestCount: 0
+	getTransport: function () {
+		return Try.these(
+			function () {
+				return new XMLHttpRequest()
+			},
+			function () {
+				return new ActiveXObject('Msxml2.XMLHTTP')
+			},
+			function () {
+				return new ActiveXObject('Microsoft.XMLHTTP')
+			}
+		) || false;
+	},
+
+	activeRequestCount: 0
 }
 
 Ajax.Responders = {
-  responders: [],
-
-  _each: function(iterator) {
-    this.responders._each(iterator);
-  },
-
-  register: function(responder) {
-    if (!this.include(responder))
-      this.responders.push(responder);
-  },
-
-  unregister: function(responder) {
-    this.responders = this.responders.without(responder);
-  },
-
-  dispatch: function(callback, request, transport, json) {
-    this.each(function(responder) {
-      if (typeof responder[callback] == 'function') {
-        try {
-          responder[callback].apply(responder, [request, transport, json]);
-        } catch (e) {}
-      }
-    });
-  }
+	responders: [],
+
+	_each: function (iterator) {
+		this.responders._each(iterator);
+	},
+
+	register: function (responder) {
+		if (!this.include(responder))
+			this.responders.push(responder);
+	},
+
+	unregister: function (responder) {
+		this.responders = this.responders.without(responder);
+	},
+
+	dispatch: function (callback, request, transport, json) {
+		this.each(function (responder) {
+			if (typeof responder[callback] == 'function') {
+				try {
+					responder[callback].apply(responder, [request, transport, json]);
+				} catch (e) {
+				}
+			}
+		});
+	}
 };
 
 Object.extend(Ajax.Responders, Enumerable);
 
 Ajax.Responders.register({
-  onCreate: function() {
-    Ajax.activeRequestCount++;
-  },
-  onComplete: function() {
-    Ajax.activeRequestCount--;
-  }
+	onCreate: function () {
+		Ajax.activeRequestCount++;
+	},
+	onComplete: function () {
+		Ajax.activeRequestCount--;
+	}
 });
 
-Ajax.Base = function() {};
+Ajax.Base = function () {
+};
 Ajax.Base.prototype = {
-  setOptions: function(options) {
-    this.options = {
-      method:       'post',
-      asynchronous: true,
-      contentType:  'application/x-www-form-urlencoded',
-      encoding:     'UTF-8',
-      parameters:   ''
-    }
-    Object.extend(this.options, options || {});
-
-    this.options.method = this.options.method.toLowerCase();
-    if (typeof this.options.parameters == 'string')
-      this.options.parameters = this.options.parameters.toQueryParams();
-  }
+	setOptions: function (options) {
+		this.options = {
+			method: 'post',
+			asynchronous: true,
+			contentType: 'application/x-www-form-urlencoded',
+			encoding: 'UTF-8',
+			parameters: ''
+		}
+		Object.extend(this.options, options || {});
+
+		this.options.method = this.options.method.toLowerCase();
+		if (typeof this.options.parameters == 'string')
+			this.options.parameters = this.options.parameters.toQueryParams();
+	}
 }
 
 Ajax.Request = Class.create();
 Ajax.Request.Events =
-  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
+	['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
 
 Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
-  _complete: false,
-
-  initialize: function(url, options) {
-    this.transport = Ajax.getTransport();
-    this.setOptions(options);
-    this.request(url);
-  },
-
-  request: function(url) {
-    this.url = url;
-    this.method = this.options.method;
-    var params = Object.clone(this.options.parameters);
-
-    if (!['get', 'post'].include(this.method)) {
-      // simulate other verbs over post
-      params['_method'] = this.method;
-      this.method = 'post';
-    }
-
-    this.parameters = params;
-
-    if (params = Hash.toQueryString(params)) {
-      // when GET, append parameters to URL
-      if (this.method == 'get' || this.options.postBody)
-        this.url += (this.url.include('?') ? '&' : '?') + params;
-      else if (/Konqueror|Safari|KHTML/.test(navigator.userAgent))
-        params += '&_=';
-    }
-
-    try {
-      if (this.options.onCreate) this.options.onCreate(this.transport);
-      Ajax.Responders.dispatch('onCreate', this, this.transport);
-
-      this.transport.open(this.method.toUpperCase(), this.url,
-        this.options.asynchronous);
-
-      if (this.options.asynchronous)
-        setTimeout(function() { this.respondToReadyState(1) }.bind(this), 10);
-
-      this.transport.onreadystatechange = this.onStateChange.bind(this);
-      this.setRequestHeaders();
-
-      this.body = this.method == 'post' ? (this.options.postBody || params) : null;
-      this.transport.send(this.body);
-
-      /* Force Firefox to handle ready state 4 for synchronous requests */
-      if (!this.options.asynchronous && this.transport.overrideMimeType)
-        this.onStateChange();
-
-    }
-    catch (e) {
-      this.dispatchException(e);
-    }
-  },
-
-  onStateChange: function() {
-    var readyState = this.transport.readyState;
-    if (readyState > 1 && !((readyState == 4) && this._complete))
-      this.respondToReadyState(this.transport.readyState);
-  },
-
-  setRequestHeaders: function() {
-    var headers = {
-      'X-Requested-With': 'XMLHttpRequest',
-      'X-Prototype-Version': Prototype.Version,
-      'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
-    };
-
-    if (this.method == 'post') {
-      headers['Content-type'] = this.options.contentType +
-        (this.options.encoding ? '; charset=' + this.options.encoding : '');
-
-      /* Force "Connection: close" for older Mozilla browsers to work
-       * around a bug where XMLHttpRequest sends an incorrect
-       * Content-length header. See Mozilla Bugzilla #246651.
-       */
-      if (this.transport.overrideMimeType &&
-          (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005)
-            headers['Connection'] = 'close';
-    }
-
-    // user-defined headers
-    if (typeof this.options.requestHeaders == 'object') {
-      var extras = this.options.requestHeaders;
-
-      if (typeof extras.push == 'function')
-        for (var i = 0, length = extras.length; i < length; i += 2)
-          headers[extras[i]] = extras[i+1];
-      else
-        $H(extras).each(function(pair) { headers[pair.key] = pair.value });
-    }
-
-    for (var name in headers)
-      this.transport.setRequestHeader(name, headers[name]);
-  },
-
-  success: function() {
-    return !this.transport.status
-        || (this.transport.status >= 200 && this.transport.status < 300);
-  },
-
-  respondToReadyState: function(readyState) {
-    var state = Ajax.Request.Events[readyState];
-    var transport = this.transport, json = this.evalJSON();
-
-    if (state == 'Complete') {
-      try {
-        this._complete = true;
-        (this.options['on' + this.transport.status]
-         || this.options['on' + (this.success() ? 'Success' : 'Failure')]
-         || Prototype.emptyFunction)(transport, json);
-      } catch (e) {
-        this.dispatchException(e);
-      }
-
-      var contentType = this.getHeader('Content-type');
-      if (contentType && contentType.strip().
-        match(/^(text|application)\/(x-)?(java|ecma)script(;.*)?$/i))
-          this.evalResponse();
-    }
-
-    try {
-      (this.options['on' + state] || Prototype.emptyFunction)(transport, json);
-      Ajax.Responders.dispatch('on' + state, this, transport, json);
-    } catch (e) {
-      this.dispatchException(e);
-    }
-
-    if (state == 'Complete') {
-      // avoid memory leak in MSIE: clean up
-      this.transport.onreadystatechange = Prototype.emptyFunction;
-    }
-  },
-
-  getHeader: function(name) {
-    try {
-      return this.transport.getResponseHeader(name);
-    } catch (e) { return null }
-  },
-
-  evalJSON: function() {
-    try {
-      var json = this.getHeader('X-JSON');
-      return json ? json.evalJSON() : null;
-    } catch (e) { return null }
-  },
-
-  evalResponse: function() {
-    try {
-      return eval((this.transport.responseText || '').unfilterJSON());
-    } catch (e) {
-      this.dispatchException(e);
-    }
-  },
-
-  dispatchException: function(exception) {
-    (this.options.onException || Prototype.emptyFunction)(this, exception);
-    Ajax.Responders.dispatch('onException', this, exception);
-  }
+	_complete: false,
+
+	initialize: function (url, options) {
+		this.transport = Ajax.getTransport();
+		this.setOptions(options);
+		this.request(url);
+	},
+
+	request: function (url) {
+		this.url = url;
+		this.method = this.options.method;
+		var params = Object.clone(this.options.parameters);
+
+		if (!['get', 'post'].include(this.method)) {
+			// simulate other verbs over post
+			params['_method'] = this.method;
+			this.method = 'post';
+		}
+
+		this.parameters = params;
+
+		if (params = Hash.toQueryString(params)) {
+			// when GET, append parameters to URL
+			if (this.method == 'get' || this.options.postBody)
+				this.url += (this.url.include('?') ? '&' : '?') + params;
+			else if (/Konqueror|Safari|KHTML/.test(navigator.userAgent))
+				params += '&_=';
+		}
+
+		try {
+			if (this.options.onCreate) this.options.onCreate(this.transport);
+			Ajax.Responders.dispatch('onCreate', this, this.transport);
+
+			this.transport.open(this.method.toUpperCase(), this.url,
+				this.options.asynchronous);
+
+			if (this.options.asynchronous)
+				setTimeout(function () {
+					this.respondToReadyState(1)
+				}.bind(this), 10);
+
+			this.transport.onreadystatechange = this.onStateChange.bind(this);
+			this.setRequestHeaders();
+
+			this.body = this.method == 'post' ? (this.options.postBody || params) : null;
+			this.transport.send(this.body);
+
+			/* Force Firefox to handle ready state 4 for synchronous requests */
+			if (!this.options.asynchronous && this.transport.overrideMimeType)
+				this.onStateChange();
+
+		} catch (e) {
+			this.dispatchException(e);
+		}
+	},
+
+	onStateChange: function () {
+		var readyState = this.transport.readyState;
+		if (readyState > 1 && !((readyState == 4) && this._complete))
+			this.respondToReadyState(this.transport.readyState);
+	},
+
+	setRequestHeaders: function () {
+		var headers = {
+			'X-Requested-With': 'XMLHttpRequest',
+			'X-Prototype-Version': Prototype.Version,
+			'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
+		};
+
+		if (this.method == 'post') {
+			headers['Content-type'] = this.options.contentType +
+				(this.options.encoding ? '; charset=' + this.options.encoding : '');
+
+			/* Force "Connection: close" for older Mozilla browsers to work
+	   * around a bug where XMLHttpRequest sends an incorrect
+	   * Content-length header. See Mozilla Bugzilla #246651.
+	   */
+			if (this.transport.overrideMimeType &&
+				(navigator.userAgent.match(/Gecko\/(\d{4})/) || [0, 2005])[1] < 2005)
+				headers['Connection'] = 'close';
+		}
+
+		// user-defined headers
+		if (typeof this.options.requestHeaders == 'object') {
+			var extras = this.options.requestHeaders;
+
+			if (typeof extras.push == 'function')
+				for (var i = 0, length = extras.length; i < length; i += 2)
+					headers[extras[i]] = extras[i + 1];
+			else
+				$H(extras).each(function (pair) {
+					headers[pair.key] = pair.value
+				});
+		}
+
+		for (var name in headers)
+			this.transport.setRequestHeader(name, headers[name]);
+	},
+
+	success: function () {
+		return !this.transport.status
+			|| (this.transport.status >= 200 && this.transport.status < 300);
+	},
+
+	respondToReadyState: function (readyState) {
+		var state = Ajax.Request.Events[readyState];
+		var transport = this.transport, json = this.evalJSON();
+
+		if (state == 'Complete') {
+			try {
+				this._complete = true;
+				(this.options['on' + this.transport.status]
+					|| this.options['on' + (this.success() ? 'Success' : 'Failure')]
+					|| Prototype.emptyFunction)(transport, json);
+			} catch (e) {
+				this.dispatchException(e);
+			}
+
+			var contentType = this.getHeader('Content-type');
+			if (contentType && contentType.strip().match(/^(text|application)\/(x-)?(java|ecma)script(;.*)?$/i))
+				this.evalResponse();
+		}
+
+		try {
+			(this.options['on' + state] || Prototype.emptyFunction)(transport, json);
+			Ajax.Responders.dispatch('on' + state, this, transport, json);
+		} catch (e) {
+			this.dispatchException(e);
+		}
+
+		if (state == 'Complete') {
+			// avoid memory leak in MSIE: clean up
+			this.transport.onreadystatechange = Prototype.emptyFunction;
+		}
+	},
+
+	getHeader: function (name) {
+		try {
+			return this.transport.getResponseHeader(name);
+		} catch (e) {
+			return null
+		}
+	},
+
+	evalJSON: function () {
+		try {
+			var json = this.getHeader('X-JSON');
+			return json ? json.evalJSON() : null;
+		} catch (e) {
+			return null
+		}
+	},
+
+	evalResponse: function () {
+		try {
+			return eval((this.transport.responseText || '').unfilterJSON());
+		} catch (e) {
+			this.dispatchException(e);
+		}
+	},
+
+	dispatchException: function (exception) {
+		(this.options.onException || Prototype.emptyFunction)(this, exception);
+		Ajax.Responders.dispatch('onException', this, exception);
+	}
 });
 
 Ajax.Updater = Class.create();
 
 Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), {
-  initialize: function(container, url, options) {
-    this.container = {
-      success: (container.success || container),
-      failure: (container.failure || (container.success ? null : container))
-    }
-
-    this.transport = Ajax.getTransport();
-    this.setOptions(options);
-
-    var onComplete = this.options.onComplete || Prototype.emptyFunction;
-    this.options.onComplete = (function(transport, param) {
-      this.updateContent();
-      onComplete(transport, param);
-    }).bind(this);
-
-    this.request(url);
-  },
-
-  updateContent: function() {
-    var receiver = this.container[this.success() ? 'success' : 'failure'];
-    var response = this.transport.responseText;
-
-    if (!this.options.evalScripts) response = response.stripScripts();
-
-    if (receiver = $(receiver)) {
-      if (this.options.insertion)
-        new this.options.insertion(receiver, response);
-      else
-        receiver.update(response);
-    }
-
-    if (this.success()) {
-      if (this.onComplete)
-        setTimeout(this.onComplete.bind(this), 10);
-    }
-  }
+	initialize: function (container, url, options) {
+		this.container = {
+			success: (container.success || container),
+			failure: (container.failure || (container.success ? null : container))
+		}
+
+		this.transport = Ajax.getTransport();
+		this.setOptions(options);
+
+		var onComplete = this.options.onComplete || Prototype.emptyFunction;
+		this.options.onComplete = (function (transport, param) {
+			this.updateContent();
+			onComplete(transport, param);
+		}).bind(this);
+
+		this.request(url);
+	},
+
+	updateContent: function () {
+		var receiver = this.container[this.success() ? 'success' : 'failure'];
+		var response = this.transport.responseText;
+
+		if (!this.options.evalScripts) response = response.stripScripts();
+
+		if (receiver = $(receiver)) {
+			if (this.options.insertion)
+				new this.options.insertion(receiver, response);
+			else
+				receiver.update(response);
+		}
+
+		if (this.success()) {
+			if (this.onComplete)
+				setTimeout(this.onComplete.bind(this), 10);
+		}
+	}
 });
 
 Ajax.PeriodicalUpdater = Class.create();
 Ajax.PeriodicalUpdater.prototype = Object.extend(new Ajax.Base(), {
-  initialize: function(container, url, options) {
-    this.setOptions(options);
-    this.onComplete = this.options.onComplete;
-
-    this.frequency = (this.options.frequency || 2);
-    this.decay = (this.options.decay || 1);
-
-    this.updater = {};
-    this.container = container;
-    this.url = url;
-
-    this.start();
-  },
-
-  start: function() {
-    this.options.onComplete = this.updateComplete.bind(this);
-    this.onTimerEvent();
-  },
-
-  stop: function() {
-    this.updater.options.onComplete = undefined;
-    clearTimeout(this.timer);
-    (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
-  },
-
-  updateComplete: function(request) {
-    if (this.options.decay) {
-      this.decay = (request.responseText == this.lastText ?
-        this.decay * this.options.decay : 1);
-
-      this.lastText = request.responseText;
-    }
-    this.timer = setTimeout(this.onTimerEvent.bind(this),
-      this.decay * this.frequency * 1000);
-  },
-
-  onTimerEvent: function() {
-    this.updater = new Ajax.Updater(this.container, this.url, this.options);
-  }
+	initialize: function (container, url, options) {
+		this.setOptions(options);
+		this.onComplete = this.options.onComplete;
+
+		this.frequency = (this.options.frequency || 2);
+		this.decay = (this.options.decay || 1);
+
+		this.updater = {};
+		this.container = container;
+		this.url = url;
+
+		this.start();
+	},
+
+	start: function () {
+		this.options.onComplete = this.updateComplete.bind(this);
+		this.onTimerEvent();
+	},
+
+	stop: function () {
+		this.updater.options.onComplete = undefined;
+		clearTimeout(this.timer);
+		(this.onComplete || Prototype.emptyFunction).apply(this, arguments);
+	},
+
+	updateComplete: function (request) {
+		if (this.options.decay) {
+			this.decay = (request.responseText == this.lastText ?
+				this.decay * this.options.decay : 1);
+
+			this.lastText = request.responseText;
+		}
+		this.timer = setTimeout(this.onTimerEvent.bind(this),
+			this.decay * this.frequency * 1000);
+	},
+
+	onTimerEvent: function () {
+		this.updater = new Ajax.Updater(this.container, this.url, this.options);
+	}
 });
+
 function $(element) {
-  if (arguments.length > 1) {
-    for (var i = 0, elements = [], length = arguments.length; i < length; i++)
-      elements.push($(arguments[i]));
-    return elements;
-  }
-  if (typeof element == 'string')
-    element = document.getElementById(element);
-  return Element.extend(element);
+	if (arguments.length > 1) {
+		for (var i = 0, elements = [], length = arguments.length; i < length; i++)
+			elements.push($(arguments[i]));
+		return elements;
+	}
+	if (typeof element == 'string')
+		element = document.getElementById(element);
+	return Element.extend(element);
 }
 
 if (Prototype.BrowserFeatures.XPath) {
-  document._getElementsByXPath = function(expression, parentElement) {
-    var results = [];
-    var query = document.evaluate(expression, $(parentElement) || document,
-      null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-    for (var i = 0, length = query.snapshotLength; i < length; i++)
-      results.push(query.snapshotItem(i));
-    return results;
-  };
-
-  document.getElementsByClassName = function(className, parentElement) {
-    var q = ".//*[contains(concat(' ', @class, ' '), ' " + className + " ')]";
-    return document._getElementsByXPath(q, parentElement);
-  }
-
-} else document.getElementsByClassName = function(className, parentElement) {
-  var children = ($(parentElement) || document.body).getElementsByTagName('*');
-  var elements = [], child;
-  for (var i = 0, length = children.length; i < length; i++) {
-    child = children[i];
-    if (Element.hasClassName(child, className))
-      elements.push(Element.extend(child));
-  }
-  return elements;
+	document._getElementsByXPath = function (expression, parentElement) {
+		var results = [];
+		var query = document.evaluate(expression, $(parentElement) || document,
+			null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+		for (var i = 0, length = query.snapshotLength; i < length; i++)
+			results.push(query.snapshotItem(i));
+		return results;
+	};
+
+	document.getElementsByClassName = function (className, parentElement) {
+		var q = ".//*[contains(concat(' ', @class, ' '), ' " + className + " ')]";
+		return document._getElementsByXPath(q, parentElement);
+	}
+
+} else document.getElementsByClassName = function (className, parentElement) {
+	var children = ($(parentElement) || document.body).getElementsByTagName('*');
+	var elements = [], child;
+	for (var i = 0, length = children.length; i < length; i++) {
+		child = children[i];
+		if (Element.hasClassName(child, className))
+			elements.push(Element.extend(child));
+	}
+	return elements;
 };
 
 /*--------------------------------------------------------------------------*/
 
 if (!window.Element) var Element = {};
 
-Element.extend = function(element) {
-  var F = Prototype.BrowserFeatures;
-  if (!element || !element.tagName || element.nodeType == 3 ||
-   element._extended || F.SpecificElementExtensions || element == window)
-    return element;
+Element.extend = function (element) {
+	var F = Prototype.BrowserFeatures;
+	if (!element || !element.tagName || element.nodeType == 3 ||
+		element._extended || F.SpecificElementExtensions || element == window)
+		return element;
 
-  var methods = {}, tagName = element.tagName, cache = Element.extend.cache,
-   T = Element.Methods.ByTag;
+	var methods = {}, tagName = element.tagName, cache = Element.extend.cache,
+		T = Element.Methods.ByTag;
 
-  // extend methods for all tags (Safari doesn't need this)
-  if (!F.ElementExtensions) {
-    Object.extend(methods, Element.Methods),
-    Object.extend(methods, Element.Methods.Simulated);
-  }
+	// extend methods for all tags (Safari doesn't need this)
+	if (!F.ElementExtensions) {
+		Object.extend(methods, Element.Methods),
+			Object.extend(methods, Element.Methods.Simulated);
+	}
 
-  // extend methods for specific tags
-  if (T[tagName]) Object.extend(methods, T[tagName]);
+	// extend methods for specific tags
+	if (T[tagName]) Object.extend(methods, T[tagName]);
 
-  for (var property in methods) {
-    var value = methods[property];
-    if (typeof value == 'function' && !(property in element))
-      element[property] = cache.findOrStore(value);
-  }
+	for (var property in methods) {
+		var value = methods[property];
+		if (typeof value == 'function' && !(property in element))
+			element[property] = cache.findOrStore(value);
+	}
 
-  element._extended = Prototype.emptyFunction;
-  return element;
+	element._extended = Prototype.emptyFunction;
+	return element;
 };
 
 Element.extend.cache = {
-  findOrStore: function(value) {
-    return this[value] = this[value] || function() {
-      return value.apply(null, [this].concat($A(arguments)));
-    }
-  }
+	findOrStore: function (value) {
+		return this[value] = this[value] || function () {
+			return value.apply(null, [this].concat($A(arguments)));
+		}
+	}
 };
 
 Element.Methods = {
-  visible: function(element) {
-    return $(element).style.display != 'none';
-  },
-
-  toggle: function(element) {
-    element = $(element);
-    Element[Element.visible(element) ? 'hide' : 'show'](element);
-    return element;
-  },
-
-  hide: function(element) {
-    $(element).style.display = 'none';
-    return element;
-  },
-
-  show: function(element) {
-    $(element).style.display = '';
-    return element;
-  },
-
-  remove: function(element) {
-    element = $(element);
-    element.parentNode.removeChild(element);
-    return element;
-  },
-
-  update: function(element, html) {
-    html = typeof html == 'undefined' ? '' : html.toString();
-    $(element).innerHTML = html.stripScripts();
-    setTimeout(function() {html.evalScripts()}, 10);
-    return element;
-  },
-
-  replace: function(element, html) {
-    element = $(element);
-    html = typeof html == 'undefined' ? '' : html.toString();
-    if (element.outerHTML) {
-      element.outerHTML = html.stripScripts();
-    } else {
-      var range = element.ownerDocument.createRange();
-      range.selectNodeContents(element);
-      element.parentNode.replaceChild(
-        range.createContextualFragment(html.stripScripts()), element);
-    }
-    setTimeout(function() {html.evalScripts()}, 10);
-    return element;
-  },
-
-  inspect: function(element) {
-    element = $(element);
-    var result = '<' + element.tagName.toLowerCase();
-    $H({'id': 'id', 'className': 'class'}).each(function(pair) {
-      var property = pair.first(), attribute = pair.last();
-      var value = (element[property] || '').toString();
-      if (value) result += ' ' + attribute + '=' + value.inspect(true);
-    });
-    return result + '>';
-  },
-
-  recursivelyCollect: function(element, property) {
-    element = $(element);
-    var elements = [];
-    while (element = element[property])
-      if (element.nodeType == 1)
-        elements.push(Element.extend(element));
-    return elements;
-  },
-
-  ancestors: function(element) {
-    return $(element).recursivelyCollect('parentNode');
-  },
-
-  descendants: function(element) {
-    return $A($(element).getElementsByTagName('*')).each(Element.extend);
-  },
-
-  firstDescendant: function(element) {
-    element = $(element).firstChild;
-    while (element && element.nodeType != 1) element = element.nextSibling;
-    return $(element);
-  },
-
-  immediateDescendants: function(element) {
-    if (!(element = $(element).firstChild)) return [];
-    while (element && element.nodeType != 1) element = element.nextSibling;
-    if (element) return [element].concat($(element).nextSiblings());
-    return [];
-  },
-
-  previousSiblings: function(element) {
-    return $(element).recursivelyCollect('previousSibling');
-  },
-
-  nextSiblings: function(element) {
-    return $(element).recursivelyCollect('nextSibling');
-  },
-
-  siblings: function(element) {
-    element = $(element);
-    return element.previousSiblings().reverse().concat(element.nextSiblings());
-  },
-
-  match: function(element, selector) {
-    if (typeof selector == 'string')
-      selector = new Selector(selector);
-    return selector.match($(element));
-  },
-
-  up: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return $(element.parentNode);
-    var ancestors = element.ancestors();
-    return expression ? Selector.findElement(ancestors, expression, index) :
-      ancestors[index || 0];
-  },
-
-  down: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return element.firstDescendant();
-    var descendants = element.descendants();
-    return expression ? Selector.findElement(descendants, expression, index) :
-      descendants[index || 0];
-  },
-
-  previous: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return $(Selector.handlers.previousElementSibling(element));
-    var previousSiblings = element.previousSiblings();
-    return expression ? Selector.findElement(previousSiblings, expression, index) :
-      previousSiblings[index || 0];
-  },
-
-  next: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return $(Selector.handlers.nextElementSibling(element));
-    var nextSiblings = element.nextSiblings();
-    return expression ? Selector.findElement(nextSiblings, expression, index) :
-      nextSiblings[index || 0];
-  },
-
-  getElementsBySelector: function() {
-    var args = $A(arguments), element = $(args.shift());
-    return Selector.findChildElements(element, args);
-  },
-
-  getElementsByClassName: function(element, className) {
-    return document.getElementsByClassName(className, element);
-  },
-
-  readAttribute: function(element, name) {
-    element = $(element);
-    if (Prototype.Browser.IE) {
-      if (!element.attributes) return null;
-      var t = Element._attributeTranslations;
-      if (t.values[name]) return t.values[name](element, name);
-      if (t.names[name])  name = t.names[name];
-      var attribute = element.attributes[name];
-      return attribute ? attribute.nodeValue : null;
-    }
-    return element.getAttribute(name);
-  },
-
-  getHeight: function(element) {
-    return $(element).getDimensions().height;
-  },
-
-  getWidth: function(element) {
-    return $(element).getDimensions().width;
-  },
-
-  classNames: function(element) {
-    return new Element.ClassNames(element);
-  },
-
-  hasClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    var elementClassName = element.className;
-    if (elementClassName.length == 0) return false;
-    if (elementClassName == className ||
-    		(typeof(elementClassName.match) === 'function' && elementClassName.match(new RegExp("(^|\\s)" + className + "(\\s|$)"))))
-      return true;
-    return false;
-  },
-
-  addClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    Element.classNames(element).add(className);
-    return element;
-  },
-
-  removeClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    Element.classNames(element).remove(className);
-    return element;
-  },
-
-  toggleClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    Element.classNames(element)[element.hasClassName(className) ? 'remove' : 'add'](className);
-    return element;
-  },
-
-  observe: function() {
-    Event.observe.apply(Event, arguments);
-    return $A(arguments).first();
-  },
-
-  stopObserving: function() {
-    Event.stopObserving.apply(Event, arguments);
-    return $A(arguments).first();
-  },
-
-  // removes whitespace-only text node children
-  cleanWhitespace: function(element) {
-    element = $(element);
-    var node = element.firstChild;
-    while (node) {
-      var nextNode = node.nextSibling;
-      if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
-        element.removeChild(node);
-      node = nextNode;
-    }
-    return element;
-  },
-
-  empty: function(element) {
-    return $(element).innerHTML.blank();
-  },
-
-  descendantOf: function(element, ancestor) {
-    element = $(element), ancestor = $(ancestor);
-    while (element = element.parentNode)
-      if (element == ancestor) return true;
-    return false;
-  },
-
-  scrollTo: function(element) {
-    element = $(element);
-    var pos = Position.cumulativeOffset(element);
-    window.scrollTo(pos[0], pos[1]);
-    return element;
-  },
-
-  getStyle: function(element, style) {
-    element = $(element);
-    style = style == 'float' ? 'cssFloat' : style.camelize();
-    var value = element.style[style];
-    if (!value) {
-      var css = document.defaultView.getComputedStyle(element, null);
-      value = css ? css[style] : null;
-    }
-    if (style == 'opacity') return value ? parseFloat(value) : 1.0;
-    return value == 'auto' ? null : value;
-  },
-
-  getOpacity: function(element) {
-    return $(element).getStyle('opacity');
-  },
-
-  setStyle: function(element, styles, camelized) {
-    element = $(element);
-    var elementStyle = element.style;
-
-    for (var property in styles)
-      if (property == 'opacity') element.setOpacity(styles[property])
-      else
-        elementStyle[(property == 'float' || property == 'cssFloat') ?
-          (elementStyle.styleFloat === undefined ? 'cssFloat' : 'styleFloat') :
-          (camelized ? property : property.camelize())] = styles[property];
-
-    return element;
-  },
-
-  setOpacity: function(element, value) {
-    element = $(element);
-    element.style.opacity = (value == 1 || value === '') ? '' :
-      (value < 0.00001) ? 0 : value;
-    return element;
-  },
-
-  getDimensions: function(element) {
-    element = $(element);
-    var display = $(element).getStyle('display');
-    if (display != 'none' && display != null) // Safari bug
-      return {width: element.offsetWidth, height: element.offsetHeight};
-
-    // All *Width and *Height properties give 0 on elements with display none,
-    // so enable the element temporarily
-    var els = element.style;
-    var originalVisibility = els.visibility;
-    var originalPosition = els.position;
-    var originalDisplay = els.display;
-    els.visibility = 'hidden';
-    els.position = 'absolute';
-    els.display = 'block';
-    var originalWidth = element.clientWidth;
-    var originalHeight = element.clientHeight;
-    els.display = originalDisplay;
-    els.position = originalPosition;
-    els.visibility = originalVisibility;
-    return {width: originalWidth, height: originalHeight};
-  },
-
-  makePositioned: function(element) {
-    element = $(element);
-    var pos = Element.getStyle(element, 'position');
-    if (pos == 'static' || !pos) {
-      element._madePositioned = true;
-      element.style.position = 'relative';
-      // Opera returns the offset relative to the positioning context, when an
-      // element is position relative but top and left have not been defined
-      if (window.opera) {
-        element.style.top = 0;
-        element.style.left = 0;
-      }
-    }
-    return element;
-  },
-
-  undoPositioned: function(element) {
-    element = $(element);
-    if (element._madePositioned) {
-      element._madePositioned = undefined;
-      element.style.position =
-        element.style.top =
-        element.style.left =
-        element.style.bottom =
-        element.style.right = '';
-    }
-    return element;
-  },
-
-  makeClipping: function(element) {
-    element = $(element);
-    if (element._overflow) return element;
-    element._overflow = element.style.overflow || 'auto';
-    if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden')
-      element.style.overflow = 'hidden';
-    return element;
-  },
-
-  undoClipping: function(element) {
-    element = $(element);
-    if (!element._overflow) return element;
-    element.style.overflow = element._overflow == 'auto' ? '' : element._overflow;
-    element._overflow = null;
-    return element;
-  }
+	visible: function (element) {
+		return $(element).style.display != 'none';
+	},
+
+	toggle: function (element) {
+		element = $(element);
+		Element[Element.visible(element) ? 'hide' : 'show'](element);
+		return element;
+	},
+
+	hide: function (element) {
+		$(element).style.display = 'none';
+		return element;
+	},
+
+	show: function (element) {
+		$(element).style.display = '';
+		return element;
+	},
+
+	remove: function (element) {
+		element = $(element);
+		element.parentNode.removeChild(element);
+		return element;
+	},
+
+	update: function (element, html) {
+		html = typeof html == 'undefined' ? '' : html.toString();
+		$(element).innerHTML = html.stripScripts();
+		setTimeout(function () {
+			html.evalScripts()
+		}, 10);
+		return element;
+	},
+
+	replace: function (element, html) {
+		element = $(element);
+		html = typeof html == 'undefined' ? '' : html.toString();
+		if (element.outerHTML) {
+			element.outerHTML = html.stripScripts();
+		} else {
+			var range = element.ownerDocument.createRange();
+			range.selectNodeContents(element);
+			element.parentNode.replaceChild(
+				range.createContextualFragment(html.stripScripts()), element);
+		}
+		setTimeout(function () {
+			html.evalScripts()
+		}, 10);
+		return element;
+	},
+
+	inspect: function (element) {
+		element = $(element);
+		var result = '<' + element.tagName.toLowerCase();
+		$H({'id': 'id', 'className': 'class'}).each(function (pair) {
+			var property = pair.first(), attribute = pair.last();
+			var value = (element[property] || '').toString();
+			if (value) result += ' ' + attribute + '=' + value.inspect(true);
+		});
+		return result + '>';
+	},
+
+	recursivelyCollect: function (element, property) {
+		element = $(element);
+		var elements = [];
+		while (element = element[property])
+			if (element.nodeType == 1)
+				elements.push(Element.extend(element));
+		return elements;
+	},
+
+	ancestors: function (element) {
+		return $(element).recursivelyCollect('parentNode');
+	},
+
+	descendants: function (element) {
+		return $A($(element).getElementsByTagName('*')).each(Element.extend);
+	},
+
+	firstDescendant: function (element) {
+		element = $(element).firstChild;
+		while (element && element.nodeType != 1) element = element.nextSibling;
+		return $(element);
+	},
+
+	immediateDescendants: function (element) {
+		if (!(element = $(element).firstChild)) return [];
+		while (element && element.nodeType != 1) element = element.nextSibling;
+		if (element) return [element].concat($(element).nextSiblings());
+		return [];
+	},
+
+	previousSiblings: function (element) {
+		return $(element).recursivelyCollect('previousSibling');
+	},
+
+	nextSiblings: function (element) {
+		return $(element).recursivelyCollect('nextSibling');
+	},
+
+	siblings: function (element) {
+		element = $(element);
+		return element.previousSiblings().reverse().concat(element.nextSiblings());
+	},
+
+	match: function (element, selector) {
+		if (typeof selector == 'string')
+			selector = new Selector(selector);
+		return selector.match($(element));
+	},
+
+	up: function (element, expression, index) {
+		element = $(element);
+		if (arguments.length == 1) return $(element.parentNode);
+		var ancestors = element.ancestors();
+		return expression ? Selector.findElement(ancestors, expression, index) :
+			ancestors[index || 0];
+	},
+
+	down: function (element, expression, index) {
+		element = $(element);
+		if (arguments.length == 1) return element.firstDescendant();
+		var descendants = element.descendants();
+		return expression ? Selector.findElement(descendants, expression, index) :
+			descendants[index || 0];
+	},
+
+	previous: function (element, expression, index) {
+		element = $(element);
+		if (arguments.length == 1) return $(Selector.handlers.previousElementSibling(element));
+		var previousSiblings = element.previousSiblings();
+		return expression ? Selector.findElement(previousSiblings, expression, index) :
+			previousSiblings[index || 0];
+	},
+
+	next: function (element, expression, index) {
+		element = $(element);
+		if (arguments.length == 1) return $(Selector.handlers.nextElementSibling(element));
+		var nextSiblings = element.nextSiblings();
+		return expression ? Selector.findElement(nextSiblings, expression, index) :
+			nextSiblings[index || 0];
+	},
+
+	getElementsBySelector: function () {
+		var args = $A(arguments), element = $(args.shift());
+		return Selector.findChildElements(element, args);
+	},
+
+	getElementsByClassName: function (element, className) {
+		return document.getElementsByClassName(className, element);
+	},
+
+	readAttribute: function (element, name) {
+		element = $(element);
+		if (Prototype.Browser.IE) {
+			if (!element.attributes) return null;
+			var t = Element._attributeTranslations;
+			if (t.values[name]) return t.values[name](element, name);
+			if (t.names[name]) name = t.names[name];
+			var attribute = element.attributes[name];
+			return attribute ? attribute.nodeValue : null;
+		}
+		return element.getAttribute(name);
+	},
+
+	getHeight: function (element) {
+		return $(element).getDimensions().height;
+	},
+
+	getWidth: function (element) {
+		return $(element).getDimensions().width;
+	},
+
+	classNames: function (element) {
+		return new Element.ClassNames(element);
+	},
+
+	hasClassName: function (element, className) {
+		if (!(element = $(element))) return;
+		var elementClassName = element.className;
+		if (elementClassName.length == 0) return false;
+		if (elementClassName == className ||
+			(typeof (elementClassName.match) === 'function' && elementClassName.match(new RegExp("(^|\\s)" + className + "(\\s|$)"))))
+			return true;
+		return false;
+	},
+
+	addClassName: function (element, className) {
+		if (!(element = $(element))) return;
+		Element.classNames(element).add(className);
+		return element;
+	},
+
+	removeClassName: function (element, className) {
+		if (!(element = $(element))) return;
+		Element.classNames(element).remove(className);
+		return element;
+	},
+
+	toggleClassName: function (element, className) {
+		if (!(element = $(element))) return;
+		Element.classNames(element)[element.hasClassName(className) ? 'remove' : 'add'](className);
+		return element;
+	},
+
+	observe: function () {
+		Event.observe.apply(Event, arguments);
+		return $A(arguments).first();
+	},
+
+	stopObserving: function () {
+		Event.stopObserving.apply(Event, arguments);
+		return $A(arguments).first();
+	},
+
+	// removes whitespace-only text node children
+	cleanWhitespace: function (element) {
+		element = $(element);
+		var node = element.firstChild;
+		while (node) {
+			var nextNode = node.nextSibling;
+			if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
+				element.removeChild(node);
+			node = nextNode;
+		}
+		return element;
+	},
+
+	empty: function (element) {
+		return $(element).innerHTML.blank();
+	},
+
+	descendantOf: function (element, ancestor) {
+		element = $(element), ancestor = $(ancestor);
+		while (element = element.parentNode)
+			if (element == ancestor) return true;
+		return false;
+	},
+
+	scrollTo: function (element) {
+		element = $(element);
+		var pos = Position.cumulativeOffset(element);
+		window.scrollTo(pos[0], pos[1]);
+		return element;
+	},
+
+	getStyle: function (element, style) {
+		element = $(element);
+		style = style == 'float' ? 'cssFloat' : style.camelize();
+		var value = element.style[style];
+		if (!value) {
+			var css = document.defaultView.getComputedStyle(element, null);
+			value = css ? css[style] : null;
+		}
+		if (style == 'opacity') return value ? parseFloat(value) : 1.0;
+		return value == 'auto' ? null : value;
+	},
+
+	getOpacity: function (element) {
+		return $(element).getStyle('opacity');
+	},
+
+	setStyle: function (element, styles, camelized) {
+		element = $(element);
+		var elementStyle = element.style;
+
+		for (var property in styles)
+			if (property == 'opacity') element.setOpacity(styles[property])
+			else
+				elementStyle[(property == 'float' || property == 'cssFloat') ?
+					(elementStyle.styleFloat === undefined ? 'cssFloat' : 'styleFloat') :
+					(camelized ? property : property.camelize())] = styles[property];
+
+		return element;
+	},
+
+	setOpacity: function (element, value) {
+		element = $(element);
+		element.style.opacity = (value == 1 || value === '') ? '' :
+			(value < 0.00001) ? 0 : value;
+		return element;
+	},
+
+	getDimensions: function (element) {
+		element = $(element);
+		var display = $(element).getStyle('display');
+		if (display != 'none' && display != null) // Safari bug
+			return {width: element.offsetWidth, height: element.offsetHeight};
+
+		// All *Width and *Height properties give 0 on elements with display none,
+		// so enable the element temporarily
+		var els = element.style;
+		var originalVisibility = els.visibility;
+		var originalPosition = els.position;
+		var originalDisplay = els.display;
+		els.visibility = 'hidden';
+		els.position = 'absolute';
+		els.display = 'block';
+		var originalWidth = element.clientWidth;
+		var originalHeight = element.clientHeight;
+		els.display = originalDisplay;
+		els.position = originalPosition;
+		els.visibility = originalVisibility;
+		return {width: originalWidth, height: originalHeight};
+	},
+
+	makePositioned: function (element) {
+		element = $(element);
+		var pos = Element.getStyle(element, 'position');
+		if (pos == 'static' || !pos) {
+			element._madePositioned = true;
+			element.style.position = 'relative';
+			// Opera returns the offset relative to the positioning context, when an
+			// element is position relative but top and left have not been defined
+			if (window.opera) {
+				element.style.top = 0;
+				element.style.left = 0;
+			}
+		}
+		return element;
+	},
+
+	undoPositioned: function (element) {
+		element = $(element);
+		if (element._madePositioned) {
+			element._madePositioned = undefined;
+			element.style.position =
+				element.style.top =
+					element.style.left =
+						element.style.bottom =
+							element.style.right = '';
+		}
+		return element;
+	},
+
+	makeClipping: function (element) {
+		element = $(element);
+		if (element._overflow) return element;
+		element._overflow = element.style.overflow || 'auto';
+		if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden')
+			element.style.overflow = 'hidden';
+		return element;
+	},
+
+	undoClipping: function (element) {
+		element = $(element);
+		if (!element._overflow) return element;
+		element.style.overflow = element._overflow == 'auto' ? '' : element._overflow;
+		element._overflow = null;
+		return element;
+	}
 };
 
 Object.extend(Element.Methods, {
-  childOf: Element.Methods.descendantOf,
-  childElements: Element.Methods.immediateDescendants
+	childOf: Element.Methods.descendantOf,
+	childElements: Element.Methods.immediateDescendants
 });
 
 if (Prototype.Browser.Opera) {
-  Element.Methods._getStyle = Element.Methods.getStyle;
-  Element.Methods.getStyle = function(element, style) {
-    switch(style) {
-      case 'left':
-      case 'top':
-      case 'right':
-      case 'bottom':
-        if (Element._getStyle(element, 'position') == 'static') return null;
-      default: return Element._getStyle(element, style);
-    }
-  };
-}
-else if (Prototype.Browser.IE) {
-  Element.Methods.getStyle = function(element, style) {
-    element = $(element);
-    style = (style == 'float' || style == 'cssFloat') ? 'styleFloat' : style.camelize();
-    var value = element.style[style];
-    if (!value && element.currentStyle) value = element.currentStyle[style];
-
-    if (style == 'opacity') {
-      if (value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
-        if (value[1]) return parseFloat(value[1]) / 100;
-      return 1.0;
-    }
-
-    if (value == 'auto') {
-      if ((style == 'width' || style == 'height') && (element.getStyle('display') != 'none'))
-        return element['offset'+style.capitalize()] + 'px';
-      return null;
-    }
-    return value;
-  };
-
-  Element.Methods.setOpacity = function(element, value) {
-    element = $(element);
-    var filter = element.getStyle('filter'), style = element.style;
-    if (value == 1 || value === '') {
-      style.filter = filter.replace(/alpha\([^\)]*\)/gi,'');
-      return element;
-    } else if (value < 0.00001) value = 0;
-    style.filter = filter.replace(/alpha\([^\)]*\)/gi, '') +
-      'alpha(opacity=' + (value * 100) + ')';
-    return element;
-  };
-
-  // IE is missing .innerHTML support for TABLE-related elements
-  Element.Methods.update = function(element, html) {
-    element = $(element);
-    html = typeof html == 'undefined' ? '' : html.toString();
-    var tagName = element.tagName.toUpperCase();
-    if (['THEAD','TBODY','TR','TD'].include(tagName)) {
-      var div = document.createElement('div');
-      switch (tagName) {
-        case 'THEAD':
-        case 'TBODY':
-          div.innerHTML = '<table><tbody>' +  html.stripScripts() + '</tbody></table>';
-          depth = 2;
-          break;
-        case 'TR':
-          div.innerHTML = '<table><tbody><tr>' +  html.stripScripts() + '</tr></tbody></table>';
-          depth = 3;
-          break;
-        case 'TD':
-          div.innerHTML = '<table><tbody><tr><td>' +  html.stripScripts() + '</td></tr></tbody></table>';
-          depth = 4;
-      }
-      $A(element.childNodes).each(function(node) { element.removeChild(node) });
-      depth.times(function() { div = div.firstChild });
-      $A(div.childNodes).each(function(node) { element.appendChild(node) });
-    } else {
-      element.innerHTML = html.stripScripts();
-    }
-    setTimeout(function() { html.evalScripts() }, 10);
-    return element;
-  }
-}
-else if (Prototype.Browser.Gecko) {
-  Element.Methods.setOpacity = function(element, value) {
-    element = $(element);
-    element.style.opacity = (value == 1) ? 0.999999 :
-      (value === '') ? '' : (value < 0.00001) ? 0 : value;
-    return element;
-  };
+	Element.Methods._getStyle = Element.Methods.getStyle;
+	Element.Methods.getStyle = function (element, style) {
+		switch (style) {
+			case 'left':
+			case 'top':
+			case 'right':
+			case 'bottom':
+				if (Element._getStyle(element, 'position') == 'static') return null;
+			default:
+				return Element._getStyle(element, style);
+		}
+	};
+} else if (Prototype.Browser.IE) {
+	Element.Methods.getStyle = function (element, style) {
+		element = $(element);
+		style = (style == 'float' || style == 'cssFloat') ? 'styleFloat' : style.camelize();
+		var value = element.style[style];
+		if (!value && element.currentStyle) value = element.currentStyle[style];
+
+		if (style == 'opacity') {
+			if (value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
+				if (value[1]) return parseFloat(value[1]) / 100;
+			return 1.0;
+		}
+
+		if (value == 'auto') {
+			if ((style == 'width' || style == 'height') && (element.getStyle('display') != 'none'))
+				return element['offset' + style.capitalize()] + 'px';
+			return null;
+		}
+		return value;
+	};
+
+	Element.Methods.setOpacity = function (element, value) {
+		element = $(element);
+		var filter = element.getStyle('filter'), style = element.style;
+		if (value == 1 || value === '') {
+			style.filter = filter.replace(/alpha\([^\)]*\)/gi, '');
+			return element;
+		} else if (value < 0.00001) value = 0;
+		style.filter = filter.replace(/alpha\([^\)]*\)/gi, '') +
+			'alpha(opacity=' + (value * 100) + ')';
+		return element;
+	};
+
+	// IE is missing .innerHTML support for TABLE-related elements
+	Element.Methods.update = function (element, html) {
+		element = $(element);
+		html = typeof html == 'undefined' ? '' : html.toString();
+		var tagName = element.tagName.toUpperCase();
+		if (['THEAD', 'TBODY', 'TR', 'TD'].include(tagName)) {
+			var div = document.createElement('div');
+			switch (tagName) {
+				case 'THEAD':
+				case 'TBODY':
+					div.innerHTML = '<table><tbody>' + html.stripScripts() + '</tbody></table>';
+					depth = 2;
+					break;
+				case 'TR':
+					div.innerHTML = '<table><tbody><tr>' + html.stripScripts() + '</tr></tbody></table>';
+					depth = 3;
+					break;
+				case 'TD':
+					div.innerHTML = '<table><tbody><tr><td>' + html.stripScripts() + '</td></tr></tbody></table>';
+					depth = 4;
+			}
+			$A(element.childNodes).each(function (node) {
+				element.removeChild(node)
+			});
+			depth.times(function () {
+				div = div.firstChild
+			});
+			$A(div.childNodes).each(function (node) {
+				element.appendChild(node)
+			});
+		} else {
+			element.innerHTML = html.stripScripts();
+		}
+		setTimeout(function () {
+			html.evalScripts()
+		}, 10);
+		return element;
+	}
+} else if (Prototype.Browser.Gecko) {
+	Element.Methods.setOpacity = function (element, value) {
+		element = $(element);
+		element.style.opacity = (value == 1) ? 0.999999 :
+			(value === '') ? '' : (value < 0.00001) ? 0 : value;
+		return element;
+	};
 }
 
 Element._attributeTranslations = {
-  names: {
-    colspan:   "colSpan",
-    rowspan:   "rowSpan",
-    valign:    "vAlign",
-    datetime:  "dateTime",
-    accesskey: "accessKey",
-    tabindex:  "tabIndex",
-    enctype:   "encType",
-    maxlength: "maxLength",
-    readonly:  "readOnly",
-    longdesc:  "longDesc"
-  },
-  values: {
-    _getAttr: function(element, attribute) {
-      return element.getAttribute(attribute, 2);
-    },
-    _flag: function(element, attribute) {
-      return $(element).hasAttribute(attribute) ? attribute : null;
-    },
-    style: function(element) {
-      return element.style.cssText.toLowerCase();
-    },
-    title: function(element) {
-      var node = element.getAttributeNode('title');
-      return node.specified ? node.nodeValue : null;
-    }
-  }
+	names: {
+		colspan: "colSpan",
+		rowspan: "rowSpan",
+		valign: "vAlign",
+		datetime: "dateTime",
+		accesskey: "accessKey",
+		tabindex: "tabIndex",
+		enctype: "encType",
+		maxlength: "maxLength",
+		readonly: "readOnly",
+		longdesc: "longDesc"
+	},
+	values: {
+		_getAttr: function (element, attribute) {
+			return element.getAttribute(attribute, 2);
+		},
+		_flag: function (element, attribute) {
+			return $(element).hasAttribute(attribute) ? attribute : null;
+		},
+		style: function (element) {
+			return element.style.cssText.toLowerCase();
+		},
+		title: function (element) {
+			var node = element.getAttributeNode('title');
+			return node.specified ? node.nodeValue : null;
+		}
+	}
 };
 
-(function() {
-  Object.extend(this, {
-    href: this._getAttr,
-    src:  this._getAttr,
-    type: this._getAttr,
-    disabled: this._flag,
-    checked:  this._flag,
-    readonly: this._flag,
-    multiple: this._flag
-  });
+(function () {
+	Object.extend(this, {
+		href: this._getAttr,
+		src: this._getAttr,
+		type: this._getAttr,
+		disabled: this._flag,
+		checked: this._flag,
+		readonly: this._flag,
+		multiple: this._flag
+	});
 }).call(Element._attributeTranslations.values);
 
 Element.Methods.Simulated = {
-  hasAttribute: function(element, attribute) {
-    var t = Element._attributeTranslations, node;
-    attribute = t.names[attribute] || attribute;
-    node = $(element).getAttributeNode(attribute);
-    return node && node.specified;
-  }
+	hasAttribute: function (element, attribute) {
+		var t = Element._attributeTranslations, node;
+		attribute = t.names[attribute] || attribute;
+		node = $(element).getAttributeNode(attribute);
+		return node && node.specified;
+	}
 };
 
 Element.Methods.ByTag = {};
@@ -1818,229 +1858,231 @@ Element.Methods.ByTag = {};
 Object.extend(Element, Element.Methods);
 
 if (!Prototype.BrowserFeatures.ElementExtensions &&
- document.createElement('div').__proto__) {
-  window.HTMLElement = {};
-  window.HTMLElement.prototype = document.createElement('div').__proto__;
-  Prototype.BrowserFeatures.ElementExtensions = true;
+	document.createElement('div').__proto__) {
+	window.HTMLElement = {};
+	window.HTMLElement.prototype = document.createElement('div').__proto__;
+	Prototype.BrowserFeatures.ElementExtensions = true;
 }
 
-Element.hasAttribute = function(element, attribute) {
-  if (element.hasAttribute) return element.hasAttribute(attribute);
-  return Element.Methods.Simulated.hasAttribute(element, attribute);
+Element.hasAttribute = function (element, attribute) {
+	if (element.hasAttribute) return element.hasAttribute(attribute);
+	return Element.Methods.Simulated.hasAttribute(element, attribute);
 };
 
-Element.addMethods = function(methods) {
-  var F = Prototype.BrowserFeatures, T = Element.Methods.ByTag;
-
-  if (!methods) {
-    Object.extend(Form, Form.Methods);
-    Object.extend(Form.Element, Form.Element.Methods);
-    Object.extend(Element.Methods.ByTag, {
-      "FORM":     Object.clone(Form.Methods),
-      "INPUT":    Object.clone(Form.Element.Methods),
-      "SELECT":   Object.clone(Form.Element.Methods),
-      "TEXTAREA": Object.clone(Form.Element.Methods)
-    });
-  }
-
-  if (arguments.length == 2) {
-    var tagName = methods;
-    methods = arguments[1];
-  }
-
-  if (!tagName) Object.extend(Element.Methods, methods || {});
-  else {
-    if (tagName.constructor == Array) tagName.each(extend);
-    else extend(tagName);
-  }
-
-  function extend(tagName) {
-    tagName = tagName.toUpperCase();
-    if (!Element.Methods.ByTag[tagName])
-      Element.Methods.ByTag[tagName] = {};
-    Object.extend(Element.Methods.ByTag[tagName], methods);
-  }
-
-  function copy(methods, destination, onlyIfAbsent) {
-    onlyIfAbsent = onlyIfAbsent || false;
-    var cache = Element.extend.cache;
-    for (var property in methods) {
-      var value = methods[property];
-      if (!onlyIfAbsent || !(property in destination))
-        destination[property] = cache.findOrStore(value);
-    }
-  }
-
-  function findDOMClass(tagName) {
-    var klass;
-    var trans = {
-      "OPTGROUP": "OptGroup", "TEXTAREA": "TextArea", "P": "Paragraph",
-      "FIELDSET": "FieldSet", "UL": "UList", "OL": "OList", "DL": "DList",
-      "DIR": "Directory", "H1": "Heading", "H2": "Heading", "H3": "Heading",
-      "H4": "Heading", "H5": "Heading", "H6": "Heading", "Q": "Quote",
-      "INS": "Mod", "DEL": "Mod", "A": "Anchor", "IMG": "Image", "CAPTION":
-      "TableCaption", "COL": "TableCol", "COLGROUP": "TableCol", "THEAD":
-      "TableSection", "TFOOT": "TableSection", "TBODY": "TableSection", "TR":
-      "TableRow", "TH": "TableCell", "TD": "TableCell", "FRAMESET":
-      "FrameSet", "IFRAME": "IFrame"
-    };
-    if (trans[tagName]) klass = 'HTML' + trans[tagName] + 'Element';
-    if (window[klass]) return window[klass];
-    klass = 'HTML' + tagName + 'Element';
-    if (window[klass]) return window[klass];
-    klass = 'HTML' + tagName.capitalize() + 'Element';
-    if (window[klass]) return window[klass];
-
-    window[klass] = {};
-    window[klass].prototype = document.createElement(tagName).__proto__;
-    return window[klass];
-  }
-
-  if (F.ElementExtensions) {
-    copy(Element.Methods, HTMLElement.prototype);
-    copy(Element.Methods.Simulated, HTMLElement.prototype, true);
-  }
-
-  if (F.SpecificElementExtensions) {
-    for (var tag in Element.Methods.ByTag) {
-      var klass = findDOMClass(tag);
-      if (typeof klass == "undefined") continue;
-      copy(T[tag], klass.prototype);
-    }
-  }
-
-  Object.extend(Element, Element.Methods);
-  delete Element.ByTag;
+Element.addMethods = function (methods) {
+	var F = Prototype.BrowserFeatures, T = Element.Methods.ByTag;
+
+	if (!methods) {
+		Object.extend(Form, Form.Methods);
+		Object.extend(Form.Element, Form.Element.Methods);
+		Object.extend(Element.Methods.ByTag, {
+			"FORM": Object.clone(Form.Methods),
+			"INPUT": Object.clone(Form.Element.Methods),
+			"SELECT": Object.clone(Form.Element.Methods),
+			"TEXTAREA": Object.clone(Form.Element.Methods)
+		});
+	}
+
+	if (arguments.length == 2) {
+		var tagName = methods;
+		methods = arguments[1];
+	}
+
+	if (!tagName) Object.extend(Element.Methods, methods || {});
+	else {
+		if (tagName.constructor == Array) tagName.each(extend);
+		else extend(tagName);
+	}
+
+	function extend(tagName) {
+		tagName = tagName.toUpperCase();
+		if (!Element.Methods.ByTag[tagName])
+			Element.Methods.ByTag[tagName] = {};
+		Object.extend(Element.Methods.ByTag[tagName], methods);
+	}
+
+	function copy(methods, destination, onlyIfAbsent) {
+		onlyIfAbsent = onlyIfAbsent || false;
+		var cache = Element.extend.cache;
+		for (var property in methods) {
+			var value = methods[property];
+			if (!onlyIfAbsent || !(property in destination))
+				destination[property] = cache.findOrStore(value);
+		}
+	}
+
+	function findDOMClass(tagName) {
+		var klass;
+		var trans = {
+			"OPTGROUP": "OptGroup", "TEXTAREA": "TextArea", "P": "Paragraph",
+			"FIELDSET": "FieldSet", "UL": "UList", "OL": "OList", "DL": "DList",
+			"DIR": "Directory", "H1": "Heading", "H2": "Heading", "H3": "Heading",
+			"H4": "Heading", "H5": "Heading", "H6": "Heading", "Q": "Quote",
+			"INS": "Mod", "DEL": "Mod", "A": "Anchor", "IMG": "Image", "CAPTION":
+				"TableCaption", "COL": "TableCol", "COLGROUP": "TableCol", "THEAD":
+				"TableSection", "TFOOT": "TableSection", "TBODY": "TableSection", "TR":
+				"TableRow", "TH": "TableCell", "TD": "TableCell", "FRAMESET":
+				"FrameSet", "IFRAME": "IFrame"
+		};
+		if (trans[tagName]) klass = 'HTML' + trans[tagName] + 'Element';
+		if (window[klass]) return window[klass];
+		klass = 'HTML' + tagName + 'Element';
+		if (window[klass]) return window[klass];
+		klass = 'HTML' + tagName.capitalize() + 'Element';
+		if (window[klass]) return window[klass];
+
+		window[klass] = {};
+		window[klass].prototype = document.createElement(tagName).__proto__;
+		return window[klass];
+	}
+
+	if (F.ElementExtensions) {
+		copy(Element.Methods, HTMLElement.prototype);
+		copy(Element.Methods.Simulated, HTMLElement.prototype, true);
+	}
+
+	if (F.SpecificElementExtensions) {
+		for (var tag in Element.Methods.ByTag) {
+			var klass = findDOMClass(tag);
+			if (typeof klass == "undefined") continue;
+			copy(T[tag], klass.prototype);
+		}
+	}
+
+	Object.extend(Element, Element.Methods);
+	delete Element.ByTag;
 };
 
-var Toggle = { display: Element.toggle };
+var Toggle = {display: Element.toggle};
 
 /*--------------------------------------------------------------------------*/
 
-Abstract.Insertion = function(adjacency) {
-  this.adjacency = adjacency;
+Abstract.Insertion = function (adjacency) {
+	this.adjacency = adjacency;
 }
 
 Abstract.Insertion.prototype = {
-  initialize: function(element, content) {
-    this.element = $(element);
-    this.content = content.stripScripts();
-
-    if (this.adjacency && this.element.insertAdjacentHTML) {
-      try {
-        this.element.insertAdjacentHTML(this.adjacency, this.content);
-      } catch (e) {
-        var tagName = this.element.tagName.toUpperCase();
-        if (['TBODY', 'TR'].include(tagName)) {
-          this.insertContent(this.contentFromAnonymousTable());
-        } else {
-          throw e;
-        }
-      }
-    } else {
-      this.range = this.element.ownerDocument.createRange();
-      if (this.initializeRange) this.initializeRange();
-      this.insertContent([this.range.createContextualFragment(this.content)]);
-    }
-
-    setTimeout(function() {content.evalScripts()}, 10);
-  },
-
-  contentFromAnonymousTable: function() {
-    var div = document.createElement('div');
-    div.innerHTML = '<table><tbody>' + this.content + '</tbody></table>';
-    return $A(div.childNodes[0].childNodes[0].childNodes);
-  }
+	initialize: function (element, content) {
+		this.element = $(element);
+		this.content = content.stripScripts();
+
+		if (this.adjacency && this.element.insertAdjacentHTML) {
+			try {
+				this.element.insertAdjacentHTML(this.adjacency, this.content);
+			} catch (e) {
+				var tagName = this.element.tagName.toUpperCase();
+				if (['TBODY', 'TR'].include(tagName)) {
+					this.insertContent(this.contentFromAnonymousTable());
+				} else {
+					throw e;
+				}
+			}
+		} else {
+			this.range = this.element.ownerDocument.createRange();
+			if (this.initializeRange) this.initializeRange();
+			this.insertContent([this.range.createContextualFragment(this.content)]);
+		}
+
+		setTimeout(function () {
+			content.evalScripts()
+		}, 10);
+	},
+
+	contentFromAnonymousTable: function () {
+		var div = document.createElement('div');
+		div.innerHTML = '<table><tbody>' + this.content + '</tbody></table>';
+		return $A(div.childNodes[0].childNodes[0].childNodes);
+	}
 }
 
 var Insertion = new Object();
 
 Insertion.Before = Class.create();
 Insertion.Before.prototype = Object.extend(new Abstract.Insertion('beforeBegin'), {
-  initializeRange: function() {
-    this.range.setStartBefore(this.element);
-  },
-
-  insertContent: function(fragments) {
-    fragments.each((function(fragment) {
-      this.element.parentNode.insertBefore(fragment, this.element);
-    }).bind(this));
-  }
+	initializeRange: function () {
+		this.range.setStartBefore(this.element);
+	},
+
+	insertContent: function (fragments) {
+		fragments.each((function (fragment) {
+			this.element.parentNode.insertBefore(fragment, this.element);
+		}).bind(this));
+	}
 });
 
 Insertion.Top = Class.create();
 Insertion.Top.prototype = Object.extend(new Abstract.Insertion('afterBegin'), {
-  initializeRange: function() {
-    this.range.selectNodeContents(this.element);
-    this.range.collapse(true);
-  },
-
-  insertContent: function(fragments) {
-    fragments.reverse(false).each((function(fragment) {
-      this.element.insertBefore(fragment, this.element.firstChild);
-    }).bind(this));
-  }
+	initializeRange: function () {
+		this.range.selectNodeContents(this.element);
+		this.range.collapse(true);
+	},
+
+	insertContent: function (fragments) {
+		fragments.reverse(false).each((function (fragment) {
+			this.element.insertBefore(fragment, this.element.firstChild);
+		}).bind(this));
+	}
 });
 
 Insertion.Bottom = Class.create();
 Insertion.Bottom.prototype = Object.extend(new Abstract.Insertion('beforeEnd'), {
-  initializeRange: function() {
-    this.range.selectNodeContents(this.element);
-    this.range.collapse(this.element);
-  },
-
-  insertContent: function(fragments) {
-    fragments.each((function(fragment) {
-      this.element.appendChild(fragment);
-    }).bind(this));
-  }
+	initializeRange: function () {
+		this.range.selectNodeContents(this.element);
+		this.range.collapse(this.element);
+	},
+
+	insertContent: function (fragments) {
+		fragments.each((function (fragment) {
+			this.element.appendChild(fragment);
+		}).bind(this));
+	}
 });
 
 Insertion.After = Class.create();
 Insertion.After.prototype = Object.extend(new Abstract.Insertion('afterEnd'), {
-  initializeRange: function() {
-    this.range.setStartAfter(this.element);
-  },
-
-  insertContent: function(fragments) {
-    fragments.each((function(fragment) {
-      this.element.parentNode.insertBefore(fragment,
-        this.element.nextSibling);
-    }).bind(this));
-  }
+	initializeRange: function () {
+		this.range.setStartAfter(this.element);
+	},
+
+	insertContent: function (fragments) {
+		fragments.each((function (fragment) {
+			this.element.parentNode.insertBefore(fragment,
+				this.element.nextSibling);
+		}).bind(this));
+	}
 });
 
 /*--------------------------------------------------------------------------*/
 
 Element.ClassNames = Class.create();
 Element.ClassNames.prototype = {
-  initialize: function(element) {
-    this.element = $(element);
-  },
-
-  _each: function(iterator) {
-    this.element.className.split(/\s+/).select(function(name) {
-      return name.length > 0;
-    })._each(iterator);
-  },
-
-  set: function(className) {
-    this.element.className = className;
-  },
-
-  add: function(classNameToAdd) {
-    if (this.include(classNameToAdd)) return;
-    this.set($A(this).concat(classNameToAdd).join(' '));
-  },
-
-  remove: function(classNameToRemove) {
-    if (!this.include(classNameToRemove)) return;
-    this.set($A(this).without(classNameToRemove).join(' '));
-  },
-
-  toString: function() {
-    return $A(this).join(' ');
-  }
+	initialize: function (element) {
+		this.element = $(element);
+	},
+
+	_each: function (iterator) {
+		this.element.className.split(/\s+/).select(function (name) {
+			return name.length > 0;
+		})._each(iterator);
+	},
+
+	set: function (className) {
+		this.element.className = className;
+	},
+
+	add: function (classNameToAdd) {
+		if (this.include(classNameToAdd)) return;
+		this.set($A(this).concat(classNameToAdd).join(' '));
+	},
+
+	remove: function (classNameToRemove) {
+		if (!this.include(classNameToRemove)) return;
+		this.set($A(this).without(classNameToRemove).join(' '));
+	},
+
+	toString: function () {
+		return $A(this).join(' ');
+	}
 };
 
 Object.extend(Element.ClassNames.prototype, Enumerable);
@@ -2051,736 +2093,758 @@ Object.extend(Element.ClassNames.prototype, Enumerable);
 var Selector = Class.create();
 
 Selector.prototype = {
-  initialize: function(expression) {
-    this.expression = expression.strip();
-    this.compileMatcher();
-  },
-
-  compileMatcher: function() {
-    // Selectors with namespaced attributes can't use the XPath version
-    if (Prototype.BrowserFeatures.XPath && !(/\[[\w-]*?:/).test(this.expression))
-      return this.compileXPathMatcher();
-
-    var e = this.expression, ps = Selector.patterns, h = Selector.handlers,
-        c = Selector.criteria, le, p, m;
-
-    if (Selector._cache[e]) {
-      this.matcher = Selector._cache[e]; return;
-    }
-    this.matcher = ["this.matcher = function(root) {",
-                    "var r = root, h = Selector.handlers, c = false, n;"];
-
-    while (e && le != e && (/\S/).test(e)) {
-      le = e;
-      for (var i in ps) {
-        p = ps[i];
-        if (m = e.match(p)) {
-          this.matcher.push(typeof c[i] == 'function' ? c[i](m) :
-    	      new Template(c[i]).evaluate(m));
-          e = e.replace(m[0], '');
-          break;
-        }
-      }
-    }
-
-    this.matcher.push("return h.unique(n);\n}");
-    eval(this.matcher.join('\n'));
-    Selector._cache[this.expression] = this.matcher;
-  },
-
-  compileXPathMatcher: function() {
-    var e = this.expression, ps = Selector.patterns,
-        x = Selector.xpath, le,  m;
-
-    if (Selector._cache[e]) {
-      this.xpath = Selector._cache[e]; return;
-    }
-
-    this.matcher = ['.//*'];
-    while (e && le != e && (/\S/).test(e)) {
-      le = e;
-      for (var i in ps) {
-        if (m = e.match(ps[i])) {
-          this.matcher.push(typeof x[i] == 'function' ? x[i](m) :
-            new Template(x[i]).evaluate(m));
-          e = e.replace(m[0], '');
-          break;
-        }
-      }
-    }
-
-    this.xpath = this.matcher.join('');
-    Selector._cache[this.expression] = this.xpath;
-  },
-
-  findElements: function(root) {
-    root = root || document;
-    if (this.xpath) return document._getElementsByXPath(this.xpath, root);
-    return this.matcher(root);
-  },
-
-  match: function(element) {
-    return this.findElements(document).include(element);
-  },
-
-  toString: function() {
-    return this.expression;
-  },
-
-  inspect: function() {
-    return "#<Selector:" + this.expression.inspect() + ">";
-  }
+	initialize: function (expression) {
+		this.expression = expression.strip();
+		this.compileMatcher();
+	},
+
+	compileMatcher: function () {
+		// Selectors with namespaced attributes can't use the XPath version
+		if (Prototype.BrowserFeatures.XPath && !(/\[[\w-]*?:/).test(this.expression))
+			return this.compileXPathMatcher();
+
+		var e = this.expression, ps = Selector.patterns, h = Selector.handlers,
+			c = Selector.criteria, le, p, m;
+
+		if (Selector._cache[e]) {
+			this.matcher = Selector._cache[e];
+			return;
+		}
+		this.matcher = ["this.matcher = function(root) {",
+			"var r = root, h = Selector.handlers, c = false, n;"];
+
+		while (e && le != e && (/\S/).test(e)) {
+			le = e;
+			for (var i in ps) {
+				p = ps[i];
+				if (m = e.match(p)) {
+					this.matcher.push(typeof c[i] == 'function' ? c[i](m) :
+						new Template(c[i]).evaluate(m));
+					e = e.replace(m[0], '');
+					break;
+				}
+			}
+		}
+
+		this.matcher.push("return h.unique(n);\n}");
+		eval(this.matcher.join('\n'));
+		Selector._cache[this.expression] = this.matcher;
+	},
+
+	compileXPathMatcher: function () {
+		var e = this.expression, ps = Selector.patterns,
+			x = Selector.xpath, le, m;
+
+		if (Selector._cache[e]) {
+			this.xpath = Selector._cache[e];
+			return;
+		}
+
+		this.matcher = ['.//*'];
+		while (e && le != e && (/\S/).test(e)) {
+			le = e;
+			for (var i in ps) {
+				if (m = e.match(ps[i])) {
+					this.matcher.push(typeof x[i] == 'function' ? x[i](m) :
+						new Template(x[i]).evaluate(m));
+					e = e.replace(m[0], '');
+					break;
+				}
+			}
+		}
+
+		this.xpath = this.matcher.join('');
+		Selector._cache[this.expression] = this.xpath;
+	},
+
+	findElements: function (root) {
+		root = root || document;
+		if (this.xpath) return document._getElementsByXPath(this.xpath, root);
+		return this.matcher(root);
+	},
+
+	match: function (element) {
+		return this.findElements(document).include(element);
+	},
+
+	toString: function () {
+		return this.expression;
+	},
+
+	inspect: function () {
+		return "#<Selector:" + this.expression.inspect() + ">";
+	}
 };
 
 Object.extend(Selector, {
-  _cache: {},
-
-  xpath: {
-    descendant:   "//*",
-    child:        "/*",
-    adjacent:     "/following-sibling::*[1]",
-    laterSibling: '/following-sibling::*',
-    tagName:      function(m) {
-      if (m[1] == '*') return '';
-      return "[local-name()='" + m[1].toLowerCase() +
-             "' or local-name()='" + m[1].toUpperCase() + "']";
-    },
-    className:    "[contains(concat(' ', @class, ' '), ' #{1} ')]",
-    id:           "[@id='#{1}']",
-    attrPresence: "[@#{1}]",
-    attr: function(m) {
-      m[3] = m[5] || m[6];
-      return new Template(Selector.xpath.operators[m[2]]).evaluate(m);
-    },
-    pseudo: function(m) {
-      var h = Selector.xpath.pseudos[m[1]];
-      if (!h) return '';
-      if (typeof h === 'function') return h(m);
-      return new Template(Selector.xpath.pseudos[m[1]]).evaluate(m);
-    },
-    operators: {
-      '=':  "[@#{1}='#{3}']",
-      '!=': "[@#{1}!='#{3}']",
-      '^=': "[starts-with(@#{1}, '#{3}')]",
-      '$=': "[substring(@#{1}, (string-length(@#{1}) - string-length('#{3}') + 1))='#{3}']",
-      '*=': "[contains(@#{1}, '#{3}')]",
-      '~=': "[contains(concat(' ', @#{1}, ' '), ' #{3} ')]",
-      '|=': "[contains(concat('-', @#{1}, '-'), '-#{3}-')]"
-    },
-    pseudos: {
-      'first-child': '[not(preceding-sibling::*)]',
-      'last-child':  '[not(following-sibling::*)]',
-      'only-child':  '[not(preceding-sibling::* or following-sibling::*)]',
-      'empty':       "[count(*) = 0 and (count(text()) = 0 or translate(text(), ' \t\r\n', '') = '')]",
-      'checked':     "[@checked]",
-      'disabled':    "[@disabled]",
-      'enabled':     "[not(@disabled)]",
-      'not': function(m) {
-        var e = m[6], p = Selector.patterns,
-            x = Selector.xpath, le, m, v;
-
-        var exclusion = [];
-        while (e && le != e && (/\S/).test(e)) {
-          le = e;
-          for (var i in p) {
-            if (m = e.match(p[i])) {
-              v = typeof x[i] == 'function' ? x[i](m) : new Template(x[i]).evaluate(m);
-              exclusion.push("(" + v.substring(1, v.length - 1) + ")");
-              e = e.replace(m[0], '');
-              break;
-            }
-          }
-        }
-        return "[not(" + exclusion.join(" and ") + ")]";
-      },
-      'nth-child':      function(m) {
-        return Selector.xpath.pseudos.nth("(count(./preceding-sibling::*) + 1) ", m);
-      },
-      'nth-last-child': function(m) {
-        return Selector.xpath.pseudos.nth("(count(./following-sibling::*) + 1) ", m);
-      },
-      'nth-of-type':    function(m) {
-        return Selector.xpath.pseudos.nth("position() ", m);
-      },
-      'nth-last-of-type': function(m) {
-        return Selector.xpath.pseudos.nth("(last() + 1 - position()) ", m);
-      },
-      'first-of-type':  function(m) {
-        m[6] = "1"; return Selector.xpath.pseudos['nth-of-type'](m);
-      },
-      'last-of-type':   function(m) {
-        m[6] = "1"; return Selector.xpath.pseudos['nth-last-of-type'](m);
-      },
-      'only-of-type':   function(m) {
-        var p = Selector.xpath.pseudos; return p['first-of-type'](m) + p['last-of-type'](m);
-      },
-      nth: function(fragment, m) {
-        var mm, formula = m[6], predicate;
-        if (formula == 'even') formula = '2n+0';
-        if (formula == 'odd')  formula = '2n+1';
-        if (mm = formula.match(/^(\d+)$/)) // digit only
-          return '[' + fragment + "= " + mm[1] + ']';
-        if (mm = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
-          if (mm[1] == "-") mm[1] = -1;
-          var a = mm[1] ? Number(mm[1]) : 1;
-          var b = mm[2] ? Number(mm[2]) : 0;
-          predicate = "[((#{fragment} - #{b}) mod #{a} = 0) and " +
-          "((#{fragment} - #{b}) div #{a} >= 0)]";
-          return new Template(predicate).evaluate({
-            fragment: fragment, a: a, b: b });
-        }
-      }
-    }
-  },
-
-  criteria: {
-    tagName:      'n = h.tagName(n, r, "#{1}", c);   c = false;',
-    className:    'n = h.className(n, r, "#{1}", c); c = false;',
-    id:           'n = h.id(n, r, "#{1}", c);        c = false;',
-    attrPresence: 'n = h.attrPresence(n, r, "#{1}"); c = false;',
-    attr: function(m) {
-      m[3] = (m[5] || m[6]);
-      return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}"); c = false;').evaluate(m);
-    },
-    pseudo:       function(m) {
-      if (m[6]) m[6] = m[6].replace(/"/g, '\\"');
-      return new Template('n = h.pseudo(n, "#{1}", "#{6}", r, c); c = false;').evaluate(m);
-    },
-    descendant:   'c = "descendant";',
-    child:        'c = "child";',
-    adjacent:     'c = "adjacent";',
-    laterSibling: 'c = "laterSibling";'
-  },
-
-  patterns: {
-    // combinators must be listed first
-    // (and descendant needs to be last combinator)
-    laterSibling: /^\s*~\s*/,
-    child:        /^\s*>\s*/,
-    adjacent:     /^\s*\+\s*/,
-    descendant:   /^\s/,
-
-    // selectors follow
-    tagName:      /^\s*(\*|[\w\-]+)(\b|$)?/,
-    id:           /^#([\w\-\*]+)(\b|$)/,
-    className:    /^\.([\w\-\*]+)(\b|$)/,
-    pseudo:       /^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|\s|(?=:))/,
-    attrPresence: /^\[([\w]+)\]/,
-    attr:         /\[((?:[\w-]*:)?[\w-]+)\s*(?:([!^$*~|]?=)\s*((['"])([^\]]*?)\4|([^'"][^\]]*?)))?\]/
-  },
-
-  handlers: {
-    // UTILITY FUNCTIONS
-    // joins two collections
-    concat: function(a, b) {
-      for (var i = 0, node; node = b[i]; i++)
-        a.push(node);
-      return a;
-    },
-
-    // marks an array of nodes for counting
-    mark: function(nodes) {
-      for (var i = 0, node; node = nodes[i]; i++)
-        node._counted = true;
-      return nodes;
-    },
-
-    unmark: function(nodes) {
-      for (var i = 0, node; node = nodes[i]; i++)
-        node._counted = undefined;
-      return nodes;
-    },
-
-    // mark each child node with its position (for nth calls)
-    // "ofType" flag indicates whether we're indexing for nth-of-type
-    // rather than nth-child
-    index: function(parentNode, reverse, ofType) {
-      parentNode._counted = true;
-      if (reverse) {
-        for (var nodes = parentNode.childNodes, i = nodes.length - 1, j = 1; i >= 0; i--) {
-          node = nodes[i];
-          if (node.nodeType == 1 && (!ofType || node._counted)) node.nodeIndex = j++;
-        }
-      } else {
-        for (var i = 0, j = 1, nodes = parentNode.childNodes; node = nodes[i]; i++)
-          if (node.nodeType == 1 && (!ofType || node._counted)) node.nodeIndex = j++;
-      }
-    },
-
-    // filters out duplicates and extends all nodes
-    unique: function(nodes) {
-      if (nodes.length == 0) return nodes;
-      var results = [], n;
-      for (var i = 0, l = nodes.length; i < l; i++)
-        if (!(n = nodes[i])._counted) {
-          n._counted = true;
-          results.push(Element.extend(n));
-        }
-      return Selector.handlers.unmark(results);
-    },
-
-    // COMBINATOR FUNCTIONS
-    descendant: function(nodes) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        h.concat(results, node.getElementsByTagName('*'));
-      return results;
-    },
-
-    child: function(nodes) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        for (var j = 0, children = [], child; child = node.childNodes[j]; j++)
-          if (child.nodeType == 1 && child.tagName != '!') results.push(child);
-      }
-      return results;
-    },
-
-    adjacent: function(nodes) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        var next = this.nextElementSibling(node);
-        if (next) results.push(next);
-      }
-      return results;
-    },
-
-    laterSibling: function(nodes) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        h.concat(results, Element.nextSiblings(node));
-      return results;
-    },
-
-    nextElementSibling: function(node) {
-      while (node = node.nextSibling)
-	      if (node.nodeType == 1) return node;
-      return null;
-    },
-
-    previousElementSibling: function(node) {
-      while (node = node.previousSibling)
-        if (node.nodeType == 1) return node;
-      return null;
-    },
-
-    // TOKEN FUNCTIONS
-    tagName: function(nodes, root, tagName, combinator) {
-      tagName = tagName.toUpperCase();
-      var results = [], h = Selector.handlers;
-      if (nodes) {
-        if (combinator) {
-          // fastlane for ordinary descendant combinators
-          if (combinator == "descendant") {
-            for (var i = 0, node; node = nodes[i]; i++)
-              h.concat(results, node.getElementsByTagName(tagName));
-            return results;
-          } else nodes = this[combinator](nodes);
-          if (tagName == "*") return nodes;
-        }
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node.tagName.toUpperCase() == tagName) results.push(node);
-        return results;
-      } else return root.getElementsByTagName(tagName);
-    },
-
-    id: function(nodes, root, id, combinator) {
-      var targetNode = $(id), h = Selector.handlers;
-      if (!nodes && root == document) return targetNode ? [targetNode] : [];
-      if (nodes) {
-        if (combinator) {
-          if (combinator == 'child') {
-            for (var i = 0, node; node = nodes[i]; i++)
-              if (targetNode.parentNode == node) return [targetNode];
-          } else if (combinator == 'descendant') {
-            for (var i = 0, node; node = nodes[i]; i++)
-              if (Element.descendantOf(targetNode, node)) return [targetNode];
-          } else if (combinator == 'adjacent') {
-            for (var i = 0, node; node = nodes[i]; i++)
-              if (Selector.handlers.previousElementSibling(targetNode) == node)
-                return [targetNode];
-          } else nodes = h[combinator](nodes);
-        }
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node == targetNode) return [targetNode];
-        return [];
-      }
-      return (targetNode && Element.descendantOf(targetNode, root)) ? [targetNode] : [];
-    },
-
-    className: function(nodes, root, className, combinator) {
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      return Selector.handlers.byClassName(nodes, root, className);
-    },
-
-    byClassName: function(nodes, root, className) {
-      if (!nodes) nodes = Selector.handlers.descendant([root]);
-      var needle = ' ' + className + ' ';
-      for (var i = 0, results = [], node, nodeClassName; node = nodes[i]; i++) {
-        nodeClassName = node.className;
-        if (nodeClassName.length == 0) continue;
-        if (nodeClassName == className || (' ' + nodeClassName + ' ').include(needle))
-          results.push(node);
-      }
-      return results;
-    },
-
-    attrPresence: function(nodes, root, attr) {
-      var results = [];
-      for (var i = 0, node; node = nodes[i]; i++)
-        if (Element.hasAttribute(node, attr)) results.push(node);
-      return results;
-    },
-
-    attr: function(nodes, root, attr, value, operator) {
-      if (!nodes) nodes = root.getElementsByTagName("*");
-      var handler = Selector.operators[operator], results = [];
-      for (var i = 0, node; node = nodes[i]; i++) {
-        var nodeValue = Element.readAttribute(node, attr);
-        if (nodeValue === null) continue;
-        if (handler(nodeValue, value)) results.push(node);
-      }
-      return results;
-    },
-
-    pseudo: function(nodes, name, value, root, combinator) {
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      if (!nodes) nodes = root.getElementsByTagName("*");
-      return Selector.pseudos[name](nodes, value, root);
-    }
-  },
-
-  pseudos: {
-    'first-child': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        if (Selector.handlers.previousElementSibling(node)) continue;
-          results.push(node);
-      }
-      return results;
-    },
-    'last-child': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        if (Selector.handlers.nextElementSibling(node)) continue;
-          results.push(node);
-      }
-      return results;
-    },
-    'only-child': function(nodes, value, root) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (!h.previousElementSibling(node) && !h.nextElementSibling(node))
-          results.push(node);
-      return results;
-    },
-    'nth-child':        function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root);
-    },
-    'nth-last-child':   function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root, true);
-    },
-    'nth-of-type':      function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root, false, true);
-    },
-    'nth-last-of-type': function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root, true, true);
-    },
-    'first-of-type':    function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, "1", root, false, true);
-    },
-    'last-of-type':     function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, "1", root, true, true);
-    },
-    'only-of-type':     function(nodes, formula, root) {
-      var p = Selector.pseudos;
-      return p['last-of-type'](p['first-of-type'](nodes, formula, root), formula, root);
-    },
-
-    // handles the an+b logic
-    getIndices: function(a, b, total) {
-      if (a == 0) return b > 0 ? [b] : [];
-      return $R(1, total).inject([], function(memo, i) {
-        if (0 == (i - b) % a && (i - b) / a >= 0) memo.push(i);
-        return memo;
-      });
-    },
-
-    // handles nth(-last)-child, nth(-last)-of-type, and (first|last)-of-type
-    nth: function(nodes, formula, root, reverse, ofType) {
-      if (nodes.length == 0) return [];
-      if (formula == 'even') formula = '2n+0';
-      if (formula == 'odd')  formula = '2n+1';
-      var h = Selector.handlers, results = [], indexed = [], m;
-      h.mark(nodes);
-      for (var i = 0, node; node = nodes[i]; i++) {
-        if (!node.parentNode._counted) {
-          h.index(node.parentNode, reverse, ofType);
-          indexed.push(node.parentNode);
-        }
-      }
-      if (formula.match(/^\d+$/)) { // just a number
-        formula = Number(formula);
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node.nodeIndex == formula) results.push(node);
-      } else if (m = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
-        if (m[1] == "-") m[1] = -1;
-        var a = m[1] ? Number(m[1]) : 1;
-        var b = m[2] ? Number(m[2]) : 0;
-        var indices = Selector.pseudos.getIndices(a, b, nodes.length);
-        for (var i = 0, node, l = indices.length; node = nodes[i]; i++) {
-          for (var j = 0; j < l; j++)
-            if (node.nodeIndex == indices[j]) results.push(node);
-        }
-      }
-      h.unmark(nodes);
-      h.unmark(indexed);
-      return results;
-    },
-
-    'empty': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        // IE treats comments as element nodes
-        if (node.tagName == '!' || (node.firstChild && !node.innerHTML.match(/^\s*$/))) continue;
-        results.push(node);
-      }
-      return results;
-    },
-
-    'not': function(nodes, selector, root) {
-      var h = Selector.handlers, selectorType, m;
-      var exclusions = new Selector(selector).findElements(root);
-      h.mark(exclusions);
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (!node._counted) results.push(node);
-      h.unmark(exclusions);
-      return results;
-    },
-
-    'enabled': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (!node.disabled) results.push(node);
-      return results;
-    },
-
-    'disabled': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (node.disabled) results.push(node);
-      return results;
-    },
-
-    'checked': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (node.checked) results.push(node);
-      return results;
-    }
-  },
-
-  operators: {
-    '=':  function(nv, v) { return nv == v; },
-    '!=': function(nv, v) { return nv != v; },
-    '^=': function(nv, v) { return nv.startsWith(v); },
-    '$=': function(nv, v) { return nv.endsWith(v); },
-    '*=': function(nv, v) { return nv.include(v); },
-    '~=': function(nv, v) { return (' ' + nv + ' ').include(' ' + v + ' '); },
-    '|=': function(nv, v) { return ('-' + nv.toUpperCase() + '-').include('-' + v.toUpperCase() + '-'); }
-  },
-
-  matchElements: function(elements, expression) {
-    var matches = new Selector(expression).findElements(), h = Selector.handlers;
-    h.mark(matches);
-    for (var i = 0, results = [], element; element = elements[i]; i++)
-      if (element._counted) results.push(element);
-    h.unmark(matches);
-    return results;
-  },
-
-  findElement: function(elements, expression, index) {
-    if (typeof expression == 'number') {
-      index = expression; expression = false;
-    }
-    return Selector.matchElements(elements, expression || '*')[index || 0];
-  },
-
-  findChildElements: function(element, expressions) {
-    var exprs = expressions.join(','), expressions = [];
-    exprs.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
-      expressions.push(m[1].strip());
-    });
-    var results = [], h = Selector.handlers;
-    for (var i = 0, l = expressions.length, selector; i < l; i++) {
-      selector = new Selector(expressions[i].strip());
-      h.concat(results, selector.findElements(element));
-    }
-    return (l > 1) ? h.unique(results) : results;
-  }
+	_cache: {},
+
+	xpath: {
+		descendant: "//*",
+		child: "/*",
+		adjacent: "/following-sibling::*[1]",
+		laterSibling: '/following-sibling::*',
+		tagName: function (m) {
+			if (m[1] == '*') return '';
+			return "[local-name()='" + m[1].toLowerCase() +
+				"' or local-name()='" + m[1].toUpperCase() + "']";
+		},
+		className: "[contains(concat(' ', @class, ' '), ' #{1} ')]",
+		id: "[@id='#{1}']",
+		attrPresence: "[@#{1}]",
+		attr: function (m) {
+			m[3] = m[5] || m[6];
+			return new Template(Selector.xpath.operators[m[2]]).evaluate(m);
+		},
+		pseudo: function (m) {
+			var h = Selector.xpath.pseudos[m[1]];
+			if (!h) return '';
+			if (typeof h === 'function') return h(m);
+			return new Template(Selector.xpath.pseudos[m[1]]).evaluate(m);
+		},
+		operators: {
+			'=': "[@#{1}='#{3}']",
+			'!=': "[@#{1}!='#{3}']",
+			'^=': "[starts-with(@#{1}, '#{3}')]",
+			'$=': "[substring(@#{1}, (string-length(@#{1}) - string-length('#{3}') + 1))='#{3}']",
+			'*=': "[contains(@#{1}, '#{3}')]",
+			'~=': "[contains(concat(' ', @#{1}, ' '), ' #{3} ')]",
+			'|=': "[contains(concat('-', @#{1}, '-'), '-#{3}-')]"
+		},
+		pseudos: {
+			'first-child': '[not(preceding-sibling::*)]',
+			'last-child': '[not(following-sibling::*)]',
+			'only-child': '[not(preceding-sibling::* or following-sibling::*)]',
+			'empty': "[count(*) = 0 and (count(text()) = 0 or translate(text(), ' \t\r\n', '') = '')]",
+			'checked': "[@checked]",
+			'disabled': "[@disabled]",
+			'enabled': "[not(@disabled)]",
+			'not': function (m) {
+				var e = m[6], p = Selector.patterns,
+					x = Selector.xpath, le, m, v;
+
+				var exclusion = [];
+				while (e && le != e && (/\S/).test(e)) {
+					le = e;
+					for (var i in p) {
+						if (m = e.match(p[i])) {
+							v = typeof x[i] == 'function' ? x[i](m) : new Template(x[i]).evaluate(m);
+							exclusion.push("(" + v.substring(1, v.length - 1) + ")");
+							e = e.replace(m[0], '');
+							break;
+						}
+					}
+				}
+				return "[not(" + exclusion.join(" and ") + ")]";
+			},
+			'nth-child': function (m) {
+				return Selector.xpath.pseudos.nth("(count(./preceding-sibling::*) + 1) ", m);
+			},
+			'nth-last-child': function (m) {
+				return Selector.xpath.pseudos.nth("(count(./following-sibling::*) + 1) ", m);
+			},
+			'nth-of-type': function (m) {
+				return Selector.xpath.pseudos.nth("position() ", m);
+			},
+			'nth-last-of-type': function (m) {
+				return Selector.xpath.pseudos.nth("(last() + 1 - position()) ", m);
+			},
+			'first-of-type': function (m) {
+				m[6] = "1";
+				return Selector.xpath.pseudos['nth-of-type'](m);
+			},
+			'last-of-type': function (m) {
+				m[6] = "1";
+				return Selector.xpath.pseudos['nth-last-of-type'](m);
+			},
+			'only-of-type': function (m) {
+				var p = Selector.xpath.pseudos;
+				return p['first-of-type'](m) + p['last-of-type'](m);
+			},
+			nth: function (fragment, m) {
+				var mm, formula = m[6], predicate;
+				if (formula == 'even') formula = '2n+0';
+				if (formula == 'odd') formula = '2n+1';
+				if (mm = formula.match(/^(\d+)$/)) // digit only
+					return '[' + fragment + "= " + mm[1] + ']';
+				if (mm = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
+					if (mm[1] == "-") mm[1] = -1;
+					var a = mm[1] ? Number(mm[1]) : 1;
+					var b = mm[2] ? Number(mm[2]) : 0;
+					predicate = "[((#{fragment} - #{b}) mod #{a} = 0) and " +
+						"((#{fragment} - #{b}) div #{a} >= 0)]";
+					return new Template(predicate).evaluate({
+						fragment: fragment, a: a, b: b
+					});
+				}
+			}
+		}
+	},
+
+	criteria: {
+		tagName: 'n = h.tagName(n, r, "#{1}", c);   c = false;',
+		className: 'n = h.className(n, r, "#{1}", c); c = false;',
+		id: 'n = h.id(n, r, "#{1}", c);        c = false;',
+		attrPresence: 'n = h.attrPresence(n, r, "#{1}"); c = false;',
+		attr: function (m) {
+			m[3] = (m[5] || m[6]);
+			return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}"); c = false;').evaluate(m);
+		},
+		pseudo: function (m) {
+			if (m[6]) m[6] = m[6].replace(/"/g, '\\"');
+			return new Template('n = h.pseudo(n, "#{1}", "#{6}", r, c); c = false;').evaluate(m);
+		},
+		descendant: 'c = "descendant";',
+		child: 'c = "child";',
+		adjacent: 'c = "adjacent";',
+		laterSibling: 'c = "laterSibling";'
+	},
+
+	patterns: {
+		// combinators must be listed first
+		// (and descendant needs to be last combinator)
+		laterSibling: /^\s*~\s*/,
+		child: /^\s*>\s*/,
+		adjacent: /^\s*\+\s*/,
+		descendant: /^\s/,
+
+		// selectors follow
+		tagName: /^\s*(\*|[\w\-]+)(\b|$)?/,
+		id: /^#([\w\-\*]+)(\b|$)/,
+		className: /^\.([\w\-\*]+)(\b|$)/,
+		pseudo: /^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|\s|(?=:))/,
+		attrPresence: /^\[([\w]+)\]/,
+		attr: /\[((?:[\w-]*:)?[\w-]+)\s*(?:([!^$*~|]?=)\s*((['"])([^\]]*?)\4|([^'"][^\]]*?)))?\]/
+	},
+
+	handlers: {
+		// UTILITY FUNCTIONS
+		// joins two collections
+		concat: function (a, b) {
+			for (var i = 0, node; node = b[i]; i++)
+				a.push(node);
+			return a;
+		},
+
+		// marks an array of nodes for counting
+		mark: function (nodes) {
+			for (var i = 0, node; node = nodes[i]; i++)
+				node._counted = true;
+			return nodes;
+		},
+
+		unmark: function (nodes) {
+			for (var i = 0, node; node = nodes[i]; i++)
+				node._counted = undefined;
+			return nodes;
+		},
+
+		// mark each child node with its position (for nth calls)
+		// "ofType" flag indicates whether we're indexing for nth-of-type
+		// rather than nth-child
+		index: function (parentNode, reverse, ofType) {
+			parentNode._counted = true;
+			if (reverse) {
+				for (var nodes = parentNode.childNodes, i = nodes.length - 1, j = 1; i >= 0; i--) {
+					node = nodes[i];
+					if (node.nodeType == 1 && (!ofType || node._counted)) node.nodeIndex = j++;
+				}
+			} else {
+				for (var i = 0, j = 1, nodes = parentNode.childNodes; node = nodes[i]; i++)
+					if (node.nodeType == 1 && (!ofType || node._counted)) node.nodeIndex = j++;
+			}
+		},
+
+		// filters out duplicates and extends all nodes
+		unique: function (nodes) {
+			if (nodes.length == 0) return nodes;
+			var results = [], n;
+			for (var i = 0, l = nodes.length; i < l; i++)
+				if (!(n = nodes[i])._counted) {
+					n._counted = true;
+					results.push(Element.extend(n));
+				}
+			return Selector.handlers.unmark(results);
+		},
+
+		// COMBINATOR FUNCTIONS
+		descendant: function (nodes) {
+			var h = Selector.handlers;
+			for (var i = 0, results = [], node; node = nodes[i]; i++)
+				h.concat(results, node.getElementsByTagName('*'));
+			return results;
+		},
+
+		child: function (nodes) {
+			var h = Selector.handlers;
+			for (var i = 0, results = [], node; node = nodes[i]; i++) {
+				for (var j = 0, children = [], child; child = node.childNodes[j]; j++)
+					if (child.nodeType == 1 && child.tagName != '!') results.push(child);
+			}
+			return results;
+		},
+
+		adjacent: function (nodes) {
+			for (var i = 0, results = [], node; node = nodes[i]; i++) {
+				var next = this.nextElementSibling(node);
+				if (next) results.push(next);
+			}
+			return results;
+		},
+
+		laterSibling: function (nodes) {
+			var h = Selector.handlers;
+			for (var i = 0, results = [], node; node = nodes[i]; i++)
+				h.concat(results, Element.nextSiblings(node));
+			return results;
+		},
+
+		nextElementSibling: function (node) {
+			while (node = node.nextSibling)
+				if (node.nodeType == 1) return node;
+			return null;
+		},
+
+		previousElementSibling: function (node) {
+			while (node = node.previousSibling)
+				if (node.nodeType == 1) return node;
+			return null;
+		},
+
+		// TOKEN FUNCTIONS
+		tagName: function (nodes, root, tagName, combinator) {
+			tagName = tagName.toUpperCase();
+			var results = [], h = Selector.handlers;
+			if (nodes) {
+				if (combinator) {
+					// fastlane for ordinary descendant combinators
+					if (combinator == "descendant") {
+						for (var i = 0, node; node = nodes[i]; i++)
+							h.concat(results, node.getElementsByTagName(tagName));
+						return results;
+					} else nodes = this[combinator](nodes);
+					if (tagName == "*") return nodes;
+				}
+				for (var i = 0, node; node = nodes[i]; i++)
+					if (node.tagName.toUpperCase() == tagName) results.push(node);
+				return results;
+			} else return root.getElementsByTagName(tagName);
+		},
+
+		id: function (nodes, root, id, combinator) {
+			var targetNode = $(id), h = Selector.handlers;
+			if (!nodes && root == document) return targetNode ? [targetNode] : [];
+			if (nodes) {
+				if (combinator) {
+					if (combinator == 'child') {
+						for (var i = 0, node; node = nodes[i]; i++)
+							if (targetNode.parentNode == node) return [targetNode];
+					} else if (combinator == 'descendant') {
+						for (var i = 0, node; node = nodes[i]; i++)
+							if (Element.descendantOf(targetNode, node)) return [targetNode];
+					} else if (combinator == 'adjacent') {
+						for (var i = 0, node; node = nodes[i]; i++)
+							if (Selector.handlers.previousElementSibling(targetNode) == node)
+								return [targetNode];
+					} else nodes = h[combinator](nodes);
+				}
+				for (var i = 0, node; node = nodes[i]; i++)
+					if (node == targetNode) return [targetNode];
+				return [];
+			}
+			return (targetNode && Element.descendantOf(targetNode, root)) ? [targetNode] : [];
+		},
+
+		className: function (nodes, root, className, combinator) {
+			if (nodes && combinator) nodes = this[combinator](nodes);
+			return Selector.handlers.byClassName(nodes, root, className);
+		},
+
+		byClassName: function (nodes, root, className) {
+			if (!nodes) nodes = Selector.handlers.descendant([root]);
+			var needle = ' ' + className + ' ';
+			for (var i = 0, results = [], node, nodeClassName; node = nodes[i]; i++) {
+				nodeClassName = node.className;
+				if (nodeClassName.length == 0) continue;
+				if (nodeClassName == className || (' ' + nodeClassName + ' ').include(needle))
+					results.push(node);
+			}
+			return results;
+		},
+
+		attrPresence: function (nodes, root, attr) {
+			var results = [];
+			for (var i = 0, node; node = nodes[i]; i++)
+				if (Element.hasAttribute(node, attr)) results.push(node);
+			return results;
+		},
+
+		attr: function (nodes, root, attr, value, operator) {
+			if (!nodes) nodes = root.getElementsByTagName("*");
+			var handler = Selector.operators[operator], results = [];
+			for (var i = 0, node; node = nodes[i]; i++) {
+				var nodeValue = Element.readAttribute(node, attr);
+				if (nodeValue === null) continue;
+				if (handler(nodeValue, value)) results.push(node);
+			}
+			return results;
+		},
+
+		pseudo: function (nodes, name, value, root, combinator) {
+			if (nodes && combinator) nodes = this[combinator](nodes);
+			if (!nodes) nodes = root.getElementsByTagName("*");
+			return Selector.pseudos[name](nodes, value, root);
+		}
+	},
+
+	pseudos: {
+		'first-child': function (nodes, value, root) {
+			for (var i = 0, results = [], node; node = nodes[i]; i++) {
+				if (Selector.handlers.previousElementSibling(node)) continue;
+				results.push(node);
+			}
+			return results;
+		},
+		'last-child': function (nodes, value, root) {
+			for (var i = 0, results = [], node; node = nodes[i]; i++) {
+				if (Selector.handlers.nextElementSibling(node)) continue;
+				results.push(node);
+			}
+			return results;
+		},
+		'only-child': function (nodes, value, root) {
+			var h = Selector.handlers;
+			for (var i = 0, results = [], node; node = nodes[i]; i++)
+				if (!h.previousElementSibling(node) && !h.nextElementSibling(node))
+					results.push(node);
+			return results;
+		},
+		'nth-child': function (nodes, formula, root) {
+			return Selector.pseudos.nth(nodes, formula, root);
+		},
+		'nth-last-child': function (nodes, formula, root) {
+			return Selector.pseudos.nth(nodes, formula, root, true);
+		},
+		'nth-of-type': function (nodes, formula, root) {
+			return Selector.pseudos.nth(nodes, formula, root, false, true);
+		},
+		'nth-last-of-type': function (nodes, formula, root) {
+			return Selector.pseudos.nth(nodes, formula, root, true, true);
+		},
+		'first-of-type': function (nodes, formula, root) {
+			return Selector.pseudos.nth(nodes, "1", root, false, true);
+		},
+		'last-of-type': function (nodes, formula, root) {
+			return Selector.pseudos.nth(nodes, "1", root, true, true);
+		},
+		'only-of-type': function (nodes, formula, root) {
+			var p = Selector.pseudos;
+			return p['last-of-type'](p['first-of-type'](nodes, formula, root), formula, root);
+		},
+
+		// handles the an+b logic
+		getIndices: function (a, b, total) {
+			if (a == 0) return b > 0 ? [b] : [];
+			return $R(1, total).inject([], function (memo, i) {
+				if (0 == (i - b) % a && (i - b) / a >= 0) memo.push(i);
+				return memo;
+			});
+		},
+
+		// handles nth(-last)-child, nth(-last)-of-type, and (first|last)-of-type
+		nth: function (nodes, formula, root, reverse, ofType) {
+			if (nodes.length == 0) return [];
+			if (formula == 'even') formula = '2n+0';
+			if (formula == 'odd') formula = '2n+1';
+			var h = Selector.handlers, results = [], indexed = [], m;
+			h.mark(nodes);
+			for (var i = 0, node; node = nodes[i]; i++) {
+				if (!node.parentNode._counted) {
+					h.index(node.parentNode, reverse, ofType);
+					indexed.push(node.parentNode);
+				}
+			}
+			if (formula.match(/^\d+$/)) { // just a number
+				formula = Number(formula);
+				for (var i = 0, node; node = nodes[i]; i++)
+					if (node.nodeIndex == formula) results.push(node);
+			} else if (m = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
+				if (m[1] == "-") m[1] = -1;
+				var a = m[1] ? Number(m[1]) : 1;
+				var b = m[2] ? Number(m[2]) : 0;
+				var indices = Selector.pseudos.getIndices(a, b, nodes.length);
+				for (var i = 0, node, l = indices.length; node = nodes[i]; i++) {
+					for (var j = 0; j < l; j++)
+						if (node.nodeIndex == indices[j]) results.push(node);
+				}
+			}
+			h.unmark(nodes);
+			h.unmark(indexed);
+			return results;
+		},
+
+		'empty': function (nodes, value, root) {
+			for (var i = 0, results = [], node; node = nodes[i]; i++) {
+				// IE treats comments as element nodes
+				if (node.tagName == '!' || (node.firstChild && !node.innerHTML.match(/^\s*$/))) continue;
+				results.push(node);
+			}
+			return results;
+		},
+
+		'not': function (nodes, selector, root) {
+			var h = Selector.handlers, selectorType, m;
+			var exclusions = new Selector(selector).findElements(root);
+			h.mark(exclusions);
+			for (var i = 0, results = [], node; node = nodes[i]; i++)
+				if (!node._counted) results.push(node);
+			h.unmark(exclusions);
+			return results;
+		},
+
+		'enabled': function (nodes, value, root) {
+			for (var i = 0, results = [], node; node = nodes[i]; i++)
+				if (!node.disabled) results.push(node);
+			return results;
+		},
+
+		'disabled': function (nodes, value, root) {
+			for (var i = 0, results = [], node; node = nodes[i]; i++)
+				if (node.disabled) results.push(node);
+			return results;
+		},
+
+		'checked': function (nodes, value, root) {
+			for (var i = 0, results = [], node; node = nodes[i]; i++)
+				if (node.checked) results.push(node);
+			return results;
+		}
+	},
+
+	operators: {
+		'=': function (nv, v) {
+			return nv == v;
+		},
+		'!=': function (nv, v) {
+			return nv != v;
+		},
+		'^=': function (nv, v) {
+			return nv.startsWith(v);
+		},
+		'$=': function (nv, v) {
+			return nv.endsWith(v);
+		},
+		'*=': function (nv, v) {
+			return nv.include(v);
+		},
+		'~=': function (nv, v) {
+			return (' ' + nv + ' ').include(' ' + v + ' ');
+		},
+		'|=': function (nv, v) {
+			return ('-' + nv.toUpperCase() + '-').include('-' + v.toUpperCase() + '-');
+		}
+	},
+
+	matchElements: function (elements, expression) {
+		var matches = new Selector(expression).findElements(), h = Selector.handlers;
+		h.mark(matches);
+		for (var i = 0, results = [], element; element = elements[i]; i++)
+			if (element._counted) results.push(element);
+		h.unmark(matches);
+		return results;
+	},
+
+	findElement: function (elements, expression, index) {
+		if (typeof expression == 'number') {
+			index = expression;
+			expression = false;
+		}
+		return Selector.matchElements(elements, expression || '*')[index || 0];
+	},
+
+	findChildElements: function (element, expressions) {
+		var exprs = expressions.join(','), expressions = [];
+		exprs.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function (m) {
+			expressions.push(m[1].strip());
+		});
+		var results = [], h = Selector.handlers;
+		for (var i = 0, l = expressions.length, selector; i < l; i++) {
+			selector = new Selector(expressions[i].strip());
+			h.concat(results, selector.findElements(element));
+		}
+		return (l > 1) ? h.unique(results) : results;
+	}
 });
 
 function $$() {
-  return Selector.findChildElements(document, $A(arguments));
+	return Selector.findChildElements(document, $A(arguments));
 }
+
 var Form = {
-  reset: function(form) {
-    $(form).reset();
-    return form;
-  },
-
-  serializeElements: function(elements, getHash) {
-    var data = elements.inject({}, function(result, element) {
-      if (!element.disabled && element.name) {
-        var key = element.name, value = $(element).getValue();
-        if (value != null) {
-         	if (key in result) {
-            if (result[key].constructor != Array) result[key] = [result[key]];
-            result[key].push(value);
-          }
-          else result[key] = value;
-        }
-      }
-      return result;
-    });
-
-    return getHash ? data : Hash.toQueryString(data);
-  }
+	reset: function (form) {
+		$(form).reset();
+		return form;
+	},
+
+	serializeElements: function (elements, getHash) {
+		var data = elements.inject({}, function (result, element) {
+			if (!element.disabled && element.name) {
+				var key = element.name, value = $(element).getValue();
+				if (value != null) {
+					if (key in result) {
+						if (result[key].constructor != Array) result[key] = [result[key]];
+						result[key].push(value);
+					} else result[key] = value;
+				}
+			}
+			return result;
+		});
+
+		return getHash ? data : Hash.toQueryString(data);
+	}
 };
 
 Form.Methods = {
-  serialize: function(form, getHash) {
-    return Form.serializeElements(Form.getElements(form), getHash);
-  },
-
-  getElements: function(form) {
-    return $A($(form).getElementsByTagName('*')).inject([],
-      function(elements, child) {
-        if (Form.Element.Serializers[child.tagName.toLowerCase()])
-          elements.push(Element.extend(child));
-        return elements;
-      }
-    );
-  },
-
-  getInputs: function(form, typeName, name) {
-    form = $(form);
-    var inputs = form.getElementsByTagName('input');
-
-    if (!typeName && !name) return $A(inputs).map(Element.extend);
-
-    for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) {
-      var input = inputs[i];
-      if ((typeName && input.type != typeName) || (name && input.name != name))
-        continue;
-      matchingInputs.push(Element.extend(input));
-    }
-
-    return matchingInputs;
-  },
-
-  disable: function(form) {
-    form = $(form);
-    Form.getElements(form).invoke('disable');
-    return form;
-  },
-
-  enable: function(form) {
-    form = $(form);
-    Form.getElements(form).invoke('enable');
-    return form;
-  },
-
-  findFirstElement: function(form) {
-    return $(form).getElements().find(function(element) {
-      return element.type != 'hidden' && !element.disabled &&
-        ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
-    });
-  },
-
-  focusFirstElement: function(form) {
-    form = $(form);
-    form.findFirstElement().activate();
-    return form;
-  },
-
-  request: function(form, options) {
-    form = $(form), options = Object.clone(options || {});
-
-    var params = options.parameters;
-    options.parameters = form.serialize(true);
-
-    if (params) {
-      if (typeof params == 'string') params = params.toQueryParams();
-      Object.extend(options.parameters, params);
-    }
-
-    if (form.hasAttribute('method') && !options.method)
-      options.method = form.method;
-
-    return new Ajax.Request(form.readAttribute('action'), options);
-  }
+	serialize: function (form, getHash) {
+		return Form.serializeElements(Form.getElements(form), getHash);
+	},
+
+	getElements: function (form) {
+		return $A($(form).getElementsByTagName('*')).inject([],
+			function (elements, child) {
+				if (Form.Element.Serializers[child.tagName.toLowerCase()])
+					elements.push(Element.extend(child));
+				return elements;
+			}
+		);
+	},
+
+	getInputs: function (form, typeName, name) {
+		form = $(form);
+		var inputs = form.getElementsByTagName('input');
+
+		if (!typeName && !name) return $A(inputs).map(Element.extend);
+
+		for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) {
+			var input = inputs[i];
+			if ((typeName && input.type != typeName) || (name && input.name != name))
+				continue;
+			matchingInputs.push(Element.extend(input));
+		}
+
+		return matchingInputs;
+	},
+
+	disable: function (form) {
+		form = $(form);
+		Form.getElements(form).invoke('disable');
+		return form;
+	},
+
+	enable: function (form) {
+		form = $(form);
+		Form.getElements(form).invoke('enable');
+		return form;
+	},
+
+	findFirstElement: function (form) {
+		return $(form).getElements().find(function (element) {
+			return element.type != 'hidden' && !element.disabled &&
+				['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
+		});
+	},
+
+	focusFirstElement: function (form) {
+		form = $(form);
+		form.findFirstElement().activate();
+		return form;
+	},
+
+	request: function (form, options) {
+		form = $(form), options = Object.clone(options || {});
+
+		var params = options.parameters;
+		options.parameters = form.serialize(true);
+
+		if (params) {
+			if (typeof params == 'string') params = params.toQueryParams();
+			Object.extend(options.parameters, params);
+		}
+
+		if (form.hasAttribute('method') && !options.method)
+			options.method = form.method;
+
+		return new Ajax.Request(form.readAttribute('action'), options);
+	}
 }
 
 /*--------------------------------------------------------------------------*/
 
 Form.Element = {
-  focus: function(element) {
-    $(element).focus();
-    return element;
-  },
-
-  select: function(element) {
-    $(element).select();
-    return element;
-  }
+	focus: function (element) {
+		$(element).focus();
+		return element;
+	},
+
+	select: function (element) {
+		$(element).select();
+		return element;
+	}
 }
 
 Form.Element.Methods = {
-  serialize: function(element) {
-    element = $(element);
-    if (!element.disabled && element.name) {
-      var value = element.getValue();
-      if (value != undefined) {
-        var pair = {};
-        pair[element.name] = value;
-        return Hash.toQueryString(pair);
-      }
-    }
-    return '';
-  },
-
-  getValue: function(element) {
-    element = $(element);
-    var method = element.tagName.toLowerCase();
-    return Form.Element.Serializers[method](element);
-  },
-
-  clear: function(element) {
-    $(element).value = '';
-    return element;
-  },
-
-  present: function(element) {
-    return $(element).value != '';
-  },
-
-  activate: function(element) {
-    element = $(element);
-    try {
-      element.focus();
-      if (element.select && (element.tagName.toLowerCase() != 'input' ||
-        !['button', 'reset', 'submit'].include(element.type)))
-        element.select();
-    } catch (e) {}
-    return element;
-  },
-
-  disable: function(element) {
-    element = $(element);
-    element.blur();
-    element.disabled = true;
-    return element;
-  },
-
-  enable: function(element) {
-    element = $(element);
-    element.disabled = false;
-    return element;
-  }
+	serialize: function (element) {
+		element = $(element);
+		if (!element.disabled && element.name) {
+			var value = element.getValue();
+			if (value != undefined) {
+				var pair = {};
+				pair[element.name] = value;
+				return Hash.toQueryString(pair);
+			}
+		}
+		return '';
+	},
+
+	getValue: function (element) {
+		element = $(element);
+		var method = element.tagName.toLowerCase();
+		return Form.Element.Serializers[method](element);
+	},
+
+	clear: function (element) {
+		$(element).value = '';
+		return element;
+	},
+
+	present: function (element) {
+		return $(element).value != '';
+	},
+
+	activate: function (element) {
+		element = $(element);
+		try {
+			element.focus();
+			if (element.select && (element.tagName.toLowerCase() != 'input' ||
+				!['button', 'reset', 'submit'].include(element.type)))
+				element.select();
+		} catch (e) {
+		}
+		return element;
+	},
+
+	disable: function (element) {
+		element = $(element);
+		element.blur();
+		element.disabled = true;
+		return element;
+	},
+
+	enable: function (element) {
+		element = $(element);
+		element.disabled = false;
+		return element;
+	}
 }
 
 /*--------------------------------------------------------------------------*/
@@ -2791,482 +2855,485 @@ var $F = Form.Element.Methods.getValue;
 /*--------------------------------------------------------------------------*/
 
 Form.Element.Serializers = {
-  input: function(element) {
-    switch (element.type.toLowerCase()) {
-      case 'checkbox':
-      case 'radio':
-        return Form.Element.Serializers.inputSelector(element);
-      default:
-        return Form.Element.Serializers.textarea(element);
-    }
-  },
-
-  inputSelector: function(element) {
-    return element.checked ? element.value : null;
-  },
-
-  textarea: function(element) {
-    return element.value;
-  },
-
-  select: function(element) {
-    return this[element.type == 'select-one' ?
-      'selectOne' : 'selectMany'](element);
-  },
-
-  selectOne: function(element) {
-    var index = element.selectedIndex;
-    return index >= 0 ? this.optionValue(element.options[index]) : null;
-  },
-
-  selectMany: function(element) {
-    var values, length = element.length;
-    if (!length) return null;
-
-    for (var i = 0, values = []; i < length; i++) {
-      var opt = element.options[i];
-      if (opt.selected) values.push(this.optionValue(opt));
-    }
-    return values;
-  },
-
-  optionValue: function(opt) {
-    // extend element because hasAttribute may not be native
-    return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text;
-  }
+	input: function (element) {
+		switch (element.type.toLowerCase()) {
+			case 'checkbox':
+			case 'radio':
+				return Form.Element.Serializers.inputSelector(element);
+			default:
+				return Form.Element.Serializers.textarea(element);
+		}
+	},
+
+	inputSelector: function (element) {
+		return element.checked ? element.value : null;
+	},
+
+	textarea: function (element) {
+		return element.value;
+	},
+
+	select: function (element) {
+		return this[element.type == 'select-one' ?
+			'selectOne' : 'selectMany'](element);
+	},
+
+	selectOne: function (element) {
+		var index = element.selectedIndex;
+		return index >= 0 ? this.optionValue(element.options[index]) : null;
+	},
+
+	selectMany: function (element) {
+		var values, length = element.length;
+		if (!length) return null;
+
+		for (var i = 0, values = []; i < length; i++) {
+			var opt = element.options[i];
+			if (opt.selected) values.push(this.optionValue(opt));
+		}
+		return values;
+	},
+
+	optionValue: function (opt) {
+		// extend element because hasAttribute may not be native
+		return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text;
+	}
 }
 
 /*--------------------------------------------------------------------------*/
 
-Abstract.TimedObserver = function() {}
+Abstract.TimedObserver = function () {
+}
 Abstract.TimedObserver.prototype = {
-  initialize: function(element, frequency, callback) {
-    this.frequency = frequency;
-    this.element   = $(element);
-    this.callback  = callback;
-
-    this.lastValue = this.getValue();
-    this.registerCallback();
-  },
-
-  registerCallback: function() {
-    setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
-  },
-
-  onTimerEvent: function() {
-    var value = this.getValue();
-    var changed = ('string' == typeof this.lastValue && 'string' == typeof value
-      ? this.lastValue != value : String(this.lastValue) != String(value));
-    if (changed) {
-      this.callback(this.element, value);
-      this.lastValue = value;
-    }
-  }
+	initialize: function (element, frequency, callback) {
+		this.frequency = frequency;
+		this.element = $(element);
+		this.callback = callback;
+
+		this.lastValue = this.getValue();
+		this.registerCallback();
+	},
+
+	registerCallback: function () {
+		setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
+	},
+
+	onTimerEvent: function () {
+		var value = this.getValue();
+		var changed = ('string' == typeof this.lastValue && 'string' == typeof value
+			? this.lastValue != value : String(this.lastValue) != String(value));
+		if (changed) {
+			this.callback(this.element, value);
+			this.lastValue = value;
+		}
+	}
 }
 
 Form.Element.Observer = Class.create();
 Form.Element.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {
-  getValue: function() {
-    return Form.Element.getValue(this.element);
-  }
+	getValue: function () {
+		return Form.Element.getValue(this.element);
+	}
 });
 
 Form.Observer = Class.create();
 Form.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {
-  getValue: function() {
-    return Form.serialize(this.element);
-  }
+	getValue: function () {
+		return Form.serialize(this.element);
+	}
 });
 
 /*--------------------------------------------------------------------------*/
 
-Abstract.EventObserver = function() {}
+Abstract.EventObserver = function () {
+}
 Abstract.EventObserver.prototype = {
-  initialize: function(element, callback) {
-    this.element  = $(element);
-    this.callback = callback;
-
-    this.lastValue = this.getValue();
-    if (this.element.tagName.toLowerCase() == 'form')
-      this.registerFormCallbacks();
-    else
-      this.registerCallback(this.element);
-  },
-
-  onElementEvent: function() {
-    var value = this.getValue();
-    if (this.lastValue != value) {
-      this.callback(this.element, value);
-      this.lastValue = value;
-    }
-  },
-
-  registerFormCallbacks: function() {
-    Form.getElements(this.element).each(this.registerCallback.bind(this));
-  },
-
-  registerCallback: function(element) {
-    if (element.type) {
-      switch (element.type.toLowerCase()) {
-        case 'checkbox':
-        case 'radio':
-          Event.observe(element, 'click', this.onElementEvent.bind(this));
-          break;
-        default:
-          Event.observe(element, 'change', this.onElementEvent.bind(this));
-          break;
-      }
-    }
-  }
+	initialize: function (element, callback) {
+		this.element = $(element);
+		this.callback = callback;
+
+		this.lastValue = this.getValue();
+		if (this.element.tagName.toLowerCase() == 'form')
+			this.registerFormCallbacks();
+		else
+			this.registerCallback(this.element);
+	},
+
+	onElementEvent: function () {
+		var value = this.getValue();
+		if (this.lastValue != value) {
+			this.callback(this.element, value);
+			this.lastValue = value;
+		}
+	},
+
+	registerFormCallbacks: function () {
+		Form.getElements(this.element).each(this.registerCallback.bind(this));
+	},
+
+	registerCallback: function (element) {
+		if (element.type) {
+			switch (element.type.toLowerCase()) {
+				case 'checkbox':
+				case 'radio':
+					Event.observe(element, 'click', this.onElementEvent.bind(this));
+					break;
+				default:
+					Event.observe(element, 'change', this.onElementEvent.bind(this));
+					break;
+			}
+		}
+	}
 }
 
 Form.Element.EventObserver = Class.create();
 Form.Element.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), {
-  getValue: function() {
-    return Form.Element.getValue(this.element);
-  }
+	getValue: function () {
+		return Form.Element.getValue(this.element);
+	}
 });
 
 Form.EventObserver = Class.create();
 Form.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), {
-  getValue: function() {
-    return Form.serialize(this.element);
-  }
+	getValue: function () {
+		return Form.serialize(this.element);
+	}
 });
 if (!window.Event) {
-  var Event = new Object();
+	var Event = new Object();
 }
 
 Object.extend(Event, {
-  KEY_BACKSPACE: 8,
-  KEY_TAB:       9,
-  KEY_RETURN:   13,
-  KEY_ESC:      27,
-  KEY_LEFT:     37,
-  KEY_UP:       38,
-  KEY_RIGHT:    39,
-  KEY_DOWN:     40,
-  KEY_DELETE:   46,
-  KEY_HOME:     36,
-  KEY_END:      35,
-  KEY_PAGEUP:   33,
-  KEY_PAGEDOWN: 34,
-
-  element: function(event) {
-    return $(event.target || event.srcElement);
-  },
-
-  isLeftClick: function(event) {
-    return (((event.which) && (event.which == 1)) ||
-            ((event.button) && (event.button == 1)));
-  },
-
-  pointerX: function(event) {
-    return event.pageX || (event.clientX +
-      (document.documentElement.scrollLeft || document.body.scrollLeft));
-  },
-
-  pointerY: function(event) {
-    return event.pageY || (event.clientY +
-      (document.documentElement.scrollTop || document.body.scrollTop));
-  },
-
-  stop: function(event) {
-    if (event.preventDefault) {
-      event.preventDefault();
-      event.stopPropagation();
-    } else {
-      event.returnValue = false;
-      event.cancelBubble = true;
-    }
-  },
-
-  // find the first node with the given tagName, starting from the
-  // node the event was triggered on; traverses the DOM upwards
-  findElement: function(event, tagName) {
-    var element = Event.element(event);
-    while (element.parentNode && (!element.tagName ||
-        (element.tagName.toUpperCase() != tagName.toUpperCase())))
-      element = element.parentNode;
-    return element;
-  },
-
-  observers: false,
-
-  _observeAndCache: function(element, name, observer, useCapture) {
-    if (!this.observers) this.observers = [];
-    if (element.addEventListener) {
-      this.observers.push([element, name, observer, useCapture]);
-      element.addEventListener(name, observer, useCapture);
-    } else if (element.attachEvent) {
-      this.observers.push([element, name, observer, useCapture]);
-      element.attachEvent('on' + name, observer);
-    }
-  },
-
-  unloadCache: function() {
-    if (!Event.observers) return;
-    for (var i = 0, length = Event.observers.length; i < length; i++) {
-      Event.stopObserving.apply(this, Event.observers[i]);
-      Event.observers[i][0] = null;
-    }
-    Event.observers = false;
-  },
-
-  observe: function(element, name, observer, useCapture) {
-    element = $(element);
-    useCapture = useCapture || false;
-
-    if (name == 'keypress' &&
-      (Prototype.Browser.WebKit || element.attachEvent))
-      name = 'keydown';
-
-    Event._observeAndCache(element, name, observer, useCapture);
-  },
-
-  stopObserving: function(element, name, observer, useCapture) {
-    element = $(element);
-    useCapture = useCapture || false;
-
-    if (name == 'keypress' &&
-        (Prototype.Browser.WebKit || element.attachEvent))
-      name = 'keydown';
-
-    if (element.removeEventListener) {
-      element.removeEventListener(name, observer, useCapture);
-    } else if (element.detachEvent) {
-      try {
-        element.detachEvent('on' + name, observer);
-      } catch (e) {}
-    }
-  }
+	KEY_BACKSPACE: 8,
+	KEY_TAB: 9,
+	KEY_RETURN: 13,
+	KEY_ESC: 27,
+	KEY_LEFT: 37,
+	KEY_UP: 38,
+	KEY_RIGHT: 39,
+	KEY_DOWN: 40,
+	KEY_DELETE: 46,
+	KEY_HOME: 36,
+	KEY_END: 35,
+	KEY_PAGEUP: 33,
+	KEY_PAGEDOWN: 34,
+
+	element: function (event) {
+		return $(event.target || event.srcElement);
+	},
+
+	isLeftClick: function (event) {
+		return (((event.which) && (event.which == 1)) ||
+			((event.button) && (event.button == 1)));
+	},
+
+	pointerX: function (event) {
+		return event.pageX || (event.clientX +
+			(document.documentElement.scrollLeft || document.body.scrollLeft));
+	},
+
+	pointerY: function (event) {
+		return event.pageY || (event.clientY +
+			(document.documentElement.scrollTop || document.body.scrollTop));
+	},
+
+	stop: function (event) {
+		if (event.preventDefault) {
+			event.preventDefault();
+			event.stopPropagation();
+		} else {
+			event.returnValue = false;
+			event.cancelBubble = true;
+		}
+	},
+
+	// find the first node with the given tagName, starting from the
+	// node the event was triggered on; traverses the DOM upwards
+	findElement: function (event, tagName) {
+		var element = Event.element(event);
+		while (element.parentNode && (!element.tagName ||
+			(element.tagName.toUpperCase() != tagName.toUpperCase())))
+			element = element.parentNode;
+		return element;
+	},
+
+	observers: false,
+
+	_observeAndCache: function (element, name, observer, useCapture) {
+		if (!this.observers) this.observers = [];
+		if (element.addEventListener) {
+			this.observers.push([element, name, observer, useCapture]);
+			element.addEventListener(name, observer, useCapture);
+		} else if (element.attachEvent) {
+			this.observers.push([element, name, observer, useCapture]);
+			element.attachEvent('on' + name, observer);
+		}
+	},
+
+	unloadCache: function () {
+		if (!Event.observers) return;
+		for (var i = 0, length = Event.observers.length; i < length; i++) {
+			Event.stopObserving.apply(this, Event.observers[i]);
+			Event.observers[i][0] = null;
+		}
+		Event.observers = false;
+	},
+
+	observe: function (element, name, observer, useCapture) {
+		element = $(element);
+		useCapture = useCapture || false;
+
+		if (name == 'keypress' &&
+			(Prototype.Browser.WebKit || element.attachEvent))
+			name = 'keydown';
+
+		Event._observeAndCache(element, name, observer, useCapture);
+	},
+
+	stopObserving: function (element, name, observer, useCapture) {
+		element = $(element);
+		useCapture = useCapture || false;
+
+		if (name == 'keypress' &&
+			(Prototype.Browser.WebKit || element.attachEvent))
+			name = 'keydown';
+
+		if (element.removeEventListener) {
+			element.removeEventListener(name, observer, useCapture);
+		} else if (element.detachEvent) {
+			try {
+				element.detachEvent('on' + name, observer);
+			} catch (e) {
+			}
+		}
+	}
 });
 
 /* prevent memory leaks in IE */
 if (Prototype.Browser.IE)
-  Event.observe(window, 'unload', Event.unloadCache, false);
+	Event.observe(window, 'unload', Event.unloadCache, false);
 var Position = {
-  // set to true if needed, warning: firefox performance problems
-  // NOT neeeded for page scrolling, only if draggable contained in
-  // scrollable elements
-  includeScrollOffsets: false,
-
-  // must be called before calling withinIncludingScrolloffset, every time the
-  // page is scrolled
-  prepare: function() {
-    this.deltaX =  window.pageXOffset
-                || document.documentElement.scrollLeft
-                || document.body.scrollLeft
-                || 0;
-    this.deltaY =  window.pageYOffset
-                || document.documentElement.scrollTop
-                || document.body.scrollTop
-                || 0;
-  },
-
-  realOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.scrollTop  || 0;
-      valueL += element.scrollLeft || 0;
-      element = element.parentNode;
-    } while (element);
-    return [valueL, valueT];
-  },
-
-  cumulativeOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      element = element.offsetParent;
-    } while (element);
-    return [valueL, valueT];
-  },
-
-  positionedOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      element = element.offsetParent;
-      if (element) {
-        if(element.tagName=='BODY') break;
-        var p = Element.getStyle(element, 'position');
-        if (p == 'relative' || p == 'absolute') break;
-      }
-    } while (element);
-    return [valueL, valueT];
-  },
-
-  offsetParent: function(element) {
-    if (element.offsetParent) return element.offsetParent;
-    if (element == document.body) return element;
-
-    while ((element = element.parentNode) && element != document.body)
-      if (Element.getStyle(element, 'position') != 'static')
-        return element;
-
-    return document.body;
-  },
-
-  // caches x/y coordinate pair to use with overlap
-  within: function(element, x, y) {
-    if (this.includeScrollOffsets)
-      return this.withinIncludingScrolloffsets(element, x, y);
-    this.xcomp = x;
-    this.ycomp = y;
-    this.offset = this.cumulativeOffset(element);
-
-    return (y >= this.offset[1] &&
-            y <  this.offset[1] + element.offsetHeight &&
-            x >= this.offset[0] &&
-            x <  this.offset[0] + element.offsetWidth);
-  },
-
-  withinIncludingScrolloffsets: function(element, x, y) {
-    var offsetcache = this.realOffset(element);
-
-    this.xcomp = x + offsetcache[0] - this.deltaX;
-    this.ycomp = y + offsetcache[1] - this.deltaY;
-    this.offset = this.cumulativeOffset(element);
-
-    return (this.ycomp >= this.offset[1] &&
-            this.ycomp <  this.offset[1] + element.offsetHeight &&
-            this.xcomp >= this.offset[0] &&
-            this.xcomp <  this.offset[0] + element.offsetWidth);
-  },
-
-  // within must be called directly before
-  overlap: function(mode, element) {
-    if (!mode) return 0;
-    if (mode == 'vertical')
-      return ((this.offset[1] + element.offsetHeight) - this.ycomp) /
-        element.offsetHeight;
-    if (mode == 'horizontal')
-      return ((this.offset[0] + element.offsetWidth) - this.xcomp) /
-        element.offsetWidth;
-  },
-
-  page: function(forElement) {
-    var valueT = 0, valueL = 0;
-
-    var element = forElement;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-
-      // Safari fix
-      if (element.offsetParent == document.body)
-        if (Element.getStyle(element,'position')=='absolute') break;
-
-    } while (element = element.offsetParent);
-
-    element = forElement;
-    do {
-      if (!window.opera || element.tagName=='BODY') {
-        valueT -= element.scrollTop  || 0;
-        valueL -= element.scrollLeft || 0;
-      }
-    } while (element = element.parentNode);
-
-    return [valueL, valueT];
-  },
-
-  clone: function(source, target) {
-    var options = Object.extend({
-      setLeft:    true,
-      setTop:     true,
-      setWidth:   true,
-      setHeight:  true,
-      offsetTop:  0,
-      offsetLeft: 0
-    }, arguments[2] || {})
-
-    // find page position of source
-    source = $(source);
-    var p = Position.page(source);
-
-    // find coordinate system to use
-    target = $(target);
-    var delta = [0, 0];
-    var parent = null;
-    // delta [0,0] will do fine with position: fixed elements,
-    // position:absolute needs offsetParent deltas
-    if (Element.getStyle(target,'position') == 'absolute') {
-      parent = Position.offsetParent(target);
-      delta = Position.page(parent);
-    }
-
-    // correct by body offsets (fixes Safari)
-    if (parent == document.body) {
-      delta[0] -= document.body.offsetLeft;
-      delta[1] -= document.body.offsetTop;
-    }
-
-    // set position
-    if(options.setLeft)   target.style.left  = (p[0] - delta[0] + options.offsetLeft) + 'px';
-    if(options.setTop)    target.style.top   = (p[1] - delta[1] + options.offsetTop) + 'px';
-    if(options.setWidth)  target.style.width = source.offsetWidth + 'px';
-    if(options.setHeight) target.style.height = source.offsetHeight + 'px';
-  },
-
-  absolutize: function(element) {
-    element = $(element);
-    if (element.style.position == 'absolute') return;
-    Position.prepare();
-
-    var offsets = Position.positionedOffset(element);
-    var top     = offsets[1];
-    var left    = offsets[0];
-    var width   = element.clientWidth;
-    var height  = element.clientHeight;
-
-    element._originalLeft   = left - parseFloat(element.style.left  || 0);
-    element._originalTop    = top  - parseFloat(element.style.top || 0);
-    element._originalWidth  = element.style.width;
-    element._originalHeight = element.style.height;
-
-    element.style.position = 'absolute';
-    element.style.top    = top + 'px';
-    element.style.left   = left + 'px';
-    element.style.width  = width + 'px';
-    element.style.height = height + 'px';
-  },
-
-  relativize: function(element) {
-    element = $(element);
-    if (element.style.position == 'relative') return;
-    Position.prepare();
-
-    element.style.position = 'relative';
-    var top  = parseFloat(element.style.top  || 0) - (element._originalTop || 0);
-    var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0);
-
-    element.style.top    = top + 'px';
-    element.style.left   = left + 'px';
-    element.style.height = element._originalHeight;
-    element.style.width  = element._originalWidth;
-  }
+	// set to true if needed, warning: firefox performance problems
+	// NOT neeeded for page scrolling, only if draggable contained in
+	// scrollable elements
+	includeScrollOffsets: false,
+
+	// must be called before calling withinIncludingScrolloffset, every time the
+	// page is scrolled
+	prepare: function () {
+		this.deltaX = window.pageXOffset
+			|| document.documentElement.scrollLeft
+			|| document.body.scrollLeft
+			|| 0;
+		this.deltaY = window.pageYOffset
+			|| document.documentElement.scrollTop
+			|| document.body.scrollTop
+			|| 0;
+	},
+
+	realOffset: function (element) {
+		var valueT = 0, valueL = 0;
+		do {
+			valueT += element.scrollTop || 0;
+			valueL += element.scrollLeft || 0;
+			element = element.parentNode;
+		} while (element);
+		return [valueL, valueT];
+	},
+
+	cumulativeOffset: function (element) {
+		var valueT = 0, valueL = 0;
+		do {
+			valueT += element.offsetTop || 0;
+			valueL += element.offsetLeft || 0;
+			element = element.offsetParent;
+		} while (element);
+		return [valueL, valueT];
+	},
+
+	positionedOffset: function (element) {
+		var valueT = 0, valueL = 0;
+		do {
+			valueT += element.offsetTop || 0;
+			valueL += element.offsetLeft || 0;
+			element = element.offsetParent;
+			if (element) {
+				if (element.tagName == 'BODY') break;
+				var p = Element.getStyle(element, 'position');
+				if (p == 'relative' || p == 'absolute') break;
+			}
+		} while (element);
+		return [valueL, valueT];
+	},
+
+	offsetParent: function (element) {
+		if (element.offsetParent) return element.offsetParent;
+		if (element == document.body) return element;
+
+		while ((element = element.parentNode) && element != document.body)
+			if (Element.getStyle(element, 'position') != 'static')
+				return element;
+
+		return document.body;
+	},
+
+	// caches x/y coordinate pair to use with overlap
+	within: function (element, x, y) {
+		if (this.includeScrollOffsets)
+			return this.withinIncludingScrolloffsets(element, x, y);
+		this.xcomp = x;
+		this.ycomp = y;
+		this.offset = this.cumulativeOffset(element);
+
+		return (y >= this.offset[1] &&
+			y < this.offset[1] + element.offsetHeight &&
+			x >= this.offset[0] &&
+			x < this.offset[0] + element.offsetWidth);
+	},
+
+	withinIncludingScrolloffsets: function (element, x, y) {
+		var offsetcache = this.realOffset(element);
+
+		this.xcomp = x + offsetcache[0] - this.deltaX;
+		this.ycomp = y + offsetcache[1] - this.deltaY;
+		this.offset = this.cumulativeOffset(element);
+
+		return (this.ycomp >= this.offset[1] &&
+			this.ycomp < this.offset[1] + element.offsetHeight &&
+			this.xcomp >= this.offset[0] &&
+			this.xcomp < this.offset[0] + element.offsetWidth);
+	},
+
+	// within must be called directly before
+	overlap: function (mode, element) {
+		if (!mode) return 0;
+		if (mode == 'vertical')
+			return ((this.offset[1] + element.offsetHeight) - this.ycomp) /
+				element.offsetHeight;
+		if (mode == 'horizontal')
+			return ((this.offset[0] + element.offsetWidth) - this.xcomp) /
+				element.offsetWidth;
+	},
+
+	page: function (forElement) {
+		var valueT = 0, valueL = 0;
+
+		var element = forElement;
+		do {
+			valueT += element.offsetTop || 0;
+			valueL += element.offsetLeft || 0;
+
+			// Safari fix
+			if (element.offsetParent == document.body)
+				if (Element.getStyle(element, 'position') == 'absolute') break;
+
+		} while (element = element.offsetParent);
+
+		element = forElement;
+		do {
+			if (!window.opera || element.tagName == 'BODY') {
+				valueT -= element.scrollTop || 0;
+				valueL -= element.scrollLeft || 0;
+			}
+		} while (element = element.parentNode);
+
+		return [valueL, valueT];
+	},
+
+	clone: function (source, target) {
+		var options = Object.extend({
+			setLeft: true,
+			setTop: true,
+			setWidth: true,
+			setHeight: true,
+			offsetTop: 0,
+			offsetLeft: 0
+		}, arguments[2] || {})
+
+		// find page position of source
+		source = $(source);
+		var p = Position.page(source);
+
+		// find coordinate system to use
+		target = $(target);
+		var delta = [0, 0];
+		var parent = null;
+		// delta [0,0] will do fine with position: fixed elements,
+		// position:absolute needs offsetParent deltas
+		if (Element.getStyle(target, 'position') == 'absolute') {
+			parent = Position.offsetParent(target);
+			delta = Position.page(parent);
+		}
+
+		// correct by body offsets (fixes Safari)
+		if (parent == document.body) {
+			delta[0] -= document.body.offsetLeft;
+			delta[1] -= document.body.offsetTop;
+		}
+
+		// set position
+		if (options.setLeft) target.style.left = (p[0] - delta[0] + options.offsetLeft) + 'px';
+		if (options.setTop) target.style.top = (p[1] - delta[1] + options.offsetTop) + 'px';
+		if (options.setWidth) target.style.width = source.offsetWidth + 'px';
+		if (options.setHeight) target.style.height = source.offsetHeight + 'px';
+	},
+
+	absolutize: function (element) {
+		element = $(element);
+		if (element.style.position == 'absolute') return;
+		Position.prepare();
+
+		var offsets = Position.positionedOffset(element);
+		var top = offsets[1];
+		var left = offsets[0];
+		var width = element.clientWidth;
+		var height = element.clientHeight;
+
+		element._originalLeft = left - parseFloat(element.style.left || 0);
+		element._originalTop = top - parseFloat(element.style.top || 0);
+		element._originalWidth = element.style.width;
+		element._originalHeight = element.style.height;
+
+		element.style.position = 'absolute';
+		element.style.top = top + 'px';
+		element.style.left = left + 'px';
+		element.style.width = width + 'px';
+		element.style.height = height + 'px';
+	},
+
+	relativize: function (element) {
+		element = $(element);
+		if (element.style.position == 'relative') return;
+		Position.prepare();
+
+		element.style.position = 'relative';
+		var top = parseFloat(element.style.top || 0) - (element._originalTop || 0);
+		var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0);
+
+		element.style.top = top + 'px';
+		element.style.left = left + 'px';
+		element.style.height = element._originalHeight;
+		element.style.width = element._originalWidth;
+	}
 }
 
 // Safari returns margins on body which is incorrect if the child is absolutely
 // positioned.  For performance reasons, redefine Position.cumulativeOffset for
 // KHTML/WebKit only.
 if (Prototype.Browser.WebKit) {
-  Position.cumulativeOffset = function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      if (element.offsetParent == document.body)
-        if (Element.getStyle(element, 'position') == 'absolute') break;
-
-      element = element.offsetParent;
-    } while (element);
-
-    return [valueL, valueT];
-  }
+	Position.cumulativeOffset = function (element) {
+		var valueT = 0, valueL = 0;
+		do {
+			valueT += element.offsetTop || 0;
+			valueL += element.offsetLeft || 0;
+			if (element.offsetParent == document.body)
+				if (Element.getStyle(element, 'position') == 'absolute') break;
+
+			element = element.offsetParent;
+		} while (element);
+
+		return [valueL, valueT];
+	}
 }
 
-Element.addMethods();
\ No newline at end of file
+Element.addMethods();
diff --git a/len-activiti/src/main/resources/static/editor-app/partials/root-stencil-item-template.html b/len-activiti/src/main/resources/static/editor-app/partials/root-stencil-item-template.html
index 1e4f7ad..1af3580 100644
--- a/len-activiti/src/main/resources/static/editor-app/partials/root-stencil-item-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/partials/root-stencil-item-template.html
@@ -1,11 +1,11 @@
 <span class="stencil-item root-stencil-item"
-      id="{{group.id}}"
-      title="{{group.description}}"
-      ng-model="draggedElement"
-      data-drag="true"
-      jqyoui-draggable="{onStart:'startDragCallback', onDrag:'dragCallback'}"
-      data-jqyoui-options="{revert: 'invalid', helper: 'clone', opacity : 0.5}">
-        
-        <img ng-src="editor-app/stencilsets/bpmn2.0/icons/{{group.icon}}" width="16px;" height="16px;"/>
+	  data-drag="true"
+	  data-jqyoui-options="{revert: 'invalid', helper: 'clone', opacity : 0.5}"
+	  id="{{group.id}}"
+	  jqyoui-draggable="{onStart:'startDragCallback', onDrag:'dragCallback'}"
+	  ng-model="draggedElement"
+	  title="{{group.description}}">
+
+        <img height="16px;" ng-src="editor-app/stencilsets/bpmn2.0/icons/{{group.icon}}" width="16px;"/>
         {{group.name}}
-</span>
\ No newline at end of file
+</span>
diff --git a/len-activiti/src/main/resources/static/editor-app/partials/stencil-item-template.html b/len-activiti/src/main/resources/static/editor-app/partials/stencil-item-template.html
index f032060..43ed861 100644
--- a/len-activiti/src/main/resources/static/editor-app/partials/stencil-item-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/partials/stencil-item-template.html
@@ -1,27 +1,27 @@
 <span ng-click="group.expanded = !group.expanded">
         <i class="glyphicon"
-           ng-class="{'glyphicon-chevron-right': !group.expanded, 'glyphicon-chevron-down': group.expanded}"></i>
+		   ng-class="{'glyphicon-chevron-right': !group.expanded, 'glyphicon-chevron-down': group.expanded}"></i>
         {{group.name}}
     </span>
 
 <!-- Child groups -->
-<ul ng-repeat="group in group.groups"
-    class="stencil-group stencil-group-non-root"
-    ng-class="{collapsed: !group.expanded, 'first': $first}"
-    ng-include="'editor-app/partials/stencil-item-template.html?version=4'">
+<ul class="stencil-group stencil-group-non-root"
+	ng-class="{collapsed: !group.expanded, 'first': $first}"
+	ng-include="'editor-app/partials/stencil-item-template.html?version=4'"
+	ng-repeat="group in group.groups">
 </ul>
 
 <!-- Group items -->
 <ul>
-    <li ng-repeat="item in group.paletteItems" class="stencil-item"
-        id="{{item.id}}"
-        title="{{item.description}}"
-        ng-model="draggedElement"
-        data-drag="true"
-        jqyoui-draggable="{onStart:'startDragCallback', onDrag:'dragCallback'}"
-        data-jqyoui-options="{revert: 'invalid', helper: 'clone', opacity : 0.5}">
-        
-        <img ng-src="editor-app/stencilsets/bpmn2.0/icons/{{item.icon}}" width="16px;" height="16px;"/>
-        {{item.name}}
-    </li>
-</ul>
\ No newline at end of file
+	<li class="stencil-item" data-drag="true"
+		data-jqyoui-options="{revert: 'invalid', helper: 'clone', opacity : 0.5}"
+		id="{{item.id}}"
+		jqyoui-draggable="{onStart:'startDragCallback', onDrag:'dragCallback'}"
+		ng-model="draggedElement"
+		ng-repeat="item in group.paletteItems"
+		title="{{item.description}}">
+
+		<img height="16px;" ng-src="editor-app/stencilsets/bpmn2.0/icons/{{item.icon}}" width="16px;"/>
+		{{item.name}}
+	</li>
+</ul>
diff --git a/len-activiti/src/main/resources/static/editor-app/plugins.xml b/len-activiti/src/main/resources/static/editor-app/plugins.xml
index 76bc151..b6df368 100644
--- a/len-activiti/src/main/resources/static/editor-app/plugins.xml
+++ b/len-activiti/src/main/resources/static/editor-app/plugins.xml
@@ -1,58 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
 
-  <plugins>
-    <plugin source="version.js" name="" />
-    <plugin source="signavio.js" name="Signavio.Plugins.Loading" />
+	<plugins>
+		<plugin source="version.js" name=""/>
+		<plugin source="signavio.js" name="Signavio.Plugins.Loading"/>
 
-    <plugin source="loading.js" name="ORYX.Plugins.Loading" />
-    <plugin source="canvasResize.js" name="ORYX.Plugins.CanvasResize">
-      <notUsesIn namespace="http://b3mn.org/stencilset/xforms#"/>
-    </plugin>
-    
-    <plugin source="renameShapes.js" name="ORYX.Plugins.RenameShapes" />
-    <plugin source="processLink.js" name="ORYX.Plugins.ProcessLink">
-      <requires namespace="http://b3mn.org/stencilset/bpmn1.1#"/> 
-    </plugin>
-      
-    <!-- following plugins don't require Ext -->
-    <plugin source="arrangement.js" name="ORYX.Plugins.Arrangement">
-      <notUsesIn namespace="http://b3mn.org/stencilset/xforms#"/>
-    </plugin>
-    <plugin source="file.js" name="ORYX.Plugins.Save"/>
-    <plugin source="view.js" name="ORYX.Plugins.View" />
-    <plugin source="dragdropresize.js" name="ORYX.Plugins.DragDropResize" />
-    <plugin source="shapeHighlighting.js" name="ORYX.Plugins.HighlightingSelectedShapes" />
-    <plugin source="dragDocker.js" name="ORYX.Plugins.DragDocker">
-      <notUsesIn namespace="http://b3mn.org/stencilset/xforms#" />
-    </plugin>   
-    <plugin source="addDocker.js" name="ORYX.Plugins.AddDocker">
-      <notUsesIn namespace="http://b3mn.org/stencilset/xforms#" />
-    </plugin>
-    <plugin source="selectionframe.js" name="ORYX.Plugins.SelectionFrame">
-      <notUsesIn namespace="http://b3mn.org/stencilset/xforms#" />
-    </plugin>
-    <plugin source="shapeHighlighting.js" name="ORYX.Plugins.ShapeHighlighting" />
-    <plugin source="overlay.js" name="ORYX.Plugins.Overlay" />    
-    <plugin source="keysMove.js" name="ORYX.Plugins.KeysMove" />
-    <plugin source="Layouter/edgeLayouter.js" name="ORYX.Plugins.Layouter.EdgeLayouter" />
-    
-    <!-- Begin: BPMN2.0 specific plugins -->
-    <plugin source="bpmn2.0/bpmn2.0.js" name="ORYX.Plugins.BPMN2_0">
-      <requires namespace="http://lenosp.cn#" />
-    </plugin> 
-    
-    <!-- End: BPMN2.0 specific plugins -->
-  </plugins>
-  
-  <properties>
-    <property group="File" index="1" />
-    <property group="Edit" index="2" /> 
-    <property group="Undo" index="3" />
-    <property group="Alignment" index="4" />
-    <property group="Group" index="5" />
-    <property group="Z-Order" index="6" />
-    <property group="Docker" index="7" />
-    <property group="Zoom" index="8" /> 
-  </properties>
-</config>
\ No newline at end of file
+		<plugin source="loading.js" name="ORYX.Plugins.Loading"/>
+		<plugin source="canvasResize.js" name="ORYX.Plugins.CanvasResize">
+			<notUsesIn namespace="http://b3mn.org/stencilset/xforms#"/>
+		</plugin>
+
+		<plugin source="renameShapes.js" name="ORYX.Plugins.RenameShapes"/>
+		<plugin source="processLink.js" name="ORYX.Plugins.ProcessLink">
+			<requires namespace="http://b3mn.org/stencilset/bpmn1.1#"/>
+		</plugin>
+
+		<!-- following plugins don't require Ext -->
+		<plugin source="arrangement.js" name="ORYX.Plugins.Arrangement">
+			<notUsesIn namespace="http://b3mn.org/stencilset/xforms#"/>
+		</plugin>
+		<plugin source="file.js" name="ORYX.Plugins.Save"/>
+		<plugin source="view.js" name="ORYX.Plugins.View"/>
+		<plugin source="dragdropresize.js" name="ORYX.Plugins.DragDropResize"/>
+		<plugin source="shapeHighlighting.js" name="ORYX.Plugins.HighlightingSelectedShapes"/>
+		<plugin source="dragDocker.js" name="ORYX.Plugins.DragDocker">
+			<notUsesIn namespace="http://b3mn.org/stencilset/xforms#"/>
+		</plugin>
+		<plugin source="addDocker.js" name="ORYX.Plugins.AddDocker">
+			<notUsesIn namespace="http://b3mn.org/stencilset/xforms#"/>
+		</plugin>
+		<plugin source="selectionframe.js" name="ORYX.Plugins.SelectionFrame">
+			<notUsesIn namespace="http://b3mn.org/stencilset/xforms#"/>
+		</plugin>
+		<plugin source="shapeHighlighting.js" name="ORYX.Plugins.ShapeHighlighting"/>
+		<plugin source="overlay.js" name="ORYX.Plugins.Overlay"/>
+		<plugin source="keysMove.js" name="ORYX.Plugins.KeysMove"/>
+		<plugin source="Layouter/edgeLayouter.js" name="ORYX.Plugins.Layouter.EdgeLayouter"/>
+
+		<!-- Begin: BPMN2.0 specific plugins -->
+		<plugin source="bpmn2.0/bpmn2.0.js" name="ORYX.Plugins.BPMN2_0">
+			<requires namespace="http://lenosp.cn#"/>
+		</plugin>
+
+		<!-- End: BPMN2.0 specific plugins -->
+	</plugins>
+
+	<properties>
+		<property group="File" index="1"/>
+		<property group="Edit" index="2"/>
+		<property group="Undo" index="3"/>
+		<property group="Alignment" index="4"/>
+		<property group="Group" index="5"/>
+		<property group="Z-Order" index="6"/>
+		<property group="Docker" index="7"/>
+		<property group="Zoom" index="8"/>
+	</properties>
+</config>
diff --git a/len-activiti/src/main/resources/static/editor-app/popups/icon-template.html b/len-activiti/src/main/resources/static/editor-app/popups/icon-template.html
index 22eb12a..7164f4c 100644
--- a/len-activiti/src/main/resources/static/editor-app/popups/icon-template.html
+++ b/len-activiti/src/main/resources/static/editor-app/popups/icon-template.html
@@ -1,3 +1,3 @@
 <div class="ui-grid-cell-contents">
-    <img ng-src="editor-app/stencilsets/bpmn2.0/icons/{{row.entity.icon}}" />
-</div>
\ No newline at end of file
+	<img ng-src="editor-app/stencilsets/bpmn2.0/icons/{{row.entity.icon}}"/>
+</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/popups/save-model.html b/len-activiti/src/main/resources/static/editor-app/popups/save-model.html
index 502d38e..5121ff2 100644
--- a/len-activiti/src/main/resources/static/editor-app/popups/save-model.html
+++ b/len-activiti/src/main/resources/static/editor-app/popups/save-model.html
@@ -1,41 +1,47 @@
-
 <div class="modal" ng-controller="SaveModelCtrl">
-    <div class="modal-dialog">
-        <div class="modal-content">
-        <div class="modal-header">
-            <h2>{{'MODEL.SAVE.TITLE' | translate}}</h2>
-        </div>
-        <div class="modal-body">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h2>{{'MODEL.SAVE.TITLE' | translate}}</h2>
+			</div>
+			<div class="modal-body">
+
+				<div class="form-group">
+					<label for="nameField">{{'MODEL.NAME' | translate}}</label>
+					<input auto-focus
+						   class="form-control"
+						   id="nameField"
+						   ng-disabled="status.loading"
+						   ng-model="saveDialog.name"
+						   type="text"
+						   ui-keypress="{13:'save()'}"/>
+				</div>
+				<div class="form-group">
+					<label for="docTextArea">{{'MODEL.DESCRIPTION' | translate}}</label>
+					<textarea class="form-control" id="docTextArea" ng-disabled="status.loading"
+							  ng-model="saveDialog.description"></textarea>
+				</div>
+			</div>
+			<div class="modal-footer">
+
+				<div class="pull-right">
+					<button class="btn" ng-click="close()" ng-disabled="status.loading" translate type="button">
+						ACTION.CANCEL
+					</button>
+					<button class="btn btn-primary" ng-click="saveAndClose()" ng-disabled="status.loading"
+							ng-show="!error" translate>ACTION.SAVE-AND-CLOSE
+					</button>
+					<button class="btn btn-primary" ng-click="save()" ng-disabled="status.loading" ng-show="!error"
+							translate>ACTION.SAVE
+					</button>
+				</div>
+
+				<div class="pull-right popup-error" ng-if="error && !error.isConflict">
+					<span>{{'MODEL.SAVE.ERROR' | translate}}</span>
+				</div>
+
+				<loading></loading>
 
-        	<div class="form-group">
-           		<label for="nameField">{{'MODEL.NAME' | translate}}</label>
-        		<input type="text"
-                       ng-disabled="status.loading"
-                       id="nameField"
-                       class="form-control"
-                       ng-model="saveDialog.name"
-                       ui-keypress="{13:'save()'}"
-                       auto-focus />
-        	</div>
-        	<div class="form-group">
-           		<label for="docTextArea">{{'MODEL.DESCRIPTION' | translate}}</label>
-           		<textarea id="docTextArea" ng-disabled="status.loading" class="form-control" ng-model="saveDialog.description"></textarea>
-        	</div>
-        </div>
-        <div class="modal-footer">
-        
-        	<div class="pull-right">
-            	<button type="button" class="btn" ng-click="close()" ng-disabled="status.loading" translate>ACTION.CANCEL</button>
-            	<button class="btn btn-primary" ng-click="saveAndClose()" ng-disabled="status.loading" ng-show="!error" translate>ACTION.SAVE-AND-CLOSE</button>
-            	<button class="btn btn-primary" ng-click="save()" ng-disabled="status.loading" ng-show="!error" translate>ACTION.SAVE</button>
-            </div>
-        
-            <div class="pull-right popup-error" ng-if="error && !error.isConflict">
-                <span>{{'MODEL.SAVE.ERROR' | translate}}</span>
-            </div>
-        
-        	<loading></loading>
-        
-        </div>
-    </div>
-</div>
\ No newline at end of file
+			</div>
+		</div>
+	</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/popups/select-shape.html b/len-activiti/src/main/resources/static/editor-app/popups/select-shape.html
index a004ae3..c052359 100644
--- a/len-activiti/src/main/resources/static/editor-app/popups/select-shape.html
+++ b/len-activiti/src/main/resources/static/editor-app/popups/select-shape.html
@@ -1,20 +1,20 @@
-
 <div class="modal" ng-controller="KisBpmShapeSelectionCtrl">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="close()">&times;</button>
-                <h2>Change shape to:</h2>
-            </div>
-            <div class="modal-body">
-            
-                   <div class="kis-listener-grid" ng-grid="gridOptions"></div>
-            
-            </div>
-            <div class="modal-footer">
-                <button ng-click="cancel()" class="btn btn-primary" translate>ACTION.CANCEL</button>
-                <button ng-click="select()" class="btn btn-primary" translate>ACTION.SELECT</button>
-            </div>
-        </div>
-    </div>
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button aria-hidden="true" class="close" data-dismiss="modal" ng-click="close()" type="button">&times;
+				</button>
+				<h2>Change shape to:</h2>
+			</div>
+			<div class="modal-body">
+
+				<div class="kis-listener-grid" ng-grid="gridOptions"></div>
+
+			</div>
+			<div class="modal-footer">
+				<button class="btn btn-primary" ng-click="cancel()" translate>ACTION.CANCEL</button>
+				<button class="btn btn-primary" ng-click="select()" translate>ACTION.SELECT</button>
+			</div>
+		</div>
+	</div>
 </div>
diff --git a/len-activiti/src/main/resources/static/editor-app/popups/unsaved-changes.html b/len-activiti/src/main/resources/static/editor-app/popups/unsaved-changes.html
index 964ab69..b97ff5e 100644
--- a/len-activiti/src/main/resources/static/editor-app/popups/unsaved-changes.html
+++ b/len-activiti/src/main/resources/static/editor-app/popups/unsaved-changes.html
@@ -1,22 +1,25 @@
-
 <div class="modal" ng-controller="EditorUnsavedChangesPopupCrtl">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h2 translate="EDITOR.POPUP.UNSAVED-CHANGES.TITLE"></h2>
-            </div>
-            <div class="modal-body">
-            	<p translate="EDITOR.POPUP.UNSAVED-CHANGES.DESCRIPTION"></p>
-            </div>
-            <div class="modal-footer">
-            	<div class="pull-right">
-                	<button class="btn btn-danger" ng-click="ok()" translate="EDITOR.POPUP.UNSAVED-CHANGES.ACTION.DISCARD"></button>
-                	<button class="btn btn-default" ng-click="cancel()" translate="EDITOR.POPUP.UNSAVED-CHANGES.ACTION.CONTINUE"></button>
-                </div>
-            	<div class="loading pull-right" ng-show="loading">
-            		<div class="l1"></div><div class="l2"></div><div class="l2"></div>
-            	</div>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h2 translate="EDITOR.POPUP.UNSAVED-CHANGES.TITLE"></h2>
+			</div>
+			<div class="modal-body">
+				<p translate="EDITOR.POPUP.UNSAVED-CHANGES.DESCRIPTION"></p>
+			</div>
+			<div class="modal-footer">
+				<div class="pull-right">
+					<button class="btn btn-danger" ng-click="ok()"
+							translate="EDITOR.POPUP.UNSAVED-CHANGES.ACTION.DISCARD"></button>
+					<button class="btn btn-default" ng-click="cancel()"
+							translate="EDITOR.POPUP.UNSAVED-CHANGES.ACTION.CONTINUE"></button>
+				</div>
+				<div class="loading pull-right" ng-show="loading">
+					<div class="l1"></div>
+					<div class="l2"></div>
+					<div class="l2"></div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/len-activiti/src/main/resources/static/editor-app/select-shape-controller.js b/len-activiti/src/main/resources/static/editor-app/select-shape-controller.js
index 9e426e6..6aa69bb 100644
--- a/len-activiti/src/main/resources/static/editor-app/select-shape-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/select-shape-controller.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -21,294 +21,297 @@
  * Controller for morph shape selection
  */
 
-var KisBpmShapeSelectionCtrl = [ '$rootScope', '$scope', '$timeout', '$translate', function($rootScope, $scope, $timeout, $translate) {
-
-    $scope.selectedMorphShapes = [];
-    
-    $scope.availableMorphShapes = [];
-
-    for (var i = 0; i < $scope.morphShapes.length; i++)
-    {
-    	if ($scope.morphShapes[i].id != $scope.currentSelectedShape.getStencil().idWithoutNs())
-    	{
-    		$scope.availableMorphShapes.push($scope.morphShapes[i]);
-    	}
-    }
-    	
-    // Config for grid
-    $scope.gridOptions = {
-        data: 'availableMorphShapes',
-        enableRowReordering: true,
-        headerRowHeight: 28,
-        multiSelect: false,
-        keepLastSelected : false,
-        selectedItems: $scope.selectedMorphShapes,
-        columnDefs: [{ field: 'objectId', displayName: 'Icon', width: 50, cellTemplate: 'editor-app/popups/icon-template.html?version=' + Date.now() },
-            { field: 'name', displayName: 'Name'}]
-    };
-
-    // Click handler for save button
-    $scope.select = function() {
-
-        if ($scope.selectedMorphShapes.length > 0) 
-        {
-        	var MorphTo = ORYX.Core.Command.extend({
-    			construct: function(shape, stencil, facade){
-    				this.shape = shape;
-    				this.stencil = stencil;
-    				this.facade = facade;
-    			},
-    			execute: function(){
-    				
-    				var shape = this.shape;
-    				var stencil = this.stencil;
-    				var resourceId = shape.resourceId;
-    				
-    				// Serialize all attributes
-    				var serialized = shape.serialize();
-    				stencil.properties().each((function(prop) {
-    					if(prop.readonly()) {
-    						serialized = serialized.reject(function(serProp) {
-    							return serProp.name==prop.id();
-    						});
-    					}
-    				}).bind(this));
-    		
-    				// Get shape if already created, otherwise create a new shape
-    				if (this.newShape){
-    					newShape = this.newShape;
-    					this.facade.getCanvas().add(newShape);
-    				} else {
-    					newShape = this.facade.createShape({
-    									type: stencil.id(),
-    									namespace: stencil.namespace(),
-    									resourceId: resourceId
-    								});
-    				}
-    				
-    				// calculate new bounds using old shape's upperLeft and new shape's width/height
-    				var boundsObj = serialized.find(function(serProp){
-    					return (serProp.prefix === "oryx" && serProp.name === "bounds");
-    				});
-    				
-    				var changedBounds = null;
-    				
-    				if (!this.facade.getRules().preserveBounds(shape.getStencil())) {
-    					
-    					var bounds = boundsObj.value.split(",");
-    					if (parseInt(bounds[0], 10) > parseInt(bounds[2], 10)) { // if lowerRight comes first, swap array items
-    						var tmp = bounds[0];
-    						bounds[0] = bounds[2];
-    						bounds[2] = tmp;
-    						tmp = bounds[1];
-    						bounds[1] = bounds[3];
-    						bounds[3] = tmp;
-    					}
-    					bounds[2] = parseInt(bounds[0], 10) + newShape.bounds.width();
-    					bounds[3] = parseInt(bounds[1], 10) + newShape.bounds.height();
-    					boundsObj.value = bounds.join(",");
-    					
-    				}  else {
-    					
-    					var height = shape.bounds.height();
-    					var width  = shape.bounds.width();
-    					
-    					// consider the minimum and maximum size of
-    					// the new shape
-    					
-    					if (newShape.minimumSize) {
-    						if (shape.bounds.height() < newShape.minimumSize.height) {
-    							height = newShape.minimumSize.height;
-    						}
-    						
-    						
-    						if (shape.bounds.width() < newShape.minimumSize.width) {
-    							width = newShape.minimumSize.width;
-    						}
-    					}
-    					
-    					if(newShape.maximumSize) {
-    						if(shape.bounds.height() > newShape.maximumSize.height) {
-    							height = newShape.maximumSize.height;
-    						}	
-    						
-    						if(shape.bounds.width() > newShape.maximumSize.width) {
-    							width = newShape.maximumSize.width;
-    						}
-    					}
-    					
-    					changedBounds = {
-    						a : {
-    							x: shape.bounds.a.x,
-    							y: shape.bounds.a.y
-    						},
-    						b : {
-    							x: shape.bounds.a.x + width,
-    							y: shape.bounds.a.y + height
-    						}						
-    					};
-    					
-    				}
-    				
-    				var oPos = shape.bounds.center();
-    				if(changedBounds !== null) {
-    					newShape.bounds.set(changedBounds);
-    				}
-    				
-    				// Set all related dockers
-    				this.setRelatedDockers(shape, newShape);
-    				
-    				// store DOM position of old shape
-    				var parentNode = shape.node.parentNode;
-    				var nextSibling = shape.node.nextSibling;
-    				
-    				// Delete the old shape
-    				this.facade.deleteShape(shape);
-    				
-    				// Deserialize the new shape - Set all attributes
-    				newShape.deserialize(serialized);
-    				/*
-    				 * Change color to default if unchanged
-    				 * 23.04.2010
-    				 */
-    				if(shape.getStencil().property("oryx-bgcolor") 
-    						&& shape.properties["oryx-bgcolor"]
-    						&& shape.getStencil().property("oryx-bgcolor").value().toUpperCase()== shape.properties["oryx-bgcolor"].toUpperCase()){
-    						if(newShape.getStencil().property("oryx-bgcolor")){
-    							newShape.setProperty("oryx-bgcolor", newShape.getStencil().property("oryx-bgcolor").value());
-    						}
-    				}	
-    				if(changedBounds !== null) {
-    					newShape.bounds.set(changedBounds);
-    				}
-    				
-    				if(newShape.getStencil().type()==="edge" || (newShape.dockers.length==0 || !newShape.dockers[0].getDockedShape())) {
-    					newShape.bounds.centerMoveTo(oPos);
-    				} 
-    				
-    				if(newShape.getStencil().type()==="node" && (newShape.dockers.length==0 || !newShape.dockers[0].getDockedShape())) {
-    					this.setRelatedDockers(newShape, newShape);
-    					
-    				}
-    				
-    				// place at the DOM position of the old shape
-    				if(nextSibling) parentNode.insertBefore(newShape.node, nextSibling);
-    				else parentNode.appendChild(newShape.node);
-    				
-    				// Set selection
-    				this.facade.setSelection([newShape]);
-    				this.facade.getCanvas().update();
-    				this.facade.updateSelection();
-    				this.newShape = newShape;
-    				
-    			},
-    			rollback: function(){
-    				
-    				if (!this.shape || !this.newShape || !this.newShape.parent) {return;}
-    				
-    				// Append shape to the parent
-    				this.newShape.parent.add(this.shape);
-    				// Set dockers
-    				this.setRelatedDockers(this.newShape, this.shape);
-    				// Delete new shape
-    				this.facade.deleteShape(this.newShape);
-    				// Set selection
-    				this.facade.setSelection([this.shape]);
-    				// Update
-    				this.facade.getCanvas().update();
-    				this.facade.updateSelection();
-    			},
-    			
-    			/**
-    			 * Set all incoming and outgoing edges from the shape to the new shape
-    			 * @param {Shape} shape
-    			 * @param {Shape} newShape
-    			 */
-    			setRelatedDockers: function(shape, newShape){
-    				
-    				if(shape.getStencil().type()==="node") {
-    					
-    					(shape.incoming||[]).concat(shape.outgoing||[])
-    						.each(function(i) { 
-    							i.dockers.each(function(docker) {
-    								if (docker.getDockedShape() == shape) {
-    									var rPoint = Object.clone(docker.referencePoint);
-    									// Move reference point per percent
-
-    									var rPointNew = {
-    										x: rPoint.x*newShape.bounds.width()/shape.bounds.width(),
-    										y: rPoint.y*newShape.bounds.height()/shape.bounds.height()
-    									};
-
-    									docker.setDockedShape(newShape);
-    									// Set reference point and center to new position
-    									docker.setReferencePoint(rPointNew);
-    									if(i instanceof ORYX.Core.Edge) {
-    										docker.bounds.centerMoveTo(rPointNew);
-    									} else {
-    										var absXY = shape.absoluteXY();
-    										docker.bounds.centerMoveTo({x:rPointNew.x+absXY.x, y:rPointNew.y+absXY.y});
-    										//docker.bounds.moveBy({x:rPointNew.x-rPoint.x, y:rPointNew.y-rPoint.y});
-    									}
-    								}
-    							});	
-    						});
-    					
-    					// for attached events
-    					if(shape.dockers.length>0&&shape.dockers.first().getDockedShape()) {
-    						newShape.dockers.first().setDockedShape(shape.dockers.first().getDockedShape());
-    						newShape.dockers.first().setReferencePoint(Object.clone(shape.dockers.first().referencePoint));
-    					}
-    				
-    				} else { // is edge
-    					newShape.dockers.first().setDockedShape(shape.dockers.first().getDockedShape());
-    					newShape.dockers.first().setReferencePoint(shape.dockers.first().referencePoint);
-    					newShape.dockers.last().setDockedShape(shape.dockers.last().getDockedShape());
-    					newShape.dockers.last().setReferencePoint(shape.dockers.last().referencePoint);
-    				}
-    			}
-    		});
-    		
-        	var stencil = undefined;
-        	var stencilSets = $scope.editor.getStencilSets().values();
-        	
-        	var stencilId = $scope.selectedMorphShapes[0].id;
-        	if ($scope.selectedMorphShapes[0].genericTaskId)
-        	{
-        		stencilId = $scope.selectedMorphShapes[0].genericTaskId;
-        	}
-        	
-        	for (var i = 0; i < stencilSets.length; i++)
-        	{
-        		var stencilSet = stencilSets[i];
-    			var nodes = stencilSet.nodes();
-    			for (var j = 0; j < nodes.length; j++)
-            	{
-    				if (nodes[j].idWithoutNs() === stencilId)
-    				{
-    					stencil = nodes[j];
-    					break;
-    				}
-            	}
-        	}
-        	
-        	if (!stencil) return;
-        	
-    		// Create and execute command (for undo/redo)			
-    		var command = new MorphTo($scope.currentSelectedShape, stencil, $scope.editor);
-    		$scope.editor.executeCommands([command]);
-        }
-
-        $scope.close();
-    };
-
-    $scope.cancel = function() {
-    	$scope.$hide();
-    };
-
-    // Close button handler
-    $scope.close = function() {
-    	$scope.$hide();
-    };
-
-}];
\ No newline at end of file
+var KisBpmShapeSelectionCtrl = ['$rootScope', '$scope', '$timeout', '$translate', function ($rootScope, $scope, $timeout, $translate) {
+
+	$scope.selectedMorphShapes = [];
+
+	$scope.availableMorphShapes = [];
+
+	for (var i = 0; i < $scope.morphShapes.length; i++) {
+		if ($scope.morphShapes[i].id != $scope.currentSelectedShape.getStencil().idWithoutNs()) {
+			$scope.availableMorphShapes.push($scope.morphShapes[i]);
+		}
+	}
+
+	// Config for grid
+	$scope.gridOptions = {
+		data: 'availableMorphShapes',
+		enableRowReordering: true,
+		headerRowHeight: 28,
+		multiSelect: false,
+		keepLastSelected: false,
+		selectedItems: $scope.selectedMorphShapes,
+		columnDefs: [{
+			field: 'objectId',
+			displayName: 'Icon',
+			width: 50,
+			cellTemplate: 'editor-app/popups/icon-template.html?version=' + Date.now()
+		},
+			{field: 'name', displayName: 'Name'}]
+	};
+
+	// Click handler for save button
+	$scope.select = function () {
+
+		if ($scope.selectedMorphShapes.length > 0) {
+			var MorphTo = ORYX.Core.Command.extend({
+				construct: function (shape, stencil, facade) {
+					this.shape = shape;
+					this.stencil = stencil;
+					this.facade = facade;
+				},
+				execute: function () {
+
+					var shape = this.shape;
+					var stencil = this.stencil;
+					var resourceId = shape.resourceId;
+
+					// Serialize all attributes
+					var serialized = shape.serialize();
+					stencil.properties().each((function (prop) {
+						if (prop.readonly()) {
+							serialized = serialized.reject(function (serProp) {
+								return serProp.name == prop.id();
+							});
+						}
+					}).bind(this));
+
+					// Get shape if already created, otherwise create a new shape
+					if (this.newShape) {
+						newShape = this.newShape;
+						this.facade.getCanvas().add(newShape);
+					} else {
+						newShape = this.facade.createShape({
+							type: stencil.id(),
+							namespace: stencil.namespace(),
+							resourceId: resourceId
+						});
+					}
+
+					// calculate new bounds using old shape's upperLeft and new shape's width/height
+					var boundsObj = serialized.find(function (serProp) {
+						return (serProp.prefix === "oryx" && serProp.name === "bounds");
+					});
+
+					var changedBounds = null;
+
+					if (!this.facade.getRules().preserveBounds(shape.getStencil())) {
+
+						var bounds = boundsObj.value.split(",");
+						if (parseInt(bounds[0], 10) > parseInt(bounds[2], 10)) { // if lowerRight comes first, swap array items
+							var tmp = bounds[0];
+							bounds[0] = bounds[2];
+							bounds[2] = tmp;
+							tmp = bounds[1];
+							bounds[1] = bounds[3];
+							bounds[3] = tmp;
+						}
+						bounds[2] = parseInt(bounds[0], 10) + newShape.bounds.width();
+						bounds[3] = parseInt(bounds[1], 10) + newShape.bounds.height();
+						boundsObj.value = bounds.join(",");
+
+					} else {
+
+						var height = shape.bounds.height();
+						var width = shape.bounds.width();
+
+						// consider the minimum and maximum size of
+						// the new shape
+
+						if (newShape.minimumSize) {
+							if (shape.bounds.height() < newShape.minimumSize.height) {
+								height = newShape.minimumSize.height;
+							}
+
+
+							if (shape.bounds.width() < newShape.minimumSize.width) {
+								width = newShape.minimumSize.width;
+							}
+						}
+
+						if (newShape.maximumSize) {
+							if (shape.bounds.height() > newShape.maximumSize.height) {
+								height = newShape.maximumSize.height;
+							}
+
+							if (shape.bounds.width() > newShape.maximumSize.width) {
+								width = newShape.maximumSize.width;
+							}
+						}
+
+						changedBounds = {
+							a: {
+								x: shape.bounds.a.x,
+								y: shape.bounds.a.y
+							},
+							b: {
+								x: shape.bounds.a.x + width,
+								y: shape.bounds.a.y + height
+							}
+						};
+
+					}
+
+					var oPos = shape.bounds.center();
+					if (changedBounds !== null) {
+						newShape.bounds.set(changedBounds);
+					}
+
+					// Set all related dockers
+					this.setRelatedDockers(shape, newShape);
+
+					// store DOM position of old shape
+					var parentNode = shape.node.parentNode;
+					var nextSibling = shape.node.nextSibling;
+
+					// Delete the old shape
+					this.facade.deleteShape(shape);
+
+					// Deserialize the new shape - Set all attributes
+					newShape.deserialize(serialized);
+					/*
+					 * Change color to default if unchanged
+					 * 23.04.2010
+					 */
+					if (shape.getStencil().property("oryx-bgcolor")
+						&& shape.properties["oryx-bgcolor"]
+						&& shape.getStencil().property("oryx-bgcolor").value().toUpperCase() == shape.properties["oryx-bgcolor"].toUpperCase()) {
+						if (newShape.getStencil().property("oryx-bgcolor")) {
+							newShape.setProperty("oryx-bgcolor", newShape.getStencil().property("oryx-bgcolor").value());
+						}
+					}
+					if (changedBounds !== null) {
+						newShape.bounds.set(changedBounds);
+					}
+
+					if (newShape.getStencil().type() === "edge" || (newShape.dockers.length == 0 || !newShape.dockers[0].getDockedShape())) {
+						newShape.bounds.centerMoveTo(oPos);
+					}
+
+					if (newShape.getStencil().type() === "node" && (newShape.dockers.length == 0 || !newShape.dockers[0].getDockedShape())) {
+						this.setRelatedDockers(newShape, newShape);
+
+					}
+
+					// place at the DOM position of the old shape
+					if (nextSibling) parentNode.insertBefore(newShape.node, nextSibling);
+					else parentNode.appendChild(newShape.node);
+
+					// Set selection
+					this.facade.setSelection([newShape]);
+					this.facade.getCanvas().update();
+					this.facade.updateSelection();
+					this.newShape = newShape;
+
+				},
+				rollback: function () {
+
+					if (!this.shape || !this.newShape || !this.newShape.parent) {
+						return;
+					}
+
+					// Append shape to the parent
+					this.newShape.parent.add(this.shape);
+					// Set dockers
+					this.setRelatedDockers(this.newShape, this.shape);
+					// Delete new shape
+					this.facade.deleteShape(this.newShape);
+					// Set selection
+					this.facade.setSelection([this.shape]);
+					// Update
+					this.facade.getCanvas().update();
+					this.facade.updateSelection();
+				},
+
+				/**
+				 * Set all incoming and outgoing edges from the shape to the new shape
+				 * @param {Shape} shape
+				 * @param {Shape} newShape
+				 */
+				setRelatedDockers: function (shape, newShape) {
+
+					if (shape.getStencil().type() === "node") {
+
+						(shape.incoming || []).concat(shape.outgoing || [])
+							.each(function (i) {
+								i.dockers.each(function (docker) {
+									if (docker.getDockedShape() == shape) {
+										var rPoint = Object.clone(docker.referencePoint);
+										// Move reference point per percent
+
+										var rPointNew = {
+											x: rPoint.x * newShape.bounds.width() / shape.bounds.width(),
+											y: rPoint.y * newShape.bounds.height() / shape.bounds.height()
+										};
+
+										docker.setDockedShape(newShape);
+										// Set reference point and center to new position
+										docker.setReferencePoint(rPointNew);
+										if (i instanceof ORYX.Core.Edge) {
+											docker.bounds.centerMoveTo(rPointNew);
+										} else {
+											var absXY = shape.absoluteXY();
+											docker.bounds.centerMoveTo({
+												x: rPointNew.x + absXY.x,
+												y: rPointNew.y + absXY.y
+											});
+											//docker.bounds.moveBy({x:rPointNew.x-rPoint.x, y:rPointNew.y-rPoint.y});
+										}
+									}
+								});
+							});
+
+						// for attached events
+						if (shape.dockers.length > 0 && shape.dockers.first().getDockedShape()) {
+							newShape.dockers.first().setDockedShape(shape.dockers.first().getDockedShape());
+							newShape.dockers.first().setReferencePoint(Object.clone(shape.dockers.first().referencePoint));
+						}
+
+					} else { // is edge
+						newShape.dockers.first().setDockedShape(shape.dockers.first().getDockedShape());
+						newShape.dockers.first().setReferencePoint(shape.dockers.first().referencePoint);
+						newShape.dockers.last().setDockedShape(shape.dockers.last().getDockedShape());
+						newShape.dockers.last().setReferencePoint(shape.dockers.last().referencePoint);
+					}
+				}
+			});
+
+			var stencil = undefined;
+			var stencilSets = $scope.editor.getStencilSets().values();
+
+			var stencilId = $scope.selectedMorphShapes[0].id;
+			if ($scope.selectedMorphShapes[0].genericTaskId) {
+				stencilId = $scope.selectedMorphShapes[0].genericTaskId;
+			}
+
+			for (var i = 0; i < stencilSets.length; i++) {
+				var stencilSet = stencilSets[i];
+				var nodes = stencilSet.nodes();
+				for (var j = 0; j < nodes.length; j++) {
+					if (nodes[j].idWithoutNs() === stencilId) {
+						stencil = nodes[j];
+						break;
+					}
+				}
+			}
+
+			if (!stencil) return;
+
+			// Create and execute command (for undo/redo)
+			var command = new MorphTo($scope.currentSelectedShape, stencil, $scope.editor);
+			$scope.editor.executeCommands([command]);
+		}
+
+		$scope.close();
+	};
+
+	$scope.cancel = function () {
+		$scope.$hide();
+	};
+
+	// Close button handler
+	$scope.close = function () {
+		$scope.$hide();
+	};
+
+}];
diff --git a/len-activiti/src/main/resources/static/editor-app/stencil-controller.js b/len-activiti/src/main/resources/static/editor-app/stencil-controller.js
index a37abee..6e98deb 100644
--- a/len-activiti/src/main/resources/static/editor-app/stencil-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/stencil-controller.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -19,1284 +19,1239 @@
 'use strict';
 
 angular.module('activitiModeler')
-    .controller('StencilController', ['$rootScope', '$scope', '$http', '$modal', '$timeout', function ($rootScope, $scope, $http, $modal, $timeout) {
-
-        // Property window toggle state
-        $scope.propertyWindowState = {'collapsed': false};
-
-        // Add reference to global header-config
-        $scope.headerConfig = KISBPM.HEADER_CONFIG;
-
-        $scope.propertyWindowState.toggle = function () {
-            $scope.propertyWindowState.collapsed = !$scope.propertyWindowState.collapsed;
-            $timeout(function () {
-                jQuery(window).trigger('resize');
-            });
-        };
-        
-        // Code that is dependent on an initialised Editor is wrapped in a promise for the editor
-        $scope.editorFactory.promise.then(function () {
-        	
-            /* Build stencil item list */
-
-            // Build simple json representation of stencil set
-            var stencilItemGroups = [];
-
-            // Helper method: find a group in an array
-            var findGroup = function (name, groupArray) {
-                for (var index = 0; index < groupArray.length; index++) {
-                    if (groupArray[index].name === name) {
-                        return groupArray[index];
-                    }
-                }
-                return null;
-            };
-
-            // Helper method: add a new group to an array of groups
-            var addGroup = function (groupName, groupArray) {
-                var group = { name: groupName, items: [], paletteItems: [], groups: [], visible: true };
-                groupArray.push(group);
-                return group;
-            };
-
-            /*
-             StencilSet items
-             */
-            $http({method: 'GET', url: KISBPM.URL.getStencilSet()}).success(function (data, status, headers, config) {
-
-            	var quickMenuDefinition = ['UserTask', 'EndNoneEvent', 'ExclusiveGateway', 
-            	                           'CatchTimerEvent', 'ThrowNoneEvent', 'TextAnnotation',
-            	                           'SequenceFlow', 'Association'];
-            	var ignoreForPaletteDefinition = ['SequenceFlow', 'MessageFlow', 'Association', 'DataAssociation', 'DataStore', 'SendTask'];
-            	var quickMenuItems = [];
-            	
-            	var morphRoles = [];
-                for (var i = 0; i < data.rules.morphingRules.length; i++) 
-                {
-                    var role = data.rules.morphingRules[i].role;
-                    var roleItem = {'role': role, 'morphOptions': []};
-                    morphRoles.push(roleItem);
-                }
-            	
-                // Check all received items
-                for (var stencilIndex = 0; stencilIndex < data.stencils.length; stencilIndex++) 
-                {
-                	// Check if the root group is the 'diagram' group. If so, this item should not be shown.
-                    var currentGroupName = data.stencils[stencilIndex].groups[0];
-                    if (currentGroupName === 'Diagram' || currentGroupName === 'Form') {
-                        continue;  // go to next item
-                    }
-                    
-                    var removed = false;
-                    if (data.stencils[stencilIndex].removed) {
-                        removed = true;
-                    }
-
-                    var currentGroup = undefined;
-                    if (!removed) {
-                        // Check if this group already exists. If not, we create a new one
-
-                        if (currentGroupName !== null && currentGroupName !== undefined && currentGroupName.length > 0) {
-
-                            currentGroup = findGroup(currentGroupName, stencilItemGroups); // Find group in root groups array
-                            if (currentGroup === null) {
-                                currentGroup = addGroup(currentGroupName, stencilItemGroups);
-                            }
-
-                            // Add all child groups (if any)
-                            for (var groupIndex = 1; groupIndex < data.stencils[stencilIndex].groups.length; groupIndex++) {
-                                var childGroupName = data.stencils[stencilIndex].groups[groupIndex];
-                                var childGroup = findGroup(childGroupName, currentGroup.groups);
-                                if (childGroup === null) {
-                                    childGroup = addGroup(childGroupName, currentGroup.groups);
-                                }
-
-                                // The current group variable holds the parent of the next group (if any),
-                                // and is basically the last element in the array of groups defined in the stencil item
-                                currentGroup = childGroup;
-
-                            }
-
-                        }
-                    }
-                    
-                    // Construct the stencil item
-                    var stencilItem = {'id': data.stencils[stencilIndex].id,
-                        'name': data.stencils[stencilIndex].title,
-                        'description': data.stencils[stencilIndex].description,
-                        'icon': data.stencils[stencilIndex].icon,
-                        'type': data.stencils[stencilIndex].type,
-                        'roles': data.stencils[stencilIndex].roles,
-                        'removed': removed,
-                        'customIcon': false,
-                        'canConnect': false,
-                        'canConnectTo': false,
-                        'canConnectAssociation': false};
-                    
-                    if (data.stencils[stencilIndex].customIconId && data.stencils[stencilIndex].customIconId > 0) {
-                        stencilItem.customIcon = true;
-                        stencilItem.icon = data.stencils[stencilIndex].customIconId;
-                    }
-                    
-                    if (!removed) {
-                        if (quickMenuDefinition.indexOf(stencilItem.id) >= 0) {
-                        	quickMenuItems[quickMenuDefinition.indexOf(stencilItem.id)] = stencilItem;
-                        }
-                    }
-                    
-                    if (stencilItem.id === 'TextAnnotation' || stencilItem.id === 'BoundaryCompensationEvent') {
-                    	stencilItem.canConnectAssociation = true;
-                    }
-                    
-                    for (var i = 0; i < data.stencils[stencilIndex].roles.length; i++) {
-                    	var stencilRole = data.stencils[stencilIndex].roles[i];
-                    	if (stencilRole === 'sequence_start') {
-                    		stencilItem.canConnect = true;
-                    	} else if (stencilRole === 'sequence_end') {
-                    		stencilItem.canConnectTo = true;
-                    	}
-                    	
-                    	for (var j = 0; j < morphRoles.length; j++) {
-                    		if (stencilRole === morphRoles[j].role) {
-                    		    if (!removed) {
-                    			     morphRoles[j].morphOptions.push(stencilItem);
-                    			}
-                    			stencilItem.morphRole = morphRoles[j].role;
-                    			break;
-                    		}
-                    	}
-                    }
-
-                    if (currentGroup) {
-	                    // Add the stencil item to the correct group
-	                    currentGroup.items.push(stencilItem);
-	                    if (ignoreForPaletteDefinition.indexOf(stencilItem.id) < 0) {
-	                    	currentGroup.paletteItems.push(stencilItem);
-	                    }
-
-                    } else {
-                        // It's a root stencil element
-                        if (!removed) {
-                            stencilItemGroups.push(stencilItem);
-                        }
-                    }
-                }
-                
-                for (var i = 0; i < stencilItemGroups.length; i++) 
-                {
-                	if (stencilItemGroups[i].paletteItems && stencilItemGroups[i].paletteItems.length == 0)
-                	{
-                		stencilItemGroups[i].visible = false;
-                	}
-                }
-                
-                $scope.stencilItemGroups = stencilItemGroups;
-
-                var containmentRules = [];
-                for (var i = 0; i < data.rules.containmentRules.length; i++) 
-                {
-                    var rule = data.rules.containmentRules[i];
-                    containmentRules.push(rule);
-                }
-                $scope.containmentRules = containmentRules;
-                
-                // remove quick menu items which are not available anymore due to custom pallette
-                var availableQuickMenuItems = [];
-                for (var i = 0; i < quickMenuItems.length; i++) 
-                {
-                    if (quickMenuItems[i]) {
-                        availableQuickMenuItems[availableQuickMenuItems.length] = quickMenuItems[i];
-                    }
-                }
-                
-                $scope.quickMenuItems = availableQuickMenuItems;
-                $scope.morphRoles = morphRoles;
-            }).
-            
-            error(function (data, status, headers, config) {
-                console.log('Something went wrong when fetching stencil items:' + JSON.stringify(data));
-            });
-
-            /*
-             * Listen to selection change events: show properties
-             */
-            $scope.editor.registerOnEvent(ORYX.CONFIG.EVENT_SELECTION_CHANGED, function (event) {
-                var shapes = event.elements;
-                var canvasSelected = false;
-                if (shapes && shapes.length == 0) {
-                    shapes = [$scope.editor.getCanvas()];
-                    canvasSelected = true;
-                }
-                if (shapes && shapes.length > 0) {
-
-                    var selectedShape = shapes.first();
-                    var stencil = selectedShape.getStencil();
-                    
-                    if ($rootScope.selectedElementBeforeScrolling && stencil.id().indexOf('BPMNDiagram') !== -1)
-                    {
-                    	// ignore canvas event because of empty selection when scrolling stops
-                    	return;
-                    }
-                    
-                    if ($rootScope.selectedElementBeforeScrolling && $rootScope.selectedElementBeforeScrolling.getId() === selectedShape.getId())
-                    {
-                    	$rootScope.selectedElementBeforeScrolling = null;
-                    	return;
-                    }
-
-                    // Store previous selection
-                    $scope.previousSelectedShape = $scope.selectedShape;
-                    
-                    // Only do something if another element is selected (Oryx fires this event multiple times)
-                    if ($scope.selectedShape !== undefined && $scope.selectedShape.getId() === selectedShape.getId()) {
-                        if ($rootScope.forceSelectionRefresh) {
-                            // Switch the flag again, this run will force refresh
-                            $rootScope.forceSelectionRefresh = false;
-                        } else {
-                            // Selected the same element again, no need to update anything
-                            return;
-                        }
-                    }
-
-                    var selectedItem = {'title': '', 'properties': []};
-
-                    if (canvasSelected) {
-                        selectedItem.auditData = {
-                            'author': $scope.modelData.createdByUser,
-                            'createDate': $scope.modelData.createDate
-                        };
-                    }
-
-                    // Gather properties of selected item
-                    var properties = stencil.properties();
-                    for (var i = 0; i < properties.length; i++) {
-                        var property = properties[i];
-                        if (property.popular() == false) continue;
-                        var key = property.prefix() + "-" + property.id();
-
-                        if (key === 'oryx-name') {
-                            selectedItem.title = selectedShape.properties[key];
-                        }
-
-                        // First we check if there is a config for 'key-type' and then for 'type' alone
-                        var propertyConfig = KISBPM.PROPERTY_CONFIG[key + '-' + property.type()];
-                        if (propertyConfig === undefined || propertyConfig === null) {
-                            propertyConfig = KISBPM.PROPERTY_CONFIG[property.type()];
-                        }
-
-                        if (propertyConfig === undefined || propertyConfig === null) {
-                            console.log('WARNING: no property configuration defined for ' + key + ' of type ' + property.type());
-                        } else {
-
-                            if (selectedShape.properties[key] === 'true') {
-                                selectedShape.properties[key] = true;
-                            }
-                            
-                            if (KISBPM.CONFIG.showRemovedProperties == false && property.isHidden())
-                            {
-                            	continue;
-                            }
-
-                            var currentProperty = {
-                                'key': key,
-                                'title': property.title(),
-                                'type': property.type(),
-                                'mode': 'read',
-                                'hidden': property.isHidden(),
-                                'value': selectedShape.properties[key]
-                            };
-                            
-                            if ((currentProperty.type === 'complex' || currentProperty.type === 'multiplecomplex') && currentProperty.value && currentProperty.value.length > 0) {
-                                try {
-                                    currentProperty.value = JSON.parse(currentProperty.value);
-                                } catch (err) {
-                                    // ignore
-                                }
-                            }
-
-                            if (propertyConfig.readModeTemplateUrl !== undefined && propertyConfig.readModeTemplateUrl !== null) {
-                                currentProperty.readModeTemplateUrl = propertyConfig.readModeTemplateUrl + '?version=' + $rootScope.staticIncludeVersion;
-                            }
-                            if (propertyConfig.writeModeTemplateUrl !== null && propertyConfig.writeModeTemplateUrl !== null) {
-                            	currentProperty.writeModeTemplateUrl = propertyConfig.writeModeTemplateUrl + '?version=' + $rootScope.staticIncludeVersion;
-                            }
-
-                            if (propertyConfig.templateUrl !== undefined && propertyConfig.templateUrl !== null) {
-                                currentProperty.templateUrl = propertyConfig.templateUrl + '?version=' + $rootScope.staticIncludeVersion;
-                                currentProperty.hasReadWriteMode = false;
-                            }
-                            else {
-                                currentProperty.hasReadWriteMode = true;
-                            }
-
-                            if (currentProperty.value === undefined
-                                || currentProperty.value === null
-                                || currentProperty.value.length == 0) {
-                                currentProperty.noValue = true;
-                            }
-
-                            selectedItem.properties.push(currentProperty);
-                        }
-                    }
-
-                    // Need to wrap this in an $apply block, see http://jimhoskins.com/2012/12/17/angularjs-and-apply.html
-                    $scope.safeApply(function () {
-                        $scope.selectedItem = selectedItem;
-                        $scope.selectedShape = selectedShape;
-                    });
-
-                } else {
-                    $scope.safeApply(function () {
-                        $scope.selectedItem = {};
-                        $scope.selectedShape = null;
-                    });
-                }
-            });
-            
-            $scope.editor.registerOnEvent(ORYX.CONFIG.EVENT_SELECTION_CHANGED, function (event) {
-            	
-            	KISBPM.eventBus.dispatch(KISBPM.eventBus.EVENT_TYPE_HIDE_SHAPE_BUTTONS);
-            	var shapes = event.elements;
-                
-                if (shapes && shapes.length == 1) {
-
-                    var selectedShape = shapes.first();
-            	
-                    var a = $scope.editor.getCanvas().node.getScreenCTM();
-        			
-        			var absoluteXY = selectedShape.absoluteXY();
-        			
-        			absoluteXY.x *= a.a;
-        			absoluteXY.y *= a.d;
-        			
-        			var additionalIEZoom = 1;
-        			if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
-                        var ua = navigator.userAgent;
-                        if (ua.indexOf('MSIE') >= 0) {
-                            //IE 10 and below
-                            var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
-                            if (zoom !== 100) {
-                                additionalIEZoom = zoom / 100
-                            }
-                        }
-                    }
-                    
-        			if (additionalIEZoom === 1) {
-        			     absoluteXY.y = absoluteXY.y - jQuery("#canvasSection").offset().top + 5;
-                         absoluteXY.x = absoluteXY.x - jQuery("#canvasSection").offset().left;
-        			
-        			} else {
-        			     var canvasOffsetLeft = jQuery("#canvasSection").offset().left;
-        			     var canvasScrollLeft = jQuery("#canvasSection").scrollLeft();
-        			     var canvasScrollTop = jQuery("#canvasSection").scrollTop();
-        			     
-        			     var offset = a.e - (canvasOffsetLeft * additionalIEZoom);
-        			     var additionaloffset = 0;
-        			     if (offset > 10) {
-        			         additionaloffset = (offset / additionalIEZoom) - offset;
-        			     }
-        			     absoluteXY.y = absoluteXY.y - (jQuery("#canvasSection").offset().top * additionalIEZoom) + 5 + ((canvasScrollTop * additionalIEZoom) - canvasScrollTop);
-                         absoluteXY.x = absoluteXY.x - (canvasOffsetLeft * additionalIEZoom) + additionaloffset + ((canvasScrollLeft * additionalIEZoom) - canvasScrollLeft);
-                    }
-        			
-        			var bounds = new ORYX.Core.Bounds(a.e + absoluteXY.x, a.f + absoluteXY.y, a.e + absoluteXY.x + a.a*selectedShape.bounds.width(), a.f + absoluteXY.y + a.d*selectedShape.bounds.height());
-        			var shapeXY = bounds.upperLeft();
-        			
-        			var stencilItem = $scope.getStencilItemById(selectedShape.getStencil().idWithoutNs());
-        			var morphShapes = [];
-        			if (stencilItem && stencilItem.morphRole)
-        			{
-            			for (var i = 0; i < $scope.morphRoles.length; i++)
-            			{
-            				if ($scope.morphRoles[i].role === stencilItem.morphRole)
-        					{
-        						morphShapes = $scope.morphRoles[i].morphOptions;
-        					}
-            			}
-            	    }
-        			
-        			var x = shapeXY.x;
-    				if (bounds.width() < 48) {
-    					x -= 24;
-    				}
-        			
-        			if (morphShapes && morphShapes.length > 0) {
-        				// In case the element is not wide enough, start the 2 bottom-buttons more to the left
-        				// to prevent overflow in the right-menu
-	        			var morphButton = document.getElementById('morph-button');
-	        			morphButton.style.display = "block";
-	        			morphButton.style.left = x + 24 +'px';
-	        			morphButton.style.top = (shapeXY.y+bounds.height() + 2) + 'px';
-        			}
-        			
-        			var deleteButton = document.getElementById('delete-button');
-        			deleteButton.style.display = "block";
-        			deleteButton.style.left = x + 'px';
-        			deleteButton.style.top = (shapeXY.y+bounds.height() + 2) + 'px';
-        			
-        			if (stencilItem && (stencilItem.canConnect || stencilItem.canConnectAssociation)) {
-	        			var quickButtonCounter = 0;
-	        			var quickButtonX = shapeXY.x+bounds.width() + 5;
-	        			var quickButtonY = shapeXY.y;
-	        			jQuery('.Oryx_button').each(function(i, obj) {
-	        				if (obj.id !== 'morph-button' && obj.id != 'delete-button') {
-	        					quickButtonCounter++;
-	        					if (quickButtonCounter > 3) {
-	        						quickButtonX = shapeXY.x+bounds.width() + 5;
-	        						quickButtonY += 24;
-	        						quickButtonCounter = 1;
-	        						
-	        					} else if (quickButtonCounter > 1) {
-	        						quickButtonX += 24;
-	        					}
-	        					obj.style.display = "block";
-	        					obj.style.left = quickButtonX + 'px';
-	        					obj.style.top = quickButtonY + 'px';
-	        				}
-	        			});
-        			}
-                }
-            });
-	        
-            if (!$rootScope.stencilInitialized) {
-	            KISBPM.eventBus.addListener(KISBPM.eventBus.EVENT_TYPE_HIDE_SHAPE_BUTTONS, function (event) {
-		            jQuery('.Oryx_button').each(function(i, obj) {
-		            	obj.style.display = "none";
-      				});
-	            });
-
-	            /*
-	             * Listen to property updates and act upon them
-	             */
-	            KISBPM.eventBus.addListener(KISBPM.eventBus.EVENT_TYPE_PROPERTY_VALUE_CHANGED, function (event) {
-	                if (event.property && event.property.key) {
-	                    // If the name property is been updated, we also need to change the title of the currently selected item
-	                    if (event.property.key === 'oryx-name' && $scope.selectedItem !== undefined && $scope.selectedItem !== null) {
-	                        $scope.selectedItem.title = event.newValue;
-	                    }
-
-	                    // Update "no value" flag
-	                    event.property.noValue = (event.property.value === undefined
-	                        || event.property.value === null
-	                        || event.property.value.length == 0);
-	                }
-	            });
-	            
-	            $rootScope.stencilInitialized = true;
-            }
-            
-            $scope.morphShape = function() {
-            	$scope.safeApply(function () {
-            		
-            		var shapes = $rootScope.editor.getSelection();
-            		if (shapes && shapes.length == 1)
-            		{
-            			$rootScope.currentSelectedShape = shapes.first();
-            			var stencilItem = $scope.getStencilItemById($rootScope.currentSelectedShape.getStencil().idWithoutNs());
-            			var morphShapes = [];
-            			for (var i = 0; i < $scope.morphRoles.length; i++)
-            			{
-            				if ($scope.morphRoles[i].role === stencilItem.morphRole)
-        					{
-        						morphShapes = $scope.morphRoles[i].morphOptions.slice();
-        					}
-            			}
-
-            			// Method to open shape select dialog (used later on)
-                        var showSelectShapeDialog = function()
-                        {
-                            $rootScope.morphShapes = morphShapes;
-                            $modal({
-                                backdrop: false,
-                                keyboard: true,
-                                template: 'editor-app/popups/select-shape.html?version=' + Date.now()
-                            });
-                        };
-
-                        showSelectShapeDialog();
-            		}
-            	});
-            };
-            
-            $scope.deleteShape = function() {
-              KISBPM.TOOLBAR.ACTIONS.deleteItem({'$scope': $scope});
-            };
-            
-            $scope.quickAddItem = function(newItemId) {
-            	$scope.safeApply(function () {
-            		
-            		var shapes = $rootScope.editor.getSelection();
-            		if (shapes && shapes.length == 1)
-            		{
-            			$rootScope.currentSelectedShape = shapes.first();
-            			
-            			var containedStencil = undefined;
-                    	var stencilSets = $scope.editor.getStencilSets().values();
-                    	for (var i = 0; i < stencilSets.length; i++)
-                    	{
-                    		var stencilSet = stencilSets[i];
-                			var nodes = stencilSet.nodes();
-                			for (var j = 0; j < nodes.length; j++)
-                        	{
-                				if (nodes[j].idWithoutNs() === newItemId)
-                				{
-                					containedStencil = nodes[j];
-                					break;
-                				}
-                        	}
-                    	}
-                    	
-                    	if (!containedStencil) return;
-            			
-            			var option = {type: $scope.currentSelectedShape.getStencil().namespace() + newItemId, namespace: $scope.currentSelectedShape.getStencil().namespace()};
-            			option['connectedShape'] = $rootScope.currentSelectedShape;
-            			option['parent'] = $rootScope.currentSelectedShape.parent;
-            			option['containedStencil'] = containedStencil;
-            		
-            			var args = { sourceShape: $rootScope.currentSelectedShape, targetStencil: containedStencil };
-            			var targetStencil = $scope.editor.getRules().connectMorph(args);
-            			if (!targetStencil){ return; }// Check if there can be a target shape
-            			option['connectingType'] = targetStencil.id();
-
-            			var command = new KISBPM.CreateCommand(option, undefined, undefined, $scope.editor);
-            		
-            			$scope.editor.executeCommands([command]);
-            		}
-            	});
-            };
-
-        }); // end of $scope.editorFactory.promise block
-
-        /* Click handler for clicking a property */
-        $scope.propertyClicked = function (index) {
-            if (!$scope.selectedItem.properties[index].hidden) {
-                $scope.selectedItem.properties[index].mode = "write";
-            }
-        };
-
-        /* Helper method to retrieve the template url for a property */
-        $scope.getPropertyTemplateUrl = function (index) {
-            return $scope.selectedItem.properties[index].templateUrl;
-        };
-        $scope.getPropertyReadModeTemplateUrl = function (index) {
-            return $scope.selectedItem.properties[index].readModeTemplateUrl;
-        };
-        $scope.getPropertyWriteModeTemplateUrl = function (index) {
-            return $scope.selectedItem.properties[index].writeModeTemplateUrl;
-        };
-
-        /* Method available to all sub controllers (for property controllers) to update the internal Oryx model */
-        $scope.updatePropertyInModel = function (property, shapeId) {
-
-            var shape = $scope.selectedShape;
-            // Some updates may happen when selected shape is already changed, so when an additional
-            // shapeId is supplied, we need to make sure the correct shape is updated (current or previous)
-            if (shapeId) {
-                if (shape.id != shapeId && $scope.previousSelectedShape && $scope.previousSelectedShape.id == shapeId) {
-                    shape = $scope.previousSelectedShape;
-                } else {
-                    shape = null;
-                }
-            }
-
-            if (!shape) {
-                // When no shape is selected, or no shape is found for the alternative
-                // shape ID, do nothing
-                return;
-            }
-            var key = property.key;
-            var newValue = property.value;
-            var oldValue = shape.properties[key];
-
-            if (newValue != oldValue) {
-                var commandClass = ORYX.Core.Command.extend({
-                    construct: function () {
-                        this.key = key;
-                        this.oldValue = oldValue;
-                        this.newValue = newValue;
-                        this.shape = shape;
-                        this.facade = $scope.editor;
-                    },
-                    execute: function () {
-                        this.shape.setProperty(this.key, this.newValue);
-                        this.facade.getCanvas().update();
-                        this.facade.updateSelection();
-                    },
-                    rollback: function () {
-                        this.shape.setProperty(this.key, this.oldValue);
-                        this.facade.getCanvas().update();
-                        this.facade.updateSelection();
-                    }
-                });
-                // Instantiate the class
-                var command = new commandClass();
-
-                // Execute the command
-                $scope.editor.executeCommands([command]);
-                $scope.editor.handleEvents({
-                    type: ORYX.CONFIG.EVENT_PROPWINDOW_PROP_CHANGED,
-                    elements: [shape],
-                    key: key
-                });
-
-                // Switch the property back to read mode, now the update is done
-                property.mode = 'read';
-
-                // Fire event to all who is interested
-                // Fire event to all who want to know about this
-                var event = {
-                    type: KISBPM.eventBus.EVENT_TYPE_PROPERTY_VALUE_CHANGED,
-                    property: property,
-                    oldValue: oldValue,
-                    newValue: newValue
-                };
-                KISBPM.eventBus.dispatch(event.type, event);
-            } else {
-                // Switch the property back to read mode, no update was needed
-                property.mode = 'read';
-            }
-
-        };
-
-        /**
-         * Helper method that searches a group for an item with the given id.
-         * If not found, will return undefined.
-         */
-        $scope.findStencilItemInGroup = function (stencilItemId, group) {
-
-            var item;
-
-            // Check all items directly in this group
-            for (var j = 0; j < group.items.length; j++) {
-                item = group.items[j];
-                if (item.id === stencilItemId) {
-                    return item;
-                }
-            }
-
-            // Check the child groups
-            if (group.groups && group.groups.length > 0) {
-                for (var k = 0; k < group.groups.length; k++) {
-                    item = $scope.findStencilItemInGroup(stencilItemId, group.groups[k]);
-                    if (item) {
-                        return item;
-                    }
-                }
-            }
-
-            return undefined;
-        };
-
-        /**
-         * Helper method to find a stencil item.
-         */
-        $scope.getStencilItemById = function (stencilItemId) {
-            for (var i = 0; i < $scope.stencilItemGroups.length; i++) {
-                var element = $scope.stencilItemGroups[i];
-
-                // Real group
-                if (element.items !== null && element.items !== undefined) {
-                    var item = $scope.findStencilItemInGroup(stencilItemId, element);
-                    if (item) {
-                        return item;
-                    }
-                } else { // Root stencil item
-                    if (element.id === stencilItemId) {
-                        return element;
-                    }
-                }
-            }
-            return undefined;
-        };
-
-        /*
-         * DRAG AND DROP FUNCTIONALITY
-         */
-
-        $scope.dropCallback = function (event, ui) {
-        	
-            $scope.editor.handleEvents({
-                type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
-                highlightId: "shapeRepo.attached"
-            });
-            $scope.editor.handleEvents({
-                type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
-                highlightId: "shapeRepo.added"
-            });
-            
-            $scope.editor.handleEvents({
-                type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
-                highlightId: "shapeMenu"
-            });
-            
-            KISBPM.eventBus.dispatch(KISBPM.eventBus.EVENT_TYPE_HIDE_SHAPE_BUTTONS);
-
-            if ($scope.dragCanContain) {
-
-            	var item = $scope.getStencilItemById(ui.draggable[0].id);
-            	
-            	var pos = {x: event.pageX, y: event.pageY};
-            	
-            	var additionalIEZoom = 1;
-                if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
-                    var ua = navigator.userAgent;
-                    if (ua.indexOf('MSIE') >= 0) {
-                        //IE 10 and below
-                        var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
-                        if (zoom !== 100) {
-                            additionalIEZoom = zoom / 100;
-                        }
-                    }
-                }
-            	
-                var screenCTM = $scope.editor.getCanvas().node.getScreenCTM();
-
-                // Correcting the UpperLeft-Offset
-                pos.x -= (screenCTM.e / additionalIEZoom);
-                pos.y -= (screenCTM.f / additionalIEZoom);
-                // Correcting the Zoom-Factor
-                pos.x /= screenCTM.a;
-                pos.y /= screenCTM.d;
-                
-                // Correcting the ScrollOffset
-                pos.x -= document.documentElement.scrollLeft;
-                pos.y -= document.documentElement.scrollTop;
-                
-                var parentAbs = $scope.dragCurrentParent.absoluteXY();
-                pos.x -= parentAbs.x;
-                pos.y -= parentAbs.y;
-
-                var containedStencil = undefined;
-                var stencilSets = $scope.editor.getStencilSets().values();
-                for (var i = 0; i < stencilSets.length; i++)
-                {
-                    var stencilSet = stencilSets[i];
-                    var nodes = stencilSet.nodes();
-                    for (var j = 0; j < nodes.length; j++)
-                    {
-                        if (nodes[j].idWithoutNs() === ui.draggable[0].id)
-                        {
-                            containedStencil = nodes[j];
-                            break;
-                        }
-                    }
-
-                    if (!containedStencil)
-                    {
-                        var edges = stencilSet.edges();
-                        for (var j = 0; j < edges.length; j++)
-                        {
-                            if (edges[j].idWithoutNs() === ui.draggable[0].id)
-                            {
-                                containedStencil = edges[j];
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                if (!containedStencil) return;
-
-            	if ($scope.quickMenu)
-            	{
-            		var shapes = $scope.editor.getSelection();
-            		if (shapes && shapes.length == 1)
-            		{
-            			var currentSelectedShape = shapes.first();
-
-	        			var option = {};
-	        			option.type = currentSelectedShape.getStencil().namespace() + ui.draggable[0].id;
-	        			option.namespace = currentSelectedShape.getStencil().namespace();
-	        			option.connectedShape = currentSelectedShape;
-	        			option.parent = $scope.dragCurrentParent;
-	        			option.containedStencil = containedStencil;
-	        			
-	        			// If the ctrl key is not pressed, 
-	        			// snapp the new shape to the center 
-	        			// if it is near to the center of the other shape
-	        			if (!event.ctrlKey){
-	        				// Get the center of the shape
-	        				var cShape = currentSelectedShape.bounds.center();
-	        				// Snapp +-20 Pixel horizontal to the center 
-	        				if (20 > Math.abs(cShape.x - pos.x)){
-	        					pos.x = cShape.x;
-	        				}
-	        				// Snapp +-20 Pixel vertical to the center 
-	        				if (20 > Math.abs(cShape.y - pos.y)){
-	        					pos.y = cShape.y;
-	        				}
-	        			}
-	        			
-	        			option.position = pos;
-	        		
-	        			if (containedStencil.idWithoutNs() !== 'SequenceFlow' && containedStencil.idWithoutNs() !== 'Association' && 
-	        			        containedStencil.idWithoutNs() !== 'MessageFlow' && containedStencil.idWithoutNs() !== 'DataAssociation')
-	        			{
-		        			var args = { sourceShape: currentSelectedShape, targetStencil: containedStencil };
-		        			var targetStencil = $scope.editor.getRules().connectMorph(args);
-		        			if (!targetStencil){ return; }// Check if there can be a target shape
-		        			option.connectingType = targetStencil.id();
-	        			}
-	
-	        			var command = new KISBPM.CreateCommand(option, $scope.dropTargetElement, pos, $scope.editor);
-	        		
-	        			$scope.editor.executeCommands([command]);
-            		}
-            	}
-            	else
-            	{
-                    var canAttach = false;
-                    if (containedStencil.idWithoutNs() === 'BoundaryErrorEvent' || containedStencil.idWithoutNs() === 'BoundaryTimerEvent' ||
-                        containedStencil.idWithoutNs() === 'BoundarySignalEvent' || containedStencil.idWithoutNs() === 'BoundaryMessageEvent' ||
-                        containedStencil.idWithoutNs() === 'BoundaryCancelEvent' || containedStencil.idWithoutNs() === 'BoundaryCompensationEvent') {
-                        // Modify position, otherwise boundary event will get position related to left corner of the canvas instead of the container
-                        pos = $scope.editor.eventCoordinates( event );
-                        canAttach = true;
-                    }
-
-                    var option = {};
-                    option['type'] = $scope.modelData.model.stencilset.namespace + item.id;
-                    option['namespace'] = $scope.modelData.model.stencilset.namespace;
-                    option['position'] = pos;
-                    option['parent'] = $scope.dragCurrentParent;
-
-                    var commandClass = ORYX.Core.Command.extend({
-                        construct: function(option, dockedShape, canAttach, position, facade){
-                            this.option = option;
-                            this.docker = null;
-                            this.dockedShape = dockedShape;
-                            this.dockedShapeParent = dockedShape.parent || facade.getCanvas();
-                            this.position = position;
-                            this.facade	= facade;
-                            this.selection = this.facade.getSelection();
-                            this.shape = null;
-                            this.parent = null;
-                            this.canAttach = canAttach;
-                        },
-                        execute: function(){
-                            if (!this.shape) {
-                                this.shape = this.facade.createShape(option);
-                                this.parent = this.shape.parent;
-                            } else if (this.parent) {
-                                this.parent.add(this.shape);
-                            }
-
-                            if (this.canAttach && this.shape.dockers && this.shape.dockers.length) {
-                                this.docker = this.shape.dockers[0];
-
-                                this.dockedShapeParent.add(this.docker.parent);
-
-                                // Set the Docker to the new Shape
-                                this.docker.setDockedShape(undefined);
-                                this.docker.bounds.centerMoveTo(this.position);
-                                if (this.dockedShape !== this.facade.getCanvas()) {
-                                    this.docker.setDockedShape(this.dockedShape);
-                                }
-                                this.facade.setSelection( [this.docker.parent] );
-                            }
-
-                            this.facade.getCanvas().update();
-                            this.facade.updateSelection();
-
-                        },
-                        rollback: function(){
-                            if (this.shape) {
-                                this.facade.setSelection(this.selection.without(this.shape));
-                                this.facade.deleteShape(this.shape);
-                            }
-                            if (this.canAttach && this.docker) {
-                                this.docker.setDockedShape(undefined);
-                            }
-                            this.facade.getCanvas().update();
-                            this.facade.updateSelection();
-
-                        }
-                    });
-
-                    // Update canvas
-                    var command = new commandClass(option, $scope.dragCurrentParent, canAttach, pos, $scope.editor);
-                    $scope.editor.executeCommands([command]);
-
-                    // Fire event to all who want to know about this
-                    var dropEvent = {
-                        type: KISBPM.eventBus.EVENT_TYPE_ITEM_DROPPED,
-                        droppedItem: item,
-                        position: pos
-                    };
-                    KISBPM.eventBus.dispatch(dropEvent.type, dropEvent);
-                }
-            }
-
-            $scope.dragCurrentParent = undefined;
-            $scope.dragCurrentParentId = undefined;
-            $scope.dragCurrentParentStencil = undefined;
-            $scope.dragCanContain = undefined;
-            $scope.quickMenu = undefined;
-            $scope.dropTargetElement = undefined;
-        };
-
-
-        $scope.overCallback = function (event, ui) {
-            $scope.dragModeOver = true;
-        };
-
-        $scope.outCallback = function (event, ui) {
-            $scope.dragModeOver = false;
-        };
-
-        $scope.startDragCallback = function (event, ui) {
-            $scope.dragModeOver = false;
-            $scope.quickMenu = false;
-            if (!ui.helper.hasClass('stencil-item-dragged')) {
-                ui.helper.addClass('stencil-item-dragged');
-            }
-        };
-        
-        $scope.startDragCallbackQuickMenu = function (event, ui) {
-            $scope.dragModeOver = false;
-            $scope.quickMenu = true;
-        };
-        
-        $scope.dragCallback = function (event, ui) {
-        	
-            if ($scope.dragModeOver != false) {
-            	
-                var coord = $scope.editor.eventCoordinatesXY(event.pageX, event.pageY);
-                
-                var additionalIEZoom = 1;
-                if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
-                    var ua = navigator.userAgent;
-                    if (ua.indexOf('MSIE') >= 0) {
-                        //IE 10 and below
-                        var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
-                        if (zoom !== 100) {
-                            additionalIEZoom = zoom / 100
-                        }
-                    }
-                }
-                
-                if (additionalIEZoom !== 1) {
-                     coord.x = coord.x / additionalIEZoom;
-                     coord.y = coord.y / additionalIEZoom;
-                }
-                
-                var aShapes = $scope.editor.getCanvas().getAbstractShapesAtPosition(coord);
-                
-                if (aShapes.length <= 0) {
-                    if (event.helper) {
-                        $scope.dragCanContain = false;
-                        return false;
-                    }
-                }
-
-                if (aShapes[0] instanceof ORYX.Core.Canvas) {
-                    $scope.editor.getCanvas().setHightlightStateBasedOnX(coord.x);
-                }
-
-                if (aShapes.length == 1 && aShapes[0] instanceof ORYX.Core.Canvas)
-                {
-                    var parentCandidate = aShapes[0];
-
-                    $scope.dragCanContain = true;
-                    $scope.dragCurrentParent = parentCandidate;
-                    $scope.dragCurrentParentId = parentCandidate.id;
-
-                    $scope.editor.handleEvents({
-                        type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
-                        highlightId: "shapeRepo.attached"
-                    });
-                    $scope.editor.handleEvents({
-                        type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
-                        highlightId: "shapeRepo.added"
-                    });
-                    return false;
-                }
-                else 
-                {
-                    var item = $scope.getStencilItemById(event.target.id);
-                    
-                    var parentCandidate = aShapes.reverse().find(function (candidate) {
-                        return (candidate instanceof ORYX.Core.Canvas
-                            || candidate instanceof ORYX.Core.Node
-                            || candidate instanceof ORYX.Core.Edge);
-                    });
-                    
-                    if (!parentCandidate) {
-                        $scope.dragCanContain = false;
-                        return false;
-                    }
-                    
-                    if (item.type === "node") {
-                        
-                        // check if the draggable is a boundary event and the parent an Activity
-                        var _canContain = false;
-                        var parentStencilId = parentCandidate.getStencil().id();
-
-                        if ($scope.dragCurrentParentId && $scope.dragCurrentParentId === parentCandidate.id) {
-                            return false;
-                        }
-
-                        var parentItem = $scope.getStencilItemById(parentCandidate.getStencil().idWithoutNs());
-                        if (parentItem.roles.indexOf("Activity") > -1) {
-                            if (item.roles.indexOf("IntermediateEventOnActivityBoundary") > -1) {
-                                _canContain = true;
-                            }
-                        }
-                        else if (parentCandidate.getStencil().idWithoutNs() === 'Pool')
-                        {
-                        	if (item.id === 'Lane')
-                        	{
-                        		_canContain = true;
-                        	}
-                        }
-                        
-                        if (_canContain)
-                        {
-                        	$scope.editor.handleEvents({
-                                type: ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW,
-                                highlightId: "shapeRepo.attached",
-                                elements: [parentCandidate],
-                                style: ORYX.CONFIG.SELECTION_HIGHLIGHT_STYLE_RECTANGLE,
-                                color: ORYX.CONFIG.SELECTION_VALID_COLOR
-                            });
-
-                            $scope.editor.handleEvents({
-                                type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
-                                highlightId: "shapeRepo.added"
-                            });
-                        }
-                        else
-                        {
-                            for (var i = 0; i < $scope.containmentRules.length; i++) {
-                                var rule = $scope.containmentRules[i];
-                                if (rule.role === parentItem.id) {
-                                    for (var j = 0; j < rule.contains.length; j++) {
-                                        if (item.roles.indexOf(rule.contains[j]) > -1) {
-                                            _canContain = true;
-                                            break;
-                                        }
-                                    }
-
-                                    if (_canContain) {
-                                        break;
-                                    }
-                                }
-                            }
-
-                            // Show Highlight
-                            $scope.editor.handleEvents({
-                                type: ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW,
-                                highlightId: 'shapeRepo.added',
-                                elements: [parentCandidate],
-                                color: _canContain ? ORYX.CONFIG.SELECTION_VALID_COLOR : ORYX.CONFIG.SELECTION_INVALID_COLOR
-                            });
-
-                            $scope.editor.handleEvents({
-                                type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
-                                highlightId: "shapeRepo.attached"
-                            });
-                        }
-
-                        $scope.dragCurrentParent = parentCandidate;
-                        $scope.dragCurrentParentId = parentCandidate.id;
-                        $scope.dragCurrentParentStencil = parentStencilId;
-                        $scope.dragCanContain = _canContain;
-                        
-                    } else  { 
-                    	var canvasCandidate = $scope.editor.getCanvas();
-                    	var canConnect = false;
-                    	
-                    	var targetStencil = $scope.getStencilItemById(parentCandidate.getStencil().idWithoutNs());
-            			if (targetStencil) {
-            				var associationConnect = false;
-            				if (stencil.idWithoutNs() === 'Association' && (curCan.getStencil().idWithoutNs() === 'TextAnnotation' || curCan.getStencil().idWithoutNs() === 'BoundaryCompensationEvent')) {
-            				    associationConnect = true;
-            				} else if (stencil.idWithoutNs() === 'DataAssociation' && curCan.getStencil().idWithoutNs() === 'DataStore') {
-                                associationConnect = true;
-                            }
-            				
-            				if (targetStencil.canConnectTo || associationConnect) {
-            					canConnect = true;
-            				}
-            			}
-                    	
-                    	//Edge
-                    	$scope.dragCurrentParent = canvasCandidate;
-                    	$scope.dragCurrentParentId = canvasCandidate.id;
-                        $scope.dragCurrentParentStencil = canvasCandidate.getStencil().id();
-                        $scope.dragCanContain = canConnect;
-                        
-                    	// Show Highlight
-                        $scope.editor.handleEvents({
-                            type: ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW,
-                            highlightId: 'shapeRepo.added',
-                            elements: [canvasCandidate],
-                            color: ORYX.CONFIG.SELECTION_VALID_COLOR
-                        });
-
-                        $scope.editor.handleEvents({
-                            type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
-                            highlightId: "shapeRepo.attached"
-                        });
-        			}
-                }
-            }
-        };
-        
-        $scope.dragCallbackQuickMenu = function (event, ui) {
-        	
-            if ($scope.dragModeOver != false) {
-                var coord = $scope.editor.eventCoordinatesXY(event.pageX, event.pageY);
-                
-                var additionalIEZoom = 1;
-                if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
-                    var ua = navigator.userAgent;
-                    if (ua.indexOf('MSIE') >= 0) {
-                        //IE 10 and below
-                        var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
-                        if (zoom !== 100) {
-                            additionalIEZoom = zoom / 100
-                        }
-                    }
-                }
-                
-                if (additionalIEZoom !== 1) {
-                     coord.x = coord.x / additionalIEZoom;
-                     coord.y = coord.y / additionalIEZoom;
-                }
-                
-                var aShapes = $scope.editor.getCanvas().getAbstractShapesAtPosition(coord);
-               
-                if (aShapes.length <= 0) {
-                    if (event.helper) {
-                        $scope.dragCanContain = false;
-                        return false;
-                    }
-                }
-
-                if (aShapes[0] instanceof ORYX.Core.Canvas) {
-                    $scope.editor.getCanvas().setHightlightStateBasedOnX(coord.x);
-                }
-                
-        		var stencil = undefined;
-            	var stencilSets = $scope.editor.getStencilSets().values();
-            	for (var i = 0; i < stencilSets.length; i++)
-            	{
-            		var stencilSet = stencilSets[i];
-        			var nodes = stencilSet.nodes();
-        			for (var j = 0; j < nodes.length; j++)
-                	{
-        				if (nodes[j].idWithoutNs() === event.target.id)
-        				{
-        					stencil = nodes[j];
-        					break;
-        				}
-                	}
-        			
-        			if (!stencil)
-        			{
-        				var edges = stencilSet.edges();
-            			for (var j = 0; j < edges.length; j++)
-                    	{
-            				if (edges[j].idWithoutNs() === event.target.id)
-            				{
-            					stencil = edges[j];
-            					break;
-            				}
-                    	}
-        			}
-            	}
-        		
-                var candidate = aShapes.last();
-                
-                var isValid = false;
-                if (stencil.type() === "node") 
-                {
-    				//check containment rules
-    				var canContain = $scope.editor.getRules().canContain({containingShape:candidate, containedStencil:stencil});
-    				
-    				var parentCandidate = aShapes.reverse().find(function (candidate) {
-                        return (candidate instanceof ORYX.Core.Canvas
-                            || candidate instanceof ORYX.Core.Node
-                            || candidate instanceof ORYX.Core.Edge);
-                    });
-
-                    if (!parentCandidate) {
-                        $scope.dragCanContain = false;
-                        return false;
-                    }
-    				
-    				$scope.dragCurrentParent = parentCandidate;
-                    $scope.dragCurrentParentId = parentCandidate.id;
-                    $scope.dragCurrentParentStencil = parentCandidate.getStencil().id();
-                    $scope.dragCanContain = canContain;
-                    $scope.dropTargetElement = parentCandidate;
-                    isValid = canContain;
-    	
-    			} else { //Edge
-    			
-    				var shapes = $scope.editor.getSelection();
-            		if (shapes && shapes.length == 1)
-            		{
-            			var currentSelectedShape = shapes.first();
-            			var curCan = candidate;
-            			var canConnect = false;
-            			
-            			var targetStencil = $scope.getStencilItemById(curCan.getStencil().idWithoutNs());
-            			if (targetStencil)
-            			{
-            				var associationConnect = false;
-            				if (stencil.idWithoutNs() === 'Association' && (curCan.getStencil().idWithoutNs() === 'TextAnnotation' || curCan.getStencil().idWithoutNs() === 'BoundaryCompensationEvent'))  
-            				{
-            					associationConnect = true;
-            				}
-            				else if (stencil.idWithoutNs() === 'DataAssociation' && curCan.getStencil().idWithoutNs() === 'DataStore')
-            				{
-            				    associationConnect = true;
-            				}
-            				
-            				if (targetStencil.canConnectTo || associationConnect)
-	            			{
-		        				while (!canConnect && curCan && !(curCan instanceof ORYX.Core.Canvas))
-		        				{
-		        					candidate = curCan;
-		        					//check connection rules
-		        					canConnect = $scope.editor.getRules().canConnect({
-		        											sourceShape: currentSelectedShape, 
-		        											edgeStencil: stencil, 
-		        											targetShape: curCan
-		        											});	
-		        					curCan = curCan.parent;
-		        				}
-	            			}
-            			}
-            			var parentCandidate = $scope.editor.getCanvas();
-        				
-        				isValid = canConnect;
-        				$scope.dragCurrentParent = parentCandidate;
-                        $scope.dragCurrentParentId = parentCandidate.id;
-                        $scope.dragCurrentParentStencil = parentCandidate.getStencil().id();
-        				$scope.dragCanContain = canConnect;
-        				$scope.dropTargetElement = candidate;
-            		}		
-    				
-    			}	
-
-                $scope.editor.handleEvents({
-					type:		ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW, 
-					highlightId:'shapeMenu',
-					elements:	[candidate],
-					color:		isValid ? ORYX.CONFIG.SELECTION_VALID_COLOR : ORYX.CONFIG.SELECTION_INVALID_COLOR
+	.controller('StencilController', ['$rootScope', '$scope', '$http', '$modal', '$timeout', function ($rootScope, $scope, $http, $modal, $timeout) {
+
+		// Property window toggle state
+		$scope.propertyWindowState = {'collapsed': false};
+
+		// Add reference to global header-config
+		$scope.headerConfig = KISBPM.HEADER_CONFIG;
+
+		$scope.propertyWindowState.toggle = function () {
+			$scope.propertyWindowState.collapsed = !$scope.propertyWindowState.collapsed;
+			$timeout(function () {
+				jQuery(window).trigger('resize');
+			});
+		};
+
+		// Code that is dependent on an initialised Editor is wrapped in a promise for the editor
+		$scope.editorFactory.promise.then(function () {
+
+			/* Build stencil item list */
+
+			// Build simple json representation of stencil set
+			var stencilItemGroups = [];
+
+			// Helper method: find a group in an array
+			var findGroup = function (name, groupArray) {
+				for (var index = 0; index < groupArray.length; index++) {
+					if (groupArray[index].name === name) {
+						return groupArray[index];
+					}
+				}
+				return null;
+			};
+
+			// Helper method: add a new group to an array of groups
+			var addGroup = function (groupName, groupArray) {
+				var group = {name: groupName, items: [], paletteItems: [], groups: [], visible: true};
+				groupArray.push(group);
+				return group;
+			};
+
+			/*
+			 StencilSet items
+			 */
+			$http({method: 'GET', url: KISBPM.URL.getStencilSet()}).success(function (data, status, headers, config) {
+
+				var quickMenuDefinition = ['UserTask', 'EndNoneEvent', 'ExclusiveGateway',
+					'CatchTimerEvent', 'ThrowNoneEvent', 'TextAnnotation',
+					'SequenceFlow', 'Association'];
+				var ignoreForPaletteDefinition = ['SequenceFlow', 'MessageFlow', 'Association', 'DataAssociation', 'DataStore', 'SendTask'];
+				var quickMenuItems = [];
+
+				var morphRoles = [];
+				for (var i = 0; i < data.rules.morphingRules.length; i++) {
+					var role = data.rules.morphingRules[i].role;
+					var roleItem = {'role': role, 'morphOptions': []};
+					morphRoles.push(roleItem);
+				}
+
+				// Check all received items
+				for (var stencilIndex = 0; stencilIndex < data.stencils.length; stencilIndex++) {
+					// Check if the root group is the 'diagram' group. If so, this item should not be shown.
+					var currentGroupName = data.stencils[stencilIndex].groups[0];
+					if (currentGroupName === 'Diagram' || currentGroupName === 'Form') {
+						continue;  // go to next item
+					}
+
+					var removed = false;
+					if (data.stencils[stencilIndex].removed) {
+						removed = true;
+					}
+
+					var currentGroup = undefined;
+					if (!removed) {
+						// Check if this group already exists. If not, we create a new one
+
+						if (currentGroupName !== null && currentGroupName !== undefined && currentGroupName.length > 0) {
+
+							currentGroup = findGroup(currentGroupName, stencilItemGroups); // Find group in root groups array
+							if (currentGroup === null) {
+								currentGroup = addGroup(currentGroupName, stencilItemGroups);
+							}
+
+							// Add all child groups (if any)
+							for (var groupIndex = 1; groupIndex < data.stencils[stencilIndex].groups.length; groupIndex++) {
+								var childGroupName = data.stencils[stencilIndex].groups[groupIndex];
+								var childGroup = findGroup(childGroupName, currentGroup.groups);
+								if (childGroup === null) {
+									childGroup = addGroup(childGroupName, currentGroup.groups);
+								}
+
+								// The current group variable holds the parent of the next group (if any),
+								// and is basically the last element in the array of groups defined in the stencil item
+								currentGroup = childGroup;
+
+							}
+
+						}
+					}
+
+					// Construct the stencil item
+					var stencilItem = {
+						'id': data.stencils[stencilIndex].id,
+						'name': data.stencils[stencilIndex].title,
+						'description': data.stencils[stencilIndex].description,
+						'icon': data.stencils[stencilIndex].icon,
+						'type': data.stencils[stencilIndex].type,
+						'roles': data.stencils[stencilIndex].roles,
+						'removed': removed,
+						'customIcon': false,
+						'canConnect': false,
+						'canConnectTo': false,
+						'canConnectAssociation': false
+					};
+
+					if (data.stencils[stencilIndex].customIconId && data.stencils[stencilIndex].customIconId > 0) {
+						stencilItem.customIcon = true;
+						stencilItem.icon = data.stencils[stencilIndex].customIconId;
+					}
+
+					if (!removed) {
+						if (quickMenuDefinition.indexOf(stencilItem.id) >= 0) {
+							quickMenuItems[quickMenuDefinition.indexOf(stencilItem.id)] = stencilItem;
+						}
+					}
+
+					if (stencilItem.id === 'TextAnnotation' || stencilItem.id === 'BoundaryCompensationEvent') {
+						stencilItem.canConnectAssociation = true;
+					}
+
+					for (var i = 0; i < data.stencils[stencilIndex].roles.length; i++) {
+						var stencilRole = data.stencils[stencilIndex].roles[i];
+						if (stencilRole === 'sequence_start') {
+							stencilItem.canConnect = true;
+						} else if (stencilRole === 'sequence_end') {
+							stencilItem.canConnectTo = true;
+						}
+
+						for (var j = 0; j < morphRoles.length; j++) {
+							if (stencilRole === morphRoles[j].role) {
+								if (!removed) {
+									morphRoles[j].morphOptions.push(stencilItem);
+								}
+								stencilItem.morphRole = morphRoles[j].role;
+								break;
+							}
+						}
+					}
+
+					if (currentGroup) {
+						// Add the stencil item to the correct group
+						currentGroup.items.push(stencilItem);
+						if (ignoreForPaletteDefinition.indexOf(stencilItem.id) < 0) {
+							currentGroup.paletteItems.push(stencilItem);
+						}
+
+					} else {
+						// It's a root stencil element
+						if (!removed) {
+							stencilItemGroups.push(stencilItem);
+						}
+					}
+				}
+
+				for (var i = 0; i < stencilItemGroups.length; i++) {
+					if (stencilItemGroups[i].paletteItems && stencilItemGroups[i].paletteItems.length == 0) {
+						stencilItemGroups[i].visible = false;
+					}
+				}
+
+				$scope.stencilItemGroups = stencilItemGroups;
+
+				var containmentRules = [];
+				for (var i = 0; i < data.rules.containmentRules.length; i++) {
+					var rule = data.rules.containmentRules[i];
+					containmentRules.push(rule);
+				}
+				$scope.containmentRules = containmentRules;
+
+				// remove quick menu items which are not available anymore due to custom pallette
+				var availableQuickMenuItems = [];
+				for (var i = 0; i < quickMenuItems.length; i++) {
+					if (quickMenuItems[i]) {
+						availableQuickMenuItems[availableQuickMenuItems.length] = quickMenuItems[i];
+					}
+				}
+
+				$scope.quickMenuItems = availableQuickMenuItems;
+				$scope.morphRoles = morphRoles;
+			}).error(function (data, status, headers, config) {
+				console.log('Something went wrong when fetching stencil items:' + JSON.stringify(data));
+			});
+
+			/*
+			 * Listen to selection change events: show properties
+			 */
+			$scope.editor.registerOnEvent(ORYX.CONFIG.EVENT_SELECTION_CHANGED, function (event) {
+				var shapes = event.elements;
+				var canvasSelected = false;
+				if (shapes && shapes.length == 0) {
+					shapes = [$scope.editor.getCanvas()];
+					canvasSelected = true;
+				}
+				if (shapes && shapes.length > 0) {
+
+					var selectedShape = shapes.first();
+					var stencil = selectedShape.getStencil();
+
+					if ($rootScope.selectedElementBeforeScrolling && stencil.id().indexOf('BPMNDiagram') !== -1) {
+						// ignore canvas event because of empty selection when scrolling stops
+						return;
+					}
+
+					if ($rootScope.selectedElementBeforeScrolling && $rootScope.selectedElementBeforeScrolling.getId() === selectedShape.getId()) {
+						$rootScope.selectedElementBeforeScrolling = null;
+						return;
+					}
+
+					// Store previous selection
+					$scope.previousSelectedShape = $scope.selectedShape;
+
+					// Only do something if another element is selected (Oryx fires this event multiple times)
+					if ($scope.selectedShape !== undefined && $scope.selectedShape.getId() === selectedShape.getId()) {
+						if ($rootScope.forceSelectionRefresh) {
+							// Switch the flag again, this run will force refresh
+							$rootScope.forceSelectionRefresh = false;
+						} else {
+							// Selected the same element again, no need to update anything
+							return;
+						}
+					}
+
+					var selectedItem = {'title': '', 'properties': []};
+
+					if (canvasSelected) {
+						selectedItem.auditData = {
+							'author': $scope.modelData.createdByUser,
+							'createDate': $scope.modelData.createDate
+						};
+					}
+
+					// Gather properties of selected item
+					var properties = stencil.properties();
+					for (var i = 0; i < properties.length; i++) {
+						var property = properties[i];
+						if (property.popular() == false) continue;
+						var key = property.prefix() + "-" + property.id();
+
+						if (key === 'oryx-name') {
+							selectedItem.title = selectedShape.properties[key];
+						}
+
+						// First we check if there is a config for 'key-type' and then for 'type' alone
+						var propertyConfig = KISBPM.PROPERTY_CONFIG[key + '-' + property.type()];
+						if (propertyConfig === undefined || propertyConfig === null) {
+							propertyConfig = KISBPM.PROPERTY_CONFIG[property.type()];
+						}
+
+						if (propertyConfig === undefined || propertyConfig === null) {
+							console.log('WARNING: no property configuration defined for ' + key + ' of type ' + property.type());
+						} else {
+
+							if (selectedShape.properties[key] === 'true') {
+								selectedShape.properties[key] = true;
+							}
+
+							if (KISBPM.CONFIG.showRemovedProperties == false && property.isHidden()) {
+								continue;
+							}
+
+							var currentProperty = {
+								'key': key,
+								'title': property.title(),
+								'type': property.type(),
+								'mode': 'read',
+								'hidden': property.isHidden(),
+								'value': selectedShape.properties[key]
+							};
+
+							if ((currentProperty.type === 'complex' || currentProperty.type === 'multiplecomplex') && currentProperty.value && currentProperty.value.length > 0) {
+								try {
+									currentProperty.value = JSON.parse(currentProperty.value);
+								} catch (err) {
+									// ignore
+								}
+							}
+
+							if (propertyConfig.readModeTemplateUrl !== undefined && propertyConfig.readModeTemplateUrl !== null) {
+								currentProperty.readModeTemplateUrl = propertyConfig.readModeTemplateUrl + '?version=' + $rootScope.staticIncludeVersion;
+							}
+							if (propertyConfig.writeModeTemplateUrl !== null && propertyConfig.writeModeTemplateUrl !== null) {
+								currentProperty.writeModeTemplateUrl = propertyConfig.writeModeTemplateUrl + '?version=' + $rootScope.staticIncludeVersion;
+							}
+
+							if (propertyConfig.templateUrl !== undefined && propertyConfig.templateUrl !== null) {
+								currentProperty.templateUrl = propertyConfig.templateUrl + '?version=' + $rootScope.staticIncludeVersion;
+								currentProperty.hasReadWriteMode = false;
+							} else {
+								currentProperty.hasReadWriteMode = true;
+							}
+
+							if (currentProperty.value === undefined
+								|| currentProperty.value === null
+								|| currentProperty.value.length == 0) {
+								currentProperty.noValue = true;
+							}
+
+							selectedItem.properties.push(currentProperty);
+						}
+					}
+
+					// Need to wrap this in an $apply block, see http://jimhoskins.com/2012/12/17/angularjs-and-apply.html
+					$scope.safeApply(function () {
+						$scope.selectedItem = selectedItem;
+						$scope.selectedShape = selectedShape;
+					});
+
+				} else {
+					$scope.safeApply(function () {
+						$scope.selectedItem = {};
+						$scope.selectedShape = null;
+					});
+				}
+			});
+
+			$scope.editor.registerOnEvent(ORYX.CONFIG.EVENT_SELECTION_CHANGED, function (event) {
+
+				KISBPM.eventBus.dispatch(KISBPM.eventBus.EVENT_TYPE_HIDE_SHAPE_BUTTONS);
+				var shapes = event.elements;
+
+				if (shapes && shapes.length == 1) {
+
+					var selectedShape = shapes.first();
+
+					var a = $scope.editor.getCanvas().node.getScreenCTM();
+
+					var absoluteXY = selectedShape.absoluteXY();
+
+					absoluteXY.x *= a.a;
+					absoluteXY.y *= a.d;
+
+					var additionalIEZoom = 1;
+					if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
+						var ua = navigator.userAgent;
+						if (ua.indexOf('MSIE') >= 0) {
+							//IE 10 and below
+							var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
+							if (zoom !== 100) {
+								additionalIEZoom = zoom / 100
+							}
+						}
+					}
+
+					if (additionalIEZoom === 1) {
+						absoluteXY.y = absoluteXY.y - jQuery("#canvasSection").offset().top + 5;
+						absoluteXY.x = absoluteXY.x - jQuery("#canvasSection").offset().left;
+
+					} else {
+						var canvasOffsetLeft = jQuery("#canvasSection").offset().left;
+						var canvasScrollLeft = jQuery("#canvasSection").scrollLeft();
+						var canvasScrollTop = jQuery("#canvasSection").scrollTop();
+
+						var offset = a.e - (canvasOffsetLeft * additionalIEZoom);
+						var additionaloffset = 0;
+						if (offset > 10) {
+							additionaloffset = (offset / additionalIEZoom) - offset;
+						}
+						absoluteXY.y = absoluteXY.y - (jQuery("#canvasSection").offset().top * additionalIEZoom) + 5 + ((canvasScrollTop * additionalIEZoom) - canvasScrollTop);
+						absoluteXY.x = absoluteXY.x - (canvasOffsetLeft * additionalIEZoom) + additionaloffset + ((canvasScrollLeft * additionalIEZoom) - canvasScrollLeft);
+					}
+
+					var bounds = new ORYX.Core.Bounds(a.e + absoluteXY.x, a.f + absoluteXY.y, a.e + absoluteXY.x + a.a * selectedShape.bounds.width(), a.f + absoluteXY.y + a.d * selectedShape.bounds.height());
+					var shapeXY = bounds.upperLeft();
+
+					var stencilItem = $scope.getStencilItemById(selectedShape.getStencil().idWithoutNs());
+					var morphShapes = [];
+					if (stencilItem && stencilItem.morphRole) {
+						for (var i = 0; i < $scope.morphRoles.length; i++) {
+							if ($scope.morphRoles[i].role === stencilItem.morphRole) {
+								morphShapes = $scope.morphRoles[i].morphOptions;
+							}
+						}
+					}
+
+					var x = shapeXY.x;
+					if (bounds.width() < 48) {
+						x -= 24;
+					}
+
+					if (morphShapes && morphShapes.length > 0) {
+						// In case the element is not wide enough, start the 2 bottom-buttons more to the left
+						// to prevent overflow in the right-menu
+						var morphButton = document.getElementById('morph-button');
+						morphButton.style.display = "block";
+						morphButton.style.left = x + 24 + 'px';
+						morphButton.style.top = (shapeXY.y + bounds.height() + 2) + 'px';
+					}
+
+					var deleteButton = document.getElementById('delete-button');
+					deleteButton.style.display = "block";
+					deleteButton.style.left = x + 'px';
+					deleteButton.style.top = (shapeXY.y + bounds.height() + 2) + 'px';
+
+					if (stencilItem && (stencilItem.canConnect || stencilItem.canConnectAssociation)) {
+						var quickButtonCounter = 0;
+						var quickButtonX = shapeXY.x + bounds.width() + 5;
+						var quickButtonY = shapeXY.y;
+						jQuery('.Oryx_button').each(function (i, obj) {
+							if (obj.id !== 'morph-button' && obj.id != 'delete-button') {
+								quickButtonCounter++;
+								if (quickButtonCounter > 3) {
+									quickButtonX = shapeXY.x + bounds.width() + 5;
+									quickButtonY += 24;
+									quickButtonCounter = 1;
+
+								} else if (quickButtonCounter > 1) {
+									quickButtonX += 24;
+								}
+								obj.style.display = "block";
+								obj.style.left = quickButtonX + 'px';
+								obj.style.top = quickButtonY + 'px';
+							}
+						});
+					}
+				}
+			});
+
+			if (!$rootScope.stencilInitialized) {
+				KISBPM.eventBus.addListener(KISBPM.eventBus.EVENT_TYPE_HIDE_SHAPE_BUTTONS, function (event) {
+					jQuery('.Oryx_button').each(function (i, obj) {
+						obj.style.display = "none";
+					});
+				});
+
+				/*
+				 * Listen to property updates and act upon them
+				 */
+				KISBPM.eventBus.addListener(KISBPM.eventBus.EVENT_TYPE_PROPERTY_VALUE_CHANGED, function (event) {
+					if (event.property && event.property.key) {
+						// If the name property is been updated, we also need to change the title of the currently selected item
+						if (event.property.key === 'oryx-name' && $scope.selectedItem !== undefined && $scope.selectedItem !== null) {
+							$scope.selectedItem.title = event.newValue;
+						}
+
+						// Update "no value" flag
+						event.property.noValue = (event.property.value === undefined
+							|| event.property.value === null
+							|| event.property.value.length == 0);
+					}
+				});
+
+				$rootScope.stencilInitialized = true;
+			}
+
+			$scope.morphShape = function () {
+				$scope.safeApply(function () {
+
+					var shapes = $rootScope.editor.getSelection();
+					if (shapes && shapes.length == 1) {
+						$rootScope.currentSelectedShape = shapes.first();
+						var stencilItem = $scope.getStencilItemById($rootScope.currentSelectedShape.getStencil().idWithoutNs());
+						var morphShapes = [];
+						for (var i = 0; i < $scope.morphRoles.length; i++) {
+							if ($scope.morphRoles[i].role === stencilItem.morphRole) {
+								morphShapes = $scope.morphRoles[i].morphOptions.slice();
+							}
+						}
+
+						// Method to open shape select dialog (used later on)
+						var showSelectShapeDialog = function () {
+							$rootScope.morphShapes = morphShapes;
+							$modal({
+								backdrop: false,
+								keyboard: true,
+								template: 'editor-app/popups/select-shape.html?version=' + Date.now()
+							});
+						};
+
+						showSelectShapeDialog();
+					}
+				});
+			};
+
+			$scope.deleteShape = function () {
+				KISBPM.TOOLBAR.ACTIONS.deleteItem({'$scope': $scope});
+			};
+
+			$scope.quickAddItem = function (newItemId) {
+				$scope.safeApply(function () {
+
+					var shapes = $rootScope.editor.getSelection();
+					if (shapes && shapes.length == 1) {
+						$rootScope.currentSelectedShape = shapes.first();
+
+						var containedStencil = undefined;
+						var stencilSets = $scope.editor.getStencilSets().values();
+						for (var i = 0; i < stencilSets.length; i++) {
+							var stencilSet = stencilSets[i];
+							var nodes = stencilSet.nodes();
+							for (var j = 0; j < nodes.length; j++) {
+								if (nodes[j].idWithoutNs() === newItemId) {
+									containedStencil = nodes[j];
+									break;
+								}
+							}
+						}
+
+						if (!containedStencil) return;
+
+						var option = {
+							type: $scope.currentSelectedShape.getStencil().namespace() + newItemId,
+							namespace: $scope.currentSelectedShape.getStencil().namespace()
+						};
+						option['connectedShape'] = $rootScope.currentSelectedShape;
+						option['parent'] = $rootScope.currentSelectedShape.parent;
+						option['containedStencil'] = containedStencil;
+
+						var args = {sourceShape: $rootScope.currentSelectedShape, targetStencil: containedStencil};
+						var targetStencil = $scope.editor.getRules().connectMorph(args);
+						if (!targetStencil) {
+							return;
+						}// Check if there can be a target shape
+						option['connectingType'] = targetStencil.id();
+
+						var command = new KISBPM.CreateCommand(option, undefined, undefined, $scope.editor);
+
+						$scope.editor.executeCommands([command]);
+					}
 				});
-            }
-        };
+			};
+
+		}); // end of $scope.editorFactory.promise block
 
-    }]);
+		/* Click handler for clicking a property */
+		$scope.propertyClicked = function (index) {
+			if (!$scope.selectedItem.properties[index].hidden) {
+				$scope.selectedItem.properties[index].mode = "write";
+			}
+		};
+
+		/* Helper method to retrieve the template url for a property */
+		$scope.getPropertyTemplateUrl = function (index) {
+			return $scope.selectedItem.properties[index].templateUrl;
+		};
+		$scope.getPropertyReadModeTemplateUrl = function (index) {
+			return $scope.selectedItem.properties[index].readModeTemplateUrl;
+		};
+		$scope.getPropertyWriteModeTemplateUrl = function (index) {
+			return $scope.selectedItem.properties[index].writeModeTemplateUrl;
+		};
+
+		/* Method available to all sub controllers (for property controllers) to update the internal Oryx model */
+		$scope.updatePropertyInModel = function (property, shapeId) {
+
+			var shape = $scope.selectedShape;
+			// Some updates may happen when selected shape is already changed, so when an additional
+			// shapeId is supplied, we need to make sure the correct shape is updated (current or previous)
+			if (shapeId) {
+				if (shape.id != shapeId && $scope.previousSelectedShape && $scope.previousSelectedShape.id == shapeId) {
+					shape = $scope.previousSelectedShape;
+				} else {
+					shape = null;
+				}
+			}
+
+			if (!shape) {
+				// When no shape is selected, or no shape is found for the alternative
+				// shape ID, do nothing
+				return;
+			}
+			var key = property.key;
+			var newValue = property.value;
+			var oldValue = shape.properties[key];
+
+			if (newValue != oldValue) {
+				var commandClass = ORYX.Core.Command.extend({
+					construct: function () {
+						this.key = key;
+						this.oldValue = oldValue;
+						this.newValue = newValue;
+						this.shape = shape;
+						this.facade = $scope.editor;
+					},
+					execute: function () {
+						this.shape.setProperty(this.key, this.newValue);
+						this.facade.getCanvas().update();
+						this.facade.updateSelection();
+					},
+					rollback: function () {
+						this.shape.setProperty(this.key, this.oldValue);
+						this.facade.getCanvas().update();
+						this.facade.updateSelection();
+					}
+				});
+				// Instantiate the class
+				var command = new commandClass();
+
+				// Execute the command
+				$scope.editor.executeCommands([command]);
+				$scope.editor.handleEvents({
+					type: ORYX.CONFIG.EVENT_PROPWINDOW_PROP_CHANGED,
+					elements: [shape],
+					key: key
+				});
+
+				// Switch the property back to read mode, now the update is done
+				property.mode = 'read';
+
+				// Fire event to all who is interested
+				// Fire event to all who want to know about this
+				var event = {
+					type: KISBPM.eventBus.EVENT_TYPE_PROPERTY_VALUE_CHANGED,
+					property: property,
+					oldValue: oldValue,
+					newValue: newValue
+				};
+				KISBPM.eventBus.dispatch(event.type, event);
+			} else {
+				// Switch the property back to read mode, no update was needed
+				property.mode = 'read';
+			}
+
+		};
+
+		/**
+		 * Helper method that searches a group for an item with the given id.
+		 * If not found, will return undefined.
+		 */
+		$scope.findStencilItemInGroup = function (stencilItemId, group) {
+
+			var item;
+
+			// Check all items directly in this group
+			for (var j = 0; j < group.items.length; j++) {
+				item = group.items[j];
+				if (item.id === stencilItemId) {
+					return item;
+				}
+			}
+
+			// Check the child groups
+			if (group.groups && group.groups.length > 0) {
+				for (var k = 0; k < group.groups.length; k++) {
+					item = $scope.findStencilItemInGroup(stencilItemId, group.groups[k]);
+					if (item) {
+						return item;
+					}
+				}
+			}
+
+			return undefined;
+		};
+
+		/**
+		 * Helper method to find a stencil item.
+		 */
+		$scope.getStencilItemById = function (stencilItemId) {
+			for (var i = 0; i < $scope.stencilItemGroups.length; i++) {
+				var element = $scope.stencilItemGroups[i];
+
+				// Real group
+				if (element.items !== null && element.items !== undefined) {
+					var item = $scope.findStencilItemInGroup(stencilItemId, element);
+					if (item) {
+						return item;
+					}
+				} else { // Root stencil item
+					if (element.id === stencilItemId) {
+						return element;
+					}
+				}
+			}
+			return undefined;
+		};
+
+		/*
+		 * DRAG AND DROP FUNCTIONALITY
+		 */
+
+		$scope.dropCallback = function (event, ui) {
+
+			$scope.editor.handleEvents({
+				type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
+				highlightId: "shapeRepo.attached"
+			});
+			$scope.editor.handleEvents({
+				type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
+				highlightId: "shapeRepo.added"
+			});
+
+			$scope.editor.handleEvents({
+				type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
+				highlightId: "shapeMenu"
+			});
+
+			KISBPM.eventBus.dispatch(KISBPM.eventBus.EVENT_TYPE_HIDE_SHAPE_BUTTONS);
+
+			if ($scope.dragCanContain) {
+
+				var item = $scope.getStencilItemById(ui.draggable[0].id);
+
+				var pos = {x: event.pageX, y: event.pageY};
+
+				var additionalIEZoom = 1;
+				if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
+					var ua = navigator.userAgent;
+					if (ua.indexOf('MSIE') >= 0) {
+						//IE 10 and below
+						var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
+						if (zoom !== 100) {
+							additionalIEZoom = zoom / 100;
+						}
+					}
+				}
+
+				var screenCTM = $scope.editor.getCanvas().node.getScreenCTM();
+
+				// Correcting the UpperLeft-Offset
+				pos.x -= (screenCTM.e / additionalIEZoom);
+				pos.y -= (screenCTM.f / additionalIEZoom);
+				// Correcting the Zoom-Factor
+				pos.x /= screenCTM.a;
+				pos.y /= screenCTM.d;
+
+				// Correcting the ScrollOffset
+				pos.x -= document.documentElement.scrollLeft;
+				pos.y -= document.documentElement.scrollTop;
+
+				var parentAbs = $scope.dragCurrentParent.absoluteXY();
+				pos.x -= parentAbs.x;
+				pos.y -= parentAbs.y;
+
+				var containedStencil = undefined;
+				var stencilSets = $scope.editor.getStencilSets().values();
+				for (var i = 0; i < stencilSets.length; i++) {
+					var stencilSet = stencilSets[i];
+					var nodes = stencilSet.nodes();
+					for (var j = 0; j < nodes.length; j++) {
+						if (nodes[j].idWithoutNs() === ui.draggable[0].id) {
+							containedStencil = nodes[j];
+							break;
+						}
+					}
+
+					if (!containedStencil) {
+						var edges = stencilSet.edges();
+						for (var j = 0; j < edges.length; j++) {
+							if (edges[j].idWithoutNs() === ui.draggable[0].id) {
+								containedStencil = edges[j];
+								break;
+							}
+						}
+					}
+				}
+
+				if (!containedStencil) return;
+
+				if ($scope.quickMenu) {
+					var shapes = $scope.editor.getSelection();
+					if (shapes && shapes.length == 1) {
+						var currentSelectedShape = shapes.first();
+
+						var option = {};
+						option.type = currentSelectedShape.getStencil().namespace() + ui.draggable[0].id;
+						option.namespace = currentSelectedShape.getStencil().namespace();
+						option.connectedShape = currentSelectedShape;
+						option.parent = $scope.dragCurrentParent;
+						option.containedStencil = containedStencil;
+
+						// If the ctrl key is not pressed,
+						// snapp the new shape to the center
+						// if it is near to the center of the other shape
+						if (!event.ctrlKey) {
+							// Get the center of the shape
+							var cShape = currentSelectedShape.bounds.center();
+							// Snapp +-20 Pixel horizontal to the center
+							if (20 > Math.abs(cShape.x - pos.x)) {
+								pos.x = cShape.x;
+							}
+							// Snapp +-20 Pixel vertical to the center
+							if (20 > Math.abs(cShape.y - pos.y)) {
+								pos.y = cShape.y;
+							}
+						}
+
+						option.position = pos;
+
+						if (containedStencil.idWithoutNs() !== 'SequenceFlow' && containedStencil.idWithoutNs() !== 'Association' &&
+							containedStencil.idWithoutNs() !== 'MessageFlow' && containedStencil.idWithoutNs() !== 'DataAssociation') {
+							var args = {sourceShape: currentSelectedShape, targetStencil: containedStencil};
+							var targetStencil = $scope.editor.getRules().connectMorph(args);
+							if (!targetStencil) {
+								return;
+							}// Check if there can be a target shape
+							option.connectingType = targetStencil.id();
+						}
+
+						var command = new KISBPM.CreateCommand(option, $scope.dropTargetElement, pos, $scope.editor);
+
+						$scope.editor.executeCommands([command]);
+					}
+				} else {
+					var canAttach = false;
+					if (containedStencil.idWithoutNs() === 'BoundaryErrorEvent' || containedStencil.idWithoutNs() === 'BoundaryTimerEvent' ||
+						containedStencil.idWithoutNs() === 'BoundarySignalEvent' || containedStencil.idWithoutNs() === 'BoundaryMessageEvent' ||
+						containedStencil.idWithoutNs() === 'BoundaryCancelEvent' || containedStencil.idWithoutNs() === 'BoundaryCompensationEvent') {
+						// Modify position, otherwise boundary event will get position related to left corner of the canvas instead of the container
+						pos = $scope.editor.eventCoordinates(event);
+						canAttach = true;
+					}
+
+					var option = {};
+					option['type'] = $scope.modelData.model.stencilset.namespace + item.id;
+					option['namespace'] = $scope.modelData.model.stencilset.namespace;
+					option['position'] = pos;
+					option['parent'] = $scope.dragCurrentParent;
+
+					var commandClass = ORYX.Core.Command.extend({
+						construct: function (option, dockedShape, canAttach, position, facade) {
+							this.option = option;
+							this.docker = null;
+							this.dockedShape = dockedShape;
+							this.dockedShapeParent = dockedShape.parent || facade.getCanvas();
+							this.position = position;
+							this.facade = facade;
+							this.selection = this.facade.getSelection();
+							this.shape = null;
+							this.parent = null;
+							this.canAttach = canAttach;
+						},
+						execute: function () {
+							if (!this.shape) {
+								this.shape = this.facade.createShape(option);
+								this.parent = this.shape.parent;
+							} else if (this.parent) {
+								this.parent.add(this.shape);
+							}
+
+							if (this.canAttach && this.shape.dockers && this.shape.dockers.length) {
+								this.docker = this.shape.dockers[0];
+
+								this.dockedShapeParent.add(this.docker.parent);
+
+								// Set the Docker to the new Shape
+								this.docker.setDockedShape(undefined);
+								this.docker.bounds.centerMoveTo(this.position);
+								if (this.dockedShape !== this.facade.getCanvas()) {
+									this.docker.setDockedShape(this.dockedShape);
+								}
+								this.facade.setSelection([this.docker.parent]);
+							}
+
+							this.facade.getCanvas().update();
+							this.facade.updateSelection();
+
+						},
+						rollback: function () {
+							if (this.shape) {
+								this.facade.setSelection(this.selection.without(this.shape));
+								this.facade.deleteShape(this.shape);
+							}
+							if (this.canAttach && this.docker) {
+								this.docker.setDockedShape(undefined);
+							}
+							this.facade.getCanvas().update();
+							this.facade.updateSelection();
+
+						}
+					});
+
+					// Update canvas
+					var command = new commandClass(option, $scope.dragCurrentParent, canAttach, pos, $scope.editor);
+					$scope.editor.executeCommands([command]);
+
+					// Fire event to all who want to know about this
+					var dropEvent = {
+						type: KISBPM.eventBus.EVENT_TYPE_ITEM_DROPPED,
+						droppedItem: item,
+						position: pos
+					};
+					KISBPM.eventBus.dispatch(dropEvent.type, dropEvent);
+				}
+			}
+
+			$scope.dragCurrentParent = undefined;
+			$scope.dragCurrentParentId = undefined;
+			$scope.dragCurrentParentStencil = undefined;
+			$scope.dragCanContain = undefined;
+			$scope.quickMenu = undefined;
+			$scope.dropTargetElement = undefined;
+		};
+
+
+		$scope.overCallback = function (event, ui) {
+			$scope.dragModeOver = true;
+		};
+
+		$scope.outCallback = function (event, ui) {
+			$scope.dragModeOver = false;
+		};
+
+		$scope.startDragCallback = function (event, ui) {
+			$scope.dragModeOver = false;
+			$scope.quickMenu = false;
+			if (!ui.helper.hasClass('stencil-item-dragged')) {
+				ui.helper.addClass('stencil-item-dragged');
+			}
+		};
+
+		$scope.startDragCallbackQuickMenu = function (event, ui) {
+			$scope.dragModeOver = false;
+			$scope.quickMenu = true;
+		};
+
+		$scope.dragCallback = function (event, ui) {
+
+			if ($scope.dragModeOver != false) {
+
+				var coord = $scope.editor.eventCoordinatesXY(event.pageX, event.pageY);
+
+				var additionalIEZoom = 1;
+				if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
+					var ua = navigator.userAgent;
+					if (ua.indexOf('MSIE') >= 0) {
+						//IE 10 and below
+						var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
+						if (zoom !== 100) {
+							additionalIEZoom = zoom / 100
+						}
+					}
+				}
+
+				if (additionalIEZoom !== 1) {
+					coord.x = coord.x / additionalIEZoom;
+					coord.y = coord.y / additionalIEZoom;
+				}
+
+				var aShapes = $scope.editor.getCanvas().getAbstractShapesAtPosition(coord);
+
+				if (aShapes.length <= 0) {
+					if (event.helper) {
+						$scope.dragCanContain = false;
+						return false;
+					}
+				}
+
+				if (aShapes[0] instanceof ORYX.Core.Canvas) {
+					$scope.editor.getCanvas().setHightlightStateBasedOnX(coord.x);
+				}
+
+				if (aShapes.length == 1 && aShapes[0] instanceof ORYX.Core.Canvas) {
+					var parentCandidate = aShapes[0];
+
+					$scope.dragCanContain = true;
+					$scope.dragCurrentParent = parentCandidate;
+					$scope.dragCurrentParentId = parentCandidate.id;
+
+					$scope.editor.handleEvents({
+						type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
+						highlightId: "shapeRepo.attached"
+					});
+					$scope.editor.handleEvents({
+						type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
+						highlightId: "shapeRepo.added"
+					});
+					return false;
+				} else {
+					var item = $scope.getStencilItemById(event.target.id);
+
+					var parentCandidate = aShapes.reverse().find(function (candidate) {
+						return (candidate instanceof ORYX.Core.Canvas
+							|| candidate instanceof ORYX.Core.Node
+							|| candidate instanceof ORYX.Core.Edge);
+					});
+
+					if (!parentCandidate) {
+						$scope.dragCanContain = false;
+						return false;
+					}
+
+					if (item.type === "node") {
+
+						// check if the draggable is a boundary event and the parent an Activity
+						var _canContain = false;
+						var parentStencilId = parentCandidate.getStencil().id();
+
+						if ($scope.dragCurrentParentId && $scope.dragCurrentParentId === parentCandidate.id) {
+							return false;
+						}
+
+						var parentItem = $scope.getStencilItemById(parentCandidate.getStencil().idWithoutNs());
+						if (parentItem.roles.indexOf("Activity") > -1) {
+							if (item.roles.indexOf("IntermediateEventOnActivityBoundary") > -1) {
+								_canContain = true;
+							}
+						} else if (parentCandidate.getStencil().idWithoutNs() === 'Pool') {
+							if (item.id === 'Lane') {
+								_canContain = true;
+							}
+						}
+
+						if (_canContain) {
+							$scope.editor.handleEvents({
+								type: ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW,
+								highlightId: "shapeRepo.attached",
+								elements: [parentCandidate],
+								style: ORYX.CONFIG.SELECTION_HIGHLIGHT_STYLE_RECTANGLE,
+								color: ORYX.CONFIG.SELECTION_VALID_COLOR
+							});
+
+							$scope.editor.handleEvents({
+								type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
+								highlightId: "shapeRepo.added"
+							});
+						} else {
+							for (var i = 0; i < $scope.containmentRules.length; i++) {
+								var rule = $scope.containmentRules[i];
+								if (rule.role === parentItem.id) {
+									for (var j = 0; j < rule.contains.length; j++) {
+										if (item.roles.indexOf(rule.contains[j]) > -1) {
+											_canContain = true;
+											break;
+										}
+									}
+
+									if (_canContain) {
+										break;
+									}
+								}
+							}
+
+							// Show Highlight
+							$scope.editor.handleEvents({
+								type: ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW,
+								highlightId: 'shapeRepo.added',
+								elements: [parentCandidate],
+								color: _canContain ? ORYX.CONFIG.SELECTION_VALID_COLOR : ORYX.CONFIG.SELECTION_INVALID_COLOR
+							});
+
+							$scope.editor.handleEvents({
+								type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
+								highlightId: "shapeRepo.attached"
+							});
+						}
+
+						$scope.dragCurrentParent = parentCandidate;
+						$scope.dragCurrentParentId = parentCandidate.id;
+						$scope.dragCurrentParentStencil = parentStencilId;
+						$scope.dragCanContain = _canContain;
+
+					} else {
+						var canvasCandidate = $scope.editor.getCanvas();
+						var canConnect = false;
+
+						var targetStencil = $scope.getStencilItemById(parentCandidate.getStencil().idWithoutNs());
+						if (targetStencil) {
+							var associationConnect = false;
+							if (stencil.idWithoutNs() === 'Association' && (curCan.getStencil().idWithoutNs() === 'TextAnnotation' || curCan.getStencil().idWithoutNs() === 'BoundaryCompensationEvent')) {
+								associationConnect = true;
+							} else if (stencil.idWithoutNs() === 'DataAssociation' && curCan.getStencil().idWithoutNs() === 'DataStore') {
+								associationConnect = true;
+							}
+
+							if (targetStencil.canConnectTo || associationConnect) {
+								canConnect = true;
+							}
+						}
+
+						//Edge
+						$scope.dragCurrentParent = canvasCandidate;
+						$scope.dragCurrentParentId = canvasCandidate.id;
+						$scope.dragCurrentParentStencil = canvasCandidate.getStencil().id();
+						$scope.dragCanContain = canConnect;
+
+						// Show Highlight
+						$scope.editor.handleEvents({
+							type: ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW,
+							highlightId: 'shapeRepo.added',
+							elements: [canvasCandidate],
+							color: ORYX.CONFIG.SELECTION_VALID_COLOR
+						});
+
+						$scope.editor.handleEvents({
+							type: ORYX.CONFIG.EVENT_HIGHLIGHT_HIDE,
+							highlightId: "shapeRepo.attached"
+						});
+					}
+				}
+			}
+		};
+
+		$scope.dragCallbackQuickMenu = function (event, ui) {
+
+			if ($scope.dragModeOver != false) {
+				var coord = $scope.editor.eventCoordinatesXY(event.pageX, event.pageY);
+
+				var additionalIEZoom = 1;
+				if (!isNaN(screen.logicalXDPI) && !isNaN(screen.systemXDPI)) {
+					var ua = navigator.userAgent;
+					if (ua.indexOf('MSIE') >= 0) {
+						//IE 10 and below
+						var zoom = Math.round((screen.deviceXDPI / screen.logicalXDPI) * 100);
+						if (zoom !== 100) {
+							additionalIEZoom = zoom / 100
+						}
+					}
+				}
+
+				if (additionalIEZoom !== 1) {
+					coord.x = coord.x / additionalIEZoom;
+					coord.y = coord.y / additionalIEZoom;
+				}
+
+				var aShapes = $scope.editor.getCanvas().getAbstractShapesAtPosition(coord);
+
+				if (aShapes.length <= 0) {
+					if (event.helper) {
+						$scope.dragCanContain = false;
+						return false;
+					}
+				}
+
+				if (aShapes[0] instanceof ORYX.Core.Canvas) {
+					$scope.editor.getCanvas().setHightlightStateBasedOnX(coord.x);
+				}
+
+				var stencil = undefined;
+				var stencilSets = $scope.editor.getStencilSets().values();
+				for (var i = 0; i < stencilSets.length; i++) {
+					var stencilSet = stencilSets[i];
+					var nodes = stencilSet.nodes();
+					for (var j = 0; j < nodes.length; j++) {
+						if (nodes[j].idWithoutNs() === event.target.id) {
+							stencil = nodes[j];
+							break;
+						}
+					}
+
+					if (!stencil) {
+						var edges = stencilSet.edges();
+						for (var j = 0; j < edges.length; j++) {
+							if (edges[j].idWithoutNs() === event.target.id) {
+								stencil = edges[j];
+								break;
+							}
+						}
+					}
+				}
+
+				var candidate = aShapes.last();
+
+				var isValid = false;
+				if (stencil.type() === "node") {
+					//check containment rules
+					var canContain = $scope.editor.getRules().canContain({
+						containingShape: candidate,
+						containedStencil: stencil
+					});
+
+					var parentCandidate = aShapes.reverse().find(function (candidate) {
+						return (candidate instanceof ORYX.Core.Canvas
+							|| candidate instanceof ORYX.Core.Node
+							|| candidate instanceof ORYX.Core.Edge);
+					});
+
+					if (!parentCandidate) {
+						$scope.dragCanContain = false;
+						return false;
+					}
+
+					$scope.dragCurrentParent = parentCandidate;
+					$scope.dragCurrentParentId = parentCandidate.id;
+					$scope.dragCurrentParentStencil = parentCandidate.getStencil().id();
+					$scope.dragCanContain = canContain;
+					$scope.dropTargetElement = parentCandidate;
+					isValid = canContain;
+
+				} else { //Edge
+
+					var shapes = $scope.editor.getSelection();
+					if (shapes && shapes.length == 1) {
+						var currentSelectedShape = shapes.first();
+						var curCan = candidate;
+						var canConnect = false;
+
+						var targetStencil = $scope.getStencilItemById(curCan.getStencil().idWithoutNs());
+						if (targetStencil) {
+							var associationConnect = false;
+							if (stencil.idWithoutNs() === 'Association' && (curCan.getStencil().idWithoutNs() === 'TextAnnotation' || curCan.getStencil().idWithoutNs() === 'BoundaryCompensationEvent')) {
+								associationConnect = true;
+							} else if (stencil.idWithoutNs() === 'DataAssociation' && curCan.getStencil().idWithoutNs() === 'DataStore') {
+								associationConnect = true;
+							}
+
+							if (targetStencil.canConnectTo || associationConnect) {
+								while (!canConnect && curCan && !(curCan instanceof ORYX.Core.Canvas)) {
+									candidate = curCan;
+									//check connection rules
+									canConnect = $scope.editor.getRules().canConnect({
+										sourceShape: currentSelectedShape,
+										edgeStencil: stencil,
+										targetShape: curCan
+									});
+									curCan = curCan.parent;
+								}
+							}
+						}
+						var parentCandidate = $scope.editor.getCanvas();
+
+						isValid = canConnect;
+						$scope.dragCurrentParent = parentCandidate;
+						$scope.dragCurrentParentId = parentCandidate.id;
+						$scope.dragCurrentParentStencil = parentCandidate.getStencil().id();
+						$scope.dragCanContain = canConnect;
+						$scope.dropTargetElement = candidate;
+					}
+
+				}
+
+				$scope.editor.handleEvents({
+					type: ORYX.CONFIG.EVENT_HIGHLIGHT_SHOW,
+					highlightId: 'shapeMenu',
+					elements: [candidate],
+					color: isValid ? ORYX.CONFIG.SELECTION_VALID_COLOR : ORYX.CONFIG.SELECTION_INVALID_COLOR
+				});
+			}
+		};
+
+	}]);
 
 var KISBPM = KISBPM || {};
 //create command for undo/redo
 KISBPM.CreateCommand = ORYX.Core.Command.extend({
-	construct: function(option, currentReference, position, facade){
+	construct: function (option, currentReference, position, facade) {
 		this.option = option;
 		this.currentReference = currentReference;
 		this.position = position;
@@ -1308,17 +1263,17 @@ KISBPM.CreateCommand = ORYX.Core.Command.extend({
 		/*
 		 * clone options parameters
 		 */
-        this.connectedShape = option.connectedShape;
-        this.connectingType = option.connectingType;
-        this.namespace = option.namespace;
-        this.type = option.type;
-        this.containedStencil = option.containedStencil;
-        this.parent = option.parent;
-        this.currentReference = currentReference;
-        this.shapeOptions = option.shapeOptions;
-	},			
-	execute: function(){
-		
+		this.connectedShape = option.connectedShape;
+		this.connectingType = option.connectingType;
+		this.namespace = option.namespace;
+		this.type = option.type;
+		this.containedStencil = option.containedStencil;
+		this.parent = option.parent;
+		this.currentReference = currentReference;
+		this.shapeOptions = option.shapeOptions;
+	},
+	execute: function () {
+
 		if (this.shape) {
 			if (this.shape instanceof ORYX.Core.Node) {
 				this.parent.add(this.shape);
@@ -1329,46 +1284,41 @@ KISBPM.CreateCommand = ORYX.Core.Command.extend({
 					this.edge.dockers.last().setDockedShape(this.shape);
 					this.edge.dockers.last().setReferencePoint(this.targetRefPos);
 				}
-				
+
 				this.facade.setSelection([this.shape]);
-				
+
 			} else if (this.shape instanceof ORYX.Core.Edge) {
 				this.facade.getCanvas().add(this.shape);
 				this.shape.dockers.first().setDockedShape(this.connectedShape);
 				this.shape.dockers.first().setReferencePoint(this.sourceRefPos);
 			}
-		}
-		else {
+		} else {
 			this.shape = this.facade.createShape(this.option);
 			this.edge = (!(this.shape instanceof ORYX.Core.Edge)) ? this.shape.getIncomingShapes().first() : undefined;
 		}
-		
+
 		if (this.currentReference && this.position) {
-			
+
 			if (this.shape instanceof ORYX.Core.Edge) {
-			
+
 				if (!(this.currentReference instanceof ORYX.Core.Canvas)) {
 					this.shape.dockers.last().setDockedShape(this.currentReference);
-					
-					if (this.currentReference.getStencil().idWithoutNs() === 'TextAnnotation')
-					{
+
+					if (this.currentReference.getStencil().idWithoutNs() === 'TextAnnotation') {
 						var midpoint = {};
 						midpoint.x = 0;
 						midpoint.y = this.currentReference.bounds.height() / 2;
 						this.shape.dockers.last().setReferencePoint(midpoint);
-					}
-					else
-					{
+					} else {
 						this.shape.dockers.last().setReferencePoint(this.currentReference.bounds.midPoint());
 					}
-				}
-				else {
+				} else {
 					this.shape.dockers.last().bounds.centerMoveTo(this.position);
 				}
 				this.sourceRefPos = this.shape.dockers.first().referencePoint;
 				this.targetRefPos = this.shape.dockers.last().referencePoint;
-				
-			} else if (this.edge){
+
+			} else if (this.edge) {
 				this.sourceRefPos = this.edge.dockers.first().referencePoint;
 				this.targetRefPos = this.edge.dockers.last().referencePoint;
 			}
@@ -1377,56 +1327,56 @@ KISBPM.CreateCommand = ORYX.Core.Command.extend({
 			var connectedShape = this.connectedShape;
 			var bc = connectedShape.bounds;
 			var bs = this.shape.bounds;
-			
+
 			var pos = bc.center();
-			if(containedStencil.defaultAlign()==="north") {
-				pos.y -= (bc.height() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET + (bs.height()/2);
-			} else if(containedStencil.defaultAlign()==="northeast") {
-				pos.x += (bc.width() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET_CORNER + (bs.width()/2);
-				pos.y -= (bc.height() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET_CORNER + (bs.height()/2);
-			} else if(containedStencil.defaultAlign()==="southeast") {
-				pos.x += (bc.width() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET_CORNER + (bs.width()/2);
-				pos.y += (bc.height() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET_CORNER + (bs.height()/2);
-			} else if(containedStencil.defaultAlign()==="south") {
-				pos.y += (bc.height() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET + (bs.height()/2);
-			} else if(containedStencil.defaultAlign()==="southwest") {
-				pos.x -= (bc.width() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET_CORNER + (bs.width()/2);
-				pos.y += (bc.height() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET_CORNER + (bs.height()/2);
-			} else if(containedStencil.defaultAlign()==="west") {
-				pos.x -= (bc.width() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET + (bs.width()/2);
-			} else if(containedStencil.defaultAlign()==="northwest") {
-				pos.x -= (bc.width() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET_CORNER + (bs.width()/2);
-				pos.y -= (bc.height() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET_CORNER + (bs.height()/2);
+			if (containedStencil.defaultAlign() === "north") {
+				pos.y -= (bc.height() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET + (bs.height() / 2);
+			} else if (containedStencil.defaultAlign() === "northeast") {
+				pos.x += (bc.width() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET_CORNER + (bs.width() / 2);
+				pos.y -= (bc.height() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET_CORNER + (bs.height() / 2);
+			} else if (containedStencil.defaultAlign() === "southeast") {
+				pos.x += (bc.width() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET_CORNER + (bs.width() / 2);
+				pos.y += (bc.height() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET_CORNER + (bs.height() / 2);
+			} else if (containedStencil.defaultAlign() === "south") {
+				pos.y += (bc.height() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET + (bs.height() / 2);
+			} else if (containedStencil.defaultAlign() === "southwest") {
+				pos.x -= (bc.width() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET_CORNER + (bs.width() / 2);
+				pos.y += (bc.height() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET_CORNER + (bs.height() / 2);
+			} else if (containedStencil.defaultAlign() === "west") {
+				pos.x -= (bc.width() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET + (bs.width() / 2);
+			} else if (containedStencil.defaultAlign() === "northwest") {
+				pos.x -= (bc.width() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET_CORNER + (bs.width() / 2);
+				pos.y -= (bc.height() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET_CORNER + (bs.height() / 2);
 			} else {
-				pos.x += (bc.width() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET + (bs.width()/2);
+				pos.x += (bc.width() / 2) + ORYX.CONFIG.SHAPEMENU_CREATE_OFFSET + (bs.width() / 2);
 			}
-			
+
 			// Move shape to the new position
 			this.shape.bounds.centerMoveTo(pos);
-			
+
 			// Move all dockers of a node to the position
-			if (this.shape instanceof ORYX.Core.Node){
-				(this.shape.dockers||[]).each(function(docker){
+			if (this.shape instanceof ORYX.Core.Node) {
+				(this.shape.dockers || []).each(function (docker) {
 					docker.bounds.centerMoveTo(pos);
 				});
 			}
-			
+
 			//this.shape.update();
 			this.position = pos;
-			
-			if (this.edge){
+
+			if (this.edge) {
 				this.sourceRefPos = this.edge.dockers.first().referencePoint;
 				this.targetRefPos = this.edge.dockers.last().referencePoint;
 			}
 		}
-		
+
 		this.facade.getCanvas().update();
 		this.facade.updateSelection();
 
 	},
-	rollback: function(){
+	rollback: function () {
 		this.facade.deleteShape(this.shape);
-		if(this.edge) {
+		if (this.edge) {
 			this.facade.deleteShape(this.edge);
 		}
 		//this.currentParent.update();
diff --git a/len-activiti/src/main/resources/static/editor-app/toolbar-controller.js b/len-activiti/src/main/resources/static/editor-app/toolbar-controller.js
index 892948d..2efd093 100644
--- a/len-activiti/src/main/resources/static/editor-app/toolbar-controller.js
+++ b/len-activiti/src/main/resources/static/editor-app/toolbar-controller.js
@@ -1,7 +1,7 @@
 /*
  * Activiti Modeler component part of the Activiti project
  * Copyright 2005-2014 Alfresco Software, Ltd. All rights reserved.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -19,144 +19,188 @@
 'use strict';
 
 angular.module('activitiModeler')
-    .controller('ToolbarController', ['$scope', '$http', '$modal', '$q', '$rootScope', '$translate', '$location', function ($scope, $http, $modal, $q, $rootScope, $translate, $location) {
-
-    	$scope.editorFactory.promise.then(function () {
-    		$scope.items = KISBPM.TOOLBAR_CONFIG.items;
-    	});
-        
-        $scope.secondaryItems = KISBPM.TOOLBAR_CONFIG.secondaryItems;
-
-        // Call configurable click handler (From http://stackoverflow.com/questions/359788/how-to-execute-a-javascript-function-when-i-have-its-name-as-a-string)
-        var executeFunctionByName = function(functionName, context /*, args */) {
-            var args = Array.prototype.slice.call(arguments).splice(2);
-            var namespaces = functionName.split(".");
-            var func = namespaces.pop();
-            for(var i = 0; i < namespaces.length; i++) {
-                context = context[namespaces[i]];
-            }
-            return context[func].apply(this, args);
-        };
-
-        // Click handler for toolbar buttons
-        $scope.toolbarButtonClicked = function(buttonIndex) {
-
-            // Default behaviour
-            var buttonClicked = $scope.items[buttonIndex];
-            var services = { '$scope' : $scope, '$rootScope' : $rootScope, '$http' : $http, '$modal' : $modal, '$q' : $q, '$translate' : $translate};
-            executeFunctionByName(buttonClicked.action, window, services);
-
-            // Other events
-            var event = {
-                type : KISBPM.eventBus.EVENT_TYPE_TOOLBAR_BUTTON_CLICKED,
-                toolbarItem : buttonClicked
-            };
-            KISBPM.eventBus.dispatch(event.type, event);
-        };
-        
-        // Click handler for secondary toolbar buttons
-        $scope.toolbarSecondaryButtonClicked = function(buttonIndex) {
-            var buttonClicked = $scope.secondaryItems[buttonIndex];
-            var services = { '$scope' : $scope, '$http' : $http, '$modal' : $modal, '$q' : $q, '$translate' : $translate, '$location': $location};
-            executeFunctionByName(buttonClicked.action, window, services);
-        };
-        
-        /* Key bindings */
-        Mousetrap.bind(['command+z', 'ctrl+z'], function(e) {
-        	var services = { '$scope' : $scope, '$rootScope' : $rootScope, '$http' : $http, '$modal' : $modal, '$q' : $q, '$translate' : $translate};
-        	KISBPM.TOOLBAR.ACTIONS.undo(services);
-            return false;
-        });
-        
-        Mousetrap.bind(['command+y', 'ctrl+y'], function(e) {
-        	var services = { '$scope' : $scope, '$rootScope' : $rootScope, '$http' : $http, '$modal' : $modal, '$q' : $q, '$translate' : $translate};
-        	KISBPM.TOOLBAR.ACTIONS.redo(services);
-            return false;
-        });
-        
-        Mousetrap.bind(['command+c', 'ctrl+c'], function(e) {
-        	var services = { '$scope' : $scope, '$rootScope' : $rootScope, '$http' : $http, '$modal' : $modal, '$q' : $q, '$translate' : $translate};
-        	KISBPM.TOOLBAR.ACTIONS.copy(services);
-            return false;
-        });
-        
-        Mousetrap.bind(['command+v', 'ctrl+v'], function(e) {
-        	var services = { '$scope' : $scope, '$rootScope' : $rootScope, '$http' : $http, '$modal' : $modal, '$q' : $q, '$translate' : $translate};
-        	KISBPM.TOOLBAR.ACTIONS.paste(services);
-            return false;
-        });
-        
-        Mousetrap.bind(['del'], function(e) {
-        	var services = { '$scope' : $scope, '$rootScope' : $rootScope, '$http' : $http, '$modal' : $modal, '$q' : $q, '$translate' : $translate};
-        	KISBPM.TOOLBAR.ACTIONS.deleteItem(services);
-            return false;
-        });
-
-        /* Undo logic */
-
-        $scope.undoStack = [];
-        $scope.redoStack = [];
-
-        $scope.editorFactory.promise.then(function() {
-
-            // Catch all command that are executed and store them on the respective stacks
-            $scope.editor.registerOnEvent(ORYX.CONFIG.EVENT_EXECUTE_COMMANDS, function( evt ){
-
-                // If the event has commands
-                if( !evt.commands ){ return; }
-
-                $scope.undoStack.push( evt.commands );
-                $scope.redoStack = [];
-                
-                for(var i = 0; i < $scope.items.length; i++) 
-        		{
-                    var item = $scope.items[i];
-                    if (item.action === 'KISBPM.TOOLBAR.ACTIONS.undo')
-                    {
-                    	item.enabled = true;
-                    }
-                    else if (item.action === 'KISBPM.TOOLBAR.ACTIONS.redo')
-                    {
-                    	item.enabled = false;
-                    }
-        		}
-
-                // Update
-                $scope.editor.getCanvas().update();
-                $scope.editor.updateSelection();
-
-            });
-
-        });
-        
-        // Handle enable/disable toolbar buttons 
-        $scope.editorFactory.promise.then(function() {
-        	$scope.editor.registerOnEvent(ORYX.CONFIG.EVENT_SELECTION_CHANGED, function( evt ){
-        		var elements = evt.elements;
-        		
-        		for(var i = 0; i < $scope.items.length; i++) 
-        		{
-                    var item = $scope.items[i];
-                    if (item.enabledAction && item.enabledAction === 'element')
-                    {
-                    	var minLength = 1;
-                    	if(item.minSelectionCount) {
-                    		minLength = item.minSelectionCount;
-                    	}
-                    	if (elements.length >= minLength && !item.enabled) {
-                    		$scope.safeApply(function () {
-                    			item.enabled = true;
-                            });
-                    	}
-                    	else if (elements.length == 0 && item.enabled) {
-                    		$scope.safeApply(function () {
-                    			item.enabled = false;
-                            });
-                    	}
-                    }
-                }
-        	});
-        	
-        });
-
-    }]);
\ No newline at end of file
+	.controller('ToolbarController', ['$scope', '$http', '$modal', '$q', '$rootScope', '$translate', '$location', function ($scope, $http, $modal, $q, $rootScope, $translate, $location) {
+
+		$scope.editorFactory.promise.then(function () {
+			$scope.items = KISBPM.TOOLBAR_CONFIG.items;
+		});
+
+		$scope.secondaryItems = KISBPM.TOOLBAR_CONFIG.secondaryItems;
+
+		// Call configurable click handler (From http://stackoverflow.com/questions/359788/how-to-execute-a-javascript-function-when-i-have-its-name-as-a-string)
+		var executeFunctionByName = function (functionName, context /*, args */) {
+			var args = Array.prototype.slice.call(arguments).splice(2);
+			var namespaces = functionName.split(".");
+			var func = namespaces.pop();
+			for (var i = 0; i < namespaces.length; i++) {
+				context = context[namespaces[i]];
+			}
+			return context[func].apply(this, args);
+		};
+
+		// Click handler for toolbar buttons
+		$scope.toolbarButtonClicked = function (buttonIndex) {
+
+			// Default behaviour
+			var buttonClicked = $scope.items[buttonIndex];
+			var services = {
+				'$scope': $scope,
+				'$rootScope': $rootScope,
+				'$http': $http,
+				'$modal': $modal,
+				'$q': $q,
+				'$translate': $translate
+			};
+			executeFunctionByName(buttonClicked.action, window, services);
+
+			// Other events
+			var event = {
+				type: KISBPM.eventBus.EVENT_TYPE_TOOLBAR_BUTTON_CLICKED,
+				toolbarItem: buttonClicked
+			};
+			KISBPM.eventBus.dispatch(event.type, event);
+		};
+
+		// Click handler for secondary toolbar buttons
+		$scope.toolbarSecondaryButtonClicked = function (buttonIndex) {
+			var buttonClicked = $scope.secondaryItems[buttonIndex];
+			var services = {
+				'$scope': $scope,
+				'$http': $http,
+				'$modal': $modal,
+				'$q': $q,
+				'$translate': $translate,
+				'$location': $location
+			};
+			executeFunctionByName(buttonClicked.action, window, services);
+		};
+
+		/* Key bindings */
+		Mousetrap.bind(['command+z', 'ctrl+z'], function (e) {
+			var services = {
+				'$scope': $scope,
+				'$rootScope': $rootScope,
+				'$http': $http,
+				'$modal': $modal,
+				'$q': $q,
+				'$translate': $translate
+			};
+			KISBPM.TOOLBAR.ACTIONS.undo(services);
+			return false;
+		});
+
+		Mousetrap.bind(['command+y', 'ctrl+y'], function (e) {
+			var services = {
+				'$scope': $scope,
+				'$rootScope': $rootScope,
+				'$http': $http,
+				'$modal': $modal,
+				'$q': $q,
+				'$translate': $translate
+			};
+			KISBPM.TOOLBAR.ACTIONS.redo(services);
+			return false;
+		});
+
+		Mousetrap.bind(['command+c', 'ctrl+c'], function (e) {
+			var services = {
+				'$scope': $scope,
+				'$rootScope': $rootScope,
+				'$http': $http,
+				'$modal': $modal,
+				'$q': $q,
+				'$translate': $translate
+			};
+			KISBPM.TOOLBAR.ACTIONS.copy(services);
+			return false;
+		});
+
+		Mousetrap.bind(['command+v', 'ctrl+v'], function (e) {
+			var services = {
+				'$scope': $scope,
+				'$rootScope': $rootScope,
+				'$http': $http,
+				'$modal': $modal,
+				'$q': $q,
+				'$translate': $translate
+			};
+			KISBPM.TOOLBAR.ACTIONS.paste(services);
+			return false;
+		});
+
+		Mousetrap.bind(['del'], function (e) {
+			var services = {
+				'$scope': $scope,
+				'$rootScope': $rootScope,
+				'$http': $http,
+				'$modal': $modal,
+				'$q': $q,
+				'$translate': $translate
+			};
+			KISBPM.TOOLBAR.ACTIONS.deleteItem(services);
+			return false;
+		});
+
+		/* Undo logic */
+
+		$scope.undoStack = [];
+		$scope.redoStack = [];
+
+		$scope.editorFactory.promise.then(function () {
+
+			// Catch all command that are executed and store them on the respective stacks
+			$scope.editor.registerOnEvent(ORYX.CONFIG.EVENT_EXECUTE_COMMANDS, function (evt) {
+
+				// If the event has commands
+				if (!evt.commands) {
+					return;
+				}
+
+				$scope.undoStack.push(evt.commands);
+				$scope.redoStack = [];
+
+				for (var i = 0; i < $scope.items.length; i++) {
+					var item = $scope.items[i];
+					if (item.action === 'KISBPM.TOOLBAR.ACTIONS.undo') {
+						item.enabled = true;
+					} else if (item.action === 'KISBPM.TOOLBAR.ACTIONS.redo') {
+						item.enabled = false;
+					}
+				}
+
+				// Update
+				$scope.editor.getCanvas().update();
+				$scope.editor.updateSelection();
+
+			});
+
+		});
+
+		// Handle enable/disable toolbar buttons
+		$scope.editorFactory.promise.then(function () {
+			$scope.editor.registerOnEvent(ORYX.CONFIG.EVENT_SELECTION_CHANGED, function (evt) {
+				var elements = evt.elements;
+
+				for (var i = 0; i < $scope.items.length; i++) {
+					var item = $scope.items[i];
+					if (item.enabledAction && item.enabledAction === 'element') {
+						var minLength = 1;
+						if (item.minSelectionCount) {
+							minLength = item.minSelectionCount;
+						}
+						if (elements.length >= minLength && !item.enabled) {
+							$scope.safeApply(function () {
+								item.enabled = true;
+							});
+						} else if (elements.length == 0 && item.enabled) {
+							$scope.safeApply(function () {
+								item.enabled = false;
+							});
+						}
+					}
+				}
+			});
+
+		});
+
+	}]);
diff --git a/len-activiti/src/main/resources/static/modeler.html b/len-activiti/src/main/resources/static/modeler.html
index a35a9d4..3034f1b 100644
--- a/len-activiti/src/main/resources/static/modeler.html
+++ b/len-activiti/src/main/resources/static/modeler.html
@@ -9,38 +9,66 @@
 <html class="no-js"> <!--<![endif]-->
 <head>
 	<meta charset="utf-8">
-	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta content="IE=edge" http-equiv="X-UA-Compatible">
 	<title>Activiti Editor</title>
-	<meta name="description" content="">
-	<meta name="viewport"
-		  content="initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, width=device-width">
+	<meta content="" name="description">
+	<meta content="initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no, width=device-width"
+		  name="viewport">
 	<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
 
-	<link rel="Stylesheet" media="screen" href="editor-app/libs/ng-grid-2.0.7.min.css" type="text/css"/>
-	<link rel="stylesheet" href="editor-app/libs/bootstrap_3.1.1/css/bootstrap.min.css"/>
+	<link href="editor-app/libs/ng-grid-2.0.7.min.css" media="screen" rel="Stylesheet" type="text/css"/>
+	<link href="editor-app/libs/bootstrap_3.1.1/css/bootstrap.min.css" rel="stylesheet"/>
 
-	<link rel="Stylesheet" media="screen" href="editor-app/editor/css/editor.css" type="text/css"/>
-	<link rel="stylesheet" href="editor-app/css/style.css" type="text/css"/>
+	<link href="editor-app/editor/css/editor.css" media="screen" rel="Stylesheet" type="text/css"/>
+	<link href="editor-app/css/style.css" rel="stylesheet" type="text/css"/>
 
-	<link rel="stylesheet" href="editor-app/css/style-common.css">
-	<link rel="stylesheet" href="editor-app/css/style-editor.css">
+	<link href="editor-app/css/style-common.css" rel="stylesheet">
+	<link href="editor-app/css/style-editor.css" rel="stylesheet">
 
 	<style>
-		.page-list{
+		.page-list {
 			overflow: hidden;
 		}
-		.page-list .pagination {    margin: 0 0 10px 0;    float: left;}
-		.page-list .pagination span {cursor: pointer;}
-		.page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;}
-		.page-list .pagination .separate span:hover {background: none;}
+
+		.page-list .pagination {
+			margin: 0 0 10px 0;
+			float: left;
+		}
+
+		.page-list .pagination span {
+			cursor: pointer;
+		}
+
+		.page-list .pagination .separate span {
+			cursor: default;
+			border-top: none;
+			border-bottom: none;
+		}
+
+		.page-list .pagination .separate span:hover {
+			background: none;
+		}
+
 		.page-list .page-total {
 			float: left;
 			margin: 2px 0 2px 11px;
 		}
-		.page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}
-		.page-list .page-total input {width: 40px; padding-left:3px;}
-		.page-list .page-total select {width: 50px;}
-		.no-items{
+
+		.page-list .page-total input, .page-list .page-total select {
+			height: 26px;
+			border: 1px solid #ddd;
+		}
+
+		.page-list .page-total input {
+			width: 40px;
+			padding-left: 3px;
+		}
+
+		.page-list .page-total select {
+			width: 50px;
+		}
+
+		.no-items {
 			text-align: center;
 		}
 	</style>
@@ -64,7 +92,7 @@
 <![endif]-->
 
 <div class="alert-wrapper" ng-cloak>
-	<div class="alert fadein {{alerts.current.type}}" ng-show="alerts.current" ng-click="dismissAlert()">
+	<div class="alert fadein {{alerts.current.type}}" ng-click="dismissAlert()" ng-show="alerts.current">
 		<i class="glyphicon"
 		   ng-class="{'glyphicon-ok': alerts.current.type == 'info', 'glyphicon-remove': alerts.current.type == 'error'}"></i>
 		<span>{{alerts.current.message}}</span>
@@ -75,7 +103,8 @@
 	</div>
 </div>
 
-<div id="main" class="wrapper full clearfix" ng-style="{height: window.height + 'px'}" ng-app="activitiModeler" ng-include="'editor-app/editor.html'">
+<div class="wrapper full clearfix" id="main" ng-app="activitiModeler" ng-include="'editor-app/editor.html'"
+	 ng-style="{height: window.height + 'px'}">
 </div>
 
 <!--[if lt IE 9]>
diff --git a/len-activiti/src/main/resources/stencilset.json b/len-activiti/src/main/resources/stencilset.json
index 3cdb83a..04717ec 100644
--- a/len-activiti/src/main/resources/stencilset.json
+++ b/len-activiti/src/main/resources/stencilset.json
@@ -1,1339 +1,2412 @@
 {
-    "title" : "BPMN 2.0标准工具",
-    "namespace" : "http://lenosp.cn",
-    "description" : "流程编辑器",
-    "propertyPackages" : [ {
-        "name" : "process_idpackage",
-        "properties" : [ {
-            "id" : "process_id",
-            "type" : "String",
-            "title" : "流程名称",
-            "value" : "process",
-            "description" : "流程的特殊唯一的名称标识",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "overrideidpackage",
-        "properties" : [ {
-            "id" : "overrideid",
-            "type" : "String",
-            "title" : "Id",
-            "value" : "",
-            "description" : "元素的唯一标识符",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "namepackage",
-        "properties" : [ {
-            "id" : "name",
-            "type" : "String",
-            "title" : "名称",
-            "value" : "",
-            "description" : "元素名称",
-            "popular" : true,
-            "refToView" : "text_name"
-        } ]
-    }, {
-        "name" : "documentationpackage",
-        "properties" : [ {
-            "id" : "documentation",
-            "type" : "Text",
-            "title" : "描述",
-            "value" : "",
-            "description" : "元素描述",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "process_authorpackage",
-        "properties" : [ {
-            "id" : "process_author",
-            "type" : "String",
-            "title" : "流程作者",
-            "value" : "",
-            "description" : "流程定义者姓名",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "process_versionpackage",
-        "properties" : [ {
-            "id" : "process_version",
-            "type" : "String",
-            "title" : "流程版本",
-            "value" : "",
-            "description" : "标识文档版本",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "process_namespacepackage",
-        "properties" : [ {
-            "id" : "process_namespace",
-            "type" : "String",
-            "title" : "目标命名空间",
-            "value" : "http://lenosp.cn",
-            "description" : "工作流目标命名空间",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "asynchronousdefinitionpackage",
-        "properties" : [ {
-            "id" : "asynchronousdefinition",
-            "type" : "Boolean",
-            "title" : "异步",
-            "value" : "false",
-            "description" : "将活动定义为异步",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "exclusivedefinitionpackage",
-        "properties" : [ {
-            "id" : "exclusivedefinition",
-            "type" : "Boolean",
-            "title" : "单独",
-            "value" : "false",
-            "description" : "将活动定义为单独",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "executionlistenerspackage",
-        "properties" : [ {
-            "id" : "executionlisteners",
-            "type" : "multiplecomplex",
-            "title" : "执行监听器",
-            "value" : "",
-            "description" : "活动，流程，顺序流程，开始和结束事件的监听器",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "tasklistenerspackage",
-        "properties" : [ {
-            "id" : "tasklisteners",
-            "type" : "multiplecomplex",
-            "title" : "任务监听器",
-            "value" : "",
-            "description" : "用户任务的监听器",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "eventlistenerspackage",
-        "properties" : [ {
-            "id" : "eventlisteners",
-            "type" : "multiplecomplex",
-            "title" : "事件监听器",
-            "value" : "",
-            "description" : "侦听Activiti引擎中发生的任何事件。也可以将事件作为信号、消息或错误事件重新引发",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "usertaskassignmentpackage",
-        "properties" : [ {
-            "id" : "usertaskassignment",
-            "type" : "Complex",
-            "title" : "代理",
-            "value" : "",
-            "description" : "用户任务的分配定义",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "formpropertiespackage",
-        "properties" : [ {
-            "id" : "formproperties",
-            "type" : "Complex",
-            "title" : "动态表单属性",
-            "value" : "",
-            "description" : "使用表单属性列表定义表单",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "formkeydefinitionpackage",
-        "properties" : [ {
-            "id" : "formkeydefinition",
-            "type" : "String",
-            "title" : "自定义表单",
-            "value" : "",
-            "description" : "用户任务表单编号",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "duedatedefinitionpackage",
-        "properties" : [ {
-            "id" : "duedatedefinition",
-            "type" : "String",
-            "title" : "到期日期",
-            "value" : "",
-            "description" : "用户任务到期时间",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "prioritydefinitionpackage",
-        "properties" : [ {
-            "id" : "prioritydefinition",
-            "type" : "String",
-            "title" : "优先级",
-            "value" : "",
-            "description" : "用户任务优先级",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "duedatedefinitionpackage",
-        "properties" : [ {
-            "id" : "duedatedefinition",
-            "type" : "String",
-            "title" : "到期日期",
-            "value" : "",
-            "description" : "用户任务的截止日期",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "servicetaskclasspackage",
-        "properties" : [ {
-            "id" : "servicetaskclass",
-            "type" : "String",
-            "title" : "监听类",
-            "value" : "",
-            "description" : "实现服务任务逻辑的监听类",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "servicetaskexpressionpackage",
-        "properties" : [ {
-            "id" : "servicetaskexpression",
-            "type" : "String",
-            "title" : "表达式",
-            "value" : "",
-            "description" : "使用表达式定义的服务任务逻辑",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "servicetaskdelegateexpressionpackage",
-        "properties" : [ {
-            "id" : "servicetaskdelegateexpression",
-            "type" : "String",
-            "title" : "委托表达式",
-            "value" : "",
-            "description" : "使用委托表达式定义的服务任务逻辑",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "servicetaskfieldspackage",
-        "properties" : [ {
-            "id" : "servicetaskfields",
-            "type" : "Complex",
-            "title" : "字段",
-            "value" : "",
-            "description" : "字段扩展",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "servicetaskresultvariablepackage",
-        "properties" : [ {
-            "id" : "servicetaskresultvariable",
-            "type" : "String",
-            "title" : "结果变量名称",
-            "value" : "",
-            "description" : "处理变量名称以存储服务任务结果",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "scriptformatpackage",
-        "properties" : [ {
-            "id" : "scriptformat",
-            "type" : "String",
-            "title" : "脚本格式",
-            "value" : "",
-            "description" : "脚本任务的脚本格式",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "scripttextpackage",
-        "properties" : [ {
-            "id" : "scripttext",
-            "type" : "Text",
-            "title" : "脚本",
-            "value" : "",
-            "description" : "脚本任务的脚本文本",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "ruletask_rulespackage",
-        "properties" : [ {
-            "id" : "ruletask_rules",
-            "type" : "String",
-            "title" : "规则",
-            "value" : "",
-            "description" : "规则任务的规则",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "ruletask_variables_inputpackage",
-        "properties" : [ {
-            "id" : "ruletask_variables_input",
-            "type" : "String",
-            "title" : "输入变量",
-            "value" : "",
-            "description" : "输入规则任务的变量",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "ruletask_excludepackage",
-        "properties" : [ {
-            "id" : "ruletask_exclude",
-            "type" : "Boolean",
-            "title" : "除外",
-            "value" : "false",
-            "description" : "使用rules属性作为排除",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "ruletask_resultpackage",
-        "properties" : [ {
-            "id" : "ruletask_result",
-            "type" : "String",
-            "title" : "返回变量",
-            "value" : "",
-            "description" : "规则任务的结果变量",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "mailtasktopackage",
-        "properties" : [ {
-            "id" : "mailtaskto",
-            "type" : "Text",
-            "title" : "接收人",
-            "value" : "",
-            "description" : "收件人，如果电子邮件。 多个收件人在逗号分隔列表中定义",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "mailtaskfrompackage",
-        "properties" : [ {
-            "id" : "mailtaskfrom",
-            "type" : "Text",
-            "title" : "发件人",
-            "value" : "",
-            "description" : "发件人的电子邮件地址。 如果未提供，则使用从地址配置的默认值.",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "mailtasksubjectpackage",
-        "properties" : [ {
-            "id" : "mailtasksubject",
-            "type" : "Text",
-            "title" : "主题",
-            "value" : "",
-            "description" : "电子邮件的主题(Subject).",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "mailtaskccpackage",
-        "properties" : [ {
-            "id" : "mailtaskcc",
-            "type" : "Text",
-            "title" : "转发",
-            "value" : "",
-            "description" : "电子邮件的抄送。在逗号分隔的列表中定义了多个收件人",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "mailtaskbccpackage",
-        "properties" : [ {
-            "id" : "mailtaskbcc",
-            "type" : "Text",
-            "title" : "密送",
-            "value" : "",
-            "description" : "电子邮件的密件抄送。在逗号分隔的列表中定义了多个收件人",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "mailtasktextpackage",
-        "properties" : [ {
-            "id" : "mailtasktext",
-            "type" : "Text",
-            "title" : "内容",
-            "value" : "",
-            "description" : "电子邮件的内容，以防需要发送不丰富的普通电子邮件。可与HTML结合使用，用于不支持丰富内容的电子邮件客户端。然后，客户机将返回到仅此文本的备选方案",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "mailtaskhtmlpackage",
-        "properties" : [ {
-            "id" : "mailtaskhtml",
-            "type" : "Text",
-            "title" : "Html",
-            "value" : "",
-            "description" : "一段HTML，它是电子邮件的内容",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "mailtaskcharsetpackage",
-        "properties" : [ {
-            "id" : "mailtaskcharset",
-            "type" : "String",
-            "title" : "Charset",
-            "value" : "",
-            "description" : "允许更改电子邮件的字符集，这对于许多非英语语言是必需的 ",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "callactivitycalledelementpackage",
-        "properties" : [ {
-            "id" : "callactivitycalledelement",
-            "type" : "String",
-            "title" : "被调用元素",
-            "value" : "",
-            "description" : "流程参考.",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "callactivityinparameterspackage",
-        "properties" : [ {
-            "id" : "callactivityinparameters",
-            "type" : "Complex",
-            "title" : "输入参数",
-            "value" : "",
-            "description" : "输入参数的定义",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "callactivityoutparameterspackage",
-        "properties" : [ {
-            "id" : "callactivityoutparameters",
-            "type" : "Complex",
-            "title" : "输出参数",
-            "value" : "",
-            "description" : "输出参数的定义",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "cameltaskcamelcontextpackage",
-        "properties" : [ {
-            "id" : "cameltaskcamelcontext",
-            "type" : "String",
-            "title" : "Camel内容",
-            "value" : "",
-            "description" : "可选的camel上下文定义，如果保留为空，则使用默认值。",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "muletaskendpointurlpackage",
-        "properties" : [ {
-            "id" : "muletaskendpointurl",
-            "type" : "String",
-            "title" : "终端url",
-            "value" : "",
-            "description" : "向MULE发送消息所需的终结点URL。",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "muletasklanguagepackage",
-        "properties" : [ {
-            "id" : "muletasklanguage",
-            "type" : "String",
-            "title" : "语言",
-            "value" : "",
-            "description" : "语言解析有效负载表达式所需的定义，如juel.",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "muletaskpayloadexpressionpackage",
-        "properties" : [ {
-            "id" : "muletaskpayloadexpression",
-            "type" : "String",
-            "title" : "有效载荷表达式",
-            "value" : "",
-            "description" : "发送给MULE的消息有效载荷的必要定义",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "muletaskresultvariablepackage",
-        "properties" : [ {
-            "id" : "muletaskresultvariable",
-            "type" : "String",
-            "title" : "返回变量",
-            "value" : "",
-            "description" : "返回的有效负载的可选结果变量",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "conditionsequenceflowpackage",
-        "properties" : [ {
-            "id" : "conditionsequenceflow",
-            "type" : "Complex",
-            "title" : "流转条件",
-            "value" : "",
-            "description" : "序列流的条件",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "defaultflowpackage",
-        "properties" : [ {
-            "id" : "defaultflow",
-            "type" : "Boolean",
-            "title" : "默认流转",
-            "value" : "false",
-            "description" : "将序列流定义为默认值",
-            "popular" : true,
-            "refToView" : "default"
-        } ]
-    }, {
-        "name" : "conditionalflowpackage",
-        "properties" : [ {
-            "id" : "conditionalflow",
-            "type" : "Boolean",
-            "title" : "条件流",
-            "value" : "false",
-            "description" : "使用条件定义序列流",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "timercycledefinitionpackage",
-        "properties" : [ {
-            "id" : "timercycledefinition",
-            "type" : "String",
-            "title" : "循环时间(例：R3/PT10H)",
-            "value" : "",
-            "description" : "Define the timer with a ISO-8601 cycle.",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "timerdatedefinitionpackage",
-        "properties" : [ {
-            "id" : "timerdatedefinition",
-            "type" : "String",
-            "title" : "开始时间（ISO-8601）",
-            "value" : "",
-            "description" : "Define the timer with a ISO-8601 date definition.",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "timerdurationdefinitionpackage",
-        "properties" : [ {
-            "id" : "timerdurationdefinition",
-            "type" : "String",
-            "title" : "持续时间(例：PT5M)",
-            "value" : "",
-            "description" : "Define the timer with a ISO-8601 duration.",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "timerenddatedefinitionpackage",
-        "properties" : [ {
-            "id" : "timerenddatedefinition",
-            "type" : "String",
-            "title" : "结束时间（ISO-8601）",
-            "value" : "",
-            "description" : "Define the timer with a ISO-8601 duration.",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "messagerefpackage",
-        "properties" : [ {
-            "id" : "messageref",
-            "type" : "String",
-            "title" : "消息引用",
-            "value" : "",
-            "description" : "定义消息名称",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "signalrefpackage",
-        "properties" : [ {
-            "id" : "signalref",
-            "type" : "String",
-            "title" : "信号引用",
-            "value" : "",
-            "description" : "定义信号名称",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "errorrefpackage",
-        "properties" : [ {
-            "id" : "errorref",
-            "type" : "String",
-            "title" : "错误引用",
-            "value" : "",
-            "description" : "定义错误名称",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "cancelactivitypackage",
-        "properties" : [ {
-            "id" : "cancelactivity",
-            "type" : "Boolean",
-            "title" : "取消活动",
-            "value" : "true",
-            "description" : "是否应该取消活动",
-            "popular" : true,
-            "refToView" : [ "frame", "frame2" ]
-        } ]
-    }, {
-        "name" : "initiatorpackage",
-        "properties" : [ {
-            "id" : "initiator",
-            "type" : "String",
-            "title" : "发起人",
-            "value" : "",
-            "description" : "该过程的发起者",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "textpackage",
-        "properties" : [ {
-            "id" : "text",
-            "type" : "String",
-            "title" : "Text",
-            "value" : "",
-            "description" : "文本注释的文本.",
-            "popular" : true,
-            "refToView" : "text"
-        } ]
-    }, {
-        "name" : "multiinstance_typepackage",
-        "properties" : [ {
-            "id" : "multiinstance_type",
-            "type" : "kisbpm-multiinstance",
-            "title" : "多实例类型",
-            "value" : "None",
-            "description" : "Repeated activity execution (parallel or sequential) can be displayed through different loop types",
-            "popular" : true,
-            "refToView" : "multiinstance"
-        } ]
-    }, {
-        "name" : "multiinstance_cardinalitypackage",
-        "properties" : [ {
-            "id" : "multiinstance_cardinality",
-            "type" : "String",
-            "title" : "基数(多实例)",
-            "value" : "",
-            "description" : "定义多实例的基数.",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "multiinstance_collectionpackage",
-        "properties" : [ {
-            "id" : "multiinstance_collection",
-            "type" : "String",
-            "title" : "集合(多实例)",
-            "value" : "",
-            "description" : "定义多实例的集合",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "multiinstance_variablepackage",
-        "properties" : [ {
-            "id" : "multiinstance_variable",
-            "type" : "String",
-            "title" : "元素变量(多实例)",
-            "value" : "",
-            "description" : "为多实例定义元素变量",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "multiinstance_conditionpackage",
-        "properties" : [ {
-            "id" : "multiinstance_condition",
-            "type" : "String",
-            "title" : "完成条件(多实例)",
-            "value" : "",
-            "description" : "定义多实例的完成条件",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "isforcompensationpackage",
-        "properties" : [ {
-            "id" : "isforcompensation",
-            "type" : "Boolean",
-            "title" : "是否为补偿",
-            "value" : "false",
-            "description" : "一个标志,标识是否这个活动的目的是为了补偿.",
-            "popular" : true,
-            "refToView" : "compensation"
-        } ]
-    }, {
-        "name" : "sequencefloworderpackage",
-        "properties" : [ {
-            "id" : "sequencefloworder",
-            "type" : "Complex",
-            "title" : "流动顺序",
-            "value" : "",
-            "description" : "Order outgoing sequence flows.",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "signaldefinitionspackage",
-        "properties" : [ {
-            "id" : "signaldefinitions",
-            "type" : "multiplecomplex",
-            "title" : "信号定义",
-            "value" : "",
-            "description" : "信号定义",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "messagedefinitionspackage",
-        "properties" : [ {
-            "id" : "messagedefinitions",
-            "type" : "multiplecomplex",
-            "title" : "消息定义",
-            "value" : "",
-            "description" : "消息定义",
-            "popular" : true
-        } ]
-    }, {
-        "name" : "istransactionpackage",
-        "properties" : [ {
-            "id" : "istransaction",
-            "type" : "Boolean",
-            "title" : "是否事务处理子过程",
-            "value" : "false",
-            "description" : "标识此子进程是否为事务类型的标志",
-            "popular" : true,
-            "refToView" : "border"
-        } ]
-    }, {
-        "name" : "terminateAllpackage",
-        "properties" : [ {
-            "id" : "terminateAll",
-            "type" : "Boolean",
-            "title" : "终止全部",
-            "value" : "false",
-            "description" : "启用以终止流程实例",
-            "popular" : true
-        } ]
-    } ],
-    "stencils" : [ {
-        "type" : "node",
-        "id" : "BPMNDiagram",
-        "title" : "BPMN-Diagram",
-        "description" : "A BPMN 2.0 diagram.",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n   width=\"800\"\n   height=\"600\"\n   version=\"1.0\">\n  <defs></defs>\n  <g pointer-events=\"fill\" >\n    <polygon stroke=\"black\" fill=\"black\" stroke-width=\"1\" points=\"0,0 0,590 9,599 799,599 799,9 790,0\" stroke-linecap=\"butt\" stroke-linejoin=\"miter\" stroke-miterlimit=\"10\" />\n    <rect id=\"diagramcanvas\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"790\" height=\"590\" stroke=\"black\" stroke-width=\"2\" fill=\"white\" />\n    \t<text font-size=\"22\" id=\"diagramtext\" x=\"400\" y=\"25\" oryx:align=\"top center\" stroke=\"#373e48\"></text>\n  </g>\n</svg>",
-        "icon" : "diagram.png",
-        "groups" : [ "Diagram" ],
-        "mayBeRoot" : true,
-        "hide" : true,
-        "propertyPackages" : [ "process_idpackage", "namepackage", "documentationpackage", "process_authorpackage", "process_versionpackage", "process_namespacepackage", "executionlistenerspackage", "eventlistenerspackage", "signaldefinitionspackage", "messagedefinitionspackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ ]
-    }, {
-        "type" : "node",
-        "id" : "StartNoneEvent",
-        "title" : "事件",
-        "description" : "没有特定触发器的启动事件",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\">\n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#24ca58\" fill=\"#FFFFFF\" stroke-width=\"1\"/>\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
-        "icon" : "startevent/none.png",
-        "groups" : [ "启动事件" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "executionlistenerspackage", "initiatorpackage", "formkeydefinitionpackage", "formpropertiespackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "sequence_start", "Startevents_all", "StartEventsMorph", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "StartTimerEvent",
-        "title" : "定时事件",
-        "description" : "带有计时器触发器的启动事件",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\">\n    <circle \n    \tid=\"bg_frame\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"15\" \n    \tstroke=\"#585858\" \n    \tfill=\"#ffffff\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 5.5, 3\" />\n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    \n    <path id=\"path1\" transform=\"translate(6,6)\"\n    \td=\"M 10 0 C 4.4771525 0 0 4.4771525 0 10 C 0 15.522847 4.4771525 20 10 20 C 15.522847 20 20 15.522847 20 10 C 20 4.4771525 15.522847 1.1842379e-15 10 0 z M 9.09375 1.03125 C 9.2292164 1.0174926 9.362825 1.0389311 9.5 1.03125 L 9.5 3.5 L 10.5 3.5 L 10.5 1.03125 C 15.063526 1.2867831 18.713217 4.9364738 18.96875 9.5 L 16.5 9.5 L 16.5 10.5 L 18.96875 10.5 C 18.713217 15.063526 15.063526 18.713217 10.5 18.96875 L 10.5 16.5 L 9.5 16.5 L 9.5 18.96875 C 4.9364738 18.713217 1.2867831 15.063526 1.03125 10.5 L 3.5 10.5 L 3.5 9.5 L 1.03125 9.5 C 1.279102 5.0736488 4.7225326 1.4751713 9.09375 1.03125 z M 9.5 5 L 9.5 8.0625 C 8.6373007 8.2844627 8 9.0680195 8 10 C 8 11.104569 8.8954305 12 10 12 C 10.931981 12 11.715537 11.362699 11.9375 10.5 L 14 10.5 L 14 9.5 L 11.9375 9.5 C 11.756642 8.7970599 11.20294 8.2433585 10.5 8.0625 L 10.5 5 L 9.5 5 z \"  \n    \tfill=\"#585858\" stroke=\"none\" />\n   \n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
-        "icon" : "startevent/timer.png",
-        "groups" : [ "启动事件" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "executionlistenerspackage", "timercycledefinitionpackage", "timerdatedefinitionpackage", "timerdurationdefinitionpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "sequence_start", "Startevents_all", "StartEventsMorph", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "StartSignalEvent",
-        "title" : "信号事件",
-        "description" : "带信号触发的启动事件",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\">\n\n    <circle \n    \tid=\"bg_frame\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"15\" \n    \tstroke=\"#585858\" \n    \tfill=\"#ffffff\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 5.5, 3\" />\n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    <path\n       d=\"M 8.7124971,21.247342 L 23.333334,21.247342 L 16.022915,8.5759512 L 8.7124971,21.247342 z\"\n       id=\"triangle\"\n       stroke=\"#585858\"\n       style=\"fill:none;stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
-        "icon" : "startevent/signal.png",
-        "groups" : [ "启动事件" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "executionlistenerspackage", "signalrefpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "sequence_start", "Startevents_all", "StartEventsMorph", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "StartMessageEvent",
-        "title" : "消息事件",
-        "description" : "带有消息触发器的启动事件",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\">\n    <circle \n    \tid=\"bg_frame\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"15\" \n    \tstroke=\"#585858\" \n    \tfill=\"#ffffff\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 5.5, 3\" />\n    \n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    \n    <path transform=\"translate(7,7)\" id=\"path1\" stroke=\"none\" fill=\"#585858\" stroke-width=\"1\" d=\"m 0.5,2.5 0,13 17,0 0,-13 z M 2,4 6.5,8.5 2,13 z M 4,4 14,4 9,9 z m 12,0 0,9 -4.5,-4.5 z M 7.5,9.5 9,11 10.5,9.5 15,14 3,14 z\"/>\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
-        "icon" : "startevent/message.png",
-        "groups" : [ "启动事件" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "executionlistenerspackage", "messagerefpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "sequence_start", "Startevents_all", "StartEventsMorph", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "StartErrorEvent",
-        "title" : "异常事件",
-        "description" : "捕获抛出的BPMN错误的启动事件",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"1\"/>\n    \n    <path\n         stroke=\"#585858\"\n         style=\"fill:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10\"\n         d=\"M 22.820839,11.171502 L 19.36734,24.58992 L 13.54138,14.281819 L 9.3386512,20.071607 L 13.048949,6.8323057 L 18.996148,16.132659 L 22.820839,11.171502 z\"\n         id=\"errorPolygon\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
-        "icon" : "startevent/error.png",
-        "groups" : [ "启动事件" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "executionlistenerspackage", "errorrefpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "sequence_start", "Startevents_all", "StartEventsMorph", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "UserTask",
-        "title" : "用户活动",
-        "description" : "分配给特定人的任务 ",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"5\" ry=\"5\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#90EE90\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n\t\n\t<g id=\"userTask\" transform=\"translate(3,3)\">\n\t\t<path oryx:anchors=\"top left\"\n       \t\tstyle=\"fill:#A9A9A9;stroke:none;\"\n       \t\t d=\"m 1,17 16,0 0,-1.7778 -5.333332,-3.5555 0,-1.7778 c 1.244444,0 1.244444,-2.3111 1.244444,-2.3111 l 0,-3.0222 C 12.555557,0.8221 9.0000001,1.0001 9.0000001,1.0001 c 0,0 -3.5555556,-0.178 -3.9111111,3.5555 l 0,3.0222 c 0,0 0,2.3111 1.2444443,2.3111 l 0,1.7778 L 1,15.2222 1,17 17,17\" \n         />\n\t\t\n\t</g>\n  \n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\t\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
-        "icon" : "activity/list/type.user.png",
-        "groups" : [ "活动列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "asynchronousdefinitionpackage", "exclusivedefinitionpackage", "executionlistenerspackage", "multiinstance_typepackage", "multiinstance_cardinalitypackage", "multiinstance_collectionpackage", "multiinstance_variablepackage", "multiinstance_conditionpackage", "isforcompensationpackage", "usertaskassignmentpackage", "formkeydefinitionpackage", "duedatedefinitionpackage", "prioritydefinitionpackage", "formpropertiespackage", "tasklistenerspackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "Activity", "sequence_start", "sequence_end", "ActivitiesMorph", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "ServiceTask",
-        "title" : "服务任务",
-        "description" : "具有服务逻辑的自动任务",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n\t\n\t<g id=\"serviceTask\" transform=\"translate(3,3)\">\n\t<path oryx:anchors=\"top left\"\n\t\tstyle=\"fill:#72a7d0;stroke:none\"\n     d=\"M 8,1 7.5,2.875 c 0,0 -0.02438,0.250763 -0.40625,0.4375 C 7.05724,3.330353 7.04387,3.358818 7,3.375 6.6676654,3.4929791 6.3336971,3.6092802 6.03125,3.78125 6.02349,3.78566 6.007733,3.77681 6,3.78125 5.8811373,3.761018 5.8125,3.71875 5.8125,3.71875 l -1.6875,-1 -1.40625,1.4375 0.96875,1.65625 c 0,0 0.065705,0.068637 0.09375,0.1875 0.002,0.00849 -0.00169,0.022138 0,0.03125 C 3.6092802,6.3336971 3.4929791,6.6676654 3.375,7 3.3629836,7.0338489 3.3239228,7.0596246 3.3125,7.09375 3.125763,7.4756184 2.875,7.5 2.875,7.5 L 1,8 l 0,2 1.875,0.5 c 0,0 0.250763,0.02438 0.4375,0.40625 0.017853,0.03651 0.046318,0.04988 0.0625,0.09375 0.1129372,0.318132 0.2124732,0.646641 0.375,0.9375 -0.00302,0.215512 -0.09375,0.34375 -0.09375,0.34375 L 2.6875,13.9375 4.09375,15.34375 5.78125,14.375 c 0,0 0.1229911,-0.09744 0.34375,-0.09375 0.2720511,0.147787 0.5795915,0.23888 0.875,0.34375 0.033849,0.01202 0.059625,0.05108 0.09375,0.0625 C 7.4756199,14.874237 7.5,15.125 7.5,15.125 L 8,17 l 2,0 0.5,-1.875 c 0,0 0.02438,-0.250763 0.40625,-0.4375 0.03651,-0.01785 0.04988,-0.04632 0.09375,-0.0625 0.332335,-0.117979 0.666303,-0.23428 0.96875,-0.40625 0.177303,0.0173 0.28125,0.09375 0.28125,0.09375 l 1.65625,0.96875 1.40625,-1.40625 -0.96875,-1.65625 c 0,0 -0.07645,-0.103947 -0.09375,-0.28125 0.162527,-0.290859 0.262063,-0.619368 0.375,-0.9375 0.01618,-0.04387 0.04465,-0.05724 0.0625,-0.09375 C 14.874237,10.52438 15.125,10.5 15.125,10.5 L 17,10 17,8 15.125,7.5 c 0,0 -0.250763,-0.024382 -0.4375,-0.40625 C 14.669647,7.0572406 14.641181,7.0438697 14.625,7 14.55912,6.8144282 14.520616,6.6141566 14.4375,6.4375 c -0.224363,-0.4866 0,-0.71875 0,-0.71875 L 15.40625,4.0625 14,2.625 l -1.65625,1 c 0,0 -0.253337,0.1695664 -0.71875,-0.03125 l -0.03125,0 C 11.405359,3.5035185 11.198648,3.4455201 11,3.375 10.95613,3.3588185 10.942759,3.3303534 10.90625,3.3125 10.524382,3.125763 10.5,2.875 10.5,2.875 L 10,1 8,1 z m 1,5 c 1.656854,0 3,1.3431458 3,3 0,1.656854 -1.343146,3 -3,3 C 7.3431458,12 6,10.656854 6,9 6,7.3431458 7.3431458,6 9,6 z\" />\n\t</g>\n  \n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\t\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
-        "icon" : "activity/list/type.service.png",
-        "groups" : [ "活动列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "asynchronousdefinitionpackage", "exclusivedefinitionpackage", "executionlistenerspackage", "multiinstance_typepackage", "multiinstance_cardinalitypackage", "multiinstance_collectionpackage", "multiinstance_variablepackage", "multiinstance_conditionpackage", "isforcompensationpackage", "servicetaskclasspackage", "servicetaskexpressionpackage", "servicetaskdelegateexpressionpackage", "servicetaskfieldspackage", "servicetaskresultvariablepackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "Activity", "sequence_start", "sequence_end", "ActivitiesMorph", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "ScriptTask",
-        "title" : "脚本任务",
-        "description" : "带脚本逻辑的自动任务",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n\t\n\t<g id=\"scriptTask\" transform=\"translate(2,2)\">\n\t\t<path oryx:anchors=\"top left\"\n\t\t\td=\"m 5,2 0,0.094 c 0.23706,0.064 0.53189,0.1645 0.8125,0.375 0.5582,0.4186 1.05109,1.228 1.15625,2.5312 l 8.03125,0 1,0 1,0 c 0,-3 -2,-3 -2,-3 l -10,0 z M 4,3 4,13 2,13 c 0,3 2,3 2,3 l 9,0 c 0,0 2,0 2,-3 L 15,6 6,6 6,5.5 C 6,4.1111 5.5595,3.529 5.1875,3.25 4.8155,2.971 4.5,3 4.5,3 L 4,3 z\"\n     \t\tstyle=\"fill:#72a7d0;stroke:none\"\n\t\t/>\n\t</g>\n  \n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\t\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
-        "icon" : "activity/list/type.script.png",
-        "groups" : [ "活动列表" ],
-        "propertyPackages" : [ "scriptformatpackage", "scripttextpackage", "overrideidpackage", "namepackage", "documentationpackage", "asynchronousdefinitionpackage", "exclusivedefinitionpackage", "executionlistenerspackage", "multiinstance_typepackage", "multiinstance_cardinalitypackage", "multiinstance_collectionpackage", "multiinstance_variablepackage", "multiinstance_conditionpackage", "isforcompensationpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "Activity", "sequence_start", "sequence_end", "ActivitiesMorph", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "BusinessRule",
-        "title" : "规则任务",
-        "description" : "具有规则逻辑的自动任务",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n  \t<defs>\n\t\t<radialGradient id=\"background\" cx=\"10%\" cy=\"10%\" r=\"100%\" fx=\"10%\" fy=\"10%\">\n\t\t\t<stop offset=\"0%\" stop-color=\"#ffffff\" stop-opacity=\"1\"/>\n\t\t\t<stop id=\"fill_el\" offset=\"100%\" stop-color=\"#ffffcc\" stop-opacity=\"1\"/>\n\t\t</radialGradient>\n\t</defs>\n\t\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n    \n\t<g id=\"businessRuleTask\" transform=\"translate(4,3)\">\n\t\t<path oryx:anchors=\"top left\" \n\t\t\t d=\"m 1,2 0,14 16,0 0,-14 z m 1.45458,5.6000386 2.90906,0 0,2.7999224 -2.90906,0 z m 4.36364,0 8.72718,0 0,2.7999224 -8.72718,0 z m -4.36364,4.1998844 2.90906,0 0,2.800116 -2.90906,0 z m 4.36364,0 8.72718,0 0,2.800116 -8.72718,0 z\"\n     \t\tstyle=\"fill:#72a7d0;stroke:none\"\n\t\t/>\n\t</g>\n\t\n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
-        "icon" : "activity/list/type.business.rule.png",
-        "groups" : [ "活动列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "asynchronousdefinitionpackage", "exclusivedefinitionpackage", "executionlistenerspackage", "multiinstance_typepackage", "multiinstance_cardinalitypackage", "multiinstance_collectionpackage", "multiinstance_variablepackage", "multiinstance_conditionpackage", "isforcompensationpackage", "ruletask_rulespackage", "ruletask_variables_inputpackage", "ruletask_excludepackage", "ruletask_resultpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "Activity", "sequence_start", "sequence_end", "ActivitiesMorph", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "ReceiveTask",
-        "title" : "接受任务",
-        "description" : "等待信号的任务",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n    \n\t<g id=\"receiveTask\" transform=\"translate(4,3)\">\n\t\t<path oryx:anchors=\"left top\" \n\t\t\t style=\"fill:#16964d;stroke:none;\"\n     \t\t d=\"m 0.5,2.5 0,13 17,0 0,-13 z M 2,4 6.5,8.5 2,13 z M 4,4 14,4 9,9 z m 12,0 0,9 -4.5,-4.5 z M 7.5,9.5 9,11 10.5,9.5 15,14 3,14 z\"\n\t\t />\n\t</g>\n\t\n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
-        "icon" : "activity/list/type.receive.png",
-        "groups" : [ "活动列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "asynchronousdefinitionpackage", "exclusivedefinitionpackage", "executionlistenerspackage", "multiinstance_typepackage", "multiinstance_cardinalitypackage", "multiinstance_collectionpackage", "multiinstance_variablepackage", "multiinstance_conditionpackage", "isforcompensationpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "Activity", "sequence_start", "sequence_end", "ActivitiesMorph", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "ManualTask",
-        "title" : "手工任务",
-        "description" : "没有逻辑的自动任务",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n    <g id=\"manualTask\" transform=\"translate(3,1)\">\n    \t<path oryx:anchors=\"top left\"\n    \t\tstyle=\"fill:#d1b575;stroke=none\"\n     \t\td=\"m 17,9.3290326 c -0.0069,0.5512461 -0.455166,1.0455894 -0.940778,1.0376604 l -5.792746,0 c 0.0053,0.119381 0.0026,0.237107 0.0061,0.355965 l 5.154918,0 c 0.482032,-0.0096 0.925529,0.49051 0.919525,1.037574 -0.0078,0.537128 -0.446283,1.017531 -0.919521,1.007683 l -5.245273,0 c -0.01507,0.104484 -0.03389,0.204081 -0.05316,0.301591 l 2.630175,0 c 0.454137,-0.0096 0.872112,0.461754 0.866386,0.977186 C 13.619526,14.554106 13.206293,15.009498 12.75924,15 L 3.7753054,15 C 3.6045812,15 3.433552,14.94423 3.2916363,14.837136 c -0.00174,0 -0.00436,0 -0.00609,0 C 1.7212035,14.367801 0.99998255,11.458641 1,11.458641 L 1,7.4588393 c 0,0 0.6623144,-1.316333 1.8390583,-2.0872584 1.1767614,-0.7711868 6.8053358,-2.40497 7.2587847,-2.8052901 0.453484,-0.40032 1.660213,1.4859942 0.04775,2.4010487 C 8.5332315,5.882394 8.507351,5.7996113 8.4370292,5.7936859 l 6.3569748,-0.00871 c 0.497046,-0.00958 0.952273,0.5097676 0.94612,1.0738232 -0.0053,0.556126 -0.456176,1.0566566 -0.94612,1.0496854 l -4.72435,0 c 0.01307,0.1149374 0.0244,0.2281319 0.03721,0.3498661 l 5.952195,0 c 0.494517,-0.00871 0.947906,0.5066305 0.940795,1.0679848 z\"\n    \t/>\n\t</g>\n\t\n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
-        "icon" : "activity/list/type.manual.png",
-        "groups" : [ "活动列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "asynchronousdefinitionpackage", "exclusivedefinitionpackage", "executionlistenerspackage", "multiinstance_typepackage", "multiinstance_cardinalitypackage", "multiinstance_collectionpackage", "multiinstance_variablepackage", "multiinstance_conditionpackage", "isforcompensationpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "Activity", "sequence_start", "sequence_end", "ActivitiesMorph", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "MailTask",
-        "title" : "邮件任务",
-        "description" : "An mail task",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n    \n\t<g id=\"sendTask\" transform=\"translate(4,3)\">\n\t\n\t<!-- path here -->\n\t\t<path oryx:anchors=\"top left\"\n\t\t\tstyle=\"fill:#16964d;stroke:none;\"\n     \t\td=\"M 1 3 L 9 11 L 17 3 L 1 3 z M 1 5 L 1 13 L 5 9 L 1 5 z M 17 5 L 13 9 L 17 13 L 17 5 z M 6 10 L 1 15 L 17 15 L 12 10 L 9 13 L 6 10 z \"\n     \t/>\n\t</g>\n\t\n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
-        "icon" : "activity/list/type.send.png",
-        "groups" : [ "活动列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "asynchronousdefinitionpackage", "exclusivedefinitionpackage", "executionlistenerspackage", "multiinstance_typepackage", "multiinstance_cardinalitypackage", "multiinstance_collectionpackage", "multiinstance_variablepackage", "multiinstance_conditionpackage", "isforcompensationpackage", "mailtasktopackage", "mailtaskfrompackage", "mailtasksubjectpackage", "mailtaskccpackage", "mailtaskbccpackage", "mailtasktextpackage", "mailtaskhtmlpackage", "mailtaskcharsetpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "Activity", "sequence_start", "sequence_end", "ActivitiesMorph", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "CamelTask",
-        "title" : "Camel任务",
-        "description" : "向Camel发送消息的任务",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n\t\n\t<g id=\"camelTask\" transform=\"translate(4,4)\">\n\t\t<path\n     style=\"fill:#bd4848;fill-opacity:1\"\n     d=\"m 8.1878027,15.383782 c -0.824818,-0.3427 0.375093,-1.1925 0.404055,-1.7743 0.230509,-0.8159 -0.217173,-1.5329 -0.550642,-2.2283 -0.106244,-0.5273 -0.03299,-1.8886005 -0.747194,-1.7818005 -0.712355,0.3776 -0.9225,1.2309005 -1.253911,1.9055005 -0.175574,1.0874 -0.630353,2.114 -0.775834,3.2123 -0.244009,0.4224 -1.741203,0.3888 -1.554386,-0.1397 0.651324,-0.3302 1.13227,-0.9222 1.180246,-1.6705 0.0082,-0.7042 -0.133578,-1.3681 0.302178,-2.0083 0.08617,-0.3202 0.356348,-1.0224005 -0.218996,-0.8051 -0.694517,0.2372 -1.651062,0.6128 -2.057645,-0.2959005 -0.696769,0.3057005 -1.102947,-0.611 -1.393127,-1.0565 -0.231079,-0.6218 -0.437041,-1.3041 -0.202103,-1.9476 -0.185217,-0.7514 -0.39751099,-1.5209 -0.35214999,-2.301 -0.243425,-0.7796 0.86000899,-1.2456 0.08581,-1.8855 -0.76078999,0.1964 -1.41630099,-0.7569 -0.79351899,-1.2877 0.58743,-0.52829998 1.49031699,-0.242 2.09856399,-0.77049998 0.816875,-0.3212 1.256619,0.65019998 1.923119,0.71939998 0.01194,0.7333 -0.0031,1.5042 -0.18417,2.2232 -0.194069,0.564 -0.811196,1.6968 0.06669,1.9398 0.738382,-0.173 1.095723,-0.9364 1.659041,-1.3729 0.727298,-0.3962 1.093982,-1.117 1.344137,-1.8675 0.400558,-0.8287 1.697676,-0.6854 1.955367,0.1758 0.103564,0.5511 0.9073983,1.7538 1.2472763,0.6846 0.121868,-0.6687 0.785541,-1.4454 1.518183,-1.0431 0.813587,0.4875 0.658233,1.6033 1.285504,2.2454 0.768715,0.8117 1.745394,1.4801 2.196633,2.5469 0.313781,0.8074 0.568552,1.707 0.496624,2.5733 -0.35485,0.8576005 -1.224508,-0.216 -0.64725,-0.7284 0.01868,-0.3794 -0.01834,-1.3264 -0.370249,-1.3272 -0.123187,0.7586 -0.152778,1.547 -0.10869,2.3154 0.270285,0.6662005 1.310741,0.7653005 1.060553,1.6763005 -0.03493,0.9801 0.294343,1.9505 0.148048,2.9272 -0.320479,0.2406 -0.79575,0.097 -1.185062,0.1512 -0.165725,0.3657 -0.40138,0.921 -1.020848,0.6744 -0.564671,0.1141 -1.246404,-0.266 -0.578559,-0.7715 0.679736,-0.5602 0.898618,-1.5362 0.687058,-2.3673 -0.529674,-1.108 -1.275984,-2.0954005 -1.839206,-3.1831005 -0.634619,-0.1004 -1.251945,0.6779 -1.956789,0.7408 -0.6065893,-0.038 -1.0354363,-0.06 -0.8495673,0.6969005 0.01681,0.711 0.152396,1.3997 0.157345,2.1104 0.07947,0.7464 0.171287,1.4944 0.238271,2.2351 0.237411,1.0076 -0.687542,1.1488 -1.414811,0.8598 z m 6.8675483,-1.8379 c 0.114364,-0.3658 0.206751,-1.2704 -0.114466,-1.3553 -0.152626,0.5835 -0.225018,1.1888 -0.227537,1.7919 0.147087,-0.1166 0.265559,-0.2643 0.342003,-0.4366 z\"\n     />\n\t</g>\n  \n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\t\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
-        "icon" : "activity/list/type.camel.png",
-        "groups" : [ "活动列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "asynchronousdefinitionpackage", "exclusivedefinitionpackage", "executionlistenerspackage", "multiinstance_typepackage", "multiinstance_cardinalitypackage", "multiinstance_collectionpackage", "multiinstance_variablepackage", "multiinstance_conditionpackage", "isforcompensationpackage", "cameltaskcamelcontextpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "Activity", "sequence_start", "sequence_end", "ActivitiesMorph", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "MuleTask",
-        "title" : "Mule任务",
-        "description" : "向Mule发送消息的任务",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n\t\n\t<g id=\"muleTask\" transform=\"translate(4,4)\">\n\t\t<path\n     style=\"fill:#bd4848;fill-opacity:1\"\n     d=\"M 8,0 C 3.581722,0 0,3.5817 0,8 c 0,4.4183 3.581722,8 8,8 4.418278,0 8,-3.5817 8,-8 L 16,7.6562 C 15.813571,3.3775 12.282847,0 8,0 z M 5.1875,2.7812 8,7.3437 10.8125,2.7812 c 1.323522,0.4299 2.329453,1.5645 2.8125,2.8438 1.136151,2.8609 -0.380702,6.4569 -3.25,7.5937 -0.217837,-0.6102 -0.438416,-1.2022 -0.65625,-1.8125 0.701032,-0.2274 1.313373,-0.6949 1.71875,-1.3125 0.73624,-1.2317 0.939877,-2.6305 -0.03125,-4.3125 l -2.75,4.0625 -0.65625,0 -0.65625,0 -2.75,-4 C 3.5268433,7.6916 3.82626,8.862 4.5625,10.0937 4.967877,10.7113 5.580218,11.1788 6.28125,11.4062 6.063416,12.0165 5.842837,12.6085 5.625,13.2187 2.755702,12.0819 1.238849,8.4858 2.375,5.625 2.858047,4.3457 3.863978,3.2112 5.1875,2.7812 z\"\n     />\n\t</g>\n  \n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\t\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
-        "icon" : "activity/list/type.mule.png",
-        "groups" : [ "活动列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "asynchronousdefinitionpackage", "exclusivedefinitionpackage", "executionlistenerspackage", "multiinstance_typepackage", "multiinstance_cardinalitypackage", "multiinstance_collectionpackage", "multiinstance_variablepackage", "multiinstance_conditionpackage", "isforcompensationpackage", "muletaskendpointurlpackage", "muletasklanguagepackage", "muletaskpayloadexpressionpackage", "muletaskresultvariablepackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "Activity", "sequence_start", "sequence_end", "ActivitiesMorph", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "SendTask",
-        "title" : "发送任务",
-        "description" : "发送消息的任务",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n    \n\t<g id=\"sendTask\" transform=\"translate(4,3)\">\n\t\n\t<!-- path here -->\n\t\t<path oryx:anchors=\"top left\"\n\t\t\tstyle=\"fill:#16964d;stroke:none;\"\n     \t\td=\"M 1 3 L 9 11 L 17 3 L 1 3 z M 1 5 L 1 13 L 5 9 L 1 5 z M 17 5 L 13 9 L 17 13 L 17 5 z M 6 10 L 1 15 L 17 15 L 12 10 L 9 13 L 6 10 z \"\n     \t/>\n\t</g>\n\t\n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
-        "icon" : "activity/list/type.send.png",
-        "groups" : [ "活动列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "asynchronousdefinitionpackage", "exclusivedefinitionpackage", "executionlistenerspackage", "multiinstance_typepackage", "multiinstance_cardinalitypackage", "multiinstance_collectionpackage", "multiinstance_variablepackage", "multiinstance_conditionpackage", "isforcompensationpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "Activity", "sequence_start", "sequence_end", "ActivitiesMorph", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "SubProcess",
-        "title" : "子流程",
-        "description" : "子流程范围",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n   width=\"200\"\n   height=\"160\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"50\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"80\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"110\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"70\" oryx:cy=\"159\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"100\" oryx:cy=\"159\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"130\" oryx:cy=\"159\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"199\" oryx:cy=\"50\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"199\" oryx:cy=\"80\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"199\" oryx:cy=\"110\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"70\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"100\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"130\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"100\" oryx:cy=\"80\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"120 100\" oryx:maximumSize=\"\" >\n    <rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"0\" y=\"0\" width=\"190\" height=\"160\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:anchors=\"bottom top right left\" x=\"0\" y=\"0\" width=\"200\" height=\"160\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#ffffff\" />\n\t<rect id=\"border\" oryx:anchors=\"top bottom left right\" oryx:resize=\"vertical horizontal\" x=\"2.5\" y=\"2.5\" width=\"195\" height=\"155\" rx=\"8\" ry=\"8\" stroke=\"black\" stroke-width=\"1\" fill=\"none\" />\n\t<text \n\t\tfont-size=\"12\" \n\t\tid=\"text_name\" \n\t\tx=\"8\" \n\t\ty=\"10\" \n\t\toryx:align=\"top left\"\n\t\toryx:fittoelem=\"text_frame\"\n\t\toryx:anchors=\"left top\" \n\t\tstroke=\"#373e48\">\n\t</text>\n\t\n\t<g \tid=\"parallel\"\n\t\ttransform=\"translate(1)\">\n\t\t<path \n\t\t\tid=\"parallelpath\"\n\t\t\toryx:anchors=\"bottom\" \n\t\t\tfill=\"none\" stroke=\"#bbbbbb\" d=\"M96 145 v10 M100 145 v10 M104 145 v10\" \n\t\t\tstroke-width=\"2\"\n\t\t/>\n\t</g>\n\t<g \tid=\"sequential\"\n\t\ttransform=\"translate(1)\">\n\t\t<path \n\t\t\tid=\"sequentialpath\"\n\t\t\toryx:anchors=\"bottom\" \n\t\t\tfill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M95,154h10 M95,150h10 M95,146h10\"\n\t\t/>\n\t</g>\n  </g>\n</svg>",
-        "icon" : "activity/expanded.subprocess.png",
-        "groups" : [ "结构列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "asynchronousdefinitionpackage", "exclusivedefinitionpackage", "executionlistenerspackage", "multiinstance_typepackage", "multiinstance_cardinalitypackage", "multiinstance_collectionpackage", "multiinstance_variablepackage", "multiinstance_conditionpackage", "istransactionpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "Activity", "sequence_start", "sequence_end", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "EventSubProcess",
-        "title" : "事件子流程",
-        "description" : "一个事件周期的子流程",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n   width=\"200\"\n   height=\"160\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"0\" oryx:cy=\"80\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"100\" oryx:cy=\"160\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"200\" oryx:cy=\"80\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"100\" oryx:cy=\"0\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"100\" oryx:cy=\"80\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"120 100\" oryx:maximumSize=\"\" >\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"0\" y=\"0\" width=\"190\" height=\"160\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:anchors=\"bottom top right left\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"200\" height=\"160\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" stroke-dasharray=\"2,2,2\" fill=\"#ffffff\" />\n    \t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"8\" \n\t\t\ty=\"10\" \n\t\t\toryx:align=\"top left\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\toryx:anchors=\"left top\" \n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n    \t\n\t<g id=\"none\"></g>\n\t\n  </g>\n</svg>",
-        "icon" : "activity/event.subprocess.png",
-        "groups" : [ "结构列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "asynchronousdefinitionpackage", "exclusivedefinitionpackage", "executionlistenerspackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "Activity", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "CallActivity",
-        "title" : "调用活动",
-        "description" : "一个调用活动",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n    <rect oryx:resize=\"vertical horizontal\" oryx:anchors=\"bottom top right left\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"4\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n    \n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
-        "icon" : "activity/task.png",
-        "groups" : [ "结构列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "asynchronousdefinitionpackage", "exclusivedefinitionpackage", "executionlistenerspackage", "callactivitycalledelementpackage", "callactivityinparameterspackage", "callactivityoutparameterspackage", "multiinstance_typepackage", "multiinstance_cardinalitypackage", "multiinstance_collectionpackage", "multiinstance_variablepackage", "multiinstance_conditionpackage", "isforcompensationpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "Activity", "sequence_start", "sequence_end", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "ExclusiveGateway",
-        "title" : "互斥网关",
-        "description" : "一个选择的网关",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns=\"http://www.w3.org/2000/svg\"\n   version=\"1.0\"\n   width=\"40\"\n   height=\"40\">\n  <defs\n     id=\"defs4\" />\n  <oryx:magnets>\n    <oryx:magnet\n       oryx:default=\"yes\"\n       oryx:cy=\"16\"\n       oryx:cx=\"16\" />\n  </oryx:magnets>\t\t\t\t\t\n  <g>\n  \n    <path\n       d=\"M -4.5,16 L 16,-4.5 L 35.5,16 L 16,35.5z\"\n       id=\"bg_frame\"\n       fill=\"#ffffff\"\n       stroke=\"#585858\"\n       style=\"stroke-width:1\" />\n    <g\n       id=\"cross\">\n      <path\n      \tid=\"crosspath\"\n      \tstroke=\"#585858\"\n      \tfill=\"#585858\"\n        d=\"M 8.75,7.55 L 12.75,7.55 L 23.15,24.45 L 19.25,24.45 z\"\n        style=\"stroke-width:1\" />\n      <path\n      \tid=\"crosspath2\"\n      \tstroke=\"#585858\"\n      \tfill=\"#585858\"\n        d=\"M 8.75,24.45 L 19.25,7.55 L 23.15,7.55 L 12.75,24.45 z\"\n        style=\"stroke-width:1\" />\n    </g>\n\t\n\t<text id=\"text_name\" x=\"26\" y=\"26\" oryx:align=\"left top\"/>\n\t\n  </g>\n</svg>\n",
-        "icon" : "gateway/exclusive.databased.png",
-        "groups" : [ "网关列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "asynchronousdefinitionpackage", "exclusivedefinitionpackage", "sequencefloworderpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "sequence_start", "GatewaysMorph", "sequence_end", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "ParallelGateway",
-        "title" : "并行网关",
-        "description" : "一个并行的网关",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns=\"http://www.w3.org/2000/svg\"\n   version=\"1.0\"\n   width=\"40\"\n   height=\"40\">\n   \n  <oryx:magnets>\n    <oryx:magnet\n       oryx:default=\"yes\"\n       oryx:cy=\"16\"\n       oryx:cx=\"16\" />\n  </oryx:magnets>\n  <g>\n    <path\n       d=\"M -4.5,16 L 16,-4.5 L 35.5,16 L 16,35.5z\"\n       id=\"bg_frame\"\n       fill=\"#ffffff\"\n       stroke=\"#585858\"\n       style=\"stroke-width:1\" />\n    <path\n       d=\"M 6.75,16 L 25.75,16 M 16,6.75 L 16,25.75\"\n       id=\"path9\"\n       stroke=\"#585858\"\n       style=\"fill:none;stroke-width:3\" />\n    \n\t<text id=\"text_name\" x=\"26\" y=\"26\" oryx:align=\"left top\"/>\n\t\n  </g>\n</svg>\n",
-        "icon" : "gateway/parallel.png",
-        "groups" : [ "网关列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "asynchronousdefinitionpackage", "exclusivedefinitionpackage", "sequencefloworderpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "sequence_start", "GatewaysMorph", "sequence_end", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "InclusiveGateway",
-        "title" : "包容性网关",
-        "description" : "一个包容性网关",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns=\"http://www.w3.org/2000/svg\"\n   version=\"1.0\"\n   width=\"40\"\n   height=\"40\">\n  <oryx:magnets>\n    <oryx:magnet\n       oryx:default=\"yes\"\n       oryx:cy=\"16\"\n       oryx:cx=\"16\" />\n  </oryx:magnets>\n  <g>\n\n    <path\n       d=\"M -4.5,16 L 16,-4.5 L 35.5,16 L 16,35.5z\"\n       id=\"bg_frame\"\n       fill=\"#ffffff\"\n       stroke=\"#585858\"\n       style=\"stroke-width:1\" />\n    <circle\n    \tid=\"circle\"\n    \tstroke=\"#585858\"\n\t\tcx=\"16\"\n\t\tcy=\"16\"\n\t\tr=\"9.75\"\n\t\tstyle=\"fill:none;stroke-width:2.5\" />\n    \n\t<text id=\"text_name\" x=\"26\" y=\"26\" oryx:align=\"left top\"/>\n\t\n  </g>\n</svg>\n",
-        "icon" : "gateway/inclusive.png",
-        "groups" : [ "网关列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "asynchronousdefinitionpackage", "exclusivedefinitionpackage", "sequencefloworderpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "sequence_start", "GatewaysMorph", "sequence_end", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "EventGateway",
-        "title" : "事件网关",
-        "description" : "一个事件网关",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns=\"http://www.w3.org/2000/svg\"\n   version=\"1.0\"\n   width=\"40\"\n   height=\"40\">\n  <oryx:magnets>\n    <oryx:magnet\n       oryx:default=\"yes\"\n       oryx:cy=\"16\"\n       oryx:cx=\"16\" />\n  </oryx:magnets>\n  \n  <g> \n  \t\n\t<path\n\t\td=\"M -4.5,16 L 16,-4.5 L 35.5,16 L 16,35.5z\"\n\t\tid=\"bg_frame\"\n\t\tfill=\"#ffffff\"\n\t\tstroke=\"#585858\"\n\t\tstyle=\"stroke-width:1\" />\n\t<circle\n\t\tid=\"circle\"\n\t\tcx=\"16\"\n\t\tcy=\"16\"\n\t\tr=\"10.4\"\n\t\tstroke=\"#585858\"\n\t\tstyle=\"fill:none;stroke-width:0.5\" />\n\t<circle\n\t\tid=\"circle2\"\n\t\tcx=\"16\"\n\t\tcy=\"16\"\n\t\tr=\"11.7\"\n\t\tstroke=\"#585858\"\n\t\tstyle=\"fill:none;stroke-width:0.5\" />\n\t<path\n\t\td=\"M 20.327514,22.344972 L 11.259248,22.344216 L 8.4577203,13.719549 L 15.794545,8.389969 L 23.130481,13.720774 L 20.327514,22.344972 z\"\n\t\tid=\"middlePolygon\"\n\t\tstroke=\"#585858\"\n\t\tstyle=\"fill:none;fill-opacity:1;stroke-width:1.39999998;stroke-linejoin:bevel;stroke-opacity:1\" />\n\t\n\t\n\t<g id=\"instantiate\">\n\t\n\t\t<path\n\t\t\td=\"M -4.5,16 L 16,-4.5 L 35.5,16 L 16,35.5z\"\n\t\t\tid=\"bg_frame2\"\n\t\t\tfill=\"#ffffff\"\n\t\t\tstroke=\"#585858\"\n\t\t\tstyle=\"stroke-width:1\" />\n\t\t<circle\n\t\t\tid=\"circle3\"\n\t\t\tcx=\"16\"\n\t\t\tcy=\"16\"\n\t\t\tr=\"11\"\n\t\t\tstroke=\"#585858\"\n\t\t\tstyle=\"fill:none;stroke-width:1\" />\n\t\t<path\n\t\t\td=\"M 20.327514,22.344972 L 11.259248,22.344216 L 8.4577203,13.719549 L 15.794545,8.389969 L 23.130481,13.720774 L 20.327514,22.344972 z\"\n\t\t\tid=\"middlePolygon2\"\n\t\t\tstroke=\"#585858\"\n\t\t\tstyle=\"fill:none;fill-opacity:1;stroke-width:1.39999998;stroke-linejoin:bevel;stroke-opacity:1\" />\n\t\n\t\n\t\t<g id=\"parallel\">\n\t\t\t<path\n\t\t\t\td=\"M -4.5,16 L 16,-4.5 L 35.5,16 L 16,35.5z\"\n\t\t\t\tid=\"bg_frame3\"\n\t\t\t\tfill=\"#ffffff\"\n\t\t\t\tstroke=\"#585858\"\n\t\t\t\tstyle=\"stroke-width:1\" />\n\t\t\t<circle id=\"frame5\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n\t\t\t\n\t\t\t<path\n\t\t\t\td=\"M 6.75,14 L6.75,18 L14,18 L14,24.75 L18,24.75 L18,18 L24.75,18 L24.75,14 L18,14 L18,6.75 L14,6.75 L14,14z\"\n\t\t\t\tid=\"path92\"\n\t\t\t\tstroke=\"#585858\"\n\t\t\t\tstyle=\"fill:none;stroke-width:1\" />\n\t\t\n\t\t</g>\n\t\n\t</g>\n\t\n\t<text id=\"text_name\" x=\"26\" y=\"26\" oryx:align=\"left top\"/>\n\t\n  </g>\t\n\t\n</svg>\n",
-        "icon" : "gateway/eventbased.png",
-        "groups" : [ "网关列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "asynchronousdefinitionpackage", "exclusivedefinitionpackage", "sequencefloworderpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "sequence_start", "GatewaysMorph", "sequence_end", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "BoundaryErrorEvent",
-        "title" : "边界错误事件",
-        "description" : "一个捕捉BPMN异常的边界事件",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"1\"/>\n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    \n    <path\n         stroke=\"#585858\"\n         style=\"fill:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10\"\n         d=\"M 22.820839,11.171502 L 19.36734,24.58992 L 13.54138,14.281819 L 9.3386512,20.071607 L 13.048949,6.8323057 L 18.996148,16.132659 L 22.820839,11.171502 z\"\n         id=\"errorPolygon\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
-        "icon" : "catching/error.png",
-        "groups" : [ "边界事件" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "errorrefpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "sequence_start", "BoundaryEventsMorph", "IntermediateEventOnActivityBoundary" ]
-    }, {
-        "type" : "node",
-        "id" : "BoundaryTimerEvent",
-        "title" : "定时边界事件",
-        "description" : "一个定时触发的边界事件",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle \n    \tid=\"bg_frame\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"15\" \n    \tstroke=\"#585858\" \n    \tfill=\"#ffffff\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 5.5, 3\" />\n    \t\n    <circle \n    \tid=\"frame2_non_interrupting\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"12\" \n    \tstroke=\"#585858\" \n    \tfill=\"none\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 4.5, 3\" />\n    \n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    <circle id=\"frame2\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    \n    <path id=\"path1\" transform=\"translate(6,6)\"\n    \td=\"M 10 0 C 4.4771525 0 0 4.4771525 0 10 C 0 15.522847 4.4771525 20 10 20 C 15.522847 20 20 15.522847 20 10 C 20 4.4771525 15.522847 1.1842379e-15 10 0 z M 9.09375 1.03125 C 9.2292164 1.0174926 9.362825 1.0389311 9.5 1.03125 L 9.5 3.5 L 10.5 3.5 L 10.5 1.03125 C 15.063526 1.2867831 18.713217 4.9364738 18.96875 9.5 L 16.5 9.5 L 16.5 10.5 L 18.96875 10.5 C 18.713217 15.063526 15.063526 18.713217 10.5 18.96875 L 10.5 16.5 L 9.5 16.5 L 9.5 18.96875 C 4.9364738 18.713217 1.2867831 15.063526 1.03125 10.5 L 3.5 10.5 L 3.5 9.5 L 1.03125 9.5 C 1.279102 5.0736488 4.7225326 1.4751713 9.09375 1.03125 z M 9.5 5 L 9.5 8.0625 C 8.6373007 8.2844627 8 9.0680195 8 10 C 8 11.104569 8.8954305 12 10 12 C 10.931981 12 11.715537 11.362699 11.9375 10.5 L 14 10.5 L 14 9.5 L 11.9375 9.5 C 11.756642 8.7970599 11.20294 8.2433585 10.5 8.0625 L 10.5 5 L 9.5 5 z \"  \n    \tfill=\"#585858\" stroke=\"none\" />\n    \t\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
-        "icon" : "catching/timer.png",
-        "groups" : [ "边界事件" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "timercycledefinitionpackage", "timerdatedefinitionpackage", "timerdurationdefinitionpackage", "timerenddatedefinitionpackage", "cancelactivitypackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "sequence_start", "BoundaryEventsMorph", "IntermediateEventOnActivityBoundary" ]
-    }, {
-        "type" : "node",
-        "id" : "BoundarySignalEvent",
-        "title" : "边界信号事件",
-        "description" : "一个信号触发的边界事件",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle \n    \tid=\"bg_frame\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"15\" \n    \tstroke=\"#585858\" \n    \tfill=\"#ffffff\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 5.5, 3\" />\n    \t\n    <circle \n    \tid=\"frame2_non_interrupting\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"12\" \n    \tstroke=\"#585858\" \n    \tfill=\"none\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 4.5, 3\" />\n    \n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    <circle id=\"frame2\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n\t<path\n\t   id=\"signalCatching\"\n\t   stroke=\"#585858\"\n       d=\"M 8.7124971,21.247342 L 23.333334,21.247342 L 16.022915,8.5759512 L 8.7124971,21.247342 z\"\n       style=\"fill:none;stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
-        "icon" : "catching/signal.png",
-        "groups" : [ "边界事件" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "signalrefpackage", "cancelactivitypackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "sequence_start", "BoundaryEventsMorph", "IntermediateEventOnActivityBoundary" ]
-    }, {
-        "type" : "node",
-        "id" : "BoundaryMessageEvent",
-        "title" : "边界消息事件",
-        "description" : "一个边界消息事件",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle \n    \tid=\"bg_frame\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"15\" \n    \tstroke=\"#585858\" \n    \tfill=\"#ffffff\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 5.5, 3\" />\n    \t\n    <circle \n    \tid=\"frame2_non_interrupting\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"12\" \n    \tstroke=\"#585858\" \n    \tfill=\"none\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 4.5, 3\" />\n    \t\n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    <circle id=\"frame2\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    \n\t<g id=\"messageCatching\">\n\t\t<path transform=\"translate(7,7)\" id=\"path1\" stroke=\"none\" fill=\"#585858\" stroke-width=\"1\" d=\"M 1 3 L 9 11 L 17 3 L 1 3 z M 1 5 L 1 13 L 5 9 L 1 5 z M 17 5 L 13 9 L 17 13 L 17 5 z M 6 10 L 1 15 L 17 15 L 12 10 L 9 13 L 6 10 z \"/>\n\t</g>\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n\t\n  </g>\n</svg>",
-        "icon" : "catching/message.png",
-        "groups" : [ "边界事件" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "messagerefpackage", "cancelactivitypackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "sequence_start", "BoundaryEventsMorph", "IntermediateEventOnActivityBoundary" ]
-    }, {
-        "type" : "node",
-        "id" : "BoundaryCancelEvent",
-        "title" : "边界取消事件",
-        "description" : "一个边界取消事件",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n  \n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"1\"/>\n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    \n    <path\n       d=\"M 7.2839105,10.27369 L 10.151395,7.4062062 L 15.886362,13.141174 L 21.621331,7.4062056 L 24.488814,10.273689 L 18.753846,16.008657 L 24.488815,21.743626 L 21.621331,24.611111 L 15.886362,18.876142 L 10.151394,24.611109 L 7.283911,21.743625 L 13.018878,16.008658 L 7.2839105,10.27369 z\"\n       id=\"cancelCross\" fill=\"none\" stroke=\"#585858\" stroke-width=\"1.7\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
-        "icon" : "catching/cancel.png",
-        "groups" : [ "边界事件" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "sequence_start", "BoundaryEventsMorph", "IntermediateEventOnActivityBoundary" ]
-    }, {
-        "type" : "node",
-        "id" : "BoundaryCompensationEvent",
-        "title" : "边界修正事件",
-        "description" : "一个边界修正事件",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n\t\n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"1\"/>\n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"1\"/>\n    \n    <polygon id=\"poly1\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1.4\" points=\"15,9 15,23 8,16\" stroke-linecap=\"butt\" stroke-linejoin=\"miter\" stroke-miterlimit=\"10\" />\n    <polygon id=\"poly2\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1.4\" points=\"22,9 22,23 15,16\" stroke-linecap=\"butt\" stroke-linejoin=\"miter\" stroke-miterlimit=\"10\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n </g>\n</svg>",
-        "icon" : "catching/compensation.png",
-        "groups" : [ "边界事件" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "BoundaryEventsMorph", "IntermediateEventOnActivityBoundary", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "CatchTimerEvent",
-        "title" : "中间定时器捕获事件",
-        "description" : "定时器触发的中间捕获事件",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle \n    \tid=\"bg_frame\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"15\" \n    \tstroke=\"#585858\" \n    \tfill=\"#ffffff\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 5.5, 3\" />\n    \t\n    <circle \n    \tid=\"frame2_non_interrupting\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"12\" \n    \tstroke=\"#585858\" \n    \tfill=\"none\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 4.5, 3\" />\n    \n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    <circle id=\"frame2\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    \n    <path id=\"path1\" transform=\"translate(6,6)\"\n    \td=\"M 10 0 C 4.4771525 0 0 4.4771525 0 10 C 0 15.522847 4.4771525 20 10 20 C 15.522847 20 20 15.522847 20 10 C 20 4.4771525 15.522847 1.1842379e-15 10 0 z M 9.09375 1.03125 C 9.2292164 1.0174926 9.362825 1.0389311 9.5 1.03125 L 9.5 3.5 L 10.5 3.5 L 10.5 1.03125 C 15.063526 1.2867831 18.713217 4.9364738 18.96875 9.5 L 16.5 9.5 L 16.5 10.5 L 18.96875 10.5 C 18.713217 15.063526 15.063526 18.713217 10.5 18.96875 L 10.5 16.5 L 9.5 16.5 L 9.5 18.96875 C 4.9364738 18.713217 1.2867831 15.063526 1.03125 10.5 L 3.5 10.5 L 3.5 9.5 L 1.03125 9.5 C 1.279102 5.0736488 4.7225326 1.4751713 9.09375 1.03125 z M 9.5 5 L 9.5 8.0625 C 8.6373007 8.2844627 8 9.0680195 8 10 C 8 11.104569 8.8954305 12 10 12 C 10.931981 12 11.715537 11.362699 11.9375 10.5 L 14 10.5 L 14 9.5 L 11.9375 9.5 C 11.756642 8.7970599 11.20294 8.2433585 10.5 8.0625 L 10.5 5 L 9.5 5 z \"  \n    \tfill=\"#585858\" stroke=\"none\" />\n    \t\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
-        "icon" : "catching/timer.png",
-        "groups" : [ "中间捕获事件列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "executionlistenerspackage", "timercycledefinitionpackage", "timerdatedefinitionpackage", "timerdurationdefinitionpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "sequence_start", "sequence_end", "CatchEventsMorph", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "CatchSignalEvent",
-        "title" : "中间信号捕获事件",
-        "description" : "信号触发的捕获事件",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle \n    \tid=\"bg_frame\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"15\" \n    \tstroke=\"#585858\" \n    \tfill=\"#ffffff\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 5.5, 3\" />\n    \t\n    <circle \n    \tid=\"frame2_non_interrupting\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"12\" \n    \tstroke=\"#585858\" \n    \tfill=\"none\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 4.5, 3\" />\n    \n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    <circle id=\"frame2\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n\t<path\n\t   id=\"signalCatching\"\n\t   stroke=\"#585858\"\n       d=\"M 8.7124971,21.247342 L 23.333334,21.247342 L 16.022915,8.5759512 L 8.7124971,21.247342 z\"\n       style=\"fill:none;stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
-        "icon" : "catching/signal.png",
-        "groups" : [ "中间捕获事件列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "executionlistenerspackage", "signalrefpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "sequence_start", "sequence_end", "CatchEventsMorph", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "CatchMessageEvent",
-        "title" : "中间消息捕获事件",
-        "description" : "一个消息触发的中间捕获事件",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle \n    \tid=\"bg_frame\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"15\" \n    \tstroke=\"#585858\" \n    \tfill=\"#ffffff\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 5.5, 3\" />\n    \t\n    <circle \n    \tid=\"frame2_non_interrupting\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"12\" \n    \tstroke=\"#585858\" \n    \tfill=\"none\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 4.5, 3\" />\n    \t\n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    <circle id=\"frame2\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    \n\t<g id=\"messageCatching\">\n\t\t<path transform=\"translate(7,7)\" id=\"path1\" stroke=\"none\" fill=\"#585858\" stroke-width=\"1\" d=\"M 1 3 L 9 11 L 17 3 L 1 3 z M 1 5 L 1 13 L 5 9 L 1 5 z M 17 5 L 13 9 L 17 13 L 17 5 z M 6 10 L 1 15 L 17 15 L 12 10 L 9 13 L 6 10 z \"/>\n\t</g>\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n\t\n  </g>\n</svg>",
-        "icon" : "catching/message.png",
-        "groups" : [ "中间捕获事件列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "executionlistenerspackage", "messagerefpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "sequence_start", "sequence_end", "CatchEventsMorph", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "ThrowNoneEvent",
-        "title" : "中间抛出事件",
-        "description" : "无触发器的中间抛出事件",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n  \n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"1\"/>\n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
-        "icon" : "throwing/none.png",
-        "groups" : [ "中间抛出事件" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "executionlistenerspackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "ThrowEventsMorph", "sequence_start", "sequence_end", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "ThrowSignalEvent",
-        "title" : "信号中间抛出事件",
-        "description" : "一个信号触发的中间抛出事件",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"1\"/>\n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    <path\n\t   id=\"signalThrowing\"\n       d=\"M 8.7124971,21.247342 L 23.333334,21.247342 L 16.022915,8.5759512 L 8.7124971,21.247342 z\"\n       fill=\"#585858\"\n       stroke=\"#585858\"\n       style=\"stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
-        "icon" : "throwing/signal.png",
-        "groups" : [ "中间抛出事件" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "executionlistenerspackage", "signalrefpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "ThrowEventsMorph", "sequence_start", "sequence_end", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "EndNoneEvent",
-        "title" : "结束任务",
-        "description" : "一个无触发器的结束任务",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\">\n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"14\" stroke=\"#585858\" fill=\"#FFFFFF\" stroke-width=\"1\"/>\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"32\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
-        "icon" : "endevent/none.png",
-        "groups" : [ "结束任务列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "executionlistenerspackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "EndEventsMorph", "sequence_end", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "EndErrorEvent",
-        "title" : "结束错误任务",
-        "description" : "An end event that throws an error event",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"14\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"3\"/>\n    \n    <path\n         fill=\"#585858\"\n         stroke=\"#585858\"\n         style=\"stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10\"\n         d=\"M 22.820839,11.171502 L 19.36734,24.58992 L 13.54138,14.281819 L 9.3386512,20.071607 L 13.048949,6.8323057 L 18.996148,16.132659 L 22.820839,11.171502 z\"\n         id=\"errorPolygon\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"32\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
-        "icon" : "endevent/error.png",
-        "groups" : [ "结束任务列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "executionlistenerspackage", "errorrefpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "EndEventsMorph", "sequence_end", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "EndCancelEvent",
-        "title" : "结束取消任务",
-        "description" : "A cancel end event",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\">\n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"14\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"3\"/>\n    \n    <path id=\"path1\" d=\"M 9 9 L 23 23 M 9 23 L 23 9\" fill=\"none\" stroke=\"#585858\" stroke-width=\"5\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"32\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
-        "icon" : "endevent/cancel.png",
-        "groups" : [ "结束任务列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "executionlistenerspackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "EndEventsMorph", "sequence_end", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "EndTerminateEvent",
-        "title" : "终结任务",
-        "description" : "A terminate end event",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\">\n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"14\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"3\"/>\n    \n    <circle id=\"circle1\" cx=\"16\" cy=\"16\" r=\"9\" stroke=\"#585858\" fill=\"#585858\" stroke-width=\"1\"/>\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"32\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
-        "icon" : "endevent/terminate.png",
-        "groups" : [ "结束任务列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "executionlistenerspackage", "terminateAllpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "EndEventsMorph", "sequence_end", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "Pool",
-        "title" : "池",
-        "description" : "A pool to stucture the process definition",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n   width=\"600\"\n   height=\"250\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"0\" oryx:cy=\"124\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"299\" oryx:cy=\"249\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"599\" oryx:cy=\"124\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"299\" oryx:cy=\"0\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"299\" oryx:cy=\"124\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"none\" >\n    <defs>\n\t\t<radialGradient id=\"background\" cx=\"0%\" cy=\"10%\" r=\"100%\" fx=\"20%\" fy=\"10%\">\n\t\t\t<stop offset=\"0%\" stop-color=\"#ffffff\" stop-opacity=\"1\"/>\n\t\t\t<stop id=\"fill_el\" offset=\"100%\" stop-color=\"#ffffff\" stop-opacity=\"1\"/>\n\t\t</radialGradient>\n\t</defs>\n\t  \t\n  \t<rect\n  \t\tid=\"border\"\n  \t\tclass=\"stripable-element-force\"\n  \t\toryx:resize=\"vertical horizontal\"\n  \t\tx=\"0\"\n  \t\ty=\"0\"\n  \t\twidth=\"600\"\n  \t\theight=\"250\"\n  \t\tfill=\"none\"\n  \t\tstroke-width=\"9\"\n  \t\tstroke=\"none\"\n  \t\tvisibility=\"visible\"\n  \t\tpointer-events=\"stroke\"\n  \t/>\n    <rect\n    \tid=\"c\"\n    \toryx:resize=\"vertical horizontal\"\n    \tx=\"0\"\n    \ty=\"0\"\n    \twidth=\"600\" \n    \theight=\"250\" \n    \tstroke=\"black\" \n    \tfill=\"url(#background) white\"\n    \tfill-opacity=\"0.3\" \n    />\n    \n\t<rect \n\t\tid=\"caption\"\n\t\toryx:anchors=\"left top bottom\"\n\t\tx=\"0\"\n\t\ty=\"0\"\n\t\twidth=\"30\"\n\t\theight=\"250\"\n\t\tstroke=\"black\"\n\t\tstroke-width=\"1\"\n\t\tfill=\"url(#background) white\"\n\t\tpointer-events=\"all\"\n\t/>\n\t\n\t<rect \n\t\tid=\"captionDisableAntialiasing\"\n\t\toryx:anchors=\"left top bottom\"\n\t\tx=\"0\"\n\t\ty=\"0\"\n\t\twidth=\"30\"\n\t\theight=\"250\"\n\t\tstroke=\"black\"\n\t\tstroke-width=\"1\"\n\t\tfill=\"url(#background) white\"\n\t\tpointer-events=\"all\"\n\t/>\n\t\n    <text x=\"13\" y=\"125\" font-size=\"12\" id=\"text_name\" oryx:fittoelem=\"caption\" oryx:align=\"middle center\" oryx:anchors=\"left\" oryx:rotate=\"270\" fill=\"black\" stroke=\"black\"></text>\n    \n  </g>\n</svg>",
-        "icon" : "swimlane/pool.png",
-        "groups" : [ "泳道列表" ],
-        "layout" : [ {
-            "type" : "layout.bpmn2_0.pool"
-        } ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "process_idpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "canContainArtifacts", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "Lane",
-        "title" : "泳道",
-        "description" : "构建流程定义的通道",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n   width=\"600\"\n   height=\"250\"\n   version=\"1.0\">\n  <defs></defs>\n  <g pointer-events=\"none\" >\n  \n     <defs>\n\t\t<radialGradient id=\"background\" cx=\"0%\" cy=\"10%\" r=\"200%\" fx=\"20%\" fy=\"10%\">\n\t\t\t<stop offset=\"0%\" stop-color=\"#ffffff\" stop-opacity=\"1\"/>\n\t\t\t<stop id=\"fill_el\" offset=\"100%\" stop-color=\"#ffffff\" stop-opacity=\"0\"/>\n\t\t</radialGradient>\n\t</defs>\n\t\n  \t<rect id=\"border_invisible\" class=\"stripable-element-force\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"600\" height=\"250\" fill=\"none\" stroke-width=\"10\" stroke=\"white\" visibility=\"hidden\" pointer-events=\"stroke\"/>\t\t\n\t<rect id=\"border\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"600\" height=\"250\" stroke=\"black\" stroke-width=\"1\" fill=\"url(#background) white\" pointer-events=\"none\" />\n\t\n\t\n\t<rect \n\t\tid=\"caption\"\n\t\toryx:anchors=\"left top bottom\"\n\t\tx=\"0\"\n\t\ty=\"1\"\n\t\twidth=\"30\"\n\t\theight=\"248\"\n\t\tstroke=\"black\"\n\t\tstroke-width=\"0\"\n\t\tfill=\"white\"\n\t\tvisibility=\"hidden\"\n\t\tclass=\"stripable-element-force\"\n\t\tpointer-events=\"all\"\n\t/>\n\t\n\t<path\n\t\tstroke=\"black\"\n\t\tstroke-width=\"1\"\n\t\tfill=\"none\"\n\t\td=\"M 0,0 L 0,250\"\n        oryx:anchors=\"left top bottom\"\n        id=\"captionDisableAntialiasing\"\n    />\n\t\n\t<!--rect \n\t\tid=\"captionDisableAntialiasing\"\n\t\toryx:anchors=\"left top bottom\"\n\t\tx=\"0\"\n\t\ty=\"0\"\n\t\twidth=\"30\"\n\t\theight=\"250\"\n\t\tstroke=\"black\"\n\t\tstroke-width=\"1\"\n\t\tfill=\"url(#background) white\"\n\t/-->\n\t\n    <text \n\t\tx=\"13\"\n\t\ty=\"125\"\n\t\toryx:rotate=\"270\" \n\t\tfont-size=\"12\" \n\t\tid=\"text_name\" \n\t\toryx:align=\"middle center\" \n\t\toryx:anchors=\"left\"\n\t\toryx:fittoelem=\"caption\"\n\t\tfill=\"black\" \n\t\tstroke=\"black\">\n\t</text>\n  </g>\n</svg>",
-        "icon" : "swimlane/lane.png",
-        "groups" : [ "泳道列表" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "PoolChild", "canContainArtifacts", "all" ]
-    }, {
-        "type" : "edge",
-        "id" : "SequenceFlow",
-        "title" : "顺序流",
-        "description" : "顺序流定义活动的执行顺序",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\r\n<svg\r\n\txmlns=\"http://www.w3.org/2000/svg\"\r\n\txmlns:oryx=\"http://www.b3mn.org/oryx\"\r\n\tversion=\"1.0\"\r\n\toryx:edge=\"edge\" >\r\n\t<defs>\r\n\t  \t<marker id=\"start\" refX=\"1\" refY=\"5\" markerUnits=\"userSpaceOnUse\" markerWidth=\"17\" markerHeight=\"11\" orient=\"auto\">\r\n\t  \t\t<!-- <path id=\"conditional\"   d=\"M 0 6 L 8 1 L 15 5 L 8 9 L 1 5\" fill=\"white\" stroke=\"black\" stroke-width=\"1\" /> -->\r\n\t\t\t<path id=\"default\" d=\"M 5 0 L 11 10\" fill=\"white\" stroke=\"#585858\" stroke-width=\"1\" />\r\n\t  \t</marker>\r\n\t  \t<marker id=\"end\" refX=\"15\" refY=\"6\" markerUnits=\"userSpaceOnUse\" markerWidth=\"15\" markerHeight=\"12\" orient=\"auto\">\r\n\t  \t\t<path id=\"arrowhead\" d=\"M 0 1 L 15 6 L 0 11z\" fill=\"#585858\" stroke=\"#585858\" stroke-linejoin=\"round\" stroke-width=\"2\" />\r\n\t  \t</marker>\r\n\t</defs>\r\n\t<g id=\"edge\">\r\n\t\t<path id=\"bg_frame\" d=\"M10 50 L210 50\" stroke=\"#585858\" fill=\"none\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\" marker-start=\"url(#start)\" marker-end=\"url(#end)\" />\r\n\t\t<text id=\"text_name\" x=\"0\" y=\"0\" oryx:edgePosition=\"startTop\"/>\r\n\t</g>\r\n</svg>",
-        "icon" : "connector/sequenceflow.png",
-        "groups" : [ "连接对象" ],
-        "layout" : [ {
-            "type" : "layout.bpmn2_0.sequenceflow"
-        } ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "conditionsequenceflowpackage", "executionlistenerspackage", "defaultflowpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "ConnectingObjectsMorph", "all" ]
-    }, {
-        "type" : "edge",
-        "id" : "MessageFlow",
-        "title" : "消息流",
-        "description" : "用于连接不同池中的元素的消息流",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\r\n<svg\r\n\txmlns=\"http://www.w3.org/2000/svg\"\r\n\txmlns:oryx=\"http://www.b3mn.org/oryx\"\r\n\tversion=\"1.0\"\r\n\toryx:edge=\"edge\" >\r\n\t<defs>\r\n\t\t<marker id=\"start\" oryx:optional=\"yes\" oryx:enabled=\"yes\" refX=\"5\" refY=\"5\" markerUnits=\"userSpaceOnUse\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\">\r\n\t  \t\t<!-- <path d=\"M 10 10 L 0 5 L 10 0\" fill=\"none\" stroke=\"#585858\" /> -->\r\n\t  \t\t<circle id=\"arrowhead\" cx=\"5\" cy=\"5\" r=\"5\" fill=\"white\" stroke=\"black\" />\r\n\t  \t</marker>\r\n\r\n\t  \t<marker id=\"end\" refX=\"10\" refY=\"5\" markerUnits=\"userSpaceOnUse\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\">\r\n\t  \t\t<path id=\"arrowhead2\" d=\"M 0 0 L 10 5 L 0 10 L 0 0\" fill=\"white\" stroke=\"#585858\" />\r\n\t  \t</marker>\r\n\t</defs>\r\n\t<g id=\"edge\">\r\n\t    <path id=\"bg_frame\" d=\"M10 50 L210 50\" stroke=\"#585858\" fill=\"none\" stroke-width=\"2\" stroke-dasharray=\"3, 4\" marker-start=\"url(#start)\" marker-end=\"url(#end)\" />\r\n\t\t<text id=\"text_name\" x=\"0\" y=\"0\" oryx:edgePosition=\"midTop\"/>\r\n\t</g>\r\n</svg>",
-        "icon" : "connector/messageflow.png",
-        "groups" : [ "连接对象" ],
-        "layout" : [ {
-            "type" : "layout.bpmn2_0.sequenceflow"
-        } ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "ConnectingObjectsMorph", "all" ]
-    }, {
-        "type" : "edge",
-        "id" : "Association",
-        "title" : "注释",
-        "description" : "连接一个注释到指定元素",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\r\n<svg\r\n\txmlns=\"http://www.w3.org/2000/svg\"\r\n\txmlns:oryx=\"http://www.b3mn.org/oryx\"\r\n\tversion=\"1.0\"\r\n\toryx:edge=\"edge\" >\r\n\t<g id=\"edge\">\r\n\t    <path id=\"bg_frame\" d=\"M10 50 L210 50\" stroke=\"#585858\" fill=\"none\" stroke-width=\"2\" stroke-dasharray=\"3, 4\" />\r\n\t\t<text id=\"name\" x=\"0\" y=\"0\" oryx:edgePosition=\"midTop\" oryx:offsetTop=\"6\" style=\"font-size:9px;\"/>\r\n\t</g>\r\n</svg>",
-        "icon" : "connector/association.undirected.png",
-        "groups" : [ "连接对象" ],
-        "layout" : [ {
-            "type" : "layout.bpmn2_0.sequenceflow"
-        } ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "ConnectingObjectsMorph", "all" ]
-    }, {
-        "type" : "edge",
-        "id" : "DataAssociation",
-        "title" : "日期注释",
-        "description" : "连接一个日期注释到指定元素",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\r\n<svg\r\n\txmlns=\"http://www.w3.org/2000/svg\"\r\n\txmlns:oryx=\"http://www.b3mn.org/oryx\"\r\n\tversion=\"1.0\"\r\n\toryx:edge=\"edge\" >\r\n\t<defs>\r\n\t  \t<marker id=\"end\" refX=\"10\" refY=\"5\" markerUnits=\"userSpaceOnUse\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\">\r\n\t  \t\t<path id=\"arrowhead\" d=\"M 0 0 L 10 5 L 0 10\" fill=\"none\" stroke=\"#585858\" />\r\n\t  \t</marker>\r\n\t</defs>\r\n\t<g id=\"edge\">\r\n\t    <path id=\"bg_frame\" d=\"M10 50 L210 50\" stroke=\"#585858\" fill=\"none\" stroke-width=\"2\" stroke-dasharray=\"3, 4\" marker-end=\"url(#end)\" />\r\n\t\t<text id=\"name\" x=\"0\" y=\"0\" oryx:edgePosition=\"midTop\" oryx:offsetTop=\"6\" style=\"font-size:9px;\"/>\r\n\t</g>\r\n</svg>",
-        "icon" : "connector/association.unidirectional.png",
-        "groups" : [ "连接对象" ],
-        "layout" : [ {
-            "type" : "layout.bpmn2_0.sequenceflow"
-        } ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "ConnectingObjectsMorph", "all" ]
-    }, {
-        "type" : "node",
-        "id" : "TextAnnotation",
-        "title" : "文本注释",
-        "description" : "连接一个文本注释到指定元素",
-        "view" : "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n   width=\"102\"\n   height=\"51\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"2\" oryx:cy=\"25\" oryx:anchors=\"left\" oryx:default=\"yes\"/>\n  </oryx:magnets>\n  <g pointer-events=\"all\" oryx:minimumSize=\"10 20\" oryx:maximumSize=\"\" >\n  <rect \n\tid=\"textannotationrect\"\n\toryx:resize=\"vertical horizontal\"\n\tx=\"1\" \n\ty=\"1\"\n\twidth=\"100\"\n\theight=\"50\"\n\tstroke=\"none\"\n\tfill=\"none\" />\n  <path \n  \tid = \"frame\"\n\td=\"M20,1 L1,1 L1,50 L20,50\" \n\toryx:anchors=\"top bottom left\" \n\tstroke=\"#585858\" \n\tfill=\"none\" \n\tstroke-width=\"1\" />\n    \n    <text \n\t\tfont-size=\"12\" \n\t\tid=\"text\" \n\t\tx=\"5\" \n\t\ty=\"25\" \n\t\toryx:align=\"middle left\"\n\t\toryx:fittoelem=\"textannotationrect\"\n\t\toryx:anchors=\"left\"\n\t\tstroke=\"#373e48\">\n\t</text>\n  </g>\n</svg>",
-        "icon" : "artifact/text.annotation.png",
-        "groups" : [ "加工" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage", "textpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "all" ]
-    }, {
-        "type" : "node",
-        "id" : "DataStore",
-        "title" : "数据存储",
-        "description" : "引用数据存储",
-        "view" : "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\" ?>\r\n<svg \r\n\txmlns=\"http://www.w3.org/2000/svg\"\r\n\txmlns:svg=\"http://www.w3.org/2000/svg\"\r\n   \txmlns:oryx=\"http://www.b3mn.org/oryx\"\r\n   \txmlns:xlink=\"http://www.w3.org/1999/xlink\"\r\n\t\r\n\twidth=\"63.001px\" \r\n\theight=\"61.173px\"\r\n\tversion=\"1.0\">\r\n\t<defs></defs>\r\n\t<oryx:magnets>\r\n\t\t<oryx:magnet oryx:cx=\"0\" oryx:cy=\"30.5865\" oryx:anchors=\"left\" />\r\n\t\t<oryx:magnet oryx:cx=\"31.5005\" oryx:cy=\"61.173\" oryx:anchors=\"bottom\" />\r\n\t\t<oryx:magnet oryx:cx=\"63.001\" oryx:cy=\"30.5865\" oryx:anchors=\"right\" />\r\n\t\t<oryx:magnet oryx:cx=\"31.5005\" oryx:cy=\"0\" oryx:anchors=\"top\" />\r\n\t\t<oryx:magnet oryx:cx=\"31.5005\" oryx:cy=\"30.5865\" oryx:default=\"yes\" />\r\n\t</oryx:magnets>\r\n\t\r\n\t<g>\r\n\t\t<defs>\r\n\t\t\t<radialGradient id=\"background\" cx=\"30%\" cy=\"30%\" r=\"50%\" fx=\"0%\" fy=\"0%\">\r\n\t\t\t\t<stop offset=\"0%\" stop-color=\"#ffffff\" stop-opacity=\"1\"></stop>\r\n\t\t\t\t<stop offset=\"100%\" stop-color=\"#ffffff\" stop-opacity=\"1\" id=\"fill_el\"></stop>\r\n\t\t\t</radialGradient>\r\n\t\t</defs>\r\n\t\t\r\n\t\t<path id=\"bg_frame\" fill=\"url(#background) #ffffff\" stroke=\"#000000\" d=\"M31.634,0.662c20.013,0,31.292,3.05,31.292,5.729c0,2.678,0,45.096,0,48.244\r\n\t\t\tc0,3.148-16.42,6.2-31.388,6.2c-14.968,0-30.613-2.955-30.613-6.298c0-3.342,0-45.728,0-48.05\r\n\t\t\tC0.925,4.165,11.622,0.662,31.634,0.662z\"/>\r\n\t\t<path id=\"bg_frame2\" fill=\"none\" stroke=\"#000000\" d=\"\r\n\t\t\tM62.926,15.69c0,1.986-3.62,6.551-31.267,6.551c-27.646,0-30.734-4.686-30.734-6.454 M0.925,11.137\r\n\t\t\tc0,1.769,3.088,6.455,30.734,6.455c27.647,0,31.267-4.565,31.267-6.551 M0.925,6.487c0,2.35,3.088,6.455,30.734,6.455\r\n\t\t\tc27.647,0,31.267-3.912,31.267-6.552 M62.926,6.391v4.844 M0.949,6.391v4.844 M62.926,11.041v4.844 M0.949,11.041v4.844\"/>\r\n\t\t\t \t\r\n\t\t<text font-size=\"12\" id=\"text_name\" x=\"31\" y=\"66\" oryx:align=\"center top\" stroke=\"black\" />\r\n\t\t\t \r\n\t</g>\r\n</svg>\r\n",
-        "icon" : "dataobject/data.store.png",
-        "groups" : [ "Artifacts" ],
-        "propertyPackages" : [ "overrideidpackage", "namepackage", "documentationpackage" ],
-        "hiddenPropertyPackages" : [ ],
-        "roles" : [ "all" ]
-    } ],
-    "rules" : {
-        "cardinalityRules" : [ {
-            "role" : "Startevents_all",
-            "incomingEdges" : [ {
-                "role" : "SequenceFlow",
-                "maximum" : 0
-            } ]
-        }, {
-            "role" : "Endevents_all",
-            "outgoingEdges" : [ {
-                "role" : "SequenceFlow",
-                "maximum" : 0
-            } ]
-        } ],
-        "connectionRules" : [ {
-            "role" : "SequenceFlow",
-            "connects" : [ {
-                "from" : "sequence_start",
-                "to" : [ "sequence_end" ]
-            } ]
-        }, {
-            "role" : "Association",
-            "connects" : [ {
-                "from" : "sequence_start",
-                "to" : [ "TextAnnotation" ]
-            }, {
-                "from" : "sequence_end",
-                "to" : [ "TextAnnotation" ]
-            }, {
-                "from" : "TextAnnotation",
-                "to" : [ "sequence_end" ]
-            }, {
-                "from" : "BoundaryCompensationEvent",
-                "to" : [ "sequence_end" ]
-            }, {
-                "from" : "TextAnnotation",
-                "to" : [ "sequence_start" ]
-            }, {
-                "from" : "BoundaryCompensationEvent",
-                "to" : [ "sequence_start" ]
-            } ]
-        }, {
-            "role" : "DataAssociation",
-            "connects" : [ {
-                "from" : "sequence_start",
-                "to" : [ "DataStore" ]
-            }, {
-                "from" : "sequence_end",
-                "to" : [ "DataStore" ]
-            }, {
-                "from" : "DataStore",
-                "to" : [ "sequence_end" ]
-            }, {
-                "from" : "DataStore",
-                "to" : [ "sequence_start" ]
-            } ]
-        }, {
-            "role" : "IntermediateEventOnActivityBoundary",
-            "connects" : [ {
-                "from" : "Activity",
-                "to" : [ "IntermediateEventOnActivityBoundary" ]
-            } ]
-        } ],
-        "containmentRules" : [ {
-            "role" : "BPMNDiagram",
-            "contains" : [ "all" ]
-        }, {
-            "role" : "SubProcess",
-            "contains" : [ "sequence_start", "sequence_end", "from_task_event", "to_task_event", "EventSubProcess", "TextAnnotation", "DataStore" ]
-        }, {
-            "role" : "EventSubProcess",
-            "contains" : [ "sequence_start", "sequence_end", "from_task_event", "to_task_event", "TextAnnotation", "DataStore" ]
-        }, {
-            "role" : "Pool",
-            "contains" : [ "Lane" ]
-        }, {
-            "role" : "Lane",
-            "contains" : [ "sequence_start", "sequence_end", "EventSubProcess", "TextAnnotation", "DataStore" ]
-        } ],
-        "morphingRules" : [ {
-            "role" : "ActivitiesMorph",
-            "baseMorphs" : [ "UserTask" ],
-            "preserveBounds" : true
-        }, {
-            "role" : "GatewaysMorph",
-            "baseMorphs" : [ "ExclusiveGateway" ]
-        }, {
-            "role" : "StartEventsMorph",
-            "baseMorphs" : [ "StartNoneEvent" ]
-        }, {
-            "role" : "EndEventsMorph",
-            "baseMorphs" : [ "StartNoneEvent" ]
-        }, {
-            "role" : "CatchEventsMorph",
-            "baseMorphs" : [ "CatchTimerEvent" ]
-        }, {
-            "role" : "ThrowEventsMorph",
-            "baseMorphs" : [ "ThrowNoneEvent" ]
-        }, {
-            "role" : "BoundaryEventsMorph",
-            "baseMorphs" : [ "ThrowNoneEvent" ]
-        }, {
-            "role" : "BoundaryCompensationEvent",
-            "baseMorphs" : [ "BoundaryCompensationEvent" ]
-        }, {
-            "role" : "TextAnnotation",
-            "baseMorphs" : [ "TextAnnotation" ]
-        }, {
-            "role" : "DataStore",
-            "baseMorphs" : [ "DataStore" ]
-        } ]
+  "title": "BPMN 2.0标准工具",
+  "namespace": "http://lenosp.cn",
+  "description": "流程编辑器",
+  "propertyPackages": [
+    {
+      "name": "process_idpackage",
+      "properties": [
+        {
+          "id": "process_id",
+          "type": "String",
+          "title": "流程名称",
+          "value": "process",
+          "description": "流程的特殊唯一的名称标识",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "overrideidpackage",
+      "properties": [
+        {
+          "id": "overrideid",
+          "type": "String",
+          "title": "Id",
+          "value": "",
+          "description": "元素的唯一标识符",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "namepackage",
+      "properties": [
+        {
+          "id": "name",
+          "type": "String",
+          "title": "名称",
+          "value": "",
+          "description": "元素名称",
+          "popular": true,
+          "refToView": "text_name"
+        }
+      ]
+    },
+    {
+      "name": "documentationpackage",
+      "properties": [
+        {
+          "id": "documentation",
+          "type": "Text",
+          "title": "描述",
+          "value": "",
+          "description": "元素描述",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "process_authorpackage",
+      "properties": [
+        {
+          "id": "process_author",
+          "type": "String",
+          "title": "流程作者",
+          "value": "",
+          "description": "流程定义者姓名",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "process_versionpackage",
+      "properties": [
+        {
+          "id": "process_version",
+          "type": "String",
+          "title": "流程版本",
+          "value": "",
+          "description": "标识文档版本",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "process_namespacepackage",
+      "properties": [
+        {
+          "id": "process_namespace",
+          "type": "String",
+          "title": "目标命名空间",
+          "value": "http://lenosp.cn",
+          "description": "工作流目标命名空间",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "asynchronousdefinitionpackage",
+      "properties": [
+        {
+          "id": "asynchronousdefinition",
+          "type": "Boolean",
+          "title": "异步",
+          "value": "false",
+          "description": "将活动定义为异步",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "exclusivedefinitionpackage",
+      "properties": [
+        {
+          "id": "exclusivedefinition",
+          "type": "Boolean",
+          "title": "单独",
+          "value": "false",
+          "description": "将活动定义为单独",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "executionlistenerspackage",
+      "properties": [
+        {
+          "id": "executionlisteners",
+          "type": "multiplecomplex",
+          "title": "执行监听器",
+          "value": "",
+          "description": "活动，流程，顺序流程，开始和结束事件的监听器",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "tasklistenerspackage",
+      "properties": [
+        {
+          "id": "tasklisteners",
+          "type": "multiplecomplex",
+          "title": "任务监听器",
+          "value": "",
+          "description": "用户任务的监听器",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "eventlistenerspackage",
+      "properties": [
+        {
+          "id": "eventlisteners",
+          "type": "multiplecomplex",
+          "title": "事件监听器",
+          "value": "",
+          "description": "侦听Activiti引擎中发生的任何事件。也可以将事件作为信号、消息或错误事件重新引发",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "usertaskassignmentpackage",
+      "properties": [
+        {
+          "id": "usertaskassignment",
+          "type": "Complex",
+          "title": "代理",
+          "value": "",
+          "description": "用户任务的分配定义",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "formpropertiespackage",
+      "properties": [
+        {
+          "id": "formproperties",
+          "type": "Complex",
+          "title": "动态表单属性",
+          "value": "",
+          "description": "使用表单属性列表定义表单",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "formkeydefinitionpackage",
+      "properties": [
+        {
+          "id": "formkeydefinition",
+          "type": "String",
+          "title": "自定义表单",
+          "value": "",
+          "description": "用户任务表单编号",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "duedatedefinitionpackage",
+      "properties": [
+        {
+          "id": "duedatedefinition",
+          "type": "String",
+          "title": "到期日期",
+          "value": "",
+          "description": "用户任务到期时间",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "prioritydefinitionpackage",
+      "properties": [
+        {
+          "id": "prioritydefinition",
+          "type": "String",
+          "title": "优先级",
+          "value": "",
+          "description": "用户任务优先级",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "duedatedefinitionpackage",
+      "properties": [
+        {
+          "id": "duedatedefinition",
+          "type": "String",
+          "title": "到期日期",
+          "value": "",
+          "description": "用户任务的截止日期",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "servicetaskclasspackage",
+      "properties": [
+        {
+          "id": "servicetaskclass",
+          "type": "String",
+          "title": "监听类",
+          "value": "",
+          "description": "实现服务任务逻辑的监听类",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "servicetaskexpressionpackage",
+      "properties": [
+        {
+          "id": "servicetaskexpression",
+          "type": "String",
+          "title": "表达式",
+          "value": "",
+          "description": "使用表达式定义的服务任务逻辑",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "servicetaskdelegateexpressionpackage",
+      "properties": [
+        {
+          "id": "servicetaskdelegateexpression",
+          "type": "String",
+          "title": "委托表达式",
+          "value": "",
+          "description": "使用委托表达式定义的服务任务逻辑",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "servicetaskfieldspackage",
+      "properties": [
+        {
+          "id": "servicetaskfields",
+          "type": "Complex",
+          "title": "字段",
+          "value": "",
+          "description": "字段扩展",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "servicetaskresultvariablepackage",
+      "properties": [
+        {
+          "id": "servicetaskresultvariable",
+          "type": "String",
+          "title": "结果变量名称",
+          "value": "",
+          "description": "处理变量名称以存储服务任务结果",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "scriptformatpackage",
+      "properties": [
+        {
+          "id": "scriptformat",
+          "type": "String",
+          "title": "脚本格式",
+          "value": "",
+          "description": "脚本任务的脚本格式",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "scripttextpackage",
+      "properties": [
+        {
+          "id": "scripttext",
+          "type": "Text",
+          "title": "脚本",
+          "value": "",
+          "description": "脚本任务的脚本文本",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "ruletask_rulespackage",
+      "properties": [
+        {
+          "id": "ruletask_rules",
+          "type": "String",
+          "title": "规则",
+          "value": "",
+          "description": "规则任务的规则",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "ruletask_variables_inputpackage",
+      "properties": [
+        {
+          "id": "ruletask_variables_input",
+          "type": "String",
+          "title": "输入变量",
+          "value": "",
+          "description": "输入规则任务的变量",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "ruletask_excludepackage",
+      "properties": [
+        {
+          "id": "ruletask_exclude",
+          "type": "Boolean",
+          "title": "除外",
+          "value": "false",
+          "description": "使用rules属性作为排除",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "ruletask_resultpackage",
+      "properties": [
+        {
+          "id": "ruletask_result",
+          "type": "String",
+          "title": "返回变量",
+          "value": "",
+          "description": "规则任务的结果变量",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "mailtasktopackage",
+      "properties": [
+        {
+          "id": "mailtaskto",
+          "type": "Text",
+          "title": "接收人",
+          "value": "",
+          "description": "收件人，如果电子邮件。 多个收件人在逗号分隔列表中定义",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "mailtaskfrompackage",
+      "properties": [
+        {
+          "id": "mailtaskfrom",
+          "type": "Text",
+          "title": "发件人",
+          "value": "",
+          "description": "发件人的电子邮件地址。 如果未提供，则使用从地址配置的默认值.",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "mailtasksubjectpackage",
+      "properties": [
+        {
+          "id": "mailtasksubject",
+          "type": "Text",
+          "title": "主题",
+          "value": "",
+          "description": "电子邮件的主题(Subject).",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "mailtaskccpackage",
+      "properties": [
+        {
+          "id": "mailtaskcc",
+          "type": "Text",
+          "title": "转发",
+          "value": "",
+          "description": "电子邮件的抄送。在逗号分隔的列表中定义了多个收件人",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "mailtaskbccpackage",
+      "properties": [
+        {
+          "id": "mailtaskbcc",
+          "type": "Text",
+          "title": "密送",
+          "value": "",
+          "description": "电子邮件的密件抄送。在逗号分隔的列表中定义了多个收件人",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "mailtasktextpackage",
+      "properties": [
+        {
+          "id": "mailtasktext",
+          "type": "Text",
+          "title": "内容",
+          "value": "",
+          "description": "电子邮件的内容，以防需要发送不丰富的普通电子邮件。可与HTML结合使用，用于不支持丰富内容的电子邮件客户端。然后，客户机将返回到仅此文本的备选方案",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "mailtaskhtmlpackage",
+      "properties": [
+        {
+          "id": "mailtaskhtml",
+          "type": "Text",
+          "title": "Html",
+          "value": "",
+          "description": "一段HTML，它是电子邮件的内容",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "mailtaskcharsetpackage",
+      "properties": [
+        {
+          "id": "mailtaskcharset",
+          "type": "String",
+          "title": "Charset",
+          "value": "",
+          "description": "允许更改电子邮件的字符集，这对于许多非英语语言是必需的 ",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "callactivitycalledelementpackage",
+      "properties": [
+        {
+          "id": "callactivitycalledelement",
+          "type": "String",
+          "title": "被调用元素",
+          "value": "",
+          "description": "流程参考.",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "callactivityinparameterspackage",
+      "properties": [
+        {
+          "id": "callactivityinparameters",
+          "type": "Complex",
+          "title": "输入参数",
+          "value": "",
+          "description": "输入参数的定义",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "callactivityoutparameterspackage",
+      "properties": [
+        {
+          "id": "callactivityoutparameters",
+          "type": "Complex",
+          "title": "输出参数",
+          "value": "",
+          "description": "输出参数的定义",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "cameltaskcamelcontextpackage",
+      "properties": [
+        {
+          "id": "cameltaskcamelcontext",
+          "type": "String",
+          "title": "Camel内容",
+          "value": "",
+          "description": "可选的camel上下文定义，如果保留为空，则使用默认值。",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "muletaskendpointurlpackage",
+      "properties": [
+        {
+          "id": "muletaskendpointurl",
+          "type": "String",
+          "title": "终端url",
+          "value": "",
+          "description": "向MULE发送消息所需的终结点URL。",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "muletasklanguagepackage",
+      "properties": [
+        {
+          "id": "muletasklanguage",
+          "type": "String",
+          "title": "语言",
+          "value": "",
+          "description": "语言解析有效负载表达式所需的定义，如juel.",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "muletaskpayloadexpressionpackage",
+      "properties": [
+        {
+          "id": "muletaskpayloadexpression",
+          "type": "String",
+          "title": "有效载荷表达式",
+          "value": "",
+          "description": "发送给MULE的消息有效载荷的必要定义",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "muletaskresultvariablepackage",
+      "properties": [
+        {
+          "id": "muletaskresultvariable",
+          "type": "String",
+          "title": "返回变量",
+          "value": "",
+          "description": "返回的有效负载的可选结果变量",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "conditionsequenceflowpackage",
+      "properties": [
+        {
+          "id": "conditionsequenceflow",
+          "type": "Complex",
+          "title": "流转条件",
+          "value": "",
+          "description": "序列流的条件",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "defaultflowpackage",
+      "properties": [
+        {
+          "id": "defaultflow",
+          "type": "Boolean",
+          "title": "默认流转",
+          "value": "false",
+          "description": "将序列流定义为默认值",
+          "popular": true,
+          "refToView": "default"
+        }
+      ]
+    },
+    {
+      "name": "conditionalflowpackage",
+      "properties": [
+        {
+          "id": "conditionalflow",
+          "type": "Boolean",
+          "title": "条件流",
+          "value": "false",
+          "description": "使用条件定义序列流",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "timercycledefinitionpackage",
+      "properties": [
+        {
+          "id": "timercycledefinition",
+          "type": "String",
+          "title": "循环时间(例：R3/PT10H)",
+          "value": "",
+          "description": "Define the timer with a ISO-8601 cycle.",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "timerdatedefinitionpackage",
+      "properties": [
+        {
+          "id": "timerdatedefinition",
+          "type": "String",
+          "title": "开始时间（ISO-8601）",
+          "value": "",
+          "description": "Define the timer with a ISO-8601 date definition.",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "timerdurationdefinitionpackage",
+      "properties": [
+        {
+          "id": "timerdurationdefinition",
+          "type": "String",
+          "title": "持续时间(例：PT5M)",
+          "value": "",
+          "description": "Define the timer with a ISO-8601 duration.",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "timerenddatedefinitionpackage",
+      "properties": [
+        {
+          "id": "timerenddatedefinition",
+          "type": "String",
+          "title": "结束时间（ISO-8601）",
+          "value": "",
+          "description": "Define the timer with a ISO-8601 duration.",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "messagerefpackage",
+      "properties": [
+        {
+          "id": "messageref",
+          "type": "String",
+          "title": "消息引用",
+          "value": "",
+          "description": "定义消息名称",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "signalrefpackage",
+      "properties": [
+        {
+          "id": "signalref",
+          "type": "String",
+          "title": "信号引用",
+          "value": "",
+          "description": "定义信号名称",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "errorrefpackage",
+      "properties": [
+        {
+          "id": "errorref",
+          "type": "String",
+          "title": "错误引用",
+          "value": "",
+          "description": "定义错误名称",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "cancelactivitypackage",
+      "properties": [
+        {
+          "id": "cancelactivity",
+          "type": "Boolean",
+          "title": "取消活动",
+          "value": "true",
+          "description": "是否应该取消活动",
+          "popular": true,
+          "refToView": [
+            "frame",
+            "frame2"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "initiatorpackage",
+      "properties": [
+        {
+          "id": "initiator",
+          "type": "String",
+          "title": "发起人",
+          "value": "",
+          "description": "该过程的发起者",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "textpackage",
+      "properties": [
+        {
+          "id": "text",
+          "type": "String",
+          "title": "Text",
+          "value": "",
+          "description": "文本注释的文本.",
+          "popular": true,
+          "refToView": "text"
+        }
+      ]
+    },
+    {
+      "name": "multiinstance_typepackage",
+      "properties": [
+        {
+          "id": "multiinstance_type",
+          "type": "kisbpm-multiinstance",
+          "title": "多实例类型",
+          "value": "None",
+          "description": "Repeated activity execution (parallel or sequential) can be displayed through different loop types",
+          "popular": true,
+          "refToView": "multiinstance"
+        }
+      ]
+    },
+    {
+      "name": "multiinstance_cardinalitypackage",
+      "properties": [
+        {
+          "id": "multiinstance_cardinality",
+          "type": "String",
+          "title": "基数(多实例)",
+          "value": "",
+          "description": "定义多实例的基数.",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "multiinstance_collectionpackage",
+      "properties": [
+        {
+          "id": "multiinstance_collection",
+          "type": "String",
+          "title": "集合(多实例)",
+          "value": "",
+          "description": "定义多实例的集合",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "multiinstance_variablepackage",
+      "properties": [
+        {
+          "id": "multiinstance_variable",
+          "type": "String",
+          "title": "元素变量(多实例)",
+          "value": "",
+          "description": "为多实例定义元素变量",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "multiinstance_conditionpackage",
+      "properties": [
+        {
+          "id": "multiinstance_condition",
+          "type": "String",
+          "title": "完成条件(多实例)",
+          "value": "",
+          "description": "定义多实例的完成条件",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "isforcompensationpackage",
+      "properties": [
+        {
+          "id": "isforcompensation",
+          "type": "Boolean",
+          "title": "是否为补偿",
+          "value": "false",
+          "description": "一个标志,标识是否这个活动的目的是为了补偿.",
+          "popular": true,
+          "refToView": "compensation"
+        }
+      ]
+    },
+    {
+      "name": "sequencefloworderpackage",
+      "properties": [
+        {
+          "id": "sequencefloworder",
+          "type": "Complex",
+          "title": "流动顺序",
+          "value": "",
+          "description": "Order outgoing sequence flows.",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "signaldefinitionspackage",
+      "properties": [
+        {
+          "id": "signaldefinitions",
+          "type": "multiplecomplex",
+          "title": "信号定义",
+          "value": "",
+          "description": "信号定义",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "messagedefinitionspackage",
+      "properties": [
+        {
+          "id": "messagedefinitions",
+          "type": "multiplecomplex",
+          "title": "消息定义",
+          "value": "",
+          "description": "消息定义",
+          "popular": true
+        }
+      ]
+    },
+    {
+      "name": "istransactionpackage",
+      "properties": [
+        {
+          "id": "istransaction",
+          "type": "Boolean",
+          "title": "是否事务处理子过程",
+          "value": "false",
+          "description": "标识此子进程是否为事务类型的标志",
+          "popular": true,
+          "refToView": "border"
+        }
+      ]
+    },
+    {
+      "name": "terminateAllpackage",
+      "properties": [
+        {
+          "id": "terminateAll",
+          "type": "Boolean",
+          "title": "终止全部",
+          "value": "false",
+          "description": "启用以终止流程实例",
+          "popular": true
+        }
+      ]
     }
+  ],
+  "stencils": [
+    {
+      "type": "node",
+      "id": "BPMNDiagram",
+      "title": "BPMN-Diagram",
+      "description": "A BPMN 2.0 diagram.",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n   width=\"800\"\n   height=\"600\"\n   version=\"1.0\">\n  <defs></defs>\n  <g pointer-events=\"fill\" >\n    <polygon stroke=\"black\" fill=\"black\" stroke-width=\"1\" points=\"0,0 0,590 9,599 799,599 799,9 790,0\" stroke-linecap=\"butt\" stroke-linejoin=\"miter\" stroke-miterlimit=\"10\" />\n    <rect id=\"diagramcanvas\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"790\" height=\"590\" stroke=\"black\" stroke-width=\"2\" fill=\"white\" />\n    \t<text font-size=\"22\" id=\"diagramtext\" x=\"400\" y=\"25\" oryx:align=\"top center\" stroke=\"#373e48\"></text>\n  </g>\n</svg>",
+      "icon": "diagram.png",
+      "groups": [
+        "Diagram"
+      ],
+      "mayBeRoot": true,
+      "hide": true,
+      "propertyPackages": [
+        "process_idpackage",
+        "namepackage",
+        "documentationpackage",
+        "process_authorpackage",
+        "process_versionpackage",
+        "process_namespacepackage",
+        "executionlistenerspackage",
+        "eventlistenerspackage",
+        "signaldefinitionspackage",
+        "messagedefinitionspackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": []
+    },
+    {
+      "type": "node",
+      "id": "StartNoneEvent",
+      "title": "事件",
+      "description": "没有特定触发器的启动事件",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\">\n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#24ca58\" fill=\"#FFFFFF\" stroke-width=\"1\"/>\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
+      "icon": "startevent/none.png",
+      "groups": [
+        "启动事件"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "executionlistenerspackage",
+        "initiatorpackage",
+        "formkeydefinitionpackage",
+        "formpropertiespackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "sequence_start",
+        "Startevents_all",
+        "StartEventsMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "StartTimerEvent",
+      "title": "定时事件",
+      "description": "带有计时器触发器的启动事件",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\">\n    <circle \n    \tid=\"bg_frame\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"15\" \n    \tstroke=\"#585858\" \n    \tfill=\"#ffffff\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 5.5, 3\" />\n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    \n    <path id=\"path1\" transform=\"translate(6,6)\"\n    \td=\"M 10 0 C 4.4771525 0 0 4.4771525 0 10 C 0 15.522847 4.4771525 20 10 20 C 15.522847 20 20 15.522847 20 10 C 20 4.4771525 15.522847 1.1842379e-15 10 0 z M 9.09375 1.03125 C 9.2292164 1.0174926 9.362825 1.0389311 9.5 1.03125 L 9.5 3.5 L 10.5 3.5 L 10.5 1.03125 C 15.063526 1.2867831 18.713217 4.9364738 18.96875 9.5 L 16.5 9.5 L 16.5 10.5 L 18.96875 10.5 C 18.713217 15.063526 15.063526 18.713217 10.5 18.96875 L 10.5 16.5 L 9.5 16.5 L 9.5 18.96875 C 4.9364738 18.713217 1.2867831 15.063526 1.03125 10.5 L 3.5 10.5 L 3.5 9.5 L 1.03125 9.5 C 1.279102 5.0736488 4.7225326 1.4751713 9.09375 1.03125 z M 9.5 5 L 9.5 8.0625 C 8.6373007 8.2844627 8 9.0680195 8 10 C 8 11.104569 8.8954305 12 10 12 C 10.931981 12 11.715537 11.362699 11.9375 10.5 L 14 10.5 L 14 9.5 L 11.9375 9.5 C 11.756642 8.7970599 11.20294 8.2433585 10.5 8.0625 L 10.5 5 L 9.5 5 z \"  \n    \tfill=\"#585858\" stroke=\"none\" />\n   \n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
+      "icon": "startevent/timer.png",
+      "groups": [
+        "启动事件"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "executionlistenerspackage",
+        "timercycledefinitionpackage",
+        "timerdatedefinitionpackage",
+        "timerdurationdefinitionpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "sequence_start",
+        "Startevents_all",
+        "StartEventsMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "StartSignalEvent",
+      "title": "信号事件",
+      "description": "带信号触发的启动事件",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\">\n\n    <circle \n    \tid=\"bg_frame\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"15\" \n    \tstroke=\"#585858\" \n    \tfill=\"#ffffff\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 5.5, 3\" />\n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    <path\n       d=\"M 8.7124971,21.247342 L 23.333334,21.247342 L 16.022915,8.5759512 L 8.7124971,21.247342 z\"\n       id=\"triangle\"\n       stroke=\"#585858\"\n       style=\"fill:none;stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
+      "icon": "startevent/signal.png",
+      "groups": [
+        "启动事件"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "executionlistenerspackage",
+        "signalrefpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "sequence_start",
+        "Startevents_all",
+        "StartEventsMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "StartMessageEvent",
+      "title": "消息事件",
+      "description": "带有消息触发器的启动事件",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\">\n    <circle \n    \tid=\"bg_frame\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"15\" \n    \tstroke=\"#585858\" \n    \tfill=\"#ffffff\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 5.5, 3\" />\n    \n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    \n    <path transform=\"translate(7,7)\" id=\"path1\" stroke=\"none\" fill=\"#585858\" stroke-width=\"1\" d=\"m 0.5,2.5 0,13 17,0 0,-13 z M 2,4 6.5,8.5 2,13 z M 4,4 14,4 9,9 z m 12,0 0,9 -4.5,-4.5 z M 7.5,9.5 9,11 10.5,9.5 15,14 3,14 z\"/>\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
+      "icon": "startevent/message.png",
+      "groups": [
+        "启动事件"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "executionlistenerspackage",
+        "messagerefpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "sequence_start",
+        "Startevents_all",
+        "StartEventsMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "StartErrorEvent",
+      "title": "异常事件",
+      "description": "捕获抛出的BPMN错误的启动事件",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"1\"/>\n    \n    <path\n         stroke=\"#585858\"\n         style=\"fill:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10\"\n         d=\"M 22.820839,11.171502 L 19.36734,24.58992 L 13.54138,14.281819 L 9.3386512,20.071607 L 13.048949,6.8323057 L 18.996148,16.132659 L 22.820839,11.171502 z\"\n         id=\"errorPolygon\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
+      "icon": "startevent/error.png",
+      "groups": [
+        "启动事件"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "executionlistenerspackage",
+        "errorrefpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "sequence_start",
+        "Startevents_all",
+        "StartEventsMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "UserTask",
+      "title": "用户活动",
+      "description": "分配给特定人的任务 ",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"5\" ry=\"5\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#90EE90\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n\t\n\t<g id=\"userTask\" transform=\"translate(3,3)\">\n\t\t<path oryx:anchors=\"top left\"\n       \t\tstyle=\"fill:#A9A9A9;stroke:none;\"\n       \t\t d=\"m 1,17 16,0 0,-1.7778 -5.333332,-3.5555 0,-1.7778 c 1.244444,0 1.244444,-2.3111 1.244444,-2.3111 l 0,-3.0222 C 12.555557,0.8221 9.0000001,1.0001 9.0000001,1.0001 c 0,0 -3.5555556,-0.178 -3.9111111,3.5555 l 0,3.0222 c 0,0 0,2.3111 1.2444443,2.3111 l 0,1.7778 L 1,15.2222 1,17 17,17\" \n         />\n\t\t\n\t</g>\n  \n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\t\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
+      "icon": "activity/list/type.user.png",
+      "groups": [
+        "活动列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "asynchronousdefinitionpackage",
+        "exclusivedefinitionpackage",
+        "executionlistenerspackage",
+        "multiinstance_typepackage",
+        "multiinstance_cardinalitypackage",
+        "multiinstance_collectionpackage",
+        "multiinstance_variablepackage",
+        "multiinstance_conditionpackage",
+        "isforcompensationpackage",
+        "usertaskassignmentpackage",
+        "formkeydefinitionpackage",
+        "duedatedefinitionpackage",
+        "prioritydefinitionpackage",
+        "formpropertiespackage",
+        "tasklistenerspackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "Activity",
+        "sequence_start",
+        "sequence_end",
+        "ActivitiesMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "ServiceTask",
+      "title": "服务任务",
+      "description": "具有服务逻辑的自动任务",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n\t\n\t<g id=\"serviceTask\" transform=\"translate(3,3)\">\n\t<path oryx:anchors=\"top left\"\n\t\tstyle=\"fill:#72a7d0;stroke:none\"\n     d=\"M 8,1 7.5,2.875 c 0,0 -0.02438,0.250763 -0.40625,0.4375 C 7.05724,3.330353 7.04387,3.358818 7,3.375 6.6676654,3.4929791 6.3336971,3.6092802 6.03125,3.78125 6.02349,3.78566 6.007733,3.77681 6,3.78125 5.8811373,3.761018 5.8125,3.71875 5.8125,3.71875 l -1.6875,-1 -1.40625,1.4375 0.96875,1.65625 c 0,0 0.065705,0.068637 0.09375,0.1875 0.002,0.00849 -0.00169,0.022138 0,0.03125 C 3.6092802,6.3336971 3.4929791,6.6676654 3.375,7 3.3629836,7.0338489 3.3239228,7.0596246 3.3125,7.09375 3.125763,7.4756184 2.875,7.5 2.875,7.5 L 1,8 l 0,2 1.875,0.5 c 0,0 0.250763,0.02438 0.4375,0.40625 0.017853,0.03651 0.046318,0.04988 0.0625,0.09375 0.1129372,0.318132 0.2124732,0.646641 0.375,0.9375 -0.00302,0.215512 -0.09375,0.34375 -0.09375,0.34375 L 2.6875,13.9375 4.09375,15.34375 5.78125,14.375 c 0,0 0.1229911,-0.09744 0.34375,-0.09375 0.2720511,0.147787 0.5795915,0.23888 0.875,0.34375 0.033849,0.01202 0.059625,0.05108 0.09375,0.0625 C 7.4756199,14.874237 7.5,15.125 7.5,15.125 L 8,17 l 2,0 0.5,-1.875 c 0,0 0.02438,-0.250763 0.40625,-0.4375 0.03651,-0.01785 0.04988,-0.04632 0.09375,-0.0625 0.332335,-0.117979 0.666303,-0.23428 0.96875,-0.40625 0.177303,0.0173 0.28125,0.09375 0.28125,0.09375 l 1.65625,0.96875 1.40625,-1.40625 -0.96875,-1.65625 c 0,0 -0.07645,-0.103947 -0.09375,-0.28125 0.162527,-0.290859 0.262063,-0.619368 0.375,-0.9375 0.01618,-0.04387 0.04465,-0.05724 0.0625,-0.09375 C 14.874237,10.52438 15.125,10.5 15.125,10.5 L 17,10 17,8 15.125,7.5 c 0,0 -0.250763,-0.024382 -0.4375,-0.40625 C 14.669647,7.0572406 14.641181,7.0438697 14.625,7 14.55912,6.8144282 14.520616,6.6141566 14.4375,6.4375 c -0.224363,-0.4866 0,-0.71875 0,-0.71875 L 15.40625,4.0625 14,2.625 l -1.65625,1 c 0,0 -0.253337,0.1695664 -0.71875,-0.03125 l -0.03125,0 C 11.405359,3.5035185 11.198648,3.4455201 11,3.375 10.95613,3.3588185 10.942759,3.3303534 10.90625,3.3125 10.524382,3.125763 10.5,2.875 10.5,2.875 L 10,1 8,1 z m 1,5 c 1.656854,0 3,1.3431458 3,3 0,1.656854 -1.343146,3 -3,3 C 7.3431458,12 6,10.656854 6,9 6,7.3431458 7.3431458,6 9,6 z\" />\n\t</g>\n  \n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\t\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
+      "icon": "activity/list/type.service.png",
+      "groups": [
+        "活动列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "asynchronousdefinitionpackage",
+        "exclusivedefinitionpackage",
+        "executionlistenerspackage",
+        "multiinstance_typepackage",
+        "multiinstance_cardinalitypackage",
+        "multiinstance_collectionpackage",
+        "multiinstance_variablepackage",
+        "multiinstance_conditionpackage",
+        "isforcompensationpackage",
+        "servicetaskclasspackage",
+        "servicetaskexpressionpackage",
+        "servicetaskdelegateexpressionpackage",
+        "servicetaskfieldspackage",
+        "servicetaskresultvariablepackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "Activity",
+        "sequence_start",
+        "sequence_end",
+        "ActivitiesMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "ScriptTask",
+      "title": "脚本任务",
+      "description": "带脚本逻辑的自动任务",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n\t\n\t<g id=\"scriptTask\" transform=\"translate(2,2)\">\n\t\t<path oryx:anchors=\"top left\"\n\t\t\td=\"m 5,2 0,0.094 c 0.23706,0.064 0.53189,0.1645 0.8125,0.375 0.5582,0.4186 1.05109,1.228 1.15625,2.5312 l 8.03125,0 1,0 1,0 c 0,-3 -2,-3 -2,-3 l -10,0 z M 4,3 4,13 2,13 c 0,3 2,3 2,3 l 9,0 c 0,0 2,0 2,-3 L 15,6 6,6 6,5.5 C 6,4.1111 5.5595,3.529 5.1875,3.25 4.8155,2.971 4.5,3 4.5,3 L 4,3 z\"\n     \t\tstyle=\"fill:#72a7d0;stroke:none\"\n\t\t/>\n\t</g>\n  \n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\t\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
+      "icon": "activity/list/type.script.png",
+      "groups": [
+        "活动列表"
+      ],
+      "propertyPackages": [
+        "scriptformatpackage",
+        "scripttextpackage",
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "asynchronousdefinitionpackage",
+        "exclusivedefinitionpackage",
+        "executionlistenerspackage",
+        "multiinstance_typepackage",
+        "multiinstance_cardinalitypackage",
+        "multiinstance_collectionpackage",
+        "multiinstance_variablepackage",
+        "multiinstance_conditionpackage",
+        "isforcompensationpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "Activity",
+        "sequence_start",
+        "sequence_end",
+        "ActivitiesMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "BusinessRule",
+      "title": "规则任务",
+      "description": "具有规则逻辑的自动任务",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n  \t<defs>\n\t\t<radialGradient id=\"background\" cx=\"10%\" cy=\"10%\" r=\"100%\" fx=\"10%\" fy=\"10%\">\n\t\t\t<stop offset=\"0%\" stop-color=\"#ffffff\" stop-opacity=\"1\"/>\n\t\t\t<stop id=\"fill_el\" offset=\"100%\" stop-color=\"#ffffcc\" stop-opacity=\"1\"/>\n\t\t</radialGradient>\n\t</defs>\n\t\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n    \n\t<g id=\"businessRuleTask\" transform=\"translate(4,3)\">\n\t\t<path oryx:anchors=\"top left\" \n\t\t\t d=\"m 1,2 0,14 16,0 0,-14 z m 1.45458,5.6000386 2.90906,0 0,2.7999224 -2.90906,0 z m 4.36364,0 8.72718,0 0,2.7999224 -8.72718,0 z m -4.36364,4.1998844 2.90906,0 0,2.800116 -2.90906,0 z m 4.36364,0 8.72718,0 0,2.800116 -8.72718,0 z\"\n     \t\tstyle=\"fill:#72a7d0;stroke:none\"\n\t\t/>\n\t</g>\n\t\n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
+      "icon": "activity/list/type.business.rule.png",
+      "groups": [
+        "活动列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "asynchronousdefinitionpackage",
+        "exclusivedefinitionpackage",
+        "executionlistenerspackage",
+        "multiinstance_typepackage",
+        "multiinstance_cardinalitypackage",
+        "multiinstance_collectionpackage",
+        "multiinstance_variablepackage",
+        "multiinstance_conditionpackage",
+        "isforcompensationpackage",
+        "ruletask_rulespackage",
+        "ruletask_variables_inputpackage",
+        "ruletask_excludepackage",
+        "ruletask_resultpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "Activity",
+        "sequence_start",
+        "sequence_end",
+        "ActivitiesMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "ReceiveTask",
+      "title": "接受任务",
+      "description": "等待信号的任务",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n    \n\t<g id=\"receiveTask\" transform=\"translate(4,3)\">\n\t\t<path oryx:anchors=\"left top\" \n\t\t\t style=\"fill:#16964d;stroke:none;\"\n     \t\t d=\"m 0.5,2.5 0,13 17,0 0,-13 z M 2,4 6.5,8.5 2,13 z M 4,4 14,4 9,9 z m 12,0 0,9 -4.5,-4.5 z M 7.5,9.5 9,11 10.5,9.5 15,14 3,14 z\"\n\t\t />\n\t</g>\n\t\n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
+      "icon": "activity/list/type.receive.png",
+      "groups": [
+        "活动列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "asynchronousdefinitionpackage",
+        "exclusivedefinitionpackage",
+        "executionlistenerspackage",
+        "multiinstance_typepackage",
+        "multiinstance_cardinalitypackage",
+        "multiinstance_collectionpackage",
+        "multiinstance_variablepackage",
+        "multiinstance_conditionpackage",
+        "isforcompensationpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "Activity",
+        "sequence_start",
+        "sequence_end",
+        "ActivitiesMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "ManualTask",
+      "title": "手工任务",
+      "description": "没有逻辑的自动任务",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n    <g id=\"manualTask\" transform=\"translate(3,1)\">\n    \t<path oryx:anchors=\"top left\"\n    \t\tstyle=\"fill:#d1b575;stroke=none\"\n     \t\td=\"m 17,9.3290326 c -0.0069,0.5512461 -0.455166,1.0455894 -0.940778,1.0376604 l -5.792746,0 c 0.0053,0.119381 0.0026,0.237107 0.0061,0.355965 l 5.154918,0 c 0.482032,-0.0096 0.925529,0.49051 0.919525,1.037574 -0.0078,0.537128 -0.446283,1.017531 -0.919521,1.007683 l -5.245273,0 c -0.01507,0.104484 -0.03389,0.204081 -0.05316,0.301591 l 2.630175,0 c 0.454137,-0.0096 0.872112,0.461754 0.866386,0.977186 C 13.619526,14.554106 13.206293,15.009498 12.75924,15 L 3.7753054,15 C 3.6045812,15 3.433552,14.94423 3.2916363,14.837136 c -0.00174,0 -0.00436,0 -0.00609,0 C 1.7212035,14.367801 0.99998255,11.458641 1,11.458641 L 1,7.4588393 c 0,0 0.6623144,-1.316333 1.8390583,-2.0872584 1.1767614,-0.7711868 6.8053358,-2.40497 7.2587847,-2.8052901 0.453484,-0.40032 1.660213,1.4859942 0.04775,2.4010487 C 8.5332315,5.882394 8.507351,5.7996113 8.4370292,5.7936859 l 6.3569748,-0.00871 c 0.497046,-0.00958 0.952273,0.5097676 0.94612,1.0738232 -0.0053,0.556126 -0.456176,1.0566566 -0.94612,1.0496854 l -4.72435,0 c 0.01307,0.1149374 0.0244,0.2281319 0.03721,0.3498661 l 5.952195,0 c 0.494517,-0.00871 0.947906,0.5066305 0.940795,1.0679848 z\"\n    \t/>\n\t</g>\n\t\n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
+      "icon": "activity/list/type.manual.png",
+      "groups": [
+        "活动列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "asynchronousdefinitionpackage",
+        "exclusivedefinitionpackage",
+        "executionlistenerspackage",
+        "multiinstance_typepackage",
+        "multiinstance_cardinalitypackage",
+        "multiinstance_collectionpackage",
+        "multiinstance_variablepackage",
+        "multiinstance_conditionpackage",
+        "isforcompensationpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "Activity",
+        "sequence_start",
+        "sequence_end",
+        "ActivitiesMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "MailTask",
+      "title": "邮件任务",
+      "description": "An mail task",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n    \n\t<g id=\"sendTask\" transform=\"translate(4,3)\">\n\t\n\t<!-- path here -->\n\t\t<path oryx:anchors=\"top left\"\n\t\t\tstyle=\"fill:#16964d;stroke:none;\"\n     \t\td=\"M 1 3 L 9 11 L 17 3 L 1 3 z M 1 5 L 1 13 L 5 9 L 1 5 z M 17 5 L 13 9 L 17 13 L 17 5 z M 6 10 L 1 15 L 17 15 L 12 10 L 9 13 L 6 10 z \"\n     \t/>\n\t</g>\n\t\n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
+      "icon": "activity/list/type.send.png",
+      "groups": [
+        "活动列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "asynchronousdefinitionpackage",
+        "exclusivedefinitionpackage",
+        "executionlistenerspackage",
+        "multiinstance_typepackage",
+        "multiinstance_cardinalitypackage",
+        "multiinstance_collectionpackage",
+        "multiinstance_variablepackage",
+        "multiinstance_conditionpackage",
+        "isforcompensationpackage",
+        "mailtasktopackage",
+        "mailtaskfrompackage",
+        "mailtasksubjectpackage",
+        "mailtaskccpackage",
+        "mailtaskbccpackage",
+        "mailtasktextpackage",
+        "mailtaskhtmlpackage",
+        "mailtaskcharsetpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "Activity",
+        "sequence_start",
+        "sequence_end",
+        "ActivitiesMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "CamelTask",
+      "title": "Camel任务",
+      "description": "向Camel发送消息的任务",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n\t\n\t<g id=\"camelTask\" transform=\"translate(4,4)\">\n\t\t<path\n     style=\"fill:#bd4848;fill-opacity:1\"\n     d=\"m 8.1878027,15.383782 c -0.824818,-0.3427 0.375093,-1.1925 0.404055,-1.7743 0.230509,-0.8159 -0.217173,-1.5329 -0.550642,-2.2283 -0.106244,-0.5273 -0.03299,-1.8886005 -0.747194,-1.7818005 -0.712355,0.3776 -0.9225,1.2309005 -1.253911,1.9055005 -0.175574,1.0874 -0.630353,2.114 -0.775834,3.2123 -0.244009,0.4224 -1.741203,0.3888 -1.554386,-0.1397 0.651324,-0.3302 1.13227,-0.9222 1.180246,-1.6705 0.0082,-0.7042 -0.133578,-1.3681 0.302178,-2.0083 0.08617,-0.3202 0.356348,-1.0224005 -0.218996,-0.8051 -0.694517,0.2372 -1.651062,0.6128 -2.057645,-0.2959005 -0.696769,0.3057005 -1.102947,-0.611 -1.393127,-1.0565 -0.231079,-0.6218 -0.437041,-1.3041 -0.202103,-1.9476 -0.185217,-0.7514 -0.39751099,-1.5209 -0.35214999,-2.301 -0.243425,-0.7796 0.86000899,-1.2456 0.08581,-1.8855 -0.76078999,0.1964 -1.41630099,-0.7569 -0.79351899,-1.2877 0.58743,-0.52829998 1.49031699,-0.242 2.09856399,-0.77049998 0.816875,-0.3212 1.256619,0.65019998 1.923119,0.71939998 0.01194,0.7333 -0.0031,1.5042 -0.18417,2.2232 -0.194069,0.564 -0.811196,1.6968 0.06669,1.9398 0.738382,-0.173 1.095723,-0.9364 1.659041,-1.3729 0.727298,-0.3962 1.093982,-1.117 1.344137,-1.8675 0.400558,-0.8287 1.697676,-0.6854 1.955367,0.1758 0.103564,0.5511 0.9073983,1.7538 1.2472763,0.6846 0.121868,-0.6687 0.785541,-1.4454 1.518183,-1.0431 0.813587,0.4875 0.658233,1.6033 1.285504,2.2454 0.768715,0.8117 1.745394,1.4801 2.196633,2.5469 0.313781,0.8074 0.568552,1.707 0.496624,2.5733 -0.35485,0.8576005 -1.224508,-0.216 -0.64725,-0.7284 0.01868,-0.3794 -0.01834,-1.3264 -0.370249,-1.3272 -0.123187,0.7586 -0.152778,1.547 -0.10869,2.3154 0.270285,0.6662005 1.310741,0.7653005 1.060553,1.6763005 -0.03493,0.9801 0.294343,1.9505 0.148048,2.9272 -0.320479,0.2406 -0.79575,0.097 -1.185062,0.1512 -0.165725,0.3657 -0.40138,0.921 -1.020848,0.6744 -0.564671,0.1141 -1.246404,-0.266 -0.578559,-0.7715 0.679736,-0.5602 0.898618,-1.5362 0.687058,-2.3673 -0.529674,-1.108 -1.275984,-2.0954005 -1.839206,-3.1831005 -0.634619,-0.1004 -1.251945,0.6779 -1.956789,0.7408 -0.6065893,-0.038 -1.0354363,-0.06 -0.8495673,0.6969005 0.01681,0.711 0.152396,1.3997 0.157345,2.1104 0.07947,0.7464 0.171287,1.4944 0.238271,2.2351 0.237411,1.0076 -0.687542,1.1488 -1.414811,0.8598 z m 6.8675483,-1.8379 c 0.114364,-0.3658 0.206751,-1.2704 -0.114466,-1.3553 -0.152626,0.5835 -0.225018,1.1888 -0.227537,1.7919 0.147087,-0.1166 0.265559,-0.2643 0.342003,-0.4366 z\"\n     />\n\t</g>\n  \n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\t\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
+      "icon": "activity/list/type.camel.png",
+      "groups": [
+        "活动列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "asynchronousdefinitionpackage",
+        "exclusivedefinitionpackage",
+        "executionlistenerspackage",
+        "multiinstance_typepackage",
+        "multiinstance_cardinalitypackage",
+        "multiinstance_collectionpackage",
+        "multiinstance_variablepackage",
+        "multiinstance_conditionpackage",
+        "isforcompensationpackage",
+        "cameltaskcamelcontextpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "Activity",
+        "sequence_start",
+        "sequence_end",
+        "ActivitiesMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "MuleTask",
+      "title": "Mule任务",
+      "description": "向Mule发送消息的任务",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n\t\n\t<g id=\"muleTask\" transform=\"translate(4,4)\">\n\t\t<path\n     style=\"fill:#bd4848;fill-opacity:1\"\n     d=\"M 8,0 C 3.581722,0 0,3.5817 0,8 c 0,4.4183 3.581722,8 8,8 4.418278,0 8,-3.5817 8,-8 L 16,7.6562 C 15.813571,3.3775 12.282847,0 8,0 z M 5.1875,2.7812 8,7.3437 10.8125,2.7812 c 1.323522,0.4299 2.329453,1.5645 2.8125,2.8438 1.136151,2.8609 -0.380702,6.4569 -3.25,7.5937 -0.217837,-0.6102 -0.438416,-1.2022 -0.65625,-1.8125 0.701032,-0.2274 1.313373,-0.6949 1.71875,-1.3125 0.73624,-1.2317 0.939877,-2.6305 -0.03125,-4.3125 l -2.75,4.0625 -0.65625,0 -0.65625,0 -2.75,-4 C 3.5268433,7.6916 3.82626,8.862 4.5625,10.0937 4.967877,10.7113 5.580218,11.1788 6.28125,11.4062 6.063416,12.0165 5.842837,12.6085 5.625,13.2187 2.755702,12.0819 1.238849,8.4858 2.375,5.625 2.858047,4.3457 3.863978,3.2112 5.1875,2.7812 z\"\n     />\n\t</g>\n  \n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\t\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
+      "icon": "activity/list/type.mule.png",
+      "groups": [
+        "活动列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "asynchronousdefinitionpackage",
+        "exclusivedefinitionpackage",
+        "executionlistenerspackage",
+        "multiinstance_typepackage",
+        "multiinstance_cardinalitypackage",
+        "multiinstance_collectionpackage",
+        "multiinstance_variablepackage",
+        "multiinstance_conditionpackage",
+        "isforcompensationpackage",
+        "muletaskendpointurlpackage",
+        "muletasklanguagepackage",
+        "muletaskpayloadexpressionpackage",
+        "muletaskresultvariablepackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "Activity",
+        "sequence_start",
+        "sequence_end",
+        "ActivitiesMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "SendTask",
+      "title": "发送任务",
+      "description": "发送消息的任务",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n    \n\t<g id=\"sendTask\" transform=\"translate(4,3)\">\n\t\n\t<!-- path here -->\n\t\t<path oryx:anchors=\"top left\"\n\t\t\tstyle=\"fill:#16964d;stroke:none;\"\n     \t\td=\"M 1 3 L 9 11 L 17 3 L 1 3 z M 1 5 L 1 13 L 5 9 L 1 5 z M 17 5 L 13 9 L 17 13 L 17 5 z M 6 10 L 1 15 L 17 15 L 12 10 L 9 13 L 6 10 z \"\n     \t/>\n\t</g>\n\t\n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
+      "icon": "activity/list/type.send.png",
+      "groups": [
+        "活动列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "asynchronousdefinitionpackage",
+        "exclusivedefinitionpackage",
+        "executionlistenerspackage",
+        "multiinstance_typepackage",
+        "multiinstance_cardinalitypackage",
+        "multiinstance_collectionpackage",
+        "multiinstance_variablepackage",
+        "multiinstance_conditionpackage",
+        "isforcompensationpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "Activity",
+        "sequence_start",
+        "sequence_end",
+        "ActivitiesMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "SubProcess",
+      "title": "子流程",
+      "description": "子流程范围",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n   width=\"200\"\n   height=\"160\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"50\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"80\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"110\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"70\" oryx:cy=\"159\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"100\" oryx:cy=\"159\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"130\" oryx:cy=\"159\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"199\" oryx:cy=\"50\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"199\" oryx:cy=\"80\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"199\" oryx:cy=\"110\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"70\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"100\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"130\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"100\" oryx:cy=\"80\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"120 100\" oryx:maximumSize=\"\" >\n    <rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"0\" y=\"0\" width=\"190\" height=\"160\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:anchors=\"bottom top right left\" x=\"0\" y=\"0\" width=\"200\" height=\"160\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#ffffff\" />\n\t<rect id=\"border\" oryx:anchors=\"top bottom left right\" oryx:resize=\"vertical horizontal\" x=\"2.5\" y=\"2.5\" width=\"195\" height=\"155\" rx=\"8\" ry=\"8\" stroke=\"black\" stroke-width=\"1\" fill=\"none\" />\n\t<text \n\t\tfont-size=\"12\" \n\t\tid=\"text_name\" \n\t\tx=\"8\" \n\t\ty=\"10\" \n\t\toryx:align=\"top left\"\n\t\toryx:fittoelem=\"text_frame\"\n\t\toryx:anchors=\"left top\" \n\t\tstroke=\"#373e48\">\n\t</text>\n\t\n\t<g \tid=\"parallel\"\n\t\ttransform=\"translate(1)\">\n\t\t<path \n\t\t\tid=\"parallelpath\"\n\t\t\toryx:anchors=\"bottom\" \n\t\t\tfill=\"none\" stroke=\"#bbbbbb\" d=\"M96 145 v10 M100 145 v10 M104 145 v10\" \n\t\t\tstroke-width=\"2\"\n\t\t/>\n\t</g>\n\t<g \tid=\"sequential\"\n\t\ttransform=\"translate(1)\">\n\t\t<path \n\t\t\tid=\"sequentialpath\"\n\t\t\toryx:anchors=\"bottom\" \n\t\t\tfill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M95,154h10 M95,150h10 M95,146h10\"\n\t\t/>\n\t</g>\n  </g>\n</svg>",
+      "icon": "activity/expanded.subprocess.png",
+      "groups": [
+        "结构列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "asynchronousdefinitionpackage",
+        "exclusivedefinitionpackage",
+        "executionlistenerspackage",
+        "multiinstance_typepackage",
+        "multiinstance_cardinalitypackage",
+        "multiinstance_collectionpackage",
+        "multiinstance_variablepackage",
+        "multiinstance_conditionpackage",
+        "istransactionpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "Activity",
+        "sequence_start",
+        "sequence_end",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "EventSubProcess",
+      "title": "事件子流程",
+      "description": "一个事件周期的子流程",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n   width=\"200\"\n   height=\"160\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"0\" oryx:cy=\"80\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"100\" oryx:cy=\"160\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"200\" oryx:cy=\"80\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"100\" oryx:cy=\"0\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"100\" oryx:cy=\"80\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"120 100\" oryx:maximumSize=\"\" >\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"0\" y=\"0\" width=\"190\" height=\"160\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:anchors=\"bottom top right left\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"200\" height=\"160\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" stroke-dasharray=\"2,2,2\" fill=\"#ffffff\" />\n    \t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"8\" \n\t\t\ty=\"10\" \n\t\t\toryx:align=\"top left\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\toryx:anchors=\"left top\" \n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n    \t\n\t<g id=\"none\"></g>\n\t\n  </g>\n</svg>",
+      "icon": "activity/event.subprocess.png",
+      "groups": [
+        "结构列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "asynchronousdefinitionpackage",
+        "exclusivedefinitionpackage",
+        "executionlistenerspackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "Activity",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "CallActivity",
+      "title": "调用活动",
+      "description": "一个调用活动",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n\n   width=\"102\"\n   height=\"82\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"20\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"40\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"1\" oryx:cy=\"60\" oryx:anchors=\"left\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"79\" oryx:anchors=\"bottom\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"20\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"40\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"99\" oryx:cy=\"60\" oryx:anchors=\"right\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"25\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"75\" oryx:cy=\"1\" oryx:anchors=\"top\" />\n  \t\n  \t<oryx:magnet oryx:cx=\"50\" oryx:cy=\"40\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\" oryx:minimumSize=\"50 40\">\n\t<rect id=\"text_frame\" oryx:anchors=\"bottom top right left\" x=\"1\" y=\"1\" width=\"94\" height=\"79\" rx=\"10\" ry=\"10\" stroke=\"none\" stroke-width=\"0\" fill=\"none\" />\n    <rect oryx:resize=\"vertical horizontal\" oryx:anchors=\"bottom top right left\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"4\" fill=\"none\" />\n\t<rect id=\"bg_frame\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"100\" height=\"80\" rx=\"10\" ry=\"10\" stroke=\"#bbbbbb\" stroke-width=\"1\" fill=\"#FFFFFF\" />\n\t\t<text \n\t\t\tfont-size=\"12\" \n\t\t\tid=\"text_name\" \n\t\t\tx=\"50\" \n\t\t\ty=\"40\" \n\t\t\toryx:align=\"middle center\"\n\t\t\toryx:fittoelem=\"text_frame\"\n\t\t\tstroke=\"#373e48\">\n\t\t</text>\n    \n\t<g id=\"parallel\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M46 70 v8 M50 70 v8 M54 70 v8\" stroke-width=\"2\" />\n\t</g>\n\t\n\t<g id=\"sequential\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" stroke-width=\"2\" d=\"M46,76h10M46,72h10 M46,68h10\"/>\n\t</g>\n\n\t<g id=\"compensation\">\n\t\t<path oryx:anchors=\"bottom\" fill=\"none\" stroke=\"#bbbbbb\" d=\"M 62 74 L 66 70 L 66 78 L 62 74 L 62 70 L 58 74 L 62 78 L 62 74\" stroke-width=\"1\" />\n\t</g>\n  </g>\n</svg>",
+      "icon": "activity/task.png",
+      "groups": [
+        "结构列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "asynchronousdefinitionpackage",
+        "exclusivedefinitionpackage",
+        "executionlistenerspackage",
+        "callactivitycalledelementpackage",
+        "callactivityinparameterspackage",
+        "callactivityoutparameterspackage",
+        "multiinstance_typepackage",
+        "multiinstance_cardinalitypackage",
+        "multiinstance_collectionpackage",
+        "multiinstance_variablepackage",
+        "multiinstance_conditionpackage",
+        "isforcompensationpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "Activity",
+        "sequence_start",
+        "sequence_end",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "ExclusiveGateway",
+      "title": "互斥网关",
+      "description": "一个选择的网关",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns=\"http://www.w3.org/2000/svg\"\n   version=\"1.0\"\n   width=\"40\"\n   height=\"40\">\n  <defs\n     id=\"defs4\" />\n  <oryx:magnets>\n    <oryx:magnet\n       oryx:default=\"yes\"\n       oryx:cy=\"16\"\n       oryx:cx=\"16\" />\n  </oryx:magnets>\t\t\t\t\t\n  <g>\n  \n    <path\n       d=\"M -4.5,16 L 16,-4.5 L 35.5,16 L 16,35.5z\"\n       id=\"bg_frame\"\n       fill=\"#ffffff\"\n       stroke=\"#585858\"\n       style=\"stroke-width:1\" />\n    <g\n       id=\"cross\">\n      <path\n      \tid=\"crosspath\"\n      \tstroke=\"#585858\"\n      \tfill=\"#585858\"\n        d=\"M 8.75,7.55 L 12.75,7.55 L 23.15,24.45 L 19.25,24.45 z\"\n        style=\"stroke-width:1\" />\n      <path\n      \tid=\"crosspath2\"\n      \tstroke=\"#585858\"\n      \tfill=\"#585858\"\n        d=\"M 8.75,24.45 L 19.25,7.55 L 23.15,7.55 L 12.75,24.45 z\"\n        style=\"stroke-width:1\" />\n    </g>\n\t\n\t<text id=\"text_name\" x=\"26\" y=\"26\" oryx:align=\"left top\"/>\n\t\n  </g>\n</svg>\n",
+      "icon": "gateway/exclusive.databased.png",
+      "groups": [
+        "网关列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "asynchronousdefinitionpackage",
+        "exclusivedefinitionpackage",
+        "sequencefloworderpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "sequence_start",
+        "GatewaysMorph",
+        "sequence_end",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "ParallelGateway",
+      "title": "并行网关",
+      "description": "一个并行的网关",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns=\"http://www.w3.org/2000/svg\"\n   version=\"1.0\"\n   width=\"40\"\n   height=\"40\">\n   \n  <oryx:magnets>\n    <oryx:magnet\n       oryx:default=\"yes\"\n       oryx:cy=\"16\"\n       oryx:cx=\"16\" />\n  </oryx:magnets>\n  <g>\n    <path\n       d=\"M -4.5,16 L 16,-4.5 L 35.5,16 L 16,35.5z\"\n       id=\"bg_frame\"\n       fill=\"#ffffff\"\n       stroke=\"#585858\"\n       style=\"stroke-width:1\" />\n    <path\n       d=\"M 6.75,16 L 25.75,16 M 16,6.75 L 16,25.75\"\n       id=\"path9\"\n       stroke=\"#585858\"\n       style=\"fill:none;stroke-width:3\" />\n    \n\t<text id=\"text_name\" x=\"26\" y=\"26\" oryx:align=\"left top\"/>\n\t\n  </g>\n</svg>\n",
+      "icon": "gateway/parallel.png",
+      "groups": [
+        "网关列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "asynchronousdefinitionpackage",
+        "exclusivedefinitionpackage",
+        "sequencefloworderpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "sequence_start",
+        "GatewaysMorph",
+        "sequence_end",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "InclusiveGateway",
+      "title": "包容性网关",
+      "description": "一个包容性网关",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns=\"http://www.w3.org/2000/svg\"\n   version=\"1.0\"\n   width=\"40\"\n   height=\"40\">\n  <oryx:magnets>\n    <oryx:magnet\n       oryx:default=\"yes\"\n       oryx:cy=\"16\"\n       oryx:cx=\"16\" />\n  </oryx:magnets>\n  <g>\n\n    <path\n       d=\"M -4.5,16 L 16,-4.5 L 35.5,16 L 16,35.5z\"\n       id=\"bg_frame\"\n       fill=\"#ffffff\"\n       stroke=\"#585858\"\n       style=\"stroke-width:1\" />\n    <circle\n    \tid=\"circle\"\n    \tstroke=\"#585858\"\n\t\tcx=\"16\"\n\t\tcy=\"16\"\n\t\tr=\"9.75\"\n\t\tstyle=\"fill:none;stroke-width:2.5\" />\n    \n\t<text id=\"text_name\" x=\"26\" y=\"26\" oryx:align=\"left top\"/>\n\t\n  </g>\n</svg>\n",
+      "icon": "gateway/inclusive.png",
+      "groups": [
+        "网关列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "asynchronousdefinitionpackage",
+        "exclusivedefinitionpackage",
+        "sequencefloworderpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "sequence_start",
+        "GatewaysMorph",
+        "sequence_end",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "EventGateway",
+      "title": "事件网关",
+      "description": "一个事件网关",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns=\"http://www.w3.org/2000/svg\"\n   version=\"1.0\"\n   width=\"40\"\n   height=\"40\">\n  <oryx:magnets>\n    <oryx:magnet\n       oryx:default=\"yes\"\n       oryx:cy=\"16\"\n       oryx:cx=\"16\" />\n  </oryx:magnets>\n  \n  <g> \n  \t\n\t<path\n\t\td=\"M -4.5,16 L 16,-4.5 L 35.5,16 L 16,35.5z\"\n\t\tid=\"bg_frame\"\n\t\tfill=\"#ffffff\"\n\t\tstroke=\"#585858\"\n\t\tstyle=\"stroke-width:1\" />\n\t<circle\n\t\tid=\"circle\"\n\t\tcx=\"16\"\n\t\tcy=\"16\"\n\t\tr=\"10.4\"\n\t\tstroke=\"#585858\"\n\t\tstyle=\"fill:none;stroke-width:0.5\" />\n\t<circle\n\t\tid=\"circle2\"\n\t\tcx=\"16\"\n\t\tcy=\"16\"\n\t\tr=\"11.7\"\n\t\tstroke=\"#585858\"\n\t\tstyle=\"fill:none;stroke-width:0.5\" />\n\t<path\n\t\td=\"M 20.327514,22.344972 L 11.259248,22.344216 L 8.4577203,13.719549 L 15.794545,8.389969 L 23.130481,13.720774 L 20.327514,22.344972 z\"\n\t\tid=\"middlePolygon\"\n\t\tstroke=\"#585858\"\n\t\tstyle=\"fill:none;fill-opacity:1;stroke-width:1.39999998;stroke-linejoin:bevel;stroke-opacity:1\" />\n\t\n\t\n\t<g id=\"instantiate\">\n\t\n\t\t<path\n\t\t\td=\"M -4.5,16 L 16,-4.5 L 35.5,16 L 16,35.5z\"\n\t\t\tid=\"bg_frame2\"\n\t\t\tfill=\"#ffffff\"\n\t\t\tstroke=\"#585858\"\n\t\t\tstyle=\"stroke-width:1\" />\n\t\t<circle\n\t\t\tid=\"circle3\"\n\t\t\tcx=\"16\"\n\t\t\tcy=\"16\"\n\t\t\tr=\"11\"\n\t\t\tstroke=\"#585858\"\n\t\t\tstyle=\"fill:none;stroke-width:1\" />\n\t\t<path\n\t\t\td=\"M 20.327514,22.344972 L 11.259248,22.344216 L 8.4577203,13.719549 L 15.794545,8.389969 L 23.130481,13.720774 L 20.327514,22.344972 z\"\n\t\t\tid=\"middlePolygon2\"\n\t\t\tstroke=\"#585858\"\n\t\t\tstyle=\"fill:none;fill-opacity:1;stroke-width:1.39999998;stroke-linejoin:bevel;stroke-opacity:1\" />\n\t\n\t\n\t\t<g id=\"parallel\">\n\t\t\t<path\n\t\t\t\td=\"M -4.5,16 L 16,-4.5 L 35.5,16 L 16,35.5z\"\n\t\t\t\tid=\"bg_frame3\"\n\t\t\t\tfill=\"#ffffff\"\n\t\t\t\tstroke=\"#585858\"\n\t\t\t\tstyle=\"stroke-width:1\" />\n\t\t\t<circle id=\"frame5\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n\t\t\t\n\t\t\t<path\n\t\t\t\td=\"M 6.75,14 L6.75,18 L14,18 L14,24.75 L18,24.75 L18,18 L24.75,18 L24.75,14 L18,14 L18,6.75 L14,6.75 L14,14z\"\n\t\t\t\tid=\"path92\"\n\t\t\t\tstroke=\"#585858\"\n\t\t\t\tstyle=\"fill:none;stroke-width:1\" />\n\t\t\n\t\t</g>\n\t\n\t</g>\n\t\n\t<text id=\"text_name\" x=\"26\" y=\"26\" oryx:align=\"left top\"/>\n\t\n  </g>\t\n\t\n</svg>\n",
+      "icon": "gateway/eventbased.png",
+      "groups": [
+        "网关列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "asynchronousdefinitionpackage",
+        "exclusivedefinitionpackage",
+        "sequencefloworderpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "sequence_start",
+        "GatewaysMorph",
+        "sequence_end",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "BoundaryErrorEvent",
+      "title": "边界错误事件",
+      "description": "一个捕捉BPMN异常的边界事件",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"1\"/>\n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    \n    <path\n         stroke=\"#585858\"\n         style=\"fill:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10\"\n         d=\"M 22.820839,11.171502 L 19.36734,24.58992 L 13.54138,14.281819 L 9.3386512,20.071607 L 13.048949,6.8323057 L 18.996148,16.132659 L 22.820839,11.171502 z\"\n         id=\"errorPolygon\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
+      "icon": "catching/error.png",
+      "groups": [
+        "边界事件"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "errorrefpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "sequence_start",
+        "BoundaryEventsMorph",
+        "IntermediateEventOnActivityBoundary"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "BoundaryTimerEvent",
+      "title": "定时边界事件",
+      "description": "一个定时触发的边界事件",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle \n    \tid=\"bg_frame\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"15\" \n    \tstroke=\"#585858\" \n    \tfill=\"#ffffff\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 5.5, 3\" />\n    \t\n    <circle \n    \tid=\"frame2_non_interrupting\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"12\" \n    \tstroke=\"#585858\" \n    \tfill=\"none\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 4.5, 3\" />\n    \n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    <circle id=\"frame2\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    \n    <path id=\"path1\" transform=\"translate(6,6)\"\n    \td=\"M 10 0 C 4.4771525 0 0 4.4771525 0 10 C 0 15.522847 4.4771525 20 10 20 C 15.522847 20 20 15.522847 20 10 C 20 4.4771525 15.522847 1.1842379e-15 10 0 z M 9.09375 1.03125 C 9.2292164 1.0174926 9.362825 1.0389311 9.5 1.03125 L 9.5 3.5 L 10.5 3.5 L 10.5 1.03125 C 15.063526 1.2867831 18.713217 4.9364738 18.96875 9.5 L 16.5 9.5 L 16.5 10.5 L 18.96875 10.5 C 18.713217 15.063526 15.063526 18.713217 10.5 18.96875 L 10.5 16.5 L 9.5 16.5 L 9.5 18.96875 C 4.9364738 18.713217 1.2867831 15.063526 1.03125 10.5 L 3.5 10.5 L 3.5 9.5 L 1.03125 9.5 C 1.279102 5.0736488 4.7225326 1.4751713 9.09375 1.03125 z M 9.5 5 L 9.5 8.0625 C 8.6373007 8.2844627 8 9.0680195 8 10 C 8 11.104569 8.8954305 12 10 12 C 10.931981 12 11.715537 11.362699 11.9375 10.5 L 14 10.5 L 14 9.5 L 11.9375 9.5 C 11.756642 8.7970599 11.20294 8.2433585 10.5 8.0625 L 10.5 5 L 9.5 5 z \"  \n    \tfill=\"#585858\" stroke=\"none\" />\n    \t\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
+      "icon": "catching/timer.png",
+      "groups": [
+        "边界事件"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "timercycledefinitionpackage",
+        "timerdatedefinitionpackage",
+        "timerdurationdefinitionpackage",
+        "timerenddatedefinitionpackage",
+        "cancelactivitypackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "sequence_start",
+        "BoundaryEventsMorph",
+        "IntermediateEventOnActivityBoundary"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "BoundarySignalEvent",
+      "title": "边界信号事件",
+      "description": "一个信号触发的边界事件",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle \n    \tid=\"bg_frame\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"15\" \n    \tstroke=\"#585858\" \n    \tfill=\"#ffffff\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 5.5, 3\" />\n    \t\n    <circle \n    \tid=\"frame2_non_interrupting\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"12\" \n    \tstroke=\"#585858\" \n    \tfill=\"none\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 4.5, 3\" />\n    \n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    <circle id=\"frame2\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n\t<path\n\t   id=\"signalCatching\"\n\t   stroke=\"#585858\"\n       d=\"M 8.7124971,21.247342 L 23.333334,21.247342 L 16.022915,8.5759512 L 8.7124971,21.247342 z\"\n       style=\"fill:none;stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
+      "icon": "catching/signal.png",
+      "groups": [
+        "边界事件"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "signalrefpackage",
+        "cancelactivitypackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "sequence_start",
+        "BoundaryEventsMorph",
+        "IntermediateEventOnActivityBoundary"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "BoundaryMessageEvent",
+      "title": "边界消息事件",
+      "description": "一个边界消息事件",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle \n    \tid=\"bg_frame\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"15\" \n    \tstroke=\"#585858\" \n    \tfill=\"#ffffff\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 5.5, 3\" />\n    \t\n    <circle \n    \tid=\"frame2_non_interrupting\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"12\" \n    \tstroke=\"#585858\" \n    \tfill=\"none\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 4.5, 3\" />\n    \t\n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    <circle id=\"frame2\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    \n\t<g id=\"messageCatching\">\n\t\t<path transform=\"translate(7,7)\" id=\"path1\" stroke=\"none\" fill=\"#585858\" stroke-width=\"1\" d=\"M 1 3 L 9 11 L 17 3 L 1 3 z M 1 5 L 1 13 L 5 9 L 1 5 z M 17 5 L 13 9 L 17 13 L 17 5 z M 6 10 L 1 15 L 17 15 L 12 10 L 9 13 L 6 10 z \"/>\n\t</g>\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n\t\n  </g>\n</svg>",
+      "icon": "catching/message.png",
+      "groups": [
+        "边界事件"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "messagerefpackage",
+        "cancelactivitypackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "sequence_start",
+        "BoundaryEventsMorph",
+        "IntermediateEventOnActivityBoundary"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "BoundaryCancelEvent",
+      "title": "边界取消事件",
+      "description": "一个边界取消事件",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n  \n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"1\"/>\n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    \n    <path\n       d=\"M 7.2839105,10.27369 L 10.151395,7.4062062 L 15.886362,13.141174 L 21.621331,7.4062056 L 24.488814,10.273689 L 18.753846,16.008657 L 24.488815,21.743626 L 21.621331,24.611111 L 15.886362,18.876142 L 10.151394,24.611109 L 7.283911,21.743625 L 13.018878,16.008658 L 7.2839105,10.27369 z\"\n       id=\"cancelCross\" fill=\"none\" stroke=\"#585858\" stroke-width=\"1.7\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
+      "icon": "catching/cancel.png",
+      "groups": [
+        "边界事件"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "sequence_start",
+        "BoundaryEventsMorph",
+        "IntermediateEventOnActivityBoundary"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "BoundaryCompensationEvent",
+      "title": "边界修正事件",
+      "description": "一个边界修正事件",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n\t\n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"1\"/>\n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"1\"/>\n    \n    <polygon id=\"poly1\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1.4\" points=\"15,9 15,23 8,16\" stroke-linecap=\"butt\" stroke-linejoin=\"miter\" stroke-miterlimit=\"10\" />\n    <polygon id=\"poly2\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1.4\" points=\"22,9 22,23 15,16\" stroke-linecap=\"butt\" stroke-linejoin=\"miter\" stroke-miterlimit=\"10\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n </g>\n</svg>",
+      "icon": "catching/compensation.png",
+      "groups": [
+        "边界事件"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "BoundaryEventsMorph",
+        "IntermediateEventOnActivityBoundary",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "CatchTimerEvent",
+      "title": "中间定时器捕获事件",
+      "description": "定时器触发的中间捕获事件",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle \n    \tid=\"bg_frame\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"15\" \n    \tstroke=\"#585858\" \n    \tfill=\"#ffffff\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 5.5, 3\" />\n    \t\n    <circle \n    \tid=\"frame2_non_interrupting\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"12\" \n    \tstroke=\"#585858\" \n    \tfill=\"none\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 4.5, 3\" />\n    \n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    <circle id=\"frame2\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    \n    <path id=\"path1\" transform=\"translate(6,6)\"\n    \td=\"M 10 0 C 4.4771525 0 0 4.4771525 0 10 C 0 15.522847 4.4771525 20 10 20 C 15.522847 20 20 15.522847 20 10 C 20 4.4771525 15.522847 1.1842379e-15 10 0 z M 9.09375 1.03125 C 9.2292164 1.0174926 9.362825 1.0389311 9.5 1.03125 L 9.5 3.5 L 10.5 3.5 L 10.5 1.03125 C 15.063526 1.2867831 18.713217 4.9364738 18.96875 9.5 L 16.5 9.5 L 16.5 10.5 L 18.96875 10.5 C 18.713217 15.063526 15.063526 18.713217 10.5 18.96875 L 10.5 16.5 L 9.5 16.5 L 9.5 18.96875 C 4.9364738 18.713217 1.2867831 15.063526 1.03125 10.5 L 3.5 10.5 L 3.5 9.5 L 1.03125 9.5 C 1.279102 5.0736488 4.7225326 1.4751713 9.09375 1.03125 z M 9.5 5 L 9.5 8.0625 C 8.6373007 8.2844627 8 9.0680195 8 10 C 8 11.104569 8.8954305 12 10 12 C 10.931981 12 11.715537 11.362699 11.9375 10.5 L 14 10.5 L 14 9.5 L 11.9375 9.5 C 11.756642 8.7970599 11.20294 8.2433585 10.5 8.0625 L 10.5 5 L 9.5 5 z \"  \n    \tfill=\"#585858\" stroke=\"none\" />\n    \t\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
+      "icon": "catching/timer.png",
+      "groups": [
+        "中间捕获事件列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "executionlistenerspackage",
+        "timercycledefinitionpackage",
+        "timerdatedefinitionpackage",
+        "timerdurationdefinitionpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "sequence_start",
+        "sequence_end",
+        "CatchEventsMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "CatchSignalEvent",
+      "title": "中间信号捕获事件",
+      "description": "信号触发的捕获事件",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle \n    \tid=\"bg_frame\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"15\" \n    \tstroke=\"#585858\" \n    \tfill=\"#ffffff\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 5.5, 3\" />\n    \t\n    <circle \n    \tid=\"frame2_non_interrupting\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"12\" \n    \tstroke=\"#585858\" \n    \tfill=\"none\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 4.5, 3\" />\n    \n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    <circle id=\"frame2\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n\t<path\n\t   id=\"signalCatching\"\n\t   stroke=\"#585858\"\n       d=\"M 8.7124971,21.247342 L 23.333334,21.247342 L 16.022915,8.5759512 L 8.7124971,21.247342 z\"\n       style=\"fill:none;stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
+      "icon": "catching/signal.png",
+      "groups": [
+        "中间捕获事件列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "executionlistenerspackage",
+        "signalrefpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "sequence_start",
+        "sequence_end",
+        "CatchEventsMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "CatchMessageEvent",
+      "title": "中间消息捕获事件",
+      "description": "一个消息触发的中间捕获事件",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle \n    \tid=\"bg_frame\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"15\" \n    \tstroke=\"#585858\" \n    \tfill=\"#ffffff\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 5.5, 3\" />\n    \t\n    <circle \n    \tid=\"frame2_non_interrupting\" \n    \tcx=\"16\" \n    \tcy=\"16\" \n    \tr=\"12\" \n    \tstroke=\"#585858\" \n    \tfill=\"none\" \n    \tstroke-width=\"1\"\n    \tstyle=\"stroke-dasharray: 4.5, 3\" />\n    \t\n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    <circle id=\"frame2\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    \n\t<g id=\"messageCatching\">\n\t\t<path transform=\"translate(7,7)\" id=\"path1\" stroke=\"none\" fill=\"#585858\" stroke-width=\"1\" d=\"M 1 3 L 9 11 L 17 3 L 1 3 z M 1 5 L 1 13 L 5 9 L 1 5 z M 17 5 L 13 9 L 17 13 L 17 5 z M 6 10 L 1 15 L 17 15 L 12 10 L 9 13 L 6 10 z \"/>\n\t</g>\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n\t\n  </g>\n</svg>",
+      "icon": "catching/message.png",
+      "groups": [
+        "中间捕获事件列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "executionlistenerspackage",
+        "messagerefpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "sequence_start",
+        "sequence_end",
+        "CatchEventsMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "ThrowNoneEvent",
+      "title": "中间抛出事件",
+      "description": "无触发器的中间抛出事件",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n  \n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"1\"/>\n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
+      "icon": "throwing/none.png",
+      "groups": [
+        "中间抛出事件"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "executionlistenerspackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "ThrowEventsMorph",
+        "sequence_start",
+        "sequence_end",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "ThrowSignalEvent",
+      "title": "信号中间抛出事件",
+      "description": "一个信号触发的中间抛出事件",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"15\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"1\"/>\n    <circle id=\"frame\" cx=\"16\" cy=\"16\" r=\"12\" stroke=\"#585858\" fill=\"none\" stroke-width=\"1\"/>\n    <path\n\t   id=\"signalThrowing\"\n       d=\"M 8.7124971,21.247342 L 23.333334,21.247342 L 16.022915,8.5759512 L 8.7124971,21.247342 z\"\n       fill=\"#585858\"\n       stroke=\"#585858\"\n       style=\"stroke-width:1.4;stroke-miterlimit:4;stroke-dasharray:none\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"33\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
+      "icon": "throwing/signal.png",
+      "groups": [
+        "中间抛出事件"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "executionlistenerspackage",
+        "signalrefpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "ThrowEventsMorph",
+        "sequence_start",
+        "sequence_end",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "EndNoneEvent",
+      "title": "结束任务",
+      "description": "一个无触发器的结束任务",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\">\n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"14\" stroke=\"#585858\" fill=\"#FFFFFF\" stroke-width=\"1\"/>\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"32\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
+      "icon": "endevent/none.png",
+      "groups": [
+        "结束任务列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "executionlistenerspackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "EndEventsMorph",
+        "sequence_end",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "EndErrorEvent",
+      "title": "结束错误任务",
+      "description": "An end event that throws an error event",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <oryx:docker oryx:cx=\"16\" oryx:cy=\"16\" />\n  <g pointer-events=\"fill\">\n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"14\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"3\"/>\n    \n    <path\n         fill=\"#585858\"\n         stroke=\"#585858\"\n         style=\"stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10\"\n         d=\"M 22.820839,11.171502 L 19.36734,24.58992 L 13.54138,14.281819 L 9.3386512,20.071607 L 13.048949,6.8323057 L 18.996148,16.132659 L 22.820839,11.171502 z\"\n         id=\"errorPolygon\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"32\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
+      "icon": "endevent/error.png",
+      "groups": [
+        "结束任务列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "executionlistenerspackage",
+        "errorrefpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "EndEventsMorph",
+        "sequence_end",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "EndCancelEvent",
+      "title": "结束取消任务",
+      "description": "A cancel end event",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\">\n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"14\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"3\"/>\n    \n    <path id=\"path1\" d=\"M 9 9 L 23 23 M 9 23 L 23 9\" fill=\"none\" stroke=\"#585858\" stroke-width=\"5\" />\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"32\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
+      "icon": "endevent/cancel.png",
+      "groups": [
+        "结束任务列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "executionlistenerspackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "EndEventsMorph",
+        "sequence_end",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "EndTerminateEvent",
+      "title": "终结任务",
+      "description": "A terminate end event",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   width=\"40\"\n   height=\"40\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"16\" oryx:cy=\"16\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"fill\">\n    <circle id=\"bg_frame\" cx=\"16\" cy=\"16\" r=\"14\" stroke=\"#585858\" fill=\"#ffffff\" stroke-width=\"3\"/>\n    \n    <circle id=\"circle1\" cx=\"16\" cy=\"16\" r=\"9\" stroke=\"#585858\" fill=\"#585858\" stroke-width=\"1\"/>\n\t<text font-size=\"11\" \n\t\tid=\"text_name\" \n\t\tx=\"16\" y=\"32\" \n\t\toryx:align=\"top center\" \n\t\tstroke=\"#373e48\"\n\t></text>\n  </g>\n</svg>",
+      "icon": "endevent/terminate.png",
+      "groups": [
+        "结束任务列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "executionlistenerspackage",
+        "terminateAllpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "EndEventsMorph",
+        "sequence_end",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "Pool",
+      "title": "池",
+      "description": "A pool to stucture the process definition",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n   width=\"600\"\n   height=\"250\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"0\" oryx:cy=\"124\" oryx:anchors=\"left\" />\n  \t<oryx:magnet oryx:cx=\"299\" oryx:cy=\"249\" oryx:anchors=\"bottom\" />\n  \t<oryx:magnet oryx:cx=\"599\" oryx:cy=\"124\" oryx:anchors=\"right\" />\n  \t<oryx:magnet oryx:cx=\"299\" oryx:cy=\"0\" oryx:anchors=\"top\" />\n  \t<oryx:magnet oryx:cx=\"299\" oryx:cy=\"124\" oryx:default=\"yes\" />\n  </oryx:magnets>\n  <g pointer-events=\"none\" >\n    <defs>\n\t\t<radialGradient id=\"background\" cx=\"0%\" cy=\"10%\" r=\"100%\" fx=\"20%\" fy=\"10%\">\n\t\t\t<stop offset=\"0%\" stop-color=\"#ffffff\" stop-opacity=\"1\"/>\n\t\t\t<stop id=\"fill_el\" offset=\"100%\" stop-color=\"#ffffff\" stop-opacity=\"1\"/>\n\t\t</radialGradient>\n\t</defs>\n\t  \t\n  \t<rect\n  \t\tid=\"border\"\n  \t\tclass=\"stripable-element-force\"\n  \t\toryx:resize=\"vertical horizontal\"\n  \t\tx=\"0\"\n  \t\ty=\"0\"\n  \t\twidth=\"600\"\n  \t\theight=\"250\"\n  \t\tfill=\"none\"\n  \t\tstroke-width=\"9\"\n  \t\tstroke=\"none\"\n  \t\tvisibility=\"visible\"\n  \t\tpointer-events=\"stroke\"\n  \t/>\n    <rect\n    \tid=\"c\"\n    \toryx:resize=\"vertical horizontal\"\n    \tx=\"0\"\n    \ty=\"0\"\n    \twidth=\"600\" \n    \theight=\"250\" \n    \tstroke=\"black\" \n    \tfill=\"url(#background) white\"\n    \tfill-opacity=\"0.3\" \n    />\n    \n\t<rect \n\t\tid=\"caption\"\n\t\toryx:anchors=\"left top bottom\"\n\t\tx=\"0\"\n\t\ty=\"0\"\n\t\twidth=\"30\"\n\t\theight=\"250\"\n\t\tstroke=\"black\"\n\t\tstroke-width=\"1\"\n\t\tfill=\"url(#background) white\"\n\t\tpointer-events=\"all\"\n\t/>\n\t\n\t<rect \n\t\tid=\"captionDisableAntialiasing\"\n\t\toryx:anchors=\"left top bottom\"\n\t\tx=\"0\"\n\t\ty=\"0\"\n\t\twidth=\"30\"\n\t\theight=\"250\"\n\t\tstroke=\"black\"\n\t\tstroke-width=\"1\"\n\t\tfill=\"url(#background) white\"\n\t\tpointer-events=\"all\"\n\t/>\n\t\n    <text x=\"13\" y=\"125\" font-size=\"12\" id=\"text_name\" oryx:fittoelem=\"caption\" oryx:align=\"middle center\" oryx:anchors=\"left\" oryx:rotate=\"270\" fill=\"black\" stroke=\"black\"></text>\n    \n  </g>\n</svg>",
+      "icon": "swimlane/pool.png",
+      "groups": [
+        "泳道列表"
+      ],
+      "layout": [
+        {
+          "type": "layout.bpmn2_0.pool"
+        }
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "process_idpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "canContainArtifacts",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "Lane",
+      "title": "泳道",
+      "description": "构建流程定义的通道",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n   width=\"600\"\n   height=\"250\"\n   version=\"1.0\">\n  <defs></defs>\n  <g pointer-events=\"none\" >\n  \n     <defs>\n\t\t<radialGradient id=\"background\" cx=\"0%\" cy=\"10%\" r=\"200%\" fx=\"20%\" fy=\"10%\">\n\t\t\t<stop offset=\"0%\" stop-color=\"#ffffff\" stop-opacity=\"1\"/>\n\t\t\t<stop id=\"fill_el\" offset=\"100%\" stop-color=\"#ffffff\" stop-opacity=\"0\"/>\n\t\t</radialGradient>\n\t</defs>\n\t\n  \t<rect id=\"border_invisible\" class=\"stripable-element-force\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"600\" height=\"250\" fill=\"none\" stroke-width=\"10\" stroke=\"white\" visibility=\"hidden\" pointer-events=\"stroke\"/>\t\t\n\t<rect id=\"border\" oryx:resize=\"vertical horizontal\" x=\"0\" y=\"0\" width=\"600\" height=\"250\" stroke=\"black\" stroke-width=\"1\" fill=\"url(#background) white\" pointer-events=\"none\" />\n\t\n\t\n\t<rect \n\t\tid=\"caption\"\n\t\toryx:anchors=\"left top bottom\"\n\t\tx=\"0\"\n\t\ty=\"1\"\n\t\twidth=\"30\"\n\t\theight=\"248\"\n\t\tstroke=\"black\"\n\t\tstroke-width=\"0\"\n\t\tfill=\"white\"\n\t\tvisibility=\"hidden\"\n\t\tclass=\"stripable-element-force\"\n\t\tpointer-events=\"all\"\n\t/>\n\t\n\t<path\n\t\tstroke=\"black\"\n\t\tstroke-width=\"1\"\n\t\tfill=\"none\"\n\t\td=\"M 0,0 L 0,250\"\n        oryx:anchors=\"left top bottom\"\n        id=\"captionDisableAntialiasing\"\n    />\n\t\n\t<!--rect \n\t\tid=\"captionDisableAntialiasing\"\n\t\toryx:anchors=\"left top bottom\"\n\t\tx=\"0\"\n\t\ty=\"0\"\n\t\twidth=\"30\"\n\t\theight=\"250\"\n\t\tstroke=\"black\"\n\t\tstroke-width=\"1\"\n\t\tfill=\"url(#background) white\"\n\t/-->\n\t\n    <text \n\t\tx=\"13\"\n\t\ty=\"125\"\n\t\toryx:rotate=\"270\" \n\t\tfont-size=\"12\" \n\t\tid=\"text_name\" \n\t\toryx:align=\"middle center\" \n\t\toryx:anchors=\"left\"\n\t\toryx:fittoelem=\"caption\"\n\t\tfill=\"black\" \n\t\tstroke=\"black\">\n\t</text>\n  </g>\n</svg>",
+      "icon": "swimlane/lane.png",
+      "groups": [
+        "泳道列表"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "PoolChild",
+        "canContainArtifacts",
+        "all"
+      ]
+    },
+    {
+      "type": "edge",
+      "id": "SequenceFlow",
+      "title": "顺序流",
+      "description": "顺序流定义活动的执行顺序",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\r\n<svg\r\n\txmlns=\"http://www.w3.org/2000/svg\"\r\n\txmlns:oryx=\"http://www.b3mn.org/oryx\"\r\n\tversion=\"1.0\"\r\n\toryx:edge=\"edge\" >\r\n\t<defs>\r\n\t  \t<marker id=\"start\" refX=\"1\" refY=\"5\" markerUnits=\"userSpaceOnUse\" markerWidth=\"17\" markerHeight=\"11\" orient=\"auto\">\r\n\t  \t\t<!-- <path id=\"conditional\"   d=\"M 0 6 L 8 1 L 15 5 L 8 9 L 1 5\" fill=\"white\" stroke=\"black\" stroke-width=\"1\" /> -->\r\n\t\t\t<path id=\"default\" d=\"M 5 0 L 11 10\" fill=\"white\" stroke=\"#585858\" stroke-width=\"1\" />\r\n\t  \t</marker>\r\n\t  \t<marker id=\"end\" refX=\"15\" refY=\"6\" markerUnits=\"userSpaceOnUse\" markerWidth=\"15\" markerHeight=\"12\" orient=\"auto\">\r\n\t  \t\t<path id=\"arrowhead\" d=\"M 0 1 L 15 6 L 0 11z\" fill=\"#585858\" stroke=\"#585858\" stroke-linejoin=\"round\" stroke-width=\"2\" />\r\n\t  \t</marker>\r\n\t</defs>\r\n\t<g id=\"edge\">\r\n\t\t<path id=\"bg_frame\" d=\"M10 50 L210 50\" stroke=\"#585858\" fill=\"none\" stroke-width=\"2\" stroke-linecap=\"round\" stroke-linejoin=\"round\" marker-start=\"url(#start)\" marker-end=\"url(#end)\" />\r\n\t\t<text id=\"text_name\" x=\"0\" y=\"0\" oryx:edgePosition=\"startTop\"/>\r\n\t</g>\r\n</svg>",
+      "icon": "connector/sequenceflow.png",
+      "groups": [
+        "连接对象"
+      ],
+      "layout": [
+        {
+          "type": "layout.bpmn2_0.sequenceflow"
+        }
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "conditionsequenceflowpackage",
+        "executionlistenerspackage",
+        "defaultflowpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "ConnectingObjectsMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "edge",
+      "id": "MessageFlow",
+      "title": "消息流",
+      "description": "用于连接不同池中的元素的消息流",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\r\n<svg\r\n\txmlns=\"http://www.w3.org/2000/svg\"\r\n\txmlns:oryx=\"http://www.b3mn.org/oryx\"\r\n\tversion=\"1.0\"\r\n\toryx:edge=\"edge\" >\r\n\t<defs>\r\n\t\t<marker id=\"start\" oryx:optional=\"yes\" oryx:enabled=\"yes\" refX=\"5\" refY=\"5\" markerUnits=\"userSpaceOnUse\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\">\r\n\t  \t\t<!-- <path d=\"M 10 10 L 0 5 L 10 0\" fill=\"none\" stroke=\"#585858\" /> -->\r\n\t  \t\t<circle id=\"arrowhead\" cx=\"5\" cy=\"5\" r=\"5\" fill=\"white\" stroke=\"black\" />\r\n\t  \t</marker>\r\n\r\n\t  \t<marker id=\"end\" refX=\"10\" refY=\"5\" markerUnits=\"userSpaceOnUse\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\">\r\n\t  \t\t<path id=\"arrowhead2\" d=\"M 0 0 L 10 5 L 0 10 L 0 0\" fill=\"white\" stroke=\"#585858\" />\r\n\t  \t</marker>\r\n\t</defs>\r\n\t<g id=\"edge\">\r\n\t    <path id=\"bg_frame\" d=\"M10 50 L210 50\" stroke=\"#585858\" fill=\"none\" stroke-width=\"2\" stroke-dasharray=\"3, 4\" marker-start=\"url(#start)\" marker-end=\"url(#end)\" />\r\n\t\t<text id=\"text_name\" x=\"0\" y=\"0\" oryx:edgePosition=\"midTop\"/>\r\n\t</g>\r\n</svg>",
+      "icon": "connector/messageflow.png",
+      "groups": [
+        "连接对象"
+      ],
+      "layout": [
+        {
+          "type": "layout.bpmn2_0.sequenceflow"
+        }
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "ConnectingObjectsMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "edge",
+      "id": "Association",
+      "title": "注释",
+      "description": "连接一个注释到指定元素",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\r\n<svg\r\n\txmlns=\"http://www.w3.org/2000/svg\"\r\n\txmlns:oryx=\"http://www.b3mn.org/oryx\"\r\n\tversion=\"1.0\"\r\n\toryx:edge=\"edge\" >\r\n\t<g id=\"edge\">\r\n\t    <path id=\"bg_frame\" d=\"M10 50 L210 50\" stroke=\"#585858\" fill=\"none\" stroke-width=\"2\" stroke-dasharray=\"3, 4\" />\r\n\t\t<text id=\"name\" x=\"0\" y=\"0\" oryx:edgePosition=\"midTop\" oryx:offsetTop=\"6\" style=\"font-size:9px;\"/>\r\n\t</g>\r\n</svg>",
+      "icon": "connector/association.undirected.png",
+      "groups": [
+        "连接对象"
+      ],
+      "layout": [
+        {
+          "type": "layout.bpmn2_0.sequenceflow"
+        }
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "ConnectingObjectsMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "edge",
+      "id": "DataAssociation",
+      "title": "日期注释",
+      "description": "连接一个日期注释到指定元素",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\r\n<svg\r\n\txmlns=\"http://www.w3.org/2000/svg\"\r\n\txmlns:oryx=\"http://www.b3mn.org/oryx\"\r\n\tversion=\"1.0\"\r\n\toryx:edge=\"edge\" >\r\n\t<defs>\r\n\t  \t<marker id=\"end\" refX=\"10\" refY=\"5\" markerUnits=\"userSpaceOnUse\" markerWidth=\"10\" markerHeight=\"10\" orient=\"auto\">\r\n\t  \t\t<path id=\"arrowhead\" d=\"M 0 0 L 10 5 L 0 10\" fill=\"none\" stroke=\"#585858\" />\r\n\t  \t</marker>\r\n\t</defs>\r\n\t<g id=\"edge\">\r\n\t    <path id=\"bg_frame\" d=\"M10 50 L210 50\" stroke=\"#585858\" fill=\"none\" stroke-width=\"2\" stroke-dasharray=\"3, 4\" marker-end=\"url(#end)\" />\r\n\t\t<text id=\"name\" x=\"0\" y=\"0\" oryx:edgePosition=\"midTop\" oryx:offsetTop=\"6\" style=\"font-size:9px;\"/>\r\n\t</g>\r\n</svg>",
+      "icon": "connector/association.unidirectional.png",
+      "groups": [
+        "连接对象"
+      ],
+      "layout": [
+        {
+          "type": "layout.bpmn2_0.sequenceflow"
+        }
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "ConnectingObjectsMorph",
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "TextAnnotation",
+      "title": "文本注释",
+      "description": "连接一个文本注释到指定元素",
+      "view": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<svg\n   xmlns=\"http://www.w3.org/2000/svg\"\n   xmlns:svg=\"http://www.w3.org/2000/svg\"\n   xmlns:oryx=\"http://www.b3mn.org/oryx\"\n   xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n   width=\"102\"\n   height=\"51\"\n   version=\"1.0\">\n  <defs></defs>\n  <oryx:magnets>\n  \t<oryx:magnet oryx:cx=\"2\" oryx:cy=\"25\" oryx:anchors=\"left\" oryx:default=\"yes\"/>\n  </oryx:magnets>\n  <g pointer-events=\"all\" oryx:minimumSize=\"10 20\" oryx:maximumSize=\"\" >\n  <rect \n\tid=\"textannotationrect\"\n\toryx:resize=\"vertical horizontal\"\n\tx=\"1\" \n\ty=\"1\"\n\twidth=\"100\"\n\theight=\"50\"\n\tstroke=\"none\"\n\tfill=\"none\" />\n  <path \n  \tid = \"frame\"\n\td=\"M20,1 L1,1 L1,50 L20,50\" \n\toryx:anchors=\"top bottom left\" \n\tstroke=\"#585858\" \n\tfill=\"none\" \n\tstroke-width=\"1\" />\n    \n    <text \n\t\tfont-size=\"12\" \n\t\tid=\"text\" \n\t\tx=\"5\" \n\t\ty=\"25\" \n\t\toryx:align=\"middle left\"\n\t\toryx:fittoelem=\"textannotationrect\"\n\t\toryx:anchors=\"left\"\n\t\tstroke=\"#373e48\">\n\t</text>\n  </g>\n</svg>",
+      "icon": "artifact/text.annotation.png",
+      "groups": [
+        "加工"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage",
+        "textpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "all"
+      ]
+    },
+    {
+      "type": "node",
+      "id": "DataStore",
+      "title": "数据存储",
+      "description": "引用数据存储",
+      "view": "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"no\" ?>\r\n<svg \r\n\txmlns=\"http://www.w3.org/2000/svg\"\r\n\txmlns:svg=\"http://www.w3.org/2000/svg\"\r\n   \txmlns:oryx=\"http://www.b3mn.org/oryx\"\r\n   \txmlns:xlink=\"http://www.w3.org/1999/xlink\"\r\n\t\r\n\twidth=\"63.001px\" \r\n\theight=\"61.173px\"\r\n\tversion=\"1.0\">\r\n\t<defs></defs>\r\n\t<oryx:magnets>\r\n\t\t<oryx:magnet oryx:cx=\"0\" oryx:cy=\"30.5865\" oryx:anchors=\"left\" />\r\n\t\t<oryx:magnet oryx:cx=\"31.5005\" oryx:cy=\"61.173\" oryx:anchors=\"bottom\" />\r\n\t\t<oryx:magnet oryx:cx=\"63.001\" oryx:cy=\"30.5865\" oryx:anchors=\"right\" />\r\n\t\t<oryx:magnet oryx:cx=\"31.5005\" oryx:cy=\"0\" oryx:anchors=\"top\" />\r\n\t\t<oryx:magnet oryx:cx=\"31.5005\" oryx:cy=\"30.5865\" oryx:default=\"yes\" />\r\n\t</oryx:magnets>\r\n\t\r\n\t<g>\r\n\t\t<defs>\r\n\t\t\t<radialGradient id=\"background\" cx=\"30%\" cy=\"30%\" r=\"50%\" fx=\"0%\" fy=\"0%\">\r\n\t\t\t\t<stop offset=\"0%\" stop-color=\"#ffffff\" stop-opacity=\"1\"></stop>\r\n\t\t\t\t<stop offset=\"100%\" stop-color=\"#ffffff\" stop-opacity=\"1\" id=\"fill_el\"></stop>\r\n\t\t\t</radialGradient>\r\n\t\t</defs>\r\n\t\t\r\n\t\t<path id=\"bg_frame\" fill=\"url(#background) #ffffff\" stroke=\"#000000\" d=\"M31.634,0.662c20.013,0,31.292,3.05,31.292,5.729c0,2.678,0,45.096,0,48.244\r\n\t\t\tc0,3.148-16.42,6.2-31.388,6.2c-14.968,0-30.613-2.955-30.613-6.298c0-3.342,0-45.728,0-48.05\r\n\t\t\tC0.925,4.165,11.622,0.662,31.634,0.662z\"/>\r\n\t\t<path id=\"bg_frame2\" fill=\"none\" stroke=\"#000000\" d=\"\r\n\t\t\tM62.926,15.69c0,1.986-3.62,6.551-31.267,6.551c-27.646,0-30.734-4.686-30.734-6.454 M0.925,11.137\r\n\t\t\tc0,1.769,3.088,6.455,30.734,6.455c27.647,0,31.267-4.565,31.267-6.551 M0.925,6.487c0,2.35,3.088,6.455,30.734,6.455\r\n\t\t\tc27.647,0,31.267-3.912,31.267-6.552 M62.926,6.391v4.844 M0.949,6.391v4.844 M62.926,11.041v4.844 M0.949,11.041v4.844\"/>\r\n\t\t\t \t\r\n\t\t<text font-size=\"12\" id=\"text_name\" x=\"31\" y=\"66\" oryx:align=\"center top\" stroke=\"black\" />\r\n\t\t\t \r\n\t</g>\r\n</svg>\r\n",
+      "icon": "dataobject/data.store.png",
+      "groups": [
+        "Artifacts"
+      ],
+      "propertyPackages": [
+        "overrideidpackage",
+        "namepackage",
+        "documentationpackage"
+      ],
+      "hiddenPropertyPackages": [],
+      "roles": [
+        "all"
+      ]
+    }
+  ],
+  "rules": {
+    "cardinalityRules": [
+      {
+        "role": "Startevents_all",
+        "incomingEdges": [
+          {
+            "role": "SequenceFlow",
+            "maximum": 0
+          }
+        ]
+      },
+      {
+        "role": "Endevents_all",
+        "outgoingEdges": [
+          {
+            "role": "SequenceFlow",
+            "maximum": 0
+          }
+        ]
+      }
+    ],
+    "connectionRules": [
+      {
+        "role": "SequenceFlow",
+        "connects": [
+          {
+            "from": "sequence_start",
+            "to": [
+              "sequence_end"
+            ]
+          }
+        ]
+      },
+      {
+        "role": "Association",
+        "connects": [
+          {
+            "from": "sequence_start",
+            "to": [
+              "TextAnnotation"
+            ]
+          },
+          {
+            "from": "sequence_end",
+            "to": [
+              "TextAnnotation"
+            ]
+          },
+          {
+            "from": "TextAnnotation",
+            "to": [
+              "sequence_end"
+            ]
+          },
+          {
+            "from": "BoundaryCompensationEvent",
+            "to": [
+              "sequence_end"
+            ]
+          },
+          {
+            "from": "TextAnnotation",
+            "to": [
+              "sequence_start"
+            ]
+          },
+          {
+            "from": "BoundaryCompensationEvent",
+            "to": [
+              "sequence_start"
+            ]
+          }
+        ]
+      },
+      {
+        "role": "DataAssociation",
+        "connects": [
+          {
+            "from": "sequence_start",
+            "to": [
+              "DataStore"
+            ]
+          },
+          {
+            "from": "sequence_end",
+            "to": [
+              "DataStore"
+            ]
+          },
+          {
+            "from": "DataStore",
+            "to": [
+              "sequence_end"
+            ]
+          },
+          {
+            "from": "DataStore",
+            "to": [
+              "sequence_start"
+            ]
+          }
+        ]
+      },
+      {
+        "role": "IntermediateEventOnActivityBoundary",
+        "connects": [
+          {
+            "from": "Activity",
+            "to": [
+              "IntermediateEventOnActivityBoundary"
+            ]
+          }
+        ]
+      }
+    ],
+    "containmentRules": [
+      {
+        "role": "BPMNDiagram",
+        "contains": [
+          "all"
+        ]
+      },
+      {
+        "role": "SubProcess",
+        "contains": [
+          "sequence_start",
+          "sequence_end",
+          "from_task_event",
+          "to_task_event",
+          "EventSubProcess",
+          "TextAnnotation",
+          "DataStore"
+        ]
+      },
+      {
+        "role": "EventSubProcess",
+        "contains": [
+          "sequence_start",
+          "sequence_end",
+          "from_task_event",
+          "to_task_event",
+          "TextAnnotation",
+          "DataStore"
+        ]
+      },
+      {
+        "role": "Pool",
+        "contains": [
+          "Lane"
+        ]
+      },
+      {
+        "role": "Lane",
+        "contains": [
+          "sequence_start",
+          "sequence_end",
+          "EventSubProcess",
+          "TextAnnotation",
+          "DataStore"
+        ]
+      }
+    ],
+    "morphingRules": [
+      {
+        "role": "ActivitiesMorph",
+        "baseMorphs": [
+          "UserTask"
+        ],
+        "preserveBounds": true
+      },
+      {
+        "role": "GatewaysMorph",
+        "baseMorphs": [
+          "ExclusiveGateway"
+        ]
+      },
+      {
+        "role": "StartEventsMorph",
+        "baseMorphs": [
+          "StartNoneEvent"
+        ]
+      },
+      {
+        "role": "EndEventsMorph",
+        "baseMorphs": [
+          "StartNoneEvent"
+        ]
+      },
+      {
+        "role": "CatchEventsMorph",
+        "baseMorphs": [
+          "CatchTimerEvent"
+        ]
+      },
+      {
+        "role": "ThrowEventsMorph",
+        "baseMorphs": [
+          "ThrowNoneEvent"
+        ]
+      },
+      {
+        "role": "BoundaryEventsMorph",
+        "baseMorphs": [
+          "ThrowNoneEvent"
+        ]
+      },
+      {
+        "role": "BoundaryCompensationEvent",
+        "baseMorphs": [
+          "BoundaryCompensationEvent"
+        ]
+      },
+      {
+        "role": "TextAnnotation",
+        "baseMorphs": [
+          "TextAnnotation"
+        ]
+      },
+      {
+        "role": "DataStore",
+        "baseMorphs": [
+          "DataStore"
+        ]
+      }
+    ]
+  }
 }
diff --git a/len-activiti/src/test/java/com/len/AppTest.java b/len-activiti/src/test/java/com/len/AppTest.java
index bfff2c5..2d2effe 100644
--- a/len-activiti/src/test/java/com/len/AppTest.java
+++ b/len-activiti/src/test/java/com/len/AppTest.java
@@ -7,32 +7,28 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
+public class AppTest
+	extends TestCase {
+	/**
+	 * Create the test case
+	 *
+	 * @param testName name of the test case
+	 */
+	public AppTest(String testName) {
+		super(testName);
+	}
 
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
+	/**
+	 * @return the suite of tests being tested
+	 */
+	public static Test suite() {
+		return new TestSuite(AppTest.class);
+	}
 
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
+	/**
+	 * Rigourous Test :-)
+	 */
+	public void testApp() {
+		assertTrue(true);
+	}
 }
diff --git a/len-activiti/src/test/java/com/len/JsonTest.java b/len-activiti/src/test/java/com/len/JsonTest.java
index a223fb1..5d2ff7c 100644
--- a/len-activiti/src/test/java/com/len/JsonTest.java
+++ b/len-activiti/src/test/java/com/len/JsonTest.java
@@ -2,11 +2,12 @@ package com.len;
 
 import com.len.entity.UserLeave;
 import com.len.util.ReType;
+import org.junit.Test;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.junit.Test;
 
 /**
  * @author zhuxiaomeng
@@ -14,24 +15,24 @@ import org.junit.Test;
  * @email lenospmiller@gmail.com
  */
 public class JsonTest {
-  @Test
-  public void json(){
-    List<UserLeave> leaves=new ArrayList<>();
-    UserLeave leave=new UserLeave();
-    /**我们模拟下数据*/
-    leave.setId("1");
-    leave.setTaskName("45151");
-    leave.setProcessInstanceId("54521");
-    leaves.add(leave);
-    ReType reType=new ReType();
-    Map<String, Map<String,Object>> map=new HashMap<>();
-    Map<String,Object> map1=new HashMap<>();
-    //我们要向UsereLeave对象中添加的 属性名 属性值
-    map1.put("aaa","aaaa");
-    // 当然也可以是其他的key 1为上面id的值
-    map.put("1",map1);
-    //node 绑定属性的id
-   String s= reType.jsonStrng(5,leaves,map,"id");
-   System.out.println(s);
-  }
+	@Test
+	public void json() {
+		List<UserLeave> leaves = new ArrayList<>();
+		UserLeave leave = new UserLeave();
+		/**我们模拟下数据*/
+		leave.setId("1");
+		leave.setTaskName("45151");
+		leave.setProcessInstanceId("54521");
+		leaves.add(leave);
+		ReType reType = new ReType();
+		Map<String, Map<String, Object>> map = new HashMap<>();
+		Map<String, Object> map1 = new HashMap<>();
+		//我们要向UsereLeave对象中添加的 属性名 属性值
+		map1.put("aaa", "aaaa");
+		// 当然也可以是其他的key 1为上面id的值
+		map.put("1", map1);
+		//node 绑定属性的id
+		String s = reType.jsonStrng(5, leaves, map, "id");
+		System.out.println(s);
+	}
 }
diff --git a/len-blog/pom.xml b/len-blog/pom.xml
index b2290c3..cb6d5f8 100644
--- a/len-blog/pom.xml
+++ b/len-blog/pom.xml
@@ -1,31 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>lenosp</artifactId>
-        <groupId>com.len</groupId>
-        <version>lenosp-2.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<artifactId>lenosp</artifactId>
+		<groupId>com.len</groupId>
+		<version>lenosp-2.0-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
 
-    <artifactId>len-blog</artifactId>
+	<artifactId>len-blog</artifactId>
 
 
-
-    <dependencies>
-        <dependency>
-            <groupId>com.len</groupId>
-            <artifactId>len-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.len</groupId>
-            <artifactId>len-sys</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file
+	<dependencies>
+		<dependency>
+			<groupId>com.len</groupId>
+			<artifactId>len-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.len</groupId>
+			<artifactId>len-sys</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/len-blog/src/main/java/com/len/config/CorsConfig.java b/len-blog/src/main/java/com/len/config/CorsConfig.java
index 481a991..caf6565 100644
--- a/len-blog/src/main/java/com/len/config/CorsConfig.java
+++ b/len-blog/src/main/java/com/len/config/CorsConfig.java
@@ -2,23 +2,21 @@ package com.len.config;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
  * 文章管理（后台）
- *
  */
 
 @Configuration
 public class CorsConfig implements WebMvcConfigurer {
 
-    @Override
-    public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**")
-                .allowedOrigins("*")
-                .allowCredentials(true)
-                .allowedMethods("GET", "POST", "DELETE", "PUT")
-                .maxAge(3600);
-    }
-}
\ No newline at end of file
+	@Override
+	public void addCorsMappings(CorsRegistry registry) {
+		registry.addMapping("/**")
+			.allowedOrigins("*")
+			.allowCredentials(true)
+			.allowedMethods("GET", "POST", "DELETE", "PUT")
+			.maxAge(3600);
+	}
+}
diff --git a/len-blog/src/main/java/com/len/controller/ArticleController.java b/len-blog/src/main/java/com/len/controller/ArticleController.java
index d71ef68..ad0fdd6 100644
--- a/len-blog/src/main/java/com/len/controller/ArticleController.java
+++ b/len-blog/src/main/java/com/len/controller/ArticleController.java
@@ -32,91 +32,91 @@ import java.util.List;
 @RequestMapping("/blog")
 public class ArticleController {
 
-    @Autowired
-    private BlogArticleService articleService;
-
-    @Autowired
-    private ArticleCategoryService articleCategoryService;
-
-    @Autowired
-    private BlogCategoryService categoryService;
-
-    private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-
-    @GetMapping("/articleList")
-    public String articleListPage() {
-        return "articleList";
-    }
-
-
-    /**
-     * 获取 文章列表
-     *
-     * @param code
-     * @param page
-     * @param limit
-     * @return
-     */
-    @GetMapping("/article/list")
-    public ReType getList(String code, Integer page, Integer limit) {
-        limit = limit > 100 ? 100 : limit;
-        Page<Object> startPage = PageHelper.startPage(page, limit);
-
-        List<Article> articles;
-        if (!StringUtils.isEmpty(code)) {
-            articles = articleService.selectArticle(code);
-        } else {
-            articles = articleService.indexSelect();
-        }
-
-        return new ReType(startPage.getTotal(), startPage.getPageNum(), articles);
-    }
-
-    /**
-     * 根据code获取文章内容
-     *
-     * @param code
-     * @return
-     */
-    @GetMapping("/article/getDetail/{code}")
-    public LenResponse detail(@PathVariable("code") String code, HttpServletRequest request) {
-        String ip = IpUtil.getIp(request);
-        return articleService.detail(code, ip);
-    }
-
-    /**
-     * 根据标签code获取文章
-     *
-     * @param tagName
-     * @param page
-     * @param limit
-     * @return
-     */
-    @GetMapping("/article/list/{tagName}")
-    public ReType getArticleByTag(@PathVariable("tagName") String tagName, Integer page, Integer limit) {
-        limit = limit > 100 ? 100 : limit;
-        Page<Object> startPage = PageHelper.startPage(page, limit);
-
-        List<Article> articles = articleService.selectArticleByTag(tagName);
-        return new ReType(startPage.getTotal(), startPage.getPageNum(), articles);
-    }
-
-    @GetMapping("/article/list/order/read")
-    public ReType getArticleByReadNumber() {
-        QueryWrapper<BlogArticle> articleQueryWrapper = new QueryWrapper<>();
-        articleQueryWrapper.orderByDesc("read_number");
-        PageHelper.startPage(1, 5);
-        List<BlogArticle> articles = articleService.list(articleQueryWrapper);
-        articles.forEach(s -> {
-            s.setContent(null);
-            String title = s.getTitle();
-            if (title.length() > 25) {
-                title = title.substring(0, 25) + "...";
-                s.setTitle(title);
-            }
-        });
-        ReType reType = new ReType();
-        reType.setData(articles);
-        return reType;
-    }
+	@Autowired
+	private BlogArticleService articleService;
+
+	@Autowired
+	private ArticleCategoryService articleCategoryService;
+
+	@Autowired
+	private BlogCategoryService categoryService;
+
+	private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+	@GetMapping("/articleList")
+	public String articleListPage() {
+		return "articleList";
+	}
+
+
+	/**
+	 * 获取 文章列表
+	 *
+	 * @param code
+	 * @param page
+	 * @param limit
+	 * @return
+	 */
+	@GetMapping("/article/list")
+	public ReType getList(String code, Integer page, Integer limit) {
+		limit = limit > 100 ? 100 : limit;
+		Page<Object> startPage = PageHelper.startPage(page, limit);
+
+		List<Article> articles;
+		if (!StringUtils.isEmpty(code)) {
+			articles = articleService.selectArticle(code);
+		} else {
+			articles = articleService.indexSelect();
+		}
+
+		return new ReType(startPage.getTotal(), startPage.getPageNum(), articles);
+	}
+
+	/**
+	 * 根据code获取文章内容
+	 *
+	 * @param code
+	 * @return
+	 */
+	@GetMapping("/article/getDetail/{code}")
+	public LenResponse detail(@PathVariable("code") String code, HttpServletRequest request) {
+		String ip = IpUtil.getIp(request);
+		return articleService.detail(code, ip);
+	}
+
+	/**
+	 * 根据标签code获取文章
+	 *
+	 * @param tagName
+	 * @param page
+	 * @param limit
+	 * @return
+	 */
+	@GetMapping("/article/list/{tagName}")
+	public ReType getArticleByTag(@PathVariable("tagName") String tagName, Integer page, Integer limit) {
+		limit = limit > 100 ? 100 : limit;
+		Page<Object> startPage = PageHelper.startPage(page, limit);
+
+		List<Article> articles = articleService.selectArticleByTag(tagName);
+		return new ReType(startPage.getTotal(), startPage.getPageNum(), articles);
+	}
+
+	@GetMapping("/article/list/order/read")
+	public ReType getArticleByReadNumber() {
+		QueryWrapper<BlogArticle> articleQueryWrapper = new QueryWrapper<>();
+		articleQueryWrapper.orderByDesc("read_number");
+		PageHelper.startPage(1, 5);
+		List<BlogArticle> articles = articleService.list(articleQueryWrapper);
+		articles.forEach(s -> {
+			s.setContent(null);
+			String title = s.getTitle();
+			if (title.length() > 25) {
+				title = title.substring(0, 25) + "...";
+				s.setTitle(title);
+			}
+		});
+		ReType reType = new ReType();
+		reType.setData(articles);
+		return reType;
+	}
 }
diff --git a/len-blog/src/main/java/com/len/controller/AuthController.java b/len-blog/src/main/java/com/len/controller/AuthController.java
index c062eb3..4cb72c6 100644
--- a/len-blog/src/main/java/com/len/controller/AuthController.java
+++ b/len-blog/src/main/java/com/len/controller/AuthController.java
@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
+ *
  */
 @CrossOrigin
 @RestController
@@ -32,67 +33,67 @@ import java.util.stream.Collectors;
 @Slf4j
 public class AuthController {
 
-    private static final String INIT_BLOG_ROLE = "blogAdmin";
+	private static final String INIT_BLOG_ROLE = "blogAdmin";
 
-    @Autowired
-    private SysUserService sysUserService;
+	@Autowired
+	private SysUserService sysUserService;
 
-    @Autowired
-    private RoleService roleService;
+	@Autowired
+	private RoleService roleService;
 
-    @Autowired
-    private RoleUserService roleUserService;
+	@Autowired
+	private RoleUserService roleUserService;
 
-    @Value("${len-blog.roles}")
-    private List<String> roles;
+	@Value("${len-blog.roles}")
+	private List<String> roles;
 
 
-    @ApiOperation(value = "/blogLogin", httpMethod = "POST", notes = "登录method")
-    @PostMapping(value = "/blogLogin")
-    public LenResponse blogLogin(SysUser user) {
-        if (StringUtils.isEmpty(user.getUsername()) || StringUtils.isEmpty(user.getPassword())) {
-            throw new UnknownAccountException("用户名或密码不能为空");
-        }
-        String pass = user.getPassword();
-        user.setPassword(null);
-        QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>(user);
-        SysUser sysUser = sysUserService.getOne(userQueryWrapper);
-        if (sysUser == null) {
-            throw new UnknownAccountException("用户名或密码错误");
-        }
-        String md5 = Md5Util.getMD5(pass, sysUser.getUsername());
-        if (!md5.equals(sysUser.getPassword())) {
-            throw new UnknownAccountException("用户名或密码错误");
-        }
+	@ApiOperation(value = "/blogLogin", httpMethod = "POST", notes = "登录method")
+	@PostMapping(value = "/blogLogin")
+	public LenResponse blogLogin(SysUser user) {
+		if (StringUtils.isEmpty(user.getUsername()) || StringUtils.isEmpty(user.getPassword())) {
+			throw new UnknownAccountException("用户名或密码不能为空");
+		}
+		String pass = user.getPassword();
+		user.setPassword(null);
+		QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>(user);
+		SysUser sysUser = sysUserService.getOne(userQueryWrapper);
+		if (sysUser == null) {
+			throw new UnknownAccountException("用户名或密码错误");
+		}
+		String md5 = Md5Util.getMD5(pass, sysUser.getUsername());
+		if (!md5.equals(sysUser.getPassword())) {
+			throw new UnknownAccountException("用户名或密码错误");
+		}
 
-        QueryWrapper<SysRoleUser> roleUserQueryWrapper = new QueryWrapper<>();
-        roleUserQueryWrapper.eq("user_id", sysUser.getId());
-        List<SysRoleUser> sysRoleUsers = roleUserService.list(roleUserQueryWrapper);
+		QueryWrapper<SysRoleUser> roleUserQueryWrapper = new QueryWrapper<>();
+		roleUserQueryWrapper.eq("user_id", sysUser.getId());
+		List<SysRoleUser> sysRoleUsers = roleUserService.list(roleUserQueryWrapper);
 
-        if (sysRoleUsers.isEmpty()) {
-            throw new UnknownAccountException("权限不足");
-        }
-        List<String> roleList = sysRoleUsers
-                .stream()
-                .map(SysRoleUser::getRoleId)
-                .collect(Collectors.toList());
+		if (sysRoleUsers.isEmpty()) {
+			throw new UnknownAccountException("权限不足");
+		}
+		List<String> roleList = sysRoleUsers
+			.stream()
+			.map(SysRoleUser::getRoleId)
+			.collect(Collectors.toList());
 
-        QueryWrapper<SysRole> roleQueryWrapper = new QueryWrapper<>();
-        roleQueryWrapper.in("id", roleList);
-        List<SysRole> sysRoles = roleService.list(roleQueryWrapper);
-        if (roles == null || roles.isEmpty()) {
-            log.error("not init blog roles!");
-            roles.add(INIT_BLOG_ROLE);
-        }
-        long isBlogAdmin = sysRoles.stream().filter(s -> roles.contains(s.getRoleName())).count();
-        if (isBlogAdmin == 0) {
-            throw new UnknownAccountException("权限不足");
-        }
-        List<String> roleNames = sysRoles
-                .stream()
-                .map(SysRole::getRoleName)
-                .collect(Collectors.toList());
+		QueryWrapper<SysRole> roleQueryWrapper = new QueryWrapper<>();
+		roleQueryWrapper.in("id", roleList);
+		List<SysRole> sysRoles = roleService.list(roleQueryWrapper);
+		if (roles == null || roles.isEmpty()) {
+			log.error("not init blog roles!");
+			roles.add(INIT_BLOG_ROLE);
+		}
+		long isBlogAdmin = sysRoles.stream().filter(s -> roles.contains(s.getRoleName())).count();
+		if (isBlogAdmin == 0) {
+			throw new UnknownAccountException("权限不足");
+		}
+		List<String> roleNames = sysRoles
+			.stream()
+			.map(SysRole::getRoleName)
+			.collect(Collectors.toList());
 
-        return new LenResponse(true, JWTUtil.sign(sysUser.getUsername(), sysUser.getId(), roleNames, sysUser.getPassword()), 200);
-    }
+		return new LenResponse(true, JWTUtil.sign(sysUser.getUsername(), sysUser.getId(), roleNames, sysUser.getPassword()), 200);
+	}
 }
diff --git a/len-blog/src/main/java/com/len/controller/BlogAdminController.java b/len-blog/src/main/java/com/len/controller/BlogAdminController.java
index 4f1768f..d84f035 100644
--- a/len-blog/src/main/java/com/len/controller/BlogAdminController.java
+++ b/len-blog/src/main/java/com/len/controller/BlogAdminController.java
@@ -4,7 +4,8 @@ import com.len.entity.ArticleDetail;
 import com.len.entity.BlogArticle;
 import com.len.entity.BlogCategory;
 import com.len.model.Article;
-import com.len.service.*;
+import com.len.service.BlogArticleService;
+import com.len.service.BlogCategoryService;
 import com.len.util.LenResponse;
 import com.len.util.ReType;
 import com.len.util.UploadUtil;
@@ -29,122 +30,122 @@ import java.util.List;
 @Slf4j
 public class BlogAdminController {
 
-    @Autowired
-    private BlogArticleService articleService;
-
-    @Value("${lenosp.imagePath}")
-    private String imagePath;
-
-    @Autowired
-    private UploadUtil uploadUtil;
-
-    @Autowired
-    private BlogCategoryService categoryService;
-
-
-    @GetMapping("/article/getList")
-    public ReType getArticleList(BlogArticle article, Integer page, Integer limit) {
-        return articleService.getList(article, page, limit);
-    }
-
-    /**
-     * 根据code获取文章明细
-     *
-     * @param code
-     * @return
-     */
-    @GetMapping("/article/getDetail/{code}")
-    public LenResponse getDetail(@PathVariable("code") String code) {
-        return articleService.getDetail(code);
-    }
-
-    @GetMapping("/article/getCategory")
-    public LenResponse getCategory() {
-        LenResponse json = new LenResponse();
-        List<BlogCategory> categories = categoryService.list();
-        categories.sort(Comparator.comparing(BlogCategory::getSequence));
-        json.setData(categories);
-        return json;
-    }
-
-    @PostMapping("/article/addImage")
-    public LenResponse addImage(MultipartHttpServletRequest request) {
-        MultipartFile multipartFile = request.getFile("file");
-        String path = uploadUtil.upload(multipartFile);
-        LenResponse json = new LenResponse();
-        StringBuffer requestURL = request.getRequestURL();
-        int serverPort = request.getServerPort();
-        int i = requestURL.indexOf(String.valueOf(serverPort));
-        String url = requestURL.substring(0, i);
-        json.setData(url + serverPort + "/img/" + path);
-        json.setFlag(true);
-        return json;
-    }
-
-    @PostMapping("/article/add")
-    public LenResponse addArticle(@RequestBody ArticleDetail detail) {
-        LenResponse json = new LenResponse();
-        json.setStatus(400);
-        Article article = detail.getArticle();
-        if (article == null) {
-            json.setMsg("数据获取失败");
-            return json;
-        }
-        if (StringUtils.isEmpty(article.getTitle())) {
-            json.setMsg("标题不能为空");
-            return json;
-        }
-        if (StringUtils.isEmpty(article.getContent())) {
-            json.setMsg("内容不能为空");
-            return json;
-        }
-        if (detail.getCategory().isEmpty()) {
-            json.setMsg("类别不能为空");
-            return json;
-        }
-        if (detail.getTags().isEmpty()) {
-            json.setMsg("标签不能为空");
-            return json;
-        }
-
-        articleService.addArticle(detail);
-        json.setStatus(200);
-        json.setMsg("文章发表成功");
-        return json;
-    }
-
-    @PostMapping("/article/update")
-    public LenResponse updateArticle(@RequestBody ArticleDetail detail) {
-        LenResponse json = new LenResponse();
-        Article article = detail.getArticle();
-        json.setFlag(false);
-        json.setStatus(400);
-        if (StringUtils.isBlank(article.getId())) {
-            json.setMsg("数据获取失败");
-            return json;
-        }
-        if (StringUtils.isBlank(article.getTitle())) {
-            json.setMsg("标题不能为空");
-            return json;
-        }
-        if (StringUtils.isBlank(article.getContent())) {
-            json.setMsg("内容不能为空");
-            return json;
-        }
-        List<String> categoryIds = detail.getCategory();
-        if (categoryIds.isEmpty()) {
-            json.setMsg("类别不能为空");
-            return json;
-        }
-        List<String> tags = detail.getTags();
-        if (tags.isEmpty()) {
-            json.setMsg("标签不能为空");
-            return json;
-        }
-        articleService.updateArticle(article, categoryIds, tags);
-        json.setStatus(200);
-        json.setMsg("更新成功");
-        return json;
-    }
+	@Autowired
+	private BlogArticleService articleService;
+
+	@Value("${lenosp.imagePath}")
+	private String imagePath;
+
+	@Autowired
+	private UploadUtil uploadUtil;
+
+	@Autowired
+	private BlogCategoryService categoryService;
+
+
+	@GetMapping("/article/getList")
+	public ReType getArticleList(BlogArticle article, Integer page, Integer limit) {
+		return articleService.getList(article, page, limit);
+	}
+
+	/**
+	 * 根据code获取文章明细
+	 *
+	 * @param code
+	 * @return
+	 */
+	@GetMapping("/article/getDetail/{code}")
+	public LenResponse getDetail(@PathVariable("code") String code) {
+		return articleService.getDetail(code);
+	}
+
+	@GetMapping("/article/getCategory")
+	public LenResponse getCategory() {
+		LenResponse json = new LenResponse();
+		List<BlogCategory> categories = categoryService.list();
+		categories.sort(Comparator.comparing(BlogCategory::getSequence));
+		json.setData(categories);
+		return json;
+	}
+
+	@PostMapping("/article/addImage")
+	public LenResponse addImage(MultipartHttpServletRequest request) {
+		MultipartFile multipartFile = request.getFile("file");
+		String path = uploadUtil.upload(multipartFile);
+		LenResponse json = new LenResponse();
+		StringBuffer requestURL = request.getRequestURL();
+		int serverPort = request.getServerPort();
+		int i = requestURL.indexOf(String.valueOf(serverPort));
+		String url = requestURL.substring(0, i);
+		json.setData(url + serverPort + "/img/" + path);
+		json.setFlag(true);
+		return json;
+	}
+
+	@PostMapping("/article/add")
+	public LenResponse addArticle(@RequestBody ArticleDetail detail) {
+		LenResponse json = new LenResponse();
+		json.setStatus(400);
+		Article article = detail.getArticle();
+		if (article == null) {
+			json.setMsg("数据获取失败");
+			return json;
+		}
+		if (StringUtils.isEmpty(article.getTitle())) {
+			json.setMsg("标题不能为空");
+			return json;
+		}
+		if (StringUtils.isEmpty(article.getContent())) {
+			json.setMsg("内容不能为空");
+			return json;
+		}
+		if (detail.getCategory().isEmpty()) {
+			json.setMsg("类别不能为空");
+			return json;
+		}
+		if (detail.getTags().isEmpty()) {
+			json.setMsg("标签不能为空");
+			return json;
+		}
+
+		articleService.addArticle(detail);
+		json.setStatus(200);
+		json.setMsg("文章发表成功");
+		return json;
+	}
+
+	@PostMapping("/article/update")
+	public LenResponse updateArticle(@RequestBody ArticleDetail detail) {
+		LenResponse json = new LenResponse();
+		Article article = detail.getArticle();
+		json.setFlag(false);
+		json.setStatus(400);
+		if (StringUtils.isBlank(article.getId())) {
+			json.setMsg("数据获取失败");
+			return json;
+		}
+		if (StringUtils.isBlank(article.getTitle())) {
+			json.setMsg("标题不能为空");
+			return json;
+		}
+		if (StringUtils.isBlank(article.getContent())) {
+			json.setMsg("内容不能为空");
+			return json;
+		}
+		List<String> categoryIds = detail.getCategory();
+		if (categoryIds.isEmpty()) {
+			json.setMsg("类别不能为空");
+			return json;
+		}
+		List<String> tags = detail.getTags();
+		if (tags.isEmpty()) {
+			json.setMsg("标签不能为空");
+			return json;
+		}
+		articleService.updateArticle(article, categoryIds, tags);
+		json.setStatus(200);
+		json.setMsg("更新成功");
+		return json;
+	}
 
 }
diff --git a/len-blog/src/main/java/com/len/controller/BlogCategoryController.java b/len-blog/src/main/java/com/len/controller/BlogCategoryController.java
index 9c699d5..ef25e1d 100644
--- a/len-blog/src/main/java/com/len/controller/BlogCategoryController.java
+++ b/len-blog/src/main/java/com/len/controller/BlogCategoryController.java
@@ -18,21 +18,21 @@ import java.util.*;
 @RequestMapping("/blog")
 public class BlogCategoryController {
 
-    @Autowired
-    private BlogCategoryService categoryService;
+	@Autowired
+	private BlogCategoryService categoryService;
 
 
-    @GetMapping("/menu")
-    public List<Map> menuList() {
-        List<BlogCategory> categories = categoryService.list();
-        categories.sort(Comparator.comparing(BlogCategory::getSequence));
-        List<Map> cates = new ArrayList<>();
-        for (BlogCategory category : categories) {
-            Map<String, String> cateMap = new HashMap<>(2);
-            cateMap.put("name", category.getName());
-            cateMap.put("code", category.getCode());
-            cates.add(cateMap);
-        }
-        return cates;
-    }
+	@GetMapping("/menu")
+	public List<Map> menuList() {
+		List<BlogCategory> categories = categoryService.list();
+		categories.sort(Comparator.comparing(BlogCategory::getSequence));
+		List<Map> cates = new ArrayList<>();
+		for (BlogCategory category : categories) {
+			Map<String, String> cateMap = new HashMap<>(2);
+			cateMap.put("name", category.getName());
+			cateMap.put("code", category.getCode());
+			cates.add(cateMap);
+		}
+		return cates;
+	}
 }
diff --git a/len-blog/src/main/java/com/len/controller/TagController.java b/len-blog/src/main/java/com/len/controller/TagController.java
index 88053d5..c807799 100644
--- a/len-blog/src/main/java/com/len/controller/TagController.java
+++ b/len-blog/src/main/java/com/len/controller/TagController.java
@@ -24,32 +24,30 @@ import java.util.List;
 @RequestMapping("/blog")
 public class TagController extends BaseController {
 
-    @Autowired
-    private BlogTagService blogLabelService;
+	private static String[] color = {"primary", "success", "error", "warning"};
+	@Autowired
+	private BlogTagService blogLabelService;
+	@Autowired
+	private BlogArticleService articleService;
 
-    @Autowired
-    private BlogArticleService articleService;
-
-    private static String[] color = {"primary", "success", "error", "warning"};
-
-    /**
-     * 获取标签 后期增加规则 颜色后期处理成浅色 好看
-     *
-     * @return
-     */
-    @GetMapping("/getTag")
-    public JSONArray label() {
-        List<BlogTag> blogLabels = blogLabelService.list();
-        JSONArray array = JSONArray.parseArray(JSON.toJSONString(blogLabels));
-        int i = 0;
-        JSONObject object;
-        for (Object o : array) {
-            i = i == 4 ? 0 : i;
-            object = (JSONObject) o;
-            object.put("color", color[i]);
-            object.remove("id");
-            i++;
-        }
-        return array;
-    }
+	/**
+	 * 获取标签 后期增加规则 颜色后期处理成浅色 好看
+	 *
+	 * @return
+	 */
+	@GetMapping("/getTag")
+	public JSONArray label() {
+		List<BlogTag> blogLabels = blogLabelService.list();
+		JSONArray array = JSONArray.parseArray(JSON.toJSONString(blogLabels));
+		int i = 0;
+		JSONObject object;
+		for (Object o : array) {
+			i = i == 4 ? 0 : i;
+			object = (JSONObject) o;
+			object.put("color", color[i]);
+			object.remove("id");
+			i++;
+		}
+		return array;
+	}
 }
diff --git a/len-blog/src/main/java/com/len/core/BlogRealm.java b/len-blog/src/main/java/com/len/core/BlogRealm.java
index 42b22e5..eca5c0a 100644
--- a/len-blog/src/main/java/com/len/core/BlogRealm.java
+++ b/len-blog/src/main/java/com/len/core/BlogRealm.java
@@ -18,66 +18,67 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
+ *
  */
 @Service
 public class BlogRealm extends AuthorizingRealm {
 
-    @Autowired
-    private SysUserService userService;
+	@Autowired
+	private SysUserService userService;
 
 
-    @Override
-    public boolean supports(AuthenticationToken token) {
-        return token instanceof JwtToken;
-    }
+	@Override
+	public boolean supports(AuthenticationToken token) {
+		return token instanceof JwtToken;
+	}
 
-    /**
-     * 获取认证
-     *
-     * @param principalCollection
-     * @return
-     */
-    @Override
-    protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principalCollection) {
-        SimpleAuthorizationInfo info = new SimpleAuthorizationInfo();
-        CurrentUser user = (CurrentUser) principalCollection.getPrimaryPrincipal();
-        JWTUtil.getUsername(user.getUsername());
-        //根据用户获取角色 根据角色获取所有按钮权限
-        CurrentUser cUser = (CurrentUser) Principal.getSession().getAttribute("currentPrincipal");
-        for (CurrentRole cRole : cUser.getCurrentRoleList()) {
-            info.addRole(cRole.getId());
-        }
-        for (CurrentMenu cMenu : cUser.getCurrentMenuList()) {
-            if (!StringUtils.isEmpty(cMenu.getPermission())) {
-                info.addStringPermission(cMenu.getPermission());
-            }
-        }
-        return info;
-    }
+	/**
+	 * 获取认证
+	 *
+	 * @param principalCollection
+	 * @return
+	 */
+	@Override
+	protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principalCollection) {
+		SimpleAuthorizationInfo info = new SimpleAuthorizationInfo();
+		CurrentUser user = (CurrentUser) principalCollection.getPrimaryPrincipal();
+		JWTUtil.getUsername(user.getUsername());
+		//根据用户获取角色 根据角色获取所有按钮权限
+		CurrentUser cUser = (CurrentUser) Principal.getSession().getAttribute("currentPrincipal");
+		for (CurrentRole cRole : cUser.getCurrentRoleList()) {
+			info.addRole(cRole.getId());
+		}
+		for (CurrentMenu cMenu : cUser.getCurrentMenuList()) {
+			if (!StringUtils.isEmpty(cMenu.getPermission())) {
+				info.addStringPermission(cMenu.getPermission());
+			}
+		}
+		return info;
+	}
 
-    /**
-     * 获取授权
-     *
-     * @param authenticationToken
-     * @return
-     * @throws AuthenticationException
-     */
-    @Override
-    protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authenticationToken)
-            throws AuthenticationException {
-        JwtToken token = (JwtToken) authenticationToken;
-        String username = JWTUtil.getUsername(token.getToken());
-        if (StringUtils.isEmpty(username)) {
-            throw new UnknownAccountException("令牌无效");
-        }
-        SysUser s = userService.login(username);
-        if (s == null) {
-            throw new UnknownAccountException("用户名或密码错误");
-        }
-        if (!JWTUtil.verify(token.getToken(), username, s.getPassword())) {
-            throw new UnknownAccountException("用户名或密码错误");
-        }
+	/**
+	 * 获取授权
+	 *
+	 * @param authenticationToken
+	 * @return
+	 * @throws AuthenticationException
+	 */
+	@Override
+	protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authenticationToken)
+		throws AuthenticationException {
+		JwtToken token = (JwtToken) authenticationToken;
+		String username = JWTUtil.getUsername(token.getToken());
+		if (StringUtils.isEmpty(username)) {
+			throw new UnknownAccountException("令牌无效");
+		}
+		SysUser s = userService.login(username);
+		if (s == null) {
+			throw new UnknownAccountException("用户名或密码错误");
+		}
+		if (!JWTUtil.verify(token.getToken(), username, s.getPassword())) {
+			throw new UnknownAccountException("用户名或密码错误");
+		}
 
-        return new SimpleAuthenticationInfo(token.getToken(), token.getToken(), getName());
-    }
+		return new SimpleAuthenticationInfo(token.getToken(), token.getToken(), getName());
+	}
 }
diff --git a/len-blog/src/main/java/com/len/core/LenUser.java b/len-blog/src/main/java/com/len/core/LenUser.java
index 3ea3f51..dcad39a 100644
--- a/len-blog/src/main/java/com/len/core/LenUser.java
+++ b/len-blog/src/main/java/com/len/core/LenUser.java
@@ -8,17 +8,17 @@ import org.apache.shiro.subject.Subject;
 
 
 public class LenUser {
-    public static Principal getPrincipal() {
-        Subject subject = SecurityUtils.getSubject();
-        if (subject != null) {
-            Object principal = subject.getPrincipal();
-            if (principal != null) {
-                return JWTUtil.getPrincipal(principal.toString());
-            } else {
-                throw new UnknownAccountException("current user null");
-            }
-        } else {
-            throw new UnknownAccountException("current user null");
-        }
-    }
+	public static Principal getPrincipal() {
+		Subject subject = SecurityUtils.getSubject();
+		if (subject != null) {
+			Object principal = subject.getPrincipal();
+			if (principal != null) {
+				return JWTUtil.getPrincipal(principal.toString());
+			} else {
+				throw new UnknownAccountException("current user null");
+			}
+		} else {
+			throw new UnknownAccountException("current user null");
+		}
+	}
 }
diff --git a/len-blog/src/main/java/com/len/core/MyBasicHttpAuthenticationFilter.java b/len-blog/src/main/java/com/len/core/MyBasicHttpAuthenticationFilter.java
index 9fa48fb..f8b280c 100644
--- a/len-blog/src/main/java/com/len/core/MyBasicHttpAuthenticationFilter.java
+++ b/len-blog/src/main/java/com/len/core/MyBasicHttpAuthenticationFilter.java
@@ -13,37 +13,37 @@ import javax.servlet.http.HttpServletResponse;
 
 public class MyBasicHttpAuthenticationFilter extends BasicHttpAuthenticationFilter {
 
-    @Override
-    protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
-        if (isLoginAttempt(request, response)) {
-            try {
-                executeLogin(request, response);
-                return true;
-            } catch (Exception e) {
-            }
-        }
-        return false;
-    }
-
-    @Override
-    protected boolean executeLogin(ServletRequest request, ServletResponse response) throws Exception {
-        HttpServletRequest httpServletRequest = (HttpServletRequest) request;
-        String token = httpServletRequest.getHeader("Authorization");
-        JwtToken jwtToken = new JwtToken(token, LoginType.BLOG);
-        getSubject(request, response).login(jwtToken);
-        return true;
-    }
-
-    @Override
-    protected boolean isLoginAttempt(ServletRequest request, ServletResponse response) {
-        HttpServletRequest req = (HttpServletRequest) request;
-        String authorization = req.getHeader("Authorization");
-        return authorization != null;
-    }
-
-    @Override
-    protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
-        WebUtils.toHttp(response).sendError(HttpServletResponse.SC_UNAUTHORIZED,"访问被拒绝");
-        return false;
-    }
+	@Override
+	protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
+		if (isLoginAttempt(request, response)) {
+			try {
+				executeLogin(request, response);
+				return true;
+			} catch (Exception e) {
+			}
+		}
+		return false;
+	}
+
+	@Override
+	protected boolean executeLogin(ServletRequest request, ServletResponse response) throws Exception {
+		HttpServletRequest httpServletRequest = (HttpServletRequest) request;
+		String token = httpServletRequest.getHeader("Authorization");
+		JwtToken jwtToken = new JwtToken(token, LoginType.BLOG);
+		getSubject(request, response).login(jwtToken);
+		return true;
+	}
+
+	@Override
+	protected boolean isLoginAttempt(ServletRequest request, ServletResponse response) {
+		HttpServletRequest req = (HttpServletRequest) request;
+		String authorization = req.getHeader("Authorization");
+		return authorization != null;
+	}
+
+	@Override
+	protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
+		WebUtils.toHttp(response).sendError(HttpServletResponse.SC_UNAUTHORIZED, "访问被拒绝");
+		return false;
+	}
 }
diff --git a/len-blog/src/main/java/com/len/core/exception/CustomException.java b/len-blog/src/main/java/com/len/core/exception/CustomException.java
index 7a6c311..be71df5 100644
--- a/len-blog/src/main/java/com/len/core/exception/CustomException.java
+++ b/len-blog/src/main/java/com/len/core/exception/CustomException.java
@@ -13,21 +13,21 @@ import org.springframework.web.bind.annotation.RestControllerAdvice;
 public class CustomException {
 
 
-    @ResponseStatus(HttpStatus.UNAUTHORIZED)
-    @ExceptionHandler(AuthenticationException.class)
-    public LenResponse getAuthenticationException(AuthenticationException e) {
-        return new LenResponse(false, e.getMessage(), 401);
-    }
+	@ResponseStatus(HttpStatus.UNAUTHORIZED)
+	@ExceptionHandler(AuthenticationException.class)
+	public LenResponse getAuthenticationException(AuthenticationException e) {
+		return new LenResponse(false, e.getMessage(), 401);
+	}
 
-    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
-    @ExceptionHandler(UnknownAccountException.class)
-    public LenResponse getUnknownAccountException(UnknownAccountException e) {
-        return new LenResponse(false, e.getMessage(), 401);
-    }
+	@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+	@ExceptionHandler(UnknownAccountException.class)
+	public LenResponse getUnknownAccountException(UnknownAccountException e) {
+		return new LenResponse(false, e.getMessage(), 401);
+	}
 
-    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
-    @ExceptionHandler(UnauthorizedException.class)
-    public LenResponse getUnauthorizedException(UnauthorizedException e) {
-        return new LenResponse(false, e.getMessage(), 401);
-    }
+	@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+	@ExceptionHandler(UnauthorizedException.class)
+	public LenResponse getUnauthorizedException(UnauthorizedException e) {
+		return new LenResponse(false, e.getMessage(), 401);
+	}
 }
diff --git a/len-blog/src/main/java/com/len/core/exception/UnauthorizedException.java b/len-blog/src/main/java/com/len/core/exception/UnauthorizedException.java
index 8b2d503..831cce2 100644
--- a/len-blog/src/main/java/com/len/core/exception/UnauthorizedException.java
+++ b/len-blog/src/main/java/com/len/core/exception/UnauthorizedException.java
@@ -4,7 +4,7 @@ package com.len.core.exception;
  * 未授权异常
  */
 public class UnauthorizedException extends RuntimeException {
-    public UnauthorizedException(String msg) {
-        super(msg);
-    }
+	public UnauthorizedException(String msg) {
+		super(msg);
+	}
 }
diff --git a/len-blog/src/main/java/com/len/entity/ArticleCategory.java b/len-blog/src/main/java/com/len/entity/ArticleCategory.java
index 85fb402..7fab679 100644
--- a/len-blog/src/main/java/com/len/entity/ArticleCategory.java
+++ b/len-blog/src/main/java/com/len/entity/ArticleCategory.java
@@ -8,58 +8,58 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 @TableName(value = "blog_article_category")
 public class ArticleCategory {
-    @TableId(value = "id", type = IdType.UUID)
-    private String id;
+	@TableId(value = "id", type = IdType.UUID)
+	private String id;
 
-    /**
-     * 文章id
-     */
-    @TableField(value = "article_id")
-    private String articleId;
+	/**
+	 * 文章id
+	 */
+	@TableField(value = "article_id")
+	private String articleId;
 
-    /**
-     * 标签id
-     */
-    @TableField(value = "category_id")
-    private String categoryId;
+	/**
+	 * 标签id
+	 */
+	@TableField(value = "category_id")
+	private String categoryId;
 
-    /**
-     * @return id
-     */
-    public String getId() {
-        return id;
-    }
+	/**
+	 * @return id
+	 */
+	public String getId() {
+		return id;
+	}
 
-    /**
-     * @param id
-     */
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
+	/**
+	 * @param id
+	 */
+	public void setId(String id) {
+		this.id = id == null ? null : id.trim();
+	}
 
-    /**
-     * 获取文章id
-     *
-     * @return article_id - 文章id
-     */
-    public String getArticleId() {
-        return articleId;
-    }
+	/**
+	 * 获取文章id
+	 *
+	 * @return article_id - 文章id
+	 */
+	public String getArticleId() {
+		return articleId;
+	}
 
-    /**
-     * 设置文章id
-     *
-     * @param articleId 文章id
-     */
-    public void setArticleId(String articleId) {
-        this.articleId = articleId == null ? null : articleId.trim();
-    }
+	/**
+	 * 设置文章id
+	 *
+	 * @param articleId 文章id
+	 */
+	public void setArticleId(String articleId) {
+		this.articleId = articleId == null ? null : articleId.trim();
+	}
 
-    public String getCategoryId() {
-        return categoryId;
-    }
+	public String getCategoryId() {
+		return categoryId;
+	}
 
-    public void setCategoryId(String categoryId) {
-        this.categoryId = categoryId;
-    }
-}
\ No newline at end of file
+	public void setCategoryId(String categoryId) {
+		this.categoryId = categoryId;
+	}
+}
diff --git a/len-blog/src/main/java/com/len/entity/ArticleDetail.java b/len-blog/src/main/java/com/len/entity/ArticleDetail.java
index e0c10ae..0be943f 100644
--- a/len-blog/src/main/java/com/len/entity/ArticleDetail.java
+++ b/len-blog/src/main/java/com/len/entity/ArticleDetail.java
@@ -10,28 +10,28 @@ import java.util.List;
 
 @Data
 public class ArticleDetail {
-    /**
-     * 文章对象
-     */
-    Article article;
-    /**
-     * 文章标签
-     */
-    private List<String> tags = new ArrayList<>();
-
-    /**
-     * 文章类别
-     */
-    private List<String> category = new ArrayList<>();
-
-    /**
-     * 上一篇
-     */
-    private SimpleArticle previous;
-
-    /**
-     * 下一篇
-     */
-    private SimpleArticle next;
+	/**
+	 * 文章对象
+	 */
+	Article article;
+	/**
+	 * 文章标签
+	 */
+	private List<String> tags = new ArrayList<>();
+
+	/**
+	 * 文章类别
+	 */
+	private List<String> category = new ArrayList<>();
+
+	/**
+	 * 上一篇
+	 */
+	private SimpleArticle previous;
+
+	/**
+	 * 下一篇
+	 */
+	private SimpleArticle next;
 
 }
diff --git a/len-blog/src/main/java/com/len/entity/ArticleList.java b/len-blog/src/main/java/com/len/entity/ArticleList.java
index ac3807d..b2fff48 100644
--- a/len-blog/src/main/java/com/len/entity/ArticleList.java
+++ b/len-blog/src/main/java/com/len/entity/ArticleList.java
@@ -2,36 +2,34 @@ package com.len.entity;
 
 import lombok.Data;
 
-import java.util.Date;
-
 
 @Data
 public class ArticleList {
 
-    private String id;
+	private String id;
 
-    private String code;
+	private String code;
 
-    private String title;
+	private String title;
 
-    private Integer topNum;
+	private Integer topNum;
 
-    private String createBy;
+	private String createBy;
 
-    private String createDate;
+	private String createDate;
 
-    private String content;
+	private String content;
 
-    public ArticleList() {
-    }
+	public ArticleList() {
+	}
 
-    public ArticleList(String id, String code, String title, Integer topNum, String createBy, String createDate,String content) {
-        this.id = id;
-        this.code = code;
-        this.title = title;
-        this.topNum = topNum;
-        this.createBy = createBy;
-        this.createDate = createDate;
-        this.content=content;
-    }
+	public ArticleList(String id, String code, String title, Integer topNum, String createBy, String createDate, String content) {
+		this.id = id;
+		this.code = code;
+		this.title = title;
+		this.topNum = topNum;
+		this.createBy = createBy;
+		this.createDate = createDate;
+		this.content = content;
+	}
 }
diff --git a/len-blog/src/main/java/com/len/entity/ArticleTag.java b/len-blog/src/main/java/com/len/entity/ArticleTag.java
index 701aac9..c19e97a 100644
--- a/len-blog/src/main/java/com/len/entity/ArticleTag.java
+++ b/len-blog/src/main/java/com/len/entity/ArticleTag.java
@@ -8,37 +8,37 @@ import com.baomidou.mybatisplus.annotation.TableName;
 @TableName(value = "blog_article_tag")
 public class ArticleTag {
 
-    @TableId(value = "article_id", type = IdType.UUID)
-    private String articleId;
-
-    @TableField(value = "tag_id")
-    private String tagId;
-
-    /**
-     * @return article_id
-     */
-    public String getArticleId() {
-        return articleId;
-    }
-
-    /**
-     * @param articleId
-     */
-    public void setArticleId(String articleId) {
-        this.articleId = articleId == null ? null : articleId.trim();
-    }
-
-    /**
-     * @return tag_id
-     */
-    public String getTagId() {
-        return tagId;
-    }
-
-    /**
-     * @param tagId
-     */
-    public void setTagId(String tagId) {
-        this.tagId = tagId == null ? null : tagId.trim();
-    }
-}
\ No newline at end of file
+	@TableId(value = "article_id", type = IdType.UUID)
+	private String articleId;
+
+	@TableField(value = "tag_id")
+	private String tagId;
+
+	/**
+	 * @return article_id
+	 */
+	public String getArticleId() {
+		return articleId;
+	}
+
+	/**
+	 * @param articleId
+	 */
+	public void setArticleId(String articleId) {
+		this.articleId = articleId == null ? null : articleId.trim();
+	}
+
+	/**
+	 * @return tag_id
+	 */
+	public String getTagId() {
+		return tagId;
+	}
+
+	/**
+	 * @param tagId
+	 */
+	public void setTagId(String tagId) {
+		this.tagId = tagId == null ? null : tagId.trim();
+	}
+}
diff --git a/len-blog/src/main/java/com/len/entity/BlogArticle.java b/len-blog/src/main/java/com/len/entity/BlogArticle.java
index a66d6d8..7c85bb1 100644
--- a/len-blog/src/main/java/com/len/entity/BlogArticle.java
+++ b/len-blog/src/main/java/com/len/entity/BlogArticle.java
@@ -12,60 +12,60 @@ import java.util.Date;
 @Data
 public class BlogArticle {
 
-    @TableId(value = "id", type = IdType.UUID)
-    private String id;
+	@TableId(value = "id", type = IdType.UUID)
+	private String id;
 
-    /**
-     * code
-     */
-    @TableField(value = "code")
-    private String code;
+	/**
+	 * code
+	 */
+	@TableField(value = "code")
+	private String code;
 
 
-    /**
-     * 标题
-     */
-    @TableField(value = "title")
-    private String title;
+	/**
+	 * 标题
+	 */
+	@TableField(value = "title")
+	private String title;
 
-    /**
-     * 列表缩略图
-     */
-    @TableField(value="first_img")
-    private String firstImg;
+	/**
+	 * 列表缩略图
+	 */
+	@TableField(value = "first_img")
+	private String firstImg;
 
-    /**
-     * 阅读次数
-     */
-    @TableField(value = "read_number")
-    private Integer readNumber;
+	/**
+	 * 阅读次数
+	 */
+	@TableField(value = "read_number")
+	private Integer readNumber;
 
-    /**
-     * 次序(置顶功能)
-     */
-    @TableField(value = "top_num")
-    private Integer topNum;
+	/**
+	 * 次序(置顶功能)
+	 */
+	@TableField(value = "top_num")
+	private Integer topNum;
 
-    @TableField(value = "create_by")
-    private String createBy;
+	@TableField(value = "create_by")
+	private String createBy;
 
-    @TableField(value = "update_by")
-    private String updateBy;
+	@TableField(value = "update_by")
+	private String updateBy;
 
-    @TableField(value = "create_date")
-    private Date createDate;
+	@TableField(value = "create_date")
+	private Date createDate;
 
-    @TableField(value = "update_date")
-    private Date updateDate;
+	@TableField(value = "update_date")
+	private Date updateDate;
 
-    /**
-     * 文章内容
-     */
-    @TableField(value = "content")
-    private String content;
+	/**
+	 * 文章内容
+	 */
+	@TableField(value = "content")
+	private String content;
 
-    @TableField(value = "del_flag")
-    private Byte delFlag;
+	@TableField(value = "del_flag")
+	private Byte delFlag;
 
 
-}
\ No newline at end of file
+}
diff --git a/len-blog/src/main/java/com/len/entity/BlogCategory.java b/len-blog/src/main/java/com/len/entity/BlogCategory.java
index 0c58604..43e0922 100644
--- a/len-blog/src/main/java/com/len/entity/BlogCategory.java
+++ b/len-blog/src/main/java/com/len/entity/BlogCategory.java
@@ -9,172 +9,172 @@ import java.util.Date;
 
 @TableName(value = "blog_category")
 public class BlogCategory {
-    @TableId(value = "id", type = IdType.UUID)
-    private String id;
-
-    @TableField(value="sequence")
-    private Byte sequence;
-
-    /**
-     * 搜索code
-     */
-    @TableField(value="code")
-    private String code;
-
-    /**
-     * 类别名称
-     */
-    @TableField(value="name")
-    private String name;
-
-    /**
-     * 上层id(目前最多两次层)
-     */
-    @TableField(value = "parent_id")
-    private String parentId;
-
-    @TableField(value = "create_by")
-    private String createBy;
-
-    @TableField(value = "update_by")
-    private String updateBy;
-
-    @TableField(value = "create_date")
-    private Date createDate;
-
-    @TableField(value = "update_date")
-    private Date updateDate;
-
-    /**
-     * @return id
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
-
-
-    public Byte getSequence() {
-        return sequence;
-    }
-
-    public void setSequence(Byte sequence) {
-        this.sequence = sequence;
-    }
-
-    /**
-     * 获取搜索code
-     *
-     * @return code - 搜索code
-     */
-    public String getCode() {
-        return code;
-    }
-
-    /**
-     * 设置搜索code
-     *
-     * @param code 搜索code
-     */
-    public void setCode(String code) {
-        this.code = code == null ? null : code.trim();
-    }
-
-    /**
-     * 获取类别名称
-     *
-     * @return name - 类别名称
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * 设置类别名称
-     *
-     * @param name 类别名称
-     */
-    public void setName(String name) {
-        this.name = name == null ? null : name.trim();
-    }
-
-    /**
-     * 获取上层id(目前最多两次层)
-     *
-     * @return parent_id - 上层id(目前最多两次层)
-     */
-    public String getParentId() {
-        return parentId;
-    }
-
-    /**
-     * 设置上层id(目前最多两次层)
-     *
-     * @param parentId 上层id(目前最多两次层)
-     */
-    public void setParentId(String parentId) {
-        this.parentId = parentId == null ? null : parentId.trim();
-    }
-
-    /**
-     * @return create_by
-     */
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    /**
-     * @param createBy
-     */
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy == null ? null : createBy.trim();
-    }
-
-    /**
-     * @return update_by
-     */
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    /**
-     * @param updateBy
-     */
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy == null ? null : updateBy.trim();
-    }
-
-    /**
-     * @return create_date
-     */
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    /**
-     * @param createDate
-     */
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    /**
-     * @return update_date
-     */
-    public Date getUpdateDate() {
-        return updateDate;
-    }
-
-    /**
-     * @param updateDate
-     */
-    public void setUpdateDate(Date updateDate) {
-        this.updateDate = updateDate;
-    }
-}
\ No newline at end of file
+	@TableId(value = "id", type = IdType.UUID)
+	private String id;
+
+	@TableField(value = "sequence")
+	private Byte sequence;
+
+	/**
+	 * 搜索code
+	 */
+	@TableField(value = "code")
+	private String code;
+
+	/**
+	 * 类别名称
+	 */
+	@TableField(value = "name")
+	private String name;
+
+	/**
+	 * 上层id(目前最多两次层)
+	 */
+	@TableField(value = "parent_id")
+	private String parentId;
+
+	@TableField(value = "create_by")
+	private String createBy;
+
+	@TableField(value = "update_by")
+	private String updateBy;
+
+	@TableField(value = "create_date")
+	private Date createDate;
+
+	@TableField(value = "update_date")
+	private Date updateDate;
+
+	/**
+	 * @return id
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * @param id
+	 */
+	public void setId(String id) {
+		this.id = id == null ? null : id.trim();
+	}
+
+
+	public Byte getSequence() {
+		return sequence;
+	}
+
+	public void setSequence(Byte sequence) {
+		this.sequence = sequence;
+	}
+
+	/**
+	 * 获取搜索code
+	 *
+	 * @return code - 搜索code
+	 */
+	public String getCode() {
+		return code;
+	}
+
+	/**
+	 * 设置搜索code
+	 *
+	 * @param code 搜索code
+	 */
+	public void setCode(String code) {
+		this.code = code == null ? null : code.trim();
+	}
+
+	/**
+	 * 获取类别名称
+	 *
+	 * @return name - 类别名称
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * 设置类别名称
+	 *
+	 * @param name 类别名称
+	 */
+	public void setName(String name) {
+		this.name = name == null ? null : name.trim();
+	}
+
+	/**
+	 * 获取上层id(目前最多两次层)
+	 *
+	 * @return parent_id - 上层id(目前最多两次层)
+	 */
+	public String getParentId() {
+		return parentId;
+	}
+
+	/**
+	 * 设置上层id(目前最多两次层)
+	 *
+	 * @param parentId 上层id(目前最多两次层)
+	 */
+	public void setParentId(String parentId) {
+		this.parentId = parentId == null ? null : parentId.trim();
+	}
+
+	/**
+	 * @return create_by
+	 */
+	public String getCreateBy() {
+		return createBy;
+	}
+
+	/**
+	 * @param createBy
+	 */
+	public void setCreateBy(String createBy) {
+		this.createBy = createBy == null ? null : createBy.trim();
+	}
+
+	/**
+	 * @return update_by
+	 */
+	public String getUpdateBy() {
+		return updateBy;
+	}
+
+	/**
+	 * @param updateBy
+	 */
+	public void setUpdateBy(String updateBy) {
+		this.updateBy = updateBy == null ? null : updateBy.trim();
+	}
+
+	/**
+	 * @return create_date
+	 */
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	/**
+	 * @param createDate
+	 */
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	/**
+	 * @return update_date
+	 */
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+
+	/**
+	 * @param updateDate
+	 */
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+}
diff --git a/len-blog/src/main/java/com/len/entity/BlogTag.java b/len-blog/src/main/java/com/len/entity/BlogTag.java
index 054713b..3755c7e 100644
--- a/len-blog/src/main/java/com/len/entity/BlogTag.java
+++ b/len-blog/src/main/java/com/len/entity/BlogTag.java
@@ -7,68 +7,68 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 @TableName(value = "blog_tag")
 public class BlogTag {
-    @TableId(value = "id", type = IdType.UUID)
-    private String id;
+	@TableId(value = "id", type = IdType.UUID)
+	private String id;
 
-    /**
-     * 标签code
-     */
-    @TableField(value = "tag_code")
-    private String tagCode;
+	/**
+	 * 标签code
+	 */
+	@TableField(value = "tag_code")
+	private String tagCode;
 
-    /**
-     * 标签name
-     */
-    @TableField(value = "tag_name")
-    private String tagName;
+	/**
+	 * 标签name
+	 */
+	@TableField(value = "tag_name")
+	private String tagName;
 
-    /**
-     * @return id
-     */
-    public String getId() {
-        return id;
-    }
+	/**
+	 * @return id
+	 */
+	public String getId() {
+		return id;
+	}
 
-    /**
-     * @param id
-     */
-    public void setId(String id) {
-        this.id = id == null ? null : id.trim();
-    }
+	/**
+	 * @param id
+	 */
+	public void setId(String id) {
+		this.id = id == null ? null : id.trim();
+	}
 
-    /**
-     * 获取标签code
-     *
-     * @return tag_code - 标签code
-     */
-    public String getTagCode() {
-        return tagCode;
-    }
+	/**
+	 * 获取标签code
+	 *
+	 * @return tag_code - 标签code
+	 */
+	public String getTagCode() {
+		return tagCode;
+	}
 
-    /**
-     * 设置标签code
-     *
-     * @param tagCode 标签code
-     */
-    public void setTagCode(String tagCode) {
-        this.tagCode = tagCode == null ? null : tagCode.trim();
-    }
+	/**
+	 * 设置标签code
+	 *
+	 * @param tagCode 标签code
+	 */
+	public void setTagCode(String tagCode) {
+		this.tagCode = tagCode == null ? null : tagCode.trim();
+	}
 
-    /**
-     * 获取标签name
-     *
-     * @return tag_name - 标签name
-     */
-    public String getTagName() {
-        return tagName;
-    }
+	/**
+	 * 获取标签name
+	 *
+	 * @return tag_name - 标签name
+	 */
+	public String getTagName() {
+		return tagName;
+	}
 
-    /**
-     * 设置标签name
-     *
-     * @param tagName 标签name
-     */
-    public void setTagName(String tagName) {
-        this.tagName = tagName == null ? null : tagName.trim();
-    }
-}
\ No newline at end of file
+	/**
+	 * 设置标签name
+	 *
+	 * @param tagName 标签name
+	 */
+	public void setTagName(String tagName) {
+		this.tagName = tagName == null ? null : tagName.trim();
+	}
+}
diff --git a/len-blog/src/main/java/com/len/mapper/ArticleCategoryMapper.java b/len-blog/src/main/java/com/len/mapper/ArticleCategoryMapper.java
index 5ab3fcb..37f0c4c 100644
--- a/len-blog/src/main/java/com/len/mapper/ArticleCategoryMapper.java
+++ b/len-blog/src/main/java/com/len/mapper/ArticleCategoryMapper.java
@@ -8,5 +8,5 @@ import java.util.List;
 
 public interface ArticleCategoryMapper extends BaseMapper<ArticleCategory> {
 
-    void delByIds(@Param("ids") List<String> ids);
-}
\ No newline at end of file
+	void delByIds(@Param("ids") List<String> ids);
+}
diff --git a/len-blog/src/main/java/com/len/mapper/BlogArticleMapper.java b/len-blog/src/main/java/com/len/mapper/BlogArticleMapper.java
index fd95d03..4c272d3 100644
--- a/len-blog/src/main/java/com/len/mapper/BlogArticleMapper.java
+++ b/len-blog/src/main/java/com/len/mapper/BlogArticleMapper.java
@@ -10,13 +10,13 @@ import java.util.List;
 
 public interface BlogArticleMapper extends BaseMapper<BlogArticle> {
 
-    List<Article> indexSelect();
+	List<Article> indexSelect();
 
-    List<Article> selectArticle(@Param("code") String code);
+	List<Article> selectArticle(@Param("code") String code);
 
-    List<Article> selectArticleByTag(@Param("tagCode") String tagCode);
+	List<Article> selectArticleByTag(@Param("tagCode") String tagCode);
 
-    BlogArticle selectPrevious(@Param("createDate")Date date);
+	BlogArticle selectPrevious(@Param("createDate") Date date);
 
-    BlogArticle selectNext(@Param("createDate")Date date);
-}
\ No newline at end of file
+	BlogArticle selectNext(@Param("createDate") Date date);
+}
diff --git a/len-blog/src/main/java/com/len/model/Article.java b/len-blog/src/main/java/com/len/model/Article.java
index 29dccdb..286b9db 100644
--- a/len-blog/src/main/java/com/len/model/Article.java
+++ b/len-blog/src/main/java/com/len/model/Article.java
@@ -7,48 +7,48 @@ import java.util.Date;
 @Data
 public class Article {
 
-    private String id;
+	private String id;
 
-    /**
-     * code
-     */
-    private String code;
+	/**
+	 * code
+	 */
+	private String code;
 
 
-    /**
-     * 标题
-     */
-    private String title;
+	/**
+	 * 标题
+	 */
+	private String title;
 
 
-    private String firstImg;
+	private String firstImg;
 
-    /**
-     * 阅读次数
-     */
-    private Integer readNumber;
+	/**
+	 * 阅读次数
+	 */
+	private Integer readNumber;
 
-    /**
-     * 次序(置顶功能)
-     */
-    private Integer topNum;
+	/**
+	 * 次序(置顶功能)
+	 */
+	private Integer topNum;
 
-    private String createBy;
+	private String createBy;
 
-    private String createName;
+	private String createName;
 
-    private String updateBy;
+	private String updateBy;
 
-    private Date createDate;
+	private Date createDate;
 
-    private Date updateDate;
+	private Date updateDate;
 
-    /**
-     * 文章内容
-     */
-    private String content;
+	/**
+	 * 文章内容
+	 */
+	private String content;
 
-    private Byte delFlag;
+	private Byte delFlag;
 
 
-}
\ No newline at end of file
+}
diff --git a/len-blog/src/main/java/com/len/model/SimpleArticle.java b/len-blog/src/main/java/com/len/model/SimpleArticle.java
index eff0809..89a7e53 100644
--- a/len-blog/src/main/java/com/len/model/SimpleArticle.java
+++ b/len-blog/src/main/java/com/len/model/SimpleArticle.java
@@ -8,7 +8,7 @@ import lombok.Data;
 @ApiModel("简单文章")
 public class SimpleArticle {
 
-    private String code;
+	private String code;
 
-    private String title;
+	private String title;
 }
diff --git a/len-blog/src/main/java/com/len/model/VArticle.java b/len-blog/src/main/java/com/len/model/VArticle.java
index 4a45e84..6b1b709 100644
--- a/len-blog/src/main/java/com/len/model/VArticle.java
+++ b/len-blog/src/main/java/com/len/model/VArticle.java
@@ -9,11 +9,11 @@ import java.util.List;
 @Data
 public class VArticle {
 
-    private String title;
+	private String title;
 
-    private String content;
+	private String content;
 
-    private List<String> category=new ArrayList<>();
+	private List<String> category = new ArrayList<>();
 
-    private List<String> tags=new ArrayList<>();
+	private List<String> tags = new ArrayList<>();
 }
diff --git a/len-blog/src/main/java/com/len/service/ArticleCategoryService.java b/len-blog/src/main/java/com/len/service/ArticleCategoryService.java
index e4b3b20..ef2d7bf 100644
--- a/len-blog/src/main/java/com/len/service/ArticleCategoryService.java
+++ b/len-blog/src/main/java/com/len/service/ArticleCategoryService.java
@@ -8,5 +8,5 @@ import java.util.List;
 
 public interface ArticleCategoryService extends BaseService<ArticleCategory> {
 
-    void delByIds(List<String> ids);
+	void delByIds(List<String> ids);
 }
diff --git a/len-blog/src/main/java/com/len/service/BlogArticleService.java b/len-blog/src/main/java/com/len/service/BlogArticleService.java
index b34a05c..f425542 100644
--- a/len-blog/src/main/java/com/len/service/BlogArticleService.java
+++ b/len-blog/src/main/java/com/len/service/BlogArticleService.java
@@ -12,22 +12,22 @@ import java.util.List;
 
 public interface BlogArticleService extends BaseService<BlogArticle> {
 
-    List<Article> indexSelect();
+	List<Article> indexSelect();
 
-    public LenResponse getDetail(String code);
+	public LenResponse getDetail(String code);
 
-    public LenResponse detail(String code, String ip);
+	public LenResponse detail(String code, String ip);
 
-    List<Article> selectArticle(String code);
+	List<Article> selectArticle(String code);
 
-    List<Article> selectArticleByTag(String tagCode);
+	List<Article> selectArticleByTag(String tagCode);
 
-    BlogArticle selectPrevious(Date date);
+	BlogArticle selectPrevious(Date date);
 
-    BlogArticle selectNext(Date date);
+	BlogArticle selectNext(Date date);
 
-    boolean addArticle(ArticleDetail articleDetail);
+	boolean addArticle(ArticleDetail articleDetail);
 
-    boolean updateArticle(Article article, List<String> categoryIds, List<String> tags);
+	boolean updateArticle(Article article, List<String> categoryIds, List<String> tags);
 
 }
diff --git a/len-blog/src/main/java/com/len/service/impl/ArticleCategoryServiceImpl.java b/len-blog/src/main/java/com/len/service/impl/ArticleCategoryServiceImpl.java
index de6b0d2..c034b3e 100644
--- a/len-blog/src/main/java/com/len/service/impl/ArticleCategoryServiceImpl.java
+++ b/len-blog/src/main/java/com/len/service/impl/ArticleCategoryServiceImpl.java
@@ -12,13 +12,13 @@ import java.util.List;
 
 @Service
 public class ArticleCategoryServiceImpl extends BaseServiceImpl<ArticleCategoryMapper, ArticleCategory>
-        implements ArticleCategoryService {
+	implements ArticleCategoryService {
 
-    @Autowired
-    private ArticleCategoryMapper articleCategoryMapper;
+	@Autowired
+	private ArticleCategoryMapper articleCategoryMapper;
 
-    @Override
-    public void delByIds(List<String> ids) {
-        articleCategoryMapper.delByIds(ids);
-    }
+	@Override
+	public void delByIds(List<String> ids) {
+		articleCategoryMapper.delByIds(ids);
+	}
 }
diff --git a/len-blog/src/main/java/com/len/service/impl/ArticleTagServiceImpl.java b/len-blog/src/main/java/com/len/service/impl/ArticleTagServiceImpl.java
index ce90e15..3443c66 100644
--- a/len-blog/src/main/java/com/len/service/impl/ArticleTagServiceImpl.java
+++ b/len-blog/src/main/java/com/len/service/impl/ArticleTagServiceImpl.java
@@ -11,7 +11,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class ArticleTagServiceImpl extends BaseServiceImpl<ArticleTagMapper, ArticleTag> implements ArticleTagService {
 
-    @Autowired
-    private ArticleTagMapper articleTagMapper;
+	@Autowired
+	private ArticleTagMapper articleTagMapper;
 
 }
diff --git a/len-blog/src/main/java/com/len/service/impl/BlogArticleServiceImpl.java b/len-blog/src/main/java/com/len/service/impl/BlogArticleServiceImpl.java
index a5af706..5e6ef91 100644
--- a/len-blog/src/main/java/com/len/service/impl/BlogArticleServiceImpl.java
+++ b/len-blog/src/main/java/com/len/service/impl/BlogArticleServiceImpl.java
@@ -13,11 +13,8 @@ import com.len.service.*;
 import com.len.util.ApplicationContextUtil;
 import com.len.util.BeanUtil;
 import com.len.util.LenResponse;
-import freemarker.core.LocalContext;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -30,351 +27,344 @@ import java.util.stream.Collectors;
 @Service
 public class BlogArticleServiceImpl extends BaseServiceImpl<BlogArticleMapper, BlogArticle> implements BlogArticleService {
 
-    @Autowired
-    private BlogArticleMapper blogArticleMapper;
-
-    @Autowired
-    private ArticleTagService articleTagService;
-
-    @Autowired
-    private ArticleCategoryService articleCategoryService;
-
-    @Autowired
-    private BlogTagService tagService;
-
-    @Autowired
-    private SysUserService sysUserService;
-
-    private static final Pattern IMG = Pattern.compile("<(img)(.*?)(/>|></img>|>)");
-
-    private static final Pattern SRC = Pattern.compile("src\\s*=\\s*\"?(.*?)(\"|>|\\s+)");
-
-
-    private ArticleDetail getArticleByCode(String code) {
-
-        QueryWrapper<BlogArticle> blogArticleQueryWrapper = new QueryWrapper<>();
-        blogArticleQueryWrapper.eq("code", code).eq("del_flag", 0);
-        blogArticleMapper.selectList(blogArticleQueryWrapper);
-        List<BlogArticle> articles = blogArticleMapper.selectList(blogArticleQueryWrapper);
-        ;
-        if (articles.isEmpty()) {
-            return null;
-        }
-        ArticleDetail detail = new ArticleDetail();
-        BlogArticle blogArticle = articles.get(0);
-
-
-        Article article = new Article();
-        BeanUtil.copyNotNullBean(blogArticle, article);
-        detail.setArticle(article);
-
-        String createBy = blogArticle.getCreateBy();
-        if (!StringUtils.isEmpty(createBy)) {
-            SysUser sysUser = sysUserService.getById(createBy);
-            if (sysUser != null) {
-                article.setCreateName(sysUser.getUsername());
-            }
-        } else {
-            article.setCreateName("admin");
-        }
-
-        ArticleTag articleTag = new ArticleTag();
-        articleTag.setArticleId(blogArticle.getId());
-        QueryWrapper<ArticleTag> tagQueryWrapper = new QueryWrapper<>(articleTag);
-        List<ArticleTag> articleTags = articleTagService.list(tagQueryWrapper);
-        if (!articleTags.isEmpty()) {
-            QueryWrapper<BlogTag> queryWrapper = new QueryWrapper<>();
-            queryWrapper.in("id", articleTags.stream()
-                    .map(ArticleTag::getTagId).collect(Collectors.toList()));
-            List<BlogTag> blogTags = tagService.list(queryWrapper);
-
-            detail.setTags(blogTags.stream().map(BlogTag::getTagCode).collect(Collectors.toList()));
-        }
-        ArticleCategory articleCategory = new ArticleCategory();
-        articleCategory.setArticleId(blogArticle.getId());
-        QueryWrapper<ArticleCategory> blogTagQueryWrapper = new QueryWrapper<>(articleCategory);
-        List<ArticleCategory> articleCategories = articleCategoryService.list(blogTagQueryWrapper);
-        if (!articleCategories.isEmpty()) {
-            detail.setCategory(articleCategories.stream().map(ArticleCategory::getCategoryId)
-                    .collect(Collectors.toList()));
-        }
-        return detail;
-    }
-
-    @Override
-    public List<Article> indexSelect() {
-        return blogArticleMapper.indexSelect();
-    }
-
-    @Override
-    public LenResponse getDetail(String code) {
-        LenResponse json = new LenResponse();
-        ArticleDetail detail = getArticleByCode(code);
-        if (detail == null) {
-            json.setStatus(404);
-            json.setFlag(false);
-            return json;
-        }
-        json.setData(detail);
-        json.setFlag(true);
-        return json;
-
-    }
-
-    @Override
-    public LenResponse detail(String code, String ip) {
-        LenResponse json = new LenResponse();
-        ArticleDetail detail = getArticleByCode(code);
-        if (detail == null) {
-            json.setStatus(404);
-            json.setFlag(false);
-            return json;
-        }
-        Article article = detail.getArticle();
-        //点击次数
-        int clickNum = addArticleReadNum(ip, article.getId());
-        if (clickNum > 0) {
-            article.setReadNumber(clickNum);
-        }
-
-        //上一篇
-        PageHelper.startPage(1, 1);
-        BlogArticle previous = selectPrevious(article.getCreateDate());
-        if (previous != null) {
-            SimpleArticle simpleArticle = new SimpleArticle();
-            BeanUtil.copyNotNullBean(previous, simpleArticle);
-            detail.setPrevious(simpleArticle);
-        }
-        //下一篇
-        PageHelper.startPage(1, 1);
-        BlogArticle next = selectNext(article.getCreateDate());
-        if (next != null) {
-            SimpleArticle simpleArticle = new SimpleArticle();
-            BeanUtil.copyNotNullBean(next, simpleArticle);
-            detail.setNext(simpleArticle);
-        }
-        json.setData(detail);
-        json.setFlag(true);
-        return json;
-    }
-
-    @Override
-    public List<Article> selectArticle(String code) {
-        return blogArticleMapper.selectArticle(code);
-    }
-
-    @Override
-    public List<Article> selectArticleByTag(String tagCode) {
-        return blogArticleMapper.selectArticleByTag(tagCode);
-    }
-
-    @Override
-    public BlogArticle selectPrevious(Date date) {
-        return blogArticleMapper.selectPrevious(date);
-    }
-
-    @Override
-    public BlogArticle selectNext(Date date) {
-        return blogArticleMapper.selectNext(date);
-    }
-
-
-    private String generatorCode() {
-        Random random = new Random();
-        StringBuilder result = new StringBuilder();
-        for (int i = 0; i < 8; i++) {
-            result.append(random.nextInt(9) + 1);
-        }
-        BlogArticle article = new BlogArticle();
-        article.setCode(result.toString());
-        QueryWrapper<BlogArticle> articleQueryWrapper = new QueryWrapper<>(article);
-        BlogArticle blogArticle = blogArticleMapper.selectOne(articleQueryWrapper);
-        if (blogArticle == null) {
-            return result.toString();
-        } else {
-            return generatorCode();
-        }
-    }
-
-    @Override
-    @Transactional
-    public boolean addArticle(ArticleDetail articleDetail) {
-        Article article = articleDetail.getArticle();
-        String articleId = UUID.randomUUID().toString().replace("-", "");
-        article.setCode(generatorCode());
-        article.setId(articleId);
-        article.setCreateDate(new Date());
-        article.setCreateBy(LenUser.getPrincipal().getUserId());
-        article.setReadNumber(0);
-
-        String content = article.getContent();
-
-        Matcher matcher = IMG.matcher(content);
-        boolean exists = matcher.find();
-        if (exists) {
-            String img = matcher.group();
-            Matcher m = SRC.matcher(img);
-            boolean b = m.find();
-            if (b) {
-                article.setFirstImg(m.group(1));
-            }
-        }
-
-        BlogArticle blogArticle = new BlogArticle();
-        BeanUtil.copyNotNullBean(article, blogArticle);
-
-        int result = blogArticleMapper.insert(blogArticle);
-
-        List<ArticleCategory> categories = new ArrayList<>();
-        for (String cateId : articleDetail.getCategory()) {
-            ArticleCategory articleCategory = new ArticleCategory();
-            articleCategory.setId(UUID.randomUUID().toString().replace("-", ""));
-            articleCategory.setArticleId(articleId);
-            articleCategory.setCategoryId(cateId);
-            categories.add(articleCategory);
-        }
-        boolean insertResult = articleCategoryService.saveBatch(categories);
-
-        List<ArticleTag> articleTags = new ArrayList<>();
-        List<BlogTag> blogTags = new ArrayList<>();
-        ArticleTag articleTag;
-        BlogTag blogTag;
-        BlogTag oldTag;
-        for (String tag : articleDetail.getTags()) {
-            articleTag = new ArticleTag();
-            articleTags.add(articleTag);
-
-            articleTag.setArticleId(articleId);
-
-            blogTag = new BlogTag();
-            blogTag.setTagCode(tag);
-            QueryWrapper<BlogTag> blogTagQueryWrapper = new QueryWrapper<>(blogTag);
-            oldTag = tagService.getOne(blogTagQueryWrapper);
-
-            if (oldTag != null) {
-                articleTag.setTagId(oldTag.getId());
-            } else {
-                blogTags.add(blogTag);
-                String id = UUID.randomUUID().toString().replace("-", "");
-                blogTag.setId(id);
-                blogTag.setTagName(tag);
-                articleTag.setTagId(id);
-            }
-        }
-        articleTagService.saveBatch(articleTags);
-        if (!blogTags.isEmpty()) {
-            tagService.saveBatch(blogTags);
-        }
-
-        return result > 0 && insertResult;
-    }
-
-    @Override
-    @Transactional
-    public boolean updateArticle(Article article, List<String> categoryIds, List<String> tags) {
-        article.setUpdateBy(LenUser.getPrincipal().getUserId());
-        article.setUpdateDate(new Date());
-
-        String content = article.getContent();
-
-        Matcher matcher = IMG.matcher(content);
-        boolean exists = matcher.find();
-        if (exists) {
-            String img = matcher.group();
-            Matcher m = SRC.matcher(img);
-            boolean b = m.find();
-            if (b) {
-                article.setFirstImg(m.group(1));
-            }
-        }
-        BlogArticle blogArticle = new BlogArticle();
-        BeanUtil.copyNotNullBean(article, blogArticle);
-        blogArticleMapper.updateById(blogArticle);
-
-        ArticleTag articleTag = new ArticleTag();
-        articleTag.setArticleId(article.getId());
-        articleTagService.removeById(article.getId());
-
-        List<ArticleTag> articleTags = new ArrayList<>();
-        List<BlogTag> blogTags = new ArrayList<>();
-        BlogTag needAddTag;
-        for (String tag : tags) {
-            articleTag = new ArticleTag();
-            articleTags.add(articleTag);
-            articleTag.setArticleId(article.getId());
-            BlogTag blogTag = new BlogTag();
-            blogTag.setTagCode(tag);
-            QueryWrapper<BlogTag> blogTagQueryWrapper = new QueryWrapper<>(blogTag);
-            BlogTag tag1 = tagService.getOne(blogTagQueryWrapper);
-            if (tag1 != null) {
-                articleTag.setTagId(tag1.getId());
-            } else {
-                String tagId = UUID.randomUUID().toString().replace("-", "");
-                articleTag.setTagId(tagId);
-
-                needAddTag = new BlogTag();
-                blogTags.add(needAddTag);
-                needAddTag.setId(tagId);
-                needAddTag.setTagCode(tag);
-                needAddTag.setTagName(tag);
-            }
-        }
-        if (!blogTags.isEmpty()) {
-            tagService.saveBatch(blogTags);
-        }
-
-        articleTagService.saveBatch(articleTags);
-        ArticleCategory articleCategory = new ArticleCategory();
-        articleCategory.setArticleId(article.getId());
-        QueryWrapper<ArticleCategory> categoryQueryWrapper = new QueryWrapper<>(articleCategory);
-        List<ArticleCategory> categories = articleCategoryService.list(categoryQueryWrapper);
-        if (!categories.isEmpty()) {
-            List<String> cateIds = categories.stream().map(ArticleCategory::getCategoryId)
-                    .collect(Collectors.toList());
-            List<String> collect = cateIds.stream().filter(categoryIds::contains)
-                    .collect(Collectors.toList());
-            categoryIds.removeAll(collect);
-            cateIds.removeAll(collect);
-            if (!cateIds.isEmpty()) {
-                List<String> delCategoryIds = categories.stream().filter(s -> cateIds.contains(s.getCategoryId()))
-                        .map(ArticleCategory::getId)
-                        .collect(Collectors.toList());
-                articleCategoryService.delByIds(delCategoryIds);
-            }
-        }
-        if (!categoryIds.isEmpty()) {
-            List<ArticleCategory> articleCategories = new ArrayList<>();
-            ArticleCategory category;
-            for (String ca : categoryIds) {
-                category = new ArticleCategory();
-                articleCategories.add(category);
-                category.setId(UUID.randomUUID().toString().replace("-", ""));
-                category.setArticleId(article.getId());
-                category.setCategoryId(ca);
-            }
-            articleCategoryService.saveBatch(articleCategories);
-        }
-        return true;
-    }
-
-    /**
-     * 半小时增加一次有效点击数
-     *
-     * @param ip        访问者ip
-     * @param articleId 文章id
-     */
-    private int addArticleReadNum(String ip, String articleId) {
-        String str = ip + "_" + articleId;
-        RedisService redisService = ApplicationContextUtil.getBean(RedisService.class);
-        if (!StringUtils.isBlank(str)) {
-            if (StringUtils.isEmpty(redisService.get(str))) {
-                redisService.set(str, "true", 60 * 30L);
-                BlogArticle article = blogArticleMapper.selectById(articleId);
-                article.setReadNumber(article.getReadNumber() + 1);
-                blogArticleMapper.updateById(article);
-                return article.getReadNumber();
-            }
-        }
-        return -1;
-    }
+	private static final Pattern IMG = Pattern.compile("<(img)(.*?)(/>|></img>|>)");
+	private static final Pattern SRC = Pattern.compile("src\\s*=\\s*\"?(.*?)(\"|>|\\s+)");
+	@Autowired
+	private BlogArticleMapper blogArticleMapper;
+	@Autowired
+	private ArticleTagService articleTagService;
+	@Autowired
+	private ArticleCategoryService articleCategoryService;
+	@Autowired
+	private BlogTagService tagService;
+	@Autowired
+	private SysUserService sysUserService;
+
+	private ArticleDetail getArticleByCode(String code) {
+
+		QueryWrapper<BlogArticle> blogArticleQueryWrapper = new QueryWrapper<>();
+		blogArticleQueryWrapper.eq("code", code).eq("del_flag", 0);
+		blogArticleMapper.selectList(blogArticleQueryWrapper);
+		List<BlogArticle> articles = blogArticleMapper.selectList(blogArticleQueryWrapper);
+		;
+		if (articles.isEmpty()) {
+			return null;
+		}
+		ArticleDetail detail = new ArticleDetail();
+		BlogArticle blogArticle = articles.get(0);
+
+
+		Article article = new Article();
+		BeanUtil.copyNotNullBean(blogArticle, article);
+		detail.setArticle(article);
+
+		String createBy = blogArticle.getCreateBy();
+		if (!StringUtils.isEmpty(createBy)) {
+			SysUser sysUser = sysUserService.getById(createBy);
+			if (sysUser != null) {
+				article.setCreateName(sysUser.getUsername());
+			}
+		} else {
+			article.setCreateName("admin");
+		}
+
+		ArticleTag articleTag = new ArticleTag();
+		articleTag.setArticleId(blogArticle.getId());
+		QueryWrapper<ArticleTag> tagQueryWrapper = new QueryWrapper<>(articleTag);
+		List<ArticleTag> articleTags = articleTagService.list(tagQueryWrapper);
+		if (!articleTags.isEmpty()) {
+			QueryWrapper<BlogTag> queryWrapper = new QueryWrapper<>();
+			queryWrapper.in("id", articleTags.stream()
+				.map(ArticleTag::getTagId).collect(Collectors.toList()));
+			List<BlogTag> blogTags = tagService.list(queryWrapper);
+
+			detail.setTags(blogTags.stream().map(BlogTag::getTagCode).collect(Collectors.toList()));
+		}
+		ArticleCategory articleCategory = new ArticleCategory();
+		articleCategory.setArticleId(blogArticle.getId());
+		QueryWrapper<ArticleCategory> blogTagQueryWrapper = new QueryWrapper<>(articleCategory);
+		List<ArticleCategory> articleCategories = articleCategoryService.list(blogTagQueryWrapper);
+		if (!articleCategories.isEmpty()) {
+			detail.setCategory(articleCategories.stream().map(ArticleCategory::getCategoryId)
+				.collect(Collectors.toList()));
+		}
+		return detail;
+	}
+
+	@Override
+	public List<Article> indexSelect() {
+		return blogArticleMapper.indexSelect();
+	}
+
+	@Override
+	public LenResponse getDetail(String code) {
+		LenResponse json = new LenResponse();
+		ArticleDetail detail = getArticleByCode(code);
+		if (detail == null) {
+			json.setStatus(404);
+			json.setFlag(false);
+			return json;
+		}
+		json.setData(detail);
+		json.setFlag(true);
+		return json;
+
+	}
+
+	@Override
+	public LenResponse detail(String code, String ip) {
+		LenResponse json = new LenResponse();
+		ArticleDetail detail = getArticleByCode(code);
+		if (detail == null) {
+			json.setStatus(404);
+			json.setFlag(false);
+			return json;
+		}
+		Article article = detail.getArticle();
+		//点击次数
+		int clickNum = addArticleReadNum(ip, article.getId());
+		if (clickNum > 0) {
+			article.setReadNumber(clickNum);
+		}
+
+		//上一篇
+		PageHelper.startPage(1, 1);
+		BlogArticle previous = selectPrevious(article.getCreateDate());
+		if (previous != null) {
+			SimpleArticle simpleArticle = new SimpleArticle();
+			BeanUtil.copyNotNullBean(previous, simpleArticle);
+			detail.setPrevious(simpleArticle);
+		}
+		//下一篇
+		PageHelper.startPage(1, 1);
+		BlogArticle next = selectNext(article.getCreateDate());
+		if (next != null) {
+			SimpleArticle simpleArticle = new SimpleArticle();
+			BeanUtil.copyNotNullBean(next, simpleArticle);
+			detail.setNext(simpleArticle);
+		}
+		json.setData(detail);
+		json.setFlag(true);
+		return json;
+	}
+
+	@Override
+	public List<Article> selectArticle(String code) {
+		return blogArticleMapper.selectArticle(code);
+	}
+
+	@Override
+	public List<Article> selectArticleByTag(String tagCode) {
+		return blogArticleMapper.selectArticleByTag(tagCode);
+	}
+
+	@Override
+	public BlogArticle selectPrevious(Date date) {
+		return blogArticleMapper.selectPrevious(date);
+	}
+
+	@Override
+	public BlogArticle selectNext(Date date) {
+		return blogArticleMapper.selectNext(date);
+	}
+
+
+	private String generatorCode() {
+		Random random = new Random();
+		StringBuilder result = new StringBuilder();
+		for (int i = 0; i < 8; i++) {
+			result.append(random.nextInt(9) + 1);
+		}
+		BlogArticle article = new BlogArticle();
+		article.setCode(result.toString());
+		QueryWrapper<BlogArticle> articleQueryWrapper = new QueryWrapper<>(article);
+		BlogArticle blogArticle = blogArticleMapper.selectOne(articleQueryWrapper);
+		if (blogArticle == null) {
+			return result.toString();
+		} else {
+			return generatorCode();
+		}
+	}
+
+	@Override
+	@Transactional
+	public boolean addArticle(ArticleDetail articleDetail) {
+		Article article = articleDetail.getArticle();
+		String articleId = UUID.randomUUID().toString().replace("-", "");
+		article.setCode(generatorCode());
+		article.setId(articleId);
+		article.setCreateDate(new Date());
+		article.setCreateBy(LenUser.getPrincipal().getUserId());
+		article.setReadNumber(0);
+
+		String content = article.getContent();
+
+		Matcher matcher = IMG.matcher(content);
+		boolean exists = matcher.find();
+		if (exists) {
+			String img = matcher.group();
+			Matcher m = SRC.matcher(img);
+			boolean b = m.find();
+			if (b) {
+				article.setFirstImg(m.group(1));
+			}
+		}
+
+		BlogArticle blogArticle = new BlogArticle();
+		BeanUtil.copyNotNullBean(article, blogArticle);
+
+		int result = blogArticleMapper.insert(blogArticle);
+
+		List<ArticleCategory> categories = new ArrayList<>();
+		for (String cateId : articleDetail.getCategory()) {
+			ArticleCategory articleCategory = new ArticleCategory();
+			articleCategory.setId(UUID.randomUUID().toString().replace("-", ""));
+			articleCategory.setArticleId(articleId);
+			articleCategory.setCategoryId(cateId);
+			categories.add(articleCategory);
+		}
+		boolean insertResult = articleCategoryService.saveBatch(categories);
+
+		List<ArticleTag> articleTags = new ArrayList<>();
+		List<BlogTag> blogTags = new ArrayList<>();
+		ArticleTag articleTag;
+		BlogTag blogTag;
+		BlogTag oldTag;
+		for (String tag : articleDetail.getTags()) {
+			articleTag = new ArticleTag();
+			articleTags.add(articleTag);
+
+			articleTag.setArticleId(articleId);
+
+			blogTag = new BlogTag();
+			blogTag.setTagCode(tag);
+			QueryWrapper<BlogTag> blogTagQueryWrapper = new QueryWrapper<>(blogTag);
+			oldTag = tagService.getOne(blogTagQueryWrapper);
+
+			if (oldTag != null) {
+				articleTag.setTagId(oldTag.getId());
+			} else {
+				blogTags.add(blogTag);
+				String id = UUID.randomUUID().toString().replace("-", "");
+				blogTag.setId(id);
+				blogTag.setTagName(tag);
+				articleTag.setTagId(id);
+			}
+		}
+		articleTagService.saveBatch(articleTags);
+		if (!blogTags.isEmpty()) {
+			tagService.saveBatch(blogTags);
+		}
+
+		return result > 0 && insertResult;
+	}
+
+	@Override
+	@Transactional
+	public boolean updateArticle(Article article, List<String> categoryIds, List<String> tags) {
+		article.setUpdateBy(LenUser.getPrincipal().getUserId());
+		article.setUpdateDate(new Date());
+
+		String content = article.getContent();
+
+		Matcher matcher = IMG.matcher(content);
+		boolean exists = matcher.find();
+		if (exists) {
+			String img = matcher.group();
+			Matcher m = SRC.matcher(img);
+			boolean b = m.find();
+			if (b) {
+				article.setFirstImg(m.group(1));
+			}
+		}
+		BlogArticle blogArticle = new BlogArticle();
+		BeanUtil.copyNotNullBean(article, blogArticle);
+		blogArticleMapper.updateById(blogArticle);
+
+		ArticleTag articleTag = new ArticleTag();
+		articleTag.setArticleId(article.getId());
+		articleTagService.removeById(article.getId());
+
+		List<ArticleTag> articleTags = new ArrayList<>();
+		List<BlogTag> blogTags = new ArrayList<>();
+		BlogTag needAddTag;
+		for (String tag : tags) {
+			articleTag = new ArticleTag();
+			articleTags.add(articleTag);
+			articleTag.setArticleId(article.getId());
+			BlogTag blogTag = new BlogTag();
+			blogTag.setTagCode(tag);
+			QueryWrapper<BlogTag> blogTagQueryWrapper = new QueryWrapper<>(blogTag);
+			BlogTag tag1 = tagService.getOne(blogTagQueryWrapper);
+			if (tag1 != null) {
+				articleTag.setTagId(tag1.getId());
+			} else {
+				String tagId = UUID.randomUUID().toString().replace("-", "");
+				articleTag.setTagId(tagId);
+
+				needAddTag = new BlogTag();
+				blogTags.add(needAddTag);
+				needAddTag.setId(tagId);
+				needAddTag.setTagCode(tag);
+				needAddTag.setTagName(tag);
+			}
+		}
+		if (!blogTags.isEmpty()) {
+			tagService.saveBatch(blogTags);
+		}
+
+		articleTagService.saveBatch(articleTags);
+		ArticleCategory articleCategory = new ArticleCategory();
+		articleCategory.setArticleId(article.getId());
+		QueryWrapper<ArticleCategory> categoryQueryWrapper = new QueryWrapper<>(articleCategory);
+		List<ArticleCategory> categories = articleCategoryService.list(categoryQueryWrapper);
+		if (!categories.isEmpty()) {
+			List<String> cateIds = categories.stream().map(ArticleCategory::getCategoryId)
+				.collect(Collectors.toList());
+			List<String> collect = cateIds.stream().filter(categoryIds::contains)
+				.collect(Collectors.toList());
+			categoryIds.removeAll(collect);
+			cateIds.removeAll(collect);
+			if (!cateIds.isEmpty()) {
+				List<String> delCategoryIds = categories.stream().filter(s -> cateIds.contains(s.getCategoryId()))
+					.map(ArticleCategory::getId)
+					.collect(Collectors.toList());
+				articleCategoryService.delByIds(delCategoryIds);
+			}
+		}
+		if (!categoryIds.isEmpty()) {
+			List<ArticleCategory> articleCategories = new ArrayList<>();
+			ArticleCategory category;
+			for (String ca : categoryIds) {
+				category = new ArticleCategory();
+				articleCategories.add(category);
+				category.setId(UUID.randomUUID().toString().replace("-", ""));
+				category.setArticleId(article.getId());
+				category.setCategoryId(ca);
+			}
+			articleCategoryService.saveBatch(articleCategories);
+		}
+		return true;
+	}
+
+	/**
+	 * 半小时增加一次有效点击数
+	 *
+	 * @param ip        访问者ip
+	 * @param articleId 文章id
+	 */
+	private int addArticleReadNum(String ip, String articleId) {
+		String str = ip + "_" + articleId;
+		RedisService redisService = ApplicationContextUtil.getBean(RedisService.class);
+		if (!StringUtils.isBlank(str)) {
+			if (StringUtils.isEmpty(redisService.get(str))) {
+				redisService.set(str, "true", 60 * 30L);
+				BlogArticle article = blogArticleMapper.selectById(articleId);
+				article.setReadNumber(article.getReadNumber() + 1);
+				blogArticleMapper.updateById(article);
+				return article.getReadNumber();
+			}
+		}
+		return -1;
+	}
 }
diff --git a/len-blog/src/main/resources/ftl/articleList.ftl b/len-blog/src/main/resources/ftl/articleList.ftl
index 271de7f..264fa84 100644
--- a/len-blog/src/main/resources/ftl/articleList.ftl
+++ b/len-blog/src/main/resources/ftl/articleList.ftl
@@ -1,330 +1,330 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="UTF-8">
-    <title>文章管理</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-          content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi"/>
-    <link rel="stylesheet" href="${re.contextPath}/plugin/layui/css/layui.css">
-    <link rel="stylesheet" href="${re.contextPath}/plugin/lenos/main.css">
-    <script type="text/javascript" src="${re.contextPath}/plugin/jquery/jquery-3.2.1.min.js"></script>
-    <script type="text/javascript" src="${re.contextPath}/plugin/layui/layui.all.js"
-            charset="utf-8"></script>
+	<meta charset="UTF-8">
+	<title>文章管理</title>
+	<meta name="renderer" content="webkit">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<meta name="viewport"
+		  content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi"/>
+	<link rel="stylesheet" href="${re.contextPath}/plugin/layui/css/layui.css">
+	<link rel="stylesheet" href="${re.contextPath}/plugin/lenos/main.css">
+	<script type="text/javascript" src="${re.contextPath}/plugin/jquery/jquery-3.2.1.min.js"></script>
+	<script type="text/javascript" src="${re.contextPath}/plugin/layui/layui.all.js"
+			charset="utf-8"></script>
 
 </head>
 
 <body>
 <div class="lenos-search">
-    <div class="search-select">
-        标题：
-        <div class="layui-inline">
-            <input class="layui-input" height="20px" id="title" autocomplete="off">
-        </div>
-        提要：
-        <div class="layui-inline">
-            <input class="layui-input" height="20px" id="description" autocomplete="off">
-        </div>
-        <button class="select-on layui-btn layui-btn-sm" data-type="select"><i class="layui-icon"></i>
-        </button>
-        <button class="layui-btn layui-btn-sm icon-position-button" id="refresh" style="float: right;"
-                data-type="reload">
-            <i class="layui-icon">ဂ</i>
-        </button>
-    </div>
+	<div class="search-select">
+		标题：
+		<div class="layui-inline">
+			<input class="layui-input" height="20px" id="title" autocomplete="off">
+		</div>
+		提要：
+		<div class="layui-inline">
+			<input class="layui-input" height="20px" id="description" autocomplete="off">
+		</div>
+		<button class="select-on layui-btn layui-btn-sm" data-type="select"><i class="layui-icon"></i>
+		</button>
+		<button class="layui-btn layui-btn-sm icon-position-button" id="refresh" style="float: right;"
+				data-type="reload">
+			<i class="layui-icon">ဂ</i>
+		</button>
+	</div>
 
 </div>
 <div class="layui-col-md12" style="height:40px;margin-top:3px;">
-    <div class="layui-btn-group">
-        <button class="layui-btn layui-btn-normal" data-type="add">
-            <i class="layui-icon">&#xe608;</i>新增
-        </button>
-        <button class="layui-btn layui-btn-normal" data-type="update">
-            <i class="layui-icon">&#xe642;</i>编辑
-        </button>
-        <button class="layui-btn layui-btn-normal" data-type="detail">
-            <i class="layui-icon">&#xe605;</i>查看
-        </button>
-    </div>
+	<div class="layui-btn-group">
+		<button class="layui-btn layui-btn-normal" data-type="add">
+			<i class="layui-icon">&#xe608;</i>新增
+		</button>
+		<button class="layui-btn layui-btn-normal" data-type="update">
+			<i class="layui-icon">&#xe642;</i>编辑
+		</button>
+		<button class="layui-btn layui-btn-normal" data-type="detail">
+			<i class="layui-icon">&#xe605;</i>查看
+		</button>
+	</div>
 </div>
 <table id="articleList" class="layui-hide" lay-filter="user"></table>
 <script type="text/html" id="barDemo">
-    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看</a>
-    <a class="layui-btn layui-btn-xs  layui-btn-normal" lay-event="edit">编辑</a>
-    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+	<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">查看</a>
+	<a class="layui-btn layui-btn-xs  layui-btn-normal" lay-event="edit">编辑</a>
+	<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
 </script>
 <script type="text/html" id="switchTpl">
-    <input type="checkbox" name="sex" lay-skin="switch" lay-text="女|男" lay-filter="sexDemo">
+	<input type="checkbox" name="sex" lay-skin="switch" lay-text="女|男" lay-filter="sexDemo">
 </script>
 <script>
-    layui.laytpl.toDateString = function (d, format) {
-        var date = new Date(d || new Date())
-                , ymd = [
-            this.digit(date.getFullYear(), 4)
-            , this.digit(date.getMonth() + 1)
-            , this.digit(date.getDate())
-        ]
-                , hms = [
-            this.digit(date.getHours())
-            , this.digit(date.getMinutes())
-            , this.digit(date.getSeconds())
-        ];
+	layui.laytpl.toDateString = function (d, format) {
+		var date = new Date(d || new Date())
+			, ymd = [
+			this.digit(date.getFullYear(), 4)
+			, this.digit(date.getMonth() + 1)
+			, this.digit(date.getDate())
+		]
+			, hms = [
+			this.digit(date.getHours())
+			, this.digit(date.getMinutes())
+			, this.digit(date.getSeconds())
+		];
 
-        format = format || 'yyyy-MM-dd HH:mm:ss';
+		format = format || 'yyyy-MM-dd HH:mm:ss';
 
-        return format.replace(/yyyy/g, ymd[0])
-                .replace(/MM/g, ymd[1])
-                .replace(/dd/g, ymd[2])
-                .replace(/HH/g, hms[0])
-                .replace(/mm/g, hms[1])
-                .replace(/ss/g, hms[2]);
-    };
+		return format.replace(/yyyy/g, ymd[0])
+			.replace(/MM/g, ymd[1])
+			.replace(/dd/g, ymd[2])
+			.replace(/HH/g, hms[0])
+			.replace(/mm/g, hms[1])
+			.replace(/ss/g, hms[2]);
+	};
 
-    //数字前置补零
-    layui.laytpl.digit = function (num, length, end) {
-        var str = '';
-        num = String(num);
-        length = length || 2;
-        for (var i = num.length; i < length; i++) {
-            str += '0';
-        }
-        return num < Math.pow(10, length) ? str + (num | 0) : num;
-    };
+	//数字前置补零
+	layui.laytpl.digit = function (num, length, end) {
+		var str = '';
+		num = String(num);
+		length = length || 2;
+		for (var i = num.length; i < length; i++) {
+			str += '0';
+		}
+		return num < Math.pow(10, length) ? str + (num | 0) : num;
+	};
 
-    document.onkeydown = function (e) { // 回车提交表单
-        var theEvent = window.event || e;
-        var code = theEvent.keyCode || theEvent.which;
-        if (code == 13) {
-            $(".select .select-on").click();
-        }
-    }
-    layui.use('table', function () {
-        var table = layui.table;
-        //方法级渲染
-        table.render({
-            id: 'articleList',
-            elem: '#articleList'
-            , url: '/article/showArticleList'
-            , cols: [[
-                {checkbox: true, fixed: true, width: '5%'}
-                , {field: 'title', title: '标题', width: '25%'}
-                , {field: 'description', title: '提要', width: '30%'}
-                , {
-                    field: 'gmtCreated',
-                    title: '发布时间',
-                    width: '15%',
-                    templet: '<div>{{ layui.laytpl.toDateString(d.createTime,"yyyy-MM-dd HH:mm:ss") }}</div>'
-                }
-                , {
-                    field: 'gmtModified',
-                    title: '最后修改时间',
-                    width: '15%',
-                    templet: '<div>{{ layui.laytpl.toDateString(d.createTime,"yyyy-MM-dd HH:mm:ss") }}</div>'
-                }
-            ]]
-            , page: true,
-            height: 'full-83'
-        });
+	document.onkeydown = function (e) { // 回车提交表单
+		var theEvent = window.event || e;
+		var code = theEvent.keyCode || theEvent.which;
+		if (code == 13) {
+			$(".select .select-on").click();
+		}
+	}
+	layui.use('table', function () {
+		var table = layui.table;
+		//方法级渲染
+		table.render({
+			id: 'articleList',
+			elem: '#articleList'
+			, url: '/article/showArticleList'
+			, cols: [[
+				{checkbox: true, fixed: true, width: '5%'}
+				, {field: 'title', title: '标题', width: '25%'}
+				, {field: 'description', title: '提要', width: '30%'}
+				, {
+					field: 'gmtCreated',
+					title: '发布时间',
+					width: '15%',
+					templet: '<div>{{ layui.laytpl.toDateString(d.createTime,"yyyy-MM-dd HH:mm:ss") }}</div>'
+				}
+				, {
+					field: 'gmtModified',
+					title: '最后修改时间',
+					width: '15%',
+					templet: '<div>{{ layui.laytpl.toDateString(d.createTime,"yyyy-MM-dd HH:mm:ss") }}</div>'
+				}
+			]]
+			, page: true,
+			height: 'full-83'
+		});
 
-        var $ = layui.$, active = {
-            select: function () {
-                var uname = $('#title').val();
-                var email = $('#description').val();
-                console.info(title);
-                table.reload('articleList', {
-                    where: {
-                        title: title,
-                        description: description
-                    }
-                });
-            },
-            reload: function () {
-                $('#title').val('');
-                $('#description').val('');
-                table.reload('articleList', {
-                    where: {
-                        title: null,
-                        description: null
-                    }
-                });
-            },
-            add: function () {
-                // todo 修改 url
-                add('写文章', 'writeArticle', 700, 450);
-            },
-            update: function () {
-                var checkStatus = table.checkStatus('articleList')
-                        , data = checkStatus.data;
-                if (data.length != 1) {
-                    layer.msg('请选择一行编辑,已选 ' + data.length + ' 行', {icon: 5});
-                    return false;
-                }
-                update('编辑文章', 'updateArticle?id=' + data[0].id, 700, 450);
-            },
-            detail: function () {
-                var checkStatus = table.checkStatus('articleList')
-                        , data = checkStatus.data;
-                if (data.length != 1) {
-                    layer.msg('请选择一行查看,已选 ' + data.length + ' 行', {icon: 5});
-                    return false;
-                }
-                // todo 查看文章
-                detail('查看文章', 'aaaaa?id=' + data[0].id, 700, 450);
-            }
-        };
+		var $ = layui.$, active = {
+			select: function () {
+				var uname = $('#title').val();
+				var email = $('#description').val();
+				console.info(title);
+				table.reload('articleList', {
+					where: {
+						title: title,
+						description: description
+					}
+				});
+			},
+			reload: function () {
+				$('#title').val('');
+				$('#description').val('');
+				table.reload('articleList', {
+					where: {
+						title: null,
+						description: null
+					}
+				});
+			},
+			add: function () {
+				// todo 修改 url
+				add('写文章', 'writeArticle', 700, 450);
+			},
+			update: function () {
+				var checkStatus = table.checkStatus('articleList')
+					, data = checkStatus.data;
+				if (data.length != 1) {
+					layer.msg('请选择一行编辑,已选 ' + data.length + ' 行', {icon: 5});
+					return false;
+				}
+				update('编辑文章', 'updateArticle?id=' + data[0].id, 700, 450);
+			},
+			detail: function () {
+				var checkStatus = table.checkStatus('articleList')
+					, data = checkStatus.data;
+				if (data.length != 1) {
+					layer.msg('请选择一行查看,已选 ' + data.length + ' 行', {icon: 5});
+					return false;
+				}
+				// todo 查看文章
+				detail('查看文章', 'aaaaa?id=' + data[0].id, 700, 450);
+			}
+		};
 
-        //监听表格复选框选择
-        table.on('checkbox(user)', function (obj) {
-            console.log(obj)
-        });
-        //监听工具条
-        table.on('tool(user)', function (obj) {
-            var data = obj.data;
-            if (obj.event === 'detail') {
-                detail('编辑用户', 'updateUser?id=' + data.id, 700, 450);
-            } else if (obj.event === 'del') {
-                layer.confirm('确定删除用户[<label style="color: #00AA91;">' + data.username + '</label>]?', {
-                    btn: ['逻辑删除', '物理删除']
-                }, function () {
-                    del(data.id, true);
-                }, function () {
-                    del(data.id, false);
-                });
-            } else if (obj.event === 'edit') {
-                update('编辑用户', 'updateUser?id=' + data.id, 700, 450);
-            }
-        });
+		//监听表格复选框选择
+		table.on('checkbox(user)', function (obj) {
+			console.log(obj)
+		});
+		//监听工具条
+		table.on('tool(user)', function (obj) {
+			var data = obj.data;
+			if (obj.event === 'detail') {
+				detail('编辑用户', 'updateUser?id=' + data.id, 700, 450);
+			} else if (obj.event === 'del') {
+				layer.confirm('确定删除用户[<label style="color: #00AA91;">' + data.username + '</label>]?', {
+					btn: ['逻辑删除', '物理删除']
+				}, function () {
+					del(data.id, true);
+				}, function () {
+					del(data.id, false);
+				});
+			} else if (obj.event === 'edit') {
+				update('编辑用户', 'updateUser?id=' + data.id, 700, 450);
+			}
+		});
 
-        $('.layui-col-md12 .layui-btn').on('click', function () {
-            var type = $(this).data('type');
-            active[type] ? active[type].call(this) : '';
-        });
-        $('.select .layui-btn').on('click', function () {
-            var type = $(this).data('type');
-            active[type] ? active[type].call(this) : '';
-        });
+		$('.layui-col-md12 .layui-btn').on('click', function () {
+			var type = $(this).data('type');
+			active[type] ? active[type].call(this) : '';
+		});
+		$('.select .layui-btn').on('click', function () {
+			var type = $(this).data('type');
+			active[type] ? active[type].call(this) : '';
+		});
 
-    });
+	});
 
 
-    function del(id, flag) {
-        $.ajax({
-            url: "del",
-            type: "post",
-            data: {id: id, flag: flag}, async: false,
-            success: function (d) {
-                if (d.flag) {
-                    window.top.layer.msg(d.msg, {icon: 6, offset: 'rb', area: ['120px', '80px'], anim: 2});
-                    layui.table.reload('userList');
-                } else {
-                    window.top.layer.msg(d.msg, {icon: 5, offset: 'rb', area: ['120px', '80px'], anim: 2});
-                }
-            }, error: function () {
-                alert('error');
-            }
-        });
-    }
+	function del(id, flag) {
+		$.ajax({
+			url: "del",
+			type: "post",
+			data: {id: id, flag: flag}, async: false,
+			success: function (d) {
+				if (d.flag) {
+					window.top.layer.msg(d.msg, {icon: 6, offset: 'rb', area: ['120px', '80px'], anim: 2});
+					layui.table.reload('userList');
+				} else {
+					window.top.layer.msg(d.msg, {icon: 5, offset: 'rb', area: ['120px', '80px'], anim: 2});
+				}
+			}, error: function () {
+				alert('error');
+			}
+		});
+	}
 
-    function detail(title, url, w, h) {
-        var number = 1;
-        if (title == null || title == '') {
-            title = false;
-        }
-        ;
-        if (url == null || url == '') {
-            url = "error/404";
-        }
-        ;
-        if (w == null || w == '') {
-            w = ($(window).width() * 0.9);
-        }
-        ;
-        if (h == null || h == '') {
-            h = ($(window).height() - 50);
-        }
-        ;
-        layer.open({
-            id: 'user-detail',
-            type: 2,
-            area: [w + 'px', h + 'px'],
-            fix: false,
-            maxmin: true,
-            shadeClose: true,
-            shade: 0.4,
-            title: title,
-            content: url + '&detail=true',
-            // btn:['关闭']
-        });
-    }
+	function detail(title, url, w, h) {
+		var number = 1;
+		if (title == null || title == '') {
+			title = false;
+		}
+		;
+		if (url == null || url == '') {
+			url = "error/404";
+		}
+		;
+		if (w == null || w == '') {
+			w = ($(window).width() * 0.9);
+		}
+		;
+		if (h == null || h == '') {
+			h = ($(window).height() - 50);
+		}
+		;
+		layer.open({
+			id: 'user-detail',
+			type: 2,
+			area: [w + 'px', h + 'px'],
+			fix: false,
+			maxmin: true,
+			shadeClose: true,
+			shade: 0.4,
+			title: title,
+			content: url + '&detail=true',
+			// btn:['关闭']
+		});
+	}
 
-    /**
-     * 更新用户
-     */
-    function update(title, url, w, h) {
-        if (title == null || title == '') {
-            title = false;
-        }
-        if (url == null || url == '') {
-            url = "404.html";
-        }
-        if (w == null || w == '') {
-            w = ($(window).width() * 0.9);
-        }
-        if (h == null || h == '') {
-            h = ($(window).height() - 50);
-        }
-        layer.open({
-            id: 'user-update',
-            type: 2,
-            area: [w + 'px', h + 'px'],
-            fix: false,
-            maxmin: true,
-            shadeClose: false,
-            shade: 0.4,
-            title: title,
-            content: url + '&detail=false'
-        });
-    }
+	/**
+	 * 更新用户
+	 */
+	function update(title, url, w, h) {
+		if (title == null || title == '') {
+			title = false;
+		}
+		if (url == null || url == '') {
+			url = "404.html";
+		}
+		if (w == null || w == '') {
+			w = ($(window).width() * 0.9);
+		}
+		if (h == null || h == '') {
+			h = ($(window).height() - 50);
+		}
+		layer.open({
+			id: 'user-update',
+			type: 2,
+			area: [w + 'px', h + 'px'],
+			fix: false,
+			maxmin: true,
+			shadeClose: false,
+			shade: 0.4,
+			title: title,
+			content: url + '&detail=false'
+		});
+	}
 
-    /*弹出层*/
-    /*
-     参数解释：
-     title   标题
-     url     请求的url
-     id      需要操作的数据id
-     w       弹出层宽度（缺省调默认值）
-     h       弹出层高度（缺省调默认值）
-     */
-    function add(title, url, w, h) {
-        if (title == null || title == '') {
-            title = false;
-        }
-        ;
-        if (url == null || url == '') {
-            url = "404.html";
-        }
-        ;
-        if (w == null || w == '') {
-            w = ($(window).width() * 0.9);
-        }
-        ;
-        if (h == null || h == '') {
-            h = ($(window).height() - 50);
-        }
-        ;
-        layer.open({
-            id: 'user-add',
-            type: 2,
-            area: [w + 'px', h + 'px'],
-            fix: false,
-            maxmin: true,
-            shadeClose: false,
-            shade: 0.4,
-            title: title,
-            content: url
-        });
-    }
+	/*弹出层*/
+	/*
+	 参数解释：
+	 title   标题
+	 url     请求的url
+	 id      需要操作的数据id
+	 w       弹出层宽度（缺省调默认值）
+	 h       弹出层高度（缺省调默认值）
+	 */
+	function add(title, url, w, h) {
+		if (title == null || title == '') {
+			title = false;
+		}
+		;
+		if (url == null || url == '') {
+			url = "404.html";
+		}
+		;
+		if (w == null || w == '') {
+			w = ($(window).width() * 0.9);
+		}
+		;
+		if (h == null || h == '') {
+			h = ($(window).height() - 50);
+		}
+		;
+		layer.open({
+			id: 'user-add',
+			type: 2,
+			area: [w + 'px', h + 'px'],
+			fix: false,
+			maxmin: true,
+			shadeClose: false,
+			shade: 0.4,
+			title: title,
+			content: url
+		});
+	}
 </script>
 </body>
 
diff --git a/len-blog/src/main/resources/mapper/ArticleCategoryMapper.xml b/len-blog/src/main/resources/mapper/ArticleCategoryMapper.xml
index d7f5507..42d61c9 100644
--- a/len-blog/src/main/resources/mapper/ArticleCategoryMapper.xml
+++ b/len-blog/src/main/resources/mapper/ArticleCategoryMapper.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.len.mapper.ArticleCategoryMapper">
-  <resultMap id="BaseResultMap" type="com.len.entity.ArticleCategory">
-    <!--
-      WARNING - @mbg.generated
-    -->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="article_id" jdbcType="VARCHAR" property="articleId" />
-    <result column="category_id" jdbcType="VARCHAR" property="categoryId" />
-  </resultMap>
-  <delete id="delByIds">
-    delete from blog_article_category
-    <where>
-      <if test="ids!=null and ids.size()>0">
-        id in(
-        <foreach collection="ids" separator="," item="id">
-          #{id}
-        </foreach>
-        )
-      </if>
-    </where>
-  </delete>
-</mapper>
\ No newline at end of file
+	<resultMap id="BaseResultMap" type="com.len.entity.ArticleCategory">
+		<!--
+		  WARNING - @mbg.generated
+		-->
+		<id column="id" jdbcType="VARCHAR" property="id"/>
+		<result column="article_id" jdbcType="VARCHAR" property="articleId"/>
+		<result column="category_id" jdbcType="VARCHAR" property="categoryId"/>
+	</resultMap>
+	<delete id="delByIds">
+		delete from blog_article_category
+		<where>
+			<if test="ids!=null and ids.size()>0">
+				id in(
+				<foreach collection="ids" separator="," item="id">
+					#{id}
+				</foreach>
+				)
+			</if>
+		</where>
+	</delete>
+</mapper>
diff --git a/len-blog/src/main/resources/mapper/ArticleTagMapper.xml b/len-blog/src/main/resources/mapper/ArticleTagMapper.xml
index 2c01fe8..e68f5e5 100644
--- a/len-blog/src/main/resources/mapper/ArticleTagMapper.xml
+++ b/len-blog/src/main/resources/mapper/ArticleTagMapper.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.len.mapper.ArticleTagMapper">
-  <resultMap id="BaseResultMap" type="com.len.entity.ArticleTag">
-    <!--
-      WARNING - @mbg.generated
-    -->
-    <id column="article_id" jdbcType="VARCHAR" property="articleId" />
-    <id column="tag_id" jdbcType="VARCHAR" property="tagId" />
-  </resultMap>
-</mapper>
\ No newline at end of file
+	<resultMap id="BaseResultMap" type="com.len.entity.ArticleTag">
+		<!--
+		  WARNING - @mbg.generated
+		-->
+		<id column="article_id" jdbcType="VARCHAR" property="articleId"/>
+		<id column="tag_id" jdbcType="VARCHAR" property="tagId"/>
+	</resultMap>
+</mapper>
diff --git a/len-blog/src/main/resources/mapper/BlogArticleMapper.xml b/len-blog/src/main/resources/mapper/BlogArticleMapper.xml
index e169555..e284447 100644
--- a/len-blog/src/main/resources/mapper/BlogArticleMapper.xml
+++ b/len-blog/src/main/resources/mapper/BlogArticleMapper.xml
@@ -1,122 +1,125 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.len.mapper.BlogArticleMapper">
-    <resultMap id="BaseResultMap" type="com.len.entity.BlogArticle">
-        <!--
-          WARNING - @mbg.generated
-        -->
-        <id column="id" jdbcType="VARCHAR" property="id"/>
-        <result column="code" jdbcType="VARCHAR" property="code"/>
-        <result column="title" jdbcType="VARCHAR" property="title"/>
-        <result column="first_img" jdbcType="VARCHAR" property="firstImg"/>
-        <result column="read_number" jdbcType="INTEGER" property="readNumber"/>
-        <result column="top_num" jdbcType="INTEGER" property="topNum"/>
-        <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
-        <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
-        <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
-        <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
-        <result column="content" jdbcType="LONGVARCHAR" property="content"/>
-        <result column="del_flag" jdbcType="TINYINT" property="delFlag"/>
-    </resultMap>
+	<resultMap id="BaseResultMap" type="com.len.entity.BlogArticle">
+		<!--
+		  WARNING - @mbg.generated
+		-->
+		<id column="id" jdbcType="VARCHAR" property="id"/>
+		<result column="code" jdbcType="VARCHAR" property="code"/>
+		<result column="title" jdbcType="VARCHAR" property="title"/>
+		<result column="first_img" jdbcType="VARCHAR" property="firstImg"/>
+		<result column="read_number" jdbcType="INTEGER" property="readNumber"/>
+		<result column="top_num" jdbcType="INTEGER" property="topNum"/>
+		<result column="create_by" jdbcType="VARCHAR" property="createBy"/>
+		<result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+		<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
+		<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
+		<result column="content" jdbcType="LONGVARCHAR" property="content"/>
+		<result column="del_flag" jdbcType="TINYINT" property="delFlag"/>
+	</resultMap>
 
 
-    <select id="selectListByPage" parameterType="com.len.entity.BlogArticle" resultMap="BaseResultMap">
-        SELECT id,code,title,read_number,top_num,create_by,create_date,
-        left(content,50) content,del_flag
-        from blog_article
-        <where>
-            <if test="title!=null and title!=''">and title like concat(concat('%',#{title}),'%')</if>
-            <if test="content!=null and content!=''">and content like concat(concat('%',#{content}),'%')</if>
-        </where>
-        order by read_number asc,create_date desc
-    </select>
+	<select id="selectListByPage" parameterType="com.len.entity.BlogArticle" resultMap="BaseResultMap">
+		SELECT id,code,title,read_number,top_num,create_by,create_date,
+		left(content,50) content,del_flag
+		from blog_article
+		<where>
+			<if test="title!=null and title!=''">and title like concat(concat('%',#{title}),'%')</if>
+			<if test="content!=null and content!=''">and content like concat(concat('%',#{content}),'%')</if>
+		</where>
+		order by read_number asc,create_date desc
+	</select>
 
-    <sql id="selectSql">
-        ba.id,ba.code,ba.title,ba.read_number readNumber,
+	<sql id="selectSql">
+		ba
+		.
+		id
+		,ba.code,ba.title,ba.read_number readNumber,
         ba.top_num topNum,ba.create_by createBy,ba.create_date createDate,
         left(ba.content,50) content,
         su.username createName,ba.first_img firstImg
-     </sql>
+	</sql>
 
-    <select id="indexSelect" resultType="com.len.model.Article">
-        select
-        <include refid="selectSql"/>
-        from blog_article ba
-        LEFT JOIN
-        sys_user su on ba.create_by=su.id
-        where
-        ba.del_flag=0
-        order by ba.top_num desc,ba.create_date desc
-    </select>
-    <select id="selectArticle" resultType="com.len.model.Article">
-        select
-        <include refid="selectSql"/>
-        from
-        blog_article ba
-        left JOIN
-        blog_article_category bac
-        on
-        ba.id=bac.article_id
-        LEFT JOIN
-        blog_category bc
-        on
-        bac.category_id=bc.id
-        LEFT JOIN
-        sys_user su on ba.create_by=su.id
-        where
-        ba.del_flag=0
-        <if test="code!=null and code!=''">
-            and bc.code=#{code}
-        </if>
-        order by ba.top_num desc,ba.create_date desc
-    </select>
+	<select id="indexSelect" resultType="com.len.model.Article">
+		select
+		<include refid="selectSql"/>
+		from blog_article ba
+		LEFT JOIN
+		sys_user su on ba.create_by=su.id
+		where
+		ba.del_flag=0
+		order by ba.top_num desc,ba.create_date desc
+	</select>
+	<select id="selectArticle" resultType="com.len.model.Article">
+		select
+		<include refid="selectSql"/>
+		from
+		blog_article ba
+		left JOIN
+		blog_article_category bac
+		on
+		ba.id=bac.article_id
+		LEFT JOIN
+		blog_category bc
+		on
+		bac.category_id=bc.id
+		LEFT JOIN
+		sys_user su on ba.create_by=su.id
+		where
+		ba.del_flag=0
+		<if test="code!=null and code!=''">
+			and bc.code=#{code}
+		</if>
+		order by ba.top_num desc,ba.create_date desc
+	</select>
 
-    <select id="selectArticleByTag" resultType="com.len.model.Article">
-      select
-      <include refid="selectSql"/>
-      from
-        blog_article ba
-      LEFT JOIN
-        blog_article_tag bat
-      on
-        ba.id=bat.article_id
-      LEFT JOIN
-        blog_tag bt
-      on
-        bat.tag_id=bt.id
-      LEFT JOIN
-        sys_user su on ba.create_by=su.id
-      where
-        bt.tag_code=#{tagCode}
-        and ba.del_flag=0
-        order by ba.top_num desc,ba.create_date desc
-  </select>
+	<select id="selectArticleByTag" resultType="com.len.model.Article">
+		select
+		<include refid="selectSql"/>
+		from
+		blog_article ba
+		LEFT JOIN
+		blog_article_tag bat
+		on
+		ba.id=bat.article_id
+		LEFT JOIN
+		blog_tag bt
+		on
+		bat.tag_id=bt.id
+		LEFT JOIN
+		sys_user su on ba.create_by=su.id
+		where
+		bt.tag_code=#{tagCode}
+		and ba.del_flag=0
+		order by ba.top_num desc,ba.create_date desc
+	</select>
 
-    <select id="selectPrevious" resultMap="BaseResultMap">
-        select
-        id,code,title,read_number,top_num,create_by,create_date,
-        left(content,50) content
-        from
-        blog_article
-        where
-        del_flag=0
-        <if test="createDate!=null">
-            and unix_timestamp(create_date) <![CDATA[ > ]]> unix_timestamp(#{createDate})
-        </if>
-        order by create_date asc
-    </select>
+	<select id="selectPrevious" resultMap="BaseResultMap">
+		select
+		id,code,title,read_number,top_num,create_by,create_date,
+		left(content,50) content
+		from
+		blog_article
+		where
+		del_flag=0
+		<if test="createDate!=null">
+			and unix_timestamp(create_date) <![CDATA[ > ]]> unix_timestamp(#{createDate})
+		</if>
+		order by create_date asc
+	</select>
 
-    <select id="selectNext" resultMap="BaseResultMap">
-        select
-        id,code,title,read_number,top_num,create_by,create_date,
-        left(content,50) content
-        from
-        blog_article
-        where
-        del_flag=0
-        <if test="createDate!=null">
-            and unix_timestamp(create_date) <![CDATA[ < ]]> unix_timestamp(#{createDate})
-        </if>
-        order by create_date desc
-    </select>
-</mapper>
\ No newline at end of file
+	<select id="selectNext" resultMap="BaseResultMap">
+		select
+		id,code,title,read_number,top_num,create_by,create_date,
+		left(content,50) content
+		from
+		blog_article
+		where
+		del_flag=0
+		<if test="createDate!=null">
+			and unix_timestamp(create_date) <![CDATA[ < ]]> unix_timestamp(#{createDate})
+		</if>
+		order by create_date desc
+	</select>
+</mapper>
diff --git a/len-blog/src/main/resources/mapper/BlogCategoryMapper.xml b/len-blog/src/main/resources/mapper/BlogCategoryMapper.xml
index 6286278..67373fd 100644
--- a/len-blog/src/main/resources/mapper/BlogCategoryMapper.xml
+++ b/len-blog/src/main/resources/mapper/BlogCategoryMapper.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.len.mapper.BlogCategoryMapper">
-  <resultMap id="BaseResultMap" type="com.len.entity.BlogCategory">
-    <!--
-      WARNING - @mbg.generated
-    -->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="sequence" jdbcType="TINYINT" property="sequence" />
-    <result column="code" jdbcType="VARCHAR" property="code" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="parent_id" jdbcType="VARCHAR" property="parentId" />
-    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
-    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
-    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
-    <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
-  </resultMap>
-</mapper>
\ No newline at end of file
+	<resultMap id="BaseResultMap" type="com.len.entity.BlogCategory">
+		<!--
+		  WARNING - @mbg.generated
+		-->
+		<id column="id" jdbcType="VARCHAR" property="id"/>
+		<result column="sequence" jdbcType="TINYINT" property="sequence"/>
+		<result column="code" jdbcType="VARCHAR" property="code"/>
+		<result column="name" jdbcType="VARCHAR" property="name"/>
+		<result column="parent_id" jdbcType="VARCHAR" property="parentId"/>
+		<result column="create_by" jdbcType="VARCHAR" property="createBy"/>
+		<result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+		<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
+		<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
+	</resultMap>
+</mapper>
diff --git a/len-blog/src/main/resources/mapper/BlogTagMapper.xml b/len-blog/src/main/resources/mapper/BlogTagMapper.xml
index a5a209b..d2b16e1 100644
--- a/len-blog/src/main/resources/mapper/BlogTagMapper.xml
+++ b/len-blog/src/main/resources/mapper/BlogTagMapper.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.len.mapper.BlogTagMapper">
-  <resultMap id="BaseResultMap" type="com.len.entity.BlogTag">
-    <!--
-      WARNING - @mbg.generated
-    -->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="tag_code" jdbcType="VARCHAR" property="tagCode" />
-    <result column="tag_name" jdbcType="VARCHAR" property="tagName" />
-  </resultMap>
-</mapper>
\ No newline at end of file
+	<resultMap id="BaseResultMap" type="com.len.entity.BlogTag">
+		<!--
+		  WARNING - @mbg.generated
+		-->
+		<id column="id" jdbcType="VARCHAR" property="id"/>
+		<result column="tag_code" jdbcType="VARCHAR" property="tagCode"/>
+		<result column="tag_name" jdbcType="VARCHAR" property="tagName"/>
+	</resultMap>
+</mapper>
diff --git a/len-core/pom.xml b/len-core/pom.xml
index 70767a8..6702cee 100644
--- a/len-core/pom.xml
+++ b/len-core/pom.xml
@@ -1,38 +1,38 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <artifactId>lenosp</artifactId>
-    <groupId>com.len</groupId>
-    <version>lenosp-2.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>len-core</artifactId>
-
-
-  <name>len-core</name>
-  <url>http://maven.apache.org</url>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- https://mvnrepository.com/artifact/javax.mail/mail -->
-    <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>mail</artifactId>
-      <version>1.5.0-b01</version>
-    </dependency>
-
-
-  </dependencies>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<artifactId>lenosp</artifactId>
+		<groupId>com.len</groupId>
+		<version>lenosp-2.0-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>len-core</artifactId>
+
+
+	<name>len-core</name>
+	<url>http://maven.apache.org</url>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.1</version>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/javax.mail/mail -->
+		<dependency>
+			<groupId>javax.mail</groupId>
+			<artifactId>mail</artifactId>
+			<version>1.5.0-b01</version>
+		</dependency>
+
+
+	</dependencies>
 </project>
diff --git a/len-core/src/main/java/com/len/base/BaseController.java b/len-core/src/main/java/com/len/base/BaseController.java
index 64d0d5f..1dcaf45 100644
--- a/len-core/src/main/java/com/len/base/BaseController.java
+++ b/len-core/src/main/java/com/len/base/BaseController.java
@@ -1,15 +1,11 @@
 package com.len.base;
 
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.alibaba.fastjson.JSON;
+import com.google.common.collect.Maps;
+import com.len.exception.ServiceException;
+import com.len.util.LenResponse;
+import com.len.util.MsHelper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.authz.AuthorizationException;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
@@ -17,100 +13,101 @@ import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.InitBinder;
 
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Maps;
-import com.len.exception.ServiceException;
-import com.len.util.LenResponse;
-import com.len.util.MsHelper;
-
-import lombok.extern.slf4j.Slf4j;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Map;
 
 
 @Slf4j
 public abstract class BaseController {
 
-    @InitBinder
-    protected void initBinder(WebDataBinder binder) {
-        binder.registerCustomEditor(Date.class,
-            new CustomDateEditor(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"), true));
-        binder.registerCustomEditor(Date.class, new CustomDateEditor(new SimpleDateFormat("yyyy-MM-dd"), true));
-    }
-
-    @ExceptionHandler({UnauthorizedException.class, AuthorizationException.class})
-    public String authorizationException(HttpServletRequest request, HttpServletResponse response) {
-        if (isAjaxRequest(request)) {
-            Map<String, Object> map = Maps.newHashMap();
-            map.put("code", "403");
-            map.put("message", "无权限");
-            return JSON.toJSONString(map);
-        } else {
-            String message = "权限不足";
-            try {
-                message = URLEncoder.encode(message, "utf-8");
-            } catch (UnsupportedEncodingException e) {
-                log.error("BaseController：" + e.getMessage());
-                e.printStackTrace();
-            }
-            return "redirect:/error/403?message=" + message;
-        }
-    }
-
-    @ExceptionHandler({Exception.class})
-    public void runTimeException(Exception e, HttpServletResponse response) {
-        response.setContentType("application/json");
-        try {
-            log.error(String.format("Unknown exception information :%s", e.getMessage()));
-            LenResponse lenResponse = new LenResponse(false, MsHelper.getMsg("system.error"));
-            response.getWriter().write(JSON.toJSONString(lenResponse));
-        } catch (IOException e1) {
-            e1.printStackTrace();
-        }
-    }
-
-    @ExceptionHandler({ServiceException.class})
-    public void serviceException(ServiceException e, HttpServletResponse response) {
-        response.setContentType("application/json");
-        try {
-            log.error(String.format("serviceException :%s", e.getMessage()));
-            String message = e.getMessage();
-            LenResponse lenResponse = new LenResponse(false, message);
-            response.getWriter().write(JSON.toJSONString(lenResponse));
-        } catch (IOException e1) {
-            e1.printStackTrace();
-        }
-    }
-
-    private static boolean isAjaxRequest(HttpServletRequest request) {
-        String requestedWith = request.getHeader("x-requested-with");
-        return requestedWith != null && requestedWith.equalsIgnoreCase("XMLHttpRequest");
-    }
-
-    public LenResponse resp(boolean flag, String msg) {
-        return new LenResponse(flag, msg);
-    }
-
-    public LenResponse resp(boolean flag) {
-        return resp(flag, null);
-    }
-
-    public LenResponse succ(String msg) {
-        return resp(true, msg);
-    }
-
-    public LenResponse succ(Object data) {
-        return new LenResponse(true, data);
-    }
-
-    public LenResponse succ() {
-        return succ(null);
-    }
-
-    public LenResponse error(String msg) {
-        return resp(false, msg);
-    }
-
-    public LenResponse error() {
-        return error(null);
-    }
+	private static boolean isAjaxRequest(HttpServletRequest request) {
+		String requestedWith = request.getHeader("x-requested-with");
+		return requestedWith != null && requestedWith.equalsIgnoreCase("XMLHttpRequest");
+	}
+
+	@InitBinder
+	protected void initBinder(WebDataBinder binder) {
+		binder.registerCustomEditor(Date.class,
+			new CustomDateEditor(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"), true));
+		binder.registerCustomEditor(Date.class, new CustomDateEditor(new SimpleDateFormat("yyyy-MM-dd"), true));
+	}
+
+	@ExceptionHandler({UnauthorizedException.class, AuthorizationException.class})
+	public String authorizationException(HttpServletRequest request, HttpServletResponse response) {
+		if (isAjaxRequest(request)) {
+			Map<String, Object> map = Maps.newHashMap();
+			map.put("code", "403");
+			map.put("message", "无权限");
+			return JSON.toJSONString(map);
+		} else {
+			String message = "权限不足";
+			try {
+				message = URLEncoder.encode(message, "utf-8");
+			} catch (UnsupportedEncodingException e) {
+				log.error("BaseController：" + e.getMessage());
+				e.printStackTrace();
+			}
+			return "redirect:/error/403?message=" + message;
+		}
+	}
+
+	@ExceptionHandler({Exception.class})
+	public void runTimeException(Exception e, HttpServletResponse response) {
+		response.setContentType("application/json");
+		try {
+			log.error(String.format("Unknown exception information :%s", e.getMessage()));
+			LenResponse lenResponse = new LenResponse(false, MsHelper.getMsg("system.error"));
+			response.getWriter().write(JSON.toJSONString(lenResponse));
+		} catch (IOException e1) {
+			e1.printStackTrace();
+		}
+	}
+
+	@ExceptionHandler({ServiceException.class})
+	public void serviceException(ServiceException e, HttpServletResponse response) {
+		response.setContentType("application/json");
+		try {
+			log.error(String.format("serviceException :%s", e.getMessage()));
+			String message = e.getMessage();
+			LenResponse lenResponse = new LenResponse(false, message);
+			response.getWriter().write(JSON.toJSONString(lenResponse));
+		} catch (IOException e1) {
+			e1.printStackTrace();
+		}
+	}
+
+	public LenResponse resp(boolean flag, String msg) {
+		return new LenResponse(flag, msg);
+	}
+
+	public LenResponse resp(boolean flag) {
+		return resp(flag, null);
+	}
+
+	public LenResponse succ(String msg) {
+		return resp(true, msg);
+	}
+
+	public LenResponse succ(Object data) {
+		return new LenResponse(true, data);
+	}
+
+	public LenResponse succ() {
+		return succ(null);
+	}
+
+	public LenResponse error(String msg) {
+		return resp(false, msg);
+	}
+
+	public LenResponse error() {
+		return error(null);
+	}
 
 }
diff --git a/len-core/src/main/java/com/len/base/BaseEntity.java b/len-core/src/main/java/com/len/base/BaseEntity.java
index 83cec63..f22e32b 100644
--- a/len-core/src/main/java/com/len/base/BaseEntity.java
+++ b/len-core/src/main/java/com/len/base/BaseEntity.java
@@ -1,7 +1,6 @@
 package com.len.base;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
@@ -12,14 +11,14 @@ import java.util.Date;
 @Data
 public class BaseEntity implements Serializable {
 
-    @TableId(type = IdType.UUID)
-    private String id;
+	@TableId(type = IdType.UUID)
+	private String id;
 
-    private String createBy;
+	private String createBy;
 
-    private Date createDate;
+	private Date createDate;
 
-    private String updateBy;
+	private String updateBy;
 
-    private Date updateDate;
+	private Date updateDate;
 }
diff --git a/len-core/src/main/java/com/len/base/BaseMapper.java b/len-core/src/main/java/com/len/base/BaseMapper.java
index c1a932f..5d46c10 100644
--- a/len-core/src/main/java/com/len/base/BaseMapper.java
+++ b/len-core/src/main/java/com/len/base/BaseMapper.java
@@ -10,11 +10,11 @@ import java.util.List;
  */
 public interface BaseMapper<T> extends com.baomidou.mybatisplus.core.mapper.BaseMapper<T> {
 
-    public List<T> selectListByPage(T record);
+	public List<T> selectListByPage(T record);
 
-    public ReType show(T t, int page, int limit);
+	public ReType show(T t, int page, int limit);
 
-    public ReType getList(T t, int page, int limit);
+	public ReType getList(T t, int page, int limit);
 
-    public String showAll(T t);
+	public String showAll(T t);
 }
diff --git a/len-core/src/main/java/com/len/base/BaseService.java b/len-core/src/main/java/com/len/base/BaseService.java
index a850be3..bf5fd19 100644
--- a/len-core/src/main/java/com/len/base/BaseService.java
+++ b/len-core/src/main/java/com/len/base/BaseService.java
@@ -11,9 +11,9 @@ import java.util.List;
 public interface BaseService<T> extends IService<T> {
 
 
-    public ReType show(T t, int page, int limit);
+	public ReType show(T t, int page, int limit);
 
-    public ReType getList(T t, int page, int limit);
+	public ReType getList(T t, int page, int limit);
 
-    public List<T> showAll(T t);
+	public List<T> showAll(T t);
 }
diff --git a/len-core/src/main/java/com/len/base/CurrentMenu.java b/len-core/src/main/java/com/len/base/CurrentMenu.java
index d28160f..8ade5ca 100644
--- a/len-core/src/main/java/com/len/base/CurrentMenu.java
+++ b/len-core/src/main/java/com/len/base/CurrentMenu.java
@@ -1,60 +1,63 @@
 package com.len.base;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
+import java.io.Serializable;
+import java.util.Date;
+
 
 @Getter
 @Setter
 @ToString
 public class CurrentMenu implements Serializable {
-    /**
-     * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
-     */
-    private static final long serialVersionUID = 1L;
+	/**
+	 * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
+	 */
+	private static final long serialVersionUID = 1L;
 
-    private String id;
+	private String id;
 
-    private String name;
+	private String name;
 
-    private String pId;
+	private String pId;
 
-    private String url;
+	private String url;
 
-    private Integer orderNum;
+	private Integer orderNum;
 
-    private String icon;
+	private String icon;
 
-    private String createBy;
+	private String createBy;
 
-    private Date createDate;
+	private Date createDate;
 
-    private String updateBy;
+	private String updateBy;
 
-    private Date updateDate;
+	private Date updateDate;
 
-    private String permission;
+	private String permission;
 
-    private Byte menuType;
-    /** 菜单排序id 填充菜单展示id */
-    private String code;
+	private Byte menuType;
+	/**
+	 * 菜单排序id 填充菜单展示id
+	 */
+	private String code;
 
-    public CurrentMenu(String id, String name, String pId, String url, Integer orderNum, String icon, String permission,
-        Byte menuType, String code) {
-        this.id = id;
-        this.name = name;
-        this.pId = pId;
-        this.url = url;
-        this.orderNum = orderNum;
-        this.icon = icon;
-        this.permission = permission;
-        this.menuType = menuType;
-        this.code = code;
-    }
+	public CurrentMenu(String id, String name, String pId, String url, Integer orderNum, String icon, String permission,
+					   Byte menuType, String code) {
+		this.id = id;
+		this.name = name;
+		this.pId = pId;
+		this.url = url;
+		this.orderNum = orderNum;
+		this.icon = icon;
+		this.permission = permission;
+		this.menuType = menuType;
+		this.code = code;
+	}
 
-    public CurrentMenu() {}
+	public CurrentMenu() {
+	}
 }
diff --git a/len-core/src/main/java/com/len/base/CurrentRole.java b/len-core/src/main/java/com/len/base/CurrentRole.java
index d0ebd4a..8f7ef0c 100644
--- a/len-core/src/main/java/com/len/base/CurrentRole.java
+++ b/len-core/src/main/java/com/len/base/CurrentRole.java
@@ -1,33 +1,30 @@
 package com.len.base;
 
-import java.io.Serializable;
-
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
+
+import java.io.Serializable;
 
 
 @Data
 public class CurrentRole implements Serializable {
 
-    /**  
-	 * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)  
+	/**
+	 * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么)
 	 */
 	private static final long serialVersionUID = 1L;
 
 	private String id;
 
-    private String roleName;
+	private String roleName;
 
-    private String remark;
+	private String remark;
 
-    public CurrentRole(String id, String roleName, String remark) {
-        this.id = id;
-        this.roleName = roleName;
-        this.remark = remark;
-    }
+	public CurrentRole(String id, String roleName, String remark) {
+		this.id = id;
+		this.roleName = roleName;
+		this.remark = remark;
+	}
 
-    public CurrentRole() {
-    }
+	public CurrentRole() {
+	}
 }
diff --git a/len-core/src/main/java/com/len/base/CurrentUser.java b/len-core/src/main/java/com/len/base/CurrentUser.java
index ebb725a..3286249 100644
--- a/len-core/src/main/java/com/len/base/CurrentUser.java
+++ b/len-core/src/main/java/com/len/base/CurrentUser.java
@@ -1,52 +1,41 @@
 package com.len.base;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
 @Getter
 @Setter
 @ToString
 public class CurrentUser implements Serializable {
-    private String id;
-
-    private String username;
-
-    private String password;
-
-    private Integer age;
-
-    private String email;
-
-    private String photo;
-
-    private String realName;
-
-    private String createBy;
-
-    private String updateBy;
-
-    private Date createDate;
-
-    private Date updateDate;
-
-    private Byte delFlag;
-
-   private List<CurrentMenu> currentMenuList;
-   private List<CurrentRole> currentRoleList;
-    private static final long serialVersionUID = 1L;
-
-    public CurrentUser(String id, String username, Integer age, String email, String photo) {
-        this.id = id;
-        this.username = username;
-        this.age = age;
-        this.email = email;
-        this.photo = photo;
-    }
-
-    public CurrentUser() {
-    }
-}
\ No newline at end of file
+	private static final long serialVersionUID = 1L;
+	private String id;
+	private String username;
+	private String password;
+	private Integer age;
+	private String email;
+	private String photo;
+	private String realName;
+	private String createBy;
+	private String updateBy;
+	private Date createDate;
+	private Date updateDate;
+	private Byte delFlag;
+	private List<CurrentMenu> currentMenuList;
+	private List<CurrentRole> currentRoleList;
+
+	public CurrentUser(String id, String username, Integer age, String email, String photo) {
+		this.id = id;
+		this.username = username;
+		this.age = age;
+		this.email = email;
+		this.photo = photo;
+	}
+
+	public CurrentUser() {
+	}
+}
diff --git a/len-core/src/main/java/com/len/base/handler/ExecuteContext.java b/len-core/src/main/java/com/len/base/handler/ExecuteContext.java
index a7536db..4409cfe 100644
--- a/len-core/src/main/java/com/len/base/handler/ExecuteContext.java
+++ b/len-core/src/main/java/com/len/base/handler/ExecuteContext.java
@@ -3,8 +3,7 @@ package com.len.base.handler;
 import org.springframework.context.event.ContextRefreshedEvent;
 
 
-
 public interface ExecuteContext {
 
-    void execute(ContextRefreshedEvent event);
+	void execute(ContextRefreshedEvent event);
 }
diff --git a/len-core/src/main/java/com/len/base/impl/AbstractServiceImpl.java b/len-core/src/main/java/com/len/base/impl/AbstractServiceImpl.java
index 59e72ec..b603405 100644
--- a/len-core/src/main/java/com/len/base/impl/AbstractServiceImpl.java
+++ b/len-core/src/main/java/com/len/base/impl/AbstractServiceImpl.java
@@ -16,49 +16,49 @@ import java.util.List;
 public class AbstractServiceImpl<E extends com.baomidou.mybatisplus.core.mapper.BaseMapper, T> extends ServiceImpl<BaseMapper<T>, T> implements BaseService<T> {
 
 
-    /**
-     * 公共展示类
-     *
-     * @param t     实体
-     * @param page  页
-     * @param limit 行
-     * @return
-     */
-    @Override
-    public ReType show(T t, int page, int limit) {
-        List<T> tList = null;
-        Page<T> tPage = PageHelper.startPage(page, limit);
-        try {
-            tList = getBaseMapper().selectListByPage(t);
-        } catch (LenException e) {
-            log.error("class:BaseServiceImpl ->method:show->message:" + e.getMessage());
-            e.printStackTrace();
-        }
-        return new ReType(tPage.getTotal(), tList);
-    }
+	/**
+	 * 公共展示类
+	 *
+	 * @param t     实体
+	 * @param page  页
+	 * @param limit 行
+	 * @return
+	 */
+	@Override
+	public ReType show(T t, int page, int limit) {
+		List<T> tList = null;
+		Page<T> tPage = PageHelper.startPage(page, limit);
+		try {
+			tList = getBaseMapper().selectListByPage(t);
+		} catch (LenException e) {
+			log.error("class:BaseServiceImpl ->method:show->message:" + e.getMessage());
+			e.printStackTrace();
+		}
+		return new ReType(tPage.getTotal(), tList);
+	}
 
-    @Override
-    public List<T> showAll(T t) {
-        List<T> tList = null;
-        try {
-            tList = getBaseMapper().selectListByPage(t);
-        } catch (LenException e) {
-            log.error("class:BaseServiceImpl ->method:show->message:" + e.getMessage());
-            e.printStackTrace();
-        }
-        return tList;
-    }
+	@Override
+	public List<T> showAll(T t) {
+		List<T> tList = null;
+		try {
+			tList = getBaseMapper().selectListByPage(t);
+		} catch (LenException e) {
+			log.error("class:BaseServiceImpl ->method:show->message:" + e.getMessage());
+			e.printStackTrace();
+		}
+		return tList;
+	}
 
-    @Override
-    public ReType getList(T t, int page, int limit) {
-        List<T> tList = null;
-        Page<T> tPage = PageHelper.startPage(page, limit);
-        try {
-            tList = getBaseMapper().selectListByPage(t);
-        } catch (LenException e) {
-            log.error("class:BaseServiceImpl ->method:getList->message:" + e.getMessage());
-            e.printStackTrace();
-        }
-        return new ReType(tPage.getTotal(), tPage.getPageNum(), tList);
-    }
+	@Override
+	public ReType getList(T t, int page, int limit) {
+		List<T> tList = null;
+		Page<T> tPage = PageHelper.startPage(page, limit);
+		try {
+			tList = getBaseMapper().selectListByPage(t);
+		} catch (LenException e) {
+			log.error("class:BaseServiceImpl ->method:getList->message:" + e.getMessage());
+			e.printStackTrace();
+		}
+		return new ReType(tPage.getTotal(), tPage.getPageNum(), tList);
+	}
 }
diff --git a/len-core/src/main/java/com/len/cache/CacheManagerFactory.java b/len-core/src/main/java/com/len/cache/CacheManagerFactory.java
index abdfdc2..06575e8 100644
--- a/len-core/src/main/java/com/len/cache/CacheManagerFactory.java
+++ b/len-core/src/main/java/com/len/cache/CacheManagerFactory.java
@@ -1,45 +1,44 @@
 package com.len.cache;
 
+import com.len.cache.impl.config.LenProp;
+import com.len.exception.LenException;
 import org.apache.shiro.cache.CacheManager;
 import org.apache.shiro.cache.ehcache.EhCacheManager;
 import org.crazycake.shiro.RedisCacheManager;
 import org.crazycake.shiro.RedisManager;
 
-import com.len.cache.impl.config.LenProp;
-import com.len.exception.LenException;
-
 
 public class CacheManagerFactory {
 
-    private static CacheManager cacheManager;
-
-    static {
-        String provider = LenProp.getCache();
-        switch (provider) {
-            case "ehcache":
-                EhCacheManager ehCacheManager = new EhCacheManager();
-                ehCacheManager.setCacheManagerConfigFile("classpath:ehcache/ehcache.xml");
-                cacheManager = ehCacheManager;
-                break;
-            case "redis":
-                RedisCacheManager redisCacheManager = new RedisCacheManager();
-                redisCacheManager.setRedisManager(getRedisManager());
-                redisCacheManager.setPrincipalIdFieldName("id");
-                cacheManager = redisCacheManager;
-                break;
-            default:
-                throw new LenException(String.format("不支持的缓存 [%]", provider));
-
-        }
-    }
-
-    public static CacheManager getCacheManager() {
-        return cacheManager;
-    }
-
-    public static RedisManager getRedisManager() {
-        RedisManager redisManager = new RedisManager();
-        redisManager.setHost(String.format("%s:%s", LenProp.getRedisHost(), LenProp.getRedisPort()));
-        return redisManager;
-    }
+	private static CacheManager cacheManager;
+
+	static {
+		String provider = LenProp.getCache();
+		switch (provider) {
+			case "ehcache":
+				EhCacheManager ehCacheManager = new EhCacheManager();
+				ehCacheManager.setCacheManagerConfigFile("classpath:ehcache/ehcache.xml");
+				cacheManager = ehCacheManager;
+				break;
+			case "redis":
+				RedisCacheManager redisCacheManager = new RedisCacheManager();
+				redisCacheManager.setRedisManager(getRedisManager());
+				redisCacheManager.setPrincipalIdFieldName("id");
+				cacheManager = redisCacheManager;
+				break;
+			default:
+				throw new LenException(String.format("不支持的缓存 [%]", provider));
+
+		}
+	}
+
+	public static CacheManager getCacheManager() {
+		return cacheManager;
+	}
+
+	public static RedisManager getRedisManager() {
+		RedisManager redisManager = new RedisManager();
+		redisManager.setHost(String.format("%s:%s", LenProp.getRedisHost(), LenProp.getRedisPort()));
+		return redisManager;
+	}
 }
diff --git a/len-core/src/main/java/com/len/cache/impl/config/LenProp.java b/len-core/src/main/java/com/len/cache/impl/config/LenProp.java
index 1d74791..703e399 100644
--- a/len-core/src/main/java/com/len/cache/impl/config/LenProp.java
+++ b/len-core/src/main/java/com/len/cache/impl/config/LenProp.java
@@ -5,43 +5,43 @@ package com.len.cache.impl.config;
  */
 public class LenProp {
 
-    /**
-     * redis host address
-     */
-    private static String redisHost;
-    /**
-     * redis post
-     */
-    private static String redisPort;
-    /**
-     * cache
-     */
-    private static String cache;
-    /**
-     * session cache
-     */
-    private static String sessionCache;
+	/**
+	 * redis host address
+	 */
+	private static String redisHost;
+	/**
+	 * redis post
+	 */
+	private static String redisPort;
+	/**
+	 * cache
+	 */
+	private static String cache;
+	/**
+	 * session cache
+	 */
+	private static String sessionCache;
 
-    static {
-        redisHost = PropertiesConfig.getValue("redis.host");
-        redisPort = PropertiesConfig.getValue("redis.port");
-        cache = PropertiesConfig.getValue("cache");
-        sessionCache = PropertiesConfig.getValue("cache");
-    }
+	static {
+		redisHost = PropertiesConfig.getValue("redis.host");
+		redisPort = PropertiesConfig.getValue("redis.port");
+		cache = PropertiesConfig.getValue("cache");
+		sessionCache = PropertiesConfig.getValue("cache");
+	}
 
-    public static String getRedisHost() {
-        return redisHost;
-    }
+	public static String getRedisHost() {
+		return redisHost;
+	}
 
-    public static String getRedisPort() {
-        return redisPort;
-    }
+	public static String getRedisPort() {
+		return redisPort;
+	}
 
-    public static String getCache() {
-        return cache;
-    }
+	public static String getCache() {
+		return cache;
+	}
 
-    public static String getSessionCache() {
-        return sessionCache;
-    }
+	public static String getSessionCache() {
+		return sessionCache;
+	}
 }
diff --git a/len-core/src/main/java/com/len/cache/impl/config/PropertiesConfig.java b/len-core/src/main/java/com/len/cache/impl/config/PropertiesConfig.java
index 009e1ef..8ce2e11 100644
--- a/len-core/src/main/java/com/len/cache/impl/config/PropertiesConfig.java
+++ b/len-core/src/main/java/com/len/cache/impl/config/PropertiesConfig.java
@@ -5,21 +5,21 @@ import java.util.Properties;
 
 public class PropertiesConfig {
 
-    private static final String propertiesName = "len.properties";
+	private static final String propertiesName = "len.properties";
 
 
-    private static Properties properties = new Properties();
+	private static Properties properties = new Properties();
 
-    static {
-        try {
-            properties.load(Thread.currentThread().getContextClassLoader().getResourceAsStream(propertiesName));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
+	static {
+		try {
+			properties.load(Thread.currentThread().getContextClassLoader().getResourceAsStream(propertiesName));
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
 
-    public static String getValue(String key) {
-        return properties.getProperty(key);
-    }
+	public static String getValue(String key) {
+		return properties.getProperty(key);
+	}
 
 }
diff --git a/len-core/src/main/java/com/len/enums/PanelEnum.java b/len-core/src/main/java/com/len/enums/PanelEnum.java
index 55575d5..75d0162 100644
--- a/len-core/src/main/java/com/len/enums/PanelEnum.java
+++ b/len-core/src/main/java/com/len/enums/PanelEnum.java
@@ -2,11 +2,11 @@ package com.len.enums;
 
 public enum PanelEnum {
 
-    // 动态
-    DYNAMIC,
-    // 快捷菜单
-    SHORTCUTS,
-    // 待办事项
-    BACKLOG
+	// 动态
+	DYNAMIC,
+	// 快捷菜单
+	SHORTCUTS,
+	// 待办事项
+	BACKLOG
 
 }
diff --git a/len-core/src/main/java/com/len/exception/CustomErrorViewResolver.java b/len-core/src/main/java/com/len/exception/CustomErrorViewResolver.java
index d7c5ea2..8e2032b 100644
--- a/len-core/src/main/java/com/len/exception/CustomErrorViewResolver.java
+++ b/len-core/src/main/java/com/len/exception/CustomErrorViewResolver.java
@@ -12,30 +12,30 @@ import java.util.Map;
 @ControllerAdvice
 public class CustomErrorViewResolver implements ErrorViewResolver {
 
-    private static final String PAGE_500 = "/error/500";
-    private static final String PAGE_404 = "/error/404";
-    private static final String PAGE_403 = "/error/403";
-    private static final String OTHER_ERROR = "/error/error";
-
-    @Override
-    public ModelAndView resolveErrorView(HttpServletRequest request,
-                                         HttpStatus status, Map<String, Object> model) {
-        boolean isServerError = status.is5xxServerError();
-        ModelAndView andView = new ModelAndView();
-        andView.addObject("message", model.get("message"));
-
-        if (status.value() == 404) {
-            andView.setViewName(PAGE_404);
-        } else if (status.value() == 403) {
-            andView.setViewName(PAGE_403);
-        } else if (isServerError) {
-            andView.setViewName(PAGE_500);
-        } else {
-            andView.addObject("status", status.value());
-            andView.setViewName(OTHER_ERROR);
-        }
-        return andView;
-
-    }
-
-}
\ No newline at end of file
+	private static final String PAGE_500 = "/error/500";
+	private static final String PAGE_404 = "/error/404";
+	private static final String PAGE_403 = "/error/403";
+	private static final String OTHER_ERROR = "/error/error";
+
+	@Override
+	public ModelAndView resolveErrorView(HttpServletRequest request,
+										 HttpStatus status, Map<String, Object> model) {
+		boolean isServerError = status.is5xxServerError();
+		ModelAndView andView = new ModelAndView();
+		andView.addObject("message", model.get("message"));
+
+		if (status.value() == 404) {
+			andView.setViewName(PAGE_404);
+		} else if (status.value() == 403) {
+			andView.setViewName(PAGE_403);
+		} else if (isServerError) {
+			andView.setViewName(PAGE_500);
+		} else {
+			andView.addObject("status", status.value());
+			andView.setViewName(OTHER_ERROR);
+		}
+		return andView;
+
+	}
+
+}
diff --git a/len-core/src/main/java/com/len/exception/LenException.java b/len-core/src/main/java/com/len/exception/LenException.java
index 23d76c6..9d9cc33 100644
--- a/len-core/src/main/java/com/len/exception/LenException.java
+++ b/len-core/src/main/java/com/len/exception/LenException.java
@@ -3,19 +3,19 @@ package com.len.exception;
 
 public class LenException extends RuntimeException {
 
-  private String message;
+	private String message;
 
-  public LenException(String message){
-    super(message);
-    this.message=message;
-  }
+	public LenException(String message) {
+		super(message);
+		this.message = message;
+	}
 
-  @Override
-  public String getMessage() {
-    return message;
-  }
+	@Override
+	public String getMessage() {
+		return message;
+	}
 
-  public void setMessage(String message) {
-    this.message = message;
-  }
+	public void setMessage(String message) {
+		this.message = message;
+	}
 }
diff --git a/len-core/src/main/java/com/len/exception/ServiceException.java b/len-core/src/main/java/com/len/exception/ServiceException.java
index 0b2d9dc..057c4ac 100644
--- a/len-core/src/main/java/com/len/exception/ServiceException.java
+++ b/len-core/src/main/java/com/len/exception/ServiceException.java
@@ -1,23 +1,21 @@
 package com.len.exception;
 
 
-
-
 public class ServiceException extends RuntimeException {
 
-    private String message;
+	private String message;
 
-    public ServiceException(String message) {
-        super(message);
-        this.message=message;
-    }
+	public ServiceException(String message) {
+		super(message);
+		this.message = message;
+	}
 
-    @Override
-    public String getMessage() {
-        return message;
-    }
+	@Override
+	public String getMessage() {
+		return message;
+	}
 
-    public void setMessage(String message) {
-        this.message = message;
-    }
+	public void setMessage(String message) {
+		this.message = message;
+	}
 }
diff --git a/len-core/src/main/java/com/len/freemarker/LenInclude.java b/len-core/src/main/java/com/len/freemarker/LenInclude.java
index 2bd583f..7cbc4ec 100644
--- a/len-core/src/main/java/com/len/freemarker/LenInclude.java
+++ b/len-core/src/main/java/com/len/freemarker/LenInclude.java
@@ -27,44 +27,44 @@ import java.util.Map;
  */
 public class LenInclude implements TemplateDirectiveModel {
 
-    private static final String PATH = "path";
+	private static final String PATH = "path";
 
-    @Override
-    public void execute(Environment environment, Map map, TemplateModel[] templateModels, TemplateDirectiveBody templateDirectiveBody) throws TemplateException, IOException {
-        TemplateLoader templateLoader = environment.getConfiguration().getTemplateLoader();
-        String templatePath = templatePath(environment, map, PATH);
-        DefaultObjectWrapperBuilder builder = new DefaultObjectWrapperBuilder(Configuration.VERSION_2_3_29);
-        if (templatePath.startsWith("/")) {
-            templatePath = templatePath.substring(1);
-        }
-        if (templateLoader.findTemplateSource(templatePath) == null) {
-            throw new _MiscTemplateException(String.format("未找到模板文件(Template file not found)[%s]", templatePath));
-        }
-        HashMap paramMap = new HashMap<String, Object>(map);
-        paramMap.remove(PATH);
-        for (Object key : paramMap.keySet()) {
-            TemplateModel templateModel = builder.build().wrap(map.get(key));
-            environment.setVariable(key.toString(), templateModel);
-        }
-        Template templateForInclusion = environment.getTemplateForInclusion(templatePath, null, true);
-        environment.include(templateForInclusion);
+	@Override
+	public void execute(Environment environment, Map map, TemplateModel[] templateModels, TemplateDirectiveBody templateDirectiveBody) throws TemplateException, IOException {
+		TemplateLoader templateLoader = environment.getConfiguration().getTemplateLoader();
+		String templatePath = templatePath(environment, map, PATH);
+		DefaultObjectWrapperBuilder builder = new DefaultObjectWrapperBuilder(Configuration.VERSION_2_3_29);
+		if (templatePath.startsWith("/")) {
+			templatePath = templatePath.substring(1);
+		}
+		if (templateLoader.findTemplateSource(templatePath) == null) {
+			throw new _MiscTemplateException(String.format("未找到模板文件(Template file not found)[%s]", templatePath));
+		}
+		HashMap paramMap = new HashMap<String, Object>(map);
+		paramMap.remove(PATH);
+		for (Object key : paramMap.keySet()) {
+			TemplateModel templateModel = builder.build().wrap(map.get(key));
+			environment.setVariable(key.toString(), templateModel);
+		}
+		Template templateForInclusion = environment.getTemplateForInclusion(templatePath, null, true);
+		environment.include(templateForInclusion);
 
-        if (templateDirectiveBody != null) {
-            templateDirectiveBody.render(environment.getOut());
-        }
-    }
+		if (templateDirectiveBody != null) {
+			templateDirectiveBody.render(environment.getOut());
+		}
+	}
 
-    private String templatePath(Environment environment, Map params, String templatePath)
-            throws MalformedTemplateNameException {
-        if (!params.containsKey(templatePath)) {
-            throw new MalformedTemplateNameException("missing required parameter '" + templatePath, "'");
-        }
+	private String templatePath(Environment environment, Map params, String templatePath)
+		throws MalformedTemplateNameException {
+		if (!params.containsKey(templatePath)) {
+			throw new MalformedTemplateNameException("missing required parameter '" + templatePath, "'");
+		}
 
-        String currentTemplateName = environment.getMainTemplate().getName();
-        final String baseName = FilenameUtils.getPath(currentTemplateName);
+		String currentTemplateName = environment.getMainTemplate().getName();
+		final String baseName = FilenameUtils.getPath(currentTemplateName);
 
-        final String targetName = params.get(templatePath).toString();
+		final String targetName = params.get(templatePath).toString();
 
-        return environment.toFullTemplateName(baseName, targetName);
-    }
+		return environment.toFullTemplateName(baseName, targetName);
+	}
 }
diff --git a/len-core/src/main/java/com/len/menu/LoginType.java b/len-core/src/main/java/com/len/menu/LoginType.java
index 738b55f..db88137 100644
--- a/len-core/src/main/java/com/len/menu/LoginType.java
+++ b/len-core/src/main/java/com/len/menu/LoginType.java
@@ -1,22 +1,20 @@
 package com.len.menu;
 
 
-
-
 public enum LoginType {
 
-    BLOG("BlogLogin"),
-    SYS("UserLogin");
+	BLOG("BlogLogin"),
+	SYS("UserLogin");
 
-    private String type;
+	private String type;
 
-    private LoginType(String type) {
-        this.type = type;
-    }
+	private LoginType(String type) {
+		this.type = type;
+	}
 
 
-    @Override
-    public String toString() {
-        return this.type;
-    }
+	@Override
+	public String toString() {
+		return this.type;
+	}
 }
diff --git a/len-core/src/main/java/com/len/redis/RedisService.java b/len-core/src/main/java/com/len/redis/RedisService.java
index 205039c..41e4504 100644
--- a/len-core/src/main/java/com/len/redis/RedisService.java
+++ b/len-core/src/main/java/com/len/redis/RedisService.java
@@ -5,7 +5,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
-import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.concurrent.TimeUnit;
@@ -14,82 +13,82 @@ import java.util.concurrent.TimeUnit;
 // @Service
 public class RedisService<T> {
 
-    @Autowired
-    private StringRedisTemplate stringRedisTemplate;
+	@Autowired
+	private StringRedisTemplate stringRedisTemplate;
 
-    @Autowired
-    private RedisTemplate<Object, T> redisTemplate;
+	@Autowired
+	private RedisTemplate<Object, T> redisTemplate;
 
-    @Resource(name = "stringRedisTemplate")
-    private ValueOperations<String, String> valueOps;
+	@Resource(name = "stringRedisTemplate")
+	private ValueOperations<String, String> valueOps;
 
-    @Resource(name = "redisTemplate")
-    private ValueOperations<Object, T> valOpsObj;
+	@Resource(name = "redisTemplate")
+	private ValueOperations<Object, T> valOpsObj;
 
-    @Value("${redis.prefix}")
-    private String prefix;
+	@Value("${redis.prefix}")
+	private String prefix;
 
-    /**
-     * 获取缓存字符串 根据key
-     *
-     * @param key 字符串key
-     * @return value
-     */
-    public String get(String key) {
-        key = prefix + key;
-        return valueOps.get(key);
-    }
+	/**
+	 * 获取缓存字符串 根据key
+	 *
+	 * @param key 字符串key
+	 * @return value
+	 */
+	public String get(String key) {
+		key = prefix + key;
+		return valueOps.get(key);
+	}
 
-    /**
-     * set value and cache timeout by str key
-     *
-     * @param key 字符串key
-     * @param value 字符串value
-     * @param second 过期时间 单位 秒
-     */
-    public void set(String key, String value, Long second) {
-        key = prefix + key;
-        valueOps.set(key, value, second, TimeUnit.SECONDS);
-    }
+	/**
+	 * set value and cache timeout by str key
+	 *
+	 * @param key    字符串key
+	 * @param value  字符串value
+	 * @param second 过期时间 单位 秒
+	 */
+	public void set(String key, String value, Long second) {
+		key = prefix + key;
+		valueOps.set(key, value, second, TimeUnit.SECONDS);
+	}
 
-    /**
-     * get object value by key
-     *
-     * @param key obj key
-     * @return obj value
-     */
-    public T getObj(Object key) {
-        key = prefix + key.toString();
-        return valOpsObj.get(key);
-    }
+	/**
+	 * get object value by key
+	 *
+	 * @param key obj key
+	 * @return obj value
+	 */
+	public T getObj(Object key) {
+		key = prefix + key.toString();
+		return valOpsObj.get(key);
+	}
 
-    /**
-     * set value by key
-     *
-     * @param key obj key
-     * @param value obj value
-     * @param second 过期时间 单位户 秒
-     */
-    public void setObj(Object key, T value, Long second) {
-        key = prefix + key.toString();
-        valOpsObj.set(key, value, second, TimeUnit.SECONDS);
-    }
+	/**
+	 * set value by key
+	 *
+	 * @param key    obj key
+	 * @param value  obj value
+	 * @param second 过期时间 单位户 秒
+	 */
+	public void setObj(Object key, T value, Long second) {
+		key = prefix + key.toString();
+		valOpsObj.set(key, value, second, TimeUnit.SECONDS);
+	}
 
-    /**
-     * delete by key
-     *
-     * @param key key
-     */
-    public void del(String key) {
-        stringRedisTemplate.delete(prefix + key);
-    }
+	/**
+	 * delete by key
+	 *
+	 * @param key key
+	 */
+	public void del(String key) {
+		stringRedisTemplate.delete(prefix + key);
+	}
 
-    /**
-     * delete by key
-     *
-     * @param key obj key
-     */
-    public void delObj(Object key) {
-        redisTemplate.delete(prefix + key.toString());
-    }
+	/**
+	 * delete by key
+	 *
+	 * @param key obj key
+	 */
+	public void delObj(Object key) {
+		redisTemplate.delete(prefix + key.toString());
+	}
 }
diff --git a/len-core/src/main/java/com/len/socket/WebSocketService.java b/len-core/src/main/java/com/len/socket/WebSocketService.java
index b7777fc..8e0141c 100644
--- a/len-core/src/main/java/com/len/socket/WebSocketService.java
+++ b/len-core/src/main/java/com/len/socket/WebSocketService.java
@@ -17,65 +17,65 @@ import java.util.concurrent.ConcurrentHashMap;
 @ServerEndpoint(value = "/webSocket/{userId}")
 public class WebSocketService {
 
-    private static ConcurrentHashMap<String, WebSocketService> socketClient = new ConcurrentHashMap<>();
+	private static ConcurrentHashMap<String, WebSocketService> socketClient = new ConcurrentHashMap<>();
 
-    private Session session;
+	private Session session;
 
-    public static ConcurrentHashMap<String, WebSocketService> getClients() {
-        return socketClient;
-    }
+	public static ConcurrentHashMap<String, WebSocketService> getClients() {
+		return socketClient;
+	}
 
-    @OnOpen
-    public void onOpen(@PathParam("userId") String userId, Session session) {
-        this.session = session;
-        socketClient.put(userId, this);
-        log.info("【websocket消息】有新的连接, 总数:{}", socketClient.size());
-    }
+	@OnOpen
+	public void onOpen(@PathParam("userId") String userId, Session session) {
+		this.session = session;
+		socketClient.put(userId, this);
+		log.info("【websocket消息】有新的连接, 总数:{}", socketClient.size());
+	}
 
-    @OnClose
-    public void onClose(Session session) {
-        socketClient.remove(session.getId());
-        log.info("【websocket消息】连接断开, 总数:{}", socketClient.size());
-    }
+	@OnClose
+	public void onClose(Session session) {
+		socketClient.remove(session.getId());
+		log.info("【websocket消息】连接断开, 总数:{}", socketClient.size());
+	}
 
-    @OnMessage
-    public void onMessage(String message) {
-        log.info("【websocket消息】收到客户端发来的消息:{}", message);
-    }
+	@OnMessage
+	public void onMessage(String message) {
+		log.info("【websocket消息】收到客户端发来的消息:{}", message);
+	}
 
-    /**
-     * 推消息给个人
-     *
-     * @param response
-     * @param userId
-     * @throws IOException
-     */
-    public void sendMessage(LenResponse response, String userId) throws IOException {
-        WebSocketService webSocketService = socketClient.get(userId);
-        if (webSocketService != null) {
-            try {
-                webSocketService.session.getBasicRemote().sendObject(response);
-            } catch (EncodeException e) {
-                e.printStackTrace();
-            }
-        }
-    }
+	/**
+	 * 推消息给个人
+	 *
+	 * @param response
+	 * @param userId
+	 * @throws IOException
+	 */
+	public void sendMessage(LenResponse response, String userId) throws IOException {
+		WebSocketService webSocketService = socketClient.get(userId);
+		if (webSocketService != null) {
+			try {
+				webSocketService.session.getBasicRemote().sendObject(response);
+			} catch (EncodeException e) {
+				e.printStackTrace();
+			}
+		}
+	}
 
-    /**
-     * 广播消息
-     *
-     * @param response
-     */
-    public void sendMessageBroad(LenResponse response) {
-        for (Entry<String, WebSocketService> webSocket : socketClient.entrySet()) {
-            log.info("【websocket消息】广播消息, message={}", response);
-            try {
-                webSocket.getValue().session.getBasicRemote().sendObject(response);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-    }
+	/**
+	 * 广播消息
+	 *
+	 * @param response
+	 */
+	public void sendMessageBroad(LenResponse response) {
+		for (Entry<String, WebSocketService> webSocket : socketClient.entrySet()) {
+			log.info("【websocket消息】广播消息, message={}", response);
+			try {
+				webSocket.getValue().session.getBasicRemote().sendObject(response);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+	}
 
 
 }
diff --git a/len-core/src/main/java/com/len/util/ApplicationContextUtil.java b/len-core/src/main/java/com/len/util/ApplicationContextUtil.java
index 186b320..1e311b9 100644
--- a/len-core/src/main/java/com/len/util/ApplicationContextUtil.java
+++ b/len-core/src/main/java/com/len/util/ApplicationContextUtil.java
@@ -7,22 +7,22 @@ import org.springframework.context.ApplicationContextAware;
 
 public class ApplicationContextUtil implements ApplicationContextAware {
 
-    private static ApplicationContext applicationContext;
+	private static ApplicationContext applicationContext;
 
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        ApplicationContextUtil.applicationContext = applicationContext;
-    }
+	public static ApplicationContext getContext() {
+		return applicationContext;
+	}
 
-    public static ApplicationContext getContext() {
-        return applicationContext;
-    }
+	public static Object getBean(String arg) {
+		return applicationContext.getBean(arg);
+	}
 
-    public static Object getBean(String arg) {
-        return applicationContext.getBean(arg);
-    }
+	public static <T> T getBean(Class aClass) {
+		return (T) applicationContext.getBean(aClass);
+	}
 
-    public static <T> T getBean(Class aClass) {
-        return (T)applicationContext.getBean(aClass);
-    }
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		ApplicationContextUtil.applicationContext = applicationContext;
+	}
 }
diff --git a/len-core/src/main/java/com/len/util/BeanUtil.java b/len-core/src/main/java/com/len/util/BeanUtil.java
index 10af713..7d81151 100644
--- a/len-core/src/main/java/com/len/util/BeanUtil.java
+++ b/len-core/src/main/java/com/len/util/BeanUtil.java
@@ -1,38 +1,40 @@
 package com.len.util;
 
-import java.beans.PropertyDescriptor;
-import java.util.HashSet;
-import java.util.Set;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanWrapper;
 import org.springframework.beans.BeanWrapperImpl;
 
+import java.beans.PropertyDescriptor;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * 对象操作
  */
 public class BeanUtil {
 
-  public static String[] getNullPropertyNames(Object source) {
-    final BeanWrapper src = new BeanWrapperImpl(source);
-    PropertyDescriptor[] pds = src.getPropertyDescriptors();
+	public static String[] getNullPropertyNames(Object source) {
+		final BeanWrapper src = new BeanWrapperImpl(source);
+		PropertyDescriptor[] pds = src.getPropertyDescriptors();
 
-    Set<String> emptyNames = new HashSet<>();
-    for (PropertyDescriptor pd : pds) {
-      Object srcValue = src.getPropertyValue(pd.getName());
-      if (srcValue == null){
-        emptyNames.add(pd.getName());
-      }
-    }
-    String[] result = new String[emptyNames.size()];
-    return emptyNames.toArray(result);
-  }
+		Set<String> emptyNames = new HashSet<>();
+		for (PropertyDescriptor pd : pds) {
+			Object srcValue = src.getPropertyValue(pd.getName());
+			if (srcValue == null) {
+				emptyNames.add(pd.getName());
+			}
+		}
+		String[] result = new String[emptyNames.size()];
+		return emptyNames.toArray(result);
+	}
 
-  /**
-   * 非空拷贝
-   * @param source
-   * @param target
-   */
-  public static void copyNotNullBean(Object source, Object target) {
-    BeanUtils.copyProperties(source, target, getNullPropertyNames(source));
-  }
+	/**
+	 * 非空拷贝
+	 *
+	 * @param source
+	 * @param target
+	 */
+	public static void copyNotNullBean(Object source, Object target) {
+		BeanUtils.copyProperties(source, target, getNullPropertyNames(source));
+	}
 }
diff --git a/len-core/src/main/java/com/len/util/Checkbox.java b/len-core/src/main/java/com/len/util/Checkbox.java
index 334f8f4..99c7fca 100644
--- a/len-core/src/main/java/com/len/util/Checkbox.java
+++ b/len-core/src/main/java/com/len/util/Checkbox.java
@@ -10,9 +10,11 @@ import lombok.Setter;
 @Setter
 public class Checkbox {
 
-  private String id;
-  private String name;
-  /**默认未选择*/
-  private boolean check=false;
+	private String id;
+	private String name;
+	/**
+	 * 默认未选择
+	 */
+	private boolean check = false;
 
 }
diff --git a/len-core/src/main/java/com/len/util/CommonUtil.java b/len-core/src/main/java/com/len/util/CommonUtil.java
index 85b06c4..fa89d97 100644
--- a/len-core/src/main/java/com/len/util/CommonUtil.java
+++ b/len-core/src/main/java/com/len/util/CommonUtil.java
@@ -6,25 +6,25 @@ import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.session.Session;
 
 /**
- *
  * 管理工具类
  */
 public class CommonUtil {
 
-  /**
-   * 获取当前用户
-   */
-  public static CurrentUser getUser() {
-    org.apache.shiro.subject.Subject subject = SecurityUtils.getSubject();
-    Session session = subject.getSession();
-    return (CurrentUser) session.getAttribute("currentPrincipal");
-  }
+	/**
+	 * 获取当前用户
+	 */
+	public static CurrentUser getUser() {
+		org.apache.shiro.subject.Subject subject = SecurityUtils.getSubject();
+		Session session = subject.getSession();
+		return (CurrentUser) session.getAttribute("currentPrincipal");
+	}
 }
 
-  /**
-   * 获取权限
-   * @return
-   */
+/**
+ * 获取权限
+ *
+ * @return
+ */
   /*public static List<SysPermission> getPermission(){
     SysUser user=CommonUtil.getUser();
     if(user!=null){
@@ -33,4 +33,4 @@ public class CommonUtil {
   }
 
 }
-*/
\ No newline at end of file
+*/
diff --git a/len-core/src/main/java/com/len/util/ContextUtil.java b/len-core/src/main/java/com/len/util/ContextUtil.java
index 69073ba..fc86a48 100644
--- a/len-core/src/main/java/com/len/util/ContextUtil.java
+++ b/len-core/src/main/java/com/len/util/ContextUtil.java
@@ -1,22 +1,23 @@
 package com.len.util;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
 /**
  * 获取上下文
  */
 public class ContextUtil {
 
-  public static HttpServletRequest getServletRequest(){
-    HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-    return request;
-  }
+	public static HttpServletRequest getServletRequest() {
+		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+		return request;
+	}
 
-  public static HttpSession getSession(){
-    return getServletRequest().getSession();
-  }
+	public static HttpSession getSession() {
+		return getServletRequest().getSession();
+	}
 
 }
diff --git a/len-core/src/main/java/com/len/util/CustomUsernamePasswordToken.java b/len-core/src/main/java/com/len/util/CustomUsernamePasswordToken.java
index e64a38d..1ff9080 100644
--- a/len-core/src/main/java/com/len/util/CustomUsernamePasswordToken.java
+++ b/len-core/src/main/java/com/len/util/CustomUsernamePasswordToken.java
@@ -6,21 +6,20 @@ import org.apache.shiro.authc.UsernamePasswordToken;
 
 public class CustomUsernamePasswordToken extends UsernamePasswordToken {
 
-    private LoginType type;
+	private LoginType type;
 
 
+	public CustomUsernamePasswordToken(final String username, final String password, LoginType loginType) {
+		super(username, password);
+		this.type = loginType;
+	}
 
-    public CustomUsernamePasswordToken(final String username, final String password, LoginType loginType) {
-        super(username,password);
-        this.type = loginType;
-    }
 
+	public LoginType getType() {
+		return type;
+	}
 
-    public LoginType getType() {
-        return type;
-    }
-
-    public void setType(LoginType type) {
-        this.type = type;
-    }
+	public void setType(LoginType type) {
+		this.type = type;
+	}
 }
diff --git a/len-core/src/main/java/com/len/util/FileUtil.java b/len-core/src/main/java/com/len/util/FileUtil.java
index f62fbba..5445e76 100644
--- a/len-core/src/main/java/com/len/util/FileUtil.java
+++ b/len-core/src/main/java/com/len/util/FileUtil.java
@@ -8,7 +8,7 @@ package com.len.util;
 public class FileUtil {
 
 
-    public static final String defaultPhoto = "default.jpg";
+	public static final String defaultPhoto = "default.jpg";
 
 
 }
diff --git a/len-core/src/main/java/com/len/util/IpUtil.java b/len-core/src/main/java/com/len/util/IpUtil.java
index 4158038..9917ebd 100644
--- a/len-core/src/main/java/com/len/util/IpUtil.java
+++ b/len-core/src/main/java/com/len/util/IpUtil.java
@@ -5,20 +5,20 @@ import javax.servlet.http.HttpServletRequest;
 
 public class IpUtil {
 
-    public static String getIp(HttpServletRequest request){
-        String ip=request.getHeader("x-forwarded-for");
-        if(ip==null || ip.length()==0 || "unknown".equalsIgnoreCase(ip)){
-            ip=request.getHeader("Proxy-Client-IP");
-        }
-        if(ip==null || ip.length()==0 || "unknown".equalsIgnoreCase(ip)){
-            ip=request.getHeader("WL-Proxy-Client-IP");
-        }
-        if(ip==null || ip.length()==0 || "unknown".equalsIgnoreCase(ip)){
-            ip=request.getHeader("X-Real-IP");
-        }
-        if(ip==null || ip.length()==0 || "unknown".equalsIgnoreCase(ip)){
-            ip=request.getRemoteAddr();
-        }
-        return ip;
-    }
+	public static String getIp(HttpServletRequest request) {
+		String ip = request.getHeader("x-forwarded-for");
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("Proxy-Client-IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("WL-Proxy-Client-IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getHeader("X-Real-IP");
+		}
+		if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+			ip = request.getRemoteAddr();
+		}
+		return ip;
+	}
 }
diff --git a/len-core/src/main/java/com/len/util/JWTUtil.java b/len-core/src/main/java/com/len/util/JWTUtil.java
index bf3c02a..70375f1 100644
--- a/len-core/src/main/java/com/len/util/JWTUtil.java
+++ b/len-core/src/main/java/com/len/util/JWTUtil.java
@@ -12,99 +12,99 @@ import java.util.List;
 
 public class JWTUtil {
 
-    /**
-     * 过期时间3小时
-     */
-    private static final long EXPIRE_TIME = 3 * 60 * 60 * 1000;
+	/**
+	 * 过期时间3小时
+	 */
+	private static final long EXPIRE_TIME = 3 * 60 * 60 * 1000;
 
-    /**
-     * 校验token是否正确
-     *
-     * @param token  密钥
-     * @param secret 用户的密码
-     * @return 是否正确
-     */
-    public static boolean verify(String token, String username, String secret) {
-        try {
-            Algorithm algorithm = Algorithm.HMAC256(secret);
-            JWTVerifier verifier = JWT.require(algorithm)
-                    .withClaim("username", username)
-                    .build();
-            DecodedJWT jwt = verifier.verify(token);
-            return true;
-        } catch (Exception exception) {
-            return false;
-        }
-    }
+	/**
+	 * 校验token是否正确
+	 *
+	 * @param token  密钥
+	 * @param secret 用户的密码
+	 * @return 是否正确
+	 */
+	public static boolean verify(String token, String username, String secret) {
+		try {
+			Algorithm algorithm = Algorithm.HMAC256(secret);
+			JWTVerifier verifier = JWT.require(algorithm)
+				.withClaim("username", username)
+				.build();
+			DecodedJWT jwt = verifier.verify(token);
+			return true;
+		} catch (Exception exception) {
+			return false;
+		}
+	}
 
-    /**
-     * @return token中包含的用户名
-     */
-    public static String getUsername(String token) {
-        try {
-            DecodedJWT jwt = JWT.decode(token);
-            return jwt.getClaim("username").asString();
-        } catch (JWTDecodeException e) {
-            return null;
-        }
-    }
+	/**
+	 * @return token中包含的用户名
+	 */
+	public static String getUsername(String token) {
+		try {
+			DecodedJWT jwt = JWT.decode(token);
+			return jwt.getClaim("username").asString();
+		} catch (JWTDecodeException e) {
+			return null;
+		}
+	}
 
-    /**
-     * 获取当前用户
-     *
-     * @param token jwt加密信息
-     * @return 解析的当前用户信息
-     */
-    public static Principal getPrincipal(String token) {
-        try {
-            Principal principal = new Principal();
-            DecodedJWT jwt = JWT.decode(token);
-            principal.setUserId(jwt.getClaim("userId").asString());
-            principal.setUserName(jwt.getClaim("username").asString());
-            String[] roleArr = jwt.getClaim("roles").asArray(String.class);
-            if (roleArr != null) {
-                principal.setRoles(Arrays.asList(roleArr));
-            }
-            return principal;
-        } catch (JWTDecodeException e) {
-            return null;
-        }
-    }
+	/**
+	 * 获取当前用户
+	 *
+	 * @param token jwt加密信息
+	 * @return 解析的当前用户信息
+	 */
+	public static Principal getPrincipal(String token) {
+		try {
+			Principal principal = new Principal();
+			DecodedJWT jwt = JWT.decode(token);
+			principal.setUserId(jwt.getClaim("userId").asString());
+			principal.setUserName(jwt.getClaim("username").asString());
+			String[] roleArr = jwt.getClaim("roles").asArray(String.class);
+			if (roleArr != null) {
+				principal.setRoles(Arrays.asList(roleArr));
+			}
+			return principal;
+		} catch (JWTDecodeException e) {
+			return null;
+		}
+	}
 
-    /**
-     * 获取角色组
-     *
-     * @param token
-     * @return
-     */
-    public static String[] getRoles(String token) {
-        try {
-            DecodedJWT jwt = JWT.decode(token);
-            return jwt.getClaim("roles").asArray(String.class);
-        } catch (JWTDecodeException e) {
-            return null;
-        }
-    }
+	/**
+	 * 获取角色组
+	 *
+	 * @param token
+	 * @return
+	 */
+	public static String[] getRoles(String token) {
+		try {
+			DecodedJWT jwt = JWT.decode(token);
+			return jwt.getClaim("roles").asArray(String.class);
+		} catch (JWTDecodeException e) {
+			return null;
+		}
+	}
 
-    /**
-     * 生成签名
-     *
-     * @param username 用户名
-     * @param userId   用户id
-     * @param secret   用户的密码
-     * @return 加密的token
-     */
-    public static String sign(String username, String userId, List<String> roles, String secret) {
-        Date date = new Date(System.currentTimeMillis() + EXPIRE_TIME);
-        Algorithm algorithm = Algorithm.HMAC256(secret);
-        String[] roleArr = new String[roles.size()];
-        roleArr = roles.toArray(roleArr);
-        // 附带username信息
-        return JWT.create()
-                .withClaim("userId", userId)
-                .withClaim("username", username)
-                .withArrayClaim("roles", roleArr)
-                .withExpiresAt(date)
-                .sign(algorithm);
-    }
-}
\ No newline at end of file
+	/**
+	 * 生成签名
+	 *
+	 * @param username 用户名
+	 * @param userId   用户id
+	 * @param secret   用户的密码
+	 * @return 加密的token
+	 */
+	public static String sign(String username, String userId, List<String> roles, String secret) {
+		Date date = new Date(System.currentTimeMillis() + EXPIRE_TIME);
+		Algorithm algorithm = Algorithm.HMAC256(secret);
+		String[] roleArr = new String[roles.size()];
+		roleArr = roles.toArray(roleArr);
+		// 附带username信息
+		return JWT.create()
+			.withClaim("userId", userId)
+			.withClaim("username", username)
+			.withArrayClaim("roles", roleArr)
+			.withExpiresAt(date)
+			.sign(algorithm);
+	}
+}
diff --git a/len-core/src/main/java/com/len/util/JdbcUtil.java b/len-core/src/main/java/com/len/util/JdbcUtil.java
index 7319eaa..d6237e4 100644
--- a/len-core/src/main/java/com/len/util/JdbcUtil.java
+++ b/len-core/src/main/java/com/len/util/JdbcUtil.java
@@ -1,38 +1,34 @@
 package com.len.util;
 
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.sql.*;
 
 public class JdbcUtil {
 
-  public static Connection getConnection() {
-    Connection con = null;
+	public static Connection getConnection() {
+		Connection con = null;
 
-    String driverName = "com.mysql.jdbc.Driver";
+		String driverName = "com.mysql.jdbc.Driver";
 //    String dbURL = "jdbc:mysql://localhost:3306/z_eas?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&failOverReadOnly=false";
-    String dbURL="jdbc:mysql://localhost:3306/z_eas?useUnicode=true&characterEncoding=UTF-8";
-    String userName = "root";
-    String userPwd = "123";
-    try {
-      Class.forName(driverName);
-      con =  DriverManager.getConnection(dbURL, userName, userPwd);
-    } catch (Exception e) {
-      System.out.println("获取连接失败." + e.getMessage());
-    }
-    return con;
-  }
+		String dbURL = "jdbc:mysql://localhost:3306/z_eas?useUnicode=true&characterEncoding=UTF-8";
+		String userName = "root";
+		String userPwd = "123";
+		try {
+			Class.forName(driverName);
+			con = DriverManager.getConnection(dbURL, userName, userPwd);
+		} catch (Exception e) {
+			System.out.println("获取连接失败." + e.getMessage());
+		}
+		return con;
+	}
 
-  public static void main(String[] args) throws SQLException {
-    Connection con= getConnection();
-    Statement statement = con.createStatement();
-    String sql = "select * from z_user";
-   ResultSet rs = statement.executeQuery(sql);
-   while(rs.next()){
-     System.out.println(rs.getString("username"));
-   }
+	public static void main(String[] args) throws SQLException {
+		Connection con = getConnection();
+		Statement statement = con.createStatement();
+		String sql = "select * from z_user";
+		ResultSet rs = statement.executeQuery(sql);
+		while (rs.next()) {
+			System.out.println(rs.getString("username"));
+		}
 
-  }
-}
\ No newline at end of file
+	}
+}
diff --git a/len-core/src/main/java/com/len/util/JsonUtil.java b/len-core/src/main/java/com/len/util/JsonUtil.java
index 0fa86b5..aaec750 100644
--- a/len-core/src/main/java/com/len/util/JsonUtil.java
+++ b/len-core/src/main/java/com/len/util/JsonUtil.java
@@ -10,43 +10,43 @@ import lombok.Data;
 @Data
 public class JsonUtil {
 
-    //默认成功
-    private boolean flag = true;
-    private String msg;
-    private JSONObject josnObj;
-    private Integer status;
-    private Object data;
-
-    public boolean isFlag() {
-        return flag;
-    }
-
-    public void setFlag(boolean flag) {
-        this.flag = flag;
-    }
-
-    public JsonUtil() {
-    }
-
-    public JsonUtil(boolean flag, String msg) {
-        this.flag = flag;
-        this.msg = msg;
-    }
-
-    public JsonUtil(boolean flag, String msg, Integer status) {
-        this.flag = flag;
-        this.msg = msg;
-        this.status = status;
-    }
-
-    /**
-     * restful 返回
-     */
-    public static JsonUtil error(String msg) {
-        return new JsonUtil(false, msg);
-    }
-
-    public static JsonUtil sucess(String msg) {
-        return new JsonUtil(true, msg);
-    }
+	//默认成功
+	private boolean flag = true;
+	private String msg;
+	private JSONObject josnObj;
+	private Integer status;
+	private Object data;
+
+	public JsonUtil() {
+	}
+
+	public JsonUtil(boolean flag, String msg) {
+		this.flag = flag;
+		this.msg = msg;
+	}
+
+	public JsonUtil(boolean flag, String msg, Integer status) {
+		this.flag = flag;
+		this.msg = msg;
+		this.status = status;
+	}
+
+	/**
+	 * restful 返回
+	 */
+	public static JsonUtil error(String msg) {
+		return new JsonUtil(false, msg);
+	}
+
+	public static JsonUtil sucess(String msg) {
+		return new JsonUtil(true, msg);
+	}
+
+	public boolean isFlag() {
+		return flag;
+	}
+
+	public void setFlag(boolean flag) {
+		this.flag = flag;
+	}
 }
diff --git a/len-core/src/main/java/com/len/util/JwtToken.java b/len-core/src/main/java/com/len/util/JwtToken.java
index e45b862..75e2e87 100644
--- a/len-core/src/main/java/com/len/util/JwtToken.java
+++ b/len-core/src/main/java/com/len/util/JwtToken.java
@@ -6,37 +6,37 @@ import org.apache.shiro.authc.AuthenticationToken;
 
 public class JwtToken implements AuthenticationToken {
 
-    private String token;
-    private LoginType type;
-
-    public JwtToken(String token,LoginType type) {
-        this.token = token;
-        this.type=type;
-    }
-
-    @Override
-    public Object getPrincipal() {
-        return token;
-    }
-
-    @Override
-    public Object getCredentials() {
-        return token;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public LoginType getType() {
-        return type;
-    }
-
-    public void setType(LoginType type) {
-        this.type = type;
-    }
+	private String token;
+	private LoginType type;
+
+	public JwtToken(String token, LoginType type) {
+		this.token = token;
+		this.type = type;
+	}
+
+	@Override
+	public Object getPrincipal() {
+		return token;
+	}
+
+	@Override
+	public Object getCredentials() {
+		return token;
+	}
+
+	public String getToken() {
+		return token;
+	}
+
+	public void setToken(String token) {
+		this.token = token;
+	}
+
+	public LoginType getType() {
+		return type;
+	}
+
+	public void setType(LoginType type) {
+		this.type = type;
+	}
 }
diff --git a/len-core/src/main/java/com/len/util/LenResponse.java b/len-core/src/main/java/com/len/util/LenResponse.java
index fe10ba1..b8bd9ff 100644
--- a/len-core/src/main/java/com/len/util/LenResponse.java
+++ b/len-core/src/main/java/com/len/util/LenResponse.java
@@ -1,54 +1,54 @@
 package com.len.util;
 
 import com.alibaba.fastjson.JSONObject;
-
 import lombok.Data;
 
 
 @Data
 public class LenResponse {
 
-    // 默认成功
-    private boolean flag = true;
-    private String msg;
-    private JSONObject jsonObj;
-    private Integer status;
-    private Object data;
-
-    public boolean isFlag() {
-        return flag;
-    }
-
-    public void setFlag(boolean flag) {
-        this.flag = flag;
-    }
-
-    public LenResponse() {}
-
-    public LenResponse(boolean flag, Object data) {
-        this.flag = flag;
-        this.data = data;
-    }
-
-    public LenResponse(boolean flag, String msg) {
-        this.flag = flag;
-        this.msg = msg;
-    }
-
-    public LenResponse(boolean flag, String msg, Integer status) {
-        this.flag = flag;
-        this.msg = msg;
-        this.status = status;
-    }
-
-    /**
-     * restful 返回
-     */
-    public static LenResponse error(String msg) {
-        return new LenResponse(false, msg);
-    }
-
-    public static LenResponse sucess(String msg) {
-        return new LenResponse(true, msg);
-    }
+	// 默认成功
+	private boolean flag = true;
+	private String msg;
+	private JSONObject jsonObj;
+	private Integer status;
+	private Object data;
+
+	public LenResponse() {
+	}
+
+	public LenResponse(boolean flag, Object data) {
+		this.flag = flag;
+		this.data = data;
+	}
+
+	public LenResponse(boolean flag, String msg) {
+		this.flag = flag;
+		this.msg = msg;
+	}
+
+	public LenResponse(boolean flag, String msg, Integer status) {
+		this.flag = flag;
+		this.msg = msg;
+		this.status = status;
+	}
+
+	/**
+	 * restful 返回
+	 */
+	public static LenResponse error(String msg) {
+		return new LenResponse(false, msg);
+	}
+
+	public static LenResponse sucess(String msg) {
+		return new LenResponse(true, msg);
+	}
+
+	public boolean isFlag() {
+		return flag;
+	}
+
+	public void setFlag(boolean flag) {
+		this.flag = flag;
+	}
 }
diff --git a/len-core/src/main/java/com/len/util/LocalLocale.java b/len-core/src/main/java/com/len/util/LocalLocale.java
index 35e1686..6ca86ce 100644
--- a/len-core/src/main/java/com/len/util/LocalLocale.java
+++ b/len-core/src/main/java/com/len/util/LocalLocale.java
@@ -1,7 +1,6 @@
 package com.len.util;
 
 
-
 import java.util.Locale;
 
 /**
@@ -9,26 +8,26 @@ import java.util.Locale;
  */
 public class LocalLocale {
 
-    private final static ThreadLocal<Locale> local = ThreadLocal.withInitial(() -> {
-        // 语言的默认值
-        return Locale.SIMPLIFIED_CHINESE;
-    });
+	private final static ThreadLocal<Locale> local = ThreadLocal.withInitial(() -> {
+		// 语言的默认值
+		return Locale.SIMPLIFIED_CHINESE;
+	});
 
-    public static void setLocale(String locale) {
-        setLocale(new Locale(locale));
-    }
+	public static Locale getLocale() {
+		return local.get();
+	}
 
-    public static void setLocale(Locale locale) {
-        local.set(locale);
-    }
+	public static void setLocale(String locale) {
+		setLocale(new Locale(locale));
+	}
 
-    public static Locale getLocale() {
-        return local.get();
-    }
+	public static void setLocale(Locale locale) {
+		local.set(locale);
+	}
 
-    public static void clear() {
-        local.remove();
-    }
+	public static void clear() {
+		local.remove();
+	}
 
 
 }
diff --git a/len-core/src/main/java/com/len/util/Md5Util.java b/len-core/src/main/java/com/len/util/Md5Util.java
index 3360da0..613c93e 100644
--- a/len-core/src/main/java/com/len/util/Md5Util.java
+++ b/len-core/src/main/java/com/len/util/Md5Util.java
@@ -6,16 +6,17 @@ import org.apache.shiro.crypto.hash.Md5Hash;
  * 采用md5加密 确保数据安全性
  */
 public class Md5Util {
-  public static String getMD5(String msg,String salt){
-    return new Md5Hash(msg,salt,4).toString();
-  }
+	public static String getMD5(String msg, String salt) {
+		return new Md5Hash(msg, salt, 4).toString();
+	}
 
-  /**
-   * 测试
-   * @param args
-   */
-  public static void main(String[] args) {
-  String str= getMD5("111111","manager");
-   System.out.println(str);
-  }
+	/**
+	 * 测试
+	 *
+	 * @param args
+	 */
+	public static void main(String[] args) {
+		String str = getMD5("111111", "manager");
+		System.out.println(str);
+	}
 }
diff --git a/len-core/src/main/java/com/len/util/MsHelper.java b/len-core/src/main/java/com/len/util/MsHelper.java
index 861217f..87024bd 100644
--- a/len-core/src/main/java/com/len/util/MsHelper.java
+++ b/len-core/src/main/java/com/len/util/MsHelper.java
@@ -13,27 +13,27 @@ import org.springframework.context.NoSuchMessageException;
 public class MsHelper {
 
 
-    private static final MessageSource messageSource;
+	private static final MessageSource messageSource;
 
-    static {
-        messageSource = SpringUtil.getBean(MessageSource.class);
-    }
+	static {
+		messageSource = SpringUtil.getBean(MessageSource.class);
+	}
 
 
-    public static String getMsg(String msg) {
-        return messageSource.getMessage(msg, null, LocalLocale.getLocale());
-    }
+	public static String getMsg(String msg) {
+		return messageSource.getMessage(msg, null, LocalLocale.getLocale());
+	}
 
 
-    public static String getMessage(String s, Object[] objects, String s1) {
-        return messageSource.getMessage(s, objects, s1, LocalLocale.getLocale());
-    }
+	public static String getMessage(String s, Object[] objects, String s1) {
+		return messageSource.getMessage(s, objects, s1, LocalLocale.getLocale());
+	}
 
-    public static String getMessage(String s, Object[] objects) throws NoSuchMessageException {
-        return messageSource.getMessage(s, objects, LocalLocale.getLocale());
-    }
+	public static String getMessage(String s, Object[] objects) throws NoSuchMessageException {
+		return messageSource.getMessage(s, objects, LocalLocale.getLocale());
+	}
 
-    public static String getMessage(MessageSourceResolvable messageSourceResolvable) throws NoSuchMessageException {
-        return messageSource.getMessage(messageSourceResolvable, LocalLocale.getLocale());
-    }
+	public static String getMessage(MessageSourceResolvable messageSourceResolvable) throws NoSuchMessageException {
+		return messageSource.getMessage(messageSourceResolvable, LocalLocale.getLocale());
+	}
 }
diff --git a/len-core/src/main/java/com/len/util/PageUtil.java b/len-core/src/main/java/com/len/util/PageUtil.java
index 6c3d0b5..6053722 100644
--- a/len-core/src/main/java/com/len/util/PageUtil.java
+++ b/len-core/src/main/java/com/len/util/PageUtil.java
@@ -3,75 +3,77 @@ package com.len.util;
 /**
  * 分页工具
  */
-public class PageUtil <T>{
-  /**当前页*/
-  private int curPageNo=1;
-  private int pageCount;//总页数
-  private int pageSize=5;//每页大小 默认5
-  private int upPageNo;//上一页
-  private int nextPageNo;//下一页
-  private int startPage;//开始页
+public class PageUtil<T> {
+	/**
+	 * 当前页
+	 */
+	private int curPageNo = 1;
+	private int pageCount;//总页数
+	private int pageSize = 5;//每页大小 默认5
+	private int upPageNo;//上一页
+	private int nextPageNo;//下一页
+	private int startPage;//开始页
 
-  private T t;
+	private T t;
 
-  public int getCurPageNo() {
-    return curPageNo;
-  }
+	public int getCurPageNo() {
+		return curPageNo;
+	}
 
-  public void setCurPageNo(int curPageNo) {
-    if(curPageNo<=0){
-      this.curPageNo=1;
-    }
-    if(curPageNo!=1&&curPageNo>0){
-      upPageNo=curPageNo-1;
-    }
-    nextPageNo=curPageNo+1;
-    this.curPageNo = curPageNo;
-    this.startPage=(curPageNo-1)*pageSize;
-  }
+	public void setCurPageNo(int curPageNo) {
+		if (curPageNo <= 0) {
+			this.curPageNo = 1;
+		}
+		if (curPageNo != 1 && curPageNo > 0) {
+			upPageNo = curPageNo - 1;
+		}
+		nextPageNo = curPageNo + 1;
+		this.curPageNo = curPageNo;
+		this.startPage = (curPageNo - 1) * pageSize;
+	}
 
-  public int getPageCount() {
-    return pageCount;
-  }
+	public int getPageCount() {
+		return pageCount;
+	}
 
-  public void setPageCount(int pageCount) {
-    if(pageCount%pageSize>0){
-      this.pageCount=pageCount/pageSize+1;
-    }else {
-      this.pageCount = pageCount/pageSize;
-    }
-  }
+	public void setPageCount(int pageCount) {
+		if (pageCount % pageSize > 0) {
+			this.pageCount = pageCount / pageSize + 1;
+		} else {
+			this.pageCount = pageCount / pageSize;
+		}
+	}
 
-  public int getPageSize() {
-    return pageSize;
-  }
+	public int getPageSize() {
+		return pageSize;
+	}
 
-  public void setPageSize(int pageSize) {
-    this.pageSize = pageSize;
-  }
+	public void setPageSize(int pageSize) {
+		this.pageSize = pageSize;
+	}
 
-  public int getUpPageNo() {
-    return upPageNo;
-  }
+	public int getUpPageNo() {
+		return upPageNo;
+	}
 
-  public void setUpPageNo(int upPageNo) {
-    this.upPageNo = upPageNo;
-  }
+	public void setUpPageNo(int upPageNo) {
+		this.upPageNo = upPageNo;
+	}
 
-  public int getNextPageNo() {
-    return nextPageNo;
-  }
+	public int getNextPageNo() {
+		return nextPageNo;
+	}
 
-  public void setNextPageNo(int nextPageNo) {
-    this.nextPageNo = nextPageNo;
-  }
+	public void setNextPageNo(int nextPageNo) {
+		this.nextPageNo = nextPageNo;
+	}
 
-  public int getStartPage() {
-    return startPage;
-  }
+	public int getStartPage() {
+		return startPage;
+	}
 
-  public void setStartPage(int startPage) {
+	public void setStartPage(int startPage) {
 
-    this.startPage = startPage;
-  }
+		this.startPage = startPage;
+	}
 }
diff --git a/len-core/src/main/java/com/len/util/Principal.java b/len-core/src/main/java/com/len/util/Principal.java
index acdb702..c005c8d 100644
--- a/len-core/src/main/java/com/len/util/Principal.java
+++ b/len-core/src/main/java/com/len/util/Principal.java
@@ -12,11 +12,11 @@ import java.util.List;
 @Data
 public class Principal {
 
-    private String userId;
+	private String userId;
 
-    private String userName;
+	private String userName;
 
-    private List<String> roles = new ArrayList<>();
+	private List<String> roles = new ArrayList<>();
 
-    private String photo;
+	private String photo;
 }
diff --git a/len-core/src/main/java/com/len/util/ReType.java b/len-core/src/main/java/com/len/util/ReType.java
index e44f66c..3dce190 100644
--- a/len-core/src/main/java/com/len/util/ReType.java
+++ b/len-core/src/main/java/com/len/util/ReType.java
@@ -13,51 +13,60 @@ import java.util.Map;
  * 查询返回json格式依照ui默认属性名称
  */
 @Data
-public class ReType implements Serializable{
-  /**状态*/
-  public int code=0;
-  /**状态信息*/
-  public String msg="";
-  /**数据总数*/
-  public long count;
-  /**页码*/
-  public long pageNum;
-
-  public List<?> data;
-
-  public ReType() {
-  }
-
-  public ReType(long count, List<?> data) {
-    this.count = count;
-    this.data = data;
-  }
-
-  public ReType(long count,long pageNum, List<?> data) {
-    this.count = count;
-    this.pageNum=pageNum;
-    this.data = data;
-  }
-
-  /**
-   * 动态添加属性 map 用法可以参考 activiti 模块中 com.len.JsonTest 测试类中用法
-   * @param count
-   * @param data
-   * @param map
-   * @param node 绑定节点字符串 这样可以更加灵活
-   * @return
-   */
-  public static String jsonStrng(long count,List<?> data,Map<String, Map<String,Object>> map,String node){
-    JSONArray jsonArray=JSONArray.parseArray(JSON.toJSONString(data));
-    JSONObject object=new JSONObject();
-    for(int i=0;i<jsonArray.size();i++){
-      JSONObject jsonData = (JSONObject) jsonArray.get(i);
-      jsonData.putAll(map.get(jsonData.get(node)));
-    }
-    object.put("count",count);
-    object.put("data",jsonArray);
-    object.put("code",0);
-    object.put("msg","");
-    return object.toJSONString();
-  }
+public class ReType implements Serializable {
+	/**
+	 * 状态
+	 */
+	public int code = 0;
+	/**
+	 * 状态信息
+	 */
+	public String msg = "";
+	/**
+	 * 数据总数
+	 */
+	public long count;
+	/**
+	 * 页码
+	 */
+	public long pageNum;
+
+	public List<?> data;
+
+	public ReType() {
+	}
+
+	public ReType(long count, List<?> data) {
+		this.count = count;
+		this.data = data;
+	}
+
+	public ReType(long count, long pageNum, List<?> data) {
+		this.count = count;
+		this.pageNum = pageNum;
+		this.data = data;
+	}
+
+	/**
+	 * 动态添加属性 map 用法可以参考 activiti 模块中 com.len.JsonTest 测试类中用法
+	 *
+	 * @param count
+	 * @param data
+	 * @param map
+	 * @param node  绑定节点字符串 这样可以更加灵活
+	 * @return
+	 */
+	public static String jsonStrng(long count, List<?> data, Map<String, Map<String, Object>> map, String node) {
+		JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(data));
+		JSONObject object = new JSONObject();
+		for (int i = 0; i < jsonArray.size(); i++) {
+			JSONObject jsonData = (JSONObject) jsonArray.get(i);
+			jsonData.putAll(map.get(jsonData.get(node)));
+		}
+		object.put("count", count);
+		object.put("data", jsonArray);
+		object.put("code", 0);
+		object.put("msg", "");
+		return object.toJSONString();
+	}
 }
diff --git a/len-core/src/main/java/com/len/util/SpringUtil.java b/len-core/src/main/java/com/len/util/SpringUtil.java
index 6e96ce0..9a913e3 100644
--- a/len-core/src/main/java/com/len/util/SpringUtil.java
+++ b/len-core/src/main/java/com/len/util/SpringUtil.java
@@ -4,46 +4,46 @@ import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
+
 /**
- *
  * 通过封装applicationContext上线文
  * 获取 spring bean对象 bean启动时候 已经被打印出，可直接根据name、class、name class获取
- *
+ * <p>
  * 很多地方能用得到
  */
 @Component
 public class SpringUtil implements ApplicationContextAware {
 
-    private static ApplicationContext applicationContext;
-  
-    @Override  
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        if (SpringUtil.applicationContext == null) {  
-            SpringUtil.applicationContext = applicationContext;  
-        }
-    }  
-  
-    public static ApplicationContext getApplicationContext() {  
-        return applicationContext;  
-    }
-
-    /***
-     * 根据name获取bean
-     * @param name
-     * @param <T>
-     * @return
-     */
-    @SuppressWarnings("unchecked")  
-    public static <T> T getBean(String name) {  
-        return (T) getApplicationContext().getBean(name);  
-    }  
-
-    public static <T> T getBean(Class<T> clazz) {  
-        return getApplicationContext().getBean(clazz);  
-    }  
-
-    public static <T> T getBean(String name, Class<T> clazz) {  
-        return getApplicationContext().getBean(name, clazz);  
-    }  
-  
-}  
\ No newline at end of file
+	private static ApplicationContext applicationContext;
+
+	public static ApplicationContext getApplicationContext() {
+		return applicationContext;
+	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		if (SpringUtil.applicationContext == null) {
+			SpringUtil.applicationContext = applicationContext;
+		}
+	}
+
+	/***
+	 * 根据name获取bean
+	 * @param name
+	 * @param <T>
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public static <T> T getBean(String name) {
+		return (T) getApplicationContext().getBean(name);
+	}
+
+	public static <T> T getBean(Class<T> clazz) {
+		return getApplicationContext().getBean(clazz);
+	}
+
+	public static <T> T getBean(String name, Class<T> clazz) {
+		return getApplicationContext().getBean(name, clazz);
+	}
+
+}
diff --git a/len-core/src/main/java/com/len/util/TreeUtil.java b/len-core/src/main/java/com/len/util/TreeUtil.java
index a990f10..e54c944 100644
--- a/len-core/src/main/java/com/len/util/TreeUtil.java
+++ b/len-core/src/main/java/com/len/util/TreeUtil.java
@@ -1,27 +1,33 @@
 package com.len.util;
 
-import java.util.ArrayList;
-import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
- *
  * 树形工具类
  */
 @Getter
 @Setter
 public class TreeUtil {
-    /**级数*/
-    private int layer;
-    private String id;
-    private String name;
-    private String pId;
-    /**是否开启 默认开启*/
-    private boolean open=true;
-    /**是否选择 checkbox状态可用 默认未选中*/
-    private boolean checked=false;
-    private List<TreeUtil> children=new ArrayList<>();
+	/**
+	 * 级数
+	 */
+	private int layer;
+	private String id;
+	private String name;
+	private String pId;
+	/**
+	 * 是否开启 默认开启
+	 */
+	private boolean open = true;
+	/**
+	 * 是否选择 checkbox状态可用 默认未选中
+	 */
+	private boolean checked = false;
+	private List<TreeUtil> children = new ArrayList<>();
 
 
 }
diff --git a/len-core/src/main/java/com/len/util/UploadUtil.java b/len-core/src/main/java/com/len/util/UploadUtil.java
index bfa785e..5180f07 100644
--- a/len-core/src/main/java/com/len/util/UploadUtil.java
+++ b/len-core/src/main/java/com/len/util/UploadUtil.java
@@ -1,6 +1,5 @@
 package com.len.util;
 
-import com.len.exception.LenException;
 import com.len.exception.ServiceException;
 import lombok.Data;
 import lombok.Getter;
@@ -27,84 +26,82 @@ import java.util.UUID;
 @Component
 public class UploadUtil {
 
-    /**
-     * 按照当日创建文件夹
-     */
-    @Value("${lenosp.isDayType}")
-    private boolean isDayType;
-    /**
-     * 自定义文件路径
-     */
-    @Value("${lenosp.uploadPath}")
-    private String uploadPath;
+	public static final String IMAGE_SUFFIX = "bmp,jpg,png,gif,jpeg";
+	/**
+	 * 按照当日创建文件夹
+	 */
+	@Value("${lenosp.isDayType}")
+	private boolean isDayType;
+	/**
+	 * 自定义文件路径
+	 */
+	@Value("${lenosp.uploadPath}")
+	private String uploadPath;
+	@Value("${lenosp.imagePath}")
+	private String imagePath;
 
-    @Value("${lenosp.imagePath}")
-    private String imagePath;
 
-    public static final String IMAGE_SUFFIX = "bmp,jpg,png,gif,jpeg";
+	public UploadUtil() {
+	}
 
+	public String upload(MultipartFile multipartFile) {
+		if (isNull(multipartFile)) {
+			throw new ServiceException(MsHelper.getMsg("upload.error"));
+		}
 
-    public UploadUtil() {
-    }
+		LoadType loadType = getFileMessage(multipartFile);
+		try {
+			FileUtils.copyInputStreamToFile(multipartFile.getInputStream(), loadType.getCurrentFile());
+		} catch (IOException e) {
+			e.printStackTrace();
+			throw new RuntimeException(e);
+		}
+		return loadType.getFileName();
+	}
 
-    public String upload(MultipartFile multipartFile) {
-        if (isNull(multipartFile)) {
-            throw new ServiceException(MsHelper.getMsg("upload.error"));
-        }
+	/**
+	 * 格式化文件名 默认采用UUID
+	 *
+	 * @return
+	 */
+	public LoadType getFileMessage(MultipartFile multipartFile) {
+		String curr = multipartFile.getOriginalFilename();
+		if (StringUtils.isEmpty(curr)) {
+			throw new ServiceException(MsHelper.getMsg("file.not.exists"));
+		}
+		int suffixLen = curr.lastIndexOf(".");
+		boolean flag = false;
+		int index = -1;
+		if ("blob".equals(curr)) {
+			flag = true;
+			index = 0;
+			curr = UUID.randomUUID() + ".png";
+		} else if (suffixLen == -1) {
+			throw new ServiceException(MsHelper.getMsg("file.not.exists"));
+		}
+		if (!flag) {
+			String suffix = curr.substring(suffixLen);
+			index = Arrays.binarySearch(IMAGE_SUFFIX.split(","),
+				suffix.replace(".", ""));
+			curr = UUID.randomUUID() + suffix;
+		}
+		LoadType loadType = new LoadType();
+		loadType.setFileName(curr);
+		//image 情况
+		curr = StringUtils.isEmpty(imagePath) || index == -1 ?
+			uploadPath + File.separator + curr : imagePath + File.separator + curr;
+		loadType.setCurrentFile(new File(curr));
+		return loadType;
+	}
 
-        LoadType loadType = getFileMessage(multipartFile);
-        try {
-            FileUtils.copyInputStreamToFile(multipartFile.getInputStream(), loadType.getCurrentFile());
-        } catch (IOException e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
-        return loadType.getFileName();
-    }
-
-    /**
-     * 格式化文件名 默认采用UUID
-     *
-     * @return
-     */
-    public LoadType getFileMessage(MultipartFile multipartFile) {
-        String curr = multipartFile.getOriginalFilename();
-        if (StringUtils.isEmpty(curr)) {
-            throw new ServiceException(MsHelper.getMsg("file.not.exists"));
-        }
-        int suffixLen = curr.lastIndexOf(".");
-        boolean flag = false;
-        int index = -1;
-        if ("blob".equals(curr)) {
-            flag = true;
-            index = 0;
-            curr = UUID.randomUUID() + ".png";
-        } else if (suffixLen == -1) {
-            throw new ServiceException(MsHelper.getMsg("file.not.exists"));
-        }
-        if (!flag) {
-            String suffix = curr.substring(suffixLen);
-            index = Arrays.binarySearch(IMAGE_SUFFIX.split(","),
-                    suffix.replace(".", ""));
-            curr = UUID.randomUUID() + suffix;
-        }
-        LoadType loadType = new LoadType();
-        loadType.setFileName(curr);
-        //image 情况
-        curr = StringUtils.isEmpty(imagePath) || index == -1 ?
-                uploadPath + File.separator + curr : imagePath + File.separator + curr;
-        loadType.setCurrentFile(new File(curr));
-        return loadType;
-    }
-
-    private boolean isNull(MultipartFile multipartFile) {
-        return null == multipartFile;
-    }
+	private boolean isNull(MultipartFile multipartFile) {
+		return null == multipartFile;
+	}
 
 }
 
 @Data
 class LoadType {
-    private String fileName;
-    private File currentFile;
+	private String fileName;
+	private File currentFile;
 }
diff --git a/len-core/src/main/java/com/len/util/UuidUtil.java b/len-core/src/main/java/com/len/util/UuidUtil.java
index 410dbcd..042b20f 100644
--- a/len-core/src/main/java/com/len/util/UuidUtil.java
+++ b/len-core/src/main/java/com/len/util/UuidUtil.java
@@ -4,7 +4,7 @@ import java.util.UUID;
 
 public class UuidUtil {
 
-    public static String getUuid() {
-        return UUID.randomUUID().toString().replace("-", "").toLowerCase();
-    }
+	public static String getUuid() {
+		return UUID.randomUUID().toString().replace("-", "").toLowerCase();
+	}
 }
diff --git a/len-core/src/main/java/com/len/util/VerifyCodeUtils.java b/len-core/src/main/java/com/len/util/VerifyCodeUtils.java
index ddc0c63..59dbcaf 100644
--- a/len-core/src/main/java/com/len/util/VerifyCodeUtils.java
+++ b/len-core/src/main/java/com/len/util/VerifyCodeUtils.java
@@ -1,10 +1,7 @@
 package com.len.util;
 
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
+import javax.imageio.ImageIO;
+import java.awt.*;
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -13,297 +10,308 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Arrays;
 import java.util.Random;
-import javax.imageio.ImageIO;
 
 public class VerifyCodeUtils {
-  
-    //使用到Algerian字体，系统里没有的话需要安装字体，字体只显示大写，去掉了1,0,i,o几个容易混淆的字符  
-    public static final String VERIFY_CODES = "23456789ABCDEFGHJKLMNPQRSTUVWXYZ";  
-    private static Random random = new Random();  
-  
-    
-    /**
-     * 验证码对象
-     * @author zhou-baicheng
-     *
-     */
-    public static class Verify{
-
-        private String code;//如 1 + 2
-    	
-    	private Integer value;//如  3
+
+	//使用到Algerian字体，系统里没有的话需要安装字体，字体只显示大写，去掉了1,0,i,o几个容易混淆的字符
+	public static final String VERIFY_CODES = "23456789ABCDEFGHJKLMNPQRSTUVWXYZ";
+	private static Random random = new Random();
+
+	/**
+	 * 使用系统默认字符源生成验证码
+	 *
+	 * @param verifySize 验证码长度
+	 * @return
+	 */
+	public static Verify generateVerify() {
+		int number1 = new Random().nextInt(10) + 1;
+		;
+		int number2 = new Random().nextInt(10) + 1;
+		;
+		Verify entity = new Verify();
+		entity.setCode(number1 + " x " + number2);
+		entity.setValue(number1 + number2);
+		return entity;
+	}
+
+	/**
+	 * 使用系统默认字符源生成验证码
+	 *
+	 * @param verifySize 验证码长度
+	 * @return
+	 */
+	public static String generateVerifyCode(int verifySize) {
+		return generateVerifyCode(verifySize, VERIFY_CODES);
+	}
+
+	/**
+	 * 使用指定源生成验证码
+	 *
+	 * @param verifySize 验证码长度
+	 * @param sources    验证码字符源
+	 * @return
+	 */
+	public static String generateVerifyCode(int verifySize, String sources) {
+		if (sources == null || sources.length() == 0) {
+			sources = VERIFY_CODES;
+		}
+		int codesLen = sources.length();
+		Random rand = new Random(System.currentTimeMillis());
+		StringBuilder verifyCode = new StringBuilder(verifySize);
+		for (int i = 0; i < verifySize; i++) {
+			verifyCode.append(sources.charAt(rand.nextInt(codesLen - 1)));
+		}
+		return verifyCode.toString();
+	}
+
+	/**
+	 * 生成随机验证码文件,并返回验证码值
+	 *
+	 * @param w
+	 * @param h
+	 * @param outputFile
+	 * @param verifySize
+	 * @return
+	 * @throws IOException
+	 */
+	public static String outputVerifyImage(int w, int h, File outputFile, int verifySize) throws IOException {
+		String verifyCode = generateVerifyCode(verifySize);
+		outputImage(w, h, outputFile, verifyCode);
+		return verifyCode;
+	}
+
+	/**
+	 * 输出随机验证码图片流,并返回验证码值
+	 *
+	 * @param w
+	 * @param h
+	 * @param os
+	 * @param verifySize
+	 * @return
+	 * @throws IOException
+	 */
+	public static String outputVerifyImage(int w, int h, OutputStream os, int verifySize) throws IOException {
+		String verifyCode = generateVerifyCode(verifySize);
+		outputImage(w, h, os, verifyCode);
+		return verifyCode;
+	}
+
+	/**
+	 * 生成指定验证码图像文件
+	 *
+	 * @param w
+	 * @param h
+	 * @param outputFile
+	 * @param code
+	 * @throws IOException
+	 */
+	public static void outputImage(int w, int h, File outputFile, String code) throws IOException {
+		if (outputFile == null) {
+			return;
+		}
+		File dir = outputFile.getParentFile();
+		if (!dir.exists()) {
+			dir.mkdirs();
+		}
+		try {
+			outputFile.createNewFile();
+			FileOutputStream fos = new FileOutputStream(outputFile);
+			outputImage(w, h, fos, code);
+			fos.close();
+		} catch (IOException e) {
+			throw e;
+		}
+	}
+
+	/**
+	 * 输出指定验证码图片流
+	 *
+	 * @param w
+	 * @param h
+	 * @param os
+	 * @param code
+	 * @throws IOException
+	 */
+	public static void outputImage(int w, int h, OutputStream os, String code) throws IOException {
+		int verifySize = code.length();
+		BufferedImage image = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
+		Random rand = new Random();
+		Graphics2D g2 = image.createGraphics();
+		g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+		Color[] colors = new Color[5];
+		Color[] colorSpaces = new Color[]{Color.WHITE, Color.CYAN,
+			Color.GRAY, Color.LIGHT_GRAY, Color.MAGENTA, Color.ORANGE,
+			Color.PINK, Color.YELLOW};
+		float[] fractions = new float[colors.length];
+		for (int i = 0; i < colors.length; i++) {
+			colors[i] = colorSpaces[rand.nextInt(colorSpaces.length)];
+			fractions[i] = rand.nextFloat();
+		}
+		Arrays.sort(fractions);
+
+		g2.setColor(Color.GRAY);// 设置边框色
+		g2.fillRect(0, 0, w, h);
+
+		Color c = getRandColor(200, 250);
+		g2.setColor(c);// 设置背景色
+		g2.fillRect(0, 2, w, h - 4);
+
+		//绘制干扰线
+		Random random = new Random();
+		g2.setColor(getRandColor(160, 200));// 设置线条的颜色
+		for (int i = 0; i < 20; i++) {
+			int x = random.nextInt(w - 1);
+			int y = random.nextInt(h - 1);
+			int xl = random.nextInt(6) + 1;
+			int yl = random.nextInt(12) + 1;
+			g2.drawLine(x, y, x + xl + 40, y + yl + 20);
+		}
+
+		// 添加噪点
+		float yawpRate = 0.05f;// 噪声率
+		int area = (int) (yawpRate * w * h);
+		for (int i = 0; i < area; i++) {
+			int x = random.nextInt(w);
+			int y = random.nextInt(h);
+			int rgb = getRandomIntColor();
+			image.setRGB(x, y, rgb);
+		}
+
+		shear(g2, w, h, c);// 使图片扭曲
+
+		g2.setColor(getRandColor(100, 160));
+		int fontSize = h - 4;
+		Font font = new Font("Algerian", Font.ITALIC, fontSize);
+		g2.setFont(font);
+		char[] chars = code.toCharArray();
+		for (int i = 0; i < verifySize; i++) {
+			AffineTransform affine = new AffineTransform();
+			affine.setToRotation(Math.PI / 4 * rand.nextDouble() * (rand.nextBoolean() ? 1 : -1), (w / verifySize) * i + fontSize / 2, h / 2);
+			g2.setTransform(affine);
+			g2.drawChars(chars, i, 1, ((w - 10) / verifySize) * i + 5, h / 2 + fontSize / 2 - 10);
+		}
+
+		g2.dispose();
+		ImageIO.write(image, "jpg", os);
+	}
+
+	private static Color getRandColor(int fc, int bc) {
+		if (fc > 255)
+			fc = 255;
+		if (bc > 255)
+			bc = 255;
+		int r = fc + random.nextInt(bc - fc);
+		int g = fc + random.nextInt(bc - fc);
+		int b = fc + random.nextInt(bc - fc);
+		return new Color(r, g, b);
+	}
+
+	private static int getRandomIntColor() {
+		int[] rgb = getRandomRgb();
+		int color = 0;
+		for (int c : rgb) {
+			color = color << 8;
+			color = color | c;
+		}
+		return color;
+	}
+
+	private static int[] getRandomRgb() {
+		int[] rgb = new int[3];
+		for (int i = 0; i < 3; i++) {
+			rgb[i] = random.nextInt(255);
+		}
+		return rgb;
+	}
+
+	private static void shear(Graphics g, int w1, int h1, Color color) {
+		shearX(g, w1, h1, color);
+		shearY(g, w1, h1, color);
+	}
+
+	private static void shearX(Graphics g, int w1, int h1, Color color) {
+
+		int period = random.nextInt(2);
+
+		boolean borderGap = true;
+		int frames = 1;
+		int phase = random.nextInt(2);
+
+		for (int i = 0; i < h1; i++) {
+			double d = (double) (period >> 1)
+				* Math.sin((double) i / (double) period
+				+ (6.2831853071795862D * (double) phase)
+				/ (double) frames);
+			g.copyArea(0, i, w1, 1, (int) d, 0);
+			if (borderGap) {
+				g.setColor(color);
+				g.drawLine((int) d, i, 0, i);
+				g.drawLine((int) d + w1, i, w1, i);
+			}
+		}
+
+	}
+
+	private static void shearY(Graphics g, int w1, int h1, Color color) {
+
+		int period = random.nextInt(40) + 10; // 50;
+
+		boolean borderGap = true;
+		int frames = 20;
+		int phase = 7;
+		for (int i = 0; i < w1; i++) {
+			double d = (double) (period >> 1)
+				* Math.sin((double) i / (double) period
+				+ (6.2831853071795862D * (double) phase)
+				/ (double) frames);
+			g.copyArea(i, 0, 1, h1, 0, (int) d);
+			if (borderGap) {
+				g.setColor(color);
+				g.drawLine(i, (int) d, i, 0);
+				g.drawLine(i, (int) d + h1, i, h1);
+			}
+
+		}
+
+	}
+
+	public static void main(String[] args) throws IOException {
+		File dir = new File("F:/verifies");
+		int w = 200, h = 80;
+		for (int i = 0; i < 50; i++) {
+			String verifyCode = generateVerifyCode(4);
+			File file = new File(dir, verifyCode + ".jpg");
+			outputImage(w, h, file, verifyCode);
+		}
+	}
+
+	/**
+	 * 验证码对象
+	 *
+	 * @author zhou-baicheng
+	 */
+	public static class Verify {
+
+		private String code;//如 1 + 2
+
+		private Integer value;//如  3
+
 		public String getCode() {
 			return code;
 		}
+
 		public void setCode(String code) {
 			this.code = code;
 		}
+
 		public Integer getValue() {
 			return value;
 		}
+
 		public void setValue(Integer value) {
 			this.value = value;
 		}
-    }
-  
-    /** 
-     * 使用系统默认字符源生成验证码 
-     * @param verifySize    验证码长度 
-     * @return 
-     */  
-    public static Verify generateVerify(){  
-    	int number1 = new Random().nextInt(10) + 1;;
-    	int number2 = new Random().nextInt(10) + 1;;
-    	Verify entity = new Verify();
-    	entity.setCode(number1  + " x " + number2);
-    	entity.setValue(number1 + number2);
-    	return entity;
-    }  
-    
-    /** 
-     * 使用系统默认字符源生成验证码 
-     * @param verifySize    验证码长度 
-     * @return 
-     */  
-    public static String generateVerifyCode(int verifySize){  
-        return generateVerifyCode(verifySize, VERIFY_CODES);  
-    }  
-    
-    
-    /** 
-     * 使用指定源生成验证码 
-     * @param verifySize    验证码长度 
-     * @param sources   验证码字符源 
-     * @return 
-     */  
-    public static String generateVerifyCode(int verifySize, String sources){  
-        if(sources == null || sources.length() == 0){  
-            sources = VERIFY_CODES;  
-        }  
-        int codesLen = sources.length();  
-        Random rand = new Random(System.currentTimeMillis());  
-        StringBuilder verifyCode = new StringBuilder(verifySize);  
-        for(int i = 0; i < verifySize; i++){  
-            verifyCode.append(sources.charAt(rand.nextInt(codesLen-1)));  
-        }  
-        return verifyCode.toString();  
-    }  
-      
-    /** 
-     * 生成随机验证码文件,并返回验证码值 
-     * @param w 
-     * @param h 
-     * @param outputFile 
-     * @param verifySize 
-     * @return 
-     * @throws IOException 
-     */  
-    public static String outputVerifyImage(int w, int h, File outputFile, int verifySize) throws IOException{  
-        String verifyCode = generateVerifyCode(verifySize);  
-        outputImage(w, h, outputFile, verifyCode);  
-        return verifyCode;  
-    }  
-      
-    /** 
-     * 输出随机验证码图片流,并返回验证码值 
-     * @param w 
-     * @param h 
-     * @param os 
-     * @param verifySize 
-     * @return 
-     * @throws IOException 
-     */  
-    public static String outputVerifyImage(int w, int h, OutputStream os, int verifySize) throws IOException{  
-        String verifyCode = generateVerifyCode(verifySize);  
-        outputImage(w, h, os, verifyCode);  
-        return verifyCode;  
-    }  
-      
-    /** 
-     * 生成指定验证码图像文件 
-     * @param w 
-     * @param h 
-     * @param outputFile 
-     * @param code 
-     * @throws IOException 
-     */  
-    public static void outputImage(int w, int h, File outputFile, String code) throws IOException{  
-        if(outputFile == null){  
-            return;  
-        }  
-        File dir = outputFile.getParentFile();  
-        if(!dir.exists()){  
-            dir.mkdirs();  
-        }  
-        try{  
-            outputFile.createNewFile();  
-            FileOutputStream fos = new FileOutputStream(outputFile);  
-            outputImage(w, h, fos, code);  
-            fos.close();  
-        } catch(IOException e){  
-            throw e;  
-        }  
-    }  
-      
-    /** 
-     * 输出指定验证码图片流 
-     * @param w 
-     * @param h 
-     * @param os 
-     * @param code 
-     * @throws IOException 
-     */  
-    public static void outputImage(int w, int h, OutputStream os, String code) throws IOException{  
-        int verifySize = code.length();  
-        BufferedImage image = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);  
-        Random rand = new Random();  
-        Graphics2D g2 = image.createGraphics();  
-        g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,RenderingHints.VALUE_ANTIALIAS_ON);  
-        Color[] colors = new Color[5];  
-        Color[] colorSpaces = new Color[] { Color.WHITE, Color.CYAN,  
-                Color.GRAY, Color.LIGHT_GRAY, Color.MAGENTA, Color.ORANGE,  
-                Color.PINK, Color.YELLOW };  
-        float[] fractions = new float[colors.length];  
-        for(int i = 0; i < colors.length; i++){  
-            colors[i] = colorSpaces[rand.nextInt(colorSpaces.length)];  
-            fractions[i] = rand.nextFloat();  
-        }  
-        Arrays.sort(fractions);  
-          
-        g2.setColor(Color.GRAY);// 设置边框色  
-        g2.fillRect(0, 0, w, h);  
-          
-        Color c = getRandColor(200, 250);  
-        g2.setColor(c);// 设置背景色  
-        g2.fillRect(0, 2, w, h-4);  
-          
-        //绘制干扰线  
-        Random random = new Random();  
-        g2.setColor(getRandColor(160, 200));// 设置线条的颜色  
-        for (int i = 0; i < 20; i++) {  
-            int x = random.nextInt(w - 1);  
-            int y = random.nextInt(h - 1);  
-            int xl = random.nextInt(6) + 1;  
-            int yl = random.nextInt(12) + 1;  
-            g2.drawLine(x, y, x + xl + 40, y + yl + 20);  
-        }  
-          
-        // 添加噪点  
-        float yawpRate = 0.05f;// 噪声率  
-        int area = (int) (yawpRate * w * h);  
-        for (int i = 0; i < area; i++) {  
-            int x = random.nextInt(w);  
-            int y = random.nextInt(h);  
-            int rgb = getRandomIntColor();  
-            image.setRGB(x, y, rgb);  
-        }  
-          
-        shear(g2, w, h, c);// 使图片扭曲  
-  
-        g2.setColor(getRandColor(100, 160));  
-        int fontSize = h-4;  
-        Font font = new Font("Algerian", Font.ITALIC, fontSize);  
-        g2.setFont(font);  
-        char[] chars = code.toCharArray();  
-        for(int i = 0; i < verifySize; i++){  
-            AffineTransform affine = new AffineTransform();  
-            affine.setToRotation(Math.PI / 4 * rand.nextDouble() * (rand.nextBoolean() ? 1 : -1), (w / verifySize) * i + fontSize/2, h/2);  
-            g2.setTransform(affine);  
-            g2.drawChars(chars, i, 1, ((w-10) / verifySize) * i + 5, h/2 + fontSize/2 - 10);  
-        }  
-          
-        g2.dispose();  
-        ImageIO.write(image, "jpg", os);  
-    }  
-      
-    private static Color getRandColor(int fc, int bc) {  
-        if (fc > 255)  
-            fc = 255;  
-        if (bc > 255)  
-            bc = 255;  
-        int r = fc + random.nextInt(bc - fc);  
-        int g = fc + random.nextInt(bc - fc);  
-        int b = fc + random.nextInt(bc - fc);  
-        return new Color(r, g, b);  
-    }  
-      
-    private static int getRandomIntColor() {  
-        int[] rgb = getRandomRgb();  
-        int color = 0;  
-        for (int c : rgb) {  
-            color = color << 8;  
-            color = color | c;  
-        }  
-        return color;  
-    }  
-      
-    private static int[] getRandomRgb() {  
-        int[] rgb = new int[3];  
-        for (int i = 0; i < 3; i++) {  
-            rgb[i] = random.nextInt(255);  
-        }  
-        return rgb;  
-    }  
-  
-    private static void shear(Graphics g, int w1, int h1, Color color) {  
-        shearX(g, w1, h1, color);  
-        shearY(g, w1, h1, color);  
-    }  
-      
-    private static void shearX(Graphics g, int w1, int h1, Color color) {  
-  
-        int period = random.nextInt(2);  
-  
-        boolean borderGap = true;  
-        int frames = 1;  
-        int phase = random.nextInt(2);  
-  
-        for (int i = 0; i < h1; i++) {  
-            double d = (double) (period >> 1)  
-                    * Math.sin((double) i / (double) period  
-                            + (6.2831853071795862D * (double) phase)  
-                            / (double) frames);  
-            g.copyArea(0, i, w1, 1, (int) d, 0);  
-            if (borderGap) {  
-                g.setColor(color);  
-                g.drawLine((int) d, i, 0, i);  
-                g.drawLine((int) d + w1, i, w1, i);  
-            }  
-        }  
-  
-    }  
-  
-    private static void shearY(Graphics g, int w1, int h1, Color color) {  
-  
-        int period = random.nextInt(40) + 10; // 50;  
-  
-        boolean borderGap = true;  
-        int frames = 20;  
-        int phase = 7;  
-        for (int i = 0; i < w1; i++) {  
-            double d = (double) (period >> 1)  
-                    * Math.sin((double) i / (double) period  
-                            + (6.2831853071795862D * (double) phase)  
-                            / (double) frames);  
-            g.copyArea(i, 0, 1, h1, 0, (int) d);  
-            if (borderGap) {  
-                g.setColor(color);  
-                g.drawLine(i, (int) d, i, 0);  
-                g.drawLine(i, (int) d + h1, i, h1);  
-            }  
-  
-        }  
-  
-    }  
-    public static void main(String[] args) throws IOException{  
-        File dir = new File("F:/verifies");  
-        int w = 200, h = 80;  
-        for(int i = 0; i < 50; i++){  
-            String verifyCode = generateVerifyCode(4);  
-            File file = new File(dir, verifyCode + ".jpg");  
-            outputImage(w, h, file, verifyCode);  
-        }  
-    }  
-    
-   
-}
\ No newline at end of file
+	}
+
+
+}
diff --git a/len-core/src/main/java/com/len/validator/ValidatorUtils.java b/len-core/src/main/java/com/len/validator/ValidatorUtils.java
index cc1b6cb..38ffa41 100644
--- a/len-core/src/main/java/com/len/validator/ValidatorUtils.java
+++ b/len-core/src/main/java/com/len/validator/ValidatorUtils.java
@@ -18,43 +18,43 @@ import java.util.Set;
  */
 public class ValidatorUtils {
 
-    private static Validator validator;
-
-
-    static {
-        validator = Validation.buildDefaultValidatorFactory().getValidator();
-    }
-
-    /**
-     * 校验对象
-     *
-     * @param object 待校验对象
-     * @param groups 待校验的组
-     * @throws LenException 校验不通过，则报BusinessException异常
-     */
-    public static void validateEntity(Object object, Class<?>... groups)
-            throws LenException {
-        Set<ConstraintViolation<Object>> constraintViolations = validator.validate(object, groups);
-        if (!constraintViolations.isEmpty()) {
-            ConstraintViolation<Object> constraint =
-                    constraintViolations.iterator().next();
-            throw new ServiceException(constraint.getMessage());
-        }
-    }
-
-    public static void notEmpty(String str, String msg, Object... args) {
-        if (str == null || str.isEmpty()) {
-            validateEntity(msg, args);
-        }
-    }
-
-    public static void notNull(Object obj, String msg, Object... args) {
-        if (obj == null) {
-            validateEntity(msg, args);
-        }
-    }
-
-    private static void validateEntity(String msg, Object... args) {
-        throw new ServiceException(MsHelper.getMessage(msg, args));
-    }
+	private static Validator validator;
+
+
+	static {
+		validator = Validation.buildDefaultValidatorFactory().getValidator();
+	}
+
+	/**
+	 * 校验对象
+	 *
+	 * @param object 待校验对象
+	 * @param groups 待校验的组
+	 * @throws LenException 校验不通过，则报BusinessException异常
+	 */
+	public static void validateEntity(Object object, Class<?>... groups)
+		throws LenException {
+		Set<ConstraintViolation<Object>> constraintViolations = validator.validate(object, groups);
+		if (!constraintViolations.isEmpty()) {
+			ConstraintViolation<Object> constraint =
+				constraintViolations.iterator().next();
+			throw new ServiceException(constraint.getMessage());
+		}
+	}
+
+	public static void notEmpty(String str, String msg, Object... args) {
+		if (str == null || str.isEmpty()) {
+			validateEntity(msg, args);
+		}
+	}
+
+	public static void notNull(Object obj, String msg, Object... args) {
+		if (obj == null) {
+			validateEntity(msg, args);
+		}
+	}
+
+	private static void validateEntity(String msg, Object... args) {
+		throw new ServiceException(MsHelper.getMessage(msg, args));
+	}
 }
diff --git a/len-core/src/main/java/com/len/validator/group/AddGroup.java b/len-core/src/main/java/com/len/validator/group/AddGroup.java
index 10316fc..2bcaeab 100644
--- a/len-core/src/main/java/com/len/validator/group/AddGroup.java
+++ b/len-core/src/main/java/com/len/validator/group/AddGroup.java
@@ -1,8 +1,7 @@
 package com.len.validator.group;
 
 /**
- * 
- * @ClassName: AddGroup   
+ * @ClassName: AddGroup
  * @Description: 新增数据 Group
  * @author: liutao
  * @date: 2018年3月16日 下午12:15:23
diff --git a/len-core/src/main/java/com/len/validator/group/Group.java b/len-core/src/main/java/com/len/validator/group/Group.java
index 3b92508..29d4086 100644
--- a/len-core/src/main/java/com/len/validator/group/Group.java
+++ b/len-core/src/main/java/com/len/validator/group/Group.java
@@ -3,8 +3,7 @@ package com.len.validator.group;
 import javax.validation.GroupSequence;
 
 /**
- * 
- * @ClassName: Group   
+ * @ClassName: Group
  * @Description: 定义校验顺序，如果AddGroup组失败，则UpdateGroup组不会再校验
  * @author: liutao
  * @date: 2018年3月16日 下午2:29:21
diff --git a/len-core/src/main/java/com/len/validator/group/UpdateGroup.java b/len-core/src/main/java/com/len/validator/group/UpdateGroup.java
index e7f965d..91ee1d6 100644
--- a/len-core/src/main/java/com/len/validator/group/UpdateGroup.java
+++ b/len-core/src/main/java/com/len/validator/group/UpdateGroup.java
@@ -1,8 +1,7 @@
 package com.len.validator.group;
 
 /**
- * 
- * @ClassName: UpdateGroup   
+ * @ClassName: UpdateGroup
  * @Description: 更新数据 Group
  * @author: liutao
  * @date: 2018年3月16日 下午2:29:34
diff --git a/len-core/src/test/java/com/len/AppTest.java b/len-core/src/test/java/com/len/AppTest.java
index bfff2c5..2d2effe 100644
--- a/len-core/src/test/java/com/len/AppTest.java
+++ b/len-core/src/test/java/com/len/AppTest.java
@@ -7,32 +7,28 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
+public class AppTest
+	extends TestCase {
+	/**
+	 * Create the test case
+	 *
+	 * @param testName name of the test case
+	 */
+	public AppTest(String testName) {
+		super(testName);
+	}
 
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
+	/**
+	 * @return the suite of tests being tested
+	 */
+	public static Test suite() {
+		return new TestSuite(AppTest.class);
+	}
 
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
+	/**
+	 * Rigourous Test :-)
+	 */
+	public void testApp() {
+		assertTrue(true);
+	}
 }
diff --git a/len-sys/pom.xml b/len-sys/pom.xml
index 7ba911d..4760f9f 100644
--- a/len-sys/pom.xml
+++ b/len-sys/pom.xml
@@ -1,31 +1,31 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <artifactId>lenosp</artifactId>
-    <groupId>com.len</groupId>
-    <version>lenosp-2.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<artifactId>lenosp</artifactId>
+		<groupId>com.len</groupId>
+		<version>lenosp-2.0-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
 
-  <artifactId>len-sys</artifactId>
+	<artifactId>len-sys</artifactId>
 
-  <name>len-sys</name>
-  <url>http://maven.apache.org</url>
+	<name>len-sys</name>
+	<url>http://maven.apache.org</url>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
 
-  <dependencies>
-      <dependency>
-        <groupId>com.len</groupId>
-        <artifactId>len-core</artifactId>
-      </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-    </dependency>
-  </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>com.len</groupId>
+			<artifactId>len-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+		</dependency>
+	</dependencies>
 </project>
diff --git a/len-sys/src/main/java/com/len/controller/DashboardController.java b/len-sys/src/main/java/com/len/controller/DashboardController.java
index be1abed..21baeb0 100644
--- a/len-sys/src/main/java/com/len/controller/DashboardController.java
+++ b/len-sys/src/main/java/com/len/controller/DashboardController.java
@@ -1,105 +1,103 @@
 package com.len.controller;
 
-import java.util.Arrays;
-import java.util.List;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-
 import com.len.base.BaseController;
 import com.len.entity.SysPanelOpt;
 import com.len.service.DashboardService;
 import com.len.service.MenuService;
 import com.len.util.LenResponse;
-
 import io.swagger.annotations.Api;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
 
 @Controller
 @RequestMapping("/dashboard")
 @Api(value = "仪表盘", tags = "仪表盘")
 public class DashboardController extends BaseController {
 
-    private final MenuService menuService;
-
-    private final DashboardService dashboardService;
-
-    public DashboardController(MenuService menuService, DashboardService dashboardService) {
-        this.menuService = menuService;
-        this.dashboardService = dashboardService;
-    }
-
-    @GetMapping("/panel/list")
-    @ResponseBody
-    public LenResponse paneList() {
-        return succ(dashboardService.panelList());
-    }
-
-    /**
-     * 保存个人面板顺序配置
-     *
-     * @param panelOpts
-     * @return
-     */
-    @PostMapping("/panel/save")
-    @ResponseBody
-    public LenResponse savePanel(@RequestBody List<SysPanelOpt> panelOpts) {
-        dashboardService.savePanelOpt(panelOpts);
-        return succ();
-    }
-
-    /**
-     * 展示面板
-     * 
-     * @return
-     */
-    @GetMapping
-    public String main() {
-        return "/main/dashboard";
-    }
-
-    @GetMapping("/shortCuts")
-    @ResponseBody
-    public LenResponse getShortCuts() {
-        return succ(menuService.getShortCuts());
-    }
-
-    /**
-     * 添加快捷菜单
-     * 
-     * @param code 菜单code
-     * @return
-     */
-    @PostMapping("/shortCuts/add")
-    @ResponseBody
-    public LenResponse addShortCuts(String code) {
-        return succ(menuService.addShortCuts(code));
-    }
-
-    /**
-     * 根据编码删除菜单
-     * 
-     * @param code 菜单code
-     * @return
-     */
-    @PostMapping("/shortCuts/del/{code}")
-    @ResponseBody
-    public LenResponse delShortCuts(@PathVariable("code") String code) {
-        menuService.delShortcuts(code);
-        return succ();
-    }
-
-    /**
-     * 根据编码删除菜单
-     *
-     * @param shortCutsIds 快捷菜单id arr
-     * @return
-     */
-    @PostMapping("/shortCuts/sort")
-    @ResponseBody
-    public LenResponse sortShortCuts(String shortCutsIds) {
-        String[] shortCutsList = shortCutsIds.split(",", -1);
-        menuService.sortShortCuts(Arrays.asList(shortCutsList));
-        return succ();
-    }
+	private final MenuService menuService;
+
+	private final DashboardService dashboardService;
+
+	public DashboardController(MenuService menuService, DashboardService dashboardService) {
+		this.menuService = menuService;
+		this.dashboardService = dashboardService;
+	}
+
+	@GetMapping("/panel/list")
+	@ResponseBody
+	public LenResponse paneList() {
+		return succ(dashboardService.panelList());
+	}
+
+	/**
+	 * 保存个人面板顺序配置
+	 *
+	 * @param panelOpts
+	 * @return
+	 */
+	@PostMapping("/panel/save")
+	@ResponseBody
+	public LenResponse savePanel(@RequestBody List<SysPanelOpt> panelOpts) {
+		dashboardService.savePanelOpt(panelOpts);
+		return succ();
+	}
+
+	/**
+	 * 展示面板
+	 *
+	 * @return
+	 */
+	@GetMapping
+	public String main() {
+		return "/main/dashboard";
+	}
+
+	@GetMapping("/shortCuts")
+	@ResponseBody
+	public LenResponse getShortCuts() {
+		return succ(menuService.getShortCuts());
+	}
+
+	/**
+	 * 添加快捷菜单
+	 *
+	 * @param code 菜单code
+	 * @return
+	 */
+	@PostMapping("/shortCuts/add")
+	@ResponseBody
+	public LenResponse addShortCuts(String code) {
+		return succ(menuService.addShortCuts(code));
+	}
+
+	/**
+	 * 根据编码删除菜单
+	 *
+	 * @param code 菜单code
+	 * @return
+	 */
+	@PostMapping("/shortCuts/del/{code}")
+	@ResponseBody
+	public LenResponse delShortCuts(@PathVariable("code") String code) {
+		menuService.delShortcuts(code);
+		return succ();
+	}
+
+	/**
+	 * 根据编码删除菜单
+	 *
+	 * @param shortCutsIds 快捷菜单id arr
+	 * @return
+	 */
+	@PostMapping("/shortCuts/sort")
+	@ResponseBody
+	public LenResponse sortShortCuts(String shortCutsIds) {
+		String[] shortCutsList = shortCutsIds.split(",", -1);
+		menuService.sortShortCuts(Arrays.asList(shortCutsList));
+		return succ();
+	}
 
 }
diff --git a/len-sys/src/main/java/com/len/controller/ErrorController.java b/len-sys/src/main/java/com/len/controller/ErrorController.java
index 19becae..e603e3a 100644
--- a/len-sys/src/main/java/com/len/controller/ErrorController.java
+++ b/len-sys/src/main/java/com/len/controller/ErrorController.java
@@ -13,17 +13,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @Api(value = "异常", tags = "异常业务类")
 public class ErrorController {
 
-    @GetMapping(value = "404")
-    public String pageNotFound() {
-        return "error/404";
-    }
+	@GetMapping(value = "404")
+	public String pageNotFound() {
+		return "error/404";
+	}
 
-    @GetMapping(value = "403")
-    public String notFound(String message, Model model) {
-        if (!StringUtils.isEmpty(message)) {
-            model.addAttribute("message", message);
-        }
-        return "error/403";
-    }
+	@GetMapping(value = "403")
+	public String notFound(String message, Model model) {
+		if (!StringUtils.isEmpty(message)) {
+			model.addAttribute("message", message);
+		}
+		return "error/403";
+	}
 
 }
diff --git a/len-sys/src/main/java/com/len/controller/JobController.java b/len-sys/src/main/java/com/len/controller/JobController.java
index 7050486..6d47870 100644
--- a/len-sys/src/main/java/com/len/controller/JobController.java
+++ b/len-sys/src/main/java/com/len/controller/JobController.java
@@ -1,14 +1,5 @@
 package com.len.controller;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
 import com.len.base.BaseController;
 import com.len.core.annotation.Log;
 import com.len.core.annotation.Log.LOG_TYPE;
@@ -19,9 +10,16 @@ import com.len.service.JobService;
 import com.len.util.LenResponse;
 import com.len.util.MsHelper;
 import com.len.util.ReType;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
  * 定时任务 controller
@@ -31,92 +29,92 @@ import io.swagger.annotations.ApiOperation;
 @Api(value = "定时任务", tags = "定时任务")
 public class JobController extends BaseController {
 
-    private final JobService jobService;
-
-    private final JobTask jobTask;
-
-    public JobController(JobService jobService, JobTask jobTask) {
-        this.jobService = jobService;
-        this.jobTask = jobTask;
-    }
-
-    @GetMapping(value = "showJob")
-    @RequiresPermissions("job:show")
-    public String showUser(Model model) {
-        return "/system/job/jobList";
-    }
-
-    @GetMapping(value = "showJobList")
-    @ResponseBody
-    @RequiresPermissions("job:show")
-    public ReType showUser(SysJob job, String page, String limit) {
-        return jobService.show(job, Integer.parseInt(page), Integer.parseInt(limit));
-    }
-
-    @GetMapping(value = "showAddJob")
-    public String addJob() {
-        return "/system/job/add";
-    }
-
-    @ApiOperation(value = "/addJob", httpMethod = "POST", notes = "添加任务类")
-    @Log(desc = "添加任务")
-    @PostMapping(value = "addJob")
-    @ResponseBody
-    public LenResponse addJob(SysJob job) {
-        job.setStatus(false);
-        jobService.save(job);
-        return succ(MsHelper.getMsg("insert.success"));
-    }
-
-    @GetMapping(value = "updateJob")
-    public String updateJob(String id, Model model, boolean detail) {
-        if (StringUtils.isNotEmpty(id)) {
-            SysJob job = jobService.getById(id);
-            model.addAttribute("job", job);
-        }
-        model.addAttribute("detail", detail);
-        return "system/job/update";
-    }
-
-    @ApiOperation(value = "/updateJob", httpMethod = "POST", notes = "更新任务")
-    @Log(desc = "更新任务", type = LOG_TYPE.UPDATE)
-    @PostMapping(value = "updateJob")
-    @ResponseBody
-    public LenResponse updateJob(SysJob job) {
-        if (jobTask.checkJob(job)) {
-            throw new ServiceException(MsHelper.getMsg("job.started"));
-        }
-        jobService.updateJob(job);
-        return succ(MsHelper.getMsg("update.success"));
-
-    }
-
-    @Log(desc = "删除任务", type = LOG_TYPE.DEL)
-    @ApiOperation(value = "/del", httpMethod = "POST", notes = "删除任务")
-    @PostMapping(value = "del")
-    @ResponseBody
-    @RequiresPermissions("job:del")
-    public LenResponse del(String id) {
-        jobService.del(id);
-        return succ(MsHelper.getMsg("del.success"));
-    }
-
-    @Log(desc = "启动任务")
-    @PostMapping(value = "startJob")
-    @ResponseBody
-    @RequiresPermissions("job:start")
-    public LenResponse startJob(String id) {
-        jobService.startJob(id);
-        return succ("job.start");
-    }
-
-    @Log(desc = "停止任务")
-    @PostMapping(value = "endJob")
-    @ResponseBody
-    @RequiresPermissions("job:end")
-    public LenResponse endJob(String id) {
-        jobService.stopJob(id);
-        return succ(MsHelper.getMsg("job.stop"));
-    }
+	private final JobService jobService;
+
+	private final JobTask jobTask;
+
+	public JobController(JobService jobService, JobTask jobTask) {
+		this.jobService = jobService;
+		this.jobTask = jobTask;
+	}
+
+	@GetMapping(value = "showJob")
+	@RequiresPermissions("job:show")
+	public String showUser(Model model) {
+		return "/system/job/jobList";
+	}
+
+	@GetMapping(value = "showJobList")
+	@ResponseBody
+	@RequiresPermissions("job:show")
+	public ReType showUser(SysJob job, String page, String limit) {
+		return jobService.show(job, Integer.parseInt(page), Integer.parseInt(limit));
+	}
+
+	@GetMapping(value = "showAddJob")
+	public String addJob() {
+		return "/system/job/add";
+	}
+
+	@ApiOperation(value = "/addJob", httpMethod = "POST", notes = "添加任务类")
+	@Log(desc = "添加任务")
+	@PostMapping(value = "addJob")
+	@ResponseBody
+	public LenResponse addJob(SysJob job) {
+		job.setStatus(false);
+		jobService.save(job);
+		return succ(MsHelper.getMsg("insert.success"));
+	}
+
+	@GetMapping(value = "updateJob")
+	public String updateJob(String id, Model model, boolean detail) {
+		if (StringUtils.isNotEmpty(id)) {
+			SysJob job = jobService.getById(id);
+			model.addAttribute("job", job);
+		}
+		model.addAttribute("detail", detail);
+		return "system/job/update";
+	}
+
+	@ApiOperation(value = "/updateJob", httpMethod = "POST", notes = "更新任务")
+	@Log(desc = "更新任务", type = LOG_TYPE.UPDATE)
+	@PostMapping(value = "updateJob")
+	@ResponseBody
+	public LenResponse updateJob(SysJob job) {
+		if (jobTask.checkJob(job)) {
+			throw new ServiceException(MsHelper.getMsg("job.started"));
+		}
+		jobService.updateJob(job);
+		return succ(MsHelper.getMsg("update.success"));
+
+	}
+
+	@Log(desc = "删除任务", type = LOG_TYPE.DEL)
+	@ApiOperation(value = "/del", httpMethod = "POST", notes = "删除任务")
+	@PostMapping(value = "del")
+	@ResponseBody
+	@RequiresPermissions("job:del")
+	public LenResponse del(String id) {
+		jobService.del(id);
+		return succ(MsHelper.getMsg("del.success"));
+	}
+
+	@Log(desc = "启动任务")
+	@PostMapping(value = "startJob")
+	@ResponseBody
+	@RequiresPermissions("job:start")
+	public LenResponse startJob(String id) {
+		jobService.startJob(id);
+		return succ("job.start");
+	}
+
+	@Log(desc = "停止任务")
+	@PostMapping(value = "endJob")
+	@ResponseBody
+	@RequiresPermissions("job:end")
+	public LenResponse endJob(String id) {
+		jobService.stopJob(id);
+		return succ(MsHelper.getMsg("job.stop"));
+	}
 
 }
diff --git a/len-sys/src/main/java/com/len/controller/LogController.java b/len-sys/src/main/java/com/len/controller/LogController.java
index 3026b61..14ce760 100644
--- a/len-sys/src/main/java/com/len/controller/LogController.java
+++ b/len-sys/src/main/java/com/len/controller/LogController.java
@@ -10,16 +10,14 @@ import com.len.util.MsHelper;
 import com.len.util.ReType;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
- *        日志监控
+ * 日志监控
  */
 @Controller
 @RequestMapping(value = "/log")
@@ -27,45 +25,45 @@ import org.springframework.web.bind.annotation.ResponseBody;
 @Api(value = "日志管理", tags = "操作日志记录")
 public class LogController extends BaseController {
 
-    private final SysLogMapper logMapper;
+	private final SysLogMapper logMapper;
 
-    public LogController(SysLogMapper logMapper) {
-        this.logMapper = logMapper;
-    }
+	public LogController(SysLogMapper logMapper) {
+		this.logMapper = logMapper;
+	}
 
-    @GetMapping(value = "showLog")
-    public String showMenu() {
-        return "/system/log/logList";
-    }
+	@GetMapping(value = "showLog")
+	public String showMenu() {
+		return "/system/log/logList";
+	}
 
-    /**
-     * 日志监控
-     *
-     * @param sysLog
-     * @param page
-     * @param limit
-     * @return
-     */
-    @GetMapping(value = "showLogList")
-    @ResponseBody
-    public ReType showLog(SysLog sysLog, String page, String limit) {
-        Page<SysLog> tPage = PageHelper.startPage(Integer.valueOf(page), Integer.valueOf(limit));
-        return new ReType(tPage.getTotal(), logMapper.selectListByPage(sysLog));
-    }
+	/**
+	 * 日志监控
+	 *
+	 * @param sysLog
+	 * @param page
+	 * @param limit
+	 * @return
+	 */
+	@GetMapping(value = "showLogList")
+	@ResponseBody
+	public ReType showLog(SysLog sysLog, String page, String limit) {
+		Page<SysLog> tPage = PageHelper.startPage(Integer.valueOf(page), Integer.valueOf(limit));
+		return new ReType(tPage.getTotal(), logMapper.selectListByPage(sysLog));
+	}
 
-    /**
-     * 删除log
-     *
-     * @param
-     * @return
-     */
-    @PostMapping(value = "del")
-    @ResponseBody
-    public LenResponse del(String[] ids) {
-        for (String id : ids) {
-            logMapper.deleteById(Integer.valueOf(id));
-        }
-        return succ(MsHelper.getMsg("del.success"));
-    }
+	/**
+	 * 删除log
+	 *
+	 * @param
+	 * @return
+	 */
+	@PostMapping(value = "del")
+	@ResponseBody
+	public LenResponse del(String[] ids) {
+		for (String id : ids) {
+			logMapper.deleteById(Integer.valueOf(id));
+		}
+		return succ(MsHelper.getMsg("del.success"));
+	}
 
 }
diff --git a/len-sys/src/main/java/com/len/controller/LoginController.java b/len-sys/src/main/java/com/len/controller/LoginController.java
index c03de21..d86d413 100644
--- a/len-sys/src/main/java/com/len/controller/LoginController.java
+++ b/len-sys/src/main/java/com/len/controller/LoginController.java
@@ -1,9 +1,16 @@
 package com.len.controller;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
+import com.len.core.annotation.Log;
+import com.len.core.shiro.Principal;
+import com.len.entity.SysUser;
+import com.len.menu.LoginType;
+import com.len.service.SysUserService;
+import com.len.util.CustomUsernamePasswordToken;
+import com.len.util.MsHelper;
+import com.len.util.VerifyCodeUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.ExcessiveAttemptsException;
@@ -17,18 +24,9 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 
-import com.len.core.annotation.Log;
-import com.len.core.shiro.Principal;
-import com.len.entity.SysUser;
-import com.len.menu.LoginType;
-import com.len.service.SysUserService;
-import com.len.util.CustomUsernamePasswordToken;
-import com.len.util.MsHelper;
-import com.len.util.VerifyCodeUtils;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 /**
  * 登录、退出页面
@@ -38,59 +36,60 @@ import lombok.extern.slf4j.Slf4j;
 @Api(value = "登录业务", tags = "登录校验处理")
 public class LoginController {
 
-    SysUserService userService;
-    /**
-     * spring在4.x版本后推荐使用构造器的方式的来注入fileld；
-     * Spring4.3+之后，constructor注入支持非显示注入方式。
-     * 下方的@Autowired就已经可以去掉了
-     * @param userService
-     */
-    @Autowired
-    public LoginController(SysUserService userService) {
-        this.userService = userService;
-    }
-
-    private static final String CODE_ERROR = "code.error";
-    private static final String CODE_TIMEOUT = "code.timeout";
-    private static final Long TWO_WEEK = 1000 * 60 * 60 * 24 * 14L;
-
-    @GetMapping(value = "")
-    public String login() {
-        return toLogin();
-    }
-
-    @GetMapping(value = "goLogin")
-    public String goLogin(Model model) {
-        Subject sub = SecurityUtils.getSubject();
-        if (sub.isAuthenticated()) {
-            return "/main/main";
-        } else {
-            model.addAttribute("message", MsHelper.getMsg("login.again"));
-            return "/login2";
-        }
-    }
-
-    @GetMapping(value = "/login")
-    public String toLogin() {
-        Subject sub = SecurityUtils.getSubject();
-        Session session = sub.getSession();
-        if (sub.isAuthenticated() || sub.isRemembered()) {
-            return "/main/main";
-        }
-        return "/login2";
-    }
-
-    /**
-     * 登录动作
-     *
-     * @param user
-     * @param model
-     * @param rememberMe
-     * @return
-     */
-    @ApiOperation(value = "/login", httpMethod = "POST", notes = "登录method")
-    @PostMapping("/login")
-    public String login(SysUser user, Model model, String rememberMe, HttpServletRequest request) {
+	private static final String CODE_ERROR = "code.error";
+	private static final String CODE_TIMEOUT = "code.timeout";
+	private static final Long TWO_WEEK = 1000 * 60 * 60 * 24 * 14L;
+	SysUserService userService;
+
+	/**
+	 * spring在4.x版本后推荐使用构造器的方式的来注入fileld；
+	 * Spring4.3+之后，constructor注入支持非显示注入方式。
+	 * 下方的@Autowired就已经可以去掉了
+	 *
+	 * @param userService
+	 */
+	@Autowired
+	public LoginController(SysUserService userService) {
+		this.userService = userService;
+	}
+
+	@GetMapping(value = "")
+	public String login() {
+		return toLogin();
+	}
+
+	@GetMapping(value = "goLogin")
+	public String goLogin(Model model) {
+		Subject sub = SecurityUtils.getSubject();
+		if (sub.isAuthenticated()) {
+			return "/main/main";
+		} else {
+			model.addAttribute("message", MsHelper.getMsg("login.again"));
+			return "/login2";
+		}
+	}
+
+	@GetMapping(value = "/login")
+	public String toLogin() {
+		Subject sub = SecurityUtils.getSubject();
+		Session session = sub.getSession();
+		if (sub.isAuthenticated() || sub.isRemembered()) {
+			return "/main/main";
+		}
+		return "/login2";
+	}
+
+	/**
+	 * 登录动作
+	 *
+	 * @param user
+	 * @param model
+	 * @param rememberMe
+	 * @return
+	 */
+	@ApiOperation(value = "/login", httpMethod = "POST", notes = "登录method")
+	@PostMapping("/login")
+	public String login(SysUser user, Model model, String rememberMe, HttpServletRequest request) {
         /* String codeMsg = (String) request.getAttribute("shiroLoginFailure");
         if (CODE_ERROR.equals(codeMsg)) {
             model.addAttribute("message", "验证码错误");
@@ -99,65 +98,65 @@ public class LoginController {
             model.addAttribute("message", "验证码过期");
             return "/login2";
         }*/
-        CustomUsernamePasswordToken token =
-            new CustomUsernamePasswordToken(user.getUsername().trim(), user.getPassword(), LoginType.SYS);
-        Subject subject = Principal.getSubject();
-        String msg = null;
-        try {
-            subject.login(token);
-            if (subject.isAuthenticated()) {
-                String isRemember = request.getParameter("isRemember");
-                if (!StringUtils.isEmpty(isRemember)) {
-                    if ("true".equals(isRemember)) {
-                        subject.getSession().setTimeout(TWO_WEEK);
-                    }
-                }
-
-                return "redirect:/main";
-            }
-        } catch (UnknownAccountException | IncorrectCredentialsException e) {
-            msg = MsHelper.getMsg("login.error");
-        } catch (ExcessiveAttemptsException e) {
-            msg = MsHelper.getMsg("locking");
-        }
-        if (msg != null) {
-            model.addAttribute("message", msg);
-        }
-        return "/login2";
-    }
-
-    @GetMapping("/main")
-    public String main() {
-        return "main/main";
-    }
-
-    @Log(desc = "用户退出平台")
-    @GetMapping(value = "/logout")
-    public String logout() {
-        Subject sub = SecurityUtils.getSubject();
-        sub.logout();
-        return "/login2";
-    }
-
-    @GetMapping(value = "/getCode")
-    public void getYzm(HttpServletResponse response, HttpServletRequest request) {
-        try {
-            response.setHeader("Pragma", "No-cache");
-            response.setHeader("Cache-Control", "no-cache");
-            response.setDateHeader("Expires", 0);
-            response.setContentType("image/jpg");
-
-            // 生成随机字串
-            String verifyCode = VerifyCodeUtils.generateVerifyCode(4);
-            log.info("verifyCode:{}", verifyCode);
-            // 存入会话session
-            HttpSession session = request.getSession(true);
-            session.setAttribute("code", verifyCode.toLowerCase());
-            // 生成图片
-            int w = 100, h = 35;
-            VerifyCodeUtils.outputImage(w, h, response.getOutputStream(), verifyCode);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
+		CustomUsernamePasswordToken token =
+			new CustomUsernamePasswordToken(user.getUsername().trim(), user.getPassword(), LoginType.SYS);
+		Subject subject = Principal.getSubject();
+		String msg = null;
+		try {
+			subject.login(token);
+			if (subject.isAuthenticated()) {
+				String isRemember = request.getParameter("isRemember");
+				if (!StringUtils.isEmpty(isRemember)) {
+					if ("true".equals(isRemember)) {
+						subject.getSession().setTimeout(TWO_WEEK);
+					}
+				}
+
+				return "redirect:/main";
+			}
+		} catch (UnknownAccountException | IncorrectCredentialsException e) {
+			msg = MsHelper.getMsg("login.error");
+		} catch (ExcessiveAttemptsException e) {
+			msg = MsHelper.getMsg("locking");
+		}
+		if (msg != null) {
+			model.addAttribute("message", msg);
+		}
+		return "/login2";
+	}
+
+	@GetMapping("/main")
+	public String main() {
+		return "main/main";
+	}
+
+	@Log(desc = "用户退出平台")
+	@GetMapping(value = "/logout")
+	public String logout() {
+		Subject sub = SecurityUtils.getSubject();
+		sub.logout();
+		return "/login2";
+	}
+
+	@GetMapping(value = "/getCode")
+	public void getYzm(HttpServletResponse response, HttpServletRequest request) {
+		try {
+			response.setHeader("Pragma", "No-cache");
+			response.setHeader("Cache-Control", "no-cache");
+			response.setDateHeader("Expires", 0);
+			response.setContentType("image/jpg");
+
+			// 生成随机字串
+			String verifyCode = VerifyCodeUtils.generateVerifyCode(4);
+			log.info("verifyCode:{}", verifyCode);
+			// 存入会话session
+			HttpSession session = request.getSession(true);
+			session.setAttribute("code", verifyCode.toLowerCase());
+			// 生成图片
+			int w = 100, h = 35;
+			VerifyCodeUtils.outputImage(w, h, response.getOutputStream(), verifyCode);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 }
diff --git a/len-sys/src/main/java/com/len/controller/MenuController.java b/len-sys/src/main/java/com/len/controller/MenuController.java
index d5ec5a8..6066977 100644
--- a/len-sys/src/main/java/com/len/controller/MenuController.java
+++ b/len-sys/src/main/java/com/len/controller/MenuController.java
@@ -1,14 +1,5 @@
 package com.len.controller;
 
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.len.base.BaseController;
@@ -20,12 +11,18 @@ import com.len.util.BeanUtil;
 import com.len.util.LenResponse;
 import com.len.util.MsHelper;
 import com.len.util.ReType;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 /**
- *  菜单
+ * 菜单
  */
 @RequestMapping("/menu")
 @Controller
@@ -33,72 +30,72 @@ import io.swagger.annotations.ApiOperation;
 public class MenuController extends BaseController {
 
 
-    private final MenuService menuService;
+	private final MenuService menuService;
 
-    public MenuController(MenuService menuService) {
-        this.menuService = menuService;
-    }
+	public MenuController(MenuService menuService) {
+		this.menuService = menuService;
+	}
 
-    @GetMapping(value = "showMenu")
-    public String showUser() {
-        return "/system/menu/menuList";
-    }
+	@GetMapping(value = "showMenu")
+	public String showUser() {
+		return "/system/menu/menuList";
+	}
 
-    @GetMapping(value = "showMenuList")
-    @ResponseBody
-    public ReType showUser(String name) {
-        SysMenu sysMenu = new SysMenu();
-        if (!StringUtils.isEmpty(name)) {
-            sysMenu.setName(name);
-        }
-        return new ReType(10, menuService.list(new QueryWrapper<>(sysMenu)));
-    }
+	@GetMapping(value = "showMenuList")
+	@ResponseBody
+	public ReType showUser(String name) {
+		SysMenu sysMenu = new SysMenu();
+		if (!StringUtils.isEmpty(name)) {
+			sysMenu.setName(name);
+		}
+		return new ReType(10, menuService.list(new QueryWrapper<>(sysMenu)));
+	}
 
-    @GetMapping(value = "showAddMenu")
-    public String addMenu(Model model) {
-        JSONArray ja = menuService.getMenuJsonList();
-        model.addAttribute("menus", ja.toJSONString());
-        return "/system/menu/add";
-    }
+	@GetMapping(value = "showAddMenu")
+	public String addMenu(Model model) {
+		JSONArray ja = menuService.getMenuJsonList();
+		model.addAttribute("menus", ja.toJSONString());
+		return "/system/menu/add";
+	}
 
-    @Log(desc = "添加菜单", type = LOG_TYPE.UPDATE)
-    @ApiOperation(value = "/addMenu", httpMethod = "POST", notes = "添加菜单")
-    @PostMapping(value = "addMenu")
-    @ResponseBody
-    public LenResponse addMenu(SysMenu sysMenu) {
-        menuService.addMenu(sysMenu);
-        return succ(MsHelper.getMsg("insert.success"));
-    }
+	@Log(desc = "添加菜单", type = LOG_TYPE.UPDATE)
+	@ApiOperation(value = "/addMenu", httpMethod = "POST", notes = "添加菜单")
+	@PostMapping(value = "addMenu")
+	@ResponseBody
+	public LenResponse addMenu(SysMenu sysMenu) {
+		menuService.addMenu(sysMenu);
+		return succ(MsHelper.getMsg("insert.success"));
+	}
 
-    @GetMapping(value = "showUpdateMenu")
-    public String showUpdateMenu(Model model, String id) {
-        SysMenu sysMenu = menuService.getById(id);
-        JSONArray ja = menuService.getMenuJsonList();
-        model.addAttribute("menus", ja.toJSONString());
-        model.addAttribute("sysMenu", sysMenu);
-        if (null != sysMenu.getPId()) {
-            SysMenu pSysMenu = menuService.getById(sysMenu.getPId());
-            model.addAttribute("pName", pSysMenu.getName());
-        }
-        return "/system/menu/update";
-    }
+	@GetMapping(value = "showUpdateMenu")
+	public String showUpdateMenu(Model model, String id) {
+		SysMenu sysMenu = menuService.getById(id);
+		JSONArray ja = menuService.getMenuJsonList();
+		model.addAttribute("menus", ja.toJSONString());
+		model.addAttribute("sysMenu", sysMenu);
+		if (null != sysMenu.getPId()) {
+			SysMenu pSysMenu = menuService.getById(sysMenu.getPId());
+			model.addAttribute("pName", pSysMenu.getName());
+		}
+		return "/system/menu/update";
+	}
 
-    @Log(desc = "更新菜单", type = LOG_TYPE.ADD)
-    @PostMapping(value = "updateMenu")
-    @ResponseBody
-    public LenResponse updateMenu(SysMenu sysMenu) {
-        SysMenu oldMenu = menuService.getById(sysMenu.getId());
-        BeanUtil.copyNotNullBean(sysMenu, oldMenu);
-        menuService.updateById(oldMenu);
-        return succ(MsHelper.getMsg("update.success"));
-    }
+	@Log(desc = "更新菜单", type = LOG_TYPE.ADD)
+	@PostMapping(value = "updateMenu")
+	@ResponseBody
+	public LenResponse updateMenu(SysMenu sysMenu) {
+		SysMenu oldMenu = menuService.getById(sysMenu.getId());
+		BeanUtil.copyNotNullBean(sysMenu, oldMenu);
+		menuService.updateById(oldMenu);
+		return succ(MsHelper.getMsg("update.success"));
+	}
 
-    @Log(desc = "删除菜单", type = LOG_TYPE.DEL)
-    @PostMapping("del")
-    @ResponseBody
-    public LenResponse del(String id) {
-        menuService.del(id);
-        return succ(MsHelper.getMsg("del.success"));
-    }
+	@Log(desc = "删除菜单", type = LOG_TYPE.DEL)
+	@PostMapping("del")
+	@ResponseBody
+	public LenResponse del(String id) {
+		menuService.del(id);
+		return succ(MsHelper.getMsg("del.success"));
+	}
 
 }
diff --git a/len-sys/src/main/java/com/len/controller/PersonController.java b/len-sys/src/main/java/com/len/controller/PersonController.java
index 53bfad0..1407401 100644
--- a/len-sys/src/main/java/com/len/controller/PersonController.java
+++ b/len-sys/src/main/java/com/len/controller/PersonController.java
@@ -6,12 +6,10 @@ import com.len.core.annotation.Log;
 import com.len.core.shiro.Principal;
 import com.len.entity.SysUser;
 import com.len.service.SysUserService;
-import com.len.util.Checkbox;
 import com.len.util.LenResponse;
 import com.len.util.MsHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,8 +17,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.List;
-
 
 @Controller
 @RequestMapping("/person")
@@ -28,30 +24,30 @@ import java.util.List;
 public class PersonController extends BaseController {
 
 
-    private final SysUserService userService;
-
-    public PersonController(SysUserService userService) {
-        this.userService = userService;
-    }
-
-    @GetMapping()
-    public String toPerson(Model model) {
-        CurrentUser principal = Principal.getPrincipal();
-        if (principal == null) {
-            return "/login";
-        }
-        String id = principal.getId();
-        SysUser user = userService.getById(id);
-        model.addAttribute("user", user);
-        return "/system/person/me";
-    }
-
-    @ApiOperation(value = "/updateUser", httpMethod = "POST", notes = "更新用户")
-    @Log(desc = "更新用户", type = Log.LOG_TYPE.UPDATE)
-    @PostMapping(value = "updateUser")
-    @ResponseBody
-    public LenResponse updatePerson(SysUser user) {
-        userService.updatePerson(user);
-        return succ(MsHelper.getMsg("update.success"));
-    }
+	private final SysUserService userService;
+
+	public PersonController(SysUserService userService) {
+		this.userService = userService;
+	}
+
+	@GetMapping()
+	public String toPerson(Model model) {
+		CurrentUser principal = Principal.getPrincipal();
+		if (principal == null) {
+			return "/login";
+		}
+		String id = principal.getId();
+		SysUser user = userService.getById(id);
+		model.addAttribute("user", user);
+		return "/system/person/me";
+	}
+
+	@ApiOperation(value = "/updateUser", httpMethod = "POST", notes = "更新用户")
+	@Log(desc = "更新用户", type = Log.LOG_TYPE.UPDATE)
+	@PostMapping(value = "updateUser")
+	@ResponseBody
+	public LenResponse updatePerson(SysUser user) {
+		userService.updatePerson(user);
+		return succ(MsHelper.getMsg("update.success"));
+	}
 }
diff --git a/len-sys/src/main/java/com/len/controller/RoleController.java b/len-sys/src/main/java/com/len/controller/RoleController.java
index aceebb4..d9b25d7 100644
--- a/len-sys/src/main/java/com/len/controller/RoleController.java
+++ b/len-sys/src/main/java/com/len/controller/RoleController.java
@@ -15,7 +15,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -34,87 +33,87 @@ import java.util.List;
 public class RoleController extends BaseController {
 
 
-    private final RoleService roleService;
-
-
-    private final MenuService menuService;
-
-
-    private final RoleMenuService roleMenuService;
-
-    public RoleController(RoleService roleService, MenuService menuService, RoleMenuService roleMenuService) {
-        this.roleService = roleService;
-        this.menuService = menuService;
-        this.roleMenuService = roleMenuService;
-    }
-
-    @GetMapping(value = "showRole")
-    @RequiresPermissions(value = "role:show")
-    public String showRole() {
-        return "/system/role/roleList";
-    }
-
-    @ApiOperation(value = "/showRoleList", httpMethod = "GET", notes = "展示角色")
-    @GetMapping(value = "showRoleList")
-    @ResponseBody
-    @RequiresPermissions("role:show")
-    public ReType showRoleList(SysRole role, String page, String limit) {
-        return roleService.show(role, Integer.valueOf(page), Integer.valueOf(limit));
-    }
-
-    @ApiOperation(value = "/showaLLRoleList", httpMethod = "GET", notes = "展示角色")
-    @GetMapping(value = "showaLLRoleList")
-    @ResponseBody
-    @RequiresPermissions("role:show")
-    public List<SysRole> showRoleList(SysRole role) {
-        return roleService.showAll(role);
-    }
-
-    @GetMapping(value = "showAddRole")
-    public String goAddRole(Model model) {
-        JSONArray jsonArray = menuService.getTreeUtil(null);
-        model.addAttribute("menus", jsonArray.toJSONString());
-        return "/system/role/add";
-    }
-
-    @ApiOperation(value = "/addRole", httpMethod = "POST", notes = "添加角色")
-    @Log(desc = "添加角色")
-    @PostMapping(value = "addRole")
-    @ResponseBody
-    public LenResponse addRole(SysRole sysRole, String[] menus) {
-        roleService.addRole(sysRole, menus);
-        return succ(MsHelper.getMsg("insert.success"));
-    }
-
-    @GetMapping(value = "updateRole")
-    public String updateRole(String id, Model model, boolean detail) {
-        if (StringUtils.isNotEmpty(id)) {
-            SysRole role = roleService.getById(id);
-            model.addAttribute("role", role);
-            JSONArray jsonArray = menuService.getTreeUtil(id);
-            model.addAttribute("menus", jsonArray.toJSONString());
-        }
-        model.addAttribute("detail", detail);
-        return "system/role/update";
-    }
-
-    @ApiOperation(value = "/updateRole", httpMethod = "POST", notes = "更新角色")
-    @Log(desc = "更新角色")
-    @PostMapping(value = "updateRole")
-    @ResponseBody
-    public LenResponse updateUser(SysRole role, String[] menus) {
-        roleService.updateUser(role, menus);
-        return succ(MsHelper.getMsg("update.success"));
-    }
-
-    @ApiOperation(value = "/del", httpMethod = "POST", notes = "删除角色")
-    @Log(desc = "删除角色", type = LOG_TYPE.DEL)
-    @PostMapping(value = "del")
-    @ResponseBody
-    @RequiresPermissions("role:del")
-    public LenResponse del(String id) {
-        roleService.del(id);
-        return succ(MsHelper.getMsg("del.success"));
-    }
+	private final RoleService roleService;
+
+
+	private final MenuService menuService;
+
+
+	private final RoleMenuService roleMenuService;
+
+	public RoleController(RoleService roleService, MenuService menuService, RoleMenuService roleMenuService) {
+		this.roleService = roleService;
+		this.menuService = menuService;
+		this.roleMenuService = roleMenuService;
+	}
+
+	@GetMapping(value = "showRole")
+	@RequiresPermissions(value = "role:show")
+	public String showRole() {
+		return "/system/role/roleList";
+	}
+
+	@ApiOperation(value = "/showRoleList", httpMethod = "GET", notes = "展示角色")
+	@GetMapping(value = "showRoleList")
+	@ResponseBody
+	@RequiresPermissions("role:show")
+	public ReType showRoleList(SysRole role, String page, String limit) {
+		return roleService.show(role, Integer.valueOf(page), Integer.valueOf(limit));
+	}
+
+	@ApiOperation(value = "/showaLLRoleList", httpMethod = "GET", notes = "展示角色")
+	@GetMapping(value = "showaLLRoleList")
+	@ResponseBody
+	@RequiresPermissions("role:show")
+	public List<SysRole> showRoleList(SysRole role) {
+		return roleService.showAll(role);
+	}
+
+	@GetMapping(value = "showAddRole")
+	public String goAddRole(Model model) {
+		JSONArray jsonArray = menuService.getTreeUtil(null);
+		model.addAttribute("menus", jsonArray.toJSONString());
+		return "/system/role/add";
+	}
+
+	@ApiOperation(value = "/addRole", httpMethod = "POST", notes = "添加角色")
+	@Log(desc = "添加角色")
+	@PostMapping(value = "addRole")
+	@ResponseBody
+	public LenResponse addRole(SysRole sysRole, String[] menus) {
+		roleService.addRole(sysRole, menus);
+		return succ(MsHelper.getMsg("insert.success"));
+	}
+
+	@GetMapping(value = "updateRole")
+	public String updateRole(String id, Model model, boolean detail) {
+		if (StringUtils.isNotEmpty(id)) {
+			SysRole role = roleService.getById(id);
+			model.addAttribute("role", role);
+			JSONArray jsonArray = menuService.getTreeUtil(id);
+			model.addAttribute("menus", jsonArray.toJSONString());
+		}
+		model.addAttribute("detail", detail);
+		return "system/role/update";
+	}
+
+	@ApiOperation(value = "/updateRole", httpMethod = "POST", notes = "更新角色")
+	@Log(desc = "更新角色")
+	@PostMapping(value = "updateRole")
+	@ResponseBody
+	public LenResponse updateUser(SysRole role, String[] menus) {
+		roleService.updateUser(role, menus);
+		return succ(MsHelper.getMsg("update.success"));
+	}
+
+	@ApiOperation(value = "/del", httpMethod = "POST", notes = "删除角色")
+	@Log(desc = "删除角色", type = LOG_TYPE.DEL)
+	@PostMapping(value = "del")
+	@ResponseBody
+	@RequiresPermissions("role:del")
+	public LenResponse del(String id) {
+		roleService.del(id);
+		return succ(MsHelper.getMsg("del.success"));
+	}
 
 }
diff --git a/len-sys/src/main/java/com/len/controller/UserController.java b/len-sys/src/main/java/com/len/controller/UserController.java
index c2d1689..6787d44 100644
--- a/len-sys/src/main/java/com/len/controller/UserController.java
+++ b/len-sys/src/main/java/com/len/controller/UserController.java
@@ -1,16 +1,5 @@
 package com.len.controller;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.Page;
@@ -24,12 +13,21 @@ import com.len.service.SysUserService;
 import com.len.util.*;
 import com.len.validator.ValidatorUtils;
 import com.len.validator.group.AddGroup;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
- *  用户管理
+ * 用户管理
  */
 // @Api(value="user")
 @Controller
@@ -37,161 +35,161 @@ import io.swagger.annotations.ApiOperation;
 @Api(value = "用户管理", tags = "用户管理业务")
 public class UserController extends BaseController {
 
-    private final SysUserService userService;
-
-    private final UploadUtil uploadUtil;
-
-    public UserController(SysUserService userService, UploadUtil uploadUtil) {
-        this.userService = userService;
-        this.uploadUtil = uploadUtil;
-    }
-
-    @GetMapping(value = "mainTest")
-    @RequiresPermissions("user:show")
-    public String showTest() {
-        return "system/user/mainTest";
-    }
-
-    @GetMapping(value = "showUser")
-    @RequiresPermissions("user:show")
-    public String showUser() {
-        return "/system/user/userList";
-    }
-
-    @GetMapping(value = "showUserList")
-    @ResponseBody
-    @RequiresPermissions("user:show")
-    public ReType showUser(SysUser user, int page, int limit) {
-        ReType show = userService.show(user, page, limit);
-        return show;
-    }
-
-    @ApiOperation(value = "/listByRoleId", httpMethod = "GET", notes = "展示角色")
-    @GetMapping(value = "listByRoleId")
-    @ResponseBody
-    @RequiresPermissions("user:show")
-    public String showUser(String roleId, int page, int limit) {
-        JSONObject returnValue = new JSONObject();
-        Page<Object> startPage = PageHelper.startPage(page, limit);
-        List<SysUser> users = userService.getUserByRoleId(roleId);
-        returnValue.put("users", users);
-        returnValue.put("totals", startPage.getTotal());
-        return JSON.toJSONString(returnValue);
-    }
-
-    @GetMapping(value = "showAddUser")
-    public String goAddUser(Model model) {
-        List<Checkbox> checkboxList = userService.getUserRoleList(null);
-        model.addAttribute("boxJson", checkboxList);
-        return "/system/user/add";
-    }
-
-    @ApiOperation(value = "/addUser", httpMethod = "POST", notes = "添加用户")
-    @Log(desc = "添加用户")
-    @PostMapping(value = "addUser")
-    @ResponseBody
-    public LenResponse addUser(SysUser user, String[] role) {
-        ValidatorUtils.validateEntity(user, AddGroup.class);
-        if (role == null) {
-            return error(MsHelper.getMsg("user.select.role"));
-        }
-        userService.add(user, Arrays.asList(role));
-        return succ();
-    }
-
-    @GetMapping(value = "updateUser")
-    public String goUpdateUser(String id, Model model, boolean detail) {
-        ValidatorUtils.notEmpty(id, "failed.get.data");
-        // 用户-角色
-        SysUser user = userService.getById(id);
-        if (user != null) {
-            String photo = user.getPhoto();
-            if (StringUtils.isEmpty(photo)) {
-                user.setPhoto(FileUtil.defaultPhoto);
-            }
-        }
-        model.addAttribute("user", user);
-        model.addAttribute("boxJson", userService.getUserRoleList(id));
-        model.addAttribute("detail", detail);
-        return "system/user/update";
-    }
-
-    public String userDetail(String id, Model model) {
-        List<Checkbox> checkboxList = userService.getUserRoleList(id);
-        SysUser user = userService.getById(id);
-        model.addAttribute("user", user);
-        model.addAttribute("boxJson", checkboxList);
-        return "system/user/update";
-    }
-
-    @ApiOperation(value = "/updateUser", httpMethod = "POST", notes = "更新用户")
-    @Log(desc = "更新用户", type = LOG_TYPE.UPDATE)
-    @PostMapping(value = "updateUser")
-    @ResponseBody
-    public LenResponse updateUser(SysUser user, String[] role) {
-        List<String> roles = new ArrayList<>();
-        if (role != null) {
-            roles = Arrays.asList(role);
-        }
-        userService.updateUser(user, roles);
-        return succ(MsHelper.getMsg("update.success"));
-    }
-
-    @Log(desc = "删除用户", type = LOG_TYPE.DEL)
-    @ApiOperation(value = "/del", httpMethod = "POST", notes = "删除用户")
-    @PostMapping(value = "/del")
-    @ResponseBody
-    @RequiresPermissions("user:del")
-    public LenResponse del(String id, boolean realDel) {
-        userService.delById(id, realDel);
-        return succ(MsHelper.getMsg("del.success"));
-    }
-
-    @GetMapping(value = "goRePass")
-    public String goRePass(String id, Model model) {
-        ValidatorUtils.notEmpty(id, "failed.get.data1", "id");
-        model.addAttribute("user", userService.getById(id));
-        return "/system/user/resetPassword";
-    }
-
-    /**
-     * 修改密码
-     *
-     * @param id
-     * @param newPwd
-     * @return
-     */
-    @Log(desc = "修改密码", type = LOG_TYPE.UPDATE)
-    @PostMapping(value = "rePass")
-    @ResponseBody
-    @RequiresPermissions("user:repass")
-    public LenResponse rePass(String userId, String newPwd) {
-        userService.rePass(userId, newPwd);
-        return succ(MsHelper.getMsg("update.success"));
-    }
-
-    /**
-     * 头像上传 目前首先相对路径
-     */
-    @PostMapping(value = "upload")
-    @ResponseBody
-    public LenResponse imgUpload(@RequestParam("file") MultipartFile file) {
-        return succ(uploadUtil.upload(file));
-    }
-
-    /**
-     * 验证用户名是否存在
-     */
-    @GetMapping(value = "checkUser")
-    @ResponseBody
-    public LenResponse checkUser(String uname) {
-        if (StringUtils.isEmpty(uname)) {
-            throw new ServiceException(MsHelper.getMsg("failed.get.data"));
-        }
-        if (userService.checkUser(uname) > 0) {
-            throw new ServiceException(MsHelper.getMsg("user.exists"));
-        }
-        return succ();
-    }
+	private final SysUserService userService;
+
+	private final UploadUtil uploadUtil;
+
+	public UserController(SysUserService userService, UploadUtil uploadUtil) {
+		this.userService = userService;
+		this.uploadUtil = uploadUtil;
+	}
+
+	@GetMapping(value = "mainTest")
+	@RequiresPermissions("user:show")
+	public String showTest() {
+		return "system/user/mainTest";
+	}
+
+	@GetMapping(value = "showUser")
+	@RequiresPermissions("user:show")
+	public String showUser() {
+		return "/system/user/userList";
+	}
+
+	@GetMapping(value = "showUserList")
+	@ResponseBody
+	@RequiresPermissions("user:show")
+	public ReType showUser(SysUser user, int page, int limit) {
+		ReType show = userService.show(user, page, limit);
+		return show;
+	}
+
+	@ApiOperation(value = "/listByRoleId", httpMethod = "GET", notes = "展示角色")
+	@GetMapping(value = "listByRoleId")
+	@ResponseBody
+	@RequiresPermissions("user:show")
+	public String showUser(String roleId, int page, int limit) {
+		JSONObject returnValue = new JSONObject();
+		Page<Object> startPage = PageHelper.startPage(page, limit);
+		List<SysUser> users = userService.getUserByRoleId(roleId);
+		returnValue.put("users", users);
+		returnValue.put("totals", startPage.getTotal());
+		return JSON.toJSONString(returnValue);
+	}
+
+	@GetMapping(value = "showAddUser")
+	public String goAddUser(Model model) {
+		List<Checkbox> checkboxList = userService.getUserRoleList(null);
+		model.addAttribute("boxJson", checkboxList);
+		return "/system/user/add";
+	}
+
+	@ApiOperation(value = "/addUser", httpMethod = "POST", notes = "添加用户")
+	@Log(desc = "添加用户")
+	@PostMapping(value = "addUser")
+	@ResponseBody
+	public LenResponse addUser(SysUser user, String[] role) {
+		ValidatorUtils.validateEntity(user, AddGroup.class);
+		if (role == null) {
+			return error(MsHelper.getMsg("user.select.role"));
+		}
+		userService.add(user, Arrays.asList(role));
+		return succ();
+	}
+
+	@GetMapping(value = "updateUser")
+	public String goUpdateUser(String id, Model model, boolean detail) {
+		ValidatorUtils.notEmpty(id, "failed.get.data");
+		// 用户-角色
+		SysUser user = userService.getById(id);
+		if (user != null) {
+			String photo = user.getPhoto();
+			if (StringUtils.isEmpty(photo)) {
+				user.setPhoto(FileUtil.defaultPhoto);
+			}
+		}
+		model.addAttribute("user", user);
+		model.addAttribute("boxJson", userService.getUserRoleList(id));
+		model.addAttribute("detail", detail);
+		return "system/user/update";
+	}
+
+	public String userDetail(String id, Model model) {
+		List<Checkbox> checkboxList = userService.getUserRoleList(id);
+		SysUser user = userService.getById(id);
+		model.addAttribute("user", user);
+		model.addAttribute("boxJson", checkboxList);
+		return "system/user/update";
+	}
+
+	@ApiOperation(value = "/updateUser", httpMethod = "POST", notes = "更新用户")
+	@Log(desc = "更新用户", type = LOG_TYPE.UPDATE)
+	@PostMapping(value = "updateUser")
+	@ResponseBody
+	public LenResponse updateUser(SysUser user, String[] role) {
+		List<String> roles = new ArrayList<>();
+		if (role != null) {
+			roles = Arrays.asList(role);
+		}
+		userService.updateUser(user, roles);
+		return succ(MsHelper.getMsg("update.success"));
+	}
+
+	@Log(desc = "删除用户", type = LOG_TYPE.DEL)
+	@ApiOperation(value = "/del", httpMethod = "POST", notes = "删除用户")
+	@PostMapping(value = "/del")
+	@ResponseBody
+	@RequiresPermissions("user:del")
+	public LenResponse del(String id, boolean realDel) {
+		userService.delById(id, realDel);
+		return succ(MsHelper.getMsg("del.success"));
+	}
+
+	@GetMapping(value = "goRePass")
+	public String goRePass(String id, Model model) {
+		ValidatorUtils.notEmpty(id, "failed.get.data1", "id");
+		model.addAttribute("user", userService.getById(id));
+		return "/system/user/resetPassword";
+	}
+
+	/**
+	 * 修改密码
+	 *
+	 * @param id
+	 * @param newPwd
+	 * @return
+	 */
+	@Log(desc = "修改密码", type = LOG_TYPE.UPDATE)
+	@PostMapping(value = "rePass")
+	@ResponseBody
+	@RequiresPermissions("user:repass")
+	public LenResponse rePass(String userId, String newPwd) {
+		userService.rePass(userId, newPwd);
+		return succ(MsHelper.getMsg("update.success"));
+	}
+
+	/**
+	 * 头像上传 目前首先相对路径
+	 */
+	@PostMapping(value = "upload")
+	@ResponseBody
+	public LenResponse imgUpload(@RequestParam("file") MultipartFile file) {
+		return succ(uploadUtil.upload(file));
+	}
+
+	/**
+	 * 验证用户名是否存在
+	 */
+	@GetMapping(value = "checkUser")
+	@ResponseBody
+	public LenResponse checkUser(String uname) {
+		if (StringUtils.isEmpty(uname)) {
+			throw new ServiceException(MsHelper.getMsg("failed.get.data"));
+		}
+		if (userService.checkUser(uname) > 0) {
+			throw new ServiceException(MsHelper.getMsg("user.exists"));
+		}
+		return succ();
+	}
 
 }
diff --git a/len-sys/src/main/java/com/len/core/annotation/Log.java b/len-sys/src/main/java/com/len/core/annotation/Log.java
index ca599b4..1e0e7b0 100644
--- a/len-sys/src/main/java/com/len/core/annotation/Log.java
+++ b/len-sys/src/main/java/com/len/core/annotation/Log.java
@@ -1,33 +1,28 @@
 package com.len.core.annotation;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
- *        记录日志
+ * 记录日志
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD})
 @Documented
 @Inherited
 public @interface Log {
-    public enum LOG_TYPE {
-        ADD, UPDATE, DEL, SELECT, ATHOR
-    }
+	/**
+	 * 内容
+	 */
+	String desc();
 
-    ;
+	;
 
-    /**
-     * 内容
-     */
-    String desc();
+	/**
+	 * 类型 curd
+	 */
+	LOG_TYPE type() default LOG_TYPE.ATHOR;
 
-    /**
-     * 类型 curd
-     */
-    LOG_TYPE type() default LOG_TYPE.ATHOR;
+	public enum LOG_TYPE {
+		ADD, UPDATE, DEL, SELECT, ATHOR
+	}
 }
diff --git a/len-sys/src/main/java/com/len/core/annotation/LogAspect.java b/len-sys/src/main/java/com/len/core/annotation/LogAspect.java
index 077ab24..4180854 100644
--- a/len-sys/src/main/java/com/len/core/annotation/LogAspect.java
+++ b/len-sys/src/main/java/com/len/core/annotation/LogAspect.java
@@ -6,12 +6,6 @@ import com.len.core.shiro.Principal;
 import com.len.entity.SysLog;
 import com.len.mapper.SysLogMapper;
 import com.len.util.IpUtil;
-
-import java.lang.reflect.Method;
-import java.util.Date;
-import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-
 import org.apache.shiro.UnavailableSecurityManagerException;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.After;
@@ -26,93 +20,96 @@ import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
+import java.util.Date;
+
 /**
- *
- *        为增删改添加监控
+ * 为增删改添加监控
  */
 @Aspect
 @Component
 public class LogAspect {
 
-    @Autowired
-    private SysLogMapper logMapper;
+	@Autowired
+	private SysLogMapper logMapper;
 
-    @Pointcut("@annotation(com.len.core.annotation.Log)")
-    private void pointcut() {
+	@Pointcut("@annotation(com.len.core.annotation.Log)")
+	private void pointcut() {
 
-    }
+	}
 
-    @After("pointcut()")
-    public void insertLogSuccess(JoinPoint jp) {
-        addLog(jp, getDesc(jp));
-    }
+	@After("pointcut()")
+	public void insertLogSuccess(JoinPoint jp) {
+		addLog(jp, getDesc(jp));
+	}
 
-    private void addLog(JoinPoint jp, String text) {
-        Log.LOG_TYPE type = getType(jp);
-        SysLog log = new SysLog();
-        RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
-        // 一些系统监控
-        if (requestAttributes != null) {
-            HttpServletRequest request =
-                ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest();
-            String ip = IpUtil.getIp(request);
-            log.setIp(ip);
-        }
-        log.setCreateTime(new Date());
-        log.setType(type.toString());
-        log.setText(text);
+	private void addLog(JoinPoint jp, String text) {
+		Log.LOG_TYPE type = getType(jp);
+		SysLog log = new SysLog();
+		RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes();
+		// 一些系统监控
+		if (requestAttributes != null) {
+			HttpServletRequest request =
+				((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+			String ip = IpUtil.getIp(request);
+			log.setIp(ip);
+		}
+		log.setCreateTime(new Date());
+		log.setType(type.toString());
+		log.setText(text);
 
-        Object[] obj = jp.getArgs();
-        StringBuffer buffer = new StringBuffer();
-        if (obj != null) {
-            for (int i = 0; i < obj.length; i++) {
-                buffer.append("[参数").append(i + 1).append(":");
-                Object o = obj[i];
-                if (o instanceof Model) {
-                    continue;
-                }
-                String parameter;
-                try {
-                    parameter = JSON.toJSONString(o);
-                } catch (Exception e) {
-                    continue;
-                }
-                buffer.append(parameter);
-                buffer.append("]");
-            }
-        }
-        log.setParam(buffer.toString());
-        try {
-            CurrentUser currentUser = Principal.getCurrentUse();
-            if (currentUser != null) {
-                log.setUserName(currentUser.getUsername());
-            }
-        } catch (UnavailableSecurityManagerException e) {
-        }
-        logMapper.insert(log);
-    }
+		Object[] obj = jp.getArgs();
+		StringBuffer buffer = new StringBuffer();
+		if (obj != null) {
+			for (int i = 0; i < obj.length; i++) {
+				buffer.append("[参数").append(i + 1).append(":");
+				Object o = obj[i];
+				if (o instanceof Model) {
+					continue;
+				}
+				String parameter;
+				try {
+					parameter = JSON.toJSONString(o);
+				} catch (Exception e) {
+					continue;
+				}
+				buffer.append(parameter);
+				buffer.append("]");
+			}
+		}
+		log.setParam(buffer.toString());
+		try {
+			CurrentUser currentUser = Principal.getCurrentUse();
+			if (currentUser != null) {
+				log.setUserName(currentUser.getUsername());
+			}
+		} catch (UnavailableSecurityManagerException e) {
+		}
+		logMapper.insert(log);
+	}
 
-    /**
-     * 记录异常
-     *
-     * @param joinPoint
-     * @param e
-     */
-    @AfterThrowing(value = "pointcut()", throwing = "e")
-    public void afterException(JoinPoint joinPoint, Exception e) {
-        System.out.print("-----------afterException:" + e.getMessage());
-        addLog(joinPoint, getDesc(joinPoint) + e.getMessage());
-    }
+	/**
+	 * 记录异常
+	 *
+	 * @param joinPoint
+	 * @param e
+	 */
+	@AfterThrowing(value = "pointcut()", throwing = "e")
+	public void afterException(JoinPoint joinPoint, Exception e) {
+		System.out.print("-----------afterException:" + e.getMessage());
+		addLog(joinPoint, getDesc(joinPoint) + e.getMessage());
+	}
 
-    private String getDesc(JoinPoint joinPoint) {
-        MethodSignature methodName = (MethodSignature)joinPoint.getSignature();
-        Method method = methodName.getMethod();
-        return method.getAnnotation(Log.class).desc();
-    }
+	private String getDesc(JoinPoint joinPoint) {
+		MethodSignature methodName = (MethodSignature) joinPoint.getSignature();
+		Method method = methodName.getMethod();
+		return method.getAnnotation(Log.class).desc();
+	}
 
-    private Log.LOG_TYPE getType(JoinPoint joinPoint) {
-        MethodSignature methodName = (MethodSignature)joinPoint.getSignature();
-        Method method = methodName.getMethod();
-        return method.getAnnotation(Log.class).type();
-    }
+	private Log.LOG_TYPE getType(JoinPoint joinPoint) {
+		MethodSignature methodName = (MethodSignature) joinPoint.getSignature();
+		Method method = methodName.getMethod();
+		return method.getAnnotation(Log.class).type();
+	}
 }
diff --git a/len-sys/src/main/java/com/len/core/filter/CustomAdvicFilter.java b/len-sys/src/main/java/com/len/core/filter/CustomAdvicFilter.java
index bf3b770..76246ae 100644
--- a/len-sys/src/main/java/com/len/core/filter/CustomAdvicFilter.java
+++ b/len-sys/src/main/java/com/len/core/filter/CustomAdvicFilter.java
@@ -1,11 +1,9 @@
 package com.len.core.filter;
 
-import com.len.service.MenuService;
-import com.len.service.SysUserService;
+import org.apache.shiro.web.filter.authc.FormAuthenticationFilter;
+
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
-import org.apache.shiro.web.filter.authc.FormAuthenticationFilter;
-import org.springframework.beans.factory.annotation.Autowired;
 
 
 public class CustomAdvicFilter extends FormAuthenticationFilter {
@@ -18,8 +16,8 @@ public class CustomAdvicFilter extends FormAuthenticationFilter {
     private MenuService menuService;
 */
 
-    @Override
-    protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
-        return true;
-    }
+	@Override
+	protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception {
+		return true;
+	}
 }
diff --git a/len-sys/src/main/java/com/len/core/filter/PermissionFilter.java b/len-sys/src/main/java/com/len/core/filter/PermissionFilter.java
index 43a96ef..036c1d2 100644
--- a/len-sys/src/main/java/com/len/core/filter/PermissionFilter.java
+++ b/len-sys/src/main/java/com/len/core/filter/PermissionFilter.java
@@ -1,16 +1,16 @@
 package com.len.core.filter;
 
 import com.len.base.CurrentUser;
-import java.io.IOException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.session.Session;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.web.filter.authz.AuthorizationFilter;
 import org.apache.shiro.web.util.WebUtils;
 
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import java.io.IOException;
+
 /**
  * 拦截器 校验用户是否已授权 未授权返回到登录界面
  */
@@ -18,19 +18,19 @@ import org.apache.shiro.web.util.WebUtils;
 public class PermissionFilter extends AuthorizationFilter {
 
 
-    @Override
-    protected boolean isAccessAllowed(ServletRequest servletRequest, ServletResponse servletResponse, Object o) {
-        Subject sub = getSubject(servletRequest, servletResponse);
-        Session session = sub.getSession();
-        CurrentUser user = (CurrentUser)session.getAttribute("currentPrincipal");
+	@Override
+	protected boolean isAccessAllowed(ServletRequest servletRequest, ServletResponse servletResponse, Object o) {
+		Subject sub = getSubject(servletRequest, servletResponse);
+		Session session = sub.getSession();
+		CurrentUser user = (CurrentUser) session.getAttribute("currentPrincipal");
 //        log.info("user:{}", user);
-        return user != null;
-    }
+		return user != null;
+	}
 
-    @Override
-    protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws IOException {
-        saveRequest(request);
-        WebUtils.issueRedirect(request, response, "/goLogin");
-        return false;
-    }
+	@Override
+	protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws IOException {
+		saveRequest(request);
+		WebUtils.issueRedirect(request, response, "/goLogin");
+		return false;
+	}
 }
diff --git a/len-sys/src/main/java/com/len/core/filter/VerfityCodeFilter.java b/len-sys/src/main/java/com/len/core/filter/VerfityCodeFilter.java
index af2cd41..75c0d49 100644
--- a/len-sys/src/main/java/com/len/core/filter/VerfityCodeFilter.java
+++ b/len-sys/src/main/java/com/len/core/filter/VerfityCodeFilter.java
@@ -1,96 +1,94 @@
 package com.len.core.filter;
 
-import java.util.Collection;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.session.Session;
+import org.apache.shiro.web.filter.AccessControlFilter;
 
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.session.Session;
-import org.apache.shiro.web.filter.AccessControlFilter;
-
 /**
- *        验证码拦截
+ * 验证码拦截
  */
 public class VerfityCodeFilter extends AccessControlFilter {
-    /**
-     * 是否开启验证码验证 默认true
-     */
-    private boolean verfitiCode = true;
+	/**
+	 * 是否开启验证码验证 默认true
+	 */
+	private boolean verfitiCode = true;
 
-    /**
-     * 前台提交的验证码name
-     */
-    private String jcaptchaParam = "code";
+	/**
+	 * 前台提交的验证码name
+	 */
+	private String jcaptchaParam = "code";
 
-    /**
-     * 验证失败后setAttribute key
-     */
-    private String failureKeyAttribute = "shiroLoginFailure";
+	/**
+	 * 验证失败后setAttribute key
+	 */
+	private String failureKeyAttribute = "shiroLoginFailure";
 
-    /**
-     * shiro回调 是否允许访问
-     * 
-     * @param request
-     * @param response
-     * @param o
-     * @return
-     * @throws Exception
-     */
-    @Override
-    protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object o) throws Exception {
-        request.setAttribute("verfitiCode", verfitiCode);// 暂时未用到非验证码
-        HttpServletRequest httpRequest = (HttpServletRequest)request;
-        // 2、判断验证码是否禁用 或不是表单提交
-        if (!verfitiCode || !"post".equalsIgnoreCase(httpRequest.getMethod())) {
-            return true;
-        }
-        Session session = getSubject(request, response).getSession();
-        //Collection<Object> attributeKeys = session.getAttributeKeys();
-        Object code = getSubject(request, response).getSession().getAttribute(jcaptchaParam);
-        String storedCode = null;
-        if (null != code) {
-            storedCode = code.toString();
-        } else {
-            request.setAttribute(failureKeyAttribute, "code.timeout");
-            return false;
-        }
-        // 表单提交，校验验证码的正确性
-        String currentCode = httpRequest.getParameter(jcaptchaParam);
+	/**
+	 * shiro回调 是否允许访问
+	 *
+	 * @param request
+	 * @param response
+	 * @param o
+	 * @return
+	 * @throws Exception
+	 */
+	@Override
+	protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object o) throws Exception {
+		request.setAttribute("verfitiCode", verfitiCode);// 暂时未用到非验证码
+		HttpServletRequest httpRequest = (HttpServletRequest) request;
+		// 2、判断验证码是否禁用 或不是表单提交
+		if (!verfitiCode || !"post".equalsIgnoreCase(httpRequest.getMethod())) {
+			return true;
+		}
+		Session session = getSubject(request, response).getSession();
+		//Collection<Object> attributeKeys = session.getAttributeKeys();
+		Object code = getSubject(request, response).getSession().getAttribute(jcaptchaParam);
+		String storedCode = null;
+		if (null != code) {
+			storedCode = code.toString();
+		} else {
+			request.setAttribute(failureKeyAttribute, "code.timeout");
+			return false;
+		}
+		// 表单提交，校验验证码的正确性
+		String currentCode = httpRequest.getParameter(jcaptchaParam);
 
-        return StringUtils.equalsIgnoreCase(storedCode, currentCode);
-    }
+		return StringUtils.equalsIgnoreCase(storedCode, currentCode);
+	}
 
-    @Override
-    protected boolean onAccessDenied(ServletRequest servletRequest, ServletResponse servletResponse) throws Exception {
-        if (servletRequest.getAttribute(failureKeyAttribute) == null) {
-            servletRequest.setAttribute(failureKeyAttribute, "code.error");
-        }
-        return true;
-    }
+	@Override
+	protected boolean onAccessDenied(ServletRequest servletRequest, ServletResponse servletResponse) throws Exception {
+		if (servletRequest.getAttribute(failureKeyAttribute) == null) {
+			servletRequest.setAttribute(failureKeyAttribute, "code.error");
+		}
+		return true;
+	}
 
-    public boolean isVerfitiCode() {
-        return verfitiCode;
-    }
+	public boolean isVerfitiCode() {
+		return verfitiCode;
+	}
 
-    public void setVerfitiCode(boolean verfitiCode) {
-        this.verfitiCode = verfitiCode;
-    }
+	public void setVerfitiCode(boolean verfitiCode) {
+		this.verfitiCode = verfitiCode;
+	}
 
-    public String getJcaptchaParam() {
-        return jcaptchaParam;
-    }
+	public String getJcaptchaParam() {
+		return jcaptchaParam;
+	}
 
-    public void setJcaptchaParam(String jcaptchaParam) {
-        this.jcaptchaParam = jcaptchaParam;
-    }
+	public void setJcaptchaParam(String jcaptchaParam) {
+		this.jcaptchaParam = jcaptchaParam;
+	}
 
-    public String getFailureKeyAttribute() {
-        return failureKeyAttribute;
-    }
+	public String getFailureKeyAttribute() {
+		return failureKeyAttribute;
+	}
 
-    public void setFailureKeyAttribute(String failureKeyAttribute) {
-        this.failureKeyAttribute = failureKeyAttribute;
-    }
+	public void setFailureKeyAttribute(String failureKeyAttribute) {
+		this.failureKeyAttribute = failureKeyAttribute;
+	}
 }
diff --git a/len-sys/src/main/java/com/len/core/filter/VerifyCodeUtils.java b/len-sys/src/main/java/com/len/core/filter/VerifyCodeUtils.java
index 4e7e311..570e915 100644
--- a/len-sys/src/main/java/com/len/core/filter/VerifyCodeUtils.java
+++ b/len-sys/src/main/java/com/len/core/filter/VerifyCodeUtils.java
@@ -1,10 +1,7 @@
 package com.len.core.filter;
 
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
+import javax.imageio.ImageIO;
+import java.awt.*;
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -13,303 +10,303 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Arrays;
 import java.util.Random;
-import javax.imageio.ImageIO;
 
 public class VerifyCodeUtils {
 
-    // 使用到Algerian字体，系统里没有的话需要安装字体，字体只显示大写，去掉了1,0,i,o几个容易混淆的字符
-    public static final String VERIFY_CODES = "23456789ABCDEFGHJKLMNPQRSTUVWXYZ";
-    private static Random random = new Random();
-
-    /**
-     * 验证码对象
-     * 
-     * @author zhou-baicheng
-     *
-     */
-    public static class Verify {
-
-        private String code;// 如 1 + 2
-
-        private Integer value;// 如 3
-
-        public String getCode() {
-            return code;
-        }
-
-        public void setCode(String code) {
-            this.code = code;
-        }
-
-        public Integer getValue() {
-            return value;
-        }
-
-        public void setValue(Integer value) {
-            this.value = value;
-        }
-    }
-
-    /**
-     * 使用系统默认字符源生成验证码
-     * 
-     * @param
-     * @return
-     */
-    public static Verify generateVerify() {
-        int number1 = new Random().nextInt(10) + 1;;
-        int number2 = new Random().nextInt(10) + 1;;
-        Verify entity = new Verify();
-        entity.setCode(number1 + " x " + number2);
-        entity.setValue(number1 + number2);
-        return entity;
-    }
-
-    /**
-     * 使用系统默认字符源生成验证码
-     * 
-     * @param verifySize 验证码长度
-     * @return
-     */
-    public static String generateVerifyCode(int verifySize) {
-        return generateVerifyCode(verifySize, VERIFY_CODES);
-    }
-
-    /**
-     * 使用指定源生成验证码
-     * 
-     * @param verifySize 验证码长度
-     * @param sources 验证码字符源
-     * @return
-     */
-    public static String generateVerifyCode(int verifySize, String sources) {
-        if (sources == null || sources.length() == 0) {
-            sources = VERIFY_CODES;
-        }
-        int codesLen = sources.length();
-        Random rand = new Random(System.currentTimeMillis());
-        StringBuilder verifyCode = new StringBuilder(verifySize);
-        for (int i = 0; i < verifySize; i++) {
-            verifyCode.append(sources.charAt(rand.nextInt(codesLen - 1)));
-        }
-        return verifyCode.toString();
-    }
-
-    /**
-     * 生成随机验证码文件,并返回验证码值
-     * 
-     * @param w
-     * @param h
-     * @param outputFile
-     * @param verifySize
-     * @return
-     * @throws IOException
-     */
-    public static String outputVerifyImage(int w, int h, File outputFile, int verifySize) throws IOException {
-        String verifyCode = generateVerifyCode(verifySize);
-        outputImage(w, h, outputFile, verifyCode);
-        return verifyCode;
-    }
-
-    /**
-     * 输出随机验证码图片流,并返回验证码值
-     * 
-     * @param w
-     * @param h
-     * @param os
-     * @param verifySize
-     * @return
-     * @throws IOException
-     */
-    public static String outputVerifyImage(int w, int h, OutputStream os, int verifySize) throws IOException {
-        String verifyCode = generateVerifyCode(verifySize);
-        outputImage(w, h, os, verifyCode);
-        return verifyCode;
-    }
-
-    /**
-     * 生成指定验证码图像文件
-     * 
-     * @param w
-     * @param h
-     * @param outputFile
-     * @param code
-     * @throws IOException
-     */
-    public static void outputImage(int w, int h, File outputFile, String code) throws IOException {
-        if (outputFile == null) {
-            return;
-        }
-        File dir = outputFile.getParentFile();
-        if (!dir.exists()) {
-            dir.mkdirs();
-        }
-        try {
-            outputFile.createNewFile();
-            FileOutputStream fos = new FileOutputStream(outputFile);
-            outputImage(w, h, fos, code);
-            fos.close();
-        } catch (IOException e) {
-            throw e;
-        }
-    }
-
-    /**
-     * 输出指定验证码图片流
-     * 
-     * @param w
-     * @param h
-     * @param os
-     * @param code
-     * @throws IOException
-     */
-    public static void outputImage(int w, int h, OutputStream os, String code) throws IOException {
-        int verifySize = code.length();
-        BufferedImage image = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
-        Random rand = new Random();
-        Graphics2D g2 = image.createGraphics();
-        g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-        Color[] colors = new Color[5];
-        Color[] colorSpaces = new Color[] {Color.WHITE, Color.CYAN, Color.GRAY, Color.LIGHT_GRAY, Color.MAGENTA,
-            Color.ORANGE, Color.PINK, Color.YELLOW};
-        float[] fractions = new float[colors.length];
-        for (int i = 0; i < colors.length; i++) {
-            colors[i] = colorSpaces[rand.nextInt(colorSpaces.length)];
-            fractions[i] = rand.nextFloat();
-        }
-        Arrays.sort(fractions);
-
-        g2.setColor(Color.GRAY);// 设置边框色
-        g2.fillRect(0, 0, w, h);
-
-        Color c = getRandColor(200, 250);
-        g2.setColor(c);// 设置背景色
-        g2.fillRect(0, 2, w, h - 4);
-
-        // 绘制干扰线
-        Random random = new Random();
-        g2.setColor(getRandColor(160, 200));// 设置线条的颜色
-        for (int i = 0; i < 20; i++) {
-            int x = random.nextInt(w - 1);
-            int y = random.nextInt(h - 1);
-            int xl = random.nextInt(6) + 1;
-            int yl = random.nextInt(12) + 1;
-            g2.drawLine(x, y, x + xl + 40, y + yl + 20);
-        }
-
-        // 添加噪点
-        float yawpRate = 0.05f;// 噪声率
-        int area = (int)(yawpRate * w * h);
-        for (int i = 0; i < area; i++) {
-            int x = random.nextInt(w);
-            int y = random.nextInt(h);
-            int rgb = getRandomIntColor();
-            image.setRGB(x, y, rgb);
-        }
-
-        shear(g2, w, h, c);// 使图片扭曲
-
-        g2.setColor(getRandColor(100, 160));
-        int fontSize = h - 4;
-        Font font = new Font("Algerian", Font.ITALIC, fontSize);
-        g2.setFont(font);
-        char[] chars = code.toCharArray();
-        for (int i = 0; i < verifySize; i++) {
-            AffineTransform affine = new AffineTransform();
-            affine.setToRotation(Math.PI / 4 * rand.nextDouble() * (rand.nextBoolean() ? 1 : -1),
-                (w / verifySize) * i + fontSize / 2, h / 2);
-            g2.setTransform(affine);
-            g2.drawChars(chars, i, 1, ((w - 10) / verifySize) * i + 5, h / 2 + fontSize / 2 - 10);
-        }
-
-        g2.dispose();
-        ImageIO.write(image, "jpg", os);
-    }
-
-    private static Color getRandColor(int fc, int bc) {
-        if (fc > 255)
-            fc = 255;
-        if (bc > 255)
-            bc = 255;
-        int r = fc + random.nextInt(bc - fc);
-        int g = fc + random.nextInt(bc - fc);
-        int b = fc + random.nextInt(bc - fc);
-        return new Color(r, g, b);
-    }
-
-    private static int getRandomIntColor() {
-        int[] rgb = getRandomRgb();
-        int color = 0;
-        for (int c : rgb) {
-            color = color << 8;
-            color = color | c;
-        }
-        return color;
-    }
-
-    private static int[] getRandomRgb() {
-        int[] rgb = new int[3];
-        for (int i = 0; i < 3; i++) {
-            rgb[i] = random.nextInt(255);
-        }
-        return rgb;
-    }
-
-    private static void shear(Graphics g, int w1, int h1, Color color) {
-        shearX(g, w1, h1, color);
-        shearY(g, w1, h1, color);
-    }
-
-    private static void shearX(Graphics g, int w1, int h1, Color color) {
-
-        int period = random.nextInt(2);
-
-        boolean borderGap = true;
-        int frames = 1;
-        int phase = random.nextInt(2);
-
-        for (int i = 0; i < h1; i++) {
-            double d = (double)(period >> 1)
-                * Math.sin((double)i / (double)period + (6.2831853071795862D * (double)phase) / (double)frames);
-            g.copyArea(0, i, w1, 1, (int)d, 0);
-            if (borderGap) {
-                g.setColor(color);
-                g.drawLine((int)d, i, 0, i);
-                g.drawLine((int)d + w1, i, w1, i);
-            }
-        }
-
-    }
-
-    private static void shearY(Graphics g, int w1, int h1, Color color) {
-
-        int period = random.nextInt(40) + 10; // 50;
-
-        boolean borderGap = true;
-        int frames = 20;
-        int phase = 7;
-        for (int i = 0; i < w1; i++) {
-            double d = (double)(period >> 1)
-                * Math.sin((double)i / (double)period + (6.2831853071795862D * (double)phase) / (double)frames);
-            g.copyArea(i, 0, 1, h1, 0, (int)d);
-            if (borderGap) {
-                g.setColor(color);
-                g.drawLine(i, (int)d, i, 0);
-                g.drawLine(i, (int)d + h1, i, h1);
-            }
-
-        }
-
-    }
-
-    public static void main(String[] args) throws IOException {
-        File dir = new File("F:/verifies");
-        int w = 200, h = 80;
-        for (int i = 0; i < 50; i++) {
-            String verifyCode = generateVerifyCode(4);
-            File file = new File(dir, verifyCode + ".jpg");
-            outputImage(w, h, file, verifyCode);
-        }
-    }
-
-}
\ No newline at end of file
+	// 使用到Algerian字体，系统里没有的话需要安装字体，字体只显示大写，去掉了1,0,i,o几个容易混淆的字符
+	public static final String VERIFY_CODES = "23456789ABCDEFGHJKLMNPQRSTUVWXYZ";
+	private static Random random = new Random();
+
+	/**
+	 * 使用系统默认字符源生成验证码
+	 *
+	 * @param
+	 * @return
+	 */
+	public static Verify generateVerify() {
+		int number1 = new Random().nextInt(10) + 1;
+		;
+		int number2 = new Random().nextInt(10) + 1;
+		;
+		Verify entity = new Verify();
+		entity.setCode(number1 + " x " + number2);
+		entity.setValue(number1 + number2);
+		return entity;
+	}
+
+	/**
+	 * 使用系统默认字符源生成验证码
+	 *
+	 * @param verifySize 验证码长度
+	 * @return
+	 */
+	public static String generateVerifyCode(int verifySize) {
+		return generateVerifyCode(verifySize, VERIFY_CODES);
+	}
+
+	/**
+	 * 使用指定源生成验证码
+	 *
+	 * @param verifySize 验证码长度
+	 * @param sources    验证码字符源
+	 * @return
+	 */
+	public static String generateVerifyCode(int verifySize, String sources) {
+		if (sources == null || sources.length() == 0) {
+			sources = VERIFY_CODES;
+		}
+		int codesLen = sources.length();
+		Random rand = new Random(System.currentTimeMillis());
+		StringBuilder verifyCode = new StringBuilder(verifySize);
+		for (int i = 0; i < verifySize; i++) {
+			verifyCode.append(sources.charAt(rand.nextInt(codesLen - 1)));
+		}
+		return verifyCode.toString();
+	}
+
+	/**
+	 * 生成随机验证码文件,并返回验证码值
+	 *
+	 * @param w
+	 * @param h
+	 * @param outputFile
+	 * @param verifySize
+	 * @return
+	 * @throws IOException
+	 */
+	public static String outputVerifyImage(int w, int h, File outputFile, int verifySize) throws IOException {
+		String verifyCode = generateVerifyCode(verifySize);
+		outputImage(w, h, outputFile, verifyCode);
+		return verifyCode;
+	}
+
+	/**
+	 * 输出随机验证码图片流,并返回验证码值
+	 *
+	 * @param w
+	 * @param h
+	 * @param os
+	 * @param verifySize
+	 * @return
+	 * @throws IOException
+	 */
+	public static String outputVerifyImage(int w, int h, OutputStream os, int verifySize) throws IOException {
+		String verifyCode = generateVerifyCode(verifySize);
+		outputImage(w, h, os, verifyCode);
+		return verifyCode;
+	}
+
+	/**
+	 * 生成指定验证码图像文件
+	 *
+	 * @param w
+	 * @param h
+	 * @param outputFile
+	 * @param code
+	 * @throws IOException
+	 */
+	public static void outputImage(int w, int h, File outputFile, String code) throws IOException {
+		if (outputFile == null) {
+			return;
+		}
+		File dir = outputFile.getParentFile();
+		if (!dir.exists()) {
+			dir.mkdirs();
+		}
+		try {
+			outputFile.createNewFile();
+			FileOutputStream fos = new FileOutputStream(outputFile);
+			outputImage(w, h, fos, code);
+			fos.close();
+		} catch (IOException e) {
+			throw e;
+		}
+	}
+
+	/**
+	 * 输出指定验证码图片流
+	 *
+	 * @param w
+	 * @param h
+	 * @param os
+	 * @param code
+	 * @throws IOException
+	 */
+	public static void outputImage(int w, int h, OutputStream os, String code) throws IOException {
+		int verifySize = code.length();
+		BufferedImage image = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
+		Random rand = new Random();
+		Graphics2D g2 = image.createGraphics();
+		g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+		Color[] colors = new Color[5];
+		Color[] colorSpaces = new Color[]{Color.WHITE, Color.CYAN, Color.GRAY, Color.LIGHT_GRAY, Color.MAGENTA,
+			Color.ORANGE, Color.PINK, Color.YELLOW};
+		float[] fractions = new float[colors.length];
+		for (int i = 0; i < colors.length; i++) {
+			colors[i] = colorSpaces[rand.nextInt(colorSpaces.length)];
+			fractions[i] = rand.nextFloat();
+		}
+		Arrays.sort(fractions);
+
+		g2.setColor(Color.GRAY);// 设置边框色
+		g2.fillRect(0, 0, w, h);
+
+		Color c = getRandColor(200, 250);
+		g2.setColor(c);// 设置背景色
+		g2.fillRect(0, 2, w, h - 4);
+
+		// 绘制干扰线
+		Random random = new Random();
+		g2.setColor(getRandColor(160, 200));// 设置线条的颜色
+		for (int i = 0; i < 20; i++) {
+			int x = random.nextInt(w - 1);
+			int y = random.nextInt(h - 1);
+			int xl = random.nextInt(6) + 1;
+			int yl = random.nextInt(12) + 1;
+			g2.drawLine(x, y, x + xl + 40, y + yl + 20);
+		}
+
+		// 添加噪点
+		float yawpRate = 0.05f;// 噪声率
+		int area = (int) (yawpRate * w * h);
+		for (int i = 0; i < area; i++) {
+			int x = random.nextInt(w);
+			int y = random.nextInt(h);
+			int rgb = getRandomIntColor();
+			image.setRGB(x, y, rgb);
+		}
+
+		shear(g2, w, h, c);// 使图片扭曲
+
+		g2.setColor(getRandColor(100, 160));
+		int fontSize = h - 4;
+		Font font = new Font("Algerian", Font.ITALIC, fontSize);
+		g2.setFont(font);
+		char[] chars = code.toCharArray();
+		for (int i = 0; i < verifySize; i++) {
+			AffineTransform affine = new AffineTransform();
+			affine.setToRotation(Math.PI / 4 * rand.nextDouble() * (rand.nextBoolean() ? 1 : -1),
+				(w / verifySize) * i + fontSize / 2, h / 2);
+			g2.setTransform(affine);
+			g2.drawChars(chars, i, 1, ((w - 10) / verifySize) * i + 5, h / 2 + fontSize / 2 - 10);
+		}
+
+		g2.dispose();
+		ImageIO.write(image, "jpg", os);
+	}
+
+	private static Color getRandColor(int fc, int bc) {
+		if (fc > 255)
+			fc = 255;
+		if (bc > 255)
+			bc = 255;
+		int r = fc + random.nextInt(bc - fc);
+		int g = fc + random.nextInt(bc - fc);
+		int b = fc + random.nextInt(bc - fc);
+		return new Color(r, g, b);
+	}
+
+	private static int getRandomIntColor() {
+		int[] rgb = getRandomRgb();
+		int color = 0;
+		for (int c : rgb) {
+			color = color << 8;
+			color = color | c;
+		}
+		return color;
+	}
+
+	private static int[] getRandomRgb() {
+		int[] rgb = new int[3];
+		for (int i = 0; i < 3; i++) {
+			rgb[i] = random.nextInt(255);
+		}
+		return rgb;
+	}
+
+	private static void shear(Graphics g, int w1, int h1, Color color) {
+		shearX(g, w1, h1, color);
+		shearY(g, w1, h1, color);
+	}
+
+	private static void shearX(Graphics g, int w1, int h1, Color color) {
+
+		int period = random.nextInt(2);
+
+		boolean borderGap = true;
+		int frames = 1;
+		int phase = random.nextInt(2);
+
+		for (int i = 0; i < h1; i++) {
+			double d = (double) (period >> 1)
+				* Math.sin((double) i / (double) period + (6.2831853071795862D * (double) phase) / (double) frames);
+			g.copyArea(0, i, w1, 1, (int) d, 0);
+			if (borderGap) {
+				g.setColor(color);
+				g.drawLine((int) d, i, 0, i);
+				g.drawLine((int) d + w1, i, w1, i);
+			}
+		}
+
+	}
+
+	private static void shearY(Graphics g, int w1, int h1, Color color) {
+
+		int period = random.nextInt(40) + 10; // 50;
+
+		boolean borderGap = true;
+		int frames = 20;
+		int phase = 7;
+		for (int i = 0; i < w1; i++) {
+			double d = (double) (period >> 1)
+				* Math.sin((double) i / (double) period + (6.2831853071795862D * (double) phase) / (double) frames);
+			g.copyArea(i, 0, 1, h1, 0, (int) d);
+			if (borderGap) {
+				g.setColor(color);
+				g.drawLine(i, (int) d, i, 0);
+				g.drawLine(i, (int) d + h1, i, h1);
+			}
+
+		}
+
+	}
+
+	public static void main(String[] args) throws IOException {
+		File dir = new File("F:/verifies");
+		int w = 200, h = 80;
+		for (int i = 0; i < 50; i++) {
+			String verifyCode = generateVerifyCode(4);
+			File file = new File(dir, verifyCode + ".jpg");
+			outputImage(w, h, file, verifyCode);
+		}
+	}
+
+	/**
+	 * 验证码对象
+	 *
+	 * @author zhou-baicheng
+	 */
+	public static class Verify {
+
+		private String code;// 如 1 + 2
+
+		private Integer value;// 如 3
+
+		public String getCode() {
+			return code;
+		}
+
+		public void setCode(String code) {
+			this.code = code;
+		}
+
+		public Integer getValue() {
+			return value;
+		}
+
+		public void setValue(Integer value) {
+			this.value = value;
+		}
+	}
+
+}
diff --git a/len-sys/src/main/java/com/len/core/init/job/DataSourceJobThread.java b/len-sys/src/main/java/com/len/core/init/job/DataSourceJobThread.java
index 43818e6..a241c32 100644
--- a/len-sys/src/main/java/com/len/core/init/job/DataSourceJobThread.java
+++ b/len-sys/src/main/java/com/len/core/init/job/DataSourceJobThread.java
@@ -1,60 +1,57 @@
 package com.len.core.init.job;
 
-import java.util.List;
-
-import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.len.core.quartz.JobTask;
 import com.len.entity.SysJob;
 import com.len.service.JobService;
 import com.len.service.RoleService;
 import com.len.util.SpringUtil;
-
 import lombok.extern.slf4j.Slf4j;
+import org.quartz.SchedulerException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.List;
 
 /**
- *
- *        启动数据库中已经设定为 启动状态(status:true)的任务 项目启动时init 可优化
+ * 启动数据库中已经设定为 启动状态(status:true)的任务 项目启动时init 可优化
  */
 @Configuration
 @Slf4j
 public class DataSourceJobThread extends Thread {
 
-    @Autowired
-    RoleService roleService;
-
-    @Autowired
-    JobService jobService;
-
-    @Override
-    public void run() {
-        try {
-            Thread.sleep(1000);
-            log.info("---------线程启动---------");
-            JobTask jobTask = SpringUtil.getBean("jobTask");
-            SysJob job = new SysJob();
-            job.setStatus(true);
-            QueryWrapper<SysJob> jobQueryWrapper = new QueryWrapper<>(job);
-            List<SysJob> jobList = jobService.list(jobQueryWrapper);
-            // 开启任务
-            jobList.forEach(jobs -> {
-                log.info("---任务[" + jobs.getId() + "]系统 init--开始启动---------");
-                try {
-                    jobTask.startJob(jobs);
-                } catch (ClassNotFoundException | SchedulerException e) {
-                    e.printStackTrace();
-                }
-            });
-            if (jobList.size() == 0) {
-                log.info("---数据库暂无启动的任务---------");
-            } else {
-                System.out.println("---任务启动完毕---------");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
+	@Autowired
+	RoleService roleService;
+
+	@Autowired
+	JobService jobService;
+
+	@Override
+	public void run() {
+		try {
+			Thread.sleep(1000);
+			log.info("---------线程启动---------");
+			JobTask jobTask = SpringUtil.getBean("jobTask");
+			SysJob job = new SysJob();
+			job.setStatus(true);
+			QueryWrapper<SysJob> jobQueryWrapper = new QueryWrapper<>(job);
+			List<SysJob> jobList = jobService.list(jobQueryWrapper);
+			// 开启任务
+			jobList.forEach(jobs -> {
+				log.info("---任务[" + jobs.getId() + "]系统 init--开始启动---------");
+				try {
+					jobTask.startJob(jobs);
+				} catch (ClassNotFoundException | SchedulerException e) {
+					e.printStackTrace();
+				}
+			});
+			if (jobList.size() == 0) {
+				log.info("---数据库暂无启动的任务---------");
+			} else {
+				System.out.println("---任务启动完毕---------");
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 }
diff --git a/len-sys/src/main/java/com/len/core/init/job/JobExecuteImpl.java b/len-sys/src/main/java/com/len/core/init/job/JobExecuteImpl.java
index 98c24df..f54f432 100644
--- a/len-sys/src/main/java/com/len/core/init/job/JobExecuteImpl.java
+++ b/len-sys/src/main/java/com/len/core/init/job/JobExecuteImpl.java
@@ -4,15 +4,14 @@ import com.len.base.handler.ExecuteContext;
 import org.springframework.context.event.ContextRefreshedEvent;
 
 
-
 public class JobExecuteImpl implements ExecuteContext {
 
-    @Override
-    public void execute(ContextRefreshedEvent event) {
-        /*
-         * 通过线程开启数据库中已经开启的定时任务
-         */
-        DataSourceJobThread myThread = event.getApplicationContext().getBean(DataSourceJobThread.class);
-        myThread.start();
-    }
+	@Override
+	public void execute(ContextRefreshedEvent event) {
+		/*
+		 * 通过线程开启数据库中已经开启的定时任务
+		 */
+		DataSourceJobThread myThread = event.getApplicationContext().getBean(DataSourceJobThread.class);
+		myThread.start();
+	}
 }
diff --git a/len-sys/src/main/java/com/len/core/listener/CustomServletContextListener.java b/len-sys/src/main/java/com/len/core/listener/CustomServletContextListener.java
index 116990c..63eb5ee 100644
--- a/len-sys/src/main/java/com/len/core/listener/CustomServletContextListener.java
+++ b/len-sys/src/main/java/com/len/core/listener/CustomServletContextListener.java
@@ -1,20 +1,20 @@
 package com.len.core.listener;
 
+import org.springframework.stereotype.Component;
+
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
-import org.springframework.stereotype.Component;
-
 @Component
 public class CustomServletContextListener implements ServletContextListener {
 
-    @Override
-    public void contextInitialized(ServletContextEvent sce) {
-        System.out.println("-------contextInitialized-----------");
-    }
+	@Override
+	public void contextInitialized(ServletContextEvent sce) {
+		System.out.println("-------contextInitialized-----------");
+	}
 
-    @Override
-    public void contextDestroyed(ServletContextEvent sce) {
-        System.out.println("------------contextDestroyed-------------");
-    }
+	@Override
+	public void contextDestroyed(ServletContextEvent sce) {
+		System.out.println("------------contextDestroyed-------------");
+	}
 }
diff --git a/len-sys/src/main/java/com/len/core/listener/LenospInit.java b/len-sys/src/main/java/com/len/core/listener/LenospInit.java
index 4a74b4e..d63afff 100644
--- a/len-sys/src/main/java/com/len/core/listener/LenospInit.java
+++ b/len-sys/src/main/java/com/len/core/listener/LenospInit.java
@@ -7,23 +7,23 @@ import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.stereotype.Component;
 
 /**
- *   初始化类
+ * 初始化类
  */
 @Component
 public class LenospInit implements ApplicationListener<ContextRefreshedEvent> {
 
-    public void onApplicationEvent(ContextRefreshedEvent event) {
-        init(event);
-    }
+	public void onApplicationEvent(ContextRefreshedEvent event) {
+		init(event);
+	}
 
-    /**
-     * spring 加载后初始化操作
-     *
-     * @param event
-     */
-    public void init(ContextRefreshedEvent event) {
-        ExecuteContext context = new JobExecuteImpl();
-        context.execute(event);
-    }
+	/**
+	 * spring 加载后初始化操作
+	 *
+	 * @param event
+	 */
+	public void init(ContextRefreshedEvent event) {
+		ExecuteContext context = new JobExecuteImpl();
+		context.execute(event);
+	}
 
 }
diff --git a/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/DataSchdule.java b/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/DataSchdule.java
index 8f3e133..8aea873 100644
--- a/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/DataSchdule.java
+++ b/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/DataSchdule.java
@@ -1,16 +1,12 @@
 package com.len.core.quartz.CustomQuartz;
 
-import java.io.*;
-
 import com.len.core.annotation.Log;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.io.*;
+
 /**
- *
  * 定时还原数据库数据
  */
 
@@ -18,36 +14,36 @@ import org.springframework.stereotype.Component;
 @Slf4j
 public class DataSchdule {
 
-   // @Scheduled(cron = "0 0/5 * * * ? ")
-    @Log(type = Log.LOG_TYPE.UPDATE,desc = "定时还原数据库")
-    public static void restData() throws IOException, InterruptedException {
-        // SQL文件路径
-        try {
-            Runtime rt = Runtime.getRuntime();
-            String sqlPath = "G:\\os\\sql\\lenos_test.sql";
-            Process process = rt
-                    .exec("D:\\java\\mysql-5.7.21-winx64\\mysql-5.7.21-winx64\\bin\\mysql.exe -hlocalhost -uroot -ppassword --default-character-set=utf8 "
-                            + "lenos_test");
-            OutputStream outputStream = process.getOutputStream();
-            BufferedReader br = new BufferedReader(new InputStreamReader(
-                    new FileInputStream(sqlPath), "utf-8"));
-            String str = null;
-            StringBuffer sb = new StringBuffer();
-            while ((str = br.readLine()) != null) {
-                sb.append(str + "\r\n");
-            }
-            str = sb.toString();
-            OutputStreamWriter writer = new OutputStreamWriter(outputStream,
-                    "utf-8");
-            writer.write(str);
-            writer.flush();
-            outputStream.close();
-            br.close();
-            writer.close();
-            log.info("数据库还原成功");
-        } catch (IOException e) {
-            log.error("数据库还原失败");
-            e.printStackTrace();
-        }
-    }
-}
\ No newline at end of file
+	// @Scheduled(cron = "0 0/5 * * * ? ")
+	@Log(type = Log.LOG_TYPE.UPDATE, desc = "定时还原数据库")
+	public static void restData() throws IOException, InterruptedException {
+		// SQL文件路径
+		try {
+			Runtime rt = Runtime.getRuntime();
+			String sqlPath = "G:\\os\\sql\\lenos_test.sql";
+			Process process = rt
+				.exec("D:\\java\\mysql-5.7.21-winx64\\mysql-5.7.21-winx64\\bin\\mysql.exe -hlocalhost -uroot -ppassword --default-character-set=utf8 "
+					+ "lenos_test");
+			OutputStream outputStream = process.getOutputStream();
+			BufferedReader br = new BufferedReader(new InputStreamReader(
+				new FileInputStream(sqlPath), "utf-8"));
+			String str = null;
+			StringBuffer sb = new StringBuffer();
+			while ((str = br.readLine()) != null) {
+				sb.append(str + "\r\n");
+			}
+			str = sb.toString();
+			OutputStreamWriter writer = new OutputStreamWriter(outputStream,
+				"utf-8");
+			writer.write(str);
+			writer.flush();
+			outputStream.close();
+			br.close();
+			writer.close();
+			log.info("数据库还原成功");
+		} catch (IOException e) {
+			log.error("数据库还原失败");
+			e.printStackTrace();
+		}
+	}
+}
diff --git a/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo1.java b/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo1.java
index 3b13f4a..7caca70 100644
--- a/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo1.java
+++ b/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo1.java
@@ -1,43 +1,44 @@
 package com.len.core.quartz.CustomQuartz;
 
-import com.len.util.SpringUtil;
 import com.len.entity.SysUser;
 import com.len.service.SysUserService;
-import java.text.SimpleDateFormat;
-import java.util.List;
+import com.len.util.SpringUtil;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 
+import java.text.SimpleDateFormat;
+import java.util.List;
+
 /**
- *
  * 定时
  */
-public class JobDemo1 implements Job{
-
-  int num;
-
-  @Autowired
-  SysUserService sys;
-
-  @Override
-  public void execute(JobExecutionContext context) throws JobExecutionException {
-    System.out.println("JobDemo1：启动任务=======================");
-    run();
-    System.out.println("JobDemo1：下次执行时间====="+
-        new SimpleDateFormat("yyyy-MM-dd hh:mm:ss")
-            .format(context.getNextFireTime())+"==============");
-  }
-
-  public void run(){
-    ApplicationContext applicationContext=SpringUtil.getApplicationContext();
-    //可以 获取
-    //SysUserService sys=SpringUtil.getBean(SysUserServiceImpl.class);
-    List<SysUser> userList=sys.list();
-    System.out.println(userList.get(0).getUsername());;
-    System.out.println("JobDemo1：执行完毕=======================");
-
-  }
+public class JobDemo1 implements Job {
+
+	int num;
+
+	@Autowired
+	SysUserService sys;
+
+	@Override
+	public void execute(JobExecutionContext context) throws JobExecutionException {
+		System.out.println("JobDemo1：启动任务=======================");
+		run();
+		System.out.println("JobDemo1：下次执行时间=====" +
+			new SimpleDateFormat("yyyy-MM-dd hh:mm:ss")
+				.format(context.getNextFireTime()) + "==============");
+	}
+
+	public void run() {
+		ApplicationContext applicationContext = SpringUtil.getApplicationContext();
+		//可以 获取
+		//SysUserService sys=SpringUtil.getBean(SysUserServiceImpl.class);
+		List<SysUser> userList = sys.list();
+		System.out.println(userList.get(0).getUsername());
+		;
+		System.out.println("JobDemo1：执行完毕=======================");
+
+	}
 }
diff --git a/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo2.java b/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo2.java
index c139c12..a61ed70 100644
--- a/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo2.java
+++ b/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo2.java
@@ -5,37 +5,35 @@ import com.len.entity.SysUser;
 import com.len.service.SysUserService;
 import com.len.service.impl.SysUserServiceImpl;
 import com.len.util.SpringUtil;
-import java.text.SimpleDateFormat;
-import java.util.List;
-
 import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.context.ApplicationContext;
 
+import java.text.SimpleDateFormat;
+import java.util.List;
+
 /**
  * 定时测试类
  */
 @Slf4j
-public class JobDemo2 implements Job{
+public class JobDemo2 implements Job {
 
-  @Override
-  public void execute(JobExecutionContext context) throws JobExecutionException {
-    System.out.println("JobDemo2：启动任务=======================");
-    run();
-    System.out.println("JobDemo2：下次执行时间====="+
-        new SimpleDateFormat("yyyy-MM-dd hh:mm:ss")
-            .format(context.getNextFireTime())+"==============");
-  }
+	@Override
+	public void execute(JobExecutionContext context) throws JobExecutionException {
+		System.out.println("JobDemo2：启动任务=======================");
+		run();
+		System.out.println("JobDemo2：下次执行时间=====" +
+			new SimpleDateFormat("yyyy-MM-dd hh:mm:ss")
+				.format(context.getNextFireTime()) + "==============");
+	}
 
-  public void run(){
-    ApplicationContext applicationContext=SpringUtil.getApplicationContext();
-    SysUserService sys=SpringUtil.getBean(SysUserServiceImpl.class);
-    List<SysUser> userList=sys.list();
-    log.info(userList.get(0).getUsername());
-    log.info("JobDemo2：执行完毕=======================");
-  }
+	public void run() {
+		ApplicationContext applicationContext = SpringUtil.getApplicationContext();
+		SysUserService sys = SpringUtil.getBean(SysUserServiceImpl.class);
+		List<SysUser> userList = sys.list();
+		log.info(userList.get(0).getUsername());
+		log.info("JobDemo2：执行完毕=======================");
+	}
 }
diff --git a/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo3.java b/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo3.java
index 6211083..4f32929 100644
--- a/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo3.java
+++ b/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo3.java
@@ -4,34 +4,36 @@ import com.len.entity.SysUser;
 import com.len.service.SysUserService;
 import com.len.service.impl.SysUserServiceImpl;
 import com.len.util.SpringUtil;
-import java.text.SimpleDateFormat;
-import java.util.List;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.context.ApplicationContext;
 
+import java.text.SimpleDateFormat;
+import java.util.List;
+
 /**
  * 定时测试类
  */
-public class JobDemo3 implements Job{
+public class JobDemo3 implements Job {
 
 
-  @Override
-  public void execute(JobExecutionContext context) throws JobExecutionException {
-    System.out.println("JobDemo3：启动任务=======================");
-    run();
-    System.out.println("JobDemo3：下次执行时间====="+
-        new SimpleDateFormat("yyyy-MM-dd hh:mm:ss")
-            .format(context.getNextFireTime())+"==============");
-  }
+	@Override
+	public void execute(JobExecutionContext context) throws JobExecutionException {
+		System.out.println("JobDemo3：启动任务=======================");
+		run();
+		System.out.println("JobDemo3：下次执行时间=====" +
+			new SimpleDateFormat("yyyy-MM-dd hh:mm:ss")
+				.format(context.getNextFireTime()) + "==============");
+	}
 
-  public void run(){
-    ApplicationContext applicationContext=SpringUtil.getApplicationContext();
-    SysUserService sys=SpringUtil.getBean(SysUserServiceImpl.class);
-    List<SysUser> userList=sys.list();
-    System.out.println(userList.get(0).getUsername());;
-    System.out.println("JobDemo3：执行完毕=======================");
+	public void run() {
+		ApplicationContext applicationContext = SpringUtil.getApplicationContext();
+		SysUserService sys = SpringUtil.getBean(SysUserServiceImpl.class);
+		List<SysUser> userList = sys.list();
+		System.out.println(userList.get(0).getUsername());
+		;
+		System.out.println("JobDemo3：执行完毕=======================");
 
-  }
+	}
 }
diff --git a/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo4.java b/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo4.java
index 8c28206..124cb01 100644
--- a/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo4.java
+++ b/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo4.java
@@ -4,34 +4,36 @@ import com.len.entity.SysUser;
 import com.len.service.SysUserService;
 import com.len.service.impl.SysUserServiceImpl;
 import com.len.util.SpringUtil;
-import java.text.SimpleDateFormat;
-import java.util.List;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.context.ApplicationContext;
 
+import java.text.SimpleDateFormat;
+import java.util.List;
+
 /**
  * 定时测试类
  */
-public class JobDemo4 implements Job{
+public class JobDemo4 implements Job {
 
 
-  @Override
-  public void execute(JobExecutionContext context) throws JobExecutionException {
-    System.out.println("JobDemo4：启动任务=======================");
-    run();
-    System.out.println("JobDemo4：下次执行时间====="+
-        new SimpleDateFormat("yyyy-MM-dd hh:mm:ss")
-            .format(context.getNextFireTime())+"==============");
-  }
+	@Override
+	public void execute(JobExecutionContext context) throws JobExecutionException {
+		System.out.println("JobDemo4：启动任务=======================");
+		run();
+		System.out.println("JobDemo4：下次执行时间=====" +
+			new SimpleDateFormat("yyyy-MM-dd hh:mm:ss")
+				.format(context.getNextFireTime()) + "==============");
+	}
 
-  public void run(){
-    ApplicationContext applicationContext=SpringUtil.getApplicationContext();
-    SysUserService sys=SpringUtil.getBean(SysUserServiceImpl.class);
-    List<SysUser> userList=sys.list();
-    System.out.println(userList.get(0).getUsername());;
-    System.out.println("JobDemo4：执行完毕=======================");
+	public void run() {
+		ApplicationContext applicationContext = SpringUtil.getApplicationContext();
+		SysUserService sys = SpringUtil.getBean(SysUserServiceImpl.class);
+		List<SysUser> userList = sys.list();
+		System.out.println(userList.get(0).getUsername());
+		;
+		System.out.println("JobDemo4：执行完毕=======================");
 
-  }
+	}
 }
diff --git a/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo5.java b/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo5.java
index cfe1838..427026d 100644
--- a/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo5.java
+++ b/len-sys/src/main/java/com/len/core/quartz/CustomQuartz/JobDemo5.java
@@ -4,34 +4,36 @@ import com.len.entity.SysUser;
 import com.len.service.SysUserService;
 import com.len.service.impl.SysUserServiceImpl;
 import com.len.util.SpringUtil;
-import java.text.SimpleDateFormat;
-import java.util.List;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.springframework.context.ApplicationContext;
 
+import java.text.SimpleDateFormat;
+import java.util.List;
+
 /**
  * 定时测试类
  */
-public class JobDemo5 implements Job{
+public class JobDemo5 implements Job {
 
 
-  @Override
-  public void execute(JobExecutionContext context) throws JobExecutionException {
-    System.out.println("JobDemo5：启动任务=======================");
-    run();
-    System.out.println("JobDemo5：下次执行时间====="+
-        new SimpleDateFormat("yyyy-MM-dd hh:mm:ss")
-            .format(context.getNextFireTime())+"==============");
-  }
+	@Override
+	public void execute(JobExecutionContext context) throws JobExecutionException {
+		System.out.println("JobDemo5：启动任务=======================");
+		run();
+		System.out.println("JobDemo5：下次执行时间=====" +
+			new SimpleDateFormat("yyyy-MM-dd hh:mm:ss")
+				.format(context.getNextFireTime()) + "==============");
+	}
 
-  public void run(){
-    ApplicationContext applicationContext=SpringUtil.getApplicationContext();
-    SysUserService sys=SpringUtil.getBean(SysUserServiceImpl.class);
-    List<SysUser> userList=sys.list();
-    System.out.println(userList.get(0).getUsername());;
-    System.out.println("JobDemo5：执行完毕=======================");
+	public void run() {
+		ApplicationContext applicationContext = SpringUtil.getApplicationContext();
+		SysUserService sys = SpringUtil.getBean(SysUserServiceImpl.class);
+		List<SysUser> userList = sys.list();
+		System.out.println(userList.get(0).getUsername());
+		;
+		System.out.println("JobDemo5：执行完毕=======================");
 
-  }
+	}
 }
diff --git a/len-sys/src/main/java/com/len/core/quartz/JobTask.java b/len-sys/src/main/java/com/len/core/quartz/JobTask.java
index 864dfac..fdc7abe 100644
--- a/len-sys/src/main/java/com/len/core/quartz/JobTask.java
+++ b/len-sys/src/main/java/com/len/core/quartz/JobTask.java
@@ -14,114 +14,114 @@ import java.util.Date;
 import java.util.HashSet;
 
 /**
- *        <p>
- *        定时任务类 增删改 可参考api：http://www.quartz-scheduler.org/api/2.2.1/
- *        <p>
- *        任务名称 默认为 SysJob 类 id
+ * <p>
+ * 定时任务类 增删改 可参考api：http://www.quartz-scheduler.org/api/2.2.1/
+ * <p>
+ * 任务名称 默认为 SysJob 类 id
  */
 @Service
 @Slf4j
 public class JobTask {
 
 
-    @Autowired
-    SchedulerFactoryBean schedulerFactoryBean;
+	@Autowired
+	SchedulerFactoryBean schedulerFactoryBean;
 
-    /**
-     * true 存在 false 不存在
-     *
-     * @param
-     * @return
-     */
-    public boolean checkJob(SysJob job) {
-        Scheduler scheduler = schedulerFactoryBean.getScheduler();
-        TriggerKey triggerKey = TriggerKey.triggerKey(job.getId(), Scheduler.DEFAULT_GROUP);
-        try {
-            if (scheduler.checkExists(triggerKey)) {
-                return true;
-            }
-        } catch (SchedulerException e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
+	/**
+	 * true 存在 false 不存在
+	 *
+	 * @param
+	 * @return
+	 */
+	public boolean checkJob(SysJob job) {
+		Scheduler scheduler = schedulerFactoryBean.getScheduler();
+		TriggerKey triggerKey = TriggerKey.triggerKey(job.getId(), Scheduler.DEFAULT_GROUP);
+		try {
+			if (scheduler.checkExists(triggerKey)) {
+				return true;
+			}
+		} catch (SchedulerException e) {
+			e.printStackTrace();
+		}
+		return false;
+	}
 
-    /**
-     * 开启
-     */
-    @Log(desc = "开启定时任务")
-    public boolean startJob(SysJob job) throws ClassNotFoundException, SchedulerException {
-        Scheduler scheduler = schedulerFactoryBean.getScheduler();
-        Class clazz = Class.forName(job.getClazzPath());
-        JobDetail jobDetail = JobBuilder.newJob(clazz).build();
-        // 触发器
-        TriggerKey triggerKey = TriggerKey.triggerKey(job.getId(), Scheduler.DEFAULT_GROUP);
-        CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity(triggerKey)
-            .withSchedule(CronScheduleBuilder.cronSchedule(job.getCron())).build();
-        scheduler.scheduleJob(jobDetail, trigger);
-        // 启动
-        if (!scheduler.isShutdown()) {
-            scheduler.start();
-            log.info("---任务[" + triggerKey.getName() + "]启动成功-------");
-            return true;
-        } else {
-            log.info("---任务[" + triggerKey.getName() + "]已经运行，请勿再次启动-------");
-        }
+	/**
+	 * 开启
+	 */
+	@Log(desc = "开启定时任务")
+	public boolean startJob(SysJob job) throws ClassNotFoundException, SchedulerException {
+		Scheduler scheduler = schedulerFactoryBean.getScheduler();
+		Class clazz = Class.forName(job.getClazzPath());
+		JobDetail jobDetail = JobBuilder.newJob(clazz).build();
+		// 触发器
+		TriggerKey triggerKey = TriggerKey.triggerKey(job.getId(), Scheduler.DEFAULT_GROUP);
+		CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity(triggerKey)
+			.withSchedule(CronScheduleBuilder.cronSchedule(job.getCron())).build();
+		scheduler.scheduleJob(jobDetail, trigger);
+		// 启动
+		if (!scheduler.isShutdown()) {
+			scheduler.start();
+			log.info("---任务[" + triggerKey.getName() + "]启动成功-------");
+			return true;
+		} else {
+			log.info("---任务[" + triggerKey.getName() + "]已经运行，请勿再次启动-------");
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    /**
-     * 更新
-     */
-    @Log(desc = "更新定时任务", type = LOG_TYPE.UPDATE)
-    public boolean updateJob(SysJob job) {
-        Scheduler scheduler = schedulerFactoryBean.getScheduler();
-        String createTime = DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss");
+	/**
+	 * 更新
+	 */
+	@Log(desc = "更新定时任务", type = LOG_TYPE.UPDATE)
+	public boolean updateJob(SysJob job) {
+		Scheduler scheduler = schedulerFactoryBean.getScheduler();
+		String createTime = DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss");
 
-        TriggerKey triggerKey = TriggerKey.triggerKey(job.getId(), Scheduler.DEFAULT_GROUP);
-        try {
-            if (scheduler.checkExists(triggerKey)) {
-                return false;
-            }
+		TriggerKey triggerKey = TriggerKey.triggerKey(job.getId(), Scheduler.DEFAULT_GROUP);
+		try {
+			if (scheduler.checkExists(triggerKey)) {
+				return false;
+			}
 
-            JobKey jobKey = JobKey.jobKey(job.getId(), Scheduler.DEFAULT_GROUP);
+			JobKey jobKey = JobKey.jobKey(job.getId(), Scheduler.DEFAULT_GROUP);
 
-            CronScheduleBuilder schedBuilder =
-                CronScheduleBuilder.cronSchedule(job.getCron()).withMisfireHandlingInstructionDoNothing();
-            CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity(triggerKey).withDescription(createTime)
-                .withSchedule(schedBuilder).build();
+			CronScheduleBuilder schedBuilder =
+				CronScheduleBuilder.cronSchedule(job.getCron()).withMisfireHandlingInstructionDoNothing();
+			CronTrigger trigger = TriggerBuilder.newTrigger().withIdentity(triggerKey).withDescription(createTime)
+				.withSchedule(schedBuilder).build();
 
-            JobDetail jobDetail = scheduler.getJobDetail(jobKey);
-            HashSet<Trigger> triggerSet = new HashSet<>();
-            triggerSet.add(trigger);
-            scheduler.scheduleJob(jobDetail, triggerSet, true);
-            log.info("---任务[" + triggerKey.getName() + "]更新成功-------");
-            return true;
-        } catch (SchedulerException e) {
-            e.printStackTrace();
-            throw new RuntimeException(e.getMessage());
-        }
-    }
+			JobDetail jobDetail = scheduler.getJobDetail(jobKey);
+			HashSet<Trigger> triggerSet = new HashSet<>();
+			triggerSet.add(trigger);
+			scheduler.scheduleJob(jobDetail, triggerSet, true);
+			log.info("---任务[" + triggerKey.getName() + "]更新成功-------");
+			return true;
+		} catch (SchedulerException e) {
+			e.printStackTrace();
+			throw new RuntimeException(e.getMessage());
+		}
+	}
 
-    /**
-     * 删除
-     */
-    @Log(desc = "删除定时任务", type = LOG_TYPE.DEL)
-    public boolean remove(SysJob job) {
-        Scheduler scheduler = schedulerFactoryBean.getScheduler();
-        TriggerKey triggerKey = TriggerKey.triggerKey(job.getId(), Scheduler.DEFAULT_GROUP);
-        try {
-            if (checkJob(job)) {
-                scheduler.pauseTrigger(triggerKey);
-                scheduler.unscheduleJob(triggerKey);
-                scheduler.deleteJob(JobKey.jobKey(job.getId(), Scheduler.DEFAULT_GROUP));
-                log.info("---任务[" + triggerKey.getName() + "]删除成功-------");
-                return true;
-            }
-        } catch (SchedulerException e) {
-            e.printStackTrace();
-        }
-        return false;
-    }
+	/**
+	 * 删除
+	 */
+	@Log(desc = "删除定时任务", type = LOG_TYPE.DEL)
+	public boolean remove(SysJob job) {
+		Scheduler scheduler = schedulerFactoryBean.getScheduler();
+		TriggerKey triggerKey = TriggerKey.triggerKey(job.getId(), Scheduler.DEFAULT_GROUP);
+		try {
+			if (checkJob(job)) {
+				scheduler.pauseTrigger(triggerKey);
+				scheduler.unscheduleJob(triggerKey);
+				scheduler.deleteJob(JobKey.jobKey(job.getId(), Scheduler.DEFAULT_GROUP));
+				log.info("---任务[" + triggerKey.getName() + "]删除成功-------");
+				return true;
+			}
+		} catch (SchedulerException e) {
+			e.printStackTrace();
+		}
+		return false;
+	}
 }
diff --git a/len-sys/src/main/java/com/len/core/quartz/MyJobFactory.java b/len-sys/src/main/java/com/len/core/quartz/MyJobFactory.java
index 0e3a2e4..bb96db4 100644
--- a/len-sys/src/main/java/com/len/core/quartz/MyJobFactory.java
+++ b/len-sys/src/main/java/com/len/core/quartz/MyJobFactory.java
@@ -1,25 +1,22 @@
 package com.len.core.quartz;
 
 import org.quartz.spi.TriggerFiredBundle;
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
 import org.springframework.scheduling.quartz.AdaptableJobFactory;
 import org.springframework.stereotype.Component;
 
 @Component
 public class MyJobFactory extends AdaptableJobFactory {
 
-    @Autowired
-    private AutowireCapableBeanFactory capableBeanFactory;
+	@Autowired
+	private AutowireCapableBeanFactory capableBeanFactory;
 
-    @Override
-    protected Object createJobInstance(TriggerFiredBundle bundle) throws Exception {
-        Object job = super.createJobInstance(bundle);
-        capableBeanFactory.autowireBean(job);
-        return job;
-    }
+	@Override
+	protected Object createJobInstance(TriggerFiredBundle bundle) throws Exception {
+		Object job = super.createJobInstance(bundle);
+		capableBeanFactory.autowireBean(job);
+		return job;
+	}
 
-}
\ No newline at end of file
+}
diff --git a/len-sys/src/main/java/com/len/core/quartz/MySchedulerListener.java b/len-sys/src/main/java/com/len/core/quartz/MySchedulerListener.java
index 108e6b1..0050a40 100644
--- a/len-sys/src/main/java/com/len/core/quartz/MySchedulerListener.java
+++ b/len-sys/src/main/java/com/len/core/quartz/MySchedulerListener.java
@@ -1,7 +1,6 @@
 package com.len.core.quartz;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
@@ -10,15 +9,15 @@ import org.springframework.scheduling.quartz.SchedulerFactoryBean;
 @Configuration
 public class MySchedulerListener {
 
-    @Autowired
-    MyJobFactory myJobFactory;
+	@Autowired
+	MyJobFactory myJobFactory;
 
-    @Bean(name = "schedulerFactoryBean")
-    public SchedulerFactoryBean schedulerFactory() {
-        SchedulerFactoryBean bean = new SchedulerFactoryBean();
-        bean.setJobFactory(myJobFactory);
-        bean.setConfigLocation(new ClassPathResource("quartz.properties"));
-        return bean;
-    }
+	@Bean(name = "schedulerFactoryBean")
+	public SchedulerFactoryBean schedulerFactory() {
+		SchedulerFactoryBean bean = new SchedulerFactoryBean();
+		bean.setJobFactory(myJobFactory);
+		bean.setConfigLocation(new ClassPathResource("quartz.properties"));
+		return bean;
+	}
 
-}
\ No newline at end of file
+}
diff --git a/len-sys/src/main/java/com/len/core/shiro/LoginRealm.java b/len-sys/src/main/java/com/len/core/shiro/LoginRealm.java
index b2f2f37..c508ea1 100644
--- a/len-sys/src/main/java/com/len/core/shiro/LoginRealm.java
+++ b/len-sys/src/main/java/com/len/core/shiro/LoginRealm.java
@@ -26,68 +26,68 @@ import java.util.Set;
 @Service
 public class LoginRealm extends AuthorizingRealm {
 
-    @Autowired
-    private SysUserService userService;
+	@Autowired
+	private SysUserService userService;
 
-    /**
-     * 获取授权
-     *
-     * @param principalCollection
-     * @return
-     */
-    @Override
-    protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principalCollection) {
-        SimpleAuthorizationInfo info = new SimpleAuthorizationInfo();
-        CurrentUser user = (CurrentUser)principalCollection.getPrimaryPrincipal();
-        Set<String> realmNames = principalCollection.getRealmNames();
-        List<String> realmNameList = new ArrayList<>(realmNames);
-        if (LoginType.BLOG.toString().equals(realmNameList.get(0))) {
-            String[] roles = JWTUtil.getRoles(user.getUsername());
-            assert roles != null;
-            for (String role : roles) {
-                info.addRole(role);
-            }
-        } else {
-            // 根据用户获取角色 根据角色获取所有按钮权限
-            CurrentUser cUser = (CurrentUser)Principal.getSession().getAttribute("currentPrincipal");
-            for (CurrentRole cRole : cUser.getCurrentRoleList()) {
-                info.addRole(cRole.getId());
-            }
-            for (CurrentMenu cMenu : cUser.getCurrentMenuList()) {
-                if (!StringUtils.isEmpty(cMenu.getPermission())) {
-                    info.addStringPermission(cMenu.getPermission());
-                }
-            }
-        }
+	/**
+	 * 获取授权
+	 *
+	 * @param principalCollection
+	 * @return
+	 */
+	@Override
+	protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principalCollection) {
+		SimpleAuthorizationInfo info = new SimpleAuthorizationInfo();
+		CurrentUser user = (CurrentUser) principalCollection.getPrimaryPrincipal();
+		Set<String> realmNames = principalCollection.getRealmNames();
+		List<String> realmNameList = new ArrayList<>(realmNames);
+		if (LoginType.BLOG.toString().equals(realmNameList.get(0))) {
+			String[] roles = JWTUtil.getRoles(user.getUsername());
+			assert roles != null;
+			for (String role : roles) {
+				info.addRole(role);
+			}
+		} else {
+			// 根据用户获取角色 根据角色获取所有按钮权限
+			CurrentUser cUser = (CurrentUser) Principal.getSession().getAttribute("currentPrincipal");
+			for (CurrentRole cRole : cUser.getCurrentRoleList()) {
+				info.addRole(cRole.getId());
+			}
+			for (CurrentMenu cMenu : cUser.getCurrentMenuList()) {
+				if (!StringUtils.isEmpty(cMenu.getPermission())) {
+					info.addStringPermission(cMenu.getPermission());
+				}
+			}
+		}
 
-        return info;
-    }
+		return info;
+	}
 
-    /**
-     * 获取认证
-     *
-     * @param authenticationToken
-     * @return
-     * @throws AuthenticationException
-     */
-    @Override
-    protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authenticationToken)
-        throws AuthenticationException {
-        String username = (String)authenticationToken.getPrincipal();
-        SysUser s = null;
-        try {
-            s = userService.login(username);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if (s == null) {
-            throw new UnknownAccountException("账户密码不正确");
-        }
-        CurrentUser user = new CurrentUser();
-        BeanUtil.copyNotNullBean(s, user);
-        user.setPassword(null);
-        userService.setMenuAndRoles(username);
-        ByteSource byteSource = ByteSource.Util.bytes(username);
-        return new SimpleAuthenticationInfo(user, s.getPassword(), byteSource, getName());
-    }
+	/**
+	 * 获取认证
+	 *
+	 * @param authenticationToken
+	 * @return
+	 * @throws AuthenticationException
+	 */
+	@Override
+	protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authenticationToken)
+		throws AuthenticationException {
+		String username = (String) authenticationToken.getPrincipal();
+		SysUser s = null;
+		try {
+			s = userService.login(username);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		if (s == null) {
+			throw new UnknownAccountException("账户密码不正确");
+		}
+		CurrentUser user = new CurrentUser();
+		BeanUtil.copyNotNullBean(s, user);
+		user.setPassword(null);
+		userService.setMenuAndRoles(username);
+		ByteSource byteSource = ByteSource.Util.bytes(username);
+		return new SimpleAuthenticationInfo(user, s.getPassword(), byteSource, getName());
+	}
 }
diff --git a/len-sys/src/main/java/com/len/core/shiro/Principal.java b/len-sys/src/main/java/com/len/core/shiro/Principal.java
index 08c246f..1f4261b 100644
--- a/len-sys/src/main/java/com/len/core/shiro/Principal.java
+++ b/len-sys/src/main/java/com/len/core/shiro/Principal.java
@@ -8,33 +8,35 @@ import org.apache.shiro.subject.Subject;
 
 public class Principal {
 
-    /**
-     * 获取用户主题
-     *
-     * @return
-     */
-    public static Subject getSubject() {
-        return SecurityUtils.getSubject();
-    }
-
-    /**
-     * 获取当前用户对象
-     * @return
-     */
-    public static CurrentUser getPrincipal() {
-        return (CurrentUser) getSubject().getPrincipal();
-    }
-
-    /**
-     * 当前session
-     * @return
-     */
-    public static Session getSession() {
-        return getSubject().getSession();
-    }
-
-    public static CurrentUser getCurrentUse() {
-        return (CurrentUser) getSession().getAttribute("currentPrincipal");
-    }
+	/**
+	 * 获取用户主题
+	 *
+	 * @return
+	 */
+	public static Subject getSubject() {
+		return SecurityUtils.getSubject();
+	}
+
+	/**
+	 * 获取当前用户对象
+	 *
+	 * @return
+	 */
+	public static CurrentUser getPrincipal() {
+		return (CurrentUser) getSubject().getPrincipal();
+	}
+
+	/**
+	 * 当前session
+	 *
+	 * @return
+	 */
+	public static Session getSession() {
+		return getSubject().getSession();
+	}
+
+	public static CurrentUser getCurrentUse() {
+		return (CurrentUser) getSession().getAttribute("currentPrincipal");
+	}
 
 }
diff --git a/len-sys/src/main/java/com/len/core/shiro/RetryLimitCredentialsMatcher.java b/len-sys/src/main/java/com/len/core/shiro/RetryLimitCredentialsMatcher.java
index 7bc5685..d189251 100644
--- a/len-sys/src/main/java/com/len/core/shiro/RetryLimitCredentialsMatcher.java
+++ b/len-sys/src/main/java/com/len/core/shiro/RetryLimitCredentialsMatcher.java
@@ -1,68 +1,65 @@
-package com.len.core.shiro;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.apache.shiro.authc.AuthenticationInfo;
-import org.apache.shiro.authc.AuthenticationToken;
-import org.apache.shiro.authc.ExcessiveAttemptsException;
-import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
-import org.apache.shiro.cache.Cache;
-import org.apache.shiro.cache.CacheManager;
-
-import cn.hutool.core.util.StrUtil;
-
-/**
- * 验证器，增加了登录次数校验功能 限制尝试登陆次数,防止暴力破解
- */
-@Slf4j
-public class RetryLimitCredentialsMatcher extends HashedCredentialsMatcher {
-
-    private Cache<String, AtomicInteger> loginRetryCache;
-
-    private int maxRetryCount = 5;
-
-    public void setMaxRetryCount(int maxRetryCount) {
-        this.maxRetryCount = maxRetryCount;
-    }
-
-    public RetryLimitCredentialsMatcher() {}
-
-    /**
-     *
-     * @param cacheManager
-     * @param maxRetryCount 最大尝试次数
-     */
-    public RetryLimitCredentialsMatcher(CacheManager cacheManager, int maxRetryCount) {
-        this.maxRetryCount = maxRetryCount;
-        this.loginRetryCache = cacheManager.getCache("loginRetryCache");
-    }
-
-    public RetryLimitCredentialsMatcher(CacheManager cacheManager) {
-        this(cacheManager, 5);
-    }
-
-    @Override
-    public boolean doCredentialsMatch(AuthenticationToken token, AuthenticationInfo info) {
-        String username = (String)token.getPrincipal();
-        // retry count + 1
-        AtomicInteger retryCount =
-            loginRetryCache.get(username) == null ? new AtomicInteger(0) : loginRetryCache.get(username);
-        log.info("retryCount:{}, username:{}", retryCount, username);
-        if (retryCount.incrementAndGet() > this.maxRetryCount) {
-            throw new ExcessiveAttemptsException(StrUtil
-                .format("username: {} tried to login more than {} times in perid", username, this.maxRetryCount));
-        }
-        boolean matches = super.doCredentialsMatch(token, info);
-
-        if (matches) {
-            loginRetryCache.remove(username);
-        } else {
-            loginRetryCache.put(username, retryCount);
-            log.info(String.valueOf(retryCount.get()));
-        }
-        return matches;
-    }
-}
\ No newline at end of file
+package com.len.core.shiro;
+
+import cn.hutool.core.util.StrUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authc.AuthenticationInfo;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.authc.ExcessiveAttemptsException;
+import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
+import org.apache.shiro.cache.Cache;
+import org.apache.shiro.cache.CacheManager;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * 验证器，增加了登录次数校验功能 限制尝试登陆次数,防止暴力破解
+ */
+@Slf4j
+public class RetryLimitCredentialsMatcher extends HashedCredentialsMatcher {
+
+	private Cache<String, AtomicInteger> loginRetryCache;
+
+	private int maxRetryCount = 5;
+
+	public RetryLimitCredentialsMatcher() {
+	}
+
+	/**
+	 * @param cacheManager
+	 * @param maxRetryCount 最大尝试次数
+	 */
+	public RetryLimitCredentialsMatcher(CacheManager cacheManager, int maxRetryCount) {
+		this.maxRetryCount = maxRetryCount;
+		this.loginRetryCache = cacheManager.getCache("loginRetryCache");
+	}
+
+	public RetryLimitCredentialsMatcher(CacheManager cacheManager) {
+		this(cacheManager, 5);
+	}
+
+	public void setMaxRetryCount(int maxRetryCount) {
+		this.maxRetryCount = maxRetryCount;
+	}
+
+	@Override
+	public boolean doCredentialsMatch(AuthenticationToken token, AuthenticationInfo info) {
+		String username = (String) token.getPrincipal();
+		// retry count + 1
+		AtomicInteger retryCount =
+			loginRetryCache.get(username) == null ? new AtomicInteger(0) : loginRetryCache.get(username);
+		log.info("retryCount:{}, username:{}", retryCount, username);
+		if (retryCount.incrementAndGet() > this.maxRetryCount) {
+			throw new ExcessiveAttemptsException(StrUtil
+				.format("username: {} tried to login more than {} times in perid", username, this.maxRetryCount));
+		}
+		boolean matches = super.doCredentialsMatch(token, info);
+
+		if (matches) {
+			loginRetryCache.remove(username);
+		} else {
+			loginRetryCache.put(username, retryCount);
+			log.info(String.valueOf(retryCount.get()));
+		}
+		return matches;
+	}
+}
diff --git a/len-sys/src/main/java/com/len/entity/SysDept.java b/len-sys/src/main/java/com/len/entity/SysDept.java
index a71d837..6b1af7d 100644
--- a/len-sys/src/main/java/com/len/entity/SysDept.java
+++ b/len-sys/src/main/java/com/len/entity/SysDept.java
@@ -1,10 +1,7 @@
 package com.len.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.len.base.BaseEntity;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -13,23 +10,23 @@ import lombok.EqualsAndHashCode;
 @Data
 public class SysDept extends BaseEntity {
 
-    /**
-     * 编码
-     */
-    private String deptCode;
+	/**
+	 * 编码
+	 */
+	private String deptCode;
 
-    /**
-     * 部门名称
-     */
-    private String deptName;
+	/**
+	 * 部门名称
+	 */
+	private String deptName;
 
-    /**
-     * 父级id
-     */
-    private String deptPid;
+	/**
+	 * 父级id
+	 */
+	private String deptPid;
 
-    /**
-     * 部门描述
-     */
-    private String deptDesc;
-}
\ No newline at end of file
+	/**
+	 * 部门描述
+	 */
+	private String deptDesc;
+}
diff --git a/len-sys/src/main/java/com/len/entity/SysEmployee.java b/len-sys/src/main/java/com/len/entity/SysEmployee.java
index 5fe8273..41a6aa8 100644
--- a/len-sys/src/main/java/com/len/entity/SysEmployee.java
+++ b/len-sys/src/main/java/com/len/entity/SysEmployee.java
@@ -1,93 +1,92 @@
 package com.len.entity;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.len.base.BaseEntity;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = "sys_employee")
 @Data
 public class SysEmployee extends BaseEntity {
 
-    /**
-     * 编码
-     */
-    private String employeeCode;
+	/**
+	 * 编码
+	 */
+	private String employeeCode;
 
-    /**
-     * 员工姓名
-     */
-    private String employeeName;
-    /**
-     * 员工性别
-     */
-    private String employeeGender;
-    /**
-     * 员工生日
-     */
-    private String employeeBirthday;
-    /**
-     * 员工部门
-     */
-    private String employeeDeptcodes;
-    /**
-     * 员工工作电话
-     */
-    private String employeeMobile1;
-    /**
-     * 员工私人电话
-     */
-    private String employeeMobile2;
-    /**
-     * 员工工作邮箱
-     */
-    private String employeeMail1;
-    /**
-     * 员工私人邮箱
-     */
-    private String employeeMail2;
-    /**
-     * 员工微信
-     */
-    private String employeeWechat;
-    /**
-     * 员工QQ
-     */
-    private String employeeQq;
-    /**
-     * 员工头像
-     */
-    private String employeePhoto;
-    /**
-     * 员工社保
-     */
-    private String employeeSsn;
-    /**
-     * 员工医保
-     */
-    private String employeeMin;
+	/**
+	 * 员工姓名
+	 */
+	private String employeeName;
+	/**
+	 * 员工性别
+	 */
+	private String employeeGender;
+	/**
+	 * 员工生日
+	 */
+	private String employeeBirthday;
+	/**
+	 * 员工部门
+	 */
+	private String employeeDeptcodes;
+	/**
+	 * 员工工作电话
+	 */
+	private String employeeMobile1;
+	/**
+	 * 员工私人电话
+	 */
+	private String employeeMobile2;
+	/**
+	 * 员工工作邮箱
+	 */
+	private String employeeMail1;
+	/**
+	 * 员工私人邮箱
+	 */
+	private String employeeMail2;
+	/**
+	 * 员工微信
+	 */
+	private String employeeWechat;
+	/**
+	 * 员工QQ
+	 */
+	private String employeeQq;
+	/**
+	 * 员工头像
+	 */
+	private String employeePhoto;
+	/**
+	 * 员工社保
+	 */
+	private String employeeSsn;
+	/**
+	 * 员工医保
+	 */
+	private String employeeMin;
 
-    /**
-     * 部门编码
-     */
-    @TableField(exist = false)
-    private List<Integer> deptCodeList;
+	/**
+	 * 部门编码
+	 */
+	@TableField(exist = false)
+	private List<Integer> deptCodeList;
 
-    /**
-     * 添加部门编码
-     * 
-     * @param deptCode 部门编码
-     */
-    public void addDeptCode(int deptCode) {
-        if (deptCodeList == null) {
-            deptCodeList = new ArrayList<>();
-        }
-        deptCodeList.add(deptCode);
-    }
-}
\ No newline at end of file
+	/**
+	 * 添加部门编码
+	 *
+	 * @param deptCode 部门编码
+	 */
+	public void addDeptCode(int deptCode) {
+		if (deptCodeList == null) {
+			deptCodeList = new ArrayList<>();
+		}
+		deptCodeList.add(deptCode);
+	}
+}
diff --git a/len-sys/src/main/java/com/len/entity/SysJob.java b/len-sys/src/main/java/com/len/entity/SysJob.java
index a56519e..a567c94 100644
--- a/len-sys/src/main/java/com/len/entity/SysJob.java
+++ b/len-sys/src/main/java/com/len/entity/SysJob.java
@@ -16,32 +16,32 @@ import javax.validation.constraints.NotEmpty;
 @ToString
 public class SysJob extends BaseEntity {
 
-    /**
-     * 描述任务
-     */
-    @NotEmpty(message = "任务描述不能为空", groups = {AddGroup.class, UpdateGroup.class})
-    private String jobName;
-
-    /**
-     * 任务表达式
-     */
-    @NotEmpty(message = "表达式不能为空", groups = {AddGroup.class, UpdateGroup.class})
-    private String cron;
-
-    /**
-     * 状态:0未启动false/1启动true
-     */
-    private Boolean status;
-
-    /**
-     * 任务执行方法
-     */
-    @NotEmpty(message = "执行方法不能未空", groups = {AddGroup.class, UpdateGroup.class})
-    private String clazzPath;
-
-    /**
-     * 其他描述
-     */
-    private String jobDesc;
-
-}
\ No newline at end of file
+	/**
+	 * 描述任务
+	 */
+	@NotEmpty(message = "任务描述不能为空", groups = {AddGroup.class, UpdateGroup.class})
+	private String jobName;
+
+	/**
+	 * 任务表达式
+	 */
+	@NotEmpty(message = "表达式不能为空", groups = {AddGroup.class, UpdateGroup.class})
+	private String cron;
+
+	/**
+	 * 状态:0未启动false/1启动true
+	 */
+	private Boolean status;
+
+	/**
+	 * 任务执行方法
+	 */
+	@NotEmpty(message = "执行方法不能未空", groups = {AddGroup.class, UpdateGroup.class})
+	private String clazzPath;
+
+	/**
+	 * 其他描述
+	 */
+	private String jobDesc;
+
+}
diff --git a/len-sys/src/main/java/com/len/entity/SysLog.java b/len-sys/src/main/java/com/len/entity/SysLog.java
index d2df42e..79e6424 100644
--- a/len-sys/src/main/java/com/len/entity/SysLog.java
+++ b/len-sys/src/main/java/com/len/entity/SysLog.java
@@ -1,7 +1,6 @@
 package com.len.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -9,116 +8,116 @@ import java.util.Date;
 
 @TableName(value = "sys_log")
 public class SysLog {
-    @TableId(type = IdType.AUTO)
-    private Integer id;
-
-    private String userName;
-
-    private String ip;
-
-    private String type;
-
-    private String text;
-
-    private Date createTime;
-
-    private String param;
-
-    /**
-     * @return id
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * @return user_name
-     */
-    public String getUserName() {
-        return userName;
-    }
-
-    /**
-     * @param userName
-     */
-    public void setUserName(String userName) {
-        this.userName = userName == null ? null : userName.trim();
-    }
-
-    /**
-     * @return ip
-     */
-    public String getIp() {
-        return ip;
-    }
-
-    /**
-     * @param ip
-     */
-    public void setIp(String ip) {
-        this.ip = ip == null ? null : ip.trim();
-    }
-
-    /**
-     * @return type
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * @param type
-     */
-    public void setType(String type) {
-        this.type = type == null ? null : type.trim();
-    }
-
-    /**
-     * @return text
-     */
-    public String getText() {
-        return text;
-    }
-
-    /**
-     * @param text
-     */
-    public void setText(String text) {
-        this.text = text == null ? null : text.trim();
-    }
-
-    /**
-     * @return create_time
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * @param createTime
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * @return param
-     */
-    public String getParam() {
-        return param;
-    }
-
-    /**
-     * @param param
-     */
-    public void setParam(String param) {
-        this.param = param == null ? null : param.trim();
-    }
-}
\ No newline at end of file
+	@TableId(type = IdType.AUTO)
+	private Integer id;
+
+	private String userName;
+
+	private String ip;
+
+	private String type;
+
+	private String text;
+
+	private Date createTime;
+
+	private String param;
+
+	/**
+	 * @return id
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * @param id
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * @return user_name
+	 */
+	public String getUserName() {
+		return userName;
+	}
+
+	/**
+	 * @param userName
+	 */
+	public void setUserName(String userName) {
+		this.userName = userName == null ? null : userName.trim();
+	}
+
+	/**
+	 * @return ip
+	 */
+	public String getIp() {
+		return ip;
+	}
+
+	/**
+	 * @param ip
+	 */
+	public void setIp(String ip) {
+		this.ip = ip == null ? null : ip.trim();
+	}
+
+	/**
+	 * @return type
+	 */
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * @param type
+	 */
+	public void setType(String type) {
+		this.type = type == null ? null : type.trim();
+	}
+
+	/**
+	 * @return text
+	 */
+	public String getText() {
+		return text;
+	}
+
+	/**
+	 * @param text
+	 */
+	public void setText(String text) {
+		this.text = text == null ? null : text.trim();
+	}
+
+	/**
+	 * @return create_time
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * @param createTime
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * @return param
+	 */
+	public String getParam() {
+		return param;
+	}
+
+	/**
+	 * @param param
+	 */
+	public void setParam(String param) {
+		this.param = param == null ? null : param.trim();
+	}
+}
diff --git a/len-sys/src/main/java/com/len/entity/SysMenu.java b/len-sys/src/main/java/com/len/entity/SysMenu.java
index 1d2a809..0d04700 100644
--- a/len-sys/src/main/java/com/len/entity/SysMenu.java
+++ b/len-sys/src/main/java/com/len/entity/SysMenu.java
@@ -1,69 +1,57 @@
 package com.len.entity;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.len.base.BaseEntity;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
 @EqualsAndHashCode(callSuper = true)
 @TableName("sys_menu")
 @Data
 @ToString
 public class SysMenu extends BaseEntity implements Serializable {
 
-    /**
-     * 编码
-     */
-    private String code;
-
-    private String name;
-
-    private String pId;
-
-    private String url;
-
-    /**
-     * 路由
-     */
-    private String router;
-
-    /**
-     * 排序字段
-     */
-    private Integer orderNum;
-
-    /**
-     * 图标
-     */
-    private String icon;
-
-    /**
-     * 权限
-     */
-    private String permission;
-
-    /**
-     * 1栏目2菜单
-     */
-    private Byte menuType;
-
-    @TableField(exist = false)
-    private List<SysRole> roleList;
-
-    private static final long serialVersionUID = 1L;
-
-    @TableField(exist = false)
-    private List<SysMenu> children = new ArrayList<SysMenu>();
-
-    public void addChild(SysMenu sysMenu) {
-        children.add(sysMenu);
-    }
-
-}
\ No newline at end of file
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 编码
+	 */
+	private String code;
+	private String name;
+	private String pId;
+	private String url;
+	/**
+	 * 路由
+	 */
+	private String router;
+	/**
+	 * 排序字段
+	 */
+	private Integer orderNum;
+	/**
+	 * 图标
+	 */
+	private String icon;
+	/**
+	 * 权限
+	 */
+	private String permission;
+	/**
+	 * 1栏目2菜单
+	 */
+	private Byte menuType;
+	@TableField(exist = false)
+	private List<SysRole> roleList;
+	@TableField(exist = false)
+	private List<SysMenu> children = new ArrayList<SysMenu>();
+
+	public void addChild(SysMenu sysMenu) {
+		children.add(sysMenu);
+	}
+
+}
diff --git a/len-sys/src/main/java/com/len/entity/SysPanelOpt.java b/len-sys/src/main/java/com/len/entity/SysPanelOpt.java
index 7512e78..7f9e8cb 100644
--- a/len-sys/src/main/java/com/len/entity/SysPanelOpt.java
+++ b/len-sys/src/main/java/com/len/entity/SysPanelOpt.java
@@ -2,7 +2,6 @@ package com.len.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.len.base.BaseEntity;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -14,24 +13,24 @@ import lombok.EqualsAndHashCode;
 @TableName(value = "sys_panelopt")
 public class SysPanelOpt extends BaseEntity {
 
-    /**
-     * 列
-     */
-    private Integer paneloptColumn;
-
-    /**
-     * 列顺序
-     */
-    private Integer paneloptIndex;
-
-    /**
-     * 编号
-     */
-    private String paneloptCode;
-
-    /**
-     * 用户id
-     */
-    private String paneloptUserid;
+	/**
+	 * 列
+	 */
+	private Integer paneloptColumn;
+
+	/**
+	 * 列顺序
+	 */
+	private Integer paneloptIndex;
+
+	/**
+	 * 编号
+	 */
+	private String paneloptCode;
+
+	/**
+	 * 用户id
+	 */
+	private String paneloptUserid;
 
 }
diff --git a/len-sys/src/main/java/com/len/entity/SysRole.java b/len-sys/src/main/java/com/len/entity/SysRole.java
index 112df53..b34729d 100644
--- a/len-sys/src/main/java/com/len/entity/SysRole.java
+++ b/len-sys/src/main/java/com/len/entity/SysRole.java
@@ -16,8 +16,8 @@ import javax.validation.constraints.NotEmpty;
 @EqualsAndHashCode
 public class SysRole extends BaseEntity {
 
-    @NotEmpty(message = "角色名称不能为空", groups = {AddGroup.class, UpdateGroup.class})
-    private String roleName;
+	@NotEmpty(message = "角色名称不能为空", groups = {AddGroup.class, UpdateGroup.class})
+	private String roleName;
 
-    private String remark;
-}
\ No newline at end of file
+	private String remark;
+}
diff --git a/len-sys/src/main/java/com/len/entity/SysRoleMenu.java b/len-sys/src/main/java/com/len/entity/SysRoleMenu.java
index 94d35f0..142035a 100644
--- a/len-sys/src/main/java/com/len/entity/SysRoleMenu.java
+++ b/len-sys/src/main/java/com/len/entity/SysRoleMenu.java
@@ -9,9 +9,9 @@ import lombok.Data;
 @TableName(value = "sys_role_menu")
 public class SysRoleMenu {
 
-    @TableId(type = IdType.UUID)
-    private String roleId;
+	@TableId(type = IdType.UUID)
+	private String roleId;
 
-    @TableId(type = IdType.UUID)
-    private String menuId;
-}
\ No newline at end of file
+	@TableId(type = IdType.UUID)
+	private String menuId;
+}
diff --git a/len-sys/src/main/java/com/len/entity/SysRoleUser.java b/len-sys/src/main/java/com/len/entity/SysRoleUser.java
index c765582..898100f 100644
--- a/len-sys/src/main/java/com/len/entity/SysRoleUser.java
+++ b/len-sys/src/main/java/com/len/entity/SysRoleUser.java
@@ -9,9 +9,9 @@ import lombok.Data;
 @TableName(value = "sys_role_user")
 public class SysRoleUser {
 
-    @TableId(type = IdType.UUID)
-    private String userId;
+	@TableId(type = IdType.UUID)
+	private String userId;
 
-    @TableId(type = IdType.UUID)
-    private String roleId;
-}
\ No newline at end of file
+	@TableId(type = IdType.UUID)
+	private String roleId;
+}
diff --git a/len-sys/src/main/java/com/len/entity/SysShortcuts.java b/len-sys/src/main/java/com/len/entity/SysShortcuts.java
index 3b31d95..16a4083 100644
--- a/len-sys/src/main/java/com/len/entity/SysShortcuts.java
+++ b/len-sys/src/main/java/com/len/entity/SysShortcuts.java
@@ -2,7 +2,6 @@ package com.len.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.len.base.BaseEntity;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -14,19 +13,19 @@ import lombok.EqualsAndHashCode;
 @TableName(value = "sys_shortcuts")
 public class SysShortcuts extends BaseEntity {
 
-    /**
-     * 序号
-     */
-    private Integer shortcutsNum;
+	/**
+	 * 序号
+	 */
+	private Integer shortcutsNum;
 
-    /**
-     * 用户id
-     */
-    private String shortcutsUserid;
+	/**
+	 * 用户id
+	 */
+	private String shortcutsUserid;
 
-    /**
-     * 菜单id
-     */
-    private String shortcutsMenuid;
+	/**
+	 * 菜单id
+	 */
+	private String shortcutsMenuid;
 
 }
diff --git a/len-sys/src/main/java/com/len/entity/SysUser.java b/len-sys/src/main/java/com/len/entity/SysUser.java
index 6c87e63..5c30bb3 100644
--- a/len-sys/src/main/java/com/len/entity/SysUser.java
+++ b/len-sys/src/main/java/com/len/entity/SysUser.java
@@ -14,33 +14,33 @@ import javax.validation.constraints.NotEmpty;
 public class SysUser extends BaseEntity {
 
 
-    @NotEmpty(message = "用户名不能为空", groups = {AddGroup.class, UpdateGroup.class})
-    @TableField
-    private String username;
+	@NotEmpty(message = "用户名不能为空", groups = {AddGroup.class, UpdateGroup.class})
+	@TableField
+	private String username;
 
-    @NotEmpty(message = "密码不能为空", groups = {AddGroup.class, UpdateGroup.class})
-    @TableField
-    private String password;
+	@NotEmpty(message = "密码不能为空", groups = {AddGroup.class, UpdateGroup.class})
+	@TableField
+	private String password;
 
-    @TableField
-    private Integer age;
+	@TableField
+	private Integer age;
 
-    @TableField
-    private String email;
+	@TableField
+	private String email;
 
-    @TableField
-    private String photo;
+	@TableField
+	private String photo;
 
 
-    private String realName;
+	private String realName;
 
-    /**
-     * 员工id
-     */
-    private String userEmpid;
+	/**
+	 * 员工id
+	 */
+	private String userEmpid;
 
-    /**
-     * 0可用1封禁
-     */
-    private Byte delFlag;
-}
\ No newline at end of file
+	/**
+	 * 0可用1封禁
+	 */
+	private Byte delFlag;
+}
diff --git a/len-sys/src/main/java/com/len/entity/SysUserDepart.java b/len-sys/src/main/java/com/len/entity/SysUserDepart.java
index f20af68..1f69186 100644
--- a/len-sys/src/main/java/com/len/entity/SysUserDepart.java
+++ b/len-sys/src/main/java/com/len/entity/SysUserDepart.java
@@ -8,15 +8,15 @@ import lombok.Data;
 @TableName(value = "sys_user_depart")
 @Data
 public class SysUserDepart {
-    /**
-     * 用户id
-     */
-    @TableId(type = IdType.UUID, value = "user_id")
-    private String userId;
+	/**
+	 * 用户id
+	 */
+	@TableId(type = IdType.UUID, value = "user_id")
+	private String userId;
 
-    /**
-     * 部门id
-     */
-    @TableId(type = IdType.UUID, value = "depart_id")
-    private String departId;
-}
\ No newline at end of file
+	/**
+	 * 部门id
+	 */
+	@TableId(type = IdType.UUID, value = "depart_id")
+	private String departId;
+}
diff --git a/len-sys/src/main/java/com/len/mapper/SysMenuMapper.java b/len-sys/src/main/java/com/len/mapper/SysMenuMapper.java
index 78308a9..b2f3a45 100644
--- a/len-sys/src/main/java/com/len/mapper/SysMenuMapper.java
+++ b/len-sys/src/main/java/com/len/mapper/SysMenuMapper.java
@@ -1,55 +1,53 @@
 package com.len.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.len.base.BaseMapper;
 import com.len.entity.SysMenu;
-import com.len.entity.SysShortcuts;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 菜单 mapper
  */
 public interface SysMenuMapper extends BaseMapper<SysMenu> {
 
-    /**
-     * 获取元节点
-     */
-    List<SysMenu> getMenuNotSuper();
-
-    /**
-     * 获取子节点
-     *
-     * @return
-     */
-    List<SysMenu> getMenuChildren(String id);
-
-    List<SysMenu> getMenuChildrenAll(String id);
-
-    /**
-     * 根据用户获取所有菜单
-     *
-     * @param id
-     * @return
-     */
-    List<SysMenu> getUserMenu(@Param("id") String id);
-
-    /**
-     * 获取用户快捷菜单列表
-     * 
-     * @param userId 用户id
-     * @return
-     */
-    List<SysMenu> getUserShortCuts(@Param("userId") String userId);
-
-
-    /**
-     * 获取个人快捷菜单最大编码数
-     * 
-     * @param userId
-     * @return
-     */
-    Integer getMaxNum(String userId);
-
-}
\ No newline at end of file
+	/**
+	 * 获取元节点
+	 */
+	List<SysMenu> getMenuNotSuper();
+
+	/**
+	 * 获取子节点
+	 *
+	 * @return
+	 */
+	List<SysMenu> getMenuChildren(String id);
+
+	List<SysMenu> getMenuChildrenAll(String id);
+
+	/**
+	 * 根据用户获取所有菜单
+	 *
+	 * @param id
+	 * @return
+	 */
+	List<SysMenu> getUserMenu(@Param("id") String id);
+
+	/**
+	 * 获取用户快捷菜单列表
+	 *
+	 * @param userId 用户id
+	 * @return
+	 */
+	List<SysMenu> getUserShortCuts(@Param("userId") String userId);
+
+
+	/**
+	 * 获取个人快捷菜单最大编码数
+	 *
+	 * @param userId
+	 * @return
+	 */
+	Integer getMaxNum(String userId);
+
+}
diff --git a/len-sys/src/main/java/com/len/mapper/SysRoleMenuMapper.java b/len-sys/src/main/java/com/len/mapper/SysRoleMenuMapper.java
index 0e48913..1e48a26 100644
--- a/len-sys/src/main/java/com/len/mapper/SysRoleMenuMapper.java
+++ b/len-sys/src/main/java/com/len/mapper/SysRoleMenuMapper.java
@@ -10,19 +10,19 @@ import java.util.List;
  */
 public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
 
-    /**
-     * 根据条件查询角色菜单
-     * 
-     * @param sysRoleMenu
-     * @return
-     */
-    List<SysRoleMenu> selectByCondition(SysRoleMenu sysRoleMenu);
+	/**
+	 * 根据条件查询角色菜单
+	 *
+	 * @param sysRoleMenu
+	 * @return
+	 */
+	List<SysRoleMenu> selectByCondition(SysRoleMenu sysRoleMenu);
 
-    /**
-     * count
-     * 
-     * @param sysRoleMenu
-     * @return
-     */
-    int selectCountByCondition(SysRoleMenu sysRoleMenu);
-}
\ No newline at end of file
+	/**
+	 * count
+	 *
+	 * @param sysRoleMenu
+	 * @return
+	 */
+	int selectCountByCondition(SysRoleMenu sysRoleMenu);
+}
diff --git a/len-sys/src/main/java/com/len/mapper/SysRoleUserMapper.java b/len-sys/src/main/java/com/len/mapper/SysRoleUserMapper.java
index 733446f..b2016da 100644
--- a/len-sys/src/main/java/com/len/mapper/SysRoleUserMapper.java
+++ b/len-sys/src/main/java/com/len/mapper/SysRoleUserMapper.java
@@ -10,7 +10,7 @@ import java.util.List;
  */
 public interface SysRoleUserMapper extends BaseMapper<SysRoleUser> {
 
-    List<SysRoleUser> selectByCondition(SysRoleUser sysRoleUser);
+	List<SysRoleUser> selectByCondition(SysRoleUser sysRoleUser);
 
-    int selectCountByCondition(SysRoleUser sysRoleUser);
-}
\ No newline at end of file
+	int selectCountByCondition(SysRoleUser sysRoleUser);
+}
diff --git a/len-sys/src/main/java/com/len/mapper/SysUserMapper.java b/len-sys/src/main/java/com/len/mapper/SysUserMapper.java
index 0503266..4fe3a7f 100644
--- a/len-sys/src/main/java/com/len/mapper/SysUserMapper.java
+++ b/len-sys/src/main/java/com/len/mapper/SysUserMapper.java
@@ -1,11 +1,10 @@
 package com.len.mapper;
 
-import java.util.List;
-
+import com.len.entity.SysUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import com.len.entity.SysUser;
+import java.util.List;
 
 /**
  * 账户菜单 mapper
@@ -13,23 +12,23 @@ import com.len.entity.SysUser;
 @Mapper
 public interface SysUserMapper extends com.len.base.BaseMapper<SysUser> {
 
-    SysUser login(@Param("username") String username);
+	SysUser login(@Param("username") String username);
 
-    int count();
+	int count();
 
-    int add(SysUser user);
+	int add(SysUser user);
 
-    int delById(String id);
+	int delById(String id);
 
-    int checkUser(String username);
+	int checkUser(String username);
 
-    /**
-     * 更新密码
-     *
-     * @param user
-     * @return
-     */
-    int rePass(SysUser user);
+	/**
+	 * 更新密码
+	 *
+	 * @param user
+	 * @return
+	 */
+	int rePass(SysUser user);
 
-    List<SysUser> getUserByRoleId(@Param("roleId") String roleId);
-}
\ No newline at end of file
+	List<SysUser> getUserByRoleId(@Param("roleId") String roleId);
+}
diff --git a/len-sys/src/main/java/com/len/service/DashboardService.java b/len-sys/src/main/java/com/len/service/DashboardService.java
index 9cf58b1..512791c 100644
--- a/len-sys/src/main/java/com/len/service/DashboardService.java
+++ b/len-sys/src/main/java/com/len/service/DashboardService.java
@@ -1,28 +1,28 @@
 package com.len.service;
 
+import com.len.entity.SysPanelOpt;
+
 import java.util.List;
 import java.util.Map;
 
-import com.len.entity.SysPanelOpt;
-
 public interface DashboardService {
 
-    /**
-     * 获取个人panel配置列表
-     * 
-     * @return key 列， value 每列面板
-     */
-    Map<Integer, List<SysPanelOpt>> panelList();
+	/**
+	 * 获取个人panel配置列表
+	 *
+	 * @return key 列， value 每列面板
+	 */
+	Map<Integer, List<SysPanelOpt>> panelList();
 
-    /**
-     * 初始化个人面板
-     */
-    void initPanelOpt();
+	/**
+	 * 初始化个人面板
+	 */
+	void initPanelOpt();
 
-    /**
-     * 保存 个人面板顺序配置
-     *
-     * @param sysPanelOpts
-     */
-    void savePanelOpt(List<SysPanelOpt> sysPanelOpts);
+	/**
+	 * 保存 个人面板顺序配置
+	 *
+	 * @param sysPanelOpts
+	 */
+	void savePanelOpt(List<SysPanelOpt> sysPanelOpts);
 }
diff --git a/len-sys/src/main/java/com/len/service/JobService.java b/len-sys/src/main/java/com/len/service/JobService.java
index b7d64fd..9ccffe7 100644
--- a/len-sys/src/main/java/com/len/service/JobService.java
+++ b/len-sys/src/main/java/com/len/service/JobService.java
@@ -6,32 +6,36 @@ import com.len.entity.SysJob;
 
 public interface JobService extends BaseService<SysJob> {
 
-    /**
-     * 更新
-     * @param job
-     * @return
-     */
-    public boolean updateJob(SysJob job);
-
-    /**
-     * 删除
-     * @param id
-     * @return
-     */
-    public boolean del(String id);
-
-    /**
-     * 启动任务
-     * @param id
-     * @return
-     */
-    public boolean startJob(String id);
-
-    /**
-     * 停止任务
-     * @param id
-     * @return
-     */
-    public boolean stopJob(String id);
+	/**
+	 * 更新
+	 *
+	 * @param job
+	 * @return
+	 */
+	public boolean updateJob(SysJob job);
+
+	/**
+	 * 删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	public boolean del(String id);
+
+	/**
+	 * 启动任务
+	 *
+	 * @param id
+	 * @return
+	 */
+	public boolean startJob(String id);
+
+	/**
+	 * 停止任务
+	 *
+	 * @param id
+	 * @return
+	 */
+	public boolean stopJob(String id);
 
 }
diff --git a/len-sys/src/main/java/com/len/service/MenuService.java b/len-sys/src/main/java/com/len/service/MenuService.java
index 7009d27..aa9bd17 100644
--- a/len-sys/src/main/java/com/len/service/MenuService.java
+++ b/len-sys/src/main/java/com/len/service/MenuService.java
@@ -1,65 +1,65 @@
 package com.len.service;
 
-import java.util.List;
-
 import com.alibaba.fastjson.JSONArray;
 import com.len.base.BaseService;
 import com.len.entity.SysMenu;
 
+import java.util.List;
+
 
 public interface MenuService extends BaseService<SysMenu> {
 
-    /**
-     * 添加菜单
-     * 
-     * @param menu
-     * @return
-     */
-    String addMenu(SysMenu menu);
+	/**
+	 * 添加菜单
+	 *
+	 * @param menu
+	 * @return
+	 */
+	String addMenu(SysMenu menu);
 
-    List<SysMenu> getMenuNotSuper();
+	List<SysMenu> getMenuNotSuper();
 
-    List<SysMenu> getMenuChildren(String id);
+	List<SysMenu> getMenuChildren(String id);
 
-    JSONArray getMenuJsonList();
+	JSONArray getMenuJsonList();
 
-    List<SysMenu> getMenuChildrenAll(String id);
+	List<SysMenu> getMenuChildrenAll(String id);
 
-    JSONArray getTreeUtil(String roleId);
+	JSONArray getTreeUtil(String roleId);
 
-    List<SysMenu> getUserMenu(String id);
+	List<SysMenu> getUserMenu(String id);
 
-    JSONArray getMenuJsonByUser(List<SysMenu> menuList);
+	JSONArray getMenuJsonByUser(List<SysMenu> menuList);
 
-    boolean del(String id);
+	boolean del(String id);
 
-    /**
-     * 快捷菜单 获取用户列表
-     * 
-     * @return
-     */
-    List<SysMenu> getShortCuts();
+	/**
+	 * 快捷菜单 获取用户列表
+	 *
+	 * @return
+	 */
+	List<SysMenu> getShortCuts();
 
-    /**
-     * 快捷菜单 添加
-     * 
-     * @param code 菜单编码
-     * @return
-     */
-    SysMenu addShortCuts(String code);
+	/**
+	 * 快捷菜单 添加
+	 *
+	 * @param code 菜单编码
+	 * @return
+	 */
+	SysMenu addShortCuts(String code);
 
-    /**
-     * 快捷菜单 根据当前员工删除
-     * 
-     * @param code 菜单编码
-     */
-    void delShortcuts(String code);
+	/**
+	 * 快捷菜单 根据当前员工删除
+	 *
+	 * @param code 菜单编码
+	 */
+	void delShortcuts(String code);
 
-    /**
-     * 快捷菜单 重排序
-     * 
-     * @param codeList
-     */
-    void sortShortCuts(List<String> codeList);
+	/**
+	 * 快捷菜单 重排序
+	 *
+	 * @param codeList
+	 */
+	void sortShortCuts(List<String> codeList);
 
 }
diff --git a/len-sys/src/main/java/com/len/service/RoleMenuService.java b/len-sys/src/main/java/com/len/service/RoleMenuService.java
index fe1d9e3..6870d86 100644
--- a/len-sys/src/main/java/com/len/service/RoleMenuService.java
+++ b/len-sys/src/main/java/com/len/service/RoleMenuService.java
@@ -8,9 +8,9 @@ import java.util.List;
 
 public interface RoleMenuService extends BaseService<SysRoleMenu> {
 
-    List<SysRoleMenu> selectByCondition(SysRoleMenu sysRoleMenu);
+	List<SysRoleMenu> selectByCondition(SysRoleMenu sysRoleMenu);
 
-    int selectCountByCondition(SysRoleMenu sysRoleMenu);
+	int selectCountByCondition(SysRoleMenu sysRoleMenu);
 
-    int deleteByPrimaryKey(SysRoleMenu sysRoleMenu);
+	int deleteByPrimaryKey(SysRoleMenu sysRoleMenu);
 }
diff --git a/len-sys/src/main/java/com/len/service/RoleService.java b/len-sys/src/main/java/com/len/service/RoleService.java
index 4efea64..b82846b 100644
--- a/len-sys/src/main/java/com/len/service/RoleService.java
+++ b/len-sys/src/main/java/com/len/service/RoleService.java
@@ -7,9 +7,9 @@ import com.len.entity.SysRole;
 public interface RoleService extends BaseService<SysRole> {
 
 
-    void addRole(SysRole sysRole, String[] menus);
+	void addRole(SysRole sysRole, String[] menus);
 
-    void updateUser(SysRole role, String[] menus);
+	void updateUser(SysRole role, String[] menus);
 
-    void del(String id);
+	void del(String id);
 }
diff --git a/len-sys/src/main/java/com/len/service/SysUserService.java b/len-sys/src/main/java/com/len/service/SysUserService.java
index b8c88c0..1645938 100644
--- a/len-sys/src/main/java/com/len/service/SysUserService.java
+++ b/len-sys/src/main/java/com/len/service/SysUserService.java
@@ -11,56 +11,56 @@ import java.util.List;
 
 public interface SysUserService extends BaseService<SysUser> {
 
-    SysUser login(String username);
+	SysUser login(String username);
 
-    /**
-     * 新增用户和用户角色信息
-     *
-     * @param user 用户对象
-     * @param role 角色列表
-     * @return
-     */
-    boolean add(SysUser user, List<String> role);
+	/**
+	 * 新增用户和用户角色信息
+	 *
+	 * @param user 用户对象
+	 * @param role 角色列表
+	 * @return
+	 */
+	boolean add(SysUser user, List<String> role);
 
-    /**
-     * 更新用户和用户角色信息
-     *
-     * @param user
-     * @param role
-     * @return
-     */
-    boolean updateUser(SysUser user, List<String> role);
+	/**
+	 * 更新用户和用户角色信息
+	 *
+	 * @param user
+	 * @param role
+	 * @return
+	 */
+	boolean updateUser(SysUser user, List<String> role);
 
-    /**
-     * 删除
-     *
-     * @param id
-     * @return
-     */
-    boolean delById(String id, boolean flag);
+	/**
+	 * 删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	boolean delById(String id, boolean flag);
 
-    int checkUser(String username);
+	int checkUser(String username);
 
 
-    List<SysRoleUser> selectByCondition(SysRoleUser sysRoleUser);
+	List<SysRoleUser> selectByCondition(SysRoleUser sysRoleUser);
 
-    List<Checkbox> getUserRoleList(String id);
+	List<Checkbox> getUserRoleList(String id);
 
-    /**
-     * 更新密码
-     *
-     * @param id     用户id
-     * @param newPwd 新密码
-     * @return
-     */
-    int rePass(String id, String newPwd);
+	/**
+	 * 更新密码
+	 *
+	 * @param id     用户id
+	 * @param newPwd 新密码
+	 * @return
+	 */
+	int rePass(String id, String newPwd);
 
 
-    List<SysUser> getUserByRoleId(String roleId);
+	List<SysUser> getUserByRoleId(String roleId);
 
-    void setMenuAndRoles(String username);
+	void setMenuAndRoles(String username);
 
-    void updateCurrent(SysUser user);
+	void updateCurrent(SysUser user);
 
-    boolean updatePerson(SysUser user);
+	boolean updatePerson(SysUser user);
 }
diff --git a/len-sys/src/main/java/com/len/service/impl/DashboardServiceImpl.java b/len-sys/src/main/java/com/len/service/impl/DashboardServiceImpl.java
index f10d432..e4c93a7 100644
--- a/len-sys/src/main/java/com/len/service/impl/DashboardServiceImpl.java
+++ b/len-sys/src/main/java/com/len/service/impl/DashboardServiceImpl.java
@@ -1,86 +1,85 @@
 package com.len.service.impl;
 
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.len.core.shiro.Principal;
 import com.len.entity.SysPanelOpt;
 import com.len.enums.PanelEnum;
 import com.len.mapper.PanelOptMapper;
 import com.len.service.DashboardService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class DashboardServiceImpl implements DashboardService {
 
-    @Autowired
-    PanelOptMapper panelOptMapper;
+	@Autowired
+	PanelOptMapper panelOptMapper;
 
-    @Override
-    public Map<Integer, List<SysPanelOpt>> panelList() {
-        SysPanelOpt sysPanelOpt = new SysPanelOpt();
-        String userId = Principal.getPrincipal().getId();
-        sysPanelOpt.setPaneloptUserid(userId);
-        QueryWrapper<SysPanelOpt> queryWrapper = new QueryWrapper<>(sysPanelOpt);
-        List<SysPanelOpt> sysPanelOpts = panelOptMapper.selectList(queryWrapper);
-        if (sysPanelOpts.isEmpty()) {
-            // 初始化
-            initPanelOpt();
-            sysPanelOpts = panelOptMapper.selectList(queryWrapper);
-        }
-        sysPanelOpts.sort(Comparator.comparing(SysPanelOpt::getPaneloptIndex));
-        return sysPanelOpts.stream().sorted(Comparator.comparingInt(SysPanelOpt::getPaneloptColumn))
-                .collect(Collectors.groupingBy(SysPanelOpt::getPaneloptColumn));
-    }
+	@Override
+	public Map<Integer, List<SysPanelOpt>> panelList() {
+		SysPanelOpt sysPanelOpt = new SysPanelOpt();
+		String userId = Principal.getPrincipal().getId();
+		sysPanelOpt.setPaneloptUserid(userId);
+		QueryWrapper<SysPanelOpt> queryWrapper = new QueryWrapper<>(sysPanelOpt);
+		List<SysPanelOpt> sysPanelOpts = panelOptMapper.selectList(queryWrapper);
+		if (sysPanelOpts.isEmpty()) {
+			// 初始化
+			initPanelOpt();
+			sysPanelOpts = panelOptMapper.selectList(queryWrapper);
+		}
+		sysPanelOpts.sort(Comparator.comparing(SysPanelOpt::getPaneloptIndex));
+		return sysPanelOpts.stream().sorted(Comparator.comparingInt(SysPanelOpt::getPaneloptColumn))
+			.collect(Collectors.groupingBy(SysPanelOpt::getPaneloptColumn));
+	}
 
-    /**
-     * 初始化面板 </br>
-     * 默认 </br>
-     * column 0 index 0 dynamic;</br>
-     * column 1 index 0 shortcuts;</br>
-     * column 1 index 1 backlogs</br>
-     */
-    @Override
-    public void initPanelOpt() {
-        String userId = Principal.getPrincipal().getId();
-        SysPanelOpt sysPanelOpt = new SysPanelOpt();
-        sysPanelOpt.setPaneloptColumn(0);
-        sysPanelOpt.setPaneloptIndex(0);
-        sysPanelOpt.setPaneloptUserid(userId);
-        sysPanelOpt.setPaneloptCode(PanelEnum.DYNAMIC.name());
-        panelOptMapper.insert(sysPanelOpt);
+	/**
+	 * 初始化面板 </br>
+	 * 默认 </br>
+	 * column 0 index 0 dynamic;</br>
+	 * column 1 index 0 shortcuts;</br>
+	 * column 1 index 1 backlogs</br>
+	 */
+	@Override
+	public void initPanelOpt() {
+		String userId = Principal.getPrincipal().getId();
+		SysPanelOpt sysPanelOpt = new SysPanelOpt();
+		sysPanelOpt.setPaneloptColumn(0);
+		sysPanelOpt.setPaneloptIndex(0);
+		sysPanelOpt.setPaneloptUserid(userId);
+		sysPanelOpt.setPaneloptCode(PanelEnum.DYNAMIC.name());
+		panelOptMapper.insert(sysPanelOpt);
 
-        sysPanelOpt = new SysPanelOpt();
-        sysPanelOpt.setPaneloptColumn(1);
-        sysPanelOpt.setPaneloptIndex(0);
-        sysPanelOpt.setPaneloptUserid(userId);
-        sysPanelOpt.setPaneloptCode(PanelEnum.SHORTCUTS.name());
-        panelOptMapper.insert(sysPanelOpt);
+		sysPanelOpt = new SysPanelOpt();
+		sysPanelOpt.setPaneloptColumn(1);
+		sysPanelOpt.setPaneloptIndex(0);
+		sysPanelOpt.setPaneloptUserid(userId);
+		sysPanelOpt.setPaneloptCode(PanelEnum.SHORTCUTS.name());
+		panelOptMapper.insert(sysPanelOpt);
 
-        sysPanelOpt = new SysPanelOpt();
-        sysPanelOpt.setPaneloptColumn(1);
-        sysPanelOpt.setPaneloptIndex(1);
-        sysPanelOpt.setPaneloptUserid(userId);
-        sysPanelOpt.setPaneloptCode(PanelEnum.BACKLOG.name());
-        panelOptMapper.insert(sysPanelOpt);
+		sysPanelOpt = new SysPanelOpt();
+		sysPanelOpt.setPaneloptColumn(1);
+		sysPanelOpt.setPaneloptIndex(1);
+		sysPanelOpt.setPaneloptUserid(userId);
+		sysPanelOpt.setPaneloptCode(PanelEnum.BACKLOG.name());
+		panelOptMapper.insert(sysPanelOpt);
 
-    }
+	}
 
-    @Override
-    public void savePanelOpt(List<SysPanelOpt> sysPanelOpts) {
-        if (sysPanelOpts == null) {
-            return;
-        }
-        String userId = Principal.getPrincipal().getId();
-        for (SysPanelOpt panelOpt : sysPanelOpts) {
-            panelOpt.setPaneloptUserid(userId);
-            panelOptMapper.updateById(panelOpt);
-        }
+	@Override
+	public void savePanelOpt(List<SysPanelOpt> sysPanelOpts) {
+		if (sysPanelOpts == null) {
+			return;
+		}
+		String userId = Principal.getPrincipal().getId();
+		for (SysPanelOpt panelOpt : sysPanelOpts) {
+			panelOpt.setPaneloptUserid(userId);
+			panelOptMapper.updateById(panelOpt);
+		}
 
-    }
+	}
 }
diff --git a/len-sys/src/main/java/com/len/service/impl/EmployeeServiceImpl.java b/len-sys/src/main/java/com/len/service/impl/EmployeeServiceImpl.java
index 2b673af..7a98ffb 100644
--- a/len-sys/src/main/java/com/len/service/impl/EmployeeServiceImpl.java
+++ b/len-sys/src/main/java/com/len/service/impl/EmployeeServiceImpl.java
@@ -1,11 +1,10 @@
 package com.len.service.impl;
 
-import org.springframework.stereotype.Service;
-
 import com.len.base.impl.BaseServiceImpl;
 import com.len.entity.SysEmployee;
 import com.len.mapper.SysEmployeeMapper;
 import com.len.service.EmployeeService;
+import org.springframework.stereotype.Service;
 
 /**
  * 员工 service
diff --git a/len-sys/src/main/java/com/len/service/impl/JobServiceImpl.java b/len-sys/src/main/java/com/len/service/impl/JobServiceImpl.java
index eb2861c..f8bc33e 100644
--- a/len-sys/src/main/java/com/len/service/impl/JobServiceImpl.java
+++ b/len-sys/src/main/java/com/len/service/impl/JobServiceImpl.java
@@ -21,64 +21,64 @@ import org.springframework.stereotype.Service;
 @Slf4j
 public class JobServiceImpl extends BaseServiceImpl<SysJobMapper, SysJob> implements JobService {
 
-    @Autowired
-    SysJobMapper jobMapper;
+	@Autowired
+	SysJobMapper jobMapper;
 
-    @Autowired
-    JobTask jobTask;
+	@Autowired
+	JobTask jobTask;
 
 
-    @Override
-    public boolean updateJob(SysJob job) {
-        try {
-            SysJob oldJob = getById(job.getId());
-            BeanUtil.copyNotNullBean(job, oldJob);
-            updateById(oldJob);
-            return true;
-        } catch (LenException e) {
-            log.error(e.getMessage());
-            return false;
-        }
-    }
+	@Override
+	public boolean updateJob(SysJob job) {
+		try {
+			SysJob oldJob = getById(job.getId());
+			BeanUtil.copyNotNullBean(job, oldJob);
+			updateById(oldJob);
+			return true;
+		} catch (LenException e) {
+			log.error(e.getMessage());
+			return false;
+		}
+	}
 
-    @Override
-    public boolean del(String id) {
-        ValidatorUtils.notEmpty(id, "failed.get.data");
-        SysJob job = getById(id);
-        boolean flag = jobTask.checkJob(job);
-        if ((flag && !job.getStatus()) || !flag && job.getStatus()) {
-            throw new ServiceException(MsHelper.getMsg("job.status.error"));
-        }
-        if (flag) {
-            throw new ServiceException(MsHelper.getMsg("job.started"));
-        }
-        return removeById(id);
-    }
+	@Override
+	public boolean del(String id) {
+		ValidatorUtils.notEmpty(id, "failed.get.data");
+		SysJob job = getById(id);
+		boolean flag = jobTask.checkJob(job);
+		if ((flag && !job.getStatus()) || !flag && job.getStatus()) {
+			throw new ServiceException(MsHelper.getMsg("job.status.error"));
+		}
+		if (flag) {
+			throw new ServiceException(MsHelper.getMsg("job.started"));
+		}
+		return removeById(id);
+	}
 
-    @Override
-    public boolean startJob(String id) {
-        SysJob job = getById(id);
-        try {
-            jobTask.startJob(job);
-        } catch (Exception e) {
-            e.printStackTrace();
-            String errorMsg = MsHelper.getMsg("system.error");
-            if (e instanceof ClassNotFoundException) {
-                errorMsg = String.format(MsHelper.getMsg("job.notfound.class"), job.getClazzPath());
-            }
-            throw new ServiceException(errorMsg);
-        }
-        job.setStatus(true);
-        updateById(job);
-        return true;
-    }
+	@Override
+	public boolean startJob(String id) {
+		SysJob job = getById(id);
+		try {
+			jobTask.startJob(job);
+		} catch (Exception e) {
+			e.printStackTrace();
+			String errorMsg = MsHelper.getMsg("system.error");
+			if (e instanceof ClassNotFoundException) {
+				errorMsg = String.format(MsHelper.getMsg("job.notfound.class"), job.getClazzPath());
+			}
+			throw new ServiceException(errorMsg);
+		}
+		job.setStatus(true);
+		updateById(job);
+		return true;
+	}
 
-    @Override
-    public boolean stopJob(String id) {
-        SysJob job = getById(id);
-        jobTask.remove(job);
-        job.setStatus(false);
-        updateById(job);
-        return true;
-    }
+	@Override
+	public boolean stopJob(String id) {
+		SysJob job = getById(id);
+		jobTask.remove(job);
+		job.setStatus(false);
+		updateById(job);
+		return true;
+	}
 }
diff --git a/len-sys/src/main/java/com/len/service/impl/MenuServiceImpl.java b/len-sys/src/main/java/com/len/service/impl/MenuServiceImpl.java
index 0f2d551..7efc172 100644
--- a/len-sys/src/main/java/com/len/service/impl/MenuServiceImpl.java
+++ b/len-sys/src/main/java/com/len/service/impl/MenuServiceImpl.java
@@ -1,14 +1,6 @@
 package com.len.service.impl;
 
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.len.base.impl.BaseServiceImpl;
@@ -27,8 +19,14 @@ import com.len.util.MsHelper;
 import com.len.util.TreeUtil;
 import com.len.util.UuidUtil;
 import com.len.validator.ValidatorUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
-import cn.hutool.core.util.RandomUtil;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 菜单 service
@@ -36,257 +34,255 @@ import cn.hutool.core.util.RandomUtil;
 @Service
 public class MenuServiceImpl extends BaseServiceImpl<SysMenuMapper, SysMenu> implements MenuService {
 
-    static SysMenuMapper menuDao;
-
-    @Autowired
-    private ShortcutsMapper shortcutsMapper;
-
-    public MenuServiceImpl(SysMenuMapper menuDao) {
-        MenuServiceImpl.menuDao = menuDao;
-    }
+	static SysMenuMapper menuDao;
 
-    @Autowired
-    private SysRoleMenuMapper roleMenuMapper;
+	@Autowired
+	private ShortcutsMapper shortcutsMapper;
+	@Autowired
+	private SysRoleMenuMapper roleMenuMapper;
+	@Autowired
+	private RoleMenuService roleMenuService;
 
-    @Autowired
-    private RoleMenuService roleMenuService;
+	public MenuServiceImpl(SysMenuMapper menuDao) {
+		MenuServiceImpl.menuDao = menuDao;
+	}
 
-    @Override
-    public String addMenu(SysMenu sysMenu) {
-        if (StringUtils.isEmpty(sysMenu.getPId())) {
-            sysMenu.setPId(null);
-        }
-        if (StringUtils.isEmpty(sysMenu.getUrl())) {
-            sysMenu.setUrl(null);
-        }
-        if (StringUtils.isEmpty(sysMenu.getPermission())) {
-            sysMenu.setPermission(null);
-        }
-        if (sysMenu.getMenuType() == 2) {
-            sysMenu.setMenuType((byte)0);
-        }
-        sysMenu.setCode(randomCode());
-        save(sysMenu);
-        return "";
-    }
+	/**
+	 * 获取菜单编码
+	 *
+	 * @return 6位数 数字随机编码
+	 */
+	public static String randomCode() {
+		SysMenu sysMenu = new SysMenu();
+		boolean exists = true;
+		String code = null;
+		while (exists) {
+			code = RandomUtil.randomNumbers(4);
+			sysMenu.setCode(code);
+			QueryWrapper<SysMenu> queryWrapper = new QueryWrapper<>(sysMenu);
+			exists = menuDao.selectCount(queryWrapper) > 0;
+		}
+		return code;
+	}
 
-    @Override
-    public List<SysMenu> getMenuNotSuper() {
-        return menuDao.getMenuNotSuper();
-    }
+	@Override
+	public String addMenu(SysMenu sysMenu) {
+		if (StringUtils.isEmpty(sysMenu.getPId())) {
+			sysMenu.setPId(null);
+		}
+		if (StringUtils.isEmpty(sysMenu.getUrl())) {
+			sysMenu.setUrl(null);
+		}
+		if (StringUtils.isEmpty(sysMenu.getPermission())) {
+			sysMenu.setPermission(null);
+		}
+		if (sysMenu.getMenuType() == 2) {
+			sysMenu.setMenuType((byte) 0);
+		}
+		sysMenu.setCode(randomCode());
+		save(sysMenu);
+		return "";
+	}
 
-    @Override
-    public List<SysMenu> getMenuChildren(String id) {
-        return menuDao.getMenuChildren(id);
-    }
+	@Override
+	public List<SysMenu> getMenuNotSuper() {
+		return menuDao.getMenuNotSuper();
+	}
 
-    public SysMenu child(SysMenu sysMenu, List<SysMenu> sysMenus, Integer num) {
-        List<SysMenu> childSysMenu =
-            sysMenus.stream().filter(s -> s.getPId().equals(sysMenu.getId())).collect(Collectors.toList());
-        sysMenus.removeAll(childSysMenu);
-        for (SysMenu menu : childSysMenu) {
-            ++num;
-            child(menu, sysMenus, num);
-            sysMenu.addChild(menu);
-        }
-        return sysMenu;
-    }
+	@Override
+	public List<SysMenu> getMenuChildren(String id) {
+		return menuDao.getMenuChildren(id);
+	}
 
-    @Override
-    public JSONArray getMenuJsonList() {
-        List<SysMenu> sysMenus = list();
-        List<SysMenu> supers =
-            sysMenus.stream().filter(sysMenu -> StringUtils.isEmpty(sysMenu.getPId())).collect(Collectors.toList());
-        sysMenus.removeAll(supers);
-        supers.sort(Comparator.comparingInt(SysMenu::getOrderNum));
-        JSONArray jsonArr = new JSONArray();
-        for (SysMenu sysMenu : supers) {
-            SysMenu child = child(sysMenu, sysMenus, 0);
-            jsonArr.add(child);
-        }
-        return jsonArr;
-    }
+	public SysMenu child(SysMenu sysMenu, List<SysMenu> sysMenus, Integer num) {
+		List<SysMenu> childSysMenu =
+			sysMenus.stream().filter(s -> s.getPId().equals(sysMenu.getId())).collect(Collectors.toList());
+		sysMenus.removeAll(childSysMenu);
+		for (SysMenu menu : childSysMenu) {
+			++num;
+			child(menu, sysMenus, num);
+			sysMenu.addChild(menu);
+		}
+		return sysMenu;
+	}
 
-    @Override
-    public JSONArray getMenuJsonByUser(List<SysMenu> menuList) {
-        JSONArray jsonArr = new JSONArray();
-        menuList.sort((o1, o2) -> {
-            if (o1.getOrderNum() == null || o2.getOrderNum() == null) {
-                return -1;
-            }
-            if (o1.getOrderNum() > o2.getOrderNum()) {
-                return 1;
-            }
-            if (o1.getOrderNum().equals(o2.getOrderNum())) {
-                return 0;
-            }
-            return -1;
-        });
-        for (SysMenu menu : menuList) {
-            if (StringUtils.isEmpty(menu.getPId())) {
-                SysMenu sysMenu = getChilds(menu, menuList);
-                jsonArr.add(sysMenu);
-            }
-        }
-        return jsonArr;
-    }
+	@Override
+	public JSONArray getMenuJsonList() {
+		List<SysMenu> sysMenus = list();
+		List<SysMenu> supers =
+			sysMenus.stream().filter(sysMenu -> StringUtils.isEmpty(sysMenu.getPId())).collect(Collectors.toList());
+		sysMenus.removeAll(supers);
+		supers.sort(Comparator.comparingInt(SysMenu::getOrderNum));
+		JSONArray jsonArr = new JSONArray();
+		for (SysMenu sysMenu : supers) {
+			SysMenu child = child(sysMenu, sysMenus, 0);
+			jsonArr.add(child);
+		}
+		return jsonArr;
+	}
 
-    @Override
-    public boolean del(String id) {
-        ValidatorUtils.notEmpty(id, "failed.get.data");
-        SysRoleMenu sysRoleMenu = new SysRoleMenu();
-        sysRoleMenu.setMenuId(id);
-        QueryWrapper<SysRoleMenu> sysRoleMenuQueryWrapper = new QueryWrapper<>(sysRoleMenu);
-        int count = roleMenuService.count(sysRoleMenuQueryWrapper);
-        // 存在角色绑定不能删除
-        if (count > 0) {
-            throw new ServiceException(MsHelper.getMsg("menu.bind.role"));
-        }
-        // 存在下级菜单 不能解除
-        SysMenu sysMenu = new SysMenu();
-        sysMenu.setPId(id);
-        QueryWrapper<SysMenu> sysRoleMenuQueryWrapperTwo = new QueryWrapper<>(sysMenu);
-        if (menuDao.selectCount(sysRoleMenuQueryWrapperTwo) > 0) {
-            throw new ServiceException(MsHelper.getMsg("menu.exists.children"));
-        }
-        return removeById(id);
-    }
+	@Override
+	public JSONArray getMenuJsonByUser(List<SysMenu> menuList) {
+		JSONArray jsonArr = new JSONArray();
+		menuList.sort((o1, o2) -> {
+			if (o1.getOrderNum() == null || o2.getOrderNum() == null) {
+				return -1;
+			}
+			if (o1.getOrderNum() > o2.getOrderNum()) {
+				return 1;
+			}
+			if (o1.getOrderNum().equals(o2.getOrderNum())) {
+				return 0;
+			}
+			return -1;
+		});
+		for (SysMenu menu : menuList) {
+			if (StringUtils.isEmpty(menu.getPId())) {
+				SysMenu sysMenu = getChilds(menu, menuList);
+				jsonArr.add(sysMenu);
+			}
+		}
+		return jsonArr;
+	}
 
-    @Override
-    public List<SysMenu> getShortCuts() {
-        return menuDao.getUserShortCuts(Principal.getPrincipal().getId());
-    }
+	@Override
+	public boolean del(String id) {
+		ValidatorUtils.notEmpty(id, "failed.get.data");
+		SysRoleMenu sysRoleMenu = new SysRoleMenu();
+		sysRoleMenu.setMenuId(id);
+		QueryWrapper<SysRoleMenu> sysRoleMenuQueryWrapper = new QueryWrapper<>(sysRoleMenu);
+		int count = roleMenuService.count(sysRoleMenuQueryWrapper);
+		// 存在角色绑定不能删除
+		if (count > 0) {
+			throw new ServiceException(MsHelper.getMsg("menu.bind.role"));
+		}
+		// 存在下级菜单 不能解除
+		SysMenu sysMenu = new SysMenu();
+		sysMenu.setPId(id);
+		QueryWrapper<SysMenu> sysRoleMenuQueryWrapperTwo = new QueryWrapper<>(sysMenu);
+		if (menuDao.selectCount(sysRoleMenuQueryWrapperTwo) > 0) {
+			throw new ServiceException(MsHelper.getMsg("menu.exists.children"));
+		}
+		return removeById(id);
+	}
 
-    @Override
-    public SysMenu addShortCuts(String code) {
-        String userId = Principal.getPrincipal().getId();
-        Integer maxNum = menuDao.getMaxNum(userId);
-        maxNum = maxNum == null ? 0 : maxNum;
-        SysMenu menu = getMenuBNyCode(code);
-        SysShortcuts shortcuts = new SysShortcuts();
-        shortcuts.setId(UuidUtil.getUuid());
-        shortcuts.setShortcutsMenuid(menu.getId());
-        shortcuts.setShortcutsNum(maxNum + 1);
-        shortcuts.setShortcutsUserid(userId);
-        shortcuts.setCreateBy(userId);
-        shortcuts.setCreateDate(new Date());
-        shortcutsMapper.insert(shortcuts);
-        return menu;
-    }
+	@Override
+	public List<SysMenu> getShortCuts() {
+		return menuDao.getUserShortCuts(Principal.getPrincipal().getId());
+	}
 
-    private SysMenu getMenuBNyCode(String code) {
-        SysMenu menu = new SysMenu();
-        menu.setCode(code);
-        QueryWrapper<SysMenu> queryWrapper = new QueryWrapper<>(menu);
-        menu = menuDao.selectOne(queryWrapper);
-        if (menu == null) {
-            throw new LenException("菜单不存在！");
-        }
-        return menu;
-    }
+	@Override
+	public SysMenu addShortCuts(String code) {
+		String userId = Principal.getPrincipal().getId();
+		Integer maxNum = menuDao.getMaxNum(userId);
+		maxNum = maxNum == null ? 0 : maxNum;
+		SysMenu menu = getMenuBNyCode(code);
+		SysShortcuts shortcuts = new SysShortcuts();
+		shortcuts.setId(UuidUtil.getUuid());
+		shortcuts.setShortcutsMenuid(menu.getId());
+		shortcuts.setShortcutsNum(maxNum + 1);
+		shortcuts.setShortcutsUserid(userId);
+		shortcuts.setCreateBy(userId);
+		shortcuts.setCreateDate(new Date());
+		shortcutsMapper.insert(shortcuts);
+		return menu;
+	}
 
-    @Override
-    public void delShortcuts(String code) {
-        SysMenu menu = getMenuBNyCode(code);
-        SysShortcuts shortcuts = new SysShortcuts();
-        shortcuts.setShortcutsUserid(Principal.getPrincipal().getId());
-        shortcuts.setShortcutsMenuid(menu.getId());
-        QueryWrapper<SysShortcuts> queryWrapper = new QueryWrapper<>(shortcuts);
-        shortcutsMapper.delete(queryWrapper);
-    }
+	private SysMenu getMenuBNyCode(String code) {
+		SysMenu menu = new SysMenu();
+		menu.setCode(code);
+		QueryWrapper<SysMenu> queryWrapper = new QueryWrapper<>(menu);
+		menu = menuDao.selectOne(queryWrapper);
+		if (menu == null) {
+			throw new LenException("菜单不存在！");
+		}
+		return menu;
+	}
 
-    @Override
-    public void sortShortCuts(List<String> shortCutsIds) {
-        int i = 0;
-        for (String shortcutsId : shortCutsIds) {
-            SysShortcuts shortcuts = new SysShortcuts();
-            shortcuts.setId(shortcutsId);
-            shortcuts.setShortcutsNum(i);
-            shortcutsMapper.updateById(shortcuts);
-            i++;
-        }
+	@Override
+	public void delShortcuts(String code) {
+		SysMenu menu = getMenuBNyCode(code);
+		SysShortcuts shortcuts = new SysShortcuts();
+		shortcuts.setShortcutsUserid(Principal.getPrincipal().getId());
+		shortcuts.setShortcutsMenuid(menu.getId());
+		QueryWrapper<SysShortcuts> queryWrapper = new QueryWrapper<>(shortcuts);
+		shortcutsMapper.delete(queryWrapper);
+	}
 
-    }
+	@Override
+	public void sortShortCuts(List<String> shortCutsIds) {
+		int i = 0;
+		for (String shortcutsId : shortCutsIds) {
+			SysShortcuts shortcuts = new SysShortcuts();
+			shortcuts.setId(shortcutsId);
+			shortcuts.setShortcutsNum(i);
+			shortcutsMapper.updateById(shortcuts);
+			i++;
+		}
 
-    public SysMenu getChilds(SysMenu menu, List<SysMenu> menuList) {
-        for (SysMenu menus : menuList) {
-            if (menu.getId().equals(menus.getPId()) && menus.getMenuType() == 0) {
-                SysMenu m = getChilds(menus, menuList);
-                menu.addChild(m);
-            }
-        }
-        return menu;
-    }
+	}
 
-    @Override
-    public List<SysMenu> getMenuChildrenAll(String id) {
-        return menuDao.getMenuChildrenAll(id);
-    }
+	public SysMenu getChilds(SysMenu menu, List<SysMenu> menuList) {
+		for (SysMenu menus : menuList) {
+			if (menu.getId().equals(menus.getPId()) && menus.getMenuType() == 0) {
+				SysMenu m = getChilds(menus, menuList);
+				menu.addChild(m);
+			}
+		}
+		return menu;
+	}
 
-    @Override
-    public JSONArray getTreeUtil(String roleId) {
-        TreeUtil treeUtil;
-        List<SysMenu> sysMenus = list();
-        List<SysMenu> supers =
-            sysMenus.stream().filter(sysMenu -> StringUtils.isEmpty(sysMenu.getPId())).collect(Collectors.toList());
-        sysMenus.removeAll(supers);
-        supers.sort(Comparator.comparingInt(SysMenu::getOrderNum));
-        JSONArray jsonArr = new JSONArray();
-        for (SysMenu sysMenu : supers) {
-            treeUtil = getChildByTree(sysMenu, sysMenus, 0, null, roleId);
-            jsonArr.add(treeUtil);
-        }
-        return jsonArr;
+	@Override
+	public List<SysMenu> getMenuChildrenAll(String id) {
+		return menuDao.getMenuChildrenAll(id);
+	}
 
-    }
+	@Override
+	public JSONArray getTreeUtil(String roleId) {
+		TreeUtil treeUtil;
+		List<SysMenu> sysMenus = list();
+		List<SysMenu> supers =
+			sysMenus.stream().filter(sysMenu -> StringUtils.isEmpty(sysMenu.getPId())).collect(Collectors.toList());
+		sysMenus.removeAll(supers);
+		supers.sort(Comparator.comparingInt(SysMenu::getOrderNum));
+		JSONArray jsonArr = new JSONArray();
+		for (SysMenu sysMenu : supers) {
+			treeUtil = getChildByTree(sysMenu, sysMenus, 0, null, roleId);
+			jsonArr.add(treeUtil);
+		}
+		return jsonArr;
 
-    @Override
-    public List<SysMenu> getUserMenu(String id) {
-        return menuDao.getUserMenu(id);
-    }
+	}
 
-    private TreeUtil getChildByTree(SysMenu sysMenu, List<SysMenu> sysMenus, int layer, String pId, String roleId) {
-        layer++;
-        List<SysMenu> childSysMenu =
-            sysMenus.stream().filter(s -> s.getPId().equals(sysMenu.getId())).collect(Collectors.toList());
-        sysMenus.removeAll(childSysMenu);
-        TreeUtil treeUtil = new TreeUtil();
-        treeUtil.setId(sysMenu.getId());
-        treeUtil.setName(sysMenu.getName());
-        treeUtil.setLayer(layer);
-        treeUtil.setPId(pId);
-        /*判断是否存在*/
-        if (!StringUtils.isEmpty(roleId)) {
-            SysRoleMenu sysRoleMenu = new SysRoleMenu();
-            sysRoleMenu.setMenuId(sysMenu.getId());
-            sysRoleMenu.setRoleId(roleId);
-            int count = roleMenuMapper.selectCountByCondition(sysRoleMenu);
-            if (count > 0) {
-                treeUtil.setChecked(true);
-            }
-        }
-        for (SysMenu menu : childSysMenu) {
-            TreeUtil m = getChildByTree(menu, sysMenus, layer, menu.getId(), roleId);
-            treeUtil.getChildren().add(m);
-        }
-        return treeUtil;
-    }
+	@Override
+	public List<SysMenu> getUserMenu(String id) {
+		return menuDao.getUserMenu(id);
+	}
 
-    /**
-     * 获取菜单编码
-     * 
-     * @return 6位数 数字随机编码
-     */
-    public static String randomCode() {
-        SysMenu sysMenu = new SysMenu();
-        boolean exists = true;
-        String code = null;
-        while (exists) {
-            code = RandomUtil.randomNumbers(4);
-            sysMenu.setCode(code);
-            QueryWrapper<SysMenu> queryWrapper = new QueryWrapper<>(sysMenu);
-            exists = menuDao.selectCount(queryWrapper) > 0;
-        }
-        return code;
-    }
+	private TreeUtil getChildByTree(SysMenu sysMenu, List<SysMenu> sysMenus, int layer, String pId, String roleId) {
+		layer++;
+		List<SysMenu> childSysMenu =
+			sysMenus.stream().filter(s -> s.getPId().equals(sysMenu.getId())).collect(Collectors.toList());
+		sysMenus.removeAll(childSysMenu);
+		TreeUtil treeUtil = new TreeUtil();
+		treeUtil.setId(sysMenu.getId());
+		treeUtil.setName(sysMenu.getName());
+		treeUtil.setLayer(layer);
+		treeUtil.setPId(pId);
+		/*判断是否存在*/
+		if (!StringUtils.isEmpty(roleId)) {
+			SysRoleMenu sysRoleMenu = new SysRoleMenu();
+			sysRoleMenu.setMenuId(sysMenu.getId());
+			sysRoleMenu.setRoleId(roleId);
+			int count = roleMenuMapper.selectCountByCondition(sysRoleMenu);
+			if (count > 0) {
+				treeUtil.setChecked(true);
+			}
+		}
+		for (SysMenu menu : childSysMenu) {
+			TreeUtil m = getChildByTree(menu, sysMenus, layer, menu.getId(), roleId);
+			treeUtil.getChildren().add(m);
+		}
+		return treeUtil;
+	}
 }
diff --git a/len-sys/src/main/java/com/len/service/impl/RoleMenuServiceImpl.java b/len-sys/src/main/java/com/len/service/impl/RoleMenuServiceImpl.java
index b6fb114..f96a20d 100644
--- a/len-sys/src/main/java/com/len/service/impl/RoleMenuServiceImpl.java
+++ b/len-sys/src/main/java/com/len/service/impl/RoleMenuServiceImpl.java
@@ -15,24 +15,24 @@ import java.util.List;
  */
 @Service
 public class RoleMenuServiceImpl extends BaseServiceImpl<SysRoleMenuMapper, SysRoleMenu> implements
-        RoleMenuService {
+	RoleMenuService {
 
-    @Autowired
-    private SysRoleMenuMapper roleMenuMapper;
+	@Autowired
+	private SysRoleMenuMapper roleMenuMapper;
 
-    @Override
-    public List<SysRoleMenu> selectByCondition(SysRoleMenu sysRoleMenu) {
-        return roleMenuMapper.selectByCondition(sysRoleMenu);
-    }
+	@Override
+	public List<SysRoleMenu> selectByCondition(SysRoleMenu sysRoleMenu) {
+		return roleMenuMapper.selectByCondition(sysRoleMenu);
+	}
 
-    @Override
-    public int selectCountByCondition(SysRoleMenu sysRoleMenu) {
-        return roleMenuMapper.selectCountByCondition(sysRoleMenu);
-    }
+	@Override
+	public int selectCountByCondition(SysRoleMenu sysRoleMenu) {
+		return roleMenuMapper.selectCountByCondition(sysRoleMenu);
+	}
 
-    @Override
-    public int deleteByPrimaryKey(SysRoleMenu sysRoleMenu) {
-        QueryWrapper<SysRoleMenu> queryWrapper = new QueryWrapper<>(sysRoleMenu);
-        return roleMenuMapper.delete(queryWrapper);
-    }
+	@Override
+	public int deleteByPrimaryKey(SysRoleMenu sysRoleMenu) {
+		QueryWrapper<SysRoleMenu> queryWrapper = new QueryWrapper<>(sysRoleMenu);
+		return roleMenuMapper.delete(queryWrapper);
+	}
 }
diff --git a/len-sys/src/main/java/com/len/service/impl/RoleServiceImpl.java b/len-sys/src/main/java/com/len/service/impl/RoleServiceImpl.java
index c28f01a..9473e4a 100644
--- a/len-sys/src/main/java/com/len/service/impl/RoleServiceImpl.java
+++ b/len-sys/src/main/java/com/len/service/impl/RoleServiceImpl.java
@@ -26,62 +26,62 @@ import java.util.List;
 @Service
 public class RoleServiceImpl extends BaseServiceImpl<SysRoleMapper, SysRole> implements RoleService {
 
-    @Autowired
-    private SysRoleMapper roleMapper;
+	@Autowired
+	private SysRoleMapper roleMapper;
 
-    @Autowired
-    private RoleMenuService roleMenuService;
+	@Autowired
+	private RoleMenuService roleMenuService;
 
-    @Autowired
-    private RoleUserService roleUserService;
+	@Autowired
+	private RoleUserService roleUserService;
 
-    @Override
-    public void addRole(SysRole sysRole, String[] menus) {
-        ValidatorUtils.validateEntity(sysRole, AddGroup.class);
-        roleMapper.insert(sysRole);
-        // 操作role-menu data
-        if (menus != null) {
-            for (String menu : menus) {
-                SysRoleMenu sysRoleMenu = new SysRoleMenu();
-                sysRoleMenu.setRoleId(sysRole.getId());
-                sysRoleMenu.setMenuId(menu);
-                roleMenuService.save(sysRoleMenu);
-            }
-        }
-    }
+	@Override
+	public void addRole(SysRole sysRole, String[] menus) {
+		ValidatorUtils.validateEntity(sysRole, AddGroup.class);
+		roleMapper.insert(sysRole);
+		// 操作role-menu data
+		if (menus != null) {
+			for (String menu : menus) {
+				SysRoleMenu sysRoleMenu = new SysRoleMenu();
+				sysRoleMenu.setRoleId(sysRole.getId());
+				sysRoleMenu.setMenuId(menu);
+				roleMenuService.save(sysRoleMenu);
+			}
+		}
+	}
 
-    @Override
-    public void updateUser(SysRole role, String[] menus) {
-        LenResponse jsonUtil = new LenResponse();
-        jsonUtil.setFlag(false);
-        SysRole oldRole = roleMapper.selectById(role.getId());
-        BeanUtil.copyNotNullBean(role, oldRole);
-        roleMapper.updateById(oldRole);
+	@Override
+	public void updateUser(SysRole role, String[] menus) {
+		LenResponse jsonUtil = new LenResponse();
+		jsonUtil.setFlag(false);
+		SysRole oldRole = roleMapper.selectById(role.getId());
+		BeanUtil.copyNotNullBean(role, oldRole);
+		roleMapper.updateById(oldRole);
 
-        SysRoleMenu sysRoleMenu = new SysRoleMenu();
-        sysRoleMenu.setRoleId(role.getId());
-        List<SysRoleMenu> menuList = roleMenuService.selectByCondition(sysRoleMenu);
-        for (SysRoleMenu sysRoleMenu1 : menuList) {
-            roleMenuService.deleteByPrimaryKey(sysRoleMenu1);
-        }
-        if (menus != null) {
-            for (String menu : menus) {
-                sysRoleMenu.setMenuId(menu);
-                roleMenuService.save(sysRoleMenu);
-            }
-        }
-    }
+		SysRoleMenu sysRoleMenu = new SysRoleMenu();
+		sysRoleMenu.setRoleId(role.getId());
+		List<SysRoleMenu> menuList = roleMenuService.selectByCondition(sysRoleMenu);
+		for (SysRoleMenu sysRoleMenu1 : menuList) {
+			roleMenuService.deleteByPrimaryKey(sysRoleMenu1);
+		}
+		if (menus != null) {
+			for (String menu : menus) {
+				sysRoleMenu.setMenuId(menu);
+				roleMenuService.save(sysRoleMenu);
+			}
+		}
+	}
 
-    @Override
-    public void del(String id) {
-        ValidatorUtils.notEmpty(id, "failed.get.data");
-        SysRoleUser sysRoleUser = new SysRoleUser();
-        sysRoleUser.setRoleId(id);
-        QueryWrapper<SysRoleUser> wrapper = new QueryWrapper<>(sysRoleUser);
-        int count = roleUserService.count(wrapper);
-        if (count > 0) {
-            throw new ServiceException(MsHelper.getMsg("role.exists.user"));
-        }
-        roleMapper.deleteById(id);
-    }
+	@Override
+	public void del(String id) {
+		ValidatorUtils.notEmpty(id, "failed.get.data");
+		SysRoleUser sysRoleUser = new SysRoleUser();
+		sysRoleUser.setRoleId(id);
+		QueryWrapper<SysRoleUser> wrapper = new QueryWrapper<>(sysRoleUser);
+		int count = roleUserService.count(wrapper);
+		if (count > 0) {
+			throw new ServiceException(MsHelper.getMsg("role.exists.user"));
+		}
+		roleMapper.deleteById(id);
+	}
 }
diff --git a/len-sys/src/main/java/com/len/service/impl/RoleUserServiceImpl.java b/len-sys/src/main/java/com/len/service/impl/RoleUserServiceImpl.java
index 4fa7c0c..40d1c0c 100644
--- a/len-sys/src/main/java/com/len/service/impl/RoleUserServiceImpl.java
+++ b/len-sys/src/main/java/com/len/service/impl/RoleUserServiceImpl.java
@@ -1,11 +1,10 @@
 package com.len.service.impl;
 
-import org.springframework.stereotype.Service;
-
 import com.len.base.impl.BaseServiceImpl;
 import com.len.entity.SysRoleUser;
 import com.len.mapper.SysRoleUserMapper;
 import com.len.service.RoleUserService;
+import org.springframework.stereotype.Service;
 
 /**
  * 用户角色 service
diff --git a/len-sys/src/main/java/com/len/service/impl/SysUserServiceImpl.java b/len-sys/src/main/java/com/len/service/impl/SysUserServiceImpl.java
index 718d78a..e6030c3 100644
--- a/len-sys/src/main/java/com/len/service/impl/SysUserServiceImpl.java
+++ b/len-sys/src/main/java/com/len/service/impl/SysUserServiceImpl.java
@@ -1,17 +1,5 @@
 package com.len.service.impl;
 
-import static com.len.validator.ValidatorUtils.*;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.shiro.session.Session;
-import org.apache.shiro.subject.Subject;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.len.base.CurrentMenu;
@@ -33,6 +21,17 @@ import com.len.service.SysUserService;
 import com.len.util.*;
 import com.len.validator.ValidatorUtils;
 import com.len.validator.group.AddGroup;
+import org.apache.shiro.session.Session;
+import org.apache.shiro.subject.Subject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static com.len.validator.ValidatorUtils.*;
 
 /**
  * 账户 service
@@ -40,214 +39,209 @@ import com.len.validator.group.AddGroup;
 @Service
 public class SysUserServiceImpl extends BaseServiceImpl<SysUserMapper, SysUser> implements SysUserService {
 
-    @Autowired
-    SysUserMapper sysUserMapper;
-
-    @Autowired
-    SysRoleUserMapper sysRoleUserMapper;
-
-    @Autowired
-    RoleService roleService;
-
-    @Autowired
-    RoleUserService roleUserService;
-
-    @Autowired
-    MenuService menuService;
-
-    private static final String ADMIN = "admin";
-
-    @Override
-    public SysUser login(String username) {
-        return sysUserMapper.login(username);
-    }
-
-    @Override
-    public List<SysRoleUser> selectByCondition(SysRoleUser sysRoleUser) {
-        return sysRoleUserMapper.selectByCondition(sysRoleUser);
-    }
-
-    @Override
-    public int count() {
-        return sysUserMapper.count();
-    }
-
-    @Override
-    public boolean add(SysUser user, List<String> role) {
-        validateEntity(user, AddGroup.class);
-        notNull(role, "role.not.null");
-        int result = checkUser(user.getUsername());
-        if (result > 0) {
-            throw new ServiceException(MsHelper.getMsg("user.exists"));
-        }
-        // 密码加密
-        user.setPassword(Md5Util.getMD5(user.getPassword(), user.getUsername()));
-        boolean save = save(user);
-        SysRoleUser sysRoleUser = new SysRoleUser();
-        sysRoleUser.setUserId(user.getId());
-        for (String r : role) {
-            sysRoleUser.setRoleId(r);
-            roleUserService.save(sysRoleUser);
-        }
-        return save;
-    }
-
-    @Override
-    public boolean updateUser(SysUser user, List<String> role) {
-        SysUser oldUser = getById(user.getId());
-        BeanUtil.copyNotNullBean(user, oldUser);
-        updateById(oldUser);
-
-        SysRoleUser sysRoleUser = new SysRoleUser();
-        sysRoleUser.setUserId(oldUser.getId());
-        List<SysRoleUser> keyList = selectByCondition(sysRoleUser);
-        for (SysRoleUser currentRoleUser : keyList) {
-            QueryWrapper<SysRoleUser> queryWrapper = new QueryWrapper<>(currentRoleUser);
-            roleUserService.remove(queryWrapper);
-        }
-
-        if (role != null) {
-            for (String r : role) {
-                sysRoleUser.setRoleId(r);
-                roleUserService.save(sysRoleUser);
-            }
-        }
-        updateCurrent(user);
-        return true;
-    }
-
-    @Override
-    public boolean delById(String id, boolean realDel) {
-        notEmpty(id, "failed.get.data");
-        LenResponse j = new LenResponse();
-        SysUser sysUser = sysUserMapper.selectById(id);
-        if (ADMIN.equals(sysUser.getUsername())) {
-            throw new ServiceException(MsHelper.getMsg("user.del.admin"));
-        }
-        SysRoleUser roleUser = new SysRoleUser();
-        roleUser.setUserId(id);
-        QueryWrapper<SysRoleUser> wrapper = new QueryWrapper<>(roleUser);
-        int count = roleUserService.count(wrapper);
-        if (count > 0) {
-            throw new ServiceException(MsHelper.getMsg("user.bind.role"));
-        }
-        if (!realDel) {
-            // 逻辑
-            sysUser.setDelFlag(Byte.parseByte("1"));
-            sysUserMapper.updateById(sysUser);
-        } else {
-            // 物理
-            sysUserMapper.delById(id);
-        }
-        return true;
-    }
-
-    @Override
-    public int checkUser(String username) {
-        return sysUserMapper.checkUser(username);
-    }
-
-    @Override
-    public List<Checkbox> getUserRoleList(String id) {
-        List<SysRole> roleList = roleService.list();
-        SysRoleUser sysRoleUser = new SysRoleUser();
-        sysRoleUser.setUserId(id);
-        List<SysRoleUser> kList = selectByCondition(sysRoleUser);
-
-        List<Checkbox> checkboxList = new ArrayList<>();
-        Checkbox checkbox;
-        for (SysRole sysRole : roleList) {
-            checkbox = new Checkbox();
-            checkbox.setId(sysRole.getId());
-            checkbox.setName(sysRole.getRoleName());
-            for (SysRoleUser sysRoleUser1 : kList) {
-                if (sysRoleUser1.getRoleId().equals(sysRole.getId())) {
-                    checkbox.setCheck(true);
-                    break;
-                }
-            }
-            checkboxList.add(checkbox);
-        }
-        return checkboxList;
-    }
-
-    @Override
-    public int rePass(String id, String newPwd) {
-        ValidatorUtils.notEmpty(id, "failed.get.data");
-        ValidatorUtils.notEmpty(newPwd, "failed.get.data");
-        SysUser user = getById(id);
-        newPwd = Md5Util.getMD5(newPwd, user.getUsername());
-        if (newPwd.equals(user.getPassword())) {
-            throw new ServiceException("newpass.not.eq.oldpass");
-        }
-        user.setPassword(newPwd);
-        return sysUserMapper.rePass(user);
-    }
-
-    @Override
-    public List<SysUser> getUserByRoleId(String roleId) {
-        return sysUserMapper.getUserByRoleId(roleId);
-    }
-
-    @Override
-    public void setMenuAndRoles(String username) {
-        SysUser s = new SysUser();
-        s.setUsername(username);
-        QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>(s);
-        s = sysUserMapper.selectOne(userQueryWrapper);
-        CurrentUser currentUser = new CurrentUser(s.getId(), s.getUsername(), s.getAge(), s.getEmail(), s.getPhoto());
-        Subject subject = Principal.getSubject();
-        /*角色权限封装进去*/
-        // 根据用户获取菜单
-        Session session = subject.getSession();
-
-        List<SysMenu> menuList = menuService.getUserMenu(s.getId());
-        JSONArray menuArr = menuService.getMenuJsonByUser(menuList);
-        session.setAttribute("menu", menuArr);
-        session.setAttribute("menuArr", menuArr.toString());
-
-        List<CurrentMenu> currentMenuList = new ArrayList<>();
-        Set<SysRole> roleList = new HashSet<>();
-        for (SysMenu m : menuList) {
-            CurrentMenu currentMenu = new CurrentMenu();
-            BeanUtil.copyNotNullBean(m, currentMenu);
-            currentMenuList.add(currentMenu);
-            roleList.addAll(m.getRoleList());
-        }
-
-        List<CurrentRole> currentRoleList = new ArrayList<>();
-
-        for (SysRole r : roleList) {
-            CurrentRole role = new CurrentRole();
-            BeanUtil.copyNotNullBean(r, role);
-            currentRoleList.add(role);
-        }
-        currentUser.setCurrentRoleList(currentRoleList);
-        currentUser.setCurrentMenuList(currentMenuList);
-        session.setAttribute("currentPrincipal", currentUser);
-    }
-
-    /**
-     * 更新session头像
-     */
-    @Override
-    public void updateCurrent(SysUser sysUser) {
-        CurrentUser principal = Principal.getPrincipal();
-        if (principal.getId().equals(sysUser.getId())) {
-            // 当前用户
-            CurrentUser currentUse = Principal.getCurrentUse();
-            Session session = Principal.getSession();
-            currentUse.setPhoto(sysUser.getPhoto());
-            session.setAttribute("currentPrincipal", currentUse);
-        }
-    }
-
-    @Override
-    public boolean updatePerson(SysUser user) {
-        SysUser oldUser = getById(user.getId());
-        BeanUtil.copyNotNullBean(user, oldUser);
-        updateById(oldUser);
-        updateCurrent(user);
-        return true;
-    }
+	private static final String ADMIN = "admin";
+	@Autowired
+	SysUserMapper sysUserMapper;
+	@Autowired
+	SysRoleUserMapper sysRoleUserMapper;
+	@Autowired
+	RoleService roleService;
+	@Autowired
+	RoleUserService roleUserService;
+	@Autowired
+	MenuService menuService;
+
+	@Override
+	public SysUser login(String username) {
+		return sysUserMapper.login(username);
+	}
+
+	@Override
+	public List<SysRoleUser> selectByCondition(SysRoleUser sysRoleUser) {
+		return sysRoleUserMapper.selectByCondition(sysRoleUser);
+	}
+
+	@Override
+	public int count() {
+		return sysUserMapper.count();
+	}
+
+	@Override
+	public boolean add(SysUser user, List<String> role) {
+		validateEntity(user, AddGroup.class);
+		notNull(role, "role.not.null");
+		int result = checkUser(user.getUsername());
+		if (result > 0) {
+			throw new ServiceException(MsHelper.getMsg("user.exists"));
+		}
+		// 密码加密
+		user.setPassword(Md5Util.getMD5(user.getPassword(), user.getUsername()));
+		boolean save = save(user);
+		SysRoleUser sysRoleUser = new SysRoleUser();
+		sysRoleUser.setUserId(user.getId());
+		for (String r : role) {
+			sysRoleUser.setRoleId(r);
+			roleUserService.save(sysRoleUser);
+		}
+		return save;
+	}
+
+	@Override
+	public boolean updateUser(SysUser user, List<String> role) {
+		SysUser oldUser = getById(user.getId());
+		BeanUtil.copyNotNullBean(user, oldUser);
+		updateById(oldUser);
+
+		SysRoleUser sysRoleUser = new SysRoleUser();
+		sysRoleUser.setUserId(oldUser.getId());
+		List<SysRoleUser> keyList = selectByCondition(sysRoleUser);
+		for (SysRoleUser currentRoleUser : keyList) {
+			QueryWrapper<SysRoleUser> queryWrapper = new QueryWrapper<>(currentRoleUser);
+			roleUserService.remove(queryWrapper);
+		}
+
+		if (role != null) {
+			for (String r : role) {
+				sysRoleUser.setRoleId(r);
+				roleUserService.save(sysRoleUser);
+			}
+		}
+		updateCurrent(user);
+		return true;
+	}
+
+	@Override
+	public boolean delById(String id, boolean realDel) {
+		notEmpty(id, "failed.get.data");
+		LenResponse j = new LenResponse();
+		SysUser sysUser = sysUserMapper.selectById(id);
+		if (ADMIN.equals(sysUser.getUsername())) {
+			throw new ServiceException(MsHelper.getMsg("user.del.admin"));
+		}
+		SysRoleUser roleUser = new SysRoleUser();
+		roleUser.setUserId(id);
+		QueryWrapper<SysRoleUser> wrapper = new QueryWrapper<>(roleUser);
+		int count = roleUserService.count(wrapper);
+		if (count > 0) {
+			throw new ServiceException(MsHelper.getMsg("user.bind.role"));
+		}
+		if (!realDel) {
+			// 逻辑
+			sysUser.setDelFlag(Byte.parseByte("1"));
+			sysUserMapper.updateById(sysUser);
+		} else {
+			// 物理
+			sysUserMapper.delById(id);
+		}
+		return true;
+	}
+
+	@Override
+	public int checkUser(String username) {
+		return sysUserMapper.checkUser(username);
+	}
+
+	@Override
+	public List<Checkbox> getUserRoleList(String id) {
+		List<SysRole> roleList = roleService.list();
+		SysRoleUser sysRoleUser = new SysRoleUser();
+		sysRoleUser.setUserId(id);
+		List<SysRoleUser> kList = selectByCondition(sysRoleUser);
+
+		List<Checkbox> checkboxList = new ArrayList<>();
+		Checkbox checkbox;
+		for (SysRole sysRole : roleList) {
+			checkbox = new Checkbox();
+			checkbox.setId(sysRole.getId());
+			checkbox.setName(sysRole.getRoleName());
+			for (SysRoleUser sysRoleUser1 : kList) {
+				if (sysRoleUser1.getRoleId().equals(sysRole.getId())) {
+					checkbox.setCheck(true);
+					break;
+				}
+			}
+			checkboxList.add(checkbox);
+		}
+		return checkboxList;
+	}
+
+	@Override
+	public int rePass(String id, String newPwd) {
+		ValidatorUtils.notEmpty(id, "failed.get.data");
+		ValidatorUtils.notEmpty(newPwd, "failed.get.data");
+		SysUser user = getById(id);
+		newPwd = Md5Util.getMD5(newPwd, user.getUsername());
+		if (newPwd.equals(user.getPassword())) {
+			throw new ServiceException("newpass.not.eq.oldpass");
+		}
+		user.setPassword(newPwd);
+		return sysUserMapper.rePass(user);
+	}
+
+	@Override
+	public List<SysUser> getUserByRoleId(String roleId) {
+		return sysUserMapper.getUserByRoleId(roleId);
+	}
+
+	@Override
+	public void setMenuAndRoles(String username) {
+		SysUser s = new SysUser();
+		s.setUsername(username);
+		QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>(s);
+		s = sysUserMapper.selectOne(userQueryWrapper);
+		CurrentUser currentUser = new CurrentUser(s.getId(), s.getUsername(), s.getAge(), s.getEmail(), s.getPhoto());
+		Subject subject = Principal.getSubject();
+		/*角色权限封装进去*/
+		// 根据用户获取菜单
+		Session session = subject.getSession();
+
+		List<SysMenu> menuList = menuService.getUserMenu(s.getId());
+		JSONArray menuArr = menuService.getMenuJsonByUser(menuList);
+		session.setAttribute("menu", menuArr);
+		session.setAttribute("menuArr", menuArr.toString());
+
+		List<CurrentMenu> currentMenuList = new ArrayList<>();
+		Set<SysRole> roleList = new HashSet<>();
+		for (SysMenu m : menuList) {
+			CurrentMenu currentMenu = new CurrentMenu();
+			BeanUtil.copyNotNullBean(m, currentMenu);
+			currentMenuList.add(currentMenu);
+			roleList.addAll(m.getRoleList());
+		}
+
+		List<CurrentRole> currentRoleList = new ArrayList<>();
+
+		for (SysRole r : roleList) {
+			CurrentRole role = new CurrentRole();
+			BeanUtil.copyNotNullBean(r, role);
+			currentRoleList.add(role);
+		}
+		currentUser.setCurrentRoleList(currentRoleList);
+		currentUser.setCurrentMenuList(currentMenuList);
+		session.setAttribute("currentPrincipal", currentUser);
+	}
+
+	/**
+	 * 更新session头像
+	 */
+	@Override
+	public void updateCurrent(SysUser sysUser) {
+		CurrentUser principal = Principal.getPrincipal();
+		if (principal.getId().equals(sysUser.getId())) {
+			// 当前用户
+			CurrentUser currentUse = Principal.getCurrentUse();
+			Session session = Principal.getSession();
+			currentUse.setPhoto(sysUser.getPhoto());
+			session.setAttribute("currentPrincipal", currentUse);
+		}
+	}
+
+	@Override
+	public boolean updatePerson(SysUser user) {
+		SysUser oldUser = getById(user.getId());
+		BeanUtil.copyNotNullBean(user, oldUser);
+		updateById(oldUser);
+		updateCurrent(user);
+		return true;
+	}
 }
diff --git a/len-sys/src/main/resources/ftl/login.ftl b/len-sys/src/main/resources/ftl/login.ftl
index fbf9e6e..4c7efb4 100644
--- a/len-sys/src/main/resources/ftl/login.ftl
+++ b/len-sys/src/main/resources/ftl/login.ftl
@@ -1,93 +1,96 @@
-
 <!doctype html>
 <html>
 <head>
-    <meta charset="UTF-8">
-    <title>后台登录</title>
-    <meta name="renderer" content="webkit|ie-comp|ie-stand">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi" />
-    <meta http-equiv="Cache-Control" content="no-siteapp" />
+	<meta charset="UTF-8">
+	<title>后台登录</title>
+	<meta name="renderer" content="webkit|ie-comp|ie-stand">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<meta name="viewport"
+		  content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi"/>
+	<meta http-equiv="Cache-Control" content="no-siteapp"/>
 
-    <link rel="stylesheet" href="${re.contextPath}/plugin/layui/css/layui.css" media="all">
-    <link rel="stylesheet" href="${re.contextPath}/plugin/x-admin/css/font.css">
-    <link rel="stylesheet" href="${re.contextPath}/plugin/x-admin/css/xadmin.css">
-    <script type="text/javascript" src="${re.contextPath}/plugin/layui/layui.all.js"></script>
-    <script type="text/javascript" src="${re.contextPath}/plugin/jquery/jquery-3.2.1.min.js"></script>
+	<link rel="stylesheet" href="${re.contextPath}/plugin/layui/css/layui.css" media="all">
+	<link rel="stylesheet" href="${re.contextPath}/plugin/x-admin/css/font.css">
+	<link rel="stylesheet" href="${re.contextPath}/plugin/x-admin/css/xadmin.css">
+	<script type="text/javascript" src="${re.contextPath}/plugin/layui/layui.all.js"></script>
+	<script type="text/javascript" src="${re.contextPath}/plugin/jquery/jquery-3.2.1.min.js"></script>
 
 </head>
 <body class="login-bg">
 
 <div class="login">
-    <div class="message">len-脚手架</div>
-    <div id="darkbannerwrap"></div>
+	<div class="message">len-脚手架</div>
+	<div id="darkbannerwrap"></div>
 
-    <form method="post" action="${re.contextPath}/login" class="layui-form" >
-        <input name="username" placeholder="用户名" autocomplete="off"  type="text" lay-verify="username" class="layui-input" >
-        <hr class="hr15">
-        <input name="password" lay-verify="password" placeholder="密码" autocomplete="off"  type="password" class="layui-input">
-        <hr class="hr15">
-        <div  class="layui-inline">
-            <label class="layui-form-label" style="width:40px;padding: 9px 0px;">验证码&nbsp;</label>
-               <div class="layui-input-inline">
-                     <input type="text" name="code" style="width:150px;height:35px;" autocomplete="off" lay-verify="code"   class="layui-input">
-              </div>
-            <div class="layui-input-inline">
-                <img src="" id="code">
-            </div>
+	<form method="post" action="${re.contextPath}/login" class="layui-form">
+		<input name="username" placeholder="用户名" autocomplete="off" type="text" lay-verify="username"
+			   class="layui-input">
+		<hr class="hr15">
+		<input name="password" lay-verify="password" placeholder="密码" autocomplete="off" type="password"
+			   class="layui-input">
+		<hr class="hr15">
+		<div class="layui-inline">
+			<label class="layui-form-label" style="width:40px;padding: 9px 0px;">验证码&nbsp;</label>
+			<div class="layui-input-inline">
+				<input type="text" name="code" style="width:150px;height:35px;" autocomplete="off" lay-verify="code"
+					   class="layui-input">
+			</div>
+			<div class="layui-input-inline">
+				<img src="" id="code">
+			</div>
 
-        </div>
+		</div>
         <#--<div>-->
         <#--<label class="layui-form-label" style="width:40px;padding: 9px 0px;">记住我</label>  由于不好验证 目前去掉-->
-            <#--<input type="checkbox"   name="rememberMe" lay-skin="switch" lay-filter="switchTest" lay-text="ON|OFF">-->
+        <#--<input type="checkbox"   name="rememberMe" lay-skin="switch" lay-filter="switchTest" lay-text="ON|OFF">-->
         <#--</div>-->
-        <hr class="hr15">
-        <input value="登录" lay-submit lay-filter="login" style="width:100%;" type="submit">
-        <hr class="hr20" >
-    </form>
+		<hr class="hr15">
+		<input value="登录" lay-submit lay-filter="login" style="width:100%;" type="submit">
+		<hr class="hr20">
+	</form>
 </div>
 
 
 <script>
-  var layer;
-  $(function  () {
-    layui.use(['form','layer'], function(){
-      var form = layui.form;
-      form.verify({
-        username:function(v){
-          if(v.trim()==''){
-            return "用户名不能为空";
-          }
-        }
-        ,password:function(v){
-          if(v.trim()==''){
-            return "密码不能为空";
-          }
-        },code:function(v){
-              if(v.trim()==''){
-                  return '验证码不能为空';
-              }
-          }
-      });
+	var layer;
+	$(function () {
+		layui.use(['form', 'layer'], function () {
+			var form = layui.form;
+			form.verify({
+				username: function (v) {
+					if (v.trim() == '') {
+						return "用户名不能为空";
+					}
+				}
+				, password: function (v) {
+					if (v.trim() == '') {
+						return "密码不能为空";
+					}
+				}, code: function (v) {
+					if (v.trim() == '') {
+						return '验证码不能为空';
+					}
+				}
+			});
 
-      form.render();
-    });
-    layer = layui.layer;
-    var msg='${message}';
-    if(msg.trim()!=""){
-        layer.msg(msg, {icon: 5,anim:6,offset: 't'});
-    }
-      $("#code").click(function(){
-          var url = "${re.contextPath}/getCode?"+new Date().getTime();
-          this.src = url;
-      }).click().show();
-    $('#code').on('mouseover',function(){
-        layer.tips('点击刷新验证码', this,{time:1000});
-    });
-  })
+			form.render();
+		});
+		layer = layui.layer;
+		var msg = '${message}';
+		if (msg.trim() != "") {
+			layer.msg(msg, {icon: 5, anim: 6, offset: 't'});
+		}
+		$("#code").click(function () {
+			var url = "${re.contextPath}/getCode?" + new Date().getTime();
+			this.src = url;
+		}).click().show();
+		$('#code').on('mouseover', function () {
+			layer.tips('点击刷新验证码', this, {time: 1000});
+		});
+	})
 
-  if (window != top)
-    top.location.href = location.href;
+	if (window != top)
+		top.location.href = location.href;
 </script>
 
 
diff --git a/len-sys/src/main/resources/ftl/login2.html b/len-sys/src/main/resources/ftl/login2.html
index f085361..76d25a5 100644
--- a/len-sys/src/main/resources/ftl/login2.html
+++ b/len-sys/src/main/resources/ftl/login2.html
@@ -1,157 +1,158 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta charset="UTF-8">
-    <title>后台登录</title>
-    <meta name="renderer" content="webkit|ie-comp|ie-stand">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport"
-          content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi"/>
-    <meta http-equiv="Cache-Control" content="no-siteapp"/>
-    <link href="/plugin/login/sys.min.css" rel="stylesheet" type="text/css">
-    <link rel="stylesheet" href="/plugin/layui/css/layui.css" media="all">
+	<meta charset="UTF-8">
+	<title>后台登录</title>
+	<meta content="webkit|ie-comp|ie-stand" name="renderer">
+	<meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible">
+	<meta content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi"
+		  name="viewport"/>
+	<meta content="no-siteapp" http-equiv="Cache-Control"/>
+	<link href="/plugin/login/sys.min.css" rel="stylesheet" type="text/css">
+	<link href="/plugin/layui/css/layui.css" media="all" rel="stylesheet">
 
 </head>
-<script type="text/javascript" src="/plugin/login/jquery-core.min.js"></script>
-<script type="text/javascript" src="/plugin/login/jquery-ui-core.min.js"></script>
-<script type="text/javascript" src="/plugin/login/fai.min.js"></script>
-<script type="text/javascript" src="/plugin/layui/layui.all.js"></script>
+<script src="/plugin/login/jquery-core.min.js" type="text/javascript"></script>
+<script src="/plugin/login/jquery-ui-core.min.js" type="text/javascript"></script>
+<script src="/plugin/login/fai.min.js" type="text/javascript"></script>
+<script src="/plugin/layui/layui.all.js" type="text/javascript"></script>
 <style>
-    input::-webkit-input-placeholder {
-        color: #a6aebf;
-    }
+	input::-webkit-input-placeholder {
+		color: #a6aebf;
+	}
 
-    input::-moz-placeholder {
-        color: #a6aebf;
-    }
+	input::-moz-placeholder {
+		color: #a6aebf;
+	}
 
-    input:-moz-placeholder {
-        color: #a6aebf;
-    }
+	input:-moz-placeholder {
+		color: #a6aebf;
+	}
 
-    input:-ms-input-placeholder {
-        color: #a6aebf;
-    }
+	input:-ms-input-placeholder {
+		color: #a6aebf;
+	}
 
-    input:-webkit-autofill {
-        -webkit-box-shadow: 0 0 0 1000px white inset !important;
-    }
+	input:-webkit-autofill {
+		-webkit-box-shadow: 0 0 0 1000px white inset !important;
+	}
 
-    html {
-        height: 100%;
-    }
+	html {
+		height: 100%;
+	}
 </style>
 <body id="body" style="height: 684px; background: url(plugin/login/demo2.png) 0 0 / cover no-repeat; position: static;">
 <div class="main-body no-qrcode">
-    <div class="new-login">
-        <div class="top">
-            lenosp管理平台
-            <span class="bg1"></span>
-            <span class="bg2"></span>
-        </div>
-        <form id="len_form" method="post" action="login" class="layui-form">
-            <div class="bottom">
-                <div class="center">
-                    <div class="item">
-                        <span class="icon icon-2"></span>
-                        <input name="username" type="text" id="username" placeholder="请输入账号" maxlength="20">
-                    </div>
-                    <div class="item">
-                        <span class="icon icon-3"></span>
-                        <input name="password" type="password" id="loginPwd" placeholder="请输入密码" maxlength="20">
-                        <input type="text" id="loginPwdText" placeholder="请输入密码" maxlength="20" class="hide">
-                        <input type="hidden" id="isRemember" name="isRemember" value="false"/>
-                        <span class="icon icon-4"></span>
-                    </div>
-                    <div id="validatePanel" class="item" style="width: 137px;">
-                        <input id="code" name="code" type="text" placeholder="请输入验证码" maxlength="4">
-                        <img class="validateImg" id="codeImg">
-                        <span id="validateRefresh" class="icon icon-6"></span>
-                    </div>
-                </div>
-                <div class="tip">
-                    <span class="icon-nocheck" id="autoLogin"></span>
-                    <span class="login-tip">两周内自动登录</span>
-                </div>
-                <div style="width: 300px;height: 50px;text-align: center;margin: 24px auto 0;">
-                    <input id="loginBtn" class="deal" value="立即登录" type="submit">
-                </div>
-            </div>
-        </form>
-    </div>
+	<div class="new-login">
+		<div class="top">
+			lenosp管理平台
+			<span class="bg1"></span>
+			<span class="bg2"></span>
+		</div>
+		<form action="login" class="layui-form" id="len_form" method="post">
+			<div class="bottom">
+				<div class="center">
+					<div class="item">
+						<span class="icon icon-2"></span>
+						<input id="username" maxlength="20" name="username" placeholder="请输入账号" type="text">
+					</div>
+					<div class="item">
+						<span class="icon icon-3"></span>
+						<input id="loginPwd" maxlength="20" name="password" placeholder="请输入密码" type="password">
+						<input class="hide" id="loginPwdText" maxlength="20" placeholder="请输入密码" type="text">
+						<input id="isRemember" name="isRemember" type="hidden" value="false"/>
+						<span class="icon icon-4"></span>
+					</div>
+					<div class="item" id="validatePanel" style="width: 137px;">
+						<input id="code" maxlength="4" name="code" placeholder="请输入验证码" type="text">
+						<img class="validateImg" id="codeImg">
+						<span class="icon icon-6" id="validateRefresh"></span>
+					</div>
+				</div>
+				<div class="tip">
+					<span class="icon-nocheck" id="autoLogin"></span>
+					<span class="login-tip">两周内自动登录</span>
+				</div>
+				<div style="width: 300px;height: 50px;text-align: center;margin: 24px auto 0;">
+					<input class="deal" id="loginBtn" type="submit" value="立即登录">
+				</div>
+			</div>
+		</form>
+	</div>
 </div>
-<script type="text/javascript" src="/plugin/validator/validator.min.js"></script>
+<script src="/plugin/validator/validator.min.js" type="text/javascript"></script>
 <script>
-    function randomCode(){
-        $('#codeImg').attr('src', '/getCode?' + Math.random());
-    }
-    randomCode();
-    new Validator('len_form', [
-        {
-            name: 'username',
-            display: "用户名不能为空",
-            rules: 'required'
-        }, {
-            name: 'password',
-            display: "密码不能为空",
-            rules: 'required'
-        }, {
-            name: 'code',
-            display: "验证码不能为空",
-            rules: 'required'
-        },
-    ], function (obj) {
-        if (obj.errors) {
-            layer.msg(obj.errors[0].display, {icon: 5, anim: 6, offset: 't'});
-        }
-    });
-    $(function () {
-        // 加载背景图片
-        $("#body").css('background', 'url("/plugin/login/demo2.png") no-repeat');
-        $("#body").css('backgroundSize', 'cover');
+	function randomCode() {
+		$('#codeImg').attr('src', '/getCode?' + Math.random());
+	}
 
+	randomCode();
+	new Validator('len_form', [
+		{
+			name: 'username',
+			display: "用户名不能为空",
+			rules: 'required'
+		}, {
+			name: 'password',
+			display: "密码不能为空",
+			rules: 'required'
+		}, {
+			name: 'code',
+			display: "验证码不能为空",
+			rules: 'required'
+		},
+	], function (obj) {
+		if (obj.errors) {
+			layer.msg(obj.errors[0].display, {icon: 5, anim: 6, offset: 't'});
+		}
+	});
+	$(function () {
+		// 加载背景图片
+		$("#body").css('background', 'url("/plugin/login/demo2.png") no-repeat');
+		$("#body").css('backgroundSize', 'cover');
 
-        // 是否两周内自动登录
-        $('.icon-nocheck, .login-tip').click(function () {
-            $('.icon-nocheck').toggleClass('icon-check');
-            var isRemember = $('#isRemember').val();
-            if (isRemember === 'false') {
-                isRemember = 'true';
-            } else {
-                isRemember = 'false'
-            }
-            $('#isRemember').val(isRemember);
-        });
 
-        layer = layui.layer;
-        var msg = '${message}';
-        let username = '${username}';
-        if (msg.trim() !== "") {
-            $("*[name='username']").val(username);
-            layer.msg(msg, {icon: 5, anim: 6, offset: 't'});
-        }
-        $("#codeImg,#validateRefresh").click(function () {
-            randomCode();
-        });
+		// 是否两周内自动登录
+		$('.icon-nocheck, .login-tip').click(function () {
+			$('.icon-nocheck').toggleClass('icon-check');
+			var isRemember = $('#isRemember').val();
+			if (isRemember === 'false') {
+				isRemember = 'true';
+			} else {
+				isRemember = 'false'
+			}
+			$('#isRemember').val(isRemember);
+		});
 
-        //密码展示/隐藏
-        $('.icon-4').click(function () {
-            $(this).toggleClass('icon-5');
-            var pwdObj = $('#loginPwd');
-            var pwdTextObj = $('#loginPwdText');
-            var pwd = $(this).hasClass('icon-5') ? pwdObj.val() : pwdTextObj.val();
-            pwdObj.toggleClass('hide').val(pwd);
-            pwdTextObj.toggleClass('hide').val(pwd);
-        });
+		layer = layui.layer;
+		var msg = '${message}';
+		let username = '${username}';
+		if (msg.trim() !== "") {
+			$("*[name='username']").val(username);
+			layer.msg(msg, {icon: 5, anim: 6, offset: 't'});
+		}
+		$("#codeImg,#validateRefresh").click(function () {
+			randomCode();
+		});
 
-        $("#loginPwdText").change(function () {
-            $('#loginPwd').val($("#loginPwdText").val());
-        });
-    });
+		//密码展示/隐藏
+		$('.icon-4').click(function () {
+			$(this).toggleClass('icon-5');
+			var pwdObj = $('#loginPwd');
+			var pwdTextObj = $('#loginPwdText');
+			var pwd = $(this).hasClass('icon-5') ? pwdObj.val() : pwdTextObj.val();
+			pwdObj.toggleClass('hide').val(pwd);
+			pwdTextObj.toggleClass('hide').val(pwd);
+		});
 
-    if (window != top)
-        top.location.href = location.href;
+		$("#loginPwdText").change(function () {
+			$('#loginPwd').val($("#loginPwdText").val());
+		});
+	});
+
+	if (window != top)
+		top.location.href = location.href;
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/len-sys/src/main/resources/ftl/main/dashboard.ftl b/len-sys/src/main/resources/ftl/main/dashboard.ftl
index d26eea0..6f6f995 100644
--- a/len-sys/src/main/resources/ftl/main/dashboard.ftl
+++ b/len-sys/src/main/resources/ftl/main/dashboard.ftl
@@ -1,26 +1,26 @@
 <style>
-    body {
-        background-color: #f8f8f8
-    }
+	body {
+		background-color: #f8f8f8
+	}
 </style>
 <div class="layui-bg-gray" style="padding: 10px;">
     <#--动态 快捷菜单 代办 body-->
-    <div id="panelBody" class="layui-row layui-col-space15">
+	<div id="panelBody" class="layui-row layui-col-space15">
         <#--主-->
-        <div id="panelColumnOne" class="able-col layui-col-md8"></div>
+		<div id="panelColumnOne" class="able-col layui-col-md8"></div>
         <#--次-->
-        <div id="panelColumnTwo" class="able-col layui-col-md4"></div>
-    </div>
+		<div id="panelColumnTwo" class="able-col layui-col-md4"></div>
+	</div>
 </div>
 
 <script type="text/javascript" src="${re.contextPath}/plugin/build/js/dashboard.js" charset="utf-8"></script>
 
 <script type="application/javascript">
-    layui.use('dashboard', function () {
-        var $ = layui.jquery,
-            dashboard = layui.dashboard;
+	layui.use('dashboard', function () {
+		var $ = layui.jquery,
+			dashboard = layui.dashboard;
 
-    });
+	});
 
 
-</script>
\ No newline at end of file
+</script>
diff --git a/len-sys/src/main/resources/ftl/main/dashboard_static_copy.ftl b/len-sys/src/main/resources/ftl/main/dashboard_static_copy.ftl
index 1d47264..1478ef3 100644
--- a/len-sys/src/main/resources/ftl/main/dashboard_static_copy.ftl
+++ b/len-sys/src/main/resources/ftl/main/dashboard_static_copy.ftl
@@ -1,141 +1,141 @@
 <style>
-    body {
-        background-color: #f8f8f8
-    }
+	body {
+		background-color: #f8f8f8
+	}
 </style>
 <div class="layui-bg-gray" style="padding: 10px;">
-    <div class="layui-row layui-col-space15">
+	<div class="layui-row layui-col-space15">
         <#--动态-->
-        <div class="layui-col-md8 dragdropPanel">
-            <div class="layui-card admin-dynamic">
-                <div class="layui-card-header">
-                    动态
-                </div>
-                <div class="layui-card-body admin-dynamic-content" style="height: 540px">
-                    <ul class="layui-row layui-col-space10 layui-this">
-                        <li class="layui-col-xs12">
-                            <a href="javascript:;" class="admin-dynamic-body">
-                                <h3>系统</h3>
-                                <p><cite style="color: #858585;">张三的请假待审批</cite></p>
-                            </a>
-                            <i class="admin-dynamic-remove" title="删除动态">
-                                <i class="layui-icon layui-icon-close"></i>
-                            </i>
-                        </li>
-                        <li class="layui-col-xs12">
-                            <a href="javascript:;" class="admin-dynamic-body">
-                                <h3>系统</h3>
-                                <p><cite style="color: #858585;">张三的请假待审批</cite></p>
-                            </a>
-                            <i class="admin-dynamic-remove" title="删除动态">
-                                <i class="layui-icon layui-icon-close"></i>
-                            </i>
-                        </li>
-                        <li class="layui-col-xs12">
-                            <a href="javascript:;" class="admin-dynamic-body">
-                                <h3>系统</h3>
-                                <p><cite style="color: #858585;">张三的请假待审批</cite></p>
-                            </a>
-                            <i class="admin-dynamic-remove" title="删除动态">
-                                <i class="layui-icon layui-icon-close"></i>
-                            </i>
-                        </li>
-                        <li class="layui-col-xs12">
-                            <a href="javascript:;" class="admin-dynamic-body">
-                                <h3>系统</h3>
-                                <p><cite style="color: #858585;">张三的请假待审批</cite></p>
-                            </a>
-                            <i class="admin-dynamic-remove" title="删除动态">
-                                <i class="layui-icon layui-icon-close"></i>
-                            </i>
-                        </li>
-                        <li class="layui-col-xs12">
-                            <a href="javascript:;" class="admin-dynamic-body">
-                                <h3>系统</h3>
-                                <p><cite style="color: #858585;">张三的请假待审批</cite></p>
-                            </a>
-                            <i class="admin-dynamic-remove" title="删除动态">
-                                <i class="layui-icon layui-icon-close"></i>
-                            </i>
-                        </li>
-                        <li class="layui-col-xs12">
-                            <a href="javascript:;" class="admin-dynamic-body">
-                                <h3>系统</h3>
-                                <p><cite style="color: #858585;">张三的请假待审批</cite></p>
-                            </a>
-                            <i class="admin-dynamic-remove" title="删除动态">
-                                <i class="layui-icon layui-icon-close"></i>
-                            </i>
-                        </li>
-                        <li class="layui-col-xs12">
-                            <a href="javascript:;" class="admin-dynamic-body">
-                                <h3>系统</h3>
-                                <p><cite style="color: #858585;">张三的请假待审批</cite></p>
-                            </a>
-                            <i class="admin-dynamic-remove" title="删除动态">
-                                <i class="layui-icon layui-icon-close"></i>
-                            </i>
-                        </li>
-                        <li class="layui-col-xs12">
-                            <a href="javascript:;" class="admin-dynamic-body">
-                                <h3>系统</h3>
-                                <p><cite style="color: #858585;">张三的请假待审批</cite></p>
-                            </a>
-                            <i class="admin-dynamic-remove" title="删除动态">
-                                <i class="layui-icon layui-icon-close"></i>
-                            </i>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </div>
+		<div class="layui-col-md8 dragdropPanel">
+			<div class="layui-card admin-dynamic">
+				<div class="layui-card-header">
+					动态
+				</div>
+				<div class="layui-card-body admin-dynamic-content" style="height: 540px">
+					<ul class="layui-row layui-col-space10 layui-this">
+						<li class="layui-col-xs12">
+							<a href="javascript:;" class="admin-dynamic-body">
+								<h3>系统</h3>
+								<p><cite style="color: #858585;">张三的请假待审批</cite></p>
+							</a>
+							<i class="admin-dynamic-remove" title="删除动态">
+								<i class="layui-icon layui-icon-close"></i>
+							</i>
+						</li>
+						<li class="layui-col-xs12">
+							<a href="javascript:;" class="admin-dynamic-body">
+								<h3>系统</h3>
+								<p><cite style="color: #858585;">张三的请假待审批</cite></p>
+							</a>
+							<i class="admin-dynamic-remove" title="删除动态">
+								<i class="layui-icon layui-icon-close"></i>
+							</i>
+						</li>
+						<li class="layui-col-xs12">
+							<a href="javascript:;" class="admin-dynamic-body">
+								<h3>系统</h3>
+								<p><cite style="color: #858585;">张三的请假待审批</cite></p>
+							</a>
+							<i class="admin-dynamic-remove" title="删除动态">
+								<i class="layui-icon layui-icon-close"></i>
+							</i>
+						</li>
+						<li class="layui-col-xs12">
+							<a href="javascript:;" class="admin-dynamic-body">
+								<h3>系统</h3>
+								<p><cite style="color: #858585;">张三的请假待审批</cite></p>
+							</a>
+							<i class="admin-dynamic-remove" title="删除动态">
+								<i class="layui-icon layui-icon-close"></i>
+							</i>
+						</li>
+						<li class="layui-col-xs12">
+							<a href="javascript:;" class="admin-dynamic-body">
+								<h3>系统</h3>
+								<p><cite style="color: #858585;">张三的请假待审批</cite></p>
+							</a>
+							<i class="admin-dynamic-remove" title="删除动态">
+								<i class="layui-icon layui-icon-close"></i>
+							</i>
+						</li>
+						<li class="layui-col-xs12">
+							<a href="javascript:;" class="admin-dynamic-body">
+								<h3>系统</h3>
+								<p><cite style="color: #858585;">张三的请假待审批</cite></p>
+							</a>
+							<i class="admin-dynamic-remove" title="删除动态">
+								<i class="layui-icon layui-icon-close"></i>
+							</i>
+						</li>
+						<li class="layui-col-xs12">
+							<a href="javascript:;" class="admin-dynamic-body">
+								<h3>系统</h3>
+								<p><cite style="color: #858585;">张三的请假待审批</cite></p>
+							</a>
+							<i class="admin-dynamic-remove" title="删除动态">
+								<i class="layui-icon layui-icon-close"></i>
+							</i>
+						</li>
+						<li class="layui-col-xs12">
+							<a href="javascript:;" class="admin-dynamic-body">
+								<h3>系统</h3>
+								<p><cite style="color: #858585;">张三的请假待审批</cite></p>
+							</a>
+							<i class="admin-dynamic-remove" title="删除动态">
+								<i class="layui-icon layui-icon-close"></i>
+							</i>
+						</li>
+					</ul>
+				</div>
+			</div>
+		</div>
         <#--快捷菜单-->
-        <div class="layui-col-md4 dragdropPanel">
-            <div class="layui-card  admin-shortcut">
-                <div class="layui-card-header" title="可从左侧菜单拖拽">
-                    快捷菜单
-                </div>
-                <div class="layui-card-body admin-shortcut-content" style="height: 230px">
-                    <div carousel-item="">
-                        <ul id="admin-shortcut-content" class="layui-row layui-col-space10 layui-this">
+		<div class="layui-col-md4 dragdropPanel">
+			<div class="layui-card  admin-shortcut">
+				<div class="layui-card-header" title="可从左侧菜单拖拽">
+					快捷菜单
+				</div>
+				<div class="layui-card-body admin-shortcut-content" style="height: 230px">
+					<div carousel-item="">
+						<ul id="admin-shortcut-content" class="layui-row layui-col-space10 layui-this">
 
-                        </ul>
+						</ul>
 
-                    </div>
-                </div>
-            </div>
-        </div>
+					</div>
+				</div>
+			</div>
+		</div>
         <#--代办-->
-        <div class="layui-col-md4">
-            <div class="dragdropPanel">
-                <div class="layui-card admin-backlog">
-                    <div class="layui-card-header">
-                        代办事项
-                    </div>
-                    <div class="layui-card-body" style="height: 230px">
-                        <ul class="layui-row layui-col-space10 layui-this">
-                            <li class="layui-col-xs6">
-                                <a href="javascript:;" class="admin-backlog-body">
-                                    <h3>待审批</h3>
-                                    <p><cite style="color: #FF5722;">5</cite></p>
-                                </a>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
+		<div class="layui-col-md4">
+			<div class="dragdropPanel">
+				<div class="layui-card admin-backlog">
+					<div class="layui-card-header">
+						代办事项
+					</div>
+					<div class="layui-card-body" style="height: 230px">
+						<ul class="layui-row layui-col-space10 layui-this">
+							<li class="layui-col-xs6">
+								<a href="javascript:;" class="admin-backlog-body">
+									<h3>待审批</h3>
+									<p><cite style="color: #FF5722;">5</cite></p>
+								</a>
+							</li>
+						</ul>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
 </div>
 
 <script type="text/javascript" src="${re.contextPath}/plugin/build/js/dashboard.js" charset="utf-8"></script>
 
 <script type="application/javascript">
-    layui.use('dashboard', function () {
-        var $ = layui.jquery,
-            dashboard = layui.dashboard;
+	layui.use('dashboard', function () {
+		var $ = layui.jquery,
+			dashboard = layui.dashboard;
 
-    });
+	});
 
 
-</script>
\ No newline at end of file
+</script>
diff --git a/len-sys/src/main/resources/ftl/main/main.ftl b/len-sys/src/main/resources/ftl/main/main.ftl
index ff3ee47..5c63e9b 100644
--- a/len-sys/src/main/resources/ftl/main/main.ftl
+++ b/len-sys/src/main/resources/ftl/main/main.ftl
@@ -2,127 +2,127 @@
 <html>
 
 <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>len-脚手架</title>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+	<title>len-脚手架</title>
     <#include "/system/base/head.ftl">
 
 </head>
 
 <body class="kit-theme">
 <div class="layui-layout layui-layout-admin kit-layout-admin">
-    <div class="layui-header">
-        <div class="layui-logo layui-logo1">
-            <span>len-脚手架</span>
-        </div>
-        <div class="layui-logo layui-logo2 kit-logo-mobile">
-            <span>len</span>
-        </div>
-        <div class="layui-hide-xs">
-            <ul class="layui-nav layui-layout-left kit-nav kit-header">
-                <li class="layui-nav-item"><a href="javascript:;">会员管理</a></li>
-                <li class="layui-nav-item"><a href="javascript:;">会员管理</a></li>
-                <li class="layui-nav-item"><a href="javascript:;" kit-target
-                                              data-options="{url:'/article/articleList',icon:'&#xe658;',title:'文章管理',id:'966'}">文章管理</a>
-                </li>
-                <li class="layui-nav-item">
-                    <a href="javascript:;">其它系统</a>
-                    <dl class="layui-nav-child">
-                        <dd><a href="javascript:;">邮件管理</a></dd>
-                        <dd><a href="javascript:;">消息管理</a></dd>
-                        <dd><a href="javascript:;">授权管理</a></dd>
-                    </dl>
-                </li>
-            </ul>
-        </div>
-        <ul class="layui-nav layui-layout-right kit-nav">
-            <li class="layui-nav-item">
-                <a href="javascript:;">
-                    <i class="layui-icon">&#xe63f;</i> 皮肤
-                </a>
-                <dl class="layui-nav-child skin">
-                    <dd><a href="javascript:;" data-skin="default" style="color:#393D49;"><i
-                                    class="layui-icon">&#xe658;</i> 默认</a></dd>
-                    <dd><a href="javascript:;" data-skin="orange" style="color:#ff6700;"><i
-                                    class="layui-icon">&#xe658;</i> 橙</a></dd>
-                    <dd><a href="javascript:;" data-skin="green" style="color:#00a65a;"><i
-                                    class="layui-icon">&#xe658;</i> 绿</a></dd>
-                    <dd><a href="javascript:;" data-skin="pink" style="color:#FA6086;"><i
-                                    class="layui-icon">&#xe658;</i> 粉</a></dd>
-                    <dd><a href="javascript:;" data-skin="blue" style="color:#00c0ef;"><i
-                                    class="layui-icon">&#xe658;</i> 蓝</a></dd>
-                    <dd><a href="javascript:;" data-skin="red" style="color:#dd4b39;"><i class="layui-icon">&#xe658;</i>
-                            红</a></dd>
-                </dl>
-            </li>
-            <li class="layui-nav-item">
-                <a href="javascript:;" layadmin-event="fullscreen">
-                    <i class="layui-icon layui-icon-screen-full"></i>
-                </a>
-            </li>
-            <li class="layui-nav-item">
-                <a href="javascript:;">
+	<div class="layui-header">
+		<div class="layui-logo layui-logo1">
+			<span>len-脚手架</span>
+		</div>
+		<div class="layui-logo layui-logo2 kit-logo-mobile">
+			<span>len</span>
+		</div>
+		<div class="layui-hide-xs">
+			<ul class="layui-nav layui-layout-left kit-nav kit-header">
+				<li class="layui-nav-item"><a href="javascript:;">会员管理</a></li>
+				<li class="layui-nav-item"><a href="javascript:;">会员管理</a></li>
+				<li class="layui-nav-item"><a href="javascript:;" kit-target
+											  data-options="{url:'/article/articleList',icon:'&#xe658;',title:'文章管理',id:'966'}">文章管理</a>
+				</li>
+				<li class="layui-nav-item">
+					<a href="javascript:;">其它系统</a>
+					<dl class="layui-nav-child">
+						<dd><a href="javascript:;">邮件管理</a></dd>
+						<dd><a href="javascript:;">消息管理</a></dd>
+						<dd><a href="javascript:;">授权管理</a></dd>
+					</dl>
+				</li>
+			</ul>
+		</div>
+		<ul class="layui-nav layui-layout-right kit-nav">
+			<li class="layui-nav-item">
+				<a href="javascript:;">
+					<i class="layui-icon">&#xe63f;</i> 皮肤
+				</a>
+				<dl class="layui-nav-child skin">
+					<dd><a href="javascript:;" data-skin="default" style="color:#393D49;"><i
+								class="layui-icon">&#xe658;</i> 默认</a></dd>
+					<dd><a href="javascript:;" data-skin="orange" style="color:#ff6700;"><i
+								class="layui-icon">&#xe658;</i> 橙</a></dd>
+					<dd><a href="javascript:;" data-skin="green" style="color:#00a65a;"><i
+								class="layui-icon">&#xe658;</i> 绿</a></dd>
+					<dd><a href="javascript:;" data-skin="pink" style="color:#FA6086;"><i
+								class="layui-icon">&#xe658;</i> 粉</a></dd>
+					<dd><a href="javascript:;" data-skin="blue" style="color:#00c0ef;"><i
+								class="layui-icon">&#xe658;</i> 蓝</a></dd>
+					<dd><a href="javascript:;" data-skin="red" style="color:#dd4b39;"><i class="layui-icon">&#xe658;</i>
+							红</a></dd>
+				</dl>
+			</li>
+			<li class="layui-nav-item">
+				<a href="javascript:;" layadmin-event="fullscreen">
+					<i class="layui-icon layui-icon-screen-full"></i>
+				</a>
+			</li>
+			<li class="layui-nav-item">
+				<a href="javascript:;">
                     <#assign currentUser = Session["currentPrincipal"]>
-                    <img src="${re.contextPath}/images/${currentUser.photo}"
-                         class="layui-nav-img">${currentUser.username}
-                </a>
-                <dl class="layui-nav-child">
-                    <dd><a href="javascript:;" kit-target
-                           data-options="{url:'/person',icon:'&#xe658;',title:'基本资料',id:'966'}"><span>基本资料</span></a>
-                    </dd>
-                    <dd><a href="javascript:;">安全设置</a></dd>
-                </dl>
-            </li>
-            <li class="layui-nav-item">
-                <a href="logout"><i class="fa fa-sign-out" aria-hidden="true"></i></a></li>
-        </ul>
-    </div>
+					<img src="${re.contextPath}/images/${currentUser.photo}"
+						 class="layui-nav-img">${currentUser.username}
+				</a>
+				<dl class="layui-nav-child">
+					<dd><a href="javascript:;" kit-target
+						   data-options="{url:'/person',icon:'&#xe658;',title:'基本资料',id:'966'}"><span>基本资料</span></a>
+					</dd>
+					<dd><a href="javascript:;">安全设置</a></dd>
+				</dl>
+			</li>
+			<li class="layui-nav-item">
+				<a href="logout"><i class="fa fa-sign-out" aria-hidden="true"></i></a></li>
+		</ul>
+	</div>
 
     <#--菜单-->
     <#macro tree data start end>
         <#if (start=="start")>
-            <div class="layui-side layui-nav-tree layui-bg-black kit-side">
-            <div class="layui-side-scroll">
-            <div class="kit-side-fold"><i class="fa fa-navicon" aria-hidden="true"></i></div>
-            <ul class="layui-nav layui-nav-tree" lay-filter="kitNavbar" kit-navbar>
+			<div class="layui-side layui-nav-tree layui-bg-black kit-side">
+			<div class="layui-side-scroll">
+			<div class="kit-side-fold"><i class="fa fa-navicon" aria-hidden="true"></i></div>
+			<ul class="layui-nav layui-nav-tree" lay-filter="kitNavbar" kit-navbar>
         </#if>
         <#list data as child>
             <#if child.children?size gt 0>
-                <li class="layui-nav-item">
-                    <a href="javascript:;" kit-target-parsent>
-                        <i aria-hidden="true" class="layui-icon">${child.icon}</i>
-                        <span> ${child.name}</span>
-                    </a>
-                    <ul class="layui-nav-child">
+				<li class="layui-nav-item">
+					<a href="javascript:;" kit-target-parsent>
+						<i aria-hidden="true" class="layui-icon">${child.icon}</i>
+						<span> ${child.name}</span>
+					</a>
+					<ul class="layui-nav-child">
                         <@tree data=child.children start="" end=""/>
-                    </ul>
-                </li>
+					</ul>
+				</li>
             <#else>
-                <dd class="len-main-menu">
-                    <a draggable="false" href="#${child.router}" kit-target len-id="${child.code}"
-                       data-options="{url:'${child.url}',icon:'${child.icon}',title:'${child.name}',id:'${child.code}'}">
-                        <i class="layui-icon">${child.icon}</i><span> ${child.name}</span></a>
-                </dd>
+				<dd class="len-main-menu">
+					<a draggable="false" href="#${child.router}" kit-target len-id="${child.code}"
+					   data-options="{url:'${child.url}',icon:'${child.icon}',title:'${child.name}',id:'${child.code}'}">
+						<i class="layui-icon">${child.icon}</i><span> ${child.name}</span></a>
+				</dd>
             </#if>
         </#list>
         <#if (end=="end")>
-            </ul>
-            </div>
-            </div>
+			</ul>
+			</div>
+			</div>
         </#if>
     </#macro>
 
     <@tree data=menu start="start" end="end"/>
 
 
-    <div class="layui-body" id="container">
+	<div class="layui-body" id="container">
 
-        <!-- 内容主体区域 -->
-        <div style="padding: 15px;"><i class="layui-icon layui-anim layui-anim-rotate layui-anim-loop">&#xe63e;</i>
-            loading...
-        </div>
+		<!-- 内容主体区域 -->
+		<div style="padding: 15px;"><i class="layui-icon layui-anim layui-anim-rotate layui-anim-loop">&#xe63e;</i>
+			loading...
+		</div>
 
-    </div>
+	</div>
 
 
 </div>
@@ -133,20 +133,20 @@
 <script src="${re.contextPath}/plugin/plugins/sortable/Sortable.js"></script>
 
 <script type="application/javascript">
-    Len.menuArr = ${Session["menuArr"]};
-    var nestedSortables = document.getElementsByClassName('len-main-menu');
+	Len.menuArr = ${Session["menuArr"]};
+	var nestedSortables = document.getElementsByClassName('len-main-menu');
 
-    for (var i = 0; i < nestedSortables.length; i++) {
-        new Sortable(nestedSortables[i], {
-            group: {
-                name: 'menu',
-                pull: 'clone',
-                put: false,
-            },
-            swapThreshold: 0.31,
-            animation: 150
-        });
-    }
+	for (var i = 0; i < nestedSortables.length; i++) {
+		new Sortable(nestedSortables[i], {
+			group: {
+				name: 'menu',
+				pull: 'clone',
+				put: false,
+			},
+			swapThreshold: 0.31,
+			animation: 150
+		});
+	}
 </script>
 <script src="${re.contextPath}/plugin/tools/main.js"></script>
 <script src="${re.contextPath}/plugin/build/js/admin.js"></script>
diff --git a/len-sys/src/main/resources/ftl/system/base/bar.ftl b/len-sys/src/main/resources/ftl/system/base/bar.ftl
index f66a538..fa2e593 100644
--- a/len-sys/src/main/resources/ftl/system/base/bar.ftl
+++ b/len-sys/src/main/resources/ftl/system/base/bar.ftl
@@ -22,12 +22,12 @@
 
 <#if hasPermission!='' >
     <@shiro.hasPermission name="${hasPermission}">
-        <a class="layui-btn layui-btn-xs ${currentClass}"
-           lay-event="${event}">${name}</a>
+		<a class="layui-btn layui-btn-xs ${currentClass}"
+		   lay-event="${event}">${name}</a>
     </@shiro.hasPermission>
 <#else >
-    <a class="layui-btn layui-btn-xs ${currentClass}"
-       lay-event="${event}">${name}1</a>
+	<a class="layui-btn layui-btn-xs ${currentClass}"
+	   lay-event="${event}">${name}1</a>
 </#if>
 
 <#--置空变量 防止覆盖后面的引用-->
@@ -37,4 +37,4 @@
 <#assign class=''>
 <#assign event=''>
 <#assign name=''>
-<#assign code=''>
\ No newline at end of file
+<#assign code=''>
diff --git a/len-sys/src/main/resources/ftl/system/base/blockInput.ftl b/len-sys/src/main/resources/ftl/system/base/blockInput.ftl
index aff7198..7d30404 100644
--- a/len-sys/src/main/resources/ftl/system/base/blockInput.ftl
+++ b/len-sys/src/main/resources/ftl/system/base/blockInput.ftl
@@ -2,28 +2,28 @@
 
 <#--description
 -->
-    
+
 <#if type=="">
     <#assign type='text'>
 </#if>
 
 <div>
-    <label for="${for}" class="layui-form-label">
+	<label for="${for}" class="layui-form-label">
         ${label}
         <#if require=="true">
-            <span class="x-red">*</span>
+			<span class="x-red">*</span>
         </#if>
-    </label>
-    <div class="layui-input-block">
-        <input type="${type}" id="${id}"
-               name="${name}" lay-verify="${varify}"
-               autocomplete="off"
-               class="layui-input"/>
-    </div>
+	</label>
+	<div class="layui-input-block">
+		<input type="${type}" id="${id}"
+			   name="${name}" lay-verify="${varify}"
+			   autocomplete="off"
+			   class="layui-input"/>
+	</div>
 </div>
 
 <#assign for=''>
 <#assign desc=''>
 <#assign id=''>
 <#assign name=''>
-<#assign varify=''>
\ No newline at end of file
+<#assign varify=''>
diff --git a/len-sys/src/main/resources/ftl/system/base/btn.ftl b/len-sys/src/main/resources/ftl/system/base/btn.ftl
index d14ac56..887ee1b 100644
--- a/len-sys/src/main/resources/ftl/system/base/btn.ftl
+++ b/len-sys/src/main/resources/ftl/system/base/btn.ftl
@@ -7,12 +7,12 @@
 <span>
 <#if permission >
     <@shiro.hasPermission name="${hasPermission}">
-        <button class="layui-btn layui-btn-normal  layui-btn-sm" style="margin-left:20px" data-type="${type}">
+		<button class="layui-btn layui-btn-normal  layui-btn-sm" style="margin-left:20px" data-type="${type}">
             <i class="layui-icon">${icon}</i>${name}
         </button>
     </@shiro.hasPermission>
 <#else >
-    <button class="layui-btn layui-btn-normal  layui-btn-sm" style="margin-left:20px" data-type="${type}">
+	<button class="layui-btn layui-btn-normal  layui-btn-sm" style="margin-left:20px" data-type="${type}">
         <i class="layui-icon">${icon}</i>${name}
     </button>
 </#if>
@@ -22,4 +22,4 @@
 <#assign hasPermission=''>
 <#assign permission=''>
 <#assign type=''>
-<#assign icon=''>
\ No newline at end of file
+<#assign icon=''>
diff --git a/len-sys/src/main/resources/ftl/system/base/formBtn.ftl b/len-sys/src/main/resources/ftl/system/base/formBtn.ftl
index cc8d000..e02fa3e 100644
--- a/len-sys/src/main/resources/ftl/system/base/formBtn.ftl
+++ b/len-sys/src/main/resources/ftl/system/base/formBtn.ftl
@@ -21,13 +21,13 @@
      <button type="button" class="layui-btn layui-btn-normal layui-btn-radius">确认</button>
      <button type="button" class="layui-btn layui-btn-primary layui-btn-radius">取消</button>
  </div>-->
-    <div class="layer-footer">
-        <button class="layui-btn layui-btn-normal" lay-filter="add" lay-submit>
-            确定
-        </button>
-        <button class="layui-btn layui-btn-primary" id="close">
-            取消
-        </button>
-    </div>
+	<div class="layer-footer">
+		<button class="layui-btn layui-btn-normal" lay-filter="add" lay-submit>
+			确定
+		</button>
+		<button class="layui-btn layui-btn-primary" id="close">
+			取消
+		</button>
+	</div>
 </#if>
-<#assign detail=''>
\ No newline at end of file
+<#assign detail=''>
diff --git a/len-sys/src/main/resources/ftl/system/base/formHead.ftl b/len-sys/src/main/resources/ftl/system/base/formHead.ftl
index 4c93aa1..0403b78 100644
--- a/len-sys/src/main/resources/ftl/system/base/formHead.ftl
+++ b/len-sys/src/main/resources/ftl/system/base/formHead.ftl
@@ -7,9 +7,9 @@ form表单 引用
 <script type="text/javascript" src="${re.contextPath}/plugin/validator/validator.min.js"></script>
 <script type="text/javascript" src="${re.contextPath}/plugin/layui/layui.all.js" charset="utf-8"></script>
 <script type="text/javascript">
-    $(document).ready(function () {
-        if ('${detail}') {
-            $("form").disable();
-        }
-    });
-</script>
\ No newline at end of file
+	$(document).ready(function () {
+		if ('${detail}') {
+			$("form").disable();
+		}
+	});
+</script>
diff --git a/len-sys/src/main/resources/ftl/system/base/lineInput.ftl b/len-sys/src/main/resources/ftl/system/base/lineInput.ftl
index 144b30b..936db9a 100644
--- a/len-sys/src/main/resources/ftl/system/base/lineInput.ftl
+++ b/len-sys/src/main/resources/ftl/system/base/lineInput.ftl
@@ -8,25 +8,25 @@
 </#if>
 
 <div class="layui-inline">
-    <label for="${for}" class="layui-form-label">
+	<label for="${for}" class="layui-form-label">
         ${label}
         <#if require=="true">
-            <span class="x-red">*</span>
+			<span class="x-red">*</span>
         </#if>
-    </label>
-    <div class="layui-input-inline">
-        <input type="${type}"
-               id="${id}"
-               name="${name}"
-               lay-verify="${verify}"
-               value="${value}"
-               autocomplete="off"
-               class="layui-input"/>
-    </div>
+	</label>
+	<div class="layui-input-inline">
+		<input type="${type}"
+			   id="${id}"
+			   name="${name}"
+			   lay-verify="${verify}"
+			   value="${value}"
+			   autocomplete="off"
+			   class="layui-input"/>
+	</div>
 </div>
 
 <#assign for=''>
 <#assign desc=''>
 <#assign id=''>
 <#assign name=''>
-<#assign varify=''>
\ No newline at end of file
+<#assign varify=''>
diff --git a/len-sys/src/main/resources/ftl/system/base/queryBox.ftl b/len-sys/src/main/resources/ftl/system/base/queryBox.ftl
index 75f05b1..bd3c48d 100644
--- a/len-sys/src/main/resources/ftl/system/base/queryBox.ftl
+++ b/len-sys/src/main/resources/ftl/system/base/queryBox.ftl
@@ -4,14 +4,14 @@
 -->
 
 <div class="search-div">
-    <div class="search-div-label">
-        <span>${name}</span>
-    </div>
-    <span class="layui-inline">
+	<div class="search-div-label">
+		<span>${name}</span>
+	</div>
+	<span class="layui-inline">
         <input class="layui-input" id="${id}" autocomplete="off">
     </span>
 </div>
 
 <#--置空变量 防止覆盖后面的引用-->
 <#assign name=''>
-<#assign id=''>
\ No newline at end of file
+<#assign id=''>
diff --git a/len-sys/src/main/resources/ftl/system/base/readme.md b/len-sys/src/main/resources/ftl/system/base/readme.md
index 412b2b6..1ec2bc5 100644
--- a/len-sys/src/main/resources/ftl/system/base/readme.md
+++ b/len-sys/src/main/resources/ftl/system/base/readme.md
@@ -1,28 +1,34 @@
 # 封装组件介绍
+
 ### 说明
+
 以下为已封装组件，可直接引用使用，您也可以按需自定义封装。
 
 * 文本框 queryBox.ftl  
-可定义文本框名称，id。    
-使用，在列表中添加名称为: 用户名的搜索文本框：
+  可定义文本框名称，id。    
+  使用，在列表中添加名称为: 用户名的搜索文本框：
+
  ~~~~
 <@lenInclude path="/system/base/queryBox.ftl" name="用户名" id="uname" ></@lenInclude>
  ~~~~
 
 * 表单确定取消组合按钮 formBtn.ftl    
-使用:
+  使用:
+
  ~~~~
 <@lenInclude path="system/base/formBtn.ftl"></@lenInclude>
 ~~~~
 
 * 查询重置组合按钮 searth.ftl   
-   使用:
+  使用:
+
 ~~~~
 <#include "/system/base/searth.ftl">
 ~~~~
 
 * 上传按钮 upload.ftl
-   使用:
+  使用:
+
 ~~~~
 <@lenInclude path="/system/base/upload.ftl" id="uploadFile"></@lenInclude>
 ~~~~
diff --git a/len-sys/src/main/resources/ftl/system/base/searth.ftl b/len-sys/src/main/resources/ftl/system/base/searth.ftl
index 994a896..1b8e156 100644
--- a/len-sys/src/main/resources/ftl/system/base/searth.ftl
+++ b/len-sys/src/main/resources/ftl/system/base/searth.ftl
@@ -9,7 +9,7 @@
             <i class="layui-icon">&#xe615;</i>查询
         </button>
     </span>
-    <span>
+	<span>
         <button type="button" class="layui-btn layui-btn-normal layui-btn layui-btn-sm" data-type="reload">
             <i class="layui-icon">&#x1006;</i>重置
         </button>
diff --git a/len-sys/src/main/resources/ftl/system/base/upload.ftl b/len-sys/src/main/resources/ftl/system/base/upload.ftl
index 3cb50c1..b2aee24 100644
--- a/len-sys/src/main/resources/ftl/system/base/upload.ftl
+++ b/len-sys/src/main/resources/ftl/system/base/upload.ftl
@@ -13,36 +13,36 @@ $("#id").uploadFile({
 -->
 
 <div class="layui-input-inline">
-    <div class="layui-upload-drag" style="margin-left:10%;" id="${id}">
-        <i style="font-size:30px;" class="layui-icon"></i>
-        <p style="font-size: 10px">点击上传，或将文件拖拽到此处</p>
-    </div>
+	<div class="layui-upload-drag" style="margin-left:10%;" id="${id}">
+		<i style="font-size:30px;" class="layui-icon"></i>
+		<p style="font-size: 10px">点击上传，或将文件拖拽到此处</p>
+	</div>
 </div>
 <script>
-    (function () {
-        var uploadFile = function (id, opt) {
-            this.defaults = {
-                elem: $(id)
-                , url: 'upload'
-            };
-            this.options = $.extend({}, this.defaults, opt);
-        };
-
-        uploadFile.prototype = {
-            init: function () {
-                var _this = this;
-                return layui.use('upload', function () {
-                    var upload = layui.upload;
-                    var uploadInst = upload.render(_this.options);
-                });
-            }
-        };
-
-        $.fn.uploadFile = function (options) {
-            var file = new uploadFile(this, options);
-            return file.init();
-        }
-    })();
+	(function () {
+		var uploadFile = function (id, opt) {
+			this.defaults = {
+				elem: $(id)
+				, url: 'upload'
+			};
+			this.options = $.extend({}, this.defaults, opt);
+		};
+
+		uploadFile.prototype = {
+			init: function () {
+				var _this = this;
+				return layui.use('upload', function () {
+					var upload = layui.upload;
+					var uploadInst = upload.render(_this.options);
+				});
+			}
+		};
+
+		$.fn.uploadFile = function (options) {
+			var file = new uploadFile(this, options);
+			return file.init();
+		}
+	})();
 </script>
 <#assign id=''>
 
diff --git a/len-sys/src/main/resources/ftl/system/base/zoom.ftl b/len-sys/src/main/resources/ftl/system/base/zoom.ftl
index 4740cc7..92d1a10 100644
--- a/len-sys/src/main/resources/ftl/system/base/zoom.ftl
+++ b/len-sys/src/main/resources/ftl/system/base/zoom.ftl
@@ -4,29 +4,29 @@
 
 -->
 <div class="search-zoom">
-    <div id="userZoomShow" data-type="zoomShow" title="展开全部" class="search-zoom-show">
-        <i class="layui-icon layui-icon-down"></i>
-    </div>
-    <div id="userZoomHidden" data-type="zoomHidden" title="收起" class="search-zoom-hidden">
-        <i class="layui-icon layui-icon-up"></i>
-    </div>
+	<div id="userZoomShow" data-type="zoomShow" title="展开全部" class="search-zoom-show">
+		<i class="layui-icon layui-icon-down"></i>
+	</div>
+	<div id="userZoomHidden" data-type="zoomHidden" title="收起" class="search-zoom-hidden">
+		<i class="layui-icon layui-icon-up"></i>
+	</div>
 </div>
 
 <script>
-    layui.use('form', function () {
-        var $ = layui.$, active = {
-            zoomShow: function () {
-                $('#${hiddenId},#userZoomHidden').css('display', 'block');
-                $('#userZoomShow').css('display', 'none');
-            },
-            zoomHidden: function () {
-                $('#${hiddenId},#userZoomHidden').css('display', 'none');
-                $('#userZoomShow').css('display', 'block');
-            }
-        };
-        //存在问题
-        Len.btnBind($('.search-zoom div'), active);
-    });
+	layui.use('form', function () {
+		var $ = layui.$, active = {
+			zoomShow: function () {
+				$('#${hiddenId},#userZoomHidden').css('display', 'block');
+				$('#userZoomShow').css('display', 'none');
+			},
+			zoomHidden: function () {
+				$('#${hiddenId},#userZoomHidden').css('display', 'none');
+				$('#userZoomShow').css('display', 'block');
+			}
+		};
+		//存在问题
+		Len.btnBind($('.search-zoom div'), active);
+	});
 </script>
 
-<#assign hiddenId=''>
\ No newline at end of file
+<#assign hiddenId=''>
diff --git a/len-sys/src/main/resources/ftl/system/job/add.ftl b/len-sys/src/main/resources/ftl/system/job/add.ftl
index 4541485..9b54d01 100644
--- a/len-sys/src/main/resources/ftl/system/job/add.ftl
+++ b/len-sys/src/main/resources/ftl/system/job/add.ftl
@@ -1,105 +1,105 @@
 <#include "/system/base/formHead.ftl">
 
 <div class="x-body">
-    <form class="layui-form layui-form-pane" style="margin-left: 20px;">
-        <div style="width:100%;height:400px;overflow: auto;">
-            <div class="layui-form-item">
-                <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                    <legend style="font-size:16px;">任务信息</legend>
-                </fieldset>
-            </div>
-            <div class="layui-form-item">
-                <label for="jobName" class="layui-form-label">
-                    <span class="x-red">*</span>任务名称
-                </label>
-                <div class="layui-input-inline">
-                    <input type="text" id="jobName" name="jobName" lay-verify="jobName"
-                           autocomplete="off" class="layui-input">
-                </div>
-                <div id="ms" class="layui-form-mid layui-word-aux">
-                    <span class="x-red">*</span><span id="ums">名称必填</span>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label for="cron" class="layui-form-label">
-                        <span class="x-red">*</span>表达式
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="cron" name="cron" lay-verify="cron" autocomplete="off"
-                               class="layui-input">
-                    </div>
-                    <div id="ms" class="layui-form-mid layui-word-aux">
-                        <span class="x-red">*</span><a href="http://cron.qqe2.com/" target="_blank">获取表达式</a>
-                    </div>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                    <legend style="font-size:16px;">执行类要实现Job</legend>
-                </fieldset>
-            </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label for="clazzPath" class="layui-form-label">
-                        <span class="x-red">*</span>任务执行类
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="clazzPath" style="width: 300px;" name="clazzPath" lay-verify="clazzPath"
-                               autocomplete="off" class="layui-input">
-                    </div>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label for="jobDesc" class="layui-form-label">
-                        <span class="x-red">*</span>任务描述
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="jobDesc" name="jobDesc" lay-verify="jobDesc" autocomplete="off"
-                               class="layui-input">
-                    </div>
-                </div>
-            </div>
-            <div style="height: 60px"></div>
-        </div>
+	<form class="layui-form layui-form-pane" style="margin-left: 20px;">
+		<div style="width:100%;height:400px;overflow: auto;">
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">任务信息</legend>
+				</fieldset>
+			</div>
+			<div class="layui-form-item">
+				<label for="jobName" class="layui-form-label">
+					<span class="x-red">*</span>任务名称
+				</label>
+				<div class="layui-input-inline">
+					<input type="text" id="jobName" name="jobName" lay-verify="jobName"
+						   autocomplete="off" class="layui-input">
+				</div>
+				<div id="ms" class="layui-form-mid layui-word-aux">
+					<span class="x-red">*</span><span id="ums">名称必填</span>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label for="cron" class="layui-form-label">
+						<span class="x-red">*</span>表达式
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" id="cron" name="cron" lay-verify="cron" autocomplete="off"
+							   class="layui-input">
+					</div>
+					<div id="ms" class="layui-form-mid layui-word-aux">
+						<span class="x-red">*</span><a href="http://cron.qqe2.com/" target="_blank">获取表达式</a>
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">执行类要实现Job</legend>
+				</fieldset>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label for="clazzPath" class="layui-form-label">
+						<span class="x-red">*</span>任务执行类
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" id="clazzPath" style="width: 300px;" name="clazzPath" lay-verify="clazzPath"
+							   autocomplete="off" class="layui-input">
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label for="jobDesc" class="layui-form-label">
+						<span class="x-red">*</span>任务描述
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" id="jobDesc" name="jobDesc" lay-verify="jobDesc" autocomplete="off"
+							   class="layui-input">
+					</div>
+				</div>
+			</div>
+			<div style="height: 60px"></div>
+		</div>
         <#include "/system/base/formBtn.ftl">
-    </form>
+	</form>
 </div>
 
 
 <script>
-    layui.use(['form', 'layer'], function () {
-        $ = layui.jquery;
-        var form = layui.form
-            , layer = layui.layer;
+	layui.use(['form', 'layer'], function () {
+		$ = layui.jquery;
+		var form = layui.form
+			, layer = layui.layer;
 
-        //自定义验证规则
-        form.verify({
-            jobName: function (value) {
-                if (Len.isEmpty(value)) {
-                    return "任务名称不能为空";
-                }
-            },
-            cron: function (value) {
-                if (Len.isEmpty(value)) {
-                    return "表达式不能为空";
-                }
-            },
-            clazzPath: function (value) {
-                if (Len.isEmpty(value)) {
-                    return "执行类不能为空";
-                }
-            }
-        });
+		//自定义验证规则
+		form.verify({
+			jobName: function (value) {
+				if (Len.isEmpty(value)) {
+					return "任务名称不能为空";
+				}
+			},
+			cron: function (value) {
+				if (Len.isEmpty(value)) {
+					return "表达式不能为空";
+				}
+			},
+			clazzPath: function (value) {
+				if (Len.isEmpty(value)) {
+					return "执行类不能为空";
+				}
+			}
+		});
 
-        $('#close').click(function () {
-            Len.close();
-        });
-        //监听提交
-        form.on('submit(add)', function (data) {
-            Len.layerAjax('addJob', data.field, 'jobList');
-            return false;
-        });
-    });
-</script>
\ No newline at end of file
+		$('#close').click(function () {
+			Len.close();
+		});
+		//监听提交
+		form.on('submit(add)', function (data) {
+			Len.layerAjax('addJob', data.field, 'jobList');
+			return false;
+		});
+	});
+</script>
diff --git a/len-sys/src/main/resources/ftl/system/job/jobList.ftl b/len-sys/src/main/resources/ftl/system/job/jobList.ftl
index 93eb205..3baecb0 100644
--- a/len-sys/src/main/resources/ftl/system/job/jobList.ftl
+++ b/len-sys/src/main/resources/ftl/system/job/jobList.ftl
@@ -1,15 +1,15 @@
 
 <#--搜索-->
 <div class="lenos-search">
-    <div class="search-select">
+	<div class="search-select">
         <@lenInclude path="/system/base/queryBox.ftl" name="任务名称" id="jobName" ></@lenInclude>
         <@lenInclude path="/system/base/queryBox.ftl" name="描述" id="remark" ></@lenInclude>
-    </div>
+	</div>
 </div>
 
 <#--按钮-->
 <div class="layui-col-md12 len-button">
-    <div class="layui-btn-group job-bar">
+	<div class="layui-btn-group job-bar">
         <#include "/system/base/searth.ftl">
         <@lenInclude path="/system/base/btn.ftl" hasPermission="job:add"
         type="add" name="新增" icon="&#xe608;"></@lenInclude>
@@ -17,7 +17,7 @@
         type="update" name="编辑" icon="&#xe642;"></@lenInclude>
         <@lenInclude path="/system/base/btn.ftl" hasPermission="job:select"
         type="detail" name="查看" icon="&#xe605;"></@lenInclude>
-    </div>
+	</div>
 </div>
 <#--表格-->
 <table id="jobList" width="100%" lay-filter="job"></table>
@@ -25,129 +25,144 @@
 <script type="text/html" id="toolBar">
     <@lenInclude  path="/system/base/bar.ftl"  hasPermission="job:add"   name="查看" event="detail"/>
     <@lenInclude  path="/system/base/bar.ftl" hasPermission="job:update" code="edit" name="编辑" event="edit"/>
-    {{#  if(!d.status){ }}
+	{{#  if(!d.status){ }}
     <@lenInclude  path="/system/base/bar.ftl" hasPermission="job:start" name="启动" event="start"/>
-    {{#  } }}
-    {{# if(d.status){ }}
+	{{#  } }}
+	{{# if(d.status){ }}
     <@lenInclude  path="/system/base/bar.ftl" hasPermission="job:end"   name="停止" event="end"/>
-    {{#  } }}
+	{{#  } }}
     <@lenInclude  path="/system/base/bar.ftl" hasPermission="job:del" code="del"   name="删除" event="del"/>
 </script>
 <script>
 
-    layui.use('table', function () {
-        table = layui.table;
-        //方法级渲染
-        table.render({
-            id: 'jobList',
-            elem: '#jobList'
-            , url: 'job/showJobList'
-            , parseData: function (res) {
-                return {
-                    "code": res.code,
-                    "msg": res.msg,
-                    "count": res.count,
-                    "data": res.data
-                };
-            }
-            , cols: [[
-                {checkbox: true, fixed: true, width: '5%'}
-                , {field: 'jobName', title: '任务名称', width: '10%', sort: true}
-                , {field: 'cron', title: '表达式', width: '10%'}
-                , {field: 'clazzPath', title: '任务类', width: '20%', sort: true}
-                , {field: 'status', title: '状态', width: '10%', sort: true}
-                , {field: 'jobDesc', title: '任务描述', width: '10%'}
-                , {
-                    title: '创建时间',
-                    width: '10%',
-                    templet: '<div>{{ moment(+d.createDate).format(\'YYYY-MM-DD\') }}</div>'
-                }
-                , {field: 'remark', title: '操作', width: '20%', toolbar: "#toolBar"}
-            ]]
-            , page: true
-            , height: 'full-100'
-        });
+	layui.use('table', function () {
+		table = layui.table;
+		//方法级渲染
+		table.render({
+			id: 'jobList',
+			elem: '#jobList'
+			, url: 'job/showJobList'
+			, parseData: function (res) {
+				return {
+					"code": res.code,
+					"msg": res.msg,
+					"count": res.count,
+					"data": res.data
+				};
+			}
+			, cols: [[
+				{checkbox: true, fixed: true, width: '5%'}
+				, {field: 'jobName', title: '任务名称', width: '10%', sort: true}
+				, {field: 'cron', title: '表达式', width: '10%'}
+				, {field: 'clazzPath', title: '任务类', width: '20%', sort: true}
+				, {field: 'status', title: '状态', width: '10%', sort: true}
+				, {field: 'jobDesc', title: '任务描述', width: '10%'}
+				, {
+					title: '创建时间',
+					width: '10%',
+					templet: '<div>{{ moment(+d.createDate).format(\'YYYY-MM-DD\') }}</div>'
+				}
+				, {field: 'remark', title: '操作', width: '20%', toolbar: "#toolBar"}
+			]]
+			, page: true
+			, height: 'full-100'
+		});
 
-        var $ = layui.$, active = {
-            select: function () {
-                var jobName = $('#jobName').val();
-                var remark = $('#remark').val();
-                table.reload('jobList', {
-                    where: {
-                        jobName: jobName,
-                        jobDesc: remark
-                    }
-                });
-            },
-            reload: function () {
-                $('#jobName').val('');
-                $('#remark').val('');
-                table.reload('jobList', {
-                    where: {
-                        jobName: null,
-                        jobDesc: null
-                    }
-                });
-            },
-            add: function () {
-                Len.add('/job/showAddJob', '添加任务');
-            },
-            update: function () {
-                var data = table.checkStatus('jobList').data;
-                if (Len.onlyOne(data.length)) {
-                    if (data[0].status) {
-                        layer.msg('已经启动任务无法更新,请停止后更新', {icon: 5, offset: 'rb', area: ['200px', '100px'], anim: 2});
-                        return false;
-                    }
-                    Len.update('/job/updateJob?id=' + data[0].id, '编辑任务');
-                }
-            },
-            detail: function () {
-                var data = table.checkStatus('jobList').data;
-                Len.onlyOne(data.length) ?
-                    Len.detail('/job/updateJob?id=' + data[0].id, '查看任务信息') : false;
-            }
-        };
-        //监听工具条
-        table.on('tool(job)', function (obj) {
-            var data = obj.data;
-            switch (obj.event) {
-                case "detail":
-                    Len.detail('/job/updateJob?id=' + data.id, '编辑角色');
-                    break;
-                case "del":
-                    if (!data.status) {
-                        Len.delete('del', data.id, '', 'jobList');
-                    } else {
-                        layer.msg('已经启动任务无法更新,请停止后删除', {icon: 5, offset: 'rb', area: ['200px', '100px'], anim: 2});
-                    }
-                    break;
-                case "edit":
-                    if (!data.status) {
-                        Len.update('/job/updateJob?id=' + data.id, '编辑任务');
-                    } else {
-                        layer.msg('已经启动任务无法更新,请停止后更新', {icon: 5, offset: 'rb', area: ['200px', '100px'], anim: 2});
-                    }
-                    break;
-                case "start":
-                    layer.confirm('确定开启任务[<label style="color: #00AA91;">' + data.jobName + '</label>]?', function () {
-                        Len.ajaxPost('startJob', {id: data.id}, function (res) {
-                            Len.rbSuccess(res.msg);
-                            layui.table.reload('jobList');
-                        });
-                    });
-                    break;
-                case "end":
-                    layer.confirm('确定停止任务[<label style="color: #00AA91;">' + data.jobName + '</label>]?', function () {
-                        Len.ajaxPost('endJob', {id: data.id}, function (res) {
-                            Len.rbSuccess(res.msg);
-                            layui.table.reload('jobList');
-                        });
-                    });
-                    break;
-            }
-        });
-        Len.btnBind($('.job-bar .layui-btn'), active);
-        Len.keydown(active);
-    });
+		var $ = layui.$, active = {
+			select: function () {
+				var jobName = $('#jobName').val();
+				var remark = $('#remark').val();
+				table.reload('jobList', {
+					where: {
+						jobName: jobName,
+						jobDesc: remark
+					}
+				});
+			},
+			reload: function () {
+				$('#jobName').val('');
+				$('#remark').val('');
+				table.reload('jobList', {
+					where: {
+						jobName: null,
+						jobDesc: null
+					}
+				});
+			},
+			add: function () {
+				Len.add('/job/showAddJob', '添加任务');
+			},
+			update: function () {
+				var data = table.checkStatus('jobList').data;
+				if (Len.onlyOne(data.length)) {
+					if (data[0].status) {
+						layer.msg('已经启动任务无法更新,请停止后更新', {
+							icon: 5,
+							offset: 'rb',
+							area: ['200px', '100px'],
+							anim: 2
+						});
+						return false;
+					}
+					Len.update('/job/updateJob?id=' + data[0].id, '编辑任务');
+				}
+			},
+			detail: function () {
+				var data = table.checkStatus('jobList').data;
+				Len.onlyOne(data.length) ?
+					Len.detail('/job/updateJob?id=' + data[0].id, '查看任务信息') : false;
+			}
+		};
+		//监听工具条
+		table.on('tool(job)', function (obj) {
+			var data = obj.data;
+			switch (obj.event) {
+				case "detail":
+					Len.detail('/job/updateJob?id=' + data.id, '编辑角色');
+					break;
+				case "del":
+					if (!data.status) {
+						Len.delete('del', data.id, '', 'jobList');
+					} else {
+						layer.msg('已经启动任务无法更新,请停止后删除', {
+							icon: 5,
+							offset: 'rb',
+							area: ['200px', '100px'],
+							anim: 2
+						});
+					}
+					break;
+				case "edit":
+					if (!data.status) {
+						Len.update('/job/updateJob?id=' + data.id, '编辑任务');
+					} else {
+						layer.msg('已经启动任务无法更新,请停止后更新', {
+							icon: 5,
+							offset: 'rb',
+							area: ['200px', '100px'],
+							anim: 2
+						});
+					}
+					break;
+				case "start":
+					layer.confirm('确定开启任务[<label style="color: #00AA91;">' + data.jobName + '</label>]?', function () {
+						Len.ajaxPost('startJob', {id: data.id}, function (res) {
+							Len.rbSuccess(res.msg);
+							layui.table.reload('jobList');
+						});
+					});
+					break;
+				case "end":
+					layer.confirm('确定停止任务[<label style="color: #00AA91;">' + data.jobName + '</label>]?', function () {
+						Len.ajaxPost('endJob', {id: data.id}, function (res) {
+							Len.rbSuccess(res.msg);
+							layui.table.reload('jobList');
+						});
+					});
+					break;
+			}
+		});
+		Len.btnBind($('.job-bar .layui-btn'), active);
+		Len.keydown(active);
+	});
 </script>
diff --git a/len-sys/src/main/resources/ftl/system/job/update.ftl b/len-sys/src/main/resources/ftl/system/job/update.ftl
index 3e05395..cb03d7f 100644
--- a/len-sys/src/main/resources/ftl/system/job/update.ftl
+++ b/len-sys/src/main/resources/ftl/system/job/update.ftl
@@ -1,102 +1,105 @@
 <#include "/system/base/formHead.ftl">
 
 <div class="x-body">
-  <form class="layui-form layui-form-pane" style="margin-left: 20px;">
-    <div style="width:100%;height:400px;overflow: auto;">
-    <div class="layui-form-item">
-      <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-        <legend style="font-size:16px;">任务信息</legend>
-      </fieldset>
-    </div>
-    <div class="layui-form-item">
-      <label for="jobName" class="layui-form-label">
-        <span class="x-red">*</span>任务名称
-      </label>
-      <div class="layui-input-inline">
-        <input type="hidden" value="${job.id}" name="id">
-        <input type="text" value="${job.jobName}" id="jobName" name="jobName"  lay-verify="jobName"
-               autocomplete="off" class="layui-input">
-      </div>
-      <div id="ms" class="layui-form-mid layui-word-aux">
-        <span class="x-red">*</span><span id="ums">名称必填</span>
-      </div>
-    </div>
-    <div class="layui-form-item">
-    <div class="layui-inline">
-      <label for="cron" class="layui-form-label">
-        <span class="x-red">*</span>表达式
-      </label>
-      <div class="layui-input-inline">
-        <input type="text" id="cron" name="cron" lay-verify="cron" value="${job.cron}"  autocomplete="off" class="layui-input">
-      </div>
-      <div id="ms" class="layui-form-mid layui-word-aux">
-        <span class="x-red">*</span><a href="http://cron.qqe2.com/" target="_blank">获取表达式</a>
-      </div>
-    </div>
-    </div>
-      <div class="layui-form-item">
-        <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-          <legend style="font-size:16px;">执行类要实现Job</legend>
-        </fieldset>
-      </div>
-      <div class="layui-form-item">
-    <div class="layui-inline">
-      <label for="clazzPath" class="layui-form-label">
-        <span class="x-red">*</span>任务执行类
-      </label>
-      <div class="layui-input-inline">
-        <input type="text" id="clazzPath" style="width: 300px;" value="${job.clazzPath}" name="clazzPath" lay-verify="clazzPath"  autocomplete="off" class="layui-input">
-      </div>
-    </div>
-    </div>
-      <div class="layui-form-item">
-    <div class="layui-inline">
-      <label for="jobDesc" class="layui-form-label">
-        <span class="x-red">*</span>任务描述
-      </label>
-      <div class="layui-input-inline">
-        <input type="text" id="jobDesc" name="jobDesc" value="${job.jobDesc}" lay-verify="jobDesc"  autocomplete="off" class="layui-input">
-      </div>
-    </div>
-    </div>
-      <div style="height: 60px"></div>
-    </div>
-<#if !detail>
-  <#include "/system/base/formBtn.ftl">
-</#if>
-  </form>
+	<form class="layui-form layui-form-pane" style="margin-left: 20px;">
+		<div style="width:100%;height:400px;overflow: auto;">
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">任务信息</legend>
+				</fieldset>
+			</div>
+			<div class="layui-form-item">
+				<label for="jobName" class="layui-form-label">
+					<span class="x-red">*</span>任务名称
+				</label>
+				<div class="layui-input-inline">
+					<input type="hidden" value="${job.id}" name="id">
+					<input type="text" value="${job.jobName}" id="jobName" name="jobName" lay-verify="jobName"
+						   autocomplete="off" class="layui-input">
+				</div>
+				<div id="ms" class="layui-form-mid layui-word-aux">
+					<span class="x-red">*</span><span id="ums">名称必填</span>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label for="cron" class="layui-form-label">
+						<span class="x-red">*</span>表达式
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" id="cron" name="cron" lay-verify="cron" value="${job.cron}"
+							   autocomplete="off" class="layui-input">
+					</div>
+					<div id="ms" class="layui-form-mid layui-word-aux">
+						<span class="x-red">*</span><a href="http://cron.qqe2.com/" target="_blank">获取表达式</a>
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">执行类要实现Job</legend>
+				</fieldset>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label for="clazzPath" class="layui-form-label">
+						<span class="x-red">*</span>任务执行类
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" id="clazzPath" style="width: 300px;" value="${job.clazzPath}"
+							   name="clazzPath" lay-verify="clazzPath" autocomplete="off" class="layui-input">
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label for="jobDesc" class="layui-form-label">
+						<span class="x-red">*</span>任务描述
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" id="jobDesc" name="jobDesc" value="${job.jobDesc}" lay-verify="jobDesc"
+							   autocomplete="off" class="layui-input">
+					</div>
+				</div>
+			</div>
+			<div style="height: 60px"></div>
+		</div>
+        <#if !detail>
+            <#include "/system/base/formBtn.ftl">
+        </#if>
+	</form>
 </div>
 <script>
-    layui.use(['form','layer'], function(){
-    $ = layui.jquery;
-    var form = layui.form;
+	layui.use(['form', 'layer'], function () {
+		$ = layui.jquery;
+		var form = layui.form;
 
-    //自定义验证规则
-    form.verify({
-      jobName: function(value){
-        if(Len.isEmpty(value)){
-          return "任务名称不能为空";
-        }
-      },
-      cron:function(value) {
-        if (Len.isEmpty(value)) {
-          return "表达式不能为空";
-        }
-      },
-        clazzPath:function(value){
-        if(Len.isEmpty(value)){
-          return "执行类不能为空";
-        }
-      }
-    });
+		//自定义验证规则
+		form.verify({
+			jobName: function (value) {
+				if (Len.isEmpty(value)) {
+					return "任务名称不能为空";
+				}
+			},
+			cron: function (value) {
+				if (Len.isEmpty(value)) {
+					return "表达式不能为空";
+				}
+			},
+			clazzPath: function (value) {
+				if (Len.isEmpty(value)) {
+					return "执行类不能为空";
+				}
+			}
+		});
 
-   $('#close').click(function(){
-     Len.close();
-   });
-    //监听提交
-    form.on('submit(add)', function(data){
-      Len.layerAjax('updateJob', data.field, 'jobList');
-      return false;
-    });
-  });
+		$('#close').click(function () {
+			Len.close();
+		});
+		//监听提交
+		form.on('submit(add)', function (data) {
+			Len.layerAjax('updateJob', data.field, 'jobList');
+			return false;
+		});
+	});
 </script>
diff --git a/len-sys/src/main/resources/ftl/system/log/logList.ftl b/len-sys/src/main/resources/ftl/system/log/logList.ftl
index 67bc159..0ebbccc 100644
--- a/len-sys/src/main/resources/ftl/system/log/logList.ftl
+++ b/len-sys/src/main/resources/ftl/system/log/logList.ftl
@@ -1,19 +1,19 @@
 
 <#--搜索-->
 <div class="lenos-search">
-    <div class="search-select">
+	<div class="search-select">
         <@lenInclude path="/system/base/queryBox.ftl" name="操作用户" id="userName" ></@lenInclude>
         <@lenInclude path="/system/base/queryBox.ftl" name="操作类型" id="type" ></@lenInclude>
-    </div>
+	</div>
 </div>
 
 <#--按钮-->
 <div class="layui-col-md12 len-button">
-    <div class="layui-btn-group log-bar">
+	<div class="layui-btn-group log-bar">
         <#include "/system/base/searth.ftl">
         <@lenInclude path="/system/base/btn.ftl" hasPermission="control:del"
         type="del" name="删除" icon="&#xe640;"></@lenInclude>
-    </div>
+	</div>
 </div>
 
 <#--表格-->
@@ -26,98 +26,98 @@
 
 <#--js-->
 <script>
-    layui.use('table', function () {
-        var table = layui.table;
-        //方法级渲染
-        table.render({
-            id: 'logList',
-            elem: '#logList'
-            , url: 'log/showLogList'
-            , parseData: function (res) {
-                return {
-                    "code": res.code,
-                    "msg": res.msg,
-                    "count": res.count,
-                    "data": res.data
-                };
-            }
-            , cols: [[
-                {checkbox: true, fixed: true, width: '5%'}
-                , {field: 'userName', title: '操作人', width: '10%', sort: true}
-                , {field: 'type', title: '操作类型', width: '10%', sort: true}
-                , {field: 'text', title: '描述内容', width: '10%', sort: true}
-                , {field: 'param', title: '参数', width: '40%', sort: true}
-                , {
-                    title: '操作时间',
-                    width: '15%',
-                    templet: '<div>{{ moment(+d.createTime).format(\'YYYY-MM-DD HH:mm:ss\')  }}</div>'
-                }
-                , {field: 'text', title: '操作', width: '5%', toolbar: '#toolBar'}
+	layui.use('table', function () {
+		var table = layui.table;
+		//方法级渲染
+		table.render({
+			id: 'logList',
+			elem: '#logList'
+			, url: 'log/showLogList'
+			, parseData: function (res) {
+				return {
+					"code": res.code,
+					"msg": res.msg,
+					"count": res.count,
+					"data": res.data
+				};
+			}
+			, cols: [[
+				{checkbox: true, fixed: true, width: '5%'}
+				, {field: 'userName', title: '操作人', width: '10%', sort: true}
+				, {field: 'type', title: '操作类型', width: '10%', sort: true}
+				, {field: 'text', title: '描述内容', width: '10%', sort: true}
+				, {field: 'param', title: '参数', width: '40%', sort: true}
+				, {
+					title: '操作时间',
+					width: '15%',
+					templet: '<div>{{ moment(+d.createTime).format(\'YYYY-MM-DD HH:mm:ss\')  }}</div>'
+				}
+				, {field: 'text', title: '操作', width: '5%', toolbar: '#toolBar'}
 
-            ]]
-            , page: true
-            , height: 'full-100'
-        });
+			]]
+			, page: true
+			, height: 'full-100'
+		});
 
-        var $ = layui.$, active = {
-            select: function () {
-                var userName = $('#userName').val();
-                var type = $('#type').val();
-                table.reload('logList', {
-                    where: {
-                        userName: userName,
-                        type: type
-                    }
-                });
-            }
-            , del: function () {
-                var checkStatus = table.checkStatus('logList')
-                    , data = checkStatus.data;
-                if (data.length === 0) {
-                    layer.msg('请选择要删除的数据', {icon: 5});
-                    return false;
-                }
-                var ids = [];
-                for (item in data) {
-                    ids.push(data[item].id);
-                }
-                del(ids);
-            }
-            , reload: function () {
-                $('#userName').val('');
-                $('#type').val('');
-                table.reload('logList', {
-                    where: {
-                        userName: null,
-                        type: null
-                    }
-                });
-            },
-        };
-        //监听工具条
-        table.on('tool(log)', function (obj) {
-            var data = obj.data;
-            if (obj.event === 'del') {
-                var ids = [];
-                ids.push(data.id);
-                del(ids);
-            }
-        });
-        Len.formBind($('.log-bar .layui-btn'),active);
+		var $ = layui.$, active = {
+			select: function () {
+				var userName = $('#userName').val();
+				var type = $('#type').val();
+				table.reload('logList', {
+					where: {
+						userName: userName,
+						type: type
+					}
+				});
+			}
+			, del: function () {
+				var checkStatus = table.checkStatus('logList')
+					, data = checkStatus.data;
+				if (data.length === 0) {
+					layer.msg('请选择要删除的数据', {icon: 5});
+					return false;
+				}
+				var ids = [];
+				for (item in data) {
+					ids.push(data[item].id);
+				}
+				del(ids);
+			}
+			, reload: function () {
+				$('#userName').val('');
+				$('#type').val('');
+				table.reload('logList', {
+					where: {
+						userName: null,
+						type: null
+					}
+				});
+			},
+		};
+		//监听工具条
+		table.on('tool(log)', function (obj) {
+			var data = obj.data;
+			if (obj.event === 'del') {
+				var ids = [];
+				ids.push(data.id);
+				del(ids);
+			}
+		});
+		Len.formBind($('.log-bar .layui-btn'), active);
 
-    });
+	});
 
-    /**批量删除id*/
-    function del(ids) {
-        $.ajax({
-            url: "log/del",
-            type: "post",
-            data: {ids: ids},
-            dataType: "json", traditional: true,
-            success: function (data) {
-                layer.msg(data.msg, {icon: 6});
-                layui.table.reload('logList');
-            }
-        });
-    }
+	/**批量删除id*/
+	function del(ids) {
+		$.ajax({
+			url: "log/del",
+			type: "post",
+			data: {ids: ids},
+			dataType: "json", traditional: true,
+			success: function (data) {
+				layer.msg(data.msg, {icon: 6});
+				layui.table.reload('logList');
+			}
+		});
+	}
 </script>
diff --git a/len-sys/src/main/resources/ftl/system/menu/add.ftl b/len-sys/src/main/resources/ftl/system/menu/add.ftl
index 6748e7f..8ac16d7 100644
--- a/len-sys/src/main/resources/ftl/system/menu/add.ftl
+++ b/len-sys/src/main/resources/ftl/system/menu/add.ftl
@@ -1,277 +1,278 @@
 <#include "/system/base/formHead.ftl">
 
 <div class="x-body">
-    <form class="layui-form layui-form-pane" style="margin-left: 20px;">
-        <div style="width:100%;height:500px;overflow: auto;">
-            <div class="layui-form-item">
-                <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                    <legend style="font-size:16px;">基础信息</legend>
-                </fieldset>
-            </div>
-            <div style="margin-left:25%">
+	<form class="layui-form layui-form-pane" style="margin-left: 20px;">
+		<div style="width:100%;height:500px;overflow: auto;">
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">基础信息</legend>
+				</fieldset>
+			</div>
+			<div style="margin-left:25%">
 
                 <#--类型-->
-                <div class="layui-form-item">
-                    <label for="menuType" class="layui-form-label">
-                        <span class="x-red">*</span>类型
-                    </label>
-                    <div class="layui-input-block" style="width:190px;">
-                        <select name="menuType" id="menuType" lay-verify="menuType" lay-filter="menuType">
-                            <option value=""></option>
-                            <option value="2">一级菜单</option>
-                            <option value="0">二级菜单</option>
-                            <option value="1">按钮</option>
-                        </select>
-                    </div>
-                </div>
+				<div class="layui-form-item">
+					<label for="menuType" class="layui-form-label">
+						<span class="x-red">*</span>类型
+					</label>
+					<div class="layui-input-block" style="width:190px;">
+						<select name="menuType" id="menuType" lay-verify="menuType" lay-filter="menuType">
+							<option value=""></option>
+							<option value="2">一级菜单</option>
+							<option value="0">二级菜单</option>
+							<option value="1">按钮</option>
+						</select>
+					</div>
+				</div>
 
                 <#--父级菜单-->
-                <div class="layui-form-item" id="pDiv">
-                    <label for="pName" class="layui-form-label">
-                        父级菜单
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="hidden" name="pId" id="pId">
-                        <input type="text" autocomplete="off" id="pName" onclick="showTree();" lay-verify="pName"
-                               class="layui-input">
-                    </div>
-                    <div id="treeNode" style="display:none; position: absolute;z-index:1000;background-color: white;">
-                        <div id="tree"></div>
-                    </div>
-                </div>
+				<div class="layui-form-item" id="pDiv">
+					<label for="pName" class="layui-form-label">
+						父级菜单
+					</label>
+					<div class="layui-input-inline">
+						<input type="hidden" name="pId" id="pId">
+						<input type="text" autocomplete="off" id="pName" onclick="showTree();" lay-verify="pName"
+							   class="layui-input">
+					</div>
+					<div id="treeNode" style="display:none; position: absolute;z-index:1000;background-color: white;">
+						<div id="tree"></div>
+					</div>
+				</div>
 
                 <#--名称-->
-                <div class="layui-form-item">
-                    <label for="name" class="layui-form-label">
-                        <span class="x-red">*</span>名称
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="name" name="name" lay-verify="name"
-                               autocomplete="off" class="layui-input">
-                    </div>
-                    <div id="ms" class="layui-form-mid layui-word-aux">
-                        <span class="x-red">*</span><span id="ums">必须填写</span>
-                    </div>
-                </div>
+				<div class="layui-form-item">
+					<label for="name" class="layui-form-label">
+						<span class="x-red">*</span>名称
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" id="name" name="name" lay-verify="name"
+							   autocomplete="off" class="layui-input">
+					</div>
+					<div id="ms" class="layui-form-mid layui-word-aux">
+						<span class="x-red">*</span><span id="ums">必须填写</span>
+					</div>
+				</div>
 
                 <#--url-->
-                <div class="layui-form-item">
-                    <label for="url" class="layui-form-label">
-                        url
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="url" name="url" lay-verify="url" autocomplete="off" class="layui-input">
-                    </div>
-                </div>
+				<div class="layui-form-item">
+					<label for="url" class="layui-form-label">
+						url
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" id="url" name="url" lay-verify="url" autocomplete="off" class="layui-input">
+					</div>
+				</div>
 
                 <#--权限-->
-                <div class="layui-form-item">
-                    <label for="permission" class="layui-form-label">
-                        <span class="x-red">*</span>权限
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="permission" name="permission" lay-verify="permission"
-                               autocomplete="off" class="layui-input">
-                    </div>
-                </div>
+				<div class="layui-form-item">
+					<label for="permission" class="layui-form-label">
+						<span class="x-red">*</span>权限
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" id="permission" name="permission" lay-verify="permission"
+							   autocomplete="off" class="layui-input">
+					</div>
+				</div>
 
                 <#--图标-->
-                <div class="layui-form-item">
-                    <label for="menu-icon" class="layui-form-label">
-                        <span class="x-red">*</span>图标
-                    </label>
-                    <div class="layui-input-inline">
-                        <div style="margin-left: 20px;margin-top:5px">
-                            <ul>
-                                <li style="display: inline-block;width: 50px;">
-                                    <i id="menu-icon" class="layui-icon" style="font-size: 25px;">&#xe671;</i>
-                                </li>
-                                <li style="display: inline-block;">
-                                    <i class="layui-btn layui-btn-primary layui-btn-sm"
-                                       id="select_icon">选择图标</i>
-                                </li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
+				<div class="layui-form-item">
+					<label for="menu-icon" class="layui-form-label">
+						<span class="x-red">*</span>图标
+					</label>
+					<div class="layui-input-inline">
+						<div style="margin-left: 20px;margin-top:5px">
+							<ul>
+								<li style="display: inline-block;width: 50px;">
+									<i id="menu-icon" class="layui-icon" style="font-size: 25px;">&#xe671;</i>
+								</li>
+								<li style="display: inline-block;">
+									<i class="layui-btn layui-btn-primary layui-btn-sm"
+									   id="select_icon">选择图标</i>
+								</li>
+							</ul>
+						</div>
+					</div>
+				</div>
 
                 <#--序号-->
-                <div class="layui-form-item">
-                    <label for="orderNum" class="layui-form-label">
-                        <span class="x-red">*</span>序号
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="orderNum" id="orderNum" name="orderNum" lay-verify="orderNum"
-                               autocomplete="off" class="layui-input" maxlength="4">
-                    </div>
-                </div>
-                <div style="height: 60px"></div>
-            </div>
-        </div>
-        <div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
+				<div class="layui-form-item">
+					<label for="orderNum" class="layui-form-label">
+						<span class="x-red">*</span>序号
+					</label>
+					<div class="layui-input-inline">
+						<input type="orderNum" id="orderNum" name="orderNum" lay-verify="orderNum"
+							   autocomplete="off" class="layui-input" maxlength="4">
+					</div>
+				</div>
+				<div style="height: 60px"></div>
+			</div>
+		</div>
+		<div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
   position: fixed;bottom: 1px;margin-left:-20px;">
-            <div class="layui-form-item" style=" float: right;margin-right: 30px;margin-top: 8px">
-                <button type="submit" class="layui-btn layui-btn-normal" lay-filter="add" lay-submit="">
-                    增加
-                </button>
-                <button type="button" class="layui-btn layui-btn-primary" id="close">
-                    取消
-                </button>
-            </div>
-        </div>
-    </form>
+			<div class="layui-form-item" style=" float: right;margin-right: 30px;margin-top: 8px">
+				<button type="submit" class="layui-btn layui-btn-normal" lay-filter="add" lay-submit="">
+					增加
+				</button>
+				<button type="button" class="layui-btn layui-btn-primary" id="close">
+					取消
+				</button>
+			</div>
+		</div>
+	</form>
 </div>
 
 <#--js-->
 <script>
-    layui.use(['form', 'layer', 'tree'], function () {
-        $ = layui.jquery;
-        var form = layui.form
-            , layer = layui.layer, tree = layui.tree;
-        var menus =${menus};
-        /*过滤掉按钮和兼容新版layui*/
-        var convert = function (menus) {
-            menus.find(function (v) {
-                v['title'] = v.name;
-                if (v.children.length > 0) {
-                    var isButton = v.children[0].menuType === 1;
-                    if (isButton) {
-                        v.children = [];
-                    } else {
-                        convert(v.children);
-                    }
-                }
-            });
-        };
-        convert(menus);
-        tree.render({
-            elem: '#tree',
-            data: menus
-            , click: function (node) {
-                var data = node.data;
-                $('#pId').val(data.id);
-                $('#pName').val(data.name);
-            }
-        });
-        $('#select_icon').click(function () {
-            parent.layer.open({
-                id: 'icon',
-                type: 2,
-                area: ['800px', '600px'],
-                shade: 0.4,
-                zIndex: layer.zIndex,
-                title: '图标',
-                content: '../plugin/html/icon.html?param.parentname=' + window.name,
-            });
-        });
+	layui.use(['form', 'layer', 'tree'], function () {
+		$ = layui.jquery;
+		var form = layui.form
+			, layer = layui.layer, tree = layui.tree;
+		var menus = ${menus};
+		/*过滤掉按钮和兼容新版layui*/
+		var convert = function (menus) {
+			menus.find(function (v) {
+				v['title'] = v.name;
+				if (v.children.length > 0) {
+					var isButton = v.children[0].menuType === 1;
+					if (isButton) {
+						v.children = [];
+					} else {
+						convert(v.children);
+					}
+				}
+			});
+		};
+		convert(menus);
+		tree.render({
+			elem: '#tree',
+			data: menus
+			, click: function (node) {
+				var data = node.data;
+				$('#pId').val(data.id);
+				$('#pName').val(data.name);
+			}
+		});
+		$('#select_icon').click(function () {
+			parent.layer.open({
+				id: 'icon',
+				type: 2,
+				area: ['800px', '600px'],
+				shade: 0.4,
+				zIndex: layer.zIndex,
+				title: '图标',
+				content: '../plugin/html/icon.html?param.parentname=' + window.name,
+			});
+		});
 
-        //自定义验证规则
-        var type = $('#menuType');
-        form.verify({
-            menuType: function (v) {
-                if (Len.isEmpty(v)) {
-                    return '类型不能为空';
-                }
-            }, pName: function (v) {
-                if (type.val() !== '2' && v.trim() === '') {
-                    return '父菜单不能为空';
-                }
-            }, name: function (v) {
-                if (Len.isEmpty(v)) {
-                    return '名称不能为空';
-                }
-            }, url: function (v) {
-                if (type.val() === '1') {
-                    $('#url').val('');
-                }
-                if (type.val() === '0' && Len.isEmpty(v)) {
-                    return 'url不能为空';
-                }
-            }, permission: function (v) {
-                if ((type.val() === '1' || type.val() === '0') && v.trim() === '') {
-                    return '权限不能为空';
-                }
-            }, orderNum: [/^[0-9]*[1-9][0-9]*$/, '请填写序号(正整数)']
-        });
+		//自定义验证规则
+		var type = $('#menuType');
+		form.verify({
+			menuType: function (v) {
+				if (Len.isEmpty(v)) {
+					return '类型不能为空';
+				}
+			}, pName: function (v) {
+				if (type.val() !== '2' && v.trim() === '') {
+					return '父菜单不能为空';
+				}
+			}, name: function (v) {
+				if (Len.isEmpty(v)) {
+					return '名称不能为空';
+				}
+			}, url: function (v) {
+				if (type.val() === '1') {
+					$('#url').val('');
+				}
+				if (type.val() === '0' && Len.isEmpty(v)) {
+					return 'url不能为空';
+				}
+			}, permission: function (v) {
+				if ((type.val() === '1' || type.val() === '0') && v.trim() === '') {
+					return '权限不能为空';
+				}
+			}, orderNum: [/^[0-9]*[1-9][0-9]*$/, '请填写序号(正整数)']
+		});
 
-        form.on('select(menuType)', function (data) {
-            if (data.value === '2') {
-                $('#pId').val('');
-                dOs('pName', true);
-                dOs('permission', true);
-                dOs('url', false);
-            } else if (data.value === '1') {
-                //按钮
-                dOs('url', true);
-                dOs('pName', false);
-                dOs('permission', false);
-            } else if (data.value === '0') {
-                dOs('url', false);
-                dOs('pName', false);
-                dOs('permission', false);
-            }
-        });
+		form.on('select(menuType)', function (data) {
+			if (data.value === '2') {
+				$('#pId').val('');
+				dOs('pName', true);
+				dOs('permission', true);
+				dOs('url', false);
+			} else if (data.value === '1') {
+				//按钮
+				dOs('url', true);
+				dOs('pName', false);
+				dOs('permission', false);
+			} else if (data.value === '0') {
+				dOs('url', false);
+				dOs('pName', false);
+				dOs('permission', false);
+			}
+		});
 
-        /**
-         * id :元素id
-         * flag true:禁止输入，false 允许输入
-         */
-        function dOs(id, flag) {
-            var $id = $("#" + id);
-            if (flag) {
-                $id.val('');
-                $id.attr('disabled', 'disabled').css('background', '#e6e6e6');
-            } else
-                $id.removeAttr('disabled').css('background', 'white')
-        }
+		/**
+		 * id :元素id
+		 * flag true:禁止输入，false 允许输入
+		 */
+		function dOs(id, flag) {
+			var $id = $("#" + id);
+			if (flag) {
+				$id.val('');
+				$id.attr('disabled', 'disabled').css('background', '#e6e6e6');
+			} else
+				$id.removeAttr('disabled').css('background', 'white')
+		}
 
-        $('#close').click(function () {
-            var index = parent.layer.getFrameIndex(window.name);
-            parent.layer.close(index);
-        });
-        //监听提交
-        form.on('submit(add)', function (data) {
-            data.field['icon'] = $('#menu-icon').text();
-            Len.layerAjax('addMenu', data.field, 'treeList');
-            return false;
-        });
-        form.render();
-    });
+		$('#close').click(function () {
+			var index = parent.layer.getFrameIndex(window.name);
+			parent.layer.close(index);
+		});
+		//监听提交
+		form.on('submit(add)', function (data) {
+			data.field['icon'] = $('#menu-icon').text();
+			Len.layerAjax('addMenu', data.field, 'treeList');
+			return false;
+		});
+		form.render();
+	});
 
 
-    function showTree() {
-        var p = $('#pName');
-        var cityObj = p;
-        var cityOffset = p.offset();
-        var width = p.css('width');
-        $('#treeNode').css({
-            left: cityOffset.left + 'px',
-            top: cityOffset.top + cityObj.outerHeight() + 'px',
-            width: width,
-            border: '1px solid #e6e6e6'
-        }).slideDown('fast');
-        $('body').bind('mousedown', onBodyDown);
-        $('#treeNode').css('display', 'inline');
-    }
+	function showTree() {
+		var p = $('#pName');
+		var cityObj = p;
+		var cityOffset = p.offset();
+		var width = p.css('width');
+		$('#treeNode').css({
+			left: cityOffset.left + 'px',
+			top: cityOffset.top + cityObj.outerHeight() + 'px',
+			width: width,
+			border: '1px solid #e6e6e6'
+		}).slideDown('fast');
+		$('body').bind('mousedown', onBodyDown);
+		$('#treeNode').css('display', 'inline');
+	}
 
 
-    function hideMenu() {
-        $('#treeNode').fadeOut('fast');
-        $('body').unbind('blur', onBodyDown);
-    }
+	function hideMenu() {
+		$('#treeNode').fadeOut('fast');
+		$('body').unbind('blur', onBodyDown);
+	}
 
 
-    function onBodyDown(event) {
-        if (!(event.target.id == 'treeNode' || $(event.target).parents('#treeNode').length > 0)) {
-            hideMenu();
-        }
-    }
+	function onBodyDown(event) {
+		if (!(event.target.id == 'treeNode' || $(event.target).parents('#treeNode').length > 0)) {
+			hideMenu();
+		}
+	}
 
-    function callback(id) {
-        $('#layui-layer-iframe1').contents().find('#menu-icon').val(id);
-    }
-    window.memuCallback=function(id){
-        debugger
-        callback(id)
-    };
+	function callback(id) {
+		$('#layui-layer-iframe1').contents().find('#menu-icon').val(id);
+	}
+
+	window.memuCallback = function (id) {
+		debugger
+		callback(id)
+	};
 </script>
diff --git a/len-sys/src/main/resources/ftl/system/menu/menuList.ftl b/len-sys/src/main/resources/ftl/system/menu/menuList.ftl
index b57ebbe..b570621 100644
--- a/len-sys/src/main/resources/ftl/system/menu/menuList.ftl
+++ b/len-sys/src/main/resources/ftl/system/menu/menuList.ftl
@@ -2,18 +2,18 @@
 
 <#--搜索-->
 <div class="lenos-search">
-    <div class="search-select">
+	<div class="search-select">
         <@lenInclude path="/system/base/queryBox.ftl" name="菜单名称" id="name" ></@lenInclude>
-    </div>
+	</div>
 </div>
 <hr class="layui-bg-gray">
 
 <#--按钮-->
 <div class="layui-btn-container len-button">
-    <div class="layui-btn-group menu-bar">
+	<div class="layui-btn-group menu-bar">
         <#include "/system/base/searth.ftl">
         <@lenInclude path="/system/base/btn.ftl" type="add" name="新增" icon="&#xe608;"></@lenInclude>
-    </div>
+	</div>
 </div>
 
 <#--表格-->
@@ -22,94 +22,94 @@
 
 <!-- 表格操作列 -->
 <script type="text/html" id="tbBar">
-    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
-    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
+	<a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">修改</a>
+	<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
 </script>
 
 
 <script type="text/javascript">
-    /*加载treetable 模块*/
-    layui.config({
-        base: '${re.contextPath}/plugin/layui/modules/'
-    }).extend({
-        treeTable: 'treeTable'
-    });
-    /*渲染tree table*/
-    layui.use(['treeTable'], function () {
-        var $ = layui.jquery;
-        var treeTable = layui.treeTable;
+	/*加载treetable 模块*/
+	layui.config({
+		base: '${re.contextPath}/plugin/layui/modules/'
+	}).extend({
+		treeTable: 'treeTable'
+	});
+	/*渲染tree table*/
+	layui.use(['treeTable'], function () {
+		var $ = layui.jquery;
+		var treeTable = layui.treeTable;
 
-        // 渲染表格
-        table = treeTable.render({
-            elem: '#treeList',
-            url: 'menu/showMenuList',
-            tree: {
-                iconIndex: 2,
-                isPidData: true,
-                idName: 'id',
-                pidName: 'pid'
-            },
-            cols: [[
-                {type: 'numbers'},
-                {type: 'checkbox'},
-                {field: 'name', title: '菜单名称', minWidth: 165},
-                {
-                    title: '图标',
-                    templet: function (d) {
-                        if (typeof (d.icon) != "undefined") {
-                            return '<i class="layui-icon">' + d.icon + '</i>';
-                        }
-                    },
-                },
-                {title: '类型', templet: '<p>{{d.menuType=="1"?"按钮":"菜单"}}</p>', align: 'center', width: 60},
-                {field: 'url', title: '菜单地址'},
-                {field: 'permission', title: '权限标识'},
-                // {title: '创建时间', templet: '<div>{{ moment(+d.createDate).format(\'yyyy-MM-dd\') }}</div>'},
-                {align: 'center', toolbar: '#tbBar', title: '操作', width: 120}
-            ]],
-            style: 'margin-top:0;'
-        });
-        var active = {
+		// 渲染表格
+		table = treeTable.render({
+			elem: '#treeList',
+			url: 'menu/showMenuList',
+			tree: {
+				iconIndex: 2,
+				isPidData: true,
+				idName: 'id',
+				pidName: 'pid'
+			},
+			cols: [[
+				{type: 'numbers'},
+				{type: 'checkbox'},
+				{field: 'name', title: '菜单名称', minWidth: 165},
+				{
+					title: '图标',
+					templet: function (d) {
+						if (typeof (d.icon) != "undefined") {
+							return '<i class="layui-icon">' + d.icon + '</i>';
+						}
+					},
+				},
+				{title: '类型', templet: '<p>{{d.menuType=="1"?"按钮":"菜单"}}</p>', align: 'center', width: 60},
+				{field: 'url', title: '菜单地址'},
+				{field: 'permission', title: '权限标识'},
+				// {title: '创建时间', templet: '<div>{{ moment(+d.createDate).format(\'yyyy-MM-dd\') }}</div>'},
+				{align: 'center', toolbar: '#tbBar', title: '操作', width: 120}
+			]],
+			style: 'margin-top:0;'
+		});
+		var active = {
 
-            /*查询*/
-            select: function () {
-                table.reload({
-                    where: {
-                        name: $('#name').val(),
-                    }
-                });
-            },
-            /*重置*/
-            reload: function () {
-                $('#name').val('');
-                table.reload({
-                    where: {
-                        name: '',
-                    }
-                });
-            },
+			/*查询*/
+			select: function () {
+				table.reload({
+					where: {
+						name: $('#name').val(),
+					}
+				});
+			},
+			/*重置*/
+			reload: function () {
+				$('#name').val('');
+				table.reload({
+					where: {
+						name: '',
+					}
+				});
+			},
 
-            /*添加*/
-            add: function () {
-                Len.add('menu/showAddMenu','','menu');
-            },
-        };
+			/*添加*/
+			add: function () {
+				Len.add('menu/showAddMenu', '', 'menu');
+			},
+		};
 
-        treeTable.on('tool(treeList)', function (obj) {
-            var event = obj.event, data = obj.data;
-            switch (event) {
-                case "edit":
-                    Len.update('menu/showUpdateMenu?id=' + data.id);
-                    break;
-                case "del":
-                    Len.delete('menu/del', data.id, function () {
-                        Len.rbSuccess("删除成功");
-                        active.reload();
-                    });
-                    break;
-            }
-        });
-        Len.btnBind($('.menu-bar .layui-btn'), active);
-        Len.keydown(active);
-    });
+		treeTable.on('tool(treeList)', function (obj) {
+			var event = obj.event, data = obj.data;
+			switch (event) {
+				case "edit":
+					Len.update('menu/showUpdateMenu?id=' + data.id);
+					break;
+				case "del":
+					Len.delete('menu/del', data.id, function () {
+						Len.rbSuccess("删除成功");
+						active.reload();
+					});
+					break;
+			}
+		});
+		Len.btnBind($('.menu-bar .layui-btn'), active);
+		Len.keydown(active);
+	});
 </script>
diff --git a/len-sys/src/main/resources/ftl/system/menu/update.ftl b/len-sys/src/main/resources/ftl/system/menu/update.ftl
index 09a7088..fd313d0 100644
--- a/len-sys/src/main/resources/ftl/system/menu/update.ftl
+++ b/len-sys/src/main/resources/ftl/system/menu/update.ftl
@@ -3,264 +3,264 @@
 <#--body-->
 <body>
 <div class="x-body">
-    <form class="layui-form layui-form-pane" style="margin-left: 20px;">
-        <div style="width:100%;height:500px;overflow: auto;">
-            <div class="layui-form-item">
-                <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                    <legend style="font-size:16px;">基础信息</legend>
-                </fieldset>
-            </div>
-            <div style="margin-left:25%">
-                <div class="layui-form-item">
-                    <label for="menuType" class="layui-form-label">
-                        <span class="x-red">*</span>类型
-                    </label>
-                    <div class="layui-input-block" style="width:190px;">
-                        <select disabled id="menuType" lay-verify="menuType" lay-filter="menuType">
-                            <option value=""></option>
-                            <option <#if (sysMenu.PId)??==null>selected</#if> value="2">一级菜单</option>
-                            <option <#if sysMenu.menuType='0'&&(sysMenu.PId)??>selected</#if> value="0">
-                                二级菜单
-                            </option>
-                            <option <#if sysMenu.menuType=='1'>selected</#if> value="1">按钮</option>
-                        </select>
-                    </div>
-                </div>
-                <div class="layui-form-item" id="pDiv">
-                    <label for="pName" class="layui-form-label">
-                        父级菜单
-                    </label>
-                    <div class="layui-input-inline">
+	<form class="layui-form layui-form-pane" style="margin-left: 20px;">
+		<div style="width:100%;height:500px;overflow: auto;">
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">基础信息</legend>
+				</fieldset>
+			</div>
+			<div style="margin-left:25%">
+				<div class="layui-form-item">
+					<label for="menuType" class="layui-form-label">
+						<span class="x-red">*</span>类型
+					</label>
+					<div class="layui-input-block" style="width:190px;">
+						<select disabled id="menuType" lay-verify="menuType" lay-filter="menuType">
+							<option value=""></option>
+							<option <#if (sysMenu.PId)??==null>selected</#if> value="2">一级菜单</option>
+							<option <#if sysMenu.menuType='0'&&(sysMenu.PId)??>selected</#if> value="0">
+								二级菜单
+							</option>
+							<option <#if sysMenu.menuType=='1'>selected</#if> value="1">按钮</option>
+						</select>
+					</div>
+				</div>
+				<div class="layui-form-item" id="pDiv">
+					<label for="pName" class="layui-form-label">
+						父级菜单
+					</label>
+					<div class="layui-input-inline">
                         <#-- <input type="hidden"  id="pId" value="${sysMenu.PId}">-->
                         <#--保留 但不做更新-->
-                        <input type="text" id="pName" disabled value="${pName}" onclick="showTree();" lay-verify="pName"
-                               class="layui-input">
-                    </div>
-                    <div id="treeNode" style="display:none; position: absolute;z-index:1000;background-color: white;">
-                        <div id="tree"></div>
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label for="name" class="layui-form-label">
-                        <span class="x-red">*</span>名称
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="text" value="${sysMenu.name}" id="name" name="name" lay-verify="name"
-                               autocomplete="off" class="layui-input">
-                    </div>
-                    <div id="ms" class="layui-form-mid layui-word-aux">
-                        <span class="x-red">*</span><span id="ums">必须填写</span>
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label for="url" class="layui-form-label">
-                        url
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="text" value="${sysMenu.url}" id="url" name="url" lay-verify="urls"
-                               autocomplete="off" class="layui-input">
-                    </div>
-                </div>
-                <div class="layui-form-item">
+						<input type="text" id="pName" disabled value="${pName}" onclick="showTree();" lay-verify="pName"
+							   class="layui-input">
+					</div>
+					<div id="treeNode" style="display:none; position: absolute;z-index:1000;background-color: white;">
+						<div id="tree"></div>
+					</div>
+				</div>
+				<div class="layui-form-item">
+					<label for="name" class="layui-form-label">
+						<span class="x-red">*</span>名称
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" value="${sysMenu.name}" id="name" name="name" lay-verify="name"
+							   autocomplete="off" class="layui-input">
+					</div>
+					<div id="ms" class="layui-form-mid layui-word-aux">
+						<span class="x-red">*</span><span id="ums">必须填写</span>
+					</div>
+				</div>
+				<div class="layui-form-item">
+					<label for="url" class="layui-form-label">
+						url
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" value="${sysMenu.url}" id="url" name="url" lay-verify="urls"
+							   autocomplete="off" class="layui-input">
+					</div>
+				</div>
+				<div class="layui-form-item">
 
-                    <label for="permission" class="layui-form-label">
-                        <span class="x-red">*</span>权限
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="text" value="${sysMenu.permission}" id="permission" name="permission"
-                               lay-verify="permission"
-                               autocomplete="off" class="layui-input">
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label for="menu-icon" class="layui-form-label">
-                        <span class="x-red">*</span>图标
-                    </label>
-                    <div class="layui-input-inline">
-                        <div style="margin-left: 20px;margin-top:5px">
-                            <ul>
-                                <li style="display: inline-block;width: 50px;">
-                                    <i  id="menu-icon" class="layui-icon" style="font-size: 25px;">${sysMenu.icon}</i>
-                                </li>
-                                <li style="display: inline-block;"><i class="layui-btn layui-btn-primary layui-btn-sm"
-                                                                      id="select_icon">选择图标</i></li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-                <div class="layui-form-item">
-                    <label for="orderNum" class="layui-form-label">
-                        <span class="x-red">*</span>序号
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="orderNum" value="${sysMenu.orderNum}" name="orderNum"
-                               lay-verify="orderNum"
-                               autocomplete="off" class="layui-input">
-                    </div>
-                </div>
-                <div style="height: 60px"></div>
-            </div>
-        </div>
-        <div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
+					<label for="permission" class="layui-form-label">
+						<span class="x-red">*</span>权限
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" value="${sysMenu.permission}" id="permission" name="permission"
+							   lay-verify="permission"
+							   autocomplete="off" class="layui-input">
+					</div>
+				</div>
+				<div class="layui-form-item">
+					<label for="menu-icon" class="layui-form-label">
+						<span class="x-red">*</span>图标
+					</label>
+					<div class="layui-input-inline">
+						<div style="margin-left: 20px;margin-top:5px">
+							<ul>
+								<li style="display: inline-block;width: 50px;">
+									<i id="menu-icon" class="layui-icon" style="font-size: 25px;">${sysMenu.icon}</i>
+								</li>
+								<li style="display: inline-block;"><i class="layui-btn layui-btn-primary layui-btn-sm"
+																	  id="select_icon">选择图标</i></li>
+							</ul>
+						</div>
+					</div>
+				</div>
+				<div class="layui-form-item">
+					<label for="orderNum" class="layui-form-label">
+						<span class="x-red">*</span>序号
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" id="orderNum" value="${sysMenu.orderNum}" name="orderNum"
+							   lay-verify="orderNum"
+							   autocomplete="off" class="layui-input">
+					</div>
+				</div>
+				<div style="height: 60px"></div>
+			</div>
+		</div>
+		<div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
   position: fixed;bottom: 1px;margin-left:-20px;">
-            <div class="layui-form-item" style=" float: right;margin-right: 30px;margin-top: 8px">
-                <button class="layui-btn layui-btn-normal" lay-filter="add" lay-submit>
-                    更新
-                </button>
-                <button class="layui-btn layui-btn-primary" id="close">
-                    取消
-                </button>
-            </div>
-        </div>
-    </form>
+			<div class="layui-form-item" style=" float: right;margin-right: 30px;margin-top: 8px">
+				<button class="layui-btn layui-btn-normal" lay-filter="add" lay-submit>
+					更新
+				</button>
+				<button class="layui-btn layui-btn-primary" id="close">
+					取消
+				</button>
+			</div>
+		</div>
+	</form>
 </div>
 
 <#--js-->
 <script>
-    layui.use(['form', 'layer', 'tree'], function () {
-        $ = layui.jquery;
-        var form = layui.form
-            , layer = layui.layer, tree = layui.tree;
-        var menus =${menus};
-        /*过滤掉按钮和兼容新版layui*/
-        var convert = function (menus) {
-            menus.find(function (v) {
-                v['title'] = v.name;
-                if (v.children.length > 0) {
-                    var isButton = v.children[0].menuType === 1;
-                    if (isButton) {
-                        v.children = [];
-                    } else {
-                        convert(v.children);
-                    }
-                }
-            });
-        };
-        convert(menus);
-        tree.render({
-            elem: '#tree',
-            nodes: menus
-            , click: function (node) {
-                var data = node.data;
-                $('#pId').val(data.id);
-                $('#pName').val(data.name);
-            }
-        });
-        $('#select_icon').click(function () {
-            parent.layer.open({
-                id: 'icon',
-                type: 2,
-                area: ['800px', '600px'],
-                shade: 0.4,
-                zIndex: layer.zIndex,
-                title: '图标',
-                content: '../plugin/html/icon.html?param.parentname=' + window.name,
-            });
-        });
+	layui.use(['form', 'layer', 'tree'], function () {
+		$ = layui.jquery;
+		var form = layui.form
+			, layer = layui.layer, tree = layui.tree;
+		var menus = ${menus};
+		/*过滤掉按钮和兼容新版layui*/
+		var convert = function (menus) {
+			menus.find(function (v) {
+				v['title'] = v.name;
+				if (v.children.length > 0) {
+					var isButton = v.children[0].menuType === 1;
+					if (isButton) {
+						v.children = [];
+					} else {
+						convert(v.children);
+					}
+				}
+			});
+		};
+		convert(menus);
+		tree.render({
+			elem: '#tree',
+			nodes: menus
+			, click: function (node) {
+				var data = node.data;
+				$('#pId').val(data.id);
+				$('#pName').val(data.name);
+			}
+		});
+		$('#select_icon').click(function () {
+			parent.layer.open({
+				id: 'icon',
+				type: 2,
+				area: ['800px', '600px'],
+				shade: 0.4,
+				zIndex: layer.zIndex,
+				title: '图标',
+				content: '../plugin/html/icon.html?param.parentname=' + window.name,
+			});
+		});
 
-        //自定义验证规则
-        var type = $('#menuType');
-        form.verify({
-            menuType: function (v) {
-                if (Len.isEmpty(v)) {
-                    return '类型不能为空';
-                }
-            }
-            , pName: function (v) {
-                if (type.val() !== '2' && v.trim() === '') {
-                    return '父菜单不能为空';
-                }
-            }
-            , name: function (v) {
-                if (Len.isEmpty(v.trim())) {
-                    return '名称不能为空';
-                }
-            }
-            , urls: function (v) {
-                if (type.val() === '1') {
-                    $('#url').val('');
-                }
-                if (type.val() === '0' && v.trim() === '') {
-                    return 'url不能为空';
-                }
-            }
-            , permission: function (v) {
-                if ((type.val() === '1' || type.val() === '0') && v.trim() === '') {
-                    return '权限不能为空';
-                }
-            }
-            , orderNum: [/^[0-9]*[1-9][0-9]*$/, '请填写序号(正整数)']
-        });
+		//自定义验证规则
+		var type = $('#menuType');
+		form.verify({
+			menuType: function (v) {
+				if (Len.isEmpty(v)) {
+					return '类型不能为空';
+				}
+			}
+			, pName: function (v) {
+				if (type.val() !== '2' && v.trim() === '') {
+					return '父菜单不能为空';
+				}
+			}
+			, name: function (v) {
+				if (Len.isEmpty(v.trim())) {
+					return '名称不能为空';
+				}
+			}
+			, urls: function (v) {
+				if (type.val() === '1') {
+					$('#url').val('');
+				}
+				if (type.val() === '0' && v.trim() === '') {
+					return 'url不能为空';
+				}
+			}
+			, permission: function (v) {
+				if ((type.val() === '1' || type.val() === '0') && v.trim() === '') {
+					return '权限不能为空';
+				}
+			}
+			, orderNum: [/^[0-9]*[1-9][0-9]*$/, '请填写序号(正整数)']
+		});
 
-        form.on('select(menuType)', function (data) {
-            if (data.value === '2') {
-                $('#pId').val('');
-                dOs('pName', true);
-                dOs('permission', true);
-                dOs('url', false);
-            } else if (data.value === '1') {//按钮
-                dOs('url', true);
-                dOs('pName', false);
-                dOs('permission', false);
-            } else if (data.value === '0') {
-                dOs('url', false);
-                dOs('pName', false);
-                dOs('permission', false);
-            }
-        });
+		form.on('select(menuType)', function (data) {
+			if (data.value === '2') {
+				$('#pId').val('');
+				dOs('pName', true);
+				dOs('permission', true);
+				dOs('url', false);
+			} else if (data.value === '1') {//按钮
+				dOs('url', true);
+				dOs('pName', false);
+				dOs('permission', false);
+			} else if (data.value === '0') {
+				dOs('url', false);
+				dOs('pName', false);
+				dOs('permission', false);
+			}
+		});
 
-        /**
-         * id :元素id
-         * flag true:禁止输入，false 允许输入
-         */
-        function dOs(id, flag) {
-            var $id = $("#" + id);
-            if (flag) {
-                $id.val('');
-                $id.attr('disabled', 'disabled').css('background', '#e6e6e6');
-            } else
-                $id.removeAttr('disabled').css('background', 'white')
-        }
+		/**
+		 * id :元素id
+		 * flag true:禁止输入，false 允许输入
+		 */
+		function dOs(id, flag) {
+			var $id = $("#" + id);
+			if (flag) {
+				$id.val('');
+				$id.attr('disabled', 'disabled').css('background', '#e6e6e6');
+			} else
+				$id.removeAttr('disabled').css('background', 'white')
+		}
 
-        $('#close').click(function () {
-            var index = parent.layer.getFrameIndex(window.name);
-            parent.layer.close(index);
-        });
-        //监听提交
-        form.on('submit(add)', function (data) {
-            data.field['icon'] = $('#menu-icon').text();
-            data.field['id'] = '${sysMenu.id}';
-            Len.layerAjax('updateMenu', data.field, 'treeList');
-            return false;
-        });
-        form.render();
-    });
+		$('#close').click(function () {
+			var index = parent.layer.getFrameIndex(window.name);
+			parent.layer.close(index);
+		});
+		//监听提交
+		form.on('submit(add)', function (data) {
+			data.field['icon'] = $('#menu-icon').text();
+			data.field['id'] = '${sysMenu.id}';
+			Len.layerAjax('updateMenu', data.field, 'treeList');
+			return false;
+		});
+		form.render();
+	});
 
-    function showTree() {
-        var p = $('#pName');
-        var cityObj = p;
-        var cityOffset = p.offset();
-        var width = p.css('width');
-        $('#treeNode').css({
-            left: cityOffset.left + 'px',
-            top: cityOffset.top + cityObj.outerHeight() + 'px',
-            width: width,
-            border: '1px solid #e6e6e6'
-        }).slideDown('fast');
-        $('body').bind('mousedown', onBodyDown);
-        $('#treeNode').css('display', 'inline');
-    }
+	function showTree() {
+		var p = $('#pName');
+		var cityObj = p;
+		var cityOffset = p.offset();
+		var width = p.css('width');
+		$('#treeNode').css({
+			left: cityOffset.left + 'px',
+			top: cityOffset.top + cityObj.outerHeight() + 'px',
+			width: width,
+			border: '1px solid #e6e6e6'
+		}).slideDown('fast');
+		$('body').bind('mousedown', onBodyDown);
+		$('#treeNode').css('display', 'inline');
+	}
 
-    function hideMenu() {
-        $('#treeNode').fadeOut('fast');
-        $('body').unbind('blur', onBodyDown);
-    }
+	function hideMenu() {
+		$('#treeNode').fadeOut('fast');
+		$('body').unbind('blur', onBodyDown);
+	}
 
-    function onBodyDown(event) {
-        if (!(event.target.id == 'treeNode' || $(event.target).parents('#treeNode').length > 0)) {
-            hideMenu();
-        }
-    }
+	function onBodyDown(event) {
+		if (!(event.target.id == 'treeNode' || $(event.target).parents('#treeNode').length > 0)) {
+			hideMenu();
+		}
+	}
 </script>
 </body>
 
diff --git a/len-sys/src/main/resources/ftl/system/person/me.ftl b/len-sys/src/main/resources/ftl/system/person/me.ftl
index 475ee66..4f1d7c5 100644
--- a/len-sys/src/main/resources/ftl/system/person/me.ftl
+++ b/len-sys/src/main/resources/ftl/system/person/me.ftl
@@ -1,180 +1,180 @@
 <script type="text/javascript" src="/plugin/tools/update-setting.js"></script>
 
 <form class="layui-form layui-form-pane" style="margin-left: 20px;">
-    <div class="layui-form-item">
-        <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-            <legend style="font-size:16px;">头像上传</legend>
-        </fieldset>
-        <div class="layui-input-inline">
-            <div class="layui-upload-drag" style="margin-left:10%;" id="test10">
-                <i style="font-size:30px;" class="layui-icon"></i>
-                <p style="font-size: 10px">点击上传，或将文件拖拽到此处</p>
-            </div>
-        </div>
-        <div class="layui-input-inline">
+	<div class="layui-form-item">
+		<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+			<legend style="font-size:16px;">头像上传</legend>
+		</fieldset>
+		<div class="layui-input-inline">
+			<div class="layui-upload-drag" style="margin-left:10%;" id="test10">
+				<i style="font-size:30px;" class="layui-icon"></i>
+				<p style="font-size: 10px">点击上传，或将文件拖拽到此处</p>
+			</div>
+		</div>
+		<div class="layui-input-inline">
 
-            <div id="demo2" style="margin-top: 20px;margin-left: 50px">
-                <img src="/images/${re.contextPath}/${user.photo}" width="100px" height="100px"
-                     class="layui-upload-img layui-circle">
-            </div>
+			<div id="demo2" style="margin-top: 20px;margin-left: 50px">
+				<img src="/images/${re.contextPath}/${user.photo}" width="100px" height="100px"
+					 class="layui-upload-img layui-circle">
+			</div>
 
-        </div>
-    </div>
-    <div class="layui-form-item">
-        <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-            <legend style="font-size:16px;">基础信息</legend>
-        </fieldset>
-    </div>
-    <div class="layui-form-item">
-        <label for="uname" class="layui-form-label">
-            <span class="x-red">*</span>用户名
-        </label>
-        <div class="layui-input-inline">
-            <input value="${user.id}" type="hidden" name="id">
-            <input type="text" id="uname" value="${user.username}" readonly lay-verify="username"
-                   autocomplete="off" class="layui-input">
-        </div>
-        <div id="ms" class="layui-form-mid layui-word-aux">
-            <span class="x-red">*</span><span id="ums">将会成为您唯一的登入名</span>
-        </div>
-    </div>
-    <div class="layui-form-item">
-        <div class="layui-inline">
-            <label for="realName" class="layui-form-label">
-                <span class="x-red">*</span>真实姓名
-            </label>
-            <div class="layui-input-inline">
-                <input type="text" id="realName" value="${user.realName}" name="realName" lay-verify="realName"
-                       autocomplete="off" class="layui-input">
-            </div>
-        </div>
-        <div class="layui-inline">
-            <label for="age" class="layui-form-label">
-                <span class="x-red">*</span>年龄
-            </label>
-            <div class="layui-input-inline">
-                <input type="text" id="age" name="age" value="${user.age}" lay-verify="number"
-                       autocomplete="off" class="layui-input">
-            </div>
-        </div>
-    </div>
-    <div>
-        <label for="email" class="layui-form-label">
-            <span class="x-red"></span>邮箱
-        </label>
-        <div class="layui-input-block">
-            <input type="email" id="email" value="${user.email}" style="width: 93%" name="email" lay-verify="email"
-                   autocomplete="off" class="layui-input">
-            <input id="photo" value="${user.photo}" name="photo" type="hidden">
-        </div>
-    </div>
-    <a class="layui-btn layui-btn-normal" lay-filter="*" lay-submit>
-        更新
-    </a>
+		</div>
+	</div>
+	<div class="layui-form-item">
+		<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+			<legend style="font-size:16px;">基础信息</legend>
+		</fieldset>
+	</div>
+	<div class="layui-form-item">
+		<label for="uname" class="layui-form-label">
+			<span class="x-red">*</span>用户名
+		</label>
+		<div class="layui-input-inline">
+			<input value="${user.id}" type="hidden" name="id">
+			<input type="text" id="uname" value="${user.username}" readonly lay-verify="username"
+				   autocomplete="off" class="layui-input">
+		</div>
+		<div id="ms" class="layui-form-mid layui-word-aux">
+			<span class="x-red">*</span><span id="ums">将会成为您唯一的登入名</span>
+		</div>
+	</div>
+	<div class="layui-form-item">
+		<div class="layui-inline">
+			<label for="realName" class="layui-form-label">
+				<span class="x-red">*</span>真实姓名
+			</label>
+			<div class="layui-input-inline">
+				<input type="text" id="realName" value="${user.realName}" name="realName" lay-verify="realName"
+					   autocomplete="off" class="layui-input">
+			</div>
+		</div>
+		<div class="layui-inline">
+			<label for="age" class="layui-form-label">
+				<span class="x-red">*</span>年龄
+			</label>
+			<div class="layui-input-inline">
+				<input type="text" id="age" name="age" value="${user.age}" lay-verify="number"
+					   autocomplete="off" class="layui-input">
+			</div>
+		</div>
+	</div>
+	<div>
+		<label for="email" class="layui-form-label">
+			<span class="x-red"></span>邮箱
+		</label>
+		<div class="layui-input-block">
+			<input type="email" id="email" value="${user.email}" style="width: 93%" name="email" lay-verify="email"
+				   autocomplete="off" class="layui-input">
+			<input id="photo" value="${user.photo}" name="photo" type="hidden">
+		</div>
+	</div>
+	<a class="layui-btn layui-btn-normal" lay-filter="*" lay-submit>
+		更新
+	</a>
 </form>
 </body>
 <script>
-    var flag;
-    $(function () {
-        let name = '${user.username}';
-        if ($('#uname').val() === name)
-            flag = true;
-        let uNameFun = $('#uname');
-        uNameFun.on('blur', function () {
-            let uName = uNameFun.val();
-            if (uName.match(/[\u4e00-\u9fa5]/)) return;
-            if (!/(.+){3,12}$/.test(uName)) return;
+	var flag;
+	$(function () {
+		let name = '${user.username}';
+		if ($('#uname').val() === name)
+			flag = true;
+		let uNameFun = $('#uname');
+		uNameFun.on('blur', function () {
+			let uName = uNameFun.val();
+			if (uName.match(/[\u4e00-\u9fa5]/)) return;
+			if (!/(.+){3,12}$/.test(uName)) return;
 
-            if (uName != '' && uName != name) {
-                $.ajax({
-                    url: 'checkUser?uname=' + uname, async: false, type: 'get', success: function (data) {
-                        flag = data.flag;
-                        $('#ms').find('span').remove();
-                        if (!data.flag) {
-                            msg = data.msg;
-                            $('#ms').append("<span style='color: red;'>" + data.msg + "</span>");
-                            // layer.msg(msg,{icon: 5,anim: 6});
-                        } else {
-                            flag = true;
-                            $('#ms').append("<span style='color: green;'>用户名可用</span>");
-                        }
-                    }, beforeSend: function () {
-                        $('#ms').find('span').remove();
-                        $('#ms').append("<span>验证ing</span>");
-                    }
-                });
-            } else {
-                flag = true;
-            }
-        });
-    });
+			if (uName != '' && uName != name) {
+				$.ajax({
+					url: 'checkUser?uname=' + uname, async: false, type: 'get', success: function (data) {
+						flag = data.flag;
+						$('#ms').find('span').remove();
+						if (!data.flag) {
+							msg = data.msg;
+							$('#ms').append("<span style='color: red;'>" + data.msg + "</span>");
+							// layer.msg(msg,{icon: 5,anim: 6});
+						} else {
+							flag = true;
+							$('#ms').append("<span style='color: green;'>用户名可用</span>");
+						}
+					}, beforeSend: function () {
+						$('#ms').find('span').remove();
+						$('#ms').append("<span>验证ing</span>");
+					}
+				});
+			} else {
+				flag = true;
+			}
+		});
+	});
 
-    layui.use(['form', 'layer', 'upload'], function () {
-        $ = layui.jquery;
-        var form = layui.form
-            , layer = layui.layer,
-            upload = layui.upload;
-        upload.render({
-            elem: '#test10'
-            , url: '/user/upload'
-            , before: function (obj) {
-                //预读，不支持ie8
-                obj.preview(function (index, file, result) {
-                    $('#demo2').find('img').remove();
-                    $('#demo2').append('<img src="' + result + '" alt="' + file.name + '" width="100px" height="100px" class="layui-upload-img layui-circle">');
-                });
-            }, done: function (res) {
-                if (!res.flag) {
-                    layer.msg(res.msg, {icon: 5, anim: 6});
-                } else {
-                    $("#photo").val(res.msg);
-                }
-            }
-        });
+	layui.use(['form', 'layer', 'upload'], function () {
+		$ = layui.jquery;
+		var form = layui.form
+			, layer = layui.layer,
+			upload = layui.upload;
+		upload.render({
+			elem: '#test10'
+			, url: '/user/upload'
+			, before: function (obj) {
+				//预读，不支持ie8
+				obj.preview(function (index, file, result) {
+					$('#demo2').find('img').remove();
+					$('#demo2').append('<img src="' + result + '" alt="' + file.name + '" width="100px" height="100px" class="layui-upload-img layui-circle">');
+				});
+			}, done: function (res) {
+				if (!res.flag) {
+					layer.msg(res.msg, {icon: 5, anim: 6});
+				} else {
+					$("#photo").val(res.msg);
+				}
+			}
+		});
 
-        //自定义验证规则
-        form.verify({
-            username: function (value) {
-                if (Len.isEmpty(value)) {
-                    return "用户名不能为空";
-                }
-                if (value.match(/[\u4e00-\u9fa5]/)) {
-                    return "用户名不能为中文";
-                }
-                if (!/(.+){3,12}$/.test(value)) {
-                    return "用户名必须3到12位";
-                }
-                if (typeof (flag) == 'undefined') {
-                    return "用户名验证ing";
-                }
-                if (!flag) {
-                    return msg;
-                }
-            }
-            , email: function (value) {
-                if (!Len.isEmpty(value)) {
-                    if (!/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/.test(value)) {
-                        return "邮箱格式不正确";
-                    }
-                }
-            }
-        });
+		//自定义验证规则
+		form.verify({
+			username: function (value) {
+				if (Len.isEmpty(value)) {
+					return "用户名不能为空";
+				}
+				if (value.match(/[\u4e00-\u9fa5]/)) {
+					return "用户名不能为中文";
+				}
+				if (!/(.+){3,12}$/.test(value)) {
+					return "用户名必须3到12位";
+				}
+				if (typeof (flag) == 'undefined') {
+					return "用户名验证ing";
+				}
+				if (!flag) {
+					return msg;
+				}
+			}
+			, email: function (value) {
+				if (!Len.isEmpty(value)) {
+					if (!/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/.test(value)) {
+						return "邮箱格式不正确";
+					}
+				}
+			}
+		});
 
-        //监听提交
-        form.on('submit(*)', function (data) {
-            $.ajax({
-                url: '/person/updateUser',
-                type: 'post',
-                data: data.field,
-                traditional: true,
-                success: function (d) {
-                    window.top.layer.msg(d.msg, {icon: 6, offset: 'rb', area: ['200px', '80px'], anim: 2});
+		//监听提交
+		form.on('submit(*)', function (data) {
+			$.ajax({
+				url: '/person/updateUser',
+				type: 'post',
+				data: data.field,
+				traditional: true,
+				success: function (d) {
+					window.top.layer.msg(d.msg, {icon: 6, offset: 'rb', area: ['200px', '80px'], anim: 2});
 
-                }, error: function (e) {
-                    layer.msg('发生错误', {icon: 6});
-                }
-            });
-            return false;
-        });
-    });
-</script>
\ No newline at end of file
+				}, error: function (e) {
+					layer.msg('发生错误', {icon: 6});
+				}
+			});
+			return false;
+		});
+	});
+</script>
diff --git a/len-sys/src/main/resources/ftl/system/role/add.ftl b/len-sys/src/main/resources/ftl/system/role/add.ftl
index 206d7f3..92584ea 100644
--- a/len-sys/src/main/resources/ftl/system/role/add.ftl
+++ b/len-sys/src/main/resources/ftl/system/role/add.ftl
@@ -4,115 +4,115 @@
 <script type="text/javascript" src="${re.contextPath}/plugin/ztree/js/jquery.ztree.core.js"></script>
 <script type="text/javascript" src="${re.contextPath}/plugin/ztree/js/jquery.ztree.excheck.js" charset="utf-8"></script>
 <script type="text/javascript">
-    var setting = {
-        check: {
-            enable: true
-        },
-        data: {
-            simpleData: {
-                enable: true
-            }
-        }
-    };
-    var zNodes =${menus};
-    $(document).ready(function () {
-        $.fn.zTree.init($("#treeDemo"), setting, zNodes);
-    });
+	var setting = {
+		check: {
+			enable: true
+		},
+		data: {
+			simpleData: {
+				enable: true
+			}
+		}
+	};
+	var zNodes = ${menus};
+	$(document).ready(function () {
+		$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+	});
 </script>
 
 <div class="x-body">
-    <form class="layui-form layui-form-pane" style="margin-left: 20px;">
-        <div style="width:100%;height:400px;overflow: auto;">
-            <div class="layui-form-item">
-                <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                    <legend style="font-size:16px;">角色信息</legend>
-                </fieldset>
-            </div>
-            <div class="layui-form-item">
-                <label for="roleName" class="layui-form-label">
-                    <span class="x-red">*</span>角色名称
-                </label>
-                <div class="layui-input-inline">
-                    <input type="text" id="roleName" name="roleName" lay-verify="rolename"
-                           autocomplete="off" class="layui-input">
-                </div>
-                <div id="ms" class="layui-form-mid layui-word-aux">
-                    <span class="x-red">*</span><span id="ums">角色名称必填</span>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label for="remark" class="layui-form-label">
-                        <span class="x-red">*</span>角色备注
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="remark" name="remark" lay-verify="remark" autocomplete="off"
-                               class="layui-input">
-                    </div>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                    <legend style="font-size:16px;">权限</legend>
-                </fieldset>
-            </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label for="remark" class="layui-form-label">
-                        <span class="x-red">*</span>权限选择
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="hidden" name="menus">
-                        <ul id="treeDemo" class="ztree"></ul>
-                    </div>
-                </div>
-            </div>
-            <div style="height: 60px"></div>
-        </div>
-        <div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
+	<form class="layui-form layui-form-pane" style="margin-left: 20px;">
+		<div style="width:100%;height:400px;overflow: auto;">
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">角色信息</legend>
+				</fieldset>
+			</div>
+			<div class="layui-form-item">
+				<label for="roleName" class="layui-form-label">
+					<span class="x-red">*</span>角色名称
+				</label>
+				<div class="layui-input-inline">
+					<input type="text" id="roleName" name="roleName" lay-verify="rolename"
+						   autocomplete="off" class="layui-input">
+				</div>
+				<div id="ms" class="layui-form-mid layui-word-aux">
+					<span class="x-red">*</span><span id="ums">角色名称必填</span>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label for="remark" class="layui-form-label">
+						<span class="x-red">*</span>角色备注
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" id="remark" name="remark" lay-verify="remark" autocomplete="off"
+							   class="layui-input">
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">权限</legend>
+				</fieldset>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label for="remark" class="layui-form-label">
+						<span class="x-red">*</span>权限选择
+					</label>
+					<div class="layui-input-inline">
+						<input type="hidden" name="menus">
+						<ul id="treeDemo" class="ztree"></ul>
+					</div>
+				</div>
+			</div>
+			<div style="height: 60px"></div>
+		</div>
+		<div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
   position: fixed;bottom: 1px;margin-left:-20px;">
-            <div class="layui-form-item" style=" float: right;margin-right: 30px;margin-top: 8px">
+			<div class="layui-form-item" style=" float: right;margin-right: 30px;margin-top: 8px">
 
-                <button type="submit" class="layui-btn layui-btn-normal" lay-filter="add" lay-submit>
-                    增加
-                </button>
-                <button type="button" class="layui-btn layui-btn-primary" id="close">
-                    取消
-                </button>
-            </div>
-        </div>
-    </form>
+				<button type="submit" class="layui-btn layui-btn-normal" lay-filter="add" lay-submit>
+					增加
+				</button>
+				<button type="button" class="layui-btn layui-btn-primary" id="close">
+					取消
+				</button>
+			</div>
+		</div>
+	</form>
 </div>
 <script>
-    layui.use(['form', 'layer'], function () {
-        $ = layui.jquery;
-        var form = layui.form
-            , layer = layui.layer;
+	layui.use(['form', 'layer'], function () {
+		$ = layui.jquery;
+		var form = layui.form
+			, layer = layui.layer;
 
-        //自定义验证规则
-        form.verify({
-            rolename: function (value) {
-                if (value.trim() == "") {
-                    return "角色名不能为空";
-                }
-            }
-        });
+		//自定义验证规则
+		form.verify({
+			rolename: function (value) {
+				if (value.trim() == "") {
+					return "角色名不能为空";
+				}
+			}
+		});
 
-        $('#close').click(function () {
-            var index = parent.layer.getFrameIndex(window.name);
-            parent.layer.close(index);
-        });
-        //监听提交
-        form.on('submit(add)', function (data) {
-            var zTree = $.fn.zTree.getZTreeObj("treeDemo");
-            var jsonArr = zTree.getCheckedNodes(true);
-            var menus = [];
-            for (var item in jsonArr) {
-                menus.push(jsonArr[item].id);
-            }
-            data.field.menus = menus;
-            Len.layerAjax('addRole', data.field, 'roleList');
-            return false;
-        });
-    });
+		$('#close').click(function () {
+			var index = parent.layer.getFrameIndex(window.name);
+			parent.layer.close(index);
+		});
+		//监听提交
+		form.on('submit(add)', function (data) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			var jsonArr = zTree.getCheckedNodes(true);
+			var menus = [];
+			for (var item in jsonArr) {
+				menus.push(jsonArr[item].id);
+			}
+			data.field.menus = menus;
+			Len.layerAjax('addRole', data.field, 'roleList');
+			return false;
+		});
+	});
 </script>
diff --git a/len-sys/src/main/resources/ftl/system/role/roleList.ftl b/len-sys/src/main/resources/ftl/system/role/roleList.ftl
index 50dc785..cbcb35e 100644
--- a/len-sys/src/main/resources/ftl/system/role/roleList.ftl
+++ b/len-sys/src/main/resources/ftl/system/role/roleList.ftl
@@ -1,14 +1,11 @@
-
-
-
 <div class="lenos-search">
-    <div class="search-select">
+	<div class="search-select">
         <@lenInclude path="/system/base/queryBox.ftl" name="角色名" id="rolename" ></@lenInclude>
         <@lenInclude path="/system/base/queryBox.ftl" name="描述" id="remark" ></@lenInclude>
-    </div>
+	</div>
 </div>
 <div class="layui-col-md12 len-button">
-    <div class="layui-btn-group role-bar">
+	<div class="layui-btn-group role-bar">
         <#include "/system/base/searth.ftl">
         <@lenInclude path="/system/base/btn.ftl" hasPermission="role:add"
         type="add" name="新增" icon="&#xe608;"></@lenInclude>
@@ -16,7 +13,7 @@
         type="update" name="编辑" icon="&#xe642;"></@lenInclude>
         <@lenInclude path="/system/base/btn.ftl" hasPermission="role:select"
         type="detail" name="查看" icon="&#xe605;"></@lenInclude>
-    </div>
+	</div>
 </div>
 <table id="roleList" width="100%" lay-filter="user"></table>
 <script type="text/html" id="toolBar">
@@ -25,78 +22,78 @@
     <@lenInclude  path="/system/base/bar.ftl" hasPermission="user:del"  code="del"  name="删除" event="del"/>
 </script>
 <script>
-    layui.use('table', function () {
-        table = layui.table;
-        //方法级渲染
-        table.render({
-            id: 'roleList',
-            elem: '#roleList'
-            , url: 'role/showRoleList'
-            , parseData: function (res) {
-                return {
-                    "code": res.code,
-                    "msg": res.msg,
-                    "count": res.count,
-                    "data": res.data
-                };
-            }, cols: [[
-                {checkbox: true, fixed: true, width: '5%'},
-                {field: 'roleName', title: '角色名称', width: '20%', sort: true},
-                {field: 'remark', title: '角色描述', width: '20%', sort: true},
-                {
-                    title: '创建时间',
-                    width: '20%',
-                    templet: '<div>{{ moment(+d.createDate).format(\'YYYY-MM-DD\')  }}</div>'
-                }, {field: 'remark', title: '操作', width: '20%', toolbar: "#toolBar"}
-            ]], page: true, height: 'full-100'
-        });
+	layui.use('table', function () {
+		table = layui.table;
+		//方法级渲染
+		table.render({
+			id: 'roleList',
+			elem: '#roleList'
+			, url: 'role/showRoleList'
+			, parseData: function (res) {
+				return {
+					"code": res.code,
+					"msg": res.msg,
+					"count": res.count,
+					"data": res.data
+				};
+			}, cols: [[
+				{checkbox: true, fixed: true, width: '5%'},
+				{field: 'roleName', title: '角色名称', width: '20%', sort: true},
+				{field: 'remark', title: '角色描述', width: '20%', sort: true},
+				{
+					title: '创建时间',
+					width: '20%',
+					templet: '<div>{{ moment(+d.createDate).format(\'YYYY-MM-DD\')  }}</div>'
+				}, {field: 'remark', title: '操作', width: '20%', toolbar: "#toolBar"}
+			]], page: true, height: 'full-100'
+		});
 
-        var $ = layui.$, active = {
-            select: function () {
-                var rolename = $('#rolename').val();
-                var remark = $('#remark').val();
-                table.reload('roleList', {
-                    where: {
-                        roleName: rolename,
-                        remark: remark
-                    }
-                });
-            },
-            reload: function () {
-                $('#rolename').val('');
-                $('#remark').val('');
-                table.reload('roleList', {
-                    where: {
-                        roleName: null,
-                        remark: null
-                    }
-                });
-            },
-            add: function () {
-                Len.add('/role/showAddRole', '添加角色');
-            },
-            update: function () {
-                var data = table.checkStatus('roleList').data;
-                Len.onlyOne(data.length) ? Len.update('/role/updateRole?id=' + data[0].id, '编辑角色') : false;
-            },
-            detail: function () {
-                var data = table.checkStatus('roleList').data;
-                Len.onlyOne(data.length) ? Len.detail('/role/updateRole?id=' + data[0].id, '查看角色信息') : false;
-            }
-        };
+		var $ = layui.$, active = {
+			select: function () {
+				var rolename = $('#rolename').val();
+				var remark = $('#remark').val();
+				table.reload('roleList', {
+					where: {
+						roleName: rolename,
+						remark: remark
+					}
+				});
+			},
+			reload: function () {
+				$('#rolename').val('');
+				$('#remark').val('');
+				table.reload('roleList', {
+					where: {
+						roleName: null,
+						remark: null
+					}
+				});
+			},
+			add: function () {
+				Len.add('/role/showAddRole', '添加角色');
+			},
+			update: function () {
+				var data = table.checkStatus('roleList').data;
+				Len.onlyOne(data.length) ? Len.update('/role/updateRole?id=' + data[0].id, '编辑角色') : false;
+			},
+			detail: function () {
+				var data = table.checkStatus('roleList').data;
+				Len.onlyOne(data.length) ? Len.detail('/role/updateRole?id=' + data[0].id, '查看角色信息') : false;
+			}
+		};
 
-        //监听工具条
-        table.on('tool(user)', function (obj) {
-            var data = obj.data;
-            if (obj.event === 'detail') {
-                Len.detail('/role/updateRole?id=' + data.id, '编辑角色');
-            } else if (obj.event === 'del') {
-                Len.delete('role/del', data.id, '', 'roleList');
-            } else if (obj.event === 'edit') {
-                Len.update('/role/updateRole?id=' + data.id, '编辑角色');
-            }
-        });
-        Len.btnBind($('.role-bar .layui-btn'), active);
-        Len.keydown(active);
-    });
+		//监听工具条
+		table.on('tool(user)', function (obj) {
+			var data = obj.data;
+			if (obj.event === 'detail') {
+				Len.detail('/role/updateRole?id=' + data.id, '编辑角色');
+			} else if (obj.event === 'del') {
+				Len.delete('role/del', data.id, '', 'roleList');
+			} else if (obj.event === 'edit') {
+				Len.update('/role/updateRole?id=' + data.id, '编辑角色');
+			}
+		});
+		Len.btnBind($('.role-bar .layui-btn'), active);
+		Len.keydown(active);
+	});
 </script>
diff --git a/len-sys/src/main/resources/ftl/system/role/update.ftl b/len-sys/src/main/resources/ftl/system/role/update.ftl
index 3a29905..ab37152 100644
--- a/len-sys/src/main/resources/ftl/system/role/update.ftl
+++ b/len-sys/src/main/resources/ftl/system/role/update.ftl
@@ -2,150 +2,150 @@
 
 <link rel="stylesheet" href="${re.contextPath}/plugin/ztree/css/metroStyle/metroStyle.css">
 <script type="text/javascript"
-        src="${re.contextPath}/plugin/ztree/js/jquery.ztree.core.js"></script>
+		src="${re.contextPath}/plugin/ztree/js/jquery.ztree.core.js"></script>
 <script type="text/javascript" src="${re.contextPath}/plugin/ztree/js/jquery.ztree.excheck.js"
-        charset="utf-8"></script>
+		charset="utf-8"></script>
 <script type="text/javascript" src="${re.contextPath}/plugin/tools/update-setting.js"></script>
 <script type="text/javascript">
-    $(document).ready(function () {
-        var flag = '${detail}';
-        if (flag) {
-            $("form").disable();
-        }
-    });
+	$(document).ready(function () {
+		var flag = '${detail}';
+		if (flag) {
+			$("form").disable();
+		}
+	});
 </script>
 <script type="text/javascript">
-    var setting = {
-        check: {
-            enable: true
-        },
-        data: {
-            simpleData: {
-                enable: true
-            }
-        }
-    };
-    var zNodes =${menus};
-    $(document).ready(function () {
-        $.fn.zTree.init($("#treeDemo"), setting, zNodes);
-    });
+	var setting = {
+		check: {
+			enable: true
+		},
+		data: {
+			simpleData: {
+				enable: true
+			}
+		}
+	};
+	var zNodes = ${menus};
+	$(document).ready(function () {
+		$.fn.zTree.init($("#treeDemo"), setting, zNodes);
+	});
 
-    (function ($) {
-        $.fn.disable = function () {
-            return $(this).find("*").each(function () {
-                $(this).attr("disabled", "disabled");
-            });
-        }
-    })(jQuery);
+	(function ($) {
+		$.fn.disable = function () {
+			return $(this).find("*").each(function () {
+				$(this).attr("disabled", "disabled");
+			});
+		}
+	})(jQuery);
 </script>
 <script type="text/javascript">
-    $(document).ready(function () {
-        var flag = '${detail}';
-        if (flag) {
-            $("form").disable();
-        }
-    });
+	$(document).ready(function () {
+		var flag = '${detail}';
+		if (flag) {
+			$("form").disable();
+		}
+	});
 </script>
 
 <body>
 <div class="x-body">
-    <form class="layui-form layui-form-pane" style="margin-left: 20px;">
-        <div style="width:100%;height:400px;overflow: auto;">
-            <div class="layui-form-item">
-                <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                    <legend style="font-size:16px;">角色信息</legend>
-                </fieldset>
-            </div>
-            <div class="layui-form-item">
-                <label for="roleName" class="layui-form-label">
-                    <span class="x-red">*</span>角色名称
-                </label>
-                <div class="layui-input-inline">
-                    <input value="${role.id}" type="hidden" name="id">
-                    <input type="text" value="${role.roleName}" id="roleName" name="roleName"
-                           lay-verify="roleName"
-                           autocomplete="off" class="layui-input">
-                </div>
-                <div id="ms" class="layui-form-mid layui-word-aux">
-                    <span class="x-red">*</span><span id="ums">角色名称必填</span>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label for="remark" class="layui-form-label">
-                        <span class="x-red">*</span>角色备注
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="text" value="${role.remark}" id="remark" name="remark" autocomplete="off"
-                               class="layui-input">
-                    </div>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                    <legend style="font-size:16px;">权限</legend>
-                </fieldset>
-            </div>
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label for="remark" class="layui-form-label">
-                        <span class="x-red">*</span>权限选择
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="hidden" name="menus">
-                        <ul id="treeDemo" class="ztree"></ul>
-                    </div>
-                </div>
-            </div>
-            <div style="height: 60px"></div>
-        </div>
+	<form class="layui-form layui-form-pane" style="margin-left: 20px;">
+		<div style="width:100%;height:400px;overflow: auto;">
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">角色信息</legend>
+				</fieldset>
+			</div>
+			<div class="layui-form-item">
+				<label for="roleName" class="layui-form-label">
+					<span class="x-red">*</span>角色名称
+				</label>
+				<div class="layui-input-inline">
+					<input value="${role.id}" type="hidden" name="id">
+					<input type="text" value="${role.roleName}" id="roleName" name="roleName"
+						   lay-verify="roleName"
+						   autocomplete="off" class="layui-input">
+				</div>
+				<div id="ms" class="layui-form-mid layui-word-aux">
+					<span class="x-red">*</span><span id="ums">角色名称必填</span>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label for="remark" class="layui-form-label">
+						<span class="x-red">*</span>角色备注
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" value="${role.remark}" id="remark" name="remark" autocomplete="off"
+							   class="layui-input">
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">权限</legend>
+				</fieldset>
+			</div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label for="remark" class="layui-form-label">
+						<span class="x-red">*</span>权限选择
+					</label>
+					<div class="layui-input-inline">
+						<input type="hidden" name="menus">
+						<ul id="treeDemo" class="ztree"></ul>
+					</div>
+				</div>
+			</div>
+			<div style="height: 60px"></div>
+		</div>
         <#if !detail>
-            <div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
+			<div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
   position: fixed;bottom: 1px;margin-left:-20px;">
-                <div class="layui-form-item" style=" float: right;margin-right: 30px;margin-top: 8px">
+				<div class="layui-form-item" style=" float: right;margin-right: 30px;margin-top: 8px">
 
-                    <button class="layui-btn layui-btn-normal" lay-filter="add" lay-submit>
-                        确认
-                    </button>
-                    <button class="layui-btn layui-btn-primary" id="close">
-                        取消
-                    </button>
-                </div>
-            </div>
+					<button class="layui-btn layui-btn-normal" lay-filter="add" lay-submit>
+						确认
+					</button>
+					<button class="layui-btn layui-btn-primary" id="close">
+						取消
+					</button>
+				</div>
+			</div>
         </#if>
-    </form>
+	</form>
 </div>
 <script>
-    layui.use(['form', 'layer'], function () {
-        $ = layui.jquery;
-        var form = layui.form
-            , layer = layui.layer;
+	layui.use(['form', 'layer'], function () {
+		$ = layui.jquery;
+		var form = layui.form
+			, layer = layui.layer;
 
-        //自定义验证规则
-        form.verify({
-            roleName: function (value) {
-                if (value.trim() == "") {
-                    return "角色名不能为空";
-                }
-            }
-        });
+		//自定义验证规则
+		form.verify({
+			roleName: function (value) {
+				if (value.trim() == "") {
+					return "角色名不能为空";
+				}
+			}
+		});
 
-        $('#close').click(function () {
-            var index = parent.layer.getFrameIndex(window.name);
-            parent.layer.close(index);
-        });
-        //监听提交
-        form.on('submit(add)', function (data) {
-            var zTree = $.fn.zTree.getZTreeObj("treeDemo");
-            var jsonArr = zTree.getCheckedNodes(true);
-            var menus = [];
-            for (var item in jsonArr) {
-                menus.push(jsonArr[item].id);
-            }
-            data.field.menus = menus;
-            Len.layerAjax('updateRole', data.field, 'roleList');
-            return false;
-        });
-    });
+		$('#close').click(function () {
+			var index = parent.layer.getFrameIndex(window.name);
+			parent.layer.close(index);
+		});
+		//监听提交
+		form.on('submit(add)', function (data) {
+			var zTree = $.fn.zTree.getZTreeObj("treeDemo");
+			var jsonArr = zTree.getCheckedNodes(true);
+			var menus = [];
+			for (var item in jsonArr) {
+				menus.push(jsonArr[item].id);
+			}
+			data.field.menus = menus;
+			Len.layerAjax('updateRole', data.field, 'roleList');
+			return false;
+		});
+	});
 </script>
 </body>
diff --git a/len-sys/src/main/resources/ftl/system/user/add.ftl b/len-sys/src/main/resources/ftl/system/user/add.ftl
index 6d99d88..0e27eb7 100644
--- a/len-sys/src/main/resources/ftl/system/user/add.ftl
+++ b/len-sys/src/main/resources/ftl/system/user/add.ftl
@@ -2,48 +2,48 @@
 
 <body>
 <div class="x-body">
-    <form id="useradd" class="layui-form layui-form-pane" style="padding-left: 20px">
-        <div>
+	<form id="useradd" class="layui-form layui-form-pane" style="padding-left: 20px">
+		<div>
             <#--头像-->
-            <div class="layui-form-item">
-                <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                    <legend style="font-size:16px;">头像上传</legend>
-                </fieldset>
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">头像上传</legend>
+				</fieldset>
 
                 <#--上传组件-->
                 <@lenInclude path="/system/base/upload.ftl" id="uploadFile"></@lenInclude>
-                <input id="photo" name="photo" type="hidden">
-
-                <div class="layui-input-inline">
-                    <div id="showImage" style="margin-top: 20px;margin-left: 50px">
-                        <img src="${re.contextPath}/plugin/x-admin/images/bg.png" width="100px" height="100px"
-                             class="layui-upload-img layui-circle">
-                    </div>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
-                <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                    <legend style="font-size:16px;">基础信息</legend>
-                </fieldset>
-            </div>
+				<input id="photo" name="photo" type="hidden">
+
+				<div class="layui-input-inline">
+					<div id="showImage" style="margin-top: 20px;margin-left: 50px">
+						<img src="${re.contextPath}/plugin/x-admin/images/bg.png" width="100px" height="100px"
+							 class="layui-upload-img layui-circle">
+					</div>
+				</div>
+			</div>
+
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">基础信息</legend>
+				</fieldset>
+			</div>
 
             <#--用户名-->
-            <div class="layui-form-item">
-                <label for="uname" class="layui-form-label">
-                    用户名<span class="x-red">*</span>
-                </label>
-                <div class="layui-input-inline">
-                    <input type="text" id="uname" name="username"
-                           autocomplete="off" class="layui-input" lay-verify="username">
-                </div>
-                <div id="ms" class="layui-form-mid layui-word-aux">
-                    <span class="x-red">*</span><span id="ums">将会成为您唯一的登入名</span>
-                </div>
-            </div>
-
-
-            <div class="layui-form-item">
+			<div class="layui-form-item">
+				<label for="uname" class="layui-form-label">
+					用户名<span class="x-red">*</span>
+				</label>
+				<div class="layui-input-inline">
+					<input type="text" id="uname" name="username"
+						   autocomplete="off" class="layui-input" lay-verify="username">
+				</div>
+				<div id="ms" class="layui-form-mid layui-word-aux">
+					<span class="x-red">*</span><span id="ums">将会成为您唯一的登入名</span>
+				</div>
+			</div>
+
+
+			<div class="layui-form-item">
 
                 <#--真实姓名-->
                 <@lenInclude  path="/system/base/lineInput.ftl"
@@ -58,10 +58,10 @@
                 label="年龄"
                 id="age"
                 name="age"/>
-            </div>
+			</div>
 
 
-            <div class="layui-form-item">
+			<div class="layui-form-item">
                 <#--密码-->
                 <@lenInclude  path="/system/base/lineInput.ftl"
                 for="password"
@@ -81,42 +81,42 @@
                 require="true"
                 type="password"
                 verify="repass"/>
-            </div>
+			</div>
 
             <#--邮箱-->
-           <#-- <@lenInclude  path="/system/base/blockInput.ftl"
-            for="email"
-            label="邮箱"
-            id="email"
-            name="email"
-            require="true"
-            verify="email"/>-->
+            <#-- <@lenInclude  path="/system/base/blockInput.ftl"
+             for="email"
+             label="邮箱"
+             id="email"
+             name="email"
+             require="true"
+             verify="email"/>-->
 
             <#--邮箱-->
-            <div>
-                <label for="email" class="layui-form-label">
-                    <span class="x-red"></span>邮箱
-                </label>
-                <div class="layui-input-block">
-                    <input type="email" id="email" style="width: 93%" name="email"
-                           autocomplete="off" class="layui-input">
+			<div>
+				<label for="email" class="layui-form-label">
+					<span class="x-red"></span>邮箱
+				</label>
+				<div class="layui-input-block">
+					<input type="email" id="email" style="width: 93%" name="email"
+						   autocomplete="off" class="layui-input">
 
-                </div>
-            </div>
+				</div>
+			</div>
 
             <#--角色-->
-            <div class="layui-form-item">
-                <label class="layui-form-label">角色选择</label>
-                <div class="layui-input-block">
+			<div class="layui-form-item">
+				<label class="layui-form-label">角色选择</label>
+				<div class="layui-input-block">
                     <#list boxJson as json>
-                        <input type="checkbox" name="role" title="${json.name}" lay-filter="check" value="${json.id}">
+						<input type="checkbox" name="role" title="${json.name}" lay-filter="check" value="${json.id}">
                     </#list>
-                </div>
-            </div>
-            <div style="height: 60px"></div>
-        </div>
+				</div>
+			</div>
+			<div style="height: 60px"></div>
+		</div>
         <@lenInclude path="system/base/formBtn.ftl"></@lenInclude>
-    </form>
+	</form>
 
 </div>
 
@@ -124,126 +124,126 @@
 
 <script>
 
-    var flag, msg;
-
-    $(function () {
-        /**
-         * 用户名重复校验
-         */
-        $('#uname').on("blur", function () {
-            var uname = $('#uname').val();
-            if (uname.match(/[\u4e00-\u9fa5]/)) {
-                return;
-            }
-            if (!/(.+){3,12}$/.test(uname)) {
-                return;
-            }
-            if (!Len.isEmpty(uname)) {
-                $.ajax({
-                    url: 'checkUser?uname=' + uname, async: false, type: 'get', success: function (data) {
-                        flag = data.flag;
-                        $('#ms').find('span').remove();
-                        if (!data.flag) {
-                            msg = data.msg;
-                            $('#ms').append("<span style='color: red;'>" + data.msg + "</span>");
-                        } else {
-                            flag = true;
-                            $('#ms').append("<span style='color: green;'>用户名可用</span>");
-                        }
-                    }, beforeSend: function () {
-                        $('#ms').find('span').remove();
-                        $('#ms').append("<span>验证ing</span>");
-                    }
-                });
-            }
-        });
-
-    });
-
-    layui.use(['form', 'layer', 'upload'], function () {
-        $ = layui.jquery;
-        var form = layui.form;
-
-        /**
-         * 校验
-         */
-        form.verify({
-            username: function (value) {
-                if (value.trim() === "") {
-                    return "用户名不能为空";
-                }
-                if (value.match(/[\u4e00-\u9fa5]/)) {
-                    return "用户名不能为中文";
-                }
-                if (!/(.+){3,12}$/.test(value)) {
-                    return "用户名必须3到12位";
-                }
-                if (typeof (flag) == 'undefined') {
-                    return "用户名验证ing";
-                }
-                if (!flag) {
-                    return msg;
-                }
-            }
-            , password: [/(.+){6,12}$/, '密码必须6到12位']
-            , repass: function (value) {
-                if ($('#password').val() !== $('#l_repass').val()) {
-                    return '两次密码不一致';
-                }
-            }
-            , email: function (value) {
-                if (value !== "") {
-                    if (!/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/.test(value)) {
-                        return "邮箱格式不正确";
-                    }
-                }
-            }
-        });
-
-        /**
-         * 头像上传
-         */
-        $('#uploadFile').uploadFile({
-            before: function (obj) {
-                obj.preview(function (index, file, result) {
-                    var imgObj = $('#showImage');
-                    imgObj.find('img').remove();
-                    imgObj.append('<img src="' + result + '" alt="' + file.name + '" width="100px" height="100px" class="layui-upload-img layui-circle">');
-                });
-            }, done: function (res) {
-                $("#photo").val(res.msg);
-            }
-        });
-
-        /**
-         * 关闭当前弹框
-         */
-        $('#close').click(function () {
-            var index = parent.layer.getFrameIndex(window.name);
-            parent.layer.close(index);
-        });
-
-        /**
-         * 表单保存
-         */
-        form.on('submit(add)', function (data) {
-            var r = document.getElementsByName("role");
-            var role = [];
-            for (var i = 0; i < r.length; i++) {
-                if (r[i].checked) {
-                    role.push(r[i].value);
-                }
-            }
-            if (role.length === 0) {
-                Len.error('请选择角色');
-                return false;
-            }
-            data.field.role = role;
-            Len.layerAjax('addUser', data.field, 'userList');
-            return false;
-        });
-
-        form.render();
-    });
+	var flag, msg;
+
+	$(function () {
+		/**
+		 * 用户名重复校验
+		 */
+		$('#uname').on("blur", function () {
+			var uname = $('#uname').val();
+			if (uname.match(/[\u4e00-\u9fa5]/)) {
+				return;
+			}
+			if (!/(.+){3,12}$/.test(uname)) {
+				return;
+			}
+			if (!Len.isEmpty(uname)) {
+				$.ajax({
+					url: 'checkUser?uname=' + uname, async: false, type: 'get', success: function (data) {
+						flag = data.flag;
+						$('#ms').find('span').remove();
+						if (!data.flag) {
+							msg = data.msg;
+							$('#ms').append("<span style='color: red;'>" + data.msg + "</span>");
+						} else {
+							flag = true;
+							$('#ms').append("<span style='color: green;'>用户名可用</span>");
+						}
+					}, beforeSend: function () {
+						$('#ms').find('span').remove();
+						$('#ms').append("<span>验证ing</span>");
+					}
+				});
+			}
+		});
+
+	});
+
+	layui.use(['form', 'layer', 'upload'], function () {
+		$ = layui.jquery;
+		var form = layui.form;
+
+		/**
+		 * 校验
+		 */
+		form.verify({
+			username: function (value) {
+				if (value.trim() === "") {
+					return "用户名不能为空";
+				}
+				if (value.match(/[\u4e00-\u9fa5]/)) {
+					return "用户名不能为中文";
+				}
+				if (!/(.+){3,12}$/.test(value)) {
+					return "用户名必须3到12位";
+				}
+				if (typeof (flag) == 'undefined') {
+					return "用户名验证ing";
+				}
+				if (!flag) {
+					return msg;
+				}
+			}
+			, password: [/(.+){6,12}$/, '密码必须6到12位']
+			, repass: function (value) {
+				if ($('#password').val() !== $('#l_repass').val()) {
+					return '两次密码不一致';
+				}
+			}
+			, email: function (value) {
+				if (value !== "") {
+					if (!/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/.test(value)) {
+						return "邮箱格式不正确";
+					}
+				}
+			}
+		});
+
+		/**
+		 * 头像上传
+		 */
+		$('#uploadFile').uploadFile({
+			before: function (obj) {
+				obj.preview(function (index, file, result) {
+					var imgObj = $('#showImage');
+					imgObj.find('img').remove();
+					imgObj.append('<img src="' + result + '" alt="' + file.name + '" width="100px" height="100px" class="layui-upload-img layui-circle">');
+				});
+			}, done: function (res) {
+				$("#photo").val(res.msg);
+			}
+		});
+
+		/**
+		 * 关闭当前弹框
+		 */
+		$('#close').click(function () {
+			var index = parent.layer.getFrameIndex(window.name);
+			parent.layer.close(index);
+		});
+
+		/**
+		 * 表单保存
+		 */
+		form.on('submit(add)', function (data) {
+			var r = document.getElementsByName("role");
+			var role = [];
+			for (var i = 0; i < r.length; i++) {
+				if (r[i].checked) {
+					role.push(r[i].value);
+				}
+			}
+			if (role.length === 0) {
+				Len.error('请选择角色');
+				return false;
+			}
+			data.field.role = role;
+			Len.layerAjax('addUser', data.field, 'userList');
+			return false;
+		});
+
+		form.render();
+	});
 </script>
 </body>
diff --git a/len-sys/src/main/resources/ftl/system/user/add2.ftl b/len-sys/src/main/resources/ftl/system/user/add2.ftl
index 5fe9138..941e4c4 100644
--- a/len-sys/src/main/resources/ftl/system/user/add2.ftl
+++ b/len-sys/src/main/resources/ftl/system/user/add2.ftl
@@ -2,206 +2,206 @@
 <html>
 
 <head>
-    <meta charset="UTF-8">
-    <title>用户管理</title>
+	<meta charset="UTF-8">
+	<title>用户管理</title>
     <#include "/system/base/formHead.ftl">
 </head>
 
 <body>
 <div class="x-body">
-    <form id="useradd" class="layui-form layui-form-pane" style="margin-left: 20px;">
-        <div style="width:100%;height:400px;overflow: auto;">
+	<form id="useradd" class="layui-form layui-form-pane" style="margin-left: 20px;">
+		<div style="width:100%;height:400px;overflow: auto;">
             <#--头像-->
-            <div class="layui-form-item">
-                <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                    <legend style="font-size:16px;">头像上传</legend>
-                </fieldset>
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">头像上传</legend>
+				</fieldset>
 
                 <#--上传组件-->
                 <@lenInclude path="/system/base/upload.ftl" id="uploadFile"></@lenInclude>
 
-                <div class="layui-input-inline">
-                    <div id="showImage" style="margin-top: 20px;margin-left: 50px">
-                        <img src="${re.contextPath}/plugin/x-admin/images/bg.png" width="100px" height="100px"
-                             class="layui-upload-img layui-circle">
-                    </div>
-                </div>
-            </div>
+				<div class="layui-input-inline">
+					<div id="showImage" style="margin-top: 20px;margin-left: 50px">
+						<img src="${re.contextPath}/plugin/x-admin/images/bg.png" width="100px" height="100px"
+							 class="layui-upload-img layui-circle">
+					</div>
+				</div>
+			</div>
 
-            <div class="layui-form-item">
-                <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                    <legend style="font-size:16px;">基础信息</legend>
-                </fieldset>
-            </div>
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">基础信息</legend>
+				</fieldset>
+			</div>
 
             <#--用户名-->
-            <div class="layui-form-item">
-                <label for="uname" class="layui-form-label">
-                    <span class="x-red">*</span>用户名
-                </label>
-                <div class="layui-input-inline">
-                    <input type="text" id="uname" name="username" lay-verify="username"
-                           autocomplete="off" class="layui-input">
-                </div>
-                <div id="ms" class="layui-form-mid layui-word-aux">
-                    <span class="x-red">*</span><span id="ums">将会成为您唯一的登入名</span>
-                </div>
-            </div>
+			<div class="layui-form-item">
+				<label for="uname" class="layui-form-label">
+					<span class="x-red">*</span>用户名
+				</label>
+				<div class="layui-input-inline">
+					<input type="text" id="uname" name="username" lay-verify="username"
+						   autocomplete="off" class="layui-input">
+				</div>
+				<div id="ms" class="layui-form-mid layui-word-aux">
+					<span class="x-red">*</span><span id="ums">将会成为您唯一的登入名</span>
+				</div>
+			</div>
 
             <#--真实姓名-->
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label for="realName" class="layui-form-label">
-                        <span class="x-red">*</span>真实姓名
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="realName" name="realName" lay-verify="realName" autocomplete="off"
-                               class="layui-input">
-                    </div>
-                </div>
-                <div class="layui-inline">
-                    <label for="age" class="layui-form-label">
-                        <span class="x-red">*</span>年龄
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="text" id="age" name="age" lay-verify="number"
-                               autocomplete="off" class="layui-input">
-                    </div>
-                </div>
-            </div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label for="realName" class="layui-form-label">
+						<span class="x-red">*</span>真实姓名
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" id="realName" name="realName" lay-verify="realName" autocomplete="off"
+							   class="layui-input">
+					</div>
+				</div>
+				<div class="layui-inline">
+					<label for="age" class="layui-form-label">
+						<span class="x-red">*</span>年龄
+					</label>
+					<div class="layui-input-inline">
+						<input type="text" id="age" name="age" lay-verify="number"
+							   autocomplete="off" class="layui-input">
+					</div>
+				</div>
+			</div>
 
             <#--密码-->
-            <div class="layui-form-item">
-                <div class="layui-inline">
-                    <label for="password" class="layui-form-label">
-                        <span class="x-red">*</span>密码
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="password" id="password" name="password" lay-verify="password"
-                               autocomplete="off" class="layui-input">
-                    </div>
-                </div>
-                <div class="layui-inline">
-                    <label for="L_repass" class="layui-form-label">
-                        <span class="x-red">*</span>确认密码
-                    </label>
-                    <div class="layui-input-inline">
-                        <input type="password" id="l_repass" name="repass" lay-verify="repass"
-                               autocomplete="off" class="layui-input">
-                    </div>
-                </div>
-            </div>
+			<div class="layui-form-item">
+				<div class="layui-inline">
+					<label for="password" class="layui-form-label">
+						<span class="x-red">*</span>密码
+					</label>
+					<div class="layui-input-inline">
+						<input type="password" id="password" name="password" lay-verify="password"
+							   autocomplete="off" class="layui-input">
+					</div>
+				</div>
+				<div class="layui-inline">
+					<label for="L_repass" class="layui-form-label">
+						<span class="x-red">*</span>确认密码
+					</label>
+					<div class="layui-input-inline">
+						<input type="password" id="l_repass" name="repass" lay-verify="repass"
+							   autocomplete="off" class="layui-input">
+					</div>
+				</div>
+			</div>
             <#--邮箱-->
-            <div>
-                <label for="email" class="layui-form-label">
-                    <span class="x-red"></span>邮箱
-                </label>
-                <div class="layui-input-block">
-                    <input type="email" id="email" style="width: 93%" name="email" lay-verify="email"
-                           autocomplete="off" class="layui-input">
-                    <input id="photo" name="photo" type="hidden">
-                </div>
-            </div>
+			<div>
+				<label for="email" class="layui-form-label">
+					<span class="x-red"></span>邮箱
+				</label>
+				<div class="layui-input-block">
+					<input type="email" id="email" style="width: 93%" name="email" lay-verify="email"
+						   autocomplete="off" class="layui-input">
+					<input id="photo" name="photo" type="hidden">
+				</div>
+			</div>
 
             <#--角色-->
-            <div class="layui-form-item">
-                <label class="layui-form-label">角色选择</label>
-                <div class="layui-input-block">
+			<div class="layui-form-item">
+				<label class="layui-form-label">角色选择</label>
+				<div class="layui-input-block">
                     <#list boxJson as json>
-                        <input type="checkbox" name="role" title="${json.name}" lay-filter="check" value="${json.id}">
+						<input type="checkbox" name="role" title="${json.name}" lay-filter="check" value="${json.id}">
                     </#list>
-                </div>
-            </div>
-            <div style="height: 60px"></div>
-        </div>
+				</div>
+			</div>
+			<div style="height: 60px"></div>
+		</div>
         <@lenInclude path="system/base/formBtn.ftl"></@lenInclude>
-    </form>
+	</form>
 </div>
 <script type="text/javascript" src="/plugin/validator/validator.min.js"></script>
 <script>
-    var flag, msg;
-    new Validator('useradd', [
-        {
-            name: 'username',
-            display: "用户名不能为空",
-            rules: 'required'
-        }, {
-            name: 'realName',
-            display: "真实姓名不能为空",
-            rules: 'required'
-        }
-    ], function (obj) {
-        if (obj.errors) {
-            layer.msg(obj.errors[0].display, {icon: 5, anim: 6, offset: 't'});
-        }
-    });
+	var flag, msg;
+	new Validator('useradd', [
+		{
+			name: 'username',
+			display: "用户名不能为空",
+			rules: 'required'
+		}, {
+			name: 'realName',
+			display: "真实姓名不能为空",
+			rules: 'required'
+		}
+	], function (obj) {
+		if (obj.errors) {
+			layer.msg(obj.errors[0].display, {icon: 5, anim: 6, offset: 't'});
+		}
+	});
 
-    $(function () {
-        $('#uname').on("blur", function () {
-            var uname = $('#uname').val();
-            if (uname.match(/[\u4e00-\u9fa5]/)) {
-                return;
-            }
-            if (!/(.+){3,12}$/.test(uname)) {
-                return;
-            }
-            if (!Len.isEmpty(uname)) {
-                $.ajax({
-                    url: 'checkUser?uname=' + uname, async: false, type: 'get', success: function (data) {
-                        flag = data.flag;
-                        $('#ms').find('span').remove();
-                        if (!data.flag) {
-                            msg = data.msg;
-                            $('#ms').append("<span style='color: red;'>" + data.msg + "</span>");
-                        } else {
-                            flag = true;
-                            $('#ms').append("<span style='color: green;'>用户名可用</span>");
-                        }
-                    }, beforeSend: function () {
-                        $('#ms').find('span').remove();
-                        $('#ms').append("<span>验证ing</span>");
-                    }
-                });
-            }
-        });
+	$(function () {
+		$('#uname').on("blur", function () {
+			var uname = $('#uname').val();
+			if (uname.match(/[\u4e00-\u9fa5]/)) {
+				return;
+			}
+			if (!/(.+){3,12}$/.test(uname)) {
+				return;
+			}
+			if (!Len.isEmpty(uname)) {
+				$.ajax({
+					url: 'checkUser?uname=' + uname, async: false, type: 'get', success: function (data) {
+						flag = data.flag;
+						$('#ms').find('span').remove();
+						if (!data.flag) {
+							msg = data.msg;
+							$('#ms').append("<span style='color: red;'>" + data.msg + "</span>");
+						} else {
+							flag = true;
+							$('#ms').append("<span style='color: green;'>用户名可用</span>");
+						}
+					}, beforeSend: function () {
+						$('#ms').find('span').remove();
+						$('#ms').append("<span>验证ing</span>");
+					}
+				});
+			}
+		});
 
-    });
-    layui.use(['form', 'layer', 'upload'], function () {
-        $ = layui.jquery;
-        var form = layui.form
-            , layer = layui.layer;
+	});
+	layui.use(['form', 'layer', 'upload'], function () {
+		$ = layui.jquery;
+		var form = layui.form
+			, layer = layui.layer;
 
-        $('#uploadFile').uploadFile({
-            before: function (obj) {
-                obj.preview(function (index, file, result) {
-                    var imgObj = $('#showImage');
-                    imgObj.find('img').remove();
-                    imgObj.append('<img src="' + result + '" alt="' + file.name + '" width="100px" height="100px" class="layui-upload-img layui-circle">');
-                });
-            }, done: function (res) {
-                $("#photo").val(res.msg);
-            }
-        });
+		$('#uploadFile').uploadFile({
+			before: function (obj) {
+				obj.preview(function (index, file, result) {
+					var imgObj = $('#showImage');
+					imgObj.find('img').remove();
+					imgObj.append('<img src="' + result + '" alt="' + file.name + '" width="100px" height="100px" class="layui-upload-img layui-circle">');
+				});
+			}, done: function (res) {
+				$("#photo").val(res.msg);
+			}
+		});
 
-        $('#close').click(function () {
-            var index = parent.layer.getFrameIndex(window.name);
-            parent.layer.close(index);
-        });
-        //监听提交
-        form.on('submit(add)', function (data) {
-            var r = document.getElementsByName("role");
-            var role = [];
-            for (var i = 0; i < r.length; i++) {
-                if (r[i].checked) {
-                    role.push(r[i].value);
-                }
-            }
-            data.field.role = role;
-            Len.layerAjax('addUser', data.field, 'userList');
-            return false;
-        });
-        form.render();
-    });
+		$('#close').click(function () {
+			var index = parent.layer.getFrameIndex(window.name);
+			parent.layer.close(index);
+		});
+		//监听提交
+		form.on('submit(add)', function (data) {
+			var r = document.getElementsByName("role");
+			var role = [];
+			for (var i = 0; i < r.length; i++) {
+				if (r[i].checked) {
+					role.push(r[i].value);
+				}
+			}
+			data.field.role = role;
+			Len.layerAjax('addUser', data.field, 'userList');
+			return false;
+		});
+		form.render();
+	});
 </script>
 </body>
 
diff --git a/len-sys/src/main/resources/ftl/system/user/resetPassword.ftl b/len-sys/src/main/resources/ftl/system/user/resetPassword.ftl
index c0788b5..da9a856 100644
--- a/len-sys/src/main/resources/ftl/system/user/resetPassword.ftl
+++ b/len-sys/src/main/resources/ftl/system/user/resetPassword.ftl
@@ -2,91 +2,92 @@
 
 <body>
 <div class="x-body">
-  <form class="layui-form layui-form-pane" style="margin-left: 20px;">
-    <input  name="userId" value="${user.id}" hidden>
-    <div style="width:100%;height:300px;overflow: auto;">
-    <div class="layui-form-item">
-      <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-        <legend style="font-size:16px;">修改账户：${user.username}</legend>
-      </fieldset>
-    </div>
-    <div class="layui-form-item">
-      <label for="newPass" class="layui-form-label">
-        <span class="x-red">*</span>新密码
-      </label>
-      <div class="layui-input-inline">
-        <input type="password" id="newPass" name="newPwd" lay-verify="newPass"  autocomplete="off" class="layui-input">
-      </div>
-    </div>
-    <div class="layui-form-item">
-      <label for="reNewPass" class="layui-form-label">
-        <span class="x-red">*</span>确认密码
-      </label>
-      <div class="layui-input-inline">
-        <input type="password" id="reNewPass" name="reNewPass"  lay-verify="reNewPass"
-               autocomplete="off" class="layui-input">
-      </div>
-    </div>
-      <div style="height: 60px"></div>
-    </div>
-  <div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
+	<form class="layui-form layui-form-pane" style="margin-left: 20px;">
+		<input name="userId" value="${user.id}" hidden>
+		<div style="width:100%;height:300px;overflow: auto;">
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">修改账户：${user.username}</legend>
+				</fieldset>
+			</div>
+			<div class="layui-form-item">
+				<label for="newPass" class="layui-form-label">
+					<span class="x-red">*</span>新密码
+				</label>
+				<div class="layui-input-inline">
+					<input type="password" id="newPass" name="newPwd" lay-verify="newPass" autocomplete="off"
+						   class="layui-input">
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<label for="reNewPass" class="layui-form-label">
+					<span class="x-red">*</span>确认密码
+				</label>
+				<div class="layui-input-inline">
+					<input type="password" id="reNewPass" name="reNewPass" lay-verify="reNewPass"
+						   autocomplete="off" class="layui-input">
+				</div>
+			</div>
+			<div style="height: 60px"></div>
+		</div>
+		<div style="width: 100%;height: 55px;background-color: white;border-top:1px solid #e6e6e6;
   position: fixed;bottom: 1px;margin-left:-20px;">
-    <div class="layui-form-item" style=" float: right;margin-right: 30px;margin-top: 8px">
+			<div class="layui-form-item" style=" float: right;margin-right: 30px;margin-top: 8px">
 
-      <button type="submit" name="save"  class="layui-btn layui-btn-normal" lay-filter="add" lay-submit="">
-        修改
-      </button>
-      <button type="button"  class="layui-btn layui-btn-primary" id="close">
-        取消
-      </button>
-    </div>
-  </div>
-  </form>
+				<button type="submit" name="save" class="layui-btn layui-btn-normal" lay-filter="add" lay-submit="">
+					修改
+				</button>
+				<button type="button" class="layui-btn layui-btn-primary" id="close">
+					取消
+				</button>
+			</div>
+		</div>
+	</form>
 </div>
 
 
 <script>
-  $(document).ready(function () {
-    $('#close').click(function(){
-      var index = parent.layer.getFrameIndex(window.name);
-      parent.layer.close(index);
-    });
-  });
-  layui.use(['form','layer'], function(){
-    $ = layui.jquery;
-    var form = layui.form
-        ,layer = layui.layer;
-    //自定义验证规则
-    form.verify({
-      newPass: [/(.+){6,12}$/, '密码必须6到12位']
-      ,reNewPass: function(value){
-        if($('#newPass').val()!=$('#reNewPass').val()){
-          return '两次密码不一致';
-        }
-      }
-    });
+	$(document).ready(function () {
+		$('#close').click(function () {
+			var index = parent.layer.getFrameIndex(window.name);
+			parent.layer.close(index);
+		});
+	});
+	layui.use(['form', 'layer'], function () {
+		$ = layui.jquery;
+		var form = layui.form
+			, layer = layui.layer;
+		//自定义验证规则
+		form.verify({
+			newPass: [/(.+){6,12}$/, '密码必须6到12位']
+			, reNewPass: function (value) {
+				if ($('#newPass').val() != $('#reNewPass').val()) {
+					return '两次密码不一致';
+				}
+			}
+		});
 
-    //监听提交
-    form.on('submit(add)', function(data){
-      $.ajax({
-        url:'rePass',
-        type:'post',
-        data:data.field,
-        async:false, dataType: "json", traditional: true,
-        success:function(json){
-          var index = parent.layer.getFrameIndex(window.name);
-          parent.layer.close(index);
-          window.parent.layui.table.reload('userList');
-          window.top.layer.msg(json.msg,{icon:6,offset: 'rb',area:['120px','80px'],anim:2});
-        },error:function(){
-            var index = parent.layer.getFrameIndex(window.name);
-            parent.layer.close(index);
-          window.top.layer.msg('请求失败',{icon:5,offset: 'rb',area:['120px','80px'],anim:2});
-        }
-      });
-      return false;
-    });
-    form.render();
-  });
+		//监听提交
+		form.on('submit(add)', function (data) {
+			$.ajax({
+				url: 'rePass',
+				type: 'post',
+				data: data.field,
+				async: false, dataType: "json", traditional: true,
+				success: function (json) {
+					var index = parent.layer.getFrameIndex(window.name);
+					parent.layer.close(index);
+					window.parent.layui.table.reload('userList');
+					window.top.layer.msg(json.msg, {icon: 6, offset: 'rb', area: ['120px', '80px'], anim: 2});
+				}, error: function () {
+					var index = parent.layer.getFrameIndex(window.name);
+					parent.layer.close(index);
+					window.top.layer.msg('请求失败', {icon: 5, offset: 'rb', area: ['120px', '80px'], anim: 2});
+				}
+			});
+			return false;
+		});
+		form.render();
+	});
 </script>
 </body>
diff --git a/len-sys/src/main/resources/ftl/system/user/update.ftl b/len-sys/src/main/resources/ftl/system/user/update.ftl
index 64485aa..8c68320 100644
--- a/len-sys/src/main/resources/ftl/system/user/update.ftl
+++ b/len-sys/src/main/resources/ftl/system/user/update.ftl
@@ -3,47 +3,47 @@
 
 <body>
 <div class="x-body">
-    <form class="layui-form layui-form-pane" style="margin-left: 20px;">
-        <div style="width:100%;height:400px;overflow: auto;">
+	<form class="layui-form layui-form-pane" style="margin-left: 20px;">
+		<div style="width:100%;height:400px;overflow: auto;">
 
             <#--头像-->
-            <div class="layui-form-item">
-                <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                    <legend style="font-size:16px;">头像上传</legend>
-                </fieldset>
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">头像上传</legend>
+				</fieldset>
 
                 <#--上传组件-->
                 <@lenInclude path="/system/base/upload.ftl" id="uploadFile"></@lenInclude>
 
-                <div class="layui-input-inline">
-                    <div id="showImage" style="margin-top: 20px;margin-left: 50px">
-                        <img src="/images/${re.contextPath}/${user.photo}" width="100px" height="100px"
-                             class="layui-upload-img layui-circle">
-                    </div>
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
-                    <legend style="font-size:16px;">基础信息</legend>
-                </fieldset>
-            </div>
+				<div class="layui-input-inline">
+					<div id="showImage" style="margin-top: 20px;margin-left: 50px">
+						<img src="/images/${re.contextPath}/${user.photo}" width="100px" height="100px"
+							 class="layui-upload-img layui-circle">
+					</div>
+				</div>
+			</div>
+			<div class="layui-form-item">
+				<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;">
+					<legend style="font-size:16px;">基础信息</legend>
+				</fieldset>
+			</div>
 
             <#--用户名-->
-            <div class="layui-form-item">
-                <label for="uname" class="layui-form-label">
-                    <span class="x-red">*</span>用户名
-                </label>
-                <div class="layui-input-inline">
-                    <input value="${user.id}" type="hidden" name="id">
-                    <input type="text" id="uname" value="${user.username}" readonly lay-verify="username"
-                           autocomplete="off" class="layui-input">
-                </div>
-                <div id="ms" class="layui-form-mid layui-word-aux">
-                    <span class="x-red">*</span><span id="ums">将会成为您唯一的登入名</span>
-                </div>
-            </div>
-
-            <div class="layui-form-item">
+			<div class="layui-form-item">
+				<label for="uname" class="layui-form-label">
+					<span class="x-red">*</span>用户名
+				</label>
+				<div class="layui-input-inline">
+					<input value="${user.id}" type="hidden" name="id">
+					<input type="text" id="uname" value="${user.username}" readonly lay-verify="username"
+						   autocomplete="off" class="layui-input">
+				</div>
+				<div id="ms" class="layui-form-mid layui-word-aux">
+					<span class="x-red">*</span><span id="ums">将会成为您唯一的登入名</span>
+				</div>
+			</div>
+
+			<div class="layui-form-item">
 
                 <#--真实姓名-->
                 <@lenInclude  path="/system/base/lineInput.ftl"
@@ -60,141 +60,141 @@
                 id="age"
                 value="${user.age}"
                 name="age"/>
-            </div>
+			</div>
 
             <#--邮箱-->
-            <div class="layui-form-item">
-                <label for="email" class="layui-form-label">
-                    <span class="x-red"></span>邮箱
-                </label>
-                <div class="layui-input-block">
-                    <input type="email" id="email" value="${user.email}" style="width: 93%" name="email"
-                           lay-verify="email"
-                           autocomplete="off" class="layui-input">
-                    <input id="photo" value="${user.photo}" name="photo" type="hidden">
-                </div>
-            </div>
+			<div class="layui-form-item">
+				<label for="email" class="layui-form-label">
+					<span class="x-red"></span>邮箱
+				</label>
+				<div class="layui-input-block">
+					<input type="email" id="email" value="${user.email}" style="width: 93%" name="email"
+						   lay-verify="email"
+						   autocomplete="off" class="layui-input">
+					<input id="photo" value="${user.photo}" name="photo" type="hidden">
+				</div>
+			</div>
 
             <#--角色-->
-            <div class="layui-form-item">
-                <label class="layui-form-label">角色选择</label>
-                <div class="layui-input-block">
+			<div class="layui-form-item">
+				<label class="layui-form-label">角色选择</label>
+				<div class="layui-input-block">
                     <#list boxJson as json>
-                        <input type="checkbox" name="role" lay-filter="check" value="${json.id}" title="${json.name}"
+						<input type="checkbox" name="role" lay-filter="check" value="${json.id}" title="${json.name}"
                                <#if json.check?string=='true'>checked</#if>>
                     </#list>
-                </div>
-            </div>
-            <div style="height: 60px"></div>
-        </div>
+				</div>
+			</div>
+			<div style="height: 60px"></div>
+		</div>
         <#if !detail>
             <@lenInclude path="system/base/formBtn.ftl"></@lenInclude>
         </#if>
-    </form>
+	</form>
 </div>
 
 
 <script>
-    var flag, msg;
-    $(function () {
-        var name = '${user.username}';
-        if ($('#uname').val() === name)
-            flag = true;
-        $('#uname').on("blur", function () {
-            var uname = $('#uname').val();
-            if (uname.match(/[\u4e00-\u9fa5]/)) {
-                return;
-            }
-            if (!/(.+){3,12}$/.test(uname)) {
-                return;
-            }
-            if (!Len.isEmpty(uname) && uname != name) {
-                $.ajax({
-                    url: 'checkUser?uname=' + uname, async: false, type: 'get', success: function (data) {
-                        flag = data.flag;
-                        $('#ms').find('span').remove();
-                        if (!data.flag) {
-                            msg = data.msg;
-                            $('#ms').append("<span style='color: red;'>" + data.msg + "</span>");
-                        } else {
-                            flag = true;
-                            $('#ms').append("<span style='color: green;'>用户名可用</span>");
-                        }
-                    }, beforeSend: function () {
-                        $('#ms').find('span').remove();
-                        $('#ms').append("<span>验证ing</span>");
-                    }
-                });
-            } else {
-                flag = true;
-            }
-        });
-
-    });
-    layui.use(['form', 'layer', 'upload'], function () {
-        $ = layui.jquery;
-        var form = layui.form;
-
-
-        $('#uploadFile').uploadFile({
-            before: function (obj) {
-                obj.preview(function (index, file, result) {
-                    var imgObj = $('#showImage');
-                    imgObj.find('img').remove();
-                    imgObj.append('<img src="' + result + '" alt="' + file.name + '" width="100px" height="100px" class="layui-upload-img layui-circle">');
-                });
-            }, done: function (res) {
-                $("#photo").val(res.msg);
-            }
-        });
-
-        /**
-         * 校验
-         */
-        form.verify({
-            username: function (value) {
-                if (value.trim() === "") {
-                    return "用户名不能为空";
-                }
-                if (value.match(/[\u4e00-\u9fa5]/)) {
-                    return "用户名不能为中文";
-                }
-                if (!/(.+){3,12}$/.test(value)) {
-                    return "用户名必须3到12位";
-                }
-                if (typeof (flag) == 'undefined') {
-                    return "用户名验证ing";
-                }
-                if (!flag) {
-                    return msg;
-                }
-            }
-            , email: function (value) {
-                if (value !== "") {
-                    if (!/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/.test(value)) {
-                        return "邮箱格式不正确";
-                    }
-                }
-            }
-        });
-
-        $('#close').click(function () {
-            var index = parent.layer.getFrameIndex(window.name);
-            parent.layer.close(index);
-        });
-        //监听提交
-        form.on('submit(add)', function (data) {
-            var r = document.getElementsByName("role");
-            var role = [];
-            for (var i = 0; i < r.length; i++) {
-                if (r[i].checked) {
-                    role.push(r[i].value);
-                }
-            }
-            data.field.role = role;
-            Len.layerAjax('updateUser', data.field, 'userList');
-            return false;
-        });
-        form.render();
-    });
+	var flag, msg;
+	$(function () {
+		var name = '${user.username}';
+		if ($('#uname').val() === name)
+			flag = true;
+		$('#uname').on("blur", function () {
+			var uname = $('#uname').val();
+			if (uname.match(/[\u4e00-\u9fa5]/)) {
+				return;
+			}
+			if (!/(.+){3,12}$/.test(uname)) {
+				return;
+			}
+			if (!Len.isEmpty(uname) && uname != name) {
+				$.ajax({
+					url: 'checkUser?uname=' + uname, async: false, type: 'get', success: function (data) {
+						flag = data.flag;
+						$('#ms').find('span').remove();
+						if (!data.flag) {
+							msg = data.msg;
+							$('#ms').append("<span style='color: red;'>" + data.msg + "</span>");
+						} else {
+							flag = true;
+							$('#ms').append("<span style='color: green;'>用户名可用</span>");
+						}
+					}, beforeSend: function () {
+						$('#ms').find('span').remove();
+						$('#ms').append("<span>验证ing</span>");
+					}
+				});
+			} else {
+				flag = true;
+			}
+		});
+
+	});
+	layui.use(['form', 'layer', 'upload'], function () {
+		$ = layui.jquery;
+		var form = layui.form;
+
+
+		$('#uploadFile').uploadFile({
+			before: function (obj) {
+				obj.preview(function (index, file, result) {
+					var imgObj = $('#showImage');
+					imgObj.find('img').remove();
+					imgObj.append('<img src="' + result + '" alt="' + file.name + '" width="100px" height="100px" class="layui-upload-img layui-circle">');
+				});
+			}, done: function (res) {
+				$("#photo").val(res.msg);
+			}
+		});
+
+		/**
+		 * 校验
+		 */
+		form.verify({
+			username: function (value) {
+				if (value.trim() === "") {
+					return "用户名不能为空";
+				}
+				if (value.match(/[\u4e00-\u9fa5]/)) {
+					return "用户名不能为中文";
+				}
+				if (!/(.+){3,12}$/.test(value)) {
+					return "用户名必须3到12位";
+				}
+				if (typeof (flag) == 'undefined') {
+					return "用户名验证ing";
+				}
+				if (!flag) {
+					return msg;
+				}
+			}
+			, email: function (value) {
+				if (value !== "") {
+					if (!/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(.[a-zA-Z0-9_-])+/.test(value)) {
+						return "邮箱格式不正确";
+					}
+				}
+			}
+		});
+
+		$('#close').click(function () {
+			var index = parent.layer.getFrameIndex(window.name);
+			parent.layer.close(index);
+		});
+		//监听提交
+		form.on('submit(add)', function (data) {
+			var r = document.getElementsByName("role");
+			var role = [];
+			for (var i = 0; i < r.length; i++) {
+				if (r[i].checked) {
+					role.push(r[i].value);
+				}
+			}
+			data.field.role = role;
+			Len.layerAjax('updateUser', data.field, 'userList');
+			return false;
+		});
+		form.render();
+	});
 </script>
diff --git a/len-sys/src/main/resources/ftl/system/user/userList.ftl b/len-sys/src/main/resources/ftl/system/user/userList.ftl
index 94b12aa..6bc53ba 100644
--- a/len-sys/src/main/resources/ftl/system/user/userList.ftl
+++ b/len-sys/src/main/resources/ftl/system/user/userList.ftl
@@ -2,17 +2,17 @@
 
 <#--搜索-->
 <div class="lenos-search len-button">
-    <div class="search-select">
+	<div class="search-select">
         <@lenInclude path="/system/base/queryBox.ftl" name="用户名" id="uname" ></@lenInclude>
         <@lenInclude path="/system/base/queryBox.ftl" name="邮箱" id="email" ></@lenInclude>
-    </div>
+	</div>
 
 
 </div>
 
 <#--按钮-->
 <div class="layui-col-md12 len-button">
-    <div class="layui-btn-group  user-bar">
+	<div class="layui-btn-group  user-bar">
         <#include "/system/base/searth.ftl">
         <@lenInclude path="/system/base/btn.ftl" hasPermission="user:select"
         type="add" name="新建" icon="&#xe608;"></@lenInclude>
@@ -22,7 +22,7 @@
         type="detail" name="查看" icon="&#xe605;"></@lenInclude>
         <@lenInclude path="/system/base/btn.ftl" hasPermission="user:repass"
         type="changePwd" name="修改密码" icon="&#xe605;"></@lenInclude>
-    </div>
+	</div>
 </div>
 
 <#--表格-->
@@ -35,114 +35,114 @@
     <@lenInclude  path="/system/base/bar.ftl" hasPermission="user:del" name="删除" event="del"/>
 </script>
 <script type="text/html" id="switchTpl">
-    <input type="checkbox" name="sex" lay-skin="switch" lay-text="女|男" lay-filter="sexDemo">
+	<input type="checkbox" name="sex" lay-skin="switch" lay-text="女|男" lay-filter="sexDemo">
 </script>
 
 
 <script>
-    layui.use('table', function () {
-        table = layui.table;
-        //方法级渲染
-        table.render({
-            id: 'userList',
-            elem: '#userList'
-            , url: 'user/showUserList'
-            , parseData: function (res) {
-                return {
-                    "code": res.code,
-                    "msg": res.msg,
-                    "count": res.count,
-                    "data": res.data
-                };
-            }
-            , cols: [[
-                {checkbox: true, fixed: true, width: '5%'}
-                , {field: 'username', title: '用户名', width: '10%', sort: true,}
-                , {field: 'age', title: '年龄', width: '17%', sort: true}
-                , {field: 'realName', title: '真实姓名', width: '20%'}
-                , {field: 'email', title: '邮箱', width: '13%'}
-                , {field: 'right', title: '操作', width: '20%', toolbar: "#bar"}
-            ]]
-            , page: true,
-            height: 'full-100'
-        });
+	layui.use('table', function () {
+		table = layui.table;
+		//方法级渲染
+		table.render({
+			id: 'userList',
+			elem: '#userList'
+			, url: 'user/showUserList'
+			, parseData: function (res) {
+				return {
+					"code": res.code,
+					"msg": res.msg,
+					"count": res.count,
+					"data": res.data
+				};
+			}
+			, cols: [[
+				{checkbox: true, fixed: true, width: '5%'}
+				, {field: 'username', title: '用户名', width: '10%', sort: true,}
+				, {field: 'age', title: '年龄', width: '17%', sort: true}
+				, {field: 'realName', title: '真实姓名', width: '20%'}
+				, {field: 'email', title: '邮箱', width: '13%'}
+				, {field: 'right', title: '操作', width: '20%', toolbar: "#bar"}
+			]]
+			, page: true,
+			height: 'full-100'
+		});
 
-        var $ = layui.$, active = {
-            data: function () {
-                return table.checkStatus('userList').data;
-            },
-            /*查询*/
-            select: function () {
-                table.reload('userList', {
-                    where: {
-                        username: $('#uname').val(),
-                        email: $('#email').val()
-                    }
-                });
-            },
-            /*重置*/
-            reload: function () {
-                $('#uname').val('');
-                $('#email').val('');
-                table.reload('userList', {
-                    where: {
-                        username: null,
-                        email: null
-                    }
-                });
-            },
-            /*添加*/
-            add: function () {
-                Len.add('/user/showAddUser', '添加用户');
-            },
-            /*更新*/
-            update: function () {
-                var data = active.data();
-                Len.onlyOne(data.length) ? Len.update('/user/updateUser?id=' + data[0].id, '编辑用户',) : false;
-            },
-            /*详情*/
-            detail: function () {
-                var data = active.data();
-                Len.onlyOne(data.length) ? Len.detail('/user/updateUser?id=' + data[0].id, '查看用户信息',) : false;
-            },
-            /*重置密码*/
-            changePwd: function () {
-                var data = active.data();
-                Len.onlyOne(data.length) ? Len.popup('/user/goRePass?id=' + data[0].id, '修改密码', 500, 350) : false;
+		var $ = layui.$, active = {
+			data: function () {
+				return table.checkStatus('userList').data;
+			},
+			/*查询*/
+			select: function () {
+				table.reload('userList', {
+					where: {
+						username: $('#uname').val(),
+						email: $('#email').val()
+					}
+				});
+			},
+			/*重置*/
+			reload: function () {
+				$('#uname').val('');
+				$('#email').val('');
+				table.reload('userList', {
+					where: {
+						username: null,
+						email: null
+					}
+				});
+			},
+			/*添加*/
+			add: function () {
+				Len.add('/user/showAddUser', '添加用户');
+			},
+			/*更新*/
+			update: function () {
+				var data = active.data();
+				Len.onlyOne(data.length) ? Len.update('/user/updateUser?id=' + data[0].id, '编辑用户',) : false;
+			},
+			/*详情*/
+			detail: function () {
+				var data = active.data();
+				Len.onlyOne(data.length) ? Len.detail('/user/updateUser?id=' + data[0].id, '查看用户信息',) : false;
+			},
+			/*重置密码*/
+			changePwd: function () {
+				var data = active.data();
+				Len.onlyOne(data.length) ? Len.popup('/user/goRePass?id=' + data[0].id, '修改密码', 500, 350) : false;
 
-            }
-        };
+			}
+		};
 
-        /*监听表格复选框选择*/
-        table.on('checkbox(user)', function (obj) {
-        });
+		/*监听表格复选框选择*/
+		table.on('checkbox(user)', function (obj) {
+		});
 
-        /*监听工具条*/
-        table.on('tool(user)', function (obj) {
-            var data = obj.data;
-            switch (obj.event) {
-                case "detail":
-                    Len.detail('/user/updateUser?id=' + data.id, '编辑用户',);
-                    break;
-                case "edit":
-                    Len.update('/user/updateUser?id=' + data.id);
-                    break;
-                case "del":
-                    layer.confirm('确定删除?', function () {
-                        Len.ajaxPost('user/del', {id: data.id, realDel: true}, function (result) {
-                            if (!result.flag) {
-                                Len.warn(result.msg);
-                            } else {
-                                Len.success("删除成功");
-                                layui.table.reload('userList');
-                            }
-                        }, data.username);
-                    });
+		/*监听工具条*/
+		table.on('tool(user)', function (obj) {
+			var data = obj.data;
+			switch (obj.event) {
+				case "detail":
+					Len.detail('/user/updateUser?id=' + data.id, '编辑用户',);
+					break;
+				case "edit":
+					Len.update('/user/updateUser?id=' + data.id);
+					break;
+				case "del":
+					layer.confirm('确定删除?', function () {
+						Len.ajaxPost('user/del', {id: data.id, realDel: true}, function (result) {
+							if (!result.flag) {
+								Len.warn(result.msg);
+							} else {
+								Len.success("删除成功");
+								layui.table.reload('userList');
+							}
+						}, data.username);
+					});
 
-            }
-        });
-        Len.btnBind($('.user-bar .layui-btn'),active);
-        Len.keydown($('.user-bar .layui-btn'),active);
-    });
+			}
+		});
+		Len.btnBind($('.user-bar .layui-btn'), active);
+		Len.keydown($('.user-bar .layui-btn'), active);
+	});
 </script>
 
diff --git a/len-sys/src/main/resources/i18n/message_en_US.properties b/len-sys/src/main/resources/i18n/message_en_US.properties
index 426fb38..7f96087 100644
--- a/len-sys/src/main/resources/i18n/message_en_US.properties
+++ b/len-sys/src/main/resources/i18n/message_en_US.properties
@@ -9,21 +9,18 @@ user.exists=The user name already exists
 user.del.admin=Super tube cannot be deleted
 user.select.role=Please select a role
 user.bind.role=The account has been bound to a role
-
 login.error=Username/password error
 locking=Login failed many times, account locked for 10 minutes
 role.not.null=Role cannot be empty
 failed.get.data=Failed to get data
 failed.get.data1=Failed to get data[%s]
 upload.error=Failed to upload data
-    file.not.exists=File acquisition failed
+file.not.exists=File acquisition failed
 newpass.not.eq.oldpass=New password cannot be the same as the old password
 role.exists.user=Assigned to user, delete failed
 login.again=Please login again
-
 menu.bind.role=There are bound roles
 menu.exists.children=There is a submenu
-
 job.started=Task started, unable to operate
 job.start=Start successfully
 job.stop=Stop success
diff --git a/len-sys/src/main/resources/i18n/message_zh_CN.properties b/len-sys/src/main/resources/i18n/message_zh_CN.properties
index 7a038ee..a954d04 100644
--- a/len-sys/src/main/resources/i18n/message_zh_CN.properties
+++ b/len-sys/src/main/resources/i18n/message_zh_CN.properties
@@ -9,7 +9,6 @@ user.exists=\u7528\u6237\u540D\u5DF2\u5B58\u5728
 user.del.admin=\u8D85\u7BA1\u65E0\u6CD5\u5220\u9664
 user.select.role=\u8BF7\u9009\u62E9\u89D2\u8272
 user.bind.role=\u8D26\u6237\u5DF2\u7ECF\u7ED1\u5B9A\u89D2\u8272\uFF0C\u65E0\u6CD5\u5220\u9664
-
 login.error=\u7528\u6237\u540D/\u5BC6\u7801\u9519\u8BEF
 locking=\u767B\u5F55\u5931\u8D25\u591A\u6B21\uFF0C\u8D26\u6237\u9501\u5B9A10\u5206\u949F
 role.not.null=\u89D2\u8272\u4E0D\u80FD\u4E3A\u7A7A
@@ -20,10 +19,8 @@ file.not.exists=\u6587\u4EF6\u83B7\u53D6\u5931\u8D25
 newpass.not.eq.oldpass=\u65B0\u5BC6\u7801\u4E0D\u80FD\u4E0E\u65E7\u5BC6\u7801\u76F8\u540C
 role.exists.user=\u5DF2\u5206\u914D\u7ED9\u7528\u6237\uFF0C\u5220\u9664\u5931\u8D25
 login.again=\u8BF7\u91CD\u65B0\u767B\u5F55
-
 menu.bind.role=\u672C\u83DC\u5355\u5B58\u5728\u7ED1\u5B9A\u89D2\u8272,\u8BF7\u5148\u89E3\u9664\u7ED1\u5B9A!
 menu.exists.children=\u5B58\u5728\u5B50\u83DC\u5355,\u8BF7\u5148\u5220\u9664\u5B50\u83DC\u5355!
-
 job.started=\u4EFB\u52A1\u5DF2\u542F\u52A8\u4E2D\uFF0C\u65E0\u6CD5\u64CD\u4F5C
 job.start=\u542F\u52A8\u6210\u529F
 job.stop=\u505C\u6B62\u6210\u529F
diff --git a/len-sys/src/main/resources/mapper/SysDeptMapper.xml b/len-sys/src/main/resources/mapper/SysDeptMapper.xml
index be3c8f0..4ce2ec2 100644
--- a/len-sys/src/main/resources/mapper/SysDeptMapper.xml
+++ b/len-sys/src/main/resources/mapper/SysDeptMapper.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.len.mapper.SysDeptMapper">
-  <resultMap id="BaseResultMap" type="com.len.entity.SysDept">
+	<resultMap id="BaseResultMap" type="com.len.entity.SysDept">
 
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="dept_code" jdbcType="VARCHAR" property="deptCode" />
-    <result column="dept_name" jdbcType="VARCHAR" property="deptName" />
-    <result column="dept_pid" jdbcType="VARCHAR" property="deptPid" />
-    <result column="dept_desc" jdbcType="VARCHAR" property="deptDesc" />
-    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
-    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
-    <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
-  </resultMap>
-</mapper>
\ No newline at end of file
+		<id column="id" jdbcType="VARCHAR" property="id"/>
+		<result column="dept_code" jdbcType="VARCHAR" property="deptCode"/>
+		<result column="dept_name" jdbcType="VARCHAR" property="deptName"/>
+		<result column="dept_pid" jdbcType="VARCHAR" property="deptPid"/>
+		<result column="dept_desc" jdbcType="VARCHAR" property="deptDesc"/>
+		<result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+		<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
+		<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
+	</resultMap>
+</mapper>
diff --git a/len-sys/src/main/resources/mapper/SysEmployeeMapper.xml b/len-sys/src/main/resources/mapper/SysEmployeeMapper.xml
index 053fa93..71be201 100644
--- a/len-sys/src/main/resources/mapper/SysEmployeeMapper.xml
+++ b/len-sys/src/main/resources/mapper/SysEmployeeMapper.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.len.mapper.SysEmployeeMapper">
-  <resultMap id="BaseResultMap" type="com.len.entity.SysEmployee">
+	<resultMap id="BaseResultMap" type="com.len.entity.SysEmployee">
 
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="employee_code" jdbcType="VARCHAR" property="employeeCode" />
-    <result column="employee_name" jdbcType="VARCHAR" property="employeeName" />
-    <result column="employee_gender" jdbcType="VARCHAR" property="employeeGender" />
-    <result column="employee_birthday" jdbcType="VARCHAR" property="employeeBirthday" />
-    <result column="employee_deptcodes" jdbcType="VARCHAR" property="employeeDeptcodes" />
-    <result column="employee_mobile1" jdbcType="VARCHAR" property="employeeMobile1" />
-    <result column="employee_mobile2" jdbcType="VARCHAR" property="employeeMobile2" />
-    <result column="employee_mail1" jdbcType="VARCHAR" property="employeeMail1" />
-    <result column="employee_mail2" jdbcType="VARCHAR" property="employeeMail2" />
-    <result column="employee_wechat" jdbcType="VARCHAR" property="employeeWechat" />
-    <result column="employee_qq" jdbcType="VARCHAR" property="employeeQq" />
-    <result column="employee_photo" jdbcType="VARCHAR" property="employeePhoto" />
-    <result column="employee_ssn" jdbcType="VARCHAR" property="employeeSsn" />
-    <result column="employee_min" jdbcType="VARCHAR" property="employeeMin" />
-    <result column="dept_desc" jdbcType="VARCHAR" property="deptDesc" />
-    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
-    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
-    <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
-  </resultMap>
-</mapper>
\ No newline at end of file
+		<id column="id" jdbcType="VARCHAR" property="id"/>
+		<result column="employee_code" jdbcType="VARCHAR" property="employeeCode"/>
+		<result column="employee_name" jdbcType="VARCHAR" property="employeeName"/>
+		<result column="employee_gender" jdbcType="VARCHAR" property="employeeGender"/>
+		<result column="employee_birthday" jdbcType="VARCHAR" property="employeeBirthday"/>
+		<result column="employee_deptcodes" jdbcType="VARCHAR" property="employeeDeptcodes"/>
+		<result column="employee_mobile1" jdbcType="VARCHAR" property="employeeMobile1"/>
+		<result column="employee_mobile2" jdbcType="VARCHAR" property="employeeMobile2"/>
+		<result column="employee_mail1" jdbcType="VARCHAR" property="employeeMail1"/>
+		<result column="employee_mail2" jdbcType="VARCHAR" property="employeeMail2"/>
+		<result column="employee_wechat" jdbcType="VARCHAR" property="employeeWechat"/>
+		<result column="employee_qq" jdbcType="VARCHAR" property="employeeQq"/>
+		<result column="employee_photo" jdbcType="VARCHAR" property="employeePhoto"/>
+		<result column="employee_ssn" jdbcType="VARCHAR" property="employeeSsn"/>
+		<result column="employee_min" jdbcType="VARCHAR" property="employeeMin"/>
+		<result column="dept_desc" jdbcType="VARCHAR" property="deptDesc"/>
+		<result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+		<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
+		<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
+	</resultMap>
+</mapper>
diff --git a/len-sys/src/main/resources/mapper/SysJobMapper.xml b/len-sys/src/main/resources/mapper/SysJobMapper.xml
index d043788..c213577 100644
--- a/len-sys/src/main/resources/mapper/SysJobMapper.xml
+++ b/len-sys/src/main/resources/mapper/SysJobMapper.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.len.mapper.SysJobMapper">
-  <resultMap id="BaseResultMap" type="com.len.entity.SysJob">
+	<resultMap id="BaseResultMap" type="com.len.entity.SysJob">
 
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="job_name" jdbcType="VARCHAR" property="jobName" />
-    <result column="cron" jdbcType="VARCHAR" property="cron" />
-    <result column="status" jdbcType="BIT" property="status" />
-    <result column="clazz_path" jdbcType="VARCHAR" property="clazzPath" />
-    <result column="job_desc" jdbcType="VARCHAR" property="jobDesc" />
-    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
-    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
-    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
-    <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
-  </resultMap>
+		<id column="id" jdbcType="VARCHAR" property="id"/>
+		<result column="job_name" jdbcType="VARCHAR" property="jobName"/>
+		<result column="cron" jdbcType="VARCHAR" property="cron"/>
+		<result column="status" jdbcType="BIT" property="status"/>
+		<result column="clazz_path" jdbcType="VARCHAR" property="clazzPath"/>
+		<result column="job_desc" jdbcType="VARCHAR" property="jobDesc"/>
+		<result column="create_by" jdbcType="VARCHAR" property="createBy"/>
+		<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
+		<result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+		<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
+	</resultMap>
 
-  <select id="selectListByPage" parameterType="com.len.entity.SysJob" resultMap="BaseResultMap">
-    SELECT *
-    from sys_job
-    <where>
-      <if test="jobName!=null and jobName!=''"> and job_name like '%${jobName}%'</if>
-      <if test="clazzPath!=null and clazzPath!=''"> and clazz_path like '%${clazzPath}%'</if>
-      <if test="jobDesc!=null and jobDesc!=''"> and job_desc like '%${jobDesc}%'</if>
-      <if test="status!=null and status!=''"> and status =#{status}</if>
-    </where>
-  </select>
-</mapper>
\ No newline at end of file
+	<select id="selectListByPage" parameterType="com.len.entity.SysJob" resultMap="BaseResultMap">
+		SELECT *
+		from sys_job
+		<where>
+			<if test="jobName!=null and jobName!=''">and job_name like '%${jobName}%'</if>
+			<if test="clazzPath!=null and clazzPath!=''">and clazz_path like '%${clazzPath}%'</if>
+			<if test="jobDesc!=null and jobDesc!=''">and job_desc like '%${jobDesc}%'</if>
+			<if test="status!=null and status!=''">and status =#{status}</if>
+		</where>
+	</select>
+</mapper>
diff --git a/len-sys/src/main/resources/mapper/SysLogMapper.xml b/len-sys/src/main/resources/mapper/SysLogMapper.xml
index c03c34a..727c2c7 100644
--- a/len-sys/src/main/resources/mapper/SysLogMapper.xml
+++ b/len-sys/src/main/resources/mapper/SysLogMapper.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.len.mapper.SysLogMapper">
-  <resultMap id="BaseResultMap" type="com.len.entity.SysLog">
+	<resultMap id="BaseResultMap" type="com.len.entity.SysLog">
 
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="user_name" jdbcType="VARCHAR" property="userName" />
-    <result column="ip" jdbcType="VARCHAR" property="ip" />
-    <result column="type" jdbcType="VARCHAR" property="type" />
-    <result column="text" jdbcType="VARCHAR" property="text" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="param" jdbcType="LONGVARCHAR" property="param" />
-  </resultMap>
+		<id column="id" jdbcType="INTEGER" property="id"/>
+		<result column="user_name" jdbcType="VARCHAR" property="userName"/>
+		<result column="ip" jdbcType="VARCHAR" property="ip"/>
+		<result column="type" jdbcType="VARCHAR" property="type"/>
+		<result column="text" jdbcType="VARCHAR" property="text"/>
+		<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+		<result column="param" jdbcType="LONGVARCHAR" property="param"/>
+	</resultMap>
 
-  <select id="selectListByPage" parameterType="com.len.entity.SysLog" resultMap="BaseResultMap">
-    SELECT *
-    from sys_log
-    <where>
-      <if test="userName!=null and userName!=''"> and user_name like '%${userName}%'</if>
-      <if test="type!=null and type!=''"> and type like '%${type}%'</if>
-    </where>
-    ORDER  BY create_time desc
-  </select>
-</mapper>
\ No newline at end of file
+	<select id="selectListByPage" parameterType="com.len.entity.SysLog" resultMap="BaseResultMap">
+		SELECT *
+		from sys_log
+		<where>
+			<if test="userName!=null and userName!=''">and user_name like '%${userName}%'</if>
+			<if test="type!=null and type!=''">and type like '%${type}%'</if>
+		</where>
+		ORDER BY create_time desc
+	</select>
+</mapper>
diff --git a/len-sys/src/main/resources/mapper/SysMenuMapper.xml b/len-sys/src/main/resources/mapper/SysMenuMapper.xml
index 0ac8c53..6c7cf23 100644
--- a/len-sys/src/main/resources/mapper/SysMenuMapper.xml
+++ b/len-sys/src/main/resources/mapper/SysMenuMapper.xml
@@ -1,74 +1,90 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.len.mapper.SysMenuMapper">
-    <resultMap id="BaseResultMap" type="com.len.entity.SysMenu">
+	<resultMap id="BaseResultMap" type="com.len.entity.SysMenu">
 
-        <id column="id" jdbcType="VARCHAR" property="id"/>
-        <result column="code" jdbcType="VARCHAR" property="code"/>
-        <result column="name" jdbcType="VARCHAR" property="name"/>
-        <result column="p_id" jdbcType="VARCHAR" property="pId"/>
-        <result column="url" jdbcType="VARCHAR" property="url"/>
-        <result column="router" jdbcType="VARCHAR" property="router"/>
-        <result column="order_num" jdbcType="INTEGER" property="orderNum"/>
-        <result column="icon" jdbcType="VARCHAR" property="icon"/>
-        <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
-        <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
-        <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
-        <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
-        <result column="permission" jdbcType="VARCHAR" property="permission"/>
-        <result column="menu_type" jdbcType="TINYINT" property="menuType"/>
-    </resultMap>
+		<id column="id" jdbcType="VARCHAR" property="id"/>
+		<result column="code" jdbcType="VARCHAR" property="code"/>
+		<result column="name" jdbcType="VARCHAR" property="name"/>
+		<result column="p_id" jdbcType="VARCHAR" property="pId"/>
+		<result column="url" jdbcType="VARCHAR" property="url"/>
+		<result column="router" jdbcType="VARCHAR" property="router"/>
+		<result column="order_num" jdbcType="INTEGER" property="orderNum"/>
+		<result column="icon" jdbcType="VARCHAR" property="icon"/>
+		<result column="create_by" jdbcType="VARCHAR" property="createBy"/>
+		<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
+		<result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+		<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
+		<result column="permission" jdbcType="VARCHAR" property="permission"/>
+		<result column="menu_type" jdbcType="TINYINT" property="menuType"/>
+	</resultMap>
 
-    <resultMap id="menuAndRoleMap" type="com.len.entity.SysMenu">
-        <id column="id" jdbcType="VARCHAR" property="id"/>
-        <result column="code" jdbcType="VARCHAR" property="code"/>
-        <result column="name" jdbcType="VARCHAR" property="name"/>
-        <result column="p_id" jdbcType="VARCHAR" property="pId"/>
-        <result column="router" jdbcType="VARCHAR" property="router"/>
-        <result column="url" jdbcType="VARCHAR" property="url"/>
-        <result column="order_num" jdbcType="INTEGER" property="orderNum"/>
-        <result column="icon" jdbcType="VARCHAR" property="icon"/>
-        <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
-        <result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
-        <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
-        <result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
-        <result column="permission" jdbcType="VARCHAR" property="permission"/>
-        <result column="menu_type" jdbcType="TINYINT" property="menuType"/>
-        <collection property="roleList" ofType="com.len.entity.SysRole">
-            <id column="rid" jdbcType="VARCHAR" property="id"/>
-            <result column="role_name" jdbcType="VARCHAR" property="roleName"/>
-            <result column="remark" jdbcType="VARCHAR" property="remark"/>
-        </collection>
-    </resultMap>
-    <select id="getMenuNotSuper" resultMap="BaseResultMap">
-    select
-    *
-    from sys_menu where p_id is null and  menu_type=0 order by order_num asc
-  </select>
-    <select id="getMenuChildren" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select
-    *
-    from sys_menu where p_id=#{id,jdbcType=VARCHAR} and  menu_type=0 order by order_num asc
-  </select>
+	<resultMap id="menuAndRoleMap" type="com.len.entity.SysMenu">
+		<id column="id" jdbcType="VARCHAR" property="id"/>
+		<result column="code" jdbcType="VARCHAR" property="code"/>
+		<result column="name" jdbcType="VARCHAR" property="name"/>
+		<result column="p_id" jdbcType="VARCHAR" property="pId"/>
+		<result column="router" jdbcType="VARCHAR" property="router"/>
+		<result column="url" jdbcType="VARCHAR" property="url"/>
+		<result column="order_num" jdbcType="INTEGER" property="orderNum"/>
+		<result column="icon" jdbcType="VARCHAR" property="icon"/>
+		<result column="create_by" jdbcType="VARCHAR" property="createBy"/>
+		<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
+		<result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+		<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
+		<result column="permission" jdbcType="VARCHAR" property="permission"/>
+		<result column="menu_type" jdbcType="TINYINT" property="menuType"/>
+		<collection property="roleList" ofType="com.len.entity.SysRole">
+			<id column="rid" jdbcType="VARCHAR" property="id"/>
+			<result column="role_name" jdbcType="VARCHAR" property="roleName"/>
+			<result column="remark" jdbcType="VARCHAR" property="remark"/>
+		</collection>
+	</resultMap>
+	<select id="getMenuNotSuper" resultMap="BaseResultMap">
+		select *
+		from sys_menu
+		where p_id is null
+		  and menu_type = 0
+		order by order_num asc
+	</select>
+	<select id="getMenuChildren" parameterType="java.lang.String" resultMap="BaseResultMap">
+		select *
+		from sys_menu
+		where p_id = #{id,jdbcType=VARCHAR}
+		  and menu_type = 0
+		order by order_num asc
+	</select>
 
-    <select id="getMenuChildrenAll" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select
-    *
-    from sys_menu where p_id=#{id,jdbcType=VARCHAR} order by order_num asc
-  </select>
-    <select id="getUserMenu" parameterType="java.lang.String" resultMap="menuAndRoleMap">
-    select m.*,r.id as rid,m.router,r.role_name as role_name,r.remark as remark from sys_menu m left join sys_role_menu rm
-    on m.id=rm.menu_id left join sys_role r
-    on rm.role_id=r.id left join sys_role_user ru
-    on r.id=ru.role_id where ru.user_id =#{id,jdbcType=VARCHAR} order by m.order_num asc
-  </select>
-    <!--获取用户快捷菜单-->
-    <select id="getUserShortCuts" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select s.id,m.name,m.code,m.icon from sys_shortcuts s left join sys_menu m on s.shortcuts_menuid = m.id
-    where s.shortcuts_userid =#{userId,jdbcType=VARCHAR} order by s.shortcuts_num asc
-  </select>
-    <!--获取当前用户快捷菜单最大编码-->
-    <select id="getMaxNum" parameterType="java.lang.String" resultType="java.lang.Integer">
-    select max(shortcuts_num) from sys_shortcuts where shortcuts_userid =#{userId,jdbcType=VARCHAR}
-  </select>
-</mapper>
\ No newline at end of file
+	<select id="getMenuChildrenAll" parameterType="java.lang.String" resultMap="BaseResultMap">
+		select *
+		from sys_menu
+		where p_id = #{id,jdbcType=VARCHAR}
+		order by order_num asc
+	</select>
+	<select id="getUserMenu" parameterType="java.lang.String" resultMap="menuAndRoleMap">
+		select m.*, r.id as rid, m.router, r.role_name as role_name, r.remark as remark
+		from sys_menu m
+				 left join sys_role_menu rm
+						   on m.id = rm.menu_id
+				 left join sys_role r
+						   on rm.role_id = r.id
+				 left join sys_role_user ru
+						   on r.id = ru.role_id
+		where ru.user_id = #{id,jdbcType=VARCHAR}
+		order by m.order_num asc
+	</select>
+	<!--获取用户快捷菜单-->
+	<select id="getUserShortCuts" parameterType="java.lang.String" resultMap="BaseResultMap">
+		select s.id, m.name, m.code, m.icon
+		from sys_shortcuts s
+				 left join sys_menu m on s.shortcuts_menuid = m.id
+		where s.shortcuts_userid = #{userId,jdbcType=VARCHAR}
+		order by s.shortcuts_num asc
+	</select>
+	<!--获取当前用户快捷菜单最大编码-->
+	<select id="getMaxNum" parameterType="java.lang.String" resultType="java.lang.Integer">
+		select max(shortcuts_num)
+		from sys_shortcuts
+		where shortcuts_userid = #{userId,jdbcType=VARCHAR}
+	</select>
+</mapper>
diff --git a/len-sys/src/main/resources/mapper/SysRoleMapper.xml b/len-sys/src/main/resources/mapper/SysRoleMapper.xml
index 70e4313..4c2c788 100644
--- a/len-sys/src/main/resources/mapper/SysRoleMapper.xml
+++ b/len-sys/src/main/resources/mapper/SysRoleMapper.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.len.mapper.SysRoleMapper">
-  <resultMap id="BaseResultMap" type="com.len.entity.SysRole">
+	<resultMap id="BaseResultMap" type="com.len.entity.SysRole">
 
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="role_name" jdbcType="VARCHAR" property="roleName" />
-    <result column="remark" jdbcType="VARCHAR" property="remark" />
-    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
-    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
-    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
-    <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
-  </resultMap>
+		<id column="id" jdbcType="VARCHAR" property="id"/>
+		<result column="role_name" jdbcType="VARCHAR" property="roleName"/>
+		<result column="remark" jdbcType="VARCHAR" property="remark"/>
+		<result column="create_by" jdbcType="VARCHAR" property="createBy"/>
+		<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
+		<result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+		<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
+	</resultMap>
 
-  <select id="selectListByPage" parameterType="com.len.entity.SysRole" resultMap="BaseResultMap">
-    SELECT *
-    from sys_role
-    <where>
-      <if test="roleName!=null and roleName!=''">and role_name like '%${roleName}%'</if>
-      <if test="remark!=null and remark!=''">and remark like '%${remark}%'</if>
-    </where>
-    order by create_date desc
-  </select>
-</mapper>
\ No newline at end of file
+	<select id="selectListByPage" parameterType="com.len.entity.SysRole" resultMap="BaseResultMap">
+		SELECT *
+		from sys_role
+		<where>
+			<if test="roleName!=null and roleName!=''">and role_name like '%${roleName}%'</if>
+			<if test="remark!=null and remark!=''">and remark like '%${remark}%'</if>
+		</where>
+		order by create_date desc
+	</select>
+</mapper>
diff --git a/len-sys/src/main/resources/mapper/SysRoleMenuMapper.xml b/len-sys/src/main/resources/mapper/SysRoleMenuMapper.xml
index fb87b4b..adafc53 100644
--- a/len-sys/src/main/resources/mapper/SysRoleMenuMapper.xml
+++ b/len-sys/src/main/resources/mapper/SysRoleMenuMapper.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.len.mapper.SysRoleMenuMapper">
-  <resultMap id="BaseResultMap" type="com.len.entity.SysRoleMenu">
+	<resultMap id="BaseResultMap" type="com.len.entity.SysRoleMenu">
 
-    <id column="role_id" jdbcType="VARCHAR" property="roleId" />
-    <id column="menu_id" jdbcType="VARCHAR" property="menuId" />
-  </resultMap>
+		<id column="role_id" jdbcType="VARCHAR" property="roleId"/>
+		<id column="menu_id" jdbcType="VARCHAR" property="menuId"/>
+	</resultMap>
 
-  <select id="selectByCondition" parameterType="com.len.entity.SysRoleMenu" resultMap="BaseResultMap">
-    select
-    *
-    from sys_role_menu
-    <where>
-      <if test="menuId!=null and menuId!=''">and menu_id =#{menuId,jdbcType=VARCHAR}</if>
-      <if test="roleId!=null and roleId!=''">and role_id =#{roleId,jdbcType=VARCHAR}</if>
-    </where>
-  </select>
+	<select id="selectByCondition" parameterType="com.len.entity.SysRoleMenu" resultMap="BaseResultMap">
+		select
+		*
+		from sys_role_menu
+		<where>
+			<if test="menuId!=null and menuId!=''">and menu_id =#{menuId,jdbcType=VARCHAR}</if>
+			<if test="roleId!=null and roleId!=''">and role_id =#{roleId,jdbcType=VARCHAR}</if>
+		</where>
+	</select>
 
-  <select id="selectCountByCondition" parameterType="com.len.entity.SysRoleMenu" resultType="java.lang.Integer">
-    select
-    count(*)
-    from sys_role_menu
-    <where>
-      <if test="menuId!=null and menuId!=''">and menu_id =#{menuId,jdbcType=VARCHAR}</if>
-      <if test="roleId!=null and roleId!=''">and role_id =#{roleId,jdbcType=VARCHAR}</if>
-    </where>
-  </select>
-</mapper>
\ No newline at end of file
+	<select id="selectCountByCondition" parameterType="com.len.entity.SysRoleMenu" resultType="java.lang.Integer">
+		select
+		count(*)
+		from sys_role_menu
+		<where>
+			<if test="menuId!=null and menuId!=''">and menu_id =#{menuId,jdbcType=VARCHAR}</if>
+			<if test="roleId!=null and roleId!=''">and role_id =#{roleId,jdbcType=VARCHAR}</if>
+		</where>
+	</select>
+</mapper>
diff --git a/len-sys/src/main/resources/mapper/SysRoleUserMapper.xml b/len-sys/src/main/resources/mapper/SysRoleUserMapper.xml
index 9f70473..d981a0a 100644
--- a/len-sys/src/main/resources/mapper/SysRoleUserMapper.xml
+++ b/len-sys/src/main/resources/mapper/SysRoleUserMapper.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.len.mapper.SysRoleUserMapper">
-  <resultMap id="BaseResultMap" type="com.len.entity.SysRoleUser">
+	<resultMap id="BaseResultMap" type="com.len.entity.SysRoleUser">
 
-    <id column="user_id" jdbcType="VARCHAR" property="userId" />
-    <id column="role_id" jdbcType="VARCHAR" property="roleId" />
-  </resultMap>
+		<id column="user_id" jdbcType="VARCHAR" property="userId"/>
+		<id column="role_id" jdbcType="VARCHAR" property="roleId"/>
+	</resultMap>
 
-  <select id="selectByCondition" parameterType="com.len.entity.SysRoleUser" resultMap="BaseResultMap">
-    select
-    *
-    from sys_role_user
-    <where>
-      <if test="userId!=null and userId!=''">and user_id =#{userId,jdbcType=VARCHAR}</if>
-      <if test="roleId!=null and roleId!=''">and role_id =#{roleId,jdbcType=VARCHAR}</if>
-    </where>
-  </select>
-  <select id="selectCountByCondition" parameterType="com.len.entity.SysRoleUser" resultType="java.lang.Integer">
-    select
-    count(*)
-    from sys_role_user
-    <where>
-      <if test="userId!=null and userId!=''">and user_id =#{userId,jdbcType=VARCHAR}</if>
-      <if test="roleId!=null and roleId!=''">and role_id =#{roleId,jdbcType=VARCHAR}</if>
-    </where>
-  </select>
-</mapper>
\ No newline at end of file
+	<select id="selectByCondition" parameterType="com.len.entity.SysRoleUser" resultMap="BaseResultMap">
+		select
+		*
+		from sys_role_user
+		<where>
+			<if test="userId!=null and userId!=''">and user_id =#{userId,jdbcType=VARCHAR}</if>
+			<if test="roleId!=null and roleId!=''">and role_id =#{roleId,jdbcType=VARCHAR}</if>
+		</where>
+	</select>
+	<select id="selectCountByCondition" parameterType="com.len.entity.SysRoleUser" resultType="java.lang.Integer">
+		select
+		count(*)
+		from sys_role_user
+		<where>
+			<if test="userId!=null and userId!=''">and user_id =#{userId,jdbcType=VARCHAR}</if>
+			<if test="roleId!=null and roleId!=''">and role_id =#{roleId,jdbcType=VARCHAR}</if>
+		</where>
+	</select>
+</mapper>
diff --git a/len-sys/src/main/resources/mapper/SysUserMapper.xml b/len-sys/src/main/resources/mapper/SysUserMapper.xml
index 7df178e..8f79829 100644
--- a/len-sys/src/main/resources/mapper/SysUserMapper.xml
+++ b/len-sys/src/main/resources/mapper/SysUserMapper.xml
@@ -1,141 +1,149 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.len.mapper.SysUserMapper">
-  <resultMap id="BaseResultMap" type="com.len.entity.SysUser">
+	<resultMap id="BaseResultMap" type="com.len.entity.SysUser">
 
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="username" jdbcType="VARCHAR" property="username" />
-    <result column="password" jdbcType="VARCHAR" property="password" />
-    <result column="age" jdbcType="INTEGER" property="age" />
-    <result column="email" jdbcType="VARCHAR" property="email" />
-    <result column="photo" jdbcType="VARCHAR" property="photo" />
-    <result column="user_empId" jdbcType="VARCHAR" property="userEmpId" />
-    <result column="create_by" jdbcType="VARCHAR" property="createBy" />
-    <result column="update_by" jdbcType="VARCHAR" property="updateBy" />
-    <result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
-    <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
-    <result column="del_flag" jdbcType="TINYINT" property="delFlag" />
-  </resultMap>
+		<id column="id" jdbcType="VARCHAR" property="id"/>
+		<result column="username" jdbcType="VARCHAR" property="username"/>
+		<result column="password" jdbcType="VARCHAR" property="password"/>
+		<result column="age" jdbcType="INTEGER" property="age"/>
+		<result column="email" jdbcType="VARCHAR" property="email"/>
+		<result column="photo" jdbcType="VARCHAR" property="photo"/>
+		<result column="user_empId" jdbcType="VARCHAR" property="userEmpId"/>
+		<result column="create_by" jdbcType="VARCHAR" property="createBy"/>
+		<result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+		<result column="create_date" jdbcType="TIMESTAMP" property="createDate"/>
+		<result column="update_date" jdbcType="TIMESTAMP" property="updateDate"/>
+		<result column="del_flag" jdbcType="TINYINT" property="delFlag"/>
+	</resultMap>
 
-  <sql id="userColumn">
-    <trim suffix="" suffixOverrides=",">
-      <if test="id!=null">
-        id,
-      </if>
-      <if test="username!=null">
-        username,
-      </if>
-      <if test="password!=null">
-        password,
-      </if>
-      <if test="age!=null">
-        age,
-      </if>
-      <if test="email!=null">
-        email,
-      </if>
-      <if test="photo != null">
-        photo,
-      </if>
-      <if test="createBy != null">
-        create_by,
-      </if>
-      <if test="updateBy != null">
-        update_by,
-      </if>
-      <if test="createDate != null">
-        create_date,
-      </if>
-      <if test="updateDate != null">
-        update_date,
-      </if>
-      <if test="delFlag != null">
-        del_flag,
-      </if>
-    </trim>
-  </sql>
+	<sql id="userColumn">
+		<trim suffix="" suffixOverrides=",">
+			<if test="id!=null">
+				id,
+			</if>
+			<if test="username!=null">
+				username,
+			</if>
+			<if test="password!=null">
+				password,
+			</if>
+			<if test="age!=null">
+				age,
+			</if>
+			<if test="email!=null">
+				email,
+			</if>
+			<if test="photo != null">
+				photo,
+			</if>
+			<if test="createBy != null">
+				create_by,
+			</if>
+			<if test="updateBy != null">
+				update_by,
+			</if>
+			<if test="createDate != null">
+				create_date,
+			</if>
+			<if test="updateDate != null">
+				update_date,
+			</if>
+			<if test="delFlag != null">
+				del_flag,
+			</if>
+		</trim>
+	</sql>
 
-  <sql id="userValue">
-    <trim suffix="" suffixOverrides=",">
-      <if test="id!=null">
-        #{id},
-      </if>
-      <if test="username!=null">
-        #{username},
-      </if>
-      <if test="password!=null">
-        #{password},
-      </if>
-      <if test="age!=null">
-        #{age},
-      </if>
-      <if test="email!=null">
-        #{email},
-      </if>
-      <if test="photo != null">
-        #{photo,jdbcType=VARCHAR},
-      </if>
-      <if test="createBy != null">
-        #{createBy,jdbcType=VARCHAR},
-      </if>
-      <if test="updateBy != null">
-        #{updateBy,jdbcType=VARCHAR},
-      </if>
-      <if test="createDate != null">
-        #{createDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="updateDate != null">
-        #{updateDate,jdbcType=TIMESTAMP},
-      </if>
-      <if test="delFlag != null">
-        #{delFlag,jdbcType=TINYINT},
-      </if>
-    </trim>
-  </sql>
+	<sql id="userValue">
+		<trim suffix="" suffixOverrides=",">
+			<if test="id!=null">
+				#{id},
+			</if>
+			<if test="username!=null">
+				#{username},
+			</if>
+			<if test="password!=null">
+				#{password},
+			</if>
+			<if test="age!=null">
+				#{age},
+			</if>
+			<if test="email!=null">
+				#{email},
+			</if>
+			<if test="photo != null">
+				#{photo,jdbcType=VARCHAR},
+			</if>
+			<if test="createBy != null">
+				#{createBy,jdbcType=VARCHAR},
+			</if>
+			<if test="updateBy != null">
+				#{updateBy,jdbcType=VARCHAR},
+			</if>
+			<if test="createDate != null">
+				#{createDate,jdbcType=TIMESTAMP},
+			</if>
+			<if test="updateDate != null">
+				#{updateDate,jdbcType=TIMESTAMP},
+			</if>
+			<if test="delFlag != null">
+				#{delFlag,jdbcType=TINYINT},
+			</if>
+		</trim>
+	</sql>
 
 
+	<select id="login" resultMap="BaseResultMap">
+		select *
+		from sys_user
+		where username = #{username,jdbcType=VARCHAR}
+	</select>
+	<select id="selectListByPage" parameterType="com.len.entity.SysUser" resultMap="BaseResultMap">
+		SELECT *
+		from sys_user
+		<where>
+			del_flag=0
+			<if test="username!=null and username!=''">and username like '%${username}%'</if>
+			<if test="email!=null and email!=''">and email like '%${email}%'</if>
+		</where>
+	</select>
+	<select id="count" resultType="java.lang.Integer">
+		select count(*)
+		from sys_user
+	</select>
+	<insert id="add" parameterType="com.len.entity.SysUser">
+		insert into sys_user(
+		<include refid="userColumn"/>
+		) values (
+		<include refid="userValue"/>
+		)
+	</insert>
 
-  <select id="login" resultMap="BaseResultMap">
-    select
-    *
-    from sys_user
-    where username=#{username,jdbcType=VARCHAR}
-  </select>
-  <select id="selectListByPage" parameterType="com.len.entity.SysUser" resultMap="BaseResultMap">
-    SELECT *
-    from sys_user
-    <where>
-      del_flag=0
-      <if test="username!=null and username!=''"> and username like '%${username}%'</if>
-      <if test="email!=null and email!=''"> and email like '%${email}%'</if>
-    </where>
-  </select>
-  <select id="count" resultType="java.lang.Integer">
-    select count(*) from sys_user
-  </select>
-  <insert id="add" parameterType="com.len.entity.SysUser" >
-    insert into sys_user(
-    <include refid="userColumn"/>
-    ) values (
-    <include refid="userValue"/>
-    )
-  </insert>
+	<delete id="delById" parameterType="java.lang.String">
+		delete
+		from sys_user
+		where id = #{id}
+	</delete>
 
-  <delete id="delById" parameterType="java.lang.String">
-    delete from sys_user where id=#{id}
-  </delete>
+	<select id="checkUser" parameterType="java.lang.String" resultType="java.lang.Integer">
+		select count(1)
+		from sys_user
+		where username = #{username}
+	</select>
+	<update id="rePass" parameterType="com.len.entity.SysUser">
+		update sys_user
+		set password=#{password,jdbcType=VARCHAR}
+		where id = #{id,jdbcType=VARCHAR}
+	</update>
 
-  <select id="checkUser" parameterType="java.lang.String" resultType="java.lang.Integer">
-    select count(1) from sys_user where username=#{username}
-  </select>
-  <update id="rePass" parameterType="com.len.entity.SysUser">
-    update sys_user set password=#{password,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR}
-  </update>
 
+	<select id="getUserByRoleId" resultMap="BaseResultMap">
+		select sysuser.id, sysuser.real_name, sysuser.username
+		from sys_user sysuser
+				 inner join sys_role_user roleuser
+							on sysuser.id = roleuser.user_id and roleuser.role_id = #{roleId,jdbcType=VARCHAR}
 
-  <select id="getUserByRoleId" resultMap="BaseResultMap">
-    select sysuser.id,sysuser.real_name,sysuser.username from sys_user sysuser inner join sys_role_user roleuser on sysuser.id = roleuser.user_id and roleuser.role_id = #{roleId,jdbcType=VARCHAR}
+	</select>
 
-  </select>
-
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/len-sys/src/main/resources/plugin/build/css/admin.css b/len-sys/src/main/resources/plugin/build/css/admin.css
index 43de02a..7dc2b59 100644
--- a/len-sys/src/main/resources/plugin/build/css/admin.css
+++ b/len-sys/src/main/resources/plugin/build/css/admin.css
@@ -1,203 +1,203 @@
 /*tab 格式*/
 html {
-    color: #666;
-    background-color: #fff;
+	color: #666;
+	background-color: #fff;
 }
 
 .layui-body {
-    background-color: #fff;
+	background-color: #fff;
 }
 
 .kit-theme .layui-layout-admin .layui-body, .layui-layout-admin .layui-footer, .layui-layout-admin .layui-header .layui-layout-right, .layui-layout-admin .layui-header .layui-nav .layui-nav-item, .layui-layout-admin .layui-layout-left, .layui-layout-admin .layui-logo, .layui-layout-admin .layui-side {
-    transition: all .3s;
-    -webkit-transition: all .3s;
+	transition: all .3s;
+	-webkit-transition: all .3s;
 }
 
 .kit-theme .layui-layout-admin .layui-logo {
-    color: #fff;
-    color: rgba(255, 255, 255, .8);
+	color: #fff;
+	color: rgba(255, 255, 255, .8);
 }
 
 .kit-theme .layui-layout-admin .layui-logo-hidden, .kit-layout-admin .layui-logo-hidden {
-    display: none;
+	display: none;
 }
 
 
 .kit-theme .layui-layout-admin .layui-layout-left-zone {
-    position: absolute !important;
-    left: 20px;
-    top: 0
+	position: absolute !important;
+	left: 20px;
+	top: 0
 }
 
 .kit-theme .kit-layout-admin .kit-logo-min {
-    display: block;
-    width: 50px;
-    border-bottom: 0;
+	display: block;
+	width: 50px;
+	border-bottom: 0;
 }
 
 .kit-theme .layui-tab-title li.layui-this:after {
-    width: 100%;
-    border: none;
-    height: 1px;
-    background-color: #292B34;
+	width: 100%;
+	border: none;
+	height: 1px;
+	background-color: #292B34;
 }
 
 .kit-theme .layui-tab-title li:after {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 0;
-    height: 2px;
-    border-radius: 0;
-    background-color: #292B34;
-    transition: all .3s;
-    -webkit-transition: all .3s;
+	content: '';
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 0;
+	height: 2px;
+	border-radius: 0;
+	background-color: #292B34;
+	transition: all .3s;
+	-webkit-transition: all .3s;
 }
 
 .kit-theme .layui-tab-title li {
-    min-width: 0;
-    line-height: 40px;
-    max-width: 160px;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    border-right: 1px solid #f6f6f6;
-    vertical-align: top;
+	min-width: 0;
+	line-height: 40px;
+	max-width: 160px;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	border-right: 1px solid #f6f6f6;
+	vertical-align: top;
 }
 
 .kit-theme .layui-tab-card > .layui-tab-title {
-    background-color: #fff;
-    z-index: 999;
+	background-color: #fff;
+	z-index: 999;
 }
 
 .kit-theme .layui-tab-title li.layui-this, .kit-theme .layui-tab-title li:hover {
-    background-color: #f6f6f6;
+	background-color: #f6f6f6;
 }
 
 .kit-theme .layui-tab-title {
-    box-shadow: 0 1px 2px 0 rgb(0 0 0 / 10%);
+	box-shadow: 0 1px 2px 0 rgb(0 0 0 / 10%);
 }
 
 /*动态*/
 .admin-dynamic .admin-dynamic-content {
-    overflow-y: scroll;
+	overflow-y: scroll;
 }
 
 .admin-dynamic li {
-    text-align: left;
+	text-align: left;
 }
 
 .admin-dynamic .admin-dynamic-body {
-    display: block;
-    padding: 10px 15px;
-    background-color: #f8f8f8;
-    color: #999;
-    font-weight: bold;
-    border-radius: 2px;
-    transition: all .3s;
-    -webkit-transition: all .3s;
+	display: block;
+	padding: 10px 15px;
+	background-color: #f8f8f8;
+	color: #999;
+	font-weight: bold;
+	border-radius: 2px;
+	transition: all .3s;
+	-webkit-transition: all .3s;
 }
 
 .admin-dynamic .admin-dynamic-remove, .admin-shortcut .admin-shortcut-remove {
-    position: absolute;
-    right: -1px;
-    top: -5px;
-    display: none;
-    cursor: pointer;
+	position: absolute;
+	right: -1px;
+	top: -5px;
+	display: none;
+	cursor: pointer;
 }
 
 .admin-dynamic li:hover .admin-dynamic-remove, .admin-shortcut li:hover .admin-shortcut-remove {
-    display: inline-block;
+	display: inline-block;
 }
 
 /* 快捷方式 */
 .admin-shortcut li {
-    cursor: pointer;
-    text-align: center;
+	cursor: pointer;
+	text-align: center;
 }
 
 .admin-shortcut li a .layui-icon {
-    display: inline-block;
-    width: 100%;
-    height: 60px;
-    line-height: 60px;
-    text-align: center;
-    border-radius: 2px;
-    font-size: 30px;
-    background-color: #F8F8F8;
-    color: #333;
-    transition: all .3s;
-    -webkit-transition: all .3s;
+	display: inline-block;
+	width: 100%;
+	height: 60px;
+	line-height: 60px;
+	text-align: center;
+	border-radius: 2px;
+	font-size: 30px;
+	background-color: #F8F8F8;
+	color: #333;
+	transition: all .3s;
+	-webkit-transition: all .3s;
 }
 
 .admin-shortcut li cite {
-    position: relative;
-    top: 2px;
-    display: block;
-    color: #666;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-    font-size: 14px;
+	position: relative;
+	top: 2px;
+	display: block;
+	color: #666;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
+	font-size: 14px;
 }
 
 .admin-shortcut li:hover a .layui-icon {
-    background-color: #f2f2f2;
+	background-color: #f2f2f2;
 }
 
 /* 待办事项 */
 .admin-backlog .admin-backlog-body {
-    display: block;
-    padding: 10px 15px;
-    background-color: #f8f8f8;
-    color: #999;
-    border-radius: 2px;
-    transition: all .3s;
-    -webkit-transition: all .3s;
+	display: block;
+	padding: 10px 15px;
+	background-color: #f8f8f8;
+	color: #999;
+	border-radius: 2px;
+	transition: all .3s;
+	-webkit-transition: all .3s;
 }
 
 
 .admin-backlog-body h3 {
-    padding-bottom: 10px;
-    font-size: 12px;
+	padding-bottom: 10px;
+	font-size: 12px;
 }
 
 .admin-backlog-body p cite {
-    font-style: normal;
-    font-size: 30px;
-    font-weight: 300;
-    color: #009688;
+	font-style: normal;
+	font-size: 30px;
+	font-weight: 300;
+	color: #009688;
 }
 
 .admin-backlog-body:hover {
-    background-color: #f2f2f2;
-    color: #888;
+	background-color: #f2f2f2;
+	color: #888;
 }
 
 
 /* 滚动条优化 */
 ::-webkit-scrollbar {
-    width: 8px;
-    height: 8px;
+	width: 8px;
+	height: 8px;
 }
 
 ::-webkit-scrollbar-track {
-    border-radius: 2px;
+	border-radius: 2px;
 }
 
 ::-webkit-scrollbar-thumb {
-    background: #cdcdcd;
-    border-radius: 2px;
+	background: #cdcdcd;
+	border-radius: 2px;
 }
 
 ::-webkit-scrollbar-thumb:hover {
-    background-color: #747474;
+	background-color: #747474;
 }
 
 ::-webkit-scrollbar-corner {
-    background: #f6f6f6;
+	background: #f6f6f6;
 }
 
-body .ag-layout-normal{
-    font-size: 13px;
-}
\ No newline at end of file
+body .ag-layout-normal {
+	font-size: 13px;
+}
diff --git a/len-sys/src/main/resources/plugin/build/css/app.css b/len-sys/src/main/resources/plugin/build/css/app.css
index db9a0d4..bc598de 100644
--- a/len-sys/src/main/resources/plugin/build/css/app.css
+++ b/len-sys/src/main/resources/plugin/build/css/app.css
@@ -1,277 +1,277 @@
 .kit-sided .layui-side-scroll .layui-nav-item a, .layui-layout-admin .layui-header .layui-layout-right {
-    padding: 0
+	padding: 0
 }
 
 ::-webkit-scrollbar {
-    width: 10px;
-    height: 10px
+	width: 10px;
+	height: 10px
 }
 
 ::-webkit-scrollbar-button:vertical {
-    display: none
+	display: none
 }
 
 ::-webkit-scrollbar-corner, ::-webkit-scrollbar-track {
-    background-color: #e2e2e2
+	background-color: #e2e2e2
 }
 
 ::-webkit-scrollbar-thumb {
-    border-radius: 0;
-    background-color: rgba(0, 0, 0, .3)
+	border-radius: 0;
+	background-color: rgba(0, 0, 0, .3)
 }
 
 ::-webkit-scrollbar-thumb:vertical:hover {
-    background-color: rgba(0, 0, 0, .35)
+	background-color: rgba(0, 0, 0, .35)
 }
 
 ::-webkit-scrollbar-thumb:vertical:active {
-    background-color: rgba(0, 0, 0, .38)
+	background-color: rgba(0, 0, 0, .38)
 }
 
 a, button {
-    position: relative;
-    border: none;
-    outline: 0;
-    cursor: pointer;
-    overflow: hidden;
-    user-select: none
+	position: relative;
+	border: none;
+	outline: 0;
+	cursor: pointer;
+	overflow: hidden;
+	user-select: none
 }
 
 .ripple {
-    position: absolute;
-    background: rgba(0, 0, 0, .15);
-    border-radius: 100%;
-    transform: scale(0);
-    pointer-events: none
+	position: absolute;
+	background: rgba(0, 0, 0, .15);
+	border-radius: 100%;
+	transform: scale(0);
+	pointer-events: none
 }
 
 .kit-table, .kit-table .kit-table-header {
-    position: relative;
-    box-shadow: 0 1px 7px 0 #ccc
+	position: relative;
+	box-shadow: 0 1px 7px 0 #ccc
 }
 
 .kit-nav .layui-this, .layui-layout-left .layui-nav-item:hover {
-    background-color: #393D49 !important
+	background-color: #393D49 !important
 }
 
 .ripple.show {
-    animation: ripple .75s ease-out
+	animation: ripple .75s ease-out
 }
 
 @keyframes ripple {
-    to {
-        transform: scale(2);
-        opacity: 0
-    }
+	to {
+		transform: scale(2);
+		opacity: 0
+	}
 }
 
 .kit-layout-admin .kit-logo-mobile {
-    display: none
+	display: none
 }
 
 .kit-nav .layui-nav-item {
-    line-height: 50px
+	line-height: 50px
 }
 
 .kit-nav .layui-nav-item .layui-nav-more {
-    top: 22px
+	top: 22px
 }
 
 .kit-nav .layui-nav-item .layui-nav-mored {
-    top: 16px
+	top: 16px
 }
 
 .kit-nav .layui-nav-item .layui-nav-child {
-    top: 55px
+	top: 55px
 }
 
 .kit-nav * {
-    font-size: 13px
+	font-size: 13px
 }
 
 .kit-nav .layui-nav-bar {
-    height: 0
+	height: 0
 }
 
 .kit-nav .layui-this:after {
-    content: none
+	content: none
 }
 
 .kit-layout-admin .layui-footer {
-    height: 35px;
-    line-height: 35px
+	height: 35px;
+	line-height: 35px
 }
 
 .kit-layout-admin .layui-body {
-    bottom: 0px;
-    top: 50px
+	bottom: 0px;
+	top: 50px
 }
 
 .kit-layout-admin .layui-header {
-    height: 50px
+	height: 50px
 }
 
 .kit-layout-admin .layui-logo {
-    line-height: 50px
+	line-height: 50px
 }
 
 .kit-layout-admin .kit-side {
-    top: 50px
+	top: 50px
 }
 
 .kit-layout-admin .kit-sided {
-    width: 50px
+	width: 50px
 }
 
 .kit-side .layui-side-scroll, .kit-side .layui-side-scroll .layui-nav-tree {
-    width: auto
+	width: auto
 }
 
 .kit-side .layui-side-scroll .kit-side-fold {
-    height: 35px;
-    background-color: #4A5064;
-    color: #aeb9c2;
-    line-height: 35px;
-    text-align: center;
-    cursor: pointer
+	height: 35px;
+	background-color: #4A5064;
+	color: #aeb9c2;
+	line-height: 35px;
+	text-align: center;
+	cursor: pointer
 }
 
 .kit-sided .layui-side-scroll .layui-nav-item {
-    text-align: center
+	text-align: center
 }
 
 .kit-side .layui-nav-tree .layui-nav-child a {
-    padding-left: 30px
+	padding-left: 30px
 }
 
 .kit-sided .layui-nav-tree .layui-nav-child a {
-    padding-left: 0
+	padding-left: 0
 }
 
 .kit-sided .layui-side-scroll a span {
-    display: none
+	display: none
 }
 
 .kit-layout-admin .kit-body-folded, .kit-layout-admin .kit-footer-folded {
-    left: 50px
+	left: 50px
 }
 
 .kit-table .kit-table-header {
-    height: 50px
+	height: 50px
 }
 
 .kit-table .kit-table-header .kit-search-btns {
-    padding: 10px;
-    position: absolute
+	padding: 10px;
+	position: absolute
 }
 
 .kit-table .kit-table-header .kit-search-inputs {
-    position: absolute;
-    right: 70px;
-    top: 0;
-    padding: 10px 25px 10px 10px
+	position: absolute;
+	right: 70px;
+	top: 0;
+	padding: 10px 25px 10px 10px
 }
 
 .kit-table .kit-table-header .kit-search-inputs .kit-search-keyword {
-    margin-right: 10px;
-    position: relative
+	margin-right: 10px;
+	position: relative
 }
 
 .kit-table .kit-table-header .kit-search-inputs .kit-search-more {
-    cursor: pointer;
-    color: #009688;
-    position: absolute;
-    top: 15px;
-    right: -50px
+	cursor: pointer;
+	color: #009688;
+	position: absolute;
+	top: 15px;
+	right: -50px
 }
 
 .kit-table .kit-table-header .kit-search-inputs .kit-search-keyword input {
-    height: 30px;
-    line-height: 30px;
-    width: 200px;
-    padding-right: 32px
+	height: 30px;
+	line-height: 30px;
+	width: 200px;
+	padding-right: 32px
 }
 
 .kit-table .kit-table-header .kit-search-inputs .kit-search-keyword button {
-    position: absolute;
-    right: 0;
-    top: 0;
-    width: 30px;
-    height: 30px;
-    border: 0;
-    cursor: pointer;
-    background-color: #009688;
-    color: #fff
+	position: absolute;
+	right: 0;
+	top: 0;
+	width: 30px;
+	height: 30px;
+	border: 0;
+	cursor: pointer;
+	background-color: #009688;
+	color: #fff
 }
 
 .kit-table .kit-table-header .kit-search-btns .layui-btn {
-    padding: 0 15px
+	padding: 0 15px
 }
 
 .kit-table .kit-search-mored {
-    height: auto;
-    top: 51px;
-    background-color: #fff;
-    z-index: 5;
-    box-shadow: -4px 4px 7px -3px #ccc;
-    position: absolute;
-    margin-bottom: 10px;
-    display: none;
-    right: 0;
-    width: 50%
+	height: auto;
+	top: 51px;
+	background-color: #fff;
+	z-index: 5;
+	box-shadow: -4px 4px 7px -3px #ccc;
+	position: absolute;
+	margin-bottom: 10px;
+	display: none;
+	right: 0;
+	width: 50%
 }
 
 .kit-table .kit-search-mored .kit-search-body {
-    padding: 10px 10px 45px
+	padding: 10px 10px 45px
 }
 
 .kit-table .kit-search-mored .kit-search-footer {
-    height: 50px;
-    bottom: 0;
-    left: 0;
-    position: absolute;
-    width: 100%;
-    border-top: 1px solid #e2e2e2;
-    text-align: right
+	height: 50px;
+	bottom: 0;
+	left: 0;
+	position: absolute;
+	width: 100%;
+	border-top: 1px solid #e2e2e2;
+	text-align: right
 }
 
 .kit-tab, .kit-table .kit-table-body {
-    position: relative
+	position: relative
 }
 
 .kit-table .kit-search-mored .kit-search-footer .kit-btn {
-    margin: 10px 5px;
-    padding: 0 15px
+	margin: 10px 5px;
+	padding: 0 15px
 }
 
 .kit-table .kit-search-mored .kit-search-footer .kit-btn:last-child {
-    margin-right: 15px
+	margin-right: 15px
 }
 
 .kit-tab, .kit-table .kit-table-body .layui-table-view {
-    margin: 0
+	margin: 0
 }
 
 .kit-tab {
-    border-bottom: 0;
-    box-shadow: none
+	border-bottom: 0;
+	box-shadow: none
 }
 
 .kit-tab .kit-tab-tool, .kit-tab .kit-tab-tool-body .kit-line {
-    border-bottom: 1px solid #e2e2e2
+	border-bottom: 1px solid #e2e2e2
 }
 
 .kit-tab .kit-tab-tool {
-    position: absolute;
-    width: 60px;
-    height: 40px;
-    top: 0;
-    right: 0;
-    border-left: 1px solid #e2e2e2;
-    line-height: 40px;
-    text-align: center;
-    cursor: pointer;
-    box-shadow: 0 1px 2px 0 rgb(0 0 0 / 10%);
+	position: absolute;
+	width: 60px;
+	height: 40px;
+	top: 0;
+	right: 0;
+	border-left: 1px solid #e2e2e2;
+	line-height: 40px;
+	text-align: center;
+	cursor: pointer;
+	box-shadow: 0 1px 2px 0 rgb(0 0 0 / 10%);
 }
 
 /*.kit-tab-tool{
@@ -279,85 +279,85 @@ a, button {
   color: white;
 }*/
 .kit-tab .kit-tab-tool:hover {
-    background-color: #f3f3f3
+	background-color: #f3f3f3
 }
 
 .kit-tab .kit-tab-tool-body {
-    position: absolute;
-    top: 40px;
-    right: 0;
-    width: 150px;
-    border: 1px solid #e2e2e2;
-    display: none;
-    background-color: #fff;
-    z-index: 999
+	position: absolute;
+	top: 40px;
+	right: 0;
+	width: 150px;
+	border: 1px solid #e2e2e2;
+	display: none;
+	background-color: #fff;
+	z-index: 999
 }
 
 .kit-tab .kit-tab-tool-body ul {
-    text-align: center;
-    padding: 8px 0
+	text-align: center;
+	padding: 8px 0
 }
 
 .kit-tab .kit-tab-tool-body ul li.kit-item {
-    line-height: 35px;
-    cursor: pointer
+	line-height: 35px;
+	cursor: pointer
 }
 
 .kit-tab .kit-tab-tool-body ul li.kit-item:hover {
-    background-color: #f3f3f3
+	background-color: #f3f3f3
 }
 
 .kit-tab .layui-tab-title {
-    width: calc(100% - 71px);
-    padding-right: 10px;
-    position: absolute;
-    z-index: 2
+	width: calc(100% - 71px);
+	padding-right: 10px;
+	position: absolute;
+	z-index: 2
 }
 
 .kit-tab .layui-tab-content {
-    padding: 0;
-    position: relative;
-    top: 41px;
-    overflow-y: auto
+	padding: 0;
+	position: relative;
+	top: 41px;
+	overflow-y: auto
 }
 
 .kit-tab .layui-tab-content iframe {
-    width: 100%;
-    border: 0
+	width: 100%;
+	border: 0
 }
 
 @media (max-width: 992px) {
-    .kit-layout-admin .layui-body, .kit-layout-admin .layui-footer, .kit-layout-admin .layui-layout-left {
-        left: 50px
-    }
-
-    .kit-layout-admin .kit-side {
-        width: 50px
-    }
-
-    .kit-layout-admin .kit-side .layui-side-scroll .layui-nav li.layui-nav-item, .kit-layout-admin .kit-side .layui-side-scroll .layui-nav li.layui-nav-item dl dd {
-        text-align: center
-    }
-
-    .kit-layout-admin .kit-side .layui-side-scroll .layui-nav li.layui-nav-item a, .kit-layout-admin .kit-side .layui-side-scroll .layui-nav li.layui-nav-item dl dd a {
-        padding: 0
-    }
-
-    .kit-layout-admin .kit-side .layui-side-scroll .layui-nav li.layui-nav-item a span, .kit-layout-admin .kit-side .layui-side-scroll .layui-nav li.layui-nav-item dl dd a span, .kit-layout-admin .layui-logo, .kit-side .layui-side-scroll .kit-side-fold {
-        display: none
-    }
-
-    .kit-layout-admin .kit-logo-mobile {
-        display: block;
-        width: 50px
-    }
-
-    .kit-table .kit-search-mored {
-        width: 100%;
-        box-shadow: 0 4px 7px -3px #ccc
-    }
-
-    .kit-side .layui-nav-tree .layui-nav-child a, .kit-sided .layui-nav-tree .layui-nav-child a {
-        padding-left: 0
-    }
-}
\ No newline at end of file
+	.kit-layout-admin .layui-body, .kit-layout-admin .layui-footer, .kit-layout-admin .layui-layout-left {
+		left: 50px
+	}
+
+	.kit-layout-admin .kit-side {
+		width: 50px
+	}
+
+	.kit-layout-admin .kit-side .layui-side-scroll .layui-nav li.layui-nav-item, .kit-layout-admin .kit-side .layui-side-scroll .layui-nav li.layui-nav-item dl dd {
+		text-align: center
+	}
+
+	.kit-layout-admin .kit-side .layui-side-scroll .layui-nav li.layui-nav-item a, .kit-layout-admin .kit-side .layui-side-scroll .layui-nav li.layui-nav-item dl dd a {
+		padding: 0
+	}
+
+	.kit-layout-admin .kit-side .layui-side-scroll .layui-nav li.layui-nav-item a span, .kit-layout-admin .kit-side .layui-side-scroll .layui-nav li.layui-nav-item dl dd a span, .kit-layout-admin .layui-logo, .kit-side .layui-side-scroll .kit-side-fold {
+		display: none
+	}
+
+	.kit-layout-admin .kit-logo-mobile {
+		display: block;
+		width: 50px
+	}
+
+	.kit-table .kit-search-mored {
+		width: 100%;
+		box-shadow: 0 4px 7px -3px #ccc
+	}
+
+	.kit-side .layui-nav-tree .layui-nav-child a, .kit-sided .layui-nav-tree .layui-nav-child a {
+		padding-left: 0
+	}
+}
diff --git a/len-sys/src/main/resources/plugin/build/css/themes/blue.css b/len-sys/src/main/resources/plugin/build/css/themes/blue.css
index afc33d0..85fcd54 100644
--- a/len-sys/src/main/resources/plugin/build/css/themes/blue.css
+++ b/len-sys/src/main/resources/plugin/build/css/themes/blue.css
@@ -1,104 +1,104 @@
 /** kit_admin-v1.1.0 MIT License By http://kit/zhengjinfan.cn e-mail:zheng_jinfan@126.com */
 .kit-theme .layui-layout-admin .layui-logo {
-    background-color: #1E9FFF
+	background-color: #1E9FFF
 }
 
 .kit-theme .kit-layout-admin .layui-header {
-    background-color: #fff;
+	background-color: #fff;
 }
 
 .kit-theme .kit-side, .kit-theme .kit-side .layui-side-scroll .layui-nav-tree, .kit-theme .layui-layout-left .layui-nav-item:hover {
-    background-color: #fff !important
+	background-color: #fff !important
 }
 
 .kit-theme .layui-layout-admin .layui-header .layui-nav {
-    color: #EEE
+	color: #EEE
 }
 
 .kit-theme .kit-layout-admin .layui-body {
-    top: 52px
+	top: 52px
 }
 
 .kit-theme .kit-side {
-    box-shadow: 0 0 10px 0 #ccc;
-    top: 52px
+	box-shadow: 0 0 10px 0 #ccc;
+	top: 52px
 }
 
 .kit-theme .kit-side .layui-nav-tree .layui-nav-item {
-    background-color: #fff;
-    border-bottom: 1px solid #EEE
+	background-color: #fff;
+	border-bottom: 1px solid #EEE
 }
 
 .kit-theme .kit-side .layui-nav-tree .layui-nav-item a:hover {
-    background-color: #fff;
-    color: #EEE
+	background-color: #fff;
+	color: #EEE
 }
 
 .kit-theme .kit-side .layui-nav .layui-nav-item a {
-    color: #666 !important
+	color: #666 !important
 }
 
 .kit-theme .kit-side .layui-nav-tree .layui-nav-child dd.layui-this, .kit-theme .kit-side .layui-nav-tree .layui-nav-child dd.layui-this a, .kit-theme .kit-side .layui-nav-tree .layui-nav-child dd.layui-this a:hover, .kit-theme .kit-side .layui-nav-tree .layui-this, .kit-theme .kit-side .layui-nav-tree .layui-this > a, .kit-theme .kit-side .layui-nav-tree .layui-this > a:hover {
-    color: #1E9FFF !important;
-    background-color: #fff !important
+	color: #1E9FFF !important;
+	background-color: #fff !important
 }
 
 .kit-theme .kit-side .layui-nav .layui-nav-itemed .layui-nav-child {
-    background-color: #f8f8f8 !important
+	background-color: #f8f8f8 !important
 }
 
 .kit-theme .kit-side .layui-nav-tree .layui-nav-child dd:first-child {
-    border-top: 1px solid #EEE
+	border-top: 1px solid #EEE
 }
 
 .kit-theme .kit-nav li.layui-this {
-    background-color: #fff !important
+	background-color: #fff !important
 }
 
 .kit-theme .kit-nav li.layui-this a {
-    color: #1E9FFF !important
+	color: #1E9FFF !important
 }
 
 .kit-theme .kit-nav .layui-nav-item a {
-    color: #666 !important
+	color: #666 !important
 }
 
 .kit-theme .kit-nav .layui-nav-item a:hover {
-    color: #1E9FFF !important
+	color: #1E9FFF !important
 }
 
 .kit-theme .kit-tab .layui-tab-title li.layui-this, .kit-theme .kit-table .kit-table-header .kit-search-inputs .kit-search-more, .kit-theme .layui-table-tool .layui-laypage a:hover {
-    color: #1E9FFF
+	color: #1E9FFF
 }
 
 .kit-theme .kit-side .layui-side-scroll .kit-side-fold {
-    color: #1E9FFF;
-    background-color: #fff;
-    border-bottom: 1px solid #eee
+	color: #1E9FFF;
+	background-color: #fff;
+	border-bottom: 1px solid #eee
 }
 
 .kit-theme .kit-side .layui-nav-tree .layui-nav-child dd.layui-this {
-    padding-left: 3px;
-    background-color: #1E9FFF !important
+	padding-left: 3px;
+	background-color: #1E9FFF !important
 }
 
 .kit-theme .kit-side .layui-nav-tree li.layui-this {
-    padding-left: 5px;
-    background-color: #1E9FFF !important
+	padding-left: 5px;
+	background-color: #1E9FFF !important
 }
 
 .kit-theme .kit-side .layui-nav-tree .layui-nav-bar {
-    background-color: #1E9FFF !important
+	background-color: #1E9FFF !important
 }
 
 .kit-table .kit-table-header .kit-search-inputs .kit-search-keyword button, .kit-theme .layui-laypage .layui-laypage-curr .layui-laypage-em {
-    background-color: #1E9FFF
+	background-color: #1E9FFF
 }
 
 .kit-theme .layui-nav .layui-nav-more {
-    border-top-color: #1E9FFF
+	border-top-color: #1E9FFF
 }
 
 .kit-theme .kit-nav .layui-nav-itemed .layui-nav-more, .kit-theme .kit-nav .layui-nav-mored, .kit-theme .kit-side .layui-nav-itemed .layui-nav-more, .kit-theme .kit-side .layui-nav-mored {
-    border-color: transparent transparent #1E9FFF
-}
\ No newline at end of file
+	border-color: transparent transparent #1E9FFF
+}
diff --git a/len-sys/src/main/resources/plugin/build/css/themes/default.css b/len-sys/src/main/resources/plugin/build/css/themes/default.css
index e6c5d01..0244556 100644
--- a/len-sys/src/main/resources/plugin/build/css/themes/default.css
+++ b/len-sys/src/main/resources/plugin/build/css/themes/default.css
@@ -1,9 +1,10 @@
 
 .kit-theme .kit-layout-admin .layui-header {
-    border-bottom: 2px solid rgba(255, 255, 255, 0.08)
+	border-bottom: 2px solid rgba(255, 255, 255, 0.08)
 }
-.kit-theme .layui-tab-card>.layui-tab-title{
-    background-color: #fbfbfb;
+
+.kit-theme .layui-tab-card > .layui-tab-title {
+	background-color: #fbfbfb;
 }
 
 
diff --git a/len-sys/src/main/resources/plugin/build/css/themes/orange.css b/len-sys/src/main/resources/plugin/build/css/themes/orange.css
index 24b0f38..446fa46 100644
--- a/len-sys/src/main/resources/plugin/build/css/themes/orange.css
+++ b/len-sys/src/main/resources/plugin/build/css/themes/orange.css
@@ -1,106 +1,106 @@
 /** kit_admin-v1.1.0 MIT License By http://kit/zhengjinfan.cn e-mail:zheng_jinfan@126.com */
 .kit-theme .layui-layout-admin .layui-logo {
-    color: #fff;
-    background-color: #ff6700
+	color: #fff;
+	background-color: #ff6700
 }
 
 .kit-theme .kit-layout-admin .layui-header {
-    background-color: #fff;
-    border-bottom: 2px solid #ff6700
+	background-color: #fff;
+	border-bottom: 2px solid #ff6700
 }
 
 .kit-theme .kit-side, .kit-theme .kit-side .layui-side-scroll .layui-nav-tree, .kit-theme .layui-layout-left .layui-nav-item:hover {
-    background-color: #fff !important
+	background-color: #fff !important
 }
 
 .kit-theme .layui-layout-admin .layui-header .layui-nav {
-    color: #EEE
+	color: #EEE
 }
 
 .kit-theme .kit-layout-admin .layui-body {
-    top: 52px
+	top: 52px
 }
 
 .kit-theme .kit-side {
-    box-shadow: 0 0 10px 0 #ccc;
-    top: 52px
+	box-shadow: 0 0 10px 0 #ccc;
+	top: 52px
 }
 
 .kit-theme .kit-side .layui-nav-tree .layui-nav-item {
-    background-color: #fff;
-    border-bottom: 1px solid #EEE
+	background-color: #fff;
+	border-bottom: 1px solid #EEE
 }
 
 .kit-theme .kit-side .layui-nav-tree .layui-nav-item a:hover {
-    background-color: #fff;
-    color: #EEE
+	background-color: #fff;
+	color: #EEE
 }
 
 .kit-theme .kit-side .layui-nav .layui-nav-item a {
-    color: #393D49 !important
+	color: #393D49 !important
 }
 
 .kit-theme .kit-side .layui-nav-tree .layui-nav-child dd.layui-this, .kit-theme .kit-side .layui-nav-tree .layui-nav-child dd.layui-this a, .kit-theme .kit-side .layui-nav-tree .layui-nav-child dd.layui-this a:hover, .kit-theme .kit-side .layui-nav-tree .layui-this, .kit-theme .kit-side .layui-nav-tree .layui-this > a, .kit-theme .kit-side .layui-nav-tree .layui-this > a:hover {
-    color: #ff6700 !important;
-    background-color: #fff !important
+	color: #ff6700 !important;
+	background-color: #fff !important
 }
 
 .kit-theme .kit-side .layui-nav .layui-nav-itemed .layui-nav-child {
-    background-color: #f8f8f8 !important
+	background-color: #f8f8f8 !important
 }
 
 .kit-theme .kit-side .layui-nav-tree .layui-nav-child dd:first-child {
-    border-top: 1px solid #EEE
+	border-top: 1px solid #EEE
 }
 
 .kit-theme .kit-nav li.layui-this {
-    background-color: #fff !important
+	background-color: #fff !important
 }
 
 .kit-theme .kit-nav li.layui-this a {
-    color: #ff6700 !important
+	color: #ff6700 !important
 }
 
 .kit-theme .kit-nav .layui-nav-item a {
-    color: #393D49 !important
+	color: #393D49 !important
 }
 
 .kit-theme .kit-nav .layui-nav-item a:hover {
-    color: #ff6700 !important
+	color: #ff6700 !important
 }
 
 .kit-theme .kit-tab .layui-tab-title li.layui-this, .kit-theme .kit-table .kit-table-header .kit-search-inputs .kit-search-more, .kit-theme .layui-table-tool .layui-laypage a:hover {
-    color: #ff6700
+	color: #ff6700
 }
 
 .kit-theme .kit-side .layui-side-scroll .kit-side-fold {
-    color: #ff6700;
-    background-color: #fff;
-    border-bottom: 1px solid #eee
+	color: #ff6700;
+	background-color: #fff;
+	border-bottom: 1px solid #eee
 }
 
 .kit-theme .kit-side .layui-nav-tree .layui-nav-child dd.layui-this {
-    padding-left: 3px;
-    background-color: #ff6700 !important
+	padding-left: 3px;
+	background-color: #ff6700 !important
 }
 
 .kit-theme .kit-side .layui-nav-tree li.layui-this {
-    padding-left: 5px;
-    background-color: #ff6700 !important
+	padding-left: 5px;
+	background-color: #ff6700 !important
 }
 
 .kit-theme .kit-side .layui-nav-tree .layui-nav-bar {
-    background-color: #ff6700 !important
+	background-color: #ff6700 !important
 }
 
 .kit-table .kit-table-header .kit-search-inputs .kit-search-keyword button, .kit-theme .layui-laypage .layui-laypage-curr .layui-laypage-em {
-    background-color: #ff6700
+	background-color: #ff6700
 }
 
 .kit-theme .layui-nav .layui-nav-more {
-    border-top-color: #ff6700
+	border-top-color: #ff6700
 }
 
 .kit-theme .kit-nav .layui-nav-itemed .layui-nav-more, .kit-theme .kit-nav .layui-nav-mored, .kit-theme .kit-side .layui-nav-itemed .layui-nav-more, .kit-theme .kit-side .layui-nav-mored {
-    border-color: transparent transparent #ff6700
-}
\ No newline at end of file
+	border-color: transparent transparent #ff6700
+}
diff --git a/len-sys/src/main/resources/plugin/build/js/admin.js b/len-sys/src/main/resources/plugin/build/js/admin.js
index 60b0b26..7229a72 100644
--- a/len-sys/src/main/resources/plugin/build/js/admin.js
+++ b/len-sys/src/main/resources/plugin/build/js/admin.js
@@ -1,54 +1,53 @@
 layui.config({
-    base: 'plugin/build/js/',
-    version: '1.0.1'
+	base: 'plugin/build/js/',
+	version: '1.0.1'
 }).define('tab', function (exports) {
 
-    var $ = layui.jquery;
-    var $body = $('body');
-
-
-
-    var admin = {};
-    var events = admin.events = {
-        fullscreen: function (othis) {
-            var SCREEN_FULL = 'layui-icon-screen-full'
-                , SCREEN_REST = 'layui-icon-screen-restore'
-                , iconElem = othis.children("i");
-            var elem = document.body;
-            if (iconElem.hasClass(SCREEN_FULL)) {
-                if (elem.webkitRequestFullScreen) {
-                    elem.webkitRequestFullScreen();
-                } else if (elem.mozRequestFullScreen) {
-                    elem.mozRequestFullScreen();
-                } else if (elem.requestFullScreen) {
-                    elem.requestFullscreen();
-                }
-
-                iconElem.addClass(SCREEN_REST).removeClass(SCREEN_FULL);
-            } else {
-                elem = document;
-                if (elem.webkitCancelFullScreen) {
-                    elem.webkitCancelFullScreen();
-                } else if (elem.mozCancelFullScreen) {
-                    elem.mozCancelFullScreen();
-                } else if (elem.cancelFullScreen) {
-                    elem.cancelFullScreen();
-                } else if (elem.exitFullscreen) {
-                    elem.exitFullscreen();
-                }
-
-                iconElem.addClass(SCREEN_FULL).removeClass(SCREEN_REST);
-            }
-        }
-    };
-
-    $body.on('click', '*[layadmin-event]', function () {
-        var othis = $(this)
-            , attrEvent = othis.attr('layadmin-event');
-        events[attrEvent] && events[attrEvent].call(this, othis);
-    });
-
-    exports('admin', admin);
+	var $ = layui.jquery;
+	var $body = $('body');
+
+
+	var admin = {};
+	var events = admin.events = {
+		fullscreen: function (othis) {
+			var SCREEN_FULL = 'layui-icon-screen-full'
+				, SCREEN_REST = 'layui-icon-screen-restore'
+				, iconElem = othis.children("i");
+			var elem = document.body;
+			if (iconElem.hasClass(SCREEN_FULL)) {
+				if (elem.webkitRequestFullScreen) {
+					elem.webkitRequestFullScreen();
+				} else if (elem.mozRequestFullScreen) {
+					elem.mozRequestFullScreen();
+				} else if (elem.requestFullScreen) {
+					elem.requestFullscreen();
+				}
+
+				iconElem.addClass(SCREEN_REST).removeClass(SCREEN_FULL);
+			} else {
+				elem = document;
+				if (elem.webkitCancelFullScreen) {
+					elem.webkitCancelFullScreen();
+				} else if (elem.mozCancelFullScreen) {
+					elem.mozCancelFullScreen();
+				} else if (elem.cancelFullScreen) {
+					elem.cancelFullScreen();
+				} else if (elem.exitFullscreen) {
+					elem.exitFullscreen();
+				}
+
+				iconElem.addClass(SCREEN_FULL).removeClass(SCREEN_REST);
+			}
+		}
+	};
+
+	$body.on('click', '*[layadmin-event]', function () {
+		var othis = $(this)
+			, attrEvent = othis.attr('layadmin-event');
+		events[attrEvent] && events[attrEvent].call(this, othis);
+	});
+
+	exports('admin', admin);
 
 
 });
diff --git a/len-sys/src/main/resources/plugin/build/js/app.js b/len-sys/src/main/resources/plugin/build/js/app.js
index 350d461..8cc6784 100644
--- a/len-sys/src/main/resources/plugin/build/js/app.js
+++ b/len-sys/src/main/resources/plugin/build/js/app.js
@@ -1,5 +1,5 @@
 /** kit_admin-v1.1.0 MIT License By http://kit/zhengjinfan.cn e-mail:zheng_jinfan@126.com */
- ;/**
+;/**
  * Name:app.js
  * Author:Van
  * E-mail:zheng_jinfan@126.com
@@ -7,225 +7,225 @@
  * LICENSE:MIT
  */
 var tab;
-layui.define(['element', 'nprogress', 'form', 'table', 'loader', 'tab', 'navbar', 'onelevel', 'laytpl', 'spa'], function(exports) {
-    var $ = layui.jquery,
-        element = layui.element,
-        layer = layui.layer,
-        _win = $(window),
-        _doc = $(document),
-        _body = $('.kit-body'),
-        form = layui.form,
-        table = layui.table,
-        loader = layui.loader,
-        navbar = layui.navbar,
-        _componentPath = 'components/',
-        spa = layui.spa;
-    tab = layui.tab
-    var app = {
-        hello: function(str) {
-            layer.alert('Hello ' + (str || 'test'));
-        },
-        config: {
-            type: 'page'
-        },
-        set: function(options) {
-            var that = this;
-            $.extend(true, that.config, options);
-            return that;
-        },
-        getId:function(){
-           return tab.getId();
-        },
-        init: function() {
-            var that = this,
-                _config = that.config;
-            if (_config.type === 'spa') {
-                navbar.bind(function(data) {
-                    spa.render(data.url, function() {
-                        console.log('渲染完成..');
-                    });
-                });
-            }
-            if (_config.type === 'page') {
-                tab.set({
-                    renderType: 'page',
-                    mainUrl: 'dashboard',
-                    elem: '#container',
-                    onSwitch: function(data) { //选项卡切换时触发
-                        //console.log(data.layId); //lay-id值
-                        //console.log(data.index); //得到当前Tab的所在下标
-                        //console.log(data.elem); //得到当前的Tab大容器
-                    },
-                    closeBefore: function(data) { //关闭选项卡之前触发
-                        // console.log(data);
-                        // console.log(data.icon); //显示的图标
-                        // console.log(data.id); //lay-id
-                        // console.log(data.title); //显示的标题
-                        // console.log(data.url); //跳转的地址
-                        return true; //返回true则关闭
-                    }
-                }).render();
-                //navbar加载方式一，直接绑定已有的dom元素事件
-                navbar.bind(function(data) {
-                    tab.tabAdd(data);
-                });
-            }
-            if (_config.type === 'iframe') {
-                tab.set({
-                    //renderType: 'iframe',
-                    //mainUrl: 'table.html',
-                    //openWait: false,
-                    elem: '#container',
-                    onSwitch: function(data) { //选项卡切换时触发
-                        window.layId=data.layId;
-                        //console.log(data.layId); //lay-id值
-                        //console.log(data.index); //得到当前Tab的所在下标
-                        //console.log(data.elem); //得到当前的Tab大容器
-                    },
-                    closeBefore: function(data) { //关闭选项卡之前触发
-                        // console.log(data);
-                        // console.log(data.icon); //显示的图标
-                        // console.log(data.id); //lay-id
-                        // console.log(data.title); //显示的标题
-                        // console.log(data.url); //跳转的地址
-                        return true; //返回true则关闭
-                    }
-                }).render();
-                //navbar加载方式一，直接绑定已有的dom元素事件
-                navbar.bind(function(data) {
-                    tab.tabAdd(data);
-                });
-                //navbar加载方式二，设置远程地址加载
-                // navbar.set({
-                //     remote: {
-                //         url: '/datas/navbar1.json'
-                //     }
-                // }).render(function(data) {
-                //     tab.tabAdd(data);
-                // });
-                //navbar加载方式三，设置data本地数据
-                // navbar.set({
-                //     data: [{
-                //         id: "1",
-                //         title: "基本元素",
-                //         icon: "fa-cubes",
-                //         spread: true,
-                //         children: [{
-                //             id: "7",
-                //             title: "表格",
-                //             icon: "&#xe6c6;",
-                //             url: "test.html"
-                //         }, {
-                //             id: "8",
-                //             title: "表单",
-                //             icon: "&#xe63c;",
-                //             url: "form.html"
-                //         }]
-                //     }, {
-                //         id: "5",
-                //         title: "这是一级导航",
-                //         icon: "fa-stop-circle",
-                //         url: "https://www.baidu.com",
-                //         spread: false
-                //     }]
-                // }).render(function(data) {
-                //     tab.tabAdd(data);
-                // });
+layui.define(['element', 'nprogress', 'form', 'table', 'loader', 'tab', 'navbar', 'onelevel', 'laytpl', 'spa'], function (exports) {
+	var $ = layui.jquery,
+		element = layui.element,
+		layer = layui.layer,
+		_win = $(window),
+		_doc = $(document),
+		_body = $('.kit-body'),
+		form = layui.form,
+		table = layui.table,
+		loader = layui.loader,
+		navbar = layui.navbar,
+		_componentPath = 'components/',
+		spa = layui.spa;
+	tab = layui.tab
+	var app = {
+		hello: function (str) {
+			layer.alert('Hello ' + (str || 'test'));
+		},
+		config: {
+			type: 'page'
+		},
+		set: function (options) {
+			var that = this;
+			$.extend(true, that.config, options);
+			return that;
+		},
+		getId: function () {
+			return tab.getId();
+		},
+		init: function () {
+			var that = this,
+				_config = that.config;
+			if (_config.type === 'spa') {
+				navbar.bind(function (data) {
+					spa.render(data.url, function () {
+						console.log('渲染完成..');
+					});
+				});
+			}
+			if (_config.type === 'page') {
+				tab.set({
+					renderType: 'page',
+					mainUrl: 'dashboard',
+					elem: '#container',
+					onSwitch: function (data) { //选项卡切换时触发
+						//console.log(data.layId); //lay-id值
+						//console.log(data.index); //得到当前Tab的所在下标
+						//console.log(data.elem); //得到当前的Tab大容器
+					},
+					closeBefore: function (data) { //关闭选项卡之前触发
+						// console.log(data);
+						// console.log(data.icon); //显示的图标
+						// console.log(data.id); //lay-id
+						// console.log(data.title); //显示的标题
+						// console.log(data.url); //跳转的地址
+						return true; //返回true则关闭
+					}
+				}).render();
+				//navbar加载方式一，直接绑定已有的dom元素事件
+				navbar.bind(function (data) {
+					tab.tabAdd(data);
+				});
+			}
+			if (_config.type === 'iframe') {
+				tab.set({
+					//renderType: 'iframe',
+					//mainUrl: 'table.html',
+					//openWait: false,
+					elem: '#container',
+					onSwitch: function (data) { //选项卡切换时触发
+						window.layId = data.layId;
+						//console.log(data.layId); //lay-id值
+						//console.log(data.index); //得到当前Tab的所在下标
+						//console.log(data.elem); //得到当前的Tab大容器
+					},
+					closeBefore: function (data) { //关闭选项卡之前触发
+						// console.log(data);
+						// console.log(data.icon); //显示的图标
+						// console.log(data.id); //lay-id
+						// console.log(data.title); //显示的标题
+						// console.log(data.url); //跳转的地址
+						return true; //返回true则关闭
+					}
+				}).render();
+				//navbar加载方式一，直接绑定已有的dom元素事件
+				navbar.bind(function (data) {
+					tab.tabAdd(data);
+				});
+				//navbar加载方式二，设置远程地址加载
+				// navbar.set({
+				//     remote: {
+				//         url: '/datas/navbar1.json'
+				//     }
+				// }).render(function(data) {
+				//     tab.tabAdd(data);
+				// });
+				//navbar加载方式三，设置data本地数据
+				// navbar.set({
+				//     data: [{
+				//         id: "1",
+				//         title: "基本元素",
+				//         icon: "fa-cubes",
+				//         spread: true,
+				//         children: [{
+				//             id: "7",
+				//             title: "表格",
+				//             icon: "&#xe6c6;",
+				//             url: "test.html"
+				//         }, {
+				//             id: "8",
+				//             title: "表单",
+				//             icon: "&#xe63c;",
+				//             url: "form.html"
+				//         }]
+				//     }, {
+				//         id: "5",
+				//         title: "这是一级导航",
+				//         icon: "fa-stop-circle",
+				//         url: "https://www.baidu.com",
+				//         spread: false
+				//     }]
+				// }).render(function(data) {
+				//     tab.tabAdd(data);
+				// });
 
-                //处理顶部一级菜单
-                /*var onelevel = layui.onelevel;
-                if (onelevel.hasElem()) {
-                    onelevel.set({
-                        remote: {
-                            url: '/datas/onelevel1.json' //远程地址
-                        },
-                        onClicked: function(id) {
-                            switch (id) {
-                                case 1:
-                                    navbar.set({
-                                        remote: {
-                                            url: '/datas/navbar1.json'
-                                        }
-                                    }).render(function(data) {
-                                        tab.tabAdd(data);
-                                    });
-                                    break;
-                                case 2:
-                                    navbar.set({
-                                        remote: {
-                                            url: '/datas/navbar2.json'
-                                        }
-                                    }).render(function(data) {
-                                        tab.tabAdd(data);
-                                    });
-                                    break;
-                                default:
-                                    navbar.set({
-                                        data: [{
-                                            id: "1",
-                                            title: "基本元素",
-                                            icon: "fa-cubes",
-                                            spread: true,
-                                            children: [{
-                                                id: "7",
-                                                title: "表格",
-                                                icon: "&#xe6c6;",
-                                                url: "test.html"
-                                            }, {
-                                                id: "8",
-                                                title: "表单",
-                                                icon: "&#xe63c;",
-                                                url: "form.html"
-                                            }]
-                                        }, {
-                                            id: "5",
-                                            title: "这是一级导航",
-                                            icon: "fa-stop-circle",
-                                            url: "https://www.baidu.com",
-                                            spread: false
-                                        }]
-                                    }).render(function(data) {
-                                        tab.tabAdd(data);
-                                    });
-                                    break;
-                            }
-                        },
-                        renderAfter: function(elem) {
-                            elem.find('li').eq(0).click(); //模拟点击第一个
-                        }
-                    }).render();
-                }*/
-            }
+				//处理顶部一级菜单
+				/*var onelevel = layui.onelevel;
+				if (onelevel.hasElem()) {
+					onelevel.set({
+						remote: {
+							url: '/datas/onelevel1.json' //远程地址
+						},
+						onClicked: function(id) {
+							switch (id) {
+								case 1:
+									navbar.set({
+										remote: {
+											url: '/datas/navbar1.json'
+										}
+									}).render(function(data) {
+										tab.tabAdd(data);
+									});
+									break;
+								case 2:
+									navbar.set({
+										remote: {
+											url: '/datas/navbar2.json'
+										}
+									}).render(function(data) {
+										tab.tabAdd(data);
+									});
+									break;
+								default:
+									navbar.set({
+										data: [{
+											id: "1",
+											title: "基本元素",
+											icon: "fa-cubes",
+											spread: true,
+											children: [{
+												id: "7",
+												title: "表格",
+												icon: "&#xe6c6;",
+												url: "test.html"
+											}, {
+												id: "8",
+												title: "表单",
+												icon: "&#xe63c;",
+												url: "form.html"
+											}]
+										}, {
+											id: "5",
+											title: "这是一级导航",
+											icon: "fa-stop-circle",
+											url: "https://www.baidu.com",
+											spread: false
+										}]
+									}).render(function(data) {
+										tab.tabAdd(data);
+									});
+									break;
+							}
+						},
+						renderAfter: function(elem) {
+							elem.find('li').eq(0).click(); //模拟点击第一个
+						}
+					}).render();
+				}*/
+			}
 
-            // ripple start
-            var addRippleEffect = function(e) {
-                // console.log(e);
-                layui.stope(e)
-                var target = e.target;
-                if (target.localName !== 'button' && target.localName !== 'a') return false;
-                var rect = target.getBoundingClientRect();
-                var ripple = target.querySelector('.ripple');
-                if (!ripple) {
-                    ripple = document.createElement('span');
-                    ripple.className = 'ripple'
-                    ripple.style.height = ripple.style.width = Math.max(rect.width, rect.height) + 'px'
-                    target.appendChild(ripple);
-                }
-                ripple.classList.remove('show');
-                var top = e.pageY - rect.top - ripple.offsetHeight / 2 - document.body.scrollTop;
-                var left = e.pageX - rect.left - ripple.offsetWidth / 2 - document.body.scrollLeft;
-                ripple.style.top = top + 'px'
-                ripple.style.left = left + 'px'
-                ripple.classList.add('show');
-                return false;
-            }
-            document.addEventListener('click', addRippleEffect, false);
-            // ripple end
+			// ripple start
+			var addRippleEffect = function (e) {
+				// console.log(e);
+				layui.stope(e)
+				var target = e.target;
+				if (target.localName !== 'button' && target.localName !== 'a') return false;
+				var rect = target.getBoundingClientRect();
+				var ripple = target.querySelector('.ripple');
+				if (!ripple) {
+					ripple = document.createElement('span');
+					ripple.className = 'ripple'
+					ripple.style.height = ripple.style.width = Math.max(rect.width, rect.height) + 'px'
+					target.appendChild(ripple);
+				}
+				ripple.classList.remove('show');
+				var top = e.pageY - rect.top - ripple.offsetHeight / 2 - document.body.scrollTop;
+				var left = e.pageX - rect.left - ripple.offsetWidth / 2 - document.body.scrollLeft;
+				ripple.style.top = top + 'px'
+				ripple.style.left = left + 'px'
+				ripple.classList.add('show');
+				return false;
+			}
+			document.addEventListener('click', addRippleEffect, false);
+			// ripple end
 
-            return that;
-        }
-    };
+			return that;
+		}
+	};
 
-    //输出test接口
-    exports('app', app);
-});
\ No newline at end of file
+	//输出test接口
+	exports('app', app);
+});
diff --git a/len-sys/src/main/resources/plugin/build/js/dashboard.js b/len-sys/src/main/resources/plugin/build/js/dashboard.js
index 30ad40b..a27338c 100644
--- a/len-sys/src/main/resources/plugin/build/js/dashboard.js
+++ b/len-sys/src/main/resources/plugin/build/js/dashboard.js
@@ -2,410 +2,410 @@
  * 仪表盘面板功能
  */
 layui.config({
-    base: 'plugin/build/js/',
-    version: '1.0.1'
+	base: 'plugin/build/js/',
+	version: '1.0.1'
 }).define(['layer', 'utils'], function (exports) {
-    var $ = layui.jquery,
-        utils = layui.utils,
-        layer = layui.layer;
-
-
-    var dashboard = {
-
-        panelOpt: {},
-
-        init: function () {
-            dashboard.showDashboard();
-            _dashboard.initShortcut();
-            _dashboard.initDynamic();
-            _dashboard.initBacklog();
-            dashboard.dragPanel();
-        },
-
-        /**
-         * 根据配置面板渲染面板功能模块
-         */
-        showDashboard: function () {
-            var data = dashboard.getPanelOptData();
-            var panelColumnOne = $('#panelColumnOne'),
-                panelColumnTwo = $('#panelColumnTwo');
-            $.map(data, function (panelOptArr) {
-                panelOptArr.forEach(function (panelOpt) {
-                    var panelId = panelOpt.id,
-                        code = panelOpt.paneloptCode,
-                        column = panelOpt.paneloptColumn;
-                    dashboard.panelOpt[panelId] = code;
-
-                    var itemBody = dashboard.getPanelItemBody(code, panelId);
-                    if (column === 1) {
-                        panelColumnOne.append(itemBody);
-                    } else {
-                        panelColumnTwo.append(itemBody);
-                    }
-                });
-            });
-            //不存在赋一个空拖拽元素
-            if (panelColumnOne.find('div').length === 0) {
-                panelColumnOne.append(dashboard.panelNullDiv());
-            }
-            if (panelColumnTwo.find('div').length === 0) {
-                panelColumnTwo.append(dashboard.panelNullDiv());
-            }
-        },
-
-        panelNullDiv: function () {
-            return "<div panel-item='true' class=\"dragdropPanel\" style='margin-bottom: 15px' >" +
-                "</div>";
-        },
-
-        /**
-         * 更具code 获取功能面板
-         * @param code
-         * @param id
-         * @returns {string}
-         */
-        getPanelItemBody(code, id) {
-            switch (code) {
-                case 'DYNAMIC':
-                    return dashboard.dynamicBody(id);
-                case 'SHORTCUTS':
-                    return dashboard.shortCutsBody(id);
-                case 'BACKLOG':
-                    return dashboard.backlogBody(id);
-            }
-            return '';
-        },
-
-        /**
-         * 获取面板配置
-         * @returns {string}
-         */
-        getPanelOptData: function () {
-            var data = '';
-            $.ajaxSettings.async = false;
-            $.get('dashboard/panel/list', {}, function (resp, status) {
-                $.ajaxSettings.async = true;
-                data = resp.data;
-            });
-            $.ajaxSettings.async = true;
-            return data;
-        },
-        /**
-         * 快捷菜单body
-         * @returns {string}
-         */
-        shortCutsBody: function (id) {
-            return "<div panel-item='true'  class=\"dragdropPanel\" style='margin-bottom: 15px' >" +
-                "   <div  panel-id=" + id + " class=\"layui-card  admin-shortcut\">\n" +
-                "       <div class=\"layui-card-header\" title=\"可从左侧菜单拖拽\">\n" +
-                "           快捷菜单\n" +
-                "       </div>\n" +
-                "       <div class=\"layui-card-body admin-shortcut-content\" style=\"height: 230px\">\n" +
-                "           <div carousel-item=\"\">\n" +
-                "               <ul id=\"admin-shortcut-content\" class=\"layui-row layui-col-space10 layui-this\">\n" +
-                "               </ul>\n" +
-                "           </div>\n" +
-                "       </div>\n" +
-                "    </div>\n" +
-                "</div>";
-        },
-
-        /**
-         * 动态面板 body
-         * @returns {string}
-         */
-        dynamicBody: function (id) {
-            return "<div panel-item='true' class=\"dragdropPanel\" style='margin-bottom: 15px' >" +
-                "     <div panel-id=" + id + " class=\"layui-card admin-dynamic\">\n" +
-                "         <div class=\"layui-card-header\">\n" +
-                "             动态\n" +
-                "         </div>\n" +
-                "         <div class=\"layui-card-body admin-dynamic-content\" style=\"height: 540px\">\n" +
-                "             <ul class=\"layui-row layui-col-space10 layui-this\">\n" +
-                "             </ul>\n" +
-                "         </div>\n" +
-                "     </div>\n" +
-                "</div>";
-        },
-
-        /**
-         * 待办事项 body
-         * @returns {string}
-         */
-        backlogBody: function (id) {
-            return "<div panel-item='true' class=\"dragdropPanel\" style='margin-bottom: 15px' >" +
-                "    <div panel-id=" + id + " class=\"layui-card admin-backlog\">\n" +
-                "        <div class=\"layui-card-header\">\n" +
-                "            代办事项\n" +
-                "        </div>\n" +
-                "        <div class=\"layui-card-body\" style=\"height: 230px\">\n" +
-                "            <ul class=\"layui-row layui-col-space10 layui-this\">\n" +
-                "            </ul>\n" +
-                "        </div>\n" +
-                "    </div>\n" +
-                "    </div>";
-        },
-
-
-        /**
-         * 面板可拖拽
-         */
-        dragPanel: function () {
-            var dragdropPanel = document.getElementsByClassName('dragdropPanel');
-            for (var i = 0; i < dragdropPanel.length; i++) {
-                new Sortable(dragdropPanel[i], {
-                    group: 'dragdrop',
-                    swapThreshold: 0.31,
-                    animation: 150,
-                    onAdd: function ( /**Event*/ evt) {
-                        dashboard.savePanelOpt();
-                    }
-                });
-            }
-        },
-
-        /**
-         * 保存面板配置
-         */
-        savePanelOpt: function () {
-            //保存拖拽配置
-            var panelColumnOne = $('#panelColumnOne'),
-                panelColumnTwo = $('#panelColumnTwo');
-            var opt = [];
-            var oneIndexArr = panelColumnOne.find('div[panel-id]'),
-                twoIndexArr = panelColumnTwo.find('div[panel-id]');
-
-            $.each(oneIndexArr, function (index, $el) {
-                var id = $($el).attr('panel-id');
-                var code = dashboard.panelOpt[id];
-                opt.push({
-                    id: id,
-                    paneloptColumn: 1,
-                    paneloptIndex: parseInt(index),
-                    paneloptCode: code
-                })
-            });
-
-            $.each(twoIndexArr, function (index, $el) {
-                var id = $($el).attr('panel-id');
-                var code = dashboard.panelOpt[id];
-                opt.push({
-                    id: id,
-                    paneloptColumn: 2,
-                    paneloptIndex: parseInt(index),
-                    paneloptCode: code
-                })
-            });
-
-            $.ajax({
-                url: 'dashboard/panel/save',
-                headers: {
-                    'Content-Type': 'application/json'
-                },
-                method: 'POST',
-                data: JSON.stringify(opt),
-                success: function () {
-                }
-            });
-        },
-
-
-        /**
-         * 创建一个 快捷方式
-         * @param id 快捷菜单id
-         * @param code 菜单code
-         * @param name name
-         * @param icon 图标
-         */
-        createShortCuts: function (id, code, name, icon) {
-            var shortCuts =
-                "<li class=\"layui-col-xs3 len-main-menu\">" +
-                "   <a  len-shortcut-id = \"" + id + "\" len-shortcut-code=\"" + code + "\">" +
-                "      <i class=\"layui-icon \">" + icon + "</i>" +
-                "      <cite>" + name + "</cite>" +
-                "    </a>" +
-                "    <i len-shortcut-code=\"" + code + "\" class=\"admin-shortcut-remove\" title=\"删除快捷菜单\">" +
-                "      <i class=\"layui-icon layui-icon-close\"></i>" +
-                "    </i>" +
-                " </li>";
-            return $(shortCuts);
-        },
-
-        /**
-         * 绑定单个 快捷菜单
-         */
-        singleShortcutBind: function ($that) {
-            _dashboard.singleShortcutBind($that);
-            _dashboard.delSingleShortcutBind($that);
-        },
-
-        /**
-         * 根据菜单编码删除快捷方式
-         * @param code
-         * @param callback 回调
-         */
-        removeShortcuts: function (code, callback) {
-            $.post('dashboard/shortCuts/del/' + code, {}, function (resp, status) {
-                if (callback) callback(resp);
-            });
-        }
-    };
-
-    /**
-     * 私有
-     * @type {{init: init}}
-     * @private
-     */
-    var _dashboard = {
-
-
-        /**
-         * 快捷菜单
-         */
-        initShortcut: function () {
-            //渲染
-            $.get('dashboard/shortCuts', {}, function (resp, status) {
-                var data = resp.data;
-                var shortCutsBody = $('#admin-shortcut-content');
-                data.forEach(function (shortCut) {
-                    var $shortCut = dashboard.createShortCuts(shortCut.id, shortCut.code, shortCut.name, shortCut.icon);
-                    shortCutsBody.append($shortCut);
-                });
-                _dashboard.dragShortCuts();
-                _dashboard.shortcutBind();
-            });
-        },
-
-        /**
-         * 快捷方式拖拽
-         */
-        dragShortCuts: function () {
-            new Sortable(document.getElementById('admin-shortcut-content'), {
-                group: {
-                    name: 'shortCutsGroup',
-                    pull: false,
-                    put: ['menu']
-                },
-                swapThreshold: 0.31,
-                animation: 150,
-                fallbackOnBody: true,
-                // 元素从另一个列表拖放到列表
-                onAdd: function ( /**Event*/ evt) {
-                    var item = evt.item;
-                    var sBody = $(item).parent();
-                    var cId = $(item).attr('len-id');
-                    item.parentNode.removeChild(item);
-                    var children = sBody.children();
-                    if (children.length > 8) {
-                        layer.msg('快捷方式最多8个！', {icon: 5});
-                        return false;
-                    }
-
-                    var exists = false;
-                    $.each(children, function (index, el) {
-                        var id = $(el).find('a').attr('len-shortcut-code');
-                        if (cId === id) {
-                            exists = true;
-                            return false;
-                        }
-                    });
-                    if (exists) {
-                        layer.msg('存在重复快捷方式！', {icon: 5});
-                        return false;
-                    }
-                    //保存快捷菜单
-                    $.post('dashboard/shortCuts/add', {
-                        code: cId
-                    }, function (resp, textStatus) {
-                        var code = resp.data.code,
-                            name = resp.data.name,
-                            icon = resp.data.icon;
-                        var shortCuts = dashboard.createShortCuts(cId, code, name, icon);
-                        //添加快捷
-                        sBody.append(shortCuts);
-                        //绑定事件
-                        _dashboard.singleShortcutBind(shortCuts.find('a'));
-                        _dashboard.delSingleShortcutBind(shortCuts.find('i[class=admin-shortcut-remove]'));
-                    });
-                },
-
-                // 改变了列表中的排序
-                onUpdate: function ( /**Event*/ evt) {
-                    var item = evt.item;
-                    var sBody = $(item).parent();
-                    var children = sBody.children();
-                    var shortCutsIds = [];
-                    $.each(children, function (index, el) {
-                        shortCutsIds.push($(el).find('a').attr('len-shortcut-id'));
-                    });
-
-                    //重新排序保存
-                    $.post('dashboard/shortCuts/sort', {
-                        shortCutsIds: shortCutsIds.join()
-                    }, function (resp, textStatus) {
-                    });
-                },
-            });
-        },
-
-
-        /**
-         * 快捷菜单绑定事件
-         */
-        shortcutBind: function () {
-            var shortcutsBody = $('div.admin-shortcut-content');
-            shortcutsBody.find('a[len-shortcut-code]').each(function () {
-                var $that = $(this);
-                _dashboard.singleShortcutBind($that);
-            });
-            //删除事件
-            shortcutsBody.find('i[class=admin-shortcut-remove]').each(function () {
-                var $that = $(this);
-                _dashboard.delSingleShortcutBind($that);
-            });
-        },
-
-        singleShortcutBind: function ($that) {
-            $that.off('click').on('click', function () {
-                var menuId = $that.attr('len-shortcut-code');
-                var menu = $('div.layui-nav-tree').find('a[len-id=' + menuId + ']');
-                if (menu.length > 0) {
-                    var cMenu = menu[0];
-                    cMenu.click();
-                }
-            });
-        },
-
-        delSingleShortcutBind: function ($that) {
-            $that.off('click').on('click', function () {
-                layer.confirm('确定删除快捷菜单？', function () {
-                    var code = $that.attr('len-shortcut-code');
-                    dashboard.removeShortcuts(code, function (resp) {
-                        //删除当前快捷方式
-                        $that.parent().remove();
-                        layer.close(layer.index);
-                    });
-                });
-            });
-        },
-
-        /**
-         * 动态
-         */
-
-        initDynamic: function () {
-
-        },
-
-        /**
-         * 待办事项
-         */
-
-        initBacklog: function () {
-
-        }
-
-    };
-
-    exports('dashboard', dashboard);
-});
\ No newline at end of file
+	var $ = layui.jquery,
+		utils = layui.utils,
+		layer = layui.layer;
+
+
+	var dashboard = {
+
+		panelOpt: {},
+
+		init: function () {
+			dashboard.showDashboard();
+			_dashboard.initShortcut();
+			_dashboard.initDynamic();
+			_dashboard.initBacklog();
+			dashboard.dragPanel();
+		},
+
+		/**
+		 * 根据配置面板渲染面板功能模块
+		 */
+		showDashboard: function () {
+			var data = dashboard.getPanelOptData();
+			var panelColumnOne = $('#panelColumnOne'),
+				panelColumnTwo = $('#panelColumnTwo');
+			$.map(data, function (panelOptArr) {
+				panelOptArr.forEach(function (panelOpt) {
+					var panelId = panelOpt.id,
+						code = panelOpt.paneloptCode,
+						column = panelOpt.paneloptColumn;
+					dashboard.panelOpt[panelId] = code;
+
+					var itemBody = dashboard.getPanelItemBody(code, panelId);
+					if (column === 1) {
+						panelColumnOne.append(itemBody);
+					} else {
+						panelColumnTwo.append(itemBody);
+					}
+				});
+			});
+			//不存在赋一个空拖拽元素
+			if (panelColumnOne.find('div').length === 0) {
+				panelColumnOne.append(dashboard.panelNullDiv());
+			}
+			if (panelColumnTwo.find('div').length === 0) {
+				panelColumnTwo.append(dashboard.panelNullDiv());
+			}
+		},
+
+		panelNullDiv: function () {
+			return "<div panel-item='true' class=\"dragdropPanel\" style='margin-bottom: 15px' >" +
+				"</div>";
+		},
+
+		/**
+		 * 更具code 获取功能面板
+		 * @param code
+		 * @param id
+		 * @returns {string}
+		 */
+		getPanelItemBody(code, id) {
+			switch (code) {
+				case 'DYNAMIC':
+					return dashboard.dynamicBody(id);
+				case 'SHORTCUTS':
+					return dashboard.shortCutsBody(id);
+				case 'BACKLOG':
+					return dashboard.backlogBody(id);
+			}
+			return '';
+		},
+
+		/**
+		 * 获取面板配置
+		 * @returns {string}
+		 */
+		getPanelOptData: function () {
+			var data = '';
+			$.ajaxSettings.async = false;
+			$.get('dashboard/panel/list', {}, function (resp, status) {
+				$.ajaxSettings.async = true;
+				data = resp.data;
+			});
+			$.ajaxSettings.async = true;
+			return data;
+		},
+		/**
+		 * 快捷菜单body
+		 * @returns {string}
+		 */
+		shortCutsBody: function (id) {
+			return "<div panel-item='true'  class=\"dragdropPanel\" style='margin-bottom: 15px' >" +
+				"   <div  panel-id=" + id + " class=\"layui-card  admin-shortcut\">\n" +
+				"       <div class=\"layui-card-header\" title=\"可从左侧菜单拖拽\">\n" +
+				"           快捷菜单\n" +
+				"       </div>\n" +
+				"       <div class=\"layui-card-body admin-shortcut-content\" style=\"height: 230px\">\n" +
+				"           <div carousel-item=\"\">\n" +
+				"               <ul id=\"admin-shortcut-content\" class=\"layui-row layui-col-space10 layui-this\">\n" +
+				"               </ul>\n" +
+				"           </div>\n" +
+				"       </div>\n" +
+				"    </div>\n" +
+				"</div>";
+		},
+
+		/**
+		 * 动态面板 body
+		 * @returns {string}
+		 */
+		dynamicBody: function (id) {
+			return "<div panel-item='true' class=\"dragdropPanel\" style='margin-bottom: 15px' >" +
+				"     <div panel-id=" + id + " class=\"layui-card admin-dynamic\">\n" +
+				"         <div class=\"layui-card-header\">\n" +
+				"             动态\n" +
+				"         </div>\n" +
+				"         <div class=\"layui-card-body admin-dynamic-content\" style=\"height: 540px\">\n" +
+				"             <ul class=\"layui-row layui-col-space10 layui-this\">\n" +
+				"             </ul>\n" +
+				"         </div>\n" +
+				"     </div>\n" +
+				"</div>";
+		},
+
+		/**
+		 * 待办事项 body
+		 * @returns {string}
+		 */
+		backlogBody: function (id) {
+			return "<div panel-item='true' class=\"dragdropPanel\" style='margin-bottom: 15px' >" +
+				"    <div panel-id=" + id + " class=\"layui-card admin-backlog\">\n" +
+				"        <div class=\"layui-card-header\">\n" +
+				"            代办事项\n" +
+				"        </div>\n" +
+				"        <div class=\"layui-card-body\" style=\"height: 230px\">\n" +
+				"            <ul class=\"layui-row layui-col-space10 layui-this\">\n" +
+				"            </ul>\n" +
+				"        </div>\n" +
+				"    </div>\n" +
+				"    </div>";
+		},
+
+
+		/**
+		 * 面板可拖拽
+		 */
+		dragPanel: function () {
+			var dragdropPanel = document.getElementsByClassName('dragdropPanel');
+			for (var i = 0; i < dragdropPanel.length; i++) {
+				new Sortable(dragdropPanel[i], {
+					group: 'dragdrop',
+					swapThreshold: 0.31,
+					animation: 150,
+					onAdd: function ( /**Event*/ evt) {
+						dashboard.savePanelOpt();
+					}
+				});
+			}
+		},
+
+		/**
+		 * 保存面板配置
+		 */
+		savePanelOpt: function () {
+			//保存拖拽配置
+			var panelColumnOne = $('#panelColumnOne'),
+				panelColumnTwo = $('#panelColumnTwo');
+			var opt = [];
+			var oneIndexArr = panelColumnOne.find('div[panel-id]'),
+				twoIndexArr = panelColumnTwo.find('div[panel-id]');
+
+			$.each(oneIndexArr, function (index, $el) {
+				var id = $($el).attr('panel-id');
+				var code = dashboard.panelOpt[id];
+				opt.push({
+					id: id,
+					paneloptColumn: 1,
+					paneloptIndex: parseInt(index),
+					paneloptCode: code
+				})
+			});
+
+			$.each(twoIndexArr, function (index, $el) {
+				var id = $($el).attr('panel-id');
+				var code = dashboard.panelOpt[id];
+				opt.push({
+					id: id,
+					paneloptColumn: 2,
+					paneloptIndex: parseInt(index),
+					paneloptCode: code
+				})
+			});
+
+			$.ajax({
+				url: 'dashboard/panel/save',
+				headers: {
+					'Content-Type': 'application/json'
+				},
+				method: 'POST',
+				data: JSON.stringify(opt),
+				success: function () {
+				}
+			});
+		},
+
+
+		/**
+		 * 创建一个 快捷方式
+		 * @param id 快捷菜单id
+		 * @param code 菜单code
+		 * @param name name
+		 * @param icon 图标
+		 */
+		createShortCuts: function (id, code, name, icon) {
+			var shortCuts =
+				"<li class=\"layui-col-xs3 len-main-menu\">" +
+				"   <a  len-shortcut-id = \"" + id + "\" len-shortcut-code=\"" + code + "\">" +
+				"      <i class=\"layui-icon \">" + icon + "</i>" +
+				"      <cite>" + name + "</cite>" +
+				"    </a>" +
+				"    <i len-shortcut-code=\"" + code + "\" class=\"admin-shortcut-remove\" title=\"删除快捷菜单\">" +
+				"      <i class=\"layui-icon layui-icon-close\"></i>" +
+				"    </i>" +
+				" </li>";
+			return $(shortCuts);
+		},
+
+		/**
+		 * 绑定单个 快捷菜单
+		 */
+		singleShortcutBind: function ($that) {
+			_dashboard.singleShortcutBind($that);
+			_dashboard.delSingleShortcutBind($that);
+		},
+
+		/**
+		 * 根据菜单编码删除快捷方式
+		 * @param code
+		 * @param callback 回调
+		 */
+		removeShortcuts: function (code, callback) {
+			$.post('dashboard/shortCuts/del/' + code, {}, function (resp, status) {
+				if (callback) callback(resp);
+			});
+		}
+	};
+
+	/**
+	 * 私有
+	 * @type {{init: init}}
+	 * @private
+	 */
+	var _dashboard = {
+
+
+		/**
+		 * 快捷菜单
+		 */
+		initShortcut: function () {
+			//渲染
+			$.get('dashboard/shortCuts', {}, function (resp, status) {
+				var data = resp.data;
+				var shortCutsBody = $('#admin-shortcut-content');
+				data.forEach(function (shortCut) {
+					var $shortCut = dashboard.createShortCuts(shortCut.id, shortCut.code, shortCut.name, shortCut.icon);
+					shortCutsBody.append($shortCut);
+				});
+				_dashboard.dragShortCuts();
+				_dashboard.shortcutBind();
+			});
+		},
+
+		/**
+		 * 快捷方式拖拽
+		 */
+		dragShortCuts: function () {
+			new Sortable(document.getElementById('admin-shortcut-content'), {
+				group: {
+					name: 'shortCutsGroup',
+					pull: false,
+					put: ['menu']
+				},
+				swapThreshold: 0.31,
+				animation: 150,
+				fallbackOnBody: true,
+				// 元素从另一个列表拖放到列表
+				onAdd: function ( /**Event*/ evt) {
+					var item = evt.item;
+					var sBody = $(item).parent();
+					var cId = $(item).attr('len-id');
+					item.parentNode.removeChild(item);
+					var children = sBody.children();
+					if (children.length > 8) {
+						layer.msg('快捷方式最多8个！', {icon: 5});
+						return false;
+					}
+
+					var exists = false;
+					$.each(children, function (index, el) {
+						var id = $(el).find('a').attr('len-shortcut-code');
+						if (cId === id) {
+							exists = true;
+							return false;
+						}
+					});
+					if (exists) {
+						layer.msg('存在重复快捷方式！', {icon: 5});
+						return false;
+					}
+					//保存快捷菜单
+					$.post('dashboard/shortCuts/add', {
+						code: cId
+					}, function (resp, textStatus) {
+						var code = resp.data.code,
+							name = resp.data.name,
+							icon = resp.data.icon;
+						var shortCuts = dashboard.createShortCuts(cId, code, name, icon);
+						//添加快捷
+						sBody.append(shortCuts);
+						//绑定事件
+						_dashboard.singleShortcutBind(shortCuts.find('a'));
+						_dashboard.delSingleShortcutBind(shortCuts.find('i[class=admin-shortcut-remove]'));
+					});
+				},
+
+				// 改变了列表中的排序
+				onUpdate: function ( /**Event*/ evt) {
+					var item = evt.item;
+					var sBody = $(item).parent();
+					var children = sBody.children();
+					var shortCutsIds = [];
+					$.each(children, function (index, el) {
+						shortCutsIds.push($(el).find('a').attr('len-shortcut-id'));
+					});
+
+					//重新排序保存
+					$.post('dashboard/shortCuts/sort', {
+						shortCutsIds: shortCutsIds.join()
+					}, function (resp, textStatus) {
+					});
+				},
+			});
+		},
+
+
+		/**
+		 * 快捷菜单绑定事件
+		 */
+		shortcutBind: function () {
+			var shortcutsBody = $('div.admin-shortcut-content');
+			shortcutsBody.find('a[len-shortcut-code]').each(function () {
+				var $that = $(this);
+				_dashboard.singleShortcutBind($that);
+			});
+			//删除事件
+			shortcutsBody.find('i[class=admin-shortcut-remove]').each(function () {
+				var $that = $(this);
+				_dashboard.delSingleShortcutBind($that);
+			});
+		},
+
+		singleShortcutBind: function ($that) {
+			$that.off('click').on('click', function () {
+				var menuId = $that.attr('len-shortcut-code');
+				var menu = $('div.layui-nav-tree').find('a[len-id=' + menuId + ']');
+				if (menu.length > 0) {
+					var cMenu = menu[0];
+					cMenu.click();
+				}
+			});
+		},
+
+		delSingleShortcutBind: function ($that) {
+			$that.off('click').on('click', function () {
+				layer.confirm('确定删除快捷菜单？', function () {
+					var code = $that.attr('len-shortcut-code');
+					dashboard.removeShortcuts(code, function (resp) {
+						//删除当前快捷方式
+						$that.parent().remove();
+						layer.close(layer.index);
+					});
+				});
+			});
+		},
+
+		/**
+		 * 动态
+		 */
+
+		initDynamic: function () {
+
+		},
+
+		/**
+		 * 待办事项
+		 */
+
+		initBacklog: function () {
+
+		}
+
+	};
+
+	exports('dashboard', dashboard);
+});
diff --git a/len-sys/src/main/resources/plugin/build/js/kitconfig.js b/len-sys/src/main/resources/plugin/build/js/kitconfig.js
index 463fa30..d3aec36 100644
--- a/len-sys/src/main/resources/plugin/build/js/kitconfig.js
+++ b/len-sys/src/main/resources/plugin/build/js/kitconfig.js
@@ -1,9 +1,9 @@
 /** kit_admin-v1.1.0 MIT License By http://kit/zhengjinfan.cn e-mail:zheng_jinfan@126.com */
- ;layui.define(function(exports) {
+;layui.define(function (exports) {
 
-    var kitconfig = {
-        resourcePath: 'plugin/build/', //框架资源路径-相对路径和绝对路径
-    };
+	var kitconfig = {
+		resourcePath: 'plugin/build/', //框架资源路径-相对路径和绝对路径
+	};
 
-    exports('kitconfig', kitconfig);
-});
\ No newline at end of file
+	exports('kitconfig', kitconfig);
+});
diff --git a/len-sys/src/main/resources/plugin/build/js/layrouter.js b/len-sys/src/main/resources/plugin/build/js/layrouter.js
index 9b97897..ac6881e 100644
--- a/len-sys/src/main/resources/plugin/build/js/layrouter.js
+++ b/len-sys/src/main/resources/plugin/build/js/layrouter.js
@@ -1,86 +1,86 @@
 layui.define([], function (exports) {
-    var layrouter = {
-        version: '0.0.5',
-        // 关键词
-        key: '',
-        // 路由表
-        routes: [],
-        // 当前 hash
-        currentHash: '',
-        // 注册路由
-        register: function (hash, callback) {
-            var that = this;
-            if (!hash) {
-                return;
-            }
+	var layrouter = {
+		version: '0.0.5',
+		// 关键词
+		key: '',
+		// 路由表
+		routes: [],
+		// 当前 hash
+		currentHash: '',
+		// 注册路由
+		register: function (hash, callback) {
+			var that = this;
+			if (!hash) {
+				return;
+			}
 
-            // 给不同的 hash 设置不同的回调函数
-            if (typeof hash == 'string') {
-                that.routes[hash] = callback || function () {
-                };
-            } else if (hash instanceof Array) {
-                // 路由数组
-                for (var i in hash) {
-                    that.register.apply(that, [].concat(hash[i]).concat(callback || function () {
-                    }));
-                }
-            }
-            return that;
-        },
-        go: function (hash) {
-            var that = this;
-            window.location.hash = '#'.concat(that.key).concat(hash || '');
-            return that;
-        },
-        // 刷新
-        refresh: function () {
-            var that = this;
-            // 获取相应的 hash 值
-            console.log(location.hash);
-            console.log(location.hash.slice(1));
-            // 如果存在 hash 则获取, 否则为 /
-            that.currentHash = location.hash.slice(1) || '/';
-            if (that.currentHash && this.currentHash != '/') {
-                // 根据当前 hash 调用对应的回调函数
-                that.routes[that.currentHash]();
-            }
-        },
-        // 初始化
-        init: function (options) {
-            var that = this;
+			// 给不同的 hash 设置不同的回调函数
+			if (typeof hash == 'string') {
+				that.routes[hash] = callback || function () {
+				};
+			} else if (hash instanceof Array) {
+				// 路由数组
+				for (var i in hash) {
+					that.register.apply(that, [].concat(hash[i]).concat(callback || function () {
+					}));
+				}
+			}
+			return that;
+		},
+		go: function (hash) {
+			var that = this;
+			window.location.hash = '#'.concat(that.key).concat(hash || '');
+			return that;
+		},
+		// 刷新
+		refresh: function () {
+			var that = this;
+			// 获取相应的 hash 值
+			console.log(location.hash);
+			console.log(location.hash.slice(1));
+			// 如果存在 hash 则获取, 否则为 /
+			that.currentHash = location.hash.slice(1) || '/';
+			if (that.currentHash && this.currentHash != '/') {
+				// 根据当前 hash 调用对应的回调函数
+				that.routes[that.currentHash]();
+			}
+		},
+		// 初始化
+		init: function (options) {
+			var that = this;
 
-            // 使用自定义关键词
-            that.key = options.key || that.key;
+			// 使用自定义关键词
+			that.key = options.key || that.key;
 
-            window.addEventListener('load', that.refresh.bind(that), false);
-            window.addEventListener('hashchange', that.refresh.bind(that), false);
-            return that;
-        },
+			window.addEventListener('load', that.refresh.bind(that), false);
+			window.addEventListener('hashchange', that.refresh.bind(that), false);
+			return that;
+		},
 
-        /**
-         * 获取当前路由
-         */
-        getRouter: function () {
-            var that = this;
-            // 获取相应的 hash 值
-            console.log(location.hash);
-            console.log(location.hash.slice(1));
-            // 如果存在 hash 则获取, 否则为 /
-            that.currentHash = location.hash.slice(1) || '/';
-            return that.currentHash;
-        },
-        // Removes the current page from the session history and navigates to the given URL.
-        replace: function (url) {
-            window.location.replace(url);
-        },
-        // Navigate to the given URL.
-        href: function (url) {
-            window.location.href = url;
-        },
-        // Reloads the current page.
-        reload: function () {
-            window.location.reload();
-        }
-    };
-    exports('layrouter', layrouter);
-});
\ No newline at end of file
+		/**
+		 * 获取当前路由
+		 */
+		getRouter: function () {
+			var that = this;
+			// 获取相应的 hash 值
+			console.log(location.hash);
+			console.log(location.hash.slice(1));
+			// 如果存在 hash 则获取, 否则为 /
+			that.currentHash = location.hash.slice(1) || '/';
+			return that.currentHash;
+		},
+		// Removes the current page from the session history and navigates to the given URL.
+		replace: function (url) {
+			window.location.replace(url);
+		},
+		// Navigate to the given URL.
+		href: function (url) {
+			window.location.href = url;
+		},
+		// Reloads the current page.
+		reload: function () {
+			window.location.reload();
+		}
+	};
+	exports('layrouter', layrouter);
+});
diff --git a/len-sys/src/main/resources/plugin/build/js/loader.js b/len-sys/src/main/resources/plugin/build/js/loader.js
index 63df9a2..ee83078 100644
--- a/len-sys/src/main/resources/plugin/build/js/loader.js
+++ b/len-sys/src/main/resources/plugin/build/js/loader.js
@@ -1,39 +1,39 @@
 /** kit_admin-v1.1.0 MIT License By http://kit/zhengjinfan.cn e-mail:zheng_jinfan@126.com */
- ;/**
+;/**
  * Name:loader.js
  * Author:Van
  * E-mail:zheng_jinfan@126.com
  * Website:http://kit.zhengjinfan.cn/
  * LICENSE:MIT
  */
-layui.define(['jquery', 'nprogress'], function(exports) {
-    var $ = layui.jquery,
-        _modName = 'loader';
+layui.define(['jquery', 'nprogress'], function (exports) {
+	var $ = layui.jquery,
+		_modName = 'loader';
 
-    var loader = {
-        version: '1.0.1',
-        load: function(options) {
-            NProgress.start();
-            var url = options.url,
-                name = options.name,
-                id = options.id,
-                _elem = options.elem !== undefined ? $(options.elem) : $('#container');
-            _elem.load(url, function(res, status, xhr) {
-                if (status === "error" && typeof options.onError === 'function') {
-                    options.onError();
-                }
-                if (status === 'success') {
-                    _elem.html(res);
-                    typeof options.onSuccess === 'function' && options.onSuccess({ name: name, id: id });
-                }
-                typeof options.onComplate === 'function' && options.onComplate();
-                NProgress.done();
-            });
-        },
-        //动态加载script
-        getScript: function(url, callback) {
-            $.getScript(url, callback);
-        }
-    };
-    exports('loader', loader);
-});
\ No newline at end of file
+	var loader = {
+		version: '1.0.1',
+		load: function (options) {
+			NProgress.start();
+			var url = options.url,
+				name = options.name,
+				id = options.id,
+				_elem = options.elem !== undefined ? $(options.elem) : $('#container');
+			_elem.load(url, function (res, status, xhr) {
+				if (status === "error" && typeof options.onError === 'function') {
+					options.onError();
+				}
+				if (status === 'success') {
+					_elem.html(res);
+					typeof options.onSuccess === 'function' && options.onSuccess({name: name, id: id});
+				}
+				typeof options.onComplate === 'function' && options.onComplate();
+				NProgress.done();
+			});
+		},
+		//动态加载script
+		getScript: function (url, callback) {
+			$.getScript(url, callback);
+		}
+	};
+	exports('loader', loader);
+});
diff --git a/len-sys/src/main/resources/plugin/build/js/message.js b/len-sys/src/main/resources/plugin/build/js/message.js
index 919f333..e72978b 100644
--- a/len-sys/src/main/resources/plugin/build/js/message.js
+++ b/len-sys/src/main/resources/plugin/build/js/message.js
@@ -1,60 +1,60 @@
 /** kit_admin-v1.1.0 MIT License By http://kit/zhengjinfan.cn e-mail:zheng_jinfan@126.com */
- ;/**
+;/**
  * Name:message.js
  * Author:Van
  * E-mail:zheng_jinfan@126.com
  * Website:http://kit.zhengjinfan.cn/
  * LICENSE:MIT
  */
-layui.define(['jquery', 'kitconfig'], function(exports) {
-    var $ = layui.jquery,
-        kitconfig = layui.kitconfig,
-        _modName = 'message',
-        _doc = $(document),
-        _body = $('body'),
-        _MESSAGE = '.kit-message';
-    var message = {
-        v: '1.0.0',
-        times: 1,
-        _message: function() {
-            var _msg = $(_MESSAGE);
-            if (_msg.length > 0)
-                return _msg;
-            _body.append('<div class="kit-message"></div>');
-            return $(_MESSAGE);
-        },
-        show: function(options) {
-            var that = this,
-                _message = that._message(),
-                id = that.times,
-                options = options || {},
-                skin = options.skin === undefined ? 'default' : options.skin,
-                msg = options.msg === undefined ? '请输入一些提示信息!' : options.msg,
-                autoClose = options.autoClose === undefined ? true : options.autoClose;
-            var tpl = [
-                '<div class="kit-message-item layui-anim layui-anim-upbit" data-times="' + id + '">',
-                '<div class="kit-message-body kit-skin-' + skin + '">',
-                msg,
-                '</div>',
-                '<div class="kit-close kit-skin-' + skin + '"><i class="fa fa-times" aria-hidden="true"></i></div>',
-                '</div>'
-            ];
-            _message.append(tpl.join(''));
-            var _times = _message.children('div[data-times=' + id + ']').find('i.fa-times');
-            _times.off('click').on('click', function() {
-                var _t = $(this).parents('div.kit-message-item').removeClass('layui-anim-upbit').addClass('layui-anim-fadeout');
-                setTimeout(function() {
-                    _t.remove();
-                }, 1000);
-            });
-            if (autoClose) { //是否自动关闭
-                setTimeout(function() {
-                    _times.click();
-                }, 3000);
-            }
-            that.times++;
-        }
-    };
-    layui.link(kitconfig.resourcePath + 'css/message.css');
-    exports('message', message);
-});
\ No newline at end of file
+layui.define(['jquery', 'kitconfig'], function (exports) {
+	var $ = layui.jquery,
+		kitconfig = layui.kitconfig,
+		_modName = 'message',
+		_doc = $(document),
+		_body = $('body'),
+		_MESSAGE = '.kit-message';
+	var message = {
+		v: '1.0.0',
+		times: 1,
+		_message: function () {
+			var _msg = $(_MESSAGE);
+			if (_msg.length > 0)
+				return _msg;
+			_body.append('<div class="kit-message"></div>');
+			return $(_MESSAGE);
+		},
+		show: function (options) {
+			var that = this,
+				_message = that._message(),
+				id = that.times,
+				options = options || {},
+				skin = options.skin === undefined ? 'default' : options.skin,
+				msg = options.msg === undefined ? '请输入一些提示信息!' : options.msg,
+				autoClose = options.autoClose === undefined ? true : options.autoClose;
+			var tpl = [
+				'<div class="kit-message-item layui-anim layui-anim-upbit" data-times="' + id + '">',
+				'<div class="kit-message-body kit-skin-' + skin + '">',
+				msg,
+				'</div>',
+				'<div class="kit-close kit-skin-' + skin + '"><i class="fa fa-times" aria-hidden="true"></i></div>',
+				'</div>'
+			];
+			_message.append(tpl.join(''));
+			var _times = _message.children('div[data-times=' + id + ']').find('i.fa-times');
+			_times.off('click').on('click', function () {
+				var _t = $(this).parents('div.kit-message-item').removeClass('layui-anim-upbit').addClass('layui-anim-fadeout');
+				setTimeout(function () {
+					_t.remove();
+				}, 1000);
+			});
+			if (autoClose) { //是否自动关闭
+				setTimeout(function () {
+					_times.click();
+				}, 3000);
+			}
+			that.times++;
+		}
+	};
+	layui.link(kitconfig.resourcePath + 'css/message.css');
+	exports('message', message);
+});
diff --git a/len-sys/src/main/resources/plugin/build/js/navbar.js b/len-sys/src/main/resources/plugin/build/js/navbar.js
index 9d09c82..aab3383 100644
--- a/len-sys/src/main/resources/plugin/build/js/navbar.js
+++ b/len-sys/src/main/resources/plugin/build/js/navbar.js
@@ -7,228 +7,228 @@
  * LICENSE:MIT
  */
 layui.define(['layer', 'laytpl', 'element'], function (exports) {
-    var $ = layui.jquery,
-        layer = layui.layer,
-        _modName = 'navbar',
-        _win = $(window),
-        _doc = $(document),
-        laytpl = layui.laytpl,
-        element = layui.element;
+	var $ = layui.jquery,
+		layer = layui.layer,
+		_modName = 'navbar',
+		_win = $(window),
+		_doc = $(document),
+		laytpl = layui.laytpl,
+		element = layui.element;
 
-    var navbar = {
-        v: '1.0.4',
-        config: {
-            data: undefined, //静态数据
-            remote: {
-                url: undefined, //接口地址
-                type: 'GET', //请求方式
-                jsonp: false //跨域
-            },
-            cached: false, //是否缓存
-            elem: undefined, //容器
-            filter: 'kitNavbar' //过滤器名称
-        },
-        set: function (options) {
-            var that = this;
-            that.config.data = undefined;
-            $.extend(true, that.config, options);
-            return that;
-        },
-        /**
-         * 是否已设置了elem
-         */
-        hasElem: function () {
-            var that = this,
-                _config = that.config;
-            if (_config.elem === undefined && _doc.find('ul[kit-navbar]').length === 0 && $(_config.elem)) {
-                layui.hint().error('Navbar error:请配置Navbar容器.');
-                return false;
-            }
-            return true;
-        },
-        /**
-         * 获取容器的jq对象
-         */
-        getElem: function () {
-            var _config = this.config;
-            return (_config.elem !== undefined && $(_config.elem).length > 0) ? $(_config.elem) : _doc.find('ul[kit-navbar]');
-        },
-        /**
-         * 绑定特定a标签的点击事件
-         */
-        bind: function (callback, params) {
-            var that = this,
-                _config = that.config;
-            var defaults = {
-                target: undefined,
-                showTips: false
-            };
-            $.extend(true, defaults, params);
+	var navbar = {
+		v: '1.0.4',
+		config: {
+			data: undefined, //静态数据
+			remote: {
+				url: undefined, //接口地址
+				type: 'GET', //请求方式
+				jsonp: false //跨域
+			},
+			cached: false, //是否缓存
+			elem: undefined, //容器
+			filter: 'kitNavbar' //过滤器名称
+		},
+		set: function (options) {
+			var that = this;
+			that.config.data = undefined;
+			$.extend(true, that.config, options);
+			return that;
+		},
+		/**
+		 * 是否已设置了elem
+		 */
+		hasElem: function () {
+			var that = this,
+				_config = that.config;
+			if (_config.elem === undefined && _doc.find('ul[kit-navbar]').length === 0 && $(_config.elem)) {
+				layui.hint().error('Navbar error:请配置Navbar容器.');
+				return false;
+			}
+			return true;
+		},
+		/**
+		 * 获取容器的jq对象
+		 */
+		getElem: function () {
+			var _config = this.config;
+			return (_config.elem !== undefined && $(_config.elem).length > 0) ? $(_config.elem) : _doc.find('ul[kit-navbar]');
+		},
+		/**
+		 * 绑定特定a标签的点击事件
+		 */
+		bind: function (callback, params) {
+			var that = this,
+				_config = that.config;
+			var defaults = {
+				target: undefined,
+				showTips: false
+			};
+			$.extend(true, defaults, params);
 
 
-            var _target = defaults.target === undefined ? _doc : $(defaults.target);
-            // if (!that.hasElem())
-            //     return that;
-            // var _elem = that.getElem();
-            _target.find('a[kit-target]').each(function () {
-                var _that = $(this),
-                    tipsId = undefined;
-                if (defaults.showTips) {
-                    _that.hover(function () {
-                        tipsId = layer.tips($(this).children('span').text(), this);
-                    }, function () {
-                        if (tipsId) {
-                        }
-                        // layer.close(tipsId);
-                    });
-                }
-                _that.off('click').on('click', function () {
-                    var options = _that.data('options');
-                    var data;
-                    if (options !== undefined) {
-                        try {
-                            data = new Function('return ' + options)();
-                        } catch (e) {
-                            layui.hint().error('Navbar 组件a[data-options]配置项存在语法错误：' + options)
-                        }
-                    } else {
-                        data = {
-                            icon: _that.data('icon'),
-                            id: _that.data('id'),
-                            router: _that.data('router'),
-                            title: _that.data('title'),
-                            url: _that.data('url'),
-                        };
-                    }
-                    typeof callback === 'function' && callback(data);
-                });
-            });
-            $('.kit-side-fold').off('click').on('click', function () {
-                var _side = _doc.find('div.kit-side');
-                var _log1 = _doc.find('div.layui-logo1');
-                var left = _doc.find('ul.kit-header');
+			var _target = defaults.target === undefined ? _doc : $(defaults.target);
+			// if (!that.hasElem())
+			//     return that;
+			// var _elem = that.getElem();
+			_target.find('a[kit-target]').each(function () {
+				var _that = $(this),
+					tipsId = undefined;
+				if (defaults.showTips) {
+					_that.hover(function () {
+						tipsId = layer.tips($(this).children('span').text(), this);
+					}, function () {
+						if (tipsId) {
+						}
+						// layer.close(tipsId);
+					});
+				}
+				_that.off('click').on('click', function () {
+					var options = _that.data('options');
+					var data;
+					if (options !== undefined) {
+						try {
+							data = new Function('return ' + options)();
+						} catch (e) {
+							layui.hint().error('Navbar 组件a[data-options]配置项存在语法错误：' + options)
+						}
+					} else {
+						data = {
+							icon: _that.data('icon'),
+							id: _that.data('id'),
+							router: _that.data('router'),
+							title: _that.data('title'),
+							url: _that.data('url'),
+						};
+					}
+					typeof callback === 'function' && callback(data);
+				});
+			});
+			$('.kit-side-fold').off('click').on('click', function () {
+				var _side = _doc.find('div.kit-side');
+				var _log1 = _doc.find('div.layui-logo1');
+				var left = _doc.find('ul.kit-header');
 
-                if (_side.hasClass('kit-sided')) {
-                    _side.removeClass('kit-sided');
-                    _doc.find('div.kit-logo-mobile').removeClass('kit-logo-min');
-                    _doc.find('div.layui-body').removeClass('kit-body-folded');
-                    _doc.find('div.layui-footer').removeClass('kit-footer-folded');
-                    _log1.removeClass('layui-logo-hidden');
-                    left.removeClass('layui-layout-left-zone');
-                    left.addClass('layui-layout-left');
-                } else {
-                    _side.addClass('kit-sided');
-                    _doc.find('div.kit-logo-mobile').addClass('kit-logo-min');
-                    _doc.find('div.layui-body').addClass('kit-body-folded');
-                    _doc.find('div.layui-footer').addClass('kit-footer-folded');
-                    _log1.addClass('layui-logo-hidden');
-                    left.removeClass('layui-layout-left');
-                    left.addClass('layui-layout-left-zone');
-                }
-            });
-            return that;
-        },
-        /**
-         * 渲染navbar
-         */
-        render: function (callback) {
-            var that = this,
-                _config = that.config, //配置
-                _remote = _config.remote, //远程参数配置
-                _tpl = [
-                    '{{# layui.each(d,function(index, item){ }}',
-                    '{{# if(item.spread){ }}',
-                    '<li class="layui-nav-item layui-nav-itemed">',
-                    '{{# }else{ }}',
-                    '<li class="layui-nav-item">',
-                    '{{# } }}',
-                    '{{# var hasChildren = item.children!==undefined && item.children.length>0; }}',
-                    '{{# if(hasChildren){ }}',
-                    '<a href="javascript:;">',
-                    '{{# if (item.icon.indexOf("fa-") !== -1) { }}',
-                    '<i class="fa {{item.icon}}" aria-hidden="true"></i>',
-                    '{{# } else { }}',
-                    '<i class="layui-icon">{{item.icon}}</i>',
-                    '{{# } }}',
-                    '<span> {{item.title}}</span>',
-                    '</a>',
-                    '{{# var children = item.children; }}',
-                    '<dl class="layui-nav-child">',
-                    '{{# layui.each(children,function(childIndex, child){ }}',
-                    '<dd>',
-                    '<a href="javascript:;" kit-target data-options="{url:\'{{child.url}}\',icon:\'{{child.icon}}\',title:\'{{child.title}}\',id:\'{{child.id}}\'}">',
-                    '{{# if (child.icon.indexOf("fa-") !== -1) { }}',
-                    '<i class="fa {{child.icon}}" aria-hidden="true"></i>',
-                    '{{# } else { }}',
-                    '<i class="layui-icon">{{child.icon}}</i>',
-                    '{{# } }}',
-                    '<span> {{child.title}}</span>',
-                    '</a>',
-                    '</dd>',
-                    '{{# }); }}',
-                    '</dl>',
-                    '{{# }else{ }}',
-                    '<a href="javascript:;" kit-target data-options="{url:\'{{item.url}}\',icon:\'{{item.icon}}\',title:\'{{item.title}}\',id:\'{{item.id}}\'}">',
-                    '{{# if (item.icon.indexOf("fa-") !== -1) { }}',
-                    '<i class="fa {{item.icon}}" aria-hidden="true"></i>',
-                    '{{# } else { }}',
-                    '<i class="layui-icon">{{item.icon}}</i>',
-                    '{{# } }}',
-                    '<span> {{item.title}}</span>',
-                    '</a>',
-                    '{{# } }}',
-                    '</li>',
-                    '{{# }); }}',
-                ], //模板
-                _data = [];
-            var navbarLoadIndex = layer.load(2);
-            if (!that.hasElem())
-                return that;
-            var _elem = that.getElem();
-            //本地数据优先
-            if (_config.data !== undefined && _config.data.length > 0) {
-                _data = _config.data;
-            } else {
-                var dataType = _remote.jsonp ? 'jsonp' : 'json';
-                var options = {
-                    url: _remote.url,
-                    type: _remote.type,
-                    error: function (xhr, status, thrown) {
-                        layui.hint().error('Navbar error:AJAX请求出错.' + thrown);
-                        navbarLoadIndex && layer.close(navbarLoadIndex);
-                    },
-                    success: function (res) {
-                        _data = res;
-                    }
-                };
-                $.extend(true, options, _remote.jsonp ? {
-                    dataType: 'jsonp',
-                    jsonp: 'callback',
-                    jsonpCallback: 'jsonpCallback'
-                } : {
-                    dataType: 'json'
-                });
-                $.support.cors = true;
-                $.ajax(options);
-            }
-            var tIndex = setInterval(function () {
-                if (_data.length > 0) {
-                    clearInterval(tIndex);
-                    //渲染模板
-                    laytpl(_tpl.join('')).render(_data, function (html) {
-                        _elem.html(html);
-                        element.init();
-                        //绑定a标签的点击事件
-                        that.bind(function (data) {
-                            typeof callback === 'function' && callback(data);
-                        });
-                        //关闭等待层
-                        navbarLoadIndex && layer.close(navbarLoadIndex);
-                    });
-                }
-            }, 50);
-            return that;
-        }
-    };
-    exports('navbar', navbar);
-});
\ No newline at end of file
+				if (_side.hasClass('kit-sided')) {
+					_side.removeClass('kit-sided');
+					_doc.find('div.kit-logo-mobile').removeClass('kit-logo-min');
+					_doc.find('div.layui-body').removeClass('kit-body-folded');
+					_doc.find('div.layui-footer').removeClass('kit-footer-folded');
+					_log1.removeClass('layui-logo-hidden');
+					left.removeClass('layui-layout-left-zone');
+					left.addClass('layui-layout-left');
+				} else {
+					_side.addClass('kit-sided');
+					_doc.find('div.kit-logo-mobile').addClass('kit-logo-min');
+					_doc.find('div.layui-body').addClass('kit-body-folded');
+					_doc.find('div.layui-footer').addClass('kit-footer-folded');
+					_log1.addClass('layui-logo-hidden');
+					left.removeClass('layui-layout-left');
+					left.addClass('layui-layout-left-zone');
+				}
+			});
+			return that;
+		},
+		/**
+		 * 渲染navbar
+		 */
+		render: function (callback) {
+			var that = this,
+				_config = that.config, //配置
+				_remote = _config.remote, //远程参数配置
+				_tpl = [
+					'{{# layui.each(d,function(index, item){ }}',
+					'{{# if(item.spread){ }}',
+					'<li class="layui-nav-item layui-nav-itemed">',
+					'{{# }else{ }}',
+					'<li class="layui-nav-item">',
+					'{{# } }}',
+					'{{# var hasChildren = item.children!==undefined && item.children.length>0; }}',
+					'{{# if(hasChildren){ }}',
+					'<a href="javascript:;">',
+					'{{# if (item.icon.indexOf("fa-") !== -1) { }}',
+					'<i class="fa {{item.icon}}" aria-hidden="true"></i>',
+					'{{# } else { }}',
+					'<i class="layui-icon">{{item.icon}}</i>',
+					'{{# } }}',
+					'<span> {{item.title}}</span>',
+					'</a>',
+					'{{# var children = item.children; }}',
+					'<dl class="layui-nav-child">',
+					'{{# layui.each(children,function(childIndex, child){ }}',
+					'<dd>',
+					'<a href="javascript:;" kit-target data-options="{url:\'{{child.url}}\',icon:\'{{child.icon}}\',title:\'{{child.title}}\',id:\'{{child.id}}\'}">',
+					'{{# if (child.icon.indexOf("fa-") !== -1) { }}',
+					'<i class="fa {{child.icon}}" aria-hidden="true"></i>',
+					'{{# } else { }}',
+					'<i class="layui-icon">{{child.icon}}</i>',
+					'{{# } }}',
+					'<span> {{child.title}}</span>',
+					'</a>',
+					'</dd>',
+					'{{# }); }}',
+					'</dl>',
+					'{{# }else{ }}',
+					'<a href="javascript:;" kit-target data-options="{url:\'{{item.url}}\',icon:\'{{item.icon}}\',title:\'{{item.title}}\',id:\'{{item.id}}\'}">',
+					'{{# if (item.icon.indexOf("fa-") !== -1) { }}',
+					'<i class="fa {{item.icon}}" aria-hidden="true"></i>',
+					'{{# } else { }}',
+					'<i class="layui-icon">{{item.icon}}</i>',
+					'{{# } }}',
+					'<span> {{item.title}}</span>',
+					'</a>',
+					'{{# } }}',
+					'</li>',
+					'{{# }); }}',
+				], //模板
+				_data = [];
+			var navbarLoadIndex = layer.load(2);
+			if (!that.hasElem())
+				return that;
+			var _elem = that.getElem();
+			//本地数据优先
+			if (_config.data !== undefined && _config.data.length > 0) {
+				_data = _config.data;
+			} else {
+				var dataType = _remote.jsonp ? 'jsonp' : 'json';
+				var options = {
+					url: _remote.url,
+					type: _remote.type,
+					error: function (xhr, status, thrown) {
+						layui.hint().error('Navbar error:AJAX请求出错.' + thrown);
+						navbarLoadIndex && layer.close(navbarLoadIndex);
+					},
+					success: function (res) {
+						_data = res;
+					}
+				};
+				$.extend(true, options, _remote.jsonp ? {
+					dataType: 'jsonp',
+					jsonp: 'callback',
+					jsonpCallback: 'jsonpCallback'
+				} : {
+					dataType: 'json'
+				});
+				$.support.cors = true;
+				$.ajax(options);
+			}
+			var tIndex = setInterval(function () {
+				if (_data.length > 0) {
+					clearInterval(tIndex);
+					//渲染模板
+					laytpl(_tpl.join('')).render(_data, function (html) {
+						_elem.html(html);
+						element.init();
+						//绑定a标签的点击事件
+						that.bind(function (data) {
+							typeof callback === 'function' && callback(data);
+						});
+						//关闭等待层
+						navbarLoadIndex && layer.close(navbarLoadIndex);
+					});
+				}
+			}, 50);
+			return that;
+		}
+	};
+	exports('navbar', navbar);
+});
diff --git a/len-sys/src/main/resources/plugin/build/js/nprogress.js b/len-sys/src/main/resources/plugin/build/js/nprogress.js
index d10ba07..17e8fb9 100644
--- a/len-sys/src/main/resources/plugin/build/js/nprogress.js
+++ b/len-sys/src/main/resources/plugin/build/js/nprogress.js
@@ -1,482 +1,482 @@
 /** kit_admin-v1.1.0 MIT License By http://kit/zhengjinfan.cn e-mail:zheng_jinfan@126.com */
- ;/* NProgress, (c) 2013, 2014 Rico Sta. Cruz - http://ricostacruz.com/nprogress
+;/* NProgress, (c) 2013, 2014 Rico Sta. Cruz - http://ricostacruz.com/nprogress
  * @license MIT */
-layui.define('kitconfig', function(exports) {
-    var kitconfig = layui.kitconfig;
-    (function(root, factory) {
-
-        if (typeof define === 'function' && define.amd) {
-            define(factory);
-        } else if (typeof exports === 'object') {
-            module.exports = factory();
-        } else {
-            root.NProgress = factory();
-        }
-
-    })(this, function() {
-        var NProgress = {};
-
-        NProgress.version = '0.2.0';
-
-        var Settings = NProgress.settings = {
-            minimum: 0.08,
-            easing: 'ease',
-            positionUsing: '',
-            speed: 200,
-            trickle: true,
-            trickleRate: 0.02,
-            trickleSpeed: 800,
-            showSpinner: true,
-            barSelector: '[role="bar"]',
-            spinnerSelector: '[role="spinner"]',
-            parent: 'body',
-            template: '<div class="bar" role="bar"><div class="peg"></div></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'
-        };
-
-        /**
-         * Updates configuration.
-         *
-         *     NProgress.configure({
-         *       minimum: 0.1
-         *     });
-         */
-        NProgress.configure = function(options) {
-            var key, value;
-            for (key in options) {
-                value = options[key];
-                if (value !== undefined && options.hasOwnProperty(key)) Settings[key] = value;
-            }
-
-            return this;
-        };
-
-        /**
-         * Last number.
-         */
-
-        NProgress.status = null;
-
-        /**
-         * Sets the progress bar status, where `n` is a number from `0.0` to `1.0`.
-         *
-         *     NProgress.set(0.4);
-         *     NProgress.set(1.0);
-         */
-
-        NProgress.set = function(n) {
-            var started = NProgress.isStarted();
-
-            n = clamp(n, Settings.minimum, 1);
-            NProgress.status = (n === 1 ? null : n);
-
-            var progress = NProgress.render(!started),
-                bar = progress.querySelector(Settings.barSelector),
-                speed = Settings.speed,
-                ease = Settings.easing;
-
-            progress.offsetWidth; /* Repaint */
-
-            queue(function(next) {
-                // Set positionUsing if it hasn't already been set
-                if (Settings.positionUsing === '') Settings.positionUsing = NProgress.getPositioningCSS();
-
-                // Add transition
-                css(bar, barPositionCSS(n, speed, ease));
-
-                if (n === 1) {
-                    // Fade out
-                    css(progress, {
-                        transition: 'none',
-                        opacity: 1
-                    });
-                    progress.offsetWidth; /* Repaint */
-
-                    setTimeout(function() {
-                        css(progress, {
-                            transition: 'all ' + speed + 'ms linear',
-                            opacity: 0
-                        });
-                        setTimeout(function() {
-                            NProgress.remove();
-                            next();
-                        }, speed);
-                    }, speed);
-                } else {
-                    setTimeout(next, speed);
-                }
-            });
-
-            return this;
-        };
-
-        NProgress.isStarted = function() {
-            return typeof NProgress.status === 'number';
-        };
-
-        /**
-         * Shows the progress bar.
-         * This is the same as setting the status to 0%, except that it doesn't go backwards.
-         *
-         *     NProgress.start();
-         *
-         */
-        NProgress.start = function() {
-            if (!NProgress.status) NProgress.set(0);
-
-            var work = function() {
-                setTimeout(function() {
-                    if (!NProgress.status) return;
-                    NProgress.trickle();
-                    work();
-                }, Settings.trickleSpeed);
-            };
-
-            if (Settings.trickle) work();
-
-            return this;
-        };
-
-        /**
-         * Hides the progress bar.
-         * This is the *sort of* the same as setting the status to 100%, with the
-         * difference being `done()` makes some placebo effect of some realistic motion.
-         *
-         *     NProgress.done();
-         *
-         * If `true` is passed, it will show the progress bar even if its hidden.
-         *
-         *     NProgress.done(true);
-         */
-
-        NProgress.done = function(force) {
-            if (!force && !NProgress.status) return this;
-
-            return NProgress.inc(0.3 + 0.5 * Math.random()).set(1);
-        };
-
-        /**
-         * Increments by a random amount.
-         */
-
-        NProgress.inc = function(amount) {
-            var n = NProgress.status;
-
-            if (!n) {
-                return NProgress.start();
-            } else {
-                if (typeof amount !== 'number') {
-                    amount = (1 - n) * clamp(Math.random() * n, 0.1, 0.95);
-                }
-
-                n = clamp(n + amount, 0, 0.994);
-                return NProgress.set(n);
-            }
-        };
-
-        NProgress.trickle = function() {
-            return NProgress.inc(Math.random() * Settings.trickleRate);
-        };
-
-        /**
-         * Waits for all supplied jQuery promises and
-         * increases the progress as the promises resolve.
-         *
-         * @param $promise jQUery Promise
-         */
-        (function() {
-            var initial = 0,
-                current = 0;
-
-            NProgress.promise = function($promise) {
-                if (!$promise || $promise.state() === "resolved") {
-                    return this;
-                }
-
-                if (current === 0) {
-                    NProgress.start();
-                }
-
-                initial++;
-                current++;
-
-                $promise.always(function() {
-                    current--;
-                    if (current === 0) {
-                        initial = 0;
-                        NProgress.done();
-                    } else {
-                        NProgress.set((initial - current) / initial);
-                    }
-                });
-
-                return this;
-            };
-
-        })();
-
-        /**
-         * (Internal) renders the progress bar markup based on the `template`
-         * setting.
-         */
-
-        NProgress.render = function(fromStart) {
-            if (NProgress.isRendered()) return document.getElementById('nprogress');
-
-            addClass(document.documentElement, 'nprogress-busy');
-
-            var progress = document.createElement('div');
-            progress.id = 'nprogress';
-            progress.innerHTML = Settings.template;
-
-            var bar = progress.querySelector(Settings.barSelector),
-                perc = fromStart ? '-100' : toBarPerc(NProgress.status || 0),
-                parent = document.querySelector(Settings.parent),
-                spinner;
-
-            css(bar, {
-                transition: 'all 0 linear',
-                transform: 'translate3d(' + perc + '%,0,0)'
-            });
-
-            if (!Settings.showSpinner) {
-                spinner = progress.querySelector(Settings.spinnerSelector);
-                spinner && removeElement(spinner);
-            }
-
-            if (parent != document.body) {
-                addClass(parent, 'nprogress-custom-parent');
-            }
-
-            parent.appendChild(progress);
-            return progress;
-        };
-
-        /**
-         * Removes the element. Opposite of render().
-         */
-
-        NProgress.remove = function() {
-            removeClass(document.documentElement, 'nprogress-busy');
-            removeClass(document.querySelector(Settings.parent), 'nprogress-custom-parent');
-            var progress = document.getElementById('nprogress');
-            progress && removeElement(progress);
-        };
-
-        /**
-         * Checks if the progress bar is rendered.
-         */
-
-        NProgress.isRendered = function() {
-            return !!document.getElementById('nprogress');
-        };
-
-        /**
-         * Determine which positioning CSS rule to use.
-         */
-
-        NProgress.getPositioningCSS = function() {
-            // Sniff on document.body.style
-            var bodyStyle = document.body.style;
-
-            // Sniff prefixes
-            var vendorPrefix = ('WebkitTransform' in bodyStyle) ? 'Webkit' :
-                ('MozTransform' in bodyStyle) ? 'Moz' :
-                ('msTransform' in bodyStyle) ? 'ms' :
-                ('OTransform' in bodyStyle) ? 'O' : '';
-
-            if (vendorPrefix + 'Perspective' in bodyStyle) {
-                // Modern browsers with 3D support, e.g. Webkit, IE10
-                return 'translate3d';
-            } else if (vendorPrefix + 'Transform' in bodyStyle) {
-                // Browsers without 3D support, e.g. IE9
-                return 'translate';
-            } else {
-                // Browsers without translate() support, e.g. IE7-8
-                return 'margin';
-            }
-        };
-
-        /**
-         * Helpers
-         */
-
-        function clamp(n, min, max) {
-            if (n < min) return min;
-            if (n > max) return max;
-            return n;
-        }
-
-        /**
-         * (Internal) converts a percentage (`0..1`) to a bar translateX
-         * percentage (`-100%..0%`).
-         */
-
-        function toBarPerc(n) {
-            return (-1 + n) * 100;
-        }
-
-
-        /**
-         * (Internal) returns the correct CSS for changing the bar's
-         * position given an n percentage, and speed and ease from Settings
-         */
-
-        function barPositionCSS(n, speed, ease) {
-            var barCSS;
-
-            if (Settings.positionUsing === 'translate3d') {
-                barCSS = { transform: 'translate3d(' + toBarPerc(n) + '%,0,0)' };
-            } else if (Settings.positionUsing === 'translate') {
-                barCSS = { transform: 'translate(' + toBarPerc(n) + '%,0)' };
-            } else {
-                barCSS = { 'margin-left': toBarPerc(n) + '%' };
-            }
-
-            barCSS.transition = 'all ' + speed + 'ms ' + ease;
-
-            return barCSS;
-        }
-
-        /**
-         * (Internal) Queues a function to be executed.
-         */
-
-        var queue = (function() {
-            var pending = [];
-
-            function next() {
-                var fn = pending.shift();
-                if (fn) {
-                    fn(next);
-                }
-            }
-
-            return function(fn) {
-                pending.push(fn);
-                if (pending.length == 1) next();
-            };
-        })();
-
-        /**
-         * (Internal) Applies css properties to an element, similar to the jQuery 
-         * css method.
-         *
-         * While this helper does assist with vendor prefixed property names, it 
-         * does not perform any manipulation of values prior to setting styles.
-         */
-
-        var css = (function() {
-            var cssPrefixes = ['Webkit', 'O', 'Moz', 'ms'],
-                cssProps = {};
-
-            function camelCase(string) {
-                return string.replace(/^-ms-/, 'ms-').replace(/-([\da-z])/gi, function(match, letter) {
-                    return letter.toUpperCase();
-                });
-            }
-
-            function getVendorProp(name) {
-                var style = document.body.style;
-                if (name in style) return name;
-
-                var i = cssPrefixes.length,
-                    capName = name.charAt(0).toUpperCase() + name.slice(1),
-                    vendorName;
-                while (i--) {
-                    vendorName = cssPrefixes[i] + capName;
-                    if (vendorName in style) return vendorName;
-                }
-
-                return name;
-            }
-
-            function getStyleProp(name) {
-                name = camelCase(name);
-                return cssProps[name] || (cssProps[name] = getVendorProp(name));
-            }
-
-            function applyCss(element, prop, value) {
-                prop = getStyleProp(prop);
-                element.style[prop] = value;
-            }
-
-            return function(element, properties) {
-                var args = arguments,
-                    prop,
-                    value;
-
-                if (args.length == 2) {
-                    for (prop in properties) {
-                        value = properties[prop];
-                        if (value !== undefined && properties.hasOwnProperty(prop)) applyCss(element, prop, value);
-                    }
-                } else {
-                    applyCss(element, args[1], args[2]);
-                }
-            }
-        })();
-
-        /**
-         * (Internal) Determines if an element or space separated list of class names contains a class name.
-         */
-
-        function hasClass(element, name) {
-            var list = typeof element == 'string' ? element : classList(element);
-            return list.indexOf(' ' + name + ' ') >= 0;
-        }
-
-        /**
-         * (Internal) Adds a class to an element.
-         */
-
-        function addClass(element, name) {
-            var oldList = classList(element),
-                newList = oldList + name;
-
-            if (hasClass(oldList, name)) return;
-
-            // Trim the opening space.
-            element.className = newList.substring(1);
-        }
-
-        /**
-         * (Internal) Removes a class from an element.
-         */
-
-        function removeClass(element, name) {
-            var oldList = classList(element),
-                newList;
-
-            if (!hasClass(element, name)) return;
-
-            // Replace the class name.
-            newList = oldList.replace(' ' + name + ' ', ' ');
-
-            // Trim the opening and closing spaces.
-            element.className = newList.substring(1, newList.length - 1);
-        }
-
-        /**
-         * (Internal) Gets a space separated list of the class names on the element. 
-         * The list is wrapped with a single space on each end to facilitate finding 
-         * matches within the list.
-         */
-
-        function classList(element) {
-            return (' ' + (element.className || '') + ' ').replace(/\s+/gi, ' ');
-        }
-
-        /**
-         * (Internal) Removes an element from the DOM.
-         */
-
-        function removeElement(element) {
-            element && element.parentNode && element.parentNode.removeChild(element);
-        }
-
-        return NProgress;
-    });
-
-    layui.link(kitconfig.resourcePath + 'css/nprogress.css');
-    exports('nprogress');
-});
\ No newline at end of file
+layui.define('kitconfig', function (exports) {
+	var kitconfig = layui.kitconfig;
+	(function (root, factory) {
+
+		if (typeof define === 'function' && define.amd) {
+			define(factory);
+		} else if (typeof exports === 'object') {
+			module.exports = factory();
+		} else {
+			root.NProgress = factory();
+		}
+
+	})(this, function () {
+		var NProgress = {};
+
+		NProgress.version = '0.2.0';
+
+		var Settings = NProgress.settings = {
+			minimum: 0.08,
+			easing: 'ease',
+			positionUsing: '',
+			speed: 200,
+			trickle: true,
+			trickleRate: 0.02,
+			trickleSpeed: 800,
+			showSpinner: true,
+			barSelector: '[role="bar"]',
+			spinnerSelector: '[role="spinner"]',
+			parent: 'body',
+			template: '<div class="bar" role="bar"><div class="peg"></div></div><div class="spinner" role="spinner"><div class="spinner-icon"></div></div>'
+		};
+
+		/**
+		 * Updates configuration.
+		 *
+		 *     NProgress.configure({
+		 *       minimum: 0.1
+		 *     });
+		 */
+		NProgress.configure = function (options) {
+			var key, value;
+			for (key in options) {
+				value = options[key];
+				if (value !== undefined && options.hasOwnProperty(key)) Settings[key] = value;
+			}
+
+			return this;
+		};
+
+		/**
+		 * Last number.
+		 */
+
+		NProgress.status = null;
+
+		/**
+		 * Sets the progress bar status, where `n` is a number from `0.0` to `1.0`.
+		 *
+		 *     NProgress.set(0.4);
+		 *     NProgress.set(1.0);
+		 */
+
+		NProgress.set = function (n) {
+			var started = NProgress.isStarted();
+
+			n = clamp(n, Settings.minimum, 1);
+			NProgress.status = (n === 1 ? null : n);
+
+			var progress = NProgress.render(!started),
+				bar = progress.querySelector(Settings.barSelector),
+				speed = Settings.speed,
+				ease = Settings.easing;
+
+			progress.offsetWidth; /* Repaint */
+
+			queue(function (next) {
+				// Set positionUsing if it hasn't already been set
+				if (Settings.positionUsing === '') Settings.positionUsing = NProgress.getPositioningCSS();
+
+				// Add transition
+				css(bar, barPositionCSS(n, speed, ease));
+
+				if (n === 1) {
+					// Fade out
+					css(progress, {
+						transition: 'none',
+						opacity: 1
+					});
+					progress.offsetWidth; /* Repaint */
+
+					setTimeout(function () {
+						css(progress, {
+							transition: 'all ' + speed + 'ms linear',
+							opacity: 0
+						});
+						setTimeout(function () {
+							NProgress.remove();
+							next();
+						}, speed);
+					}, speed);
+				} else {
+					setTimeout(next, speed);
+				}
+			});
+
+			return this;
+		};
+
+		NProgress.isStarted = function () {
+			return typeof NProgress.status === 'number';
+		};
+
+		/**
+		 * Shows the progress bar.
+		 * This is the same as setting the status to 0%, except that it doesn't go backwards.
+		 *
+		 *     NProgress.start();
+		 *
+		 */
+		NProgress.start = function () {
+			if (!NProgress.status) NProgress.set(0);
+
+			var work = function () {
+				setTimeout(function () {
+					if (!NProgress.status) return;
+					NProgress.trickle();
+					work();
+				}, Settings.trickleSpeed);
+			};
+
+			if (Settings.trickle) work();
+
+			return this;
+		};
+
+		/**
+		 * Hides the progress bar.
+		 * This is the *sort of* the same as setting the status to 100%, with the
+		 * difference being `done()` makes some placebo effect of some realistic motion.
+		 *
+		 *     NProgress.done();
+		 *
+		 * If `true` is passed, it will show the progress bar even if its hidden.
+		 *
+		 *     NProgress.done(true);
+		 */
+
+		NProgress.done = function (force) {
+			if (!force && !NProgress.status) return this;
+
+			return NProgress.inc(0.3 + 0.5 * Math.random()).set(1);
+		};
+
+		/**
+		 * Increments by a random amount.
+		 */
+
+		NProgress.inc = function (amount) {
+			var n = NProgress.status;
+
+			if (!n) {
+				return NProgress.start();
+			} else {
+				if (typeof amount !== 'number') {
+					amount = (1 - n) * clamp(Math.random() * n, 0.1, 0.95);
+				}
+
+				n = clamp(n + amount, 0, 0.994);
+				return NProgress.set(n);
+			}
+		};
+
+		NProgress.trickle = function () {
+			return NProgress.inc(Math.random() * Settings.trickleRate);
+		};
+
+		/**
+		 * Waits for all supplied jQuery promises and
+		 * increases the progress as the promises resolve.
+		 *
+		 * @param $promise jQUery Promise
+		 */
+		(function () {
+			var initial = 0,
+				current = 0;
+
+			NProgress.promise = function ($promise) {
+				if (!$promise || $promise.state() === "resolved") {
+					return this;
+				}
+
+				if (current === 0) {
+					NProgress.start();
+				}
+
+				initial++;
+				current++;
+
+				$promise.always(function () {
+					current--;
+					if (current === 0) {
+						initial = 0;
+						NProgress.done();
+					} else {
+						NProgress.set((initial - current) / initial);
+					}
+				});
+
+				return this;
+			};
+
+		})();
+
+		/**
+		 * (Internal) renders the progress bar markup based on the `template`
+		 * setting.
+		 */
+
+		NProgress.render = function (fromStart) {
+			if (NProgress.isRendered()) return document.getElementById('nprogress');
+
+			addClass(document.documentElement, 'nprogress-busy');
+
+			var progress = document.createElement('div');
+			progress.id = 'nprogress';
+			progress.innerHTML = Settings.template;
+
+			var bar = progress.querySelector(Settings.barSelector),
+				perc = fromStart ? '-100' : toBarPerc(NProgress.status || 0),
+				parent = document.querySelector(Settings.parent),
+				spinner;
+
+			css(bar, {
+				transition: 'all 0 linear',
+				transform: 'translate3d(' + perc + '%,0,0)'
+			});
+
+			if (!Settings.showSpinner) {
+				spinner = progress.querySelector(Settings.spinnerSelector);
+				spinner && removeElement(spinner);
+			}
+
+			if (parent != document.body) {
+				addClass(parent, 'nprogress-custom-parent');
+			}
+
+			parent.appendChild(progress);
+			return progress;
+		};
+
+		/**
+		 * Removes the element. Opposite of render().
+		 */
+
+		NProgress.remove = function () {
+			removeClass(document.documentElement, 'nprogress-busy');
+			removeClass(document.querySelector(Settings.parent), 'nprogress-custom-parent');
+			var progress = document.getElementById('nprogress');
+			progress && removeElement(progress);
+		};
+
+		/**
+		 * Checks if the progress bar is rendered.
+		 */
+
+		NProgress.isRendered = function () {
+			return !!document.getElementById('nprogress');
+		};
+
+		/**
+		 * Determine which positioning CSS rule to use.
+		 */
+
+		NProgress.getPositioningCSS = function () {
+			// Sniff on document.body.style
+			var bodyStyle = document.body.style;
+
+			// Sniff prefixes
+			var vendorPrefix = ('WebkitTransform' in bodyStyle) ? 'Webkit' :
+				('MozTransform' in bodyStyle) ? 'Moz' :
+					('msTransform' in bodyStyle) ? 'ms' :
+						('OTransform' in bodyStyle) ? 'O' : '';
+
+			if (vendorPrefix + 'Perspective' in bodyStyle) {
+				// Modern browsers with 3D support, e.g. Webkit, IE10
+				return 'translate3d';
+			} else if (vendorPrefix + 'Transform' in bodyStyle) {
+				// Browsers without 3D support, e.g. IE9
+				return 'translate';
+			} else {
+				// Browsers without translate() support, e.g. IE7-8
+				return 'margin';
+			}
+		};
+
+		/**
+		 * Helpers
+		 */
+
+		function clamp(n, min, max) {
+			if (n < min) return min;
+			if (n > max) return max;
+			return n;
+		}
+
+		/**
+		 * (Internal) converts a percentage (`0..1`) to a bar translateX
+		 * percentage (`-100%..0%`).
+		 */
+
+		function toBarPerc(n) {
+			return (-1 + n) * 100;
+		}
+
+
+		/**
+		 * (Internal) returns the correct CSS for changing the bar's
+		 * position given an n percentage, and speed and ease from Settings
+		 */
+
+		function barPositionCSS(n, speed, ease) {
+			var barCSS;
+
+			if (Settings.positionUsing === 'translate3d') {
+				barCSS = {transform: 'translate3d(' + toBarPerc(n) + '%,0,0)'};
+			} else if (Settings.positionUsing === 'translate') {
+				barCSS = {transform: 'translate(' + toBarPerc(n) + '%,0)'};
+			} else {
+				barCSS = {'margin-left': toBarPerc(n) + '%'};
+			}
+
+			barCSS.transition = 'all ' + speed + 'ms ' + ease;
+
+			return barCSS;
+		}
+
+		/**
+		 * (Internal) Queues a function to be executed.
+		 */
+
+		var queue = (function () {
+			var pending = [];
+
+			function next() {
+				var fn = pending.shift();
+				if (fn) {
+					fn(next);
+				}
+			}
+
+			return function (fn) {
+				pending.push(fn);
+				if (pending.length == 1) next();
+			};
+		})();
+
+		/**
+		 * (Internal) Applies css properties to an element, similar to the jQuery
+		 * css method.
+		 *
+		 * While this helper does assist with vendor prefixed property names, it
+		 * does not perform any manipulation of values prior to setting styles.
+		 */
+
+		var css = (function () {
+			var cssPrefixes = ['Webkit', 'O', 'Moz', 'ms'],
+				cssProps = {};
+
+			function camelCase(string) {
+				return string.replace(/^-ms-/, 'ms-').replace(/-([\da-z])/gi, function (match, letter) {
+					return letter.toUpperCase();
+				});
+			}
+
+			function getVendorProp(name) {
+				var style = document.body.style;
+				if (name in style) return name;
+
+				var i = cssPrefixes.length,
+					capName = name.charAt(0).toUpperCase() + name.slice(1),
+					vendorName;
+				while (i--) {
+					vendorName = cssPrefixes[i] + capName;
+					if (vendorName in style) return vendorName;
+				}
+
+				return name;
+			}
+
+			function getStyleProp(name) {
+				name = camelCase(name);
+				return cssProps[name] || (cssProps[name] = getVendorProp(name));
+			}
+
+			function applyCss(element, prop, value) {
+				prop = getStyleProp(prop);
+				element.style[prop] = value;
+			}
+
+			return function (element, properties) {
+				var args = arguments,
+					prop,
+					value;
+
+				if (args.length == 2) {
+					for (prop in properties) {
+						value = properties[prop];
+						if (value !== undefined && properties.hasOwnProperty(prop)) applyCss(element, prop, value);
+					}
+				} else {
+					applyCss(element, args[1], args[2]);
+				}
+			}
+		})();
+
+		/**
+		 * (Internal) Determines if an element or space separated list of class names contains a class name.
+		 */
+
+		function hasClass(element, name) {
+			var list = typeof element == 'string' ? element : classList(element);
+			return list.indexOf(' ' + name + ' ') >= 0;
+		}
+
+		/**
+		 * (Internal) Adds a class to an element.
+		 */
+
+		function addClass(element, name) {
+			var oldList = classList(element),
+				newList = oldList + name;
+
+			if (hasClass(oldList, name)) return;
+
+			// Trim the opening space.
+			element.className = newList.substring(1);
+		}
+
+		/**
+		 * (Internal) Removes a class from an element.
+		 */
+
+		function removeClass(element, name) {
+			var oldList = classList(element),
+				newList;
+
+			if (!hasClass(element, name)) return;
+
+			// Replace the class name.
+			newList = oldList.replace(' ' + name + ' ', ' ');
+
+			// Trim the opening and closing spaces.
+			element.className = newList.substring(1, newList.length - 1);
+		}
+
+		/**
+		 * (Internal) Gets a space separated list of the class names on the element.
+		 * The list is wrapped with a single space on each end to facilitate finding
+		 * matches within the list.
+		 */
+
+		function classList(element) {
+			return (' ' + (element.className || '') + ' ').replace(/\s+/gi, ' ');
+		}
+
+		/**
+		 * (Internal) Removes an element from the DOM.
+		 */
+
+		function removeElement(element) {
+			element && element.parentNode && element.parentNode.removeChild(element);
+		}
+
+		return NProgress;
+	});
+
+	layui.link(kitconfig.resourcePath + 'css/nprogress.css');
+	exports('nprogress');
+});
diff --git a/len-sys/src/main/resources/plugin/build/js/onelevel.js b/len-sys/src/main/resources/plugin/build/js/onelevel.js
index a6d0a96..f0963e0 100644
--- a/len-sys/src/main/resources/plugin/build/js/onelevel.js
+++ b/len-sys/src/main/resources/plugin/build/js/onelevel.js
@@ -1,122 +1,122 @@
 /** kit_admin-v1.1.0 MIT License By http://kit/zhengjinfan.cn e-mail:zheng_jinfan@126.com */
- ;/**
+;/**
  * Name:onelevel.js
  * Author:Van
  * E-mail:zheng_jinfan@126.com
  * Website:http://kit.zhengjinfan.cn/
  * LICENSE:MIT
  */
-layui.define(['jquery', 'laytpl', 'element'], function(exports) {
-    var $ = layui.jquery,
-        _modName = 'oneLevel',
-        _win = $(window),
-        _doc = $(document),
-        laytpl = layui.laytpl;
+layui.define(['jquery', 'laytpl', 'element'], function (exports) {
+	var $ = layui.jquery,
+		_modName = 'oneLevel',
+		_win = $(window),
+		_doc = $(document),
+		laytpl = layui.laytpl;
 
-    var oneLevel = {
-        v: '1.0.1',
-        config: {
-            elem: undefined,
-            data: undefined,
-            remote: {
-                url: undefined,
-                type: 'GET'
-            },
-            onClicked: undefined
-        },
-        set: function(options) {
-            var that = this;
-            $.extend(true, that.config, options);
-            return that;
-        },
-        /**
-         * 是否已设置了elem
-         */
-        hasElem: function() {
-            var that = this,
-                _config = that.config;
-            if (_config.elem === undefined && _doc.find('ul[kit-one-level]').length === 0 && $(_config.elem)) {
-                //console.log('One-Level error:请配置One-Level容器.');
-                //do something..
-                return false;
-            }
-            return true;
-        },
-        /**
-         * 获取容器的jq对象
-         */
-        getElem: function() {
-            var _config = this.config;
-            return (_config.elem !== undefined && $(_config.elem).length > 0) ? $(_config.elem) : _doc.find('ul[kit-one-level]');
-        },
-        render: function() {
-            var that = this,
-                _config = that.config, //配置
-                _remote = _config.remote, //远程参数配置
-                _tpl = [
-                    '{{# layui.each(d,function(index, item){ }}',
-                    '<li class="layui-nav-item">',
-                    '<a href="javascript:;" data-title="{{item.title}}" data-icon="{{item.icon}}" data-id="{{item.id}}" >',
-                    '{{# if (item.icon.indexOf("fa-") !== -1) { }}',
-                    '<i class="fa {{item.icon}}" aria-hidden="true"></i>',
-                    '{{# } else { }}',
-                    '<i class="layui-icon">{{item.icon}}</i>',
-                    '{{# } }}',
-                    '<span> {{item.title}}</span>',
-                    '</a>',
-                    '</li>',
-                    '{{# }); }}',
-                ], //模板
-                _data = [];
-            var navbarLoadIndex = layer.load(2);
-            if (!that.hasElem())
-                return that;
-            var _elem = that.getElem();
-            //本地数据优先
-            if (_config.data !== undefined && _config.data.length > 0) {
-                _data = _config.data;
-            } else {
-                var dataType = _remote.jsonp ? 'jsonp' : 'json';
-                var options = {
-                    url: _remote.url,
-                    type: _remote.type,
-                    error: function(xhr, status, thrown) {
-                        layui.hint().error('One-Level error:AJAX请求出错.' + thrown);
-                    },
-                    success: function(res) {
-                        _data = res;
-                    }
-                };
-                $.extend(true, options, _remote.jsonp ? {
-                    dataType: 'jsonp',
-                    jsonp: 'callback',
-                    jsonpCallback: 'jsonpCallback'
-                } : {
-                    dataType: 'json'
-                });
-                $.support.cors = true;
-                $.ajax(options);
-            }
-            var tIndex = setInterval(function() {
-                if (_data.length > 0)
-                    clearInterval(tIndex);
-                //渲染模板
-                laytpl(_tpl.join('')).render(_data, function(html) {
-                    _elem.html(html);
-                    layui.element.init();
-                    typeof _config.onClicked === 'function' && _elem.children('li.layui-nav-item').off('click').on('click', function() {
-                        var _a = $(this).children('a'),
-                            id = _a.data('id');
-                        _config.onClicked(id);
-                    });
-                    //关闭等待层
-                    navbarLoadIndex && layer.close(navbarLoadIndex);
-                    typeof _config.renderAfter === 'function' && _config.renderAfter(_elem);
-                });
-            }, 50);
-            return that;
-        }
-    };
+	var oneLevel = {
+		v: '1.0.1',
+		config: {
+			elem: undefined,
+			data: undefined,
+			remote: {
+				url: undefined,
+				type: 'GET'
+			},
+			onClicked: undefined
+		},
+		set: function (options) {
+			var that = this;
+			$.extend(true, that.config, options);
+			return that;
+		},
+		/**
+		 * 是否已设置了elem
+		 */
+		hasElem: function () {
+			var that = this,
+				_config = that.config;
+			if (_config.elem === undefined && _doc.find('ul[kit-one-level]').length === 0 && $(_config.elem)) {
+				//console.log('One-Level error:请配置One-Level容器.');
+				//do something..
+				return false;
+			}
+			return true;
+		},
+		/**
+		 * 获取容器的jq对象
+		 */
+		getElem: function () {
+			var _config = this.config;
+			return (_config.elem !== undefined && $(_config.elem).length > 0) ? $(_config.elem) : _doc.find('ul[kit-one-level]');
+		},
+		render: function () {
+			var that = this,
+				_config = that.config, //配置
+				_remote = _config.remote, //远程参数配置
+				_tpl = [
+					'{{# layui.each(d,function(index, item){ }}',
+					'<li class="layui-nav-item">',
+					'<a href="javascript:;" data-title="{{item.title}}" data-icon="{{item.icon}}" data-id="{{item.id}}" >',
+					'{{# if (item.icon.indexOf("fa-") !== -1) { }}',
+					'<i class="fa {{item.icon}}" aria-hidden="true"></i>',
+					'{{# } else { }}',
+					'<i class="layui-icon">{{item.icon}}</i>',
+					'{{# } }}',
+					'<span> {{item.title}}</span>',
+					'</a>',
+					'</li>',
+					'{{# }); }}',
+				], //模板
+				_data = [];
+			var navbarLoadIndex = layer.load(2);
+			if (!that.hasElem())
+				return that;
+			var _elem = that.getElem();
+			//本地数据优先
+			if (_config.data !== undefined && _config.data.length > 0) {
+				_data = _config.data;
+			} else {
+				var dataType = _remote.jsonp ? 'jsonp' : 'json';
+				var options = {
+					url: _remote.url,
+					type: _remote.type,
+					error: function (xhr, status, thrown) {
+						layui.hint().error('One-Level error:AJAX请求出错.' + thrown);
+					},
+					success: function (res) {
+						_data = res;
+					}
+				};
+				$.extend(true, options, _remote.jsonp ? {
+					dataType: 'jsonp',
+					jsonp: 'callback',
+					jsonpCallback: 'jsonpCallback'
+				} : {
+					dataType: 'json'
+				});
+				$.support.cors = true;
+				$.ajax(options);
+			}
+			var tIndex = setInterval(function () {
+				if (_data.length > 0)
+					clearInterval(tIndex);
+				//渲染模板
+				laytpl(_tpl.join('')).render(_data, function (html) {
+					_elem.html(html);
+					layui.element.init();
+					typeof _config.onClicked === 'function' && _elem.children('li.layui-nav-item').off('click').on('click', function () {
+						var _a = $(this).children('a'),
+							id = _a.data('id');
+						_config.onClicked(id);
+					});
+					//关闭等待层
+					navbarLoadIndex && layer.close(navbarLoadIndex);
+					typeof _config.renderAfter === 'function' && _config.renderAfter(_elem);
+				});
+			}, 50);
+			return that;
+		}
+	};
 
-    exports('onelevel', oneLevel);
-});
\ No newline at end of file
+	exports('onelevel', oneLevel);
+});
diff --git a/len-sys/src/main/resources/plugin/build/js/pjax.js b/len-sys/src/main/resources/plugin/build/js/pjax.js
index f9d7d2c..ef76ba2 100644
--- a/len-sys/src/main/resources/plugin/build/js/pjax.js
+++ b/len-sys/src/main/resources/plugin/build/js/pjax.js
@@ -1,948 +1,949 @@
 /** kit_admin-v1.1.0 MIT License By http://kit/zhengjinfan.cn e-mail:zheng_jinfan@126.com */
- ;layui.define(['jquery'], function(exports) {
-    var jQuery = layui.jquery;
-
-    /*!
-     * Copyright 2012, Chris Wanstrath
-     * Released under the MIT License
-     * https://github.com/defunkt/jquery-pjax
-     */
-
-    (function($) {
-
-        // When called on a container with a selector, fetches the href with
-        // ajax into the container or with the data-pjax attribute on the link
-        // itself.
-        //
-        // Tries to make sure the back button and ctrl+click work the way
-        // you'd expect.
-        //
-        // Exported as $.fn.pjax
-        //
-        // Accepts a jQuery ajax options object that may include these
-        // pjax specific options:
-        //
-        //
-        // container - Where to stick the response body. Usually a String selector.
-        //             $(container).html(xhr.responseBody)
-        //             (default: current jquery context)
-        //      push - Whether to pushState the URL. Defaults to true (of course).
-        //   replace - Want to use replaceState instead? That's cool.
-        //
-        // For convenience the second parameter can be either the container or
-        // the options object.
-        //
-        // Returns the jQuery object
-        function fnPjax(selector, container, options) {
-            var context = this
-            return this.on('click.pjax', selector, function(event) {
-                var opts = $.extend({}, optionsFor(container, options))
-                if (!opts.container)
-                    opts.container = $(this).attr('data-pjax') || context
-                handleClick(event, opts)
-            })
-        }
-
-        // Public: pjax on click handler
-        //
-        // Exported as $.pjax.click.
-        //
-        // event   - "click" jQuery.Event
-        // options - pjax options
-        //
-        // Examples
-        //
-        //   $(document).on('click', 'a', $.pjax.click)
-        //   // is the same as
-        //   $(document).pjax('a')
-        //
-        //  $(document).on('click', 'a', function(event) {
-        //    var container = $(this).closest('[data-pjax-container]')
-        //    $.pjax.click(event, container)
-        //  })
-        //
-        // Returns nothing.
-        function handleClick(event, container, options) {
-            options = optionsFor(container, options)
-
-            var link = event.currentTarget
-
-            if (link.tagName.toUpperCase() !== 'A')
-                throw "$.fn.pjax or $.pjax.click requires an anchor element"
-
-            // Middle click, cmd click, and ctrl click should open
-            // links in a new tab as normal.
-            if (event.which > 1 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey)
-                return
-
-            // Ignore cross origin links
-            if (location.protocol !== link.protocol || location.hostname !== link.hostname)
-                return
-
-            // Ignore case when a hash is being tacked on the current URL
-            if (link.href.indexOf('#') > -1 && stripHash(link) == stripHash(location))
-                return
-
-            // Ignore event with default prevented
-            if (event.isDefaultPrevented())
-                return
-
-            var defaults = {
-                url: link.href,
-                container: $(link).attr('data-pjax'),
-                target: link
-            }
-
-            var opts = $.extend({}, defaults, options)
-            var clickEvent = $.Event('pjax:click')
-            $(link).trigger(clickEvent, [opts])
-
-            if (!clickEvent.isDefaultPrevented()) {
-                pjax(opts)
-                event.preventDefault()
-                $(link).trigger('pjax:clicked', [opts])
-            }
-        }
-
-        // Public: pjax on form submit handler
-        //
-        // Exported as $.pjax.submit
-        //
-        // event   - "click" jQuery.Event
-        // options - pjax options
-        //
-        // Examples
-        //
-        //  $(document).on('submit', 'form', function(event) {
-        //    var container = $(this).closest('[data-pjax-container]')
-        //    $.pjax.submit(event, container)
-        //  })
-        //
-        // Returns nothing.
-        function handleSubmit(event, container, options) {
-            options = optionsFor(container, options)
-
-            var form = event.currentTarget
-
-            if (form.tagName.toUpperCase() !== 'FORM')
-                throw "$.pjax.submit requires a form element"
-
-            var defaults = {
-                type: form.method.toUpperCase(),
-                url: form.action,
-                container: $(form).attr('data-pjax'),
-                target: form
-            }
-
-            if (defaults.type !== 'GET' && window.FormData !== undefined) {
-                defaults.data = new FormData(form);
-                defaults.processData = false;
-                defaults.contentType = false;
-            } else {
-                // Can't handle file uploads, exit
-                if ($(form).find(':file').length) {
-                    return;
-                }
-
-                // Fallback to manually serializing the fields
-                defaults.data = $(form).serializeArray();
-            }
-
-            pjax($.extend({}, defaults, options))
-
-            event.preventDefault()
-        }
-
-        // Loads a URL with ajax, puts the response body inside a container,
-        // then pushState()'s the loaded URL.
-        //
-        // Works just like $.ajax in that it accepts a jQuery ajax
-        // settings object (with keys like url, type, data, etc).
-        //
-        // Accepts these extra keys:
-        //
-        // container - Where to stick the response body.
-        //             $(container).html(xhr.responseBody)
-        //      push - Whether to pushState the URL. Defaults to true (of course).
-        //   replace - Want to use replaceState instead? That's cool.
-        //
-        // Use it just like $.ajax:
-        //
-        //   var xhr = $.pjax({ url: this.href, container: '#main' })
-        //   console.log( xhr.readyState )
-        //
-        // Returns whatever $.ajax returns.
-        function pjax(options) {
-            options = $.extend(true, {}, $.ajaxSettings, pjax.defaults, options)
-
-            if ($.isFunction(options.url)) {
-                options.url = options.url()
-            }
-
-            var target = options.target
-
-            var hash = parseURL(options.url).hash
-
-            var context = options.context = findContainerFor(options.container)
-
-            // We want the browser to maintain two separate internal caches: one
-            // for pjax'd partial page loads and one for normal page loads.
-            // Without adding this secret parameter, some browsers will often
-            // confuse the two.
-            if (!options.data) options.data = {}
-            if ($.isArray(options.data)) {
-                options.data.push({
-                    name: '_pjax',
-                    value: context.selector
-                })
-            } else {
-                options.data._pjax = context.selector
-            }
-
-            function fire(type, args, props) {
-                if (!props) props = {}
-                props.relatedTarget = target
-                var event = $.Event(type, props)
-                context.trigger(event, args)
-                return !event.isDefaultPrevented()
-            }
-
-            var timeoutTimer
-
-            options.beforeSend = function(xhr, settings) {
-                // No timeout for non-GET requests
-                // Its not safe to request the resource again with a fallback method.
-                if (settings.type !== 'GET') {
-                    settings.timeout = 0
-                }
-
-                xhr.setRequestHeader('X-PJAX', 'true')
-                xhr.setRequestHeader('X-PJAX-Container', context.selector)
-
-                if (!fire('pjax:beforeSend', [xhr, settings]))
-                    return false
-
-                if (settings.timeout > 0) {
-                    timeoutTimer = setTimeout(function() {
-                        if (fire('pjax:timeout', [xhr, options]))
-                            xhr.abort('timeout')
-                    }, settings.timeout)
-
-                    // Clear timeout setting so jquerys internal timeout isn't invoked
-                    settings.timeout = 0
-                }
-
-                var url = parseURL(settings.url)
-                if (hash) url.hash = hash
-                options.requestUrl = stripInternalParams(url)
-            }
-
-            options.complete = function(xhr, textStatus) {
-                if (timeoutTimer)
-                    clearTimeout(timeoutTimer)
-
-                fire('pjax:complete', [xhr, textStatus, options])
-
-                fire('pjax:end', [xhr, options])
-            }
-
-            options.error = function(xhr, textStatus, errorThrown) {
-                var container = extractContainer("", xhr, options)
-
-                var allowed = fire('pjax:error', [xhr, textStatus, errorThrown, options])
-                if (options.type == 'GET' && textStatus !== 'abort' && allowed) {
-                    locationReplace(container.url)
-                }
-            }
-
-            options.success = function(data, status, xhr) {
-                var previousState = pjax.state;
-
-                // If $.pjax.defaults.version is a function, invoke it first.
-                // Otherwise it can be a static string.
-                var currentVersion = (typeof $.pjax.defaults.version === 'function') ?
-                    $.pjax.defaults.version() :
-                    $.pjax.defaults.version
-
-                var latestVersion = xhr.getResponseHeader('X-PJAX-Version')
-
-                var container = extractContainer(data, xhr, options)
-
-                var url = parseURL(container.url)
-                if (hash) {
-                    url.hash = hash
-                    container.url = url.href
-                }
-
-                // If there is a layout version mismatch, hard load the new url
-                if (currentVersion && latestVersion && currentVersion !== latestVersion) {
-                    locationReplace(container.url)
-                    return
-                }
-
-                // If the new response is missing a body, hard load the page
-                if (!container.contents) {
-                    locationReplace(container.url)
-                    return
-                }
-
-                pjax.state = {
-                    id: options.id || uniqueId(),
-                    url: container.url,
-                    title: container.title,
-                    container: context.selector,
-                    fragment: options.fragment,
-                    timeout: options.timeout
-                }
-
-                if (options.push || options.replace) {
-                    window.history.replaceState(pjax.state, container.title, container.url)
-                }
-
-                // Clear out any focused controls before inserting new page contents.
-                try {
-                    document.activeElement.blur()
-                } catch (e) {}
-
-                if (container.title) document.title = container.title
-
-                fire('pjax:beforeReplace', [container.contents, options], {
-                    state: pjax.state,
-                    previousState: previousState
-                })
-                context.html(container.contents)
-
-                // FF bug: Won't autofocus fields that are inserted via JS.
-                // This behavior is incorrect. So if theres no current focus, autofocus
-                // the last field.
-                //
-                // http://www.w3.org/html/wg/drafts/html/master/forms.html
-                var autofocusEl = context.find('input[autofocus], textarea[autofocus]').last()[0]
-                if (autofocusEl && document.activeElement !== autofocusEl) {
-                    autofocusEl.focus();
-                }
-
-                executeScriptTags(container.scripts)
-
-                var scrollTo = options.scrollTo
-
-                // Ensure browser scrolls to the element referenced by the URL anchor
-                if (hash) {
-                    var name = decodeURIComponent(hash.slice(1))
-                    var target = document.getElementById(name) || document.getElementsByName(name)[0]
-                    if (target) scrollTo = $(target).offset().top
-                }
-
-                if (typeof scrollTo == 'number') $(window).scrollTop(scrollTo)
-
-                fire('pjax:success', [data, status, xhr, options])
-            }
-
-            // Initialize pjax.state for the initial page load. Assume we're
-            // using the container and options of the link we're loading for the
-            // back button to the initial page. This ensures good back button
-            // behavior.
-            if (!pjax.state) {
-                pjax.state = {
-                    id: uniqueId(),
-                    url: window.location.href,
-                    title: document.title,
-                    container: context.selector,
-                    fragment: options.fragment,
-                    timeout: options.timeout
-                }
-                window.history.replaceState(pjax.state, document.title)
-            }
-
-            // Cancel the current request if we're already pjaxing
-            abortXHR(pjax.xhr)
-
-            pjax.options = options
-            var xhr = pjax.xhr = $.ajax(options)
-
-            if (xhr.readyState > 0) {
-                if (options.push && !options.replace) {
-                    // Cache current container element before replacing it
-                    cachePush(pjax.state.id, cloneContents(context))
-
-                    window.history.pushState(null, "", options.requestUrl)
-                }
-
-                fire('pjax:start', [xhr, options])
-                fire('pjax:send', [xhr, options])
-            }
-
-            return pjax.xhr
-        }
-
-        // Public: Reload current page with pjax.
-        //
-        // Returns whatever $.pjax returns.
-        function pjaxReload(container, options) {
-            var defaults = {
-                url: window.location.href,
-                push: false,
-                replace: true,
-                scrollTo: false
-            }
-
-            return pjax($.extend(defaults, optionsFor(container, options)))
-        }
-
-        // Internal: Hard replace current state with url.
-        //
-        // Work for around WebKit
-        //   https://bugs.webkit.org/show_bug.cgi?id=93506
-        //
-        // Returns nothing.
-        function locationReplace(url) {
-            window.history.replaceState(null, "", pjax.state.url)
-            window.location.replace(url)
-        }
-
-        var initialPop = true
-        var initialURL = window.location.href
-        var initialState = window.history.state
-
-        // Initialize $.pjax.state if possible
-        // Happens when reloading a page and coming forward from a different
-        // session history.
-        if (initialState && initialState.container) {
-            pjax.state = initialState
-        }
-
-        // Non-webkit browsers don't fire an initial popstate event
-        if ('state' in window.history) {
-            initialPop = false
-        }
-
-        // popstate handler takes care of the back and forward buttons
-        //
-        // You probably shouldn't use pjax on pages with other pushState
-        // stuff yet.
-        function onPjaxPopstate(event) {
-
-            // Hitting back or forward should override any pending PJAX request.
-            if (!initialPop) {
-                abortXHR(pjax.xhr)
-            }
-
-            var previousState = pjax.state
-            var state = event.state
-            var direction
-
-            if (state && state.container) {
-                // When coming forward from a separate history session, will get an
-                // initial pop with a state we are already at. Skip reloading the current
-                // page.
-                if (initialPop && initialURL == state.url) return
-
-                if (previousState) {
-                    // If popping back to the same state, just skip.
-                    // Could be clicking back from hashchange rather than a pushState.
-                    if (previousState.id === state.id) return
-
-                    // Since state IDs always increase, we can deduce the navigation direction
-                    direction = previousState.id < state.id ? 'forward' : 'back'
-                }
-
-                var cache = cacheMapping[state.id] || []
-                var container = $(cache[0] || state.container),
-                    contents = cache[1]
-
-                if (container.length) {
-                    if (previousState) {
-                        // Cache current container before replacement and inform the
-                        // cache which direction the history shifted.
-                        cachePop(direction, previousState.id, cloneContents(container))
-                    }
-
-                    var popstateEvent = $.Event('pjax:popstate', {
-                        state: state,
-                        direction: direction
-                    })
-                    container.trigger(popstateEvent)
-
-                    var options = {
-                        id: state.id,
-                        url: state.url,
-                        container: container,
-                        push: false,
-                        fragment: state.fragment,
-                        timeout: state.timeout,
-                        scrollTo: false
-                    }
-
-                    if (contents) {
-                        container.trigger('pjax:start', [null, options])
-
-                        pjax.state = state
-                        if (state.title) document.title = state.title
-                        var beforeReplaceEvent = $.Event('pjax:beforeReplace', {
-                            state: state,
-                            previousState: previousState
-                        })
-                        container.trigger(beforeReplaceEvent, [contents, options])
-                        container.html(contents)
-
-                        container.trigger('pjax:end', [null, options])
-                    } else {
-                        pjax(options)
-                    }
-
-                    // Force reflow/relayout before the browser tries to restore the
-                    // scroll position.
-                    container[0].offsetHeight
-                } else {
-                    locationReplace(location.href)
-                }
-            }
-            initialPop = false
-        }
-
-        // Fallback version of main pjax function for browsers that don't
-        // support pushState.
-        //
-        // Returns nothing since it retriggers a hard form submission.
-        function fallbackPjax(options) {
-            var url = $.isFunction(options.url) ? options.url() : options.url,
-                method = options.type ? options.type.toUpperCase() : 'GET'
-
-            var form = $('<form>', {
-                method: method === 'GET' ? 'GET' : 'POST',
-                action: url,
-                style: 'display:none'
-            })
-
-            if (method !== 'GET' && method !== 'POST') {
-                form.append($('<input>', {
-                    type: 'hidden',
-                    name: '_method',
-                    value: method.toLowerCase()
-                }))
-            }
-
-            var data = options.data
-            if (typeof data === 'string') {
-                $.each(data.split('&'), function(index, value) {
-                    var pair = value.split('=')
-                    form.append($('<input>', {
-                        type: 'hidden',
-                        name: pair[0],
-                        value: pair[1]
-                    }))
-                })
-            } else if ($.isArray(data)) {
-                $.each(data, function(index, value) {
-                    form.append($('<input>', {
-                        type: 'hidden',
-                        name: value.name,
-                        value: value.value
-                    }))
-                })
-            } else if (typeof data === 'object') {
-                var key
-                for (key in data)
-                    form.append($('<input>', {
-                        type: 'hidden',
-                        name: key,
-                        value: data[key]
-                    }))
-            }
-
-            $(document.body).append(form)
-            form.submit()
-        }
-
-        // Internal: Abort an XmlHttpRequest if it hasn't been completed,
-        // also removing its event handlers.
-        function abortXHR(xhr) {
-            if (xhr && xhr.readyState < 4) {
-                xhr.onreadystatechange = $.noop
-                xhr.abort()
-            }
-        }
-
-        // Internal: Generate unique id for state object.
-        //
-        // Use a timestamp instead of a counter since ids should still be
-        // unique across page loads.
-        //
-        // Returns Number.
-        function uniqueId() {
-            return (new Date).getTime()
-        }
-
-        function cloneContents(container) {
-            var cloned = container.clone()
-                // Unmark script tags as already being eval'd so they can get executed again
-                // when restored from cache. HAXX: Uses jQuery internal method.
-            cloned.find('script').each(function() {
-                if (!this.src) jQuery._data(this, 'globalEval', false)
-            })
-            return [container.selector, cloned.contents()]
-        }
-
-        // Internal: Strip internal query params from parsed URL.
-        //
-        // Returns sanitized url.href String.
-        function stripInternalParams(url) {
-            url.search = url.search.replace(/([?&])(_pjax|_)=[^&]*/g, '')
-            return url.href.replace(/\?($|#)/, '$1')
-        }
-
-        // Internal: Parse URL components and returns a Locationish object.
-        //
-        // url - String URL
-        //
-        // Returns HTMLAnchorElement that acts like Location.
-        function parseURL(url) {
-            var a = document.createElement('a')
-            a.href = url
-            return a
-        }
-
-        // Internal: Return the `href` component of given URL object with the hash
-        // portion removed.
-        //
-        // location - Location or HTMLAnchorElement
-        //
-        // Returns String
-        function stripHash(location) {
-            return location.href.replace(/#.*/, '')
-        }
-
-        // Internal: Build options Object for arguments.
-        //
-        // For convenience the first parameter can be either the container or
-        // the options object.
-        //
-        // Examples
-        //
-        //   optionsFor('#container')
-        //   // => {container: '#container'}
-        //
-        //   optionsFor('#container', {push: true})
-        //   // => {container: '#container', push: true}
-        //
-        //   optionsFor({container: '#container', push: true})
-        //   // => {container: '#container', push: true}
-        //
-        // Returns options Object.
-        function optionsFor(container, options) {
-            // Both container and options
-            if (container && options)
-                options.container = container
-
-            // First argument is options Object
-            else if ($.isPlainObject(container))
-                options = container
-
-            // Only container
-            else
-                options = {
-                    container: container
-                }
-
-            // Find and validate container
-            if (options.container)
-                options.container = findContainerFor(options.container)
-
-            return options
-        }
-
-        // Internal: Find container element for a variety of inputs.
-        //
-        // Because we can't persist elements using the history API, we must be
-        // able to find a String selector that will consistently find the Element.
-        //
-        // container - A selector String, jQuery object, or DOM Element.
-        //
-        // Returns a jQuery object whose context is `document` and has a selector.
-        function findContainerFor(container) {
-            container = $(container)
-
-            if (!container.length) {
-                throw "no pjax container for " + container.selector
-            } else if (container.selector !== '' && container.context === document) {
-                return container
-            } else if (container.attr('id')) {
-                return $('#' + container.attr('id'))
-            } else {
-                throw "cant get selector for pjax container!"
-            }
-        }
-
-        // Internal: Filter and find all elements matching the selector.
-        //
-        // Where $.fn.find only matches descendants, findAll will test all the
-        // top level elements in the jQuery object as well.
-        //
-        // elems    - jQuery object of Elements
-        // selector - String selector to match
-        //
-        // Returns a jQuery object.
-        function findAll(elems, selector) {
-            return elems.filter(selector).add(elems.find(selector));
-        }
-
-        function parseHTML(html) {
-            return $.parseHTML(html, document, true)
-        }
-
-        // Internal: Extracts container and metadata from response.
-        //
-        // 1. Extracts X-PJAX-URL header if set
-        // 2. Extracts inline <title> tags
-        // 3. Builds response Element and extracts fragment if set
-        //
-        // data    - String response data
-        // xhr     - XHR response
-        // options - pjax options Object
-        //
-        // Returns an Object with url, title, and contents keys.
-        function extractContainer(data, xhr, options) {
-            var obj = {},
-                fullDocument = /<html/i.test(data)
-
-            // Prefer X-PJAX-URL header if it was set, otherwise fallback to
-            // using the original requested url.
-            var serverUrl = xhr.getResponseHeader('X-PJAX-URL')
-            obj.url = serverUrl ? stripInternalParams(parseURL(serverUrl)) : options.requestUrl
-
-            // Attempt to parse response html into elements
-            if (fullDocument) {
-                var $head = $(parseHTML(data.match(/<head[^>]*>([\s\S.]*)<\/head>/i)[0]))
-                var $body = $(parseHTML(data.match(/<body[^>]*>([\s\S.]*)<\/body>/i)[0]))
-            } else {
-                var $head = $body = $(parseHTML(data))
-            }
-
-            // If response data is empty, return fast
-            if ($body.length === 0)
-                return obj
-
-            // If there's a <title> tag in the header, use it as
-            // the page's title.
-            obj.title = findAll($head, 'title').last().text()
-
-            if (options.fragment) {
-                // If they specified a fragment, look for it in the response
-                // and pull it out.
-                if (options.fragment === 'body') {
-                    var $fragment = $body
-                } else {
-                    var $fragment = findAll($body, options.fragment).first()
-                }
-
-                if ($fragment.length) {
-                    obj.contents = options.fragment === 'body' ? $fragment : $fragment.contents()
-
-                    // If there's no title, look for data-title and title attributes
-                    // on the fragment
-                    if (!obj.title)
-                        obj.title = $fragment.attr('title') || $fragment.data('title')
-                }
-
-            } else if (!fullDocument) {
-                obj.contents = $body
-            }
-
-            // Clean up any <title> tags
-            if (obj.contents) {
-                // Remove any parent title elements
-                obj.contents = obj.contents.not(function() {
-                    return $(this).is('title')
-                })
-
-                // Then scrub any titles from their descendants
-                obj.contents.find('title').remove()
-
-                // Gather all script[src] elements
-                obj.scripts = findAll(obj.contents, 'script[src]').remove()
-                obj.contents = obj.contents.not(obj.scripts)
-            }
-
-            // Trim any whitespace off the title
-            if (obj.title) obj.title = $.trim(obj.title)
-
-            return obj
-        }
-
-        // Load an execute scripts using standard script request.
-        //
-        // Avoids jQuery's traditional $.getScript which does a XHR request and
-        // globalEval.
-        //
-        // scripts - jQuery object of script Elements
-        //
-        // Returns nothing.
-        function executeScriptTags(scripts) {
-            if (!scripts) return
-
-            var existingScripts = $('script[src]')
-
-            scripts.each(function() {
-                var src = this.src
-                var matchedScripts = existingScripts.filter(function() {
-                    return this.src === src
-                })
-                if (matchedScripts.length) return
-
-                var script = document.createElement('script')
-                var type = $(this).attr('type')
-                if (type) script.type = type
-                script.src = $(this).attr('src')
-                document.head.appendChild(script)
-            })
-        }
-
-        // Internal: History DOM caching class.
-        var cacheMapping = {}
-        var cacheForwardStack = []
-        var cacheBackStack = []
-
-        // Push previous state id and container contents into the history
-        // cache. Should be called in conjunction with `pushState` to save the
-        // previous container contents.
-        //
-        // id    - State ID Number
-        // value - DOM Element to cache
-        //
-        // Returns nothing.
-        function cachePush(id, value) {
-            cacheMapping[id] = value
-            cacheBackStack.push(id)
-
-            // Remove all entries in forward history stack after pushing a new page.
-            trimCacheStack(cacheForwardStack, 0)
-
-            // Trim back history stack to max cache length.
-            trimCacheStack(cacheBackStack, pjax.defaults.maxCacheLength)
-        }
-
-        // Shifts cache from directional history cache. Should be
-        // called on `popstate` with the previous state id and container
-        // contents.
-        //
-        // direction - "forward" or "back" String
-        // id        - State ID Number
-        // value     - DOM Element to cache
-        //
-        // Returns nothing.
-        function cachePop(direction, id, value) {
-            var pushStack, popStack
-            cacheMapping[id] = value
-
-            if (direction === 'forward') {
-                pushStack = cacheBackStack
-                popStack = cacheForwardStack
-            } else {
-                pushStack = cacheForwardStack
-                popStack = cacheBackStack
-            }
-
-            pushStack.push(id)
-            if (id = popStack.pop())
-                delete cacheMapping[id]
-
-            // Trim whichever stack we just pushed to to max cache length.
-            trimCacheStack(pushStack, pjax.defaults.maxCacheLength)
-        }
-
-        // Trim a cache stack (either cacheBackStack or cacheForwardStack) to be no
-        // longer than the specified length, deleting cached DOM elements as necessary.
-        //
-        // stack  - Array of state IDs
-        // length - Maximum length to trim to
-        //
-        // Returns nothing.
-        function trimCacheStack(stack, length) {
-            while (stack.length > length)
-                delete cacheMapping[stack.shift()]
-        }
-
-        // Public: Find version identifier for the initial page load.
-        //
-        // Returns String version or undefined.
-        function findVersion() {
-            return $('meta').filter(function() {
-                var name = $(this).attr('http-equiv')
-                return name && name.toUpperCase() === 'X-PJAX-VERSION'
-            }).attr('content')
-        }
-
-        // Install pjax functions on $.pjax to enable pushState behavior.
-        //
-        // Does nothing if already enabled.
-        //
-        // Examples
-        //
-        //     $.pjax.enable()
-        //
-        // Returns nothing.
-        function enable() {
-            $.fn.pjax = fnPjax
-            $.pjax = pjax
-            $.pjax.enable = $.noop
-            $.pjax.disable = disable
-            $.pjax.click = handleClick
-            $.pjax.submit = handleSubmit
-            $.pjax.reload = pjaxReload
-            $.pjax.defaults = {
-                timeout: 650,
-                push: true,
-                replace: false,
-                type: 'GET',
-                dataType: 'html',
-                scrollTo: 0,
-                maxCacheLength: 20,
-                version: findVersion
-            }
-            $(window).on('popstate.pjax', onPjaxPopstate)
-        }
-
-        // Disable pushState behavior.
-        //
-        // This is the case when a browser doesn't support pushState. It is
-        // sometimes useful to disable pushState for debugging on a modern
-        // browser.
-        //
-        // Examples
-        //
-        //     $.pjax.disable()
-        //
-        // Returns nothing.
-        function disable() {
-            $.fn.pjax = function() {
-                return this
-            }
-            $.pjax = fallbackPjax
-            $.pjax.enable = enable
-            $.pjax.disable = $.noop
-            $.pjax.click = $.noop
-            $.pjax.submit = $.noop
-            $.pjax.reload = function() {
-                window.location.reload()
-            }
-
-            $(window).off('popstate.pjax', onPjaxPopstate)
-        }
-
-        // Add the state property to jQuery's event object so we can use it in
-        // $(window).bind('popstate')
-        if ($.inArray('state', $.event.props) < 0)
-            $.event.props.push('state')
-
-        // Is pjax supported by this browser?
-        $.support.pjax =
-            window.history && window.history.pushState && window.history.replaceState &&
-            // pushState isn't reliable on iOS until 5.
-            !navigator.userAgent.match(/((iPod|iPhone|iPad).+\bOS\s+[1-4]\D|WebApps\/.+CFNetwork)/)
-
-        $.support.pjax ? enable() : disable()
-
-    })(jQuery);
-    //输出接口
-    exports('pjax');
-});
\ No newline at end of file
+;layui.define(['jquery'], function (exports) {
+	var jQuery = layui.jquery;
+
+	/*!
+	 * Copyright 2012, Chris Wanstrath
+	 * Released under the MIT License
+	 * https://github.com/defunkt/jquery-pjax
+	 */
+
+	(function ($) {
+
+		// When called on a container with a selector, fetches the href with
+		// ajax into the container or with the data-pjax attribute on the link
+		// itself.
+		//
+		// Tries to make sure the back button and ctrl+click work the way
+		// you'd expect.
+		//
+		// Exported as $.fn.pjax
+		//
+		// Accepts a jQuery ajax options object that may include these
+		// pjax specific options:
+		//
+		//
+		// container - Where to stick the response body. Usually a String selector.
+		//             $(container).html(xhr.responseBody)
+		//             (default: current jquery context)
+		//      push - Whether to pushState the URL. Defaults to true (of course).
+		//   replace - Want to use replaceState instead? That's cool.
+		//
+		// For convenience the second parameter can be either the container or
+		// the options object.
+		//
+		// Returns the jQuery object
+		function fnPjax(selector, container, options) {
+			var context = this
+			return this.on('click.pjax', selector, function (event) {
+				var opts = $.extend({}, optionsFor(container, options))
+				if (!opts.container)
+					opts.container = $(this).attr('data-pjax') || context
+				handleClick(event, opts)
+			})
+		}
+
+		// Public: pjax on click handler
+		//
+		// Exported as $.pjax.click.
+		//
+		// event   - "click" jQuery.Event
+		// options - pjax options
+		//
+		// Examples
+		//
+		//   $(document).on('click', 'a', $.pjax.click)
+		//   // is the same as
+		//   $(document).pjax('a')
+		//
+		//  $(document).on('click', 'a', function(event) {
+		//    var container = $(this).closest('[data-pjax-container]')
+		//    $.pjax.click(event, container)
+		//  })
+		//
+		// Returns nothing.
+		function handleClick(event, container, options) {
+			options = optionsFor(container, options)
+
+			var link = event.currentTarget
+
+			if (link.tagName.toUpperCase() !== 'A')
+				throw "$.fn.pjax or $.pjax.click requires an anchor element"
+
+			// Middle click, cmd click, and ctrl click should open
+			// links in a new tab as normal.
+			if (event.which > 1 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey)
+				return
+
+			// Ignore cross origin links
+			if (location.protocol !== link.protocol || location.hostname !== link.hostname)
+				return
+
+			// Ignore case when a hash is being tacked on the current URL
+			if (link.href.indexOf('#') > -1 && stripHash(link) == stripHash(location))
+				return
+
+			// Ignore event with default prevented
+			if (event.isDefaultPrevented())
+				return
+
+			var defaults = {
+				url: link.href,
+				container: $(link).attr('data-pjax'),
+				target: link
+			}
+
+			var opts = $.extend({}, defaults, options)
+			var clickEvent = $.Event('pjax:click')
+			$(link).trigger(clickEvent, [opts])
+
+			if (!clickEvent.isDefaultPrevented()) {
+				pjax(opts)
+				event.preventDefault()
+				$(link).trigger('pjax:clicked', [opts])
+			}
+		}
+
+		// Public: pjax on form submit handler
+		//
+		// Exported as $.pjax.submit
+		//
+		// event   - "click" jQuery.Event
+		// options - pjax options
+		//
+		// Examples
+		//
+		//  $(document).on('submit', 'form', function(event) {
+		//    var container = $(this).closest('[data-pjax-container]')
+		//    $.pjax.submit(event, container)
+		//  })
+		//
+		// Returns nothing.
+		function handleSubmit(event, container, options) {
+			options = optionsFor(container, options)
+
+			var form = event.currentTarget
+
+			if (form.tagName.toUpperCase() !== 'FORM')
+				throw "$.pjax.submit requires a form element"
+
+			var defaults = {
+				type: form.method.toUpperCase(),
+				url: form.action,
+				container: $(form).attr('data-pjax'),
+				target: form
+			}
+
+			if (defaults.type !== 'GET' && window.FormData !== undefined) {
+				defaults.data = new FormData(form);
+				defaults.processData = false;
+				defaults.contentType = false;
+			} else {
+				// Can't handle file uploads, exit
+				if ($(form).find(':file').length) {
+					return;
+				}
+
+				// Fallback to manually serializing the fields
+				defaults.data = $(form).serializeArray();
+			}
+
+			pjax($.extend({}, defaults, options))
+
+			event.preventDefault()
+		}
+
+		// Loads a URL with ajax, puts the response body inside a container,
+		// then pushState()'s the loaded URL.
+		//
+		// Works just like $.ajax in that it accepts a jQuery ajax
+		// settings object (with keys like url, type, data, etc).
+		//
+		// Accepts these extra keys:
+		//
+		// container - Where to stick the response body.
+		//             $(container).html(xhr.responseBody)
+		//      push - Whether to pushState the URL. Defaults to true (of course).
+		//   replace - Want to use replaceState instead? That's cool.
+		//
+		// Use it just like $.ajax:
+		//
+		//   var xhr = $.pjax({ url: this.href, container: '#main' })
+		//   console.log( xhr.readyState )
+		//
+		// Returns whatever $.ajax returns.
+		function pjax(options) {
+			options = $.extend(true, {}, $.ajaxSettings, pjax.defaults, options)
+
+			if ($.isFunction(options.url)) {
+				options.url = options.url()
+			}
+
+			var target = options.target
+
+			var hash = parseURL(options.url).hash
+
+			var context = options.context = findContainerFor(options.container)
+
+			// We want the browser to maintain two separate internal caches: one
+			// for pjax'd partial page loads and one for normal page loads.
+			// Without adding this secret parameter, some browsers will often
+			// confuse the two.
+			if (!options.data) options.data = {}
+			if ($.isArray(options.data)) {
+				options.data.push({
+					name: '_pjax',
+					value: context.selector
+				})
+			} else {
+				options.data._pjax = context.selector
+			}
+
+			function fire(type, args, props) {
+				if (!props) props = {}
+				props.relatedTarget = target
+				var event = $.Event(type, props)
+				context.trigger(event, args)
+				return !event.isDefaultPrevented()
+			}
+
+			var timeoutTimer
+
+			options.beforeSend = function (xhr, settings) {
+				// No timeout for non-GET requests
+				// Its not safe to request the resource again with a fallback method.
+				if (settings.type !== 'GET') {
+					settings.timeout = 0
+				}
+
+				xhr.setRequestHeader('X-PJAX', 'true')
+				xhr.setRequestHeader('X-PJAX-Container', context.selector)
+
+				if (!fire('pjax:beforeSend', [xhr, settings]))
+					return false
+
+				if (settings.timeout > 0) {
+					timeoutTimer = setTimeout(function () {
+						if (fire('pjax:timeout', [xhr, options]))
+							xhr.abort('timeout')
+					}, settings.timeout)
+
+					// Clear timeout setting so jquerys internal timeout isn't invoked
+					settings.timeout = 0
+				}
+
+				var url = parseURL(settings.url)
+				if (hash) url.hash = hash
+				options.requestUrl = stripInternalParams(url)
+			}
+
+			options.complete = function (xhr, textStatus) {
+				if (timeoutTimer)
+					clearTimeout(timeoutTimer)
+
+				fire('pjax:complete', [xhr, textStatus, options])
+
+				fire('pjax:end', [xhr, options])
+			}
+
+			options.error = function (xhr, textStatus, errorThrown) {
+				var container = extractContainer("", xhr, options)
+
+				var allowed = fire('pjax:error', [xhr, textStatus, errorThrown, options])
+				if (options.type == 'GET' && textStatus !== 'abort' && allowed) {
+					locationReplace(container.url)
+				}
+			}
+
+			options.success = function (data, status, xhr) {
+				var previousState = pjax.state;
+
+				// If $.pjax.defaults.version is a function, invoke it first.
+				// Otherwise it can be a static string.
+				var currentVersion = (typeof $.pjax.defaults.version === 'function') ?
+					$.pjax.defaults.version() :
+					$.pjax.defaults.version
+
+				var latestVersion = xhr.getResponseHeader('X-PJAX-Version')
+
+				var container = extractContainer(data, xhr, options)
+
+				var url = parseURL(container.url)
+				if (hash) {
+					url.hash = hash
+					container.url = url.href
+				}
+
+				// If there is a layout version mismatch, hard load the new url
+				if (currentVersion && latestVersion && currentVersion !== latestVersion) {
+					locationReplace(container.url)
+					return
+				}
+
+				// If the new response is missing a body, hard load the page
+				if (!container.contents) {
+					locationReplace(container.url)
+					return
+				}
+
+				pjax.state = {
+					id: options.id || uniqueId(),
+					url: container.url,
+					title: container.title,
+					container: context.selector,
+					fragment: options.fragment,
+					timeout: options.timeout
+				}
+
+				if (options.push || options.replace) {
+					window.history.replaceState(pjax.state, container.title, container.url)
+				}
+
+				// Clear out any focused controls before inserting new page contents.
+				try {
+					document.activeElement.blur()
+				} catch (e) {
+				}
+
+				if (container.title) document.title = container.title
+
+				fire('pjax:beforeReplace', [container.contents, options], {
+					state: pjax.state,
+					previousState: previousState
+				})
+				context.html(container.contents)
+
+				// FF bug: Won't autofocus fields that are inserted via JS.
+				// This behavior is incorrect. So if theres no current focus, autofocus
+				// the last field.
+				//
+				// http://www.w3.org/html/wg/drafts/html/master/forms.html
+				var autofocusEl = context.find('input[autofocus], textarea[autofocus]').last()[0]
+				if (autofocusEl && document.activeElement !== autofocusEl) {
+					autofocusEl.focus();
+				}
+
+				executeScriptTags(container.scripts)
+
+				var scrollTo = options.scrollTo
+
+				// Ensure browser scrolls to the element referenced by the URL anchor
+				if (hash) {
+					var name = decodeURIComponent(hash.slice(1))
+					var target = document.getElementById(name) || document.getElementsByName(name)[0]
+					if (target) scrollTo = $(target).offset().top
+				}
+
+				if (typeof scrollTo == 'number') $(window).scrollTop(scrollTo)
+
+				fire('pjax:success', [data, status, xhr, options])
+			}
+
+			// Initialize pjax.state for the initial page load. Assume we're
+			// using the container and options of the link we're loading for the
+			// back button to the initial page. This ensures good back button
+			// behavior.
+			if (!pjax.state) {
+				pjax.state = {
+					id: uniqueId(),
+					url: window.location.href,
+					title: document.title,
+					container: context.selector,
+					fragment: options.fragment,
+					timeout: options.timeout
+				}
+				window.history.replaceState(pjax.state, document.title)
+			}
+
+			// Cancel the current request if we're already pjaxing
+			abortXHR(pjax.xhr)
+
+			pjax.options = options
+			var xhr = pjax.xhr = $.ajax(options)
+
+			if (xhr.readyState > 0) {
+				if (options.push && !options.replace) {
+					// Cache current container element before replacing it
+					cachePush(pjax.state.id, cloneContents(context))
+
+					window.history.pushState(null, "", options.requestUrl)
+				}
+
+				fire('pjax:start', [xhr, options])
+				fire('pjax:send', [xhr, options])
+			}
+
+			return pjax.xhr
+		}
+
+		// Public: Reload current page with pjax.
+		//
+		// Returns whatever $.pjax returns.
+		function pjaxReload(container, options) {
+			var defaults = {
+				url: window.location.href,
+				push: false,
+				replace: true,
+				scrollTo: false
+			}
+
+			return pjax($.extend(defaults, optionsFor(container, options)))
+		}
+
+		// Internal: Hard replace current state with url.
+		//
+		// Work for around WebKit
+		//   https://bugs.webkit.org/show_bug.cgi?id=93506
+		//
+		// Returns nothing.
+		function locationReplace(url) {
+			window.history.replaceState(null, "", pjax.state.url)
+			window.location.replace(url)
+		}
+
+		var initialPop = true
+		var initialURL = window.location.href
+		var initialState = window.history.state
+
+		// Initialize $.pjax.state if possible
+		// Happens when reloading a page and coming forward from a different
+		// session history.
+		if (initialState && initialState.container) {
+			pjax.state = initialState
+		}
+
+		// Non-webkit browsers don't fire an initial popstate event
+		if ('state' in window.history) {
+			initialPop = false
+		}
+
+		// popstate handler takes care of the back and forward buttons
+		//
+		// You probably shouldn't use pjax on pages with other pushState
+		// stuff yet.
+		function onPjaxPopstate(event) {
+
+			// Hitting back or forward should override any pending PJAX request.
+			if (!initialPop) {
+				abortXHR(pjax.xhr)
+			}
+
+			var previousState = pjax.state
+			var state = event.state
+			var direction
+
+			if (state && state.container) {
+				// When coming forward from a separate history session, will get an
+				// initial pop with a state we are already at. Skip reloading the current
+				// page.
+				if (initialPop && initialURL == state.url) return
+
+				if (previousState) {
+					// If popping back to the same state, just skip.
+					// Could be clicking back from hashchange rather than a pushState.
+					if (previousState.id === state.id) return
+
+					// Since state IDs always increase, we can deduce the navigation direction
+					direction = previousState.id < state.id ? 'forward' : 'back'
+				}
+
+				var cache = cacheMapping[state.id] || []
+				var container = $(cache[0] || state.container),
+					contents = cache[1]
+
+				if (container.length) {
+					if (previousState) {
+						// Cache current container before replacement and inform the
+						// cache which direction the history shifted.
+						cachePop(direction, previousState.id, cloneContents(container))
+					}
+
+					var popstateEvent = $.Event('pjax:popstate', {
+						state: state,
+						direction: direction
+					})
+					container.trigger(popstateEvent)
+
+					var options = {
+						id: state.id,
+						url: state.url,
+						container: container,
+						push: false,
+						fragment: state.fragment,
+						timeout: state.timeout,
+						scrollTo: false
+					}
+
+					if (contents) {
+						container.trigger('pjax:start', [null, options])
+
+						pjax.state = state
+						if (state.title) document.title = state.title
+						var beforeReplaceEvent = $.Event('pjax:beforeReplace', {
+							state: state,
+							previousState: previousState
+						})
+						container.trigger(beforeReplaceEvent, [contents, options])
+						container.html(contents)
+
+						container.trigger('pjax:end', [null, options])
+					} else {
+						pjax(options)
+					}
+
+					// Force reflow/relayout before the browser tries to restore the
+					// scroll position.
+					container[0].offsetHeight
+				} else {
+					locationReplace(location.href)
+				}
+			}
+			initialPop = false
+		}
+
+		// Fallback version of main pjax function for browsers that don't
+		// support pushState.
+		//
+		// Returns nothing since it retriggers a hard form submission.
+		function fallbackPjax(options) {
+			var url = $.isFunction(options.url) ? options.url() : options.url,
+				method = options.type ? options.type.toUpperCase() : 'GET'
+
+			var form = $('<form>', {
+				method: method === 'GET' ? 'GET' : 'POST',
+				action: url,
+				style: 'display:none'
+			})
+
+			if (method !== 'GET' && method !== 'POST') {
+				form.append($('<input>', {
+					type: 'hidden',
+					name: '_method',
+					value: method.toLowerCase()
+				}))
+			}
+
+			var data = options.data
+			if (typeof data === 'string') {
+				$.each(data.split('&'), function (index, value) {
+					var pair = value.split('=')
+					form.append($('<input>', {
+						type: 'hidden',
+						name: pair[0],
+						value: pair[1]
+					}))
+				})
+			} else if ($.isArray(data)) {
+				$.each(data, function (index, value) {
+					form.append($('<input>', {
+						type: 'hidden',
+						name: value.name,
+						value: value.value
+					}))
+				})
+			} else if (typeof data === 'object') {
+				var key
+				for (key in data)
+					form.append($('<input>', {
+						type: 'hidden',
+						name: key,
+						value: data[key]
+					}))
+			}
+
+			$(document.body).append(form)
+			form.submit()
+		}
+
+		// Internal: Abort an XmlHttpRequest if it hasn't been completed,
+		// also removing its event handlers.
+		function abortXHR(xhr) {
+			if (xhr && xhr.readyState < 4) {
+				xhr.onreadystatechange = $.noop
+				xhr.abort()
+			}
+		}
+
+		// Internal: Generate unique id for state object.
+		//
+		// Use a timestamp instead of a counter since ids should still be
+		// unique across page loads.
+		//
+		// Returns Number.
+		function uniqueId() {
+			return (new Date).getTime()
+		}
+
+		function cloneContents(container) {
+			var cloned = container.clone()
+			// Unmark script tags as already being eval'd so they can get executed again
+			// when restored from cache. HAXX: Uses jQuery internal method.
+			cloned.find('script').each(function () {
+				if (!this.src) jQuery._data(this, 'globalEval', false)
+			})
+			return [container.selector, cloned.contents()]
+		}
+
+		// Internal: Strip internal query params from parsed URL.
+		//
+		// Returns sanitized url.href String.
+		function stripInternalParams(url) {
+			url.search = url.search.replace(/([?&])(_pjax|_)=[^&]*/g, '')
+			return url.href.replace(/\?($|#)/, '$1')
+		}
+
+		// Internal: Parse URL components and returns a Locationish object.
+		//
+		// url - String URL
+		//
+		// Returns HTMLAnchorElement that acts like Location.
+		function parseURL(url) {
+			var a = document.createElement('a')
+			a.href = url
+			return a
+		}
+
+		// Internal: Return the `href` component of given URL object with the hash
+		// portion removed.
+		//
+		// location - Location or HTMLAnchorElement
+		//
+		// Returns String
+		function stripHash(location) {
+			return location.href.replace(/#.*/, '')
+		}
+
+		// Internal: Build options Object for arguments.
+		//
+		// For convenience the first parameter can be either the container or
+		// the options object.
+		//
+		// Examples
+		//
+		//   optionsFor('#container')
+		//   // => {container: '#container'}
+		//
+		//   optionsFor('#container', {push: true})
+		//   // => {container: '#container', push: true}
+		//
+		//   optionsFor({container: '#container', push: true})
+		//   // => {container: '#container', push: true}
+		//
+		// Returns options Object.
+		function optionsFor(container, options) {
+			// Both container and options
+			if (container && options)
+				options.container = container
+
+			// First argument is options Object
+			else if ($.isPlainObject(container))
+				options = container
+
+			// Only container
+			else
+				options = {
+					container: container
+				}
+
+			// Find and validate container
+			if (options.container)
+				options.container = findContainerFor(options.container)
+
+			return options
+		}
+
+		// Internal: Find container element for a variety of inputs.
+		//
+		// Because we can't persist elements using the history API, we must be
+		// able to find a String selector that will consistently find the Element.
+		//
+		// container - A selector String, jQuery object, or DOM Element.
+		//
+		// Returns a jQuery object whose context is `document` and has a selector.
+		function findContainerFor(container) {
+			container = $(container)
+
+			if (!container.length) {
+				throw "no pjax container for " + container.selector
+			} else if (container.selector !== '' && container.context === document) {
+				return container
+			} else if (container.attr('id')) {
+				return $('#' + container.attr('id'))
+			} else {
+				throw "cant get selector for pjax container!"
+			}
+		}
+
+		// Internal: Filter and find all elements matching the selector.
+		//
+		// Where $.fn.find only matches descendants, findAll will test all the
+		// top level elements in the jQuery object as well.
+		//
+		// elems    - jQuery object of Elements
+		// selector - String selector to match
+		//
+		// Returns a jQuery object.
+		function findAll(elems, selector) {
+			return elems.filter(selector).add(elems.find(selector));
+		}
+
+		function parseHTML(html) {
+			return $.parseHTML(html, document, true)
+		}
+
+		// Internal: Extracts container and metadata from response.
+		//
+		// 1. Extracts X-PJAX-URL header if set
+		// 2. Extracts inline <title> tags
+		// 3. Builds response Element and extracts fragment if set
+		//
+		// data    - String response data
+		// xhr     - XHR response
+		// options - pjax options Object
+		//
+		// Returns an Object with url, title, and contents keys.
+		function extractContainer(data, xhr, options) {
+			var obj = {},
+				fullDocument = /<html/i.test(data)
+
+			// Prefer X-PJAX-URL header if it was set, otherwise fallback to
+			// using the original requested url.
+			var serverUrl = xhr.getResponseHeader('X-PJAX-URL')
+			obj.url = serverUrl ? stripInternalParams(parseURL(serverUrl)) : options.requestUrl
+
+			// Attempt to parse response html into elements
+			if (fullDocument) {
+				var $head = $(parseHTML(data.match(/<head[^>]*>([\s\S.]*)<\/head>/i)[0]))
+				var $body = $(parseHTML(data.match(/<body[^>]*>([\s\S.]*)<\/body>/i)[0]))
+			} else {
+				var $head = $body = $(parseHTML(data))
+			}
+
+			// If response data is empty, return fast
+			if ($body.length === 0)
+				return obj
+
+			// If there's a <title> tag in the header, use it as
+			// the page's title.
+			obj.title = findAll($head, 'title').last().text()
+
+			if (options.fragment) {
+				// If they specified a fragment, look for it in the response
+				// and pull it out.
+				if (options.fragment === 'body') {
+					var $fragment = $body
+				} else {
+					var $fragment = findAll($body, options.fragment).first()
+				}
+
+				if ($fragment.length) {
+					obj.contents = options.fragment === 'body' ? $fragment : $fragment.contents()
+
+					// If there's no title, look for data-title and title attributes
+					// on the fragment
+					if (!obj.title)
+						obj.title = $fragment.attr('title') || $fragment.data('title')
+				}
+
+			} else if (!fullDocument) {
+				obj.contents = $body
+			}
+
+			// Clean up any <title> tags
+			if (obj.contents) {
+				// Remove any parent title elements
+				obj.contents = obj.contents.not(function () {
+					return $(this).is('title')
+				})
+
+				// Then scrub any titles from their descendants
+				obj.contents.find('title').remove()
+
+				// Gather all script[src] elements
+				obj.scripts = findAll(obj.contents, 'script[src]').remove()
+				obj.contents = obj.contents.not(obj.scripts)
+			}
+
+			// Trim any whitespace off the title
+			if (obj.title) obj.title = $.trim(obj.title)
+
+			return obj
+		}
+
+		// Load an execute scripts using standard script request.
+		//
+		// Avoids jQuery's traditional $.getScript which does a XHR request and
+		// globalEval.
+		//
+		// scripts - jQuery object of script Elements
+		//
+		// Returns nothing.
+		function executeScriptTags(scripts) {
+			if (!scripts) return
+
+			var existingScripts = $('script[src]')
+
+			scripts.each(function () {
+				var src = this.src
+				var matchedScripts = existingScripts.filter(function () {
+					return this.src === src
+				})
+				if (matchedScripts.length) return
+
+				var script = document.createElement('script')
+				var type = $(this).attr('type')
+				if (type) script.type = type
+				script.src = $(this).attr('src')
+				document.head.appendChild(script)
+			})
+		}
+
+		// Internal: History DOM caching class.
+		var cacheMapping = {}
+		var cacheForwardStack = []
+		var cacheBackStack = []
+
+		// Push previous state id and container contents into the history
+		// cache. Should be called in conjunction with `pushState` to save the
+		// previous container contents.
+		//
+		// id    - State ID Number
+		// value - DOM Element to cache
+		//
+		// Returns nothing.
+		function cachePush(id, value) {
+			cacheMapping[id] = value
+			cacheBackStack.push(id)
+
+			// Remove all entries in forward history stack after pushing a new page.
+			trimCacheStack(cacheForwardStack, 0)
+
+			// Trim back history stack to max cache length.
+			trimCacheStack(cacheBackStack, pjax.defaults.maxCacheLength)
+		}
+
+		// Shifts cache from directional history cache. Should be
+		// called on `popstate` with the previous state id and container
+		// contents.
+		//
+		// direction - "forward" or "back" String
+		// id        - State ID Number
+		// value     - DOM Element to cache
+		//
+		// Returns nothing.
+		function cachePop(direction, id, value) {
+			var pushStack, popStack
+			cacheMapping[id] = value
+
+			if (direction === 'forward') {
+				pushStack = cacheBackStack
+				popStack = cacheForwardStack
+			} else {
+				pushStack = cacheForwardStack
+				popStack = cacheBackStack
+			}
+
+			pushStack.push(id)
+			if (id = popStack.pop())
+				delete cacheMapping[id]
+
+			// Trim whichever stack we just pushed to to max cache length.
+			trimCacheStack(pushStack, pjax.defaults.maxCacheLength)
+		}
+
+		// Trim a cache stack (either cacheBackStack or cacheForwardStack) to be no
+		// longer than the specified length, deleting cached DOM elements as necessary.
+		//
+		// stack  - Array of state IDs
+		// length - Maximum length to trim to
+		//
+		// Returns nothing.
+		function trimCacheStack(stack, length) {
+			while (stack.length > length)
+				delete cacheMapping[stack.shift()]
+		}
+
+		// Public: Find version identifier for the initial page load.
+		//
+		// Returns String version or undefined.
+		function findVersion() {
+			return $('meta').filter(function () {
+				var name = $(this).attr('http-equiv')
+				return name && name.toUpperCase() === 'X-PJAX-VERSION'
+			}).attr('content')
+		}
+
+		// Install pjax functions on $.pjax to enable pushState behavior.
+		//
+		// Does nothing if already enabled.
+		//
+		// Examples
+		//
+		//     $.pjax.enable()
+		//
+		// Returns nothing.
+		function enable() {
+			$.fn.pjax = fnPjax
+			$.pjax = pjax
+			$.pjax.enable = $.noop
+			$.pjax.disable = disable
+			$.pjax.click = handleClick
+			$.pjax.submit = handleSubmit
+			$.pjax.reload = pjaxReload
+			$.pjax.defaults = {
+				timeout: 650,
+				push: true,
+				replace: false,
+				type: 'GET',
+				dataType: 'html',
+				scrollTo: 0,
+				maxCacheLength: 20,
+				version: findVersion
+			}
+			$(window).on('popstate.pjax', onPjaxPopstate)
+		}
+
+		// Disable pushState behavior.
+		//
+		// This is the case when a browser doesn't support pushState. It is
+		// sometimes useful to disable pushState for debugging on a modern
+		// browser.
+		//
+		// Examples
+		//
+		//     $.pjax.disable()
+		//
+		// Returns nothing.
+		function disable() {
+			$.fn.pjax = function () {
+				return this
+			}
+			$.pjax = fallbackPjax
+			$.pjax.enable = enable
+			$.pjax.disable = $.noop
+			$.pjax.click = $.noop
+			$.pjax.submit = $.noop
+			$.pjax.reload = function () {
+				window.location.reload()
+			}
+
+			$(window).off('popstate.pjax', onPjaxPopstate)
+		}
+
+		// Add the state property to jQuery's event object so we can use it in
+		// $(window).bind('popstate')
+		if ($.inArray('state', $.event.props) < 0)
+			$.event.props.push('state')
+
+		// Is pjax supported by this browser?
+		$.support.pjax =
+			window.history && window.history.pushState && window.history.replaceState &&
+			// pushState isn't reliable on iOS until 5.
+			!navigator.userAgent.match(/((iPod|iPhone|iPad).+\bOS\s+[1-4]\D|WebApps\/.+CFNetwork)/)
+
+		$.support.pjax ? enable() : disable()
+
+	})(jQuery);
+	//输出接口
+	exports('pjax');
+});
diff --git a/len-sys/src/main/resources/plugin/build/js/spa.js b/len-sys/src/main/resources/plugin/build/js/spa.js
index 56f6be0..0159b10 100644
--- a/len-sys/src/main/resources/plugin/build/js/spa.js
+++ b/len-sys/src/main/resources/plugin/build/js/spa.js
@@ -1,42 +1,42 @@
-layui.define(['layer', 'nprogress', 'utils'], function(exports) {
-    var $ = layui.jquery,
-        layer = layui.layer,
-        _modName = 'spa',
-        utils = layui.utils;
+layui.define(['layer', 'nprogress', 'utils'], function (exports) {
+	var $ = layui.jquery,
+		layer = layui.layer,
+		_modName = 'spa',
+		utils = layui.utils;
 
-    var Spa = function() {
-        this.config = {
-            elem: '#container',
-            openWait: true
-        };
-        this.v = '1.0.0';
-    };
-    Spa.fn = Spa.prototype;
-    Spa.fn.set = function(options) {
-        var that = this;
-        $.extend(true, that.config, options);
-        return that;
-    };
-    Spa.fn.render = function(url, callback) {
-        var that = this,
-            _config = that.config,
-            _elem = $(_config.elem),
-            loadIndex = undefined;
-        NProgress.start();
-        if (_config.openWait)
-            loadIndex = utils.load();
-        var html = utils.getBodyContent(utils.loadHtml(url + '?v=' + new Date().getTime(), function() {
-            setTimeout(function() {
-                NProgress.done();
-                _config.openWait && loadIndex && layer.close(loadIndex);
-            }, 500);
-            typeof callback === 'function' && callback();
-        }));
-        _elem.html(html);
-    };
+	var Spa = function () {
+		this.config = {
+			elem: '#container',
+			openWait: true
+		};
+		this.v = '1.0.0';
+	};
+	Spa.fn = Spa.prototype;
+	Spa.fn.set = function (options) {
+		var that = this;
+		$.extend(true, that.config, options);
+		return that;
+	};
+	Spa.fn.render = function (url, callback) {
+		var that = this,
+			_config = that.config,
+			_elem = $(_config.elem),
+			loadIndex = undefined;
+		NProgress.start();
+		if (_config.openWait)
+			loadIndex = utils.load();
+		var html = utils.getBodyContent(utils.loadHtml(url + '?v=' + new Date().getTime(), function () {
+			setTimeout(function () {
+				NProgress.done();
+				_config.openWait && loadIndex && layer.close(loadIndex);
+			}, 500);
+			typeof callback === 'function' && callback();
+		}));
+		_elem.html(html);
+	};
 
 
-    var t = new Spa();
+	var t = new Spa();
 
-    exports('spa', t);
-});
\ No newline at end of file
+	exports('spa', t);
+});
diff --git a/len-sys/src/main/resources/plugin/build/js/tab.js b/len-sys/src/main/resources/plugin/build/js/tab.js
index 88d8b8d..8591f2d 100644
--- a/len-sys/src/main/resources/plugin/build/js/tab.js
+++ b/len-sys/src/main/resources/plugin/build/js/tab.js
@@ -7,385 +7,385 @@
  * LICENSE:MIT
  */
 layui.define(['layrouter', 'jquery', 'element', 'nprogress', 'utils'], function (exports) {
-    var $ = layui.jquery,
-        _modName = 'tab',
-        layrouter = layui.layrouter,
-        element = layui.element,
-        utils = layui.utils,
-        _doc = $(document),
-        _win = $(window),
-        renderType = {
-            page: 'page',
-            iframe: 'iframe'
-        };
-    var Tab = function () {
-        this.config = {
-            elem: undefined,
-            mainUrl: 'dashboard',
-            renderType: 'page',
-            openWait: true
-        };
-        this.v = '1.0.5';
-    };
-    Tab.fn = Tab.prototype;
-    Tab.fn.set = function (options) {
-        var that = this;
-        $.extend(true, that.config, options);
-        return that;
-    };
-    /**
-     * 渲染选项卡
-     */
-    Tab.fn.render = function () {
-        var that = this,
-            _config = that.config;
-        if (_config.elem === undefined) {
-            layui.hint().error('Tab error:请配置选择卡容器.')
-            return that;
-        }
-        _tab._config = _config;
-        _tab.createTabDom();
-        _tab.after();
-        return that;
-    };
-    /**
-     * 添加一个选项卡
-     */
-    Tab.fn.tabAdd = function (params) {
-        _tab.tabAdd(params);
-    };
-    /**
-     * 关闭一个选项卡
-     */
-    Tab.fn.close = function (layId) {
-        _tab.tabDelete(layId);
-    };
-    Tab.fn.getId = function () {
-        return _tab.getCurrLayId();
-    };
-    //私用对象
-    var _tab = {
-        _config: {},
-        _filter: 'kitTab', //过滤器名
-        _title: undefined,
-        _content: undefined,
-        _parentElem: undefined, //要存放的容器
-        //检查选项卡DOM是否存在
-        tabDomExists: function () {
-            var that = this;
-            if (_doc.find('div.kit-tab').length > 0) {
-                that._title = $('.kit-tab ul.layui-tab-title');
-                that._content = $('.kit-tab div.layui-tab-content');
-                return true;
-            }
-            return false;
-        },
-        /**
-         * 创建选项卡DOM
-         */
-        createTabDom: function () {
-            var that = this,
-                _config = that._config;
-            that._parentElem = _config.elem;
-            if (that.tabDomExists())
-                return;
-            //模板
-            var tpl = [
-                    '<div class="layui-tab layui-tab-card kit-tab" lay-filter="' + that._filter + '">',
-                    '<ul class="layui-tab-title">',
-                    '<li class="layui-this" lay-id="-1" data-url="' + _config.mainUrl + '"><i class="layui-icon">&#xe68e;</i> 仪表盘</li>',
-                    '</ul>',
-                    '<div class="kit-tab-tool">操作&nbsp;<i class="fa fa-caret-down"></i></div>',
-                    '<div class="kit-tab-tool-body layui-anim layui-anim-upbit">',
-                    '<ul>',
-                    '<li class="kit-item" data-target="refresh">刷新当前选项卡</li>',
-                    '<li class="kit-line"></li>',
-                    '<li class="kit-item" data-target="closeCurrent">关闭当前选项卡</li>',
-                    '<li class="kit-item" data-target="closeOther">关闭其他选项卡</li>',
-                    '<li class="kit-line"></li>',
-                    '<li class="kit-item" data-target="closeAll">关闭所有选项卡</li>',
-                    '</ul>',
-                    '</div>',
-                    '<div class="layui-tab-content">',
-                    '<div class="layui-tab-item layui-show" lay-item-id="-1">{{content}}</div>',
-                    '</div>',
-                    '</div>'
-                ],
-                _htm = tpl.join('');
-            switch (_config.renderType) {
-                case renderType.page:
-                    _htm = _htm.replace('{{content}}', that.getBodyContent(_config.mainUrl + '?v=' + new Date().getTime()));
-                    break;
-                case renderType.iframe:
-                    _htm = _htm.replace('{{content}}', '<iframe src="' + _config.mainUrl + '"></iframe>');
-                    break;
-            }
-            //渲染
-            $(_config.elem).html(_htm);
-            that._title = $('.kit-tab ul.layui-tab-title');
-            that._content = $('.kit-tab div.layui-tab-content');
-            var _tool = $('.kit-tab-tool'),
-                _toolBody = $('.kit-tab-tool-body');
-            //监听操作点击事件
-            _tool.on('click', function () {
-                _toolBody.toggle();
-            });
-            //监听操作项点击事件
-            _toolBody.find('li.kit-item').each(function () {
-                var $that = $(this);
-                var target = $that.data('target');
-                $that.off('click').on('click', function () {
-                    var layId = that._title.children('li[class=layui-this]').attr('lay-id');
-                    switch (target) {
-                        case 'refresh': //刷新
-                            switch (_config.renderType) {
-                                case renderType.page:
-                                    var loadIndex = that.load();
-                                    var url = that._title.children('li[lay-id=' + layId + ']').data('url');
-                                    that._content.children('div[lay-item-id=' + layId + ']')
-                                        .html(that.getBodyContent(url + '?v=' + new Date().getTime(), function () {
-                                            that.closeLoad(loadIndex);
-                                        }));
-                                    break;
-                                case renderType.iframe:
-                                    var item = that._content.children('div[lay-item-id=' + layId + ']').children('iframe');
-                                    item.attr('src', item.attr('src'));
-                                    break;
-                            }
-                            break;
-                        case 'closeCurrent': //关闭当前
-                            if (layId != -1)
-                                that.tabDelete(layId);
-                            break;
-                        case 'closeOther': //关闭其他
-                            that._title.children('li[lay-id]').each(function () {
-                                var curId = $(this).attr('lay-id');
-                                if (curId != layId && curId != -1)
-                                    that.tabDelete(curId);
-                            });
-                            break;
-                        case 'closeAll': //关闭所有
-                            that._title.children('li[lay-id]').each(function () {
-                                var curId = $(this).attr('lay-id');
-                                if (curId != -1)
-                                    that.tabDelete(curId);
-                            });
-                            that.tabChange(-1);
-                            break;
-                    }
-                    _tool.click();
-                });
-            });
-            //监听浏览器窗口改变事件
-            that.winResize();
-        },
+	var $ = layui.jquery,
+		_modName = 'tab',
+		layrouter = layui.layrouter,
+		element = layui.element,
+		utils = layui.utils,
+		_doc = $(document),
+		_win = $(window),
+		renderType = {
+			page: 'page',
+			iframe: 'iframe'
+		};
+	var Tab = function () {
+		this.config = {
+			elem: undefined,
+			mainUrl: 'dashboard',
+			renderType: 'page',
+			openWait: true
+		};
+		this.v = '1.0.5';
+	};
+	Tab.fn = Tab.prototype;
+	Tab.fn.set = function (options) {
+		var that = this;
+		$.extend(true, that.config, options);
+		return that;
+	};
+	/**
+	 * 渲染选项卡
+	 */
+	Tab.fn.render = function () {
+		var that = this,
+			_config = that.config;
+		if (_config.elem === undefined) {
+			layui.hint().error('Tab error:请配置选择卡容器.')
+			return that;
+		}
+		_tab._config = _config;
+		_tab.createTabDom();
+		_tab.after();
+		return that;
+	};
+	/**
+	 * 添加一个选项卡
+	 */
+	Tab.fn.tabAdd = function (params) {
+		_tab.tabAdd(params);
+	};
+	/**
+	 * 关闭一个选项卡
+	 */
+	Tab.fn.close = function (layId) {
+		_tab.tabDelete(layId);
+	};
+	Tab.fn.getId = function () {
+		return _tab.getCurrLayId();
+	};
+	//私用对象
+	var _tab = {
+		_config: {},
+		_filter: 'kitTab', //过滤器名
+		_title: undefined,
+		_content: undefined,
+		_parentElem: undefined, //要存放的容器
+		//检查选项卡DOM是否存在
+		tabDomExists: function () {
+			var that = this;
+			if (_doc.find('div.kit-tab').length > 0) {
+				that._title = $('.kit-tab ul.layui-tab-title');
+				that._content = $('.kit-tab div.layui-tab-content');
+				return true;
+			}
+			return false;
+		},
+		/**
+		 * 创建选项卡DOM
+		 */
+		createTabDom: function () {
+			var that = this,
+				_config = that._config;
+			that._parentElem = _config.elem;
+			if (that.tabDomExists())
+				return;
+			//模板
+			var tpl = [
+					'<div class="layui-tab layui-tab-card kit-tab" lay-filter="' + that._filter + '">',
+					'<ul class="layui-tab-title">',
+					'<li class="layui-this" lay-id="-1" data-url="' + _config.mainUrl + '"><i class="layui-icon">&#xe68e;</i> 仪表盘</li>',
+					'</ul>',
+					'<div class="kit-tab-tool">操作&nbsp;<i class="fa fa-caret-down"></i></div>',
+					'<div class="kit-tab-tool-body layui-anim layui-anim-upbit">',
+					'<ul>',
+					'<li class="kit-item" data-target="refresh">刷新当前选项卡</li>',
+					'<li class="kit-line"></li>',
+					'<li class="kit-item" data-target="closeCurrent">关闭当前选项卡</li>',
+					'<li class="kit-item" data-target="closeOther">关闭其他选项卡</li>',
+					'<li class="kit-line"></li>',
+					'<li class="kit-item" data-target="closeAll">关闭所有选项卡</li>',
+					'</ul>',
+					'</div>',
+					'<div class="layui-tab-content">',
+					'<div class="layui-tab-item layui-show" lay-item-id="-1">{{content}}</div>',
+					'</div>',
+					'</div>'
+				],
+				_htm = tpl.join('');
+			switch (_config.renderType) {
+				case renderType.page:
+					_htm = _htm.replace('{{content}}', that.getBodyContent(_config.mainUrl + '?v=' + new Date().getTime()));
+					break;
+				case renderType.iframe:
+					_htm = _htm.replace('{{content}}', '<iframe src="' + _config.mainUrl + '"></iframe>');
+					break;
+			}
+			//渲染
+			$(_config.elem).html(_htm);
+			that._title = $('.kit-tab ul.layui-tab-title');
+			that._content = $('.kit-tab div.layui-tab-content');
+			var _tool = $('.kit-tab-tool'),
+				_toolBody = $('.kit-tab-tool-body');
+			//监听操作点击事件
+			_tool.on('click', function () {
+				_toolBody.toggle();
+			});
+			//监听操作项点击事件
+			_toolBody.find('li.kit-item').each(function () {
+				var $that = $(this);
+				var target = $that.data('target');
+				$that.off('click').on('click', function () {
+					var layId = that._title.children('li[class=layui-this]').attr('lay-id');
+					switch (target) {
+						case 'refresh': //刷新
+							switch (_config.renderType) {
+								case renderType.page:
+									var loadIndex = that.load();
+									var url = that._title.children('li[lay-id=' + layId + ']').data('url');
+									that._content.children('div[lay-item-id=' + layId + ']')
+										.html(that.getBodyContent(url + '?v=' + new Date().getTime(), function () {
+											that.closeLoad(loadIndex);
+										}));
+									break;
+								case renderType.iframe:
+									var item = that._content.children('div[lay-item-id=' + layId + ']').children('iframe');
+									item.attr('src', item.attr('src'));
+									break;
+							}
+							break;
+						case 'closeCurrent': //关闭当前
+							if (layId != -1)
+								that.tabDelete(layId);
+							break;
+						case 'closeOther': //关闭其他
+							that._title.children('li[lay-id]').each(function () {
+								var curId = $(this).attr('lay-id');
+								if (curId != layId && curId != -1)
+									that.tabDelete(curId);
+							});
+							break;
+						case 'closeAll': //关闭所有
+							that._title.children('li[lay-id]').each(function () {
+								var curId = $(this).attr('lay-id');
+								if (curId != -1)
+									that.tabDelete(curId);
+							});
+							that.tabChange(-1);
+							break;
+					}
+					_tool.click();
+				});
+			});
+			//监听浏览器窗口改变事件
+			that.winResize();
+		},
 
-        after: function () {
-            var that = this;
-            var currentRouter = layrouter.getRouter();
+		after: function () {
+			var that = this;
+			var currentRouter = layrouter.getRouter();
 
-            if (!Len.isEmpty(currentRouter) && currentRouter !== '/') {
-                //存在路由
-                var menu = Len.getMenu(currentRouter);
-                if (!Len.isEmpty(menu)) {
-                    var tabOpt = {
-                        icon: menu.icon,
-                        id: menu.code,
-                        title: menu.name,
-                        url: menu.url
-                    };
-                    tab.tabAdd(tabOpt);
-                }
-            }
-        },
+			if (!Len.isEmpty(currentRouter) && currentRouter !== '/') {
+				//存在路由
+				var menu = Len.getMenu(currentRouter);
+				if (!Len.isEmpty(menu)) {
+					var tabOpt = {
+						icon: menu.icon,
+						id: menu.code,
+						title: menu.name,
+						url: menu.url
+					};
+					tab.tabAdd(tabOpt);
+				}
+			}
+		},
 
-        load: function () {
-            return layer.load(0, {shade: [0.3, '#333']});
-        },
-        closeLoad: function (index) {
-            setTimeout(function () {
-                index && layer.close(index);
-            }, 500);
-            return true;
-        },
+		load: function () {
+			return layer.load(0, {shade: [0.3, '#333']});
+		},
+		closeLoad: function (index) {
+			setTimeout(function () {
+				index && layer.close(index);
+			}, 500);
+			return true;
+		},
 
 
-        getBodyContent: function (url, callback) {
-            return utils.getBodyContent(utils.loadHtml(url, callback));
-        },
-        /**
-         * 监听浏览器窗口改变事件
-         */
-        winResize: function (id) {
-            var that = this,
-                _config = that._config;
-            _win.on('resize', function () {
-                //获取当前容器的高度
-                var currBoxHeight = $(that._parentElem).height() - 50;
-                switch (_config.renderType) {
-                    case renderType.page:
-                        $('.kit-tab .layui-tab-content').height(currBoxHeight);
-                        break;
-                    case renderType.iframe:
-                        $('.kit-tab .layui-tab-content iframe').height(currBoxHeight);
-                        break;
-                }
-            }).resize();
-        },
-        /**
-         * 检查选项卡是否存在
-         */
-        tabExists: function (layId) {
-            var that = this;
-            /*if (typeof that._title == 'undefined') {
-                that._title = $('.kit-tab ul.layui-tab-title', parent.document);
-                that._content = $('.kit-tab div.layui-tab-content', parent.document);
-                _doc = $(document, parent.document);
-                _win = $(window, parent.document);
-                that._config.renderType = 'page';
-            }*/
-            return that._title.find('li[lay-id=' + layId + ']').length > 0;
-        },
-        /**
-         * 删除选项卡
-         */
-        tabDelete: function (layId) {
-            element.tabDelete(this._filter, layId);
-        },
-        /**
-         * 设置选中选项卡
-         */
-        tabChange: function (layId) {
-            element.tabChange(this._filter, layId);
-        },
-        /**
-         * 获取选项卡对象
-         */
-        getTab: function (layId) {
-            return this._title.find('li[lay-id=' + layId + ']');
-        },
-        /**
-         * 添加一个选项卡，已存在则获取焦点
-         */
-        tabAdd: function (options) {
-            var that = this,
-                _config = that._config,
-                loadIndex = undefined;
-            options = options || {
-                id: new Date().getTime(),
-                title: '新标签页',
-                icon: 'fa-file',
-                url: '404.html'
-            };
-            var title = options.title,
-                icon = options.icon,
-                url = options.url,
-                id = options.id;
-            if (that.tabExists(id)) {
-                that.tabChange(id);
-                return;
-            }
-            NProgress.start();
-            if (_config.openWait)
-                loadIndex = that.load();
-            var titleHtm = ['<li class="layui-this" lay-id="' + id + '" data-url="' + url + '">'];
-            if (icon) {
-                if (icon.indexOf('fa-') !== -1) {
-                    titleHtm.push('<i class="fa ' + icon + '" aria-hidden="true"></i>');
-                } else {
-                    titleHtm.push('<i class="layui-icon">' + icon + '</i>');
-                }
-            }
-            titleHtm.push('&nbsp;' + title);
-            titleHtm.push('<i class="layui-icon layui-unselect layui-tab-close">&#x1006;</i>');
-            titleHtm.push('</li>');
-            var contentHtm = '<div class="layui-tab-item layui-show" lay-item-id="' + id + '">{{content}}</div>';
-            switch (_config.renderType) {
-                case renderType.page:
-                    contentHtm = contentHtm.replace('{{content}}', that.getBodyContent(url + '?v=' + new Date().getTime(), function () {
-                        setTimeout(function () {
-                            NProgress.done();
-                            _config.openWait && loadIndex && that.closeLoad(loadIndex);
-                        }, 500);
-                    }));
-                    break;
-                case renderType.iframe:
-                    window.layId = id;
-                    contentHtm = contentHtm.replace('{{content}}', '<iframe id="' + id + '" src="' + url + '"></iframe>');
-                    break;
-            }
-            //追加htm
-            that._title.append(titleHtm.join(''));
-            that._content.append(contentHtm);
-            if (_config.renderType === renderType.iframe) {
-                that._content.find('div[lay-item-id=' + id + ']').find('iframe').on('load', function () {
-                    NProgress.done();
-                    _config.openWait && loadIndex && that.closeLoad(loadIndex);
-                });
-            }
-            //监听选项卡关闭事件
-            that.getTab(id).find('i.layui-tab-close').off('click').on('click', function () {
-                //关闭之前
-                if (_config.closeBefore) {
-                    if (_config.closeBefore(options)) {
-                        that.tabDelete(id);
-                    }
-                } else {
-                    that.tabDelete(id);
-                }
-            });
-            that.tabChange(id);
-            that.winResize(id);
-            if (_config.onSwitch) {
-                element.on('tab(' + that._filter + ')', function (data) {
-                    _config.onSwitch({
-                        index: data.index,
-                        elem: data.elem,
-                        layId: that._title.children('li').eq(data.index).attr('lay-id')
-                    });
-                });
-            }
-        },
-        /**
-         * 获取当前选项卡的id
-         */
-        getCurrLayId: function () {
-            return this._title.find('li.layui-this').attr('lay-id');
-        },
-        fullscreen: function (othis) {
-            var SCREEN_FULL = 'layui-icon-screen-full'
-                , SCREEN_REST = 'layui-icon-screen-restore'
-                , iconElem = othis.children("i");
+		getBodyContent: function (url, callback) {
+			return utils.getBodyContent(utils.loadHtml(url, callback));
+		},
+		/**
+		 * 监听浏览器窗口改变事件
+		 */
+		winResize: function (id) {
+			var that = this,
+				_config = that._config;
+			_win.on('resize', function () {
+				//获取当前容器的高度
+				var currBoxHeight = $(that._parentElem).height() - 50;
+				switch (_config.renderType) {
+					case renderType.page:
+						$('.kit-tab .layui-tab-content').height(currBoxHeight);
+						break;
+					case renderType.iframe:
+						$('.kit-tab .layui-tab-content iframe').height(currBoxHeight);
+						break;
+				}
+			}).resize();
+		},
+		/**
+		 * 检查选项卡是否存在
+		 */
+		tabExists: function (layId) {
+			var that = this;
+			/*if (typeof that._title == 'undefined') {
+				that._title = $('.kit-tab ul.layui-tab-title', parent.document);
+				that._content = $('.kit-tab div.layui-tab-content', parent.document);
+				_doc = $(document, parent.document);
+				_win = $(window, parent.document);
+				that._config.renderType = 'page';
+			}*/
+			return that._title.find('li[lay-id=' + layId + ']').length > 0;
+		},
+		/**
+		 * 删除选项卡
+		 */
+		tabDelete: function (layId) {
+			element.tabDelete(this._filter, layId);
+		},
+		/**
+		 * 设置选中选项卡
+		 */
+		tabChange: function (layId) {
+			element.tabChange(this._filter, layId);
+		},
+		/**
+		 * 获取选项卡对象
+		 */
+		getTab: function (layId) {
+			return this._title.find('li[lay-id=' + layId + ']');
+		},
+		/**
+		 * 添加一个选项卡，已存在则获取焦点
+		 */
+		tabAdd: function (options) {
+			var that = this,
+				_config = that._config,
+				loadIndex = undefined;
+			options = options || {
+				id: new Date().getTime(),
+				title: '新标签页',
+				icon: 'fa-file',
+				url: '404.html'
+			};
+			var title = options.title,
+				icon = options.icon,
+				url = options.url,
+				id = options.id;
+			if (that.tabExists(id)) {
+				that.tabChange(id);
+				return;
+			}
+			NProgress.start();
+			if (_config.openWait)
+				loadIndex = that.load();
+			var titleHtm = ['<li class="layui-this" lay-id="' + id + '" data-url="' + url + '">'];
+			if (icon) {
+				if (icon.indexOf('fa-') !== -1) {
+					titleHtm.push('<i class="fa ' + icon + '" aria-hidden="true"></i>');
+				} else {
+					titleHtm.push('<i class="layui-icon">' + icon + '</i>');
+				}
+			}
+			titleHtm.push('&nbsp;' + title);
+			titleHtm.push('<i class="layui-icon layui-unselect layui-tab-close">&#x1006;</i>');
+			titleHtm.push('</li>');
+			var contentHtm = '<div class="layui-tab-item layui-show" lay-item-id="' + id + '">{{content}}</div>';
+			switch (_config.renderType) {
+				case renderType.page:
+					contentHtm = contentHtm.replace('{{content}}', that.getBodyContent(url + '?v=' + new Date().getTime(), function () {
+						setTimeout(function () {
+							NProgress.done();
+							_config.openWait && loadIndex && that.closeLoad(loadIndex);
+						}, 500);
+					}));
+					break;
+				case renderType.iframe:
+					window.layId = id;
+					contentHtm = contentHtm.replace('{{content}}', '<iframe id="' + id + '" src="' + url + '"></iframe>');
+					break;
+			}
+			//追加htm
+			that._title.append(titleHtm.join(''));
+			that._content.append(contentHtm);
+			if (_config.renderType === renderType.iframe) {
+				that._content.find('div[lay-item-id=' + id + ']').find('iframe').on('load', function () {
+					NProgress.done();
+					_config.openWait && loadIndex && that.closeLoad(loadIndex);
+				});
+			}
+			//监听选项卡关闭事件
+			that.getTab(id).find('i.layui-tab-close').off('click').on('click', function () {
+				//关闭之前
+				if (_config.closeBefore) {
+					if (_config.closeBefore(options)) {
+						that.tabDelete(id);
+					}
+				} else {
+					that.tabDelete(id);
+				}
+			});
+			that.tabChange(id);
+			that.winResize(id);
+			if (_config.onSwitch) {
+				element.on('tab(' + that._filter + ')', function (data) {
+					_config.onSwitch({
+						index: data.index,
+						elem: data.elem,
+						layId: that._title.children('li').eq(data.index).attr('lay-id')
+					});
+				});
+			}
+		},
+		/**
+		 * 获取当前选项卡的id
+		 */
+		getCurrLayId: function () {
+			return this._title.find('li.layui-this').attr('lay-id');
+		},
+		fullscreen: function (othis) {
+			var SCREEN_FULL = 'layui-icon-screen-full'
+				, SCREEN_REST = 'layui-icon-screen-restore'
+				, iconElem = othis.children("i");
 
-            if (iconElem.hasClass(SCREEN_FULL)) {
-                var elem = document.body;
-                if (elem.webkitRequestFullScreen) {
-                    elem.webkitRequestFullScreen();
-                } else if (elem.mozRequestFullScreen) {
-                    elem.mozRequestFullScreen();
-                } else if (elem.requestFullScreen) {
-                    elem.requestFullscreen();
-                }
+			if (iconElem.hasClass(SCREEN_FULL)) {
+				var elem = document.body;
+				if (elem.webkitRequestFullScreen) {
+					elem.webkitRequestFullScreen();
+				} else if (elem.mozRequestFullScreen) {
+					elem.mozRequestFullScreen();
+				} else if (elem.requestFullScreen) {
+					elem.requestFullscreen();
+				}
 
-                iconElem.addClass(SCREEN_REST).removeClass(SCREEN_FULL);
-            } else {
-                var elem = document;
-                if (elem.webkitCancelFullScreen) {
-                    elem.webkitCancelFullScreen();
-                } else if (elem.mozCancelFullScreen) {
-                    elem.mozCancelFullScreen();
-                } else if (elem.cancelFullScreen) {
-                    elem.cancelFullScreen();
-                } else if (elem.exitFullscreen) {
-                    elem.exitFullscreen();
-                }
+				iconElem.addClass(SCREEN_REST).removeClass(SCREEN_FULL);
+			} else {
+				var elem = document;
+				if (elem.webkitCancelFullScreen) {
+					elem.webkitCancelFullScreen();
+				} else if (elem.mozCancelFullScreen) {
+					elem.mozCancelFullScreen();
+				} else if (elem.cancelFullScreen) {
+					elem.cancelFullScreen();
+				} else if (elem.exitFullscreen) {
+					elem.exitFullscreen();
+				}
 
-                iconElem.addClass(SCREEN_FULL).removeClass(SCREEN_REST);
-            }
-        }
-    };
+				iconElem.addClass(SCREEN_FULL).removeClass(SCREEN_REST);
+			}
+		}
+	};
 
-    var t = new Tab();
+	var t = new Tab();
 
-    exports('tab', t);
-});
\ No newline at end of file
+	exports('tab', t);
+});
diff --git a/len-sys/src/main/resources/plugin/build/js/treeselect.js b/len-sys/src/main/resources/plugin/build/js/treeselect.js
index 7ffd503..0f7c7c7 100644
--- a/len-sys/src/main/resources/plugin/build/js/treeselect.js
+++ b/len-sys/src/main/resources/plugin/build/js/treeselect.js
@@ -1,199 +1,202 @@
- ;
-layui.define(['layer', 'ztree'], function(exports) {
-  var _MOD = 'treeselect',
-    layer = layui.layer,
-    $ = layui.jquery;
-  var TreeSelect = function() {
-    this.v = '1.0.0';
-  };
-  /**
-   * 渲染treeSelect
-   */
-  TreeSelect.prototype.render = function(options) {
-    var that = this;
-    // 设置可参考ztree.js配置 URL:http://www.treejs.cn/v3/api.php
-    var setting = {
-      check: {
-        enable: true,
-        chkboxType: {
-          "Y": "",
-          "N": ""
-        }
-      },
-      view: {
-        dblClickExpand: false
-      },
-      data: {
-        simpleData: {
-          enable: true
-        }
-      },
-      callback: {
-        // ztree 点击前发生
-        beforeClick: function(treeId, treeNode) {
-          var zTree = $.fn.zTree.getZTreeObj(treeId);
-          zTree.checkNode(treeNode, !treeNode.checked, null, true);
-        },
-        // ztree 点击时发生
-        onClick: function(e, treeId, treeNode) {
-          var zTree = $.fn.zTree.getZTreeObj(treeId),
-            nodes = zTree.getCheckedNodes(true), //获取选中的节点
-            valIds = [],
-            arr = [];
-          for (var i = 0, l = nodes.length; i < l; i++) {
-            valIds.push(nodes[i].id);
-            arr.push({
-              name: nodes[i].name,
-              id: nodes[i].id,
-              tid: nodes[i].tId
-            });
-          }
-          _div = $(options.elem);
-          var _htm = [];
-          layui.each(arr, function(index, item) {
-            _htm.push([
-              '<a href="javascript:;">',
-              item.name,
-              ' <i class="layui-icon" data-action="close" data-tid="' + item.tid + '" data-id="' + item.id + '">&#x1006;</i>',
-              '</a>'
-            ].join(''));
-          });
-          _div.html(_htm.join(''));
-          //给input 赋值
-          var _input = _div.siblings('input.layui-input');
-          _input.attr("value", valIds.join(','));
-          _bindCloseEvent();
-        }
-      }
-    };
-    // 获取当前时间戳
-    var times = new Date().getTime();
-    var eId = 'content' + times;
-    var treeDOMId = 'treeDemo' + times;
-    // 创建DOM
-    $(options.elem)
-      .parent()
-      .append('<div class="ztree-input" id="' + options.elem.substr(1) + '"></div>')
-      .append(['<div id="' + eId + '" class="ztree-content layui-anim layui-anim-upbit">',
-        '<ul id="treeDemo' + times + '" class="ztree"></ul>',
-        '</div>'
-      ].join(''))
-      .children('input.layui-input').removeAttr('id');
-    // 初始化zTree
-    var zTree = $.fn.zTree.init($('#' + treeDOMId), setting, options.data);
-    // 获取所有节点
-    var nodes = zTree.getNodes();
-    // 获取初始值
-    var vals = $(options.elem).parent().children('input.layui-input').val();
-    if ($.trim(vals).length > 0) {
-      initNode(nodes);
-    }
-    // 初始化数据
-    function initNode(nodes) {
-      for (var i = 0, l = nodes.length; i < l; i++) {
-        var node = nodes[i];
-        if (findArray(vals.split(','), node.id) !== -1) {
-          zTree.checkNode(node, true, false);
-          $(options.elem).append([
-            '<a href="javascript:;">',
-            node.name,
-            ' <i class="layui-icon" data-action="close" data-tid="' + node.tId + '" data-id="' + node.id + '">&#x1006;</i>',
-            '</a>'
-          ].join(''));
-          _bindCloseEvent();
-        }
-        if (node.children !== null && node.children !== undefined && node.children.length > 0) {
-          // 递归调用
-          initNode(node.children);
-        }
-      }
-    };
-    // input 框点击事件
-    $(options.elem).off('click').on('click', function() {
-      $("#" + eId).show();
-      $(document).off('mousedown').on("mousedown", function(event) {
-        if (!('#' + event.target.id == options.elem || event.target.id == eId || $(event.target).parents('#' + eId).length > 0)) {
-          // 隐藏ztree
-          $("#" + eId).fadeOut('fast');
-        }
-      });
-    });
-    /**
-     * 绑定删除按钮事件
-     */
-    function _bindCloseEvent() {
-      var _div = $(options.elem),
-        _input = _div.siblings('input.layui-input');
-      _div.find('i[data-action=close]').off('click').on('click', function(e) {
-        layui.stope(e);
-        // 获取id
-        var id = $(this).data('id');
-        // 获取tid
-        var tid = $(this).data('tid');
-        // 处理节点显示
-        var node = zTree.getNodeByTId(tid);
-        // 将对应的ztree节点的check取消选中
-        zTree.checkNode(node, false, false);
-        // 处理input 值
-        var inputs = _input.val().split(',');
-        // 移除当前所选值Id
-        inputs.remove(id);
-        // 重新辅助
-        _input.attr('value', inputs.join(','));
-        // 移除截元素
-        $(this).parent().remove();
-      });
-    }
+;
+layui.define(['layer', 'ztree'], function (exports) {
+	var _MOD = 'treeselect',
+		layer = layui.layer,
+		$ = layui.jquery;
+	var TreeSelect = function () {
+		this.v = '1.0.0';
+	};
+	/**
+	 * 渲染treeSelect
+	 */
+	TreeSelect.prototype.render = function (options) {
+		var that = this;
+		// 设置可参考ztree.js配置 URL:http://www.treejs.cn/v3/api.php
+		var setting = {
+			check: {
+				enable: true,
+				chkboxType: {
+					"Y": "",
+					"N": ""
+				}
+			},
+			view: {
+				dblClickExpand: false
+			},
+			data: {
+				simpleData: {
+					enable: true
+				}
+			},
+			callback: {
+				// ztree 点击前发生
+				beforeClick: function (treeId, treeNode) {
+					var zTree = $.fn.zTree.getZTreeObj(treeId);
+					zTree.checkNode(treeNode, !treeNode.checked, null, true);
+				},
+				// ztree 点击时发生
+				onClick: function (e, treeId, treeNode) {
+					var zTree = $.fn.zTree.getZTreeObj(treeId),
+						nodes = zTree.getCheckedNodes(true), //获取选中的节点
+						valIds = [],
+						arr = [];
+					for (var i = 0, l = nodes.length; i < l; i++) {
+						valIds.push(nodes[i].id);
+						arr.push({
+							name: nodes[i].name,
+							id: nodes[i].id,
+							tid: nodes[i].tId
+						});
+					}
+					_div = $(options.elem);
+					var _htm = [];
+					layui.each(arr, function (index, item) {
+						_htm.push([
+							'<a href="javascript:;">',
+							item.name,
+							' <i class="layui-icon" data-action="close" data-tid="' + item.tid + '" data-id="' + item.id + '">&#x1006;</i>',
+							'</a>'
+						].join(''));
+					});
+					_div.html(_htm.join(''));
+					//给input 赋值
+					var _input = _div.siblings('input.layui-input');
+					_input.attr("value", valIds.join(','));
+					_bindCloseEvent();
+				}
+			}
+		};
+		// 获取当前时间戳
+		var times = new Date().getTime();
+		var eId = 'content' + times;
+		var treeDOMId = 'treeDemo' + times;
+		// 创建DOM
+		$(options.elem)
+			.parent()
+			.append('<div class="ztree-input" id="' + options.elem.substr(1) + '"></div>')
+			.append(['<div id="' + eId + '" class="ztree-content layui-anim layui-anim-upbit">',
+				'<ul id="treeDemo' + times + '" class="ztree"></ul>',
+				'</div>'
+			].join(''))
+			.children('input.layui-input').removeAttr('id');
+		// 初始化zTree
+		var zTree = $.fn.zTree.init($('#' + treeDOMId), setting, options.data);
+		// 获取所有节点
+		var nodes = zTree.getNodes();
+		// 获取初始值
+		var vals = $(options.elem).parent().children('input.layui-input').val();
+		if ($.trim(vals).length > 0) {
+			initNode(nodes);
+		}
 
-    // Array 扩展
-    Array.prototype.indexOf = function(val) {
-      for (var i = 0; i < this.length; i++) {
-        if (this[i] == val) return i;
-      }
-      return -1;
-    };
-    // 移除指定值
-    Array.prototype.remove = function(val) {
-      var index = this.indexOf(val);
-      if (index > -1) {
-        this.splice(index, 1);
-      }
-    };
-    /**
-     * 
-     * 查找数组，返回匹配到的第一个index
-     * 
-     * @param array 被查找的数组
-     * @param feature 查找特征 或者为一个具体值，用于匹配数组遍历的值，或者为一个对象，表明所有希望被匹配的key-value
-     * @param or boolean 希望命中feature全部特征或者只需命中一个特征，默认true
-     * 
-     * @return 数组下标  查找不到返回-1
-     */
-    function findArray(array, feature, all = true) {
-      for (let index in array) {
-        let cur = array[index];
-        if (feature instanceof Object) {
-          let allRight = true;
-          for (let key in feature) {
-            let value = feature[key];
-            if (cur[key] == value && !all) return index;
-            if (all && cur[key] != value) {
-              allRight = false;
-              break;
-            }
-          }
-          if (allRight) return index;
-        } else {
-          if (cur == feature) {
-            return index;
-          }
-        }
-      }
-      return -1;
-    }
+		// 初始化数据
+		function initNode(nodes) {
+			for (var i = 0, l = nodes.length; i < l; i++) {
+				var node = nodes[i];
+				if (findArray(vals.split(','), node.id) !== -1) {
+					zTree.checkNode(node, true, false);
+					$(options.elem).append([
+						'<a href="javascript:;">',
+						node.name,
+						' <i class="layui-icon" data-action="close" data-tid="' + node.tId + '" data-id="' + node.id + '">&#x1006;</i>',
+						'</a>'
+					].join(''));
+					_bindCloseEvent();
+				}
+				if (node.children !== null && node.children !== undefined && node.children.length > 0) {
+					// 递归调用
+					initNode(node.children);
+				}
+			}
+		};
+		// input 框点击事件
+		$(options.elem).off('click').on('click', function () {
+			$("#" + eId).show();
+			$(document).off('mousedown').on("mousedown", function (event) {
+				if (!('#' + event.target.id == options.elem || event.target.id == eId || $(event.target).parents('#' + eId).length > 0)) {
+					// 隐藏ztree
+					$("#" + eId).fadeOut('fast');
+				}
+			});
+		});
 
-    return that;
-  };
-  // 导出组件
-  exports(_MOD, new TreeSelect());
-});
\ No newline at end of file
+		/**
+		 * 绑定删除按钮事件
+		 */
+		function _bindCloseEvent() {
+			var _div = $(options.elem),
+				_input = _div.siblings('input.layui-input');
+			_div.find('i[data-action=close]').off('click').on('click', function (e) {
+				layui.stope(e);
+				// 获取id
+				var id = $(this).data('id');
+				// 获取tid
+				var tid = $(this).data('tid');
+				// 处理节点显示
+				var node = zTree.getNodeByTId(tid);
+				// 将对应的ztree节点的check取消选中
+				zTree.checkNode(node, false, false);
+				// 处理input 值
+				var inputs = _input.val().split(',');
+				// 移除当前所选值Id
+				inputs.remove(id);
+				// 重新辅助
+				_input.attr('value', inputs.join(','));
+				// 移除截元素
+				$(this).parent().remove();
+			});
+		}
+
+		// Array 扩展
+		Array.prototype.indexOf = function (val) {
+			for (var i = 0; i < this.length; i++) {
+				if (this[i] == val) return i;
+			}
+			return -1;
+		};
+		// 移除指定值
+		Array.prototype.remove = function (val) {
+			var index = this.indexOf(val);
+			if (index > -1) {
+				this.splice(index, 1);
+			}
+		};
+
+		/**
+		 *
+		 * 查找数组，返回匹配到的第一个index
+		 *
+		 * @param array 被查找的数组
+		 * @param feature 查找特征 或者为一个具体值，用于匹配数组遍历的值，或者为一个对象，表明所有希望被匹配的key-value
+		 * @param or boolean 希望命中feature全部特征或者只需命中一个特征，默认true
+		 *
+		 * @return 数组下标  查找不到返回-1
+		 */
+		function findArray(array, feature, all = true) {
+			for (let index in array) {
+				let cur = array[index];
+				if (feature instanceof Object) {
+					let allRight = true;
+					for (let key in feature) {
+						let value = feature[key];
+						if (cur[key] == value && !all) return index;
+						if (all && cur[key] != value) {
+							allRight = false;
+							break;
+						}
+					}
+					if (allRight) return index;
+				} else {
+					if (cur == feature) {
+						return index;
+					}
+				}
+			}
+			return -1;
+		}
+
+		return that;
+	};
+	// 导出组件
+	exports(_MOD, new TreeSelect());
+});
diff --git a/len-sys/src/main/resources/plugin/build/js/utils.js b/len-sys/src/main/resources/plugin/build/js/utils.js
index c21b123..4a61a85 100644
--- a/len-sys/src/main/resources/plugin/build/js/utils.js
+++ b/len-sys/src/main/resources/plugin/build/js/utils.js
@@ -1,259 +1,261 @@
 /** kit_admin-v1.1.0 MIT License By http://kit/zhengjinfan.cn e-mail:zheng_jinfan@126.com */
- ;/**
+;/**
  * Name:utils.js
  * Author:Van
  * E-mail:zheng_jinfan@126.com
  * Website:http://kit.zhengjinfan.cn/
  * LICENSE:MIT
  */
-layui.define(['layer'], function(exports) {
-    var $ = layui.jquery,
-        layer = layui.layer,
-        _modName = 'utils';
-    var utils = {
-        v: '1.0.3',
-        /**
-         * 根据一个html内容读取出body标签里的文本
-         */
-        getBodyContent: function(content) {
-            var REG_BODY = /<body[^>]*>([\s\S]*)<\/body>/,
-                result = REG_BODY.exec(content);
-            if (result && result.length === 2)
-                return result[1];
-            return content;
-        },
-        /**
-         * 读取html字符串
-         */
-        loadHtml: function(url, callback) {
-            var result;
-            $.ajax({
-                url: url,
-                async: false,
-                dataType: 'html',
-                beforeSend: function(request) {
-                    request.setRequestHeader("IsGetHtml", 'true');
-                },
-                error: function(xhr, err, msg) {
-                    var m = ['<div style="padding: 20px;font-size: 20px;text-align:left;color:#009688;">',
-                        '<p>{{msg}}  >>> ' + url + '</p>',
-                        '</div>'
-                    ].join('');
-                    if (xhr.status === 404) {
-                        result = m.replace('{{msg}}', '<i class="layui-icon" style="font-size:70px;">&#xe61c;</i>  ' + msg);
-                        return;
-                    }
-                    result = m.replace('{{msg}}', '<i class="layui-icon" style="font-size:70px;">&#xe69c;</i>  未知错误.');
-                },
-                success: function(res) {
-                    result = res;
-                },
-                complete: function() {
-                    typeof callback === 'function' && callback();
-                }
-            });
-            return result;
-        },
-        /**
-         * 加载等待层
-         */
-        load: function(type) {
-            type = type || 0;
-            return layer.load(type, { shade: [0.3, '#333'] });
-        },
-        /**
-         * ajax post
-         */
-        post: function(url, params, callback, options) {
-            var defaults = {
-                error: function(xhr, err, msg) {
-                    console.log('发生错误了..');
-                    console.log(xhr);
-                    console.log(err);
-                    console.log(msg);
-                },
-                complete: function(xhr, statusCode) {
-                    console.log('complete.' + statusCode);
-                }
-            };
-            $.extend(true, defaults, options);
-            $.ajax({
-                url: url,
-                beforeSend: function(request) {
-                    request.setRequestHeader("IsAjax", 'true');
-                },
-                dataType: 'json',
-                method: 'POST',
-                data: params,
-                error: function(xhr, err, msg) {
-                    defaults.error(xhr, err, msg);
-                },
-                success: function(res) {
-                    if (res.code === 101) {
-                        layer.alert(res.msg, {
-                            icon: 2,
-                            title: '系统提示',
-                            cancel: function(index, layero) {
-                                top.location.href = location.origin + '/Account/Login';
-                            }
-                        }, function() {
-                            top.location.href = location.origin + '/Account/Login';
-                        });
-                    } else {
-                        callback(res);
-                    }
-                },
-                complete: function(xhr, statusCode) {
-                    defaults.complete(xhr, statusCode);
-                }
-            });
-        },
-        /**
-         * ajax get
-         */
-        get: function(url, params, callback, options) {
-            var defaults = {
-                error: function(xhr, err, msg) {
-                    console.log('发生错误了..');
-                    console.log(xhr);
-                    console.log(err);
-                    console.log(msg);
-                },
-                complete: function(xhr, statusCode) {
-                    console.log('complete.' + statusCode);
-                }
-            };
-            $.extend(true, defaults, options);
-            $.ajax({
-                url: url,
-                beforeSend: function(request) {
-                    request.setRequestHeader("IsAjax", 'true');
-                },
-                dataType: 'json',
-                method: 'GET',
-                data: params,
-                error: function(xhr, err, msg) {
-                    defaults.error(xhr, err, msg);
-                },
-                success: function(res) {
-                    if (res.code === 101) {
-                        layer.alert(res.msg, {
-                            icon: 2,
-                            title: '系统提示',
-                            cancel: function(index, layero) {
-                                top.location.href = location.origin + '/Account/Login';
-                            }
-                        }, function() {
-                            top.location.href = location.origin + '/Account/Login';
-                        });
-                    } else {
-                        callback(res);
-                    }
-                },
-                complete: function(xhr, statusCode) {
-                    defaults.complete(xhr, statusCode);
-                }
-            });
-        },
-        keyWordHighlight: function(o, flag, rndColor, url) {
-            /// <summary>
-            ///     使用 javascript HTML DOM 高亮显示页面特定字词.
-            ///     实例:
-            ///         keyWordHighlight(document.body, '纸伞|她'); 
-            ///         这里的body是指高亮body里面的内容。
-            ///         keyWordHighlight(document.body, '希望|愁怨', false, '/'); 
-            ///         keyWordHighlight(document.getElementById('at_main'), '独自|飘过|悠长', true, 'search.asp?keyword='); 
-            ///         这里的'at_main'是指高亮id='at_main'的div里面的内容。search.asp?keyword=指给关键字加的链接地址，
-            ///         我这里加了一个参数，在后面要用到。可以是任意的地址。        
-            /// </summary>
-            /// <param name="o" type="Object">
-            ///     对象, 要进行高亮显示的对象. 
-            /// </param>
-            /// <param name="flag" type="String">
-            ///     字符串, 要进行高亮的词或多个词, 使用 竖杠(|) 分隔多个词 . 
-            /// </param>
-            /// <param name="rndColor" type="Boolean">
-            ///     布尔值, 是否随机显示文字背景色与文字颜色, true 表示随机显示. 
-            /// </param>
-            /// <param name="url" type="String">
-            ///     URI, 是否对高亮的词添加链接.
-            /// </param>                        
-            /// <return></return>
-            var bgCor = fgCor = '';
-            if (rndColor) {
-                bgCor = fRndCor(10, 20);
-                fgCor = fRndCor(230, 255);
-            } else {
-                bgCor = 'transparent'; //背景色
-                fgCor = 'red'; //字体颜色
-            }
-            var re = new RegExp(flag, 'i');
-            for (var i = 0; i < o.childNodes.length; i++) {
-                var o_ = o.childNodes[i];
-                var o_p = o_.parentNode;
-                if (o_.nodeType == 1) {
-                    this.keyWordHighlight(o_, flag, rndColor, url);
-                } else if (o_.nodeType == 3) {
-                    if (!(o_p.nodeName == 'A')) {
-                        if (o_.data.search(re) == -1) continue;
-                        var temp = fEleA(o_.data, flag);
-                        o_p.replaceChild(temp, o_);
-                    }
-                }
-            }
-            //------------------------------------------------ 
-            function fEleA(text, flag) {
-                var style = ' style="background-color:' + bgCor + ';color:' + fgCor + ';" '
-                var o = document.createElement('span');
-                var str = '';
-                var re = new RegExp('(' + flag + ')', 'gi');
-                if (url) {
-                    str = text.replace(re, '<a href="' + url +
-                        '$1"' + style + '>$1</a>'); //这里是给关键字加链接，红色的$1是指上面链接地址后的具体参数。
-                } else {
-                    str = text.replace(re, '<span ' + style + '>$1</span>'); //不加链接时显示
-                }
-                o.innerHTML = str;
-                return o;
-            }
-            //------------------------------------------------ 
-            function fRndCor(under, over) {
-                if (arguments.length == 1) {
-                    var over = under;
-                    under = 0;
-                } else if (arguments.length == 0) {
-                    var under = 0;
-                    var over = 255;
-                }
-                var r = fRandomBy(under, over).toString(16);
-                r = padNum(r, r, 2);
-                var g = fRandomBy(under, over).toString(16);
-                g = padNum(g, g, 2);
-                var b = fRandomBy(under, over).toString(16);
-                b = padNum(b, b, 2);
-                //defaultStatus=r+' '+g+' '+b 
-                return '#' + r + g + b;
+layui.define(['layer'], function (exports) {
+	var $ = layui.jquery,
+		layer = layui.layer,
+		_modName = 'utils';
+	var utils = {
+		v: '1.0.3',
+		/**
+		 * 根据一个html内容读取出body标签里的文本
+		 */
+		getBodyContent: function (content) {
+			var REG_BODY = /<body[^>]*>([\s\S]*)<\/body>/,
+				result = REG_BODY.exec(content);
+			if (result && result.length === 2)
+				return result[1];
+			return content;
+		},
+		/**
+		 * 读取html字符串
+		 */
+		loadHtml: function (url, callback) {
+			var result;
+			$.ajax({
+				url: url,
+				async: false,
+				dataType: 'html',
+				beforeSend: function (request) {
+					request.setRequestHeader("IsGetHtml", 'true');
+				},
+				error: function (xhr, err, msg) {
+					var m = ['<div style="padding: 20px;font-size: 20px;text-align:left;color:#009688;">',
+						'<p>{{msg}}  >>> ' + url + '</p>',
+						'</div>'
+					].join('');
+					if (xhr.status === 404) {
+						result = m.replace('{{msg}}', '<i class="layui-icon" style="font-size:70px;">&#xe61c;</i>  ' + msg);
+						return;
+					}
+					result = m.replace('{{msg}}', '<i class="layui-icon" style="font-size:70px;">&#xe69c;</i>  未知错误.');
+				},
+				success: function (res) {
+					result = res;
+				},
+				complete: function () {
+					typeof callback === 'function' && callback();
+				}
+			});
+			return result;
+		},
+		/**
+		 * 加载等待层
+		 */
+		load: function (type) {
+			type = type || 0;
+			return layer.load(type, {shade: [0.3, '#333']});
+		},
+		/**
+		 * ajax post
+		 */
+		post: function (url, params, callback, options) {
+			var defaults = {
+				error: function (xhr, err, msg) {
+					console.log('发生错误了..');
+					console.log(xhr);
+					console.log(err);
+					console.log(msg);
+				},
+				complete: function (xhr, statusCode) {
+					console.log('complete.' + statusCode);
+				}
+			};
+			$.extend(true, defaults, options);
+			$.ajax({
+				url: url,
+				beforeSend: function (request) {
+					request.setRequestHeader("IsAjax", 'true');
+				},
+				dataType: 'json',
+				method: 'POST',
+				data: params,
+				error: function (xhr, err, msg) {
+					defaults.error(xhr, err, msg);
+				},
+				success: function (res) {
+					if (res.code === 101) {
+						layer.alert(res.msg, {
+							icon: 2,
+							title: '系统提示',
+							cancel: function (index, layero) {
+								top.location.href = location.origin + '/Account/Login';
+							}
+						}, function () {
+							top.location.href = location.origin + '/Account/Login';
+						});
+					} else {
+						callback(res);
+					}
+				},
+				complete: function (xhr, statusCode) {
+					defaults.complete(xhr, statusCode);
+				}
+			});
+		},
+		/**
+		 * ajax get
+		 */
+		get: function (url, params, callback, options) {
+			var defaults = {
+				error: function (xhr, err, msg) {
+					console.log('发生错误了..');
+					console.log(xhr);
+					console.log(err);
+					console.log(msg);
+				},
+				complete: function (xhr, statusCode) {
+					console.log('complete.' + statusCode);
+				}
+			};
+			$.extend(true, defaults, options);
+			$.ajax({
+				url: url,
+				beforeSend: function (request) {
+					request.setRequestHeader("IsAjax", 'true');
+				},
+				dataType: 'json',
+				method: 'GET',
+				data: params,
+				error: function (xhr, err, msg) {
+					defaults.error(xhr, err, msg);
+				},
+				success: function (res) {
+					if (res.code === 101) {
+						layer.alert(res.msg, {
+							icon: 2,
+							title: '系统提示',
+							cancel: function (index, layero) {
+								top.location.href = location.origin + '/Account/Login';
+							}
+						}, function () {
+							top.location.href = location.origin + '/Account/Login';
+						});
+					} else {
+						callback(res);
+					}
+				},
+				complete: function (xhr, statusCode) {
+					defaults.complete(xhr, statusCode);
+				}
+			});
+		},
+		keyWordHighlight: function (o, flag, rndColor, url) {
+			/// <summary>
+			///     使用 javascript HTML DOM 高亮显示页面特定字词.
+			///     实例:
+			///         keyWordHighlight(document.body, '纸伞|她');
+			///         这里的body是指高亮body里面的内容。
+			///         keyWordHighlight(document.body, '希望|愁怨', false, '/');
+			///         keyWordHighlight(document.getElementById('at_main'), '独自|飘过|悠长', true, 'search.asp?keyword=');
+			///         这里的'at_main'是指高亮id='at_main'的div里面的内容。search.asp?keyword=指给关键字加的链接地址，
+			///         我这里加了一个参数，在后面要用到。可以是任意的地址。
+			/// </summary>
+			/// <param name="o" type="Object">
+			///     对象, 要进行高亮显示的对象.
+			/// </param>
+			/// <param name="flag" type="String">
+			///     字符串, 要进行高亮的词或多个词, 使用 竖杠(|) 分隔多个词 .
+			/// </param>
+			/// <param name="rndColor" type="Boolean">
+			///     布尔值, 是否随机显示文字背景色与文字颜色, true 表示随机显示.
+			/// </param>
+			/// <param name="url" type="String">
+			///     URI, 是否对高亮的词添加链接.
+			/// </param>
+			/// <return></return>
+			var bgCor = fgCor = '';
+			if (rndColor) {
+				bgCor = fRndCor(10, 20);
+				fgCor = fRndCor(230, 255);
+			} else {
+				bgCor = 'transparent'; //背景色
+				fgCor = 'red'; //字体颜色
+			}
+			var re = new RegExp(flag, 'i');
+			for (var i = 0; i < o.childNodes.length; i++) {
+				var o_ = o.childNodes[i];
+				var o_p = o_.parentNode;
+				if (o_.nodeType == 1) {
+					this.keyWordHighlight(o_, flag, rndColor, url);
+				} else if (o_.nodeType == 3) {
+					if (!(o_p.nodeName == 'A')) {
+						if (o_.data.search(re) == -1) continue;
+						var temp = fEleA(o_.data, flag);
+						o_p.replaceChild(temp, o_);
+					}
+				}
+			}
 
-                function fRandomBy(under, over) {
-                    switch (arguments.length) {
-                        case 1:
-                            return parseInt(Math.random() * under + 1);
-                        case 2:
-                            return parseInt(Math.random() * (over - under + 1) + under);
-                        default:
-                            return 0;
-                    }
-                }
+			//------------------------------------------------
+			function fEleA(text, flag) {
+				var style = ' style="background-color:' + bgCor + ';color:' + fgCor + ';" '
+				var o = document.createElement('span');
+				var str = '';
+				var re = new RegExp('(' + flag + ')', 'gi');
+				if (url) {
+					str = text.replace(re, '<a href="' + url +
+						'$1"' + style + '>$1</a>'); //这里是给关键字加链接，红色的$1是指上面链接地址后的具体参数。
+				} else {
+					str = text.replace(re, '<span ' + style + '>$1</span>'); //不加链接时显示
+				}
+				o.innerHTML = str;
+				return o;
+			}
 
-                function padNum(str, num, len) {
-                    var temp = ''
-                    for (var i = 0; i < len; temp += num, i++);
-                    return temp = (temp += str).substr(temp.length - len);
-                }
-            }
-        }
-    };
+			//------------------------------------------------
+			function fRndCor(under, over) {
+				if (arguments.length == 1) {
+					var over = under;
+					under = 0;
+				} else if (arguments.length == 0) {
+					var under = 0;
+					var over = 255;
+				}
+				var r = fRandomBy(under, over).toString(16);
+				r = padNum(r, r, 2);
+				var g = fRandomBy(under, over).toString(16);
+				g = padNum(g, g, 2);
+				var b = fRandomBy(under, over).toString(16);
+				b = padNum(b, b, 2);
+				//defaultStatus=r+' '+g+' '+b
+				return '#' + r + g + b;
 
+				function fRandomBy(under, over) {
+					switch (arguments.length) {
+						case 1:
+							return parseInt(Math.random() * under + 1);
+						case 2:
+							return parseInt(Math.random() * (over - under + 1) + under);
+						default:
+							return 0;
+					}
+				}
 
-    exports('utils', utils);
-});
\ No newline at end of file
+				function padNum(str, num, len) {
+					var temp = ''
+					for (var i = 0; i < len; temp += num, i++) ;
+					return temp = (temp += str).substr(temp.length - len);
+				}
+			}
+		}
+	};
+
+
+	exports('utils', utils);
+});
diff --git a/len-sys/src/main/resources/plugin/build/js/ztree.js b/len-sys/src/main/resources/plugin/build/js/ztree.js
index 7f67822..891981e 100644
--- a/len-sys/src/main/resources/plugin/build/js/ztree.js
+++ b/len-sys/src/main/resources/plugin/build/js/ztree.js
@@ -1,9 +1,9 @@
 /** kit_admin-v1.1.0 MIT License By http://kit/zhengjinfan.cn e-mail:zheng_jinfan@126.com */
- ;layui.define(['jquery'], function(exports) {
-    var jQuery = layui.jquery;
+;layui.define(['jquery'], function (exports) {
+	var jQuery = layui.jquery;
 
 
-    /*
+	/*
      * JQuery zTree core v3.5.29
      * http://treejs.cn/
      *
@@ -15,1936 +15,1940 @@
      * email: hunter.z@263.net
      * Date: 2017-06-19
      */
-    (function($) {
-        var settings = {},
-            roots = {},
-            caches = {},
-            //default consts of core
-            _consts = {
-                className: {
-                    BUTTON: "button",
-                    LEVEL: "level",
-                    ICO_LOADING: "ico_loading",
-                    SWITCH: "switch",
-                    NAME: 'node_name'
-                },
-                event: {
-                    NODECREATED: "ztree_nodeCreated",
-                    CLICK: "ztree_click",
-                    EXPAND: "ztree_expand",
-                    COLLAPSE: "ztree_collapse",
-                    ASYNC_SUCCESS: "ztree_async_success",
-                    ASYNC_ERROR: "ztree_async_error",
-                    REMOVE: "ztree_remove",
-                    SELECTED: "ztree_selected",
-                    UNSELECTED: "ztree_unselected"
-                },
-                id: {
-                    A: "_a",
-                    ICON: "_ico",
-                    SPAN: "_span",
-                    SWITCH: "_switch",
-                    UL: "_ul"
-                },
-                line: {
-                    ROOT: "root",
-                    ROOTS: "roots",
-                    CENTER: "center",
-                    BOTTOM: "bottom",
-                    NOLINE: "noline",
-                    LINE: "line"
-                },
-                folder: {
-                    OPEN: "open",
-                    CLOSE: "close",
-                    DOCU: "docu"
-                },
-                node: {
-                    CURSELECTED: "curSelectedNode"
-                }
-            },
-            //default setting of core
-            _setting = {
-                treeId: "",
-                treeObj: null,
-                view: {
-                    addDiyDom: null,
-                    autoCancelSelected: true,
-                    dblClickExpand: true,
-                    expandSpeed: "fast",
-                    fontCss: {},
-                    nameIsHTML: false,
-                    selectedMulti: true,
-                    showIcon: true,
-                    showLine: true,
-                    showTitle: true,
-                    txtSelectedEnable: false
-                },
-                data: {
-                    key: {
-                        children: "children",
-                        name: "name",
-                        title: "",
-                        url: "url",
-                        icon: "icon"
-                    },
-                    simpleData: {
-                        enable: false,
-                        idKey: "id",
-                        pIdKey: "pId",
-                        rootPId: null
-                    },
-                    keep: {
-                        parent: false,
-                        leaf: false
-                    }
-                },
-                async: {
-                    enable: false,
-                    contentType: "application/x-www-form-urlencoded",
-                    type: "post",
-                    dataType: "text",
-                    url: "",
-                    autoParam: [],
-                    otherParam: [],
-                    dataFilter: null
-                },
-                callback: {
-                    beforeAsync: null,
-                    beforeClick: null,
-                    beforeDblClick: null,
-                    beforeRightClick: null,
-                    beforeMouseDown: null,
-                    beforeMouseUp: null,
-                    beforeExpand: null,
-                    beforeCollapse: null,
-                    beforeRemove: null,
-
-                    onAsyncError: null,
-                    onAsyncSuccess: null,
-                    onNodeCreated: null,
-                    onClick: null,
-                    onDblClick: null,
-                    onRightClick: null,
-                    onMouseDown: null,
-                    onMouseUp: null,
-                    onExpand: null,
-                    onCollapse: null,
-                    onRemove: null
-                }
-            },
-            //default root of core
-            //zTree use root to save full data
-            _initRoot = function(setting) {
-                var r = data.getRoot(setting);
-                if (!r) {
-                    r = {};
-                    data.setRoot(setting, r);
-                }
-                r[setting.data.key.children] = [];
-                r.expandTriggerFlag = false;
-                r.curSelectedList = [];
-                r.noSelection = true;
-                r.createdNodes = [];
-                r.zId = 0;
-                r._ver = (new Date()).getTime();
-            },
-            //default cache of core
-            _initCache = function(setting) {
-                var c = data.getCache(setting);
-                if (!c) {
-                    c = {};
-                    data.setCache(setting, c);
-                }
-                c.nodes = [];
-                c.doms = [];
-            },
-            //default bindEvent of core
-            _bindEvent = function(setting) {
-                var o = setting.treeObj,
-                    c = consts.event;
-                o.bind(c.NODECREATED, function(event, treeId, node) {
-                    tools.apply(setting.callback.onNodeCreated, [event, treeId, node]);
-                });
-
-                o.bind(c.CLICK, function(event, srcEvent, treeId, node, clickFlag) {
-                    tools.apply(setting.callback.onClick, [srcEvent, treeId, node, clickFlag]);
-                });
-
-                o.bind(c.EXPAND, function(event, treeId, node) {
-                    tools.apply(setting.callback.onExpand, [event, treeId, node]);
-                });
-
-                o.bind(c.COLLAPSE, function(event, treeId, node) {
-                    tools.apply(setting.callback.onCollapse, [event, treeId, node]);
-                });
-
-                o.bind(c.ASYNC_SUCCESS, function(event, treeId, node, msg) {
-                    tools.apply(setting.callback.onAsyncSuccess, [event, treeId, node, msg]);
-                });
-
-                o.bind(c.ASYNC_ERROR, function(event, treeId, node, XMLHttpRequest, textStatus, errorThrown) {
-                    tools.apply(setting.callback.onAsyncError, [event, treeId, node, XMLHttpRequest, textStatus, errorThrown]);
-                });
-
-                o.bind(c.REMOVE, function(event, treeId, treeNode) {
-                    tools.apply(setting.callback.onRemove, [event, treeId, treeNode]);
-                });
-
-                o.bind(c.SELECTED, function(event, treeId, node) {
-                    tools.apply(setting.callback.onSelected, [treeId, node]);
-                });
-                o.bind(c.UNSELECTED, function(event, treeId, node) {
-                    tools.apply(setting.callback.onUnSelected, [treeId, node]);
-                });
-            },
-            _unbindEvent = function(setting) {
-                var o = setting.treeObj,
-                    c = consts.event;
-                o.unbind(c.NODECREATED)
-                    .unbind(c.CLICK)
-                    .unbind(c.EXPAND)
-                    .unbind(c.COLLAPSE)
-                    .unbind(c.ASYNC_SUCCESS)
-                    .unbind(c.ASYNC_ERROR)
-                    .unbind(c.REMOVE)
-                    .unbind(c.SELECTED)
-                    .unbind(c.UNSELECTED);
-            },
-            //default event proxy of core
-            _eventProxy = function(event) {
-                var target = event.target,
-                    setting = data.getSetting(event.data.treeId),
-                    tId = "",
-                    node = null,
-                    nodeEventType = "",
-                    treeEventType = "",
-                    nodeEventCallback = null,
-                    treeEventCallback = null,
-                    tmp = null;
-
-                if (tools.eqs(event.type, "mousedown")) {
-                    treeEventType = "mousedown";
-                } else if (tools.eqs(event.type, "mouseup")) {
-                    treeEventType = "mouseup";
-                } else if (tools.eqs(event.type, "contextmenu")) {
-                    treeEventType = "contextmenu";
-                } else if (tools.eqs(event.type, "click")) {
-                    if (tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.SWITCH) !== null) {
-                        tId = tools.getNodeMainDom(target).id;
-                        nodeEventType = "switchNode";
-                    } else {
-                        tmp = tools.getMDom(setting, target, [{ tagName: "a", attrName: "treeNode" + consts.id.A }]);
-                        if (tmp) {
-                            tId = tools.getNodeMainDom(tmp).id;
-                            nodeEventType = "clickNode";
-                        }
-                    }
-                } else if (tools.eqs(event.type, "dblclick")) {
-                    treeEventType = "dblclick";
-                    tmp = tools.getMDom(setting, target, [{ tagName: "a", attrName: "treeNode" + consts.id.A }]);
-                    if (tmp) {
-                        tId = tools.getNodeMainDom(tmp).id;
-                        nodeEventType = "switchNode";
-                    }
-                }
-                if (treeEventType.length > 0 && tId.length == 0) {
-                    tmp = tools.getMDom(setting, target, [{ tagName: "a", attrName: "treeNode" + consts.id.A }]);
-                    if (tmp) {
-                        tId = tools.getNodeMainDom(tmp).id;
-                    }
-                }
-                // event to node
-                if (tId.length > 0) {
-                    node = data.getNodeCache(setting, tId);
-                    switch (nodeEventType) {
-                        case "switchNode":
-                            if (!node.isParent) {
-                                nodeEventType = "";
-                            } else if (tools.eqs(event.type, "click") ||
-                                (tools.eqs(event.type, "dblclick") && tools.apply(setting.view.dblClickExpand, [setting.treeId, node], setting.view.dblClickExpand))) {
-                                nodeEventCallback = handler.onSwitchNode;
-                            } else {
-                                nodeEventType = "";
-                            }
-                            break;
-                        case "clickNode":
-                            nodeEventCallback = handler.onClickNode;
-                            break;
-                    }
-                }
-                // event to zTree
-                switch (treeEventType) {
-                    case "mousedown":
-                        treeEventCallback = handler.onZTreeMousedown;
-                        break;
-                    case "mouseup":
-                        treeEventCallback = handler.onZTreeMouseup;
-                        break;
-                    case "dblclick":
-                        treeEventCallback = handler.onZTreeDblclick;
-                        break;
-                    case "contextmenu":
-                        treeEventCallback = handler.onZTreeContextmenu;
-                        break;
-                }
-                var proxyResult = {
-                    stop: false,
-                    node: node,
-                    nodeEventType: nodeEventType,
-                    nodeEventCallback: nodeEventCallback,
-                    treeEventType: treeEventType,
-                    treeEventCallback: treeEventCallback
-                };
-                return proxyResult
-            },
-            //default init node of core
-            _initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
-                if (!n) return;
-                var r = data.getRoot(setting),
-                    childKey = setting.data.key.children;
-                n.level = level;
-                n.tId = setting.treeId + "_" + (++r.zId);
-                n.parentTId = parentNode ? parentNode.tId : null;
-                n.open = (typeof n.open == "string") ? tools.eqs(n.open, "true") : !!n.open;
-                if (n[childKey] && n[childKey].length > 0) {
-                    n.isParent = true;
-                    n.zAsync = true;
-                } else {
-                    n.isParent = (typeof n.isParent == "string") ? tools.eqs(n.isParent, "true") : !!n.isParent;
-                    n.open = (n.isParent && !setting.async.enable) ? n.open : false;
-                    n.zAsync = !n.isParent;
-                }
-                n.isFirstNode = isFirstNode;
-                n.isLastNode = isLastNode;
-                n.getParentNode = function() {
-                    return data.getNodeCache(setting, n.parentTId);
-                };
-                n.getPreNode = function() {
-                    return data.getPreNode(setting, n);
-                };
-                n.getNextNode = function() {
-                    return data.getNextNode(setting, n);
-                };
-                n.getIndex = function() {
-                    return data.getNodeIndex(setting, n);
-                };
-                n.getPath = function() {
-                    return data.getNodePath(setting, n);
-                };
-                n.isAjaxing = false;
-                data.fixPIdKeyValue(setting, n);
-            },
-            _init = {
-                bind: [_bindEvent],
-                unbind: [_unbindEvent],
-                caches: [_initCache],
-                nodes: [_initNode],
-                proxys: [_eventProxy],
-                roots: [_initRoot],
-                beforeA: [],
-                afterA: [],
-                innerBeforeA: [],
-                innerAfterA: [],
-                zTreeTools: []
-            },
-            //method of operate data
-            data = {
-                addNodeCache: function(setting, node) {
-                    data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = node;
-                },
-                getNodeCacheId: function(tId) {
-                    return tId.substring(tId.lastIndexOf("_") + 1);
-                },
-                addAfterA: function(afterA) {
-                    _init.afterA.push(afterA);
-                },
-                addBeforeA: function(beforeA) {
-                    _init.beforeA.push(beforeA);
-                },
-                addInnerAfterA: function(innerAfterA) {
-                    _init.innerAfterA.push(innerAfterA);
-                },
-                addInnerBeforeA: function(innerBeforeA) {
-                    _init.innerBeforeA.push(innerBeforeA);
-                },
-                addInitBind: function(bindEvent) {
-                    _init.bind.push(bindEvent);
-                },
-                addInitUnBind: function(unbindEvent) {
-                    _init.unbind.push(unbindEvent);
-                },
-                addInitCache: function(initCache) {
-                    _init.caches.push(initCache);
-                },
-                addInitNode: function(initNode) {
-                    _init.nodes.push(initNode);
-                },
-                addInitProxy: function(initProxy, isFirst) {
-                    if (!!isFirst) {
-                        _init.proxys.splice(0, 0, initProxy);
-                    } else {
-                        _init.proxys.push(initProxy);
-                    }
-                },
-                addInitRoot: function(initRoot) {
-                    _init.roots.push(initRoot);
-                },
-                addNodesData: function(setting, parentNode, index, nodes) {
-                    var childKey = setting.data.key.children,
-                        params;
-                    if (!parentNode[childKey]) {
-                        parentNode[childKey] = [];
-                        index = -1;
-                    } else if (index >= parentNode[childKey].length) {
-                        index = -1;
-                    }
-
-                    if (parentNode[childKey].length > 0 && index === 0) {
-                        parentNode[childKey][0].isFirstNode = false;
-                        view.setNodeLineIcos(setting, parentNode[childKey][0]);
-                    } else if (parentNode[childKey].length > 0 && index < 0) {
-                        parentNode[childKey][parentNode[childKey].length - 1].isLastNode = false;
-                        view.setNodeLineIcos(setting, parentNode[childKey][parentNode[childKey].length - 1]);
-                    }
-                    parentNode.isParent = true;
-
-                    if (index < 0) {
-                        parentNode[childKey] = parentNode[childKey].concat(nodes);
-                    } else {
-                        params = [index, 0].concat(nodes);
-                        parentNode[childKey].splice.apply(parentNode[childKey], params);
-                    }
-                },
-                addSelectedNode: function(setting, node) {
-                    var root = data.getRoot(setting);
-                    if (!data.isSelectedNode(setting, node)) {
-                        root.curSelectedList.push(node);
-                    }
-                },
-                addCreatedNode: function(setting, node) {
-                    if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
-                        var root = data.getRoot(setting);
-                        root.createdNodes.push(node);
-                    }
-                },
-                addZTreeTools: function(zTreeTools) {
-                    _init.zTreeTools.push(zTreeTools);
-                },
-                exSetting: function(s) {
-                    $.extend(true, _setting, s);
-                },
-                fixPIdKeyValue: function(setting, node) {
-                    if (setting.data.simpleData.enable) {
-                        node[setting.data.simpleData.pIdKey] = node.parentTId ? node.getParentNode()[setting.data.simpleData.idKey] : setting.data.simpleData.rootPId;
-                    }
-                },
-                getAfterA: function(setting, node, array) {
-                    for (var i = 0, j = _init.afterA.length; i < j; i++) {
-                        _init.afterA[i].apply(this, arguments);
-                    }
-                },
-                getBeforeA: function(setting, node, array) {
-                    for (var i = 0, j = _init.beforeA.length; i < j; i++) {
-                        _init.beforeA[i].apply(this, arguments);
-                    }
-                },
-                getInnerAfterA: function(setting, node, array) {
-                    for (var i = 0, j = _init.innerAfterA.length; i < j; i++) {
-                        _init.innerAfterA[i].apply(this, arguments);
-                    }
-                },
-                getInnerBeforeA: function(setting, node, array) {
-                    for (var i = 0, j = _init.innerBeforeA.length; i < j; i++) {
-                        _init.innerBeforeA[i].apply(this, arguments);
-                    }
-                },
-                getCache: function(setting) {
-                    return caches[setting.treeId];
-                },
-                getNodeIndex: function(setting, node) {
-                    if (!node) return null;
-                    var childKey = setting.data.key.children,
-                        p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
-                    for (var i = 0, l = p[childKey].length - 1; i <= l; i++) {
-                        if (p[childKey][i] === node) {
-                            return i;
-                        }
-                    }
-                    return -1;
-                },
-                getNextNode: function(setting, node) {
-                    if (!node) return null;
-                    var childKey = setting.data.key.children,
-                        p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
-                    for (var i = 0, l = p[childKey].length - 1; i <= l; i++) {
-                        if (p[childKey][i] === node) {
-                            return (i == l ? null : p[childKey][i + 1]);
-                        }
-                    }
-                    return null;
-                },
-                getNodeByParam: function(setting, nodes, key, value) {
-                    if (!nodes || !key) return null;
-                    var childKey = setting.data.key.children;
-                    for (var i = 0, l = nodes.length; i < l; i++) {
-                        if (nodes[i][key] == value) {
-                            return nodes[i];
-                        }
-                        var tmp = data.getNodeByParam(setting, nodes[i][childKey], key, value);
-                        if (tmp) return tmp;
-                    }
-                    return null;
-                },
-                getNodeCache: function(setting, tId) {
-                    if (!tId) return null;
-                    var n = caches[setting.treeId].nodes[data.getNodeCacheId(tId)];
-                    return n ? n : null;
-                },
-                getNodeName: function(setting, node) {
-                    var nameKey = setting.data.key.name;
-                    return "" + node[nameKey];
-                },
-                getNodePath: function(setting, node) {
-                    if (!node) return null;
-
-                    var path;
-                    if (node.parentTId) {
-                        path = node.getParentNode().getPath();
-                    } else {
-                        path = [];
-                    }
-
-                    if (path) {
-                        path.push(node);
-                    }
-
-                    return path;
-                },
-                getNodeTitle: function(setting, node) {
-                    var t = setting.data.key.title === "" ? setting.data.key.name : setting.data.key.title;
-                    return "" + node[t];
-                },
-                getNodes: function(setting) {
-                    return data.getRoot(setting)[setting.data.key.children];
-                },
-                getNodesByParam: function(setting, nodes, key, value) {
-                    if (!nodes || !key) return [];
-                    var childKey = setting.data.key.children,
-                        result = [];
-                    for (var i = 0, l = nodes.length; i < l; i++) {
-                        if (nodes[i][key] == value) {
-                            result.push(nodes[i]);
-                        }
-                        result = result.concat(data.getNodesByParam(setting, nodes[i][childKey], key, value));
-                    }
-                    return result;
-                },
-                getNodesByParamFuzzy: function(setting, nodes, key, value) {
-                    if (!nodes || !key) return [];
-                    var childKey = setting.data.key.children,
-                        result = [];
-                    value = value.toLowerCase();
-                    for (var i = 0, l = nodes.length; i < l; i++) {
-                        if (typeof nodes[i][key] == "string" && nodes[i][key].toLowerCase().indexOf(value) > -1) {
-                            result.push(nodes[i]);
-                        }
-                        result = result.concat(data.getNodesByParamFuzzy(setting, nodes[i][childKey], key, value));
-                    }
-                    return result;
-                },
-                getNodesByFilter: function(setting, nodes, filter, isSingle, invokeParam) {
-                    if (!nodes) return (isSingle ? null : []);
-                    var childKey = setting.data.key.children,
-                        result = isSingle ? null : [];
-                    for (var i = 0, l = nodes.length; i < l; i++) {
-                        if (tools.apply(filter, [nodes[i], invokeParam], false)) {
-                            if (isSingle) {
-                                return nodes[i];
-                            }
-                            result.push(nodes[i]);
-                        }
-                        var tmpResult = data.getNodesByFilter(setting, nodes[i][childKey], filter, isSingle, invokeParam);
-                        if (isSingle && !!tmpResult) {
-                            return tmpResult;
-                        }
-                        result = isSingle ? tmpResult : result.concat(tmpResult);
-                    }
-                    return result;
-                },
-                getPreNode: function(setting, node) {
-                    if (!node) return null;
-                    var childKey = setting.data.key.children,
-                        p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
-                    for (var i = 0, l = p[childKey].length; i < l; i++) {
-                        if (p[childKey][i] === node) {
-                            return (i == 0 ? null : p[childKey][i - 1]);
-                        }
-                    }
-                    return null;
-                },
-                getRoot: function(setting) {
-                    return setting ? roots[setting.treeId] : null;
-                },
-                getRoots: function() {
-                    return roots;
-                },
-                getSetting: function(treeId) {
-                    return settings[treeId];
-                },
-                getSettings: function() {
-                    return settings;
-                },
-                getZTreeTools: function(treeId) {
-                    var r = this.getRoot(this.getSetting(treeId));
-                    return r ? r.treeTools : null;
-                },
-                initCache: function(setting) {
-                    for (var i = 0, j = _init.caches.length; i < j; i++) {
-                        _init.caches[i].apply(this, arguments);
-                    }
-                },
-                initNode: function(setting, level, node, parentNode, preNode, nextNode) {
-                    for (var i = 0, j = _init.nodes.length; i < j; i++) {
-                        _init.nodes[i].apply(this, arguments);
-                    }
-                },
-                initRoot: function(setting) {
-                    for (var i = 0, j = _init.roots.length; i < j; i++) {
-                        _init.roots[i].apply(this, arguments);
-                    }
-                },
-                isSelectedNode: function(setting, node) {
-                    var root = data.getRoot(setting);
-                    for (var i = 0, j = root.curSelectedList.length; i < j; i++) {
-                        if (node === root.curSelectedList[i]) return true;
-                    }
-                    return false;
-                },
-                removeNodeCache: function(setting, node) {
-                    var childKey = setting.data.key.children;
-                    if (node[childKey]) {
-                        for (var i = 0, l = node[childKey].length; i < l; i++) {
-                            data.removeNodeCache(setting, node[childKey][i]);
-                        }
-                    }
-                    data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = null;
-                },
-                removeSelectedNode: function(setting, node) {
-                    var root = data.getRoot(setting);
-                    for (var i = 0, j = root.curSelectedList.length; i < j; i++) {
-                        if (node === root.curSelectedList[i] || !data.getNodeCache(setting, root.curSelectedList[i].tId)) {
-                            root.curSelectedList.splice(i, 1);
-                            setting.treeObj.trigger(consts.event.UNSELECTED, [setting.treeId, node]);
-                            i--;
-                            j--;
-                        }
-                    }
-                },
-                setCache: function(setting, cache) {
-                    caches[setting.treeId] = cache;
-                },
-                setRoot: function(setting, root) {
-                    roots[setting.treeId] = root;
-                },
-                setZTreeTools: function(setting, zTreeTools) {
-                    for (var i = 0, j = _init.zTreeTools.length; i < j; i++) {
-                        _init.zTreeTools[i].apply(this, arguments);
-                    }
-                },
-                transformToArrayFormat: function(setting, nodes) {
-                    if (!nodes) return [];
-                    var childKey = setting.data.key.children,
-                        r = [];
-                    if (tools.isArray(nodes)) {
-                        for (var i = 0, l = nodes.length; i < l; i++) {
-                            r.push(nodes[i]);
-                            if (nodes[i][childKey])
-                                r = r.concat(data.transformToArrayFormat(setting, nodes[i][childKey]));
-                        }
-                    } else {
-                        r.push(nodes);
-                        if (nodes[childKey])
-                            r = r.concat(data.transformToArrayFormat(setting, nodes[childKey]));
-                    }
-                    return r;
-                },
-                transformTozTreeFormat: function(setting, sNodes) {
-                    var i, l,
-                        key = setting.data.simpleData.idKey,
-                        parentKey = setting.data.simpleData.pIdKey,
-                        childKey = setting.data.key.children;
-                    if (!key || key == "" || !sNodes) return [];
-
-                    if (tools.isArray(sNodes)) {
-                        var r = [];
-                        var tmpMap = {};
-                        for (i = 0, l = sNodes.length; i < l; i++) {
-                            tmpMap[sNodes[i][key]] = sNodes[i];
-                        }
-                        for (i = 0, l = sNodes.length; i < l; i++) {
-                            if (tmpMap[sNodes[i][parentKey]] && sNodes[i][key] != sNodes[i][parentKey]) {
-                                if (!tmpMap[sNodes[i][parentKey]][childKey])
-                                    tmpMap[sNodes[i][parentKey]][childKey] = [];
-                                tmpMap[sNodes[i][parentKey]][childKey].push(sNodes[i]);
-                            } else {
-                                r.push(sNodes[i]);
-                            }
-                        }
-                        return r;
-                    } else {
-                        return [sNodes];
-                    }
-                }
-            },
-            //method of event proxy
-            event = {
-                bindEvent: function(setting) {
-                    for (var i = 0, j = _init.bind.length; i < j; i++) {
-                        _init.bind[i].apply(this, arguments);
-                    }
-                },
-                unbindEvent: function(setting) {
-                    for (var i = 0, j = _init.unbind.length; i < j; i++) {
-                        _init.unbind[i].apply(this, arguments);
-                    }
-                },
-                bindTree: function(setting) {
-                    var eventParam = {
-                            treeId: setting.treeId
-                        },
-                        o = setting.treeObj;
-                    if (!setting.view.txtSelectedEnable) {
-                        // for can't select text
-                        o.bind('selectstart', handler.onSelectStart).css({
-                            "-moz-user-select": "-moz-none"
-                        });
-                    }
-                    o.bind('click', eventParam, event.proxy);
-                    o.bind('dblclick', eventParam, event.proxy);
-                    o.bind('mouseover', eventParam, event.proxy);
-                    o.bind('mouseout', eventParam, event.proxy);
-                    o.bind('mousedown', eventParam, event.proxy);
-                    o.bind('mouseup', eventParam, event.proxy);
-                    o.bind('contextmenu', eventParam, event.proxy);
-                },
-                unbindTree: function(setting) {
-                    var o = setting.treeObj;
-                    o.unbind('selectstart', handler.onSelectStart)
-                        .unbind('click', event.proxy)
-                        .unbind('dblclick', event.proxy)
-                        .unbind('mouseover', event.proxy)
-                        .unbind('mouseout', event.proxy)
-                        .unbind('mousedown', event.proxy)
-                        .unbind('mouseup', event.proxy)
-                        .unbind('contextmenu', event.proxy);
-                },
-                doProxy: function(e) {
-                    var results = [];
-                    for (var i = 0, j = _init.proxys.length; i < j; i++) {
-                        var proxyResult = _init.proxys[i].apply(this, arguments);
-                        results.push(proxyResult);
-                        if (proxyResult.stop) {
-                            break;
-                        }
-                    }
-                    return results;
-                },
-                proxy: function(e) {
-                    var setting = data.getSetting(e.data.treeId);
-                    if (!tools.uCanDo(setting, e)) return true;
-                    var results = event.doProxy(e),
-                        r = true,
-                        x = false;
-                    for (var i = 0, l = results.length; i < l; i++) {
-                        var proxyResult = results[i];
-                        if (proxyResult.nodeEventCallback) {
-                            x = true;
-                            r = proxyResult.nodeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
-                        }
-                        if (proxyResult.treeEventCallback) {
-                            x = true;
-                            r = proxyResult.treeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
-                        }
-                    }
-                    return r;
-                }
-            },
-            //method of event handler
-            handler = {
-                onSwitchNode: function(event, node) {
-                    var setting = data.getSetting(event.data.treeId);
-                    if (node.open) {
-                        if (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false) return true;
-                        data.getRoot(setting).expandTriggerFlag = true;
-                        view.switchNode(setting, node);
-                    } else {
-                        if (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false) return true;
-                        data.getRoot(setting).expandTriggerFlag = true;
-                        view.switchNode(setting, node);
-                    }
-                    return true;
-                },
-                onClickNode: function(event, node) {
-                    var setting = data.getSetting(event.data.treeId),
-                        clickFlag = ((setting.view.autoCancelSelected && (event.ctrlKey || event.metaKey)) && data.isSelectedNode(setting, node)) ? 0 : (setting.view.autoCancelSelected && (event.ctrlKey || event.metaKey) && setting.view.selectedMulti) ? 2 : 1;
-                    if (tools.apply(setting.callback.beforeClick, [setting.treeId, node, clickFlag], true) == false) return true;
-                    if (clickFlag === 0) {
-                        view.cancelPreSelectedNode(setting, node);
-                    } else {
-                        view.selectNode(setting, node, clickFlag === 2);
-                    }
-                    setting.treeObj.trigger(consts.event.CLICK, [event, setting.treeId, node, clickFlag]);
-                    return true;
-                },
-                onZTreeMousedown: function(event, node) {
-                    var setting = data.getSetting(event.data.treeId);
-                    if (tools.apply(setting.callback.beforeMouseDown, [setting.treeId, node], true)) {
-                        tools.apply(setting.callback.onMouseDown, [event, setting.treeId, node]);
-                    }
-                    return true;
-                },
-                onZTreeMouseup: function(event, node) {
-                    var setting = data.getSetting(event.data.treeId);
-                    if (tools.apply(setting.callback.beforeMouseUp, [setting.treeId, node], true)) {
-                        tools.apply(setting.callback.onMouseUp, [event, setting.treeId, node]);
-                    }
-                    return true;
-                },
-                onZTreeDblclick: function(event, node) {
-                    var setting = data.getSetting(event.data.treeId);
-                    if (tools.apply(setting.callback.beforeDblClick, [setting.treeId, node], true)) {
-                        tools.apply(setting.callback.onDblClick, [event, setting.treeId, node]);
-                    }
-                    return true;
-                },
-                onZTreeContextmenu: function(event, node) {
-                    var setting = data.getSetting(event.data.treeId);
-                    if (tools.apply(setting.callback.beforeRightClick, [setting.treeId, node], true)) {
-                        tools.apply(setting.callback.onRightClick, [event, setting.treeId, node]);
-                    }
-                    return (typeof setting.callback.onRightClick) != "function";
-                },
-                onSelectStart: function(e) {
-                    var n = e.originalEvent.srcElement.nodeName.toLowerCase();
-                    return (n === "input" || n === "textarea");
-                }
-            },
-            //method of tools for zTree
-            tools = {
-                apply: function(fun, param, defaultValue) {
-                    if ((typeof fun) == "function") {
-                        return fun.apply(zt, param ? param : []);
-                    }
-                    return defaultValue;
-                },
-                canAsync: function(setting, node) {
-                    var childKey = setting.data.key.children;
-                    return (setting.async.enable && node && node.isParent && !(node.zAsync || (node[childKey] && node[childKey].length > 0)));
-                },
-                clone: function(obj) {
-                    if (obj === null) return null;
-                    var o = tools.isArray(obj) ? [] : {};
-                    for (var i in obj) {
-                        o[i] = (obj[i] instanceof Date) ? new Date(obj[i].getTime()) : (typeof obj[i] === "object" ? tools.clone(obj[i]) : obj[i]);
-                    }
-                    return o;
-                },
-                eqs: function(str1, str2) {
-                    return str1.toLowerCase() === str2.toLowerCase();
-                },
-                isArray: function(arr) {
-                    return Object.prototype.toString.apply(arr) === "[object Array]";
-                },
-                isElement: function(o) {
-                    return (
-                        typeof HTMLElement === "object" ? o instanceof HTMLElement : //DOM2
-                        o && typeof o === "object" && o !== null && o.nodeType === 1 && typeof o.nodeName === "string"
-                    );
-                },
-                $: function(node, exp, setting) {
-                    if (!!exp && typeof exp != "string") {
-                        setting = exp;
-                        exp = "";
-                    }
-                    if (typeof node == "string") {
-                        return $(node, setting ? setting.treeObj.get(0).ownerDocument : null);
-                    } else {
-                        return $("#" + node.tId + exp, setting ? setting.treeObj : null);
-                    }
-                },
-                getMDom: function(setting, curDom, targetExpr) {
-                    if (!curDom) return null;
-                    while (curDom && curDom.id !== setting.treeId) {
-                        for (var i = 0, l = targetExpr.length; curDom.tagName && i < l; i++) {
-                            if (tools.eqs(curDom.tagName, targetExpr[i].tagName) && curDom.getAttribute(targetExpr[i].attrName) !== null) {
-                                return curDom;
-                            }
-                        }
-                        curDom = curDom.parentNode;
-                    }
-                    return null;
-                },
-                getNodeMainDom: function(target) {
-                    return ($(target).parent("li").get(0) || $(target).parentsUntil("li").parent().get(0));
-                },
-                isChildOrSelf: function(dom, parentId) {
-                    return ($(dom).closest("#" + parentId).length > 0);
-                },
-                uCanDo: function(setting, e) {
-                    return true;
-                }
-            },
-            //method of operate ztree dom
-            view = {
-                addNodes: function(setting, parentNode, index, newNodes, isSilent) {
-                    if (setting.data.keep.leaf && parentNode && !parentNode.isParent) {
-                        return;
-                    }
-                    if (!tools.isArray(newNodes)) {
-                        newNodes = [newNodes];
-                    }
-                    if (setting.data.simpleData.enable) {
-                        newNodes = data.transformTozTreeFormat(setting, newNodes);
-                    }
-                    if (parentNode) {
-                        var target_switchObj = $$(parentNode, consts.id.SWITCH, setting),
-                            target_icoObj = $$(parentNode, consts.id.ICON, setting),
-                            target_ulObj = $$(parentNode, consts.id.UL, setting);
-
-                        if (!parentNode.open) {
-                            view.replaceSwitchClass(parentNode, target_switchObj, consts.folder.CLOSE);
-                            view.replaceIcoClass(parentNode, target_icoObj, consts.folder.CLOSE);
-                            parentNode.open = false;
-                            target_ulObj.css({
-                                "display": "none"
-                            });
-                        }
-
-                        data.addNodesData(setting, parentNode, index, newNodes);
-                        view.createNodes(setting, parentNode.level + 1, newNodes, parentNode, index);
-                        if (!isSilent) {
-                            view.expandCollapseParentNode(setting, parentNode, true);
-                        }
-                    } else {
-                        data.addNodesData(setting, data.getRoot(setting), index, newNodes);
-                        view.createNodes(setting, 0, newNodes, null, index);
-                    }
-                },
-                appendNodes: function(setting, level, nodes, parentNode, index, initFlag, openFlag) {
-                    if (!nodes) return [];
-                    var html = [],
-                        childKey = setting.data.key.children;
-
-                    var tmpPNode = (parentNode) ? parentNode : data.getRoot(setting),
-                        tmpPChild = tmpPNode[childKey],
-                        isFirstNode, isLastNode;
-
-                    if (!tmpPChild || index >= tmpPChild.length - nodes.length) {
-                        index = -1;
-                    }
-
-                    for (var i = 0, l = nodes.length; i < l; i++) {
-                        var node = nodes[i];
-                        if (initFlag) {
-                            isFirstNode = ((index === 0 || tmpPChild.length == nodes.length) && (i == 0));
-                            isLastNode = (index < 0 && i == (nodes.length - 1));
-                            data.initNode(setting, level, node, parentNode, isFirstNode, isLastNode, openFlag);
-                            data.addNodeCache(setting, node);
-                        }
-
-                        var childHtml = [];
-                        if (node[childKey] && node[childKey].length > 0) {
-                            //make child html first, because checkType
-                            childHtml = view.appendNodes(setting, level + 1, node[childKey], node, -1, initFlag, openFlag && node.open);
-                        }
-                        if (openFlag) {
-
-                            view.makeDOMNodeMainBefore(html, setting, node);
-                            view.makeDOMNodeLine(html, setting, node);
-                            data.getBeforeA(setting, node, html);
-                            view.makeDOMNodeNameBefore(html, setting, node);
-                            data.getInnerBeforeA(setting, node, html);
-                            view.makeDOMNodeIcon(html, setting, node);
-                            data.getInnerAfterA(setting, node, html);
-                            view.makeDOMNodeNameAfter(html, setting, node);
-                            data.getAfterA(setting, node, html);
-                            if (node.isParent && node.open) {
-                                view.makeUlHtml(setting, node, html, childHtml.join(''));
-                            }
-                            view.makeDOMNodeMainAfter(html, setting, node);
-                            data.addCreatedNode(setting, node);
-                        }
-                    }
-                    return html;
-                },
-                appendParentULDom: function(setting, node) {
-                    var html = [],
-                        nObj = $$(node, setting);
-                    if (!nObj.get(0) && !!node.parentTId) {
-                        view.appendParentULDom(setting, node.getParentNode());
-                        nObj = $$(node, setting);
-                    }
-                    var ulObj = $$(node, consts.id.UL, setting);
-                    if (ulObj.get(0)) {
-                        ulObj.remove();
-                    }
-                    var childKey = setting.data.key.children,
-                        childHtml = view.appendNodes(setting, node.level + 1, node[childKey], node, -1, false, true);
-                    view.makeUlHtml(setting, node, html, childHtml.join(''));
-                    nObj.append(html.join(''));
-                },
-                asyncNode: function(setting, node, isSilent, callback) {
-                    var i, l;
-                    if (node && !node.isParent) {
-                        tools.apply(callback);
-                        return false;
-                    } else if (node && node.isAjaxing) {
-                        return false;
-                    } else if (tools.apply(setting.callback.beforeAsync, [setting.treeId, node], true) == false) {
-                        tools.apply(callback);
-                        return false;
-                    }
-                    if (node) {
-                        node.isAjaxing = true;
-                        var icoObj = $$(node, consts.id.ICON, setting);
-                        icoObj.attr({ "style": "", "class": consts.className.BUTTON + " " + consts.className.ICO_LOADING });
-                    }
-
-                    var tmpParam = {};
-                    for (i = 0, l = setting.async.autoParam.length; node && i < l; i++) {
-                        var pKey = setting.async.autoParam[i].split("="),
-                            spKey = pKey;
-                        if (pKey.length > 1) {
-                            spKey = pKey[1];
-                            pKey = pKey[0];
-                        }
-                        tmpParam[spKey] = node[pKey];
-                    }
-                    if (tools.isArray(setting.async.otherParam)) {
-                        for (i = 0, l = setting.async.otherParam.length; i < l; i += 2) {
-                            tmpParam[setting.async.otherParam[i]] = setting.async.otherParam[i + 1];
-                        }
-                    } else {
-                        for (var p in setting.async.otherParam) {
-                            tmpParam[p] = setting.async.otherParam[p];
-                        }
-                    }
-
-                    var _tmpV = data.getRoot(setting)._ver;
-                    $.ajax({
-                        contentType: setting.async.contentType,
-                        cache: false,
-                        type: setting.async.type,
-                        url: tools.apply(setting.async.url, [setting.treeId, node], setting.async.url),
-                        data: setting.async.contentType.indexOf('application/json') > -1 ? JSON.stringify(tmpParam) : tmpParam,
-                        dataType: setting.async.dataType,
-                        success: function(msg) {
-                            if (_tmpV != data.getRoot(setting)._ver) {
-                                return;
-                            }
-                            var newNodes = [];
-                            try {
-                                if (!msg || msg.length == 0) {
-                                    newNodes = [];
-                                } else if (typeof msg == "string") {
-                                    newNodes = eval("(" + msg + ")");
-                                } else {
-                                    newNodes = msg;
-                                }
-                            } catch (err) {
-                                newNodes = msg;
-                            }
-
-                            if (node) {
-                                node.isAjaxing = null;
-                                node.zAsync = true;
-                            }
-                            view.setNodeLineIcos(setting, node);
-                            if (newNodes && newNodes !== "") {
-                                newNodes = tools.apply(setting.async.dataFilter, [setting.treeId, node, newNodes], newNodes);
-                                view.addNodes(setting, node, -1, !!newNodes ? tools.clone(newNodes) : [], !!isSilent);
-                            } else {
-                                view.addNodes(setting, node, -1, [], !!isSilent);
-                            }
-                            setting.treeObj.trigger(consts.event.ASYNC_SUCCESS, [setting.treeId, node, msg]);
-                            tools.apply(callback);
-                        },
-                        error: function(XMLHttpRequest, textStatus, errorThrown) {
-                            if (_tmpV != data.getRoot(setting)._ver) {
-                                return;
-                            }
-                            if (node) node.isAjaxing = null;
-                            view.setNodeLineIcos(setting, node);
-                            setting.treeObj.trigger(consts.event.ASYNC_ERROR, [setting.treeId, node, XMLHttpRequest, textStatus, errorThrown]);
-                        }
-                    });
-                    return true;
-                },
-                cancelPreSelectedNode: function(setting, node, excludeNode) {
-                    var list = data.getRoot(setting).curSelectedList,
-                        i, n;
-                    for (i = list.length - 1; i >= 0; i--) {
-                        n = list[i];
-                        if (node === n || (!node && (!excludeNode || excludeNode !== n))) {
-                            $$(n, consts.id.A, setting).removeClass(consts.node.CURSELECTED);
-                            if (node) {
-                                data.removeSelectedNode(setting, node);
-                                break;
-                            } else {
-                                list.splice(i, 1);
-                                setting.treeObj.trigger(consts.event.UNSELECTED, [setting.treeId, n]);
-                            }
-                        }
-                    }
-                },
-                createNodeCallback: function(setting) {
-                    if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
-                        var root = data.getRoot(setting);
-                        while (root.createdNodes.length > 0) {
-                            var node = root.createdNodes.shift();
-                            tools.apply(setting.view.addDiyDom, [setting.treeId, node]);
-                            if (!!setting.callback.onNodeCreated) {
-                                setting.treeObj.trigger(consts.event.NODECREATED, [setting.treeId, node]);
-                            }
-                        }
-                    }
-                },
-                createNodes: function(setting, level, nodes, parentNode, index) {
-                    if (!nodes || nodes.length == 0) return;
-                    var root = data.getRoot(setting),
-                        childKey = setting.data.key.children,
-                        openFlag = !parentNode || parentNode.open || !!$$(parentNode[childKey][0], setting).get(0);
-                    root.createdNodes = [];
-                    var zTreeHtml = view.appendNodes(setting, level, nodes, parentNode, index, true, openFlag),
-                        parentObj, nextObj;
-
-                    if (!parentNode) {
-                        parentObj = setting.treeObj;
-                        //setting.treeObj.append(zTreeHtml.join(''));
-                    } else {
-                        var ulObj = $$(parentNode, consts.id.UL, setting);
-                        if (ulObj.get(0)) {
-                            parentObj = ulObj;
-                            //ulObj.append(zTreeHtml.join(''));
-                        }
-                    }
-                    if (parentObj) {
-                        if (index >= 0) {
-                            nextObj = parentObj.children()[index];
-                        }
-                        if (index >= 0 && nextObj) {
-                            $(nextObj).before(zTreeHtml.join(''));
-                        } else {
-                            parentObj.append(zTreeHtml.join(''));
-                        }
-                    }
-
-                    view.createNodeCallback(setting);
-                },
-                destroy: function(setting) {
-                    if (!setting) return;
-                    data.initCache(setting);
-                    data.initRoot(setting);
-                    event.unbindTree(setting);
-                    event.unbindEvent(setting);
-                    setting.treeObj.empty();
-                    delete settings[setting.treeId];
-                },
-                expandCollapseNode: function(setting, node, expandFlag, animateFlag, callback) {
-                    var root = data.getRoot(setting),
-                        childKey = setting.data.key.children;
-                    var tmpCb, _callback;
-                    if (!node) {
-                        tools.apply(callback, []);
-                        return;
-                    }
-                    if (root.expandTriggerFlag) {
-                        _callback = callback;
-                        tmpCb = function() {
-                            if (_callback) _callback();
-                            if (node.open) {
-                                setting.treeObj.trigger(consts.event.EXPAND, [setting.treeId, node]);
-                            } else {
-                                setting.treeObj.trigger(consts.event.COLLAPSE, [setting.treeId, node]);
-                            }
-                        };
-                        callback = tmpCb;
-                        root.expandTriggerFlag = false;
-                    }
-                    if (!node.open && node.isParent && ((!$$(node, consts.id.UL, setting).get(0)) || (node[childKey] && node[childKey].length > 0 && !$$(node[childKey][0], setting).get(0)))) {
-                        view.appendParentULDom(setting, node);
-                        view.createNodeCallback(setting);
-                    }
-                    if (node.open == expandFlag) {
-                        tools.apply(callback, []);
-                        return;
-                    }
-                    var ulObj = $$(node, consts.id.UL, setting),
-                        switchObj = $$(node, consts.id.SWITCH, setting),
-                        icoObj = $$(node, consts.id.ICON, setting);
-
-                    if (node.isParent) {
-                        node.open = !node.open;
-                        if (node.iconOpen && node.iconClose) {
-                            icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
-                        }
-
-                        if (node.open) {
-                            view.replaceSwitchClass(node, switchObj, consts.folder.OPEN);
-                            view.replaceIcoClass(node, icoObj, consts.folder.OPEN);
-                            if (animateFlag == false || setting.view.expandSpeed == "") {
-                                ulObj.show();
-                                tools.apply(callback, []);
-                            } else {
-                                if (node[childKey] && node[childKey].length > 0) {
-                                    ulObj.slideDown(setting.view.expandSpeed, callback);
-                                } else {
-                                    ulObj.show();
-                                    tools.apply(callback, []);
-                                }
-                            }
-                        } else {
-                            view.replaceSwitchClass(node, switchObj, consts.folder.CLOSE);
-                            view.replaceIcoClass(node, icoObj, consts.folder.CLOSE);
-                            if (animateFlag == false || setting.view.expandSpeed == "" || !(node[childKey] && node[childKey].length > 0)) {
-                                ulObj.hide();
-                                tools.apply(callback, []);
-                            } else {
-                                ulObj.slideUp(setting.view.expandSpeed, callback);
-                            }
-                        }
-                    } else {
-                        tools.apply(callback, []);
-                    }
-                },
-                expandCollapseParentNode: function(setting, node, expandFlag, animateFlag, callback) {
-                    if (!node) return;
-                    if (!node.parentTId) {
-                        view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback);
-                        return;
-                    } else {
-                        view.expandCollapseNode(setting, node, expandFlag, animateFlag);
-                    }
-                    if (node.parentTId) {
-                        view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, animateFlag, callback);
-                    }
-                },
-                expandCollapseSonNode: function(setting, node, expandFlag, animateFlag, callback) {
-                    var root = data.getRoot(setting),
-                        childKey = setting.data.key.children,
-                        treeNodes = (node) ? node[childKey] : root[childKey],
-                        selfAnimateSign = (node) ? false : animateFlag,
-                        expandTriggerFlag = data.getRoot(setting).expandTriggerFlag;
-                    data.getRoot(setting).expandTriggerFlag = false;
-                    if (treeNodes) {
-                        for (var i = 0, l = treeNodes.length; i < l; i++) {
-                            if (treeNodes[i]) view.expandCollapseSonNode(setting, treeNodes[i], expandFlag, selfAnimateSign);
-                        }
-                    }
-                    data.getRoot(setting).expandTriggerFlag = expandTriggerFlag;
-                    view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback);
-                },
-                isSelectedNode: function(setting, node) {
-                    if (!node) {
-                        return false;
-                    }
-                    var list = data.getRoot(setting).curSelectedList,
-                        i;
-                    for (i = list.length - 1; i >= 0; i--) {
-                        if (node === list[i]) {
-                            return true;
-                        }
-                    }
-                    return false;
-                },
-                makeDOMNodeIcon: function(html, setting, node) {
-                    var nameStr = data.getNodeName(setting, node),
-                        name = setting.view.nameIsHTML ? nameStr : nameStr.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-                    html.push("<span id='", node.tId, consts.id.ICON,
-                        "' title='' treeNode", consts.id.ICON, " class='", view.makeNodeIcoClass(setting, node),
-                        "' style='", view.makeNodeIcoStyle(setting, node), "'></span><span id='", node.tId, consts.id.SPAN,
-                        "' class='", consts.className.NAME,
-                        "'>", name, "</span>");
-                },
-                makeDOMNodeLine: function(html, setting, node) {
-                    html.push("<span id='", node.tId, consts.id.SWITCH, "' title='' class='", view.makeNodeLineClass(setting, node), "' treeNode", consts.id.SWITCH, "></span>");
-                },
-                makeDOMNodeMainAfter: function(html, setting, node) {
-                    html.push("</li>");
-                },
-                makeDOMNodeMainBefore: function(html, setting, node) {
-                    html.push("<li id='", node.tId, "' class='", consts.className.LEVEL, node.level, "' tabindex='0' hidefocus='true' treenode>");
-                },
-                makeDOMNodeNameAfter: function(html, setting, node) {
-                    html.push("</a>");
-                },
-                makeDOMNodeNameBefore: function(html, setting, node) {
-                    var title = data.getNodeTitle(setting, node),
-                        url = view.makeNodeUrl(setting, node),
-                        fontcss = view.makeNodeFontCss(setting, node),
-                        fontStyle = [];
-                    for (var f in fontcss) {
-                        fontStyle.push(f, ":", fontcss[f], ";");
-                    }
-                    html.push("<a id='", node.tId, consts.id.A, "' class='", consts.className.LEVEL, node.level, "' treeNode", consts.id.A, " onclick=\"", (node.click || ''),
-                        "\" ", ((url != null && url.length > 0) ? "href='" + url + "'" : ""), " target='", view.makeNodeTarget(node), "' style='", fontStyle.join(''),
-                        "'");
-                    if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle) && title) {
-                        html.push("title='", title.replace(/'/g, "&#39;").replace(/</g, '&lt;').replace(/>/g, '&gt;'), "'");
-                    }
-                    html.push(">");
-                },
-                makeNodeFontCss: function(setting, node) {
-                    var fontCss = tools.apply(setting.view.fontCss, [setting.treeId, node], setting.view.fontCss);
-                    return (fontCss && ((typeof fontCss) != "function")) ? fontCss : {};
-                },
-                makeNodeIcoClass: function(setting, node) {
-                    var icoCss = ["ico"];
-                    if (!node.isAjaxing) {
-                        icoCss[0] = (node.iconSkin ? node.iconSkin + "_" : "") + icoCss[0];
-                        if (node.isParent) {
-                            icoCss.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
-                        } else {
-                            icoCss.push(consts.folder.DOCU);
-                        }
-                    }
-                    return consts.className.BUTTON + " " + icoCss.join('_');
-                },
-                makeNodeIcoStyle: function(setting, node) {
-                    var icoStyle = [];
-                    if (!node.isAjaxing) {
-                        var icon = (node.isParent && node.iconOpen && node.iconClose) ? (node.open ? node.iconOpen : node.iconClose) : node[setting.data.key.icon];
-                        if (icon) icoStyle.push("background:url(", icon, ") 0 0 no-repeat;");
-                        if (setting.view.showIcon == false || !tools.apply(setting.view.showIcon, [setting.treeId, node], true)) {
-                            icoStyle.push("width:0px;height:0px;");
-                        }
-                    }
-                    return icoStyle.join('');
-                },
-                makeNodeLineClass: function(setting, node) {
-                    var lineClass = [];
-                    if (setting.view.showLine) {
-                        if (node.level == 0 && node.isFirstNode && node.isLastNode) {
-                            lineClass.push(consts.line.ROOT);
-                        } else if (node.level == 0 && node.isFirstNode) {
-                            lineClass.push(consts.line.ROOTS);
-                        } else if (node.isLastNode) {
-                            lineClass.push(consts.line.BOTTOM);
-                        } else {
-                            lineClass.push(consts.line.CENTER);
-                        }
-                    } else {
-                        lineClass.push(consts.line.NOLINE);
-                    }
-                    if (node.isParent) {
-                        lineClass.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
-                    } else {
-                        lineClass.push(consts.folder.DOCU);
-                    }
-                    return view.makeNodeLineClassEx(node) + lineClass.join('_');
-                },
-                makeNodeLineClassEx: function(node) {
-                    return consts.className.BUTTON + " " + consts.className.LEVEL + node.level + " " + consts.className.SWITCH + " ";
-                },
-                makeNodeTarget: function(node) {
-                    return (node.target || "_blank");
-                },
-                makeNodeUrl: function(setting, node) {
-                    var urlKey = setting.data.key.url;
-                    return node[urlKey] ? node[urlKey] : null;
-                },
-                makeUlHtml: function(setting, node, html, content) {
-                    html.push("<ul id='", node.tId, consts.id.UL, "' class='", consts.className.LEVEL, node.level, " ", view.makeUlLineClass(setting, node), "' style='display:", (node.open ? "block" : "none"), "'>");
-                    html.push(content);
-                    html.push("</ul>");
-                },
-                makeUlLineClass: function(setting, node) {
-                    return ((setting.view.showLine && !node.isLastNode) ? consts.line.LINE : "");
-                },
-                removeChildNodes: function(setting, node) {
-                    if (!node) return;
-                    var childKey = setting.data.key.children,
-                        nodes = node[childKey];
-                    if (!nodes) return;
-
-                    for (var i = 0, l = nodes.length; i < l; i++) {
-                        data.removeNodeCache(setting, nodes[i]);
-                    }
-                    data.removeSelectedNode(setting);
-                    delete node[childKey];
-
-                    if (!setting.data.keep.parent) {
-                        node.isParent = false;
-                        node.open = false;
-                        var tmp_switchObj = $$(node, consts.id.SWITCH, setting),
-                            tmp_icoObj = $$(node, consts.id.ICON, setting);
-                        view.replaceSwitchClass(node, tmp_switchObj, consts.folder.DOCU);
-                        view.replaceIcoClass(node, tmp_icoObj, consts.folder.DOCU);
-                        $$(node, consts.id.UL, setting).remove();
-                    } else {
-                        $$(node, consts.id.UL, setting).empty();
-                    }
-                },
-                scrollIntoView: function(dom) {
-                    if (!dom) {
-                        return;
-                    }
-                    // code src: http://jsfiddle.net/08u6cxwj/
-                    if (!Element.prototype.scrollIntoViewIfNeeded) {
-                        Element.prototype.scrollIntoViewIfNeeded = function(centerIfNeeded) {
-                            function withinBounds(value, min, max, extent) {
-                                if (false === centerIfNeeded || max <= value + extent && value <= min + extent) {
-                                    return Math.min(max, Math.max(min, value));
-                                } else {
-                                    return (min + max) / 2;
-                                }
-                            }
-
-                            function makeArea(left, top, width, height) {
-                                return {
-                                    "left": left,
-                                    "top": top,
-                                    "width": width,
-                                    "height": height,
-                                    "right": left + width,
-                                    "bottom": top + height,
-                                    "translate": function(x, y) {
-                                        return makeArea(x + left, y + top, width, height);
-                                    },
-                                    "relativeFromTo": function(lhs, rhs) {
-                                        var newLeft = left,
-                                            newTop = top;
-                                        lhs = lhs.offsetParent;
-                                        rhs = rhs.offsetParent;
-                                        if (lhs === rhs) {
-                                            return area;
-                                        }
-                                        for (; lhs; lhs = lhs.offsetParent) {
-                                            newLeft += lhs.offsetLeft + lhs.clientLeft;
-                                            newTop += lhs.offsetTop + lhs.clientTop;
-                                        }
-                                        for (; rhs; rhs = rhs.offsetParent) {
-                                            newLeft -= rhs.offsetLeft + rhs.clientLeft;
-                                            newTop -= rhs.offsetTop + rhs.clientTop;
-                                        }
-                                        return makeArea(newLeft, newTop, width, height);
-                                    }
-                                };
-                            }
-
-                            var parent, elem = this,
-                                area = makeArea(
-                                    this.offsetLeft, this.offsetTop,
-                                    this.offsetWidth, this.offsetHeight);
-                            while (tools.isElement(parent = elem.parentNode)) {
-                                var clientLeft = parent.offsetLeft + parent.clientLeft;
-                                var clientTop = parent.offsetTop + parent.clientTop;
-
-                                // Make area relative to parent's client area.
-                                area = area.relativeFromTo(elem, parent).translate(-clientLeft, -clientTop);
-
-                                parent.scrollLeft = withinBounds(
-                                    parent.scrollLeft,
-                                    area.right - parent.clientWidth, area.left,
-                                    parent.clientWidth);
-
-                                parent.scrollTop = withinBounds(
-                                    parent.scrollTop,
-                                    area.bottom - parent.clientHeight, area.top,
-                                    parent.clientHeight);
-
-                                // Determine actual scroll amount by reading back scroll properties.
-                                area = area.translate(clientLeft - parent.scrollLeft,
-                                    clientTop - parent.scrollTop);
-                                elem = parent;
-                            }
-                        };
-                    }
-                    dom.scrollIntoViewIfNeeded();
-                },
-                setFirstNode: function(setting, parentNode) {
-                    var childKey = setting.data.key.children,
-                        childLength = parentNode[childKey].length;
-                    if (childLength > 0) {
-                        parentNode[childKey][0].isFirstNode = true;
-                    }
-                },
-                setLastNode: function(setting, parentNode) {
-                    var childKey = setting.data.key.children,
-                        childLength = parentNode[childKey].length;
-                    if (childLength > 0) {
-                        parentNode[childKey][childLength - 1].isLastNode = true;
-                    }
-                },
-                removeNode: function(setting, node) {
-                    var root = data.getRoot(setting),
-                        childKey = setting.data.key.children,
-                        parentNode = (node.parentTId) ? node.getParentNode() : root;
-
-                    node.isFirstNode = false;
-                    node.isLastNode = false;
-                    node.getPreNode = function() {
-                        return null;
-                    };
-                    node.getNextNode = function() {
-                        return null;
-                    };
-
-                    if (!data.getNodeCache(setting, node.tId)) {
-                        return;
-                    }
-
-                    $$(node, setting).remove();
-                    data.removeNodeCache(setting, node);
-                    data.removeSelectedNode(setting, node);
-
-                    for (var i = 0, l = parentNode[childKey].length; i < l; i++) {
-                        if (parentNode[childKey][i].tId == node.tId) {
-                            parentNode[childKey].splice(i, 1);
-                            break;
-                        }
-                    }
-                    view.setFirstNode(setting, parentNode);
-                    view.setLastNode(setting, parentNode);
-
-                    var tmp_ulObj, tmp_switchObj, tmp_icoObj,
-                        childLength = parentNode[childKey].length;
-
-                    //repair nodes old parent
-                    if (!setting.data.keep.parent && childLength == 0) {
-                        //old parentNode has no child nodes
-                        parentNode.isParent = false;
-                        parentNode.open = false;
-                        tmp_ulObj = $$(parentNode, consts.id.UL, setting);
-                        tmp_switchObj = $$(parentNode, consts.id.SWITCH, setting);
-                        tmp_icoObj = $$(parentNode, consts.id.ICON, setting);
-                        view.replaceSwitchClass(parentNode, tmp_switchObj, consts.folder.DOCU);
-                        view.replaceIcoClass(parentNode, tmp_icoObj, consts.folder.DOCU);
-                        tmp_ulObj.css("display", "none");
-
-                    } else if (setting.view.showLine && childLength > 0) {
-                        //old parentNode has child nodes
-                        var newLast = parentNode[childKey][childLength - 1];
-                        tmp_ulObj = $$(newLast, consts.id.UL, setting);
-                        tmp_switchObj = $$(newLast, consts.id.SWITCH, setting);
-                        tmp_icoObj = $$(newLast, consts.id.ICON, setting);
-                        if (parentNode == root) {
-                            if (parentNode[childKey].length == 1) {
-                                //node was root, and ztree has only one root after move node
-                                view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.ROOT);
-                            } else {
-                                var tmp_first_switchObj = $$(parentNode[childKey][0], consts.id.SWITCH, setting);
-                                view.replaceSwitchClass(parentNode[childKey][0], tmp_first_switchObj, consts.line.ROOTS);
-                                view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
-                            }
-                        } else {
-                            view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
-                        }
-                        tmp_ulObj.removeClass(consts.line.LINE);
-                    }
-                },
-                replaceIcoClass: function(node, obj, newName) {
-                    if (!obj || node.isAjaxing) return;
-                    var tmpName = obj.attr("class");
-                    if (tmpName == undefined) return;
-                    var tmpList = tmpName.split("_");
-                    switch (newName) {
-                        case consts.folder.OPEN:
-                        case consts.folder.CLOSE:
-                        case consts.folder.DOCU:
-                            tmpList[tmpList.length - 1] = newName;
-                            break;
-                    }
-                    obj.attr("class", tmpList.join("_"));
-                },
-                replaceSwitchClass: function(node, obj, newName) {
-                    if (!obj) return;
-                    var tmpName = obj.attr("class");
-                    if (tmpName == undefined) return;
-                    var tmpList = tmpName.split("_");
-                    switch (newName) {
-                        case consts.line.ROOT:
-                        case consts.line.ROOTS:
-                        case consts.line.CENTER:
-                        case consts.line.BOTTOM:
-                        case consts.line.NOLINE:
-                            tmpList[0] = view.makeNodeLineClassEx(node) + newName;
-                            break;
-                        case consts.folder.OPEN:
-                        case consts.folder.CLOSE:
-                        case consts.folder.DOCU:
-                            tmpList[1] = newName;
-                            break;
-                    }
-                    obj.attr("class", tmpList.join("_"));
-                    if (newName !== consts.folder.DOCU) {
-                        obj.removeAttr("disabled");
-                    } else {
-                        obj.attr("disabled", "disabled");
-                    }
-                },
-                selectNode: function(setting, node, addFlag) {
-                    if (!addFlag) {
-                        view.cancelPreSelectedNode(setting, null, node);
-                    }
-                    $$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED);
-                    data.addSelectedNode(setting, node);
-                    setting.treeObj.trigger(consts.event.SELECTED, [setting.treeId, node]);
-                },
-                setNodeFontCss: function(setting, treeNode) {
-                    var aObj = $$(treeNode, consts.id.A, setting),
-                        fontCss = view.makeNodeFontCss(setting, treeNode);
-                    if (fontCss) {
-                        aObj.css(fontCss);
-                    }
-                },
-                setNodeLineIcos: function(setting, node) {
-                    if (!node) return;
-                    var switchObj = $$(node, consts.id.SWITCH, setting),
-                        ulObj = $$(node, consts.id.UL, setting),
-                        icoObj = $$(node, consts.id.ICON, setting),
-                        ulLine = view.makeUlLineClass(setting, node);
-                    if (ulLine.length == 0) {
-                        ulObj.removeClass(consts.line.LINE);
-                    } else {
-                        ulObj.addClass(ulLine);
-                    }
-                    switchObj.attr("class", view.makeNodeLineClass(setting, node));
-                    if (node.isParent) {
-                        switchObj.removeAttr("disabled");
-                    } else {
-                        switchObj.attr("disabled", "disabled");
-                    }
-                    icoObj.removeAttr("style");
-                    icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
-                    icoObj.attr("class", view.makeNodeIcoClass(setting, node));
-                },
-                setNodeName: function(setting, node) {
-                    var title = data.getNodeTitle(setting, node),
-                        nObj = $$(node, consts.id.SPAN, setting);
-                    nObj.empty();
-                    if (setting.view.nameIsHTML) {
-                        nObj.html(data.getNodeName(setting, node));
-                    } else {
-                        nObj.text(data.getNodeName(setting, node));
-                    }
-                    if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle)) {
-                        var aObj = $$(node, consts.id.A, setting);
-                        aObj.attr("title", !title ? "" : title);
-                    }
-                },
-                setNodeTarget: function(setting, node) {
-                    var aObj = $$(node, consts.id.A, setting);
-                    aObj.attr("target", view.makeNodeTarget(node));
-                },
-                setNodeUrl: function(setting, node) {
-                    var aObj = $$(node, consts.id.A, setting),
-                        url = view.makeNodeUrl(setting, node);
-                    if (url == null || url.length == 0) {
-                        aObj.removeAttr("href");
-                    } else {
-                        aObj.attr("href", url);
-                    }
-                },
-                switchNode: function(setting, node) {
-                    if (node.open || !tools.canAsync(setting, node)) {
-                        view.expandCollapseNode(setting, node, !node.open);
-                    } else if (setting.async.enable) {
-                        if (!view.asyncNode(setting, node)) {
-                            view.expandCollapseNode(setting, node, !node.open);
-                            return;
-                        }
-                    } else if (node) {
-                        view.expandCollapseNode(setting, node, !node.open);
-                    }
-                }
-            };
-        // zTree defind
-        $.fn.zTree = {
-            consts: _consts,
-            _z: {
-                tools: tools,
-                view: view,
-                event: event,
-                data: data
-            },
-            getZTreeObj: function(treeId) {
-                var o = data.getZTreeTools(treeId);
-                return o ? o : null;
-            },
-            destroy: function(treeId) {
-                if (!!treeId && treeId.length > 0) {
-                    view.destroy(data.getSetting(treeId));
-                } else {
-                    for (var s in settings) {
-                        view.destroy(settings[s]);
-                    }
-                }
-            },
-            init: function(obj, zSetting, zNodes) {
-                var setting = tools.clone(_setting);
-                $.extend(true, setting, zSetting);
-                setting.treeId = obj.attr("id");
-                setting.treeObj = obj;
-                setting.treeObj.empty();
-                settings[setting.treeId] = setting;
-                //For some older browser,(e.g., ie6)
-                if (typeof document.body.style.maxHeight === "undefined") {
-                    setting.view.expandSpeed = "";
-                }
-                data.initRoot(setting);
-                var root = data.getRoot(setting),
-                    childKey = setting.data.key.children;
-                zNodes = zNodes ? tools.clone(tools.isArray(zNodes) ? zNodes : [zNodes]) : [];
-                if (setting.data.simpleData.enable) {
-                    root[childKey] = data.transformTozTreeFormat(setting, zNodes);
-                } else {
-                    root[childKey] = zNodes;
-                }
-
-                data.initCache(setting);
-                event.unbindTree(setting);
-                event.bindTree(setting);
-                event.unbindEvent(setting);
-                event.bindEvent(setting);
-
-                var zTreeTools = {
-                    setting: setting,
-                    addNodes: function(parentNode, index, newNodes, isSilent) {
-                        if (!parentNode) parentNode = null;
-                        if (parentNode && !parentNode.isParent && setting.data.keep.leaf) return null;
-
-                        var i = parseInt(index, 10);
-                        if (isNaN(i)) {
-                            isSilent = !!newNodes;
-                            newNodes = index;
-                            index = -1;
-                        } else {
-                            index = i;
-                        }
-                        if (!newNodes) return null;
-
-
-                        var xNewNodes = tools.clone(tools.isArray(newNodes) ? newNodes : [newNodes]);
-
-                        function addCallback() {
-                            view.addNodes(setting, parentNode, index, xNewNodes, (isSilent == true));
-                        }
-
-                        if (tools.canAsync(setting, parentNode)) {
-                            view.asyncNode(setting, parentNode, isSilent, addCallback);
-                        } else {
-                            addCallback();
-                        }
-                        return xNewNodes;
-                    },
-                    cancelSelectedNode: function(node) {
-                        view.cancelPreSelectedNode(setting, node);
-                    },
-                    destroy: function() {
-                        view.destroy(setting);
-                    },
-                    expandAll: function(expandFlag) {
-                        expandFlag = !!expandFlag;
-                        view.expandCollapseSonNode(setting, null, expandFlag, true);
-                        return expandFlag;
-                    },
-                    expandNode: function(node, expandFlag, sonSign, focus, callbackFlag) {
-                        if (!node || !node.isParent) return null;
-                        if (expandFlag !== true && expandFlag !== false) {
-                            expandFlag = !node.open;
-                        }
-                        callbackFlag = !!callbackFlag;
-
-                        if (callbackFlag && expandFlag && (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false)) {
-                            return null;
-                        } else if (callbackFlag && !expandFlag && (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false)) {
-                            return null;
-                        }
-                        if (expandFlag && node.parentTId) {
-                            view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, false);
-                        }
-                        if (expandFlag === node.open && !sonSign) {
-                            return null;
-                        }
-
-                        data.getRoot(setting).expandTriggerFlag = callbackFlag;
-                        if (!tools.canAsync(setting, node) && sonSign) {
-                            view.expandCollapseSonNode(setting, node, expandFlag, true, showNodeFocus);
-                        } else {
-                            node.open = !expandFlag;
-                            view.switchNode(this.setting, node);
-                            showNodeFocus();
-                        }
-                        return expandFlag;
-
-                        function showNodeFocus() {
-                            var a = $$(node, setting).get(0);
-                            if (a && focus !== false) {
-                                view.scrollIntoView(a);
-                            }
-                        }
-                    },
-                    getNodes: function() {
-                        return data.getNodes(setting);
-                    },
-                    getNodeByParam: function(key, value, parentNode) {
-                        if (!key) return null;
-                        return data.getNodeByParam(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), key, value);
-                    },
-                    getNodeByTId: function(tId) {
-                        return data.getNodeCache(setting, tId);
-                    },
-                    getNodesByParam: function(key, value, parentNode) {
-                        if (!key) return null;
-                        return data.getNodesByParam(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), key, value);
-                    },
-                    getNodesByParamFuzzy: function(key, value, parentNode) {
-                        if (!key) return null;
-                        return data.getNodesByParamFuzzy(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), key, value);
-                    },
-                    getNodesByFilter: function(filter, isSingle, parentNode, invokeParam) {
-                        isSingle = !!isSingle;
-                        if (!filter || (typeof filter != "function")) return (isSingle ? null : []);
-                        return data.getNodesByFilter(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), filter, isSingle, invokeParam);
-                    },
-                    getNodeIndex: function(node) {
-                        if (!node) return null;
-                        var childKey = setting.data.key.children,
-                            parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
-                        for (var i = 0, l = parentNode[childKey].length; i < l; i++) {
-                            if (parentNode[childKey][i] == node) return i;
-                        }
-                        return -1;
-                    },
-                    getSelectedNodes: function() {
-                        var r = [],
-                            list = data.getRoot(setting).curSelectedList;
-                        for (var i = 0, l = list.length; i < l; i++) {
-                            r.push(list[i]);
-                        }
-                        return r;
-                    },
-                    isSelectedNode: function(node) {
-                        return data.isSelectedNode(setting, node);
-                    },
-                    reAsyncChildNodesPromise: function(parentNode, reloadType, isSilent) {
-                        var promise = new Promise(function(resolve, reject) {
-                            try {
-                                zTreeTools.reAsyncChildNodes(parentNode, reloadType, isSilent, function() {
-                                    resolve(parentNode);
-                                });
-                            } catch (e) {
-                                reject(e);
-                            }
-                        });
-                        return promise;
-                    },
-                    reAsyncChildNodes: function(parentNode, reloadType, isSilent, callback) {
-                        if (!this.setting.async.enable) return;
-                        var isRoot = !parentNode;
-                        if (isRoot) {
-                            parentNode = data.getRoot(setting);
-                        }
-                        if (reloadType == "refresh") {
-                            var childKey = this.setting.data.key.children;
-                            for (var i = 0, l = parentNode[childKey] ? parentNode[childKey].length : 0; i < l; i++) {
-                                data.removeNodeCache(setting, parentNode[childKey][i]);
-                            }
-                            data.removeSelectedNode(setting);
-                            parentNode[childKey] = [];
-                            if (isRoot) {
-                                this.setting.treeObj.empty();
-                            } else {
-                                var ulObj = $$(parentNode, consts.id.UL, setting);
-                                ulObj.empty();
-                            }
-                        }
-                        view.asyncNode(this.setting, isRoot ? null : parentNode, !!isSilent, callback);
-                    },
-                    refresh: function() {
-                        this.setting.treeObj.empty();
-                        var root = data.getRoot(setting),
-                            nodes = root[setting.data.key.children]
-                        data.initRoot(setting);
-                        root[setting.data.key.children] = nodes
-                        data.initCache(setting);
-                        view.createNodes(setting, 0, root[setting.data.key.children], null, -1);
-                    },
-                    removeChildNodes: function(node) {
-                        if (!node) return null;
-                        var childKey = setting.data.key.children,
-                            nodes = node[childKey];
-                        view.removeChildNodes(setting, node);
-                        return nodes ? nodes : null;
-                    },
-                    removeNode: function(node, callbackFlag) {
-                        if (!node) return;
-                        callbackFlag = !!callbackFlag;
-                        if (callbackFlag && tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return;
-                        view.removeNode(setting, node);
-                        if (callbackFlag) {
-                            this.setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
-                        }
-                    },
-                    selectNode: function(node, addFlag, isSilent) {
-                        if (!node) return;
-                        if (tools.uCanDo(setting)) {
-                            addFlag = setting.view.selectedMulti && addFlag;
-                            if (node.parentTId) {
-                                view.expandCollapseParentNode(setting, node.getParentNode(), true, false, showNodeFocus);
-                            } else if (!isSilent) {
-                                try {
-                                    $$(node, setting).focus().blur();
-                                } catch (e) {}
-                            }
-                            view.selectNode(setting, node, addFlag);
-                        }
-
-                        function showNodeFocus() {
-                            if (isSilent) {
-                                return;
-                            }
-                            var a = $$(node, setting).get(0);
-                            view.scrollIntoView(a);
-                        }
-                    },
-                    transformTozTreeNodes: function(simpleNodes) {
-                        return data.transformTozTreeFormat(setting, simpleNodes);
-                    },
-                    transformToArray: function(nodes) {
-                        return data.transformToArrayFormat(setting, nodes);
-                    },
-                    updateNode: function(node, checkTypeFlag) {
-                        if (!node) return;
-                        var nObj = $$(node, setting);
-                        if (nObj.get(0) && tools.uCanDo(setting)) {
-                            view.setNodeName(setting, node);
-                            view.setNodeTarget(setting, node);
-                            view.setNodeUrl(setting, node);
-                            view.setNodeLineIcos(setting, node);
-                            view.setNodeFontCss(setting, node);
-                        }
-                    }
-                }
-                root.treeTools = zTreeTools;
-                data.setZTreeTools(setting, zTreeTools);
-
-                if (root[childKey] && root[childKey].length > 0) {
-                    view.createNodes(setting, 0, root[childKey], null, -1);
-                } else if (setting.async.enable && setting.async.url && setting.async.url !== '') {
-                    view.asyncNode(setting);
-                }
-                return zTreeTools;
-            }
-        };
-
-        var zt = $.fn.zTree,
-            $$ = tools.$,
-            consts = zt.consts;
-    })(jQuery);
-    /*
+	(function ($) {
+		var settings = {},
+			roots = {},
+			caches = {},
+			//default consts of core
+			_consts = {
+				className: {
+					BUTTON: "button",
+					LEVEL: "level",
+					ICO_LOADING: "ico_loading",
+					SWITCH: "switch",
+					NAME: 'node_name'
+				},
+				event: {
+					NODECREATED: "ztree_nodeCreated",
+					CLICK: "ztree_click",
+					EXPAND: "ztree_expand",
+					COLLAPSE: "ztree_collapse",
+					ASYNC_SUCCESS: "ztree_async_success",
+					ASYNC_ERROR: "ztree_async_error",
+					REMOVE: "ztree_remove",
+					SELECTED: "ztree_selected",
+					UNSELECTED: "ztree_unselected"
+				},
+				id: {
+					A: "_a",
+					ICON: "_ico",
+					SPAN: "_span",
+					SWITCH: "_switch",
+					UL: "_ul"
+				},
+				line: {
+					ROOT: "root",
+					ROOTS: "roots",
+					CENTER: "center",
+					BOTTOM: "bottom",
+					NOLINE: "noline",
+					LINE: "line"
+				},
+				folder: {
+					OPEN: "open",
+					CLOSE: "close",
+					DOCU: "docu"
+				},
+				node: {
+					CURSELECTED: "curSelectedNode"
+				}
+			},
+			//default setting of core
+			_setting = {
+				treeId: "",
+				treeObj: null,
+				view: {
+					addDiyDom: null,
+					autoCancelSelected: true,
+					dblClickExpand: true,
+					expandSpeed: "fast",
+					fontCss: {},
+					nameIsHTML: false,
+					selectedMulti: true,
+					showIcon: true,
+					showLine: true,
+					showTitle: true,
+					txtSelectedEnable: false
+				},
+				data: {
+					key: {
+						children: "children",
+						name: "name",
+						title: "",
+						url: "url",
+						icon: "icon"
+					},
+					simpleData: {
+						enable: false,
+						idKey: "id",
+						pIdKey: "pId",
+						rootPId: null
+					},
+					keep: {
+						parent: false,
+						leaf: false
+					}
+				},
+				async: {
+					enable: false,
+					contentType: "application/x-www-form-urlencoded",
+					type: "post",
+					dataType: "text",
+					url: "",
+					autoParam: [],
+					otherParam: [],
+					dataFilter: null
+				},
+				callback: {
+					beforeAsync: null,
+					beforeClick: null,
+					beforeDblClick: null,
+					beforeRightClick: null,
+					beforeMouseDown: null,
+					beforeMouseUp: null,
+					beforeExpand: null,
+					beforeCollapse: null,
+					beforeRemove: null,
+
+					onAsyncError: null,
+					onAsyncSuccess: null,
+					onNodeCreated: null,
+					onClick: null,
+					onDblClick: null,
+					onRightClick: null,
+					onMouseDown: null,
+					onMouseUp: null,
+					onExpand: null,
+					onCollapse: null,
+					onRemove: null
+				}
+			},
+			//default root of core
+			//zTree use root to save full data
+			_initRoot = function (setting) {
+				var r = data.getRoot(setting);
+				if (!r) {
+					r = {};
+					data.setRoot(setting, r);
+				}
+				r[setting.data.key.children] = [];
+				r.expandTriggerFlag = false;
+				r.curSelectedList = [];
+				r.noSelection = true;
+				r.createdNodes = [];
+				r.zId = 0;
+				r._ver = (new Date()).getTime();
+			},
+			//default cache of core
+			_initCache = function (setting) {
+				var c = data.getCache(setting);
+				if (!c) {
+					c = {};
+					data.setCache(setting, c);
+				}
+				c.nodes = [];
+				c.doms = [];
+			},
+			//default bindEvent of core
+			_bindEvent = function (setting) {
+				var o = setting.treeObj,
+					c = consts.event;
+				o.bind(c.NODECREATED, function (event, treeId, node) {
+					tools.apply(setting.callback.onNodeCreated, [event, treeId, node]);
+				});
+
+				o.bind(c.CLICK, function (event, srcEvent, treeId, node, clickFlag) {
+					tools.apply(setting.callback.onClick, [srcEvent, treeId, node, clickFlag]);
+				});
+
+				o.bind(c.EXPAND, function (event, treeId, node) {
+					tools.apply(setting.callback.onExpand, [event, treeId, node]);
+				});
+
+				o.bind(c.COLLAPSE, function (event, treeId, node) {
+					tools.apply(setting.callback.onCollapse, [event, treeId, node]);
+				});
+
+				o.bind(c.ASYNC_SUCCESS, function (event, treeId, node, msg) {
+					tools.apply(setting.callback.onAsyncSuccess, [event, treeId, node, msg]);
+				});
+
+				o.bind(c.ASYNC_ERROR, function (event, treeId, node, XMLHttpRequest, textStatus, errorThrown) {
+					tools.apply(setting.callback.onAsyncError, [event, treeId, node, XMLHttpRequest, textStatus, errorThrown]);
+				});
+
+				o.bind(c.REMOVE, function (event, treeId, treeNode) {
+					tools.apply(setting.callback.onRemove, [event, treeId, treeNode]);
+				});
+
+				o.bind(c.SELECTED, function (event, treeId, node) {
+					tools.apply(setting.callback.onSelected, [treeId, node]);
+				});
+				o.bind(c.UNSELECTED, function (event, treeId, node) {
+					tools.apply(setting.callback.onUnSelected, [treeId, node]);
+				});
+			},
+			_unbindEvent = function (setting) {
+				var o = setting.treeObj,
+					c = consts.event;
+				o.unbind(c.NODECREATED)
+					.unbind(c.CLICK)
+					.unbind(c.EXPAND)
+					.unbind(c.COLLAPSE)
+					.unbind(c.ASYNC_SUCCESS)
+					.unbind(c.ASYNC_ERROR)
+					.unbind(c.REMOVE)
+					.unbind(c.SELECTED)
+					.unbind(c.UNSELECTED);
+			},
+			//default event proxy of core
+			_eventProxy = function (event) {
+				var target = event.target,
+					setting = data.getSetting(event.data.treeId),
+					tId = "",
+					node = null,
+					nodeEventType = "",
+					treeEventType = "",
+					nodeEventCallback = null,
+					treeEventCallback = null,
+					tmp = null;
+
+				if (tools.eqs(event.type, "mousedown")) {
+					treeEventType = "mousedown";
+				} else if (tools.eqs(event.type, "mouseup")) {
+					treeEventType = "mouseup";
+				} else if (tools.eqs(event.type, "contextmenu")) {
+					treeEventType = "contextmenu";
+				} else if (tools.eqs(event.type, "click")) {
+					if (tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.SWITCH) !== null) {
+						tId = tools.getNodeMainDom(target).id;
+						nodeEventType = "switchNode";
+					} else {
+						tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+						if (tmp) {
+							tId = tools.getNodeMainDom(tmp).id;
+							nodeEventType = "clickNode";
+						}
+					}
+				} else if (tools.eqs(event.type, "dblclick")) {
+					treeEventType = "dblclick";
+					tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+					if (tmp) {
+						tId = tools.getNodeMainDom(tmp).id;
+						nodeEventType = "switchNode";
+					}
+				}
+				if (treeEventType.length > 0 && tId.length == 0) {
+					tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+					if (tmp) {
+						tId = tools.getNodeMainDom(tmp).id;
+					}
+				}
+				// event to node
+				if (tId.length > 0) {
+					node = data.getNodeCache(setting, tId);
+					switch (nodeEventType) {
+						case "switchNode":
+							if (!node.isParent) {
+								nodeEventType = "";
+							} else if (tools.eqs(event.type, "click") ||
+								(tools.eqs(event.type, "dblclick") && tools.apply(setting.view.dblClickExpand, [setting.treeId, node], setting.view.dblClickExpand))) {
+								nodeEventCallback = handler.onSwitchNode;
+							} else {
+								nodeEventType = "";
+							}
+							break;
+						case "clickNode":
+							nodeEventCallback = handler.onClickNode;
+							break;
+					}
+				}
+				// event to zTree
+				switch (treeEventType) {
+					case "mousedown":
+						treeEventCallback = handler.onZTreeMousedown;
+						break;
+					case "mouseup":
+						treeEventCallback = handler.onZTreeMouseup;
+						break;
+					case "dblclick":
+						treeEventCallback = handler.onZTreeDblclick;
+						break;
+					case "contextmenu":
+						treeEventCallback = handler.onZTreeContextmenu;
+						break;
+				}
+				var proxyResult = {
+					stop: false,
+					node: node,
+					nodeEventType: nodeEventType,
+					nodeEventCallback: nodeEventCallback,
+					treeEventType: treeEventType,
+					treeEventCallback: treeEventCallback
+				};
+				return proxyResult
+			},
+			//default init node of core
+			_initNode = function (setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+				if (!n) return;
+				var r = data.getRoot(setting),
+					childKey = setting.data.key.children;
+				n.level = level;
+				n.tId = setting.treeId + "_" + (++r.zId);
+				n.parentTId = parentNode ? parentNode.tId : null;
+				n.open = (typeof n.open == "string") ? tools.eqs(n.open, "true") : !!n.open;
+				if (n[childKey] && n[childKey].length > 0) {
+					n.isParent = true;
+					n.zAsync = true;
+				} else {
+					n.isParent = (typeof n.isParent == "string") ? tools.eqs(n.isParent, "true") : !!n.isParent;
+					n.open = (n.isParent && !setting.async.enable) ? n.open : false;
+					n.zAsync = !n.isParent;
+				}
+				n.isFirstNode = isFirstNode;
+				n.isLastNode = isLastNode;
+				n.getParentNode = function () {
+					return data.getNodeCache(setting, n.parentTId);
+				};
+				n.getPreNode = function () {
+					return data.getPreNode(setting, n);
+				};
+				n.getNextNode = function () {
+					return data.getNextNode(setting, n);
+				};
+				n.getIndex = function () {
+					return data.getNodeIndex(setting, n);
+				};
+				n.getPath = function () {
+					return data.getNodePath(setting, n);
+				};
+				n.isAjaxing = false;
+				data.fixPIdKeyValue(setting, n);
+			},
+			_init = {
+				bind: [_bindEvent],
+				unbind: [_unbindEvent],
+				caches: [_initCache],
+				nodes: [_initNode],
+				proxys: [_eventProxy],
+				roots: [_initRoot],
+				beforeA: [],
+				afterA: [],
+				innerBeforeA: [],
+				innerAfterA: [],
+				zTreeTools: []
+			},
+			//method of operate data
+			data = {
+				addNodeCache: function (setting, node) {
+					data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = node;
+				},
+				getNodeCacheId: function (tId) {
+					return tId.substring(tId.lastIndexOf("_") + 1);
+				},
+				addAfterA: function (afterA) {
+					_init.afterA.push(afterA);
+				},
+				addBeforeA: function (beforeA) {
+					_init.beforeA.push(beforeA);
+				},
+				addInnerAfterA: function (innerAfterA) {
+					_init.innerAfterA.push(innerAfterA);
+				},
+				addInnerBeforeA: function (innerBeforeA) {
+					_init.innerBeforeA.push(innerBeforeA);
+				},
+				addInitBind: function (bindEvent) {
+					_init.bind.push(bindEvent);
+				},
+				addInitUnBind: function (unbindEvent) {
+					_init.unbind.push(unbindEvent);
+				},
+				addInitCache: function (initCache) {
+					_init.caches.push(initCache);
+				},
+				addInitNode: function (initNode) {
+					_init.nodes.push(initNode);
+				},
+				addInitProxy: function (initProxy, isFirst) {
+					if (!!isFirst) {
+						_init.proxys.splice(0, 0, initProxy);
+					} else {
+						_init.proxys.push(initProxy);
+					}
+				},
+				addInitRoot: function (initRoot) {
+					_init.roots.push(initRoot);
+				},
+				addNodesData: function (setting, parentNode, index, nodes) {
+					var childKey = setting.data.key.children,
+						params;
+					if (!parentNode[childKey]) {
+						parentNode[childKey] = [];
+						index = -1;
+					} else if (index >= parentNode[childKey].length) {
+						index = -1;
+					}
+
+					if (parentNode[childKey].length > 0 && index === 0) {
+						parentNode[childKey][0].isFirstNode = false;
+						view.setNodeLineIcos(setting, parentNode[childKey][0]);
+					} else if (parentNode[childKey].length > 0 && index < 0) {
+						parentNode[childKey][parentNode[childKey].length - 1].isLastNode = false;
+						view.setNodeLineIcos(setting, parentNode[childKey][parentNode[childKey].length - 1]);
+					}
+					parentNode.isParent = true;
+
+					if (index < 0) {
+						parentNode[childKey] = parentNode[childKey].concat(nodes);
+					} else {
+						params = [index, 0].concat(nodes);
+						parentNode[childKey].splice.apply(parentNode[childKey], params);
+					}
+				},
+				addSelectedNode: function (setting, node) {
+					var root = data.getRoot(setting);
+					if (!data.isSelectedNode(setting, node)) {
+						root.curSelectedList.push(node);
+					}
+				},
+				addCreatedNode: function (setting, node) {
+					if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
+						var root = data.getRoot(setting);
+						root.createdNodes.push(node);
+					}
+				},
+				addZTreeTools: function (zTreeTools) {
+					_init.zTreeTools.push(zTreeTools);
+				},
+				exSetting: function (s) {
+					$.extend(true, _setting, s);
+				},
+				fixPIdKeyValue: function (setting, node) {
+					if (setting.data.simpleData.enable) {
+						node[setting.data.simpleData.pIdKey] = node.parentTId ? node.getParentNode()[setting.data.simpleData.idKey] : setting.data.simpleData.rootPId;
+					}
+				},
+				getAfterA: function (setting, node, array) {
+					for (var i = 0, j = _init.afterA.length; i < j; i++) {
+						_init.afterA[i].apply(this, arguments);
+					}
+				},
+				getBeforeA: function (setting, node, array) {
+					for (var i = 0, j = _init.beforeA.length; i < j; i++) {
+						_init.beforeA[i].apply(this, arguments);
+					}
+				},
+				getInnerAfterA: function (setting, node, array) {
+					for (var i = 0, j = _init.innerAfterA.length; i < j; i++) {
+						_init.innerAfterA[i].apply(this, arguments);
+					}
+				},
+				getInnerBeforeA: function (setting, node, array) {
+					for (var i = 0, j = _init.innerBeforeA.length; i < j; i++) {
+						_init.innerBeforeA[i].apply(this, arguments);
+					}
+				},
+				getCache: function (setting) {
+					return caches[setting.treeId];
+				},
+				getNodeIndex: function (setting, node) {
+					if (!node) return null;
+					var childKey = setting.data.key.children,
+						p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
+					for (var i = 0, l = p[childKey].length - 1; i <= l; i++) {
+						if (p[childKey][i] === node) {
+							return i;
+						}
+					}
+					return -1;
+				},
+				getNextNode: function (setting, node) {
+					if (!node) return null;
+					var childKey = setting.data.key.children,
+						p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
+					for (var i = 0, l = p[childKey].length - 1; i <= l; i++) {
+						if (p[childKey][i] === node) {
+							return (i == l ? null : p[childKey][i + 1]);
+						}
+					}
+					return null;
+				},
+				getNodeByParam: function (setting, nodes, key, value) {
+					if (!nodes || !key) return null;
+					var childKey = setting.data.key.children;
+					for (var i = 0, l = nodes.length; i < l; i++) {
+						if (nodes[i][key] == value) {
+							return nodes[i];
+						}
+						var tmp = data.getNodeByParam(setting, nodes[i][childKey], key, value);
+						if (tmp) return tmp;
+					}
+					return null;
+				},
+				getNodeCache: function (setting, tId) {
+					if (!tId) return null;
+					var n = caches[setting.treeId].nodes[data.getNodeCacheId(tId)];
+					return n ? n : null;
+				},
+				getNodeName: function (setting, node) {
+					var nameKey = setting.data.key.name;
+					return "" + node[nameKey];
+				},
+				getNodePath: function (setting, node) {
+					if (!node) return null;
+
+					var path;
+					if (node.parentTId) {
+						path = node.getParentNode().getPath();
+					} else {
+						path = [];
+					}
+
+					if (path) {
+						path.push(node);
+					}
+
+					return path;
+				},
+				getNodeTitle: function (setting, node) {
+					var t = setting.data.key.title === "" ? setting.data.key.name : setting.data.key.title;
+					return "" + node[t];
+				},
+				getNodes: function (setting) {
+					return data.getRoot(setting)[setting.data.key.children];
+				},
+				getNodesByParam: function (setting, nodes, key, value) {
+					if (!nodes || !key) return [];
+					var childKey = setting.data.key.children,
+						result = [];
+					for (var i = 0, l = nodes.length; i < l; i++) {
+						if (nodes[i][key] == value) {
+							result.push(nodes[i]);
+						}
+						result = result.concat(data.getNodesByParam(setting, nodes[i][childKey], key, value));
+					}
+					return result;
+				},
+				getNodesByParamFuzzy: function (setting, nodes, key, value) {
+					if (!nodes || !key) return [];
+					var childKey = setting.data.key.children,
+						result = [];
+					value = value.toLowerCase();
+					for (var i = 0, l = nodes.length; i < l; i++) {
+						if (typeof nodes[i][key] == "string" && nodes[i][key].toLowerCase().indexOf(value) > -1) {
+							result.push(nodes[i]);
+						}
+						result = result.concat(data.getNodesByParamFuzzy(setting, nodes[i][childKey], key, value));
+					}
+					return result;
+				},
+				getNodesByFilter: function (setting, nodes, filter, isSingle, invokeParam) {
+					if (!nodes) return (isSingle ? null : []);
+					var childKey = setting.data.key.children,
+						result = isSingle ? null : [];
+					for (var i = 0, l = nodes.length; i < l; i++) {
+						if (tools.apply(filter, [nodes[i], invokeParam], false)) {
+							if (isSingle) {
+								return nodes[i];
+							}
+							result.push(nodes[i]);
+						}
+						var tmpResult = data.getNodesByFilter(setting, nodes[i][childKey], filter, isSingle, invokeParam);
+						if (isSingle && !!tmpResult) {
+							return tmpResult;
+						}
+						result = isSingle ? tmpResult : result.concat(tmpResult);
+					}
+					return result;
+				},
+				getPreNode: function (setting, node) {
+					if (!node) return null;
+					var childKey = setting.data.key.children,
+						p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
+					for (var i = 0, l = p[childKey].length; i < l; i++) {
+						if (p[childKey][i] === node) {
+							return (i == 0 ? null : p[childKey][i - 1]);
+						}
+					}
+					return null;
+				},
+				getRoot: function (setting) {
+					return setting ? roots[setting.treeId] : null;
+				},
+				getRoots: function () {
+					return roots;
+				},
+				getSetting: function (treeId) {
+					return settings[treeId];
+				},
+				getSettings: function () {
+					return settings;
+				},
+				getZTreeTools: function (treeId) {
+					var r = this.getRoot(this.getSetting(treeId));
+					return r ? r.treeTools : null;
+				},
+				initCache: function (setting) {
+					for (var i = 0, j = _init.caches.length; i < j; i++) {
+						_init.caches[i].apply(this, arguments);
+					}
+				},
+				initNode: function (setting, level, node, parentNode, preNode, nextNode) {
+					for (var i = 0, j = _init.nodes.length; i < j; i++) {
+						_init.nodes[i].apply(this, arguments);
+					}
+				},
+				initRoot: function (setting) {
+					for (var i = 0, j = _init.roots.length; i < j; i++) {
+						_init.roots[i].apply(this, arguments);
+					}
+				},
+				isSelectedNode: function (setting, node) {
+					var root = data.getRoot(setting);
+					for (var i = 0, j = root.curSelectedList.length; i < j; i++) {
+						if (node === root.curSelectedList[i]) return true;
+					}
+					return false;
+				},
+				removeNodeCache: function (setting, node) {
+					var childKey = setting.data.key.children;
+					if (node[childKey]) {
+						for (var i = 0, l = node[childKey].length; i < l; i++) {
+							data.removeNodeCache(setting, node[childKey][i]);
+						}
+					}
+					data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = null;
+				},
+				removeSelectedNode: function (setting, node) {
+					var root = data.getRoot(setting);
+					for (var i = 0, j = root.curSelectedList.length; i < j; i++) {
+						if (node === root.curSelectedList[i] || !data.getNodeCache(setting, root.curSelectedList[i].tId)) {
+							root.curSelectedList.splice(i, 1);
+							setting.treeObj.trigger(consts.event.UNSELECTED, [setting.treeId, node]);
+							i--;
+							j--;
+						}
+					}
+				},
+				setCache: function (setting, cache) {
+					caches[setting.treeId] = cache;
+				},
+				setRoot: function (setting, root) {
+					roots[setting.treeId] = root;
+				},
+				setZTreeTools: function (setting, zTreeTools) {
+					for (var i = 0, j = _init.zTreeTools.length; i < j; i++) {
+						_init.zTreeTools[i].apply(this, arguments);
+					}
+				},
+				transformToArrayFormat: function (setting, nodes) {
+					if (!nodes) return [];
+					var childKey = setting.data.key.children,
+						r = [];
+					if (tools.isArray(nodes)) {
+						for (var i = 0, l = nodes.length; i < l; i++) {
+							r.push(nodes[i]);
+							if (nodes[i][childKey])
+								r = r.concat(data.transformToArrayFormat(setting, nodes[i][childKey]));
+						}
+					} else {
+						r.push(nodes);
+						if (nodes[childKey])
+							r = r.concat(data.transformToArrayFormat(setting, nodes[childKey]));
+					}
+					return r;
+				},
+				transformTozTreeFormat: function (setting, sNodes) {
+					var i, l,
+						key = setting.data.simpleData.idKey,
+						parentKey = setting.data.simpleData.pIdKey,
+						childKey = setting.data.key.children;
+					if (!key || key == "" || !sNodes) return [];
+
+					if (tools.isArray(sNodes)) {
+						var r = [];
+						var tmpMap = {};
+						for (i = 0, l = sNodes.length; i < l; i++) {
+							tmpMap[sNodes[i][key]] = sNodes[i];
+						}
+						for (i = 0, l = sNodes.length; i < l; i++) {
+							if (tmpMap[sNodes[i][parentKey]] && sNodes[i][key] != sNodes[i][parentKey]) {
+								if (!tmpMap[sNodes[i][parentKey]][childKey])
+									tmpMap[sNodes[i][parentKey]][childKey] = [];
+								tmpMap[sNodes[i][parentKey]][childKey].push(sNodes[i]);
+							} else {
+								r.push(sNodes[i]);
+							}
+						}
+						return r;
+					} else {
+						return [sNodes];
+					}
+				}
+			},
+			//method of event proxy
+			event = {
+				bindEvent: function (setting) {
+					for (var i = 0, j = _init.bind.length; i < j; i++) {
+						_init.bind[i].apply(this, arguments);
+					}
+				},
+				unbindEvent: function (setting) {
+					for (var i = 0, j = _init.unbind.length; i < j; i++) {
+						_init.unbind[i].apply(this, arguments);
+					}
+				},
+				bindTree: function (setting) {
+					var eventParam = {
+							treeId: setting.treeId
+						},
+						o = setting.treeObj;
+					if (!setting.view.txtSelectedEnable) {
+						// for can't select text
+						o.bind('selectstart', handler.onSelectStart).css({
+							"-moz-user-select": "-moz-none"
+						});
+					}
+					o.bind('click', eventParam, event.proxy);
+					o.bind('dblclick', eventParam, event.proxy);
+					o.bind('mouseover', eventParam, event.proxy);
+					o.bind('mouseout', eventParam, event.proxy);
+					o.bind('mousedown', eventParam, event.proxy);
+					o.bind('mouseup', eventParam, event.proxy);
+					o.bind('contextmenu', eventParam, event.proxy);
+				},
+				unbindTree: function (setting) {
+					var o = setting.treeObj;
+					o.unbind('selectstart', handler.onSelectStart)
+						.unbind('click', event.proxy)
+						.unbind('dblclick', event.proxy)
+						.unbind('mouseover', event.proxy)
+						.unbind('mouseout', event.proxy)
+						.unbind('mousedown', event.proxy)
+						.unbind('mouseup', event.proxy)
+						.unbind('contextmenu', event.proxy);
+				},
+				doProxy: function (e) {
+					var results = [];
+					for (var i = 0, j = _init.proxys.length; i < j; i++) {
+						var proxyResult = _init.proxys[i].apply(this, arguments);
+						results.push(proxyResult);
+						if (proxyResult.stop) {
+							break;
+						}
+					}
+					return results;
+				},
+				proxy: function (e) {
+					var setting = data.getSetting(e.data.treeId);
+					if (!tools.uCanDo(setting, e)) return true;
+					var results = event.doProxy(e),
+						r = true,
+						x = false;
+					for (var i = 0, l = results.length; i < l; i++) {
+						var proxyResult = results[i];
+						if (proxyResult.nodeEventCallback) {
+							x = true;
+							r = proxyResult.nodeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
+						}
+						if (proxyResult.treeEventCallback) {
+							x = true;
+							r = proxyResult.treeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
+						}
+					}
+					return r;
+				}
+			},
+			//method of event handler
+			handler = {
+				onSwitchNode: function (event, node) {
+					var setting = data.getSetting(event.data.treeId);
+					if (node.open) {
+						if (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false) return true;
+						data.getRoot(setting).expandTriggerFlag = true;
+						view.switchNode(setting, node);
+					} else {
+						if (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false) return true;
+						data.getRoot(setting).expandTriggerFlag = true;
+						view.switchNode(setting, node);
+					}
+					return true;
+				},
+				onClickNode: function (event, node) {
+					var setting = data.getSetting(event.data.treeId),
+						clickFlag = ((setting.view.autoCancelSelected && (event.ctrlKey || event.metaKey)) && data.isSelectedNode(setting, node)) ? 0 : (setting.view.autoCancelSelected && (event.ctrlKey || event.metaKey) && setting.view.selectedMulti) ? 2 : 1;
+					if (tools.apply(setting.callback.beforeClick, [setting.treeId, node, clickFlag], true) == false) return true;
+					if (clickFlag === 0) {
+						view.cancelPreSelectedNode(setting, node);
+					} else {
+						view.selectNode(setting, node, clickFlag === 2);
+					}
+					setting.treeObj.trigger(consts.event.CLICK, [event, setting.treeId, node, clickFlag]);
+					return true;
+				},
+				onZTreeMousedown: function (event, node) {
+					var setting = data.getSetting(event.data.treeId);
+					if (tools.apply(setting.callback.beforeMouseDown, [setting.treeId, node], true)) {
+						tools.apply(setting.callback.onMouseDown, [event, setting.treeId, node]);
+					}
+					return true;
+				},
+				onZTreeMouseup: function (event, node) {
+					var setting = data.getSetting(event.data.treeId);
+					if (tools.apply(setting.callback.beforeMouseUp, [setting.treeId, node], true)) {
+						tools.apply(setting.callback.onMouseUp, [event, setting.treeId, node]);
+					}
+					return true;
+				},
+				onZTreeDblclick: function (event, node) {
+					var setting = data.getSetting(event.data.treeId);
+					if (tools.apply(setting.callback.beforeDblClick, [setting.treeId, node], true)) {
+						tools.apply(setting.callback.onDblClick, [event, setting.treeId, node]);
+					}
+					return true;
+				},
+				onZTreeContextmenu: function (event, node) {
+					var setting = data.getSetting(event.data.treeId);
+					if (tools.apply(setting.callback.beforeRightClick, [setting.treeId, node], true)) {
+						tools.apply(setting.callback.onRightClick, [event, setting.treeId, node]);
+					}
+					return (typeof setting.callback.onRightClick) != "function";
+				},
+				onSelectStart: function (e) {
+					var n = e.originalEvent.srcElement.nodeName.toLowerCase();
+					return (n === "input" || n === "textarea");
+				}
+			},
+			//method of tools for zTree
+			tools = {
+				apply: function (fun, param, defaultValue) {
+					if ((typeof fun) == "function") {
+						return fun.apply(zt, param ? param : []);
+					}
+					return defaultValue;
+				},
+				canAsync: function (setting, node) {
+					var childKey = setting.data.key.children;
+					return (setting.async.enable && node && node.isParent && !(node.zAsync || (node[childKey] && node[childKey].length > 0)));
+				},
+				clone: function (obj) {
+					if (obj === null) return null;
+					var o = tools.isArray(obj) ? [] : {};
+					for (var i in obj) {
+						o[i] = (obj[i] instanceof Date) ? new Date(obj[i].getTime()) : (typeof obj[i] === "object" ? tools.clone(obj[i]) : obj[i]);
+					}
+					return o;
+				},
+				eqs: function (str1, str2) {
+					return str1.toLowerCase() === str2.toLowerCase();
+				},
+				isArray: function (arr) {
+					return Object.prototype.toString.apply(arr) === "[object Array]";
+				},
+				isElement: function (o) {
+					return (
+						typeof HTMLElement === "object" ? o instanceof HTMLElement : //DOM2
+							o && typeof o === "object" && o !== null && o.nodeType === 1 && typeof o.nodeName === "string"
+					);
+				},
+				$: function (node, exp, setting) {
+					if (!!exp && typeof exp != "string") {
+						setting = exp;
+						exp = "";
+					}
+					if (typeof node == "string") {
+						return $(node, setting ? setting.treeObj.get(0).ownerDocument : null);
+					} else {
+						return $("#" + node.tId + exp, setting ? setting.treeObj : null);
+					}
+				},
+				getMDom: function (setting, curDom, targetExpr) {
+					if (!curDom) return null;
+					while (curDom && curDom.id !== setting.treeId) {
+						for (var i = 0, l = targetExpr.length; curDom.tagName && i < l; i++) {
+							if (tools.eqs(curDom.tagName, targetExpr[i].tagName) && curDom.getAttribute(targetExpr[i].attrName) !== null) {
+								return curDom;
+							}
+						}
+						curDom = curDom.parentNode;
+					}
+					return null;
+				},
+				getNodeMainDom: function (target) {
+					return ($(target).parent("li").get(0) || $(target).parentsUntil("li").parent().get(0));
+				},
+				isChildOrSelf: function (dom, parentId) {
+					return ($(dom).closest("#" + parentId).length > 0);
+				},
+				uCanDo: function (setting, e) {
+					return true;
+				}
+			},
+			//method of operate ztree dom
+			view = {
+				addNodes: function (setting, parentNode, index, newNodes, isSilent) {
+					if (setting.data.keep.leaf && parentNode && !parentNode.isParent) {
+						return;
+					}
+					if (!tools.isArray(newNodes)) {
+						newNodes = [newNodes];
+					}
+					if (setting.data.simpleData.enable) {
+						newNodes = data.transformTozTreeFormat(setting, newNodes);
+					}
+					if (parentNode) {
+						var target_switchObj = $$(parentNode, consts.id.SWITCH, setting),
+							target_icoObj = $$(parentNode, consts.id.ICON, setting),
+							target_ulObj = $$(parentNode, consts.id.UL, setting);
+
+						if (!parentNode.open) {
+							view.replaceSwitchClass(parentNode, target_switchObj, consts.folder.CLOSE);
+							view.replaceIcoClass(parentNode, target_icoObj, consts.folder.CLOSE);
+							parentNode.open = false;
+							target_ulObj.css({
+								"display": "none"
+							});
+						}
+
+						data.addNodesData(setting, parentNode, index, newNodes);
+						view.createNodes(setting, parentNode.level + 1, newNodes, parentNode, index);
+						if (!isSilent) {
+							view.expandCollapseParentNode(setting, parentNode, true);
+						}
+					} else {
+						data.addNodesData(setting, data.getRoot(setting), index, newNodes);
+						view.createNodes(setting, 0, newNodes, null, index);
+					}
+				},
+				appendNodes: function (setting, level, nodes, parentNode, index, initFlag, openFlag) {
+					if (!nodes) return [];
+					var html = [],
+						childKey = setting.data.key.children;
+
+					var tmpPNode = (parentNode) ? parentNode : data.getRoot(setting),
+						tmpPChild = tmpPNode[childKey],
+						isFirstNode, isLastNode;
+
+					if (!tmpPChild || index >= tmpPChild.length - nodes.length) {
+						index = -1;
+					}
+
+					for (var i = 0, l = nodes.length; i < l; i++) {
+						var node = nodes[i];
+						if (initFlag) {
+							isFirstNode = ((index === 0 || tmpPChild.length == nodes.length) && (i == 0));
+							isLastNode = (index < 0 && i == (nodes.length - 1));
+							data.initNode(setting, level, node, parentNode, isFirstNode, isLastNode, openFlag);
+							data.addNodeCache(setting, node);
+						}
+
+						var childHtml = [];
+						if (node[childKey] && node[childKey].length > 0) {
+							//make child html first, because checkType
+							childHtml = view.appendNodes(setting, level + 1, node[childKey], node, -1, initFlag, openFlag && node.open);
+						}
+						if (openFlag) {
+
+							view.makeDOMNodeMainBefore(html, setting, node);
+							view.makeDOMNodeLine(html, setting, node);
+							data.getBeforeA(setting, node, html);
+							view.makeDOMNodeNameBefore(html, setting, node);
+							data.getInnerBeforeA(setting, node, html);
+							view.makeDOMNodeIcon(html, setting, node);
+							data.getInnerAfterA(setting, node, html);
+							view.makeDOMNodeNameAfter(html, setting, node);
+							data.getAfterA(setting, node, html);
+							if (node.isParent && node.open) {
+								view.makeUlHtml(setting, node, html, childHtml.join(''));
+							}
+							view.makeDOMNodeMainAfter(html, setting, node);
+							data.addCreatedNode(setting, node);
+						}
+					}
+					return html;
+				},
+				appendParentULDom: function (setting, node) {
+					var html = [],
+						nObj = $$(node, setting);
+					if (!nObj.get(0) && !!node.parentTId) {
+						view.appendParentULDom(setting, node.getParentNode());
+						nObj = $$(node, setting);
+					}
+					var ulObj = $$(node, consts.id.UL, setting);
+					if (ulObj.get(0)) {
+						ulObj.remove();
+					}
+					var childKey = setting.data.key.children,
+						childHtml = view.appendNodes(setting, node.level + 1, node[childKey], node, -1, false, true);
+					view.makeUlHtml(setting, node, html, childHtml.join(''));
+					nObj.append(html.join(''));
+				},
+				asyncNode: function (setting, node, isSilent, callback) {
+					var i, l;
+					if (node && !node.isParent) {
+						tools.apply(callback);
+						return false;
+					} else if (node && node.isAjaxing) {
+						return false;
+					} else if (tools.apply(setting.callback.beforeAsync, [setting.treeId, node], true) == false) {
+						tools.apply(callback);
+						return false;
+					}
+					if (node) {
+						node.isAjaxing = true;
+						var icoObj = $$(node, consts.id.ICON, setting);
+						icoObj.attr({
+							"style": "",
+							"class": consts.className.BUTTON + " " + consts.className.ICO_LOADING
+						});
+					}
+
+					var tmpParam = {};
+					for (i = 0, l = setting.async.autoParam.length; node && i < l; i++) {
+						var pKey = setting.async.autoParam[i].split("="),
+							spKey = pKey;
+						if (pKey.length > 1) {
+							spKey = pKey[1];
+							pKey = pKey[0];
+						}
+						tmpParam[spKey] = node[pKey];
+					}
+					if (tools.isArray(setting.async.otherParam)) {
+						for (i = 0, l = setting.async.otherParam.length; i < l; i += 2) {
+							tmpParam[setting.async.otherParam[i]] = setting.async.otherParam[i + 1];
+						}
+					} else {
+						for (var p in setting.async.otherParam) {
+							tmpParam[p] = setting.async.otherParam[p];
+						}
+					}
+
+					var _tmpV = data.getRoot(setting)._ver;
+					$.ajax({
+						contentType: setting.async.contentType,
+						cache: false,
+						type: setting.async.type,
+						url: tools.apply(setting.async.url, [setting.treeId, node], setting.async.url),
+						data: setting.async.contentType.indexOf('application/json') > -1 ? JSON.stringify(tmpParam) : tmpParam,
+						dataType: setting.async.dataType,
+						success: function (msg) {
+							if (_tmpV != data.getRoot(setting)._ver) {
+								return;
+							}
+							var newNodes = [];
+							try {
+								if (!msg || msg.length == 0) {
+									newNodes = [];
+								} else if (typeof msg == "string") {
+									newNodes = eval("(" + msg + ")");
+								} else {
+									newNodes = msg;
+								}
+							} catch (err) {
+								newNodes = msg;
+							}
+
+							if (node) {
+								node.isAjaxing = null;
+								node.zAsync = true;
+							}
+							view.setNodeLineIcos(setting, node);
+							if (newNodes && newNodes !== "") {
+								newNodes = tools.apply(setting.async.dataFilter, [setting.treeId, node, newNodes], newNodes);
+								view.addNodes(setting, node, -1, !!newNodes ? tools.clone(newNodes) : [], !!isSilent);
+							} else {
+								view.addNodes(setting, node, -1, [], !!isSilent);
+							}
+							setting.treeObj.trigger(consts.event.ASYNC_SUCCESS, [setting.treeId, node, msg]);
+							tools.apply(callback);
+						},
+						error: function (XMLHttpRequest, textStatus, errorThrown) {
+							if (_tmpV != data.getRoot(setting)._ver) {
+								return;
+							}
+							if (node) node.isAjaxing = null;
+							view.setNodeLineIcos(setting, node);
+							setting.treeObj.trigger(consts.event.ASYNC_ERROR, [setting.treeId, node, XMLHttpRequest, textStatus, errorThrown]);
+						}
+					});
+					return true;
+				},
+				cancelPreSelectedNode: function (setting, node, excludeNode) {
+					var list = data.getRoot(setting).curSelectedList,
+						i, n;
+					for (i = list.length - 1; i >= 0; i--) {
+						n = list[i];
+						if (node === n || (!node && (!excludeNode || excludeNode !== n))) {
+							$$(n, consts.id.A, setting).removeClass(consts.node.CURSELECTED);
+							if (node) {
+								data.removeSelectedNode(setting, node);
+								break;
+							} else {
+								list.splice(i, 1);
+								setting.treeObj.trigger(consts.event.UNSELECTED, [setting.treeId, n]);
+							}
+						}
+					}
+				},
+				createNodeCallback: function (setting) {
+					if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
+						var root = data.getRoot(setting);
+						while (root.createdNodes.length > 0) {
+							var node = root.createdNodes.shift();
+							tools.apply(setting.view.addDiyDom, [setting.treeId, node]);
+							if (!!setting.callback.onNodeCreated) {
+								setting.treeObj.trigger(consts.event.NODECREATED, [setting.treeId, node]);
+							}
+						}
+					}
+				},
+				createNodes: function (setting, level, nodes, parentNode, index) {
+					if (!nodes || nodes.length == 0) return;
+					var root = data.getRoot(setting),
+						childKey = setting.data.key.children,
+						openFlag = !parentNode || parentNode.open || !!$$(parentNode[childKey][0], setting).get(0);
+					root.createdNodes = [];
+					var zTreeHtml = view.appendNodes(setting, level, nodes, parentNode, index, true, openFlag),
+						parentObj, nextObj;
+
+					if (!parentNode) {
+						parentObj = setting.treeObj;
+						//setting.treeObj.append(zTreeHtml.join(''));
+					} else {
+						var ulObj = $$(parentNode, consts.id.UL, setting);
+						if (ulObj.get(0)) {
+							parentObj = ulObj;
+							//ulObj.append(zTreeHtml.join(''));
+						}
+					}
+					if (parentObj) {
+						if (index >= 0) {
+							nextObj = parentObj.children()[index];
+						}
+						if (index >= 0 && nextObj) {
+							$(nextObj).before(zTreeHtml.join(''));
+						} else {
+							parentObj.append(zTreeHtml.join(''));
+						}
+					}
+
+					view.createNodeCallback(setting);
+				},
+				destroy: function (setting) {
+					if (!setting) return;
+					data.initCache(setting);
+					data.initRoot(setting);
+					event.unbindTree(setting);
+					event.unbindEvent(setting);
+					setting.treeObj.empty();
+					delete settings[setting.treeId];
+				},
+				expandCollapseNode: function (setting, node, expandFlag, animateFlag, callback) {
+					var root = data.getRoot(setting),
+						childKey = setting.data.key.children;
+					var tmpCb, _callback;
+					if (!node) {
+						tools.apply(callback, []);
+						return;
+					}
+					if (root.expandTriggerFlag) {
+						_callback = callback;
+						tmpCb = function () {
+							if (_callback) _callback();
+							if (node.open) {
+								setting.treeObj.trigger(consts.event.EXPAND, [setting.treeId, node]);
+							} else {
+								setting.treeObj.trigger(consts.event.COLLAPSE, [setting.treeId, node]);
+							}
+						};
+						callback = tmpCb;
+						root.expandTriggerFlag = false;
+					}
+					if (!node.open && node.isParent && ((!$$(node, consts.id.UL, setting).get(0)) || (node[childKey] && node[childKey].length > 0 && !$$(node[childKey][0], setting).get(0)))) {
+						view.appendParentULDom(setting, node);
+						view.createNodeCallback(setting);
+					}
+					if (node.open == expandFlag) {
+						tools.apply(callback, []);
+						return;
+					}
+					var ulObj = $$(node, consts.id.UL, setting),
+						switchObj = $$(node, consts.id.SWITCH, setting),
+						icoObj = $$(node, consts.id.ICON, setting);
+
+					if (node.isParent) {
+						node.open = !node.open;
+						if (node.iconOpen && node.iconClose) {
+							icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
+						}
+
+						if (node.open) {
+							view.replaceSwitchClass(node, switchObj, consts.folder.OPEN);
+							view.replaceIcoClass(node, icoObj, consts.folder.OPEN);
+							if (animateFlag == false || setting.view.expandSpeed == "") {
+								ulObj.show();
+								tools.apply(callback, []);
+							} else {
+								if (node[childKey] && node[childKey].length > 0) {
+									ulObj.slideDown(setting.view.expandSpeed, callback);
+								} else {
+									ulObj.show();
+									tools.apply(callback, []);
+								}
+							}
+						} else {
+							view.replaceSwitchClass(node, switchObj, consts.folder.CLOSE);
+							view.replaceIcoClass(node, icoObj, consts.folder.CLOSE);
+							if (animateFlag == false || setting.view.expandSpeed == "" || !(node[childKey] && node[childKey].length > 0)) {
+								ulObj.hide();
+								tools.apply(callback, []);
+							} else {
+								ulObj.slideUp(setting.view.expandSpeed, callback);
+							}
+						}
+					} else {
+						tools.apply(callback, []);
+					}
+				},
+				expandCollapseParentNode: function (setting, node, expandFlag, animateFlag, callback) {
+					if (!node) return;
+					if (!node.parentTId) {
+						view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback);
+						return;
+					} else {
+						view.expandCollapseNode(setting, node, expandFlag, animateFlag);
+					}
+					if (node.parentTId) {
+						view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, animateFlag, callback);
+					}
+				},
+				expandCollapseSonNode: function (setting, node, expandFlag, animateFlag, callback) {
+					var root = data.getRoot(setting),
+						childKey = setting.data.key.children,
+						treeNodes = (node) ? node[childKey] : root[childKey],
+						selfAnimateSign = (node) ? false : animateFlag,
+						expandTriggerFlag = data.getRoot(setting).expandTriggerFlag;
+					data.getRoot(setting).expandTriggerFlag = false;
+					if (treeNodes) {
+						for (var i = 0, l = treeNodes.length; i < l; i++) {
+							if (treeNodes[i]) view.expandCollapseSonNode(setting, treeNodes[i], expandFlag, selfAnimateSign);
+						}
+					}
+					data.getRoot(setting).expandTriggerFlag = expandTriggerFlag;
+					view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback);
+				},
+				isSelectedNode: function (setting, node) {
+					if (!node) {
+						return false;
+					}
+					var list = data.getRoot(setting).curSelectedList,
+						i;
+					for (i = list.length - 1; i >= 0; i--) {
+						if (node === list[i]) {
+							return true;
+						}
+					}
+					return false;
+				},
+				makeDOMNodeIcon: function (html, setting, node) {
+					var nameStr = data.getNodeName(setting, node),
+						name = setting.view.nameIsHTML ? nameStr : nameStr.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+					html.push("<span id='", node.tId, consts.id.ICON,
+						"' title='' treeNode", consts.id.ICON, " class='", view.makeNodeIcoClass(setting, node),
+						"' style='", view.makeNodeIcoStyle(setting, node), "'></span><span id='", node.tId, consts.id.SPAN,
+						"' class='", consts.className.NAME,
+						"'>", name, "</span>");
+				},
+				makeDOMNodeLine: function (html, setting, node) {
+					html.push("<span id='", node.tId, consts.id.SWITCH, "' title='' class='", view.makeNodeLineClass(setting, node), "' treeNode", consts.id.SWITCH, "></span>");
+				},
+				makeDOMNodeMainAfter: function (html, setting, node) {
+					html.push("</li>");
+				},
+				makeDOMNodeMainBefore: function (html, setting, node) {
+					html.push("<li id='", node.tId, "' class='", consts.className.LEVEL, node.level, "' tabindex='0' hidefocus='true' treenode>");
+				},
+				makeDOMNodeNameAfter: function (html, setting, node) {
+					html.push("</a>");
+				},
+				makeDOMNodeNameBefore: function (html, setting, node) {
+					var title = data.getNodeTitle(setting, node),
+						url = view.makeNodeUrl(setting, node),
+						fontcss = view.makeNodeFontCss(setting, node),
+						fontStyle = [];
+					for (var f in fontcss) {
+						fontStyle.push(f, ":", fontcss[f], ";");
+					}
+					html.push("<a id='", node.tId, consts.id.A, "' class='", consts.className.LEVEL, node.level, "' treeNode", consts.id.A, " onclick=\"", (node.click || ''),
+						"\" ", ((url != null && url.length > 0) ? "href='" + url + "'" : ""), " target='", view.makeNodeTarget(node), "' style='", fontStyle.join(''),
+						"'");
+					if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle) && title) {
+						html.push("title='", title.replace(/'/g, "&#39;").replace(/</g, '&lt;').replace(/>/g, '&gt;'), "'");
+					}
+					html.push(">");
+				},
+				makeNodeFontCss: function (setting, node) {
+					var fontCss = tools.apply(setting.view.fontCss, [setting.treeId, node], setting.view.fontCss);
+					return (fontCss && ((typeof fontCss) != "function")) ? fontCss : {};
+				},
+				makeNodeIcoClass: function (setting, node) {
+					var icoCss = ["ico"];
+					if (!node.isAjaxing) {
+						icoCss[0] = (node.iconSkin ? node.iconSkin + "_" : "") + icoCss[0];
+						if (node.isParent) {
+							icoCss.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
+						} else {
+							icoCss.push(consts.folder.DOCU);
+						}
+					}
+					return consts.className.BUTTON + " " + icoCss.join('_');
+				},
+				makeNodeIcoStyle: function (setting, node) {
+					var icoStyle = [];
+					if (!node.isAjaxing) {
+						var icon = (node.isParent && node.iconOpen && node.iconClose) ? (node.open ? node.iconOpen : node.iconClose) : node[setting.data.key.icon];
+						if (icon) icoStyle.push("background:url(", icon, ") 0 0 no-repeat;");
+						if (setting.view.showIcon == false || !tools.apply(setting.view.showIcon, [setting.treeId, node], true)) {
+							icoStyle.push("width:0px;height:0px;");
+						}
+					}
+					return icoStyle.join('');
+				},
+				makeNodeLineClass: function (setting, node) {
+					var lineClass = [];
+					if (setting.view.showLine) {
+						if (node.level == 0 && node.isFirstNode && node.isLastNode) {
+							lineClass.push(consts.line.ROOT);
+						} else if (node.level == 0 && node.isFirstNode) {
+							lineClass.push(consts.line.ROOTS);
+						} else if (node.isLastNode) {
+							lineClass.push(consts.line.BOTTOM);
+						} else {
+							lineClass.push(consts.line.CENTER);
+						}
+					} else {
+						lineClass.push(consts.line.NOLINE);
+					}
+					if (node.isParent) {
+						lineClass.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
+					} else {
+						lineClass.push(consts.folder.DOCU);
+					}
+					return view.makeNodeLineClassEx(node) + lineClass.join('_');
+				},
+				makeNodeLineClassEx: function (node) {
+					return consts.className.BUTTON + " " + consts.className.LEVEL + node.level + " " + consts.className.SWITCH + " ";
+				},
+				makeNodeTarget: function (node) {
+					return (node.target || "_blank");
+				},
+				makeNodeUrl: function (setting, node) {
+					var urlKey = setting.data.key.url;
+					return node[urlKey] ? node[urlKey] : null;
+				},
+				makeUlHtml: function (setting, node, html, content) {
+					html.push("<ul id='", node.tId, consts.id.UL, "' class='", consts.className.LEVEL, node.level, " ", view.makeUlLineClass(setting, node), "' style='display:", (node.open ? "block" : "none"), "'>");
+					html.push(content);
+					html.push("</ul>");
+				},
+				makeUlLineClass: function (setting, node) {
+					return ((setting.view.showLine && !node.isLastNode) ? consts.line.LINE : "");
+				},
+				removeChildNodes: function (setting, node) {
+					if (!node) return;
+					var childKey = setting.data.key.children,
+						nodes = node[childKey];
+					if (!nodes) return;
+
+					for (var i = 0, l = nodes.length; i < l; i++) {
+						data.removeNodeCache(setting, nodes[i]);
+					}
+					data.removeSelectedNode(setting);
+					delete node[childKey];
+
+					if (!setting.data.keep.parent) {
+						node.isParent = false;
+						node.open = false;
+						var tmp_switchObj = $$(node, consts.id.SWITCH, setting),
+							tmp_icoObj = $$(node, consts.id.ICON, setting);
+						view.replaceSwitchClass(node, tmp_switchObj, consts.folder.DOCU);
+						view.replaceIcoClass(node, tmp_icoObj, consts.folder.DOCU);
+						$$(node, consts.id.UL, setting).remove();
+					} else {
+						$$(node, consts.id.UL, setting).empty();
+					}
+				},
+				scrollIntoView: function (dom) {
+					if (!dom) {
+						return;
+					}
+					// code src: http://jsfiddle.net/08u6cxwj/
+					if (!Element.prototype.scrollIntoViewIfNeeded) {
+						Element.prototype.scrollIntoViewIfNeeded = function (centerIfNeeded) {
+							function withinBounds(value, min, max, extent) {
+								if (false === centerIfNeeded || max <= value + extent && value <= min + extent) {
+									return Math.min(max, Math.max(min, value));
+								} else {
+									return (min + max) / 2;
+								}
+							}
+
+							function makeArea(left, top, width, height) {
+								return {
+									"left": left,
+									"top": top,
+									"width": width,
+									"height": height,
+									"right": left + width,
+									"bottom": top + height,
+									"translate": function (x, y) {
+										return makeArea(x + left, y + top, width, height);
+									},
+									"relativeFromTo": function (lhs, rhs) {
+										var newLeft = left,
+											newTop = top;
+										lhs = lhs.offsetParent;
+										rhs = rhs.offsetParent;
+										if (lhs === rhs) {
+											return area;
+										}
+										for (; lhs; lhs = lhs.offsetParent) {
+											newLeft += lhs.offsetLeft + lhs.clientLeft;
+											newTop += lhs.offsetTop + lhs.clientTop;
+										}
+										for (; rhs; rhs = rhs.offsetParent) {
+											newLeft -= rhs.offsetLeft + rhs.clientLeft;
+											newTop -= rhs.offsetTop + rhs.clientTop;
+										}
+										return makeArea(newLeft, newTop, width, height);
+									}
+								};
+							}
+
+							var parent, elem = this,
+								area = makeArea(
+									this.offsetLeft, this.offsetTop,
+									this.offsetWidth, this.offsetHeight);
+							while (tools.isElement(parent = elem.parentNode)) {
+								var clientLeft = parent.offsetLeft + parent.clientLeft;
+								var clientTop = parent.offsetTop + parent.clientTop;
+
+								// Make area relative to parent's client area.
+								area = area.relativeFromTo(elem, parent).translate(-clientLeft, -clientTop);
+
+								parent.scrollLeft = withinBounds(
+									parent.scrollLeft,
+									area.right - parent.clientWidth, area.left,
+									parent.clientWidth);
+
+								parent.scrollTop = withinBounds(
+									parent.scrollTop,
+									area.bottom - parent.clientHeight, area.top,
+									parent.clientHeight);
+
+								// Determine actual scroll amount by reading back scroll properties.
+								area = area.translate(clientLeft - parent.scrollLeft,
+									clientTop - parent.scrollTop);
+								elem = parent;
+							}
+						};
+					}
+					dom.scrollIntoViewIfNeeded();
+				},
+				setFirstNode: function (setting, parentNode) {
+					var childKey = setting.data.key.children,
+						childLength = parentNode[childKey].length;
+					if (childLength > 0) {
+						parentNode[childKey][0].isFirstNode = true;
+					}
+				},
+				setLastNode: function (setting, parentNode) {
+					var childKey = setting.data.key.children,
+						childLength = parentNode[childKey].length;
+					if (childLength > 0) {
+						parentNode[childKey][childLength - 1].isLastNode = true;
+					}
+				},
+				removeNode: function (setting, node) {
+					var root = data.getRoot(setting),
+						childKey = setting.data.key.children,
+						parentNode = (node.parentTId) ? node.getParentNode() : root;
+
+					node.isFirstNode = false;
+					node.isLastNode = false;
+					node.getPreNode = function () {
+						return null;
+					};
+					node.getNextNode = function () {
+						return null;
+					};
+
+					if (!data.getNodeCache(setting, node.tId)) {
+						return;
+					}
+
+					$$(node, setting).remove();
+					data.removeNodeCache(setting, node);
+					data.removeSelectedNode(setting, node);
+
+					for (var i = 0, l = parentNode[childKey].length; i < l; i++) {
+						if (parentNode[childKey][i].tId == node.tId) {
+							parentNode[childKey].splice(i, 1);
+							break;
+						}
+					}
+					view.setFirstNode(setting, parentNode);
+					view.setLastNode(setting, parentNode);
+
+					var tmp_ulObj, tmp_switchObj, tmp_icoObj,
+						childLength = parentNode[childKey].length;
+
+					//repair nodes old parent
+					if (!setting.data.keep.parent && childLength == 0) {
+						//old parentNode has no child nodes
+						parentNode.isParent = false;
+						parentNode.open = false;
+						tmp_ulObj = $$(parentNode, consts.id.UL, setting);
+						tmp_switchObj = $$(parentNode, consts.id.SWITCH, setting);
+						tmp_icoObj = $$(parentNode, consts.id.ICON, setting);
+						view.replaceSwitchClass(parentNode, tmp_switchObj, consts.folder.DOCU);
+						view.replaceIcoClass(parentNode, tmp_icoObj, consts.folder.DOCU);
+						tmp_ulObj.css("display", "none");
+
+					} else if (setting.view.showLine && childLength > 0) {
+						//old parentNode has child nodes
+						var newLast = parentNode[childKey][childLength - 1];
+						tmp_ulObj = $$(newLast, consts.id.UL, setting);
+						tmp_switchObj = $$(newLast, consts.id.SWITCH, setting);
+						tmp_icoObj = $$(newLast, consts.id.ICON, setting);
+						if (parentNode == root) {
+							if (parentNode[childKey].length == 1) {
+								//node was root, and ztree has only one root after move node
+								view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.ROOT);
+							} else {
+								var tmp_first_switchObj = $$(parentNode[childKey][0], consts.id.SWITCH, setting);
+								view.replaceSwitchClass(parentNode[childKey][0], tmp_first_switchObj, consts.line.ROOTS);
+								view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
+							}
+						} else {
+							view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
+						}
+						tmp_ulObj.removeClass(consts.line.LINE);
+					}
+				},
+				replaceIcoClass: function (node, obj, newName) {
+					if (!obj || node.isAjaxing) return;
+					var tmpName = obj.attr("class");
+					if (tmpName == undefined) return;
+					var tmpList = tmpName.split("_");
+					switch (newName) {
+						case consts.folder.OPEN:
+						case consts.folder.CLOSE:
+						case consts.folder.DOCU:
+							tmpList[tmpList.length - 1] = newName;
+							break;
+					}
+					obj.attr("class", tmpList.join("_"));
+				},
+				replaceSwitchClass: function (node, obj, newName) {
+					if (!obj) return;
+					var tmpName = obj.attr("class");
+					if (tmpName == undefined) return;
+					var tmpList = tmpName.split("_");
+					switch (newName) {
+						case consts.line.ROOT:
+						case consts.line.ROOTS:
+						case consts.line.CENTER:
+						case consts.line.BOTTOM:
+						case consts.line.NOLINE:
+							tmpList[0] = view.makeNodeLineClassEx(node) + newName;
+							break;
+						case consts.folder.OPEN:
+						case consts.folder.CLOSE:
+						case consts.folder.DOCU:
+							tmpList[1] = newName;
+							break;
+					}
+					obj.attr("class", tmpList.join("_"));
+					if (newName !== consts.folder.DOCU) {
+						obj.removeAttr("disabled");
+					} else {
+						obj.attr("disabled", "disabled");
+					}
+				},
+				selectNode: function (setting, node, addFlag) {
+					if (!addFlag) {
+						view.cancelPreSelectedNode(setting, null, node);
+					}
+					$$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED);
+					data.addSelectedNode(setting, node);
+					setting.treeObj.trigger(consts.event.SELECTED, [setting.treeId, node]);
+				},
+				setNodeFontCss: function (setting, treeNode) {
+					var aObj = $$(treeNode, consts.id.A, setting),
+						fontCss = view.makeNodeFontCss(setting, treeNode);
+					if (fontCss) {
+						aObj.css(fontCss);
+					}
+				},
+				setNodeLineIcos: function (setting, node) {
+					if (!node) return;
+					var switchObj = $$(node, consts.id.SWITCH, setting),
+						ulObj = $$(node, consts.id.UL, setting),
+						icoObj = $$(node, consts.id.ICON, setting),
+						ulLine = view.makeUlLineClass(setting, node);
+					if (ulLine.length == 0) {
+						ulObj.removeClass(consts.line.LINE);
+					} else {
+						ulObj.addClass(ulLine);
+					}
+					switchObj.attr("class", view.makeNodeLineClass(setting, node));
+					if (node.isParent) {
+						switchObj.removeAttr("disabled");
+					} else {
+						switchObj.attr("disabled", "disabled");
+					}
+					icoObj.removeAttr("style");
+					icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
+					icoObj.attr("class", view.makeNodeIcoClass(setting, node));
+				},
+				setNodeName: function (setting, node) {
+					var title = data.getNodeTitle(setting, node),
+						nObj = $$(node, consts.id.SPAN, setting);
+					nObj.empty();
+					if (setting.view.nameIsHTML) {
+						nObj.html(data.getNodeName(setting, node));
+					} else {
+						nObj.text(data.getNodeName(setting, node));
+					}
+					if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle)) {
+						var aObj = $$(node, consts.id.A, setting);
+						aObj.attr("title", !title ? "" : title);
+					}
+				},
+				setNodeTarget: function (setting, node) {
+					var aObj = $$(node, consts.id.A, setting);
+					aObj.attr("target", view.makeNodeTarget(node));
+				},
+				setNodeUrl: function (setting, node) {
+					var aObj = $$(node, consts.id.A, setting),
+						url = view.makeNodeUrl(setting, node);
+					if (url == null || url.length == 0) {
+						aObj.removeAttr("href");
+					} else {
+						aObj.attr("href", url);
+					}
+				},
+				switchNode: function (setting, node) {
+					if (node.open || !tools.canAsync(setting, node)) {
+						view.expandCollapseNode(setting, node, !node.open);
+					} else if (setting.async.enable) {
+						if (!view.asyncNode(setting, node)) {
+							view.expandCollapseNode(setting, node, !node.open);
+							return;
+						}
+					} else if (node) {
+						view.expandCollapseNode(setting, node, !node.open);
+					}
+				}
+			};
+		// zTree defind
+		$.fn.zTree = {
+			consts: _consts,
+			_z: {
+				tools: tools,
+				view: view,
+				event: event,
+				data: data
+			},
+			getZTreeObj: function (treeId) {
+				var o = data.getZTreeTools(treeId);
+				return o ? o : null;
+			},
+			destroy: function (treeId) {
+				if (!!treeId && treeId.length > 0) {
+					view.destroy(data.getSetting(treeId));
+				} else {
+					for (var s in settings) {
+						view.destroy(settings[s]);
+					}
+				}
+			},
+			init: function (obj, zSetting, zNodes) {
+				var setting = tools.clone(_setting);
+				$.extend(true, setting, zSetting);
+				setting.treeId = obj.attr("id");
+				setting.treeObj = obj;
+				setting.treeObj.empty();
+				settings[setting.treeId] = setting;
+				//For some older browser,(e.g., ie6)
+				if (typeof document.body.style.maxHeight === "undefined") {
+					setting.view.expandSpeed = "";
+				}
+				data.initRoot(setting);
+				var root = data.getRoot(setting),
+					childKey = setting.data.key.children;
+				zNodes = zNodes ? tools.clone(tools.isArray(zNodes) ? zNodes : [zNodes]) : [];
+				if (setting.data.simpleData.enable) {
+					root[childKey] = data.transformTozTreeFormat(setting, zNodes);
+				} else {
+					root[childKey] = zNodes;
+				}
+
+				data.initCache(setting);
+				event.unbindTree(setting);
+				event.bindTree(setting);
+				event.unbindEvent(setting);
+				event.bindEvent(setting);
+
+				var zTreeTools = {
+					setting: setting,
+					addNodes: function (parentNode, index, newNodes, isSilent) {
+						if (!parentNode) parentNode = null;
+						if (parentNode && !parentNode.isParent && setting.data.keep.leaf) return null;
+
+						var i = parseInt(index, 10);
+						if (isNaN(i)) {
+							isSilent = !!newNodes;
+							newNodes = index;
+							index = -1;
+						} else {
+							index = i;
+						}
+						if (!newNodes) return null;
+
+
+						var xNewNodes = tools.clone(tools.isArray(newNodes) ? newNodes : [newNodes]);
+
+						function addCallback() {
+							view.addNodes(setting, parentNode, index, xNewNodes, (isSilent == true));
+						}
+
+						if (tools.canAsync(setting, parentNode)) {
+							view.asyncNode(setting, parentNode, isSilent, addCallback);
+						} else {
+							addCallback();
+						}
+						return xNewNodes;
+					},
+					cancelSelectedNode: function (node) {
+						view.cancelPreSelectedNode(setting, node);
+					},
+					destroy: function () {
+						view.destroy(setting);
+					},
+					expandAll: function (expandFlag) {
+						expandFlag = !!expandFlag;
+						view.expandCollapseSonNode(setting, null, expandFlag, true);
+						return expandFlag;
+					},
+					expandNode: function (node, expandFlag, sonSign, focus, callbackFlag) {
+						if (!node || !node.isParent) return null;
+						if (expandFlag !== true && expandFlag !== false) {
+							expandFlag = !node.open;
+						}
+						callbackFlag = !!callbackFlag;
+
+						if (callbackFlag && expandFlag && (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false)) {
+							return null;
+						} else if (callbackFlag && !expandFlag && (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false)) {
+							return null;
+						}
+						if (expandFlag && node.parentTId) {
+							view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, false);
+						}
+						if (expandFlag === node.open && !sonSign) {
+							return null;
+						}
+
+						data.getRoot(setting).expandTriggerFlag = callbackFlag;
+						if (!tools.canAsync(setting, node) && sonSign) {
+							view.expandCollapseSonNode(setting, node, expandFlag, true, showNodeFocus);
+						} else {
+							node.open = !expandFlag;
+							view.switchNode(this.setting, node);
+							showNodeFocus();
+						}
+						return expandFlag;
+
+						function showNodeFocus() {
+							var a = $$(node, setting).get(0);
+							if (a && focus !== false) {
+								view.scrollIntoView(a);
+							}
+						}
+					},
+					getNodes: function () {
+						return data.getNodes(setting);
+					},
+					getNodeByParam: function (key, value, parentNode) {
+						if (!key) return null;
+						return data.getNodeByParam(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), key, value);
+					},
+					getNodeByTId: function (tId) {
+						return data.getNodeCache(setting, tId);
+					},
+					getNodesByParam: function (key, value, parentNode) {
+						if (!key) return null;
+						return data.getNodesByParam(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), key, value);
+					},
+					getNodesByParamFuzzy: function (key, value, parentNode) {
+						if (!key) return null;
+						return data.getNodesByParamFuzzy(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), key, value);
+					},
+					getNodesByFilter: function (filter, isSingle, parentNode, invokeParam) {
+						isSingle = !!isSingle;
+						if (!filter || (typeof filter != "function")) return (isSingle ? null : []);
+						return data.getNodesByFilter(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), filter, isSingle, invokeParam);
+					},
+					getNodeIndex: function (node) {
+						if (!node) return null;
+						var childKey = setting.data.key.children,
+							parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
+						for (var i = 0, l = parentNode[childKey].length; i < l; i++) {
+							if (parentNode[childKey][i] == node) return i;
+						}
+						return -1;
+					},
+					getSelectedNodes: function () {
+						var r = [],
+							list = data.getRoot(setting).curSelectedList;
+						for (var i = 0, l = list.length; i < l; i++) {
+							r.push(list[i]);
+						}
+						return r;
+					},
+					isSelectedNode: function (node) {
+						return data.isSelectedNode(setting, node);
+					},
+					reAsyncChildNodesPromise: function (parentNode, reloadType, isSilent) {
+						var promise = new Promise(function (resolve, reject) {
+							try {
+								zTreeTools.reAsyncChildNodes(parentNode, reloadType, isSilent, function () {
+									resolve(parentNode);
+								});
+							} catch (e) {
+								reject(e);
+							}
+						});
+						return promise;
+					},
+					reAsyncChildNodes: function (parentNode, reloadType, isSilent, callback) {
+						if (!this.setting.async.enable) return;
+						var isRoot = !parentNode;
+						if (isRoot) {
+							parentNode = data.getRoot(setting);
+						}
+						if (reloadType == "refresh") {
+							var childKey = this.setting.data.key.children;
+							for (var i = 0, l = parentNode[childKey] ? parentNode[childKey].length : 0; i < l; i++) {
+								data.removeNodeCache(setting, parentNode[childKey][i]);
+							}
+							data.removeSelectedNode(setting);
+							parentNode[childKey] = [];
+							if (isRoot) {
+								this.setting.treeObj.empty();
+							} else {
+								var ulObj = $$(parentNode, consts.id.UL, setting);
+								ulObj.empty();
+							}
+						}
+						view.asyncNode(this.setting, isRoot ? null : parentNode, !!isSilent, callback);
+					},
+					refresh: function () {
+						this.setting.treeObj.empty();
+						var root = data.getRoot(setting),
+							nodes = root[setting.data.key.children]
+						data.initRoot(setting);
+						root[setting.data.key.children] = nodes
+						data.initCache(setting);
+						view.createNodes(setting, 0, root[setting.data.key.children], null, -1);
+					},
+					removeChildNodes: function (node) {
+						if (!node) return null;
+						var childKey = setting.data.key.children,
+							nodes = node[childKey];
+						view.removeChildNodes(setting, node);
+						return nodes ? nodes : null;
+					},
+					removeNode: function (node, callbackFlag) {
+						if (!node) return;
+						callbackFlag = !!callbackFlag;
+						if (callbackFlag && tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return;
+						view.removeNode(setting, node);
+						if (callbackFlag) {
+							this.setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
+						}
+					},
+					selectNode: function (node, addFlag, isSilent) {
+						if (!node) return;
+						if (tools.uCanDo(setting)) {
+							addFlag = setting.view.selectedMulti && addFlag;
+							if (node.parentTId) {
+								view.expandCollapseParentNode(setting, node.getParentNode(), true, false, showNodeFocus);
+							} else if (!isSilent) {
+								try {
+									$$(node, setting).focus().blur();
+								} catch (e) {
+								}
+							}
+							view.selectNode(setting, node, addFlag);
+						}
+
+						function showNodeFocus() {
+							if (isSilent) {
+								return;
+							}
+							var a = $$(node, setting).get(0);
+							view.scrollIntoView(a);
+						}
+					},
+					transformTozTreeNodes: function (simpleNodes) {
+						return data.transformTozTreeFormat(setting, simpleNodes);
+					},
+					transformToArray: function (nodes) {
+						return data.transformToArrayFormat(setting, nodes);
+					},
+					updateNode: function (node, checkTypeFlag) {
+						if (!node) return;
+						var nObj = $$(node, setting);
+						if (nObj.get(0) && tools.uCanDo(setting)) {
+							view.setNodeName(setting, node);
+							view.setNodeTarget(setting, node);
+							view.setNodeUrl(setting, node);
+							view.setNodeLineIcos(setting, node);
+							view.setNodeFontCss(setting, node);
+						}
+					}
+				}
+				root.treeTools = zTreeTools;
+				data.setZTreeTools(setting, zTreeTools);
+
+				if (root[childKey] && root[childKey].length > 0) {
+					view.createNodes(setting, 0, root[childKey], null, -1);
+				} else if (setting.async.enable && setting.async.url && setting.async.url !== '') {
+					view.asyncNode(setting);
+				}
+				return zTreeTools;
+			}
+		};
+
+		var zt = $.fn.zTree,
+			$$ = tools.$,
+			consts = zt.consts;
+	})(jQuery);
+	/*
      * JQuery zTree excheck v3.5.29
      * http://treejs.cn/
      *
@@ -1956,632 +1960,631 @@
      * email: hunter.z@263.net
      * Date: 2017-06-19
      */
-    (function($) {
-        //default consts of excheck
-        var _consts = {
-                event: {
-                    CHECK: "ztree_check"
-                },
-                id: {
-                    CHECK: "_check"
-                },
-                checkbox: {
-                    STYLE: "checkbox",
-                    DEFAULT: "chk",
-                    DISABLED: "disable",
-                    FALSE: "false",
-                    TRUE: "true",
-                    FULL: "full",
-                    PART: "part",
-                    FOCUS: "focus"
-                },
-                radio: {
-                    STYLE: "radio",
-                    TYPE_ALL: "all",
-                    TYPE_LEVEL: "level"
-                }
-            },
-            //default setting of excheck
-            _setting = {
-                check: {
-                    enable: false,
-                    autoCheckTrigger: false,
-                    chkStyle: _consts.checkbox.STYLE,
-                    nocheckInherit: false,
-                    chkDisabledInherit: false,
-                    radioType: _consts.radio.TYPE_LEVEL,
-                    chkboxType: {
-                        "Y": "ps",
-                        "N": "ps"
-                    }
-                },
-                data: {
-                    key: {
-                        checked: "checked"
-                    }
-                },
-                callback: {
-                    beforeCheck: null,
-                    onCheck: null
-                }
-            },
-            //default root of excheck
-            _initRoot = function(setting) {
-                var r = data.getRoot(setting);
-                r.radioCheckedList = [];
-            },
-            //default cache of excheck
-            _initCache = function(treeId) {},
-            //default bind event of excheck
-            _bindEvent = function(setting) {
-                var o = setting.treeObj,
-                    c = consts.event;
-                o.bind(c.CHECK, function(event, srcEvent, treeId, node) {
-                    event.srcEvent = srcEvent;
-                    tools.apply(setting.callback.onCheck, [event, treeId, node]);
-                });
-            },
-            _unbindEvent = function(setting) {
-                var o = setting.treeObj,
-                    c = consts.event;
-                o.unbind(c.CHECK);
-            },
-            //default event proxy of excheck
-            _eventProxy = function(e) {
-                var target = e.target,
-                    setting = data.getSetting(e.data.treeId),
-                    tId = "",
-                    node = null,
-                    nodeEventType = "",
-                    treeEventType = "",
-                    nodeEventCallback = null,
-                    treeEventCallback = null;
-
-                if (tools.eqs(e.type, "mouseover")) {
-                    if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.CHECK) !== null) {
-                        tId = tools.getNodeMainDom(target).id;
-                        nodeEventType = "mouseoverCheck";
-                    }
-                } else if (tools.eqs(e.type, "mouseout")) {
-                    if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.CHECK) !== null) {
-                        tId = tools.getNodeMainDom(target).id;
-                        nodeEventType = "mouseoutCheck";
-                    }
-                } else if (tools.eqs(e.type, "click")) {
-                    if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.CHECK) !== null) {
-                        tId = tools.getNodeMainDom(target).id;
-                        nodeEventType = "checkNode";
-                    }
-                }
-                if (tId.length > 0) {
-                    node = data.getNodeCache(setting, tId);
-                    switch (nodeEventType) {
-                        case "checkNode":
-                            nodeEventCallback = _handler.onCheckNode;
-                            break;
-                        case "mouseoverCheck":
-                            nodeEventCallback = _handler.onMouseoverCheck;
-                            break;
-                        case "mouseoutCheck":
-                            nodeEventCallback = _handler.onMouseoutCheck;
-                            break;
-                    }
-                }
-                var proxyResult = {
-                    stop: nodeEventType === "checkNode",
-                    node: node,
-                    nodeEventType: nodeEventType,
-                    nodeEventCallback: nodeEventCallback,
-                    treeEventType: treeEventType,
-                    treeEventCallback: treeEventCallback
-                };
-                return proxyResult
-            },
-            //default init node of excheck
-            _initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
-                if (!n) return;
-                var checkedKey = setting.data.key.checked;
-                if (typeof n[checkedKey] == "string") n[checkedKey] = tools.eqs(n[checkedKey], "true");
-                n[checkedKey] = !!n[checkedKey];
-                n.checkedOld = n[checkedKey];
-                if (typeof n.nocheck == "string") n.nocheck = tools.eqs(n.nocheck, "true");
-                n.nocheck = !!n.nocheck || (setting.check.nocheckInherit && parentNode && !!parentNode.nocheck);
-                if (typeof n.chkDisabled == "string") n.chkDisabled = tools.eqs(n.chkDisabled, "true");
-                n.chkDisabled = !!n.chkDisabled || (setting.check.chkDisabledInherit && parentNode && !!parentNode.chkDisabled);
-                if (typeof n.halfCheck == "string") n.halfCheck = tools.eqs(n.halfCheck, "true");
-                n.halfCheck = !!n.halfCheck;
-                n.check_Child_State = -1;
-                n.check_Focus = false;
-                n.getCheckStatus = function() { return data.getCheckStatus(setting, n); };
-
-                if (setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL && n[checkedKey]) {
-                    var r = data.getRoot(setting);
-                    r.radioCheckedList.push(n);
-                }
-            },
-            //add dom for check
-            _beforeA = function(setting, node, html) {
-                var checkedKey = setting.data.key.checked;
-                if (setting.check.enable) {
-                    data.makeChkFlag(setting, node);
-                    html.push("<span ID='", node.tId, consts.id.CHECK, "' class='", view.makeChkClass(setting, node), "' treeNode", consts.id.CHECK, (node.nocheck === true ? " style='display:none;'" : ""), "></span>");
-                }
-            },
-            //update zTreeObj, add method of check
-            _zTreeTools = function(setting, zTreeTools) {
-                zTreeTools.checkNode = function(node, checked, checkTypeFlag, callbackFlag) {
-                    var checkedKey = this.setting.data.key.checked;
-                    if (node.chkDisabled === true) return;
-                    if (checked !== true && checked !== false) {
-                        checked = !node[checkedKey];
-                    }
-                    callbackFlag = !!callbackFlag;
-
-                    if (node[checkedKey] === checked && !checkTypeFlag) {
-                        return;
-                    } else if (callbackFlag && tools.apply(this.setting.callback.beforeCheck, [this.setting.treeId, node], true) == false) {
-                        return;
-                    }
-                    if (tools.uCanDo(this.setting) && this.setting.check.enable && node.nocheck !== true) {
-                        node[checkedKey] = checked;
-                        var checkObj = $$(node, consts.id.CHECK, this.setting);
-                        if (checkTypeFlag || this.setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(this.setting, node);
-                        view.setChkClass(this.setting, checkObj, node);
-                        view.repairParentChkClassWithSelf(this.setting, node);
-                        if (callbackFlag) {
-                            this.setting.treeObj.trigger(consts.event.CHECK, [null, this.setting.treeId, node]);
-                        }
-                    }
-                }
-
-                zTreeTools.checkAllNodes = function(checked) {
-                    view.repairAllChk(this.setting, !!checked);
-                }
-
-                zTreeTools.getCheckedNodes = function(checked) {
-                    var childKey = this.setting.data.key.children;
-                    checked = (checked !== false);
-                    return data.getTreeCheckedNodes(this.setting, data.getRoot(this.setting)[childKey], checked);
-                }
-
-                zTreeTools.getChangeCheckedNodes = function() {
-                    var childKey = this.setting.data.key.children;
-                    return data.getTreeChangeCheckedNodes(this.setting, data.getRoot(this.setting)[childKey]);
-                }
-
-                zTreeTools.setChkDisabled = function(node, disabled, inheritParent, inheritChildren) {
-                    disabled = !!disabled;
-                    inheritParent = !!inheritParent;
-                    inheritChildren = !!inheritChildren;
-                    view.repairSonChkDisabled(this.setting, node, disabled, inheritChildren);
-                    view.repairParentChkDisabled(this.setting, node.getParentNode(), disabled, inheritParent);
-                }
-
-                var _updateNode = zTreeTools.updateNode;
-                zTreeTools.updateNode = function(node, checkTypeFlag) {
-                    if (_updateNode) _updateNode.apply(zTreeTools, arguments);
-                    if (!node || !this.setting.check.enable) return;
-                    var nObj = $$(node, this.setting);
-                    if (nObj.get(0) && tools.uCanDo(this.setting)) {
-                        var checkObj = $$(node, consts.id.CHECK, this.setting);
-                        if (checkTypeFlag == true || this.setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(this.setting, node);
-                        view.setChkClass(this.setting, checkObj, node);
-                        view.repairParentChkClassWithSelf(this.setting, node);
-                    }
-                }
-            },
-            //method of operate data
-            _data = {
-                getRadioCheckedList: function(setting) {
-                    var checkedList = data.getRoot(setting).radioCheckedList;
-                    for (var i = 0, j = checkedList.length; i < j; i++) {
-                        if (!data.getNodeCache(setting, checkedList[i].tId)) {
-                            checkedList.splice(i, 1);
-                            i--;
-                            j--;
-                        }
-                    }
-                    return checkedList;
-                },
-                getCheckStatus: function(setting, node) {
-                    if (!setting.check.enable || node.nocheck || node.chkDisabled) return null;
-                    var checkedKey = setting.data.key.checked,
-                        r = {
-                            checked: node[checkedKey],
-                            half: node.halfCheck ? node.halfCheck : (setting.check.chkStyle == consts.radio.STYLE ? (node.check_Child_State === 2) : (node[checkedKey] ? (node.check_Child_State > -1 && node.check_Child_State < 2) : (node.check_Child_State > 0)))
-                        };
-                    return r;
-                },
-                getTreeCheckedNodes: function(setting, nodes, checked, results) {
-                    if (!nodes) return [];
-                    var childKey = setting.data.key.children,
-                        checkedKey = setting.data.key.checked,
-                        onlyOne = (checked && setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL);
-                    results = !results ? [] : results;
-                    for (var i = 0, l = nodes.length; i < l; i++) {
-                        if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] == checked) {
-                            results.push(nodes[i]);
-                            if (onlyOne) {
-                                break;
-                            }
-                        }
-                        data.getTreeCheckedNodes(setting, nodes[i][childKey], checked, results);
-                        if (onlyOne && results.length > 0) {
-                            break;
-                        }
-                    }
-                    return results;
-                },
-                getTreeChangeCheckedNodes: function(setting, nodes, results) {
-                    if (!nodes) return [];
-                    var childKey = setting.data.key.children,
-                        checkedKey = setting.data.key.checked;
-                    results = !results ? [] : results;
-                    for (var i = 0, l = nodes.length; i < l; i++) {
-                        if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] != nodes[i].checkedOld) {
-                            results.push(nodes[i]);
-                        }
-                        data.getTreeChangeCheckedNodes(setting, nodes[i][childKey], results);
-                    }
-                    return results;
-                },
-                makeChkFlag: function(setting, node) {
-                    if (!node) return;
-                    var childKey = setting.data.key.children,
-                        checkedKey = setting.data.key.checked,
-                        chkFlag = -1;
-                    if (node[childKey]) {
-                        for (var i = 0, l = node[childKey].length; i < l; i++) {
-                            var cNode = node[childKey][i];
-                            var tmp = -1;
-                            if (setting.check.chkStyle == consts.radio.STYLE) {
-                                if (cNode.nocheck === true || cNode.chkDisabled === true) {
-                                    tmp = cNode.check_Child_State;
-                                } else if (cNode.halfCheck === true) {
-                                    tmp = 2;
-                                } else if (cNode[checkedKey]) {
-                                    tmp = 2;
-                                } else {
-                                    tmp = cNode.check_Child_State > 0 ? 2 : 0;
-                                }
-                                if (tmp == 2) {
-                                    chkFlag = 2;
-                                    break;
-                                } else if (tmp == 0) {
-                                    chkFlag = 0;
-                                }
-                            } else if (setting.check.chkStyle == consts.checkbox.STYLE) {
-                                if (cNode.nocheck === true || cNode.chkDisabled === true) {
-                                    tmp = cNode.check_Child_State;
-                                } else if (cNode.halfCheck === true) {
-                                    tmp = 1;
-                                } else if (cNode[checkedKey]) {
-                                    tmp = (cNode.check_Child_State === -1 || cNode.check_Child_State === 2) ? 2 : 1;
-                                } else {
-                                    tmp = (cNode.check_Child_State > 0) ? 1 : 0;
-                                }
-                                if (tmp === 1) {
-                                    chkFlag = 1;
-                                    break;
-                                } else if (tmp === 2 && chkFlag > -1 && i > 0 && tmp !== chkFlag) {
-                                    chkFlag = 1;
-                                    break;
-                                } else if (chkFlag === 2 && tmp > -1 && tmp < 2) {
-                                    chkFlag = 1;
-                                    break;
-                                } else if (tmp > -1) {
-                                    chkFlag = tmp;
-                                }
-                            }
-                        }
-                    }
-                    node.check_Child_State = chkFlag;
-                }
-            },
-            //method of event proxy
-            _event = {
-
-            },
-            //method of event handler
-            _handler = {
-                onCheckNode: function(event, node) {
-                    if (node.chkDisabled === true) return false;
-                    var setting = data.getSetting(event.data.treeId),
-                        checkedKey = setting.data.key.checked;
-                    if (tools.apply(setting.callback.beforeCheck, [setting.treeId, node], true) == false) return true;
-                    node[checkedKey] = !node[checkedKey];
-                    view.checkNodeRelation(setting, node);
-                    var checkObj = $$(node, consts.id.CHECK, setting);
-                    view.setChkClass(setting, checkObj, node);
-                    view.repairParentChkClassWithSelf(setting, node);
-                    setting.treeObj.trigger(consts.event.CHECK, [event, setting.treeId, node]);
-                    return true;
-                },
-                onMouseoverCheck: function(event, node) {
-                    if (node.chkDisabled === true) return false;
-                    var setting = data.getSetting(event.data.treeId),
-                        checkObj = $$(node, consts.id.CHECK, setting);
-                    node.check_Focus = true;
-                    view.setChkClass(setting, checkObj, node);
-                    return true;
-                },
-                onMouseoutCheck: function(event, node) {
-                    if (node.chkDisabled === true) return false;
-                    var setting = data.getSetting(event.data.treeId),
-                        checkObj = $$(node, consts.id.CHECK, setting);
-                    node.check_Focus = false;
-                    view.setChkClass(setting, checkObj, node);
-                    return true;
-                }
-            },
-            //method of tools for zTree
-            _tools = {
-
-            },
-            //method of operate ztree dom
-            _view = {
-                checkNodeRelation: function(setting, node) {
-                    var pNode, i, l,
-                        childKey = setting.data.key.children,
-                        checkedKey = setting.data.key.checked,
-                        r = consts.radio;
-                    if (setting.check.chkStyle == r.STYLE) {
-                        var checkedList = data.getRadioCheckedList(setting);
-                        if (node[checkedKey]) {
-                            if (setting.check.radioType == r.TYPE_ALL) {
-                                for (i = checkedList.length - 1; i >= 0; i--) {
-                                    pNode = checkedList[i];
-                                    if (pNode[checkedKey] && pNode != node) {
-                                        pNode[checkedKey] = false;
-                                        checkedList.splice(i, 1);
-
-                                        view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
-                                        if (pNode.parentTId != node.parentTId) {
-                                            view.repairParentChkClassWithSelf(setting, pNode);
-                                        }
-                                    }
-                                }
-                                checkedList.push(node);
-                            } else {
-                                var parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
-                                for (i = 0, l = parentNode[childKey].length; i < l; i++) {
-                                    pNode = parentNode[childKey][i];
-                                    if (pNode[checkedKey] && pNode != node) {
-                                        pNode[checkedKey] = false;
-                                        view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
-                                    }
-                                }
-                            }
-                        } else if (setting.check.radioType == r.TYPE_ALL) {
-                            for (i = 0, l = checkedList.length; i < l; i++) {
-                                if (node == checkedList[i]) {
-                                    checkedList.splice(i, 1);
-                                    break;
-                                }
-                            }
-                        }
-
-                    } else {
-                        if (node[checkedKey] && (!node[childKey] || node[childKey].length == 0 || setting.check.chkboxType.Y.indexOf("s") > -1)) {
-                            view.setSonNodeCheckBox(setting, node, true);
-                        }
-                        if (!node[checkedKey] && (!node[childKey] || node[childKey].length == 0 || setting.check.chkboxType.N.indexOf("s") > -1)) {
-                            view.setSonNodeCheckBox(setting, node, false);
-                        }
-                        if (node[checkedKey] && setting.check.chkboxType.Y.indexOf("p") > -1) {
-                            view.setParentNodeCheckBox(setting, node, true);
-                        }
-                        if (!node[checkedKey] && setting.check.chkboxType.N.indexOf("p") > -1) {
-                            view.setParentNodeCheckBox(setting, node, false);
-                        }
-                    }
-                },
-                makeChkClass: function(setting, node) {
-                    var checkedKey = setting.data.key.checked,
-                        c = consts.checkbox,
-                        r = consts.radio,
-                        fullStyle = "";
-                    if (node.chkDisabled === true) {
-                        fullStyle = c.DISABLED;
-                    } else if (node.halfCheck) {
-                        fullStyle = c.PART;
-                    } else if (setting.check.chkStyle == r.STYLE) {
-                        fullStyle = (node.check_Child_State < 1) ? c.FULL : c.PART;
-                    } else {
-                        fullStyle = node[checkedKey] ? ((node.check_Child_State === 2 || node.check_Child_State === -1) ? c.FULL : c.PART) : ((node.check_Child_State < 1) ? c.FULL : c.PART);
-                    }
-                    var chkName = setting.check.chkStyle + "_" + (node[checkedKey] ? c.TRUE : c.FALSE) + "_" + fullStyle;
-                    chkName = (node.check_Focus && node.chkDisabled !== true) ? chkName + "_" + c.FOCUS : chkName;
-                    return consts.className.BUTTON + " " + c.DEFAULT + " " + chkName;
-                },
-                repairAllChk: function(setting, checked) {
-                    if (setting.check.enable && setting.check.chkStyle === consts.checkbox.STYLE) {
-                        var checkedKey = setting.data.key.checked,
-                            childKey = setting.data.key.children,
-                            root = data.getRoot(setting);
-                        for (var i = 0, l = root[childKey].length; i < l; i++) {
-                            var node = root[childKey][i];
-                            if (node.nocheck !== true && node.chkDisabled !== true) {
-                                node[checkedKey] = checked;
-                            }
-                            view.setSonNodeCheckBox(setting, node, checked);
-                        }
-                    }
-                },
-                repairChkClass: function(setting, node) {
-                    if (!node) return;
-                    data.makeChkFlag(setting, node);
-                    if (node.nocheck !== true) {
-                        var checkObj = $$(node, consts.id.CHECK, setting);
-                        view.setChkClass(setting, checkObj, node);
-                    }
-                },
-                repairParentChkClass: function(setting, node) {
-                    if (!node || !node.parentTId) return;
-                    var pNode = node.getParentNode();
-                    view.repairChkClass(setting, pNode);
-                    view.repairParentChkClass(setting, pNode);
-                },
-                repairParentChkClassWithSelf: function(setting, node) {
-                    if (!node) return;
-                    var childKey = setting.data.key.children;
-                    if (node[childKey] && node[childKey].length > 0) {
-                        view.repairParentChkClass(setting, node[childKey][0]);
-                    } else {
-                        view.repairParentChkClass(setting, node);
-                    }
-                },
-                repairSonChkDisabled: function(setting, node, chkDisabled, inherit) {
-                    if (!node) return;
-                    var childKey = setting.data.key.children;
-                    if (node.chkDisabled != chkDisabled) {
-                        node.chkDisabled = chkDisabled;
-                    }
-                    view.repairChkClass(setting, node);
-                    if (node[childKey] && inherit) {
-                        for (var i = 0, l = node[childKey].length; i < l; i++) {
-                            var sNode = node[childKey][i];
-                            view.repairSonChkDisabled(setting, sNode, chkDisabled, inherit);
-                        }
-                    }
-                },
-                repairParentChkDisabled: function(setting, node, chkDisabled, inherit) {
-                    if (!node) return;
-                    if (node.chkDisabled != chkDisabled && inherit) {
-                        node.chkDisabled = chkDisabled;
-                    }
-                    view.repairChkClass(setting, node);
-                    view.repairParentChkDisabled(setting, node.getParentNode(), chkDisabled, inherit);
-                },
-                setChkClass: function(setting, obj, node) {
-                    if (!obj) return;
-                    if (node.nocheck === true) {
-                        obj.hide();
-                    } else {
-                        obj.show();
-                    }
-                    obj.attr('class', view.makeChkClass(setting, node));
-                },
-                setParentNodeCheckBox: function(setting, node, value, srcNode) {
-                    var childKey = setting.data.key.children,
-                        checkedKey = setting.data.key.checked,
-                        checkObj = $$(node, consts.id.CHECK, setting);
-                    if (!srcNode) srcNode = node;
-                    data.makeChkFlag(setting, node);
-                    if (node.nocheck !== true && node.chkDisabled !== true) {
-                        node[checkedKey] = value;
-                        view.setChkClass(setting, checkObj, node);
-                        if (setting.check.autoCheckTrigger && node != srcNode) {
-                            setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
-                        }
-                    }
-                    if (node.parentTId) {
-                        var pSign = true;
-                        if (!value) {
-                            var pNodes = node.getParentNode()[childKey];
-                            for (var i = 0, l = pNodes.length; i < l; i++) {
-                                if ((pNodes[i].nocheck !== true && pNodes[i].chkDisabled !== true && pNodes[i][checkedKey]) ||
-                                    ((pNodes[i].nocheck === true || pNodes[i].chkDisabled === true) && pNodes[i].check_Child_State > 0)) {
-                                    pSign = false;
-                                    break;
-                                }
-                            }
-                        }
-                        if (pSign) {
-                            view.setParentNodeCheckBox(setting, node.getParentNode(), value, srcNode);
-                        }
-                    }
-                },
-                setSonNodeCheckBox: function(setting, node, value, srcNode) {
-                    if (!node) return;
-                    var childKey = setting.data.key.children,
-                        checkedKey = setting.data.key.checked,
-                        checkObj = $$(node, consts.id.CHECK, setting);
-                    if (!srcNode) srcNode = node;
-
-                    var hasDisable = false;
-                    if (node[childKey]) {
-                        for (var i = 0, l = node[childKey].length; i < l; i++) {
-                            var sNode = node[childKey][i];
-                            view.setSonNodeCheckBox(setting, sNode, value, srcNode);
-                            if (sNode.chkDisabled === true) hasDisable = true;
-                        }
-                    }
-
-                    if (node != data.getRoot(setting) && node.chkDisabled !== true) {
-                        if (hasDisable && node.nocheck !== true) {
-                            data.makeChkFlag(setting, node);
-                        }
-                        if (node.nocheck !== true && node.chkDisabled !== true) {
-                            node[checkedKey] = value;
-                            if (!hasDisable) node.check_Child_State = (node[childKey] && node[childKey].length > 0) ? (value ? 2 : 0) : -1;
-                        } else {
-                            node.check_Child_State = -1;
-                        }
-                        view.setChkClass(setting, checkObj, node);
-                        if (setting.check.autoCheckTrigger && node != srcNode && node.nocheck !== true && node.chkDisabled !== true) {
-                            setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
-                        }
-                    }
-
-                }
-            },
-
-            _z = {
-                tools: _tools,
-                view: _view,
-                event: _event,
-                data: _data
-            };
-        $.extend(true, $.fn.zTree.consts, _consts);
-        $.extend(true, $.fn.zTree._z, _z);
-
-        var zt = $.fn.zTree,
-            tools = zt._z.tools,
-            consts = zt.consts,
-            view = zt._z.view,
-            data = zt._z.data,
-            event = zt._z.event,
-            $$ = tools.$;
-
-        data.exSetting(_setting);
-        data.addInitBind(_bindEvent);
-        data.addInitUnBind(_unbindEvent);
-        data.addInitCache(_initCache);
-        data.addInitNode(_initNode);
-        data.addInitProxy(_eventProxy, true);
-        data.addInitRoot(_initRoot);
-        data.addBeforeA(_beforeA);
-        data.addZTreeTools(_zTreeTools);
-
-        var _createNodes = view.createNodes;
-        view.createNodes = function(setting, level, nodes, parentNode, index) {
-            if (_createNodes) _createNodes.apply(view, arguments);
-            if (!nodes) return;
-            view.repairParentChkClassWithSelf(setting, parentNode);
-        }
-        var _removeNode = view.removeNode;
-        view.removeNode = function(setting, node) {
-            var parentNode = node.getParentNode();
-            if (_removeNode) _removeNode.apply(view, arguments);
-            if (!node || !parentNode) return;
-            view.repairChkClass(setting, parentNode);
-            view.repairParentChkClass(setting, parentNode);
-        }
-
-        var _appendNodes = view.appendNodes;
-        view.appendNodes = function(setting, level, nodes, parentNode, index, initFlag, openFlag) {
-            var html = "";
-            if (_appendNodes) {
-                html = _appendNodes.apply(view, arguments);
-            }
-            if (parentNode) {
-                data.makeChkFlag(setting, parentNode);
-            }
-            return html;
-        }
-    })(jQuery);
-    /*
+	(function ($) {
+		//default consts of excheck
+		var _consts = {
+				event: {
+					CHECK: "ztree_check"
+				},
+				id: {
+					CHECK: "_check"
+				},
+				checkbox: {
+					STYLE: "checkbox",
+					DEFAULT: "chk",
+					DISABLED: "disable",
+					FALSE: "false",
+					TRUE: "true",
+					FULL: "full",
+					PART: "part",
+					FOCUS: "focus"
+				},
+				radio: {
+					STYLE: "radio",
+					TYPE_ALL: "all",
+					TYPE_LEVEL: "level"
+				}
+			},
+			//default setting of excheck
+			_setting = {
+				check: {
+					enable: false,
+					autoCheckTrigger: false,
+					chkStyle: _consts.checkbox.STYLE,
+					nocheckInherit: false,
+					chkDisabledInherit: false,
+					radioType: _consts.radio.TYPE_LEVEL,
+					chkboxType: {
+						"Y": "ps",
+						"N": "ps"
+					}
+				},
+				data: {
+					key: {
+						checked: "checked"
+					}
+				},
+				callback: {
+					beforeCheck: null,
+					onCheck: null
+				}
+			},
+			//default root of excheck
+			_initRoot = function (setting) {
+				var r = data.getRoot(setting);
+				r.radioCheckedList = [];
+			},
+			//default cache of excheck
+			_initCache = function (treeId) {
+			},
+			//default bind event of excheck
+			_bindEvent = function (setting) {
+				var o = setting.treeObj,
+					c = consts.event;
+				o.bind(c.CHECK, function (event, srcEvent, treeId, node) {
+					event.srcEvent = srcEvent;
+					tools.apply(setting.callback.onCheck, [event, treeId, node]);
+				});
+			},
+			_unbindEvent = function (setting) {
+				var o = setting.treeObj,
+					c = consts.event;
+				o.unbind(c.CHECK);
+			},
+			//default event proxy of excheck
+			_eventProxy = function (e) {
+				var target = e.target,
+					setting = data.getSetting(e.data.treeId),
+					tId = "",
+					node = null,
+					nodeEventType = "",
+					treeEventType = "",
+					nodeEventCallback = null,
+					treeEventCallback = null;
+
+				if (tools.eqs(e.type, "mouseover")) {
+					if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.CHECK) !== null) {
+						tId = tools.getNodeMainDom(target).id;
+						nodeEventType = "mouseoverCheck";
+					}
+				} else if (tools.eqs(e.type, "mouseout")) {
+					if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.CHECK) !== null) {
+						tId = tools.getNodeMainDom(target).id;
+						nodeEventType = "mouseoutCheck";
+					}
+				} else if (tools.eqs(e.type, "click")) {
+					if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.CHECK) !== null) {
+						tId = tools.getNodeMainDom(target).id;
+						nodeEventType = "checkNode";
+					}
+				}
+				if (tId.length > 0) {
+					node = data.getNodeCache(setting, tId);
+					switch (nodeEventType) {
+						case "checkNode":
+							nodeEventCallback = _handler.onCheckNode;
+							break;
+						case "mouseoverCheck":
+							nodeEventCallback = _handler.onMouseoverCheck;
+							break;
+						case "mouseoutCheck":
+							nodeEventCallback = _handler.onMouseoutCheck;
+							break;
+					}
+				}
+				var proxyResult = {
+					stop: nodeEventType === "checkNode",
+					node: node,
+					nodeEventType: nodeEventType,
+					nodeEventCallback: nodeEventCallback,
+					treeEventType: treeEventType,
+					treeEventCallback: treeEventCallback
+				};
+				return proxyResult
+			},
+			//default init node of excheck
+			_initNode = function (setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+				if (!n) return;
+				var checkedKey = setting.data.key.checked;
+				if (typeof n[checkedKey] == "string") n[checkedKey] = tools.eqs(n[checkedKey], "true");
+				n[checkedKey] = !!n[checkedKey];
+				n.checkedOld = n[checkedKey];
+				if (typeof n.nocheck == "string") n.nocheck = tools.eqs(n.nocheck, "true");
+				n.nocheck = !!n.nocheck || (setting.check.nocheckInherit && parentNode && !!parentNode.nocheck);
+				if (typeof n.chkDisabled == "string") n.chkDisabled = tools.eqs(n.chkDisabled, "true");
+				n.chkDisabled = !!n.chkDisabled || (setting.check.chkDisabledInherit && parentNode && !!parentNode.chkDisabled);
+				if (typeof n.halfCheck == "string") n.halfCheck = tools.eqs(n.halfCheck, "true");
+				n.halfCheck = !!n.halfCheck;
+				n.check_Child_State = -1;
+				n.check_Focus = false;
+				n.getCheckStatus = function () {
+					return data.getCheckStatus(setting, n);
+				};
+
+				if (setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL && n[checkedKey]) {
+					var r = data.getRoot(setting);
+					r.radioCheckedList.push(n);
+				}
+			},
+			//add dom for check
+			_beforeA = function (setting, node, html) {
+				var checkedKey = setting.data.key.checked;
+				if (setting.check.enable) {
+					data.makeChkFlag(setting, node);
+					html.push("<span ID='", node.tId, consts.id.CHECK, "' class='", view.makeChkClass(setting, node), "' treeNode", consts.id.CHECK, (node.nocheck === true ? " style='display:none;'" : ""), "></span>");
+				}
+			},
+			//update zTreeObj, add method of check
+			_zTreeTools = function (setting, zTreeTools) {
+				zTreeTools.checkNode = function (node, checked, checkTypeFlag, callbackFlag) {
+					var checkedKey = this.setting.data.key.checked;
+					if (node.chkDisabled === true) return;
+					if (checked !== true && checked !== false) {
+						checked = !node[checkedKey];
+					}
+					callbackFlag = !!callbackFlag;
+
+					if (node[checkedKey] === checked && !checkTypeFlag) {
+						return;
+					} else if (callbackFlag && tools.apply(this.setting.callback.beforeCheck, [this.setting.treeId, node], true) == false) {
+						return;
+					}
+					if (tools.uCanDo(this.setting) && this.setting.check.enable && node.nocheck !== true) {
+						node[checkedKey] = checked;
+						var checkObj = $$(node, consts.id.CHECK, this.setting);
+						if (checkTypeFlag || this.setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(this.setting, node);
+						view.setChkClass(this.setting, checkObj, node);
+						view.repairParentChkClassWithSelf(this.setting, node);
+						if (callbackFlag) {
+							this.setting.treeObj.trigger(consts.event.CHECK, [null, this.setting.treeId, node]);
+						}
+					}
+				}
+
+				zTreeTools.checkAllNodes = function (checked) {
+					view.repairAllChk(this.setting, !!checked);
+				}
+
+				zTreeTools.getCheckedNodes = function (checked) {
+					var childKey = this.setting.data.key.children;
+					checked = (checked !== false);
+					return data.getTreeCheckedNodes(this.setting, data.getRoot(this.setting)[childKey], checked);
+				}
+
+				zTreeTools.getChangeCheckedNodes = function () {
+					var childKey = this.setting.data.key.children;
+					return data.getTreeChangeCheckedNodes(this.setting, data.getRoot(this.setting)[childKey]);
+				}
+
+				zTreeTools.setChkDisabled = function (node, disabled, inheritParent, inheritChildren) {
+					disabled = !!disabled;
+					inheritParent = !!inheritParent;
+					inheritChildren = !!inheritChildren;
+					view.repairSonChkDisabled(this.setting, node, disabled, inheritChildren);
+					view.repairParentChkDisabled(this.setting, node.getParentNode(), disabled, inheritParent);
+				}
+
+				var _updateNode = zTreeTools.updateNode;
+				zTreeTools.updateNode = function (node, checkTypeFlag) {
+					if (_updateNode) _updateNode.apply(zTreeTools, arguments);
+					if (!node || !this.setting.check.enable) return;
+					var nObj = $$(node, this.setting);
+					if (nObj.get(0) && tools.uCanDo(this.setting)) {
+						var checkObj = $$(node, consts.id.CHECK, this.setting);
+						if (checkTypeFlag == true || this.setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(this.setting, node);
+						view.setChkClass(this.setting, checkObj, node);
+						view.repairParentChkClassWithSelf(this.setting, node);
+					}
+				}
+			},
+			//method of operate data
+			_data = {
+				getRadioCheckedList: function (setting) {
+					var checkedList = data.getRoot(setting).radioCheckedList;
+					for (var i = 0, j = checkedList.length; i < j; i++) {
+						if (!data.getNodeCache(setting, checkedList[i].tId)) {
+							checkedList.splice(i, 1);
+							i--;
+							j--;
+						}
+					}
+					return checkedList;
+				},
+				getCheckStatus: function (setting, node) {
+					if (!setting.check.enable || node.nocheck || node.chkDisabled) return null;
+					var checkedKey = setting.data.key.checked,
+						r = {
+							checked: node[checkedKey],
+							half: node.halfCheck ? node.halfCheck : (setting.check.chkStyle == consts.radio.STYLE ? (node.check_Child_State === 2) : (node[checkedKey] ? (node.check_Child_State > -1 && node.check_Child_State < 2) : (node.check_Child_State > 0)))
+						};
+					return r;
+				},
+				getTreeCheckedNodes: function (setting, nodes, checked, results) {
+					if (!nodes) return [];
+					var childKey = setting.data.key.children,
+						checkedKey = setting.data.key.checked,
+						onlyOne = (checked && setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL);
+					results = !results ? [] : results;
+					for (var i = 0, l = nodes.length; i < l; i++) {
+						if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] == checked) {
+							results.push(nodes[i]);
+							if (onlyOne) {
+								break;
+							}
+						}
+						data.getTreeCheckedNodes(setting, nodes[i][childKey], checked, results);
+						if (onlyOne && results.length > 0) {
+							break;
+						}
+					}
+					return results;
+				},
+				getTreeChangeCheckedNodes: function (setting, nodes, results) {
+					if (!nodes) return [];
+					var childKey = setting.data.key.children,
+						checkedKey = setting.data.key.checked;
+					results = !results ? [] : results;
+					for (var i = 0, l = nodes.length; i < l; i++) {
+						if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] != nodes[i].checkedOld) {
+							results.push(nodes[i]);
+						}
+						data.getTreeChangeCheckedNodes(setting, nodes[i][childKey], results);
+					}
+					return results;
+				},
+				makeChkFlag: function (setting, node) {
+					if (!node) return;
+					var childKey = setting.data.key.children,
+						checkedKey = setting.data.key.checked,
+						chkFlag = -1;
+					if (node[childKey]) {
+						for (var i = 0, l = node[childKey].length; i < l; i++) {
+							var cNode = node[childKey][i];
+							var tmp = -1;
+							if (setting.check.chkStyle == consts.radio.STYLE) {
+								if (cNode.nocheck === true || cNode.chkDisabled === true) {
+									tmp = cNode.check_Child_State;
+								} else if (cNode.halfCheck === true) {
+									tmp = 2;
+								} else if (cNode[checkedKey]) {
+									tmp = 2;
+								} else {
+									tmp = cNode.check_Child_State > 0 ? 2 : 0;
+								}
+								if (tmp == 2) {
+									chkFlag = 2;
+									break;
+								} else if (tmp == 0) {
+									chkFlag = 0;
+								}
+							} else if (setting.check.chkStyle == consts.checkbox.STYLE) {
+								if (cNode.nocheck === true || cNode.chkDisabled === true) {
+									tmp = cNode.check_Child_State;
+								} else if (cNode.halfCheck === true) {
+									tmp = 1;
+								} else if (cNode[checkedKey]) {
+									tmp = (cNode.check_Child_State === -1 || cNode.check_Child_State === 2) ? 2 : 1;
+								} else {
+									tmp = (cNode.check_Child_State > 0) ? 1 : 0;
+								}
+								if (tmp === 1) {
+									chkFlag = 1;
+									break;
+								} else if (tmp === 2 && chkFlag > -1 && i > 0 && tmp !== chkFlag) {
+									chkFlag = 1;
+									break;
+								} else if (chkFlag === 2 && tmp > -1 && tmp < 2) {
+									chkFlag = 1;
+									break;
+								} else if (tmp > -1) {
+									chkFlag = tmp;
+								}
+							}
+						}
+					}
+					node.check_Child_State = chkFlag;
+				}
+			},
+			//method of event proxy
+			_event = {},
+			//method of event handler
+			_handler = {
+				onCheckNode: function (event, node) {
+					if (node.chkDisabled === true) return false;
+					var setting = data.getSetting(event.data.treeId),
+						checkedKey = setting.data.key.checked;
+					if (tools.apply(setting.callback.beforeCheck, [setting.treeId, node], true) == false) return true;
+					node[checkedKey] = !node[checkedKey];
+					view.checkNodeRelation(setting, node);
+					var checkObj = $$(node, consts.id.CHECK, setting);
+					view.setChkClass(setting, checkObj, node);
+					view.repairParentChkClassWithSelf(setting, node);
+					setting.treeObj.trigger(consts.event.CHECK, [event, setting.treeId, node]);
+					return true;
+				},
+				onMouseoverCheck: function (event, node) {
+					if (node.chkDisabled === true) return false;
+					var setting = data.getSetting(event.data.treeId),
+						checkObj = $$(node, consts.id.CHECK, setting);
+					node.check_Focus = true;
+					view.setChkClass(setting, checkObj, node);
+					return true;
+				},
+				onMouseoutCheck: function (event, node) {
+					if (node.chkDisabled === true) return false;
+					var setting = data.getSetting(event.data.treeId),
+						checkObj = $$(node, consts.id.CHECK, setting);
+					node.check_Focus = false;
+					view.setChkClass(setting, checkObj, node);
+					return true;
+				}
+			},
+			//method of tools for zTree
+			_tools = {},
+			//method of operate ztree dom
+			_view = {
+				checkNodeRelation: function (setting, node) {
+					var pNode, i, l,
+						childKey = setting.data.key.children,
+						checkedKey = setting.data.key.checked,
+						r = consts.radio;
+					if (setting.check.chkStyle == r.STYLE) {
+						var checkedList = data.getRadioCheckedList(setting);
+						if (node[checkedKey]) {
+							if (setting.check.radioType == r.TYPE_ALL) {
+								for (i = checkedList.length - 1; i >= 0; i--) {
+									pNode = checkedList[i];
+									if (pNode[checkedKey] && pNode != node) {
+										pNode[checkedKey] = false;
+										checkedList.splice(i, 1);
+
+										view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
+										if (pNode.parentTId != node.parentTId) {
+											view.repairParentChkClassWithSelf(setting, pNode);
+										}
+									}
+								}
+								checkedList.push(node);
+							} else {
+								var parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
+								for (i = 0, l = parentNode[childKey].length; i < l; i++) {
+									pNode = parentNode[childKey][i];
+									if (pNode[checkedKey] && pNode != node) {
+										pNode[checkedKey] = false;
+										view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
+									}
+								}
+							}
+						} else if (setting.check.radioType == r.TYPE_ALL) {
+							for (i = 0, l = checkedList.length; i < l; i++) {
+								if (node == checkedList[i]) {
+									checkedList.splice(i, 1);
+									break;
+								}
+							}
+						}
+
+					} else {
+						if (node[checkedKey] && (!node[childKey] || node[childKey].length == 0 || setting.check.chkboxType.Y.indexOf("s") > -1)) {
+							view.setSonNodeCheckBox(setting, node, true);
+						}
+						if (!node[checkedKey] && (!node[childKey] || node[childKey].length == 0 || setting.check.chkboxType.N.indexOf("s") > -1)) {
+							view.setSonNodeCheckBox(setting, node, false);
+						}
+						if (node[checkedKey] && setting.check.chkboxType.Y.indexOf("p") > -1) {
+							view.setParentNodeCheckBox(setting, node, true);
+						}
+						if (!node[checkedKey] && setting.check.chkboxType.N.indexOf("p") > -1) {
+							view.setParentNodeCheckBox(setting, node, false);
+						}
+					}
+				},
+				makeChkClass: function (setting, node) {
+					var checkedKey = setting.data.key.checked,
+						c = consts.checkbox,
+						r = consts.radio,
+						fullStyle = "";
+					if (node.chkDisabled === true) {
+						fullStyle = c.DISABLED;
+					} else if (node.halfCheck) {
+						fullStyle = c.PART;
+					} else if (setting.check.chkStyle == r.STYLE) {
+						fullStyle = (node.check_Child_State < 1) ? c.FULL : c.PART;
+					} else {
+						fullStyle = node[checkedKey] ? ((node.check_Child_State === 2 || node.check_Child_State === -1) ? c.FULL : c.PART) : ((node.check_Child_State < 1) ? c.FULL : c.PART);
+					}
+					var chkName = setting.check.chkStyle + "_" + (node[checkedKey] ? c.TRUE : c.FALSE) + "_" + fullStyle;
+					chkName = (node.check_Focus && node.chkDisabled !== true) ? chkName + "_" + c.FOCUS : chkName;
+					return consts.className.BUTTON + " " + c.DEFAULT + " " + chkName;
+				},
+				repairAllChk: function (setting, checked) {
+					if (setting.check.enable && setting.check.chkStyle === consts.checkbox.STYLE) {
+						var checkedKey = setting.data.key.checked,
+							childKey = setting.data.key.children,
+							root = data.getRoot(setting);
+						for (var i = 0, l = root[childKey].length; i < l; i++) {
+							var node = root[childKey][i];
+							if (node.nocheck !== true && node.chkDisabled !== true) {
+								node[checkedKey] = checked;
+							}
+							view.setSonNodeCheckBox(setting, node, checked);
+						}
+					}
+				},
+				repairChkClass: function (setting, node) {
+					if (!node) return;
+					data.makeChkFlag(setting, node);
+					if (node.nocheck !== true) {
+						var checkObj = $$(node, consts.id.CHECK, setting);
+						view.setChkClass(setting, checkObj, node);
+					}
+				},
+				repairParentChkClass: function (setting, node) {
+					if (!node || !node.parentTId) return;
+					var pNode = node.getParentNode();
+					view.repairChkClass(setting, pNode);
+					view.repairParentChkClass(setting, pNode);
+				},
+				repairParentChkClassWithSelf: function (setting, node) {
+					if (!node) return;
+					var childKey = setting.data.key.children;
+					if (node[childKey] && node[childKey].length > 0) {
+						view.repairParentChkClass(setting, node[childKey][0]);
+					} else {
+						view.repairParentChkClass(setting, node);
+					}
+				},
+				repairSonChkDisabled: function (setting, node, chkDisabled, inherit) {
+					if (!node) return;
+					var childKey = setting.data.key.children;
+					if (node.chkDisabled != chkDisabled) {
+						node.chkDisabled = chkDisabled;
+					}
+					view.repairChkClass(setting, node);
+					if (node[childKey] && inherit) {
+						for (var i = 0, l = node[childKey].length; i < l; i++) {
+							var sNode = node[childKey][i];
+							view.repairSonChkDisabled(setting, sNode, chkDisabled, inherit);
+						}
+					}
+				},
+				repairParentChkDisabled: function (setting, node, chkDisabled, inherit) {
+					if (!node) return;
+					if (node.chkDisabled != chkDisabled && inherit) {
+						node.chkDisabled = chkDisabled;
+					}
+					view.repairChkClass(setting, node);
+					view.repairParentChkDisabled(setting, node.getParentNode(), chkDisabled, inherit);
+				},
+				setChkClass: function (setting, obj, node) {
+					if (!obj) return;
+					if (node.nocheck === true) {
+						obj.hide();
+					} else {
+						obj.show();
+					}
+					obj.attr('class', view.makeChkClass(setting, node));
+				},
+				setParentNodeCheckBox: function (setting, node, value, srcNode) {
+					var childKey = setting.data.key.children,
+						checkedKey = setting.data.key.checked,
+						checkObj = $$(node, consts.id.CHECK, setting);
+					if (!srcNode) srcNode = node;
+					data.makeChkFlag(setting, node);
+					if (node.nocheck !== true && node.chkDisabled !== true) {
+						node[checkedKey] = value;
+						view.setChkClass(setting, checkObj, node);
+						if (setting.check.autoCheckTrigger && node != srcNode) {
+							setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+						}
+					}
+					if (node.parentTId) {
+						var pSign = true;
+						if (!value) {
+							var pNodes = node.getParentNode()[childKey];
+							for (var i = 0, l = pNodes.length; i < l; i++) {
+								if ((pNodes[i].nocheck !== true && pNodes[i].chkDisabled !== true && pNodes[i][checkedKey]) ||
+									((pNodes[i].nocheck === true || pNodes[i].chkDisabled === true) && pNodes[i].check_Child_State > 0)) {
+									pSign = false;
+									break;
+								}
+							}
+						}
+						if (pSign) {
+							view.setParentNodeCheckBox(setting, node.getParentNode(), value, srcNode);
+						}
+					}
+				},
+				setSonNodeCheckBox: function (setting, node, value, srcNode) {
+					if (!node) return;
+					var childKey = setting.data.key.children,
+						checkedKey = setting.data.key.checked,
+						checkObj = $$(node, consts.id.CHECK, setting);
+					if (!srcNode) srcNode = node;
+
+					var hasDisable = false;
+					if (node[childKey]) {
+						for (var i = 0, l = node[childKey].length; i < l; i++) {
+							var sNode = node[childKey][i];
+							view.setSonNodeCheckBox(setting, sNode, value, srcNode);
+							if (sNode.chkDisabled === true) hasDisable = true;
+						}
+					}
+
+					if (node != data.getRoot(setting) && node.chkDisabled !== true) {
+						if (hasDisable && node.nocheck !== true) {
+							data.makeChkFlag(setting, node);
+						}
+						if (node.nocheck !== true && node.chkDisabled !== true) {
+							node[checkedKey] = value;
+							if (!hasDisable) node.check_Child_State = (node[childKey] && node[childKey].length > 0) ? (value ? 2 : 0) : -1;
+						} else {
+							node.check_Child_State = -1;
+						}
+						view.setChkClass(setting, checkObj, node);
+						if (setting.check.autoCheckTrigger && node != srcNode && node.nocheck !== true && node.chkDisabled !== true) {
+							setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+						}
+					}
+
+				}
+			},
+
+			_z = {
+				tools: _tools,
+				view: _view,
+				event: _event,
+				data: _data
+			};
+		$.extend(true, $.fn.zTree.consts, _consts);
+		$.extend(true, $.fn.zTree._z, _z);
+
+		var zt = $.fn.zTree,
+			tools = zt._z.tools,
+			consts = zt.consts,
+			view = zt._z.view,
+			data = zt._z.data,
+			event = zt._z.event,
+			$$ = tools.$;
+
+		data.exSetting(_setting);
+		data.addInitBind(_bindEvent);
+		data.addInitUnBind(_unbindEvent);
+		data.addInitCache(_initCache);
+		data.addInitNode(_initNode);
+		data.addInitProxy(_eventProxy, true);
+		data.addInitRoot(_initRoot);
+		data.addBeforeA(_beforeA);
+		data.addZTreeTools(_zTreeTools);
+
+		var _createNodes = view.createNodes;
+		view.createNodes = function (setting, level, nodes, parentNode, index) {
+			if (_createNodes) _createNodes.apply(view, arguments);
+			if (!nodes) return;
+			view.repairParentChkClassWithSelf(setting, parentNode);
+		}
+		var _removeNode = view.removeNode;
+		view.removeNode = function (setting, node) {
+			var parentNode = node.getParentNode();
+			if (_removeNode) _removeNode.apply(view, arguments);
+			if (!node || !parentNode) return;
+			view.repairChkClass(setting, parentNode);
+			view.repairParentChkClass(setting, parentNode);
+		}
+
+		var _appendNodes = view.appendNodes;
+		view.appendNodes = function (setting, level, nodes, parentNode, index, initFlag, openFlag) {
+			var html = "";
+			if (_appendNodes) {
+				html = _appendNodes.apply(view, arguments);
+			}
+			if (parentNode) {
+				data.makeChkFlag(setting, parentNode);
+			}
+			return html;
+		}
+	})(jQuery);
+	/*
      * JQuery zTree exedit v3.5.29
      * http://treejs.cn/
      *
@@ -2593,1198 +2596,1201 @@
      * email: hunter.z@263.net
      * Date: 2017-06-19
      */
-    (function($) {
-        //default consts of exedit
-        var _consts = {
-                event: {
-                    DRAG: "ztree_drag",
-                    DROP: "ztree_drop",
-                    RENAME: "ztree_rename",
-                    DRAGMOVE: "ztree_dragmove"
-                },
-                id: {
-                    EDIT: "_edit",
-                    INPUT: "_input",
-                    REMOVE: "_remove"
-                },
-                move: {
-                    TYPE_INNER: "inner",
-                    TYPE_PREV: "prev",
-                    TYPE_NEXT: "next"
-                },
-                node: {
-                    CURSELECTED_EDIT: "curSelectedNode_Edit",
-                    TMPTARGET_TREE: "tmpTargetzTree",
-                    TMPTARGET_NODE: "tmpTargetNode"
-                }
-            },
-            //default setting of exedit
-            _setting = {
-                edit: {
-                    enable: false,
-                    editNameSelectAll: false,
-                    showRemoveBtn: true,
-                    showRenameBtn: true,
-                    removeTitle: "remove",
-                    renameTitle: "rename",
-                    drag: {
-                        autoExpandTrigger: false,
-                        isCopy: true,
-                        isMove: true,
-                        prev: true,
-                        next: true,
-                        inner: true,
-                        minMoveSize: 5,
-                        borderMax: 10,
-                        borderMin: -5,
-                        maxShowNodeNum: 5,
-                        autoOpenTime: 500
-                    }
-                },
-                view: {
-                    addHoverDom: null,
-                    removeHoverDom: null
-                },
-                callback: {
-                    beforeDrag: null,
-                    beforeDragOpen: null,
-                    beforeDrop: null,
-                    beforeEditName: null,
-                    beforeRename: null,
-                    onDrag: null,
-                    onDragMove: null,
-                    onDrop: null,
-                    onRename: null
-                }
-            },
-            //default root of exedit
-            _initRoot = function(setting) {
-                var r = data.getRoot(setting),
-                    rs = data.getRoots();
-                r.curEditNode = null;
-                r.curEditInput = null;
-                r.curHoverNode = null;
-                r.dragFlag = 0;
-                r.dragNodeShowBefore = [];
-                r.dragMaskList = new Array();
-                rs.showHoverDom = true;
-            },
-            //default cache of exedit
-            _initCache = function(treeId) {},
-            //default bind event of exedit
-            _bindEvent = function(setting) {
-                var o = setting.treeObj;
-                var c = consts.event;
-                o.bind(c.RENAME, function(event, treeId, treeNode, isCancel) {
-                    tools.apply(setting.callback.onRename, [event, treeId, treeNode, isCancel]);
-                });
-
-                o.bind(c.DRAG, function(event, srcEvent, treeId, treeNodes) {
-                    tools.apply(setting.callback.onDrag, [srcEvent, treeId, treeNodes]);
-                });
-
-                o.bind(c.DRAGMOVE, function(event, srcEvent, treeId, treeNodes) {
-                    tools.apply(setting.callback.onDragMove, [srcEvent, treeId, treeNodes]);
-                });
-
-                o.bind(c.DROP, function(event, srcEvent, treeId, treeNodes, targetNode, moveType, isCopy) {
-                    tools.apply(setting.callback.onDrop, [srcEvent, treeId, treeNodes, targetNode, moveType, isCopy]);
-                });
-            },
-            _unbindEvent = function(setting) {
-                var o = setting.treeObj;
-                var c = consts.event;
-                o.unbind(c.RENAME);
-                o.unbind(c.DRAG);
-                o.unbind(c.DRAGMOVE);
-                o.unbind(c.DROP);
-            },
-            //default event proxy of exedit
-            _eventProxy = function(e) {
-                var target = e.target,
-                    setting = data.getSetting(e.data.treeId),
-                    relatedTarget = e.relatedTarget,
-                    tId = "",
-                    node = null,
-                    nodeEventType = "",
-                    treeEventType = "",
-                    nodeEventCallback = null,
-                    treeEventCallback = null,
-                    tmp = null;
-
-                if (tools.eqs(e.type, "mouseover")) {
-                    tmp = tools.getMDom(setting, target, [{ tagName: "a", attrName: "treeNode" + consts.id.A }]);
-                    if (tmp) {
-                        tId = tools.getNodeMainDom(tmp).id;
-                        nodeEventType = "hoverOverNode";
-                    }
-                } else if (tools.eqs(e.type, "mouseout")) {
-                    tmp = tools.getMDom(setting, relatedTarget, [{ tagName: "a", attrName: "treeNode" + consts.id.A }]);
-                    if (!tmp) {
-                        tId = "remove";
-                        nodeEventType = "hoverOutNode";
-                    }
-                } else if (tools.eqs(e.type, "mousedown")) {
-                    tmp = tools.getMDom(setting, target, [{ tagName: "a", attrName: "treeNode" + consts.id.A }]);
-                    if (tmp) {
-                        tId = tools.getNodeMainDom(tmp).id;
-                        nodeEventType = "mousedownNode";
-                    }
-                }
-                if (tId.length > 0) {
-                    node = data.getNodeCache(setting, tId);
-                    switch (nodeEventType) {
-                        case "mousedownNode":
-                            nodeEventCallback = _handler.onMousedownNode;
-                            break;
-                        case "hoverOverNode":
-                            nodeEventCallback = _handler.onHoverOverNode;
-                            break;
-                        case "hoverOutNode":
-                            nodeEventCallback = _handler.onHoverOutNode;
-                            break;
-                    }
-                }
-                var proxyResult = {
-                    stop: false,
-                    node: node,
-                    nodeEventType: nodeEventType,
-                    nodeEventCallback: nodeEventCallback,
-                    treeEventType: treeEventType,
-                    treeEventCallback: treeEventCallback
-                };
-                return proxyResult
-            },
-            //default init node of exedit
-            _initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
-                if (!n) return;
-                n.isHover = false;
-                n.editNameFlag = false;
-            },
-            //update zTreeObj, add method of edit
-            _zTreeTools = function(setting, zTreeTools) {
-                zTreeTools.cancelEditName = function(newName) {
-                    var root = data.getRoot(this.setting);
-                    if (!root.curEditNode) return;
-                    view.cancelCurEditNode(this.setting, newName ? newName : null, true);
-                }
-                zTreeTools.copyNode = function(targetNode, node, moveType, isSilent) {
-                    if (!node) return null;
-                    if (targetNode && !targetNode.isParent && this.setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) return null;
-                    var _this = this,
-                        newNode = tools.clone(node);
-                    if (!targetNode) {
-                        targetNode = null;
-                        moveType = consts.move.TYPE_INNER;
-                    }
-                    if (moveType == consts.move.TYPE_INNER) {
-                        function copyCallback() {
-                            view.addNodes(_this.setting, targetNode, -1, [newNode], isSilent);
-                        }
-
-                        if (tools.canAsync(this.setting, targetNode)) {
-                            view.asyncNode(this.setting, targetNode, isSilent, copyCallback);
-                        } else {
-                            copyCallback();
-                        }
-                    } else {
-                        view.addNodes(this.setting, targetNode.parentNode, -1, [newNode], isSilent);
-                        view.moveNode(this.setting, targetNode, newNode, moveType, false, isSilent);
-                    }
-                    return newNode;
-                }
-                zTreeTools.editName = function(node) {
-                    if (!node || !node.tId || node !== data.getNodeCache(this.setting, node.tId)) return;
-                    if (node.parentTId) view.expandCollapseParentNode(this.setting, node.getParentNode(), true);
-                    view.editNode(this.setting, node)
-                }
-                zTreeTools.moveNode = function(targetNode, node, moveType, isSilent) {
-                    if (!node) return node;
-                    if (targetNode && !targetNode.isParent && this.setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) {
-                        return null;
-                    } else if (targetNode && ((node.parentTId == targetNode.tId && moveType == consts.move.TYPE_INNER) || $$(node, this.setting).find("#" + targetNode.tId).length > 0)) {
-                        return null;
-                    } else if (!targetNode) {
-                        targetNode = null;
-                    }
-                    var _this = this;
-
-                    function moveCallback() {
-                        view.moveNode(_this.setting, targetNode, node, moveType, false, isSilent);
-                    }
-                    if (tools.canAsync(this.setting, targetNode) && moveType === consts.move.TYPE_INNER) {
-                        view.asyncNode(this.setting, targetNode, isSilent, moveCallback);
-                    } else {
-                        moveCallback();
-                    }
-                    return node;
-                }
-                zTreeTools.setEditable = function(editable) {
-                    this.setting.edit.enable = editable;
-                    return this.refresh();
-                }
-            },
-            //method of operate data
-            _data = {
-                setSonNodeLevel: function(setting, parentNode, node) {
-                    if (!node) return;
-                    var childKey = setting.data.key.children;
-                    node.level = (parentNode) ? parentNode.level + 1 : 0;
-                    if (!node[childKey]) return;
-                    for (var i = 0, l = node[childKey].length; i < l; i++) {
-                        if (node[childKey][i]) data.setSonNodeLevel(setting, node, node[childKey][i]);
-                    }
-                }
-            },
-            //method of event proxy
-            _event = {
-
-            },
-            //method of event handler
-            _handler = {
-                onHoverOverNode: function(event, node) {
-                    var setting = data.getSetting(event.data.treeId),
-                        root = data.getRoot(setting);
-                    if (root.curHoverNode != node) {
-                        _handler.onHoverOutNode(event);
-                    }
-                    root.curHoverNode = node;
-                    view.addHoverDom(setting, node);
-                },
-                onHoverOutNode: function(event, node) {
-                    var setting = data.getSetting(event.data.treeId),
-                        root = data.getRoot(setting);
-                    if (root.curHoverNode && !data.isSelectedNode(setting, root.curHoverNode)) {
-                        view.removeTreeDom(setting, root.curHoverNode);
-                        root.curHoverNode = null;
-                    }
-                },
-                onMousedownNode: function(eventMouseDown, _node) {
-                    var i, l,
-                        setting = data.getSetting(eventMouseDown.data.treeId),
-                        root = data.getRoot(setting),
-                        roots = data.getRoots();
-                    //right click can't drag & drop
-                    if (eventMouseDown.button == 2 || !setting.edit.enable || (!setting.edit.drag.isCopy && !setting.edit.drag.isMove)) return true;
-
-                    //input of edit node name can't drag & drop
-                    var target = eventMouseDown.target,
-                        _nodes = data.getRoot(setting).curSelectedList,
-                        nodes = [];
-                    if (!data.isSelectedNode(setting, _node)) {
-                        nodes = [_node];
-                    } else {
-                        for (i = 0, l = _nodes.length; i < l; i++) {
-                            if (_nodes[i].editNameFlag && tools.eqs(target.tagName, "input") && target.getAttribute("treeNode" + consts.id.INPUT) !== null) {
-                                return true;
-                            }
-                            nodes.push(_nodes[i]);
-                            if (nodes[0].parentTId !== _nodes[i].parentTId) {
-                                nodes = [_node];
-                                break;
-                            }
-                        }
-                    }
-
-                    view.editNodeBlur = true;
-                    view.cancelCurEditNode(setting);
-
-                    var doc = $(setting.treeObj.get(0).ownerDocument),
-                        body = $(setting.treeObj.get(0).ownerDocument.body),
-                        curNode, tmpArrow, tmpTarget,
-                        isOtherTree = false,
-                        targetSetting = setting,
-                        sourceSetting = setting,
-                        preNode, nextNode,
-                        preTmpTargetNodeId = null,
-                        preTmpMoveType = null,
-                        tmpTargetNodeId = null,
-                        moveType = consts.move.TYPE_INNER,
-                        mouseDownX = eventMouseDown.clientX,
-                        mouseDownY = eventMouseDown.clientY,
-                        startTime = (new Date()).getTime();
-
-                    if (tools.uCanDo(setting)) {
-                        doc.bind("mousemove", _docMouseMove);
-                    }
-
-                    function _docMouseMove(event) {
-                        //avoid start drag after click node
-                        if (root.dragFlag == 0 && Math.abs(mouseDownX - event.clientX) < setting.edit.drag.minMoveSize &&
-                            Math.abs(mouseDownY - event.clientY) < setting.edit.drag.minMoveSize) {
-                            return true;
-                        }
-                        var i, l, tmpNode, tmpDom, tmpNodes,
-                            childKey = setting.data.key.children;
-                        body.css("cursor", "pointer");
-
-                        if (root.dragFlag == 0) {
-                            if (tools.apply(setting.callback.beforeDrag, [setting.treeId, nodes], true) == false) {
-                                _docMouseUp(event);
-                                return true;
-                            }
-
-                            for (i = 0, l = nodes.length; i < l; i++) {
-                                if (i == 0) {
-                                    root.dragNodeShowBefore = [];
-                                }
-                                tmpNode = nodes[i];
-                                if (tmpNode.isParent && tmpNode.open) {
-                                    view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
-                                    root.dragNodeShowBefore[tmpNode.tId] = true;
-                                } else {
-                                    root.dragNodeShowBefore[tmpNode.tId] = false;
-                                }
-                            }
-
-                            root.dragFlag = 1;
-                            roots.showHoverDom = false;
-                            tools.showIfameMask(setting, true);
-
-                            //sort
-                            var isOrder = true,
-                                lastIndex = -1;
-                            if (nodes.length > 1) {
-                                var pNodes = nodes[0].parentTId ? nodes[0].getParentNode()[childKey] : data.getNodes(setting);
-                                tmpNodes = [];
-                                for (i = 0, l = pNodes.length; i < l; i++) {
-                                    if (root.dragNodeShowBefore[pNodes[i].tId] !== undefined) {
-                                        if (isOrder && lastIndex > -1 && (lastIndex + 1) !== i) {
-                                            isOrder = false;
-                                        }
-                                        tmpNodes.push(pNodes[i]);
-                                        lastIndex = i;
-                                    }
-                                    if (nodes.length === tmpNodes.length) {
-                                        nodes = tmpNodes;
-                                        break;
-                                    }
-                                }
-                            }
-                            if (isOrder) {
-                                preNode = nodes[0].getPreNode();
-                                nextNode = nodes[nodes.length - 1].getNextNode();
-                            }
-
-                            //set node in selected
-                            curNode = $$("<ul class='zTreeDragUL'></ul>", setting);
-                            for (i = 0, l = nodes.length; i < l; i++) {
-                                tmpNode = nodes[i];
-                                tmpNode.editNameFlag = false;
-                                view.selectNode(setting, tmpNode, i > 0);
-                                view.removeTreeDom(setting, tmpNode);
-
-                                if (i > setting.edit.drag.maxShowNodeNum - 1) {
-                                    continue;
-                                }
-
-                                tmpDom = $$("<li id='" + tmpNode.tId + "_tmp'></li>", setting);
-                                tmpDom.append($$(tmpNode, consts.id.A, setting).clone());
-                                tmpDom.css("padding", "0");
-                                tmpDom.children("#" + tmpNode.tId + consts.id.A).removeClass(consts.node.CURSELECTED);
-                                curNode.append(tmpDom);
-                                if (i == setting.edit.drag.maxShowNodeNum - 1) {
-                                    tmpDom = $$("<li id='" + tmpNode.tId + "_moretmp'><a>  ...  </a></li>", setting);
-                                    curNode.append(tmpDom);
-                                }
-                            }
-                            curNode.attr("id", nodes[0].tId + consts.id.UL + "_tmp");
-                            curNode.addClass(setting.treeObj.attr("class"));
-                            curNode.appendTo(body);
-
-                            tmpArrow = $$("<span class='tmpzTreeMove_arrow'></span>", setting);
-                            tmpArrow.attr("id", "zTreeMove_arrow_tmp");
-                            tmpArrow.appendTo(body);
-
-                            setting.treeObj.trigger(consts.event.DRAG, [event, setting.treeId, nodes]);
-                        }
-
-                        if (root.dragFlag == 1) {
-                            if (tmpTarget && tmpArrow.attr("id") == event.target.id && tmpTargetNodeId && (event.clientX + doc.scrollLeft() + 2) > ($("#" + tmpTargetNodeId + consts.id.A, tmpTarget).offset().left)) {
-                                var xT = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget);
-                                event.target = (xT.length > 0) ? xT.get(0) : event.target;
-                            } else if (tmpTarget) {
-                                tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
-                                if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
-                                    .removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
-                            }
-                            tmpTarget = null;
-                            tmpTargetNodeId = null;
-
-                            //judge drag & drop in multi ztree
-                            isOtherTree = false;
-                            targetSetting = setting;
-                            var settings = data.getSettings();
-                            for (var s in settings) {
-                                if (settings[s].treeId && settings[s].edit.enable && settings[s].treeId != setting.treeId &&
-                                    (event.target.id == settings[s].treeId || $(event.target).parents("#" + settings[s].treeId).length > 0)) {
-                                    isOtherTree = true;
-                                    targetSetting = settings[s];
-                                }
-                            }
-
-                            var docScrollTop = doc.scrollTop(),
-                                docScrollLeft = doc.scrollLeft(),
-                                treeOffset = targetSetting.treeObj.offset(),
-                                scrollHeight = targetSetting.treeObj.get(0).scrollHeight,
-                                scrollWidth = targetSetting.treeObj.get(0).scrollWidth,
-                                dTop = (event.clientY + docScrollTop - treeOffset.top),
-                                dBottom = (targetSetting.treeObj.height() + treeOffset.top - event.clientY - docScrollTop),
-                                dLeft = (event.clientX + docScrollLeft - treeOffset.left),
-                                dRight = (targetSetting.treeObj.width() + treeOffset.left - event.clientX - docScrollLeft),
-                                isTop = (dTop < setting.edit.drag.borderMax && dTop > setting.edit.drag.borderMin),
-                                isBottom = (dBottom < setting.edit.drag.borderMax && dBottom > setting.edit.drag.borderMin),
-                                isLeft = (dLeft < setting.edit.drag.borderMax && dLeft > setting.edit.drag.borderMin),
-                                isRight = (dRight < setting.edit.drag.borderMax && dRight > setting.edit.drag.borderMin),
-                                isTreeInner = dTop > setting.edit.drag.borderMin && dBottom > setting.edit.drag.borderMin && dLeft > setting.edit.drag.borderMin && dRight > setting.edit.drag.borderMin,
-                                isTreeTop = (isTop && targetSetting.treeObj.scrollTop() <= 0),
-                                isTreeBottom = (isBottom && (targetSetting.treeObj.scrollTop() + targetSetting.treeObj.height() + 10) >= scrollHeight),
-                                isTreeLeft = (isLeft && targetSetting.treeObj.scrollLeft() <= 0),
-                                isTreeRight = (isRight && (targetSetting.treeObj.scrollLeft() + targetSetting.treeObj.width() + 10) >= scrollWidth);
-
-                            if (event.target && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
-                                //get node <li> dom
-                                var targetObj = event.target;
-                                while (targetObj && targetObj.tagName && !tools.eqs(targetObj.tagName, "li") && targetObj.id != targetSetting.treeId) {
-                                    targetObj = targetObj.parentNode;
-                                }
-
-                                var canMove = true;
-                                //don't move to self or children of self
-                                for (i = 0, l = nodes.length; i < l; i++) {
-                                    tmpNode = nodes[i];
-                                    if (targetObj.id === tmpNode.tId) {
-                                        canMove = false;
-                                        break;
-                                    } else if ($$(tmpNode, setting).find("#" + targetObj.id).length > 0) {
-                                        canMove = false;
-                                        break;
-                                    }
-                                }
-                                if (canMove && event.target && tools.isChildOrSelf(event.target, targetObj.id + consts.id.A)) {
-                                    tmpTarget = $(targetObj);
-                                    tmpTargetNodeId = targetObj.id;
-                                }
-                            }
-
-                            //the mouse must be in zTree
-                            tmpNode = nodes[0];
-                            if (isTreeInner && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
-                                //judge mouse move in root of ztree
-                                if (!tmpTarget && (event.target.id == targetSetting.treeId || isTreeTop || isTreeBottom || isTreeLeft || isTreeRight) && (isOtherTree || (!isOtherTree && tmpNode.parentTId))) {
-                                    tmpTarget = targetSetting.treeObj;
-                                }
-                                //auto scroll top
-                                if (isTop) {
-                                    targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop() - 10);
-                                } else if (isBottom) {
-                                    targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop() + 10);
-                                }
-                                if (isLeft) {
-                                    targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft() - 10);
-                                } else if (isRight) {
-                                    targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft() + 10);
-                                }
-                                //auto scroll left
-                                if (tmpTarget && tmpTarget != targetSetting.treeObj && tmpTarget.offset().left < targetSetting.treeObj.offset().left) {
-                                    targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft() + tmpTarget.offset().left - targetSetting.treeObj.offset().left);
-                                }
-                            }
-
-                            curNode.css({
-                                "top": (event.clientY + docScrollTop + 3) + "px",
-                                "left": (event.clientX + docScrollLeft + 3) + "px"
-                            });
-
-                            var dX = 0;
-                            var dY = 0;
-                            if (tmpTarget && tmpTarget.attr("id") != targetSetting.treeId) {
-                                var tmpTargetNode = tmpTargetNodeId == null ? null : data.getNodeCache(targetSetting, tmpTargetNodeId),
-                                    isCopy = ((event.ctrlKey || event.metaKey) && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy),
-                                    isPrev = !!(preNode && tmpTargetNodeId === preNode.tId),
-                                    isNext = !!(nextNode && tmpTargetNodeId === nextNode.tId),
-                                    isInner = (tmpNode.parentTId && tmpNode.parentTId == tmpTargetNodeId),
-                                    canPrev = (isCopy || !isNext) && tools.apply(targetSetting.edit.drag.prev, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.prev),
-                                    canNext = (isCopy || !isPrev) && tools.apply(targetSetting.edit.drag.next, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.next),
-                                    canInner = (isCopy || !isInner) && !(targetSetting.data.keep.leaf && !tmpTargetNode.isParent) && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.inner);
-
-                                function clearMove() {
-                                    tmpTarget = null;
-                                    tmpTargetNodeId = "";
-                                    moveType = consts.move.TYPE_INNER;
-                                    tmpArrow.css({
-                                        "display": "none"
-                                    });
-                                    if (window.zTreeMoveTimer) {
-                                        clearTimeout(window.zTreeMoveTimer);
-                                        window.zTreeMoveTargetNodeTId = null
-                                    }
-                                }
-                                if (!canPrev && !canNext && !canInner) {
-                                    clearMove();
-                                } else {
-                                    var tmpTargetA = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget),
-                                        tmpNextA = tmpTargetNode.isLastNode ? null : $("#" + tmpTargetNode.getNextNode().tId + consts.id.A, tmpTarget.next()),
-                                        tmpTop = tmpTargetA.offset().top,
-                                        tmpLeft = tmpTargetA.offset().left,
-                                        prevPercent = canPrev ? (canInner ? 0.25 : (canNext ? 0.5 : 1)) : -1,
-                                        nextPercent = canNext ? (canInner ? 0.75 : (canPrev ? 0.5 : 0)) : -1,
-                                        dY_percent = (event.clientY + docScrollTop - tmpTop) / tmpTargetA.height();
-
-                                    if ((prevPercent == 1 || dY_percent <= prevPercent && dY_percent >= -.2) && canPrev) {
-                                        dX = 1 - tmpArrow.width();
-                                        dY = tmpTop - tmpArrow.height() / 2;
-                                        moveType = consts.move.TYPE_PREV;
-                                    } else if ((nextPercent == 0 || dY_percent >= nextPercent && dY_percent <= 1.2) && canNext) {
-                                        dX = 1 - tmpArrow.width();
-                                        dY = (tmpNextA == null || (tmpTargetNode.isParent && tmpTargetNode.open)) ? (tmpTop + tmpTargetA.height() - tmpArrow.height() / 2) : (tmpNextA.offset().top - tmpArrow.height() / 2);
-                                        moveType = consts.move.TYPE_NEXT;
-                                    } else if (canInner) {
-                                        dX = 5 - tmpArrow.width();
-                                        dY = tmpTop;
-                                        moveType = consts.move.TYPE_INNER;
-                                    } else {
-                                        clearMove();
-                                    }
-
-                                    if (tmpTarget) {
-                                        tmpArrow.css({
-                                            "display": "block",
-                                            "top": dY + "px",
-                                            "left": (tmpLeft + dX) + "px"
-                                        });
-                                        tmpTargetA.addClass(consts.node.TMPTARGET_NODE + "_" + moveType);
-
-                                        if (preTmpTargetNodeId != tmpTargetNodeId || preTmpMoveType != moveType) {
-                                            startTime = (new Date()).getTime();
-                                        }
-                                        if (tmpTargetNode && tmpTargetNode.isParent && moveType == consts.move.TYPE_INNER) {
-                                            var startTimer = true;
-                                            if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId !== tmpTargetNode.tId) {
-                                                clearTimeout(window.zTreeMoveTimer);
-                                                window.zTreeMoveTargetNodeTId = null;
-                                            } else if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId === tmpTargetNode.tId) {
-                                                startTimer = false;
-                                            }
-                                            if (startTimer) {
-                                                window.zTreeMoveTimer = setTimeout(function() {
-                                                    if (moveType != consts.move.TYPE_INNER) return;
-                                                    if (tmpTargetNode && tmpTargetNode.isParent && !tmpTargetNode.open && (new Date()).getTime() - startTime > targetSetting.edit.drag.autoOpenTime &&
-                                                        tools.apply(targetSetting.callback.beforeDragOpen, [targetSetting.treeId, tmpTargetNode], true)) {
-                                                        view.switchNode(targetSetting, tmpTargetNode);
-                                                        if (targetSetting.edit.drag.autoExpandTrigger) {
-                                                            targetSetting.treeObj.trigger(consts.event.EXPAND, [targetSetting.treeId, tmpTargetNode]);
-                                                        }
-                                                    }
-                                                }, targetSetting.edit.drag.autoOpenTime + 50);
-                                                window.zTreeMoveTargetNodeTId = tmpTargetNode.tId;
-                                            }
-                                        }
-                                    }
-                                }
-                            } else {
-                                moveType = consts.move.TYPE_INNER;
-                                if (tmpTarget && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, null], !!targetSetting.edit.drag.inner)) {
-                                    tmpTarget.addClass(consts.node.TMPTARGET_TREE);
-                                } else {
-                                    tmpTarget = null;
-                                }
-                                tmpArrow.css({
-                                    "display": "none"
-                                });
-                                if (window.zTreeMoveTimer) {
-                                    clearTimeout(window.zTreeMoveTimer);
-                                    window.zTreeMoveTargetNodeTId = null;
-                                }
-                            }
-                            preTmpTargetNodeId = tmpTargetNodeId;
-                            preTmpMoveType = moveType;
-
-                            setting.treeObj.trigger(consts.event.DRAGMOVE, [event, setting.treeId, nodes]);
-                        }
-                        return false;
-                    }
-
-                    doc.bind("mouseup", _docMouseUp);
-
-                    function _docMouseUp(event) {
-                        if (window.zTreeMoveTimer) {
-                            clearTimeout(window.zTreeMoveTimer);
-                            window.zTreeMoveTargetNodeTId = null;
-                        }
-                        preTmpTargetNodeId = null;
-                        preTmpMoveType = null;
-                        doc.unbind("mousemove", _docMouseMove);
-                        doc.unbind("mouseup", _docMouseUp);
-                        doc.unbind("selectstart", _docSelect);
-                        body.css("cursor", "");
-                        if (tmpTarget) {
-                            tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
-                            if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
-                                .removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
-                        }
-                        tools.showIfameMask(setting, false);
-
-                        roots.showHoverDom = true;
-                        if (root.dragFlag == 0) return;
-                        root.dragFlag = 0;
-
-                        var i, l, tmpNode;
-                        for (i = 0, l = nodes.length; i < l; i++) {
-                            tmpNode = nodes[i];
-                            if (tmpNode.isParent && root.dragNodeShowBefore[tmpNode.tId] && !tmpNode.open) {
-                                view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
-                                delete root.dragNodeShowBefore[tmpNode.tId];
-                            }
-                        }
-
-                        if (curNode) curNode.remove();
-                        if (tmpArrow) tmpArrow.remove();
-
-                        var isCopy = ((event.ctrlKey || event.metaKey) && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy);
-                        if (!isCopy && tmpTarget && tmpTargetNodeId && nodes[0].parentTId && tmpTargetNodeId == nodes[0].parentTId && moveType == consts.move.TYPE_INNER) {
-                            tmpTarget = null;
-                        }
-                        if (tmpTarget) {
-                            var dragTargetNode = tmpTargetNodeId == null ? null : data.getNodeCache(targetSetting, tmpTargetNodeId);
-                            if (tools.apply(setting.callback.beforeDrop, [targetSetting.treeId, nodes, dragTargetNode, moveType, isCopy], true) == false) {
-                                view.selectNodes(sourceSetting, nodes);
-                                return;
-                            }
-                            var newNodes = isCopy ? tools.clone(nodes) : nodes;
-
-                            function dropCallback() {
-                                if (isOtherTree) {
-                                    if (!isCopy) {
-                                        for (var i = 0, l = nodes.length; i < l; i++) {
-                                            view.removeNode(setting, nodes[i]);
-                                        }
-                                    }
-                                    if (moveType == consts.move.TYPE_INNER) {
-                                        view.addNodes(targetSetting, dragTargetNode, -1, newNodes);
-                                    } else {
-                                        view.addNodes(targetSetting, dragTargetNode.getParentNode(), moveType == consts.move.TYPE_PREV ? dragTargetNode.getIndex() : dragTargetNode.getIndex() + 1, newNodes);
-                                    }
-                                } else {
-                                    if (isCopy && moveType == consts.move.TYPE_INNER) {
-                                        view.addNodes(targetSetting, dragTargetNode, -1, newNodes);
-                                    } else if (isCopy) {
-                                        view.addNodes(targetSetting, dragTargetNode.getParentNode(), moveType == consts.move.TYPE_PREV ? dragTargetNode.getIndex() : dragTargetNode.getIndex() + 1, newNodes);
-                                    } else {
-                                        if (moveType != consts.move.TYPE_NEXT) {
-                                            for (i = 0, l = newNodes.length; i < l; i++) {
-                                                view.moveNode(targetSetting, dragTargetNode, newNodes[i], moveType, false);
-                                            }
-                                        } else {
-                                            for (i = -1, l = newNodes.length - 1; i < l; l--) {
-                                                view.moveNode(targetSetting, dragTargetNode, newNodes[l], moveType, false);
-                                            }
-                                        }
-                                    }
-                                }
-                                view.selectNodes(targetSetting, newNodes);
-
-                                var a = $$(newNodes[0], setting).get(0);
-                                view.scrollIntoView(a);
-
-                                setting.treeObj.trigger(consts.event.DROP, [event, targetSetting.treeId, newNodes, dragTargetNode, moveType, isCopy]);
-                            }
-
-                            if (moveType == consts.move.TYPE_INNER && tools.canAsync(targetSetting, dragTargetNode)) {
-                                view.asyncNode(targetSetting, dragTargetNode, false, dropCallback);
-                            } else {
-                                dropCallback();
-                            }
-
-                        } else {
-                            view.selectNodes(sourceSetting, nodes);
-                            setting.treeObj.trigger(consts.event.DROP, [event, setting.treeId, nodes, null, null, null]);
-                        }
-                    }
-
-                    doc.bind("selectstart", _docSelect);
-
-                    function _docSelect() {
-                        return false;
-                    }
-
-                    //Avoid FireFox's Bug
-                    //If zTree Div CSS set 'overflow', so drag node outside of zTree, and event.target is error.
-                    if (eventMouseDown.preventDefault) {
-                        eventMouseDown.preventDefault();
-                    }
-                    return true;
-                }
-            },
-            //method of tools for zTree
-            _tools = {
-                getAbs: function(obj) {
-                    var oRect = obj.getBoundingClientRect(),
-                        scrollTop = document.body.scrollTop + document.documentElement.scrollTop,
-                        scrollLeft = document.body.scrollLeft + document.documentElement.scrollLeft;
-                    return [oRect.left + scrollLeft, oRect.top + scrollTop];
-                },
-                inputFocus: function(inputObj) {
-                    if (inputObj.get(0)) {
-                        inputObj.focus();
-                        tools.setCursorPosition(inputObj.get(0), inputObj.val().length);
-                    }
-                },
-                inputSelect: function(inputObj) {
-                    if (inputObj.get(0)) {
-                        inputObj.focus();
-                        inputObj.select();
-                    }
-                },
-                setCursorPosition: function(obj, pos) {
-                    if (obj.setSelectionRange) {
-                        obj.focus();
-                        obj.setSelectionRange(pos, pos);
-                    } else if (obj.createTextRange) {
-                        var range = obj.createTextRange();
-                        range.collapse(true);
-                        range.moveEnd('character', pos);
-                        range.moveStart('character', pos);
-                        range.select();
-                    }
-                },
-                showIfameMask: function(setting, showSign) {
-                    var root = data.getRoot(setting);
-                    //clear full mask
-                    while (root.dragMaskList.length > 0) {
-                        root.dragMaskList[0].remove();
-                        root.dragMaskList.shift();
-                    }
-                    if (showSign) {
-                        //show mask
-                        var iframeList = $$("iframe", setting);
-                        for (var i = 0, l = iframeList.length; i < l; i++) {
-                            var obj = iframeList.get(i),
-                                r = tools.getAbs(obj),
-                                dragMask = $$("<div id='zTreeMask_" + i + "' class='zTreeMask' style='top:" + r[1] + "px; left:" + r[0] + "px; width:" + obj.offsetWidth + "px; height:" + obj.offsetHeight + "px;'></div>", setting);
-                            dragMask.appendTo($$("body", setting));
-                            root.dragMaskList.push(dragMask);
-                        }
-                    }
-                }
-            },
-            //method of operate ztree dom
-            _view = {
-                addEditBtn: function(setting, node) {
-                    if (node.editNameFlag || $$(node, consts.id.EDIT, setting).length > 0) {
-                        return;
-                    }
-                    if (!tools.apply(setting.edit.showRenameBtn, [setting.treeId, node], setting.edit.showRenameBtn)) {
-                        return;
-                    }
-                    var aObj = $$(node, consts.id.A, setting),
-                        editStr = "<span class='" + consts.className.BUTTON + " edit' id='" + node.tId + consts.id.EDIT + "' title='" + tools.apply(setting.edit.renameTitle, [setting.treeId, node], setting.edit.renameTitle) + "' treeNode" + consts.id.EDIT + " style='display:none;'></span>";
-                    aObj.append(editStr);
-
-                    $$(node, consts.id.EDIT, setting).bind('click',
-                        function() {
-                            if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeEditName, [setting.treeId, node], true) == false) return false;
-                            view.editNode(setting, node);
-                            return false;
-                        }
-                    ).show();
-                },
-                addRemoveBtn: function(setting, node) {
-                    if (node.editNameFlag || $$(node, consts.id.REMOVE, setting).length > 0) {
-                        return;
-                    }
-                    if (!tools.apply(setting.edit.showRemoveBtn, [setting.treeId, node], setting.edit.showRemoveBtn)) {
-                        return;
-                    }
-                    var aObj = $$(node, consts.id.A, setting),
-                        removeStr = "<span class='" + consts.className.BUTTON + " remove' id='" + node.tId + consts.id.REMOVE + "' title='" + tools.apply(setting.edit.removeTitle, [setting.treeId, node], setting.edit.removeTitle) + "' treeNode" + consts.id.REMOVE + " style='display:none;'></span>";
-                    aObj.append(removeStr);
-
-                    $$(node, consts.id.REMOVE, setting).bind('click',
-                        function() {
-                            if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return false;
-                            view.removeNode(setting, node);
-                            setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
-                            return false;
-                        }
-                    ).bind('mousedown',
-                        function(eventMouseDown) {
-                            return true;
-                        }
-                    ).show();
-                },
-                addHoverDom: function(setting, node) {
-                    if (data.getRoots().showHoverDom) {
-                        node.isHover = true;
-                        if (setting.edit.enable) {
-                            view.addEditBtn(setting, node);
-                            view.addRemoveBtn(setting, node);
-                        }
-                        tools.apply(setting.view.addHoverDom, [setting.treeId, node]);
-                    }
-                },
-                cancelCurEditNode: function(setting, forceName, isCancel) {
-                    var root = data.getRoot(setting),
-                        nameKey = setting.data.key.name,
-                        node = root.curEditNode;
-
-                    if (node) {
-                        var inputObj = root.curEditInput,
-                            newName = forceName ? forceName : (isCancel ? node[nameKey] : inputObj.val());
-                        if (tools.apply(setting.callback.beforeRename, [setting.treeId, node, newName, isCancel], true) === false) {
-                            return false;
-                        }
-                        node[nameKey] = newName;
-                        var aObj = $$(node, consts.id.A, setting);
-                        aObj.removeClass(consts.node.CURSELECTED_EDIT);
-                        inputObj.unbind();
-                        view.setNodeName(setting, node);
-                        node.editNameFlag = false;
-                        root.curEditNode = null;
-                        root.curEditInput = null;
-                        view.selectNode(setting, node, false);
-                        setting.treeObj.trigger(consts.event.RENAME, [setting.treeId, node, isCancel]);
-                    }
-                    root.noSelection = true;
-                    return true;
-                },
-                editNode: function(setting, node) {
-                    var root = data.getRoot(setting);
-                    view.editNodeBlur = false;
-                    if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
-                        setTimeout(function() { tools.inputFocus(root.curEditInput); }, 0);
-                        return;
-                    }
-                    var nameKey = setting.data.key.name;
-                    node.editNameFlag = true;
-                    view.removeTreeDom(setting, node);
-                    view.cancelCurEditNode(setting);
-                    view.selectNode(setting, node, false);
-                    $$(node, consts.id.SPAN, setting).html("<input type=text class='rename' id='" + node.tId + consts.id.INPUT + "' treeNode" + consts.id.INPUT + " >");
-                    var inputObj = $$(node, consts.id.INPUT, setting);
-                    inputObj.attr("value", node[nameKey]);
-                    if (setting.edit.editNameSelectAll) {
-                        tools.inputSelect(inputObj);
-                    } else {
-                        tools.inputFocus(inputObj);
-                    }
-
-                    inputObj.bind('blur', function(event) {
-                        if (!view.editNodeBlur) {
-                            view.cancelCurEditNode(setting);
-                        }
-                    }).bind('keydown', function(event) {
-                        if (event.keyCode == "13") {
-                            view.editNodeBlur = true;
-                            view.cancelCurEditNode(setting);
-                        } else if (event.keyCode == "27") {
-                            view.cancelCurEditNode(setting, null, true);
-                        }
-                    }).bind('click', function(event) {
-                        return false;
-                    }).bind('dblclick', function(event) {
-                        return false;
-                    });
-
-                    $$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED_EDIT);
-                    root.curEditInput = inputObj;
-                    root.noSelection = false;
-                    root.curEditNode = node;
-                },
-                moveNode: function(setting, targetNode, node, moveType, animateFlag, isSilent) {
-                    var root = data.getRoot(setting),
-                        childKey = setting.data.key.children;
-                    if (targetNode == node) return;
-                    if (setting.data.keep.leaf && targetNode && !targetNode.isParent && moveType == consts.move.TYPE_INNER) return;
-                    var oldParentNode = (node.parentTId ? node.getParentNode() : root),
-                        targetNodeIsRoot = (targetNode === null || targetNode == root);
-                    if (targetNodeIsRoot && targetNode === null) targetNode = root;
-                    if (targetNodeIsRoot) moveType = consts.move.TYPE_INNER;
-                    var targetParentNode = (targetNode.parentTId ? targetNode.getParentNode() : root);
-
-                    if (moveType != consts.move.TYPE_PREV && moveType != consts.move.TYPE_NEXT) {
-                        moveType = consts.move.TYPE_INNER;
-                    }
-
-                    if (moveType == consts.move.TYPE_INNER) {
-                        if (targetNodeIsRoot) {
-                            //parentTId of root node is null
-                            node.parentTId = null;
-                        } else {
-                            if (!targetNode.isParent) {
-                                targetNode.isParent = true;
-                                targetNode.open = !!targetNode.open;
-                                view.setNodeLineIcos(setting, targetNode);
-                            }
-                            node.parentTId = targetNode.tId;
-                        }
-                    }
-
-                    //move node Dom
-                    var targetObj, target_ulObj;
-                    if (targetNodeIsRoot) {
-                        targetObj = setting.treeObj;
-                        target_ulObj = targetObj;
-                    } else {
-                        if (!isSilent && moveType == consts.move.TYPE_INNER) {
-                            view.expandCollapseNode(setting, targetNode, true, false);
-                        } else if (!isSilent) {
-                            view.expandCollapseNode(setting, targetNode.getParentNode(), true, false);
-                        }
-                        targetObj = $$(targetNode, setting);
-                        target_ulObj = $$(targetNode, consts.id.UL, setting);
-                        if (!!targetObj.get(0) && !target_ulObj.get(0)) {
-                            var ulstr = [];
-                            view.makeUlHtml(setting, targetNode, ulstr, '');
-                            targetObj.append(ulstr.join(''));
-                        }
-                        target_ulObj = $$(targetNode, consts.id.UL, setting);
-                    }
-                    var nodeDom = $$(node, setting);
-                    if (!nodeDom.get(0)) {
-                        nodeDom = view.appendNodes(setting, node.level, [node], null, -1, false, true).join('');
-                    } else if (!targetObj.get(0)) {
-                        nodeDom.remove();
-                    }
-                    if (target_ulObj.get(0) && moveType == consts.move.TYPE_INNER) {
-                        target_ulObj.append(nodeDom);
-                    } else if (targetObj.get(0) && moveType == consts.move.TYPE_PREV) {
-                        targetObj.before(nodeDom);
-                    } else if (targetObj.get(0) && moveType == consts.move.TYPE_NEXT) {
-                        targetObj.after(nodeDom);
-                    }
-
-                    //repair the data after move
-                    var i, l,
-                        tmpSrcIndex = -1,
-                        tmpTargetIndex = 0,
-                        oldNeighbor = null,
-                        newNeighbor = null,
-                        oldLevel = node.level;
-                    if (node.isFirstNode) {
-                        tmpSrcIndex = 0;
-                        if (oldParentNode[childKey].length > 1) {
-                            oldNeighbor = oldParentNode[childKey][1];
-                            oldNeighbor.isFirstNode = true;
-                        }
-                    } else if (node.isLastNode) {
-                        tmpSrcIndex = oldParentNode[childKey].length - 1;
-                        oldNeighbor = oldParentNode[childKey][tmpSrcIndex - 1];
-                        oldNeighbor.isLastNode = true;
-                    } else {
-                        for (i = 0, l = oldParentNode[childKey].length; i < l; i++) {
-                            if (oldParentNode[childKey][i].tId == node.tId) {
-                                tmpSrcIndex = i;
-                                break;
-                            }
-                        }
-                    }
-                    if (tmpSrcIndex >= 0) {
-                        oldParentNode[childKey].splice(tmpSrcIndex, 1);
-                    }
-                    if (moveType != consts.move.TYPE_INNER) {
-                        for (i = 0, l = targetParentNode[childKey].length; i < l; i++) {
-                            if (targetParentNode[childKey][i].tId == targetNode.tId) tmpTargetIndex = i;
-                        }
-                    }
-                    if (moveType == consts.move.TYPE_INNER) {
-                        if (!targetNode[childKey]) targetNode[childKey] = new Array();
-                        if (targetNode[childKey].length > 0) {
-                            newNeighbor = targetNode[childKey][targetNode[childKey].length - 1];
-                            newNeighbor.isLastNode = false;
-                        }
-                        targetNode[childKey].splice(targetNode[childKey].length, 0, node);
-                        node.isLastNode = true;
-                        node.isFirstNode = (targetNode[childKey].length == 1);
-                    } else if (targetNode.isFirstNode && moveType == consts.move.TYPE_PREV) {
-                        targetParentNode[childKey].splice(tmpTargetIndex, 0, node);
-                        newNeighbor = targetNode;
-                        newNeighbor.isFirstNode = false;
-                        node.parentTId = targetNode.parentTId;
-                        node.isFirstNode = true;
-                        node.isLastNode = false;
-
-                    } else if (targetNode.isLastNode && moveType == consts.move.TYPE_NEXT) {
-                        targetParentNode[childKey].splice(tmpTargetIndex + 1, 0, node);
-                        newNeighbor = targetNode;
-                        newNeighbor.isLastNode = false;
-                        node.parentTId = targetNode.parentTId;
-                        node.isFirstNode = false;
-                        node.isLastNode = true;
-
-                    } else {
-                        if (moveType == consts.move.TYPE_PREV) {
-                            targetParentNode[childKey].splice(tmpTargetIndex, 0, node);
-                        } else {
-                            targetParentNode[childKey].splice(tmpTargetIndex + 1, 0, node);
-                        }
-                        node.parentTId = targetNode.parentTId;
-                        node.isFirstNode = false;
-                        node.isLastNode = false;
-                    }
-                    data.fixPIdKeyValue(setting, node);
-                    data.setSonNodeLevel(setting, node.getParentNode(), node);
-
-                    //repair node what been moved
-                    view.setNodeLineIcos(setting, node);
-                    view.repairNodeLevelClass(setting, node, oldLevel)
-
-                    //repair node's old parentNode dom
-                    if (!setting.data.keep.parent && oldParentNode[childKey].length < 1) {
-                        //old parentNode has no child nodes
-                        oldParentNode.isParent = false;
-                        oldParentNode.open = false;
-                        var tmp_ulObj = $$(oldParentNode, consts.id.UL, setting),
-                            tmp_switchObj = $$(oldParentNode, consts.id.SWITCH, setting),
-                            tmp_icoObj = $$(oldParentNode, consts.id.ICON, setting);
-                        view.replaceSwitchClass(oldParentNode, tmp_switchObj, consts.folder.DOCU);
-                        view.replaceIcoClass(oldParentNode, tmp_icoObj, consts.folder.DOCU);
-                        tmp_ulObj.css("display", "none");
-
-                    } else if (oldNeighbor) {
-                        //old neigbor node
-                        view.setNodeLineIcos(setting, oldNeighbor);
-                    }
-
-                    //new neigbor node
-                    if (newNeighbor) {
-                        view.setNodeLineIcos(setting, newNeighbor);
-                    }
-
-                    //repair checkbox / radio
-                    if (!!setting.check && setting.check.enable && view.repairChkClass) {
-                        view.repairChkClass(setting, oldParentNode);
-                        view.repairParentChkClassWithSelf(setting, oldParentNode);
-                        if (oldParentNode != node.parent)
-                            view.repairParentChkClassWithSelf(setting, node);
-                    }
-
-                    //expand parents after move
-                    if (!isSilent) {
-                        view.expandCollapseParentNode(setting, node.getParentNode(), true, animateFlag);
-                    }
-                },
-                removeEditBtn: function(setting, node) {
-                    $$(node, consts.id.EDIT, setting).unbind().remove();
-                },
-                removeRemoveBtn: function(setting, node) {
-                    $$(node, consts.id.REMOVE, setting).unbind().remove();
-                },
-                removeTreeDom: function(setting, node) {
-                    node.isHover = false;
-                    view.removeEditBtn(setting, node);
-                    view.removeRemoveBtn(setting, node);
-                    tools.apply(setting.view.removeHoverDom, [setting.treeId, node]);
-                },
-                repairNodeLevelClass: function(setting, node, oldLevel) {
-                    if (oldLevel === node.level) return;
-                    var liObj = $$(node, setting),
-                        aObj = $$(node, consts.id.A, setting),
-                        ulObj = $$(node, consts.id.UL, setting),
-                        oldClass = consts.className.LEVEL + oldLevel,
-                        newClass = consts.className.LEVEL + node.level;
-                    liObj.removeClass(oldClass);
-                    liObj.addClass(newClass);
-                    aObj.removeClass(oldClass);
-                    aObj.addClass(newClass);
-                    ulObj.removeClass(oldClass);
-                    ulObj.addClass(newClass);
-                },
-                selectNodes: function(setting, nodes) {
-                    for (var i = 0, l = nodes.length; i < l; i++) {
-                        view.selectNode(setting, nodes[i], i > 0);
-                    }
-                }
-            },
-
-            _z = {
-                tools: _tools,
-                view: _view,
-                event: _event,
-                data: _data
-            };
-        $.extend(true, $.fn.zTree.consts, _consts);
-        $.extend(true, $.fn.zTree._z, _z);
-
-        var zt = $.fn.zTree,
-            tools = zt._z.tools,
-            consts = zt.consts,
-            view = zt._z.view,
-            data = zt._z.data,
-            event = zt._z.event,
-            $$ = tools.$;
-
-        data.exSetting(_setting);
-        data.addInitBind(_bindEvent);
-        data.addInitUnBind(_unbindEvent);
-        data.addInitCache(_initCache);
-        data.addInitNode(_initNode);
-        data.addInitProxy(_eventProxy);
-        data.addInitRoot(_initRoot);
-        data.addZTreeTools(_zTreeTools);
-
-        var _cancelPreSelectedNode = view.cancelPreSelectedNode;
-        view.cancelPreSelectedNode = function(setting, node) {
-            var list = data.getRoot(setting).curSelectedList;
-            for (var i = 0, j = list.length; i < j; i++) {
-                if (!node || node === list[i]) {
-                    view.removeTreeDom(setting, list[i]);
-                    if (node) break;
-                }
-            }
-            if (_cancelPreSelectedNode) _cancelPreSelectedNode.apply(view, arguments);
-        }
-
-        var _createNodes = view.createNodes;
-        view.createNodes = function(setting, level, nodes, parentNode, index) {
-            if (_createNodes) {
-                _createNodes.apply(view, arguments);
-            }
-            if (!nodes) return;
-            if (view.repairParentChkClassWithSelf) {
-                view.repairParentChkClassWithSelf(setting, parentNode);
-            }
-        }
-
-        var _makeNodeUrl = view.makeNodeUrl;
-        view.makeNodeUrl = function(setting, node) {
-            return setting.edit.enable ? null : (_makeNodeUrl.apply(view, arguments));
-        }
-
-        var _removeNode = view.removeNode;
-        view.removeNode = function(setting, node) {
-            var root = data.getRoot(setting);
-            if (root.curEditNode === node) root.curEditNode = null;
-            if (_removeNode) {
-                _removeNode.apply(view, arguments);
-            }
-        }
-
-        var _selectNode = view.selectNode;
-        view.selectNode = function(setting, node, addFlag) {
-            var root = data.getRoot(setting);
-            if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
-                return false;
-            }
-            if (_selectNode) _selectNode.apply(view, arguments);
-            view.addHoverDom(setting, node);
-            return true;
-        }
-
-        var _uCanDo = tools.uCanDo;
-        tools.uCanDo = function(setting, e) {
-            var root = data.getRoot(setting);
-            if (e && (tools.eqs(e.type, "mouseover") || tools.eqs(e.type, "mouseout") || tools.eqs(e.type, "mousedown") || tools.eqs(e.type, "mouseup"))) {
-                return true;
-            }
-            if (root.curEditNode) {
-                view.editNodeBlur = false;
-                root.curEditInput.focus();
-            }
-            return (!root.curEditNode) && (_uCanDo ? _uCanDo.apply(view, arguments) : true);
-        }
-    })(jQuery);
-
-    //输出接口
-    exports('ztree');
-});
\ No newline at end of file
+	(function ($) {
+		//default consts of exedit
+		var _consts = {
+				event: {
+					DRAG: "ztree_drag",
+					DROP: "ztree_drop",
+					RENAME: "ztree_rename",
+					DRAGMOVE: "ztree_dragmove"
+				},
+				id: {
+					EDIT: "_edit",
+					INPUT: "_input",
+					REMOVE: "_remove"
+				},
+				move: {
+					TYPE_INNER: "inner",
+					TYPE_PREV: "prev",
+					TYPE_NEXT: "next"
+				},
+				node: {
+					CURSELECTED_EDIT: "curSelectedNode_Edit",
+					TMPTARGET_TREE: "tmpTargetzTree",
+					TMPTARGET_NODE: "tmpTargetNode"
+				}
+			},
+			//default setting of exedit
+			_setting = {
+				edit: {
+					enable: false,
+					editNameSelectAll: false,
+					showRemoveBtn: true,
+					showRenameBtn: true,
+					removeTitle: "remove",
+					renameTitle: "rename",
+					drag: {
+						autoExpandTrigger: false,
+						isCopy: true,
+						isMove: true,
+						prev: true,
+						next: true,
+						inner: true,
+						minMoveSize: 5,
+						borderMax: 10,
+						borderMin: -5,
+						maxShowNodeNum: 5,
+						autoOpenTime: 500
+					}
+				},
+				view: {
+					addHoverDom: null,
+					removeHoverDom: null
+				},
+				callback: {
+					beforeDrag: null,
+					beforeDragOpen: null,
+					beforeDrop: null,
+					beforeEditName: null,
+					beforeRename: null,
+					onDrag: null,
+					onDragMove: null,
+					onDrop: null,
+					onRename: null
+				}
+			},
+			//default root of exedit
+			_initRoot = function (setting) {
+				var r = data.getRoot(setting),
+					rs = data.getRoots();
+				r.curEditNode = null;
+				r.curEditInput = null;
+				r.curHoverNode = null;
+				r.dragFlag = 0;
+				r.dragNodeShowBefore = [];
+				r.dragMaskList = new Array();
+				rs.showHoverDom = true;
+			},
+			//default cache of exedit
+			_initCache = function (treeId) {
+			},
+			//default bind event of exedit
+			_bindEvent = function (setting) {
+				var o = setting.treeObj;
+				var c = consts.event;
+				o.bind(c.RENAME, function (event, treeId, treeNode, isCancel) {
+					tools.apply(setting.callback.onRename, [event, treeId, treeNode, isCancel]);
+				});
+
+				o.bind(c.DRAG, function (event, srcEvent, treeId, treeNodes) {
+					tools.apply(setting.callback.onDrag, [srcEvent, treeId, treeNodes]);
+				});
+
+				o.bind(c.DRAGMOVE, function (event, srcEvent, treeId, treeNodes) {
+					tools.apply(setting.callback.onDragMove, [srcEvent, treeId, treeNodes]);
+				});
+
+				o.bind(c.DROP, function (event, srcEvent, treeId, treeNodes, targetNode, moveType, isCopy) {
+					tools.apply(setting.callback.onDrop, [srcEvent, treeId, treeNodes, targetNode, moveType, isCopy]);
+				});
+			},
+			_unbindEvent = function (setting) {
+				var o = setting.treeObj;
+				var c = consts.event;
+				o.unbind(c.RENAME);
+				o.unbind(c.DRAG);
+				o.unbind(c.DRAGMOVE);
+				o.unbind(c.DROP);
+			},
+			//default event proxy of exedit
+			_eventProxy = function (e) {
+				var target = e.target,
+					setting = data.getSetting(e.data.treeId),
+					relatedTarget = e.relatedTarget,
+					tId = "",
+					node = null,
+					nodeEventType = "",
+					treeEventType = "",
+					nodeEventCallback = null,
+					treeEventCallback = null,
+					tmp = null;
+
+				if (tools.eqs(e.type, "mouseover")) {
+					tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+					if (tmp) {
+						tId = tools.getNodeMainDom(tmp).id;
+						nodeEventType = "hoverOverNode";
+					}
+				} else if (tools.eqs(e.type, "mouseout")) {
+					tmp = tools.getMDom(setting, relatedTarget, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+					if (!tmp) {
+						tId = "remove";
+						nodeEventType = "hoverOutNode";
+					}
+				} else if (tools.eqs(e.type, "mousedown")) {
+					tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+					if (tmp) {
+						tId = tools.getNodeMainDom(tmp).id;
+						nodeEventType = "mousedownNode";
+					}
+				}
+				if (tId.length > 0) {
+					node = data.getNodeCache(setting, tId);
+					switch (nodeEventType) {
+						case "mousedownNode":
+							nodeEventCallback = _handler.onMousedownNode;
+							break;
+						case "hoverOverNode":
+							nodeEventCallback = _handler.onHoverOverNode;
+							break;
+						case "hoverOutNode":
+							nodeEventCallback = _handler.onHoverOutNode;
+							break;
+					}
+				}
+				var proxyResult = {
+					stop: false,
+					node: node,
+					nodeEventType: nodeEventType,
+					nodeEventCallback: nodeEventCallback,
+					treeEventType: treeEventType,
+					treeEventCallback: treeEventCallback
+				};
+				return proxyResult
+			},
+			//default init node of exedit
+			_initNode = function (setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+				if (!n) return;
+				n.isHover = false;
+				n.editNameFlag = false;
+			},
+			//update zTreeObj, add method of edit
+			_zTreeTools = function (setting, zTreeTools) {
+				zTreeTools.cancelEditName = function (newName) {
+					var root = data.getRoot(this.setting);
+					if (!root.curEditNode) return;
+					view.cancelCurEditNode(this.setting, newName ? newName : null, true);
+				}
+				zTreeTools.copyNode = function (targetNode, node, moveType, isSilent) {
+					if (!node) return null;
+					if (targetNode && !targetNode.isParent && this.setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) return null;
+					var _this = this,
+						newNode = tools.clone(node);
+					if (!targetNode) {
+						targetNode = null;
+						moveType = consts.move.TYPE_INNER;
+					}
+					if (moveType == consts.move.TYPE_INNER) {
+						function copyCallback() {
+							view.addNodes(_this.setting, targetNode, -1, [newNode], isSilent);
+						}
+
+						if (tools.canAsync(this.setting, targetNode)) {
+							view.asyncNode(this.setting, targetNode, isSilent, copyCallback);
+						} else {
+							copyCallback();
+						}
+					} else {
+						view.addNodes(this.setting, targetNode.parentNode, -1, [newNode], isSilent);
+						view.moveNode(this.setting, targetNode, newNode, moveType, false, isSilent);
+					}
+					return newNode;
+				}
+				zTreeTools.editName = function (node) {
+					if (!node || !node.tId || node !== data.getNodeCache(this.setting, node.tId)) return;
+					if (node.parentTId) view.expandCollapseParentNode(this.setting, node.getParentNode(), true);
+					view.editNode(this.setting, node)
+				}
+				zTreeTools.moveNode = function (targetNode, node, moveType, isSilent) {
+					if (!node) return node;
+					if (targetNode && !targetNode.isParent && this.setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) {
+						return null;
+					} else if (targetNode && ((node.parentTId == targetNode.tId && moveType == consts.move.TYPE_INNER) || $$(node, this.setting).find("#" + targetNode.tId).length > 0)) {
+						return null;
+					} else if (!targetNode) {
+						targetNode = null;
+					}
+					var _this = this;
+
+					function moveCallback() {
+						view.moveNode(_this.setting, targetNode, node, moveType, false, isSilent);
+					}
+
+					if (tools.canAsync(this.setting, targetNode) && moveType === consts.move.TYPE_INNER) {
+						view.asyncNode(this.setting, targetNode, isSilent, moveCallback);
+					} else {
+						moveCallback();
+					}
+					return node;
+				}
+				zTreeTools.setEditable = function (editable) {
+					this.setting.edit.enable = editable;
+					return this.refresh();
+				}
+			},
+			//method of operate data
+			_data = {
+				setSonNodeLevel: function (setting, parentNode, node) {
+					if (!node) return;
+					var childKey = setting.data.key.children;
+					node.level = (parentNode) ? parentNode.level + 1 : 0;
+					if (!node[childKey]) return;
+					for (var i = 0, l = node[childKey].length; i < l; i++) {
+						if (node[childKey][i]) data.setSonNodeLevel(setting, node, node[childKey][i]);
+					}
+				}
+			},
+			//method of event proxy
+			_event = {},
+			//method of event handler
+			_handler = {
+				onHoverOverNode: function (event, node) {
+					var setting = data.getSetting(event.data.treeId),
+						root = data.getRoot(setting);
+					if (root.curHoverNode != node) {
+						_handler.onHoverOutNode(event);
+					}
+					root.curHoverNode = node;
+					view.addHoverDom(setting, node);
+				},
+				onHoverOutNode: function (event, node) {
+					var setting = data.getSetting(event.data.treeId),
+						root = data.getRoot(setting);
+					if (root.curHoverNode && !data.isSelectedNode(setting, root.curHoverNode)) {
+						view.removeTreeDom(setting, root.curHoverNode);
+						root.curHoverNode = null;
+					}
+				},
+				onMousedownNode: function (eventMouseDown, _node) {
+					var i, l,
+						setting = data.getSetting(eventMouseDown.data.treeId),
+						root = data.getRoot(setting),
+						roots = data.getRoots();
+					//right click can't drag & drop
+					if (eventMouseDown.button == 2 || !setting.edit.enable || (!setting.edit.drag.isCopy && !setting.edit.drag.isMove)) return true;
+
+					//input of edit node name can't drag & drop
+					var target = eventMouseDown.target,
+						_nodes = data.getRoot(setting).curSelectedList,
+						nodes = [];
+					if (!data.isSelectedNode(setting, _node)) {
+						nodes = [_node];
+					} else {
+						for (i = 0, l = _nodes.length; i < l; i++) {
+							if (_nodes[i].editNameFlag && tools.eqs(target.tagName, "input") && target.getAttribute("treeNode" + consts.id.INPUT) !== null) {
+								return true;
+							}
+							nodes.push(_nodes[i]);
+							if (nodes[0].parentTId !== _nodes[i].parentTId) {
+								nodes = [_node];
+								break;
+							}
+						}
+					}
+
+					view.editNodeBlur = true;
+					view.cancelCurEditNode(setting);
+
+					var doc = $(setting.treeObj.get(0).ownerDocument),
+						body = $(setting.treeObj.get(0).ownerDocument.body),
+						curNode, tmpArrow, tmpTarget,
+						isOtherTree = false,
+						targetSetting = setting,
+						sourceSetting = setting,
+						preNode, nextNode,
+						preTmpTargetNodeId = null,
+						preTmpMoveType = null,
+						tmpTargetNodeId = null,
+						moveType = consts.move.TYPE_INNER,
+						mouseDownX = eventMouseDown.clientX,
+						mouseDownY = eventMouseDown.clientY,
+						startTime = (new Date()).getTime();
+
+					if (tools.uCanDo(setting)) {
+						doc.bind("mousemove", _docMouseMove);
+					}
+
+					function _docMouseMove(event) {
+						//avoid start drag after click node
+						if (root.dragFlag == 0 && Math.abs(mouseDownX - event.clientX) < setting.edit.drag.minMoveSize &&
+							Math.abs(mouseDownY - event.clientY) < setting.edit.drag.minMoveSize) {
+							return true;
+						}
+						var i, l, tmpNode, tmpDom, tmpNodes,
+							childKey = setting.data.key.children;
+						body.css("cursor", "pointer");
+
+						if (root.dragFlag == 0) {
+							if (tools.apply(setting.callback.beforeDrag, [setting.treeId, nodes], true) == false) {
+								_docMouseUp(event);
+								return true;
+							}
+
+							for (i = 0, l = nodes.length; i < l; i++) {
+								if (i == 0) {
+									root.dragNodeShowBefore = [];
+								}
+								tmpNode = nodes[i];
+								if (tmpNode.isParent && tmpNode.open) {
+									view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
+									root.dragNodeShowBefore[tmpNode.tId] = true;
+								} else {
+									root.dragNodeShowBefore[tmpNode.tId] = false;
+								}
+							}
+
+							root.dragFlag = 1;
+							roots.showHoverDom = false;
+							tools.showIfameMask(setting, true);
+
+							//sort
+							var isOrder = true,
+								lastIndex = -1;
+							if (nodes.length > 1) {
+								var pNodes = nodes[0].parentTId ? nodes[0].getParentNode()[childKey] : data.getNodes(setting);
+								tmpNodes = [];
+								for (i = 0, l = pNodes.length; i < l; i++) {
+									if (root.dragNodeShowBefore[pNodes[i].tId] !== undefined) {
+										if (isOrder && lastIndex > -1 && (lastIndex + 1) !== i) {
+											isOrder = false;
+										}
+										tmpNodes.push(pNodes[i]);
+										lastIndex = i;
+									}
+									if (nodes.length === tmpNodes.length) {
+										nodes = tmpNodes;
+										break;
+									}
+								}
+							}
+							if (isOrder) {
+								preNode = nodes[0].getPreNode();
+								nextNode = nodes[nodes.length - 1].getNextNode();
+							}
+
+							//set node in selected
+							curNode = $$("<ul class='zTreeDragUL'></ul>", setting);
+							for (i = 0, l = nodes.length; i < l; i++) {
+								tmpNode = nodes[i];
+								tmpNode.editNameFlag = false;
+								view.selectNode(setting, tmpNode, i > 0);
+								view.removeTreeDom(setting, tmpNode);
+
+								if (i > setting.edit.drag.maxShowNodeNum - 1) {
+									continue;
+								}
+
+								tmpDom = $$("<li id='" + tmpNode.tId + "_tmp'></li>", setting);
+								tmpDom.append($$(tmpNode, consts.id.A, setting).clone());
+								tmpDom.css("padding", "0");
+								tmpDom.children("#" + tmpNode.tId + consts.id.A).removeClass(consts.node.CURSELECTED);
+								curNode.append(tmpDom);
+								if (i == setting.edit.drag.maxShowNodeNum - 1) {
+									tmpDom = $$("<li id='" + tmpNode.tId + "_moretmp'><a>  ...  </a></li>", setting);
+									curNode.append(tmpDom);
+								}
+							}
+							curNode.attr("id", nodes[0].tId + consts.id.UL + "_tmp");
+							curNode.addClass(setting.treeObj.attr("class"));
+							curNode.appendTo(body);
+
+							tmpArrow = $$("<span class='tmpzTreeMove_arrow'></span>", setting);
+							tmpArrow.attr("id", "zTreeMove_arrow_tmp");
+							tmpArrow.appendTo(body);
+
+							setting.treeObj.trigger(consts.event.DRAG, [event, setting.treeId, nodes]);
+						}
+
+						if (root.dragFlag == 1) {
+							if (tmpTarget && tmpArrow.attr("id") == event.target.id && tmpTargetNodeId && (event.clientX + doc.scrollLeft() + 2) > ($("#" + tmpTargetNodeId + consts.id.A, tmpTarget).offset().left)) {
+								var xT = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget);
+								event.target = (xT.length > 0) ? xT.get(0) : event.target;
+							} else if (tmpTarget) {
+								tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
+								if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
+									.removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
+							}
+							tmpTarget = null;
+							tmpTargetNodeId = null;
+
+							//judge drag & drop in multi ztree
+							isOtherTree = false;
+							targetSetting = setting;
+							var settings = data.getSettings();
+							for (var s in settings) {
+								if (settings[s].treeId && settings[s].edit.enable && settings[s].treeId != setting.treeId &&
+									(event.target.id == settings[s].treeId || $(event.target).parents("#" + settings[s].treeId).length > 0)) {
+									isOtherTree = true;
+									targetSetting = settings[s];
+								}
+							}
+
+							var docScrollTop = doc.scrollTop(),
+								docScrollLeft = doc.scrollLeft(),
+								treeOffset = targetSetting.treeObj.offset(),
+								scrollHeight = targetSetting.treeObj.get(0).scrollHeight,
+								scrollWidth = targetSetting.treeObj.get(0).scrollWidth,
+								dTop = (event.clientY + docScrollTop - treeOffset.top),
+								dBottom = (targetSetting.treeObj.height() + treeOffset.top - event.clientY - docScrollTop),
+								dLeft = (event.clientX + docScrollLeft - treeOffset.left),
+								dRight = (targetSetting.treeObj.width() + treeOffset.left - event.clientX - docScrollLeft),
+								isTop = (dTop < setting.edit.drag.borderMax && dTop > setting.edit.drag.borderMin),
+								isBottom = (dBottom < setting.edit.drag.borderMax && dBottom > setting.edit.drag.borderMin),
+								isLeft = (dLeft < setting.edit.drag.borderMax && dLeft > setting.edit.drag.borderMin),
+								isRight = (dRight < setting.edit.drag.borderMax && dRight > setting.edit.drag.borderMin),
+								isTreeInner = dTop > setting.edit.drag.borderMin && dBottom > setting.edit.drag.borderMin && dLeft > setting.edit.drag.borderMin && dRight > setting.edit.drag.borderMin,
+								isTreeTop = (isTop && targetSetting.treeObj.scrollTop() <= 0),
+								isTreeBottom = (isBottom && (targetSetting.treeObj.scrollTop() + targetSetting.treeObj.height() + 10) >= scrollHeight),
+								isTreeLeft = (isLeft && targetSetting.treeObj.scrollLeft() <= 0),
+								isTreeRight = (isRight && (targetSetting.treeObj.scrollLeft() + targetSetting.treeObj.width() + 10) >= scrollWidth);
+
+							if (event.target && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
+								//get node <li> dom
+								var targetObj = event.target;
+								while (targetObj && targetObj.tagName && !tools.eqs(targetObj.tagName, "li") && targetObj.id != targetSetting.treeId) {
+									targetObj = targetObj.parentNode;
+								}
+
+								var canMove = true;
+								//don't move to self or children of self
+								for (i = 0, l = nodes.length; i < l; i++) {
+									tmpNode = nodes[i];
+									if (targetObj.id === tmpNode.tId) {
+										canMove = false;
+										break;
+									} else if ($$(tmpNode, setting).find("#" + targetObj.id).length > 0) {
+										canMove = false;
+										break;
+									}
+								}
+								if (canMove && event.target && tools.isChildOrSelf(event.target, targetObj.id + consts.id.A)) {
+									tmpTarget = $(targetObj);
+									tmpTargetNodeId = targetObj.id;
+								}
+							}
+
+							//the mouse must be in zTree
+							tmpNode = nodes[0];
+							if (isTreeInner && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
+								//judge mouse move in root of ztree
+								if (!tmpTarget && (event.target.id == targetSetting.treeId || isTreeTop || isTreeBottom || isTreeLeft || isTreeRight) && (isOtherTree || (!isOtherTree && tmpNode.parentTId))) {
+									tmpTarget = targetSetting.treeObj;
+								}
+								//auto scroll top
+								if (isTop) {
+									targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop() - 10);
+								} else if (isBottom) {
+									targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop() + 10);
+								}
+								if (isLeft) {
+									targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft() - 10);
+								} else if (isRight) {
+									targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft() + 10);
+								}
+								//auto scroll left
+								if (tmpTarget && tmpTarget != targetSetting.treeObj && tmpTarget.offset().left < targetSetting.treeObj.offset().left) {
+									targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft() + tmpTarget.offset().left - targetSetting.treeObj.offset().left);
+								}
+							}
+
+							curNode.css({
+								"top": (event.clientY + docScrollTop + 3) + "px",
+								"left": (event.clientX + docScrollLeft + 3) + "px"
+							});
+
+							var dX = 0;
+							var dY = 0;
+							if (tmpTarget && tmpTarget.attr("id") != targetSetting.treeId) {
+								var tmpTargetNode = tmpTargetNodeId == null ? null : data.getNodeCache(targetSetting, tmpTargetNodeId),
+									isCopy = ((event.ctrlKey || event.metaKey) && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy),
+									isPrev = !!(preNode && tmpTargetNodeId === preNode.tId),
+									isNext = !!(nextNode && tmpTargetNodeId === nextNode.tId),
+									isInner = (tmpNode.parentTId && tmpNode.parentTId == tmpTargetNodeId),
+									canPrev = (isCopy || !isNext) && tools.apply(targetSetting.edit.drag.prev, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.prev),
+									canNext = (isCopy || !isPrev) && tools.apply(targetSetting.edit.drag.next, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.next),
+									canInner = (isCopy || !isInner) && !(targetSetting.data.keep.leaf && !tmpTargetNode.isParent) && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.inner);
+
+								function clearMove() {
+									tmpTarget = null;
+									tmpTargetNodeId = "";
+									moveType = consts.move.TYPE_INNER;
+									tmpArrow.css({
+										"display": "none"
+									});
+									if (window.zTreeMoveTimer) {
+										clearTimeout(window.zTreeMoveTimer);
+										window.zTreeMoveTargetNodeTId = null
+									}
+								}
+
+								if (!canPrev && !canNext && !canInner) {
+									clearMove();
+								} else {
+									var tmpTargetA = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget),
+										tmpNextA = tmpTargetNode.isLastNode ? null : $("#" + tmpTargetNode.getNextNode().tId + consts.id.A, tmpTarget.next()),
+										tmpTop = tmpTargetA.offset().top,
+										tmpLeft = tmpTargetA.offset().left,
+										prevPercent = canPrev ? (canInner ? 0.25 : (canNext ? 0.5 : 1)) : -1,
+										nextPercent = canNext ? (canInner ? 0.75 : (canPrev ? 0.5 : 0)) : -1,
+										dY_percent = (event.clientY + docScrollTop - tmpTop) / tmpTargetA.height();
+
+									if ((prevPercent == 1 || dY_percent <= prevPercent && dY_percent >= -.2) && canPrev) {
+										dX = 1 - tmpArrow.width();
+										dY = tmpTop - tmpArrow.height() / 2;
+										moveType = consts.move.TYPE_PREV;
+									} else if ((nextPercent == 0 || dY_percent >= nextPercent && dY_percent <= 1.2) && canNext) {
+										dX = 1 - tmpArrow.width();
+										dY = (tmpNextA == null || (tmpTargetNode.isParent && tmpTargetNode.open)) ? (tmpTop + tmpTargetA.height() - tmpArrow.height() / 2) : (tmpNextA.offset().top - tmpArrow.height() / 2);
+										moveType = consts.move.TYPE_NEXT;
+									} else if (canInner) {
+										dX = 5 - tmpArrow.width();
+										dY = tmpTop;
+										moveType = consts.move.TYPE_INNER;
+									} else {
+										clearMove();
+									}
+
+									if (tmpTarget) {
+										tmpArrow.css({
+											"display": "block",
+											"top": dY + "px",
+											"left": (tmpLeft + dX) + "px"
+										});
+										tmpTargetA.addClass(consts.node.TMPTARGET_NODE + "_" + moveType);
+
+										if (preTmpTargetNodeId != tmpTargetNodeId || preTmpMoveType != moveType) {
+											startTime = (new Date()).getTime();
+										}
+										if (tmpTargetNode && tmpTargetNode.isParent && moveType == consts.move.TYPE_INNER) {
+											var startTimer = true;
+											if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId !== tmpTargetNode.tId) {
+												clearTimeout(window.zTreeMoveTimer);
+												window.zTreeMoveTargetNodeTId = null;
+											} else if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId === tmpTargetNode.tId) {
+												startTimer = false;
+											}
+											if (startTimer) {
+												window.zTreeMoveTimer = setTimeout(function () {
+													if (moveType != consts.move.TYPE_INNER) return;
+													if (tmpTargetNode && tmpTargetNode.isParent && !tmpTargetNode.open && (new Date()).getTime() - startTime > targetSetting.edit.drag.autoOpenTime &&
+														tools.apply(targetSetting.callback.beforeDragOpen, [targetSetting.treeId, tmpTargetNode], true)) {
+														view.switchNode(targetSetting, tmpTargetNode);
+														if (targetSetting.edit.drag.autoExpandTrigger) {
+															targetSetting.treeObj.trigger(consts.event.EXPAND, [targetSetting.treeId, tmpTargetNode]);
+														}
+													}
+												}, targetSetting.edit.drag.autoOpenTime + 50);
+												window.zTreeMoveTargetNodeTId = tmpTargetNode.tId;
+											}
+										}
+									}
+								}
+							} else {
+								moveType = consts.move.TYPE_INNER;
+								if (tmpTarget && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, null], !!targetSetting.edit.drag.inner)) {
+									tmpTarget.addClass(consts.node.TMPTARGET_TREE);
+								} else {
+									tmpTarget = null;
+								}
+								tmpArrow.css({
+									"display": "none"
+								});
+								if (window.zTreeMoveTimer) {
+									clearTimeout(window.zTreeMoveTimer);
+									window.zTreeMoveTargetNodeTId = null;
+								}
+							}
+							preTmpTargetNodeId = tmpTargetNodeId;
+							preTmpMoveType = moveType;
+
+							setting.treeObj.trigger(consts.event.DRAGMOVE, [event, setting.treeId, nodes]);
+						}
+						return false;
+					}
+
+					doc.bind("mouseup", _docMouseUp);
+
+					function _docMouseUp(event) {
+						if (window.zTreeMoveTimer) {
+							clearTimeout(window.zTreeMoveTimer);
+							window.zTreeMoveTargetNodeTId = null;
+						}
+						preTmpTargetNodeId = null;
+						preTmpMoveType = null;
+						doc.unbind("mousemove", _docMouseMove);
+						doc.unbind("mouseup", _docMouseUp);
+						doc.unbind("selectstart", _docSelect);
+						body.css("cursor", "");
+						if (tmpTarget) {
+							tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
+							if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
+								.removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
+						}
+						tools.showIfameMask(setting, false);
+
+						roots.showHoverDom = true;
+						if (root.dragFlag == 0) return;
+						root.dragFlag = 0;
+
+						var i, l, tmpNode;
+						for (i = 0, l = nodes.length; i < l; i++) {
+							tmpNode = nodes[i];
+							if (tmpNode.isParent && root.dragNodeShowBefore[tmpNode.tId] && !tmpNode.open) {
+								view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
+								delete root.dragNodeShowBefore[tmpNode.tId];
+							}
+						}
+
+						if (curNode) curNode.remove();
+						if (tmpArrow) tmpArrow.remove();
+
+						var isCopy = ((event.ctrlKey || event.metaKey) && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy);
+						if (!isCopy && tmpTarget && tmpTargetNodeId && nodes[0].parentTId && tmpTargetNodeId == nodes[0].parentTId && moveType == consts.move.TYPE_INNER) {
+							tmpTarget = null;
+						}
+						if (tmpTarget) {
+							var dragTargetNode = tmpTargetNodeId == null ? null : data.getNodeCache(targetSetting, tmpTargetNodeId);
+							if (tools.apply(setting.callback.beforeDrop, [targetSetting.treeId, nodes, dragTargetNode, moveType, isCopy], true) == false) {
+								view.selectNodes(sourceSetting, nodes);
+								return;
+							}
+							var newNodes = isCopy ? tools.clone(nodes) : nodes;
+
+							function dropCallback() {
+								if (isOtherTree) {
+									if (!isCopy) {
+										for (var i = 0, l = nodes.length; i < l; i++) {
+											view.removeNode(setting, nodes[i]);
+										}
+									}
+									if (moveType == consts.move.TYPE_INNER) {
+										view.addNodes(targetSetting, dragTargetNode, -1, newNodes);
+									} else {
+										view.addNodes(targetSetting, dragTargetNode.getParentNode(), moveType == consts.move.TYPE_PREV ? dragTargetNode.getIndex() : dragTargetNode.getIndex() + 1, newNodes);
+									}
+								} else {
+									if (isCopy && moveType == consts.move.TYPE_INNER) {
+										view.addNodes(targetSetting, dragTargetNode, -1, newNodes);
+									} else if (isCopy) {
+										view.addNodes(targetSetting, dragTargetNode.getParentNode(), moveType == consts.move.TYPE_PREV ? dragTargetNode.getIndex() : dragTargetNode.getIndex() + 1, newNodes);
+									} else {
+										if (moveType != consts.move.TYPE_NEXT) {
+											for (i = 0, l = newNodes.length; i < l; i++) {
+												view.moveNode(targetSetting, dragTargetNode, newNodes[i], moveType, false);
+											}
+										} else {
+											for (i = -1, l = newNodes.length - 1; i < l; l--) {
+												view.moveNode(targetSetting, dragTargetNode, newNodes[l], moveType, false);
+											}
+										}
+									}
+								}
+								view.selectNodes(targetSetting, newNodes);
+
+								var a = $$(newNodes[0], setting).get(0);
+								view.scrollIntoView(a);
+
+								setting.treeObj.trigger(consts.event.DROP, [event, targetSetting.treeId, newNodes, dragTargetNode, moveType, isCopy]);
+							}
+
+							if (moveType == consts.move.TYPE_INNER && tools.canAsync(targetSetting, dragTargetNode)) {
+								view.asyncNode(targetSetting, dragTargetNode, false, dropCallback);
+							} else {
+								dropCallback();
+							}
+
+						} else {
+							view.selectNodes(sourceSetting, nodes);
+							setting.treeObj.trigger(consts.event.DROP, [event, setting.treeId, nodes, null, null, null]);
+						}
+					}
+
+					doc.bind("selectstart", _docSelect);
+
+					function _docSelect() {
+						return false;
+					}
+
+					//Avoid FireFox's Bug
+					//If zTree Div CSS set 'overflow', so drag node outside of zTree, and event.target is error.
+					if (eventMouseDown.preventDefault) {
+						eventMouseDown.preventDefault();
+					}
+					return true;
+				}
+			},
+			//method of tools for zTree
+			_tools = {
+				getAbs: function (obj) {
+					var oRect = obj.getBoundingClientRect(),
+						scrollTop = document.body.scrollTop + document.documentElement.scrollTop,
+						scrollLeft = document.body.scrollLeft + document.documentElement.scrollLeft;
+					return [oRect.left + scrollLeft, oRect.top + scrollTop];
+				},
+				inputFocus: function (inputObj) {
+					if (inputObj.get(0)) {
+						inputObj.focus();
+						tools.setCursorPosition(inputObj.get(0), inputObj.val().length);
+					}
+				},
+				inputSelect: function (inputObj) {
+					if (inputObj.get(0)) {
+						inputObj.focus();
+						inputObj.select();
+					}
+				},
+				setCursorPosition: function (obj, pos) {
+					if (obj.setSelectionRange) {
+						obj.focus();
+						obj.setSelectionRange(pos, pos);
+					} else if (obj.createTextRange) {
+						var range = obj.createTextRange();
+						range.collapse(true);
+						range.moveEnd('character', pos);
+						range.moveStart('character', pos);
+						range.select();
+					}
+				},
+				showIfameMask: function (setting, showSign) {
+					var root = data.getRoot(setting);
+					//clear full mask
+					while (root.dragMaskList.length > 0) {
+						root.dragMaskList[0].remove();
+						root.dragMaskList.shift();
+					}
+					if (showSign) {
+						//show mask
+						var iframeList = $$("iframe", setting);
+						for (var i = 0, l = iframeList.length; i < l; i++) {
+							var obj = iframeList.get(i),
+								r = tools.getAbs(obj),
+								dragMask = $$("<div id='zTreeMask_" + i + "' class='zTreeMask' style='top:" + r[1] + "px; left:" + r[0] + "px; width:" + obj.offsetWidth + "px; height:" + obj.offsetHeight + "px;'></div>", setting);
+							dragMask.appendTo($$("body", setting));
+							root.dragMaskList.push(dragMask);
+						}
+					}
+				}
+			},
+			//method of operate ztree dom
+			_view = {
+				addEditBtn: function (setting, node) {
+					if (node.editNameFlag || $$(node, consts.id.EDIT, setting).length > 0) {
+						return;
+					}
+					if (!tools.apply(setting.edit.showRenameBtn, [setting.treeId, node], setting.edit.showRenameBtn)) {
+						return;
+					}
+					var aObj = $$(node, consts.id.A, setting),
+						editStr = "<span class='" + consts.className.BUTTON + " edit' id='" + node.tId + consts.id.EDIT + "' title='" + tools.apply(setting.edit.renameTitle, [setting.treeId, node], setting.edit.renameTitle) + "' treeNode" + consts.id.EDIT + " style='display:none;'></span>";
+					aObj.append(editStr);
+
+					$$(node, consts.id.EDIT, setting).bind('click',
+						function () {
+							if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeEditName, [setting.treeId, node], true) == false) return false;
+							view.editNode(setting, node);
+							return false;
+						}
+					).show();
+				},
+				addRemoveBtn: function (setting, node) {
+					if (node.editNameFlag || $$(node, consts.id.REMOVE, setting).length > 0) {
+						return;
+					}
+					if (!tools.apply(setting.edit.showRemoveBtn, [setting.treeId, node], setting.edit.showRemoveBtn)) {
+						return;
+					}
+					var aObj = $$(node, consts.id.A, setting),
+						removeStr = "<span class='" + consts.className.BUTTON + " remove' id='" + node.tId + consts.id.REMOVE + "' title='" + tools.apply(setting.edit.removeTitle, [setting.treeId, node], setting.edit.removeTitle) + "' treeNode" + consts.id.REMOVE + " style='display:none;'></span>";
+					aObj.append(removeStr);
+
+					$$(node, consts.id.REMOVE, setting).bind('click',
+						function () {
+							if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return false;
+							view.removeNode(setting, node);
+							setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
+							return false;
+						}
+					).bind('mousedown',
+						function (eventMouseDown) {
+							return true;
+						}
+					).show();
+				},
+				addHoverDom: function (setting, node) {
+					if (data.getRoots().showHoverDom) {
+						node.isHover = true;
+						if (setting.edit.enable) {
+							view.addEditBtn(setting, node);
+							view.addRemoveBtn(setting, node);
+						}
+						tools.apply(setting.view.addHoverDom, [setting.treeId, node]);
+					}
+				},
+				cancelCurEditNode: function (setting, forceName, isCancel) {
+					var root = data.getRoot(setting),
+						nameKey = setting.data.key.name,
+						node = root.curEditNode;
+
+					if (node) {
+						var inputObj = root.curEditInput,
+							newName = forceName ? forceName : (isCancel ? node[nameKey] : inputObj.val());
+						if (tools.apply(setting.callback.beforeRename, [setting.treeId, node, newName, isCancel], true) === false) {
+							return false;
+						}
+						node[nameKey] = newName;
+						var aObj = $$(node, consts.id.A, setting);
+						aObj.removeClass(consts.node.CURSELECTED_EDIT);
+						inputObj.unbind();
+						view.setNodeName(setting, node);
+						node.editNameFlag = false;
+						root.curEditNode = null;
+						root.curEditInput = null;
+						view.selectNode(setting, node, false);
+						setting.treeObj.trigger(consts.event.RENAME, [setting.treeId, node, isCancel]);
+					}
+					root.noSelection = true;
+					return true;
+				},
+				editNode: function (setting, node) {
+					var root = data.getRoot(setting);
+					view.editNodeBlur = false;
+					if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
+						setTimeout(function () {
+							tools.inputFocus(root.curEditInput);
+						}, 0);
+						return;
+					}
+					var nameKey = setting.data.key.name;
+					node.editNameFlag = true;
+					view.removeTreeDom(setting, node);
+					view.cancelCurEditNode(setting);
+					view.selectNode(setting, node, false);
+					$$(node, consts.id.SPAN, setting).html("<input type=text class='rename' id='" + node.tId + consts.id.INPUT + "' treeNode" + consts.id.INPUT + " >");
+					var inputObj = $$(node, consts.id.INPUT, setting);
+					inputObj.attr("value", node[nameKey]);
+					if (setting.edit.editNameSelectAll) {
+						tools.inputSelect(inputObj);
+					} else {
+						tools.inputFocus(inputObj);
+					}
+
+					inputObj.bind('blur', function (event) {
+						if (!view.editNodeBlur) {
+							view.cancelCurEditNode(setting);
+						}
+					}).bind('keydown', function (event) {
+						if (event.keyCode == "13") {
+							view.editNodeBlur = true;
+							view.cancelCurEditNode(setting);
+						} else if (event.keyCode == "27") {
+							view.cancelCurEditNode(setting, null, true);
+						}
+					}).bind('click', function (event) {
+						return false;
+					}).bind('dblclick', function (event) {
+						return false;
+					});
+
+					$$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED_EDIT);
+					root.curEditInput = inputObj;
+					root.noSelection = false;
+					root.curEditNode = node;
+				},
+				moveNode: function (setting, targetNode, node, moveType, animateFlag, isSilent) {
+					var root = data.getRoot(setting),
+						childKey = setting.data.key.children;
+					if (targetNode == node) return;
+					if (setting.data.keep.leaf && targetNode && !targetNode.isParent && moveType == consts.move.TYPE_INNER) return;
+					var oldParentNode = (node.parentTId ? node.getParentNode() : root),
+						targetNodeIsRoot = (targetNode === null || targetNode == root);
+					if (targetNodeIsRoot && targetNode === null) targetNode = root;
+					if (targetNodeIsRoot) moveType = consts.move.TYPE_INNER;
+					var targetParentNode = (targetNode.parentTId ? targetNode.getParentNode() : root);
+
+					if (moveType != consts.move.TYPE_PREV && moveType != consts.move.TYPE_NEXT) {
+						moveType = consts.move.TYPE_INNER;
+					}
+
+					if (moveType == consts.move.TYPE_INNER) {
+						if (targetNodeIsRoot) {
+							//parentTId of root node is null
+							node.parentTId = null;
+						} else {
+							if (!targetNode.isParent) {
+								targetNode.isParent = true;
+								targetNode.open = !!targetNode.open;
+								view.setNodeLineIcos(setting, targetNode);
+							}
+							node.parentTId = targetNode.tId;
+						}
+					}
+
+					//move node Dom
+					var targetObj, target_ulObj;
+					if (targetNodeIsRoot) {
+						targetObj = setting.treeObj;
+						target_ulObj = targetObj;
+					} else {
+						if (!isSilent && moveType == consts.move.TYPE_INNER) {
+							view.expandCollapseNode(setting, targetNode, true, false);
+						} else if (!isSilent) {
+							view.expandCollapseNode(setting, targetNode.getParentNode(), true, false);
+						}
+						targetObj = $$(targetNode, setting);
+						target_ulObj = $$(targetNode, consts.id.UL, setting);
+						if (!!targetObj.get(0) && !target_ulObj.get(0)) {
+							var ulstr = [];
+							view.makeUlHtml(setting, targetNode, ulstr, '');
+							targetObj.append(ulstr.join(''));
+						}
+						target_ulObj = $$(targetNode, consts.id.UL, setting);
+					}
+					var nodeDom = $$(node, setting);
+					if (!nodeDom.get(0)) {
+						nodeDom = view.appendNodes(setting, node.level, [node], null, -1, false, true).join('');
+					} else if (!targetObj.get(0)) {
+						nodeDom.remove();
+					}
+					if (target_ulObj.get(0) && moveType == consts.move.TYPE_INNER) {
+						target_ulObj.append(nodeDom);
+					} else if (targetObj.get(0) && moveType == consts.move.TYPE_PREV) {
+						targetObj.before(nodeDom);
+					} else if (targetObj.get(0) && moveType == consts.move.TYPE_NEXT) {
+						targetObj.after(nodeDom);
+					}
+
+					//repair the data after move
+					var i, l,
+						tmpSrcIndex = -1,
+						tmpTargetIndex = 0,
+						oldNeighbor = null,
+						newNeighbor = null,
+						oldLevel = node.level;
+					if (node.isFirstNode) {
+						tmpSrcIndex = 0;
+						if (oldParentNode[childKey].length > 1) {
+							oldNeighbor = oldParentNode[childKey][1];
+							oldNeighbor.isFirstNode = true;
+						}
+					} else if (node.isLastNode) {
+						tmpSrcIndex = oldParentNode[childKey].length - 1;
+						oldNeighbor = oldParentNode[childKey][tmpSrcIndex - 1];
+						oldNeighbor.isLastNode = true;
+					} else {
+						for (i = 0, l = oldParentNode[childKey].length; i < l; i++) {
+							if (oldParentNode[childKey][i].tId == node.tId) {
+								tmpSrcIndex = i;
+								break;
+							}
+						}
+					}
+					if (tmpSrcIndex >= 0) {
+						oldParentNode[childKey].splice(tmpSrcIndex, 1);
+					}
+					if (moveType != consts.move.TYPE_INNER) {
+						for (i = 0, l = targetParentNode[childKey].length; i < l; i++) {
+							if (targetParentNode[childKey][i].tId == targetNode.tId) tmpTargetIndex = i;
+						}
+					}
+					if (moveType == consts.move.TYPE_INNER) {
+						if (!targetNode[childKey]) targetNode[childKey] = new Array();
+						if (targetNode[childKey].length > 0) {
+							newNeighbor = targetNode[childKey][targetNode[childKey].length - 1];
+							newNeighbor.isLastNode = false;
+						}
+						targetNode[childKey].splice(targetNode[childKey].length, 0, node);
+						node.isLastNode = true;
+						node.isFirstNode = (targetNode[childKey].length == 1);
+					} else if (targetNode.isFirstNode && moveType == consts.move.TYPE_PREV) {
+						targetParentNode[childKey].splice(tmpTargetIndex, 0, node);
+						newNeighbor = targetNode;
+						newNeighbor.isFirstNode = false;
+						node.parentTId = targetNode.parentTId;
+						node.isFirstNode = true;
+						node.isLastNode = false;
+
+					} else if (targetNode.isLastNode && moveType == consts.move.TYPE_NEXT) {
+						targetParentNode[childKey].splice(tmpTargetIndex + 1, 0, node);
+						newNeighbor = targetNode;
+						newNeighbor.isLastNode = false;
+						node.parentTId = targetNode.parentTId;
+						node.isFirstNode = false;
+						node.isLastNode = true;
+
+					} else {
+						if (moveType == consts.move.TYPE_PREV) {
+							targetParentNode[childKey].splice(tmpTargetIndex, 0, node);
+						} else {
+							targetParentNode[childKey].splice(tmpTargetIndex + 1, 0, node);
+						}
+						node.parentTId = targetNode.parentTId;
+						node.isFirstNode = false;
+						node.isLastNode = false;
+					}
+					data.fixPIdKeyValue(setting, node);
+					data.setSonNodeLevel(setting, node.getParentNode(), node);
+
+					//repair node what been moved
+					view.setNodeLineIcos(setting, node);
+					view.repairNodeLevelClass(setting, node, oldLevel)
+
+					//repair node's old parentNode dom
+					if (!setting.data.keep.parent && oldParentNode[childKey].length < 1) {
+						//old parentNode has no child nodes
+						oldParentNode.isParent = false;
+						oldParentNode.open = false;
+						var tmp_ulObj = $$(oldParentNode, consts.id.UL, setting),
+							tmp_switchObj = $$(oldParentNode, consts.id.SWITCH, setting),
+							tmp_icoObj = $$(oldParentNode, consts.id.ICON, setting);
+						view.replaceSwitchClass(oldParentNode, tmp_switchObj, consts.folder.DOCU);
+						view.replaceIcoClass(oldParentNode, tmp_icoObj, consts.folder.DOCU);
+						tmp_ulObj.css("display", "none");
+
+					} else if (oldNeighbor) {
+						//old neigbor node
+						view.setNodeLineIcos(setting, oldNeighbor);
+					}
+
+					//new neigbor node
+					if (newNeighbor) {
+						view.setNodeLineIcos(setting, newNeighbor);
+					}
+
+					//repair checkbox / radio
+					if (!!setting.check && setting.check.enable && view.repairChkClass) {
+						view.repairChkClass(setting, oldParentNode);
+						view.repairParentChkClassWithSelf(setting, oldParentNode);
+						if (oldParentNode != node.parent)
+							view.repairParentChkClassWithSelf(setting, node);
+					}
+
+					//expand parents after move
+					if (!isSilent) {
+						view.expandCollapseParentNode(setting, node.getParentNode(), true, animateFlag);
+					}
+				},
+				removeEditBtn: function (setting, node) {
+					$$(node, consts.id.EDIT, setting).unbind().remove();
+				},
+				removeRemoveBtn: function (setting, node) {
+					$$(node, consts.id.REMOVE, setting).unbind().remove();
+				},
+				removeTreeDom: function (setting, node) {
+					node.isHover = false;
+					view.removeEditBtn(setting, node);
+					view.removeRemoveBtn(setting, node);
+					tools.apply(setting.view.removeHoverDom, [setting.treeId, node]);
+				},
+				repairNodeLevelClass: function (setting, node, oldLevel) {
+					if (oldLevel === node.level) return;
+					var liObj = $$(node, setting),
+						aObj = $$(node, consts.id.A, setting),
+						ulObj = $$(node, consts.id.UL, setting),
+						oldClass = consts.className.LEVEL + oldLevel,
+						newClass = consts.className.LEVEL + node.level;
+					liObj.removeClass(oldClass);
+					liObj.addClass(newClass);
+					aObj.removeClass(oldClass);
+					aObj.addClass(newClass);
+					ulObj.removeClass(oldClass);
+					ulObj.addClass(newClass);
+				},
+				selectNodes: function (setting, nodes) {
+					for (var i = 0, l = nodes.length; i < l; i++) {
+						view.selectNode(setting, nodes[i], i > 0);
+					}
+				}
+			},
+
+			_z = {
+				tools: _tools,
+				view: _view,
+				event: _event,
+				data: _data
+			};
+		$.extend(true, $.fn.zTree.consts, _consts);
+		$.extend(true, $.fn.zTree._z, _z);
+
+		var zt = $.fn.zTree,
+			tools = zt._z.tools,
+			consts = zt.consts,
+			view = zt._z.view,
+			data = zt._z.data,
+			event = zt._z.event,
+			$$ = tools.$;
+
+		data.exSetting(_setting);
+		data.addInitBind(_bindEvent);
+		data.addInitUnBind(_unbindEvent);
+		data.addInitCache(_initCache);
+		data.addInitNode(_initNode);
+		data.addInitProxy(_eventProxy);
+		data.addInitRoot(_initRoot);
+		data.addZTreeTools(_zTreeTools);
+
+		var _cancelPreSelectedNode = view.cancelPreSelectedNode;
+		view.cancelPreSelectedNode = function (setting, node) {
+			var list = data.getRoot(setting).curSelectedList;
+			for (var i = 0, j = list.length; i < j; i++) {
+				if (!node || node === list[i]) {
+					view.removeTreeDom(setting, list[i]);
+					if (node) break;
+				}
+			}
+			if (_cancelPreSelectedNode) _cancelPreSelectedNode.apply(view, arguments);
+		}
+
+		var _createNodes = view.createNodes;
+		view.createNodes = function (setting, level, nodes, parentNode, index) {
+			if (_createNodes) {
+				_createNodes.apply(view, arguments);
+			}
+			if (!nodes) return;
+			if (view.repairParentChkClassWithSelf) {
+				view.repairParentChkClassWithSelf(setting, parentNode);
+			}
+		}
+
+		var _makeNodeUrl = view.makeNodeUrl;
+		view.makeNodeUrl = function (setting, node) {
+			return setting.edit.enable ? null : (_makeNodeUrl.apply(view, arguments));
+		}
+
+		var _removeNode = view.removeNode;
+		view.removeNode = function (setting, node) {
+			var root = data.getRoot(setting);
+			if (root.curEditNode === node) root.curEditNode = null;
+			if (_removeNode) {
+				_removeNode.apply(view, arguments);
+			}
+		}
+
+		var _selectNode = view.selectNode;
+		view.selectNode = function (setting, node, addFlag) {
+			var root = data.getRoot(setting);
+			if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
+				return false;
+			}
+			if (_selectNode) _selectNode.apply(view, arguments);
+			view.addHoverDom(setting, node);
+			return true;
+		}
+
+		var _uCanDo = tools.uCanDo;
+		tools.uCanDo = function (setting, e) {
+			var root = data.getRoot(setting);
+			if (e && (tools.eqs(e.type, "mouseover") || tools.eqs(e.type, "mouseout") || tools.eqs(e.type, "mousedown") || tools.eqs(e.type, "mouseup"))) {
+				return true;
+			}
+			if (root.curEditNode) {
+				view.editNodeBlur = false;
+				root.curEditInput.focus();
+			}
+			return (!root.curEditNode) && (_uCanDo ? _uCanDo.apply(view, arguments) : true);
+		}
+	})(jQuery);
+
+	//输出接口
+	exports('ztree');
+});
diff --git a/len-sys/src/main/resources/plugin/html/icon.html b/len-sys/src/main/resources/plugin/html/icon.html
index 0c6188f..c6e7a64 100644
--- a/len-sys/src/main/resources/plugin/html/icon.html
+++ b/len-sys/src/main/resources/plugin/html/icon.html
@@ -1,710 +1,711 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta charset="UTF-8">
-    <title>图标</title>
-    <link rel="stylesheet" href="../layui/css/layui.css">
-    <script type="text/javascript" src="../jquery/jquery-3.2.1.min.js"></script>
-    <script type="text/javascript" src="../layer/layer.js" charset="utf-8"></script>
-    <script type="text/javascript" src="../layui/layui.all.js" charset="utf-8"></script>
+	<meta charset="UTF-8">
+	<title>图标</title>
+	<link href="../layui/css/layui.css" rel="stylesheet">
+	<script src="../jquery/jquery-3.2.1.min.js" type="text/javascript"></script>
+	<script charset="utf-8" src="../layer/layer.js" type="text/javascript"></script>
+	<script charset="utf-8" src="../layui/layui.all.js" type="text/javascript"></script>
 </head>
 <script>
-    function getQueryString(name) {
-        var result = window.location.search.substr(1).match(new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i'));
-        if (result != null) {
-            return unescape(result[2]);
-        }
-        return null;
-    }
-    $(function () {
-        var winName=getQueryString("param.parentname");
-        $('li').on('click', function () {
-            var text = $(this).find('div').eq(1).html();
-            text = text.substring(5, text.length);
-            var frames = parent.frames;
-            frames.$("#"+winName)[0].contentWindow.$("#menu-icon").html('&'+text);
-            /*var parentFrames;
-            if (frames.length > 0) {
-                for (var f in frames) {
-                    if (frames[f].id == 'menu') {
-                        parentFrames = frames[f];
-                        break;
-                    }
-                }
-                var icon = $("#menu-icon", parentFrames);
-                icon.find('i').remove();
-                icon.append('<i class="layui-icon" id="icon" style="font-size: 25px;">&' + text + '</i>');
-            }*/
-            var index = parent.layer.getFrameIndex(window.name);
-            parent.layer.close(index);
-        });
-    });
+	function getQueryString(name) {
+		var result = window.location.search.substr(1).match(new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i'));
+		if (result != null) {
+			return unescape(result[2]);
+		}
+		return null;
+	}
+
+	$(function () {
+		var winName = getQueryString("param.parentname");
+		$('li').on('click', function () {
+			var text = $(this).find('div').eq(1).html();
+			text = text.substring(5, text.length);
+			var frames = parent.frames;
+			frames.$("#" + winName)[0].contentWindow.$("#menu-icon").html('&' + text);
+			/*var parentFrames;
+			if (frames.length > 0) {
+				for (var f in frames) {
+					if (frames[f].id == 'menu') {
+						parentFrames = frames[f];
+						break;
+					}
+				}
+				var icon = $("#menu-icon", parentFrames);
+				icon.find('i').remove();
+				icon.append('<i class="layui-icon" id="icon" style="font-size: 25px;">&' + text + '</i>');
+			}*/
+			var index = parent.layer.getFrameIndex(window.name);
+			parent.layer.close(index);
+		});
+	});
 </script>
 
 <style>
-    .layui-icon {
-        font-size: 30px;
-    }
-
-    .site-doc-icon {
-        margin-bottom: 50px;
-        font-size: 0;
-    }
-
-    .site-doc-icon li {
-        display: inline-block;
-        vertical-align: middle;
-        width: 127px;
-        line-height: 25px;
-        padding: 20px 0;
-        margin-right: -1px;
-        margin-bottom: -1px;
-        border: 1px solid #e2e2e2;
-        font-size: 14px;
-        text-align: center;
-        color: #666;
-        transition: all .3s;
-        -webkit-transition: all .3s;
-    }
+	.layui-icon {
+		font-size: 30px;
+	}
+
+	.site-doc-icon {
+		margin-bottom: 50px;
+		font-size: 0;
+	}
+
+	.site-doc-icon li {
+		display: inline-block;
+		vertical-align: middle;
+		width: 127px;
+		line-height: 25px;
+		padding: 20px 0;
+		margin-right: -1px;
+		margin-bottom: -1px;
+		border: 1px solid #e2e2e2;
+		font-size: 14px;
+		text-align: center;
+		color: #666;
+		transition: all .3s;
+		-webkit-transition: all .3s;
+	}
 </style>
 <body>
 
 <ul class="site-doc-icon">
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">主页</div>
-        <div class="code">&amp;#xe68e;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">赞</div>
-        <div class="code">&amp;#xe6c6;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">踩</div>
-        <div class="code">&amp;#xe6c5;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">男</div>
-        <div class="code">&amp;#xe662;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">女</div>
-        <div class="code">&amp;#xe661;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">相机-空心</div>
-        <div class="code">&amp;#xe660;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">相机-实心</div>
-        <div class="code">&amp;#xe65d;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">菜单-水平</div>
-        <div class="code">&amp;#xe65f;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">菜单-竖直</div>
-        <div class="code">&amp;#xe671;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">返回</div>
-        <div class="code">&amp;#xe65c;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">Hot</div>
-        <div class="code">&amp;#xe756;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">等级</div>
-        <div class="code">&amp;#xe735;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">金额-人民币</div>
-        <div class="code">&amp;#xe65e;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">金额-美元</div>
-        <div class="code">&amp;#xe659;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">位置</div>
-        <div class="code">&amp;#xe715;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">文档</div>
-        <div class="code">&amp;#xe705;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">检验</div>
-        <div class="code">&amp;#xe6b2;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">笑脸</div>
-        <div class="code">&amp;#xe6af;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">哭脸</div>
-        <div class="code">&amp;#xe69c;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">购物车1</div>
-        <div class="code">&amp;#xe698;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">购物车2</div>
-        <div class="code">&amp;#xe657;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">星级</div>
-        <div class="code">&amp;#xe658;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">上一页</div>
-        <div class="code">&amp;#xe65a;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">下一页</div>
-        <div class="code">&amp;#xe65b;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">上传-空心</div>
-        <div class="code">&amp;#xe681;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">上传-实心</div>
-        <div class="code">&amp;#xe67c;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">文件夹</div>
-        <div class="code">&amp;#xe7a0;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">应用</div>
-        <div class="code">&amp;#xe857;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">播放</div>
-        <div class="code">&amp;#xe652;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">播放暂停</div>
-        <div class="code">&amp;#xe651;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">音乐</div>
-        <div class="code">&amp;#xe6fc;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">视频</div>
-        <div class="code">&amp;#xe6ed;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">语音</div>
-        <div class="code">&amp;#xe688;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">喇叭</div>
-        <div class="code">&amp;#xe645;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">对话</div>
-        <div class="code">&amp;#xe611;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">设置</div>
-        <div class="code">&amp;#xe614;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">隐身-im</div>
-        <div class="code">&amp;#xe60f;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">搜索</div>
-        <div class="code">&amp;#xe615;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">分享</div>
-        <div class="code">&amp;#xe641;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon layui-anim layui-anim-rotate layui-anim-loop">ဂ</i>
-        <div class="name">刷新</div>
-        <div class="code">&amp;#x1002;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon layui-anim layui-anim-rotate layui-anim-loop"></i>
-        <div class="name">loading</div>
-        <div class="code">&amp;#xe63d;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon layui-anim layui-anim-rotate layui-anim-loop"></i>
-        <div class="name">loading</div>
-        <div class="code">&amp;#xe63e;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">设置</div>
-        <div class="code">&amp;#xe620;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">引擎</div>
-        <div class="code">&amp;#xe628;</div>
-    </li>
-    <li>
-        <i class="layui-icon">ဆ</i>
-        <div class="name">阅卷错号</div>
-        <div class="code">&amp;#x1006;</div>
-    </li>
-    <li>
-        <i class="layui-icon">ဇ</i>
-        <div class="name">错-</div>
-        <div class="code">&amp;#x1007;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">报表</div>
-        <div class="code">&amp;#xe629;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">star</div>
-        <div class="code">&amp;#xe600;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">圆点</div>
-        <div class="code">&amp;#xe617;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">客服</div>
-        <div class="code">&amp;#xe606;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">发布</div>
-        <div class="code">&amp;#xe609;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">21cake_list</div>
-        <div class="code">&amp;#xe60a;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">图表</div>
-        <div class="code">&amp;#xe62c;</div>
-    </li>
-    <li>
-        <i class="layui-icon">စ</i>
-        <div class="name">正确</div>
-        <div class="code">&amp;#x1005;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">换肤2</div>
-        <div class="code">&amp;#xe61b;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">在线</div>
-        <div class="code">&amp;#xe610;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">右右</div>
-        <div class="code">&amp;#xe602;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">左左</div>
-        <div class="code">&amp;#xe603;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">表格</div>
-        <div class="code">&amp;#xe62d;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">icon_树</div>
-        <div class="code">&amp;#xe62e;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">上传</div>
-        <div class="code">&amp;#xe62f;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">添加</div>
-        <div class="code">&amp;#xe61f;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">下载</div>
-        <div class="code">&amp;#xe601;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">选择模版48</div>
-        <div class="code">&amp;#xe630;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">工具</div>
-        <div class="code">&amp;#xe631;</div>
-    </li>
-
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">添加</div>
-        <div class="code">&amp;#xe654;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">编辑</div>
-        <div class="code">&amp;#xe642;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">删除</div>
-        <div class="code">&amp;#xe640;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">向下</div>
-        <div class="code">&amp;#xe61a;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">文件</div>
-        <div class="code">&amp;#xe621;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">布局</div>
-        <div class="code">&amp;#xe632;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">对勾</div>
-        <div class="code">&amp;#xe618;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">添加</div>
-        <div class="code">&amp;#xe608;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">么么直播－翻页</div>
-        <div class="code">&amp;#xe633;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">404</div>
-        <div class="code">&amp;#xe61c;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">轮播组图</div>
-        <div class="code">&amp;#xe634;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">help</div>
-        <div class="code">&amp;#xe607;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">代码1</div>
-        <div class="code">&amp;#xe635;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">进水</div>
-        <div class="code">&amp;#xe636;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">关于</div>
-        <div class="code">&amp;#xe60b;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">向上</div>
-        <div class="code">&amp;#xe619;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">日期</div>
-        <div class="code">&amp;#xe637;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">文件</div>
-        <div class="code">&amp;#xe61d;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">top</div>
-        <div class="code">&amp;#xe604;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">好友请求</div>
-        <div class="code">&amp;#xe612;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">对</div>
-        <div class="code">&amp;#xe605;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">窗口</div>
-        <div class="code">&amp;#xe638;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">表情</div>
-        <div class="code">&amp;#xe60c;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">正确</div>
-        <div class="code">&amp;#xe616;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">我的好友</div>
-        <div class="code">&amp;#xe613;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">文件下载</div>
-        <div class="code">&amp;#xe61e;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">图片</div>
-        <div class="code">&amp;#xe60d;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">链接</div>
-        <div class="code">&amp;#xe64c;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">记录</div>
-        <div class="code">&amp;#xe60e;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">文件夹</div>
-        <div class="code">&amp;#xe622;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">font-strikethrough</div>
-        <div class="code">&amp;#xe64f;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">unlink</div>
-        <div class="code">&amp;#xe64d;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">编辑_文字</div>
-        <div class="code">&amp;#xe639;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">三角</div>
-        <div class="code">&amp;#xe623;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">单选框-候选</div>
-        <div class="code">&amp;#xe63f;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">单选框-选中</div>
-        <div class="code">&amp;#xe643;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">居中对齐</div>
-        <div class="code">&amp;#xe647;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">右对齐</div>
-        <div class="code">&amp;#xe648;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">左对齐</div>
-        <div class="code">&amp;#xe649;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">勾选框（未打勾）</div>
-        <div class="code">&amp;#xe626;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">勾选框（已打勾）</div>
-        <div class="code">&amp;#xe627;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">加粗</div>
-        <div class="code">&amp;#xe62b;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">聊天 对话 IM 沟通</div>
-        <div class="code">&amp;#xe63a;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">文件夹_反</div>
-        <div class="code">&amp;#xe624;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">手机</div>
-        <div class="code">&amp;#xe63b;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">表情</div>
-        <div class="code">&amp;#xe650;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">html</div>
-        <div class="code">&amp;#xe64b;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">表单</div>
-        <div class="code">&amp;#xe63c;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">tab</div>
-        <div class="code">&amp;#xe62a;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">emw_代码</div>
-        <div class="code">&amp;#xe64e;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">字体-下划线</div>
-        <div class="code">&amp;#xe646;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">三角</div>
-        <div class="code">&amp;#xe625;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">图片</div>
-        <div class="code">&amp;#xe64a;</div>
-    </li>
-    <li>
-        <i class="layui-icon"></i>
-        <div class="name">斜体</div>
-        <div class="code">&amp;#xe644;</div>
-    </li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">主页</div>
+		<div class="code">&amp;#xe68e;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">赞</div>
+		<div class="code">&amp;#xe6c6;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">踩</div>
+		<div class="code">&amp;#xe6c5;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">男</div>
+		<div class="code">&amp;#xe662;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">女</div>
+		<div class="code">&amp;#xe661;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">相机-空心</div>
+		<div class="code">&amp;#xe660;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">相机-实心</div>
+		<div class="code">&amp;#xe65d;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">菜单-水平</div>
+		<div class="code">&amp;#xe65f;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">菜单-竖直</div>
+		<div class="code">&amp;#xe671;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">返回</div>
+		<div class="code">&amp;#xe65c;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">Hot</div>
+		<div class="code">&amp;#xe756;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">等级</div>
+		<div class="code">&amp;#xe735;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">金额-人民币</div>
+		<div class="code">&amp;#xe65e;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">金额-美元</div>
+		<div class="code">&amp;#xe659;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">位置</div>
+		<div class="code">&amp;#xe715;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">文档</div>
+		<div class="code">&amp;#xe705;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">检验</div>
+		<div class="code">&amp;#xe6b2;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">笑脸</div>
+		<div class="code">&amp;#xe6af;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">哭脸</div>
+		<div class="code">&amp;#xe69c;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">购物车1</div>
+		<div class="code">&amp;#xe698;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">购物车2</div>
+		<div class="code">&amp;#xe657;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">星级</div>
+		<div class="code">&amp;#xe658;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">上一页</div>
+		<div class="code">&amp;#xe65a;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">下一页</div>
+		<div class="code">&amp;#xe65b;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">上传-空心</div>
+		<div class="code">&amp;#xe681;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">上传-实心</div>
+		<div class="code">&amp;#xe67c;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">文件夹</div>
+		<div class="code">&amp;#xe7a0;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">应用</div>
+		<div class="code">&amp;#xe857;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">播放</div>
+		<div class="code">&amp;#xe652;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">播放暂停</div>
+		<div class="code">&amp;#xe651;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">音乐</div>
+		<div class="code">&amp;#xe6fc;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">视频</div>
+		<div class="code">&amp;#xe6ed;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">语音</div>
+		<div class="code">&amp;#xe688;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">喇叭</div>
+		<div class="code">&amp;#xe645;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">对话</div>
+		<div class="code">&amp;#xe611;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">设置</div>
+		<div class="code">&amp;#xe614;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">隐身-im</div>
+		<div class="code">&amp;#xe60f;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">搜索</div>
+		<div class="code">&amp;#xe615;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">分享</div>
+		<div class="code">&amp;#xe641;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon layui-anim layui-anim-rotate layui-anim-loop">ဂ</i>
+		<div class="name">刷新</div>
+		<div class="code">&amp;#x1002;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon layui-anim layui-anim-rotate layui-anim-loop"></i>
+		<div class="name">loading</div>
+		<div class="code">&amp;#xe63d;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon layui-anim layui-anim-rotate layui-anim-loop"></i>
+		<div class="name">loading</div>
+		<div class="code">&amp;#xe63e;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">设置</div>
+		<div class="code">&amp;#xe620;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">引擎</div>
+		<div class="code">&amp;#xe628;</div>
+	</li>
+	<li>
+		<i class="layui-icon">ဆ</i>
+		<div class="name">阅卷错号</div>
+		<div class="code">&amp;#x1006;</div>
+	</li>
+	<li>
+		<i class="layui-icon">ဇ</i>
+		<div class="name">错-</div>
+		<div class="code">&amp;#x1007;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">报表</div>
+		<div class="code">&amp;#xe629;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">star</div>
+		<div class="code">&amp;#xe600;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">圆点</div>
+		<div class="code">&amp;#xe617;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">客服</div>
+		<div class="code">&amp;#xe606;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">发布</div>
+		<div class="code">&amp;#xe609;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">21cake_list</div>
+		<div class="code">&amp;#xe60a;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">图表</div>
+		<div class="code">&amp;#xe62c;</div>
+	</li>
+	<li>
+		<i class="layui-icon">စ</i>
+		<div class="name">正确</div>
+		<div class="code">&amp;#x1005;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">换肤2</div>
+		<div class="code">&amp;#xe61b;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">在线</div>
+		<div class="code">&amp;#xe610;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">右右</div>
+		<div class="code">&amp;#xe602;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">左左</div>
+		<div class="code">&amp;#xe603;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">表格</div>
+		<div class="code">&amp;#xe62d;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">icon_树</div>
+		<div class="code">&amp;#xe62e;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">上传</div>
+		<div class="code">&amp;#xe62f;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">添加</div>
+		<div class="code">&amp;#xe61f;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">下载</div>
+		<div class="code">&amp;#xe601;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">选择模版48</div>
+		<div class="code">&amp;#xe630;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">工具</div>
+		<div class="code">&amp;#xe631;</div>
+	</li>
+
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">添加</div>
+		<div class="code">&amp;#xe654;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">编辑</div>
+		<div class="code">&amp;#xe642;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">删除</div>
+		<div class="code">&amp;#xe640;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">向下</div>
+		<div class="code">&amp;#xe61a;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">文件</div>
+		<div class="code">&amp;#xe621;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">布局</div>
+		<div class="code">&amp;#xe632;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">对勾</div>
+		<div class="code">&amp;#xe618;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">添加</div>
+		<div class="code">&amp;#xe608;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">么么直播－翻页</div>
+		<div class="code">&amp;#xe633;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">404</div>
+		<div class="code">&amp;#xe61c;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">轮播组图</div>
+		<div class="code">&amp;#xe634;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">help</div>
+		<div class="code">&amp;#xe607;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">代码1</div>
+		<div class="code">&amp;#xe635;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">进水</div>
+		<div class="code">&amp;#xe636;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">关于</div>
+		<div class="code">&amp;#xe60b;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">向上</div>
+		<div class="code">&amp;#xe619;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">日期</div>
+		<div class="code">&amp;#xe637;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">文件</div>
+		<div class="code">&amp;#xe61d;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">top</div>
+		<div class="code">&amp;#xe604;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">好友请求</div>
+		<div class="code">&amp;#xe612;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">对</div>
+		<div class="code">&amp;#xe605;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">窗口</div>
+		<div class="code">&amp;#xe638;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">表情</div>
+		<div class="code">&amp;#xe60c;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">正确</div>
+		<div class="code">&amp;#xe616;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">我的好友</div>
+		<div class="code">&amp;#xe613;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">文件下载</div>
+		<div class="code">&amp;#xe61e;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">图片</div>
+		<div class="code">&amp;#xe60d;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">链接</div>
+		<div class="code">&amp;#xe64c;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">记录</div>
+		<div class="code">&amp;#xe60e;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">文件夹</div>
+		<div class="code">&amp;#xe622;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">font-strikethrough</div>
+		<div class="code">&amp;#xe64f;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">unlink</div>
+		<div class="code">&amp;#xe64d;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">编辑_文字</div>
+		<div class="code">&amp;#xe639;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">三角</div>
+		<div class="code">&amp;#xe623;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">单选框-候选</div>
+		<div class="code">&amp;#xe63f;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">单选框-选中</div>
+		<div class="code">&amp;#xe643;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">居中对齐</div>
+		<div class="code">&amp;#xe647;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">右对齐</div>
+		<div class="code">&amp;#xe648;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">左对齐</div>
+		<div class="code">&amp;#xe649;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">勾选框（未打勾）</div>
+		<div class="code">&amp;#xe626;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">勾选框（已打勾）</div>
+		<div class="code">&amp;#xe627;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">加粗</div>
+		<div class="code">&amp;#xe62b;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">聊天 对话 IM 沟通</div>
+		<div class="code">&amp;#xe63a;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">文件夹_反</div>
+		<div class="code">&amp;#xe624;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">手机</div>
+		<div class="code">&amp;#xe63b;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">表情</div>
+		<div class="code">&amp;#xe650;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">html</div>
+		<div class="code">&amp;#xe64b;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">表单</div>
+		<div class="code">&amp;#xe63c;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">tab</div>
+		<div class="code">&amp;#xe62a;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">emw_代码</div>
+		<div class="code">&amp;#xe64e;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">字体-下划线</div>
+		<div class="code">&amp;#xe646;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">三角</div>
+		<div class="code">&amp;#xe625;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">图片</div>
+		<div class="code">&amp;#xe64a;</div>
+	</li>
+	<li>
+		<i class="layui-icon"></i>
+		<div class="name">斜体</div>
+		<div class="code">&amp;#xe644;</div>
+	</li>
 </ul>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/len-sys/src/main/resources/plugin/layui/font/iconfont.svg b/len-sys/src/main/resources/plugin/layui/font/iconfont.svg
index f407df7..5f65ab1 100644
--- a/len-sys/src/main/resources/plugin/layui/font/iconfont.svg
+++ b/len-sys/src/main/resources/plugin/layui/font/iconfont.svg
@@ -4,482 +4,786 @@
 2013-9-30: Created.
 -->
 <svg>
-<metadata>
-Created by iconfont
-</metadata>
-<defs>
+	<metadata>
+		Created by iconfont
+	</metadata>
+	<defs>
 
-<font id="layui-icon" horiz-adv-x="1024" >
-  <font-face
-    font-family="layui-icon"
-    font-weight="500"
-    font-stretch="normal"
-    units-per-em="1024"
-    ascent="896"
-    descent="-128"
-  />
-    <missing-glyph />
-    
-    <glyph glyph-name="reply-fill" unicode="&#58897;" d="M507.904 835.5840000000001q93.184 1.024 175.104-33.792t143.872-94.72 97.792-141.312 36.864-174.592q1.024-88.064-30.208-165.888t-87.04-137.728-131.072-98.816-162.304-48.128q-22.528-3.072-48.128-5.12t-56.832-3.072-69.632 0-86.528 6.144q-106.496 10.24-158.208 26.624t-41.472 18.432q54.272 9.216 93.184 29.696 20.48 11.264 16.896 32.256t-19.968 39.424q-52.224 57.344-84.48 133.632t-34.304 164.352q-1.024 93.184 33.792 175.104t95.232 143.36 142.336 97.28 175.104 36.864zM707.584 385.024q0-26.624 18.432-45.568t45.056-18.944 45.568 18.944 18.944 45.568-18.944 45.056-45.568 18.432-45.056-18.432-18.432-45.056zM450.56 385.024q0-26.624 19.456-46.08t46.08-19.456q27.648 0 46.592 19.456t18.944 46.08q0 27.648-18.944 46.592t-46.592 18.944q-26.624 0-46.08-18.944t-19.456-46.592zM196.608 386.048q0-26.624 18.944-46.08t45.568-19.456q27.648 0 46.592 19.456t18.944 46.08-18.944 45.568-46.592 18.944q-26.624 0-45.568-18.944t-18.944-45.568z"  horiz-adv-x="1024" />
+		<font id="layui-icon" horiz-adv-x="1024">
+			<font-face
+				font-family="layui-icon"
+				font-weight="500"
+				font-stretch="normal"
+				units-per-em="1024"
+				ascent="896"
+				descent="-128"
+			/>
+			<missing-glyph/>
 
-    
-    <glyph glyph-name="set-fill" unicode="&#58900;" d="M916.9398 445.2101l-69.9664 10.7833c-18.6619 2.863-38.1388 17.826-43.3424 33.2487-5.1618 15.3809-15.0883 65.4524-3.9288 80.6661l41.9004 57.135c11.1595 15.2346 9.3832 38.5985-3.9706 51.9314l-30.6364 30.6573c-13.3538 13.3538-36.7177 15.151-51.9314 3.9497l-57.135-41.8795c-15.2346-11.1804-39.4344-14.3987-53.7704-7.168-14.3569 7.2307-57.3022 35.7773-60.1652 54.4183l-10.7833 69.9664C570.3471 807.6016 552.542 822.8571 533.6712 822.8571h-43.34236734693877c-18.8709 0-36.6759-15.2555-39.5389-33.9174l-10.7833-69.9664c-2.863-18.6619-17.826-38.1388-33.2487-43.3424-15.4018-5.1827-65.4524-15.1092-80.687-3.9288L268.9567 713.5817c-15.2346 11.1804-38.6194 9.3832-51.9523-3.9497l-30.6364-30.6573c-13.3747-13.3538-15.151-36.7177-3.9706-51.9314l41.9004-57.135c11.1595-15.2346 14.3778-39.4136 7.168-53.7704-7.2307-14.3569-35.7773-57.2813-54.4183-60.1443l-69.9664-10.7833C88.3984 442.3471 73.1429 424.542 73.1429 405.6712v-43.34236734693877c0-18.8709 15.2555-36.6759 33.9174-39.5389l69.9664-10.7833c18.6619-2.863 38.1388-17.8469 43.3424-33.2487 5.1618-15.4018 15.0883-65.4733 3.9288-80.687l-41.9004-57.135c-11.1595-15.2346-9.3832-38.6194 3.9706-51.9314l30.6364-30.6573c13.3538-13.3538 36.7177-15.151 51.9523-3.9706l57.135 41.9213c15.2346 11.1386 39.4136 14.3778 53.7704 7.168 14.3569-7.2307 57.2813-35.7773 60.1443-54.4183l10.7833-69.9664c2.863-18.6619 20.6472-33.9174 39.5389-33.9174h43.34236734693877c18.8709 0 36.6759 15.2555 39.5389 33.9174l10.7833 69.9664c2.863 18.6619 17.826 38.1388 33.2487 43.3215 15.4018 5.1827 65.4524 15.0883 80.6661 3.9288l57.1559-41.9213c15.2346-11.1595 38.5985-9.3623 51.9314 3.9706l30.6364 30.6573c13.3747 13.3329 15.151 36.7177 3.9706 51.9314l-41.9004 57.135c-11.1595 15.2346-14.3778 39.4136-7.168 53.7496 7.2307 14.3778 35.7773 57.3231 54.4183 60.1861l69.9664 10.7833c18.6619 2.863 33.9174 20.6472 33.9174 39.5389v43.34236734693877C950.8571 424.542 935.6016 442.3471 916.9398 445.2101zM512 210.4633c-95.838 0-173.5367 77.6986-173.5367 173.5367s77.6986 173.5367 173.5367 173.5367 173.5367-77.6986 173.5367-173.5367S607.838 210.4633 512 210.4633zM512 384m-104.7824 0a5.014 5.014 0 1 1 209.5647 0 5.014 5.014 0 1 1-209.5647 0Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="reply-fill" unicode="&#58897;"
+				   d="M507.904 835.5840000000001q93.184 1.024 175.104-33.792t143.872-94.72 97.792-141.312 36.864-174.592q1.024-88.064-30.208-165.888t-87.04-137.728-131.072-98.816-162.304-48.128q-22.528-3.072-48.128-5.12t-56.832-3.072-69.632 0-86.528 6.144q-106.496 10.24-158.208 26.624t-41.472 18.432q54.272 9.216 93.184 29.696 20.48 11.264 16.896 32.256t-19.968 39.424q-52.224 57.344-84.48 133.632t-34.304 164.352q-1.024 93.184 33.792 175.104t95.232 143.36 142.336 97.28 175.104 36.864zM707.584 385.024q0-26.624 18.432-45.568t45.056-18.944 45.568 18.944 18.944 45.568-18.944 45.056-45.568 18.432-45.056-18.432-18.432-45.056zM450.56 385.024q0-26.624 19.456-46.08t46.08-19.456q27.648 0 46.592 19.456t18.944 46.08q0 27.648-18.944 46.592t-46.592 18.944q-26.624 0-46.08-18.944t-19.456-46.592zM196.608 386.048q0-26.624 18.944-46.08t45.568-19.456q27.648 0 46.592 19.456t18.944 46.08-18.944 45.568-46.592 18.944q-26.624 0-45.568-18.944t-18.944-45.568z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="menu-fill" unicode="&#58895;" d="M511.999488 834.254727c-248.678712 0-450.273176-201.585181-450.273176-450.254727s201.594464-450.254727 450.273176-450.254727 450.273176 201.585181 450.273176 450.254727S760.6782 834.254727 511.999488 834.254727zM266.371377 589.705012l491.256222 0 0-33.772174L266.371377 555.932838 266.371377 589.705012zM757.627599 178.29396499999996L266.371377 178.29396499999996l0 33.773198 491.256222 0L757.627599 178.29396499999996zM140.487278 367.11340099999995l0 33.771151 743.024421 0 0-33.771151L140.487278 367.11340099999995z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="search" unicode="&#58901;" d="M439.323351 120.52219c-49.280352 0-97.09834 9.656941-142.126681 28.699646-43.480015 18.388812-82.522793 44.706201-116.043584 78.225619s-59.841305 72.560596-78.230871 116.03883C83.878729 388.513804 74.222416 436.330856 74.222416 485.609189c0 49.284473 9.656313 97.104595 28.699798 142.133138 18.388542 43.479257 44.71008 82.520435 78.231894 116.03883 33.518745 33.515325 72.562546 59.832713 116.043584 78.219479 45.027318 19.039635 92.846329 28.694529 142.125658 28.694529 49.280352 0 97.099364-9.653871 142.126681-28.694529 43.481039-18.385742 82.525863-44.704155 116.044608-78.220502 33.520791-33.518395 59.842328-72.559573 78.230871-116.03883 19.042462-45.028543 28.699798-92.848665 28.699798-142.133138 0-49.278333-9.657336-97.095385-28.701845-142.122905-18.388542-43.47721-44.708033-82.520435-78.228824-116.03883s-72.563569-59.838853-116.043584-78.226642C536.422715 130.177084 488.603703 120.52219 439.323351 120.52219zM439.323351 797.483242c-171.975699 0-311.887855-139.906423-311.887855-311.875077S267.347652 173.734112 439.323351 173.734112s311.887855 139.907447 311.887855 311.874053S611.299051 797.483242 439.323351 797.483242zM890.678206-48.734702c-22.121716 0-42.90387 8.562003-58.541653 24.115234L674.672953 128.025071l37.039062 38.20616 157.888289-153.058978c5.606924-5.606695 13.091693-8.692986 21.077901-8.692986 7.983139 0 15.464837 3.087315 21.070738 8.69094 5.616135 5.622044 8.715856 13.126972 8.715856 21.123087 0 7.980765-3.091535 15.46318-8.702552 21.067828l-0.301888 0.306992L758.714395 213.230662l38.207726 37.035498 152.611906-157.427472c15.571265-15.638165 24.144876-36.422538 24.144876-58.549487 0-22.195511-8.625801-43.054585-24.287121-58.735729C933.723298-40.112324 912.876674-48.734702 890.678206-48.734702zM281.015489 327.245392c-42.340005 42.320874-65.652899 98.584296-65.643689 158.421102 0.008187 59.818387 23.319034 116.074645 65.637549 158.4078l37.634651-37.619806c-66.60666-66.629513-66.60973-175.00071-0.007163-241.577011L281.015489 327.245392z"  horiz-adv-x="1024" />
+			<glyph glyph-name="set-fill" unicode="&#58900;"
+				   d="M916.9398 445.2101l-69.9664 10.7833c-18.6619 2.863-38.1388 17.826-43.3424 33.2487-5.1618 15.3809-15.0883 65.4524-3.9288 80.6661l41.9004 57.135c11.1595 15.2346 9.3832 38.5985-3.9706 51.9314l-30.6364 30.6573c-13.3538 13.3538-36.7177 15.151-51.9314 3.9497l-57.135-41.8795c-15.2346-11.1804-39.4344-14.3987-53.7704-7.168-14.3569 7.2307-57.3022 35.7773-60.1652 54.4183l-10.7833 69.9664C570.3471 807.6016 552.542 822.8571 533.6712 822.8571h-43.34236734693877c-18.8709 0-36.6759-15.2555-39.5389-33.9174l-10.7833-69.9664c-2.863-18.6619-17.826-38.1388-33.2487-43.3424-15.4018-5.1827-65.4524-15.1092-80.687-3.9288L268.9567 713.5817c-15.2346 11.1804-38.6194 9.3832-51.9523-3.9497l-30.6364-30.6573c-13.3747-13.3538-15.151-36.7177-3.9706-51.9314l41.9004-57.135c11.1595-15.2346 14.3778-39.4136 7.168-53.7704-7.2307-14.3569-35.7773-57.2813-54.4183-60.1443l-69.9664-10.7833C88.3984 442.3471 73.1429 424.542 73.1429 405.6712v-43.34236734693877c0-18.8709 15.2555-36.6759 33.9174-39.5389l69.9664-10.7833c18.6619-2.863 38.1388-17.8469 43.3424-33.2487 5.1618-15.4018 15.0883-65.4733 3.9288-80.687l-41.9004-57.135c-11.1595-15.2346-9.3832-38.6194 3.9706-51.9314l30.6364-30.6573c13.3538-13.3538 36.7177-15.151 51.9523-3.9706l57.135 41.9213c15.2346 11.1386 39.4136 14.3778 53.7704 7.168 14.3569-7.2307 57.2813-35.7773 60.1443-54.4183l10.7833-69.9664c2.863-18.6619 20.6472-33.9174 39.5389-33.9174h43.34236734693877c18.8709 0 36.6759 15.2555 39.5389 33.9174l10.7833 69.9664c2.863 18.6619 17.826 38.1388 33.2487 43.3215 15.4018 5.1827 65.4524 15.0883 80.6661 3.9288l57.1559-41.9213c15.2346-11.1595 38.5985-9.3623 51.9314 3.9706l30.6364 30.6573c13.3747 13.3329 15.151 36.7177 3.9706 51.9314l-41.9004 57.135c-11.1595 15.2346-14.3778 39.4136-7.168 53.7496 7.2307 14.3778 35.7773 57.3231 54.4183 60.1861l69.9664 10.7833c18.6619 2.863 33.9174 20.6472 33.9174 39.5389v43.34236734693877C950.8571 424.542 935.6016 442.3471 916.9398 445.2101zM512 210.4633c-95.838 0-173.5367 77.6986-173.5367 173.5367s77.6986 173.5367 173.5367 173.5367 173.5367-77.6986 173.5367-173.5367S607.838 210.4633 512 210.4633zM512 384m-104.7824 0a5.014 5.014 0 1 1 209.5647 0 5.014 5.014 0 1 1-209.5647 0Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="share" unicode="&#58945;" d="M769.714 306.453c-51.754 0-97.702-24.851-126.571-63.269L394.479 367.94100000000003c3.93 13.798 6.034 28.364 6.034 43.424 0 16.496-2.527 32.399-7.211 47.35l247.724 124.288c28.71-40.052 75.647-66.151 128.687-66.151 87.388 0 158.229 70.84 158.229 158.229 0 87.388-70.841 158.229-158.229 158.229-87.389 0-158.229-70.841-158.229-158.229 0-6.046 0.352-12.009 1.011-17.88L351.22 526.116c-28.371 26.943-66.723 43.479-108.938 43.479-87.388 0-158.229-70.84-158.229-158.229s70.84-158.229 158.229-158.229c43.752 0 83.354 17.758 111.997 46.459l258.676-129.779c-0.964-7.062-1.474-14.266-1.474-21.592 0-87.389 70.84-158.229 158.229-158.229s158.229 70.84 158.229 158.229C927.938 235.61199999999997 857.103 306.453 769.714 306.453L769.714 306.453z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="set-sm" unicode="&#58912;" d="M946.367 405.895c0.02 21.85-13.04 38.49-31.74 41.57-18.69 3.07-79.05 13.01-85.99 14.14-6.95 1.15-14.09 8.07-15.4 11.45-1.32 3.37-8.94 22.2-11.87 29.46-2.95 7.27-1.92 16.58 4.39 25.52 6.3 8.93 39.9 55.87 48.38 67.72 8.49 11.87 8.65 34.61-4.84 48.39-13.48 13.78-47.75 47.09-56.73 55.86-8.99 8.76-31.08 8.64-42.67 0.43-11.58-8.2-71.69-51.01-71.69-51.01s-9.97-6.89-20.67-2.64c-10.7 4.24-33.43 14.07-33.43 14.07s-7.19 5.43-9.68 19.79c-2.5 14.37-11.11 65.28-14.07 82.7-2.97 17.42-20.67 29.62-37.83 29.46-17.16-0.14-57.91 0-74.33 0s-32.26-15.68-34.75-29.46c-2.49-13.79-11.56-69.16-14.07-84.45-2.52-15.3-11.44-18.48-11.44-18.48s-19.56-8.06-29.91-12.31c-10.34-4.26-15.39-2.64-30.35 7.48-14.95 10.11-44.74 31.03-63.04 43.83-18.3 12.81-38.12 7.92-49.26-3.52s-36.06-35.77-51.02-50.43c-14.95-14.66-12.61-37.54 0.58-55.71 13.2-18.18 32.34-45.43 41.35-58.21 9.01-12.78 10.84-19.5 8.36-26.82-2.49-7.34-6.64-16.58-11.43-27.72-4.81-11.13-9.69-13.64-27.86-17.01-17.36-3.21-58.42-9.92-77.4-13.31-18.99-3.37-30.66-21.43-30.66-41.81l0-64.66c0-24.34 13.2-37.24 38.42-41.93 25.22-4.69 62.66-10.66 74.77-12.61 12.1-1.95 17.67-6.6 21.41-15.54 3.73-8.94 5.13-10.12 9.37-22.57 4.26-12.47 6.46-15.55-4.98-31.67-11.44-16.13-34.31-48.11-46.03-64.51-11.74-16.4-6.45-37.83 4.98-49.85 11.44-12.03 35.47-35.64 48.97-48.97 13.49-13.33 35.19-16.28 53.36-3.52 18.19 12.75 54.98 38.99 65.69 46.62 10.7 7.63 21.91 5.28 27.85 2.94 5.94-2.35 11.25-4.6 22-9.1 10.73-4.48 13.85-11.2 16.41-23.45 2.57-12.24 10.19-56.85 13.93-78.59 3.75-21.72 18.91-33.43 40.62-33.72 21.7-0.29 33.27-0.12 61.57 0 28.29 0.13 41.86 12.61 45.45 31.38 3.59 18.76 12.45 72.94 14.22 83.72 1.78 10.76 5.94 14.73 13.63 18.47 7.7 3.74 14.32 6.47 26.84 11.88 12.51 5.4 18.91 0.66 27.7-5.72 8.8-6.39 47.51-33.78 63.78-45.31 16.28-11.53 36.73-10.33 51.9 4.4 15.18 14.73 31.62 30.99 49.27 48.38 17.64 17.4 12.16 39.59 4.4 51.46-7.77 11.88-44.49 62.95-49.71 70.23-5.21 7.28-4.4 18.62-1.75 24.63 2.64 6.01 8.44 18.24 11.72 25.22 3.29 6.97 9.6 11.22 18.18 12.9 8.58 1.69 62.72 11 83.75 14.61 21.03 3.64 31.11 19.92 31.26 39.92C946.427 359.93499999999995 946.347 388.525 946.367 405.895zM908.587 338.615c0.21-5.76-4.66-10.65-8.82-11.38-4.17-0.73-63.26-11.38-81.48-14.29-18.21-2.92-33.23-15.07-38.72-28.06-3.98-9.44-5.47-13.51-10.59-26.96-5.12-13.44-4.64-32.19 2.56-42.26 7.2-10.08 46.82-64.9 50.38-70.45s4.27-11.95-1.28-17.5-40.99-41.2-47.39-47.39c-6.41-6.19-11.83-4.8-18.79 0-6.95 4.8-39.61 26.39-64.44 44.36-16.96 12.28-32.82 12.43-48.7 6.02-15.87-6.42 1.28 0.28-22.2-8.97-23.48-9.25-30.23-27.62-33.73-48.24-3.5-20.63-10.67-62.98-11.95-70.45-1.28-7.47-5.55-11.1-13.66-11.1l-64.9 0c-8.11 0-11.74 2.99-14.52 11.95-2.77 8.97-10.03 54.87-12.8 74.29-2.78 19.43-13.82 36.12-24.77 40.56-10.94 4.45-4.98 2.14-27.32 11.1-22.34 8.97-39.63 4.5-51.23-3.84-11.61-8.34-58.64-42.69-65.33-46.96-6.68-4.28-14.65-3.28-18.35 0.42-3.7 3.7-40.56 40.56-46.54 46.54-5.98 5.98-5.36 12.92 0 20.49 5.36 7.58 28.39 40.76 40.99 57.95 12.59 17.2 17.93 34.74 9.82 53.49-8.12 18.74-4.42 10.24-12.39 28.6-7.96 18.36-24.28 24.46-38.42 26.9-14.14 2.43-68.88 11.53-76.85 13.23-7.97 1.71-11.95 7.26-11.95 14.09l0 66.18c0 9.53 7.67 12.44 12.38 13.23 4.7 0.8 54.22 9.18 73 12.39 18.79 3.2 36.36 11.32 43.55 29.03 7.19 17.7 4.27 11.1 11.1 27.32 6.83 16.23 3.8 33.94-7.68 49.96-11.49 16.01-38.85 54-44.4 61.9-5.55 7.9-5.77 12.6 0.85 19.21 6.62 6.62 42.05 42.48 46.96 46.97 4.91 4.48 12.07 5.4 18.36 0.85 6.3-4.55 49.31-35.65 64.04-46.11 14.73-10.46 32.35-12.56 49.1-5.55 16.75 7.02 10.25 4.48 26.9 11.1s24.84 19.09 28.18 39.71c3.33 20.61 11.95 74.14 12.81 77.7 0.85 3.55 5.55 10.46 11.74 10.46s65.82-0.07 69.8 0c3.99 0.07 10.3-3.29 11.32-9.18 1.02-5.9 13.02-74.29 14.94-86.25 1.92-11.95 15.58-28.57 25.54-32.73 9.96-4.16 21.35-8.75 31.31-13.09 9.97-4.34 30.13-1.91 36.15 2.28 6.03 4.18 70.52 48.81 75.43 52.37 4.91 3.56 11.52 3.27 17.64-2.85s43.34-43.19 47.54-47.53c4.19-4.34 4.66-8.66 1.14-13.66-3.53-5.01-36.72-51.8-47.54-67.46-10.81-15.65-11.73-33.73-5.41-48.96 6.33-15.22 3.99-9.39 9.11-21.91 5.13-12.53 16.28-29.03 33.59-31.88 17.31-2.85 76.92-12.74 84.82-13.95 7.9-1.21 11.1-7.18 11.1-13.37S908.377 344.385 908.587 338.615zM526.833 573.1949999999999c-110.45 0-200-89.54-200-200s89.55-200 200-200c110.46 0 200 89.54 200 200S637.293 573.1949999999999 526.833 573.1949999999999zM526.833 208.19500000000005c-91.12 0-165 73.87-165 165s73.88 165 165 165c91.13 0 165-73.87 165-165S617.963 208.19500000000005 526.833 208.19500000000005z"  horiz-adv-x="1024" />
+			<glyph glyph-name="menu-fill" unicode="&#58895;"
+				   d="M511.999488 834.254727c-248.678712 0-450.273176-201.585181-450.273176-450.254727s201.594464-450.254727 450.273176-450.254727 450.273176 201.585181 450.273176 450.254727S760.6782 834.254727 511.999488 834.254727zM266.371377 589.705012l491.256222 0 0-33.772174L266.371377 555.932838 266.371377 589.705012zM757.627599 178.29396499999996L266.371377 178.29396499999996l0 33.773198 491.256222 0L757.627599 178.29396499999996zM140.487278 367.11340099999995l0 33.771151 743.024421 0 0-33.771151L140.487278 367.11340099999995z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="engine" unicode="&#58920;" d="M422.214332 360.70413299999996L186.183684 360.70413299999996l0 46.568461 236.030648 0c10.379577 40.075407 46.47537 69.794509 89.785668 69.794509 51.432433 0 93.067103-41.657943 93.067103-93.067103C605.067103 332.56756700000005 563.40916 290.909624 512 290.909624 468.689703 290.909624 432.593909 320.65199900000005 422.214332 360.70413299999996L422.214332 360.70413299999996zM512 779.634098c-218.529658 0-395.634098-177.10444-395.634098-395.634098 0-218.529658 177.10444-395.634098 395.634098-395.634098 154.76275 0 288.417257 89.064217 353.440885 218.55293l101.398692-59.112389-23.063141-39.959044-62.161099 35.909613c-33.745261-51.595341-77.42792-96.115813-129.093079-129.744711l35.653614-61.765464-40.308133-23.295867-35.653614 61.765464c-53.620057-27.345298-113.360805-44.404109-176.894987-47.73209L535.319139-127.99706800000001l-46.568461 0 0 70.981412c-63.534182 3.327981-123.27493 20.386792-176.894987 47.73209l-35.653614-61.765464-40.308133 23.295867 35.653614 61.765464c-51.665159 33.628898-95.347818 78.149371-129.093079 129.744711l-62.161099-35.909613-23.295867 40.308133 62.114553 35.863067c-27.415116 53.550239-44.799743 113.104807-48.127724 176.685534L0.002932 360.70413299999996l0 46.568461 70.958139 0c3.327981 63.580727 20.712609 123.135295 48.127724 176.685534l-62.114553 35.863067 23.295867 40.308133 62.161099-35.909613c33.745261 51.595341 77.42792 96.115813 129.093079 129.744711l-35.653614 61.765464 40.308133 23.295867 35.653614-61.765464c53.620057 27.345298 113.360805 44.404109 176.894987 47.73209L488.727406 895.997068l46.568461 0 0-70.981412c63.534182-3.327981 123.27493-20.386792 176.894987-47.73209l35.653614 61.765464 40.308133-23.295867-35.653614-61.765464c51.665159-33.628898 95.347818-78.149371 129.093079-129.744711l62.161099 35.909613 23.063141-39.959044-101.398692-59.112389C800.417257 690.569881 666.76275 779.634098 512 779.634098L512 779.634098z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="close" unicode="&#4102;" d="M783.483 701.249L512 429.775 240.517 701.249c-10.082 10.083-26.429 10.083-36.51 0-10.083-10.082-10.083-26.429 0-36.509l271.481-271.475L204.008 121.78800000000001c-10.083-10.081-10.083-26.428 0-36.508 10.082-10.082 26.429-10.082 36.51 0L512 356.755l271.483-271.475c10.082-10.082 26.429-10.082 36.513 0 10.081 10.083 10.081 26.428 0 36.508L548.51 393.265l271.485 271.474c10.081 10.083 10.081 26.429 0 36.509C809.912 711.33 793.564 711.33 783.483 701.249z"  horiz-adv-x="1024" />
+			<glyph glyph-name="search" unicode="&#58901;"
+				   d="M439.323351 120.52219c-49.280352 0-97.09834 9.656941-142.126681 28.699646-43.480015 18.388812-82.522793 44.706201-116.043584 78.225619s-59.841305 72.560596-78.230871 116.03883C83.878729 388.513804 74.222416 436.330856 74.222416 485.609189c0 49.284473 9.656313 97.104595 28.699798 142.133138 18.388542 43.479257 44.71008 82.520435 78.231894 116.03883 33.518745 33.515325 72.562546 59.832713 116.043584 78.219479 45.027318 19.039635 92.846329 28.694529 142.125658 28.694529 49.280352 0 97.099364-9.653871 142.126681-28.694529 43.481039-18.385742 82.525863-44.704155 116.044608-78.220502 33.520791-33.518395 59.842328-72.559573 78.230871-116.03883 19.042462-45.028543 28.699798-92.848665 28.699798-142.133138 0-49.278333-9.657336-97.095385-28.701845-142.122905-18.388542-43.47721-44.708033-82.520435-78.228824-116.03883s-72.563569-59.838853-116.043584-78.226642C536.422715 130.177084 488.603703 120.52219 439.323351 120.52219zM439.323351 797.483242c-171.975699 0-311.887855-139.906423-311.887855-311.875077S267.347652 173.734112 439.323351 173.734112s311.887855 139.907447 311.887855 311.874053S611.299051 797.483242 439.323351 797.483242zM890.678206-48.734702c-22.121716 0-42.90387 8.562003-58.541653 24.115234L674.672953 128.025071l37.039062 38.20616 157.888289-153.058978c5.606924-5.606695 13.091693-8.692986 21.077901-8.692986 7.983139 0 15.464837 3.087315 21.070738 8.69094 5.616135 5.622044 8.715856 13.126972 8.715856 21.123087 0 7.980765-3.091535 15.46318-8.702552 21.067828l-0.301888 0.306992L758.714395 213.230662l38.207726 37.035498 152.611906-157.427472c15.571265-15.638165 24.144876-36.422538 24.144876-58.549487 0-22.195511-8.625801-43.054585-24.287121-58.735729C933.723298-40.112324 912.876674-48.734702 890.678206-48.734702zM281.015489 327.245392c-42.340005 42.320874-65.652899 98.584296-65.643689 158.421102 0.008187 59.818387 23.319034 116.074645 65.637549 158.4078l37.634651-37.619806c-66.60666-66.629513-66.60973-175.00071-0.007163-241.577011L281.015489 327.245392z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="close-fill" unicode="&#4103;" d="M512 822.022125c-217.47508 0-394.423141-176.949085-394.423141-394.423141 0-217.474057 176.948061-394.422118 394.423141-394.422118 217.473033 0 394.422118 176.948061 394.422118 394.422118C906.422118 645.07304 729.473033 822.022125 512 822.022125zM702.228529 270.92978200000005c8.030907-8.030907 8.030907-21.052478 0-29.083385s-21.052478-8.030907-29.083385 0L512 402.992563 350.853833 241.84741899999995c-8.030907-8.030907-21.052478-8.030907-29.083385 0s-8.030907 21.052478 0 29.083385l161.146167 161.146167L321.771471 593.222115c-8.030907 8.030907-8.030907 21.052478 0 29.083385s21.052478 8.030907 29.083385 0l161.146167-161.146167L673.145144 622.305501c8.030907 8.030907 21.052478 8.030907 29.083385 0s8.030907-21.052478 0-29.083385L541.082362 432.075949 702.228529 270.92978200000005z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="chart-screen" unicode="&#58921;" d="M963.930903 179.21903299999997l0 34.824133-37.354769-2.675946L926.576133 694.8538169999999 691.413206 694.8538169999999l0 70.462818L330.260819 765.316635l0-70.462818L95.690386 694.8538169999999l0-480.809627-35.621289 0 0-34.824133 432.583253 0 0-141.228535-90.313935 0 0-35.307134 216.753649 0 0 35.307134-90.313935 0L528.778128 179.21903299999997 963.930903 179.21903299999997zM366.212636 730.008478L655.216819 730.008478l0-35.307134L366.212636 694.7013440000001 366.212636 730.008478zM364.817869 332.73133600000006L222.224244 406.252817l14.295588 27.736715 123.238812-63.523779 173.928285 159.755494 127.5807-92.634794 93.13826 122.414027 12.420891-9.449209 12.420891-9.449209L667.639756 394.365068l-131.636063 95.621824L364.817869 332.73133600000006z"  horiz-adv-x="1024" />
+			<glyph glyph-name="share" unicode="&#58945;"
+				   d="M769.714 306.453c-51.754 0-97.702-24.851-126.571-63.269L394.479 367.94100000000003c3.93 13.798 6.034 28.364 6.034 43.424 0 16.496-2.527 32.399-7.211 47.35l247.724 124.288c28.71-40.052 75.647-66.151 128.687-66.151 87.388 0 158.229 70.84 158.229 158.229 0 87.388-70.841 158.229-158.229 158.229-87.389 0-158.229-70.841-158.229-158.229 0-6.046 0.352-12.009 1.011-17.88L351.22 526.116c-28.371 26.943-66.723 43.479-108.938 43.479-87.388 0-158.229-70.84-158.229-158.229s70.84-158.229 158.229-158.229c43.752 0 83.354 17.758 111.997 46.459l258.676-129.779c-0.964-7.062-1.474-14.266-1.474-21.592 0-87.389 70.84-158.229 158.229-158.229s158.229 70.84 158.229 158.229C927.938 235.61199999999997 857.103 306.453 769.714 306.453L769.714 306.453z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="star" unicode="&#58880;" d="M749.624889-84.152889c-15.672889 0-31.246222 3.882667-45.084444 11.306667l-192.526222 103.637333L319.544889-72.817778c-31.203556-16.64-70.314667-14.392889-99.043556 5.304889-29.511111 20.337778-44.743111 55.921778-38.840889 90.695111l37.703111 225.251556L56.661333 410.908444c-25.002667 24.888889-33.464889 60.984889-22.058667 94.193778 11.349333 32.910222 40.064 56.576 74.965333 61.752889l221.326222 32.896 96.128 199.580444c15.488 32.085333 48.853333 52.807111 84.992 52.807111 36.167111 0 69.518222-20.736 84.963556-52.807111l96.156444-199.580444 221.297778-32.910222c34.872889-5.162667 63.616-28.8 74.979556-61.696 11.392-33.28 2.944-69.361778-22.030222-94.250667L804.622222 248.433778l37.745778-225.28c5.845333-34.773333-9.386667-70.357333-38.812444-90.638222C787.569778-78.392889 768.938667-84.152889 749.624889-84.152889zM512.014222 91.548444c4.636444 0 9.272889-1.137778 13.482667-3.384889l205.937778-110.862222c12.373333-6.641778 28.316444-5.802667 39.936 2.133333 11.392 7.836444 17.123556 21.006222 14.890667 34.304L746.097778 253.496889c-1.507556 9.088 1.450667 18.332444 7.964444 24.832l173.141333 172.842667c9.457778 9.429333 12.686222 23.025778 8.405333 35.484444-4.380444 12.672-15.701333 21.873778-29.525333 23.921778L669.866667 545.706667c-9.315556 1.379556-17.365333 7.296-21.447111 15.786667L545.720889 774.641778c-6.030222 12.529778-19.256889 20.608-33.706667 20.608s-27.690667-8.092444-33.763556-20.622222L375.608889 561.493333c-4.081778-8.490667-12.131556-14.407111-21.447111-15.786667L117.930667 510.577778c-13.624889-2.033778-25.201778-11.434667-29.539556-23.992889-4.266667-12.416-1.024-25.984 8.433778-35.399111L269.937778 278.328889c6.513778-6.499556 9.472-15.744 7.964444-24.832l-40.135111-239.744c-2.247111-13.312 3.484444-26.439111 14.976-34.360889 11.434667-7.836444 27.349333-8.775111 39.950222-2.062222l205.852444 110.833778C502.741333 90.410667 507.377778 91.548444 512.014222 91.548444zM200.32 439.210667c-6.840889 0-12.885333 4.963556-14.023111 11.946667-1.251556 7.751111 4.010667 15.061333 11.761778 16.312889l9.443556 1.536c7.793778 1.336889 15.061333-4.010667 16.312889-11.761778 1.251556-7.751111-4.010667-15.061333-11.761778-16.312889l-9.443556-1.536C201.856 439.267556 201.073778 439.210667 200.32 439.210667zM252.544 447.687111c-6.684444 0-12.643556 4.721778-13.937778 11.534222-1.493333 7.708444 3.555556 15.175111 11.264 16.654222l153.927111 29.696 58.055111 133.148444c3.157333 7.182222 11.548444 10.496 18.716444 7.352889 7.210667-3.143111 10.510222-11.52 7.367111-18.716444l-61.056-140.017778c-1.877333-4.295111-5.745778-7.395556-10.353778-8.277333l-161.28-31.118222C254.336 447.758222 253.44 447.687111 252.544 447.687111z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="circle-dot" unicode="&#58903;" d="M513.133312 830.6731560000001c-247.538793 0-448.208115-200.669322-448.208115-448.207092 0-247.538793 200.670346-448.208115 448.208115-448.208115 247.538793 0 448.208115 200.670346 448.208115 448.208115C961.341427 630.004857 760.673128 830.6731560000001 513.133312 830.6731560000001zM513.132288-6.649187999999981c-214.901465 0-389.113205 174.212764-389.113205 389.114229 0 214.902488 174.21174 389.115252 389.113205 389.115252 214.903511 0 389.115252-174.212764 389.115252-389.115252C902.24754 167.563576 728.0358-6.649187999999981 513.132288-6.649187999999981zM513.133312 382.46504100000004m-344.602456 0a336.754 336.754 0 1 1 689.204911 0 336.754 336.754 0 1 1-689.204911 0Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="set-sm" unicode="&#58912;"
+				   d="M946.367 405.895c0.02 21.85-13.04 38.49-31.74 41.57-18.69 3.07-79.05 13.01-85.99 14.14-6.95 1.15-14.09 8.07-15.4 11.45-1.32 3.37-8.94 22.2-11.87 29.46-2.95 7.27-1.92 16.58 4.39 25.52 6.3 8.93 39.9 55.87 48.38 67.72 8.49 11.87 8.65 34.61-4.84 48.39-13.48 13.78-47.75 47.09-56.73 55.86-8.99 8.76-31.08 8.64-42.67 0.43-11.58-8.2-71.69-51.01-71.69-51.01s-9.97-6.89-20.67-2.64c-10.7 4.24-33.43 14.07-33.43 14.07s-7.19 5.43-9.68 19.79c-2.5 14.37-11.11 65.28-14.07 82.7-2.97 17.42-20.67 29.62-37.83 29.46-17.16-0.14-57.91 0-74.33 0s-32.26-15.68-34.75-29.46c-2.49-13.79-11.56-69.16-14.07-84.45-2.52-15.3-11.44-18.48-11.44-18.48s-19.56-8.06-29.91-12.31c-10.34-4.26-15.39-2.64-30.35 7.48-14.95 10.11-44.74 31.03-63.04 43.83-18.3 12.81-38.12 7.92-49.26-3.52s-36.06-35.77-51.02-50.43c-14.95-14.66-12.61-37.54 0.58-55.71 13.2-18.18 32.34-45.43 41.35-58.21 9.01-12.78 10.84-19.5 8.36-26.82-2.49-7.34-6.64-16.58-11.43-27.72-4.81-11.13-9.69-13.64-27.86-17.01-17.36-3.21-58.42-9.92-77.4-13.31-18.99-3.37-30.66-21.43-30.66-41.81l0-64.66c0-24.34 13.2-37.24 38.42-41.93 25.22-4.69 62.66-10.66 74.77-12.61 12.1-1.95 17.67-6.6 21.41-15.54 3.73-8.94 5.13-10.12 9.37-22.57 4.26-12.47 6.46-15.55-4.98-31.67-11.44-16.13-34.31-48.11-46.03-64.51-11.74-16.4-6.45-37.83 4.98-49.85 11.44-12.03 35.47-35.64 48.97-48.97 13.49-13.33 35.19-16.28 53.36-3.52 18.19 12.75 54.98 38.99 65.69 46.62 10.7 7.63 21.91 5.28 27.85 2.94 5.94-2.35 11.25-4.6 22-9.1 10.73-4.48 13.85-11.2 16.41-23.45 2.57-12.24 10.19-56.85 13.93-78.59 3.75-21.72 18.91-33.43 40.62-33.72 21.7-0.29 33.27-0.12 61.57 0 28.29 0.13 41.86 12.61 45.45 31.38 3.59 18.76 12.45 72.94 14.22 83.72 1.78 10.76 5.94 14.73 13.63 18.47 7.7 3.74 14.32 6.47 26.84 11.88 12.51 5.4 18.91 0.66 27.7-5.72 8.8-6.39 47.51-33.78 63.78-45.31 16.28-11.53 36.73-10.33 51.9 4.4 15.18 14.73 31.62 30.99 49.27 48.38 17.64 17.4 12.16 39.59 4.4 51.46-7.77 11.88-44.49 62.95-49.71 70.23-5.21 7.28-4.4 18.62-1.75 24.63 2.64 6.01 8.44 18.24 11.72 25.22 3.29 6.97 9.6 11.22 18.18 12.9 8.58 1.69 62.72 11 83.75 14.61 21.03 3.64 31.11 19.92 31.26 39.92C946.427 359.93499999999995 946.347 388.525 946.367 405.895zM908.587 338.615c0.21-5.76-4.66-10.65-8.82-11.38-4.17-0.73-63.26-11.38-81.48-14.29-18.21-2.92-33.23-15.07-38.72-28.06-3.98-9.44-5.47-13.51-10.59-26.96-5.12-13.44-4.64-32.19 2.56-42.26 7.2-10.08 46.82-64.9 50.38-70.45s4.27-11.95-1.28-17.5-40.99-41.2-47.39-47.39c-6.41-6.19-11.83-4.8-18.79 0-6.95 4.8-39.61 26.39-64.44 44.36-16.96 12.28-32.82 12.43-48.7 6.02-15.87-6.42 1.28 0.28-22.2-8.97-23.48-9.25-30.23-27.62-33.73-48.24-3.5-20.63-10.67-62.98-11.95-70.45-1.28-7.47-5.55-11.1-13.66-11.1l-64.9 0c-8.11 0-11.74 2.99-14.52 11.95-2.77 8.97-10.03 54.87-12.8 74.29-2.78 19.43-13.82 36.12-24.77 40.56-10.94 4.45-4.98 2.14-27.32 11.1-22.34 8.97-39.63 4.5-51.23-3.84-11.61-8.34-58.64-42.69-65.33-46.96-6.68-4.28-14.65-3.28-18.35 0.42-3.7 3.7-40.56 40.56-46.54 46.54-5.98 5.98-5.36 12.92 0 20.49 5.36 7.58 28.39 40.76 40.99 57.95 12.59 17.2 17.93 34.74 9.82 53.49-8.12 18.74-4.42 10.24-12.39 28.6-7.96 18.36-24.28 24.46-38.42 26.9-14.14 2.43-68.88 11.53-76.85 13.23-7.97 1.71-11.95 7.26-11.95 14.09l0 66.18c0 9.53 7.67 12.44 12.38 13.23 4.7 0.8 54.22 9.18 73 12.39 18.79 3.2 36.36 11.32 43.55 29.03 7.19 17.7 4.27 11.1 11.1 27.32 6.83 16.23 3.8 33.94-7.68 49.96-11.49 16.01-38.85 54-44.4 61.9-5.55 7.9-5.77 12.6 0.85 19.21 6.62 6.62 42.05 42.48 46.96 46.97 4.91 4.48 12.07 5.4 18.36 0.85 6.3-4.55 49.31-35.65 64.04-46.11 14.73-10.46 32.35-12.56 49.1-5.55 16.75 7.02 10.25 4.48 26.9 11.1s24.84 19.09 28.18 39.71c3.33 20.61 11.95 74.14 12.81 77.7 0.85 3.55 5.55 10.46 11.74 10.46s65.82-0.07 69.8 0c3.99 0.07 10.3-3.29 11.32-9.18 1.02-5.9 13.02-74.29 14.94-86.25 1.92-11.95 15.58-28.57 25.54-32.73 9.96-4.16 21.35-8.75 31.31-13.09 9.97-4.34 30.13-1.91 36.15 2.28 6.03 4.18 70.52 48.81 75.43 52.37 4.91 3.56 11.52 3.27 17.64-2.85s43.34-43.19 47.54-47.53c4.19-4.34 4.66-8.66 1.14-13.66-3.53-5.01-36.72-51.8-47.54-67.46-10.81-15.65-11.73-33.73-5.41-48.96 6.33-15.22 3.99-9.39 9.11-21.91 5.13-12.53 16.28-29.03 33.59-31.88 17.31-2.85 76.92-12.74 84.82-13.95 7.9-1.21 11.1-7.18 11.1-13.37S908.377 344.385 908.587 338.615zM526.833 573.1949999999999c-110.45 0-200-89.54-200-200s89.55-200 200-200c110.46 0 200 89.54 200 200S637.293 573.1949999999999 526.833 573.1949999999999zM526.833 208.19500000000005c-91.12 0-165 73.87-165 165s73.88 165 165 165c91.13 0 165-73.87 165-165S617.963 208.19500000000005 526.833 208.19500000000005z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="chat" unicode="&#58886;" d="M132.682393 414.567179c0 208.287837 166.471452 377.143593 379.317095 377.143593s385.380184-168.855756 385.380184-377.143593c0-177.196725-122.197086-325.812507-290.49821-366.259708l-116.291586-51.04763 0 41.126676C290.570353 52.175568999999996 132.682393 215.31206599999996 132.682393 414.567179zM83.799056 414.567179c0-211.946157 160.764474-387.135154 369.469819-415.152255-3.2623-20.458961-10.036587-65.024969-7.286963-65.024969 2.384303 0 114.89068 47.294143 189.700503 78.865185 176.193885 51.91437 304.518528 211.946157 304.518528 401.312038 0 231.432976-191.70823 419.042865-428.200432 419.042865S83.799056 646.0001560000001 83.799056 414.567179zM340.71952 276.63573699999995c22.935362-41.481763 89.831958-75.102489 170.391738-75.102489 79.650061 0 148.489916 32.909527 172.168198 73.681116-12.701277 5.979178-19.068288 8.02886-28.131711 12.21009-19.894096-31.257911-75.425853-59.661821-142.729725-59.661821-66.969251 0-122.836653 28.40391-143.598512 61.083194L340.71952 276.63573699999995z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="release" unicode="&#58889;" d="M990.78144 828.5388800000001c-3.35872 1.59744-7.04512 2.37568-11.01824 2.37568-14.45888 0-27.60704-10.81344-27.40224-10.81344-8.8064-4.42368-880.59904-443.22816-911.44192-459.44832-17.408-9.13408-27.36128-24.73984-25.92768-40.71424 1.10592-13.14816 9.78944-23.51104 23.10144-27.77088 26.17344-8.27392 290.24256-91.58656 290.24256-91.58656l4.83328-1.47456 16.67072 50.05312-254.32064 79.54432 780.73856 406.28224c-82.82112-93.88032-420.53632-476.32384-436.10112-493.93664-20.11136-22.48704-29.4912-45.09696-29.40928-70.98368l0.28672-153.27232-0.08192 0c0 0 0.08192-53.49376 0.08192-53.6576l0-1.96608 0 0c1.18784-13.5168 12.73856-24.24832 26.54208-24.24832s25.51808 10.73152 26.74688 24.24832l0 0c0 0 0.53248 191.03744 0 205.08672-0.49152 12.4928 5.07904 26.54208 10.69056 33.05472 5.65248 6.38976 390.63552 442.61376 465.75616 527.81056-21.38112-106.41408-126.68928-629.76-128.24576-637.41952-0.8192-4.05504-2.58048-4.05504-3.35872-4.05504-0.6144 0-1.31072 0.12288-2.048 0.36864-7.45472 2.37568-268.82048 81.55136-279.92064 84.91008l-4.7104 1.4336-17.16224-50.50368 5.07904-1.59744c2.58048-0.77824 258.90816-79.09376 284.38528-86.46656 5.07904-1.47456 10.24-2.2528 15.44192-2.2528 26.99264 0 49.5616 19.37408 54.8864 46.98112 2.08896 10.93632 27.0336 134.67648 55.9104 277.99552 39.77216 197.14048 84.7872 420.61824 85.93408 427.6224l0.6144 3.31776C1009.70496 798.96576 1013.26848 817.9712 990.78144 828.5388800000001z"  horiz-adv-x="1024" />
+			<glyph glyph-name="engine" unicode="&#58920;"
+				   d="M422.214332 360.70413299999996L186.183684 360.70413299999996l0 46.568461 236.030648 0c10.379577 40.075407 46.47537 69.794509 89.785668 69.794509 51.432433 0 93.067103-41.657943 93.067103-93.067103C605.067103 332.56756700000005 563.40916 290.909624 512 290.909624 468.689703 290.909624 432.593909 320.65199900000005 422.214332 360.70413299999996L422.214332 360.70413299999996zM512 779.634098c-218.529658 0-395.634098-177.10444-395.634098-395.634098 0-218.529658 177.10444-395.634098 395.634098-395.634098 154.76275 0 288.417257 89.064217 353.440885 218.55293l101.398692-59.112389-23.063141-39.959044-62.161099 35.909613c-33.745261-51.595341-77.42792-96.115813-129.093079-129.744711l35.653614-61.765464-40.308133-23.295867-35.653614 61.765464c-53.620057-27.345298-113.360805-44.404109-176.894987-47.73209L535.319139-127.99706800000001l-46.568461 0 0 70.981412c-63.534182 3.327981-123.27493 20.386792-176.894987 47.73209l-35.653614-61.765464-40.308133 23.295867 35.653614 61.765464c-51.665159 33.628898-95.347818 78.149371-129.093079 129.744711l-62.161099-35.909613-23.295867 40.308133 62.114553 35.863067c-27.415116 53.550239-44.799743 113.104807-48.127724 176.685534L0.002932 360.70413299999996l0 46.568461 70.958139 0c3.327981 63.580727 20.712609 123.135295 48.127724 176.685534l-62.114553 35.863067 23.295867 40.308133 62.161099-35.909613c33.745261 51.595341 77.42792 96.115813 129.093079 129.744711l-35.653614 61.765464 40.308133 23.295867 35.653614-61.765464c53.620057 27.345298 113.360805 44.404109 176.894987 47.73209L488.727406 895.997068l46.568461 0 0-70.981412c63.534182-3.327981 123.27493-20.386792 176.894987-47.73209l35.653614 61.765464 40.308133-23.295867-35.653614-61.765464c51.665159-33.628898 95.347818-78.149371 129.093079-129.744711l62.161099 35.909613 23.063141-39.959044-101.398692-59.112389C800.417257 690.569881 666.76275 779.634098 512 779.634098L512 779.634098z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="list" unicode="&#58890;" d="M618.04471 733.97072l-397.175835 0c-16.927531 0-30.699186-13.771655-30.699186-30.699186l0-638.543068c0-16.927531 13.771655-30.699186 30.699186-30.699186l582.261227 0c16.927531 0 30.699186 13.771655 30.699186 30.699186l-0.726547 476.760404L618.04471 733.97072zM803.771715 541.488871 619.537713 541.488871 619.537713 705.552483 803.771715 541.488871zM813.363164 64.728466c0-5.64251-4.590552-10.233062-10.233062-10.233062l-582.261227 0c-5.64251 0-10.233062 4.590552-10.233062 10.233062l0 638.543068c0 5.64251 4.590552 10.233062 10.233062 10.233062l378.202715 0 0-192.481849 214.291574 0L813.363164 64.728466zM298.129516 482.495268l55.258535 0 0-55.258535-55.258535 0 0 55.258535ZM399.777591 468.168981l323.364759 0 0-26.605961-323.364759 0 0 26.605961ZM298.129516 342.044446l55.258535 0 0-55.258535-55.258535 0 0 55.258535ZM399.777591 327.718159l323.364759 0 0-26.605961-323.364759 0 0 26.605961ZM298.129516 199.804884l55.258535 0 0-55.258535-55.258535 0 0 55.258535ZM399.777591 185.478598l323.364759 0 0-26.605961-323.364759 0 0 26.605961ZM881.315812 53.053566"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="chart" unicode="&#58924;" d="M953.440991 315.668729L784.061302 315.668729 681.06451 437.392024c-0.312108 0.373507-0.635473 0.737804-0.969071 1.094938-0.013303 0.014326-0.026606 0.027629-0.039909 0.041956-0.276293 0.293689-0.559748 0.582261-0.851391 0.86367-0.053212 0.051165-0.107447 0.099261-0.160659 0.150426-0.249687 0.237407-0.50142 0.470721-0.76134 0.697895-0.089028 0.078795-0.181125 0.153496-0.272199 0.230244-0.225127 0.191358-0.451278 0.381693-0.683569 0.565888-0.124843 0.099261-0.251733 0.192382-0.3776 0.288572-0.200568 0.153496-0.402159 0.306992-0.607844 0.454348-0.159636 0.11461-0.322341 0.224104-0.485047 0.334621-0.177032 0.12075-0.354064 0.242524-0.535189 0.35918-0.195451 0.12689-0.394996 0.246617-0.593518 0.367367-0.152473 0.092098-0.302899 0.186242-0.457418 0.275269-0.237407 0.137123-0.477884 0.268106-0.718361 0.397043-0.121773 0.065492-0.2415 0.132006-0.364297 0.195451-0.283456 0.146333-0.571005 0.285502-0.859577 0.420579-0.085958 0.040932-0.170892 0.082888-0.257873 0.122797-0.337691 0.154519-0.679475 0.298805-1.022283 0.437975-0.044002 0.017396-0.086981 0.036839-0.130983 0.055259-1.604544 0.638543-3.2623 1.113357-4.948709 1.416256-0.343831 0.062422-0.687662 0.112564-1.031493 0.160659-0.055259 0.008186-0.110517 0.01842-0.165776 0.025583-1.633197 0.216941-3.25923 0.26913-4.861728 0.173962-0.013303-0.001023-0.026606-0.001023-0.040932-0.002047-0.363274-0.022513-0.724501-0.054235-1.085728-0.091074-0.060375-0.00614-0.119727-0.011256-0.180102-0.017396-0.310062-0.034792-0.618077-0.077771-0.926092-0.122797-0.116657-0.017396-0.232291-0.032746-0.348947-0.051165-0.24764-0.040932-0.494257-0.086981-0.740874-0.135076-0.178055-0.033769-0.355087-0.067538-0.532119-0.105401-0.183172-0.039909-0.36532-0.083911-0.547469-0.127913-0.237407-0.056282-0.474814-0.113587-0.710175-0.176009-0.12075-0.032746-0.240477-0.068562-0.360204-0.102331-0.292666-0.082888-0.584308-0.168846-0.874927-0.26299-0.063445-0.020466-0.125867-0.042979-0.188288-0.063445-0.338714-0.112564-0.675382-0.230244-1.010003-0.357134-0.019443-0.007163-0.038886-0.01535-0.058328-0.022513-1.493004-0.571005-2.948145-1.284249-4.340865-2.149966-0.067538-0.041956-0.13303-0.088004-0.200568-0.12996-0.273223-0.172939-0.545422-0.346901-0.813528-0.531096-1.416256-0.971118-2.734274-2.089591-3.936659-3.333932-0.025583-0.026606-0.049119-0.053212-0.074701-0.079818-0.26299-0.275269-0.521886-0.555655-0.773619-0.843204-0.058328-0.066515-0.112564-0.134053-0.169869-0.200568-0.211824-0.246617-0.420579-0.496304-0.62217-0.751107-0.083911-0.106424-0.164752-0.214894-0.246617-0.322341-0.167822-0.218988-0.334621-0.437975-0.49528-0.663102-0.102331-0.14224-0.199545-0.287549-0.298805-0.431835-0.13303-0.194428-0.26606-0.387833-0.393973-0.586354-0.115634-0.179079-0.225127-0.360204-0.335644-0.541329-0.103354-0.168846-0.207731-0.336668-0.306992-0.508583-0.12689-0.220011-0.24764-0.443092-0.36839-0.666172-0.074701-0.138146-0.151449-0.275269-0.223081-0.416486-0.137123-0.265036-0.265036-0.533143-0.39295-0.802272-0.050142-0.105401-0.101307-0.209778-0.150426-0.316202-0.144286-0.317225-0.279363-0.63752-0.410346-0.958838-0.026606-0.064468-0.055259-0.127913-0.080841-0.193405-0.150426-0.378623-0.291642-0.760317-0.423649-1.14508-0.005117-0.016373-0.011256-0.031722-0.017396-0.048095-0.157589-0.463558-0.303922-0.930185-0.434905-1.400906l-97.897657-342.642824L435.093423 811.832042c-0.071631 0.569982-0.165776 1.13587-0.275269 1.696642-0.008186 0.040932-0.017396 0.081864-0.025583 0.12382-0.071631 0.356111-0.148379 0.709151-0.234337 1.061169-0.031722 0.128937-0.065492 0.255827-0.099261 0.38374-0.066515 0.254803-0.135076 0.508583-0.208754 0.760317-0.060375 0.206708-0.124843 0.411369-0.190335 0.615007-0.053212 0.166799-0.107447 0.332575-0.164752 0.49835-0.092098 0.26913-0.190335 0.535189-0.290619 0.800225-0.037862 0.098237-0.074701 0.196475-0.113587 0.293689-0.12382 0.313132-0.25378 0.623193-0.38988 0.930185-0.022513 0.050142-0.044002 0.100284-0.066515 0.150426-0.152473 0.338714-0.311085 0.672312-0.477884 1.00284-0.01228 0.024559-0.024559 0.049119-0.037862 0.074701-0.173962 0.343831-0.356111 0.682545-0.545422 1.017166-0.011256 0.019443-0.022513 0.039909-0.033769 0.059352-0.188288 0.330528-0.382717 0.654916-0.584308 0.975211-0.021489 0.034792-0.044002 0.068562-0.065492 0.103354-0.190335 0.298805-0.385786 0.592494-0.587378 0.88209-0.045025 0.065492-0.091074 0.12996-0.137123 0.194428-0.180102 0.252757-0.363274 0.502443-0.551562 0.74906-0.079818 0.105401-0.162706 0.208754-0.24457 0.312108-0.157589 0.199545-0.317225 0.396019-0.480954 0.590448-0.124843 0.149403-0.252757 0.295735-0.381693 0.442068-0.125867 0.14224-0.251733 0.284479-0.38067 0.424672-0.174985 0.191358-0.355087 0.378623-0.536212 0.563842-0.088004 0.090051-0.176009 0.180102-0.26606 0.26913-0.224104 0.222057-0.452301 0.440022-0.684592 0.653893-0.054235 0.050142-0.10847 0.100284-0.163729 0.150426-0.265036 0.240477-0.535189 0.474814-0.810459 0.704035-0.028653 0.023536-0.056282 0.047072-0.084934 0.070608-0.294712 0.243547-0.595564 0.479931-0.902556 0.711198-0.01535 0.011256-0.029676 0.022513-0.045025 0.033769-0.311085 0.232291-0.627287 0.458441-0.949628 0.677429-0.019443 0.013303-0.037862 0.025583-0.057305 0.038886-0.309038 0.208754-0.623193 0.411369-0.942465 0.606821-0.045025 0.027629-0.090051 0.054235-0.134053 0.081864-0.288572 0.174985-0.581238 0.343831-0.877997 0.50756-0.090051 0.050142-0.181125 0.098237-0.272199 0.147356-0.25071 0.134053-0.502443 0.265036-0.759293 0.391926-0.156566 0.077771-0.314155 0.151449-0.472767 0.226151-0.194428 0.091074-0.38988 0.182149-0.587378 0.268106-0.239454 0.105401-0.481977 0.204661-0.724501 0.302899-0.12382 0.049119-0.246617 0.100284-0.37146 0.148379-0.334621 0.128937-0.673335 0.249687-1.014096 0.36532-0.042979 0.014326-0.085958 0.029676-0.128937 0.044002-1.6158 0.536212-3.296069 0.915859-5.02034 1.119497-0.01535 0.002047-0.029676 0.004093-0.044002 0.00614-0.309038 0.035816-0.620124 0.062422-0.931209 0.086981-0.132006 0.010233-0.265036 0.025583-0.397043 0.033769-0.174985 0.011256-0.349971 0.01535-0.525979 0.022513-0.270153 0.01228-0.539282 0.024559-0.808412 0.027629-0.054235 0.001023-0.10847-0.001023-0.162706-0.001023-1.696642 0.010233-3.371794-0.149403-5.006014-0.466628-0.065492-0.01228-0.12996-0.027629-0.195451-0.039909-0.331551-0.067538-0.662079-0.13917-0.989537-0.218988-0.148379-0.035816-0.295735-0.075725-0.443092-0.11461-0.234337-0.061398-0.468674-0.124843-0.700965-0.192382-0.224104-0.065492-0.445138-0.135076-0.666172-0.206708-0.149403-0.048095-0.297782-0.096191-0.446162-0.147356-0.286526-0.098237-0.568958-0.201591-0.850367-0.309038-0.079818-0.030699-0.160659-0.061398-0.240477-0.093121-0.330528-0.12996-0.655939-0.267083-0.979304-0.410346-0.033769-0.01535-0.067538-0.029676-0.101307-0.045025-0.355087-0.159636-0.705058-0.325411-1.050935-0.500397-0.008186-0.004093-0.016373-0.008186-0.023536-0.01228-0.360204-0.182149-0.714268-0.372483-1.064238-0.569982-0.004093-0.002047-0.008186-0.005117-0.013303-0.007163-0.344854-0.196475-0.684592-0.399089-1.019213-0.610914-0.020466-0.013303-0.040932-0.025583-0.060375-0.038886-0.313132-0.199545-0.621147-0.404206-0.925069-0.61603-0.050142-0.034792-0.099261-0.070608-0.149403-0.105401-0.268106-0.190335-0.532119-0.38374-0.791016-0.583285-0.091074-0.069585-0.181125-0.141216-0.271176-0.212848-0.212848-0.167822-0.422625-0.337691-0.629333-0.512676-0.137123-0.11461-0.271176-0.232291-0.406253-0.349971-0.154519-0.1361-0.308015-0.272199-0.459464-0.412392-0.179079-0.164752-0.354064-0.332575-0.528026-0.502443-0.102331-0.100284-0.204661-0.199545-0.304945-0.301875-0.211824-0.212848-0.418532-0.430812-0.623193-0.651846-0.059352-0.064468-0.119727-0.128937-0.179079-0.194428-0.231267-0.254803-0.456395-0.515746-0.678452-0.780783-0.031722-0.037862-0.063445-0.075725-0.095167-0.11461-0.23536-0.285502-0.465604-0.577145-0.688685-0.874927-0.01842-0.024559-0.036839-0.048095-0.055259-0.072655-0.226151-0.301875-0.445138-0.60989-0.657986-0.923022-0.019443-0.028653-0.038886-0.057305-0.058328-0.084934-0.202615-0.300852-0.400113-0.606821-0.590448-0.916882-0.032746-0.053212-0.064468-0.105401-0.096191-0.158612-0.169869-0.282433-0.335644-0.567935-0.49528-0.857531-0.053212-0.097214-0.105401-0.194428-0.158612-0.292666-0.130983-0.24457-0.258896-0.490164-0.381693-0.73985-0.080841-0.162706-0.157589-0.326435-0.234337-0.491187-0.088004-0.189312-0.177032-0.378623-0.260943-0.571005-0.107447-0.245593-0.209778-0.493234-0.310062-0.741897-0.047072-0.11768-0.095167-0.234337-0.141216-0.354064-0.130983-0.340761-0.25378-0.684592-0.370437-1.030469-0.013303-0.037862-0.026606-0.075725-0.038886-0.113587-0.180102-0.543376-0.345877-1.092891-0.48914-1.650593L244.22942 305.59939599999996 67.355037 305.59939599999996c-14.128789 0-25.582655-11.453866-25.582655-25.582655s11.453866-25.582655 25.582655-25.582655l191.314257 0c0.867764 0 1.725294 0.044002 2.570545 0.128937 0.828878-0.080841 1.656733-0.1361 2.478448-0.1361 11.218506 0 21.512966 7.439436 24.644283 18.779715l113.358791 410.43686 103.412254-723.884758c0.00921-0.072655 0.021489-0.145309 0.030699-0.217964l0.046049-0.320295c0.002047-0.011256 0.005117-0.021489 0.00614-0.032746 0.109494-0.7552 0.25071-1.502213 0.425695-2.238994 0.01535-0.064468 0.031722-0.12689 0.047072-0.191358 0.166799-0.679475 0.358157-1.350764 0.579191-2.01182 0.041956-0.124843 0.088004-0.24764 0.130983-0.37146 0.210801-0.600681 0.437975-1.194198 0.692778-1.77646 0.068562-0.156566 0.144286-0.309038 0.215918-0.464581 0.223081-0.484024 0.460488-0.961908 0.713244-1.431605 0.106424-0.196475 0.213871-0.390903 0.325411-0.584308 0.265036-0.462534 0.545422-0.914836 0.838088-1.359974 0.088004-0.13303 0.170892-0.268106 0.260943-0.399089 0.354064-0.51677 0.732687-1.016143 1.12359-1.506307 0.078795-0.099261 0.156566-0.198521 0.237407-0.296759 0.420579-0.511653 0.864694-1.004887 1.325182-1.482771 0.051165-0.052189 0.101307-0.105401 0.152473-0.157589 0.494257-0.50449 1.010003-0.989537 1.548262-1.454118 0.00921-0.007163 0.017396-0.014326 0.026606-0.022513 1.636267-1.408069 3.466961-2.620687 5.466502-3.592828 0.075725-0.036839 0.151449-0.074701 0.228197-0.11154 0.576121-0.273223 1.165546-0.525979 1.768273-0.75827 0.158612-0.061398 0.319272-0.118704 0.478907-0.177032 0.558725-0.202615 1.124614-0.393973 1.704828-0.559748 0.005117-0.001023 0.010233-0.002047 0.01535-0.004093 0.278339-0.079818 0.562818-0.13917 0.844228-0.209778 0.394996-0.098237 0.789992-0.194428 1.184989-0.274246 0.283456-0.056282 0.568958-0.103354 0.854461-0.149403 0.445138-0.073678 0.889253-0.134053 1.333368-0.183172 0.229221-0.024559 0.456395-0.052189 0.686638-0.071631 0.710175-0.059352 1.418302-0.099261 2.122337-0.099261 0.337691 0 0.671289 0.027629 1.007957 0.040932 0.276293 0.011256 0.550539 0.013303 0.828878 0.033769 0.401136 0.029676 0.799202 0.079818 1.196245 0.127913 0.191358 0.022513 0.38067 0.033769 0.572028 0.061398 0.069585 0.010233 0.1361 0.024559 0.205685 0.034792 0.232291 0.034792 0.462534 0.075725 0.692778 0.116657 0.463558 0.082888 0.921999 0.176009 1.3743 0.283456 0.109494 0.025583 0.218988 0.047072 0.327458 0.074701 0.582261 0.145309 1.152243 0.316202 1.716084 0.499373 0.098237 0.031722 0.196475 0.063445 0.293689 0.097214 1.90335 0.644683 3.694135 1.50119 5.351891 2.540869 0.014326 0.00921 0.028653 0.01842 0.042979 0.027629 1.089821 0.686638 2.121314 1.452071 3.087315 2.287089 0.083911 0.071631 0.167822 0.143263 0.25071 0.215918 0.424672 0.3776 0.837064 0.76748 1.235131 1.170662 0.12382 0.124843 0.243547 0.254803 0.36532 0.382717 0.317225 0.334621 0.626263 0.677429 0.925069 1.028423 0.155543 0.183172 0.308015 0.36839 0.458441 0.556679 0.26606 0.331551 0.523933 0.670266 0.773619 1.01512 0.130983 0.180102 0.261966 0.35918 0.387833 0.543376 0.294712 0.429789 0.575098 0.86981 0.843204 1.316995 0.099261 0.165776 0.195451 0.334621 0.290619 0.503467 0.283456 0.499373 0.555655 1.004887 0.806365 1.52268 0.031722 0.065492 0.060375 0.13303 0.091074 0.199545 0.276293 0.584308 0.530073 1.178849 0.762363 1.784646 0.00614 0.017396 0.014326 0.034792 0.020466 0.051165 0.251733 0.661056 0.472767 1.336438 0.669242 2.020006 0.002047 0.008186 0.00614 0.016373 0.008186 0.024559l0.061398 0.215918c0.029676 0.106424 0.062422 0.210801 0.090051 0.317225l117.579929 411.527704 79.800487-94.308923c0.070608-0.083911 0.146333-0.161682 0.217964-0.243547 0.190335-0.220011 0.38374-0.436952 0.581238-0.649799 0.134053-0.144286 0.26913-0.285502 0.405229-0.425695 0.164752-0.168846 0.331551-0.335644 0.50142-0.500397 0.164752-0.159636 0.329505-0.319272 0.496304-0.473791 0.138146-0.12689 0.279363-0.25071 0.419556-0.37453 0.198521-0.174985 0.397043-0.350994 0.599657-0.518816 0.081864-0.067538 0.166799-0.132006 0.249687-0.198521 0.817622-0.661056 1.667989-1.264806 2.545986-1.811252 0.098237-0.061398 0.195451-0.125867 0.294712-0.185218 0.228197-0.138146 0.459464-0.267083 0.691755-0.398066 0.157589-0.089028 0.315178-0.178055 0.474814-0.264013 0.200568-0.107447 0.403183-0.208754 0.606821-0.311085 0.202615-0.101307 0.406253-0.201591 0.611937-0.297782 0.173962-0.080841 0.348947-0.159636 0.523933-0.237407 0.245593-0.10847 0.494257-0.212848 0.743944-0.313132 0.144286-0.058328 0.289596-0.115634 0.434905-0.171915 0.291642-0.11154 0.586354-0.216941 0.883113-0.317225 0.11154-0.037862 0.223081-0.076748 0.334621-0.113587 0.337691-0.109494 0.677429-0.210801 1.02126-0.305969 0.078795-0.021489 0.157589-0.046049 0.236384-0.066515 0.376577-0.101307 0.757247-0.193405 1.140986-0.277316 0.050142-0.011256 0.100284-0.023536 0.150426-0.034792 0.405229-0.085958 0.813528-0.162706 1.225921-0.229221 0.031722-0.005117 0.063445-0.01228 0.096191-0.017396 0.412392-0.065492 0.828878-0.12075 1.24741-0.165776 0.032746-0.004093 0.064468-0.00921 0.097214-0.01228 0.382717-0.039909 0.768503-0.068562 1.155313-0.092098 0.068562-0.004093 0.1361-0.01228 0.204661-0.01535 0.25992-0.013303 0.521886-0.01535 0.782829-0.020466 0.188288-0.004093 0.376577-0.01535 0.564865-0.01535 0.008186 0 0.01535 0.001023 0.023536 0.001023l181.208085 0c14.129812 0 25.582655 11.453866 25.582655 25.582655S967.56978 315.668729 953.440991 315.668729z"  horiz-adv-x="1024" />
+			<glyph glyph-name="close" unicode="&#4102;"
+				   d="M783.483 701.249L512 429.775 240.517 701.249c-10.082 10.083-26.429 10.083-36.51 0-10.083-10.082-10.083-26.429 0-36.509l271.481-271.475L204.008 121.78800000000001c-10.083-10.081-10.083-26.428 0-36.508 10.082-10.082 26.429-10.082 36.51 0L512 356.755l271.483-271.475c10.082-10.082 26.429-10.082 36.513 0 10.081 10.083 10.081 26.428 0 36.508L548.51 393.265l271.485 271.474c10.081 10.083 10.081 26.429 0 36.509C809.912 711.33 793.564 711.33 783.483 701.249z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="ok-circle" unicode="&#4101;" d="M516.152065-63.152063c-60.696384 0-119.594819 11.894911-175.056991 35.353183-53.55473 22.651906-101.646028 55.073316-142.936433 96.364745-41.291428 41.291428-73.712839 89.381703-96.363721 142.936433-23.458271 55.462173-35.353183 114.359584-35.353183 175.055968s11.894911 119.594819 35.353183 175.056991c22.651906 53.55473 55.073316 101.646028 96.363721 142.936433 41.290405 41.291428 89.381703 73.712839 142.936433 96.363721 55.462173 23.458271 114.359584 35.353183 175.056991 35.353183s119.594819-11.894911 175.056991-35.353183c53.55473-22.651906 101.645005-55.073316 142.936433-96.363721 41.291428-41.290405 73.711815-89.38068 96.363721-142.936433 23.459295-55.462173 35.353183-114.359584 35.353183-175.056991 0-60.696384-11.893888-119.593795-35.353183-175.055968-22.651906-53.55473-55.072293-101.645005-96.363721-142.936433s-89.381703-73.712839-142.936433-96.364745C635.747907-51.25715200000002 576.849472-63.152063 516.152065-63.152063zM516.152065 774.870222c-214.115566 0-388.311956-174.196391-388.311956-388.311956s174.196391-388.311956 388.311956-388.311956 388.311956 174.196391 388.311956 388.311956S730.268654 774.870222 516.152065 774.870222zM434.74908 132.830517L209.49278 358.08784 289.087583 437.68162 434.74908 292.020122 743.218594 600.488613 822.812373 520.89381Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="layim-theme" unicode="&#58907;" d="M958.830745 538.643056L740.659817 692.753993l-100.539834 0-3.977591-9.332553c-0.37146-0.871857-38.021965-86.8613-124.772748-88.667435-35.691897 0.76441-67.206658 15.500019-93.680613 43.828204-20.658506 22.106484-30.374798 44.584428-30.456662 44.776809l-3.955078 9.393951-100.587929 0L64.518433 538.643056 169.320337 379.756349l89.956801 65.019853-19.016099-368.05254 268.86654 0 4.093225 0 269.866311 0-19.016099 368.051517 89.956801-65.018829L958.830745 538.643056zM730.105437 507.20402l20.655436-399.781172-237.540068 0-4.093225 0L272.587282 107.42284700000005l20.656459 399.781172-115.938546-83.797521-36.3243 55.070246 159.440315 111.641683-19.276019 30.638811L121.066333 508.667348l-14.548344 22.056342 185.921433 131.330094 71.077825 0c5.332449-10.04375 15.433504-26.779923 30.951943-43.580564 32.047904-34.69622 72.256674-53.486168 116.345822-54.411237l0-0.031722c0.203638 0.00307 0.406253 0.01228 0.60989 0.016373 0.203638-0.00307 0.406253-0.013303 0.60989-0.016373l0 0.031722c44.073798 0.925069 84.359316 19.703761 116.566856 54.379515 15.623839 16.821107 25.814945 33.579793 31.188326 43.612287l71.120804 0 185.921433-131.330094-14.548344-22.056342L742.203986 620.7551920000001l-19.276019-30.638811 159.440315-111.641683-36.3243-55.070246L730.105437 507.20402z"  horiz-adv-x="1024" />
+			<glyph glyph-name="close-fill" unicode="&#4103;"
+				   d="M512 822.022125c-217.47508 0-394.423141-176.949085-394.423141-394.423141 0-217.474057 176.948061-394.422118 394.423141-394.422118 217.473033 0 394.422118 176.948061 394.422118 394.422118C906.422118 645.07304 729.473033 822.022125 512 822.022125zM702.228529 270.92978200000005c8.030907-8.030907 8.030907-21.052478 0-29.083385s-21.052478-8.030907-29.083385 0L512 402.992563 350.853833 241.84741899999995c-8.030907-8.030907-21.052478-8.030907-29.083385 0s-8.030907 21.052478 0 29.083385l161.146167 161.146167L321.771471 593.222115c-8.030907 8.030907-8.030907 21.052478 0 29.083385s21.052478 8.030907 29.083385 0l161.146167-161.146167L673.145144 622.305501c8.030907 8.030907 21.052478 8.030907 29.083385 0s8.030907-21.052478 0-29.083385L541.082362 432.075949 702.228529 270.92978200000005z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="table" unicode="&#58925;" d="M304.738028 343.684806M729.544153 511.153982M595.52788 637.723655M143.806755 686.614156l0-601.704045L881.172549 84.91011100000003l0 601.704045L143.806755 686.614156zM420.318416 299.80441299999995l0 128.936581 184.341448 0 0-128.936581L420.318416 299.80441299999995zM604.659865 256.825552l0-128.936581L420.318416 127.88897099999997l0 128.936581L604.659865 256.825552zM604.659865 600.656435l0-128.936581L420.318416 471.719854l0 128.936581L604.659865 600.656435zM374.232798 600.656435l0-128.936581L189.89135 471.719854l0 128.936581L374.232798 600.656435zM189.89135 428.740994L374.232798 428.740994l0-128.936581L189.89135 299.80441299999995 189.89135 428.740994zM650.745483 428.740994l184.341448 0 0-128.936581L650.745483 299.80441299999995 650.745483 428.740994zM650.745483 471.719854l0 128.936581 184.341448 0 0-128.936581L650.745483 471.719854zM189.89135 256.825552L374.232798 256.825552l0-128.936581L189.89135 127.88897099999997 189.89135 256.825552zM650.745483 127.88897099999997l0 128.936581 184.341448 0 0-128.936581L650.745483 127.88897099999997z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="right" unicode="&#58882;" d="M283.648 721.9189759999999L340.873216 780.926976 740.352 383.99795200000005 340.876288-12.925952000000052 283.648 46.07795199999998 619.52 383.99795200000005Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="chart-screen" unicode="&#58921;"
+				   d="M963.930903 179.21903299999997l0 34.824133-37.354769-2.675946L926.576133 694.8538169999999 691.413206 694.8538169999999l0 70.462818L330.260819 765.316635l0-70.462818L95.690386 694.8538169999999l0-480.809627-35.621289 0 0-34.824133 432.583253 0 0-141.228535-90.313935 0 0-35.307134 216.753649 0 0 35.307134-90.313935 0L528.778128 179.21903299999997 963.930903 179.21903299999997zM366.212636 730.008478L655.216819 730.008478l0-35.307134L366.212636 694.7013440000001 366.212636 730.008478zM364.817869 332.73133600000006L222.224244 406.252817l14.295588 27.736715 123.238812-63.523779 173.928285 159.755494 127.5807-92.634794 93.13826 122.414027 12.420891-9.449209 12.420891-9.449209L667.639756 394.365068l-131.636063 95.621824L364.817869 332.73133600000006z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="left" unicode="&#58883;" d="M740.352 721.9189759999999L683.126784 780.926976 283.648 383.99795200000005 683.123712-12.925952000000052 740.352 46.07795199999998 404.48 383.99795200000005Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="cart-simple" unicode="&#59032;" d="M235.097303 196.866982C247.384597 160.417152 286.382106 132.37606800000003 324.772759 132.37606800000003L861.658537 132.37606800000003 880.429732 132.37606800000003 885.649214 150.54185399999994 1009.08775 580.154957C1021.388907 622.967661 993.187631 660.786325 949.051586 660.786325L424.585365 660.786325C410.791718 660.786325 399.609756 649.5207379999999 399.609756 635.623932 399.609756 621.727125 410.791718 610.461538 424.585365 610.461538L949.051586 610.461538C959.924 610.461538 964.161052 604.779539 961.106394 594.148171L837.667859 164.53506800000002 861.658537 182.70085500000005 324.772759 182.70085500000005C307.742153 182.70085500000005 287.789837 197.04752900000005 282.395194 213.05054900000005L73.600164 832.433664C69.16437 845.592294 54.980454 852.636656 41.919502 848.167687 28.858551 843.698719 21.86648 829.408727 26.302275 816.250097L235.097303 196.866982ZM399.609756-6.017094000000043C399.609756 49.57012899999995 354.881911 94.63247799999999 299.707317 94.63247799999999 244.532723 94.63247799999999 199.804878 49.57012899999995 199.804878-6.017094000000043 199.804878-61.604318000000035 244.532723-106.66666699999996 299.707317-106.66666699999996 354.881911-106.66666699999996 399.609756-61.604318000000035 399.609756-6.017094000000043ZM249.756098-6.017094000000043C249.756098 21.77651800000001 272.120021 44.30769299999997 299.707317 44.30769299999997 327.294613 44.30769299999997 349.658537 21.77651800000001 349.658537-6.017094000000043 349.658537-33.810704999999984 327.294613-56.34187899999995 299.707317-56.34187899999995 272.120021-56.34187899999995 249.756098-33.810704999999984 249.756098-6.017094000000043ZM924.097562-6.017094000000043C924.097562 49.57012899999995 879.369715 94.63247799999999 824.195121 94.63247799999999 769.020529 94.63247799999999 724.292683 49.57012899999995 724.292683-6.017094000000043 724.292683-61.604318000000035 769.020529-106.66666699999996 824.195121-106.66666699999996 879.369715-106.66666699999996 924.097562-61.604318000000035 924.097562-6.017094000000043ZM774.243902-6.017094000000043C774.243902 21.77651800000001 796.607825 44.30769299999997 824.195121 44.30769299999997 851.782419 44.30769299999997 874.146342 21.77651800000001 874.146342-6.017094000000043 874.146342-33.810704999999984 851.782419-56.34187899999995 824.195121-56.34187899999995 796.607825-56.34187899999995 774.243902-33.810704999999984 774.243902-6.017094000000043Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="star" unicode="&#58880;"
+				   d="M749.624889-84.152889c-15.672889 0-31.246222 3.882667-45.084444 11.306667l-192.526222 103.637333L319.544889-72.817778c-31.203556-16.64-70.314667-14.392889-99.043556 5.304889-29.511111 20.337778-44.743111 55.921778-38.840889 90.695111l37.703111 225.251556L56.661333 410.908444c-25.002667 24.888889-33.464889 60.984889-22.058667 94.193778 11.349333 32.910222 40.064 56.576 74.965333 61.752889l221.326222 32.896 96.128 199.580444c15.488 32.085333 48.853333 52.807111 84.992 52.807111 36.167111 0 69.518222-20.736 84.963556-52.807111l96.156444-199.580444 221.297778-32.910222c34.872889-5.162667 63.616-28.8 74.979556-61.696 11.392-33.28 2.944-69.361778-22.030222-94.250667L804.622222 248.433778l37.745778-225.28c5.845333-34.773333-9.386667-70.357333-38.812444-90.638222C787.569778-78.392889 768.938667-84.152889 749.624889-84.152889zM512.014222 91.548444c4.636444 0 9.272889-1.137778 13.482667-3.384889l205.937778-110.862222c12.373333-6.641778 28.316444-5.802667 39.936 2.133333 11.392 7.836444 17.123556 21.006222 14.890667 34.304L746.097778 253.496889c-1.507556 9.088 1.450667 18.332444 7.964444 24.832l173.141333 172.842667c9.457778 9.429333 12.686222 23.025778 8.405333 35.484444-4.380444 12.672-15.701333 21.873778-29.525333 23.921778L669.866667 545.706667c-9.315556 1.379556-17.365333 7.296-21.447111 15.786667L545.720889 774.641778c-6.030222 12.529778-19.256889 20.608-33.706667 20.608s-27.690667-8.092444-33.763556-20.622222L375.608889 561.493333c-4.081778-8.490667-12.131556-14.407111-21.447111-15.786667L117.930667 510.577778c-13.624889-2.033778-25.201778-11.434667-29.539556-23.992889-4.266667-12.416-1.024-25.984 8.433778-35.399111L269.937778 278.328889c6.513778-6.499556 9.472-15.744 7.964444-24.832l-40.135111-239.744c-2.247111-13.312 3.484444-26.439111 14.976-34.360889 11.434667-7.836444 27.349333-8.775111 39.950222-2.062222l205.852444 110.833778C502.741333 90.410667 507.377778 91.548444 512.014222 91.548444zM200.32 439.210667c-6.840889 0-12.885333 4.963556-14.023111 11.946667-1.251556 7.751111 4.010667 15.061333 11.761778 16.312889l9.443556 1.536c7.793778 1.336889 15.061333-4.010667 16.312889-11.761778 1.251556-7.751111-4.010667-15.061333-11.761778-16.312889l-9.443556-1.536C201.856 439.267556 201.073778 439.210667 200.32 439.210667zM252.544 447.687111c-6.684444 0-12.643556 4.721778-13.937778 11.534222-1.493333 7.708444 3.555556 15.175111 11.264 16.654222l153.927111 29.696 58.055111 133.148444c3.157333 7.182222 11.548444 10.496 18.716444 7.352889 7.210667-3.143111 10.510222-11.52 7.367111-18.716444l-61.056-140.017778c-1.877333-4.295111-5.745778-7.395556-10.353778-8.277333l-161.28-31.118222C254.336 447.758222 253.44 447.687111 252.544 447.687111z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="face-cry" unicode="&#59036;" d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.23020799999995 229.230208-128 512-128 629.410831-128 740.826187-88.33104600000001 830.768465-16.686661999999956 841.557579-8.092490999999995 843.33693 7.620766000000003 834.742758 18.409879000000046 826.148587 29.198990999999978 810.43533 30.978341999999998 799.646219 22.384173000000033 718.470035-42.277495000000044 618.001779-78.04878099999996 512-78.04878099999996 256.817504-78.04878099999996 49.951219 128.81750399999999 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.66323599999998 904.470807 140.039307 897.177109 128.33175700000004 900.755245 112.92820300000005 912.462793 105.63450699999999 924.170342 98.34080900000004 939.573897 101.91894200000002 946.867595 113.62649199999998 997.013826 194.11920399999997 1024 287.101621 1024 384ZM337.170731 396.487806C371.654852 396.487806 399.609756 424.442709 399.609756 458.926829 399.609756 493.41095 371.654852 521.365854 337.170731 521.365854 302.686611 521.365854 274.731708 493.41095 274.731708 458.926829 274.731708 424.442709 302.686611 396.487806 337.170731 396.487806ZM711.804879 396.487806C746.288998 396.487806 774.243902 424.442709 774.243902 458.926829 774.243902 493.41095 746.288998 521.365854 711.804879 521.365854 677.320757 521.365854 649.365854 493.41095 649.365854 458.926829 649.365854 424.442709 677.320757 396.487806 711.804879 396.487806ZM352.788105 191.21547499999997C396.165222 225.91716899999994 453.151987 246.639629 524.487806 246.639629 595.823622 246.639629 652.810387 225.91716899999994 696.187505 191.21547499999997 722.700531 170.00505399999997 738.882517 148.42907300000002 746.631548 132.931012 752.800254 120.59359800000004 747.799529 105.59142399999996 735.462114 99.42271600000004 723.124702 93.25401 708.122526 98.25473499999998 701.953818 110.59214899999995 701.03616 112.42746499999998 698.492224 116.61747600000001 694.165854 122.38597100000004 686.602473 132.47047699999996 676.927317 142.654852 664.983226 152.21012499999995 630.311565 179.947456 584.273939 196.68840999999998 524.487806 196.68840999999998 464.70167 196.68840999999998 418.664045 179.947456 383.992384 152.21012499999995 372.048292 142.654852 362.373137 132.47047699999996 354.809756 122.38597100000004 350.483386 116.61747600000001 347.93945 112.42746499999998 347.021792 110.59214899999995 340.853084 98.25473499999998 325.850908 93.25401 313.513495 99.42271600000004 301.176081 105.59142399999996 296.175356 120.59359800000004 302.344062 132.931012 310.093092 148.42907300000002 326.275078 170.00505399999997 352.788105 191.21547499999997Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="face-smile" unicode="&#59055;" d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.23020799999995 229.230208-128 512-128 629.410831-128 740.826187-88.33104600000001 830.768465-16.686661999999956 841.557579-8.092490999999995 843.33693 7.620766000000003 834.742758 18.409879000000046 826.148587 29.198990999999978 810.43533 30.978341999999998 799.646219 22.384173000000033 718.470035-42.277495000000044 618.001779-78.04878099999996 512-78.04878099999996 256.817504-78.04878099999996 49.951219 128.81750399999999 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.66323599999998 904.470807 140.039307 897.177109 128.33175700000004 900.755245 112.92820300000005 912.462793 105.63450699999999 924.170342 98.34080900000004 939.573897 101.91894200000002 946.867595 113.62649199999998 997.013826 194.11920399999997 1024 287.101621 1024 384ZM337.170731 396.487806C371.654852 396.487806 399.609756 424.442709 399.609756 458.926829 399.609756 493.41095 371.654852 521.365854 337.170731 521.365854 302.686611 521.365854 274.731708 493.41095 274.731708 458.926829 274.731708 424.442709 302.686611 396.487806 337.170731 396.487806ZM711.804879 396.487806C746.288998 396.487806 774.243902 424.442709 774.243902 458.926829 774.243902 493.41095 746.288998 521.365854 711.804879 521.365854 677.320757 521.365854 649.365854 493.41095 649.365854 458.926829 649.365854 424.442709 677.320757 396.487806 711.804879 396.487806ZM352.788105 127.22903299999996C396.165222 92.52733899999998 453.151987 71.80487900000003 524.487806 71.80487900000003 595.823622 71.80487900000003 652.810387 92.52733899999998 696.187505 127.22903299999996 722.700531 148.43945399999996 738.882517 170.01543500000002 746.631548 185.51349500000003 752.800254 197.850908 747.799529 212.85308399999997 735.462114 219.021792 723.124702 225.19049800000005 708.122526 220.18977299999995 701.953818 207.85235799999998 701.03616 206.01704299999994 698.492224 201.82703100000003 694.165854 196.058537 686.602473 185.97402899999997 676.927317 175.78965500000004 664.983226 166.23438299999998 630.311565 138.49705200000005 584.273939 121.75609799999995 524.487806 121.75609799999995 464.70167 121.75609799999995 418.664045 138.49705200000005 383.992384 166.23438299999998 372.048292 175.78965500000004 362.373137 185.97402899999997 354.809756 196.058537 350.483386 201.82703100000003 347.93945 206.01704299999994 347.021792 207.85235799999998 340.853084 220.18977299999995 325.850908 225.19049800000005 313.513495 219.021792 301.176081 212.85308399999997 296.175356 197.850908 302.344062 185.51349500000003 310.093092 170.01543500000002 326.275078 148.43945399999996 352.788105 127.22903299999996Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="circle-dot" unicode="&#58903;"
+				   d="M513.133312 830.6731560000001c-247.538793 0-448.208115-200.669322-448.208115-448.207092 0-247.538793 200.670346-448.208115 448.208115-448.208115 247.538793 0 448.208115 200.670346 448.208115 448.208115C961.341427 630.004857 760.673128 830.6731560000001 513.133312 830.6731560000001zM513.132288-6.649187999999981c-214.901465 0-389.113205 174.212764-389.113205 389.114229 0 214.902488 174.21174 389.115252 389.113205 389.115252 214.903511 0 389.115252-174.212764 389.115252-389.115252C902.24754 167.563576 728.0358-6.649187999999981 513.132288-6.649187999999981zM513.133312 382.46504100000004m-344.602456 0a336.754 336.754 0 1 1 689.204911 0 336.754 336.754 0 1 1-689.204911 0Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="survey" unicode="&#59058;" d="M722.355804 849.454545C761.006291 849.454545 792.380951 818.166023 792.380951 779.627344L792.380951 437.500928 799.081094 453.813218 401.874746 51.22138 418.539682 58.181818 138.070006 58.181818C99.387643 58.181818 68.063492 89.328555 68.063492 127.771428L68.063492 872.727273 44.698413 849.454545 722.355804 849.454545ZM21.333333 896 21.333333 872.727273 21.333333 127.771428C21.333333 63.604277 73.59726 11.636363 138.070006 11.636363L418.539682 11.636363 428.337293 11.636363 435.204619 18.596802 832.410967 421.18864 839.11111 427.979625 839.11111 437.500928 839.11111 779.627344C839.11111 843.859757 786.827324 896 722.355804 896L44.698413 896 21.333333 896ZM775.859347 307.365395 759.337741 290.90909 775.859347 274.452787 869.319663 181.361879 885.841269 164.905574 902.362876 181.361879 972.458114 251.18006 988.979721 267.636363 972.458114 284.092668 878.997796 377.183575 862.47619 393.639878 845.954583 377.183575 775.859347 307.365395ZM845.954583 344.27097 939.414901 251.18006 939.414901 284.092668 869.319663 214.274485 902.362876 214.274485 808.902558 307.365395 808.902558 274.452787 878.997796 344.27097 845.954583 344.27097ZM518.843473 51.365395 513.841133 46.382827 512.453734 39.473248 489.088655-76.890387 482.215251-111.121568 516.58227-104.275332 633.407665-81.002605 640.344663-79.620689 645.347004-74.638121 902.362876 181.361879 918.884482 197.818182 902.362876 214.274485 808.902558 307.365395 792.380951 323.821698 775.859347 307.365395 518.843473 51.365395ZM775.859347 274.452787 869.319663 181.361879 869.319663 214.274485 612.303791-41.725515 624.243127-35.361033 507.41773-58.633758 534.911345-86.018703 558.276425 30.344934 551.886686 18.452787 808.902558 274.452787 775.859347 274.452787ZM426.576706 298.269073C444.201086 298.269073 458.488469 284.053815 458.488469 266.500753L458.488469 258.086116C458.488469 240.540958 444.323959 226.317797 426.576706 226.317797L426.576706 226.317797C408.952326 226.317797 394.664943 240.533054 394.664943 258.086116L394.664943 266.500753C394.664943 284.045911 408.829453 298.269073 426.576706 298.269073L426.576706 298.269073ZM278.349205 552.435127C278.349205 552.435127 280.851125 530.485568 305.477133 530.485568 330.103138 530.485568 331.559155 552.435127 331.559155 552.435127 329.927383 623.508937 362.988497 657.25782 430.67155 653.905282 475.722639 648.839223 499.06407 623.508937 500.624896 577.839917 497.503245 557.501184 480.405116 531.202385 449.969026 499.092521 409.671358 458.489557 389.522524 422.133143 389.522524 390.023279L389.522524 357.093903C389.522524 357.093903 392.614705 337.454532 414.885933 337.454532 437.157161 337.454532 440.249342 357.093903 440.249342 357.093903L440.249342 379.965664C440.249342 406.785969 459.546816 439.044836 498.21271 476.369762 538.652271 513.471183 558.730159 547.369069 558.730159 577.839917 555.395669 662.323878 511.195938 706.353877 425.776235 709.780917 327.515198 711.419936 278.349205 658.971339 278.349205 552.435127Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="tree" unicode="&#58926;" d="M962.691679 258.53447400000005c-8.721639 54.163597-34.298154 97.584526-73.089645 133.8638-44.721551 41.825594-99.282191 65.724911-156.512636 84.432994-26.935466 8.80555-54.079686 16.971533-81.129762 25.427112 41.188074 7.485485 81.495082 10.991332 121.872698 12.269441 39.906895 1.26276 79.885422 0.276293 120.633475 0.276293-30.644951 44.233434-74.588789 71.110571-127.260405 84.384899-53.004191 13.357216-103.742782 9.715269-152.261822-32.081673 18.715247 66.336848 12.464893 120.18936-38.810934 160.830989-32.450063 25.719778-77.127611 31.000038-111.319341 14.916734 58.583257-31.127951 82.051761-84.265172 94.304829-145.102772-44.638663 69.056795-110.067838 96.432283-187.710173 86.487793-56.123228-7.187703-110.723777-26.270317-166.003801-40.048111 15.677051-14.358009 31.136138-24.116257 47.932686-27.839045 51.427276-11.399631 103.405091-20.301372 155.098427-30.524201 37.036521-7.323802 75.163887-12.144598 104.448864-40.879036-78.096682 23.458271-155.928329 30.034037-235.541551 9.092076C186.718589 530.20385 104.838743 479.821369 81.996502 429.437865c46.955428 23.955598 95.807043 18.776645 144.606469 17.139356 37.737486-1.266853 76.089979-3.461845 113.238041 1.594311 52.683896 7.170307 104.513332 20.624736 159.209048 31.909757-91.88164-62.077847-186.516997-122.342396-159.194722-259.889075 58.852386 100.205213 163.392324 150.107763 229.951229 238.105956-16.239869-91.498924 6.980995-169.376619 66.432015-237.83785 41.815361-48.152696 89.979314-92.010577 110.706381-156.013263 12.758582 141.877311-25.823132 270.789333-97.911984 396.334677C755.996107 391.809873 858.199837 325.909977 962.691679 258.53447400000005zM513.476631 320.10169099999996c-27.767414-14.065344-39.008432-35.954887-42.252313-64.998363-6.078439-54.437843-15.162328-108.532879-21.799492-162.916487-3.90903-32.026414-5.519714-64.333214-8.16496-96.53052 30.078039 0 55.507198 0 79.961146 0 9.912767 78.200036 19.732413 154.247037 28.913517 230.369761 0.883113 7.322779-0.756223 15.746636-3.705392 22.591531C536.246217 272.25086999999996 524.967336 295.41135899999995 513.476631 320.10169099999996z"  horiz-adv-x="1024" />
+			<glyph glyph-name="chat" unicode="&#58886;"
+				   d="M132.682393 414.567179c0 208.287837 166.471452 377.143593 379.317095 377.143593s385.380184-168.855756 385.380184-377.143593c0-177.196725-122.197086-325.812507-290.49821-366.259708l-116.291586-51.04763 0 41.126676C290.570353 52.175568999999996 132.682393 215.31206599999996 132.682393 414.567179zM83.799056 414.567179c0-211.946157 160.764474-387.135154 369.469819-415.152255-3.2623-20.458961-10.036587-65.024969-7.286963-65.024969 2.384303 0 114.89068 47.294143 189.700503 78.865185 176.193885 51.91437 304.518528 211.946157 304.518528 401.312038 0 231.432976-191.70823 419.042865-428.200432 419.042865S83.799056 646.0001560000001 83.799056 414.567179zM340.71952 276.63573699999995c22.935362-41.481763 89.831958-75.102489 170.391738-75.102489 79.650061 0 148.489916 32.909527 172.168198 73.681116-12.701277 5.979178-19.068288 8.02886-28.131711 12.21009-19.894096-31.257911-75.425853-59.661821-142.729725-59.661821-66.969251 0-122.836653 28.40391-143.598512 61.083194L340.71952 276.63573699999995z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="upload-circle" unicode="&#58927;" d="M512-128c282.768 0 512 229.216 512 512C1024 666.768 794.768 896 512 896 229.216 896 0 666.768 0 384 0 101.21600000000001 229.216-128 512-128zM512 848c256.272 0 464-207.744 464-464 0-256.272-207.728-464-464-464S48 127.72799999999995 48 384C48 640.256 255.728 848 512 848zM377.728 534.544L480 534.544l0-478c0-17.664 14.336-32 32-32s32 14.336 32 32L544 534.544l102.272 0c17.616 0 23.424 11.568 12.944 25.68l-128.128 172.624c-10.496 14.128-27.664 14.128-38.16 0L364.8 560.24C354.32 546.1120000000001 360.128 534.544 377.728 534.544z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="add-circle" unicode="&#58911;" d="M675.04 412.736l-127.04 0 0 127.264c0 20.064-16.288 36.32-36.32 36.32-20.064 0-36.32-16.192-36.32-36.32l0-127.232-127.072 0c-20.064 0-36.352-16.32-36.352-36.352 0-20.064 16.224-36.352 36.352-36.352l127.072 0 0-127.232c0-20 16.256-36.384 36.32-36.384 20.032 0 36.32 16.256 36.32 36.384l0 127.136 127.04 0c19.968 0 36.352 16.256 36.352 36.384C711.36 396.448 695.136 412.736 675.04 412.736L675.04 412.736zM511.328 830.56c-250.24 0-453.952-203.616-453.952-453.952 0-250.336 203.712-453.952 453.952-453.952 250.336 0 453.984 203.584 453.984 453.952C965.312 626.944 761.696 830.56 511.328 830.56L511.328 830.56zM511.328-20.576000000000022c-219.04 0-397.184 178.176-397.184 397.152 0 219.104 178.144 397.216 397.184 397.216s397.216-178.112 397.216-397.216C908.576 157.63199999999995 730.368-20.576000000000022 511.328-20.576000000000022L511.328-20.576000000000022zM511.328-20.576000000000022"  horiz-adv-x="1024" />
+			<glyph glyph-name="release" unicode="&#58889;"
+				   d="M990.78144 828.5388800000001c-3.35872 1.59744-7.04512 2.37568-11.01824 2.37568-14.45888 0-27.60704-10.81344-27.40224-10.81344-8.8064-4.42368-880.59904-443.22816-911.44192-459.44832-17.408-9.13408-27.36128-24.73984-25.92768-40.71424 1.10592-13.14816 9.78944-23.51104 23.10144-27.77088 26.17344-8.27392 290.24256-91.58656 290.24256-91.58656l4.83328-1.47456 16.67072 50.05312-254.32064 79.54432 780.73856 406.28224c-82.82112-93.88032-420.53632-476.32384-436.10112-493.93664-20.11136-22.48704-29.4912-45.09696-29.40928-70.98368l0.28672-153.27232-0.08192 0c0 0 0.08192-53.49376 0.08192-53.6576l0-1.96608 0 0c1.18784-13.5168 12.73856-24.24832 26.54208-24.24832s25.51808 10.73152 26.74688 24.24832l0 0c0 0 0.53248 191.03744 0 205.08672-0.49152 12.4928 5.07904 26.54208 10.69056 33.05472 5.65248 6.38976 390.63552 442.61376 465.75616 527.81056-21.38112-106.41408-126.68928-629.76-128.24576-637.41952-0.8192-4.05504-2.58048-4.05504-3.35872-4.05504-0.6144 0-1.31072 0.12288-2.048 0.36864-7.45472 2.37568-268.82048 81.55136-279.92064 84.91008l-4.7104 1.4336-17.16224-50.50368 5.07904-1.59744c2.58048-0.77824 258.90816-79.09376 284.38528-86.46656 5.07904-1.47456 10.24-2.2528 15.44192-2.2528 26.99264 0 49.5616 19.37408 54.8864 46.98112 2.08896 10.93632 27.0336 134.67648 55.9104 277.99552 39.77216 197.14048 84.7872 420.61824 85.93408 427.6224l0.6144 3.31776C1009.70496 798.96576 1013.26848 817.9712 990.78144 828.5388800000001z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="download-circle" unicode="&#58881;" d="M510.771521 828.211081c-244.998947 0-443.597097-198.60429-443.597097-443.590957s198.59815-443.591981 443.597097-443.591981c244.986667 0 443.583794 198.60429 443.583794 443.591981S755.758188 828.211081 510.771521 828.211081zM510.771521-30.044013999999947c-229.010811 0-414.664138 185.65435-414.664138 414.664138 0 229.010811 185.653327 414.657998 414.664138 414.657998 228.996484 0 414.652881-185.647187 414.652881-414.657998C925.424402 155.60931300000004 739.768005-30.044013999999947 510.771521-30.044013999999947zM662.749888 352.39518799999996L537.719266 245.82501100000002l0 324.388065c0 14.887059-12.06478 26.953885-26.947745 26.953885-14.894222 0-26.961048-12.066827-26.961048-26.953885l0-325.410348L357.936647 352.39518799999996c-10.56359 10.599406-27.693736 10.599406-38.267559 0-10.56359-10.596336-10.56359-27.777647 0-38.375006l170.181961-161.220868c5.629207-5.652743 13.111622-8.060583 20.49887-7.680936 7.373944-0.379647 14.859429 2.02717 20.488637 7.680936l170.181961 161.220868c10.562567 10.597359 10.562567 27.77867 0 38.375006C690.443623 362.99561700000004 673.313477 362.99561700000004 662.749888 352.39518799999996z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="templeate-1" unicode="&#58928;" d="M320 384L106.666667 384c-35.349333 0-64-28.650667-64-64l0-213.333333c0-35.349333 28.650667-64 64-64l213.333333 0c35.349333 0 64 28.650667 64 64L384 320C384 355.349333 355.349333 384 320 384zM256 341.33333300000004l0-256L170.666667 85.33333300000004 170.666667 341.33333300000004 256 341.33333300000004zM85.333333 106.66666699999996L85.333333 320c0 11.754667 9.578667 21.333333 21.333333 21.333333l42.666667 0 0-256L106.666667 85.33333300000004C94.912 85.33333300000004 85.333333 94.91200000000003 85.333333 106.66666699999996zM341.333333 106.66666699999996c0-11.754667-9.578667-21.333333-21.333333-21.333333l-42.666667 0L277.333333 341.33333300000004l42.666667 0c11.754667 0 21.333333-9.578667 21.333333-21.333333L341.333333 106.66666699999996zM576 554.666667L234.666667 554.666667c-47.061333 0-85.333333-38.272-85.333333-85.333333l0-42.666667 42.666667 0 0 42.666667c0 23.530667 19.136 42.666667 42.666667 42.666667l42.666667 0 0-96 21.333333 0L298.666667 512l213.333333 0 0-426.666667-85.333333 0-21.333333-42.666667 170.666667 0c47.061333 0 85.333333 38.272 85.333333 85.333333L661.333333 469.333333C661.333333 516.394667 623.061333 554.666667 576 554.666667zM618.666667 128c0-23.530667-19.136-42.666667-42.666667-42.666667l-42.666667 0L533.333333 512l42.666667 0c23.530667 0 42.666667-19.136 42.666667-42.666667L618.666667 128zM853.333333 42.66666699999996c47.061333 0 85.333333 38.272 85.333333 85.333333L938.666667 640c0 47.061333-38.272 85.333333-85.333333 85.333333L341.333333 725.333333c-47.061333 0-85.333333-38.272-85.333333-85.333333l0-42.666667 42.666667 0 0 42.666667c0 23.530667 19.136 42.666667 42.666667 42.666667l85.333333 0 0-85.333333 21.333333 0 0 85.333333 298.666667 0 0-597.333333-42.666667 0-21.333333-42.666667L853.333333 42.66666699999996zM896 128c0-23.530667-19.136-42.666667-42.666667-42.666667l-85.333333 0L768 682.666667l85.333333 0c23.530667 0 42.666667-19.136 42.666667-42.666667L896 128z"  horiz-adv-x="1024" />
+			<glyph glyph-name="list" unicode="&#58890;"
+				   d="M618.04471 733.97072l-397.175835 0c-16.927531 0-30.699186-13.771655-30.699186-30.699186l0-638.543068c0-16.927531 13.771655-30.699186 30.699186-30.699186l582.261227 0c16.927531 0 30.699186 13.771655 30.699186 30.699186l-0.726547 476.760404L618.04471 733.97072zM803.771715 541.488871 619.537713 541.488871 619.537713 705.552483 803.771715 541.488871zM813.363164 64.728466c0-5.64251-4.590552-10.233062-10.233062-10.233062l-582.261227 0c-5.64251 0-10.233062 4.590552-10.233062 10.233062l0 638.543068c0 5.64251 4.590552 10.233062 10.233062 10.233062l378.202715 0 0-192.481849 214.291574 0L813.363164 64.728466zM298.129516 482.495268l55.258535 0 0-55.258535-55.258535 0 0 55.258535ZM399.777591 468.168981l323.364759 0 0-26.605961-323.364759 0 0 26.605961ZM298.129516 342.044446l55.258535 0 0-55.258535-55.258535 0 0 55.258535ZM399.777591 327.718159l323.364759 0 0-26.605961-323.364759 0 0 26.605961ZM298.129516 199.804884l55.258535 0 0-55.258535-55.258535 0 0 55.258535ZM399.777591 185.478598l323.364759 0 0-26.605961-323.364759 0 0 26.605961ZM881.315812 53.053566"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="util" unicode="&#58929;" d="M282.127566 639.0826059999999c-13.120832-13.221116-30.625508-20.50808-49.278333-20.50808-18.618033 0-36.157501 7.286963-49.311079 20.50808l-32.885991 33.019021 98.623181 99.027387 32.885991-33.019021c13.186324-13.221116 20.473287-30.829146 20.473287-49.548486C302.599829 669.8769589999999 295.347658 652.26893 282.127566 639.0826059999999L282.127566 639.0826059999999zM249.308089 705.0899489999999l-0.032746 0-32.884968-32.987299c4.418636-4.417613 10.252505-6.845918 16.458857-6.845918 6.206352 0 12.041244 2.428306 16.426111 6.813173 4.418636 4.452405 6.845918 10.288321 6.845918 16.493649C256.121262 694.802652 253.693979 700.671313 249.308089 705.0899489999999L249.308089 705.0899489999999zM396.703067 496.343671L249.578242 638.778684l32.278147 33.626865 147.157571-142.468782L396.703067 496.343671 396.703067 496.343671zM751.45979 133.92852400000004L618.131179 274.071332l32.884968 32.985252 133.330658-140.141784L751.45979 133.92852400000004 751.45979 133.92852400000004zM850.184279 67.95597399999997c-22.700001-22.766516-52.481282-34.168194-82.264609-34.168194-29.714765 0-59.395762 11.333116-81.994456 34.033118L538.194592 222.398462l32.884968 33.021068L718.811206 100.806149c27.117614-27.183106 71.269183-27.116591 98.488105 0.169869 27.186176 27.287483 27.117614 71.773673-0.135076 99.196233l-147.426701 154.273642 32.851199 33.021068 147.461493-154.308435C895.447159 187.557956 895.514697 113.421468 850.184279 67.95597399999997L850.184279 67.95597399999997zM801.716404 468.380806c-30.726815-30.860868-71.605851-47.861054-115.082038-47.861054-43.442418 0-84.321454 16.999163-115.082038 47.861054-30.760584 30.861892-47.692209 71.877027-47.692209 115.521037s16.931624 84.691891 47.692209 115.554806l42.497906 42.666752 32.885991-32.986275-42.497906-42.667775c-21.99085-22.090111-34.099632-51.367925-34.065863-82.566484 0-31.163767 12.108782-60.441581 34.065863-82.499969 21.956058-22.058388 51.16531-34.20094 82.196047-34.20094 31.064506 0 60.239989 12.142551 82.196047 34.20094l42.49893 42.665729 32.884968-33.019021L801.716404 468.380806 801.716404 468.380806zM844.214311 511.049604l-49.311079 49.51267-16.45988-16.493649c-17.538445-17.638729-40.879036-27.352975-65.73719-27.352975l-0.032746 0c-24.824385 0-48.198745 9.713222-65.73719 27.352975-17.539468 17.607006-27.252691 41.082674-27.252691 66.007343 0 24.925692 9.679453 48.400337 27.252691 66.040089l16.458857 16.495696-49.344848 49.51267 32.885991 33.021068 82.196047-82.533738-49.311079-49.482995c-8.769734-8.835226-13.626345-20.571525-13.626345-33.051767 0-12.446473 4.856611-24.183795 13.626345-32.987299 8.768711-8.835226 20.439518-13.69286 32.884968-13.69286 12.411681 0 24.082488 4.857635 32.852222 13.69286l49.344848 49.514717 82.196047-82.534761L844.214311 511.049604 844.214311 511.049604zM233.591129 129.139451l0 46.681182 46.512337 0 0-46.681182L233.591129 129.139451 233.591129 129.139451zM538.160823 356.538555l-92.247984 91.572602 32.717146 33.18889 92.214215-91.539856L538.160823 356.538555 538.160823 356.538555zM304.2187 101.04355599999997l173.634596 239.842507 37.641295-27.454282L338.318332 69.23715300000003c-21.923312-22.057365-51.132564-34.20094-82.19707-34.20094-31.028691 0-60.237943 12.143575-82.196047 34.168194-21.958104 22.057365-34.065863 51.335179-34.065863 82.533738 0 31.198559 12.107759 60.476373 34.065863 82.533738l2.765997 2.360767L417.243893 412.054963l27.353998-37.742603L205.596542 200.00340600000004c-12.411681-13.053294-19.224854-30.119995-19.224854-48.26526 0-18.71934 7.252171-36.291554 20.438495-49.513694C232.747925 76.15265599999998 277.775444 75.71263499999998 304.2187 101.04355599999997L304.2187 101.04355599999997z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="face-surprised" unicode="&#58980;" d="M485.656116-128C221.592397-128 6.762016 86.81718000000001 6.762016 350.87649799999997s214.830381 478.867697 478.8941 478.867697c264.041716 0 478.854495-214.812779 478.854495-478.867697S749.697832-128 485.656116-128zM485.656116 798.834741c-247.024795 0-447.975846-200.959852-447.975846-447.962644 0-247.002792 200.951051-447.962644 447.975846-447.962644 247.002792 0 447.953843 200.959852 447.953843 447.962644C933.609959 597.8748889999999 732.658908 798.834741 485.656116 798.834741zM352.033458 447.380528c0-30.469398-24.682677-55.147675-55.143274-55.147675-30.451796 0-55.143274 24.678276-55.143274 55.147675 0 30.460597 24.691478 55.138874 55.143274 55.138874C327.350781 502.519402 352.033458 477.845526 352.033458 447.380528zM674.417647 502.519402c-30.460597 0-55.156476-24.678276-55.156476-55.138874 0-30.469398 24.695879-55.147675 55.156476-55.147675 30.451796 0 55.143274 24.678276 55.143274 55.147675C729.560922 477.845526 704.869444 502.519402 674.417647 502.519402zM562.005634 165.30976499999997c0-59.733046-34.192262-108.165484-76.349518-108.165484-42.166057 0-76.36272 48.432438-76.36272 108.165484 0 59.724245 34.196663 108.152282 76.36272 108.152282C527.813371 273.45764699999995 562.005634 225.03400999999997 562.005634 165.30976499999997zM835.631745 793.712503c0 0 12.871605 56.819883 41.959231 85.925112 29.083226 29.096427 69.915916 15.124685 78.492585-8.801097 9.461179-26.385689-2.033053-50.069442-29.092027-56.164202C899.404495 808.463141 874.880237 826.192952 835.631745 793.712503zM916.698651 757.570797c0 0 35.767659 20.576965 64.877288 19.393218 29.136032-1.174946 41.431165-29.144833 33.109728-45.110024-9.192746-17.588993-27.054573-22.966463-43.217788-11.797871C954.979023 731.44034 952.453108 752.721393 916.698651 757.570797z"  horiz-adv-x="1024" />
+			<glyph glyph-name="chart" unicode="&#58924;"
+				   d="M953.440991 315.668729L784.061302 315.668729 681.06451 437.392024c-0.312108 0.373507-0.635473 0.737804-0.969071 1.094938-0.013303 0.014326-0.026606 0.027629-0.039909 0.041956-0.276293 0.293689-0.559748 0.582261-0.851391 0.86367-0.053212 0.051165-0.107447 0.099261-0.160659 0.150426-0.249687 0.237407-0.50142 0.470721-0.76134 0.697895-0.089028 0.078795-0.181125 0.153496-0.272199 0.230244-0.225127 0.191358-0.451278 0.381693-0.683569 0.565888-0.124843 0.099261-0.251733 0.192382-0.3776 0.288572-0.200568 0.153496-0.402159 0.306992-0.607844 0.454348-0.159636 0.11461-0.322341 0.224104-0.485047 0.334621-0.177032 0.12075-0.354064 0.242524-0.535189 0.35918-0.195451 0.12689-0.394996 0.246617-0.593518 0.367367-0.152473 0.092098-0.302899 0.186242-0.457418 0.275269-0.237407 0.137123-0.477884 0.268106-0.718361 0.397043-0.121773 0.065492-0.2415 0.132006-0.364297 0.195451-0.283456 0.146333-0.571005 0.285502-0.859577 0.420579-0.085958 0.040932-0.170892 0.082888-0.257873 0.122797-0.337691 0.154519-0.679475 0.298805-1.022283 0.437975-0.044002 0.017396-0.086981 0.036839-0.130983 0.055259-1.604544 0.638543-3.2623 1.113357-4.948709 1.416256-0.343831 0.062422-0.687662 0.112564-1.031493 0.160659-0.055259 0.008186-0.110517 0.01842-0.165776 0.025583-1.633197 0.216941-3.25923 0.26913-4.861728 0.173962-0.013303-0.001023-0.026606-0.001023-0.040932-0.002047-0.363274-0.022513-0.724501-0.054235-1.085728-0.091074-0.060375-0.00614-0.119727-0.011256-0.180102-0.017396-0.310062-0.034792-0.618077-0.077771-0.926092-0.122797-0.116657-0.017396-0.232291-0.032746-0.348947-0.051165-0.24764-0.040932-0.494257-0.086981-0.740874-0.135076-0.178055-0.033769-0.355087-0.067538-0.532119-0.105401-0.183172-0.039909-0.36532-0.083911-0.547469-0.127913-0.237407-0.056282-0.474814-0.113587-0.710175-0.176009-0.12075-0.032746-0.240477-0.068562-0.360204-0.102331-0.292666-0.082888-0.584308-0.168846-0.874927-0.26299-0.063445-0.020466-0.125867-0.042979-0.188288-0.063445-0.338714-0.112564-0.675382-0.230244-1.010003-0.357134-0.019443-0.007163-0.038886-0.01535-0.058328-0.022513-1.493004-0.571005-2.948145-1.284249-4.340865-2.149966-0.067538-0.041956-0.13303-0.088004-0.200568-0.12996-0.273223-0.172939-0.545422-0.346901-0.813528-0.531096-1.416256-0.971118-2.734274-2.089591-3.936659-3.333932-0.025583-0.026606-0.049119-0.053212-0.074701-0.079818-0.26299-0.275269-0.521886-0.555655-0.773619-0.843204-0.058328-0.066515-0.112564-0.134053-0.169869-0.200568-0.211824-0.246617-0.420579-0.496304-0.62217-0.751107-0.083911-0.106424-0.164752-0.214894-0.246617-0.322341-0.167822-0.218988-0.334621-0.437975-0.49528-0.663102-0.102331-0.14224-0.199545-0.287549-0.298805-0.431835-0.13303-0.194428-0.26606-0.387833-0.393973-0.586354-0.115634-0.179079-0.225127-0.360204-0.335644-0.541329-0.103354-0.168846-0.207731-0.336668-0.306992-0.508583-0.12689-0.220011-0.24764-0.443092-0.36839-0.666172-0.074701-0.138146-0.151449-0.275269-0.223081-0.416486-0.137123-0.265036-0.265036-0.533143-0.39295-0.802272-0.050142-0.105401-0.101307-0.209778-0.150426-0.316202-0.144286-0.317225-0.279363-0.63752-0.410346-0.958838-0.026606-0.064468-0.055259-0.127913-0.080841-0.193405-0.150426-0.378623-0.291642-0.760317-0.423649-1.14508-0.005117-0.016373-0.011256-0.031722-0.017396-0.048095-0.157589-0.463558-0.303922-0.930185-0.434905-1.400906l-97.897657-342.642824L435.093423 811.832042c-0.071631 0.569982-0.165776 1.13587-0.275269 1.696642-0.008186 0.040932-0.017396 0.081864-0.025583 0.12382-0.071631 0.356111-0.148379 0.709151-0.234337 1.061169-0.031722 0.128937-0.065492 0.255827-0.099261 0.38374-0.066515 0.254803-0.135076 0.508583-0.208754 0.760317-0.060375 0.206708-0.124843 0.411369-0.190335 0.615007-0.053212 0.166799-0.107447 0.332575-0.164752 0.49835-0.092098 0.26913-0.190335 0.535189-0.290619 0.800225-0.037862 0.098237-0.074701 0.196475-0.113587 0.293689-0.12382 0.313132-0.25378 0.623193-0.38988 0.930185-0.022513 0.050142-0.044002 0.100284-0.066515 0.150426-0.152473 0.338714-0.311085 0.672312-0.477884 1.00284-0.01228 0.024559-0.024559 0.049119-0.037862 0.074701-0.173962 0.343831-0.356111 0.682545-0.545422 1.017166-0.011256 0.019443-0.022513 0.039909-0.033769 0.059352-0.188288 0.330528-0.382717 0.654916-0.584308 0.975211-0.021489 0.034792-0.044002 0.068562-0.065492 0.103354-0.190335 0.298805-0.385786 0.592494-0.587378 0.88209-0.045025 0.065492-0.091074 0.12996-0.137123 0.194428-0.180102 0.252757-0.363274 0.502443-0.551562 0.74906-0.079818 0.105401-0.162706 0.208754-0.24457 0.312108-0.157589 0.199545-0.317225 0.396019-0.480954 0.590448-0.124843 0.149403-0.252757 0.295735-0.381693 0.442068-0.125867 0.14224-0.251733 0.284479-0.38067 0.424672-0.174985 0.191358-0.355087 0.378623-0.536212 0.563842-0.088004 0.090051-0.176009 0.180102-0.26606 0.26913-0.224104 0.222057-0.452301 0.440022-0.684592 0.653893-0.054235 0.050142-0.10847 0.100284-0.163729 0.150426-0.265036 0.240477-0.535189 0.474814-0.810459 0.704035-0.028653 0.023536-0.056282 0.047072-0.084934 0.070608-0.294712 0.243547-0.595564 0.479931-0.902556 0.711198-0.01535 0.011256-0.029676 0.022513-0.045025 0.033769-0.311085 0.232291-0.627287 0.458441-0.949628 0.677429-0.019443 0.013303-0.037862 0.025583-0.057305 0.038886-0.309038 0.208754-0.623193 0.411369-0.942465 0.606821-0.045025 0.027629-0.090051 0.054235-0.134053 0.081864-0.288572 0.174985-0.581238 0.343831-0.877997 0.50756-0.090051 0.050142-0.181125 0.098237-0.272199 0.147356-0.25071 0.134053-0.502443 0.265036-0.759293 0.391926-0.156566 0.077771-0.314155 0.151449-0.472767 0.226151-0.194428 0.091074-0.38988 0.182149-0.587378 0.268106-0.239454 0.105401-0.481977 0.204661-0.724501 0.302899-0.12382 0.049119-0.246617 0.100284-0.37146 0.148379-0.334621 0.128937-0.673335 0.249687-1.014096 0.36532-0.042979 0.014326-0.085958 0.029676-0.128937 0.044002-1.6158 0.536212-3.296069 0.915859-5.02034 1.119497-0.01535 0.002047-0.029676 0.004093-0.044002 0.00614-0.309038 0.035816-0.620124 0.062422-0.931209 0.086981-0.132006 0.010233-0.265036 0.025583-0.397043 0.033769-0.174985 0.011256-0.349971 0.01535-0.525979 0.022513-0.270153 0.01228-0.539282 0.024559-0.808412 0.027629-0.054235 0.001023-0.10847-0.001023-0.162706-0.001023-1.696642 0.010233-3.371794-0.149403-5.006014-0.466628-0.065492-0.01228-0.12996-0.027629-0.195451-0.039909-0.331551-0.067538-0.662079-0.13917-0.989537-0.218988-0.148379-0.035816-0.295735-0.075725-0.443092-0.11461-0.234337-0.061398-0.468674-0.124843-0.700965-0.192382-0.224104-0.065492-0.445138-0.135076-0.666172-0.206708-0.149403-0.048095-0.297782-0.096191-0.446162-0.147356-0.286526-0.098237-0.568958-0.201591-0.850367-0.309038-0.079818-0.030699-0.160659-0.061398-0.240477-0.093121-0.330528-0.12996-0.655939-0.267083-0.979304-0.410346-0.033769-0.01535-0.067538-0.029676-0.101307-0.045025-0.355087-0.159636-0.705058-0.325411-1.050935-0.500397-0.008186-0.004093-0.016373-0.008186-0.023536-0.01228-0.360204-0.182149-0.714268-0.372483-1.064238-0.569982-0.004093-0.002047-0.008186-0.005117-0.013303-0.007163-0.344854-0.196475-0.684592-0.399089-1.019213-0.610914-0.020466-0.013303-0.040932-0.025583-0.060375-0.038886-0.313132-0.199545-0.621147-0.404206-0.925069-0.61603-0.050142-0.034792-0.099261-0.070608-0.149403-0.105401-0.268106-0.190335-0.532119-0.38374-0.791016-0.583285-0.091074-0.069585-0.181125-0.141216-0.271176-0.212848-0.212848-0.167822-0.422625-0.337691-0.629333-0.512676-0.137123-0.11461-0.271176-0.232291-0.406253-0.349971-0.154519-0.1361-0.308015-0.272199-0.459464-0.412392-0.179079-0.164752-0.354064-0.332575-0.528026-0.502443-0.102331-0.100284-0.204661-0.199545-0.304945-0.301875-0.211824-0.212848-0.418532-0.430812-0.623193-0.651846-0.059352-0.064468-0.119727-0.128937-0.179079-0.194428-0.231267-0.254803-0.456395-0.515746-0.678452-0.780783-0.031722-0.037862-0.063445-0.075725-0.095167-0.11461-0.23536-0.285502-0.465604-0.577145-0.688685-0.874927-0.01842-0.024559-0.036839-0.048095-0.055259-0.072655-0.226151-0.301875-0.445138-0.60989-0.657986-0.923022-0.019443-0.028653-0.038886-0.057305-0.058328-0.084934-0.202615-0.300852-0.400113-0.606821-0.590448-0.916882-0.032746-0.053212-0.064468-0.105401-0.096191-0.158612-0.169869-0.282433-0.335644-0.567935-0.49528-0.857531-0.053212-0.097214-0.105401-0.194428-0.158612-0.292666-0.130983-0.24457-0.258896-0.490164-0.381693-0.73985-0.080841-0.162706-0.157589-0.326435-0.234337-0.491187-0.088004-0.189312-0.177032-0.378623-0.260943-0.571005-0.107447-0.245593-0.209778-0.493234-0.310062-0.741897-0.047072-0.11768-0.095167-0.234337-0.141216-0.354064-0.130983-0.340761-0.25378-0.684592-0.370437-1.030469-0.013303-0.037862-0.026606-0.075725-0.038886-0.113587-0.180102-0.543376-0.345877-1.092891-0.48914-1.650593L244.22942 305.59939599999996 67.355037 305.59939599999996c-14.128789 0-25.582655-11.453866-25.582655-25.582655s11.453866-25.582655 25.582655-25.582655l191.314257 0c0.867764 0 1.725294 0.044002 2.570545 0.128937 0.828878-0.080841 1.656733-0.1361 2.478448-0.1361 11.218506 0 21.512966 7.439436 24.644283 18.779715l113.358791 410.43686 103.412254-723.884758c0.00921-0.072655 0.021489-0.145309 0.030699-0.217964l0.046049-0.320295c0.002047-0.011256 0.005117-0.021489 0.00614-0.032746 0.109494-0.7552 0.25071-1.502213 0.425695-2.238994 0.01535-0.064468 0.031722-0.12689 0.047072-0.191358 0.166799-0.679475 0.358157-1.350764 0.579191-2.01182 0.041956-0.124843 0.088004-0.24764 0.130983-0.37146 0.210801-0.600681 0.437975-1.194198 0.692778-1.77646 0.068562-0.156566 0.144286-0.309038 0.215918-0.464581 0.223081-0.484024 0.460488-0.961908 0.713244-1.431605 0.106424-0.196475 0.213871-0.390903 0.325411-0.584308 0.265036-0.462534 0.545422-0.914836 0.838088-1.359974 0.088004-0.13303 0.170892-0.268106 0.260943-0.399089 0.354064-0.51677 0.732687-1.016143 1.12359-1.506307 0.078795-0.099261 0.156566-0.198521 0.237407-0.296759 0.420579-0.511653 0.864694-1.004887 1.325182-1.482771 0.051165-0.052189 0.101307-0.105401 0.152473-0.157589 0.494257-0.50449 1.010003-0.989537 1.548262-1.454118 0.00921-0.007163 0.017396-0.014326 0.026606-0.022513 1.636267-1.408069 3.466961-2.620687 5.466502-3.592828 0.075725-0.036839 0.151449-0.074701 0.228197-0.11154 0.576121-0.273223 1.165546-0.525979 1.768273-0.75827 0.158612-0.061398 0.319272-0.118704 0.478907-0.177032 0.558725-0.202615 1.124614-0.393973 1.704828-0.559748 0.005117-0.001023 0.010233-0.002047 0.01535-0.004093 0.278339-0.079818 0.562818-0.13917 0.844228-0.209778 0.394996-0.098237 0.789992-0.194428 1.184989-0.274246 0.283456-0.056282 0.568958-0.103354 0.854461-0.149403 0.445138-0.073678 0.889253-0.134053 1.333368-0.183172 0.229221-0.024559 0.456395-0.052189 0.686638-0.071631 0.710175-0.059352 1.418302-0.099261 2.122337-0.099261 0.337691 0 0.671289 0.027629 1.007957 0.040932 0.276293 0.011256 0.550539 0.013303 0.828878 0.033769 0.401136 0.029676 0.799202 0.079818 1.196245 0.127913 0.191358 0.022513 0.38067 0.033769 0.572028 0.061398 0.069585 0.010233 0.1361 0.024559 0.205685 0.034792 0.232291 0.034792 0.462534 0.075725 0.692778 0.116657 0.463558 0.082888 0.921999 0.176009 1.3743 0.283456 0.109494 0.025583 0.218988 0.047072 0.327458 0.074701 0.582261 0.145309 1.152243 0.316202 1.716084 0.499373 0.098237 0.031722 0.196475 0.063445 0.293689 0.097214 1.90335 0.644683 3.694135 1.50119 5.351891 2.540869 0.014326 0.00921 0.028653 0.01842 0.042979 0.027629 1.089821 0.686638 2.121314 1.452071 3.087315 2.287089 0.083911 0.071631 0.167822 0.143263 0.25071 0.215918 0.424672 0.3776 0.837064 0.76748 1.235131 1.170662 0.12382 0.124843 0.243547 0.254803 0.36532 0.382717 0.317225 0.334621 0.626263 0.677429 0.925069 1.028423 0.155543 0.183172 0.308015 0.36839 0.458441 0.556679 0.26606 0.331551 0.523933 0.670266 0.773619 1.01512 0.130983 0.180102 0.261966 0.35918 0.387833 0.543376 0.294712 0.429789 0.575098 0.86981 0.843204 1.316995 0.099261 0.165776 0.195451 0.334621 0.290619 0.503467 0.283456 0.499373 0.555655 1.004887 0.806365 1.52268 0.031722 0.065492 0.060375 0.13303 0.091074 0.199545 0.276293 0.584308 0.530073 1.178849 0.762363 1.784646 0.00614 0.017396 0.014326 0.034792 0.020466 0.051165 0.251733 0.661056 0.472767 1.336438 0.669242 2.020006 0.002047 0.008186 0.00614 0.016373 0.008186 0.024559l0.061398 0.215918c0.029676 0.106424 0.062422 0.210801 0.090051 0.317225l117.579929 411.527704 79.800487-94.308923c0.070608-0.083911 0.146333-0.161682 0.217964-0.243547 0.190335-0.220011 0.38374-0.436952 0.581238-0.649799 0.134053-0.144286 0.26913-0.285502 0.405229-0.425695 0.164752-0.168846 0.331551-0.335644 0.50142-0.500397 0.164752-0.159636 0.329505-0.319272 0.496304-0.473791 0.138146-0.12689 0.279363-0.25071 0.419556-0.37453 0.198521-0.174985 0.397043-0.350994 0.599657-0.518816 0.081864-0.067538 0.166799-0.132006 0.249687-0.198521 0.817622-0.661056 1.667989-1.264806 2.545986-1.811252 0.098237-0.061398 0.195451-0.125867 0.294712-0.185218 0.228197-0.138146 0.459464-0.267083 0.691755-0.398066 0.157589-0.089028 0.315178-0.178055 0.474814-0.264013 0.200568-0.107447 0.403183-0.208754 0.606821-0.311085 0.202615-0.101307 0.406253-0.201591 0.611937-0.297782 0.173962-0.080841 0.348947-0.159636 0.523933-0.237407 0.245593-0.10847 0.494257-0.212848 0.743944-0.313132 0.144286-0.058328 0.289596-0.115634 0.434905-0.171915 0.291642-0.11154 0.586354-0.216941 0.883113-0.317225 0.11154-0.037862 0.223081-0.076748 0.334621-0.113587 0.337691-0.109494 0.677429-0.210801 1.02126-0.305969 0.078795-0.021489 0.157589-0.046049 0.236384-0.066515 0.376577-0.101307 0.757247-0.193405 1.140986-0.277316 0.050142-0.011256 0.100284-0.023536 0.150426-0.034792 0.405229-0.085958 0.813528-0.162706 1.225921-0.229221 0.031722-0.005117 0.063445-0.01228 0.096191-0.017396 0.412392-0.065492 0.828878-0.12075 1.24741-0.165776 0.032746-0.004093 0.064468-0.00921 0.097214-0.01228 0.382717-0.039909 0.768503-0.068562 1.155313-0.092098 0.068562-0.004093 0.1361-0.01228 0.204661-0.01535 0.25992-0.013303 0.521886-0.01535 0.782829-0.020466 0.188288-0.004093 0.376577-0.01535 0.564865-0.01535 0.008186 0 0.01535 0.001023 0.023536 0.001023l181.208085 0c14.129812 0 25.582655 11.453866 25.582655 25.582655S967.56978 315.668729 953.440991 315.668729z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="edit" unicode="&#58946;" d="M769.089 516.251l-125.896 125.89 62.974 62.947c20.866 20.838 54.652 20.838 75.517 0l50.353-50.351c20.865-20.865 20.865-54.703 0-75.567L769.089 516.251zM403.349 150.52700000000004L277.453 276.418 619.706 615.982 745.601 490.09ZM176.314 47.283000000000015L252.912 251.87699999999995 377.753 127.01199999999994Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="speaker" unicode="&#58949;" d="M587.182306 754.7203c-6.003737 2.705622-13.043061 1.642406-17.984606-2.721994l-259.223926-229.293243-148.246369 0c-9.253758 0-16.752546-7.498788-16.752546-16.756639l0-267.886213c0-9.249665 7.498788-16.756639 16.752546-16.756639l144.050814 0c9.253758 0 16.752546 7.506974 16.752546 16.756639L322.530764 490.391099c1.774413 0.704035 3.433192 1.719154 4.892427 3.010567l236.127905 208.861912 0-653.332912-160.751171 137.64287c-2.12643 1.824555-90.300632 78.69941-93.927229 76.162634-4.427846-3.097548-15.768125-17.59882-18.419512-22.512736-0.953721-1.768273-2.196015-1.334391 15.413038-16.379039 25.674753-21.936615 73.780377-61.548798 75.144444-62.717414l10.007935-8.570189 178.388876-152.761196c3.093455-2.653433 6.978948-4.028757 10.900258-4.028757 2.369977 0 4.756327 0.503467 7.003508 1.534959 5.939269 2.738367 9.749038 8.677637 9.749038 15.217586L597.060281 739.446431C597.060281 746.034477 593.190137 752.013655 587.182306 754.7203L587.182306 754.7203zM290.453185 254.814756l-115.040083 0L175.413102 489.195877l115.03906 0 0-234.381122L290.453185 254.814756zM747.742119 375.98444300000006c0-51.55212-34.83232-96.658434-84.702124-109.693308-1.415232-0.375553-2.846838-0.551562-4.245697-0.551562-7.438413 0-14.234189 4.992711-16.200984 12.523221-2.338255 8.949836 3.021823 18.104333 11.967566 20.442588 35.136242 9.18929 59.672054 40.96397 59.672054 77.279061 0 36.307927-24.535813 68.090794-59.672054 77.271898-8.945743 2.346441-14.305821 11.492752-11.967566 20.450774 2.342348 8.953929 11.499915 14.305821 20.446681 11.967566C712.909799 472.643899 747.742119 427.530422 747.742119 375.98444300000006L747.742119 375.98444300000006zM864.950588 375.793084c0-88.87619-48.554856-170.44495-126.718053-212.883505-2.537799-1.375324-5.276167-2.02717-7.982812-2.02717-5.939269 0-11.69946 3.166109-14.733563 8.762571-4.417613 8.134261-1.39886 18.303878 6.727215 22.720468 67.350944 36.566824 109.198028 106.851587 109.198028 183.427636 0 76.844156-42.055838 147.272181-109.741403 183.78784-8.154727 4.396123-11.192923 14.557554-6.795776 22.700001 4.38896 8.142447 14.558577 11.184737 22.701025 6.795776C816.151162 546.697499 864.950588 464.976266 864.950588 375.793084L864.950588 375.793084z"  horiz-adv-x="1024" />
+			<glyph glyph-name="ok-circle" unicode="&#4101;"
+				   d="M516.152065-63.152063c-60.696384 0-119.594819 11.894911-175.056991 35.353183-53.55473 22.651906-101.646028 55.073316-142.936433 96.364745-41.291428 41.291428-73.712839 89.381703-96.363721 142.936433-23.458271 55.462173-35.353183 114.359584-35.353183 175.055968s11.894911 119.594819 35.353183 175.056991c22.651906 53.55473 55.073316 101.646028 96.363721 142.936433 41.290405 41.291428 89.381703 73.712839 142.936433 96.363721 55.462173 23.458271 114.359584 35.353183 175.056991 35.353183s119.594819-11.894911 175.056991-35.353183c53.55473-22.651906 101.645005-55.073316 142.936433-96.363721 41.291428-41.290405 73.711815-89.38068 96.363721-142.936433 23.459295-55.462173 35.353183-114.359584 35.353183-175.056991 0-60.696384-11.893888-119.593795-35.353183-175.055968-22.651906-53.55473-55.072293-101.645005-96.363721-142.936433s-89.381703-73.712839-142.936433-96.364745C635.747907-51.25715200000002 576.849472-63.152063 516.152065-63.152063zM516.152065 774.870222c-214.115566 0-388.311956-174.196391-388.311956-388.311956s174.196391-388.311956 388.311956-388.311956 388.311956 174.196391 388.311956 388.311956S730.268654 774.870222 516.152065 774.870222zM434.74908 132.830517L209.49278 358.08784 289.087583 437.68162 434.74908 292.020122 743.218594 600.488613 822.812373 520.89381Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="down" unicode="&#58906;" d="M888.306 619.94c15.615 15.617 40.93 15.617 56.545 0v0c15.617-15.615 15.617-40.93 0-56.545l-405.733-405.734c-15.615-15.617-40.928-15.617-56.545 0v0c-15.615 15.615-15.615 40.93 0 56.545l405.733 405.734zM538.619 214.20600000000002c15.617-15.615 15.617-40.93 0-56.545v0c-15.615-15.617-40.928-15.617-56.545 0l-405.734 405.734c-15.615 15.615-15.615 40.93 0 56.545v0c15.617 15.617 40.93 15.617 56.547 0l405.732-405.734zM538.619 214.20600000000002z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="file" unicode="&#58913;" d="M887.443911 598.6304l0-44.578133 0-45.511111 0-477.866667c0-37.705956-30.560711-68.266667-68.266667-68.266667l-614.4 0c-37.705956 0-68.266667 30.560711-68.266667 68.266667l0 705.422222c0 37.6832 30.560711 68.266667 68.266667 68.266667l386.844444 0 45.511111 0 38.024533 0c7.805156 2.594133 16.566044 1.2288 22.778311-5.006222l183.136711-183.159467C885.919289 611.373511 887.876267 604.9564439999999 887.443911 598.6304zM659.888356 531.296711c-12.583822 0-22.755556 10.171733-22.755556 22.755556l0 204.8-45.511111 0-364.088889 0c-25.122133 0-45.511111-20.388978-45.511111-45.511111l0-659.911111c0-25.122133 20.388978-45.511111 45.511111-45.511111l568.888889 0c25.122133 0 45.511111 20.388978 45.511111 45.511111l0 455.111111 0 22.755556L659.888356 531.296711zM682.643911 750.273422l0-173.4656 159.288889 0 0 14.176711L682.643911 750.273422z"  horiz-adv-x="1024" />
+			<glyph glyph-name="layim-theme" unicode="&#58907;"
+				   d="M958.830745 538.643056L740.659817 692.753993l-100.539834 0-3.977591-9.332553c-0.37146-0.871857-38.021965-86.8613-124.772748-88.667435-35.691897 0.76441-67.206658 15.500019-93.680613 43.828204-20.658506 22.106484-30.374798 44.584428-30.456662 44.776809l-3.955078 9.393951-100.587929 0L64.518433 538.643056 169.320337 379.756349l89.956801 65.019853-19.016099-368.05254 268.86654 0 4.093225 0 269.866311 0-19.016099 368.051517 89.956801-65.018829L958.830745 538.643056zM730.105437 507.20402l20.655436-399.781172-237.540068 0-4.093225 0L272.587282 107.42284700000005l20.656459 399.781172-115.938546-83.797521-36.3243 55.070246 159.440315 111.641683-19.276019 30.638811L121.066333 508.667348l-14.548344 22.056342 185.921433 131.330094 71.077825 0c5.332449-10.04375 15.433504-26.779923 30.951943-43.580564 32.047904-34.69622 72.256674-53.486168 116.345822-54.411237l0-0.031722c0.203638 0.00307 0.406253 0.01228 0.60989 0.016373 0.203638-0.00307 0.406253-0.013303 0.60989-0.016373l0 0.031722c44.073798 0.925069 84.359316 19.703761 116.566856 54.379515 15.623839 16.821107 25.814945 33.579793 31.188326 43.612287l71.120804 0 185.921433-131.330094-14.548344-22.056342L742.203986 620.7551920000001l-19.276019-30.638811 159.440315-111.641683-36.3243-55.070246L730.105437 507.20402z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="layouts" unicode="&#58930;" d="M917.213-103.239h-810.426c-23.151 0-41.918 18.766-41.918 41.917l0 698.644c0 23.148 18.767 41.917 41.918 41.917h810.426c23.149 0 41.918-18.769 41.918-41.917v-698.643c0-23.151-18.769-41.918-41.918-41.918zM316.38-61.321h600.833v363.294h-600.833v-363.294zM106.787-61.321h167.674v363.294h-167.674v-363.294zM148.705 637.322c-23.151 0-41.918-18.769-41.918-41.92s18.767-41.92 41.918-41.92 41.92 18.768 41.92 41.92-18.769 41.92-41.92 41.92zM274.461 637.322c-23.151 0-41.918-18.769-41.918-41.92s18.767-41.92 41.918-41.92c23.151 0 41.92 18.768 41.92 41.92s-18.77 41.92-41.92 41.92zM400.216 637.322c-23.15 0-41.918-18.769-41.918-41.92s18.769-41.92 41.918-41.92c23.152 0 41.92 18.768 41.92 41.92s-18.768 41.92-41.92 41.92zM875.293 511.566h-768.506v-167.675h810.426l0 167.675h-41.921z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="rate-half" unicode="&#59081;" d="M1012.064 504l-359.552 31.008-140.512 331.04-140.512-331.552-359.552-30.496 273.024-236.544-82.016-351.552 309.056 186.528 309.056-186.528-81.504 351.552 272.544 236.544zM512 195.96799999999996l0 465.056 85.504-202.016 219.04-19.008-166.016-144.032 50.016-214.016-188.512 114.016z"  horiz-adv-x="1024" />
+			<glyph glyph-name="table" unicode="&#58925;"
+				   d="M304.738028 343.684806M729.544153 511.153982M595.52788 637.723655M143.806755 686.614156l0-601.704045L881.172549 84.91011100000003l0 601.704045L143.806755 686.614156zM420.318416 299.80441299999995l0 128.936581 184.341448 0 0-128.936581L420.318416 299.80441299999995zM604.659865 256.825552l0-128.936581L420.318416 127.88897099999997l0 128.936581L604.659865 256.825552zM604.659865 600.656435l0-128.936581L420.318416 471.719854l0 128.936581L604.659865 600.656435zM374.232798 600.656435l0-128.936581L189.89135 471.719854l0 128.936581L374.232798 600.656435zM189.89135 428.740994L374.232798 428.740994l0-128.936581L189.89135 299.80441299999995 189.89135 428.740994zM650.745483 428.740994l184.341448 0 0-128.936581L650.745483 299.80441299999995 650.745483 428.740994zM650.745483 471.719854l0 128.936581 184.341448 0 0-128.936581L650.745483 471.719854zM189.89135 256.825552L374.232798 256.825552l0-128.936581L189.89135 127.88897099999997 189.89135 256.825552zM650.745483 127.88897099999997l0 128.936581 184.341448 0 0-128.936581L650.745483 127.88897099999997z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="add-circle-fine" unicode="&#58888;" d="M509.989715-60.972421000000054c-246.734474 0-446.75195 200.023616-446.75195 446.75809 0 246.732427 200.017476 446.75195 446.75195 446.75195 246.733451 0 446.757067-200.019523 446.757067-446.75195C956.746782 139.051195 756.723166-60.972421000000054 509.989715-60.972421000000054L509.989715-60.972421000000054zM509.989715 812.433746c-235.633648 0-426.650123-191.014428-426.650123-426.648077 0-235.639788 191.016475-426.654216 426.650123-426.654216 235.638765 0 426.654216 191.014428 426.654216 426.654216C936.643931 621.419318 745.62848 812.433746 509.989715 812.433746L509.989715 812.433746zM527.863804 153.46957999999995l-35.741016 0L492.122789 367.909533 277.678742 367.909533 277.678742 403.653619l214.443024 0L492.121765 618.0956189999999l35.741016 0L527.862781 403.653619l214.442 0 0-35.744086L527.863804 367.909533 527.863804 153.46957999999995 527.863804 153.46957999999995zM527.863804 153.46957999999995"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="prev-circle" unicode="&#58931;" d="M508.638018 827.97307c-246.403458 0-446.845649-200.463469-446.845649-446.845649 0-246.382179 200.442191-446.845649 446.845649-446.845649 246.382179 0 446.845649 200.463469 446.845649 446.845649C955.483667 627.5096 755.041476 827.97307 508.638018 827.97307zM508.638018-23.16149900000005c-222.933422 0-404.28892 181.355498-404.28892 404.28892 0 222.933422 181.355498 404.28892 404.28892 404.28892 222.912144 0 404.28892-181.355498 404.28892-404.28892C912.926939 158.19399899999996 731.57144-23.16149900000005 508.638018-23.16149900000005zM252.87208 485.1999c8.639016 26.129831-32.470784 37.215859-41.067243 11.32009-27.810822-83.730363-22.321004-168.545923 14.086277-248.573851 11.362646-24.938243 48.025268-3.298146 36.747735 21.491148C230.976644 339.081373 228.806251 412.853462 252.87208 485.1999zM599.262572 247.73335499999996l-127.627629 133.394065 127.47868 133.223838c9.043305 9.064583 9.022026 23.789211-0.021278 32.832516-8.809243 8.830521-24.087108 8.766686-32.832516 0l-148.310199-148.310199c-4.617405-4.638683-6.979303-11.064749-6.553736-17.746156-0.404289-6.702685 1.936331-13.107472 6.575015-17.788712l148.310199-148.28892c4.383343-4.383343 10.213615-6.787798 16.405619-6.787798 6.170726 0 12.000997 2.404455 16.405619 6.787798C608.156928 224.114371 608.156928 238.83899899999994 599.262572 247.73335499999996z"  horiz-adv-x="1024" />
+			<glyph glyph-name="right" unicode="&#58882;"
+				   d="M283.648 721.9189759999999L340.873216 780.926976 740.352 383.99795200000005 340.876288-12.925952000000052 283.648 46.07795199999998 619.52 383.99795200000005Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="read" unicode="&#59141;" d="M335.282306 712.495464C399.587328 713.451107 442.778899 696.882717 470.183494 669.3706540000001 479.127332 660.39174 485.691302 650.857363 490.241971 641.442689 492.795622 636.159553 494.049041 632.438701 494.358795 631.0740940000001L493.723712 636.7409230000001 493.723706 196.90019600000005C493.723706 199.018106 495.816045 203.920655 503.591595 207.36436700000002 511.039185 210.66283299999998 515.68422 209.16527399999995 517.176538 207.906613L500.671543 188.33763 521.297207 203.50146800000005C514.140179 213.23636899999997 499.631258 225.71450900000002 476.134074 237.35914000000002 439.577969 255.475456 390.86048 266.10507900000005 328.491925 266.10508200000004 265.860796 266.10508200000004 219.424582 255.71817999999996 186.827162 237.741581 164.977332 225.69198700000004 152.538132 212.28117299999997 147.220271 201.30886999999996L170.257196 190.14374199999997 151.035786 207.05224299999998C152.884078 209.15336100000002 158.307299 211.80336599999998 167.849005 208.050434 177.092077 204.41496099999995 179.2 199.20011699999998 179.2 196.66445199999998L179.2 497.049743 179.2 636.7409230000001 175.817447 624.023021C177.078908 626.226721 180.088681 630.807811 184.828724 636.965629 192.95423 647.521524 202.792594 658.127492 214.297641 668.007961 247.526453 696.544681 287.381649 713.209056 334.514421 712.495571L335.282306 712.495464ZM335.289387 763.689705C274.661039 764.607483 223.081402 743.04085 180.940156 706.850184 156.32698 685.712527 139.975514 664.470237 131.382553 649.4588249999999L128 643.549699 128 636.7409230000001 128 497.049743 128 196.66445199999998C128 159.26104999999995 164.542545 144.88818300000003 189.478606 173.23524099999997L191.776657 175.84764199999995 193.294121 178.978613C194.07832 180.59664399999997 199.156367 186.07133399999998 211.552092 192.907243 236.030601 206.40648099999999 274.024879 214.905082 328.491925 214.905082 383.221547 214.905079 424.163878 205.97190999999998 453.399258 191.483569 469.376966 183.56540600000005 477.614626 176.48075300000005 480.045882 173.17379000000005L481.844905 170.72677999999996 484.166551 168.768644C511.279708 145.90070000000003 544.923706 160.801293 544.923706 196.90019600000005L544.923712 636.740922 544.288627 642.407751C540.427211 659.419023 529.175531 682.697124 506.45814 705.503602 468.987716 743.1209699999999 412.352271 764.846461 334.521502 763.689812L335.289387 763.689705ZM0 506.026694L0 27.856867999999963C0-8.875636999999983 34.793167-23.40043300000002 61.4635 1.2485080000000153L63.46242 3.315859000000046C65.301149 5.444836000000009 69.655573 9.862312999999972 76.498228 15.820363000000043 88.306297 26.101906999999983 102.566352 36.46294 119.251411 46.17438500000003 167.295691 74.13829099999998 224.90855 90.95018200000004 292.337329 90.95018200000004 358.378978 90.95018000000005 409.459345 71.66956600000003 448.125308 39.64774 461.506042 28.56627400000002 472.380655 16.734758000000056 480.912593 4.997000999999955 485.832384-1.7713730000000396 488.762874-6.741985999999997 489.872527-9.02252199999998 496.058545-21.73590200000001 511.379537-27.027375000000006 524.092917-20.84135500000002 536.806298-14.655337000000031 542.097771 0.6656550000000152 535.91175 13.379036000000042 527.471002 30.726293000000055 509.777717 55.06771800000001 480.782336 79.08069999999998 433.134118 118.54132300000003 370.586889 142.15017999999998 292.337329 142.15018199999997 215.474895 142.15018499999996 149.074727 122.77408400000002 93.495781 90.424668 59.761154 70.78961500000003 36.872315 50.859801999999945 24.713677 36.78188399999999L44.088049 20.048869999999965 26.712598 38.84923500000002C28.162783 40.189508000000046 32.877261 41.946117999999956 40.792576 38.64178100000004 49.035365 35.200736000000006 51.2 30.12989200000004 51.2 27.856867999999963L51.2 506.026694C51.2 520.165184 39.73849 531.626694 25.6 531.626694 11.46151 531.626694 0 520.165184 0 506.026694L0 506.026694ZM696.80221 763.689812C618.971441 764.846461 562.335996 743.1209699999999 524.86557 705.503602 502.148181 682.697124 490.896501 659.419023 487.035083 642.407751L486.4 636.740922 486.400004 196.90019600000005C486.400006 160.801293 520.044004 145.90070000000003 547.157161 168.768644L549.478807 170.72677999999996 551.27783 173.17379000000005C553.709086 176.48075300000005 561.946746 183.56540600000005 577.924452 191.483569 607.159834 205.97190999999998 648.102165 214.905079 702.831787 214.905082 757.298833 214.905082 795.293111 206.40648099999999 819.77162 192.907243 832.167345 186.07133399999998 837.245391 180.59664399999997 838.029591 178.978613L839.547055 175.84764199999995 841.845105 173.23524099999997C866.781167 144.88818300000003 903.323712 159.26104999999995 903.323712 196.66445199999998L903.323712 497.049743 903.323712 636.7409230000001 903.323712 643.549699 899.941158 649.4588249999999C891.348196 664.470237 874.996732 685.712527 850.383556 706.850184 808.24231 743.04085 756.662673 764.607483 696.034325 763.689705L696.80221 763.689812ZM696.809291 712.495571C743.942063 713.209056 783.797257 696.544681 817.026071 668.007961 828.531119 658.127492 838.369481 647.521524 846.494989 636.965629 851.235031 630.807811 854.244804 626.226721 855.506263 624.023021L852.123712 636.7409230000001 852.123712 497.049743 852.123712 196.66445199999998C852.123712 199.20011699999998 854.231635 204.41496099999995 863.474707 208.050434 873.016412 211.80336599999998 878.439633 209.15336100000002 880.287925 207.05224299999998L861.066515 190.14374199999997 884.103441 201.30886999999996C878.785579 212.28117299999997 866.346381 225.69198700000004 844.49655 237.741581 811.89913 255.71817999999996 765.462916 266.10508200000004 702.831785 266.10508200000004 640.463232 266.10507900000005 591.745741 255.475456 555.189638 237.35914000000002 531.692454 225.71450900000002 517.183533 213.23636899999997 510.026502 203.50146800000005L530.652166 188.33763 514.147172 207.906613C515.63949 209.16527399999995 520.284527 210.66283299999998 527.732117 207.36436700000002 535.507665 203.920655 537.600004 199.018106 537.600004 196.90019600000005L537.6 636.7409230000001 536.964917 631.0740940000001C537.274671 632.438701 538.52809 636.159553 541.081741 641.442689 545.63241 650.857363 552.196378 660.39174 561.140218 669.3706540000001 588.544813 696.882717 631.736384 713.451107 696.041406 712.495464L696.809291 712.495571ZM972.799998 506.026694L972.799998 27.856867999999963C972.799998 30.12989200000004 974.964631 35.200736000000006 983.207422 38.64178100000004 991.122737 41.946117999999956 995.837214 40.189508000000046 997.287401 38.84923500000002L979.911949 20.048869999999965 999.286321 36.78188399999999C987.127682 50.859801999999945 964.238844 70.78961500000003 930.504218 90.424668 874.925269 122.77408400000002 808.525103 142.15018499999996 731.662669 142.15018199999997 653.132708 142.15017999999998 590.55104 117.26282200000003 543.127755 75.73800100000005 514.370099 50.55719499999998 496.945662 25.10259599999995 488.705389 7.022771000000034 482.841769-5.842485000000011 488.517717-21.02524200000005 501.382974-26.888862000000017 514.248233-32.752481999999986 529.430987-27.07653300000004 535.294607-14.211275 536.420563-11.740835999999945 539.350332-6.450639000000024 544.25735 0.7178109999999833 552.731727 13.097653000000037 563.54464 25.561581000000047 576.856734 37.21792900000003 615.190044 70.78337499999998 665.901421 90.95018000000005 731.662669 90.95018200000004 799.091447 90.95018200000004 856.704307 74.13829099999998 904.748587 46.17438500000003 921.433645 36.46294 935.6937 26.101906999999983 947.501771 15.820363000000043 954.344425 9.862312999999972 958.698848 5.444836000000009 960.537577 3.315859000000046L962.536497 1.2485080000000153C989.206831-23.40043300000002 1023.999998-8.875636999999983 1023.999998 27.856867999999963L1023.999998 506.026694C1023.999998 520.165184 1012.538487 531.626694 998.399998 531.626694 984.261508 531.626694 972.799998 520.165184 972.799998 506.026694L972.799998 506.026694Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="404" unicode="&#58908;" d="M300.197309 299.705317l4.427931 1.803972c1.147982-2.787956 10.167841-7.543882 26.89558-14.267777l5.411915-12.955798c10.659833-24.927611 23.123639-62.483024 37.555413-112.66624 14.431775 5.575913 34.439462 0.983985 60.351057-13.611787l1.803972-4.427931L389.575913 107.828315l18.203716-42.639334c2.459962-5.575913-12.463805-15.579757-44.7713-29.847534-11.151826 7.215887-19.84369 9.675849-26.403587 7.05189l-0.983985 2.131967c-10.823831 25.419603-16.235746 42.311339-16.399744 50.675208l-4.427931-1.803972 6.3959-14.923767-11.151826-4.263933c-41.655349-16.235746-71.830878-18.695708-90.690583-7.871877l-4.427931-1.803972-1.803972 4.263933c-7.05189 16.727739 3.607944 77.406791 32.307495 182.037156 11.479821 4.427931 19.1877 14.923767 22.959641 31.323511C281.337604 290.685458 291.83344 296.425368 300.197309 299.705317L300.197309 299.705317zM216.230621 80.276746c28.371557 19.515695 40.999359 32.799488 38.047406 39.68738-0.983985 2.131967-0.65599 5.575913 0.65599 10.167841l-0.983985 2.131967c-25.5836-21.483664-38.047406-32.963485-37.391416-34.439462C215.246637 88.804612 215.082639 83.064702 216.230621 80.276746L216.230621 80.276746zM216.722614 72.896861l0.983985-2.131967c11.643818 1.147982 21.155669 3.279949 28.699552 6.231903 0.819987 0.327995 7.379885 5.411915 19.84369 15.251762l-0.983985 2.131967c-7.543882-2.951954-12.7918-0.983985-15.743754 6.067905C226.398463 85.032671 215.574632 75.848815 216.722614 72.896861L216.722614 72.896861zM225.90647 143.743754l11.151826 4.263933c-1.147982-2.623959-6.3959-8.691864-15.579757-18.53171-2.295964-10.823831-2.787956-17.547726-1.639974-20.335682 27.715567 20.663677 40.34337 33.783472 37.883408 39.523382l0.819987 10.331839-3.443946-3.935939-9.019859-3.443946-0.983985 2.131967c11.151826 4.263933 17.875721 16.891736 20.49968 37.719411l-0.983985 2.131967C239.35426 172.443306 227.21845 160.307495 227.874439 157.027546L225.90647 143.743754 225.90647 143.743754zM231.646381 173.42729l0.983985-2.131967 2.131967 0.819987c28.371557 23.123639 40.179372 40.179372 35.423447 51.331198 1.475977 0.65599 1.967969 1.639974 1.475977 2.951954l-2.295964-0.819987c-28.863549-21.647662-40.999359-38.047406-36.407431-49.035234C231.482383 175.723254 230.990391 174.73927 231.646381 173.42729L231.646381 173.42729zM240.994234 211.966688l0.983985-2.131967c13.775785 10.331839 35.915439 29.847534 66.418962 58.21909l2.131967 0.819987-6.3959 14.923767 0.491992 5.083921-2.295964-0.819987c-36.571429-32.963485-55.431134-51.82319-56.579116-56.743113L240.994234 211.966688 240.994234 211.966688zM311.67713 107.336323l-35.751441-13.939782c-1.475977-0.491992-6.887892-4.263933-16.235746-11.315823l0.819987-1.967969 12.299808 2.131967 20.007687 7.871877c11.643818 4.591928 32.143498 19.84369 61.171044 46.08328l-6.3959 14.923767-2.131967-0.819987c-24.107623-16.891736-34.439462-29.191544-31.159513-36.899423C315.449071 110.616272 314.629084 108.484305 311.67713 107.336323L311.67713 107.336323zM267.889814 264.773863l0.819987-1.967969c17.875721 16.891736 27.387572 25.419603 28.207559 25.747598l-0.983985 2.131967-8.855862-3.443946C274.941704 282.485586 268.545804 274.941704 267.889814 264.773863L267.889814 264.773863zM275.597694 222.954516c16.071749-37.883408 20.007687-67.894939 11.971813-90.034593l-3.443946-28.863549 26.89558 10.495836c-7.543882 30.011531-18.367713 65.598975-32.471493 106.926329l-0.983985 2.131967L275.597694 222.954516 275.597694 222.954516zM279.369635 231.810378l6.3959-14.923767c13.44779 15.087764 24.435618 24.271621 32.63549 27.55157l-3.607944 8.527867-2.459962 11.643818-2.131967-0.819987C289.045484 247.06214 278.713645 236.566304 279.369635 231.810378L279.369635 231.810378zM292.817425 194.58296c23.943626 17.219731 33.619475 30.995516 29.191544 41.491352l-2.787956 6.3959-2.295964-0.819987c-21.483664-18.859705-30.667521-31.651505-27.879564-38.3754L292.817425 194.58296 292.817425 194.58296zM294.457399 190.483024l2.787956-6.3959 2.295964-11.807816 2.295964 0.819987-0.491992-5.083921 6.3959-14.923767 32.471493 27.387572-6.3959 15.087764c-9.347854-10.331839-16.235746-16.399744-20.827675-18.203716l-2.295964-0.983985c-0.65599 1.639974 6.067905 10.167841 20.335682 25.419603l-3.115951 13.611787-0.983985 2.131967L294.457399 190.483024 294.457399 190.483024zM307.413197 148.171685l2.787956-6.3959 2.295964-11.643818c23.943626 17.219731 35.259449 27.387572 33.94747 30.503523l-5.411915 12.955798C329.224856 165.719411 318.07303 157.191544 307.413197 148.171685L307.413197 148.171685zM355.792441 131.935939c-23.779628-17.711723-34.111467-30.011531-30.995516-37.227418l1.475977-9.347854c25.255605 18.039718 36.899423 29.355541 34.931454 33.783472 24.435618 21.155669 38.703395 32.471493 42.803331 33.94747l-0.819987 1.967969c-1.803972 2.787956-6.723895 4.099936-14.595772 4.427931l-30.831518-31.9795L355.792441 131.935939 355.792441 131.935939zM327.912876 81.26073l4.591928-10.659833-0.491992-5.083921 2.295964 0.819987c23.451634 14.595772 34.275464 23.615631 32.63549 27.55157l-5.411915 12.955798L327.912876 81.26073 327.912876 81.26073zM333.816784 61.253043l5.411915-12.7918c25.747598 13.283792 37.719411 22.139654 35.915439 26.403587l-4.591928 10.659833C348.412556 70.272902 336.112748 62.237028 333.816784 61.253043L333.816784 61.253043zM357.596413 139.971813l1.803972-4.099936c4.919923 1.967969 8.527867 9.839846 10.823831 23.943626l-2.295964-0.819987C364.648302 147.679693 361.204356 141.44779 357.596413 139.971813L357.596413 139.971813zM731.674568 256.081999l3.935939-0.163997c-0.163997-2.459962 4.755926-9.019859 14.759769-19.515695l-0.65599-11.315823c-1.147982-21.975657-5.411915-53.955157-12.955798-95.774504 12.627803-0.65599 25.911595-10.659833 39.68738-30.175529l-0.163997-3.935939-47.887252-10.823831-1.967969-37.719411c-0.327995-4.919923-14.923767-7.379885-43.951313-7.379885-5.575913 9.019859-11.151826 13.775785-16.891736 13.939782l0.163997 1.967969c1.147982 22.467649 3.279949 36.735426 6.231903 42.967329l-3.935939 0.163997-0.65599-13.119795-9.839846 0.491992c-36.571429 1.803972-60.023062 9.839846-70.026906 24.271621l-3.935939 0.163997 0.163997 3.771941c0.819987 14.759769 30.667521 56.087124 89.706598 124.14606 10.167841-0.491992 19.515695 4.755926 28.371557 15.579757C714.290839 255.754004 724.294683 256.573991 731.674568 256.081999L731.674568 256.081999zM587.848815 115.86419l-0.163997-1.967969c9.019859-2.951954 16.891736-4.591928 23.615631-4.919923 0.65599 0 7.379885 1.475977 20.171685 4.755926l0.163997 1.967969c-6.723895 0.327995-9.839846 3.607944-9.511851 9.675849C599.328635 121.6041 588.012812 118.324151 587.848815 115.86419L587.848815 115.86419zM590.144779 121.440102c28.043562 5.083921 42.147341 10.659833 42.475336 16.727739 0.163997 1.803972 1.475977 4.263933 4.099936 7.215887l0.163997 1.967969c-26.731582-7.379885-40.015375-11.807816-40.179372-13.119795C592.440743 128.163997 590.308776 123.900064 590.144779 121.440102L590.144779 121.440102zM620.15631 165.227418l9.839846-0.491992c-1.803972-1.475977-7.871877-4.427931-18.367713-8.527867-5.575913-7.215887-8.527867-12.13581-8.527867-14.595772 28.043562 6.067905 42.147341 11.643818 42.311339 16.727739l4.263933 7.379885-3.935939-1.803972-8.035874 0.327995 0.163997 1.967969c9.839846-0.491992 19.351698 6.559898 28.863549 21.155669l0.163997 1.967969c-26.23959-7.379885-39.68738-12.463805-40.34337-14.923767L620.15631 165.227418 620.15631 165.227418zM670.667521 109.960282l-31.487508 1.475977c-1.31198 0-6.559898-0.983985-16.071749-2.951954l-0.163997-1.803972 9.839846-2.459962 17.711723-0.819987c10.331839-0.491992 30.995516 4.099936 61.991031 13.939782l0.65599 13.119795-1.803972 0.163997c-23.943626-4.591928-36.079436-10.167841-36.407431-16.891736C674.603459 110.944266 673.29148 109.796284 670.667521 109.960282L670.667521 109.960282zM635.244074 185.399103l-0.163997-1.967969 1.803972-0.163997c29.355541 7.70788 44.279308 16.563741 44.7713 26.23959 1.31198 0 2.131967 0.491992 2.131967 1.639974l-1.967969 0.163997c-29.191544-6.3959-44.115311-14.595772-44.607303-24.271621C635.900064 187.039078 635.244074 186.547085 635.244074 185.399103L635.244074 185.399103zM685.755285 207.37476c-1.803972-33.29148-9.675849-56.907111-23.615631-70.682896l-12.955798-20.171685 23.779628-1.147982c5.247918 24.763613 10.167841 54.611147 14.595772 89.870596l0.163997 1.967969L685.755285 207.37476 685.755285 207.37476zM656.071749 210.818706l-0.163997-1.967969c13.939782 3.115951 37.391416 10.167841 70.354901 21.155669l1.803972-0.163997 0.65599 13.119795 2.295964 3.607944-1.967969 0.163997c-39.03139-12.299808-59.859065-20.007687-62.483024-23.287636L656.071749 210.818706 656.071749 210.818706zM670.339526 68.46893l-0.65599-11.315823c23.943626 1.31198 35.915439 3.935939 36.079436 7.70788l0.491992 9.347854C684.443306 70.272902 672.471493 68.304933 670.339526 68.46893L670.339526 68.46893zM673.29148 85.196669l-0.491992-9.347854-2.295964-3.607944 1.967969-0.163997c22.631646 2.951954 33.94747 6.231903 34.111467 9.511851l0.65599 11.315823L673.29148 85.196669 673.29148 85.196669zM712.158873 113.568225c-23.943626-5.247918-36.079436-10.987828-36.407431-17.219731l-2.295964-7.379885c25.255605 5.083921 37.883408 9.511851 38.211403 13.44779 25.747598 7.543882 40.34337 11.151826 43.951313 10.987828l0.163997 1.803972c-0.327995 2.623959-3.443946 5.247918-9.347854 8.035874l-34.439462-13.44779L712.158873 113.568225 712.158873 113.568225zM682.147341 141.611787l-0.327995-5.73991-2.459962-9.347854c23.943626 4.755926 36.079436 8.691864 36.079436 11.479821l0.65599 11.315823C704.778988 147.351698 693.463165 144.727739 682.147341 141.611787L682.147341 141.611787zM688.051249 177.199231l-0.327995-5.73991-2.623959-9.511851 1.967969-0.163997-2.295964-3.607944-0.65599-13.119795 33.94747 9.511851 0.65599 13.283792c-10.659833-4.591928-18.039718-6.723895-21.975657-6.559898l-1.967969 0.163997c0 1.475977 8.199872 5.411915 24.271621 12.13581l2.623959 11.151826 0.163997 1.967969L688.051249 177.199231 688.051249 177.199231zM688.215247 180.807175c23.943626 4.755926 36.243434 11.807816 36.735426 20.991672l0.327995 5.73991-1.967969 0.163997c-22.631646-6.887892-34.275464-13.283792-34.603459-19.1877L688.215247 180.807175 688.215247 180.807175zM691.82319 212.786675l-0.65599-13.119795c15.415759 6.723895 26.89558 10.003844 34.111467 9.511851l0.327995 7.543882 2.459962 9.511851-1.803972 0.163997C704.450993 220.986547 692.971172 216.558616 691.82319 212.786675L691.82319 212.786675zM695.103139 240.994234l-0.163997-1.803972c19.351698 6.559898 29.355541 9.839846 30.339526 9.839846l0.163997 1.967969-7.871877 0.327995C706.746957 251.818065 699.367072 248.374119 695.103139 240.994234L695.103139 240.994234zM716.422806 118.980141l-0.163997-3.607944c4.427931-0.163997 10.003844 4.427931 16.727739 14.10378l-1.967969 0.163997C724.45868 122.26009 719.538757 118.816143 716.422806 118.980141L716.422806 118.980141zM479.118514 382.196028c53.627162 10.167841 89.870596 1.967969 109.222293-24.599616 9.675849-18.695708 15.579757-33.455477 17.875721-44.279308 11.807816-56.743113-5.903908-103.154388-53.299167-138.741832-12.463805-5.083921-22.631646-8.363869-30.339526-10.003844-31.651505-6.067905-63.631006 5.083921-95.938501 33.455477-9.347854 16.399744-15.251762 31.159513-18.039718 44.279308-13.283792 63.795003 1.967969 108.238309 45.919283 133.165919L479.118514 382.196028 479.118514 382.196028zM410.075593 265.429853c6.231903 5.247918 11.479821 8.199872 15.579757 9.019859-9.675849-9.347854-14.431775-15.087764-13.939782-17.219731-0.327995-5.411915-0.163997-10.167841 0.819987-14.267777l2.131967 0.327995c24.271621 15.743754 35.915439 25.5836 35.095452 29.519539l-2.131967 10.003844c-4.099936-3.607944-8.035874-5.73991-11.643818-6.559898l-0.819987 4.099936c10.823831 2.131967 15.251762 11.971813 13.44779 29.519539l-1.967969-0.327995c-22.467649-16.399744-34.603459-27.715567-36.407431-33.94747C409.255605 273.30173 409.255605 269.857783 410.075593 265.429853L410.075593 265.429853zM410.23959 286.257527c33.127482 21.647662 47.887252 40.34337 44.607303 56.251121-29.683536-23.615631-44.443306-36.079436-44.279308-37.555413C409.747598 295.769379 409.5836 289.537476 410.23959 286.257527L410.23959 286.257527zM412.699552 315.777066l0.491992-2.131967c27.059577 20.663677 44.607303 37.227418 52.643177 49.527226 10.331839 1.967969 17.055734 7.379885 20.49968 16.235746l-2.131967-0.491992C447.303011 372.028187 423.523382 350.872518 412.699552 315.777066L412.699552 315.777066zM414.339526 234.926329c2.459962-4.919923 4.263933-9.347854 5.083921-13.44779 18.859705 14.759769 30.339526 22.467649 34.111467 23.123639l-3.771941 18.039718C444.18706 261.493914 432.379244 252.310058 414.339526 234.926329L414.339526 234.926329zM421.883408 220.002562c2.131967-9.839846 5.247918-14.759769 9.675849-14.759769l27.879564 21.975657c-0.327995 1.147982-2.131967 6.231903-5.411915 15.415759C437.299167 228.530429 426.639334 220.986547 421.883408 220.002562L421.883408 220.002562zM432.707239 199.174888c5.083921-5.903908 8.527867-8.691864 10.495836-8.363869l3.935939 0.819987c10.987828 10.495836 19.1877 16.235746 24.599616 17.219731-0.819987 3.935939-3.935939 8.855862-9.511851 14.759769C442.21909 209.014734 432.379244 200.814862 432.707239 199.174888L432.707239 199.174888zM448.450993 185.563101l0.491992-2.131967c2.459962 0.491992 6.3959-0.819987 11.807816-3.771941 18.859705 10.003844 28.207559 16.727739 28.207559 19.84369-6.067905 1.639974-9.511851 4.427931-10.331839 8.363869C466.818706 202.946829 456.814862 195.566944 448.450993 185.563101L448.450993 185.563101zM469.442665 179.331198l0.491992-2.131967 14.923767 0.65599 12.627803 2.459962c2.459962 0.491992 8.199872 3.771941 17.547726 9.839846l-0.491992 2.131967c-6.887892-1.31198-13.611787 0.163997-20.49968 4.263933L469.442665 179.331198 469.442665 179.331198zM476.494555 249.030109l4.591928-21.811659c2.951954-14.431775 12.463805-25.091608 28.535554-31.9795l4.099936 0.819987c24.599616 34.275464 32.143498 73.798847 22.795644 118.570147l-2.459962 11.971813-6.231903 19.515695-6.067905-1.147982c-3.935939-0.819987-14.267777 0-30.831518 2.295964C473.870596 316.597053 469.278668 283.961563 476.494555 249.030109L476.494555 249.030109zM476.494555 363.172325l0.327995-1.967969c10.823831-2.131967 17.547726-3.115951 20.007687-2.623959 13.939782 10.167841 21.647662 17.875721 23.287636 23.287636l-21.319667-1.967969C496.174247 379.408072 488.630365 373.832159 476.494555 363.172325L476.494555 363.172325zM508.966047 363.172325l3.771941 2.787956c1.147982 0.163997 6.231903-2.951954 15.087764-9.675849 10.331839 13.119795 18.203716 20.171685 23.779628 21.155669-0.65599 2.951954-8.199872 4.263933-22.467649 4.099936C515.361947 370.716208 508.638053 364.648302 508.966047 363.172325L508.966047 363.172325zM511.590006 185.235106l0.491992-2.131967 4.099936 0.819987c19.84369 3.771941 35.751441 17.219731 47.723254 40.34337C554.557335 214.754644 537.173607 201.634849 511.590006 185.235106L511.590006 185.235106zM521.921845 197.534914c38.211403 24.271621 56.087124 42.311339 53.79116 53.79116 1.967969 4.919923 2.623959 8.527867 2.295964 10.823831-35.095452-26.567585-51.495195-44.935298-49.363229-54.939142C526.349776 206.71877 524.217809 203.602819 521.921845 197.534914L521.921845 197.534914zM528.64574 352.348495l7.543882-15.251762 2.131967 0.491992c4.263933 5.73991 13.283792 14.431775 27.059577 25.911595l-0.491992 2.131967c-5.411915 5.247918-8.363869 8.855862-8.855862 10.823831l-4.099936-0.819987L528.64574 352.348495 528.64574 352.348495zM536.845612 333.324792l4.263933-9.675849-0.491992-8.363869 4.099936 0.819987c19.515695 17.711723 29.027546 27.059577 28.863549 28.371557l-0.491992 2.131967c-1.967969 9.347854-4.263933 13.611787-7.05189 13.119795C548.817425 342.508648 539.141576 333.652787 536.845612 333.324792L536.845612 333.324792zM539.797566 236.402306c27.715567 19.84369 40.999359 32.63549 39.68738 38.703395 1.31198 7.215887 1.803972 12.13581 1.147982 14.759769l-1.967969-0.327995-35.095452-29.519539C540.78155 245.586163 539.469571 237.714286 539.797566 236.402306L539.797566 236.402306zM542.257527 307.413197l2.459962-11.971813 10.003844 3.935939c-7.05189-7.871877-10.331839-12.627803-10.003844-14.267777-0.65599-10.495836-0.819987-16.727739-0.327995-18.695708 18.695708 13.611787 30.831518 24.927611 36.243434 33.94747l-2.459962 11.971813c-7.05189-7.05189-12.7918-10.987828-16.727739-11.807816 8.035874 11.315823 13.939782 17.383728 17.711723 18.039718l-4.099936 19.84369C554.557335 320.532992 543.733504 310.201153 542.257527 307.413197L542.257527 307.413197zM307.249199 569.153107c-9.675849 0-17.711723-6.887892-19.84369-16.071749-4.263933-12.463805 1.639974-28.863549 29.519539-35.751441 1.31198 35.587444 0 49.527226 0 49.527226C313.809097 568.33312 310.693145 569.153107 307.249199 569.153107L307.249199 569.153107zM709.862908 537.173607c0-1.147982 0-2.131967-0.163997-3.115951 2.131967 3.279949 3.279949 7.215887 3.279949 11.479821 0 11.643818-9.183857 21.155669-20.49968 21.155669-3.443946 0-6.723895-0.819987-9.511851-2.459962C697.891095 563.905189 709.862908 551.933376 709.862908 537.173607L709.862908 537.173607zM531.761691 520.281871c0.65599 15.743754-32.963485 49.199231-32.963485 49.199231 0-18.203716 9.347854-42.803331 12.463805-48.707239-8.035874-11.643818-13.283792-32.307495-13.283792-32.307495S531.105701 504.374119 531.761691 520.281871L531.761691 520.281871zM488.794363 507.326073c2.459962 0 4.427931 1.967969 4.427931 4.427931 0 2.459962-1.967969 4.427931-4.427931 4.427931-2.459962 0-4.427931-1.967969-4.427931-4.427931C484.366432 509.294042 486.334401 507.326073 488.794363 507.326073L488.794363 507.326073zM445.335042 629.668161c-0.819987 8.855862-2.131967 16.235746-2.131967 16.235746s-53.627162 7.05189-63.959001-30.503523C395.151826 632.94811 427.623318 631.144138 445.335042 629.668161L445.335042 629.668161zM620.648302 614.908392c-9.675849 37.719411-63.303011 31.651505-63.303011 31.651505s-1.475977-7.379885-2.459962-16.235746C572.597053 631.636131 605.232543 632.784113 620.648302 614.908392L620.648302 614.908392zM419.587444 518.313901c29.847534 0 53.955157 21.975657 53.955157 49.035234 0 27.059577-24.271621 49.035234-53.955157 49.035234-29.847534 0-53.955157-21.975657-53.955157-49.035234C365.632287 540.289558 389.903908 518.313901 419.587444 518.313901L419.587444 518.313901zM419.587444 613.76041c28.371557 0 51.331198-20.827675 51.331198-46.411275 0-25.5836-22.959641-46.411275-51.331198-46.411275-28.207559 0-51.331198 20.827675-51.331198 46.411275C368.256246 592.932735 391.379885 613.76041 419.587444 613.76041L419.587444 613.76041zM419.587444 534.38565c20.007687 0 36.243434 14.759769 36.243434 32.799488 0 18.203716-16.235746 32.799488-36.243434 32.799488s-36.243434-14.759769-36.243434-32.799488C383.34401 549.14542 399.579757 534.38565 419.587444 534.38565L419.587444 534.38565zM435.331198 552.261371c1.967969 2.131967 4.919923 2.623959 6.559898 1.147982 1.639974-1.475977 1.475977-4.263933-0.491992-6.3959-1.967969-2.131967-4.919923-2.623959-6.559898-1.147982C433.035234 547.341448 433.199231 550.129404 435.331198 552.261371L435.331198 552.261371zM395.971813 585.880846c5.411915 5.73991 13.283792 7.05189 17.875721 3.115951 4.591928-3.935939 3.935939-11.807816-1.475977-17.547726-5.411915-5.73991-13.283792-7.05189-17.875721-3.115951C389.903908 572.433056 390.559898 580.304933 395.971813 585.880846L395.971813 585.880846zM584.240871 518.313901c29.847534 0 53.955157 21.975657 53.955157 49.035234 0 27.059577-24.271621 49.035234-53.955157 49.035234-29.847534 0-53.955157-21.975657-53.955157-49.035234C530.121717 540.289558 554.393338 518.313901 584.240871 518.313901L584.240871 518.313901zM584.240871 613.76041c28.371557 0 51.331198-20.827675 51.331198-46.411275 0-25.5836-22.959641-46.411275-51.331198-46.411275-28.207559 0-51.331198 20.827675-51.331198 46.411275C532.909673 592.932735 555.869315 613.76041 584.240871 613.76041L584.240871 613.76041zM584.240871 534.38565c20.007687 0 36.243434 14.759769 36.243434 32.799488 0 18.203716-16.235746 32.799488-36.243434 32.799488-20.007687 0-36.243434-14.759769-36.243434-32.799488C547.997438 549.14542 564.233184 534.38565 584.240871 534.38565L584.240871 534.38565zM599.820628 552.261371c1.967969 2.131967 4.919923 2.623959 6.559898 1.147982 1.639974-1.475977 1.475977-4.263933-0.491992-6.3959-1.967969-2.131967-4.919923-2.623959-6.559898-1.147982C597.688661 547.341448 597.852659 550.129404 599.820628 552.261371L599.820628 552.261371zM560.62524 585.880846c5.411915 5.73991 13.283792 7.05189 17.875721 3.115951 4.591928-3.935939 3.935939-11.807816-1.475977-17.547726-5.411915-5.73991-13.283792-7.05189-17.875721-3.115951C554.557335 572.433056 555.213325 580.304933 560.62524 585.880846L560.62524 585.880846zM957.171044 381.540038C957.171044 381.540038 957.171044 381.540038 957.171044 381.540038c-0.65599 0.983985-1.31198 1.803972-1.967969 2.951954-0.327995 0.327995-0.491992 0.65599-0.819987 0.983985-0.327995 0.327995-1.967969 0.65599-2.295964 0.983985-11.315823 14.759769-29.355541 40.34337-62.975016 46.247277l0 34.931454c0 4.263933-0.819987 8.691864-5.083921 8.691864L685.919283 476.330557c-0.163997 10.331839-0.327995 18.203716-0.65599 27.879564 24.435618 1.803972 43.295324 19.351698 43.295324 41.491352 0 22.467649-19.84369 40.671365-45.263293 41.819347-1.967969 78.226778-5.903908 143.98975-7.70788 150.549648l-0.491992 0.983985c-1.967969 2.295964-9.511851 5.247918-21.155669 8.363869 0.327995 13.939782-3.279949 29.355541-11.643818 46.08328 3.443946-21.647662-22.795644-36.079436-26.567585-38.047406-0.163997 0-0.327995 0-0.491992 0 0.163997 4.427931 0 57.727098-88.230621 97.90647-1.475977-44.115311-14.10378-70.682896-31.9795-86.754644L494.534273 766.606022l-5.411915-0.327995 0-0.163997 0 0 0 0 0.327995 0 0.327995-0.163997c-0.819987-0.163997-0.983985-0.491992-1.147982-1.147982-10.331839-8.035874-28.043562-18.203716-64.450993-18.203716-13.283792 0-28.207559 1.31198-44.607303 3.935939-4.099936 0.819987-7.70788 1.147982-11.151826 1.147982-5.575913 0-10.003844-0.983985-16.071749-2.295964l-0.327995 0-0.327995-0.163997c-17.547726-4.099936-27.55157-7.70788-30.011531-10.659833l-0.491992-0.983985c-0.491992-2.131967-2.295964-8.363869-5.73991-150.549648-25.255605-0.983985-45.263293-19.351698-45.263293-41.983344 0-22.139654 18.859705-39.523382 43.459321-41.163357-0.163997-9.675849-0.327995-17.547726-0.65599-27.879564L132.099936 476.002562c-4.427931 0-10.495836-4.591928-10.495836-8.691864l0-97.414478c-11.807816-0.65599-19.679693-2.295964-26.731582-4.755926-29.027546-10.495836-35.751441-35.915439-35.587444-60.023062 0-1.475977 0.491992-2.787956 0.983985-3.771941-6.723895-11.643818-6.231903-25.5836-5.083921-35.587444 0.983985-8.035874 2.623959-12.13581 4.427931-13.939782-4.263933-8.855862-0.983985-18.859705 1.967969-26.731582 3.771941-10.167841 12.13581-11.971813 22.139654-10.003844-4.755926-9.019859-2.459962-17.219731 11.643818-28.699552 4.427931-3.607944 14.267777 7.05189 26.075593 16.071749l0-267.151826c0-4.263933 6.067905-6.067905 10.331839-6.067905l751.928251 0c4.427931 0 5.083921 1.803972 5.083921 6.067905L888.784113 248.374119c16.727739 0.983985 29.355541 7.70788 38.539398 19.84369 4.591928 6.231903 7.871877 11.807816 8.691864 16.891736C977.670724 313.153107 982.262652 344.640615 957.171044 381.540038L957.171044 381.540038zM316.433056 508.638053c-22.959641 0.491992-40.835362 16.727739-40.835362 36.735426 0 20.335682 18.859705 36.899423 41.983344 36.899423l0 2.623959 0.163997-0.65599c0-0.819987 0-1.475977 0-2.295964 0.491992 0.163997 0.983985 0.163997 1.475977 0.327995l1.803972 0 0 0.491992c5.247918 1.31198 12.7918 2.951954 19.351698 3.771941 10.003844 35.095452 34.111467 64.122998 34.111467 64.122998s-9.839846 28.863549-13.939782 67.238949c51.167201-85.11467 229.268418-81.178732 280.107623-10.823831-4.591928-32.799488-12.627803-56.415119-12.627803-56.415119s24.107623-28.863549 34.111467-64.122998c6.559898-0.819987 13.939782-1.147982 19.023703-2.295964 0 0.491992 0 2.623959 0 2.623959l0.491992 0c23.123639 0 41.983344-18.695708 41.983344-39.03139 0-9.347854-3.935939-18.695708-10.495836-25.419603-10.167841-6.723895-25.091608-10.331839-40.835362-10.331839 0-6.723895 0.983985-19.351698 1.803972-35.423447L318.401025 476.658552c0.163997 10.331839 0.491992 19.84369 0.65599 30.175529l0 2.131967L316.433056 508.638053 316.433056 508.638053zM126.524023 462.554773c0 4.099936 6.3959 9.183857 10.823831 9.183857l741.432415 0c4.263933 0 5.575913-4.919923 5.575913-9.183857l0-29.027546c0 0.491992-6.723895 1.475977-10.823831 1.147982-22.795644-2.295964-44.443306-3.607944-60.679052-9.183857L176.215247 425.491352l-1.31198-2.787956 0-60.18706c-10.823831 5.903908-25.5836 8.363869-48.215247 7.871877L126.68802 462.554773 126.524023 462.554773zM821.381166-13.693786 180.807175-13.693786 180.807175 282.649584c10.823831 4.263933 15.579757 10.987828 15.087764 21.975657-0.491992 8.363869-4.263933 13.611787-15.087764 16.727739l0 7.379885c5.903908 1.967969 3.935939 4.263933 5.247918 6.723895 5.411915 10.495836 5.575913 18.203716-5.247918 23.779628l0 55.759129 615.318386 0c-2.787956-5.575913-4.755926-7.871877-5.575913-12.299808-1.475977-8.035874-1.639974-18.367713-1.147982-28.207559L697.891095 315.449071c0 0-28.371557-15.251762-16.727739-32.799488 11.643818-17.383728 32.307495-11.479821 50.511211-0.327995 12.13581 7.379885 39.68738 23.287636 63.959001 40.179372 0.163997-0.163997 0.327995-0.163997 0.491992-0.327995-1.803972-1.31198-2.951954-2.295964-2.951954-2.295964-11.151826-7.543882-6.887892-36.899423 15.415759-41.327354 3.115951-0.65599 9.675849 0 9.675849 1.147982l0-293.391416L821.381166-13.693786 821.381166-13.693786zM177.855221 271.169763c0 3.443946-2.131967 6.231903-4.755926 8.035874 1.639974 0.491992 3.771941 0.983985 4.755926 1.475977L177.855221 271.169763 177.855221 271.169763zM177.855221 322.828956c-0.983985 0.163997-1.639974 0.327995-2.459962 0.491992 0.819987 0.491992 1.475977 0.983985 2.459962 1.475977L177.855221 322.828956 177.855221 322.828956zM878.780269-65.516976 137.347854-65.516976c-4.263933 0-10.823831 2.131967-10.823831 6.3959L126.524023 206.882767c5.903908 1.147982 4.919923 2.295964 6.723895 3.279949 19.679693 8.035874 38.047406 25.255605 25.747598 33.127482-0.163997 0-1.475977 0.163997-1.639974 0.163997 9.511851 3.771941 17.547726 9.839846 17.547726 20.663677l0-289.29148 655.169763 2.459962 0 291.915439c9.839846-9.675849 21.647662-14.595772 34.603459-10.331839 3.279949-6.559898 13.611787-9.839846 19.515695-10.331839l0-307.495195C884.192184-63.38501 883.044202-65.516976 878.780269-65.516976L878.780269-65.516976zM878.780269-65.516976"  horiz-adv-x="1024" />
+			<glyph glyph-name="left" unicode="&#58883;"
+				   d="M740.352 721.9189759999999L683.126784 780.926976 283.648 383.99795200000005 683.123712-12.925952000000052 740.352 46.07795199999998 404.48 383.99795200000005Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="carousel" unicode="&#58932;" d="M1002.069333 144.38400000000001L1002.069333 611.6906670000001c0 24.213333-16.917333 49.578667-42.069333 49.578667l-64 0 1.152 6.4c0 31.338667-26.005333 57.6-58.538667 57.6L186.432 725.269333c-31.936 0-58.410667-31.957333-58.410667-64l-0.213333 0.96L67.178667 662.229333c-25.152 0-45.226667-20.288-45.226667-44.501333l0-467.328L21.354667 150.39999999999998c0-24.789333 20.629333-44.693333 45.312-44.693333L127.786667 105.70666700000004l0-5.184C127.786667 69.03466700000001 153.792 42.66666699999996 186.432 42.66666699999996l652.842667 0c31.658667 0 56.277333 10.901333 56.725333 42.602667l64 0c24.661333 0 42.666667 34.325333 42.666667 59.114667L1002.069333 144.38400000000001zM128 149.26933299999996L64 149.26933299999996l0 469.333333 64 0L128 149.26933299999996zM853.333333 106.602667c0-6.421333-14.848-21.333333-21.333333-21.333333l-640 0c-6.485333 0-21.333333 14.848-21.333333 21.333333l0 554.666667c0 6.378667 9.258667 18.56 15.744 18.56l5.589333 2.773333 640 0c6.442667 0 21.333333-14.954667 21.333333-21.333333L853.333333 106.602667zM960 127.93600000000004l-64 0 0 490.666667 60.842667 1.984c4.970667 0 3.157333 2.944 3.157333-1.984l0-469.333333C960 144.29866700000002 965.013333 127.93600000000004 960 127.93600000000004zM412.458667 399.829333c43.925333 0 79.637333 34.773333 79.637333 77.482667 0 42.752-35.712 77.482667-79.637333 77.482667-43.925333 0-79.637333-34.730667-79.637333-77.482667C332.8 434.602667 368.533333 399.829333 412.458667 399.829333zM412.458667 516.0533330000001c21.952 0 39.829333-17.365333 39.829333-38.741333 0-21.333333-17.877333-38.741333-39.829333-38.741333-21.952 0-39.829333 17.408-39.829333 38.741333C372.629333 498.709333 390.506667 516.0533330000001 412.458667 516.0533330000001zM785.92 457.386667c-95.914667-23.338667-137.728-87.765333-168.256-134.805333-24.213333-37.269333-39.082667-58.346667-65.109333-58.346667l-0.042667 0c-35.456 0-57.109333 14.272-80.042667 28.16-24.362667 14.741333-49.536 29.952-88.64 29.952-75.648 0-156.906667-93.269333-165.930667-103.893333L213.333333 167.38133300000004c0-10.709333 8.917333-18.112 19.925333-18.112l557.504 0c10.986667 0 19.904 7.402667 19.904 18.112L810.666667 438.570667c0 5.973333-2.837333 11.626667-7.658667 15.296C798.186667 457.536 791.872 458.858667 785.92 457.386667zM770.858667 188.52266699999996L253.162667 188.52266699999996c24.874667 27.733333 85.290667 95.082667 130.666667 95.082667 27.733333 0 46.229333-11.157333 67.605333-24.128 25.152-15.168 53.632-32.426667 99.712-33.941333l2.944-0.064c47.637333 0 71.722667 37.12 97.237333 76.416 26.645333 41.088 56.469333 79.104 119.530667 102.485333L770.858667 188.52266699999996z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="help" unicode="&#58887;" d="M690.2 741.8C635.2 783.6 573.2 798 494.6 798c-59.6 0-110.6-12.2-151-39.4C284 718 256 649.8 256 542l153.6 0c0 28.8-2.8 59.8 14 86.4 16.8 26.6 40.2 47 80.4 47 40.8 0 61.8-11.8 81.6-36.2 16.8-20.8 23.2-45.6 23.2-72 0-22.8-11.6-43.8-25.4-62.8-7.6-11.2-17.6-21.2-30.2-30.8 0 0-83-49.4-112.2-96.2-21.8-34.8-29.6-78.4-31.4-130.6-0.2-3.8 1.2-11.6 14.4-11.6 13 0 112 0 123.6 0 11.6 0 14 8.8 14.2 12.4 0.8 19 3.2 48.2 6.6 59.2 6.6 20.8 19.4 39 39.4 54.6l41.4 28.6c37.4 29.2 67.2 53 80.4 71.8 22.6 30.8 38.4 68.8 38.4 113.8C768 649 741 703.2 690.2 741.8zM484 155.6c-51.8 1.6-94.6-34.4-96.4-90.6-1.6-56.4 39-93.4 91-95 54-1.6 95.8 33.2 97.4 89.4C577.6 115.6 538 154 484 155.6z"  horiz-adv-x="1024" />
+			<glyph glyph-name="cart-simple" unicode="&#59032;"
+				   d="M235.097303 196.866982C247.384597 160.417152 286.382106 132.37606800000003 324.772759 132.37606800000003L861.658537 132.37606800000003 880.429732 132.37606800000003 885.649214 150.54185399999994 1009.08775 580.154957C1021.388907 622.967661 993.187631 660.786325 949.051586 660.786325L424.585365 660.786325C410.791718 660.786325 399.609756 649.5207379999999 399.609756 635.623932 399.609756 621.727125 410.791718 610.461538 424.585365 610.461538L949.051586 610.461538C959.924 610.461538 964.161052 604.779539 961.106394 594.148171L837.667859 164.53506800000002 861.658537 182.70085500000005 324.772759 182.70085500000005C307.742153 182.70085500000005 287.789837 197.04752900000005 282.395194 213.05054900000005L73.600164 832.433664C69.16437 845.592294 54.980454 852.636656 41.919502 848.167687 28.858551 843.698719 21.86648 829.408727 26.302275 816.250097L235.097303 196.866982ZM399.609756-6.017094000000043C399.609756 49.57012899999995 354.881911 94.63247799999999 299.707317 94.63247799999999 244.532723 94.63247799999999 199.804878 49.57012899999995 199.804878-6.017094000000043 199.804878-61.604318000000035 244.532723-106.66666699999996 299.707317-106.66666699999996 354.881911-106.66666699999996 399.609756-61.604318000000035 399.609756-6.017094000000043ZM249.756098-6.017094000000043C249.756098 21.77651800000001 272.120021 44.30769299999997 299.707317 44.30769299999997 327.294613 44.30769299999997 349.658537 21.77651800000001 349.658537-6.017094000000043 349.658537-33.810704999999984 327.294613-56.34187899999995 299.707317-56.34187899999995 272.120021-56.34187899999995 249.756098-33.810704999999984 249.756098-6.017094000000043ZM924.097562-6.017094000000043C924.097562 49.57012899999995 879.369715 94.63247799999999 824.195121 94.63247799999999 769.020529 94.63247799999999 724.292683 49.57012899999995 724.292683-6.017094000000043 724.292683-61.604318000000035 769.020529-106.66666699999996 824.195121-106.66666699999996 879.369715-106.66666699999996 924.097562-61.604318000000035 924.097562-6.017094000000043ZM774.243902-6.017094000000043C774.243902 21.77651800000001 796.607825 44.30769299999997 824.195121 44.30769299999997 851.782419 44.30769299999997 874.146342 21.77651800000001 874.146342-6.017094000000043 874.146342-33.810704999999984 851.782419-56.34187899999995 824.195121-56.34187899999995 796.607825-56.34187899999995 774.243902-33.810704999999984 774.243902-6.017094000000043Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="code-circle" unicode="&#58933;" d="M513.544163 893.525741c-282.101629 0-510.78094-228.679311-510.78094-510.76288 0-282.083569 228.679311-510.76288 510.78094-510.76288s510.76288 228.679311 510.76288 510.76288C1024.325103 664.8464309999999 795.645793 893.525741 513.544163 893.525741zM513.544163-83.46335899999997c-257.503523 0-466.22622 208.740757-466.22622 466.22622S256.0587 848.989082 513.544163 848.989082s466.22622-208.740757 466.22622-466.22622S771.047686-83.46335899999997 513.544163-83.46335899999997zM171.771357 359.77212099999997L414.357086 256.088033 414.357086 300.805295 221.978945 380.50532599999997 414.357086 459.464886 414.357086 504.182148 171.771357 401.76228ZM442.585309 193.38272800000004L478.814238 193.38272800000004 584.737801 572.1429949999999 548.743656 572.1429949999999ZM612.749301 504.182148L612.749301 459.464886 804.874598 380.50532599999997 612.749301 300.805295 612.749301 256.088033 855.33503 359.77212099999997 855.33503 401.76228Z"  horiz-adv-x="1025" />
 
-    
-    <glyph glyph-name="water" unicode="&#58934;" d="M862.315763 33.684211000000005C802.869868 33.684211000000005 754.526289 82.94399999999996 754.526289 143.50371900000005 754.526289 162.33094700000004 759.35885 180.96056099999998 768.520956 197.43438600000002 768.64671 197.79368399999998 768.808394 198.15298199999995 769.006008 198.49431600000003L849.075622 334.542596 849.057657 334.542596 862.315763 357.052632 875.573868 334.542596 875.573868 334.542596 955.140464 199.356632C955.715341 198.67396499999995 956.164464 197.865544 956.380043 196.96729800000003 965.380464 180.60126300000002 970.123201 162.151298 970.105236 143.50371900000005 970.105236 82.94399999999996 921.761657 33.684211000000005 862.315763 33.684211000000005L862.315763 33.684211000000005ZM924.33064 188.57768399999998C924.204885 188.79326300000002 924.115061 189.02680699999996 924.025236 189.27831600000002L862.315763 302.996211 800.606289 189.260351C800.516464 189.02680699999996 800.42664 188.79326300000002 800.300885 188.57768399999998 793.977236 176.505263 790.635763 162.81600000000003 790.635763 148.965053 790.635763 105.29235100000005 822.792956 69.75775399999998 862.333727 69.75775399999998 901.856534 69.75775399999998 933.995763 105.29235100000005 933.995763 148.98301800000002 933.995763 162.81600000000003 930.654289 176.52322800000002 924.33064 188.57768399999998L924.33064 188.57768399999998ZM682.684605 392.982456C593.50678 392.982456 520.982429 469.602807 520.982429 563.8108070000001 520.982429 593.093614 528.240254 622.071018 541.965447 647.706947 542.163061 648.281825 542.396605 648.820772 542.684043 649.341754L662.815412 860.968421 662.797447 860.968421 682.684605 896 702.571763 860.968421 702.535833 860.968421 821.89471 650.689123C822.774991 649.647158 823.439692 648.3716489999999 823.781026 646.970386 837.25471 621.514105 844.368815 592.8241399999999 844.35085 563.8108070000001 844.35085 469.602807 771.844464 392.982456 682.684605 392.982456L682.684605 392.982456ZM791.408254 630.1192980000001C791.21064 630.4965609999999 791.030991 630.891789 790.887271 631.322947L682.684605 823.924772 574.446008 631.287018C574.320254 630.891789 574.140605 630.4965609999999 573.942991 630.1013330000001 562.840675 609.6931930000001 556.912254 596.075789 556.912254 572.631579 556.912254 498.634105 613.375973 428.876351 682.684605 428.876351 751.993236 428.876351 808.367131 489.058807 808.367131 563.056281 808.367131 586.500491 802.492605 609.6931930000001 791.408254 630.1192980000001L791.408254 630.1192980000001ZM538.695833 276.983018C540.115061 275.330246 541.174991 273.33614 541.713938 271.12645599999996 563.433517 231.11859600000003 574.895131 186.02666699999997 574.895131 140.43171900000004 574.895131-7.581192999999985 458.051341-128 314.403903-128 170.738499-128 53.89471-7.581192999999985 53.89471 140.43171900000004 53.89471 186.47578899999996 65.589868 231.998877 87.704675 272.294175 88.010078 273.17445599999996 88.387341 274.01880700000004 88.872394 274.863158L282.408394 607.411649 282.372464 607.411649 314.403903 662.45614 346.453306 607.411649 346.399412 607.411649 538.695833 276.983018 538.695833 276.983018ZM314.403903 590.614456L119.807973 257.79649099999995C119.556464 257.113825 119.251061 256.449123 118.873798 255.78442099999995 98.932745 220.48336800000004 88.387341 180.42161399999998 88.387341 139.91073700000004 88.387341 12.072420999999963 189.799271-91.89052600000002 314.421868-91.89052600000002 439.026499-91.89052600000002 540.420464 12.072420999999963 540.402499 139.91073700000004 540.402499 180.42161399999998 529.857096 220.50133300000005 509.916043 255.78442099999995 509.53878 256.449123 509.233377 257.131789 508.963903 257.86835099999996L314.403903 590.614456 314.403903 590.614456Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="face-cry" unicode="&#59036;"
+				   d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.23020799999995 229.230208-128 512-128 629.410831-128 740.826187-88.33104600000001 830.768465-16.686661999999956 841.557579-8.092490999999995 843.33693 7.620766000000003 834.742758 18.409879000000046 826.148587 29.198990999999978 810.43533 30.978341999999998 799.646219 22.384173000000033 718.470035-42.277495000000044 618.001779-78.04878099999996 512-78.04878099999996 256.817504-78.04878099999996 49.951219 128.81750399999999 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.66323599999998 904.470807 140.039307 897.177109 128.33175700000004 900.755245 112.92820300000005 912.462793 105.63450699999999 924.170342 98.34080900000004 939.573897 101.91894200000002 946.867595 113.62649199999998 997.013826 194.11920399999997 1024 287.101621 1024 384ZM337.170731 396.487806C371.654852 396.487806 399.609756 424.442709 399.609756 458.926829 399.609756 493.41095 371.654852 521.365854 337.170731 521.365854 302.686611 521.365854 274.731708 493.41095 274.731708 458.926829 274.731708 424.442709 302.686611 396.487806 337.170731 396.487806ZM711.804879 396.487806C746.288998 396.487806 774.243902 424.442709 774.243902 458.926829 774.243902 493.41095 746.288998 521.365854 711.804879 521.365854 677.320757 521.365854 649.365854 493.41095 649.365854 458.926829 649.365854 424.442709 677.320757 396.487806 711.804879 396.487806ZM352.788105 191.21547499999997C396.165222 225.91716899999994 453.151987 246.639629 524.487806 246.639629 595.823622 246.639629 652.810387 225.91716899999994 696.187505 191.21547499999997 722.700531 170.00505399999997 738.882517 148.42907300000002 746.631548 132.931012 752.800254 120.59359800000004 747.799529 105.59142399999996 735.462114 99.42271600000004 723.124702 93.25401 708.122526 98.25473499999998 701.953818 110.59214899999995 701.03616 112.42746499999998 698.492224 116.61747600000001 694.165854 122.38597100000004 686.602473 132.47047699999996 676.927317 142.654852 664.983226 152.21012499999995 630.311565 179.947456 584.273939 196.68840999999998 524.487806 196.68840999999998 464.70167 196.68840999999998 418.664045 179.947456 383.992384 152.21012499999995 372.048292 142.654852 362.373137 132.47047699999996 354.809756 122.38597100000004 350.483386 116.61747600000001 347.93945 112.42746499999998 347.021792 110.59214899999995 340.853084 98.25473499999998 325.850908 93.25401 313.513495 99.42271600000004 301.176081 105.59142399999996 296.175356 120.59359800000004 302.344062 132.931012 310.093092 148.42907300000002 326.275078 170.00505399999997 352.788105 191.21547499999997Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="username" unicode="&#58991;" d="M514.594 824.888c-144.11 0-260.979-118.46-260.979-264.558 0-88.783 43.497-166.928 109.711-214.898-135.361-59.354-230.159-195.858-230.159-354.931h0.894c1.541-21.375 18.641-38.377 40.117-38.377s38.575 17.051 40.117 38.377h0.645c0 0.944-0.099 1.79-0.099 2.734 0 0.05 0 0.099 0 0.149 0 0.099-0.05 0.149-0.05 0.199 0.05 159.967 120 291.054 273.009 304.924 8.948-0.944 17.598-2.734 26.844-2.734 144.11 0 260.979 118.46 260.979 264.558s-116.919 264.558-261.029 264.558zM514.594 377.54499999999996c-99.769 0-180.698 81.972-180.698 183.183s80.879 183.183 180.698 183.183c99.719 0 180.647-81.972 180.647-183.183s-80.879-183.183-180.647-183.183zM896.021-6.615000000000009c0 0.348-0.199 0.645-0.199 0.994-1.043 105.038-43.397 200.034-111.35 269.131v0c-7.157 7.357-17.001 11.98-27.986 11.98-21.574 0-39.122-17.747-39.122-39.668 0-11.135 4.573-21.127 11.83-28.334l-0.099-0.05c52.742-55.229 85.302-130.589 85.302-213.853 0-1.043-0.149-1.987-0.149-3.034h0.994c1.491-21.375 18.691-38.377 40.117-38.377 21.475 0 38.575 17.051 40.117 38.377h0.597c0 0.796-0.099 1.491-0.099 2.287-0.05 0.149 0.05 0.348 0.05 0.547z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="find-fill" unicode="&#58992;" d="M512 896C229.236364 896 0 666.763636 0 384c0-282.786909 229.236364-512 512-512s512 229.213091 512 512C1024 666.763636 794.763636 896 512 896zM657.291636 383.976727c0-77.195636-60.392727-139.729455-136.424727-144.407273l-175.732364-151.714909-22.877091 13.242182 58.228364 222.021818c-8.634182 18.548364-13.800727 39.074909-13.800727 60.858182 0 77.195636 60.369455 139.729455 136.378182 144.430545l175.802182 151.714909 22.877091-13.172364-58.251636-222.068364C652.125091 426.309818 657.291636 405.806545 657.291636 383.976727zM512 384m-66.048 0a2.838 2.838 0 1 1 132.096 0 2.838 2.838 0 1 1-132.096 0Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="face-smile" unicode="&#59055;"
+				   d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.23020799999995 229.230208-128 512-128 629.410831-128 740.826187-88.33104600000001 830.768465-16.686661999999956 841.557579-8.092490999999995 843.33693 7.620766000000003 834.742758 18.409879000000046 826.148587 29.198990999999978 810.43533 30.978341999999998 799.646219 22.384173000000033 718.470035-42.277495000000044 618.001779-78.04878099999996 512-78.04878099999996 256.817504-78.04878099999996 49.951219 128.81750399999999 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.66323599999998 904.470807 140.039307 897.177109 128.33175700000004 900.755245 112.92820300000005 912.462793 105.63450699999999 924.170342 98.34080900000004 939.573897 101.91894200000002 946.867595 113.62649199999998 997.013826 194.11920399999997 1024 287.101621 1024 384ZM337.170731 396.487806C371.654852 396.487806 399.609756 424.442709 399.609756 458.926829 399.609756 493.41095 371.654852 521.365854 337.170731 521.365854 302.686611 521.365854 274.731708 493.41095 274.731708 458.926829 274.731708 424.442709 302.686611 396.487806 337.170731 396.487806ZM711.804879 396.487806C746.288998 396.487806 774.243902 424.442709 774.243902 458.926829 774.243902 493.41095 746.288998 521.365854 711.804879 521.365854 677.320757 521.365854 649.365854 493.41095 649.365854 458.926829 649.365854 424.442709 677.320757 396.487806 711.804879 396.487806ZM352.788105 127.22903299999996C396.165222 92.52733899999998 453.151987 71.80487900000003 524.487806 71.80487900000003 595.823622 71.80487900000003 652.810387 92.52733899999998 696.187505 127.22903299999996 722.700531 148.43945399999996 738.882517 170.01543500000002 746.631548 185.51349500000003 752.800254 197.850908 747.799529 212.85308399999997 735.462114 219.021792 723.124702 225.19049800000005 708.122526 220.18977299999995 701.953818 207.85235799999998 701.03616 206.01704299999994 698.492224 201.82703100000003 694.165854 196.058537 686.602473 185.97402899999997 676.927317 175.78965500000004 664.983226 166.23438299999998 630.311565 138.49705200000005 584.273939 121.75609799999995 524.487806 121.75609799999995 464.70167 121.75609799999995 418.664045 138.49705200000005 383.992384 166.23438299999998 372.048292 175.78965500000004 362.373137 185.97402899999997 354.809756 196.058537 350.483386 201.82703100000003 347.93945 206.01704299999994 347.021792 207.85235799999998 340.853084 220.18977299999995 325.850908 225.19049800000005 313.513495 219.021792 301.176081 212.85308399999997 296.175356 197.850908 302.344062 185.51349500000003 310.093092 170.01543500000002 326.275078 148.43945399999996 352.788105 127.22903299999996Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="about" unicode="&#58891;" d="M514.27174 834.607768c-249.516844 0-451.789687-202.272843-451.789687-451.789687s202.272843-451.789687 451.789687-451.789687 451.789687 202.272843 451.789687 451.789687S763.788583 834.607768 514.27174 834.607768zM514.27174-20.12919999999997c-222.541469 0-402.947282 180.405813-402.947282 402.947282s180.405813 402.947282 402.947282 402.947282 402.947282-180.405813 402.947282-402.947282S736.814232-20.12919999999997 514.27174-20.12919999999997zM514.295276 593.979362c-9.44614-10.360975-14.307867-22.951735-14.307867-37.483706 0-11.960403 3.886517-22.396079 11.534707-30.457686 7.783267-8.211009 17.853623-12.450567 29.313629-12.450567 9.312086 0 23.139 2.849908 35.782971 16.900925 9.865695 10.641361 14.866592 23.437805 14.866592 37.693484 0 11.68104-4.031826 21.900799-11.744485 29.832446C562.925856 615.325529 532.358677 613.449809 514.295276 593.979362zM549.461193 293.282882c-12.110829-11.541871-20.589944-18.759249-26.236548-23.316032 2.77009 14.953573 9.976212 44.614104 27.330462 103.023398 17.297968 57.890478 18.799158 67.991534 18.799158 72.955592 0 8.65717-3.63683 16.335037-9.921977 21.642926-14.124695 11.661597-39.035038 9.349949-69.131497-7.677866-16.779152-9.408277-34.595936-24.759917-54.493102-46.576805l-10.377348-11.541871 34.425044-26.548656 8.818853 8.715499c9.573029 9.292644 16.086373 15.35164 20.411889 19.393699-26.294876-86.460164-39.093367-140.190903-39.093367-164.262134 0-10.907421 3.172249-19.970844 9.573029-26.839275 6.460132-7.039323 15.510252-10.736529 25.891693-10.736529 10.146081 0 21.792329 3.926426 35.922141 11.949146 12.741185 7.212262 31.883151 23.029506 58.641585 48.190559l10.837836 10.391674-31.30703 30.475082L549.461193 293.282882z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="location" unicode="&#59157;" d="M451.673935-98.39569900000004C478.883834-129.01914699999998 524.254807-128.8089789999999 551.400292-97.92885100000001 553.755808-95.38790800000004 558.821323-89.79676199999994 565.872444-81.84834999999998 577.572838-68.65901699999995 590.597131-53.62432000000001 604.615947-36.99831500000005 644.662065 10.495494000000008 684.708678 61.282182000000034 722.129538 113.35355300000003 759.658524 165.575381 792.492213 216.29072599999995 819.314991 264.54153799999995 868.685946 353.35368300000005 896 430.456574 896 493.714285 896 715.890551 719.301715 896 501.333333 896 283.364952 896 106.666667 715.890551 106.666667 493.714285 106.666667 430.401284 134.05152 353.19426999999996 183.54613 264.23737800000004 210.371803 216.02347099999997 243.193308 165.34812399999998 280.699364 113.16684599999996 318.155192 61.05544999999995 358.239268 10.22578999999996 398.322835-37.31103099999996 412.354743-53.95207300000004 425.391185-69.00072999999998 437.102468-82.20257900000001 444.160087-90.15846599999998 449.230214-95.75492099999997 451.982775-98.73670600000003L451.673935-98.39569900000004ZM486.822684-65.32134799999994C484.281231-62.568254000000024 479.425084-57.207989 472.585916-49.49835900000005 461.135889-36.591016999999965 448.364015-21.84776099999999 434.602351-5.527214999999956 395.275714 41.11192700000004 355.949587 90.98045200000001 319.289224 141.985137 282.808749 192.739548 250.983685 241.87642200000005 225.158316 288.29247799999996 179.388826 370.55419500000005 154.50505 440.709839 154.50505 493.714285 154.50505 688.960095 309.785362 847.238095 501.333333 847.238095 692.881306 847.238095 848.161617 688.960095 848.161617 493.714285 848.161617 440.753978 823.345286 370.701737 777.693969 288.58074899999997 751.873483 242.13293399999998 720.038415 192.96007499999996 683.537446 142.16873799999996 646.912604 91.20503299999996 607.624538 41.38032599999997 568.335977-5.21503800000005 554.587654-21.52024300000005 541.828177-36.24924999999996 530.389289-49.14379699999995 523.556841-56.84571100000005 518.705521-62.20043499999997 516.166694-64.95052599999997 507.543772-74.74891100000002 495.255793-74.80583000000001 487.131524-65.66235300000005L486.822684-65.32134799999994ZM714.955981 428.971194C723.919106 453.372045 728.565658 479.331002 728.565658 505.904762 728.565658 627.091817 632.184774 725.333333 513.29293 725.333333 394.401086 725.333333 298.020202 627.091817 298.020202 505.904762 298.020202 384.717709 394.401086 286.47619 513.29293 286.47619 549.003859 286.47619 583.510052 295.36805300000003 614.373097 312.125591 626.032316 318.456132 630.449257 333.22218 624.238611 345.10648100000003 618.027966 356.99078199999997 603.541579 361.49299399999995 591.882359 355.16245100000003 567.900883 342.14136099999996 541.111735 335.23809500000004 513.29293 335.23809500000004 420.821495 335.23809500000004 345.858586 411.648164 345.858586 505.904762 345.858586 600.161359 420.821495 676.571428 513.29293 676.571428 605.764365 676.571428 680.727273 600.161359 680.727273 505.904762 680.727273 485.192019 677.117041 465.022684 670.154965 446.069408 665.522846 433.459117 671.796821 419.408892 684.168282 414.687349 696.53974 409.965809 710.323861 416.360905 714.955981 428.971194L714.955981 428.971194Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="survey" unicode="&#59058;"
+				   d="M722.355804 849.454545C761.006291 849.454545 792.380951 818.166023 792.380951 779.627344L792.380951 437.500928 799.081094 453.813218 401.874746 51.22138 418.539682 58.181818 138.070006 58.181818C99.387643 58.181818 68.063492 89.328555 68.063492 127.771428L68.063492 872.727273 44.698413 849.454545 722.355804 849.454545ZM21.333333 896 21.333333 872.727273 21.333333 127.771428C21.333333 63.604277 73.59726 11.636363 138.070006 11.636363L418.539682 11.636363 428.337293 11.636363 435.204619 18.596802 832.410967 421.18864 839.11111 427.979625 839.11111 437.500928 839.11111 779.627344C839.11111 843.859757 786.827324 896 722.355804 896L44.698413 896 21.333333 896ZM775.859347 307.365395 759.337741 290.90909 775.859347 274.452787 869.319663 181.361879 885.841269 164.905574 902.362876 181.361879 972.458114 251.18006 988.979721 267.636363 972.458114 284.092668 878.997796 377.183575 862.47619 393.639878 845.954583 377.183575 775.859347 307.365395ZM845.954583 344.27097 939.414901 251.18006 939.414901 284.092668 869.319663 214.274485 902.362876 214.274485 808.902558 307.365395 808.902558 274.452787 878.997796 344.27097 845.954583 344.27097ZM518.843473 51.365395 513.841133 46.382827 512.453734 39.473248 489.088655-76.890387 482.215251-111.121568 516.58227-104.275332 633.407665-81.002605 640.344663-79.620689 645.347004-74.638121 902.362876 181.361879 918.884482 197.818182 902.362876 214.274485 808.902558 307.365395 792.380951 323.821698 775.859347 307.365395 518.843473 51.365395ZM775.859347 274.452787 869.319663 181.361879 869.319663 214.274485 612.303791-41.725515 624.243127-35.361033 507.41773-58.633758 534.911345-86.018703 558.276425 30.344934 551.886686 18.452787 808.902558 274.452787 775.859347 274.452787ZM426.576706 298.269073C444.201086 298.269073 458.488469 284.053815 458.488469 266.500753L458.488469 258.086116C458.488469 240.540958 444.323959 226.317797 426.576706 226.317797L426.576706 226.317797C408.952326 226.317797 394.664943 240.533054 394.664943 258.086116L394.664943 266.500753C394.664943 284.045911 408.829453 298.269073 426.576706 298.269073L426.576706 298.269073ZM278.349205 552.435127C278.349205 552.435127 280.851125 530.485568 305.477133 530.485568 330.103138 530.485568 331.559155 552.435127 331.559155 552.435127 329.927383 623.508937 362.988497 657.25782 430.67155 653.905282 475.722639 648.839223 499.06407 623.508937 500.624896 577.839917 497.503245 557.501184 480.405116 531.202385 449.969026 499.092521 409.671358 458.489557 389.522524 422.133143 389.522524 390.023279L389.522524 357.093903C389.522524 357.093903 392.614705 337.454532 414.885933 337.454532 437.157161 337.454532 440.249342 357.093903 440.249342 357.093903L440.249342 379.965664C440.249342 406.785969 459.546816 439.044836 498.21271 476.369762 538.652271 513.471183 558.730159 547.369069 558.730159 577.839917 555.395669 662.323878 511.195938 706.353877 425.776235 709.780917 327.515198 711.419936 278.349205 658.971339 278.349205 552.435127Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="up" unicode="&#58905;" d="M513.6 539.2l384-384c12.8-12.8 32-12.8 44.8 0 12.801 12.8 12.801 32 0 44.8l-403.2 403.2C532.8 609.6 520 616 513.6 616c-6.4 0-19.2 0-25.599-6.4L78.399 200c-12.8-12.8-12.8-32 0-44.8s32-12.8 44.8 0L513.6 539.2z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="pause" unicode="&#58961;" d="M512-128c-282.714 0-511.893 229.232-511.893 512 0 282.768 229.179 512 511.893 512 282.714 0 511.893-229.232 511.893-512 0-282.768-229.179-512-511.893-512zM512 863.996c-265.043 0-479.9-214.91-479.9-479.996 0-265.097 214.857-479.996 479.9-479.996 265.043 0 479.9 214.899 479.9 479.996 0 265.086-214.857 479.996-479.9 479.996zM639.973 181.32299999999998h-21.329c-23.558 0-42.658 19.1-42.658 42.658v319.933c0 23.558 19.1 42.658 42.658 42.658h21.329c23.558 0 42.658-19.1 42.658-42.658v-319.933c0-23.558-19.1-42.658-42.658-42.658zM405.356 181.32299999999998h-21.329c-23.558 0-42.658 19.1-42.658 42.658v319.933c0 23.558 19.1 42.658 42.658 42.658h21.329c23.558 0 42.658-19.1 42.658-42.658v-319.933c0-23.558-19.1-42.658-42.658-42.658z"  horiz-adv-x="1024" />
+			<glyph glyph-name="tree" unicode="&#58926;"
+				   d="M962.691679 258.53447400000005c-8.721639 54.163597-34.298154 97.584526-73.089645 133.8638-44.721551 41.825594-99.282191 65.724911-156.512636 84.432994-26.935466 8.80555-54.079686 16.971533-81.129762 25.427112 41.188074 7.485485 81.495082 10.991332 121.872698 12.269441 39.906895 1.26276 79.885422 0.276293 120.633475 0.276293-30.644951 44.233434-74.588789 71.110571-127.260405 84.384899-53.004191 13.357216-103.742782 9.715269-152.261822-32.081673 18.715247 66.336848 12.464893 120.18936-38.810934 160.830989-32.450063 25.719778-77.127611 31.000038-111.319341 14.916734 58.583257-31.127951 82.051761-84.265172 94.304829-145.102772-44.638663 69.056795-110.067838 96.432283-187.710173 86.487793-56.123228-7.187703-110.723777-26.270317-166.003801-40.048111 15.677051-14.358009 31.136138-24.116257 47.932686-27.839045 51.427276-11.399631 103.405091-20.301372 155.098427-30.524201 37.036521-7.323802 75.163887-12.144598 104.448864-40.879036-78.096682 23.458271-155.928329 30.034037-235.541551 9.092076C186.718589 530.20385 104.838743 479.821369 81.996502 429.437865c46.955428 23.955598 95.807043 18.776645 144.606469 17.139356 37.737486-1.266853 76.089979-3.461845 113.238041 1.594311 52.683896 7.170307 104.513332 20.624736 159.209048 31.909757-91.88164-62.077847-186.516997-122.342396-159.194722-259.889075 58.852386 100.205213 163.392324 150.107763 229.951229 238.105956-16.239869-91.498924 6.980995-169.376619 66.432015-237.83785 41.815361-48.152696 89.979314-92.010577 110.706381-156.013263 12.758582 141.877311-25.823132 270.789333-97.911984 396.334677C755.996107 391.809873 858.199837 325.909977 962.691679 258.53447400000005zM513.476631 320.10169099999996c-27.767414-14.065344-39.008432-35.954887-42.252313-64.998363-6.078439-54.437843-15.162328-108.532879-21.799492-162.916487-3.90903-32.026414-5.519714-64.333214-8.16496-96.53052 30.078039 0 55.507198 0 79.961146 0 9.912767 78.200036 19.732413 154.247037 28.913517 230.369761 0.883113 7.322779-0.756223 15.746636-3.705392 22.591531C536.246217 272.25086999999996 524.967336 295.41135899999995 513.476631 320.10169099999996z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="date" unicode="&#58935;" d="M933.185668 758.3591759999999l-167.054737 0 0 56.506968L732.333174 814.866145l0-56.506968L539.505447 758.3591759999999l0 56.506968-33.796734 0 0-56.506968-216.255299 0 0 56.506968-33.796734 0 0-56.506968L88.005356 758.3591759999999c-12.255115 0-22.224164-9.970072-22.224164-22.224164l0-706.60521c0-12.255115 9.970072-22.225187 22.224164-22.225187l845.179288 0c12.255115 0 22.225187 9.970072 22.225187 22.225187L955.409832 736.135012C955.409832 748.389104 945.43976 758.3591759999999 933.185668 758.3591759999999zM939.036933 29.528778999999986c0-3.226484-2.62478-5.852288-5.852288-5.852288l-845.179288 0c-3.226484 0-5.851265 2.62478-5.851265 5.852288L82.154092 736.135012c0 3.226484 2.62478 5.851265 5.851265 5.851265l167.650301 0 0-55.657624 33.796734 0 0 55.657624 216.255299 0 0-55.657624 33.796734 0 0 55.657624L732.333174 741.986277l0-55.657624 33.796734 0 0 55.657624 167.054737 0c3.226484 0 5.852288-2.62478 5.852288-5.851265L939.036933 29.528778999999986zM206.835765 608.260623l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM458.879152 608.260623l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM684.827207 608.260623l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM206.835765 433.345871l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM458.879152 433.345871l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM684.827207 433.345871l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM206.835765 257.877511l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM458.879152 257.877511l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM684.827207 257.877511l129.098263 0 0-94.008071-129.098263 0 0 94.008071Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="layim-uploadfile" unicode="&#58909;" d="M914.7359263333336 663.0359498888887c-20.806884999999987 20.806885000000012-48.471967999999976 32.265868000000026-77.89816099999994 32.265868000000054l-352.221993 2.2737367544323206e-13-120.26099099999992 95.03035300000005-11.157106999999995 8.816806000000007-14.220886 9.769962616701378e-15L197.09333633333344 799.148976888889c-51.69538300000001 2.1316282072803006e-14-93.75224400000005-42.88778599999995-93.75224400000006-95.60442799999993l-1.5631940186722204e-13-255.13888799999998c-1.7763568394002505e-15-2.302439 0.08391099999999785-4.716417999999999 0.24968699999999489-7.196911999999999l-1.9895196601282805e-13-340.692403c-1.9539925233402755e-14-29.426192999999998 11.458982999999954-57.09127599999999 32.26586799999994-77.89816100000002 20.806884999999987-20.806885000000012 48.471967999999976-32.265868000000026 77.89816099999994-32.265868000000054l623.083981-3.410605131648481e-13c29.426192999999998-1.9539925233402755e-14 57.09127599999999 11.458982999999954 77.89816100000002 32.26586799999994 20.806885000000012 20.806884999999987 32.265868000000026 48.471967999999976 32.265868000000054 77.89816099999994L947.0028173333335 585.1377888888885C947.0017943333336 614.5639818888885 935.5428113333334 642.2280418888886 914.7359263333336 663.0359498888887zM197.09333633333372 758.2167298888891l141.88345099999998-8.526512829121202e-14L470.3948853333333 654.369569888889l366.44287999999995-2.2737367544323206e-13c38.236859-2.1316282072803006e-14 69.23178099999997-30.99492100000004 69.23178099999994-69.23178100000004L906.0695463333333 465.9195468888886 144.27334033333327 465.91954688888893 144.2733403333336 703.5445488888892C144.2733403333336 733.7361748888891 167.92296933333355 758.2167298888891 197.09333633333372 758.2167298888891zM836.8377653333331 31.28558888888881L213.75480733333322 31.28558888888915c-38.236859 2.1316282072803006e-14-69.23178099999997 30.99492100000004-69.23178099999994 69.23178100000004L144.52302633333338 424.4776928888892l761.546519-6.252776074688882e-13-2.2737367544323206e-13-323.96134599999993C906.0695463333333 62.28050988888867 875.0746243333334 31.285588888888583 836.8377653333331 31.28558888888881z"  horiz-adv-x="1024" />
+			<glyph glyph-name="upload-circle" unicode="&#58927;"
+				   d="M512-128c282.768 0 512 229.216 512 512C1024 666.768 794.768 896 512 896 229.216 896 0 666.768 0 384 0 101.21600000000001 229.216-128 512-128zM512 848c256.272 0 464-207.744 464-464 0-256.272-207.728-464-464-464S48 127.72799999999995 48 384C48 640.256 255.728 848 512 848zM377.728 534.544L480 534.544l0-478c0-17.664 14.336-32 32-32s32 14.336 32 32L544 534.544l102.272 0c17.616 0 23.424 11.568 12.944 25.68l-128.128 172.624c-10.496 14.128-27.664 14.128-38.16 0L364.8 560.24C354.32 546.1120000000001 360.128 534.544 377.728 534.544z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="delete" unicode="&#58944;" d="M738.923 24.288h-451.956c-27.2 0-49.327 21.603-49.327 48.157v418.017c0 26.548 22.129 48.147 49.327 48.147h451.956c27.2 0 49.327-21.598 49.327-48.147v-418.017c0-26.555-22.129-48.157-49.327-48.157zM286.966 494.547c-4.447 0-7.168-2.644-7.168-4.084v-418.017c0-1.443 2.722-4.093 7.168-4.093h451.956c4.448 0 7.168 2.651 7.168 4.093v418.017c0 1.44-2.722 4.084-7.168 4.084h-451.956zM832.199 496.302h-640.401c-27.201 0-49.327 20.131-49.327 44.876v61.045c0 24.74 22.128 44.867 49.327 44.867h640.401c27.2 0 49.327-20.127 49.327-44.867v-61.045c0-24.744-22.129-44.876-49.327-44.876zM184.631 541.327c0.387-0.733 2.722-2.866 7.168-2.866h640.401c4.445 0 6.782 2.132 7.168 2.867v60.741c-0.393 0.736-2.733 2.863-7.168 2.863h-640.401c-4.437 0-6.776-2.128-7.168-2.863v-60.742zM600.748 605.354h-174.546c-27.201 0-49.327 20.13-49.327 44.876v10.736c0 24.74 22.128 44.867 49.327 44.867h174.546c27.2 0 49.327-20.126 49.327-44.867v-10.736c0-24.745-22.128-44.876-49.327-44.876zM419.034 650.378c0.387-0.733 2.722-2.865 7.168-2.865h174.546c4.446 0 6.782 2.131 7.168 2.865v10.432c-0.393 0.736-2.734 2.862-7.168 2.862h-174.546c-4.437 0-6.776-2.126-7.168-2.862v-10.432zM404.099 430.833h-30.097c-7.297 0-13.213-5.916-13.213-13.213v-272.34c0-7.297 5.916-13.212 13.213-13.212h30.098c7.297 0 13.212 5.916 13.212 13.212v272.341c0 7.297-5.916 13.213-13.212 13.213zM659.583 430.833h-30.097c-7.298 0-13.213-5.916-13.213-13.213v-272.34c0-7.297 5.917-13.212 13.213-13.212h30.097c7.297 0 13.212 5.916 13.212 13.212v272.341c0 7.297-5.916 13.213-13.212 13.213zM531.841 430.833h-30.098c-7.297 0-13.213-5.916-13.213-13.213v-272.34c0-7.297 5.917-13.212 13.213-13.212h30.098c7.297 0 13.212 5.916 13.212 13.212v272.341c0 7.297-5.916 13.213-13.212 13.213z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="play" unicode="&#58962;" d="M512 896C229.376 896 0 666.624 0 384 0 101.37599999999998 229.376-128 512-128 794.624-128 1024 101.37599999999998 1024 384 1024 666.624 794.624 896 512 896L512 896 512 896zM512-95.23199999999997C245.76-95.23199999999997 32.768 117.75999999999999 32.768 384 32.768 650.24 245.76 863.232 512 863.232S991.232 650.24 991.232 384C991.232 117.75999999999999 778.24-95.23199999999997 512-95.23199999999997L512-95.23199999999997 512-95.23199999999997zM733.184 392.192L393.216 588.8c-4.096 4.096-8.192 4.096-12.288 0C376.832 588.8 372.736 584.704 372.736 580.608l0-393.216c0-4.096 4.096-8.192 4.096-8.192 4.096-4.096 8.192-4.096 12.288 0l344.064 196.608c4.096 4.096 4.096 4.096 4.096 8.192C741.376 388.096 737.28 392.192 733.184 392.192L733.184 392.192 733.184 392.192zM733.184 392.192"  horiz-adv-x="1024" />
+			<glyph glyph-name="add-circle" unicode="&#58911;"
+				   d="M675.04 412.736l-127.04 0 0 127.264c0 20.064-16.288 36.32-36.32 36.32-20.064 0-36.32-16.192-36.32-36.32l0-127.232-127.072 0c-20.064 0-36.352-16.32-36.352-36.352 0-20.064 16.224-36.352 36.352-36.352l127.072 0 0-127.232c0-20 16.256-36.384 36.32-36.384 20.032 0 36.32 16.256 36.32 36.384l0 127.136 127.04 0c19.968 0 36.352 16.256 36.352 36.384C711.36 396.448 695.136 412.736 675.04 412.736L675.04 412.736zM511.328 830.56c-250.24 0-453.952-203.616-453.952-453.952 0-250.336 203.712-453.952 453.952-453.952 250.336 0 453.984 203.584 453.984 453.952C965.312 626.944 761.696 830.56 511.328 830.56L511.328 830.56zM511.328-20.576000000000022c-219.04 0-397.184 178.176-397.184 397.152 0 219.104 178.144 397.216 397.184 397.216s397.216-178.112 397.216-397.216C908.576 157.63199999999995 730.368-20.576000000000022 511.328-20.576000000000022L511.328-20.576000000000022zM511.328-20.576000000000022"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="top" unicode="&#58884;" d="M812 153.4l-300 172.8-300-172.8 300 604L812 153.4zM264.5 209.2l247.5 142.5 247.5-142.5L512 707.5 264.5 209.2zM371.7 138.3l0-126.2-15.9 0 0 126.2-45.9 0L309.9 153l107.4 0 0-14.8L371.7 138.2zM506.6 154.5c26.6 0 43.3-3.9 50-11.7 6.7-7.8 10-27.2 10-58.3 0-33.5-3.2-54.2-9.6-62-6.4-7.8-23.2-11.8-50.4-11.8-27 0-43.8 3.9-50.3 11.7-6.5 7.8-9.8 27.9-9.8 60.3l0 9.9 0.2 13.3c0 18.7 4.2 31.5 12.6 38.4C467.8 151 483.5 154.5 506.6 154.5zM506.5 141c-22.3 0-35.3-2.5-39.1-7.4-3.8-5-5.7-22-5.7-51 0-29.1 1.9-46.1 5.7-51.1 3.8-5 16.8-7.4 39.1-7.4 22.4 0 35.4 2.5 39.2 7.4 3.8 5 5.7 22 5.7 51.1l0 9.2-0.1 13.3c0 15.6-2.6 25.4-7.8 29.6S525.9 141 506.5 141zM608.4 12.1 608.4 153l59.2 0 5.4 0c15.9 0 26.7-3.1 32.5-9.2 5.8-6.1 8.7-17.6 8.7-34.4 0-16.1-3-27.1-9-32.9-6-5.9-17.3-8.8-33.9-8.8l-6.2-0.1-40.7 0 0-55.5L608.4 12.1zM624.3 81.1l37.7 0c15.8 0 25.9 1.6 30.3 4.9 4.4 3.2 6.7 10.7 6.7 22.3 0 13.6-1.5 22.2-4.5 25.9-3 3.6-10.1 5.4-21.3 5.4l-6.1 0.1-42.7 0L624.4 81.1z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="friends" unicode="&#58898;" d="M672.02974 765.933689c7.66047-32.266891 8.420787-62.237483 7.713682-95.365998-0.283456-12.778024-7.291057-71.832002-5.3918-89.926102 1.561565-14.936177 5.132904-16.128329 10.759041-28.436656 9.803273-21.422915 6.51846-50.970882 2.76088-72.566736-2.056845-11.816117-6.404873-28.64541-13.017478-38.287001-7.291057-10.645454-21.864984-10.711969-28.319999-23.12365-9.29469-17.848507-4.045129-42.930765-9.903557-62.21497-6.65763-21.883403-23.599488-23.420409-24.877597-52.040237 8.316409-1.243317 16.59598-2.479471 24.877597-3.722788 8.316409-18.498306 23.533996-55.70265 39.08518-66.900689 13.024641-3.728928 26.048259-7.448646 39.07904-11.156084 45.641503-19.593244 96.365768-43.032072 142.108578-63.215764 41.656749-18.381649 91.51325-24.937972 106.575294-70.629617 0-31.026644 2.795673-104.309694 2.025123-144.978952L58.155515-56.631556000000046c-0.757247 40.669258 2.029216 113.952308 2.029216 144.978952 15.065114 45.691645 64.928778 52.247968 106.578364 70.629617 45.74281 20.182668 96.467075 43.62252 142.098345 63.215764 13.027711 3.707438 26.054399 7.427156 39.08211 11.156084 15.554254 11.197016 30.78105 48.402383 39.09439 66.900689l18.492166 4.710278c-4.196579 24.429389-18.658965 26.322505-24.682146 43.62559-2.356674 26.013467-4.729721 52.052516-7.095605 78.079286 0.107447-1.234107-17.006326 3.246951-19.252483 4.716418-24.130583 15.838733-24.618701 80.075757-26.941606 106.793258-1.063215 12.222369 15.163351 22.240537 10.654664 44.62536-26.433022 131.125433 11.437493 219.776496 71.330582 240.123916 41.564651 17.633612 119.167077 50.323129 191.563944 3.716648l17.971303-17.428951 29.061896-5.237281C662.71663 795.172617 672.02974 765.933689 672.02974 765.933689z"  horiz-adv-x="1024" />
+			<glyph glyph-name="download-circle" unicode="&#58881;"
+				   d="M510.771521 828.211081c-244.998947 0-443.597097-198.60429-443.597097-443.590957s198.59815-443.591981 443.597097-443.591981c244.986667 0 443.583794 198.60429 443.583794 443.591981S755.758188 828.211081 510.771521 828.211081zM510.771521-30.044013999999947c-229.010811 0-414.664138 185.65435-414.664138 414.664138 0 229.010811 185.653327 414.657998 414.664138 414.657998 228.996484 0 414.652881-185.647187 414.652881-414.657998C925.424402 155.60931300000004 739.768005-30.044013999999947 510.771521-30.044013999999947zM662.749888 352.39518799999996L537.719266 245.82501100000002l0 324.388065c0 14.887059-12.06478 26.953885-26.947745 26.953885-14.894222 0-26.961048-12.066827-26.961048-26.953885l0-325.410348L357.936647 352.39518799999996c-10.56359 10.599406-27.693736 10.599406-38.267559 0-10.56359-10.596336-10.56359-27.777647 0-38.375006l170.181961-161.220868c5.629207-5.652743 13.111622-8.060583 20.49887-7.680936 7.373944-0.379647 14.859429 2.02717 20.488637 7.680936l170.181961 161.220868c10.562567 10.597359 10.562567 27.77867 0 38.375006C690.443623 362.99561700000004 673.313477 362.99561700000004 662.749888 352.39518799999996z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="refresh-3" unicode="&#59818;" d="M820.376904 697.14807C740.637816 774.519228 631.884926 822.157201 511.999488 822.157201c-244.621347 0-442.925808-198.305485-442.925808-442.926832 0-244.6193 198.304462-442.925808 442.925808-442.925808 206.075449 0 379.271046 140.739395 428.740738 331.337337L822.859445 267.64189899999997c-45.759183-127.45381-167.656441-218.623229-310.859957-218.623229-182.371584 0-330.210677 147.842163-330.210677 330.210677 0 182.371584 147.840116 330.2117 330.210677 330.2117 88.762603 0 169.32443-35.035958 228.655723-92.015693L557.051567 433.822732l280.641725 0 113.880677 0 3.351328 0L954.925297 831.695438 820.376904 697.14807z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="ok" unicode="&#58885;" d="M960 640L915.2 684.8 371.2 172.79999999999995 108.8 454.4 64 409.6 358.4 83.20000000000005 364.8 89.60000000000002 371.2 83.20000000000005Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="templeate-1" unicode="&#58928;"
+				   d="M320 384L106.666667 384c-35.349333 0-64-28.650667-64-64l0-213.333333c0-35.349333 28.650667-64 64-64l213.333333 0c35.349333 0 64 28.650667 64 64L384 320C384 355.349333 355.349333 384 320 384zM256 341.33333300000004l0-256L170.666667 85.33333300000004 170.666667 341.33333300000004 256 341.33333300000004zM85.333333 106.66666699999996L85.333333 320c0 11.754667 9.578667 21.333333 21.333333 21.333333l42.666667 0 0-256L106.666667 85.33333300000004C94.912 85.33333300000004 85.333333 94.91200000000003 85.333333 106.66666699999996zM341.333333 106.66666699999996c0-11.754667-9.578667-21.333333-21.333333-21.333333l-42.666667 0L277.333333 341.33333300000004l42.666667 0c11.754667 0 21.333333-9.578667 21.333333-21.333333L341.333333 106.66666699999996zM576 554.666667L234.666667 554.666667c-47.061333 0-85.333333-38.272-85.333333-85.333333l0-42.666667 42.666667 0 0 42.666667c0 23.530667 19.136 42.666667 42.666667 42.666667l42.666667 0 0-96 21.333333 0L298.666667 512l213.333333 0 0-426.666667-85.333333 0-21.333333-42.666667 170.666667 0c47.061333 0 85.333333 38.272 85.333333 85.333333L661.333333 469.333333C661.333333 516.394667 623.061333 554.666667 576 554.666667zM618.666667 128c0-23.530667-19.136-42.666667-42.666667-42.666667l-42.666667 0L533.333333 512l42.666667 0c23.530667 0 42.666667-19.136 42.666667-42.666667L618.666667 128zM853.333333 42.66666699999996c47.061333 0 85.333333 38.272 85.333333 85.333333L938.666667 640c0 47.061333-38.272 85.333333-85.333333 85.333333L341.333333 725.333333c-47.061333 0-85.333333-38.272-85.333333-85.333333l0-42.666667 42.666667 0 0 42.666667c0 23.530667 19.136 42.666667 42.666667 42.666667l85.333333 0 0-85.333333 21.333333 0 0 85.333333 298.666667 0 0-597.333333-42.666667 0-21.333333-42.666667L853.333333 42.66666699999996zM896 128c0-23.530667-19.136-42.666667-42.666667-42.666667l-85.333333 0L768 682.666667l85.333333 0c23.530667 0 42.666667-19.136 42.666667-42.666667L896 128z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="layer" unicode="&#58936;" d="M96.089 724.318l0-684.236 831.822 0L927.911 724.318 96.089 724.318zM884.178 84.457L140.464 84.457 140.464 489.559l743.714 0L884.178 84.457z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="face-smile-fine" unicode="&#58892;" d="M511.558443 852.9315573333333c-246.787686 0-447.597201-200.783932-447.597201-447.598224 0-246.815315 200.783932-447.598224 447.597201-447.598224 246.841921 0 447.64939 200.782909 447.64939 447.598224C959.207833 652.1476253333334 758.400365 852.9315573333333 511.558443 852.9315573333333zM511.558443-4.962310666666667c-226.247884 0-410.295644 184.046736-410.295644 410.295644 0 226.249931 184.072319 410.296667 410.295644 410.296667 226.27449 0 410.346809-184.046736 410.346809-410.296667C921.905252 179.08442633333334 737.832933-4.962310666666667 511.558443-4.962310666666667zM724.38055 303.5726953333334c-9.698896 3.457752-20.366863-1.566682-23.848151-11.264555-28.500101-79.45461-104.372116-132.844587-188.82353-132.844587-84.798315 0-160.770614 53.689806-189.070146 133.590578-3.432169 9.723455-14.075577 14.772448-23.823592 11.364839-9.699919-3.432169-14.797008-14.100136-11.364839-23.823592 33.547047-94.77248 123.668601-158.434405 224.234017-158.434405 100.142791 0 190.140525 63.314001 223.935212 157.564595C739.125369 289.3978573333334 734.102982 300.0903843333334 724.38055 303.5726953333334zM302.49494 515.3479593333334c0-24.653493 19.98517-44.638663 44.638663-44.638663 24.653493 0 44.638663 19.98517 44.638663 44.638663s-19.98517 44.63764-44.638663 44.63764C322.48011 559.9855993333333 302.49494 540.0014523333333 302.49494 515.3479593333334L302.49494 515.3479593333334zM631.398856 515.3479593333334c0-24.653493 19.98517-44.638663 44.63764-44.638663 24.653493 0 44.63764 19.98517 44.63764 44.638663s-19.984147 44.63764-44.63764 44.63764C651.384026 559.9855993333333 631.398856 540.0014523333333 631.398856 515.3479593333334L631.398856 515.3479593333334z"  horiz-adv-x="1024" />
+			<glyph glyph-name="util" unicode="&#58929;"
+				   d="M282.127566 639.0826059999999c-13.120832-13.221116-30.625508-20.50808-49.278333-20.50808-18.618033 0-36.157501 7.286963-49.311079 20.50808l-32.885991 33.019021 98.623181 99.027387 32.885991-33.019021c13.186324-13.221116 20.473287-30.829146 20.473287-49.548486C302.599829 669.8769589999999 295.347658 652.26893 282.127566 639.0826059999999L282.127566 639.0826059999999zM249.308089 705.0899489999999l-0.032746 0-32.884968-32.987299c4.418636-4.417613 10.252505-6.845918 16.458857-6.845918 6.206352 0 12.041244 2.428306 16.426111 6.813173 4.418636 4.452405 6.845918 10.288321 6.845918 16.493649C256.121262 694.802652 253.693979 700.671313 249.308089 705.0899489999999L249.308089 705.0899489999999zM396.703067 496.343671L249.578242 638.778684l32.278147 33.626865 147.157571-142.468782L396.703067 496.343671 396.703067 496.343671zM751.45979 133.92852400000004L618.131179 274.071332l32.884968 32.985252 133.330658-140.141784L751.45979 133.92852400000004 751.45979 133.92852400000004zM850.184279 67.95597399999997c-22.700001-22.766516-52.481282-34.168194-82.264609-34.168194-29.714765 0-59.395762 11.333116-81.994456 34.033118L538.194592 222.398462l32.884968 33.021068L718.811206 100.806149c27.117614-27.183106 71.269183-27.116591 98.488105 0.169869 27.186176 27.287483 27.117614 71.773673-0.135076 99.196233l-147.426701 154.273642 32.851199 33.021068 147.461493-154.308435C895.447159 187.557956 895.514697 113.421468 850.184279 67.95597399999997L850.184279 67.95597399999997zM801.716404 468.380806c-30.726815-30.860868-71.605851-47.861054-115.082038-47.861054-43.442418 0-84.321454 16.999163-115.082038 47.861054-30.760584 30.861892-47.692209 71.877027-47.692209 115.521037s16.931624 84.691891 47.692209 115.554806l42.497906 42.666752 32.885991-32.986275-42.497906-42.667775c-21.99085-22.090111-34.099632-51.367925-34.065863-82.566484 0-31.163767 12.108782-60.441581 34.065863-82.499969 21.956058-22.058388 51.16531-34.20094 82.196047-34.20094 31.064506 0 60.239989 12.142551 82.196047 34.20094l42.49893 42.665729 32.884968-33.019021L801.716404 468.380806 801.716404 468.380806zM844.214311 511.049604l-49.311079 49.51267-16.45988-16.493649c-17.538445-17.638729-40.879036-27.352975-65.73719-27.352975l-0.032746 0c-24.824385 0-48.198745 9.713222-65.73719 27.352975-17.539468 17.607006-27.252691 41.082674-27.252691 66.007343 0 24.925692 9.679453 48.400337 27.252691 66.040089l16.458857 16.495696-49.344848 49.51267 32.885991 33.021068 82.196047-82.533738-49.311079-49.482995c-8.769734-8.835226-13.626345-20.571525-13.626345-33.051767 0-12.446473 4.856611-24.183795 13.626345-32.987299 8.768711-8.835226 20.439518-13.69286 32.884968-13.69286 12.411681 0 24.082488 4.857635 32.852222 13.69286l49.344848 49.514717 82.196047-82.534761L844.214311 511.049604 844.214311 511.049604zM233.591129 129.139451l0 46.681182 46.512337 0 0-46.681182L233.591129 129.139451 233.591129 129.139451zM538.160823 356.538555l-92.247984 91.572602 32.717146 33.18889 92.214215-91.539856L538.160823 356.538555 538.160823 356.538555zM304.2187 101.04355599999997l173.634596 239.842507 37.641295-27.454282L338.318332 69.23715300000003c-21.923312-22.057365-51.132564-34.20094-82.19707-34.20094-31.028691 0-60.237943 12.143575-82.196047 34.168194-21.958104 22.057365-34.065863 51.335179-34.065863 82.533738 0 31.198559 12.107759 60.476373 34.065863 82.533738l2.765997 2.360767L417.243893 412.054963l27.353998-37.742603L205.596542 200.00340600000004c-12.411681-13.053294-19.224854-30.119995-19.224854-48.26526 0-18.71934 7.252171-36.291554 20.438495-49.513694C232.747925 76.15265599999998 277.775444 75.71263499999998 304.2187 101.04355599999997L304.2187 101.04355599999997z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="dollar" unicode="&#58969;" d="M517.565-65.45399999999995c-244.263 0-442.299 198.014-442.299 442.299s198.014 442.299 442.299 442.299c244.263 0 442.299-198.014 442.299-442.299 0-244.263-198.014-442.299-442.299-442.299zM517.565 863.383c-268.751 0-486.564-217.834-486.564-486.564s217.834-486.564 486.564-486.564c268.751 0 486.564 217.834 486.564 486.564 0 268.751-217.834 486.564-486.564 486.564zM497.036 425.349c-18.443 6.957-33.605 16.314-45.238 27.617-11.581 11.306-20.059 23.465-25.468 36.742-5.423 13.177-8.178 26.235-8.178 39.172-0.004 18.194 2.564 34.357 7.846 48.514 5.327 14.231 13.748 25.85 25.468 35.02 11.581 9.167 26.798 15.204 45.482 18.295v-205.52zM534.455 356.13199999999995c16.937-6.756 32.277-14.997 46.035-24.855 13.748-9.678 24.613-21.601 32.929-35.57 8.204-13.909 12.436-30.734 12.622-50.307 0-14.231-1.859-27.907-5.785-40.833-3.858-12.866-9.542-24.531-17.271-34.804-7.691-10.211-17.271-18.443-28.678-24.613-11.328-6.318-24.613-9.678-39.76-10.341v221.377zM534.455 94.18299999999999c29.037 3.318 53.978 11.306 74.785 24.134 20.985 12.866 37.018 30.15 48.281 51.734 11.125 21.535 16.876 46.832 16.937 76.196 0 16.08-1.67 30.377-5.033 42.985-3.318 12.622-8.204 24.15-14.836 34.357-6.739 10.341-14.836 20.189-24.613 29.326-8.853 8.204-19.107 15.957-30.659 23.041-11.328 7.197-22.836 13.706-34.281 19.261-11.581 5.694-21.601 10.516-30.659 14.231v221.377c14.527-3.318 26.662-8.594 36.62-16.192 9.859-7.395 17.766-16.192 23.776-26.384 5.941-10.211 10.341-20.985 12.972-32.345 2.666-11.328 4.026-22.836 3.858-34.097h46.155c0.004 16.314-1.566 32.345-5.327 48.281-3.543 15.957-9.938 30.909-19.107 44.969-8.996 13.909-21.601 26.235-37.684 36.742-16.192 10.521-36.62 18.295-61.318 23.562v49.426h-37.441v-53.316c-23.465-2.624-42.985-8.178-58.595-16.314-15.633-8.204-28.279-18.194-37.684-29.562-9.441-11.328-16.523-23.302-21.226-35.317-4.59-12.062-7.846-23.302-9.316-33.326-1.566-10.211-2.256-18.194-2.115-24.029 0.004-21.601 3.452-40.612 9.863-57.238 6.479-16.523 15.58-30.909 27.178-43.441 11.659-12.436 25.361-23.562 40.833-33.204 15.633-9.678 32.649-18.443 51.098-26.235v-237.329c-18.194 1.984-33.326 7.197-45.094 15.633-11.97 8.369-21.074 19.107-27.714 31.902-6.739 12.972-11.011 27.178-13.363 42.701-2.256 15.58-3.034 31.313-2.115 47.367h-47.803c-1.183-23.776 0.397-46.035 5.033-66.676s12.357-39.03 23.376-55.019c10.892-16.08 25.361-29.037 43.142-39.03 17.847-9.863 39.472-16.08 64.586-18.295v-65.283h37.441v65.283z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="group" unicode="&#58899;" d="M1383.17753-39.75895700000001L1380.048488-13.938771999999972 1373.005994 17.35852699999998 1362.834458 47.090445000000045 1348.751189 77.605053 1334.667921 101.07716700000003 1315.107539 123.76659099999995 1293.199086 141.76331100000004 1262.684478 158.97562200000004 1240.777745 169.147158 1211.828518 176.18965200000002 1182.87757 183.23042599999997 1157.840075 192.61927200000002 1126.544497 207.48523 1101.507002 219.22214799999995 1070.992393 233.30541600000004 1047.52028 246.607714 1047.52028 329.54366300000004 1057.690095 341.280581 1067.080661 356.92751 1074.121435 372.57615899999996 1079.598549 392.136541 1085.858352 415.610375 1088.204704 433.605376 1091.595216 432.822685 1098.37624 433.866846 1103.593603 438.040048 1109.330466 447.428894 1112.982449 458.3814 1115.06905 471.943448 1117.676871 496.459723 1118.719312 517.324016 1117.676871 535.059266 1114.024889 546.0134929999999 1106.722645 550.186695 1102.549442 549.142535 1106.201425 572.614649 1109.330466 600.782906 1110.374627 626.341621 1109.851687 646.684693 1106.722645 665.4623839999999 1100.984061 683.718855 1093.160597 700.409945 1082.20637 719.189356 1069.688483 734.838006 1055.082274 746.8346730000001 1036.304583 758.83134 1012.832469 769.785566 993.010617 775.00121 969.017283 779.174412 945.543448 779.695632 921.550114 775.52243 898.599221 767.698965 878.256148 759.35256 860.520898 747.877113 844.089558 733.2726250000001 828.440908 716.058594 814.35764 695.715522 804.186104 673.8087889999999 797.92802 648.771294 797.14533 616.691305 800.274372 586.959387 804.186104 548.621314 795.579949 548.621314 790.102836 541.57882 788.539175 529.060933 790.102836 499.329015 794.014568 464.902674 797.14533 447.688644 802.622443 438.299798 812.793979 432.822685 819.052063 433.605376 822.965515 406.221529 826.877248 389.790189 833.137051 371.79346899999996 841.743207 353.79846799999996 851.914743 339.7152 859.738207 329.54366300000004 858.955517 245.04233299999999 867.267518 242.13003600000002 878.734364 238.975192 891.063029 234.389141 902.817148 229.80137100000002 913.712888 225.78814699999998 923.459535 220.91310299999998 935.215374 216.03977999999995 948.116866 208.58615799999995 961.018358 201.13081599999998 971.625104 193.38992099999996 985.386695 183.06872699999997 997.142535 172.174708 1008.323827 158.41311700000006 1020.077947 143.21860000000004 1032.549389 125.72933699999999 1043.300632 105.086951 1052.476173 82.72436500000003 1060.502621 62.08197800000005 1066.093267 42.72974099999999 1069.963715 22.517404000000056 1073.834162-0.27523199999995995 1076.41446-26.93831499999999 1076.84451-45.000403000000006 1075.984411-61.12726799999996 1072.328988-73.59870999999998 1065.377664-87.28805299999999 1057.277248-96.391345 1042.440532-103.91721500000006 1351.099261-103.91721500000006 1365.182529-96.87472100000002 1376.136756-85.92221500000005 1383.17753-74.18529799999999 1384.742911-59.319339000000014ZM438.650719 816.389195L421.44873 797.467007 405.96694 775.104421 394.785647 751.021637 387.904851 723.498455 387.044752 688.234377 390.48515 655.550598 394.785647 613.4057250000001 385.324553 613.4057250000001 379.303857 605.6648299999999 377.583658 591.903239 379.303857 559.21946 383.604354 521.375084 387.044752 502.452896 393.065448 492.131703 404.246741 486.111007 411.127537 486.971106 415.428034 456.867625 419.728531 438.805537 426.609327 419.02325 436.070421 399.240962 447.251713 383.75917200000004 455.852708 372.57787900000005 454.992609 279.687139 440.370918 270.226045 405.96694 253.88415499999996 370.702863 238.40236500000003 342.319581 224.64077399999996 319.956995 215.17967999999996 295.014111 207.43878500000005 269.211128 202.278188 244.268244 196.25749199999996 218.46526 185.07619899999997 194.382475 173.034807 172.879989 157.55301699999995 148.797205 133.470232 131.595216 108.52734799999996 118.693724 84.44456400000001 108.372531 58.641579999999976 98.051337 29.398198999999977 92.89074 6.175514000000021 88.590243-13.606772999999976 86.009945-36.829458000000045 86.009945-57.47184500000003 89.450343-78.11423200000002 99.771536-91.87582299999997 115.253326-102.19701699999996 135.035613-103.91721500000006 995.995162-103.91721500000006 1011.476952-96.17632000000003 1023.518344-84.13492799999995 1031.259239-71.23343599999998 1032.979438-54.891546999999946 1031.259239-33.38906099999997 1027.818842-5.005778999999961 1020.077947 29.398198999999977 1008.896654 62.08197800000005 993.414864 95.625857 977.933074 121.42884000000004 956.430587 146.37172399999997 932.347803 166.15401199999997 898.803924 185.07619899999997 874.72114 196.25749199999996 842.89746 203.99838699999998 811.07378 211.739282 783.550598 222.060476 749.14662 238.40236500000003 721.623438 251.303857 688.079559 266.78564700000004 662.276576 281.407338 662.276576 372.57787900000005 673.457869 385.479371 683.779062 402.68136 691.519957 419.883349 697.540653 441.385835 704.421449 467.188819 707.001747 486.971106 710.729418 486.111007 718.18304 487.258379 723.916463 491.84443 730.224432 502.165623 734.237656 514.207015 736.532402 529.1159789999999 739.398253 556.066335 740.545626 579.001747 739.398253 598.496761 735.385029 610.538153 727.356861 615.1259239999999 722.77081 613.9785509999999 726.784034 639.7815350000001 730.224432 670.7451149999999 731.371805 698.842844 730.797258 721.205429 727.356861 741.847816 721.050611 761.915656 712.449617 780.265018 700.408225 800.907405 686.646634 818.109394 670.590297 831.2981589999999 649.94791 844.485204 624.144927 856.526596 602.356888 862.261739 575.979358 866.847789 550.176374 867.422336 523.800564 862.834565 498.570407 854.233571 476.207822 845.05975 456.712807 832.443811Z"  horiz-adv-x="1449" />
+			<glyph glyph-name="face-surprised" unicode="&#58980;"
+				   d="M485.656116-128C221.592397-128 6.762016 86.81718000000001 6.762016 350.87649799999997s214.830381 478.867697 478.8941 478.867697c264.041716 0 478.854495-214.812779 478.854495-478.867697S749.697832-128 485.656116-128zM485.656116 798.834741c-247.024795 0-447.975846-200.959852-447.975846-447.962644 0-247.002792 200.951051-447.962644 447.975846-447.962644 247.002792 0 447.953843 200.959852 447.953843 447.962644C933.609959 597.8748889999999 732.658908 798.834741 485.656116 798.834741zM352.033458 447.380528c0-30.469398-24.682677-55.147675-55.143274-55.147675-30.451796 0-55.143274 24.678276-55.143274 55.147675 0 30.460597 24.691478 55.138874 55.143274 55.138874C327.350781 502.519402 352.033458 477.845526 352.033458 447.380528zM674.417647 502.519402c-30.460597 0-55.156476-24.678276-55.156476-55.138874 0-30.469398 24.695879-55.147675 55.156476-55.147675 30.451796 0 55.143274 24.678276 55.143274 55.147675C729.560922 477.845526 704.869444 502.519402 674.417647 502.519402zM562.005634 165.30976499999997c0-59.733046-34.192262-108.165484-76.349518-108.165484-42.166057 0-76.36272 48.432438-76.36272 108.165484 0 59.724245 34.196663 108.152282 76.36272 108.152282C527.813371 273.45764699999995 562.005634 225.03400999999997 562.005634 165.30976499999997zM835.631745 793.712503c0 0 12.871605 56.819883 41.959231 85.925112 29.083226 29.096427 69.915916 15.124685 78.492585-8.801097 9.461179-26.385689-2.033053-50.069442-29.092027-56.164202C899.404495 808.463141 874.880237 826.192952 835.631745 793.712503zM916.698651 757.570797c0 0 35.767659 20.576965 64.877288 19.393218 29.136032-1.174946 41.431165-29.144833 33.109728-45.110024-9.192746-17.588993-27.054573-22.966463-43.217788-11.797871C954.979023 731.44034 952.453108 752.721393 916.698651 757.570797z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="layim-download" unicode="&#58910;" d="M186.888458 77.07363199999998l0 581.729108c14.85022-14.450107 35.050284-23.436782 57.359382-23.436782l560.03604 0 0-151.561881 25.029046 0 0 176.591951-585.065086 0c-31.191396 0-57.359382 26.166963-57.359382 57.359382 0 31.191396 26.165939 57.359382 57.359382 57.359382l572.551074 0L816.798914 800.143838 244.24784 800.143838c-45.431725 0-82.388429-36.957727-82.388429-82.388429l0-640.681778c0-41.796942 34.000372-75.789127 75.789127-75.789127l225.950102 0 0 25.029046L237.648538 26.31355099999996C209.661114 26.31355099999996 186.888458 49.078021000000035 186.888458 77.07363199999998zM236.947574 730.269421l560.38601 0 0-25.029046-560.38601 0 0 25.029046ZM686.086897 428.171012c-85.917812 0-164.908864-55.248302-194.553021-135.882783-30.013571-81.641415-4.269233-175.567621 62.624293-230.942813 67.00302-55.465243 164.474982-62.808488 238.931764-17.720593 74.094532 44.868907 113.272833 133.533272 96.080266 218.517829C869.882923 357.47283300000004 783.297916 428.171012 686.086897 428.171012zM686.086897 38.82858599999997c-75.595722 0-145.060817 48.634674-171.092703 119.595842-26.354228 71.839165-3.63069 154.438395 55.287187 203.074092 59.017138 48.718585 144.762011 55.029314 210.191186 15.237029 65.11195-39.59888 99.396801-117.681236 84.064604-192.408171C847.384513 100.72940100000005 771.387655 38.82858599999997 686.086897 38.82858599999997zM698.600909 152.23547199999996L698.600909 311.02496499999995 673.571862 311.02496499999995 673.571862 152.28459099999998 604.675726 221.17254100000002 586.978668 203.47548400000005 686.111456 104.35190499999999 785.185916 203.42738799999995 767.489882 221.123422Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="picture-fine" unicode="&#58893;" d="M958.648085 84.30682933333333L65.772494 84.30682933333333 65.772494 721.9115253333333l892.87559 0L958.648085 84.30682933333333zM97.660762 116.20328333333339l829.099055 0L926.759817 690.0570263333334 97.660762 690.0570263333334 97.660762 116.20328333333339zM648.731616 419.05893933333334l-1.991354 0c-47.801702 0-86.696548 38.900985-86.696548 86.695524l0 1.978051c0 47.809889 38.894845 86.671988 86.696548 86.671988l1.991354 0c47.801702 0 86.698594-38.862099 86.698594-86.671988l0-1.978051C735.43021 457.95992433333333 696.533318 419.05893933333334 648.731616 419.05893933333334zM646.740262 562.5193053333333c-30.224372 0-54.810327-24.582885-54.810327-54.787814l0-1.978051c0-30.230512 24.584931-54.803163 54.810327-54.803163l1.991354 0c30.222325 0 54.810327 24.572652 54.810327 54.803163l0 1.978051c0 30.203906-24.586978 54.787814-54.810327 54.787814L646.740262 562.5193053333333zM91.097276 181.7900473333334l-22.748097 22.338774 274.373974 279.332916 22.750143-22.351054L91.097276 181.7900473333334zM604.886015 215.92242633333342L339.999113 480.74793033333333l22.548552 22.525016L627.433544 238.4638153333334 604.886015 215.92242633333342zM619.007641 202.70744933333333l-22.763446 22.337751 167.989015 171.035398 22.765493-22.350031L619.007641 202.70744933333333zM925.622924 222.7939273333334L758.534418 389.8343373333333l22.548552 22.529109 167.086459-167.044504L925.622924 222.7939273333334z"  horiz-adv-x="1024" />
+			<glyph glyph-name="edit" unicode="&#58946;"
+				   d="M769.089 516.251l-125.896 125.89 62.974 62.947c20.866 20.838 54.652 20.838 75.517 0l50.353-50.351c20.865-20.865 20.865-54.703 0-75.567L769.089 516.251zM403.349 150.52700000000004L277.453 276.418 619.706 615.982 745.601 490.09ZM176.314 47.283000000000015L252.912 251.87699999999995 377.753 127.01199999999994Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="link" unicode="&#58956;" d="M262.4-121.60000000000002c-64 0-128 25.6-179.2 76.8-102.4 102.4-102.4 262.4 0 364.8l134.4 134.4 89.6-89.6-134.4-134.4c-51.2-51.2-51.2-128 0-179.2 51.2-51.2 128-51.2 179.2 0l179.2 179.2c25.6 25.6 38.4 57.6 38.4 89.6S556.8 384 537.6 409.6L467.2 473.6l89.6 89.6 70.4-70.4C672 448 697.6 384 697.6 313.6c0-70.4-25.6-134.4-76.8-179.2l-179.2-179.2C396.8-96 326.4-121.60000000000002 262.4-121.60000000000002zM467.2 204.79999999999995L396.8 268.79999999999995c-102.4 102.4-102.4 262.4 0 364.8l179.2 179.2c102.4 102.4 262.4 102.4 364.8 0 102.4-102.4 102.4-262.4 0-364.8l-134.4-134.4-89.6 89.6 134.4 134.4c51.2 51.2 51.2 128 0 179.2-51.2 51.2-134.4 51.2-179.2 0L486.4 544c-51.2-51.2-51.2-128 0-179.2l70.4-70.4L467.2 204.79999999999995z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="diamond" unicode="&#59189;" d="M998.4 526.933333L797.866667 802.133333c-4.266667 6.4-12.8 10.666667-19.2 10.666667L243.2 812.8c0 0-14.933333-2.133333-23.466667-17.066667C194.133333 753.066667 32 512 32 512L21.333333 494.933333l12.8-14.933333L469.333333-27.733333000000016c4.266667-4.266667 6.4-6.4 10.666667-8.533333 6.4-4.266667 32-10.666667 46.933333 0 4.266667 2.133333 6.4 6.4 10.666667 8.533333l409.6 420.266667c10.666667 8.533333 10.666667 25.6 0 34.133333-8.533333 10.666667-23.466667 10.666667-32 0L561.066667 61.86666700000001l153.6 422.4 0 0 251.733333 0c2.133333 0 19.2 0 23.466667 4.266667l2.133333 2.133333C1004.8 497.066667 1006.933333 512 998.4 526.933333zM782.933333 763.733333l-96-226.133333L341.333333 537.6l-85.333333 226.133333L782.933333 763.733333zM221.866667 714.666667l72.533333-179.2-192 0L221.866667 714.666667zM91.733333 488.533333l215.466667 0 138.666667-416L91.733333 488.533333zM503.466667 44.799999999999955l-147.2 443.733333 307.2 0L503.466667 44.799999999999955zM736 535.4666669999999L810.666667 701.866667l119.466667-168.533333L736 533.333333z"  horiz-adv-x="1024" />
+			<glyph glyph-name="speaker" unicode="&#58949;"
+				   d="M587.182306 754.7203c-6.003737 2.705622-13.043061 1.642406-17.984606-2.721994l-259.223926-229.293243-148.246369 0c-9.253758 0-16.752546-7.498788-16.752546-16.756639l0-267.886213c0-9.249665 7.498788-16.756639 16.752546-16.756639l144.050814 0c9.253758 0 16.752546 7.506974 16.752546 16.756639L322.530764 490.391099c1.774413 0.704035 3.433192 1.719154 4.892427 3.010567l236.127905 208.861912 0-653.332912-160.751171 137.64287c-2.12643 1.824555-90.300632 78.69941-93.927229 76.162634-4.427846-3.097548-15.768125-17.59882-18.419512-22.512736-0.953721-1.768273-2.196015-1.334391 15.413038-16.379039 25.674753-21.936615 73.780377-61.548798 75.144444-62.717414l10.007935-8.570189 178.388876-152.761196c3.093455-2.653433 6.978948-4.028757 10.900258-4.028757 2.369977 0 4.756327 0.503467 7.003508 1.534959 5.939269 2.738367 9.749038 8.677637 9.749038 15.217586L597.060281 739.446431C597.060281 746.034477 593.190137 752.013655 587.182306 754.7203L587.182306 754.7203zM290.453185 254.814756l-115.040083 0L175.413102 489.195877l115.03906 0 0-234.381122L290.453185 254.814756zM747.742119 375.98444300000006c0-51.55212-34.83232-96.658434-84.702124-109.693308-1.415232-0.375553-2.846838-0.551562-4.245697-0.551562-7.438413 0-14.234189 4.992711-16.200984 12.523221-2.338255 8.949836 3.021823 18.104333 11.967566 20.442588 35.136242 9.18929 59.672054 40.96397 59.672054 77.279061 0 36.307927-24.535813 68.090794-59.672054 77.271898-8.945743 2.346441-14.305821 11.492752-11.967566 20.450774 2.342348 8.953929 11.499915 14.305821 20.446681 11.967566C712.909799 472.643899 747.742119 427.530422 747.742119 375.98444300000006L747.742119 375.98444300000006zM864.950588 375.793084c0-88.87619-48.554856-170.44495-126.718053-212.883505-2.537799-1.375324-5.276167-2.02717-7.982812-2.02717-5.939269 0-11.69946 3.166109-14.733563 8.762571-4.417613 8.134261-1.39886 18.303878 6.727215 22.720468 67.350944 36.566824 109.198028 106.851587 109.198028 183.427636 0 76.844156-42.055838 147.272181-109.741403 183.78784-8.154727 4.396123-11.192923 14.557554-6.795776 22.700001 4.38896 8.142447 14.558577 11.184737 22.701025 6.795776C816.151162 546.697499 864.950588 464.976266 864.950588 375.793084L864.950588 375.793084z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="log" unicode="&#58894;" d="M828.01742 700.357158C743.476979 784.899646 631.076002 831.458031 511.516999 831.458031c-119.55798 0-231.959979-46.558385-316.500421-131.09985C110.47716 615.81774 63.918775 503.41574 63.918775 383.85776c0-87.103824 25.045419-171.548074 72.429613-244.204861 9.393951-14.402011 28.685319-18.46249 43.087331-9.071609 14.404058 9.393951 18.46556 28.685319 9.072633 43.089377-40.768519 62.511729-62.317301 135.194098-62.317301 210.187093 0 212.469066 172.85586 385.326972 385.325949 385.326972s385.325949-172.857906 385.325949-385.326972-172.85586-385.326972-385.325949-385.326972c-70.357418 0-139.188062 19.131733-199.052498 55.323003-14.71412 8.900717-33.856086 4.180206-42.753733-10.534937-8.896624-14.71719-4.180206-33.856086 10.534937-42.753733 69.584821-42.070164 149.556201-64.307631 231.271294-64.307631 119.559003 0 231.959979 46.558385 316.500421 131.09985 84.539418 84.539418 131.097804 196.941418 131.097804 316.499397S912.556838 615.81774 828.01742 700.357158zM494.28964 690.216193c-21.782096 0-39.397289-17.658172-39.397289-39.439244l0-283.524378c0-1.360997 0.358157-2.706645 0.493234-4.03285 2.020006-19.886933 18.959817-34.573423 39.379892-34.573423l0 0 0.146333 0.832971 223.590358 0c21.782096 0 39.438221 17.616216 39.438221 39.397289s-17.658172 39.397289-39.439244 39.397289L533.686928 408.273846l0 242.503103C533.686928 672.5580219999999 516.071735 690.216193 494.28964 690.216193z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="rate-solid" unicode="&#59002;" d="M957.111079 492.519576c-3.927449 11.669784-14.447037 19.86442-26.723641 20.816095L647.68068 535.250796 540.183388 811.873997c-4.586458 11.803837-15.951297 19.579941-28.614711 19.579941s-24.02723-7.776104-28.614711-19.579941L375.458719 535.250796l-282.708803-21.915126c-12.276604-0.951675-22.796192-9.146311-26.723641-20.816095-3.927449-11.669784-0.50142-24.557302 8.701173-32.737612l217.547735-193.358823-67.980277-291.298436c-2.848884-12.20702 2.009773-24.919553 12.273535-32.114418 10.264784-7.195889 23.87271-7.42818 34.375925-0.586354l240.624313 156.709111 240.625336-156.709111c5.099135-3.320629 10.92891-4.974291 16.752546-4.974291 6.173606 0 12.342096 1.858324 17.623379 5.561669 10.263761 7.194866 15.122419 19.907399 12.273535 32.114418l-67.980277 291.299459L948.409906 459.781964C957.613522 467.962274 961.037505 480.849792 957.111079 492.519576z"  horiz-adv-x="1024" />
+			<glyph glyph-name="down" unicode="&#58906;"
+				   d="M888.306 619.94c15.615 15.617 40.93 15.617 56.545 0v0c15.617-15.615 15.617-40.93 0-56.545l-405.733-405.734c-15.615-15.617-40.928-15.617-56.545 0v0c-15.615 15.615-15.615 40.93 0 56.545l405.733 405.734zM538.619 214.20600000000002c15.617-15.615 15.617-40.93 0-56.545v0c-15.615-15.617-40.928-15.617-56.545 0l-405.734 405.734c-15.615 15.615-15.615 40.93 0 56.545v0c15.617 15.617 40.93 15.617 56.547 0l405.732-405.734zM538.619 214.20600000000002z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="fonts-del" unicode="&#58959;" d="M928 448l-143.616 0c-3.456 55.616-14.272 106.56-29.504 144.96C725.504 666.816 617.344 768 464.32 768L256 768l0-320L96 448C78.336 448 64 433.664 64 416S78.336 384 96 384L256 384l0-320 229.632 0c156.288 0 240.768 97.856 267.904 167.488C772.736 280.96000000000004 782.272 333.312 784.96 384L928 384C945.664 384 960 398.336 960 416S945.664 448 928 448zM349.376 711.488l63.936 0c35.712 0 251.84 27.968 266.944-263.488l-330.88 0L349.376 711.488zM439.296 120.51199999999994L349.376 120.51199999999994 349.376 382.528 349.376 384l330.88 0C665.344 113.98400000000004 467.968 120.51199999999994 439.296 120.51199999999994z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="unlink" unicode="&#58957;" d="M150.336 767.6800000000001C133.44 762.304 124.16 744.3199999999999 129.472 727.488 131.2 722.1759999999999 134.208 717.44 138.304 713.664l122.624-122.432C270.208 576.192 289.92 571.52 304.96 580.736 320 590.0799999999999 324.672 609.7280000000001 315.456 624.832 312.832 629.056 309.184 632.64 304.96 635.264L182.336 757.696C175.168 765.44 164.672 769.216 154.304 767.6800000000001 152.96 767.808 151.552 767.808 150.336 767.6800000000001L150.336 767.6800000000001zM406.08 831.424c-13.696-4.48-22.72-17.6-22.016-32L384.064 672c0-17.664 14.336-32 32-32s31.872 14.336 31.872 32L447.936 799.424C448.256 817.088 434.304 831.6800000000001 416.64 832 414.464 832.064 412.16 831.808 410.048 831.424 408.704 831.552 407.296 831.552 406.08 831.424L406.08 831.424zM91.392 511.872C73.728 509.12 61.632 492.544 64.384 474.88 67.136 457.28 83.712 445.248 101.376 448L224 448C241.664 448 256 462.208 256 479.872s-14.336 32-32 32L101.376 511.872c-1.984 0.192-3.968 0.192-6.016 0C94.016 512 92.608 512 91.392 511.872L91.392 511.872zM795.456 320c-17.728-2.752-29.824-14.08-27.072-31.744 2.752-17.6 19.328-35.008 36.992-32.256L928 256c17.664 0 32 19.584 32 37.248S945.664 320 928 320l-122.624 0c-1.984 0.192-3.968 0.192-6.016 0-1.344 0.128-2.688 0.128-4.032 0L795.456 320zM598.272 127.42399999999998c-13.76-4.48-22.72-17.6-22.08-32L576.192-32c0-17.664 14.336-32 32-32S640-49.66399999999999 640-32l0 127.424c0.32 17.6-13.568 32.256-31.232 32.576-2.176 0.064-4.352-0.192-6.592-0.576-1.344 0.128-2.688 0.128-4.032 0L598.272 127.42399999999998zM726.272 191.67999999999995c-16.896-5.376-26.24-23.36-20.864-40.192 1.664-5.312 4.736-10.048 8.832-13.824l122.56-122.432c9.28-15.04 28.928-19.776 44.032-10.496 14.976 9.344 19.712 28.992 10.368 44.032-2.624 4.224-6.144 7.808-10.368 10.432l-122.56 122.432c-7.168 7.744-17.6 11.52-28.032 9.984-1.344 0.128-2.688 0.128-4.032 0L726.272 191.61599999999999zM339.968 28.03200000000004c-49.152 0-98.304 18.688-135.744 56.128-74.816 74.88-74.816 196.608 0 271.488l87.744 87.744c12.48 12.48 32.768 12.48 45.248 0s12.48-32.768 0-45.248L249.408 310.46400000000006c-49.92-49.856-49.92-131.136 0-180.992 49.856-49.856 131.136-49.856 180.992 0l87.744 87.744c12.48 12.48 32.768 12.48 45.248 0s12.48-32.768 0-45.248l-87.744-87.744C438.272 46.72000000000003 389.12 28.03200000000004 339.968 28.03200000000004zM702.144 323.712c-8.192 0-16.384 3.136-22.656 9.344-12.48 12.48-12.48 32.768 0 45.248l87.744 87.744c49.856 49.92 49.856 131.072 0 180.992-49.856 49.856-131.136 49.856-180.992 0L498.496 559.296c-12.48-12.48-32.768-12.48-45.248 0s-12.48 32.768 0 45.248l87.744 87.744c74.88 74.88 196.608 74.88 271.488 0 74.88-74.816 74.88-196.672 0-271.488l-87.744-87.744C718.528 326.784 710.336 323.712 702.144 323.712z"  horiz-adv-x="1024" />
+			<glyph glyph-name="file" unicode="&#58913;"
+				   d="M887.443911 598.6304l0-44.578133 0-45.511111 0-477.866667c0-37.705956-30.560711-68.266667-68.266667-68.266667l-614.4 0c-37.705956 0-68.266667 30.560711-68.266667 68.266667l0 705.422222c0 37.6832 30.560711 68.266667 68.266667 68.266667l386.844444 0 45.511111 0 38.024533 0c7.805156 2.594133 16.566044 1.2288 22.778311-5.006222l183.136711-183.159467C885.919289 611.373511 887.876267 604.9564439999999 887.443911 598.6304zM659.888356 531.296711c-12.583822 0-22.755556 10.171733-22.755556 22.755556l0 204.8-45.511111 0-364.088889 0c-25.122133 0-45.511111-20.388978-45.511111-45.511111l0-659.911111c0-25.122133 20.388978-45.511111 45.511111-45.511111l568.888889 0c25.122133 0 45.511111 20.388978 45.511111 45.511111l0 455.111111 0 22.755556L659.888356 531.296711zM682.643911 750.273422l0-173.4656 159.288889 0 0 14.176711L682.643911 750.273422z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="fonts-clear" unicode="&#58937;" d="M944.787709 197.20939699999997L857.081297 197.20939699999997 741.092979-127.73993700000005 815.146059-127.73993700000005 832.440281-65.58476199999996 966.82809-65.58476199999996 984.512408-127.73993700000005 1062.011328-127.73993700000005 944.787709 197.20939699999997 944.787709 197.20939699999997ZM848.04409 1.1865400000000363L898.951519 153.25866699999995 949.923963 1.1865400000000363 848.04409 1.1865400000000363 848.04409 1.1865400000000363ZM210.238376 489.910857L183.386821 513.121524 12.46009 313.522794C-5.874386 292.652698-3.728862 260.989968 17.271265 242.720508 38.401424 224.45104800000001 70.454249 226.66158700000005 88.853741 247.53168300000004L100.361551 260.599873C106.603075 267.55657099999996 117.200662 268.20673 124.287392 262.22527 131.309106 256.048762 132.024281 245.51619000000005 125.912789 238.55949199999998 107.448281 217.62438099999997 98.085995 173.08850800000005 119.216154 154.81904799999995 140.281297 136.614603 183.841932 151.76330199999995 202.371455 172.69841299999996 208.417932 179.525079 219.145551 180.30526999999995 226.167265 174.19377799999995 233.188979 168.14730199999997 233.904154 157.61473 227.792662 150.65803200000005 209.328154 129.85295199999996 199.965868 85.05701599999998 221.096027 66.91758700000003 242.16117 48.648127000000045 285.656789 63.86184100000003 304.186313 84.666921 310.362821 91.62361899999996 321.025424 92.40381000000002 327.982122 86.29231700000003 335.068852 80.18082500000003 335.784027 69.71326999999997 329.672535 62.75657100000001 311.143011 41.82146 301.845741-2.9094599999999673 322.910884-20.983873000000017 344.041043-39.253333 387.601678-24.039619000000016 406.00117-3.234540000000038 412.177678 3.7221590000000333 422.840281 4.437332999999967 429.927011-1.6091430000000173 436.948725-7.720635000000016 437.598884-18.31822199999999 431.487392-25.144889000000035 413.022884-46.08000000000004 403.725614-90.81092100000001 424.790757-109.01536499999997 445.920916-127.15479400000004 477.973741-125.00927000000001 496.373233-104.20419000000004L667.299963 95.52457100000004 658.652852 132.90869799999996 210.238376 489.910857 210.238376 489.910857ZM844.013106 329.516698L680.10809 471.12127 929.639011 715.190857C933.2799 718.376635 936.725741 721.562413 939.976535 725.203302 977.815773 768.048762 973.524725 833.129651 930.28917 870.513778 887.183646 907.702857 821.58263 903.281778 783.808408 860.631365L783.483328 860.761397 564.249805 571.3107299999999 399.824662 713.56546C385.391138 726.113524 363.480789 724.553143 350.867709 710.249651L248.14263 593.871238 225.322059 567.994921 251.393424 545.434413 695.7119 161.25561900000002 726.26936 136.679619 847.328916 281.014857C859.941995 295.318349 858.44663 316.96863499999995 844.013106 329.516698L844.013106 329.516698ZM817.941741 830.724063C839.136916 854.779937 876.000916 857.315556 900.186821 836.250413 924.372725 815.380317 926.908344 778.906413 905.648154 754.85054 884.452979 730.924698 847.588979 728.389079 823.403075 749.3892060000001 799.21717 770.324317 796.811582 806.798222 817.941741 830.724063L817.941741 830.724063ZM765.473932 758.491429C768.919773 741.522286 777.6319 725.593397 791.80536 713.305397 806.043836 701.017397 823.533106 694.580825 841.087392 693.540571L643.634186 494.526984 593.116852 538.2176509999999 765.473932 758.491429 765.473932 758.491429ZM776.006503 299.739429L709.755328 219.314794 307.502122 566.369524 376.809043 645.03873C382.920535 651.865397 393.38809 652.5155560000001 400.409805 646.534095L774.381106 323.01511100000005C781.337805 317.098667 782.117995 306.69612700000005 776.006503 299.739429L776.006503 299.739429Z"  horiz-adv-x="1063" />
 
-    
-    <glyph glyph-name="triangle-r" unicode="&#58915;" d="M293.291 728.256l426.88-355.456-426.88-355.52z"  horiz-adv-x="1024" />
+			<glyph glyph-name="layouts" unicode="&#58930;"
+				   d="M917.213-103.239h-810.426c-23.151 0-41.918 18.766-41.918 41.917l0 698.644c0 23.148 18.767 41.917 41.918 41.917h810.426c23.149 0 41.918-18.769 41.918-41.917v-698.643c0-23.151-18.769-41.918-41.918-41.918zM316.38-61.321h600.833v363.294h-600.833v-363.294zM106.787-61.321h167.674v363.294h-167.674v-363.294zM148.705 637.322c-23.151 0-41.918-18.769-41.918-41.92s18.767-41.92 41.918-41.92 41.92 18.768 41.92 41.92-18.769 41.92-41.92 41.92zM274.461 637.322c-23.151 0-41.918-18.769-41.918-41.92s18.767-41.92 41.918-41.92c23.151 0 41.92 18.768 41.92 41.92s-18.77 41.92-41.92 41.92zM400.216 637.322c-23.15 0-41.918-18.769-41.918-41.92s18.769-41.92 41.918-41.92c23.152 0 41.92 18.768 41.92 41.92s-18.768 41.92-41.92 41.92zM875.293 511.566h-768.506v-167.675h810.426l0 167.675h-41.921z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="circle" unicode="&#58943;" d="M511.998 847.999C255.739 847.999 48 640.26 48 383.999c0-256.258 207.739-463.998 463.998-463.998C768.261-79.99900000000002 976 127.74199999999996 976 383.999 976 640.26 768.261 847.999 511.998 847.999zM512.002-16.000999999999976c-220.915 0-400.002 179.088-400.002 400 0 220.917 179.086 400 400.002 400 220.912 0 399.998-179.083 399.998-400C912 163.087 732.914-16.000999999999976 512.002-16.000999999999976z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="radio" unicode="&#58947;" d="M512.5 383.5m-192 0a192 192 0 1 1 384 0 192 192 0 1 1-384 0ZM511.998 847.999C255.739 847.999 48 640.26 48 383.999c0-256.258 207.739-463.998 463.998-463.998C768.261-79.99900000000002 976 127.74199999999996 976 383.999 976 640.26 768.261 847.999 511.998 847.999zM512.002-16.000999999999976c-220.915 0-400.002 179.088-400.002 400 0 220.917 179.086 400 400.002 400 220.912 0 399.998-179.083 399.998-400C912 163.087 732.914-16.000999999999976 512.002-16.000999999999976z"  horiz-adv-x="1024" />
+			<glyph glyph-name="rate-half" unicode="&#59081;"
+				   d="M1012.064 504l-359.552 31.008-140.512 331.04-140.512-331.552-359.552-30.496 273.024-236.544-82.016-351.552 309.056 186.528 309.056-186.528-81.504 351.552 272.544 236.544zM512 195.96799999999996l0 465.056 85.504-202.016 219.04-19.008-166.016-144.032 50.016-214.016-188.512 114.016z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="align-center" unicode="&#58951;" d="M992 448L32 448C14.32 448 0 462.336 0 480 0 497.664 14.32 512 32 512L992 512C1009.68 512 1024 497.664 1024 480 1024 462.336 1009.68 448 992 448ZM800 704C817.664 704 832 689.664 832 672 832 654.336 817.664 640 800 640L224 640C206.32 640 192 654.336 192 672 192 689.664 206.32 704 224 704L800 704ZM992 832L32 832C14.32 832 0 846.336 0 864 0 881.664 14.32 896 32 896L992 896C1009.68 896 1024 881.664 1024 864 1024 846.336 1009.68 832 992 832ZM224 256C206.32 256 192 270.336 192 288 192 305.664 206.32 320 224 320L800 320C817.664 320 832 305.664 832 288 832 270.336 817.664 256 800 256L224 256ZM32 128L992 128C1009.68 128 1024 113.66399999999999 1024 96 1024 78.33600000000001 1009.68 64 992 64L32 64C14.32 64 0 78.33600000000001 0 96 0 113.66399999999999 14.32 128 32 128ZM224-64L800-64C817.664-64 832-78.33600000000001 832-96 832-113.66399999999999 817.664-128 800-128L224-128C206.32-128 192-113.66399999999999 192-96 192-78.33600000000001 206.32-64 224-64Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="align-right" unicode="&#58952;" d="M992 64L32 64C14.32 64 0 78.33600000000001 0 96 0 113.66399999999999 14.32 128 32 128L992 128C1009.68 128 1024 113.66399999999999 1024 96 1024 78.33600000000001 1009.68 64 992 64ZM992 256L288 256C270.32 256 256 270.336 256 288 256 305.664 270.32 320 288 320L992 320C1009.68 320 1024 305.664 1024 288 1024 270.336 1009.68 256 992 256ZM992 448L32 448C14.32 448 0 462.336 0 480 0 497.664 14.32 512 32 512L992 512C1009.68 512 1024 497.664 1024 480 1024 462.336 1009.68 448 992 448ZM992 640L288 640C270.32 640 256 654.336 256 672 256 689.664 270.32 704 288 704L992 704C1009.68 704 1024 689.664 1024 672 1024 654.336 1009.68 640 992 640ZM992 832L32 832C14.32 832 0 846.336 0 864 0 881.664 14.32 896 32 896L992 896C1009.68 896 1024 881.664 1024 864 1024 846.336 1009.68 832 992 832ZM288-64L992-64C1009.68-64 1024-78.33600000000001 1024-96 1024-113.66399999999999 1009.68-128 992-128L288-128C270.32-128 256-113.66399999999999 256-96 256-78.33600000000001 270.32-64 288-64Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="add-circle-fine" unicode="&#58888;"
+				   d="M509.989715-60.972421000000054c-246.734474 0-446.75195 200.023616-446.75195 446.75809 0 246.732427 200.017476 446.75195 446.75195 446.75195 246.733451 0 446.757067-200.019523 446.757067-446.75195C956.746782 139.051195 756.723166-60.972421000000054 509.989715-60.972421000000054L509.989715-60.972421000000054zM509.989715 812.433746c-235.633648 0-426.650123-191.014428-426.650123-426.648077 0-235.639788 191.016475-426.654216 426.650123-426.654216 235.638765 0 426.654216 191.014428 426.654216 426.654216C936.643931 621.419318 745.62848 812.433746 509.989715 812.433746L509.989715 812.433746zM527.863804 153.46957999999995l-35.741016 0L492.122789 367.909533 277.678742 367.909533 277.678742 403.653619l214.443024 0L492.121765 618.0956189999999l35.741016 0L527.862781 403.653619l214.442 0 0-35.744086L527.863804 367.909533 527.863804 153.46957999999995 527.863804 153.46957999999995zM527.863804 153.46957999999995"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="align-left" unicode="&#58953;" d="M992 448L32 448C14.336 448 0 462.336 0 480 0 497.664 14.336 512 32 512L992 512C1009.664 512 1024 497.664 1024 480 1024 462.336 1009.664 448 992 448ZM32 704L736 704C753.68 704 768 689.664 768 672 768 654.336 753.68 640 736 640L32 640C14.336 640 0 654.336 0 672 0 689.664 14.336 704 32 704ZM992 832L32 832C14.336 832 0 846.336 0 864 0 881.664 14.336 896 32 896L992 896C1009.664 896 1024 881.664 1024 864 1024 846.336 1009.664 832 992 832ZM32 320L736 320C753.68 320 768 305.664 768 288 768 270.336 753.68 256 736 256L32 256C14.336 256 0 270.336 0 288 0 305.664 14.336 320 32 320ZM32 128L992 128C1009.664 128 1024 113.66399999999999 1024 96 1024 78.33600000000001 1009.664 64 992 64L32 64C14.336 64 0 78.33600000000001 0 96 0 113.66399999999999 14.336 128 32 128ZM32-64L736-64C753.68-64 768-78.33600000000001 768-96 768-113.66399999999999 753.68-128 736-128L32-128C14.336-128 0-113.66399999999999 0-96 0-78.33600000000001 14.336-64 32-64Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="loading-1" unicode="&#58942;" d="M537.574469 831.696462c-14.123672 0-25.574469-11.447726-25.574469-25.574469 0-14.123672 11.450796-25.574469 25.574469-25.574469 204.495464 0 370.82877-166.358889 370.82877-370.82877 0-14.123672 11.450796-25.574469 25.574469-25.574469 14.123672 0 25.574469 11.450796 25.574469 25.574469C959.551152 642.385838 770.241552 831.696462 537.574469 831.696462z"  horiz-adv-x="1024" />
+			<glyph glyph-name="prev-circle" unicode="&#58931;"
+				   d="M508.638018 827.97307c-246.403458 0-446.845649-200.463469-446.845649-446.845649 0-246.382179 200.442191-446.845649 446.845649-446.845649 246.382179 0 446.845649 200.463469 446.845649 446.845649C955.483667 627.5096 755.041476 827.97307 508.638018 827.97307zM508.638018-23.16149900000005c-222.933422 0-404.28892 181.355498-404.28892 404.28892 0 222.933422 181.355498 404.28892 404.28892 404.28892 222.912144 0 404.28892-181.355498 404.28892-404.28892C912.926939 158.19399899999996 731.57144-23.16149900000005 508.638018-23.16149900000005zM252.87208 485.1999c8.639016 26.129831-32.470784 37.215859-41.067243 11.32009-27.810822-83.730363-22.321004-168.545923 14.086277-248.573851 11.362646-24.938243 48.025268-3.298146 36.747735 21.491148C230.976644 339.081373 228.806251 412.853462 252.87208 485.1999zM599.262572 247.73335499999996l-127.627629 133.394065 127.47868 133.223838c9.043305 9.064583 9.022026 23.789211-0.021278 32.832516-8.809243 8.830521-24.087108 8.766686-32.832516 0l-148.310199-148.310199c-4.617405-4.638683-6.979303-11.064749-6.553736-17.746156-0.404289-6.702685 1.936331-13.107472 6.575015-17.788712l148.310199-148.28892c4.383343-4.383343 10.213615-6.787798 16.405619-6.787798 6.170726 0 12.000997 2.404455 16.405619 6.787798C608.156928 224.114371 608.156928 238.83899899999994 599.262572 247.73335499999996z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="return" unicode="&#58972;" d="M927.858848 417.938973L168.863431 417.938973l308.721247 308.86758c11.685133 11.69025 11.435447 30.881334-0.557702 42.868343-11.992125 11.985986-31.18321 12.226462-42.868343 0.536212L75.199191 411.071565c-1.994424-1.662873-3.773953-3.583618-5.294586-5.713119-4.047176-5.373381-6.013971-11.839653-5.9055-18.328437-0.12996-7.794523 2.725064-15.561417 8.595772-21.432125l361.565802-361.744881c11.685133-11.691273 30.876218-11.449773 42.868343 0.535189 11.993149 11.985986 12.242835 31.17707 0.557702 42.868343L168.441828 356.54571799999997l759.417019 0c16.527418 0 29.925566 13.738909 29.925566 30.694069S944.386266 417.938973 927.858848 417.938973z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="fonts-strong" unicode="&#58923;" d="M199.092919 848.487893l355.326704 0c70.335928 0 122.780371-2.942005 157.349701-8.809643 34.568307-5.884011 65.491597-18.131963 92.78522-36.759205 27.27725-18.627243 50.01409-43.427068 68.209498-74.397431 18.195408-30.986735 27.293623-65.699328 27.293623-104.169501 0-41.7161-11.17655-79.977519-33.496905-114.802676s-52.604078-60.951187-90.818425-78.362742c54.075593-15.765055 95.647407-42.626843 124.715443-80.585363s43.602054-82.58388 43.602054-133.877103c0-40.388872-9.417487-79.673597-28.220738-117.839849-18.803251-38.182624-44.482097-68.673056-77.035514-91.489714-32.55444-22.833031-72.702835-36.855396-120.414487-42.09984-29.931706-3.229554-102.122889-5.260817-216.572524-6.060019L199.092919-40.765192999999954 199.092919 848.487893zM378.171504 700.1084940000001l0-205.684546 117.64849 0c69.935816 0 113.410979 1.006933 130.390699 3.038196 30.730908 3.629667 54.891168 14.246469 72.478731 31.850405 17.588587 17.588587 26.381857 40.756239 26.381857 69.473281 0 27.501354-7.594979 49.838082-22.75219 67.042929-15.158235 17.188474-37.702694 27.597545-67.618027 31.242562-17.796318 2.01489-68.945255 3.038196-153.431461 3.038196L378.171504 700.109518zM378.171504 346.04454999999996l0-236.383732 166.622902 0c64.85203 0 106.008382 1.807159 123.43631 5.420453 26.750247 4.828982 48.543599 16.58063 65.363683 35.272341s25.247011 43.714617 25.247011 75.085092c0 26.526143-6.491855 49.03888-19.459191 67.538209-12.983709 18.48398-31.722492 31.961946-56.250118 40.404222s-77.739549 12.663414-159.619394 12.663414L378.171504 346.04454999999996z"  horiz-adv-x="1024" />
+			<glyph glyph-name="read" unicode="&#59141;"
+				   d="M335.282306 712.495464C399.587328 713.451107 442.778899 696.882717 470.183494 669.3706540000001 479.127332 660.39174 485.691302 650.857363 490.241971 641.442689 492.795622 636.159553 494.049041 632.438701 494.358795 631.0740940000001L493.723712 636.7409230000001 493.723706 196.90019600000005C493.723706 199.018106 495.816045 203.920655 503.591595 207.36436700000002 511.039185 210.66283299999998 515.68422 209.16527399999995 517.176538 207.906613L500.671543 188.33763 521.297207 203.50146800000005C514.140179 213.23636899999997 499.631258 225.71450900000002 476.134074 237.35914000000002 439.577969 255.475456 390.86048 266.10507900000005 328.491925 266.10508200000004 265.860796 266.10508200000004 219.424582 255.71817999999996 186.827162 237.741581 164.977332 225.69198700000004 152.538132 212.28117299999997 147.220271 201.30886999999996L170.257196 190.14374199999997 151.035786 207.05224299999998C152.884078 209.15336100000002 158.307299 211.80336599999998 167.849005 208.050434 177.092077 204.41496099999995 179.2 199.20011699999998 179.2 196.66445199999998L179.2 497.049743 179.2 636.7409230000001 175.817447 624.023021C177.078908 626.226721 180.088681 630.807811 184.828724 636.965629 192.95423 647.521524 202.792594 658.127492 214.297641 668.007961 247.526453 696.544681 287.381649 713.209056 334.514421 712.495571L335.282306 712.495464ZM335.289387 763.689705C274.661039 764.607483 223.081402 743.04085 180.940156 706.850184 156.32698 685.712527 139.975514 664.470237 131.382553 649.4588249999999L128 643.549699 128 636.7409230000001 128 497.049743 128 196.66445199999998C128 159.26104999999995 164.542545 144.88818300000003 189.478606 173.23524099999997L191.776657 175.84764199999995 193.294121 178.978613C194.07832 180.59664399999997 199.156367 186.07133399999998 211.552092 192.907243 236.030601 206.40648099999999 274.024879 214.905082 328.491925 214.905082 383.221547 214.905079 424.163878 205.97190999999998 453.399258 191.483569 469.376966 183.56540600000005 477.614626 176.48075300000005 480.045882 173.17379000000005L481.844905 170.72677999999996 484.166551 168.768644C511.279708 145.90070000000003 544.923706 160.801293 544.923706 196.90019600000005L544.923712 636.740922 544.288627 642.407751C540.427211 659.419023 529.175531 682.697124 506.45814 705.503602 468.987716 743.1209699999999 412.352271 764.846461 334.521502 763.689812L335.289387 763.689705ZM0 506.026694L0 27.856867999999963C0-8.875636999999983 34.793167-23.40043300000002 61.4635 1.2485080000000153L63.46242 3.315859000000046C65.301149 5.444836000000009 69.655573 9.862312999999972 76.498228 15.820363000000043 88.306297 26.101906999999983 102.566352 36.46294 119.251411 46.17438500000003 167.295691 74.13829099999998 224.90855 90.95018200000004 292.337329 90.95018200000004 358.378978 90.95018000000005 409.459345 71.66956600000003 448.125308 39.64774 461.506042 28.56627400000002 472.380655 16.734758000000056 480.912593 4.997000999999955 485.832384-1.7713730000000396 488.762874-6.741985999999997 489.872527-9.02252199999998 496.058545-21.73590200000001 511.379537-27.027375000000006 524.092917-20.84135500000002 536.806298-14.655337000000031 542.097771 0.6656550000000152 535.91175 13.379036000000042 527.471002 30.726293000000055 509.777717 55.06771800000001 480.782336 79.08069999999998 433.134118 118.54132300000003 370.586889 142.15017999999998 292.337329 142.15018199999997 215.474895 142.15018499999996 149.074727 122.77408400000002 93.495781 90.424668 59.761154 70.78961500000003 36.872315 50.859801999999945 24.713677 36.78188399999999L44.088049 20.048869999999965 26.712598 38.84923500000002C28.162783 40.189508000000046 32.877261 41.946117999999956 40.792576 38.64178100000004 49.035365 35.200736000000006 51.2 30.12989200000004 51.2 27.856867999999963L51.2 506.026694C51.2 520.165184 39.73849 531.626694 25.6 531.626694 11.46151 531.626694 0 520.165184 0 506.026694L0 506.026694ZM696.80221 763.689812C618.971441 764.846461 562.335996 743.1209699999999 524.86557 705.503602 502.148181 682.697124 490.896501 659.419023 487.035083 642.407751L486.4 636.740922 486.400004 196.90019600000005C486.400006 160.801293 520.044004 145.90070000000003 547.157161 168.768644L549.478807 170.72677999999996 551.27783 173.17379000000005C553.709086 176.48075300000005 561.946746 183.56540600000005 577.924452 191.483569 607.159834 205.97190999999998 648.102165 214.905079 702.831787 214.905082 757.298833 214.905082 795.293111 206.40648099999999 819.77162 192.907243 832.167345 186.07133399999998 837.245391 180.59664399999997 838.029591 178.978613L839.547055 175.84764199999995 841.845105 173.23524099999997C866.781167 144.88818300000003 903.323712 159.26104999999995 903.323712 196.66445199999998L903.323712 497.049743 903.323712 636.7409230000001 903.323712 643.549699 899.941158 649.4588249999999C891.348196 664.470237 874.996732 685.712527 850.383556 706.850184 808.24231 743.04085 756.662673 764.607483 696.034325 763.689705L696.80221 763.689812ZM696.809291 712.495571C743.942063 713.209056 783.797257 696.544681 817.026071 668.007961 828.531119 658.127492 838.369481 647.521524 846.494989 636.965629 851.235031 630.807811 854.244804 626.226721 855.506263 624.023021L852.123712 636.7409230000001 852.123712 497.049743 852.123712 196.66445199999998C852.123712 199.20011699999998 854.231635 204.41496099999995 863.474707 208.050434 873.016412 211.80336599999998 878.439633 209.15336100000002 880.287925 207.05224299999998L861.066515 190.14374199999997 884.103441 201.30886999999996C878.785579 212.28117299999997 866.346381 225.69198700000004 844.49655 237.741581 811.89913 255.71817999999996 765.462916 266.10508200000004 702.831785 266.10508200000004 640.463232 266.10507900000005 591.745741 255.475456 555.189638 237.35914000000002 531.692454 225.71450900000002 517.183533 213.23636899999997 510.026502 203.50146800000005L530.652166 188.33763 514.147172 207.906613C515.63949 209.16527399999995 520.284527 210.66283299999998 527.732117 207.36436700000002 535.507665 203.920655 537.600004 199.018106 537.600004 196.90019600000005L537.6 636.7409230000001 536.964917 631.0740940000001C537.274671 632.438701 538.52809 636.159553 541.081741 641.442689 545.63241 650.857363 552.196378 660.39174 561.140218 669.3706540000001 588.544813 696.882717 631.736384 713.451107 696.041406 712.495464L696.809291 712.495571ZM972.799998 506.026694L972.799998 27.856867999999963C972.799998 30.12989200000004 974.964631 35.200736000000006 983.207422 38.64178100000004 991.122737 41.946117999999956 995.837214 40.189508000000046 997.287401 38.84923500000002L979.911949 20.048869999999965 999.286321 36.78188399999999C987.127682 50.859801999999945 964.238844 70.78961500000003 930.504218 90.424668 874.925269 122.77408400000002 808.525103 142.15018499999996 731.662669 142.15018199999997 653.132708 142.15017999999998 590.55104 117.26282200000003 543.127755 75.73800100000005 514.370099 50.55719499999998 496.945662 25.10259599999995 488.705389 7.022771000000034 482.841769-5.842485000000011 488.517717-21.02524200000005 501.382974-26.888862000000017 514.248233-32.752481999999986 529.430987-27.07653300000004 535.294607-14.211275 536.420563-11.740835999999945 539.350332-6.450639000000024 544.25735 0.7178109999999833 552.731727 13.097653000000037 563.54464 25.561581000000047 576.856734 37.21792900000003 615.190044 70.78337499999998 665.901421 90.95018000000005 731.662669 90.95018200000004 799.091447 90.95018200000004 856.704307 74.13829099999998 904.748587 46.17438500000003 921.433645 36.46294 935.6937 26.101906999999983 947.501771 15.820363000000043 954.344425 9.862312999999972 958.698848 5.444836000000009 960.537577 3.315859000000046L962.536497 1.2485080000000153C989.206831-23.40043300000002 1023.999998-8.875636999999983 1023.999998 27.856867999999963L1023.999998 506.026694C1023.999998 520.165184 1012.538487 531.626694 998.399998 531.626694 984.261508 531.626694 972.799998 520.165184 972.799998 506.026694L972.799998 506.026694Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="upload" unicode="&#59004;" d="M831.488 478.208C831.488 478.208 831.488 478.208 831.488 478.208c0 143.36-114.688 258.048-253.952 258.048-98.304 0-184.32-57.344-225.28-139.264C327.68 605.184 307.2 609.28 286.72 609.28c-90.112 0-159.744-73.728-159.744-159.744 0-16.384 4.096-28.672 8.192-40.96C57.344 379.904 0 310.27200000000005 0 224.25599999999997c0-106.496 86.016-192.512 192.512-192.512l192.512 0 0 192.512L258.048 224.25599999999997l258.048 258.048 258.048-258.048-126.976 0 0-192.512 192.512 0L839.68 35.84000000000003c106.496 16.384 192.512 110.592 192.512 221.184C1024 371.712 937.984 465.92 831.488 478.208z"  horiz-adv-x="1033" />
 
-    
-    <glyph glyph-name="dialogue" unicode="&#58938;" d="M998.4 500.992C998.4 682.24 811.392 829.696 581.632 829.696c-121.216 0-235.904-41.472-315.264-114.048 37.504 8.192 76.416 13.056 115.456 14.464 59.264 30.592 128.256 46.72 199.808 46.72 198.144 0 359.296-123.776 359.296-275.968 0-31.872-7.04-63.232-20.992-93.056 7.552-28.16 11.264-57.344 11.008-86.528C975.104 374.784 998.4 436.736 998.4 500.992L998.4 500.992zM442.368 398.72c-30.72 0-55.808-23.04-55.808-51.328s25.088-51.328 55.808-51.328 55.808 23.04 55.808 51.328S473.088 398.72 442.368 398.72zM243.328 398.72c-30.72 0-55.808-23.04-55.808-51.328s25.088-51.328 55.808-51.328 55.808 23.04 55.808 51.328C299.264 375.67999999999995 274.176 398.72 243.328 398.72zM641.28 398.72c-30.72 0-55.808-23.04-55.808-51.328s25.088-51.328 55.808-51.328 55.808 23.04 55.808 51.328S672.128 398.72 641.28 398.72zM442.368 677.888C212.608 677.888 25.6 530.432 25.6 349.312c0-179.968 173.696-296.192 332.544-321.664l60.8-78.336c5.632-7.424 14.464-11.008 23.296-11.008 8.832 0 17.792 3.712 23.424 11.008l60.8 78.464C685.312 53.24800000000005 859.008 169.47199999999998 859.008 349.44000000000005 859.136 530.432 672.128 677.888 442.368 677.888zM714.88 173.82399999999996c-52.224-45.184-124.288-77.952-197.376-89.6C503.168 81.91999999999996 490.112 74.24000000000001 481.28 62.72000000000003l-38.784-49.92-38.912 49.92c-8.96 11.52-21.888 19.2-36.224 21.504-73.216 11.776-145.152 44.416-197.376 89.728-39.68 34.304-86.912 92.544-86.912 175.36 0 69.76 35.584 136.192 100.352 187.264 68.736 54.144 160.768 84.096 258.944 84.096 98.304 0 190.336-29.824 259.072-84.096 64.768-51.072 100.352-117.504 100.352-187.264C801.664 266.36800000000005 754.56 208.12800000000004 714.88 173.82399999999996z"  horiz-adv-x="1024" />
+			<glyph glyph-name="404" unicode="&#58908;"
+				   d="M300.197309 299.705317l4.427931 1.803972c1.147982-2.787956 10.167841-7.543882 26.89558-14.267777l5.411915-12.955798c10.659833-24.927611 23.123639-62.483024 37.555413-112.66624 14.431775 5.575913 34.439462 0.983985 60.351057-13.611787l1.803972-4.427931L389.575913 107.828315l18.203716-42.639334c2.459962-5.575913-12.463805-15.579757-44.7713-29.847534-11.151826 7.215887-19.84369 9.675849-26.403587 7.05189l-0.983985 2.131967c-10.823831 25.419603-16.235746 42.311339-16.399744 50.675208l-4.427931-1.803972 6.3959-14.923767-11.151826-4.263933c-41.655349-16.235746-71.830878-18.695708-90.690583-7.871877l-4.427931-1.803972-1.803972 4.263933c-7.05189 16.727739 3.607944 77.406791 32.307495 182.037156 11.479821 4.427931 19.1877 14.923767 22.959641 31.323511C281.337604 290.685458 291.83344 296.425368 300.197309 299.705317L300.197309 299.705317zM216.230621 80.276746c28.371557 19.515695 40.999359 32.799488 38.047406 39.68738-0.983985 2.131967-0.65599 5.575913 0.65599 10.167841l-0.983985 2.131967c-25.5836-21.483664-38.047406-32.963485-37.391416-34.439462C215.246637 88.804612 215.082639 83.064702 216.230621 80.276746L216.230621 80.276746zM216.722614 72.896861l0.983985-2.131967c11.643818 1.147982 21.155669 3.279949 28.699552 6.231903 0.819987 0.327995 7.379885 5.411915 19.84369 15.251762l-0.983985 2.131967c-7.543882-2.951954-12.7918-0.983985-15.743754 6.067905C226.398463 85.032671 215.574632 75.848815 216.722614 72.896861L216.722614 72.896861zM225.90647 143.743754l11.151826 4.263933c-1.147982-2.623959-6.3959-8.691864-15.579757-18.53171-2.295964-10.823831-2.787956-17.547726-1.639974-20.335682 27.715567 20.663677 40.34337 33.783472 37.883408 39.523382l0.819987 10.331839-3.443946-3.935939-9.019859-3.443946-0.983985 2.131967c11.151826 4.263933 17.875721 16.891736 20.49968 37.719411l-0.983985 2.131967C239.35426 172.443306 227.21845 160.307495 227.874439 157.027546L225.90647 143.743754 225.90647 143.743754zM231.646381 173.42729l0.983985-2.131967 2.131967 0.819987c28.371557 23.123639 40.179372 40.179372 35.423447 51.331198 1.475977 0.65599 1.967969 1.639974 1.475977 2.951954l-2.295964-0.819987c-28.863549-21.647662-40.999359-38.047406-36.407431-49.035234C231.482383 175.723254 230.990391 174.73927 231.646381 173.42729L231.646381 173.42729zM240.994234 211.966688l0.983985-2.131967c13.775785 10.331839 35.915439 29.847534 66.418962 58.21909l2.131967 0.819987-6.3959 14.923767 0.491992 5.083921-2.295964-0.819987c-36.571429-32.963485-55.431134-51.82319-56.579116-56.743113L240.994234 211.966688 240.994234 211.966688zM311.67713 107.336323l-35.751441-13.939782c-1.475977-0.491992-6.887892-4.263933-16.235746-11.315823l0.819987-1.967969 12.299808 2.131967 20.007687 7.871877c11.643818 4.591928 32.143498 19.84369 61.171044 46.08328l-6.3959 14.923767-2.131967-0.819987c-24.107623-16.891736-34.439462-29.191544-31.159513-36.899423C315.449071 110.616272 314.629084 108.484305 311.67713 107.336323L311.67713 107.336323zM267.889814 264.773863l0.819987-1.967969c17.875721 16.891736 27.387572 25.419603 28.207559 25.747598l-0.983985 2.131967-8.855862-3.443946C274.941704 282.485586 268.545804 274.941704 267.889814 264.773863L267.889814 264.773863zM275.597694 222.954516c16.071749-37.883408 20.007687-67.894939 11.971813-90.034593l-3.443946-28.863549 26.89558 10.495836c-7.543882 30.011531-18.367713 65.598975-32.471493 106.926329l-0.983985 2.131967L275.597694 222.954516 275.597694 222.954516zM279.369635 231.810378l6.3959-14.923767c13.44779 15.087764 24.435618 24.271621 32.63549 27.55157l-3.607944 8.527867-2.459962 11.643818-2.131967-0.819987C289.045484 247.06214 278.713645 236.566304 279.369635 231.810378L279.369635 231.810378zM292.817425 194.58296c23.943626 17.219731 33.619475 30.995516 29.191544 41.491352l-2.787956 6.3959-2.295964-0.819987c-21.483664-18.859705-30.667521-31.651505-27.879564-38.3754L292.817425 194.58296 292.817425 194.58296zM294.457399 190.483024l2.787956-6.3959 2.295964-11.807816 2.295964 0.819987-0.491992-5.083921 6.3959-14.923767 32.471493 27.387572-6.3959 15.087764c-9.347854-10.331839-16.235746-16.399744-20.827675-18.203716l-2.295964-0.983985c-0.65599 1.639974 6.067905 10.167841 20.335682 25.419603l-3.115951 13.611787-0.983985 2.131967L294.457399 190.483024 294.457399 190.483024zM307.413197 148.171685l2.787956-6.3959 2.295964-11.643818c23.943626 17.219731 35.259449 27.387572 33.94747 30.503523l-5.411915 12.955798C329.224856 165.719411 318.07303 157.191544 307.413197 148.171685L307.413197 148.171685zM355.792441 131.935939c-23.779628-17.711723-34.111467-30.011531-30.995516-37.227418l1.475977-9.347854c25.255605 18.039718 36.899423 29.355541 34.931454 33.783472 24.435618 21.155669 38.703395 32.471493 42.803331 33.94747l-0.819987 1.967969c-1.803972 2.787956-6.723895 4.099936-14.595772 4.427931l-30.831518-31.9795L355.792441 131.935939 355.792441 131.935939zM327.912876 81.26073l4.591928-10.659833-0.491992-5.083921 2.295964 0.819987c23.451634 14.595772 34.275464 23.615631 32.63549 27.55157l-5.411915 12.955798L327.912876 81.26073 327.912876 81.26073zM333.816784 61.253043l5.411915-12.7918c25.747598 13.283792 37.719411 22.139654 35.915439 26.403587l-4.591928 10.659833C348.412556 70.272902 336.112748 62.237028 333.816784 61.253043L333.816784 61.253043zM357.596413 139.971813l1.803972-4.099936c4.919923 1.967969 8.527867 9.839846 10.823831 23.943626l-2.295964-0.819987C364.648302 147.679693 361.204356 141.44779 357.596413 139.971813L357.596413 139.971813zM731.674568 256.081999l3.935939-0.163997c-0.163997-2.459962 4.755926-9.019859 14.759769-19.515695l-0.65599-11.315823c-1.147982-21.975657-5.411915-53.955157-12.955798-95.774504 12.627803-0.65599 25.911595-10.659833 39.68738-30.175529l-0.163997-3.935939-47.887252-10.823831-1.967969-37.719411c-0.327995-4.919923-14.923767-7.379885-43.951313-7.379885-5.575913 9.019859-11.151826 13.775785-16.891736 13.939782l0.163997 1.967969c1.147982 22.467649 3.279949 36.735426 6.231903 42.967329l-3.935939 0.163997-0.65599-13.119795-9.839846 0.491992c-36.571429 1.803972-60.023062 9.839846-70.026906 24.271621l-3.935939 0.163997 0.163997 3.771941c0.819987 14.759769 30.667521 56.087124 89.706598 124.14606 10.167841-0.491992 19.515695 4.755926 28.371557 15.579757C714.290839 255.754004 724.294683 256.573991 731.674568 256.081999L731.674568 256.081999zM587.848815 115.86419l-0.163997-1.967969c9.019859-2.951954 16.891736-4.591928 23.615631-4.919923 0.65599 0 7.379885 1.475977 20.171685 4.755926l0.163997 1.967969c-6.723895 0.327995-9.839846 3.607944-9.511851 9.675849C599.328635 121.6041 588.012812 118.324151 587.848815 115.86419L587.848815 115.86419zM590.144779 121.440102c28.043562 5.083921 42.147341 10.659833 42.475336 16.727739 0.163997 1.803972 1.475977 4.263933 4.099936 7.215887l0.163997 1.967969c-26.731582-7.379885-40.015375-11.807816-40.179372-13.119795C592.440743 128.163997 590.308776 123.900064 590.144779 121.440102L590.144779 121.440102zM620.15631 165.227418l9.839846-0.491992c-1.803972-1.475977-7.871877-4.427931-18.367713-8.527867-5.575913-7.215887-8.527867-12.13581-8.527867-14.595772 28.043562 6.067905 42.147341 11.643818 42.311339 16.727739l4.263933 7.379885-3.935939-1.803972-8.035874 0.327995 0.163997 1.967969c9.839846-0.491992 19.351698 6.559898 28.863549 21.155669l0.163997 1.967969c-26.23959-7.379885-39.68738-12.463805-40.34337-14.923767L620.15631 165.227418 620.15631 165.227418zM670.667521 109.960282l-31.487508 1.475977c-1.31198 0-6.559898-0.983985-16.071749-2.951954l-0.163997-1.803972 9.839846-2.459962 17.711723-0.819987c10.331839-0.491992 30.995516 4.099936 61.991031 13.939782l0.65599 13.119795-1.803972 0.163997c-23.943626-4.591928-36.079436-10.167841-36.407431-16.891736C674.603459 110.944266 673.29148 109.796284 670.667521 109.960282L670.667521 109.960282zM635.244074 185.399103l-0.163997-1.967969 1.803972-0.163997c29.355541 7.70788 44.279308 16.563741 44.7713 26.23959 1.31198 0 2.131967 0.491992 2.131967 1.639974l-1.967969 0.163997c-29.191544-6.3959-44.115311-14.595772-44.607303-24.271621C635.900064 187.039078 635.244074 186.547085 635.244074 185.399103L635.244074 185.399103zM685.755285 207.37476c-1.803972-33.29148-9.675849-56.907111-23.615631-70.682896l-12.955798-20.171685 23.779628-1.147982c5.247918 24.763613 10.167841 54.611147 14.595772 89.870596l0.163997 1.967969L685.755285 207.37476 685.755285 207.37476zM656.071749 210.818706l-0.163997-1.967969c13.939782 3.115951 37.391416 10.167841 70.354901 21.155669l1.803972-0.163997 0.65599 13.119795 2.295964 3.607944-1.967969 0.163997c-39.03139-12.299808-59.859065-20.007687-62.483024-23.287636L656.071749 210.818706 656.071749 210.818706zM670.339526 68.46893l-0.65599-11.315823c23.943626 1.31198 35.915439 3.935939 36.079436 7.70788l0.491992 9.347854C684.443306 70.272902 672.471493 68.304933 670.339526 68.46893L670.339526 68.46893zM673.29148 85.196669l-0.491992-9.347854-2.295964-3.607944 1.967969-0.163997c22.631646 2.951954 33.94747 6.231903 34.111467 9.511851l0.65599 11.315823L673.29148 85.196669 673.29148 85.196669zM712.158873 113.568225c-23.943626-5.247918-36.079436-10.987828-36.407431-17.219731l-2.295964-7.379885c25.255605 5.083921 37.883408 9.511851 38.211403 13.44779 25.747598 7.543882 40.34337 11.151826 43.951313 10.987828l0.163997 1.803972c-0.327995 2.623959-3.443946 5.247918-9.347854 8.035874l-34.439462-13.44779L712.158873 113.568225 712.158873 113.568225zM682.147341 141.611787l-0.327995-5.73991-2.459962-9.347854c23.943626 4.755926 36.079436 8.691864 36.079436 11.479821l0.65599 11.315823C704.778988 147.351698 693.463165 144.727739 682.147341 141.611787L682.147341 141.611787zM688.051249 177.199231l-0.327995-5.73991-2.623959-9.511851 1.967969-0.163997-2.295964-3.607944-0.65599-13.119795 33.94747 9.511851 0.65599 13.283792c-10.659833-4.591928-18.039718-6.723895-21.975657-6.559898l-1.967969 0.163997c0 1.475977 8.199872 5.411915 24.271621 12.13581l2.623959 11.151826 0.163997 1.967969L688.051249 177.199231 688.051249 177.199231zM688.215247 180.807175c23.943626 4.755926 36.243434 11.807816 36.735426 20.991672l0.327995 5.73991-1.967969 0.163997c-22.631646-6.887892-34.275464-13.283792-34.603459-19.1877L688.215247 180.807175 688.215247 180.807175zM691.82319 212.786675l-0.65599-13.119795c15.415759 6.723895 26.89558 10.003844 34.111467 9.511851l0.327995 7.543882 2.459962 9.511851-1.803972 0.163997C704.450993 220.986547 692.971172 216.558616 691.82319 212.786675L691.82319 212.786675zM695.103139 240.994234l-0.163997-1.803972c19.351698 6.559898 29.355541 9.839846 30.339526 9.839846l0.163997 1.967969-7.871877 0.327995C706.746957 251.818065 699.367072 248.374119 695.103139 240.994234L695.103139 240.994234zM716.422806 118.980141l-0.163997-3.607944c4.427931-0.163997 10.003844 4.427931 16.727739 14.10378l-1.967969 0.163997C724.45868 122.26009 719.538757 118.816143 716.422806 118.980141L716.422806 118.980141zM479.118514 382.196028c53.627162 10.167841 89.870596 1.967969 109.222293-24.599616 9.675849-18.695708 15.579757-33.455477 17.875721-44.279308 11.807816-56.743113-5.903908-103.154388-53.299167-138.741832-12.463805-5.083921-22.631646-8.363869-30.339526-10.003844-31.651505-6.067905-63.631006 5.083921-95.938501 33.455477-9.347854 16.399744-15.251762 31.159513-18.039718 44.279308-13.283792 63.795003 1.967969 108.238309 45.919283 133.165919L479.118514 382.196028 479.118514 382.196028zM410.075593 265.429853c6.231903 5.247918 11.479821 8.199872 15.579757 9.019859-9.675849-9.347854-14.431775-15.087764-13.939782-17.219731-0.327995-5.411915-0.163997-10.167841 0.819987-14.267777l2.131967 0.327995c24.271621 15.743754 35.915439 25.5836 35.095452 29.519539l-2.131967 10.003844c-4.099936-3.607944-8.035874-5.73991-11.643818-6.559898l-0.819987 4.099936c10.823831 2.131967 15.251762 11.971813 13.44779 29.519539l-1.967969-0.327995c-22.467649-16.399744-34.603459-27.715567-36.407431-33.94747C409.255605 273.30173 409.255605 269.857783 410.075593 265.429853L410.075593 265.429853zM410.23959 286.257527c33.127482 21.647662 47.887252 40.34337 44.607303 56.251121-29.683536-23.615631-44.443306-36.079436-44.279308-37.555413C409.747598 295.769379 409.5836 289.537476 410.23959 286.257527L410.23959 286.257527zM412.699552 315.777066l0.491992-2.131967c27.059577 20.663677 44.607303 37.227418 52.643177 49.527226 10.331839 1.967969 17.055734 7.379885 20.49968 16.235746l-2.131967-0.491992C447.303011 372.028187 423.523382 350.872518 412.699552 315.777066L412.699552 315.777066zM414.339526 234.926329c2.459962-4.919923 4.263933-9.347854 5.083921-13.44779 18.859705 14.759769 30.339526 22.467649 34.111467 23.123639l-3.771941 18.039718C444.18706 261.493914 432.379244 252.310058 414.339526 234.926329L414.339526 234.926329zM421.883408 220.002562c2.131967-9.839846 5.247918-14.759769 9.675849-14.759769l27.879564 21.975657c-0.327995 1.147982-2.131967 6.231903-5.411915 15.415759C437.299167 228.530429 426.639334 220.986547 421.883408 220.002562L421.883408 220.002562zM432.707239 199.174888c5.083921-5.903908 8.527867-8.691864 10.495836-8.363869l3.935939 0.819987c10.987828 10.495836 19.1877 16.235746 24.599616 17.219731-0.819987 3.935939-3.935939 8.855862-9.511851 14.759769C442.21909 209.014734 432.379244 200.814862 432.707239 199.174888L432.707239 199.174888zM448.450993 185.563101l0.491992-2.131967c2.459962 0.491992 6.3959-0.819987 11.807816-3.771941 18.859705 10.003844 28.207559 16.727739 28.207559 19.84369-6.067905 1.639974-9.511851 4.427931-10.331839 8.363869C466.818706 202.946829 456.814862 195.566944 448.450993 185.563101L448.450993 185.563101zM469.442665 179.331198l0.491992-2.131967 14.923767 0.65599 12.627803 2.459962c2.459962 0.491992 8.199872 3.771941 17.547726 9.839846l-0.491992 2.131967c-6.887892-1.31198-13.611787 0.163997-20.49968 4.263933L469.442665 179.331198 469.442665 179.331198zM476.494555 249.030109l4.591928-21.811659c2.951954-14.431775 12.463805-25.091608 28.535554-31.9795l4.099936 0.819987c24.599616 34.275464 32.143498 73.798847 22.795644 118.570147l-2.459962 11.971813-6.231903 19.515695-6.067905-1.147982c-3.935939-0.819987-14.267777 0-30.831518 2.295964C473.870596 316.597053 469.278668 283.961563 476.494555 249.030109L476.494555 249.030109zM476.494555 363.172325l0.327995-1.967969c10.823831-2.131967 17.547726-3.115951 20.007687-2.623959 13.939782 10.167841 21.647662 17.875721 23.287636 23.287636l-21.319667-1.967969C496.174247 379.408072 488.630365 373.832159 476.494555 363.172325L476.494555 363.172325zM508.966047 363.172325l3.771941 2.787956c1.147982 0.163997 6.231903-2.951954 15.087764-9.675849 10.331839 13.119795 18.203716 20.171685 23.779628 21.155669-0.65599 2.951954-8.199872 4.263933-22.467649 4.099936C515.361947 370.716208 508.638053 364.648302 508.966047 363.172325L508.966047 363.172325zM511.590006 185.235106l0.491992-2.131967 4.099936 0.819987c19.84369 3.771941 35.751441 17.219731 47.723254 40.34337C554.557335 214.754644 537.173607 201.634849 511.590006 185.235106L511.590006 185.235106zM521.921845 197.534914c38.211403 24.271621 56.087124 42.311339 53.79116 53.79116 1.967969 4.919923 2.623959 8.527867 2.295964 10.823831-35.095452-26.567585-51.495195-44.935298-49.363229-54.939142C526.349776 206.71877 524.217809 203.602819 521.921845 197.534914L521.921845 197.534914zM528.64574 352.348495l7.543882-15.251762 2.131967 0.491992c4.263933 5.73991 13.283792 14.431775 27.059577 25.911595l-0.491992 2.131967c-5.411915 5.247918-8.363869 8.855862-8.855862 10.823831l-4.099936-0.819987L528.64574 352.348495 528.64574 352.348495zM536.845612 333.324792l4.263933-9.675849-0.491992-8.363869 4.099936 0.819987c19.515695 17.711723 29.027546 27.059577 28.863549 28.371557l-0.491992 2.131967c-1.967969 9.347854-4.263933 13.611787-7.05189 13.119795C548.817425 342.508648 539.141576 333.652787 536.845612 333.324792L536.845612 333.324792zM539.797566 236.402306c27.715567 19.84369 40.999359 32.63549 39.68738 38.703395 1.31198 7.215887 1.803972 12.13581 1.147982 14.759769l-1.967969-0.327995-35.095452-29.519539C540.78155 245.586163 539.469571 237.714286 539.797566 236.402306L539.797566 236.402306zM542.257527 307.413197l2.459962-11.971813 10.003844 3.935939c-7.05189-7.871877-10.331839-12.627803-10.003844-14.267777-0.65599-10.495836-0.819987-16.727739-0.327995-18.695708 18.695708 13.611787 30.831518 24.927611 36.243434 33.94747l-2.459962 11.971813c-7.05189-7.05189-12.7918-10.987828-16.727739-11.807816 8.035874 11.315823 13.939782 17.383728 17.711723 18.039718l-4.099936 19.84369C554.557335 320.532992 543.733504 310.201153 542.257527 307.413197L542.257527 307.413197zM307.249199 569.153107c-9.675849 0-17.711723-6.887892-19.84369-16.071749-4.263933-12.463805 1.639974-28.863549 29.519539-35.751441 1.31198 35.587444 0 49.527226 0 49.527226C313.809097 568.33312 310.693145 569.153107 307.249199 569.153107L307.249199 569.153107zM709.862908 537.173607c0-1.147982 0-2.131967-0.163997-3.115951 2.131967 3.279949 3.279949 7.215887 3.279949 11.479821 0 11.643818-9.183857 21.155669-20.49968 21.155669-3.443946 0-6.723895-0.819987-9.511851-2.459962C697.891095 563.905189 709.862908 551.933376 709.862908 537.173607L709.862908 537.173607zM531.761691 520.281871c0.65599 15.743754-32.963485 49.199231-32.963485 49.199231 0-18.203716 9.347854-42.803331 12.463805-48.707239-8.035874-11.643818-13.283792-32.307495-13.283792-32.307495S531.105701 504.374119 531.761691 520.281871L531.761691 520.281871zM488.794363 507.326073c2.459962 0 4.427931 1.967969 4.427931 4.427931 0 2.459962-1.967969 4.427931-4.427931 4.427931-2.459962 0-4.427931-1.967969-4.427931-4.427931C484.366432 509.294042 486.334401 507.326073 488.794363 507.326073L488.794363 507.326073zM445.335042 629.668161c-0.819987 8.855862-2.131967 16.235746-2.131967 16.235746s-53.627162 7.05189-63.959001-30.503523C395.151826 632.94811 427.623318 631.144138 445.335042 629.668161L445.335042 629.668161zM620.648302 614.908392c-9.675849 37.719411-63.303011 31.651505-63.303011 31.651505s-1.475977-7.379885-2.459962-16.235746C572.597053 631.636131 605.232543 632.784113 620.648302 614.908392L620.648302 614.908392zM419.587444 518.313901c29.847534 0 53.955157 21.975657 53.955157 49.035234 0 27.059577-24.271621 49.035234-53.955157 49.035234-29.847534 0-53.955157-21.975657-53.955157-49.035234C365.632287 540.289558 389.903908 518.313901 419.587444 518.313901L419.587444 518.313901zM419.587444 613.76041c28.371557 0 51.331198-20.827675 51.331198-46.411275 0-25.5836-22.959641-46.411275-51.331198-46.411275-28.207559 0-51.331198 20.827675-51.331198 46.411275C368.256246 592.932735 391.379885 613.76041 419.587444 613.76041L419.587444 613.76041zM419.587444 534.38565c20.007687 0 36.243434 14.759769 36.243434 32.799488 0 18.203716-16.235746 32.799488-36.243434 32.799488s-36.243434-14.759769-36.243434-32.799488C383.34401 549.14542 399.579757 534.38565 419.587444 534.38565L419.587444 534.38565zM435.331198 552.261371c1.967969 2.131967 4.919923 2.623959 6.559898 1.147982 1.639974-1.475977 1.475977-4.263933-0.491992-6.3959-1.967969-2.131967-4.919923-2.623959-6.559898-1.147982C433.035234 547.341448 433.199231 550.129404 435.331198 552.261371L435.331198 552.261371zM395.971813 585.880846c5.411915 5.73991 13.283792 7.05189 17.875721 3.115951 4.591928-3.935939 3.935939-11.807816-1.475977-17.547726-5.411915-5.73991-13.283792-7.05189-17.875721-3.115951C389.903908 572.433056 390.559898 580.304933 395.971813 585.880846L395.971813 585.880846zM584.240871 518.313901c29.847534 0 53.955157 21.975657 53.955157 49.035234 0 27.059577-24.271621 49.035234-53.955157 49.035234-29.847534 0-53.955157-21.975657-53.955157-49.035234C530.121717 540.289558 554.393338 518.313901 584.240871 518.313901L584.240871 518.313901zM584.240871 613.76041c28.371557 0 51.331198-20.827675 51.331198-46.411275 0-25.5836-22.959641-46.411275-51.331198-46.411275-28.207559 0-51.331198 20.827675-51.331198 46.411275C532.909673 592.932735 555.869315 613.76041 584.240871 613.76041L584.240871 613.76041zM584.240871 534.38565c20.007687 0 36.243434 14.759769 36.243434 32.799488 0 18.203716-16.235746 32.799488-36.243434 32.799488-20.007687 0-36.243434-14.759769-36.243434-32.799488C547.997438 549.14542 564.233184 534.38565 584.240871 534.38565L584.240871 534.38565zM599.820628 552.261371c1.967969 2.131967 4.919923 2.623959 6.559898 1.147982 1.639974-1.475977 1.475977-4.263933-0.491992-6.3959-1.967969-2.131967-4.919923-2.623959-6.559898-1.147982C597.688661 547.341448 597.852659 550.129404 599.820628 552.261371L599.820628 552.261371zM560.62524 585.880846c5.411915 5.73991 13.283792 7.05189 17.875721 3.115951 4.591928-3.935939 3.935939-11.807816-1.475977-17.547726-5.411915-5.73991-13.283792-7.05189-17.875721-3.115951C554.557335 572.433056 555.213325 580.304933 560.62524 585.880846L560.62524 585.880846zM957.171044 381.540038C957.171044 381.540038 957.171044 381.540038 957.171044 381.540038c-0.65599 0.983985-1.31198 1.803972-1.967969 2.951954-0.327995 0.327995-0.491992 0.65599-0.819987 0.983985-0.327995 0.327995-1.967969 0.65599-2.295964 0.983985-11.315823 14.759769-29.355541 40.34337-62.975016 46.247277l0 34.931454c0 4.263933-0.819987 8.691864-5.083921 8.691864L685.919283 476.330557c-0.163997 10.331839-0.327995 18.203716-0.65599 27.879564 24.435618 1.803972 43.295324 19.351698 43.295324 41.491352 0 22.467649-19.84369 40.671365-45.263293 41.819347-1.967969 78.226778-5.903908 143.98975-7.70788 150.549648l-0.491992 0.983985c-1.967969 2.295964-9.511851 5.247918-21.155669 8.363869 0.327995 13.939782-3.279949 29.355541-11.643818 46.08328 3.443946-21.647662-22.795644-36.079436-26.567585-38.047406-0.163997 0-0.327995 0-0.491992 0 0.163997 4.427931 0 57.727098-88.230621 97.90647-1.475977-44.115311-14.10378-70.682896-31.9795-86.754644L494.534273 766.606022l-5.411915-0.327995 0-0.163997 0 0 0 0 0.327995 0 0.327995-0.163997c-0.819987-0.163997-0.983985-0.491992-1.147982-1.147982-10.331839-8.035874-28.043562-18.203716-64.450993-18.203716-13.283792 0-28.207559 1.31198-44.607303 3.935939-4.099936 0.819987-7.70788 1.147982-11.151826 1.147982-5.575913 0-10.003844-0.983985-16.071749-2.295964l-0.327995 0-0.327995-0.163997c-17.547726-4.099936-27.55157-7.70788-30.011531-10.659833l-0.491992-0.983985c-0.491992-2.131967-2.295964-8.363869-5.73991-150.549648-25.255605-0.983985-45.263293-19.351698-45.263293-41.983344 0-22.139654 18.859705-39.523382 43.459321-41.163357-0.163997-9.675849-0.327995-17.547726-0.65599-27.879564L132.099936 476.002562c-4.427931 0-10.495836-4.591928-10.495836-8.691864l0-97.414478c-11.807816-0.65599-19.679693-2.295964-26.731582-4.755926-29.027546-10.495836-35.751441-35.915439-35.587444-60.023062 0-1.475977 0.491992-2.787956 0.983985-3.771941-6.723895-11.643818-6.231903-25.5836-5.083921-35.587444 0.983985-8.035874 2.623959-12.13581 4.427931-13.939782-4.263933-8.855862-0.983985-18.859705 1.967969-26.731582 3.771941-10.167841 12.13581-11.971813 22.139654-10.003844-4.755926-9.019859-2.459962-17.219731 11.643818-28.699552 4.427931-3.607944 14.267777 7.05189 26.075593 16.071749l0-267.151826c0-4.263933 6.067905-6.067905 10.331839-6.067905l751.928251 0c4.427931 0 5.083921 1.803972 5.083921 6.067905L888.784113 248.374119c16.727739 0.983985 29.355541 7.70788 38.539398 19.84369 4.591928 6.231903 7.871877 11.807816 8.691864 16.891736C977.670724 313.153107 982.262652 344.640615 957.171044 381.540038L957.171044 381.540038zM316.433056 508.638053c-22.959641 0.491992-40.835362 16.727739-40.835362 36.735426 0 20.335682 18.859705 36.899423 41.983344 36.899423l0 2.623959 0.163997-0.65599c0-0.819987 0-1.475977 0-2.295964 0.491992 0.163997 0.983985 0.163997 1.475977 0.327995l1.803972 0 0 0.491992c5.247918 1.31198 12.7918 2.951954 19.351698 3.771941 10.003844 35.095452 34.111467 64.122998 34.111467 64.122998s-9.839846 28.863549-13.939782 67.238949c51.167201-85.11467 229.268418-81.178732 280.107623-10.823831-4.591928-32.799488-12.627803-56.415119-12.627803-56.415119s24.107623-28.863549 34.111467-64.122998c6.559898-0.819987 13.939782-1.147982 19.023703-2.295964 0 0.491992 0 2.623959 0 2.623959l0.491992 0c23.123639 0 41.983344-18.695708 41.983344-39.03139 0-9.347854-3.935939-18.695708-10.495836-25.419603-10.167841-6.723895-25.091608-10.331839-40.835362-10.331839 0-6.723895 0.983985-19.351698 1.803972-35.423447L318.401025 476.658552c0.163997 10.331839 0.491992 19.84369 0.65599 30.175529l0 2.131967L316.433056 508.638053 316.433056 508.638053zM126.524023 462.554773c0 4.099936 6.3959 9.183857 10.823831 9.183857l741.432415 0c4.263933 0 5.575913-4.919923 5.575913-9.183857l0-29.027546c0 0.491992-6.723895 1.475977-10.823831 1.147982-22.795644-2.295964-44.443306-3.607944-60.679052-9.183857L176.215247 425.491352l-1.31198-2.787956 0-60.18706c-10.823831 5.903908-25.5836 8.363869-48.215247 7.871877L126.68802 462.554773 126.524023 462.554773zM821.381166-13.693786 180.807175-13.693786 180.807175 282.649584c10.823831 4.263933 15.579757 10.987828 15.087764 21.975657-0.491992 8.363869-4.263933 13.611787-15.087764 16.727739l0 7.379885c5.903908 1.967969 3.935939 4.263933 5.247918 6.723895 5.411915 10.495836 5.575913 18.203716-5.247918 23.779628l0 55.759129 615.318386 0c-2.787956-5.575913-4.755926-7.871877-5.575913-12.299808-1.475977-8.035874-1.639974-18.367713-1.147982-28.207559L697.891095 315.449071c0 0-28.371557-15.251762-16.727739-32.799488 11.643818-17.383728 32.307495-11.479821 50.511211-0.327995 12.13581 7.379885 39.68738 23.287636 63.959001 40.179372 0.163997-0.163997 0.327995-0.163997 0.491992-0.327995-1.803972-1.31198-2.951954-2.295964-2.951954-2.295964-11.151826-7.543882-6.887892-36.899423 15.415759-41.327354 3.115951-0.65599 9.675849 0 9.675849 1.147982l0-293.391416L821.381166-13.693786 821.381166-13.693786zM177.855221 271.169763c0 3.443946-2.131967 6.231903-4.755926 8.035874 1.639974 0.491992 3.771941 0.983985 4.755926 1.475977L177.855221 271.169763 177.855221 271.169763zM177.855221 322.828956c-0.983985 0.163997-1.639974 0.327995-2.459962 0.491992 0.819987 0.491992 1.475977 0.983985 2.459962 1.475977L177.855221 322.828956 177.855221 322.828956zM878.780269-65.516976 137.347854-65.516976c-4.263933 0-10.823831 2.131967-10.823831 6.3959L126.524023 206.882767c5.903908 1.147982 4.919923 2.295964 6.723895 3.279949 19.679693 8.035874 38.047406 25.255605 25.747598 33.127482-0.163997 0-1.475977 0.163997-1.639974 0.163997 9.511851 3.771941 17.547726 9.839846 17.547726 20.663677l0-289.29148 655.169763 2.459962 0 291.915439c9.839846-9.675849 21.647662-14.595772 34.603459-10.331839 3.279949-6.559898 13.611787-9.839846 19.515695-10.331839l0-307.495195C884.192184-63.38501 883.044202-65.516976 878.780269-65.516976L878.780269-65.516976zM878.780269-65.516976"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="video" unicode="&#59117;" d="M952.523633 599.2477269999999L952.523633 599.2477269999999 952.523633 599.2477269999999zM100.53762400000005 661.054062C100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062zM100.74228 720.404517L100.74228 720.404517 100.74228 720.404517zM660.990107 739.9449716666666c8.697911 0 17.498151-0.511642 25.684421-2.353553 12.279404-2.865194 23.22854-8.18627 34.382332-16.679524 15.144599-11.460777 26.196063-29.572899 32.02878-52.187469 3.479165-13.405016 2.967523-28.651944 2.558209-42.05696-0.102328-4.195463-0.204657-8.083941-0.204657-11.665434l0-37.759169 101.407415 70.401919 25.479764 17.60048c0.511642 0.306985 1.330269 1.023284 2.148896 1.637254 4.40012 3.376836 11.051464 8.595583 20.977316 11.051464 3.274508 0.818627 6.549016 1.22794 10.02818 1.22794 9.618867 0 19.44239-3.274508 27.730987999999996-9.311882 18.82842-13.916657999999998 18.726092-35.405616 18.726092-51.061857 0-1.023284 0-2.148896 0-3.172179l0-409.620466c0-15.963226 0.102328-37.963825-19.647047-51.982812-6.753672-4.809433-16.679524-8.390926-27.219346-8.390926-5.01409 0-10.130509 0.818627-15.144599 2.762866-7.162986 2.762866-12.279404 6.856000999999999-16.065554 9.823524-0.920955 0.716299-1.841911 1.432597-2.353553 1.841911l-24.968122 17.395823-101.10043 70.094934 0-37.963825c0-3.581493 0.102328-7.367643 0.204657-11.460777 0.409313-14.735285 0.818627-29.982212-2.865194-43.796542-5.62806-21.488957999999997-16.679524-39.396423-31.107825-50.447886-7.879285-6.037374-18.930748-13.405016-34.075347-16.986509-7.776956-1.841911-16.167882-2.353553-24.45648-2.353553-4.297792 0-8.595583 0.102328-12.688718 0.204657-3.683821 0.102328-7.162986 0.204657-10.232837 0.204657L167.15339300000005 84.94107466666674c-1.944239 0-3.888478 0-5.832717 0-1.944239 0-3.990806 0-5.935045 0-16.577196 0-33.461377 0.61397-47.787349 6.549016-27.935644999999997 11.563106-46.764065 37.759169-53.006096 73.574098l-0.409313 2.251224 0 2.353553c-0.102328 18.930748-0.204657 37.861497-0.306985 56.792245l0 0.511642L53.87588699999998 598.0155226666666c0 4.40012-0.102328 8.902568-0.102328 13.712001999999998-0.306985 27.01469-0.716299 54.950335 9.311882 76.643949 9.823524 21.284300999999996 27.526331999999996 38.066154 48.708304 45.945438 5.730389 2.148896 11.051464 2.762866 15.04227 3.172179 1.023284 0.102328 2.353553 0.306985 3.069851 0.409313l4.093135 1.534926 500.9997 0c3.581493 0 7.572299 0.102328 11.767763 0.306985C651.166583 739.7403146666667 656.078345 739.9449716666666 660.990107 739.9449716666666M304.273409 266.7785886666668L559.889677 394.2797376666667l0 33.973019L304.273409 555.9585626666667 304.273409 266.7785886666668M660.990107 780.8763196666666c-5.62806 0-10.949136-0.204657-15.758569-0.306985-3.888478-0.102328-7.469971-0.204657-10.437494-0.204657L133.79434400000002 780.3646776666667l-7.265314 0-6.446687-2.353553c-5.3210749999999996-0.61397-13.609673-1.841911-22.716898-5.218747-31.210153-11.665434-57.303887-36.121915-71.629859-67.229739-13.814329999999998-30.084541-13.405016-64.159888-12.995703-94.244429 0.102328-4.604777 0.102328-9.004897 0.102328-13.20036l0-371.349655 0-0.102328 0-0.102328 0-0.511642c0.102328-18.930748 0.204657-37.861497 0.306985-56.792245l0-2.251224 0-3.479165 0.61397-3.376836 0.409313-2.251224c4.195463-23.944839 12.791046-45.126811 25.479764-62.727291 13.609673-18.82842 31.107825-32.847407 52.08514-41.545318 21.488957999999997-8.902568 44.001199-9.618867 63.443589-9.618867 2.046567 0 4.093135 0 6.139702 0 1.841911 0 3.78615 0 5.62806 0l473.166384 0c2.558209 0 5.62806-0.102328 9.004897-0.204657 4.195463-0.102328 8.902568-0.306985 13.916657999999998-0.306985 13.302688 0 24.149495 1.125612 33.973019 3.479165 22.819227 5.423404 39.089437 16.474868 49.322274 24.251824 21.693613999999997 16.577196 37.963825 42.363944999999994 45.84311 72.653143 2.251224 8.595583 3.376836 17.088838 3.990806 25.377436l36.838213-25.582093 24.558809-17.088838c0.306985-0.204657 0.61397-0.511642 0.920955-0.716299 4.809433-3.683821 13.609673-10.642149999999999 26.400719-15.656241 9.516538-3.683821 19.647047-5.62806 30.084541-5.62806 18.009793 0 36.53122799999999 5.832717 50.8572 15.963226 16.577196 11.767763 27.730987999999996 27.935644999999997 33.052064 48.094334 3.78615 14.4283 3.78615 27.628659999999996 3.78615 37.34985499999999l0 409.518137c0 0.920955 0 1.739582 0 2.660538l0 0.409313c0 9.41421 0.102328 22.409913-3.479165 36.53122799999999-5.116419 19.749375-15.758569 35.81493-31.721795 47.68502-15.144599 11.153792-33.666034 17.293495-52.08514 17.293495-6.753672 0-13.507345-0.818627-19.954032-2.455881-18.21445-4.604777-30.289198-13.916657999999998-36.019586-18.419107l0 0c-0.204657-0.204657-0.511642-0.409313-0.716299-0.511642l-25.172779-17.293495-0.102328 0-0.102328 0-37.14519799999999-25.786749c-0.511642 7.674628-1.637254 15.553912-3.683821 23.433197-8.18627 31.721795-24.354152 57.508544-46.866394 74.597382-15.758569 11.972419-32.02878 19.851704-49.833916 23.944839C685.8559009999999 779.7507076666667 674.702109 780.8763196666666 660.990107 780.8763196666666L660.990107 780.8763196666666zM345.204757 332.9850436666668L345.204757 489.75210666666663l157.074048-78.48586L345.204757 332.9850436666668 345.204757 332.9850436666668zM347.455981 429.177975L347.455981 308.02118499999995 347.455981 429.177975Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="headset" unicode="&#59132;" d="M356.285031 2.1522690000000466L356.396571 2.1522690000000466 356.396571 285.236626 253.462201 285.236626 253.462201 2.1522690000000466ZM665.076886 285.236626l103.042841 0 0-283.08538-103.042841 0 0 283.08538ZM63.809793 301.950286c0-38.758746-3.195785-112.220874 5.457292-148.208507l65.735144 0c-10.112312 35.644825-7.747451 109.176538-7.747451 148.208507 0 219.937155 172.264389 398.231887 384.763131 398.231887 212.498742 0 384.763131-178.294732 384.763131-398.231887 0-39.031968 2.266623-112.563682-7.845689-148.208507l65.735144 0c8.653077 35.987632 5.555529 109.449761 5.555529 148.208507 0 256.20415-200.670346 463.898469-448.208115 463.898469C264.479115 765.848755 63.809793 558.1544349999999 63.809793 301.950286z"  horiz-adv-x="1024" />
+			<glyph glyph-name="carousel" unicode="&#58932;"
+				   d="M1002.069333 144.38400000000001L1002.069333 611.6906670000001c0 24.213333-16.917333 49.578667-42.069333 49.578667l-64 0 1.152 6.4c0 31.338667-26.005333 57.6-58.538667 57.6L186.432 725.269333c-31.936 0-58.410667-31.957333-58.410667-64l-0.213333 0.96L67.178667 662.229333c-25.152 0-45.226667-20.288-45.226667-44.501333l0-467.328L21.354667 150.39999999999998c0-24.789333 20.629333-44.693333 45.312-44.693333L127.786667 105.70666700000004l0-5.184C127.786667 69.03466700000001 153.792 42.66666699999996 186.432 42.66666699999996l652.842667 0c31.658667 0 56.277333 10.901333 56.725333 42.602667l64 0c24.661333 0 42.666667 34.325333 42.666667 59.114667L1002.069333 144.38400000000001zM128 149.26933299999996L64 149.26933299999996l0 469.333333 64 0L128 149.26933299999996zM853.333333 106.602667c0-6.421333-14.848-21.333333-21.333333-21.333333l-640 0c-6.485333 0-21.333333 14.848-21.333333 21.333333l0 554.666667c0 6.378667 9.258667 18.56 15.744 18.56l5.589333 2.773333 640 0c6.442667 0 21.333333-14.954667 21.333333-21.333333L853.333333 106.602667zM960 127.93600000000004l-64 0 0 490.666667 60.842667 1.984c4.970667 0 3.157333 2.944 3.157333-1.984l0-469.333333C960 144.29866700000002 965.013333 127.93600000000004 960 127.93600000000004zM412.458667 399.829333c43.925333 0 79.637333 34.773333 79.637333 77.482667 0 42.752-35.712 77.482667-79.637333 77.482667-43.925333 0-79.637333-34.730667-79.637333-77.482667C332.8 434.602667 368.533333 399.829333 412.458667 399.829333zM412.458667 516.0533330000001c21.952 0 39.829333-17.365333 39.829333-38.741333 0-21.333333-17.877333-38.741333-39.829333-38.741333-21.952 0-39.829333 17.408-39.829333 38.741333C372.629333 498.709333 390.506667 516.0533330000001 412.458667 516.0533330000001zM785.92 457.386667c-95.914667-23.338667-137.728-87.765333-168.256-134.805333-24.213333-37.269333-39.082667-58.346667-65.109333-58.346667l-0.042667 0c-35.456 0-57.109333 14.272-80.042667 28.16-24.362667 14.741333-49.536 29.952-88.64 29.952-75.648 0-156.906667-93.269333-165.930667-103.893333L213.333333 167.38133300000004c0-10.709333 8.917333-18.112 19.925333-18.112l557.504 0c10.986667 0 19.904 7.402667 19.904 18.112L810.666667 438.570667c0 5.973333-2.837333 11.626667-7.658667 15.296C798.186667 457.536 791.872 458.858667 785.92 457.386667zM770.858667 188.52266699999996L253.162667 188.52266699999996c24.874667 27.733333 85.290667 95.082667 130.666667 95.082667 27.733333 0 46.229333-11.157333 67.605333-24.128 25.152-15.168 53.632-32.426667 99.712-33.941333l2.944-0.064c47.637333 0 71.722667 37.12 97.237333 76.416 26.645333 41.088 56.469333 79.104 119.530667 102.485333L770.858667 188.52266699999996z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="cellphone-fine" unicode="&#58939;" d="M731.514252 896L292.485748 896C195.323702 896 116.154627 816.830925 116.154627 719.6688790000001l0-671.337759c0-97.162046 79.169075-176.331121 176.331121-176.331121l438.628661 0c97.162046 0 176.331121 79.169075 176.331121 176.331121L907.445529 719.6688790000001C907.845373 816.830925 828.676298 896 731.514252 896zM292.485748 853.216712l438.628661 0c70.772355 0 128.349863-55.178446 133.147989-124.751269L159.737602 728.465443C164.135884 798.038266 222.113237 853.216712 292.485748 853.216712zM865.062085 48.73096399999997c0-73.571261-59.976572-133.547833-133.547833-133.547833L292.485748-84.816868c-73.571261 0-133.547833 59.976572-133.547833 133.547833l0 45.582194 705.724326 0L864.662241 48.73096399999997zM865.062085 137.096447L158.937915 137.096447 158.937915 685.682155l705.724326 0L864.662241 137.096447zM512-54.82858299999998c13.59469 0 26.789535 5.597813 36.385787 15.194065 9.596251 9.596251 15.194065 22.791097 15.194065 36.385787 0 13.59469-5.597813 26.789535-15.194065 36.385787-9.596251 9.596251-22.791097 15.194065-36.385787 15.194065-13.59469 0-26.789535-5.597813-36.385787-15.194065-9.596251-9.596251-15.194065-22.791097-15.194065-36.385787 0-13.59469 5.597813-26.789535 15.194065-36.385787C485.210465-49.23076900000001 498.40531-54.82858299999998 512-54.82858299999998z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="add-1" unicode="&#58964;" d="M566.935 57.63900000000001c0-30.366-24.612-54.972-54.935-54.972v0c-30.384 0-54.996 24.612-54.996 54.972v610.057c0 30.361 24.612 54.972 54.996 54.972v0c30.33 0 54.935-24.612 54.935-54.972v-610.057zM817.004 417.633c30.384 0 54.996-24.606 54.996-54.966v0c0-30.354-24.612-54.966-54.996-54.966h-610.062c-30.33 0-54.942 24.612-54.942 54.966v0c0 30.359 24.612 54.966 54.942 54.966h610.062zM817.004 417.633z"  horiz-adv-x="1024" />
+			<glyph glyph-name="help" unicode="&#58887;"
+				   d="M690.2 741.8C635.2 783.6 573.2 798 494.6 798c-59.6 0-110.6-12.2-151-39.4C284 718 256 649.8 256 542l153.6 0c0 28.8-2.8 59.8 14 86.4 16.8 26.6 40.2 47 80.4 47 40.8 0 61.8-11.8 81.6-36.2 16.8-20.8 23.2-45.6 23.2-72 0-22.8-11.6-43.8-25.4-62.8-7.6-11.2-17.6-21.2-30.2-30.8 0 0-83-49.4-112.2-96.2-21.8-34.8-29.6-78.4-31.4-130.6-0.2-3.8 1.2-11.6 14.4-11.6 13 0 112 0 123.6 0 11.6 0 14 8.8 14.2 12.4 0.8 19 3.2 48.2 6.6 59.2 6.6 20.8 19.4 39 39.4 54.6l41.4 28.6c37.4 29.2 67.2 53 80.4 71.8 22.6 30.8 38.4 68.8 38.4 113.8C768 649 741 703.2 690.2 741.8zM484 155.6c-51.8 1.6-94.6-34.4-96.4-90.6-1.6-56.4 39-93.4 91-95 54-1.6 95.8 33.2 97.4 89.4C577.6 115.6 538 154 484 155.6z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="face-smile-b" unicode="&#58960;" d="M511.931733-128c-136.738133 0-265.284267 53.213867-361.984 149.879467C53.282133 118.51093300000002 0 247.09119999999996 0 384c0 136.738133 53.282133 265.3184 150.050133 362.0864C246.749867 842.683733 375.296 896 512.136533 896s265.4208-53.316267 362.1888-149.9136c199.645867-199.714133 199.543467-524.5952 0-724.206933C777.454933-74.71786699999996 648.772267-128 511.931733-128L511.931733-128 511.931733-128 511.931733-128 511.931733-128 511.931733-128zM512.034133 829.303467c-118.920533 0-230.741333-46.2848-314.914133-130.389333C113.083733 614.8778669999999 66.7648 502.8864 66.7648 384c0-118.9888 46.2848-230.912 130.3552-315.016533 84.0704-84.0704 195.857067-130.321067 314.811733-130.321067 119.022933 0 230.946133 46.318933 315.016533 130.423467 173.704533 173.636267 173.704533 456.157867 0 629.794133C742.877867 782.984533 631.057067 829.303467 512.034133 829.303467L512.034133 829.303467 512.034133 829.303467 512.034133 829.303467 512.034133 829.303467 512.034133 829.303467zM330.103467 244.25813300000004c0 0 59.904-95.9488 181.828267-95.9488s201.8304 95.9488 201.8304 95.9488 45.294933 0.136533 45.192533-47.957333c0 0-78.506667-111.8208-247.022933-111.8208s-223.368533 111.8208-223.368533 111.8208S286.856533 244.25813300000004 330.103467 244.25813300000004L330.103467 244.25813300000004 330.103467 244.25813300000004 330.103467 244.25813300000004 330.103467 244.25813300000004zM363.2128 548.590933c-34.5088 0-62.702933-28.091733-62.702933-62.737067 0-34.679467 28.194133-62.6688 62.702933-62.6688 34.679467 0 62.702933 28.091733 62.702933 62.6688C425.915733 520.4992 397.858133 548.590933 363.2128 548.590933L363.2128 548.590933 363.2128 548.590933 363.2128 548.590933 363.2128 548.590933 363.2128 548.590933zM684.544 548.590933c-34.679467 0-62.702933-28.091733-62.702933-62.737067 0-34.679467 28.023467-62.6688 62.702933-62.6688 34.6112 0 62.600533 28.091733 62.600533 62.6688C747.144533 520.4992 719.121067 548.590933 684.544 548.590933L684.544 548.590933 684.544 548.590933 684.544 548.590933 684.544 548.590933 684.544 548.590933zM684.544 548.590933"  horiz-adv-x="1025" />
 
-    
-    <glyph glyph-name="fonts-html" unicode="&#58955;" d="M194.33 416.235h-101.295v101.28h-46.035v-267.03h46.035v119.7h101.28v-119.7h46.035v267.03h-46.035v-101.28zM277.205 480.69h73.665v-230.205h46.035v230.205h73.665v36.825h-193.365v-36.825zM627.815 335.58000000000004l-46.755 181.935h-73.665v-267.03h46.035v211.785l46.035-211.785h55.245l46.83 213.93-0.795-213.93h46.035v267.03h-73.665l-45.3-181.935zM848.09 287.30999999999995v230.205h-46.035v-267.03h174.945v36.825h-128.91z"  horiz-adv-x="1024" />
+			<glyph glyph-name="code-circle" unicode="&#58933;"
+				   d="M513.544163 893.525741c-282.101629 0-510.78094-228.679311-510.78094-510.76288 0-282.083569 228.679311-510.76288 510.78094-510.76288s510.76288 228.679311 510.76288 510.76288C1024.325103 664.8464309999999 795.645793 893.525741 513.544163 893.525741zM513.544163-83.46335899999997c-257.503523 0-466.22622 208.740757-466.22622 466.22622S256.0587 848.989082 513.544163 848.989082s466.22622-208.740757 466.22622-466.22622S771.047686-83.46335899999997 513.544163-83.46335899999997zM171.771357 359.77212099999997L414.357086 256.088033 414.357086 300.805295 221.978945 380.50532599999997 414.357086 459.464886 414.357086 504.182148 171.771357 401.76228ZM442.585309 193.38272800000004L478.814238 193.38272800000004 584.737801 572.1429949999999 548.743656 572.1429949999999ZM612.749301 504.182148L612.749301 459.464886 804.874598 380.50532599999997 612.749301 300.805295 612.749301 256.088033 855.33503 359.77212099999997 855.33503 401.76228Z"
+				   horiz-adv-x="1025"/>
 
-    
-    <glyph glyph-name="screen-full" unicode="&#58914;" d="M641.750109 511.899972l205.227128 204.519-0.704035-115.89966c-0.282433-9.611915 7.489578-18.09103 17.101493-17.808598l12.297071 0c9.611915 0.283456 17.667382 5.936199 17.808598 15.689331l0.565888 172.57752c0 0.14224 0.282433 9.187243 0.282433 9.187243 0.14224 4.804423-0.99056 9.187243-4.100388 12.297071-3.109828 3.109828-7.347339 5.086855-12.297071 4.946662l-8.763594-0.14224c-0.141216 0-0.278339 0-0.420579-0.14224L697.581696 797.833213c-9.611915-0.283456-17.667382-8.200776-17.808598-17.950837l0-12.297071c1.416256-11.44875 10.458189-18.092054 20.070104-17.808598l112.789832-0.283456-204.66124-203.814965c-9.329483-9.329483-9.329483-24.449855 0-33.778314 9.329483-9.470699 24.452925-9.470699 33.782408 0L641.750109 511.899972zM383.095141 319.11010699999997L177.726797 115.29411900000002l0.707105 115.338888c0.283456 9.607822-7.492648 18.086937-17.104563 17.808598l-13.001105 0c-9.611915-0.283456-17.667382-5.937223-17.808598-15.690354l-0.565888-172.718737c0-0.14224-0.282433-9.187243-0.282433-9.187243-0.14224-4.808516 0.99056-9.187243 4.096295-12.297071 3.109828-3.109828 7.351432-5.086855 12.297071-4.946662l8.762571 0.14224c0.14224 0 0.283456 0 0.425695 0.14224l171.873486-0.708128c9.607822 0.283456 17.667382 8.196683 17.808598 17.950837L344.93503 63.42477399999996c-1.415232 11.44875-10.461259 18.092054-20.074198 17.808598L212.069977 81.51682800000003 416.59 285.32872299999997c9.329483 9.329483 9.329483 24.453948 0 33.782408C407.40685 328.58182999999997 392.424624 328.58182999999997 383.095141 319.11010699999997L383.095141 319.11010699999997zM894.047276 60.03251399999999l-0.424672 172.718737c-0.283456 9.612938-8.200776 15.406898-17.809621 15.690354l-12.296047 0c-9.612938 0.278339-17.243733-8.200776-17.105586-17.808598l0.708128-115.903753L641.750109 319.11010699999997c-9.329483 9.329483-24.452925 9.329483-33.782408 0-9.325389-9.328459-9.325389-24.452925 0-33.782408L812.490795 81.51682800000003l-112.789832-0.283456c-9.611915 0.283456-18.515702-6.502088-20.073174-17.808598l0-12.297071c0.282433-9.611915 8.200776-17.667382 17.808598-17.950837l171.166381 0.708128c0.141216 0 0.282433-0.14224 0.424672-0.14224l8.763594-0.14224c4.803399-0.141216 9.187243 1.694595 12.296047 4.946662 3.109828 3.109828 4.238534 7.488555 4.097318 12.297071 0 0-0.14224 9.046027-0.14224 9.187243L894.047276 60.03149099999996zM212.216309 749.493252l112.789832 0.283456c9.607822-0.283456 18.512632 6.502088 20.070104 17.808598L345.076246 779.883399c-0.283456 9.611915-8.196683 17.667382-17.808598 17.950837l-172.011632-0.708128c-0.14224 0-0.283456 0.14224-0.425695 0.14224l-8.761548 0.14224c-4.808516 0.141216-9.187243-1.694595-12.297071-4.946662-3.109828-3.109828-4.242627-7.488555-4.096295-12.297071 0 0 0.282433-9.046027 0.282433-9.187243l0.420579-172.718737c0.14224-9.608845 8.200776-15.406898 17.808598-15.686261l13.005198 0c9.611915-0.282433 17.242709 8.196683 17.10047 17.808598l-0.564865 115.334795 205.231221-203.958228c9.324366-9.329483 24.448832-9.329483 33.777291 0 9.329483 9.329483 9.329483 24.452925 0 33.782408L212.216309 749.493252 212.216309 749.493252zM212.216309 749.493252"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="form" unicode="&#58940;" d="M314.278111 437.019389l395.439892 0 0-30.297458-395.439892 0L314.278111 437.019389zM314.278111 315.83495200000004l395.439892 0 0-30.297458-395.439892 0L314.278111 315.83495200000004zM314.278111 194.62833l263.626661 0 0-30.297458L314.278111 164.330872 314.278111 194.62833zM609.376235 739.9931730000001c-7.849678 42.966669-48.394988 75.742447-97.378777 75.742447-48.961604 0-89.51311-32.775778-97.380776-75.742447L116.55177 739.9931730000001l0-787.725922 790.893774 0 0 787.725922L609.376235 739.9931730000001zM446.091342 670.440529l0 17.613058 0 36.791056c0 33.410348 29.57295 60.594317 65.906116 60.594317 36.352353 0 65.907115-27.183969 65.907115-60.594317l0-36.791056 0-17.621053 16.672696-8.712493c32.358061-16.929922 57.169039-42.663874 71.406386-73.213161L358.043239 588.50688c14.240345 30.555683 39.051523 56.281241 71.408385 73.213161L446.091342 670.440529zM874.489888-17.436289999999985L149.505227-17.436289999999985 149.505227 709.694715 413.138884 709.694715l0-21.641327c-51.44492-26.923746-88.727643-74.124144-98.86377-129.845165l395.44289 0c-10.102151 55.730615-47.40466 102.921419-98.859773 129.845165l0 21.641327 263.631658 0L874.489888-17.436289999999985z"  horiz-adv-x="1024" />
+			<glyph glyph-name="water" unicode="&#58934;"
+				   d="M862.315763 33.684211000000005C802.869868 33.684211000000005 754.526289 82.94399999999996 754.526289 143.50371900000005 754.526289 162.33094700000004 759.35885 180.96056099999998 768.520956 197.43438600000002 768.64671 197.79368399999998 768.808394 198.15298199999995 769.006008 198.49431600000003L849.075622 334.542596 849.057657 334.542596 862.315763 357.052632 875.573868 334.542596 875.573868 334.542596 955.140464 199.356632C955.715341 198.67396499999995 956.164464 197.865544 956.380043 196.96729800000003 965.380464 180.60126300000002 970.123201 162.151298 970.105236 143.50371900000005 970.105236 82.94399999999996 921.761657 33.684211000000005 862.315763 33.684211000000005L862.315763 33.684211000000005ZM924.33064 188.57768399999998C924.204885 188.79326300000002 924.115061 189.02680699999996 924.025236 189.27831600000002L862.315763 302.996211 800.606289 189.260351C800.516464 189.02680699999996 800.42664 188.79326300000002 800.300885 188.57768399999998 793.977236 176.505263 790.635763 162.81600000000003 790.635763 148.965053 790.635763 105.29235100000005 822.792956 69.75775399999998 862.333727 69.75775399999998 901.856534 69.75775399999998 933.995763 105.29235100000005 933.995763 148.98301800000002 933.995763 162.81600000000003 930.654289 176.52322800000002 924.33064 188.57768399999998L924.33064 188.57768399999998ZM682.684605 392.982456C593.50678 392.982456 520.982429 469.602807 520.982429 563.8108070000001 520.982429 593.093614 528.240254 622.071018 541.965447 647.706947 542.163061 648.281825 542.396605 648.820772 542.684043 649.341754L662.815412 860.968421 662.797447 860.968421 682.684605 896 702.571763 860.968421 702.535833 860.968421 821.89471 650.689123C822.774991 649.647158 823.439692 648.3716489999999 823.781026 646.970386 837.25471 621.514105 844.368815 592.8241399999999 844.35085 563.8108070000001 844.35085 469.602807 771.844464 392.982456 682.684605 392.982456L682.684605 392.982456ZM791.408254 630.1192980000001C791.21064 630.4965609999999 791.030991 630.891789 790.887271 631.322947L682.684605 823.924772 574.446008 631.287018C574.320254 630.891789 574.140605 630.4965609999999 573.942991 630.1013330000001 562.840675 609.6931930000001 556.912254 596.075789 556.912254 572.631579 556.912254 498.634105 613.375973 428.876351 682.684605 428.876351 751.993236 428.876351 808.367131 489.058807 808.367131 563.056281 808.367131 586.500491 802.492605 609.6931930000001 791.408254 630.1192980000001L791.408254 630.1192980000001ZM538.695833 276.983018C540.115061 275.330246 541.174991 273.33614 541.713938 271.12645599999996 563.433517 231.11859600000003 574.895131 186.02666699999997 574.895131 140.43171900000004 574.895131-7.581192999999985 458.051341-128 314.403903-128 170.738499-128 53.89471-7.581192999999985 53.89471 140.43171900000004 53.89471 186.47578899999996 65.589868 231.998877 87.704675 272.294175 88.010078 273.17445599999996 88.387341 274.01880700000004 88.872394 274.863158L282.408394 607.411649 282.372464 607.411649 314.403903 662.45614 346.453306 607.411649 346.399412 607.411649 538.695833 276.983018 538.695833 276.983018ZM314.403903 590.614456L119.807973 257.79649099999995C119.556464 257.113825 119.251061 256.449123 118.873798 255.78442099999995 98.932745 220.48336800000004 88.387341 180.42161399999998 88.387341 139.91073700000004 88.387341 12.072420999999963 189.799271-91.89052600000002 314.421868-91.89052600000002 439.026499-91.89052600000002 540.420464 12.072420999999963 540.402499 139.91073700000004 540.402499 180.42161399999998 529.857096 220.50133300000005 509.916043 255.78442099999995 509.53878 256.449123 509.233377 257.131789 508.963903 257.86835099999996L314.403903 590.614456 314.403903 590.614456Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="cart" unicode="&#58967;" d="M365.920994 84.618469c-39.030945 0-70.78516-31.754215-70.78516-70.78516s31.754215-70.784136 70.78516-70.784136c39.030945 0 70.784136 31.753191 70.784136 70.784136S404.951939 84.618469 365.920994 84.618469zM365.920994-5.784493999999995c-10.818393 0-19.61985 8.801457-19.61985 19.618826 0 10.818393 8.801457 19.61985 19.61985 19.61985s19.618826-8.801457 19.618826-19.61985C385.540843 3.015939000000003 376.739387-5.784493999999995 365.920994-5.784493999999995zM808.821219 84.618469c-39.030945 0-70.784136-31.754215-70.784136-70.78516s31.753191-70.784136 70.784136-70.784136 70.78516 31.753191 70.78516 70.784136S847.852164 84.618469 808.821219 84.618469zM808.821219-5.784493999999995c-10.81737 0-19.618826 8.801457-19.618826 19.618826 0 10.818393 8.801457 19.61985 19.618826 19.61985 10.818393 0 19.61985-8.801457 19.61985-19.61985C828.441069 3.015939000000003 819.640636-5.784493999999995 808.821219-5.784493999999995zM443.99107 305.940157c-14.057157-1.416256-24.305569-13.959943-22.890336-28.0171 1.328251-13.187347 12.446473-23.02132 25.423019-23.02132 0.856507 0 1.723248 0.042979 2.594081 0.130983l439.314561 44.245713c0.088004 0.007163 0.174985 0.01842 0.261966 0.026606l0.180102 0.01842c0.50449 0.051165 1.001817 0.119727 1.496074 0.198521 0.222057 0.035816 0.443092 0.076748 0.663102 0.11768 0.552585 0.103354 1.100054 0.217964 1.638313 0.355087 0.085958 0.022513 0.169869 0.047072 0.254803 0.069585 0.586354 0.156566 1.161453 0.334621 1.728364 0.530073 0.077771 0.026606 0.155543 0.051165 0.233314 0.078795 0.626263 0.222057 1.239224 0.469698 1.840928 0.737804 0.039909 0.017396 0.078795 0.035816 0.118704 0.054235 1.277086 0.577145 2.496867 1.252527 3.647063 2.020006 0.001023 0.001023 0.002047 0.001023 0.00307 0.002047 0.553609 0.369414 1.088798 0.76134 1.609661 1.170662 0.069585 0.054235 0.137123 0.10847 0.205685 0.163729 0.48607 0.38988 0.958838 0.795109 1.413186 1.218758 0.092098 0.084934 0.180102 0.173962 0.270153 0.25992 0.394996 0.378623 0.778736 0.76748 1.14815 1.169639 0.11154 0.121773 0.222057 0.243547 0.331551 0.367367 0.333598 0.3776 0.653893 0.766456 0.964978 1.163499 0.12382 0.158612 0.249687 0.314155 0.370437 0.475837 0.322341 0.432859 0.629333 0.876973 0.925069 1.329275 0.113587 0.173962 0.224104 0.348947 0.333598 0.525979 0.296759 0.479931 0.580215 0.968048 0.845251 1.467421 0.069585 0.130983 0.134053 0.265036 0.201591 0.397043 0.289596 0.568958 0.563842 1.147126 0.811482 1.738597 0.00307 0.007163 0.005117 0.014326 0.008186 0.021489 0.569982 1.369184 1.019213 2.796696 1.345648 4.26514 0 0.001023 0 0.002047 0.001023 0.00307l0.00307 0.013303c0.035816 0.162706 0.075725 0.323365 0.10847 0.487094l56.17951 252.734118c0.895393 4.030803 0.780783 8.04728-0.165776 11.794627 0.50449 2.003634 0.774643 4.101411 0.774643 6.261611 0 14.128789-11.452843 25.582655-25.582655 25.582655L195.47502 616.098125l-52.358485 159.553902c-3.631714 11.067057-14.093996 17.972327-25.177426 17.590634-0.207731 0.005117-0.413416 0.01535-0.62217 0.01535L54.663994 793.258011c-14.128789 0-25.582655-11.453866-25.582655-25.582655s11.453866-25.582655 25.582655-25.582655l45.614897 0 197.955514-603.235934c3.536546-10.776438 13.546527-17.613146 24.303522-17.613146 2.067079 0 4.16281 0.26299 6.245238 0.788969l567.583946 0c14.129812 0 25.582655 11.453866 25.582655 25.582655s-11.452843 25.582655-25.582655 25.582655L340.816223 173.1979 212.265428 564.933839l701.224666 0-48.137347-216.557174L443.99107 305.940157z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="camera-fill" unicode="&#58973;" d="M512 480C436.515555 480 375.111111 419.712 375.111111 345.6 375.111111 271.48800000000006 436.515555 211.20000000000005 512 211.20000000000005 587.484446 211.20000000000005 648.888887 271.48800000000006 648.888887 345.6 648.888887 419.712 587.484446 480 512 480M512 172.79999999999995C414.808889 172.79999999999995 336 250.15679999999998 336 345.6 336 441.0432 414.808889 518.4 512 518.4 609.210667 518.4 688 441.0432 688 345.6 688 250.15679999999998 609.210667 172.79999999999995 512 172.79999999999995M903.111113 691.2L723.767113 691.2C713.383113 691.2 703.448887 695.2512 696.115554 702.4512L640.792887 756.7488C633.459554 763.9488 623.505779 768 613.141333 768L512 768 410.878222 768C400.494222 768 390.56 763.9488 383.226667 756.7488L327.904 702.4512C320.570667 695.2512 310.616889 691.2 300.252445 691.2L120.888889 691.2C77.866667 691.2 42.666667 656.64 42.666667 614.4L42.666667 76.79999999999995C42.666667 34.559999999999945 77.866667 0 120.888889 0L903.111113 0C946.133333 0 981.333333 34.559999999999945 981.333333 76.79999999999995L981.333333 614.4C981.333333 656.64 946.133333 691.2 903.111113 691.2"  horiz-adv-x="1024" />
+			<glyph glyph-name="username" unicode="&#58991;"
+				   d="M514.594 824.888c-144.11 0-260.979-118.46-260.979-264.558 0-88.783 43.497-166.928 109.711-214.898-135.361-59.354-230.159-195.858-230.159-354.931h0.894c1.541-21.375 18.641-38.377 40.117-38.377s38.575 17.051 40.117 38.377h0.645c0 0.944-0.099 1.79-0.099 2.734 0 0.05 0 0.099 0 0.149 0 0.099-0.05 0.149-0.05 0.199 0.05 159.967 120 291.054 273.009 304.924 8.948-0.944 17.598-2.734 26.844-2.734 144.11 0 260.979 118.46 260.979 264.558s-116.919 264.558-261.029 264.558zM514.594 377.54499999999996c-99.769 0-180.698 81.972-180.698 183.183s80.879 183.183 180.698 183.183c99.719 0 180.647-81.972 180.647-183.183s-80.879-183.183-180.647-183.183zM896.021-6.615000000000009c0 0.348-0.199 0.645-0.199 0.994-1.043 105.038-43.397 200.034-111.35 269.131v0c-7.157 7.357-17.001 11.98-27.986 11.98-21.574 0-39.122-17.747-39.122-39.668 0-11.135 4.573-21.127 11.83-28.334l-0.099-0.05c52.742-55.229 85.302-130.589 85.302-213.853 0-1.043-0.149-1.987-0.149-3.034h0.994c1.491-21.375 18.691-38.377 40.117-38.377 21.475 0 38.575 17.051 40.117 38.377h0.597c0 0.796-0.099 1.491-0.099 2.287-0.05 0.149 0.05 0.348 0.05 0.547z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="tabs" unicode="&#58922;" d="M310.30303 523.636364L124.121212 523.636364c-17.128727 0-31.030303-13.901576-31.030303-31.030303l0-186.181818c0-17.128727 13.901576-31.030303 31.030303-31.030303l186.181818 0c17.128727 0 31.030303 13.901576 31.030303 31.030303L341.333333 492.606061C341.333333 509.734788 327.431758 523.636364 310.30303 523.636364zM294.787879 306.42424200000005L139.636364 306.42424200000005c-17.128727 0-15.515152-1.613576-15.515152 15.515152L124.121212 477.090909c0 17.128727-1.613576 15.515152 15.515152 15.515152l155.151515 0c17.128727 0 15.515152 1.613576 15.515152-15.515152l0-155.151515C310.30303 304.81066699999997 311.916606 306.42424200000005 294.787879 306.42424200000005zM418.909091 352.969697l480.969697 0 0 31.030303L418.909091 384 418.909091 352.969697zM418.909091 228.84848499999998l480.969697 0 0 31.030303L418.909091 259.878788 418.909091 228.84848499999998zM418.909091 89.21212100000002l480.969697 0 0 31.030303L418.909091 120.24242400000003 418.909091 89.21212100000002zM418.909091 492.606061l480.969697 0 0 31.030303L418.909091 523.636364 418.909091 492.606061zM992.969697 725.333333l-15.515152 0L977.454545 849.454545c0 17.128727-13.901576 31.030303-31.030303 31.030303L775.757576 880.484848c-17.128727 0-31.030303-13.901576-31.030303-31.030303l0-124.121212-139.636364 0L605.090909 849.454545c0 17.128727-13.901576 31.030303-31.030303 31.030303L403.393939 880.484848c-17.128727 0-31.030303-13.901576-31.030303-31.030303l0-124.121212-124.121212 0L248.242424 849.454545c0 17.128727-13.901576 31.030303-31.030303 31.030303L31.030303 880.484848C13.901576 880.484848 0 866.583273 0 849.454545l0-946.424242c0-17.128727 13.901576-31.030303 31.030303-31.030303l961.939394 0c17.128727 0 31.030303 13.901576 31.030303 31.030303L1024 694.30303C1024 711.431758 1010.098424 725.333333 992.969697 725.333333zM992.969697-65.939394c0-17.128727-13.901576-31.030303-31.030303-31.030303L62.060606-96.969697c-17.128727 0-31.030303 13.901576-31.030303 31.030303L31.030303 818.424242c0 17.128727 13.901576 31.030303 31.030303 31.030303l124.121212 0c17.128727 0 31.030303-13.901576 31.030303-31.030303l0-124.121212 744.727273 0c17.128727 0 31.030303-13.901576 31.030303-31.030303L992.969697-65.939394z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="fonts-code" unicode="&#58958;" d="M270 626c-12 12-32 12-44 0L9 409c-12-12-12-32 0-44l217-217c6-6 14-9 22-9s16 3 22 9c12 12 12 32 0 44L75 387 270 582C282 595 282 614 270 626zM1015 409L798 626c-12 12-32 12-44 0-12-12-12-32 0-44l195-195L754 192c-12-12-12-32 0-44 6-6 14-9 22-9s16 3 22 9l217 217C1027 377 1027 397 1015 409zM624 696L624 696c-16 6-34-3-40-19L382 119c-6-16 2-34 19-40l0 0c16-6 34 3 40 19l202 558C648 672 640 690 624 696z"  horiz-adv-x="1025" />
+			<glyph glyph-name="find-fill" unicode="&#58992;"
+				   d="M512 896C229.236364 896 0 666.763636 0 384c0-282.786909 229.236364-512 512-512s512 229.213091 512 512C1024 666.763636 794.763636 896 512 896zM657.291636 383.976727c0-77.195636-60.392727-139.729455-136.424727-144.407273l-175.732364-151.714909-22.877091 13.242182 58.228364 222.021818c-8.634182 18.548364-13.800727 39.074909-13.800727 60.858182 0 77.195636 60.369455 139.729455 136.378182 144.430545l175.802182 151.714909 22.877091-13.172364-58.251636-222.068364C652.125091 426.309818 657.291636 405.806545 657.291636 383.976727zM512 384m-66.048 0a2.838 2.838 0 1 1 132.096 0 2.838 2.838 0 1 1-132.096 0Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="fire" unicode="&#59222;" d="M890.059904 352.19948999999997C845.890699 458.956706 840.554889 548.4951550000001 857.396326 618.42714 859.144623 625.686731 860.991676 631.9776790000001 862.858846 637.425182 863.763607 640.064841 865.906573 645.659889 866.16406 646.532651L880.890349 696.448108 833.062903 675.9309969999999C832.106692 675.5208 830.618069 674.894716 827.426684 673.550492 824.667648 672.380966 822.310677 671.354022 819.868514 670.244809 813.291441 667.2575449999999 807.049466 664.090938 800.697749 660.4128450000001 784.089623 650.795565 768.486253 638.656896 753.86285 623.033596 727.630498 595.007563 706.526618 557.766355 691.78157 509.713231 675.041103 455.157161 671.516484 411.46006 673.004574 347.939834 673.477918 327.73476900000003 673.463923 322.197583 672.83965 318.324215 673.779618 324.156339 684.455526 333.67819899999995 696.104608 329.19567600000005 693.056849 330.36844199999996 685.695898 339.012828 676.314007 361.368339 660.550914 398.92921 646.834249 460.170272 636.817284 549.350468 625.445924 650.588768 630.103925 734.7280519999999 644.646978 801.338628 647.677924 815.221065 650.899934 827.082435 654.086773 836.904609 655.91465 842.538316 657.254607 846.094657 657.880284 847.554385L678.645286 896 628.243642 880.578031C617.409833 877.263087 599.94569 869.52239 578.105438 855.845223 542.547644 833.577626 507.199569 802.385036 474.400401 760.836776 447.596676 726.883228 423.611383 687.30061 403.118547 641.7016189999999 378.907516 587.829195 363.003277 542.798944 353.158029 503.238462 349.274261 487.632585 346.433259 473.323627 344.1945 458.925156 343.334411 453.39353 342.592734 448.063234 341.804612 441.911844 341.502524 439.553997 340.356619 430.329551 340.073506 428.145504 337.596047 409.033293 335.848224 404.35337 329.235273 398.312868 336.081933 404.566848 343.232634 404.098227 346.608002 402.086756 344.852318 403.133013 341.598345 406.493651 337.991853 411.887149 327.030897 428.279226 317.980358 454.883162 313.690598 489.339595 311.250185 508.941598 310.203772 539.08627 310.370048 576.545325 310.480474 601.422138 311.113088 628.122479 312.099068 654.977888 312.481453 665.393013 312.891081 675.105466 313.30045 683.8491750000001 313.545346 689.079919 313.735044 692.813105 313.84201 694.783403L317.55517 763.179488 271.360516 712.604139C270.467691 711.626645 268.852992 709.837042 266.618705 707.326295 262.927895 703.178805 258.823678 698.493751 254.407949 693.3614689999999 241.78797 678.693606 229.164348 663.340425 217.341267 648.004036 211.724185 640.717803 206.411389 633.591345 201.450577 626.6638379999999 176.017063 591.147305 156.617347 555.4025280000001 138.122768 512.155497 90.841957 401.595812 76.97672 299.64870599999995 99.261816 188.13489300000003 126.80821 50.29373899999996 188.553235-37.64422200000001 278.8297-84.690336 344.19104-118.75233700000001 408.837235-128 507.940695-128 525.713007-128 557.977207-125.567138 590.857378-120.46215900000004 641.152493-112.65333099999998 687.496192-99.78932299999997 726.063273-80.59104400000001 738.155853-74.57148800000004 743.07901-59.88870199999997 737.059454-47.79612199999997 731.039898-35.70354299999997 716.357111-30.780384000000026 704.264531-36.79993999999999 670.855859-53.43041900000003 629.092954-65.02289699999994 583.352478-72.12456999999995 552.984316-76.83953499999996 523.228215-79.08327499999996 507.940695-79.08327499999996 416.16215-79.08327499999996 357.934257-70.75375399999996 301.436271-41.310745999999995 224.830174-1.3887230000000272 171.977796 73.88423 147.230072 197.72094500000003 126.99711 298.965952 139.514783 391.004811 183.099329 492.921284 200.282663 533.1021499999999 218.020237 565.784358 241.22153 598.183718 245.831691 604.6215589999999 250.802959 611.289899 256.082244 618.137961 267.31885 632.713596 279.402035 647.409487 291.488864 661.457681 298.732051 669.8762429999999 304.338773 676.1767130000001 307.478705 679.614406L264.997214 697.435142C264.883874 695.347445 264.688038 691.493511 264.43725 686.13688 264.020474 677.234965 263.603959 667.359281 263.215279 656.7726250000001 262.21142 629.430212 261.566827 602.224414 261.453805 576.7624579999999 261.278897 537.3588179999999 262.385015 505.49418 265.148621 483.296209 276.058157 395.668083 322.627019 326.024497 362.226031 362.19561799999997 379.341732 377.829698 384.756649 392.328523 388.584361 421.857186 397.932742 493.974714 407.332926 531.746825 447.736538 621.64966 466.587287 663.594818 488.484326 699.731218 512.795234 730.526996 542.034492 767.565749 573.156162 795.028785 604.068111 814.386984 614.696751 821.043029 624.472062 826.201428 633.124687 830.036563 638.02329 832.207788 641.258688 833.404991 642.556233 833.802016L612.91959 866.825663C608.658554 856.884484 602.686705 838.478616 596.856038 811.772799 581.186705 740.003594 576.231674 650.498985 588.206246 543.890345 607.295279 373.94226100000003 638.819345 298.82556999999997 678.537329 283.542234 701.302332 274.78234499999996 717.731637 289.43566899999996 721.133156 310.5407 722.475759 318.870999 722.489387 324.26340300000004 721.907881 349.08549100000005 720.532565 407.791853 723.691247 446.952173 738.546223 495.36355 751.151827 536.44438 768.544047 567.135763 789.576147 589.605967 809.230566 610.60429 821.725461 617.839716 852.347733 630.9761169999999L842.705318 653.453557 819.246577 660.374464C822.235501 670.505564 813.450321 644.87463 809.839253 629.8801189999999 790.647573 550.1890470000001 796.611315 450.1135 844.8591 333.498332 883.105728 241.056017 874.587669 126.06492400000002 824.002925 61.39712899999995 815.680378 50.75754500000005 817.558709 35.38570000000004 828.198295 27.063153000000057 838.837879 18.740607999999952 854.209724 20.618939999999952 862.532269 31.258523999999966 924.762731 110.81426299999998 934.658528 244.404363 890.059904 352.19948999999997Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="set" unicode="&#59158;" d="M466.496-126.62400000000002l-1.056 0.064c-25.184 2.08-47.456 22.368-51.744 47.232l-17.344 102.4c-0.672 4.064-6.624 11.04-10.56 12.416l-30.336 12.416c-5.44 2.496-15.424 0.8-17.472-0.64l-84.992-60.16c-19.584-14.016-51.456-12.736-70.08 3.168l-64.288 64c-17.952 20.48-19.488 50.592-4.736 71.296l60.416 84.672c2.176 3.072 2.784 11.52 1.024 15.04l0 0c0 0-1.664 3.104-7.264 16.608-6.176 14.848-6.816 17.44-6.816 17.44-0.992 3.04-7.456 8.672-11.36 9.376l-102.56 17.248c-25.152 4.288-45.44 26.624-47.168 52L0 428.288c2.112 27.36 22.496 49.6 47.52 53.728l102.528 17.344c4.128 0.672 11.008 6.56 12.416 10.496l12.608 30.336c2.368 4.992 1.6 14.112-0.8 17.504L113.984 642.24C99.36 662.88 100.704 692.896 117.056 712.192l64.416 64.224c20.672 18.208 51.296 18.784 71.36 4.64l84.992-60.16c1.952-1.376 13.28-2.016 15.04-1.056 0.384 0.192 2.528 1.344 16.704 7.168 14.24 5.92 16.576 6.592 16.576 6.592 3.84 1.184 9.504 7.648 10.144 11.424l17.44 102.4c4.32 25.152 26.752 45.376 52.128 47.104l90.528 0.064c27.328-2.112 49.632-22.368 53.952-47.232l17.344-102.432c0.672-4.064 6.656-11.04 10.624-12.48l30.304-12.352c6.24-2.784 15.456-0.8 17.44 0.608l85.024 60.16c19.52 14.016 51.392 12.704 70.08-3.136l64.288-64.032c17.952-20.48 19.456-50.56 4.736-71.264l-60.416-84.672c-2.208-3.136-2.848-11.616-1.056-15.04 0.16-0.352 1.376-2.56 7.232-16.672 5.856-14.112 6.592-16.512 6.592-16.512 1.248-4.032 7.712-9.6 11.648-10.304l102.56-17.248c25.152-4.224 45.44-26.592 47.168-52l0.096-90.304c-2.112-27.392-22.528-49.6-47.552-53.728l-102.528-17.376c-4.128-0.672-10.944-6.496-12.32-10.432l-12.736-30.432c-2.336-4.928-1.568-14.112 0.832-17.472l60.288-84.512c14.624-20.736 13.216-50.816-3.232-70.048l-64.192-64.096c-11.328-9.92-24.64-14.72-38.784-14.72l0 0c-11.904 0-23.52 3.552-32.704 10.016l-84.992 60.16c-1.952 1.408-13.312 2.016-15.072 1.056-0.288-0.16-2.432-1.312-16.608-7.2-14.08-5.792-16.384-6.496-16.384-6.496-4.16-1.28-9.792-7.776-10.432-11.52l-17.408-102.4c-4.352-25.152-26.72-45.344-52.032-47.104L466.496-126.62400000000002zM347.84 100.60799999999995c10.368 0 20.192-2.112 28.48-6.112l27.648-11.296c20.416-7.072 38.976-28.992 42.848-51.584l17.344-102.336c0.288-1.6 3.136-4.32 5.056-4.832l87.296 0.064c-0.032 0.064 3.04 2.944 3.328 4.672l17.408 102.368c3.872 22.656 23.328 44.832 45.28 51.584 0 0 0 0 0 0-0.096 0 2.976 1.152 12.448 5.056 9.472 3.936 12.384 5.248 13.12 5.568 18.208 9.6 49.44 8.032 67.776-4.96l84.928-60.16c0.192-0.128 1.312-0.64 3.104-0.64l0 0c2.048 0 3.52 0.672 3.872 0.96l61.536 61.408 0 0c-0.16 0 0.064 4.416-0.992 5.952l-60.224 84.448c-13.248 18.624-15.68 47.168-5.792 67.872l11.648 27.84c6.944 19.968 29.408 38.912 51.68 42.496l102.464 17.376c1.824 0.384 4.736 3.648 4.864 5.408L972.8 428.288l0 0c-0.096 0-2.88 3.072-4.576 3.424l-102.72 17.28c-23.168 4.032-44.896 22.976-51.776 45.056l0 0c-0.032 0-1.216 3.04-5.12 12.512-3.968 9.568-5.28 12.512-5.632 13.248-10.24 19.36-8.288 48.736 4.96 67.456L868.448 672c0.96 1.408 0.736 5.6-0.384 6.912l-61.408 61.184c0.704-0.8-0.768-0.192-2.848-0.192-1.728 0-2.784-0.416-3.008-0.576l-85.024-60.16c-17.824-12.8-47.776-15.36-68-5.664l-27.712 11.296c-20.512 7.2-39.04 29.088-42.88 51.584l-17.344 102.336c-0.288 1.76-3.616 4.704-5.504 4.864L467.616 843.52c0-0.064-3.104-2.944-3.392-4.672l-17.408-102.336c-3.84-22.624-23.264-44.8-45.216-51.584 0-0.032-3.008-1.184-12.416-5.088-9.568-3.936-12.512-5.248-13.248-5.568-17.984-9.568-49.344-8.032-67.744 4.992L223.264 739.36c-0.416 0.32-6.176 0.288-6.848-0.224L154.688 677.6320000000001c0 0 0 0 0 0 0.224 0 0.032-4.384 1.056-5.856L216 587.264c13.312-18.752 15.744-47.296 5.76-67.968l-11.52-27.648c-6.976-20.032-29.472-38.944-51.776-42.624L55.968 431.68c-1.824-0.384-4.704-3.648-4.832-5.408l0.096-86.56 0 0c0.096 0 2.912-3.104 4.608-3.424l102.656-17.28c23.04-4 44.704-22.912 51.712-44.928 0.256-0.736 1.44-3.84 5.088-12.64 3.68-8.832 5.024-11.84 5.472-12.736 10.592-20.288 8.672-48.96-4.672-67.904l-60.512-84.768c-0.96-1.408-0.736-5.632 0.384-6.912l61.408-61.184c-0.736 0.8 0.736 0.224 2.816 0.192 1.728 0 2.784 0.416 3.008 0.576l84.992 60.16C318.624 96.32000000000005 333.088 100.60799999999995 347.84 100.60799999999995zM512.032 133.856c-138.336 0-250.848 112.224-250.848 250.176 0 137.92 112.544 250.144 250.848 250.144s250.848-112.224 250.848-250.144C762.88 246.08000000000004 650.336 133.856 512.032 133.856zM512.032 583.136c-110.08 0-199.648-89.312-199.648-199.104s89.568-199.136 199.648-199.136 199.648 89.344 199.648 199.136S622.112 583.136 512.032 583.136z"  horiz-adv-x="1024" />
+			<glyph glyph-name="about" unicode="&#58891;"
+				   d="M514.27174 834.607768c-249.516844 0-451.789687-202.272843-451.789687-451.789687s202.272843-451.789687 451.789687-451.789687 451.789687 202.272843 451.789687 451.789687S763.788583 834.607768 514.27174 834.607768zM514.27174-20.12919999999997c-222.541469 0-402.947282 180.405813-402.947282 402.947282s180.405813 402.947282 402.947282 402.947282 402.947282-180.405813 402.947282-402.947282S736.814232-20.12919999999997 514.27174-20.12919999999997zM514.295276 593.979362c-9.44614-10.360975-14.307867-22.951735-14.307867-37.483706 0-11.960403 3.886517-22.396079 11.534707-30.457686 7.783267-8.211009 17.853623-12.450567 29.313629-12.450567 9.312086 0 23.139 2.849908 35.782971 16.900925 9.865695 10.641361 14.866592 23.437805 14.866592 37.693484 0 11.68104-4.031826 21.900799-11.744485 29.832446C562.925856 615.325529 532.358677 613.449809 514.295276 593.979362zM549.461193 293.282882c-12.110829-11.541871-20.589944-18.759249-26.236548-23.316032 2.77009 14.953573 9.976212 44.614104 27.330462 103.023398 17.297968 57.890478 18.799158 67.991534 18.799158 72.955592 0 8.65717-3.63683 16.335037-9.921977 21.642926-14.124695 11.661597-39.035038 9.349949-69.131497-7.677866-16.779152-9.408277-34.595936-24.759917-54.493102-46.576805l-10.377348-11.541871 34.425044-26.548656 8.818853 8.715499c9.573029 9.292644 16.086373 15.35164 20.411889 19.393699-26.294876-86.460164-39.093367-140.190903-39.093367-164.262134 0-10.907421 3.172249-19.970844 9.573029-26.839275 6.460132-7.039323 15.510252-10.736529 25.891693-10.736529 10.146081 0 21.792329 3.926426 35.922141 11.949146 12.741185 7.212262 31.883151 23.029506 58.641585 48.190559l10.837836 10.391674-31.30703 30.475082L549.461193 293.282882z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="fonts-u" unicode="&#58950;" d="M0-49.23076900000001L945.230769-49.23076900000001 945.230769-128 0-128 0-49.23076900000001ZM0 896L407.076943 896 407.076943 834.065644 319.153861 827.872177 299.076923 809.911217 299.076923 365.841959C299.076923 281.19796199999996 317.076716 220.709337 353.076933 184.37435100000005 389.077071 148.03936499999998 448.153442 129.87210800000003 530.307702 129.87210800000003 606.000364 129.87210800000003 660.807522 149.17482299999995 694.730752 187.78072599999996 728.653982 226.38662899999997 745.61536 289.66226700000004 745.61536 377.60953099999995L745.61536 804.956475 724.153817 826.633531 633.461524 834.065644 633.461524 896 955.384596 896 955.384596 834.065644 868.846119 826.633531 849.461563 804.956475 849.461563 364.60331299999996C849.461563 246.92743900000005 819.923338 161.66533900000002 760.846178 108.81441500000005 701.76894 55.96348999999998 606.462188 29.53846199999998 474.923087 29.53846199999998 406.153531 29.53846199999998 345.807951 38.51886300000001 293.884613 56.47990200000004 241.961275 74.44093999999996 201.230887 100.143419 171.692347 133.58820400000002 149.076834 160.01362700000004 133.038474 190.25793999999996 123.57695 224.32200899999998 114.115348 258.386078 109.384625 307.21047599999997 109.384625 370.796702L109.384625 809.911217 89.307687 827.872177 0 834.065644 0 896Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="triangle-d" unicode="&#58917;" d="M773.128299 88.65234199999998M889.696178 575.195553L158.862147 575.195553 524.357446 209.64704300000005 889.696178 575.195553Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="location" unicode="&#59157;"
+				   d="M451.673935-98.39569900000004C478.883834-129.01914699999998 524.254807-128.8089789999999 551.400292-97.92885100000001 553.755808-95.38790800000004 558.821323-89.79676199999994 565.872444-81.84834999999998 577.572838-68.65901699999995 590.597131-53.62432000000001 604.615947-36.99831500000005 644.662065 10.495494000000008 684.708678 61.282182000000034 722.129538 113.35355300000003 759.658524 165.575381 792.492213 216.29072599999995 819.314991 264.54153799999995 868.685946 353.35368300000005 896 430.456574 896 493.714285 896 715.890551 719.301715 896 501.333333 896 283.364952 896 106.666667 715.890551 106.666667 493.714285 106.666667 430.401284 134.05152 353.19426999999996 183.54613 264.23737800000004 210.371803 216.02347099999997 243.193308 165.34812399999998 280.699364 113.16684599999996 318.155192 61.05544999999995 358.239268 10.22578999999996 398.322835-37.31103099999996 412.354743-53.95207300000004 425.391185-69.00072999999998 437.102468-82.20257900000001 444.160087-90.15846599999998 449.230214-95.75492099999997 451.982775-98.73670600000003L451.673935-98.39569900000004ZM486.822684-65.32134799999994C484.281231-62.568254000000024 479.425084-57.207989 472.585916-49.49835900000005 461.135889-36.591016999999965 448.364015-21.84776099999999 434.602351-5.527214999999956 395.275714 41.11192700000004 355.949587 90.98045200000001 319.289224 141.985137 282.808749 192.739548 250.983685 241.87642200000005 225.158316 288.29247799999996 179.388826 370.55419500000005 154.50505 440.709839 154.50505 493.714285 154.50505 688.960095 309.785362 847.238095 501.333333 847.238095 692.881306 847.238095 848.161617 688.960095 848.161617 493.714285 848.161617 440.753978 823.345286 370.701737 777.693969 288.58074899999997 751.873483 242.13293399999998 720.038415 192.96007499999996 683.537446 142.16873799999996 646.912604 91.20503299999996 607.624538 41.38032599999997 568.335977-5.21503800000005 554.587654-21.52024300000005 541.828177-36.24924999999996 530.389289-49.14379699999995 523.556841-56.84571100000005 518.705521-62.20043499999997 516.166694-64.95052599999997 507.543772-74.74891100000002 495.255793-74.80583000000001 487.131524-65.66235300000005L486.822684-65.32134799999994ZM714.955981 428.971194C723.919106 453.372045 728.565658 479.331002 728.565658 505.904762 728.565658 627.091817 632.184774 725.333333 513.29293 725.333333 394.401086 725.333333 298.020202 627.091817 298.020202 505.904762 298.020202 384.717709 394.401086 286.47619 513.29293 286.47619 549.003859 286.47619 583.510052 295.36805300000003 614.373097 312.125591 626.032316 318.456132 630.449257 333.22218 624.238611 345.10648100000003 618.027966 356.99078199999997 603.541579 361.49299399999995 591.882359 355.16245100000003 567.900883 342.14136099999996 541.111735 335.23809500000004 513.29293 335.23809500000004 420.821495 335.23809500000004 345.858586 411.648164 345.858586 505.904762 345.858586 600.161359 420.821495 676.571428 513.29293 676.571428 605.764365 676.571428 680.727273 600.161359 680.727273 505.904762 680.727273 485.192019 677.117041 465.022684 670.154965 446.069408 665.522846 433.459117 671.796821 419.408892 684.168282 414.687349 696.53974 409.965809 710.323861 416.360905 714.955981 428.971194L714.955981 428.971194Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="tips" unicode="&#59138;" d="M967.280184 578.537671c-24.915459 58.887178-60.544935 111.76755-105.96745 157.161413-45.393863 45.393863-98.273211 81.051991-157.160389 105.96745-60.988026 25.803689-125.735679 38.853913-192.494129 38.853913-66.729797 0-131.504056-13.0799-192.494129-38.853913-58.887178-24.916483-111.766526-60.544935-157.160389-105.96745-45.393863-45.393863-81.051991-98.274234-105.96745-157.161413-25.803689-60.988026-38.884612-125.734656-38.884612-192.464453s13.0799-131.50508 38.884612-192.464453c24.915459-58.887178 60.544935-111.737874 105.96745-157.161413 45.393863-45.393863 98.273211-81.051991 157.160389-105.96745 60.988026-25.803689 125.735679-38.853913 192.494129-38.853913 66.729797 0 131.504056 13.0799 192.494129 38.853913 58.887178 24.916483 111.766526 60.544935 157.160389 105.96745 45.393863 45.393863 81.051991 98.274234 105.96745 157.161413 25.803689 60.988026 38.853913 125.734656 38.853913 192.464453S993.084896 517.549645 967.280184 578.537671zM511.687892-55.138552000000004c-243.302305 0-441.241446 197.909465-441.241446 441.21177S268.385587 827.284989 511.687892 827.284989c243.273652-0.029676 441.210747-197.938118 441.210747-441.21177S754.990197-55.138552000000004 511.687892-55.138552000000004zM511.657192 573.565427m-45.511543 0a44.475 44.475 0 1 1 91.023086 0 44.475 44.475 0 1 1-91.023086 0ZM542.729885 184.14011300000004c0-17.162892-13.906731-31.071669-31.070646-31.071669l0 0c-17.163915 0-31.070646 13.907755-31.070646 31.071669L480.588593 426.998303c0 17.162892 13.906731 31.071669 31.070646 31.071669l0 0c17.163915 0 31.070646-13.907755 31.070646-31.071669L542.729885 184.14011300000004z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="picture" unicode="&#58954;" d="M765.376 615.424c0 0 103.04 1.024 103.04-100.992 0 0 9.536-98.752-103.04-100.928 0 0-100.864-2.176-99.84 100.928C665.536 514.496 664.448 605.8879999999999 765.376 615.424ZM968.32 770.56c0 0 54.208-4.224 54.208-52.032l0-712.832c0 0-3.2-51.008-54.208-52.096L968.32 770.56ZM1.472 5.631999999999948c0 0 2.176-52.096 52.096-52.096L968.32-46.464000000000055l0 150.848-99.712 0-203.072 206.144-153.024-153.984L304.32 413.568l-205.056-307.072-45.632-1.024L52.48 718.4639999999999 1.472 718.4639999999999 1.472 5.631999999999948ZM968.32 770.56L53.568 770.56c0 0-52.096 1.088-52.096-52.032L968.32 718.528 968.32 770.56Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="up" unicode="&#58905;"
+				   d="M513.6 539.2l384-384c12.8-12.8 32-12.8 44.8 0 12.801 12.8 12.801 32 0 44.8l-403.2 403.2C532.8 609.6 520 616 513.6 616c-6.4 0-19.2 0-25.599-6.4L78.399 200c-12.8-12.8-12.8-32 0-44.8s32-12.8 44.8 0L513.6 539.2z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="more-vertical" unicode="&#58993;" d="M511.998465 623.681848c40.525995 0 73.386404 35.771715 73.386404 79.892585s-32.860409 79.892585-73.386404 79.892585c-40.524972 0-73.384357-35.771715-73.384357-79.892585S471.47247 623.681848 511.998465 623.681848L511.998465 623.681848zM511.998465 463.893608c-40.524972 0-73.384357-35.772738-73.384357-79.893608 0-44.12087 32.859385-79.892585 73.384357-79.892585 40.525995 0 73.386404 35.772738 73.386404 79.892585C585.384869 428.12087 552.52446 463.893608 511.998465 463.893608L511.998465 463.893608zM511.998465 144.320199c-40.524972 0-73.384357-35.733852-73.384357-79.894631 0-44.119847 32.859385-79.893608 73.384357-79.893608 40.525995 0 73.386404 35.772738 73.386404 79.893608C585.383846 108.58634600000005 552.52446 144.320199 511.998465 144.320199L511.998465 144.320199z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="flag" unicode="&#58988;" d="M878.368178 798.272211c-11.363815 4.799306-24.470321 2.360767-33.31578-6.245238-0.36532-0.350994-37.162388-35.304064-95.163383-56.05262-75.462692-26.993794-150.763702-18.409279-223.812415 25.517163-38.347376 23.060205-81.875752 40.665165-129.376603 52.327786-37.582967 9.228175-77.742619 14.777565-119.363552 16.496719-70.805626 2.925632-121.493052-6.224772-123.615389-6.615675-14.56574-2.682086-25.140587-15.380292-25.140587-30.191626L128.58047-31.312913999999978c0-16.954137 13.745049-30.699186 30.699186-30.699186s30.699186 13.745049 30.699186 30.699186L189.978842 266.68306099999995c15.562441 5.250584 47.994084 14.447037 91.40171 17.48728 35.985586 2.51938 72.440869 0.378623 108.35073-6.363941 44.847417-8.420787 89.059362-24.102954 131.409912-46.611597 46.26879-24.591071 93.776803-41.069371 141.203976-48.977481 38.270629-6.380314 76.541257-7.219425 113.740484-2.491751 64.277956 8.16803 103.877859 30.461779 105.532545 31.406291 9.56689 5.464455 15.471366 15.637142 15.471366 26.656103L897.089565 769.958352C897.091612 782.298402 889.73711 793.470859 878.368178 798.272211zM835.69324 257.496841c-14.58416-5.755074-38.82526-13.530155-70.319555-17.225313-30.990828-3.635807-62.940494-2.676969-94.952582 2.851954-40.201607 6.943133-80.731696 21.171182-120.464629 42.289152-48.455595 25.753547-99.208513 43.61945-150.848637 53.101405-29.29214 5.378497-58.896388 8.079002-88.407516 8.079002-12.228509 0-24.443715-0.464581-36.609803-1.39272-34.879392-2.663666-63.618946-8.741082-84.111676-14.355963L189.978842 766.569162c19.971867 2.003634 50.446949 3.910053 86.392626 2.334161 58.186214-2.554172 143.250588-15.041578 218.064504-60.029188 61.32674-36.877909 119.196753-49.491181 169.691797-49.488111 42.293245 0.002047 79.416747 8.854669 109.019972 19.711947 24.269753 8.901741 45.327348 19.747763 62.544475 30.179346L835.692217 257.496841z"  horiz-adv-x="1024" />
+			<glyph glyph-name="pause" unicode="&#58961;"
+				   d="M512-128c-282.714 0-511.893 229.232-511.893 512 0 282.768 229.179 512 511.893 512 282.714 0 511.893-229.232 511.893-512 0-282.768-229.179-512-511.893-512zM512 863.996c-265.043 0-479.9-214.91-479.9-479.996 0-265.097 214.857-479.996 479.9-479.996 265.043 0 479.9 214.899 479.9 479.996 0 265.086-214.857 479.996-479.9 479.996zM639.973 181.32299999999998h-21.329c-23.558 0-42.658 19.1-42.658 42.658v319.933c0 23.558 19.1 42.658 42.658 42.658h21.329c23.558 0 42.658-19.1 42.658-42.658v-319.933c0-23.558-19.1-42.658-42.658-42.658zM405.356 181.32299999999998h-21.329c-23.558 0-42.658 19.1-42.658 42.658v319.933c0 23.558 19.1 42.658 42.658 42.658h21.329c23.558 0 42.658-19.1 42.658-42.658v-319.933c0-23.558-19.1-42.658-42.658-42.658z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="loading" unicode="&#58941;" d="M511.999488 756.654348m-70.608128 0a69 69 0 1 1 141.216255 0 69 69 0 1 1-141.216255 0ZM236.047576 639.997442m-68.561515 0a67 67 0 1 1 137.123031 0 67 67 0 1 1-137.123031 0ZM125.530506 382.12428m-62.421678 0a61 61 0 1 1 124.843356 0 61 61 0 1 1-124.843356 0ZM227.861126 100.71507499999996m-54.235229 0a53 53 0 1 1 108.470457 0 53 53 0 1 1-108.470457 0ZM514.166851-16.84438799999998m-47.192835 0a46.118 46.118 0 1 1 94.385671 0 46.118 46.118 0 1 1-94.385671 0ZM804.730553 91.450061m-33.834596 0a33.064 33.064 0 1 1 67.669192 0 33.064 33.064 0 1 1-67.669192 0ZM935.55411 383.395226m-23.969924 0a23.424 23.424 0 1 1 47.939849 0 23.424 23.424 0 1 1-47.939849 0ZM856.723717 634.80007m-17.135262 0a16.745 16.745 0 1 1 34.270525 0 16.745 16.745 0 1 1-34.270525 0Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="fonts-i" unicode="&#58948;" d="M897.948 834.255l0-64.322-128.65 0L447.674-1.9329999999999927l128.65 0 0-64.32L126.052-66.25300000000004l0 64.32 128.65 0 321.622 771.866-128.65 0L447.674 834.255 897.948 834.255z"  horiz-adv-x="1024" />
+			<glyph glyph-name="date" unicode="&#58935;"
+				   d="M933.185668 758.3591759999999l-167.054737 0 0 56.506968L732.333174 814.866145l0-56.506968L539.505447 758.3591759999999l0 56.506968-33.796734 0 0-56.506968-216.255299 0 0 56.506968-33.796734 0 0-56.506968L88.005356 758.3591759999999c-12.255115 0-22.224164-9.970072-22.224164-22.224164l0-706.60521c0-12.255115 9.970072-22.225187 22.224164-22.225187l845.179288 0c12.255115 0 22.225187 9.970072 22.225187 22.225187L955.409832 736.135012C955.409832 748.389104 945.43976 758.3591759999999 933.185668 758.3591759999999zM939.036933 29.528778999999986c0-3.226484-2.62478-5.852288-5.852288-5.852288l-845.179288 0c-3.226484 0-5.851265 2.62478-5.851265 5.852288L82.154092 736.135012c0 3.226484 2.62478 5.851265 5.851265 5.851265l167.650301 0 0-55.657624 33.796734 0 0 55.657624 216.255299 0 0-55.657624 33.796734 0 0 55.657624L732.333174 741.986277l0-55.657624 33.796734 0 0 55.657624 167.054737 0c3.226484 0 5.852288-2.62478 5.852288-5.851265L939.036933 29.528778999999986zM206.835765 608.260623l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM458.879152 608.260623l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM684.827207 608.260623l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM206.835765 433.345871l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM458.879152 433.345871l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM684.827207 433.345871l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM206.835765 257.877511l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM458.879152 257.877511l129.098263 0 0-94.008071-129.098263 0 0 94.008071ZM684.827207 257.877511l129.098263 0 0-94.008071-129.098263 0 0 94.008071Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="refresh-1" unicode="&#58982;" d="M688.146 736l-192 128v-256l192 128.001zM496.146 767.7090000000001c-231.174-8.416-416-198.479-416-431.709 0-238.587 193.413-432 432-432 233.23 0 423.293 184.826 431.709 416h-64.05c-8.377-195.817-169.778-352-367.658-352-203.241 0-368 164.759-368 368 0 197.88 156.183 359.282 352 367.658v64.051z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="rmb" unicode="&#58974;" d="M511.998465 896C229.23338 896 0.004605 666.769178 0.004605 384.001023c0-282.773272 229.227752-512.001023 511.99386-512.001023 282.769178 0 511.994883 229.227752 511.994883 512.001023C1023.994372 666.769178 794.767644 896 511.998465 896zM511.998465-91.59690499999999c-262.660188 0-475.589742 212.930577-475.589742 475.597929 0 262.663258 212.929554 475.594859 475.589742 475.594859 262.663258 0 475.590765-212.9316 475.590765-475.594859C987.590254 121.33469500000001 774.662747-91.59690499999999 511.998465-91.59690499999999zM738.742652 301.137781L544.432155 301.137781l0 69.780273 194.310497 0c17.835204 0 32.249495 14.43885 32.249495 32.220842 0 17.784038-14.414291 32.19526-32.249495 32.19526L589.7462 435.334155l149.620669 209.579249c8.916067 15.397688 3.63069 35.099403-11.82021 43.988864-15.398712 8.891508-35.097356 3.629667-44.017516-11.793604L512.187777 437.098335 340.84334 677.108664c-8.864902 15.423271-28.617781 20.685111-44.016493 11.793604-15.395642-8.889461-20.685111-28.590152-11.82021-43.988864l149.622716-209.579249L285.628808 435.334155c-17.781992 0-32.245402-14.411221-32.245402-32.19526 0-17.781992 14.46341-32.220842 32.245402-32.220842l194.310497 0 0-69.780273L285.628808 301.137781c-17.781992 0-32.245402-14.413268-32.245402-32.19526s14.46341-32.220842 32.245402-32.220842l194.310497 0 0-132.435265c0-17.780969 14.46341-32.19526 32.248472-32.19526 17.835204 0 32.245402 14.414291 32.245402 32.19526L544.433178 236.72065499999997l194.310497 0c17.835204 0 32.249495 14.43885 32.249495 32.220842S756.577856 301.137781 738.742652 301.137781"  horiz-adv-x="1024" />
+			<glyph glyph-name="layim-uploadfile" unicode="&#58909;"
+				   d="M914.7359263333336 663.0359498888887c-20.806884999999987 20.806885000000012-48.471967999999976 32.265868000000026-77.89816099999994 32.265868000000054l-352.221993 2.2737367544323206e-13-120.26099099999992 95.03035300000005-11.157106999999995 8.816806000000007-14.220886 9.769962616701378e-15L197.09333633333344 799.148976888889c-51.69538300000001 2.1316282072803006e-14-93.75224400000005-42.88778599999995-93.75224400000006-95.60442799999993l-1.5631940186722204e-13-255.13888799999998c-1.7763568394002505e-15-2.302439 0.08391099999999785-4.716417999999999 0.24968699999999489-7.196911999999999l-1.9895196601282805e-13-340.692403c-1.9539925233402755e-14-29.426192999999998 11.458982999999954-57.09127599999999 32.26586799999994-77.89816100000002 20.806884999999987-20.806885000000012 48.471967999999976-32.265868000000026 77.89816099999994-32.265868000000054l623.083981-3.410605131648481e-13c29.426192999999998-1.9539925233402755e-14 57.09127599999999 11.458982999999954 77.89816100000002 32.26586799999994 20.806885000000012 20.806884999999987 32.265868000000026 48.471967999999976 32.265868000000054 77.89816099999994L947.0028173333335 585.1377888888885C947.0017943333336 614.5639818888885 935.5428113333334 642.2280418888886 914.7359263333336 663.0359498888887zM197.09333633333372 758.2167298888891l141.88345099999998-8.526512829121202e-14L470.3948853333333 654.369569888889l366.44287999999995-2.2737367544323206e-13c38.236859-2.1316282072803006e-14 69.23178099999997-30.99492100000004 69.23178099999994-69.23178100000004L906.0695463333333 465.9195468888886 144.27334033333327 465.91954688888893 144.2733403333336 703.5445488888892C144.2733403333336 733.7361748888891 167.92296933333355 758.2167298888891 197.09333633333372 758.2167298888891zM836.8377653333331 31.28558888888881L213.75480733333322 31.28558888888915c-38.236859 2.1316282072803006e-14-69.23178099999997 30.99492100000004-69.23178099999994 69.23178100000004L144.52302633333338 424.4776928888892l761.546519-6.252776074688882e-13-2.2737367544323206e-13-323.96134599999993C906.0695463333333 62.28050988888867 875.0746243333334 31.285588888888583 836.8377653333331 31.28558888888881z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="addition" unicode="&#58916;" d="M544 768L480 768 480 416 128 416 128 352 480 352 480 0 544 0 544 352 895.936 352 895.936 416 544 416Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="home" unicode="&#59022;" d="M824.084343-40.42033900000001H232.898863c-74.604138 0-85.85232 28.334325-85.852321 49.997718l-0.584307 5.314029V447.645552h48.806589v-402.916582c0-25.547863 13.548574-36.343743 37.629015-36.343743h568.020898c25.928532 0 27.978215 6.220678 27.978215 37.84391V447.585177l48.806589 0.118704c0.022513-14.346753 0-382.76666 0-433.098999 0-38.130436-12.726859-54.765301-51.858088-54.765301l-1.76111-0.25992zM1012.470921 493.103884C849.773422 615.120868 687.101505 737.137853 524.404006 859.153814c-6.207375 4.659113-18.433838 4.659113-24.641213 0C337.077573 737.137853 174.393377 615.120868 11.696902 493.103884c-24.856108-18.635429-0.572028-61.044308 24.642236-42.13361A15995638.709915 15995638.709915 0 0 1 512.025071 807.737794c0.988514-0.715291 1.644453-1.144056 2.823302-2.037403 18.040888-13.524015 36.057217-27.036773 54.073546-40.560788 58.291614-43.718711 116.583229-87.437421 174.874843-131.143852 81.33647-61.008492 162.696476-122.015961 244.033969-183.024454 25.212218-18.911722 49.496298 23.497157 24.64019 42.132587z"  horiz-adv-x="1024" />
+			<glyph glyph-name="delete" unicode="&#58944;"
+				   d="M738.923 24.288h-451.956c-27.2 0-49.327 21.603-49.327 48.157v418.017c0 26.548 22.129 48.147 49.327 48.147h451.956c27.2 0 49.327-21.598 49.327-48.147v-418.017c0-26.555-22.129-48.157-49.327-48.157zM286.966 494.547c-4.447 0-7.168-2.644-7.168-4.084v-418.017c0-1.443 2.722-4.093 7.168-4.093h451.956c4.448 0 7.168 2.651 7.168 4.093v418.017c0 1.44-2.722 4.084-7.168 4.084h-451.956zM832.199 496.302h-640.401c-27.201 0-49.327 20.131-49.327 44.876v61.045c0 24.74 22.128 44.867 49.327 44.867h640.401c27.2 0 49.327-20.127 49.327-44.867v-61.045c0-24.744-22.129-44.876-49.327-44.876zM184.631 541.327c0.387-0.733 2.722-2.866 7.168-2.866h640.401c4.445 0 6.782 2.132 7.168 2.867v60.741c-0.393 0.736-2.733 2.863-7.168 2.863h-640.401c-4.437 0-6.776-2.128-7.168-2.863v-60.742zM600.748 605.354h-174.546c-27.201 0-49.327 20.13-49.327 44.876v10.736c0 24.74 22.128 44.867 49.327 44.867h174.546c27.2 0 49.327-20.126 49.327-44.867v-10.736c0-24.745-22.128-44.876-49.327-44.876zM419.034 650.378c0.387-0.733 2.722-2.865 7.168-2.865h174.546c4.446 0 6.782 2.131 7.168 2.865v10.432c-0.393 0.736-2.734 2.862-7.168 2.862h-174.546c-4.437 0-6.776-2.126-7.168-2.862v-10.432zM404.099 430.833h-30.097c-7.297 0-13.213-5.916-13.213-13.213v-272.34c0-7.297 5.916-13.212 13.213-13.212h30.098c7.297 0 13.212 5.916 13.212 13.212v272.341c0 7.297-5.916 13.213-13.212 13.213zM659.583 430.833h-30.097c-7.298 0-13.213-5.916-13.213-13.213v-272.34c0-7.297 5.917-13.212 13.213-13.212h30.097c7.297 0 13.212 5.916 13.212 13.212v272.341c0 7.297-5.916 13.213-13.212 13.213zM531.841 430.833h-30.098c-7.297 0-13.213-5.916-13.213-13.213v-272.34c0-7.297 5.917-13.212 13.213-13.212h30.098c7.297 0 13.212 5.916 13.212 13.212v272.341c0 7.297-5.916 13.213-13.212 13.213z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="user" unicode="&#59248;" d="M611.2 342.4c70.4 54.4 115.2 140.8 115.2 230.4 0 156.8-128 288-284.8 288s-284.8-128-284.8-284.8c0-92.8 44.8-182.4 115.2-236.8C108.8 272 0 105.60000000000002 0-80c0-9.6 9.6-19.2 19.2-19.2h848c9.6 0 19.2 9.6 19.2 19.2 0 188.8-112 355.2-275.2 422.4z m-576-396.8C44.8 115.20000000000005 156.8 268.79999999999995 320 320c6.4 3.2 12.8 9.6 12.8 16s-3.2 16-9.6 19.2c-76.8 41.6-128 131.2-128 224 0 134.4 112 246.4 246.4 246.4s246.4-112 246.4-249.6c0-89.6-51.2-176-128-220.8-6.4-3.2-9.6-9.6-9.6-19.2 0-6.4 6.4-12.8 12.8-16 160-51.2 275.2-204.8 281.6-377.6H35.2zM812.8 361.6c54.4 41.6 86.4 108.8 86.4 176 0 89.6-54.4 172.8-134.4 208-9.6 3.2-22.4 0-25.6-9.6-3.2-9.6 0-22.4 9.6-25.6 67.2-28.8 112-99.2 112-172.8 0-67.2-38.4-131.2-96-163.2-6.4-3.2-9.6-9.6-9.6-19.2 0-6.4 6.4-12.8 12.8-16 131.2-41.6 217.6-160 217.6-297.6 0-9.6 9.6-19.2 19.2-19.2s19.2 9.6 19.2 19.2c-3.2 140.8-86.4 262.4-211.2 320z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="notice" unicode="&#58983;" d="M544 798.976V864h-64v-65.024C289.536 786.304 160 658.624 160 416v-288h64V416c0 192 115.456 320 288 320 180.544 0 288-128 288-320v-288h64V416c0 242.88-122.496 370.56-320 382.976zM672 64a160 160 0 1 0-320 0h64a96 96 0 0 1 192 0h64zM64 128h896v-64H64v64z"  horiz-adv-x="1024" />
+			<glyph glyph-name="play" unicode="&#58962;"
+				   d="M512 896C229.376 896 0 666.624 0 384 0 101.37599999999998 229.376-128 512-128 794.624-128 1024 101.37599999999998 1024 384 1024 666.624 794.624 896 512 896L512 896 512 896zM512-95.23199999999997C245.76-95.23199999999997 32.768 117.75999999999999 32.768 384 32.768 650.24 245.76 863.232 512 863.232S991.232 650.24 991.232 384C991.232 117.75999999999999 778.24-95.23199999999997 512-95.23199999999997L512-95.23199999999997 512-95.23199999999997zM733.184 392.192L393.216 588.8c-4.096 4.096-8.192 4.096-12.288 0C376.832 588.8 372.736 584.704 372.736 580.608l0-393.216c0-4.096 4.096-8.192 4.096-8.192 4.096-4.096 8.192-4.096 12.288 0l344.064 196.608c4.096 4.096 4.096 4.096 4.096 8.192C741.376 388.096 737.28 392.192 733.184 392.192L733.184 392.192 733.184 392.192zM733.184 392.192"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="login-weibo" unicode="&#58997;" d="M411.270737 288.350316c-17.973895 7.504842-41.189053-0.229053-52.264421-17.542737-11.223579-17.394526-5.955368-38.103579 11.870316-46.201263 18.108632-8.232421 42.132211-0.417684 53.342316 17.421474C435.253895 260.05557899999997 429.446737 280.62989500000003 411.270737 288.350316zM455.545263 306.64757899999995c-6.885053 2.721684-15.508211-0.579368-19.550316-7.329684-3.920842-6.790737-1.751579-14.524632 5.146947-17.367579 7.019789-2.883368 16.006737 0.458105 20.048842 7.370105C465.071158 296.259368 462.551579 304.087579 455.545263 306.64757899999995zM427.52 426.684632c-115.968-11.439158-203.924211-82.216421-196.378947-158.073263 7.531789-75.910737 107.654737-128.161684 223.649684-116.749474 115.994947 11.439158 203.924211 82.216421 196.392421 158.140632C643.664842 385.859368 543.541895 438.110316 427.52 426.684632zM529.300211 247.70021099999997c-23.673263-53.355789-91.769263-81.798737-149.530947-63.232-55.754105 17.933474-79.373474 72.811789-54.945684 122.246737 23.956211 48.464842 86.352842 75.870316 141.541053 61.561263C523.506526 353.562947 552.663579 299.85684200000003 529.300211 247.70021099999997zM512 896C229.241263 896 0 666.772211 0 384c0-282.758737 229.241263-512 512-512 282.772211 0 512 229.241263 512 512C1024 666.772211 794.772211 896 512 896zM455.531789 101.02568399999996c-145.354105 0-293.941895 70.197895-293.941895 185.667368 0 60.362105 38.386526 130.182737 104.474947 196.069053 88.252632 87.929263 191.164632 127.986526 229.874526 89.397895 17.084632-17.003789 18.741895-46.457263 7.760842-81.623579-5.726316-17.690947 16.666947-7.895579 16.666947-7.936 71.343158 29.763368 133.564632 31.514947 156.321684-0.862316 12.139789-17.246316 10.954105-41.472-0.215579-69.510737-5.173895-12.921263 1.589895-14.928842 11.466105-17.879579 40.178526-12.422737 84.924632-42.455579 84.924632-95.380211C772.837053 211.36168399999997 646.090105 101.02568399999996 455.531789 101.02568399999996zM718.672842 468.197053c4.715789 14.457263 1.765053 30.962526-9.202526 43.061895-10.954105 12.072421-27.136 16.666947-42.037895 13.527579l0 0.026947c-12.463158-2.694737-24.724211 5.268211-27.392 17.664-2.667789 12.463158 5.281684 24.697263 17.744842 27.338105 30.531368 6.467368 63.595789-2.937263 85.989053-27.715368 22.447158-24.764632 28.456421-58.489263 18.849684-88.064-3.907368-12.099368-16.936421-18.728421-29.062737-14.848-12.139789 3.920842-18.782316 16.922947-14.874947 28.995368L718.672842 468.183579zM853.261474 424.865684c-0.013474-0.013474-0.013474-0.080842-0.013474-0.107789-4.567579-14.026105-19.712-21.706105-33.778526-17.165474-14.133895 4.554105-21.854316 19.590737-17.300211 33.670737l0 0.013474c13.999158 43.169684 5.12 92.429474-27.567158 128.565895-32.714105 36.122947-80.949895 49.92-125.507368 40.488421-14.484211-3.085474-28.752842 6.130526-31.838316 20.574316-3.098947 14.403368 6.144 28.631579 20.641684 31.717053l0.026947 0c62.625684 13.271579 130.519579-6.117053 176.545684-56.966737C860.483368 554.886737 872.892632 485.618526 853.261474 424.865684z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="voice" unicode="&#59016;" d="M463.380164 644.0568969999999v-0.003069c-4.550643 4.549619-10.484795 7.02295-16.913205 7.02295s-12.365632-2.473331-16.915251-7.02295c-4.549619-4.551666-7.020904-10.485819-7.020904-16.914229s2.471284-12.365632 7.020904-16.915251c60.437487-60.438511 93.675496-140.756791 93.675496-226.222301 0-85.464487-33.238009-165.783791-93.675496-226.220255-4.549619-4.551666-7.020904-10.487865-7.020904-16.915252 0-6.429433 2.471284-12.365632 7.020904-16.914228 4.550643-4.549619 10.486842-7.02295 16.915251-7.02295s12.364609 2.473331 16.913205 7.02295c35.114752 35.116799 62.317301 76.06849 80.814584 121.668037 17.904789 44.018539 26.90579 90.608647 26.90579 138.384768s-9.101285 94.26799-26.90579 138.384767c-18.59552 45.697785-45.698808 86.550215-80.814584 121.667013zM781.892405 618.929614v-0.002047c-31.358195 77.452-77.550237 146.990772-137.098471 206.539007-4.550643 4.549619-10.485819 7.02295-16.915252 7.02295-6.42841 0-12.363585-2.473331-16.914228-7.02295-9.29776-9.299807-9.29776-24.531719 0-33.82948 54.997592-54.998615 97.631598-119.195729 126.613676-190.71153 27.993564-69.044516 42.237987-142.045133 42.237987-216.924541s-14.244422-147.882072-42.237987-216.923518c-28.982078-71.517847-71.616084-135.616724-126.613676-190.711529-9.29776-9.298783-9.29776-24.531719 0-33.82948 4.551666-4.551666 10.485819-7.02295 16.914228-7.02295 6.429433 0 12.366655 2.471284 16.915252 7.02295 59.547211 59.547211 105.740276 129.085984 137.098471 206.53696 30.369681 74.78117 45.699832 153.817248 45.699831 234.928591 0 81.111343-15.331173 160.146397-45.699831 234.927567zM299.474141 427.621497c-11.670807 11.573593-27.103288 18.004049-43.522236 18.004049-16.419971 0-31.852452-6.429433-43.52326-18.004049-11.57257-11.57257-18.003026-27.104311-18.003026-43.522236 0-16.420995 6.42841-31.851429 18.003026-43.52326 11.574616-11.57257 27.103288-18.003026 43.52326-18.003025s31.852452 6.429433 43.522236 18.003025c11.573593 11.573593 18.003026 27.104311 18.003025 43.52326 0 16.419971-6.427386 31.852452-18.003025 43.522236z"  horiz-adv-x="1024" />
+			<glyph glyph-name="top" unicode="&#58884;"
+				   d="M812 153.4l-300 172.8-300-172.8 300 604L812 153.4zM264.5 209.2l247.5 142.5 247.5-142.5L512 707.5 264.5 209.2zM371.7 138.3l0-126.2-15.9 0 0 126.2-45.9 0L309.9 153l107.4 0 0-14.8L371.7 138.2zM506.6 154.5c26.6 0 43.3-3.9 50-11.7 6.7-7.8 10-27.2 10-58.3 0-33.5-3.2-54.2-9.6-62-6.4-7.8-23.2-11.8-50.4-11.8-27 0-43.8 3.9-50.3 11.7-6.5 7.8-9.8 27.9-9.8 60.3l0 9.9 0.2 13.3c0 18.7 4.2 31.5 12.6 38.4C467.8 151 483.5 154.5 506.6 154.5zM506.5 141c-22.3 0-35.3-2.5-39.1-7.4-3.8-5-5.7-22-5.7-51 0-29.1 1.9-46.1 5.7-51.1 3.8-5 16.8-7.4 39.1-7.4 22.4 0 35.4 2.5 39.2 7.4 3.8 5 5.7 22 5.7 51.1l0 9.2-0.1 13.3c0 15.6-2.6 25.4-7.8 29.6S525.9 141 506.5 141zM608.4 12.1 608.4 153l59.2 0 5.4 0c15.9 0 26.7-3.1 32.5-9.2 5.8-6.1 8.7-17.6 8.7-34.4 0-16.1-3-27.1-9-32.9-6-5.9-17.3-8.8-33.9-8.8l-6.2-0.1-40.7 0 0-55.5L608.4 12.1zM624.3 81.1l37.7 0c15.8 0 25.9 1.6 30.3 4.9 4.4 3.2 6.7 10.7 6.7 22.3 0 13.6-1.5 22.2-4.5 25.9-3 3.6-10.1 5.4-21.3 5.4l-6.1 0.1-42.7 0L624.4 81.1z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="upload-drag" unicode="&#59009;" d="M666.931 445.918l-124.245 99.362c-7.221 5.639-16.428 9.042-26.429 9.042-9.963 0-19.136-3.376-26.438-9.047l-124.215-99.391c-9.615-7.772-15.713-19.565-15.713-32.782 0-9.946 3.453-19.084 9.223-26.284 13.828-17.359 41.51-20.465 58.918-6.505l56.252 45.022v-261.12c0-23.177 18.842-41.984 41.95-41.984s41.95 18.842 41.95 41.984v261.12l56.286-45.056c17.545-13.892 45.09-10.718 58.914 6.554 5.754 7.137 9.236 16.316 9.236 26.308 0 13.211-6.086 24.999-15.609 32.716zM235.827 142.95000000000005c-85.026 0-152.542 31.71-188.655 89.839-36.113 58.095-34.406 134.724 4.335 195.174 37.342 58.334 102.366 92.023 178.995 94.549-19.866 130.492 42.667 202.377 84.753 235.008 90.112 69.871 234.257 79.053 335.565 21.367 58.982-33.587 94.037-85.675 100.454-146.978 113.937 18.978 177.562-33.826 206.814-69.905 63.317-78.131 71.27-204.39 18.91-300.203-46.524-85.06-130.389-127.317-229.82-116.497-18.739 2.116-32.222 18.978-30.174 37.683s19.285 32.017 37.683 30.174c96.7-10.718 143.258 46.353 162.406 81.408 39.014 71.373 33.826 167.868-12.049 224.495-38.673 47.684-100.352 60.518-178.483 37.069-2.94-0.916-6.319-1.443-9.822-1.443-18.851 0-34.133 15.282-34.133 34.133 0 1.495 0.096 2.969 0.283 4.414 8.549 68.506-31.114 106.53-65.93 126.362-77.346 44.066-191.522 37.035-259.925-15.974-58.266-45.193-75.947-117.18-51.132-208.179 0.761-2.688 1.198-5.775 1.198-8.963 0-18.851-15.282-34.133-34.133-34.133-1.481 0-2.94 0.094-4.371 0.277-70.759 8.822-128.991-13.535-159.677-61.424-24.61-38.434-26.146-86.46-3.823-122.368 27.716-44.578 86.05-64.375 164.147-55.637 1.132 0.133 2.443 0.209 3.772 0.209 18.853 0 34.138-15.284 34.138-34.138 0-17.525-13.205-31.965-30.208-33.914-14.153-1.653-27.874-2.404-41.118-2.404z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="login-qq" unicode="&#58998;" d="M512 896C229.227789 896 0 666.772211 0 384c0-282.745263 229.227789-512 512-512s512 229.254737 512 512C1024 666.772211 794.772211 896 512 896L512 896zM738.856421 258.93726300000003c0 0-16.208842-44.220632-45.945263-83.941053 0 0 53.126737-18.054737 48.64-64.983579 0 0 1.778526-52.345263-113.461895-48.734316 0 0-81.071158 6.319158-105.377684 40.609684l-21.423158 0c-24.306526-34.304-105.350737-40.609684-105.350737-40.609684-115.280842-3.610947-113.475368 48.734316-113.475368 48.734316-4.500211 46.928842 48.626526 64.983579 48.626526 64.983579-29.709474 39.720421-45.918316 83.941053-45.918316 83.941053-72.057263-116.439579-64.848842 16.249263-64.848842 16.249263 13.527579 78.524632 70.238316 129.967158 70.238316 129.967158-8.111158 71.316211 21.611789 83.941053 21.611789 83.941053C318.410105 709.712842 508.025263 705.859368 512 705.751579c3.988211 0.107789 193.576421 3.961263 199.828211-216.643368 0 0 29.709474-12.638316 21.611789-83.941053 0 0 56.737684-51.442526 70.238316-129.967158l0 0C803.678316 275.18652599999996 810.873263 142.49768400000005 738.856421 258.93726300000003L738.856421 258.93726300000003zM738.856421 258.93726300000003"  horiz-adv-x="1024" />
+			<glyph glyph-name="friends" unicode="&#58898;"
+				   d="M672.02974 765.933689c7.66047-32.266891 8.420787-62.237483 7.713682-95.365998-0.283456-12.778024-7.291057-71.832002-5.3918-89.926102 1.561565-14.936177 5.132904-16.128329 10.759041-28.436656 9.803273-21.422915 6.51846-50.970882 2.76088-72.566736-2.056845-11.816117-6.404873-28.64541-13.017478-38.287001-7.291057-10.645454-21.864984-10.711969-28.319999-23.12365-9.29469-17.848507-4.045129-42.930765-9.903557-62.21497-6.65763-21.883403-23.599488-23.420409-24.877597-52.040237 8.316409-1.243317 16.59598-2.479471 24.877597-3.722788 8.316409-18.498306 23.533996-55.70265 39.08518-66.900689 13.024641-3.728928 26.048259-7.448646 39.07904-11.156084 45.641503-19.593244 96.365768-43.032072 142.108578-63.215764 41.656749-18.381649 91.51325-24.937972 106.575294-70.629617 0-31.026644 2.795673-104.309694 2.025123-144.978952L58.155515-56.631556000000046c-0.757247 40.669258 2.029216 113.952308 2.029216 144.978952 15.065114 45.691645 64.928778 52.247968 106.578364 70.629617 45.74281 20.182668 96.467075 43.62252 142.098345 63.215764 13.027711 3.707438 26.054399 7.427156 39.08211 11.156084 15.554254 11.197016 30.78105 48.402383 39.09439 66.900689l18.492166 4.710278c-4.196579 24.429389-18.658965 26.322505-24.682146 43.62559-2.356674 26.013467-4.729721 52.052516-7.095605 78.079286 0.107447-1.234107-17.006326 3.246951-19.252483 4.716418-24.130583 15.838733-24.618701 80.075757-26.941606 106.793258-1.063215 12.222369 15.163351 22.240537 10.654664 44.62536-26.433022 131.125433 11.437493 219.776496 71.330582 240.123916 41.564651 17.633612 119.167077 50.323129 191.563944 3.716648l17.971303-17.428951 29.061896-5.237281C662.71663 795.172617 672.02974 765.933689 672.02974 765.933689z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="snowflake" unicode="&#59057;" d="M480.695-64h63.725V59.291000000000054l68.854-68.242 44.945 44.546-113.798 112.79v180.02l177.271-102.44 41.67-155.652 60.725 16.284-25.398 94.872 85.259-49.266 31.87 55.246-84.726 48.961 94.497 25.343-16.495 61.622-156.068-41.855-176.934 102.245 177.667 102.667 155.513-41.709 16.274 60.793-94.78 25.418 85.255 49.264-31.869 55.247-84.733-48.965 25.326 94.594-61.557 16.51-41.817-156.206-176.948-102.251V644.461l113.849 113.951-44.459 44.496-69.392-69.454V832h-63.725v-97.935l-69.188 69.249-45.068-45.107 114.256-114.355V438.89l-156.557 90.469L283.45 684.39l-60.188-16.458 24.84-94.632-107.544 62.145-31.868-55.247 106.667-61.639-93.463-25.557 16.074-61.237 154.482 42.243 156.169-90.243-156.138-90.226-154.485 42.243-15.855-60.409 94.289-25.784-107.534-62.14 31.868-55.247 106.672 61.642-24.621-93.801 61.012-16.685 40.69 155.028 156.179 90.25v-180.455l-113.801-112.79 44.338-43.944 69.463 68.845V-64z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="file-b" unicode="&#58965;" d="M790.08 177.91999999999996l-138.112-119.232V177.91999999999996h138.112zM198.848 763.008h627.328v-516.16H617.088a34.56 34.56 0 0 1-34.816-34.432v-206.528H198.848V763.008z m662.208 68.8H164.032a34.56 34.56 0 0 1-34.816-34.432v-825.92a34.56 34.56 0 0 1 34.816-34.432h453.056l278.784 240.896V797.376a34.56 34.56 0 0 1-34.816 34.432z"  horiz-adv-x="1024" />
+			<glyph glyph-name="refresh-3" unicode="&#59818;"
+				   d="M820.376904 697.14807C740.637816 774.519228 631.884926 822.157201 511.999488 822.157201c-244.621347 0-442.925808-198.305485-442.925808-442.926832 0-244.6193 198.304462-442.925808 442.925808-442.925808 206.075449 0 379.271046 140.739395 428.740738 331.337337L822.859445 267.64189899999997c-45.759183-127.45381-167.656441-218.623229-310.859957-218.623229-182.371584 0-330.210677 147.842163-330.210677 330.210677 0 182.371584 147.840116 330.2117 330.210677 330.2117 88.762603 0 169.32443-35.035958 228.655723-92.015693L557.051567 433.822732l280.641725 0 113.880677 0 3.351328 0L954.925297 831.695438 820.376904 697.14807z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="template" unicode="&#58979;" d="M734 172.89999999999998v82.8h-59.9v-37l-35.7-9.7 15.7-57.8zM674.1 419.3H734v-81.8h-59.9zM734 600.2l-95.6-26 15.7-57.8 20 5.4v-20.7H734zM866.1 131.29999999999995v-37l-35.7-9.7 7.9-28.9 7.8-28.9 79.9 21.7v82.8h-29.9zM740.9 60.299999999999955L651.4 36l7.9-28.9 7.8-29 89.5 24.4-7.8 28.9zM740.9 781.7l-89.5-24.3 7.9-28.9 7.8-28.9 89.5 24.3-7.8 28.9zM830.4 806l7.9-28.9 7.8-28.9 20 5.5v-20.8H926V832zM866.1 612.6v-120.3H926V612.6h-29.9zM866.1 371.9v-120.3H926V371.9h-29.9zM541.9 665.6l35.7 9.7-7.8 28.9-7.8 28.9-50-13.6L98 832v-783.5l384.1-104.3L512-64l29.9 8.1 35.7 9.7-7.8 28.9-7.8 28.9-20-5.4V120.79999999999995l35.7 9.7-15.7 57.8-20-5.4V486l35.7 9.7-15.7 57.8-20-5.4V665.6z m-59.8-659.4l-324.2 88.1V753.7l324.2-88.1V548l-192 52.2v-427.3l192-52.2v-114.5z m0 360.9V182.79999999999995l-132.2 35.9V521.8l132.2-35.9v-118.8z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="transfer" unicode="&#59025;" d="M320 768H128c-35.2 0-64-28.8-64-64v-640c0-35.2 28.8-64 64-64h192c35.2 0 64 28.8 64 64V704c0 35.2-28.8 64-64 64z m0-672c0-16-16-32-32-32H160c-16 0-32 16-32 32V672c0 16 16 32 32 32h128c16 0 32-16 32-32v-576z m256 544h-64c-19.2 0-32-12.8-32-32s16-32 32-32h64c19.2 0 32 12.8 32 32s-16 32-32 32z m-64-448h-64c-19.2 0-32-12.8-32-32s16-32 32-32h64c19.2 0 32 12.8 32 32s-16 32-32 32z m384 576H704c-35.2 0-64-28.8-64-64v-640c0-35.2 28.8-64 64-64h192c35.2 0 64 28.8 64 64V704c0 35.2-28.8 64-64 64z m0-672c0-16-16-32-32-32H736c-16 0-32 16-32 32V672c0 16 16 32 32 32h128c16 0 32-16 32-32v-576z"  horiz-adv-x="1024" />
+			<glyph glyph-name="ok" unicode="&#58885;"
+				   d="M960 640L915.2 684.8 371.2 172.79999999999995 108.8 454.4 64 409.6 358.4 83.20000000000005 364.8 89.60000000000002 371.2 83.20000000000005Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="auz" unicode="&#58994;" d="M324.266667 435.2c-17.066667 17.066667-39.822222 17.066667-51.2 0-17.066667-17.066667-17.066667-39.822222 0-51.2l153.6-159.288889c5.688889-5.688889 17.066667-11.377778 28.444444-11.377778s17.066667 5.688889 28.444445 11.377778l295.822222 290.133333c17.066667 17.066667 17.066667 39.822222 0 51.2-17.066667 17.066667-39.822222 17.066667-51.2 0L455.111111 304.355556 324.266667 435.2zM927.288889 753.777778L523.377778 896h-22.755556L96.711111 753.777778c-17.066667-5.688889-28.444444-17.066667-28.444444-34.133334v-432.355555c11.377778-250.311111 409.6-409.6 426.666666-415.288889h22.755556c17.066667 5.688889 415.288889 159.288889 426.666667 415.288889V719.644444c11.377778 17.066667 0 28.444444-17.066667 34.133334z m-45.511111-460.8c-5.688889-182.044444-301.511111-312.888889-369.777778-341.333334-113.777778 45.511111-358.4 182.044444-369.777778 341.333334v398.222222L512 822.044444l369.777778-125.155555v-403.911111z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="console" unicode="&#58981;" d="M30.552 104.72699999999998c4.654-16.29 23.272-23.272 37.236-18.618 16.291 4.655 23.273 23.273 18.618 37.236C16.588 314.182 84.08 521.31 237.68 640c11.636 9.31 23.273 16.29 37.236 25.6 25.6 16.29 53.528 30.255 83.782 39.564 58.182 20.945 118.691 30.254 176.873 27.927h25.6c6.982 0 11.636 0 18.618-2.327 30.255-4.655 58.182-11.637 88.436-23.273 235.055-86.11 356.073-346.764 269.964-581.818-4.654-16.291 2.327-32.582 18.618-37.237 16.291-4.654 32.582 2.328 37.237 18.619 41.89 116.363 39.563 239.709 0 349.09h2.327C921.897 656.2909999999999 738.043 784.2909999999999 537.897 793.6h-48.873c-200.145-9.31-384-137.31-458.472-337.455-39.564-109.381-41.891-232.727 0-351.418z m707.49 386.328a29.498 29.498 0 0 1-41.89 0L521.606 316.509c-4.654 2.327-9.309 2.327-13.963 2.327-32.582 0-58.182-25.6-58.182-58.181s25.6-58.182 58.182-58.182 58.181 25.6 58.181 58.182c0 4.654 0 9.309-2.327 16.29l174.546 174.546c11.636 11.636 11.636 30.254 0 39.564z m228.073-458.473H58.48c-16.29 0-30.255-13.964-30.255-30.255 0-16.29 13.964-30.254 30.255-30.254h907.636c16.291 0 30.255 13.963 30.255 30.254 0 16.291-13.964 30.255-30.255 30.255z"  horiz-adv-x="1024" />
+			<glyph glyph-name="layer" unicode="&#58936;"
+				   d="M96.089 724.318l0-684.236 831.822 0L927.911 724.318 96.089 724.318zM884.178 84.457L140.464 84.457 140.464 489.559l743.714 0L884.178 84.457z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="app" unicode="&#58963;" d="M432.022 818.946h-376.324c-6.627 0-12.078-5.45-12.078-12.078v-376.324c0-6.627 5.45-12.078 12.078-12.078h376.324c6.627 0 12.078 5.45 12.078 12.078v376.473c0 6.627-5.45 11.93-12.078 11.93zM391.517 471.196h-295.169v295.169h295.021v-295.169zM976.847 635.717l-211.95 211.95c-8.837 8.837-23.124 8.837-31.963 0l-211.95-211.95c-8.837-8.837-8.837-23.124 0-31.963l211.95-212.098c8.837-8.837 23.124-8.837 31.963 0l211.95 211.95c8.837 8.987 8.837 23.271 0 32.109zM432.022 313.45000000000005h-376.324c-6.627 0-12.078-5.45-12.078-12.078v-376.324c0-6.627 5.45-12.078 12.078-12.078h376.324c6.627 0 12.078 5.45 12.078 12.078v376.473c0 6.627-5.45 11.93-12.078 11.93zM391.517-34.15499999999997h-295.169v295.021h295.021v-295.021zM932.511 313.45000000000005h-376.324c-6.627 0-12.078-5.45-12.078-12.078v-376.324c0-6.627 5.45-12.078 12.078-12.078h376.324c6.627 0 12.078 5.45 12.078 12.078v376.473c0 6.627-5.45 11.93-12.078 11.93zM891.859-34.15499999999997h-295.021v295.021h295.021v-295.021z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="prev" unicode="&#58970;" d="M62.573 384.103l423.401 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.751-18.976-68.727 0l-39.753 39.753 0.269 0.246-385.655 385.661zM451.365 384.103l423.407 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.757-18.977-68.727 0l-39.762 39.754 0.273 0.249-385.662 385.661zM451.365 384.103z"  horiz-adv-x="1024" />
+			<glyph glyph-name="face-smile-fine" unicode="&#58892;"
+				   d="M511.558443 852.9315573333333c-246.787686 0-447.597201-200.783932-447.597201-447.598224 0-246.815315 200.783932-447.598224 447.597201-447.598224 246.841921 0 447.64939 200.782909 447.64939 447.598224C959.207833 652.1476253333334 758.400365 852.9315573333333 511.558443 852.9315573333333zM511.558443-4.962310666666667c-226.247884 0-410.295644 184.046736-410.295644 410.295644 0 226.249931 184.072319 410.296667 410.295644 410.296667 226.27449 0 410.346809-184.046736 410.346809-410.296667C921.905252 179.08442633333334 737.832933-4.962310666666667 511.558443-4.962310666666667zM724.38055 303.5726953333334c-9.698896 3.457752-20.366863-1.566682-23.848151-11.264555-28.500101-79.45461-104.372116-132.844587-188.82353-132.844587-84.798315 0-160.770614 53.689806-189.070146 133.590578-3.432169 9.723455-14.075577 14.772448-23.823592 11.364839-9.699919-3.432169-14.797008-14.100136-11.364839-23.823592 33.547047-94.77248 123.668601-158.434405 224.234017-158.434405 100.142791 0 190.140525 63.314001 223.935212 157.564595C739.125369 289.3978573333334 734.102982 300.0903843333334 724.38055 303.5726953333334zM302.49494 515.3479593333334c0-24.653493 19.98517-44.638663 44.638663-44.638663 24.653493 0 44.638663 19.98517 44.638663 44.638663s-19.98517 44.63764-44.638663 44.63764C322.48011 559.9855993333333 302.49494 540.0014523333333 302.49494 515.3479593333334L302.49494 515.3479593333334zM631.398856 515.3479593333334c0-24.653493 19.98517-44.638663 44.63764-44.638663 24.653493 0 44.63764 19.98517 44.63764 44.638663s-19.984147 44.63764-44.63764 44.63764C651.384026 559.9855993333333 631.398856 540.0014523333333 631.398856 515.3479593333334L631.398856 515.3479593333334z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="website" unicode="&#59310;" d="M777.073418 147.443038c-30.460759 21.387342-40.83038 40.182278-76.47595 53.792405 25.275949 60.273418 40.182278 83.605063 42.126583 154.896203H887.898734c-3.888608-99.159494-45.367089-143.878481-110.825316-208.688608zM136.101266 356.13164600000005h167.210126c1.944304-71.291139 16.850633-94.622785 42.126583-154.896203-34.997468-13.610127-68.050633-31.756962-98.511393-53.792405C181.468354 212.25316499999997 139.989873 256.97215200000005 136.101266 356.13164600000005z m103.048101 259.888607c29.164557-23.979747 61.56962-42.774684 96.567089-57.681012-19.443038-53.792405-30.460759-90.734177-31.756962-152.951899H136.101266c3.240506 90.734177 46.663291 147.767089 103.048101 210.632911z m309.144304-209.98481V523.989873c47.311392 1.296203 71.291139 10.36962 114.065823 25.27595 18.146835-51.2 28.516456-84.901266 30.460759-143.23038H548.293671z m104.344304-195.078481c-40.182278 12.962025-60.273418 20.091139-104.344304 21.387342V356.13164600000005h144.526582c-1.944304-68.050633-16.202532-88.141772-40.182278-145.174684z m36.941772-57.681013c31.756962-12.313924 39.534177-28.516456 66.75443-47.311392-51.848101-44.718987-114.713924-73.883544-182.116455-84.901266 36.941772 37.589873 90.734177 82.308861 115.362025 132.212658z m-163.321519-137.397468l22.035443 165.913924c40.182278-1.296203 56.38481-7.777215 92.678481-18.794937-27.220253-56.38481-66.106329-106.288608-113.417722-147.118987h-1.296202z m-75.827848 5.18481c-67.402532 11.017722-130.268354 40.83038-182.764557 84.901266 27.868354 19.443038 57.681013 34.997468 88.789873 47.311392 23.331646-48.607595 55.088608-93.326582 93.974684-132.212658z m47.311392 335.068355v-123.787342c-44.070886-1.296203-64.162025-8.425316-104.344304-21.387342-23.979747 57.681013-38.237975 77.124051-40.182278 145.174684h144.526582zM383.675949 549.265823c42.774684-14.906329 66.75443-23.331646 114.065823-25.27595v-117.95443H353.21519c1.944304 58.329114 12.313924 92.03038 30.460759 143.23038z m-37.589873 57.032911c-31.756962 12.962025-60.921519 30.460759-88.141772 51.848101 53.792405 51.848101 115.362025 91.382278 192.486076 104.344304-44.718987-44.718987-80.364557-97.863291-104.344304-156.192405z m151.655696 161.377215v-193.782278c-44.070886 1.296203-64.162025 9.073418-103.696202 22.683544 29.164557 68.698734 49.903797 127.027848 102.4 171.098734h1.296202z m75.827848-4.536708c77.772152-13.610127 149.711392-49.903797 206.744304-104.344304-29.164557-22.035443-46.01519-37.589873-80.364557-51.848102-25.275949 59.625316-82.956962 112.76962-126.379747 156.192406z m-46.01519 4.536708c54.440506-46.01519 97.21519-104.992405 124.435443-171.098734-39.534177-13.610127-59.625316-21.387342-103.696202-22.683544l-22.035443 193.782278h1.296202z m-31.10886-751.149367c-46.663291 38.886076-62.865823 88.789873-91.382279 147.118988 36.293671 11.665823 53.144304 17.498734 93.326582 18.794936v-165.913924h-1.944303zM887.898734 406.035443h-145.174683c-1.296203 61.56962-12.313924 98.511392-31.756962 152.303798 37.589873 15.55443 57.032911 33.053165 88.789873 57.681012 56.38481-62.865823 84.901266-119.898734 88.141772-209.98481z m-375.898734 427.746835c-244.334177 0-442.005063-197.670886-442.005063-442.005063S267.665823-50.227847999999994 512-50.227847999999994s442.005063 197.670886 442.005063 442.005063S756.334177 833.782278 512 833.782278z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="next" unicode="&#58971;" d="M948.066926 382.958838l-411.990051-412.24426c-18.47333-18.47333-48.417689-18.47333-66.875207 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L814.691135 383.088983 467.512212 730.269123c-18.466032 18.458735-18.466032 48.405526 0 66.873991 18.468465 18.464816 48.410391 18.464816 66.872774 0l38.682336-38.682336-0.261507-0.239614 375.259894-375.265975v0.003649m-378.312834 0L157.756743-29.28542200000004c-18.47333-18.47333-48.415256-18.47333-66.872775 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L436.369787 383.088983 89.19208 730.269123c-18.4636 18.458735-18.4636 48.405526 0 66.873991 18.470898 18.464816 48.415256 18.464816 66.872774 0l38.692067-38.682336-0.266372-0.239614 375.267191-375.265975-0.004865 0.003649m0 0z"  horiz-adv-x="1024" />
+			<glyph glyph-name="dollar" unicode="&#58969;"
+				   d="M517.565-65.45399999999995c-244.263 0-442.299 198.014-442.299 442.299s198.014 442.299 442.299 442.299c244.263 0 442.299-198.014 442.299-442.299 0-244.263-198.014-442.299-442.299-442.299zM517.565 863.383c-268.751 0-486.564-217.834-486.564-486.564s217.834-486.564 486.564-486.564c268.751 0 486.564 217.834 486.564 486.564 0 268.751-217.834 486.564-486.564 486.564zM497.036 425.349c-18.443 6.957-33.605 16.314-45.238 27.617-11.581 11.306-20.059 23.465-25.468 36.742-5.423 13.177-8.178 26.235-8.178 39.172-0.004 18.194 2.564 34.357 7.846 48.514 5.327 14.231 13.748 25.85 25.468 35.02 11.581 9.167 26.798 15.204 45.482 18.295v-205.52zM534.455 356.13199999999995c16.937-6.756 32.277-14.997 46.035-24.855 13.748-9.678 24.613-21.601 32.929-35.57 8.204-13.909 12.436-30.734 12.622-50.307 0-14.231-1.859-27.907-5.785-40.833-3.858-12.866-9.542-24.531-17.271-34.804-7.691-10.211-17.271-18.443-28.678-24.613-11.328-6.318-24.613-9.678-39.76-10.341v221.377zM534.455 94.18299999999999c29.037 3.318 53.978 11.306 74.785 24.134 20.985 12.866 37.018 30.15 48.281 51.734 11.125 21.535 16.876 46.832 16.937 76.196 0 16.08-1.67 30.377-5.033 42.985-3.318 12.622-8.204 24.15-14.836 34.357-6.739 10.341-14.836 20.189-24.613 29.326-8.853 8.204-19.107 15.957-30.659 23.041-11.328 7.197-22.836 13.706-34.281 19.261-11.581 5.694-21.601 10.516-30.659 14.231v221.377c14.527-3.318 26.662-8.594 36.62-16.192 9.859-7.395 17.766-16.192 23.776-26.384 5.941-10.211 10.341-20.985 12.972-32.345 2.666-11.328 4.026-22.836 3.858-34.097h46.155c0.004 16.314-1.566 32.345-5.327 48.281-3.543 15.957-9.938 30.909-19.107 44.969-8.996 13.909-21.601 26.235-37.684 36.742-16.192 10.521-36.62 18.295-61.318 23.562v49.426h-37.441v-53.316c-23.465-2.624-42.985-8.178-58.595-16.314-15.633-8.204-28.279-18.194-37.684-29.562-9.441-11.328-16.523-23.302-21.226-35.317-4.59-12.062-7.846-23.302-9.316-33.326-1.566-10.211-2.256-18.194-2.115-24.029 0.004-21.601 3.452-40.612 9.863-57.238 6.479-16.523 15.58-30.909 27.178-43.441 11.659-12.436 25.361-23.562 40.833-33.204 15.633-9.678 32.649-18.443 51.098-26.235v-237.329c-18.194 1.984-33.326 7.197-45.094 15.633-11.97 8.369-21.074 19.107-27.714 31.902-6.739 12.972-11.011 27.178-13.363 42.701-2.256 15.58-3.034 31.313-2.115 47.367h-47.803c-1.183-23.776 0.397-46.035 5.033-66.676s12.357-39.03 23.376-55.019c10.892-16.08 25.361-29.037 43.142-39.03 17.847-9.863 39.472-16.08 64.586-18.295v-65.283h37.441v65.283z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="component" unicode="&#59479;" d="M917.376 652.544L500.8 891.2a34.304 34.304 0 0 1-34.176 0L50.112 652.48a33.92 33.92 0 0 1-17.088-29.376v-477.44c0-12.16 6.528-23.296 17.088-29.44l416.512-238.72a35.136 35.136 0 0 1 34.176 0l416.576 238.72a33.92 33.92 0 0 1 17.088 29.44v477.44a33.92 33.92 0 0 1-17.088 29.44z m-51.264-487.36l-382.4-219.136-382.336 219.136V603.52l382.336 219.136 382.4-219.136v-438.272zM198.784 535.488a33.792 33.792 0 0 1 12.544-46.4l237.824-136.32V83.20000000000005c0-18.816 15.232-33.92 34.176-33.92a33.92 33.92 0 0 1 34.176 33.92V352.384l238.656 136.832a33.856 33.856 0 0 1 12.544 46.4 34.368 34.368 0 0 1-46.72 12.416L483.712 411.52 245.504 548.0319999999999a34.432 34.432 0 0 1-46.72-12.544z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="more" unicode="&#58975;" d="M224 288c-52.928 0-96 43.072-96 96s43.072 96 96 96 96-43.072 96-96-43.072-96-96-96z m288 0c-52.928 0-96 43.072-96 96s43.072 96 96 96 96-43.072 96-96-43.072-96-96-96z m288 0c-52.928 0-96 43.072-96 96s43.072 96 96 96 96-43.072 96-96-43.072-96-96-96z"  horiz-adv-x="1024" />
+			<glyph glyph-name="group" unicode="&#58899;"
+				   d="M1383.17753-39.75895700000001L1380.048488-13.938771999999972 1373.005994 17.35852699999998 1362.834458 47.090445000000045 1348.751189 77.605053 1334.667921 101.07716700000003 1315.107539 123.76659099999995 1293.199086 141.76331100000004 1262.684478 158.97562200000004 1240.777745 169.147158 1211.828518 176.18965200000002 1182.87757 183.23042599999997 1157.840075 192.61927200000002 1126.544497 207.48523 1101.507002 219.22214799999995 1070.992393 233.30541600000004 1047.52028 246.607714 1047.52028 329.54366300000004 1057.690095 341.280581 1067.080661 356.92751 1074.121435 372.57615899999996 1079.598549 392.136541 1085.858352 415.610375 1088.204704 433.605376 1091.595216 432.822685 1098.37624 433.866846 1103.593603 438.040048 1109.330466 447.428894 1112.982449 458.3814 1115.06905 471.943448 1117.676871 496.459723 1118.719312 517.324016 1117.676871 535.059266 1114.024889 546.0134929999999 1106.722645 550.186695 1102.549442 549.142535 1106.201425 572.614649 1109.330466 600.782906 1110.374627 626.341621 1109.851687 646.684693 1106.722645 665.4623839999999 1100.984061 683.718855 1093.160597 700.409945 1082.20637 719.189356 1069.688483 734.838006 1055.082274 746.8346730000001 1036.304583 758.83134 1012.832469 769.785566 993.010617 775.00121 969.017283 779.174412 945.543448 779.695632 921.550114 775.52243 898.599221 767.698965 878.256148 759.35256 860.520898 747.877113 844.089558 733.2726250000001 828.440908 716.058594 814.35764 695.715522 804.186104 673.8087889999999 797.92802 648.771294 797.14533 616.691305 800.274372 586.959387 804.186104 548.621314 795.579949 548.621314 790.102836 541.57882 788.539175 529.060933 790.102836 499.329015 794.014568 464.902674 797.14533 447.688644 802.622443 438.299798 812.793979 432.822685 819.052063 433.605376 822.965515 406.221529 826.877248 389.790189 833.137051 371.79346899999996 841.743207 353.79846799999996 851.914743 339.7152 859.738207 329.54366300000004 858.955517 245.04233299999999 867.267518 242.13003600000002 878.734364 238.975192 891.063029 234.389141 902.817148 229.80137100000002 913.712888 225.78814699999998 923.459535 220.91310299999998 935.215374 216.03977999999995 948.116866 208.58615799999995 961.018358 201.13081599999998 971.625104 193.38992099999996 985.386695 183.06872699999997 997.142535 172.174708 1008.323827 158.41311700000006 1020.077947 143.21860000000004 1032.549389 125.72933699999999 1043.300632 105.086951 1052.476173 82.72436500000003 1060.502621 62.08197800000005 1066.093267 42.72974099999999 1069.963715 22.517404000000056 1073.834162-0.27523199999995995 1076.41446-26.93831499999999 1076.84451-45.000403000000006 1075.984411-61.12726799999996 1072.328988-73.59870999999998 1065.377664-87.28805299999999 1057.277248-96.391345 1042.440532-103.91721500000006 1351.099261-103.91721500000006 1365.182529-96.87472100000002 1376.136756-85.92221500000005 1383.17753-74.18529799999999 1384.742911-59.319339000000014ZM438.650719 816.389195L421.44873 797.467007 405.96694 775.104421 394.785647 751.021637 387.904851 723.498455 387.044752 688.234377 390.48515 655.550598 394.785647 613.4057250000001 385.324553 613.4057250000001 379.303857 605.6648299999999 377.583658 591.903239 379.303857 559.21946 383.604354 521.375084 387.044752 502.452896 393.065448 492.131703 404.246741 486.111007 411.127537 486.971106 415.428034 456.867625 419.728531 438.805537 426.609327 419.02325 436.070421 399.240962 447.251713 383.75917200000004 455.852708 372.57787900000005 454.992609 279.687139 440.370918 270.226045 405.96694 253.88415499999996 370.702863 238.40236500000003 342.319581 224.64077399999996 319.956995 215.17967999999996 295.014111 207.43878500000005 269.211128 202.278188 244.268244 196.25749199999996 218.46526 185.07619899999997 194.382475 173.034807 172.879989 157.55301699999995 148.797205 133.470232 131.595216 108.52734799999996 118.693724 84.44456400000001 108.372531 58.641579999999976 98.051337 29.398198999999977 92.89074 6.175514000000021 88.590243-13.606772999999976 86.009945-36.829458000000045 86.009945-57.47184500000003 89.450343-78.11423200000002 99.771536-91.87582299999997 115.253326-102.19701699999996 135.035613-103.91721500000006 995.995162-103.91721500000006 1011.476952-96.17632000000003 1023.518344-84.13492799999995 1031.259239-71.23343599999998 1032.979438-54.891546999999946 1031.259239-33.38906099999997 1027.818842-5.005778999999961 1020.077947 29.398198999999977 1008.896654 62.08197800000005 993.414864 95.625857 977.933074 121.42884000000004 956.430587 146.37172399999997 932.347803 166.15401199999997 898.803924 185.07619899999997 874.72114 196.25749199999996 842.89746 203.99838699999998 811.07378 211.739282 783.550598 222.060476 749.14662 238.40236500000003 721.623438 251.303857 688.079559 266.78564700000004 662.276576 281.407338 662.276576 372.57787900000005 673.457869 385.479371 683.779062 402.68136 691.519957 419.883349 697.540653 441.385835 704.421449 467.188819 707.001747 486.971106 710.729418 486.111007 718.18304 487.258379 723.916463 491.84443 730.224432 502.165623 734.237656 514.207015 736.532402 529.1159789999999 739.398253 556.066335 740.545626 579.001747 739.398253 598.496761 735.385029 610.538153 727.356861 615.1259239999999 722.77081 613.9785509999999 726.784034 639.7815350000001 730.224432 670.7451149999999 731.371805 698.842844 730.797258 721.205429 727.356861 741.847816 721.050611 761.915656 712.449617 780.265018 700.408225 800.907405 686.646634 818.109394 670.590297 831.2981589999999 649.94791 844.485204 624.144927 856.526596 602.356888 862.261739 575.979358 866.847789 550.176374 867.422336 523.800564 862.834565 498.570407 854.233571 476.207822 845.05975 456.712807 832.443811Z"
+				   horiz-adv-x="1449"/>
 
-    
-    <glyph glyph-name="login-wechat" unicode="&#58999;" d="M516.464646 896C233.714646 896 4.464646 666.75 4.464646 384S233.714646-128 516.464646-128s512 229.25 512 512S799.214646 896 516.464646 896z m-74-523.375c-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.5-1.875-0.25-0.75-0.5-1.125-0.5-1.875-0.25-0.75-0.5-1.125-0.5-1.875-0.25-0.75-0.25-1.125-0.5-1.875s-0.5-1.125-0.5-1.875c-0.25-0.75-0.25-1.125-0.5-1.875s-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875c0-0.75-0.25-1.125-0.25-1.875s-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875 0-1.125-0.25-1.875c0-0.75-0.25-1.125-0.25-1.875s0-1.125-0.25-1.875c0-0.75 0-1.125-0.25-1.875 0-0.75 0-1.125-0.25-1.875v-22.5c0-0.75 0-1.125 0.25-1.875 0-0.75 0-1.125 0.25-1.875 0-0.75 0-1.125 0.25-1.875 0-0.75 0-1.125 0.25-1.875 0-0.75 0.25-1.125 0.25-1.875s0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875l0.25-0.875c-4.25-0.25-8.625-0.75-12.75-0.75-3.75-0.25-7.25-0.25-11-0.25-3.5 0-7 0-10.5 0.25-7.25 0.25-14 0.875-20.75 1.875-4.25 0.5-8.125 1.125-12.375 1.875-3.5 0.5-6.75 1.125-10.25 1.875-3 0.5-6.25 1.125-9.25 1.875-3 0.75-5.875 1.125-8.875 1.875-2.75 0.75-5.875 1.125-8.875 1.875-2.75 0.5-5.625 1.125-8.375 1.625l-3.25-1.625-3.75-1.875-4 1.375-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-2.75-1.375-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-2.5-1.375 0.5 1.375 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.5 1.125c-0.5 0.25-0.75 0.5-1.125 0.75-0.875 0.75-1.625 1.125-2.5 1.875s-1.625 1.125-2.5 1.875-1.625 1.125-2.5 1.875c-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.375 1.125-2.375 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-1.875 1.875-0.75 0.75-1.375 1.125-1.875 1.875l-1.875 1.875-1.875 1.875-1.875 1.875-1.875 1.875c-0.75 0.75-1.125 1.125-1.625 1.875s-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-0.875 1.125-1.625 1.875c-0.5 0.75-0.875 1.125-1.625 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.125 1.875-0.5 0.75-0.875 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.5 1.875-0.25 0.75-0.5 1.125-0.5 1.875-0.25 0.75-0.5 1.125-0.5 1.875-0.25 0.75-0.25 1.125-0.5 1.875s-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875 0 1.125-0.25 1.875c0 0.75 0 1.125-0.25 1.875 0 0.75 0 1.125-0.25 1.875 0 0.75 0 1.125-0.25 1.875V457.25v1.875 1.875 1.875 1.875 1.875 0.875 0.875 1.875 1.875 1.875 1.875 1.875 1.875c0 0.75 0 1.125 0.25 1.875 0 0.75 0 1.125 0.25 1.875 0 0.75 0 1.125 0.25 1.875 0 0.75 0.25 1.125 0.25 1.875s0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.5 1.875c0 0.75 0.25 1.125 0.5 1.875s0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.5 1.125 0.5 1.875c0.25 0.75 0.5 1.125 0.5 1.875 0.25 0.75 0.5 1.125 0.5 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.875 1.875 0.25 0.75 0.5 1.125 0.875 1.875 0.25 0.75 0.5 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.625 1.875 0.5 0.75 0.875 1.125 1.625 1.875 0.5 0.75 1.125 1.125 1.625 1.875s1.125 1.125 1.625 1.875 1.125 1.125 1.625 1.875 1.125 1.125 1.625 1.875 1.125 1.125 1.625 1.875l1.875 1.875 1.875 1.875 1.875 1.875 1.875 1.875c0.75 0.75 1.375 1.125 1.875 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.375 1.875 0.75 0.75 1.625 1.125 2.375 1.875 0.75 0.75 1.625 1.125 2.375 1.875 0.75 0.75 1.625 1.125 2.375 1.875 0.875 0.75 1.625 1.125 2.5 1.875s1.625 1.125 2.5 1.875 1.875 1.125 2.5 1.875c0.875 0.75 1.875 1.125 2.75 1.875 0.875 0.75 1.875 1.125 2.75 1.875 0.875 0.75 1.875 1.125 2.75 1.875 0.875 0.75 1.875 1.125 3 1.875 0.875 0.75 2.125 1.125 3 1.875s2.125 1.125 3 1.875c1.125 0.75 2.125 1.125 3.25 1.875 1.125 0.75 2.375 1.125 3.25 1.875 1.125 0.75 2.375 1.125 3.5 1.875 1.125 0.75 2.375 1.125 3.75 1.875 1.125 0.75 2.5 1.125 3.75 1.875 1.375 0.75 2.5 1.125 4 1.875 1.375 0.75 2.75 1.125 4.25 1.875 1.375 0.75 2.75 1.125 4.25 1.875 1.375 0.75 3 1.125 4.375 1.875 1.625 0.75 3 1.125 4.625 1.875 1.625 0.75 3.25 1.125 4.875 1.875 1.875 0.75 3.5 1.125 5.375 1.875s3.75 1.125 5.625 1.875c2.125 0.75 4.25 1.125 6 1.875 2.375 0.75 4.375 1.125 6.75 1.875 2.5 0.75 4.875 1.125 7.5 1.875 2.75 0.75 5.625 1.125 8.625 1.875 3.5 0.75 6.75 1.125 10.25 1.875 4.375 0.75 8.875 1.375 13.25 1.875 11 1.125 22.125 1.875 33.25 1.875h2.5c11.125 0 22.375-0.75 33.5-1.875 4.375-0.5 8.875-1.125 13.25-1.875 3.5-0.5 7-1.125 10.25-1.875 2.75-0.5 5.875-1.125 8.625-1.875 2.5-0.5 5.125-1.125 7.625-1.875 2.375-0.5 4.625-1.125 6.75-1.875 2.125-0.5 4.25-1.125 6.25-1.875 1.875-0.75 4-1.125 5.875-1.875s3.75-1.125 5.375-1.875c1.625-0.75 3.5-1.125 5.125-1.875 1.625-0.75 3.25-1.125 4.875-1.875 1.625-0.75 3-1.125 4.625-1.875 1.375-0.75 3-1.125 4.375-1.875s2.75-1.125 4.25-1.875c1.375-0.75 2.75-1.125 4-1.875 1.375-0.75 2.5-1.125 3.75-1.875 1.125-0.75 2.5-1.125 3.75-1.875 1.125-0.75 2.375-1.125 3.5-1.875 1.125-0.75 2.375-1.125 3.5-1.875 1.125-0.75 2.375-1.125 3.25-1.875 1.125-0.75 2.125-1.125 3.25-1.875 1.125-0.75 2.125-1.125 3-1.875s2.125-1.125 3-1.875 1.875-1.125 3-1.875c0.875-0.75 1.875-1.125 2.75-1.875 0.875-0.75 1.875-1.125 2.75-1.875 0.875-0.75 1.875-1.125 2.75-1.875 0.875-0.75 1.875-1.125 2.5-1.875 0.875-0.75 1.625-1.125 2.5-1.875s1.625-1.125 2.5-1.875 1.625-1.125 2.375-1.875c0.75-0.75 1.625-1.125 2.375-1.875 0.75-0.75 1.625-1.125 2.375-1.875 0.75-0.75 1.375-1.125 2.375-1.875 0.75-0.75 1.375-1.125 2.375-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 1.875-1.875 0.75-0.75 1.375-1.125 1.875-1.875l1.875-1.875 1.875-1.875 1.875-1.875 1.875-1.875c0.75-0.75 1.125-1.125 1.625-1.875s1.125-1.125 1.625-1.875 1.125-1.125 1.625-1.875 1.125-1.125 1.625-1.875 1.125-1.125 1.625-1.875 0.875-1.125 1.625-1.875c0.5-0.75 0.875-1.125 1.625-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.125-1.875 0.5-0.75 0.875-1.125 1.125-1.875 0.5-0.75 0.875-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.5-1.125 0.875-1.875 0.25-0.75 0.5-1.125 0.875-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.5-1.875 0.25-0.75 0.5-1.125 0.5-1.875 0.25-0.75 0.25-1.125 0.5-1.875s0.5-1.125 0.5-1.875c0.25-0.75 0.25-1.125 0.5-1.875s0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875c0-0.5 0.25-0.75 0.25-1.125-4.625 0.5-9.25 0.875-14 1.125-3.5 0.25-7 0.25-10.75 0.25-4 0-8.125 0-12.125-0.25-6.75-0.25-13.25-0.875-19.5-1.875-3.75-0.5-7.625-1.125-11.375-1.875-3-0.5-5.875-1.125-8.875-1.875-2.5-0.5-5.125-1.125-7.5-1.875-2.125-0.5-4.375-1.125-6.5-1.875-1.875-0.5-4-1.125-5.875-1.875-1.875-0.5-3.5-1.125-5.375-1.875-1.625-0.75-3.25-1.125-4.875-1.875-1.625-0.75-3-1.125-4.625-1.875-1.375-0.75-3-1.125-4.375-1.875s-2.75-1.125-4.25-1.875c-1.375-0.75-2.5-1.125-4-1.875-1.125-0.75-2.5-1.125-3.75-1.875-1.125-0.75-2.375-1.125-3.5-1.875-1.125-0.75-2.375-1.125-3.5-1.875-1.125-0.75-2.125-1.125-3.25-1.875-0.875-0.75-2.125-1.125-3-1.875s-2.125-1.125-3-1.875-1.875-1.125-3-1.875c-0.875-0.75-1.875-1.125-2.75-1.875-0.875-0.75-1.875-1.125-2.75-1.875-0.875-0.75-1.875-1.125-2.5-1.875-0.875-0.75-1.625-1.125-2.5-1.875s-1.625-1.125-2.5-1.875c-0.75-0.75-1.625-1.125-2.375-1.875-0.75-0.75-1.625-1.125-2.375-1.875-0.75-0.75-1.625-1.125-2.375-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-1.875-1.875l-1.875-1.875-1.875-1.875-1.875-1.875c-0.75-0.75-1.125-1.125-1.625-1.875s-1.125-1.125-1.625-1.875-1.125-1.125-1.625-1.875-1.125-1.125-1.625-1.875-1.125-1.125-1.625-1.875-0.875-1.125-1.625-1.875c-0.5-0.75-0.875-1.125-1.625-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.125-1.875-0.5-0.75-0.875-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.75-1.875-3.125-4.625-3.375-5.125-3.625-5.75z m433.625-71.25v-11.375c0-0.5 0-0.875-0.25-1.625 0-0.5 0-0.875-0.25-1.625 0-0.5 0-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.875-0.875-1.125-1.625-0.5-0.5-0.875-0.875-1.125-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625l-1.625-1.625-1.625-1.625c-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.375-0.875-1.875-1.625-0.75-0.5-1.375-0.875-1.875-1.625-0.75-0.5-1.375-0.875-2.125-1.625-0.75-0.5-1.375-0.875-2.125-1.625l-0.75-0.5 0.25-0.875 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.25-1.125-2.125 1.125-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-0.5 0.25-0.875-0.25c-2.125-0.5-4.25-0.875-6-1.625-2.125-0.5-4.25-0.875-6.25-1.625-2.125-0.5-4.25-0.875-6.5-1.625-2.375-0.5-4.375-0.875-6.75-1.625-2.375-0.5-4.875-1.125-7.25-1.625-2.75-0.5-5.375-1.125-8.125-1.625-3.25-0.5-6.5-1.125-9.75-1.625-5.375-0.75-10.75-1.125-15.875-1.625-2.75-0.25-5.875-0.25-8.625-0.25-3.75 0-7.5 0-11.125 0.25-6.5 0.25-12.75 0.75-19.125 1.625-3.75 0.5-7.5 0.875-11 1.625-2.75 0.5-5.875 0.875-8.625 1.625-2.375 0.5-4.875 0.875-7.25 1.625-2.125 0.5-4.25 0.875-6.25 1.625-1.875 0.5-3.75 0.875-5.625 1.625-1.875 0.5-3.5 0.875-5.125 1.625-1.625 0.5-3.25 0.875-4.875 1.625-1.375 0.5-3 0.875-4.375 1.625-1.375 0.5-2.75 0.875-4.25 1.625-1.375 0.5-2.5 0.875-4 1.625-1.125 0.5-2.5 0.875-3.75 1.625-1.125 0.5-2.375 0.875-3.75 1.625-1.125 0.5-2.375 0.875-3.5 1.625-1.125 0.5-2.125 0.875-3.25 1.625-1.125 0.5-2.125 0.875-3.25 1.625-0.875 0.5-2.125 0.875-3 1.625-0.875 0.5-1.875 0.875-3 1.625-0.875 0.5-1.875 0.875-2.75 1.625-0.875 0.5-1.875 0.875-2.75 1.625-0.875 0.5-1.875 0.875-2.5 1.625-0.875 0.5-1.625 0.875-2.5 1.625-0.875 0.5-1.625 0.875-2.5 1.625-0.75 0.5-1.625 0.875-2.375 1.625-0.75 0.5-1.625 0.875-2.375 1.625-0.75 0.5-1.625 0.875-2.375 1.625-0.75 0.5-1.375 0.875-2.375 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-1.875 1.625-0.75 0.5-1.375 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.5 0.5-1.125 0.875-1.625 1.625-0.5 0.5-1.125 0.875-1.625 1.625-0.5 0.5-1.125 0.875-1.625 1.625-0.5 0.5-1.125 0.875-1.625 1.625l-1.625 1.625-1.625 1.625c-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.125 1.625-0.5 0.5-0.875 0.875-1.125 1.625-0.5 0.5-0.875 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.5 0.875-0.875 1.625-0.25 0.5-0.5 0.875-0.875 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5 0 0.875-0.25 1.625 0 0.5 0 0.875-0.25 1.625 0 0.5 0 0.875-0.25 1.625v1.625 1.625 1.625 3.25 1.625 3.25 1.375 1.625 1.625 1.625 1.625 1.625 1.625 1.625 1.625 1.625c0 0.5 0 0.875 0.25 1.625 0 0.5 0 0.875 0.25 1.625 0 0.5 0 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.875 1.625 0.25 0.5 0.5 0.875 0.875 1.625 0.25 0.5 0.5 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625l1.625 1.625 1.625 1.625c0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.375 0.875 1.875 1.625 0.75 0.5 1.375 0.875 1.875 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.375 1.625 0.75 0.5 1.625 0.875 2.375 1.625 0.75 0.5 1.625 0.875 2.375 1.625 0.75 0.5 1.625 0.875 2.375 1.625 0.875 0.5 1.625 0.875 2.5 1.625 0.875 0.5 1.625 0.875 2.5 1.625 0.875 0.5 1.875 0.875 2.5 1.625 0.875 0.5 1.875 0.875 2.75 1.625 0.875 0.5 1.875 0.875 2.75 1.625 0.875 0.5 1.875 0.875 3 1.625 0.875 0.5 2.125 0.875 3 1.625 1.125 0.5 2.125 0.875 3.25 1.625 1.125 0.5 2.125 0.875 3.25 1.625 1.125 0.5 2.375 0.875 3.5 1.625 1.125 0.5 2.375 0.875 3.75 1.625 1.125 0.5 2.5 0.875 3.75 1.625 1.375 0.5 2.5 0.875 4 1.625 1.375 0.5 2.75 0.875 4.25 1.625 1.375 0.5 3 0.875 4.375 1.625 1.625 0.5 3.25 0.875 4.875 1.625 1.625 0.5 3.5 0.875 5.125 1.625 1.875 0.5 3.75 0.875 5.875 1.625 2.125 0.5 4.25 1.125 6.25 1.625 2.375 0.5 4.875 1.125 7.25 1.625 2.75 0.5 5.875 1.125 8.625 1.625 3.75 0.75 7.5 1.125 11.125 1.625 9.25 1.125 19.125 1.625 28.875 1.625h1.375c9.25 0 18.375-0.75 27.5-1.625 3.75-0.5 7.25-0.875 10.75-1.625 2.75-0.5 5.625-0.875 8.375-1.625 2.375-0.5 4.625-0.875 7-1.625 2.125-0.5 4.25-0.875 6.25-1.625 1.875-0.5 3.75-0.875 5.625-1.625 1.625-0.5 3.5-0.875 5.125-1.625 1.625-0.5 3.25-0.875 4.625-1.625 1.375-0.5 3-0.875 4.375-1.625 1.375-0.5 2.75-0.875 4.25-1.625 1.375-0.5 2.5-0.875 4-1.625 1.125-0.5 2.5-0.875 3.75-1.625 1.125-0.5 2.375-0.875 3.5-1.625 1.125-0.5 2.375-0.875 3.5-1.625 1.125-0.5 2.125-0.875 3.25-1.625 1.125-0.5 2.125-0.875 3.25-1.625 0.875-0.5 2.125-0.875 3-1.625 0.875-0.5 1.875-0.875 3-1.625 0.875-0.5 1.875-0.875 2.75-1.625 0.875-0.5 1.875-0.875 2.75-1.625 0.875-0.5 1.875-0.875 2.5-1.625 0.875-0.5 1.625-0.875 2.5-1.625 0.875-0.5 1.625-0.875 2.5-1.625 0.875-0.5 1.625-0.875 2.5-1.625 0.75-0.5 1.625-0.875 2.375-1.625 0.75-0.5 1.625-0.875 2.375-1.625 0.75-0.5 1.375-0.875 2.375-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 1.875-1.625 0.75-0.5 1.375-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625l1.625-1.625 1.625-1.625c0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.875-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.5-1.625 0.25-0.5 0.5-0.875 0.5-1.625 0.25-0.5 0.5-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625v-11.375h-3.125zM589.714646 384c-12.625 0-25.375-12.75-25.375-25.375 0-12.75 12.75-25.375 25.375-25.375 19.375 0 31.875 12.625 31.875 25.375-0.125 12.625-12.75 25.375-31.875 25.375zM729.589646 384c-12.625 0-25.375-12.75-25.375-25.375 0-12.75 12.75-25.375 25.375-25.375 19.125 0 31.875 12.625 31.875 25.375 0 12.625-12.75 25.375-31.875 25.375zM328.714646 568.75c-19.125 0-38.375-12.625-38.375-31.625 0-19.125 19.375-31.875 38.375-31.875s31.875 12.75 31.875 31.875-12.875 31.625-31.875 31.625zM506.964646 568.75c-19.125 0-38.125-12.625-38.125-31.625 0-19.125 19.125-31.875 38.125-31.875 19.125 0 31.875 12.75 31.875 31.875s-12.875 31.625-31.875 31.625z"  horiz-adv-x="1059" />
 
-    
-    <glyph glyph-name="shrink-right" unicode="&#58984;" d="M52.294-28.71900000000005h899.793c16.546 0 29.999 13.405 29.999 29.999v59.974c-0.013 16.562-13.436 29.985-29.998 29.999h-899.795c-16.57 0-29.999-13.429-29.999-29.999v-59.974c0-16.617 13.429-29.999 29.999-29.999zM952.087 451.165h-479.884c-16.57 0-29.999-13.405-29.999-29.999v-59.974c0 0 0 0 0 0 0-16.572 13.428-30.01 29.997-30.022h479.885c16.571 0.013 29.999 13.448 29.999 30.022 0 0 0 0 0 0v59.974c0 16.593-13.429 29.999-29.999 29.999zM52.294 691.0840000000001h899.793c16.554 0.013 29.972 13.423 29.999 29.974v59.999c0 16.57-13.429 29.999-29.999 29.999h-899.793c-16.57 0-29.999-13.429-29.999-29.999v-59.997c0-16.546 13.429-29.975 29.999-29.975zM45.183 383.53499999999997l239.919-150.598v301.196l-239.919-150.598z"  horiz-adv-x="1024" />
+			<glyph glyph-name="layim-download" unicode="&#58910;"
+				   d="M186.888458 77.07363199999998l0 581.729108c14.85022-14.450107 35.050284-23.436782 57.359382-23.436782l560.03604 0 0-151.561881 25.029046 0 0 176.591951-585.065086 0c-31.191396 0-57.359382 26.166963-57.359382 57.359382 0 31.191396 26.165939 57.359382 57.359382 57.359382l572.551074 0L816.798914 800.143838 244.24784 800.143838c-45.431725 0-82.388429-36.957727-82.388429-82.388429l0-640.681778c0-41.796942 34.000372-75.789127 75.789127-75.789127l225.950102 0 0 25.029046L237.648538 26.31355099999996C209.661114 26.31355099999996 186.888458 49.078021000000035 186.888458 77.07363199999998zM236.947574 730.269421l560.38601 0 0-25.029046-560.38601 0 0 25.029046ZM686.086897 428.171012c-85.917812 0-164.908864-55.248302-194.553021-135.882783-30.013571-81.641415-4.269233-175.567621 62.624293-230.942813 67.00302-55.465243 164.474982-62.808488 238.931764-17.720593 74.094532 44.868907 113.272833 133.533272 96.080266 218.517829C869.882923 357.47283300000004 783.297916 428.171012 686.086897 428.171012zM686.086897 38.82858599999997c-75.595722 0-145.060817 48.634674-171.092703 119.595842-26.354228 71.839165-3.63069 154.438395 55.287187 203.074092 59.017138 48.718585 144.762011 55.029314 210.191186 15.237029 65.11195-39.59888 99.396801-117.681236 84.064604-192.408171C847.384513 100.72940100000005 771.387655 38.82858599999997 686.086897 38.82858599999997zM698.600909 152.23547199999996L698.600909 311.02496499999995 673.571862 311.02496499999995 673.571862 152.28459099999998 604.675726 221.17254100000002 586.978668 203.47548400000005 686.111456 104.35190499999999 785.185916 203.42738799999995 767.489882 221.123422Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="spread-left" unicode="&#58987;" d="M942.974 770.924h-843.556c-15.513 0-28.124-12.567-28.124-28.124v-56.226c0.012-15.527 12.596-28.111 28.123-28.124h843.559c15.534 0 28.124 12.59 28.124 28.124v56.226c0 15.578-12.59 28.124-28.124 28.124zM99.418 321.033h449.891c15.534 0 28.124 12.567 28.124 28.124v56.226c0 0 0 0 0 0 0 15.537-12.589 28.134-28.122 28.146h-449.892c-15.534-0.012-28.124-12.608-28.124-28.146 0 0 0 0 0 0v-56.226c0-15.556 12.59-28.124 28.124-28.124zM942.974 96.10900000000004h-843.556c-15.519-0.012-28.099-12.584-28.124-28.101v-56.249c0-15.534 12.59-28.124 28.124-28.124h843.556c15.534 0 28.124 12.59 28.124 28.124v56.248c0 15.513-12.59 28.103-28.124 28.102zM949.641 384.436l-224.924 141.186v-282.37l224.924 141.186z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="camera" unicode="&#58976;" d="M884.3 648.6H704.2L679.5 698l-0.2 0.4c-1.9 3.6-3.6 6.9-5.1 9.9-12 23.4-21.5 41.9-54.1 41.9H416.7c-32.9 0-43.7-21.3-55.1-43.8-1.3-2.6-2.7-5.3-4.2-8.1l-24.8-49.7H152.4c-34 0-61.7-27.7-61.7-61.7v-488c0-34 27.7-61.7 61.7-61.7h731.9c34 0 61.7 27.7 61.7 61.7v488c0 34-27.7 61.7-61.7 61.7zM904 98.89999999999998c0-10.8-8.8-19.7-19.7-19.7H152.4c-10.8 0-19.7 8.8-19.7 19.7v488c0 10.8 8.8 19.7 19.7 19.7h206.1l36.2 72.5c1.5 2.9 2.9 5.7 4.3 8.3 10.6 20.8 11.1 20.8 17.7 20.8H620c4.6 0 5.8-0.6 5.8-0.6 2-1.2 7.2-11.2 10.9-18.5 1.6-3.1 3.3-6.5 5.3-10.1l36.2-72.4h206.1c10.8 0 19.7-8.8 19.7-19.7v-488zM525.5 565.5c-123.5 0-223.6-100.1-223.6-223.6S402 118.20000000000005 525.5 118.20000000000005s223.7 100.1 223.7 223.7c0 123.5-100.2 223.6-223.7 223.6z m0-402.5c-98.8 0-178.9 80.1-178.9 178.9 0 98.8 80.1 178.9 178.9 178.9 98.8 0 178.9-80.1 178.9-178.9 0-98.8-80.1-178.9-178.9-178.9z m246 402.5v-44.7H861v44.7h-89.5z"  horiz-adv-x="1024" />
+			<glyph glyph-name="picture-fine" unicode="&#58893;"
+				   d="M958.648085 84.30682933333333L65.772494 84.30682933333333 65.772494 721.9115253333333l892.87559 0L958.648085 84.30682933333333zM97.660762 116.20328333333339l829.099055 0L926.759817 690.0570263333334 97.660762 690.0570263333334 97.660762 116.20328333333339zM648.731616 419.05893933333334l-1.991354 0c-47.801702 0-86.696548 38.900985-86.696548 86.695524l0 1.978051c0 47.809889 38.894845 86.671988 86.696548 86.671988l1.991354 0c47.801702 0 86.698594-38.862099 86.698594-86.671988l0-1.978051C735.43021 457.95992433333333 696.533318 419.05893933333334 648.731616 419.05893933333334zM646.740262 562.5193053333333c-30.224372 0-54.810327-24.582885-54.810327-54.787814l0-1.978051c0-30.230512 24.584931-54.803163 54.810327-54.803163l1.991354 0c30.222325 0 54.810327 24.572652 54.810327 54.803163l0 1.978051c0 30.203906-24.586978 54.787814-54.810327 54.787814L646.740262 562.5193053333333zM91.097276 181.7900473333334l-22.748097 22.338774 274.373974 279.332916 22.750143-22.351054L91.097276 181.7900473333334zM604.886015 215.92242633333342L339.999113 480.74793033333333l22.548552 22.525016L627.433544 238.4638153333334 604.886015 215.92242633333342zM619.007641 202.70744933333333l-22.763446 22.337751 167.989015 171.035398 22.765493-22.350031L619.007641 202.70744933333333zM925.622924 222.7939273333334L758.534418 389.8343373333333l22.548552 22.529109 167.086459-167.044504L925.622924 222.7939273333334z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="note" unicode="&#58990;" d="M987.2 384.36L512.43 859.13a84.75 84.75 0 0 1-65 24.71L111.55 864.09a84.83 84.83 0 0 1-79.65-79.65L12.15 448.57a84.57 84.57 0 0 1 24.69-65l474.8-474.8a84.91 84.91 0 0 1 119.93 0L987.2 264.41999999999996a84.9 84.9 0 0 1 0 119.94z m-39.28-80.66L592.29-51.91999999999996a29.31 29.31 0 0 0-41.37 0L76.1 422.9a29.22 29.22 0 0 0-8.49 22.38l19.74 335.88a29.29 29.29 0 0 0 27.48 27.48l335.9 19.75a29.32 29.32 0 0 0 22.38-8.52l474.8-474.8a29.31 29.31 0 0 0 0.01-41.37zM236.86 659.14c-50.92-50.95-50.92-133.8 0-184.72a130.61 130.61 0 1 1 184.71 184.72c-50.89 50.86-133.77 50.86-184.71 0zM382.29 513.7c-28.38-28.38-77.78-28.38-106.15 0a75.08 75.08 0 1 0 106.15 0z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="refresh" unicode="&#58985;" d="M928 810.666667c-18.133333 0-32-13.866667-32-32v-164.266667C816 747.733333 669.866667 832 512 832 264.533333 832 64 631.4666669999999 64 384s200.533333-448 448-448c230.4 0 422.4 172.8 445.866667 402.133333 2.133333 17.066667-10.666667 33.066667-28.8 35.2-17.066667 2.133333-33.066667-10.666667-35.2-28.8C873.6 148.26666699999998 709.333333 0 512 0c-212.266667 0-384 171.733333-384 384s171.733333 384 384 384c137.6 0 264.533333-74.666667 332.8-192H693.333333c-18.133333 0-32-13.866667-32-32s13.866667-32 32-32h266.666667V778.666667c0 18.133333-14.933333 32-32 32z"  horiz-adv-x="1024" />
+			<glyph glyph-name="link" unicode="&#58956;"
+				   d="M262.4-121.60000000000002c-64 0-128 25.6-179.2 76.8-102.4 102.4-102.4 262.4 0 364.8l134.4 134.4 89.6-89.6-134.4-134.4c-51.2-51.2-51.2-128 0-179.2 51.2-51.2 128-51.2 179.2 0l179.2 179.2c25.6 25.6 38.4 57.6 38.4 89.6S556.8 384 537.6 409.6L467.2 473.6l89.6 89.6 70.4-70.4C672 448 697.6 384 697.6 313.6c0-70.4-25.6-134.4-76.8-179.2l-179.2-179.2C396.8-96 326.4-121.60000000000002 262.4-121.60000000000002zM467.2 204.79999999999995L396.8 268.79999999999995c-102.4 102.4-102.4 262.4 0 364.8l179.2 179.2c102.4 102.4 262.4 102.4 364.8 0 102.4-102.4 102.4-262.4 0-364.8l-134.4-134.4-89.6 89.6 134.4 134.4c51.2 51.2 51.2 128 0 179.2-51.2 51.2-134.4 51.2-179.2 0L486.4 544c-51.2-51.2-51.2-128 0-179.2l70.4-70.4L467.2 204.79999999999995z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="female" unicode="&#58977;" d="M774.4 800c-48 35.2-108.8 51.2-172.8 51.2-105.6 0-208-51.2-268.8-150.4-89.6-134.4-57.6-313.6 60.8-416l-32-51.2-188.8 121.6S128 384 108.8 352c-22.4-35.2 22.4-64 22.4-64l188.8-121.6-105.6-163.2s-19.2-32 16-51.2c38.4-22.4 57.6 12.8 57.6 12.8l102.4 160 185.6-121.6s48-28.8 70.4 6.4c19.2 28.8-25.6 57.6-25.6 57.6L432 192l32 48c44.8-22.4 92.8-32 137.6-32 105.6 0 208 51.2 268.8 150.4 96 147.2 51.2 345.6-96 441.6z m35.2-400c-44.8-67.2-118.4-108.8-201.6-108.8-44.8 0-92.8 12.8-131.2 38.4-112 73.6-147.2 220.8-73.6 332.8 44.8 64 121.6 105.6 201.6 108.8 44.8 0 92.8-12.8 131.2-38.4 112-73.6 147.2-220.8 73.6-332.8z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="male" unicode="&#58978;" d="M889.6 800h-240s-35.2 0-38.4-41.6c0-19.2 16-38.4 38.4-38.4h140.8l-179.2-179.2C556.8 582.4 489.6 608 416 608 240 608 96 464 96 288s144-320 320-320 320 144 320 320c0 73.6-25.6 140.8-67.2 195.2l179.2 179.2v-140.8c0-22.4 19.2-38.4 38.4-38.4 22.4 0 38.4 19.2 38.4 41.6V764.8h3.2C924.8 800 889.6 800 889.6 800zM416 48c-131.2 0-236.8 105.6-236.8 236.8 0 131.2 105.6 236.8 236.8 236.8s236.8-105.6 236.8-236.8c0-131.2-105.6-236.8-236.8-236.8z"  horiz-adv-x="1024" />
+			<glyph glyph-name="diamond" unicode="&#59189;"
+				   d="M998.4 526.933333L797.866667 802.133333c-4.266667 6.4-12.8 10.666667-19.2 10.666667L243.2 812.8c0 0-14.933333-2.133333-23.466667-17.066667C194.133333 753.066667 32 512 32 512L21.333333 494.933333l12.8-14.933333L469.333333-27.733333000000016c4.266667-4.266667 6.4-6.4 10.666667-8.533333 6.4-4.266667 32-10.666667 46.933333 0 4.266667 2.133333 6.4 6.4 10.666667 8.533333l409.6 420.266667c10.666667 8.533333 10.666667 25.6 0 34.133333-8.533333 10.666667-23.466667 10.666667-32 0L561.066667 61.86666700000001l153.6 422.4 0 0 251.733333 0c2.133333 0 19.2 0 23.466667 4.266667l2.133333 2.133333C1004.8 497.066667 1006.933333 512 998.4 526.933333zM782.933333 763.733333l-96-226.133333L341.333333 537.6l-85.333333 226.133333L782.933333 763.733333zM221.866667 714.666667l72.533333-179.2-192 0L221.866667 714.666667zM91.733333 488.533333l215.466667 0 138.666667-416L91.733333 488.533333zM503.466667 44.799999999999955l-147.2 443.733333 307.2 0L503.466667 44.799999999999955zM736 535.4666669999999L810.666667 701.866667l119.466667-168.533333L736 533.333333z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="screen-restore" unicode="&#59224;" d="M582.6 454.6v320h50V540l274 274 35.4-35.4-274-274h234.6v-50h-320zM117.4-46l274 274v-234.6h50v320h-320v-50H356l-274-274 35.4-35.4zM132 764h302V814H82v-352h50V764z m760-760H590v-50h352V306h-50v-302z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="password" unicode="&#58995;" d="M519.2 343.29999999999995c-41.1 0-74.4-33.3-74.4-74.4 0-29.7 17.5-55 42.5-67.1v-81.9c0-17.6 14.3-31.9 31.9-31.9 17.6 0 31.9 14.3 31.9 31.9v81.9c25.1 12 42.5 37.4 42.5 66.9 0 41.3-33.2 74.6-74.4 74.6zM827.6-62.10000000000002H189.4c-35.9 0-65.1 29.2-65.1 65.1V428.4c0 35.9 29.2 65.1 65.1 65.1h638.2c17.3 0 33.7-6.7 46-19.1 12.3-12.3 19.1-28.7 19.1-46V3c0-35.9-29.2-65.1-65.1-65.1zM231.9 427.2c-34.8 0-41.3-6.6-41.3-41.3v-340.4c0-34.8 6.6-41.3 41.3-41.3h553.2c34.8 0 41.3 6.6 41.3 41.3V385.9c0 34.8-6.6 41.3-41.3 41.3H231.9zM519.2 86.70000000000005c-18.3 0-33.2 14.8-33.2 33.2V201c-26.3 12.8-42.6 38.8-42.6 67.8 0 41.8 33.9 75.7 75.7 75.7s75.7-33.9 75.7-75.7c0-29-16.3-55-42.5-67.8v-81.1c0.1-18.2-14.9-33.2-33.1-33.2zM519.2 342c-40.4 0-73.2-32.9-73.2-73.2 0-28.3 16.1-53.6 41.9-65.8l0.7-0.4V120c0-17 13.7-30.7 30.7-30.7S550 103.10000000000002 550 120v82.6l0.7 0.4c25.8 12.3 41.9 37.5 41.9 65.8-0.2 40.4-33.1 73.2-73.4 73.2zM207 523.1c-9.1 0-17.6 3.5-23.9 10-6.4 6.4-10 15-10 23.9v2h-0.2l0.2 1.4c0.1 0.5 0.1 0.9 0.2 1.4l0.2 1c0.1 0.6 0.2 1.4 0.4 2 15.3 75.7 57 144.2 117.2 193 29.9 24.2 63.4 43 99.8 56 37.5 13.3 77 20.2 117.5 20.2 61 0 120.8-16.3 173-47.2 50.6-29.9 93-72.8 122.5-123.8 4-5.6 6.1-12.2 6.1-19.2 0-18.3-15-33.3-33.3-33.3-13.2 0-25.1 7.7-30.4 19.8-49.2 84.6-140.4 137.4-238 137.4-128.1 0-238.2-87.1-267.6-211.8v-0.2c-0.7-18.4-15.4-32.6-33.7-32.6z"  horiz-adv-x="1024" />
+			<glyph glyph-name="log" unicode="&#58894;"
+				   d="M828.01742 700.357158C743.476979 784.899646 631.076002 831.458031 511.516999 831.458031c-119.55798 0-231.959979-46.558385-316.500421-131.09985C110.47716 615.81774 63.918775 503.41574 63.918775 383.85776c0-87.103824 25.045419-171.548074 72.429613-244.204861 9.393951-14.402011 28.685319-18.46249 43.087331-9.071609 14.404058 9.393951 18.46556 28.685319 9.072633 43.089377-40.768519 62.511729-62.317301 135.194098-62.317301 210.187093 0 212.469066 172.85586 385.326972 385.325949 385.326972s385.325949-172.857906 385.325949-385.326972-172.85586-385.326972-385.325949-385.326972c-70.357418 0-139.188062 19.131733-199.052498 55.323003-14.71412 8.900717-33.856086 4.180206-42.753733-10.534937-8.896624-14.71719-4.180206-33.856086 10.534937-42.753733 69.584821-42.070164 149.556201-64.307631 231.271294-64.307631 119.559003 0 231.959979 46.558385 316.500421 131.09985 84.539418 84.539418 131.097804 196.941418 131.097804 316.499397S912.556838 615.81774 828.01742 700.357158zM494.28964 690.216193c-21.782096 0-39.397289-17.658172-39.397289-39.439244l0-283.524378c0-1.360997 0.358157-2.706645 0.493234-4.03285 2.020006-19.886933 18.959817-34.573423 39.379892-34.573423l0 0 0.146333 0.832971 223.590358 0c21.782096 0 39.438221 17.616216 39.438221 39.397289s-17.658172 39.397289-39.439244 39.397289L533.686928 408.273846l0 242.503103C533.686928 672.5580219999999 516.071735 690.216193 494.28964 690.216193z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="senior" unicode="&#58996;" d="M719.9 249.39999999999998L514.7 379.5V485.1C615.6 419 731.5 344 731.5 344s139.2-45.6 139.2 106.5c0 93-172.5 112.1-197.2 11.8l-69.6 47.3s24.2 101.5 162.4 106.5c138.2 4.9 192-94.6 190.9-199.6-1.2-104.7-136-198.3-237.3-167.1zM561 414c-4-19-23-33.7-47.6-33.7l-6.9 4.3-217.3 137.8S171 555.2 160.8 439c-10.2-116.1 147.4-129.5 186.8-23.8l81.7-47.6s-65.1-119.1-198.5-119.1C97.3 248.5 0.6 423.8 114 546.3c113.5 122.4 218.6 64.6 257 35.7 16.4-12.4 85.3-57.9 158.6-105.9l3.1-2.4c28.3-18.2 33.4-35.6 28.3-59.7zM434.1 149.70000000000005h212c16.7 0 30.3-13.6 30.3-30.3v-15.1c0-16.7-13.6-30.3-30.3-30.3h-212c-16.7 0-30.3 13.6-30.3 30.3v15.1c0 16.8 13.6 30.3 30.3 30.3z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="theme" unicode="&#58986;" d="M512 800C229.696 800 0 570.304 0 288c0-90.368 30.304-174.496 85.344-236.896 55.264-62.624 129.152-97.12 208.128-97.12 81.568 0 161.536 36.832 231.264 106.592l2.272 2.496c65.792 81.472 132.896 121.056 205.088 121.056 46.72 0 89.216-15.872 126.688-29.92 30.336-11.328 56.576-21.12 81.216-21.12C1024 133.08799999999997 1024 241.664 1024 288c0 282.304-229.696 512-512 512z m428-602.912c-13.088 0-35.296 8.288-58.784 17.088-40.48 15.136-90.848 33.952-149.12 33.952-92.352 0-175.328-46.944-253.76-143.456-57.184-56.704-121.056-86.688-184.832-86.688-60.352 0-117.216 26.784-160.128 75.456C88.64 144.12800000000004 64 213.216 64 288 64 535.04 264.96 736 512 736s448-200.96 448-448c0-27.328-1.952-90.912-20-90.912zM800.704 379.93600000000004m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM457.024 582.624m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM672.704 555.9359999999999m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM291.392 443.936m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM278.4 197.24800000000005m-96 0a96 96 0 1 1 192 0 96 96 0 1 1-192 0Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="rate-solid" unicode="&#59002;"
+				   d="M957.111079 492.519576c-3.927449 11.669784-14.447037 19.86442-26.723641 20.816095L647.68068 535.250796 540.183388 811.873997c-4.586458 11.803837-15.951297 19.579941-28.614711 19.579941s-24.02723-7.776104-28.614711-19.579941L375.458719 535.250796l-282.708803-21.915126c-12.276604-0.951675-22.796192-9.146311-26.723641-20.816095-3.927449-11.669784-0.50142-24.557302 8.701173-32.737612l217.547735-193.358823-67.980277-291.298436c-2.848884-12.20702 2.009773-24.919553 12.273535-32.114418 10.264784-7.195889 23.87271-7.42818 34.375925-0.586354l240.624313 156.709111 240.625336-156.709111c5.099135-3.320629 10.92891-4.974291 16.752546-4.974291 6.173606 0 12.342096 1.858324 17.623379 5.561669 10.263761 7.194866 15.122419 19.907399 12.273535 32.114418l-67.980277 291.299459L948.409906 459.781964C957.613522 467.962274 961.037505 480.849792 957.111079 492.519576z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="tread" unicode="&#59077;" d="M860.8 172.79999999999995l6.4-57.6-6.4 57.6c12.8 0 25.6 3.2 35.2 12.8 6.4 9.6 6.4 22.4 3.2 32l57.6 12.8-57.6-12.8L800 553.6c-6.4 28.8-25.6 51.2-48 64-9.6 6.4-22.4 9.6-32 9.6H182.4c-22.4 3.2-41.6-6.4-51.2-25.6-6.4-9.6-6.4-19.2-9.6-28.8v-342.4c0-19.2 9.6-38.4 28.8-48 6.4-3.2 12.8-6.4 19.2-6.4h192l19.2-25.6 147.2-188.8c6.4-9.6 19.2-12.8 28.8-9.6 16 3.2 25.6 19.2 22.4 35.2l-9.6 118.4-6.4 67.2h297.6z m-233.6-57.6l9.6-128c3.2-28.8-9.6-54.4-28.8-73.6-35.2-32-92.8-28.8-124.8 6.4l-156.8 195.2H179.2c-19.2 0-38.4 6.4-57.6 16-35.2 19.2-57.6 57.6-57.6 99.2V572.8c0 19.2 6.4 38.4 16 57.6 19.2 38.4 57.6 60.8 99.2 54.4h537.6c67.2-3.2 121.6-48 137.6-112l102.4-339.2c6.4-28.8 3.2-57.6-12.8-80-19.2-22.4-48-38.4-76.8-38.4h-240zM304 627.2v-451.2h57.6V627.2H304z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="praise" unicode="&#59078;" d="M860.8 595.2h-297.6l6.4 67.2 9.6 118.4c3.2 16-6.4 32-22.4 35.2-9.6 3.2-22.4 0-28.8-9.6l-147.2-188.8-19.2-25.6h-192c-6.4 0-12.8-3.2-19.2-6.4-19.2-9.6-28.8-28.8-28.8-48v-342.4c0-9.6 3.2-22.4 9.6-28.8 9.6-19.2 28.8-28.8 48-25.6h537.6c12.8 0 22.4 3.2 32 9.6 25.6 12.8 44.8 35.2 48 64l102.4 336 57.6-12.8-57.6 12.8c3.2 9.6 0 22.4-3.2 32-9.6 6.4-22.4 12.8-35.2 12.8l6.4 57.6-6.4-57.6z m-233.6 57.6h240c28.8 0 57.6-12.8 76.8-38.4 16-22.4 19.2-54.4 12.8-80l-102.4-339.2c-16-64-70.4-108.8-137.6-112H179.2c-41.6-3.2-80 19.2-99.2 54.4-9.6 19.2-16 38.4-16 57.6V537.6c0 41.6 22.4 80 57.6 99.2 19.2 9.6 38.4 12.8 57.6 16h144L480 848c32 35.2 89.6 38.4 124.8 6.4 19.2-19.2 32-44.8 28.8-73.6l-6.4-128z m-323.2-512h57.6V592H304v-451.2z"  horiz-adv-x="1024" />
+			<glyph glyph-name="fonts-del" unicode="&#58959;"
+				   d="M928 448l-143.616 0c-3.456 55.616-14.272 106.56-29.504 144.96C725.504 666.816 617.344 768 464.32 768L256 768l0-320L96 448C78.336 448 64 433.664 64 416S78.336 384 96 384L256 384l0-320 229.632 0c156.288 0 240.768 97.856 267.904 167.488C772.736 280.96000000000004 782.272 333.312 784.96 384L928 384C945.664 384 960 398.336 960 416S945.664 448 928 448zM349.376 711.488l63.936 0c35.712 0 251.84 27.968 266.944-263.488l-330.88 0L349.376 711.488zM439.296 120.51199999999994L349.376 120.51199999999994 349.376 382.528 349.376 384l330.88 0C665.344 113.98400000000004 467.968 120.51199999999994 439.296 120.51199999999994z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="star-fill" unicode="&#58968;" d="M752-43.200000000000045c-9.6 0-20.8 3.2-30.4 8l-208 104-209.6-104c-20.8-11.2-48-9.6-67.2 4.8-19.2 14.4-30.4 40-25.6 64l43.2 224L89.6 411.2C72 428.8 65.6 456 72 478.4c8 24 27.2 41.6 52.8 44.8l228.8 41.6 102.4 208c11.2 22.4 33.6 36.8 57.6 36.8s48-14.4 57.6-36.8l102.4-208 228.8-40c24-3.2 44.8-20.8 51.2-44.8 8-24 1.6-49.6-16-67.2L772.8 257.6l41.6-224c4.8-25.6-6.4-49.6-25.6-64-9.6-8-22.4-12.8-36.8-12.8z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="rate" unicode="&#59003;" d="M959.008 489.984l-308 47.008L512 832 372.992 536.992l-308-47.008 223.008-228-52.992-324L512 90.976l276.992-152.992-52.992 324zM512 156L304 39.00800000000004l40 235.008-179.008 182.016 242.016 32 104.992 224 104-224 240.992-34.016L680 273.024l36.992-235.008z"  horiz-adv-x="1024" />
+			<glyph glyph-name="unlink" unicode="&#58957;"
+				   d="M150.336 767.6800000000001C133.44 762.304 124.16 744.3199999999999 129.472 727.488 131.2 722.1759999999999 134.208 717.44 138.304 713.664l122.624-122.432C270.208 576.192 289.92 571.52 304.96 580.736 320 590.0799999999999 324.672 609.7280000000001 315.456 624.832 312.832 629.056 309.184 632.64 304.96 635.264L182.336 757.696C175.168 765.44 164.672 769.216 154.304 767.6800000000001 152.96 767.808 151.552 767.808 150.336 767.6800000000001L150.336 767.6800000000001zM406.08 831.424c-13.696-4.48-22.72-17.6-22.016-32L384.064 672c0-17.664 14.336-32 32-32s31.872 14.336 31.872 32L447.936 799.424C448.256 817.088 434.304 831.6800000000001 416.64 832 414.464 832.064 412.16 831.808 410.048 831.424 408.704 831.552 407.296 831.552 406.08 831.424L406.08 831.424zM91.392 511.872C73.728 509.12 61.632 492.544 64.384 474.88 67.136 457.28 83.712 445.248 101.376 448L224 448C241.664 448 256 462.208 256 479.872s-14.336 32-32 32L101.376 511.872c-1.984 0.192-3.968 0.192-6.016 0C94.016 512 92.608 512 91.392 511.872L91.392 511.872zM795.456 320c-17.728-2.752-29.824-14.08-27.072-31.744 2.752-17.6 19.328-35.008 36.992-32.256L928 256c17.664 0 32 19.584 32 37.248S945.664 320 928 320l-122.624 0c-1.984 0.192-3.968 0.192-6.016 0-1.344 0.128-2.688 0.128-4.032 0L795.456 320zM598.272 127.42399999999998c-13.76-4.48-22.72-17.6-22.08-32L576.192-32c0-17.664 14.336-32 32-32S640-49.66399999999999 640-32l0 127.424c0.32 17.6-13.568 32.256-31.232 32.576-2.176 0.064-4.352-0.192-6.592-0.576-1.344 0.128-2.688 0.128-4.032 0L598.272 127.42399999999998zM726.272 191.67999999999995c-16.896-5.376-26.24-23.36-20.864-40.192 1.664-5.312 4.736-10.048 8.832-13.824l122.56-122.432c9.28-15.04 28.928-19.776 44.032-10.496 14.976 9.344 19.712 28.992 10.368 44.032-2.624 4.224-6.144 7.808-10.368 10.432l-122.56 122.432c-7.168 7.744-17.6 11.52-28.032 9.984-1.344 0.128-2.688 0.128-4.032 0L726.272 191.61599999999999zM339.968 28.03200000000004c-49.152 0-98.304 18.688-135.744 56.128-74.816 74.88-74.816 196.608 0 271.488l87.744 87.744c12.48 12.48 32.768 12.48 45.248 0s12.48-32.768 0-45.248L249.408 310.46400000000006c-49.92-49.856-49.92-131.136 0-180.992 49.856-49.856 131.136-49.856 180.992 0l87.744 87.744c12.48 12.48 32.768 12.48 45.248 0s12.48-32.768 0-45.248l-87.744-87.744C438.272 46.72000000000003 389.12 28.03200000000004 339.968 28.03200000000004zM702.144 323.712c-8.192 0-16.384 3.136-22.656 9.344-12.48 12.48-12.48 32.768 0 45.248l87.744 87.744c49.856 49.92 49.856 131.072 0 180.992-49.856 49.856-131.136 49.856-180.992 0L498.496 559.296c-12.48-12.48-32.768-12.48-45.248 0s-12.48 32.768 0 45.248l87.744 87.744c74.88 74.88 196.608 74.88 271.488 0 74.88-74.816 74.88-196.672 0-271.488l-87.744-87.744C718.528 326.784 710.336 323.712 702.144 323.712z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="template-1" unicode="&#58966;" d="M512 384zM43.52 601.6l409.6-176.64c58.88-30.72 110.08 0 110.08 0l414.72 174.08 2.56 2.56c10.24 5.12 15.36 15.36 15.36 28.16 0 15.36-10.24 28.16-23.04 30.72L563.2 837.12c-56.32 23.04-97.28 0-97.28 0L46.08 660.48c-12.8-5.12-20.48-17.92-20.48-30.72s7.68-23.04 17.92-28.16z m0 0M512 222.72000000000003c-2.56 0-7.68 0-10.24 2.56l-486.4 215.04c-12.8 5.12-17.92 20.48-12.8 33.28 5.12 12.8 20.48 17.92 33.28 12.8L512 276.48 988.16 486.4c12.8 5.12 28.16 0 33.28-12.8 5.12-12.8 0-28.16-12.8-33.28l-486.4-215.04c-2.56-2.56-7.68-2.56-10.24-2.56zM512 71.67999999999995c-2.56 0-7.68 0-10.24 2.56l-486.4 215.04c-12.8 5.12-17.92 20.48-12.8 33.28 5.12 10.24 20.48 17.92 33.28 10.24L512 125.44000000000005 988.16 332.79999999999995c12.8 5.12 28.16 0 33.28-12.8 5.12-12.8 0-28.16-12.8-33.28l-486.4-215.04H512zM512-79.36000000000001c-2.56 0-7.68 0-10.24 2.56l-486.4 215.04c-12.8 5.12-17.92 20.48-12.8 33.28 5.12 12.8 20.48 17.92 33.28 12.8L512-25.600000000000023l476.16 209.92c12.8 5.12 28.16 0 33.28-12.8 5.12-12.8 0-28.16-12.8-33.28l-486.4-215.04c-2.56-2.56-7.68-2.56-10.24-2.56z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="vercode" unicode="&#59001;" d="M513.807059-128C351.171765-128 58.428235 126.19294100000002 54.211765 376.16941199999997V662.287059a93.364706 93.364706 0 0 0 81.317647 88.545882 570.428235 570.428235 0 0 1 163.237647 40.357647A393.336471 393.336471 0 0 1 446.945882 872.508235a101.797647 101.797647 0 0 0 120.470589 5.421177A629.458824 629.458824 0 0 1 716.8 792.395294a1255.303529 1255.303529 0 0 1 169.863529-38.550588 98.785882 98.785882 0 0 0 79.510589-90.955294 2911.171765 2911.171765 0 0 0-3.011765-291.538824C924.611765 49.09176500000001 672.828235-128 513.807059-128z m0 963.764706a39.152941 39.152941 0 0 1-24.696471-7.830588A438.512941 438.512941 0 0 0 319.247059 734.569412a608.376471 608.376471 0 0 0-180.705883-43.369412 33.731765 33.731765 0 0 1-24.094117-30.117647v-283.708235C118.663529 155.10588199999995 389.722353-67.76470600000005 513.807059-67.76470600000005s354.183529 148.178824 391.529412 444.536471c9.035294 175.887059 0 281.901176 0 283.105882a38.550588 38.550588 0 0 1-29.515295 33.731765 1287.830588 1287.830588 0 0 0-180.705882 41.562353A676.442353 676.442353 0 0 0 536.094118 829.741176a37.345882 37.345882 0 0 1-24.094118 6.02353zM784.865882 479.171765L487.905882 198.47529399999996a40.357647 40.357647 0 0 0-49.392941-4.818823l-7.830588 6.625882-161.430588 171.068235a40.357647 40.357647 0 1 0 60.235294 55.416471l133.722353-141.552941 267.444706 252.988235a40.357647 40.357647 0 1 0 55.41647-60.235294"  horiz-adv-x="1024" />
+			<glyph glyph-name="fonts-clear" unicode="&#58937;"
+				   d="M944.787709 197.20939699999997L857.081297 197.20939699999997 741.092979-127.73993700000005 815.146059-127.73993700000005 832.440281-65.58476199999996 966.82809-65.58476199999996 984.512408-127.73993700000005 1062.011328-127.73993700000005 944.787709 197.20939699999997 944.787709 197.20939699999997ZM848.04409 1.1865400000000363L898.951519 153.25866699999995 949.923963 1.1865400000000363 848.04409 1.1865400000000363 848.04409 1.1865400000000363ZM210.238376 489.910857L183.386821 513.121524 12.46009 313.522794C-5.874386 292.652698-3.728862 260.989968 17.271265 242.720508 38.401424 224.45104800000001 70.454249 226.66158700000005 88.853741 247.53168300000004L100.361551 260.599873C106.603075 267.55657099999996 117.200662 268.20673 124.287392 262.22527 131.309106 256.048762 132.024281 245.51619000000005 125.912789 238.55949199999998 107.448281 217.62438099999997 98.085995 173.08850800000005 119.216154 154.81904799999995 140.281297 136.614603 183.841932 151.76330199999995 202.371455 172.69841299999996 208.417932 179.525079 219.145551 180.30526999999995 226.167265 174.19377799999995 233.188979 168.14730199999997 233.904154 157.61473 227.792662 150.65803200000005 209.328154 129.85295199999996 199.965868 85.05701599999998 221.096027 66.91758700000003 242.16117 48.648127000000045 285.656789 63.86184100000003 304.186313 84.666921 310.362821 91.62361899999996 321.025424 92.40381000000002 327.982122 86.29231700000003 335.068852 80.18082500000003 335.784027 69.71326999999997 329.672535 62.75657100000001 311.143011 41.82146 301.845741-2.9094599999999673 322.910884-20.983873000000017 344.041043-39.253333 387.601678-24.039619000000016 406.00117-3.234540000000038 412.177678 3.7221590000000333 422.840281 4.437332999999967 429.927011-1.6091430000000173 436.948725-7.720635000000016 437.598884-18.31822199999999 431.487392-25.144889000000035 413.022884-46.08000000000004 403.725614-90.81092100000001 424.790757-109.01536499999997 445.920916-127.15479400000004 477.973741-125.00927000000001 496.373233-104.20419000000004L667.299963 95.52457100000004 658.652852 132.90869799999996 210.238376 489.910857 210.238376 489.910857ZM844.013106 329.516698L680.10809 471.12127 929.639011 715.190857C933.2799 718.376635 936.725741 721.562413 939.976535 725.203302 977.815773 768.048762 973.524725 833.129651 930.28917 870.513778 887.183646 907.702857 821.58263 903.281778 783.808408 860.631365L783.483328 860.761397 564.249805 571.3107299999999 399.824662 713.56546C385.391138 726.113524 363.480789 724.553143 350.867709 710.249651L248.14263 593.871238 225.322059 567.994921 251.393424 545.434413 695.7119 161.25561900000002 726.26936 136.679619 847.328916 281.014857C859.941995 295.318349 858.44663 316.96863499999995 844.013106 329.516698L844.013106 329.516698ZM817.941741 830.724063C839.136916 854.779937 876.000916 857.315556 900.186821 836.250413 924.372725 815.380317 926.908344 778.906413 905.648154 754.85054 884.452979 730.924698 847.588979 728.389079 823.403075 749.3892060000001 799.21717 770.324317 796.811582 806.798222 817.941741 830.724063L817.941741 830.724063ZM765.473932 758.491429C768.919773 741.522286 777.6319 725.593397 791.80536 713.305397 806.043836 701.017397 823.533106 694.580825 841.087392 693.540571L643.634186 494.526984 593.116852 538.2176509999999 765.473932 758.491429 765.473932 758.491429ZM776.006503 299.739429L709.755328 219.314794 307.502122 566.369524 376.809043 645.03873C382.920535 651.865397 393.38809 652.5155560000001 400.409805 646.534095L774.381106 323.01511100000005C781.337805 317.098667 782.117995 306.69612700000005 776.006503 299.739429L776.006503 299.739429Z"
+				   horiz-adv-x="1063"/>
 
-    
-    <glyph glyph-name="service" unicode="&#58918;" d="M895.44035 502.006246A31.340412 31.340412 0 0 1 895.44035 512.2398499999999 383.76015 383.76015 0 0 1 127.92005 512.2398499999999a31.340412 31.340412 0 0 1 0-10.233604 167.575265 167.575265 0 0 1-127.92005-159.900062V320.359775a168.854466 168.854466 0 0 1 140.712055-163.098064A351.140537 351.140537 0 0 1 401.029357-63.400375000000054h5.756402a95.940037 95.940037 0 1 1 0 63.960025 287.180512 287.180512 0 0 0-195.717677 156.062461h35.817614A40.294816 40.294816 0 0 1 287.820112 192.43972499999995V468.747033a40.294816 40.294816 0 0 1-40.934416 39.015615H191.880075A30.061212 30.061212 0 0 1 191.880075 512.2398499999999a319.800125 319.800125 0 0 0 639.60025 0 30.061212 30.061212 0 0 1 0-3.837601h-55.005622a40.294816 40.294816 0 0 1-40.934416-39.015616V192.43972499999995a40.294816 40.294816 0 0 1 40.934416-39.015615h72.274829A170.773267 170.773267 0 0 1 1023.3604 320.359775v21.746409a167.575265 167.575265 0 0 1-127.92005 159.900062zM496.329794 0.5596500000000333a31.980012 31.980012 0 1 0-31.980013-31.980012 31.980012 31.980012 0 0 0 31.980013 31.980012zM223.860087 220.582136h-49.249219A106.813242 106.813242 0 0 0 63.960025 320.359775v21.746409a106.813242 106.813242 0 0 0 110.650843 102.33604h49.249219zM959.400375 320.359775a106.813242 106.813242 0 0 0-110.650843-102.33604h-49.24922V444.442224h49.24922A106.813242 106.813242 0 0 0 959.400375 342.106184zM650.473454 750.171143l-23.665209 8.314803a31.980012 31.980012 0 0 1-19.827608-63.960025l18.548407-7.035602a31.980012 31.980012 0 1 1 24.94441 58.843223zM305.089319 674.698314A31.980012 31.980012 0 0 1 358.17614 640.1599 202.113679 202.113679 0 0 0 511.6802 716.91193a31.980012 31.980012 0 0 1 0 63.960025 263.515303 263.515303 0 0 1-206.590881-106.173641z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="cellphone" unicode="&#59000;" d="M785.066667 896H238.933333a102.4 102.4 0 0 1-102.4-102.4v-819.2a102.4 102.4 0 0 1 102.4-102.4h546.133334a102.4 102.4 0 0 1 102.4 102.4V793.6a102.4 102.4 0 0 1-102.4 102.4zM238.933333 827.733333h546.133334a34.133333 34.133333 0 0 0 34.133333-34.133333v-648.533333H204.8V793.6a34.133333 34.133333 0 0 0 34.133333 34.133333z m546.133334-887.466666H238.933333a34.133333 34.133333 0 0 0-34.133333 34.133333v102.4h614.4v-102.4a34.133333 34.133333 0 0 0-34.133333-34.133333zM512 8.53333299999997m-34.133333 0a34.133333 34.133333 0 1 1 68.266666 0 34.133333 34.133333 0 1 1-68.266666 0ZM426.666667 725.333333h170.666666a17.066667 17.066667 0 0 1 0 34.133334h-170.666666a17.066667 17.066667 0 0 1 0-34.133334z"  horiz-adv-x="1024" />
+			<glyph glyph-name="triangle-r" unicode="&#58915;" d="M293.291 728.256l426.88-355.456-426.88-355.52z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="print" unicode="&#58989;" d="M843.946667 603.733333h-47.36V725.333333a90.026667 90.026667 0 0 1-94.72 85.333334H312.32a81.493333 81.493333 0 0 1-85.333333-85.333334v-121.6H170.666667a81.493333 81.493333 0 0 1-85.333334-85.333333v-325.12a89.173333 89.173333 0 0 1 85.333334-93.866667h56.746666v-52.48a89.6 89.6 0 0 1 89.6-89.6h389.973334a89.6 89.6 0 0 1 89.6 89.6v52.48h47.36a97.706667 97.706667 0 0 1 94.72 93.866667V518.4a90.026667 90.026667 0 0 1-94.72 85.333333zM279.466667 725.333333a30.72 30.72 0 0 0 32.853333 33.706667h389.546667c18.773333 0 42.666667-11.52 42.666666-33.706667v-121.6H279.466667z m465.066666-678.4a37.546667 37.546667 0 0 0-37.546666-37.973333H317.013333a37.546667 37.546667 0 0 0-37.546666 37.973333v170.666667a37.546667 37.546667 0 0 0 37.546666 38.4h389.973334a37.546667 37.546667 0 0 0 37.546666-37.973333z m142.506667 146.346667a45.653333 45.653333 0 0 0-42.666667-42.666667h-47.786666v66.133334a89.6 89.6 0 0 1-89.6 89.6H317.013333a89.6 89.6 0 0 1-89.6-89.6v-65.28H170.666667a37.546667 37.546667 0 0 0-33.28 42.666666v324.266667A31.146667 31.146667 0 0 0 170.666667 552.106667h673.28c19.2 0 42.666667-11.52 42.666666-33.706667z m-640 281.173333h-37.546667a13.226667 13.226667 0 0 0 0 26.026667h38.826667a13.226667 13.226667 0 1 0 0-26.026667z m94.293333 0H298.666667a13.226667 13.226667 0 1 0 0 26.026667h42.666666a13.226667 13.226667 0 0 0 0-26.026667z m426.666667-116.48H248.32a13.226667 13.226667 0 0 0 0 26.026667H768a13.226667 13.226667 0 0 0 0-26.026667z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="cols" unicode="&#58896;" d="M128 448h384V832H128z m64 320h256v-256H192zM576 832v-384h384V832z m320-320H640V768h256zM192 384h64v-384H192zM384 384h64v-384H384zM640 384h64v-384H640zM832 384h64v-384h-64z"  horiz-adv-x="1024" />
+			<glyph glyph-name="circle" unicode="&#58943;"
+				   d="M511.998 847.999C255.739 847.999 48 640.26 48 383.999c0-256.258 207.739-463.998 463.998-463.998C768.261-79.99900000000002 976 127.74199999999996 976 383.999 976 640.26 768.261 847.999 511.998 847.999zM512.002-16.000999999999976c-220.915 0-400.002 179.088-400.002 400 0 220.917 179.086 400 400.002 400 220.912 0 399.998-179.083 399.998-400C912 163.087 732.914-16.000999999999976 512.002-16.000999999999976z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="export" unicode="&#59005;" d="M896.4374528 479.830016c0 26.673152-21.6236032 48.2967552-48.2967552 48.2967552H630.8069376c-26.673152 0-48.2967552-21.6236032-48.2967552-48.2967552v-83.04831147H384.69522773l-2.71428266 5.36849067c-41.336832 87.44686933-35.95195733 204.128256 150.601728 199.94487467v-108.91537067l172.19037866 164.757504L532.58267307 822.7110912v-106.57245867c-228.64418133 5.70709333-263.651328-183.517184-157.433856-314.01028266l4.6891008-5.34664534h-88.46595414c-26.673152 0-48.2967552-21.6236032-48.2967552-48.2967552v-66.78882986h-98.43616426c-26.673152 0-40.4258816-21.6236032-30.71781547-48.2967552l79.10304427-217.33485227c9.70806613-26.673152 39.20145067-48.2967552 65.87460266-48.2967552h603.70670934c23.75898453 0 37.2506624 17.16169387 33.05745066 39.76178347 0.4980736 2.77108053 0.77441707 5.619712 0.77441707 8.53497173v463.765504z m-60.37067093-306.4528896l-21.8464256 60.02223787c-9.70806613 26.673152-39.20145067 48.2967552-65.87460267 48.2967552H303.44697173v30.56708266c0 13.336576 10.81125547 24.14783147 24.14783147 24.14783147h315.28605013v107.1972352c0 13.336576 10.81125547 24.14783147 24.14783147 24.14783147h144.88917333c13.336576 0 24.14783147-10.81125547 24.14783147-24.14783147v-270.2311424z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="slider" unicode="&#59156;" d="M228.7 683.9v-66.7H112v66.7h116.7z m333.2-266.6v-66.7H112v66.7h449.9zM295.4 150.60000000000002V84H112v66.7h183.4v-0.1z m116.6 600c9 0 16.8-3.3 23.5-9.9 6.5-6.5 9.9-14.5 9.9-23.5v-133.3c0-9-3.3-16.8-9.9-23.5-6.5-6.5-14.5-9.9-23.5-9.9H278.8c-9 0-16.8 3.3-23.5 9.9-6.5 6.5-9.9 14.3-9.9 23.5V717.1c0 9 3.3 16.8 9.9 23.5 6.5 6.5 14.3 9.9 23.5 9.9h133.3v0.1h-0.1z m66.7-533.3c9 0 16.8-3.3 23.5-9.9 6.5-6.5 9.9-14.5 9.9-23.5v-133.3c0-9-3.3-16.8-9.9-23.5-6.5-6.5-14.5-9.9-23.5-9.9H345.3c-9 0-16.8 3.3-23.5 9.9-6.5 6.5-9.9 14.5-9.9 23.5V183.89999999999998c0 9 3.3 16.8 9.9 23.5 6.5 6.5 14.3 9.9 23.5 9.9h133.4v0.1zM912 683.9v-66.7H462.1v66.7H912z m0-533.3V84H528.6v66.7h383.3v-0.1h0.1zM745.2 483.9c9 0 16.8-3.3 23.5-9.9 6.5-6.5 9.9-14.5 9.9-23.5v-133.3c0-9-3.3-16.8-9.9-23.5-6.5-6.5-14.5-9.9-23.5-9.9H612c-9 0-16.8 3.3-23.5 9.9-6.5 6.5-9.9 14.3-9.9 23.5V450.6c0 9 3.3 16.8 9.9 23.5 6.5 6.5 14.5 9.9 23.5 9.9l133.2-0.1zM912 417.3v-66.7H795.3v66.7H912z"  horiz-adv-x="1024" />
+			<glyph glyph-name="radio" unicode="&#58947;"
+				   d="M512.5 383.5m-192 0a192 192 0 1 1 384 0 192 192 0 1 1-384 0ZM511.998 847.999C255.739 847.999 48 640.26 48 383.999c0-256.258 207.739-463.998 463.998-463.998C768.261-79.99900000000002 976 127.74199999999996 976 383.999 976 640.26 768.261 847.999 511.998 847.999zM512.002-16.000999999999976c-220.915 0-400.002 179.088-400.002 400 0 220.917 179.086 400 400.002 400 220.912 0 399.998-179.083 399.998-400C912 163.087 732.914-16.000999999999976 512.002-16.000999999999976z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="subtraction" unicode="&#59006;" d="M785 348H239c-19.8 0-36 16.2-36 36s16.2 36 36 36h546c19.8 0 36-16.2 36-36s-16.2-36-36-36z"  horiz-adv-x="1024" />
 
-    
+			<glyph glyph-name="align-center" unicode="&#58951;"
+				   d="M992 448L32 448C14.32 448 0 462.336 0 480 0 497.664 14.32 512 32 512L992 512C1009.68 512 1024 497.664 1024 480 1024 462.336 1009.68 448 992 448ZM800 704C817.664 704 832 689.664 832 672 832 654.336 817.664 640 800 640L224 640C206.32 640 192 654.336 192 672 192 689.664 206.32 704 224 704L800 704ZM992 832L32 832C14.32 832 0 846.336 0 864 0 881.664 14.32 896 32 896L992 896C1009.68 896 1024 881.664 1024 864 1024 846.336 1009.68 832 992 832ZM224 256C206.32 256 192 270.336 192 288 192 305.664 206.32 320 224 320L800 320C817.664 320 832 305.664 832 288 832 270.336 817.664 256 800 256L224 256ZM32 128L992 128C1009.68 128 1024 113.66399999999999 1024 96 1024 78.33600000000001 1009.68 64 992 64L32 64C14.32 64 0 78.33600000000001 0 96 0 113.66399999999999 14.32 128 32 128ZM224-64L800-64C817.664-64 832-78.33600000000001 832-96 832-113.66399999999999 817.664-128 800-128L224-128C206.32-128 192-113.66399999999999 192-96 192-78.33600000000001 206.32-64 224-64Z"
+				   horiz-adv-x="1024"/>
 
 
-  </font>
-</defs></svg>
+			<glyph glyph-name="align-right" unicode="&#58952;"
+				   d="M992 64L32 64C14.32 64 0 78.33600000000001 0 96 0 113.66399999999999 14.32 128 32 128L992 128C1009.68 128 1024 113.66399999999999 1024 96 1024 78.33600000000001 1009.68 64 992 64ZM992 256L288 256C270.32 256 256 270.336 256 288 256 305.664 270.32 320 288 320L992 320C1009.68 320 1024 305.664 1024 288 1024 270.336 1009.68 256 992 256ZM992 448L32 448C14.32 448 0 462.336 0 480 0 497.664 14.32 512 32 512L992 512C1009.68 512 1024 497.664 1024 480 1024 462.336 1009.68 448 992 448ZM992 640L288 640C270.32 640 256 654.336 256 672 256 689.664 270.32 704 288 704L992 704C1009.68 704 1024 689.664 1024 672 1024 654.336 1009.68 640 992 640ZM992 832L32 832C14.32 832 0 846.336 0 864 0 881.664 14.32 896 32 896L992 896C1009.68 896 1024 881.664 1024 864 1024 846.336 1009.68 832 992 832ZM288-64L992-64C1009.68-64 1024-78.33600000000001 1024-96 1024-113.66399999999999 1009.68-128 992-128L288-128C270.32-128 256-113.66399999999999 256-96 256-78.33600000000001 270.32-64 288-64Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="align-left" unicode="&#58953;"
+				   d="M992 448L32 448C14.336 448 0 462.336 0 480 0 497.664 14.336 512 32 512L992 512C1009.664 512 1024 497.664 1024 480 1024 462.336 1009.664 448 992 448ZM32 704L736 704C753.68 704 768 689.664 768 672 768 654.336 753.68 640 736 640L32 640C14.336 640 0 654.336 0 672 0 689.664 14.336 704 32 704ZM992 832L32 832C14.336 832 0 846.336 0 864 0 881.664 14.336 896 32 896L992 896C1009.664 896 1024 881.664 1024 864 1024 846.336 1009.664 832 992 832ZM32 320L736 320C753.68 320 768 305.664 768 288 768 270.336 753.68 256 736 256L32 256C14.336 256 0 270.336 0 288 0 305.664 14.336 320 32 320ZM32 128L992 128C1009.664 128 1024 113.66399999999999 1024 96 1024 78.33600000000001 1009.664 64 992 64L32 64C14.336 64 0 78.33600000000001 0 96 0 113.66399999999999 14.336 128 32 128ZM32-64L736-64C753.68-64 768-78.33600000000001 768-96 768-113.66399999999999 753.68-128 736-128L32-128C14.336-128 0-113.66399999999999 0-96 0-78.33600000000001 14.336-64 32-64Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="loading-1" unicode="&#58942;"
+				   d="M537.574469 831.696462c-14.123672 0-25.574469-11.447726-25.574469-25.574469 0-14.123672 11.450796-25.574469 25.574469-25.574469 204.495464 0 370.82877-166.358889 370.82877-370.82877 0-14.123672 11.450796-25.574469 25.574469-25.574469 14.123672 0 25.574469 11.450796 25.574469 25.574469C959.551152 642.385838 770.241552 831.696462 537.574469 831.696462z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="return" unicode="&#58972;"
+				   d="M927.858848 417.938973L168.863431 417.938973l308.721247 308.86758c11.685133 11.69025 11.435447 30.881334-0.557702 42.868343-11.992125 11.985986-31.18321 12.226462-42.868343 0.536212L75.199191 411.071565c-1.994424-1.662873-3.773953-3.583618-5.294586-5.713119-4.047176-5.373381-6.013971-11.839653-5.9055-18.328437-0.12996-7.794523 2.725064-15.561417 8.595772-21.432125l361.565802-361.744881c11.685133-11.691273 30.876218-11.449773 42.868343 0.535189 11.993149 11.985986 12.242835 31.17707 0.557702 42.868343L168.441828 356.54571799999997l759.417019 0c16.527418 0 29.925566 13.738909 29.925566 30.694069S944.386266 417.938973 927.858848 417.938973z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="fonts-strong" unicode="&#58923;"
+				   d="M199.092919 848.487893l355.326704 0c70.335928 0 122.780371-2.942005 157.349701-8.809643 34.568307-5.884011 65.491597-18.131963 92.78522-36.759205 27.27725-18.627243 50.01409-43.427068 68.209498-74.397431 18.195408-30.986735 27.293623-65.699328 27.293623-104.169501 0-41.7161-11.17655-79.977519-33.496905-114.802676s-52.604078-60.951187-90.818425-78.362742c54.075593-15.765055 95.647407-42.626843 124.715443-80.585363s43.602054-82.58388 43.602054-133.877103c0-40.388872-9.417487-79.673597-28.220738-117.839849-18.803251-38.182624-44.482097-68.673056-77.035514-91.489714-32.55444-22.833031-72.702835-36.855396-120.414487-42.09984-29.931706-3.229554-102.122889-5.260817-216.572524-6.060019L199.092919-40.765192999999954 199.092919 848.487893zM378.171504 700.1084940000001l0-205.684546 117.64849 0c69.935816 0 113.410979 1.006933 130.390699 3.038196 30.730908 3.629667 54.891168 14.246469 72.478731 31.850405 17.588587 17.588587 26.381857 40.756239 26.381857 69.473281 0 27.501354-7.594979 49.838082-22.75219 67.042929-15.158235 17.188474-37.702694 27.597545-67.618027 31.242562-17.796318 2.01489-68.945255 3.038196-153.431461 3.038196L378.171504 700.109518zM378.171504 346.04454999999996l0-236.383732 166.622902 0c64.85203 0 106.008382 1.807159 123.43631 5.420453 26.750247 4.828982 48.543599 16.58063 65.363683 35.272341s25.247011 43.714617 25.247011 75.085092c0 26.526143-6.491855 49.03888-19.459191 67.538209-12.983709 18.48398-31.722492 31.961946-56.250118 40.404222s-77.739549 12.663414-159.619394 12.663414L378.171504 346.04454999999996z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="upload" unicode="&#59004;"
+				   d="M831.488 478.208C831.488 478.208 831.488 478.208 831.488 478.208c0 143.36-114.688 258.048-253.952 258.048-98.304 0-184.32-57.344-225.28-139.264C327.68 605.184 307.2 609.28 286.72 609.28c-90.112 0-159.744-73.728-159.744-159.744 0-16.384 4.096-28.672 8.192-40.96C57.344 379.904 0 310.27200000000005 0 224.25599999999997c0-106.496 86.016-192.512 192.512-192.512l192.512 0 0 192.512L258.048 224.25599999999997l258.048 258.048 258.048-258.048-126.976 0 0-192.512 192.512 0L839.68 35.84000000000003c106.496 16.384 192.512 110.592 192.512 221.184C1024 371.712 937.984 465.92 831.488 478.208z"
+				   horiz-adv-x="1033"/>
+
+
+			<glyph glyph-name="dialogue" unicode="&#58938;"
+				   d="M998.4 500.992C998.4 682.24 811.392 829.696 581.632 829.696c-121.216 0-235.904-41.472-315.264-114.048 37.504 8.192 76.416 13.056 115.456 14.464 59.264 30.592 128.256 46.72 199.808 46.72 198.144 0 359.296-123.776 359.296-275.968 0-31.872-7.04-63.232-20.992-93.056 7.552-28.16 11.264-57.344 11.008-86.528C975.104 374.784 998.4 436.736 998.4 500.992L998.4 500.992zM442.368 398.72c-30.72 0-55.808-23.04-55.808-51.328s25.088-51.328 55.808-51.328 55.808 23.04 55.808 51.328S473.088 398.72 442.368 398.72zM243.328 398.72c-30.72 0-55.808-23.04-55.808-51.328s25.088-51.328 55.808-51.328 55.808 23.04 55.808 51.328C299.264 375.67999999999995 274.176 398.72 243.328 398.72zM641.28 398.72c-30.72 0-55.808-23.04-55.808-51.328s25.088-51.328 55.808-51.328 55.808 23.04 55.808 51.328S672.128 398.72 641.28 398.72zM442.368 677.888C212.608 677.888 25.6 530.432 25.6 349.312c0-179.968 173.696-296.192 332.544-321.664l60.8-78.336c5.632-7.424 14.464-11.008 23.296-11.008 8.832 0 17.792 3.712 23.424 11.008l60.8 78.464C685.312 53.24800000000005 859.008 169.47199999999998 859.008 349.44000000000005 859.136 530.432 672.128 677.888 442.368 677.888zM714.88 173.82399999999996c-52.224-45.184-124.288-77.952-197.376-89.6C503.168 81.91999999999996 490.112 74.24000000000001 481.28 62.72000000000003l-38.784-49.92-38.912 49.92c-8.96 11.52-21.888 19.2-36.224 21.504-73.216 11.776-145.152 44.416-197.376 89.728-39.68 34.304-86.912 92.544-86.912 175.36 0 69.76 35.584 136.192 100.352 187.264 68.736 54.144 160.768 84.096 258.944 84.096 98.304 0 190.336-29.824 259.072-84.096 64.768-51.072 100.352-117.504 100.352-187.264C801.664 266.36800000000005 754.56 208.12800000000004 714.88 173.82399999999996z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="video" unicode="&#59117;"
+				   d="M952.523633 599.2477269999999L952.523633 599.2477269999999 952.523633 599.2477269999999zM100.53762400000005 661.054062C100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062 100.53762400000005 661.054062zM100.74228 720.404517L100.74228 720.404517 100.74228 720.404517zM660.990107 739.9449716666666c8.697911 0 17.498151-0.511642 25.684421-2.353553 12.279404-2.865194 23.22854-8.18627 34.382332-16.679524 15.144599-11.460777 26.196063-29.572899 32.02878-52.187469 3.479165-13.405016 2.967523-28.651944 2.558209-42.05696-0.102328-4.195463-0.204657-8.083941-0.204657-11.665434l0-37.759169 101.407415 70.401919 25.479764 17.60048c0.511642 0.306985 1.330269 1.023284 2.148896 1.637254 4.40012 3.376836 11.051464 8.595583 20.977316 11.051464 3.274508 0.818627 6.549016 1.22794 10.02818 1.22794 9.618867 0 19.44239-3.274508 27.730987999999996-9.311882 18.82842-13.916657999999998 18.726092-35.405616 18.726092-51.061857 0-1.023284 0-2.148896 0-3.172179l0-409.620466c0-15.963226 0.102328-37.963825-19.647047-51.982812-6.753672-4.809433-16.679524-8.390926-27.219346-8.390926-5.01409 0-10.130509 0.818627-15.144599 2.762866-7.162986 2.762866-12.279404 6.856000999999999-16.065554 9.823524-0.920955 0.716299-1.841911 1.432597-2.353553 1.841911l-24.968122 17.395823-101.10043 70.094934 0-37.963825c0-3.581493 0.102328-7.367643 0.204657-11.460777 0.409313-14.735285 0.818627-29.982212-2.865194-43.796542-5.62806-21.488957999999997-16.679524-39.396423-31.107825-50.447886-7.879285-6.037374-18.930748-13.405016-34.075347-16.986509-7.776956-1.841911-16.167882-2.353553-24.45648-2.353553-4.297792 0-8.595583 0.102328-12.688718 0.204657-3.683821 0.102328-7.162986 0.204657-10.232837 0.204657L167.15339300000005 84.94107466666674c-1.944239 0-3.888478 0-5.832717 0-1.944239 0-3.990806 0-5.935045 0-16.577196 0-33.461377 0.61397-47.787349 6.549016-27.935644999999997 11.563106-46.764065 37.759169-53.006096 73.574098l-0.409313 2.251224 0 2.353553c-0.102328 18.930748-0.204657 37.861497-0.306985 56.792245l0 0.511642L53.87588699999998 598.0155226666666c0 4.40012-0.102328 8.902568-0.102328 13.712001999999998-0.306985 27.01469-0.716299 54.950335 9.311882 76.643949 9.823524 21.284300999999996 27.526331999999996 38.066154 48.708304 45.945438 5.730389 2.148896 11.051464 2.762866 15.04227 3.172179 1.023284 0.102328 2.353553 0.306985 3.069851 0.409313l4.093135 1.534926 500.9997 0c3.581493 0 7.572299 0.102328 11.767763 0.306985C651.166583 739.7403146666667 656.078345 739.9449716666666 660.990107 739.9449716666666M304.273409 266.7785886666668L559.889677 394.2797376666667l0 33.973019L304.273409 555.9585626666667 304.273409 266.7785886666668M660.990107 780.8763196666666c-5.62806 0-10.949136-0.204657-15.758569-0.306985-3.888478-0.102328-7.469971-0.204657-10.437494-0.204657L133.79434400000002 780.3646776666667l-7.265314 0-6.446687-2.353553c-5.3210749999999996-0.61397-13.609673-1.841911-22.716898-5.218747-31.210153-11.665434-57.303887-36.121915-71.629859-67.229739-13.814329999999998-30.084541-13.405016-64.159888-12.995703-94.244429 0.102328-4.604777 0.102328-9.004897 0.102328-13.20036l0-371.349655 0-0.102328 0-0.102328 0-0.511642c0.102328-18.930748 0.204657-37.861497 0.306985-56.792245l0-2.251224 0-3.479165 0.61397-3.376836 0.409313-2.251224c4.195463-23.944839 12.791046-45.126811 25.479764-62.727291 13.609673-18.82842 31.107825-32.847407 52.08514-41.545318 21.488957999999997-8.902568 44.001199-9.618867 63.443589-9.618867 2.046567 0 4.093135 0 6.139702 0 1.841911 0 3.78615 0 5.62806 0l473.166384 0c2.558209 0 5.62806-0.102328 9.004897-0.204657 4.195463-0.102328 8.902568-0.306985 13.916657999999998-0.306985 13.302688 0 24.149495 1.125612 33.973019 3.479165 22.819227 5.423404 39.089437 16.474868 49.322274 24.251824 21.693613999999997 16.577196 37.963825 42.363944999999994 45.84311 72.653143 2.251224 8.595583 3.376836 17.088838 3.990806 25.377436l36.838213-25.582093 24.558809-17.088838c0.306985-0.204657 0.61397-0.511642 0.920955-0.716299 4.809433-3.683821 13.609673-10.642149999999999 26.400719-15.656241 9.516538-3.683821 19.647047-5.62806 30.084541-5.62806 18.009793 0 36.53122799999999 5.832717 50.8572 15.963226 16.577196 11.767763 27.730987999999996 27.935644999999997 33.052064 48.094334 3.78615 14.4283 3.78615 27.628659999999996 3.78615 37.34985499999999l0 409.518137c0 0.920955 0 1.739582 0 2.660538l0 0.409313c0 9.41421 0.102328 22.409913-3.479165 36.53122799999999-5.116419 19.749375-15.758569 35.81493-31.721795 47.68502-15.144599 11.153792-33.666034 17.293495-52.08514 17.293495-6.753672 0-13.507345-0.818627-19.954032-2.455881-18.21445-4.604777-30.289198-13.916657999999998-36.019586-18.419107l0 0c-0.204657-0.204657-0.511642-0.409313-0.716299-0.511642l-25.172779-17.293495-0.102328 0-0.102328 0-37.14519799999999-25.786749c-0.511642 7.674628-1.637254 15.553912-3.683821 23.433197-8.18627 31.721795-24.354152 57.508544-46.866394 74.597382-15.758569 11.972419-32.02878 19.851704-49.833916 23.944839C685.8559009999999 779.7507076666667 674.702109 780.8763196666666 660.990107 780.8763196666666L660.990107 780.8763196666666zM345.204757 332.9850436666668L345.204757 489.75210666666663l157.074048-78.48586L345.204757 332.9850436666668 345.204757 332.9850436666668zM347.455981 429.177975L347.455981 308.02118499999995 347.455981 429.177975Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="headset" unicode="&#59132;"
+				   d="M356.285031 2.1522690000000466L356.396571 2.1522690000000466 356.396571 285.236626 253.462201 285.236626 253.462201 2.1522690000000466ZM665.076886 285.236626l103.042841 0 0-283.08538-103.042841 0 0 283.08538ZM63.809793 301.950286c0-38.758746-3.195785-112.220874 5.457292-148.208507l65.735144 0c-10.112312 35.644825-7.747451 109.176538-7.747451 148.208507 0 219.937155 172.264389 398.231887 384.763131 398.231887 212.498742 0 384.763131-178.294732 384.763131-398.231887 0-39.031968 2.266623-112.563682-7.845689-148.208507l65.735144 0c8.653077 35.987632 5.555529 109.449761 5.555529 148.208507 0 256.20415-200.670346 463.898469-448.208115 463.898469C264.479115 765.848755 63.809793 558.1544349999999 63.809793 301.950286z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="cellphone-fine" unicode="&#58939;"
+				   d="M731.514252 896L292.485748 896C195.323702 896 116.154627 816.830925 116.154627 719.6688790000001l0-671.337759c0-97.162046 79.169075-176.331121 176.331121-176.331121l438.628661 0c97.162046 0 176.331121 79.169075 176.331121 176.331121L907.445529 719.6688790000001C907.845373 816.830925 828.676298 896 731.514252 896zM292.485748 853.216712l438.628661 0c70.772355 0 128.349863-55.178446 133.147989-124.751269L159.737602 728.465443C164.135884 798.038266 222.113237 853.216712 292.485748 853.216712zM865.062085 48.73096399999997c0-73.571261-59.976572-133.547833-133.547833-133.547833L292.485748-84.816868c-73.571261 0-133.547833 59.976572-133.547833 133.547833l0 45.582194 705.724326 0L864.662241 48.73096399999997zM865.062085 137.096447L158.937915 137.096447 158.937915 685.682155l705.724326 0L864.662241 137.096447zM512-54.82858299999998c13.59469 0 26.789535 5.597813 36.385787 15.194065 9.596251 9.596251 15.194065 22.791097 15.194065 36.385787 0 13.59469-5.597813 26.789535-15.194065 36.385787-9.596251 9.596251-22.791097 15.194065-36.385787 15.194065-13.59469 0-26.789535-5.597813-36.385787-15.194065-9.596251-9.596251-15.194065-22.791097-15.194065-36.385787 0-13.59469 5.597813-26.789535 15.194065-36.385787C485.210465-49.23076900000001 498.40531-54.82858299999998 512-54.82858299999998z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="add-1" unicode="&#58964;"
+				   d="M566.935 57.63900000000001c0-30.366-24.612-54.972-54.935-54.972v0c-30.384 0-54.996 24.612-54.996 54.972v610.057c0 30.361 24.612 54.972 54.996 54.972v0c30.33 0 54.935-24.612 54.935-54.972v-610.057zM817.004 417.633c30.384 0 54.996-24.606 54.996-54.966v0c0-30.354-24.612-54.966-54.996-54.966h-610.062c-30.33 0-54.942 24.612-54.942 54.966v0c0 30.359 24.612 54.966 54.942 54.966h610.062zM817.004 417.633z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="face-smile-b" unicode="&#58960;"
+				   d="M511.931733-128c-136.738133 0-265.284267 53.213867-361.984 149.879467C53.282133 118.51093300000002 0 247.09119999999996 0 384c0 136.738133 53.282133 265.3184 150.050133 362.0864C246.749867 842.683733 375.296 896 512.136533 896s265.4208-53.316267 362.1888-149.9136c199.645867-199.714133 199.543467-524.5952 0-724.206933C777.454933-74.71786699999996 648.772267-128 511.931733-128L511.931733-128 511.931733-128 511.931733-128 511.931733-128 511.931733-128zM512.034133 829.303467c-118.920533 0-230.741333-46.2848-314.914133-130.389333C113.083733 614.8778669999999 66.7648 502.8864 66.7648 384c0-118.9888 46.2848-230.912 130.3552-315.016533 84.0704-84.0704 195.857067-130.321067 314.811733-130.321067 119.022933 0 230.946133 46.318933 315.016533 130.423467 173.704533 173.636267 173.704533 456.157867 0 629.794133C742.877867 782.984533 631.057067 829.303467 512.034133 829.303467L512.034133 829.303467 512.034133 829.303467 512.034133 829.303467 512.034133 829.303467 512.034133 829.303467zM330.103467 244.25813300000004c0 0 59.904-95.9488 181.828267-95.9488s201.8304 95.9488 201.8304 95.9488 45.294933 0.136533 45.192533-47.957333c0 0-78.506667-111.8208-247.022933-111.8208s-223.368533 111.8208-223.368533 111.8208S286.856533 244.25813300000004 330.103467 244.25813300000004L330.103467 244.25813300000004 330.103467 244.25813300000004 330.103467 244.25813300000004 330.103467 244.25813300000004zM363.2128 548.590933c-34.5088 0-62.702933-28.091733-62.702933-62.737067 0-34.679467 28.194133-62.6688 62.702933-62.6688 34.679467 0 62.702933 28.091733 62.702933 62.6688C425.915733 520.4992 397.858133 548.590933 363.2128 548.590933L363.2128 548.590933 363.2128 548.590933 363.2128 548.590933 363.2128 548.590933 363.2128 548.590933zM684.544 548.590933c-34.679467 0-62.702933-28.091733-62.702933-62.737067 0-34.679467 28.023467-62.6688 62.702933-62.6688 34.6112 0 62.600533 28.091733 62.600533 62.6688C747.144533 520.4992 719.121067 548.590933 684.544 548.590933L684.544 548.590933 684.544 548.590933 684.544 548.590933 684.544 548.590933 684.544 548.590933zM684.544 548.590933"
+				   horiz-adv-x="1025"/>
+
+
+			<glyph glyph-name="fonts-html" unicode="&#58955;"
+				   d="M194.33 416.235h-101.295v101.28h-46.035v-267.03h46.035v119.7h101.28v-119.7h46.035v267.03h-46.035v-101.28zM277.205 480.69h73.665v-230.205h46.035v230.205h73.665v36.825h-193.365v-36.825zM627.815 335.58000000000004l-46.755 181.935h-73.665v-267.03h46.035v211.785l46.035-211.785h55.245l46.83 213.93-0.795-213.93h46.035v267.03h-73.665l-45.3-181.935zM848.09 287.30999999999995v230.205h-46.035v-267.03h174.945v36.825h-128.91z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="screen-full" unicode="&#58914;"
+				   d="M641.750109 511.899972l205.227128 204.519-0.704035-115.89966c-0.282433-9.611915 7.489578-18.09103 17.101493-17.808598l12.297071 0c9.611915 0.283456 17.667382 5.936199 17.808598 15.689331l0.565888 172.57752c0 0.14224 0.282433 9.187243 0.282433 9.187243 0.14224 4.804423-0.99056 9.187243-4.100388 12.297071-3.109828 3.109828-7.347339 5.086855-12.297071 4.946662l-8.763594-0.14224c-0.141216 0-0.278339 0-0.420579-0.14224L697.581696 797.833213c-9.611915-0.283456-17.667382-8.200776-17.808598-17.950837l0-12.297071c1.416256-11.44875 10.458189-18.092054 20.070104-17.808598l112.789832-0.283456-204.66124-203.814965c-9.329483-9.329483-9.329483-24.449855 0-33.778314 9.329483-9.470699 24.452925-9.470699 33.782408 0L641.750109 511.899972zM383.095141 319.11010699999997L177.726797 115.29411900000002l0.707105 115.338888c0.283456 9.607822-7.492648 18.086937-17.104563 17.808598l-13.001105 0c-9.611915-0.283456-17.667382-5.937223-17.808598-15.690354l-0.565888-172.718737c0-0.14224-0.282433-9.187243-0.282433-9.187243-0.14224-4.808516 0.99056-9.187243 4.096295-12.297071 3.109828-3.109828 7.351432-5.086855 12.297071-4.946662l8.762571 0.14224c0.14224 0 0.283456 0 0.425695 0.14224l171.873486-0.708128c9.607822 0.283456 17.667382 8.196683 17.808598 17.950837L344.93503 63.42477399999996c-1.415232 11.44875-10.461259 18.092054-20.074198 17.808598L212.069977 81.51682800000003 416.59 285.32872299999997c9.329483 9.329483 9.329483 24.453948 0 33.782408C407.40685 328.58182999999997 392.424624 328.58182999999997 383.095141 319.11010699999997L383.095141 319.11010699999997zM894.047276 60.03251399999999l-0.424672 172.718737c-0.283456 9.612938-8.200776 15.406898-17.809621 15.690354l-12.296047 0c-9.612938 0.278339-17.243733-8.200776-17.105586-17.808598l0.708128-115.903753L641.750109 319.11010699999997c-9.329483 9.329483-24.452925 9.329483-33.782408 0-9.325389-9.328459-9.325389-24.452925 0-33.782408L812.490795 81.51682800000003l-112.789832-0.283456c-9.611915 0.283456-18.515702-6.502088-20.073174-17.808598l0-12.297071c0.282433-9.611915 8.200776-17.667382 17.808598-17.950837l171.166381 0.708128c0.141216 0 0.282433-0.14224 0.424672-0.14224l8.763594-0.14224c4.803399-0.141216 9.187243 1.694595 12.296047 4.946662 3.109828 3.109828 4.238534 7.488555 4.097318 12.297071 0 0-0.14224 9.046027-0.14224 9.187243L894.047276 60.03149099999996zM212.216309 749.493252l112.789832 0.283456c9.607822-0.283456 18.512632 6.502088 20.070104 17.808598L345.076246 779.883399c-0.283456 9.611915-8.196683 17.667382-17.808598 17.950837l-172.011632-0.708128c-0.14224 0-0.283456 0.14224-0.425695 0.14224l-8.761548 0.14224c-4.808516 0.141216-9.187243-1.694595-12.297071-4.946662-3.109828-3.109828-4.242627-7.488555-4.096295-12.297071 0 0 0.282433-9.046027 0.282433-9.187243l0.420579-172.718737c0.14224-9.608845 8.200776-15.406898 17.808598-15.686261l13.005198 0c9.611915-0.282433 17.242709 8.196683 17.10047 17.808598l-0.564865 115.334795 205.231221-203.958228c9.324366-9.329483 24.448832-9.329483 33.777291 0 9.329483 9.329483 9.329483 24.452925 0 33.782408L212.216309 749.493252 212.216309 749.493252zM212.216309 749.493252"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="form" unicode="&#58940;"
+				   d="M314.278111 437.019389l395.439892 0 0-30.297458-395.439892 0L314.278111 437.019389zM314.278111 315.83495200000004l395.439892 0 0-30.297458-395.439892 0L314.278111 315.83495200000004zM314.278111 194.62833l263.626661 0 0-30.297458L314.278111 164.330872 314.278111 194.62833zM609.376235 739.9931730000001c-7.849678 42.966669-48.394988 75.742447-97.378777 75.742447-48.961604 0-89.51311-32.775778-97.380776-75.742447L116.55177 739.9931730000001l0-787.725922 790.893774 0 0 787.725922L609.376235 739.9931730000001zM446.091342 670.440529l0 17.613058 0 36.791056c0 33.410348 29.57295 60.594317 65.906116 60.594317 36.352353 0 65.907115-27.183969 65.907115-60.594317l0-36.791056 0-17.621053 16.672696-8.712493c32.358061-16.929922 57.169039-42.663874 71.406386-73.213161L358.043239 588.50688c14.240345 30.555683 39.051523 56.281241 71.408385 73.213161L446.091342 670.440529zM874.489888-17.436289999999985L149.505227-17.436289999999985 149.505227 709.694715 413.138884 709.694715l0-21.641327c-51.44492-26.923746-88.727643-74.124144-98.86377-129.845165l395.44289 0c-10.102151 55.730615-47.40466 102.921419-98.859773 129.845165l0 21.641327 263.631658 0L874.489888-17.436289999999985z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="cart" unicode="&#58967;"
+				   d="M365.920994 84.618469c-39.030945 0-70.78516-31.754215-70.78516-70.78516s31.754215-70.784136 70.78516-70.784136c39.030945 0 70.784136 31.753191 70.784136 70.784136S404.951939 84.618469 365.920994 84.618469zM365.920994-5.784493999999995c-10.818393 0-19.61985 8.801457-19.61985 19.618826 0 10.818393 8.801457 19.61985 19.61985 19.61985s19.618826-8.801457 19.618826-19.61985C385.540843 3.015939000000003 376.739387-5.784493999999995 365.920994-5.784493999999995zM808.821219 84.618469c-39.030945 0-70.784136-31.754215-70.784136-70.78516s31.753191-70.784136 70.784136-70.784136 70.78516 31.753191 70.78516 70.784136S847.852164 84.618469 808.821219 84.618469zM808.821219-5.784493999999995c-10.81737 0-19.618826 8.801457-19.618826 19.618826 0 10.818393 8.801457 19.61985 19.618826 19.61985 10.818393 0 19.61985-8.801457 19.61985-19.61985C828.441069 3.015939000000003 819.640636-5.784493999999995 808.821219-5.784493999999995zM443.99107 305.940157c-14.057157-1.416256-24.305569-13.959943-22.890336-28.0171 1.328251-13.187347 12.446473-23.02132 25.423019-23.02132 0.856507 0 1.723248 0.042979 2.594081 0.130983l439.314561 44.245713c0.088004 0.007163 0.174985 0.01842 0.261966 0.026606l0.180102 0.01842c0.50449 0.051165 1.001817 0.119727 1.496074 0.198521 0.222057 0.035816 0.443092 0.076748 0.663102 0.11768 0.552585 0.103354 1.100054 0.217964 1.638313 0.355087 0.085958 0.022513 0.169869 0.047072 0.254803 0.069585 0.586354 0.156566 1.161453 0.334621 1.728364 0.530073 0.077771 0.026606 0.155543 0.051165 0.233314 0.078795 0.626263 0.222057 1.239224 0.469698 1.840928 0.737804 0.039909 0.017396 0.078795 0.035816 0.118704 0.054235 1.277086 0.577145 2.496867 1.252527 3.647063 2.020006 0.001023 0.001023 0.002047 0.001023 0.00307 0.002047 0.553609 0.369414 1.088798 0.76134 1.609661 1.170662 0.069585 0.054235 0.137123 0.10847 0.205685 0.163729 0.48607 0.38988 0.958838 0.795109 1.413186 1.218758 0.092098 0.084934 0.180102 0.173962 0.270153 0.25992 0.394996 0.378623 0.778736 0.76748 1.14815 1.169639 0.11154 0.121773 0.222057 0.243547 0.331551 0.367367 0.333598 0.3776 0.653893 0.766456 0.964978 1.163499 0.12382 0.158612 0.249687 0.314155 0.370437 0.475837 0.322341 0.432859 0.629333 0.876973 0.925069 1.329275 0.113587 0.173962 0.224104 0.348947 0.333598 0.525979 0.296759 0.479931 0.580215 0.968048 0.845251 1.467421 0.069585 0.130983 0.134053 0.265036 0.201591 0.397043 0.289596 0.568958 0.563842 1.147126 0.811482 1.738597 0.00307 0.007163 0.005117 0.014326 0.008186 0.021489 0.569982 1.369184 1.019213 2.796696 1.345648 4.26514 0 0.001023 0 0.002047 0.001023 0.00307l0.00307 0.013303c0.035816 0.162706 0.075725 0.323365 0.10847 0.487094l56.17951 252.734118c0.895393 4.030803 0.780783 8.04728-0.165776 11.794627 0.50449 2.003634 0.774643 4.101411 0.774643 6.261611 0 14.128789-11.452843 25.582655-25.582655 25.582655L195.47502 616.098125l-52.358485 159.553902c-3.631714 11.067057-14.093996 17.972327-25.177426 17.590634-0.207731 0.005117-0.413416 0.01535-0.62217 0.01535L54.663994 793.258011c-14.128789 0-25.582655-11.453866-25.582655-25.582655s11.453866-25.582655 25.582655-25.582655l45.614897 0 197.955514-603.235934c3.536546-10.776438 13.546527-17.613146 24.303522-17.613146 2.067079 0 4.16281 0.26299 6.245238 0.788969l567.583946 0c14.129812 0 25.582655 11.453866 25.582655 25.582655s-11.452843 25.582655-25.582655 25.582655L340.816223 173.1979 212.265428 564.933839l701.224666 0-48.137347-216.557174L443.99107 305.940157z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="camera-fill" unicode="&#58973;"
+				   d="M512 480C436.515555 480 375.111111 419.712 375.111111 345.6 375.111111 271.48800000000006 436.515555 211.20000000000005 512 211.20000000000005 587.484446 211.20000000000005 648.888887 271.48800000000006 648.888887 345.6 648.888887 419.712 587.484446 480 512 480M512 172.79999999999995C414.808889 172.79999999999995 336 250.15679999999998 336 345.6 336 441.0432 414.808889 518.4 512 518.4 609.210667 518.4 688 441.0432 688 345.6 688 250.15679999999998 609.210667 172.79999999999995 512 172.79999999999995M903.111113 691.2L723.767113 691.2C713.383113 691.2 703.448887 695.2512 696.115554 702.4512L640.792887 756.7488C633.459554 763.9488 623.505779 768 613.141333 768L512 768 410.878222 768C400.494222 768 390.56 763.9488 383.226667 756.7488L327.904 702.4512C320.570667 695.2512 310.616889 691.2 300.252445 691.2L120.888889 691.2C77.866667 691.2 42.666667 656.64 42.666667 614.4L42.666667 76.79999999999995C42.666667 34.559999999999945 77.866667 0 120.888889 0L903.111113 0C946.133333 0 981.333333 34.559999999999945 981.333333 76.79999999999995L981.333333 614.4C981.333333 656.64 946.133333 691.2 903.111113 691.2"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="tabs" unicode="&#58922;"
+				   d="M310.30303 523.636364L124.121212 523.636364c-17.128727 0-31.030303-13.901576-31.030303-31.030303l0-186.181818c0-17.128727 13.901576-31.030303 31.030303-31.030303l186.181818 0c17.128727 0 31.030303 13.901576 31.030303 31.030303L341.333333 492.606061C341.333333 509.734788 327.431758 523.636364 310.30303 523.636364zM294.787879 306.42424200000005L139.636364 306.42424200000005c-17.128727 0-15.515152-1.613576-15.515152 15.515152L124.121212 477.090909c0 17.128727-1.613576 15.515152 15.515152 15.515152l155.151515 0c17.128727 0 15.515152 1.613576 15.515152-15.515152l0-155.151515C310.30303 304.81066699999997 311.916606 306.42424200000005 294.787879 306.42424200000005zM418.909091 352.969697l480.969697 0 0 31.030303L418.909091 384 418.909091 352.969697zM418.909091 228.84848499999998l480.969697 0 0 31.030303L418.909091 259.878788 418.909091 228.84848499999998zM418.909091 89.21212100000002l480.969697 0 0 31.030303L418.909091 120.24242400000003 418.909091 89.21212100000002zM418.909091 492.606061l480.969697 0 0 31.030303L418.909091 523.636364 418.909091 492.606061zM992.969697 725.333333l-15.515152 0L977.454545 849.454545c0 17.128727-13.901576 31.030303-31.030303 31.030303L775.757576 880.484848c-17.128727 0-31.030303-13.901576-31.030303-31.030303l0-124.121212-139.636364 0L605.090909 849.454545c0 17.128727-13.901576 31.030303-31.030303 31.030303L403.393939 880.484848c-17.128727 0-31.030303-13.901576-31.030303-31.030303l0-124.121212-124.121212 0L248.242424 849.454545c0 17.128727-13.901576 31.030303-31.030303 31.030303L31.030303 880.484848C13.901576 880.484848 0 866.583273 0 849.454545l0-946.424242c0-17.128727 13.901576-31.030303 31.030303-31.030303l961.939394 0c17.128727 0 31.030303 13.901576 31.030303 31.030303L1024 694.30303C1024 711.431758 1010.098424 725.333333 992.969697 725.333333zM992.969697-65.939394c0-17.128727-13.901576-31.030303-31.030303-31.030303L62.060606-96.969697c-17.128727 0-31.030303 13.901576-31.030303 31.030303L31.030303 818.424242c0 17.128727 13.901576 31.030303 31.030303 31.030303l124.121212 0c17.128727 0 31.030303-13.901576 31.030303-31.030303l0-124.121212 744.727273 0c17.128727 0 31.030303-13.901576 31.030303-31.030303L992.969697-65.939394z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="fonts-code" unicode="&#58958;"
+				   d="M270 626c-12 12-32 12-44 0L9 409c-12-12-12-32 0-44l217-217c6-6 14-9 22-9s16 3 22 9c12 12 12 32 0 44L75 387 270 582C282 595 282 614 270 626zM1015 409L798 626c-12 12-32 12-44 0-12-12-12-32 0-44l195-195L754 192c-12-12-12-32 0-44 6-6 14-9 22-9s16 3 22 9l217 217C1027 377 1027 397 1015 409zM624 696L624 696c-16 6-34-3-40-19L382 119c-6-16 2-34 19-40l0 0c16-6 34 3 40 19l202 558C648 672 640 690 624 696z"
+				   horiz-adv-x="1025"/>
+
+
+			<glyph glyph-name="fire" unicode="&#59222;"
+				   d="M890.059904 352.19948999999997C845.890699 458.956706 840.554889 548.4951550000001 857.396326 618.42714 859.144623 625.686731 860.991676 631.9776790000001 862.858846 637.425182 863.763607 640.064841 865.906573 645.659889 866.16406 646.532651L880.890349 696.448108 833.062903 675.9309969999999C832.106692 675.5208 830.618069 674.894716 827.426684 673.550492 824.667648 672.380966 822.310677 671.354022 819.868514 670.244809 813.291441 667.2575449999999 807.049466 664.090938 800.697749 660.4128450000001 784.089623 650.795565 768.486253 638.656896 753.86285 623.033596 727.630498 595.007563 706.526618 557.766355 691.78157 509.713231 675.041103 455.157161 671.516484 411.46006 673.004574 347.939834 673.477918 327.73476900000003 673.463923 322.197583 672.83965 318.324215 673.779618 324.156339 684.455526 333.67819899999995 696.104608 329.19567600000005 693.056849 330.36844199999996 685.695898 339.012828 676.314007 361.368339 660.550914 398.92921 646.834249 460.170272 636.817284 549.350468 625.445924 650.588768 630.103925 734.7280519999999 644.646978 801.338628 647.677924 815.221065 650.899934 827.082435 654.086773 836.904609 655.91465 842.538316 657.254607 846.094657 657.880284 847.554385L678.645286 896 628.243642 880.578031C617.409833 877.263087 599.94569 869.52239 578.105438 855.845223 542.547644 833.577626 507.199569 802.385036 474.400401 760.836776 447.596676 726.883228 423.611383 687.30061 403.118547 641.7016189999999 378.907516 587.829195 363.003277 542.798944 353.158029 503.238462 349.274261 487.632585 346.433259 473.323627 344.1945 458.925156 343.334411 453.39353 342.592734 448.063234 341.804612 441.911844 341.502524 439.553997 340.356619 430.329551 340.073506 428.145504 337.596047 409.033293 335.848224 404.35337 329.235273 398.312868 336.081933 404.566848 343.232634 404.098227 346.608002 402.086756 344.852318 403.133013 341.598345 406.493651 337.991853 411.887149 327.030897 428.279226 317.980358 454.883162 313.690598 489.339595 311.250185 508.941598 310.203772 539.08627 310.370048 576.545325 310.480474 601.422138 311.113088 628.122479 312.099068 654.977888 312.481453 665.393013 312.891081 675.105466 313.30045 683.8491750000001 313.545346 689.079919 313.735044 692.813105 313.84201 694.783403L317.55517 763.179488 271.360516 712.604139C270.467691 711.626645 268.852992 709.837042 266.618705 707.326295 262.927895 703.178805 258.823678 698.493751 254.407949 693.3614689999999 241.78797 678.693606 229.164348 663.340425 217.341267 648.004036 211.724185 640.717803 206.411389 633.591345 201.450577 626.6638379999999 176.017063 591.147305 156.617347 555.4025280000001 138.122768 512.155497 90.841957 401.595812 76.97672 299.64870599999995 99.261816 188.13489300000003 126.80821 50.29373899999996 188.553235-37.64422200000001 278.8297-84.690336 344.19104-118.75233700000001 408.837235-128 507.940695-128 525.713007-128 557.977207-125.567138 590.857378-120.46215900000004 641.152493-112.65333099999998 687.496192-99.78932299999997 726.063273-80.59104400000001 738.155853-74.57148800000004 743.07901-59.88870199999997 737.059454-47.79612199999997 731.039898-35.70354299999997 716.357111-30.780384000000026 704.264531-36.79993999999999 670.855859-53.43041900000003 629.092954-65.02289699999994 583.352478-72.12456999999995 552.984316-76.83953499999996 523.228215-79.08327499999996 507.940695-79.08327499999996 416.16215-79.08327499999996 357.934257-70.75375399999996 301.436271-41.310745999999995 224.830174-1.3887230000000272 171.977796 73.88423 147.230072 197.72094500000003 126.99711 298.965952 139.514783 391.004811 183.099329 492.921284 200.282663 533.1021499999999 218.020237 565.784358 241.22153 598.183718 245.831691 604.6215589999999 250.802959 611.289899 256.082244 618.137961 267.31885 632.713596 279.402035 647.409487 291.488864 661.457681 298.732051 669.8762429999999 304.338773 676.1767130000001 307.478705 679.614406L264.997214 697.435142C264.883874 695.347445 264.688038 691.493511 264.43725 686.13688 264.020474 677.234965 263.603959 667.359281 263.215279 656.7726250000001 262.21142 629.430212 261.566827 602.224414 261.453805 576.7624579999999 261.278897 537.3588179999999 262.385015 505.49418 265.148621 483.296209 276.058157 395.668083 322.627019 326.024497 362.226031 362.19561799999997 379.341732 377.829698 384.756649 392.328523 388.584361 421.857186 397.932742 493.974714 407.332926 531.746825 447.736538 621.64966 466.587287 663.594818 488.484326 699.731218 512.795234 730.526996 542.034492 767.565749 573.156162 795.028785 604.068111 814.386984 614.696751 821.043029 624.472062 826.201428 633.124687 830.036563 638.02329 832.207788 641.258688 833.404991 642.556233 833.802016L612.91959 866.825663C608.658554 856.884484 602.686705 838.478616 596.856038 811.772799 581.186705 740.003594 576.231674 650.498985 588.206246 543.890345 607.295279 373.94226100000003 638.819345 298.82556999999997 678.537329 283.542234 701.302332 274.78234499999996 717.731637 289.43566899999996 721.133156 310.5407 722.475759 318.870999 722.489387 324.26340300000004 721.907881 349.08549100000005 720.532565 407.791853 723.691247 446.952173 738.546223 495.36355 751.151827 536.44438 768.544047 567.135763 789.576147 589.605967 809.230566 610.60429 821.725461 617.839716 852.347733 630.9761169999999L842.705318 653.453557 819.246577 660.374464C822.235501 670.505564 813.450321 644.87463 809.839253 629.8801189999999 790.647573 550.1890470000001 796.611315 450.1135 844.8591 333.498332 883.105728 241.056017 874.587669 126.06492400000002 824.002925 61.39712899999995 815.680378 50.75754500000005 817.558709 35.38570000000004 828.198295 27.063153000000057 838.837879 18.740607999999952 854.209724 20.618939999999952 862.532269 31.258523999999966 924.762731 110.81426299999998 934.658528 244.404363 890.059904 352.19948999999997Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="set" unicode="&#59158;"
+				   d="M466.496-126.62400000000002l-1.056 0.064c-25.184 2.08-47.456 22.368-51.744 47.232l-17.344 102.4c-0.672 4.064-6.624 11.04-10.56 12.416l-30.336 12.416c-5.44 2.496-15.424 0.8-17.472-0.64l-84.992-60.16c-19.584-14.016-51.456-12.736-70.08 3.168l-64.288 64c-17.952 20.48-19.488 50.592-4.736 71.296l60.416 84.672c2.176 3.072 2.784 11.52 1.024 15.04l0 0c0 0-1.664 3.104-7.264 16.608-6.176 14.848-6.816 17.44-6.816 17.44-0.992 3.04-7.456 8.672-11.36 9.376l-102.56 17.248c-25.152 4.288-45.44 26.624-47.168 52L0 428.288c2.112 27.36 22.496 49.6 47.52 53.728l102.528 17.344c4.128 0.672 11.008 6.56 12.416 10.496l12.608 30.336c2.368 4.992 1.6 14.112-0.8 17.504L113.984 642.24C99.36 662.88 100.704 692.896 117.056 712.192l64.416 64.224c20.672 18.208 51.296 18.784 71.36 4.64l84.992-60.16c1.952-1.376 13.28-2.016 15.04-1.056 0.384 0.192 2.528 1.344 16.704 7.168 14.24 5.92 16.576 6.592 16.576 6.592 3.84 1.184 9.504 7.648 10.144 11.424l17.44 102.4c4.32 25.152 26.752 45.376 52.128 47.104l90.528 0.064c27.328-2.112 49.632-22.368 53.952-47.232l17.344-102.432c0.672-4.064 6.656-11.04 10.624-12.48l30.304-12.352c6.24-2.784 15.456-0.8 17.44 0.608l85.024 60.16c19.52 14.016 51.392 12.704 70.08-3.136l64.288-64.032c17.952-20.48 19.456-50.56 4.736-71.264l-60.416-84.672c-2.208-3.136-2.848-11.616-1.056-15.04 0.16-0.352 1.376-2.56 7.232-16.672 5.856-14.112 6.592-16.512 6.592-16.512 1.248-4.032 7.712-9.6 11.648-10.304l102.56-17.248c25.152-4.224 45.44-26.592 47.168-52l0.096-90.304c-2.112-27.392-22.528-49.6-47.552-53.728l-102.528-17.376c-4.128-0.672-10.944-6.496-12.32-10.432l-12.736-30.432c-2.336-4.928-1.568-14.112 0.832-17.472l60.288-84.512c14.624-20.736 13.216-50.816-3.232-70.048l-64.192-64.096c-11.328-9.92-24.64-14.72-38.784-14.72l0 0c-11.904 0-23.52 3.552-32.704 10.016l-84.992 60.16c-1.952 1.408-13.312 2.016-15.072 1.056-0.288-0.16-2.432-1.312-16.608-7.2-14.08-5.792-16.384-6.496-16.384-6.496-4.16-1.28-9.792-7.776-10.432-11.52l-17.408-102.4c-4.352-25.152-26.72-45.344-52.032-47.104L466.496-126.62400000000002zM347.84 100.60799999999995c10.368 0 20.192-2.112 28.48-6.112l27.648-11.296c20.416-7.072 38.976-28.992 42.848-51.584l17.344-102.336c0.288-1.6 3.136-4.32 5.056-4.832l87.296 0.064c-0.032 0.064 3.04 2.944 3.328 4.672l17.408 102.368c3.872 22.656 23.328 44.832 45.28 51.584 0 0 0 0 0 0-0.096 0 2.976 1.152 12.448 5.056 9.472 3.936 12.384 5.248 13.12 5.568 18.208 9.6 49.44 8.032 67.776-4.96l84.928-60.16c0.192-0.128 1.312-0.64 3.104-0.64l0 0c2.048 0 3.52 0.672 3.872 0.96l61.536 61.408 0 0c-0.16 0 0.064 4.416-0.992 5.952l-60.224 84.448c-13.248 18.624-15.68 47.168-5.792 67.872l11.648 27.84c6.944 19.968 29.408 38.912 51.68 42.496l102.464 17.376c1.824 0.384 4.736 3.648 4.864 5.408L972.8 428.288l0 0c-0.096 0-2.88 3.072-4.576 3.424l-102.72 17.28c-23.168 4.032-44.896 22.976-51.776 45.056l0 0c-0.032 0-1.216 3.04-5.12 12.512-3.968 9.568-5.28 12.512-5.632 13.248-10.24 19.36-8.288 48.736 4.96 67.456L868.448 672c0.96 1.408 0.736 5.6-0.384 6.912l-61.408 61.184c0.704-0.8-0.768-0.192-2.848-0.192-1.728 0-2.784-0.416-3.008-0.576l-85.024-60.16c-17.824-12.8-47.776-15.36-68-5.664l-27.712 11.296c-20.512 7.2-39.04 29.088-42.88 51.584l-17.344 102.336c-0.288 1.76-3.616 4.704-5.504 4.864L467.616 843.52c0-0.064-3.104-2.944-3.392-4.672l-17.408-102.336c-3.84-22.624-23.264-44.8-45.216-51.584 0-0.032-3.008-1.184-12.416-5.088-9.568-3.936-12.512-5.248-13.248-5.568-17.984-9.568-49.344-8.032-67.744 4.992L223.264 739.36c-0.416 0.32-6.176 0.288-6.848-0.224L154.688 677.6320000000001c0 0 0 0 0 0 0.224 0 0.032-4.384 1.056-5.856L216 587.264c13.312-18.752 15.744-47.296 5.76-67.968l-11.52-27.648c-6.976-20.032-29.472-38.944-51.776-42.624L55.968 431.68c-1.824-0.384-4.704-3.648-4.832-5.408l0.096-86.56 0 0c0.096 0 2.912-3.104 4.608-3.424l102.656-17.28c23.04-4 44.704-22.912 51.712-44.928 0.256-0.736 1.44-3.84 5.088-12.64 3.68-8.832 5.024-11.84 5.472-12.736 10.592-20.288 8.672-48.96-4.672-67.904l-60.512-84.768c-0.96-1.408-0.736-5.632 0.384-6.912l61.408-61.184c-0.736 0.8 0.736 0.224 2.816 0.192 1.728 0 2.784 0.416 3.008 0.576l84.992 60.16C318.624 96.32000000000005 333.088 100.60799999999995 347.84 100.60799999999995zM512.032 133.856c-138.336 0-250.848 112.224-250.848 250.176 0 137.92 112.544 250.144 250.848 250.144s250.848-112.224 250.848-250.144C762.88 246.08000000000004 650.336 133.856 512.032 133.856zM512.032 583.136c-110.08 0-199.648-89.312-199.648-199.104s89.568-199.136 199.648-199.136 199.648 89.344 199.648 199.136S622.112 583.136 512.032 583.136z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="fonts-u" unicode="&#58950;"
+				   d="M0-49.23076900000001L945.230769-49.23076900000001 945.230769-128 0-128 0-49.23076900000001ZM0 896L407.076943 896 407.076943 834.065644 319.153861 827.872177 299.076923 809.911217 299.076923 365.841959C299.076923 281.19796199999996 317.076716 220.709337 353.076933 184.37435100000005 389.077071 148.03936499999998 448.153442 129.87210800000003 530.307702 129.87210800000003 606.000364 129.87210800000003 660.807522 149.17482299999995 694.730752 187.78072599999996 728.653982 226.38662899999997 745.61536 289.66226700000004 745.61536 377.60953099999995L745.61536 804.956475 724.153817 826.633531 633.461524 834.065644 633.461524 896 955.384596 896 955.384596 834.065644 868.846119 826.633531 849.461563 804.956475 849.461563 364.60331299999996C849.461563 246.92743900000005 819.923338 161.66533900000002 760.846178 108.81441500000005 701.76894 55.96348999999998 606.462188 29.53846199999998 474.923087 29.53846199999998 406.153531 29.53846199999998 345.807951 38.51886300000001 293.884613 56.47990200000004 241.961275 74.44093999999996 201.230887 100.143419 171.692347 133.58820400000002 149.076834 160.01362700000004 133.038474 190.25793999999996 123.57695 224.32200899999998 114.115348 258.386078 109.384625 307.21047599999997 109.384625 370.796702L109.384625 809.911217 89.307687 827.872177 0 834.065644 0 896Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="triangle-d" unicode="&#58917;"
+				   d="M773.128299 88.65234199999998M889.696178 575.195553L158.862147 575.195553 524.357446 209.64704300000005 889.696178 575.195553Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="tips" unicode="&#59138;"
+				   d="M967.280184 578.537671c-24.915459 58.887178-60.544935 111.76755-105.96745 157.161413-45.393863 45.393863-98.273211 81.051991-157.160389 105.96745-60.988026 25.803689-125.735679 38.853913-192.494129 38.853913-66.729797 0-131.504056-13.0799-192.494129-38.853913-58.887178-24.916483-111.766526-60.544935-157.160389-105.96745-45.393863-45.393863-81.051991-98.274234-105.96745-157.161413-25.803689-60.988026-38.884612-125.734656-38.884612-192.464453s13.0799-131.50508 38.884612-192.464453c24.915459-58.887178 60.544935-111.737874 105.96745-157.161413 45.393863-45.393863 98.273211-81.051991 157.160389-105.96745 60.988026-25.803689 125.735679-38.853913 192.494129-38.853913 66.729797 0 131.504056 13.0799 192.494129 38.853913 58.887178 24.916483 111.766526 60.544935 157.160389 105.96745 45.393863 45.393863 81.051991 98.274234 105.96745 157.161413 25.803689 60.988026 38.853913 125.734656 38.853913 192.464453S993.084896 517.549645 967.280184 578.537671zM511.687892-55.138552000000004c-243.302305 0-441.241446 197.909465-441.241446 441.21177S268.385587 827.284989 511.687892 827.284989c243.273652-0.029676 441.210747-197.938118 441.210747-441.21177S754.990197-55.138552000000004 511.687892-55.138552000000004zM511.657192 573.565427m-45.511543 0a44.475 44.475 0 1 1 91.023086 0 44.475 44.475 0 1 1-91.023086 0ZM542.729885 184.14011300000004c0-17.162892-13.906731-31.071669-31.070646-31.071669l0 0c-17.163915 0-31.070646 13.907755-31.070646 31.071669L480.588593 426.998303c0 17.162892 13.906731 31.071669 31.070646 31.071669l0 0c17.163915 0 31.070646-13.907755 31.070646-31.071669L542.729885 184.14011300000004z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="picture" unicode="&#58954;"
+				   d="M765.376 615.424c0 0 103.04 1.024 103.04-100.992 0 0 9.536-98.752-103.04-100.928 0 0-100.864-2.176-99.84 100.928C665.536 514.496 664.448 605.8879999999999 765.376 615.424ZM968.32 770.56c0 0 54.208-4.224 54.208-52.032l0-712.832c0 0-3.2-51.008-54.208-52.096L968.32 770.56ZM1.472 5.631999999999948c0 0 2.176-52.096 52.096-52.096L968.32-46.464000000000055l0 150.848-99.712 0-203.072 206.144-153.024-153.984L304.32 413.568l-205.056-307.072-45.632-1.024L52.48 718.4639999999999 1.472 718.4639999999999 1.472 5.631999999999948ZM968.32 770.56L53.568 770.56c0 0-52.096 1.088-52.096-52.032L968.32 718.528 968.32 770.56Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="more-vertical" unicode="&#58993;"
+				   d="M511.998465 623.681848c40.525995 0 73.386404 35.771715 73.386404 79.892585s-32.860409 79.892585-73.386404 79.892585c-40.524972 0-73.384357-35.771715-73.384357-79.892585S471.47247 623.681848 511.998465 623.681848L511.998465 623.681848zM511.998465 463.893608c-40.524972 0-73.384357-35.772738-73.384357-79.893608 0-44.12087 32.859385-79.892585 73.384357-79.892585 40.525995 0 73.386404 35.772738 73.386404 79.892585C585.384869 428.12087 552.52446 463.893608 511.998465 463.893608L511.998465 463.893608zM511.998465 144.320199c-40.524972 0-73.384357-35.733852-73.384357-79.894631 0-44.119847 32.859385-79.893608 73.384357-79.893608 40.525995 0 73.386404 35.772738 73.386404 79.893608C585.383846 108.58634600000005 552.52446 144.320199 511.998465 144.320199L511.998465 144.320199z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="flag" unicode="&#58988;"
+				   d="M878.368178 798.272211c-11.363815 4.799306-24.470321 2.360767-33.31578-6.245238-0.36532-0.350994-37.162388-35.304064-95.163383-56.05262-75.462692-26.993794-150.763702-18.409279-223.812415 25.517163-38.347376 23.060205-81.875752 40.665165-129.376603 52.327786-37.582967 9.228175-77.742619 14.777565-119.363552 16.496719-70.805626 2.925632-121.493052-6.224772-123.615389-6.615675-14.56574-2.682086-25.140587-15.380292-25.140587-30.191626L128.58047-31.312913999999978c0-16.954137 13.745049-30.699186 30.699186-30.699186s30.699186 13.745049 30.699186 30.699186L189.978842 266.68306099999995c15.562441 5.250584 47.994084 14.447037 91.40171 17.48728 35.985586 2.51938 72.440869 0.378623 108.35073-6.363941 44.847417-8.420787 89.059362-24.102954 131.409912-46.611597 46.26879-24.591071 93.776803-41.069371 141.203976-48.977481 38.270629-6.380314 76.541257-7.219425 113.740484-2.491751 64.277956 8.16803 103.877859 30.461779 105.532545 31.406291 9.56689 5.464455 15.471366 15.637142 15.471366 26.656103L897.089565 769.958352C897.091612 782.298402 889.73711 793.470859 878.368178 798.272211zM835.69324 257.496841c-14.58416-5.755074-38.82526-13.530155-70.319555-17.225313-30.990828-3.635807-62.940494-2.676969-94.952582 2.851954-40.201607 6.943133-80.731696 21.171182-120.464629 42.289152-48.455595 25.753547-99.208513 43.61945-150.848637 53.101405-29.29214 5.378497-58.896388 8.079002-88.407516 8.079002-12.228509 0-24.443715-0.464581-36.609803-1.39272-34.879392-2.663666-63.618946-8.741082-84.111676-14.355963L189.978842 766.569162c19.971867 2.003634 50.446949 3.910053 86.392626 2.334161 58.186214-2.554172 143.250588-15.041578 218.064504-60.029188 61.32674-36.877909 119.196753-49.491181 169.691797-49.488111 42.293245 0.002047 79.416747 8.854669 109.019972 19.711947 24.269753 8.901741 45.327348 19.747763 62.544475 30.179346L835.692217 257.496841z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="loading" unicode="&#58941;"
+				   d="M511.999488 756.654348m-70.608128 0a69 69 0 1 1 141.216255 0 69 69 0 1 1-141.216255 0ZM236.047576 639.997442m-68.561515 0a67 67 0 1 1 137.123031 0 67 67 0 1 1-137.123031 0ZM125.530506 382.12428m-62.421678 0a61 61 0 1 1 124.843356 0 61 61 0 1 1-124.843356 0ZM227.861126 100.71507499999996m-54.235229 0a53 53 0 1 1 108.470457 0 53 53 0 1 1-108.470457 0ZM514.166851-16.84438799999998m-47.192835 0a46.118 46.118 0 1 1 94.385671 0 46.118 46.118 0 1 1-94.385671 0ZM804.730553 91.450061m-33.834596 0a33.064 33.064 0 1 1 67.669192 0 33.064 33.064 0 1 1-67.669192 0ZM935.55411 383.395226m-23.969924 0a23.424 23.424 0 1 1 47.939849 0 23.424 23.424 0 1 1-47.939849 0ZM856.723717 634.80007m-17.135262 0a16.745 16.745 0 1 1 34.270525 0 16.745 16.745 0 1 1-34.270525 0Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="fonts-i" unicode="&#58948;"
+				   d="M897.948 834.255l0-64.322-128.65 0L447.674-1.9329999999999927l128.65 0 0-64.32L126.052-66.25300000000004l0 64.32 128.65 0 321.622 771.866-128.65 0L447.674 834.255 897.948 834.255z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="refresh-1" unicode="&#58982;"
+				   d="M688.146 736l-192 128v-256l192 128.001zM496.146 767.7090000000001c-231.174-8.416-416-198.479-416-431.709 0-238.587 193.413-432 432-432 233.23 0 423.293 184.826 431.709 416h-64.05c-8.377-195.817-169.778-352-367.658-352-203.241 0-368 164.759-368 368 0 197.88 156.183 359.282 352 367.658v64.051z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="rmb" unicode="&#58974;"
+				   d="M511.998465 896C229.23338 896 0.004605 666.769178 0.004605 384.001023c0-282.773272 229.227752-512.001023 511.99386-512.001023 282.769178 0 511.994883 229.227752 511.994883 512.001023C1023.994372 666.769178 794.767644 896 511.998465 896zM511.998465-91.59690499999999c-262.660188 0-475.589742 212.930577-475.589742 475.597929 0 262.663258 212.929554 475.594859 475.589742 475.594859 262.663258 0 475.590765-212.9316 475.590765-475.594859C987.590254 121.33469500000001 774.662747-91.59690499999999 511.998465-91.59690499999999zM738.742652 301.137781L544.432155 301.137781l0 69.780273 194.310497 0c17.835204 0 32.249495 14.43885 32.249495 32.220842 0 17.784038-14.414291 32.19526-32.249495 32.19526L589.7462 435.334155l149.620669 209.579249c8.916067 15.397688 3.63069 35.099403-11.82021 43.988864-15.398712 8.891508-35.097356 3.629667-44.017516-11.793604L512.187777 437.098335 340.84334 677.108664c-8.864902 15.423271-28.617781 20.685111-44.016493 11.793604-15.395642-8.889461-20.685111-28.590152-11.82021-43.988864l149.622716-209.579249L285.628808 435.334155c-17.781992 0-32.245402-14.411221-32.245402-32.19526 0-17.781992 14.46341-32.220842 32.245402-32.220842l194.310497 0 0-69.780273L285.628808 301.137781c-17.781992 0-32.245402-14.413268-32.245402-32.19526s14.46341-32.220842 32.245402-32.220842l194.310497 0 0-132.435265c0-17.780969 14.46341-32.19526 32.248472-32.19526 17.835204 0 32.245402 14.414291 32.245402 32.19526L544.433178 236.72065499999997l194.310497 0c17.835204 0 32.249495 14.43885 32.249495 32.220842S756.577856 301.137781 738.742652 301.137781"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="addition" unicode="&#58916;"
+				   d="M544 768L480 768 480 416 128 416 128 352 480 352 480 0 544 0 544 352 895.936 352 895.936 416 544 416Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="home" unicode="&#59022;"
+				   d="M824.084343-40.42033900000001H232.898863c-74.604138 0-85.85232 28.334325-85.852321 49.997718l-0.584307 5.314029V447.645552h48.806589v-402.916582c0-25.547863 13.548574-36.343743 37.629015-36.343743h568.020898c25.928532 0 27.978215 6.220678 27.978215 37.84391V447.585177l48.806589 0.118704c0.022513-14.346753 0-382.76666 0-433.098999 0-38.130436-12.726859-54.765301-51.858088-54.765301l-1.76111-0.25992zM1012.470921 493.103884C849.773422 615.120868 687.101505 737.137853 524.404006 859.153814c-6.207375 4.659113-18.433838 4.659113-24.641213 0C337.077573 737.137853 174.393377 615.120868 11.696902 493.103884c-24.856108-18.635429-0.572028-61.044308 24.642236-42.13361A15995638.709915 15995638.709915 0 0 1 512.025071 807.737794c0.988514-0.715291 1.644453-1.144056 2.823302-2.037403 18.040888-13.524015 36.057217-27.036773 54.073546-40.560788 58.291614-43.718711 116.583229-87.437421 174.874843-131.143852 81.33647-61.008492 162.696476-122.015961 244.033969-183.024454 25.212218-18.911722 49.496298 23.497157 24.64019 42.132587z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="user" unicode="&#59248;"
+				   d="M611.2 342.4c70.4 54.4 115.2 140.8 115.2 230.4 0 156.8-128 288-284.8 288s-284.8-128-284.8-284.8c0-92.8 44.8-182.4 115.2-236.8C108.8 272 0 105.60000000000002 0-80c0-9.6 9.6-19.2 19.2-19.2h848c9.6 0 19.2 9.6 19.2 19.2 0 188.8-112 355.2-275.2 422.4z m-576-396.8C44.8 115.20000000000005 156.8 268.79999999999995 320 320c6.4 3.2 12.8 9.6 12.8 16s-3.2 16-9.6 19.2c-76.8 41.6-128 131.2-128 224 0 134.4 112 246.4 246.4 246.4s246.4-112 246.4-249.6c0-89.6-51.2-176-128-220.8-6.4-3.2-9.6-9.6-9.6-19.2 0-6.4 6.4-12.8 12.8-16 160-51.2 275.2-204.8 281.6-377.6H35.2zM812.8 361.6c54.4 41.6 86.4 108.8 86.4 176 0 89.6-54.4 172.8-134.4 208-9.6 3.2-22.4 0-25.6-9.6-3.2-9.6 0-22.4 9.6-25.6 67.2-28.8 112-99.2 112-172.8 0-67.2-38.4-131.2-96-163.2-6.4-3.2-9.6-9.6-9.6-19.2 0-6.4 6.4-12.8 12.8-16 131.2-41.6 217.6-160 217.6-297.6 0-9.6 9.6-19.2 19.2-19.2s19.2 9.6 19.2 19.2c-3.2 140.8-86.4 262.4-211.2 320z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="notice" unicode="&#58983;"
+				   d="M544 798.976V864h-64v-65.024C289.536 786.304 160 658.624 160 416v-288h64V416c0 192 115.456 320 288 320 180.544 0 288-128 288-320v-288h64V416c0 242.88-122.496 370.56-320 382.976zM672 64a160 160 0 1 0-320 0h64a96 96 0 0 1 192 0h64zM64 128h896v-64H64v64z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="login-weibo" unicode="&#58997;"
+				   d="M411.270737 288.350316c-17.973895 7.504842-41.189053-0.229053-52.264421-17.542737-11.223579-17.394526-5.955368-38.103579 11.870316-46.201263 18.108632-8.232421 42.132211-0.417684 53.342316 17.421474C435.253895 260.05557899999997 429.446737 280.62989500000003 411.270737 288.350316zM455.545263 306.64757899999995c-6.885053 2.721684-15.508211-0.579368-19.550316-7.329684-3.920842-6.790737-1.751579-14.524632 5.146947-17.367579 7.019789-2.883368 16.006737 0.458105 20.048842 7.370105C465.071158 296.259368 462.551579 304.087579 455.545263 306.64757899999995zM427.52 426.684632c-115.968-11.439158-203.924211-82.216421-196.378947-158.073263 7.531789-75.910737 107.654737-128.161684 223.649684-116.749474 115.994947 11.439158 203.924211 82.216421 196.392421 158.140632C643.664842 385.859368 543.541895 438.110316 427.52 426.684632zM529.300211 247.70021099999997c-23.673263-53.355789-91.769263-81.798737-149.530947-63.232-55.754105 17.933474-79.373474 72.811789-54.945684 122.246737 23.956211 48.464842 86.352842 75.870316 141.541053 61.561263C523.506526 353.562947 552.663579 299.85684200000003 529.300211 247.70021099999997zM512 896C229.241263 896 0 666.772211 0 384c0-282.758737 229.241263-512 512-512 282.772211 0 512 229.241263 512 512C1024 666.772211 794.772211 896 512 896zM455.531789 101.02568399999996c-145.354105 0-293.941895 70.197895-293.941895 185.667368 0 60.362105 38.386526 130.182737 104.474947 196.069053 88.252632 87.929263 191.164632 127.986526 229.874526 89.397895 17.084632-17.003789 18.741895-46.457263 7.760842-81.623579-5.726316-17.690947 16.666947-7.895579 16.666947-7.936 71.343158 29.763368 133.564632 31.514947 156.321684-0.862316 12.139789-17.246316 10.954105-41.472-0.215579-69.510737-5.173895-12.921263 1.589895-14.928842 11.466105-17.879579 40.178526-12.422737 84.924632-42.455579 84.924632-95.380211C772.837053 211.36168399999997 646.090105 101.02568399999996 455.531789 101.02568399999996zM718.672842 468.197053c4.715789 14.457263 1.765053 30.962526-9.202526 43.061895-10.954105 12.072421-27.136 16.666947-42.037895 13.527579l0 0.026947c-12.463158-2.694737-24.724211 5.268211-27.392 17.664-2.667789 12.463158 5.281684 24.697263 17.744842 27.338105 30.531368 6.467368 63.595789-2.937263 85.989053-27.715368 22.447158-24.764632 28.456421-58.489263 18.849684-88.064-3.907368-12.099368-16.936421-18.728421-29.062737-14.848-12.139789 3.920842-18.782316 16.922947-14.874947 28.995368L718.672842 468.183579zM853.261474 424.865684c-0.013474-0.013474-0.013474-0.080842-0.013474-0.107789-4.567579-14.026105-19.712-21.706105-33.778526-17.165474-14.133895 4.554105-21.854316 19.590737-17.300211 33.670737l0 0.013474c13.999158 43.169684 5.12 92.429474-27.567158 128.565895-32.714105 36.122947-80.949895 49.92-125.507368 40.488421-14.484211-3.085474-28.752842 6.130526-31.838316 20.574316-3.098947 14.403368 6.144 28.631579 20.641684 31.717053l0.026947 0c62.625684 13.271579 130.519579-6.117053 176.545684-56.966737C860.483368 554.886737 872.892632 485.618526 853.261474 424.865684z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="voice" unicode="&#59016;"
+				   d="M463.380164 644.0568969999999v-0.003069c-4.550643 4.549619-10.484795 7.02295-16.913205 7.02295s-12.365632-2.473331-16.915251-7.02295c-4.549619-4.551666-7.020904-10.485819-7.020904-16.914229s2.471284-12.365632 7.020904-16.915251c60.437487-60.438511 93.675496-140.756791 93.675496-226.222301 0-85.464487-33.238009-165.783791-93.675496-226.220255-4.549619-4.551666-7.020904-10.487865-7.020904-16.915252 0-6.429433 2.471284-12.365632 7.020904-16.914228 4.550643-4.549619 10.486842-7.02295 16.915251-7.02295s12.364609 2.473331 16.913205 7.02295c35.114752 35.116799 62.317301 76.06849 80.814584 121.668037 17.904789 44.018539 26.90579 90.608647 26.90579 138.384768s-9.101285 94.26799-26.90579 138.384767c-18.59552 45.697785-45.698808 86.550215-80.814584 121.667013zM781.892405 618.929614v-0.002047c-31.358195 77.452-77.550237 146.990772-137.098471 206.539007-4.550643 4.549619-10.485819 7.02295-16.915252 7.02295-6.42841 0-12.363585-2.473331-16.914228-7.02295-9.29776-9.299807-9.29776-24.531719 0-33.82948 54.997592-54.998615 97.631598-119.195729 126.613676-190.71153 27.993564-69.044516 42.237987-142.045133 42.237987-216.924541s-14.244422-147.882072-42.237987-216.923518c-28.982078-71.517847-71.616084-135.616724-126.613676-190.711529-9.29776-9.298783-9.29776-24.531719 0-33.82948 4.551666-4.551666 10.485819-7.02295 16.914228-7.02295 6.429433 0 12.366655 2.471284 16.915252 7.02295 59.547211 59.547211 105.740276 129.085984 137.098471 206.53696 30.369681 74.78117 45.699832 153.817248 45.699831 234.928591 0 81.111343-15.331173 160.146397-45.699831 234.927567zM299.474141 427.621497c-11.670807 11.573593-27.103288 18.004049-43.522236 18.004049-16.419971 0-31.852452-6.429433-43.52326-18.004049-11.57257-11.57257-18.003026-27.104311-18.003026-43.522236 0-16.420995 6.42841-31.851429 18.003026-43.52326 11.574616-11.57257 27.103288-18.003026 43.52326-18.003025s31.852452 6.429433 43.522236 18.003025c11.573593 11.573593 18.003026 27.104311 18.003025 43.52326 0 16.419971-6.427386 31.852452-18.003025 43.522236z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="upload-drag" unicode="&#59009;"
+				   d="M666.931 445.918l-124.245 99.362c-7.221 5.639-16.428 9.042-26.429 9.042-9.963 0-19.136-3.376-26.438-9.047l-124.215-99.391c-9.615-7.772-15.713-19.565-15.713-32.782 0-9.946 3.453-19.084 9.223-26.284 13.828-17.359 41.51-20.465 58.918-6.505l56.252 45.022v-261.12c0-23.177 18.842-41.984 41.95-41.984s41.95 18.842 41.95 41.984v261.12l56.286-45.056c17.545-13.892 45.09-10.718 58.914 6.554 5.754 7.137 9.236 16.316 9.236 26.308 0 13.211-6.086 24.999-15.609 32.716zM235.827 142.95000000000005c-85.026 0-152.542 31.71-188.655 89.839-36.113 58.095-34.406 134.724 4.335 195.174 37.342 58.334 102.366 92.023 178.995 94.549-19.866 130.492 42.667 202.377 84.753 235.008 90.112 69.871 234.257 79.053 335.565 21.367 58.982-33.587 94.037-85.675 100.454-146.978 113.937 18.978 177.562-33.826 206.814-69.905 63.317-78.131 71.27-204.39 18.91-300.203-46.524-85.06-130.389-127.317-229.82-116.497-18.739 2.116-32.222 18.978-30.174 37.683s19.285 32.017 37.683 30.174c96.7-10.718 143.258 46.353 162.406 81.408 39.014 71.373 33.826 167.868-12.049 224.495-38.673 47.684-100.352 60.518-178.483 37.069-2.94-0.916-6.319-1.443-9.822-1.443-18.851 0-34.133 15.282-34.133 34.133 0 1.495 0.096 2.969 0.283 4.414 8.549 68.506-31.114 106.53-65.93 126.362-77.346 44.066-191.522 37.035-259.925-15.974-58.266-45.193-75.947-117.18-51.132-208.179 0.761-2.688 1.198-5.775 1.198-8.963 0-18.851-15.282-34.133-34.133-34.133-1.481 0-2.94 0.094-4.371 0.277-70.759 8.822-128.991-13.535-159.677-61.424-24.61-38.434-26.146-86.46-3.823-122.368 27.716-44.578 86.05-64.375 164.147-55.637 1.132 0.133 2.443 0.209 3.772 0.209 18.853 0 34.138-15.284 34.138-34.138 0-17.525-13.205-31.965-30.208-33.914-14.153-1.653-27.874-2.404-41.118-2.404z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="login-qq" unicode="&#58998;"
+				   d="M512 896C229.227789 896 0 666.772211 0 384c0-282.745263 229.227789-512 512-512s512 229.254737 512 512C1024 666.772211 794.772211 896 512 896L512 896zM738.856421 258.93726300000003c0 0-16.208842-44.220632-45.945263-83.941053 0 0 53.126737-18.054737 48.64-64.983579 0 0 1.778526-52.345263-113.461895-48.734316 0 0-81.071158 6.319158-105.377684 40.609684l-21.423158 0c-24.306526-34.304-105.350737-40.609684-105.350737-40.609684-115.280842-3.610947-113.475368 48.734316-113.475368 48.734316-4.500211 46.928842 48.626526 64.983579 48.626526 64.983579-29.709474 39.720421-45.918316 83.941053-45.918316 83.941053-72.057263-116.439579-64.848842 16.249263-64.848842 16.249263 13.527579 78.524632 70.238316 129.967158 70.238316 129.967158-8.111158 71.316211 21.611789 83.941053 21.611789 83.941053C318.410105 709.712842 508.025263 705.859368 512 705.751579c3.988211 0.107789 193.576421 3.961263 199.828211-216.643368 0 0 29.709474-12.638316 21.611789-83.941053 0 0 56.737684-51.442526 70.238316-129.967158l0 0C803.678316 275.18652599999996 810.873263 142.49768400000005 738.856421 258.93726300000003L738.856421 258.93726300000003zM738.856421 258.93726300000003"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="snowflake" unicode="&#59057;"
+				   d="M480.695-64h63.725V59.291000000000054l68.854-68.242 44.945 44.546-113.798 112.79v180.02l177.271-102.44 41.67-155.652 60.725 16.284-25.398 94.872 85.259-49.266 31.87 55.246-84.726 48.961 94.497 25.343-16.495 61.622-156.068-41.855-176.934 102.245 177.667 102.667 155.513-41.709 16.274 60.793-94.78 25.418 85.255 49.264-31.869 55.247-84.733-48.965 25.326 94.594-61.557 16.51-41.817-156.206-176.948-102.251V644.461l113.849 113.951-44.459 44.496-69.392-69.454V832h-63.725v-97.935l-69.188 69.249-45.068-45.107 114.256-114.355V438.89l-156.557 90.469L283.45 684.39l-60.188-16.458 24.84-94.632-107.544 62.145-31.868-55.247 106.667-61.639-93.463-25.557 16.074-61.237 154.482 42.243 156.169-90.243-156.138-90.226-154.485 42.243-15.855-60.409 94.289-25.784-107.534-62.14 31.868-55.247 106.672 61.642-24.621-93.801 61.012-16.685 40.69 155.028 156.179 90.25v-180.455l-113.801-112.79 44.338-43.944 69.463 68.845V-64z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="file-b" unicode="&#58965;"
+				   d="M790.08 177.91999999999996l-138.112-119.232V177.91999999999996h138.112zM198.848 763.008h627.328v-516.16H617.088a34.56 34.56 0 0 1-34.816-34.432v-206.528H198.848V763.008z m662.208 68.8H164.032a34.56 34.56 0 0 1-34.816-34.432v-825.92a34.56 34.56 0 0 1 34.816-34.432h453.056l278.784 240.896V797.376a34.56 34.56 0 0 1-34.816 34.432z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="template" unicode="&#58979;"
+				   d="M734 172.89999999999998v82.8h-59.9v-37l-35.7-9.7 15.7-57.8zM674.1 419.3H734v-81.8h-59.9zM734 600.2l-95.6-26 15.7-57.8 20 5.4v-20.7H734zM866.1 131.29999999999995v-37l-35.7-9.7 7.9-28.9 7.8-28.9 79.9 21.7v82.8h-29.9zM740.9 60.299999999999955L651.4 36l7.9-28.9 7.8-29 89.5 24.4-7.8 28.9zM740.9 781.7l-89.5-24.3 7.9-28.9 7.8-28.9 89.5 24.3-7.8 28.9zM830.4 806l7.9-28.9 7.8-28.9 20 5.5v-20.8H926V832zM866.1 612.6v-120.3H926V612.6h-29.9zM866.1 371.9v-120.3H926V371.9h-29.9zM541.9 665.6l35.7 9.7-7.8 28.9-7.8 28.9-50-13.6L98 832v-783.5l384.1-104.3L512-64l29.9 8.1 35.7 9.7-7.8 28.9-7.8 28.9-20-5.4V120.79999999999995l35.7 9.7-15.7 57.8-20-5.4V486l35.7 9.7-15.7 57.8-20-5.4V665.6z m-59.8-659.4l-324.2 88.1V753.7l324.2-88.1V548l-192 52.2v-427.3l192-52.2v-114.5z m0 360.9V182.79999999999995l-132.2 35.9V521.8l132.2-35.9v-118.8z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="transfer" unicode="&#59025;"
+				   d="M320 768H128c-35.2 0-64-28.8-64-64v-640c0-35.2 28.8-64 64-64h192c35.2 0 64 28.8 64 64V704c0 35.2-28.8 64-64 64z m0-672c0-16-16-32-32-32H160c-16 0-32 16-32 32V672c0 16 16 32 32 32h128c16 0 32-16 32-32v-576z m256 544h-64c-19.2 0-32-12.8-32-32s16-32 32-32h64c19.2 0 32 12.8 32 32s-16 32-32 32z m-64-448h-64c-19.2 0-32-12.8-32-32s16-32 32-32h64c19.2 0 32 12.8 32 32s-16 32-32 32z m384 576H704c-35.2 0-64-28.8-64-64v-640c0-35.2 28.8-64 64-64h192c35.2 0 64 28.8 64 64V704c0 35.2-28.8 64-64 64z m0-672c0-16-16-32-32-32H736c-16 0-32 16-32 32V672c0 16 16 32 32 32h128c16 0 32-16 32-32v-576z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="auz" unicode="&#58994;"
+				   d="M324.266667 435.2c-17.066667 17.066667-39.822222 17.066667-51.2 0-17.066667-17.066667-17.066667-39.822222 0-51.2l153.6-159.288889c5.688889-5.688889 17.066667-11.377778 28.444444-11.377778s17.066667 5.688889 28.444445 11.377778l295.822222 290.133333c17.066667 17.066667 17.066667 39.822222 0 51.2-17.066667 17.066667-39.822222 17.066667-51.2 0L455.111111 304.355556 324.266667 435.2zM927.288889 753.777778L523.377778 896h-22.755556L96.711111 753.777778c-17.066667-5.688889-28.444444-17.066667-28.444444-34.133334v-432.355555c11.377778-250.311111 409.6-409.6 426.666666-415.288889h22.755556c17.066667 5.688889 415.288889 159.288889 426.666667 415.288889V719.644444c11.377778 17.066667 0 28.444444-17.066667 34.133334z m-45.511111-460.8c-5.688889-182.044444-301.511111-312.888889-369.777778-341.333334-113.777778 45.511111-358.4 182.044444-369.777778 341.333334v398.222222L512 822.044444l369.777778-125.155555v-403.911111z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="console" unicode="&#58981;"
+				   d="M30.552 104.72699999999998c4.654-16.29 23.272-23.272 37.236-18.618 16.291 4.655 23.273 23.273 18.618 37.236C16.588 314.182 84.08 521.31 237.68 640c11.636 9.31 23.273 16.29 37.236 25.6 25.6 16.29 53.528 30.255 83.782 39.564 58.182 20.945 118.691 30.254 176.873 27.927h25.6c6.982 0 11.636 0 18.618-2.327 30.255-4.655 58.182-11.637 88.436-23.273 235.055-86.11 356.073-346.764 269.964-581.818-4.654-16.291 2.327-32.582 18.618-37.237 16.291-4.654 32.582 2.328 37.237 18.619 41.89 116.363 39.563 239.709 0 349.09h2.327C921.897 656.2909999999999 738.043 784.2909999999999 537.897 793.6h-48.873c-200.145-9.31-384-137.31-458.472-337.455-39.564-109.381-41.891-232.727 0-351.418z m707.49 386.328a29.498 29.498 0 0 1-41.89 0L521.606 316.509c-4.654 2.327-9.309 2.327-13.963 2.327-32.582 0-58.182-25.6-58.182-58.181s25.6-58.182 58.182-58.182 58.181 25.6 58.181 58.182c0 4.654 0 9.309-2.327 16.29l174.546 174.546c11.636 11.636 11.636 30.254 0 39.564z m228.073-458.473H58.48c-16.29 0-30.255-13.964-30.255-30.255 0-16.29 13.964-30.254 30.255-30.254h907.636c16.291 0 30.255 13.963 30.255 30.254 0 16.291-13.964 30.255-30.255 30.255z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="app" unicode="&#58963;"
+				   d="M432.022 818.946h-376.324c-6.627 0-12.078-5.45-12.078-12.078v-376.324c0-6.627 5.45-12.078 12.078-12.078h376.324c6.627 0 12.078 5.45 12.078 12.078v376.473c0 6.627-5.45 11.93-12.078 11.93zM391.517 471.196h-295.169v295.169h295.021v-295.169zM976.847 635.717l-211.95 211.95c-8.837 8.837-23.124 8.837-31.963 0l-211.95-211.95c-8.837-8.837-8.837-23.124 0-31.963l211.95-212.098c8.837-8.837 23.124-8.837 31.963 0l211.95 211.95c8.837 8.987 8.837 23.271 0 32.109zM432.022 313.45000000000005h-376.324c-6.627 0-12.078-5.45-12.078-12.078v-376.324c0-6.627 5.45-12.078 12.078-12.078h376.324c6.627 0 12.078 5.45 12.078 12.078v376.473c0 6.627-5.45 11.93-12.078 11.93zM391.517-34.15499999999997h-295.169v295.021h295.021v-295.021zM932.511 313.45000000000005h-376.324c-6.627 0-12.078-5.45-12.078-12.078v-376.324c0-6.627 5.45-12.078 12.078-12.078h376.324c6.627 0 12.078 5.45 12.078 12.078v376.473c0 6.627-5.45 11.93-12.078 11.93zM891.859-34.15499999999997h-295.021v295.021h295.021v-295.021z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="prev" unicode="&#58970;"
+				   d="M62.573 384.103l423.401 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.751-18.976-68.727 0l-39.753 39.753 0.269 0.246-385.655 385.661zM451.365 384.103l423.407 423.662c18.985 18.985 49.757 18.985 68.727 0 18.982-18.972 18.985-49.746 0-68.729l-355.058-355.067 356.796-356.796c18.977-18.971 18.976-49.746 0-68.727-18.982-18.976-49.757-18.977-68.727 0l-39.762 39.754 0.273 0.249-385.662 385.661zM451.365 384.103z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="website" unicode="&#59310;"
+				   d="M777.073418 147.443038c-30.460759 21.387342-40.83038 40.182278-76.47595 53.792405 25.275949 60.273418 40.182278 83.605063 42.126583 154.896203H887.898734c-3.888608-99.159494-45.367089-143.878481-110.825316-208.688608zM136.101266 356.13164600000005h167.210126c1.944304-71.291139 16.850633-94.622785 42.126583-154.896203-34.997468-13.610127-68.050633-31.756962-98.511393-53.792405C181.468354 212.25316499999997 139.989873 256.97215200000005 136.101266 356.13164600000005z m103.048101 259.888607c29.164557-23.979747 61.56962-42.774684 96.567089-57.681012-19.443038-53.792405-30.460759-90.734177-31.756962-152.951899H136.101266c3.240506 90.734177 46.663291 147.767089 103.048101 210.632911z m309.144304-209.98481V523.989873c47.311392 1.296203 71.291139 10.36962 114.065823 25.27595 18.146835-51.2 28.516456-84.901266 30.460759-143.23038H548.293671z m104.344304-195.078481c-40.182278 12.962025-60.273418 20.091139-104.344304 21.387342V356.13164600000005h144.526582c-1.944304-68.050633-16.202532-88.141772-40.182278-145.174684z m36.941772-57.681013c31.756962-12.313924 39.534177-28.516456 66.75443-47.311392-51.848101-44.718987-114.713924-73.883544-182.116455-84.901266 36.941772 37.589873 90.734177 82.308861 115.362025 132.212658z m-163.321519-137.397468l22.035443 165.913924c40.182278-1.296203 56.38481-7.777215 92.678481-18.794937-27.220253-56.38481-66.106329-106.288608-113.417722-147.118987h-1.296202z m-75.827848 5.18481c-67.402532 11.017722-130.268354 40.83038-182.764557 84.901266 27.868354 19.443038 57.681013 34.997468 88.789873 47.311392 23.331646-48.607595 55.088608-93.326582 93.974684-132.212658z m47.311392 335.068355v-123.787342c-44.070886-1.296203-64.162025-8.425316-104.344304-21.387342-23.979747 57.681013-38.237975 77.124051-40.182278 145.174684h144.526582zM383.675949 549.265823c42.774684-14.906329 66.75443-23.331646 114.065823-25.27595v-117.95443H353.21519c1.944304 58.329114 12.313924 92.03038 30.460759 143.23038z m-37.589873 57.032911c-31.756962 12.962025-60.921519 30.460759-88.141772 51.848101 53.792405 51.848101 115.362025 91.382278 192.486076 104.344304-44.718987-44.718987-80.364557-97.863291-104.344304-156.192405z m151.655696 161.377215v-193.782278c-44.070886 1.296203-64.162025 9.073418-103.696202 22.683544 29.164557 68.698734 49.903797 127.027848 102.4 171.098734h1.296202z m75.827848-4.536708c77.772152-13.610127 149.711392-49.903797 206.744304-104.344304-29.164557-22.035443-46.01519-37.589873-80.364557-51.848102-25.275949 59.625316-82.956962 112.76962-126.379747 156.192406z m-46.01519 4.536708c54.440506-46.01519 97.21519-104.992405 124.435443-171.098734-39.534177-13.610127-59.625316-21.387342-103.696202-22.683544l-22.035443 193.782278h1.296202z m-31.10886-751.149367c-46.663291 38.886076-62.865823 88.789873-91.382279 147.118988 36.293671 11.665823 53.144304 17.498734 93.326582 18.794936v-165.913924h-1.944303zM887.898734 406.035443h-145.174683c-1.296203 61.56962-12.313924 98.511392-31.756962 152.303798 37.589873 15.55443 57.032911 33.053165 88.789873 57.681012 56.38481-62.865823 84.901266-119.898734 88.141772-209.98481z m-375.898734 427.746835c-244.334177 0-442.005063-197.670886-442.005063-442.005063S267.665823-50.227847999999994 512-50.227847999999994s442.005063 197.670886 442.005063 442.005063S756.334177 833.782278 512 833.782278z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="next" unicode="&#58971;"
+				   d="M948.066926 382.958838l-411.990051-412.24426c-18.47333-18.47333-48.417689-18.47333-66.875207 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L814.691135 383.088983 467.512212 730.269123c-18.466032 18.458735-18.466032 48.405526 0 66.873991 18.468465 18.464816 48.410391 18.464816 66.872774 0l38.682336-38.682336-0.261507-0.239614 375.259894-375.265975v0.003649m-378.312834 0L157.756743-29.28542200000004c-18.47333-18.47333-48.415256-18.47333-66.872775 0-18.47333 18.461167-18.47333 48.405526 0 66.875207L436.369787 383.088983 89.19208 730.269123c-18.4636 18.458735-18.4636 48.405526 0 66.873991 18.470898 18.464816 48.415256 18.464816 66.872774 0l38.692067-38.682336-0.266372-0.239614 375.267191-375.265975-0.004865 0.003649m0 0z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="component" unicode="&#59479;"
+				   d="M917.376 652.544L500.8 891.2a34.304 34.304 0 0 1-34.176 0L50.112 652.48a33.92 33.92 0 0 1-17.088-29.376v-477.44c0-12.16 6.528-23.296 17.088-29.44l416.512-238.72a35.136 35.136 0 0 1 34.176 0l416.576 238.72a33.92 33.92 0 0 1 17.088 29.44v477.44a33.92 33.92 0 0 1-17.088 29.44z m-51.264-487.36l-382.4-219.136-382.336 219.136V603.52l382.336 219.136 382.4-219.136v-438.272zM198.784 535.488a33.792 33.792 0 0 1 12.544-46.4l237.824-136.32V83.20000000000005c0-18.816 15.232-33.92 34.176-33.92a33.92 33.92 0 0 1 34.176 33.92V352.384l238.656 136.832a33.856 33.856 0 0 1 12.544 46.4 34.368 34.368 0 0 1-46.72 12.416L483.712 411.52 245.504 548.0319999999999a34.432 34.432 0 0 1-46.72-12.544z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="more" unicode="&#58975;"
+				   d="M224 288c-52.928 0-96 43.072-96 96s43.072 96 96 96 96-43.072 96-96-43.072-96-96-96z m288 0c-52.928 0-96 43.072-96 96s43.072 96 96 96 96-43.072 96-96-43.072-96-96-96z m288 0c-52.928 0-96 43.072-96 96s43.072 96 96 96 96-43.072 96-96-43.072-96-96-96z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="login-wechat" unicode="&#58999;"
+				   d="M516.464646 896C233.714646 896 4.464646 666.75 4.464646 384S233.714646-128 516.464646-128s512 229.25 512 512S799.214646 896 516.464646 896z m-74-523.375c-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.75-1.875-0.25-0.75-0.5-1.125-0.5-1.875-0.25-0.75-0.5-1.125-0.5-1.875-0.25-0.75-0.5-1.125-0.5-1.875-0.25-0.75-0.25-1.125-0.5-1.875s-0.5-1.125-0.5-1.875c-0.25-0.75-0.25-1.125-0.5-1.875s-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875-0.25-1.125-0.5-1.875c0-0.75-0.25-1.125-0.25-1.875s-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875-0.25-1.125-0.25-1.875 0-1.125-0.25-1.875c0-0.75-0.25-1.125-0.25-1.875s0-1.125-0.25-1.875c0-0.75 0-1.125-0.25-1.875 0-0.75 0-1.125-0.25-1.875v-22.5c0-0.75 0-1.125 0.25-1.875 0-0.75 0-1.125 0.25-1.875 0-0.75 0-1.125 0.25-1.875 0-0.75 0-1.125 0.25-1.875 0-0.75 0.25-1.125 0.25-1.875s0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.25-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875l0.25-0.875c-4.25-0.25-8.625-0.75-12.75-0.75-3.75-0.25-7.25-0.25-11-0.25-3.5 0-7 0-10.5 0.25-7.25 0.25-14 0.875-20.75 1.875-4.25 0.5-8.125 1.125-12.375 1.875-3.5 0.5-6.75 1.125-10.25 1.875-3 0.5-6.25 1.125-9.25 1.875-3 0.75-5.875 1.125-8.875 1.875-2.75 0.75-5.875 1.125-8.875 1.875-2.75 0.5-5.625 1.125-8.375 1.625l-3.25-1.625-3.75-1.875-4 1.375-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-2.75-1.375-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-3.75-1.875-2.5-1.375 0.5 1.375 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.75 1.875 0.5 1.125c-0.5 0.25-0.75 0.5-1.125 0.75-0.875 0.75-1.625 1.125-2.5 1.875s-1.625 1.125-2.5 1.875-1.625 1.125-2.5 1.875c-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.625 1.125-2.375 1.875-0.75 0.75-1.375 1.125-2.375 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-2.125 1.875-0.75 0.75-1.375 1.125-1.875 1.875-0.75 0.75-1.375 1.125-1.875 1.875l-1.875 1.875-1.875 1.875-1.875 1.875-1.875 1.875c-0.75 0.75-1.125 1.125-1.625 1.875s-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-1.125 1.125-1.625 1.875-0.875 1.125-1.625 1.875c-0.5 0.75-0.875 1.125-1.625 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.375 1.875-0.5 0.75-0.875 1.125-1.125 1.875-0.5 0.75-0.875 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.5 0.75-0.75 1.125-1.125 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.75 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.875 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.75 1.875-0.25 0.75-0.5 1.125-0.5 1.875-0.25 0.75-0.5 1.125-0.5 1.875-0.25 0.75-0.5 1.125-0.5 1.875-0.25 0.75-0.25 1.125-0.5 1.875s-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.5 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875-0.25 1.125-0.25 1.875 0 1.125-0.25 1.875c0 0.75 0 1.125-0.25 1.875 0 0.75 0 1.125-0.25 1.875 0 0.75 0 1.125-0.25 1.875V457.25v1.875 1.875 1.875 1.875 1.875 0.875 0.875 1.875 1.875 1.875 1.875 1.875 1.875c0 0.75 0 1.125 0.25 1.875 0 0.75 0 1.125 0.25 1.875 0 0.75 0 1.125 0.25 1.875 0 0.75 0.25 1.125 0.25 1.875s0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.25 1.875 0.25 1.125 0.5 1.875c0 0.75 0.25 1.125 0.5 1.875s0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.25 1.125 0.5 1.875 0.5 1.125 0.5 1.875c0.25 0.75 0.5 1.125 0.5 1.875 0.25 0.75 0.5 1.125 0.5 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.75 1.875 0.25 0.75 0.5 1.125 0.875 1.875 0.25 0.75 0.5 1.125 0.875 1.875 0.25 0.75 0.5 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 0.875 1.875 0.25 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.75 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.125 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.375 1.875 0.5 0.75 0.875 1.125 1.625 1.875 0.5 0.75 0.875 1.125 1.625 1.875 0.5 0.75 1.125 1.125 1.625 1.875s1.125 1.125 1.625 1.875 1.125 1.125 1.625 1.875 1.125 1.125 1.625 1.875 1.125 1.125 1.625 1.875l1.875 1.875 1.875 1.875 1.875 1.875 1.875 1.875c0.75 0.75 1.375 1.125 1.875 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.125 1.875 0.75 0.75 1.375 1.125 2.375 1.875 0.75 0.75 1.625 1.125 2.375 1.875 0.75 0.75 1.625 1.125 2.375 1.875 0.75 0.75 1.625 1.125 2.375 1.875 0.875 0.75 1.625 1.125 2.5 1.875s1.625 1.125 2.5 1.875 1.875 1.125 2.5 1.875c0.875 0.75 1.875 1.125 2.75 1.875 0.875 0.75 1.875 1.125 2.75 1.875 0.875 0.75 1.875 1.125 2.75 1.875 0.875 0.75 1.875 1.125 3 1.875 0.875 0.75 2.125 1.125 3 1.875s2.125 1.125 3 1.875c1.125 0.75 2.125 1.125 3.25 1.875 1.125 0.75 2.375 1.125 3.25 1.875 1.125 0.75 2.375 1.125 3.5 1.875 1.125 0.75 2.375 1.125 3.75 1.875 1.125 0.75 2.5 1.125 3.75 1.875 1.375 0.75 2.5 1.125 4 1.875 1.375 0.75 2.75 1.125 4.25 1.875 1.375 0.75 2.75 1.125 4.25 1.875 1.375 0.75 3 1.125 4.375 1.875 1.625 0.75 3 1.125 4.625 1.875 1.625 0.75 3.25 1.125 4.875 1.875 1.875 0.75 3.5 1.125 5.375 1.875s3.75 1.125 5.625 1.875c2.125 0.75 4.25 1.125 6 1.875 2.375 0.75 4.375 1.125 6.75 1.875 2.5 0.75 4.875 1.125 7.5 1.875 2.75 0.75 5.625 1.125 8.625 1.875 3.5 0.75 6.75 1.125 10.25 1.875 4.375 0.75 8.875 1.375 13.25 1.875 11 1.125 22.125 1.875 33.25 1.875h2.5c11.125 0 22.375-0.75 33.5-1.875 4.375-0.5 8.875-1.125 13.25-1.875 3.5-0.5 7-1.125 10.25-1.875 2.75-0.5 5.875-1.125 8.625-1.875 2.5-0.5 5.125-1.125 7.625-1.875 2.375-0.5 4.625-1.125 6.75-1.875 2.125-0.5 4.25-1.125 6.25-1.875 1.875-0.75 4-1.125 5.875-1.875s3.75-1.125 5.375-1.875c1.625-0.75 3.5-1.125 5.125-1.875 1.625-0.75 3.25-1.125 4.875-1.875 1.625-0.75 3-1.125 4.625-1.875 1.375-0.75 3-1.125 4.375-1.875s2.75-1.125 4.25-1.875c1.375-0.75 2.75-1.125 4-1.875 1.375-0.75 2.5-1.125 3.75-1.875 1.125-0.75 2.5-1.125 3.75-1.875 1.125-0.75 2.375-1.125 3.5-1.875 1.125-0.75 2.375-1.125 3.5-1.875 1.125-0.75 2.375-1.125 3.25-1.875 1.125-0.75 2.125-1.125 3.25-1.875 1.125-0.75 2.125-1.125 3-1.875s2.125-1.125 3-1.875 1.875-1.125 3-1.875c0.875-0.75 1.875-1.125 2.75-1.875 0.875-0.75 1.875-1.125 2.75-1.875 0.875-0.75 1.875-1.125 2.75-1.875 0.875-0.75 1.875-1.125 2.5-1.875 0.875-0.75 1.625-1.125 2.5-1.875s1.625-1.125 2.5-1.875 1.625-1.125 2.375-1.875c0.75-0.75 1.625-1.125 2.375-1.875 0.75-0.75 1.625-1.125 2.375-1.875 0.75-0.75 1.375-1.125 2.375-1.875 0.75-0.75 1.375-1.125 2.375-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 2.125-1.875 0.75-0.75 1.375-1.125 1.875-1.875 0.75-0.75 1.375-1.125 1.875-1.875l1.875-1.875 1.875-1.875 1.875-1.875 1.875-1.875c0.75-0.75 1.125-1.125 1.625-1.875s1.125-1.125 1.625-1.875 1.125-1.125 1.625-1.875 1.125-1.125 1.625-1.875 1.125-1.125 1.625-1.875 0.875-1.125 1.625-1.875c0.5-0.75 0.875-1.125 1.625-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.375-1.875 0.5-0.75 0.875-1.125 1.125-1.875 0.5-0.75 0.875-1.125 1.125-1.875 0.5-0.75 0.875-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 1.125-1.875 0.5-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.75-1.125 0.875-1.875 0.25-0.75 0.5-1.125 0.875-1.875 0.25-0.75 0.5-1.125 0.875-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.75-1.875 0.25-0.75 0.5-1.125 0.5-1.875 0.25-0.75 0.5-1.125 0.5-1.875 0.25-0.75 0.25-1.125 0.5-1.875s0.5-1.125 0.5-1.875c0.25-0.75 0.25-1.125 0.5-1.875s0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875 0.25-1.125 0.5-1.875c0-0.5 0.25-0.75 0.25-1.125-4.625 0.5-9.25 0.875-14 1.125-3.5 0.25-7 0.25-10.75 0.25-4 0-8.125 0-12.125-0.25-6.75-0.25-13.25-0.875-19.5-1.875-3.75-0.5-7.625-1.125-11.375-1.875-3-0.5-5.875-1.125-8.875-1.875-2.5-0.5-5.125-1.125-7.5-1.875-2.125-0.5-4.375-1.125-6.5-1.875-1.875-0.5-4-1.125-5.875-1.875-1.875-0.5-3.5-1.125-5.375-1.875-1.625-0.75-3.25-1.125-4.875-1.875-1.625-0.75-3-1.125-4.625-1.875-1.375-0.75-3-1.125-4.375-1.875s-2.75-1.125-4.25-1.875c-1.375-0.75-2.5-1.125-4-1.875-1.125-0.75-2.5-1.125-3.75-1.875-1.125-0.75-2.375-1.125-3.5-1.875-1.125-0.75-2.375-1.125-3.5-1.875-1.125-0.75-2.125-1.125-3.25-1.875-0.875-0.75-2.125-1.125-3-1.875s-2.125-1.125-3-1.875-1.875-1.125-3-1.875c-0.875-0.75-1.875-1.125-2.75-1.875-0.875-0.75-1.875-1.125-2.75-1.875-0.875-0.75-1.875-1.125-2.5-1.875-0.875-0.75-1.625-1.125-2.5-1.875s-1.625-1.125-2.5-1.875c-0.75-0.75-1.625-1.125-2.375-1.875-0.75-0.75-1.625-1.125-2.375-1.875-0.75-0.75-1.625-1.125-2.375-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-2.125-1.875-0.75-0.75-1.375-1.125-1.875-1.875l-1.875-1.875-1.875-1.875-1.875-1.875c-0.75-0.75-1.125-1.125-1.625-1.875s-1.125-1.125-1.625-1.875-1.125-1.125-1.625-1.875-1.125-1.125-1.625-1.875-1.125-1.125-1.625-1.875-0.875-1.125-1.625-1.875c-0.5-0.75-0.875-1.125-1.625-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.375-1.875-0.5-0.75-0.875-1.125-1.125-1.875-0.5-0.75-0.875-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.5-0.75-0.75-1.125-1.125-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.75-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.875-1.875-0.25-0.75-0.5-1.125-0.75-1.875-3.125-4.625-3.375-5.125-3.625-5.75z m433.625-71.25v-11.375c0-0.5 0-0.875-0.25-1.625 0-0.5 0-0.875-0.25-1.625 0-0.5 0-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.25-1.625 0-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.25-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.5-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.75-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.5-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.25-0.5-0.75-0.875-0.875-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.75-0.875-1.125-1.625-0.5-0.5-0.875-0.875-1.125-1.625-0.5-0.5-0.875-0.875-1.125-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625-0.5-0.5-0.875-0.875-1.375-1.625l-1.625-1.625-1.625-1.625c-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.5-0.5-1.125-0.875-1.625-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.125-0.875-1.875-1.625-0.75-0.5-1.375-0.875-1.875-1.625-0.75-0.5-1.375-0.875-1.875-1.625-0.75-0.5-1.375-0.875-2.125-1.625-0.75-0.5-1.375-0.875-2.125-1.625l-0.75-0.5 0.25-0.875 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.5-1.625 0.25-1.125-2.125 1.125-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-2.75 1.625-0.5 0.25-0.875-0.25c-2.125-0.5-4.25-0.875-6-1.625-2.125-0.5-4.25-0.875-6.25-1.625-2.125-0.5-4.25-0.875-6.5-1.625-2.375-0.5-4.375-0.875-6.75-1.625-2.375-0.5-4.875-1.125-7.25-1.625-2.75-0.5-5.375-1.125-8.125-1.625-3.25-0.5-6.5-1.125-9.75-1.625-5.375-0.75-10.75-1.125-15.875-1.625-2.75-0.25-5.875-0.25-8.625-0.25-3.75 0-7.5 0-11.125 0.25-6.5 0.25-12.75 0.75-19.125 1.625-3.75 0.5-7.5 0.875-11 1.625-2.75 0.5-5.875 0.875-8.625 1.625-2.375 0.5-4.875 0.875-7.25 1.625-2.125 0.5-4.25 0.875-6.25 1.625-1.875 0.5-3.75 0.875-5.625 1.625-1.875 0.5-3.5 0.875-5.125 1.625-1.625 0.5-3.25 0.875-4.875 1.625-1.375 0.5-3 0.875-4.375 1.625-1.375 0.5-2.75 0.875-4.25 1.625-1.375 0.5-2.5 0.875-4 1.625-1.125 0.5-2.5 0.875-3.75 1.625-1.125 0.5-2.375 0.875-3.75 1.625-1.125 0.5-2.375 0.875-3.5 1.625-1.125 0.5-2.125 0.875-3.25 1.625-1.125 0.5-2.125 0.875-3.25 1.625-0.875 0.5-2.125 0.875-3 1.625-0.875 0.5-1.875 0.875-3 1.625-0.875 0.5-1.875 0.875-2.75 1.625-0.875 0.5-1.875 0.875-2.75 1.625-0.875 0.5-1.875 0.875-2.5 1.625-0.875 0.5-1.625 0.875-2.5 1.625-0.875 0.5-1.625 0.875-2.5 1.625-0.75 0.5-1.625 0.875-2.375 1.625-0.75 0.5-1.625 0.875-2.375 1.625-0.75 0.5-1.625 0.875-2.375 1.625-0.75 0.5-1.375 0.875-2.375 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-2.125 1.625-0.75 0.5-1.375 0.875-1.875 1.625-0.75 0.5-1.375 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.75 0.5-1.125 0.875-1.875 1.625-0.5 0.5-1.125 0.875-1.625 1.625-0.5 0.5-1.125 0.875-1.625 1.625-0.5 0.5-1.125 0.875-1.625 1.625-0.5 0.5-1.125 0.875-1.625 1.625l-1.625 1.625-1.625 1.625c-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.375 1.625-0.5 0.5-0.875 0.875-1.125 1.625-0.5 0.5-0.875 0.875-1.125 1.625-0.5 0.5-0.875 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.5 0.5-0.75 0.875-1.125 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.75 0.875-0.875 1.625-0.25 0.5-0.5 0.875-0.875 1.625-0.25 0.5-0.5 0.875-0.875 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.75 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.5 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.5 1.625-0.25 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5-0.25 0.875-0.25 1.625 0 0.5 0 0.875-0.25 1.625 0 0.5 0 0.875-0.25 1.625 0 0.5 0 0.875-0.25 1.625v1.625 1.625 1.625 3.25 1.625 3.25 1.375 1.625 1.625 1.625 1.625 1.625 1.625 1.625 1.625 1.625c0 0.5 0 0.875 0.25 1.625 0 0.5 0 0.875 0.25 1.625 0 0.5 0 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0 0.5 0.25 0.875 0.25 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.25 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.5 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.75 1.625 0.25 0.5 0.5 0.875 0.875 1.625 0.25 0.5 0.5 0.875 0.875 1.625 0.25 0.5 0.5 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 0.875 1.625 0.25 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.75 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.125 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625 0.5 0.5 0.875 0.875 1.375 1.625l1.625 1.625 1.625 1.625c0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.625 1.625 0.5 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.125 0.875 1.875 1.625 0.75 0.5 1.375 0.875 1.875 1.625 0.75 0.5 1.375 0.875 1.875 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.125 1.625 0.75 0.5 1.375 0.875 2.375 1.625 0.75 0.5 1.625 0.875 2.375 1.625 0.75 0.5 1.625 0.875 2.375 1.625 0.75 0.5 1.625 0.875 2.375 1.625 0.875 0.5 1.625 0.875 2.5 1.625 0.875 0.5 1.625 0.875 2.5 1.625 0.875 0.5 1.875 0.875 2.5 1.625 0.875 0.5 1.875 0.875 2.75 1.625 0.875 0.5 1.875 0.875 2.75 1.625 0.875 0.5 1.875 0.875 3 1.625 0.875 0.5 2.125 0.875 3 1.625 1.125 0.5 2.125 0.875 3.25 1.625 1.125 0.5 2.125 0.875 3.25 1.625 1.125 0.5 2.375 0.875 3.5 1.625 1.125 0.5 2.375 0.875 3.75 1.625 1.125 0.5 2.5 0.875 3.75 1.625 1.375 0.5 2.5 0.875 4 1.625 1.375 0.5 2.75 0.875 4.25 1.625 1.375 0.5 3 0.875 4.375 1.625 1.625 0.5 3.25 0.875 4.875 1.625 1.625 0.5 3.5 0.875 5.125 1.625 1.875 0.5 3.75 0.875 5.875 1.625 2.125 0.5 4.25 1.125 6.25 1.625 2.375 0.5 4.875 1.125 7.25 1.625 2.75 0.5 5.875 1.125 8.625 1.625 3.75 0.75 7.5 1.125 11.125 1.625 9.25 1.125 19.125 1.625 28.875 1.625h1.375c9.25 0 18.375-0.75 27.5-1.625 3.75-0.5 7.25-0.875 10.75-1.625 2.75-0.5 5.625-0.875 8.375-1.625 2.375-0.5 4.625-0.875 7-1.625 2.125-0.5 4.25-0.875 6.25-1.625 1.875-0.5 3.75-0.875 5.625-1.625 1.625-0.5 3.5-0.875 5.125-1.625 1.625-0.5 3.25-0.875 4.625-1.625 1.375-0.5 3-0.875 4.375-1.625 1.375-0.5 2.75-0.875 4.25-1.625 1.375-0.5 2.5-0.875 4-1.625 1.125-0.5 2.5-0.875 3.75-1.625 1.125-0.5 2.375-0.875 3.5-1.625 1.125-0.5 2.375-0.875 3.5-1.625 1.125-0.5 2.125-0.875 3.25-1.625 1.125-0.5 2.125-0.875 3.25-1.625 0.875-0.5 2.125-0.875 3-1.625 0.875-0.5 1.875-0.875 3-1.625 0.875-0.5 1.875-0.875 2.75-1.625 0.875-0.5 1.875-0.875 2.75-1.625 0.875-0.5 1.875-0.875 2.5-1.625 0.875-0.5 1.625-0.875 2.5-1.625 0.875-0.5 1.625-0.875 2.5-1.625 0.875-0.5 1.625-0.875 2.5-1.625 0.75-0.5 1.625-0.875 2.375-1.625 0.75-0.5 1.625-0.875 2.375-1.625 0.75-0.5 1.375-0.875 2.375-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 2.125-1.625 0.75-0.5 1.375-0.875 1.875-1.625 0.75-0.5 1.375-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.75-0.5 1.125-0.875 1.875-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625 0.5-0.5 1.125-0.875 1.625-1.625l1.625-1.625 1.625-1.625c0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.375-1.625 0.5-0.5 0.875-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.875-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 1.125-1.625 0.5-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.75-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.875-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.75-1.625 0.25-0.5 0.5-0.875 0.5-1.625 0.25-0.5 0.5-0.875 0.5-1.625 0.25-0.5 0.5-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0.25-0.5 0.25-0.875 0.5-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0.25-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625 0-0.5 0-0.875 0.25-1.625v-11.375h-3.125zM589.714646 384c-12.625 0-25.375-12.75-25.375-25.375 0-12.75 12.75-25.375 25.375-25.375 19.375 0 31.875 12.625 31.875 25.375-0.125 12.625-12.75 25.375-31.875 25.375zM729.589646 384c-12.625 0-25.375-12.75-25.375-25.375 0-12.75 12.75-25.375 25.375-25.375 19.125 0 31.875 12.625 31.875 25.375 0 12.625-12.75 25.375-31.875 25.375zM328.714646 568.75c-19.125 0-38.375-12.625-38.375-31.625 0-19.125 19.375-31.875 38.375-31.875s31.875 12.75 31.875 31.875-12.875 31.625-31.875 31.625zM506.964646 568.75c-19.125 0-38.125-12.625-38.125-31.625 0-19.125 19.125-31.875 38.125-31.875 19.125 0 31.875 12.75 31.875 31.875s-12.875 31.625-31.875 31.625z"
+				   horiz-adv-x="1059"/>
+
+
+			<glyph glyph-name="shrink-right" unicode="&#58984;"
+				   d="M52.294-28.71900000000005h899.793c16.546 0 29.999 13.405 29.999 29.999v59.974c-0.013 16.562-13.436 29.985-29.998 29.999h-899.795c-16.57 0-29.999-13.429-29.999-29.999v-59.974c0-16.617 13.429-29.999 29.999-29.999zM952.087 451.165h-479.884c-16.57 0-29.999-13.405-29.999-29.999v-59.974c0 0 0 0 0 0 0-16.572 13.428-30.01 29.997-30.022h479.885c16.571 0.013 29.999 13.448 29.999 30.022 0 0 0 0 0 0v59.974c0 16.593-13.429 29.999-29.999 29.999zM52.294 691.0840000000001h899.793c16.554 0.013 29.972 13.423 29.999 29.974v59.999c0 16.57-13.429 29.999-29.999 29.999h-899.793c-16.57 0-29.999-13.429-29.999-29.999v-59.997c0-16.546 13.429-29.975 29.999-29.975zM45.183 383.53499999999997l239.919-150.598v301.196l-239.919-150.598z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="spread-left" unicode="&#58987;"
+				   d="M942.974 770.924h-843.556c-15.513 0-28.124-12.567-28.124-28.124v-56.226c0.012-15.527 12.596-28.111 28.123-28.124h843.559c15.534 0 28.124 12.59 28.124 28.124v56.226c0 15.578-12.59 28.124-28.124 28.124zM99.418 321.033h449.891c15.534 0 28.124 12.567 28.124 28.124v56.226c0 0 0 0 0 0 0 15.537-12.589 28.134-28.122 28.146h-449.892c-15.534-0.012-28.124-12.608-28.124-28.146 0 0 0 0 0 0v-56.226c0-15.556 12.59-28.124 28.124-28.124zM942.974 96.10900000000004h-843.556c-15.519-0.012-28.099-12.584-28.124-28.101v-56.249c0-15.534 12.59-28.124 28.124-28.124h843.556c15.534 0 28.124 12.59 28.124 28.124v56.248c0 15.513-12.59 28.103-28.124 28.102zM949.641 384.436l-224.924 141.186v-282.37l224.924 141.186z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="camera" unicode="&#58976;"
+				   d="M884.3 648.6H704.2L679.5 698l-0.2 0.4c-1.9 3.6-3.6 6.9-5.1 9.9-12 23.4-21.5 41.9-54.1 41.9H416.7c-32.9 0-43.7-21.3-55.1-43.8-1.3-2.6-2.7-5.3-4.2-8.1l-24.8-49.7H152.4c-34 0-61.7-27.7-61.7-61.7v-488c0-34 27.7-61.7 61.7-61.7h731.9c34 0 61.7 27.7 61.7 61.7v488c0 34-27.7 61.7-61.7 61.7zM904 98.89999999999998c0-10.8-8.8-19.7-19.7-19.7H152.4c-10.8 0-19.7 8.8-19.7 19.7v488c0 10.8 8.8 19.7 19.7 19.7h206.1l36.2 72.5c1.5 2.9 2.9 5.7 4.3 8.3 10.6 20.8 11.1 20.8 17.7 20.8H620c4.6 0 5.8-0.6 5.8-0.6 2-1.2 7.2-11.2 10.9-18.5 1.6-3.1 3.3-6.5 5.3-10.1l36.2-72.4h206.1c10.8 0 19.7-8.8 19.7-19.7v-488zM525.5 565.5c-123.5 0-223.6-100.1-223.6-223.6S402 118.20000000000005 525.5 118.20000000000005s223.7 100.1 223.7 223.7c0 123.5-100.2 223.6-223.7 223.6z m0-402.5c-98.8 0-178.9 80.1-178.9 178.9 0 98.8 80.1 178.9 178.9 178.9 98.8 0 178.9-80.1 178.9-178.9 0-98.8-80.1-178.9-178.9-178.9z m246 402.5v-44.7H861v44.7h-89.5z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="note" unicode="&#58990;"
+				   d="M987.2 384.36L512.43 859.13a84.75 84.75 0 0 1-65 24.71L111.55 864.09a84.83 84.83 0 0 1-79.65-79.65L12.15 448.57a84.57 84.57 0 0 1 24.69-65l474.8-474.8a84.91 84.91 0 0 1 119.93 0L987.2 264.41999999999996a84.9 84.9 0 0 1 0 119.94z m-39.28-80.66L592.29-51.91999999999996a29.31 29.31 0 0 0-41.37 0L76.1 422.9a29.22 29.22 0 0 0-8.49 22.38l19.74 335.88a29.29 29.29 0 0 0 27.48 27.48l335.9 19.75a29.32 29.32 0 0 0 22.38-8.52l474.8-474.8a29.31 29.31 0 0 0 0.01-41.37zM236.86 659.14c-50.92-50.95-50.92-133.8 0-184.72a130.61 130.61 0 1 1 184.71 184.72c-50.89 50.86-133.77 50.86-184.71 0zM382.29 513.7c-28.38-28.38-77.78-28.38-106.15 0a75.08 75.08 0 1 0 106.15 0z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="refresh" unicode="&#58985;"
+				   d="M928 810.666667c-18.133333 0-32-13.866667-32-32v-164.266667C816 747.733333 669.866667 832 512 832 264.533333 832 64 631.4666669999999 64 384s200.533333-448 448-448c230.4 0 422.4 172.8 445.866667 402.133333 2.133333 17.066667-10.666667 33.066667-28.8 35.2-17.066667 2.133333-33.066667-10.666667-35.2-28.8C873.6 148.26666699999998 709.333333 0 512 0c-212.266667 0-384 171.733333-384 384s171.733333 384 384 384c137.6 0 264.533333-74.666667 332.8-192H693.333333c-18.133333 0-32-13.866667-32-32s13.866667-32 32-32h266.666667V778.666667c0 18.133333-14.933333 32-32 32z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="female" unicode="&#58977;"
+				   d="M774.4 800c-48 35.2-108.8 51.2-172.8 51.2-105.6 0-208-51.2-268.8-150.4-89.6-134.4-57.6-313.6 60.8-416l-32-51.2-188.8 121.6S128 384 108.8 352c-22.4-35.2 22.4-64 22.4-64l188.8-121.6-105.6-163.2s-19.2-32 16-51.2c38.4-22.4 57.6 12.8 57.6 12.8l102.4 160 185.6-121.6s48-28.8 70.4 6.4c19.2 28.8-25.6 57.6-25.6 57.6L432 192l32 48c44.8-22.4 92.8-32 137.6-32 105.6 0 208 51.2 268.8 150.4 96 147.2 51.2 345.6-96 441.6z m35.2-400c-44.8-67.2-118.4-108.8-201.6-108.8-44.8 0-92.8 12.8-131.2 38.4-112 73.6-147.2 220.8-73.6 332.8 44.8 64 121.6 105.6 201.6 108.8 44.8 0 92.8-12.8 131.2-38.4 112-73.6 147.2-220.8 73.6-332.8z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="male" unicode="&#58978;"
+				   d="M889.6 800h-240s-35.2 0-38.4-41.6c0-19.2 16-38.4 38.4-38.4h140.8l-179.2-179.2C556.8 582.4 489.6 608 416 608 240 608 96 464 96 288s144-320 320-320 320 144 320 320c0 73.6-25.6 140.8-67.2 195.2l179.2 179.2v-140.8c0-22.4 19.2-38.4 38.4-38.4 22.4 0 38.4 19.2 38.4 41.6V764.8h3.2C924.8 800 889.6 800 889.6 800zM416 48c-131.2 0-236.8 105.6-236.8 236.8 0 131.2 105.6 236.8 236.8 236.8s236.8-105.6 236.8-236.8c0-131.2-105.6-236.8-236.8-236.8z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="screen-restore" unicode="&#59224;"
+				   d="M582.6 454.6v320h50V540l274 274 35.4-35.4-274-274h234.6v-50h-320zM117.4-46l274 274v-234.6h50v320h-320v-50H356l-274-274 35.4-35.4zM132 764h302V814H82v-352h50V764z m760-760H590v-50h352V306h-50v-302z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="password" unicode="&#58995;"
+				   d="M519.2 343.29999999999995c-41.1 0-74.4-33.3-74.4-74.4 0-29.7 17.5-55 42.5-67.1v-81.9c0-17.6 14.3-31.9 31.9-31.9 17.6 0 31.9 14.3 31.9 31.9v81.9c25.1 12 42.5 37.4 42.5 66.9 0 41.3-33.2 74.6-74.4 74.6zM827.6-62.10000000000002H189.4c-35.9 0-65.1 29.2-65.1 65.1V428.4c0 35.9 29.2 65.1 65.1 65.1h638.2c17.3 0 33.7-6.7 46-19.1 12.3-12.3 19.1-28.7 19.1-46V3c0-35.9-29.2-65.1-65.1-65.1zM231.9 427.2c-34.8 0-41.3-6.6-41.3-41.3v-340.4c0-34.8 6.6-41.3 41.3-41.3h553.2c34.8 0 41.3 6.6 41.3 41.3V385.9c0 34.8-6.6 41.3-41.3 41.3H231.9zM519.2 86.70000000000005c-18.3 0-33.2 14.8-33.2 33.2V201c-26.3 12.8-42.6 38.8-42.6 67.8 0 41.8 33.9 75.7 75.7 75.7s75.7-33.9 75.7-75.7c0-29-16.3-55-42.5-67.8v-81.1c0.1-18.2-14.9-33.2-33.1-33.2zM519.2 342c-40.4 0-73.2-32.9-73.2-73.2 0-28.3 16.1-53.6 41.9-65.8l0.7-0.4V120c0-17 13.7-30.7 30.7-30.7S550 103.10000000000002 550 120v82.6l0.7 0.4c25.8 12.3 41.9 37.5 41.9 65.8-0.2 40.4-33.1 73.2-73.4 73.2zM207 523.1c-9.1 0-17.6 3.5-23.9 10-6.4 6.4-10 15-10 23.9v2h-0.2l0.2 1.4c0.1 0.5 0.1 0.9 0.2 1.4l0.2 1c0.1 0.6 0.2 1.4 0.4 2 15.3 75.7 57 144.2 117.2 193 29.9 24.2 63.4 43 99.8 56 37.5 13.3 77 20.2 117.5 20.2 61 0 120.8-16.3 173-47.2 50.6-29.9 93-72.8 122.5-123.8 4-5.6 6.1-12.2 6.1-19.2 0-18.3-15-33.3-33.3-33.3-13.2 0-25.1 7.7-30.4 19.8-49.2 84.6-140.4 137.4-238 137.4-128.1 0-238.2-87.1-267.6-211.8v-0.2c-0.7-18.4-15.4-32.6-33.7-32.6z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="senior" unicode="&#58996;"
+				   d="M719.9 249.39999999999998L514.7 379.5V485.1C615.6 419 731.5 344 731.5 344s139.2-45.6 139.2 106.5c0 93-172.5 112.1-197.2 11.8l-69.6 47.3s24.2 101.5 162.4 106.5c138.2 4.9 192-94.6 190.9-199.6-1.2-104.7-136-198.3-237.3-167.1zM561 414c-4-19-23-33.7-47.6-33.7l-6.9 4.3-217.3 137.8S171 555.2 160.8 439c-10.2-116.1 147.4-129.5 186.8-23.8l81.7-47.6s-65.1-119.1-198.5-119.1C97.3 248.5 0.6 423.8 114 546.3c113.5 122.4 218.6 64.6 257 35.7 16.4-12.4 85.3-57.9 158.6-105.9l3.1-2.4c28.3-18.2 33.4-35.6 28.3-59.7zM434.1 149.70000000000005h212c16.7 0 30.3-13.6 30.3-30.3v-15.1c0-16.7-13.6-30.3-30.3-30.3h-212c-16.7 0-30.3 13.6-30.3 30.3v15.1c0 16.8 13.6 30.3 30.3 30.3z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="theme" unicode="&#58986;"
+				   d="M512 800C229.696 800 0 570.304 0 288c0-90.368 30.304-174.496 85.344-236.896 55.264-62.624 129.152-97.12 208.128-97.12 81.568 0 161.536 36.832 231.264 106.592l2.272 2.496c65.792 81.472 132.896 121.056 205.088 121.056 46.72 0 89.216-15.872 126.688-29.92 30.336-11.328 56.576-21.12 81.216-21.12C1024 133.08799999999997 1024 241.664 1024 288c0 282.304-229.696 512-512 512z m428-602.912c-13.088 0-35.296 8.288-58.784 17.088-40.48 15.136-90.848 33.952-149.12 33.952-92.352 0-175.328-46.944-253.76-143.456-57.184-56.704-121.056-86.688-184.832-86.688-60.352 0-117.216 26.784-160.128 75.456C88.64 144.12800000000004 64 213.216 64 288 64 535.04 264.96 736 512 736s448-200.96 448-448c0-27.328-1.952-90.912-20-90.912zM800.704 379.93600000000004m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM457.024 582.624m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM672.704 555.9359999999999m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM291.392 443.936m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM278.4 197.24800000000005m-96 0a96 96 0 1 1 192 0 96 96 0 1 1-192 0Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="tread" unicode="&#59077;"
+				   d="M860.8 172.79999999999995l6.4-57.6-6.4 57.6c12.8 0 25.6 3.2 35.2 12.8 6.4 9.6 6.4 22.4 3.2 32l57.6 12.8-57.6-12.8L800 553.6c-6.4 28.8-25.6 51.2-48 64-9.6 6.4-22.4 9.6-32 9.6H182.4c-22.4 3.2-41.6-6.4-51.2-25.6-6.4-9.6-6.4-19.2-9.6-28.8v-342.4c0-19.2 9.6-38.4 28.8-48 6.4-3.2 12.8-6.4 19.2-6.4h192l19.2-25.6 147.2-188.8c6.4-9.6 19.2-12.8 28.8-9.6 16 3.2 25.6 19.2 22.4 35.2l-9.6 118.4-6.4 67.2h297.6z m-233.6-57.6l9.6-128c3.2-28.8-9.6-54.4-28.8-73.6-35.2-32-92.8-28.8-124.8 6.4l-156.8 195.2H179.2c-19.2 0-38.4 6.4-57.6 16-35.2 19.2-57.6 57.6-57.6 99.2V572.8c0 19.2 6.4 38.4 16 57.6 19.2 38.4 57.6 60.8 99.2 54.4h537.6c67.2-3.2 121.6-48 137.6-112l102.4-339.2c6.4-28.8 3.2-57.6-12.8-80-19.2-22.4-48-38.4-76.8-38.4h-240zM304 627.2v-451.2h57.6V627.2H304z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="praise" unicode="&#59078;"
+				   d="M860.8 595.2h-297.6l6.4 67.2 9.6 118.4c3.2 16-6.4 32-22.4 35.2-9.6 3.2-22.4 0-28.8-9.6l-147.2-188.8-19.2-25.6h-192c-6.4 0-12.8-3.2-19.2-6.4-19.2-9.6-28.8-28.8-28.8-48v-342.4c0-9.6 3.2-22.4 9.6-28.8 9.6-19.2 28.8-28.8 48-25.6h537.6c12.8 0 22.4 3.2 32 9.6 25.6 12.8 44.8 35.2 48 64l102.4 336 57.6-12.8-57.6 12.8c3.2 9.6 0 22.4-3.2 32-9.6 6.4-22.4 12.8-35.2 12.8l6.4 57.6-6.4-57.6z m-233.6 57.6h240c28.8 0 57.6-12.8 76.8-38.4 16-22.4 19.2-54.4 12.8-80l-102.4-339.2c-16-64-70.4-108.8-137.6-112H179.2c-41.6-3.2-80 19.2-99.2 54.4-9.6 19.2-16 38.4-16 57.6V537.6c0 41.6 22.4 80 57.6 99.2 19.2 9.6 38.4 12.8 57.6 16h144L480 848c32 35.2 89.6 38.4 124.8 6.4 19.2-19.2 32-44.8 28.8-73.6l-6.4-128z m-323.2-512h57.6V592H304v-451.2z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="star-fill" unicode="&#58968;"
+				   d="M752-43.200000000000045c-9.6 0-20.8 3.2-30.4 8l-208 104-209.6-104c-20.8-11.2-48-9.6-67.2 4.8-19.2 14.4-30.4 40-25.6 64l43.2 224L89.6 411.2C72 428.8 65.6 456 72 478.4c8 24 27.2 41.6 52.8 44.8l228.8 41.6 102.4 208c11.2 22.4 33.6 36.8 57.6 36.8s48-14.4 57.6-36.8l102.4-208 228.8-40c24-3.2 44.8-20.8 51.2-44.8 8-24 1.6-49.6-16-67.2L772.8 257.6l41.6-224c4.8-25.6-6.4-49.6-25.6-64-9.6-8-22.4-12.8-36.8-12.8z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="rate" unicode="&#59003;"
+				   d="M959.008 489.984l-308 47.008L512 832 372.992 536.992l-308-47.008 223.008-228-52.992-324L512 90.976l276.992-152.992-52.992 324zM512 156L304 39.00800000000004l40 235.008-179.008 182.016 242.016 32 104.992 224 104-224 240.992-34.016L680 273.024l36.992-235.008z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="template-1" unicode="&#58966;"
+				   d="M512 384zM43.52 601.6l409.6-176.64c58.88-30.72 110.08 0 110.08 0l414.72 174.08 2.56 2.56c10.24 5.12 15.36 15.36 15.36 28.16 0 15.36-10.24 28.16-23.04 30.72L563.2 837.12c-56.32 23.04-97.28 0-97.28 0L46.08 660.48c-12.8-5.12-20.48-17.92-20.48-30.72s7.68-23.04 17.92-28.16z m0 0M512 222.72000000000003c-2.56 0-7.68 0-10.24 2.56l-486.4 215.04c-12.8 5.12-17.92 20.48-12.8 33.28 5.12 12.8 20.48 17.92 33.28 12.8L512 276.48 988.16 486.4c12.8 5.12 28.16 0 33.28-12.8 5.12-12.8 0-28.16-12.8-33.28l-486.4-215.04c-2.56-2.56-7.68-2.56-10.24-2.56zM512 71.67999999999995c-2.56 0-7.68 0-10.24 2.56l-486.4 215.04c-12.8 5.12-17.92 20.48-12.8 33.28 5.12 10.24 20.48 17.92 33.28 10.24L512 125.44000000000005 988.16 332.79999999999995c12.8 5.12 28.16 0 33.28-12.8 5.12-12.8 0-28.16-12.8-33.28l-486.4-215.04H512zM512-79.36000000000001c-2.56 0-7.68 0-10.24 2.56l-486.4 215.04c-12.8 5.12-17.92 20.48-12.8 33.28 5.12 12.8 20.48 17.92 33.28 12.8L512-25.600000000000023l476.16 209.92c12.8 5.12 28.16 0 33.28-12.8 5.12-12.8 0-28.16-12.8-33.28l-486.4-215.04c-2.56-2.56-7.68-2.56-10.24-2.56z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="vercode" unicode="&#59001;"
+				   d="M513.807059-128C351.171765-128 58.428235 126.19294100000002 54.211765 376.16941199999997V662.287059a93.364706 93.364706 0 0 0 81.317647 88.545882 570.428235 570.428235 0 0 1 163.237647 40.357647A393.336471 393.336471 0 0 1 446.945882 872.508235a101.797647 101.797647 0 0 0 120.470589 5.421177A629.458824 629.458824 0 0 1 716.8 792.395294a1255.303529 1255.303529 0 0 1 169.863529-38.550588 98.785882 98.785882 0 0 0 79.510589-90.955294 2911.171765 2911.171765 0 0 0-3.011765-291.538824C924.611765 49.09176500000001 672.828235-128 513.807059-128z m0 963.764706a39.152941 39.152941 0 0 1-24.696471-7.830588A438.512941 438.512941 0 0 0 319.247059 734.569412a608.376471 608.376471 0 0 0-180.705883-43.369412 33.731765 33.731765 0 0 1-24.094117-30.117647v-283.708235C118.663529 155.10588199999995 389.722353-67.76470600000005 513.807059-67.76470600000005s354.183529 148.178824 391.529412 444.536471c9.035294 175.887059 0 281.901176 0 283.105882a38.550588 38.550588 0 0 1-29.515295 33.731765 1287.830588 1287.830588 0 0 0-180.705882 41.562353A676.442353 676.442353 0 0 0 536.094118 829.741176a37.345882 37.345882 0 0 1-24.094118 6.02353zM784.865882 479.171765L487.905882 198.47529399999996a40.357647 40.357647 0 0 0-49.392941-4.818823l-7.830588 6.625882-161.430588 171.068235a40.357647 40.357647 0 1 0 60.235294 55.416471l133.722353-141.552941 267.444706 252.988235a40.357647 40.357647 0 1 0 55.41647-60.235294"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="service" unicode="&#58918;"
+				   d="M895.44035 502.006246A31.340412 31.340412 0 0 1 895.44035 512.2398499999999 383.76015 383.76015 0 0 1 127.92005 512.2398499999999a31.340412 31.340412 0 0 1 0-10.233604 167.575265 167.575265 0 0 1-127.92005-159.900062V320.359775a168.854466 168.854466 0 0 1 140.712055-163.098064A351.140537 351.140537 0 0 1 401.029357-63.400375000000054h5.756402a95.940037 95.940037 0 1 1 0 63.960025 287.180512 287.180512 0 0 0-195.717677 156.062461h35.817614A40.294816 40.294816 0 0 1 287.820112 192.43972499999995V468.747033a40.294816 40.294816 0 0 1-40.934416 39.015615H191.880075A30.061212 30.061212 0 0 1 191.880075 512.2398499999999a319.800125 319.800125 0 0 0 639.60025 0 30.061212 30.061212 0 0 1 0-3.837601h-55.005622a40.294816 40.294816 0 0 1-40.934416-39.015616V192.43972499999995a40.294816 40.294816 0 0 1 40.934416-39.015615h72.274829A170.773267 170.773267 0 0 1 1023.3604 320.359775v21.746409a167.575265 167.575265 0 0 1-127.92005 159.900062zM496.329794 0.5596500000000333a31.980012 31.980012 0 1 0-31.980013-31.980012 31.980012 31.980012 0 0 0 31.980013 31.980012zM223.860087 220.582136h-49.249219A106.813242 106.813242 0 0 0 63.960025 320.359775v21.746409a106.813242 106.813242 0 0 0 110.650843 102.33604h49.249219zM959.400375 320.359775a106.813242 106.813242 0 0 0-110.650843-102.33604h-49.24922V444.442224h49.24922A106.813242 106.813242 0 0 0 959.400375 342.106184zM650.473454 750.171143l-23.665209 8.314803a31.980012 31.980012 0 0 1-19.827608-63.960025l18.548407-7.035602a31.980012 31.980012 0 1 1 24.94441 58.843223zM305.089319 674.698314A31.980012 31.980012 0 0 1 358.17614 640.1599 202.113679 202.113679 0 0 0 511.6802 716.91193a31.980012 31.980012 0 0 1 0 63.960025 263.515303 263.515303 0 0 1-206.590881-106.173641z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="cellphone" unicode="&#59000;"
+				   d="M785.066667 896H238.933333a102.4 102.4 0 0 1-102.4-102.4v-819.2a102.4 102.4 0 0 1 102.4-102.4h546.133334a102.4 102.4 0 0 1 102.4 102.4V793.6a102.4 102.4 0 0 1-102.4 102.4zM238.933333 827.733333h546.133334a34.133333 34.133333 0 0 0 34.133333-34.133333v-648.533333H204.8V793.6a34.133333 34.133333 0 0 0 34.133333 34.133333z m546.133334-887.466666H238.933333a34.133333 34.133333 0 0 0-34.133333 34.133333v102.4h614.4v-102.4a34.133333 34.133333 0 0 0-34.133333-34.133333zM512 8.53333299999997m-34.133333 0a34.133333 34.133333 0 1 1 68.266666 0 34.133333 34.133333 0 1 1-68.266666 0ZM426.666667 725.333333h170.666666a17.066667 17.066667 0 0 1 0 34.133334h-170.666666a17.066667 17.066667 0 0 1 0-34.133334z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="print" unicode="&#58989;"
+				   d="M843.946667 603.733333h-47.36V725.333333a90.026667 90.026667 0 0 1-94.72 85.333334H312.32a81.493333 81.493333 0 0 1-85.333333-85.333334v-121.6H170.666667a81.493333 81.493333 0 0 1-85.333334-85.333333v-325.12a89.173333 89.173333 0 0 1 85.333334-93.866667h56.746666v-52.48a89.6 89.6 0 0 1 89.6-89.6h389.973334a89.6 89.6 0 0 1 89.6 89.6v52.48h47.36a97.706667 97.706667 0 0 1 94.72 93.866667V518.4a90.026667 90.026667 0 0 1-94.72 85.333333zM279.466667 725.333333a30.72 30.72 0 0 0 32.853333 33.706667h389.546667c18.773333 0 42.666667-11.52 42.666666-33.706667v-121.6H279.466667z m465.066666-678.4a37.546667 37.546667 0 0 0-37.546666-37.973333H317.013333a37.546667 37.546667 0 0 0-37.546666 37.973333v170.666667a37.546667 37.546667 0 0 0 37.546666 38.4h389.973334a37.546667 37.546667 0 0 0 37.546666-37.973333z m142.506667 146.346667a45.653333 45.653333 0 0 0-42.666667-42.666667h-47.786666v66.133334a89.6 89.6 0 0 1-89.6 89.6H317.013333a89.6 89.6 0 0 1-89.6-89.6v-65.28H170.666667a37.546667 37.546667 0 0 0-33.28 42.666666v324.266667A31.146667 31.146667 0 0 0 170.666667 552.106667h673.28c19.2 0 42.666667-11.52 42.666666-33.706667z m-640 281.173333h-37.546667a13.226667 13.226667 0 0 0 0 26.026667h38.826667a13.226667 13.226667 0 1 0 0-26.026667z m94.293333 0H298.666667a13.226667 13.226667 0 1 0 0 26.026667h42.666666a13.226667 13.226667 0 0 0 0-26.026667z m426.666667-116.48H248.32a13.226667 13.226667 0 0 0 0 26.026667H768a13.226667 13.226667 0 0 0 0-26.026667z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="cols" unicode="&#58896;"
+				   d="M128 448h384V832H128z m64 320h256v-256H192zM576 832v-384h384V832z m320-320H640V768h256zM192 384h64v-384H192zM384 384h64v-384H384zM640 384h64v-384H640zM832 384h64v-384h-64z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="export" unicode="&#59005;"
+				   d="M896.4374528 479.830016c0 26.673152-21.6236032 48.2967552-48.2967552 48.2967552H630.8069376c-26.673152 0-48.2967552-21.6236032-48.2967552-48.2967552v-83.04831147H384.69522773l-2.71428266 5.36849067c-41.336832 87.44686933-35.95195733 204.128256 150.601728 199.94487467v-108.91537067l172.19037866 164.757504L532.58267307 822.7110912v-106.57245867c-228.64418133 5.70709333-263.651328-183.517184-157.433856-314.01028266l4.6891008-5.34664534h-88.46595414c-26.673152 0-48.2967552-21.6236032-48.2967552-48.2967552v-66.78882986h-98.43616426c-26.673152 0-40.4258816-21.6236032-30.71781547-48.2967552l79.10304427-217.33485227c9.70806613-26.673152 39.20145067-48.2967552 65.87460266-48.2967552h603.70670934c23.75898453 0 37.2506624 17.16169387 33.05745066 39.76178347 0.4980736 2.77108053 0.77441707 5.619712 0.77441707 8.53497173v463.765504z m-60.37067093-306.4528896l-21.8464256 60.02223787c-9.70806613 26.673152-39.20145067 48.2967552-65.87460267 48.2967552H303.44697173v30.56708266c0 13.336576 10.81125547 24.14783147 24.14783147 24.14783147h315.28605013v107.1972352c0 13.336576 10.81125547 24.14783147 24.14783147 24.14783147h144.88917333c13.336576 0 24.14783147-10.81125547 24.14783147-24.14783147v-270.2311424z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="slider" unicode="&#59156;"
+				   d="M228.7 683.9v-66.7H112v66.7h116.7z m333.2-266.6v-66.7H112v66.7h449.9zM295.4 150.60000000000002V84H112v66.7h183.4v-0.1z m116.6 600c9 0 16.8-3.3 23.5-9.9 6.5-6.5 9.9-14.5 9.9-23.5v-133.3c0-9-3.3-16.8-9.9-23.5-6.5-6.5-14.5-9.9-23.5-9.9H278.8c-9 0-16.8 3.3-23.5 9.9-6.5 6.5-9.9 14.3-9.9 23.5V717.1c0 9 3.3 16.8 9.9 23.5 6.5 6.5 14.3 9.9 23.5 9.9h133.3v0.1h-0.1z m66.7-533.3c9 0 16.8-3.3 23.5-9.9 6.5-6.5 9.9-14.5 9.9-23.5v-133.3c0-9-3.3-16.8-9.9-23.5-6.5-6.5-14.5-9.9-23.5-9.9H345.3c-9 0-16.8 3.3-23.5 9.9-6.5 6.5-9.9 14.5-9.9 23.5V183.89999999999998c0 9 3.3 16.8 9.9 23.5 6.5 6.5 14.3 9.9 23.5 9.9h133.4v0.1zM912 683.9v-66.7H462.1v66.7H912z m0-533.3V84H528.6v66.7h383.3v-0.1h0.1zM745.2 483.9c9 0 16.8-3.3 23.5-9.9 6.5-6.5 9.9-14.5 9.9-23.5v-133.3c0-9-3.3-16.8-9.9-23.5-6.5-6.5-14.5-9.9-23.5-9.9H612c-9 0-16.8 3.3-23.5 9.9-6.5 6.5-9.9 14.3-9.9 23.5V450.6c0 9 3.3 16.8 9.9 23.5 6.5 6.5 14.5 9.9 23.5 9.9l133.2-0.1zM912 417.3v-66.7H795.3v66.7H912z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="subtraction" unicode="&#59006;"
+				   d="M785 348H239c-19.8 0-36 16.2-36 36s16.2 36 36 36h546c19.8 0 36-16.2 36-36s-16.2-36-36-36z"
+				   horiz-adv-x="1024"/>
+
+
+		</font>
+	</defs>
+</svg>
diff --git a/len-sys/src/main/resources/plugin/layui/modules/treeTable.js b/len-sys/src/main/resources/plugin/layui/modules/treeTable.js
index f795756..e814a5b 100644
--- a/len-sys/src/main/resources/plugin/layui/modules/treeTable.js
+++ b/len-sys/src/main/resources/plugin/layui/modules/treeTable.js
@@ -1,2265 +1,2265 @@
 /** 树形表格3.x Created by wangfan on 2020-05-12 https://gitee.com/whvse/treetable-lay */
 
 layui.define(['laytpl', 'form', 'util'], function (exports) {
-    var $ = layui.jquery;
-    var laytpl = layui.laytpl;
-    var form = layui.form;
-    var util = layui.util;
-    var device = layui.device();
-    var MOD_NAME = 'treeTable';  // 模块名
-    var _instances = {};  // 记录所有实例
-
-    /* 表格默认参数 */
-    var defaultOption = {
-        elem: undefined,                                 // 容器
-        cols: undefined,                                 // 列参数
-        url: undefined,                                  // url模式请求
-        method: undefined,                               // url模式请求方式
-        where: undefined,                                // url模式请求条件
-        contentType: undefined,                          // url模式请求类型
-        headers: undefined,                              // url模式请求headers
-        parseData: undefined,                            // url模式处理请求数据
-        request: {pidName: 'pid'},                       // url模式请求字段自定义
-        toolbar: undefined,                              // 表头工具栏
-        defaultToolbar: undefined,                       // 表头工具栏右侧按钮
-        width: undefined,                                // 容器宽度
-        height: undefined,                               // 容器高度
-        cellMinWidth: 90,                                // 单元格最小宽度
-        done: undefined,                                 // 数据处理完回调
-        data: undefined,                                 // 直接赋值数据
-        title: undefined,                                // 定义table大标题，文件导出会用到
-        skin: undefined,                                 // 表格风格
-        even: undefined,                                 // 是否开启隔行变色
-        size: undefined,                                 // 表格尺寸
-        text: {
-            none: '无数据'                               // 空数据提示
-        },
-        reqData: undefined,                              // 自定义加载数据方法
-        useAdmin: false,                                  // 是否使用admin.ajax
-        tree: {
-            idName: 'id',                                // id的字段名
-            pidName: 'pid',                              // pid的字段名
-            childName: 'children',                       // children的字段名
-            haveChildName: 'haveChild',                  // 是否有children标识的字段名
-            haveChildReverse: false,                     // 是否将children标识的字段取反
-            openName: 'open',                            // 是否默认展开的字段名
-            iconIndex: 0,                                // 图标列的索引
-            arrowType: undefined,                        // 折叠箭头类型
-            onlyIconControl: undefined,                  // 仅点击图标控制展开折叠
-            getIcon: function (d) {                      // 自定义图标
-                var haveChild = d[this.haveChildName];
-                if (haveChild !== undefined) {
-                    haveChild = haveChild === true || haveChild === 'true';
-                    if (this.haveChildReverse) haveChild = !haveChild;
-                }
-                else if (d[this.childName]) haveChild = d[this.childName].length > 0;
-                if (haveChild) return '<i class="ew-tree-icon layui-icon layui-icon-layer"></i>';
-                else return '<i class="ew-tree-icon layui-icon layui-icon-file"></i>';
-            }
-        }
-    };
-    /* 列默认参数 */
-    var colDefaultOption = {
-        field: undefined,     // 字段名
-        title: undefined,     // 标题
-        width: undefined,     // 宽度
-        minWidth: undefined,  // 最小宽度
-        type: 'normal',       // 列类型
-        fixed: undefined,     // 固定列
-        hide: undefined,      // 是否初始隐藏列
-        unresize: undefined,  // 禁用拖拽列宽
-        style: undefined,     // 单元格样式
-        align: undefined,     // 对齐方式
-        colspan: undefined,   // 单元格所占的列数
-        rowspan: undefined,   // 单元格所占的行数
-        templet: undefined,   // 自定义模板
-        toolbar: undefined,   // 工具列
-        'class': undefined,   // 单元格class
-        singleLine: undefined // 是否一行显示
-    };
-
-    /** TreeTable类构造方法 */
-    var TreeTable = function (options) {
-        _instances[options.elem.substring(1)] = this;
-        this.reload(options);
-    };
-
-    /**
-     * 根据ID查找数据
-     * @param id 数据条目的ID
-     */
-    TreeTable.prototype.findDataById = function (id) {
-        var options = this.options;
-        function each(data) {
-            for (var i = 0; i < data.length; i++) {
-                if (data[i][options.tree.idName] === id) return data[i];
-                if (data[i][options.tree.childName]) {
-                    var res = each(data[i][options.tree.childName]);
-                    if (res) return res;
-                }
-            }
-        }
-        return each(options.data);
-    }
-
-    /** 参数设置 */
-    TreeTable.prototype.initOptions = function (opt) {
-        var that = this;
-
-        // 处理特殊列
-        function initCol(item) {
-            if (!item.INIT_OK) item = $.extend({INIT_OK: true}, colDefaultOption, item);
-            // 特殊列处理
-            if (item.type === 'space') {  // 空列
-                if (!item.width) item.width = 15;
-                item.minWidth = item.width;
-            } else if (item.type === 'numbers') {  // 序号列
-                if (!item.width) item.width = 40;
-                item.minWidth = item.width;
-                if (!item.singleLine) item.singleLine = false;
-                if (!item.unresize) item.unresize = true;
-                if (!item.align) item.align = 'center';
-            } else if (item.type === 'checkbox' || item.type === 'radio') {  // 复/单选框列
-                if (!item.width) item.width = 48;
-                item.minWidth = item.width;
-                if (!item.singleLine) item.singleLine = false;
-                if (!item.unresize) item.unresize = true;
-                if (!item.align) item.align = 'center';
-            }
-            if (item.toolbar) item.type = 'tool';
-            return item;
-        }
-
-        // 初始化列参数
-        if ('Array' !== isClass(opt.cols[0])) opt.cols = [opt.cols];
-
-        // 恢复cols参数初始状态
-        for (var m = 0; m < opt.cols.length; m++) {
-            for (var n = 0; n < opt.cols[m].length; n++) {
-                opt.cols[m][n].INIT_OK = undefined;
-                opt.cols[m][n].key = undefined;
-                opt.cols[m][n].colGroup = undefined;
-                opt.cols[m][n].HAS_PARENT = undefined;
-                opt.cols[m][n].parentKey = undefined;
-                opt.cols[m][n].PARENT_COL_INDEX = undefined;
-            }
-        }
-
-        // cols参数处理
-        var colArrays = [], colIndex = 0;
-        for (var i1 = 0; i1 < opt.cols.length; i1++) {
-            var item1 = opt.cols[i1];
-            for (var i2 = 0; i2 < item1.length; i2++) {
-                var item2 = item1[i2];
-                if (!item2) {
-                    item1.splice(i2, 1);
-                    continue;
-                }
-                item2 = initCol(item2);
-                // 合并单元格处理
-                item2.key = i1 + '-' + i2;
-                var CHILD_COLS = undefined;
-                if (item2.colGroup || item2.colspan > 1) {
-                    item2.colGroup = true;
-                    item2.type = 'group';
-                    CHILD_COLS = [];
-                    colIndex++;
-                    var childIndex = 0;
-                    for (var i22 = 0; i22 < opt.cols[i1 + 1].length; i22++) {
-                        var item22 = $.extend({INIT_OK: true}, colDefaultOption, opt.cols[i1 + 1][i22]);
-                        if (item22.HAS_PARENT || (childIndex > 1 && childIndex == item2.colspan)) {
-                            opt.cols[i1 + 1][i22] = item22;
-                            continue;
-                        }
-                        item22.HAS_PARENT = true;
-                        item22.parentKey = i1 + '-' + i2;
-                        item22.key = (i1 + 1) + '-' + i22;
-                        item22.PARENT_COL_INDEX = colIndex;
-                        item22 = initCol(item22);
-                        CHILD_COLS.push(item22);
-                        childIndex = childIndex + parseInt(item22.colspan > 1 ? item22.colspan : 1);
-                        opt.cols[i1 + 1][i22] = item22;
-                    }
-                }
-                item2.CHILD_COLS = CHILD_COLS;
-                if (!item2.PARENT_COL_INDEX) colArrays.push(item2);
-                opt.cols[i1][i2] = item2;
-            }
-        }
-        this.options = $.extend(true, {}, defaultOption, opt);
-        this.options.colArrays = colArrays;
-
-        // url加载模式转为reqData模式
-        if (this.options.url) {
-            this.options.reqData = function (data, callback) {
-                if (!that.options.where) that.options.where = {};
-                if (data) that.options.where[that.options.request.pidName] = data[that.options.tree.idName];
-                (that.options.useAdmin ? layui.admin : $).ajax({
-                    url: that.options.url,
-                    data: that.options.contentType && that.options.contentType.indexOf('application/json') === 0 ? JSON.stringify(that.options.where) : that.options.where,
-                    headers: that.options.headers,
-                    type: that.options.method,
-                    dataType: 'json',
-                    contentType: that.options.contentType,
-                    success: function (res) {
-                        if (that.options.parseData) res = that.options.parseData(res);
-                        if (res.code == 0) callback(res.data);
-                        else callback(res.msg || '加载失败');
-                    },
-                    error: function (xhr) {
-                        callback(xhr.status + ' - ' + xhr.statusText);
-                    }
-                });
-            };
-        } else if (this.options.data && this.options.data.length > 0 && this.options.tree.isPidData) {  // pid形式数据转children形式
-            this.options.data = tt.pidToChildren(this.options.data, this.options.tree.idName, this.options.tree.pidName, this.options.tree.childName);
-        }
-
-        // toolbar参数处理
-        if ('default' === this.options.toolbar) {
-            this.options.toolbar = [
-                '<div>',
-                '   <div class="ew-tree-table-tool-item" title="添加" lay-event="add">',
-                '      <i class="layui-icon layui-icon-add-1"></i>',
-                '   </div>',
-                '   <div class="ew-tree-table-tool-item" title="修改" lay-event="update">',
-                '      <i class="layui-icon layui-icon-edit"></i>',
-                '   </div>',
-                '   <div class="ew-tree-table-tool-item" title="删除" lay-event="delete">',
-                '      <i class="layui-icon layui-icon-delete"></i>',
-                '   </div>',
-                '</div>'
-            ].join('');
-        }
-        if (this.options.defaultToolbar === undefined) this.options.defaultToolbar = ['filter', 'exports', 'print'];
-
-        // 自定义图标参数处理
-        if (typeof this.options.tree.getIcon === 'string') {
-            var icon = this.options.tree.getIcon;
-            this.options.tree.getIcon = function (d) {
-                if (icon !== 'ew-tree-icon-style2') return icon;
-                var haveChild = d[this.haveChildName];
-                if (haveChild !== undefined) {
-                    haveChild = haveChild === true || haveChild === 'true';
-                    if (this.haveChildReverse) haveChild = !haveChild;
-                }
-                else if (d[this.childName]) haveChild = d[this.childName].length > 0;
-                if (haveChild) return '<i class="ew-tree-icon ew-tree-icon-folder"></i>';
-                else return '<i class="ew-tree-icon ew-tree-icon-file"></i>';
-            }
-        }
-    };
-    /** 初始化表格 */
-    TreeTable.prototype.init = function () {
-        var options = this.options;
-        var $elem = $(options.elem);  // 原始表格
-        var tbFilter = options.elem.substring(1);  // 表格的filter
-        // 第一次生成树表格dom
-        $elem.removeAttr('lay-filter');
-        if ($elem.next('.ew-tree-table').length === 0) {
-            $elem.css('display', 'none');
-            $elem.after([
-                '<div class="layui-form ew-tree-table" lay-filter="', tbFilter, '" style="', options.style || '', '">',
-                '   <div class="ew-tree-table-tool" style="display: none;"></div>',
-                '   <div class="ew-tree-table-head">',
-                '      <table class="layui-table"></table>',
-                '   </div>',
-                '   <div class="ew-tree-table-box">',
-                '      <table class="layui-table"></table>',
-                '      <div class="ew-tree-table-loading">',
-                '         <i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate layui-anim-loop"></i>',
-                '      </div>',
-                '      <div class="ew-tree-table-empty">', options.text.none || '', '</div>',
-                '   </div>',
-                '</div>'
-            ].join(''));
-        }
-        // 获取各个组件
-        var components = this.getComponents();
-
-        // 基础参数设置
-        if (options.skin) components.$table.attr('lay-skin', options.skin);
-        if (options.size) components.$table.attr('lay-size', options.size);
-        if (options.even) components.$table.attr('lay-even', options.even);
-
-        // 头部工具栏
-        components.$toolbar.empty();
-        if (options.toolbar === false || options.toolbar === undefined) {
-            components.$toolbar.hide();
-        } else {
-            components.$toolbar.show();
-            if (typeof options.toolbar === 'string') {
-                laytpl($(options.toolbar).html()).render({}, function (html) {
-                    components.$toolbar.html('<div style="display: inline-block;">' + html + '</div>');
-                });
-            }
-            var tbRights = ['<div class="ew-tree-table-tool-right">'];
-            for (var i = 0; i < options.defaultToolbar.length; i++) {
-                var tbItem;
-                if ('filter' === options.defaultToolbar[i]) {
-                    tbItem = {title: '筛选', layEvent: 'LAYTABLE_COLS', icon: 'layui-icon-cols'};
-                } else if ('exports' === options.defaultToolbar[i]) {
-                    tbItem = {title: '导出', layEvent: 'LAYTABLE_EXPORT', icon: 'layui-icon-export'};
-                } else if ('print' === options.defaultToolbar[i]) {
-                    tbItem = {title: '打印', layEvent: 'LAYTABLE_PRINT', icon: 'layui-icon-print'};
-                } else {
-                    tbItem = options.defaultToolbar[i];
-                }
-                if (tbItem) {
-                    tbRights.push('<div class="ew-tree-table-tool-item"');
-                    tbRights.push(' title="' + tbItem.title + '"');
-                    tbRights.push(' lay-event="' + tbItem.layEvent + '">');
-                    tbRights.push('<i class="layui-icon ' + tbItem.icon + '"></i></div>');
-                }
-            }
-            components.$toolbar.append(tbRights.join('') + '</div>');
-        }
-
-        // 固定宽度
-        if (options.width) {
-            components.$view.css('width', options.width);
-            components.$tHeadGroup.css('width', options.width);
-            components.$tBodyGroup.css('width', options.width);
-        }
-        // 表格尺寸设置
-        var colgroupHtml = this.resize(true);
-        // 生成thead
-        var headHtml = '<thead>' + this.renderBodyTh() + '</thead>';
-
-        // 渲染表头及空的表主体的结构
-        components.$tBodyGroup.children('style').remove();
-        if (options.height) {  // 固定表头
-            components.$tHead.html(colgroupHtml + headHtml);
-            components.$tBody.html(colgroupHtml + '<tbody></tbody>');
-            if (options.height.indexOf('full-') === 0) {  // 差值高度
-                var h = parseFloat(options.height.substring(5)) + components.$toolbar.outerHeight()
-                    + components.$tHeadGroup.outerHeight() + 1;
-                components.$tBodyGroup.append([
-                    '<style>[lay-filter="', tbFilter, '"] .ew-tree-table-box {',
-                    '   height: ', getPageHeight() - h, 'px;',
-                    '   height: -moz-calc(100vh - ', h, 'px);',
-                    '   height: -webkit-calc(100vh - ', h, 'px);',
-                    '   height: calc(100vh - ', h, 'px);',
-                    '}</style>'
-                ].join(''));
-                components.$tBodyGroup.data('full', h);
-                components.$tBodyGroup.css('height', '');
-            } else {  // 固定高度
-                components.$tBodyGroup.css('height', options.height);
-                components.$tBodyGroup.data('full', '');
-            }
-            components.$tHeadGroup.show();
-        } else {
-            components.$tHeadGroup.hide();
-            var trH = {lg: 50, sm: 30, md: 38};
-            components.$tBodyGroup.append([
-                '<style>[lay-filter="', tbFilter, '"] .ew-tree-table-box:before {',
-                '   content: "";',
-                '   position: absolute;',
-                '   top: 0; left: 0; right: 0;',
-                '   height: ' + (trH[options.size || 'md'] * options.cols.length) + 'px;',
-                '   background-color: #f2f2f2;',
-                '   border-bottom: 1px solid #e6e6e6;',
-                '}</style>'
-            ].join(''));
-            components.$tBody.html(colgroupHtml + headHtml + '<tbody></tbody>');
-        }
-        form.render('checkbox', tbFilter);  // 渲染表头的表单元素
-
-        // 默认隐藏列修正colspan
-        function patchHide($tr) {
-            var parentKey = $tr.data('parent'), pCol;
-            if (!parentKey) return;
-            var $parent = components.$table.children('thead').children('tr').children('[data-key="' + parentKey + '"]');
-            var colspan = $parent.attr('colspan') - 1;
-            $parent.attr('colspan', colspan);
-            if (colspan === 0) $parent.addClass('layui-hide');
-            patchHide($parent);
-        }
-
-        components.$table.children('thead').children('tr').children('th.layui-hide').each(function () {
-            patchHide($(this));
-        });
-
-        // 渲染数据
-        if (options.reqData) {  // 异步加载
-            this.options.data = undefined;
-            this.renderBodyAsync();
-        } else if (options.data && options.data.length > 0) {
-            this.renderBodyData(options.data);
-        } else {
-            components.$loading.hide();
-            components.$empty.show();
-        }
-    };
-
-    /** 绑定各项事件 */
-    TreeTable.prototype.bindEvents = function () {
-        var that = this;
-        var options = this.options;
-        var components = this.getComponents();
-        var $allBody = components.$table.children('tbody');
-
-        /* 行事件公共返回对象 */
-        var member = function (ext) {
-            // 获取行dom
-            var $tr = $(this);
-            if (!$tr.is('tr')) {
-                var $temp = $tr.parent('tr');
-                if ($temp.length > 0) $tr = $temp;
-                else $tr = $tr.parentsUntil('tr').last().parent();
-            }
-            var data = that.getDataByTr($tr);  // 行对应数据
-            var obj = {
-                tr: $tr,
-                data: data,
-                del: function () { // 删除行
-                    var index = $tr.data('index');
-                    var indent = parseInt($tr.data('indent'));
-                    // 删除子级
-                    $tr.nextAll('tr').each(function () {
-                        if (parseInt($(this).data('indent')) <= indent) return false;
-                        $(this).remove();
-                    });
-                    // 更新后面同辈的index
-                    var indexLength = (typeof index === 'number' ? 1 : index.split('-').length);
-                    $tr.nextAll('tr').each(function () {
-                        var $this = $(this);
-                        if (parseInt($this.data('indent')) < indent) return false;
-                        var _index = $this.data('index').toString().split('-');
-                        _index[indexLength - 1] = parseInt(_index[indexLength - 1]) - 1;
-                        $this.data('index', _index.join('-'));
-                    });
-                    // 删除当前行
-                    var $pTr = $tr.prevAll('tr');
-                    that.del(undefined, index);
-                    $tr.remove();
-                    that.renderNumberCol();  // 渲染序号列
-                    // 联动父级多选框
-                    $pTr.each(function () {
-                        var tInd = parseInt($(this).data('indent'));
-                        if (tInd >= indent) return true;
-                        that.checkParentCB($(this));
-                        indent = tInd;
-                    });
-                    that.checkChooseAllCB();  // 联动全选框
-                    if (options.data.length === 0) components.$empty.show();
-                    updateFixedTbHead(components.$view);  // 更新滚动条补丁
-                },
-                update: function (fields) {  // 修改行
-                    data = $.extend(true, data, fields);
-                    var indent = parseInt($tr.data('indent'));
-                    that.renderBodyTr(data, indent, undefined, $tr);  // 更新界面
-                    form.render(null, components.filter);  // 渲染表单元素
-                    that.renderNumberCol();  // 渲染序号列
-                    // 联动父级多选框
-                    $tr.prevAll('tr').each(function () {
-                        var tInd = parseInt($(this).data('indent'));
-                        if (tInd >= indent) return true;
-                        that.checkParentCB($(this));
-                        indent = tInd;
-                    });
-                    that.checkChooseAllCB();  // 联动全选框
-                }
-            };
-            return $.extend(obj, ext);
-        };
-
-        // 绑定折叠展开事件
-        $allBody.off('click.fold').on('click.fold', '.ew-tree-pack', function (e) {
-            layui.stope(e);
-            var $tr = $(this).parentsUntil('tr').last().parent();
-            if ($tr.hasClass('ew-tree-table-loading')) return; // 已是加载中
-            var haveChild = $tr.data('have-child');
-            if (haveChild !== true && haveChild !== 'true') return; // 子节点
-            var open = $tr.hasClass('ew-tree-table-open');
-            var data = that.getDataByTr($tr);
-            if (!open && !data[options.tree.childName]) {
-                that.renderBodyAsync(data, $tr);
-            } else {
-                data[options.tree.openName] = toggleRow($tr);
-            }
-        });
-
-        // 绑定lay-event事件
-        $allBody.off('click.tool').on('click.tool', '*[lay-event]', function (e) {
-            layui.stope(e);
-            var $this = $(this);
-            layui.event.call(this, MOD_NAME, 'tool(' + components.filter + ')', member.call(this, {
-                event: $this.attr('lay-event')
-            }));
-        });
-
-        // 绑定单选框事件
-        form.on('radio(' + components.radioFilter + ')', function (data) {
-            var d = that.getDataByTr($(data.elem).parentsUntil('tr').last().parent());
-            that.removeAllChecked();
-            d.LAY_CHECKED = true;  // 同时更新数据
-            d.LAY_INDETERMINATE = false;
-            layui.event.call(this, MOD_NAME, 'checkbox(' + components.filter + ')',
-                {checked: true, data: d, type: 'one'});
-        });
-
-        // 绑定复选框事件
-        form.on('checkbox(' + components.checkboxFilter + ')', function (data) {
-            var checked = data.elem.checked;
-            var $cb = $(data.elem);
-            var $layCb = $cb.next('.layui-form-checkbox');
-            // 如果是半选状态，点击全选
-            if (!checked && $cb.hasClass('ew-form-indeterminate')) {
-                checked = true;
-                $cb.prop('checked', checked);
-                $layCb.addClass('layui-form-checked');
-                $cb.removeClass('ew-form-indeterminate');
-            }
-            var $tr = $cb.parentsUntil('tr').last().parent();
-            var d = that.getDataByTr($tr);
-            d.LAY_CHECKED = checked;  // 同时更新数据
-            d.LAY_INDETERMINATE = false;
-            // 联动操作
-            if (d[options.tree.childName] && d[options.tree.childName].length > 0) {
-                that.checkSubCB($tr, checked);  // 联动子级
-            }
-            var indent = parseInt($tr.data('indent'));
-            $tr.prevAll('tr').each(function () {
-                var tInd = parseInt($(this).data('indent'));
-                if (tInd < indent) {
-                    that.checkParentCB($(this));  // 联动父级
-                    indent = tInd;
-                }
-            });
-            that.checkChooseAllCB();  // 联动全选框
-            // 回调事件
-            layui.event.call(this, MOD_NAME, 'checkbox(' + components.filter + ')',
-                {checked: checked, data: d, type: 'more'});
-        });
-
-        // 绑定全选复选框事件
-        form.on('checkbox(' + components.chooseAllFilter + ')', function (data) {
-            var checked = data.elem.checked;
-            var $cb = $(data.elem);
-            var $layCb = $cb.next('.layui-form-checkbox');
-            if (!options.data || options.data.length === 0) {  // 如果数据为空
-                $cb.prop('checked', false);
-                $layCb.removeClass('layui-form-checked');
-                $cb.removeClass('ew-form-indeterminate');
-                return;
-            }
-            // 如果是半选状态，点击全选
-            if (!checked && $cb.hasClass('ew-form-indeterminate')) {
-                checked = true;
-                $cb.prop('checked', checked);
-                $layCb.addClass('layui-form-checked');
-                $cb.removeClass('ew-form-indeterminate');
-            }
-            layui.event.call(this, MOD_NAME, 'checkbox(' + components.filter + ')', {checked: checked, type: 'all'});
-            that.checkSubCB(components.$tBody.children('tbody'), checked);  // 联动操作
-        });
-
-        // 绑定行单击事件
-        $allBody.off('click.row').on('click.row', 'tr', function () {
-            layui.event.call(this, MOD_NAME, 'row(' + components.filter + ')', member.call(this, {}));
-        });
-
-        // 绑定行双击事件
-        $allBody.off('dblclick.rowDouble').on('dblclick.rowDouble', 'tr', function () {
-            layui.event.call(this, MOD_NAME, 'rowDouble(' + components.filter + ')', member.call(this, {}));
-        });
-
-        // 绑定单元格点击事件
-        $allBody.off('click.cell').on('click.cell', 'td', function (e) {
-            var $td = $(this);
-            var type = $td.data('type');
-            // 判断是否是复选框、单选框列
-            if (type === 'checkbox' || type === 'radio') return layui.stope(e);
-            var edit = $td.data('edit');
-            var field = $td.data('field');
-            if (edit) {  // 开启了单元格编辑
-                layui.stope(e);
-                if ($allBody.find('.ew-tree-table-edit').length > 0) return;
-                var index = $td.data('index');
-                var indent = $td.find('.ew-tree-table-indent').length;
-                var d = that.getDataByTr($td.parent());
-                if ('text' === edit || 'number' === edit) {  // 文本框
-                    var $input = $('<input type="' + edit + '" class="layui-input ew-tree-table-edit"/>');
-                    $input[0].value = d[field];
-                    $td.append($input);
-                    $input.focus();
-                    $input.blur(function () {
-                        var value = $(this).val();
-                        if (value == d[field]) return $(this).remove();
-                        var rs = layui.event.call(this, MOD_NAME, 'edit(' + components.filter + ')', member.call(this,
-                            {value: value, field: field}));
-                        if (rs === false) {
-                            $(this).addClass('layui-form-danger');
-                            $(this).focus();
-                        } else {
-                            d[field] = value;  // 同步更新数据
-                            var keys = $td.data('key').split('-');
-                            that.renderBodyTd(d, indent, index, $td, options.cols[keys[0]][keys[1]]);  // 更新单元格
-                        }
-                    });
-                } else {
-                    console.error('不支持的单元格编辑类型:' + edit);
-                }
-            } else {  // 回调单元格点击事件
-                var rs = layui.event.call(this, MOD_NAME, 'cell(' + components.filter + ')', member.call(this,
-                    {td: $td, field: field}));
-                if (rs === false) layui.stope(e);
-            }
-        });
-
-        // 绑定单元格双击事件
-        $allBody.off('dblclick.cellDouble').on('dblclick.cellDouble', 'td', function (e) {
-            var $td = $(this);
-            var type = $td.data('type');
-            // 判断是否是复选框、单选框列
-            if (type === 'checkbox' || type === 'radio') return layui.stope(e);
-            var edit = $td.data('edit');
-            var field = $td.data('field');
-            if (edit) return layui.stope(e);  // 开启了单元格编辑
-            // 回调单元格双击事件
-            var rs = layui.event.call(this, MOD_NAME, 'cellDouble(' + components.filter + ')', member.call(this,
-                {td: $td, field: field}));
-            if (rs === false) layui.stope(e);
-        });
-
-        // 绑定头部工具栏事件
-        components.$toolbar.off('click.toolbar').on('click.toolbar', '*[lay-event]', function (e) {
-            layui.stope(e);
-            var $this = $(this);
-            var event = $this.attr('lay-event');
-            if ('LAYTABLE_COLS' === event) that.toggleCol();
-            else if ('LAYTABLE_EXPORT' === event) that.exportData('show');
-            else if ('LAYTABLE_PRINT' === event) that.printTable();
-            else layui.event.call(this, MOD_NAME, 'toolbar(' + components.filter + ')', {event: event, elem: $this});
-        });
-
-        // 同步滚动条
-        components.$tBodyGroup.on('scroll', function () {
-            var $this = $(this);
-            components.$tHeadGroup.scrollLeft($this.scrollLeft());
-        });
-
-        // 导出数据
-        components.$toolbar.off('click.export').on('click.export', '.layui-table-tool-panel>[data-type]', function () {
-            var type = $(this).data('type');
-            if ('csv' === type || 'xls' === type) that.exportData(type);
-        });
-        components.$toolbar.off('click.panel').on('click.panel', '.layui-table-tool-panel', function (e) {
-            layui.stope(e);
-        });
-
-        // 筛选列
-        form.on('checkbox(' + components.colsToggleFilter + ')', function (data) {
-            that.toggleCol(data.elem.checked, undefined, data.value);
-        });
-
-    };
-
-    /** 获取各个组件 */
-    TreeTable.prototype.getComponents = function () {
-        var $view = $(this.options.elem).next('.ew-tree-table');  // 容器
-        var filter = $view.attr('lay-filter');                    // 容器filter
-        var $tHeadGroup = $view.children('.ew-tree-table-head');  // 表头部分容器
-        var $tBodyGroup = $view.children('.ew-tree-table-box');   // 主体部分容器
-        return {
-            $view: $view,
-            filter: filter,
-            $tHeadGroup: $tHeadGroup,
-            $tBodyGroup: $tBodyGroup,
-            $tHead: $tHeadGroup.children('.layui-table'),                // 表头表格
-            $tBody: $tBodyGroup.children('.layui-table'),                // 主体表格
-            $table: $view.find('.layui-table'),                          // 所有表格
-            $toolbar: $view.children('.ew-tree-table-tool'),             // 头部工具栏
-            $empty: $tBodyGroup.children('.ew-tree-table-empty'),        // 空视图
-            $loading: $tBodyGroup.children('.ew-tree-table-loading'),    // 加载视图
-            checkboxFilter: 'ew_tb_checkbox_' + filter,                  // 复选框filter
-            radioFilter: 'ew_tb_radio_' + filter,                        // 单选框filter
-            chooseAllFilter: 'ew_tb_choose_all_' + filter,               // 全选按钮filter
-            colsToggleFilter: 'ew_tb_toggle_cols' + filter               // 筛选列的filter
-        };
-    };
-
-    /**
-     * 遍历表头
-     * @param callback
-     * @param obj
-     */
-    TreeTable.prototype.eachCols = function (callback, obj) {
-        if (!obj) obj = this.options.colArrays;
-        for (var i = 0; i < obj.length; i++) {
-            var item = obj[i];
-            callback && callback(i, item);
-            if (item.CHILD_COLS) this.eachCols(callback, item.CHILD_COLS);
-        }
-    };
-
-    /**
-     * 遍历数据
-     * @param callback
-     * @param data
-     */
-    TreeTable.prototype.eachData = function (callback, data) {
-        if (!data) data = this.options.data;
-        for (var i = 0; i < data.length; i++) {
-            var item = data[i];
-            callback && callback(i, item);
-            if (item[this.options.tree.childName]) this.eachData(callback, item[this.options.tree.childName]);
-        }
-    };
-
-    /**
-     * 异步加载渲染
-     * @param d 父级数据
-     * @param $tr 父级dom
-     */
-    TreeTable.prototype.renderBodyAsync = function (d, $tr) {
-        var that = this;
-        var options = this.options;
-        var components = this.getComponents();
-        // 显示loading
-        if ($tr) {
-            $tr.addClass('ew-tree-table-loading');
-            $tr.find('.ew-tree-pack').children('.ew-tree-table-arrow').addClass('layui-anim layui-anim-rotate layui-anim-loop');
-        } else {
-            components.$empty.hide();
-            if (options.data && options.data.length > 0) components.$loading.addClass('ew-loading-float');
-            components.$loading.show();
-        }
-        // 请求数据
-        options.reqData(d, function (data) {
-            if (typeof data !== 'string' && data && data.length > 0 && options.tree.isPidData) {
-                data = tt.pidToChildren(data, options.tree.idName, options.tree.pidName, options.tree.childName);
-            }
-            that.renderBodyData(data, d, $tr);  // 渲染内容
-        });
-    };
-
-    /**
-     * 根据数据渲染body
-     * @param data  数据集合
-     * @param d 父级数据
-     * @param $tr 父级dom
-     */
-    TreeTable.prototype.renderBodyData = function (data, d, $tr) {
-        var msg;
-        if (typeof data === 'string') {
-            msg = data;
-            data = [];
-        }
-        var that = this;
-        var options = this.options;
-        var components = this.getComponents();
-        // 更新到数据
-        if (d === undefined) options.data = data;
-        else d[options.tree.childName] = data;
-        var indent;
-        if ($tr) {
-            indent = parseInt($tr.data('indent')) + 1;
-            d[options.tree.openName] = true;
-        }
-        var htmlStr = this.renderBody(data, indent, d);
-        if ($tr) {
-            // 移除旧dom
-            $tr.nextAll('tr').each(function () {
-                if (parseInt($(this).data('indent')) <= (indent - 1)) return false;
-                $(this).remove();
-            });
-            // 渲染新dom
-            $tr.after(htmlStr).addClass('ew-tree-table-open');
-        } else {
-            components.$tBody.children('tbody').html(htmlStr);
-        }
-        form.render(null, components.filter);  // 渲染表单元素
-        this.renderNumberCol();  // 渲染序号列
-        if ($tr) {
-            // 更新父级复选框状态
-            this.checkParentCB($tr);
-            $tr.prevAll('tr').each(function () {
-                var tInd = parseInt($(this).data('indent'));
-                if (tInd < (indent - 1)) {
-                    that.checkParentCB($(this));
-                    indent = tInd + 1;
-                }
-            });
-            // 移除loading
-            $tr.removeClass('ew-tree-table-loading');
-            var $arrow = $tr.find('.ew-tree-pack').children('.ew-tree-table-arrow');
-            $arrow.removeClass('layui-anim layui-anim-rotate layui-anim-loop');
-            if (msg) {  // 加载失败
-                $tr.removeClass('ew-tree-table-open');
-            } else if (data && data.length === 0) {  // 无子集
-                d[options.tree.haveChildName] = !!options.tree.haveChildReverse;
-                $tr.data('have-child', false);
-                $arrow.addClass('ew-tree-table-arrow-hide');
-                $arrow.next('.ew-tree-icon').after(options.tree.getIcon(d)).remove();
-            }
-        } else {
-            // 移除loading
-            components.$loading.hide();
-            components.$loading.removeClass('ew-loading-float');
-            // 显示空视图
-            if (data && data.length > 0) {
-                components.$empty.hide();
-            } else {
-                components.$empty.show();
-                if (msg) components.$empty.text(msg);
-                else components.$empty.html(options.text.none);
-            }
-        }
-        this.checkChooseAllCB();  // 联动全选框
-        updateFixedTbHead(components.$view);  // 滚动条补丁
-        options.done && options.done(data);
-    };
-
-    /**
-     * 递归渲染表格主体部分
-     * @param data 数据列表
-     * @param indent 缩进大小
-     * @param parent 父级
-     * @param h 父级是否隐藏
-     * @returns {string}
-     */
-    TreeTable.prototype.renderBody = function (data, indent, parent, h) {
-        var options = this.options;
-        if (!indent) indent = 0;
-        var html = '';
-        if (!data || data.length === 0) return html;
-        var hide = parent ? !parent[options.tree.openName] : undefined;
-        if (h) hide = h;//当所有父级存在隐藏时，隐藏所有子集
-        for (var i = 0; i < data.length; i++) {
-            var d = data[i];
-            d.LAY_INDEX = (parent ? parent.LAY_INDEX + '-' : '') + i;
-            html += this.renderBodyTr(d, indent, hide);
-            // 递归渲染子集
-            html += this.renderBody(d[options.tree.childName], indent + 1, d, h);
-        }
-        return html;
-    };
-
-    /**
-     * 渲染每一行数据
-     * @param d 行数据
-     * @param indent 缩进大小
-     * @param hide 是否隐藏
-     * @param $tr
-     * @returns {string}
-     */
-    TreeTable.prototype.renderBodyTr = function (d, indent, hide, $tr) {
-        var that = this;
-        var options = this.options;
-        if (!indent) indent = 0;
-        var haveChild = d[options.tree.haveChildName];
-        if (options.tree.haveChildReverse) haveChild = !haveChild;
-        if (haveChild === undefined) haveChild = d[options.tree.childName] && d[options.tree.childName].length > 0;
-        if ($tr) {
-            $tr.data('have-child', haveChild ? 'true' : 'false');
-            $tr.data('indent', indent);
-            $tr.removeClass('ew-tree-table-loading');
-        }
-        var html = '<tr';
-        var classNames = '';
-        if (haveChild && d[options.tree.openName]) classNames += 'ew-tree-table-open';
-        if (hide) classNames += 'ew-tree-tb-hide';
-        html += (' class="' + classNames + '"');
-        if (haveChild) html += (' data-have-child="' + haveChild + '"');
-        html += (' data-index="' + d.LAY_INDEX + '"');
-        html += (' data-indent="' + indent + '">');
-        var index = 0;
-        this.eachCols(function (i, col) {
-            if (col.colGroup) return;
-            html += that.renderBodyTd(d, indent, index, $tr ? $tr.children('td').eq(index) : undefined, col);
-            index++;
-        });
-        html += '</tr>';
-        return html;
-    };
-
-    /**
-     * 渲染每一个单元格数据
-     * @param d 行数据
-     * @param indent 缩进大小
-     * @param index 第几列
-     * @param $td
-     * @param col
-     * @returns {string}
-     */
-    TreeTable.prototype.renderBodyTd = function (d, indent, index, $td, col) {
-        if (!col||col.colGroup) return '';
-        var options = this.options;
-        var components = this.getComponents();
-        if (!indent) indent = 0;
-        // 内容填充
-        var content = '', cell = '', icon = '';
-        if (col.type === 'numbers') {  // 序号列
-            content = '<span class="ew-tree-table-numbers"></span>';
-        } else if (col.type === 'checkbox') {  // 复选框列
-            content = [
-                '<input type="checkbox"', d.LAY_CHECKED ? ' checked="checked"' : '',
-                ' lay-filter="', components.checkboxFilter, '"',
-                ' lay-skin="primary" class="ew-tree-table-checkbox',
-                d.LAY_INDETERMINATE ? ' ew-form-indeterminate' : '', '" />'
-            ].join('');
-        } else if (col.type === 'radio') {  // 单选框列
-            content = [
-                '<input type="radio"', d.LAY_CHECKED ? ' checked="checked"' : '',
-                ' lay-filter="', components.radioFilter, '"',
-                ' name="', components.radioFilter, '"',
-                ' class="ew-tree-table-radio" />'
-            ].join('');
-        } else if (col.templet) {  // 自定义模板
-            if (typeof col.templet === 'function') {
-                content = col.templet(d);
-            } else if (typeof col.templet === 'string') {
-                laytpl($(col.templet).html()).render(d, function (html) {
-                    content = html;
-                });
-            }
-        } else if (col.toolbar) {  // 操作列
-            if (typeof col.toolbar === 'function') {
-                content = col.toolbar(d);
-            } else if (typeof col.toolbar === 'string') {
-                laytpl($(col.toolbar).html()).render(d, function (html) {
-                    content = html;
-                });
-            }
-        } else if (col.field && d[col.field] !== undefined && d[col.field] !== null) {  // 普通字段
-            content = util.escape(d[col.field] === 0 ? '0' : d[col.field]);
-        }
-        // 图标列处理
-        if (index === options.tree.iconIndex) {
-            // 缩进
-            for (var i = 0; i < indent; i++) icon += '<span class="ew-tree-table-indent"></span>';
-            icon += '<span class="ew-tree-pack">';
-            // 加箭头
-            var haveChild = d[options.tree.haveChildName];
-            if (options.tree.haveChildReverse) haveChild = !haveChild;
-            if (haveChild === undefined) haveChild = d[options.tree.childName] && d[options.tree.childName].length > 0;
-            icon += ('<i class="ew-tree-table-arrow layui-icon' + (haveChild ? '' : ' ew-tree-table-arrow-hide'));
-            icon += (' ' + (options.tree.arrowType || '') + '"></i>');
-            // 加图标
-            icon += options.tree.getIcon(d);
-            content = '<span>' + content + '</span>';
-            if (options.tree.onlyIconControl) content = icon + '</span>' + content;
-            else content = icon + content + '</span>';
-        }
-        cell = [
-            '<div class="ew-tree-table-cell', col.singleLine === undefined || col.singleLine ? ' single-line' : '', '"',
-            col.align ? ' align="' + col.align + '"' : '',
-            '>',
-            '   <div class="ew-tree-table-cell-content">', content, '</div>',
-            '   <i class="layui-icon layui-icon-close ew-tree-tips-c"></i>',
-            '   <div class="layui-table-grid-down" style="display: none;"><i class="layui-icon layui-icon-down"></i></div>',
-            '</div>'
-        ].join('');
-
-        if ($td) $td.html(cell);
-
-        var html = '<td';
-        if (col.field) html += (' data-field="' + col.field + '"');
-        if (col.edit) html += (' data-edit="' + col.edit + '"');
-        if (col.type) html += (' data-type="' + col.type + '"');
-        if (col.key) html += (' data-key="' + col.key + '"');
-        if (col.style) html += (' style="' + col.style + '"');
-        if (col['class']) html += (' class="' + col['class'] + (col.hide ? ' layui-hide' : '') + '"');
-        else if (col.hide) html += (' class="layui-hide"');
-        html += ('>' + cell + '</td>');
-        return html;
-    };
-
-    /**
-     * 渲染表头
-     * @returns {string}
-     */
-    TreeTable.prototype.renderBodyTh = function () {
-        var options = this.options;
-        var components = this.getComponents();
-        var html = [];
-        $.each(options.cols, function (i1, item1) {
-            html.push('<tr>');
-            $.each(item1, function (i2, item2) {
-                html.push('<th');
-                if (item2.colspan) html.push(' colspan="' + item2.colspan + '"');
-                if (item2.rowspan) html.push(' rowspan="' + item2.rowspan + '"');
-                if (item2.type) html.push(' data-type="' + item2.type + '"');
-                if (item2.key) html.push(' data-key="' + item2.key + '"');
-                if (item2.parentKey) html.push(' data-parent="' + item2.parentKey + '"');
-                if (item2.hide) html.push(' class="layui-hide"');
-                html.push('>');
-                html.push('<div class="ew-tree-table-cell' + (item2.singleLine === undefined || item2.singleLine ? ' single-line' : '') + '"');
-                if (item2.thAlign || item2.align) html.push(' align="' + (item2.thAlign || item2.align) + '"');
-                html.push('>');
-                html.push('<div class="ew-tree-table-cell-content">');
-                // 标题
-                var ca = '<input type="checkbox" lay-filter="' + components.chooseAllFilter + '" lay-skin="primary" class="ew-tree-table-checkbox"/>';
-                if (item2.type === 'checkbox') html.push(ca);
-                else html.push(item2.title || '');
-                html.push('</div><i class="layui-icon layui-icon-close ew-tree-tips-c"></i>');
-                html.push('<div class="layui-table-grid-down" style="display: none;"><i class="layui-icon layui-icon-down"></i></div></div>');
-                // 列宽拖拽
-                if (!item2.colGroup && !item2.unresize) html.push('<span class="ew-tb-resize"></span>');
-                html.push('</th>');
-            });
-            html.push('</tr>');
-        });
-        return html.join('');
-    };
-
-    /** 重置表格尺寸 */
-    TreeTable.prototype.resize = function (returnColgroup) {
-        // 计算表格宽度、最小宽度、百分比宽度
-        var options = this.options;
-        var components = this.getComponents();
-        var minWidth = 1, width = 1, needSetWidth = true, mwPercent = 0;
-        this.eachCols(function (i, item) {
-            if (item.colGroup || item.hide) return;
-            if (item.width) {
-                width += (item.width + 1);
-                if (item.minWidth) {
-                    if (item.width < item.minWidth) item.width = item.minWidth;
-                } else if (item.width < options.cellMinWidth) item.width = options.cellMinWidth;
-            } else needSetWidth = false;
-            if (item.width) minWidth += (item.width + 1);
-            else if (item.minWidth) {
-                minWidth += (item.minWidth + 1);
-                mwPercent += item.minWidth;
-            } else {
-                minWidth += (options.cellMinWidth + 1);
-                mwPercent += options.cellMinWidth;
-            }
-        });
-        if (minWidth) {
-            components.$tHead.css('min-width', minWidth);
-            components.$tBody.css('min-width', minWidth);
-        } else {
-            components.$tHead.css('min-width', 'auto');
-            components.$tBody.css('min-width', 'auto');
-        }
-        if (needSetWidth) {
-            components.$tHead.css('width', width);
-            components.$tBody.css('width', width);
-        } else {
-            components.$tHead.css('width', '100%');
-            components.$tBody.css('width', '100%');
-        }
-
-        // 生成colgroup
-        var colgroupHtml = [];
-        this.eachCols(function (i, item) {
-            if (item.colGroup || item.hide) return;
-            colgroupHtml.push('<col');
-            if (item.width) colgroupHtml.push(' width="' + item.width + '"');
-            else if (item.minWidth) colgroupHtml.push(' width="' + (item.minWidth / mwPercent * 100).toFixed(2) + '%"');
-            else colgroupHtml.push(' width="' + (options.cellMinWidth / mwPercent * 100).toFixed(2) + '%"');
-            if (item.type) colgroupHtml.push(' data-type="' + item.type + '"');
-            if (item.key) colgroupHtml.push(' data-key="' + item.key + '"');
-            colgroupHtml.push('/>');
-        });
-        colgroupHtml = colgroupHtml.join('');
-        if (returnColgroup) return '<colgroup>' + colgroupHtml + '</colgroup>';
-        components.$table.children('colgroup').html(colgroupHtml);
-    };
-
-    /** 获取行对应数据 */
-    TreeTable.prototype.getDataByTr = function ($tr) {
-        var data, index;
-        if (typeof $tr !== 'string' && typeof $tr !== 'number') {
-            if ($tr) index = $tr.data('index');
-        } else index = $tr;
-        if (index === undefined) return;
-        if (typeof index === 'number') index = [index];
-        else index = index.split('-');
-        for (var i = 0; i < index.length; i++) {
-            if (data) data = data[this.options.tree.childName][index[i]];
-            else data = this.options.data[index[i]];
-        }
-        return data;
-    };
-
-    /**
-     * 联动子级复选框状态
-     * @param $tr 当前tr的dom
-     * @param checked
-     */
-    TreeTable.prototype.checkSubCB = function ($tr, checked) {
-        var that = this;
-        var components = this.getComponents();
-        var indent = -1, $trList;
-        if ($tr.is('tbody')) {
-            $trList = $tr.children('tr');
-        } else {
-            indent = parseInt($tr.data('indent'));
-            $trList = $tr.nextAll('tr');
-        }
-        $trList.each(function () {
-            if (parseInt($(this).data('indent')) <= indent) return false;
-            var $cb = $(this).children('td').find('input[lay-filter="' + components.checkboxFilter + '"]');
-            $cb.prop('checked', checked);
-            $cb.removeClass('ew-form-indeterminate');
-            if (checked) $cb.next('.layui-form-checkbox').addClass('layui-form-checked');
-            else $cb.next('.layui-form-checkbox').removeClass('layui-form-checked');
-            var d = that.getDataByTr($(this));
-            d.LAY_CHECKED = checked;  // 同步更新数据
-            d.LAY_INDETERMINATE = false;
-        });
-    };
-
-    /**
-     * 联动父级复选框状态
-     * @param $tr 父级的dom
-     */
-    TreeTable.prototype.checkParentCB = function ($tr) {
-        var options = this.options;
-        var components = this.getComponents();
-        var d = this.getDataByTr($tr);
-        var ckNum = 0, unCkNum = 0;
-        if (d[options.tree.childName]) {
-            function checkNum(data) {
-                for (var i = 0; i < data.length; i++) {
-                    if (data[i].LAY_CHECKED) ckNum++;
-                    else unCkNum++;
-                    if (data[i][options.tree.childName]) checkNum(data[i][options.tree.childName]);
-                }
-            }
-
-            checkNum(d[options.tree.childName]);
-        }
-        var $cb = $tr.children('td').find('input[lay-filter="' + components.checkboxFilter + '"]');
-        if (ckNum > 0 && unCkNum === 0) {  // 全选
-            $cb.prop('checked', true);
-            $cb.removeClass('ew-form-indeterminate');
-            $cb.next('.layui-form-checkbox').addClass('layui-form-checked');
-            d.LAY_CHECKED = true;  // 同步更新数据
-            d.LAY_INDETERMINATE = false;
-        } else if (ckNum === 0 && unCkNum > 0) {  // 全不选
-            $cb.prop('checked', false);
-            $cb.removeClass('ew-form-indeterminate');
-            $cb.next('.layui-form-checkbox').removeClass('layui-form-checked');
-            d.LAY_CHECKED = false;  // 同步更新数据
-            d.LAY_INDETERMINATE = false;
-        } else if (ckNum > 0 && unCkNum > 0) {  // 半选
-            $cb.prop('checked', true);
-            $cb.data('indeterminate', 'true');
-            $cb.addClass('ew-form-indeterminate');
-            $cb.next('.layui-form-checkbox').addClass('layui-form-checked');
-            d.LAY_CHECKED = true;  // 同步更新数据
-            d.LAY_INDETERMINATE = true;
-        }
-    };
-
-    /** 联动全选复选框 */
-    TreeTable.prototype.checkChooseAllCB = function () {
-        var options = this.options;
-        var components = this.getComponents();
-        var ckNum = 0, unCkNum = 0;
-
-        function checkNum(data) {
-            for (var i = 0; i < data.length; i++) {
-                if (data[i].LAY_CHECKED) ckNum++;
-                else unCkNum++;
-                if (data[i][options.tree.childName]) checkNum(data[i][options.tree.childName]);
-            }
-        }
-
-        checkNum(options.data);
-
-        var $cb = components.$view.find('input[lay-filter="' + components.chooseAllFilter + '"]');
-        if (ckNum > 0 && unCkNum === 0) {  // 全选
-            $cb.prop('checked', true);
-            $cb.removeClass('ew-form-indeterminate');
-            $cb.next('.layui-form-checkbox').addClass('layui-form-checked');
-        } else if ((ckNum === 0 && unCkNum > 0) || (ckNum === 0 && unCkNum === 0)) {  // 全不选
-            $cb.prop('checked', false);
-            $cb.removeClass('ew-form-indeterminate');
-            $cb.next('.layui-form-checkbox').removeClass('layui-form-checked');
-        } else if (ckNum > 0 && unCkNum > 0) {  // 半选
-            $cb.prop('checked', true);
-            $cb.addClass('ew-form-indeterminate');
-            $cb.next('.layui-form-checkbox').addClass('layui-form-checked');
-        }
-    };
-
-    /** 填充序号列 */
-    TreeTable.prototype.renderNumberCol = function () {
-        this.getComponents().$tBody.children('tbody').children('tr').each(function (i) {
-            $(this).children('td').find('.ew-tree-table-numbers').text(i + 1);
-        });
-    };
-
-    /** 根据id获取tr的index */
-    TreeTable.prototype.getIndexById = function (id) {
-        var options = this.options;
-
-        function each(data, pi) {
-            for (var i = 0; i < data.length; i++) {
-                if (data[i][options.tree.idName] === id) return pi !== undefined ? pi + '-' + i : i;
-                if (data[i][options.tree.childName]) {
-                    var res = each(data[i][options.tree.childName], pi !== undefined ? pi + '-' + i : i);
-                    //值不为undefined才return
-                    if (res) return res;
-                }
-            }
-        }
-
-        return each(options.data);
-    };
-
-    /** 展开指定行 */
-    TreeTable.prototype.expand = function (id, cascade) {
-        var components = this.getComponents();
-        var $tr = components.$table.children('tbody').children('tr[data-index="' + this.getIndexById(id) + '"]');
-        if (!$tr.hasClass('ew-tree-table-open')) $tr.children('td').find('.ew-tree-pack').trigger('click');
-        if (cascade === false) return;
-        // 联动父级
-        var indent = parseInt($tr.data('indent'));
-        $tr.prevAll('tr').each(function () {
-            var tInd = parseInt($(this).data('indent'));
-            if (tInd < indent) {
-                if (!$(this).hasClass('ew-tree-table-open')) {
-                    $(this).children('td').find('.ew-tree-pack').trigger('click');
-                }
-                indent = tInd;
-            }
-        });
-    };
-
-    /** 折叠指定行 */
-    TreeTable.prototype.fold = function (id) {
-        var components = this.getComponents();
-        var $tr = components.$table.children('tbody').children('tr[data-index="' + this.getIndexById(id) + '"]');
-        if ($tr.hasClass('ew-tree-table-open')) $tr.children('td').find('.ew-tree-pack').trigger('click');
-    };
-
-    /** 全部展开 */
-    TreeTable.prototype.expandAll = function () {
-        this.getComponents().$table.children('tbody').children('tr').each(function () {
-            if (!$(this).hasClass('ew-tree-table-open')) $(this).children('td').find('.ew-tree-pack').trigger('click');
-        });
-    };
-
-    /** 全部折叠 */
-    TreeTable.prototype.foldAll = function () {
-        this.getComponents().$table.children('tbody').children('tr').each(function () {
-            if ($(this).hasClass('ew-tree-table-open')) $(this).children('td').find('.ew-tree-pack').trigger('click');
-        });
-    };
-
-    /** 获取当前数据 */
-    TreeTable.prototype.getData = function () {
-        return this.options.data;
-    };
-
-    /** 重载表格 */
-    TreeTable.prototype.reload = function (opt) {
-        this.initOptions(this.options ? $.extend(true, this.options, opt) : opt);
-        this.init();  // 初始化表格
-        this.bindEvents();  // 绑定事件
-    };
-
-    /** 获取当前选中行 */
-    TreeTable.prototype.checkStatus = function (needIndeterminate) {
-        if (needIndeterminate === undefined) needIndeterminate = true;
-        var list = [];
-        this.eachData(function (i, item) {
-            if ((needIndeterminate || !item.LAY_INDETERMINATE) && item.LAY_CHECKED)
-                list.push($.extend({isIndeterminate: item.LAY_INDETERMINATE}, item));
-        });
-        return list;
-    };
-
-    /** 设置复/单选框选中 */
-    TreeTable.prototype.setChecked = function (ids) {
-        var that = this;
-        var components = this.getComponents();
-        var $radio = components.$table.find('input[lay-filter="' + components.radioFilter + '"]');
-        if ($radio.length > 0) {  // 开启了单选框
-            $radio.each(function () {
-                var d = that.getDataByTr($(this).parentsUntil('tr').parent());
-                if (d && ids[ids.length - 1] == d[that.options.tree.idName]) {
-                    $(this).next('.layui-form-radio').trigger('click');
-                    return false;
-                }
-            });
-        } else {  // 开启了复选框
-            components.$table.find('input[lay-filter="' + components.checkboxFilter + '"]').each(function () {
-                var $cb = $(this);
-                var $layCb = $cb.next('.layui-form-checkbox');
-                var checked = $cb.prop('checked');
-                var indeterminate = $cb.hasClass('ew-form-indeterminate');
-                var d = that.getDataByTr($cb.parentsUntil('tr').parent());
-                for (var i = 0; i < ids.length; i++) {
-                    if (d && ids[i] == d[that.options.tree.idName]) {
-                        if (d[that.options.tree.childName] && d[that.options.tree.childName].length > 0) continue;
-                        if (!checked || indeterminate) $layCb.trigger('click');
-                    }
-                }
-            });
-        }
-    };
-
-    /** 移除全部选中 */
-    TreeTable.prototype.removeAllChecked = function () {
-        this.checkSubCB(this.getComponents().$table.children('tbody'), false);
-    };
-
-    /** 导出 */
-    TreeTable.prototype.exportData = function (type) {
-        var components = this.getComponents();
-        if ('show' === type) {
-            components.$toolbar.find('.layui-table-tool-panel').remove();
-            components.$toolbar.find('[lay-event="LAYTABLE_EXPORT"]').append([
-                '<ul class="layui-table-tool-panel">',
-                '   <li data-type="csv">导出到 Csv 文件</li>',
-                '   <li data-type="xls">导出到 Excel 文件</li>',
-                '</ul>'
-            ].join(''));
-        } else {
-            if (device.ie) return layer.msg('不支持ie导出');
-            if (!type) type = 'xls';
-            var head = [], body = [];
-            this.eachCols(function (i, item) {
-                if (item.type !== 'normal' || item.hide) return;
-                head.push(item.title || '');
-            });
-            components.$tBody.children('tbody').children('tr').each(function () {
-                var items = [];
-                $(this).children('td').each(function () {
-                    var $this = $(this);
-                    if ($this.data('type') !== 'normal' || $this.hasClass('layui-hide')) return true;
-                    items.push($this.text().trim().replace(/,/g, '，'));
-                });
-                body.push(items.join(','));
-            });
-            // 创建下载文件的a标签
-            var alink = document.createElement('a');
-            var content = encodeURIComponent(head.join(',') + '\r\n' + body.join('\r\n'));
-            var contentType = ({csv: 'text/csv', xls: 'application/vnd.ms-excel'})[type];
-            alink.href = 'data:' + contentType + ';charset=utf-8,\ufeff' + content;
-            alink.download = (this.options.title || 'table') + '.' + type;
-            document.body.appendChild(alink);
-            alink.click();
-            document.body.removeChild(alink);
-        }
-    };
-
-    /** 打印 */
-    TreeTable.prototype.printTable = function () {
-        var components = this.getComponents();
-        var head = components.$tHead.children('thead').html();
-        if (!head) head = components.$tBody.children('thead').html();
-        var body = components.$tBody.children('tbody').html();
-        var colgroup = components.$tBody.children('colgroup').html();
-        var $html = $([
-            '<table class="ew-tree-table-print">',
-            '   <colgroup>', colgroup, '</colgroup>',
-            '   <thead>', head, '</thead>',
-            '   <tbody>', body, '</tbody>',
-            '</table>'
-        ].join(''));
-
-        // 隐藏特殊列
-        $html.find('col[data-type="checkbox"],col[data-type="radio"],col[data-type="tool"]').remove();
-        $html.find('td[data-type="checkbox"],td[data-type="radio"],td[data-type="tool"],.layui-hide').remove();
-
-        function hideCol($temp) {
-            var parentKey = $temp.data('parent'), pCol;
-            if (!parentKey) return;
-            var $parent = $html.children('thead').children('tr').children('[data-key="' + parentKey + '"]');
-            var colspan = parseInt($parent.attr('colspan')) - 1;
-            $parent.attr('colspan', colspan);
-            if (colspan === 0) $parent.remove();
-            hideCol($parent);
-        }
-
-        $html.find('th[data-type="checkbox"],th[data-type="radio"],th[data-type="tool"]').each(function () {
-            hideCol($(this));
-        }).remove();
-
-        // 打印内容样式
-        var style = [
-            '<style>',
-            '   /* 打印表格样式 */',
-            '   .ew-tree-table-print {',
-            '      border: none;',
-            '      border-collapse: collapse;',
-            '      width: 100%;',
-            '      table-layout: fixed;',
-            '   }',
-            '   .ew-tree-table-print td, .ew-tree-table-print th {',
-            '      color: #555;',
-            '      font-size: 14px;',
-            '      padding: 9px 15px;',
-            '      word-break: break-all;',
-            '      border: 1px solid #888;',
-            '      text-align: left;',
-            '   }',
-            '   .ew-tree-table-print .ew-tree-table-cell {',
-            '      min-height: 20px;',
-            '   }',
-            '   /* 序号列样式 */',
-            '   .ew-tree-table-print td[data-type="numbers"], .ew-tree-table-print th[data-type="numbers"] {',
-            '      padding-left: 0;',
-            '      padding-right: 0;',
-            '   }',
-            '   /* 单/复选框列样式 */',
-            '   .ew-tree-table-print td[data-type="tool"], .ew-tree-table-print th[data-type="tool"], ',
-            '   .ew-tree-table-print td[data-type="checkbox"], .ew-tree-table-print th[data-type="checkbox"], ',
-            '   .ew-tree-table-print td[data-type="radio"], .ew-tree-table-print th[data-type="radio"] {',
-            '      border: none;',
-            '   }',
-            '   .ew-tree-table-print td.layui-hide + td, .ew-tree-table-print th.layui-hide + th, ',
-            '   .ew-tree-table-print td[data-type="tool"] + td, .ew-tree-table-print th[data-type="tool"] + th, ',
-            '   .ew-tree-table-print td[data-type="checkbox"] + td, .ew-tree-table-print th[data-type="checkbox"] + th, ',
-            '   .ew-tree-table-print td[data-type="radio"] + td, .ew-tree-table-print th[data-type="radio"] + th {',
-            '      border-left: none;',
-            '   }',
-            '  /* 不显示的元素 */',
-            '   .layui-hide, ',
-            '   .ew-tree-table-print td[data-type="tool"] *, .ew-tree-table-print th[data-type="tool"] *, ',
-            '   .ew-tree-table-print td[data-type="checkbox"] *, .ew-tree-table-print th[data-type="checkbox"] *, ',
-            '   .ew-tree-table-print td[data-type="radio"] *, .ew-tree-table-print th[data-type="radio"] *, ',
-            '   .layui-table-grid-down, .ew-tree-tips-c, .ew-tree-icon, .ew-tree-table-arrow.ew-tree-table-arrow-hide {',
-            '      display: none;',
-            '   }',
-            '   /* tree缩进 */',
-            '   .ew-tree-table-indent {',
-            '      padding-left: 13px;',
-            '   }',
-            '   /* 箭头 */',
-            '   .ew-tree-table-arrow {',
-            '      position: relative;',
-            '      padding-left: 13px;',
-            '   }',
-            '   .ew-tree-table-arrow:before {',
-            '      content: "";',
-            '      border: 5px solid transparent;',
-            '      border-top-color: #666;',
-            '      position: absolute;',
-            '      left: 0;',
-            '      top: 6px;',
-            '   }',
-            '</style>'
-        ].join('');
-        var pWindow = window.open('', '_blank');
-        pWindow.focus();
-        var pDocument = pWindow.document;
-        pDocument.open();
-        pDocument.write($html[0].outerHTML + style);
-        pDocument.close();
-        pWindow.print();
-        pWindow.close();
-    };
-
-    /** 筛选列 */
-    TreeTable.prototype.toggleCol = function (show, field, key) {
-        var components = this.getComponents();
-        if (show === undefined) {
-            components.$toolbar.find('.layui-table-tool-panel').remove();
-            var cols = ['<ul class="layui-table-tool-panel">'];
-            this.eachCols(function (i, item) {
-                if (item.type !== 'normal') return;
-                cols.push('<li><input type="checkbox" lay-skin="primary"');
-                cols.push(' lay-filter="' + components.colsToggleFilter + '"');
-                cols.push(' value="' + item.key + '" title="' + util.escape(item.title || '') + '"');
-                cols.push((item.hide ? '' : ' checked') + '></li>');
-            });
-            components.$toolbar.find('[lay-event="LAYTABLE_COLS"]').append(cols.join('') + '</ul>');
-            form.render('checkbox', components.filter);
-        } else {
-            if (key) {
-                var $td = components.$table.children('tbody').children('tr').children('[data-key="' + key + '"]');
-                var $th = components.$table.children('thead').children('tr').children('[data-key="' + key + '"]');
-                if (show) {
-                    $td.removeClass('layui-hide');
-                    $th.removeClass('layui-hide');
-                } else {
-                    $td.addClass('layui-hide');
-                    $th.addClass('layui-hide');
-                }
-                // 同步更新数据
-                var ks = key.split('-');
-                var col = this.options.cols[ks[0]][ks[1]];
-                col.hide = !show;
-
-                // 更新colspan数据
-                function changeParent($temp) {
-                    var parentKey = $temp.data('parent'), pCol;
-                    if (!parentKey) return;
-                    var $parent = components.$table.children('thead').children('tr').children('[data-key="' + parentKey + '"]');
-                    var colspan = $parent.attr('colspan');
-                    show ? colspan++ : colspan--;
-                    $parent.attr('colspan', colspan);
-                    if (colspan === 0) $parent.addClass('layui-hide');
-                    else $parent.removeClass('layui-hide');
-                    changeParent($parent);
-                }
-
-                changeParent($th);
-
-                // 同步eachCols数据
-                this.eachCols(function (i, item) {
-                    if (item.key === key) item.hide = col.hide;
-                });
-                this.resize();  // 更新表格尺寸
-            }
-        }
-    };
-
-    /**
-     * 搜索数据
-     * @param ids 关键字或数据id集合
-     */
-    TreeTable.prototype.filterData = function (ids) {
-        var components = this.getComponents();
-        components.$loading.show();
-        if (this.options.data.length > 0) components.$loading.addClass('ew-loading-float');
-        var $trList = components.$table.children('tbody').children('tr');
-        var indexList = [];
-        if (typeof ids === 'string') {  // 关键字
-            $trList.each(function () {
-                var index = $(this).data('index');
-                $(this).children('td').each(function () {
-                    if ($(this).text().indexOf(ids) !== -1) {
-                        indexList.push(index);
-                        return false;
-                    }
-                });
-            });
-        } else {
-            for (var i = 0; i < ids.length; i++) {
-                indexList.push(this.getIndexById(ids[i]));
-            }
-        }
-        $trList.addClass('ew-tree-table-filter-hide');
-        for (var j = 0; j < indexList.length; j++) {
-            var $tr = $trList.filter('[data-index="' + indexList[j] + '"]');
-            $tr.removeClass('ew-tree-table-filter-hide');
-            var indent = parseInt($tr.data('indent'));
-            // 联动子级
-            $tr.nextAll('tr').each(function () {
-                if (parseInt($(this).data('indent')) <= indent) return false;
-                $(this).removeClass('ew-tree-table-filter-hide');
-            });
-            if ($tr.hasClass('ew-tree-table-open')) toggleRow($tr);
-            // 联动父级
-            $tr.prevAll('tr').each(function () {
-                var tInd = parseInt($(this).data('indent'));
-                if (tInd < indent) {
-                    $(this).removeClass('ew-tree-table-filter-hide');
-                    if (!$(this).hasClass('ew-tree-table-open')) toggleRow($(this));
-                    indent = tInd;
-                }
-            });
-        }
-        // 最后再检查一遍
-        /*$trList.not('.ew-tree-table-filter-hide').not('.ew-tree-tb-hide').each(function () {
-            var index = $(this).data('index'), hide = true;
-            for (var k = 0; k < indexList.length; k++) {
-                if (indexList[k] === index) hide = false;
-            }
-            if (hide) $(this).addClass('ew-tree-table-filter-hide');
-        });*/
-        components.$loading.hide();
-        components.$loading.removeClass('ew-loading-float');
-        if (indexList.length === 0) components.$empty.show();
-        updateFixedTbHead(components.$view);  // 更新滚动条补丁
-    };
-
-    /** 重置搜索 */
-    TreeTable.prototype.clearFilter = function () {
-        var components = this.getComponents();
-        components.$table.children('tbody').children('tr').removeClass('ew-tree-table-filter-hide');
-        if (this.options.data.length > 0) components.$empty.hide();
-        updateFixedTbHead(components.$view);  // 更新滚动条补丁
-    };
-
-    /**
-     * 刷新指定父级下的节点
-     * @param id 父级id,空则全部刷新
-     * @param data 非异步模式替换的数据
-     */
-    TreeTable.prototype.refresh = function (id, data) {
-        if (isClass(id) === 'Array') {
-            data = id;
-            id = undefined;
-        }
-        var components = this.getComponents();
-        var d, $tr;
-        if (id !== undefined) {
-            $tr = components.$table.children('tbody').children('tr[data-index="' + this.getIndexById(id) + '"]');
-            d = this.getDataByTr($tr);
-        }
-        if (data) {  // 数据模式
-            if (data.length > 0) components.$loading.addClass('ew-loading-float');
-            components.$loading.show();
-            if (data.length > 0 && this.options.tree.isPidData) {  // pid形式数据
-                this.renderBodyData(tt.pidToChildren(data, this.options.tree.idName, this.options.tree.pidName, this.options.tree.childName), d, $tr);
-            } else {
-                this.renderBodyData(data, d, $tr);
-            }
-        } else {  // 异步模式
-            this.renderBodyAsync(d, $tr);
-        }
-    };
-
-    /** 删除数据 */
-    TreeTable.prototype.del = function (id, index) {
-        if (index === undefined) index = this.getIndexById(id);
-        var indexList = (typeof index === 'number' ? [index] : index.split('-'));
-        var d = this.options.data;
-        if (indexList.length > 1) {
-            for (var i = 0; i < indexList.length - 1; i++) {
-                d = d[parseInt(indexList[i])][this.options.tree.childName];
-            }
-        }
-        d.splice(indexList[indexList.length - 1], 1);
-    };
-
-    /** 更新数据 */
-    TreeTable.prototype.update = function (id, fields) {
-        $.extend(true, this.getDataByTr(this.getIndexById(id)), fields);
-    };
-
-    /** 折叠/展开行 */
-    function toggleRow($tr) {
-        var indent = parseInt($tr.data('indent'));
-        var open = $tr.hasClass('ew-tree-table-open');
-        if (open) {  // 折叠
-            $tr.removeClass('ew-tree-table-open');
-            $tr.nextAll('tr').each(function () {
-                if (parseInt($(this).data('indent')) <= indent) return false;
-                $(this).addClass('ew-tree-tb-hide');
-            });
-        } else {  // 展开
-            $tr.addClass('ew-tree-table-open');
-            var hideInd;
-            $tr.nextAll('tr').each(function () {
-                var ind = parseInt($(this).data('indent'));
-                if (ind <= indent) return false;
-                if (hideInd !== undefined && ind > hideInd) return true;
-                $(this).removeClass('ew-tree-tb-hide');
-                if (!$(this).hasClass('ew-tree-table-open')) hideInd = parseInt($(this).data('indent'));
-                else hideInd = undefined;
-            });
-        }
-        updateFixedTbHead($tr.parentsUntil('.ew-tree-table').last().parent());
-        return open;
-    }
-
-    /** 固定表头滚动条补丁 */
-    function updateFixedTbHead($view) {
-        var $headBox = $view.children('.ew-tree-table-head');
-        var $tbBox = $view.children('.ew-tree-table-box');
-        var sWidth = $tbBox.width() - $tbBox.prop('clientWidth');
-        $headBox.css('border-right', (sWidth > 0 ? sWidth : 0) + 'px solid #f2f2f2');
-    }
-
-    // 监听窗口大小改变
-    $(window).resize(function () {
-        $('.ew-tree-table').each(function () {
-            updateFixedTbHead($(this));
-            var $tbBox = $(this).children('.ew-tree-table-box');
-            var full = $tbBox.data('full');
-            if (full && device.ie && device.ie < 10) {
-                $tbBox.css('height', getPageHeight() - full);
-            }
-        });
-    });
-
-    /** 表格溢出点击展开功能 */
-    $(document).on('mouseenter', '.ew-tree-table-cell.single-line', function () {
-        var $content = $(this).children('.ew-tree-table-cell-content');
-        if ($content.prop('scrollWidth') > $content.outerWidth()) $(this).children('.layui-table-grid-down').show();
-    }).on('mouseleave', '.ew-tree-table-cell.single-line', function () {
-        $(this).children('.layui-table-grid-down').hide();
-    });
-    // 点击箭头展开
-    $(document).on('click', '.ew-tree-table-cell>.layui-table-grid-down', function (e) {
-        e.stopPropagation();
-        hideAllTdTips();
-        var $cell = $(this).parent();
-        $cell.addClass('ew-tree-tips-open');
-        $cell.children('.layui-table-grid-down').hide();
-        var tw = $cell.parent().outerWidth() + 4;
-        if ($cell.outerWidth() < tw) $cell.children('.ew-tree-table-cell-content').css({'width': tw, 'max-width': tw});
-        var $box = $cell.parents().filter('.ew-tree-table-box');
-        if ($box.length === 0) $box = $cell.parents().filter('.ew-tree-table-head');
-        if ($box.length === 0) return;
-        if (($cell.outerWidth() + $cell.offset().left) + 20 > $box.offset().left + $box.outerWidth()) {
-            $cell.addClass('ew-show-left');
-        }
-        if (($cell.outerHeight() + $cell.offset().top + 10) > $box.offset().top + $box.outerHeight()) {
-            $cell.addClass('ew-show-bottom');
-        }
-    });
-    // 点击关闭按钮关闭
-    $(document).on('click', '.ew-tree-table-cell>.ew-tree-tips-c', function () {
-        hideAllTdTips();
-    });
-    // 点击空白部分关闭
-    $(document).on('click', function () {
-        hideAllTdTips();
-        $('.ew-tree-table .layui-table-tool-panel').remove();
-    });
-    $(document).on('click', '.ew-tree-table-cell.ew-tree-tips-open', function (e) {
-        e.stopPropagation();
-    });
-
-    /* 关闭所有单元格溢出提示框 */
-    function hideAllTdTips() {
-        $('.ew-tree-table-cell').removeClass('ew-tree-tips-open ew-show-left ew-show-bottom');
-        $('.ew-tree-table-cell>.ew-tree-table-cell-content').css({'width': '', 'max-width': ''});
-    }
-
-    /** 拖拽调整列宽 */
-    $(document).on('mousedown', '.ew-tb-resize', function (e) {
-        layui.stope(e);
-        var $this = $(this);
-        $this.attr('move', 'true');
-        var key = $this.parent().data('key');
-        $this.data('x', e.clientX);
-        var w = $this.parent().parent().parent().parent().children('colgroup').children('col[data-key="' + key + '"]').attr('width');
-        if (!w || w.toString().indexOf('%') !== -1) w = $this.parent().outerWidth();
-        $this.data('width', w);
-        $('body').addClass('ew-tree-table-resizing');
-    }).on('mousemove', function (e) {
-        var $rs = $('.ew-tree-table .ew-tb-resize[move="true"]');
-        if ($rs.length === 0) return;
-        layui.stope(e);
-        var x = $rs.data('x');
-        var w = $rs.data('width');
-        var nw = parseFloat(w) + e.clientX - parseFloat(x);
-        if (nw <= 0) nw = 1;
-        // 更新实例options中的宽度
-        var ins = _instances[$rs.parentsUntil('.ew-tree-table').last().parent().attr('lay-filter')];
-        var key = $rs.parent().data('key');
-        var ks = key.split('-');
-        ins.options.cols[ks[0]][ks[1]].width = nw;
-        ins.eachCols(function (i, item) {
-            if (item.key === key) item.width = nw;
-        });
-        ins.resize();
-    }).on('mouseup', function (e) {
-        $('.ew-tree-table .ew-tb-resize[move="true"]').attr('move', 'false');
-        $('body').removeClass('ew-tree-table-resizing');
-    }).on('mouseleave', function (e) {
-        $('.ew-tree-table .ew-tb-resize[move="true"]').attr('move', 'false');
-        $('body').removeClass('ew-tree-table-resizing');
-    });
-
-    /** 获取顶级的pId */
-    function getPids(data, idName, pidName) {
-        var pids = [];
-        for (var i = 0; i < data.length; i++) {
-            var hasPid = false;
-            for (var j = 0; j < data.length; j++) {
-                if (data[i][pidName] == data[j][idName]) {
-                    hasPid = true;
-                    break;
-                }
-            }
-            if (!hasPid) pids.push(data[i][pidName]);
-        }
-        return pids;
-    }
-
-    /** 判断pId是否相等 */
-    function pidEquals(pId, pIds) {
-        if (isClass(pIds) === 'Array') {
-            for (var i = 0; i < pIds.length; i++)
-                if (pId == pIds[i]) return true;
-        }
-        return pId == pIds;
-    }
-
-    /** 获取变量类型 */
-    function isClass(o) {
-        if (o === null) return 'Null';
-        if (o === undefined) return 'Undefined';
-        return Object.prototype.toString.call(o).slice(8, -1);
-    }
-
-    /** 获取浏览器高度 */
-    function getPageHeight() {
-        return document.documentElement.clientHeight || document.body.clientHeight;
-    }
-
-    /** 对外提供的方法 */
-    var tt = {
-        /* 渲染 */
-        render: function (options) {
-            return new TreeTable(options);
-        },
-        /* 重载 */
-        reload: function (id, opt) {
-            _instances[id].reload(opt);
-        },
-        /* 事件监听 */
-        on: function (events, callback) {
-            return layui.onevent.call(this, MOD_NAME, events, callback);
-        },
-        /* pid转children形式 */
-        pidToChildren: function (data, idName, pidName, childName, pId) {
-            if (!childName) childName = 'children';
-            var newList = [];
-            for (var i = 0; i < data.length; i++) {
-                if (data[i][idName] == data[i][pidName])
-                    return console.error('第' + i + '条数据的' + idName + '与' + pidName + '相同', data[i]);
-                if (pId === undefined) pId = getPids(data, idName, pidName);
-                if (pidEquals(data[i][pidName], pId)) {
-                    var children = this.pidToChildren(data, idName, pidName, childName, data[i][idName]);
-                    if (children.length > 0) data[i][childName] = children;
-                    newList.push(data[i]);
-                }
-            }
-            return newList;
-        }
-    };
-
-    /** 添加样式 */
-    $('head').append([
-        '<style id="ew-tree-table-css">',
-        '/** 最外层容器 */',
-        '.ew-tree-table {',
-        '    margin: 10px 0;',
-        '    position: relative;',
-        '    border: 1px solid #e6e6e6;',
-        '    border-bottom: none;',
-        '    border-right: none;',
-        '}',
-
-        '.ew-tree-table:before, .ew-tree-table:after, .ew-tree-table .ew-tree-table-head:after {',
-        '    content: "";',
-        '    background-color: #e6e6e6;',
-        '    position: absolute;',
-        '    right: 0;',
-        '    bottom: 0;',
-        '}',
-
-        '.ew-tree-table:before {',
-        '    width: 1px;',
-        '    top: 0;',
-        '    z-index: 1;',
-        '}',
-
-        '.ew-tree-table:after, .ew-tree-table .ew-tree-table-head:after {',
-        '    height: 1px;',
-        '    left: 0;',
-        '}',
-
-        '.ew-tree-table .layui-table {',
-        '    margin: 0;',
-        '    position: relative;',
-        '    table-layout: fixed;',
-        '}',
-
-        '/** 表格 */',
-        '.ew-tree-table .layui-table td, .ew-tree-table .layui-table th {',
-        '    border-top: none;',
-        '    border-left: none;',
-        '    padding: 0 !important;',
-        '}',
-
-        '.ew-tree-table .ew-tree-table-box {',
-        '    overflow: auto;',
-        '    position: relative;',
-        '}',
-
-        '.ew-tree-table .ew-tree-table-head {',
-        '    overflow: hidden;',
-        '    box-sizing: border-box;',
-        '    background-color: #f2f2f2;',
-        '    position: relative;',
-        '}',
-
-        '/** loading */',
-        '.ew-tree-table div.ew-tree-table-loading {',
-        '    padding: 10px 0;',
-        '    text-align: center;',
-        '}',
-
-        '.ew-tree-table div.ew-tree-table-loading > i {',
-        '    color: #999;',
-        '    font-size: 30px;',
-        '}',
-
-        '.ew-tree-table div.ew-tree-table-loading.ew-loading-float {',
-        '    position: absolute;',
-        '    top: 0;',
-        '    left: 0;',
-        '    right: 0;',
-        '}',
-
-        '/** 空数据 */',
-        '.ew-tree-table .ew-tree-table-empty {',
-        '    color: #666;',
-        '    font-size: 14px;',
-        '    padding: 18px 0;',
-        '    text-align: center;',
-        '    display: none;',
-        '}',
-
-        '/** 单元格 */',
-        '.ew-tree-table-cell.ew-tree-tips-open {',
-        '    position: absolute;',
-        '    top: 0;',
-        '    left: 0;',
-        '    padding: 0;',
-        '    z-index: 9999;',
-        '    background-color: #fff;',
-        '    box-shadow: 3px 3px 8px rgba(0, 0, 0, .15);',
-        '}',
-
-        'thead .ew-tree-table-cell.ew-tree-tips-open {',
-        '    background-color: #f2f2f2;',
-        '}',
-
-        '.ew-tree-table-cell.ew-tree-tips-open.ew-show-left {',
-        '    right: 0;',
-        '    left: auto;',
-        '    box-shadow: -3px 3px 8px rgba(0, 0, 0, .15);',
-        '}',
-
-        '.ew-tree-table-cell.ew-tree-tips-open.ew-show-bottom {',
-        '    bottom: 0;',
-        '    top: auto;',
-        '    box-shadow: 3px -3px 8px rgba(0, 0, 0, .15);',
-        '}',
-
-        '.ew-tree-table-cell.ew-tree-tips-open.ew-show-left.ew-show-bottom {',
-        '    box-shadow: -3px -3px 8px rgba(0, 0, 0, .15);',
-        '}',
-
-        '.ew-tree-table-cell > .ew-tree-tips-c {',
-        '    position: absolute;',
-        '    right: -6px;',
-        '    top: -3px;',
-        '    width: 22px;',
-        '    height: 22px;',
-        '    line-height: 22px;',
-        '    font-size: 16px;',
-        '    color: #fff;',
-        '    background-color: #666;',
-        '    border-radius: 50%;',
-        '    text-align: center;',
-        '    cursor: pointer;',
-        '    display: none;',
-        '}',
-
-        'table tr:first-child .ew-tree-table-cell > .ew-tree-tips-c {',
-        '    top: 0;',
-        '}',
-
-        '.ew-tree-table-cell.ew-tree-tips-open > .ew-tree-tips-c {',
-        '    display: block;',
-        '}',
-
-        '.ew-tree-table-cell.ew-tree-tips-open.ew-show-left > .ew-tree-tips-c {',
-        '    left: -6px;',
-        '    right: auto;',
-        '}',
-
-        '.ew-tree-table-cell > .ew-tree-table-cell-content {',
-        '    padding: 5px 15px;',
-        '    line-height: 28px;',
-        '}',
-
-        '[lay-size="lg"] .ew-tree-table-cell > .ew-tree-table-cell-content {',
-        '    line-height: 40px;',
-        '}',
-
-        '[lay-size="sm"] .ew-tree-table-cell > .ew-tree-table-cell-content {',
-        '    padding: 1px 15px;',
-        '}',
-
-        '.ew-tree-table-cell.single-line > .ew-tree-table-cell-content {',
-        '    overflow: hidden;',
-        '    white-space: nowrap;',
-        '    text-overflow: ellipsis;',
-        '}',
-
-        '.ew-tree-table-cell.ew-tree-tips-open > .ew-tree-table-cell-content {',
-        '    overflow: auto;',
-        '    padding: 9px 15px;',
-        '    height: auto;',
-        '    min-height: 100%;',
-        '    max-height: 110px;',
-        '    line-height: inherit;',
-        '    max-width: 260px;',
-        '    width: 200px;',
-        '    width: max-content;',
-        '    width: -moz-max-content;',
-        '    box-sizing: border-box;',
-        '    white-space: normal;',
-        '}',
-
-        '.ew-tree-table-cell > .layui-table-grid-down {',
-        '    box-sizing: border-box;',
-        '}',
-
-        '/** 图标列 */',
-        '.ew-tree-table .ew-tree-pack {',
-        '    cursor: pointer;',
-        '    line-height: 16px;',
-        '}',
-
-        '.ew-tree-table .ew-tree-pack > .layui-icon, .ew-tree-table .ew-tree-pack > .ew-tree-icon {',
-        '    margin-right: 5px;',
-        '}',
-
-        '.ew-tree-table .ew-tree-pack > * {',
-        '    vertical-align: middle;',
-        '}',
-
-        '/* 缩进 */',
-        '.ew-tree-table .ew-tree-table-indent {',
-        '    margin-right: 5px;',
-        '    padding-left: 16px;',
-        '}',
-
-        '/* 箭头 */',
-        '.ew-tree-table .ew-tree-table-arrow:before {',
-        '    content: "\\e623";',
-        '}',
-
-        '.ew-tree-table .ew-tree-table-open .ew-tree-table-arrow:before {',
-        '    content: "\\e625";',
-        '}',
-
-        '.ew-tree-table .ew-tree-table-arrow.arrow2 {',
-        '    font-size: 12px;',
-        '    font-weight: 600;',
-        '    line-height: 16px;',
-        '    height: 16px;',
-        '    width: 16px;',
-        '    display: inline-block;',
-        '    text-align: center;',
-        '    color: #888;',
-        '}',
-
-        '.ew-tree-table .ew-tree-table-arrow.arrow2:before {',
-        '    content: "\\e602";',
-        '}',
-
-        '.ew-tree-table .ew-tree-table-open .ew-tree-table-arrow.arrow2:before {',
-        '    content: "\\e61a";',
-        '}',
-
-        '.ew-tree-table-arrow.ew-tree-table-arrow-hide {',
-        '    visibility: hidden;',
-        '}',
-
-        '/* 箭头变加载中状态 */',
-        '.ew-tree-table tr.ew-tree-table-loading > td .ew-tree-table-arrow:before {',
-        '    content: "\\e63d" !important;',
-        '}',
-
-        '.ew-tree-table tr.ew-tree-table-loading > td .ew-tree-table-arrow {',
-        '    margin-right: 0;',
-        '}',
-
-        '.ew-tree-table tr.ew-tree-table-loading > td .ew-tree-table-arrow + * {',
-        '    margin-left: 5px;',
-        '}',
-
-        '.ew-tree-table tr.ew-tree-table-loading * {',
-        '    pointer-events: none !important;',
-        '}',
-
-        '/** 折叠行 */',
-        '.ew-tree-table .ew-tree-tb-hide {',
-        '    display: none;',
-        '}',
-
-        '/** 特殊列调整 */',
-        '.ew-tree-table td[data-type="numbers"] > .ew-tree-table-cell,',
-        '.ew-tree-table th[data-type="numbers"] > .ew-tree-table-cell,',
-        '.ew-tree-table td[data-type="checkbox"] > .ew-tree-table-cell,',
-        '.ew-tree-table th[data-type="checkbox"] > .ew-tree-table-cell,',
-        '.ew-tree-table td[data-type="radio"] > .ew-tree-table-cell,',
-        '.ew-tree-table th[data-type="radio"] > .ew-tree-table-cell,',
-        '.ew-tree-table td[data-type="space"] > .ew-tree-table-cell,',
-        '.ew-tree-table th[data-type="space"] > .ew-tree-table-cell {',
-        '    padding-left: 0;',
-        '    padding-right: 0;',
-        '}',
-
-        '/* 单元格内表单元素样式调整 */',
-        '.ew-tree-table .layui-form-switch',
-        '.ew-tree-table .layui-form-radio {',
-        '    margin: 0;',
-        '}',
-
-        '/* checkbox列调整 */',
-        '.ew-tree-table-checkbox + .layui-form-checkbox {',
-        '    padding: 0;',
-        '}',
-
-        '.ew-tree-table-checkbox + .layui-form-checkbox > .layui-icon {',
-        '    font-weight: 600;',
-        '    color: transparent;',
-        '    transition: background-color .1s linear;',
-        '    -webkit-transition: background-color .1s linear;',
-        '}',
-
-        '.ew-tree-table-checkbox + .layui-form-checkbox.layui-form-checked > .layui-icon {',
-        '    color: #fff;',
-        '}',
-
-        '/* checkbox半选状态 */',
-        '.ew-form-indeterminate + .layui-form-checkbox .layui-icon:before {',
-        '    content: "";',
-        '    width: 10px;',
-        '    height: 2px;',
-        '    background-color: #f1f1f1;',
-        '    position: absolute;',
-        '    top: 50%;',
-        '    left: 50%;',
-        '    margin: -1px 0 0 -5px;',
-        '}',
-
-        '/* radio列调整 */',
-        '.ew-tree-table-radio + .layui-form-radio {',
-        '    margin: 0;',
-        '    padding: 0;',
-        '    height: 20px;',
-        '    line-height: 20px;',
-        '}',
-
-        '.ew-tree-table-radio + .layui-form-radio > i {',
-        '    margin: 0;',
-        '    height: 20px;',
-        '    font-size: 20px;',
-        '    line-height: 20px;',
-        '}',
-
-        '/** 单元格编辑 */',
-        '.ew-tree-table .layui-table td[data-edit] {',
-        '    cursor: text;',
-        '}',
-
-        '.ew-tree-table .ew-tree-table-edit {',
-        '    position: absolute;',
-        '    left: 0;',
-        '    top: 0;',
-        '    width: 100%;',
-        '    height: 100%;',
-        '    border-radius: 0;',
-        '    box-shadow: 1px 1px 20px rgba(0, 0, 0, .15);',
-        '}',
-
-        '.ew-tree-table .ew-tree-table-edit:focus {',
-        '    border-color: #5FB878 !important;',
-        '}',
-
-        '.ew-tree-table .ew-tree-table-edit.layui-form-danger {',
-        '    border-color: #FF5722 !important;',
-        '}',
-
-        '/** 搜索数据隐藏行 */',
-        '.ew-tree-table tr.ew-tree-table-filter-hide {',
-        '    display: none !important;',
-        '}',
-
-        '/** 头部工具栏 */',
-        '.ew-tree-table .ew-tree-table-tool {',
-        '    min-height: 50px;',
-        '    line-height: 30px;',
-        '    padding: 10px 15px;',
-        '    box-sizing: border-box;',
-        '    background-color: #f2f2f2;',
-        '    border-bottom: 1px solid #e6e6e6;',
-        '}',
-
-        '.ew-tree-table .ew-tree-table-tool .ew-tree-table-tool-right {',
-        '    float: right;',
-        '}',
-
-        '.ew-tree-table .ew-tree-table-tool .ew-tree-table-tool-item {',
-        '    position: relative;',
-        '    color: #333;',
-        '    width: 26px;',
-        '    height: 26px;',
-        '    line-height: 26px;',
-        '    text-align: center;',
-        '    margin-left: 10px;',
-        '    display: inline-block;',
-        '    border: 1px solid #ccc;',
-        '    box-sizing: border-box;',
-        '    vertical-align: middle;',
-        '    -webkit-transition: .3s all;',
-        '    transition: .3s all;',
-        '    cursor: pointer;',
-        '}',
-
-        '.ew-tree-table .ew-tree-table-tool .ew-tree-table-tool-item:first-child {',
-        '    margin-left: 0;',
-        '}',
-
-        '.ew-tree-table .ew-tree-table-tool .ew-tree-table-tool-item:hover {',
-        '    border-color: #999;',
-        '}',
-
-        '.ew-tree-table .ew-tree-table-tool-right .layui-table-tool-panel {',
-        '    left: auto;',
-        '    right: -1px;',
-        '    z-index: 9999;',
-        '}',
-
-        '/* 列宽拖拽调整 */',
-        '.ew-tree-table .ew-tb-resize {',
-        '    position: absolute;',
-        '    right: 0;',
-        '    top: 0;',
-        '    bottom: 0;',
-        '    width: 10px;',
-        '    cursor: col-resize;',
-        '}',
-
-        '.ew-tree-table-resizing {',
-        '    cursor: col-resize;',
-        '    -ms-user-select: none;',
-        '    -moz-user-select: none;',
-        '    -webkit-user-select: none;',
-        '    user-select: none;',
-        '}',
-
-        '/* 辅助样式 */',
-        '.ew-tree-table .layui-form-switch {',
-        '    margin: 0;',
-        '}',
-
-        '.ew-tree-table .pd-tb-0 {',
-        '    padding-top: 0 !important;',
-        '    padding-bottom: 0 !important;',
-        '}',
-
-        '.ew-tree-table .break-all {',
-        '    word-break: break-all !important;',
-        '}',
-
-        '/** 扩展图标 */',
-        '.ew-tree-table .ew-tree-icon-folder:after, .ew-tree-table .ew-tree-icon-file:after {',
-        '    content: "";',
-        '    padding: 2px 10px;',
-        '    -webkit-background-size: cover;',
-        '    -moz-background-size: cover;',
-        '    -o-background-size: cover;',
-        '    background-size: cover;',
-        '    background-repeat: no-repeat;',
-        '    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAE6UlEQVR4Xu2ZPYhcVRiGny9hC0FsTEBCGkFTWIQE/IlpgmKpWAiLyR0XLbYTxEKxkCAEhRCxEOwsjJnJioKIYClWKgqiskIIaCoLYyASVJT87JGspN37LrOXvec777Tzzrnvz7Nn2dnAr6YbiKbTOzwGoHEIDIABaLyBxuP7BjAAjTfQeHzfAAag8QYaj+8bwAA03kDj8X0DGIDGG2g8/lw3QFlhD9fZN7oOF7gYT3NudL5GaGjTAJQP2c1VXgIOExyGkf4/oXCe4I3oeH+EvY/G0qYAKFOWCV4Hdo8mQb+RL7jBE7HE3/3S9hQyAGXGCeDVSiv6lqscief4t1L/g9mWAChTHiD4ZrTXvVbPu9GxrEnbUWkAzPgeOJCglsXo+ChBji2L0AtAmfEgrP/0Z3hdZoF7Y5HLGcJsRQYFgLeAF7fiYSM540x0LI3Ey7bb6AdgytcEh7bd6VYa2MGhOJrmVpurmX4AZlwCds31lPF9+AI32O8/DYUvccqUKwR3jG/DuR29Gd36F1pNv/pvgKwAFK5RuC+e4eeWCWgXgJurFz6LCY8bgA0aSPwr4P/UhVNc43ir3xK2fQPcAr/wO/AewU/Ar6xRqroVdvAnC6zGIlc369sAbLax8er/ofAJOzkVR9e/uZVeBkCqqTrRyeh4RXFtAJSWatQUno0Jp/usG4C+hup9/yJ72BuPcH2jCAag3oEV50vRccYAKFXl1LwdHS8YgJzj9qcqfBoTnjQA/VVlVXwXHfcbgKzz9uf6IToOGoD+orIqDEDWZcVcBkAsKqvMAGRdVsxlAMSissoMQNZlxVwGQCwqq8wAZF1WzGUAxKKyygxA1mXFXAZALCqrzABkXVbMZQDEorLKDEDWZcVcBkAsKqvMAGRdVsxlAMSissoMQNZlxVwGQCwqq8wAZF1WzGUAxKKyygxA1mXFXAZALCqrzABkXVbMZQDEorLKDEDWZcVcBkAsKqvMAGRdVsxlAMSissoMQNZlxVwGQCwqq8wAZF1WzGUAxKKyygxA1mXFXAZALCqrzABkXVbMZQDEorLKDEDWZcVcBkAsKqvMAGRdVsxlAMSissoMQNZlxVwGQCwqq8wAZF1WzGUAxKKyygxA1mXFXAZALCqrzABkXVbMZQDEorLKDEDWZcVcBkAsKqvMAGRdVsxlAMSissoMQNZlxVwGQCwqq8wAZF1WzGUAxKKyygxA1mXFXAZALCqrzABkXVbMZQDEorLKDEDWZcVcBkAsKqvMAGRdVsxlAMSissoMQNZlxVwGQCwqq8wAZF1WzLUFAMy4BOwSH2jZmBoorMaE/RtZij6/ZcoFgrv7dH5/lA38Eh33zAfAjM+BR0cZz6Y2bqDwY0w4MB8AU04SvOyuq2zg4+h4aj4AzvIwha+qjN+66cLzMeGduQC4+eEy4zywr/U+K8t/hQX2xiJ/zQ/ACgdZ40vgtspKaNducCyOsdJXQO9fAbcOKGc5whofENzVd6jf3/YGTkTHccWFDMD6r4LT3MlOloHHCB4CblceYs3gDfxB4TeCcxReiwmr6hM3BYB6qHX1NGAA6tlqEKcGYJBa6znUANSz1SBODcAgtdZzqAGoZ6tBnBqAQWqt51ADUM9Wgzg1AIPUWs+hBqCerQZxagAGqbWeQw1APVsN4tQADFJrPYcagHq2GsTpf+KxwJB5Cd5mAAAAAElFTkSuQmCC");',
-        '}',
-
-        '.ew-tree-table tr.ew-tree-table-open > td .ew-tree-icon-folder:after {',
-        '    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAKwElEQVR4Xu2df9AVVRnHP899gUxmYKhsCpJREEeMakSoiGGCbIxSizIJ7i5OksZkMIxQjlOQyOCQ5o/8RWmkMdz7wjDC5I+hcFSKxEENh4YsEwPJAbVQ8AeQL733NPcKyn3v7r17d8/uvfvus//ec57n+3yf7z179uw5zwp6ZZoByXT0GjwqgIyLQAWgAsg4AxkPX0cAFUDGGch4+DoCqAAyzkDGw9cRQAWQcQYyHr6OACqA5hkw63kfr3IyOQZTIte8BUs9OnibEi/isEcEY8lqpswEHgHMGgbSxTyEyRjGIC1MfM8UGQ4CfyLHWp7jbllEKVNZjBBsIAGYAi7CrcCgCL6S6voM4IrDtqQcptlPQwGYAksRrkpVkIZD5JgmeR5IFe4WgK0rAFPkamBRC3BFd2k4AkwSl83RjfVeC74CMCuZSI6NqQ7d8G9KDJOLK3MEvTwY8BdAga0Io3sBa0vEYWEviCOWEDwFYDoZh+HxWDwmb/R18gzSx0Rv4r0FUORa4EfJ5yomj8IEyfNYTNZTbdZbAAU2IJyb6siOB2+4Qlx+3mvisRiInwC2I4yy6Ke1pgw/E5crWwuiPb373QL+BZzcnpBDobpLHGaF6tnLO6kAenmCG4WXFQH8WhwubURGFn/PhgAMD4nLl7KY4EYxZ0MAcBhhqOTZ14iQrP2eFQGU8/ogeb6qC0LVEs+SAMqRL+ctLpdZlRdFeoH32UBTpLc9Br6XbMMuhLUIm+jmzbZSQUdlV9M++rBTpnI4CWxZGwGS4NSWj2eBh4CbxGG3LaM97agA4mLWnt23gZ+yg8VxbHVTAdhLVNyWHqabKbb3NqgA4k6bTfuG+3GYYvNJRgVgM0FJ2DL8QFxutOVKBWCLyaTsGN6gH0NlKq/bcKkCsMFi0jYMs8XlDhtuVQA2WEzahuH34vJlG25VADZYTN7GPnE4yYZbFYANFlth4y362VjSVgG0Ink2fAon2Xi7qQKwkYxW2OglAtiP4QlgN8LLreAxtT4HcL1cwKGo+FsxAnQDv6HEbTKDv0QNQPtHYyBpAZSPm7mSp/ymS682YCA5ARiWMYS5Mon/tUHcCuEoA0kJ4AZx+KGy3n4MJCGA9eJwXqPQzSJyjGAMJU5s1FZ/r8NAH7roYIdM5T9BeIpXAIaXOMKZcgkH/MCYIp8GvgN8A/hQENDaJhADrwG/oy9X1BNDvAIQZkqee+okfwGGa9qq4FQgblPVaC85xsp09nqhjlMAO9nBCK9tTGYjfdhLJ3BRqqhMK1jDdoYw2msCHqcAypsZ53txZoqVo9pz08pnKnEbLhKXe3tij1MAk8VhQ0+HZjWj6GZ7KklMM2jD3eJW5lpVV5wC+IA47K8RQJEVwMVp5jKV2H3OR8YjAMPL4vLRmuSvoYMjvAoMTCWJ6Qa9Vhy+mdQIsEEcJtcIYCWjybE13TymFL2wVPK1dZ/iGgE8S7KYTi7F8KuUUphu2AlPAsu1eose9/9lwPfSzWRq0Q8Xh53J3AI6+IRM4681AiiwBeEzqaUwrcANh8Slvxf8OG4BXezg/T0XgCpr/afxX4S+aeUxtbgNfxCXSUkJYJs4nKXP/20ll5vFYV4yAjCsEJdve9z/y8/+5TUAvZJmwDBDXArJCADmicPNHgLQ5d+kE3/Mn+Hj4vK3ZARg+KK4POIxAdyEMKFVHGTWb/m7Cc9zgl9tgTgmgd5LwAUOIrrZI3EhGraIyzg/v7YFsFcchnhMAE+nm38kHrw6BMMycfl+MgLwObRoikwDVmk+WsCAcJnkWZ6MAOA6cWo/MGUKXI/optAWpB9KnC0zeDoZAQh5ydf+002BhxHOaQkBWXZqKHGQE+odIrU7BxBGSZ7yd/uqLlOsbArVV8DJi9FzUe54GDYF4L0EvIpTKLEr+djVIz67gOIRgOFpcTnb499f3u69VtPREgbmiMPt9TzbHAHuEYeZHgtASxB+3JLws+40x3iZXv/rb/YE4PNhJlNgPWKnnk3W89l0/APo3+gIuT0BwBfEqf3SqCnwCsKHmwavHaIy8Kw4jGxkxKYAapaAzSoGU2JPIxD6ewwMGDrFxWlk2Y4ADHvE5WMe9//zEf2Cd6MkxPJ7wIqidgQAnieATYGfIFwTS4BqtD4DwjmS59FGNNkRgM+WY1Pkt8DXGoHQ32NgoItB9U5lH/NoRwAwXRxWe6wB9N4vj8SQM4smXxCHU4PYsyOADs6Uafz9eIdmDQM54l8XIAg4bROagXXicGGQ3jYE4L0EXOBcpPZwaBBQ2iYiA4YF4la+AN/wsiGAP4vDWI8ngKsQljZEoA3iYOA8cVgfxHB0Afi8cDBF1mgBiCApiKGN8BHJ80oQy9EFAHPF4VaPCeDzwPAgILSNRQYML4nL4KAWowtAmCh5/lg1AXyAE3mDg0FBaDurDASqynbMY3QBQO0S8Eomkqt9L2A1TDXmx8AScVgYlJ6oAnhRHIZ6TADnI9wQFIS2s8rAheKwLqjFqAJ4UBwu8BBAESEfFIS2s8hAjlNlOi8EtRhNAIZrxWWBxwSwvCh0RlAQ2s4SA4YD4jKoGWvRBCB8S/KVx713L6MTwGb4t932UXGa230dTQAlzpAZ1Sd+TIHxCI/ZjkztBWKg6aLcUQTgtwQ8B6ldFwgEXxtFY8DnXEY9o+EFYHhK3Eqh56rLFCu1gWvqA0SLTHsHYkAY2ezHOMILAJaLw2UeAih/BuaTgQBrI3sM1KkDFM8IADV7zs2d9KV/pQ5Qzl5kaikQA4bHxWV8oLbHNYoyAnxeHDZVPQEUGIvwZLMgtL0VBm4XhznNWgovAI8956aTWRh+2SwIbW+BgQbfZvDzEFYAu8XhFI/7/53Ady2EoyaaZ+AscdjWbLdwAjDcL27tZk9T5ClgTLMgtH1EBhrUAYpjEljzxkkLQUZMYrTuW8UJ98cLOwLUfH3CrORT5JofgqLFrb2PMuD5SB6EnXACgNPFYUfVE0Anl5TPowdxqm2sM3C5OPwijNXmBeCz4GCK3AbMDgNC+0RkwDBOXLaEseIngOeAEZ4GDU+Iy2drngAKbEb4XBgQ2icCAwHqADU/CSzwJFK71fuoobvEYVbV8P9OJfA3tRBkhESG7/qMOIwK2917BCiwDuHrPiPAbHG5o0oAqxlJt3ct2rDAtF9ABnyKcwfsjd8tYDH4bCwUJki++n2/KVbOoXtWow4KRNuFZsDzXGZQa34jgP+xLq8l4CI3gnc9+qBAtF0IBgwH6MdgmcrhEL0rXbwFUP68WxevIQyoMmzYJS7DPCaAGxEmhgWh/UIyIMyXPDeF7O0vgPIvpsB1CFf2MH6fOEzxEIBWAo+ShXB915PnfBFMuO7v9PIcASoCWMEH6VNZ7Hlvl6lhsbhc3WMCOJxuysfA9EqKAUO5+P7MeiVgg0LxFUBFBEW+AtwH9DlqsObQgSlWvgBetTM4qHNt1zQD+zEs7PkU1rSV4zrUFcDRW0G50NMtwDBKjJAZ1f92U2ApUlshPAoo7fsuA12YCt+bgXvpxyMylW6b/DQUwDFnZiWn4fLPqPccm+DVVnQGAgsguiu10I4MqADaMSsJYlIBJEh2O7pSAbRjVhLEpAJIkOx2dKUCaMesJIhJBZAg2e3oSgXQjllJEJMKIEGy29GVCqAds5IgJhVAgmS3oysVQDtmJUFM/wdaDlOuM5Eu/AAAAABJRU5ErkJggg==");',
-        '}',
-
-        '.ew-tree-table .ew-tree-icon-file:after {',
-        '    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAJNUlEQVR4Xu2dXYxdVRXHf2tghhYaoba1Qk1owIwmfVBaTKRgQqMPlGjig2nDnDsF0whSnwqJ4SNoU2OLUSNPVDSx2t47hEkxaQMBI1hB/EiE6osYqjGUYPGjCihN6Uy525wzt7UdZu7ZZ87a5949Z52XeVl77bX//9/d52vvM4IdtVZAaj16GzwGQM0hMAAMgJorUPPh2wxgANRcgZoP32YAA6DmCtR8+DYDGADVKuB2s4BB1gMbEYZxLEFYDlxQbSU97+0Ejn8hHMPxR4R9LOZxuZGTVVZW2QzgxlnGBNuBUYSLqhxkNH05jgN7GeIrsoF/VlF3cADcQc7nKHfiuM+M97Q0BUH4GpfxbVnHKc9WcwoLCoBrsRjHYwhr51Rd3Rs5foXwaUl4PZQUwQBwLa4AngZWhiq+JnlfBj4pCX8JMd4gALgxluJ4Hrg8RNE1zHkE4WoZ4Zj22NUBcOMsZILnEFZrF1vrfI5DDHGdbOCEpg76ADTZiXCXZpGWq6OAsFNGuEdTD1UA3B7exwDpdLUgt0jHqwjjwH6EF0NMb7k19DAgO03CKtp8pvNM5AO55TjeZoCVMsLfc2M9A3QBaPEQcGtO328hbOYw+2Qbbc8653WY28YAw3yONrsRLswZ7Pck4TYtQdQAcOMMMckbwMIuxaVPua6VhBe0BjCf8rgWa4Bf5jwVPcEgl8gGJjTGrgfAGDfgeCKnqC2SsEuj8Pmaw7W4HXiw6/iE9TLCkxoa6AHQyopOi5/5cLzCCq4M/WRLQ5Re5ug8Of1z11tox3el0UXrAgPQA6DJQYTru/R9ryTsKFBbbUNdK7vS/3qXH9PPpcE6DYH0AGjxEjA8a1Ft1sgohzSKnu853MNcRburVocl4UMaOugB0MxeYMx+BTt14fKmRtHzPYcb5+LOBfVsp9Pj0mCRhg56ALRw3QqSxPYgFDHMVaSnAVDElQpjDYAKxe7HrgyAfnSlwpoMgArF7seuDIB+dKXCmgyACsXux64MgH50pcKaDIAKxe7HrgyAfnSlwpoMgBnEduO8n0m+j+MahCUV+pHf1dQun18zyBdkA3/Lb9A9wgCYpk9nj8EfEC4tK27Q9o7XGOIjZXf2GADTAWjyQ4Sbg5qnl3yvJGwqk84AePcMkO6VSxdSxnAck4RlZQo1AN4NwF+By8qIWmHbo5Kwokx/BkDcp4A9kpQ7XRkA0wGY2nPw+yguAoVVZTd0GgAz3Qbu5VIGsr0H1wLvLTPFBmj772xJd5vbZJTXyuY3AMoqGHl7AyByA8uWbwCUVTDy9gZA5AaWLd8AKKtg5O0NgMgNLFu+AVBWwcjbGwCRG1i2fAOgrIKRtzcAIjewbPkGQFkFI29vAERuYNnyDYCZXgbZmsAzqmjtto5md7CtCTz3F1E/AGxN4DkE1A+AVvb9fFsT2MGgjgDYmsCz5oD6ARDXKcDWBE6/iC9LbOc7xLYmsK6ngHTcztYE1vc2sOyDldja24Og2BxTrtcAUBY0tnQGQGyOKddrACgLGls6AyA2x5TrNQCUBY0tnQEQm2PK9RoAyoLGls4AiM0x5XoNAGVBY0tnAMTmmHK9BsAMgqp+J1D5u37K/mMATFM02JpApe/6GQCB/8eNC7sgpPR3/QyA0ACEXRNY+rt+BkB4AEKuCSz9XT8DIDQAYU8BpdfwGQChAQj1ncD0IlDhu34GQGAAUoGV1wSqftfPAKgAAG2RQ+Rzu1nAIOuBjQjDOJYgLAcu0Oyv7Crr07VEszdQU7wQudw4y5hgOzCKcFGIPs7OaQCEVtgzvzvI+RzlThz3VWF8p6wJSXRmFJsBPI2eKazzdPIxhLUl0syl6RFJWDmXhtPbGABzVNG1uAJ4GnSMKFSG4zfS4JpCbWYJNgDmoKIbYymO54HL59C8fBPHj6TBLeUTgQFQUEU3zkImeA5hdcGmeuHCRhlhXCOhAVBQRddkJ8JdBZtphr/DIEtkA29qJDUACqjY2aF8BGFBbjPHq0j2K92P8KKMcKxbGzfGKhy/ABbn5N4vCZ/N7d8zwADwFCoNc63sv5XcmtPkLYTNHGafbKPtk76A+dDmwzLKSz55fWIMAB+VUvPHGWKSN4CFXZqcTP+djSS84JmWQuY7xqRB4pvbJ84A8FEpBWCMG3A8kRO+RRJ2eaZMZ5SPAj/zmPbTlEd5h6tkE//wze8TZwD4qDQ1/T8I3D5ruOMVVnClrOOUT8rMfMczCO/JjXdM4vi4jHIoN7ZggAHgKZhrchDh+i7h90rCDp90hcwHB9wiCXt8cheNMQA8FXOt7MJreNbwNmt8fqEFzU/t3ywNfuBZZuEwA8BTMtfkOMKFs4YPcknevblr8jHgKa9pf6qjQtcUnkM5J8wA8FSt7Dr9zHzJLvgWeXYZ3Py0DgPA040yABQ237FVGjzgWVqpME0A/tuVbsfF0uA/partYeO5AtDP5uvOAE3+hPDBWT0aYLXcxO966GGprucCQL+brw3AswifmFVlxz3SYGcpF3rYuCgA7mHW0uYn3ud8x93S4P6qh6h3CmiyC+GLXQAo9KCkaiHy+isCQMf8p3IeG/+/yx6ZrzsDtLgReLyrkI4vSSN7ohbd4QvAHMzfLg2+2itB9GaA9GXJBK93vVeGk7RZ6/PApFeCzNavDwCuxaeAAwV++fdLg7t7OVY1ANJBeL8udXyehEdFssecURx5AAB3AN8EzvMakOMBabDVKzZgkC4AYyynzcveCybgEYQDPgsmAmrgldoDAK88WVCfmK96DXB69K7JNxC+7K9GzSL7yPwwAKSLJid5Fri6Ztb6DHeXJGzxCawqRvUUcGYWmFo2/duerJmvSrni/fSd+UFmgDMQTG2c+Clkf+t+fEeS7CKx744gM8BZEKQrXNPbouv6buTVFHQSx83S4JFquiveS1AAsgvehxhkEXdUvHmyuBL6LZ5hgK39/v4jOABnZoN0+/QkO3DcVOEuWn1bu2V0vA38mPP4Vr8bf3oYlQFwFgjpXcJ6HBshe3u4NMQHFII7ny7UlOy/maYbPtI3oY9yigOyiePB+1bsoHIAFGu3VAoKGAAKIsacwgCI2T2F2g0ABRFjTmEAxOyeQu0GgIKIMacwAGJ2T6F2A0BBxJhTGAAxu6dQuwGgIGLMKf4HAR/hrhUhGSQAAAAASUVORK5CYII=");',
-        '}',
-        '</style>'
-    ].join(''));
-
-    exports('treeTable', tt);
+	var $ = layui.jquery;
+	var laytpl = layui.laytpl;
+	var form = layui.form;
+	var util = layui.util;
+	var device = layui.device();
+	var MOD_NAME = 'treeTable';  // 模块名
+	var _instances = {};  // 记录所有实例
+
+	/* 表格默认参数 */
+	var defaultOption = {
+		elem: undefined,                                 // 容器
+		cols: undefined,                                 // 列参数
+		url: undefined,                                  // url模式请求
+		method: undefined,                               // url模式请求方式
+		where: undefined,                                // url模式请求条件
+		contentType: undefined,                          // url模式请求类型
+		headers: undefined,                              // url模式请求headers
+		parseData: undefined,                            // url模式处理请求数据
+		request: {pidName: 'pid'},                       // url模式请求字段自定义
+		toolbar: undefined,                              // 表头工具栏
+		defaultToolbar: undefined,                       // 表头工具栏右侧按钮
+		width: undefined,                                // 容器宽度
+		height: undefined,                               // 容器高度
+		cellMinWidth: 90,                                // 单元格最小宽度
+		done: undefined,                                 // 数据处理完回调
+		data: undefined,                                 // 直接赋值数据
+		title: undefined,                                // 定义table大标题，文件导出会用到
+		skin: undefined,                                 // 表格风格
+		even: undefined,                                 // 是否开启隔行变色
+		size: undefined,                                 // 表格尺寸
+		text: {
+			none: '无数据'                               // 空数据提示
+		},
+		reqData: undefined,                              // 自定义加载数据方法
+		useAdmin: false,                                  // 是否使用admin.ajax
+		tree: {
+			idName: 'id',                                // id的字段名
+			pidName: 'pid',                              // pid的字段名
+			childName: 'children',                       // children的字段名
+			haveChildName: 'haveChild',                  // 是否有children标识的字段名
+			haveChildReverse: false,                     // 是否将children标识的字段取反
+			openName: 'open',                            // 是否默认展开的字段名
+			iconIndex: 0,                                // 图标列的索引
+			arrowType: undefined,                        // 折叠箭头类型
+			onlyIconControl: undefined,                  // 仅点击图标控制展开折叠
+			getIcon: function (d) {                      // 自定义图标
+				var haveChild = d[this.haveChildName];
+				if (haveChild !== undefined) {
+					haveChild = haveChild === true || haveChild === 'true';
+					if (this.haveChildReverse) haveChild = !haveChild;
+				} else if (d[this.childName]) haveChild = d[this.childName].length > 0;
+				if (haveChild) return '<i class="ew-tree-icon layui-icon layui-icon-layer"></i>';
+				else return '<i class="ew-tree-icon layui-icon layui-icon-file"></i>';
+			}
+		}
+	};
+	/* 列默认参数 */
+	var colDefaultOption = {
+		field: undefined,     // 字段名
+		title: undefined,     // 标题
+		width: undefined,     // 宽度
+		minWidth: undefined,  // 最小宽度
+		type: 'normal',       // 列类型
+		fixed: undefined,     // 固定列
+		hide: undefined,      // 是否初始隐藏列
+		unresize: undefined,  // 禁用拖拽列宽
+		style: undefined,     // 单元格样式
+		align: undefined,     // 对齐方式
+		colspan: undefined,   // 单元格所占的列数
+		rowspan: undefined,   // 单元格所占的行数
+		templet: undefined,   // 自定义模板
+		toolbar: undefined,   // 工具列
+		'class': undefined,   // 单元格class
+		singleLine: undefined // 是否一行显示
+	};
+
+	/** TreeTable类构造方法 */
+	var TreeTable = function (options) {
+		_instances[options.elem.substring(1)] = this;
+		this.reload(options);
+	};
+
+	/**
+	 * 根据ID查找数据
+	 * @param id 数据条目的ID
+	 */
+	TreeTable.prototype.findDataById = function (id) {
+		var options = this.options;
+
+		function each(data) {
+			for (var i = 0; i < data.length; i++) {
+				if (data[i][options.tree.idName] === id) return data[i];
+				if (data[i][options.tree.childName]) {
+					var res = each(data[i][options.tree.childName]);
+					if (res) return res;
+				}
+			}
+		}
+
+		return each(options.data);
+	}
+
+	/** 参数设置 */
+	TreeTable.prototype.initOptions = function (opt) {
+		var that = this;
+
+		// 处理特殊列
+		function initCol(item) {
+			if (!item.INIT_OK) item = $.extend({INIT_OK: true}, colDefaultOption, item);
+			// 特殊列处理
+			if (item.type === 'space') {  // 空列
+				if (!item.width) item.width = 15;
+				item.minWidth = item.width;
+			} else if (item.type === 'numbers') {  // 序号列
+				if (!item.width) item.width = 40;
+				item.minWidth = item.width;
+				if (!item.singleLine) item.singleLine = false;
+				if (!item.unresize) item.unresize = true;
+				if (!item.align) item.align = 'center';
+			} else if (item.type === 'checkbox' || item.type === 'radio') {  // 复/单选框列
+				if (!item.width) item.width = 48;
+				item.minWidth = item.width;
+				if (!item.singleLine) item.singleLine = false;
+				if (!item.unresize) item.unresize = true;
+				if (!item.align) item.align = 'center';
+			}
+			if (item.toolbar) item.type = 'tool';
+			return item;
+		}
+
+		// 初始化列参数
+		if ('Array' !== isClass(opt.cols[0])) opt.cols = [opt.cols];
+
+		// 恢复cols参数初始状态
+		for (var m = 0; m < opt.cols.length; m++) {
+			for (var n = 0; n < opt.cols[m].length; n++) {
+				opt.cols[m][n].INIT_OK = undefined;
+				opt.cols[m][n].key = undefined;
+				opt.cols[m][n].colGroup = undefined;
+				opt.cols[m][n].HAS_PARENT = undefined;
+				opt.cols[m][n].parentKey = undefined;
+				opt.cols[m][n].PARENT_COL_INDEX = undefined;
+			}
+		}
+
+		// cols参数处理
+		var colArrays = [], colIndex = 0;
+		for (var i1 = 0; i1 < opt.cols.length; i1++) {
+			var item1 = opt.cols[i1];
+			for (var i2 = 0; i2 < item1.length; i2++) {
+				var item2 = item1[i2];
+				if (!item2) {
+					item1.splice(i2, 1);
+					continue;
+				}
+				item2 = initCol(item2);
+				// 合并单元格处理
+				item2.key = i1 + '-' + i2;
+				var CHILD_COLS = undefined;
+				if (item2.colGroup || item2.colspan > 1) {
+					item2.colGroup = true;
+					item2.type = 'group';
+					CHILD_COLS = [];
+					colIndex++;
+					var childIndex = 0;
+					for (var i22 = 0; i22 < opt.cols[i1 + 1].length; i22++) {
+						var item22 = $.extend({INIT_OK: true}, colDefaultOption, opt.cols[i1 + 1][i22]);
+						if (item22.HAS_PARENT || (childIndex > 1 && childIndex == item2.colspan)) {
+							opt.cols[i1 + 1][i22] = item22;
+							continue;
+						}
+						item22.HAS_PARENT = true;
+						item22.parentKey = i1 + '-' + i2;
+						item22.key = (i1 + 1) + '-' + i22;
+						item22.PARENT_COL_INDEX = colIndex;
+						item22 = initCol(item22);
+						CHILD_COLS.push(item22);
+						childIndex = childIndex + parseInt(item22.colspan > 1 ? item22.colspan : 1);
+						opt.cols[i1 + 1][i22] = item22;
+					}
+				}
+				item2.CHILD_COLS = CHILD_COLS;
+				if (!item2.PARENT_COL_INDEX) colArrays.push(item2);
+				opt.cols[i1][i2] = item2;
+			}
+		}
+		this.options = $.extend(true, {}, defaultOption, opt);
+		this.options.colArrays = colArrays;
+
+		// url加载模式转为reqData模式
+		if (this.options.url) {
+			this.options.reqData = function (data, callback) {
+				if (!that.options.where) that.options.where = {};
+				if (data) that.options.where[that.options.request.pidName] = data[that.options.tree.idName];
+				(that.options.useAdmin ? layui.admin : $).ajax({
+					url: that.options.url,
+					data: that.options.contentType && that.options.contentType.indexOf('application/json') === 0 ? JSON.stringify(that.options.where) : that.options.where,
+					headers: that.options.headers,
+					type: that.options.method,
+					dataType: 'json',
+					contentType: that.options.contentType,
+					success: function (res) {
+						if (that.options.parseData) res = that.options.parseData(res);
+						if (res.code == 0) callback(res.data);
+						else callback(res.msg || '加载失败');
+					},
+					error: function (xhr) {
+						callback(xhr.status + ' - ' + xhr.statusText);
+					}
+				});
+			};
+		} else if (this.options.data && this.options.data.length > 0 && this.options.tree.isPidData) {  // pid形式数据转children形式
+			this.options.data = tt.pidToChildren(this.options.data, this.options.tree.idName, this.options.tree.pidName, this.options.tree.childName);
+		}
+
+		// toolbar参数处理
+		if ('default' === this.options.toolbar) {
+			this.options.toolbar = [
+				'<div>',
+				'   <div class="ew-tree-table-tool-item" title="添加" lay-event="add">',
+				'      <i class="layui-icon layui-icon-add-1"></i>',
+				'   </div>',
+				'   <div class="ew-tree-table-tool-item" title="修改" lay-event="update">',
+				'      <i class="layui-icon layui-icon-edit"></i>',
+				'   </div>',
+				'   <div class="ew-tree-table-tool-item" title="删除" lay-event="delete">',
+				'      <i class="layui-icon layui-icon-delete"></i>',
+				'   </div>',
+				'</div>'
+			].join('');
+		}
+		if (this.options.defaultToolbar === undefined) this.options.defaultToolbar = ['filter', 'exports', 'print'];
+
+		// 自定义图标参数处理
+		if (typeof this.options.tree.getIcon === 'string') {
+			var icon = this.options.tree.getIcon;
+			this.options.tree.getIcon = function (d) {
+				if (icon !== 'ew-tree-icon-style2') return icon;
+				var haveChild = d[this.haveChildName];
+				if (haveChild !== undefined) {
+					haveChild = haveChild === true || haveChild === 'true';
+					if (this.haveChildReverse) haveChild = !haveChild;
+				} else if (d[this.childName]) haveChild = d[this.childName].length > 0;
+				if (haveChild) return '<i class="ew-tree-icon ew-tree-icon-folder"></i>';
+				else return '<i class="ew-tree-icon ew-tree-icon-file"></i>';
+			}
+		}
+	};
+	/** 初始化表格 */
+	TreeTable.prototype.init = function () {
+		var options = this.options;
+		var $elem = $(options.elem);  // 原始表格
+		var tbFilter = options.elem.substring(1);  // 表格的filter
+		// 第一次生成树表格dom
+		$elem.removeAttr('lay-filter');
+		if ($elem.next('.ew-tree-table').length === 0) {
+			$elem.css('display', 'none');
+			$elem.after([
+				'<div class="layui-form ew-tree-table" lay-filter="', tbFilter, '" style="', options.style || '', '">',
+				'   <div class="ew-tree-table-tool" style="display: none;"></div>',
+				'   <div class="ew-tree-table-head">',
+				'      <table class="layui-table"></table>',
+				'   </div>',
+				'   <div class="ew-tree-table-box">',
+				'      <table class="layui-table"></table>',
+				'      <div class="ew-tree-table-loading">',
+				'         <i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate layui-anim-loop"></i>',
+				'      </div>',
+				'      <div class="ew-tree-table-empty">', options.text.none || '', '</div>',
+				'   </div>',
+				'</div>'
+			].join(''));
+		}
+		// 获取各个组件
+		var components = this.getComponents();
+
+		// 基础参数设置
+		if (options.skin) components.$table.attr('lay-skin', options.skin);
+		if (options.size) components.$table.attr('lay-size', options.size);
+		if (options.even) components.$table.attr('lay-even', options.even);
+
+		// 头部工具栏
+		components.$toolbar.empty();
+		if (options.toolbar === false || options.toolbar === undefined) {
+			components.$toolbar.hide();
+		} else {
+			components.$toolbar.show();
+			if (typeof options.toolbar === 'string') {
+				laytpl($(options.toolbar).html()).render({}, function (html) {
+					components.$toolbar.html('<div style="display: inline-block;">' + html + '</div>');
+				});
+			}
+			var tbRights = ['<div class="ew-tree-table-tool-right">'];
+			for (var i = 0; i < options.defaultToolbar.length; i++) {
+				var tbItem;
+				if ('filter' === options.defaultToolbar[i]) {
+					tbItem = {title: '筛选', layEvent: 'LAYTABLE_COLS', icon: 'layui-icon-cols'};
+				} else if ('exports' === options.defaultToolbar[i]) {
+					tbItem = {title: '导出', layEvent: 'LAYTABLE_EXPORT', icon: 'layui-icon-export'};
+				} else if ('print' === options.defaultToolbar[i]) {
+					tbItem = {title: '打印', layEvent: 'LAYTABLE_PRINT', icon: 'layui-icon-print'};
+				} else {
+					tbItem = options.defaultToolbar[i];
+				}
+				if (tbItem) {
+					tbRights.push('<div class="ew-tree-table-tool-item"');
+					tbRights.push(' title="' + tbItem.title + '"');
+					tbRights.push(' lay-event="' + tbItem.layEvent + '">');
+					tbRights.push('<i class="layui-icon ' + tbItem.icon + '"></i></div>');
+				}
+			}
+			components.$toolbar.append(tbRights.join('') + '</div>');
+		}
+
+		// 固定宽度
+		if (options.width) {
+			components.$view.css('width', options.width);
+			components.$tHeadGroup.css('width', options.width);
+			components.$tBodyGroup.css('width', options.width);
+		}
+		// 表格尺寸设置
+		var colgroupHtml = this.resize(true);
+		// 生成thead
+		var headHtml = '<thead>' + this.renderBodyTh() + '</thead>';
+
+		// 渲染表头及空的表主体的结构
+		components.$tBodyGroup.children('style').remove();
+		if (options.height) {  // 固定表头
+			components.$tHead.html(colgroupHtml + headHtml);
+			components.$tBody.html(colgroupHtml + '<tbody></tbody>');
+			if (options.height.indexOf('full-') === 0) {  // 差值高度
+				var h = parseFloat(options.height.substring(5)) + components.$toolbar.outerHeight()
+					+ components.$tHeadGroup.outerHeight() + 1;
+				components.$tBodyGroup.append([
+					'<style>[lay-filter="', tbFilter, '"] .ew-tree-table-box {',
+					'   height: ', getPageHeight() - h, 'px;',
+					'   height: -moz-calc(100vh - ', h, 'px);',
+					'   height: -webkit-calc(100vh - ', h, 'px);',
+					'   height: calc(100vh - ', h, 'px);',
+					'}</style>'
+				].join(''));
+				components.$tBodyGroup.data('full', h);
+				components.$tBodyGroup.css('height', '');
+			} else {  // 固定高度
+				components.$tBodyGroup.css('height', options.height);
+				components.$tBodyGroup.data('full', '');
+			}
+			components.$tHeadGroup.show();
+		} else {
+			components.$tHeadGroup.hide();
+			var trH = {lg: 50, sm: 30, md: 38};
+			components.$tBodyGroup.append([
+				'<style>[lay-filter="', tbFilter, '"] .ew-tree-table-box:before {',
+				'   content: "";',
+				'   position: absolute;',
+				'   top: 0; left: 0; right: 0;',
+				'   height: ' + (trH[options.size || 'md'] * options.cols.length) + 'px;',
+				'   background-color: #f2f2f2;',
+				'   border-bottom: 1px solid #e6e6e6;',
+				'}</style>'
+			].join(''));
+			components.$tBody.html(colgroupHtml + headHtml + '<tbody></tbody>');
+		}
+		form.render('checkbox', tbFilter);  // 渲染表头的表单元素
+
+		// 默认隐藏列修正colspan
+		function patchHide($tr) {
+			var parentKey = $tr.data('parent'), pCol;
+			if (!parentKey) return;
+			var $parent = components.$table.children('thead').children('tr').children('[data-key="' + parentKey + '"]');
+			var colspan = $parent.attr('colspan') - 1;
+			$parent.attr('colspan', colspan);
+			if (colspan === 0) $parent.addClass('layui-hide');
+			patchHide($parent);
+		}
+
+		components.$table.children('thead').children('tr').children('th.layui-hide').each(function () {
+			patchHide($(this));
+		});
+
+		// 渲染数据
+		if (options.reqData) {  // 异步加载
+			this.options.data = undefined;
+			this.renderBodyAsync();
+		} else if (options.data && options.data.length > 0) {
+			this.renderBodyData(options.data);
+		} else {
+			components.$loading.hide();
+			components.$empty.show();
+		}
+	};
+
+	/** 绑定各项事件 */
+	TreeTable.prototype.bindEvents = function () {
+		var that = this;
+		var options = this.options;
+		var components = this.getComponents();
+		var $allBody = components.$table.children('tbody');
+
+		/* 行事件公共返回对象 */
+		var member = function (ext) {
+			// 获取行dom
+			var $tr = $(this);
+			if (!$tr.is('tr')) {
+				var $temp = $tr.parent('tr');
+				if ($temp.length > 0) $tr = $temp;
+				else $tr = $tr.parentsUntil('tr').last().parent();
+			}
+			var data = that.getDataByTr($tr);  // 行对应数据
+			var obj = {
+				tr: $tr,
+				data: data,
+				del: function () { // 删除行
+					var index = $tr.data('index');
+					var indent = parseInt($tr.data('indent'));
+					// 删除子级
+					$tr.nextAll('tr').each(function () {
+						if (parseInt($(this).data('indent')) <= indent) return false;
+						$(this).remove();
+					});
+					// 更新后面同辈的index
+					var indexLength = (typeof index === 'number' ? 1 : index.split('-').length);
+					$tr.nextAll('tr').each(function () {
+						var $this = $(this);
+						if (parseInt($this.data('indent')) < indent) return false;
+						var _index = $this.data('index').toString().split('-');
+						_index[indexLength - 1] = parseInt(_index[indexLength - 1]) - 1;
+						$this.data('index', _index.join('-'));
+					});
+					// 删除当前行
+					var $pTr = $tr.prevAll('tr');
+					that.del(undefined, index);
+					$tr.remove();
+					that.renderNumberCol();  // 渲染序号列
+					// 联动父级多选框
+					$pTr.each(function () {
+						var tInd = parseInt($(this).data('indent'));
+						if (tInd >= indent) return true;
+						that.checkParentCB($(this));
+						indent = tInd;
+					});
+					that.checkChooseAllCB();  // 联动全选框
+					if (options.data.length === 0) components.$empty.show();
+					updateFixedTbHead(components.$view);  // 更新滚动条补丁
+				},
+				update: function (fields) {  // 修改行
+					data = $.extend(true, data, fields);
+					var indent = parseInt($tr.data('indent'));
+					that.renderBodyTr(data, indent, undefined, $tr);  // 更新界面
+					form.render(null, components.filter);  // 渲染表单元素
+					that.renderNumberCol();  // 渲染序号列
+					// 联动父级多选框
+					$tr.prevAll('tr').each(function () {
+						var tInd = parseInt($(this).data('indent'));
+						if (tInd >= indent) return true;
+						that.checkParentCB($(this));
+						indent = tInd;
+					});
+					that.checkChooseAllCB();  // 联动全选框
+				}
+			};
+			return $.extend(obj, ext);
+		};
+
+		// 绑定折叠展开事件
+		$allBody.off('click.fold').on('click.fold', '.ew-tree-pack', function (e) {
+			layui.stope(e);
+			var $tr = $(this).parentsUntil('tr').last().parent();
+			if ($tr.hasClass('ew-tree-table-loading')) return; // 已是加载中
+			var haveChild = $tr.data('have-child');
+			if (haveChild !== true && haveChild !== 'true') return; // 子节点
+			var open = $tr.hasClass('ew-tree-table-open');
+			var data = that.getDataByTr($tr);
+			if (!open && !data[options.tree.childName]) {
+				that.renderBodyAsync(data, $tr);
+			} else {
+				data[options.tree.openName] = toggleRow($tr);
+			}
+		});
+
+		// 绑定lay-event事件
+		$allBody.off('click.tool').on('click.tool', '*[lay-event]', function (e) {
+			layui.stope(e);
+			var $this = $(this);
+			layui.event.call(this, MOD_NAME, 'tool(' + components.filter + ')', member.call(this, {
+				event: $this.attr('lay-event')
+			}));
+		});
+
+		// 绑定单选框事件
+		form.on('radio(' + components.radioFilter + ')', function (data) {
+			var d = that.getDataByTr($(data.elem).parentsUntil('tr').last().parent());
+			that.removeAllChecked();
+			d.LAY_CHECKED = true;  // 同时更新数据
+			d.LAY_INDETERMINATE = false;
+			layui.event.call(this, MOD_NAME, 'checkbox(' + components.filter + ')',
+				{checked: true, data: d, type: 'one'});
+		});
+
+		// 绑定复选框事件
+		form.on('checkbox(' + components.checkboxFilter + ')', function (data) {
+			var checked = data.elem.checked;
+			var $cb = $(data.elem);
+			var $layCb = $cb.next('.layui-form-checkbox');
+			// 如果是半选状态，点击全选
+			if (!checked && $cb.hasClass('ew-form-indeterminate')) {
+				checked = true;
+				$cb.prop('checked', checked);
+				$layCb.addClass('layui-form-checked');
+				$cb.removeClass('ew-form-indeterminate');
+			}
+			var $tr = $cb.parentsUntil('tr').last().parent();
+			var d = that.getDataByTr($tr);
+			d.LAY_CHECKED = checked;  // 同时更新数据
+			d.LAY_INDETERMINATE = false;
+			// 联动操作
+			if (d[options.tree.childName] && d[options.tree.childName].length > 0) {
+				that.checkSubCB($tr, checked);  // 联动子级
+			}
+			var indent = parseInt($tr.data('indent'));
+			$tr.prevAll('tr').each(function () {
+				var tInd = parseInt($(this).data('indent'));
+				if (tInd < indent) {
+					that.checkParentCB($(this));  // 联动父级
+					indent = tInd;
+				}
+			});
+			that.checkChooseAllCB();  // 联动全选框
+			// 回调事件
+			layui.event.call(this, MOD_NAME, 'checkbox(' + components.filter + ')',
+				{checked: checked, data: d, type: 'more'});
+		});
+
+		// 绑定全选复选框事件
+		form.on('checkbox(' + components.chooseAllFilter + ')', function (data) {
+			var checked = data.elem.checked;
+			var $cb = $(data.elem);
+			var $layCb = $cb.next('.layui-form-checkbox');
+			if (!options.data || options.data.length === 0) {  // 如果数据为空
+				$cb.prop('checked', false);
+				$layCb.removeClass('layui-form-checked');
+				$cb.removeClass('ew-form-indeterminate');
+				return;
+			}
+			// 如果是半选状态，点击全选
+			if (!checked && $cb.hasClass('ew-form-indeterminate')) {
+				checked = true;
+				$cb.prop('checked', checked);
+				$layCb.addClass('layui-form-checked');
+				$cb.removeClass('ew-form-indeterminate');
+			}
+			layui.event.call(this, MOD_NAME, 'checkbox(' + components.filter + ')', {checked: checked, type: 'all'});
+			that.checkSubCB(components.$tBody.children('tbody'), checked);  // 联动操作
+		});
+
+		// 绑定行单击事件
+		$allBody.off('click.row').on('click.row', 'tr', function () {
+			layui.event.call(this, MOD_NAME, 'row(' + components.filter + ')', member.call(this, {}));
+		});
+
+		// 绑定行双击事件
+		$allBody.off('dblclick.rowDouble').on('dblclick.rowDouble', 'tr', function () {
+			layui.event.call(this, MOD_NAME, 'rowDouble(' + components.filter + ')', member.call(this, {}));
+		});
+
+		// 绑定单元格点击事件
+		$allBody.off('click.cell').on('click.cell', 'td', function (e) {
+			var $td = $(this);
+			var type = $td.data('type');
+			// 判断是否是复选框、单选框列
+			if (type === 'checkbox' || type === 'radio') return layui.stope(e);
+			var edit = $td.data('edit');
+			var field = $td.data('field');
+			if (edit) {  // 开启了单元格编辑
+				layui.stope(e);
+				if ($allBody.find('.ew-tree-table-edit').length > 0) return;
+				var index = $td.data('index');
+				var indent = $td.find('.ew-tree-table-indent').length;
+				var d = that.getDataByTr($td.parent());
+				if ('text' === edit || 'number' === edit) {  // 文本框
+					var $input = $('<input type="' + edit + '" class="layui-input ew-tree-table-edit"/>');
+					$input[0].value = d[field];
+					$td.append($input);
+					$input.focus();
+					$input.blur(function () {
+						var value = $(this).val();
+						if (value == d[field]) return $(this).remove();
+						var rs = layui.event.call(this, MOD_NAME, 'edit(' + components.filter + ')', member.call(this,
+							{value: value, field: field}));
+						if (rs === false) {
+							$(this).addClass('layui-form-danger');
+							$(this).focus();
+						} else {
+							d[field] = value;  // 同步更新数据
+							var keys = $td.data('key').split('-');
+							that.renderBodyTd(d, indent, index, $td, options.cols[keys[0]][keys[1]]);  // 更新单元格
+						}
+					});
+				} else {
+					console.error('不支持的单元格编辑类型:' + edit);
+				}
+			} else {  // 回调单元格点击事件
+				var rs = layui.event.call(this, MOD_NAME, 'cell(' + components.filter + ')', member.call(this,
+					{td: $td, field: field}));
+				if (rs === false) layui.stope(e);
+			}
+		});
+
+		// 绑定单元格双击事件
+		$allBody.off('dblclick.cellDouble').on('dblclick.cellDouble', 'td', function (e) {
+			var $td = $(this);
+			var type = $td.data('type');
+			// 判断是否是复选框、单选框列
+			if (type === 'checkbox' || type === 'radio') return layui.stope(e);
+			var edit = $td.data('edit');
+			var field = $td.data('field');
+			if (edit) return layui.stope(e);  // 开启了单元格编辑
+			// 回调单元格双击事件
+			var rs = layui.event.call(this, MOD_NAME, 'cellDouble(' + components.filter + ')', member.call(this,
+				{td: $td, field: field}));
+			if (rs === false) layui.stope(e);
+		});
+
+		// 绑定头部工具栏事件
+		components.$toolbar.off('click.toolbar').on('click.toolbar', '*[lay-event]', function (e) {
+			layui.stope(e);
+			var $this = $(this);
+			var event = $this.attr('lay-event');
+			if ('LAYTABLE_COLS' === event) that.toggleCol();
+			else if ('LAYTABLE_EXPORT' === event) that.exportData('show');
+			else if ('LAYTABLE_PRINT' === event) that.printTable();
+			else layui.event.call(this, MOD_NAME, 'toolbar(' + components.filter + ')', {event: event, elem: $this});
+		});
+
+		// 同步滚动条
+		components.$tBodyGroup.on('scroll', function () {
+			var $this = $(this);
+			components.$tHeadGroup.scrollLeft($this.scrollLeft());
+		});
+
+		// 导出数据
+		components.$toolbar.off('click.export').on('click.export', '.layui-table-tool-panel>[data-type]', function () {
+			var type = $(this).data('type');
+			if ('csv' === type || 'xls' === type) that.exportData(type);
+		});
+		components.$toolbar.off('click.panel').on('click.panel', '.layui-table-tool-panel', function (e) {
+			layui.stope(e);
+		});
+
+		// 筛选列
+		form.on('checkbox(' + components.colsToggleFilter + ')', function (data) {
+			that.toggleCol(data.elem.checked, undefined, data.value);
+		});
+
+	};
+
+	/** 获取各个组件 */
+	TreeTable.prototype.getComponents = function () {
+		var $view = $(this.options.elem).next('.ew-tree-table');  // 容器
+		var filter = $view.attr('lay-filter');                    // 容器filter
+		var $tHeadGroup = $view.children('.ew-tree-table-head');  // 表头部分容器
+		var $tBodyGroup = $view.children('.ew-tree-table-box');   // 主体部分容器
+		return {
+			$view: $view,
+			filter: filter,
+			$tHeadGroup: $tHeadGroup,
+			$tBodyGroup: $tBodyGroup,
+			$tHead: $tHeadGroup.children('.layui-table'),                // 表头表格
+			$tBody: $tBodyGroup.children('.layui-table'),                // 主体表格
+			$table: $view.find('.layui-table'),                          // 所有表格
+			$toolbar: $view.children('.ew-tree-table-tool'),             // 头部工具栏
+			$empty: $tBodyGroup.children('.ew-tree-table-empty'),        // 空视图
+			$loading: $tBodyGroup.children('.ew-tree-table-loading'),    // 加载视图
+			checkboxFilter: 'ew_tb_checkbox_' + filter,                  // 复选框filter
+			radioFilter: 'ew_tb_radio_' + filter,                        // 单选框filter
+			chooseAllFilter: 'ew_tb_choose_all_' + filter,               // 全选按钮filter
+			colsToggleFilter: 'ew_tb_toggle_cols' + filter               // 筛选列的filter
+		};
+	};
+
+	/**
+	 * 遍历表头
+	 * @param callback
+	 * @param obj
+	 */
+	TreeTable.prototype.eachCols = function (callback, obj) {
+		if (!obj) obj = this.options.colArrays;
+		for (var i = 0; i < obj.length; i++) {
+			var item = obj[i];
+			callback && callback(i, item);
+			if (item.CHILD_COLS) this.eachCols(callback, item.CHILD_COLS);
+		}
+	};
+
+	/**
+	 * 遍历数据
+	 * @param callback
+	 * @param data
+	 */
+	TreeTable.prototype.eachData = function (callback, data) {
+		if (!data) data = this.options.data;
+		for (var i = 0; i < data.length; i++) {
+			var item = data[i];
+			callback && callback(i, item);
+			if (item[this.options.tree.childName]) this.eachData(callback, item[this.options.tree.childName]);
+		}
+	};
+
+	/**
+	 * 异步加载渲染
+	 * @param d 父级数据
+	 * @param $tr 父级dom
+	 */
+	TreeTable.prototype.renderBodyAsync = function (d, $tr) {
+		var that = this;
+		var options = this.options;
+		var components = this.getComponents();
+		// 显示loading
+		if ($tr) {
+			$tr.addClass('ew-tree-table-loading');
+			$tr.find('.ew-tree-pack').children('.ew-tree-table-arrow').addClass('layui-anim layui-anim-rotate layui-anim-loop');
+		} else {
+			components.$empty.hide();
+			if (options.data && options.data.length > 0) components.$loading.addClass('ew-loading-float');
+			components.$loading.show();
+		}
+		// 请求数据
+		options.reqData(d, function (data) {
+			if (typeof data !== 'string' && data && data.length > 0 && options.tree.isPidData) {
+				data = tt.pidToChildren(data, options.tree.idName, options.tree.pidName, options.tree.childName);
+			}
+			that.renderBodyData(data, d, $tr);  // 渲染内容
+		});
+	};
+
+	/**
+	 * 根据数据渲染body
+	 * @param data  数据集合
+	 * @param d 父级数据
+	 * @param $tr 父级dom
+	 */
+	TreeTable.prototype.renderBodyData = function (data, d, $tr) {
+		var msg;
+		if (typeof data === 'string') {
+			msg = data;
+			data = [];
+		}
+		var that = this;
+		var options = this.options;
+		var components = this.getComponents();
+		// 更新到数据
+		if (d === undefined) options.data = data;
+		else d[options.tree.childName] = data;
+		var indent;
+		if ($tr) {
+			indent = parseInt($tr.data('indent')) + 1;
+			d[options.tree.openName] = true;
+		}
+		var htmlStr = this.renderBody(data, indent, d);
+		if ($tr) {
+			// 移除旧dom
+			$tr.nextAll('tr').each(function () {
+				if (parseInt($(this).data('indent')) <= (indent - 1)) return false;
+				$(this).remove();
+			});
+			// 渲染新dom
+			$tr.after(htmlStr).addClass('ew-tree-table-open');
+		} else {
+			components.$tBody.children('tbody').html(htmlStr);
+		}
+		form.render(null, components.filter);  // 渲染表单元素
+		this.renderNumberCol();  // 渲染序号列
+		if ($tr) {
+			// 更新父级复选框状态
+			this.checkParentCB($tr);
+			$tr.prevAll('tr').each(function () {
+				var tInd = parseInt($(this).data('indent'));
+				if (tInd < (indent - 1)) {
+					that.checkParentCB($(this));
+					indent = tInd + 1;
+				}
+			});
+			// 移除loading
+			$tr.removeClass('ew-tree-table-loading');
+			var $arrow = $tr.find('.ew-tree-pack').children('.ew-tree-table-arrow');
+			$arrow.removeClass('layui-anim layui-anim-rotate layui-anim-loop');
+			if (msg) {  // 加载失败
+				$tr.removeClass('ew-tree-table-open');
+			} else if (data && data.length === 0) {  // 无子集
+				d[options.tree.haveChildName] = !!options.tree.haveChildReverse;
+				$tr.data('have-child', false);
+				$arrow.addClass('ew-tree-table-arrow-hide');
+				$arrow.next('.ew-tree-icon').after(options.tree.getIcon(d)).remove();
+			}
+		} else {
+			// 移除loading
+			components.$loading.hide();
+			components.$loading.removeClass('ew-loading-float');
+			// 显示空视图
+			if (data && data.length > 0) {
+				components.$empty.hide();
+			} else {
+				components.$empty.show();
+				if (msg) components.$empty.text(msg);
+				else components.$empty.html(options.text.none);
+			}
+		}
+		this.checkChooseAllCB();  // 联动全选框
+		updateFixedTbHead(components.$view);  // 滚动条补丁
+		options.done && options.done(data);
+	};
+
+	/**
+	 * 递归渲染表格主体部分
+	 * @param data 数据列表
+	 * @param indent 缩进大小
+	 * @param parent 父级
+	 * @param h 父级是否隐藏
+	 * @returns {string}
+	 */
+	TreeTable.prototype.renderBody = function (data, indent, parent, h) {
+		var options = this.options;
+		if (!indent) indent = 0;
+		var html = '';
+		if (!data || data.length === 0) return html;
+		var hide = parent ? !parent[options.tree.openName] : undefined;
+		if (h) hide = h;//当所有父级存在隐藏时，隐藏所有子集
+		for (var i = 0; i < data.length; i++) {
+			var d = data[i];
+			d.LAY_INDEX = (parent ? parent.LAY_INDEX + '-' : '') + i;
+			html += this.renderBodyTr(d, indent, hide);
+			// 递归渲染子集
+			html += this.renderBody(d[options.tree.childName], indent + 1, d, h);
+		}
+		return html;
+	};
+
+	/**
+	 * 渲染每一行数据
+	 * @param d 行数据
+	 * @param indent 缩进大小
+	 * @param hide 是否隐藏
+	 * @param $tr
+	 * @returns {string}
+	 */
+	TreeTable.prototype.renderBodyTr = function (d, indent, hide, $tr) {
+		var that = this;
+		var options = this.options;
+		if (!indent) indent = 0;
+		var haveChild = d[options.tree.haveChildName];
+		if (options.tree.haveChildReverse) haveChild = !haveChild;
+		if (haveChild === undefined) haveChild = d[options.tree.childName] && d[options.tree.childName].length > 0;
+		if ($tr) {
+			$tr.data('have-child', haveChild ? 'true' : 'false');
+			$tr.data('indent', indent);
+			$tr.removeClass('ew-tree-table-loading');
+		}
+		var html = '<tr';
+		var classNames = '';
+		if (haveChild && d[options.tree.openName]) classNames += 'ew-tree-table-open';
+		if (hide) classNames += 'ew-tree-tb-hide';
+		html += (' class="' + classNames + '"');
+		if (haveChild) html += (' data-have-child="' + haveChild + '"');
+		html += (' data-index="' + d.LAY_INDEX + '"');
+		html += (' data-indent="' + indent + '">');
+		var index = 0;
+		this.eachCols(function (i, col) {
+			if (col.colGroup) return;
+			html += that.renderBodyTd(d, indent, index, $tr ? $tr.children('td').eq(index) : undefined, col);
+			index++;
+		});
+		html += '</tr>';
+		return html;
+	};
+
+	/**
+	 * 渲染每一个单元格数据
+	 * @param d 行数据
+	 * @param indent 缩进大小
+	 * @param index 第几列
+	 * @param $td
+	 * @param col
+	 * @returns {string}
+	 */
+	TreeTable.prototype.renderBodyTd = function (d, indent, index, $td, col) {
+		if (!col || col.colGroup) return '';
+		var options = this.options;
+		var components = this.getComponents();
+		if (!indent) indent = 0;
+		// 内容填充
+		var content = '', cell = '', icon = '';
+		if (col.type === 'numbers') {  // 序号列
+			content = '<span class="ew-tree-table-numbers"></span>';
+		} else if (col.type === 'checkbox') {  // 复选框列
+			content = [
+				'<input type="checkbox"', d.LAY_CHECKED ? ' checked="checked"' : '',
+				' lay-filter="', components.checkboxFilter, '"',
+				' lay-skin="primary" class="ew-tree-table-checkbox',
+				d.LAY_INDETERMINATE ? ' ew-form-indeterminate' : '', '" />'
+			].join('');
+		} else if (col.type === 'radio') {  // 单选框列
+			content = [
+				'<input type="radio"', d.LAY_CHECKED ? ' checked="checked"' : '',
+				' lay-filter="', components.radioFilter, '"',
+				' name="', components.radioFilter, '"',
+				' class="ew-tree-table-radio" />'
+			].join('');
+		} else if (col.templet) {  // 自定义模板
+			if (typeof col.templet === 'function') {
+				content = col.templet(d);
+			} else if (typeof col.templet === 'string') {
+				laytpl($(col.templet).html()).render(d, function (html) {
+					content = html;
+				});
+			}
+		} else if (col.toolbar) {  // 操作列
+			if (typeof col.toolbar === 'function') {
+				content = col.toolbar(d);
+			} else if (typeof col.toolbar === 'string') {
+				laytpl($(col.toolbar).html()).render(d, function (html) {
+					content = html;
+				});
+			}
+		} else if (col.field && d[col.field] !== undefined && d[col.field] !== null) {  // 普通字段
+			content = util.escape(d[col.field] === 0 ? '0' : d[col.field]);
+		}
+		// 图标列处理
+		if (index === options.tree.iconIndex) {
+			// 缩进
+			for (var i = 0; i < indent; i++) icon += '<span class="ew-tree-table-indent"></span>';
+			icon += '<span class="ew-tree-pack">';
+			// 加箭头
+			var haveChild = d[options.tree.haveChildName];
+			if (options.tree.haveChildReverse) haveChild = !haveChild;
+			if (haveChild === undefined) haveChild = d[options.tree.childName] && d[options.tree.childName].length > 0;
+			icon += ('<i class="ew-tree-table-arrow layui-icon' + (haveChild ? '' : ' ew-tree-table-arrow-hide'));
+			icon += (' ' + (options.tree.arrowType || '') + '"></i>');
+			// 加图标
+			icon += options.tree.getIcon(d);
+			content = '<span>' + content + '</span>';
+			if (options.tree.onlyIconControl) content = icon + '</span>' + content;
+			else content = icon + content + '</span>';
+		}
+		cell = [
+			'<div class="ew-tree-table-cell', col.singleLine === undefined || col.singleLine ? ' single-line' : '', '"',
+			col.align ? ' align="' + col.align + '"' : '',
+			'>',
+			'   <div class="ew-tree-table-cell-content">', content, '</div>',
+			'   <i class="layui-icon layui-icon-close ew-tree-tips-c"></i>',
+			'   <div class="layui-table-grid-down" style="display: none;"><i class="layui-icon layui-icon-down"></i></div>',
+			'</div>'
+		].join('');
+
+		if ($td) $td.html(cell);
+
+		var html = '<td';
+		if (col.field) html += (' data-field="' + col.field + '"');
+		if (col.edit) html += (' data-edit="' + col.edit + '"');
+		if (col.type) html += (' data-type="' + col.type + '"');
+		if (col.key) html += (' data-key="' + col.key + '"');
+		if (col.style) html += (' style="' + col.style + '"');
+		if (col['class']) html += (' class="' + col['class'] + (col.hide ? ' layui-hide' : '') + '"');
+		else if (col.hide) html += (' class="layui-hide"');
+		html += ('>' + cell + '</td>');
+		return html;
+	};
+
+	/**
+	 * 渲染表头
+	 * @returns {string}
+	 */
+	TreeTable.prototype.renderBodyTh = function () {
+		var options = this.options;
+		var components = this.getComponents();
+		var html = [];
+		$.each(options.cols, function (i1, item1) {
+			html.push('<tr>');
+			$.each(item1, function (i2, item2) {
+				html.push('<th');
+				if (item2.colspan) html.push(' colspan="' + item2.colspan + '"');
+				if (item2.rowspan) html.push(' rowspan="' + item2.rowspan + '"');
+				if (item2.type) html.push(' data-type="' + item2.type + '"');
+				if (item2.key) html.push(' data-key="' + item2.key + '"');
+				if (item2.parentKey) html.push(' data-parent="' + item2.parentKey + '"');
+				if (item2.hide) html.push(' class="layui-hide"');
+				html.push('>');
+				html.push('<div class="ew-tree-table-cell' + (item2.singleLine === undefined || item2.singleLine ? ' single-line' : '') + '"');
+				if (item2.thAlign || item2.align) html.push(' align="' + (item2.thAlign || item2.align) + '"');
+				html.push('>');
+				html.push('<div class="ew-tree-table-cell-content">');
+				// 标题
+				var ca = '<input type="checkbox" lay-filter="' + components.chooseAllFilter + '" lay-skin="primary" class="ew-tree-table-checkbox"/>';
+				if (item2.type === 'checkbox') html.push(ca);
+				else html.push(item2.title || '');
+				html.push('</div><i class="layui-icon layui-icon-close ew-tree-tips-c"></i>');
+				html.push('<div class="layui-table-grid-down" style="display: none;"><i class="layui-icon layui-icon-down"></i></div></div>');
+				// 列宽拖拽
+				if (!item2.colGroup && !item2.unresize) html.push('<span class="ew-tb-resize"></span>');
+				html.push('</th>');
+			});
+			html.push('</tr>');
+		});
+		return html.join('');
+	};
+
+	/** 重置表格尺寸 */
+	TreeTable.prototype.resize = function (returnColgroup) {
+		// 计算表格宽度、最小宽度、百分比宽度
+		var options = this.options;
+		var components = this.getComponents();
+		var minWidth = 1, width = 1, needSetWidth = true, mwPercent = 0;
+		this.eachCols(function (i, item) {
+			if (item.colGroup || item.hide) return;
+			if (item.width) {
+				width += (item.width + 1);
+				if (item.minWidth) {
+					if (item.width < item.minWidth) item.width = item.minWidth;
+				} else if (item.width < options.cellMinWidth) item.width = options.cellMinWidth;
+			} else needSetWidth = false;
+			if (item.width) minWidth += (item.width + 1);
+			else if (item.minWidth) {
+				minWidth += (item.minWidth + 1);
+				mwPercent += item.minWidth;
+			} else {
+				minWidth += (options.cellMinWidth + 1);
+				mwPercent += options.cellMinWidth;
+			}
+		});
+		if (minWidth) {
+			components.$tHead.css('min-width', minWidth);
+			components.$tBody.css('min-width', minWidth);
+		} else {
+			components.$tHead.css('min-width', 'auto');
+			components.$tBody.css('min-width', 'auto');
+		}
+		if (needSetWidth) {
+			components.$tHead.css('width', width);
+			components.$tBody.css('width', width);
+		} else {
+			components.$tHead.css('width', '100%');
+			components.$tBody.css('width', '100%');
+		}
+
+		// 生成colgroup
+		var colgroupHtml = [];
+		this.eachCols(function (i, item) {
+			if (item.colGroup || item.hide) return;
+			colgroupHtml.push('<col');
+			if (item.width) colgroupHtml.push(' width="' + item.width + '"');
+			else if (item.minWidth) colgroupHtml.push(' width="' + (item.minWidth / mwPercent * 100).toFixed(2) + '%"');
+			else colgroupHtml.push(' width="' + (options.cellMinWidth / mwPercent * 100).toFixed(2) + '%"');
+			if (item.type) colgroupHtml.push(' data-type="' + item.type + '"');
+			if (item.key) colgroupHtml.push(' data-key="' + item.key + '"');
+			colgroupHtml.push('/>');
+		});
+		colgroupHtml = colgroupHtml.join('');
+		if (returnColgroup) return '<colgroup>' + colgroupHtml + '</colgroup>';
+		components.$table.children('colgroup').html(colgroupHtml);
+	};
+
+	/** 获取行对应数据 */
+	TreeTable.prototype.getDataByTr = function ($tr) {
+		var data, index;
+		if (typeof $tr !== 'string' && typeof $tr !== 'number') {
+			if ($tr) index = $tr.data('index');
+		} else index = $tr;
+		if (index === undefined) return;
+		if (typeof index === 'number') index = [index];
+		else index = index.split('-');
+		for (var i = 0; i < index.length; i++) {
+			if (data) data = data[this.options.tree.childName][index[i]];
+			else data = this.options.data[index[i]];
+		}
+		return data;
+	};
+
+	/**
+	 * 联动子级复选框状态
+	 * @param $tr 当前tr的dom
+	 * @param checked
+	 */
+	TreeTable.prototype.checkSubCB = function ($tr, checked) {
+		var that = this;
+		var components = this.getComponents();
+		var indent = -1, $trList;
+		if ($tr.is('tbody')) {
+			$trList = $tr.children('tr');
+		} else {
+			indent = parseInt($tr.data('indent'));
+			$trList = $tr.nextAll('tr');
+		}
+		$trList.each(function () {
+			if (parseInt($(this).data('indent')) <= indent) return false;
+			var $cb = $(this).children('td').find('input[lay-filter="' + components.checkboxFilter + '"]');
+			$cb.prop('checked', checked);
+			$cb.removeClass('ew-form-indeterminate');
+			if (checked) $cb.next('.layui-form-checkbox').addClass('layui-form-checked');
+			else $cb.next('.layui-form-checkbox').removeClass('layui-form-checked');
+			var d = that.getDataByTr($(this));
+			d.LAY_CHECKED = checked;  // 同步更新数据
+			d.LAY_INDETERMINATE = false;
+		});
+	};
+
+	/**
+	 * 联动父级复选框状态
+	 * @param $tr 父级的dom
+	 */
+	TreeTable.prototype.checkParentCB = function ($tr) {
+		var options = this.options;
+		var components = this.getComponents();
+		var d = this.getDataByTr($tr);
+		var ckNum = 0, unCkNum = 0;
+		if (d[options.tree.childName]) {
+			function checkNum(data) {
+				for (var i = 0; i < data.length; i++) {
+					if (data[i].LAY_CHECKED) ckNum++;
+					else unCkNum++;
+					if (data[i][options.tree.childName]) checkNum(data[i][options.tree.childName]);
+				}
+			}
+
+			checkNum(d[options.tree.childName]);
+		}
+		var $cb = $tr.children('td').find('input[lay-filter="' + components.checkboxFilter + '"]');
+		if (ckNum > 0 && unCkNum === 0) {  // 全选
+			$cb.prop('checked', true);
+			$cb.removeClass('ew-form-indeterminate');
+			$cb.next('.layui-form-checkbox').addClass('layui-form-checked');
+			d.LAY_CHECKED = true;  // 同步更新数据
+			d.LAY_INDETERMINATE = false;
+		} else if (ckNum === 0 && unCkNum > 0) {  // 全不选
+			$cb.prop('checked', false);
+			$cb.removeClass('ew-form-indeterminate');
+			$cb.next('.layui-form-checkbox').removeClass('layui-form-checked');
+			d.LAY_CHECKED = false;  // 同步更新数据
+			d.LAY_INDETERMINATE = false;
+		} else if (ckNum > 0 && unCkNum > 0) {  // 半选
+			$cb.prop('checked', true);
+			$cb.data('indeterminate', 'true');
+			$cb.addClass('ew-form-indeterminate');
+			$cb.next('.layui-form-checkbox').addClass('layui-form-checked');
+			d.LAY_CHECKED = true;  // 同步更新数据
+			d.LAY_INDETERMINATE = true;
+		}
+	};
+
+	/** 联动全选复选框 */
+	TreeTable.prototype.checkChooseAllCB = function () {
+		var options = this.options;
+		var components = this.getComponents();
+		var ckNum = 0, unCkNum = 0;
+
+		function checkNum(data) {
+			for (var i = 0; i < data.length; i++) {
+				if (data[i].LAY_CHECKED) ckNum++;
+				else unCkNum++;
+				if (data[i][options.tree.childName]) checkNum(data[i][options.tree.childName]);
+			}
+		}
+
+		checkNum(options.data);
+
+		var $cb = components.$view.find('input[lay-filter="' + components.chooseAllFilter + '"]');
+		if (ckNum > 0 && unCkNum === 0) {  // 全选
+			$cb.prop('checked', true);
+			$cb.removeClass('ew-form-indeterminate');
+			$cb.next('.layui-form-checkbox').addClass('layui-form-checked');
+		} else if ((ckNum === 0 && unCkNum > 0) || (ckNum === 0 && unCkNum === 0)) {  // 全不选
+			$cb.prop('checked', false);
+			$cb.removeClass('ew-form-indeterminate');
+			$cb.next('.layui-form-checkbox').removeClass('layui-form-checked');
+		} else if (ckNum > 0 && unCkNum > 0) {  // 半选
+			$cb.prop('checked', true);
+			$cb.addClass('ew-form-indeterminate');
+			$cb.next('.layui-form-checkbox').addClass('layui-form-checked');
+		}
+	};
+
+	/** 填充序号列 */
+	TreeTable.prototype.renderNumberCol = function () {
+		this.getComponents().$tBody.children('tbody').children('tr').each(function (i) {
+			$(this).children('td').find('.ew-tree-table-numbers').text(i + 1);
+		});
+	};
+
+	/** 根据id获取tr的index */
+	TreeTable.prototype.getIndexById = function (id) {
+		var options = this.options;
+
+		function each(data, pi) {
+			for (var i = 0; i < data.length; i++) {
+				if (data[i][options.tree.idName] === id) return pi !== undefined ? pi + '-' + i : i;
+				if (data[i][options.tree.childName]) {
+					var res = each(data[i][options.tree.childName], pi !== undefined ? pi + '-' + i : i);
+					//值不为undefined才return
+					if (res) return res;
+				}
+			}
+		}
+
+		return each(options.data);
+	};
+
+	/** 展开指定行 */
+	TreeTable.prototype.expand = function (id, cascade) {
+		var components = this.getComponents();
+		var $tr = components.$table.children('tbody').children('tr[data-index="' + this.getIndexById(id) + '"]');
+		if (!$tr.hasClass('ew-tree-table-open')) $tr.children('td').find('.ew-tree-pack').trigger('click');
+		if (cascade === false) return;
+		// 联动父级
+		var indent = parseInt($tr.data('indent'));
+		$tr.prevAll('tr').each(function () {
+			var tInd = parseInt($(this).data('indent'));
+			if (tInd < indent) {
+				if (!$(this).hasClass('ew-tree-table-open')) {
+					$(this).children('td').find('.ew-tree-pack').trigger('click');
+				}
+				indent = tInd;
+			}
+		});
+	};
+
+	/** 折叠指定行 */
+	TreeTable.prototype.fold = function (id) {
+		var components = this.getComponents();
+		var $tr = components.$table.children('tbody').children('tr[data-index="' + this.getIndexById(id) + '"]');
+		if ($tr.hasClass('ew-tree-table-open')) $tr.children('td').find('.ew-tree-pack').trigger('click');
+	};
+
+	/** 全部展开 */
+	TreeTable.prototype.expandAll = function () {
+		this.getComponents().$table.children('tbody').children('tr').each(function () {
+			if (!$(this).hasClass('ew-tree-table-open')) $(this).children('td').find('.ew-tree-pack').trigger('click');
+		});
+	};
+
+	/** 全部折叠 */
+	TreeTable.prototype.foldAll = function () {
+		this.getComponents().$table.children('tbody').children('tr').each(function () {
+			if ($(this).hasClass('ew-tree-table-open')) $(this).children('td').find('.ew-tree-pack').trigger('click');
+		});
+	};
+
+	/** 获取当前数据 */
+	TreeTable.prototype.getData = function () {
+		return this.options.data;
+	};
+
+	/** 重载表格 */
+	TreeTable.prototype.reload = function (opt) {
+		this.initOptions(this.options ? $.extend(true, this.options, opt) : opt);
+		this.init();  // 初始化表格
+		this.bindEvents();  // 绑定事件
+	};
+
+	/** 获取当前选中行 */
+	TreeTable.prototype.checkStatus = function (needIndeterminate) {
+		if (needIndeterminate === undefined) needIndeterminate = true;
+		var list = [];
+		this.eachData(function (i, item) {
+			if ((needIndeterminate || !item.LAY_INDETERMINATE) && item.LAY_CHECKED)
+				list.push($.extend({isIndeterminate: item.LAY_INDETERMINATE}, item));
+		});
+		return list;
+	};
+
+	/** 设置复/单选框选中 */
+	TreeTable.prototype.setChecked = function (ids) {
+		var that = this;
+		var components = this.getComponents();
+		var $radio = components.$table.find('input[lay-filter="' + components.radioFilter + '"]');
+		if ($radio.length > 0) {  // 开启了单选框
+			$radio.each(function () {
+				var d = that.getDataByTr($(this).parentsUntil('tr').parent());
+				if (d && ids[ids.length - 1] == d[that.options.tree.idName]) {
+					$(this).next('.layui-form-radio').trigger('click');
+					return false;
+				}
+			});
+		} else {  // 开启了复选框
+			components.$table.find('input[lay-filter="' + components.checkboxFilter + '"]').each(function () {
+				var $cb = $(this);
+				var $layCb = $cb.next('.layui-form-checkbox');
+				var checked = $cb.prop('checked');
+				var indeterminate = $cb.hasClass('ew-form-indeterminate');
+				var d = that.getDataByTr($cb.parentsUntil('tr').parent());
+				for (var i = 0; i < ids.length; i++) {
+					if (d && ids[i] == d[that.options.tree.idName]) {
+						if (d[that.options.tree.childName] && d[that.options.tree.childName].length > 0) continue;
+						if (!checked || indeterminate) $layCb.trigger('click');
+					}
+				}
+			});
+		}
+	};
+
+	/** 移除全部选中 */
+	TreeTable.prototype.removeAllChecked = function () {
+		this.checkSubCB(this.getComponents().$table.children('tbody'), false);
+	};
+
+	/** 导出 */
+	TreeTable.prototype.exportData = function (type) {
+		var components = this.getComponents();
+		if ('show' === type) {
+			components.$toolbar.find('.layui-table-tool-panel').remove();
+			components.$toolbar.find('[lay-event="LAYTABLE_EXPORT"]').append([
+				'<ul class="layui-table-tool-panel">',
+				'   <li data-type="csv">导出到 Csv 文件</li>',
+				'   <li data-type="xls">导出到 Excel 文件</li>',
+				'</ul>'
+			].join(''));
+		} else {
+			if (device.ie) return layer.msg('不支持ie导出');
+			if (!type) type = 'xls';
+			var head = [], body = [];
+			this.eachCols(function (i, item) {
+				if (item.type !== 'normal' || item.hide) return;
+				head.push(item.title || '');
+			});
+			components.$tBody.children('tbody').children('tr').each(function () {
+				var items = [];
+				$(this).children('td').each(function () {
+					var $this = $(this);
+					if ($this.data('type') !== 'normal' || $this.hasClass('layui-hide')) return true;
+					items.push($this.text().trim().replace(/,/g, '，'));
+				});
+				body.push(items.join(','));
+			});
+			// 创建下载文件的a标签
+			var alink = document.createElement('a');
+			var content = encodeURIComponent(head.join(',') + '\r\n' + body.join('\r\n'));
+			var contentType = ({csv: 'text/csv', xls: 'application/vnd.ms-excel'})[type];
+			alink.href = 'data:' + contentType + ';charset=utf-8,\ufeff' + content;
+			alink.download = (this.options.title || 'table') + '.' + type;
+			document.body.appendChild(alink);
+			alink.click();
+			document.body.removeChild(alink);
+		}
+	};
+
+	/** 打印 */
+	TreeTable.prototype.printTable = function () {
+		var components = this.getComponents();
+		var head = components.$tHead.children('thead').html();
+		if (!head) head = components.$tBody.children('thead').html();
+		var body = components.$tBody.children('tbody').html();
+		var colgroup = components.$tBody.children('colgroup').html();
+		var $html = $([
+			'<table class="ew-tree-table-print">',
+			'   <colgroup>', colgroup, '</colgroup>',
+			'   <thead>', head, '</thead>',
+			'   <tbody>', body, '</tbody>',
+			'</table>'
+		].join(''));
+
+		// 隐藏特殊列
+		$html.find('col[data-type="checkbox"],col[data-type="radio"],col[data-type="tool"]').remove();
+		$html.find('td[data-type="checkbox"],td[data-type="radio"],td[data-type="tool"],.layui-hide').remove();
+
+		function hideCol($temp) {
+			var parentKey = $temp.data('parent'), pCol;
+			if (!parentKey) return;
+			var $parent = $html.children('thead').children('tr').children('[data-key="' + parentKey + '"]');
+			var colspan = parseInt($parent.attr('colspan')) - 1;
+			$parent.attr('colspan', colspan);
+			if (colspan === 0) $parent.remove();
+			hideCol($parent);
+		}
+
+		$html.find('th[data-type="checkbox"],th[data-type="radio"],th[data-type="tool"]').each(function () {
+			hideCol($(this));
+		}).remove();
+
+		// 打印内容样式
+		var style = [
+			'<style>',
+			'   /* 打印表格样式 */',
+			'   .ew-tree-table-print {',
+			'      border: none;',
+			'      border-collapse: collapse;',
+			'      width: 100%;',
+			'      table-layout: fixed;',
+			'   }',
+			'   .ew-tree-table-print td, .ew-tree-table-print th {',
+			'      color: #555;',
+			'      font-size: 14px;',
+			'      padding: 9px 15px;',
+			'      word-break: break-all;',
+			'      border: 1px solid #888;',
+			'      text-align: left;',
+			'   }',
+			'   .ew-tree-table-print .ew-tree-table-cell {',
+			'      min-height: 20px;',
+			'   }',
+			'   /* 序号列样式 */',
+			'   .ew-tree-table-print td[data-type="numbers"], .ew-tree-table-print th[data-type="numbers"] {',
+			'      padding-left: 0;',
+			'      padding-right: 0;',
+			'   }',
+			'   /* 单/复选框列样式 */',
+			'   .ew-tree-table-print td[data-type="tool"], .ew-tree-table-print th[data-type="tool"], ',
+			'   .ew-tree-table-print td[data-type="checkbox"], .ew-tree-table-print th[data-type="checkbox"], ',
+			'   .ew-tree-table-print td[data-type="radio"], .ew-tree-table-print th[data-type="radio"] {',
+			'      border: none;',
+			'   }',
+			'   .ew-tree-table-print td.layui-hide + td, .ew-tree-table-print th.layui-hide + th, ',
+			'   .ew-tree-table-print td[data-type="tool"] + td, .ew-tree-table-print th[data-type="tool"] + th, ',
+			'   .ew-tree-table-print td[data-type="checkbox"] + td, .ew-tree-table-print th[data-type="checkbox"] + th, ',
+			'   .ew-tree-table-print td[data-type="radio"] + td, .ew-tree-table-print th[data-type="radio"] + th {',
+			'      border-left: none;',
+			'   }',
+			'  /* 不显示的元素 */',
+			'   .layui-hide, ',
+			'   .ew-tree-table-print td[data-type="tool"] *, .ew-tree-table-print th[data-type="tool"] *, ',
+			'   .ew-tree-table-print td[data-type="checkbox"] *, .ew-tree-table-print th[data-type="checkbox"] *, ',
+			'   .ew-tree-table-print td[data-type="radio"] *, .ew-tree-table-print th[data-type="radio"] *, ',
+			'   .layui-table-grid-down, .ew-tree-tips-c, .ew-tree-icon, .ew-tree-table-arrow.ew-tree-table-arrow-hide {',
+			'      display: none;',
+			'   }',
+			'   /* tree缩进 */',
+			'   .ew-tree-table-indent {',
+			'      padding-left: 13px;',
+			'   }',
+			'   /* 箭头 */',
+			'   .ew-tree-table-arrow {',
+			'      position: relative;',
+			'      padding-left: 13px;',
+			'   }',
+			'   .ew-tree-table-arrow:before {',
+			'      content: "";',
+			'      border: 5px solid transparent;',
+			'      border-top-color: #666;',
+			'      position: absolute;',
+			'      left: 0;',
+			'      top: 6px;',
+			'   }',
+			'</style>'
+		].join('');
+		var pWindow = window.open('', '_blank');
+		pWindow.focus();
+		var pDocument = pWindow.document;
+		pDocument.open();
+		pDocument.write($html[0].outerHTML + style);
+		pDocument.close();
+		pWindow.print();
+		pWindow.close();
+	};
+
+	/** 筛选列 */
+	TreeTable.prototype.toggleCol = function (show, field, key) {
+		var components = this.getComponents();
+		if (show === undefined) {
+			components.$toolbar.find('.layui-table-tool-panel').remove();
+			var cols = ['<ul class="layui-table-tool-panel">'];
+			this.eachCols(function (i, item) {
+				if (item.type !== 'normal') return;
+				cols.push('<li><input type="checkbox" lay-skin="primary"');
+				cols.push(' lay-filter="' + components.colsToggleFilter + '"');
+				cols.push(' value="' + item.key + '" title="' + util.escape(item.title || '') + '"');
+				cols.push((item.hide ? '' : ' checked') + '></li>');
+			});
+			components.$toolbar.find('[lay-event="LAYTABLE_COLS"]').append(cols.join('') + '</ul>');
+			form.render('checkbox', components.filter);
+		} else {
+			if (key) {
+				var $td = components.$table.children('tbody').children('tr').children('[data-key="' + key + '"]');
+				var $th = components.$table.children('thead').children('tr').children('[data-key="' + key + '"]');
+				if (show) {
+					$td.removeClass('layui-hide');
+					$th.removeClass('layui-hide');
+				} else {
+					$td.addClass('layui-hide');
+					$th.addClass('layui-hide');
+				}
+				// 同步更新数据
+				var ks = key.split('-');
+				var col = this.options.cols[ks[0]][ks[1]];
+				col.hide = !show;
+
+				// 更新colspan数据
+				function changeParent($temp) {
+					var parentKey = $temp.data('parent'), pCol;
+					if (!parentKey) return;
+					var $parent = components.$table.children('thead').children('tr').children('[data-key="' + parentKey + '"]');
+					var colspan = $parent.attr('colspan');
+					show ? colspan++ : colspan--;
+					$parent.attr('colspan', colspan);
+					if (colspan === 0) $parent.addClass('layui-hide');
+					else $parent.removeClass('layui-hide');
+					changeParent($parent);
+				}
+
+				changeParent($th);
+
+				// 同步eachCols数据
+				this.eachCols(function (i, item) {
+					if (item.key === key) item.hide = col.hide;
+				});
+				this.resize();  // 更新表格尺寸
+			}
+		}
+	};
+
+	/**
+	 * 搜索数据
+	 * @param ids 关键字或数据id集合
+	 */
+	TreeTable.prototype.filterData = function (ids) {
+		var components = this.getComponents();
+		components.$loading.show();
+		if (this.options.data.length > 0) components.$loading.addClass('ew-loading-float');
+		var $trList = components.$table.children('tbody').children('tr');
+		var indexList = [];
+		if (typeof ids === 'string') {  // 关键字
+			$trList.each(function () {
+				var index = $(this).data('index');
+				$(this).children('td').each(function () {
+					if ($(this).text().indexOf(ids) !== -1) {
+						indexList.push(index);
+						return false;
+					}
+				});
+			});
+		} else {
+			for (var i = 0; i < ids.length; i++) {
+				indexList.push(this.getIndexById(ids[i]));
+			}
+		}
+		$trList.addClass('ew-tree-table-filter-hide');
+		for (var j = 0; j < indexList.length; j++) {
+			var $tr = $trList.filter('[data-index="' + indexList[j] + '"]');
+			$tr.removeClass('ew-tree-table-filter-hide');
+			var indent = parseInt($tr.data('indent'));
+			// 联动子级
+			$tr.nextAll('tr').each(function () {
+				if (parseInt($(this).data('indent')) <= indent) return false;
+				$(this).removeClass('ew-tree-table-filter-hide');
+			});
+			if ($tr.hasClass('ew-tree-table-open')) toggleRow($tr);
+			// 联动父级
+			$tr.prevAll('tr').each(function () {
+				var tInd = parseInt($(this).data('indent'));
+				if (tInd < indent) {
+					$(this).removeClass('ew-tree-table-filter-hide');
+					if (!$(this).hasClass('ew-tree-table-open')) toggleRow($(this));
+					indent = tInd;
+				}
+			});
+		}
+		// 最后再检查一遍
+		/*$trList.not('.ew-tree-table-filter-hide').not('.ew-tree-tb-hide').each(function () {
+			var index = $(this).data('index'), hide = true;
+			for (var k = 0; k < indexList.length; k++) {
+				if (indexList[k] === index) hide = false;
+			}
+			if (hide) $(this).addClass('ew-tree-table-filter-hide');
+		});*/
+		components.$loading.hide();
+		components.$loading.removeClass('ew-loading-float');
+		if (indexList.length === 0) components.$empty.show();
+		updateFixedTbHead(components.$view);  // 更新滚动条补丁
+	};
+
+	/** 重置搜索 */
+	TreeTable.prototype.clearFilter = function () {
+		var components = this.getComponents();
+		components.$table.children('tbody').children('tr').removeClass('ew-tree-table-filter-hide');
+		if (this.options.data.length > 0) components.$empty.hide();
+		updateFixedTbHead(components.$view);  // 更新滚动条补丁
+	};
+
+	/**
+	 * 刷新指定父级下的节点
+	 * @param id 父级id,空则全部刷新
+	 * @param data 非异步模式替换的数据
+	 */
+	TreeTable.prototype.refresh = function (id, data) {
+		if (isClass(id) === 'Array') {
+			data = id;
+			id = undefined;
+		}
+		var components = this.getComponents();
+		var d, $tr;
+		if (id !== undefined) {
+			$tr = components.$table.children('tbody').children('tr[data-index="' + this.getIndexById(id) + '"]');
+			d = this.getDataByTr($tr);
+		}
+		if (data) {  // 数据模式
+			if (data.length > 0) components.$loading.addClass('ew-loading-float');
+			components.$loading.show();
+			if (data.length > 0 && this.options.tree.isPidData) {  // pid形式数据
+				this.renderBodyData(tt.pidToChildren(data, this.options.tree.idName, this.options.tree.pidName, this.options.tree.childName), d, $tr);
+			} else {
+				this.renderBodyData(data, d, $tr);
+			}
+		} else {  // 异步模式
+			this.renderBodyAsync(d, $tr);
+		}
+	};
+
+	/** 删除数据 */
+	TreeTable.prototype.del = function (id, index) {
+		if (index === undefined) index = this.getIndexById(id);
+		var indexList = (typeof index === 'number' ? [index] : index.split('-'));
+		var d = this.options.data;
+		if (indexList.length > 1) {
+			for (var i = 0; i < indexList.length - 1; i++) {
+				d = d[parseInt(indexList[i])][this.options.tree.childName];
+			}
+		}
+		d.splice(indexList[indexList.length - 1], 1);
+	};
+
+	/** 更新数据 */
+	TreeTable.prototype.update = function (id, fields) {
+		$.extend(true, this.getDataByTr(this.getIndexById(id)), fields);
+	};
+
+	/** 折叠/展开行 */
+	function toggleRow($tr) {
+		var indent = parseInt($tr.data('indent'));
+		var open = $tr.hasClass('ew-tree-table-open');
+		if (open) {  // 折叠
+			$tr.removeClass('ew-tree-table-open');
+			$tr.nextAll('tr').each(function () {
+				if (parseInt($(this).data('indent')) <= indent) return false;
+				$(this).addClass('ew-tree-tb-hide');
+			});
+		} else {  // 展开
+			$tr.addClass('ew-tree-table-open');
+			var hideInd;
+			$tr.nextAll('tr').each(function () {
+				var ind = parseInt($(this).data('indent'));
+				if (ind <= indent) return false;
+				if (hideInd !== undefined && ind > hideInd) return true;
+				$(this).removeClass('ew-tree-tb-hide');
+				if (!$(this).hasClass('ew-tree-table-open')) hideInd = parseInt($(this).data('indent'));
+				else hideInd = undefined;
+			});
+		}
+		updateFixedTbHead($tr.parentsUntil('.ew-tree-table').last().parent());
+		return open;
+	}
+
+	/** 固定表头滚动条补丁 */
+	function updateFixedTbHead($view) {
+		var $headBox = $view.children('.ew-tree-table-head');
+		var $tbBox = $view.children('.ew-tree-table-box');
+		var sWidth = $tbBox.width() - $tbBox.prop('clientWidth');
+		$headBox.css('border-right', (sWidth > 0 ? sWidth : 0) + 'px solid #f2f2f2');
+	}
+
+	// 监听窗口大小改变
+	$(window).resize(function () {
+		$('.ew-tree-table').each(function () {
+			updateFixedTbHead($(this));
+			var $tbBox = $(this).children('.ew-tree-table-box');
+			var full = $tbBox.data('full');
+			if (full && device.ie && device.ie < 10) {
+				$tbBox.css('height', getPageHeight() - full);
+			}
+		});
+	});
+
+	/** 表格溢出点击展开功能 */
+	$(document).on('mouseenter', '.ew-tree-table-cell.single-line', function () {
+		var $content = $(this).children('.ew-tree-table-cell-content');
+		if ($content.prop('scrollWidth') > $content.outerWidth()) $(this).children('.layui-table-grid-down').show();
+	}).on('mouseleave', '.ew-tree-table-cell.single-line', function () {
+		$(this).children('.layui-table-grid-down').hide();
+	});
+	// 点击箭头展开
+	$(document).on('click', '.ew-tree-table-cell>.layui-table-grid-down', function (e) {
+		e.stopPropagation();
+		hideAllTdTips();
+		var $cell = $(this).parent();
+		$cell.addClass('ew-tree-tips-open');
+		$cell.children('.layui-table-grid-down').hide();
+		var tw = $cell.parent().outerWidth() + 4;
+		if ($cell.outerWidth() < tw) $cell.children('.ew-tree-table-cell-content').css({'width': tw, 'max-width': tw});
+		var $box = $cell.parents().filter('.ew-tree-table-box');
+		if ($box.length === 0) $box = $cell.parents().filter('.ew-tree-table-head');
+		if ($box.length === 0) return;
+		if (($cell.outerWidth() + $cell.offset().left) + 20 > $box.offset().left + $box.outerWidth()) {
+			$cell.addClass('ew-show-left');
+		}
+		if (($cell.outerHeight() + $cell.offset().top + 10) > $box.offset().top + $box.outerHeight()) {
+			$cell.addClass('ew-show-bottom');
+		}
+	});
+	// 点击关闭按钮关闭
+	$(document).on('click', '.ew-tree-table-cell>.ew-tree-tips-c', function () {
+		hideAllTdTips();
+	});
+	// 点击空白部分关闭
+	$(document).on('click', function () {
+		hideAllTdTips();
+		$('.ew-tree-table .layui-table-tool-panel').remove();
+	});
+	$(document).on('click', '.ew-tree-table-cell.ew-tree-tips-open', function (e) {
+		e.stopPropagation();
+	});
+
+	/* 关闭所有单元格溢出提示框 */
+	function hideAllTdTips() {
+		$('.ew-tree-table-cell').removeClass('ew-tree-tips-open ew-show-left ew-show-bottom');
+		$('.ew-tree-table-cell>.ew-tree-table-cell-content').css({'width': '', 'max-width': ''});
+	}
+
+	/** 拖拽调整列宽 */
+	$(document).on('mousedown', '.ew-tb-resize', function (e) {
+		layui.stope(e);
+		var $this = $(this);
+		$this.attr('move', 'true');
+		var key = $this.parent().data('key');
+		$this.data('x', e.clientX);
+		var w = $this.parent().parent().parent().parent().children('colgroup').children('col[data-key="' + key + '"]').attr('width');
+		if (!w || w.toString().indexOf('%') !== -1) w = $this.parent().outerWidth();
+		$this.data('width', w);
+		$('body').addClass('ew-tree-table-resizing');
+	}).on('mousemove', function (e) {
+		var $rs = $('.ew-tree-table .ew-tb-resize[move="true"]');
+		if ($rs.length === 0) return;
+		layui.stope(e);
+		var x = $rs.data('x');
+		var w = $rs.data('width');
+		var nw = parseFloat(w) + e.clientX - parseFloat(x);
+		if (nw <= 0) nw = 1;
+		// 更新实例options中的宽度
+		var ins = _instances[$rs.parentsUntil('.ew-tree-table').last().parent().attr('lay-filter')];
+		var key = $rs.parent().data('key');
+		var ks = key.split('-');
+		ins.options.cols[ks[0]][ks[1]].width = nw;
+		ins.eachCols(function (i, item) {
+			if (item.key === key) item.width = nw;
+		});
+		ins.resize();
+	}).on('mouseup', function (e) {
+		$('.ew-tree-table .ew-tb-resize[move="true"]').attr('move', 'false');
+		$('body').removeClass('ew-tree-table-resizing');
+	}).on('mouseleave', function (e) {
+		$('.ew-tree-table .ew-tb-resize[move="true"]').attr('move', 'false');
+		$('body').removeClass('ew-tree-table-resizing');
+	});
+
+	/** 获取顶级的pId */
+	function getPids(data, idName, pidName) {
+		var pids = [];
+		for (var i = 0; i < data.length; i++) {
+			var hasPid = false;
+			for (var j = 0; j < data.length; j++) {
+				if (data[i][pidName] == data[j][idName]) {
+					hasPid = true;
+					break;
+				}
+			}
+			if (!hasPid) pids.push(data[i][pidName]);
+		}
+		return pids;
+	}
+
+	/** 判断pId是否相等 */
+	function pidEquals(pId, pIds) {
+		if (isClass(pIds) === 'Array') {
+			for (var i = 0; i < pIds.length; i++)
+				if (pId == pIds[i]) return true;
+		}
+		return pId == pIds;
+	}
+
+	/** 获取变量类型 */
+	function isClass(o) {
+		if (o === null) return 'Null';
+		if (o === undefined) return 'Undefined';
+		return Object.prototype.toString.call(o).slice(8, -1);
+	}
+
+	/** 获取浏览器高度 */
+	function getPageHeight() {
+		return document.documentElement.clientHeight || document.body.clientHeight;
+	}
+
+	/** 对外提供的方法 */
+	var tt = {
+		/* 渲染 */
+		render: function (options) {
+			return new TreeTable(options);
+		},
+		/* 重载 */
+		reload: function (id, opt) {
+			_instances[id].reload(opt);
+		},
+		/* 事件监听 */
+		on: function (events, callback) {
+			return layui.onevent.call(this, MOD_NAME, events, callback);
+		},
+		/* pid转children形式 */
+		pidToChildren: function (data, idName, pidName, childName, pId) {
+			if (!childName) childName = 'children';
+			var newList = [];
+			for (var i = 0; i < data.length; i++) {
+				if (data[i][idName] == data[i][pidName])
+					return console.error('第' + i + '条数据的' + idName + '与' + pidName + '相同', data[i]);
+				if (pId === undefined) pId = getPids(data, idName, pidName);
+				if (pidEquals(data[i][pidName], pId)) {
+					var children = this.pidToChildren(data, idName, pidName, childName, data[i][idName]);
+					if (children.length > 0) data[i][childName] = children;
+					newList.push(data[i]);
+				}
+			}
+			return newList;
+		}
+	};
+
+	/** 添加样式 */
+	$('head').append([
+		'<style id="ew-tree-table-css">',
+		'/** 最外层容器 */',
+		'.ew-tree-table {',
+		'    margin: 10px 0;',
+		'    position: relative;',
+		'    border: 1px solid #e6e6e6;',
+		'    border-bottom: none;',
+		'    border-right: none;',
+		'}',
+
+		'.ew-tree-table:before, .ew-tree-table:after, .ew-tree-table .ew-tree-table-head:after {',
+		'    content: "";',
+		'    background-color: #e6e6e6;',
+		'    position: absolute;',
+		'    right: 0;',
+		'    bottom: 0;',
+		'}',
+
+		'.ew-tree-table:before {',
+		'    width: 1px;',
+		'    top: 0;',
+		'    z-index: 1;',
+		'}',
+
+		'.ew-tree-table:after, .ew-tree-table .ew-tree-table-head:after {',
+		'    height: 1px;',
+		'    left: 0;',
+		'}',
+
+		'.ew-tree-table .layui-table {',
+		'    margin: 0;',
+		'    position: relative;',
+		'    table-layout: fixed;',
+		'}',
+
+		'/** 表格 */',
+		'.ew-tree-table .layui-table td, .ew-tree-table .layui-table th {',
+		'    border-top: none;',
+		'    border-left: none;',
+		'    padding: 0 !important;',
+		'}',
+
+		'.ew-tree-table .ew-tree-table-box {',
+		'    overflow: auto;',
+		'    position: relative;',
+		'}',
+
+		'.ew-tree-table .ew-tree-table-head {',
+		'    overflow: hidden;',
+		'    box-sizing: border-box;',
+		'    background-color: #f2f2f2;',
+		'    position: relative;',
+		'}',
+
+		'/** loading */',
+		'.ew-tree-table div.ew-tree-table-loading {',
+		'    padding: 10px 0;',
+		'    text-align: center;',
+		'}',
+
+		'.ew-tree-table div.ew-tree-table-loading > i {',
+		'    color: #999;',
+		'    font-size: 30px;',
+		'}',
+
+		'.ew-tree-table div.ew-tree-table-loading.ew-loading-float {',
+		'    position: absolute;',
+		'    top: 0;',
+		'    left: 0;',
+		'    right: 0;',
+		'}',
+
+		'/** 空数据 */',
+		'.ew-tree-table .ew-tree-table-empty {',
+		'    color: #666;',
+		'    font-size: 14px;',
+		'    padding: 18px 0;',
+		'    text-align: center;',
+		'    display: none;',
+		'}',
+
+		'/** 单元格 */',
+		'.ew-tree-table-cell.ew-tree-tips-open {',
+		'    position: absolute;',
+		'    top: 0;',
+		'    left: 0;',
+		'    padding: 0;',
+		'    z-index: 9999;',
+		'    background-color: #fff;',
+		'    box-shadow: 3px 3px 8px rgba(0, 0, 0, .15);',
+		'}',
+
+		'thead .ew-tree-table-cell.ew-tree-tips-open {',
+		'    background-color: #f2f2f2;',
+		'}',
+
+		'.ew-tree-table-cell.ew-tree-tips-open.ew-show-left {',
+		'    right: 0;',
+		'    left: auto;',
+		'    box-shadow: -3px 3px 8px rgba(0, 0, 0, .15);',
+		'}',
+
+		'.ew-tree-table-cell.ew-tree-tips-open.ew-show-bottom {',
+		'    bottom: 0;',
+		'    top: auto;',
+		'    box-shadow: 3px -3px 8px rgba(0, 0, 0, .15);',
+		'}',
+
+		'.ew-tree-table-cell.ew-tree-tips-open.ew-show-left.ew-show-bottom {',
+		'    box-shadow: -3px -3px 8px rgba(0, 0, 0, .15);',
+		'}',
+
+		'.ew-tree-table-cell > .ew-tree-tips-c {',
+		'    position: absolute;',
+		'    right: -6px;',
+		'    top: -3px;',
+		'    width: 22px;',
+		'    height: 22px;',
+		'    line-height: 22px;',
+		'    font-size: 16px;',
+		'    color: #fff;',
+		'    background-color: #666;',
+		'    border-radius: 50%;',
+		'    text-align: center;',
+		'    cursor: pointer;',
+		'    display: none;',
+		'}',
+
+		'table tr:first-child .ew-tree-table-cell > .ew-tree-tips-c {',
+		'    top: 0;',
+		'}',
+
+		'.ew-tree-table-cell.ew-tree-tips-open > .ew-tree-tips-c {',
+		'    display: block;',
+		'}',
+
+		'.ew-tree-table-cell.ew-tree-tips-open.ew-show-left > .ew-tree-tips-c {',
+		'    left: -6px;',
+		'    right: auto;',
+		'}',
+
+		'.ew-tree-table-cell > .ew-tree-table-cell-content {',
+		'    padding: 5px 15px;',
+		'    line-height: 28px;',
+		'}',
+
+		'[lay-size="lg"] .ew-tree-table-cell > .ew-tree-table-cell-content {',
+		'    line-height: 40px;',
+		'}',
+
+		'[lay-size="sm"] .ew-tree-table-cell > .ew-tree-table-cell-content {',
+		'    padding: 1px 15px;',
+		'}',
+
+		'.ew-tree-table-cell.single-line > .ew-tree-table-cell-content {',
+		'    overflow: hidden;',
+		'    white-space: nowrap;',
+		'    text-overflow: ellipsis;',
+		'}',
+
+		'.ew-tree-table-cell.ew-tree-tips-open > .ew-tree-table-cell-content {',
+		'    overflow: auto;',
+		'    padding: 9px 15px;',
+		'    height: auto;',
+		'    min-height: 100%;',
+		'    max-height: 110px;',
+		'    line-height: inherit;',
+		'    max-width: 260px;',
+		'    width: 200px;',
+		'    width: max-content;',
+		'    width: -moz-max-content;',
+		'    box-sizing: border-box;',
+		'    white-space: normal;',
+		'}',
+
+		'.ew-tree-table-cell > .layui-table-grid-down {',
+		'    box-sizing: border-box;',
+		'}',
+
+		'/** 图标列 */',
+		'.ew-tree-table .ew-tree-pack {',
+		'    cursor: pointer;',
+		'    line-height: 16px;',
+		'}',
+
+		'.ew-tree-table .ew-tree-pack > .layui-icon, .ew-tree-table .ew-tree-pack > .ew-tree-icon {',
+		'    margin-right: 5px;',
+		'}',
+
+		'.ew-tree-table .ew-tree-pack > * {',
+		'    vertical-align: middle;',
+		'}',
+
+		'/* 缩进 */',
+		'.ew-tree-table .ew-tree-table-indent {',
+		'    margin-right: 5px;',
+		'    padding-left: 16px;',
+		'}',
+
+		'/* 箭头 */',
+		'.ew-tree-table .ew-tree-table-arrow:before {',
+		'    content: "\\e623";',
+		'}',
+
+		'.ew-tree-table .ew-tree-table-open .ew-tree-table-arrow:before {',
+		'    content: "\\e625";',
+		'}',
+
+		'.ew-tree-table .ew-tree-table-arrow.arrow2 {',
+		'    font-size: 12px;',
+		'    font-weight: 600;',
+		'    line-height: 16px;',
+		'    height: 16px;',
+		'    width: 16px;',
+		'    display: inline-block;',
+		'    text-align: center;',
+		'    color: #888;',
+		'}',
+
+		'.ew-tree-table .ew-tree-table-arrow.arrow2:before {',
+		'    content: "\\e602";',
+		'}',
+
+		'.ew-tree-table .ew-tree-table-open .ew-tree-table-arrow.arrow2:before {',
+		'    content: "\\e61a";',
+		'}',
+
+		'.ew-tree-table-arrow.ew-tree-table-arrow-hide {',
+		'    visibility: hidden;',
+		'}',
+
+		'/* 箭头变加载中状态 */',
+		'.ew-tree-table tr.ew-tree-table-loading > td .ew-tree-table-arrow:before {',
+		'    content: "\\e63d" !important;',
+		'}',
+
+		'.ew-tree-table tr.ew-tree-table-loading > td .ew-tree-table-arrow {',
+		'    margin-right: 0;',
+		'}',
+
+		'.ew-tree-table tr.ew-tree-table-loading > td .ew-tree-table-arrow + * {',
+		'    margin-left: 5px;',
+		'}',
+
+		'.ew-tree-table tr.ew-tree-table-loading * {',
+		'    pointer-events: none !important;',
+		'}',
+
+		'/** 折叠行 */',
+		'.ew-tree-table .ew-tree-tb-hide {',
+		'    display: none;',
+		'}',
+
+		'/** 特殊列调整 */',
+		'.ew-tree-table td[data-type="numbers"] > .ew-tree-table-cell,',
+		'.ew-tree-table th[data-type="numbers"] > .ew-tree-table-cell,',
+		'.ew-tree-table td[data-type="checkbox"] > .ew-tree-table-cell,',
+		'.ew-tree-table th[data-type="checkbox"] > .ew-tree-table-cell,',
+		'.ew-tree-table td[data-type="radio"] > .ew-tree-table-cell,',
+		'.ew-tree-table th[data-type="radio"] > .ew-tree-table-cell,',
+		'.ew-tree-table td[data-type="space"] > .ew-tree-table-cell,',
+		'.ew-tree-table th[data-type="space"] > .ew-tree-table-cell {',
+		'    padding-left: 0;',
+		'    padding-right: 0;',
+		'}',
+
+		'/* 单元格内表单元素样式调整 */',
+		'.ew-tree-table .layui-form-switch',
+		'.ew-tree-table .layui-form-radio {',
+		'    margin: 0;',
+		'}',
+
+		'/* checkbox列调整 */',
+		'.ew-tree-table-checkbox + .layui-form-checkbox {',
+		'    padding: 0;',
+		'}',
+
+		'.ew-tree-table-checkbox + .layui-form-checkbox > .layui-icon {',
+		'    font-weight: 600;',
+		'    color: transparent;',
+		'    transition: background-color .1s linear;',
+		'    -webkit-transition: background-color .1s linear;',
+		'}',
+
+		'.ew-tree-table-checkbox + .layui-form-checkbox.layui-form-checked > .layui-icon {',
+		'    color: #fff;',
+		'}',
+
+		'/* checkbox半选状态 */',
+		'.ew-form-indeterminate + .layui-form-checkbox .layui-icon:before {',
+		'    content: "";',
+		'    width: 10px;',
+		'    height: 2px;',
+		'    background-color: #f1f1f1;',
+		'    position: absolute;',
+		'    top: 50%;',
+		'    left: 50%;',
+		'    margin: -1px 0 0 -5px;',
+		'}',
+
+		'/* radio列调整 */',
+		'.ew-tree-table-radio + .layui-form-radio {',
+		'    margin: 0;',
+		'    padding: 0;',
+		'    height: 20px;',
+		'    line-height: 20px;',
+		'}',
+
+		'.ew-tree-table-radio + .layui-form-radio > i {',
+		'    margin: 0;',
+		'    height: 20px;',
+		'    font-size: 20px;',
+		'    line-height: 20px;',
+		'}',
+
+		'/** 单元格编辑 */',
+		'.ew-tree-table .layui-table td[data-edit] {',
+		'    cursor: text;',
+		'}',
+
+		'.ew-tree-table .ew-tree-table-edit {',
+		'    position: absolute;',
+		'    left: 0;',
+		'    top: 0;',
+		'    width: 100%;',
+		'    height: 100%;',
+		'    border-radius: 0;',
+		'    box-shadow: 1px 1px 20px rgba(0, 0, 0, .15);',
+		'}',
+
+		'.ew-tree-table .ew-tree-table-edit:focus {',
+		'    border-color: #5FB878 !important;',
+		'}',
+
+		'.ew-tree-table .ew-tree-table-edit.layui-form-danger {',
+		'    border-color: #FF5722 !important;',
+		'}',
+
+		'/** 搜索数据隐藏行 */',
+		'.ew-tree-table tr.ew-tree-table-filter-hide {',
+		'    display: none !important;',
+		'}',
+
+		'/** 头部工具栏 */',
+		'.ew-tree-table .ew-tree-table-tool {',
+		'    min-height: 50px;',
+		'    line-height: 30px;',
+		'    padding: 10px 15px;',
+		'    box-sizing: border-box;',
+		'    background-color: #f2f2f2;',
+		'    border-bottom: 1px solid #e6e6e6;',
+		'}',
+
+		'.ew-tree-table .ew-tree-table-tool .ew-tree-table-tool-right {',
+		'    float: right;',
+		'}',
+
+		'.ew-tree-table .ew-tree-table-tool .ew-tree-table-tool-item {',
+		'    position: relative;',
+		'    color: #333;',
+		'    width: 26px;',
+		'    height: 26px;',
+		'    line-height: 26px;',
+		'    text-align: center;',
+		'    margin-left: 10px;',
+		'    display: inline-block;',
+		'    border: 1px solid #ccc;',
+		'    box-sizing: border-box;',
+		'    vertical-align: middle;',
+		'    -webkit-transition: .3s all;',
+		'    transition: .3s all;',
+		'    cursor: pointer;',
+		'}',
+
+		'.ew-tree-table .ew-tree-table-tool .ew-tree-table-tool-item:first-child {',
+		'    margin-left: 0;',
+		'}',
+
+		'.ew-tree-table .ew-tree-table-tool .ew-tree-table-tool-item:hover {',
+		'    border-color: #999;',
+		'}',
+
+		'.ew-tree-table .ew-tree-table-tool-right .layui-table-tool-panel {',
+		'    left: auto;',
+		'    right: -1px;',
+		'    z-index: 9999;',
+		'}',
+
+		'/* 列宽拖拽调整 */',
+		'.ew-tree-table .ew-tb-resize {',
+		'    position: absolute;',
+		'    right: 0;',
+		'    top: 0;',
+		'    bottom: 0;',
+		'    width: 10px;',
+		'    cursor: col-resize;',
+		'}',
+
+		'.ew-tree-table-resizing {',
+		'    cursor: col-resize;',
+		'    -ms-user-select: none;',
+		'    -moz-user-select: none;',
+		'    -webkit-user-select: none;',
+		'    user-select: none;',
+		'}',
+
+		'/* 辅助样式 */',
+		'.ew-tree-table .layui-form-switch {',
+		'    margin: 0;',
+		'}',
+
+		'.ew-tree-table .pd-tb-0 {',
+		'    padding-top: 0 !important;',
+		'    padding-bottom: 0 !important;',
+		'}',
+
+		'.ew-tree-table .break-all {',
+		'    word-break: break-all !important;',
+		'}',
+
+		'/** 扩展图标 */',
+		'.ew-tree-table .ew-tree-icon-folder:after, .ew-tree-table .ew-tree-icon-file:after {',
+		'    content: "";',
+		'    padding: 2px 10px;',
+		'    -webkit-background-size: cover;',
+		'    -moz-background-size: cover;',
+		'    -o-background-size: cover;',
+		'    background-size: cover;',
+		'    background-repeat: no-repeat;',
+		'    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAE6UlEQVR4Xu2ZPYhcVRiGny9hC0FsTEBCGkFTWIQE/IlpgmKpWAiLyR0XLbYTxEKxkCAEhRCxEOwsjJnJioKIYClWKgqiskIIaCoLYyASVJT87JGspN37LrOXvec777Tzzrnvz7Nn2dnAr6YbiKbTOzwGoHEIDIABaLyBxuP7BjAAjTfQeHzfAAag8QYaj+8bwAA03kDj8X0DGIDGG2g8/lw3QFlhD9fZN7oOF7gYT3NudL5GaGjTAJQP2c1VXgIOExyGkf4/oXCe4I3oeH+EvY/G0qYAKFOWCV4Hdo8mQb+RL7jBE7HE3/3S9hQyAGXGCeDVSiv6lqscief4t1L/g9mWAChTHiD4ZrTXvVbPu9GxrEnbUWkAzPgeOJCglsXo+ChBji2L0AtAmfEgrP/0Z3hdZoF7Y5HLGcJsRQYFgLeAF7fiYSM540x0LI3Ey7bb6AdgytcEh7bd6VYa2MGhOJrmVpurmX4AZlwCds31lPF9+AI32O8/DYUvccqUKwR3jG/DuR29Gd36F1pNv/pvgKwAFK5RuC+e4eeWCWgXgJurFz6LCY8bgA0aSPwr4P/UhVNc43ir3xK2fQPcAr/wO/AewU/Ar6xRqroVdvAnC6zGIlc369sAbLax8er/ofAJOzkVR9e/uZVeBkCqqTrRyeh4RXFtAJSWatQUno0Jp/usG4C+hup9/yJ72BuPcH2jCAag3oEV50vRccYAKFXl1LwdHS8YgJzj9qcqfBoTnjQA/VVlVXwXHfcbgKzz9uf6IToOGoD+orIqDEDWZcVcBkAsKqvMAGRdVsxlAMSissoMQNZlxVwGQCwqq8wAZF1WzGUAxKKyygxA1mXFXAZALCqrzABkXVbMZQDEorLKDEDWZcVcBkAsKqvMAGRdVsxlAMSissoMQNZlxVwGQCwqq8wAZF1WzGUAxKKyygxA1mXFXAZALCqrzABkXVbMZQDEorLKDEDWZcVcBkAsKqvMAGRdVsxlAMSissoMQNZlxVwGQCwqq8wAZF1WzGUAxKKyygxA1mXFXAZALCqrzABkXVbMZQDEorLKDEDWZcVcBkAsKqvMAGRdVsxlAMSissoMQNZlxVwGQCwqq8wAZF1WzGUAxKKyygxA1mXFXAZALCqrzABkXVbMZQDEorLKDEDWZcVcBkAsKqvMAGRdVsxlAMSissoMQNZlxVwGQCwqq8wAZF1WzGUAxKKyygxA1mXFXAZALCqrzABkXVbMZQDEorLKDEDWZcVcBkAsKqvMAGRdVsxlAMSissoMQNZlxVwGQCwqq8wAZF1WzLUFAMy4BOwSH2jZmBoorMaE/RtZij6/ZcoFgrv7dH5/lA38Eh33zAfAjM+BR0cZz6Y2bqDwY0w4MB8AU04SvOyuq2zg4+h4aj4AzvIwha+qjN+66cLzMeGduQC4+eEy4zywr/U+K8t/hQX2xiJ/zQ/ACgdZ40vgtspKaNducCyOsdJXQO9fAbcOKGc5whofENzVd6jf3/YGTkTHccWFDMD6r4LT3MlOloHHCB4CblceYs3gDfxB4TeCcxReiwmr6hM3BYB6qHX1NGAA6tlqEKcGYJBa6znUANSz1SBODcAgtdZzqAGoZ6tBnBqAQWqt51ADUM9Wgzg1AIPUWs+hBqCerQZxagAGqbWeQw1APVsN4tQADFJrPYcagHq2GsTpf+KxwJB5Cd5mAAAAAElFTkSuQmCC");',
+		'}',
+
+		'.ew-tree-table tr.ew-tree-table-open > td .ew-tree-icon-folder:after {',
+		'    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAKwElEQVR4Xu2df9AVVRnHP899gUxmYKhsCpJREEeMakSoiGGCbIxSizIJ7i5OksZkMIxQjlOQyOCQ5o/8RWmkMdz7wjDC5I+hcFSKxEENh4YsEwPJAbVQ8AeQL733NPcKyn3v7r17d8/uvfvus//ec57n+3yf7z179uw5zwp6ZZoByXT0GjwqgIyLQAWgAsg4AxkPX0cAFUDGGch4+DoCqAAyzkDGw9cRQAWQcQYyHr6OACqA5hkw63kfr3IyOQZTIte8BUs9OnibEi/isEcEY8lqpswEHgHMGgbSxTyEyRjGIC1MfM8UGQ4CfyLHWp7jbllEKVNZjBBsIAGYAi7CrcCgCL6S6voM4IrDtqQcptlPQwGYAksRrkpVkIZD5JgmeR5IFe4WgK0rAFPkamBRC3BFd2k4AkwSl83RjfVeC74CMCuZSI6NqQ7d8G9KDJOLK3MEvTwY8BdAga0Io3sBa0vEYWEviCOWEDwFYDoZh+HxWDwmb/R18gzSx0Rv4r0FUORa4EfJ5yomj8IEyfNYTNZTbdZbAAU2IJyb6siOB2+4Qlx+3mvisRiInwC2I4yy6Ke1pgw/E5crWwuiPb373QL+BZzcnpBDobpLHGaF6tnLO6kAenmCG4WXFQH8WhwubURGFn/PhgAMD4nLl7KY4EYxZ0MAcBhhqOTZ14iQrP2eFQGU8/ogeb6qC0LVEs+SAMqRL+ctLpdZlRdFeoH32UBTpLc9Br6XbMMuhLUIm+jmzbZSQUdlV9M++rBTpnI4CWxZGwGS4NSWj2eBh4CbxGG3LaM97agA4mLWnt23gZ+yg8VxbHVTAdhLVNyWHqabKbb3NqgA4k6bTfuG+3GYYvNJRgVgM0FJ2DL8QFxutOVKBWCLyaTsGN6gH0NlKq/bcKkCsMFi0jYMs8XlDhtuVQA2WEzahuH34vJlG25VADZYTN7GPnE4yYZbFYANFlth4y362VjSVgG0Ink2fAon2Xi7qQKwkYxW2OglAtiP4QlgN8LLreAxtT4HcL1cwKGo+FsxAnQDv6HEbTKDv0QNQPtHYyBpAZSPm7mSp/ymS682YCA5ARiWMYS5Mon/tUHcCuEoA0kJ4AZx+KGy3n4MJCGA9eJwXqPQzSJyjGAMJU5s1FZ/r8NAH7roYIdM5T9BeIpXAIaXOMKZcgkH/MCYIp8GvgN8A/hQENDaJhADrwG/oy9X1BNDvAIQZkqee+okfwGGa9qq4FQgblPVaC85xsp09nqhjlMAO9nBCK9tTGYjfdhLJ3BRqqhMK1jDdoYw2msCHqcAypsZ53txZoqVo9pz08pnKnEbLhKXe3tij1MAk8VhQ0+HZjWj6GZ7KklMM2jD3eJW5lpVV5wC+IA47K8RQJEVwMVp5jKV2H3OR8YjAMPL4vLRmuSvoYMjvAoMTCWJ6Qa9Vhy+mdQIsEEcJtcIYCWjybE13TymFL2wVPK1dZ/iGgE8S7KYTi7F8KuUUphu2AlPAsu1eose9/9lwPfSzWRq0Q8Xh53J3AI6+IRM4681AiiwBeEzqaUwrcANh8Slvxf8OG4BXezg/T0XgCpr/afxX4S+aeUxtbgNfxCXSUkJYJs4nKXP/20ll5vFYV4yAjCsEJdve9z/y8/+5TUAvZJmwDBDXArJCADmicPNHgLQ5d+kE3/Mn+Hj4vK3ZARg+KK4POIxAdyEMKFVHGTWb/m7Cc9zgl9tgTgmgd5LwAUOIrrZI3EhGraIyzg/v7YFsFcchnhMAE+nm38kHrw6BMMycfl+MgLwObRoikwDVmk+WsCAcJnkWZ6MAOA6cWo/MGUKXI/optAWpB9KnC0zeDoZAQh5ydf+002BhxHOaQkBWXZqKHGQE+odIrU7BxBGSZ7yd/uqLlOsbArVV8DJi9FzUe54GDYF4L0EvIpTKLEr+djVIz67gOIRgOFpcTnb499f3u69VtPREgbmiMPt9TzbHAHuEYeZHgtASxB+3JLws+40x3iZXv/rb/YE4PNhJlNgPWKnnk3W89l0/APo3+gIuT0BwBfEqf3SqCnwCsKHmwavHaIy8Kw4jGxkxKYAapaAzSoGU2JPIxD6ewwMGDrFxWlk2Y4ADHvE5WMe9//zEf2Cd6MkxPJ7wIqidgQAnieATYGfIFwTS4BqtD4DwjmS59FGNNkRgM+WY1Pkt8DXGoHQ32NgoItB9U5lH/NoRwAwXRxWe6wB9N4vj8SQM4smXxCHU4PYsyOADs6Uafz9eIdmDQM54l8XIAg4bROagXXicGGQ3jYE4L0EXOBcpPZwaBBQ2iYiA4YF4la+AN/wsiGAP4vDWI8ngKsQljZEoA3iYOA8cVgfxHB0Afi8cDBF1mgBiCApiKGN8BHJ80oQy9EFAHPF4VaPCeDzwPAgILSNRQYML4nL4KAWowtAmCh5/lg1AXyAE3mDg0FBaDurDASqynbMY3QBQO0S8Eomkqt9L2A1TDXmx8AScVgYlJ6oAnhRHIZ6TADnI9wQFIS2s8rAheKwLqjFqAJ4UBwu8BBAESEfFIS2s8hAjlNlOi8EtRhNAIZrxWWBxwSwvCh0RlAQ2s4SA4YD4jKoGWvRBCB8S/KVx713L6MTwGb4t932UXGa230dTQAlzpAZ1Sd+TIHxCI/ZjkztBWKg6aLcUQTgtwQ8B6ldFwgEXxtFY8DnXEY9o+EFYHhK3Eqh56rLFCu1gWvqA0SLTHsHYkAY2ezHOMILAJaLw2UeAih/BuaTgQBrI3sM1KkDFM8IADV7zs2d9KV/pQ5Qzl5kaikQA4bHxWV8oLbHNYoyAnxeHDZVPQEUGIvwZLMgtL0VBm4XhznNWgovAI8956aTWRh+2SwIbW+BgQbfZvDzEFYAu8XhFI/7/53Ady2EoyaaZ+AscdjWbLdwAjDcL27tZk9T5ClgTLMgtH1EBhrUAYpjEljzxkkLQUZMYrTuW8UJ98cLOwLUfH3CrORT5JofgqLFrb2PMuD5SB6EnXACgNPFYUfVE0Anl5TPowdxqm2sM3C5OPwijNXmBeCz4GCK3AbMDgNC+0RkwDBOXLaEseIngOeAEZ4GDU+Iy2drngAKbEb4XBgQ2icCAwHqADU/CSzwJFK71fuoobvEYVbV8P9OJfA3tRBkhESG7/qMOIwK2917BCiwDuHrPiPAbHG5o0oAqxlJt3ct2rDAtF9ABnyKcwfsjd8tYDH4bCwUJki++n2/KVbOoXtWow4KRNuFZsDzXGZQa34jgP+xLq8l4CI3gnc9+qBAtF0IBgwH6MdgmcrhEL0rXbwFUP68WxevIQyoMmzYJS7DPCaAGxEmhgWh/UIyIMyXPDeF7O0vgPIvpsB1CFf2MH6fOEzxEIBWAo+ShXB915PnfBFMuO7v9PIcASoCWMEH6VNZ7Hlvl6lhsbhc3WMCOJxuysfA9EqKAUO5+P7MeiVgg0LxFUBFBEW+AtwH9DlqsObQgSlWvgBetTM4qHNt1zQD+zEs7PkU1rSV4zrUFcDRW0G50NMtwDBKjJAZ1f92U2ApUlshPAoo7fsuA12YCt+bgXvpxyMylW6b/DQUwDFnZiWn4fLPqPccm+DVVnQGAgsguiu10I4MqADaMSsJYlIBJEh2O7pSAbRjVhLEpAJIkOx2dKUCaMesJIhJBZAg2e3oSgXQjllJEJMKIEGy29GVCqAds5IgJhVAgmS3oysVQDtmJUFM/wdaDlOuM5Eu/AAAAABJRU5ErkJggg==");',
+		'}',
+
+		'.ew-tree-table .ew-tree-icon-file:after {',
+		'    background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAYAAADDPmHLAAAJNUlEQVR4Xu2dXYxdVRXHf2tghhYaoba1Qk1owIwmfVBaTKRgQqMPlGjig2nDnDsF0whSnwqJ4SNoU2OLUSNPVDSx2t47hEkxaQMBI1hB/EiE6osYqjGUYPGjCihN6Uy525wzt7UdZu7ZZ87a5949Z52XeVl77bX//9/d52vvM4IdtVZAaj16GzwGQM0hMAAMgJorUPPh2wxgANRcgZoP32YAA6DmCtR8+DYDGADVKuB2s4BB1gMbEYZxLEFYDlxQbSU97+0Ejn8hHMPxR4R9LOZxuZGTVVZW2QzgxlnGBNuBUYSLqhxkNH05jgN7GeIrsoF/VlF3cADcQc7nKHfiuM+M97Q0BUH4GpfxbVnHKc9WcwoLCoBrsRjHYwhr51Rd3Rs5foXwaUl4PZQUwQBwLa4AngZWhiq+JnlfBj4pCX8JMd4gALgxluJ4Hrg8RNE1zHkE4WoZ4Zj22NUBcOMsZILnEFZrF1vrfI5DDHGdbOCEpg76ADTZiXCXZpGWq6OAsFNGuEdTD1UA3B7exwDpdLUgt0jHqwjjwH6EF0NMb7k19DAgO03CKtp8pvNM5AO55TjeZoCVMsLfc2M9A3QBaPEQcGtO328hbOYw+2Qbbc8653WY28YAw3yONrsRLswZ7Pck4TYtQdQAcOMMMckbwMIuxaVPua6VhBe0BjCf8rgWa4Bf5jwVPcEgl8gGJjTGrgfAGDfgeCKnqC2SsEuj8Pmaw7W4HXiw6/iE9TLCkxoa6AHQyopOi5/5cLzCCq4M/WRLQ5Re5ug8Of1z11tox3el0UXrAgPQA6DJQYTru/R9ryTsKFBbbUNdK7vS/3qXH9PPpcE6DYH0AGjxEjA8a1Ft1sgohzSKnu853MNcRburVocl4UMaOugB0MxeYMx+BTt14fKmRtHzPYcb5+LOBfVsp9Pj0mCRhg56ALRw3QqSxPYgFDHMVaSnAVDElQpjDYAKxe7HrgyAfnSlwpoMgArF7seuDIB+dKXCmgyACsXux64MgH50pcKaDIAKxe7HrgyAfnSlwpoMgBnEduO8n0m+j+MahCUV+pHf1dQun18zyBdkA3/Lb9A9wgCYpk9nj8EfEC4tK27Q9o7XGOIjZXf2GADTAWjyQ4Sbg5qnl3yvJGwqk84AePcMkO6VSxdSxnAck4RlZQo1AN4NwF+By8qIWmHbo5Kwokx/BkDcp4A9kpQ7XRkA0wGY2nPw+yguAoVVZTd0GgAz3Qbu5VIGsr0H1wLvLTPFBmj772xJd5vbZJTXyuY3AMoqGHl7AyByA8uWbwCUVTDy9gZA5AaWLd8AKKtg5O0NgMgNLFu+AVBWwcjbGwCRG1i2fAOgrIKRtzcAIjewbPkGQFkFI29vAERuYNnyDYCZXgbZmsAzqmjtto5md7CtCTz3F1E/AGxN4DkE1A+AVvb9fFsT2MGgjgDYmsCz5oD6ARDXKcDWBE6/iC9LbOc7xLYmsK6ngHTcztYE1vc2sOyDldja24Og2BxTrtcAUBY0tnQGQGyOKddrACgLGls6AyA2x5TrNQCUBY0tnQEQm2PK9RoAyoLGls4AiM0x5XoNAGVBY0tnAMTmmHK9BsAMgqp+J1D5u37K/mMATFM02JpApe/6GQCB/8eNC7sgpPR3/QyA0ACEXRNY+rt+BkB4AEKuCSz9XT8DIDQAYU8BpdfwGQChAQj1ncD0IlDhu34GQGAAUoGV1wSqftfPAKgAAG2RQ+Rzu1nAIOuBjQjDOJYgLAcu0Oyv7Crr07VEszdQU7wQudw4y5hgOzCKcFGIPs7OaQCEVtgzvzvI+RzlThz3VWF8p6wJSXRmFJsBPI2eKazzdPIxhLUl0syl6RFJWDmXhtPbGABzVNG1uAJ4GnSMKFSG4zfS4JpCbWYJNgDmoKIbYymO54HL59C8fBPHj6TBLeUTgQFQUEU3zkImeA5hdcGmeuHCRhlhXCOhAVBQRddkJ8JdBZtphr/DIEtkA29qJDUACqjY2aF8BGFBbjPHq0j2K92P8KKMcKxbGzfGKhy/ABbn5N4vCZ/N7d8zwADwFCoNc63sv5XcmtPkLYTNHGafbKPtk76A+dDmwzLKSz55fWIMAB+VUvPHGWKSN4CFXZqcTP+djSS84JmWQuY7xqRB4pvbJ84A8FEpBWCMG3A8kRO+RRJ2eaZMZ5SPAj/zmPbTlEd5h6tkE//wze8TZwD4qDQ1/T8I3D5ruOMVVnClrOOUT8rMfMczCO/JjXdM4vi4jHIoN7ZggAHgKZhrchDh+i7h90rCDp90hcwHB9wiCXt8cheNMQA8FXOt7MJreNbwNmt8fqEFzU/t3ywNfuBZZuEwA8BTMtfkOMKFs4YPcknevblr8jHgKa9pf6qjQtcUnkM5J8wA8FSt7Dr9zHzJLvgWeXYZ3Py0DgPA040yABQ237FVGjzgWVqpME0A/tuVbsfF0uA/partYeO5AtDP5uvOAE3+hPDBWT0aYLXcxO966GGprucCQL+brw3AswifmFVlxz3SYGcpF3rYuCgA7mHW0uYn3ud8x93S4P6qh6h3CmiyC+GLXQAo9KCkaiHy+isCQMf8p3IeG/+/yx6ZrzsDtLgReLyrkI4vSSN7ohbd4QvAHMzfLg2+2itB9GaA9GXJBK93vVeGk7RZ6/PApFeCzNavDwCuxaeAAwV++fdLg7t7OVY1ANJBeL8udXyehEdFssecURx5AAB3AN8EzvMakOMBabDVKzZgkC4AYyynzcveCybgEYQDPgsmAmrgldoDAK88WVCfmK96DXB69K7JNxC+7K9GzSL7yPwwAKSLJid5Fri6Ztb6DHeXJGzxCawqRvUUcGYWmFo2/duerJmvSrni/fSd+UFmgDMQTG2c+Clkf+t+fEeS7CKx744gM8BZEKQrXNPbouv6buTVFHQSx83S4JFquiveS1AAsgvehxhkEXdUvHmyuBL6LZ5hgK39/v4jOABnZoN0+/QkO3DcVOEuWn1bu2V0vA38mPP4Vr8bf3oYlQFwFgjpXcJ6HBshe3u4NMQHFII7ny7UlOy/maYbPtI3oY9yigOyiePB+1bsoHIAFGu3VAoKGAAKIsacwgCI2T2F2g0ABRFjTmEAxOyeQu0GgIKIMacwAGJ2T6F2A0BBxJhTGAAxu6dQuwGgIGLMKf4HAR/hrhUhGSQAAAAASUVORK5CYII=");',
+		'}',
+		'</style>'
+	].join(''));
+
+	exports('treeTable', tt);
 });
diff --git a/len-sys/src/main/resources/plugin/lenos/main.css b/len-sys/src/main/resources/plugin/lenos/main.css
index b52bde5..e6c9494 100644
--- a/len-sys/src/main/resources/plugin/lenos/main.css
+++ b/len-sys/src/main/resources/plugin/lenos/main.css
@@ -1,163 +1,163 @@
 html {
-    background-color: #fff;
+	background-color: #fff;
 }
 
 .layui-input {
-    min-width: 120px;
+	min-width: 120px;
 }
 
 .lenos-search .search-select {
-    height: auto;
-    background-color: #f8f8f8;
-    width: 100%;
+	height: auto;
+	background-color: #f8f8f8;
+	width: 100%;
 }
 
 .lenos-search .search-zoom {
-    display: flex;
-    width: 100%;
-    height: 20px;
-    background-color: #f8f8f8;
-    padding-bottom: 5px
+	display: flex;
+	width: 100%;
+	height: 20px;
+	background-color: #f8f8f8;
+	padding-bottom: 5px
 }
 
 .lenos-search .search-zoom .search-zoom-show {
-    cursor: pointer;
-    text-align: center;
-    margin: auto;
-    width: 50px;
-    height: 18px;
-    background-color: white;
-    border-radius: 15px
+	cursor: pointer;
+	text-align: center;
+	margin: auto;
+	width: 50px;
+	height: 18px;
+	background-color: white;
+	border-radius: 15px
 }
 
 .lenos-search .search-zoom .search-zoom-show:hover {
-    background-color: #fdfdfd;
+	background-color: #fdfdfd;
 }
 
 .lenos-search .search-zoom .search-zoom-hidden {
-    display: none;
-    cursor: pointer;
-    text-align: center;
-    margin: auto;
-    width: 50px;
-    height: 18px;
-    background-color: white;
-    border-radius: 15px
+	display: none;
+	cursor: pointer;
+	text-align: center;
+	margin: auto;
+	width: 50px;
+	height: 18px;
+	background-color: white;
+	border-radius: 15px
 }
 
 
 .lenos-search .search-select .search-div {
-    margin: 0 0 10px 20px;
+	margin: 0 0 10px 20px;
 }
 
 .lenos-search .search-select .search-div .search-div-label {
-    width: 100px;
-    padding-top: 3px
+	width: 100px;
+	padding-top: 3px
 }
 
 .lenos-search .search-select .search-div span {
-    color: #707070;
+	color: #707070;
 }
 
 .lenos-search .search-select span .layui-input {
-    height: 25px;
+	height: 25px;
 }
 
 
 .lenos-search {
-    padding: 10px 0;
-    position: relative;
-    z-index: 99;
-    height: auto;
-    background-color: #f8f8f8;
+	padding: 10px 0;
+	position: relative;
+	z-index: 99;
+	height: auto;
+	background-color: #f8f8f8;
 }
 
 .layui-col-md12 {
-    height: 40px;
-    padding-top: 4px;
-    margin-top: 4px;
-    border-top: 1px solid #e5e5e5;
+	height: 40px;
+	padding-top: 4px;
+	margin-top: 4px;
+	border-top: 1px solid #e5e5e5;
 }
 
 .icon-position-button {
-    padding-right: 8px;
-    padding-left: 10px;
+	padding-right: 8px;
+	padding-left: 10px;
 }
 
 .layui-col-md13 {
-    height: 41px;
-    margin-top: 2px;
-    padding-top: 3px;
-    border-top: 1px solid #e5e5e5;
-    border-bottom: 1px solid #e5e5e5;
+	height: 41px;
+	margin-top: 2px;
+	padding-top: 3px;
+	border-top: 1px solid #e5e5e5;
+	border-bottom: 1px solid #e5e5e5;
 }
 
 .icon-position-no-button {
-    padding: 1px 9px;
-    padding-left: 12px;
-    height: 36px;
-    margin-left: 9px;
-    float: right;
-    margin-right: 10px;
+	padding: 1px 9px;
+	padding-left: 12px;
+	height: 36px;
+	margin-left: 9px;
+	float: right;
+	margin-right: 10px;
 }
 
 .icon-position-no-button i {
-    font-size: 21px !important;
+	font-size: 21px !important;
 }
 
 .layui-inline input {
-    width: 100%
+	width: 100%
 }
 
 .lenos-search div {
-    float: left;
+	float: left;
 }
 
 
 /*列表按鈕*/
 .len-button button {
-    border-radius: 100px;
-    margin-bottom: 10px;
-    max-width: 200px;
+	border-radius: 100px;
+	margin-bottom: 10px;
+	max-width: 200px;
 }
 
 .len-button .layui-btn-group span {
-    margin-left: 10px;
+	margin-left: 10px;
 }
 
 .len-button .layui-btn-group .len-button-query {
-    float: right;
-    height: 40px;
-    padding-right: 85px;
+	float: right;
+	height: 40px;
+	padding-right: 85px;
 }
 
 body .layui-laypage .layui-laypage-curr .layui-laypage-em {
-    background-color: #1E9FFF;
+	background-color: #1E9FFF;
 }
 
 body .x-red {
-    color: red;
+	color: red;
 }
 
 body .layui-table-view {
-    margin: 0 0;
+	margin: 0 0;
 }
 
 body .layui-col-md12 {
-    margin-top: 0;
-    height: 40px;
-    padding-top: 4px;
-    border-top: 1px solid #e5e5e5;
+	margin-top: 0;
+	height: 40px;
+	padding-top: 4px;
+	border-top: 1px solid #e5e5e5;
 }
 
 
 .layer-footer {
-    background-color: #F8F8F8;
-    padding-top: 10px;
-    border-top: 1px solid #eee;
-    position: fixed;
-    text-align: center;
-    bottom: 0;
-    width: 100%;
-    height: 50px
+	background-color: #F8F8F8;
+	padding-top: 10px;
+	border-top: 1px solid #eee;
+	position: fixed;
+	text-align: center;
+	bottom: 0;
+	width: 100%;
+	height: 50px
 }
diff --git a/len-sys/src/main/resources/plugin/plugins/font-awesome/css/font-awesome.css b/len-sys/src/main/resources/plugin/plugins/font-awesome/css/font-awesome.css
index ee906a8..0b33dd6 100644
--- a/len-sys/src/main/resources/plugin/plugins/font-awesome/css/font-awesome.css
+++ b/len-sys/src/main/resources/plugin/plugins/font-awesome/css/font-awesome.css
@@ -5,2333 +5,3045 @@
 /* FONT PATH
  * -------------------------- */
 @font-face {
-  font-family: 'FontAwesome';
-  src: url('../fonts/fontawesome-webfont.eot?v=4.7.0');
-  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');
-  font-weight: normal;
-  font-style: normal;
+	font-family: 'FontAwesome';
+	src: url('../fonts/fontawesome-webfont.eot?v=4.7.0');
+	src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');
+	font-weight: normal;
+	font-style: normal;
 }
+
 .fa {
-  display: inline-block;
-  font: normal normal normal 14px/1 FontAwesome;
-  font-size: inherit;
-  text-rendering: auto;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
+	display: inline-block;
+	font: normal normal normal 14px/1 FontAwesome;
+	font-size: inherit;
+	text-rendering: auto;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
 /* makes the font 33% larger relative to the icon container */
 .fa-lg {
-  font-size: 1.33333333em;
-  line-height: 0.75em;
-  vertical-align: -15%;
+	font-size: 1.33333333em;
+	line-height: 0.75em;
+	vertical-align: -15%;
 }
+
 .fa-2x {
-  font-size: 2em;
+	font-size: 2em;
 }
+
 .fa-3x {
-  font-size: 3em;
+	font-size: 3em;
 }
+
 .fa-4x {
-  font-size: 4em;
+	font-size: 4em;
 }
+
 .fa-5x {
-  font-size: 5em;
+	font-size: 5em;
 }
+
 .fa-fw {
-  width: 1.28571429em;
-  text-align: center;
+	width: 1.28571429em;
+	text-align: center;
 }
+
 .fa-ul {
-  padding-left: 0;
-  margin-left: 2.14285714em;
-  list-style-type: none;
+	padding-left: 0;
+	margin-left: 2.14285714em;
+	list-style-type: none;
 }
+
 .fa-ul > li {
-  position: relative;
+	position: relative;
 }
+
 .fa-li {
-  position: absolute;
-  left: -2.14285714em;
-  width: 2.14285714em;
-  top: 0.14285714em;
-  text-align: center;
+	position: absolute;
+	left: -2.14285714em;
+	width: 2.14285714em;
+	top: 0.14285714em;
+	text-align: center;
 }
+
 .fa-li.fa-lg {
-  left: -1.85714286em;
+	left: -1.85714286em;
 }
+
 .fa-border {
-  padding: .2em .25em .15em;
-  border: solid 0.08em #eeeeee;
-  border-radius: .1em;
+	padding: .2em .25em .15em;
+	border: solid 0.08em #eeeeee;
+	border-radius: .1em;
 }
+
 .fa-pull-left {
-  float: left;
+	float: left;
 }
+
 .fa-pull-right {
-  float: right;
+	float: right;
 }
+
 .fa.fa-pull-left {
-  margin-right: .3em;
+	margin-right: .3em;
 }
+
 .fa.fa-pull-right {
-  margin-left: .3em;
+	margin-left: .3em;
 }
+
 /* Deprecated as of 4.4.0 */
 .pull-right {
-  float: right;
+	float: right;
 }
+
 .pull-left {
-  float: left;
+	float: left;
 }
+
 .fa.pull-left {
-  margin-right: .3em;
+	margin-right: .3em;
 }
+
 .fa.pull-right {
-  margin-left: .3em;
+	margin-left: .3em;
 }
+
 .fa-spin {
-  -webkit-animation: fa-spin 2s infinite linear;
-  animation: fa-spin 2s infinite linear;
+	-webkit-animation: fa-spin 2s infinite linear;
+	animation: fa-spin 2s infinite linear;
 }
+
 .fa-pulse {
-  -webkit-animation: fa-spin 1s infinite steps(8);
-  animation: fa-spin 1s infinite steps(8);
+	-webkit-animation: fa-spin 1s infinite steps(8);
+	animation: fa-spin 1s infinite steps(8);
 }
+
 @-webkit-keyframes fa-spin {
-  0% {
-    -webkit-transform: rotate(0deg);
-    transform: rotate(0deg);
-  }
-  100% {
-    -webkit-transform: rotate(359deg);
-    transform: rotate(359deg);
-  }
-}
+	0% {
+		-webkit-transform: rotate(0deg);
+		transform: rotate(0deg);
+	}
+	100% {
+		-webkit-transform: rotate(359deg);
+		transform: rotate(359deg);
+	}
+}
+
 @keyframes fa-spin {
-  0% {
-    -webkit-transform: rotate(0deg);
-    transform: rotate(0deg);
-  }
-  100% {
-    -webkit-transform: rotate(359deg);
-    transform: rotate(359deg);
-  }
-}
+	0% {
+		-webkit-transform: rotate(0deg);
+		transform: rotate(0deg);
+	}
+	100% {
+		-webkit-transform: rotate(359deg);
+		transform: rotate(359deg);
+	}
+}
+
 .fa-rotate-90 {
-  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";
-  -webkit-transform: rotate(90deg);
-  -ms-transform: rotate(90deg);
-  transform: rotate(90deg);
+	-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";
+	-webkit-transform: rotate(90deg);
+	-ms-transform: rotate(90deg);
+	transform: rotate(90deg);
 }
+
 .fa-rotate-180 {
-  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";
-  -webkit-transform: rotate(180deg);
-  -ms-transform: rotate(180deg);
-  transform: rotate(180deg);
+	-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";
+	-webkit-transform: rotate(180deg);
+	-ms-transform: rotate(180deg);
+	transform: rotate(180deg);
 }
+
 .fa-rotate-270 {
-  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";
-  -webkit-transform: rotate(270deg);
-  -ms-transform: rotate(270deg);
-  transform: rotate(270deg);
+	-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";
+	-webkit-transform: rotate(270deg);
+	-ms-transform: rotate(270deg);
+	transform: rotate(270deg);
 }
+
 .fa-flip-horizontal {
-  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";
-  -webkit-transform: scale(-1, 1);
-  -ms-transform: scale(-1, 1);
-  transform: scale(-1, 1);
+	-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";
+	-webkit-transform: scale(-1, 1);
+	-ms-transform: scale(-1, 1);
+	transform: scale(-1, 1);
 }
+
 .fa-flip-vertical {
-  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
-  -webkit-transform: scale(1, -1);
-  -ms-transform: scale(1, -1);
-  transform: scale(1, -1);
+	-ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
+	-webkit-transform: scale(1, -1);
+	-ms-transform: scale(1, -1);
+	transform: scale(1, -1);
 }
+
 :root .fa-rotate-90,
 :root .fa-rotate-180,
 :root .fa-rotate-270,
 :root .fa-flip-horizontal,
 :root .fa-flip-vertical {
-  filter: none;
+	filter: none;
 }
+
 .fa-stack {
-  position: relative;
-  display: inline-block;
-  width: 2em;
-  height: 2em;
-  line-height: 2em;
-  vertical-align: middle;
-}
+	position: relative;
+	display: inline-block;
+	width: 2em;
+	height: 2em;
+	line-height: 2em;
+	vertical-align: middle;
+}
+
 .fa-stack-1x,
 .fa-stack-2x {
-  position: absolute;
-  left: 0;
-  width: 100%;
-  text-align: center;
+	position: absolute;
+	left: 0;
+	width: 100%;
+	text-align: center;
 }
+
 .fa-stack-1x {
-  line-height: inherit;
+	line-height: inherit;
 }
+
 .fa-stack-2x {
-  font-size: 2em;
+	font-size: 2em;
 }
+
 .fa-inverse {
-  color: #ffffff;
+	color: #ffffff;
 }
+
 /* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
    readers do not read off random characters that represent icons */
 .fa-glass:before {
-  content: "\f000";
+	content: "\f000";
 }
+
 .fa-music:before {
-  content: "\f001";
+	content: "\f001";
 }
+
 .fa-search:before {
-  content: "\f002";
+	content: "\f002";
 }
+
 .fa-envelope-o:before {
-  content: "\f003";
+	content: "\f003";
 }
+
 .fa-heart:before {
-  content: "\f004";
+	content: "\f004";
 }
+
 .fa-star:before {
-  content: "\f005";
+	content: "\f005";
 }
+
 .fa-star-o:before {
-  content: "\f006";
+	content: "\f006";
 }
+
 .fa-user:before {
-  content: "\f007";
+	content: "\f007";
 }
+
 .fa-film:before {
-  content: "\f008";
+	content: "\f008";
 }
+
 .fa-th-large:before {
-  content: "\f009";
+	content: "\f009";
 }
+
 .fa-th:before {
-  content: "\f00a";
+	content: "\f00a";
 }
+
 .fa-th-list:before {
-  content: "\f00b";
+	content: "\f00b";
 }
+
 .fa-check:before {
-  content: "\f00c";
+	content: "\f00c";
 }
+
 .fa-remove:before,
 .fa-close:before,
 .fa-times:before {
-  content: "\f00d";
+	content: "\f00d";
 }
+
 .fa-search-plus:before {
-  content: "\f00e";
+	content: "\f00e";
 }
+
 .fa-search-minus:before {
-  content: "\f010";
+	content: "\f010";
 }
+
 .fa-power-off:before {
-  content: "\f011";
+	content: "\f011";
 }
+
 .fa-signal:before {
-  content: "\f012";
+	content: "\f012";
 }
+
 .fa-gear:before,
 .fa-cog:before {
-  content: "\f013";
+	content: "\f013";
 }
+
 .fa-trash-o:before {
-  content: "\f014";
+	content: "\f014";
 }
+
 .fa-home:before {
-  content: "\f015";
+	content: "\f015";
 }
+
 .fa-file-o:before {
-  content: "\f016";
+	content: "\f016";
 }
+
 .fa-clock-o:before {
-  content: "\f017";
+	content: "\f017";
 }
+
 .fa-road:before {
-  content: "\f018";
+	content: "\f018";
 }
+
 .fa-download:before {
-  content: "\f019";
+	content: "\f019";
 }
+
 .fa-arrow-circle-o-down:before {
-  content: "\f01a";
+	content: "\f01a";
 }
+
 .fa-arrow-circle-o-up:before {
-  content: "\f01b";
+	content: "\f01b";
 }
+
 .fa-inbox:before {
-  content: "\f01c";
+	content: "\f01c";
 }
+
 .fa-play-circle-o:before {
-  content: "\f01d";
+	content: "\f01d";
 }
+
 .fa-rotate-right:before,
 .fa-repeat:before {
-  content: "\f01e";
+	content: "\f01e";
 }
+
 .fa-refresh:before {
-  content: "\f021";
+	content: "\f021";
 }
+
 .fa-list-alt:before {
-  content: "\f022";
+	content: "\f022";
 }
+
 .fa-lock:before {
-  content: "\f023";
+	content: "\f023";
 }
+
 .fa-flag:before {
-  content: "\f024";
+	content: "\f024";
 }
+
 .fa-headphones:before {
-  content: "\f025";
+	content: "\f025";
 }
+
 .fa-volume-off:before {
-  content: "\f026";
+	content: "\f026";
 }
+
 .fa-volume-down:before {
-  content: "\f027";
+	content: "\f027";
 }
+
 .fa-volume-up:before {
-  content: "\f028";
+	content: "\f028";
 }
+
 .fa-qrcode:before {
-  content: "\f029";
+	content: "\f029";
 }
+
 .fa-barcode:before {
-  content: "\f02a";
+	content: "\f02a";
 }
+
 .fa-tag:before {
-  content: "\f02b";
+	content: "\f02b";
 }
+
 .fa-tags:before {
-  content: "\f02c";
+	content: "\f02c";
 }
+
 .fa-book:before {
-  content: "\f02d";
+	content: "\f02d";
 }
+
 .fa-bookmark:before {
-  content: "\f02e";
+	content: "\f02e";
 }
+
 .fa-print:before {
-  content: "\f02f";
+	content: "\f02f";
 }
+
 .fa-camera:before {
-  content: "\f030";
+	content: "\f030";
 }
+
 .fa-font:before {
-  content: "\f031";
+	content: "\f031";
 }
+
 .fa-bold:before {
-  content: "\f032";
+	content: "\f032";
 }
+
 .fa-italic:before {
-  content: "\f033";
+	content: "\f033";
 }
+
 .fa-text-height:before {
-  content: "\f034";
+	content: "\f034";
 }
+
 .fa-text-width:before {
-  content: "\f035";
+	content: "\f035";
 }
+
 .fa-align-left:before {
-  content: "\f036";
+	content: "\f036";
 }
+
 .fa-align-center:before {
-  content: "\f037";
+	content: "\f037";
 }
+
 .fa-align-right:before {
-  content: "\f038";
+	content: "\f038";
 }
+
 .fa-align-justify:before {
-  content: "\f039";
+	content: "\f039";
 }
+
 .fa-list:before {
-  content: "\f03a";
+	content: "\f03a";
 }
+
 .fa-dedent:before,
 .fa-outdent:before {
-  content: "\f03b";
+	content: "\f03b";
 }
+
 .fa-indent:before {
-  content: "\f03c";
+	content: "\f03c";
 }
+
 .fa-video-camera:before {
-  content: "\f03d";
+	content: "\f03d";
 }
+
 .fa-photo:before,
 .fa-image:before,
 .fa-picture-o:before {
-  content: "\f03e";
+	content: "\f03e";
 }
+
 .fa-pencil:before {
-  content: "\f040";
+	content: "\f040";
 }
+
 .fa-map-marker:before {
-  content: "\f041";
+	content: "\f041";
 }
+
 .fa-adjust:before {
-  content: "\f042";
+	content: "\f042";
 }
+
 .fa-tint:before {
-  content: "\f043";
+	content: "\f043";
 }
+
 .fa-edit:before,
 .fa-pencil-square-o:before {
-  content: "\f044";
+	content: "\f044";
 }
+
 .fa-share-square-o:before {
-  content: "\f045";
+	content: "\f045";
 }
+
 .fa-check-square-o:before {
-  content: "\f046";
+	content: "\f046";
 }
+
 .fa-arrows:before {
-  content: "\f047";
+	content: "\f047";
 }
+
 .fa-step-backward:before {
-  content: "\f048";
+	content: "\f048";
 }
+
 .fa-fast-backward:before {
-  content: "\f049";
+	content: "\f049";
 }
+
 .fa-backward:before {
-  content: "\f04a";
+	content: "\f04a";
 }
+
 .fa-play:before {
-  content: "\f04b";
+	content: "\f04b";
 }
+
 .fa-pause:before {
-  content: "\f04c";
+	content: "\f04c";
 }
+
 .fa-stop:before {
-  content: "\f04d";
+	content: "\f04d";
 }
+
 .fa-forward:before {
-  content: "\f04e";
+	content: "\f04e";
 }
+
 .fa-fast-forward:before {
-  content: "\f050";
+	content: "\f050";
 }
+
 .fa-step-forward:before {
-  content: "\f051";
+	content: "\f051";
 }
+
 .fa-eject:before {
-  content: "\f052";
+	content: "\f052";
 }
+
 .fa-chevron-left:before {
-  content: "\f053";
+	content: "\f053";
 }
+
 .fa-chevron-right:before {
-  content: "\f054";
+	content: "\f054";
 }
+
 .fa-plus-circle:before {
-  content: "\f055";
+	content: "\f055";
 }
+
 .fa-minus-circle:before {
-  content: "\f056";
+	content: "\f056";
 }
+
 .fa-times-circle:before {
-  content: "\f057";
+	content: "\f057";
 }
+
 .fa-check-circle:before {
-  content: "\f058";
+	content: "\f058";
 }
+
 .fa-question-circle:before {
-  content: "\f059";
+	content: "\f059";
 }
+
 .fa-info-circle:before {
-  content: "\f05a";
+	content: "\f05a";
 }
+
 .fa-crosshairs:before {
-  content: "\f05b";
+	content: "\f05b";
 }
+
 .fa-times-circle-o:before {
-  content: "\f05c";
+	content: "\f05c";
 }
+
 .fa-check-circle-o:before {
-  content: "\f05d";
+	content: "\f05d";
 }
+
 .fa-ban:before {
-  content: "\f05e";
+	content: "\f05e";
 }
+
 .fa-arrow-left:before {
-  content: "\f060";
+	content: "\f060";
 }
+
 .fa-arrow-right:before {
-  content: "\f061";
+	content: "\f061";
 }
+
 .fa-arrow-up:before {
-  content: "\f062";
+	content: "\f062";
 }
+
 .fa-arrow-down:before {
-  content: "\f063";
+	content: "\f063";
 }
+
 .fa-mail-forward:before,
 .fa-share:before {
-  content: "\f064";
+	content: "\f064";
 }
+
 .fa-expand:before {
-  content: "\f065";
+	content: "\f065";
 }
+
 .fa-compress:before {
-  content: "\f066";
+	content: "\f066";
 }
+
 .fa-plus:before {
-  content: "\f067";
+	content: "\f067";
 }
+
 .fa-minus:before {
-  content: "\f068";
+	content: "\f068";
 }
+
 .fa-asterisk:before {
-  content: "\f069";
+	content: "\f069";
 }
+
 .fa-exclamation-circle:before {
-  content: "\f06a";
+	content: "\f06a";
 }
+
 .fa-gift:before {
-  content: "\f06b";
+	content: "\f06b";
 }
+
 .fa-leaf:before {
-  content: "\f06c";
+	content: "\f06c";
 }
+
 .fa-fire:before {
-  content: "\f06d";
+	content: "\f06d";
 }
+
 .fa-eye:before {
-  content: "\f06e";
+	content: "\f06e";
 }
+
 .fa-eye-slash:before {
-  content: "\f070";
+	content: "\f070";
 }
+
 .fa-warning:before,
 .fa-exclamation-triangle:before {
-  content: "\f071";
+	content: "\f071";
 }
+
 .fa-plane:before {
-  content: "\f072";
+	content: "\f072";
 }
+
 .fa-calendar:before {
-  content: "\f073";
+	content: "\f073";
 }
+
 .fa-random:before {
-  content: "\f074";
+	content: "\f074";
 }
+
 .fa-comment:before {
-  content: "\f075";
+	content: "\f075";
 }
+
 .fa-magnet:before {
-  content: "\f076";
+	content: "\f076";
 }
+
 .fa-chevron-up:before {
-  content: "\f077";
+	content: "\f077";
 }
+
 .fa-chevron-down:before {
-  content: "\f078";
+	content: "\f078";
 }
+
 .fa-retweet:before {
-  content: "\f079";
+	content: "\f079";
 }
+
 .fa-shopping-cart:before {
-  content: "\f07a";
+	content: "\f07a";
 }
+
 .fa-folder:before {
-  content: "\f07b";
+	content: "\f07b";
 }
+
 .fa-folder-open:before {
-  content: "\f07c";
+	content: "\f07c";
 }
+
 .fa-arrows-v:before {
-  content: "\f07d";
+	content: "\f07d";
 }
+
 .fa-arrows-h:before {
-  content: "\f07e";
+	content: "\f07e";
 }
+
 .fa-bar-chart-o:before,
 .fa-bar-chart:before {
-  content: "\f080";
+	content: "\f080";
 }
+
 .fa-twitter-square:before {
-  content: "\f081";
+	content: "\f081";
 }
+
 .fa-facebook-square:before {
-  content: "\f082";
+	content: "\f082";
 }
+
 .fa-camera-retro:before {
-  content: "\f083";
+	content: "\f083";
 }
+
 .fa-key:before {
-  content: "\f084";
+	content: "\f084";
 }
+
 .fa-gears:before,
 .fa-cogs:before {
-  content: "\f085";
+	content: "\f085";
 }
+
 .fa-comments:before {
-  content: "\f086";
+	content: "\f086";
 }
+
 .fa-thumbs-o-up:before {
-  content: "\f087";
+	content: "\f087";
 }
+
 .fa-thumbs-o-down:before {
-  content: "\f088";
+	content: "\f088";
 }
+
 .fa-star-half:before {
-  content: "\f089";
+	content: "\f089";
 }
+
 .fa-heart-o:before {
-  content: "\f08a";
+	content: "\f08a";
 }
+
 .fa-sign-out:before {
-  content: "\f08b";
+	content: "\f08b";
 }
+
 .fa-linkedin-square:before {
-  content: "\f08c";
+	content: "\f08c";
 }
+
 .fa-thumb-tack:before {
-  content: "\f08d";
+	content: "\f08d";
 }
+
 .fa-external-link:before {
-  content: "\f08e";
+	content: "\f08e";
 }
+
 .fa-sign-in:before {
-  content: "\f090";
+	content: "\f090";
 }
+
 .fa-trophy:before {
-  content: "\f091";
+	content: "\f091";
 }
+
 .fa-github-square:before {
-  content: "\f092";
+	content: "\f092";
 }
+
 .fa-upload:before {
-  content: "\f093";
+	content: "\f093";
 }
+
 .fa-lemon-o:before {
-  content: "\f094";
+	content: "\f094";
 }
+
 .fa-phone:before {
-  content: "\f095";
+	content: "\f095";
 }
+
 .fa-square-o:before {
-  content: "\f096";
+	content: "\f096";
 }
+
 .fa-bookmark-o:before {
-  content: "\f097";
+	content: "\f097";
 }
+
 .fa-phone-square:before {
-  content: "\f098";
+	content: "\f098";
 }
+
 .fa-twitter:before {
-  content: "\f099";
+	content: "\f099";
 }
+
 .fa-facebook-f:before,
 .fa-facebook:before {
-  content: "\f09a";
+	content: "\f09a";
 }
+
 .fa-github:before {
-  content: "\f09b";
+	content: "\f09b";
 }
+
 .fa-unlock:before {
-  content: "\f09c";
+	content: "\f09c";
 }
+
 .fa-credit-card:before {
-  content: "\f09d";
+	content: "\f09d";
 }
+
 .fa-feed:before,
 .fa-rss:before {
-  content: "\f09e";
+	content: "\f09e";
 }
+
 .fa-hdd-o:before {
-  content: "\f0a0";
+	content: "\f0a0";
 }
+
 .fa-bullhorn:before {
-  content: "\f0a1";
+	content: "\f0a1";
 }
+
 .fa-bell:before {
-  content: "\f0f3";
+	content: "\f0f3";
 }
+
 .fa-certificate:before {
-  content: "\f0a3";
+	content: "\f0a3";
 }
+
 .fa-hand-o-right:before {
-  content: "\f0a4";
+	content: "\f0a4";
 }
+
 .fa-hand-o-left:before {
-  content: "\f0a5";
+	content: "\f0a5";
 }
+
 .fa-hand-o-up:before {
-  content: "\f0a6";
+	content: "\f0a6";
 }
+
 .fa-hand-o-down:before {
-  content: "\f0a7";
+	content: "\f0a7";
 }
+
 .fa-arrow-circle-left:before {
-  content: "\f0a8";
+	content: "\f0a8";
 }
+
 .fa-arrow-circle-right:before {
-  content: "\f0a9";
+	content: "\f0a9";
 }
+
 .fa-arrow-circle-up:before {
-  content: "\f0aa";
+	content: "\f0aa";
 }
+
 .fa-arrow-circle-down:before {
-  content: "\f0ab";
+	content: "\f0ab";
 }
+
 .fa-globe:before {
-  content: "\f0ac";
+	content: "\f0ac";
 }
+
 .fa-wrench:before {
-  content: "\f0ad";
+	content: "\f0ad";
 }
+
 .fa-tasks:before {
-  content: "\f0ae";
+	content: "\f0ae";
 }
+
 .fa-filter:before {
-  content: "\f0b0";
+	content: "\f0b0";
 }
+
 .fa-briefcase:before {
-  content: "\f0b1";
+	content: "\f0b1";
 }
+
 .fa-arrows-alt:before {
-  content: "\f0b2";
+	content: "\f0b2";
 }
+
 .fa-group:before,
 .fa-users:before {
-  content: "\f0c0";
+	content: "\f0c0";
 }
+
 .fa-chain:before,
 .fa-link:before {
-  content: "\f0c1";
+	content: "\f0c1";
 }
+
 .fa-cloud:before {
-  content: "\f0c2";
+	content: "\f0c2";
 }
+
 .fa-flask:before {
-  content: "\f0c3";
+	content: "\f0c3";
 }
+
 .fa-cut:before,
 .fa-scissors:before {
-  content: "\f0c4";
+	content: "\f0c4";
 }
+
 .fa-copy:before,
 .fa-files-o:before {
-  content: "\f0c5";
+	content: "\f0c5";
 }
+
 .fa-paperclip:before {
-  content: "\f0c6";
+	content: "\f0c6";
 }
+
 .fa-save:before,
 .fa-floppy-o:before {
-  content: "\f0c7";
+	content: "\f0c7";
 }
+
 .fa-square:before {
-  content: "\f0c8";
+	content: "\f0c8";
 }
+
 .fa-navicon:before,
 .fa-reorder:before,
 .fa-bars:before {
-  content: "\f0c9";
+	content: "\f0c9";
 }
+
 .fa-list-ul:before {
-  content: "\f0ca";
+	content: "\f0ca";
 }
+
 .fa-list-ol:before {
-  content: "\f0cb";
+	content: "\f0cb";
 }
+
 .fa-strikethrough:before {
-  content: "\f0cc";
+	content: "\f0cc";
 }
+
 .fa-underline:before {
-  content: "\f0cd";
+	content: "\f0cd";
 }
+
 .fa-table:before {
-  content: "\f0ce";
+	content: "\f0ce";
 }
+
 .fa-magic:before {
-  content: "\f0d0";
+	content: "\f0d0";
 }
+
 .fa-truck:before {
-  content: "\f0d1";
+	content: "\f0d1";
 }
+
 .fa-pinterest:before {
-  content: "\f0d2";
+	content: "\f0d2";
 }
+
 .fa-pinterest-square:before {
-  content: "\f0d3";
+	content: "\f0d3";
 }
+
 .fa-google-plus-square:before {
-  content: "\f0d4";
+	content: "\f0d4";
 }
+
 .fa-google-plus:before {
-  content: "\f0d5";
+	content: "\f0d5";
 }
+
 .fa-money:before {
-  content: "\f0d6";
+	content: "\f0d6";
 }
+
 .fa-caret-down:before {
-  content: "\f0d7";
+	content: "\f0d7";
 }
+
 .fa-caret-up:before {
-  content: "\f0d8";
+	content: "\f0d8";
 }
+
 .fa-caret-left:before {
-  content: "\f0d9";
+	content: "\f0d9";
 }
+
 .fa-caret-right:before {
-  content: "\f0da";
+	content: "\f0da";
 }
+
 .fa-columns:before {
-  content: "\f0db";
+	content: "\f0db";
 }
+
 .fa-unsorted:before,
 .fa-sort:before {
-  content: "\f0dc";
+	content: "\f0dc";
 }
+
 .fa-sort-down:before,
 .fa-sort-desc:before {
-  content: "\f0dd";
+	content: "\f0dd";
 }
+
 .fa-sort-up:before,
 .fa-sort-asc:before {
-  content: "\f0de";
+	content: "\f0de";
 }
+
 .fa-envelope:before {
-  content: "\f0e0";
+	content: "\f0e0";
 }
+
 .fa-linkedin:before {
-  content: "\f0e1";
+	content: "\f0e1";
 }
+
 .fa-rotate-left:before,
 .fa-undo:before {
-  content: "\f0e2";
+	content: "\f0e2";
 }
+
 .fa-legal:before,
 .fa-gavel:before {
-  content: "\f0e3";
+	content: "\f0e3";
 }
+
 .fa-dashboard:before,
 .fa-tachometer:before {
-  content: "\f0e4";
+	content: "\f0e4";
 }
+
 .fa-comment-o:before {
-  content: "\f0e5";
+	content: "\f0e5";
 }
+
 .fa-comments-o:before {
-  content: "\f0e6";
+	content: "\f0e6";
 }
+
 .fa-flash:before,
 .fa-bolt:before {
-  content: "\f0e7";
+	content: "\f0e7";
 }
+
 .fa-sitemap:before {
-  content: "\f0e8";
+	content: "\f0e8";
 }
+
 .fa-umbrella:before {
-  content: "\f0e9";
+	content: "\f0e9";
 }
+
 .fa-paste:before,
 .fa-clipboard:before {
-  content: "\f0ea";
+	content: "\f0ea";
 }
+
 .fa-lightbulb-o:before {
-  content: "\f0eb";
+	content: "\f0eb";
 }
+
 .fa-exchange:before {
-  content: "\f0ec";
+	content: "\f0ec";
 }
+
 .fa-cloud-download:before {
-  content: "\f0ed";
+	content: "\f0ed";
 }
+
 .fa-cloud-upload:before {
-  content: "\f0ee";
+	content: "\f0ee";
 }
+
 .fa-user-md:before {
-  content: "\f0f0";
+	content: "\f0f0";
 }
+
 .fa-stethoscope:before {
-  content: "\f0f1";
+	content: "\f0f1";
 }
+
 .fa-suitcase:before {
-  content: "\f0f2";
+	content: "\f0f2";
 }
+
 .fa-bell-o:before {
-  content: "\f0a2";
+	content: "\f0a2";
 }
+
 .fa-coffee:before {
-  content: "\f0f4";
+	content: "\f0f4";
 }
+
 .fa-cutlery:before {
-  content: "\f0f5";
+	content: "\f0f5";
 }
+
 .fa-file-text-o:before {
-  content: "\f0f6";
+	content: "\f0f6";
 }
+
 .fa-building-o:before {
-  content: "\f0f7";
+	content: "\f0f7";
 }
+
 .fa-hospital-o:before {
-  content: "\f0f8";
+	content: "\f0f8";
 }
+
 .fa-ambulance:before {
-  content: "\f0f9";
+	content: "\f0f9";
 }
+
 .fa-medkit:before {
-  content: "\f0fa";
+	content: "\f0fa";
 }
+
 .fa-fighter-jet:before {
-  content: "\f0fb";
+	content: "\f0fb";
 }
+
 .fa-beer:before {
-  content: "\f0fc";
+	content: "\f0fc";
 }
+
 .fa-h-square:before {
-  content: "\f0fd";
+	content: "\f0fd";
 }
+
 .fa-plus-square:before {
-  content: "\f0fe";
+	content: "\f0fe";
 }
+
 .fa-angle-double-left:before {
-  content: "\f100";
+	content: "\f100";
 }
+
 .fa-angle-double-right:before {
-  content: "\f101";
+	content: "\f101";
 }
+
 .fa-angle-double-up:before {
-  content: "\f102";
+	content: "\f102";
 }
+
 .fa-angle-double-down:before {
-  content: "\f103";
+	content: "\f103";
 }
+
 .fa-angle-left:before {
-  content: "\f104";
+	content: "\f104";
 }
+
 .fa-angle-right:before {
-  content: "\f105";
+	content: "\f105";
 }
+
 .fa-angle-up:before {
-  content: "\f106";
+	content: "\f106";
 }
+
 .fa-angle-down:before {
-  content: "\f107";
+	content: "\f107";
 }
+
 .fa-desktop:before {
-  content: "\f108";
+	content: "\f108";
 }
+
 .fa-laptop:before {
-  content: "\f109";
+	content: "\f109";
 }
+
 .fa-tablet:before {
-  content: "\f10a";
+	content: "\f10a";
 }
+
 .fa-mobile-phone:before,
 .fa-mobile:before {
-  content: "\f10b";
+	content: "\f10b";
 }
+
 .fa-circle-o:before {
-  content: "\f10c";
+	content: "\f10c";
 }
+
 .fa-quote-left:before {
-  content: "\f10d";
+	content: "\f10d";
 }
+
 .fa-quote-right:before {
-  content: "\f10e";
+	content: "\f10e";
 }
+
 .fa-spinner:before {
-  content: "\f110";
+	content: "\f110";
 }
+
 .fa-circle:before {
-  content: "\f111";
+	content: "\f111";
 }
+
 .fa-mail-reply:before,
 .fa-reply:before {
-  content: "\f112";
+	content: "\f112";
 }
+
 .fa-github-alt:before {
-  content: "\f113";
+	content: "\f113";
 }
+
 .fa-folder-o:before {
-  content: "\f114";
+	content: "\f114";
 }
+
 .fa-folder-open-o:before {
-  content: "\f115";
+	content: "\f115";
 }
+
 .fa-smile-o:before {
-  content: "\f118";
+	content: "\f118";
 }
+
 .fa-frown-o:before {
-  content: "\f119";
+	content: "\f119";
 }
+
 .fa-meh-o:before {
-  content: "\f11a";
+	content: "\f11a";
 }
+
 .fa-gamepad:before {
-  content: "\f11b";
+	content: "\f11b";
 }
+
 .fa-keyboard-o:before {
-  content: "\f11c";
+	content: "\f11c";
 }
+
 .fa-flag-o:before {
-  content: "\f11d";
+	content: "\f11d";
 }
+
 .fa-flag-checkered:before {
-  content: "\f11e";
+	content: "\f11e";
 }
+
 .fa-terminal:before {
-  content: "\f120";
+	content: "\f120";
 }
+
 .fa-code:before {
-  content: "\f121";
+	content: "\f121";
 }
+
 .fa-mail-reply-all:before,
 .fa-reply-all:before {
-  content: "\f122";
+	content: "\f122";
 }
+
 .fa-star-half-empty:before,
 .fa-star-half-full:before,
 .fa-star-half-o:before {
-  content: "\f123";
+	content: "\f123";
 }
+
 .fa-location-arrow:before {
-  content: "\f124";
+	content: "\f124";
 }
+
 .fa-crop:before {
-  content: "\f125";
+	content: "\f125";
 }
+
 .fa-code-fork:before {
-  content: "\f126";
+	content: "\f126";
 }
+
 .fa-unlink:before,
 .fa-chain-broken:before {
-  content: "\f127";
+	content: "\f127";
 }
+
 .fa-question:before {
-  content: "\f128";
+	content: "\f128";
 }
+
 .fa-info:before {
-  content: "\f129";
+	content: "\f129";
 }
+
 .fa-exclamation:before {
-  content: "\f12a";
+	content: "\f12a";
 }
+
 .fa-superscript:before {
-  content: "\f12b";
+	content: "\f12b";
 }
+
 .fa-subscript:before {
-  content: "\f12c";
+	content: "\f12c";
 }
+
 .fa-eraser:before {
-  content: "\f12d";
+	content: "\f12d";
 }
+
 .fa-puzzle-piece:before {
-  content: "\f12e";
+	content: "\f12e";
 }
+
 .fa-microphone:before {
-  content: "\f130";
+	content: "\f130";
 }
+
 .fa-microphone-slash:before {
-  content: "\f131";
+	content: "\f131";
 }
+
 .fa-shield:before {
-  content: "\f132";
+	content: "\f132";
 }
+
 .fa-calendar-o:before {
-  content: "\f133";
+	content: "\f133";
 }
+
 .fa-fire-extinguisher:before {
-  content: "\f134";
+	content: "\f134";
 }
+
 .fa-rocket:before {
-  content: "\f135";
+	content: "\f135";
 }
+
 .fa-maxcdn:before {
-  content: "\f136";
+	content: "\f136";
 }
+
 .fa-chevron-circle-left:before {
-  content: "\f137";
+	content: "\f137";
 }
+
 .fa-chevron-circle-right:before {
-  content: "\f138";
+	content: "\f138";
 }
+
 .fa-chevron-circle-up:before {
-  content: "\f139";
+	content: "\f139";
 }
+
 .fa-chevron-circle-down:before {
-  content: "\f13a";
+	content: "\f13a";
 }
+
 .fa-html5:before {
-  content: "\f13b";
+	content: "\f13b";
 }
+
 .fa-css3:before {
-  content: "\f13c";
+	content: "\f13c";
 }
+
 .fa-anchor:before {
-  content: "\f13d";
+	content: "\f13d";
 }
+
 .fa-unlock-alt:before {
-  content: "\f13e";
+	content: "\f13e";
 }
+
 .fa-bullseye:before {
-  content: "\f140";
+	content: "\f140";
 }
+
 .fa-ellipsis-h:before {
-  content: "\f141";
+	content: "\f141";
 }
+
 .fa-ellipsis-v:before {
-  content: "\f142";
+	content: "\f142";
 }
+
 .fa-rss-square:before {
-  content: "\f143";
+	content: "\f143";
 }
+
 .fa-play-circle:before {
-  content: "\f144";
+	content: "\f144";
 }
+
 .fa-ticket:before {
-  content: "\f145";
+	content: "\f145";
 }
+
 .fa-minus-square:before {
-  content: "\f146";
+	content: "\f146";
 }
+
 .fa-minus-square-o:before {
-  content: "\f147";
+	content: "\f147";
 }
+
 .fa-level-up:before {
-  content: "\f148";
+	content: "\f148";
 }
+
 .fa-level-down:before {
-  content: "\f149";
+	content: "\f149";
 }
+
 .fa-check-square:before {
-  content: "\f14a";
+	content: "\f14a";
 }
+
 .fa-pencil-square:before {
-  content: "\f14b";
+	content: "\f14b";
 }
+
 .fa-external-link-square:before {
-  content: "\f14c";
+	content: "\f14c";
 }
+
 .fa-share-square:before {
-  content: "\f14d";
+	content: "\f14d";
 }
+
 .fa-compass:before {
-  content: "\f14e";
+	content: "\f14e";
 }
+
 .fa-toggle-down:before,
 .fa-caret-square-o-down:before {
-  content: "\f150";
+	content: "\f150";
 }
+
 .fa-toggle-up:before,
 .fa-caret-square-o-up:before {
-  content: "\f151";
+	content: "\f151";
 }
+
 .fa-toggle-right:before,
 .fa-caret-square-o-right:before {
-  content: "\f152";
+	content: "\f152";
 }
+
 .fa-euro:before,
 .fa-eur:before {
-  content: "\f153";
+	content: "\f153";
 }
+
 .fa-gbp:before {
-  content: "\f154";
+	content: "\f154";
 }
+
 .fa-dollar:before,
 .fa-usd:before {
-  content: "\f155";
+	content: "\f155";
 }
+
 .fa-rupee:before,
 .fa-inr:before {
-  content: "\f156";
+	content: "\f156";
 }
+
 .fa-cny:before,
 .fa-rmb:before,
 .fa-yen:before,
 .fa-jpy:before {
-  content: "\f157";
+	content: "\f157";
 }
+
 .fa-ruble:before,
 .fa-rouble:before,
 .fa-rub:before {
-  content: "\f158";
+	content: "\f158";
 }
+
 .fa-won:before,
 .fa-krw:before {
-  content: "\f159";
+	content: "\f159";
 }
+
 .fa-bitcoin:before,
 .fa-btc:before {
-  content: "\f15a";
+	content: "\f15a";
 }
+
 .fa-file:before {
-  content: "\f15b";
+	content: "\f15b";
 }
+
 .fa-file-text:before {
-  content: "\f15c";
+	content: "\f15c";
 }
+
 .fa-sort-alpha-asc:before {
-  content: "\f15d";
+	content: "\f15d";
 }
+
 .fa-sort-alpha-desc:before {
-  content: "\f15e";
+	content: "\f15e";
 }
+
 .fa-sort-amount-asc:before {
-  content: "\f160";
+	content: "\f160";
 }
+
 .fa-sort-amount-desc:before {
-  content: "\f161";
+	content: "\f161";
 }
+
 .fa-sort-numeric-asc:before {
-  content: "\f162";
+	content: "\f162";
 }
+
 .fa-sort-numeric-desc:before {
-  content: "\f163";
+	content: "\f163";
 }
+
 .fa-thumbs-up:before {
-  content: "\f164";
+	content: "\f164";
 }
+
 .fa-thumbs-down:before {
-  content: "\f165";
+	content: "\f165";
 }
+
 .fa-youtube-square:before {
-  content: "\f166";
+	content: "\f166";
 }
+
 .fa-youtube:before {
-  content: "\f167";
+	content: "\f167";
 }
+
 .fa-xing:before {
-  content: "\f168";
+	content: "\f168";
 }
+
 .fa-xing-square:before {
-  content: "\f169";
+	content: "\f169";
 }
+
 .fa-youtube-play:before {
-  content: "\f16a";
+	content: "\f16a";
 }
+
 .fa-dropbox:before {
-  content: "\f16b";
+	content: "\f16b";
 }
+
 .fa-stack-overflow:before {
-  content: "\f16c";
+	content: "\f16c";
 }
+
 .fa-instagram:before {
-  content: "\f16d";
+	content: "\f16d";
 }
+
 .fa-flickr:before {
-  content: "\f16e";
+	content: "\f16e";
 }
+
 .fa-adn:before {
-  content: "\f170";
+	content: "\f170";
 }
+
 .fa-bitbucket:before {
-  content: "\f171";
+	content: "\f171";
 }
+
 .fa-bitbucket-square:before {
-  content: "\f172";
+	content: "\f172";
 }
+
 .fa-tumblr:before {
-  content: "\f173";
+	content: "\f173";
 }
+
 .fa-tumblr-square:before {
-  content: "\f174";
+	content: "\f174";
 }
+
 .fa-long-arrow-down:before {
-  content: "\f175";
+	content: "\f175";
 }
+
 .fa-long-arrow-up:before {
-  content: "\f176";
+	content: "\f176";
 }
+
 .fa-long-arrow-left:before {
-  content: "\f177";
+	content: "\f177";
 }
+
 .fa-long-arrow-right:before {
-  content: "\f178";
+	content: "\f178";
 }
+
 .fa-apple:before {
-  content: "\f179";
+	content: "\f179";
 }
+
 .fa-windows:before {
-  content: "\f17a";
+	content: "\f17a";
 }
+
 .fa-android:before {
-  content: "\f17b";
+	content: "\f17b";
 }
+
 .fa-linux:before {
-  content: "\f17c";
+	content: "\f17c";
 }
+
 .fa-dribbble:before {
-  content: "\f17d";
+	content: "\f17d";
 }
+
 .fa-skype:before {
-  content: "\f17e";
+	content: "\f17e";
 }
+
 .fa-foursquare:before {
-  content: "\f180";
+	content: "\f180";
 }
+
 .fa-trello:before {
-  content: "\f181";
+	content: "\f181";
 }
+
 .fa-female:before {
-  content: "\f182";
+	content: "\f182";
 }
+
 .fa-male:before {
-  content: "\f183";
+	content: "\f183";
 }
+
 .fa-gittip:before,
 .fa-gratipay:before {
-  content: "\f184";
+	content: "\f184";
 }
+
 .fa-sun-o:before {
-  content: "\f185";
+	content: "\f185";
 }
+
 .fa-moon-o:before {
-  content: "\f186";
+	content: "\f186";
 }
+
 .fa-archive:before {
-  content: "\f187";
+	content: "\f187";
 }
+
 .fa-bug:before {
-  content: "\f188";
+	content: "\f188";
 }
+
 .fa-vk:before {
-  content: "\f189";
+	content: "\f189";
 }
+
 .fa-weibo:before {
-  content: "\f18a";
+	content: "\f18a";
 }
+
 .fa-renren:before {
-  content: "\f18b";
+	content: "\f18b";
 }
+
 .fa-pagelines:before {
-  content: "\f18c";
+	content: "\f18c";
 }
+
 .fa-stack-exchange:before {
-  content: "\f18d";
+	content: "\f18d";
 }
+
 .fa-arrow-circle-o-right:before {
-  content: "\f18e";
+	content: "\f18e";
 }
+
 .fa-arrow-circle-o-left:before {
-  content: "\f190";
+	content: "\f190";
 }
+
 .fa-toggle-left:before,
 .fa-caret-square-o-left:before {
-  content: "\f191";
+	content: "\f191";
 }
+
 .fa-dot-circle-o:before {
-  content: "\f192";
+	content: "\f192";
 }
+
 .fa-wheelchair:before {
-  content: "\f193";
+	content: "\f193";
 }
+
 .fa-vimeo-square:before {
-  content: "\f194";
+	content: "\f194";
 }
+
 .fa-turkish-lira:before,
 .fa-try:before {
-  content: "\f195";
+	content: "\f195";
 }
+
 .fa-plus-square-o:before {
-  content: "\f196";
+	content: "\f196";
 }
+
 .fa-space-shuttle:before {
-  content: "\f197";
+	content: "\f197";
 }
+
 .fa-slack:before {
-  content: "\f198";
+	content: "\f198";
 }
+
 .fa-envelope-square:before {
-  content: "\f199";
+	content: "\f199";
 }
+
 .fa-wordpress:before {
-  content: "\f19a";
+	content: "\f19a";
 }
+
 .fa-openid:before {
-  content: "\f19b";
+	content: "\f19b";
 }
+
 .fa-institution:before,
 .fa-bank:before,
 .fa-university:before {
-  content: "\f19c";
+	content: "\f19c";
 }
+
 .fa-mortar-board:before,
 .fa-graduation-cap:before {
-  content: "\f19d";
+	content: "\f19d";
 }
+
 .fa-yahoo:before {
-  content: "\f19e";
+	content: "\f19e";
 }
+
 .fa-google:before {
-  content: "\f1a0";
+	content: "\f1a0";
 }
+
 .fa-reddit:before {
-  content: "\f1a1";
+	content: "\f1a1";
 }
+
 .fa-reddit-square:before {
-  content: "\f1a2";
+	content: "\f1a2";
 }
+
 .fa-stumbleupon-circle:before {
-  content: "\f1a3";
+	content: "\f1a3";
 }
+
 .fa-stumbleupon:before {
-  content: "\f1a4";
+	content: "\f1a4";
 }
+
 .fa-delicious:before {
-  content: "\f1a5";
+	content: "\f1a5";
 }
+
 .fa-digg:before {
-  content: "\f1a6";
+	content: "\f1a6";
 }
+
 .fa-pied-piper-pp:before {
-  content: "\f1a7";
+	content: "\f1a7";
 }
+
 .fa-pied-piper-alt:before {
-  content: "\f1a8";
+	content: "\f1a8";
 }
+
 .fa-drupal:before {
-  content: "\f1a9";
+	content: "\f1a9";
 }
+
 .fa-joomla:before {
-  content: "\f1aa";
+	content: "\f1aa";
 }
+
 .fa-language:before {
-  content: "\f1ab";
+	content: "\f1ab";
 }
+
 .fa-fax:before {
-  content: "\f1ac";
+	content: "\f1ac";
 }
+
 .fa-building:before {
-  content: "\f1ad";
+	content: "\f1ad";
 }
+
 .fa-child:before {
-  content: "\f1ae";
+	content: "\f1ae";
 }
+
 .fa-paw:before {
-  content: "\f1b0";
+	content: "\f1b0";
 }
+
 .fa-spoon:before {
-  content: "\f1b1";
+	content: "\f1b1";
 }
+
 .fa-cube:before {
-  content: "\f1b2";
+	content: "\f1b2";
 }
+
 .fa-cubes:before {
-  content: "\f1b3";
+	content: "\f1b3";
 }
+
 .fa-behance:before {
-  content: "\f1b4";
+	content: "\f1b4";
 }
+
 .fa-behance-square:before {
-  content: "\f1b5";
+	content: "\f1b5";
 }
+
 .fa-steam:before {
-  content: "\f1b6";
+	content: "\f1b6";
 }
+
 .fa-steam-square:before {
-  content: "\f1b7";
+	content: "\f1b7";
 }
+
 .fa-recycle:before {
-  content: "\f1b8";
+	content: "\f1b8";
 }
+
 .fa-automobile:before,
 .fa-car:before {
-  content: "\f1b9";
+	content: "\f1b9";
 }
+
 .fa-cab:before,
 .fa-taxi:before {
-  content: "\f1ba";
+	content: "\f1ba";
 }
+
 .fa-tree:before {
-  content: "\f1bb";
+	content: "\f1bb";
 }
+
 .fa-spotify:before {
-  content: "\f1bc";
+	content: "\f1bc";
 }
+
 .fa-deviantart:before {
-  content: "\f1bd";
+	content: "\f1bd";
 }
+
 .fa-soundcloud:before {
-  content: "\f1be";
+	content: "\f1be";
 }
+
 .fa-database:before {
-  content: "\f1c0";
+	content: "\f1c0";
 }
+
 .fa-file-pdf-o:before {
-  content: "\f1c1";
+	content: "\f1c1";
 }
+
 .fa-file-word-o:before {
-  content: "\f1c2";
+	content: "\f1c2";
 }
+
 .fa-file-excel-o:before {
-  content: "\f1c3";
+	content: "\f1c3";
 }
+
 .fa-file-powerpoint-o:before {
-  content: "\f1c4";
+	content: "\f1c4";
 }
+
 .fa-file-photo-o:before,
 .fa-file-picture-o:before,
 .fa-file-image-o:before {
-  content: "\f1c5";
+	content: "\f1c5";
 }
+
 .fa-file-zip-o:before,
 .fa-file-archive-o:before {
-  content: "\f1c6";
+	content: "\f1c6";
 }
+
 .fa-file-sound-o:before,
 .fa-file-audio-o:before {
-  content: "\f1c7";
+	content: "\f1c7";
 }
+
 .fa-file-movie-o:before,
 .fa-file-video-o:before {
-  content: "\f1c8";
+	content: "\f1c8";
 }
+
 .fa-file-code-o:before {
-  content: "\f1c9";
+	content: "\f1c9";
 }
+
 .fa-vine:before {
-  content: "\f1ca";
+	content: "\f1ca";
 }
+
 .fa-codepen:before {
-  content: "\f1cb";
+	content: "\f1cb";
 }
+
 .fa-jsfiddle:before {
-  content: "\f1cc";
+	content: "\f1cc";
 }
+
 .fa-life-bouy:before,
 .fa-life-buoy:before,
 .fa-life-saver:before,
 .fa-support:before,
 .fa-life-ring:before {
-  content: "\f1cd";
+	content: "\f1cd";
 }
+
 .fa-circle-o-notch:before {
-  content: "\f1ce";
+	content: "\f1ce";
 }
+
 .fa-ra:before,
 .fa-resistance:before,
 .fa-rebel:before {
-  content: "\f1d0";
+	content: "\f1d0";
 }
+
 .fa-ge:before,
 .fa-empire:before {
-  content: "\f1d1";
+	content: "\f1d1";
 }
+
 .fa-git-square:before {
-  content: "\f1d2";
+	content: "\f1d2";
 }
+
 .fa-git:before {
-  content: "\f1d3";
+	content: "\f1d3";
 }
+
 .fa-y-combinator-square:before,
 .fa-yc-square:before,
 .fa-hacker-news:before {
-  content: "\f1d4";
+	content: "\f1d4";
 }
+
 .fa-tencent-weibo:before {
-  content: "\f1d5";
+	content: "\f1d5";
 }
+
 .fa-qq:before {
-  content: "\f1d6";
+	content: "\f1d6";
 }
+
 .fa-wechat:before,
 .fa-weixin:before {
-  content: "\f1d7";
+	content: "\f1d7";
 }
+
 .fa-send:before,
 .fa-paper-plane:before {
-  content: "\f1d8";
+	content: "\f1d8";
 }
+
 .fa-send-o:before,
 .fa-paper-plane-o:before {
-  content: "\f1d9";
+	content: "\f1d9";
 }
+
 .fa-history:before {
-  content: "\f1da";
+	content: "\f1da";
 }
+
 .fa-circle-thin:before {
-  content: "\f1db";
+	content: "\f1db";
 }
+
 .fa-header:before {
-  content: "\f1dc";
+	content: "\f1dc";
 }
+
 .fa-paragraph:before {
-  content: "\f1dd";
+	content: "\f1dd";
 }
+
 .fa-sliders:before {
-  content: "\f1de";
+	content: "\f1de";
 }
+
 .fa-share-alt:before {
-  content: "\f1e0";
+	content: "\f1e0";
 }
+
 .fa-share-alt-square:before {
-  content: "\f1e1";
+	content: "\f1e1";
 }
+
 .fa-bomb:before {
-  content: "\f1e2";
+	content: "\f1e2";
 }
+
 .fa-soccer-ball-o:before,
 .fa-futbol-o:before {
-  content: "\f1e3";
+	content: "\f1e3";
 }
+
 .fa-tty:before {
-  content: "\f1e4";
+	content: "\f1e4";
 }
+
 .fa-binoculars:before {
-  content: "\f1e5";
+	content: "\f1e5";
 }
+
 .fa-plug:before {
-  content: "\f1e6";
+	content: "\f1e6";
 }
+
 .fa-slideshare:before {
-  content: "\f1e7";
+	content: "\f1e7";
 }
+
 .fa-twitch:before {
-  content: "\f1e8";
+	content: "\f1e8";
 }
+
 .fa-yelp:before {
-  content: "\f1e9";
+	content: "\f1e9";
 }
+
 .fa-newspaper-o:before {
-  content: "\f1ea";
+	content: "\f1ea";
 }
+
 .fa-wifi:before {
-  content: "\f1eb";
+	content: "\f1eb";
 }
+
 .fa-calculator:before {
-  content: "\f1ec";
+	content: "\f1ec";
 }
+
 .fa-paypal:before {
-  content: "\f1ed";
+	content: "\f1ed";
 }
+
 .fa-google-wallet:before {
-  content: "\f1ee";
+	content: "\f1ee";
 }
+
 .fa-cc-visa:before {
-  content: "\f1f0";
+	content: "\f1f0";
 }
+
 .fa-cc-mastercard:before {
-  content: "\f1f1";
+	content: "\f1f1";
 }
+
 .fa-cc-discover:before {
-  content: "\f1f2";
+	content: "\f1f2";
 }
+
 .fa-cc-amex:before {
-  content: "\f1f3";
+	content: "\f1f3";
 }
+
 .fa-cc-paypal:before {
-  content: "\f1f4";
+	content: "\f1f4";
 }
+
 .fa-cc-stripe:before {
-  content: "\f1f5";
+	content: "\f1f5";
 }
+
 .fa-bell-slash:before {
-  content: "\f1f6";
+	content: "\f1f6";
 }
+
 .fa-bell-slash-o:before {
-  content: "\f1f7";
+	content: "\f1f7";
 }
+
 .fa-trash:before {
-  content: "\f1f8";
+	content: "\f1f8";
 }
+
 .fa-copyright:before {
-  content: "\f1f9";
+	content: "\f1f9";
 }
+
 .fa-at:before {
-  content: "\f1fa";
+	content: "\f1fa";
 }
+
 .fa-eyedropper:before {
-  content: "\f1fb";
+	content: "\f1fb";
 }
+
 .fa-paint-brush:before {
-  content: "\f1fc";
+	content: "\f1fc";
 }
+
 .fa-birthday-cake:before {
-  content: "\f1fd";
+	content: "\f1fd";
 }
+
 .fa-area-chart:before {
-  content: "\f1fe";
+	content: "\f1fe";
 }
+
 .fa-pie-chart:before {
-  content: "\f200";
+	content: "\f200";
 }
+
 .fa-line-chart:before {
-  content: "\f201";
+	content: "\f201";
 }
+
 .fa-lastfm:before {
-  content: "\f202";
+	content: "\f202";
 }
+
 .fa-lastfm-square:before {
-  content: "\f203";
+	content: "\f203";
 }
+
 .fa-toggle-off:before {
-  content: "\f204";
+	content: "\f204";
 }
+
 .fa-toggle-on:before {
-  content: "\f205";
+	content: "\f205";
 }
+
 .fa-bicycle:before {
-  content: "\f206";
+	content: "\f206";
 }
+
 .fa-bus:before {
-  content: "\f207";
+	content: "\f207";
 }
+
 .fa-ioxhost:before {
-  content: "\f208";
+	content: "\f208";
 }
+
 .fa-angellist:before {
-  content: "\f209";
+	content: "\f209";
 }
+
 .fa-cc:before {
-  content: "\f20a";
+	content: "\f20a";
 }
+
 .fa-shekel:before,
 .fa-sheqel:before,
 .fa-ils:before {
-  content: "\f20b";
+	content: "\f20b";
 }
+
 .fa-meanpath:before {
-  content: "\f20c";
+	content: "\f20c";
 }
+
 .fa-buysellads:before {
-  content: "\f20d";
+	content: "\f20d";
 }
+
 .fa-connectdevelop:before {
-  content: "\f20e";
+	content: "\f20e";
 }
+
 .fa-dashcube:before {
-  content: "\f210";
+	content: "\f210";
 }
+
 .fa-forumbee:before {
-  content: "\f211";
+	content: "\f211";
 }
+
 .fa-leanpub:before {
-  content: "\f212";
+	content: "\f212";
 }
+
 .fa-sellsy:before {
-  content: "\f213";
+	content: "\f213";
 }
+
 .fa-shirtsinbulk:before {
-  content: "\f214";
+	content: "\f214";
 }
+
 .fa-simplybuilt:before {
-  content: "\f215";
+	content: "\f215";
 }
+
 .fa-skyatlas:before {
-  content: "\f216";
+	content: "\f216";
 }
+
 .fa-cart-plus:before {
-  content: "\f217";
+	content: "\f217";
 }
+
 .fa-cart-arrow-down:before {
-  content: "\f218";
+	content: "\f218";
 }
+
 .fa-diamond:before {
-  content: "\f219";
+	content: "\f219";
 }
+
 .fa-ship:before {
-  content: "\f21a";
+	content: "\f21a";
 }
+
 .fa-user-secret:before {
-  content: "\f21b";
+	content: "\f21b";
 }
+
 .fa-motorcycle:before {
-  content: "\f21c";
+	content: "\f21c";
 }
+
 .fa-street-view:before {
-  content: "\f21d";
+	content: "\f21d";
 }
+
 .fa-heartbeat:before {
-  content: "\f21e";
+	content: "\f21e";
 }
+
 .fa-venus:before {
-  content: "\f221";
+	content: "\f221";
 }
+
 .fa-mars:before {
-  content: "\f222";
+	content: "\f222";
 }
+
 .fa-mercury:before {
-  content: "\f223";
+	content: "\f223";
 }
+
 .fa-intersex:before,
 .fa-transgender:before {
-  content: "\f224";
+	content: "\f224";
 }
+
 .fa-transgender-alt:before {
-  content: "\f225";
+	content: "\f225";
 }
+
 .fa-venus-double:before {
-  content: "\f226";
+	content: "\f226";
 }
+
 .fa-mars-double:before {
-  content: "\f227";
+	content: "\f227";
 }
+
 .fa-venus-mars:before {
-  content: "\f228";
+	content: "\f228";
 }
+
 .fa-mars-stroke:before {
-  content: "\f229";
+	content: "\f229";
 }
+
 .fa-mars-stroke-v:before {
-  content: "\f22a";
+	content: "\f22a";
 }
+
 .fa-mars-stroke-h:before {
-  content: "\f22b";
+	content: "\f22b";
 }
+
 .fa-neuter:before {
-  content: "\f22c";
+	content: "\f22c";
 }
+
 .fa-genderless:before {
-  content: "\f22d";
+	content: "\f22d";
 }
+
 .fa-facebook-official:before {
-  content: "\f230";
+	content: "\f230";
 }
+
 .fa-pinterest-p:before {
-  content: "\f231";
+	content: "\f231";
 }
+
 .fa-whatsapp:before {
-  content: "\f232";
+	content: "\f232";
 }
+
 .fa-server:before {
-  content: "\f233";
+	content: "\f233";
 }
+
 .fa-user-plus:before {
-  content: "\f234";
+	content: "\f234";
 }
+
 .fa-user-times:before {
-  content: "\f235";
+	content: "\f235";
 }
+
 .fa-hotel:before,
 .fa-bed:before {
-  content: "\f236";
+	content: "\f236";
 }
+
 .fa-viacoin:before {
-  content: "\f237";
+	content: "\f237";
 }
+
 .fa-train:before {
-  content: "\f238";
+	content: "\f238";
 }
+
 .fa-subway:before {
-  content: "\f239";
+	content: "\f239";
 }
+
 .fa-medium:before {
-  content: "\f23a";
+	content: "\f23a";
 }
+
 .fa-yc:before,
 .fa-y-combinator:before {
-  content: "\f23b";
+	content: "\f23b";
 }
+
 .fa-optin-monster:before {
-  content: "\f23c";
+	content: "\f23c";
 }
+
 .fa-opencart:before {
-  content: "\f23d";
+	content: "\f23d";
 }
+
 .fa-expeditedssl:before {
-  content: "\f23e";
+	content: "\f23e";
 }
+
 .fa-battery-4:before,
 .fa-battery:before,
 .fa-battery-full:before {
-  content: "\f240";
+	content: "\f240";
 }
+
 .fa-battery-3:before,
 .fa-battery-three-quarters:before {
-  content: "\f241";
+	content: "\f241";
 }
+
 .fa-battery-2:before,
 .fa-battery-half:before {
-  content: "\f242";
+	content: "\f242";
 }
+
 .fa-battery-1:before,
 .fa-battery-quarter:before {
-  content: "\f243";
+	content: "\f243";
 }
+
 .fa-battery-0:before,
 .fa-battery-empty:before {
-  content: "\f244";
+	content: "\f244";
 }
+
 .fa-mouse-pointer:before {
-  content: "\f245";
+	content: "\f245";
 }
+
 .fa-i-cursor:before {
-  content: "\f246";
+	content: "\f246";
 }
+
 .fa-object-group:before {
-  content: "\f247";
+	content: "\f247";
 }
+
 .fa-object-ungroup:before {
-  content: "\f248";
+	content: "\f248";
 }
+
 .fa-sticky-note:before {
-  content: "\f249";
+	content: "\f249";
 }
+
 .fa-sticky-note-o:before {
-  content: "\f24a";
+	content: "\f24a";
 }
+
 .fa-cc-jcb:before {
-  content: "\f24b";
+	content: "\f24b";
 }
+
 .fa-cc-diners-club:before {
-  content: "\f24c";
+	content: "\f24c";
 }
+
 .fa-clone:before {
-  content: "\f24d";
+	content: "\f24d";
 }
+
 .fa-balance-scale:before {
-  content: "\f24e";
+	content: "\f24e";
 }
+
 .fa-hourglass-o:before {
-  content: "\f250";
+	content: "\f250";
 }
+
 .fa-hourglass-1:before,
 .fa-hourglass-start:before {
-  content: "\f251";
+	content: "\f251";
 }
+
 .fa-hourglass-2:before,
 .fa-hourglass-half:before {
-  content: "\f252";
+	content: "\f252";
 }
+
 .fa-hourglass-3:before,
 .fa-hourglass-end:before {
-  content: "\f253";
+	content: "\f253";
 }
+
 .fa-hourglass:before {
-  content: "\f254";
+	content: "\f254";
 }
+
 .fa-hand-grab-o:before,
 .fa-hand-rock-o:before {
-  content: "\f255";
+	content: "\f255";
 }
+
 .fa-hand-stop-o:before,
 .fa-hand-paper-o:before {
-  content: "\f256";
+	content: "\f256";
 }
+
 .fa-hand-scissors-o:before {
-  content: "\f257";
+	content: "\f257";
 }
+
 .fa-hand-lizard-o:before {
-  content: "\f258";
+	content: "\f258";
 }
+
 .fa-hand-spock-o:before {
-  content: "\f259";
+	content: "\f259";
 }
+
 .fa-hand-pointer-o:before {
-  content: "\f25a";
+	content: "\f25a";
 }
+
 .fa-hand-peace-o:before {
-  content: "\f25b";
+	content: "\f25b";
 }
+
 .fa-trademark:before {
-  content: "\f25c";
+	content: "\f25c";
 }
+
 .fa-registered:before {
-  content: "\f25d";
+	content: "\f25d";
 }
+
 .fa-creative-commons:before {
-  content: "\f25e";
+	content: "\f25e";
 }
+
 .fa-gg:before {
-  content: "\f260";
+	content: "\f260";
 }
+
 .fa-gg-circle:before {
-  content: "\f261";
+	content: "\f261";
 }
+
 .fa-tripadvisor:before {
-  content: "\f262";
+	content: "\f262";
 }
+
 .fa-odnoklassniki:before {
-  content: "\f263";
+	content: "\f263";
 }
+
 .fa-odnoklassniki-square:before {
-  content: "\f264";
+	content: "\f264";
 }
+
 .fa-get-pocket:before {
-  content: "\f265";
+	content: "\f265";
 }
+
 .fa-wikipedia-w:before {
-  content: "\f266";
+	content: "\f266";
 }
+
 .fa-safari:before {
-  content: "\f267";
+	content: "\f267";
 }
+
 .fa-chrome:before {
-  content: "\f268";
+	content: "\f268";
 }
+
 .fa-firefox:before {
-  content: "\f269";
+	content: "\f269";
 }
+
 .fa-opera:before {
-  content: "\f26a";
+	content: "\f26a";
 }
+
 .fa-internet-explorer:before {
-  content: "\f26b";
+	content: "\f26b";
 }
+
 .fa-tv:before,
 .fa-television:before {
-  content: "\f26c";
+	content: "\f26c";
 }
+
 .fa-contao:before {
-  content: "\f26d";
+	content: "\f26d";
 }
+
 .fa-500px:before {
-  content: "\f26e";
+	content: "\f26e";
 }
+
 .fa-amazon:before {
-  content: "\f270";
+	content: "\f270";
 }
+
 .fa-calendar-plus-o:before {
-  content: "\f271";
+	content: "\f271";
 }
+
 .fa-calendar-minus-o:before {
-  content: "\f272";
+	content: "\f272";
 }
+
 .fa-calendar-times-o:before {
-  content: "\f273";
+	content: "\f273";
 }
+
 .fa-calendar-check-o:before {
-  content: "\f274";
+	content: "\f274";
 }
+
 .fa-industry:before {
-  content: "\f275";
+	content: "\f275";
 }
+
 .fa-map-pin:before {
-  content: "\f276";
+	content: "\f276";
 }
+
 .fa-map-signs:before {
-  content: "\f277";
+	content: "\f277";
 }
+
 .fa-map-o:before {
-  content: "\f278";
+	content: "\f278";
 }
+
 .fa-map:before {
-  content: "\f279";
+	content: "\f279";
 }
+
 .fa-commenting:before {
-  content: "\f27a";
+	content: "\f27a";
 }
+
 .fa-commenting-o:before {
-  content: "\f27b";
+	content: "\f27b";
 }
+
 .fa-houzz:before {
-  content: "\f27c";
+	content: "\f27c";
 }
+
 .fa-vimeo:before {
-  content: "\f27d";
+	content: "\f27d";
 }
+
 .fa-black-tie:before {
-  content: "\f27e";
+	content: "\f27e";
 }
+
 .fa-fonticons:before {
-  content: "\f280";
+	content: "\f280";
 }
+
 .fa-reddit-alien:before {
-  content: "\f281";
+	content: "\f281";
 }
+
 .fa-edge:before {
-  content: "\f282";
+	content: "\f282";
 }
+
 .fa-credit-card-alt:before {
-  content: "\f283";
+	content: "\f283";
 }
+
 .fa-codiepie:before {
-  content: "\f284";
+	content: "\f284";
 }
+
 .fa-modx:before {
-  content: "\f285";
+	content: "\f285";
 }
+
 .fa-fort-awesome:before {
-  content: "\f286";
+	content: "\f286";
 }
+
 .fa-usb:before {
-  content: "\f287";
+	content: "\f287";
 }
+
 .fa-product-hunt:before {
-  content: "\f288";
+	content: "\f288";
 }
+
 .fa-mixcloud:before {
-  content: "\f289";
+	content: "\f289";
 }
+
 .fa-scribd:before {
-  content: "\f28a";
+	content: "\f28a";
 }
+
 .fa-pause-circle:before {
-  content: "\f28b";
+	content: "\f28b";
 }
+
 .fa-pause-circle-o:before {
-  content: "\f28c";
+	content: "\f28c";
 }
+
 .fa-stop-circle:before {
-  content: "\f28d";
+	content: "\f28d";
 }
+
 .fa-stop-circle-o:before {
-  content: "\f28e";
+	content: "\f28e";
 }
+
 .fa-shopping-bag:before {
-  content: "\f290";
+	content: "\f290";
 }
+
 .fa-shopping-basket:before {
-  content: "\f291";
+	content: "\f291";
 }
+
 .fa-hashtag:before {
-  content: "\f292";
+	content: "\f292";
 }
+
 .fa-bluetooth:before {
-  content: "\f293";
+	content: "\f293";
 }
+
 .fa-bluetooth-b:before {
-  content: "\f294";
+	content: "\f294";
 }
+
 .fa-percent:before {
-  content: "\f295";
+	content: "\f295";
 }
+
 .fa-gitlab:before {
-  content: "\f296";
+	content: "\f296";
 }
+
 .fa-wpbeginner:before {
-  content: "\f297";
+	content: "\f297";
 }
+
 .fa-wpforms:before {
-  content: "\f298";
+	content: "\f298";
 }
+
 .fa-envira:before {
-  content: "\f299";
+	content: "\f299";
 }
+
 .fa-universal-access:before {
-  content: "\f29a";
+	content: "\f29a";
 }
+
 .fa-wheelchair-alt:before {
-  content: "\f29b";
+	content: "\f29b";
 }
+
 .fa-question-circle-o:before {
-  content: "\f29c";
+	content: "\f29c";
 }
+
 .fa-blind:before {
-  content: "\f29d";
+	content: "\f29d";
 }
+
 .fa-audio-description:before {
-  content: "\f29e";
+	content: "\f29e";
 }
+
 .fa-volume-control-phone:before {
-  content: "\f2a0";
+	content: "\f2a0";
 }
+
 .fa-braille:before {
-  content: "\f2a1";
+	content: "\f2a1";
 }
+
 .fa-assistive-listening-systems:before {
-  content: "\f2a2";
+	content: "\f2a2";
 }
+
 .fa-asl-interpreting:before,
 .fa-american-sign-language-interpreting:before {
-  content: "\f2a3";
+	content: "\f2a3";
 }
+
 .fa-deafness:before,
 .fa-hard-of-hearing:before,
 .fa-deaf:before {
-  content: "\f2a4";
+	content: "\f2a4";
 }
+
 .fa-glide:before {
-  content: "\f2a5";
+	content: "\f2a5";
 }
+
 .fa-glide-g:before {
-  content: "\f2a6";
+	content: "\f2a6";
 }
+
 .fa-signing:before,
 .fa-sign-language:before {
-  content: "\f2a7";
+	content: "\f2a7";
 }
+
 .fa-low-vision:before {
-  content: "\f2a8";
+	content: "\f2a8";
 }
+
 .fa-viadeo:before {
-  content: "\f2a9";
+	content: "\f2a9";
 }
+
 .fa-viadeo-square:before {
-  content: "\f2aa";
+	content: "\f2aa";
 }
+
 .fa-snapchat:before {
-  content: "\f2ab";
+	content: "\f2ab";
 }
+
 .fa-snapchat-ghost:before {
-  content: "\f2ac";
+	content: "\f2ac";
 }
+
 .fa-snapchat-square:before {
-  content: "\f2ad";
+	content: "\f2ad";
 }
+
 .fa-pied-piper:before {
-  content: "\f2ae";
+	content: "\f2ae";
 }
+
 .fa-first-order:before {
-  content: "\f2b0";
+	content: "\f2b0";
 }
+
 .fa-yoast:before {
-  content: "\f2b1";
+	content: "\f2b1";
 }
+
 .fa-themeisle:before {
-  content: "\f2b2";
+	content: "\f2b2";
 }
+
 .fa-google-plus-circle:before,
 .fa-google-plus-official:before {
-  content: "\f2b3";
+	content: "\f2b3";
 }
+
 .fa-fa:before,
 .fa-font-awesome:before {
-  content: "\f2b4";
+	content: "\f2b4";
 }
+
 .fa-handshake-o:before {
-  content: "\f2b5";
+	content: "\f2b5";
 }
+
 .fa-envelope-open:before {
-  content: "\f2b6";
+	content: "\f2b6";
 }
+
 .fa-envelope-open-o:before {
-  content: "\f2b7";
+	content: "\f2b7";
 }
+
 .fa-linode:before {
-  content: "\f2b8";
+	content: "\f2b8";
 }
+
 .fa-address-book:before {
-  content: "\f2b9";
+	content: "\f2b9";
 }
+
 .fa-address-book-o:before {
-  content: "\f2ba";
+	content: "\f2ba";
 }
+
 .fa-vcard:before,
 .fa-address-card:before {
-  content: "\f2bb";
+	content: "\f2bb";
 }
+
 .fa-vcard-o:before,
 .fa-address-card-o:before {
-  content: "\f2bc";
+	content: "\f2bc";
 }
+
 .fa-user-circle:before {
-  content: "\f2bd";
+	content: "\f2bd";
 }
+
 .fa-user-circle-o:before {
-  content: "\f2be";
+	content: "\f2be";
 }
+
 .fa-user-o:before {
-  content: "\f2c0";
+	content: "\f2c0";
 }
+
 .fa-id-badge:before {
-  content: "\f2c1";
+	content: "\f2c1";
 }
+
 .fa-drivers-license:before,
 .fa-id-card:before {
-  content: "\f2c2";
+	content: "\f2c2";
 }
+
 .fa-drivers-license-o:before,
 .fa-id-card-o:before {
-  content: "\f2c3";
+	content: "\f2c3";
 }
+
 .fa-quora:before {
-  content: "\f2c4";
+	content: "\f2c4";
 }
+
 .fa-free-code-camp:before {
-  content: "\f2c5";
+	content: "\f2c5";
 }
+
 .fa-telegram:before {
-  content: "\f2c6";
+	content: "\f2c6";
 }
+
 .fa-thermometer-4:before,
 .fa-thermometer:before,
 .fa-thermometer-full:before {
-  content: "\f2c7";
+	content: "\f2c7";
 }
+
 .fa-thermometer-3:before,
 .fa-thermometer-three-quarters:before {
-  content: "\f2c8";
+	content: "\f2c8";
 }
+
 .fa-thermometer-2:before,
 .fa-thermometer-half:before {
-  content: "\f2c9";
+	content: "\f2c9";
 }
+
 .fa-thermometer-1:before,
 .fa-thermometer-quarter:before {
-  content: "\f2ca";
+	content: "\f2ca";
 }
+
 .fa-thermometer-0:before,
 .fa-thermometer-empty:before {
-  content: "\f2cb";
+	content: "\f2cb";
 }
+
 .fa-shower:before {
-  content: "\f2cc";
+	content: "\f2cc";
 }
+
 .fa-bathtub:before,
 .fa-s15:before,
 .fa-bath:before {
-  content: "\f2cd";
+	content: "\f2cd";
 }
+
 .fa-podcast:before {
-  content: "\f2ce";
+	content: "\f2ce";
 }
+
 .fa-window-maximize:before {
-  content: "\f2d0";
+	content: "\f2d0";
 }
+
 .fa-window-minimize:before {
-  content: "\f2d1";
+	content: "\f2d1";
 }
+
 .fa-window-restore:before {
-  content: "\f2d2";
+	content: "\f2d2";
 }
+
 .fa-times-rectangle:before,
 .fa-window-close:before {
-  content: "\f2d3";
+	content: "\f2d3";
 }
+
 .fa-times-rectangle-o:before,
 .fa-window-close-o:before {
-  content: "\f2d4";
+	content: "\f2d4";
 }
+
 .fa-bandcamp:before {
-  content: "\f2d5";
+	content: "\f2d5";
 }
+
 .fa-grav:before {
-  content: "\f2d6";
+	content: "\f2d6";
 }
+
 .fa-etsy:before {
-  content: "\f2d7";
+	content: "\f2d7";
 }
+
 .fa-imdb:before {
-  content: "\f2d8";
+	content: "\f2d8";
 }
+
 .fa-ravelry:before {
-  content: "\f2d9";
+	content: "\f2d9";
 }
+
 .fa-eercast:before {
-  content: "\f2da";
+	content: "\f2da";
 }
+
 .fa-microchip:before {
-  content: "\f2db";
+	content: "\f2db";
 }
+
 .fa-snowflake-o:before {
-  content: "\f2dc";
+	content: "\f2dc";
 }
+
 .fa-superpowers:before {
-  content: "\f2dd";
+	content: "\f2dd";
 }
+
 .fa-wpexplorer:before {
-  content: "\f2de";
+	content: "\f2de";
 }
+
 .fa-meetup:before {
-  content: "\f2e0";
+	content: "\f2e0";
 }
+
 .sr-only {
-  position: absolute;
-  width: 1px;
-  height: 1px;
-  padding: 0;
-  margin: -1px;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  border: 0;
-}
+	position: absolute;
+	width: 1px;
+	height: 1px;
+	padding: 0;
+	margin: -1px;
+	overflow: hidden;
+	clip: rect(0, 0, 0, 0);
+	border: 0;
+}
+
 .sr-only-focusable:active,
 .sr-only-focusable:focus {
-  position: static;
-  width: auto;
-  height: auto;
-  margin: 0;
-  overflow: visible;
-  clip: auto;
+	position: static;
+	width: auto;
+	height: auto;
+	margin: 0;
+	overflow: visible;
+	clip: auto;
 }
diff --git a/len-sys/src/main/resources/plugin/plugins/font-awesome/fonts/fontawesome-webfont.svg b/len-sys/src/main/resources/plugin/plugins/font-awesome/fonts/fontawesome-webfont.svg
index 855c845..db626ea 100644
--- a/len-sys/src/main/resources/plugin/plugins/font-awesome/fonts/fontawesome-webfont.svg
+++ b/len-sys/src/main/resources/plugin/plugins/font-awesome/fonts/fontawesome-webfont.svg
@@ -1,601 +1,601 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg>
-<metadata>
-Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016
- By ,,,
-Copyright Dave Gandy 2016. All rights reserved.
-</metadata>
-<defs>
-<font id="FontAwesome" horiz-adv-x="1536" >
-  <font-face 
-    font-family="FontAwesome"
-    font-weight="400"
-    font-stretch="normal"
-    units-per-em="1792"
-    panose-1="0 0 0 0 0 0 0 0 0 0"
-    ascent="1536"
-    descent="-256"
-    bbox="-1.02083 -256.962 2304.6 1537.02"
-    underline-thickness="0"
-    underline-position="0"
-    unicode-range="U+0020-F500"
-  />
-<missing-glyph horiz-adv-x="896" 
-d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
-    <glyph glyph-name=".notdef" horiz-adv-x="896" 
-d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
-    <glyph glyph-name=".null" horiz-adv-x="0" 
- />
-    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="597" 
- />
-    <glyph glyph-name="space" unicode=" " horiz-adv-x="448" 
- />
-    <glyph glyph-name="dieresis" unicode="&#xa8;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="copyright" unicode="&#xa9;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="registered" unicode="&#xae;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="acute" unicode="&#xb4;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="AE" unicode="&#xc6;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="Oslash" unicode="&#xd8;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="trademark" unicode="&#x2122;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="infinity" unicode="&#x221e;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="notequal" unicode="&#x2260;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="glass" unicode="&#xf000;" horiz-adv-x="1792" 
-d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
-    <glyph glyph-name="music" unicode="&#xf001;" 
-d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89
-t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="search" unicode="&#xf002;" horiz-adv-x="1664" 
-d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5
-t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-    <glyph glyph-name="envelope" unicode="&#xf003;" horiz-adv-x="1792" 
-d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13
+	<metadata>
+		Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016
+		By ,,,
+		Copyright Dave Gandy 2016. All rights reserved.
+	</metadata>
+	<defs>
+		<font id="FontAwesome" horiz-adv-x="1536">
+			<font-face
+				font-family="FontAwesome"
+				font-weight="400"
+				font-stretch="normal"
+				units-per-em="1792"
+				panose-1="0 0 0 0 0 0 0 0 0 0"
+				ascent="1536"
+				descent="-256"
+				bbox="-1.02083 -256.962 2304.6 1537.02"
+				underline-thickness="0"
+				underline-position="0"
+				unicode-range="U+0020-F500"
+			/>
+			<missing-glyph horiz-adv-x="896"
+						   d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z"/>
+			<glyph glyph-name=".notdef" horiz-adv-x="896"
+				   d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z"/>
+			<glyph glyph-name=".null" horiz-adv-x="0"
+			/>
+			<glyph glyph-name="nonmarkingreturn" horiz-adv-x="597"
+			/>
+			<glyph glyph-name="space" unicode=" " horiz-adv-x="448"
+			/>
+			<glyph glyph-name="dieresis" unicode="&#xa8;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="copyright" unicode="&#xa9;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="registered" unicode="&#xae;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="acute" unicode="&#xb4;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="AE" unicode="&#xc6;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="Oslash" unicode="&#xd8;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="trademark" unicode="&#x2122;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="infinity" unicode="&#x221e;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="notequal" unicode="&#x2260;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="glass" unicode="&#xf000;" horiz-adv-x="1792"
+				   d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z"/>
+			<glyph glyph-name="music" unicode="&#xf001;"
+				   d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89
+t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z"/>
+			<glyph glyph-name="search" unicode="&#xf002;" horiz-adv-x="1664"
+				   d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5
+t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z"/>
+			<glyph glyph-name="envelope" unicode="&#xf003;" horiz-adv-x="1792"
+				   d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13
 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z
-M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="heart" unicode="&#xf004;" horiz-adv-x="1792" 
-d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600
-q-18 -18 -44 -18z" />
-    <glyph glyph-name="star" unicode="&#xf005;" horiz-adv-x="1664" 
-d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455
-l502 -73q56 -9 56 -46z" />
-    <glyph glyph-name="star_empty" unicode="&#xf006;" horiz-adv-x="1664" 
-d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500
-l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
-    <glyph glyph-name="user" unicode="&#xf007;" horiz-adv-x="1280" 
-d="M1280 137q0 -109 -62.5 -187t-150.5 -78h-854q-88 0 -150.5 78t-62.5 187q0 85 8.5 160.5t31.5 152t58.5 131t94 89t134.5 34.5q131 -128 313 -128t313 128q76 0 134.5 -34.5t94 -89t58.5 -131t31.5 -152t8.5 -160.5zM1024 1024q0 -159 -112.5 -271.5t-271.5 -112.5
-t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
-    <glyph glyph-name="film" unicode="&#xf008;" horiz-adv-x="1920" 
-d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128
+M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z"/>
+			<glyph glyph-name="heart" unicode="&#xf004;" horiz-adv-x="1792"
+				   d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600
+q-18 -18 -44 -18z"/>
+			<glyph glyph-name="star" unicode="&#xf005;" horiz-adv-x="1664"
+				   d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455
+l502 -73q56 -9 56 -46z"/>
+			<glyph glyph-name="star_empty" unicode="&#xf006;" horiz-adv-x="1664"
+				   d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500
+l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z"/>
+			<glyph glyph-name="user" unicode="&#xf007;" horiz-adv-x="1280"
+				   d="M1280 137q0 -109 -62.5 -187t-150.5 -78h-854q-88 0 -150.5 78t-62.5 187q0 85 8.5 160.5t31.5 152t58.5 131t94 89t134.5 34.5q131 -128 313 -128t313 128q76 0 134.5 -34.5t94 -89t58.5 -131t31.5 -152t8.5 -160.5zM1024 1024q0 -159 -112.5 -271.5t-271.5 -112.5
+t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z"/>
+			<glyph glyph-name="film" unicode="&#xf008;" horiz-adv-x="1920"
+				   d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128
 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45
 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128
 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19
-t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="th_large" unicode="&#xf009;" horiz-adv-x="1664" 
-d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38
-h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="th" unicode="&#xf00a;" horiz-adv-x="1792" 
-d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320
+t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z"/>
+			<glyph glyph-name="th_large" unicode="&#xf009;" horiz-adv-x="1664"
+				   d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38
+h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z"/>
+			<glyph glyph-name="th" unicode="&#xf00a;" horiz-adv-x="1792"
+				   d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320
 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28
 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192
-q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="th_list" unicode="&#xf00b;" horiz-adv-x="1792" 
-d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960
+q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z"/>
+			<glyph glyph-name="th_list" unicode="&#xf00b;" horiz-adv-x="1792"
+				   d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960
 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28
-h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="ok" unicode="&#xf00c;" horiz-adv-x="1792" 
-d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
-    <glyph glyph-name="remove" unicode="&#xf00d;" horiz-adv-x="1408" 
-d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68
-t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
-    <glyph glyph-name="zoom_in" unicode="&#xf00e;" horiz-adv-x="1664" 
-d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224
+h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z"/>
+			<glyph glyph-name="ok" unicode="&#xf00c;" horiz-adv-x="1792"
+				   d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z"/>
+			<glyph glyph-name="remove" unicode="&#xf00d;" horiz-adv-x="1408"
+				   d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68
+t-28 -68l-294 -294l294 -294q28 -28 28 -68z"/>
+			<glyph glyph-name="zoom_in" unicode="&#xf00e;" horiz-adv-x="1664"
+				   d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224
 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5
-t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-    <glyph glyph-name="zoom_out" unicode="&#xf010;" horiz-adv-x="1664" 
-d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z
+t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z"/>
+			<glyph glyph-name="zoom_out" unicode="&#xf010;" horiz-adv-x="1664"
+				   d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z
 M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z
-" />
-    <glyph glyph-name="off" unicode="&#xf011;" 
-d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5
-t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
-    <glyph glyph-name="signal" unicode="&#xf012;" horiz-adv-x="1792" 
-d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
-v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="cog" unicode="&#xf013;" 
-d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38
+"/>
+			<glyph glyph-name="off" unicode="&#xf011;"
+				   d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5
+t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z"/>
+			<glyph glyph-name="signal" unicode="&#xf012;" horiz-adv-x="1792"
+				   d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
+v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z"/>
+			<glyph glyph-name="cog" unicode="&#xf013;"
+				   d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38
 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13
 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22
-q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
-    <glyph glyph-name="trash" unicode="&#xf014;" horiz-adv-x="1408" 
-d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576
+q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z"/>
+			<glyph glyph-name="trash" unicode="&#xf014;" horiz-adv-x="1408"
+				   d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576
 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832
-q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="home" unicode="&#xf015;" horiz-adv-x="1664" 
-d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5
-l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
-    <glyph glyph-name="file_alt" unicode="&#xf016;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-" />
-    <glyph glyph-name="time" unicode="&#xf017;" 
-d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="road" unicode="&#xf018;" horiz-adv-x="1920" 
-d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256
-q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
-    <glyph glyph-name="download_alt" unicode="&#xf019;" horiz-adv-x="1664" 
-d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136
-q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
-    <glyph glyph-name="download" unicode="&#xf01a;" 
-d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273
-t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="upload" unicode="&#xf01b;" 
-d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198
-t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="inbox" unicode="&#xf01c;" 
-d="M1023 576h316q-1 3 -2.5 8.5t-2.5 7.5l-212 496h-708l-212 -496q-1 -3 -2.5 -8.5t-2.5 -7.5h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552
-q25 -61 25 -123z" />
-    <glyph glyph-name="play_circle" unicode="&#xf01d;" 
-d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="repeat" unicode="&#xf01e;" 
-d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q15 0 25 -9
-l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
-    <glyph glyph-name="refresh" unicode="&#xf021;" 
-d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117
+q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z"/>
+			<glyph glyph-name="home" unicode="&#xf015;" horiz-adv-x="1664"
+				   d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5
+l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z"/>
+			<glyph glyph-name="file_alt" unicode="&#xf016;"
+				   d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+"/>
+			<glyph glyph-name="time" unicode="&#xf017;"
+				   d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="road" unicode="&#xf018;" horiz-adv-x="1920"
+				   d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256
+q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z"/>
+			<glyph glyph-name="download_alt" unicode="&#xf019;" horiz-adv-x="1664"
+				   d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136
+q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z"/>
+			<glyph glyph-name="download" unicode="&#xf01a;"
+				   d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273
+t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="upload" unicode="&#xf01b;"
+				   d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198
+t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="inbox" unicode="&#xf01c;"
+				   d="M1023 576h316q-1 3 -2.5 8.5t-2.5 7.5l-212 496h-708l-212 -496q-1 -3 -2.5 -8.5t-2.5 -7.5h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552
+q25 -61 25 -123z"/>
+			<glyph glyph-name="play_circle" unicode="&#xf01d;"
+				   d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="repeat" unicode="&#xf01e;"
+				   d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q15 0 25 -9
+l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z"/>
+			<glyph glyph-name="refresh" unicode="&#xf021;"
+				   d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117
 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5
-q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
-    <glyph glyph-name="list_alt" unicode="&#xf022;" horiz-adv-x="1792" 
-d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z"/>
+			<glyph glyph-name="list_alt" unicode="&#xf022;" horiz-adv-x="1792"
+				   d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
 M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z
 M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5
 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47
-t47 -113z" />
-    <glyph glyph-name="lock" unicode="&#xf023;" horiz-adv-x="1152" 
-d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="flag" unicode="&#xf024;" horiz-adv-x="1792" 
-d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48
-t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="headphones" unicode="&#xf025;" horiz-adv-x="1664" 
-d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78
+t47 -113z"/>
+			<glyph glyph-name="lock" unicode="&#xf023;" horiz-adv-x="1152"
+				   d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z"/>
+			<glyph glyph-name="flag" unicode="&#xf024;" horiz-adv-x="1792"
+				   d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48
+t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="headphones" unicode="&#xf025;" horiz-adv-x="1664"
+				   d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78
 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5
-t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
-    <glyph glyph-name="volume_off" unicode="&#xf026;" horiz-adv-x="768" 
-d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
-    <glyph glyph-name="volume_down" unicode="&#xf027;" horiz-adv-x="1152" 
-d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
-t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
-    <glyph glyph-name="volume_up" unicode="&#xf028;" horiz-adv-x="1664" 
-d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
+t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z"/>
+			<glyph glyph-name="volume_off" unicode="&#xf026;" horiz-adv-x="768"
+				   d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z"/>
+			<glyph glyph-name="volume_down" unicode="&#xf027;" horiz-adv-x="1152"
+				   d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
+t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z"/>
+			<glyph glyph-name="volume_up" unicode="&#xf028;" horiz-adv-x="1664"
+				   d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
 t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5
 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289
-t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
-    <glyph glyph-name="qrcode" unicode="&#xf029;" horiz-adv-x="1408" 
-d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z
-M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
-    <glyph glyph-name="barcode" unicode="&#xf02a;" horiz-adv-x="1792" 
-d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z
-M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
-    <glyph glyph-name="tag" unicode="&#xf02b;" 
-d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
-l715 -714q37 -39 37 -91z" />
-    <glyph glyph-name="tags" unicode="&#xf02c;" horiz-adv-x="1920" 
-d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
-l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
-    <glyph glyph-name="book" unicode="&#xf02d;" horiz-adv-x="1664" 
-d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23
+t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z"/>
+			<glyph glyph-name="qrcode" unicode="&#xf029;" horiz-adv-x="1408"
+				   d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z
+M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z"/>
+			<glyph glyph-name="barcode" unicode="&#xf02a;" horiz-adv-x="1792"
+				   d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z
+M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z"/>
+			<glyph glyph-name="tag" unicode="&#xf02b;"
+				   d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
+l715 -714q37 -39 37 -91z"/>
+			<glyph glyph-name="tags" unicode="&#xf02c;" horiz-adv-x="1920"
+				   d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
+l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z"/>
+			<glyph glyph-name="book" unicode="&#xf02d;" horiz-adv-x="1664"
+				   d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23
 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906
 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5
-t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
-    <glyph glyph-name="bookmark" unicode="&#xf02e;" horiz-adv-x="1280" 
-d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-    <glyph glyph-name="print" unicode="&#xf02f;" horiz-adv-x="1664" 
-d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68
-v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
-    <glyph glyph-name="camera" unicode="&#xf030;" horiz-adv-x="1920" 
-d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136
-q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="font" unicode="&#xf031;" horiz-adv-x="1664" 
-d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57
+t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z"/>
+			<glyph glyph-name="bookmark" unicode="&#xf02e;" horiz-adv-x="1280"
+				   d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z"/>
+			<glyph glyph-name="print" unicode="&#xf02f;" horiz-adv-x="1664"
+				   d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68
+v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z"/>
+			<glyph glyph-name="camera" unicode="&#xf030;" horiz-adv-x="1920"
+				   d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136
+q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z"/>
+			<glyph glyph-name="font" unicode="&#xf031;" horiz-adv-x="1664"
+				   d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57
 q19 -15 88 -29.5t84 -20.5q6 -38 6 -57q0 -5 -0.5 -13.5t-0.5 -12.5q-63 0 -190 8t-191 8q-76 0 -215 -7t-178 -8q0 43 4 78l131 28q1 0 12.5 2.5t15.5 3.5t14.5 4.5t15 6.5t11 8t9 11t2.5 14q0 16 -31 96.5t-72 177.5t-42 100l-450 2q-26 -58 -76.5 -195.5t-50.5 -162.5
-q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z" />
-    <glyph glyph-name="bold" unicode="&#xf032;" horiz-adv-x="1408" 
-d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142
+q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z"/>
+			<glyph glyph-name="bold" unicode="&#xf032;" horiz-adv-x="1408"
+				   d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142
 q0 70 -29 122.5t-79 82t-108 43.5t-124 14q-50 0 -130 -13q0 -50 4 -151t4 -152q0 -27 -0.5 -80t-0.5 -79q0 -46 1 -69zM0 -128l2 94q15 4 85 16t106 27q7 12 12.5 27t8.5 33.5t5.5 32.5t3 37.5t0.5 34v35.5v30q0 982 -22 1025q-4 8 -22 14.5t-44.5 11t-49.5 7t-48.5 4.5
 t-30.5 3l-4 83q98 2 340 11.5t373 9.5q23 0 68 -0.5t68 -0.5q70 0 136.5 -13t128.5 -42t108 -71t74 -104.5t28 -137.5q0 -52 -16.5 -95.5t-39 -72t-64.5 -57.5t-73 -45t-84 -40q154 -35 256.5 -134t102.5 -248q0 -100 -35 -179.5t-93.5 -130.5t-138 -85.5t-163.5 -48.5
-t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z" />
-    <glyph glyph-name="italic" unicode="&#xf033;" horiz-adv-x="1024" 
-d="M0 -126l17 85q22 7 61.5 16.5t72 19t59.5 23.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5
-q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z" />
-    <glyph glyph-name="text_height" unicode="&#xf034;" horiz-adv-x="1792" 
-d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2
+t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z"/>
+			<glyph glyph-name="italic" unicode="&#xf033;" horiz-adv-x="1024"
+				   d="M0 -126l17 85q22 7 61.5 16.5t72 19t59.5 23.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5
+q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z"/>
+			<glyph glyph-name="text_height" unicode="&#xf034;" horiz-adv-x="1792"
+				   d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2
 t132 2q36 0 107.5 -0.5t107.5 -0.5h293q6 0 21 -0.5t20.5 0t16 3t17.5 9t15 17.5l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 48t-14.5 73.5t-7.5 35.5q-6 8 -12 12.5t-15.5 6t-13 2.5t-18 0.5t-16.5 -0.5
 q-17 0 -66.5 0.5t-74.5 0.5t-64 -2t-71 -6q-9 -81 -8 -136q0 -94 2 -388t2 -455q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27
-q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z" />
-    <glyph glyph-name="text_width" unicode="&#xf035;" 
-d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1
+q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z"/>
+			<glyph glyph-name="text_width" unicode="&#xf035;"
+				   d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1
 t-94 -2t-96 -7q-9 -81 -8 -136l1 -152v52q0 -55 1 -154t1.5 -180t0.5 -153q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27
 q7 16 11.5 74t6 145.5t1.5 155t-0.5 153.5t-0.5 89q0 7 -2.5 21.5t-2.5 22.5q0 7 0.5 44t1 73t0 76.5t-3 67.5t-6.5 32q-11 12 -162 12q-41 0 -163 -13.5t-138 -24.5q-19 -12 -34 -71.5t-31.5 -111.5t-42.5 -54q-42 26 -56 44v383zM1310 125q12 0 42 -19.5t57.5 -41.5
 t59.5 -49t36 -30q26 -21 26 -49t-26 -49q-4 -3 -36 -30t-59.5 -49t-57.5 -41.5t-42 -19.5q-13 0 -20.5 10.5t-10 28.5t-2.5 33.5t1.5 33t1.5 19.5h-1024q0 -2 1.5 -19.5t1.5 -33t-2.5 -33.5t-10 -28.5t-20.5 -10.5q-12 0 -42 19.5t-57.5 41.5t-59.5 49t-36 30q-26 21 -26 49
-t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z" />
-    <glyph glyph-name="align_left" unicode="&#xf036;" horiz-adv-x="1792" 
-d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45
-t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="align_center" unicode="&#xf037;" horiz-adv-x="1792" 
-d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19
-h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="align_right" unicode="&#xf038;" horiz-adv-x="1792" 
-d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
-t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="align_justify" unicode="&#xf039;" horiz-adv-x="1792" 
-d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
-t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="list" unicode="&#xf03a;" horiz-adv-x="1792" 
-d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5
+t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z"/>
+			<glyph glyph-name="align_left" unicode="&#xf036;" horiz-adv-x="1792"
+				   d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45
+t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="align_center" unicode="&#xf037;" horiz-adv-x="1792"
+				   d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19
+h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="align_right" unicode="&#xf038;" horiz-adv-x="1792"
+				   d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
+t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="align_justify" unicode="&#xf039;" horiz-adv-x="1792"
+				   d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
+t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="list" unicode="&#xf03a;" horiz-adv-x="1792"
+				   d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5
 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344
 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5
 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192
-q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
-    <glyph glyph-name="indent_left" unicode="&#xf03b;" horiz-adv-x="1792" 
-d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
+q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z"/>
+			<glyph glyph-name="indent_left" unicode="&#xf03b;" horiz-adv-x="1792"
+				   d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088
-q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-    <glyph glyph-name="indent_right" unicode="&#xf03c;" horiz-adv-x="1792" 
-d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
+q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z"/>
+			<glyph glyph-name="indent_right" unicode="&#xf03c;" horiz-adv-x="1792"
+				   d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088
-q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-    <glyph glyph-name="facetime_video" unicode="&#xf03d;" horiz-adv-x="1792" 
-d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5
-q39 -17 39 -59z" />
-    <glyph glyph-name="picture" unicode="&#xf03e;" horiz-adv-x="1920" 
-d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216
-q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="pencil" unicode="&#xf040;" 
-d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38
-q53 0 91 -38l235 -234q37 -39 37 -91z" />
-    <glyph glyph-name="map_marker" unicode="&#xf041;" horiz-adv-x="1024" 
-d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
-    <glyph glyph-name="adjust" unicode="&#xf042;" 
-d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="tint" unicode="&#xf043;" horiz-adv-x="1024" 
-d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362
-q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
-    <glyph glyph-name="edit" unicode="&#xf044;" horiz-adv-x="1792" 
-d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
+q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z"/>
+			<glyph glyph-name="facetime_video" unicode="&#xf03d;" horiz-adv-x="1792"
+				   d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5
+q39 -17 39 -59z"/>
+			<glyph glyph-name="picture" unicode="&#xf03e;" horiz-adv-x="1920"
+				   d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216
+q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z"/>
+			<glyph glyph-name="pencil" unicode="&#xf040;"
+				   d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38
+q53 0 91 -38l235 -234q37 -39 37 -91z"/>
+			<glyph glyph-name="map_marker" unicode="&#xf041;" horiz-adv-x="1024"
+				   d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z"/>
+			<glyph glyph-name="adjust" unicode="&#xf042;"
+				   d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="tint" unicode="&#xf043;" horiz-adv-x="1024"
+				   d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362
+q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z"/>
+			<glyph glyph-name="edit" unicode="&#xf044;" horiz-adv-x="1792"
+				   d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92
-l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
-    <glyph glyph-name="share" unicode="&#xf045;" horiz-adv-x="1664" 
-d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832
+l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z"/>
+			<glyph glyph-name="share" unicode="&#xf045;" horiz-adv-x="1664"
+				   d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832
 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5
-t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
-    <glyph glyph-name="check" unicode="&#xf046;" horiz-adv-x="1664" 
-d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832
+t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z"/>
+			<glyph glyph-name="check" unicode="&#xf046;" horiz-adv-x="1664"
+				   d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832
 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110
-q24 -24 24 -57t-24 -57z" />
-    <glyph glyph-name="move" unicode="&#xf047;" horiz-adv-x="1792" 
-d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45
-t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-    <glyph glyph-name="step_backward" unicode="&#xf048;" horiz-adv-x="1024" 
-d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19z" />
-    <glyph glyph-name="fast_backward" unicode="&#xf049;" horiz-adv-x="1792" 
-d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19l710 710
-q19 19 32 13t13 -32v-710q4 10 13 19z" />
-    <glyph glyph-name="backward" unicode="&#xf04a;" horiz-adv-x="1664" 
-d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q4 10 13 19z" />
-    <glyph glyph-name="play" unicode="&#xf04b;" horiz-adv-x="1408" 
-d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
-    <glyph glyph-name="pause" unicode="&#xf04c;" 
-d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="stop" unicode="&#xf04d;" 
-d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="forward" unicode="&#xf04e;" horiz-adv-x="1664" 
-d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
-    <glyph glyph-name="fast_forward" unicode="&#xf050;" horiz-adv-x="1792" 
-d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19l-710 -710
-q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
-    <glyph glyph-name="step_forward" unicode="&#xf051;" horiz-adv-x="1024" 
-d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19z" />
-    <glyph glyph-name="eject" unicode="&#xf052;" horiz-adv-x="1538" 
-d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
-    <glyph glyph-name="chevron_left" unicode="&#xf053;" horiz-adv-x="1280" 
-d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z" />
-    <glyph glyph-name="chevron_right" unicode="&#xf054;" horiz-adv-x="1280" 
-d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z" />
-    <glyph glyph-name="plus_sign" unicode="&#xf055;" 
-d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5
-t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="minus_sign" unicode="&#xf056;" 
-d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
-t103 -385.5z" />
-    <glyph glyph-name="remove_sign" unicode="&#xf057;" 
-d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19
-q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="ok_sign" unicode="&#xf058;" 
-d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
-t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="question_sign" unicode="&#xf059;" 
-d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59
+q24 -24 24 -57t-24 -57z"/>
+			<glyph glyph-name="move" unicode="&#xf047;" horiz-adv-x="1792"
+				   d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45
+t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z"/>
+			<glyph glyph-name="step_backward" unicode="&#xf048;" horiz-adv-x="1024"
+				   d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19z"/>
+			<glyph glyph-name="fast_backward" unicode="&#xf049;" horiz-adv-x="1792"
+				   d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19l710 710
+q19 19 32 13t13 -32v-710q4 10 13 19z"/>
+			<glyph glyph-name="backward" unicode="&#xf04a;" horiz-adv-x="1664"
+				   d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q4 10 13 19z"/>
+			<glyph glyph-name="play" unicode="&#xf04b;" horiz-adv-x="1408"
+				   d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z"/>
+			<glyph glyph-name="pause" unicode="&#xf04c;"
+				   d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="stop" unicode="&#xf04d;"
+				   d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="forward" unicode="&#xf04e;" horiz-adv-x="1664"
+				   d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z"/>
+			<glyph glyph-name="fast_forward" unicode="&#xf050;" horiz-adv-x="1792"
+				   d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19l-710 -710
+q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z"/>
+			<glyph glyph-name="step_forward" unicode="&#xf051;" horiz-adv-x="1024"
+				   d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19z"/>
+			<glyph glyph-name="eject" unicode="&#xf052;" horiz-adv-x="1538"
+				   d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z"/>
+			<glyph glyph-name="chevron_left" unicode="&#xf053;" horiz-adv-x="1280"
+				   d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z"/>
+			<glyph glyph-name="chevron_right" unicode="&#xf054;" horiz-adv-x="1280"
+				   d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z"/>
+			<glyph glyph-name="plus_sign" unicode="&#xf055;"
+				   d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5
+t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="minus_sign" unicode="&#xf056;"
+				   d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z"/>
+			<glyph glyph-name="remove_sign" unicode="&#xf057;"
+				   d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19
+q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="ok_sign" unicode="&#xf058;"
+				   d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="question_sign" unicode="&#xf059;"
+				   d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59
 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
-t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="info_sign" unicode="&#xf05a;" 
-d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23
-t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="screenshot" unicode="&#xf05b;" 
-d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="info_sign" unicode="&#xf05a;"
+				   d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23
+t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="screenshot" unicode="&#xf05b;"
+				   d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109
 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143
-q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="remove_circle" unicode="&#xf05c;" 
-d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
+q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="remove_circle" unicode="&#xf05c;"
+				   d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5
-t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="ok_circle" unicode="&#xf05d;" 
-d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198
-t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="ban_circle" unicode="&#xf05e;" 
-d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61
-t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
-    <glyph glyph-name="arrow_left" unicode="&#xf060;" 
-d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5
-t32.5 -90.5z" />
-    <glyph glyph-name="arrow_right" unicode="&#xf061;" 
-d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
-    <glyph glyph-name="arrow_up" unicode="&#xf062;" horiz-adv-x="1664" 
-d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651
-q37 -39 37 -91z" />
-    <glyph glyph-name="arrow_down" unicode="&#xf063;" horiz-adv-x="1664" 
-d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-    <glyph glyph-name="share_alt" unicode="&#xf064;" horiz-adv-x="1792" 
-d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22
-t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
-    <glyph glyph-name="resize_full" unicode="&#xf065;" 
-d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332
-q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="resize_small" unicode="&#xf066;" 
-d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45
-t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
-    <glyph glyph-name="plus" unicode="&#xf067;" horiz-adv-x="1408" 
-d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="minus" unicode="&#xf068;" horiz-adv-x="1408" 
-d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="asterisk" unicode="&#xf069;" horiz-adv-x="1664" 
-d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154
-q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
-    <glyph glyph-name="exclamation_sign" unicode="&#xf06a;" 
-d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192
-q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
-    <glyph glyph-name="gift" unicode="&#xf06b;" 
-d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320
+t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="ok_circle" unicode="&#xf05d;"
+				   d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198
+t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="ban_circle" unicode="&#xf05e;"
+				   d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61
+t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z"/>
+			<glyph glyph-name="arrow_left" unicode="&#xf060;"
+				   d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5
+t32.5 -90.5z"/>
+			<glyph glyph-name="arrow_right" unicode="&#xf061;"
+				   d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z"/>
+			<glyph glyph-name="arrow_up" unicode="&#xf062;" horiz-adv-x="1664"
+				   d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651
+q37 -39 37 -91z"/>
+			<glyph glyph-name="arrow_down" unicode="&#xf063;" horiz-adv-x="1664"
+				   d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z"/>
+			<glyph glyph-name="share_alt" unicode="&#xf064;" horiz-adv-x="1792"
+				   d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22
+t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z"/>
+			<glyph glyph-name="resize_full" unicode="&#xf065;"
+				   d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332
+q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="resize_small" unicode="&#xf066;"
+				   d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45
+t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z"/>
+			<glyph glyph-name="plus" unicode="&#xf067;" horiz-adv-x="1408"
+				   d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z"/>
+			<glyph glyph-name="minus" unicode="&#xf068;" horiz-adv-x="1408"
+				   d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z"/>
+			<glyph glyph-name="asterisk" unicode="&#xf069;" horiz-adv-x="1664"
+				   d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154
+q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z"/>
+			<glyph glyph-name="exclamation_sign" unicode="&#xf06a;"
+				   d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192
+q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z"/>
+			<glyph glyph-name="gift" unicode="&#xf06b;"
+				   d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320
 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5
-t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="leaf" unicode="&#xf06c;" horiz-adv-x="1792" 
-d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268
+t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z"/>
+			<glyph glyph-name="leaf" unicode="&#xf06c;" horiz-adv-x="1792"
+				   d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268
 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-43 0 -63.5 17.5t-45.5 59.5q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5
-t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
-    <glyph glyph-name="fire" unicode="&#xf06d;" horiz-adv-x="1408" 
-d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1
-q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
-    <glyph glyph-name="eye_open" unicode="&#xf06e;" horiz-adv-x="1792" 
-d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5
-t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
-    <glyph glyph-name="eye_close" unicode="&#xf070;" horiz-adv-x="1792" 
-d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9
+t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z"/>
+			<glyph glyph-name="fire" unicode="&#xf06d;" horiz-adv-x="1408"
+				   d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1
+q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z"/>
+			<glyph glyph-name="eye_open" unicode="&#xf06e;" horiz-adv-x="1792"
+				   d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5
+t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z"/>
+			<glyph glyph-name="eye_close" unicode="&#xf070;" horiz-adv-x="1792"
+				   d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9
 q-106 -189 -316 -567t-315 -566l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5
 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z
-" />
-    <glyph glyph-name="warning_sign" unicode="&#xf071;" horiz-adv-x="1792" 
-d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185
-q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
-    <glyph glyph-name="plane" unicode="&#xf072;" horiz-adv-x="1408" 
-d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9
-q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
-    <glyph glyph-name="calendar" unicode="&#xf073;" horiz-adv-x="1664" 
-d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z
+"/>
+			<glyph glyph-name="warning_sign" unicode="&#xf071;" horiz-adv-x="1792"
+				   d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185
+q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z"/>
+			<glyph glyph-name="plane" unicode="&#xf072;" horiz-adv-x="1408"
+				   d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9
+q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z"/>
+			<glyph glyph-name="calendar" unicode="&#xf073;" horiz-adv-x="1664"
+				   d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z
 M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64
 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47
-h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="random" unicode="&#xf074;" horiz-adv-x="1792" 
-d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1
+h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z"/>
+			<glyph glyph-name="random" unicode="&#xf074;" horiz-adv-x="1792"
+				   d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1
 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5
 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111
-t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-    <glyph glyph-name="comment" unicode="&#xf075;" horiz-adv-x="1792" 
-d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281
-q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
-    <glyph glyph-name="magnet" unicode="&#xf076;" 
-d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384
-q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="chevron_up" unicode="&#xf077;" horiz-adv-x="1792" 
-d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z" />
-    <glyph glyph-name="chevron_down" unicode="&#xf078;" horiz-adv-x="1792" 
-d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z" />
-    <glyph glyph-name="retweet" unicode="&#xf079;" horiz-adv-x="1920" 
-d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -10 7 -21
+t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z"/>
+			<glyph glyph-name="comment" unicode="&#xf075;" horiz-adv-x="1792"
+				   d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281
+q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z"/>
+			<glyph glyph-name="magnet" unicode="&#xf076;"
+				   d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384
+q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="chevron_up" unicode="&#xf077;" horiz-adv-x="1792"
+				   d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z"/>
+			<glyph glyph-name="chevron_down" unicode="&#xf078;" horiz-adv-x="1792"
+				   d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z"/>
+			<glyph glyph-name="retweet" unicode="&#xf079;" horiz-adv-x="1920"
+				   d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -10 7 -21
 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z
-" />
-    <glyph glyph-name="shopping_cart" unicode="&#xf07a;" horiz-adv-x="1664" 
-d="M640 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1536 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1664 1088v-512q0 -24 -16.5 -42.5t-40.5 -21.5l-1044 -122q13 -60 13 -70q0 -16 -24 -64h920q26 0 45 -19t19 -45
-t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 11 8 31.5t16 36t21.5 40t15.5 29.5l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t19.5 -15.5t13 -24.5t8 -26t5.5 -29.5t4.5 -26h1201q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="folder_close" unicode="&#xf07b;" horiz-adv-x="1664" 
-d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-    <glyph glyph-name="folder_open" unicode="&#xf07c;" horiz-adv-x="1920" 
-d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5
-t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
-    <glyph glyph-name="resize_vertical" unicode="&#xf07d;" horiz-adv-x="768" 
-d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
-    <glyph glyph-name="resize_horizontal" unicode="&#xf07e;" horiz-adv-x="1792" 
-d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-    <glyph glyph-name="bar_chart" unicode="&#xf080;" horiz-adv-x="2048" 
-d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z" />
-    <glyph glyph-name="twitter_sign" unicode="&#xf081;" 
-d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4
+"/>
+			<glyph glyph-name="shopping_cart" unicode="&#xf07a;" horiz-adv-x="1664"
+				   d="M640 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1536 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1664 1088v-512q0 -24 -16.5 -42.5t-40.5 -21.5l-1044 -122q13 -60 13 -70q0 -16 -24 -64h920q26 0 45 -19t19 -45
+t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 11 8 31.5t16 36t21.5 40t15.5 29.5l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t19.5 -15.5t13 -24.5t8 -26t5.5 -29.5t4.5 -26h1201q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="folder_close" unicode="&#xf07b;" horiz-adv-x="1664"
+				   d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z"/>
+			<glyph glyph-name="folder_open" unicode="&#xf07c;" horiz-adv-x="1920"
+				   d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5
+t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z"/>
+			<glyph glyph-name="resize_vertical" unicode="&#xf07d;" horiz-adv-x="768"
+				   d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z"/>
+			<glyph glyph-name="resize_horizontal" unicode="&#xf07e;" horiz-adv-x="1792"
+				   d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z"/>
+			<glyph glyph-name="bar_chart" unicode="&#xf080;" horiz-adv-x="2048"
+				   d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z"/>
+			<glyph glyph-name="twitter_sign" unicode="&#xf081;"
+				   d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4
 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5
-t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="facebook_sign" unicode="&#xf082;" 
-d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-188v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-532q-119 0 -203.5 84.5t-84.5 203.5v960
-q0 119 84.5 203.5t203.5 84.5h960z" />
-    <glyph glyph-name="camera_retro" unicode="&#xf083;" horiz-adv-x="1792" 
-d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5
+t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="facebook_sign" unicode="&#xf082;"
+				   d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-188v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-532q-119 0 -203.5 84.5t-84.5 203.5v960
+q0 119 84.5 203.5t203.5 84.5h960z"/>
+			<glyph glyph-name="camera_retro" unicode="&#xf083;" horiz-adv-x="1792"
+				   d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5
 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280
-q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
-    <glyph glyph-name="key" unicode="&#xf084;" horiz-adv-x="1792" 
-d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26
+q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z"/>
+			<glyph glyph-name="key" unicode="&#xf084;" horiz-adv-x="1792"
+				   d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26
 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5
-t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
-    <glyph glyph-name="cogs" unicode="&#xf085;" horiz-adv-x="1920" 
-d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5
+t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z"/>
+			<glyph glyph-name="cogs" unicode="&#xf085;" horiz-adv-x="1920"
+				   d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5
 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -11 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5
 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7
 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -8 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31
 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20
 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68
 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70
-q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
-    <glyph glyph-name="comments" unicode="&#xf086;" horiz-adv-x="1792" 
-d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224
+q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z"/>
+			<glyph glyph-name="comments" unicode="&#xf086;" horiz-adv-x="1792"
+				   d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224
 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7
-q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
-    <glyph glyph-name="thumbs_up_alt" unicode="&#xf087;" 
-d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5
+q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z"/>
+			<glyph glyph-name="thumbs_up_alt" unicode="&#xf087;"
+				   d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5
 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769
 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128
-q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
-    <glyph glyph-name="thumbs_down_alt" unicode="&#xf088;" 
-d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 31 18 69q0 37 -17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5
+q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z"/>
+			<glyph glyph-name="thumbs_down_alt" unicode="&#xf088;"
+				   d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 31 18 69q0 37 -17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5
 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z
 M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5
-h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -73 49 -163z" />
-    <glyph glyph-name="star_half" unicode="&#xf089;" horiz-adv-x="896" 
-d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
-    <glyph glyph-name="heart_empty" unicode="&#xf08a;" horiz-adv-x="1792" 
-d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559
+h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -73 49 -163z"/>
+			<glyph glyph-name="star_half" unicode="&#xf089;" horiz-adv-x="896"
+				   d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z"/>
+			<glyph glyph-name="heart_empty" unicode="&#xf08a;" horiz-adv-x="1792"
+				   d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559
 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5
-q224 0 351 -124t127 -344z" />
-    <glyph glyph-name="signout" unicode="&#xf08b;" horiz-adv-x="1664" 
-d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704
-q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
-    <glyph glyph-name="linkedin_sign" unicode="&#xf08c;" 
-d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5
-q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="pushpin" unicode="&#xf08d;" horiz-adv-x="1152" 
-d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38
-t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
-    <glyph glyph-name="external_link" unicode="&#xf08e;" horiz-adv-x="1792" 
-d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320
-q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="signin" unicode="&#xf090;" 
-d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5
-q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="trophy" unicode="&#xf091;" horiz-adv-x="1664" 
-d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91
+q224 0 351 -124t127 -344z"/>
+			<glyph glyph-name="signout" unicode="&#xf08b;" horiz-adv-x="1664"
+				   d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704
+q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z"/>
+			<glyph glyph-name="linkedin_sign" unicode="&#xf08c;"
+				   d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5
+q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="pushpin" unicode="&#xf08d;" horiz-adv-x="1152"
+				   d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38
+t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z"/>
+			<glyph glyph-name="external_link" unicode="&#xf08e;" horiz-adv-x="1792"
+				   d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320
+q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="signin" unicode="&#xf090;"
+				   d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5
+q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="trophy" unicode="&#xf091;" horiz-adv-x="1664"
+				   d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91
 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96
-q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="github_sign" unicode="&#xf092;" 
-d="M519 336q4 6 -3 13q-9 7 -14 2q-4 -6 3 -13q9 -7 14 -2zM491 377q-5 7 -12 4q-6 -4 0 -12q7 -8 12 -5q6 4 0 13zM450 417q2 4 -5 8q-7 2 -8 -2q-3 -5 4 -8q8 -2 9 2zM471 394q2 1 1.5 4.5t-3.5 5.5q-6 7 -10 3t1 -11q6 -6 11 -2zM557 319q2 7 -9 11q-9 3 -13 -4
+q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z"/>
+			<glyph glyph-name="github_sign" unicode="&#xf092;"
+				   d="M519 336q4 6 -3 13q-9 7 -14 2q-4 -6 3 -13q9 -7 14 -2zM491 377q-5 7 -12 4q-6 -4 0 -12q7 -8 12 -5q6 4 0 13zM450 417q2 4 -5 8q-7 2 -8 -2q-3 -5 4 -8q8 -2 9 2zM471 394q2 1 1.5 4.5t-3.5 5.5q-6 7 -10 3t1 -11q6 -6 11 -2zM557 319q2 7 -9 11q-9 3 -13 -4
 q-2 -7 9 -11q9 -3 13 4zM599 316q0 8 -12 8q-10 0 -10 -8t11 -8t11 8zM638 323q-2 7 -13 5t-9 -9q2 -8 12 -6t10 10zM1280 640q0 212 -150 362t-362 150t-362 -150t-150 -362q0 -167 98 -300.5t252 -185.5q18 -3 26.5 5t8.5 20q0 52 -1 95q-6 -1 -15.5 -2.5t-35.5 -2t-48 4
 t-43.5 20t-29.5 41.5q-23 59 -57 74q-2 1 -4.5 3.5l-8 8t-7 9.5t4 7.5t19.5 3.5q6 0 15 -2t30 -15.5t33 -35.5q16 -28 37.5 -42t43.5 -14t38 3.5t30 9.5q7 47 33 69q-49 6 -86 18.5t-73 39t-55.5 76t-19.5 119.5q0 79 53 137q-24 62 5 136q19 6 54.5 -7.5t60.5 -29.5l26 -16
 q58 17 128 17t128 -17q11 7 28.5 18t55.5 26t57 9q29 -74 5 -136q53 -58 53 -137q0 -57 -14 -100.5t-35.5 -70t-53.5 -44.5t-62.5 -26t-68.5 -12q35 -31 35 -95q0 -40 -0.5 -89t-0.5 -51q0 -12 8.5 -20t26.5 -5q154 52 252 185.5t98 300.5zM1536 1120v-960
-q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="upload_alt" unicode="&#xf093;" horiz-adv-x="1664" 
-d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92
-t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
-    <glyph glyph-name="lemon" unicode="&#xf094;" 
-d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="upload_alt" unicode="&#xf093;" horiz-adv-x="1664"
+				   d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92
+t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z"/>
+			<glyph glyph-name="lemon" unicode="&#xf094;"
+				   d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5
 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44
 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5
-q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -13 2 -25t3.5 -16.5t7.5 -20.5t8 -20q16 -40 25 -118.5t9 -136.5z" />
-    <glyph glyph-name="phone" unicode="&#xf095;" horiz-adv-x="1408" 
-d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -53 3.5t-57.5 12.5t-47 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-127 79 -264 216t-216 264q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47t-12.5 57.5t-3.5 53q0 92 51 186
+q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -13 2 -25t3.5 -16.5t7.5 -20.5t8 -20q16 -40 25 -118.5t9 -136.5z"/>
+			<glyph glyph-name="phone" unicode="&#xf095;" horiz-adv-x="1408"
+				   d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -53 3.5t-57.5 12.5t-47 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-127 79 -264 216t-216 264q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47t-12.5 57.5t-3.5 53q0 92 51 186
 q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174q2 -1 19 -11.5t24 -14
-t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
-    <glyph glyph-name="check_empty" unicode="&#xf096;" horiz-adv-x="1408" 
-d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
-q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="bookmark_empty" unicode="&#xf097;" horiz-adv-x="1280" 
-d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289
-q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-    <glyph glyph-name="phone_sign" unicode="&#xf098;" 
-d="M1280 343q0 11 -2 16t-18 16.5t-40.5 25t-47.5 26.5t-45.5 25t-28.5 15q-5 3 -19 13t-25 15t-21 5q-15 0 -36.5 -20.5t-39.5 -45t-38.5 -45t-33.5 -20.5q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170 126.5t-127 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5
+t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z"/>
+			<glyph glyph-name="check_empty" unicode="&#xf096;" horiz-adv-x="1408"
+				   d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
+q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="bookmark_empty" unicode="&#xf097;" horiz-adv-x="1280"
+				   d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289
+q0 34 19.5 62t52.5 41q21 9 44 9h1048z"/>
+			<glyph glyph-name="phone_sign" unicode="&#xf098;"
+				   d="M1280 343q0 11 -2 16t-18 16.5t-40.5 25t-47.5 26.5t-45.5 25t-28.5 15q-5 3 -19 13t-25 15t-21 5q-15 0 -36.5 -20.5t-39.5 -45t-38.5 -45t-33.5 -20.5q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170 126.5t-127 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5
 t-3.5 16.5q0 13 20.5 33.5t45 38.5t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5
 t320.5 -216.5q6 -2 30 -11t33 -12.5t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z
-" />
-    <glyph glyph-name="twitter" unicode="&#xf099;" horiz-adv-x="1664" 
-d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41
-q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
-    <glyph glyph-name="facebook" unicode="&#xf09a;" horiz-adv-x="1024" 
-d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
-    <glyph glyph-name="github" unicode="&#xf09b;" 
-d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -40 7t-13 30q0 3 0.5 76.5t0.5 134.5q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 119 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24
+"/>
+			<glyph glyph-name="twitter" unicode="&#xf099;" horiz-adv-x="1664"
+				   d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41
+q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z"/>
+			<glyph glyph-name="facebook" unicode="&#xf09a;" horiz-adv-x="1024"
+				   d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z"/>
+			<glyph glyph-name="github" unicode="&#xf09b;"
+				   d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -40 7t-13 30q0 3 0.5 76.5t0.5 134.5q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 119 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24
 q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-85 13.5q-45 -113 -8 -204q-79 -87 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-39 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5
 t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -88.5t0.5 -54.5q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103zM291 305q3 7 -7 12
 q-10 3 -13 -2q-3 -7 7 -12q9 -6 13 2zM322 271q7 5 -2 16q-10 9 -16 3q-7 -5 2 -16q10 -10 16 -3zM352 226q9 7 0 19q-8 13 -17 6q-9 -5 0 -18t17 -7zM394 184q8 8 -4 19q-12 12 -20 3q-9 -8 4 -19q12 -12 20 -3zM451 159q3 11 -13 16q-15 4 -19 -7t13 -15q15 -6 19 6z
-M514 154q0 13 -17 11q-16 0 -16 -11q0 -13 17 -11q16 0 16 11zM572 164q-2 11 -18 9q-16 -3 -14 -15t18 -8t14 14z" />
-    <glyph glyph-name="unlock" unicode="&#xf09c;" horiz-adv-x="1664" 
-d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5
-t316.5 -131.5t131.5 -316.5z" />
-    <glyph glyph-name="credit_card" unicode="&#xf09d;" horiz-adv-x="1920" 
-d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608
-q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
-    <glyph glyph-name="rss" unicode="&#xf09e;" horiz-adv-x="1408" 
-d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5
+M514 154q0 13 -17 11q-16 0 -16 -11q0 -13 17 -11q16 0 16 11zM572 164q-2 11 -18 9q-16 -3 -14 -15t18 -8t14 14z"/>
+			<glyph glyph-name="unlock" unicode="&#xf09c;" horiz-adv-x="1664"
+				   d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5
+t316.5 -131.5t131.5 -316.5z"/>
+			<glyph glyph-name="credit_card" unicode="&#xf09d;" horiz-adv-x="1920"
+				   d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608
+q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z"/>
+			<glyph glyph-name="rss" unicode="&#xf09e;" horiz-adv-x="1408"
+				   d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5
 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294
-q187 -186 294 -425.5t120 -501.5z" />
-    <glyph glyph-name="hdd" unicode="&#xf0a0;" 
-d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5
+q187 -186 294 -425.5t120 -501.5z"/>
+			<glyph glyph-name="hdd" unicode="&#xf0a0;"
+				   d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5
 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75
-l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
-    <glyph glyph-name="bullhorn" unicode="&#xf0a1;" horiz-adv-x="1792" 
-d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5
-t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
-    <glyph glyph-name="bell" unicode="&#xf0a2;" horiz-adv-x="1792" 
-d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z
+l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z"/>
+			<glyph glyph-name="bullhorn" unicode="&#xf0a1;" horiz-adv-x="1792"
+				   d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5
+t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z"/>
+			<glyph glyph-name="bell" unicode="&#xf0a2;" horiz-adv-x="1792"
+				   d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z
 M1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5
-t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
-    <glyph glyph-name="certificate" unicode="&#xf0a3;" 
-d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70
+t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z"/>
+			<glyph glyph-name="certificate" unicode="&#xf0a3;"
+				   d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70
 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70
-l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
-    <glyph glyph-name="hand_right" unicode="&#xf0a4;" horiz-adv-x="1792" 
-d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106
+l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z"/>
+			<glyph glyph-name="hand_right" unicode="&#xf0a4;" horiz-adv-x="1792"
+				   d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106
 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43
 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5
-t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
-    <glyph glyph-name="hand_left" unicode="&#xf0a5;" horiz-adv-x="1792" 
-d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-8 9 -12 14q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576q-50 0 -89 -38.5
+t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z"/>
+			<glyph glyph-name="hand_left" unicode="&#xf0a5;" horiz-adv-x="1792"
+				   d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-8 9 -12 14q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576q-50 0 -89 -38.5
 t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45z
 M1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128q0 122 81.5 189t206.5 67
-q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
-    <glyph glyph-name="hand_up" unicode="&#xf0a6;" 
-d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576
+q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z"/>
+			<glyph glyph-name="hand_up" unicode="&#xf0a6;"
+				   d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576
 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5
 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76
-q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
-    <glyph glyph-name="hand_down" unicode="&#xf0a7;" 
-d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33
+q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z"/>
+			<glyph glyph-name="hand_down" unicode="&#xf0a7;"
+				   d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33
 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580
 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100
-q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
-    <glyph glyph-name="circle_arrow_left" unicode="&#xf0a8;" 
-d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="circle_arrow_right" unicode="&#xf0a9;" 
-d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="circle_arrow_up" unicode="&#xf0aa;" 
-d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="circle_arrow_down" unicode="&#xf0ab;" 
-d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="globe" unicode="&#xf0ac;" 
-d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11
+q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z"/>
+			<glyph glyph-name="circle_arrow_left" unicode="&#xf0a8;"
+				   d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="circle_arrow_right" unicode="&#xf0a9;"
+				   d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="circle_arrow_up" unicode="&#xf0aa;"
+				   d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="circle_arrow_down" unicode="&#xf0ab;"
+				   d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="globe" unicode="&#xf0ac;"
+				   d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11
 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 11t-9.5 10q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5
 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5
 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5
@@ -609,204 +609,204 @@ q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5
 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5
 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q8 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5
 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7
-q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
-    <glyph glyph-name="wrench" unicode="&#xf0ad;" horiz-adv-x="1664" 
-d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5
-t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
-    <glyph glyph-name="tasks" unicode="&#xf0ae;" horiz-adv-x="1792" 
-d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19
-t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="filter" unicode="&#xf0b0;" horiz-adv-x="1408" 
-d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
-    <glyph glyph-name="briefcase" unicode="&#xf0b1;" horiz-adv-x="1792" 
-d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68
-t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="fullscreen" unicode="&#xf0b2;" 
-d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144
+q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z"/>
+			<glyph glyph-name="wrench" unicode="&#xf0ad;" horiz-adv-x="1664"
+				   d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5
+t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z"/>
+			<glyph glyph-name="tasks" unicode="&#xf0ae;" horiz-adv-x="1792"
+				   d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19
+t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="filter" unicode="&#xf0b0;" horiz-adv-x="1408"
+				   d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z"/>
+			<glyph glyph-name="briefcase" unicode="&#xf0b1;" horiz-adv-x="1792"
+				   d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68
+t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z"/>
+			<glyph glyph-name="fullscreen" unicode="&#xf0b2;"
+				   d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144
 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z
-" />
-    <glyph glyph-name="group" unicode="&#xf0c0;" horiz-adv-x="1920" 
-d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5
+"/>
+			<glyph glyph-name="group" unicode="&#xf0c0;" horiz-adv-x="1920"
+				   d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5
 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75
 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5
-t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
-    <glyph glyph-name="link" unicode="&#xf0c1;" horiz-adv-x="1664" 
-d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26
+t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z"/>
+			<glyph glyph-name="link" unicode="&#xf0c1;" horiz-adv-x="1664"
+				   d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26
 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15
 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207
-q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
-    <glyph glyph-name="cloud" unicode="&#xf0c2;" horiz-adv-x="1920" 
-d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z
-" />
-    <glyph glyph-name="beaker" unicode="&#xf0c3;" horiz-adv-x="1664" 
-d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
-    <glyph glyph-name="cut" unicode="&#xf0c4;" horiz-adv-x="1792" 
-d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84
+q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z"/>
+			<glyph glyph-name="cloud" unicode="&#xf0c2;" horiz-adv-x="1920"
+				   d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z
+"/>
+			<glyph glyph-name="beaker" unicode="&#xf0c3;" horiz-adv-x="1664"
+				   d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z"/>
+			<glyph glyph-name="cut" unicode="&#xf0c4;" horiz-adv-x="1792"
+				   d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84
 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148
 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108
 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6
-q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
-    <glyph glyph-name="copy" unicode="&#xf0c5;" horiz-adv-x="1792" 
-d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299
-h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
-    <glyph glyph-name="paper_clip" unicode="&#xf0c6;" horiz-adv-x="1408" 
-d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181
+q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z"/>
+			<glyph glyph-name="copy" unicode="&#xf0c5;" horiz-adv-x="1792"
+				   d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299
+h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z"/>
+			<glyph glyph-name="paper_clip" unicode="&#xf0c6;" horiz-adv-x="1408"
+				   d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181
 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235
-z" />
-    <glyph glyph-name="save" unicode="&#xf0c7;" 
-d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5
-h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
-    <glyph glyph-name="sign_blank" unicode="&#xf0c8;" 
-d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="reorder" unicode="&#xf0c9;" 
-d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45
-t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="ul" unicode="&#xf0ca;" horiz-adv-x="1792" 
-d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5
+z"/>
+			<glyph glyph-name="save" unicode="&#xf0c7;"
+				   d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5
+h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z"/>
+			<glyph glyph-name="sign_blank" unicode="&#xf0c8;"
+				   d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="reorder" unicode="&#xf0c9;"
+				   d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45
+t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="ul" unicode="&#xf0ca;" horiz-adv-x="1792"
+				   d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5
 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z
-M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-    <glyph glyph-name="ol" unicode="&#xf0cb;" horiz-adv-x="1792" 
-d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362
+M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z"/>
+			<glyph glyph-name="ol" unicode="&#xf0cb;" horiz-adv-x="1792"
+				   d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362
 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5
 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 121.5t0.5 121.5v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216
-q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-    <glyph glyph-name="strikethrough" unicode="&#xf0cc;" horiz-adv-x="1792" 
-d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 98 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6
+q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z"/>
+			<glyph glyph-name="strikethrough" unicode="&#xf0cc;" horiz-adv-x="1792"
+				   d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 98 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6
 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -56 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23
-l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
-    <glyph glyph-name="underline" unicode="&#xf0cd;" 
-d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47
+l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z"/>
+			<glyph glyph-name="underline" unicode="&#xf0cd;"
+				   d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47
 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41
 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472
-q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
-    <glyph glyph-name="table" unicode="&#xf0ce;" horiz-adv-x="1664" 
-d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23
+q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z"/>
+			<glyph glyph-name="table" unicode="&#xf0ce;" horiz-adv-x="1664"
+				   d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23
 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192
 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192
 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113
-z" />
-    <glyph glyph-name="magic" unicode="&#xf0d0;" horiz-adv-x="1664" 
-d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276
-l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
-    <glyph glyph-name="truck" unicode="&#xf0d1;" horiz-adv-x="1792" 
-d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5
+z"/>
+			<glyph glyph-name="magic" unicode="&#xf0d0;" horiz-adv-x="1664"
+				   d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276
+l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z"/>
+			<glyph glyph-name="truck" unicode="&#xf0d1;" horiz-adv-x="1792"
+				   d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5
 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38
-t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="pinterest" unicode="&#xf0d2;" 
-d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134
+t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="pinterest" unicode="&#xf0d2;"
+				   d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134
 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33
-q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="pinterest_sign" unicode="&#xf0d3;" 
-d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5
+q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="pinterest_sign" unicode="&#xf0d3;"
+				   d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5
 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5
-t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
-    <glyph glyph-name="google_plus_sign" unicode="&#xf0d4;" 
-d="M917 631q0 26 -6 64h-362v-132h217q-3 -24 -16.5 -50t-37.5 -53t-66.5 -44.5t-96.5 -17.5q-99 0 -169 71t-70 171t70 171t169 71q92 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585
-h109v110h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="google_plus" unicode="&#xf0d5;" horiz-adv-x="2304" 
-d="M1437 623q0 -208 -87 -370.5t-248 -254t-369 -91.5q-149 0 -285 58t-234 156t-156 234t-58 285t58 285t156 234t234 156t285 58q286 0 491 -192l-199 -191q-117 113 -292 113q-123 0 -227.5 -62t-165.5 -168.5t-61 -232.5t61 -232.5t165.5 -168.5t227.5 -62
-q83 0 152.5 23t114.5 57.5t78.5 78.5t49 83t21.5 74h-416v252h692q12 -63 12 -122zM2304 745v-210h-209v-209h-210v209h-209v210h209v209h210v-209h209z" />
-    <glyph glyph-name="money" unicode="&#xf0d6;" horiz-adv-x="1920" 
-d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384
-v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="caret_down" unicode="&#xf0d7;" horiz-adv-x="1024" 
-d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="caret_up" unicode="&#xf0d8;" horiz-adv-x="1024" 
-d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-    <glyph glyph-name="caret_left" unicode="&#xf0d9;" horiz-adv-x="640" 
-d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
-    <glyph glyph-name="caret_right" unicode="&#xf0da;" horiz-adv-x="640" 
-d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
-    <glyph glyph-name="columns" unicode="&#xf0db;" horiz-adv-x="1664" 
-d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="sort" unicode="&#xf0dc;" horiz-adv-x="1024" 
-d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-    <glyph glyph-name="sort_down" unicode="&#xf0dd;" horiz-adv-x="1024" 
-d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="sort_up" unicode="&#xf0de;" horiz-adv-x="1024" 
-d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-    <glyph glyph-name="envelope_alt" unicode="&#xf0e0;" horiz-adv-x="1792" 
-d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123
-q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
-    <glyph glyph-name="linkedin" unicode="&#xf0e1;" 
-d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329
-q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
-    <glyph glyph-name="undo" unicode="&#xf0e2;" 
-d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
-t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
-    <glyph glyph-name="legal" unicode="&#xf0e3;" horiz-adv-x="1792" 
-d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5
+t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z"/>
+			<glyph glyph-name="google_plus_sign" unicode="&#xf0d4;"
+				   d="M917 631q0 26 -6 64h-362v-132h217q-3 -24 -16.5 -50t-37.5 -53t-66.5 -44.5t-96.5 -17.5q-99 0 -169 71t-70 171t70 171t169 71q92 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585
+h109v110h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="google_plus" unicode="&#xf0d5;" horiz-adv-x="2304"
+				   d="M1437 623q0 -208 -87 -370.5t-248 -254t-369 -91.5q-149 0 -285 58t-234 156t-156 234t-58 285t58 285t156 234t234 156t285 58q286 0 491 -192l-199 -191q-117 113 -292 113q-123 0 -227.5 -62t-165.5 -168.5t-61 -232.5t61 -232.5t165.5 -168.5t227.5 -62
+q83 0 152.5 23t114.5 57.5t78.5 78.5t49 83t21.5 74h-416v252h692q12 -63 12 -122zM2304 745v-210h-209v-209h-210v209h-209v210h209v209h210v-209h209z"/>
+			<glyph glyph-name="money" unicode="&#xf0d6;" horiz-adv-x="1920"
+				   d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384
+v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="caret_down" unicode="&#xf0d7;" horiz-adv-x="1024"
+				   d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="caret_up" unicode="&#xf0d8;" horiz-adv-x="1024"
+				   d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z"/>
+			<glyph glyph-name="caret_left" unicode="&#xf0d9;" horiz-adv-x="640"
+				   d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z"/>
+			<glyph glyph-name="caret_right" unicode="&#xf0da;" horiz-adv-x="640"
+				   d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z"/>
+			<glyph glyph-name="columns" unicode="&#xf0db;" horiz-adv-x="1664"
+				   d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z"/>
+			<glyph glyph-name="sort" unicode="&#xf0dc;" horiz-adv-x="1024"
+				   d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z"/>
+			<glyph glyph-name="sort_down" unicode="&#xf0dd;" horiz-adv-x="1024"
+				   d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="sort_up" unicode="&#xf0de;" horiz-adv-x="1024"
+				   d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z"/>
+			<glyph glyph-name="envelope_alt" unicode="&#xf0e0;" horiz-adv-x="1792"
+				   d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123
+q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z"/>
+			<glyph glyph-name="linkedin" unicode="&#xf0e1;"
+				   d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329
+q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z"/>
+			<glyph glyph-name="undo" unicode="&#xf0e2;"
+				   d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
+t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z"/>
+			<glyph glyph-name="legal" unicode="&#xf0e3;" horiz-adv-x="1792"
+				   d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5
 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14
 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28
-q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
-    <glyph glyph-name="dashboard" unicode="&#xf0e4;" horiz-adv-x="1792" 
-d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5
+q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z"/>
+			<glyph glyph-name="dashboard" unicode="&#xf0e4;" horiz-adv-x="1792"
+				   d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5
 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5
 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29
-q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="comment_alt" unicode="&#xf0e5;" horiz-adv-x="1792" 
-d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640
+q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z"/>
+			<glyph glyph-name="comment_alt" unicode="&#xf0e5;" horiz-adv-x="1792"
+				   d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640
 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5
-t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
-    <glyph glyph-name="comments_alt" unicode="&#xf0e6;" horiz-adv-x="1792" 
-d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257
+t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z"/>
+			<glyph glyph-name="comments_alt" unicode="&#xf0e6;" horiz-adv-x="1792"
+				   d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257
 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5
 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129
-q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
-    <glyph glyph-name="bolt" unicode="&#xf0e7;" horiz-adv-x="896" 
-d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
-    <glyph glyph-name="sitemap" unicode="&#xf0e8;" horiz-adv-x="1792" 
-d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320
+q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z"/>
+			<glyph glyph-name="bolt" unicode="&#xf0e7;" horiz-adv-x="896"
+				   d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z"/>
+			<glyph glyph-name="sitemap" unicode="&#xf0e8;" horiz-adv-x="1792"
+				   d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320
 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68
-z" />
-    <glyph glyph-name="umbrella" unicode="&#xf0e9;" horiz-adv-x="1664" 
-d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97
+z"/>
+			<glyph glyph-name="umbrella" unicode="&#xf0e9;" horiz-adv-x="1664"
+				   d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97
 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69
-q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
-    <glyph glyph-name="paste" unicode="&#xf0ea;" horiz-adv-x="1792" 
-d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28
-h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
-    <glyph glyph-name="light_bulb" unicode="&#xf0eb;" horiz-adv-x="1024" 
-d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134
+q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z"/>
+			<glyph glyph-name="paste" unicode="&#xf0ea;" horiz-adv-x="1792"
+				   d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28
+h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z"/>
+			<glyph glyph-name="light_bulb" unicode="&#xf0eb;" horiz-adv-x="1024"
+				   d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134
 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47
 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5
-t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
-    <glyph glyph-name="exchange" unicode="&#xf0ec;" horiz-adv-x="1792" 
-d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9
-q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-    <glyph glyph-name="cloud_download" unicode="&#xf0ed;" horiz-adv-x="1920" 
-d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
-q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-    <glyph glyph-name="cloud_upload" unicode="&#xf0ee;" horiz-adv-x="1920" 
-d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
-q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-    <glyph glyph-name="user_md" unicode="&#xf0f0;" horiz-adv-x="1408" 
-d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56
+t186.5 -32.5t164 -89t117 -142t44.5 -184.5z"/>
+			<glyph glyph-name="exchange" unicode="&#xf0ec;" horiz-adv-x="1792"
+				   d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9
+q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z"/>
+			<glyph glyph-name="cloud_download" unicode="&#xf0ed;" horiz-adv-x="1920"
+				   d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
+q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z"/>
+			<glyph glyph-name="cloud_upload" unicode="&#xf0ee;" horiz-adv-x="1920"
+				   d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
+q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z"/>
+			<glyph glyph-name="user_md" unicode="&#xf0f0;" horiz-adv-x="1408"
+				   d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56
 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68
 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5
-t271.5 -112.5t112.5 -271.5z" />
-    <glyph glyph-name="stethoscope" unicode="&#xf0f1;" horiz-adv-x="1408" 
-d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48
+t271.5 -112.5t112.5 -271.5z"/>
+			<glyph glyph-name="stethoscope" unicode="&#xf0f1;" horiz-adv-x="1408"
+				   d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48
 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252
-t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
-    <glyph glyph-name="suitcase" unicode="&#xf0f2;" horiz-adv-x="1792" 
-d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66
-t66 -158z" />
-    <glyph glyph-name="bell_alt" unicode="&#xf0f3;" horiz-adv-x="1792" 
-d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5
-t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
-    <glyph glyph-name="coffee" unicode="&#xf0f4;" horiz-adv-x="1920" 
-d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45
-t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
-    <glyph glyph-name="food" unicode="&#xf0f5;" horiz-adv-x="1408" 
-d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45
-t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="file_text_alt" unicode="&#xf0f6;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z"/>
+			<glyph glyph-name="suitcase" unicode="&#xf0f2;" horiz-adv-x="1792"
+				   d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66
+t66 -158z"/>
+			<glyph glyph-name="bell_alt" unicode="&#xf0f3;" horiz-adv-x="1792"
+				   d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5
+t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z"/>
+			<glyph glyph-name="coffee" unicode="&#xf0f4;" horiz-adv-x="1920"
+				   d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45
+t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z"/>
+			<glyph glyph-name="food" unicode="&#xf0f5;" horiz-adv-x="1408"
+				   d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45
+t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="file_text_alt" unicode="&#xf0f6;"
+				   d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
 M384 736q0 14 9 23t23 9h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64zM1120 512q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704zM1120 256q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704
-q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z" />
-    <glyph glyph-name="building" unicode="&#xf0f7;" horiz-adv-x="1408" 
-d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z"/>
+			<glyph glyph-name="building" unicode="&#xf0f7;" horiz-adv-x="1408"
+				   d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
 M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
 M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
 M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
@@ -815,418 +815,418 @@ M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9
 M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
 M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
 M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
-M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="hospital" unicode="&#xf0f8;" horiz-adv-x="1408" 
-d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="hospital" unicode="&#xf0f8;" horiz-adv-x="1408"
+				   d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
 M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
 M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
 M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
 M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
 M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5
 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320
-v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="ambulance" unicode="&#xf0f9;" horiz-adv-x="1920" 
-d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5
+v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="ambulance" unicode="&#xf0f9;" horiz-adv-x="1920"
+				   d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5
 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152
-q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="medkit" unicode="&#xf0fa;" horiz-adv-x="1792" 
-d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32
-q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
-    <glyph glyph-name="fighter_jet" unicode="&#xf0fb;" horiz-adv-x="1920" 
-d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96
-q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q128 -28 200 -52t80 -34z" />
-    <glyph glyph-name="beer" unicode="&#xf0fc;" horiz-adv-x="1664" 
-d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
-    <glyph glyph-name="h_sign" unicode="&#xf0fd;" 
-d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960
-q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="f0fe" unicode="&#xf0fe;" 
-d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960
-q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="double_angle_left" unicode="&#xf100;" horiz-adv-x="1024" 
-d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
-t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
-    <glyph glyph-name="double_angle_right" unicode="&#xf101;" horiz-adv-x="1024" 
-d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23
-l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-    <glyph glyph-name="double_angle_up" unicode="&#xf102;" horiz-adv-x="1152" 
-d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393
-q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-    <glyph glyph-name="double_angle_down" unicode="&#xf103;" horiz-adv-x="1152" 
-d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
-t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-    <glyph glyph-name="angle_left" unicode="&#xf104;" horiz-adv-x="640" 
-d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-    <glyph glyph-name="angle_right" unicode="&#xf105;" horiz-adv-x="640" 
-d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-    <glyph glyph-name="angle_up" unicode="&#xf106;" horiz-adv-x="1152" 
-d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-    <glyph glyph-name="angle_down" unicode="&#xf107;" horiz-adv-x="1152" 
-d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-    <glyph glyph-name="desktop" unicode="&#xf108;" horiz-adv-x="1920" 
-d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19
-t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="laptop" unicode="&#xf109;" horiz-adv-x="1920" 
-d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z
-M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
-    <glyph glyph-name="tablet" unicode="&#xf10a;" horiz-adv-x="1152" 
-d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832
-q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="mobile_phone" unicode="&#xf10b;" horiz-adv-x="768" 
-d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136
-q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="circle_blank" unicode="&#xf10c;" 
-d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103
-t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="quote_left" unicode="&#xf10d;" horiz-adv-x="1664" 
-d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z
-M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
-    <glyph glyph-name="quote_right" unicode="&#xf10e;" horiz-adv-x="1664" 
-d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216
-v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
-    <glyph glyph-name="spinner" unicode="&#xf110;" horiz-adv-x="1792" 
-d="M526 142q0 -53 -37.5 -90.5t-90.5 -37.5q-52 0 -90 38t-38 90q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 -64q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -53 -37.5 -90.5t-90.5 -37.5
+q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="medkit" unicode="&#xf0fa;" horiz-adv-x="1792"
+				   d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32
+q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z"/>
+			<glyph glyph-name="fighter_jet" unicode="&#xf0fb;" horiz-adv-x="1920"
+				   d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96
+q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q128 -28 200 -52t80 -34z"/>
+			<glyph glyph-name="beer" unicode="&#xf0fc;" horiz-adv-x="1664"
+				   d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z"/>
+			<glyph glyph-name="h_sign" unicode="&#xf0fd;"
+				   d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="f0fe" unicode="&#xf0fe;"
+				   d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="double_angle_left" unicode="&#xf100;" horiz-adv-x="1024"
+				   d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
+t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z"/>
+			<glyph glyph-name="double_angle_right" unicode="&#xf101;" horiz-adv-x="1024"
+				   d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23
+l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z"/>
+			<glyph glyph-name="double_angle_up" unicode="&#xf102;" horiz-adv-x="1152"
+				   d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393
+q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z"/>
+			<glyph glyph-name="double_angle_down" unicode="&#xf103;" horiz-adv-x="1152"
+				   d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
+t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z"/>
+			<glyph glyph-name="angle_left" unicode="&#xf104;" horiz-adv-x="640"
+				   d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z"/>
+			<glyph glyph-name="angle_right" unicode="&#xf105;" horiz-adv-x="640"
+				   d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z"/>
+			<glyph glyph-name="angle_up" unicode="&#xf106;" horiz-adv-x="1152"
+				   d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z"/>
+			<glyph glyph-name="angle_down" unicode="&#xf107;" horiz-adv-x="1152"
+				   d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z"/>
+			<glyph glyph-name="desktop" unicode="&#xf108;" horiz-adv-x="1920"
+				   d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19
+t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z"/>
+			<glyph glyph-name="laptop" unicode="&#xf109;" horiz-adv-x="1920"
+				   d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z
+M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z"/>
+			<glyph glyph-name="tablet" unicode="&#xf10a;" horiz-adv-x="1152"
+				   d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832
+q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z"/>
+			<glyph glyph-name="mobile_phone" unicode="&#xf10b;" horiz-adv-x="768"
+				   d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136
+q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z"/>
+			<glyph glyph-name="circle_blank" unicode="&#xf10c;"
+				   d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103
+t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="quote_left" unicode="&#xf10d;" horiz-adv-x="1664"
+				   d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z
+M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z"/>
+			<glyph glyph-name="quote_right" unicode="&#xf10e;" horiz-adv-x="1664"
+				   d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216
+v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z"/>
+			<glyph glyph-name="spinner" unicode="&#xf110;" horiz-adv-x="1792"
+				   d="M526 142q0 -53 -37.5 -90.5t-90.5 -37.5q-52 0 -90 38t-38 90q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 -64q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -53 -37.5 -90.5t-90.5 -37.5
 t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1522 142q0 -52 -38 -90t-90 -38q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM558 1138q0 -66 -47 -113t-113 -47t-113 47t-47 113t47 113t113 47t113 -47t47 -113z
 M1728 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1088 1344q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1618 1138q0 -93 -66 -158.5t-158 -65.5q-93 0 -158.5 65.5t-65.5 158.5
-q0 92 65.5 158t158.5 66q92 0 158 -66t66 -158z" />
-    <glyph glyph-name="circle" unicode="&#xf111;" 
-d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="reply" unicode="&#xf112;" horiz-adv-x="1792" 
-d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19
-l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
-    <glyph glyph-name="github_alt" unicode="&#xf113;" horiz-adv-x="1664" 
-d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320
+q0 92 65.5 158t158.5 66q92 0 158 -66t66 -158z"/>
+			<glyph glyph-name="circle" unicode="&#xf111;"
+				   d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="reply" unicode="&#xf112;" horiz-adv-x="1792"
+				   d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19
+l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z"/>
+			<glyph glyph-name="github_alt" unicode="&#xf113;" horiz-adv-x="1664"
+				   d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320
 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86
 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218
-q0 -87 -27 -168q136 -160 136 -398z" />
-    <glyph glyph-name="folder_close_alt" unicode="&#xf114;" horiz-adv-x="1664" 
-d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320
-q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-    <glyph glyph-name="folder_open_alt" unicode="&#xf115;" horiz-adv-x="1920" 
-d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68
+q0 -87 -27 -168q136 -160 136 -398z"/>
+			<glyph glyph-name="folder_close_alt" unicode="&#xf114;" horiz-adv-x="1664"
+				   d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320
+q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z"/>
+			<glyph glyph-name="folder_open_alt" unicode="&#xf115;" horiz-adv-x="1920"
+				   d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68
 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z
-" />
-    <glyph glyph-name="expand_alt" unicode="&#xf116;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="collapse_alt" unicode="&#xf117;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="smile" unicode="&#xf118;" 
-d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+"/>
+			<glyph glyph-name="expand_alt" unicode="&#xf116;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="collapse_alt" unicode="&#xf117;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="smile" unicode="&#xf118;"
+				   d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5
-t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="frown" unicode="&#xf119;" 
-d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="frown" unicode="&#xf119;"
+				   d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204
-t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="meh" unicode="&#xf11a;" 
-d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="meh" unicode="&#xf11a;"
+				   d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="gamepad" unicode="&#xf11b;" horiz-adv-x="1920" 
-d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="gamepad" unicode="&#xf11b;" horiz-adv-x="1920"
+				   d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150
-t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
-    <glyph glyph-name="keyboard" unicode="&#xf11c;" horiz-adv-x="1920" 
-d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16
+t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z"/>
+			<glyph glyph-name="keyboard" unicode="&#xf11c;" horiz-adv-x="1920"
+				   d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16
 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16
 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96
 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896
-h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
-    <glyph glyph-name="flag_alt" unicode="&#xf11d;" horiz-adv-x="1792" 
-d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9
+h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z"/>
+			<glyph glyph-name="flag_alt" unicode="&#xf11d;" horiz-adv-x="1792"
+				   d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9
 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102
-q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-    <glyph glyph-name="flag_checkered" unicode="&#xf11e;" horiz-adv-x="1792" 
-d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2
+q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z"/>
+			<glyph glyph-name="flag_checkered" unicode="&#xf11e;" horiz-adv-x="1792"
+				   d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2
 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266
 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8
-q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-    <glyph glyph-name="terminal" unicode="&#xf120;" horiz-adv-x="1664" 
-d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9
-t9 -23z" />
-    <glyph glyph-name="code" unicode="&#xf121;" horiz-adv-x="1920" 
-d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5
-l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
-    <glyph glyph-name="reply_all" unicode="&#xf122;" horiz-adv-x="1792" 
-d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1
-q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
-    <glyph glyph-name="star_half_empty" unicode="&#xf123;" horiz-adv-x="1664" 
-d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5
-l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
-    <glyph glyph-name="location_arrow" unicode="&#xf124;" horiz-adv-x="1408" 
-d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
-    <glyph glyph-name="crop" unicode="&#xf125;" horiz-adv-x="1664" 
-d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23
-v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="code_fork" unicode="&#xf126;" horiz-adv-x="1024" 
-d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5
+q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z"/>
+			<glyph glyph-name="terminal" unicode="&#xf120;" horiz-adv-x="1664"
+				   d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9
+t9 -23z"/>
+			<glyph glyph-name="code" unicode="&#xf121;" horiz-adv-x="1920"
+				   d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5
+l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z"/>
+			<glyph glyph-name="reply_all" unicode="&#xf122;" horiz-adv-x="1792"
+				   d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1
+q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z"/>
+			<glyph glyph-name="star_half_empty" unicode="&#xf123;" horiz-adv-x="1664"
+				   d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5
+l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z"/>
+			<glyph glyph-name="location_arrow" unicode="&#xf124;" horiz-adv-x="1408"
+				   d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z"/>
+			<glyph glyph-name="crop" unicode="&#xf125;" horiz-adv-x="1664"
+				   d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23
+v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z"/>
+			<glyph glyph-name="code_fork" unicode="&#xf126;" horiz-adv-x="1024"
+				   d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5
 q-2 -287 -226 -414q-67 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497
-q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
-    <glyph glyph-name="unlink" unicode="&#xf127;" horiz-adv-x="1664" 
-d="M439 265l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320
+q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z"/>
+			<glyph glyph-name="unlink" unicode="&#xf127;" horiz-adv-x="1664"
+				   d="M439 265l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320
 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18
 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9
-t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-    <glyph glyph-name="question" unicode="&#xf128;" horiz-adv-x="1024" 
-d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5
-t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
-    <glyph glyph-name="_279" unicode="&#xf129;" horiz-adv-x="640" 
-d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192
-q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="exclamation" unicode="&#xf12a;" horiz-adv-x="640" 
-d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
-    <glyph glyph-name="superscript" unicode="&#xf12b;" 
-d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
+t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z"/>
+			<glyph glyph-name="question" unicode="&#xf128;" horiz-adv-x="1024"
+				   d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5
+t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z"/>
+			<glyph glyph-name="_279" unicode="&#xf129;" horiz-adv-x="640"
+				   d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192
+q0 26 19 45t45 19h256q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="exclamation" unicode="&#xf12a;" horiz-adv-x="640"
+				   d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z"/>
+			<glyph glyph-name="superscript" unicode="&#xf12b;"
+				   d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
 M1534 846v-206h-514l-3 27q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5
-t-65.5 -51.5t-30.5 -63h232v80h126z" />
-    <glyph glyph-name="subscript" unicode="&#xf12c;" 
-d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
+t-65.5 -51.5t-30.5 -63h232v80h126z"/>
+			<glyph glyph-name="subscript" unicode="&#xf12c;"
+				   d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
 M1536 -50v-206h-514l-4 27q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73
-h232v80h126z" />
-    <glyph glyph-name="_283" unicode="&#xf12d;" horiz-adv-x="1920" 
-d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
-    <glyph glyph-name="puzzle_piece" unicode="&#xf12e;" horiz-adv-x="1664" 
-d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5
+h232v80h126z"/>
+			<glyph glyph-name="_283" unicode="&#xf12d;" horiz-adv-x="1920"
+				   d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z"/>
+			<glyph glyph-name="puzzle_piece" unicode="&#xf12e;" horiz-adv-x="1664"
+				   d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5
 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89
 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117
-q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
-    <glyph glyph-name="microphone" unicode="&#xf130;" horiz-adv-x="1152" 
-d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5
-t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
-    <glyph glyph-name="microphone_off" unicode="&#xf131;" horiz-adv-x="1408" 
-d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128
+q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z"/>
+			<glyph glyph-name="microphone" unicode="&#xf130;" horiz-adv-x="1152"
+				   d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5
+t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z"/>
+			<glyph glyph-name="microphone_off" unicode="&#xf131;" horiz-adv-x="1408"
+				   d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128
 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23
-t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
-    <glyph glyph-name="shield" unicode="&#xf132;" horiz-adv-x="1280" 
-d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150
-t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="calendar_empty" unicode="&#xf133;" horiz-adv-x="1664" 
-d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280
-q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="fire_extinguisher" unicode="&#xf134;" horiz-adv-x="1408" 
-d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800
+t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z"/>
+			<glyph glyph-name="shield" unicode="&#xf132;" horiz-adv-x="1280"
+				   d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150
+t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="calendar_empty" unicode="&#xf133;" horiz-adv-x="1664"
+				   d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280
+q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z"/>
+			<glyph glyph-name="fire_extinguisher" unicode="&#xf134;" horiz-adv-x="1408"
+				   d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800
 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113
-q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
-    <glyph glyph-name="rocket" unicode="&#xf135;" horiz-adv-x="1664" 
-d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1
-q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
-    <glyph glyph-name="maxcdn" unicode="&#xf136;" horiz-adv-x="1792" 
-d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
-    <glyph glyph-name="chevron_sign_left" unicode="&#xf137;" 
-d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
-t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="chevron_sign_right" unicode="&#xf138;" 
-d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
-t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="chevron_sign_up" unicode="&#xf139;" 
-d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
-t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="chevron_sign_down" unicode="&#xf13a;" 
-d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
-t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="html5" unicode="&#xf13b;" horiz-adv-x="1408" 
-d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
-    <glyph glyph-name="css3" unicode="&#xf13c;" horiz-adv-x="1792" 
-d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
-    <glyph glyph-name="anchor" unicode="&#xf13d;" horiz-adv-x="1792" 
-d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352
+q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z"/>
+			<glyph glyph-name="rocket" unicode="&#xf135;" horiz-adv-x="1664"
+				   d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1
+q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z"/>
+			<glyph glyph-name="maxcdn" unicode="&#xf136;" horiz-adv-x="1792"
+				   d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z"/>
+			<glyph glyph-name="chevron_sign_left" unicode="&#xf137;"
+				   d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="chevron_sign_right" unicode="&#xf138;"
+				   d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="chevron_sign_up" unicode="&#xf139;"
+				   d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="chevron_sign_down" unicode="&#xf13a;"
+				   d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="html5" unicode="&#xf13b;" horiz-adv-x="1408"
+				   d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z"/>
+			<glyph glyph-name="css3" unicode="&#xf13c;" horiz-adv-x="1792"
+				   d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z"/>
+			<glyph glyph-name="anchor" unicode="&#xf13d;" horiz-adv-x="1792"
+				   d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352
 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19
-t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="unlock_alt" unicode="&#xf13e;" horiz-adv-x="1152" 
-d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181
-v-320h736z" />
-    <glyph glyph-name="bullseye" unicode="&#xf140;" 
-d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150
+t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z"/>
+			<glyph glyph-name="unlock_alt" unicode="&#xf13e;" horiz-adv-x="1152"
+				   d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181
+v-320h736z"/>
+			<glyph glyph-name="bullseye" unicode="&#xf140;"
+				   d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150
 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640
-q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="ellipsis_horizontal" unicode="&#xf141;" horiz-adv-x="1408" 
-d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192
-q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="ellipsis_vertical" unicode="&#xf142;" horiz-adv-x="384" 
-d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192
-q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-    <glyph glyph-name="_303" unicode="&#xf143;" 
-d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 233 -176.5 396.5t-396.5 176.5q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="ellipsis_horizontal" unicode="&#xf141;" horiz-adv-x="1408"
+				   d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z"/>
+			<glyph glyph-name="ellipsis_vertical" unicode="&#xf142;" horiz-adv-x="384"
+				   d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z"/>
+			<glyph glyph-name="_303" unicode="&#xf143;"
+				   d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 233 -176.5 396.5t-396.5 176.5q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128
 q13 0 23 10t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960
-q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="play_sign" unicode="&#xf144;" 
-d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56
-q16 -8 32 -8q17 0 32 9z" />
-    <glyph glyph-name="ticket" unicode="&#xf145;" horiz-adv-x="1792" 
-d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136
-t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
-    <glyph glyph-name="minus_sign_alt" unicode="&#xf146;" 
-d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
-t84.5 -203.5z" />
-    <glyph glyph-name="check_minus" unicode="&#xf147;" horiz-adv-x="1408" 
-d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5
-t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="level_up" unicode="&#xf148;" horiz-adv-x="1024" 
-d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
-    <glyph glyph-name="level_down" unicode="&#xf149;" horiz-adv-x="1024" 
-d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
-    <glyph glyph-name="check_sign" unicode="&#xf14a;" 
-d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5
-t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="edit_sign" unicode="&#xf14b;" 
-d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120
-v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_312" unicode="&#xf14c;" 
-d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960
-q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="share_sign" unicode="&#xf14d;" 
-d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q11 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5
-t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="compass" unicode="&#xf14e;" 
-d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
-t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="collapse" unicode="&#xf150;" 
-d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120
-v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="collapse_top" unicode="&#xf151;" 
-d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960
-q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_317" unicode="&#xf152;" 
-d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5
-t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="eur" unicode="&#xf153;" horiz-adv-x="1024" 
-d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="play_sign" unicode="&#xf144;"
+				   d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56
+q16 -8 32 -8q17 0 32 9z"/>
+			<glyph glyph-name="ticket" unicode="&#xf145;" horiz-adv-x="1792"
+				   d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136
+t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z"/>
+			<glyph glyph-name="minus_sign_alt" unicode="&#xf146;"
+				   d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z"/>
+			<glyph glyph-name="check_minus" unicode="&#xf147;" horiz-adv-x="1408"
+				   d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5
+t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="level_up" unicode="&#xf148;" horiz-adv-x="1024"
+				   d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z"/>
+			<glyph glyph-name="level_down" unicode="&#xf149;" horiz-adv-x="1024"
+				   d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z"/>
+			<glyph glyph-name="check_sign" unicode="&#xf14a;"
+				   d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5
+t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="edit_sign" unicode="&#xf14b;"
+				   d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="_312" unicode="&#xf14c;"
+				   d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960
+q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="share_sign" unicode="&#xf14d;"
+				   d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q11 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5
+t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="compass" unicode="&#xf14e;"
+				   d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="collapse" unicode="&#xf150;"
+				   d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="collapse_top" unicode="&#xf151;"
+				   d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="_317" unicode="&#xf152;"
+				   d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5
+t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="eur" unicode="&#xf153;" horiz-adv-x="1024"
+				   d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9
 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26
-l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
-    <glyph glyph-name="gbp" unicode="&#xf154;" horiz-adv-x="1024" 
-d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7
-q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
-    <glyph glyph-name="usd" unicode="&#xf155;" horiz-adv-x="1024" 
-d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43
+l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z"/>
+			<glyph glyph-name="gbp" unicode="&#xf154;" horiz-adv-x="1024"
+				   d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7
+q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z"/>
+			<glyph glyph-name="usd" unicode="&#xf155;" horiz-adv-x="1024"
+				   d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43
 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5
 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50
-t53 -63.5t31.5 -76.5t13 -94z" />
-    <glyph glyph-name="inr" unicode="&#xf156;" horiz-adv-x="898" 
-d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102
-q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="jpy" unicode="&#xf157;" horiz-adv-x="1027" 
-d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61
-l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
-    <glyph glyph-name="rub" unicode="&#xf158;" horiz-adv-x="1280" 
-d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128
-q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
-    <glyph glyph-name="krw" unicode="&#xf159;" horiz-adv-x="1792" 
-d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23
+t53 -63.5t31.5 -76.5t13 -94z"/>
+			<glyph glyph-name="inr" unicode="&#xf156;" horiz-adv-x="898"
+				   d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102
+q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z"/>
+			<glyph glyph-name="jpy" unicode="&#xf157;" horiz-adv-x="1027"
+				   d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61
+l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z"/>
+			<glyph glyph-name="rub" unicode="&#xf158;" horiz-adv-x="1280"
+				   d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128
+q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z"/>
+			<glyph glyph-name="krw" unicode="&#xf159;" horiz-adv-x="1792"
+				   d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23
 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28
-q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="btc" unicode="&#xf15a;" horiz-adv-x="1280" 
-d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164
+q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z"/>
+			<glyph glyph-name="btc" unicode="&#xf15a;" horiz-adv-x="1280"
+				   d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164
 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30
-t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
-    <glyph glyph-name="file" unicode="&#xf15b;" 
-d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z" />
-    <glyph glyph-name="file_text" unicode="&#xf15c;" 
-d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704
-q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z" />
-    <glyph glyph-name="sort_by_alphabet" unicode="&#xf15d;" horiz-adv-x="1664" 
-d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23
+t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z"/>
+			<glyph glyph-name="file" unicode="&#xf15b;"
+				   d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z"/>
+			<glyph glyph-name="file_text" unicode="&#xf15c;"
+				   d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704
+q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z"/>
+			<glyph glyph-name="sort_by_alphabet" unicode="&#xf15d;" horiz-adv-x="1664"
+				   d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23
 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162
-l230 -662h70z" />
-    <glyph glyph-name="_329" unicode="&#xf15e;" horiz-adv-x="1664" 
-d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150
+l230 -662h70z"/>
+			<glyph glyph-name="_329" unicode="&#xf15e;" horiz-adv-x="1664"
+				   d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150
 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248
-v119h121z" />
-    <glyph glyph-name="sort_by_attributes" unicode="&#xf160;" horiz-adv-x="1792" 
-d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832
+v119h121z"/>
+			<glyph glyph-name="sort_by_attributes" unicode="&#xf160;" horiz-adv-x="1792"
+				   d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832
 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256
-q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="sort_by_attributes_alt" unicode="&#xf161;" horiz-adv-x="1792" 
-d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z"/>
+			<glyph glyph-name="sort_by_attributes_alt" unicode="&#xf161;" horiz-adv-x="1792"
+				   d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192
 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832
-q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="sort_by_order" unicode="&#xf162;" 
-d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z"/>
+			<glyph glyph-name="sort_by_order" unicode="&#xf162;"
+				   d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23
 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5
-t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
-    <glyph glyph-name="sort_by_order_alt" unicode="&#xf163;" 
-d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9
+t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z"/>
+			<glyph glyph-name="sort_by_order_alt" unicode="&#xf163;"
+				   d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9
 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13
-q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
-    <glyph glyph-name="_334" unicode="&#xf164;" horiz-adv-x="1664" 
-d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76
+q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z"/>
+			<glyph glyph-name="_334" unicode="&#xf164;" horiz-adv-x="1664"
+				   d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76
 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5
-t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
-    <glyph glyph-name="_335" unicode="&#xf165;" horiz-adv-x="1664" 
-d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135
+t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z"/>
+			<glyph glyph-name="_335" unicode="&#xf165;" horiz-adv-x="1664"
+				   d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135
 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121
-t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
-    <glyph glyph-name="youtube_sign" unicode="&#xf166;" 
-d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 17 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15
+t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z"/>
+			<glyph glyph-name="youtube_sign" unicode="&#xf166;"
+				   d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 17 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15
 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38
 q21 -29 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5
 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78q7 -23 23 -69l24 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38
 q-51 0 -78 -38q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5
-h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="youtube" unicode="&#xf167;" 
-d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73
+h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="youtube" unicode="&#xf167;"
+				   d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73
 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51
 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99
 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-38 -51 -106 -51q-67 0 -105 51
-q-28 38 -28 118v175q0 80 28 117q38 51 105 51q68 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
-    <glyph glyph-name="xing" unicode="&#xf168;" horiz-adv-x="1408" 
-d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942
-q25 45 64 45h241q22 0 31 -15z" />
-    <glyph glyph-name="xing_sign" unicode="&#xf169;" 
-d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1
-l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="youtube_play" unicode="&#xf16a;" horiz-adv-x="1792" 
-d="M711 408l484 250l-484 253v-503zM896 1270q168 0 324.5 -4.5t229.5 -9.5l73 -4q1 0 17 -1.5t23 -3t23.5 -4.5t28.5 -8t28 -13t31 -19.5t29 -26.5q6 -6 15.5 -18.5t29 -58.5t26.5 -101q8 -64 12.5 -136.5t5.5 -113.5v-40v-136q1 -145 -18 -290q-7 -55 -25 -99.5t-32 -61.5
+q-28 38 -28 118v175q0 80 28 117q38 51 105 51q68 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z"/>
+			<glyph glyph-name="xing" unicode="&#xf168;" horiz-adv-x="1408"
+				   d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942
+q25 45 64 45h241q22 0 31 -15z"/>
+			<glyph glyph-name="xing_sign" unicode="&#xf169;"
+				   d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1
+l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="youtube_play" unicode="&#xf16a;" horiz-adv-x="1792"
+				   d="M711 408l484 250l-484 253v-503zM896 1270q168 0 324.5 -4.5t229.5 -9.5l73 -4q1 0 17 -1.5t23 -3t23.5 -4.5t28.5 -8t28 -13t31 -19.5t29 -26.5q6 -6 15.5 -18.5t29 -58.5t26.5 -101q8 -64 12.5 -136.5t5.5 -113.5v-40v-136q1 -145 -18 -290q-7 -55 -25 -99.5t-32 -61.5
 l-14 -17q-14 -15 -29 -26.5t-31 -19t-28 -12.5t-28.5 -8t-24 -4.5t-23 -3t-16.5 -1.5q-251 -19 -627 -19q-207 2 -359.5 6.5t-200.5 7.5l-49 4l-36 4q-36 5 -54.5 10t-51 21t-56.5 41q-6 6 -15.5 18.5t-29 58.5t-26.5 101q-8 64 -12.5 136.5t-5.5 113.5v40v136
-q-1 145 18 290q7 55 25 99.5t32 61.5l14 17q14 15 29 26.5t31 19.5t28 13t28.5 8t23.5 4.5t23 3t17 1.5q251 18 627 18z" />
-    <glyph glyph-name="dropbox" unicode="&#xf16b;" horiz-adv-x="1792" 
-d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
-    <glyph glyph-name="stackexchange" unicode="&#xf16c;" 
-d="M1289 -96h-1118v480h-160v-640h1438v640h-160v-480zM347 428l33 157l783 -165l-33 -156zM450 802l67 146l725 -339l-67 -145zM651 1158l102 123l614 -513l-102 -123zM1048 1536l477 -641l-128 -96l-477 641zM330 65v159h800v-159h-800z" />
-    <glyph glyph-name="instagram" unicode="&#xf16d;" 
-d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1162 640q0 -164 -115 -279t-279 -115t-279 115t-115 279t115 279t279 115t279 -115t115 -279zM1270 1050q0 -38 -27 -65t-65 -27t-65 27t-27 65t27 65t65 27t65 -27t27 -65zM768 1270
+q-1 145 18 290q7 55 25 99.5t32 61.5l14 17q14 15 29 26.5t31 19.5t28 13t28.5 8t23.5 4.5t23 3t17 1.5q251 18 627 18z"/>
+			<glyph glyph-name="dropbox" unicode="&#xf16b;" horiz-adv-x="1792"
+				   d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z"/>
+			<glyph glyph-name="stackexchange" unicode="&#xf16c;"
+				   d="M1289 -96h-1118v480h-160v-640h1438v640h-160v-480zM347 428l33 157l783 -165l-33 -156zM450 802l67 146l725 -339l-67 -145zM651 1158l102 123l614 -513l-102 -123zM1048 1536l477 -641l-128 -96l-477 641zM330 65v159h800v-159h-800z"/>
+			<glyph glyph-name="instagram" unicode="&#xf16d;"
+				   d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1162 640q0 -164 -115 -279t-279 -115t-279 115t-115 279t115 279t279 115t279 -115t115 -279zM1270 1050q0 -38 -27 -65t-65 -27t-65 27t-27 65t27 65t65 27t65 -27t27 -65zM768 1270
 q-7 0 -76.5 0.5t-105.5 0t-96.5 -3t-103 -10t-71.5 -18.5q-50 -20 -88 -58t-58 -88q-11 -29 -18.5 -71.5t-10 -103t-3 -96.5t0 -105.5t0.5 -76.5t-0.5 -76.5t0 -105.5t3 -96.5t10 -103t18.5 -71.5q20 -50 58 -88t88 -58q29 -11 71.5 -18.5t103 -10t96.5 -3t105.5 0t76.5 0.5
 t76.5 -0.5t105.5 0t96.5 3t103 10t71.5 18.5q50 20 88 58t58 88q11 29 18.5 71.5t10 103t3 96.5t0 105.5t-0.5 76.5t0.5 76.5t0 105.5t-3 96.5t-10 103t-18.5 71.5q-20 50 -58 88t-88 58q-29 11 -71.5 18.5t-103 10t-96.5 3t-105.5 0t-76.5 -0.5zM1536 640q0 -229 -5 -317
-q-10 -208 -124 -322t-322 -124q-88 -5 -317 -5t-317 5q-208 10 -322 124t-124 322q-5 88 -5 317t5 317q10 208 124 322t322 124q88 5 317 5t317 -5q208 -10 322 -124t124 -322q5 -88 5 -317z" />
-    <glyph glyph-name="flickr" unicode="&#xf16e;" 
-d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150
-t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
-    <glyph glyph-name="adn" unicode="&#xf170;" 
-d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="f171" unicode="&#xf171;" horiz-adv-x="1408" 
-d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22
+q-10 -208 -124 -322t-322 -124q-88 -5 -317 -5t-317 5q-208 10 -322 124t-124 322q-5 88 -5 317t5 317q10 208 124 322t322 124q88 5 317 5t317 -5q208 -10 322 -124t124 -322q5 -88 5 -317z"/>
+			<glyph glyph-name="flickr" unicode="&#xf16e;"
+				   d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150
+t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z"/>
+			<glyph glyph-name="adn" unicode="&#xf170;"
+				   d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="f171" unicode="&#xf171;" horiz-adv-x="1408"
+				   d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22
 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18
 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5
-t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
-    <glyph glyph-name="bitbucket_sign" unicode="&#xf172;" 
-d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5
+t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z"/>
+			<glyph glyph-name="bitbucket_sign" unicode="&#xf172;"
+				   d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5
 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z
 M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120
-v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="tumblr" unicode="&#xf173;" horiz-adv-x="1024" 
-d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14
-q78 2 134 29z" />
-    <glyph glyph-name="tumblr_sign" unicode="&#xf174;" 
-d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z
-M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="long_arrow_down" unicode="&#xf175;" horiz-adv-x="768" 
-d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
-    <glyph glyph-name="long_arrow_up" unicode="&#xf176;" horiz-adv-x="768" 
-d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
-    <glyph glyph-name="long_arrow_left" unicode="&#xf177;" horiz-adv-x="1792" 
-d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="long_arrow_right" unicode="&#xf178;" horiz-adv-x="1792" 
-d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
-    <glyph glyph-name="apple" unicode="&#xf179;" horiz-adv-x="1408" 
-d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q113 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65
-q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
-    <glyph glyph-name="windows" unicode="&#xf17a;" horiz-adv-x="1664" 
-d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
-    <glyph glyph-name="android" unicode="&#xf17b;" horiz-adv-x="1408" 
-d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="tumblr" unicode="&#xf173;" horiz-adv-x="1024"
+				   d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14
+q78 2 134 29z"/>
+			<glyph glyph-name="tumblr_sign" unicode="&#xf174;"
+				   d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z
+M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="long_arrow_down" unicode="&#xf175;" horiz-adv-x="768"
+				   d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z"/>
+			<glyph glyph-name="long_arrow_up" unicode="&#xf176;" horiz-adv-x="768"
+				   d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z"/>
+			<glyph glyph-name="long_arrow_left" unicode="&#xf177;" horiz-adv-x="1792"
+				   d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z"/>
+			<glyph glyph-name="long_arrow_right" unicode="&#xf178;" horiz-adv-x="1792"
+				   d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z"/>
+			<glyph glyph-name="apple" unicode="&#xf179;" horiz-adv-x="1408"
+				   d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q113 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65
+q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z"/>
+			<glyph glyph-name="windows" unicode="&#xf17a;" horiz-adv-x="1664"
+				   d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z"/>
+			<glyph glyph-name="android" unicode="&#xf17b;" horiz-adv-x="1408"
+				   d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30
 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5
-h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
-    <glyph glyph-name="linux" unicode="&#xf17c;" 
-d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-10 -11 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z
+h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z"/>
+			<glyph glyph-name="linux" unicode="&#xf17c;"
+				   d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-10 -11 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z
 M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7
 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15
 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5
@@ -1241,442 +1241,442 @@ q-19 4 -51 9.5t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4
 t-14 -48q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54
 q110 143 124 195q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5
 t-40.5 -33.5t-61 -14q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5
-t15.5 47.5q1 -31 8 -56.5t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
-    <glyph glyph-name="dribble" unicode="&#xf17d;" 
-d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81
+t15.5 47.5q1 -31 8 -56.5t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z"/>
+			<glyph glyph-name="dribble" unicode="&#xf17d;"
+				   d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81
 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19
 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -5 6.5 -17t7.5 -17q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6
-t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="skype" unicode="&#xf17e;" 
-d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5
+t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="skype" unicode="&#xf17e;"
+				   d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5
 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5
 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80
-q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
-    <glyph glyph-name="foursquare" unicode="&#xf180;" horiz-adv-x="1280" 
-d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z
+q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z"/>
+			<glyph glyph-name="foursquare" unicode="&#xf180;" horiz-adv-x="1280"
+				   d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z
 M1227 1324q-15 -73 -53.5 -266.5t-69.5 -350t-35 -173.5q-6 -22 -9 -32.5t-14 -32.5t-24.5 -33t-38.5 -21t-58 -10h-271q-13 0 -22 -10q-8 -9 -426 -494q-22 -25 -58.5 -28.5t-48.5 5.5q-55 22 -55 98v1410q0 55 38 102.5t120 47.5h888q95 0 127 -53t10 -159zM1227 1324
-l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z" />
-    <glyph glyph-name="trello" unicode="&#xf181;" 
-d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408
-q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="female" unicode="&#xf182;" horiz-adv-x="1280" 
-d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43
-q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-    <glyph glyph-name="male" unicode="&#xf183;" horiz-adv-x="1024" 
-d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z
-M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-    <glyph glyph-name="gittip" unicode="&#xf184;" 
-d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
-t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="sun" unicode="&#xf185;" horiz-adv-x="1792" 
-d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4
+l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z"/>
+			<glyph glyph-name="trello" unicode="&#xf181;"
+				   d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408
+q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="female" unicode="&#xf182;" horiz-adv-x="1280"
+				   d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43
+q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z"/>
+			<glyph glyph-name="male" unicode="&#xf183;" horiz-adv-x="1024"
+				   d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z
+M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z"/>
+			<glyph glyph-name="gittip" unicode="&#xf184;"
+				   d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="sun" unicode="&#xf185;" horiz-adv-x="1792"
+				   d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4
 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94
-q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
-    <glyph glyph-name="_366" unicode="&#xf186;" 
-d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61
-t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
-    <glyph glyph-name="archive" unicode="&#xf187;" horiz-adv-x="1792" 
-d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536
-q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="bug" unicode="&#xf188;" horiz-adv-x="1664" 
-d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207
+q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z"/>
+			<glyph glyph-name="_366" unicode="&#xf186;"
+				   d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61
+t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z"/>
+			<glyph glyph-name="archive" unicode="&#xf187;" horiz-adv-x="1792"
+				   d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536
+q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="bug" unicode="&#xf188;" horiz-adv-x="1664"
+				   d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207
 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19
-t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
-    <glyph glyph-name="vk" unicode="&#xf189;" horiz-adv-x="1920" 
-d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-40 -51 -55 -72t-30.5 -49.5t-12 -42t13 -34.5t32.5 -43t57 -53q4 -2 5 -4q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58
+t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z"/>
+			<glyph glyph-name="vk" unicode="&#xf189;" horiz-adv-x="1920"
+				   d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-40 -51 -55 -72t-30.5 -49.5t-12 -42t13 -34.5t32.5 -43t57 -53q4 -2 5 -4q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58
 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6
 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q16 19 38 30q53 26 239 24
 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2
-q39 5 64 -2.5t31 -16.5z" />
-    <glyph glyph-name="weibo" unicode="&#xf18a;" horiz-adv-x="1792" 
-d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12
+q39 5 64 -2.5t31 -16.5z"/>
+			<glyph glyph-name="weibo" unicode="&#xf18a;" horiz-adv-x="1792"
+				   d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12
 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422
 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178
 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z
-M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
-    <glyph glyph-name="renren" unicode="&#xf18b;" 
-d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495
-q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
-    <glyph glyph-name="_372" unicode="&#xf18c;" horiz-adv-x="1408" 
-d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5
+M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z"/>
+			<glyph glyph-name="renren" unicode="&#xf18b;"
+				   d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495
+q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z"/>
+			<glyph glyph-name="_372" unicode="&#xf18c;" horiz-adv-x="1408"
+				   d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5
 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56
 t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -4 1 -50t-1 -72q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5
-t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
-    <glyph glyph-name="stack_exchange" unicode="&#xf18d;" horiz-adv-x="1280" 
-d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z
-" />
-    <glyph glyph-name="_374" unicode="&#xf18e;" 
-d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
-t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="arrow_circle_alt_left" unicode="&#xf190;" 
-d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
-t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_376" unicode="&#xf191;" 
-d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z
-M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="dot_circle_alt" unicode="&#xf192;" 
-d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5
-t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_378" unicode="&#xf193;" horiz-adv-x="1664" 
-d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128
-q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 17 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
-    <glyph glyph-name="vimeo_square" unicode="&#xf194;" 
-d="M1292 898q10 216 -161 222q-231 8 -312 -261q44 19 82 19q85 0 74 -96q-4 -57 -74 -167t-105 -110q-43 0 -82 169q-13 54 -45 255q-30 189 -160 177q-59 -7 -164 -100l-81 -72l-81 -72l52 -67q76 52 87 52q57 0 107 -179q15 -55 45 -164.5t45 -164.5q68 -179 164 -179
-q157 0 383 294q220 283 226 444zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_380" unicode="&#xf195;" horiz-adv-x="1152" 
-d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160
-q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="plus_square_o" unicode="&#xf196;" horiz-adv-x="1408" 
-d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832
-q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_382" unicode="&#xf197;" horiz-adv-x="2176" 
-d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40
+t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z"/>
+			<glyph glyph-name="stack_exchange" unicode="&#xf18d;" horiz-adv-x="1280"
+				   d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z
+"/>
+			<glyph glyph-name="_374" unicode="&#xf18e;"
+				   d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
+t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="arrow_circle_alt_left" unicode="&#xf190;"
+				   d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
+t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="_376" unicode="&#xf191;"
+				   d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z
+M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="dot_circle_alt" unicode="&#xf192;"
+				   d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5
+t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="_378" unicode="&#xf193;" horiz-adv-x="1664"
+				   d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128
+q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 17 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z"/>
+			<glyph glyph-name="vimeo_square" unicode="&#xf194;"
+				   d="M1292 898q10 216 -161 222q-231 8 -312 -261q44 19 82 19q85 0 74 -96q-4 -57 -74 -167t-105 -110q-43 0 -82 169q-13 54 -45 255q-30 189 -160 177q-59 -7 -164 -100l-81 -72l-81 -72l52 -67q76 52 87 52q57 0 107 -179q15 -55 45 -164.5t45 -164.5q68 -179 164 -179
+q157 0 383 294q220 283 226 444zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="_380" unicode="&#xf195;" horiz-adv-x="1152"
+				   d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160
+q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z"/>
+			<glyph glyph-name="plus_square_o" unicode="&#xf196;" horiz-adv-x="1408"
+				   d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832
+q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="_382" unicode="&#xf197;" horiz-adv-x="2176"
+				   d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40
 t-22.5 -40t-83.5 -47.5t-150 -40.5q-16 -3 -80.5 -14t-106.5 -18h-1113zM1739 668q53 -36 53 -92t-53 -92l81 -30q68 48 68 122t-68 122zM625 400h1015q-217 -38 -456 -80q-57 0 -113 -24t-83 -48l-28 -24l-288 -288q-26 -26 -70.5 -45t-89.5 -19h-96l-93 464h29
-q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z" />
-    <glyph glyph-name="_383" unicode="&#xf198;" horiz-adv-x="1664" 
-d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9
+q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z"/>
+			<glyph glyph-name="_383" unicode="&#xf198;" horiz-adv-x="1664"
+				   d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9
 q-61 0 -101.5 40t-40.5 101q0 47 27.5 85t71.5 53l156 53l-105 313l-156 -54q-26 -8 -48 -8q-60 0 -101 40.5t-41 100.5q0 47 27.5 85t71.5 53l157 53l-53 159q-8 24 -8 47q0 60 42 102.5t102 42.5q47 0 85 -27t53 -72l54 -160l310 105l-54 160q-8 24 -8 47q0 59 42.5 102
-t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z" />
-    <glyph glyph-name="_384" unicode="&#xf199;" 
-d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69
+t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z"/>
+			<glyph glyph-name="_384" unicode="&#xf199;"
+				   d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69
 q-47 32 -142 92.5t-142 92.5q-12 8 -33 27t-31 27v-436q0 -40 28 -68t68 -28h832q40 0 68 28t28 68zM1280 925q0 41 -27.5 70t-68.5 29h-832q-40 0 -68 -28t-28 -68q0 -37 30.5 -76.5t67.5 -64.5q47 -32 137.5 -89t129.5 -83q3 -2 17 -11.5t21 -14t21 -13t23.5 -13
-t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z" />
-    <glyph glyph-name="_385" unicode="&#xf19a;" horiz-adv-x="1792" 
-d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5
+t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z"/>
+			<glyph glyph-name="_385" unicode="&#xf19a;" horiz-adv-x="1792"
+				   d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5
 t19.5 -8l80 -8l120 -328l-168 -504l-280 832q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-7 0 -23 0.5t-26 0.5q105 160 274.5 253.5t367.5 93.5q147 0 280.5 -53t238.5 -149h-10q-55 0 -92 -40.5t-37 -95.5q0 -12 2 -24t4 -21.5t8 -23t9 -21t12 -22.5t12.5 -21
 t14.5 -24t14 -23q63 -107 63 -212zM909 573l237 -647q1 -6 5 -11q-126 -44 -255 -44q-112 0 -217 32zM1570 1009q95 -174 95 -369q0 -209 -104 -385.5t-279 -278.5l235 678q59 169 59 276q0 42 -6 79zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286
 t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 -215q173 0 331.5 68t273 182.5t182.5 273t68 331.5t-68 331.5t-182.5 273t-273 182.5t-331.5 68t-331.5 -68t-273 -182.5t-182.5 -273t-68 -331.5t68 -331.5t182.5 -273
-t273 -182.5t331.5 -68z" />
-    <glyph glyph-name="_386" unicode="&#xf19b;" horiz-adv-x="1792" 
-d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z" />
-    <glyph glyph-name="_387" unicode="&#xf19c;" horiz-adv-x="2048" 
-d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64
-q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />
-    <glyph glyph-name="_388" unicode="&#xf19d;" horiz-adv-x="2304" 
-d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433
-q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />
-    <glyph glyph-name="_389" unicode="&#xf19e;" 
-d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q44 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0
-q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />
-    <glyph glyph-name="uniF1A0" unicode="&#xf1a0;" 
-d="M768 750h725q12 -67 12 -128q0 -217 -91 -387.5t-259.5 -266.5t-386.5 -96q-157 0 -299 60.5t-245 163.5t-163.5 245t-60.5 299t60.5 299t163.5 245t245 163.5t299 60.5q300 0 515 -201l-209 -201q-123 119 -306 119q-129 0 -238.5 -65t-173.5 -176.5t-64 -243.5
-t64 -243.5t173.5 -176.5t238.5 -65q87 0 160 24t120 60t82 82t51.5 87t22.5 78h-436v264z" />
-    <glyph glyph-name="f1a1" unicode="&#xf1a1;" horiz-adv-x="1792" 
-d="M1095 369q16 -16 0 -31q-62 -62 -199 -62t-199 62q-16 15 0 31q6 6 15 6t15 -6q48 -49 169 -49q120 0 169 49q6 6 15 6t15 -6zM788 550q0 -37 -26 -63t-63 -26t-63.5 26t-26.5 63q0 38 26.5 64t63.5 26t63 -26.5t26 -63.5zM1183 550q0 -37 -26.5 -63t-63.5 -26t-63 26
+t273 -182.5t331.5 -68z"/>
+			<glyph glyph-name="_386" unicode="&#xf19b;" horiz-adv-x="1792"
+				   d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z"/>
+			<glyph glyph-name="_387" unicode="&#xf19c;" horiz-adv-x="2048"
+				   d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64
+q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z"/>
+			<glyph glyph-name="_388" unicode="&#xf19d;" horiz-adv-x="2304"
+				   d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433
+q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z"/>
+			<glyph glyph-name="_389" unicode="&#xf19e;"
+				   d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q44 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0
+q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z"/>
+			<glyph glyph-name="uniF1A0" unicode="&#xf1a0;"
+				   d="M768 750h725q12 -67 12 -128q0 -217 -91 -387.5t-259.5 -266.5t-386.5 -96q-157 0 -299 60.5t-245 163.5t-163.5 245t-60.5 299t60.5 299t163.5 245t245 163.5t299 60.5q300 0 515 -201l-209 -201q-123 119 -306 119q-129 0 -238.5 -65t-173.5 -176.5t-64 -243.5
+t64 -243.5t173.5 -176.5t238.5 -65q87 0 160 24t120 60t82 82t51.5 87t22.5 78h-436v264z"/>
+			<glyph glyph-name="f1a1" unicode="&#xf1a1;" horiz-adv-x="1792"
+				   d="M1095 369q16 -16 0 -31q-62 -62 -199 -62t-199 62q-16 15 0 31q6 6 15 6t15 -6q48 -49 169 -49q120 0 169 49q6 6 15 6t15 -6zM788 550q0 -37 -26 -63t-63 -26t-63.5 26t-26.5 63q0 38 26.5 64t63.5 26t63 -26.5t26 -63.5zM1183 550q0 -37 -26.5 -63t-63.5 -26t-63 26
 t-26 63t26 63.5t63 26.5t63.5 -26t26.5 -64zM1434 670q0 49 -35 84t-85 35t-86 -36q-130 90 -311 96l63 283l200 -45q0 -37 26 -63t63 -26t63.5 26.5t26.5 63.5t-26.5 63.5t-63.5 26.5q-54 0 -80 -50l-221 49q-19 5 -25 -16l-69 -312q-180 -7 -309 -97q-35 37 -87 37
 q-50 0 -85 -35t-35 -84q0 -35 18.5 -64t49.5 -44q-6 -27 -6 -56q0 -142 140 -243t337 -101q198 0 338 101t140 243q0 32 -7 57q30 15 48 43.5t18 63.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191
-t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="_392" unicode="&#xf1a2;" 
-d="M939 407q13 -13 0 -26q-53 -53 -171 -53t-171 53q-13 13 0 26q5 6 13 6t13 -6q42 -42 145 -42t145 42q5 6 13 6t13 -6zM676 563q0 -31 -23 -54t-54 -23t-54 23t-23 54q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1014 563q0 -31 -23 -54t-54 -23t-54 23t-23 54
+t348 71t348 -71t286 -191t191 -286t71 -348z"/>
+			<glyph glyph-name="_392" unicode="&#xf1a2;"
+				   d="M939 407q13 -13 0 -26q-53 -53 -171 -53t-171 53q-13 13 0 26q5 6 13 6t13 -6q42 -42 145 -42t145 42q5 6 13 6t13 -6zM676 563q0 -31 -23 -54t-54 -23t-54 23t-23 54q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1014 563q0 -31 -23 -54t-54 -23t-54 23t-23 54
 q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1229 666q0 42 -30 72t-73 30q-42 0 -73 -31q-113 78 -267 82l54 243l171 -39q1 -32 23.5 -54t53.5 -22q32 0 54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5q-48 0 -69 -43l-189 42q-17 5 -21 -13l-60 -268q-154 -6 -265 -83
 q-30 32 -74 32q-43 0 -73 -30t-30 -72q0 -30 16 -55t42 -38q-5 -25 -5 -48q0 -122 120 -208.5t289 -86.5q170 0 290 86.5t120 208.5q0 25 -6 49q25 13 40.5 37.5t15.5 54.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960
-q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_393" unicode="&#xf1a3;" 
-d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150
+q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="_393" unicode="&#xf1a3;"
+				   d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150
 v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103
-t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="f1a4" unicode="&#xf1a4;" horiz-adv-x="1920" 
-d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328
-v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z" />
-    <glyph glyph-name="_395" unicode="&#xf1a5;" 
-d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
-t84.5 -203.5z" />
-    <glyph glyph-name="_396" unicode="&#xf1a6;" horiz-adv-x="2048" 
-d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123
-v-369h123z" />
-    <glyph glyph-name="_397" unicode="&#xf1a7;" 
-d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101
+t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="f1a4" unicode="&#xf1a4;" horiz-adv-x="1920"
+				   d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328
+v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z"/>
+			<glyph glyph-name="_395" unicode="&#xf1a5;"
+				   d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z"/>
+			<glyph glyph-name="_396" unicode="&#xf1a6;" horiz-adv-x="2048"
+				   d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123
+v-369h123z"/>
+			<glyph glyph-name="_397" unicode="&#xf1a7;"
+				   d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101
 v-636l211 41v206q51 -19 117 -19q125 0 213 95t88 229zM922 940q0 134 -88.5 229t-213.5 95q-74 0 -141 -36h-186v-840l211 41v206q55 -19 116 -19q125 0 213.5 95t88.5 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960
-q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_398" unicode="&#xf1a8;" horiz-adv-x="2038" 
-d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14
+q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="_398" unicode="&#xf1a8;" horiz-adv-x="2038"
+				   d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14
 q6 -5 28 -23.5t25.5 -22t19 -18t18 -20.5t11.5 -21t10.5 -27.5t4.5 -31t4 -40.5l1 -33q1 -26 -2.5 -57.5t-7.5 -52t-12.5 -58.5t-11.5 -53q-35 1 -101 -9.5t-98 -10.5q-39 0 -72 10q-2 16 -2 47q0 74 3 96q2 13 31.5 41.5t57 59t26.5 51.5q-24 2 -43 -24
 q-36 -53 -111.5 -99.5t-136.5 -46.5q-25 0 -75.5 63t-106.5 139.5t-84 96.5q-6 4 -27 30q-482 -112 -513 -112q-16 0 -28 11t-12 27q0 15 8.5 26.5t22.5 14.5l486 106q-8 14 -8 25t5.5 17.5t16 11.5t20 7t23 4.5t18.5 4.5q4 1 15.5 7.5t17.5 6.5q15 0 28 -16t20 -33
 q163 37 172 37q17 0 29.5 -11t12.5 -28q0 -15 -8.5 -26t-23.5 -14l-182 -40l-1 -16q-1 -26 81.5 -117.5t104.5 -91.5q47 0 119 80t72 129q0 36 -23.5 53t-51 18.5t-51 11.5t-23.5 34q0 16 10 34l-68 19q43 44 43 117q0 26 -5 58q82 16 144 16q44 0 71.5 -1.5t48.5 -8.5
 t31 -13.5t20.5 -24.5t15.5 -33.5t17 -47.5t24 -60l50 25q-3 -40 -23 -60t-42.5 -21t-40 -6.5t-16.5 -20.5zM1282 842q-5 5 -13.5 15.5t-12 14.5t-10.5 11.5t-10 10.5l-8 8t-8.5 7.5t-8 5t-8.5 4.5q-7 3 -14.5 5t-20.5 2.5t-22 0.5h-32.5h-37.5q-126 0 -217 -43
 q16 30 36 46.5t54 29.5t65.5 36t46 36.5t50 55t43.5 50.5q12 -9 28 -31.5t32 -36.5t38 -13l12 1v-76l22 -1q247 95 371 190q28 21 50 39t42.5 37.5t33 31t29.5 34t24 31t24.5 37t23 38t27 47.5t29.5 53l7 9q-2 -53 -43 -139q-79 -165 -205 -264t-306 -142q-14 -3 -42 -7.5
 t-50 -9.5t-39 -14q3 -19 24.5 -46t21.5 -34q0 -11 -26 -30zM1061 -79q39 26 131.5 47.5t146.5 21.5q9 0 22.5 -15.5t28 -42.5t26 -50t24 -51t14.5 -33q-121 -45 -244 -45q-61 0 -125 11zM822 568l48 12l109 -177l-73 -48zM1323 51q3 -15 3 -16q0 -7 -17.5 -14.5t-46 -13
-t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z" />
-    <glyph glyph-name="_399" unicode="&#xf1a9;" 
-d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10
+t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z"/>
+			<glyph glyph-name="_399" unicode="&#xf1a9;"
+				   d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10
 q-29 -12 -78 -56q-26 -24 -12 -44q9 -8 17.5 -4.5t31.5 23.5q3 2 10.5 8.5t10.5 8.5t10 7t11.5 7t12.5 5t15 4.5t16.5 2.5t20.5 1q27 0 44.5 -7.5t23 -14.5t13.5 -22q10 -17 12.5 -20t12.5 1q23 12 14 34zM1483 346q0 22 -5 44.5t-16.5 45t-34 36.5t-52.5 14
 q-33 0 -97 -41.5t-129 -83.5t-101 -42q-27 -1 -63.5 19t-76 49t-83.5 58t-100 49t-111 19q-115 -1 -197 -78.5t-84 -178.5q-2 -112 74 -164q29 -20 62.5 -28.5t103.5 -8.5q57 0 132 32.5t134 71t120 70.5t93 31q26 -1 65 -31.5t71.5 -67t68 -67.5t55.5 -32q35 -3 58.5 14
 t55.5 63q28 41 42.5 101t14.5 106zM1536 506q0 -164 -62 -304.5t-166 -236t-242.5 -149.5t-290.5 -54t-293 57.5t-247.5 157t-170.5 241.5t-64 302q0 89 19.5 172.5t49 145.5t70.5 118.5t78.5 94t78.5 69.5t64.5 46.5t42.5 24.5q14 8 51 26.5t54.5 28.5t48 30t60.5 44
-q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z" />
-    <glyph glyph-name="_400" unicode="&#xf1aa;" 
-d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z
+q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z"/>
+			<glyph glyph-name="_400" unicode="&#xf1aa;"
+				   d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z
 M729 1145l12 -12l-152 -152l-12 12q-37 37 -89 37t-89 -37t-37 -89.5t37 -89.5l29 -29l152 -152l160 -160l-151 -152l-161 160l-151 152l-30 30q-68 67 -90 159.5t5 179.5q-70 15 -115 71t-45 129q0 85 60 145.5t145 60.5q76 0 133.5 -49t69.5 -123q84 20 169.5 -3.5
 t149.5 -87.5zM1536 78q0 -85 -60 -145.5t-145 -60.5q-74 0 -131 47t-71 118q-86 -28 -179.5 -6t-161.5 90l-11 12l151 152l12 -12q37 -37 89 -37t89 37t37 89t-37 89l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30q64 -64 87.5 -150.5t2.5 -171.5
 q76 -11 126.5 -68.5t50.5 -134.5zM1534 1202q0 -77 -51 -135t-127 -69q26 -85 3 -176.5t-90 -158.5l-12 -12l-151 152l12 12q37 37 37 89t-37 89t-89 37t-89 -37l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30q67 67 159 89.5t178 -3.5q11 75 68.5 126
-t135.5 51q85 0 145 -60.5t60 -145.5z" />
-    <glyph glyph-name="f1ab" unicode="&#xf1ab;" 
-d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5
+t135.5 51q85 0 145 -60.5t60 -145.5z"/>
+			<glyph glyph-name="f1ab" unicode="&#xf1ab;"
+				   d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5
 q-2 -2 -2 -10.5t-1 -9.5q-5 -10 -31 -15q-23 -7 -47 0q-18 4 -28 21q-4 6 -5 23q6 2 24.5 5t29.5 6q58 16 105 32q100 35 102 35q10 2 43 19.5t44 21.5q9 3 21.5 8t14.5 5.5t6 -0.5q2 -12 -1 -33q0 -2 -12.5 -27t-26.5 -53.5t-17 -33.5q-25 -50 -77 -131l64 -28
 q12 -6 74.5 -32t67.5 -28q4 -1 10.5 -25.5t4.5 -30.5zM449 944q3 -15 -4 -28q-12 -23 -50 -38q-30 -12 -60 -12q-26 3 -49 26q-14 15 -18 41l1 3q3 -3 19.5 -5t26.5 0t58 16q36 12 55 14q17 0 21 -17zM1147 815l63 -227l-139 42zM39 15l694 232v1032l-694 -233v-1031z
 M1280 332l102 -31l-181 657l-100 31l-216 -536l102 -31l45 110l211 -65zM777 1294l573 -184v380zM1088 -29l158 -13l-54 -160l-40 66q-130 -83 -276 -108q-58 -12 -91 -12h-84q-79 0 -199.5 39t-183.5 85q-8 7 -8 16q0 8 5 13.5t13 5.5q4 0 18 -7.5t30.5 -16.5t20.5 -11
 q73 -37 159.5 -61.5t157.5 -24.5q95 0 167 14.5t157 50.5q15 7 30.5 15.5t34 19t28.5 16.5zM1536 1050v-1079l-774 246q-14 -6 -375 -127.5t-368 -121.5q-13 0 -18 13q0 1 -1 3v1078q3 9 4 10q5 6 20 11q107 36 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5
-q20 0 20 -21v-418z" />
-    <glyph glyph-name="_402" unicode="&#xf1ac;" horiz-adv-x="1792" 
-d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48
+q20 0 20 -21v-418z"/>
+			<glyph glyph-name="_402" unicode="&#xf1ac;" horiz-adv-x="1792"
+				   d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48
 l152 -152q28 -28 48 -76t20 -88v-163zM928 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 512v128q0 14 -9 23
 t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128
 q14 0 23 9t9 23zM1184 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 256v128q0 14 -9 23t-23 9h-128
-q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z" />
-    <glyph glyph-name="_403" unicode="&#xf1ad;" 
-d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9
+q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z"/>
+			<glyph glyph-name="_403" unicode="&#xf1ad;"
+				   d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9
 t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 736v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 480v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 160v64
 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64
 q14 0 23 9t9 23zM384 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 -96v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9
 t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM896 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 928v64
 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 160v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64
 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9
-t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z" />
-    <glyph glyph-name="_404" unicode="&#xf1ae;" horiz-adv-x="1280" 
-d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68q29 28 68.5 28t67.5 -28l228 -228h368l228 228q28 28 68 28t68 -28q28 -29 28 -68.5t-28 -67.5zM864 1152
-q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-    <glyph glyph-name="uniF1B1" unicode="&#xf1b0;" horiz-adv-x="1664" 
-d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5
+t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z"/>
+			<glyph glyph-name="_404" unicode="&#xf1ae;" horiz-adv-x="1280"
+				   d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68q29 28 68.5 28t67.5 -28l228 -228h368l228 228q28 28 68 28t68 -28q28 -29 28 -68.5t-28 -67.5zM864 1152
+q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z"/>
+			<glyph glyph-name="uniF1B1" unicode="&#xf1b0;" horiz-adv-x="1664"
+				   d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5
 q76 0 141.5 -55.5t100.5 -134t35 -152.5zM832 608q118 0 255 -97.5t229 -237t92 -254.5q0 -46 -17 -76.5t-48.5 -45t-64.5 -20t-76 -5.5q-68 0 -187.5 45t-182.5 45q-66 0 -192.5 -44.5t-200.5 -44.5q-183 0 -183 146q0 86 56 191.5t139.5 192.5t187.5 146t193 59zM1071 819
 q-61 0 -105 39t-63 92.5t-19 113.5q0 74 30 151.5t91.5 135t138.5 57.5q61 0 105 -39t63 -92.5t19 -113.5q0 -73 -30 -151t-92 -135.5t-138 -57.5zM1503 923q77 0 119 -59.5t42 -139.5q0 -74 -35 -152t-100.5 -133.5t-141.5 -55.5q-77 0 -119 59t-42 139q0 74 35 152.5
-t100.5 134t141.5 55.5z" />
-    <glyph glyph-name="_406" unicode="&#xf1b1;" horiz-adv-x="768" 
-d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z" />
-    <glyph glyph-name="_407" unicode="&#xf1b2;" horiz-adv-x="1792" 
-d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z
-" />
-    <glyph glyph-name="_408" unicode="&#xf1b3;" horiz-adv-x="2304" 
-d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67
+t100.5 134t141.5 55.5z"/>
+			<glyph glyph-name="_406" unicode="&#xf1b1;" horiz-adv-x="768"
+				   d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z"/>
+			<glyph glyph-name="_407" unicode="&#xf1b2;" horiz-adv-x="1792"
+				   d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z
+"/>
+			<glyph glyph-name="_408" unicode="&#xf1b3;" horiz-adv-x="2304"
+				   d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67
 t-52 -47l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-4 2 -7 4q-2 -2 -7 -4l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-33 16 -52 47t-19 67v416q0 38 21.5 70t56.5 48l434 186v400q0 38 21.5 70t56.5 48l448 192q23 10 50 10t50 -10l448 -192q35 -16 56.5 -48t21.5 -70
-v-400l434 -186q36 -16 57 -48t21 -70z" />
-    <glyph glyph-name="_409" unicode="&#xf1b4;" horiz-adv-x="2048" 
-d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658
+v-400l434 -186q36 -16 57 -48t21 -70z"/>
+			<glyph glyph-name="_409" unicode="&#xf1b4;" horiz-adv-x="2048"
+				   d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658
 q0 -111 57.5 -171.5t166.5 -60.5zM277 236h296q205 0 205 167q0 180 -199 180h-302v-347zM277 773h281q78 0 123.5 36.5t45.5 113.5q0 144 -190 144h-260v-294zM0 1282h594q87 0 155 -14t126.5 -47.5t90 -96.5t31.5 -154q0 -181 -172 -263q114 -32 172 -115t58 -204
-q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z" />
-    <glyph glyph-name="_410" unicode="&#xf1b5;" 
-d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5
+q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z"/>
+			<glyph glyph-name="_410" unicode="&#xf1b5;"
+				   d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5
 t-56.5 60.5t-79 29.5t-97 8.5zM477 723h-176v184h163q119 0 119 -90q0 -94 -106 -94zM486 388h-185v217h189q124 0 124 -113q0 -104 -128 -104zM1136 356q-68 0 -104 38t-36 107h411q1 10 1 30q0 132 -74.5 220.5t-203.5 88.5q-128 0 -210 -86t-82 -216q0 -135 79 -217
-t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z" />
-    <glyph glyph-name="_411" unicode="&#xf1b6;" horiz-adv-x="1792" 
-d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5
+t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z"/>
+			<glyph glyph-name="_411" unicode="&#xf1b6;" horiz-adv-x="1792"
+				   d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5
 q32 -60 91 -96.5t130 -36.5q104 0 177 73t73 177zM1642 953q0 126 -89.5 215.5t-215.5 89.5q-127 0 -216.5 -89.5t-89.5 -215.5q0 -127 89.5 -216t216.5 -89q126 0 215.5 89t89.5 216zM1792 953q0 -189 -133.5 -322t-321.5 -133l-437 -319q-12 -129 -109 -218t-229 -89
-q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z" />
-    <glyph glyph-name="_412" unicode="&#xf1b7;" 
-d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5
+q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z"/>
+			<glyph glyph-name="_412" unicode="&#xf1b7;"
+				   d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5
 q82 0 140 -57.5t58 -140.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v153l172 -69q20 -92 93.5 -152t168.5 -60q104 0 181 70t87 173l345 252q150 0 255.5 105.5t105.5 254.5q0 150 -105.5 255.5t-255.5 105.5
 q-148 0 -253 -104.5t-107 -252.5l-225 -322q-9 1 -28 1q-75 0 -137 -37l-297 119v468q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5zM1289 887q0 -100 -71 -170.5t-171 -70.5t-170.5 70.5t-70.5 170.5t70.5 171t170.5 71q101 0 171.5 -70.5t70.5 -171.5z
-" />
-    <glyph glyph-name="_413" unicode="&#xf1b8;" horiz-adv-x="1792" 
-d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188
+"/>
+			<glyph glyph-name="_413" unicode="&#xf1b8;" horiz-adv-x="1792"
+				   d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188
 l-140 86zM1680 436l-188 -359q-12 -29 -36.5 -46.5t-43.5 -20.5l-18 -4q-71 -7 -219 -12l8 -164l-230 367l211 362l7 -173q170 -16 283 -5t170 33zM895 1360q-47 -63 -265 -435l-317 187l-19 12l225 356q20 31 60 45t80 10q24 -2 48.5 -12t42 -21t41.5 -33t36 -34.5
 t36 -39.5t32 -35zM1550 1053l212 -363q18 -37 12.5 -76t-27.5 -74q-13 -20 -33 -37t-38 -28t-48.5 -22t-47 -16t-51.5 -14t-46 -12q-34 72 -265 436l313 195zM1407 1279l142 83l-220 -373l-419 20l151 86q-34 89 -75 166t-75.5 123.5t-64.5 80t-47 46.5l-17 13l405 -1
-q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z" />
-    <glyph glyph-name="_414" unicode="&#xf1b9;" horiz-adv-x="2048" 
-d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384
+q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z"/>
+			<glyph glyph-name="_414" unicode="&#xf1b9;" horiz-adv-x="2048"
+				   d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384
 q0 -14 -9 -23t-23 -9h-96v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-1024v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5t179 63.5h768q98 0 179 -63.5t104 -157.5
-l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z" />
-    <glyph glyph-name="_415" unicode="&#xf1ba;" horiz-adv-x="2048" 
-d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5
+l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z"/>
+			<glyph glyph-name="_415" unicode="&#xf1ba;" horiz-adv-x="2048"
+				   d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5
 t179 63.5h128v224q0 14 9 23t23 9h448q14 0 23 -9t9 -23v-224h128q98 0 179 -63.5t104 -157.5l105 -419h28zM320 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM516 640h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5z
-M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z" />
-    <glyph glyph-name="_416" unicode="&#xf1bb;" 
-d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384
-q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z" />
-    <glyph glyph-name="_417" unicode="&#xf1bc;" 
-d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64
+M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z"/>
+			<glyph glyph-name="_416" unicode="&#xf1bb;"
+				   d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384
+q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z"/>
+			<glyph glyph-name="_417" unicode="&#xf1bc;"
+				   d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64
 q0 -25 17.5 -42.5t42.5 -17.5q7 0 37 8q122 33 251 33q279 0 488 -124q24 -13 38 -13q25 0 42.5 17.5t17.5 42.5zM1331 789q0 47 -40 70q-126 73 -293 110.5t-343 37.5q-204 0 -364 -47q-23 -7 -38.5 -25.5t-15.5 -48.5q0 -31 20.5 -52t51.5 -21q11 0 40 8q133 37 307 37
-q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_418" unicode="&#xf1bd;" horiz-adv-x="1024" 
-d="M1024 1233l-303 -582l24 -31h279v-415h-507l-44 -30l-142 -273l-30 -30h-301v303l303 583l-24 30h-279v415h507l44 30l142 273l30 30h301v-303z" />
-    <glyph glyph-name="_419" unicode="&#xf1be;" horiz-adv-x="2304" 
-d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11
+q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="_418" unicode="&#xf1bd;" horiz-adv-x="1024"
+				   d="M1024 1233l-303 -582l24 -31h279v-415h-507l-44 -30l-142 -273l-30 -30h-301v303l303 583l-24 30h-279v415h507l44 30l142 273l30 30h301v-303z"/>
+			<glyph glyph-name="_419" unicode="&#xf1be;" horiz-adv-x="2304"
+				   d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11
 q11 0 20 9q9 7 9 20zM35 533l20 -128l-20 -126q-2 -9 -9 -9t-9 9l-17 126l17 128q2 9 9 9t9 -9zM121 612l26 -207l-26 -203q-2 -9 -10 -9q-9 0 -9 10l-23 202l23 207q0 9 9 9q8 0 10 -9zM401 159zM213 650l25 -245l-25 -237q0 -11 -11 -11q-10 0 -12 11l-21 237l21 245
 q2 12 12 12q11 0 11 -12zM307 657l23 -252l-23 -244q-2 -13 -14 -13q-13 0 -13 13l-21 244l21 252q0 13 13 13q12 0 14 -13zM401 639l21 -234l-21 -246q-2 -16 -16 -16q-6 0 -10.5 4.5t-4.5 11.5l-20 246l20 234q0 6 4.5 10.5t10.5 4.5q14 0 16 -15zM784 164zM495 785
 l21 -380l-21 -246q0 -7 -5 -12.5t-12 -5.5q-16 0 -18 18l-18 246l18 380q2 18 18 18q7 0 12 -5.5t5 -12.5zM589 871l19 -468l-19 -244q0 -8 -5.5 -13.5t-13.5 -5.5q-18 0 -20 19l-16 244l16 468q2 19 20 19q8 0 13.5 -5.5t5.5 -13.5zM687 911l18 -506l-18 -242
 q-2 -21 -22 -21q-19 0 -21 21l-16 242l16 506q0 9 6.5 15.5t14.5 6.5q9 0 15 -6.5t7 -15.5zM1079 169v0v0v0zM881 915l15 -510l-15 -239q0 -10 -7.5 -17.5t-17.5 -7.5t-17 7t-8 18l-14 239l14 510q0 11 7.5 18t17.5 7t17.5 -7t7.5 -18zM980 896l14 -492l-14 -236
 q0 -11 -8 -19t-19 -8t-19 8t-9 19l-12 236l12 492q1 12 9 20t19 8t18.5 -8t8.5 -20zM1192 404l-14 -231v0q0 -13 -9 -22t-22 -9t-22 9t-10 22l-6 114l-6 117l12 636v3q2 15 12 24q9 7 20 7q8 0 15 -5q14 -8 16 -26zM2304 423q0 -117 -83 -199.5t-200 -82.5h-786
-q-13 2 -22 11t-9 22v899q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />
-    <glyph glyph-name="uniF1C0" unicode="&#xf1c0;" 
-d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127
+q-13 2 -22 11t-9 22v899q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z"/>
+			<glyph glyph-name="uniF1C0" unicode="&#xf1c0;"
+				   d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127
 t443 -43zM768 384q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 1536q208 0 385 -34.5t280 -93.5t103 -128v-128q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5
-t-103 128v128q0 69 103 128t280 93.5t385 34.5z" />
-    <glyph glyph-name="uniF1C1" unicode="&#xf1c1;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+t-103 128v128q0 69 103 128t280 93.5t385 34.5z"/>
+			<glyph glyph-name="uniF1C1" unicode="&#xf1c1;"
+				   d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
 M894 465q33 -26 84 -56q59 7 117 7q147 0 177 -49q16 -22 2 -52q0 -1 -1 -2l-2 -2v-1q-6 -38 -71 -38q-48 0 -115 20t-130 53q-221 -24 -392 -83q-153 -262 -242 -262q-15 0 -28 7l-24 12q-1 1 -6 5q-10 10 -6 36q9 40 56 91.5t132 96.5q14 9 23 -6q2 -2 2 -4q52 85 107 197
 q68 136 104 262q-24 82 -30.5 159.5t6.5 127.5q11 40 42 40h21h1q23 0 35 -15q18 -21 9 -68q-2 -6 -4 -8q1 -3 1 -8v-30q-2 -123 -14 -192q55 -164 146 -238zM318 54q52 24 137 158q-51 -40 -87.5 -84t-49.5 -74zM716 974q-15 -42 -2 -132q1 7 7 44q0 3 7 43q1 4 4 8
-q-1 1 -1 2q-1 2 -1 3q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z" />
-    <glyph glyph-name="_422" unicode="&#xf1c2;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+q-1 1 -1 2q-1 2 -1 3q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z"/>
+			<glyph glyph-name="_422" unicode="&#xf1c2;"
+				   d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
 M233 768v-107h70l164 -661h159l128 485q7 20 10 46q2 16 2 24h4l3 -24q1 -3 3.5 -20t5.5 -26l128 -485h159l164 661h70v107h-300v-107h90l-99 -438q-5 -20 -7 -46l-2 -21h-4q0 3 -0.5 6.5t-1.5 8t-1 6.5q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5
-t-3.5 -21.5l-4 -21h-4l-2 21q-2 26 -7 46l-99 438h90v107h-300z" />
-    <glyph glyph-name="_423" unicode="&#xf1c3;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+t-3.5 -21.5l-4 -21h-4l-2 21q-2 26 -7 46l-99 438h90v107h-300z"/>
+			<glyph glyph-name="_423" unicode="&#xf1c3;"
+				   d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
 M429 106v-106h281v106h-75l103 161q5 7 10 16.5t7.5 13.5t3.5 4h2q1 -4 5 -10q2 -4 4.5 -7.5t6 -8t6.5 -8.5l107 -161h-76v-106h291v106h-68l-192 273l195 282h67v107h-279v-107h74l-103 -159q-4 -7 -10 -16.5t-9 -13.5l-2 -3h-2q-1 4 -5 10q-6 11 -17 23l-106 159h76v107
-h-290v-107h68l189 -272l-194 -283h-68z" />
-    <glyph glyph-name="_424" unicode="&#xf1c4;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z" />
-    <glyph glyph-name="_425" unicode="&#xf1c5;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z" />
-    <glyph glyph-name="_426" unicode="&#xf1c6;" 
-d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400
+h-290v-107h68l189 -272l-194 -283h-68z"/>
+			<glyph glyph-name="_424" unicode="&#xf1c4;"
+				   d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z"/>
+			<glyph glyph-name="_425" unicode="&#xf1c5;"
+				   d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z"/>
+			<glyph glyph-name="_426" unicode="&#xf1c6;"
+				   d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400
 v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-128v-128h-128v128h-512v-1536h1280zM781 593l107 -349q8 -27 8 -52q0 -83 -72.5 -137.5t-183.5 -54.5t-183.5 54.5t-72.5 137.5q0 25 8 52q21 63 120 396v128h128v-128h79
-q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z" />
-    <glyph glyph-name="_427" unicode="&#xf1c7;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z"/>
+			<glyph glyph-name="_427" unicode="&#xf1c7;"
+				   d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
 M620 686q20 -8 20 -30v-544q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-166 167h-131q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h131l166 167q16 15 35 7zM1037 -3q31 0 50 24q129 159 129 363t-129 363q-16 21 -43 24t-47 -14q-21 -17 -23.5 -43.5t14.5 -47.5
-q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z" />
-    <glyph glyph-name="_428" unicode="&#xf1c8;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
-M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z" />
-    <glyph glyph-name="_429" unicode="&#xf1c9;" 
-d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z"/>
+			<glyph glyph-name="_428" unicode="&#xf1c8;"
+				   d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z"/>
+			<glyph glyph-name="_429" unicode="&#xf1c9;"
+				   d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
 M480 768q8 11 21 12.5t24 -6.5l51 -38q11 -8 12.5 -21t-6.5 -24l-182 -243l182 -243q8 -11 6.5 -24t-12.5 -21l-51 -38q-11 -8 -24 -6.5t-21 12.5l-226 301q-14 19 0 38zM1282 467q14 -19 0 -38l-226 -301q-8 -11 -21 -12.5t-24 6.5l-51 38q-11 8 -12.5 21t6.5 24l182 243
-l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z" />
-    <glyph glyph-name="_430" unicode="&#xf1ca;" 
-d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406
-q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z" />
-    <glyph glyph-name="_431" unicode="&#xf1cb;" horiz-adv-x="1792" 
-d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546
-q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />
-    <glyph glyph-name="_432" unicode="&#xf1cc;" horiz-adv-x="2048" 
-d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94
+l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z"/>
+			<glyph glyph-name="_430" unicode="&#xf1ca;"
+				   d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406
+q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z"/>
+			<glyph glyph-name="_431" unicode="&#xf1cb;" horiz-adv-x="1792"
+				   d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546
+q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z"/>
+			<glyph glyph-name="_432" unicode="&#xf1cc;" horiz-adv-x="2048"
+				   d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94
 q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55
-t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97l93 -108q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5t-85 -189.5z" />
-    <glyph glyph-name="_433" unicode="&#xf1cd;" horiz-adv-x="1792" 
-d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194
+t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97l93 -108q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5t-85 -189.5z"/>
+			<glyph glyph-name="_433" unicode="&#xf1cd;" horiz-adv-x="1792"
+				   d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194
 q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5
-t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />
-    <glyph glyph-name="_434" unicode="&#xf1ce;" horiz-adv-x="1792" 
-d="M1760 640q0 -176 -68.5 -336t-184 -275.5t-275.5 -184t-336 -68.5t-336 68.5t-275.5 184t-184 275.5t-68.5 336q0 213 97 398.5t265 305.5t374 151v-228q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5
-t136.5 204t51 248.5q0 230 -145.5 406t-366.5 221v228q206 -31 374 -151t265 -305.5t97 -398.5z" />
-    <glyph glyph-name="uniF1D0" unicode="&#xf1d0;" horiz-adv-x="1792" 
-d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41
+t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z"/>
+			<glyph glyph-name="_434" unicode="&#xf1ce;" horiz-adv-x="1792"
+				   d="M1760 640q0 -176 -68.5 -336t-184 -275.5t-275.5 -184t-336 -68.5t-336 68.5t-275.5 184t-184 275.5t-68.5 336q0 213 97 398.5t265 305.5t374 151v-228q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5
+t136.5 204t51 248.5q0 230 -145.5 406t-366.5 221v228q206 -31 374 -151t265 -305.5t97 -398.5z"/>
+			<glyph glyph-name="uniF1D0" unicode="&#xf1d0;" horiz-adv-x="1792"
+				   d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41
 t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170
 t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136
-q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />
-    <glyph glyph-name="uniF1D1" unicode="&#xf1d1;" horiz-adv-x="1792" 
-d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251
+q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z"/>
+			<glyph glyph-name="uniF1D1" unicode="&#xf1d1;" horiz-adv-x="1792"
+				   d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251
 l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162
 q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33
 q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5
 t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71
-t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="uniF1D2" unicode="&#xf1d2;" 
-d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85
+t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z"/>
+			<glyph glyph-name="uniF1D2" unicode="&#xf1d2;"
+				   d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85
 q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392
 q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072
-q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_438" unicode="&#xf1d3;" horiz-adv-x="1792" 
-d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58
+q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="_438" unicode="&#xf1d3;" horiz-adv-x="1792"
+				   d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58
 q0 -31 22.5 -51.5t58 -32t78.5 -22t86 -25.5t78.5 -37.5t58 -64t22.5 -98.5q0 -304 -363 -304q-69 0 -130 12.5t-116 41t-87.5 82t-32.5 127.5q0 165 182 225v4q-67 41 -67 126q0 109 63 137v4q-72 24 -119.5 108.5t-47.5 165.5q0 139 95 231.5t235 92.5q96 0 178 -47
 q98 0 218 47zM1123 220h-222q4 45 4 134v609q0 94 -4 128h222q-4 -33 -4 -124v-613q0 -89 4 -134zM1724 442v-196q-71 -39 -174 -39q-62 0 -107 20t-70 50t-39.5 78t-18.5 92t-4 103v351h2v4q-7 0 -19 1t-18 1q-21 0 -59 -6v190h96v76q0 54 -6 89h227q-6 -41 -6 -165h171
-v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z" />
-    <glyph glyph-name="_439" unicode="&#xf1d4;" 
-d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="uniF1D5" unicode="&#xf1d5;" horiz-adv-x="1280" 
-d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5
+v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z"/>
+			<glyph glyph-name="_439" unicode="&#xf1d4;"
+				   d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="uniF1D5" unicode="&#xf1d5;" horiz-adv-x="1280"
+				   d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5
 t136.5 -56.5t56.5 -136.5zM1223 953q0 -158 -78 -292t-212.5 -212t-292.5 -78q-64 0 -131 14q-21 5 -32.5 23.5t-6.5 39.5q5 20 23 31.5t39 7.5q51 -13 108 -13q97 0 186 38t153 102t102 153t38 186t-38 186t-102 153t-153 102t-186 38t-186 -38t-153 -102t-102 -153
-t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z" />
-    <glyph glyph-name="uniF1D6" unicode="&#xf1d6;" horiz-adv-x="1792" 
-d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5
+t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z"/>
+			<glyph glyph-name="uniF1D6" unicode="&#xf1d6;" horiz-adv-x="1792"
+				   d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5
 q77 -114 120.5 -214.5t43.5 -208.5q0 -43 -19.5 -100t-55.5 -57q-9 0 -19.5 7.5t-19 17.5t-19 26t-16 26.5t-13.5 26t-9 17.5q-1 1 -3 1l-5 -4q-59 -154 -132 -223q20 -20 61.5 -38.5t69 -41.5t35.5 -65q-2 -4 -4 -16t-7 -18q-64 -97 -302 -97q-53 0 -110.5 9t-98 20
 t-104.5 30q-15 5 -23 7q-14 4 -46 4.5t-40 1.5q-41 -45 -127.5 -65t-168.5 -20q-35 0 -69 1.5t-93 9t-101 20.5t-74.5 40t-32.5 64q0 40 10 59.5t41 48.5q11 2 40.5 13t49.5 12q4 0 14 2q2 2 2 4l-2 3q-48 11 -108 105.5t-73 156.5l-5 3q-4 0 -12 -20q-18 -41 -54.5 -74.5
-t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z" />
-    <glyph glyph-name="uniF1D7" unicode="&#xf1d7;" horiz-adv-x="2048" 
-d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25
+t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z"/>
+			<glyph glyph-name="uniF1D7" unicode="&#xf1d7;" horiz-adv-x="2048"
+				   d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25
 q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 65.5 24.5t24.5 65.5zM1722 568q0 28 -26 50t-65 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q39 0 65 22t26 51zM1456 965q-31 4 -70 4q-169 0 -311 -77t-223.5 -208.5t-81.5 -287.5
 q0 -78 23 -152q-35 -3 -68 -3q-26 0 -50 1.5t-55 6.5t-44.5 7t-54.5 10.5t-50 10.5l-253 -127l72 218q-290 203 -290 490q0 169 97.5 311t264 223.5t363.5 81.5q176 0 332.5 -66t262 -182.5t136.5 -260.5zM2048 404q0 -117 -68.5 -223.5t-185.5 -193.5l55 -181l-199 109
-q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z" />
-    <glyph glyph-name="_443" unicode="&#xf1d8;" horiz-adv-x="1792" 
-d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z" />
-    <glyph glyph-name="_444" unicode="&#xf1d9;" horiz-adv-x="1792" 
-d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137
-l863 639l-478 -797z" />
-    <glyph glyph-name="_445" unicode="&#xf1da;" 
-d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
+q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z"/>
+			<glyph glyph-name="_443" unicode="&#xf1d8;" horiz-adv-x="1792"
+				   d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z"/>
+			<glyph glyph-name="_444" unicode="&#xf1d9;" horiz-adv-x="1792"
+				   d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137
+l863 639l-478 -797z"/>
+			<glyph glyph-name="_445" unicode="&#xf1da;"
+				   d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298zM896 928v-448q0 -14 -9 -23
-t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="_446" unicode="&#xf1db;" 
-d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
-t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_447" unicode="&#xf1dc;" horiz-adv-x="1792" 
-d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15
+t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z"/>
+			<glyph glyph-name="_446" unicode="&#xf1db;"
+				   d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="_447" unicode="&#xf1dc;" horiz-adv-x="1792"
+				   d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15
 t20 -45.5q0 -26 -12.5 -48t-36.5 -22q-47 0 -139.5 3.5t-138.5 3.5q-43 0 -128 -3.5t-127 -3.5q-23 0 -35.5 21t-12.5 45q0 30 15.5 45t36 17.5t47.5 7.5t42 15q33 23 33 143l-1 57v813q0 3 0.5 26t0 36.5t-1.5 38.5t-3.5 42t-6.5 36.5t-11 31.5t-16 18q-15 10 -45 12t-53 2
 t-41 14t-18 45q0 26 12 48t36 22q46 0 138.5 -3.5t138.5 -3.5q42 0 126.5 3.5t126.5 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17 -43.5t-38.5 -14.5t-49.5 -4t-43 -13q-35 -21 -35 -160l1 -320q0 -21 1 -32q13 -3 39 -3h699q25 0 38 3q1 11 1 32l1 320q0 139 -35 160
 q-18 11 -58.5 12.5t-66 13t-25.5 49.5q0 26 12.5 48t37.5 22q44 0 132 -3.5t132 -3.5q43 0 129 3.5t129 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17.5 -44t-40 -14.5t-51.5 -3t-44 -12.5q-35 -23 -35 -161l1 -943q0 -119 34 -140q16 -10 46 -13.5t53.5 -4.5t41.5 -15.5t18 -44.5
-q0 -26 -12 -48t-36 -22z" />
-    <glyph glyph-name="_448" unicode="&#xf1dd;" horiz-adv-x="1280" 
-d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179
-q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z" />
-    <glyph glyph-name="_449" unicode="&#xf1de;" 
-d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256
-q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z" />
-    <glyph glyph-name="uniF1E0" unicode="&#xf1e0;" 
-d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5
-t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z" />
-    <glyph glyph-name="_451" unicode="&#xf1e1;" 
-d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5
-t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_452" unicode="&#xf1e2;" horiz-adv-x="1792" 
-d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5
+q0 -26 -12 -48t-36 -22z"/>
+			<glyph glyph-name="_448" unicode="&#xf1dd;" horiz-adv-x="1280"
+				   d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179
+q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z"/>
+			<glyph glyph-name="_449" unicode="&#xf1de;"
+				   d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256
+q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z"/>
+			<glyph glyph-name="uniF1E0" unicode="&#xf1e0;"
+				   d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5
+t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z"/>
+			<glyph glyph-name="_451" unicode="&#xf1e1;"
+				   d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5
+t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="_452" unicode="&#xf1e2;" horiz-adv-x="1792"
+				   d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5
 t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5q182 0 343 -89l64 64q19 19 45.5 19t45.5 -19l68 -68zM1521 1359q-10 -10 -22 -10q-13 0 -23 10l-91 90q-9 10 -9 23t9 23q10 9 23 9t23 -9l90 -91
 q10 -9 10 -22.5t-10 -22.5zM1751 1129q-11 -9 -23 -9t-23 9l-90 91q-10 9 -10 22.5t10 22.5q9 10 22.5 10t22.5 -10l91 -90q9 -10 9 -23t-9 -23zM1792 1312q0 -14 -9 -23t-23 -9h-96q-14 0 -23 9t-9 23t9 23t23 9h96q14 0 23 -9t9 -23zM1600 1504v-96q0 -14 -9 -23t-23 -9
-t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-    <glyph glyph-name="_453" unicode="&#xf1e3;" horiz-adv-x="1792" 
-d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323
-l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z" />
-    <glyph glyph-name="_454" unicode="&#xf1e4;" horiz-adv-x="1792" 
-d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
+t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z"/>
+			<glyph glyph-name="_453" unicode="&#xf1e3;" horiz-adv-x="1792"
+				   d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323
+l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z"/>
+			<glyph glyph-name="_454" unicode="&#xf1e4;" horiz-adv-x="1792"
+				   d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
 v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM66 768q-28 0 -47 19t-19 46v129h514v-129q0 -27 -19 -46t-46 -19h-383zM1216 224v-192q0 -14 -9 -23t-23 -9h-192
 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1600 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23
 zM1408 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1016v-13h-514v10q0 104 -382 102q-382 -1 -382 -102v-10h-514v13q0 17 8.5 43t34 64t65.5 75.5t110.5 76t160 67.5t224 47.5t293.5 18.5t293 -18.5t224 -47.5
-t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z" />
-    <glyph glyph-name="_455" unicode="&#xf1e5;" horiz-adv-x="1792" 
-d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z
-M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="_456" unicode="&#xf1e6;" horiz-adv-x="1792" 
-d="M1755 1083q37 -38 37 -90.5t-37 -90.5l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234
-l401 400q38 37 91 37t90 -37z" />
-    <glyph glyph-name="_457" unicode="&#xf1e7;" horiz-adv-x="1792" 
-d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5
+t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z"/>
+			<glyph glyph-name="_455" unicode="&#xf1e5;" horiz-adv-x="1792"
+				   d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z
+M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z"/>
+			<glyph glyph-name="_456" unicode="&#xf1e6;" horiz-adv-x="1792"
+				   d="M1755 1083q37 -38 37 -90.5t-37 -90.5l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234
+l401 400q38 37 91 37t90 -37z"/>
+			<glyph glyph-name="_457" unicode="&#xf1e7;" horiz-adv-x="1792"
+				   d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5
 t-111 36.5h-1112q-83 0 -112.5 -34t-29.5 -126v-673q43 -23 88.5 -40t81 -28t81 -18.5t71 -11t70 -4t58.5 -0.5t56.5 2t44.5 2q68 1 95 -27q6 -6 10 -9q26 -25 61 -51q7 91 118 87q5 0 36.5 -1.5t43 -2t45.5 -1t53 1t54.5 4.5t61 8.5t62 13.5t67 19.5t67.5 27t72 34.5z
 M1763 621q-121 -149 -372 -252q84 -285 -23 -465q-66 -113 -183 -148q-104 -32 -182 15q-86 51 -82 164l-1 326v1q-8 2 -24.5 6t-23.5 5l-1 -338q4 -114 -83 -164q-79 -47 -183 -15q-117 36 -182 150q-105 180 -22 463q-251 103 -372 252q-25 37 -4 63t60 -1q4 -2 11.5 -7
-t10.5 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />
-    <glyph glyph-name="_458" unicode="&#xf1e8;" horiz-adv-x="1792" 
-d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z" />
-    <glyph glyph-name="_459" unicode="&#xf1e9;" 
-d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36
+t10.5 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z"/>
+			<glyph glyph-name="_458" unicode="&#xf1e8;" horiz-adv-x="1792"
+				   d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z"/>
+			<glyph glyph-name="_459" unicode="&#xf1e9;"
+				   d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36
 q-12 25 -17 75q-8 76 1 166.5t30 124.5t56 32q13 0 202 -77q71 -29 115 -47l84 -34q23 -9 35.5 -30.5t11.5 -48.5zM1450 171q-7 -54 -91.5 -161t-135.5 -127q-37 -14 -63 7q-14 10 -184 287l-47 77q-14 21 -11.5 46t19.5 46q35 43 83 26q1 -1 119 -40q203 -66 242 -79.5
 t47 -20.5q28 -22 22 -61zM778 803q5 -102 -54 -122q-58 -17 -114 71l-378 598q-8 35 19 62q41 43 207.5 89.5t224.5 31.5q40 -10 49 -45q3 -18 22 -305.5t24 -379.5zM1440 695q3 -39 -26 -59q-15 -10 -329 -86q-67 -15 -91 -23l1 2q-23 -6 -46 4t-37 32q-30 47 0 87
-q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z" />
-    <glyph glyph-name="_460" unicode="&#xf1ea;" horiz-adv-x="2048" 
-d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19
-t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z" />
-    <glyph glyph-name="_461" unicode="&#xf1eb;" horiz-adv-x="2048" 
-d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121
+q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z"/>
+			<glyph glyph-name="_460" unicode="&#xf1ea;" horiz-adv-x="2048"
+				   d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19
+t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z"/>
+			<glyph glyph-name="_461" unicode="&#xf1eb;" horiz-adv-x="2048"
+				   d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121
 q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z
-M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
-    <glyph glyph-name="_462" unicode="&#xf1ec;" horiz-adv-x="1792" 
-d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
+M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z"/>
+			<glyph glyph-name="_462" unicode="&#xf1ec;" horiz-adv-x="1792"
+				   d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5
 t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5
 t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z
 M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38
-h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_463" unicode="&#xf1ed;" 
-d="M1519 890q18 -84 -4 -204q-87 -444 -565 -444h-44q-25 0 -44 -16.5t-24 -42.5l-4 -19l-55 -346l-2 -15q-5 -26 -24.5 -42.5t-44.5 -16.5h-251q-21 0 -33 15t-9 36q9 56 26.5 168t26.5 168t27 167.5t27 167.5q5 37 43 37h131q133 -2 236 21q175 39 287 144q102 95 155 246
+h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z"/>
+			<glyph glyph-name="_463" unicode="&#xf1ed;"
+				   d="M1519 890q18 -84 -4 -204q-87 -444 -565 -444h-44q-25 0 -44 -16.5t-24 -42.5l-4 -19l-55 -346l-2 -15q-5 -26 -24.5 -42.5t-44.5 -16.5h-251q-21 0 -33 15t-9 36q9 56 26.5 168t26.5 168t27 167.5t27 167.5q5 37 43 37h131q133 -2 236 21q175 39 287 144q102 95 155 246
 q24 70 35 133q1 6 2.5 7.5t3.5 1t6 -3.5q79 -59 98 -162zM1347 1172q0 -107 -46 -236q-80 -233 -302 -315q-113 -40 -252 -42q0 -1 -90 -1l-90 1q-100 0 -118 -96q-2 -8 -85 -530q-1 -10 -12 -10h-295q-22 0 -36.5 16.5t-11.5 38.5l232 1471q5 29 27.5 48t51.5 19h598
-q34 0 97.5 -13t111.5 -32q107 -41 163.5 -123t56.5 -196z" />
-    <glyph glyph-name="_464" unicode="&#xf1ee;" horiz-adv-x="1792" 
-d="M441 864q33 0 52 -26q266 -364 362 -774h-446q-127 441 -367 749q-12 16 -3 33.5t29 17.5h373zM1000 507q-49 -199 -125 -393q-79 310 -256 594q40 221 44 449q211 -340 337 -650zM1099 1216q235 -324 384.5 -698.5t184.5 -773.5h-451q-41 665 -553 1472h435zM1792 640
-q0 -424 -101 -812q-67 560 -359 1083q-25 301 -106 584q-4 16 5.5 28.5t25.5 12.5h359q21 0 38.5 -13t22.5 -33q115 -409 115 -850z" />
-    <glyph glyph-name="uniF1F0" unicode="&#xf1f0;" horiz-adv-x="2304" 
-d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27
+q34 0 97.5 -13t111.5 -32q107 -41 163.5 -123t56.5 -196z"/>
+			<glyph glyph-name="_464" unicode="&#xf1ee;" horiz-adv-x="1792"
+				   d="M441 864q33 0 52 -26q266 -364 362 -774h-446q-127 441 -367 749q-12 16 -3 33.5t29 17.5h373zM1000 507q-49 -199 -125 -393q-79 310 -256 594q40 221 44 449q211 -340 337 -650zM1099 1216q235 -324 384.5 -698.5t184.5 -773.5h-451q-41 665 -553 1472h435zM1792 640
+q0 -424 -101 -812q-67 560 -359 1083q-25 301 -106 584q-4 16 5.5 28.5t25.5 12.5h359q21 0 38.5 -13t22.5 -33q115 -409 115 -850z"/>
+			<glyph glyph-name="uniF1F0" unicode="&#xf1f0;" horiz-adv-x="2304"
+				   d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27
 q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128
-q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_466" unicode="&#xf1f1;" horiz-adv-x="2304" 
-d="M1119 1195q-128 85 -281 85q-103 0 -197.5 -40.5t-162.5 -108.5t-108.5 -162t-40.5 -197q0 -104 40.5 -198t108.5 -162t162 -108.5t198 -40.5q153 0 281 85q-131 107 -178 265.5t0.5 316.5t177.5 265zM1152 1171q-126 -99 -172 -249.5t-0.5 -300.5t172.5 -249
+q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z"/>
+			<glyph glyph-name="_466" unicode="&#xf1f1;" horiz-adv-x="2304"
+				   d="M1119 1195q-128 85 -281 85q-103 0 -197.5 -40.5t-162.5 -108.5t-108.5 -162t-40.5 -197q0 -104 40.5 -198t108.5 -162t162 -108.5t198 -40.5q153 0 281 85q-131 107 -178 265.5t0.5 316.5t177.5 265zM1152 1171q-126 -99 -172 -249.5t-0.5 -300.5t172.5 -249
 q127 99 172.5 249t-0.5 300.5t-172 249.5zM1185 1195q130 -107 177.5 -265.5t0.5 -317t-178 -264.5q128 -85 281 -85q104 0 198 40.5t162 108.5t108.5 162t40.5 198q0 103 -40.5 197t-108.5 162t-162.5 108.5t-197.5 40.5q-153 0 -281 -85zM1926 473h7v3h-17v-3h7v-17h3v17z
 M1955 456h4v20h-5l-6 -13l-6 13h-5v-20h3v15l6 -13h4l5 13v-15zM1947 16v-2h-2h-3v3h3h2v-1zM1947 7h3l-4 5h2l1 1q1 1 1 3t-1 3l-1 1h-3h-6v-13h3v5h1zM685 75q0 19 11 31t30 12q18 0 29 -12.5t11 -30.5q0 -19 -11 -31t-29 -12q-19 0 -30 12t-11 31zM1158 119q30 0 35 -32
 h-70q5 32 35 32zM1514 75q0 19 11 31t29 12t29.5 -12.5t11.5 -30.5q0 -19 -11 -31t-30 -12q-18 0 -29 12t-11 31zM1786 75q0 18 11.5 30.5t29.5 12.5t29.5 -12.5t11.5 -30.5q0 -19 -11.5 -31t-29.5 -12t-29.5 12.5t-11.5 30.5zM1944 3q-2 0 -4 1q-1 0 -3 2t-2 3q-1 2 -1 4
@@ -1686,15 +1686,15 @@ q0 -17 -31 -17q-25 0 -45 14l-13 -23q25 -17 58 -17q29 0 45.5 12t16.5 32zM1073 14l
 q-18 -15 -39 -15q-34 0 -41 33h101v12q0 32 -18 51.5t-46 19.5zM1318 146q-23 0 -35 -20v16h-30v-135h30v76q0 35 29 35q10 0 18 -4l9 28q-9 4 -21 4zM1348 75q0 -31 19.5 -51t52.5 -20q29 0 48 16l-14 24q-18 -13 -35 -12q-18 0 -29.5 12t-11.5 31t11.5 31t29.5 12
 q19 0 35 -12l14 24q-20 16 -48 16q-33 0 -52.5 -20t-19.5 -51zM1593 7h30v68v67h-30v-16q-15 20 -42 20q-29 0 -48.5 -20t-19.5 -51t19.5 -51t48.5 -20q28 0 42 20v-17zM1726 146q-23 0 -35 -20v16h-29v-135h29v76q0 35 29 35q10 0 18 -4l9 28q-8 4 -21 4zM1866 7h29v68v122
 h-29v-71q-15 20 -43 20t-47.5 -20.5t-19.5 -50.5t19.5 -50.5t47.5 -20.5q29 0 43 20v-17zM1944 27l-2 -1h-3q-2 -1 -4 -3q-3 -1 -3 -4q-1 -2 -1 -6q0 -3 1 -5q0 -2 3 -4q2 -2 4 -3t5 -1q4 0 6 1q0 1 2 2l2 1q1 1 3 4q1 2 1 5q0 4 -1 6q-1 1 -3 4q0 1 -2 2l-2 1q-1 0 -3 0.5
-t-3 0.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_467" unicode="&#xf1f2;" horiz-adv-x="2304" 
-d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42
+t-3 0.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z"/>
+			<glyph glyph-name="_467" unicode="&#xf1f2;" horiz-adv-x="2304"
+				   d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42
 q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604
 v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569
 q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73
-t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
-    <glyph glyph-name="f1f3" unicode="&#xf1f3;" horiz-adv-x="2304" 
-d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z
+t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z"/>
+			<glyph glyph-name="f1f3" unicode="&#xf1f3;" horiz-adv-x="2304"
+				   d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z
 M699 1009v-271h-66v212l-94 -212h-57l-94 212v-212h-132l-25 60h-135l-25 -60h-70l116 271h96l110 -257v257h106l85 -184l77 184h108zM1255 453q0 -20 -5.5 -35t-14 -25t-22.5 -16.5t-26 -10t-31.5 -4.5t-31.5 -1t-32.5 0.5t-29.5 0.5v-91h-126l-80 90l-83 -90h-256v271h260
 l80 -89l82 89h207q109 0 109 -89zM964 794v-56h-217v271h217v-57h-152v-49h148v-55h-148v-54h152zM2304 235v-229q0 -55 -38.5 -94.5t-93.5 -39.5h-2040q-55 0 -93.5 39.5t-38.5 94.5v678h111l25 61h55l25 -61h218v46l19 -46h113l20 47v-47h541v99l10 1q10 0 10 -14v-86h279
 v23q23 -12 55 -18t52.5 -6.5t63 0.5t51.5 1l25 61h56l25 -61h227v58l34 -58h182v378h-180v-44l-25 44h-185v-44l-23 44h-249q-69 0 -109 -22v22h-172v-22q-24 22 -73 22h-628l-43 -97l-43 97h-198v-44l-22 44h-169l-78 -179v391q0 55 38.5 94.5t93.5 39.5h2040
@@ -1702,279 +1702,279 @@ q55 0 93.5 -39.5t38.5 -94.5v-678h-120q-51 0 -81 -22v22h-177q-55 0 -78 -22v22h-31
 q60 0 95 17zM1546 469q0 -23 -12 -43t-34 -29q25 -9 34 -26t9 -46v-54h-65v45q0 33 -12 43.5t-46 10.5h-69v-99h-65v271h154q48 0 77 -15t29 -58zM1269 936q0 -24 -12.5 -44t-33.5 -29q26 -9 34.5 -25.5t8.5 -46.5v-53h-65q0 9 0.5 26.5t0 25t-3 18.5t-8.5 16t-17.5 8.5
 t-29.5 3.5h-70v-98h-64v271l153 -1q49 0 78 -14.5t29 -57.5zM1798 327v-56h-216v271h216v-56h-151v-49h148v-55h-148v-54zM1372 1009v-271h-66v271h66zM2065 357q0 -86 -102 -86h-126v58h126q34 0 34 25q0 16 -17 21t-41.5 5t-49.5 3.5t-42 22.5t-17 55q0 39 26 60t66 21
 h130v-57h-119q-36 0 -36 -25q0 -16 17.5 -20.5t42 -4t49 -2.5t42 -21.5t17.5 -54.5zM2304 407v-101q-24 -35 -88 -35h-125v58h125q33 0 33 25q0 13 -12.5 19t-31 5.5t-40 2t-40 8t-31 24t-12.5 48.5q0 39 26.5 60t66.5 21h129v-57h-118q-36 0 -36 -25q0 -20 29 -22t68.5 -5
-t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z" />
-    <glyph glyph-name="_469" unicode="&#xf1f4;" horiz-adv-x="2304" 
-d="M745 630q0 -37 -25.5 -61.5t-62.5 -24.5q-29 0 -46.5 16t-17.5 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM1530 779q0 -42 -22 -57t-66 -15l-32 -1l17 107q2 11 13 11h18q22 0 35 -2t25 -12.5t12 -30.5zM1881 630q0 -36 -25.5 -61t-61.5 -25q-29 0 -47 16
+t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z"/>
+			<glyph glyph-name="_469" unicode="&#xf1f4;" horiz-adv-x="2304"
+				   d="M745 630q0 -37 -25.5 -61.5t-62.5 -24.5q-29 0 -46.5 16t-17.5 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM1530 779q0 -42 -22 -57t-66 -15l-32 -1l17 107q2 11 13 11h18q22 0 35 -2t25 -12.5t12 -30.5zM1881 630q0 -36 -25.5 -61t-61.5 -25q-29 0 -47 16
 t-18 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM513 801q0 59 -38.5 85.5t-100.5 26.5h-160q-19 0 -21 -19l-65 -408q-1 -6 3 -11t10 -5h76q20 0 22 19l18 110q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM822 489l41 261q1 6 -3 11t-10 5h-76
 q-14 0 -17 -33q-27 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q28 0 58 12t48 32q-4 -12 -4 -21q0 -16 13 -16h69q19 0 22 19zM1269 752q0 5 -4 9.5t-9 4.5h-77q-11 0 -18 -10l-106 -156l-44 150q-5 16 -22 16h-75q-5 0 -9 -4.5t-4 -9.5q0 -2 19.5 -59
 t42 -123t23.5 -70q-82 -112 -82 -120q0 -13 13 -13h77q11 0 18 10l255 368q2 2 2 7zM1649 801q0 59 -38.5 85.5t-100.5 26.5h-159q-20 0 -22 -19l-65 -408q-1 -6 3 -11t10 -5h82q12 0 16 13l18 116q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM1958 489
 l41 261q1 6 -3 11t-10 5h-76q-14 0 -17 -33q-26 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q29 0 59 12t47 32q0 -1 -2 -9t-2 -12q0 -16 13 -16h69q19 0 22 19zM2176 898v1q0 14 -13 14h-74q-11 0 -13 -11l-65 -416l-1 -2q0 -5 4 -9.5t10 -4.5h66
-q19 0 21 19zM392 764q-5 -35 -26 -46t-60 -11l-33 -1l17 107q2 11 13 11h19q40 0 58 -11.5t12 -48.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_470" unicode="&#xf1f5;" horiz-adv-x="2304" 
-d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109
+q19 0 21 19zM392 764q-5 -35 -26 -46t-60 -11l-33 -1l17 107q2 11 13 11h19q40 0 58 -11.5t12 -48.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z"/>
+			<glyph glyph-name="_470" unicode="&#xf1f5;" horiz-adv-x="2304"
+				   d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109
 q0 -58 32.5 -90.5t99.5 -56.5q39 -14 54.5 -25.5t15.5 -27.5q0 -31 -48 -31q-29 0 -70 12.5t-72 30.5l-18 -113q72 -41 168 -41q81 0 129 37q51 41 51 117zM771 749l19 111h-96v135l-129 -21l-18 -114l-46 -8l-17 -103h62v-219q0 -84 44 -120q38 -30 111 -30q32 0 79 11v118
 q-32 -7 -44 -7q-42 0 -42 50v197h77zM1087 724v139q-15 3 -28 3q-32 0 -55.5 -16t-33.5 -46l-10 56h-131v-471h150v306q26 31 82 31q16 0 26 -2zM1124 389h150v471h-150v-471zM1746 638q0 122 -45 179q-40 52 -111 52q-64 0 -117 -56l-8 47h-132v-645l150 25v151
 q36 -11 68 -11q83 0 134 56q61 65 61 202zM1278 986q0 33 -23 56t-56 23t-56 -23t-23 -56t23 -56.5t56 -23.5t56 23.5t23 56.5zM2176 629q0 113 -48 176q-50 64 -144 64q-96 0 -151.5 -66t-55.5 -180q0 -128 63 -188q55 -55 161 -55q101 0 160 40l-16 103q-57 -31 -128 -31
-q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_471" unicode="&#xf1f6;" horiz-adv-x="2048" 
-d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5
+q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z"/>
+			<glyph glyph-name="_471" unicode="&#xf1f6;" horiz-adv-x="2048"
+				   d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5
 l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5
-l418 363q10 8 23.5 7t21.5 -11z" />
-    <glyph glyph-name="_472" unicode="&#xf1f7;" horiz-adv-x="2048" 
-d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128
+l418 363q10 8 23.5 7t21.5 -11z"/>
+			<glyph glyph-name="_472" unicode="&#xf1f7;" horiz-adv-x="2048"
+				   d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128
 q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5l149 129h757q-166 187 -227 459l111 97q61 -356 298 -556zM1942 1520l84 -96q8 -10 7.5 -23.5t-10.5 -22.5l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161
-q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z" />
-    <glyph glyph-name="_473" unicode="&#xf1f8;" horiz-adv-x="1408" 
-d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704
+q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z"/>
+			<glyph glyph-name="_473" unicode="&#xf1f8;" horiz-adv-x="1408"
+				   d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704
 q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167
-q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="_474" unicode="&#xf1f9;" 
-d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5
+q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z"/>
+			<glyph glyph-name="_474" unicode="&#xf1f9;"
+				   d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5
 t-88.5 -237.5q0 -151 91.5 -249.5t233.5 -98.5q68 0 138 24t70 66v70q0 7 4.5 11.5t10.5 4.5h119q6 0 11 -4.5t5 -11.5zM768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5
-t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_475" unicode="&#xf1fa;" 
-d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53
+t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="_475" unicode="&#xf1fa;"
+				   d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53
 q-28 33 -33 83q-52 -66 -131.5 -110t-173.5 -44q-161 0 -249.5 95.5t-88.5 269.5q0 157 66 290t179 210.5t246 77.5q87 0 155 -35.5t106 -99.5l2 19l11 56q1 6 5.5 12t9.5 6h118q5 0 13 -11q5 -5 3 -16l-120 -614q-5 -24 -5 -48q0 -39 12.5 -52t44.5 -13q28 1 57 5.5t73 24
 t77 50t57 89.5t24 137q0 292 -174 466t-466 174q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51q228 0 405 144q11 9 24 8t21 -12l41 -49q8 -12 7 -24q-2 -13 -12 -22q-102 -83 -227.5 -128t-258.5 -45q-156 0 -298 61
-t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z" />
-    <glyph glyph-name="_476" unicode="&#xf1fb;" horiz-adv-x="1792" 
-d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10
-t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z" />
-    <glyph glyph-name="f1fc" unicode="&#xf1fc;" horiz-adv-x="1792" 
-d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5
-t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z" />
-    <glyph glyph-name="_478" unicode="&#xf1fd;" horiz-adv-x="1792" 
-d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11q24 0 44 -7t31 -15t33 -27q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5
+t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z"/>
+			<glyph glyph-name="_476" unicode="&#xf1fb;" horiz-adv-x="1792"
+				   d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10
+t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z"/>
+			<glyph glyph-name="f1fc" unicode="&#xf1fc;" horiz-adv-x="1792"
+				   d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5
+t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z"/>
+			<glyph glyph-name="_478" unicode="&#xf1fd;" horiz-adv-x="1792"
+				   d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11q24 0 44 -7t31 -15t33 -27q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5
 t47 37.5q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-24 0 -44 7t-31 15t-33 27q-29 25 -47 38t-58 27t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-22 -19 -33 -27t-31 -15t-44 -7q-35 0 -56.5 11t-51.5 38q-29 25 -47 38
 t-58 27t-86 14q-45 0 -85 -14.5t-58 -27t-48 -37.5q-21 -19 -32.5 -27t-31 -15t-43.5 -7q-35 0 -56.5 11t-51.5 38q-28 24 -47 37.5t-59 27.5t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-30 -27 -51.5 -38t-56.5 -11v192q0 80 56 136t136 56h64v448h256v-448h256v448h256v-448
 h256v448h256v-448h64q80 0 136 -56t56 -136zM512 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1024 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5
-q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z" />
-    <glyph glyph-name="_479" unicode="&#xf1fe;" horiz-adv-x="2048" 
-d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />
-    <glyph glyph-name="_480" unicode="&#xf200;" horiz-adv-x="1792" 
-d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_481" unicode="&#xf201;" horiz-adv-x="2048" 
-d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9
-t9 -23z" />
-    <glyph glyph-name="_482" unicode="&#xf202;" horiz-adv-x="1792" 
-d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20
+q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z"/>
+			<glyph glyph-name="_479" unicode="&#xf1fe;" horiz-adv-x="2048"
+				   d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z"/>
+			<glyph glyph-name="_480" unicode="&#xf200;" horiz-adv-x="1792"
+				   d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="_481" unicode="&#xf201;" horiz-adv-x="2048"
+				   d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9
+t9 -23z"/>
+			<glyph glyph-name="_482" unicode="&#xf202;" horiz-adv-x="1792"
+				   d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20
 q-96 0 -183 -55.5t-138 -144.5t-51 -185q0 -160 106.5 -279.5t263.5 -119.5q177 0 258 95q56 63 83 116l84 -152q-15 -34 -44 -70l1 -1q-131 -152 -388 -152q-147 0 -269.5 79t-190.5 207.5t-68 274.5q0 105 43.5 206t116 176.5t172 121.5t204.5 46q87 0 159 -19t123.5 -50
 t95 -80t72.5 -99t58.5 -117t50.5 -124.5t50 -130.5t55 -127q96 -200 233 -200q81 0 138.5 48.5t57.5 128.5q0 42 -19 72t-50.5 46t-72.5 31.5t-84.5 27t-87.5 34t-81 52t-65 82t-39 122.5q-3 16 -3 33q0 110 87.5 192t198.5 78q78 -3 120.5 -14.5t90.5 -53.5h-1
-q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z" />
-    <glyph glyph-name="_483" unicode="&#xf203;" 
-d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73
+q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z"/>
+			<glyph glyph-name="_483" unicode="&#xf203;"
+				   d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73
 q29 -8 49 -15.5t45 -21.5t38.5 -34.5t13.5 -46.5v-5q1 -58 -40.5 -93t-100.5 -35q-97 0 -167 144q-23 47 -51.5 121.5t-48 125.5t-54 110.5t-74 95.5t-103.5 60.5t-147 24.5q-101 0 -192 -56t-144 -148t-50 -192v-1q4 -108 50.5 -199t133.5 -147.5t196 -56.5q186 0 279 110
 q20 27 31 51l-60 109q-42 -80 -99 -116t-146 -36q-115 0 -191 87t-76 204q0 105 82 189t186 84q112 0 170 -53.5t104 -172.5q8 -21 25.5 -68.5t28.5 -76.5t31.5 -74.5t38.5 -74t45.5 -62.5t55.5 -53.5t66 -33t80 -13.5q107 0 183 69.5t76 174.5zM1536 1120v-960
-q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_484" unicode="&#xf204;" horiz-adv-x="2048" 
-d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="_484" unicode="&#xf204;" horiz-adv-x="2048"
+				   d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5
 t-109.5 163.5t-163.5 109.5t-198.5 40.5h-386q119 -90 188.5 -224t69.5 -288t-69.5 -288t-188.5 -224h386q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM2048 640q0 -130 -51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5
-t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z" />
-    <glyph glyph-name="_485" unicode="&#xf205;" horiz-adv-x="2048" 
-d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5
-t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z" />
-    <glyph glyph-name="_486" unicode="&#xf206;" horiz-adv-x="2304" 
-d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94
+t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z"/>
+			<glyph glyph-name="_485" unicode="&#xf205;" horiz-adv-x="2048"
+				   d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5
+t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z"/>
+			<glyph glyph-name="_486" unicode="&#xf206;" horiz-adv-x="2304"
+				   d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94
 q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94t226 94t94 226zM2304 448q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 97 39.5 183.5t109.5 149.5l-65 98l-353 -469
 q-18 -26 -51 -26h-197q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q114 0 215 -55l137 183h-224q-26 0 -45 19t-19 45t19 45t45 19h384v-128h435l-85 128h-222q-26 0 -45 19t-19 45t19 45t45 19h256q33 0 53 -28l267 -400
-q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z" />
-    <glyph glyph-name="_487" unicode="&#xf207;" 
-d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5
+q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z"/>
+			<glyph glyph-name="_487" unicode="&#xf207;"
+				   d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5
 h-918q-23 0 -40.5 -14.5t-22.5 -37.5l-72 -384q-5 -30 14 -53t49 -23h1062q30 0 49 23t14 53zM1136 1328q0 20 -14 34t-34 14h-640q-20 0 -34 -14t-14 -34t14 -34t34 -14h640q20 0 34 14t14 34zM1536 603v-603h-128v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
-t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z" />
-    <glyph glyph-name="_488" unicode="&#xf208;" horiz-adv-x="2048" 
-d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327
+t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z"/>
+			<glyph glyph-name="_488" unicode="&#xf208;" horiz-adv-x="2048"
+				   d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327
 q0 -86 23 -170h982q36 0 61 -25t25 -60q0 -36 -25 -61t-61 -25h-908q88 -143 235.5 -227t320.5 -84q132 0 253 51.5t208 139t139 208t52 253.5zM2048 959q0 -35 -25 -60t-61 -25h-131q17 -85 17 -170q0 -167 -65.5 -319.5t-175.5 -263t-262.5 -176t-319.5 -65.5
-q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z" />
-    <glyph glyph-name="_489" unicode="&#xf209;" horiz-adv-x="1280" 
-d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q17 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119
+q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z"/>
+			<glyph glyph-name="_489" unicode="&#xf209;" horiz-adv-x="1280"
+				   d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q17 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119
 t117.5 -153t100 -70q14 0 25.5 13t11.5 27q0 24 -32 102q-13 32 -32 72t-47.5 89t-61.5 81t-62 32q-20 0 -45.5 -27t-25.5 -47zM125 273q0 -41 25 -104q59 -145 183.5 -227t281.5 -82q227 0 382 170q152 169 152 427q0 43 -1 67t-11.5 62t-30.5 56q-56 49 -211.5 75.5
 t-270.5 26.5q-37 0 -49 -11q-12 -5 -12 -35q0 -34 21.5 -60t55.5 -40t77.5 -23.5t87.5 -11.5t85 -4t70 0h23q24 0 40 -19q15 -19 19 -55q-28 -28 -96 -54q-61 -22 -93 -46q-64 -46 -108.5 -114t-44.5 -137q0 -31 18.5 -88.5t18.5 -87.5l-3 -12q-4 -12 -4 -14
 q-137 10 -146 216q-8 -2 -41 -2q2 -7 2 -21q0 -53 -40.5 -89.5t-94.5 -36.5q-82 0 -166.5 78t-84.5 159q0 34 33 67q52 -64 60 -76q77 -104 133 -104q12 0 26.5 8.5t14.5 20.5q0 34 -87.5 145t-116.5 111q-43 0 -70 -44.5t-27 -90.5zM11 264q0 101 42.5 163t136.5 88
 q-28 74 -28 104q0 62 61 123t122 61q29 0 70 -15q-163 462 -163 567q0 80 41 130.5t119 50.5q131 0 325 -581q6 -17 8 -23q6 16 29 79.5t43.5 118.5t54 127.5t64.5 123t70.5 86.5t76.5 36q71 0 112 -49t41 -122q0 -108 -159 -550q61 -15 100.5 -46t58.5 -78t26 -93.5
-t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z" />
-    <glyph glyph-name="_490" unicode="&#xf20a;" horiz-adv-x="2048" 
-d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206
+t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z"/>
+			<glyph glyph-name="_490" unicode="&#xf20a;" horiz-adv-x="2048"
+				   d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206
 q-14 -158 -98 -248.5t-214 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-204q-4 64 -35 99t-81 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t39.5 -51.5t65.5 -18q49 0 76.5 38t33.5 101zM1856 647q0 207 -15.5 307
 t-60.5 161q-6 8 -13.5 14t-21.5 15t-16 11q-86 63 -697 63q-625 0 -710 -63q-5 -4 -17.5 -11.5t-21 -14t-14.5 -14.5q-45 -60 -60 -159.5t-15 -308.5q0 -208 15 -307.5t60 -160.5q6 -8 15 -15t20.5 -14t17.5 -12q44 -33 239.5 -49t470.5 -16q610 0 697 65q5 4 17 11t20.5 14
-t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z" />
-    <glyph glyph-name="_491" unicode="&#xf20b;" 
-d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5
-t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="_492" unicode="&#xf20c;" 
-d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55
+t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z"/>
+			<glyph glyph-name="_491" unicode="&#xf20b;"
+				   d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5
+t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z"/>
+			<glyph glyph-name="_492" unicode="&#xf20c;"
+				   d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55
 q22 0 22 22v230q0 24 13.5 38t38.5 14h94q24 0 38 -14t14 -38v-230q0 -22 21 -22h54q22 0 22 22v230q0 24 14 38t38 14h97q24 0 37.5 -14t13.5 -38v-230q0 -22 22 -22h55q21 0 21 22zM1410 560v154q0 53 -33 85.5t-86 32.5h-264q-53 0 -86 -32.5t-33 -85.5v-410
-q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z" />
-    <glyph glyph-name="_493" unicode="&#xf20d;" 
-d="M915 450h-294l147 551zM1001 128h311l-324 1024h-440l-324 -1024h311l383 314zM1536 1120v-960q0 -118 -85 -203t-203 -85h-960q-118 0 -203 85t-85 203v960q0 118 85 203t203 85h960q118 0 203 -85t85 -203z" />
-    <glyph glyph-name="_494" unicode="&#xf20e;" horiz-adv-x="2048" 
-d="M2048 641q0 -21 -13 -36.5t-33 -19.5l-205 -356q3 -9 3 -18q0 -20 -12.5 -35.5t-32.5 -19.5l-193 -337q3 -8 3 -16q0 -23 -16.5 -40t-40.5 -17q-25 0 -41 18h-400q-17 -20 -43 -20t-43 20h-399q-17 -20 -43 -20q-23 0 -40 16.5t-17 40.5q0 8 4 20l-193 335
+q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z"/>
+			<glyph glyph-name="_493" unicode="&#xf20d;"
+				   d="M915 450h-294l147 551zM1001 128h311l-324 1024h-440l-324 -1024h311l383 314zM1536 1120v-960q0 -118 -85 -203t-203 -85h-960q-118 0 -203 85t-85 203v960q0 118 85 203t203 85h960q118 0 203 -85t85 -203z"/>
+			<glyph glyph-name="_494" unicode="&#xf20e;" horiz-adv-x="2048"
+				   d="M2048 641q0 -21 -13 -36.5t-33 -19.5l-205 -356q3 -9 3 -18q0 -20 -12.5 -35.5t-32.5 -19.5l-193 -337q3 -8 3 -16q0 -23 -16.5 -40t-40.5 -17q-25 0 -41 18h-400q-17 -20 -43 -20t-43 20h-399q-17 -20 -43 -20q-23 0 -40 16.5t-17 40.5q0 8 4 20l-193 335
 q-20 4 -32.5 19.5t-12.5 35.5q0 9 3 18l-206 356q-20 5 -32.5 20.5t-12.5 35.5q0 21 13.5 36.5t33.5 19.5l199 344q0 1 -0.5 3t-0.5 3q0 36 34 51l209 363q-4 10 -4 18q0 24 17 40.5t40 16.5q26 0 44 -21h396q16 21 43 21t43 -21h398q18 21 44 21q23 0 40 -16.5t17 -40.5
 q0 -6 -4 -18l207 -358q23 -1 39 -17.5t16 -38.5q0 -13 -7 -27l187 -324q19 -4 31.5 -19.5t12.5 -35.5zM1063 -158h389l-342 354h-143l-342 -354h360q18 16 39 16t39 -16zM112 654q1 -4 1 -13q0 -10 -2 -15l208 -360l15 -6l188 199v347l-187 194q-13 -8 -29 -10zM986 1438
 h-388l190 -200l554 200h-280q-16 -16 -38 -16t-38 16zM1689 226q1 6 5 11l-64 68l-17 -79h76zM1583 226l22 105l-252 266l-296 -307l63 -64h463zM1495 -142l16 28l65 310h-427l333 -343q8 4 13 5zM578 -158h5l342 354h-373v-335l4 -6q14 -5 22 -13zM552 226h402l64 66
 l-309 321l-157 -166v-221zM359 226h163v189l-168 -177q4 -8 5 -12zM358 1051q0 -1 0.5 -2t0.5 -2q0 -16 -8 -29l171 -177v269zM552 1121v-311l153 -157l297 314l-223 236zM556 1425l-4 -8v-264l205 74l-191 201q-6 -2 -10 -3zM1447 1438h-16l-621 -224l213 -225zM1023 946
 l-297 -315l311 -319l296 307zM688 634l-136 141v-284zM1038 270l-42 -44h85zM1374 618l238 -251l132 624l-3 5l-1 1zM1718 1018q-8 13 -8 29v2l-216 376q-5 1 -13 5l-437 -463l310 -327zM522 1142v223l-163 -282zM522 196h-163l163 -283v283zM1607 196l-48 -227l130 227h-82
-zM1729 266l207 361q-2 10 -2 14q0 1 3 16l-171 296l-129 -612l77 -82q5 3 15 7z" />
-    <glyph glyph-name="f210" unicode="&#xf210;" 
-d="M0 856q0 131 91.5 226.5t222.5 95.5h742l352 358v-1470q0 -132 -91.5 -227t-222.5 -95h-780q-131 0 -222.5 95t-91.5 227v790zM1232 102l-176 180v425q0 46 -32 79t-78 33h-484q-46 0 -78 -33t-32 -79v-492q0 -46 32.5 -79.5t77.5 -33.5h770z" />
-    <glyph glyph-name="_496" unicode="&#xf211;" 
-d="M934 1386q-317 -121 -556 -362.5t-358 -560.5q-20 89 -20 176q0 208 102.5 384.5t278.5 279t384 102.5q82 0 169 -19zM1203 1267q93 -65 164 -155q-389 -113 -674.5 -400.5t-396.5 -676.5q-93 72 -155 162q112 386 395 671t667 399zM470 -67q115 356 379.5 622t619.5 384
-q40 -92 54 -195q-292 -120 -516 -345t-343 -518q-103 14 -194 52zM1536 -125q-193 50 -367 115q-135 -84 -290 -107q109 205 274 370.5t369 275.5q-21 -152 -101 -284q65 -175 115 -370z" />
-    <glyph glyph-name="f212" unicode="&#xf212;" horiz-adv-x="2048" 
-d="M1893 1144l155 -1272q-131 0 -257 57q-200 91 -393 91q-226 0 -374 -148q-148 148 -374 148q-193 0 -393 -91q-128 -57 -252 -57h-5l155 1272q224 127 482 127q233 0 387 -106q154 106 387 106q258 0 482 -127zM1398 157q129 0 232 -28.5t260 -93.5l-124 1021
+zM1729 266l207 361q-2 10 -2 14q0 1 3 16l-171 296l-129 -612l77 -82q5 3 15 7z"/>
+			<glyph glyph-name="f210" unicode="&#xf210;"
+				   d="M0 856q0 131 91.5 226.5t222.5 95.5h742l352 358v-1470q0 -132 -91.5 -227t-222.5 -95h-780q-131 0 -222.5 95t-91.5 227v790zM1232 102l-176 180v425q0 46 -32 79t-78 33h-484q-46 0 -78 -33t-32 -79v-492q0 -46 32.5 -79.5t77.5 -33.5h770z"/>
+			<glyph glyph-name="_496" unicode="&#xf211;"
+				   d="M934 1386q-317 -121 -556 -362.5t-358 -560.5q-20 89 -20 176q0 208 102.5 384.5t278.5 279t384 102.5q82 0 169 -19zM1203 1267q93 -65 164 -155q-389 -113 -674.5 -400.5t-396.5 -676.5q-93 72 -155 162q112 386 395 671t667 399zM470 -67q115 356 379.5 622t619.5 384
+q40 -92 54 -195q-292 -120 -516 -345t-343 -518q-103 14 -194 52zM1536 -125q-193 50 -367 115q-135 -84 -290 -107q109 205 274 370.5t369 275.5q-21 -152 -101 -284q65 -175 115 -370z"/>
+			<glyph glyph-name="f212" unicode="&#xf212;" horiz-adv-x="2048"
+				   d="M1893 1144l155 -1272q-131 0 -257 57q-200 91 -393 91q-226 0 -374 -148q-148 148 -374 148q-193 0 -393 -91q-128 -57 -252 -57h-5l155 1272q224 127 482 127q233 0 387 -106q154 106 387 106q258 0 482 -127zM1398 157q129 0 232 -28.5t260 -93.5l-124 1021
 q-171 78 -368 78q-224 0 -374 -141q-150 141 -374 141q-197 0 -368 -78l-124 -1021q105 43 165.5 65t148.5 39.5t178 17.5q202 0 374 -108q172 108 374 108zM1438 191l-55 907q-211 -4 -359 -155q-152 155 -374 155q-176 0 -336 -66l-114 -941q124 51 228.5 76t221.5 25
-q209 0 374 -102q172 107 374 102z" />
-    <glyph glyph-name="_498" unicode="&#xf213;" horiz-adv-x="2048" 
-d="M1500 165v733q0 21 -15 36t-35 15h-93q-20 0 -35 -15t-15 -36v-733q0 -20 15 -35t35 -15h93q20 0 35 15t15 35zM1216 165v531q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-531q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM924 165v429q0 20 -15 35t-35 15h-101
+q209 0 374 -102q172 107 374 102z"/>
+			<glyph glyph-name="_498" unicode="&#xf213;" horiz-adv-x="2048"
+				   d="M1500 165v733q0 21 -15 36t-35 15h-93q-20 0 -35 -15t-15 -36v-733q0 -20 15 -35t35 -15h93q20 0 35 15t15 35zM1216 165v531q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-531q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM924 165v429q0 20 -15 35t-35 15h-101
 q-20 0 -35 -15t-15 -35v-429q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM632 165v362q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-362q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM2048 311q0 -166 -118 -284t-284 -118h-1244q-166 0 -284 118t-118 284
-q0 116 63 214.5t168 148.5q-10 34 -10 73q0 113 80.5 193.5t193.5 80.5q102 0 180 -67q45 183 194 300t338 117q149 0 275 -73.5t199.5 -199.5t73.5 -275q0 -66 -14 -122q135 -33 221 -142.5t86 -247.5z" />
-    <glyph glyph-name="_499" unicode="&#xf214;" 
-d="M0 1536h1536v-1392l-776 -338l-760 338v1392zM1436 209v926h-1336v-926l661 -294zM1436 1235v201h-1336v-201h1336zM181 937v-115h-37v115h37zM181 789v-115h-37v115h37zM181 641v-115h-37v115h37zM181 493v-115h-37v115h37zM181 345v-115h-37v115h37zM207 202l15 34
+q0 116 63 214.5t168 148.5q-10 34 -10 73q0 113 80.5 193.5t193.5 80.5q102 0 180 -67q45 183 194 300t338 117q149 0 275 -73.5t199.5 -199.5t73.5 -275q0 -66 -14 -122q135 -33 221 -142.5t86 -247.5z"/>
+			<glyph glyph-name="_499" unicode="&#xf214;"
+				   d="M0 1536h1536v-1392l-776 -338l-760 338v1392zM1436 209v926h-1336v-926l661 -294zM1436 1235v201h-1336v-201h1336zM181 937v-115h-37v115h37zM181 789v-115h-37v115h37zM181 641v-115h-37v115h37zM181 493v-115h-37v115h37zM181 345v-115h-37v115h37zM207 202l15 34
 l105 -47l-15 -33zM343 142l15 34l105 -46l-15 -34zM478 82l15 34l105 -46l-15 -34zM614 23l15 33l104 -46l-15 -34zM797 10l105 46l15 -33l-105 -47zM932 70l105 46l15 -34l-105 -46zM1068 130l105 46l15 -34l-105 -46zM1203 189l105 47l15 -34l-105 -46zM259 1389v-36h-114
 v36h114zM421 1389v-36h-115v36h115zM583 1389v-36h-115v36h115zM744 1389v-36h-114v36h114zM906 1389v-36h-114v36h114zM1068 1389v-36h-115v36h115zM1230 1389v-36h-115v36h115zM1391 1389v-36h-114v36h114zM181 1049v-79h-37v115h115v-36h-78zM421 1085v-36h-115v36h115z
 M583 1085v-36h-115v36h115zM744 1085v-36h-114v36h114zM906 1085v-36h-114v36h114zM1068 1085v-36h-115v36h115zM1230 1085v-36h-115v36h115zM1355 970v79h-78v36h115v-115h-37zM1355 822v115h37v-115h-37zM1355 674v115h37v-115h-37zM1355 526v115h37v-115h-37zM1355 378
 v115h37v-115h-37zM1355 230v115h37v-115h-37zM760 265q-129 0 -221 91.5t-92 221.5q0 129 92 221t221 92q130 0 221.5 -92t91.5 -221q0 -130 -91.5 -221.5t-221.5 -91.5zM595 646q0 -36 19.5 -56.5t49.5 -25t64 -7t64 -2t49.5 -9t19.5 -30.5q0 -49 -112 -49q-97 0 -123 51
 h-3l-31 -63q67 -42 162 -42q29 0 56.5 5t55.5 16t45.5 33t17.5 53q0 46 -27.5 69.5t-67.5 27t-79.5 3t-67 5t-27.5 25.5q0 21 20.5 33t40.5 15t41 3q34 0 70.5 -11t51.5 -34h3l30 58q-3 1 -21 8.5t-22.5 9t-19.5 7t-22 7t-20 4.5t-24 4t-23 1q-29 0 -56.5 -5t-54 -16.5
-t-43 -34t-16.5 -53.5z" />
-    <glyph glyph-name="_500" unicode="&#xf215;" horiz-adv-x="2048" 
-d="M863 504q0 112 -79.5 191.5t-191.5 79.5t-191 -79.5t-79 -191.5t79 -191t191 -79t191.5 79t79.5 191zM1726 505q0 112 -79 191t-191 79t-191.5 -79t-79.5 -191q0 -113 79.5 -192t191.5 -79t191 79.5t79 191.5zM2048 1314v-1348q0 -44 -31.5 -75.5t-76.5 -31.5h-1832
-q-45 0 -76.5 31.5t-31.5 75.5v1348q0 44 31.5 75.5t76.5 31.5h431q44 0 76 -31.5t32 -75.5v-161h754v161q0 44 32 75.5t76 31.5h431q45 0 76.5 -31.5t31.5 -75.5z" />
-    <glyph glyph-name="_501" unicode="&#xf216;" horiz-adv-x="2048" 
-d="M1430 953zM1690 749q148 0 253 -98.5t105 -244.5q0 -157 -109 -261.5t-267 -104.5q-85 0 -162 27.5t-138 73.5t-118 106t-109 126t-103.5 132.5t-108.5 126.5t-117 106t-136 73.5t-159 27.5q-154 0 -251.5 -91.5t-97.5 -244.5q0 -157 104 -250t263 -93q100 0 208 37.5
+t-43 -34t-16.5 -53.5z"/>
+			<glyph glyph-name="_500" unicode="&#xf215;" horiz-adv-x="2048"
+				   d="M863 504q0 112 -79.5 191.5t-191.5 79.5t-191 -79.5t-79 -191.5t79 -191t191 -79t191.5 79t79.5 191zM1726 505q0 112 -79 191t-191 79t-191.5 -79t-79.5 -191q0 -113 79.5 -192t191.5 -79t191 79.5t79 191.5zM2048 1314v-1348q0 -44 -31.5 -75.5t-76.5 -31.5h-1832
+q-45 0 -76.5 31.5t-31.5 75.5v1348q0 44 31.5 75.5t76.5 31.5h431q44 0 76 -31.5t32 -75.5v-161h754v161q0 44 32 75.5t76 31.5h431q45 0 76.5 -31.5t31.5 -75.5z"/>
+			<glyph glyph-name="_501" unicode="&#xf216;" horiz-adv-x="2048"
+				   d="M1430 953zM1690 749q148 0 253 -98.5t105 -244.5q0 -157 -109 -261.5t-267 -104.5q-85 0 -162 27.5t-138 73.5t-118 106t-109 126t-103.5 132.5t-108.5 126.5t-117 106t-136 73.5t-159 27.5q-154 0 -251.5 -91.5t-97.5 -244.5q0 -157 104 -250t263 -93q100 0 208 37.5
 t193 98.5q5 4 21 18.5t30 24t22 9.5q14 0 24.5 -10.5t10.5 -24.5q0 -24 -60 -77q-101 -88 -234.5 -142t-260.5 -54q-133 0 -245.5 58t-180 165t-67.5 241q0 205 141.5 341t347.5 136q120 0 226.5 -43.5t185.5 -113t151.5 -153t139 -167.5t133.5 -153.5t149.5 -113
 t172.5 -43.5q102 0 168.5 61.5t66.5 162.5q0 95 -64.5 159t-159.5 64q-30 0 -81.5 -18.5t-68.5 -18.5q-20 0 -35.5 15t-15.5 35q0 18 8.5 57t8.5 59q0 159 -107.5 263t-266.5 104q-58 0 -111.5 -18.5t-84 -40.5t-55.5 -40.5t-33 -18.5q-15 0 -25.5 10.5t-10.5 25.5
-q0 19 25 46q59 67 147 103.5t182 36.5q191 0 318 -125.5t127 -315.5q0 -37 -4 -66q57 15 115 15z" />
-    <glyph glyph-name="_502" unicode="&#xf217;" horiz-adv-x="1664" 
-d="M1216 832q0 26 -19 45t-45 19h-128v128q0 26 -19 45t-45 19t-45 -19t-19 -45v-128h-128q-26 0 -45 -19t-19 -45t19 -45t45 -19h128v-128q0 -26 19 -45t45 -19t45 19t19 45v128h128q26 0 45 19t19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+q0 19 25 46q59 67 147 103.5t182 36.5q191 0 318 -125.5t127 -315.5q0 -37 -4 -66q57 15 115 15z"/>
+			<glyph glyph-name="_502" unicode="&#xf217;" horiz-adv-x="1664"
+				   d="M1216 832q0 26 -19 45t-45 19h-128v128q0 26 -19 45t-45 19t-45 -19t-19 -45v-128h-128q-26 0 -45 -19t-19 -45t19 -45t45 -19h128v-128q0 -26 19 -45t45 -19t45 19t19 45v128h128q26 0 45 19t19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920
-q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="_503" unicode="&#xf218;" horiz-adv-x="1664" 
-d="M1280 832q0 26 -19 45t-45 19t-45 -19l-147 -146v293q0 26 -19 45t-45 19t-45 -19t-19 -45v-293l-147 146q-19 19 -45 19t-45 -19t-19 -45t19 -45l256 -256q19 -19 45 -19t45 19l256 256q19 19 19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="_503" unicode="&#xf218;" horiz-adv-x="1664"
+				   d="M1280 832q0 26 -19 45t-45 19t-45 -19l-147 -146v293q0 26 -19 45t-45 19t-45 -19t-19 -45v-293l-147 146q-19 19 -45 19t-45 -19t-19 -45t19 -45l256 -256q19 -19 45 -19t45 19l256 256q19 19 19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920
-q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="_504" unicode="&#xf219;" horiz-adv-x="2048" 
-d="M212 768l623 -665l-300 665h-323zM1024 -4l349 772h-698zM538 896l204 384h-262l-288 -384h346zM1213 103l623 665h-323zM683 896h682l-204 384h-274zM1510 896h346l-288 384h-262zM1651 1382l384 -512q14 -18 13 -41.5t-17 -40.5l-960 -1024q-18 -20 -47 -20t-47 20
-l-960 1024q-16 17 -17 40.5t13 41.5l384 512q18 26 51 26h1152q33 0 51 -26z" />
-    <glyph glyph-name="_505" unicode="&#xf21a;" horiz-adv-x="2048" 
-d="M1811 -19q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83
+q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="_504" unicode="&#xf219;" horiz-adv-x="2048"
+				   d="M212 768l623 -665l-300 665h-323zM1024 -4l349 772h-698zM538 896l204 384h-262l-288 -384h346zM1213 103l623 665h-323zM683 896h682l-204 384h-274zM1510 896h346l-288 384h-262zM1651 1382l384 -512q14 -18 13 -41.5t-17 -40.5l-960 -1024q-18 -20 -47 -20t-47 20
+l-960 1024q-16 17 -17 40.5t13 41.5l384 512q18 26 51 26h1152q33 0 51 -26z"/>
+			<glyph glyph-name="_505" unicode="&#xf21a;" horiz-adv-x="2048"
+				   d="M1811 -19q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83
 q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83
 q19 19 45 19t45 -19l83 -83zM237 19q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -82l83 82q19 19 45 19t45 -19l83 -82l64 64v293l-210 314q-17 26 -7 56.5t40 40.5l177 58v299h128v128h256v128h256v-128h256v-128h128v-299l177 -58q30 -10 40 -40.5t-7 -56.5l-210 -314
 v-293l19 18q19 19 45 19t45 -19l83 -82l83 82q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83
-q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83zM640 1152v-128l384 128l384 -128v128h-128v128h-512v-128h-128z" />
-    <glyph glyph-name="_506" unicode="&#xf21b;" 
-d="M576 0l96 448l-96 128l-128 64zM832 0l128 640l-128 -64l-96 -128zM992 1010q-2 4 -4 6q-10 8 -96 8q-70 0 -167 -19q-7 -2 -21 -2t-21 2q-97 19 -167 19q-86 0 -96 -8q-2 -2 -4 -6q2 -18 4 -27q2 -3 7.5 -6.5t7.5 -10.5q2 -4 7.5 -20.5t7 -20.5t7.5 -17t8.5 -17t9 -14
+q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83zM640 1152v-128l384 128l384 -128v128h-128v128h-512v-128h-128z"/>
+			<glyph glyph-name="_506" unicode="&#xf21b;"
+				   d="M576 0l96 448l-96 128l-128 64zM832 0l128 640l-128 -64l-96 -128zM992 1010q-2 4 -4 6q-10 8 -96 8q-70 0 -167 -19q-7 -2 -21 -2t-21 2q-97 19 -167 19q-86 0 -96 -8q-2 -2 -4 -6q2 -18 4 -27q2 -3 7.5 -6.5t7.5 -10.5q2 -4 7.5 -20.5t7 -20.5t7.5 -17t8.5 -17t9 -14
 t12 -13.5t14 -9.5t17.5 -8t20.5 -4t24.5 -2q36 0 59 12.5t32.5 30t14.5 34.5t11.5 29.5t17.5 12.5h12q11 0 17.5 -12.5t11.5 -29.5t14.5 -34.5t32.5 -30t59 -12.5q13 0 24.5 2t20.5 4t17.5 8t14 9.5t12 13.5t9 14t8.5 17t7.5 17t7 20.5t7.5 20.5q2 7 7.5 10.5t7.5 6.5
 q2 9 4 27zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 61 4.5 118t19 125.5t37.5 123.5t63.5 103.5t93.5 74.5l-90 220h214q-22 64 -22 128q0 12 2 32q-194 40 -194 96q0 57 210 99q17 62 51.5 134t70.5 114q32 37 76 37q30 0 84 -31t84 -31t84 31
-t84 31q44 0 76 -37q36 -42 70.5 -114t51.5 -134q210 -42 210 -99q0 -56 -194 -96q7 -81 -20 -160h214l-82 -225q63 -33 107.5 -96.5t65.5 -143.5t29 -151.5t8 -148.5z" />
-    <glyph glyph-name="_507" unicode="&#xf21c;" horiz-adv-x="2304" 
-d="M2301 500q12 -103 -22 -198.5t-99 -163.5t-158.5 -106t-196.5 -31q-161 11 -279.5 125t-134.5 274q-12 111 27.5 210.5t118.5 170.5l-71 107q-96 -80 -151 -194t-55 -244q0 -27 -18.5 -46.5t-45.5 -19.5h-256h-69q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5
+t84 31q44 0 76 -37q36 -42 70.5 -114t51.5 -134q210 -42 210 -99q0 -56 -194 -96q7 -81 -20 -160h214l-82 -225q63 -33 107.5 -96.5t65.5 -143.5t29 -151.5t8 -148.5z"/>
+			<glyph glyph-name="_507" unicode="&#xf21c;" horiz-adv-x="2304"
+				   d="M2301 500q12 -103 -22 -198.5t-99 -163.5t-158.5 -106t-196.5 -31q-161 11 -279.5 125t-134.5 274q-12 111 27.5 210.5t118.5 170.5l-71 107q-96 -80 -151 -194t-55 -244q0 -27 -18.5 -46.5t-45.5 -19.5h-256h-69q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5
 t-131.5 316.5t131.5 316.5t316.5 131.5q76 0 152 -27l24 45q-123 110 -304 110h-64q-26 0 -45 19t-19 45t19 45t45 19h128q78 0 145 -13.5t116.5 -38.5t71.5 -39.5t51 -36.5h512h115l-85 128h-222q-30 0 -49 22.5t-14 52.5q4 23 23 38t43 15h253q33 0 53 -28l70 -105
 l114 114q19 19 46 19h101q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-179l115 -172q131 63 275 36q143 -26 244 -134.5t118 -253.5zM448 128q115 0 203 72.5t111 183.5h-314q-35 0 -55 31q-18 32 -1 63l147 277q-47 13 -91 13q-132 0 -226 -94t-94 -226t94 -226
-t226 -94zM1856 128q132 0 226 94t94 226t-94 226t-226 94q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94z" />
-    <glyph glyph-name="_508" unicode="&#xf21d;" 
-d="M1408 0q0 -63 -61.5 -113.5t-164 -81t-225 -46t-253.5 -15.5t-253.5 15.5t-225 46t-164 81t-61.5 113.5q0 49 33 88.5t91 66.5t118 44.5t131 29.5q26 5 48 -10.5t26 -41.5q5 -26 -10.5 -48t-41.5 -26q-58 -10 -106 -23.5t-76.5 -25.5t-48.5 -23.5t-27.5 -19.5t-8.5 -12
+t226 -94zM1856 128q132 0 226 94t94 226t-94 226t-226 94q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94z"/>
+			<glyph glyph-name="_508" unicode="&#xf21d;"
+				   d="M1408 0q0 -63 -61.5 -113.5t-164 -81t-225 -46t-253.5 -15.5t-253.5 15.5t-225 46t-164 81t-61.5 113.5q0 49 33 88.5t91 66.5t118 44.5t131 29.5q26 5 48 -10.5t26 -41.5q5 -26 -10.5 -48t-41.5 -26q-58 -10 -106 -23.5t-76.5 -25.5t-48.5 -23.5t-27.5 -19.5t-8.5 -12
 q3 -11 27 -26.5t73 -33t114 -32.5t160.5 -25t201.5 -10t201.5 10t160.5 25t114 33t73 33.5t27 27.5q-1 4 -8.5 11t-27.5 19t-48.5 23.5t-76.5 25t-106 23.5q-26 4 -41.5 26t-10.5 48q4 26 26 41.5t48 10.5q71 -12 131 -29.5t118 -44.5t91 -66.5t33 -88.5zM1024 896v-384
 q0 -26 -19 -45t-45 -19h-64v-384q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v384h-64q-26 0 -45 19t-19 45v384q0 53 37.5 90.5t90.5 37.5h384q53 0 90.5 -37.5t37.5 -90.5zM928 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5
-t158.5 -65.5t65.5 -158.5z" />
-    <glyph glyph-name="_509" unicode="&#xf21e;" horiz-adv-x="1792" 
-d="M1280 512h305q-5 -6 -10 -10.5t-9 -7.5l-3 -4l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-5 2 -21 20h369q22 0 39.5 13.5t22.5 34.5l70 281l190 -667q6 -20 23 -33t39 -13q21 0 38 13t23 33l146 485l56 -112q18 -35 57 -35zM1792 940q0 -145 -103 -300h-369l-111 221
+t158.5 -65.5t65.5 -158.5z"/>
+			<glyph glyph-name="_509" unicode="&#xf21e;" horiz-adv-x="1792"
+				   d="M1280 512h305q-5 -6 -10 -10.5t-9 -7.5l-3 -4l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-5 2 -21 20h369q22 0 39.5 13.5t22.5 34.5l70 281l190 -667q6 -20 23 -33t39 -13q21 0 38 13t23 33l146 485l56 -112q18 -35 57 -35zM1792 940q0 -145 -103 -300h-369l-111 221
 q-8 17 -25.5 27t-36.5 8q-45 -5 -56 -46l-129 -430l-196 686q-6 20 -23.5 33t-39.5 13t-39 -13.5t-22 -34.5l-116 -464h-423q-103 155 -103 300q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124
-t127 -344z" />
-    <glyph glyph-name="venus" unicode="&#xf221;" horiz-adv-x="1280" 
-d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292
-q11 134 80.5 249t182 188t245.5 88q170 19 319 -54t236 -212t87 -306zM128 960q0 -185 131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5z" />
-    <glyph glyph-name="_511" unicode="&#xf222;" 
-d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-382 -383q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5
-q203 0 359 -126l382 382h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_512" unicode="&#xf223;" horiz-adv-x="1280" 
-d="M830 1220q145 -72 233.5 -210.5t88.5 -305.5q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5
+t127 -344z"/>
+			<glyph glyph-name="venus" unicode="&#xf221;" horiz-adv-x="1280"
+				   d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292
+q11 134 80.5 249t182 188t245.5 88q170 19 319 -54t236 -212t87 -306zM128 960q0 -185 131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5z"/>
+			<glyph glyph-name="_511" unicode="&#xf222;"
+				   d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-382 -383q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5
+q203 0 359 -126l382 382h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z"/>
+			<glyph glyph-name="_512" unicode="&#xf223;" horiz-adv-x="1280"
+				   d="M830 1220q145 -72 233.5 -210.5t88.5 -305.5q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5
 t-147.5 384.5q0 167 88.5 305.5t233.5 210.5q-165 96 -228 273q-6 16 3.5 29.5t26.5 13.5h69q21 0 29 -20q44 -106 140 -171t214 -65t214 65t140 171q8 20 37 20h61q17 0 26.5 -13.5t3.5 -29.5q-63 -177 -228 -273zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
-t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_513" unicode="&#xf224;" 
-d="M1024 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z"/>
+			<glyph glyph-name="_513" unicode="&#xf224;"
+				   d="M1024 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
 q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-149 16 -270.5 103t-186.5 223.5t-53 291.5q16 204 160 353.5t347 172.5q118 14 228 -19t198 -103l255 254h-134q-14 0 -23 9t-9 23v64zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
-t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_514" unicode="&#xf225;" horiz-adv-x="1792" 
-d="M1280 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z"/>
+			<glyph glyph-name="_514" unicode="&#xf225;" horiz-adv-x="1792"
+				   d="M1280 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
 q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5t-147.5 384.5q0 201 126 359l-52 53l-101 -111q-9 -10 -22 -10.5t-23 7.5l-48 44q-10 8 -10.5 21.5t8.5 23.5l105 115l-111 112v-134q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9
 t-9 23v288q0 26 19 45t45 19h288q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-133l106 -107l86 94q9 10 22 10.5t23 -7.5l48 -44q10 -8 10.5 -21.5t-8.5 -23.5l-90 -99l57 -56q158 126 359 126t359 -126l255 254h-134q-14 0 -23 9t-9 23v64zM832 256q185 0 316.5 131.5
-t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_515" unicode="&#xf226;" horiz-adv-x="1792" 
-d="M1790 1007q12 -155 -52.5 -292t-186 -224t-271.5 -103v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-512v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23
+t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z"/>
+			<glyph glyph-name="_515" unicode="&#xf226;" horiz-adv-x="1792"
+				   d="M1790 1007q12 -155 -52.5 -292t-186 -224t-271.5 -103v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-512v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23
 t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292q17 206 164.5 356.5t352.5 169.5q206 21 377 -94q171 115 377 94q205 -19 352.5 -169.5t164.5 -356.5zM896 647q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM576 512q115 0 218 57q-154 165 -154 391
 q0 224 154 391q-103 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5zM1152 128v260q-137 15 -256 94q-119 -79 -256 -94v-260h512zM1216 512q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5q-115 0 -218 -57q154 -167 154 -391
-q0 -226 -154 -391q103 -57 218 -57z" />
-    <glyph glyph-name="_516" unicode="&#xf227;" horiz-adv-x="1920" 
-d="M1536 1120q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-31 -182 -166 -312t-318 -156q-210 -29 -384.5 80t-241.5 300q-117 6 -221 57.5t-177.5 133t-113.5 192.5t-32 230
+q0 -226 -154 -391q103 -57 218 -57z"/>
+			<glyph glyph-name="_516" unicode="&#xf227;" horiz-adv-x="1920"
+				   d="M1536 1120q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-31 -182 -166 -312t-318 -156q-210 -29 -384.5 80t-241.5 300q-117 6 -221 57.5t-177.5 133t-113.5 192.5t-32 230
 q9 135 78 252t182 191.5t248 89.5q118 14 227.5 -19t198.5 -103l255 254h-134q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q59 -74 93 -169q182 -9 328 -124l255 254h-134q-14 0 -23 9
 t-9 23v64zM1024 704q0 20 -4 58q-162 -25 -271 -150t-109 -292q0 -20 4 -58q162 25 271 150t109 292zM128 704q0 -168 111 -294t276 -149q-3 29 -3 59q0 210 135 369.5t338 196.5q-53 120 -163.5 193t-245.5 73q-185 0 -316.5 -131.5t-131.5 -316.5zM1088 -128
-q185 0 316.5 131.5t131.5 316.5q0 168 -111 294t-276 149q3 -28 3 -59q0 -210 -135 -369.5t-338 -196.5q53 -120 163.5 -193t245.5 -73z" />
-    <glyph glyph-name="_517" unicode="&#xf228;" horiz-adv-x="2048" 
-d="M1664 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-32 -180 -164.5 -310t-313.5 -157q-223 -34 -409 90q-117 -78 -256 -93v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23
+q185 0 316.5 131.5t131.5 316.5q0 168 -111 294t-276 149q3 -28 3 -59q0 -210 -135 -369.5t-338 -196.5q53 -120 163.5 -193t245.5 -73z"/>
+			<glyph glyph-name="_517" unicode="&#xf228;" horiz-adv-x="2048"
+				   d="M1664 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-32 -180 -164.5 -310t-313.5 -157q-223 -34 -409 90q-117 -78 -256 -93v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23
 t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-155 17 -279.5 109.5t-187 237.5t-39.5 307q25 187 159.5 322.5t320.5 164.5q224 34 410 -90q146 97 320 97q201 0 359 -126l255 254h-134q-14 0 -23 9
 t-9 23v64zM896 391q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM128 704q0 -185 131.5 -316.5t316.5 -131.5q117 0 218 57q-154 167 -154 391t154 391q-101 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5zM1216 256q185 0 316.5 131.5t131.5 316.5
-t-131.5 316.5t-316.5 131.5q-117 0 -218 -57q154 -167 154 -391t-154 -391q101 -57 218 -57z" />
-    <glyph glyph-name="_518" unicode="&#xf229;" 
-d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-213 -214l140 -140q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-140 141l-78 -79q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5
+t-131.5 316.5t-316.5 131.5q-117 0 -218 -57q154 -167 154 -391t-154 -391q101 -57 218 -57z"/>
+			<glyph glyph-name="_518" unicode="&#xf229;"
+				   d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-213 -214l140 -140q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-140 141l-78 -79q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5
 t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5q203 0 359 -126l78 78l-172 172q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l172 -172l213 213h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
-t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_519" unicode="&#xf22a;" horiz-adv-x="1280" 
-d="M640 892q217 -24 364.5 -187.5t147.5 -384.5q0 -167 -87 -306t-236 -212t-319 -54q-133 15 -245.5 88t-182 188t-80.5 249q-12 155 52.5 292t186 224t271.5 103v132h-160q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h160v165l-92 -92q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z"/>
+			<glyph glyph-name="_519" unicode="&#xf22a;" horiz-adv-x="1280"
+				   d="M640 892q217 -24 364.5 -187.5t147.5 -384.5q0 -167 -87 -306t-236 -212t-319 -54q-133 15 -245.5 88t-182 188t-80.5 249q-12 155 52.5 292t186 224t271.5 103v132h-160q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h160v165l-92 -92q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22
 t9 23l202 201q19 19 45 19t45 -19l202 -201q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-92 92v-165h160q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-160v-132zM576 -128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5
-t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_520" unicode="&#xf22b;" horiz-adv-x="2048" 
-d="M1901 621q19 -19 19 -45t-19 -45l-294 -294q-9 -10 -22.5 -10t-22.5 10l-45 45q-10 9 -10 22.5t10 22.5l185 185h-294v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-132q-24 -217 -187.5 -364.5t-384.5 -147.5q-167 0 -306 87t-212 236t-54 319q15 133 88 245.5
+t131.5 -316.5t316.5 -131.5z"/>
+			<glyph glyph-name="_520" unicode="&#xf22b;" horiz-adv-x="2048"
+				   d="M1901 621q19 -19 19 -45t-19 -45l-294 -294q-9 -10 -22.5 -10t-22.5 10l-45 45q-10 9 -10 22.5t10 22.5l185 185h-294v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-132q-24 -217 -187.5 -364.5t-384.5 -147.5q-167 0 -306 87t-212 236t-54 319q15 133 88 245.5
 t188 182t249 80.5q155 12 292 -52.5t224 -186t103 -271.5h132v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h294l-185 185q-10 9 -10 22.5t10 22.5l45 45q9 10 22.5 10t22.5 -10zM576 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5
-t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_521" unicode="&#xf22c;" horiz-adv-x="1280" 
-d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-612q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v612q-217 24 -364.5 187.5t-147.5 384.5q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM576 512q185 0 316.5 131.5
-t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-    <glyph glyph-name="_522" unicode="&#xf22d;" horiz-adv-x="1280" 
-d="M1024 576q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1152 576q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123
-t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5z" />
-    <glyph glyph-name="_523" unicode="&#xf22e;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="_524" unicode="&#xf22f;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="_525" unicode="&#xf230;" 
-d="M1451 1408q35 0 60 -25t25 -60v-1366q0 -35 -25 -60t-60 -25h-391v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-735q-35 0 -60 25t-25 60v1366q0 35 25 60t60 25h1366z" />
-    <glyph glyph-name="_526" unicode="&#xf231;" horiz-adv-x="1280" 
-d="M0 939q0 108 37.5 203.5t103.5 166.5t152 123t185 78t202 26q158 0 294 -66.5t221 -193.5t85 -287q0 -96 -19 -188t-60 -177t-100 -149.5t-145 -103t-189 -38.5q-68 0 -135 32t-96 88q-10 -39 -28 -112.5t-23.5 -95t-20.5 -71t-26 -71t-32 -62.5t-46 -77.5t-62 -86.5
+t-131.5 -316.5t131.5 -316.5t316.5 -131.5z"/>
+			<glyph glyph-name="_521" unicode="&#xf22c;" horiz-adv-x="1280"
+				   d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-612q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v612q-217 24 -364.5 187.5t-147.5 384.5q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM576 512q185 0 316.5 131.5
+t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z"/>
+			<glyph glyph-name="_522" unicode="&#xf22d;" horiz-adv-x="1280"
+				   d="M1024 576q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1152 576q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123
+t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5z"/>
+			<glyph glyph-name="_523" unicode="&#xf22e;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="_524" unicode="&#xf22f;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="_525" unicode="&#xf230;"
+				   d="M1451 1408q35 0 60 -25t25 -60v-1366q0 -35 -25 -60t-60 -25h-391v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-735q-35 0 -60 25t-25 60v1366q0 35 25 60t60 25h1366z"/>
+			<glyph glyph-name="_526" unicode="&#xf231;" horiz-adv-x="1280"
+				   d="M0 939q0 108 37.5 203.5t103.5 166.5t152 123t185 78t202 26q158 0 294 -66.5t221 -193.5t85 -287q0 -96 -19 -188t-60 -177t-100 -149.5t-145 -103t-189 -38.5q-68 0 -135 32t-96 88q-10 -39 -28 -112.5t-23.5 -95t-20.5 -71t-26 -71t-32 -62.5t-46 -77.5t-62 -86.5
 l-14 -5l-9 10q-15 157 -15 188q0 92 21.5 206.5t66.5 287.5t52 203q-32 65 -32 169q0 83 52 156t132 73q61 0 95 -40.5t34 -102.5q0 -66 -44 -191t-44 -187q0 -63 45 -104.5t109 -41.5q55 0 102 25t78.5 68t56 95t38 110.5t20 111t6.5 99.5q0 173 -109.5 269.5t-285.5 96.5
-q-200 0 -334 -129.5t-134 -328.5q0 -44 12.5 -85t27 -65t27 -45.5t12.5 -30.5q0 -28 -15 -73t-37 -45q-2 0 -17 3q-51 15 -90.5 56t-61 94.5t-32.5 108t-11 106.5z" />
-    <glyph glyph-name="_527" unicode="&#xf232;" 
-d="M985 562q13 0 97.5 -44t89.5 -53q2 -5 2 -15q0 -33 -17 -76q-16 -39 -71 -65.5t-102 -26.5q-57 0 -190 62q-98 45 -170 118t-148 185q-72 107 -71 194v8q3 91 74 158q24 22 52 22q6 0 18 -1.5t19 -1.5q19 0 26.5 -6.5t15.5 -27.5q8 -20 33 -88t25 -75q0 -21 -34.5 -57.5
+q-200 0 -334 -129.5t-134 -328.5q0 -44 12.5 -85t27 -65t27 -45.5t12.5 -30.5q0 -28 -15 -73t-37 -45q-2 0 -17 3q-51 15 -90.5 56t-61 94.5t-32.5 108t-11 106.5z"/>
+			<glyph glyph-name="_527" unicode="&#xf232;"
+				   d="M985 562q13 0 97.5 -44t89.5 -53q2 -5 2 -15q0 -33 -17 -76q-16 -39 -71 -65.5t-102 -26.5q-57 0 -190 62q-98 45 -170 118t-148 185q-72 107 -71 194v8q3 91 74 158q24 22 52 22q6 0 18 -1.5t19 -1.5q19 0 26.5 -6.5t15.5 -27.5q8 -20 33 -88t25 -75q0 -21 -34.5 -57.5
 t-34.5 -46.5q0 -7 5 -15q34 -73 102 -137q56 -53 151 -101q12 -7 22 -7q15 0 54 48.5t52 48.5zM782 32q127 0 243.5 50t200.5 134t134 200.5t50 243.5t-50 243.5t-134 200.5t-200.5 134t-243.5 50t-243.5 -50t-200.5 -134t-134 -200.5t-50 -243.5q0 -203 120 -368l-79 -233
-l242 77q158 -104 345 -104zM782 1414q153 0 292.5 -60t240.5 -161t161 -240.5t60 -292.5t-60 -292.5t-161 -240.5t-240.5 -161t-292.5 -60q-195 0 -365 94l-417 -134l136 405q-108 178 -108 389q0 153 60 292.5t161 240.5t240.5 161t292.5 60z" />
-    <glyph glyph-name="_528" unicode="&#xf233;" horiz-adv-x="1792" 
-d="M128 128h1024v128h-1024v-128zM128 640h1024v128h-1024v-128zM1696 192q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM128 1152h1024v128h-1024v-128zM1696 704q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1696 1216
-q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1792 384v-384h-1792v384h1792zM1792 896v-384h-1792v384h1792zM1792 1408v-384h-1792v384h1792z" />
-    <glyph glyph-name="_529" unicode="&#xf234;" horiz-adv-x="2048" 
-d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1664 512h352q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-352q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5
+l242 77q158 -104 345 -104zM782 1414q153 0 292.5 -60t240.5 -161t161 -240.5t60 -292.5t-60 -292.5t-161 -240.5t-240.5 -161t-292.5 -60q-195 0 -365 94l-417 -134l136 405q-108 178 -108 389q0 153 60 292.5t161 240.5t240.5 161t292.5 60z"/>
+			<glyph glyph-name="_528" unicode="&#xf233;" horiz-adv-x="1792"
+				   d="M128 128h1024v128h-1024v-128zM128 640h1024v128h-1024v-128zM1696 192q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM128 1152h1024v128h-1024v-128zM1696 704q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1696 1216
+q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1792 384v-384h-1792v384h1792zM1792 896v-384h-1792v384h1792zM1792 1408v-384h-1792v384h1792z"/>
+			<glyph glyph-name="_529" unicode="&#xf234;" horiz-adv-x="2048"
+				   d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1664 512h352q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-352q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5
 t-9.5 22.5v352h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v352q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5v-352zM928 288q0 -52 38 -90t90 -38h256v-238q-68 -50 -171 -50h-874q-121 0 -194 69t-73 190q0 53 3.5 103.5t14 109t26.5 108.5
-t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q79 -61 154.5 -91.5t164.5 -30.5t164.5 30.5t154.5 91.5q20 17 39 17q132 0 217 -96h-223q-52 0 -90 -38t-38 -90v-192z" />
-    <glyph glyph-name="_530" unicode="&#xf235;" horiz-adv-x="2048" 
-d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1781 320l249 -249q9 -9 9 -23q0 -13 -9 -22l-136 -136q-9 -9 -22 -9q-14 0 -23 9l-249 249l-249 -249q-9 -9 -23 -9q-13 0 -22 9l-136 136
+t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q79 -61 154.5 -91.5t164.5 -30.5t164.5 30.5t154.5 91.5q20 17 39 17q132 0 217 -96h-223q-52 0 -90 -38t-38 -90v-192z"/>
+			<glyph glyph-name="_530" unicode="&#xf235;" horiz-adv-x="2048"
+				   d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1781 320l249 -249q9 -9 9 -23q0 -13 -9 -22l-136 -136q-9 -9 -22 -9q-14 0 -23 9l-249 249l-249 -249q-9 -9 -23 -9q-13 0 -22 9l-136 136
 q-9 9 -9 22q0 14 9 23l249 249l-249 249q-9 9 -9 23q0 13 9 22l136 136q9 9 22 9q14 0 23 -9l249 -249l249 249q9 9 23 9q13 0 22 -9l136 -136q9 -9 9 -22q0 -14 -9 -23zM1283 320l-181 -181q-37 -37 -37 -91q0 -53 37 -90l83 -83q-21 -3 -44 -3h-874q-121 0 -194 69
-t-73 190q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q154 -122 319 -122t319 122q20 17 39 17q28 0 57 -6q-28 -27 -41 -50t-13 -56q0 -54 37 -91z" />
-    <glyph glyph-name="_531" unicode="&#xf236;" horiz-adv-x="2048" 
-d="M256 512h1728q26 0 45 -19t19 -45v-448h-256v256h-1536v-256h-256v1216q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-704zM832 832q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM2048 576v64q0 159 -112.5 271.5t-271.5 112.5h-704
-q-26 0 -45 -19t-19 -45v-384h1152z" />
-    <glyph glyph-name="_532" unicode="&#xf237;" 
-d="M1536 1536l-192 -448h192v-192h-274l-55 -128h329v-192h-411l-357 -832l-357 832h-411v192h329l-55 128h-274v192h192l-192 448h256l323 -768h378l323 768h256zM768 320l108 256h-216z" />
-    <glyph glyph-name="_533" unicode="&#xf238;" 
-d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM768 192q80 0 136 56t56 136t-56 136t-136 56
-t-136 -56t-56 -136t56 -136t136 -56zM1344 768v512h-1152v-512h1152z" />
-    <glyph glyph-name="_534" unicode="&#xf239;" 
-d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM288 224q66 0 113 47t47 113t-47 113t-113 47
-t-113 -47t-47 -113t47 -113t113 -47zM704 768v512h-544v-512h544zM1248 224q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM1408 768v512h-576v-512h576z" />
-    <glyph glyph-name="_535" unicode="&#xf23a;" horiz-adv-x="1792" 
-d="M597 1115v-1173q0 -25 -12.5 -42.5t-36.5 -17.5q-17 0 -33 8l-465 233q-21 10 -35.5 33.5t-14.5 46.5v1140q0 20 10 34t29 14q14 0 44 -15l511 -256q3 -3 3 -5zM661 1014l534 -866l-534 266v600zM1792 996v-1054q0 -25 -14 -40.5t-38 -15.5t-47 13l-441 220zM1789 1116
-q0 -3 -256.5 -419.5t-300.5 -487.5l-390 634l324 527q17 28 52 28q14 0 26 -6l541 -270q4 -2 4 -6z" />
-    <glyph glyph-name="_536" unicode="&#xf23b;" 
-d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1408v-1536h-1536v1536h1536z" />
-    <glyph glyph-name="_537" unicode="&#xf23c;" horiz-adv-x="2296" 
-d="M478 -139q-8 -16 -27 -34.5t-37 -25.5q-25 -9 -51.5 3.5t-28.5 31.5q-1 22 40 55t68 38q23 4 34 -21.5t2 -46.5zM1819 -139q7 -16 26 -34.5t38 -25.5q25 -9 51.5 3.5t27.5 31.5q2 22 -39.5 55t-68.5 38q-22 4 -33 -21.5t-2 -46.5zM1867 -30q13 -27 56.5 -59.5t77.5 -41.5
+t-73 190q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q154 -122 319 -122t319 122q20 17 39 17q28 0 57 -6q-28 -27 -41 -50t-13 -56q0 -54 37 -91z"/>
+			<glyph glyph-name="_531" unicode="&#xf236;" horiz-adv-x="2048"
+				   d="M256 512h1728q26 0 45 -19t19 -45v-448h-256v256h-1536v-256h-256v1216q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-704zM832 832q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM2048 576v64q0 159 -112.5 271.5t-271.5 112.5h-704
+q-26 0 -45 -19t-19 -45v-384h1152z"/>
+			<glyph glyph-name="_532" unicode="&#xf237;"
+				   d="M1536 1536l-192 -448h192v-192h-274l-55 -128h329v-192h-411l-357 -832l-357 832h-411v192h329l-55 128h-274v192h192l-192 448h256l323 -768h378l323 768h256zM768 320l108 256h-216z"/>
+			<glyph glyph-name="_533" unicode="&#xf238;"
+				   d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM768 192q80 0 136 56t56 136t-56 136t-136 56
+t-136 -56t-56 -136t56 -136t136 -56zM1344 768v512h-1152v-512h1152z"/>
+			<glyph glyph-name="_534" unicode="&#xf239;"
+				   d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM288 224q66 0 113 47t47 113t-47 113t-113 47
+t-113 -47t-47 -113t47 -113t113 -47zM704 768v512h-544v-512h544zM1248 224q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM1408 768v512h-576v-512h576z"/>
+			<glyph glyph-name="_535" unicode="&#xf23a;" horiz-adv-x="1792"
+				   d="M597 1115v-1173q0 -25 -12.5 -42.5t-36.5 -17.5q-17 0 -33 8l-465 233q-21 10 -35.5 33.5t-14.5 46.5v1140q0 20 10 34t29 14q14 0 44 -15l511 -256q3 -3 3 -5zM661 1014l534 -866l-534 266v600zM1792 996v-1054q0 -25 -14 -40.5t-38 -15.5t-47 13l-441 220zM1789 1116
+q0 -3 -256.5 -419.5t-300.5 -487.5l-390 634l324 527q17 28 52 28q14 0 26 -6l541 -270q4 -2 4 -6z"/>
+			<glyph glyph-name="_536" unicode="&#xf23b;"
+				   d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1408v-1536h-1536v1536h1536z"/>
+			<glyph glyph-name="_537" unicode="&#xf23c;" horiz-adv-x="2296"
+				   d="M478 -139q-8 -16 -27 -34.5t-37 -25.5q-25 -9 -51.5 3.5t-28.5 31.5q-1 22 40 55t68 38q23 4 34 -21.5t2 -46.5zM1819 -139q7 -16 26 -34.5t38 -25.5q25 -9 51.5 3.5t27.5 31.5q2 22 -39.5 55t-68.5 38q-22 4 -33 -21.5t-2 -46.5zM1867 -30q13 -27 56.5 -59.5t77.5 -41.5
 q45 -13 82 4.5t37 50.5q0 46 -67.5 100.5t-115.5 59.5q-40 5 -63.5 -37.5t-6.5 -76.5zM428 -30q-13 -27 -56 -59.5t-77 -41.5q-45 -13 -82 4.5t-37 50.5q0 46 67.5 100.5t115.5 59.5q40 5 63 -37.5t6 -76.5zM1158 1094h1q-41 0 -76 -15q27 -8 44 -30.5t17 -49.5
 q0 -35 -27 -60t-65 -25q-52 0 -80 43q-5 -23 -5 -42q0 -74 56 -126.5t135 -52.5q80 0 136 52.5t56 126.5t-56 126.5t-136 52.5zM1462 1312q-99 109 -220.5 131.5t-245.5 -44.5q27 60 82.5 96.5t118 39.5t121.5 -17t99.5 -74.5t44.5 -131.5zM2212 73q8 -11 -11 -42
 q7 -23 7 -40q1 -56 -44.5 -112.5t-109.5 -91.5t-118 -37q-48 -2 -92 21.5t-66 65.5q-687 -25 -1259 0q-23 -41 -66.5 -65t-92.5 -22q-86 3 -179.5 80.5t-92.5 160.5q2 22 7 40q-19 31 -11 42q6 10 31 1q14 22 41 51q-7 29 2 38q11 10 39 -4q29 20 59 34q0 29 13 37
@@ -1990,645 +1990,645 @@ q-69 -2 -136 -6zM591 510q3 -23 -34 -36q132 -141 271.5 -240t305.5 -154q172 49 310
 l-10 -2.5t-12 -2l-12 -1.5t-13.5 -1t-13.5 -0.5q-106 -9 -163 11q-4 -17 -10 -26.5t-21 -15t-23 -7t-36 -3.5q-6 -1 -9 -1q-179 -17 -203 40q-2 -63 -56 -54q-47 8 -91 54q-12 13 -20 26q-17 29 -26 65q-58 -6 -87 -10q1 -2 4 -10zM507 -118q3 14 3 30q-17 71 -51 130
 t-73 70q-41 12 -101.5 -14.5t-104.5 -80t-39 -107.5q35 -53 100 -93t119 -42q51 -2 94 28t53 79zM510 53q23 -63 27 -119q195 113 392 174q-98 52 -180.5 120t-179.5 165q-6 -4 -29 -13q0 -1 -1 -4t-1 -5q31 -18 22 -37q-12 -23 -56 -34q-10 -13 -29 -24h-1q-2 -83 1 -150
 q19 -34 35 -73zM579 -113q532 -21 1145 0q-254 147 -428 196q-76 -35 -156 -57q-8 -3 -16 0q-65 21 -129 49q-208 -60 -416 -188h-1v-1q1 0 1 1zM1763 -67q4 54 28 120q14 38 33 71l-1 -1q3 77 3 153q-15 8 -30 25q-42 9 -56 33q-9 20 22 38q-2 4 -2 9q-16 4 -28 12
-q-204 -190 -383 -284q198 -59 414 -176zM2155 -90q5 54 -39 107.5t-104 80t-102 14.5q-38 -11 -72.5 -70.5t-51.5 -129.5q0 -16 3 -30q10 -49 53 -79t94 -28q54 2 119 42t100 93z" />
-    <glyph glyph-name="_538" unicode="&#xf23d;" horiz-adv-x="2304" 
-d="M1524 -25q0 -68 -48 -116t-116 -48t-116.5 48t-48.5 116t48.5 116.5t116.5 48.5t116 -48.5t48 -116.5zM775 -25q0 -68 -48.5 -116t-116.5 -48t-116 48t-48 116t48 116.5t116 48.5t116.5 -48.5t48.5 -116.5zM0 1469q57 -60 110.5 -104.5t121 -82t136 -63t166 -45.5
+q-204 -190 -383 -284q198 -59 414 -176zM2155 -90q5 54 -39 107.5t-104 80t-102 14.5q-38 -11 -72.5 -70.5t-51.5 -129.5q0 -16 3 -30q10 -49 53 -79t94 -28q54 2 119 42t100 93z"/>
+			<glyph glyph-name="_538" unicode="&#xf23d;" horiz-adv-x="2304"
+				   d="M1524 -25q0 -68 -48 -116t-116 -48t-116.5 48t-48.5 116t48.5 116.5t116.5 48.5t116 -48.5t48 -116.5zM775 -25q0 -68 -48.5 -116t-116.5 -48t-116 48t-48 116t48 116.5t116 48.5t116.5 -48.5t48.5 -116.5zM0 1469q57 -60 110.5 -104.5t121 -82t136 -63t166 -45.5
 t200 -31.5t250 -18.5t304 -9.5t372.5 -2.5q139 0 244.5 -5t181 -16.5t124 -27.5t71 -39.5t24 -51.5t-19.5 -64t-56.5 -76.5t-89.5 -91t-116 -104.5t-139 -119q-185 -157 -286 -247q29 51 76.5 109t94 105.5t94.5 98.5t83 91.5t54 80.5t13 70t-45.5 55.5t-116.5 41t-204 23.5
-t-304 5q-168 -2 -314 6t-256 23t-204.5 41t-159.5 51.5t-122.5 62.5t-91.5 66.5t-68 71.5t-50.5 69.5t-40 68t-36.5 59.5z" />
-    <glyph glyph-name="_539" unicode="&#xf23e;" horiz-adv-x="1792" 
-d="M896 1472q-169 0 -323 -66t-265.5 -177.5t-177.5 -265.5t-66 -323t66 -323t177.5 -265.5t265.5 -177.5t323 -66t323 66t265.5 177.5t177.5 265.5t66 323t-66 323t-177.5 265.5t-265.5 177.5t-323 66zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348
+t-304 5q-168 -2 -314 6t-256 23t-204.5 41t-159.5 51.5t-122.5 62.5t-91.5 66.5t-68 71.5t-50.5 69.5t-40 68t-36.5 59.5z"/>
+			<glyph glyph-name="_539" unicode="&#xf23e;" horiz-adv-x="1792"
+				   d="M896 1472q-169 0 -323 -66t-265.5 -177.5t-177.5 -265.5t-66 -323t66 -323t177.5 -265.5t265.5 -177.5t323 -66t323 66t265.5 177.5t177.5 265.5t66 323t-66 323t-177.5 265.5t-265.5 177.5t-323 66zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348
 t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM496 704q16 0 16 -16v-480q0 -16 -16 -16h-32q-16 0 -16 16v480q0 16 16 16h32zM896 640q53 0 90.5 -37.5t37.5 -90.5q0 -35 -17.5 -64t-46.5 -46v-114q0 -14 -9 -23
 t-23 -9h-64q-14 0 -23 9t-9 23v114q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5zM896 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM544 928v-96
 q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 93 65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5v-96q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 146 -103 249t-249 103t-249 -103t-103 -249zM1408 192v512q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-512
-q0 -26 19 -45t45 -19h896q26 0 45 19t19 45z" />
-    <glyph glyph-name="_540" unicode="&#xf240;" horiz-adv-x="2304" 
-d="M1920 1024v-768h-1664v768h1664zM2048 448h128v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288zM2304 832v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113
-v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160q53 0 90.5 -37.5t37.5 -90.5z" />
-    <glyph glyph-name="_541" unicode="&#xf241;" horiz-adv-x="2304" 
-d="M256 256v768h1280v-768h-1280zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
-h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
-    <glyph glyph-name="_542" unicode="&#xf242;" horiz-adv-x="2304" 
-d="M256 256v768h896v-768h-896zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
-h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
-    <glyph glyph-name="_543" unicode="&#xf243;" horiz-adv-x="2304" 
-d="M256 256v768h512v-768h-512zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
-h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
-    <glyph glyph-name="_544" unicode="&#xf244;" horiz-adv-x="2304" 
-d="M2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23
-v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
-    <glyph glyph-name="_545" unicode="&#xf245;" horiz-adv-x="1280" 
-d="M1133 493q31 -30 14 -69q-17 -40 -59 -40h-382l201 -476q10 -25 0 -49t-34 -35l-177 -75q-25 -10 -49 0t-35 34l-191 452l-312 -312q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v1504q0 42 40 59q12 5 24 5q27 0 45 -19z" />
-    <glyph glyph-name="_546" unicode="&#xf246;" horiz-adv-x="1024" 
-d="M832 1408q-320 0 -320 -224v-416h128v-128h-128v-544q0 -224 320 -224h64v-128h-64q-272 0 -384 146q-112 -146 -384 -146h-64v128h64q320 0 320 224v544h-128v128h128v416q0 224 -320 224h-64v128h64q272 0 384 -146q112 146 384 146h64v-128h-64z" />
-    <glyph glyph-name="_547" unicode="&#xf247;" horiz-adv-x="2048" 
-d="M2048 1152h-128v-1024h128v-384h-384v128h-1280v-128h-384v384h128v1024h-128v384h384v-128h1280v128h384v-384zM1792 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 -128v128h-128v-128h128zM1664 0v128h128v1024h-128v128h-1280v-128h-128v-1024h128v-128
-h1280zM1920 -128v128h-128v-128h128zM1280 896h384v-768h-896v256h-384v768h896v-256zM512 512h640v512h-640v-512zM1536 256v512h-256v-384h-384v-128h640z" />
-    <glyph glyph-name="_548" unicode="&#xf248;" horiz-adv-x="2304" 
-d="M2304 768h-128v-640h128v-384h-384v128h-896v-128h-384v384h128v128h-384v-128h-384v384h128v640h-128v384h384v-128h896v128h384v-384h-128v-128h384v128h384v-384zM2048 1024v-128h128v128h-128zM1408 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 256
-v128h-128v-128h128zM1536 384h-128v-128h128v128zM384 384h896v128h128v640h-128v128h-896v-128h-128v-640h128v-128zM896 -128v128h-128v-128h128zM2176 -128v128h-128v-128h128zM2048 128v640h-128v128h-384v-384h128v-384h-384v128h-384v-128h128v-128h896v128h128z" />
-    <glyph glyph-name="_549" unicode="&#xf249;" 
-d="M1024 288v-416h-928q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68v-928h-416q-40 0 -68 -28t-28 -68zM1152 256h381q-15 -82 -65 -132l-184 -184q-50 -50 -132 -65v381z" />
-    <glyph glyph-name="_550" unicode="&#xf24a;" 
-d="M1400 256h-248v-248q29 10 41 22l185 185q12 12 22 41zM1120 384h288v896h-1280v-1280h896v288q0 40 28 68t68 28zM1536 1312v-1024q0 -40 -20 -88t-48 -76l-184 -184q-28 -28 -76 -48t-88 -20h-1024q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68
-z" />
-    <glyph glyph-name="_551" unicode="&#xf24b;" horiz-adv-x="2304" 
-d="M1951 538q0 -26 -15.5 -44.5t-38.5 -23.5q-8 -2 -18 -2h-153v140h153q10 0 18 -2q23 -5 38.5 -23.5t15.5 -44.5zM1933 751q0 -25 -15 -42t-38 -21q-3 -1 -15 -1h-139v129h139q3 0 8.5 -0.5t6.5 -0.5q23 -4 38 -21.5t15 -42.5zM728 587v308h-228v-308q0 -58 -38 -94.5
+q0 -26 19 -45t45 -19h896q26 0 45 19t19 45z"/>
+			<glyph glyph-name="_540" unicode="&#xf240;" horiz-adv-x="2304"
+				   d="M1920 1024v-768h-1664v768h1664zM2048 448h128v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288zM2304 832v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113
+v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160q53 0 90.5 -37.5t37.5 -90.5z"/>
+			<glyph glyph-name="_541" unicode="&#xf241;" horiz-adv-x="2304"
+				   d="M256 256v768h1280v-768h-1280zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z"/>
+			<glyph glyph-name="_542" unicode="&#xf242;" horiz-adv-x="2304"
+				   d="M256 256v768h896v-768h-896zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z"/>
+			<glyph glyph-name="_543" unicode="&#xf243;" horiz-adv-x="2304"
+				   d="M256 256v768h512v-768h-512zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z"/>
+			<glyph glyph-name="_544" unicode="&#xf244;" horiz-adv-x="2304"
+				   d="M2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23
+v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z"/>
+			<glyph glyph-name="_545" unicode="&#xf245;" horiz-adv-x="1280"
+				   d="M1133 493q31 -30 14 -69q-17 -40 -59 -40h-382l201 -476q10 -25 0 -49t-34 -35l-177 -75q-25 -10 -49 0t-35 34l-191 452l-312 -312q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v1504q0 42 40 59q12 5 24 5q27 0 45 -19z"/>
+			<glyph glyph-name="_546" unicode="&#xf246;" horiz-adv-x="1024"
+				   d="M832 1408q-320 0 -320 -224v-416h128v-128h-128v-544q0 -224 320 -224h64v-128h-64q-272 0 -384 146q-112 -146 -384 -146h-64v128h64q320 0 320 224v544h-128v128h128v416q0 224 -320 224h-64v128h64q272 0 384 -146q112 146 384 146h64v-128h-64z"/>
+			<glyph glyph-name="_547" unicode="&#xf247;" horiz-adv-x="2048"
+				   d="M2048 1152h-128v-1024h128v-384h-384v128h-1280v-128h-384v384h128v1024h-128v384h384v-128h1280v128h384v-384zM1792 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 -128v128h-128v-128h128zM1664 0v128h128v1024h-128v128h-1280v-128h-128v-1024h128v-128
+h1280zM1920 -128v128h-128v-128h128zM1280 896h384v-768h-896v256h-384v768h896v-256zM512 512h640v512h-640v-512zM1536 256v512h-256v-384h-384v-128h640z"/>
+			<glyph glyph-name="_548" unicode="&#xf248;" horiz-adv-x="2304"
+				   d="M2304 768h-128v-640h128v-384h-384v128h-896v-128h-384v384h128v128h-384v-128h-384v384h128v640h-128v384h384v-128h896v128h384v-384h-128v-128h384v128h384v-384zM2048 1024v-128h128v128h-128zM1408 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 256
+v128h-128v-128h128zM1536 384h-128v-128h128v128zM384 384h896v128h128v640h-128v128h-896v-128h-128v-640h128v-128zM896 -128v128h-128v-128h128zM2176 -128v128h-128v-128h128zM2048 128v640h-128v128h-384v-384h128v-384h-384v128h-384v-128h128v-128h896v128h128z"/>
+			<glyph glyph-name="_549" unicode="&#xf249;"
+				   d="M1024 288v-416h-928q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68v-928h-416q-40 0 -68 -28t-28 -68zM1152 256h381q-15 -82 -65 -132l-184 -184q-50 -50 -132 -65v381z"/>
+			<glyph glyph-name="_550" unicode="&#xf24a;"
+				   d="M1400 256h-248v-248q29 10 41 22l185 185q12 12 22 41zM1120 384h288v896h-1280v-1280h896v288q0 40 28 68t68 28zM1536 1312v-1024q0 -40 -20 -88t-48 -76l-184 -184q-28 -28 -76 -48t-88 -20h-1024q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68
+z"/>
+			<glyph glyph-name="_551" unicode="&#xf24b;" horiz-adv-x="2304"
+				   d="M1951 538q0 -26 -15.5 -44.5t-38.5 -23.5q-8 -2 -18 -2h-153v140h153q10 0 18 -2q23 -5 38.5 -23.5t15.5 -44.5zM1933 751q0 -25 -15 -42t-38 -21q-3 -1 -15 -1h-139v129h139q3 0 8.5 -0.5t6.5 -0.5q23 -4 38 -21.5t15 -42.5zM728 587v308h-228v-308q0 -58 -38 -94.5
 t-105 -36.5q-108 0 -229 59v-112q53 -15 121 -23t109 -9l42 -1q328 0 328 217zM1442 403v113q-99 -52 -200 -59q-108 -8 -169 41t-61 142t61 142t169 41q101 -7 200 -58v112q-48 12 -100 19.5t-80 9.5l-28 2q-127 6 -218.5 -14t-140.5 -60t-71 -88t-22 -106t22 -106t71 -88
 t140.5 -60t218.5 -14q101 4 208 31zM2176 518q0 54 -43 88.5t-109 39.5v3q57 8 89 41.5t32 79.5q0 55 -41 88t-107 36q-3 0 -12 0.5t-14 0.5h-455v-510h491q74 0 121.5 36.5t47.5 96.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90
-t90 38h2048q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_552" unicode="&#xf24c;" horiz-adv-x="2304" 
-d="M858 295v693q-106 -41 -172 -135.5t-66 -211.5t66 -211.5t172 -134.5zM1362 641q0 117 -66 211.5t-172 135.5v-694q106 41 172 135.5t66 211.5zM1577 641q0 -159 -78.5 -294t-213.5 -213.5t-294 -78.5q-119 0 -227.5 46.5t-187 125t-125 187t-46.5 227.5q0 159 78.5 294
+t90 38h2048q52 0 90 -38t38 -90z"/>
+			<glyph glyph-name="_552" unicode="&#xf24c;" horiz-adv-x="2304"
+				   d="M858 295v693q-106 -41 -172 -135.5t-66 -211.5t66 -211.5t172 -134.5zM1362 641q0 117 -66 211.5t-172 135.5v-694q106 41 172 135.5t66 211.5zM1577 641q0 -159 -78.5 -294t-213.5 -213.5t-294 -78.5q-119 0 -227.5 46.5t-187 125t-125 187t-46.5 227.5q0 159 78.5 294
 t213.5 213.5t294 78.5t294 -78.5t213.5 -213.5t78.5 -294zM1960 634q0 139 -55.5 261.5t-147.5 205.5t-213.5 131t-252.5 48h-301q-176 0 -323.5 -81t-235 -230t-87.5 -335q0 -171 87 -317.5t236 -231.5t323 -85h301q129 0 251.5 50.5t214.5 135t147.5 202.5t55.5 246z
-M2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_553" unicode="&#xf24d;" horiz-adv-x="1792" 
-d="M1664 -96v1088q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5zM1792 992v-1088q0 -66 -47 -113t-113 -47h-1088q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113
-zM1408 1376v-160h-128v160q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h160v-128h-160q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="_554" unicode="&#xf24e;" horiz-adv-x="2304" 
-d="M1728 1088l-384 -704h768zM448 1088l-384 -704h768zM1269 1280q-14 -40 -45.5 -71.5t-71.5 -45.5v-1291h608q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1344q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h608v1291q-40 14 -71.5 45.5t-45.5 71.5h-491q-14 0 -23 9t-9 23v64
+M2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z"/>
+			<glyph glyph-name="_553" unicode="&#xf24d;" horiz-adv-x="1792"
+				   d="M1664 -96v1088q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5zM1792 992v-1088q0 -66 -47 -113t-113 -47h-1088q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113
+zM1408 1376v-160h-128v160q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h160v-128h-160q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113z"/>
+			<glyph glyph-name="_554" unicode="&#xf24e;" horiz-adv-x="2304"
+				   d="M1728 1088l-384 -704h768zM448 1088l-384 -704h768zM1269 1280q-14 -40 -45.5 -71.5t-71.5 -45.5v-1291h608q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1344q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h608v1291q-40 14 -71.5 45.5t-45.5 71.5h-491q-14 0 -23 9t-9 23v64
 q0 14 9 23t23 9h491q21 57 70 92.5t111 35.5t111 -35.5t70 -92.5h491q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-491zM1088 1264q33 0 56.5 23.5t23.5 56.5t-23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5zM2176 384q0 -73 -46.5 -131t-117.5 -91
 t-144.5 -49.5t-139.5 -16.5t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81zM896 384q0 -73 -46.5 -131t-117.5 -91t-144.5 -49.5t-139.5 -16.5
-t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81z" />
-    <glyph glyph-name="_555" unicode="&#xf250;" 
-d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81z"/>
+			<glyph glyph-name="_555" unicode="&#xf250;"
+				   d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
 t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-77 -29 -149 -92.5
-t-129.5 -152.5t-92.5 -210t-35 -253h1024q0 132 -35 253t-92.5 210t-129.5 152.5t-149 92.5q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
-    <glyph glyph-name="_556" unicode="&#xf251;" 
-d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
-t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -66 9 -128h1006q9 61 9 128zM1280 -128q0 130 -34 249.5t-90.5 208t-126.5 152t-146 94.5h-230q-76 -31 -146 -94.5t-126.5 -152t-90.5 -208t-34 -249.5h1024z" />
-    <glyph glyph-name="_557" unicode="&#xf252;" 
-d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
-t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -206 85 -384h854q85 178 85 384zM1223 192q-54 141 -145.5 241.5t-194.5 142.5h-230q-103 -42 -194.5 -142.5t-145.5 -241.5h910z" />
-    <glyph glyph-name="_558" unicode="&#xf253;" 
-d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-129.5 -152.5t-92.5 -210t-35 -253h1024q0 132 -35 253t-92.5 210t-129.5 152.5t-149 92.5q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z"/>
+			<glyph glyph-name="_556" unicode="&#xf251;"
+				   d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -66 9 -128h1006q9 61 9 128zM1280 -128q0 130 -34 249.5t-90.5 208t-126.5 152t-146 94.5h-230q-76 -31 -146 -94.5t-126.5 -152t-90.5 -208t-34 -249.5h1024z"/>
+			<glyph glyph-name="_557" unicode="&#xf252;"
+				   d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -206 85 -384h854q85 178 85 384zM1223 192q-54 141 -145.5 241.5t-194.5 142.5h-230q-103 -42 -194.5 -142.5t-145.5 -241.5h910z"/>
+			<glyph glyph-name="_558" unicode="&#xf253;"
+				   d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
 t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-137 -51 -244 -196
-h700q-107 145 -244 196q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
-    <glyph glyph-name="_559" unicode="&#xf254;" 
-d="M1504 -64q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472zM130 0q3 55 16 107t30 95t46 87t53.5 76t64.5 69.5t66 60t70.5 55t66.5 47.5t65 43q-43 28 -65 43t-66.5 47.5t-70.5 55t-66 60t-64.5 69.5t-53.5 76t-46 87
+h700q-107 145 -244 196q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z"/>
+			<glyph glyph-name="_559" unicode="&#xf254;"
+				   d="M1504 -64q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472zM130 0q3 55 16 107t30 95t46 87t53.5 76t64.5 69.5t66 60t70.5 55t66.5 47.5t65 43q-43 28 -65 43t-66.5 47.5t-70.5 55t-66 60t-64.5 69.5t-53.5 76t-46 87
 t-30 95t-16 107h1276q-3 -55 -16 -107t-30 -95t-46 -87t-53.5 -76t-64.5 -69.5t-66 -60t-70.5 -55t-66.5 -47.5t-65 -43q43 -28 65 -43t66.5 -47.5t70.5 -55t66 -60t64.5 -69.5t53.5 -76t46 -87t30 -95t16 -107h-1276zM1504 1536q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9
-h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472z" />
-    <glyph glyph-name="_560" unicode="&#xf255;" 
-d="M768 1152q-53 0 -90.5 -37.5t-37.5 -90.5v-128h-32v93q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-429l-32 30v172q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-224q0 -47 35 -82l310 -296q39 -39 39 -102q0 -26 19 -45t45 -19h640q26 0 45 19t19 45v25
+h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472z"/>
+			<glyph glyph-name="_560" unicode="&#xf255;"
+				   d="M768 1152q-53 0 -90.5 -37.5t-37.5 -90.5v-128h-32v93q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-429l-32 30v172q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-224q0 -47 35 -82l310 -296q39 -39 39 -102q0 -26 19 -45t45 -19h640q26 0 45 19t19 45v25
 q0 41 10 77l108 436q10 36 10 77v246q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-32h-32v125q0 40 -25 72.5t-64 40.5q-14 2 -23 2q-46 0 -79 -33t-33 -79v-128h-32v122q0 51 -32.5 89.5t-82.5 43.5q-5 1 -13 1zM768 1280q84 0 149 -50q57 34 123 34q59 0 111 -27
 t86 -76q27 7 59 7q100 0 170 -71.5t70 -171.5v-246q0 -51 -13 -108l-109 -436q-6 -24 -6 -71q0 -80 -56 -136t-136 -56h-640q-84 0 -138 58.5t-54 142.5l-308 296q-76 73 -76 175v224q0 99 70.5 169.5t169.5 70.5q11 0 16 -1q6 95 75.5 160t164.5 65q52 0 98 -21
-q72 69 174 69z" />
-    <glyph glyph-name="_561" unicode="&#xf256;" horiz-adv-x="1792" 
-d="M880 1408q-46 0 -79 -33t-33 -79v-656h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528v-256l-154 205q-38 51 -102 51q-53 0 -90.5 -37.5t-37.5 -90.5q0 -43 26 -77l384 -512q38 -51 102 -51h688q34 0 61 22t34 56l76 405q5 32 5 59v498q0 46 -33 79t-79 33t-79 -33
+q72 69 174 69z"/>
+			<glyph glyph-name="_561" unicode="&#xf256;" horiz-adv-x="1792"
+				   d="M880 1408q-46 0 -79 -33t-33 -79v-656h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528v-256l-154 205q-38 51 -102 51q-53 0 -90.5 -37.5t-37.5 -90.5q0 -43 26 -77l384 -512q38 -51 102 -51h688q34 0 61 22t34 56l76 405q5 32 5 59v498q0 46 -33 79t-79 33t-79 -33
 t-33 -79v-272h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528h-32v656q0 46 -33 79t-79 33zM880 1536q68 0 125.5 -35.5t88.5 -96.5q19 4 42 4q99 0 169.5 -70.5t70.5 -169.5v-17q105 6 180.5 -64t75.5 -175v-498q0 -40 -8 -83l-76 -404q-14 -79 -76.5 -131t-143.5 -52
-h-688q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 106 75 181t181 75q78 0 128 -34v434q0 99 70.5 169.5t169.5 70.5q23 0 42 -4q31 61 88.5 96.5t125.5 35.5z" />
-    <glyph glyph-name="_562" unicode="&#xf257;" horiz-adv-x="1792" 
-d="M1073 -128h-177q-163 0 -226 141q-23 49 -23 102v5q-62 30 -98.5 88.5t-36.5 127.5q0 38 5 48h-261q-106 0 -181 75t-75 181t75 181t181 75h113l-44 17q-74 28 -119.5 93.5t-45.5 145.5q0 106 75 181t181 75q46 0 91 -17l628 -239h401q106 0 181 -75t75 -181v-668
+h-688q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 106 75 181t181 75q78 0 128 -34v434q0 99 70.5 169.5t169.5 70.5q23 0 42 -4q31 61 88.5 96.5t125.5 35.5z"/>
+			<glyph glyph-name="_562" unicode="&#xf257;" horiz-adv-x="1792"
+				   d="M1073 -128h-177q-163 0 -226 141q-23 49 -23 102v5q-62 30 -98.5 88.5t-36.5 127.5q0 38 5 48h-261q-106 0 -181 75t-75 181t75 181t181 75h113l-44 17q-74 28 -119.5 93.5t-45.5 145.5q0 106 75 181t181 75q46 0 91 -17l628 -239h401q106 0 181 -75t75 -181v-668
 q0 -88 -54 -157.5t-140 -90.5l-339 -85q-92 -23 -186 -23zM1024 583l-155 -71l-163 -74q-30 -14 -48 -41.5t-18 -60.5q0 -46 33 -79t79 -33q26 0 46 10l338 154q-49 10 -80.5 50t-31.5 90v55zM1344 272q0 46 -33 79t-79 33q-26 0 -46 -10l-290 -132q-28 -13 -37 -17
 t-30.5 -17t-29.5 -23.5t-16 -29t-8 -40.5q0 -50 31.5 -82t81.5 -32q20 0 38 9l352 160q30 14 48 41.5t18 60.5zM1112 1024l-650 248q-24 8 -46 8q-53 0 -90.5 -37.5t-37.5 -90.5q0 -40 22.5 -73t59.5 -47l526 -200v-64h-640q-53 0 -90.5 -37.5t-37.5 -90.5t37.5 -90.5
 t90.5 -37.5h535l233 106v198q0 63 46 106l111 102h-69zM1073 0q82 0 155 19l339 85q43 11 70 45.5t27 78.5v668q0 53 -37.5 90.5t-90.5 37.5h-308l-136 -126q-36 -33 -36 -82v-296q0 -46 33 -77t79 -31t79 35t33 81v208h32v-208q0 -70 -57 -114q52 -8 86.5 -48.5t34.5 -93.5
-q0 -42 -23 -78t-61 -53l-310 -141h91z" />
-    <glyph glyph-name="_563" unicode="&#xf258;" horiz-adv-x="2048" 
-d="M1151 1536q61 0 116 -28t91 -77l572 -781q118 -159 118 -359v-355q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v177l-286 143h-546q-80 0 -136 56t-56 136v32q0 119 84.5 203.5t203.5 84.5h420l42 128h-686q-100 0 -173.5 67.5t-81.5 166.5q-65 79 -65 182v32
+q0 -42 -23 -78t-61 -53l-310 -141h91z"/>
+			<glyph glyph-name="_563" unicode="&#xf258;" horiz-adv-x="2048"
+				   d="M1151 1536q61 0 116 -28t91 -77l572 -781q118 -159 118 -359v-355q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v177l-286 143h-546q-80 0 -136 56t-56 136v32q0 119 84.5 203.5t203.5 84.5h420l42 128h-686q-100 0 -173.5 67.5t-81.5 166.5q-65 79 -65 182v32
 q0 80 56 136t136 56h959zM1920 -64v355q0 157 -93 284l-573 781q-39 52 -103 52h-959q-26 0 -45 -19t-19 -45q0 -32 1.5 -49.5t9.5 -40.5t25 -43q10 31 35.5 50t56.5 19h832v-32h-832q-26 0 -45 -19t-19 -45q0 -44 3 -58q8 -44 44 -73t81 -29h640h91q40 0 68 -28t28 -68
-q0 -15 -5 -30l-64 -192q-10 -29 -35 -47.5t-56 -18.5h-443q-66 0 -113 -47t-47 -113v-32q0 -26 19 -45t45 -19h561q16 0 29 -7l317 -158q24 -13 38.5 -36t14.5 -50v-197q0 -26 19 -45t45 -19h384q26 0 45 19t19 45z" />
-    <glyph glyph-name="_564" unicode="&#xf259;" horiz-adv-x="2048" 
-d="M459 -256q-77 0 -137.5 47.5t-79.5 122.5l-101 401q-13 57 -13 108q0 45 -5 67l-116 477q-7 27 -7 57q0 93 62 161t155 78q17 85 82.5 139t152.5 54q83 0 148 -51.5t85 -132.5l83 -348l103 428q20 81 85 132.5t148 51.5q89 0 155.5 -57.5t80.5 -144.5q92 -10 152 -79
+q0 -15 -5 -30l-64 -192q-10 -29 -35 -47.5t-56 -18.5h-443q-66 0 -113 -47t-47 -113v-32q0 -26 19 -45t45 -19h561q16 0 29 -7l317 -158q24 -13 38.5 -36t14.5 -50v-197q0 -26 19 -45t45 -19h384q26 0 45 19t19 45z"/>
+			<glyph glyph-name="_564" unicode="&#xf259;" horiz-adv-x="2048"
+				   d="M459 -256q-77 0 -137.5 47.5t-79.5 122.5l-101 401q-13 57 -13 108q0 45 -5 67l-116 477q-7 27 -7 57q0 93 62 161t155 78q17 85 82.5 139t152.5 54q83 0 148 -51.5t85 -132.5l83 -348l103 428q20 81 85 132.5t148 51.5q89 0 155.5 -57.5t80.5 -144.5q92 -10 152 -79
 t60 -162q0 -24 -7 -59l-123 -512q10 7 37.5 28.5t38.5 29.5t35 23t41 20.5t41.5 11t49.5 5.5q105 0 180 -74t75 -179q0 -62 -28.5 -118t-78.5 -94l-507 -380q-68 -51 -153 -51h-694zM1104 1408q-38 0 -68.5 -24t-39.5 -62l-164 -682h-127l-145 602q-9 38 -39.5 62t-68.5 24
 q-48 0 -80 -33t-32 -80q0 -15 3 -28l132 -547h-26l-99 408q-9 37 -40 62.5t-69 25.5q-47 0 -80 -33t-33 -79q0 -14 3 -26l116 -478q7 -28 9 -86t10 -88l100 -401q8 -32 34 -52.5t59 -20.5h694q42 0 76 26l507 379q56 43 56 110q0 52 -37.5 88.5t-89.5 36.5q-43 0 -77 -26
-l-307 -230v227q0 4 32 138t68 282t39 161q4 18 4 29q0 47 -32 81t-79 34q-39 0 -69.5 -24t-39.5 -62l-116 -482h-26l150 624q3 14 3 28q0 48 -31.5 82t-79.5 34z" />
-    <glyph glyph-name="_565" unicode="&#xf25a;" horiz-adv-x="1792" 
-d="M640 1408q-53 0 -90.5 -37.5t-37.5 -90.5v-512v-384l-151 202q-41 54 -107 54q-52 0 -89 -38t-37 -90q0 -43 26 -77l384 -512q38 -51 102 -51h718q22 0 39.5 13.5t22.5 34.5l92 368q24 96 24 194v217q0 41 -28 71t-68 30t-68 -28t-28 -68h-32v61q0 48 -32 81.5t-80 33.5
+l-307 -230v227q0 4 32 138t68 282t39 161q4 18 4 29q0 47 -32 81t-79 34q-39 0 -69.5 -24t-39.5 -62l-116 -482h-26l150 624q3 14 3 28q0 48 -31.5 82t-79.5 34z"/>
+			<glyph glyph-name="_565" unicode="&#xf25a;" horiz-adv-x="1792"
+				   d="M640 1408q-53 0 -90.5 -37.5t-37.5 -90.5v-512v-384l-151 202q-41 54 -107 54q-52 0 -89 -38t-37 -90q0 -43 26 -77l384 -512q38 -51 102 -51h718q22 0 39.5 13.5t22.5 34.5l92 368q24 96 24 194v217q0 41 -28 71t-68 30t-68 -28t-28 -68h-32v61q0 48 -32 81.5t-80 33.5
 q-46 0 -79 -33t-33 -79v-64h-32v90q0 55 -37 94.5t-91 39.5q-53 0 -90.5 -37.5t-37.5 -90.5v-96h-32v570q0 55 -37 94.5t-91 39.5zM640 1536q107 0 181.5 -77.5t74.5 -184.5v-220q22 2 32 2q99 0 173 -69q47 21 99 21q113 0 184 -87q27 7 56 7q94 0 159 -67.5t65 -161.5
 v-217q0 -116 -28 -225l-92 -368q-16 -64 -68 -104.5t-118 -40.5h-718q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 105 74.5 180.5t179.5 75.5q71 0 130 -35v547q0 106 75 181t181 75zM768 128v384h-32v-384h32zM1024 128v384h-32v-384h32zM1280 128v384h-32
-v-384h32z" />
-    <glyph glyph-name="_566" unicode="&#xf25b;" 
-d="M1288 889q60 0 107 -23q141 -63 141 -226v-177q0 -94 -23 -186l-85 -339q-21 -86 -90.5 -140t-157.5 -54h-668q-106 0 -181 75t-75 181v401l-239 628q-17 45 -17 91q0 106 75 181t181 75q80 0 145.5 -45.5t93.5 -119.5l17 -44v113q0 106 75 181t181 75t181 -75t75 -181
+v-384h32z"/>
+			<glyph glyph-name="_566" unicode="&#xf25b;"
+				   d="M1288 889q60 0 107 -23q141 -63 141 -226v-177q0 -94 -23 -186l-85 -339q-21 -86 -90.5 -140t-157.5 -54h-668q-106 0 -181 75t-75 181v401l-239 628q-17 45 -17 91q0 106 75 181t181 75q80 0 145.5 -45.5t93.5 -119.5l17 -44v113q0 106 75 181t181 75t181 -75t75 -181
 v-261q27 5 48 5q69 0 127.5 -36.5t88.5 -98.5zM1072 896q-33 0 -60.5 -18t-41.5 -48l-74 -163l-71 -155h55q50 0 90 -31.5t50 -80.5l154 338q10 20 10 46q0 46 -33 79t-79 33zM1293 761q-22 0 -40.5 -8t-29 -16t-23.5 -29.5t-17 -30.5t-17 -37l-132 -290q-10 -20 -10 -46
 q0 -46 33 -79t79 -33q33 0 60.5 18t41.5 48l160 352q9 18 9 38q0 50 -32 81.5t-82 31.5zM128 1120q0 -22 8 -46l248 -650v-69l102 111q43 46 106 46h198l106 233v535q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5v-640h-64l-200 526q-14 37 -47 59.5t-73 22.5
 q-53 0 -90.5 -37.5t-37.5 -90.5zM1180 -128q44 0 78.5 27t45.5 70l85 339q19 73 19 155v91l-141 -310q-17 -38 -53 -61t-78 -23q-53 0 -93.5 34.5t-48.5 86.5q-44 -57 -114 -57h-208v32h208q46 0 81 33t35 79t-31 79t-77 33h-296q-49 0 -82 -36l-126 -136v-308
-q0 -53 37.5 -90.5t90.5 -37.5h668z" />
-    <glyph glyph-name="_567" unicode="&#xf25c;" horiz-adv-x="1973" 
-d="M857 992v-117q0 -13 -9.5 -22t-22.5 -9h-298v-812q0 -13 -9 -22.5t-22 -9.5h-135q-13 0 -22.5 9t-9.5 23v812h-297q-13 0 -22.5 9t-9.5 22v117q0 14 9 23t23 9h793q13 0 22.5 -9.5t9.5 -22.5zM1895 995l77 -961q1 -13 -8 -24q-10 -10 -23 -10h-134q-12 0 -21 8.5
+q0 -53 37.5 -90.5t90.5 -37.5h668z"/>
+			<glyph glyph-name="_567" unicode="&#xf25c;" horiz-adv-x="1973"
+				   d="M857 992v-117q0 -13 -9.5 -22t-22.5 -9h-298v-812q0 -13 -9 -22.5t-22 -9.5h-135q-13 0 -22.5 9t-9.5 23v812h-297q-13 0 -22.5 9t-9.5 22v117q0 14 9 23t23 9h793q13 0 22.5 -9.5t9.5 -22.5zM1895 995l77 -961q1 -13 -8 -24q-10 -10 -23 -10h-134q-12 0 -21 8.5
 t-10 20.5l-46 588l-189 -425q-8 -19 -29 -19h-120q-20 0 -29 19l-188 427l-45 -590q-1 -12 -10 -20.5t-21 -8.5h-135q-13 0 -23 10q-9 10 -9 24l78 961q1 12 10 20.5t21 8.5h142q20 0 29 -19l220 -520q10 -24 20 -51q3 7 9.5 24.5t10.5 26.5l221 520q9 19 29 19h141
-q13 0 22 -8.5t10 -20.5z" />
-    <glyph glyph-name="_568" unicode="&#xf25d;" horiz-adv-x="1792" 
-d="M1042 833q0 88 -60 121q-33 18 -117 18h-123v-281h162q66 0 102 37t36 105zM1094 548l205 -373q8 -17 -1 -31q-8 -16 -27 -16h-152q-20 0 -28 17l-194 365h-155v-350q0 -14 -9 -23t-23 -9h-134q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h294q128 0 190 -24q85 -31 134 -109
+q13 0 22 -8.5t10 -20.5z"/>
+			<glyph glyph-name="_568" unicode="&#xf25d;" horiz-adv-x="1792"
+				   d="M1042 833q0 88 -60 121q-33 18 -117 18h-123v-281h162q66 0 102 37t36 105zM1094 548l205 -373q8 -17 -1 -31q-8 -16 -27 -16h-152q-20 0 -28 17l-194 365h-155v-350q0 -14 -9 -23t-23 -9h-134q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h294q128 0 190 -24q85 -31 134 -109
 t49 -180q0 -92 -42.5 -165.5t-115.5 -109.5q6 -10 9 -16zM896 1376q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM1792 640
-q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="_569" unicode="&#xf25e;" horiz-adv-x="1792" 
-d="M605 303q153 0 257 104q14 18 3 36l-45 82q-6 13 -24 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13.5t-23.5 -14.5t-28.5 -13t-33.5 -9.5t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78
+q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z"/>
+			<glyph glyph-name="_569" unicode="&#xf25e;" horiz-adv-x="1792"
+				   d="M605 303q153 0 257 104q14 18 3 36l-45 82q-6 13 -24 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13.5t-23.5 -14.5t-28.5 -13t-33.5 -9.5t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78
 q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-148 0 -246 -96.5t-98 -240.5q0 -146 97 -241.5t247 -95.5zM1235 303q153 0 257 104q14 18 4 36l-45 82q-8 14 -25 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13.5t-23.5 -14.5t-28.5 -13t-33.5 -9.5
 t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-147 0 -245.5 -96.5t-98.5 -240.5q0 -146 97 -241.5t247 -95.5zM896 1376
 q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191
-t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71z" />
-    <glyph glyph-name="f260" unicode="&#xf260;" horiz-adv-x="2048" 
-d="M736 736l384 -384l-384 -384l-672 672l672 672l168 -168l-96 -96l-72 72l-480 -480l480 -480l193 193l-289 287zM1312 1312l672 -672l-672 -672l-168 168l96 96l72 -72l480 480l-480 480l-193 -193l289 -287l-96 -96l-384 384z" />
-    <glyph glyph-name="f261" unicode="&#xf261;" horiz-adv-x="1792" 
-d="M717 182l271 271l-279 279l-88 -88l192 -191l-96 -96l-279 279l279 279l40 -40l87 87l-127 128l-454 -454zM1075 190l454 454l-454 454l-271 -271l279 -279l88 88l-192 191l96 96l279 -279l-279 -279l-40 40l-87 -88zM1792 640q0 -182 -71 -348t-191 -286t-286 -191
-t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="_572" unicode="&#xf262;" horiz-adv-x="2304" 
-d="M651 539q0 -39 -27.5 -66.5t-65.5 -27.5q-39 0 -66.5 27.5t-27.5 66.5q0 38 27.5 65.5t66.5 27.5q38 0 65.5 -27.5t27.5 -65.5zM1805 540q0 -39 -27.5 -66.5t-66.5 -27.5t-66.5 27.5t-27.5 66.5t27.5 66t66.5 27t66.5 -27t27.5 -66zM765 539q0 79 -56.5 136t-136.5 57
+t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71z"/>
+			<glyph glyph-name="f260" unicode="&#xf260;" horiz-adv-x="2048"
+				   d="M736 736l384 -384l-384 -384l-672 672l672 672l168 -168l-96 -96l-72 72l-480 -480l480 -480l193 193l-289 287zM1312 1312l672 -672l-672 -672l-168 168l96 96l72 -72l480 480l-480 480l-193 -193l289 -287l-96 -96l-384 384z"/>
+			<glyph glyph-name="f261" unicode="&#xf261;" horiz-adv-x="1792"
+				   d="M717 182l271 271l-279 279l-88 -88l192 -191l-96 -96l-279 279l279 279l40 -40l87 87l-127 128l-454 -454zM1075 190l454 454l-454 454l-271 -271l279 -279l88 88l-192 191l96 96l279 -279l-279 -279l-40 40l-87 -88zM1792 640q0 -182 -71 -348t-191 -286t-286 -191
+t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z"/>
+			<glyph glyph-name="_572" unicode="&#xf262;" horiz-adv-x="2304"
+				   d="M651 539q0 -39 -27.5 -66.5t-65.5 -27.5q-39 0 -66.5 27.5t-27.5 66.5q0 38 27.5 65.5t66.5 27.5q38 0 65.5 -27.5t27.5 -65.5zM1805 540q0 -39 -27.5 -66.5t-66.5 -27.5t-66.5 27.5t-27.5 66.5t27.5 66t66.5 27t66.5 -27t27.5 -66zM765 539q0 79 -56.5 136t-136.5 57
 t-136.5 -56.5t-56.5 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM1918 540q0 80 -56.5 136.5t-136.5 56.5q-79 0 -136 -56.5t-57 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM850 539q0 -116 -81.5 -197.5t-196.5 -81.5q-116 0 -197.5 82t-81.5 197
 t82 196.5t197 81.5t196.5 -81.5t81.5 -196.5zM2004 540q0 -115 -81.5 -196.5t-197.5 -81.5q-115 0 -196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5q116 0 197.5 -81.5t81.5 -196.5zM1040 537q0 191 -135.5 326.5t-326.5 135.5q-125 0 -231 -62t-168 -168.5t-62 -231.5
 t62 -231.5t168 -168.5t231 -62q191 0 326.5 135.5t135.5 326.5zM1708 1110q-254 111 -556 111q-319 0 -573 -110q117 0 223 -45.5t182.5 -122.5t122 -183t45.5 -223q0 115 43.5 219.5t118 180.5t177.5 123t217 50zM2187 537q0 191 -135 326.5t-326 135.5t-326.5 -135.5
 t-135.5 -326.5t135.5 -326.5t326.5 -135.5t326 135.5t135 326.5zM1921 1103h383q-44 -51 -75 -114.5t-40 -114.5q110 -151 110 -337q0 -156 -77 -288t-209 -208.5t-287 -76.5q-133 0 -249 56t-196 155q-47 -56 -129 -179q-11 22 -53.5 82.5t-74.5 97.5
-q-80 -99 -196.5 -155.5t-249.5 -56.5q-155 0 -287 76.5t-209 208.5t-77 288q0 186 110 337q-9 51 -40 114.5t-75 114.5h365q149 100 355 156.5t432 56.5q224 0 421 -56t348 -157z" />
-    <glyph glyph-name="f263" unicode="&#xf263;" horiz-adv-x="1280" 
-d="M640 629q-188 0 -321 133t-133 320q0 188 133 321t321 133t321 -133t133 -321q0 -187 -133 -320t-321 -133zM640 1306q-92 0 -157.5 -65.5t-65.5 -158.5q0 -92 65.5 -157.5t157.5 -65.5t157.5 65.5t65.5 157.5q0 93 -65.5 158.5t-157.5 65.5zM1163 574q13 -27 15 -49.5
+q-80 -99 -196.5 -155.5t-249.5 -56.5q-155 0 -287 76.5t-209 208.5t-77 288q0 186 110 337q-9 51 -40 114.5t-75 114.5h365q149 100 355 156.5t432 56.5q224 0 421 -56t348 -157z"/>
+			<glyph glyph-name="f263" unicode="&#xf263;" horiz-adv-x="1280"
+				   d="M640 629q-188 0 -321 133t-133 320q0 188 133 321t321 133t321 -133t133 -321q0 -187 -133 -320t-321 -133zM640 1306q-92 0 -157.5 -65.5t-65.5 -158.5q0 -92 65.5 -157.5t157.5 -65.5t157.5 65.5t65.5 157.5q0 93 -65.5 158.5t-157.5 65.5zM1163 574q13 -27 15 -49.5
 t-4.5 -40.5t-26.5 -38.5t-42.5 -37t-61.5 -41.5q-115 -73 -315 -94l73 -72l267 -267q30 -31 30 -74t-30 -73l-12 -13q-31 -30 -74 -30t-74 30q-67 68 -267 268l-267 -268q-31 -30 -74 -30t-73 30l-12 13q-31 30 -31 73t31 74l267 267l72 72q-203 21 -317 94
-q-39 25 -61.5 41.5t-42.5 37t-26.5 38.5t-4.5 40.5t15 49.5q10 20 28 35t42 22t56 -2t65 -35q5 -4 15 -11t43 -24.5t69 -30.5t92 -24t113 -11q91 0 174 25.5t120 50.5l38 25q33 26 65 35t56 2t42 -22t28 -35z" />
-    <glyph glyph-name="_574" unicode="&#xf264;" 
-d="M927 956q0 -66 -46.5 -112.5t-112.5 -46.5t-112.5 46.5t-46.5 112.5t46.5 112.5t112.5 46.5t112.5 -46.5t46.5 -112.5zM1141 593q-10 20 -28 32t-47.5 9.5t-60.5 -27.5q-10 -8 -29 -20t-81 -32t-127 -20t-124 18t-86 36l-27 18q-31 25 -60.5 27.5t-47.5 -9.5t-28 -32
+q-39 25 -61.5 41.5t-42.5 37t-26.5 38.5t-4.5 40.5t15 49.5q10 20 28 35t42 22t56 -2t65 -35q5 -4 15 -11t43 -24.5t69 -30.5t92 -24t113 -11q91 0 174 25.5t120 50.5l38 25q33 26 65 35t56 2t42 -22t28 -35z"/>
+			<glyph glyph-name="_574" unicode="&#xf264;"
+				   d="M927 956q0 -66 -46.5 -112.5t-112.5 -46.5t-112.5 46.5t-46.5 112.5t46.5 112.5t112.5 46.5t112.5 -46.5t46.5 -112.5zM1141 593q-10 20 -28 32t-47.5 9.5t-60.5 -27.5q-10 -8 -29 -20t-81 -32t-127 -20t-124 18t-86 36l-27 18q-31 25 -60.5 27.5t-47.5 -9.5t-28 -32
 q-22 -45 -2 -74.5t87 -73.5q83 -53 226 -67l-51 -52q-142 -142 -191 -190q-22 -22 -22 -52.5t22 -52.5l9 -9q22 -22 52.5 -22t52.5 22l191 191q114 -115 191 -191q22 -22 52.5 -22t52.5 22l9 9q22 22 22 52.5t-22 52.5l-191 190l-52 52q141 14 225 67q67 44 87 73.5t-2 74.5
-zM1092 956q0 134 -95 229t-229 95t-229 -95t-95 -229t95 -229t229 -95t229 95t95 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="_575" unicode="&#xf265;" horiz-adv-x="1720" 
-d="M1565 1408q65 0 110 -45.5t45 -110.5v-519q0 -176 -68 -336t-182.5 -275t-274 -182.5t-334.5 -67.5q-176 0 -335.5 67.5t-274.5 182.5t-183 275t-68 336v519q0 64 46 110t110 46h1409zM861 344q47 0 82 33l404 388q37 35 37 85q0 49 -34.5 83.5t-83.5 34.5q-47 0 -82 -33
-l-323 -310l-323 310q-35 33 -81 33q-49 0 -83.5 -34.5t-34.5 -83.5q0 -51 36 -85l405 -388q33 -33 81 -33z" />
-    <glyph glyph-name="_576" unicode="&#xf266;" horiz-adv-x="2304" 
-d="M1494 -103l-295 695q-25 -49 -158.5 -305.5t-198.5 -389.5q-1 -1 -27.5 -0.5t-26.5 1.5q-82 193 -255.5 587t-259.5 596q-21 50 -66.5 107.5t-103.5 100.5t-102 43q0 5 -0.5 24t-0.5 27h583v-50q-39 -2 -79.5 -16t-66.5 -43t-10 -64q26 -59 216.5 -499t235.5 -540
+zM1092 956q0 134 -95 229t-229 95t-229 -95t-95 -229t95 -229t229 -95t229 95t95 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="_575" unicode="&#xf265;" horiz-adv-x="1720"
+				   d="M1565 1408q65 0 110 -45.5t45 -110.5v-519q0 -176 -68 -336t-182.5 -275t-274 -182.5t-334.5 -67.5q-176 0 -335.5 67.5t-274.5 182.5t-183 275t-68 336v519q0 64 46 110t110 46h1409zM861 344q47 0 82 33l404 388q37 35 37 85q0 49 -34.5 83.5t-83.5 34.5q-47 0 -82 -33
+l-323 -310l-323 310q-35 33 -81 33q-49 0 -83.5 -34.5t-34.5 -83.5q0 -51 36 -85l405 -388q33 -33 81 -33z"/>
+			<glyph glyph-name="_576" unicode="&#xf266;" horiz-adv-x="2304"
+				   d="M1494 -103l-295 695q-25 -49 -158.5 -305.5t-198.5 -389.5q-1 -1 -27.5 -0.5t-26.5 1.5q-82 193 -255.5 587t-259.5 596q-21 50 -66.5 107.5t-103.5 100.5t-102 43q0 5 -0.5 24t-0.5 27h583v-50q-39 -2 -79.5 -16t-66.5 -43t-10 -64q26 -59 216.5 -499t235.5 -540
 q31 61 140 266.5t131 247.5q-19 39 -126 281t-136 295q-38 69 -201 71v50l513 -1v-47q-60 -2 -93.5 -25t-12.5 -69q33 -70 87 -189.5t86 -187.5q110 214 173 363q24 55 -10 79.5t-129 26.5q1 7 1 25v24q64 0 170.5 0.5t180 1t92.5 0.5v-49q-62 -2 -119 -33t-90 -81
-l-213 -442q13 -33 127.5 -290t121.5 -274l441 1017q-14 38 -49.5 62.5t-65 31.5t-55.5 8v50l460 -4l1 -2l-1 -44q-139 -4 -201 -145q-526 -1216 -559 -1291h-49z" />
-    <glyph glyph-name="_577" unicode="&#xf267;" horiz-adv-x="1792" 
-d="M949 643q0 -26 -16.5 -45t-41.5 -19q-26 0 -45 16.5t-19 41.5q0 26 17 45t42 19t44 -16.5t19 -41.5zM964 585l350 581q-9 -8 -67.5 -62.5t-125.5 -116.5t-136.5 -127t-117 -110.5t-50.5 -51.5l-349 -580q7 7 67 62t126 116.5t136 127t117 111t50 50.5zM1611 640
+l-213 -442q13 -33 127.5 -290t121.5 -274l441 1017q-14 38 -49.5 62.5t-65 31.5t-55.5 8v50l460 -4l1 -2l-1 -44q-139 -4 -201 -145q-526 -1216 -559 -1291h-49z"/>
+			<glyph glyph-name="_577" unicode="&#xf267;" horiz-adv-x="1792"
+				   d="M949 643q0 -26 -16.5 -45t-41.5 -19q-26 0 -45 16.5t-19 41.5q0 26 17 45t42 19t44 -16.5t19 -41.5zM964 585l350 581q-9 -8 -67.5 -62.5t-125.5 -116.5t-136.5 -127t-117 -110.5t-50.5 -51.5l-349 -580q7 7 67 62t126 116.5t136 127t117 111t50 50.5zM1611 640
 q0 -201 -104 -371q-3 2 -17 11t-26.5 16.5t-16.5 7.5q-13 0 -13 -13q0 -10 59 -44q-74 -112 -184.5 -190.5t-241.5 -110.5l-16 67q-1 10 -15 10q-5 0 -8 -5.5t-2 -9.5l16 -68q-72 -15 -146 -15q-199 0 -372 105q1 2 13 20.5t21.5 33.5t9.5 19q0 13 -13 13q-6 0 -17 -14.5
 t-22.5 -34.5t-13.5 -23q-113 75 -192 187.5t-110 244.5l69 15q10 3 10 15q0 5 -5.5 8t-10.5 2l-68 -15q-14 72 -14 139q0 206 109 379q2 -1 18.5 -12t30 -19t17.5 -8q13 0 13 12q0 6 -12.5 15.5t-32.5 21.5l-20 12q77 112 189 189t244 107l15 -67q2 -10 15 -10q5 0 8 5.5
 t2 10.5l-15 66q71 13 134 13q204 0 379 -109q-39 -56 -39 -65q0 -13 12 -13q11 0 48 64q111 -75 187.5 -186t107.5 -241l-56 -12q-10 -2 -10 -16q0 -5 5.5 -8t9.5 -2l57 13q14 -72 14 -140zM1696 640q0 163 -63.5 311t-170.5 255t-255 170.5t-311 63.5t-311 -63.5
 t-255 -170.5t-170.5 -255t-63.5 -311t63.5 -311t170.5 -255t255 -170.5t311 -63.5t311 63.5t255 170.5t170.5 255t63.5 311zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191
-t191 -286t71 -348z" />
-    <glyph glyph-name="_578" unicode="&#xf268;" horiz-adv-x="1792" 
-d="M893 1536q240 2 451 -120q232 -134 352 -372l-742 39q-160 9 -294 -74.5t-185 -229.5l-276 424q128 159 311 245.5t383 87.5zM146 1131l337 -663q72 -143 211 -217t293 -45l-230 -451q-212 33 -385 157.5t-272.5 316t-99.5 411.5q0 267 146 491zM1732 962
-q58 -150 59.5 -310.5t-48.5 -306t-153 -272t-246 -209.5q-230 -133 -498 -119l405 623q88 131 82.5 290.5t-106.5 277.5zM896 942q125 0 213.5 -88.5t88.5 -213.5t-88.5 -213.5t-213.5 -88.5t-213.5 88.5t-88.5 213.5t88.5 213.5t213.5 88.5z" />
-    <glyph glyph-name="_579" unicode="&#xf269;" horiz-adv-x="1792" 
-d="M903 -256q-283 0 -504.5 150.5t-329.5 398.5q-58 131 -67 301t26 332.5t111 312t179 242.5l-11 -281q11 14 68 15.5t70 -15.5q42 81 160.5 138t234.5 59q-54 -45 -119.5 -148.5t-58.5 -163.5q25 -8 62.5 -13.5t63 -7.5t68 -4t50.5 -3q15 -5 9.5 -45.5t-30.5 -75.5
+t191 -286t71 -348z"/>
+			<glyph glyph-name="_578" unicode="&#xf268;" horiz-adv-x="1792"
+				   d="M893 1536q240 2 451 -120q232 -134 352 -372l-742 39q-160 9 -294 -74.5t-185 -229.5l-276 424q128 159 311 245.5t383 87.5zM146 1131l337 -663q72 -143 211 -217t293 -45l-230 -451q-212 33 -385 157.5t-272.5 316t-99.5 411.5q0 267 146 491zM1732 962
+q58 -150 59.5 -310.5t-48.5 -306t-153 -272t-246 -209.5q-230 -133 -498 -119l405 623q88 131 82.5 290.5t-106.5 277.5zM896 942q125 0 213.5 -88.5t88.5 -213.5t-88.5 -213.5t-213.5 -88.5t-213.5 88.5t-88.5 213.5t88.5 213.5t213.5 88.5z"/>
+			<glyph glyph-name="_579" unicode="&#xf269;" horiz-adv-x="1792"
+				   d="M903 -256q-283 0 -504.5 150.5t-329.5 398.5q-58 131 -67 301t26 332.5t111 312t179 242.5l-11 -281q11 14 68 15.5t70 -15.5q42 81 160.5 138t234.5 59q-54 -45 -119.5 -148.5t-58.5 -163.5q25 -8 62.5 -13.5t63 -7.5t68 -4t50.5 -3q15 -5 9.5 -45.5t-30.5 -75.5
 q-5 -7 -16.5 -18.5t-56.5 -35.5t-101 -34l15 -189l-139 67q-18 -43 -7.5 -81.5t36 -66.5t65.5 -41.5t81 -6.5q51 9 98 34.5t83.5 45t73.5 17.5q61 -4 89.5 -33t19.5 -65q-1 -2 -2.5 -5.5t-8.5 -12.5t-18 -15.5t-31.5 -10.5t-46.5 -1q-60 -95 -144.5 -135.5t-209.5 -29.5
-q74 -61 162.5 -82.5t168.5 -6t154.5 52t128 87.5t80.5 104q43 91 39 192.5t-37.5 188.5t-78.5 125q87 -38 137 -79.5t77 -112.5q15 170 -57.5 343t-209.5 284q265 -77 412 -279.5t151 -517.5q2 -127 -40.5 -255t-123.5 -238t-189 -196t-247.5 -135.5t-288.5 -49.5z" />
-    <glyph glyph-name="_580" unicode="&#xf26a;" horiz-adv-x="1792" 
-d="M1493 1308q-165 110 -359 110q-155 0 -293 -73t-240 -200q-75 -93 -119.5 -218t-48.5 -266v-42q4 -141 48.5 -266t119.5 -218q102 -127 240 -200t293 -73q194 0 359 110q-121 -108 -274.5 -168t-322.5 -60q-29 0 -43 1q-175 8 -333 82t-272 193t-181 281t-67 339
+q74 -61 162.5 -82.5t168.5 -6t154.5 52t128 87.5t80.5 104q43 91 39 192.5t-37.5 188.5t-78.5 125q87 -38 137 -79.5t77 -112.5q15 170 -57.5 343t-209.5 284q265 -77 412 -279.5t151 -517.5q2 -127 -40.5 -255t-123.5 -238t-189 -196t-247.5 -135.5t-288.5 -49.5z"/>
+			<glyph glyph-name="_580" unicode="&#xf26a;" horiz-adv-x="1792"
+				   d="M1493 1308q-165 110 -359 110q-155 0 -293 -73t-240 -200q-75 -93 -119.5 -218t-48.5 -266v-42q4 -141 48.5 -266t119.5 -218q102 -127 240 -200t293 -73q194 0 359 110q-121 -108 -274.5 -168t-322.5 -60q-29 0 -43 1q-175 8 -333 82t-272 193t-181 281t-67 339
 q0 182 71 348t191 286t286 191t348 71h3q168 -1 320.5 -60.5t273.5 -167.5zM1792 640q0 -192 -77 -362.5t-213 -296.5q-104 -63 -222 -63q-137 0 -255 84q154 56 253.5 233t99.5 405q0 227 -99 404t-253 234q119 83 254 83q119 0 226 -65q135 -125 210.5 -295t75.5 -361z
-" />
-    <glyph glyph-name="_581" unicode="&#xf26b;" horiz-adv-x="1792" 
-d="M1792 599q0 -56 -7 -104h-1151q0 -146 109.5 -244.5t257.5 -98.5q99 0 185.5 46.5t136.5 130.5h423q-56 -159 -170.5 -281t-267.5 -188.5t-321 -66.5q-187 0 -356 83q-228 -116 -394 -116q-237 0 -237 263q0 115 45 275q17 60 109 229q199 360 475 606
+"/>
+			<glyph glyph-name="_581" unicode="&#xf26b;" horiz-adv-x="1792"
+				   d="M1792 599q0 -56 -7 -104h-1151q0 -146 109.5 -244.5t257.5 -98.5q99 0 185.5 46.5t136.5 130.5h423q-56 -159 -170.5 -281t-267.5 -188.5t-321 -66.5q-187 0 -356 83q-228 -116 -394 -116q-237 0 -237 263q0 115 45 275q17 60 109 229q199 360 475 606
 q-184 -79 -427 -354q63 274 283.5 449.5t501.5 175.5q30 0 45 -1q255 117 433 117q64 0 116 -13t94.5 -40.5t66.5 -76.5t24 -115q0 -116 -75 -286q101 -182 101 -390zM1722 1239q0 83 -53 132t-137 49q-108 0 -254 -70q121 -47 222.5 -131.5t170.5 -195.5q51 135 51 216z
-M128 2q0 -86 48.5 -132.5t134.5 -46.5q115 0 266 83q-122 72 -213.5 183t-137.5 245q-98 -205 -98 -332zM632 715h728q-5 142 -113 237t-251 95q-144 0 -251.5 -95t-112.5 -237z" />
-    <glyph glyph-name="_582" unicode="&#xf26c;" horiz-adv-x="2048" 
-d="M1792 288v960q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1248v-960q0 -66 -47 -113t-113 -47h-736v-128h352q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23
-v64q0 14 9 23t23 9h352v128h-736q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="_583" unicode="&#xf26d;" horiz-adv-x="1792" 
-d="M138 1408h197q-70 -64 -126 -149q-36 -56 -59 -115t-30 -125.5t-8.5 -120t10.5 -132t21 -126t28 -136.5q4 -19 6 -28q51 -238 81 -329q57 -171 152 -275h-272q-48 0 -82 34t-34 82v1304q0 48 34 82t82 34zM1346 1408h308q48 0 82 -34t34 -82v-1304q0 -48 -34 -82t-82 -34
+M128 2q0 -86 48.5 -132.5t134.5 -46.5q115 0 266 83q-122 72 -213.5 183t-137.5 245q-98 -205 -98 -332zM632 715h728q-5 142 -113 237t-251 95q-144 0 -251.5 -95t-112.5 -237z"/>
+			<glyph glyph-name="_582" unicode="&#xf26c;" horiz-adv-x="2048"
+				   d="M1792 288v960q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1248v-960q0 -66 -47 -113t-113 -47h-736v-128h352q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23
+v64q0 14 9 23t23 9h352v128h-736q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z"/>
+			<glyph glyph-name="_583" unicode="&#xf26d;" horiz-adv-x="1792"
+				   d="M138 1408h197q-70 -64 -126 -149q-36 -56 -59 -115t-30 -125.5t-8.5 -120t10.5 -132t21 -126t28 -136.5q4 -19 6 -28q51 -238 81 -329q57 -171 152 -275h-272q-48 0 -82 34t-34 82v1304q0 48 34 82t82 34zM1346 1408h308q48 0 82 -34t34 -82v-1304q0 -48 -34 -82t-82 -34
 h-178q212 210 196 565l-469 -101q-2 -45 -12 -82t-31 -72t-59.5 -59.5t-93.5 -36.5q-123 -26 -199 40q-32 27 -53 61t-51.5 129t-64.5 258q-35 163 -45.5 263t-5.5 139t23 77q20 41 62.5 73t102.5 45q45 12 83.5 6.5t67 -17t54 -35t43 -48t34.5 -56.5l468 100
-q-68 175 -180 287z" />
-    <glyph glyph-name="_584" unicode="&#xf26e;" 
-d="M1401 -11l-6 -6q-113 -113 -259 -175q-154 -64 -317 -64q-165 0 -317 64q-148 63 -259 175q-113 112 -175 258q-42 103 -54 189q-4 28 48 36q51 8 56 -20q1 -1 1 -4q18 -90 46 -159q50 -124 152 -226q98 -98 226 -152q132 -56 276 -56q143 0 276 56q128 55 225 152l6 6
+q-68 175 -180 287z"/>
+			<glyph glyph-name="_584" unicode="&#xf26e;"
+				   d="M1401 -11l-6 -6q-113 -113 -259 -175q-154 -64 -317 -64q-165 0 -317 64q-148 63 -259 175q-113 112 -175 258q-42 103 -54 189q-4 28 48 36q51 8 56 -20q1 -1 1 -4q18 -90 46 -159q50 -124 152 -226q98 -98 226 -152q132 -56 276 -56q143 0 276 56q128 55 225 152l6 6
 q10 10 25 6q12 -3 33 -22q36 -37 17 -58zM929 604l-66 -66l63 -63q21 -21 -7 -49q-17 -17 -32 -17q-10 0 -19 10l-62 61l-66 -66q-5 -5 -15 -5q-15 0 -31 16l-2 2q-18 15 -18 29q0 7 8 17l66 65l-66 66q-16 16 14 45q18 18 31 18q6 0 13 -5l65 -66l65 65q18 17 48 -13
 q27 -27 11 -44zM1400 547q0 -118 -46 -228q-45 -105 -126 -186q-80 -80 -187 -126t-228 -46t-228 46t-187 126q-82 82 -125 186q-15 33 -15 40h-1q-9 27 43 44q50 16 60 -12q37 -99 97 -167h1v339v2q3 136 102 232q105 103 253 103q147 0 251 -103t104 -249
 q0 -147 -104.5 -251t-250.5 -104q-58 0 -112 16q-28 11 -13 61q16 51 44 43l14 -3q14 -3 33 -6t30 -3q104 0 176 71.5t72 174.5q0 101 -72 171q-71 71 -175 71q-107 0 -178 -80q-64 -72 -64 -160v-413q110 -67 242 -67q96 0 185 36.5t156 103.5t103.5 155t36.5 183
 q0 198 -141 339q-140 140 -339 140q-200 0 -340 -140q-53 -53 -77 -87l-2 -2q-8 -11 -13 -15.5t-21.5 -9.5t-38.5 3q-21 5 -36.5 16.5t-15.5 26.5v680q0 15 10.5 26.5t27.5 11.5h877q30 0 30 -55t-30 -55h-811v-483h1q40 42 102 84t108 61q109 46 231 46q121 0 228 -46
-t187 -126q81 -81 126 -186q46 -112 46 -229zM1369 1128q9 -8 9 -18t-5.5 -18t-16.5 -21q-26 -26 -39 -26q-9 0 -16 7q-106 91 -207 133q-128 56 -276 56q-133 0 -262 -49q-27 -10 -45 37q-9 25 -8 38q3 16 16 20q130 57 299 57q164 0 316 -64q137 -58 235 -152z" />
-    <glyph glyph-name="_585" unicode="&#xf270;" horiz-adv-x="1792" 
-d="M1551 60q15 6 26 3t11 -17.5t-15 -33.5q-13 -16 -44 -43.5t-95.5 -68t-141 -74t-188 -58t-229.5 -24.5q-119 0 -238 31t-209 76.5t-172.5 104t-132.5 105t-84 87.5q-8 9 -10 16.5t1 12t8 7t11.5 2t11.5 -4.5q192 -117 300 -166q389 -176 799 -90q190 40 391 135z
+t187 -126q81 -81 126 -186q46 -112 46 -229zM1369 1128q9 -8 9 -18t-5.5 -18t-16.5 -21q-26 -26 -39 -26q-9 0 -16 7q-106 91 -207 133q-128 56 -276 56q-133 0 -262 -49q-27 -10 -45 37q-9 25 -8 38q3 16 16 20q130 57 299 57q164 0 316 -64q137 -58 235 -152z"/>
+			<glyph glyph-name="_585" unicode="&#xf270;" horiz-adv-x="1792"
+				   d="M1551 60q15 6 26 3t11 -17.5t-15 -33.5q-13 -16 -44 -43.5t-95.5 -68t-141 -74t-188 -58t-229.5 -24.5q-119 0 -238 31t-209 76.5t-172.5 104t-132.5 105t-84 87.5q-8 9 -10 16.5t1 12t8 7t11.5 2t11.5 -4.5q192 -117 300 -166q389 -176 799 -90q190 40 391 135z
 M1758 175q11 -16 2.5 -69.5t-28.5 -102.5q-34 -83 -85 -124q-17 -14 -26 -9t0 24q21 45 44.5 121.5t6.5 98.5q-5 7 -15.5 11.5t-27 6t-29.5 2.5t-35 0t-31.5 -2t-31 -3t-22.5 -2q-6 -1 -13 -1.5t-11 -1t-8.5 -1t-7 -0.5h-5.5h-4.5t-3 0.5t-2 1.5l-1.5 3q-6 16 47 40t103 30
 q46 7 108 1t76 -24zM1364 618q0 -31 13.5 -64t32 -58t37.5 -46t33 -32l13 -11l-227 -224q-40 37 -79 75.5t-58 58.5l-19 20q-11 11 -25 33q-38 -59 -97.5 -102.5t-127.5 -63.5t-140 -23t-137.5 21t-117.5 65.5t-83 113t-31 162.5q0 84 28 154t72 116.5t106.5 83t122.5 57
 t130 34.5t119.5 18.5t99.5 6.5v127q0 65 -21 97q-34 53 -121 53q-6 0 -16.5 -1t-40.5 -12t-56 -29.5t-56 -59.5t-48 -96l-294 27q0 60 22 119t67 113t108 95t151.5 65.5t190.5 24.5q100 0 181 -25t129.5 -61.5t81 -83t45 -86t12.5 -73.5v-589zM692 597q0 -86 70 -133
-q66 -44 139 -22q84 25 114 123q14 45 14 101v162q-59 -2 -111 -12t-106.5 -33.5t-87 -71t-32.5 -114.5z" />
-    <glyph glyph-name="_586" unicode="&#xf271;" horiz-adv-x="1792" 
-d="M1536 1280q52 0 90 -38t38 -90v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128zM1152 1376v-288q0 -14 9 -23t23 -9
+q66 -44 139 -22q84 25 114 123q14 45 14 101v162q-59 -2 -111 -12t-106.5 -33.5t-87 -71t-32.5 -114.5z"/>
+			<glyph glyph-name="_586" unicode="&#xf271;" horiz-adv-x="1792"
+				   d="M1536 1280q52 0 90 -38t38 -90v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128zM1152 1376v-288q0 -14 9 -23t23 -9
 h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 1376v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM1536 -128v1024h-1408v-1024h1408zM896 448h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224
-v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224z" />
-    <glyph glyph-name="_587" unicode="&#xf272;" horiz-adv-x="1792" 
-d="M1152 416v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23
+v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224z"/>
+			<glyph glyph-name="_587" unicode="&#xf272;" horiz-adv-x="1792"
+				   d="M1152 416v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23
 t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47
-t47 -113v-96h128q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_588" unicode="&#xf273;" horiz-adv-x="1792" 
-d="M1111 151l-46 -46q-9 -9 -22 -9t-23 9l-188 189l-188 -189q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22t9 23l189 188l-189 188q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l188 -188l188 188q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23l-188 -188l188 -188q9 -10 9 -23t-9 -22z
+t47 -113v-96h128q52 0 90 -38t38 -90z"/>
+			<glyph glyph-name="_588" unicode="&#xf273;" horiz-adv-x="1792"
+				   d="M1111 151l-46 -46q-9 -9 -22 -9t-23 9l-188 189l-188 -189q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22t9 23l189 188l-189 188q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l188 -188l188 188q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23l-188 -188l188 -188q9 -10 9 -23t-9 -22z
 M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280
-q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_589" unicode="&#xf274;" horiz-adv-x="1792" 
-d="M1303 572l-512 -512q-10 -9 -23 -9t-23 9l-288 288q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l220 -220l444 444q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23
+q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z"/>
+			<glyph glyph-name="_589" unicode="&#xf274;" horiz-adv-x="1792"
+				   d="M1303 572l-512 -512q-10 -9 -23 -9t-23 9l-288 288q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l220 -220l444 444q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23
 t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47
-t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-    <glyph glyph-name="_590" unicode="&#xf275;" horiz-adv-x="1792" 
-d="M448 1536q26 0 45 -19t19 -45v-891l536 429q17 14 40 14q26 0 45 -19t19 -45v-379l536 429q17 14 40 14q26 0 45 -19t19 -45v-1152q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h384z" />
-    <glyph glyph-name="_591" unicode="&#xf276;" horiz-adv-x="1024" 
-d="M512 448q66 0 128 15v-655q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v655q62 -15 128 -15zM512 1536q212 0 362 -150t150 -362t-150 -362t-362 -150t-362 150t-150 362t150 362t362 150zM512 1312q14 0 23 9t9 23t-9 23t-23 9q-146 0 -249 -103t-103 -249
-q0 -14 9 -23t23 -9t23 9t9 23q0 119 84.5 203.5t203.5 84.5z" />
-    <glyph glyph-name="_592" unicode="&#xf277;" horiz-adv-x="1792" 
-d="M1745 1239q10 -10 10 -23t-10 -23l-141 -141q-28 -28 -68 -28h-1344q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h576v64q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-64h512q40 0 68 -28zM768 320h256v-512q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v512zM1600 768
-q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-1344q-40 0 -68 28l-141 141q-10 10 -10 23t10 23l141 141q28 28 68 28h512v192h256v-192h576z" />
-    <glyph glyph-name="_593" unicode="&#xf278;" horiz-adv-x="2048" 
-d="M2020 1525q28 -20 28 -53v-1408q0 -20 -11 -36t-29 -23l-640 -256q-24 -11 -48 0l-616 246l-616 -246q-10 -5 -24 -5q-19 0 -36 11q-28 20 -28 53v1408q0 20 11 36t29 23l640 256q24 11 48 0l616 -246l616 246q32 13 60 -6zM736 1390v-1270l576 -230v1270zM128 1173
-v-1270l544 217v1270zM1920 107v1270l-544 -217v-1270z" />
-    <glyph glyph-name="_594" unicode="&#xf279;" horiz-adv-x="1792" 
-d="M512 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472q0 20 17 28l480 256q7 4 15 4zM1760 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472
-q0 20 17 28l480 256q7 4 15 4zM640 1536q8 0 14 -3l512 -256q18 -10 18 -29v-1472q0 -13 -9.5 -22.5t-22.5 -9.5q-8 0 -14 3l-512 256q-18 10 -18 29v1472q0 13 9.5 22.5t22.5 9.5z" />
-    <glyph glyph-name="_595" unicode="&#xf27a;" horiz-adv-x="1792" 
-d="M640 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 640q0 53 -37.5 90.5t-90.5 37.5
+t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z"/>
+			<glyph glyph-name="_590" unicode="&#xf275;" horiz-adv-x="1792"
+				   d="M448 1536q26 0 45 -19t19 -45v-891l536 429q17 14 40 14q26 0 45 -19t19 -45v-379l536 429q17 14 40 14q26 0 45 -19t19 -45v-1152q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h384z"/>
+			<glyph glyph-name="_591" unicode="&#xf276;" horiz-adv-x="1024"
+				   d="M512 448q66 0 128 15v-655q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v655q62 -15 128 -15zM512 1536q212 0 362 -150t150 -362t-150 -362t-362 -150t-362 150t-150 362t150 362t362 150zM512 1312q14 0 23 9t9 23t-9 23t-23 9q-146 0 -249 -103t-103 -249
+q0 -14 9 -23t23 -9t23 9t9 23q0 119 84.5 203.5t203.5 84.5z"/>
+			<glyph glyph-name="_592" unicode="&#xf277;" horiz-adv-x="1792"
+				   d="M1745 1239q10 -10 10 -23t-10 -23l-141 -141q-28 -28 -68 -28h-1344q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h576v64q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-64h512q40 0 68 -28zM768 320h256v-512q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v512zM1600 768
+q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-1344q-40 0 -68 28l-141 141q-10 10 -10 23t10 23l141 141q28 28 68 28h512v192h256v-192h576z"/>
+			<glyph glyph-name="_593" unicode="&#xf278;" horiz-adv-x="2048"
+				   d="M2020 1525q28 -20 28 -53v-1408q0 -20 -11 -36t-29 -23l-640 -256q-24 -11 -48 0l-616 246l-616 -246q-10 -5 -24 -5q-19 0 -36 11q-28 20 -28 53v1408q0 20 11 36t29 23l640 256q24 11 48 0l616 -246l616 246q32 13 60 -6zM736 1390v-1270l576 -230v1270zM128 1173
+v-1270l544 217v1270zM1920 107v1270l-544 -217v-1270z"/>
+			<glyph glyph-name="_594" unicode="&#xf279;" horiz-adv-x="1792"
+				   d="M512 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472q0 20 17 28l480 256q7 4 15 4zM1760 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472
+q0 20 17 28l480 256q7 4 15 4zM640 1536q8 0 14 -3l512 -256q18 -10 18 -29v-1472q0 -13 -9.5 -22.5t-22.5 -9.5q-8 0 -14 3l-512 256q-18 10 -18 29v1472q0 13 9.5 22.5t22.5 9.5z"/>
+			<glyph glyph-name="_595" unicode="&#xf27a;" horiz-adv-x="1792"
+				   d="M640 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 640q0 53 -37.5 90.5t-90.5 37.5
 t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-110 0 -211 18q-173 -173 -435 -229q-52 -10 -86 -13q-12 -1 -22 6t-13 18q-4 15 20 37q5 5 23.5 21.5t25.5 23.5t23.5 25.5t24 31.5t20.5 37
-t20 48t14.5 57.5t12.5 72.5q-146 90 -229.5 216.5t-83.5 269.5q0 174 120 321.5t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
-    <glyph glyph-name="_596" unicode="&#xf27b;" horiz-adv-x="1792" 
-d="M640 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 -53 -37.5 -90.5t-90.5 -37.5
+t20 48t14.5 57.5t12.5 72.5q-146 90 -229.5 216.5t-83.5 269.5q0 174 120 321.5t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z"/>
+			<glyph glyph-name="_596" unicode="&#xf27b;" horiz-adv-x="1792"
+				   d="M640 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 -53 -37.5 -90.5t-90.5 -37.5
 t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5
 t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51
-t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 130 71 248.5t191 204.5t286 136.5t348 50.5t348 -50.5t286 -136.5t191 -204.5t71 -248.5z" />
-    <glyph glyph-name="_597" unicode="&#xf27c;" horiz-adv-x="1024" 
-d="M512 345l512 295v-591l-512 -296v592zM0 640v-591l512 296zM512 1527v-591l-512 -296v591zM512 936l512 295v-591z" />
-    <glyph glyph-name="_598" unicode="&#xf27d;" horiz-adv-x="1792" 
-d="M1709 1018q-10 -236 -332 -651q-333 -431 -562 -431q-142 0 -240 263q-44 160 -132 482q-72 262 -157 262q-18 0 -127 -76l-77 98q24 21 108 96.5t130 115.5q156 138 241 146q95 9 153 -55.5t81 -203.5q44 -287 66 -373q55 -249 120 -249q51 0 154 161q101 161 109 246
-q13 139 -109 139q-57 0 -121 -26q120 393 459 382q251 -8 236 -326z" />
-    <glyph glyph-name="f27e" unicode="&#xf27e;" 
-d="M0 1408h1536v-1536h-1536v1536zM1085 293l-221 631l221 297h-634l221 -297l-221 -631l317 -304z" />
-    <glyph glyph-name="uniF280" unicode="&#xf280;" 
-d="M0 1408h1536v-1536h-1536v1536zM908 1088l-12 -33l75 -83l-31 -114l25 -25l107 57l107 -57l25 25l-31 114l75 83l-12 33h-95l-53 96h-32l-53 -96h-95zM641 925q32 0 44.5 -16t11.5 -63l174 21q0 55 -17.5 92.5t-50.5 56t-69 25.5t-85 7q-133 0 -199 -57.5t-66 -182.5v-72
+t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 130 71 248.5t191 204.5t286 136.5t348 50.5t348 -50.5t286 -136.5t191 -204.5t71 -248.5z"/>
+			<glyph glyph-name="_597" unicode="&#xf27c;" horiz-adv-x="1024"
+				   d="M512 345l512 295v-591l-512 -296v592zM0 640v-591l512 296zM512 1527v-591l-512 -296v591zM512 936l512 295v-591z"/>
+			<glyph glyph-name="_598" unicode="&#xf27d;" horiz-adv-x="1792"
+				   d="M1709 1018q-10 -236 -332 -651q-333 -431 -562 -431q-142 0 -240 263q-44 160 -132 482q-72 262 -157 262q-18 0 -127 -76l-77 98q24 21 108 96.5t130 115.5q156 138 241 146q95 9 153 -55.5t81 -203.5q44 -287 66 -373q55 -249 120 -249q51 0 154 161q101 161 109 246
+q13 139 -109 139q-57 0 -121 -26q120 393 459 382q251 -8 236 -326z"/>
+			<glyph glyph-name="f27e" unicode="&#xf27e;"
+				   d="M0 1408h1536v-1536h-1536v1536zM1085 293l-221 631l221 297h-634l221 -297l-221 -631l317 -304z"/>
+			<glyph glyph-name="uniF280" unicode="&#xf280;"
+				   d="M0 1408h1536v-1536h-1536v1536zM908 1088l-12 -33l75 -83l-31 -114l25 -25l107 57l107 -57l25 25l-31 114l75 83l-12 33h-95l-53 96h-32l-53 -96h-95zM641 925q32 0 44.5 -16t11.5 -63l174 21q0 55 -17.5 92.5t-50.5 56t-69 25.5t-85 7q-133 0 -199 -57.5t-66 -182.5v-72
 h-96v-128h76q20 0 20 -8v-382q0 -14 -5 -20t-18 -7l-73 -7v-88h448v86l-149 14q-6 1 -8.5 1.5t-3.5 2.5t-0.5 4t1 7t0.5 10v387h191l38 128h-231q-6 0 -2 6t4 9v80q0 27 1.5 40.5t7.5 28t19.5 20t36.5 5.5zM1248 96v86l-54 9q-7 1 -9.5 2.5t-2.5 3t1 7.5t1 12v520h-275
-l-23 -101l83 -22q23 -7 23 -27v-370q0 -14 -6 -18.5t-20 -6.5l-70 -9v-86h352z" />
-    <glyph glyph-name="uniF281" unicode="&#xf281;" horiz-adv-x="1792" 
-d="M1792 690q0 -58 -29.5 -105.5t-79.5 -72.5q12 -46 12 -96q0 -155 -106.5 -287t-290.5 -208.5t-400 -76.5t-399.5 76.5t-290 208.5t-106.5 287q0 47 11 94q-51 25 -82 73.5t-31 106.5q0 82 58 140.5t141 58.5q85 0 145 -63q218 152 515 162l116 521q3 13 15 21t26 5
+l-23 -101l83 -22q23 -7 23 -27v-370q0 -14 -6 -18.5t-20 -6.5l-70 -9v-86h352z"/>
+			<glyph glyph-name="uniF281" unicode="&#xf281;" horiz-adv-x="1792"
+				   d="M1792 690q0 -58 -29.5 -105.5t-79.5 -72.5q12 -46 12 -96q0 -155 -106.5 -287t-290.5 -208.5t-400 -76.5t-399.5 76.5t-290 208.5t-106.5 287q0 47 11 94q-51 25 -82 73.5t-31 106.5q0 82 58 140.5t141 58.5q85 0 145 -63q218 152 515 162l116 521q3 13 15 21t26 5
 l369 -81q18 37 54 59.5t79 22.5q62 0 106 -43.5t44 -105.5t-44 -106t-106 -44t-105.5 43.5t-43.5 105.5l-334 74l-104 -472q300 -9 519 -160q58 61 143 61q83 0 141 -58.5t58 -140.5zM418 491q0 -62 43.5 -106t105.5 -44t106 44t44 106t-44 105.5t-106 43.5q-61 0 -105 -44
 t-44 -105zM1228 136q11 11 11 26t-11 26q-10 10 -25 10t-26 -10q-41 -42 -121 -62t-160 -20t-160 20t-121 62q-11 10 -26 10t-25 -10q-11 -10 -11 -25.5t11 -26.5q43 -43 118.5 -68t122.5 -29.5t91 -4.5t91 4.5t122.5 29.5t118.5 68zM1225 341q62 0 105.5 44t43.5 106
-q0 61 -44 105t-105 44q-62 0 -106 -43.5t-44 -105.5t44 -106t106 -44z" />
-    <glyph glyph-name="_602" unicode="&#xf282;" horiz-adv-x="1792" 
-d="M69 741h1q16 126 58.5 241.5t115 217t167.5 176t223.5 117.5t276.5 43q231 0 414 -105.5t294 -303.5q104 -187 104 -442v-188h-1125q1 -111 53.5 -192.5t136.5 -122.5t189.5 -57t213 -3t208 46.5t173.5 84.5v-377q-92 -55 -229.5 -92t-312.5 -38t-316 53
-q-189 73 -311.5 249t-124.5 372q-3 242 111 412t325 268q-48 -60 -78 -125.5t-46 -159.5h635q8 77 -8 140t-47 101.5t-70.5 66.5t-80.5 41t-75 20.5t-56 8.5l-22 1q-135 -5 -259.5 -44.5t-223.5 -104.5t-176 -140.5t-138 -163.5z" />
-    <glyph glyph-name="_603" unicode="&#xf283;" horiz-adv-x="2304" 
-d="M0 32v608h2304v-608q0 -66 -47 -113t-113 -47h-1984q-66 0 -113 47t-47 113zM640 256v-128h384v128h-384zM256 256v-128h256v128h-256zM2144 1408q66 0 113 -47t47 -113v-224h-2304v224q0 66 47 113t113 47h1984z" />
-    <glyph glyph-name="_604" unicode="&#xf284;" horiz-adv-x="1792" 
-d="M1584 246l-218 111q-74 -120 -196.5 -189t-263.5 -69q-147 0 -271 72t-196 196t-72 270q0 110 42.5 209.5t115 172t172 115t209.5 42.5q131 0 247.5 -60.5t192.5 -168.5l215 125q-110 169 -286.5 265t-378.5 96q-161 0 -308 -63t-253 -169t-169 -253t-63 -308t63 -308
+q0 61 -44 105t-105 44q-62 0 -106 -43.5t-44 -105.5t44 -106t106 -44z"/>
+			<glyph glyph-name="_602" unicode="&#xf282;" horiz-adv-x="1792"
+				   d="M69 741h1q16 126 58.5 241.5t115 217t167.5 176t223.5 117.5t276.5 43q231 0 414 -105.5t294 -303.5q104 -187 104 -442v-188h-1125q1 -111 53.5 -192.5t136.5 -122.5t189.5 -57t213 -3t208 46.5t173.5 84.5v-377q-92 -55 -229.5 -92t-312.5 -38t-316 53
+q-189 73 -311.5 249t-124.5 372q-3 242 111 412t325 268q-48 -60 -78 -125.5t-46 -159.5h635q8 77 -8 140t-47 101.5t-70.5 66.5t-80.5 41t-75 20.5t-56 8.5l-22 1q-135 -5 -259.5 -44.5t-223.5 -104.5t-176 -140.5t-138 -163.5z"/>
+			<glyph glyph-name="_603" unicode="&#xf283;" horiz-adv-x="2304"
+				   d="M0 32v608h2304v-608q0 -66 -47 -113t-113 -47h-1984q-66 0 -113 47t-47 113zM640 256v-128h384v128h-384zM256 256v-128h256v128h-256zM2144 1408q66 0 113 -47t47 -113v-224h-2304v224q0 66 47 113t113 47h1984z"/>
+			<glyph glyph-name="_604" unicode="&#xf284;" horiz-adv-x="1792"
+				   d="M1584 246l-218 111q-74 -120 -196.5 -189t-263.5 -69q-147 0 -271 72t-196 196t-72 270q0 110 42.5 209.5t115 172t172 115t209.5 42.5q131 0 247.5 -60.5t192.5 -168.5l215 125q-110 169 -286.5 265t-378.5 96q-161 0 -308 -63t-253 -169t-169 -253t-63 -308t63 -308
 t169 -253t253 -169t308 -63q213 0 397.5 107t290.5 292zM1030 643l693 -352q-116 -253 -334.5 -400t-492.5 -147q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71q260 0 470.5 -133.5t335.5 -366.5zM1543 640h-39v-160h-96v352h136q32 0 54.5 -20
-t28.5 -48t1 -56t-27.5 -48t-57.5 -20z" />
-    <glyph glyph-name="uniF285" unicode="&#xf285;" horiz-adv-x="1792" 
-d="M1427 827l-614 386l92 151h855zM405 562l-184 116v858l1183 -743zM1424 697l147 -95v-858l-532 335zM1387 718l-500 -802h-855l356 571z" />
-    <glyph glyph-name="uniF286" unicode="&#xf286;" horiz-adv-x="1792" 
-d="M640 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1152 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1664 496v-752h-640v320q0 80 -56 136t-136 56t-136 -56t-56 -136v-320h-640v752q0 16 16 16h96
+t28.5 -48t1 -56t-27.5 -48t-57.5 -20z"/>
+			<glyph glyph-name="uniF285" unicode="&#xf285;" horiz-adv-x="1792"
+				   d="M1427 827l-614 386l92 151h855zM405 562l-184 116v858l1183 -743zM1424 697l147 -95v-858l-532 335zM1387 718l-500 -802h-855l356 571z"/>
+			<glyph glyph-name="uniF286" unicode="&#xf286;" horiz-adv-x="1792"
+				   d="M640 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1152 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1664 496v-752h-640v320q0 80 -56 136t-136 56t-136 -56t-56 -136v-320h-640v752q0 16 16 16h96
 q16 0 16 -16v-112h128v624q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 6 2.5 9.5t8.5 5t9.5 2t11.5 0t9 -0.5v391q-32 15 -32 50q0 23 16.5 39t38.5 16t38.5 -16t16.5 -39q0 -35 -32 -50v-17q45 10 83 10q21 0 59.5 -7.5t54.5 -7.5
 q17 0 47 7.5t37 7.5q16 0 16 -16v-210q0 -15 -35 -21.5t-62 -6.5q-18 0 -54.5 7.5t-55.5 7.5q-40 0 -90 -12v-133q1 0 9 0.5t11.5 0t9.5 -2t8.5 -5t2.5 -9.5v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-624h128v112q0 16 16 16h96
-q16 0 16 -16z" />
-    <glyph glyph-name="_607" unicode="&#xf287;" horiz-adv-x="2304" 
-d="M2288 731q16 -8 16 -27t-16 -27l-320 -192q-8 -5 -16 -5q-9 0 -16 4q-16 10 -16 28v128h-858q37 -58 83 -165q16 -37 24.5 -55t24 -49t27 -47t27 -34t31.5 -26t33 -8h96v96q0 14 9 23t23 9h320q14 0 23 -9t9 -23v-320q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v96h-96
+q16 0 16 -16z"/>
+			<glyph glyph-name="_607" unicode="&#xf287;" horiz-adv-x="2304"
+				   d="M2288 731q16 -8 16 -27t-16 -27l-320 -192q-8 -5 -16 -5q-9 0 -16 4q-16 10 -16 28v128h-858q37 -58 83 -165q16 -37 24.5 -55t24 -49t27 -47t27 -34t31.5 -26t33 -8h96v96q0 14 9 23t23 9h320q14 0 23 -9t9 -23v-320q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v96h-96
 q-32 0 -61 10t-51 23.5t-45 40.5t-37 46t-33.5 57t-28.5 57.5t-28 60.5q-23 53 -37 81.5t-36 65t-44.5 53.5t-46.5 17h-360q-22 -84 -91 -138t-157 -54q-106 0 -181 75t-75 181t75 181t181 75q88 0 157 -54t91 -138h104q24 0 46.5 17t44.5 53.5t36 65t37 81.5q19 41 28 60.5
-t28.5 57.5t33.5 57t37 46t45 40.5t51 23.5t61 10h107q21 57 70 92.5t111 35.5q80 0 136 -56t56 -136t-56 -136t-136 -56q-62 0 -111 35.5t-70 92.5h-107q-17 0 -33 -8t-31.5 -26t-27 -34t-27 -47t-24 -49t-24.5 -55q-46 -107 -83 -165h1114v128q0 18 16 28t32 -1z" />
-    <glyph glyph-name="_608" unicode="&#xf288;" horiz-adv-x="1792" 
-d="M1150 774q0 -56 -39.5 -95t-95.5 -39h-253v269h253q56 0 95.5 -39.5t39.5 -95.5zM1329 774q0 130 -91.5 222t-222.5 92h-433v-896h180v269h253q130 0 222 91.5t92 221.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348
-t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="_609" unicode="&#xf289;" horiz-adv-x="2304" 
-d="M1645 438q0 59 -34 106.5t-87 68.5q-7 -45 -23 -92q-7 -24 -27.5 -38t-44.5 -14q-12 0 -24 3q-31 10 -45 38.5t-4 58.5q23 71 23 143q0 123 -61 227.5t-166 165.5t-228 61q-134 0 -247 -73t-167 -194q108 -28 188 -106q22 -23 22 -55t-22 -54t-54 -22t-55 22
+t28.5 57.5t33.5 57t37 46t45 40.5t51 23.5t61 10h107q21 57 70 92.5t111 35.5q80 0 136 -56t56 -136t-56 -136t-136 -56q-62 0 -111 35.5t-70 92.5h-107q-17 0 -33 -8t-31.5 -26t-27 -34t-27 -47t-24 -49t-24.5 -55q-46 -107 -83 -165h1114v128q0 18 16 28t32 -1z"/>
+			<glyph glyph-name="_608" unicode="&#xf288;" horiz-adv-x="1792"
+				   d="M1150 774q0 -56 -39.5 -95t-95.5 -39h-253v269h253q56 0 95.5 -39.5t39.5 -95.5zM1329 774q0 130 -91.5 222t-222.5 92h-433v-896h180v269h253q130 0 222 91.5t92 221.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348
+t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z"/>
+			<glyph glyph-name="_609" unicode="&#xf289;" horiz-adv-x="2304"
+				   d="M1645 438q0 59 -34 106.5t-87 68.5q-7 -45 -23 -92q-7 -24 -27.5 -38t-44.5 -14q-12 0 -24 3q-31 10 -45 38.5t-4 58.5q23 71 23 143q0 123 -61 227.5t-166 165.5t-228 61q-134 0 -247 -73t-167 -194q108 -28 188 -106q22 -23 22 -55t-22 -54t-54 -22t-55 22
 q-75 75 -180 75q-106 0 -181 -74.5t-75 -180.5t75 -180.5t181 -74.5h1046q79 0 134.5 55.5t55.5 133.5zM1798 438q0 -142 -100.5 -242t-242.5 -100h-1046q-169 0 -289 119.5t-120 288.5q0 153 100 267t249 136q62 184 221 298t354 114q235 0 408.5 -158.5t196.5 -389.5
 q116 -25 192.5 -118.5t76.5 -214.5zM2048 438q0 -175 -97 -319q-23 -33 -64 -33q-24 0 -43 13q-26 17 -32 48.5t12 57.5q71 104 71 233t-71 233q-18 26 -12 57t32 49t57.5 11.5t49.5 -32.5q97 -142 97 -318zM2304 438q0 -244 -134 -443q-23 -34 -64 -34q-23 0 -42 13
-q-26 18 -32.5 49t11.5 57q108 164 108 358q0 195 -108 357q-18 26 -11.5 57.5t32.5 48.5q26 18 57 12t49 -33q134 -198 134 -442z" />
-    <glyph glyph-name="_610" unicode="&#xf28a;" 
-d="M1500 -13q0 -89 -63 -152.5t-153 -63.5t-153.5 63.5t-63.5 152.5q0 90 63.5 153.5t153.5 63.5t153 -63.5t63 -153.5zM1267 268q-115 -15 -192.5 -102.5t-77.5 -205.5q0 -74 33 -138q-146 -78 -379 -78q-109 0 -201 21t-153.5 54.5t-110.5 76.5t-76 85t-44.5 83
+q-26 18 -32.5 49t11.5 57q108 164 108 358q0 195 -108 357q-18 26 -11.5 57.5t32.5 48.5q26 18 57 12t49 -33q134 -198 134 -442z"/>
+			<glyph glyph-name="_610" unicode="&#xf28a;"
+				   d="M1500 -13q0 -89 -63 -152.5t-153 -63.5t-153.5 63.5t-63.5 152.5q0 90 63.5 153.5t153.5 63.5t153 -63.5t63 -153.5zM1267 268q-115 -15 -192.5 -102.5t-77.5 -205.5q0 -74 33 -138q-146 -78 -379 -78q-109 0 -201 21t-153.5 54.5t-110.5 76.5t-76 85t-44.5 83
 t-23.5 66.5t-6 39.5q0 19 4.5 42.5t18.5 56t36.5 58t64 43.5t94.5 18t94 -17.5t63 -41t35.5 -53t17.5 -49t4 -33.5q0 -34 -23 -81q28 -27 82 -42t93 -17l40 -1q115 0 190 51t75 133q0 26 -9 48.5t-31.5 44.5t-49.5 41t-74 44t-93.5 47.5t-119.5 56.5q-28 13 -43 20
 q-116 55 -187 100t-122.5 102t-72 125.5t-20.5 162.5q0 78 20.5 150t66 137.5t112.5 114t166.5 77t221.5 28.5q120 0 220 -26t164.5 -67t109.5 -94t64 -105.5t19 -103.5q0 -46 -15 -82.5t-36.5 -58t-48.5 -36t-49 -19.5t-39 -5h-8h-32t-39 5t-44 14t-41 28t-37 46t-24 70.5
-t-10 97.5q-15 16 -59 25.5t-81 10.5l-37 1q-68 0 -117.5 -31t-70.5 -70t-21 -76q0 -24 5 -43t24 -46t53 -51t97 -53.5t150 -58.5q76 -25 138.5 -53.5t109 -55.5t83 -59t60.5 -59.5t41 -62.5t26.5 -62t14.5 -63.5t6 -62t1 -62.5z" />
-    <glyph glyph-name="_611" unicode="&#xf28b;" 
-d="M704 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1152 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103
-t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_612" unicode="&#xf28c;" 
-d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
-t73 -273t198 -198t273 -73zM864 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192z" />
-    <glyph glyph-name="_613" unicode="&#xf28d;" 
-d="M1088 352v576q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
-t103 -385.5z" />
-    <glyph glyph-name="_614" unicode="&#xf28e;" 
-d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
-t73 -273t198 -198t273 -73zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h576q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-576z" />
-    <glyph glyph-name="_615" unicode="&#xf290;" horiz-adv-x="1792" 
-d="M1757 128l35 -313q3 -28 -16 -50q-19 -21 -48 -21h-1664q-29 0 -48 21q-19 22 -16 50l35 313h1722zM1664 967l86 -775h-1708l86 775q3 24 21 40.5t43 16.5h256v-128q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5v128h384v-128q0 -53 37.5 -90.5t90.5 -37.5
-t90.5 37.5t37.5 90.5v128h256q25 0 43 -16.5t21 -40.5zM1280 1152v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 159 112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
-    <glyph glyph-name="_616" unicode="&#xf291;" horiz-adv-x="2048" 
-d="M1920 768q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5h-15l-115 -662q-8 -46 -44 -76t-82 -30h-1280q-46 0 -82 30t-44 76l-115 662h-15q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5h1792zM485 -32q26 2 43.5 22.5t15.5 46.5l-32 416q-2 26 -22.5 43.5
+t-10 97.5q-15 16 -59 25.5t-81 10.5l-37 1q-68 0 -117.5 -31t-70.5 -70t-21 -76q0 -24 5 -43t24 -46t53 -51t97 -53.5t150 -58.5q76 -25 138.5 -53.5t109 -55.5t83 -59t60.5 -59.5t41 -62.5t26.5 -62t14.5 -63.5t6 -62t1 -62.5z"/>
+			<glyph glyph-name="_611" unicode="&#xf28b;"
+				   d="M704 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1152 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103
+t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="_612" unicode="&#xf28c;"
+				   d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
+t73 -273t198 -198t273 -73zM864 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192z"/>
+			<glyph glyph-name="_613" unicode="&#xf28d;"
+				   d="M1088 352v576q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z"/>
+			<glyph glyph-name="_614" unicode="&#xf28e;"
+				   d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
+t73 -273t198 -198t273 -73zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h576q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-576z"/>
+			<glyph glyph-name="_615" unicode="&#xf290;" horiz-adv-x="1792"
+				   d="M1757 128l35 -313q3 -28 -16 -50q-19 -21 -48 -21h-1664q-29 0 -48 21q-19 22 -16 50l35 313h1722zM1664 967l86 -775h-1708l86 775q3 24 21 40.5t43 16.5h256v-128q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5v128h384v-128q0 -53 37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5v128h256q25 0 43 -16.5t21 -40.5zM1280 1152v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 159 112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z"/>
+			<glyph glyph-name="_616" unicode="&#xf291;" horiz-adv-x="2048"
+				   d="M1920 768q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5h-15l-115 -662q-8 -46 -44 -76t-82 -30h-1280q-46 0 -82 30t-44 76l-115 662h-15q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5h1792zM485 -32q26 2 43.5 22.5t15.5 46.5l-32 416q-2 26 -22.5 43.5
 t-46.5 15.5t-43.5 -22.5t-15.5 -46.5l32 -416q2 -25 20.5 -42t43.5 -17h5zM896 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1280 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1632 27l32 416
 q2 26 -15.5 46.5t-43.5 22.5t-46.5 -15.5t-22.5 -43.5l-32 -416q-2 -26 15.5 -46.5t43.5 -22.5h5q25 0 43.5 17t20.5 42zM476 1244l-93 -412h-132l101 441q19 88 89 143.5t160 55.5h167q0 26 19 45t45 19h384q26 0 45 -19t19 -45h167q90 0 160 -55.5t89 -143.5l101 -441
-h-132l-93 412q-11 44 -45.5 72t-79.5 28h-167q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45h-167q-45 0 -79.5 -28t-45.5 -72z" />
-    <glyph glyph-name="_617" unicode="&#xf292;" horiz-adv-x="1792" 
-d="M991 512l64 256h-254l-64 -256h254zM1759 1016l-56 -224q-7 -24 -31 -24h-327l-64 -256h311q15 0 25 -12q10 -14 6 -28l-56 -224q-5 -24 -31 -24h-327l-81 -328q-7 -24 -31 -24h-224q-16 0 -26 12q-9 12 -6 28l78 312h-254l-81 -328q-7 -24 -31 -24h-225q-15 0 -25 12
+h-132l-93 412q-11 44 -45.5 72t-79.5 28h-167q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45h-167q-45 0 -79.5 -28t-45.5 -72z"/>
+			<glyph glyph-name="_617" unicode="&#xf292;" horiz-adv-x="1792"
+				   d="M991 512l64 256h-254l-64 -256h254zM1759 1016l-56 -224q-7 -24 -31 -24h-327l-64 -256h311q15 0 25 -12q10 -14 6 -28l-56 -224q-5 -24 -31 -24h-327l-81 -328q-7 -24 -31 -24h-224q-16 0 -26 12q-9 12 -6 28l78 312h-254l-81 -328q-7 -24 -31 -24h-225q-15 0 -25 12
 q-9 12 -6 28l78 312h-311q-15 0 -25 12q-9 12 -6 28l56 224q7 24 31 24h327l64 256h-311q-15 0 -25 12q-10 14 -6 28l56 224q5 24 31 24h327l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h254l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h311
-q15 0 25 -12q9 -12 6 -28z" />
-    <glyph glyph-name="_618" unicode="&#xf293;" 
-d="M841 483l148 -148l-149 -149zM840 1094l149 -149l-148 -148zM710 -130l464 464l-306 306l306 306l-464 464v-611l-255 255l-93 -93l320 -321l-320 -321l93 -93l255 255v-611zM1429 640q0 -209 -32 -365.5t-87.5 -257t-140.5 -162.5t-181.5 -86.5t-219.5 -24.5
-t-219.5 24.5t-181.5 86.5t-140.5 162.5t-87.5 257t-32 365.5t32 365.5t87.5 257t140.5 162.5t181.5 86.5t219.5 24.5t219.5 -24.5t181.5 -86.5t140.5 -162.5t87.5 -257t32 -365.5z" />
-    <glyph glyph-name="_619" unicode="&#xf294;" horiz-adv-x="1024" 
-d="M596 113l173 172l-173 172v-344zM596 823l173 172l-173 172v-344zM628 640l356 -356l-539 -540v711l-297 -296l-108 108l372 373l-372 373l108 108l297 -296v711l539 -540z" />
-    <glyph glyph-name="_620" unicode="&#xf295;" 
-d="M1280 256q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM512 1024q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5
+q15 0 25 -12q9 -12 6 -28z"/>
+			<glyph glyph-name="_618" unicode="&#xf293;"
+				   d="M841 483l148 -148l-149 -149zM840 1094l149 -149l-148 -148zM710 -130l464 464l-306 306l306 306l-464 464v-611l-255 255l-93 -93l320 -321l-320 -321l93 -93l255 255v-611zM1429 640q0 -209 -32 -365.5t-87.5 -257t-140.5 -162.5t-181.5 -86.5t-219.5 -24.5
+t-219.5 24.5t-181.5 86.5t-140.5 162.5t-87.5 257t-32 365.5t32 365.5t87.5 257t140.5 162.5t181.5 86.5t219.5 24.5t219.5 -24.5t181.5 -86.5t140.5 -162.5t87.5 -257t32 -365.5z"/>
+			<glyph glyph-name="_619" unicode="&#xf294;" horiz-adv-x="1024"
+				   d="M596 113l173 172l-173 172v-344zM596 823l173 172l-173 172v-344zM628 640l356 -356l-539 -540v711l-297 -296l-108 108l372 373l-372 373l108 108l297 -296v711l539 -540z"/>
+			<glyph glyph-name="_620" unicode="&#xf295;"
+				   d="M1280 256q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM512 1024q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5
 t112.5 -271.5zM1440 1344q0 -20 -13 -38l-1056 -1408q-19 -26 -51 -26h-160q-26 0 -45 19t-19 45q0 20 13 38l1056 1408q19 26 51 26h160q26 0 45 -19t19 -45zM768 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5
-t271.5 -112.5t112.5 -271.5z" />
-    <glyph glyph-name="_621" unicode="&#xf296;" horiz-adv-x="1792" 
-d="M104 830l792 -1015l-868 630q-18 13 -25 34.5t0 42.5l101 308v0zM566 830h660l-330 -1015v0zM368 1442l198 -612h-462l198 612q8 23 33 23t33 -23zM1688 830l101 -308q7 -21 0 -42.5t-25 -34.5l-868 -630l792 1015v0zM1688 830h-462l198 612q8 23 33 23t33 -23z" />
-    <glyph glyph-name="_622" unicode="&#xf297;" horiz-adv-x="1792" 
-d="M384 704h160v224h-160v-224zM1221 372v92q-104 -36 -243 -38q-135 -1 -259.5 46.5t-220.5 122.5l1 -96q88 -80 212 -128.5t272 -47.5q129 0 238 49zM640 704h640v224h-640v-224zM1792 736q0 -187 -99 -352q89 -102 89 -229q0 -157 -129.5 -268t-313.5 -111
-q-122 0 -225 52.5t-161 140.5q-19 -1 -57 -1t-57 1q-58 -88 -161 -140.5t-225 -52.5q-184 0 -313.5 111t-129.5 268q0 127 89 229q-99 165 -99 352q0 209 120 385.5t326.5 279.5t449.5 103t449.5 -103t326.5 -279.5t120 -385.5z" />
-    <glyph glyph-name="_623" unicode="&#xf298;" 
-d="M515 625v-128h-252v128h252zM515 880v-127h-252v127h252zM1273 369v-128h-341v128h341zM1273 625v-128h-672v128h672zM1273 880v-127h-672v127h672zM1408 20v1240q0 8 -6 14t-14 6h-32l-378 -256l-210 171l-210 -171l-378 256h-32q-8 0 -14 -6t-6 -14v-1240q0 -8 6 -14
-t14 -6h1240q8 0 14 6t6 14zM553 1130l185 150h-406zM983 1130l221 150h-406zM1536 1260v-1240q0 -62 -43 -105t-105 -43h-1240q-62 0 -105 43t-43 105v1240q0 62 43 105t105 43h1240q62 0 105 -43t43 -105z" />
-    <glyph glyph-name="_624" unicode="&#xf299;" horiz-adv-x="1792" 
-d="M896 720q-104 196 -160 278q-139 202 -347 318q-34 19 -70 36q-89 40 -94 32t34 -38l39 -31q62 -43 112.5 -93.5t94.5 -116.5t70.5 -113t70.5 -131q9 -17 13 -25q44 -84 84 -153t98 -154t115.5 -150t131 -123.5t148.5 -90.5q153 -66 154 -60q1 3 -49 37q-53 36 -81 57
+t271.5 -112.5t112.5 -271.5z"/>
+			<glyph glyph-name="_621" unicode="&#xf296;" horiz-adv-x="1792"
+				   d="M104 830l792 -1015l-868 630q-18 13 -25 34.5t0 42.5l101 308v0zM566 830h660l-330 -1015v0zM368 1442l198 -612h-462l198 612q8 23 33 23t33 -23zM1688 830l101 -308q7 -21 0 -42.5t-25 -34.5l-868 -630l792 1015v0zM1688 830h-462l198 612q8 23 33 23t33 -23z"/>
+			<glyph glyph-name="_622" unicode="&#xf297;" horiz-adv-x="1792"
+				   d="M384 704h160v224h-160v-224zM1221 372v92q-104 -36 -243 -38q-135 -1 -259.5 46.5t-220.5 122.5l1 -96q88 -80 212 -128.5t272 -47.5q129 0 238 49zM640 704h640v224h-640v-224zM1792 736q0 -187 -99 -352q89 -102 89 -229q0 -157 -129.5 -268t-313.5 -111
+q-122 0 -225 52.5t-161 140.5q-19 -1 -57 -1t-57 1q-58 -88 -161 -140.5t-225 -52.5q-184 0 -313.5 111t-129.5 268q0 127 89 229q-99 165 -99 352q0 209 120 385.5t326.5 279.5t449.5 103t449.5 -103t326.5 -279.5t120 -385.5z"/>
+			<glyph glyph-name="_623" unicode="&#xf298;"
+				   d="M515 625v-128h-252v128h252zM515 880v-127h-252v127h252zM1273 369v-128h-341v128h341zM1273 625v-128h-672v128h672zM1273 880v-127h-672v127h672zM1408 20v1240q0 8 -6 14t-14 6h-32l-378 -256l-210 171l-210 -171l-378 256h-32q-8 0 -14 -6t-6 -14v-1240q0 -8 6 -14
+t14 -6h1240q8 0 14 6t6 14zM553 1130l185 150h-406zM983 1130l221 150h-406zM1536 1260v-1240q0 -62 -43 -105t-105 -43h-1240q-62 0 -105 43t-43 105v1240q0 62 43 105t105 43h1240q62 0 105 -43t43 -105z"/>
+			<glyph glyph-name="_624" unicode="&#xf299;" horiz-adv-x="1792"
+				   d="M896 720q-104 196 -160 278q-139 202 -347 318q-34 19 -70 36q-89 40 -94 32t34 -38l39 -31q62 -43 112.5 -93.5t94.5 -116.5t70.5 -113t70.5 -131q9 -17 13 -25q44 -84 84 -153t98 -154t115.5 -150t131 -123.5t148.5 -90.5q153 -66 154 -60q1 3 -49 37q-53 36 -81 57
 q-77 58 -179 211t-185 310zM549 177q-76 60 -132.5 125t-98 143.5t-71 154.5t-58.5 186t-52 209t-60.5 252t-76.5 289q273 0 497.5 -36t379 -92t271 -144.5t185.5 -172.5t110 -198.5t56 -199.5t12.5 -198.5t-9.5 -173t-20 -143.5t-13 -107l323 -327h-104l-281 285
-q-22 -2 -91.5 -14t-121.5 -19t-138 -6t-160.5 17t-167.5 59t-179 111z" />
-    <glyph glyph-name="_625" unicode="&#xf29a;" horiz-adv-x="1792" 
-d="M1374 879q-6 26 -28.5 39.5t-48.5 7.5q-261 -62 -401 -62t-401 62q-26 6 -48.5 -7.5t-28.5 -39.5t7.5 -48.5t39.5 -28.5q194 -46 303 -58q-2 -158 -15.5 -269t-26.5 -155.5t-41 -115.5l-9 -21q-10 -25 1 -49t36 -34q9 -4 23 -4q44 0 60 41l8 20q54 139 71 259h42
+q-22 -2 -91.5 -14t-121.5 -19t-138 -6t-160.5 17t-167.5 59t-179 111z"/>
+			<glyph glyph-name="_625" unicode="&#xf29a;" horiz-adv-x="1792"
+				   d="M1374 879q-6 26 -28.5 39.5t-48.5 7.5q-261 -62 -401 -62t-401 62q-26 6 -48.5 -7.5t-28.5 -39.5t7.5 -48.5t39.5 -28.5q194 -46 303 -58q-2 -158 -15.5 -269t-26.5 -155.5t-41 -115.5l-9 -21q-10 -25 1 -49t36 -34q9 -4 23 -4q44 0 60 41l8 20q54 139 71 259h42
 q17 -120 71 -259l8 -20q16 -41 60 -41q14 0 23 4q25 10 36 34t1 49l-9 21q-28 71 -41 115.5t-26.5 155.5t-15.5 269q109 12 303 58q26 6 39.5 28.5t7.5 48.5zM1024 1024q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z
 M1600 640q0 -143 -55.5 -273.5t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5zM896 1408q-156 0 -298 -61t-245 -164t-164 -245t-61 -298t61 -298
-t164 -245t245 -164t298 -61t298 61t245 164t164 245t61 298t-61 298t-164 245t-245 164t-298 61zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="_626" unicode="&#xf29b;" 
-d="M1438 723q34 -35 29 -82l-44 -551q-4 -42 -34.5 -70t-71.5 -28q-6 0 -9 1q-44 3 -72.5 36.5t-25.5 77.5l35 429l-143 -8q55 -113 55 -240q0 -216 -148 -372l-137 137q91 101 91 235q0 145 -102.5 248t-247.5 103q-134 0 -236 -92l-137 138q120 114 284 141l264 300
+t164 -245t245 -164t298 -61t298 61t245 164t164 245t61 298t-61 298t-164 245t-245 164t-298 61zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z"/>
+			<glyph glyph-name="_626" unicode="&#xf29b;"
+				   d="M1438 723q34 -35 29 -82l-44 -551q-4 -42 -34.5 -70t-71.5 -28q-6 0 -9 1q-44 3 -72.5 36.5t-25.5 77.5l35 429l-143 -8q55 -113 55 -240q0 -216 -148 -372l-137 137q91 101 91 235q0 145 -102.5 248t-247.5 103q-134 0 -236 -92l-137 138q120 114 284 141l264 300
 l-149 87l-181 -161q-33 -30 -77 -27.5t-73 35.5t-26.5 77t34.5 73l239 213q26 23 60 26.5t64 -14.5l488 -283q36 -21 48 -68q17 -67 -26 -117l-205 -232l371 20q49 3 83 -32zM1240 1180q-74 0 -126 52t-52 126t52 126t126 52t126.5 -52t52.5 -126t-52.5 -126t-126.5 -52z
-M613 -62q106 0 196 61l139 -139q-146 -116 -335 -116q-148 0 -273.5 73t-198.5 198t-73 273q0 188 116 336l139 -139q-60 -88 -60 -197q0 -145 102.5 -247.5t247.5 -102.5z" />
-    <glyph glyph-name="_627" unicode="&#xf29c;" 
-d="M880 336v-160q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h160q14 0 23 -9t9 -23zM1136 832q0 -50 -15 -90t-45.5 -69t-52 -44t-59.5 -36q-32 -18 -46.5 -28t-26 -24t-11.5 -29v-32q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v68q0 35 10.5 64.5
+M613 -62q106 0 196 61l139 -139q-146 -116 -335 -116q-148 0 -273.5 73t-198.5 198t-73 273q0 188 116 336l139 -139q-60 -88 -60 -197q0 -145 102.5 -247.5t247.5 -102.5z"/>
+			<glyph glyph-name="_627" unicode="&#xf29c;"
+				   d="M880 336v-160q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h160q14 0 23 -9t9 -23zM1136 832q0 -50 -15 -90t-45.5 -69t-52 -44t-59.5 -36q-32 -18 -46.5 -28t-26 -24t-11.5 -29v-32q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v68q0 35 10.5 64.5
 t24 47.5t39 35.5t41 25.5t44.5 21q53 25 75 43t22 49q0 42 -43.5 71.5t-95.5 29.5q-56 0 -95 -27q-29 -20 -80 -83q-9 -12 -25 -12q-11 0 -19 6l-108 82q-10 7 -12 20t5 23q122 192 349 192q129 0 238.5 -89.5t109.5 -214.5zM768 1280q-130 0 -248.5 -51t-204 -136.5
 t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5
-t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="_628" unicode="&#xf29d;" horiz-adv-x="1408" 
-d="M366 1225q-64 0 -110 45.5t-46 110.5q0 64 46 109.5t110 45.5t109.5 -45.5t45.5 -109.5q0 -65 -45.5 -110.5t-109.5 -45.5zM917 583q0 -50 -30 -67.5t-63.5 -6.5t-47.5 34l-367 438q-7 12 -14 15.5t-11 1.5l-3 -3q-7 -8 4 -21l122 -139l1 -354l-161 -457
+t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="_628" unicode="&#xf29d;" horiz-adv-x="1408"
+				   d="M366 1225q-64 0 -110 45.5t-46 110.5q0 64 46 109.5t110 45.5t109.5 -45.5t45.5 -109.5q0 -65 -45.5 -110.5t-109.5 -45.5zM917 583q0 -50 -30 -67.5t-63.5 -6.5t-47.5 34l-367 438q-7 12 -14 15.5t-11 1.5l-3 -3q-7 -8 4 -21l122 -139l1 -354l-161 -457
 q-67 -192 -92 -234q-15 -26 -28 -32q-50 -26 -103 -1q-29 13 -41.5 43t-9.5 57q2 17 197 618l5 416l-85 -164l35 -222q4 -24 -1 -42t-14 -27.5t-19 -16t-17 -7.5l-7 -2q-19 -3 -34.5 3t-24 16t-14 22t-7.5 19.5t-2 9.5l-46 299l211 381q23 34 113 34q75 0 107 -40l424 -521
 q7 -5 14 -17l3 -3l-1 -1q7 -13 7 -29zM514 433q43 -113 88.5 -225t69.5 -168l24 -55q36 -93 42 -125q11 -70 -36 -97q-35 -22 -66 -16t-51 22t-29 35h-1q-6 16 -8 25l-124 351zM1338 -159q31 -49 31 -57q0 -5 -3 -7q-9 -5 -14.5 0.5t-15.5 26t-16 30.5q-114 172 -423 661
-q3 -1 7 1t7 4l3 2q11 9 11 17z" />
-    <glyph glyph-name="_629" unicode="&#xf29e;" horiz-adv-x="2304" 
-d="M504 542h171l-1 265zM1530 641q0 87 -50.5 140t-146.5 53h-54v-388h52q91 0 145 57t54 138zM956 1018l1 -756q0 -14 -9.5 -24t-23.5 -10h-216q-14 0 -23.5 10t-9.5 24v62h-291l-55 -81q-10 -15 -28 -15h-267q-21 0 -30.5 18t3.5 35l556 757q9 14 27 14h332q14 0 24 -10
+q3 -1 7 1t7 4l3 2q11 9 11 17z"/>
+			<glyph glyph-name="_629" unicode="&#xf29e;" horiz-adv-x="2304"
+				   d="M504 542h171l-1 265zM1530 641q0 87 -50.5 140t-146.5 53h-54v-388h52q91 0 145 57t54 138zM956 1018l1 -756q0 -14 -9.5 -24t-23.5 -10h-216q-14 0 -23.5 10t-9.5 24v62h-291l-55 -81q-10 -15 -28 -15h-267q-21 0 -30.5 18t3.5 35l556 757q9 14 27 14h332q14 0 24 -10
 t10 -24zM1783 641q0 -193 -125.5 -303t-324.5 -110h-270q-14 0 -24 10t-10 24v756q0 14 10 24t24 10h268q200 0 326 -109t126 -302zM1939 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5
 t-7.5 60t-20 91.5t-41 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2123 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-45 -108t-74 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5
 h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2304 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66 104.5t41 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96
-t9.5 -70.5z" />
-    <glyph glyph-name="uniF2A0" unicode="&#xf2a0;" horiz-adv-x="1408" 
-d="M617 -153q0 11 -13 58t-31 107t-20 69q-1 4 -5 26.5t-8.5 36t-13.5 21.5q-15 14 -51 14q-23 0 -70 -5.5t-71 -5.5q-34 0 -47 11q-6 5 -11 15.5t-7.5 20t-6.5 24t-5 18.5q-37 128 -37 255t37 255q1 4 5 18.5t6.5 24t7.5 20t11 15.5q13 11 47 11q24 0 71 -5.5t70 -5.5
+t9.5 -70.5z"/>
+			<glyph glyph-name="uniF2A0" unicode="&#xf2a0;" horiz-adv-x="1408"
+				   d="M617 -153q0 11 -13 58t-31 107t-20 69q-1 4 -5 26.5t-8.5 36t-13.5 21.5q-15 14 -51 14q-23 0 -70 -5.5t-71 -5.5q-34 0 -47 11q-6 5 -11 15.5t-7.5 20t-6.5 24t-5 18.5q-37 128 -37 255t37 255q1 4 5 18.5t6.5 24t7.5 20t11 15.5q13 11 47 11q24 0 71 -5.5t70 -5.5
 q36 0 51 14q9 8 13.5 21.5t8.5 36t5 26.5q2 9 20 69t31 107t13 58q0 22 -43.5 52.5t-75.5 42.5q-20 8 -45 8q-34 0 -98 -18q-57 -17 -96.5 -40.5t-71 -66t-46 -70t-45.5 -94.5q-6 -12 -9 -19q-49 -107 -68 -216t-19 -244t19 -244t68 -216q56 -122 83 -161q63 -91 179 -127
 l6 -2q64 -18 98 -18q25 0 45 8q32 12 75.5 42.5t43.5 52.5zM776 760q-26 0 -45 19t-19 45.5t19 45.5q37 37 37 90q0 52 -37 91q-19 19 -19 45t19 45t45 19t45 -19q75 -75 75 -181t-75 -181q-21 -19 -45 -19zM957 579q-27 0 -45 19q-19 19 -19 45t19 45q112 114 112 272
 t-112 272q-19 19 -19 45t19 45t45 19t45 -19q150 -150 150 -362t-150 -362q-18 -19 -45 -19zM1138 398q-27 0 -45 19q-19 19 -19 45t19 45q90 91 138.5 208t48.5 245t-48.5 245t-138.5 208q-19 19 -19 45t19 45t45 19t45 -19q109 -109 167 -249t58 -294t-58 -294t-167 -249
-q-18 -19 -45 -19z" />
-    <glyph glyph-name="uniF2A1" unicode="&#xf2a1;" horiz-adv-x="2176" 
-d="M192 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 352
+q-18 -19 -45 -19z"/>
+			<glyph glyph-name="uniF2A1" unicode="&#xf2a1;" horiz-adv-x="2176"
+				   d="M192 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 352
 q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 864
 q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 1376q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 192q0 -80 -56 -136
 t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 1216q0 -80 -56 -136t-136 -56
 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 192q0 -80 -56 -136t-136 -56t-136 56
 t-56 136t56 136t136 56t136 -56t56 -136zM1664 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136
-t56 136t136 56t136 -56t56 -136zM2176 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z" />
-    <glyph glyph-name="uniF2A2" unicode="&#xf2a2;" horiz-adv-x="1792" 
-d="M128 -192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM320 0q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM365 365l256 -256l-90 -90l-256 256zM704 384q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45z
+t56 136t136 56t136 -56t56 -136zM2176 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z"/>
+			<glyph glyph-name="uniF2A2" unicode="&#xf2a2;" horiz-adv-x="1792"
+				   d="M128 -192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM320 0q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM365 365l256 -256l-90 -90l-256 256zM704 384q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45z
 M1411 704q0 -59 -11.5 -108.5t-37.5 -93.5t-44 -67.5t-53 -64.5q-31 -35 -45.5 -54t-33.5 -50t-26.5 -64t-7.5 -74q0 -159 -112.5 -271.5t-271.5 -112.5q-26 0 -45 19t-19 45t19 45t45 19q106 0 181 75t75 181q0 57 11.5 105.5t37 91t43.5 66.5t52 63q40 46 59.5 72
 t37.5 74.5t18 103.5q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM896 576q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45
 t45 19t45 -19t19 -45zM1184 704q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 93 -65.5 158.5t-158.5 65.5q-92 0 -158 -65.5t-66 -158.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 146 103 249t249 103t249 -103t103 -249zM1578 993q10 -25 -1 -49t-36 -34q-9 -4 -23 -4
-q-19 0 -35.5 11t-23.5 30q-68 178 -224 295q-21 16 -25 42t12 47q17 21 43 25t47 -12q183 -137 266 -351zM1788 1074q9 -25 -1.5 -49t-35.5 -34q-11 -4 -23 -4q-44 0 -60 41q-92 238 -297 393q-22 16 -25.5 42t12.5 47q16 22 42 25.5t47 -12.5q235 -175 341 -449z" />
-    <glyph glyph-name="uniF2A3" unicode="&#xf2a3;" horiz-adv-x="2304" 
-d="M1032 576q-59 2 -84 55q-17 34 -48 53.5t-68 19.5q-53 0 -90.5 -37.5t-37.5 -90.5q0 -56 36 -89l10 -8q34 -31 82 -31q37 0 68 19.5t48 53.5q25 53 84 55zM1600 704q0 56 -36 89l-10 8q-34 31 -82 31q-37 0 -68 -19.5t-48 -53.5q-25 -53 -84 -55q59 -2 84 -55
+q-19 0 -35.5 11t-23.5 30q-68 178 -224 295q-21 16 -25 42t12 47q17 21 43 25t47 -12q183 -137 266 -351zM1788 1074q9 -25 -1.5 -49t-35.5 -34q-11 -4 -23 -4q-44 0 -60 41q-92 238 -297 393q-22 16 -25.5 42t12.5 47q16 22 42 25.5t47 -12.5q235 -175 341 -449z"/>
+			<glyph glyph-name="uniF2A3" unicode="&#xf2a3;" horiz-adv-x="2304"
+				   d="M1032 576q-59 2 -84 55q-17 34 -48 53.5t-68 19.5q-53 0 -90.5 -37.5t-37.5 -90.5q0 -56 36 -89l10 -8q34 -31 82 -31q37 0 68 19.5t48 53.5q25 53 84 55zM1600 704q0 56 -36 89l-10 8q-34 31 -82 31q-37 0 -68 -19.5t-48 -53.5q-25 -53 -84 -55q59 -2 84 -55
 q17 -34 48 -53.5t68 -19.5q53 0 90.5 37.5t37.5 90.5zM1174 925q-17 -35 -55 -48t-73 4q-62 31 -134 31q-51 0 -99 -17q3 0 9.5 0.5t9.5 0.5q92 0 170.5 -50t118.5 -133q17 -36 3.5 -73.5t-49.5 -54.5q-18 -9 -39 -9q21 0 39 -9q36 -17 49.5 -54.5t-3.5 -73.5
 q-40 -83 -118.5 -133t-170.5 -50h-6q-16 2 -44 4l-290 27l-239 -120q-14 -7 -29 -7q-40 0 -57 35l-160 320q-11 23 -4 47.5t29 37.5l209 119l148 267q17 155 91.5 291.5t195.5 236.5q31 25 70.5 21.5t64.5 -34.5t21.5 -70t-34.5 -65q-70 -59 -117 -128q123 84 267 101
 q40 5 71.5 -19t35.5 -64q5 -40 -19 -71.5t-64 -35.5q-84 -10 -159 -55q46 10 99 10q115 0 218 -50q36 -18 49 -55.5t-5 -73.5zM2137 1085l160 -320q11 -23 4 -47.5t-29 -37.5l-209 -119l-148 -267q-17 -155 -91.5 -291.5t-195.5 -236.5q-26 -22 -61 -22q-45 0 -74 35
 q-25 31 -21.5 70t34.5 65q70 59 117 128q-123 -84 -267 -101q-4 -1 -12 -1q-36 0 -63.5 24t-31.5 60q-5 40 19 71.5t64 35.5q84 10 159 55q-46 -10 -99 -10q-115 0 -218 50q-36 18 -49 55.5t5 73.5q17 35 55 48t73 -4q62 -31 134 -31q51 0 99 17q-3 0 -9.5 -0.5t-9.5 -0.5
-q-92 0 -170.5 50t-118.5 133q-17 36 -3.5 73.5t49.5 54.5q18 9 39 9q-21 0 -39 9q-36 17 -49.5 54.5t3.5 73.5q40 83 118.5 133t170.5 50h6h1q14 -2 42 -4l291 -27l239 120q14 7 29 7q40 0 57 -35z" />
-    <glyph glyph-name="uniF2A4" unicode="&#xf2a4;" horiz-adv-x="1792" 
-d="M1056 704q0 -26 19 -45t45 -19t45 19t19 45q0 146 -103 249t-249 103t-249 -103t-103 -249q0 -26 19 -45t45 -19t45 19t19 45q0 93 66 158.5t158 65.5t158 -65.5t66 -158.5zM835 1280q-117 0 -223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5q0 -26 19 -45t45 -19t45 19
+q-92 0 -170.5 50t-118.5 133q-17 36 -3.5 73.5t49.5 54.5q18 9 39 9q-21 0 -39 9q-36 17 -49.5 54.5t3.5 73.5q40 83 118.5 133t170.5 50h6h1q14 -2 42 -4l291 -27l239 120q14 7 29 7q40 0 57 -35z"/>
+			<glyph glyph-name="uniF2A4" unicode="&#xf2a4;" horiz-adv-x="1792"
+				   d="M1056 704q0 -26 19 -45t45 -19t45 19t19 45q0 146 -103 249t-249 103t-249 -103t-103 -249q0 -26 19 -45t45 -19t45 19t19 45q0 93 66 158.5t158 65.5t158 -65.5t66 -158.5zM835 1280q-117 0 -223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5q0 -26 19 -45t45 -19t45 19
 t19 45q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -55 -18 -103.5t-37.5 -74.5t-59.5 -72q-34 -39 -52 -63t-43.5 -66.5t-37 -91t-11.5 -105.5q0 -106 -75 -181t-181 -75q-26 0 -45 -19t-19 -45t19 -45t45 -19q159 0 271.5 112.5t112.5 271.5q0 41 7.5 74
 t26.5 64t33.5 50t45.5 54q35 41 53 64.5t44 67.5t37.5 93.5t11.5 108.5q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5zM591 561l226 -226l-579 -579q-12 -12 -29 -12t-29 12l-168 168q-12 12 -12 29t12 29zM1612 1524l168 -168q12 -12 12 -29t-12 -30l-233 -233
-l-26 -25l-71 -71q-66 153 -195 258l91 91l207 207q13 12 30 12t29 -12z" />
-    <glyph glyph-name="uniF2A5" unicode="&#xf2a5;" 
-d="M866 1021q0 -27 -13 -94q-11 -50 -31.5 -150t-30.5 -150q-2 -11 -4.5 -12.5t-13.5 -2.5q-20 -2 -31 -2q-58 0 -84 49.5t-26 113.5q0 88 35 174t103 124q28 14 51 14q28 0 36.5 -16.5t8.5 -47.5zM1352 597q0 14 -39 75.5t-52 66.5q-21 8 -34 8q-91 0 -226 -77l-2 2
+l-26 -25l-71 -71q-66 153 -195 258l91 91l207 207q13 12 30 12t29 -12z"/>
+			<glyph glyph-name="uniF2A5" unicode="&#xf2a5;"
+				   d="M866 1021q0 -27 -13 -94q-11 -50 -31.5 -150t-30.5 -150q-2 -11 -4.5 -12.5t-13.5 -2.5q-20 -2 -31 -2q-58 0 -84 49.5t-26 113.5q0 88 35 174t103 124q28 14 51 14q28 0 36.5 -16.5t8.5 -47.5zM1352 597q0 14 -39 75.5t-52 66.5q-21 8 -34 8q-91 0 -226 -77l-2 2
 q3 22 27.5 135t24.5 178q0 233 -242 233q-24 0 -68 -6q-94 -17 -168.5 -89.5t-111.5 -166.5t-37 -189q0 -146 80.5 -225t227.5 -79q25 0 25 -3t-1 -5q-4 -34 -26 -117q-14 -52 -51.5 -101t-82.5 -49q-42 0 -42 47q0 24 10.5 47.5t25 39.5t29.5 28.5t26 20t11 8.5q0 3 -7 10
 q-24 22 -58.5 36.5t-65.5 14.5q-35 0 -63.5 -34t-41 -75t-12.5 -75q0 -88 51.5 -142t138.5 -54q82 0 155 53t117.5 126t65.5 153q6 22 15.5 66.5t14.5 66.5q3 12 14 18q118 60 227 60q48 0 127 -18q1 -1 4 -1q5 0 9.5 4.5t4.5 8.5zM1536 1120v-960q0 -119 -84.5 -203.5
-t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="uniF2A6" unicode="&#xf2a6;" horiz-adv-x="1535" 
-d="M744 1231q0 24 -2 38.5t-8.5 30t-21 23t-37.5 7.5q-39 0 -78 -23q-105 -58 -159 -190.5t-54 -269.5q0 -44 8.5 -85.5t26.5 -80.5t52.5 -62.5t81.5 -23.5q4 0 18 -0.5t20 0t16 3t15 8.5t7 16q16 77 48 231.5t48 231.5q19 91 19 146zM1498 575q0 -7 -7.5 -13.5t-15.5 -6.5
+t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="uniF2A6" unicode="&#xf2a6;" horiz-adv-x="1535"
+				   d="M744 1231q0 24 -2 38.5t-8.5 30t-21 23t-37.5 7.5q-39 0 -78 -23q-105 -58 -159 -190.5t-54 -269.5q0 -44 8.5 -85.5t26.5 -80.5t52.5 -62.5t81.5 -23.5q4 0 18 -0.5t20 0t16 3t15 8.5t7 16q16 77 48 231.5t48 231.5q19 91 19 146zM1498 575q0 -7 -7.5 -13.5t-15.5 -6.5
 l-6 1q-22 3 -62 11t-72 12.5t-63 4.5q-167 0 -351 -93q-15 -8 -21 -27q-10 -36 -24.5 -105.5t-22.5 -100.5q-23 -91 -70 -179.5t-112.5 -164.5t-154.5 -123t-185 -47q-135 0 -214.5 83.5t-79.5 219.5q0 53 19.5 117t63 116.5t97.5 52.5q38 0 120 -33.5t83 -61.5
 q0 -1 -16.5 -12.5t-39.5 -31t-46 -44.5t-39 -61t-16 -74q0 -33 16.5 -53t48.5 -20q45 0 85 31.5t66.5 78t48 105.5t32.5 107t16 90v9q0 2 -3.5 3.5t-8.5 1.5h-10t-10 -0.5t-6 -0.5q-227 0 -352 122.5t-125 348.5q0 108 34.5 221t96 210t156 167.5t204.5 89.5q52 9 106 9
-q374 0 374 -360q0 -98 -38 -273t-43 -211l3 -3q101 57 182.5 88t167.5 31q22 0 53 -13q19 -7 80 -102.5t61 -116.5z" />
-    <glyph glyph-name="uniF2A7" unicode="&#xf2a7;" horiz-adv-x="1664" 
-d="M831 863q32 0 59 -18l222 -148q61 -40 110 -97l146 -170q40 -46 29 -106l-72 -413q-6 -32 -29.5 -53.5t-55.5 -25.5l-527 -56l-352 -32h-9q-39 0 -67.5 28t-28.5 68q0 37 27 64t65 32l260 32h-448q-41 0 -69.5 30t-26.5 71q2 39 32 65t69 26l442 1l-521 64q-41 5 -66 37
+q374 0 374 -360q0 -98 -38 -273t-43 -211l3 -3q101 57 182.5 88t167.5 31q22 0 53 -13q19 -7 80 -102.5t61 -116.5z"/>
+			<glyph glyph-name="uniF2A7" unicode="&#xf2a7;" horiz-adv-x="1664"
+				   d="M831 863q32 0 59 -18l222 -148q61 -40 110 -97l146 -170q40 -46 29 -106l-72 -413q-6 -32 -29.5 -53.5t-55.5 -25.5l-527 -56l-352 -32h-9q-39 0 -67.5 28t-28.5 68q0 37 27 64t65 32l260 32h-448q-41 0 -69.5 30t-26.5 71q2 39 32 65t69 26l442 1l-521 64q-41 5 -66 37
 t-19 73q6 35 34.5 57.5t65.5 22.5h10l481 -60l-351 94q-38 10 -62 41.5t-18 68.5q6 36 33 58.5t62 22.5q6 0 20 -2l448 -96l217 -37q1 0 3 -0.5t3 -0.5q23 0 30.5 23t-12.5 36l-186 125q-35 23 -42 63.5t18 73.5q27 38 76 38zM761 661l186 -125l-218 37l-5 2l-36 38
 l-238 262q-1 1 -2.5 3.5t-2.5 3.5q-24 31 -18.5 70t37.5 64q31 23 68 17.5t64 -33.5l142 -147q-2 -1 -5 -3.5t-4 -4.5q-32 -45 -23 -99t55 -85zM1648 1115l15 -266q4 -73 -11 -147l-48 -219q-12 -59 -67 -87l-106 -54q2 62 -39 109l-146 170q-53 61 -117 103l-222 148
 q-34 23 -76 23q-51 0 -88 -37l-235 312q-25 33 -18 73.5t41 63.5q33 22 71.5 14t62.5 -40l266 -352l-262 455q-21 35 -10.5 75t47.5 59q35 18 72.5 6t57.5 -46l241 -420l-136 337q-15 35 -4.5 74t44.5 56q37 19 76 6t56 -51l193 -415l101 -196q8 -15 23 -17.5t27 7.5t11 26
-l-12 224q-2 41 26 71t69 31q39 0 67 -28.5t30 -67.5z" />
-    <glyph glyph-name="uniF2A8" unicode="&#xf2a8;" horiz-adv-x="1792" 
-d="M335 180q-2 0 -6 2q-86 57 -168.5 145t-139.5 180q-21 30 -21 69q0 9 2 19t4 18t7 18t8.5 16t10.5 17t10 15t12 15.5t11 14.5q184 251 452 365q-110 198 -110 211q0 19 17 29q116 64 128 64q18 0 28 -16l124 -229q92 19 192 19q266 0 497.5 -137.5t378.5 -369.5
+l-12 224q-2 41 26 71t69 31q39 0 67 -28.5t30 -67.5z"/>
+			<glyph glyph-name="uniF2A8" unicode="&#xf2a8;" horiz-adv-x="1792"
+				   d="M335 180q-2 0 -6 2q-86 57 -168.5 145t-139.5 180q-21 30 -21 69q0 9 2 19t4 18t7 18t8.5 16t10.5 17t10 15t12 15.5t11 14.5q184 251 452 365q-110 198 -110 211q0 19 17 29q116 64 128 64q18 0 28 -16l124 -229q92 19 192 19q266 0 497.5 -137.5t378.5 -369.5
 q20 -31 20 -69t-20 -69q-91 -142 -218.5 -253.5t-278.5 -175.5q110 -198 110 -211q0 -20 -17 -29q-116 -64 -127 -64q-19 0 -29 16l-124 229l-64 119l-444 820l7 7q-58 -24 -99 -47q3 -5 127 -234t243 -449t119 -223q0 -7 -9 -9q-13 -3 -72 -3q-57 0 -60 7l-456 841
 q-39 -28 -82 -68q24 -43 214 -393.5t190 -354.5q0 -10 -11 -10q-14 0 -82.5 22t-72.5 28l-106 197l-224 413q-44 -53 -78 -106q2 -3 18 -25t23 -34l176 -327q0 -10 -10 -10zM1165 282l49 -91q273 111 450 385q-180 277 -459 389q67 -64 103 -148.5t36 -176.5
-q0 -106 -47 -200.5t-132 -157.5zM848 896q0 -20 14 -34t34 -14q86 0 147 -61t61 -147q0 -20 14 -34t34 -14t34 14t14 34q0 126 -89 215t-215 89q-20 0 -34 -14t-14 -34zM1214 961l-9 4l7 -7z" />
-    <glyph glyph-name="uniF2A9" unicode="&#xf2a9;" horiz-adv-x="1280" 
-d="M1050 430q0 -215 -147 -374q-148 -161 -378 -161q-232 0 -378 161q-147 159 -147 374q0 147 68 270.5t189 196.5t268 73q96 0 182 -31q-32 -62 -39 -126q-66 28 -143 28q-167 0 -280.5 -123t-113.5 -291q0 -170 112.5 -288.5t281.5 -118.5t281 118.5t112 288.5
+q0 -106 -47 -200.5t-132 -157.5zM848 896q0 -20 14 -34t34 -14q86 0 147 -61t61 -147q0 -20 14 -34t34 -14t34 14t14 34q0 126 -89 215t-215 89q-20 0 -34 -14t-14 -34zM1214 961l-9 4l7 -7z"/>
+			<glyph glyph-name="uniF2A9" unicode="&#xf2a9;" horiz-adv-x="1280"
+				   d="M1050 430q0 -215 -147 -374q-148 -161 -378 -161q-232 0 -378 161q-147 159 -147 374q0 147 68 270.5t189 196.5t268 73q96 0 182 -31q-32 -62 -39 -126q-66 28 -143 28q-167 0 -280.5 -123t-113.5 -291q0 -170 112.5 -288.5t281.5 -118.5t281 118.5t112 288.5
 q0 89 -32 166q66 13 123 49q41 -98 41 -212zM846 619q0 -192 -79.5 -345t-238.5 -253l-14 -1q-29 0 -62 5q83 32 146.5 102.5t99.5 154.5t58.5 189t30 192.5t7.5 178.5q0 69 -3 103q55 -160 55 -326zM791 947v-2q-73 214 -206 440q88 -59 142.5 -186.5t63.5 -251.5z
-M1035 744q-83 0 -160 75q218 120 290 247q19 37 21 56q-42 -94 -139.5 -166.5t-204.5 -97.5q-35 54 -35 113q0 37 17 79t43 68q46 44 157 74q59 16 106 58.5t74 100.5q74 -105 74 -253q0 -109 -24 -170q-32 -77 -88.5 -130.5t-130.5 -53.5z" />
-    <glyph glyph-name="uniF2AA" unicode="&#xf2aa;" 
-d="M1050 495q0 78 -28 147q-41 -25 -85 -34q22 -50 22 -114q0 -117 -77 -198.5t-193 -81.5t-193.5 81.5t-77.5 198.5q0 115 78 199.5t193 84.5q53 0 98 -19q4 43 27 87q-60 21 -125 21q-154 0 -257.5 -108.5t-103.5 -263.5t103.5 -261t257.5 -106t257.5 106.5t103.5 260.5z
+M1035 744q-83 0 -160 75q218 120 290 247q19 37 21 56q-42 -94 -139.5 -166.5t-204.5 -97.5q-35 54 -35 113q0 37 17 79t43 68q46 44 157 74q59 16 106 58.5t74 100.5q74 -105 74 -253q0 -109 -24 -170q-32 -77 -88.5 -130.5t-130.5 -53.5z"/>
+			<glyph glyph-name="uniF2AA" unicode="&#xf2aa;"
+				   d="M1050 495q0 78 -28 147q-41 -25 -85 -34q22 -50 22 -114q0 -117 -77 -198.5t-193 -81.5t-193.5 81.5t-77.5 198.5q0 115 78 199.5t193 84.5q53 0 98 -19q4 43 27 87q-60 21 -125 21q-154 0 -257.5 -108.5t-103.5 -263.5t103.5 -261t257.5 -106t257.5 106.5t103.5 260.5z
 M872 850q2 -24 2 -71q0 -63 -5 -123t-20.5 -132.5t-40.5 -130t-68.5 -106t-100.5 -70.5q21 -3 42 -3h10q219 139 219 411q0 116 -38 225zM872 850q-4 80 -44 171.5t-98 130.5q92 -156 142 -302zM1207 955q0 102 -51 174q-41 -86 -124 -109q-69 -19 -109 -53.5t-40 -99.5
 q0 -40 24 -77q74 17 140.5 67t95.5 115q-4 -52 -74.5 -111.5t-138.5 -97.5q52 -52 110 -52q51 0 90 37t60 90q17 42 17 117zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
-t84.5 -203.5z" />
-    <glyph glyph-name="uniF2AB" unicode="&#xf2ab;" 
-d="M1279 388q0 22 -22 27q-67 15 -118 59t-80 108q-7 19 -7 25q0 15 19.5 26t43 17t43 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-12 0 -32 -8t-31 -8q-4 0 -12 2q5 95 5 114q0 79 -17 114q-36 78 -103 121.5t-152 43.5q-199 0 -275 -165q-17 -35 -17 -114q0 -19 5 -114
+t84.5 -203.5z"/>
+			<glyph glyph-name="uniF2AB" unicode="&#xf2ab;"
+				   d="M1279 388q0 22 -22 27q-67 15 -118 59t-80 108q-7 19 -7 25q0 15 19.5 26t43 17t43 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-12 0 -32 -8t-31 -8q-4 0 -12 2q5 95 5 114q0 79 -17 114q-36 78 -103 121.5t-152 43.5q-199 0 -275 -165q-17 -35 -17 -114q0 -19 5 -114
 q-4 -2 -14 -2q-12 0 -32 7.5t-30 7.5q-21 0 -38.5 -12t-17.5 -32q0 -21 19.5 -35.5t43 -20.5t43 -17t19.5 -26q0 -6 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -46 137 -68q2 -5 6 -26t11.5 -30.5t23.5 -9.5q12 0 37.5 4.5t39.5 4.5q35 0 67 -15t54 -32.5t57.5 -32.5
 t76.5 -15q43 0 79 15t57.5 32.5t53.5 32.5t67 15q14 0 39.5 -4t38.5 -4q16 0 23 10t11 30t6 25q137 22 137 68zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
-t103 -385.5z" />
-    <glyph glyph-name="uniF2AC" unicode="&#xf2ac;" horiz-adv-x="1664" 
-d="M848 1408q134 1 240.5 -68.5t163.5 -192.5q27 -58 27 -179q0 -47 -9 -191q14 -7 28 -7q18 0 51 13.5t51 13.5q29 0 56 -18t27 -46q0 -32 -31.5 -54t-69 -31.5t-69 -29t-31.5 -47.5q0 -15 12 -43q37 -82 102.5 -150t144.5 -101q28 -12 80 -23q28 -6 28 -35
+t103 -385.5z"/>
+			<glyph glyph-name="uniF2AC" unicode="&#xf2ac;" horiz-adv-x="1664"
+				   d="M848 1408q134 1 240.5 -68.5t163.5 -192.5q27 -58 27 -179q0 -47 -9 -191q14 -7 28 -7q18 0 51 13.5t51 13.5q29 0 56 -18t27 -46q0 -32 -31.5 -54t-69 -31.5t-69 -29t-31.5 -47.5q0 -15 12 -43q37 -82 102.5 -150t144.5 -101q28 -12 80 -23q28 -6 28 -35
 q0 -70 -219 -103q-7 -11 -11 -39t-14 -46.5t-33 -18.5q-20 0 -62 6.5t-64 6.5q-37 0 -62 -5q-32 -5 -63 -22.5t-58 -38t-58 -40.5t-76 -33.5t-99 -13.5q-52 0 -96.5 13.5t-75 33.5t-57.5 40.5t-58 38t-62 22.5q-26 5 -63 5q-24 0 -65.5 -7.5t-58.5 -7.5q-25 0 -35 18.5
-t-14 47.5t-11 40q-219 33 -219 103q0 29 28 35q52 11 80 23q78 32 144.5 101t102.5 150q12 28 12 43q0 28 -31.5 47.5t-69.5 29.5t-69.5 31.5t-31.5 52.5q0 27 26 45.5t55 18.5q15 0 48 -13t53 -13q18 0 32 7q-9 142 -9 190q0 122 27 180q64 137 172 198t264 63z" />
-    <glyph glyph-name="uniF2AD" unicode="&#xf2ad;" 
-d="M1280 388q0 22 -22 27q-67 14 -118 58t-80 109q-7 14 -7 25q0 15 19.5 26t42.5 17t42.5 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-11 0 -31 -8t-32 -8q-4 0 -12 2q5 63 5 115q0 78 -17 114q-36 78 -102.5 121.5t-152.5 43.5q-198 0 -275 -165q-18 -38 -18 -115
+t-14 47.5t-11 40q-219 33 -219 103q0 29 28 35q52 11 80 23q78 32 144.5 101t102.5 150q12 28 12 43q0 28 -31.5 47.5t-69.5 29.5t-69.5 31.5t-31.5 52.5q0 27 26 45.5t55 18.5q15 0 48 -13t53 -13q18 0 32 7q-9 142 -9 190q0 122 27 180q64 137 172 198t264 63z"/>
+			<glyph glyph-name="uniF2AD" unicode="&#xf2ad;"
+				   d="M1280 388q0 22 -22 27q-67 14 -118 58t-80 109q-7 14 -7 25q0 15 19.5 26t42.5 17t42.5 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-11 0 -31 -8t-32 -8q-4 0 -12 2q5 63 5 115q0 78 -17 114q-36 78 -102.5 121.5t-152.5 43.5q-198 0 -275 -165q-18 -38 -18 -115
 q0 -38 6 -114q-10 -2 -15 -2q-11 0 -31.5 8t-30.5 8q-20 0 -37.5 -12.5t-17.5 -32.5q0 -21 19.5 -35.5t42.5 -20.5t42.5 -17t19.5 -26q0 -11 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -47 138 -69q2 -5 6 -26t11 -30.5t23 -9.5q13 0 38.5 5t38.5 5q35 0 67.5 -15
 t54.5 -32.5t57.5 -32.5t76.5 -15q43 0 79 15t57.5 32.5t54 32.5t67.5 15q13 0 39 -4.5t39 -4.5q15 0 22.5 9.5t11.5 31t5 24.5q138 22 138 69zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960
-q119 0 203.5 -84.5t84.5 -203.5z" />
-    <glyph glyph-name="uniF2AE" unicode="&#xf2ae;" horiz-adv-x="2304" 
-d="M2304 1536q-69 -46 -125 -92t-89 -81t-59.5 -71.5t-37.5 -57.5t-22 -44.5t-14 -29.5q-10 -18 -35.5 -136.5t-48.5 -164.5q-15 -29 -50 -60.5t-67.5 -50.5t-72.5 -41t-48 -28q-47 -31 -151 -231q-341 14 -630 -158q-92 -53 -303 -179q47 16 86 31t55 22l15 7
+q119 0 203.5 -84.5t84.5 -203.5z"/>
+			<glyph glyph-name="uniF2AE" unicode="&#xf2ae;" horiz-adv-x="2304"
+				   d="M2304 1536q-69 -46 -125 -92t-89 -81t-59.5 -71.5t-37.5 -57.5t-22 -44.5t-14 -29.5q-10 -18 -35.5 -136.5t-48.5 -164.5q-15 -29 -50 -60.5t-67.5 -50.5t-72.5 -41t-48 -28q-47 -31 -151 -231q-341 14 -630 -158q-92 -53 -303 -179q47 16 86 31t55 22l15 7
 q71 27 163 64.5t133.5 53.5t108 34.5t142.5 31.5q186 31 465 -7q1 0 10 -3q11 -6 14 -17t-3 -22l-194 -345q-15 -29 -47 -22q-128 24 -354 24q-146 0 -402 -44.5t-392 -46.5q-82 -1 -149 13t-107 37t-61 40t-33 34l-1 1v2q0 6 6 6q138 0 371 55q192 366 374.5 524t383.5 158
-q5 0 14.5 -0.5t38 -5t55 -12t61.5 -24.5t63 -39.5t54 -59t40 -82.5l102 177q2 4 21 42.5t44.5 86.5t61 109.5t84 133.5t100.5 137q66 82 128 141.5t121.5 96.5t92.5 53.5t88 39.5z" />
-    <glyph glyph-name="uniF2B0" unicode="&#xf2b0;" 
-d="M1322 640q0 -45 -5 -76l-236 14l224 -78q-19 -73 -58 -141l-214 103l177 -158q-44 -61 -107 -108l-157 178l103 -215q-61 -37 -140 -59l-79 228l14 -240q-38 -6 -76 -6t-76 6l14 238l-78 -226q-74 19 -140 59l103 215l-157 -178q-59 43 -108 108l178 158l-214 -104
+q5 0 14.5 -0.5t38 -5t55 -12t61.5 -24.5t63 -39.5t54 -59t40 -82.5l102 177q2 4 21 42.5t44.5 86.5t61 109.5t84 133.5t100.5 137q66 82 128 141.5t121.5 96.5t92.5 53.5t88 39.5z"/>
+			<glyph glyph-name="uniF2B0" unicode="&#xf2b0;"
+				   d="M1322 640q0 -45 -5 -76l-236 14l224 -78q-19 -73 -58 -141l-214 103l177 -158q-44 -61 -107 -108l-157 178l103 -215q-61 -37 -140 -59l-79 228l14 -240q-38 -6 -76 -6t-76 6l14 238l-78 -226q-74 19 -140 59l103 215l-157 -178q-59 43 -108 108l178 158l-214 -104
 q-39 69 -58 141l224 79l-237 -14q-5 42 -5 76q0 35 5 77l238 -14l-225 79q19 73 58 140l214 -104l-177 159q46 61 107 108l158 -178l-103 215q67 39 140 58l77 -224l-13 236q36 6 75 6q38 0 76 -6l-14 -237l78 225q74 -19 140 -59l-103 -214l158 178q61 -47 107 -108
 l-177 -159l213 104q37 -62 58 -141l-224 -78l237 14q5 -31 5 -77zM1352 640q0 160 -78.5 295.5t-213 214t-292.5 78.5q-119 0 -227 -46.5t-186.5 -125t-124.5 -187.5t-46 -229q0 -119 46 -228t124.5 -187.5t186.5 -125t227 -46.5q158 0 292.5 78.5t213 214t78.5 294.5z
-M1425 1023v-766l-657 -383l-657 383v766l657 383zM768 -183l708 412v823l-708 411l-708 -411v-823zM1536 1088v-896l-768 -448l-768 448v896l768 448z" />
-    <glyph glyph-name="uniF2B1" unicode="&#xf2b1;" horiz-adv-x="1664" 
-d="M339 1318h691l-26 -72h-665q-110 0 -188.5 -79t-78.5 -189v-771q0 -95 60.5 -169.5t153.5 -93.5q23 -5 98 -5v-72h-45q-140 0 -239.5 100t-99.5 240v771q0 140 99.5 240t239.5 100zM1190 1536h247l-482 -1294q-23 -61 -40.5 -103.5t-45 -98t-54 -93.5t-64.5 -78.5
-t-79.5 -65t-95.5 -41t-116 -18.5v195q163 26 220 182q20 52 20 105q0 54 -20 106l-285 733h228l187 -585zM1664 978v-1111h-795q37 55 45 73h678v1038q0 85 -49.5 155t-129.5 99l25 67q101 -34 163.5 -123.5t62.5 -197.5z" />
-    <glyph glyph-name="uniF2B2" unicode="&#xf2b2;" horiz-adv-x="1792" 
-d="M852 1227q0 -29 -17 -52.5t-45 -23.5t-45 23.5t-17 52.5t17 52.5t45 23.5t45 -23.5t17 -52.5zM688 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50 -21.5t-20 -51.5v-114q0 -30 20.5 -52t49.5 -22q30 0 50.5 22t20.5 52zM860 -149v114q0 30 -20 51.5t-50 21.5t-50.5 -21.5
+M1425 1023v-766l-657 -383l-657 383v766l657 383zM768 -183l708 412v823l-708 411l-708 -411v-823zM1536 1088v-896l-768 -448l-768 448v896l768 448z"/>
+			<glyph glyph-name="uniF2B1" unicode="&#xf2b1;" horiz-adv-x="1664"
+				   d="M339 1318h691l-26 -72h-665q-110 0 -188.5 -79t-78.5 -189v-771q0 -95 60.5 -169.5t153.5 -93.5q23 -5 98 -5v-72h-45q-140 0 -239.5 100t-99.5 240v771q0 140 99.5 240t239.5 100zM1190 1536h247l-482 -1294q-23 -61 -40.5 -103.5t-45 -98t-54 -93.5t-64.5 -78.5
+t-79.5 -65t-95.5 -41t-116 -18.5v195q163 26 220 182q20 52 20 105q0 54 -20 106l-285 733h228l187 -585zM1664 978v-1111h-795q37 55 45 73h678v1038q0 85 -49.5 155t-129.5 99l25 67q101 -34 163.5 -123.5t62.5 -197.5z"/>
+			<glyph glyph-name="uniF2B2" unicode="&#xf2b2;" horiz-adv-x="1792"
+				   d="M852 1227q0 -29 -17 -52.5t-45 -23.5t-45 23.5t-17 52.5t17 52.5t45 23.5t45 -23.5t17 -52.5zM688 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50 -21.5t-20 -51.5v-114q0 -30 20.5 -52t49.5 -22q30 0 50.5 22t20.5 52zM860 -149v114q0 30 -20 51.5t-50 21.5t-50.5 -21.5
 t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22q29 0 49.5 22t20.5 52zM1034 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1208 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114
 q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1476 535q-84 -160 -232 -259.5t-323 -99.5q-123 0 -229.5 51.5t-178.5 137t-113 197.5t-41 232q0 88 21 174q-104 -175 -104 -390q0 -162 65 -312t185 -251q30 57 91 57q56 0 86 -50q32 50 87 50q56 0 86 -50q32 50 87 50t87 -50
 q30 50 86 50q28 0 52.5 -15.5t37.5 -40.5q112 94 177 231.5t73 287.5zM1326 564q0 75 -72 75q-17 0 -47 -6q-95 -19 -149 -19q-226 0 -226 243q0 86 30 204q-83 -127 -83 -275q0 -150 89 -260.5t235 -110.5q111 0 210 70q13 48 13 79zM884 1223q0 50 -32 89.5t-81 39.5
 t-81 -39.5t-32 -89.5q0 -51 31.5 -90.5t81.5 -39.5t81.5 39.5t31.5 90.5zM1513 884q0 96 -37.5 179t-113 137t-173.5 54q-77 0 -149 -35t-127 -94q-48 -159 -48 -268q0 -104 45.5 -157t147.5 -53q53 0 142 19q36 6 53 6q51 0 77.5 -28t26.5 -80q0 -26 -4 -46
 q75 68 117.5 165.5t42.5 200.5zM1792 667q0 -111 -33.5 -249.5t-93.5 -204.5q-58 -64 -195 -142.5t-228 -104.5l-4 -1v-114q0 -43 -29.5 -75t-72.5 -32q-56 0 -86 50q-32 -50 -87 -50t-87 50q-30 -50 -86 -50q-55 0 -87 50q-30 -50 -86 -50q-47 0 -75 33.5t-28 81.5
 q-90 -68 -198 -68q-118 0 -211 80q54 1 106 20q-113 31 -182 127q32 -7 71 -7q89 0 164 46q-192 192 -240 306q-24 56 -24 160q0 57 9 125.5t31.5 146.5t55 141t86.5 105t120 42q59 0 81 -52q19 29 42 54q2 3 12 13t13 16q10 15 23 38t25 42t28 39q87 111 211.5 177
-t260.5 66q35 0 62 -4q59 64 146 64q83 0 140 -57q5 -5 5 -12q0 -5 -6 -13.5t-12.5 -16t-16 -17l-10.5 -10.5q17 -6 36 -18t19 -24q0 -6 -16 -25q157 -138 197 -378q25 30 60 30q45 0 100 -49q90 -80 90 -279z" />
-    <glyph glyph-name="uniF2B3" unicode="&#xf2b3;" 
-d="M917 631q0 33 -6 64h-362v-132h217q-12 -76 -74.5 -120.5t-142.5 -44.5q-99 0 -169 71.5t-70 170.5t70 170.5t169 71.5q93 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585h109v110
-h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-    <glyph glyph-name="uniF2B4" unicode="&#xf2b4;" 
-d="M1536 1024v-839q0 -48 -49 -62q-174 -52 -338 -52q-73 0 -215.5 29.5t-227.5 29.5q-164 0 -370 -48v-338h-160v1368q-63 25 -101 81t-38 124q0 91 64 155t155 64t155 -64t64 -155q0 -68 -38 -124t-101 -81v-68q190 44 343 44q99 0 198 -15q14 -2 111.5 -22.5t149.5 -20.5
-q77 0 165 18q11 2 80 21t89 19q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="uniF2B5" unicode="&#xf2b5;" horiz-adv-x="2304" 
-d="M192 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32zM1665 442q-10 13 -38.5 50t-41.5 54t-38 49t-42.5 53t-40.5 47t-45 49l-125 -140q-83 -94 -208.5 -92t-205.5 98q-57 69 -56.5 158t58.5 157l177 206q-22 11 -51 16.5t-47.5 6t-56.5 -0.5t-49 -1q-92 0 -158 -66
+t260.5 66q35 0 62 -4q59 64 146 64q83 0 140 -57q5 -5 5 -12q0 -5 -6 -13.5t-12.5 -16t-16 -17l-10.5 -10.5q17 -6 36 -18t19 -24q0 -6 -16 -25q157 -138 197 -378q25 30 60 30q45 0 100 -49q90 -80 90 -279z"/>
+			<glyph glyph-name="uniF2B3" unicode="&#xf2b3;"
+				   d="M917 631q0 33 -6 64h-362v-132h217q-12 -76 -74.5 -120.5t-142.5 -44.5q-99 0 -169 71.5t-70 170.5t70 170.5t169 71.5q93 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585h109v110
+h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z"/>
+			<glyph glyph-name="uniF2B4" unicode="&#xf2b4;"
+				   d="M1536 1024v-839q0 -48 -49 -62q-174 -52 -338 -52q-73 0 -215.5 29.5t-227.5 29.5q-164 0 -370 -48v-338h-160v1368q-63 25 -101 81t-38 124q0 91 64 155t155 64t155 -64t64 -155q0 -68 -38 -124t-101 -81v-68q190 44 343 44q99 0 198 -15q14 -2 111.5 -22.5t149.5 -20.5
+q77 0 165 18q11 2 80 21t89 19q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="uniF2B5" unicode="&#xf2b5;" horiz-adv-x="2304"
+				   d="M192 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32zM1665 442q-10 13 -38.5 50t-41.5 54t-38 49t-42.5 53t-40.5 47t-45 49l-125 -140q-83 -94 -208.5 -92t-205.5 98q-57 69 -56.5 158t58.5 157l177 206q-22 11 -51 16.5t-47.5 6t-56.5 -0.5t-49 -1q-92 0 -158 -66
 l-158 -158h-155v-544q5 0 21 0.5t22 0t19.5 -2t20.5 -4.5t17.5 -8.5t18.5 -13.5l297 -292q115 -111 227 -111q78 0 125 47q57 -20 112.5 8t72.5 85q74 -6 127 44q20 18 36 45.5t14 50.5q10 -10 43 -10q43 0 77 21t49.5 53t12 71.5t-30.5 73.5zM1824 384h96v512h-93l-157 180
 q-66 76 -169 76h-167q-89 0 -146 -67l-209 -243q-28 -33 -28 -75t27 -75q43 -51 110 -52t111 49l193 218q25 23 53.5 21.5t47 -27t8.5 -56.5q16 -19 56 -63t60 -68q29 -36 82.5 -105.5t64.5 -84.5q52 -66 60 -140zM2112 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32z
 M2304 960v-640q0 -26 -19 -45t-45 -19h-434q-27 -65 -82 -106.5t-125 -51.5q-33 -48 -80.5 -81.5t-102.5 -45.5q-42 -53 -104.5 -81.5t-128.5 -24.5q-60 -34 -126 -39.5t-127.5 14t-117 53.5t-103.5 81l-287 282h-358q-26 0 -45 19t-19 45v672q0 26 19 45t45 19h421
-q14 14 47 48t47.5 48t44 40t50.5 37.5t51 25.5t62 19.5t68 5.5h117q99 0 181 -56q82 56 181 56h167q35 0 67 -6t56.5 -14.5t51.5 -26.5t44.5 -31t43 -39.5t39 -42t41 -48t41.5 -48.5h355q26 0 45 -19t19 -45z" />
-    <glyph glyph-name="uniF2B6" unicode="&#xf2b6;" horiz-adv-x="1792" 
-d="M1792 882v-978q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v978q0 15 11 24q8 7 39 34.5t41.5 36t45.5 37.5t70 55.5t96 73t143.5 107t192.5 140.5q5 4 52.5 40t71.5 52.5t64 35t69 18.5t69 -18.5t65 -35.5t71 -52t52 -40q110 -80 192.5 -140.5t143.5 -107
+q14 14 47 48t47.5 48t44 40t50.5 37.5t51 25.5t62 19.5t68 5.5h117q99 0 181 -56q82 56 181 56h167q35 0 67 -6t56.5 -14.5t51.5 -26.5t44.5 -31t43 -39.5t39 -42t41 -48t41.5 -48.5h355q26 0 45 -19t19 -45z"/>
+			<glyph glyph-name="uniF2B6" unicode="&#xf2b6;" horiz-adv-x="1792"
+				   d="M1792 882v-978q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v978q0 15 11 24q8 7 39 34.5t41.5 36t45.5 37.5t70 55.5t96 73t143.5 107t192.5 140.5q5 4 52.5 40t71.5 52.5t64 35t69 18.5t69 -18.5t65 -35.5t71 -52t52 -40q110 -80 192.5 -140.5t143.5 -107
 t96 -73t70 -55.5t45.5 -37.5t41.5 -36t39 -34.5q11 -9 11 -24zM1228 297q263 191 345 252q11 8 12.5 20.5t-6.5 23.5l-38 52q-8 11 -21 12.5t-24 -6.5q-231 -169 -343 -250q-5 -3 -52 -39t-71.5 -52.5t-64.5 -35t-69 -18.5t-69 18.5t-64.5 35t-71.5 52.5t-52 39
-q-186 134 -343 250q-11 8 -24 6.5t-21 -12.5l-38 -52q-8 -11 -6.5 -23.5t12.5 -20.5q82 -61 345 -252q10 -8 50 -38t65 -47t64 -39.5t77.5 -33.5t75.5 -11t75.5 11t79 34.5t64.5 39.5t65 47.5t48 36.5z" />
-    <glyph glyph-name="uniF2B7" unicode="&#xf2b7;" horiz-adv-x="1792" 
-d="M1474 623l39 -51q8 -11 6.5 -23.5t-11.5 -20.5q-43 -34 -126.5 -98.5t-146.5 -113t-67 -51.5q-39 -32 -60 -48t-60.5 -41t-76.5 -36.5t-74 -11.5h-1h-1q-37 0 -74 11.5t-76 36.5t-61 41.5t-60 47.5q-5 4 -65 50.5t-143.5 111t-122.5 94.5q-11 8 -12.5 20.5t6.5 23.5
+q-186 134 -343 250q-11 8 -24 6.5t-21 -12.5l-38 -52q-8 -11 -6.5 -23.5t12.5 -20.5q82 -61 345 -252q10 -8 50 -38t65 -47t64 -39.5t77.5 -33.5t75.5 -11t75.5 11t79 34.5t64.5 39.5t65 47.5t48 36.5z"/>
+			<glyph glyph-name="uniF2B7" unicode="&#xf2b7;" horiz-adv-x="1792"
+				   d="M1474 623l39 -51q8 -11 6.5 -23.5t-11.5 -20.5q-43 -34 -126.5 -98.5t-146.5 -113t-67 -51.5q-39 -32 -60 -48t-60.5 -41t-76.5 -36.5t-74 -11.5h-1h-1q-37 0 -74 11.5t-76 36.5t-61 41.5t-60 47.5q-5 4 -65 50.5t-143.5 111t-122.5 94.5q-11 8 -12.5 20.5t6.5 23.5
 l37 52q8 11 21.5 13t24.5 -7q94 -73 306 -236q5 -4 43.5 -35t60.5 -46.5t56.5 -32.5t58.5 -17h1h1q24 0 58.5 17t56.5 32.5t60.5 46.5t43.5 35q258 198 313 242q11 8 24 6.5t21 -12.5zM1664 -96v928q-90 83 -159 139q-91 74 -389 304q-3 2 -43 35t-61 48t-56 32.5t-59 17.5
 h-1h-1q-24 0 -59 -17.5t-56 -32.5t-61 -48t-43 -35q-215 -166 -315.5 -245.5t-129.5 -104t-82 -74.5q-14 -12 -21 -19v-928q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 832v-928q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v928q0 56 41 94
-q123 114 350 290.5t233 181.5q36 30 59 47.5t61.5 42t76 36.5t74.5 12h1h1q37 0 74.5 -12t76 -36.5t61.5 -42t59 -47.5q43 -36 156 -122t226 -177t201 -173q41 -38 41 -94z" />
-    <glyph glyph-name="uniF2B8" unicode="&#xf2b8;" 
-d="M330 1l202 -214l-34 236l-216 213zM556 -225l274 218l-11 245l-300 -215zM245 413l227 -213l-48 327l-245 204zM495 189l317 214l-14 324l-352 -200zM843 178l95 -80l-2 239l-103 79q0 -1 1 -8.5t0 -12t-5 -7.5l-78 -52l85 -70q7 -6 7 -88zM138 930l256 -200l-68 465
+q123 114 350 290.5t233 181.5q36 30 59 47.5t61.5 42t76 36.5t74.5 12h1h1q37 0 74.5 -12t76 -36.5t61.5 -42t59 -47.5q43 -36 156 -122t226 -177t201 -173q41 -38 41 -94z"/>
+			<glyph glyph-name="uniF2B8" unicode="&#xf2b8;"
+				   d="M330 1l202 -214l-34 236l-216 213zM556 -225l274 218l-11 245l-300 -215zM245 413l227 -213l-48 327l-245 204zM495 189l317 214l-14 324l-352 -200zM843 178l95 -80l-2 239l-103 79q0 -1 1 -8.5t0 -12t-5 -7.5l-78 -52l85 -70q7 -6 7 -88zM138 930l256 -200l-68 465
 l-279 173zM1173 267l15 234l-230 -164l2 -240zM417 722l373 194l-19 441l-423 -163zM1270 357l20 233l-226 142l-2 -105l144 -95q6 -4 4 -9l-7 -119zM1461 496l30 222l-179 -128l-20 -228zM1273 329l-71 49l-8 -117q0 -5 -4 -8l-234 -187q-7 -5 -14 0l-98 83l7 -161
 q0 -5 -4 -8l-293 -234q-4 -2 -6 -2q-8 2 -8 3l-228 242q-4 4 -59 277q-2 7 5 11l61 37q-94 86 -95 92l-72 351q-2 7 6 12l94 45q-133 100 -135 108l-96 466q-2 10 7 13l433 135q5 0 8 -1l317 -153q6 -4 6 -9l20 -463q0 -7 -6 -10l-118 -61l126 -85q5 -2 5 -8l5 -123l121 74
-q5 4 11 0l84 -56l3 110q0 6 5 9l206 126q6 3 11 0l245 -135q4 -4 5 -7t-6.5 -60t-17.5 -124.5t-10 -70.5q0 -5 -4 -7l-191 -153q-6 -5 -13 0z" />
-    <glyph glyph-name="uniF2B9" unicode="&#xf2b9;" horiz-adv-x="1664" 
-d="M1201 298q0 57 -5.5 107t-21 100.5t-39.5 86t-64 58t-91 22.5q-6 -4 -33.5 -20.5t-42.5 -24.5t-40.5 -20t-49 -17t-46.5 -5t-46.5 5t-49 17t-40.5 20t-42.5 24.5t-33.5 20.5q-51 0 -91 -22.5t-64 -58t-39.5 -86t-21 -100.5t-5.5 -107q0 -73 42 -121.5t103 -48.5h576
+q5 4 11 0l84 -56l3 110q0 6 5 9l206 126q6 3 11 0l245 -135q4 -4 5 -7t-6.5 -60t-17.5 -124.5t-10 -70.5q0 -5 -4 -7l-191 -153q-6 -5 -13 0z"/>
+			<glyph glyph-name="uniF2B9" unicode="&#xf2b9;" horiz-adv-x="1664"
+				   d="M1201 298q0 57 -5.5 107t-21 100.5t-39.5 86t-64 58t-91 22.5q-6 -4 -33.5 -20.5t-42.5 -24.5t-40.5 -20t-49 -17t-46.5 -5t-46.5 5t-49 17t-40.5 20t-42.5 24.5t-33.5 20.5q-51 0 -91 -22.5t-64 -58t-39.5 -86t-21 -100.5t-5.5 -107q0 -73 42 -121.5t103 -48.5h576
 q61 0 103 48.5t42 121.5zM1028 892q0 108 -76.5 184t-183.5 76t-183.5 -76t-76.5 -184q0 -107 76.5 -183t183.5 -76t183.5 76t76.5 183zM1664 352v-192q0 -14 -9 -23t-23 -9h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216
-q66 0 113 -47t47 -113v-224h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23z" />
-    <glyph glyph-name="uniF2BA" unicode="&#xf2ba;" horiz-adv-x="1664" 
-d="M1028 892q0 -107 -76.5 -183t-183.5 -76t-183.5 76t-76.5 183q0 108 76.5 184t183.5 76t183.5 -76t76.5 -184zM980 672q46 0 82.5 -17t60 -47.5t39.5 -67t24 -81t11.5 -82.5t3.5 -79q0 -67 -39.5 -118.5t-105.5 -51.5h-576q-66 0 -105.5 51.5t-39.5 118.5q0 48 4.5 93.5
+q66 0 113 -47t47 -113v-224h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23z"/>
+			<glyph glyph-name="uniF2BA" unicode="&#xf2ba;" horiz-adv-x="1664"
+				   d="M1028 892q0 -107 -76.5 -183t-183.5 -76t-183.5 76t-76.5 183q0 108 76.5 184t183.5 76t183.5 -76t76.5 -184zM980 672q46 0 82.5 -17t60 -47.5t39.5 -67t24 -81t11.5 -82.5t3.5 -79q0 -67 -39.5 -118.5t-105.5 -51.5h-576q-66 0 -105.5 51.5t-39.5 118.5q0 48 4.5 93.5
 t18.5 98.5t36.5 91.5t63 64.5t93.5 26h5q7 -4 32 -19.5t35.5 -21t33 -17t37 -16t35 -9t39.5 -4.5t39.5 4.5t35 9t37 16t33 17t35.5 21t32 19.5zM1664 928q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96
 q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216q66 0 113 -47t47 -113v-224h96q13 0 22.5 -9.5t9.5 -22.5v-192zM1408 -96v1472q0 13 -9.5 22.5t-22.5 9.5h-1216
-q-13 0 -22.5 -9.5t-9.5 -22.5v-1472q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5z" />
-    <glyph glyph-name="uniF2BB" unicode="&#xf2bb;" horiz-adv-x="2048" 
-d="M1024 405q0 64 -9 117.5t-29.5 103t-60.5 78t-97 28.5q-6 -4 -30 -18t-37.5 -21.5t-35.5 -17.5t-43 -14.5t-42 -4.5t-42 4.5t-43 14.5t-35.5 17.5t-37.5 21.5t-30 18q-57 0 -97 -28.5t-60.5 -78t-29.5 -103t-9 -117.5t37 -106.5t91 -42.5h512q54 0 91 42.5t37 106.5z
+q-13 0 -22.5 -9.5t-9.5 -22.5v-1472q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5z"/>
+			<glyph glyph-name="uniF2BB" unicode="&#xf2bb;" horiz-adv-x="2048"
+				   d="M1024 405q0 64 -9 117.5t-29.5 103t-60.5 78t-97 28.5q-6 -4 -30 -18t-37.5 -21.5t-35.5 -17.5t-43 -14.5t-42 -4.5t-42 4.5t-43 14.5t-35.5 17.5t-37.5 21.5t-30 18q-57 0 -97 -28.5t-60.5 -78t-29.5 -103t-9 -117.5t37 -106.5t91 -42.5h512q54 0 91 42.5t37 106.5z
 M867 925q0 94 -66.5 160.5t-160.5 66.5t-160.5 -66.5t-66.5 -160.5t66.5 -160.5t160.5 -66.5t160.5 66.5t66.5 160.5zM1792 416v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1792 676v56q0 15 -10.5 25.5t-25.5 10.5h-568
 q-15 0 -25.5 -10.5t-10.5 -25.5v-56q0 -15 10.5 -25.5t25.5 -10.5h568q15 0 25.5 10.5t10.5 25.5zM1792 928v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-352v96q0 14 -9 23t-23 9
-h-64q-14 0 -23 -9t-9 -23v-96h-768v96q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-96h-352q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2BC" unicode="&#xf2bc;" horiz-adv-x="2048" 
-d="M1024 405q0 -64 -37 -106.5t-91 -42.5h-512q-54 0 -91 42.5t-37 106.5t9 117.5t29.5 103t60.5 78t97 28.5q6 -4 30 -18t37.5 -21.5t35.5 -17.5t43 -14.5t42 -4.5t42 4.5t43 14.5t35.5 17.5t37.5 21.5t30 18q57 0 97 -28.5t60.5 -78t29.5 -103t9 -117.5zM867 925
+h-64q-14 0 -23 -9t-9 -23v-96h-768v96q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-96h-352q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z"/>
+			<glyph glyph-name="uniF2BC" unicode="&#xf2bc;" horiz-adv-x="2048"
+				   d="M1024 405q0 -64 -37 -106.5t-91 -42.5h-512q-54 0 -91 42.5t-37 106.5t9 117.5t29.5 103t60.5 78t97 28.5q6 -4 30 -18t37.5 -21.5t35.5 -17.5t43 -14.5t42 -4.5t42 4.5t43 14.5t35.5 17.5t37.5 21.5t30 18q57 0 97 -28.5t60.5 -78t29.5 -103t9 -117.5zM867 925
 q0 -94 -66.5 -160.5t-160.5 -66.5t-160.5 66.5t-66.5 160.5t66.5 160.5t160.5 66.5t160.5 -66.5t66.5 -160.5zM1792 480v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1792 732v-56q0 -15 -10.5 -25.5t-25.5 -10.5h-568
 q-15 0 -25.5 10.5t-10.5 25.5v56q0 15 10.5 25.5t25.5 10.5h568q15 0 25.5 -10.5t10.5 -25.5zM1792 992v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1920 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1728q-13 0 -22.5 -9.5
 t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h352v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h768v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h352q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113
-t113 47h1728q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2BD" unicode="&#xf2bd;" horiz-adv-x="1792" 
-d="M1523 197q-22 155 -87.5 257.5t-184.5 118.5q-67 -74 -159.5 -115.5t-195.5 -41.5t-195.5 41.5t-159.5 115.5q-119 -16 -184.5 -118.5t-87.5 -257.5q106 -150 271 -237.5t356 -87.5t356 87.5t271 237.5zM1280 896q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5
-t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1792 640q0 -182 -71 -347.5t-190.5 -286t-285.5 -191.5t-349 -71q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="uniF2BE" unicode="&#xf2be;" horiz-adv-x="1792" 
-d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348q0 -181 -70.5 -347t-190.5 -286t-286 -191.5t-349 -71.5t-349 71t-285.5 191.5t-190.5 286t-71 347.5t71 348t191 286t286 191t348 71zM1515 185q149 205 149 455q0 156 -61 298t-164 245t-245 164t-298 61t-298 -61
-t-245 -164t-164 -245t-61 -298q0 -250 149 -455q66 327 306 327q131 -128 313 -128t313 128q240 0 306 -327zM1280 832q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5z" />
-    <glyph glyph-name="uniF2C0" unicode="&#xf2c0;" 
-d="M1201 752q47 -14 89.5 -38t89 -73t79.5 -115.5t55 -172t22 -236.5q0 -154 -100 -263.5t-241 -109.5h-854q-141 0 -241 109.5t-100 263.5q0 131 22 236.5t55 172t79.5 115.5t89 73t89.5 38q-79 125 -79 272q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5
+t113 47h1728q66 0 113 -47t47 -113z"/>
+			<glyph glyph-name="uniF2BD" unicode="&#xf2bd;" horiz-adv-x="1792"
+				   d="M1523 197q-22 155 -87.5 257.5t-184.5 118.5q-67 -74 -159.5 -115.5t-195.5 -41.5t-195.5 41.5t-159.5 115.5q-119 -16 -184.5 -118.5t-87.5 -257.5q106 -150 271 -237.5t356 -87.5t356 87.5t271 237.5zM1280 896q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5
+t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1792 640q0 -182 -71 -347.5t-190.5 -286t-285.5 -191.5t-349 -71q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z"/>
+			<glyph glyph-name="uniF2BE" unicode="&#xf2be;" horiz-adv-x="1792"
+				   d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348q0 -181 -70.5 -347t-190.5 -286t-286 -191.5t-349 -71.5t-349 71t-285.5 191.5t-190.5 286t-71 347.5t71 348t191 286t286 191t348 71zM1515 185q149 205 149 455q0 156 -61 298t-164 245t-245 164t-298 61t-298 -61
+t-245 -164t-164 -245t-61 -298q0 -250 149 -455q66 327 306 327q131 -128 313 -128t313 128q240 0 306 -327zM1280 832q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5z"/>
+			<glyph glyph-name="uniF2C0" unicode="&#xf2c0;"
+				   d="M1201 752q47 -14 89.5 -38t89 -73t79.5 -115.5t55 -172t22 -236.5q0 -154 -100 -263.5t-241 -109.5h-854q-141 0 -241 109.5t-100 263.5q0 131 22 236.5t55 172t79.5 115.5t89 73t89.5 38q-79 125 -79 272q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5
 t198.5 -40.5t163.5 -109.5t109.5 -163.5t40.5 -198.5q0 -147 -79 -272zM768 1408q-159 0 -271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5zM1195 -128q88 0 150.5 71.5t62.5 173.5q0 239 -78.5 377t-225.5 145
-q-145 -127 -336 -127t-336 127q-147 -7 -225.5 -145t-78.5 -377q0 -102 62.5 -173.5t150.5 -71.5h854z" />
-    <glyph glyph-name="uniF2C1" unicode="&#xf2c1;" horiz-adv-x="1280" 
-d="M1024 278q0 -64 -37 -107t-91 -43h-512q-54 0 -91 43t-37 107t9 118t29.5 104t61 78.5t96.5 28.5q80 -75 188 -75t188 75q56 0 96.5 -28.5t61 -78.5t29.5 -104t9 -118zM870 797q0 -94 -67.5 -160.5t-162.5 -66.5t-162.5 66.5t-67.5 160.5t67.5 160.5t162.5 66.5
+q-145 -127 -336 -127t-336 127q-147 -7 -225.5 -145t-78.5 -377q0 -102 62.5 -173.5t150.5 -71.5h854z"/>
+			<glyph glyph-name="uniF2C1" unicode="&#xf2c1;" horiz-adv-x="1280"
+				   d="M1024 278q0 -64 -37 -107t-91 -43h-512q-54 0 -91 43t-37 107t9 118t29.5 104t61 78.5t96.5 28.5q80 -75 188 -75t188 75q56 0 96.5 -28.5t61 -78.5t29.5 -104t9 -118zM870 797q0 -94 -67.5 -160.5t-162.5 -66.5t-162.5 66.5t-67.5 160.5t67.5 160.5t162.5 66.5
 t162.5 -66.5t67.5 -160.5zM1152 -96v1376h-1024v-1376q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1280 1376v-1472q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h352v-96q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v96h352
-q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2C2" unicode="&#xf2c2;" horiz-adv-x="2048" 
-d="M896 324q0 54 -7.5 100.5t-24.5 90t-51 68.5t-81 25q-64 -64 -156 -64t-156 64q-47 0 -81 -25t-51 -68.5t-24.5 -90t-7.5 -100.5q0 -55 31.5 -93.5t75.5 -38.5h426q44 0 75.5 38.5t31.5 93.5zM768 768q0 80 -56 136t-136 56t-136 -56t-56 -136t56 -136t136 -56t136 56
+q66 0 113 -47t47 -113z"/>
+			<glyph glyph-name="uniF2C2" unicode="&#xf2c2;" horiz-adv-x="2048"
+				   d="M896 324q0 54 -7.5 100.5t-24.5 90t-51 68.5t-81 25q-64 -64 -156 -64t-156 64q-47 0 -81 -25t-51 -68.5t-24.5 -90t-7.5 -100.5q0 -55 31.5 -93.5t75.5 -38.5h426q44 0 75.5 38.5t31.5 93.5zM768 768q0 80 -56 136t-136 56t-136 -56t-56 -136t56 -136t136 -56t136 56
 t56 136zM1792 288v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1408 544v64q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1792 544v64q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23
 v-64q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1792 800v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM128 1152h1792v96q0 14 -9 23t-23 9h-1728q-14 0 -23 -9t-9 -23v-96zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728
-q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2C3" unicode="&#xf2c3;" horiz-adv-x="2048" 
-d="M896 324q0 -55 -31.5 -93.5t-75.5 -38.5h-426q-44 0 -75.5 38.5t-31.5 93.5q0 54 7.5 100.5t24.5 90t51 68.5t81 25q64 -64 156 -64t156 64q47 0 81 -25t51 -68.5t24.5 -90t7.5 -100.5zM768 768q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z
+q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z"/>
+			<glyph glyph-name="uniF2C3" unicode="&#xf2c3;" horiz-adv-x="2048"
+				   d="M896 324q0 -55 -31.5 -93.5t-75.5 -38.5h-426q-44 0 -75.5 38.5t-31.5 93.5q0 54 7.5 100.5t24.5 90t51 68.5t81 25q64 -64 156 -64t156 64q47 0 81 -25t51 -68.5t24.5 -90t7.5 -100.5zM768 768q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z
 M1792 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1408 608v-64q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h320q14 0 23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v64
 q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 864v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1920 32v1120h-1792v-1120q0 -13 9.5 -22.5t22.5 -9.5h1728q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47
-h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2C4" unicode="&#xf2c4;" horiz-adv-x="1792" 
-d="M1255 749q0 318 -105 474.5t-330 156.5q-222 0 -326 -157t-104 -474q0 -316 104 -471.5t326 -155.5q74 0 131 17q-22 43 -39 73t-44 65t-53.5 56.5t-63 36t-77.5 14.5q-46 0 -79 -16l-49 97q105 91 276 91q132 0 215.5 -54t150.5 -155q67 149 67 402zM1645 117h117
+h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z"/>
+			<glyph glyph-name="uniF2C4" unicode="&#xf2c4;" horiz-adv-x="1792"
+				   d="M1255 749q0 318 -105 474.5t-330 156.5q-222 0 -326 -157t-104 -474q0 -316 104 -471.5t326 -155.5q74 0 131 17q-22 43 -39 73t-44 65t-53.5 56.5t-63 36t-77.5 14.5q-46 0 -79 -16l-49 97q105 91 276 91q132 0 215.5 -54t150.5 -155q67 149 67 402zM1645 117h117
 q3 -27 -2 -67t-26.5 -95t-58 -100.5t-107 -78t-162.5 -32.5q-71 0 -130.5 19t-105.5 56t-79 78t-66 96q-97 -27 -205 -27q-150 0 -292.5 58t-253 158.5t-178 249t-67.5 317.5q0 170 67.5 319.5t178.5 250.5t253.5 159t291.5 58q121 0 238.5 -36t217 -106t176 -164.5
-t119.5 -219t43 -261.5q0 -190 -80.5 -347.5t-218.5 -264.5q47 -70 93.5 -106.5t104.5 -36.5q61 0 94 37.5t38 85.5z" />
-    <glyph glyph-name="uniF2C5" unicode="&#xf2c5;" horiz-adv-x="2304" 
-d="M453 -101q0 -21 -16 -37.5t-37 -16.5q-1 0 -13 3q-63 15 -162 140q-225 284 -225 676q0 341 213 614q39 51 95 103.5t94 52.5q19 0 35 -13.5t16 -32.5q0 -27 -63 -90q-98 -102 -147 -184q-119 -199 -119 -449q0 -281 123 -491q50 -85 136 -173q2 -3 14.5 -16t19.5 -21
+t119.5 -219t43 -261.5q0 -190 -80.5 -347.5t-218.5 -264.5q47 -70 93.5 -106.5t104.5 -36.5q61 0 94 37.5t38 85.5z"/>
+			<glyph glyph-name="uniF2C5" unicode="&#xf2c5;" horiz-adv-x="2304"
+				   d="M453 -101q0 -21 -16 -37.5t-37 -16.5q-1 0 -13 3q-63 15 -162 140q-225 284 -225 676q0 341 213 614q39 51 95 103.5t94 52.5q19 0 35 -13.5t16 -32.5q0 -27 -63 -90q-98 -102 -147 -184q-119 -199 -119 -449q0 -281 123 -491q50 -85 136 -173q2 -3 14.5 -16t19.5 -21
 t17 -20.5t14.5 -23.5t4.5 -21zM1796 33q0 -29 -17.5 -48.5t-46.5 -19.5h-1081q-26 0 -45 19t-19 45q0 29 17.5 48.5t46.5 19.5h1081q26 0 45 -19t19 -45zM1581 644q0 -134 -67 -233q-25 -38 -69.5 -78.5t-83.5 -60.5q-16 -10 -27 -10q-7 0 -15 6t-8 12q0 9 19 30t42 46
 t42 67.5t19 88.5q0 76 -35 130q-29 42 -46 42q-3 0 -3 -5q0 -12 7.5 -35.5t7.5 -36.5q0 -22 -21.5 -35t-44.5 -13q-66 0 -66 76q0 15 1.5 44t1.5 44q0 25 -10 46q-13 25 -42 53.5t-51 28.5q-5 0 -7 -0.5t-3.5 -2.5t-1.5 -6q0 -2 16 -26t16 -54q0 -37 -19 -68t-46 -54
 t-53.5 -46t-45.5 -54t-19 -68q0 -98 42 -160q29 -43 79 -63q16 -5 17 -10q1 -2 1 -5q0 -16 -18 -16q-6 0 -33 11q-119 43 -195 139.5t-76 218.5q0 55 24.5 115.5t60 115t70.5 108.5t59.5 113.5t24.5 111.5q0 53 -25 94q-29 48 -56 64q-19 9 -19 21q0 20 41 20q50 0 110 -29
 q41 -19 71 -44.5t49.5 -51t33.5 -62.5t22 -69t16 -80q0 -1 3 -17.5t4.5 -25t5.5 -25t9 -27t11 -21.5t14.5 -16.5t18.5 -5.5q23 0 37 14t14 37q0 25 -20 67t-20 52t10 10q27 0 93 -70q72 -76 102.5 -156t30.5 -186zM2304 615q0 -274 -138 -503q-19 -32 -48 -72t-68 -86.5
 t-81 -77t-74 -30.5q-16 0 -31 15.5t-15 31.5q0 15 29 50.5t68.5 77t48.5 52.5q183 230 183 531q0 131 -20.5 235t-72.5 211q-58 119 -163 228q-2 3 -13 13.5t-16.5 16.5t-15 17.5t-15 20t-9.5 18.5t-4 19q0 19 16 35.5t35 16.5q70 0 196 -169q98 -131 146 -273t60 -314
-q2 -42 2 -64z" />
-    <glyph glyph-name="uniF2C6" unicode="&#xf2c6;" horiz-adv-x="1792" 
-d="M1189 229l147 693q9 44 -10.5 63t-51.5 7l-864 -333q-29 -11 -39.5 -25t-2.5 -26.5t32 -19.5l221 -69l513 323q21 14 32 6q7 -5 -4 -15l-415 -375v0v0l-16 -228q23 0 45 22l108 104l224 -165q64 -36 81 38zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71
-t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="uniF2C7" unicode="&#xf2c7;" horiz-adv-x="1024" 
-d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v907h128v-907q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+q2 -42 2 -64z"/>
+			<glyph glyph-name="uniF2C6" unicode="&#xf2c6;" horiz-adv-x="1792"
+				   d="M1189 229l147 693q9 44 -10.5 63t-51.5 7l-864 -333q-29 -11 -39.5 -25t-2.5 -26.5t32 -19.5l221 -69l513 323q21 14 32 6q7 -5 -4 -15l-415 -375v0v0l-16 -228q23 0 45 22l108 104l224 -165q64 -36 81 38zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71
+t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z"/>
+			<glyph glyph-name="uniF2C7" unicode="&#xf2c7;" horiz-adv-x="1024"
+				   d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v907h128v-907q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
 t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
-v128h192z" />
-    <glyph glyph-name="uniF2C8" unicode="&#xf2c8;" horiz-adv-x="1024" 
-d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v651h128v-651q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+v128h192z"/>
+			<glyph glyph-name="uniF2C8" unicode="&#xf2c8;" horiz-adv-x="1024"
+				   d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v651h128v-651q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
 t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
-v128h192z" />
-    <glyph glyph-name="uniF2C9" unicode="&#xf2c9;" horiz-adv-x="1024" 
-d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v395h128v-395q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+v128h192z"/>
+			<glyph glyph-name="uniF2C9" unicode="&#xf2c9;" horiz-adv-x="1024"
+				   d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v395h128v-395q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
 t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
-v128h192z" />
-    <glyph glyph-name="uniF2CA" unicode="&#xf2ca;" horiz-adv-x="1024" 
-d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v139h128v-139q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+v128h192z"/>
+			<glyph glyph-name="uniF2CA" unicode="&#xf2ca;" horiz-adv-x="1024"
+				   d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v139h128v-139q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
 t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
-v128h192z" />
-    <glyph glyph-name="uniF2CB" unicode="&#xf2cb;" horiz-adv-x="1024" 
-d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 79 56 135.5t136 56.5t136 -56.5t56 -135.5zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5t93.5 226.5z
-M896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192v128h192z" />
-    <glyph glyph-name="uniF2CC" unicode="&#xf2cc;" horiz-adv-x="1920" 
-d="M1433 1287q10 -10 10 -23t-10 -23l-626 -626q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l44 44q-72 91 -81.5 207t46.5 215q-74 71 -176 71q-106 0 -181 -75t-75 -181v-1280h-256v1280q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5q106 0 201 -41
+v128h192z"/>
+			<glyph glyph-name="uniF2CB" unicode="&#xf2cb;" horiz-adv-x="1024"
+				   d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 79 56 135.5t136 56.5t136 -56.5t56 -135.5zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5t93.5 226.5z
+M896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192v128h192z"/>
+			<glyph glyph-name="uniF2CC" unicode="&#xf2cc;" horiz-adv-x="1920"
+				   d="M1433 1287q10 -10 10 -23t-10 -23l-626 -626q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l44 44q-72 91 -81.5 207t46.5 215q-74 71 -176 71q-106 0 -181 -75t-75 -181v-1280h-256v1280q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5q106 0 201 -41
 t166 -115q94 39 197 24.5t185 -79.5l44 44q10 10 23 10t23 -10zM1344 1024q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1600 896q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1856 1024q26 0 45 -19t19 -45t-19 -45t-45 -19
 t-45 19t-19 45t19 45t45 19zM1216 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1408 832q0 26 19 45t45 19t45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45zM1728 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 768
 q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 640q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1600 768q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 512q-26 0 -45 19t-19 45t19 45t45 19t45 -19
 t19 -45t-19 -45t-45 -19zM1472 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 384
-q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 256q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19z" />
-    <glyph glyph-name="uniF2CD" unicode="&#xf2cd;" horiz-adv-x="1792" 
-d="M1664 448v-192q0 -169 -128 -286v-194q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v118q-63 -22 -128 -22h-768q-65 0 -128 22v-110q0 -17 -9.5 -28.5t-22.5 -11.5h-64q-13 0 -22.5 11.5t-9.5 28.5v186q-128 117 -128 286v192h1536zM704 864q0 -14 -9 -23t-23 -9t-23 9
+q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 256q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19z"/>
+			<glyph glyph-name="uniF2CD" unicode="&#xf2cd;" horiz-adv-x="1792"
+				   d="M1664 448v-192q0 -169 -128 -286v-194q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v118q-63 -22 -128 -22h-768q-65 0 -128 22v-110q0 -17 -9.5 -28.5t-22.5 -11.5h-64q-13 0 -22.5 11.5t-9.5 28.5v186q-128 117 -128 286v192h1536zM704 864q0 -14 -9 -23t-23 -9t-23 9
 t-9 23t9 23t23 9t23 -9t9 -23zM768 928q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM704 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1056q0 -14 -9 -23t-23 -9t-23 9
 t-9 23t9 23t23 9t23 -9t9 -23zM704 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v640q0 106 75 181t181 75q108 0 184 -78q46 19 98 12t93 -39l22 22q11 11 22 0l42 -42
 q11 -11 0 -22l-314 -314q-11 -11 -22 0l-42 42q-11 11 0 22l22 22q-36 46 -40.5 104t23.5 108q-37 35 -88 35q-53 0 -90.5 -37.5t-37.5 -90.5v-640h1504q14 0 23 -9t9 -23zM896 1056q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1120q0 -14 -9 -23t-23 -9
 t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM896 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1248q0 -14 -9 -23
-t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1024 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1088 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23z" />
-    <glyph glyph-name="uniF2CE" unicode="&#xf2ce;" 
-d="M994 344q0 -86 -17 -197q-31 -215 -55 -313q-22 -90 -152 -90t-152 90q-24 98 -55 313q-17 110 -17 197q0 168 224 168t224 -168zM1536 768q0 -240 -134 -434t-350 -280q-8 -3 -15 3t-6 15q7 48 10 66q4 32 6 47q1 9 9 12q159 81 255.5 234t96.5 337q0 180 -91 330.5
+t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1024 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1088 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23z"/>
+			<glyph glyph-name="uniF2CE" unicode="&#xf2ce;"
+				   d="M994 344q0 -86 -17 -197q-31 -215 -55 -313q-22 -90 -152 -90t-152 90q-24 98 -55 313q-17 110 -17 197q0 168 224 168t224 -168zM1536 768q0 -240 -134 -434t-350 -280q-8 -3 -15 3t-6 15q7 48 10 66q4 32 6 47q1 9 9 12q159 81 255.5 234t96.5 337q0 180 -91 330.5
 t-247 234.5t-337 74q-124 -7 -237 -61t-193.5 -140.5t-128 -202t-46.5 -240.5q1 -184 99 -336.5t257 -231.5q7 -3 9 -12q3 -21 6 -45q1 -9 5 -32.5t6 -35.5q1 -9 -6.5 -15t-15.5 -2q-148 58 -261 169.5t-173.5 264t-52.5 319.5q7 143 66 273.5t154.5 227t225 157.5t272.5 70
 q164 10 315.5 -46.5t261 -160.5t175 -250.5t65.5 -308.5zM994 800q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5zM1282 768q0 -122 -53.5 -228.5t-146.5 -177.5q-8 -6 -16 -2t-10 14q-6 52 -29 92q-7 10 3 20
 q58 54 91 127t33 155q0 111 -58.5 204t-157.5 141.5t-212 36.5q-133 -15 -229 -113t-109 -231q-10 -92 23.5 -176t98.5 -144q10 -10 3 -20q-24 -41 -29 -93q-2 -9 -10 -13t-16 2q-95 74 -148.5 183t-51.5 234q3 131 69 244t177 181.5t241 74.5q144 7 268 -60t196.5 -187.5
-t72.5 -263.5z" />
-    <glyph glyph-name="uniF2D0" unicode="&#xf2d0;" horiz-adv-x="1792" 
-d="M256 128h1280v768h-1280v-768zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2D1" unicode="&#xf2d1;" horiz-adv-x="1792" 
-d="M1792 224v-192q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2D2" unicode="&#xf2d2;" horiz-adv-x="2048" 
-d="M256 0h768v512h-768v-512zM1280 512h512v768h-768v-256h96q66 0 113 -47t47 -113v-352zM2048 1376v-960q0 -66 -47 -113t-113 -47h-608v-352q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h608v352q0 66 47 113t113 47h960q66 0 113 -47
-t47 -113z" />
-    <glyph glyph-name="uniF2D3" unicode="&#xf2d3;" horiz-adv-x="1792" 
-d="M1175 215l146 146q10 10 10 23t-10 23l-233 233l233 233q10 10 10 23t-10 23l-146 146q-10 10 -23 10t-23 -10l-233 -233l-233 233q-10 10 -23 10t-23 -10l-146 -146q-10 -10 -10 -23t10 -23l233 -233l-233 -233q-10 -10 -10 -23t10 -23l146 -146q10 -10 23 -10t23 10
-l233 233l233 -233q10 -10 23 -10t23 10zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2D4" unicode="&#xf2d4;" horiz-adv-x="1792" 
-d="M1257 425l-146 -146q-10 -10 -23 -10t-23 10l-169 169l-169 -169q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l169 169l-169 169q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l169 -169l169 169q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
-l-169 -169l169 -169q10 -10 10 -23t-10 -23zM256 128h1280v1024h-1280v-1024zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2D5" unicode="&#xf2d5;" horiz-adv-x="1792" 
-d="M1070 358l306 564h-654l-306 -564h654zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="uniF2D6" unicode="&#xf2d6;" horiz-adv-x="1794" 
-d="M1291 1060q-15 17 -35 8.5t-26 -28.5t5 -38q14 -17 40 -14.5t34 20.5t-18 52zM895 814q-8 -8 -19.5 -8t-18.5 8q-8 8 -8 19t8 18q7 8 18.5 8t19.5 -8q7 -7 7 -18t-7 -19zM1060 740l-35 -35q-12 -13 -29.5 -13t-30.5 13l-38 38q-12 13 -12 30t12 30l35 35q12 12 29.5 12
+t72.5 -263.5z"/>
+			<glyph glyph-name="uniF2D0" unicode="&#xf2d0;" horiz-adv-x="1792"
+				   d="M256 128h1280v768h-1280v-768zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z"/>
+			<glyph glyph-name="uniF2D1" unicode="&#xf2d1;" horiz-adv-x="1792"
+				   d="M1792 224v-192q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z"/>
+			<glyph glyph-name="uniF2D2" unicode="&#xf2d2;" horiz-adv-x="2048"
+				   d="M256 0h768v512h-768v-512zM1280 512h512v768h-768v-256h96q66 0 113 -47t47 -113v-352zM2048 1376v-960q0 -66 -47 -113t-113 -47h-608v-352q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h608v352q0 66 47 113t113 47h960q66 0 113 -47
+t47 -113z"/>
+			<glyph glyph-name="uniF2D3" unicode="&#xf2d3;" horiz-adv-x="1792"
+				   d="M1175 215l146 146q10 10 10 23t-10 23l-233 233l233 233q10 10 10 23t-10 23l-146 146q-10 10 -23 10t-23 -10l-233 -233l-233 233q-10 10 -23 10t-23 -10l-146 -146q-10 -10 -10 -23t10 -23l233 -233l-233 -233q-10 -10 -10 -23t10 -23l146 -146q10 -10 23 -10t23 10
+l233 233l233 -233q10 -10 23 -10t23 10zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z"/>
+			<glyph glyph-name="uniF2D4" unicode="&#xf2d4;" horiz-adv-x="1792"
+				   d="M1257 425l-146 -146q-10 -10 -23 -10t-23 10l-169 169l-169 -169q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l169 169l-169 169q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l169 -169l169 169q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
+l-169 -169l169 -169q10 -10 10 -23t-10 -23zM256 128h1280v1024h-1280v-1024zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z"/>
+			<glyph glyph-name="uniF2D5" unicode="&#xf2d5;" horiz-adv-x="1792"
+				   d="M1070 358l306 564h-654l-306 -564h654zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z"/>
+			<glyph glyph-name="uniF2D6" unicode="&#xf2d6;" horiz-adv-x="1794"
+				   d="M1291 1060q-15 17 -35 8.5t-26 -28.5t5 -38q14 -17 40 -14.5t34 20.5t-18 52zM895 814q-8 -8 -19.5 -8t-18.5 8q-8 8 -8 19t8 18q7 8 18.5 8t19.5 -8q7 -7 7 -18t-7 -19zM1060 740l-35 -35q-12 -13 -29.5 -13t-30.5 13l-38 38q-12 13 -12 30t12 30l35 35q12 12 29.5 12
 t30.5 -12l38 -39q12 -12 12 -29.5t-12 -29.5zM951 870q-7 -8 -18.5 -8t-19.5 8q-7 8 -7 19t7 19q8 8 19 8t19 -8t8 -19t-8 -19zM1354 968q-34 -64 -107.5 -85.5t-127.5 16.5q-38 28 -61 66.5t-21 87.5t39 92t75.5 53t70.5 -5t70 -51q2 -2 13 -12.5t14.5 -13.5t13 -13.5
 t12.5 -15.5t10 -15.5t8.5 -18t4 -18.5t1 -21t-5 -22t-9.5 -24zM1555 486q3 20 -8.5 34.5t-27.5 21.5t-33 17t-23 20q-40 71 -84 98.5t-113 11.5q19 13 40 18.5t33 4.5l12 -1q2 45 -34 90q6 20 6.5 40.5t-2.5 30.5l-3 10q43 24 71 65t34 91q10 84 -43 150.5t-137 76.5
 q-60 7 -114 -18.5t-82 -74.5q-30 -51 -33.5 -101t14.5 -87t43.5 -64t56.5 -42q-45 4 -88 36t-57 88q-28 108 32 222q-16 21 -29 32q-50 0 -89 -19q19 24 42 37t36 14l13 1q0 50 -13 78q-10 21 -32.5 28.5t-47 -3.5t-37.5 -40q2 4 4 7q-7 -28 -6.5 -75.5t19 -117t48.5 -122.5
 q-25 -14 -47 -36q-35 -16 -85.5 -70.5t-84.5 -101.5l-33 -46q-90 -34 -181 -125.5t-75 -162.5q1 -16 11 -27q-15 -12 -30 -30q-21 -25 -21 -54t21.5 -40t63.5 6q41 19 77 49.5t55 60.5q-2 2 -6.5 5t-20.5 7.5t-33 3.5q23 5 51 12.5t40 10t27.5 6t26 4t23.5 0.5q14 -7 22 34
 q7 37 7 90q0 102 -40 150q106 -103 101 -219q-1 -29 -15 -50t-27 -27l-13 -6q-4 -7 -19 -32t-26 -45.5t-26.5 -52t-25 -61t-17 -63t-6.5 -66.5t10 -63q-35 54 -37 80q-22 -24 -34.5 -39t-33.5 -42t-30.5 -46t-16.5 -41t-0.5 -38t25.5 -27q45 -25 144 64t190.5 221.5
-t122.5 228.5q86 52 145 115.5t86 119.5q47 -93 154 -178q104 -83 167 -80q39 2 46 43zM1794 640q0 -182 -71 -348t-191 -286t-286.5 -191t-348.5 -71t-348.5 71t-286.5 191t-191 286t-71 348t71 348t191 286t286.5 191t348.5 71t348.5 -71t286.5 -191t191 -286t71 -348z" />
-    <glyph glyph-name="uniF2D7" unicode="&#xf2d7;" 
-d="M518 1353v-655q103 -1 191.5 1.5t125.5 5.5l37 3q68 2 90.5 24.5t39.5 94.5l33 142h103l-14 -322l7 -319h-103l-29 127q-15 68 -45 93t-84 26q-87 8 -352 8v-556q0 -78 43.5 -115.5t133.5 -37.5h357q35 0 59.5 2t55 7.5t54 18t48.5 32t46 50.5t39 73l93 216h89
+t122.5 228.5q86 52 145 115.5t86 119.5q47 -93 154 -178q104 -83 167 -80q39 2 46 43zM1794 640q0 -182 -71 -348t-191 -286t-286.5 -191t-348.5 -71t-348.5 71t-286.5 191t-191 286t-71 348t71 348t191 286t286.5 191t348.5 71t348.5 -71t286.5 -191t191 -286t71 -348z"/>
+			<glyph glyph-name="uniF2D7" unicode="&#xf2d7;"
+				   d="M518 1353v-655q103 -1 191.5 1.5t125.5 5.5l37 3q68 2 90.5 24.5t39.5 94.5l33 142h103l-14 -322l7 -319h-103l-29 127q-15 68 -45 93t-84 26q-87 8 -352 8v-556q0 -78 43.5 -115.5t133.5 -37.5h357q35 0 59.5 2t55 7.5t54 18t48.5 32t46 50.5t39 73l93 216h89
 q-6 -37 -31.5 -252t-30.5 -276q-146 5 -263.5 8t-162.5 4h-44h-628l-376 -12v102l127 25q67 13 91.5 37t25.5 79l8 643q3 402 -8 645q-2 61 -25.5 84t-91.5 36l-127 24v102l376 -12h702q139 0 374 27q-6 -68 -14 -194.5t-12 -219.5l-5 -92h-93l-32 124q-31 121 -74 179.5
-t-113 58.5h-548q-28 0 -35.5 -8.5t-7.5 -30.5z" />
-    <glyph glyph-name="uniF2D8" unicode="&#xf2d8;" 
-d="M922 739v-182q0 -4 0.5 -15t0 -15l-1.5 -12t-3.5 -11.5t-6.5 -7.5t-11 -5.5t-16 -1.5v309q9 0 16 -1t11 -5t6.5 -5.5t3.5 -9.5t1 -10.5v-13.5v-14zM1238 643v-121q0 -1 0.5 -12.5t0 -15.5t-2.5 -11.5t-7.5 -10.5t-13.5 -3q-9 0 -14 9q-4 10 -4 165v7v8.5v9t1.5 8.5l3.5 7
+t-113 58.5h-548q-28 0 -35.5 -8.5t-7.5 -30.5z"/>
+			<glyph glyph-name="uniF2D8" unicode="&#xf2d8;"
+				   d="M922 739v-182q0 -4 0.5 -15t0 -15l-1.5 -12t-3.5 -11.5t-6.5 -7.5t-11 -5.5t-16 -1.5v309q9 0 16 -1t11 -5t6.5 -5.5t3.5 -9.5t1 -10.5v-13.5v-14zM1238 643v-121q0 -1 0.5 -12.5t0 -15.5t-2.5 -11.5t-7.5 -10.5t-13.5 -3q-9 0 -14 9q-4 10 -4 165v7v8.5v9t1.5 8.5l3.5 7
 t5 5.5t8 1.5q6 0 10 -1.5t6.5 -4.5t4 -6t2 -8.5t0.5 -8v-9.5v-9zM180 407h122v472h-122v-472zM614 407h106v472h-159l-28 -221q-20 148 -32 221h-158v-472h107v312l45 -312h76l43 319v-319zM1039 712q0 67 -5 90q-3 16 -11 28.5t-17 20.5t-25 14t-26.5 8.5t-31 4t-29 1.5
 h-29.5h-12h-91v-472h56q169 -1 197 24.5t25 180.5q-1 62 -1 100zM1356 515v133q0 29 -2 45t-9.5 33.5t-24.5 25t-46 7.5q-46 0 -77 -34v154h-117v-472h110l7 30q30 -36 77 -36q50 0 66 30.5t16 83.5zM1536 1248v-1216q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113
-v1216q0 66 47 113t113 47h1216q66 0 113 -47t47 -113z" />
-    <glyph glyph-name="uniF2D9" unicode="&#xf2d9;" horiz-adv-x="2176" 
-d="M1143 -197q-6 1 -11 4q-13 8 -36 23t-86 65t-116.5 104.5t-112 140t-89.5 172.5q-17 3 -175 37q66 -213 235 -362t391 -184zM502 409l168 -28q-25 76 -41 167.5t-19 145.5l-4 53q-84 -82 -121 -224q5 -65 17 -114zM612 1018q-43 -64 -77 -148q44 46 74 68zM2049 584
+v1216q0 66 47 113t113 47h1216q66 0 113 -47t47 -113z"/>
+			<glyph glyph-name="uniF2D9" unicode="&#xf2d9;" horiz-adv-x="2176"
+				   d="M1143 -197q-6 1 -11 4q-13 8 -36 23t-86 65t-116.5 104.5t-112 140t-89.5 172.5q-17 3 -175 37q66 -213 235 -362t391 -184zM502 409l168 -28q-25 76 -41 167.5t-19 145.5l-4 53q-84 -82 -121 -224q5 -65 17 -114zM612 1018q-43 -64 -77 -148q44 46 74 68zM2049 584
 q0 161 -62 307t-167.5 252t-250.5 168.5t-304 62.5q-147 0 -281 -52.5t-240 -148.5q-30 -58 -45 -160q60 51 143 83.5t158.5 43t143 13.5t108.5 -1l40 -3q33 -1 53 -15.5t24.5 -33t6.5 -37t-1 -28.5q-126 11 -227.5 0.5t-183 -43.5t-142.5 -71.5t-131 -98.5
 q4 -36 11.5 -92.5t35.5 -178t62 -179.5q123 -6 247.5 14.5t214.5 53.5t162.5 67t109.5 59l37 24q22 16 39.5 20.5t30.5 -5t17 -34.5q14 -97 -39 -121q-208 -97 -467 -134q-135 -20 -317 -16q41 -96 110 -176.5t137 -127t130.5 -79t101.5 -43.5l39 -12q143 -23 263 15
 q195 99 314 289t119 418zM2123 621q-14 -135 -40 -212q-70 -208 -181.5 -346.5t-318.5 -253.5q-48 -33 -82 -44q-72 -26 -163 -16q-36 -3 -73 -3q-283 0 -504.5 173t-295.5 442q-1 0 -4 0.5t-5 0.5q-6 -50 2.5 -112.5t26 -115t36 -98t31.5 -71.5l14 -26q8 -12 54 -82
 q-71 38 -124.5 106.5t-78.5 140t-39.5 137t-17.5 107.5l-2 42q-5 2 -33.5 12.5t-48.5 18t-53 20.5t-57.5 25t-50 25.5t-42.5 27t-25 25.5q19 -10 50.5 -25.5t113 -45.5t145.5 -38l2 32q11 149 94 290q41 202 176 365q28 115 81 214q15 28 32 45t49 32q158 74 303.5 104
-t302 11t306.5 -97q220 -115 333 -336t87 -474z" />
-    <glyph glyph-name="uniF2DA" unicode="&#xf2da;" horiz-adv-x="1792" 
-d="M1341 752q29 44 -6.5 129.5t-121.5 142.5q-58 39 -125.5 53.5t-118 4.5t-68.5 -37q-12 -23 -4.5 -28t42.5 -10q23 -3 38.5 -5t44.5 -9.5t56 -17.5q36 -13 67.5 -31.5t53 -37t40 -38.5t30.5 -38t22 -34.5t16.5 -28.5t12 -18.5t10.5 -6t11 9.5zM1704 178
+t302 11t306.5 -97q220 -115 333 -336t87 -474z"/>
+			<glyph glyph-name="uniF2DA" unicode="&#xf2da;" horiz-adv-x="1792"
+				   d="M1341 752q29 44 -6.5 129.5t-121.5 142.5q-58 39 -125.5 53.5t-118 4.5t-68.5 -37q-12 -23 -4.5 -28t42.5 -10q23 -3 38.5 -5t44.5 -9.5t56 -17.5q36 -13 67.5 -31.5t53 -37t40 -38.5t30.5 -38t22 -34.5t16.5 -28.5t12 -18.5t10.5 -6t11 9.5zM1704 178
 q-52 -127 -148.5 -220t-214.5 -141.5t-253 -60.5t-266 13.5t-251 91t-210 161.5t-141.5 235.5t-46.5 303.5q1 41 8.5 84.5t12.5 64t24 80.5t23 73q-51 -208 1 -397t173 -318t291 -206t346 -83t349 74.5t289 244.5q20 27 18 14q0 -4 -4 -14zM1465 627q0 -104 -40.5 -199
 t-108.5 -164t-162 -109.5t-198 -40.5t-198 40.5t-162 109.5t-108.5 164t-40.5 199t40.5 199t108.5 164t162 109.5t198 40.5t198 -40.5t162 -109.5t108.5 -164t40.5 -199zM1752 915q-65 147 -180.5 251t-253 153.5t-292 53.5t-301 -36.5t-275.5 -129t-220 -211.5t-131 -297
 t-10 -373q-49 161 -51.5 311.5t35.5 272.5t109 227t165.5 180.5t207 126t232 71t242.5 9t236 -54t216 -124.5t178 -197q33 -50 62 -121t31 -112zM1690 573q12 244 -136.5 416t-396.5 240q-8 0 -10 5t24 8q125 -4 230 -50t173 -120t116 -168.5t58.5 -199t-1 -208
-t-61.5 -197.5t-122.5 -167t-185 -117.5t-248.5 -46.5q108 30 201.5 80t174 123t129.5 176.5t55 225.5z" />
-    <glyph glyph-name="uniF2DB" unicode="&#xf2db;" 
-d="M192 256v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 512v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 768v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16
+t-61.5 -197.5t-122.5 -167t-185 -117.5t-248.5 -46.5q108 30 201.5 80t174 123t129.5 176.5t55 225.5z"/>
+			<glyph glyph-name="uniF2DB" unicode="&#xf2db;"
+				   d="M192 256v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 512v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 768v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16
 q0 16 16 16h112zM192 1024v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 1280v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM1280 1440v-1472q0 -40 -28 -68t-68 -28h-832q-40 0 -68 28
 t-28 68v1472q0 40 28 68t68 28h832q40 0 68 -28t28 -68zM1536 208v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 464v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 720v-32
 q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 976v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 1232v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16
-h48q16 0 16 -16z" />
-    <glyph glyph-name="uniF2DC" unicode="&#xf2dc;" horiz-adv-x="1664" 
-d="M1566 419l-167 -33l186 -107q23 -13 29.5 -38.5t-6.5 -48.5q-14 -23 -39 -29.5t-48 6.5l-186 106l55 -160q13 -38 -12 -63.5t-60.5 -20.5t-48.5 42l-102 300l-271 156v-313l208 -238q16 -18 17 -39t-11 -36.5t-28.5 -25t-37 -5.5t-36.5 22l-112 128v-214q0 -26 -19 -45
+h48q16 0 16 -16z"/>
+			<glyph glyph-name="uniF2DC" unicode="&#xf2dc;" horiz-adv-x="1664"
+				   d="M1566 419l-167 -33l186 -107q23 -13 29.5 -38.5t-6.5 -48.5q-14 -23 -39 -29.5t-48 6.5l-186 106l55 -160q13 -38 -12 -63.5t-60.5 -20.5t-48.5 42l-102 300l-271 156v-313l208 -238q16 -18 17 -39t-11 -36.5t-28.5 -25t-37 -5.5t-36.5 22l-112 128v-214q0 -26 -19 -45
 t-45 -19t-45 19t-19 45v214l-112 -128q-16 -18 -36.5 -22t-37 5.5t-28.5 25t-11 36.5t17 39l208 238v313l-271 -156l-102 -300q-13 -37 -48.5 -42t-60.5 20.5t-12 63.5l55 160l-186 -106q-23 -13 -48 -6.5t-39 29.5q-13 23 -6.5 48.5t29.5 38.5l186 107l-167 33
 q-29 6 -42 29t-8.5 46.5t25.5 40t50 10.5l310 -62l271 157l-271 157l-310 -62q-4 -1 -13 -1q-27 0 -44 18t-19 40t11 43t40 26l167 33l-186 107q-23 13 -29.5 38.5t6.5 48.5t39 30t48 -7l186 -106l-55 160q-13 38 12 63.5t60.5 20.5t48.5 -42l102 -300l271 -156v313
 l-208 238q-16 18 -17 39t11 36.5t28.5 25t37 5.5t36.5 -22l112 -128v214q0 26 19 45t45 19t45 -19t19 -45v-214l112 128q16 18 36.5 22t37 -5.5t28.5 -25t11 -36.5t-17 -39l-208 -238v-313l271 156l102 300q13 37 48.5 42t60.5 -20.5t12 -63.5l-55 -160l186 106
-q23 13 48 6.5t39 -29.5q13 -23 6.5 -48.5t-29.5 -38.5l-186 -107l167 -33q27 -5 40 -26t11 -43t-19 -40t-44 -18q-9 0 -13 1l-310 62l-271 -157l271 -157l310 62q29 6 50 -10.5t25.5 -40t-8.5 -46.5t-42 -29z" />
-    <glyph glyph-name="uniF2DD" unicode="&#xf2dd;" horiz-adv-x="1792" 
-d="M1473 607q7 118 -33 226.5t-113 189t-177 131t-221 57.5q-116 7 -225.5 -32t-192 -110.5t-135 -175t-59.5 -220.5q-7 -118 33 -226.5t113 -189t177.5 -131t221.5 -57.5q155 -9 293 59t224 195.5t94 283.5zM1792 1536l-349 -348q120 -117 180.5 -272t50.5 -321
-q-11 -183 -102 -339t-241 -255.5t-332 -124.5l-999 -132l347 347q-120 116 -180.5 271.5t-50.5 321.5q11 184 102 340t241.5 255.5t332.5 124.5q167 22 500 66t500 66z" />
-    <glyph glyph-name="uniF2DE" unicode="&#xf2de;" horiz-adv-x="1792" 
-d="M948 508l163 -329h-51l-175 350l-171 -350h-49l179 374l-78 33l21 49l240 -102l-21 -50zM563 1100l304 -130l-130 -304l-304 130zM907 915l240 -103l-103 -239l-239 102zM1188 765l191 -81l-82 -190l-190 81zM1680 640q0 159 -62 304t-167.5 250.5t-250.5 167.5t-304 62
+q23 13 48 6.5t39 -29.5q13 -23 6.5 -48.5t-29.5 -38.5l-186 -107l167 -33q27 -5 40 -26t11 -43t-19 -40t-44 -18q-9 0 -13 1l-310 62l-271 -157l271 -157l310 62q29 6 50 -10.5t25.5 -40t-8.5 -46.5t-42 -29z"/>
+			<glyph glyph-name="uniF2DD" unicode="&#xf2dd;" horiz-adv-x="1792"
+				   d="M1473 607q7 118 -33 226.5t-113 189t-177 131t-221 57.5q-116 7 -225.5 -32t-192 -110.5t-135 -175t-59.5 -220.5q-7 -118 33 -226.5t113 -189t177.5 -131t221.5 -57.5q155 -9 293 59t224 195.5t94 283.5zM1792 1536l-349 -348q120 -117 180.5 -272t50.5 -321
+q-11 -183 -102 -339t-241 -255.5t-332 -124.5l-999 -132l347 347q-120 116 -180.5 271.5t-50.5 321.5q11 184 102 340t241.5 255.5t332.5 124.5q167 22 500 66t500 66z"/>
+			<glyph glyph-name="uniF2DE" unicode="&#xf2de;" horiz-adv-x="1792"
+				   d="M948 508l163 -329h-51l-175 350l-171 -350h-49l179 374l-78 33l21 49l240 -102l-21 -50zM563 1100l304 -130l-130 -304l-304 130zM907 915l240 -103l-103 -239l-239 102zM1188 765l191 -81l-82 -190l-190 81zM1680 640q0 159 -62 304t-167.5 250.5t-250.5 167.5t-304 62
 t-304 -62t-250.5 -167.5t-167.5 -250.5t-62 -304t62 -304t167.5 -250.5t250.5 -167.5t304 -62t304 62t250.5 167.5t167.5 250.5t62 304zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71
-t286 -191t191 -286t71 -348z" />
-    <glyph glyph-name="uniF2E0" unicode="&#xf2e0;" horiz-adv-x="1920" 
-d="M1334 302q-4 24 -27.5 34t-49.5 10.5t-48.5 12.5t-25.5 38q-5 47 33 139.5t75 181t32 127.5q-14 101 -117 103q-45 1 -75 -16l-3 -2l-5 -2.5t-4.5 -2t-5 -2t-5 -0.5t-6 1.5t-6 3.5t-6.5 5q-3 2 -9 8.5t-9 9t-8.5 7.5t-9.5 7.5t-9.5 5.5t-11 4.5t-11.5 2.5q-30 5 -48 -3
+t286 -191t191 -286t71 -348z"/>
+			<glyph glyph-name="uniF2E0" unicode="&#xf2e0;" horiz-adv-x="1920"
+				   d="M1334 302q-4 24 -27.5 34t-49.5 10.5t-48.5 12.5t-25.5 38q-5 47 33 139.5t75 181t32 127.5q-14 101 -117 103q-45 1 -75 -16l-3 -2l-5 -2.5t-4.5 -2t-5 -2t-5 -0.5t-6 1.5t-6 3.5t-6.5 5q-3 2 -9 8.5t-9 9t-8.5 7.5t-9.5 7.5t-9.5 5.5t-11 4.5t-11.5 2.5q-30 5 -48 -3
 t-45 -31q-1 -1 -9 -8.5t-12.5 -11t-15 -10t-16.5 -5.5t-17 3q-54 27 -84 40q-41 18 -94 -5t-76 -65q-16 -28 -41 -98.5t-43.5 -132.5t-40 -134t-21.5 -73q-22 -69 18.5 -119t110.5 -46q30 2 50.5 15t38.5 46q7 13 79 199.5t77 194.5q6 11 21.5 18t29.5 0q27 -15 21 -53
 q-2 -18 -51 -139.5t-50 -132.5q-6 -38 19.5 -56.5t60.5 -7t55 49.5q4 8 45.5 92t81.5 163.5t46 88.5q20 29 41 28q29 0 25 -38q-2 -16 -65.5 -147.5t-70.5 -159.5q-12 -53 13 -103t74 -74q17 -9 51 -15.5t71.5 -8t62.5 14t20 48.5zM383 86q3 -15 -5 -27.5t-23 -15.5
 q-14 -3 -26.5 5t-15.5 23q-3 14 5 27t22 16t27 -5t16 -23zM953 -177q12 -17 8.5 -37.5t-20.5 -32.5t-37.5 -8t-32.5 21q-11 17 -7.5 37.5t20.5 32.5t37.5 8t31.5 -21zM177 635q-18 -27 -49.5 -33t-57.5 13q-26 18 -32 50t12 58q18 27 49.5 33t57.5 -12q26 -19 32 -50.5
@@ -2636,36 +2636,37 @@ t-12 -58.5zM1467 -42q19 -28 13 -61.5t-34 -52.5t-60.5 -13t-51.5 34t-13 61t33 53q2
 q-50 73 -53 164q-83 14 -142.5 70.5t-80.5 128t-2 152t81 138.5q-36 60 -38 128t24.5 125t79.5 98.5t121 50.5q32 85 99 148t146.5 91.5t168 17t159.5 -66.5q72 21 140 17.5t128.5 -36t104.5 -80t67.5 -115t17.5 -140.5q52 -16 87 -57t45.5 -89t-5.5 -99.5t-58 -87.5z
 M455 1222q14 -20 9.5 -44.5t-24.5 -38.5q-19 -14 -43.5 -9.5t-37.5 24.5q-14 20 -9.5 44.5t24.5 38.5q19 14 43.5 9.5t37.5 -24.5zM614 1503q4 -16 -5 -30.5t-26 -18.5t-31 5.5t-18 26.5q-3 17 6.5 31t25.5 18q17 4 31 -5.5t17 -26.5zM1800 555q4 -20 -6.5 -37t-30.5 -21
 q-19 -4 -36 6.5t-21 30.5t6.5 37t30.5 22q20 4 36.5 -7.5t20.5 -30.5zM1136 1448q16 -27 8.5 -58.5t-35.5 -47.5q-27 -16 -57.5 -8.5t-46.5 34.5q-16 28 -8.5 59t34.5 48t58 9t47 -36zM1882 792q4 -15 -4 -27.5t-23 -16.5q-15 -3 -27.5 5.5t-15.5 22.5q-3 15 5 28t23 16
-q14 3 26.5 -5t15.5 -23zM1691 1033q15 -22 10.5 -49t-26.5 -43q-22 -15 -49 -10t-42 27t-10 49t27 43t48.5 11t41.5 -28z" />
-    <glyph glyph-name="uniF2E1" unicode="&#xf2e1;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E2" unicode="&#xf2e2;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E3" unicode="&#xf2e3;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E4" unicode="&#xf2e4;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E5" unicode="&#xf2e5;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E6" unicode="&#xf2e6;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E7" unicode="&#xf2e7;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="_698" unicode="&#xf2e8;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2E9" unicode="&#xf2e9;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2EA" unicode="&#xf2ea;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2EB" unicode="&#xf2eb;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2EC" unicode="&#xf2ec;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2ED" unicode="&#xf2ed;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="uniF2EE" unicode="&#xf2ee;" horiz-adv-x="1792" 
- />
-    <glyph glyph-name="lessequal" unicode="&#xf500;" horiz-adv-x="1792" 
- />
-  </font>
-</defs></svg>
+q14 3 26.5 -5t15.5 -23zM1691 1033q15 -22 10.5 -49t-26.5 -43q-22 -15 -49 -10t-42 27t-10 49t27 43t48.5 11t41.5 -28z"/>
+			<glyph glyph-name="uniF2E1" unicode="&#xf2e1;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="uniF2E2" unicode="&#xf2e2;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="uniF2E3" unicode="&#xf2e3;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="uniF2E4" unicode="&#xf2e4;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="uniF2E5" unicode="&#xf2e5;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="uniF2E6" unicode="&#xf2e6;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="uniF2E7" unicode="&#xf2e7;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="_698" unicode="&#xf2e8;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="uniF2E9" unicode="&#xf2e9;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="uniF2EA" unicode="&#xf2ea;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="uniF2EB" unicode="&#xf2eb;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="uniF2EC" unicode="&#xf2ec;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="uniF2ED" unicode="&#xf2ed;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="uniF2EE" unicode="&#xf2ee;" horiz-adv-x="1792"
+			/>
+			<glyph glyph-name="lessequal" unicode="&#xf500;" horiz-adv-x="1792"
+			/>
+		</font>
+	</defs>
+</svg>
diff --git a/len-sys/src/main/resources/plugin/plugins/sideshow/css/component.css b/len-sys/src/main/resources/plugin/plugins/sideshow/css/component.css
index 3c510db..519f7f0 100644
--- a/len-sys/src/main/resources/plugin/plugins/sideshow/css/component.css
+++ b/len-sys/src/main/resources/plugin/plugins/sideshow/css/component.css
@@ -34,11 +34,11 @@
 	text-align: center;
 	top: 50%;
 	left: 50%;
-	-webkit-transform: translate3d(-50%,-50%,0);
-	transform: translate3d(-50%,-50%,0);
+	-webkit-transform: translate3d(-50%, -50%, 0);
+	transform: translate3d(-50%, -50%, 0);
 }
 
-.demo-1 .main-title, 
+.demo-1 .main-title,
 .demo-3 .main-title {
 	text-transform: uppercase;
 	font-size: 4.2em;
@@ -50,7 +50,7 @@
 	font-weight: normal;
 	font-size: 8em;
 	padding-left: 10px;
-	text-shadow: 2px 2px 4px rgba(0,0,0,0.4);
+	text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.4);
 }
 
 .demo-2 .main-title::before {
@@ -66,8 +66,8 @@
 	left: 50%;
 	border-radius: 50%;
 	z-index: -1;
-	-webkit-transform: translate3d(-50%,-50%,0);
-	transform: translate3d(-50%,-50%,0);
+	-webkit-transform: translate3d(-50%, -50%, 0);
+	transform: translate3d(-50%, -50%, 0);
 }
 
 .demo-3 .main-title {
@@ -89,8 +89,8 @@
 	font-weight: 200;
 }
 
-@media only screen and (max-width : 768px) {
-	.demo-1 .main-title, 
+@media only screen and (max-width: 768px) {
+	.demo-1 .main-title,
 	.demo-3 .main-title,
 	.demo-4 .main-title {
 		font-size: 3em;
@@ -99,4 +99,4 @@
 	.demo-2 .main-title {
 		font-size: 4em;
 	}
-}
\ No newline at end of file
+}
diff --git a/len-sys/src/main/resources/plugin/plugins/sideshow/css/demo.css b/len-sys/src/main/resources/plugin/plugins/sideshow/css/demo.css
index 39f203f..a1466bf 100644
--- a/len-sys/src/main/resources/plugin/plugins/sideshow/css/demo.css
+++ b/len-sys/src/main/resources/plugin/plugins/sideshow/css/demo.css
@@ -2,16 +2,26 @@
 	font-weight: normal;
 	font-style: normal;
 	font-family: 'codropsicons';
-	src:url('../fonts/codropsicons/codropsicons.eot');
-	src:url('../fonts/codropsicons/codropsicons.eot?#iefix') format('embedded-opentype'),
-		url('../fonts/codropsicons/codropsicons.woff') format('woff'),
-		url('../fonts/codropsicons/codropsicons.ttf') format('truetype'),
-		url('../fonts/codropsicons/codropsicons.svg#codropsicons') format('svg');
+	src: url('../fonts/codropsicons/codropsicons.eot');
+	src: url('../fonts/codropsicons/codropsicons.eot?#iefix') format('embedded-opentype'),
+	url('../fonts/codropsicons/codropsicons.woff') format('woff'),
+	url('../fonts/codropsicons/codropsicons.ttf') format('truetype'),
+	url('../fonts/codropsicons/codropsicons.svg#codropsicons') format('svg');
 }
 
-*, *:after, *:before { -webkit-box-sizing: border-box; box-sizing: border-box; }
-.clearfix:before, .clearfix:after { content: ''; display: table; }
-.clearfix:after { clear: both; }
+*, *:after, *:before {
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+.clearfix:before, .clearfix:after {
+	content: '';
+	display: table;
+}
+
+.clearfix:after {
+	clear: both;
+}
 
 body {
 	background: #fff;
@@ -109,7 +119,7 @@ p.ref {
 .codrops-demos {
 	padding-top: 1em;
 	font-size: 0.8em;
-	text-align:center;
+	text-align: center;
 }
 
 .codrops-demos a {
@@ -193,4 +203,4 @@ p.ref {
 	.codrops-header h1 {
 		font-size: 2.5em;
 	}
-}
\ No newline at end of file
+}
diff --git a/len-sys/src/main/resources/plugin/plugins/sideshow/fonts/codropsicons/codropsicons.svg b/len-sys/src/main/resources/plugin/plugins/sideshow/fonts/codropsicons/codropsicons.svg
index d202d21..a1cbd56 100644
--- a/len-sys/src/main/resources/plugin/plugins/sideshow/fonts/codropsicons/codropsicons.svg
+++ b/len-sys/src/main/resources/plugin/plugins/sideshow/fonts/codropsicons/codropsicons.svg
@@ -1,24 +1,31 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
-<metadata>
-This is a custom SVG font generated by IcoMoon.
-<iconset grid="14"></iconset>
-</metadata>
-<defs>
-<font id="codropsicons" horiz-adv-x="448" >
-<font-face units-per-em="448" ascent="384" descent="-64" />
-<missing-glyph horiz-adv-x="448" />
-<glyph unicode="&#xe001;" d="M 221.657,359.485 ,m0.00,0.00,c 0.00,0.00 -132.984-182.838 -132.205-286.236 0.515-68.522 61.089-123.688 135.314-123.218 74.202,0.479 133.943,56.421 133.428,124.943 C 357.414,178.368 221.657,359.485 221.657,359.485 z"  />
-<glyph unicode="&#xe004;" d="M 384.00,160.00l0.00-32.00 q0.00-13.25 -8.125-22.625t-21.125-9.375l-176.00,0.00 l 73.25-73.50q 9.50-9.00 9.50-22.50t-9.50-22.50l-18.75-19.00q-9.25-9.25 -22.50-9.25q-13.00,0.00 -22.75,9.25l-162.75,163.00q-9.25,9.25 -9.25,22.50q0.00,13.00 9.25,22.75l 162.75,162.50q 9.50,9.50 22.75,9.50q 13.00,0.00 22.50-9.50l 18.75-18.50q 9.50-9.50 9.50-22.75t-9.50-22.75l-73.25-73.25l 176.00,0.00 q 13.00,0.00 21.125-9.375 t 8.125-22.625z" horiz-adv-x="384"  />
-<glyph unicode="&#xe002;" d="M 407.273-23.273c0.00,0.00-325.818,0.00-366.545,0.00s-40.727,40.727-40.727,40.727l0.00,142.545 l 101.818,183.273l 244.364,0.00 l 101.818-183.273c0.00,0.00,0.00-101.818,0.00-142.545S 407.273-23.273, 407.273-23.273z M 325.818,302.545L 122.182,302.545 
+	<metadata>
+		This is a custom SVG font generated by IcoMoon.
+		<iconset grid="14"></iconset>
+	</metadata>
+	<defs>
+		<font id="codropsicons" horiz-adv-x="448">
+			<font-face units-per-em="448" ascent="384" descent="-64"/>
+			<missing-glyph horiz-adv-x="448"/>
+			<glyph unicode="&#xe001;"
+				   d="M 221.657,359.485 ,m0.00,0.00,c 0.00,0.00 -132.984-182.838 -132.205-286.236 0.515-68.522 61.089-123.688 135.314-123.218 74.202,0.479 133.943,56.421 133.428,124.943 C 357.414,178.368 221.657,359.485 221.657,359.485 z"/>
+			<glyph unicode="&#xe004;"
+				   d="M 384.00,160.00l0.00-32.00 q0.00-13.25 -8.125-22.625t-21.125-9.375l-176.00,0.00 l 73.25-73.50q 9.50-9.00 9.50-22.50t-9.50-22.50l-18.75-19.00q-9.25-9.25 -22.50-9.25q-13.00,0.00 -22.75,9.25l-162.75,163.00q-9.25,9.25 -9.25,22.50q0.00,13.00 9.25,22.75l 162.75,162.50q 9.50,9.50 22.75,9.50q 13.00,0.00 22.50-9.50l 18.75-18.50q 9.50-9.50 9.50-22.75t-9.50-22.75l-73.25-73.25l 176.00,0.00 q 13.00,0.00 21.125-9.375 t 8.125-22.625z"
+				   horiz-adv-x="384"/>
+			<glyph unicode="&#xe002;" d="M 407.273-23.273c0.00,0.00-325.818,0.00-366.545,0.00s-40.727,40.727-40.727,40.727l0.00,142.545 l 101.818,183.273l 244.364,0.00 l 101.818-183.273c0.00,0.00,0.00-101.818,0.00-142.545S 407.273-23.273, 407.273-23.273z M 325.818,302.545L 122.182,302.545
 	l-71.273-142.545L 142.545,160.00 c0.00,0.00, 40.727,0.00, 40.727-40.727l0.00-20.364 l 81.455,0.00 l0.00,20.364 c0.00,0.00,0.00,40.727, 40.727,40.727l 91.636,0.00 L 325.818,302.545z M 407.273,119.273l-96.911,0.00 C 307.532,113.917, 305.455,107.503, 305.455,98.909c0.00-40.727-40.727-40.727-40.727-40.727L 183.273,58.182 c0.00,0.00-40.727,0.00-40.727,40.727
-	c0.00,8.593-2.077,15.008-4.908,20.364L 40.727,119.273 l0.00-101.818 l 366.545,0.00 L 407.273,119.273 z M 132.364,221.091l 183.273,0.00 L 325.818,200.727L 122.182,200.727 L 132.364,221.091z M 152.727,261.818l 142.545,0.00 L 305.455,241.455L 142.545,241.455 L 152.727,261.818z"  />
-<glyph unicode="&#xe000;" d="M 368.00,144.00q0.00-13.50 -9.25-22.75l-162.75-162.75q-9.75-9.25 -22.75-9.25q-12.75,0.00 -22.50,9.25l-18.75,18.75q-9.50,9.50 -9.50,22.75t 9.50,22.75l 73.25,73.25l-176.00,0.00 q-13.00,0.00 -21.125,9.375t-8.125,22.625l0.00,32.00 q0.00,13.25 8.125,22.625t 21.125,9.375l 176.00,0.00 l-73.25,73.50q-9.50,9.00 -9.50,22.50t 9.50,22.50l 18.75,18.75q 9.50,9.50 22.50,9.50q 13.25,0.00 22.75-9.50l 162.75-162.75q 9.25-8.75 9.25-22.50z" horiz-adv-x="384"  />
-<glyph unicode="&#xe003;" d="M 224.00-64.00C 100.291-64.00,0.00,36.291,0.00,160.00S 100.291,384.00, 224.00,384.00s 224.00-100.291, 224.00-224.00S 347.709-64.00, 224.00-64.00z
+	c0.00,8.593-2.077,15.008-4.908,20.364L 40.727,119.273 l0.00-101.818 l 366.545,0.00 L 407.273,119.273 z M 132.364,221.091l 183.273,0.00 L 325.818,200.727L 122.182,200.727 L 132.364,221.091z M 152.727,261.818l 142.545,0.00 L 305.455,241.455L 142.545,241.455 L 152.727,261.818z"/>
+			<glyph unicode="&#xe000;"
+				   d="M 368.00,144.00q0.00-13.50 -9.25-22.75l-162.75-162.75q-9.75-9.25 -22.75-9.25q-12.75,0.00 -22.50,9.25l-18.75,18.75q-9.50,9.50 -9.50,22.75t 9.50,22.75l 73.25,73.25l-176.00,0.00 q-13.00,0.00 -21.125,9.375t-8.125,22.625l0.00,32.00 q0.00,13.25 8.125,22.625t 21.125,9.375l 176.00,0.00 l-73.25,73.50q-9.50,9.00 -9.50,22.50t 9.50,22.50l 18.75,18.75q 9.50,9.50 22.50,9.50q 13.25,0.00 22.75-9.50l 162.75-162.75q 9.25-8.75 9.25-22.50z"
+				   horiz-adv-x="384"/>
+			<glyph unicode="&#xe003;" d="M 224.00-64.00C 100.291-64.00,0.00,36.291,0.00,160.00S 100.291,384.00, 224.00,384.00s 224.00-100.291, 224.00-224.00S 347.709-64.00, 224.00-64.00z
 	 M 224.00,343.273c-101.228,0.00-183.273-82.045-183.273-183.273s 82.045-183.273, 183.273-183.273s 183.273,82.045, 183.273,183.273S 325.228,343.273, 224.00,343.273z M 244.364,122.164C 244.364,111.005, 244.364,98.909, 244.364,98.909l-40.727,0.00 c0.00,0.00,0.00,29.466,0.00,40.727
 	s 9.123,20.364, 20.364,20.364l0.00,0.00c 22.481,0.00, 40.727,18.246, 40.727,40.727s-18.246,40.727-40.727,40.727S 183.273,223.209, 183.273,200.727c0.00-7.453, 2.138-14.356, 5.641-20.364L 145.437,180.364 C 143.727,186.90, 142.545,193.661, 142.545,200.727
-	c0.00,44.983, 36.471,81.455, 81.455,81.455s 81.455-36.471, 81.455-81.455C 305.455,162.831, 279.45,131.247, 244.364,122.164z M 244.364,37.818l-40.727,0.00 l0.00,40.727 l 40.727,0.00 L 244.364,37.818 z"  />
-<glyph unicode="&#x20;" horiz-adv-x="224" />
-<glyph class="hidden" unicode="&#xf000;" d="M0,384L 448 -64L0 -64 z" horiz-adv-x="0" />
-</font></defs></svg>
\ No newline at end of file
+	c0.00,44.983, 36.471,81.455, 81.455,81.455s 81.455-36.471, 81.455-81.455C 305.455,162.831, 279.45,131.247, 244.364,122.164z M 244.364,37.818l-40.727,0.00 l0.00,40.727 l 40.727,0.00 L 244.364,37.818 z"/>
+			<glyph unicode="&#x20;" horiz-adv-x="224"/>
+			<glyph class="hidden" unicode="&#xf000;" d="M0,384L 448 -64L0 -64 z" horiz-adv-x="0"/>
+		</font>
+	</defs>
+</svg>
diff --git a/len-sys/src/main/resources/plugin/plugins/sideshow/fonts/codropsicons/license.txt b/len-sys/src/main/resources/plugin/plugins/sideshow/fonts/codropsicons/license.txt
index 88a5cbc..eaffc1a 100644
--- a/len-sys/src/main/resources/plugin/plugins/sideshow/fonts/codropsicons/license.txt
+++ b/len-sys/src/main/resources/plugin/plugins/sideshow/fonts/codropsicons/license.txt
@@ -1,6 +1,6 @@
-Icon Set:	Font Awesome -- http://fortawesome.github.com/Font-Awesome/
-License:	SIL -- http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL
+Icon Set:    Font Awesome -- http://fortawesome.github.com/Font-Awesome/
+License:    SIL -- http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL
 
 
-Icon Set:	Eco Ico -- http://dribbble.com/shots/665585-Eco-Ico
-License:	CC0 -- http://creativecommons.org/publicdomain/zero/1.0/
\ No newline at end of file
+Icon Set:    Eco Ico -- http://dribbble.com/shots/665585-Eco-Ico
+License:    CC0 -- http://creativecommons.org/publicdomain/zero/1.0/
\ No newline at end of file
diff --git a/len-sys/src/main/resources/plugin/plugins/sideshow/js/demo-1.js b/len-sys/src/main/resources/plugin/plugins/sideshow/js/demo-1.js
index 57ed6d7..902be5a 100644
--- a/len-sys/src/main/resources/plugin/plugins/sideshow/js/demo-1.js
+++ b/len-sys/src/main/resources/plugin/plugins/sideshow/js/demo-1.js
@@ -1,185 +1,186 @@
-(function() {
-
-    var width, height, largeHeader, canvas, ctx, points, target, animateHeader = true;
-
-    // Main
-    initHeader();
-    initAnimation();
-    addListeners();
-
-    function initHeader() {
-        width = window.innerWidth;
-        height = window.innerHeight;
-        target = {x: width/2, y: height/2};
-
-        largeHeader = document.getElementById('large-header');
-        largeHeader.style.height = height+'px';
-
-        canvas = document.getElementById('demo-canvas');
-        canvas.width = width;
-        canvas.height = height;
-        ctx = canvas.getContext('2d');
-
-        // create points
-        points = [];
-        for(var x = 0; x < width; x = x + width/20) {
-            for(var y = 0; y < height; y = y + height/20) {
-                var px = x + Math.random()*width/20;
-                var py = y + Math.random()*height/20;
-                var p = {x: px, originX: px, y: py, originY: py };
-                points.push(p);
-            }
-        }
-
-        // for each point find the 5 closest points
-        for(var i = 0; i < points.length; i++) {
-            var closest = [];
-            var p1 = points[i];
-            for(var j = 0; j < points.length; j++) {
-                var p2 = points[j]
-                if(!(p1 == p2)) {
-                    var placed = false;
-                    for(var k = 0; k < 5; k++) {
-                        if(!placed) {
-                            if(closest[k] == undefined) {
-                                closest[k] = p2;
-                                placed = true;
-                            }
-                        }
-                    }
-
-                    for(var k = 0; k < 5; k++) {
-                        if(!placed) {
-                            if(getDistance(p1, p2) < getDistance(p1, closest[k])) {
-                                closest[k] = p2;
-                                placed = true;
-                            }
-                        }
-                    }
-                }
-            }
-            p1.closest = closest;
-        }
-
-        // assign a circle to each point
-        for(var i in points) {
-            var c = new Circle(points[i], 2+Math.random()*2, 'rgba(255,255,255,0.3)');
-            points[i].circle = c;
-        }
-    }
-
-    // Event handling
-    function addListeners() {
-        if(!('ontouchstart' in window)) {
-            window.addEventListener('mousemove', mouseMove);
-        }
-        window.addEventListener('scroll', scrollCheck);
-        window.addEventListener('resize', resize);
-    }
-
-    function mouseMove(e) {
-        var posx = posy = 0;
-        if (e.pageX || e.pageY) {
-            posx = e.pageX;
-            posy = e.pageY;
-        }
-        else if (e.clientX || e.clientY)    {
-            posx = e.clientX + document.body.scrollLeft + document.documentElement.scrollLeft;
-            posy = e.clientY + document.body.scrollTop + document.documentElement.scrollTop;
-        }
-        target.x = posx;
-        target.y = posy;
-    }
-
-    function scrollCheck() {
-        if(document.body.scrollTop > height) animateHeader = false;
-        else animateHeader = true;
-    }
-
-    function resize() {
-        width = window.innerWidth;
-        height = window.innerHeight;
-        largeHeader.style.height = height+'px';
-        canvas.width = width;
-        canvas.height = height;
-    }
-
-    // animation
-    function initAnimation() {
-        animate();
-        for(var i in points) {
-            shiftPoint(points[i]);
-        }
-    }
-
-    function animate() {
-        if(animateHeader) {
-            ctx.clearRect(0,0,width,height);
-            for(var i in points) {
-                // detect points in range
-                if(Math.abs(getDistance(target, points[i])) < 4000) {
-                    points[i].active = 0.3;
-                    points[i].circle.active = 0.6;
-                } else if(Math.abs(getDistance(target, points[i])) < 20000) {
-                    points[i].active = 0.1;
-                    points[i].circle.active = 0.3;
-                } else if(Math.abs(getDistance(target, points[i])) < 40000) {
-                    points[i].active = 0.02;
-                    points[i].circle.active = 0.1;
-                } else {
-                    points[i].active = 0;
-                    points[i].circle.active = 0;
-                }
-
-                drawLines(points[i]);
-                points[i].circle.draw();
-            }
-        }
-        requestAnimationFrame(animate);
-    }
-
-    function shiftPoint(p) {
-        TweenLite.to(p, 1+1*Math.random(), {x:p.originX-50+Math.random()*100,
-            y: p.originY-50+Math.random()*100, ease:Circ.easeInOut,
-            onComplete: function() {
-                shiftPoint(p);
-            }});
-    }
-
-    // Canvas manipulation
-    function drawLines(p) {
-        if(!p.active) return;
-        for(var i in p.closest) {
-            ctx.beginPath();
-            ctx.moveTo(p.x, p.y);
-            ctx.lineTo(p.closest[i].x, p.closest[i].y);
-            ctx.strokeStyle = 'rgba(156,217,249,'+ p.active+')';
-            ctx.stroke();
-        }
-    }
-
-    function Circle(pos,rad,color) {
-        var _this = this;
-
-        // constructor
-        (function() {
-            _this.pos = pos || null;
-            _this.radius = rad || null;
-            _this.color = color || null;
-        })();
-
-        this.draw = function() {
-            if(!_this.active) return;
-            ctx.beginPath();
-            ctx.arc(_this.pos.x, _this.pos.y, _this.radius, 0, 2 * Math.PI, false);
-            ctx.fillStyle = 'rgba(156,217,249,'+ _this.active+')';
-            ctx.fill();
-        };
-    }
-
-    // Util
-    function getDistance(p1, p2) {
-        return Math.pow(p1.x - p2.x, 2) + Math.pow(p1.y - p2.y, 2);
-    }
-    
-})();
\ No newline at end of file
+(function () {
+
+	var width, height, largeHeader, canvas, ctx, points, target, animateHeader = true;
+
+	// Main
+	initHeader();
+	initAnimation();
+	addListeners();
+
+	function initHeader() {
+		width = window.innerWidth;
+		height = window.innerHeight;
+		target = {x: width / 2, y: height / 2};
+
+		largeHeader = document.getElementById('large-header');
+		largeHeader.style.height = height + 'px';
+
+		canvas = document.getElementById('demo-canvas');
+		canvas.width = width;
+		canvas.height = height;
+		ctx = canvas.getContext('2d');
+
+		// create points
+		points = [];
+		for (var x = 0; x < width; x = x + width / 20) {
+			for (var y = 0; y < height; y = y + height / 20) {
+				var px = x + Math.random() * width / 20;
+				var py = y + Math.random() * height / 20;
+				var p = {x: px, originX: px, y: py, originY: py};
+				points.push(p);
+			}
+		}
+
+		// for each point find the 5 closest points
+		for (var i = 0; i < points.length; i++) {
+			var closest = [];
+			var p1 = points[i];
+			for (var j = 0; j < points.length; j++) {
+				var p2 = points[j]
+				if (!(p1 == p2)) {
+					var placed = false;
+					for (var k = 0; k < 5; k++) {
+						if (!placed) {
+							if (closest[k] == undefined) {
+								closest[k] = p2;
+								placed = true;
+							}
+						}
+					}
+
+					for (var k = 0; k < 5; k++) {
+						if (!placed) {
+							if (getDistance(p1, p2) < getDistance(p1, closest[k])) {
+								closest[k] = p2;
+								placed = true;
+							}
+						}
+					}
+				}
+			}
+			p1.closest = closest;
+		}
+
+		// assign a circle to each point
+		for (var i in points) {
+			var c = new Circle(points[i], 2 + Math.random() * 2, 'rgba(255,255,255,0.3)');
+			points[i].circle = c;
+		}
+	}
+
+	// Event handling
+	function addListeners() {
+		if (!('ontouchstart' in window)) {
+			window.addEventListener('mousemove', mouseMove);
+		}
+		window.addEventListener('scroll', scrollCheck);
+		window.addEventListener('resize', resize);
+	}
+
+	function mouseMove(e) {
+		var posx = posy = 0;
+		if (e.pageX || e.pageY) {
+			posx = e.pageX;
+			posy = e.pageY;
+		} else if (e.clientX || e.clientY) {
+			posx = e.clientX + document.body.scrollLeft + document.documentElement.scrollLeft;
+			posy = e.clientY + document.body.scrollTop + document.documentElement.scrollTop;
+		}
+		target.x = posx;
+		target.y = posy;
+	}
+
+	function scrollCheck() {
+		if (document.body.scrollTop > height) animateHeader = false;
+		else animateHeader = true;
+	}
+
+	function resize() {
+		width = window.innerWidth;
+		height = window.innerHeight;
+		largeHeader.style.height = height + 'px';
+		canvas.width = width;
+		canvas.height = height;
+	}
+
+	// animation
+	function initAnimation() {
+		animate();
+		for (var i in points) {
+			shiftPoint(points[i]);
+		}
+	}
+
+	function animate() {
+		if (animateHeader) {
+			ctx.clearRect(0, 0, width, height);
+			for (var i in points) {
+				// detect points in range
+				if (Math.abs(getDistance(target, points[i])) < 4000) {
+					points[i].active = 0.3;
+					points[i].circle.active = 0.6;
+				} else if (Math.abs(getDistance(target, points[i])) < 20000) {
+					points[i].active = 0.1;
+					points[i].circle.active = 0.3;
+				} else if (Math.abs(getDistance(target, points[i])) < 40000) {
+					points[i].active = 0.02;
+					points[i].circle.active = 0.1;
+				} else {
+					points[i].active = 0;
+					points[i].circle.active = 0;
+				}
+
+				drawLines(points[i]);
+				points[i].circle.draw();
+			}
+		}
+		requestAnimationFrame(animate);
+	}
+
+	function shiftPoint(p) {
+		TweenLite.to(p, 1 + 1 * Math.random(), {
+			x: p.originX - 50 + Math.random() * 100,
+			y: p.originY - 50 + Math.random() * 100, ease: Circ.easeInOut,
+			onComplete: function () {
+				shiftPoint(p);
+			}
+		});
+	}
+
+	// Canvas manipulation
+	function drawLines(p) {
+		if (!p.active) return;
+		for (var i in p.closest) {
+			ctx.beginPath();
+			ctx.moveTo(p.x, p.y);
+			ctx.lineTo(p.closest[i].x, p.closest[i].y);
+			ctx.strokeStyle = 'rgba(156,217,249,' + p.active + ')';
+			ctx.stroke();
+		}
+	}
+
+	function Circle(pos, rad, color) {
+		var _this = this;
+
+		// constructor
+		(function () {
+			_this.pos = pos || null;
+			_this.radius = rad || null;
+			_this.color = color || null;
+		})();
+
+		this.draw = function () {
+			if (!_this.active) return;
+			ctx.beginPath();
+			ctx.arc(_this.pos.x, _this.pos.y, _this.radius, 0, 2 * Math.PI, false);
+			ctx.fillStyle = 'rgba(156,217,249,' + _this.active + ')';
+			ctx.fill();
+		};
+	}
+
+	// Util
+	function getDistance(p1, p2) {
+		return Math.pow(p1.x - p2.x, 2) + Math.pow(p1.y - p2.y, 2);
+	}
+
+})();
diff --git a/len-sys/src/main/resources/plugin/plugins/sideshow/js/demo-2.js b/len-sys/src/main/resources/plugin/plugins/sideshow/js/demo-2.js
index da23207..1af9c04 100644
--- a/len-sys/src/main/resources/plugin/plugins/sideshow/js/demo-2.js
+++ b/len-sys/src/main/resources/plugin/plugins/sideshow/js/demo-2.js
@@ -1,92 +1,92 @@
-(function() {
+(function () {
 
-    var width, height, largeHeader, canvas, ctx, circles, target, animateHeader = true;
+	var width, height, largeHeader, canvas, ctx, circles, target, animateHeader = true;
 
-    // Main
-    initHeader();
-    addListeners();
+	// Main
+	initHeader();
+	addListeners();
 
-    function initHeader() {
-        width = window.innerWidth;
-        height = window.innerHeight;
-        target = {x: 0, y: height};
+	function initHeader() {
+		width = window.innerWidth;
+		height = window.innerHeight;
+		target = {x: 0, y: height};
 
-        largeHeader = document.getElementById('large-header');
-        largeHeader.style.height = height+'px';
+		largeHeader = document.getElementById('large-header');
+		largeHeader.style.height = height + 'px';
 
-        canvas = document.getElementById('demo-canvas');
-        canvas.width = width;
-        canvas.height = height;
-        ctx = canvas.getContext('2d');
+		canvas = document.getElementById('demo-canvas');
+		canvas.width = width;
+		canvas.height = height;
+		ctx = canvas.getContext('2d');
 
-        // create particles
-        circles = [];
-        for(var x = 0; x < width*0.5; x++) {
-            var c = new Circle();
-            circles.push(c);
-        }
-        animate();
-    }
+		// create particles
+		circles = [];
+		for (var x = 0; x < width * 0.5; x++) {
+			var c = new Circle();
+			circles.push(c);
+		}
+		animate();
+	}
 
-    // Event handling
-    function addListeners() {
-        window.addEventListener('scroll', scrollCheck);
-        window.addEventListener('resize', resize);
-    }
+	// Event handling
+	function addListeners() {
+		window.addEventListener('scroll', scrollCheck);
+		window.addEventListener('resize', resize);
+	}
 
-    function scrollCheck() {
-        if(document.body.scrollTop > height) animateHeader = false;
-        else animateHeader = true;
-    }
+	function scrollCheck() {
+		if (document.body.scrollTop > height) animateHeader = false;
+		else animateHeader = true;
+	}
 
-    function resize() {
-        width = window.innerWidth;
-        height = window.innerHeight;
-        largeHeader.style.height = height+'px';
-        canvas.width = width;
-        canvas.height = height;
-    }
+	function resize() {
+		width = window.innerWidth;
+		height = window.innerHeight;
+		largeHeader.style.height = height + 'px';
+		canvas.width = width;
+		canvas.height = height;
+	}
 
-    function animate() {
-        if(animateHeader) {
-            ctx.clearRect(0,0,width,height);
-            for(var i in circles) {
-                circles[i].draw();
-            }
-        }
-        requestAnimationFrame(animate);
-    }
+	function animate() {
+		if (animateHeader) {
+			ctx.clearRect(0, 0, width, height);
+			for (var i in circles) {
+				circles[i].draw();
+			}
+		}
+		requestAnimationFrame(animate);
+	}
 
-    // Canvas manipulation
-    function Circle() {
-        var _this = this;
+	// Canvas manipulation
+	function Circle() {
+		var _this = this;
 
-        // constructor
-        (function() {
-            _this.pos = {};
-            init();
-            console.log(_this);
-        })();
+		// constructor
+		(function () {
+			_this.pos = {};
+			init();
+			console.log(_this);
+		})();
 
-        function init() {
-            _this.pos.x = Math.random()*width;
-            _this.pos.y = height+Math.random()*100;
-            _this.alpha = 0.1+Math.random()*0.3;
-            _this.scale = 0.1+Math.random()*0.3;
-            _this.velocity = Math.random();
-        }
+		function init() {
+			_this.pos.x = Math.random() * width;
+			_this.pos.y = height + Math.random() * 100;
+			_this.alpha = 0.1 + Math.random() * 0.3;
+			_this.scale = 0.1 + Math.random() * 0.3;
+			_this.velocity = Math.random();
+		}
 
-        this.draw = function() {
-            if(_this.alpha <= 0) {
-                init();
-            }
-            _this.pos.y -= _this.velocity;
-            _this.alpha -= 0.0005;
-            ctx.beginPath();
-            ctx.arc(_this.pos.x, _this.pos.y, _this.scale*10, 0, 2 * Math.PI, false);
-            ctx.fillStyle = 'rgba(255,255,255,'+ _this.alpha+')';
-            ctx.fill();
-        };
-    }
+		this.draw = function () {
+			if (_this.alpha <= 0) {
+				init();
+			}
+			_this.pos.y -= _this.velocity;
+			_this.alpha -= 0.0005;
+			ctx.beginPath();
+			ctx.arc(_this.pos.x, _this.pos.y, _this.scale * 10, 0, 2 * Math.PI, false);
+			ctx.fillStyle = 'rgba(255,255,255,' + _this.alpha + ')';
+			ctx.fill();
+		};
+	}
 
-})();
\ No newline at end of file
+})();
diff --git a/len-sys/src/main/resources/plugin/plugins/sideshow/js/demo-3.js b/len-sys/src/main/resources/plugin/plugins/sideshow/js/demo-3.js
index 7bad534..cf7178d 100644
--- a/len-sys/src/main/resources/plugin/plugins/sideshow/js/demo-3.js
+++ b/len-sys/src/main/resources/plugin/plugins/sideshow/js/demo-3.js
@@ -1,126 +1,130 @@
-(function() {
-
-    var width, height, largeHeader, canvas, ctx, triangles, target, animateHeader = true;
-    var colors = ['72,35,68', '43,81,102', '66,152,103', '250,178,67', '224,33,48'];
-
-    // Main
-    initHeader();
-    addListeners();
-    initAnimation();
-
-    function initHeader() {
-        width = window.innerWidth;
-        height = window.innerHeight;
-        target = {x: 0, y: height};
-
-        largeHeader = document.getElementById('large-header');
-        largeHeader.style.height = height+'px';
-
-        canvas = document.getElementById('demo-canvas');
-        canvas.width = width;
-        canvas.height = height;
-        ctx = canvas.getContext('2d');
-
-        // create particles
-        triangles = [];
-        for(var x = 0; x < 480; x++) {
-            addTriangle(x*10);
-        }
-    }
-
-    function addTriangle(delay) {
-        setTimeout(function() {
-            var t = new Triangle();
-            triangles.push(t);
-            tweenTriangle(t);
-        }, delay);
-    }
-
-    function initAnimation() {
-        animate();
-    }
-
-    function tweenTriangle(tri) {
-        var t = Math.random()*(2*Math.PI);
-        var x = (200+Math.random()*100)*Math.cos(t) + width*0.5;
-        var y = (200+Math.random()*100)*Math.sin(t) + height*0.5-20;
-        var time = 4+3*Math.random();
-
-        TweenLite.to(tri.pos, time, {x: x,
-            y: y, ease:Circ.easeOut,
-            onComplete: function() {
-                tri.init();
-                tweenTriangle(tri);
-        }});
-    }
-
-    // Event handling
-    function addListeners() {
-        window.addEventListener('scroll', scrollCheck);
-        window.addEventListener('resize', resize);
-    }
-
-    function scrollCheck() {
-        if(document.body.scrollTop > height) animateHeader = false;
-        else animateHeader = true;
-    }
-
-    function resize() {
-        width = window.innerWidth;
-        height = window.innerHeight;
-        largeHeader.style.height = height+'px';
-        canvas.width = width;
-        canvas.height = height;
-    }
-
-    function animate() {
-        if(animateHeader) {
-            ctx.clearRect(0,0,width,height);
-            for(var i in triangles) {
-                triangles[i].draw();
-            }
-        }
-        requestAnimationFrame(animate);
-    }
-
-    // Canvas manipulation
-    function Triangle() {
-        var _this = this;
-
-        // constructor
-        (function() {
-            _this.coords = [{},{},{}];
-            _this.pos = {};
-            init();
-        })();
-
-        function init() {
-            _this.pos.x = width*0.5;
-            _this.pos.y = height*0.5-20;
-            _this.coords[0].x = -10+Math.random()*40;
-            _this.coords[0].y = -10+Math.random()*40;
-            _this.coords[1].x = -10+Math.random()*40;
-            _this.coords[1].y = -10+Math.random()*40;
-            _this.coords[2].x = -10+Math.random()*40;
-            _this.coords[2].y = -10+Math.random()*40;
-            _this.scale = 0.1+Math.random()*0.3;
-            _this.color = colors[Math.floor(Math.random()*colors.length)];
-            setTimeout(function() { _this.alpha = 0.8; }, 10);
-        }
-
-        this.draw = function() {
-            if(_this.alpha >= 0.005) _this.alpha -= 0.005;
-            else _this.alpha = 0;
-            ctx.beginPath();
-            ctx.moveTo(_this.coords[0].x+_this.pos.x, _this.coords[0].y+_this.pos.y);
-            ctx.lineTo(_this.coords[1].x+_this.pos.x, _this.coords[1].y+_this.pos.y);
-            ctx.lineTo(_this.coords[2].x+_this.pos.x, _this.coords[2].y+_this.pos.y);
-            ctx.closePath();
-            ctx.fillStyle = 'rgba('+_this.color+','+ _this.alpha+')';
-            ctx.fill();
-        };
-
-        this.init = init;
-    }
-    
-})();
\ No newline at end of file
+(function () {
+
+	var width, height, largeHeader, canvas, ctx, triangles, target, animateHeader = true;
+	var colors = ['72,35,68', '43,81,102', '66,152,103', '250,178,67', '224,33,48'];
+
+	// Main
+	initHeader();
+	addListeners();
+	initAnimation();
+
+	function initHeader() {
+		width = window.innerWidth;
+		height = window.innerHeight;
+		target = {x: 0, y: height};
+
+		largeHeader = document.getElementById('large-header');
+		largeHeader.style.height = height + 'px';
+
+		canvas = document.getElementById('demo-canvas');
+		canvas.width = width;
+		canvas.height = height;
+		ctx = canvas.getContext('2d');
+
+		// create particles
+		triangles = [];
+		for (var x = 0; x < 480; x++) {
+			addTriangle(x * 10);
+		}
+	}
+
+	function addTriangle(delay) {
+		setTimeout(function () {
+			var t = new Triangle();
+			triangles.push(t);
+			tweenTriangle(t);
+		}, delay);
+	}
+
+	function initAnimation() {
+		animate();
+	}
+
+	function tweenTriangle(tri) {
+		var t = Math.random() * (2 * Math.PI);
+		var x = (200 + Math.random() * 100) * Math.cos(t) + width * 0.5;
+		var y = (200 + Math.random() * 100) * Math.sin(t) + height * 0.5 - 20;
+		var time = 4 + 3 * Math.random();
+
+		TweenLite.to(tri.pos, time, {
+			x: x,
+			y: y, ease: Circ.easeOut,
+			onComplete: function () {
+				tri.init();
+				tweenTriangle(tri);
+			}
+		});
+	}
+
+	// Event handling
+	function addListeners() {
+		window.addEventListener('scroll', scrollCheck);
+		window.addEventListener('resize', resize);
+	}
+
+	function scrollCheck() {
+		if (document.body.scrollTop > height) animateHeader = false;
+		else animateHeader = true;
+	}
+
+	function resize() {
+		width = window.innerWidth;
+		height = window.innerHeight;
+		largeHeader.style.height = height + 'px';
+		canvas.width = width;
+		canvas.height = height;
+	}
+
+	function animate() {
+		if (animateHeader) {
+			ctx.clearRect(0, 0, width, height);
+			for (var i in triangles) {
+				triangles[i].draw();
+			}
+		}
+		requestAnimationFrame(animate);
+	}
+
+	// Canvas manipulation
+	function Triangle() {
+		var _this = this;
+
+		// constructor
+		(function () {
+			_this.coords = [{}, {}, {}];
+			_this.pos = {};
+			init();
+		})();
+
+		function init() {
+			_this.pos.x = width * 0.5;
+			_this.pos.y = height * 0.5 - 20;
+			_this.coords[0].x = -10 + Math.random() * 40;
+			_this.coords[0].y = -10 + Math.random() * 40;
+			_this.coords[1].x = -10 + Math.random() * 40;
+			_this.coords[1].y = -10 + Math.random() * 40;
+			_this.coords[2].x = -10 + Math.random() * 40;
+			_this.coords[2].y = -10 + Math.random() * 40;
+			_this.scale = 0.1 + Math.random() * 0.3;
+			_this.color = colors[Math.floor(Math.random() * colors.length)];
+			setTimeout(function () {
+				_this.alpha = 0.8;
+			}, 10);
+		}
+
+		this.draw = function () {
+			if (_this.alpha >= 0.005) _this.alpha -= 0.005;
+			else _this.alpha = 0;
+			ctx.beginPath();
+			ctx.moveTo(_this.coords[0].x + _this.pos.x, _this.coords[0].y + _this.pos.y);
+			ctx.lineTo(_this.coords[1].x + _this.pos.x, _this.coords[1].y + _this.pos.y);
+			ctx.lineTo(_this.coords[2].x + _this.pos.x, _this.coords[2].y + _this.pos.y);
+			ctx.closePath();
+			ctx.fillStyle = 'rgba(' + _this.color + ',' + _this.alpha + ')';
+			ctx.fill();
+		};
+
+		this.init = init;
+	}
+
+})();
diff --git a/len-sys/src/main/resources/plugin/plugins/sideshow/js/demo-4.js b/len-sys/src/main/resources/plugin/plugins/sideshow/js/demo-4.js
index c827ac6..0702351 100644
--- a/len-sys/src/main/resources/plugin/plugins/sideshow/js/demo-4.js
+++ b/len-sys/src/main/resources/plugin/plugins/sideshow/js/demo-4.js
@@ -1,100 +1,100 @@
-(function() {
-
-    var width, height, largeHeader, canvas, ctx, lines, target, size, animateHeader = true;
-
-    // Main
-    initHeader();
-    addListeners();
-    initAnimation();
-
-    function initHeader() {
-        width = window.innerWidth;
-        height = window.innerHeight;
-        size = width > height ? height : width;
-        target = {x: 0, y: height};
-
-        largeHeader = document.getElementById('large-header');
-        largeHeader.style.height = height+'px';
-
-        canvas = document.getElementById('demo-canvas');
-        canvas.width = width;
-        canvas.height = height;
-        ctx = canvas.getContext('2d');
-
-        // create particles
-        lines = [];
-        for(var i = 0; i < 90; i++) {
-            var l = new Line(Math.random()*360);
-            lines.push(l);
-        }
-    }
-
-    function initAnimation() {
-        animate();
-    }
-
-    // Event handling
-    function addListeners() {
-        window.addEventListener('scroll', scrollCheck);
-        window.addEventListener('resize', resize);
-    }
-
-    function scrollCheck() {
-        if(document.body.scrollTop > height) animateHeader = false;
-        else animateHeader = true;
-    }
-
-    function resize() {
-        width = window.innerWidth;
-        height = window.innerHeight;
-        size = width > height ? height : width;
-        largeHeader.style.height = height+'px';
-        canvas.width = width;
-        canvas.height = height;
-    }
-
-    function animate() {
-        if(animateHeader) {
-            ctx.clearRect(0,0,width,height);
-            for(var i in lines) {
-                lines[i].draw();
-            }
-        }
-        requestAnimationFrame(animate);
-    }
-
-    // Canvas manipulation
-    function Line(angle) {
-        var _this = this;
-
-        // constructor
-        (function() {
-            _this.angle = angle;
-
-        })();
-
-        this.draw = function() {
-
-            var r1 = Math.random()*(size < 400 ? 400 : size)*0.4;
-            var r2 = Math.random()*(size < 400 ? 400 : size)*0.4;
-            var x1 = r1*Math.cos(_this.angle*(Math.PI/180)) + width*0.5;
-            var y1 = r1*Math.sin(_this.angle*(Math.PI/180)) + height*0.48;
-            var x2 = r2*Math.cos(_this.angle*(Math.PI/180)) + width*0.5;
-            var y2 = r2*Math.sin(_this.angle*(Math.PI/180)) + height*0.48;
-            ctx.beginPath();
-            ctx.moveTo(x1, y1);
-            ctx.lineTo(x2, y2);
-            ctx.strokeStyle = 'rgba(255,193,127,'+(0.5+Math.random()*0.5)+')';
-
-            ctx.stroke();
-
-            ctx.beginPath();
-            ctx.arc(x1, y1, 2, 0, 2 * Math.PI, false);
-            ctx.fillStyle = 'rgba(255,165,70,'+(0.5+Math.random()*0.5)+')';
-            ctx.fill();
-
-            _this.angle += Math.random();
-        };
-    }
-
-})();
\ No newline at end of file
+(function () {
+
+	var width, height, largeHeader, canvas, ctx, lines, target, size, animateHeader = true;
+
+	// Main
+	initHeader();
+	addListeners();
+	initAnimation();
+
+	function initHeader() {
+		width = window.innerWidth;
+		height = window.innerHeight;
+		size = width > height ? height : width;
+		target = {x: 0, y: height};
+
+		largeHeader = document.getElementById('large-header');
+		largeHeader.style.height = height + 'px';
+
+		canvas = document.getElementById('demo-canvas');
+		canvas.width = width;
+		canvas.height = height;
+		ctx = canvas.getContext('2d');
+
+		// create particles
+		lines = [];
+		for (var i = 0; i < 90; i++) {
+			var l = new Line(Math.random() * 360);
+			lines.push(l);
+		}
+	}
+
+	function initAnimation() {
+		animate();
+	}
+
+	// Event handling
+	function addListeners() {
+		window.addEventListener('scroll', scrollCheck);
+		window.addEventListener('resize', resize);
+	}
+
+	function scrollCheck() {
+		if (document.body.scrollTop > height) animateHeader = false;
+		else animateHeader = true;
+	}
+
+	function resize() {
+		width = window.innerWidth;
+		height = window.innerHeight;
+		size = width > height ? height : width;
+		largeHeader.style.height = height + 'px';
+		canvas.width = width;
+		canvas.height = height;
+	}
+
+	function animate() {
+		if (animateHeader) {
+			ctx.clearRect(0, 0, width, height);
+			for (var i in lines) {
+				lines[i].draw();
+			}
+		}
+		requestAnimationFrame(animate);
+	}
+
+	// Canvas manipulation
+	function Line(angle) {
+		var _this = this;
+
+		// constructor
+		(function () {
+			_this.angle = angle;
+
+		})();
+
+		this.draw = function () {
+
+			var r1 = Math.random() * (size < 400 ? 400 : size) * 0.4;
+			var r2 = Math.random() * (size < 400 ? 400 : size) * 0.4;
+			var x1 = r1 * Math.cos(_this.angle * (Math.PI / 180)) + width * 0.5;
+			var y1 = r1 * Math.sin(_this.angle * (Math.PI / 180)) + height * 0.48;
+			var x2 = r2 * Math.cos(_this.angle * (Math.PI / 180)) + width * 0.5;
+			var y2 = r2 * Math.sin(_this.angle * (Math.PI / 180)) + height * 0.48;
+			ctx.beginPath();
+			ctx.moveTo(x1, y1);
+			ctx.lineTo(x2, y2);
+			ctx.strokeStyle = 'rgba(255,193,127,' + (0.5 + Math.random() * 0.5) + ')';
+
+			ctx.stroke();
+
+			ctx.beginPath();
+			ctx.arc(x1, y1, 2, 0, 2 * Math.PI, false);
+			ctx.fillStyle = 'rgba(255,165,70,' + (0.5 + Math.random() * 0.5) + ')';
+			ctx.fill();
+
+			_this.angle += Math.random();
+		};
+	}
+
+})();
diff --git a/len-sys/src/main/resources/plugin/plugins/sideshow/js/rAF.js b/len-sys/src/main/resources/plugin/plugins/sideshow/js/rAF.js
index e1f1999..18d7b28 100644
--- a/len-sys/src/main/resources/plugin/plugins/sideshow/js/rAF.js
+++ b/len-sys/src/main/resources/plugin/plugins/sideshow/js/rAF.js
@@ -5,27 +5,29 @@
 
 // MIT license
 
-(function() {
-    var lastTime = 0;
-    var vendors = ['ms', 'moz', 'webkit', 'o'];
-    for(var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
-        window.requestAnimationFrame = window[vendors[x]+'RequestAnimationFrame'];
-        window.cancelAnimationFrame = window[vendors[x]+'CancelAnimationFrame']
-            || window[vendors[x]+'CancelRequestAnimationFrame'];
-    }
+(function () {
+	var lastTime = 0;
+	var vendors = ['ms', 'moz', 'webkit', 'o'];
+	for (var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
+		window.requestAnimationFrame = window[vendors[x] + 'RequestAnimationFrame'];
+		window.cancelAnimationFrame = window[vendors[x] + 'CancelAnimationFrame']
+			|| window[vendors[x] + 'CancelRequestAnimationFrame'];
+	}
 
-    if (!window.requestAnimationFrame)
-        window.requestAnimationFrame = function(callback, element) {
-            var currTime = new Date().getTime();
-            var timeToCall = Math.max(0, 16 - (currTime - lastTime));
-            var id = window.setTimeout(function() { callback(currTime + timeToCall); },
-                timeToCall);
-            lastTime = currTime + timeToCall;
-            return id;
-        };
+	if (!window.requestAnimationFrame)
+		window.requestAnimationFrame = function (callback, element) {
+			var currTime = new Date().getTime();
+			var timeToCall = Math.max(0, 16 - (currTime - lastTime));
+			var id = window.setTimeout(function () {
+					callback(currTime + timeToCall);
+				},
+				timeToCall);
+			lastTime = currTime + timeToCall;
+			return id;
+		};
 
-    if (!window.cancelAnimationFrame)
-        window.cancelAnimationFrame = function(id) {
-            clearTimeout(id);
-        };
-}());
\ No newline at end of file
+	if (!window.cancelAnimationFrame)
+		window.cancelAnimationFrame = function (id) {
+			clearTimeout(id);
+		};
+}());
diff --git a/len-sys/src/main/resources/plugin/plugins/sortable/Sortable.js b/len-sys/src/main/resources/plugin/plugins/sortable/Sortable.js
index c394160..0e4453b 100644
--- a/len-sys/src/main/resources/plugin/plugins/sortable/Sortable.js
+++ b/len-sys/src/main/resources/plugin/plugins/sortable/Sortable.js
@@ -1,3794 +1,3809 @@
 /**!
  * Sortable 1.15.0
- * @author	RubaXa   <trash@rubaxa.org>
- * @author	owenm    <owen23355@gmail.com>
+ * @author    RubaXa   <trash@rubaxa.org>
+ * @author    owenm    <owen23355@gmail.com>
  * @license MIT
  */
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
-  typeof define === 'function' && define.amd ? define(factory) :
-  (global = global || self, global.Sortable = factory());
-}(this, (function () { 'use strict';
-
-  function ownKeys(object, enumerableOnly) {
-    var keys = Object.keys(object);
-
-    if (Object.getOwnPropertySymbols) {
-      var symbols = Object.getOwnPropertySymbols(object);
-
-      if (enumerableOnly) {
-        symbols = symbols.filter(function (sym) {
-          return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-        });
-      }
-
-      keys.push.apply(keys, symbols);
-    }
-
-    return keys;
-  }
-
-  function _objectSpread2(target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i] != null ? arguments[i] : {};
-
-      if (i % 2) {
-        ownKeys(Object(source), true).forEach(function (key) {
-          _defineProperty(target, key, source[key]);
-        });
-      } else if (Object.getOwnPropertyDescriptors) {
-        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-      } else {
-        ownKeys(Object(source)).forEach(function (key) {
-          Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-        });
-      }
-    }
-
-    return target;
-  }
-
-  function _typeof(obj) {
-    "@babel/helpers - typeof";
-
-    if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-      _typeof = function (obj) {
-        return typeof obj;
-      };
-    } else {
-      _typeof = function (obj) {
-        return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-      };
-    }
-
-    return _typeof(obj);
-  }
-
-  function _defineProperty(obj, key, value) {
-    if (key in obj) {
-      Object.defineProperty(obj, key, {
-        value: value,
-        enumerable: true,
-        configurable: true,
-        writable: true
-      });
-    } else {
-      obj[key] = value;
-    }
-
-    return obj;
-  }
-
-  function _extends() {
-    _extends = Object.assign || function (target) {
-      for (var i = 1; i < arguments.length; i++) {
-        var source = arguments[i];
-
-        for (var key in source) {
-          if (Object.prototype.hasOwnProperty.call(source, key)) {
-            target[key] = source[key];
-          }
-        }
-      }
-
-      return target;
-    };
-
-    return _extends.apply(this, arguments);
-  }
-
-  function _objectWithoutPropertiesLoose(source, excluded) {
-    if (source == null) return {};
-    var target = {};
-    var sourceKeys = Object.keys(source);
-    var key, i;
-
-    for (i = 0; i < sourceKeys.length; i++) {
-      key = sourceKeys[i];
-      if (excluded.indexOf(key) >= 0) continue;
-      target[key] = source[key];
-    }
-
-    return target;
-  }
-
-  function _objectWithoutProperties(source, excluded) {
-    if (source == null) return {};
-
-    var target = _objectWithoutPropertiesLoose(source, excluded);
-
-    var key, i;
-
-    if (Object.getOwnPropertySymbols) {
-      var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-
-      for (i = 0; i < sourceSymbolKeys.length; i++) {
-        key = sourceSymbolKeys[i];
-        if (excluded.indexOf(key) >= 0) continue;
-        if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
-        target[key] = source[key];
-      }
-    }
-
-    return target;
-  }
-
-  function _toConsumableArray(arr) {
-    return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
-  }
-
-  function _arrayWithoutHoles(arr) {
-    if (Array.isArray(arr)) return _arrayLikeToArray(arr);
-  }
-
-  function _iterableToArray(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-  }
-
-  function _unsupportedIterableToArray(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(o);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
-  }
-
-  function _arrayLikeToArray(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-
-    for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
-
-    return arr2;
-  }
-
-  function _nonIterableSpread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-  }
-
-  var version = "1.15.0";
-
-  function userAgent(pattern) {
-    if (typeof window !== 'undefined' && window.navigator) {
-      return !! /*@__PURE__*/navigator.userAgent.match(pattern);
-    }
-  }
-
-  var IE11OrLess = userAgent(/(?:Trident.*rv[ :]?11\.|msie|iemobile|Windows Phone)/i);
-  var Edge = userAgent(/Edge/i);
-  var FireFox = userAgent(/firefox/i);
-  var Safari = userAgent(/safari/i) && !userAgent(/chrome/i) && !userAgent(/android/i);
-  var IOS = userAgent(/iP(ad|od|hone)/i);
-  var ChromeForAndroid = userAgent(/chrome/i) && userAgent(/android/i);
-
-  var captureMode = {
-    capture: false,
-    passive: false
-  };
-
-  function on(el, event, fn) {
-    el.addEventListener(event, fn, !IE11OrLess && captureMode);
-  }
-
-  function off(el, event, fn) {
-    el.removeEventListener(event, fn, !IE11OrLess && captureMode);
-  }
-
-  function matches(
-  /**HTMLElement*/
-  el,
-  /**String*/
-  selector) {
-    if (!selector) return;
-    selector[0] === '>' && (selector = selector.substring(1));
-
-    if (el) {
-      try {
-        if (el.matches) {
-          return el.matches(selector);
-        } else if (el.msMatchesSelector) {
-          return el.msMatchesSelector(selector);
-        } else if (el.webkitMatchesSelector) {
-          return el.webkitMatchesSelector(selector);
-        }
-      } catch (_) {
-        return false;
-      }
-    }
-
-    return false;
-  }
-
-  function getParentOrHost(el) {
-    return el.host && el !== document && el.host.nodeType ? el.host : el.parentNode;
-  }
-
-  function closest(
-  /**HTMLElement*/
-  el,
-  /**String*/
-  selector,
-  /**HTMLElement*/
-  ctx, includeCTX) {
-    if (el) {
-      ctx = ctx || document;
-
-      do {
-        if (selector != null && (selector[0] === '>' ? el.parentNode === ctx && matches(el, selector) : matches(el, selector)) || includeCTX && el === ctx) {
-          return el;
-        }
-
-        if (el === ctx) break;
-        /* jshint boss:true */
-      } while (el = getParentOrHost(el));
-    }
-
-    return null;
-  }
-
-  var R_SPACE = /\s+/g;
-
-  function toggleClass(el, name, state) {
-    if (el && name) {
-      if (el.classList) {
-        el.classList[state ? 'add' : 'remove'](name);
-      } else {
-        var className = (' ' + el.className + ' ').replace(R_SPACE, ' ').replace(' ' + name + ' ', ' ');
-        el.className = (className + (state ? ' ' + name : '')).replace(R_SPACE, ' ');
-      }
-    }
-  }
-
-  function css(el, prop, val) {
-    var style = el && el.style;
-
-    if (style) {
-      if (val === void 0) {
-        if (document.defaultView && document.defaultView.getComputedStyle) {
-          val = document.defaultView.getComputedStyle(el, '');
-        } else if (el.currentStyle) {
-          val = el.currentStyle;
-        }
-
-        return prop === void 0 ? val : val[prop];
-      } else {
-        if (!(prop in style) && prop.indexOf('webkit') === -1) {
-          prop = '-webkit-' + prop;
-        }
-
-        style[prop] = val + (typeof val === 'string' ? '' : 'px');
-      }
-    }
-  }
-
-  function matrix(el, selfOnly) {
-    var appliedTransforms = '';
-
-    if (typeof el === 'string') {
-      appliedTransforms = el;
-    } else {
-      do {
-        var transform = css(el, 'transform');
-
-        if (transform && transform !== 'none') {
-          appliedTransforms = transform + ' ' + appliedTransforms;
-        }
-        /* jshint boss:true */
-
-      } while (!selfOnly && (el = el.parentNode));
-    }
-
-    var matrixFn = window.DOMMatrix || window.WebKitCSSMatrix || window.CSSMatrix || window.MSCSSMatrix;
-    /*jshint -W056 */
-
-    return matrixFn && new matrixFn(appliedTransforms);
-  }
-
-  function find(ctx, tagName, iterator) {
-    if (ctx) {
-      var list = ctx.getElementsByTagName(tagName),
-          i = 0,
-          n = list.length;
-
-      if (iterator) {
-        for (; i < n; i++) {
-          iterator(list[i], i);
-        }
-      }
-
-      return list;
-    }
-
-    return [];
-  }
-
-  function getWindowScrollingElement() {
-    var scrollingElement = document.scrollingElement;
-
-    if (scrollingElement) {
-      return scrollingElement;
-    } else {
-      return document.documentElement;
-    }
-  }
-  /**
-   * Returns the "bounding client rect" of given element
-   * @param  {HTMLElement} el                       The element whose boundingClientRect is wanted
-   * @param  {[Boolean]} relativeToContainingBlock  Whether the rect should be relative to the containing block of (including) the container
-   * @param  {[Boolean]} relativeToNonStaticParent  Whether the rect should be relative to the relative parent of (including) the contaienr
-   * @param  {[Boolean]} undoScale                  Whether the container's scale() should be undone
-   * @param  {[HTMLElement]} container              The parent the element will be placed in
-   * @return {Object}                               The boundingClientRect of el, with specified adjustments
-   */
-
-
-  function getRect(el, relativeToContainingBlock, relativeToNonStaticParent, undoScale, container) {
-    if (!el.getBoundingClientRect && el !== window) return;
-    var elRect, top, left, bottom, right, height, width;
-
-    if (el !== window && el.parentNode && el !== getWindowScrollingElement()) {
-      elRect = el.getBoundingClientRect();
-      top = elRect.top;
-      left = elRect.left;
-      bottom = elRect.bottom;
-      right = elRect.right;
-      height = elRect.height;
-      width = elRect.width;
-    } else {
-      top = 0;
-      left = 0;
-      bottom = window.innerHeight;
-      right = window.innerWidth;
-      height = window.innerHeight;
-      width = window.innerWidth;
-    }
-
-    if ((relativeToContainingBlock || relativeToNonStaticParent) && el !== window) {
-      // Adjust for translate()
-      container = container || el.parentNode; // solves #1123 (see: https://stackoverflow.com/a/37953806/6088312)
-      // Not needed on <= IE11
-
-      if (!IE11OrLess) {
-        do {
-          if (container && container.getBoundingClientRect && (css(container, 'transform') !== 'none' || relativeToNonStaticParent && css(container, 'position') !== 'static')) {
-            var containerRect = container.getBoundingClientRect(); // Set relative to edges of padding box of container
-
-            top -= containerRect.top + parseInt(css(container, 'border-top-width'));
-            left -= containerRect.left + parseInt(css(container, 'border-left-width'));
-            bottom = top + elRect.height;
-            right = left + elRect.width;
-            break;
-          }
-          /* jshint boss:true */
-
-        } while (container = container.parentNode);
-      }
-    }
-
-    if (undoScale && el !== window) {
-      // Adjust for scale()
-      var elMatrix = matrix(container || el),
-          scaleX = elMatrix && elMatrix.a,
-          scaleY = elMatrix && elMatrix.d;
-
-      if (elMatrix) {
-        top /= scaleY;
-        left /= scaleX;
-        width /= scaleX;
-        height /= scaleY;
-        bottom = top + height;
-        right = left + width;
-      }
-    }
-
-    return {
-      top: top,
-      left: left,
-      bottom: bottom,
-      right: right,
-      width: width,
-      height: height
-    };
-  }
-  /**
-   * Checks if a side of an element is scrolled past a side of its parents
-   * @param  {HTMLElement}  el           The element who's side being scrolled out of view is in question
-   * @param  {String}       elSide       Side of the element in question ('top', 'left', 'right', 'bottom')
-   * @param  {String}       parentSide   Side of the parent in question ('top', 'left', 'right', 'bottom')
-   * @return {HTMLElement}               The parent scroll element that the el's side is scrolled past, or null if there is no such element
-   */
-
-
-  function isScrolledPast(el, elSide, parentSide) {
-    var parent = getParentAutoScrollElement(el, true),
-        elSideVal = getRect(el)[elSide];
-    /* jshint boss:true */
-
-    while (parent) {
-      var parentSideVal = getRect(parent)[parentSide],
-          visible = void 0;
-
-      if (parentSide === 'top' || parentSide === 'left') {
-        visible = elSideVal >= parentSideVal;
-      } else {
-        visible = elSideVal <= parentSideVal;
-      }
-
-      if (!visible) return parent;
-      if (parent === getWindowScrollingElement()) break;
-      parent = getParentAutoScrollElement(parent, false);
-    }
-
-    return false;
-  }
-  /**
-   * Gets nth child of el, ignoring hidden children, sortable's elements (does not ignore clone if it's visible)
-   * and non-draggable elements
-   * @param  {HTMLElement} el       The parent element
-   * @param  {Number} childNum      The index of the child
-   * @param  {Object} options       Parent Sortable's options
-   * @return {HTMLElement}          The child at index childNum, or null if not found
-   */
-
-
-  function getChild(el, childNum, options, includeDragEl) {
-    var currentChild = 0,
-        i = 0,
-        children = el.children;
-
-    while (i < children.length) {
-      if (children[i].style.display !== 'none' && children[i] !== Sortable.ghost && (includeDragEl || children[i] !== Sortable.dragged) && closest(children[i], options.draggable, el, false)) {
-        if (currentChild === childNum) {
-          return children[i];
-        }
-
-        currentChild++;
-      }
-
-      i++;
-    }
-
-    return null;
-  }
-  /**
-   * Gets the last child in the el, ignoring ghostEl or invisible elements (clones)
-   * @param  {HTMLElement} el       Parent element
-   * @param  {selector} selector    Any other elements that should be ignored
-   * @return {HTMLElement}          The last child, ignoring ghostEl
-   */
-
-
-  function lastChild(el, selector) {
-    var last = el.lastElementChild;
-
-    while (last && (last === Sortable.ghost || css(last, 'display') === 'none' || selector && !matches(last, selector))) {
-      last = last.previousElementSibling;
-    }
-
-    return last || null;
-  }
-  /**
-   * Returns the index of an element within its parent for a selected set of
-   * elements
-   * @param  {HTMLElement} el
-   * @param  {selector} selector
-   * @return {number}
-   */
-
-
-  function index(el, selector) {
-    var index = 0;
-
-    if (!el || !el.parentNode) {
-      return -1;
-    }
-    /* jshint boss:true */
-
-
-    while (el = el.previousElementSibling) {
-      if (el.nodeName.toUpperCase() !== 'TEMPLATE' && el !== Sortable.clone && (!selector || matches(el, selector))) {
-        index++;
-      }
-    }
-
-    return index;
-  }
-  /**
-   * Returns the scroll offset of the given element, added with all the scroll offsets of parent elements.
-   * The value is returned in real pixels.
-   * @param  {HTMLElement} el
-   * @return {Array}             Offsets in the format of [left, top]
-   */
-
-
-  function getRelativeScrollOffset(el) {
-    var offsetLeft = 0,
-        offsetTop = 0,
-        winScroller = getWindowScrollingElement();
-
-    if (el) {
-      do {
-        var elMatrix = matrix(el),
-            scaleX = elMatrix.a,
-            scaleY = elMatrix.d;
-        offsetLeft += el.scrollLeft * scaleX;
-        offsetTop += el.scrollTop * scaleY;
-      } while (el !== winScroller && (el = el.parentNode));
-    }
-
-    return [offsetLeft, offsetTop];
-  }
-  /**
-   * Returns the index of the object within the given array
-   * @param  {Array} arr   Array that may or may not hold the object
-   * @param  {Object} obj  An object that has a key-value pair unique to and identical to a key-value pair in the object you want to find
-   * @return {Number}      The index of the object in the array, or -1
-   */
-
-
-  function indexOfObject(arr, obj) {
-    for (var i in arr) {
-      if (!arr.hasOwnProperty(i)) continue;
-
-      for (var key in obj) {
-        if (obj.hasOwnProperty(key) && obj[key] === arr[i][key]) return Number(i);
-      }
-    }
-
-    return -1;
-  }
-
-  function getParentAutoScrollElement(el, includeSelf) {
-    // skip to window
-    if (!el || !el.getBoundingClientRect) return getWindowScrollingElement();
-    var elem = el;
-    var gotSelf = false;
-
-    do {
-      // we don't need to get elem css if it isn't even overflowing in the first place (performance)
-      if (elem.clientWidth < elem.scrollWidth || elem.clientHeight < elem.scrollHeight) {
-        var elemCSS = css(elem);
-
-        if (elem.clientWidth < elem.scrollWidth && (elemCSS.overflowX == 'auto' || elemCSS.overflowX == 'scroll') || elem.clientHeight < elem.scrollHeight && (elemCSS.overflowY == 'auto' || elemCSS.overflowY == 'scroll')) {
-          if (!elem.getBoundingClientRect || elem === document.body) return getWindowScrollingElement();
-          if (gotSelf || includeSelf) return elem;
-          gotSelf = true;
-        }
-      }
-      /* jshint boss:true */
-
-    } while (elem = elem.parentNode);
-
-    return getWindowScrollingElement();
-  }
-
-  function extend(dst, src) {
-    if (dst && src) {
-      for (var key in src) {
-        if (src.hasOwnProperty(key)) {
-          dst[key] = src[key];
-        }
-      }
-    }
-
-    return dst;
-  }
-
-  function isRectEqual(rect1, rect2) {
-    return Math.round(rect1.top) === Math.round(rect2.top) && Math.round(rect1.left) === Math.round(rect2.left) && Math.round(rect1.height) === Math.round(rect2.height) && Math.round(rect1.width) === Math.round(rect2.width);
-  }
-
-  var _throttleTimeout;
-
-  function throttle(callback, ms) {
-    return function () {
-      if (!_throttleTimeout) {
-        var args = arguments,
-            _this = this;
-
-        if (args.length === 1) {
-          callback.call(_this, args[0]);
-        } else {
-          callback.apply(_this, args);
-        }
-
-        _throttleTimeout = setTimeout(function () {
-          _throttleTimeout = void 0;
-        }, ms);
-      }
-    };
-  }
-
-  function cancelThrottle() {
-    clearTimeout(_throttleTimeout);
-    _throttleTimeout = void 0;
-  }
-
-  function scrollBy(el, x, y) {
-    el.scrollLeft += x;
-    el.scrollTop += y;
-  }
-
-  function clone(el) {
-    var Polymer = window.Polymer;
-    var $ = window.jQuery || window.Zepto;
-
-    if (Polymer && Polymer.dom) {
-      return Polymer.dom(el).cloneNode(true);
-    } else if ($) {
-      return $(el).clone(true)[0];
-    } else {
-      return el.cloneNode(true);
-    }
-  }
-
-  function setRect(el, rect) {
-    css(el, 'position', 'absolute');
-    css(el, 'top', rect.top);
-    css(el, 'left', rect.left);
-    css(el, 'width', rect.width);
-    css(el, 'height', rect.height);
-  }
-
-  function unsetRect(el) {
-    css(el, 'position', '');
-    css(el, 'top', '');
-    css(el, 'left', '');
-    css(el, 'width', '');
-    css(el, 'height', '');
-  }
-
-  var expando = 'Sortable' + new Date().getTime();
-
-  function AnimationStateManager() {
-    var animationStates = [],
-        animationCallbackId;
-    return {
-      captureAnimationState: function captureAnimationState() {
-        animationStates = [];
-        if (!this.options.animation) return;
-        var children = [].slice.call(this.el.children);
-        children.forEach(function (child) {
-          if (css(child, 'display') === 'none' || child === Sortable.ghost) return;
-          animationStates.push({
-            target: child,
-            rect: getRect(child)
-          });
-
-          var fromRect = _objectSpread2({}, animationStates[animationStates.length - 1].rect); // If animating: compensate for current animation
-
-
-          if (child.thisAnimationDuration) {
-            var childMatrix = matrix(child, true);
-
-            if (childMatrix) {
-              fromRect.top -= childMatrix.f;
-              fromRect.left -= childMatrix.e;
-            }
-          }
-
-          child.fromRect = fromRect;
-        });
-      },
-      addAnimationState: function addAnimationState(state) {
-        animationStates.push(state);
-      },
-      removeAnimationState: function removeAnimationState(target) {
-        animationStates.splice(indexOfObject(animationStates, {
-          target: target
-        }), 1);
-      },
-      animateAll: function animateAll(callback) {
-        var _this = this;
-
-        if (!this.options.animation) {
-          clearTimeout(animationCallbackId);
-          if (typeof callback === 'function') callback();
-          return;
-        }
-
-        var animating = false,
-            animationTime = 0;
-        animationStates.forEach(function (state) {
-          var time = 0,
-              target = state.target,
-              fromRect = target.fromRect,
-              toRect = getRect(target),
-              prevFromRect = target.prevFromRect,
-              prevToRect = target.prevToRect,
-              animatingRect = state.rect,
-              targetMatrix = matrix(target, true);
-
-          if (targetMatrix) {
-            // Compensate for current animation
-            toRect.top -= targetMatrix.f;
-            toRect.left -= targetMatrix.e;
-          }
-
-          target.toRect = toRect;
-
-          if (target.thisAnimationDuration) {
-            // Could also check if animatingRect is between fromRect and toRect
-            if (isRectEqual(prevFromRect, toRect) && !isRectEqual(fromRect, toRect) && // Make sure animatingRect is on line between toRect & fromRect
-            (animatingRect.top - toRect.top) / (animatingRect.left - toRect.left) === (fromRect.top - toRect.top) / (fromRect.left - toRect.left)) {
-              // If returning to same place as started from animation and on same axis
-              time = calculateRealTime(animatingRect, prevFromRect, prevToRect, _this.options);
-            }
-          } // if fromRect != toRect: animate
-
-
-          if (!isRectEqual(toRect, fromRect)) {
-            target.prevFromRect = fromRect;
-            target.prevToRect = toRect;
-
-            if (!time) {
-              time = _this.options.animation;
-            }
-
-            _this.animate(target, animatingRect, toRect, time);
-          }
-
-          if (time) {
-            animating = true;
-            animationTime = Math.max(animationTime, time);
-            clearTimeout(target.animationResetTimer);
-            target.animationResetTimer = setTimeout(function () {
-              target.animationTime = 0;
-              target.prevFromRect = null;
-              target.fromRect = null;
-              target.prevToRect = null;
-              target.thisAnimationDuration = null;
-            }, time);
-            target.thisAnimationDuration = time;
-          }
-        });
-        clearTimeout(animationCallbackId);
-
-        if (!animating) {
-          if (typeof callback === 'function') callback();
-        } else {
-          animationCallbackId = setTimeout(function () {
-            if (typeof callback === 'function') callback();
-          }, animationTime);
-        }
-
-        animationStates = [];
-      },
-      animate: function animate(target, currentRect, toRect, duration) {
-        if (duration) {
-          css(target, 'transition', '');
-          css(target, 'transform', '');
-          var elMatrix = matrix(this.el),
-              scaleX = elMatrix && elMatrix.a,
-              scaleY = elMatrix && elMatrix.d,
-              translateX = (currentRect.left - toRect.left) / (scaleX || 1),
-              translateY = (currentRect.top - toRect.top) / (scaleY || 1);
-          target.animatingX = !!translateX;
-          target.animatingY = !!translateY;
-          css(target, 'transform', 'translate3d(' + translateX + 'px,' + translateY + 'px,0)');
-          this.forRepaintDummy = repaint(target); // repaint
-
-          css(target, 'transition', 'transform ' + duration + 'ms' + (this.options.easing ? ' ' + this.options.easing : ''));
-          css(target, 'transform', 'translate3d(0,0,0)');
-          typeof target.animated === 'number' && clearTimeout(target.animated);
-          target.animated = setTimeout(function () {
-            css(target, 'transition', '');
-            css(target, 'transform', '');
-            target.animated = false;
-            target.animatingX = false;
-            target.animatingY = false;
-          }, duration);
-        }
-      }
-    };
-  }
-
-  function repaint(target) {
-    return target.offsetWidth;
-  }
-
-  function calculateRealTime(animatingRect, fromRect, toRect, options) {
-    return Math.sqrt(Math.pow(fromRect.top - animatingRect.top, 2) + Math.pow(fromRect.left - animatingRect.left, 2)) / Math.sqrt(Math.pow(fromRect.top - toRect.top, 2) + Math.pow(fromRect.left - toRect.left, 2)) * options.animation;
-  }
-
-  var plugins = [];
-  var defaults = {
-    initializeByDefault: true
-  };
-  var PluginManager = {
-    mount: function mount(plugin) {
-      // Set default static properties
-      for (var option in defaults) {
-        if (defaults.hasOwnProperty(option) && !(option in plugin)) {
-          plugin[option] = defaults[option];
-        }
-      }
-
-      plugins.forEach(function (p) {
-        if (p.pluginName === plugin.pluginName) {
-          throw "Sortable: Cannot mount plugin ".concat(plugin.pluginName, " more than once");
-        }
-      });
-      plugins.push(plugin);
-    },
-    pluginEvent: function pluginEvent(eventName, sortable, evt) {
-      var _this = this;
-
-      this.eventCanceled = false;
-
-      evt.cancel = function () {
-        _this.eventCanceled = true;
-      };
-
-      var eventNameGlobal = eventName + 'Global';
-      plugins.forEach(function (plugin) {
-        if (!sortable[plugin.pluginName]) return; // Fire global events if it exists in this sortable
-
-        if (sortable[plugin.pluginName][eventNameGlobal]) {
-          sortable[plugin.pluginName][eventNameGlobal](_objectSpread2({
-            sortable: sortable
-          }, evt));
-        } // Only fire plugin event if plugin is enabled in this sortable,
-        // and plugin has event defined
-
-
-        if (sortable.options[plugin.pluginName] && sortable[plugin.pluginName][eventName]) {
-          sortable[plugin.pluginName][eventName](_objectSpread2({
-            sortable: sortable
-          }, evt));
-        }
-      });
-    },
-    initializePlugins: function initializePlugins(sortable, el, defaults, options) {
-      plugins.forEach(function (plugin) {
-        var pluginName = plugin.pluginName;
-        if (!sortable.options[pluginName] && !plugin.initializeByDefault) return;
-        var initialized = new plugin(sortable, el, sortable.options);
-        initialized.sortable = sortable;
-        initialized.options = sortable.options;
-        sortable[pluginName] = initialized; // Add default options from plugin
-
-        _extends(defaults, initialized.defaults);
-      });
-
-      for (var option in sortable.options) {
-        if (!sortable.options.hasOwnProperty(option)) continue;
-        var modified = this.modifyOption(sortable, option, sortable.options[option]);
-
-        if (typeof modified !== 'undefined') {
-          sortable.options[option] = modified;
-        }
-      }
-    },
-    getEventProperties: function getEventProperties(name, sortable) {
-      var eventProperties = {};
-      plugins.forEach(function (plugin) {
-        if (typeof plugin.eventProperties !== 'function') return;
-
-        _extends(eventProperties, plugin.eventProperties.call(sortable[plugin.pluginName], name));
-      });
-      return eventProperties;
-    },
-    modifyOption: function modifyOption(sortable, name, value) {
-      var modifiedValue;
-      plugins.forEach(function (plugin) {
-        // Plugin must exist on the Sortable
-        if (!sortable[plugin.pluginName]) return; // If static option listener exists for this option, call in the context of the Sortable's instance of this plugin
-
-        if (plugin.optionListeners && typeof plugin.optionListeners[name] === 'function') {
-          modifiedValue = plugin.optionListeners[name].call(sortable[plugin.pluginName], value);
-        }
-      });
-      return modifiedValue;
-    }
-  };
-
-  function dispatchEvent(_ref) {
-    var sortable = _ref.sortable,
-        rootEl = _ref.rootEl,
-        name = _ref.name,
-        targetEl = _ref.targetEl,
-        cloneEl = _ref.cloneEl,
-        toEl = _ref.toEl,
-        fromEl = _ref.fromEl,
-        oldIndex = _ref.oldIndex,
-        newIndex = _ref.newIndex,
-        oldDraggableIndex = _ref.oldDraggableIndex,
-        newDraggableIndex = _ref.newDraggableIndex,
-        originalEvent = _ref.originalEvent,
-        putSortable = _ref.putSortable,
-        extraEventProperties = _ref.extraEventProperties;
-    sortable = sortable || rootEl && rootEl[expando];
-    if (!sortable) return;
-    var evt,
-        options = sortable.options,
-        onName = 'on' + name.charAt(0).toUpperCase() + name.substr(1); // Support for new CustomEvent feature
-
-    if (window.CustomEvent && !IE11OrLess && !Edge) {
-      evt = new CustomEvent(name, {
-        bubbles: true,
-        cancelable: true
-      });
-    } else {
-      evt = document.createEvent('Event');
-      evt.initEvent(name, true, true);
-    }
-
-    evt.to = toEl || rootEl;
-    evt.from = fromEl || rootEl;
-    evt.item = targetEl || rootEl;
-    evt.clone = cloneEl;
-    evt.oldIndex = oldIndex;
-    evt.newIndex = newIndex;
-    evt.oldDraggableIndex = oldDraggableIndex;
-    evt.newDraggableIndex = newDraggableIndex;
-    evt.originalEvent = originalEvent;
-    evt.pullMode = putSortable ? putSortable.lastPutMode : undefined;
-
-    var allEventProperties = _objectSpread2(_objectSpread2({}, extraEventProperties), PluginManager.getEventProperties(name, sortable));
-
-    for (var option in allEventProperties) {
-      evt[option] = allEventProperties[option];
-    }
-
-    if (rootEl) {
-      rootEl.dispatchEvent(evt);
-    }
-
-    if (options[onName]) {
-      options[onName].call(sortable, evt);
-    }
-  }
-
-  var _excluded = ["evt"];
-
-  var pluginEvent = function pluginEvent(eventName, sortable) {
-    var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
-        originalEvent = _ref.evt,
-        data = _objectWithoutProperties(_ref, _excluded);
-
-    PluginManager.pluginEvent.bind(Sortable)(eventName, sortable, _objectSpread2({
-      dragEl: dragEl,
-      parentEl: parentEl,
-      ghostEl: ghostEl,
-      rootEl: rootEl,
-      nextEl: nextEl,
-      lastDownEl: lastDownEl,
-      cloneEl: cloneEl,
-      cloneHidden: cloneHidden,
-      dragStarted: moved,
-      putSortable: putSortable,
-      activeSortable: Sortable.active,
-      originalEvent: originalEvent,
-      oldIndex: oldIndex,
-      oldDraggableIndex: oldDraggableIndex,
-      newIndex: newIndex,
-      newDraggableIndex: newDraggableIndex,
-      hideGhostForTarget: _hideGhostForTarget,
-      unhideGhostForTarget: _unhideGhostForTarget,
-      cloneNowHidden: function cloneNowHidden() {
-        cloneHidden = true;
-      },
-      cloneNowShown: function cloneNowShown() {
-        cloneHidden = false;
-      },
-      dispatchSortableEvent: function dispatchSortableEvent(name) {
-        _dispatchEvent({
-          sortable: sortable,
-          name: name,
-          originalEvent: originalEvent
-        });
-      }
-    }, data));
-  };
-
-  function _dispatchEvent(info) {
-    dispatchEvent(_objectSpread2({
-      putSortable: putSortable,
-      cloneEl: cloneEl,
-      targetEl: dragEl,
-      rootEl: rootEl,
-      oldIndex: oldIndex,
-      oldDraggableIndex: oldDraggableIndex,
-      newIndex: newIndex,
-      newDraggableIndex: newDraggableIndex
-    }, info));
-  }
-
-  var dragEl,
-      parentEl,
-      ghostEl,
-      rootEl,
-      nextEl,
-      lastDownEl,
-      cloneEl,
-      cloneHidden,
-      oldIndex,
-      newIndex,
-      oldDraggableIndex,
-      newDraggableIndex,
-      activeGroup,
-      putSortable,
-      awaitingDragStarted = false,
-      ignoreNextClick = false,
-      sortables = [],
-      tapEvt,
-      touchEvt,
-      lastDx,
-      lastDy,
-      tapDistanceLeft,
-      tapDistanceTop,
-      moved,
-      lastTarget,
-      lastDirection,
-      pastFirstInvertThresh = false,
-      isCircumstantialInvert = false,
-      targetMoveDistance,
-      // For positioning ghost absolutely
-  ghostRelativeParent,
-      ghostRelativeParentInitialScroll = [],
-      // (left, top)
-  _silent = false,
-      savedInputChecked = [];
-  /** @const */
-
-  var documentExists = typeof document !== 'undefined',
-      PositionGhostAbsolutely = IOS,
-      CSSFloatProperty = Edge || IE11OrLess ? 'cssFloat' : 'float',
-      // This will not pass for IE9, because IE9 DnD only works on anchors
-  supportDraggable = documentExists && !ChromeForAndroid && !IOS && 'draggable' in document.createElement('div'),
-      supportCssPointerEvents = function () {
-    if (!documentExists) return; // false when <= IE11
-
-    if (IE11OrLess) {
-      return false;
-    }
-
-    var el = document.createElement('x');
-    el.style.cssText = 'pointer-events:auto';
-    return el.style.pointerEvents === 'auto';
-  }(),
-      _detectDirection = function _detectDirection(el, options) {
-    var elCSS = css(el),
-        elWidth = parseInt(elCSS.width) - parseInt(elCSS.paddingLeft) - parseInt(elCSS.paddingRight) - parseInt(elCSS.borderLeftWidth) - parseInt(elCSS.borderRightWidth),
-        child1 = getChild(el, 0, options),
-        child2 = getChild(el, 1, options),
-        firstChildCSS = child1 && css(child1),
-        secondChildCSS = child2 && css(child2),
-        firstChildWidth = firstChildCSS && parseInt(firstChildCSS.marginLeft) + parseInt(firstChildCSS.marginRight) + getRect(child1).width,
-        secondChildWidth = secondChildCSS && parseInt(secondChildCSS.marginLeft) + parseInt(secondChildCSS.marginRight) + getRect(child2).width;
-
-    if (elCSS.display === 'flex') {
-      return elCSS.flexDirection === 'column' || elCSS.flexDirection === 'column-reverse' ? 'vertical' : 'horizontal';
-    }
-
-    if (elCSS.display === 'grid') {
-      return elCSS.gridTemplateColumns.split(' ').length <= 1 ? 'vertical' : 'horizontal';
-    }
-
-    if (child1 && firstChildCSS["float"] && firstChildCSS["float"] !== 'none') {
-      var touchingSideChild2 = firstChildCSS["float"] === 'left' ? 'left' : 'right';
-      return child2 && (secondChildCSS.clear === 'both' || secondChildCSS.clear === touchingSideChild2) ? 'vertical' : 'horizontal';
-    }
-
-    return child1 && (firstChildCSS.display === 'block' || firstChildCSS.display === 'flex' || firstChildCSS.display === 'table' || firstChildCSS.display === 'grid' || firstChildWidth >= elWidth && elCSS[CSSFloatProperty] === 'none' || child2 && elCSS[CSSFloatProperty] === 'none' && firstChildWidth + secondChildWidth > elWidth) ? 'vertical' : 'horizontal';
-  },
-      _dragElInRowColumn = function _dragElInRowColumn(dragRect, targetRect, vertical) {
-    var dragElS1Opp = vertical ? dragRect.left : dragRect.top,
-        dragElS2Opp = vertical ? dragRect.right : dragRect.bottom,
-        dragElOppLength = vertical ? dragRect.width : dragRect.height,
-        targetS1Opp = vertical ? targetRect.left : targetRect.top,
-        targetS2Opp = vertical ? targetRect.right : targetRect.bottom,
-        targetOppLength = vertical ? targetRect.width : targetRect.height;
-    return dragElS1Opp === targetS1Opp || dragElS2Opp === targetS2Opp || dragElS1Opp + dragElOppLength / 2 === targetS1Opp + targetOppLength / 2;
-  },
-
-  /**
-   * Detects first nearest empty sortable to X and Y position using emptyInsertThreshold.
-   * @param  {Number} x      X position
-   * @param  {Number} y      Y position
-   * @return {HTMLElement}   Element of the first found nearest Sortable
-   */
-  _detectNearestEmptySortable = function _detectNearestEmptySortable(x, y) {
-    var ret;
-    sortables.some(function (sortable) {
-      var threshold = sortable[expando].options.emptyInsertThreshold;
-      if (!threshold || lastChild(sortable)) return;
-      var rect = getRect(sortable),
-          insideHorizontally = x >= rect.left - threshold && x <= rect.right + threshold,
-          insideVertically = y >= rect.top - threshold && y <= rect.bottom + threshold;
-
-      if (insideHorizontally && insideVertically) {
-        return ret = sortable;
-      }
-    });
-    return ret;
-  },
-      _prepareGroup = function _prepareGroup(options) {
-    function toFn(value, pull) {
-      return function (to, from, dragEl, evt) {
-        var sameGroup = to.options.group.name && from.options.group.name && to.options.group.name === from.options.group.name;
-
-        if (value == null && (pull || sameGroup)) {
-          // Default pull value
-          // Default pull and put value if same group
-          return true;
-        } else if (value == null || value === false) {
-          return false;
-        } else if (pull && value === 'clone') {
-          return value;
-        } else if (typeof value === 'function') {
-          return toFn(value(to, from, dragEl, evt), pull)(to, from, dragEl, evt);
-        } else {
-          var otherGroup = (pull ? to : from).options.group.name;
-          return value === true || typeof value === 'string' && value === otherGroup || value.join && value.indexOf(otherGroup) > -1;
-        }
-      };
-    }
-
-    var group = {};
-    var originalGroup = options.group;
-
-    if (!originalGroup || _typeof(originalGroup) != 'object') {
-      originalGroup = {
-        name: originalGroup
-      };
-    }
-
-    group.name = originalGroup.name;
-    group.checkPull = toFn(originalGroup.pull, true);
-    group.checkPut = toFn(originalGroup.put);
-    group.revertClone = originalGroup.revertClone;
-    options.group = group;
-  },
-      _hideGhostForTarget = function _hideGhostForTarget() {
-    if (!supportCssPointerEvents && ghostEl) {
-      css(ghostEl, 'display', 'none');
-    }
-  },
-      _unhideGhostForTarget = function _unhideGhostForTarget() {
-    if (!supportCssPointerEvents && ghostEl) {
-      css(ghostEl, 'display', '');
-    }
-  }; // #1184 fix - Prevent click event on fallback if dragged but item not changed position
-
-
-  if (documentExists && !ChromeForAndroid) {
-    document.addEventListener('click', function (evt) {
-      if (ignoreNextClick) {
-        evt.preventDefault();
-        evt.stopPropagation && evt.stopPropagation();
-        evt.stopImmediatePropagation && evt.stopImmediatePropagation();
-        ignoreNextClick = false;
-        return false;
-      }
-    }, true);
-  }
-
-  var nearestEmptyInsertDetectEvent = function nearestEmptyInsertDetectEvent(evt) {
-    if (dragEl) {
-      evt = evt.touches ? evt.touches[0] : evt;
-
-      var nearest = _detectNearestEmptySortable(evt.clientX, evt.clientY);
-
-      if (nearest) {
-        // Create imitation event
-        var event = {};
-
-        for (var i in evt) {
-          if (evt.hasOwnProperty(i)) {
-            event[i] = evt[i];
-          }
-        }
-
-        event.target = event.rootEl = nearest;
-        event.preventDefault = void 0;
-        event.stopPropagation = void 0;
-
-        nearest[expando]._onDragOver(event);
-      }
-    }
-  };
-
-  var _checkOutsideTargetEl = function _checkOutsideTargetEl(evt) {
-    if (dragEl) {
-      dragEl.parentNode[expando]._isOutsideThisEl(evt.target);
-    }
-  };
-  /**
-   * @class  Sortable
-   * @param  {HTMLElement}  el
-   * @param  {Object}       [options]
-   */
-
-
-  function Sortable(el, options) {
-    if (!(el && el.nodeType && el.nodeType === 1)) {
-      throw "Sortable: `el` must be an HTMLElement, not ".concat({}.toString.call(el));
-    }
-
-    this.el = el; // root element
-
-    this.options = options = _extends({}, options); // Export instance
-
-    el[expando] = this;
-    var defaults = {
-      group: null,
-      sort: true,
-      disabled: false,
-      store: null,
-      handle: null,
-      draggable: /^[uo]l$/i.test(el.nodeName) ? '>li' : '>*',
-      swapThreshold: 1,
-      // percentage; 0 <= x <= 1
-      invertSwap: false,
-      // invert always
-      invertedSwapThreshold: null,
-      // will be set to same as swapThreshold if default
-      removeCloneOnHide: true,
-      direction: function direction() {
-        return _detectDirection(el, this.options);
-      },
-      ghostClass: 'sortable-ghost',
-      chosenClass: 'sortable-chosen',
-      dragClass: 'sortable-drag',
-      ignore: 'a, img',
-      filter: null,
-      preventOnFilter: true,
-      animation: 0,
-      easing: null,
-      setData: function setData(dataTransfer, dragEl) {
-        dataTransfer.setData('Text', dragEl.textContent);
-      },
-      dropBubble: false,
-      dragoverBubble: false,
-      dataIdAttr: 'data-id',
-      delay: 0,
-      delayOnTouchOnly: false,
-      touchStartThreshold: (Number.parseInt ? Number : window).parseInt(window.devicePixelRatio, 10) || 1,
-      forceFallback: false,
-      fallbackClass: 'sortable-fallback',
-      fallbackOnBody: false,
-      fallbackTolerance: 0,
-      fallbackOffset: {
-        x: 0,
-        y: 0
-      },
-      supportPointer: Sortable.supportPointer !== false && 'PointerEvent' in window && !Safari,
-      emptyInsertThreshold: 5
-    };
-    PluginManager.initializePlugins(this, el, defaults); // Set default options
-
-    for (var name in defaults) {
-      !(name in options) && (options[name] = defaults[name]);
-    }
-
-    _prepareGroup(options); // Bind all private methods
-
-
-    for (var fn in this) {
-      if (fn.charAt(0) === '_' && typeof this[fn] === 'function') {
-        this[fn] = this[fn].bind(this);
-      }
-    } // Setup drag mode
-
-
-    this.nativeDraggable = options.forceFallback ? false : supportDraggable;
-
-    if (this.nativeDraggable) {
-      // Touch start threshold cannot be greater than the native dragstart threshold
-      this.options.touchStartThreshold = 1;
-    } // Bind events
-
-
-    if (options.supportPointer) {
-      on(el, 'pointerdown', this._onTapStart);
-    } else {
-      on(el, 'mousedown', this._onTapStart);
-      on(el, 'touchstart', this._onTapStart);
-    }
-
-    if (this.nativeDraggable) {
-      on(el, 'dragover', this);
-      on(el, 'dragenter', this);
-    }
-
-    sortables.push(this.el); // Restore sorting
-
-    options.store && options.store.get && this.sort(options.store.get(this) || []); // Add animation state manager
-
-    _extends(this, AnimationStateManager());
-  }
-
-  Sortable.prototype =
-  /** @lends Sortable.prototype */
-  {
-    constructor: Sortable,
-    _isOutsideThisEl: function _isOutsideThisEl(target) {
-      if (!this.el.contains(target) && target !== this.el) {
-        lastTarget = null;
-      }
-    },
-    _getDirection: function _getDirection(evt, target) {
-      return typeof this.options.direction === 'function' ? this.options.direction.call(this, evt, target, dragEl) : this.options.direction;
-    },
-    _onTapStart: function _onTapStart(
-    /** Event|TouchEvent */
-    evt) {
-      if (!evt.cancelable) return;
-
-      var _this = this,
-          el = this.el,
-          options = this.options,
-          preventOnFilter = options.preventOnFilter,
-          type = evt.type,
-          touch = evt.touches && evt.touches[0] || evt.pointerType && evt.pointerType === 'touch' && evt,
-          target = (touch || evt).target,
-          originalTarget = evt.target.shadowRoot && (evt.path && evt.path[0] || evt.composedPath && evt.composedPath()[0]) || target,
-          filter = options.filter;
-
-      _saveInputCheckedState(el); // Don't trigger start event when an element is been dragged, otherwise the evt.oldindex always wrong when set option.group.
-
-
-      if (dragEl) {
-        return;
-      }
-
-      if (/mousedown|pointerdown/.test(type) && evt.button !== 0 || options.disabled) {
-        return; // only left button and enabled
-      } // cancel dnd if original target is content editable
-
-
-      if (originalTarget.isContentEditable) {
-        return;
-      } // Safari ignores further event handling after mousedown
-
-
-      if (!this.nativeDraggable && Safari && target && target.tagName.toUpperCase() === 'SELECT') {
-        return;
-      }
-
-      target = closest(target, options.draggable, el, false);
-
-      if (target && target.animated) {
-        return;
-      }
-
-      if (lastDownEl === target) {
-        // Ignoring duplicate `down`
-        return;
-      } // Get the index of the dragged element within its parent
-
-
-      oldIndex = index(target);
-      oldDraggableIndex = index(target, options.draggable); // Check filter
-
-      if (typeof filter === 'function') {
-        if (filter.call(this, evt, target, this)) {
-          _dispatchEvent({
-            sortable: _this,
-            rootEl: originalTarget,
-            name: 'filter',
-            targetEl: target,
-            toEl: el,
-            fromEl: el
-          });
-
-          pluginEvent('filter', _this, {
-            evt: evt
-          });
-          preventOnFilter && evt.cancelable && evt.preventDefault();
-          return; // cancel dnd
-        }
-      } else if (filter) {
-        filter = filter.split(',').some(function (criteria) {
-          criteria = closest(originalTarget, criteria.trim(), el, false);
-
-          if (criteria) {
-            _dispatchEvent({
-              sortable: _this,
-              rootEl: criteria,
-              name: 'filter',
-              targetEl: target,
-              fromEl: el,
-              toEl: el
-            });
-
-            pluginEvent('filter', _this, {
-              evt: evt
-            });
-            return true;
-          }
-        });
-
-        if (filter) {
-          preventOnFilter && evt.cancelable && evt.preventDefault();
-          return; // cancel dnd
-        }
-      }
-
-      if (options.handle && !closest(originalTarget, options.handle, el, false)) {
-        return;
-      } // Prepare `dragstart`
-
-
-      this._prepareDragStart(evt, touch, target);
-    },
-    _prepareDragStart: function _prepareDragStart(
-    /** Event */
-    evt,
-    /** Touch */
-    touch,
-    /** HTMLElement */
-    target) {
-      var _this = this,
-          el = _this.el,
-          options = _this.options,
-          ownerDocument = el.ownerDocument,
-          dragStartFn;
-
-      if (target && !dragEl && target.parentNode === el) {
-        var dragRect = getRect(target);
-        rootEl = el;
-        dragEl = target;
-        parentEl = dragEl.parentNode;
-        nextEl = dragEl.nextSibling;
-        lastDownEl = target;
-        activeGroup = options.group;
-        Sortable.dragged = dragEl;
-        tapEvt = {
-          target: dragEl,
-          clientX: (touch || evt).clientX,
-          clientY: (touch || evt).clientY
-        };
-        tapDistanceLeft = tapEvt.clientX - dragRect.left;
-        tapDistanceTop = tapEvt.clientY - dragRect.top;
-        this._lastX = (touch || evt).clientX;
-        this._lastY = (touch || evt).clientY;
-        dragEl.style['will-change'] = 'all';
-
-        dragStartFn = function dragStartFn() {
-          pluginEvent('delayEnded', _this, {
-            evt: evt
-          });
-
-          if (Sortable.eventCanceled) {
-            _this._onDrop();
-
-            return;
-          } // Delayed drag has been triggered
-          // we can re-enable the events: touchmove/mousemove
-
-
-          _this._disableDelayedDragEvents();
-
-          if (!FireFox && _this.nativeDraggable) {
-            dragEl.draggable = true;
-          } // Bind the events: dragstart/dragend
-
-
-          _this._triggerDragStart(evt, touch); // Drag start event
-
-
-          _dispatchEvent({
-            sortable: _this,
-            name: 'choose',
-            originalEvent: evt
-          }); // Chosen item
-
-
-          toggleClass(dragEl, options.chosenClass, true);
-        }; // Disable "draggable"
-
-
-        options.ignore.split(',').forEach(function (criteria) {
-          find(dragEl, criteria.trim(), _disableDraggable);
-        });
-        on(ownerDocument, 'dragover', nearestEmptyInsertDetectEvent);
-        on(ownerDocument, 'mousemove', nearestEmptyInsertDetectEvent);
-        on(ownerDocument, 'touchmove', nearestEmptyInsertDetectEvent);
-        on(ownerDocument, 'mouseup', _this._onDrop);
-        on(ownerDocument, 'touchend', _this._onDrop);
-        on(ownerDocument, 'touchcancel', _this._onDrop); // Make dragEl draggable (must be before delay for FireFox)
-
-        if (FireFox && this.nativeDraggable) {
-          this.options.touchStartThreshold = 4;
-          dragEl.draggable = true;
-        }
-
-        pluginEvent('delayStart', this, {
-          evt: evt
-        }); // Delay is impossible for native DnD in Edge or IE
-
-        if (options.delay && (!options.delayOnTouchOnly || touch) && (!this.nativeDraggable || !(Edge || IE11OrLess))) {
-          if (Sortable.eventCanceled) {
-            this._onDrop();
-
-            return;
-          } // If the user moves the pointer or let go the click or touch
-          // before the delay has been reached:
-          // disable the delayed drag
-
-
-          on(ownerDocument, 'mouseup', _this._disableDelayedDrag);
-          on(ownerDocument, 'touchend', _this._disableDelayedDrag);
-          on(ownerDocument, 'touchcancel', _this._disableDelayedDrag);
-          on(ownerDocument, 'mousemove', _this._delayedDragTouchMoveHandler);
-          on(ownerDocument, 'touchmove', _this._delayedDragTouchMoveHandler);
-          options.supportPointer && on(ownerDocument, 'pointermove', _this._delayedDragTouchMoveHandler);
-          _this._dragStartTimer = setTimeout(dragStartFn, options.delay);
-        } else {
-          dragStartFn();
-        }
-      }
-    },
-    _delayedDragTouchMoveHandler: function _delayedDragTouchMoveHandler(
-    /** TouchEvent|PointerEvent **/
-    e) {
-      var touch = e.touches ? e.touches[0] : e;
-
-      if (Math.max(Math.abs(touch.clientX - this._lastX), Math.abs(touch.clientY - this._lastY)) >= Math.floor(this.options.touchStartThreshold / (this.nativeDraggable && window.devicePixelRatio || 1))) {
-        this._disableDelayedDrag();
-      }
-    },
-    _disableDelayedDrag: function _disableDelayedDrag() {
-      dragEl && _disableDraggable(dragEl);
-      clearTimeout(this._dragStartTimer);
-
-      this._disableDelayedDragEvents();
-    },
-    _disableDelayedDragEvents: function _disableDelayedDragEvents() {
-      var ownerDocument = this.el.ownerDocument;
-      off(ownerDocument, 'mouseup', this._disableDelayedDrag);
-      off(ownerDocument, 'touchend', this._disableDelayedDrag);
-      off(ownerDocument, 'touchcancel', this._disableDelayedDrag);
-      off(ownerDocument, 'mousemove', this._delayedDragTouchMoveHandler);
-      off(ownerDocument, 'touchmove', this._delayedDragTouchMoveHandler);
-      off(ownerDocument, 'pointermove', this._delayedDragTouchMoveHandler);
-    },
-    _triggerDragStart: function _triggerDragStart(
-    /** Event */
-    evt,
-    /** Touch */
-    touch) {
-      touch = touch || evt.pointerType == 'touch' && evt;
-
-      if (!this.nativeDraggable || touch) {
-        if (this.options.supportPointer) {
-          on(document, 'pointermove', this._onTouchMove);
-        } else if (touch) {
-          on(document, 'touchmove', this._onTouchMove);
-        } else {
-          on(document, 'mousemove', this._onTouchMove);
-        }
-      } else {
-        on(dragEl, 'dragend', this);
-        on(rootEl, 'dragstart', this._onDragStart);
-      }
-
-      try {
-        if (document.selection) {
-          // Timeout neccessary for IE9
-          _nextTick(function () {
-            document.selection.empty();
-          });
-        } else {
-          window.getSelection().removeAllRanges();
-        }
-      } catch (err) {}
-    },
-    _dragStarted: function _dragStarted(fallback, evt) {
-
-      awaitingDragStarted = false;
-
-      if (rootEl && dragEl) {
-        pluginEvent('dragStarted', this, {
-          evt: evt
-        });
-
-        if (this.nativeDraggable) {
-          on(document, 'dragover', _checkOutsideTargetEl);
-        }
-
-        var options = this.options; // Apply effect
-
-        !fallback && toggleClass(dragEl, options.dragClass, false);
-        toggleClass(dragEl, options.ghostClass, true);
-        Sortable.active = this;
-        fallback && this._appendGhost(); // Drag start event
-
-        _dispatchEvent({
-          sortable: this,
-          name: 'start',
-          originalEvent: evt
-        });
-      } else {
-        this._nulling();
-      }
-    },
-    _emulateDragOver: function _emulateDragOver() {
-      if (touchEvt) {
-        this._lastX = touchEvt.clientX;
-        this._lastY = touchEvt.clientY;
-
-        _hideGhostForTarget();
-
-        var target = document.elementFromPoint(touchEvt.clientX, touchEvt.clientY);
-        var parent = target;
-
-        while (target && target.shadowRoot) {
-          target = target.shadowRoot.elementFromPoint(touchEvt.clientX, touchEvt.clientY);
-          if (target === parent) break;
-          parent = target;
-        }
-
-        dragEl.parentNode[expando]._isOutsideThisEl(target);
-
-        if (parent) {
-          do {
-            if (parent[expando]) {
-              var inserted = void 0;
-              inserted = parent[expando]._onDragOver({
-                clientX: touchEvt.clientX,
-                clientY: touchEvt.clientY,
-                target: target,
-                rootEl: parent
-              });
-
-              if (inserted && !this.options.dragoverBubble) {
-                break;
-              }
-            }
-
-            target = parent; // store last element
-          }
-          /* jshint boss:true */
-          while (parent = parent.parentNode);
-        }
-
-        _unhideGhostForTarget();
-      }
-    },
-    _onTouchMove: function _onTouchMove(
-    /**TouchEvent*/
-    evt) {
-      if (tapEvt) {
-        var options = this.options,
-            fallbackTolerance = options.fallbackTolerance,
-            fallbackOffset = options.fallbackOffset,
-            touch = evt.touches ? evt.touches[0] : evt,
-            ghostMatrix = ghostEl && matrix(ghostEl, true),
-            scaleX = ghostEl && ghostMatrix && ghostMatrix.a,
-            scaleY = ghostEl && ghostMatrix && ghostMatrix.d,
-            relativeScrollOffset = PositionGhostAbsolutely && ghostRelativeParent && getRelativeScrollOffset(ghostRelativeParent),
-            dx = (touch.clientX - tapEvt.clientX + fallbackOffset.x) / (scaleX || 1) + (relativeScrollOffset ? relativeScrollOffset[0] - ghostRelativeParentInitialScroll[0] : 0) / (scaleX || 1),
-            dy = (touch.clientY - tapEvt.clientY + fallbackOffset.y) / (scaleY || 1) + (relativeScrollOffset ? relativeScrollOffset[1] - ghostRelativeParentInitialScroll[1] : 0) / (scaleY || 1); // only set the status to dragging, when we are actually dragging
-
-        if (!Sortable.active && !awaitingDragStarted) {
-          if (fallbackTolerance && Math.max(Math.abs(touch.clientX - this._lastX), Math.abs(touch.clientY - this._lastY)) < fallbackTolerance) {
-            return;
-          }
-
-          this._onDragStart(evt, true);
-        }
-
-        if (ghostEl) {
-          if (ghostMatrix) {
-            ghostMatrix.e += dx - (lastDx || 0);
-            ghostMatrix.f += dy - (lastDy || 0);
-          } else {
-            ghostMatrix = {
-              a: 1,
-              b: 0,
-              c: 0,
-              d: 1,
-              e: dx,
-              f: dy
-            };
-          }
-
-          var cssMatrix = "matrix(".concat(ghostMatrix.a, ",").concat(ghostMatrix.b, ",").concat(ghostMatrix.c, ",").concat(ghostMatrix.d, ",").concat(ghostMatrix.e, ",").concat(ghostMatrix.f, ")");
-          css(ghostEl, 'webkitTransform', cssMatrix);
-          css(ghostEl, 'mozTransform', cssMatrix);
-          css(ghostEl, 'msTransform', cssMatrix);
-          css(ghostEl, 'transform', cssMatrix);
-          lastDx = dx;
-          lastDy = dy;
-          touchEvt = touch;
-        }
-
-        evt.cancelable && evt.preventDefault();
-      }
-    },
-    _appendGhost: function _appendGhost() {
-      // Bug if using scale(): https://stackoverflow.com/questions/2637058
-      // Not being adjusted for
-      if (!ghostEl) {
-        var container = this.options.fallbackOnBody ? document.body : rootEl,
-            rect = getRect(dragEl, true, PositionGhostAbsolutely, true, container),
-            options = this.options; // Position absolutely
-
-        if (PositionGhostAbsolutely) {
-          // Get relatively positioned parent
-          ghostRelativeParent = container;
-
-          while (css(ghostRelativeParent, 'position') === 'static' && css(ghostRelativeParent, 'transform') === 'none' && ghostRelativeParent !== document) {
-            ghostRelativeParent = ghostRelativeParent.parentNode;
-          }
-
-          if (ghostRelativeParent !== document.body && ghostRelativeParent !== document.documentElement) {
-            if (ghostRelativeParent === document) ghostRelativeParent = getWindowScrollingElement();
-            rect.top += ghostRelativeParent.scrollTop;
-            rect.left += ghostRelativeParent.scrollLeft;
-          } else {
-            ghostRelativeParent = getWindowScrollingElement();
-          }
-
-          ghostRelativeParentInitialScroll = getRelativeScrollOffset(ghostRelativeParent);
-        }
-
-        ghostEl = dragEl.cloneNode(true);
-        toggleClass(ghostEl, options.ghostClass, false);
-        toggleClass(ghostEl, options.fallbackClass, true);
-        toggleClass(ghostEl, options.dragClass, true);
-        css(ghostEl, 'transition', '');
-        css(ghostEl, 'transform', '');
-        css(ghostEl, 'box-sizing', 'border-box');
-        css(ghostEl, 'margin', 0);
-        css(ghostEl, 'top', rect.top);
-        css(ghostEl, 'left', rect.left);
-        css(ghostEl, 'width', rect.width);
-        css(ghostEl, 'height', rect.height);
-        css(ghostEl, 'opacity', '0.8');
-        css(ghostEl, 'position', PositionGhostAbsolutely ? 'absolute' : 'fixed');
-        css(ghostEl, 'zIndex', '100000');
-        css(ghostEl, 'pointerEvents', 'none');
-        Sortable.ghost = ghostEl;
-        container.appendChild(ghostEl); // Set transform-origin
-
-        css(ghostEl, 'transform-origin', tapDistanceLeft / parseInt(ghostEl.style.width) * 100 + '% ' + tapDistanceTop / parseInt(ghostEl.style.height) * 100 + '%');
-      }
-    },
-    _onDragStart: function _onDragStart(
-    /**Event*/
-    evt,
-    /**boolean*/
-    fallback) {
-      var _this = this;
-
-      var dataTransfer = evt.dataTransfer;
-      var options = _this.options;
-      pluginEvent('dragStart', this, {
-        evt: evt
-      });
-
-      if (Sortable.eventCanceled) {
-        this._onDrop();
-
-        return;
-      }
-
-      pluginEvent('setupClone', this);
-
-      if (!Sortable.eventCanceled) {
-        cloneEl = clone(dragEl);
-        cloneEl.removeAttribute("id");
-        cloneEl.draggable = false;
-        cloneEl.style['will-change'] = '';
-
-        this._hideClone();
-
-        toggleClass(cloneEl, this.options.chosenClass, false);
-        Sortable.clone = cloneEl;
-      } // #1143: IFrame support workaround
-
-
-      _this.cloneId = _nextTick(function () {
-        pluginEvent('clone', _this);
-        if (Sortable.eventCanceled) return;
-
-        if (!_this.options.removeCloneOnHide) {
-          rootEl.insertBefore(cloneEl, dragEl);
-        }
-
-        _this._hideClone();
-
-        _dispatchEvent({
-          sortable: _this,
-          name: 'clone'
-        });
-      });
-      !fallback && toggleClass(dragEl, options.dragClass, true); // Set proper drop events
-
-      if (fallback) {
-        ignoreNextClick = true;
-        _this._loopId = setInterval(_this._emulateDragOver, 50);
-      } else {
-        // Undo what was set in _prepareDragStart before drag started
-        off(document, 'mouseup', _this._onDrop);
-        off(document, 'touchend', _this._onDrop);
-        off(document, 'touchcancel', _this._onDrop);
-
-        if (dataTransfer) {
-          dataTransfer.effectAllowed = 'move';
-          options.setData && options.setData.call(_this, dataTransfer, dragEl);
-        }
-
-        on(document, 'drop', _this); // #1276 fix:
-
-        css(dragEl, 'transform', 'translateZ(0)');
-      }
-
-      awaitingDragStarted = true;
-      _this._dragStartId = _nextTick(_this._dragStarted.bind(_this, fallback, evt));
-      on(document, 'selectstart', _this);
-      moved = true;
-
-      if (Safari) {
-        css(document.body, 'user-select', 'none');
-      }
-    },
-    // Returns true - if no further action is needed (either inserted or another condition)
-    _onDragOver: function _onDragOver(
-    /**Event*/
-    evt) {
-      var el = this.el,
-          target = evt.target,
-          dragRect,
-          targetRect,
-          revert,
-          options = this.options,
-          group = options.group,
-          activeSortable = Sortable.active,
-          isOwner = activeGroup === group,
-          canSort = options.sort,
-          fromSortable = putSortable || activeSortable,
-          vertical,
-          _this = this,
-          completedFired = false;
-
-      if (_silent) return;
-
-      function dragOverEvent(name, extra) {
-        pluginEvent(name, _this, _objectSpread2({
-          evt: evt,
-          isOwner: isOwner,
-          axis: vertical ? 'vertical' : 'horizontal',
-          revert: revert,
-          dragRect: dragRect,
-          targetRect: targetRect,
-          canSort: canSort,
-          fromSortable: fromSortable,
-          target: target,
-          completed: completed,
-          onMove: function onMove(target, after) {
-            return _onMove(rootEl, el, dragEl, dragRect, target, getRect(target), evt, after);
-          },
-          changed: changed
-        }, extra));
-      } // Capture animation state
-
-
-      function capture() {
-        dragOverEvent('dragOverAnimationCapture');
-
-        _this.captureAnimationState();
-
-        if (_this !== fromSortable) {
-          fromSortable.captureAnimationState();
-        }
-      } // Return invocation when dragEl is inserted (or completed)
-
-
-      function completed(insertion) {
-        dragOverEvent('dragOverCompleted', {
-          insertion: insertion
-        });
-
-        if (insertion) {
-          // Clones must be hidden before folding animation to capture dragRectAbsolute properly
-          if (isOwner) {
-            activeSortable._hideClone();
-          } else {
-            activeSortable._showClone(_this);
-          }
-
-          if (_this !== fromSortable) {
-            // Set ghost class to new sortable's ghost class
-            toggleClass(dragEl, putSortable ? putSortable.options.ghostClass : activeSortable.options.ghostClass, false);
-            toggleClass(dragEl, options.ghostClass, true);
-          }
-
-          if (putSortable !== _this && _this !== Sortable.active) {
-            putSortable = _this;
-          } else if (_this === Sortable.active && putSortable) {
-            putSortable = null;
-          } // Animation
-
-
-          if (fromSortable === _this) {
-            _this._ignoreWhileAnimating = target;
-          }
-
-          _this.animateAll(function () {
-            dragOverEvent('dragOverAnimationComplete');
-            _this._ignoreWhileAnimating = null;
-          });
-
-          if (_this !== fromSortable) {
-            fromSortable.animateAll();
-            fromSortable._ignoreWhileAnimating = null;
-          }
-        } // Null lastTarget if it is not inside a previously swapped element
-
-
-        if (target === dragEl && !dragEl.animated || target === el && !target.animated) {
-          lastTarget = null;
-        } // no bubbling and not fallback
-
-
-        if (!options.dragoverBubble && !evt.rootEl && target !== document) {
-          dragEl.parentNode[expando]._isOutsideThisEl(evt.target); // Do not detect for empty insert if already inserted
-
-
-          !insertion && nearestEmptyInsertDetectEvent(evt);
-        }
-
-        !options.dragoverBubble && evt.stopPropagation && evt.stopPropagation();
-        return completedFired = true;
-      } // Call when dragEl has been inserted
-
-
-      function changed() {
-        newIndex = index(dragEl);
-        newDraggableIndex = index(dragEl, options.draggable);
-
-        _dispatchEvent({
-          sortable: _this,
-          name: 'change',
-          toEl: el,
-          newIndex: newIndex,
-          newDraggableIndex: newDraggableIndex,
-          originalEvent: evt
-        });
-      }
-
-      if (evt.preventDefault !== void 0) {
-        evt.cancelable && evt.preventDefault();
-      }
-
-      target = closest(target, options.draggable, el, true);
-      dragOverEvent('dragOver');
-      if (Sortable.eventCanceled) return completedFired;
-
-      if (dragEl.contains(evt.target) || target.animated && target.animatingX && target.animatingY || _this._ignoreWhileAnimating === target) {
-        return completed(false);
-      }
+	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+		typeof define === 'function' && define.amd ? define(factory) :
+			(global = global || self, global.Sortable = factory());
+}(this, (function () {
+	'use strict';
+
+	function ownKeys(object, enumerableOnly) {
+		var keys = Object.keys(object);
+
+		if (Object.getOwnPropertySymbols) {
+			var symbols = Object.getOwnPropertySymbols(object);
+
+			if (enumerableOnly) {
+				symbols = symbols.filter(function (sym) {
+					return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+				});
+			}
+
+			keys.push.apply(keys, symbols);
+		}
+
+		return keys;
+	}
+
+	function _objectSpread2(target) {
+		for (var i = 1; i < arguments.length; i++) {
+			var source = arguments[i] != null ? arguments[i] : {};
+
+			if (i % 2) {
+				ownKeys(Object(source), true).forEach(function (key) {
+					_defineProperty(target, key, source[key]);
+				});
+			} else if (Object.getOwnPropertyDescriptors) {
+				Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+			} else {
+				ownKeys(Object(source)).forEach(function (key) {
+					Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+				});
+			}
+		}
+
+		return target;
+	}
+
+	function _typeof(obj) {
+		"@babel/helpers - typeof";
+
+		if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
+			_typeof = function (obj) {
+				return typeof obj;
+			};
+		} else {
+			_typeof = function (obj) {
+				return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+			};
+		}
+
+		return _typeof(obj);
+	}
+
+	function _defineProperty(obj, key, value) {
+		if (key in obj) {
+			Object.defineProperty(obj, key, {
+				value: value,
+				enumerable: true,
+				configurable: true,
+				writable: true
+			});
+		} else {
+			obj[key] = value;
+		}
+
+		return obj;
+	}
+
+	function _extends() {
+		_extends = Object.assign || function (target) {
+			for (var i = 1; i < arguments.length; i++) {
+				var source = arguments[i];
+
+				for (var key in source) {
+					if (Object.prototype.hasOwnProperty.call(source, key)) {
+						target[key] = source[key];
+					}
+				}
+			}
+
+			return target;
+		};
+
+		return _extends.apply(this, arguments);
+	}
+
+	function _objectWithoutPropertiesLoose(source, excluded) {
+		if (source == null) return {};
+		var target = {};
+		var sourceKeys = Object.keys(source);
+		var key, i;
+
+		for (i = 0; i < sourceKeys.length; i++) {
+			key = sourceKeys[i];
+			if (excluded.indexOf(key) >= 0) continue;
+			target[key] = source[key];
+		}
+
+		return target;
+	}
+
+	function _objectWithoutProperties(source, excluded) {
+		if (source == null) return {};
+
+		var target = _objectWithoutPropertiesLoose(source, excluded);
+
+		var key, i;
+
+		if (Object.getOwnPropertySymbols) {
+			var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
+
+			for (i = 0; i < sourceSymbolKeys.length; i++) {
+				key = sourceSymbolKeys[i];
+				if (excluded.indexOf(key) >= 0) continue;
+				if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
+				target[key] = source[key];
+			}
+		}
+
+		return target;
+	}
+
+	function _toConsumableArray(arr) {
+		return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
+	}
+
+	function _arrayWithoutHoles(arr) {
+		if (Array.isArray(arr)) return _arrayLikeToArray(arr);
+	}
+
+	function _iterableToArray(iter) {
+		if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
+	}
+
+	function _unsupportedIterableToArray(o, minLen) {
+		if (!o) return;
+		if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+		var n = Object.prototype.toString.call(o).slice(8, -1);
+		if (n === "Object" && o.constructor) n = o.constructor.name;
+		if (n === "Map" || n === "Set") return Array.from(o);
+		if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+	}
+
+	function _arrayLikeToArray(arr, len) {
+		if (len == null || len > arr.length) len = arr.length;
+
+		for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i];
+
+		return arr2;
+	}
+
+	function _nonIterableSpread() {
+		throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+	}
+
+	var version = "1.15.0";
+
+	function userAgent(pattern) {
+		if (typeof window !== 'undefined' && window.navigator) {
+			return !! /*@__PURE__*/navigator.userAgent.match(pattern);
+		}
+	}
+
+	var IE11OrLess = userAgent(/(?:Trident.*rv[ :]?11\.|msie|iemobile|Windows Phone)/i);
+	var Edge = userAgent(/Edge/i);
+	var FireFox = userAgent(/firefox/i);
+	var Safari = userAgent(/safari/i) && !userAgent(/chrome/i) && !userAgent(/android/i);
+	var IOS = userAgent(/iP(ad|od|hone)/i);
+	var ChromeForAndroid = userAgent(/chrome/i) && userAgent(/android/i);
+
+	var captureMode = {
+		capture: false,
+		passive: false
+	};
+
+	function on(el, event, fn) {
+		el.addEventListener(event, fn, !IE11OrLess && captureMode);
+	}
+
+	function off(el, event, fn) {
+		el.removeEventListener(event, fn, !IE11OrLess && captureMode);
+	}
+
+	function matches(
+		/**HTMLElement*/
+		el,
+		/**String*/
+		selector) {
+		if (!selector) return;
+		selector[0] === '>' && (selector = selector.substring(1));
+
+		if (el) {
+			try {
+				if (el.matches) {
+					return el.matches(selector);
+				} else if (el.msMatchesSelector) {
+					return el.msMatchesSelector(selector);
+				} else if (el.webkitMatchesSelector) {
+					return el.webkitMatchesSelector(selector);
+				}
+			} catch (_) {
+				return false;
+			}
+		}
+
+		return false;
+	}
+
+	function getParentOrHost(el) {
+		return el.host && el !== document && el.host.nodeType ? el.host : el.parentNode;
+	}
+
+	function closest(
+		/**HTMLElement*/
+		el,
+		/**String*/
+		selector,
+		/**HTMLElement*/
+		ctx, includeCTX) {
+		if (el) {
+			ctx = ctx || document;
+
+			do {
+				if (selector != null && (selector[0] === '>' ? el.parentNode === ctx && matches(el, selector) : matches(el, selector)) || includeCTX && el === ctx) {
+					return el;
+				}
+
+				if (el === ctx) break;
+				/* jshint boss:true */
+			} while (el = getParentOrHost(el));
+		}
+
+		return null;
+	}
+
+	var R_SPACE = /\s+/g;
+
+	function toggleClass(el, name, state) {
+		if (el && name) {
+			if (el.classList) {
+				el.classList[state ? 'add' : 'remove'](name);
+			} else {
+				var className = (' ' + el.className + ' ').replace(R_SPACE, ' ').replace(' ' + name + ' ', ' ');
+				el.className = (className + (state ? ' ' + name : '')).replace(R_SPACE, ' ');
+			}
+		}
+	}
+
+	function css(el, prop, val) {
+		var style = el && el.style;
+
+		if (style) {
+			if (val === void 0) {
+				if (document.defaultView && document.defaultView.getComputedStyle) {
+					val = document.defaultView.getComputedStyle(el, '');
+				} else if (el.currentStyle) {
+					val = el.currentStyle;
+				}
+
+				return prop === void 0 ? val : val[prop];
+			} else {
+				if (!(prop in style) && prop.indexOf('webkit') === -1) {
+					prop = '-webkit-' + prop;
+				}
+
+				style[prop] = val + (typeof val === 'string' ? '' : 'px');
+			}
+		}
+	}
+
+	function matrix(el, selfOnly) {
+		var appliedTransforms = '';
+
+		if (typeof el === 'string') {
+			appliedTransforms = el;
+		} else {
+			do {
+				var transform = css(el, 'transform');
+
+				if (transform && transform !== 'none') {
+					appliedTransforms = transform + ' ' + appliedTransforms;
+				}
+				/* jshint boss:true */
+
+			} while (!selfOnly && (el = el.parentNode));
+		}
+
+		var matrixFn = window.DOMMatrix || window.WebKitCSSMatrix || window.CSSMatrix || window.MSCSSMatrix;
+		/*jshint -W056 */
+
+		return matrixFn && new matrixFn(appliedTransforms);
+	}
+
+	function find(ctx, tagName, iterator) {
+		if (ctx) {
+			var list = ctx.getElementsByTagName(tagName),
+				i = 0,
+				n = list.length;
+
+			if (iterator) {
+				for (; i < n; i++) {
+					iterator(list[i], i);
+				}
+			}
+
+			return list;
+		}
+
+		return [];
+	}
+
+	function getWindowScrollingElement() {
+		var scrollingElement = document.scrollingElement;
+
+		if (scrollingElement) {
+			return scrollingElement;
+		} else {
+			return document.documentElement;
+		}
+	}
+
+	/**
+	 * Returns the "bounding client rect" of given element
+	 * @param  {HTMLElement} el                       The element whose boundingClientRect is wanted
+	 * @param  {[Boolean]} relativeToContainingBlock  Whether the rect should be relative to the containing block of (including) the container
+	 * @param  {[Boolean]} relativeToNonStaticParent  Whether the rect should be relative to the relative parent of (including) the contaienr
+	 * @param  {[Boolean]} undoScale                  Whether the container's scale() should be undone
+	 * @param  {[HTMLElement]} container              The parent the element will be placed in
+	 * @return {Object}                               The boundingClientRect of el, with specified adjustments
+	 */
+
+
+	function getRect(el, relativeToContainingBlock, relativeToNonStaticParent, undoScale, container) {
+		if (!el.getBoundingClientRect && el !== window) return;
+		var elRect, top, left, bottom, right, height, width;
+
+		if (el !== window && el.parentNode && el !== getWindowScrollingElement()) {
+			elRect = el.getBoundingClientRect();
+			top = elRect.top;
+			left = elRect.left;
+			bottom = elRect.bottom;
+			right = elRect.right;
+			height = elRect.height;
+			width = elRect.width;
+		} else {
+			top = 0;
+			left = 0;
+			bottom = window.innerHeight;
+			right = window.innerWidth;
+			height = window.innerHeight;
+			width = window.innerWidth;
+		}
+
+		if ((relativeToContainingBlock || relativeToNonStaticParent) && el !== window) {
+			// Adjust for translate()
+			container = container || el.parentNode; // solves #1123 (see: https://stackoverflow.com/a/37953806/6088312)
+			// Not needed on <= IE11
+
+			if (!IE11OrLess) {
+				do {
+					if (container && container.getBoundingClientRect && (css(container, 'transform') !== 'none' || relativeToNonStaticParent && css(container, 'position') !== 'static')) {
+						var containerRect = container.getBoundingClientRect(); // Set relative to edges of padding box of container
+
+						top -= containerRect.top + parseInt(css(container, 'border-top-width'));
+						left -= containerRect.left + parseInt(css(container, 'border-left-width'));
+						bottom = top + elRect.height;
+						right = left + elRect.width;
+						break;
+					}
+					/* jshint boss:true */
+
+				} while (container = container.parentNode);
+			}
+		}
+
+		if (undoScale && el !== window) {
+			// Adjust for scale()
+			var elMatrix = matrix(container || el),
+				scaleX = elMatrix && elMatrix.a,
+				scaleY = elMatrix && elMatrix.d;
+
+			if (elMatrix) {
+				top /= scaleY;
+				left /= scaleX;
+				width /= scaleX;
+				height /= scaleY;
+				bottom = top + height;
+				right = left + width;
+			}
+		}
+
+		return {
+			top: top,
+			left: left,
+			bottom: bottom,
+			right: right,
+			width: width,
+			height: height
+		};
+	}
+
+	/**
+	 * Checks if a side of an element is scrolled past a side of its parents
+	 * @param  {HTMLElement}  el           The element who's side being scrolled out of view is in question
+	 * @param  {String}       elSide       Side of the element in question ('top', 'left', 'right', 'bottom')
+	 * @param  {String}       parentSide   Side of the parent in question ('top', 'left', 'right', 'bottom')
+	 * @return {HTMLElement}               The parent scroll element that the el's side is scrolled past, or null if there is no such element
+	 */
+
+
+	function isScrolledPast(el, elSide, parentSide) {
+		var parent = getParentAutoScrollElement(el, true),
+			elSideVal = getRect(el)[elSide];
+		/* jshint boss:true */
+
+		while (parent) {
+			var parentSideVal = getRect(parent)[parentSide],
+				visible = void 0;
+
+			if (parentSide === 'top' || parentSide === 'left') {
+				visible = elSideVal >= parentSideVal;
+			} else {
+				visible = elSideVal <= parentSideVal;
+			}
+
+			if (!visible) return parent;
+			if (parent === getWindowScrollingElement()) break;
+			parent = getParentAutoScrollElement(parent, false);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Gets nth child of el, ignoring hidden children, sortable's elements (does not ignore clone if it's visible)
+	 * and non-draggable elements
+	 * @param  {HTMLElement} el       The parent element
+	 * @param  {Number} childNum      The index of the child
+	 * @param  {Object} options       Parent Sortable's options
+	 * @return {HTMLElement}          The child at index childNum, or null if not found
+	 */
+
+
+	function getChild(el, childNum, options, includeDragEl) {
+		var currentChild = 0,
+			i = 0,
+			children = el.children;
+
+		while (i < children.length) {
+			if (children[i].style.display !== 'none' && children[i] !== Sortable.ghost && (includeDragEl || children[i] !== Sortable.dragged) && closest(children[i], options.draggable, el, false)) {
+				if (currentChild === childNum) {
+					return children[i];
+				}
+
+				currentChild++;
+			}
+
+			i++;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Gets the last child in the el, ignoring ghostEl or invisible elements (clones)
+	 * @param  {HTMLElement} el       Parent element
+	 * @param  {selector} selector    Any other elements that should be ignored
+	 * @return {HTMLElement}          The last child, ignoring ghostEl
+	 */
+
+
+	function lastChild(el, selector) {
+		var last = el.lastElementChild;
+
+		while (last && (last === Sortable.ghost || css(last, 'display') === 'none' || selector && !matches(last, selector))) {
+			last = last.previousElementSibling;
+		}
+
+		return last || null;
+	}
+
+	/**
+	 * Returns the index of an element within its parent for a selected set of
+	 * elements
+	 * @param  {HTMLElement} el
+	 * @param  {selector} selector
+	 * @return {number}
+	 */
+
+
+	function index(el, selector) {
+		var index = 0;
+
+		if (!el || !el.parentNode) {
+			return -1;
+		}
+		/* jshint boss:true */
+
+
+		while (el = el.previousElementSibling) {
+			if (el.nodeName.toUpperCase() !== 'TEMPLATE' && el !== Sortable.clone && (!selector || matches(el, selector))) {
+				index++;
+			}
+		}
+
+		return index;
+	}
+
+	/**
+	 * Returns the scroll offset of the given element, added with all the scroll offsets of parent elements.
+	 * The value is returned in real pixels.
+	 * @param  {HTMLElement} el
+	 * @return {Array}             Offsets in the format of [left, top]
+	 */
+
+
+	function getRelativeScrollOffset(el) {
+		var offsetLeft = 0,
+			offsetTop = 0,
+			winScroller = getWindowScrollingElement();
+
+		if (el) {
+			do {
+				var elMatrix = matrix(el),
+					scaleX = elMatrix.a,
+					scaleY = elMatrix.d;
+				offsetLeft += el.scrollLeft * scaleX;
+				offsetTop += el.scrollTop * scaleY;
+			} while (el !== winScroller && (el = el.parentNode));
+		}
+
+		return [offsetLeft, offsetTop];
+	}
+
+	/**
+	 * Returns the index of the object within the given array
+	 * @param  {Array} arr   Array that may or may not hold the object
+	 * @param  {Object} obj  An object that has a key-value pair unique to and identical to a key-value pair in the object you want to find
+	 * @return {Number}      The index of the object in the array, or -1
+	 */
+
+
+	function indexOfObject(arr, obj) {
+		for (var i in arr) {
+			if (!arr.hasOwnProperty(i)) continue;
+
+			for (var key in obj) {
+				if (obj.hasOwnProperty(key) && obj[key] === arr[i][key]) return Number(i);
+			}
+		}
+
+		return -1;
+	}
+
+	function getParentAutoScrollElement(el, includeSelf) {
+		// skip to window
+		if (!el || !el.getBoundingClientRect) return getWindowScrollingElement();
+		var elem = el;
+		var gotSelf = false;
+
+		do {
+			// we don't need to get elem css if it isn't even overflowing in the first place (performance)
+			if (elem.clientWidth < elem.scrollWidth || elem.clientHeight < elem.scrollHeight) {
+				var elemCSS = css(elem);
+
+				if (elem.clientWidth < elem.scrollWidth && (elemCSS.overflowX == 'auto' || elemCSS.overflowX == 'scroll') || elem.clientHeight < elem.scrollHeight && (elemCSS.overflowY == 'auto' || elemCSS.overflowY == 'scroll')) {
+					if (!elem.getBoundingClientRect || elem === document.body) return getWindowScrollingElement();
+					if (gotSelf || includeSelf) return elem;
+					gotSelf = true;
+				}
+			}
+			/* jshint boss:true */
+
+		} while (elem = elem.parentNode);
+
+		return getWindowScrollingElement();
+	}
+
+	function extend(dst, src) {
+		if (dst && src) {
+			for (var key in src) {
+				if (src.hasOwnProperty(key)) {
+					dst[key] = src[key];
+				}
+			}
+		}
+
+		return dst;
+	}
+
+	function isRectEqual(rect1, rect2) {
+		return Math.round(rect1.top) === Math.round(rect2.top) && Math.round(rect1.left) === Math.round(rect2.left) && Math.round(rect1.height) === Math.round(rect2.height) && Math.round(rect1.width) === Math.round(rect2.width);
+	}
+
+	var _throttleTimeout;
+
+	function throttle(callback, ms) {
+		return function () {
+			if (!_throttleTimeout) {
+				var args = arguments,
+					_this = this;
+
+				if (args.length === 1) {
+					callback.call(_this, args[0]);
+				} else {
+					callback.apply(_this, args);
+				}
+
+				_throttleTimeout = setTimeout(function () {
+					_throttleTimeout = void 0;
+				}, ms);
+			}
+		};
+	}
+
+	function cancelThrottle() {
+		clearTimeout(_throttleTimeout);
+		_throttleTimeout = void 0;
+	}
+
+	function scrollBy(el, x, y) {
+		el.scrollLeft += x;
+		el.scrollTop += y;
+	}
+
+	function clone(el) {
+		var Polymer = window.Polymer;
+		var $ = window.jQuery || window.Zepto;
+
+		if (Polymer && Polymer.dom) {
+			return Polymer.dom(el).cloneNode(true);
+		} else if ($) {
+			return $(el).clone(true)[0];
+		} else {
+			return el.cloneNode(true);
+		}
+	}
+
+	function setRect(el, rect) {
+		css(el, 'position', 'absolute');
+		css(el, 'top', rect.top);
+		css(el, 'left', rect.left);
+		css(el, 'width', rect.width);
+		css(el, 'height', rect.height);
+	}
+
+	function unsetRect(el) {
+		css(el, 'position', '');
+		css(el, 'top', '');
+		css(el, 'left', '');
+		css(el, 'width', '');
+		css(el, 'height', '');
+	}
+
+	var expando = 'Sortable' + new Date().getTime();
+
+	function AnimationStateManager() {
+		var animationStates = [],
+			animationCallbackId;
+		return {
+			captureAnimationState: function captureAnimationState() {
+				animationStates = [];
+				if (!this.options.animation) return;
+				var children = [].slice.call(this.el.children);
+				children.forEach(function (child) {
+					if (css(child, 'display') === 'none' || child === Sortable.ghost) return;
+					animationStates.push({
+						target: child,
+						rect: getRect(child)
+					});
+
+					var fromRect = _objectSpread2({}, animationStates[animationStates.length - 1].rect); // If animating: compensate for current animation
+
+
+					if (child.thisAnimationDuration) {
+						var childMatrix = matrix(child, true);
+
+						if (childMatrix) {
+							fromRect.top -= childMatrix.f;
+							fromRect.left -= childMatrix.e;
+						}
+					}
+
+					child.fromRect = fromRect;
+				});
+			},
+			addAnimationState: function addAnimationState(state) {
+				animationStates.push(state);
+			},
+			removeAnimationState: function removeAnimationState(target) {
+				animationStates.splice(indexOfObject(animationStates, {
+					target: target
+				}), 1);
+			},
+			animateAll: function animateAll(callback) {
+				var _this = this;
+
+				if (!this.options.animation) {
+					clearTimeout(animationCallbackId);
+					if (typeof callback === 'function') callback();
+					return;
+				}
+
+				var animating = false,
+					animationTime = 0;
+				animationStates.forEach(function (state) {
+					var time = 0,
+						target = state.target,
+						fromRect = target.fromRect,
+						toRect = getRect(target),
+						prevFromRect = target.prevFromRect,
+						prevToRect = target.prevToRect,
+						animatingRect = state.rect,
+						targetMatrix = matrix(target, true);
+
+					if (targetMatrix) {
+						// Compensate for current animation
+						toRect.top -= targetMatrix.f;
+						toRect.left -= targetMatrix.e;
+					}
+
+					target.toRect = toRect;
+
+					if (target.thisAnimationDuration) {
+						// Could also check if animatingRect is between fromRect and toRect
+						if (isRectEqual(prevFromRect, toRect) && !isRectEqual(fromRect, toRect) && // Make sure animatingRect is on line between toRect & fromRect
+							(animatingRect.top - toRect.top) / (animatingRect.left - toRect.left) === (fromRect.top - toRect.top) / (fromRect.left - toRect.left)) {
+							// If returning to same place as started from animation and on same axis
+							time = calculateRealTime(animatingRect, prevFromRect, prevToRect, _this.options);
+						}
+					} // if fromRect != toRect: animate
+
+
+					if (!isRectEqual(toRect, fromRect)) {
+						target.prevFromRect = fromRect;
+						target.prevToRect = toRect;
+
+						if (!time) {
+							time = _this.options.animation;
+						}
+
+						_this.animate(target, animatingRect, toRect, time);
+					}
+
+					if (time) {
+						animating = true;
+						animationTime = Math.max(animationTime, time);
+						clearTimeout(target.animationResetTimer);
+						target.animationResetTimer = setTimeout(function () {
+							target.animationTime = 0;
+							target.prevFromRect = null;
+							target.fromRect = null;
+							target.prevToRect = null;
+							target.thisAnimationDuration = null;
+						}, time);
+						target.thisAnimationDuration = time;
+					}
+				});
+				clearTimeout(animationCallbackId);
+
+				if (!animating) {
+					if (typeof callback === 'function') callback();
+				} else {
+					animationCallbackId = setTimeout(function () {
+						if (typeof callback === 'function') callback();
+					}, animationTime);
+				}
+
+				animationStates = [];
+			},
+			animate: function animate(target, currentRect, toRect, duration) {
+				if (duration) {
+					css(target, 'transition', '');
+					css(target, 'transform', '');
+					var elMatrix = matrix(this.el),
+						scaleX = elMatrix && elMatrix.a,
+						scaleY = elMatrix && elMatrix.d,
+						translateX = (currentRect.left - toRect.left) / (scaleX || 1),
+						translateY = (currentRect.top - toRect.top) / (scaleY || 1);
+					target.animatingX = !!translateX;
+					target.animatingY = !!translateY;
+					css(target, 'transform', 'translate3d(' + translateX + 'px,' + translateY + 'px,0)');
+					this.forRepaintDummy = repaint(target); // repaint
+
+					css(target, 'transition', 'transform ' + duration + 'ms' + (this.options.easing ? ' ' + this.options.easing : ''));
+					css(target, 'transform', 'translate3d(0,0,0)');
+					typeof target.animated === 'number' && clearTimeout(target.animated);
+					target.animated = setTimeout(function () {
+						css(target, 'transition', '');
+						css(target, 'transform', '');
+						target.animated = false;
+						target.animatingX = false;
+						target.animatingY = false;
+					}, duration);
+				}
+			}
+		};
+	}
+
+	function repaint(target) {
+		return target.offsetWidth;
+	}
+
+	function calculateRealTime(animatingRect, fromRect, toRect, options) {
+		return Math.sqrt(Math.pow(fromRect.top - animatingRect.top, 2) + Math.pow(fromRect.left - animatingRect.left, 2)) / Math.sqrt(Math.pow(fromRect.top - toRect.top, 2) + Math.pow(fromRect.left - toRect.left, 2)) * options.animation;
+	}
+
+	var plugins = [];
+	var defaults = {
+		initializeByDefault: true
+	};
+	var PluginManager = {
+		mount: function mount(plugin) {
+			// Set default static properties
+			for (var option in defaults) {
+				if (defaults.hasOwnProperty(option) && !(option in plugin)) {
+					plugin[option] = defaults[option];
+				}
+			}
+
+			plugins.forEach(function (p) {
+				if (p.pluginName === plugin.pluginName) {
+					throw "Sortable: Cannot mount plugin ".concat(plugin.pluginName, " more than once");
+				}
+			});
+			plugins.push(plugin);
+		},
+		pluginEvent: function pluginEvent(eventName, sortable, evt) {
+			var _this = this;
+
+			this.eventCanceled = false;
+
+			evt.cancel = function () {
+				_this.eventCanceled = true;
+			};
+
+			var eventNameGlobal = eventName + 'Global';
+			plugins.forEach(function (plugin) {
+				if (!sortable[plugin.pluginName]) return; // Fire global events if it exists in this sortable
+
+				if (sortable[plugin.pluginName][eventNameGlobal]) {
+					sortable[plugin.pluginName][eventNameGlobal](_objectSpread2({
+						sortable: sortable
+					}, evt));
+				} // Only fire plugin event if plugin is enabled in this sortable,
+				// and plugin has event defined
+
+
+				if (sortable.options[plugin.pluginName] && sortable[plugin.pluginName][eventName]) {
+					sortable[plugin.pluginName][eventName](_objectSpread2({
+						sortable: sortable
+					}, evt));
+				}
+			});
+		},
+		initializePlugins: function initializePlugins(sortable, el, defaults, options) {
+			plugins.forEach(function (plugin) {
+				var pluginName = plugin.pluginName;
+				if (!sortable.options[pluginName] && !plugin.initializeByDefault) return;
+				var initialized = new plugin(sortable, el, sortable.options);
+				initialized.sortable = sortable;
+				initialized.options = sortable.options;
+				sortable[pluginName] = initialized; // Add default options from plugin
+
+				_extends(defaults, initialized.defaults);
+			});
+
+			for (var option in sortable.options) {
+				if (!sortable.options.hasOwnProperty(option)) continue;
+				var modified = this.modifyOption(sortable, option, sortable.options[option]);
+
+				if (typeof modified !== 'undefined') {
+					sortable.options[option] = modified;
+				}
+			}
+		},
+		getEventProperties: function getEventProperties(name, sortable) {
+			var eventProperties = {};
+			plugins.forEach(function (plugin) {
+				if (typeof plugin.eventProperties !== 'function') return;
+
+				_extends(eventProperties, plugin.eventProperties.call(sortable[plugin.pluginName], name));
+			});
+			return eventProperties;
+		},
+		modifyOption: function modifyOption(sortable, name, value) {
+			var modifiedValue;
+			plugins.forEach(function (plugin) {
+				// Plugin must exist on the Sortable
+				if (!sortable[plugin.pluginName]) return; // If static option listener exists for this option, call in the context of the Sortable's instance of this plugin
+
+				if (plugin.optionListeners && typeof plugin.optionListeners[name] === 'function') {
+					modifiedValue = plugin.optionListeners[name].call(sortable[plugin.pluginName], value);
+				}
+			});
+			return modifiedValue;
+		}
+	};
+
+	function dispatchEvent(_ref) {
+		var sortable = _ref.sortable,
+			rootEl = _ref.rootEl,
+			name = _ref.name,
+			targetEl = _ref.targetEl,
+			cloneEl = _ref.cloneEl,
+			toEl = _ref.toEl,
+			fromEl = _ref.fromEl,
+			oldIndex = _ref.oldIndex,
+			newIndex = _ref.newIndex,
+			oldDraggableIndex = _ref.oldDraggableIndex,
+			newDraggableIndex = _ref.newDraggableIndex,
+			originalEvent = _ref.originalEvent,
+			putSortable = _ref.putSortable,
+			extraEventProperties = _ref.extraEventProperties;
+		sortable = sortable || rootEl && rootEl[expando];
+		if (!sortable) return;
+		var evt,
+			options = sortable.options,
+			onName = 'on' + name.charAt(0).toUpperCase() + name.substr(1); // Support for new CustomEvent feature
+
+		if (window.CustomEvent && !IE11OrLess && !Edge) {
+			evt = new CustomEvent(name, {
+				bubbles: true,
+				cancelable: true
+			});
+		} else {
+			evt = document.createEvent('Event');
+			evt.initEvent(name, true, true);
+		}
+
+		evt.to = toEl || rootEl;
+		evt.from = fromEl || rootEl;
+		evt.item = targetEl || rootEl;
+		evt.clone = cloneEl;
+		evt.oldIndex = oldIndex;
+		evt.newIndex = newIndex;
+		evt.oldDraggableIndex = oldDraggableIndex;
+		evt.newDraggableIndex = newDraggableIndex;
+		evt.originalEvent = originalEvent;
+		evt.pullMode = putSortable ? putSortable.lastPutMode : undefined;
+
+		var allEventProperties = _objectSpread2(_objectSpread2({}, extraEventProperties), PluginManager.getEventProperties(name, sortable));
+
+		for (var option in allEventProperties) {
+			evt[option] = allEventProperties[option];
+		}
+
+		if (rootEl) {
+			rootEl.dispatchEvent(evt);
+		}
+
+		if (options[onName]) {
+			options[onName].call(sortable, evt);
+		}
+	}
+
+	var _excluded = ["evt"];
+
+	var pluginEvent = function pluginEvent(eventName, sortable) {
+		var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+			originalEvent = _ref.evt,
+			data = _objectWithoutProperties(_ref, _excluded);
+
+		PluginManager.pluginEvent.bind(Sortable)(eventName, sortable, _objectSpread2({
+			dragEl: dragEl,
+			parentEl: parentEl,
+			ghostEl: ghostEl,
+			rootEl: rootEl,
+			nextEl: nextEl,
+			lastDownEl: lastDownEl,
+			cloneEl: cloneEl,
+			cloneHidden: cloneHidden,
+			dragStarted: moved,
+			putSortable: putSortable,
+			activeSortable: Sortable.active,
+			originalEvent: originalEvent,
+			oldIndex: oldIndex,
+			oldDraggableIndex: oldDraggableIndex,
+			newIndex: newIndex,
+			newDraggableIndex: newDraggableIndex,
+			hideGhostForTarget: _hideGhostForTarget,
+			unhideGhostForTarget: _unhideGhostForTarget,
+			cloneNowHidden: function cloneNowHidden() {
+				cloneHidden = true;
+			},
+			cloneNowShown: function cloneNowShown() {
+				cloneHidden = false;
+			},
+			dispatchSortableEvent: function dispatchSortableEvent(name) {
+				_dispatchEvent({
+					sortable: sortable,
+					name: name,
+					originalEvent: originalEvent
+				});
+			}
+		}, data));
+	};
+
+	function _dispatchEvent(info) {
+		dispatchEvent(_objectSpread2({
+			putSortable: putSortable,
+			cloneEl: cloneEl,
+			targetEl: dragEl,
+			rootEl: rootEl,
+			oldIndex: oldIndex,
+			oldDraggableIndex: oldDraggableIndex,
+			newIndex: newIndex,
+			newDraggableIndex: newDraggableIndex
+		}, info));
+	}
+
+	var dragEl,
+		parentEl,
+		ghostEl,
+		rootEl,
+		nextEl,
+		lastDownEl,
+		cloneEl,
+		cloneHidden,
+		oldIndex,
+		newIndex,
+		oldDraggableIndex,
+		newDraggableIndex,
+		activeGroup,
+		putSortable,
+		awaitingDragStarted = false,
+		ignoreNextClick = false,
+		sortables = [],
+		tapEvt,
+		touchEvt,
+		lastDx,
+		lastDy,
+		tapDistanceLeft,
+		tapDistanceTop,
+		moved,
+		lastTarget,
+		lastDirection,
+		pastFirstInvertThresh = false,
+		isCircumstantialInvert = false,
+		targetMoveDistance,
+		// For positioning ghost absolutely
+		ghostRelativeParent,
+		ghostRelativeParentInitialScroll = [],
+		// (left, top)
+		_silent = false,
+		savedInputChecked = [];
+	/** @const */
+
+	var documentExists = typeof document !== 'undefined',
+		PositionGhostAbsolutely = IOS,
+		CSSFloatProperty = Edge || IE11OrLess ? 'cssFloat' : 'float',
+		// This will not pass for IE9, because IE9 DnD only works on anchors
+		supportDraggable = documentExists && !ChromeForAndroid && !IOS && 'draggable' in document.createElement('div'),
+		supportCssPointerEvents = function () {
+			if (!documentExists) return; // false when <= IE11
+
+			if (IE11OrLess) {
+				return false;
+			}
+
+			var el = document.createElement('x');
+			el.style.cssText = 'pointer-events:auto';
+			return el.style.pointerEvents === 'auto';
+		}(),
+		_detectDirection = function _detectDirection(el, options) {
+			var elCSS = css(el),
+				elWidth = parseInt(elCSS.width) - parseInt(elCSS.paddingLeft) - parseInt(elCSS.paddingRight) - parseInt(elCSS.borderLeftWidth) - parseInt(elCSS.borderRightWidth),
+				child1 = getChild(el, 0, options),
+				child2 = getChild(el, 1, options),
+				firstChildCSS = child1 && css(child1),
+				secondChildCSS = child2 && css(child2),
+				firstChildWidth = firstChildCSS && parseInt(firstChildCSS.marginLeft) + parseInt(firstChildCSS.marginRight) + getRect(child1).width,
+				secondChildWidth = secondChildCSS && parseInt(secondChildCSS.marginLeft) + parseInt(secondChildCSS.marginRight) + getRect(child2).width;
+
+			if (elCSS.display === 'flex') {
+				return elCSS.flexDirection === 'column' || elCSS.flexDirection === 'column-reverse' ? 'vertical' : 'horizontal';
+			}
+
+			if (elCSS.display === 'grid') {
+				return elCSS.gridTemplateColumns.split(' ').length <= 1 ? 'vertical' : 'horizontal';
+			}
+
+			if (child1 && firstChildCSS["float"] && firstChildCSS["float"] !== 'none') {
+				var touchingSideChild2 = firstChildCSS["float"] === 'left' ? 'left' : 'right';
+				return child2 && (secondChildCSS.clear === 'both' || secondChildCSS.clear === touchingSideChild2) ? 'vertical' : 'horizontal';
+			}
+
+			return child1 && (firstChildCSS.display === 'block' || firstChildCSS.display === 'flex' || firstChildCSS.display === 'table' || firstChildCSS.display === 'grid' || firstChildWidth >= elWidth && elCSS[CSSFloatProperty] === 'none' || child2 && elCSS[CSSFloatProperty] === 'none' && firstChildWidth + secondChildWidth > elWidth) ? 'vertical' : 'horizontal';
+		},
+		_dragElInRowColumn = function _dragElInRowColumn(dragRect, targetRect, vertical) {
+			var dragElS1Opp = vertical ? dragRect.left : dragRect.top,
+				dragElS2Opp = vertical ? dragRect.right : dragRect.bottom,
+				dragElOppLength = vertical ? dragRect.width : dragRect.height,
+				targetS1Opp = vertical ? targetRect.left : targetRect.top,
+				targetS2Opp = vertical ? targetRect.right : targetRect.bottom,
+				targetOppLength = vertical ? targetRect.width : targetRect.height;
+			return dragElS1Opp === targetS1Opp || dragElS2Opp === targetS2Opp || dragElS1Opp + dragElOppLength / 2 === targetS1Opp + targetOppLength / 2;
+		},
+
+		/**
+		 * Detects first nearest empty sortable to X and Y position using emptyInsertThreshold.
+		 * @param  {Number} x      X position
+		 * @param  {Number} y      Y position
+		 * @return {HTMLElement}   Element of the first found nearest Sortable
+		 */
+		_detectNearestEmptySortable = function _detectNearestEmptySortable(x, y) {
+			var ret;
+			sortables.some(function (sortable) {
+				var threshold = sortable[expando].options.emptyInsertThreshold;
+				if (!threshold || lastChild(sortable)) return;
+				var rect = getRect(sortable),
+					insideHorizontally = x >= rect.left - threshold && x <= rect.right + threshold,
+					insideVertically = y >= rect.top - threshold && y <= rect.bottom + threshold;
+
+				if (insideHorizontally && insideVertically) {
+					return ret = sortable;
+				}
+			});
+			return ret;
+		},
+		_prepareGroup = function _prepareGroup(options) {
+			function toFn(value, pull) {
+				return function (to, from, dragEl, evt) {
+					var sameGroup = to.options.group.name && from.options.group.name && to.options.group.name === from.options.group.name;
+
+					if (value == null && (pull || sameGroup)) {
+						// Default pull value
+						// Default pull and put value if same group
+						return true;
+					} else if (value == null || value === false) {
+						return false;
+					} else if (pull && value === 'clone') {
+						return value;
+					} else if (typeof value === 'function') {
+						return toFn(value(to, from, dragEl, evt), pull)(to, from, dragEl, evt);
+					} else {
+						var otherGroup = (pull ? to : from).options.group.name;
+						return value === true || typeof value === 'string' && value === otherGroup || value.join && value.indexOf(otherGroup) > -1;
+					}
+				};
+			}
+
+			var group = {};
+			var originalGroup = options.group;
+
+			if (!originalGroup || _typeof(originalGroup) != 'object') {
+				originalGroup = {
+					name: originalGroup
+				};
+			}
+
+			group.name = originalGroup.name;
+			group.checkPull = toFn(originalGroup.pull, true);
+			group.checkPut = toFn(originalGroup.put);
+			group.revertClone = originalGroup.revertClone;
+			options.group = group;
+		},
+		_hideGhostForTarget = function _hideGhostForTarget() {
+			if (!supportCssPointerEvents && ghostEl) {
+				css(ghostEl, 'display', 'none');
+			}
+		},
+		_unhideGhostForTarget = function _unhideGhostForTarget() {
+			if (!supportCssPointerEvents && ghostEl) {
+				css(ghostEl, 'display', '');
+			}
+		}; // #1184 fix - Prevent click event on fallback if dragged but item not changed position
+
+
+	if (documentExists && !ChromeForAndroid) {
+		document.addEventListener('click', function (evt) {
+			if (ignoreNextClick) {
+				evt.preventDefault();
+				evt.stopPropagation && evt.stopPropagation();
+				evt.stopImmediatePropagation && evt.stopImmediatePropagation();
+				ignoreNextClick = false;
+				return false;
+			}
+		}, true);
+	}
+
+	var nearestEmptyInsertDetectEvent = function nearestEmptyInsertDetectEvent(evt) {
+		if (dragEl) {
+			evt = evt.touches ? evt.touches[0] : evt;
+
+			var nearest = _detectNearestEmptySortable(evt.clientX, evt.clientY);
+
+			if (nearest) {
+				// Create imitation event
+				var event = {};
+
+				for (var i in evt) {
+					if (evt.hasOwnProperty(i)) {
+						event[i] = evt[i];
+					}
+				}
+
+				event.target = event.rootEl = nearest;
+				event.preventDefault = void 0;
+				event.stopPropagation = void 0;
+
+				nearest[expando]._onDragOver(event);
+			}
+		}
+	};
+
+	var _checkOutsideTargetEl = function _checkOutsideTargetEl(evt) {
+		if (dragEl) {
+			dragEl.parentNode[expando]._isOutsideThisEl(evt.target);
+		}
+	};
+
+	/**
+	 * @class  Sortable
+	 * @param  {HTMLElement}  el
+	 * @param  {Object}       [options]
+	 */
+
+
+	function Sortable(el, options) {
+		if (!(el && el.nodeType && el.nodeType === 1)) {
+			throw "Sortable: `el` must be an HTMLElement, not ".concat({}.toString.call(el));
+		}
+
+		this.el = el; // root element
+
+		this.options = options = _extends({}, options); // Export instance
+
+		el[expando] = this;
+		var defaults = {
+			group: null,
+			sort: true,
+			disabled: false,
+			store: null,
+			handle: null,
+			draggable: /^[uo]l$/i.test(el.nodeName) ? '>li' : '>*',
+			swapThreshold: 1,
+			// percentage; 0 <= x <= 1
+			invertSwap: false,
+			// invert always
+			invertedSwapThreshold: null,
+			// will be set to same as swapThreshold if default
+			removeCloneOnHide: true,
+			direction: function direction() {
+				return _detectDirection(el, this.options);
+			},
+			ghostClass: 'sortable-ghost',
+			chosenClass: 'sortable-chosen',
+			dragClass: 'sortable-drag',
+			ignore: 'a, img',
+			filter: null,
+			preventOnFilter: true,
+			animation: 0,
+			easing: null,
+			setData: function setData(dataTransfer, dragEl) {
+				dataTransfer.setData('Text', dragEl.textContent);
+			},
+			dropBubble: false,
+			dragoverBubble: false,
+			dataIdAttr: 'data-id',
+			delay: 0,
+			delayOnTouchOnly: false,
+			touchStartThreshold: (Number.parseInt ? Number : window).parseInt(window.devicePixelRatio, 10) || 1,
+			forceFallback: false,
+			fallbackClass: 'sortable-fallback',
+			fallbackOnBody: false,
+			fallbackTolerance: 0,
+			fallbackOffset: {
+				x: 0,
+				y: 0
+			},
+			supportPointer: Sortable.supportPointer !== false && 'PointerEvent' in window && !Safari,
+			emptyInsertThreshold: 5
+		};
+		PluginManager.initializePlugins(this, el, defaults); // Set default options
+
+		for (var name in defaults) {
+			!(name in options) && (options[name] = defaults[name]);
+		}
+
+		_prepareGroup(options); // Bind all private methods
+
+
+		for (var fn in this) {
+			if (fn.charAt(0) === '_' && typeof this[fn] === 'function') {
+				this[fn] = this[fn].bind(this);
+			}
+		} // Setup drag mode
+
+
+		this.nativeDraggable = options.forceFallback ? false : supportDraggable;
+
+		if (this.nativeDraggable) {
+			// Touch start threshold cannot be greater than the native dragstart threshold
+			this.options.touchStartThreshold = 1;
+		} // Bind events
+
+
+		if (options.supportPointer) {
+			on(el, 'pointerdown', this._onTapStart);
+		} else {
+			on(el, 'mousedown', this._onTapStart);
+			on(el, 'touchstart', this._onTapStart);
+		}
+
+		if (this.nativeDraggable) {
+			on(el, 'dragover', this);
+			on(el, 'dragenter', this);
+		}
+
+		sortables.push(this.el); // Restore sorting
+
+		options.store && options.store.get && this.sort(options.store.get(this) || []); // Add animation state manager
+
+		_extends(this, AnimationStateManager());
+	}
+
+	Sortable.prototype =
+		/** @lends Sortable.prototype */
+		{
+			constructor: Sortable,
+			_isOutsideThisEl: function _isOutsideThisEl(target) {
+				if (!this.el.contains(target) && target !== this.el) {
+					lastTarget = null;
+				}
+			},
+			_getDirection: function _getDirection(evt, target) {
+				return typeof this.options.direction === 'function' ? this.options.direction.call(this, evt, target, dragEl) : this.options.direction;
+			},
+			_onTapStart: function _onTapStart(
+				/** Event|TouchEvent */
+				evt) {
+				if (!evt.cancelable) return;
+
+				var _this = this,
+					el = this.el,
+					options = this.options,
+					preventOnFilter = options.preventOnFilter,
+					type = evt.type,
+					touch = evt.touches && evt.touches[0] || evt.pointerType && evt.pointerType === 'touch' && evt,
+					target = (touch || evt).target,
+					originalTarget = evt.target.shadowRoot && (evt.path && evt.path[0] || evt.composedPath && evt.composedPath()[0]) || target,
+					filter = options.filter;
+
+				_saveInputCheckedState(el); // Don't trigger start event when an element is been dragged, otherwise the evt.oldindex always wrong when set option.group.
+
+
+				if (dragEl) {
+					return;
+				}
+
+				if (/mousedown|pointerdown/.test(type) && evt.button !== 0 || options.disabled) {
+					return; // only left button and enabled
+				} // cancel dnd if original target is content editable
+
+
+				if (originalTarget.isContentEditable) {
+					return;
+				} // Safari ignores further event handling after mousedown
+
+
+				if (!this.nativeDraggable && Safari && target && target.tagName.toUpperCase() === 'SELECT') {
+					return;
+				}
+
+				target = closest(target, options.draggable, el, false);
+
+				if (target && target.animated) {
+					return;
+				}
+
+				if (lastDownEl === target) {
+					// Ignoring duplicate `down`
+					return;
+				} // Get the index of the dragged element within its parent
+
+
+				oldIndex = index(target);
+				oldDraggableIndex = index(target, options.draggable); // Check filter
+
+				if (typeof filter === 'function') {
+					if (filter.call(this, evt, target, this)) {
+						_dispatchEvent({
+							sortable: _this,
+							rootEl: originalTarget,
+							name: 'filter',
+							targetEl: target,
+							toEl: el,
+							fromEl: el
+						});
+
+						pluginEvent('filter', _this, {
+							evt: evt
+						});
+						preventOnFilter && evt.cancelable && evt.preventDefault();
+						return; // cancel dnd
+					}
+				} else if (filter) {
+					filter = filter.split(',').some(function (criteria) {
+						criteria = closest(originalTarget, criteria.trim(), el, false);
+
+						if (criteria) {
+							_dispatchEvent({
+								sortable: _this,
+								rootEl: criteria,
+								name: 'filter',
+								targetEl: target,
+								fromEl: el,
+								toEl: el
+							});
+
+							pluginEvent('filter', _this, {
+								evt: evt
+							});
+							return true;
+						}
+					});
+
+					if (filter) {
+						preventOnFilter && evt.cancelable && evt.preventDefault();
+						return; // cancel dnd
+					}
+				}
+
+				if (options.handle && !closest(originalTarget, options.handle, el, false)) {
+					return;
+				} // Prepare `dragstart`
+
+
+				this._prepareDragStart(evt, touch, target);
+			},
+			_prepareDragStart: function _prepareDragStart(
+				/** Event */
+				evt,
+				/** Touch */
+				touch,
+				/** HTMLElement */
+				target) {
+				var _this = this,
+					el = _this.el,
+					options = _this.options,
+					ownerDocument = el.ownerDocument,
+					dragStartFn;
+
+				if (target && !dragEl && target.parentNode === el) {
+					var dragRect = getRect(target);
+					rootEl = el;
+					dragEl = target;
+					parentEl = dragEl.parentNode;
+					nextEl = dragEl.nextSibling;
+					lastDownEl = target;
+					activeGroup = options.group;
+					Sortable.dragged = dragEl;
+					tapEvt = {
+						target: dragEl,
+						clientX: (touch || evt).clientX,
+						clientY: (touch || evt).clientY
+					};
+					tapDistanceLeft = tapEvt.clientX - dragRect.left;
+					tapDistanceTop = tapEvt.clientY - dragRect.top;
+					this._lastX = (touch || evt).clientX;
+					this._lastY = (touch || evt).clientY;
+					dragEl.style['will-change'] = 'all';
+
+					dragStartFn = function dragStartFn() {
+						pluginEvent('delayEnded', _this, {
+							evt: evt
+						});
+
+						if (Sortable.eventCanceled) {
+							_this._onDrop();
+
+							return;
+						} // Delayed drag has been triggered
+						// we can re-enable the events: touchmove/mousemove
+
+
+						_this._disableDelayedDragEvents();
+
+						if (!FireFox && _this.nativeDraggable) {
+							dragEl.draggable = true;
+						} // Bind the events: dragstart/dragend
+
+
+						_this._triggerDragStart(evt, touch); // Drag start event
+
+
+						_dispatchEvent({
+							sortable: _this,
+							name: 'choose',
+							originalEvent: evt
+						}); // Chosen item
+
+
+						toggleClass(dragEl, options.chosenClass, true);
+					}; // Disable "draggable"
+
+
+					options.ignore.split(',').forEach(function (criteria) {
+						find(dragEl, criteria.trim(), _disableDraggable);
+					});
+					on(ownerDocument, 'dragover', nearestEmptyInsertDetectEvent);
+					on(ownerDocument, 'mousemove', nearestEmptyInsertDetectEvent);
+					on(ownerDocument, 'touchmove', nearestEmptyInsertDetectEvent);
+					on(ownerDocument, 'mouseup', _this._onDrop);
+					on(ownerDocument, 'touchend', _this._onDrop);
+					on(ownerDocument, 'touchcancel', _this._onDrop); // Make dragEl draggable (must be before delay for FireFox)
+
+					if (FireFox && this.nativeDraggable) {
+						this.options.touchStartThreshold = 4;
+						dragEl.draggable = true;
+					}
+
+					pluginEvent('delayStart', this, {
+						evt: evt
+					}); // Delay is impossible for native DnD in Edge or IE
+
+					if (options.delay && (!options.delayOnTouchOnly || touch) && (!this.nativeDraggable || !(Edge || IE11OrLess))) {
+						if (Sortable.eventCanceled) {
+							this._onDrop();
+
+							return;
+						} // If the user moves the pointer or let go the click or touch
+						// before the delay has been reached:
+						// disable the delayed drag
+
+
+						on(ownerDocument, 'mouseup', _this._disableDelayedDrag);
+						on(ownerDocument, 'touchend', _this._disableDelayedDrag);
+						on(ownerDocument, 'touchcancel', _this._disableDelayedDrag);
+						on(ownerDocument, 'mousemove', _this._delayedDragTouchMoveHandler);
+						on(ownerDocument, 'touchmove', _this._delayedDragTouchMoveHandler);
+						options.supportPointer && on(ownerDocument, 'pointermove', _this._delayedDragTouchMoveHandler);
+						_this._dragStartTimer = setTimeout(dragStartFn, options.delay);
+					} else {
+						dragStartFn();
+					}
+				}
+			},
+			_delayedDragTouchMoveHandler: function _delayedDragTouchMoveHandler(
+				/** TouchEvent|PointerEvent **/
+				e) {
+				var touch = e.touches ? e.touches[0] : e;
+
+				if (Math.max(Math.abs(touch.clientX - this._lastX), Math.abs(touch.clientY - this._lastY)) >= Math.floor(this.options.touchStartThreshold / (this.nativeDraggable && window.devicePixelRatio || 1))) {
+					this._disableDelayedDrag();
+				}
+			},
+			_disableDelayedDrag: function _disableDelayedDrag() {
+				dragEl && _disableDraggable(dragEl);
+				clearTimeout(this._dragStartTimer);
+
+				this._disableDelayedDragEvents();
+			},
+			_disableDelayedDragEvents: function _disableDelayedDragEvents() {
+				var ownerDocument = this.el.ownerDocument;
+				off(ownerDocument, 'mouseup', this._disableDelayedDrag);
+				off(ownerDocument, 'touchend', this._disableDelayedDrag);
+				off(ownerDocument, 'touchcancel', this._disableDelayedDrag);
+				off(ownerDocument, 'mousemove', this._delayedDragTouchMoveHandler);
+				off(ownerDocument, 'touchmove', this._delayedDragTouchMoveHandler);
+				off(ownerDocument, 'pointermove', this._delayedDragTouchMoveHandler);
+			},
+			_triggerDragStart: function _triggerDragStart(
+				/** Event */
+				evt,
+				/** Touch */
+				touch) {
+				touch = touch || evt.pointerType == 'touch' && evt;
+
+				if (!this.nativeDraggable || touch) {
+					if (this.options.supportPointer) {
+						on(document, 'pointermove', this._onTouchMove);
+					} else if (touch) {
+						on(document, 'touchmove', this._onTouchMove);
+					} else {
+						on(document, 'mousemove', this._onTouchMove);
+					}
+				} else {
+					on(dragEl, 'dragend', this);
+					on(rootEl, 'dragstart', this._onDragStart);
+				}
+
+				try {
+					if (document.selection) {
+						// Timeout neccessary for IE9
+						_nextTick(function () {
+							document.selection.empty();
+						});
+					} else {
+						window.getSelection().removeAllRanges();
+					}
+				} catch (err) {
+				}
+			},
+			_dragStarted: function _dragStarted(fallback, evt) {
+
+				awaitingDragStarted = false;
+
+				if (rootEl && dragEl) {
+					pluginEvent('dragStarted', this, {
+						evt: evt
+					});
+
+					if (this.nativeDraggable) {
+						on(document, 'dragover', _checkOutsideTargetEl);
+					}
+
+					var options = this.options; // Apply effect
+
+					!fallback && toggleClass(dragEl, options.dragClass, false);
+					toggleClass(dragEl, options.ghostClass, true);
+					Sortable.active = this;
+					fallback && this._appendGhost(); // Drag start event
+
+					_dispatchEvent({
+						sortable: this,
+						name: 'start',
+						originalEvent: evt
+					});
+				} else {
+					this._nulling();
+				}
+			},
+			_emulateDragOver: function _emulateDragOver() {
+				if (touchEvt) {
+					this._lastX = touchEvt.clientX;
+					this._lastY = touchEvt.clientY;
+
+					_hideGhostForTarget();
+
+					var target = document.elementFromPoint(touchEvt.clientX, touchEvt.clientY);
+					var parent = target;
+
+					while (target && target.shadowRoot) {
+						target = target.shadowRoot.elementFromPoint(touchEvt.clientX, touchEvt.clientY);
+						if (target === parent) break;
+						parent = target;
+					}
+
+					dragEl.parentNode[expando]._isOutsideThisEl(target);
+
+					if (parent) {
+						do {
+							if (parent[expando]) {
+								var inserted = void 0;
+								inserted = parent[expando]._onDragOver({
+									clientX: touchEvt.clientX,
+									clientY: touchEvt.clientY,
+									target: target,
+									rootEl: parent
+								});
+
+								if (inserted && !this.options.dragoverBubble) {
+									break;
+								}
+							}
+
+							target = parent; // store last element
+						}
+							/* jshint boss:true */
+						while (parent = parent.parentNode);
+					}
+
+					_unhideGhostForTarget();
+				}
+			},
+			_onTouchMove: function _onTouchMove(
+				/**TouchEvent*/
+				evt) {
+				if (tapEvt) {
+					var options = this.options,
+						fallbackTolerance = options.fallbackTolerance,
+						fallbackOffset = options.fallbackOffset,
+						touch = evt.touches ? evt.touches[0] : evt,
+						ghostMatrix = ghostEl && matrix(ghostEl, true),
+						scaleX = ghostEl && ghostMatrix && ghostMatrix.a,
+						scaleY = ghostEl && ghostMatrix && ghostMatrix.d,
+						relativeScrollOffset = PositionGhostAbsolutely && ghostRelativeParent && getRelativeScrollOffset(ghostRelativeParent),
+						dx = (touch.clientX - tapEvt.clientX + fallbackOffset.x) / (scaleX || 1) + (relativeScrollOffset ? relativeScrollOffset[0] - ghostRelativeParentInitialScroll[0] : 0) / (scaleX || 1),
+						dy = (touch.clientY - tapEvt.clientY + fallbackOffset.y) / (scaleY || 1) + (relativeScrollOffset ? relativeScrollOffset[1] - ghostRelativeParentInitialScroll[1] : 0) / (scaleY || 1); // only set the status to dragging, when we are actually dragging
+
+					if (!Sortable.active && !awaitingDragStarted) {
+						if (fallbackTolerance && Math.max(Math.abs(touch.clientX - this._lastX), Math.abs(touch.clientY - this._lastY)) < fallbackTolerance) {
+							return;
+						}
+
+						this._onDragStart(evt, true);
+					}
+
+					if (ghostEl) {
+						if (ghostMatrix) {
+							ghostMatrix.e += dx - (lastDx || 0);
+							ghostMatrix.f += dy - (lastDy || 0);
+						} else {
+							ghostMatrix = {
+								a: 1,
+								b: 0,
+								c: 0,
+								d: 1,
+								e: dx,
+								f: dy
+							};
+						}
+
+						var cssMatrix = "matrix(".concat(ghostMatrix.a, ",").concat(ghostMatrix.b, ",").concat(ghostMatrix.c, ",").concat(ghostMatrix.d, ",").concat(ghostMatrix.e, ",").concat(ghostMatrix.f, ")");
+						css(ghostEl, 'webkitTransform', cssMatrix);
+						css(ghostEl, 'mozTransform', cssMatrix);
+						css(ghostEl, 'msTransform', cssMatrix);
+						css(ghostEl, 'transform', cssMatrix);
+						lastDx = dx;
+						lastDy = dy;
+						touchEvt = touch;
+					}
+
+					evt.cancelable && evt.preventDefault();
+				}
+			},
+			_appendGhost: function _appendGhost() {
+				// Bug if using scale(): https://stackoverflow.com/questions/2637058
+				// Not being adjusted for
+				if (!ghostEl) {
+					var container = this.options.fallbackOnBody ? document.body : rootEl,
+						rect = getRect(dragEl, true, PositionGhostAbsolutely, true, container),
+						options = this.options; // Position absolutely
+
+					if (PositionGhostAbsolutely) {
+						// Get relatively positioned parent
+						ghostRelativeParent = container;
+
+						while (css(ghostRelativeParent, 'position') === 'static' && css(ghostRelativeParent, 'transform') === 'none' && ghostRelativeParent !== document) {
+							ghostRelativeParent = ghostRelativeParent.parentNode;
+						}
+
+						if (ghostRelativeParent !== document.body && ghostRelativeParent !== document.documentElement) {
+							if (ghostRelativeParent === document) ghostRelativeParent = getWindowScrollingElement();
+							rect.top += ghostRelativeParent.scrollTop;
+							rect.left += ghostRelativeParent.scrollLeft;
+						} else {
+							ghostRelativeParent = getWindowScrollingElement();
+						}
+
+						ghostRelativeParentInitialScroll = getRelativeScrollOffset(ghostRelativeParent);
+					}
+
+					ghostEl = dragEl.cloneNode(true);
+					toggleClass(ghostEl, options.ghostClass, false);
+					toggleClass(ghostEl, options.fallbackClass, true);
+					toggleClass(ghostEl, options.dragClass, true);
+					css(ghostEl, 'transition', '');
+					css(ghostEl, 'transform', '');
+					css(ghostEl, 'box-sizing', 'border-box');
+					css(ghostEl, 'margin', 0);
+					css(ghostEl, 'top', rect.top);
+					css(ghostEl, 'left', rect.left);
+					css(ghostEl, 'width', rect.width);
+					css(ghostEl, 'height', rect.height);
+					css(ghostEl, 'opacity', '0.8');
+					css(ghostEl, 'position', PositionGhostAbsolutely ? 'absolute' : 'fixed');
+					css(ghostEl, 'zIndex', '100000');
+					css(ghostEl, 'pointerEvents', 'none');
+					Sortable.ghost = ghostEl;
+					container.appendChild(ghostEl); // Set transform-origin
+
+					css(ghostEl, 'transform-origin', tapDistanceLeft / parseInt(ghostEl.style.width) * 100 + '% ' + tapDistanceTop / parseInt(ghostEl.style.height) * 100 + '%');
+				}
+			},
+			_onDragStart: function _onDragStart(
+				/**Event*/
+				evt,
+				/**boolean*/
+				fallback) {
+				var _this = this;
+
+				var dataTransfer = evt.dataTransfer;
+				var options = _this.options;
+				pluginEvent('dragStart', this, {
+					evt: evt
+				});
+
+				if (Sortable.eventCanceled) {
+					this._onDrop();
+
+					return;
+				}
+
+				pluginEvent('setupClone', this);
+
+				if (!Sortable.eventCanceled) {
+					cloneEl = clone(dragEl);
+					cloneEl.removeAttribute("id");
+					cloneEl.draggable = false;
+					cloneEl.style['will-change'] = '';
+
+					this._hideClone();
+
+					toggleClass(cloneEl, this.options.chosenClass, false);
+					Sortable.clone = cloneEl;
+				} // #1143: IFrame support workaround
+
+
+				_this.cloneId = _nextTick(function () {
+					pluginEvent('clone', _this);
+					if (Sortable.eventCanceled) return;
+
+					if (!_this.options.removeCloneOnHide) {
+						rootEl.insertBefore(cloneEl, dragEl);
+					}
+
+					_this._hideClone();
+
+					_dispatchEvent({
+						sortable: _this,
+						name: 'clone'
+					});
+				});
+				!fallback && toggleClass(dragEl, options.dragClass, true); // Set proper drop events
+
+				if (fallback) {
+					ignoreNextClick = true;
+					_this._loopId = setInterval(_this._emulateDragOver, 50);
+				} else {
+					// Undo what was set in _prepareDragStart before drag started
+					off(document, 'mouseup', _this._onDrop);
+					off(document, 'touchend', _this._onDrop);
+					off(document, 'touchcancel', _this._onDrop);
+
+					if (dataTransfer) {
+						dataTransfer.effectAllowed = 'move';
+						options.setData && options.setData.call(_this, dataTransfer, dragEl);
+					}
+
+					on(document, 'drop', _this); // #1276 fix:
+
+					css(dragEl, 'transform', 'translateZ(0)');
+				}
+
+				awaitingDragStarted = true;
+				_this._dragStartId = _nextTick(_this._dragStarted.bind(_this, fallback, evt));
+				on(document, 'selectstart', _this);
+				moved = true;
+
+				if (Safari) {
+					css(document.body, 'user-select', 'none');
+				}
+			},
+			// Returns true - if no further action is needed (either inserted or another condition)
+			_onDragOver: function _onDragOver(
+				/**Event*/
+				evt) {
+				var el = this.el,
+					target = evt.target,
+					dragRect,
+					targetRect,
+					revert,
+					options = this.options,
+					group = options.group,
+					activeSortable = Sortable.active,
+					isOwner = activeGroup === group,
+					canSort = options.sort,
+					fromSortable = putSortable || activeSortable,
+					vertical,
+					_this = this,
+					completedFired = false;
+
+				if (_silent) return;
+
+				function dragOverEvent(name, extra) {
+					pluginEvent(name, _this, _objectSpread2({
+						evt: evt,
+						isOwner: isOwner,
+						axis: vertical ? 'vertical' : 'horizontal',
+						revert: revert,
+						dragRect: dragRect,
+						targetRect: targetRect,
+						canSort: canSort,
+						fromSortable: fromSortable,
+						target: target,
+						completed: completed,
+						onMove: function onMove(target, after) {
+							return _onMove(rootEl, el, dragEl, dragRect, target, getRect(target), evt, after);
+						},
+						changed: changed
+					}, extra));
+				} // Capture animation state
+
+
+				function capture() {
+					dragOverEvent('dragOverAnimationCapture');
+
+					_this.captureAnimationState();
+
+					if (_this !== fromSortable) {
+						fromSortable.captureAnimationState();
+					}
+				} // Return invocation when dragEl is inserted (or completed)
+
+
+				function completed(insertion) {
+					dragOverEvent('dragOverCompleted', {
+						insertion: insertion
+					});
+
+					if (insertion) {
+						// Clones must be hidden before folding animation to capture dragRectAbsolute properly
+						if (isOwner) {
+							activeSortable._hideClone();
+						} else {
+							activeSortable._showClone(_this);
+						}
+
+						if (_this !== fromSortable) {
+							// Set ghost class to new sortable's ghost class
+							toggleClass(dragEl, putSortable ? putSortable.options.ghostClass : activeSortable.options.ghostClass, false);
+							toggleClass(dragEl, options.ghostClass, true);
+						}
+
+						if (putSortable !== _this && _this !== Sortable.active) {
+							putSortable = _this;
+						} else if (_this === Sortable.active && putSortable) {
+							putSortable = null;
+						} // Animation
+
+
+						if (fromSortable === _this) {
+							_this._ignoreWhileAnimating = target;
+						}
+
+						_this.animateAll(function () {
+							dragOverEvent('dragOverAnimationComplete');
+							_this._ignoreWhileAnimating = null;
+						});
+
+						if (_this !== fromSortable) {
+							fromSortable.animateAll();
+							fromSortable._ignoreWhileAnimating = null;
+						}
+					} // Null lastTarget if it is not inside a previously swapped element
+
+
+					if (target === dragEl && !dragEl.animated || target === el && !target.animated) {
+						lastTarget = null;
+					} // no bubbling and not fallback
+
+
+					if (!options.dragoverBubble && !evt.rootEl && target !== document) {
+						dragEl.parentNode[expando]._isOutsideThisEl(evt.target); // Do not detect for empty insert if already inserted
+
+
+						!insertion && nearestEmptyInsertDetectEvent(evt);
+					}
+
+					!options.dragoverBubble && evt.stopPropagation && evt.stopPropagation();
+					return completedFired = true;
+				} // Call when dragEl has been inserted
+
+
+				function changed() {
+					newIndex = index(dragEl);
+					newDraggableIndex = index(dragEl, options.draggable);
+
+					_dispatchEvent({
+						sortable: _this,
+						name: 'change',
+						toEl: el,
+						newIndex: newIndex,
+						newDraggableIndex: newDraggableIndex,
+						originalEvent: evt
+					});
+				}
+
+				if (evt.preventDefault !== void 0) {
+					evt.cancelable && evt.preventDefault();
+				}
+
+				target = closest(target, options.draggable, el, true);
+				dragOverEvent('dragOver');
+				if (Sortable.eventCanceled) return completedFired;
+
+				if (dragEl.contains(evt.target) || target.animated && target.animatingX && target.animatingY || _this._ignoreWhileAnimating === target) {
+					return completed(false);
+				}
 
-      ignoreNextClick = false;
+				ignoreNextClick = false;
 
-      if (activeSortable && !options.disabled && (isOwner ? canSort || (revert = parentEl !== rootEl) // Reverting item into the original list
-      : putSortable === this || (this.lastPutMode = activeGroup.checkPull(this, activeSortable, dragEl, evt)) && group.checkPut(this, activeSortable, dragEl, evt))) {
-        vertical = this._getDirection(evt, target) === 'vertical';
-        dragRect = getRect(dragEl);
-        dragOverEvent('dragOverValid');
-        if (Sortable.eventCanceled) return completedFired;
-
-        if (revert) {
-          parentEl = rootEl; // actualization
-
-          capture();
-
-          this._hideClone();
-
-          dragOverEvent('revert');
-
-          if (!Sortable.eventCanceled) {
-            if (nextEl) {
-              rootEl.insertBefore(dragEl, nextEl);
-            } else {
-              rootEl.appendChild(dragEl);
-            }
-          }
-
-          return completed(true);
-        }
-
-        var elLastChild = lastChild(el, options.draggable);
-
-        if (!elLastChild || _ghostIsLast(evt, vertical, this) && !elLastChild.animated) {
-          // Insert to end of list
-          // If already at end of list: Do not insert
-          if (elLastChild === dragEl) {
-            return completed(false);
-          } // if there is a last element, it is the target
+				if (activeSortable && !options.disabled && (isOwner ? canSort || (revert = parentEl !== rootEl) // Reverting item into the original list
+					: putSortable === this || (this.lastPutMode = activeGroup.checkPull(this, activeSortable, dragEl, evt)) && group.checkPut(this, activeSortable, dragEl, evt))) {
+					vertical = this._getDirection(evt, target) === 'vertical';
+					dragRect = getRect(dragEl);
+					dragOverEvent('dragOverValid');
+					if (Sortable.eventCanceled) return completedFired;
+
+					if (revert) {
+						parentEl = rootEl; // actualization
+
+						capture();
+
+						this._hideClone();
+
+						dragOverEvent('revert');
+
+						if (!Sortable.eventCanceled) {
+							if (nextEl) {
+								rootEl.insertBefore(dragEl, nextEl);
+							} else {
+								rootEl.appendChild(dragEl);
+							}
+						}
+
+						return completed(true);
+					}
+
+					var elLastChild = lastChild(el, options.draggable);
+
+					if (!elLastChild || _ghostIsLast(evt, vertical, this) && !elLastChild.animated) {
+						// Insert to end of list
+						// If already at end of list: Do not insert
+						if (elLastChild === dragEl) {
+							return completed(false);
+						} // if there is a last element, it is the target
 
 
-          if (elLastChild && el === evt.target) {
-            target = elLastChild;
-          }
+						if (elLastChild && el === evt.target) {
+							target = elLastChild;
+						}
 
-          if (target) {
-            targetRect = getRect(target);
-          }
+						if (target) {
+							targetRect = getRect(target);
+						}
 
-          if (_onMove(rootEl, el, dragEl, dragRect, target, targetRect, evt, !!target) !== false) {
-            capture();
+						if (_onMove(rootEl, el, dragEl, dragRect, target, targetRect, evt, !!target) !== false) {
+							capture();
 
-            if (elLastChild && elLastChild.nextSibling) {
-              // the last draggable element is not the last node
-              el.insertBefore(dragEl, elLastChild.nextSibling);
-            } else {
-              el.appendChild(dragEl);
-            }
+							if (elLastChild && elLastChild.nextSibling) {
+								// the last draggable element is not the last node
+								el.insertBefore(dragEl, elLastChild.nextSibling);
+							} else {
+								el.appendChild(dragEl);
+							}
 
-            parentEl = el; // actualization
-
-            changed();
-            return completed(true);
-          }
-        } else if (elLastChild && _ghostIsFirst(evt, vertical, this)) {
-          // Insert to start of list
-          var firstChild = getChild(el, 0, options, true);
-
-          if (firstChild === dragEl) {
-            return completed(false);
-          }
-
-          target = firstChild;
-          targetRect = getRect(target);
-
-          if (_onMove(rootEl, el, dragEl, dragRect, target, targetRect, evt, false) !== false) {
-            capture();
-            el.insertBefore(dragEl, firstChild);
-            parentEl = el; // actualization
-
-            changed();
-            return completed(true);
-          }
-        } else if (target.parentNode === el) {
-          targetRect = getRect(target);
-          var direction = 0,
-              targetBeforeFirstSwap,
-              differentLevel = dragEl.parentNode !== el,
-              differentRowCol = !_dragElInRowColumn(dragEl.animated && dragEl.toRect || dragRect, target.animated && target.toRect || targetRect, vertical),
-              side1 = vertical ? 'top' : 'left',
-              scrolledPastTop = isScrolledPast(target, 'top', 'top') || isScrolledPast(dragEl, 'top', 'top'),
-              scrollBefore = scrolledPastTop ? scrolledPastTop.scrollTop : void 0;
-
-          if (lastTarget !== target) {
-            targetBeforeFirstSwap = targetRect[side1];
-            pastFirstInvertThresh = false;
-            isCircumstantialInvert = !differentRowCol && options.invertSwap || differentLevel;
-          }
-
-          direction = _getSwapDirection(evt, target, targetRect, vertical, differentRowCol ? 1 : options.swapThreshold, options.invertedSwapThreshold == null ? options.swapThreshold : options.invertedSwapThreshold, isCircumstantialInvert, lastTarget === target);
-          var sibling;
-
-          if (direction !== 0) {
-            // Check if target is beside dragEl in respective direction (ignoring hidden elements)
-            var dragIndex = index(dragEl);
-
-            do {
-              dragIndex -= direction;
-              sibling = parentEl.children[dragIndex];
-            } while (sibling && (css(sibling, 'display') === 'none' || sibling === ghostEl));
-          } // If dragEl is already beside target: Do not insert
-
-
-          if (direction === 0 || sibling === target) {
-            return completed(false);
-          }
-
-          lastTarget = target;
-          lastDirection = direction;
-          var nextSibling = target.nextElementSibling,
-              after = false;
-          after = direction === 1;
-
-          var moveVector = _onMove(rootEl, el, dragEl, dragRect, target, targetRect, evt, after);
-
-          if (moveVector !== false) {
-            if (moveVector === 1 || moveVector === -1) {
-              after = moveVector === 1;
-            }
-
-            _silent = true;
-            setTimeout(_unsilent, 30);
-            capture();
-
-            if (after && !nextSibling) {
-              el.appendChild(dragEl);
-            } else {
-              target.parentNode.insertBefore(dragEl, after ? nextSibling : target);
-            } // Undo chrome's scroll adjustment (has no effect on other browsers)
-
-
-            if (scrolledPastTop) {
-              scrollBy(scrolledPastTop, 0, scrollBefore - scrolledPastTop.scrollTop);
-            }
-
-            parentEl = dragEl.parentNode; // actualization
-            // must be done before animation
-
-            if (targetBeforeFirstSwap !== undefined && !isCircumstantialInvert) {
-              targetMoveDistance = Math.abs(targetBeforeFirstSwap - getRect(target)[side1]);
-            }
-
-            changed();
-            return completed(true);
-          }
-        }
-
-        if (el.contains(dragEl)) {
-          return completed(false);
-        }
-      }
-
-      return false;
-    },
-    _ignoreWhileAnimating: null,
-    _offMoveEvents: function _offMoveEvents() {
-      off(document, 'mousemove', this._onTouchMove);
-      off(document, 'touchmove', this._onTouchMove);
-      off(document, 'pointermove', this._onTouchMove);
-      off(document, 'dragover', nearestEmptyInsertDetectEvent);
-      off(document, 'mousemove', nearestEmptyInsertDetectEvent);
-      off(document, 'touchmove', nearestEmptyInsertDetectEvent);
-    },
-    _offUpEvents: function _offUpEvents() {
-      var ownerDocument = this.el.ownerDocument;
-      off(ownerDocument, 'mouseup', this._onDrop);
-      off(ownerDocument, 'touchend', this._onDrop);
-      off(ownerDocument, 'pointerup', this._onDrop);
-      off(ownerDocument, 'touchcancel', this._onDrop);
-      off(document, 'selectstart', this);
-    },
-    _onDrop: function _onDrop(
-    /**Event*/
-    evt) {
-      var el = this.el,
-          options = this.options; // Get the index of the dragged element within its parent
-
-      newIndex = index(dragEl);
-      newDraggableIndex = index(dragEl, options.draggable);
-      pluginEvent('drop', this, {
-        evt: evt
-      });
-      parentEl = dragEl && dragEl.parentNode; // Get again after plugin event
-
-      newIndex = index(dragEl);
-      newDraggableIndex = index(dragEl, options.draggable);
-
-      if (Sortable.eventCanceled) {
-        this._nulling();
-
-        return;
-      }
-
-      awaitingDragStarted = false;
-      isCircumstantialInvert = false;
-      pastFirstInvertThresh = false;
-      clearInterval(this._loopId);
-      clearTimeout(this._dragStartTimer);
-
-      _cancelNextTick(this.cloneId);
-
-      _cancelNextTick(this._dragStartId); // Unbind events
-
-
-      if (this.nativeDraggable) {
-        off(document, 'drop', this);
-        off(el, 'dragstart', this._onDragStart);
-      }
-
-      this._offMoveEvents();
-
-      this._offUpEvents();
-
-      if (Safari) {
-        css(document.body, 'user-select', '');
-      }
-
-      css(dragEl, 'transform', '');
-
-      if (evt) {
-        if (moved) {
-          evt.cancelable && evt.preventDefault();
-          !options.dropBubble && evt.stopPropagation();
-        }
-
-        ghostEl && ghostEl.parentNode && ghostEl.parentNode.removeChild(ghostEl);
-
-        if (rootEl === parentEl || putSortable && putSortable.lastPutMode !== 'clone') {
-          // Remove clone(s)
-          cloneEl && cloneEl.parentNode && cloneEl.parentNode.removeChild(cloneEl);
-        }
-
-        if (dragEl) {
-          if (this.nativeDraggable) {
-            off(dragEl, 'dragend', this);
-          }
-
-          _disableDraggable(dragEl);
-
-          dragEl.style['will-change'] = ''; // Remove classes
-          // ghostClass is added in dragStarted
-
-          if (moved && !awaitingDragStarted) {
-            toggleClass(dragEl, putSortable ? putSortable.options.ghostClass : this.options.ghostClass, false);
-          }
-
-          toggleClass(dragEl, this.options.chosenClass, false); // Drag stop event
-
-          _dispatchEvent({
-            sortable: this,
-            name: 'unchoose',
-            toEl: parentEl,
-            newIndex: null,
-            newDraggableIndex: null,
-            originalEvent: evt
-          });
-
-          if (rootEl !== parentEl) {
-            if (newIndex >= 0) {
-              // Add event
-              _dispatchEvent({
-                rootEl: parentEl,
-                name: 'add',
-                toEl: parentEl,
-                fromEl: rootEl,
-                originalEvent: evt
-              }); // Remove event
-
-
-              _dispatchEvent({
-                sortable: this,
-                name: 'remove',
-                toEl: parentEl,
-                originalEvent: evt
-              }); // drag from one list and drop into another
-
-
-              _dispatchEvent({
-                rootEl: parentEl,
-                name: 'sort',
-                toEl: parentEl,
-                fromEl: rootEl,
-                originalEvent: evt
-              });
-
-              _dispatchEvent({
-                sortable: this,
-                name: 'sort',
-                toEl: parentEl,
-                originalEvent: evt
-              });
-            }
-
-            putSortable && putSortable.save();
-          } else {
-            if (newIndex !== oldIndex) {
-              if (newIndex >= 0) {
-                // drag & drop within the same list
-                _dispatchEvent({
-                  sortable: this,
-                  name: 'update',
-                  toEl: parentEl,
-                  originalEvent: evt
-                });
-
-                _dispatchEvent({
-                  sortable: this,
-                  name: 'sort',
-                  toEl: parentEl,
-                  originalEvent: evt
-                });
-              }
-            }
-          }
-
-          if (Sortable.active) {
-            /* jshint eqnull:true */
-            if (newIndex == null || newIndex === -1) {
-              newIndex = oldIndex;
-              newDraggableIndex = oldDraggableIndex;
-            }
-
-            _dispatchEvent({
-              sortable: this,
-              name: 'end',
-              toEl: parentEl,
-              originalEvent: evt
-            }); // Save sorting
-
-
-            this.save();
-          }
-        }
-      }
-
-      this._nulling();
-    },
-    _nulling: function _nulling() {
-      pluginEvent('nulling', this);
-      rootEl = dragEl = parentEl = ghostEl = nextEl = cloneEl = lastDownEl = cloneHidden = tapEvt = touchEvt = moved = newIndex = newDraggableIndex = oldIndex = oldDraggableIndex = lastTarget = lastDirection = putSortable = activeGroup = Sortable.dragged = Sortable.ghost = Sortable.clone = Sortable.active = null;
-      savedInputChecked.forEach(function (el) {
-        el.checked = true;
-      });
-      savedInputChecked.length = lastDx = lastDy = 0;
-    },
-    handleEvent: function handleEvent(
-    /**Event*/
-    evt) {
-      switch (evt.type) {
-        case 'drop':
-        case 'dragend':
-          this._onDrop(evt);
-
-          break;
-
-        case 'dragenter':
-        case 'dragover':
-          if (dragEl) {
-            this._onDragOver(evt);
-
-            _globalDragOver(evt);
-          }
-
-          break;
-
-        case 'selectstart':
-          evt.preventDefault();
-          break;
-      }
-    },
-
-    /**
-     * Serializes the item into an array of string.
-     * @returns {String[]}
-     */
-    toArray: function toArray() {
-      var order = [],
-          el,
-          children = this.el.children,
-          i = 0,
-          n = children.length,
-          options = this.options;
-
-      for (; i < n; i++) {
-        el = children[i];
-
-        if (closest(el, options.draggable, this.el, false)) {
-          order.push(el.getAttribute(options.dataIdAttr) || _generateId(el));
-        }
-      }
-
-      return order;
-    },
-
-    /**
-     * Sorts the elements according to the array.
-     * @param  {String[]}  order  order of the items
-     */
-    sort: function sort(order, useAnimation) {
-      var items = {},
-          rootEl = this.el;
-      this.toArray().forEach(function (id, i) {
-        var el = rootEl.children[i];
-
-        if (closest(el, this.options.draggable, rootEl, false)) {
-          items[id] = el;
-        }
-      }, this);
-      useAnimation && this.captureAnimationState();
-      order.forEach(function (id) {
-        if (items[id]) {
-          rootEl.removeChild(items[id]);
-          rootEl.appendChild(items[id]);
-        }
-      });
-      useAnimation && this.animateAll();
-    },
-
-    /**
-     * Save the current sorting
-     */
-    save: function save() {
-      var store = this.options.store;
-      store && store.set && store.set(this);
-    },
-
-    /**
-     * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
-     * @param   {HTMLElement}  el
-     * @param   {String}       [selector]  default: `options.draggable`
-     * @returns {HTMLElement|null}
-     */
-    closest: function closest$1(el, selector) {
-      return closest(el, selector || this.options.draggable, this.el, false);
-    },
-
-    /**
-     * Set/get option
-     * @param   {string} name
-     * @param   {*}      [value]
-     * @returns {*}
-     */
-    option: function option(name, value) {
-      var options = this.options;
-
-      if (value === void 0) {
-        return options[name];
-      } else {
-        var modifiedValue = PluginManager.modifyOption(this, name, value);
-
-        if (typeof modifiedValue !== 'undefined') {
-          options[name] = modifiedValue;
-        } else {
-          options[name] = value;
-        }
-
-        if (name === 'group') {
-          _prepareGroup(options);
-        }
-      }
-    },
-
-    /**
-     * Destroy
-     */
-    destroy: function destroy() {
-      pluginEvent('destroy', this);
-      var el = this.el;
-      el[expando] = null;
-      off(el, 'mousedown', this._onTapStart);
-      off(el, 'touchstart', this._onTapStart);
-      off(el, 'pointerdown', this._onTapStart);
-
-      if (this.nativeDraggable) {
-        off(el, 'dragover', this);
-        off(el, 'dragenter', this);
-      } // Remove draggable attributes
-
-
-      Array.prototype.forEach.call(el.querySelectorAll('[draggable]'), function (el) {
-        el.removeAttribute('draggable');
-      });
-
-      this._onDrop();
-
-      this._disableDelayedDragEvents();
-
-      sortables.splice(sortables.indexOf(this.el), 1);
-      this.el = el = null;
-    },
-    _hideClone: function _hideClone() {
-      if (!cloneHidden) {
-        pluginEvent('hideClone', this);
-        if (Sortable.eventCanceled) return;
-        css(cloneEl, 'display', 'none');
-
-        if (this.options.removeCloneOnHide && cloneEl.parentNode) {
-          cloneEl.parentNode.removeChild(cloneEl);
-        }
-
-        cloneHidden = true;
-      }
-    },
-    _showClone: function _showClone(putSortable) {
-      if (putSortable.lastPutMode !== 'clone') {
-        this._hideClone();
-
-        return;
-      }
-
-      if (cloneHidden) {
-        pluginEvent('showClone', this);
-        if (Sortable.eventCanceled) return; // show clone at dragEl or original position
-
-        if (dragEl.parentNode == rootEl && !this.options.group.revertClone) {
-          rootEl.insertBefore(cloneEl, dragEl);
-        } else if (nextEl) {
-          rootEl.insertBefore(cloneEl, nextEl);
-        } else {
-          rootEl.appendChild(cloneEl);
-        }
-
-        if (this.options.group.revertClone) {
-          this.animate(dragEl, cloneEl);
-        }
-
-        css(cloneEl, 'display', '');
-        cloneHidden = false;
-      }
-    }
-  };
-
-  function _globalDragOver(
-  /**Event*/
-  evt) {
-    if (evt.dataTransfer) {
-      evt.dataTransfer.dropEffect = 'move';
-    }
-
-    evt.cancelable && evt.preventDefault();
-  }
-
-  function _onMove(fromEl, toEl, dragEl, dragRect, targetEl, targetRect, originalEvent, willInsertAfter) {
-    var evt,
-        sortable = fromEl[expando],
-        onMoveFn = sortable.options.onMove,
-        retVal; // Support for new CustomEvent feature
-
-    if (window.CustomEvent && !IE11OrLess && !Edge) {
-      evt = new CustomEvent('move', {
-        bubbles: true,
-        cancelable: true
-      });
-    } else {
-      evt = document.createEvent('Event');
-      evt.initEvent('move', true, true);
-    }
-
-    evt.to = toEl;
-    evt.from = fromEl;
-    evt.dragged = dragEl;
-    evt.draggedRect = dragRect;
-    evt.related = targetEl || toEl;
-    evt.relatedRect = targetRect || getRect(toEl);
-    evt.willInsertAfter = willInsertAfter;
-    evt.originalEvent = originalEvent;
-    fromEl.dispatchEvent(evt);
-
-    if (onMoveFn) {
-      retVal = onMoveFn.call(sortable, evt, originalEvent);
-    }
-
-    return retVal;
-  }
-
-  function _disableDraggable(el) {
-    el.draggable = false;
-  }
-
-  function _unsilent() {
-    _silent = false;
-  }
-
-  function _ghostIsFirst(evt, vertical, sortable) {
-    var rect = getRect(getChild(sortable.el, 0, sortable.options, true));
-    var spacer = 10;
-    return vertical ? evt.clientX < rect.left - spacer || evt.clientY < rect.top && evt.clientX < rect.right : evt.clientY < rect.top - spacer || evt.clientY < rect.bottom && evt.clientX < rect.left;
-  }
-
-  function _ghostIsLast(evt, vertical, sortable) {
-    var rect = getRect(lastChild(sortable.el, sortable.options.draggable));
-    var spacer = 10;
-    return vertical ? evt.clientX > rect.right + spacer || evt.clientX <= rect.right && evt.clientY > rect.bottom && evt.clientX >= rect.left : evt.clientX > rect.right && evt.clientY > rect.top || evt.clientX <= rect.right && evt.clientY > rect.bottom + spacer;
-  }
-
-  function _getSwapDirection(evt, target, targetRect, vertical, swapThreshold, invertedSwapThreshold, invertSwap, isLastTarget) {
-    var mouseOnAxis = vertical ? evt.clientY : evt.clientX,
-        targetLength = vertical ? targetRect.height : targetRect.width,
-        targetS1 = vertical ? targetRect.top : targetRect.left,
-        targetS2 = vertical ? targetRect.bottom : targetRect.right,
-        invert = false;
-
-    if (!invertSwap) {
-      // Never invert or create dragEl shadow when target movemenet causes mouse to move past the end of regular swapThreshold
-      if (isLastTarget && targetMoveDistance < targetLength * swapThreshold) {
-        // multiplied only by swapThreshold because mouse will already be inside target by (1 - threshold) * targetLength / 2
-        // check if past first invert threshold on side opposite of lastDirection
-        if (!pastFirstInvertThresh && (lastDirection === 1 ? mouseOnAxis > targetS1 + targetLength * invertedSwapThreshold / 2 : mouseOnAxis < targetS2 - targetLength * invertedSwapThreshold / 2)) {
-          // past first invert threshold, do not restrict inverted threshold to dragEl shadow
-          pastFirstInvertThresh = true;
-        }
-
-        if (!pastFirstInvertThresh) {
-          // dragEl shadow (target move distance shadow)
-          if (lastDirection === 1 ? mouseOnAxis < targetS1 + targetMoveDistance // over dragEl shadow
-          : mouseOnAxis > targetS2 - targetMoveDistance) {
-            return -lastDirection;
-          }
-        } else {
-          invert = true;
-        }
-      } else {
-        // Regular
-        if (mouseOnAxis > targetS1 + targetLength * (1 - swapThreshold) / 2 && mouseOnAxis < targetS2 - targetLength * (1 - swapThreshold) / 2) {
-          return _getInsertDirection(target);
-        }
-      }
-    }
-
-    invert = invert || invertSwap;
-
-    if (invert) {
-      // Invert of regular
-      if (mouseOnAxis < targetS1 + targetLength * invertedSwapThreshold / 2 || mouseOnAxis > targetS2 - targetLength * invertedSwapThreshold / 2) {
-        return mouseOnAxis > targetS1 + targetLength / 2 ? 1 : -1;
-      }
-    }
-
-    return 0;
-  }
-  /**
-   * Gets the direction dragEl must be swapped relative to target in order to make it
-   * seem that dragEl has been "inserted" into that element's position
-   * @param  {HTMLElement} target       The target whose position dragEl is being inserted at
-   * @return {Number}                   Direction dragEl must be swapped
-   */
-
-
-  function _getInsertDirection(target) {
-    if (index(dragEl) < index(target)) {
-      return 1;
-    } else {
-      return -1;
-    }
-  }
-  /**
-   * Generate id
-   * @param   {HTMLElement} el
-   * @returns {String}
-   * @private
-   */
-
-
-  function _generateId(el) {
-    var str = el.tagName + el.className + el.src + el.href + el.textContent,
-        i = str.length,
-        sum = 0;
-
-    while (i--) {
-      sum += str.charCodeAt(i);
-    }
-
-    return sum.toString(36);
-  }
-
-  function _saveInputCheckedState(root) {
-    savedInputChecked.length = 0;
-    var inputs = root.getElementsByTagName('input');
-    var idx = inputs.length;
-
-    while (idx--) {
-      var el = inputs[idx];
-      el.checked && savedInputChecked.push(el);
-    }
-  }
-
-  function _nextTick(fn) {
-    return setTimeout(fn, 0);
-  }
-
-  function _cancelNextTick(id) {
-    return clearTimeout(id);
-  } // Fixed #973:
-
-
-  if (documentExists) {
-    on(document, 'touchmove', function (evt) {
-      if ((Sortable.active || awaitingDragStarted) && evt.cancelable) {
-        evt.preventDefault();
-      }
-    });
-  } // Export utils
-
-
-  Sortable.utils = {
-    on: on,
-    off: off,
-    css: css,
-    find: find,
-    is: function is(el, selector) {
-      return !!closest(el, selector, el, false);
-    },
-    extend: extend,
-    throttle: throttle,
-    closest: closest,
-    toggleClass: toggleClass,
-    clone: clone,
-    index: index,
-    nextTick: _nextTick,
-    cancelNextTick: _cancelNextTick,
-    detectDirection: _detectDirection,
-    getChild: getChild
-  };
-  /**
-   * Get the Sortable instance of an element
-   * @param  {HTMLElement} element The element
-   * @return {Sortable|undefined}         The instance of Sortable
-   */
-
-  Sortable.get = function (element) {
-    return element[expando];
-  };
-  /**
-   * Mount a plugin to Sortable
-   * @param  {...SortablePlugin|SortablePlugin[]} plugins       Plugins being mounted
-   */
-
-
-  Sortable.mount = function () {
-    for (var _len = arguments.length, plugins = new Array(_len), _key = 0; _key < _len; _key++) {
-      plugins[_key] = arguments[_key];
-    }
-
-    if (plugins[0].constructor === Array) plugins = plugins[0];
-    plugins.forEach(function (plugin) {
-      if (!plugin.prototype || !plugin.prototype.constructor) {
-        throw "Sortable: Mounted plugin must be a constructor function, not ".concat({}.toString.call(plugin));
-      }
-
-      if (plugin.utils) Sortable.utils = _objectSpread2(_objectSpread2({}, Sortable.utils), plugin.utils);
-      PluginManager.mount(plugin);
-    });
-  };
-  /**
-   * Create sortable instance
-   * @param {HTMLElement}  el
-   * @param {Object}      [options]
-   */
-
-
-  Sortable.create = function (el, options) {
-    return new Sortable(el, options);
-  }; // Export
-
-
-  Sortable.version = version;
-
-  var autoScrolls = [],
-      scrollEl,
-      scrollRootEl,
-      scrolling = false,
-      lastAutoScrollX,
-      lastAutoScrollY,
-      touchEvt$1,
-      pointerElemChangedInterval;
-
-  function AutoScrollPlugin() {
-    function AutoScroll() {
-      this.defaults = {
-        scroll: true,
-        forceAutoScrollFallback: false,
-        scrollSensitivity: 30,
-        scrollSpeed: 10,
-        bubbleScroll: true
-      }; // Bind all private methods
-
-      for (var fn in this) {
-        if (fn.charAt(0) === '_' && typeof this[fn] === 'function') {
-          this[fn] = this[fn].bind(this);
-        }
-      }
-    }
-
-    AutoScroll.prototype = {
-      dragStarted: function dragStarted(_ref) {
-        var originalEvent = _ref.originalEvent;
-
-        if (this.sortable.nativeDraggable) {
-          on(document, 'dragover', this._handleAutoScroll);
-        } else {
-          if (this.options.supportPointer) {
-            on(document, 'pointermove', this._handleFallbackAutoScroll);
-          } else if (originalEvent.touches) {
-            on(document, 'touchmove', this._handleFallbackAutoScroll);
-          } else {
-            on(document, 'mousemove', this._handleFallbackAutoScroll);
-          }
-        }
-      },
-      dragOverCompleted: function dragOverCompleted(_ref2) {
-        var originalEvent = _ref2.originalEvent;
-
-        // For when bubbling is canceled and using fallback (fallback 'touchmove' always reached)
-        if (!this.options.dragOverBubble && !originalEvent.rootEl) {
-          this._handleAutoScroll(originalEvent);
-        }
-      },
-      drop: function drop() {
-        if (this.sortable.nativeDraggable) {
-          off(document, 'dragover', this._handleAutoScroll);
-        } else {
-          off(document, 'pointermove', this._handleFallbackAutoScroll);
-          off(document, 'touchmove', this._handleFallbackAutoScroll);
-          off(document, 'mousemove', this._handleFallbackAutoScroll);
-        }
-
-        clearPointerElemChangedInterval();
-        clearAutoScrolls();
-        cancelThrottle();
-      },
-      nulling: function nulling() {
-        touchEvt$1 = scrollRootEl = scrollEl = scrolling = pointerElemChangedInterval = lastAutoScrollX = lastAutoScrollY = null;
-        autoScrolls.length = 0;
-      },
-      _handleFallbackAutoScroll: function _handleFallbackAutoScroll(evt) {
-        this._handleAutoScroll(evt, true);
-      },
-      _handleAutoScroll: function _handleAutoScroll(evt, fallback) {
-        var _this = this;
-
-        var x = (evt.touches ? evt.touches[0] : evt).clientX,
-            y = (evt.touches ? evt.touches[0] : evt).clientY,
-            elem = document.elementFromPoint(x, y);
-        touchEvt$1 = evt; // IE does not seem to have native autoscroll,
-        // Edge's autoscroll seems too conditional,
-        // MACOS Safari does not have autoscroll,
-        // Firefox and Chrome are good
-
-        if (fallback || this.options.forceAutoScrollFallback || Edge || IE11OrLess || Safari) {
-          autoScroll(evt, this.options, elem, fallback); // Listener for pointer element change
-
-          var ogElemScroller = getParentAutoScrollElement(elem, true);
-
-          if (scrolling && (!pointerElemChangedInterval || x !== lastAutoScrollX || y !== lastAutoScrollY)) {
-            pointerElemChangedInterval && clearPointerElemChangedInterval(); // Detect for pointer elem change, emulating native DnD behaviour
-
-            pointerElemChangedInterval = setInterval(function () {
-              var newElem = getParentAutoScrollElement(document.elementFromPoint(x, y), true);
-
-              if (newElem !== ogElemScroller) {
-                ogElemScroller = newElem;
-                clearAutoScrolls();
-              }
-
-              autoScroll(evt, _this.options, newElem, fallback);
-            }, 10);
-            lastAutoScrollX = x;
-            lastAutoScrollY = y;
-          }
-        } else {
-          // if DnD is enabled (and browser has good autoscrolling), first autoscroll will already scroll, so get parent autoscroll of first autoscroll
-          if (!this.options.bubbleScroll || getParentAutoScrollElement(elem, true) === getWindowScrollingElement()) {
-            clearAutoScrolls();
-            return;
-          }
-
-          autoScroll(evt, this.options, getParentAutoScrollElement(elem, false), false);
-        }
-      }
-    };
-    return _extends(AutoScroll, {
-      pluginName: 'scroll',
-      initializeByDefault: true
-    });
-  }
-
-  function clearAutoScrolls() {
-    autoScrolls.forEach(function (autoScroll) {
-      clearInterval(autoScroll.pid);
-    });
-    autoScrolls = [];
-  }
-
-  function clearPointerElemChangedInterval() {
-    clearInterval(pointerElemChangedInterval);
-  }
-
-  var autoScroll = throttle(function (evt, options, rootEl, isFallback) {
-    // Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=505521
-    if (!options.scroll) return;
-    var x = (evt.touches ? evt.touches[0] : evt).clientX,
-        y = (evt.touches ? evt.touches[0] : evt).clientY,
-        sens = options.scrollSensitivity,
-        speed = options.scrollSpeed,
-        winScroller = getWindowScrollingElement();
-    var scrollThisInstance = false,
-        scrollCustomFn; // New scroll root, set scrollEl
-
-    if (scrollRootEl !== rootEl) {
-      scrollRootEl = rootEl;
-      clearAutoScrolls();
-      scrollEl = options.scroll;
-      scrollCustomFn = options.scrollFn;
-
-      if (scrollEl === true) {
-        scrollEl = getParentAutoScrollElement(rootEl, true);
-      }
-    }
-
-    var layersOut = 0;
-    var currentParent = scrollEl;
-
-    do {
-      var el = currentParent,
-          rect = getRect(el),
-          top = rect.top,
-          bottom = rect.bottom,
-          left = rect.left,
-          right = rect.right,
-          width = rect.width,
-          height = rect.height,
-          canScrollX = void 0,
-          canScrollY = void 0,
-          scrollWidth = el.scrollWidth,
-          scrollHeight = el.scrollHeight,
-          elCSS = css(el),
-          scrollPosX = el.scrollLeft,
-          scrollPosY = el.scrollTop;
-
-      if (el === winScroller) {
-        canScrollX = width < scrollWidth && (elCSS.overflowX === 'auto' || elCSS.overflowX === 'scroll' || elCSS.overflowX === 'visible');
-        canScrollY = height < scrollHeight && (elCSS.overflowY === 'auto' || elCSS.overflowY === 'scroll' || elCSS.overflowY === 'visible');
-      } else {
-        canScrollX = width < scrollWidth && (elCSS.overflowX === 'auto' || elCSS.overflowX === 'scroll');
-        canScrollY = height < scrollHeight && (elCSS.overflowY === 'auto' || elCSS.overflowY === 'scroll');
-      }
-
-      var vx = canScrollX && (Math.abs(right - x) <= sens && scrollPosX + width < scrollWidth) - (Math.abs(left - x) <= sens && !!scrollPosX);
-      var vy = canScrollY && (Math.abs(bottom - y) <= sens && scrollPosY + height < scrollHeight) - (Math.abs(top - y) <= sens && !!scrollPosY);
-
-      if (!autoScrolls[layersOut]) {
-        for (var i = 0; i <= layersOut; i++) {
-          if (!autoScrolls[i]) {
-            autoScrolls[i] = {};
-          }
-        }
-      }
-
-      if (autoScrolls[layersOut].vx != vx || autoScrolls[layersOut].vy != vy || autoScrolls[layersOut].el !== el) {
-        autoScrolls[layersOut].el = el;
-        autoScrolls[layersOut].vx = vx;
-        autoScrolls[layersOut].vy = vy;
-        clearInterval(autoScrolls[layersOut].pid);
-
-        if (vx != 0 || vy != 0) {
-          scrollThisInstance = true;
-          /* jshint loopfunc:true */
-
-          autoScrolls[layersOut].pid = setInterval(function () {
-            // emulate drag over during autoscroll (fallback), emulating native DnD behaviour
-            if (isFallback && this.layer === 0) {
-              Sortable.active._onTouchMove(touchEvt$1); // To move ghost if it is positioned absolutely
-
-            }
-
-            var scrollOffsetY = autoScrolls[this.layer].vy ? autoScrolls[this.layer].vy * speed : 0;
-            var scrollOffsetX = autoScrolls[this.layer].vx ? autoScrolls[this.layer].vx * speed : 0;
-
-            if (typeof scrollCustomFn === 'function') {
-              if (scrollCustomFn.call(Sortable.dragged.parentNode[expando], scrollOffsetX, scrollOffsetY, evt, touchEvt$1, autoScrolls[this.layer].el) !== 'continue') {
-                return;
-              }
-            }
-
-            scrollBy(autoScrolls[this.layer].el, scrollOffsetX, scrollOffsetY);
-          }.bind({
-            layer: layersOut
-          }), 24);
-        }
-      }
-
-      layersOut++;
-    } while (options.bubbleScroll && currentParent !== winScroller && (currentParent = getParentAutoScrollElement(currentParent, false)));
-
-    scrolling = scrollThisInstance; // in case another function catches scrolling as false in between when it is not
-  }, 30);
-
-  var drop = function drop(_ref) {
-    var originalEvent = _ref.originalEvent,
-        putSortable = _ref.putSortable,
-        dragEl = _ref.dragEl,
-        activeSortable = _ref.activeSortable,
-        dispatchSortableEvent = _ref.dispatchSortableEvent,
-        hideGhostForTarget = _ref.hideGhostForTarget,
-        unhideGhostForTarget = _ref.unhideGhostForTarget;
-    if (!originalEvent) return;
-    var toSortable = putSortable || activeSortable;
-    hideGhostForTarget();
-    var touch = originalEvent.changedTouches && originalEvent.changedTouches.length ? originalEvent.changedTouches[0] : originalEvent;
-    var target = document.elementFromPoint(touch.clientX, touch.clientY);
-    unhideGhostForTarget();
-
-    if (toSortable && !toSortable.el.contains(target)) {
-      dispatchSortableEvent('spill');
-      this.onSpill({
-        dragEl: dragEl,
-        putSortable: putSortable
-      });
-    }
-  };
-
-  function Revert() {}
-
-  Revert.prototype = {
-    startIndex: null,
-    dragStart: function dragStart(_ref2) {
-      var oldDraggableIndex = _ref2.oldDraggableIndex;
-      this.startIndex = oldDraggableIndex;
-    },
-    onSpill: function onSpill(_ref3) {
-      var dragEl = _ref3.dragEl,
-          putSortable = _ref3.putSortable;
-      this.sortable.captureAnimationState();
-
-      if (putSortable) {
-        putSortable.captureAnimationState();
-      }
-
-      var nextSibling = getChild(this.sortable.el, this.startIndex, this.options);
-
-      if (nextSibling) {
-        this.sortable.el.insertBefore(dragEl, nextSibling);
-      } else {
-        this.sortable.el.appendChild(dragEl);
-      }
-
-      this.sortable.animateAll();
-
-      if (putSortable) {
-        putSortable.animateAll();
-      }
-    },
-    drop: drop
-  };
-
-  _extends(Revert, {
-    pluginName: 'revertOnSpill'
-  });
-
-  function Remove() {}
-
-  Remove.prototype = {
-    onSpill: function onSpill(_ref4) {
-      var dragEl = _ref4.dragEl,
-          putSortable = _ref4.putSortable;
-      var parentSortable = putSortable || this.sortable;
-      parentSortable.captureAnimationState();
-      dragEl.parentNode && dragEl.parentNode.removeChild(dragEl);
-      parentSortable.animateAll();
-    },
-    drop: drop
-  };
-
-  _extends(Remove, {
-    pluginName: 'removeOnSpill'
-  });
-
-  var lastSwapEl;
-
-  function SwapPlugin() {
-    function Swap() {
-      this.defaults = {
-        swapClass: 'sortable-swap-highlight'
-      };
-    }
-
-    Swap.prototype = {
-      dragStart: function dragStart(_ref) {
-        var dragEl = _ref.dragEl;
-        lastSwapEl = dragEl;
-      },
-      dragOverValid: function dragOverValid(_ref2) {
-        var completed = _ref2.completed,
-            target = _ref2.target,
-            onMove = _ref2.onMove,
-            activeSortable = _ref2.activeSortable,
-            changed = _ref2.changed,
-            cancel = _ref2.cancel;
-        if (!activeSortable.options.swap) return;
-        var el = this.sortable.el,
-            options = this.options;
-
-        if (target && target !== el) {
-          var prevSwapEl = lastSwapEl;
-
-          if (onMove(target) !== false) {
-            toggleClass(target, options.swapClass, true);
-            lastSwapEl = target;
-          } else {
-            lastSwapEl = null;
-          }
-
-          if (prevSwapEl && prevSwapEl !== lastSwapEl) {
-            toggleClass(prevSwapEl, options.swapClass, false);
-          }
-        }
-
-        changed();
-        completed(true);
-        cancel();
-      },
-      drop: function drop(_ref3) {
-        var activeSortable = _ref3.activeSortable,
-            putSortable = _ref3.putSortable,
-            dragEl = _ref3.dragEl;
-        var toSortable = putSortable || this.sortable;
-        var options = this.options;
-        lastSwapEl && toggleClass(lastSwapEl, options.swapClass, false);
-
-        if (lastSwapEl && (options.swap || putSortable && putSortable.options.swap)) {
-          if (dragEl !== lastSwapEl) {
-            toSortable.captureAnimationState();
-            if (toSortable !== activeSortable) activeSortable.captureAnimationState();
-            swapNodes(dragEl, lastSwapEl);
-            toSortable.animateAll();
-            if (toSortable !== activeSortable) activeSortable.animateAll();
-          }
-        }
-      },
-      nulling: function nulling() {
-        lastSwapEl = null;
-      }
-    };
-    return _extends(Swap, {
-      pluginName: 'swap',
-      eventProperties: function eventProperties() {
-        return {
-          swapItem: lastSwapEl
-        };
-      }
-    });
-  }
-
-  function swapNodes(n1, n2) {
-    var p1 = n1.parentNode,
-        p2 = n2.parentNode,
-        i1,
-        i2;
-    if (!p1 || !p2 || p1.isEqualNode(n2) || p2.isEqualNode(n1)) return;
-    i1 = index(n1);
-    i2 = index(n2);
-
-    if (p1.isEqualNode(p2) && i1 < i2) {
-      i2++;
-    }
-
-    p1.insertBefore(n2, p1.children[i1]);
-    p2.insertBefore(n1, p2.children[i2]);
-  }
-
-  var multiDragElements = [],
-      multiDragClones = [],
-      lastMultiDragSelect,
-      // for selection with modifier key down (SHIFT)
-  multiDragSortable,
-      initialFolding = false,
-      // Initial multi-drag fold when drag started
-  folding = false,
-      // Folding any other time
-  dragStarted = false,
-      dragEl$1,
-      clonesFromRect,
-      clonesHidden;
-
-  function MultiDragPlugin() {
-    function MultiDrag(sortable) {
-      // Bind all private methods
-      for (var fn in this) {
-        if (fn.charAt(0) === '_' && typeof this[fn] === 'function') {
-          this[fn] = this[fn].bind(this);
-        }
-      }
-
-      if (!sortable.options.avoidImplicitDeselect) {
-        if (sortable.options.supportPointer) {
-          on(document, 'pointerup', this._deselectMultiDrag);
-        } else {
-          on(document, 'mouseup', this._deselectMultiDrag);
-          on(document, 'touchend', this._deselectMultiDrag);
-        }
-      }
-
-      on(document, 'keydown', this._checkKeyDown);
-      on(document, 'keyup', this._checkKeyUp);
-      this.defaults = {
-        selectedClass: 'sortable-selected',
-        multiDragKey: null,
-        avoidImplicitDeselect: false,
-        setData: function setData(dataTransfer, dragEl) {
-          var data = '';
-
-          if (multiDragElements.length && multiDragSortable === sortable) {
-            multiDragElements.forEach(function (multiDragElement, i) {
-              data += (!i ? '' : ', ') + multiDragElement.textContent;
-            });
-          } else {
-            data = dragEl.textContent;
-          }
-
-          dataTransfer.setData('Text', data);
-        }
-      };
-    }
-
-    MultiDrag.prototype = {
-      multiDragKeyDown: false,
-      isMultiDrag: false,
-      delayStartGlobal: function delayStartGlobal(_ref) {
-        var dragged = _ref.dragEl;
-        dragEl$1 = dragged;
-      },
-      delayEnded: function delayEnded() {
-        this.isMultiDrag = ~multiDragElements.indexOf(dragEl$1);
-      },
-      setupClone: function setupClone(_ref2) {
-        var sortable = _ref2.sortable,
-            cancel = _ref2.cancel;
-        if (!this.isMultiDrag) return;
-
-        for (var i = 0; i < multiDragElements.length; i++) {
-          multiDragClones.push(clone(multiDragElements[i]));
-          multiDragClones[i].sortableIndex = multiDragElements[i].sortableIndex;
-          multiDragClones[i].draggable = false;
-          multiDragClones[i].style['will-change'] = '';
-          toggleClass(multiDragClones[i], this.options.selectedClass, false);
-          multiDragElements[i] === dragEl$1 && toggleClass(multiDragClones[i], this.options.chosenClass, false);
-        }
-
-        sortable._hideClone();
-
-        cancel();
-      },
-      clone: function clone(_ref3) {
-        var sortable = _ref3.sortable,
-            rootEl = _ref3.rootEl,
-            dispatchSortableEvent = _ref3.dispatchSortableEvent,
-            cancel = _ref3.cancel;
-        if (!this.isMultiDrag) return;
-
-        if (!this.options.removeCloneOnHide) {
-          if (multiDragElements.length && multiDragSortable === sortable) {
-            insertMultiDragClones(true, rootEl);
-            dispatchSortableEvent('clone');
-            cancel();
-          }
-        }
-      },
-      showClone: function showClone(_ref4) {
-        var cloneNowShown = _ref4.cloneNowShown,
-            rootEl = _ref4.rootEl,
-            cancel = _ref4.cancel;
-        if (!this.isMultiDrag) return;
-        insertMultiDragClones(false, rootEl);
-        multiDragClones.forEach(function (clone) {
-          css(clone, 'display', '');
-        });
-        cloneNowShown();
-        clonesHidden = false;
-        cancel();
-      },
-      hideClone: function hideClone(_ref5) {
-        var _this = this;
-
-        var sortable = _ref5.sortable,
-            cloneNowHidden = _ref5.cloneNowHidden,
-            cancel = _ref5.cancel;
-        if (!this.isMultiDrag) return;
-        multiDragClones.forEach(function (clone) {
-          css(clone, 'display', 'none');
-
-          if (_this.options.removeCloneOnHide && clone.parentNode) {
-            clone.parentNode.removeChild(clone);
-          }
-        });
-        cloneNowHidden();
-        clonesHidden = true;
-        cancel();
-      },
-      dragStartGlobal: function dragStartGlobal(_ref6) {
-        var sortable = _ref6.sortable;
-
-        if (!this.isMultiDrag && multiDragSortable) {
-          multiDragSortable.multiDrag._deselectMultiDrag();
-        }
-
-        multiDragElements.forEach(function (multiDragElement) {
-          multiDragElement.sortableIndex = index(multiDragElement);
-        }); // Sort multi-drag elements
-
-        multiDragElements = multiDragElements.sort(function (a, b) {
-          return a.sortableIndex - b.sortableIndex;
-        });
-        dragStarted = true;
-      },
-      dragStarted: function dragStarted(_ref7) {
-        var _this2 = this;
-
-        var sortable = _ref7.sortable;
-        if (!this.isMultiDrag) return;
-
-        if (this.options.sort) {
-          // Capture rects,
-          // hide multi drag elements (by positioning them absolute),
-          // set multi drag elements rects to dragRect,
-          // show multi drag elements,
-          // animate to rects,
-          // unset rects & remove from DOM
-          sortable.captureAnimationState();
-
-          if (this.options.animation) {
-            multiDragElements.forEach(function (multiDragElement) {
-              if (multiDragElement === dragEl$1) return;
-              css(multiDragElement, 'position', 'absolute');
-            });
-            var dragRect = getRect(dragEl$1, false, true, true);
-            multiDragElements.forEach(function (multiDragElement) {
-              if (multiDragElement === dragEl$1) return;
-              setRect(multiDragElement, dragRect);
-            });
-            folding = true;
-            initialFolding = true;
-          }
-        }
-
-        sortable.animateAll(function () {
-          folding = false;
-          initialFolding = false;
-
-          if (_this2.options.animation) {
-            multiDragElements.forEach(function (multiDragElement) {
-              unsetRect(multiDragElement);
-            });
-          } // Remove all auxiliary multidrag items from el, if sorting enabled
-
-
-          if (_this2.options.sort) {
-            removeMultiDragElements();
-          }
-        });
-      },
-      dragOver: function dragOver(_ref8) {
-        var target = _ref8.target,
-            completed = _ref8.completed,
-            cancel = _ref8.cancel;
-
-        if (folding && ~multiDragElements.indexOf(target)) {
-          completed(false);
-          cancel();
-        }
-      },
-      revert: function revert(_ref9) {
-        var fromSortable = _ref9.fromSortable,
-            rootEl = _ref9.rootEl,
-            sortable = _ref9.sortable,
-            dragRect = _ref9.dragRect;
-
-        if (multiDragElements.length > 1) {
-          // Setup unfold animation
-          multiDragElements.forEach(function (multiDragElement) {
-            sortable.addAnimationState({
-              target: multiDragElement,
-              rect: folding ? getRect(multiDragElement) : dragRect
-            });
-            unsetRect(multiDragElement);
-            multiDragElement.fromRect = dragRect;
-            fromSortable.removeAnimationState(multiDragElement);
-          });
-          folding = false;
-          insertMultiDragElements(!this.options.removeCloneOnHide, rootEl);
-        }
-      },
-      dragOverCompleted: function dragOverCompleted(_ref10) {
-        var sortable = _ref10.sortable,
-            isOwner = _ref10.isOwner,
-            insertion = _ref10.insertion,
-            activeSortable = _ref10.activeSortable,
-            parentEl = _ref10.parentEl,
-            putSortable = _ref10.putSortable;
-        var options = this.options;
-
-        if (insertion) {
-          // Clones must be hidden before folding animation to capture dragRectAbsolute properly
-          if (isOwner) {
-            activeSortable._hideClone();
-          }
-
-          initialFolding = false; // If leaving sort:false root, or already folding - Fold to new location
-
-          if (options.animation && multiDragElements.length > 1 && (folding || !isOwner && !activeSortable.options.sort && !putSortable)) {
-            // Fold: Set all multi drag elements's rects to dragEl's rect when multi-drag elements are invisible
-            var dragRectAbsolute = getRect(dragEl$1, false, true, true);
-            multiDragElements.forEach(function (multiDragElement) {
-              if (multiDragElement === dragEl$1) return;
-              setRect(multiDragElement, dragRectAbsolute); // Move element(s) to end of parentEl so that it does not interfere with multi-drag clones insertion if they are inserted
-              // while folding, and so that we can capture them again because old sortable will no longer be fromSortable
-
-              parentEl.appendChild(multiDragElement);
-            });
-            folding = true;
-          } // Clones must be shown (and check to remove multi drags) after folding when interfering multiDragElements are moved out
-
-
-          if (!isOwner) {
-            // Only remove if not folding (folding will remove them anyways)
-            if (!folding) {
-              removeMultiDragElements();
-            }
-
-            if (multiDragElements.length > 1) {
-              var clonesHiddenBefore = clonesHidden;
-
-              activeSortable._showClone(sortable); // Unfold animation for clones if showing from hidden
-
-
-              if (activeSortable.options.animation && !clonesHidden && clonesHiddenBefore) {
-                multiDragClones.forEach(function (clone) {
-                  activeSortable.addAnimationState({
-                    target: clone,
-                    rect: clonesFromRect
-                  });
-                  clone.fromRect = clonesFromRect;
-                  clone.thisAnimationDuration = null;
-                });
-              }
-            } else {
-              activeSortable._showClone(sortable);
-            }
-          }
-        }
-      },
-      dragOverAnimationCapture: function dragOverAnimationCapture(_ref11) {
-        var dragRect = _ref11.dragRect,
-            isOwner = _ref11.isOwner,
-            activeSortable = _ref11.activeSortable;
-        multiDragElements.forEach(function (multiDragElement) {
-          multiDragElement.thisAnimationDuration = null;
-        });
-
-        if (activeSortable.options.animation && !isOwner && activeSortable.multiDrag.isMultiDrag) {
-          clonesFromRect = _extends({}, dragRect);
-          var dragMatrix = matrix(dragEl$1, true);
-          clonesFromRect.top -= dragMatrix.f;
-          clonesFromRect.left -= dragMatrix.e;
-        }
-      },
-      dragOverAnimationComplete: function dragOverAnimationComplete() {
-        if (folding) {
-          folding = false;
-          removeMultiDragElements();
-        }
-      },
-      drop: function drop(_ref12) {
-        var evt = _ref12.originalEvent,
-            rootEl = _ref12.rootEl,
-            parentEl = _ref12.parentEl,
-            sortable = _ref12.sortable,
-            dispatchSortableEvent = _ref12.dispatchSortableEvent,
-            oldIndex = _ref12.oldIndex,
-            putSortable = _ref12.putSortable;
-        var toSortable = putSortable || this.sortable;
-        if (!evt) return;
-        var options = this.options,
-            children = parentEl.children; // Multi-drag selection
-
-        if (!dragStarted) {
-          if (options.multiDragKey && !this.multiDragKeyDown) {
-            this._deselectMultiDrag();
-          }
-
-          toggleClass(dragEl$1, options.selectedClass, !~multiDragElements.indexOf(dragEl$1));
-
-          if (!~multiDragElements.indexOf(dragEl$1)) {
-            multiDragElements.push(dragEl$1);
-            dispatchEvent({
-              sortable: sortable,
-              rootEl: rootEl,
-              name: 'select',
-              targetEl: dragEl$1,
-              originalEvent: evt
-            }); // Modifier activated, select from last to dragEl
-
-            if (evt.shiftKey && lastMultiDragSelect && sortable.el.contains(lastMultiDragSelect)) {
-              var lastIndex = index(lastMultiDragSelect),
-                  currentIndex = index(dragEl$1);
-
-              if (~lastIndex && ~currentIndex && lastIndex !== currentIndex) {
-                // Must include lastMultiDragSelect (select it), in case modified selection from no selection
-                // (but previous selection existed)
-                var n, i;
-
-                if (currentIndex > lastIndex) {
-                  i = lastIndex;
-                  n = currentIndex;
-                } else {
-                  i = currentIndex;
-                  n = lastIndex + 1;
-                }
-
-                for (; i < n; i++) {
-                  if (~multiDragElements.indexOf(children[i])) continue;
-                  toggleClass(children[i], options.selectedClass, true);
-                  multiDragElements.push(children[i]);
-                  dispatchEvent({
-                    sortable: sortable,
-                    rootEl: rootEl,
-                    name: 'select',
-                    targetEl: children[i],
-                    originalEvent: evt
-                  });
-                }
-              }
-            } else {
-              lastMultiDragSelect = dragEl$1;
-            }
-
-            multiDragSortable = toSortable;
-          } else {
-            multiDragElements.splice(multiDragElements.indexOf(dragEl$1), 1);
-            lastMultiDragSelect = null;
-            dispatchEvent({
-              sortable: sortable,
-              rootEl: rootEl,
-              name: 'deselect',
-              targetEl: dragEl$1,
-              originalEvent: evt
-            });
-          }
-        } // Multi-drag drop
-
-
-        if (dragStarted && this.isMultiDrag) {
-          folding = false; // Do not "unfold" after around dragEl if reverted
-
-          if ((parentEl[expando].options.sort || parentEl !== rootEl) && multiDragElements.length > 1) {
-            var dragRect = getRect(dragEl$1),
-                multiDragIndex = index(dragEl$1, ':not(.' + this.options.selectedClass + ')');
-            if (!initialFolding && options.animation) dragEl$1.thisAnimationDuration = null;
-            toSortable.captureAnimationState();
-
-            if (!initialFolding) {
-              if (options.animation) {
-                dragEl$1.fromRect = dragRect;
-                multiDragElements.forEach(function (multiDragElement) {
-                  multiDragElement.thisAnimationDuration = null;
-
-                  if (multiDragElement !== dragEl$1) {
-                    var rect = folding ? getRect(multiDragElement) : dragRect;
-                    multiDragElement.fromRect = rect; // Prepare unfold animation
-
-                    toSortable.addAnimationState({
-                      target: multiDragElement,
-                      rect: rect
-                    });
-                  }
-                });
-              } // Multi drag elements are not necessarily removed from the DOM on drop, so to reinsert
-              // properly they must all be removed
-
-
-              removeMultiDragElements();
-              multiDragElements.forEach(function (multiDragElement) {
-                if (children[multiDragIndex]) {
-                  parentEl.insertBefore(multiDragElement, children[multiDragIndex]);
-                } else {
-                  parentEl.appendChild(multiDragElement);
-                }
-
-                multiDragIndex++;
-              }); // If initial folding is done, the elements may have changed position because they are now
-              // unfolding around dragEl, even though dragEl may not have his index changed, so update event
-              // must be fired here as Sortable will not.
-
-              if (oldIndex === index(dragEl$1)) {
-                var update = false;
-                multiDragElements.forEach(function (multiDragElement) {
-                  if (multiDragElement.sortableIndex !== index(multiDragElement)) {
-                    update = true;
-                    return;
-                  }
-                });
-
-                if (update) {
-                  dispatchSortableEvent('update');
-                }
-              }
-            } // Must be done after capturing individual rects (scroll bar)
-
-
-            multiDragElements.forEach(function (multiDragElement) {
-              unsetRect(multiDragElement);
-            });
-            toSortable.animateAll();
-          }
-
-          multiDragSortable = toSortable;
-        } // Remove clones if necessary
-
-
-        if (rootEl === parentEl || putSortable && putSortable.lastPutMode !== 'clone') {
-          multiDragClones.forEach(function (clone) {
-            clone.parentNode && clone.parentNode.removeChild(clone);
-          });
-        }
-      },
-      nullingGlobal: function nullingGlobal() {
-        this.isMultiDrag = dragStarted = false;
-        multiDragClones.length = 0;
-      },
-      destroyGlobal: function destroyGlobal() {
-        this._deselectMultiDrag();
-
-        off(document, 'pointerup', this._deselectMultiDrag);
-        off(document, 'mouseup', this._deselectMultiDrag);
-        off(document, 'touchend', this._deselectMultiDrag);
-        off(document, 'keydown', this._checkKeyDown);
-        off(document, 'keyup', this._checkKeyUp);
-      },
-      _deselectMultiDrag: function _deselectMultiDrag(evt) {
-        if (typeof dragStarted !== "undefined" && dragStarted) return; // Only deselect if selection is in this sortable
-
-        if (multiDragSortable !== this.sortable) return; // Only deselect if target is not item in this sortable
-
-        if (evt && closest(evt.target, this.options.draggable, this.sortable.el, false)) return; // Only deselect if left click
-
-        if (evt && evt.button !== 0) return;
-
-        while (multiDragElements.length) {
-          var el = multiDragElements[0];
-          toggleClass(el, this.options.selectedClass, false);
-          multiDragElements.shift();
-          dispatchEvent({
-            sortable: this.sortable,
-            rootEl: this.sortable.el,
-            name: 'deselect',
-            targetEl: el,
-            originalEvent: evt
-          });
-        }
-      },
-      _checkKeyDown: function _checkKeyDown(evt) {
-        if (evt.key === this.options.multiDragKey) {
-          this.multiDragKeyDown = true;
-        }
-      },
-      _checkKeyUp: function _checkKeyUp(evt) {
-        if (evt.key === this.options.multiDragKey) {
-          this.multiDragKeyDown = false;
-        }
-      }
-    };
-    return _extends(MultiDrag, {
-      // Static methods & properties
-      pluginName: 'multiDrag',
-      utils: {
-        /**
-         * Selects the provided multi-drag item
-         * @param  {HTMLElement} el    The element to be selected
-         */
-        select: function select(el) {
-          var sortable = el.parentNode[expando];
-          if (!sortable || !sortable.options.multiDrag || ~multiDragElements.indexOf(el)) return;
-
-          if (multiDragSortable && multiDragSortable !== sortable) {
-            multiDragSortable.multiDrag._deselectMultiDrag();
-
-            multiDragSortable = sortable;
-          }
-
-          toggleClass(el, sortable.options.selectedClass, true);
-          multiDragElements.push(el);
-        },
-
-        /**
-         * Deselects the provided multi-drag item
-         * @param  {HTMLElement} el    The element to be deselected
-         */
-        deselect: function deselect(el) {
-          var sortable = el.parentNode[expando],
-              index = multiDragElements.indexOf(el);
-          if (!sortable || !sortable.options.multiDrag || !~index) return;
-          toggleClass(el, sortable.options.selectedClass, false);
-          multiDragElements.splice(index, 1);
-        }
-      },
-      eventProperties: function eventProperties() {
-        var _this3 = this;
-
-        var oldIndicies = [],
-            newIndicies = [];
-        multiDragElements.forEach(function (multiDragElement) {
-          oldIndicies.push({
-            multiDragElement: multiDragElement,
-            index: multiDragElement.sortableIndex
-          }); // multiDragElements will already be sorted if folding
-
-          var newIndex;
-
-          if (folding && multiDragElement !== dragEl$1) {
-            newIndex = -1;
-          } else if (folding) {
-            newIndex = index(multiDragElement, ':not(.' + _this3.options.selectedClass + ')');
-          } else {
-            newIndex = index(multiDragElement);
-          }
-
-          newIndicies.push({
-            multiDragElement: multiDragElement,
-            index: newIndex
-          });
-        });
-        return {
-          items: _toConsumableArray(multiDragElements),
-          clones: [].concat(multiDragClones),
-          oldIndicies: oldIndicies,
-          newIndicies: newIndicies
-        };
-      },
-      optionListeners: {
-        multiDragKey: function multiDragKey(key) {
-          key = key.toLowerCase();
-
-          if (key === 'ctrl') {
-            key = 'Control';
-          } else if (key.length > 1) {
-            key = key.charAt(0).toUpperCase() + key.substr(1);
-          }
-
-          return key;
-        }
-      }
-    });
-  }
-
-  function insertMultiDragElements(clonesInserted, rootEl) {
-    multiDragElements.forEach(function (multiDragElement, i) {
-      var target = rootEl.children[multiDragElement.sortableIndex + (clonesInserted ? Number(i) : 0)];
-
-      if (target) {
-        rootEl.insertBefore(multiDragElement, target);
-      } else {
-        rootEl.appendChild(multiDragElement);
-      }
-    });
-  }
-  /**
-   * Insert multi-drag clones
-   * @param  {[Boolean]} elementsInserted  Whether the multi-drag elements are inserted
-   * @param  {HTMLElement} rootEl
-   */
-
-
-  function insertMultiDragClones(elementsInserted, rootEl) {
-    multiDragClones.forEach(function (clone, i) {
-      var target = rootEl.children[clone.sortableIndex + (elementsInserted ? Number(i) : 0)];
-
-      if (target) {
-        rootEl.insertBefore(clone, target);
-      } else {
-        rootEl.appendChild(clone);
-      }
-    });
-  }
-
-  function removeMultiDragElements() {
-    multiDragElements.forEach(function (multiDragElement) {
-      if (multiDragElement === dragEl$1) return;
-      multiDragElement.parentNode && multiDragElement.parentNode.removeChild(multiDragElement);
-    });
-  }
-
-  Sortable.mount(new AutoScrollPlugin());
-  Sortable.mount(Remove, Revert);
-
-  Sortable.mount(new SwapPlugin());
-  Sortable.mount(new MultiDragPlugin());
-
-  return Sortable;
+							parentEl = el; // actualization
+
+							changed();
+							return completed(true);
+						}
+					} else if (elLastChild && _ghostIsFirst(evt, vertical, this)) {
+						// Insert to start of list
+						var firstChild = getChild(el, 0, options, true);
+
+						if (firstChild === dragEl) {
+							return completed(false);
+						}
+
+						target = firstChild;
+						targetRect = getRect(target);
+
+						if (_onMove(rootEl, el, dragEl, dragRect, target, targetRect, evt, false) !== false) {
+							capture();
+							el.insertBefore(dragEl, firstChild);
+							parentEl = el; // actualization
+
+							changed();
+							return completed(true);
+						}
+					} else if (target.parentNode === el) {
+						targetRect = getRect(target);
+						var direction = 0,
+							targetBeforeFirstSwap,
+							differentLevel = dragEl.parentNode !== el,
+							differentRowCol = !_dragElInRowColumn(dragEl.animated && dragEl.toRect || dragRect, target.animated && target.toRect || targetRect, vertical),
+							side1 = vertical ? 'top' : 'left',
+							scrolledPastTop = isScrolledPast(target, 'top', 'top') || isScrolledPast(dragEl, 'top', 'top'),
+							scrollBefore = scrolledPastTop ? scrolledPastTop.scrollTop : void 0;
+
+						if (lastTarget !== target) {
+							targetBeforeFirstSwap = targetRect[side1];
+							pastFirstInvertThresh = false;
+							isCircumstantialInvert = !differentRowCol && options.invertSwap || differentLevel;
+						}
+
+						direction = _getSwapDirection(evt, target, targetRect, vertical, differentRowCol ? 1 : options.swapThreshold, options.invertedSwapThreshold == null ? options.swapThreshold : options.invertedSwapThreshold, isCircumstantialInvert, lastTarget === target);
+						var sibling;
+
+						if (direction !== 0) {
+							// Check if target is beside dragEl in respective direction (ignoring hidden elements)
+							var dragIndex = index(dragEl);
+
+							do {
+								dragIndex -= direction;
+								sibling = parentEl.children[dragIndex];
+							} while (sibling && (css(sibling, 'display') === 'none' || sibling === ghostEl));
+						} // If dragEl is already beside target: Do not insert
+
+
+						if (direction === 0 || sibling === target) {
+							return completed(false);
+						}
+
+						lastTarget = target;
+						lastDirection = direction;
+						var nextSibling = target.nextElementSibling,
+							after = false;
+						after = direction === 1;
+
+						var moveVector = _onMove(rootEl, el, dragEl, dragRect, target, targetRect, evt, after);
+
+						if (moveVector !== false) {
+							if (moveVector === 1 || moveVector === -1) {
+								after = moveVector === 1;
+							}
+
+							_silent = true;
+							setTimeout(_unsilent, 30);
+							capture();
+
+							if (after && !nextSibling) {
+								el.appendChild(dragEl);
+							} else {
+								target.parentNode.insertBefore(dragEl, after ? nextSibling : target);
+							} // Undo chrome's scroll adjustment (has no effect on other browsers)
+
+
+							if (scrolledPastTop) {
+								scrollBy(scrolledPastTop, 0, scrollBefore - scrolledPastTop.scrollTop);
+							}
+
+							parentEl = dragEl.parentNode; // actualization
+							// must be done before animation
+
+							if (targetBeforeFirstSwap !== undefined && !isCircumstantialInvert) {
+								targetMoveDistance = Math.abs(targetBeforeFirstSwap - getRect(target)[side1]);
+							}
+
+							changed();
+							return completed(true);
+						}
+					}
+
+					if (el.contains(dragEl)) {
+						return completed(false);
+					}
+				}
+
+				return false;
+			},
+			_ignoreWhileAnimating: null,
+			_offMoveEvents: function _offMoveEvents() {
+				off(document, 'mousemove', this._onTouchMove);
+				off(document, 'touchmove', this._onTouchMove);
+				off(document, 'pointermove', this._onTouchMove);
+				off(document, 'dragover', nearestEmptyInsertDetectEvent);
+				off(document, 'mousemove', nearestEmptyInsertDetectEvent);
+				off(document, 'touchmove', nearestEmptyInsertDetectEvent);
+			},
+			_offUpEvents: function _offUpEvents() {
+				var ownerDocument = this.el.ownerDocument;
+				off(ownerDocument, 'mouseup', this._onDrop);
+				off(ownerDocument, 'touchend', this._onDrop);
+				off(ownerDocument, 'pointerup', this._onDrop);
+				off(ownerDocument, 'touchcancel', this._onDrop);
+				off(document, 'selectstart', this);
+			},
+			_onDrop: function _onDrop(
+				/**Event*/
+				evt) {
+				var el = this.el,
+					options = this.options; // Get the index of the dragged element within its parent
+
+				newIndex = index(dragEl);
+				newDraggableIndex = index(dragEl, options.draggable);
+				pluginEvent('drop', this, {
+					evt: evt
+				});
+				parentEl = dragEl && dragEl.parentNode; // Get again after plugin event
+
+				newIndex = index(dragEl);
+				newDraggableIndex = index(dragEl, options.draggable);
+
+				if (Sortable.eventCanceled) {
+					this._nulling();
+
+					return;
+				}
+
+				awaitingDragStarted = false;
+				isCircumstantialInvert = false;
+				pastFirstInvertThresh = false;
+				clearInterval(this._loopId);
+				clearTimeout(this._dragStartTimer);
+
+				_cancelNextTick(this.cloneId);
+
+				_cancelNextTick(this._dragStartId); // Unbind events
+
+
+				if (this.nativeDraggable) {
+					off(document, 'drop', this);
+					off(el, 'dragstart', this._onDragStart);
+				}
+
+				this._offMoveEvents();
+
+				this._offUpEvents();
+
+				if (Safari) {
+					css(document.body, 'user-select', '');
+				}
+
+				css(dragEl, 'transform', '');
+
+				if (evt) {
+					if (moved) {
+						evt.cancelable && evt.preventDefault();
+						!options.dropBubble && evt.stopPropagation();
+					}
+
+					ghostEl && ghostEl.parentNode && ghostEl.parentNode.removeChild(ghostEl);
+
+					if (rootEl === parentEl || putSortable && putSortable.lastPutMode !== 'clone') {
+						// Remove clone(s)
+						cloneEl && cloneEl.parentNode && cloneEl.parentNode.removeChild(cloneEl);
+					}
+
+					if (dragEl) {
+						if (this.nativeDraggable) {
+							off(dragEl, 'dragend', this);
+						}
+
+						_disableDraggable(dragEl);
+
+						dragEl.style['will-change'] = ''; // Remove classes
+						// ghostClass is added in dragStarted
+
+						if (moved && !awaitingDragStarted) {
+							toggleClass(dragEl, putSortable ? putSortable.options.ghostClass : this.options.ghostClass, false);
+						}
+
+						toggleClass(dragEl, this.options.chosenClass, false); // Drag stop event
+
+						_dispatchEvent({
+							sortable: this,
+							name: 'unchoose',
+							toEl: parentEl,
+							newIndex: null,
+							newDraggableIndex: null,
+							originalEvent: evt
+						});
+
+						if (rootEl !== parentEl) {
+							if (newIndex >= 0) {
+								// Add event
+								_dispatchEvent({
+									rootEl: parentEl,
+									name: 'add',
+									toEl: parentEl,
+									fromEl: rootEl,
+									originalEvent: evt
+								}); // Remove event
+
+
+								_dispatchEvent({
+									sortable: this,
+									name: 'remove',
+									toEl: parentEl,
+									originalEvent: evt
+								}); // drag from one list and drop into another
+
+
+								_dispatchEvent({
+									rootEl: parentEl,
+									name: 'sort',
+									toEl: parentEl,
+									fromEl: rootEl,
+									originalEvent: evt
+								});
+
+								_dispatchEvent({
+									sortable: this,
+									name: 'sort',
+									toEl: parentEl,
+									originalEvent: evt
+								});
+							}
+
+							putSortable && putSortable.save();
+						} else {
+							if (newIndex !== oldIndex) {
+								if (newIndex >= 0) {
+									// drag & drop within the same list
+									_dispatchEvent({
+										sortable: this,
+										name: 'update',
+										toEl: parentEl,
+										originalEvent: evt
+									});
+
+									_dispatchEvent({
+										sortable: this,
+										name: 'sort',
+										toEl: parentEl,
+										originalEvent: evt
+									});
+								}
+							}
+						}
+
+						if (Sortable.active) {
+							/* jshint eqnull:true */
+							if (newIndex == null || newIndex === -1) {
+								newIndex = oldIndex;
+								newDraggableIndex = oldDraggableIndex;
+							}
+
+							_dispatchEvent({
+								sortable: this,
+								name: 'end',
+								toEl: parentEl,
+								originalEvent: evt
+							}); // Save sorting
+
+
+							this.save();
+						}
+					}
+				}
+
+				this._nulling();
+			},
+			_nulling: function _nulling() {
+				pluginEvent('nulling', this);
+				rootEl = dragEl = parentEl = ghostEl = nextEl = cloneEl = lastDownEl = cloneHidden = tapEvt = touchEvt = moved = newIndex = newDraggableIndex = oldIndex = oldDraggableIndex = lastTarget = lastDirection = putSortable = activeGroup = Sortable.dragged = Sortable.ghost = Sortable.clone = Sortable.active = null;
+				savedInputChecked.forEach(function (el) {
+					el.checked = true;
+				});
+				savedInputChecked.length = lastDx = lastDy = 0;
+			},
+			handleEvent: function handleEvent(
+				/**Event*/
+				evt) {
+				switch (evt.type) {
+					case 'drop':
+					case 'dragend':
+						this._onDrop(evt);
+
+						break;
+
+					case 'dragenter':
+					case 'dragover':
+						if (dragEl) {
+							this._onDragOver(evt);
+
+							_globalDragOver(evt);
+						}
+
+						break;
+
+					case 'selectstart':
+						evt.preventDefault();
+						break;
+				}
+			},
+
+			/**
+			 * Serializes the item into an array of string.
+			 * @returns {String[]}
+			 */
+			toArray: function toArray() {
+				var order = [],
+					el,
+					children = this.el.children,
+					i = 0,
+					n = children.length,
+					options = this.options;
+
+				for (; i < n; i++) {
+					el = children[i];
+
+					if (closest(el, options.draggable, this.el, false)) {
+						order.push(el.getAttribute(options.dataIdAttr) || _generateId(el));
+					}
+				}
+
+				return order;
+			},
+
+			/**
+			 * Sorts the elements according to the array.
+			 * @param  {String[]}  order  order of the items
+			 */
+			sort: function sort(order, useAnimation) {
+				var items = {},
+					rootEl = this.el;
+				this.toArray().forEach(function (id, i) {
+					var el = rootEl.children[i];
+
+					if (closest(el, this.options.draggable, rootEl, false)) {
+						items[id] = el;
+					}
+				}, this);
+				useAnimation && this.captureAnimationState();
+				order.forEach(function (id) {
+					if (items[id]) {
+						rootEl.removeChild(items[id]);
+						rootEl.appendChild(items[id]);
+					}
+				});
+				useAnimation && this.animateAll();
+			},
+
+			/**
+			 * Save the current sorting
+			 */
+			save: function save() {
+				var store = this.options.store;
+				store && store.set && store.set(this);
+			},
+
+			/**
+			 * For each element in the set, get the first element that matches the selector by testing the element itself and traversing up through its ancestors in the DOM tree.
+			 * @param   {HTMLElement}  el
+			 * @param   {String}       [selector]  default: `options.draggable`
+			 * @returns {HTMLElement|null}
+			 */
+			closest: function closest$1(el, selector) {
+				return closest(el, selector || this.options.draggable, this.el, false);
+			},
+
+			/**
+			 * Set/get option
+			 * @param   {string} name
+			 * @param   {*}      [value]
+			 * @returns {*}
+			 */
+			option: function option(name, value) {
+				var options = this.options;
+
+				if (value === void 0) {
+					return options[name];
+				} else {
+					var modifiedValue = PluginManager.modifyOption(this, name, value);
+
+					if (typeof modifiedValue !== 'undefined') {
+						options[name] = modifiedValue;
+					} else {
+						options[name] = value;
+					}
+
+					if (name === 'group') {
+						_prepareGroup(options);
+					}
+				}
+			},
+
+			/**
+			 * Destroy
+			 */
+			destroy: function destroy() {
+				pluginEvent('destroy', this);
+				var el = this.el;
+				el[expando] = null;
+				off(el, 'mousedown', this._onTapStart);
+				off(el, 'touchstart', this._onTapStart);
+				off(el, 'pointerdown', this._onTapStart);
+
+				if (this.nativeDraggable) {
+					off(el, 'dragover', this);
+					off(el, 'dragenter', this);
+				} // Remove draggable attributes
+
+
+				Array.prototype.forEach.call(el.querySelectorAll('[draggable]'), function (el) {
+					el.removeAttribute('draggable');
+				});
+
+				this._onDrop();
+
+				this._disableDelayedDragEvents();
+
+				sortables.splice(sortables.indexOf(this.el), 1);
+				this.el = el = null;
+			},
+			_hideClone: function _hideClone() {
+				if (!cloneHidden) {
+					pluginEvent('hideClone', this);
+					if (Sortable.eventCanceled) return;
+					css(cloneEl, 'display', 'none');
+
+					if (this.options.removeCloneOnHide && cloneEl.parentNode) {
+						cloneEl.parentNode.removeChild(cloneEl);
+					}
+
+					cloneHidden = true;
+				}
+			},
+			_showClone: function _showClone(putSortable) {
+				if (putSortable.lastPutMode !== 'clone') {
+					this._hideClone();
+
+					return;
+				}
+
+				if (cloneHidden) {
+					pluginEvent('showClone', this);
+					if (Sortable.eventCanceled) return; // show clone at dragEl or original position
+
+					if (dragEl.parentNode == rootEl && !this.options.group.revertClone) {
+						rootEl.insertBefore(cloneEl, dragEl);
+					} else if (nextEl) {
+						rootEl.insertBefore(cloneEl, nextEl);
+					} else {
+						rootEl.appendChild(cloneEl);
+					}
+
+					if (this.options.group.revertClone) {
+						this.animate(dragEl, cloneEl);
+					}
+
+					css(cloneEl, 'display', '');
+					cloneHidden = false;
+				}
+			}
+		};
+
+	function _globalDragOver(
+		/**Event*/
+		evt) {
+		if (evt.dataTransfer) {
+			evt.dataTransfer.dropEffect = 'move';
+		}
+
+		evt.cancelable && evt.preventDefault();
+	}
+
+	function _onMove(fromEl, toEl, dragEl, dragRect, targetEl, targetRect, originalEvent, willInsertAfter) {
+		var evt,
+			sortable = fromEl[expando],
+			onMoveFn = sortable.options.onMove,
+			retVal; // Support for new CustomEvent feature
+
+		if (window.CustomEvent && !IE11OrLess && !Edge) {
+			evt = new CustomEvent('move', {
+				bubbles: true,
+				cancelable: true
+			});
+		} else {
+			evt = document.createEvent('Event');
+			evt.initEvent('move', true, true);
+		}
+
+		evt.to = toEl;
+		evt.from = fromEl;
+		evt.dragged = dragEl;
+		evt.draggedRect = dragRect;
+		evt.related = targetEl || toEl;
+		evt.relatedRect = targetRect || getRect(toEl);
+		evt.willInsertAfter = willInsertAfter;
+		evt.originalEvent = originalEvent;
+		fromEl.dispatchEvent(evt);
+
+		if (onMoveFn) {
+			retVal = onMoveFn.call(sortable, evt, originalEvent);
+		}
+
+		return retVal;
+	}
+
+	function _disableDraggable(el) {
+		el.draggable = false;
+	}
+
+	function _unsilent() {
+		_silent = false;
+	}
+
+	function _ghostIsFirst(evt, vertical, sortable) {
+		var rect = getRect(getChild(sortable.el, 0, sortable.options, true));
+		var spacer = 10;
+		return vertical ? evt.clientX < rect.left - spacer || evt.clientY < rect.top && evt.clientX < rect.right : evt.clientY < rect.top - spacer || evt.clientY < rect.bottom && evt.clientX < rect.left;
+	}
+
+	function _ghostIsLast(evt, vertical, sortable) {
+		var rect = getRect(lastChild(sortable.el, sortable.options.draggable));
+		var spacer = 10;
+		return vertical ? evt.clientX > rect.right + spacer || evt.clientX <= rect.right && evt.clientY > rect.bottom && evt.clientX >= rect.left : evt.clientX > rect.right && evt.clientY > rect.top || evt.clientX <= rect.right && evt.clientY > rect.bottom + spacer;
+	}
+
+	function _getSwapDirection(evt, target, targetRect, vertical, swapThreshold, invertedSwapThreshold, invertSwap, isLastTarget) {
+		var mouseOnAxis = vertical ? evt.clientY : evt.clientX,
+			targetLength = vertical ? targetRect.height : targetRect.width,
+			targetS1 = vertical ? targetRect.top : targetRect.left,
+			targetS2 = vertical ? targetRect.bottom : targetRect.right,
+			invert = false;
+
+		if (!invertSwap) {
+			// Never invert or create dragEl shadow when target movemenet causes mouse to move past the end of regular swapThreshold
+			if (isLastTarget && targetMoveDistance < targetLength * swapThreshold) {
+				// multiplied only by swapThreshold because mouse will already be inside target by (1 - threshold) * targetLength / 2
+				// check if past first invert threshold on side opposite of lastDirection
+				if (!pastFirstInvertThresh && (lastDirection === 1 ? mouseOnAxis > targetS1 + targetLength * invertedSwapThreshold / 2 : mouseOnAxis < targetS2 - targetLength * invertedSwapThreshold / 2)) {
+					// past first invert threshold, do not restrict inverted threshold to dragEl shadow
+					pastFirstInvertThresh = true;
+				}
+
+				if (!pastFirstInvertThresh) {
+					// dragEl shadow (target move distance shadow)
+					if (lastDirection === 1 ? mouseOnAxis < targetS1 + targetMoveDistance // over dragEl shadow
+						: mouseOnAxis > targetS2 - targetMoveDistance) {
+						return -lastDirection;
+					}
+				} else {
+					invert = true;
+				}
+			} else {
+				// Regular
+				if (mouseOnAxis > targetS1 + targetLength * (1 - swapThreshold) / 2 && mouseOnAxis < targetS2 - targetLength * (1 - swapThreshold) / 2) {
+					return _getInsertDirection(target);
+				}
+			}
+		}
+
+		invert = invert || invertSwap;
+
+		if (invert) {
+			// Invert of regular
+			if (mouseOnAxis < targetS1 + targetLength * invertedSwapThreshold / 2 || mouseOnAxis > targetS2 - targetLength * invertedSwapThreshold / 2) {
+				return mouseOnAxis > targetS1 + targetLength / 2 ? 1 : -1;
+			}
+		}
+
+		return 0;
+	}
+
+	/**
+	 * Gets the direction dragEl must be swapped relative to target in order to make it
+	 * seem that dragEl has been "inserted" into that element's position
+	 * @param  {HTMLElement} target       The target whose position dragEl is being inserted at
+	 * @return {Number}                   Direction dragEl must be swapped
+	 */
+
+
+	function _getInsertDirection(target) {
+		if (index(dragEl) < index(target)) {
+			return 1;
+		} else {
+			return -1;
+		}
+	}
+
+	/**
+	 * Generate id
+	 * @param   {HTMLElement} el
+	 * @returns {String}
+	 * @private
+	 */
+
+
+	function _generateId(el) {
+		var str = el.tagName + el.className + el.src + el.href + el.textContent,
+			i = str.length,
+			sum = 0;
+
+		while (i--) {
+			sum += str.charCodeAt(i);
+		}
+
+		return sum.toString(36);
+	}
+
+	function _saveInputCheckedState(root) {
+		savedInputChecked.length = 0;
+		var inputs = root.getElementsByTagName('input');
+		var idx = inputs.length;
+
+		while (idx--) {
+			var el = inputs[idx];
+			el.checked && savedInputChecked.push(el);
+		}
+	}
+
+	function _nextTick(fn) {
+		return setTimeout(fn, 0);
+	}
+
+	function _cancelNextTick(id) {
+		return clearTimeout(id);
+	} // Fixed #973:
+
+
+	if (documentExists) {
+		on(document, 'touchmove', function (evt) {
+			if ((Sortable.active || awaitingDragStarted) && evt.cancelable) {
+				evt.preventDefault();
+			}
+		});
+	} // Export utils
+
+
+	Sortable.utils = {
+		on: on,
+		off: off,
+		css: css,
+		find: find,
+		is: function is(el, selector) {
+			return !!closest(el, selector, el, false);
+		},
+		extend: extend,
+		throttle: throttle,
+		closest: closest,
+		toggleClass: toggleClass,
+		clone: clone,
+		index: index,
+		nextTick: _nextTick,
+		cancelNextTick: _cancelNextTick,
+		detectDirection: _detectDirection,
+		getChild: getChild
+	};
+	/**
+	 * Get the Sortable instance of an element
+	 * @param  {HTMLElement} element The element
+	 * @return {Sortable|undefined}         The instance of Sortable
+	 */
+
+	Sortable.get = function (element) {
+		return element[expando];
+	};
+	/**
+	 * Mount a plugin to Sortable
+	 * @param  {...SortablePlugin|SortablePlugin[]} plugins       Plugins being mounted
+	 */
+
+
+	Sortable.mount = function () {
+		for (var _len = arguments.length, plugins = new Array(_len), _key = 0; _key < _len; _key++) {
+			plugins[_key] = arguments[_key];
+		}
+
+		if (plugins[0].constructor === Array) plugins = plugins[0];
+		plugins.forEach(function (plugin) {
+			if (!plugin.prototype || !plugin.prototype.constructor) {
+				throw "Sortable: Mounted plugin must be a constructor function, not ".concat({}.toString.call(plugin));
+			}
+
+			if (plugin.utils) Sortable.utils = _objectSpread2(_objectSpread2({}, Sortable.utils), plugin.utils);
+			PluginManager.mount(plugin);
+		});
+	};
+	/**
+	 * Create sortable instance
+	 * @param {HTMLElement}  el
+	 * @param {Object}      [options]
+	 */
+
+
+	Sortable.create = function (el, options) {
+		return new Sortable(el, options);
+	}; // Export
+
+
+	Sortable.version = version;
+
+	var autoScrolls = [],
+		scrollEl,
+		scrollRootEl,
+		scrolling = false,
+		lastAutoScrollX,
+		lastAutoScrollY,
+		touchEvt$1,
+		pointerElemChangedInterval;
+
+	function AutoScrollPlugin() {
+		function AutoScroll() {
+			this.defaults = {
+				scroll: true,
+				forceAutoScrollFallback: false,
+				scrollSensitivity: 30,
+				scrollSpeed: 10,
+				bubbleScroll: true
+			}; // Bind all private methods
+
+			for (var fn in this) {
+				if (fn.charAt(0) === '_' && typeof this[fn] === 'function') {
+					this[fn] = this[fn].bind(this);
+				}
+			}
+		}
+
+		AutoScroll.prototype = {
+			dragStarted: function dragStarted(_ref) {
+				var originalEvent = _ref.originalEvent;
+
+				if (this.sortable.nativeDraggable) {
+					on(document, 'dragover', this._handleAutoScroll);
+				} else {
+					if (this.options.supportPointer) {
+						on(document, 'pointermove', this._handleFallbackAutoScroll);
+					} else if (originalEvent.touches) {
+						on(document, 'touchmove', this._handleFallbackAutoScroll);
+					} else {
+						on(document, 'mousemove', this._handleFallbackAutoScroll);
+					}
+				}
+			},
+			dragOverCompleted: function dragOverCompleted(_ref2) {
+				var originalEvent = _ref2.originalEvent;
+
+				// For when bubbling is canceled and using fallback (fallback 'touchmove' always reached)
+				if (!this.options.dragOverBubble && !originalEvent.rootEl) {
+					this._handleAutoScroll(originalEvent);
+				}
+			},
+			drop: function drop() {
+				if (this.sortable.nativeDraggable) {
+					off(document, 'dragover', this._handleAutoScroll);
+				} else {
+					off(document, 'pointermove', this._handleFallbackAutoScroll);
+					off(document, 'touchmove', this._handleFallbackAutoScroll);
+					off(document, 'mousemove', this._handleFallbackAutoScroll);
+				}
+
+				clearPointerElemChangedInterval();
+				clearAutoScrolls();
+				cancelThrottle();
+			},
+			nulling: function nulling() {
+				touchEvt$1 = scrollRootEl = scrollEl = scrolling = pointerElemChangedInterval = lastAutoScrollX = lastAutoScrollY = null;
+				autoScrolls.length = 0;
+			},
+			_handleFallbackAutoScroll: function _handleFallbackAutoScroll(evt) {
+				this._handleAutoScroll(evt, true);
+			},
+			_handleAutoScroll: function _handleAutoScroll(evt, fallback) {
+				var _this = this;
+
+				var x = (evt.touches ? evt.touches[0] : evt).clientX,
+					y = (evt.touches ? evt.touches[0] : evt).clientY,
+					elem = document.elementFromPoint(x, y);
+				touchEvt$1 = evt; // IE does not seem to have native autoscroll,
+				// Edge's autoscroll seems too conditional,
+				// MACOS Safari does not have autoscroll,
+				// Firefox and Chrome are good
+
+				if (fallback || this.options.forceAutoScrollFallback || Edge || IE11OrLess || Safari) {
+					autoScroll(evt, this.options, elem, fallback); // Listener for pointer element change
+
+					var ogElemScroller = getParentAutoScrollElement(elem, true);
+
+					if (scrolling && (!pointerElemChangedInterval || x !== lastAutoScrollX || y !== lastAutoScrollY)) {
+						pointerElemChangedInterval && clearPointerElemChangedInterval(); // Detect for pointer elem change, emulating native DnD behaviour
+
+						pointerElemChangedInterval = setInterval(function () {
+							var newElem = getParentAutoScrollElement(document.elementFromPoint(x, y), true);
+
+							if (newElem !== ogElemScroller) {
+								ogElemScroller = newElem;
+								clearAutoScrolls();
+							}
+
+							autoScroll(evt, _this.options, newElem, fallback);
+						}, 10);
+						lastAutoScrollX = x;
+						lastAutoScrollY = y;
+					}
+				} else {
+					// if DnD is enabled (and browser has good autoscrolling), first autoscroll will already scroll, so get parent autoscroll of first autoscroll
+					if (!this.options.bubbleScroll || getParentAutoScrollElement(elem, true) === getWindowScrollingElement()) {
+						clearAutoScrolls();
+						return;
+					}
+
+					autoScroll(evt, this.options, getParentAutoScrollElement(elem, false), false);
+				}
+			}
+		};
+		return _extends(AutoScroll, {
+			pluginName: 'scroll',
+			initializeByDefault: true
+		});
+	}
+
+	function clearAutoScrolls() {
+		autoScrolls.forEach(function (autoScroll) {
+			clearInterval(autoScroll.pid);
+		});
+		autoScrolls = [];
+	}
+
+	function clearPointerElemChangedInterval() {
+		clearInterval(pointerElemChangedInterval);
+	}
+
+	var autoScroll = throttle(function (evt, options, rootEl, isFallback) {
+		// Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=505521
+		if (!options.scroll) return;
+		var x = (evt.touches ? evt.touches[0] : evt).clientX,
+			y = (evt.touches ? evt.touches[0] : evt).clientY,
+			sens = options.scrollSensitivity,
+			speed = options.scrollSpeed,
+			winScroller = getWindowScrollingElement();
+		var scrollThisInstance = false,
+			scrollCustomFn; // New scroll root, set scrollEl
+
+		if (scrollRootEl !== rootEl) {
+			scrollRootEl = rootEl;
+			clearAutoScrolls();
+			scrollEl = options.scroll;
+			scrollCustomFn = options.scrollFn;
+
+			if (scrollEl === true) {
+				scrollEl = getParentAutoScrollElement(rootEl, true);
+			}
+		}
+
+		var layersOut = 0;
+		var currentParent = scrollEl;
+
+		do {
+			var el = currentParent,
+				rect = getRect(el),
+				top = rect.top,
+				bottom = rect.bottom,
+				left = rect.left,
+				right = rect.right,
+				width = rect.width,
+				height = rect.height,
+				canScrollX = void 0,
+				canScrollY = void 0,
+				scrollWidth = el.scrollWidth,
+				scrollHeight = el.scrollHeight,
+				elCSS = css(el),
+				scrollPosX = el.scrollLeft,
+				scrollPosY = el.scrollTop;
+
+			if (el === winScroller) {
+				canScrollX = width < scrollWidth && (elCSS.overflowX === 'auto' || elCSS.overflowX === 'scroll' || elCSS.overflowX === 'visible');
+				canScrollY = height < scrollHeight && (elCSS.overflowY === 'auto' || elCSS.overflowY === 'scroll' || elCSS.overflowY === 'visible');
+			} else {
+				canScrollX = width < scrollWidth && (elCSS.overflowX === 'auto' || elCSS.overflowX === 'scroll');
+				canScrollY = height < scrollHeight && (elCSS.overflowY === 'auto' || elCSS.overflowY === 'scroll');
+			}
+
+			var vx = canScrollX && (Math.abs(right - x) <= sens && scrollPosX + width < scrollWidth) - (Math.abs(left - x) <= sens && !!scrollPosX);
+			var vy = canScrollY && (Math.abs(bottom - y) <= sens && scrollPosY + height < scrollHeight) - (Math.abs(top - y) <= sens && !!scrollPosY);
+
+			if (!autoScrolls[layersOut]) {
+				for (var i = 0; i <= layersOut; i++) {
+					if (!autoScrolls[i]) {
+						autoScrolls[i] = {};
+					}
+				}
+			}
+
+			if (autoScrolls[layersOut].vx != vx || autoScrolls[layersOut].vy != vy || autoScrolls[layersOut].el !== el) {
+				autoScrolls[layersOut].el = el;
+				autoScrolls[layersOut].vx = vx;
+				autoScrolls[layersOut].vy = vy;
+				clearInterval(autoScrolls[layersOut].pid);
+
+				if (vx != 0 || vy != 0) {
+					scrollThisInstance = true;
+					/* jshint loopfunc:true */
+
+					autoScrolls[layersOut].pid = setInterval(function () {
+						// emulate drag over during autoscroll (fallback), emulating native DnD behaviour
+						if (isFallback && this.layer === 0) {
+							Sortable.active._onTouchMove(touchEvt$1); // To move ghost if it is positioned absolutely
+
+						}
+
+						var scrollOffsetY = autoScrolls[this.layer].vy ? autoScrolls[this.layer].vy * speed : 0;
+						var scrollOffsetX = autoScrolls[this.layer].vx ? autoScrolls[this.layer].vx * speed : 0;
+
+						if (typeof scrollCustomFn === 'function') {
+							if (scrollCustomFn.call(Sortable.dragged.parentNode[expando], scrollOffsetX, scrollOffsetY, evt, touchEvt$1, autoScrolls[this.layer].el) !== 'continue') {
+								return;
+							}
+						}
+
+						scrollBy(autoScrolls[this.layer].el, scrollOffsetX, scrollOffsetY);
+					}.bind({
+						layer: layersOut
+					}), 24);
+				}
+			}
+
+			layersOut++;
+		} while (options.bubbleScroll && currentParent !== winScroller && (currentParent = getParentAutoScrollElement(currentParent, false)));
+
+		scrolling = scrollThisInstance; // in case another function catches scrolling as false in between when it is not
+	}, 30);
+
+	var drop = function drop(_ref) {
+		var originalEvent = _ref.originalEvent,
+			putSortable = _ref.putSortable,
+			dragEl = _ref.dragEl,
+			activeSortable = _ref.activeSortable,
+			dispatchSortableEvent = _ref.dispatchSortableEvent,
+			hideGhostForTarget = _ref.hideGhostForTarget,
+			unhideGhostForTarget = _ref.unhideGhostForTarget;
+		if (!originalEvent) return;
+		var toSortable = putSortable || activeSortable;
+		hideGhostForTarget();
+		var touch = originalEvent.changedTouches && originalEvent.changedTouches.length ? originalEvent.changedTouches[0] : originalEvent;
+		var target = document.elementFromPoint(touch.clientX, touch.clientY);
+		unhideGhostForTarget();
+
+		if (toSortable && !toSortable.el.contains(target)) {
+			dispatchSortableEvent('spill');
+			this.onSpill({
+				dragEl: dragEl,
+				putSortable: putSortable
+			});
+		}
+	};
+
+	function Revert() {
+	}
+
+	Revert.prototype = {
+		startIndex: null,
+		dragStart: function dragStart(_ref2) {
+			var oldDraggableIndex = _ref2.oldDraggableIndex;
+			this.startIndex = oldDraggableIndex;
+		},
+		onSpill: function onSpill(_ref3) {
+			var dragEl = _ref3.dragEl,
+				putSortable = _ref3.putSortable;
+			this.sortable.captureAnimationState();
+
+			if (putSortable) {
+				putSortable.captureAnimationState();
+			}
+
+			var nextSibling = getChild(this.sortable.el, this.startIndex, this.options);
+
+			if (nextSibling) {
+				this.sortable.el.insertBefore(dragEl, nextSibling);
+			} else {
+				this.sortable.el.appendChild(dragEl);
+			}
+
+			this.sortable.animateAll();
+
+			if (putSortable) {
+				putSortable.animateAll();
+			}
+		},
+		drop: drop
+	};
+
+	_extends(Revert, {
+		pluginName: 'revertOnSpill'
+	});
+
+	function Remove() {
+	}
+
+	Remove.prototype = {
+		onSpill: function onSpill(_ref4) {
+			var dragEl = _ref4.dragEl,
+				putSortable = _ref4.putSortable;
+			var parentSortable = putSortable || this.sortable;
+			parentSortable.captureAnimationState();
+			dragEl.parentNode && dragEl.parentNode.removeChild(dragEl);
+			parentSortable.animateAll();
+		},
+		drop: drop
+	};
+
+	_extends(Remove, {
+		pluginName: 'removeOnSpill'
+	});
+
+	var lastSwapEl;
+
+	function SwapPlugin() {
+		function Swap() {
+			this.defaults = {
+				swapClass: 'sortable-swap-highlight'
+			};
+		}
+
+		Swap.prototype = {
+			dragStart: function dragStart(_ref) {
+				var dragEl = _ref.dragEl;
+				lastSwapEl = dragEl;
+			},
+			dragOverValid: function dragOverValid(_ref2) {
+				var completed = _ref2.completed,
+					target = _ref2.target,
+					onMove = _ref2.onMove,
+					activeSortable = _ref2.activeSortable,
+					changed = _ref2.changed,
+					cancel = _ref2.cancel;
+				if (!activeSortable.options.swap) return;
+				var el = this.sortable.el,
+					options = this.options;
+
+				if (target && target !== el) {
+					var prevSwapEl = lastSwapEl;
+
+					if (onMove(target) !== false) {
+						toggleClass(target, options.swapClass, true);
+						lastSwapEl = target;
+					} else {
+						lastSwapEl = null;
+					}
+
+					if (prevSwapEl && prevSwapEl !== lastSwapEl) {
+						toggleClass(prevSwapEl, options.swapClass, false);
+					}
+				}
+
+				changed();
+				completed(true);
+				cancel();
+			},
+			drop: function drop(_ref3) {
+				var activeSortable = _ref3.activeSortable,
+					putSortable = _ref3.putSortable,
+					dragEl = _ref3.dragEl;
+				var toSortable = putSortable || this.sortable;
+				var options = this.options;
+				lastSwapEl && toggleClass(lastSwapEl, options.swapClass, false);
+
+				if (lastSwapEl && (options.swap || putSortable && putSortable.options.swap)) {
+					if (dragEl !== lastSwapEl) {
+						toSortable.captureAnimationState();
+						if (toSortable !== activeSortable) activeSortable.captureAnimationState();
+						swapNodes(dragEl, lastSwapEl);
+						toSortable.animateAll();
+						if (toSortable !== activeSortable) activeSortable.animateAll();
+					}
+				}
+			},
+			nulling: function nulling() {
+				lastSwapEl = null;
+			}
+		};
+		return _extends(Swap, {
+			pluginName: 'swap',
+			eventProperties: function eventProperties() {
+				return {
+					swapItem: lastSwapEl
+				};
+			}
+		});
+	}
+
+	function swapNodes(n1, n2) {
+		var p1 = n1.parentNode,
+			p2 = n2.parentNode,
+			i1,
+			i2;
+		if (!p1 || !p2 || p1.isEqualNode(n2) || p2.isEqualNode(n1)) return;
+		i1 = index(n1);
+		i2 = index(n2);
+
+		if (p1.isEqualNode(p2) && i1 < i2) {
+			i2++;
+		}
+
+		p1.insertBefore(n2, p1.children[i1]);
+		p2.insertBefore(n1, p2.children[i2]);
+	}
+
+	var multiDragElements = [],
+		multiDragClones = [],
+		lastMultiDragSelect,
+		// for selection with modifier key down (SHIFT)
+		multiDragSortable,
+		initialFolding = false,
+		// Initial multi-drag fold when drag started
+		folding = false,
+		// Folding any other time
+		dragStarted = false,
+		dragEl$1,
+		clonesFromRect,
+		clonesHidden;
+
+	function MultiDragPlugin() {
+		function MultiDrag(sortable) {
+			// Bind all private methods
+			for (var fn in this) {
+				if (fn.charAt(0) === '_' && typeof this[fn] === 'function') {
+					this[fn] = this[fn].bind(this);
+				}
+			}
+
+			if (!sortable.options.avoidImplicitDeselect) {
+				if (sortable.options.supportPointer) {
+					on(document, 'pointerup', this._deselectMultiDrag);
+				} else {
+					on(document, 'mouseup', this._deselectMultiDrag);
+					on(document, 'touchend', this._deselectMultiDrag);
+				}
+			}
+
+			on(document, 'keydown', this._checkKeyDown);
+			on(document, 'keyup', this._checkKeyUp);
+			this.defaults = {
+				selectedClass: 'sortable-selected',
+				multiDragKey: null,
+				avoidImplicitDeselect: false,
+				setData: function setData(dataTransfer, dragEl) {
+					var data = '';
+
+					if (multiDragElements.length && multiDragSortable === sortable) {
+						multiDragElements.forEach(function (multiDragElement, i) {
+							data += (!i ? '' : ', ') + multiDragElement.textContent;
+						});
+					} else {
+						data = dragEl.textContent;
+					}
+
+					dataTransfer.setData('Text', data);
+				}
+			};
+		}
+
+		MultiDrag.prototype = {
+			multiDragKeyDown: false,
+			isMultiDrag: false,
+			delayStartGlobal: function delayStartGlobal(_ref) {
+				var dragged = _ref.dragEl;
+				dragEl$1 = dragged;
+			},
+			delayEnded: function delayEnded() {
+				this.isMultiDrag = ~multiDragElements.indexOf(dragEl$1);
+			},
+			setupClone: function setupClone(_ref2) {
+				var sortable = _ref2.sortable,
+					cancel = _ref2.cancel;
+				if (!this.isMultiDrag) return;
+
+				for (var i = 0; i < multiDragElements.length; i++) {
+					multiDragClones.push(clone(multiDragElements[i]));
+					multiDragClones[i].sortableIndex = multiDragElements[i].sortableIndex;
+					multiDragClones[i].draggable = false;
+					multiDragClones[i].style['will-change'] = '';
+					toggleClass(multiDragClones[i], this.options.selectedClass, false);
+					multiDragElements[i] === dragEl$1 && toggleClass(multiDragClones[i], this.options.chosenClass, false);
+				}
+
+				sortable._hideClone();
+
+				cancel();
+			},
+			clone: function clone(_ref3) {
+				var sortable = _ref3.sortable,
+					rootEl = _ref3.rootEl,
+					dispatchSortableEvent = _ref3.dispatchSortableEvent,
+					cancel = _ref3.cancel;
+				if (!this.isMultiDrag) return;
+
+				if (!this.options.removeCloneOnHide) {
+					if (multiDragElements.length && multiDragSortable === sortable) {
+						insertMultiDragClones(true, rootEl);
+						dispatchSortableEvent('clone');
+						cancel();
+					}
+				}
+			},
+			showClone: function showClone(_ref4) {
+				var cloneNowShown = _ref4.cloneNowShown,
+					rootEl = _ref4.rootEl,
+					cancel = _ref4.cancel;
+				if (!this.isMultiDrag) return;
+				insertMultiDragClones(false, rootEl);
+				multiDragClones.forEach(function (clone) {
+					css(clone, 'display', '');
+				});
+				cloneNowShown();
+				clonesHidden = false;
+				cancel();
+			},
+			hideClone: function hideClone(_ref5) {
+				var _this = this;
+
+				var sortable = _ref5.sortable,
+					cloneNowHidden = _ref5.cloneNowHidden,
+					cancel = _ref5.cancel;
+				if (!this.isMultiDrag) return;
+				multiDragClones.forEach(function (clone) {
+					css(clone, 'display', 'none');
+
+					if (_this.options.removeCloneOnHide && clone.parentNode) {
+						clone.parentNode.removeChild(clone);
+					}
+				});
+				cloneNowHidden();
+				clonesHidden = true;
+				cancel();
+			},
+			dragStartGlobal: function dragStartGlobal(_ref6) {
+				var sortable = _ref6.sortable;
+
+				if (!this.isMultiDrag && multiDragSortable) {
+					multiDragSortable.multiDrag._deselectMultiDrag();
+				}
+
+				multiDragElements.forEach(function (multiDragElement) {
+					multiDragElement.sortableIndex = index(multiDragElement);
+				}); // Sort multi-drag elements
+
+				multiDragElements = multiDragElements.sort(function (a, b) {
+					return a.sortableIndex - b.sortableIndex;
+				});
+				dragStarted = true;
+			},
+			dragStarted: function dragStarted(_ref7) {
+				var _this2 = this;
+
+				var sortable = _ref7.sortable;
+				if (!this.isMultiDrag) return;
+
+				if (this.options.sort) {
+					// Capture rects,
+					// hide multi drag elements (by positioning them absolute),
+					// set multi drag elements rects to dragRect,
+					// show multi drag elements,
+					// animate to rects,
+					// unset rects & remove from DOM
+					sortable.captureAnimationState();
+
+					if (this.options.animation) {
+						multiDragElements.forEach(function (multiDragElement) {
+							if (multiDragElement === dragEl$1) return;
+							css(multiDragElement, 'position', 'absolute');
+						});
+						var dragRect = getRect(dragEl$1, false, true, true);
+						multiDragElements.forEach(function (multiDragElement) {
+							if (multiDragElement === dragEl$1) return;
+							setRect(multiDragElement, dragRect);
+						});
+						folding = true;
+						initialFolding = true;
+					}
+				}
+
+				sortable.animateAll(function () {
+					folding = false;
+					initialFolding = false;
+
+					if (_this2.options.animation) {
+						multiDragElements.forEach(function (multiDragElement) {
+							unsetRect(multiDragElement);
+						});
+					} // Remove all auxiliary multidrag items from el, if sorting enabled
+
+
+					if (_this2.options.sort) {
+						removeMultiDragElements();
+					}
+				});
+			},
+			dragOver: function dragOver(_ref8) {
+				var target = _ref8.target,
+					completed = _ref8.completed,
+					cancel = _ref8.cancel;
+
+				if (folding && ~multiDragElements.indexOf(target)) {
+					completed(false);
+					cancel();
+				}
+			},
+			revert: function revert(_ref9) {
+				var fromSortable = _ref9.fromSortable,
+					rootEl = _ref9.rootEl,
+					sortable = _ref9.sortable,
+					dragRect = _ref9.dragRect;
+
+				if (multiDragElements.length > 1) {
+					// Setup unfold animation
+					multiDragElements.forEach(function (multiDragElement) {
+						sortable.addAnimationState({
+							target: multiDragElement,
+							rect: folding ? getRect(multiDragElement) : dragRect
+						});
+						unsetRect(multiDragElement);
+						multiDragElement.fromRect = dragRect;
+						fromSortable.removeAnimationState(multiDragElement);
+					});
+					folding = false;
+					insertMultiDragElements(!this.options.removeCloneOnHide, rootEl);
+				}
+			},
+			dragOverCompleted: function dragOverCompleted(_ref10) {
+				var sortable = _ref10.sortable,
+					isOwner = _ref10.isOwner,
+					insertion = _ref10.insertion,
+					activeSortable = _ref10.activeSortable,
+					parentEl = _ref10.parentEl,
+					putSortable = _ref10.putSortable;
+				var options = this.options;
+
+				if (insertion) {
+					// Clones must be hidden before folding animation to capture dragRectAbsolute properly
+					if (isOwner) {
+						activeSortable._hideClone();
+					}
+
+					initialFolding = false; // If leaving sort:false root, or already folding - Fold to new location
+
+					if (options.animation && multiDragElements.length > 1 && (folding || !isOwner && !activeSortable.options.sort && !putSortable)) {
+						// Fold: Set all multi drag elements's rects to dragEl's rect when multi-drag elements are invisible
+						var dragRectAbsolute = getRect(dragEl$1, false, true, true);
+						multiDragElements.forEach(function (multiDragElement) {
+							if (multiDragElement === dragEl$1) return;
+							setRect(multiDragElement, dragRectAbsolute); // Move element(s) to end of parentEl so that it does not interfere with multi-drag clones insertion if they are inserted
+							// while folding, and so that we can capture them again because old sortable will no longer be fromSortable
+
+							parentEl.appendChild(multiDragElement);
+						});
+						folding = true;
+					} // Clones must be shown (and check to remove multi drags) after folding when interfering multiDragElements are moved out
+
+
+					if (!isOwner) {
+						// Only remove if not folding (folding will remove them anyways)
+						if (!folding) {
+							removeMultiDragElements();
+						}
+
+						if (multiDragElements.length > 1) {
+							var clonesHiddenBefore = clonesHidden;
+
+							activeSortable._showClone(sortable); // Unfold animation for clones if showing from hidden
+
+
+							if (activeSortable.options.animation && !clonesHidden && clonesHiddenBefore) {
+								multiDragClones.forEach(function (clone) {
+									activeSortable.addAnimationState({
+										target: clone,
+										rect: clonesFromRect
+									});
+									clone.fromRect = clonesFromRect;
+									clone.thisAnimationDuration = null;
+								});
+							}
+						} else {
+							activeSortable._showClone(sortable);
+						}
+					}
+				}
+			},
+			dragOverAnimationCapture: function dragOverAnimationCapture(_ref11) {
+				var dragRect = _ref11.dragRect,
+					isOwner = _ref11.isOwner,
+					activeSortable = _ref11.activeSortable;
+				multiDragElements.forEach(function (multiDragElement) {
+					multiDragElement.thisAnimationDuration = null;
+				});
+
+				if (activeSortable.options.animation && !isOwner && activeSortable.multiDrag.isMultiDrag) {
+					clonesFromRect = _extends({}, dragRect);
+					var dragMatrix = matrix(dragEl$1, true);
+					clonesFromRect.top -= dragMatrix.f;
+					clonesFromRect.left -= dragMatrix.e;
+				}
+			},
+			dragOverAnimationComplete: function dragOverAnimationComplete() {
+				if (folding) {
+					folding = false;
+					removeMultiDragElements();
+				}
+			},
+			drop: function drop(_ref12) {
+				var evt = _ref12.originalEvent,
+					rootEl = _ref12.rootEl,
+					parentEl = _ref12.parentEl,
+					sortable = _ref12.sortable,
+					dispatchSortableEvent = _ref12.dispatchSortableEvent,
+					oldIndex = _ref12.oldIndex,
+					putSortable = _ref12.putSortable;
+				var toSortable = putSortable || this.sortable;
+				if (!evt) return;
+				var options = this.options,
+					children = parentEl.children; // Multi-drag selection
+
+				if (!dragStarted) {
+					if (options.multiDragKey && !this.multiDragKeyDown) {
+						this._deselectMultiDrag();
+					}
+
+					toggleClass(dragEl$1, options.selectedClass, !~multiDragElements.indexOf(dragEl$1));
+
+					if (!~multiDragElements.indexOf(dragEl$1)) {
+						multiDragElements.push(dragEl$1);
+						dispatchEvent({
+							sortable: sortable,
+							rootEl: rootEl,
+							name: 'select',
+							targetEl: dragEl$1,
+							originalEvent: evt
+						}); // Modifier activated, select from last to dragEl
+
+						if (evt.shiftKey && lastMultiDragSelect && sortable.el.contains(lastMultiDragSelect)) {
+							var lastIndex = index(lastMultiDragSelect),
+								currentIndex = index(dragEl$1);
+
+							if (~lastIndex && ~currentIndex && lastIndex !== currentIndex) {
+								// Must include lastMultiDragSelect (select it), in case modified selection from no selection
+								// (but previous selection existed)
+								var n, i;
+
+								if (currentIndex > lastIndex) {
+									i = lastIndex;
+									n = currentIndex;
+								} else {
+									i = currentIndex;
+									n = lastIndex + 1;
+								}
+
+								for (; i < n; i++) {
+									if (~multiDragElements.indexOf(children[i])) continue;
+									toggleClass(children[i], options.selectedClass, true);
+									multiDragElements.push(children[i]);
+									dispatchEvent({
+										sortable: sortable,
+										rootEl: rootEl,
+										name: 'select',
+										targetEl: children[i],
+										originalEvent: evt
+									});
+								}
+							}
+						} else {
+							lastMultiDragSelect = dragEl$1;
+						}
+
+						multiDragSortable = toSortable;
+					} else {
+						multiDragElements.splice(multiDragElements.indexOf(dragEl$1), 1);
+						lastMultiDragSelect = null;
+						dispatchEvent({
+							sortable: sortable,
+							rootEl: rootEl,
+							name: 'deselect',
+							targetEl: dragEl$1,
+							originalEvent: evt
+						});
+					}
+				} // Multi-drag drop
+
+
+				if (dragStarted && this.isMultiDrag) {
+					folding = false; // Do not "unfold" after around dragEl if reverted
+
+					if ((parentEl[expando].options.sort || parentEl !== rootEl) && multiDragElements.length > 1) {
+						var dragRect = getRect(dragEl$1),
+							multiDragIndex = index(dragEl$1, ':not(.' + this.options.selectedClass + ')');
+						if (!initialFolding && options.animation) dragEl$1.thisAnimationDuration = null;
+						toSortable.captureAnimationState();
+
+						if (!initialFolding) {
+							if (options.animation) {
+								dragEl$1.fromRect = dragRect;
+								multiDragElements.forEach(function (multiDragElement) {
+									multiDragElement.thisAnimationDuration = null;
+
+									if (multiDragElement !== dragEl$1) {
+										var rect = folding ? getRect(multiDragElement) : dragRect;
+										multiDragElement.fromRect = rect; // Prepare unfold animation
+
+										toSortable.addAnimationState({
+											target: multiDragElement,
+											rect: rect
+										});
+									}
+								});
+							} // Multi drag elements are not necessarily removed from the DOM on drop, so to reinsert
+							// properly they must all be removed
+
+
+							removeMultiDragElements();
+							multiDragElements.forEach(function (multiDragElement) {
+								if (children[multiDragIndex]) {
+									parentEl.insertBefore(multiDragElement, children[multiDragIndex]);
+								} else {
+									parentEl.appendChild(multiDragElement);
+								}
+
+								multiDragIndex++;
+							}); // If initial folding is done, the elements may have changed position because they are now
+							// unfolding around dragEl, even though dragEl may not have his index changed, so update event
+							// must be fired here as Sortable will not.
+
+							if (oldIndex === index(dragEl$1)) {
+								var update = false;
+								multiDragElements.forEach(function (multiDragElement) {
+									if (multiDragElement.sortableIndex !== index(multiDragElement)) {
+										update = true;
+										return;
+									}
+								});
+
+								if (update) {
+									dispatchSortableEvent('update');
+								}
+							}
+						} // Must be done after capturing individual rects (scroll bar)
+
+
+						multiDragElements.forEach(function (multiDragElement) {
+							unsetRect(multiDragElement);
+						});
+						toSortable.animateAll();
+					}
+
+					multiDragSortable = toSortable;
+				} // Remove clones if necessary
+
+
+				if (rootEl === parentEl || putSortable && putSortable.lastPutMode !== 'clone') {
+					multiDragClones.forEach(function (clone) {
+						clone.parentNode && clone.parentNode.removeChild(clone);
+					});
+				}
+			},
+			nullingGlobal: function nullingGlobal() {
+				this.isMultiDrag = dragStarted = false;
+				multiDragClones.length = 0;
+			},
+			destroyGlobal: function destroyGlobal() {
+				this._deselectMultiDrag();
+
+				off(document, 'pointerup', this._deselectMultiDrag);
+				off(document, 'mouseup', this._deselectMultiDrag);
+				off(document, 'touchend', this._deselectMultiDrag);
+				off(document, 'keydown', this._checkKeyDown);
+				off(document, 'keyup', this._checkKeyUp);
+			},
+			_deselectMultiDrag: function _deselectMultiDrag(evt) {
+				if (typeof dragStarted !== "undefined" && dragStarted) return; // Only deselect if selection is in this sortable
+
+				if (multiDragSortable !== this.sortable) return; // Only deselect if target is not item in this sortable
+
+				if (evt && closest(evt.target, this.options.draggable, this.sortable.el, false)) return; // Only deselect if left click
+
+				if (evt && evt.button !== 0) return;
+
+				while (multiDragElements.length) {
+					var el = multiDragElements[0];
+					toggleClass(el, this.options.selectedClass, false);
+					multiDragElements.shift();
+					dispatchEvent({
+						sortable: this.sortable,
+						rootEl: this.sortable.el,
+						name: 'deselect',
+						targetEl: el,
+						originalEvent: evt
+					});
+				}
+			},
+			_checkKeyDown: function _checkKeyDown(evt) {
+				if (evt.key === this.options.multiDragKey) {
+					this.multiDragKeyDown = true;
+				}
+			},
+			_checkKeyUp: function _checkKeyUp(evt) {
+				if (evt.key === this.options.multiDragKey) {
+					this.multiDragKeyDown = false;
+				}
+			}
+		};
+		return _extends(MultiDrag, {
+			// Static methods & properties
+			pluginName: 'multiDrag',
+			utils: {
+				/**
+				 * Selects the provided multi-drag item
+				 * @param  {HTMLElement} el    The element to be selected
+				 */
+				select: function select(el) {
+					var sortable = el.parentNode[expando];
+					if (!sortable || !sortable.options.multiDrag || ~multiDragElements.indexOf(el)) return;
+
+					if (multiDragSortable && multiDragSortable !== sortable) {
+						multiDragSortable.multiDrag._deselectMultiDrag();
+
+						multiDragSortable = sortable;
+					}
+
+					toggleClass(el, sortable.options.selectedClass, true);
+					multiDragElements.push(el);
+				},
+
+				/**
+				 * Deselects the provided multi-drag item
+				 * @param  {HTMLElement} el    The element to be deselected
+				 */
+				deselect: function deselect(el) {
+					var sortable = el.parentNode[expando],
+						index = multiDragElements.indexOf(el);
+					if (!sortable || !sortable.options.multiDrag || !~index) return;
+					toggleClass(el, sortable.options.selectedClass, false);
+					multiDragElements.splice(index, 1);
+				}
+			},
+			eventProperties: function eventProperties() {
+				var _this3 = this;
+
+				var oldIndicies = [],
+					newIndicies = [];
+				multiDragElements.forEach(function (multiDragElement) {
+					oldIndicies.push({
+						multiDragElement: multiDragElement,
+						index: multiDragElement.sortableIndex
+					}); // multiDragElements will already be sorted if folding
+
+					var newIndex;
+
+					if (folding && multiDragElement !== dragEl$1) {
+						newIndex = -1;
+					} else if (folding) {
+						newIndex = index(multiDragElement, ':not(.' + _this3.options.selectedClass + ')');
+					} else {
+						newIndex = index(multiDragElement);
+					}
+
+					newIndicies.push({
+						multiDragElement: multiDragElement,
+						index: newIndex
+					});
+				});
+				return {
+					items: _toConsumableArray(multiDragElements),
+					clones: [].concat(multiDragClones),
+					oldIndicies: oldIndicies,
+					newIndicies: newIndicies
+				};
+			},
+			optionListeners: {
+				multiDragKey: function multiDragKey(key) {
+					key = key.toLowerCase();
+
+					if (key === 'ctrl') {
+						key = 'Control';
+					} else if (key.length > 1) {
+						key = key.charAt(0).toUpperCase() + key.substr(1);
+					}
+
+					return key;
+				}
+			}
+		});
+	}
+
+	function insertMultiDragElements(clonesInserted, rootEl) {
+		multiDragElements.forEach(function (multiDragElement, i) {
+			var target = rootEl.children[multiDragElement.sortableIndex + (clonesInserted ? Number(i) : 0)];
+
+			if (target) {
+				rootEl.insertBefore(multiDragElement, target);
+			} else {
+				rootEl.appendChild(multiDragElement);
+			}
+		});
+	}
+
+	/**
+	 * Insert multi-drag clones
+	 * @param  {[Boolean]} elementsInserted  Whether the multi-drag elements are inserted
+	 * @param  {HTMLElement} rootEl
+	 */
+
+
+	function insertMultiDragClones(elementsInserted, rootEl) {
+		multiDragClones.forEach(function (clone, i) {
+			var target = rootEl.children[clone.sortableIndex + (elementsInserted ? Number(i) : 0)];
+
+			if (target) {
+				rootEl.insertBefore(clone, target);
+			} else {
+				rootEl.appendChild(clone);
+			}
+		});
+	}
+
+	function removeMultiDragElements() {
+		multiDragElements.forEach(function (multiDragElement) {
+			if (multiDragElement === dragEl$1) return;
+			multiDragElement.parentNode && multiDragElement.parentNode.removeChild(multiDragElement);
+		});
+	}
+
+	Sortable.mount(new AutoScrollPlugin());
+	Sortable.mount(Remove, Revert);
+
+	Sortable.mount(new SwapPlugin());
+	Sortable.mount(new MultiDragPlugin());
+
+	return Sortable;
 
 })));
diff --git a/len-sys/src/main/resources/plugin/tools/main.js b/len-sys/src/main/resources/plugin/tools/main.js
index 767d138..bfc5e3c 100644
--- a/len-sys/src/main/resources/plugin/tools/main.js
+++ b/len-sys/src/main/resources/plugin/tools/main.js
@@ -6,50 +6,50 @@
 var message, table;
 window.cLayuiTable = {};
 layui.config({
-    base: 'plugin/build/js/',
-    version: '1.0.1'
+	base: 'plugin/build/js/',
+	version: '1.0.1'
 }).use(['tab', 'app', 'message', 'dashboard'], function () {
 
-    var app = layui.app,
-        $ = layui.jquery,
-        dashboard = layui.dashboard;
-    //将message设置为全局以便子页面调用
-    message = layui.message;
-    //主入口
-    app.set({
-        type: 'page'
-    }).init();
+	var app = layui.app,
+		$ = layui.jquery,
+		dashboard = layui.dashboard;
+	//将message设置为全局以便子页面调用
+	message = layui.message;
+	//主入口
+	app.set({
+		type: 'page'
+	}).init();
 
-    $('dl.skin > dd').on('click', function () {
-        var $that = $(this);
-        var skin = $that.children('a').data('skin');
-        switchSkin(skin);
-    });
+	$('dl.skin > dd').on('click', function () {
+		var $that = $(this);
+		var skin = $that.children('a').data('skin');
+		switchSkin(skin);
+	});
 
-    var setSkin = function (value) {
-            layui.data('kit_skin', {
-                key: 'skin',
-                value: value
-            });
-        },
-        getSkinName = function () {
-            return layui.data('kit_skin').skin;
-        },
-        switchSkin = function (value) {
-            var _target = $('link[kit-skin]')[0];
-            _target.href = _target.href.substring(0, _target.href.lastIndexOf('/') + 1) + value + _target.href.substring(_target.href.lastIndexOf('.'));
-            setSkin(value);
-        },
-        initSkin = function () {
-            var skin = getSkinName();
-            switchSkin(skin === undefined ? 'default' : skin);
-        }();
-    /**
-     * 面板初始化
-     */
-    dashboard.init();
+	var setSkin = function (value) {
+			layui.data('kit_skin', {
+				key: 'skin',
+				value: value
+			});
+		},
+		getSkinName = function () {
+			return layui.data('kit_skin').skin;
+		},
+		switchSkin = function (value) {
+			var _target = $('link[kit-skin]')[0];
+			_target.href = _target.href.substring(0, _target.href.lastIndexOf('/') + 1) + value + _target.href.substring(_target.href.lastIndexOf('.'));
+			setSkin(value);
+		},
+		initSkin = function () {
+			var skin = getSkinName();
+			switchSkin(skin === undefined ? 'default' : skin);
+		}();
+	/**
+	 * 面板初始化
+	 */
+	dashboard.init();
 });
 
 function getId() {
-    return window.layId;
-}
\ No newline at end of file
+	return window.layId;
+}
diff --git a/len-sys/src/main/resources/plugin/tools/moment.js b/len-sys/src/main/resources/plugin/tools/moment.js
index 1b12971..75e862e 100644
--- a/len-sys/src/main/resources/plugin/tools/moment.js
+++ b/len-sys/src/main/resources/plugin/tools/moment.js
@@ -1,4602 +1,4639 @@
 //! moment.js
 
 ;(function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
-    typeof define === 'function' && define.amd ? define(factory) :
-    global.moment = factory()
-}(this, (function () { 'use strict';
-
-    var hookCallback;
-
-    function hooks () {
-        return hookCallback.apply(null, arguments);
-    }
-
-    // This is done to register the method called with moment()
-    // without creating circular dependencies.
-    function setHookCallback (callback) {
-        hookCallback = callback;
-    }
-
-    function isArray(input) {
-        return input instanceof Array || Object.prototype.toString.call(input) === '[object Array]';
-    }
-
-    function isObject(input) {
-        // IE8 will treat undefined and null as object if it wasn't for
-        // input != null
-        return input != null && Object.prototype.toString.call(input) === '[object Object]';
-    }
-
-    function isObjectEmpty(obj) {
-        if (Object.getOwnPropertyNames) {
-            return (Object.getOwnPropertyNames(obj).length === 0);
-        } else {
-            var k;
-            for (k in obj) {
-                if (obj.hasOwnProperty(k)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    }
-
-    function isUndefined(input) {
-        return input === void 0;
-    }
-
-    function isNumber(input) {
-        return typeof input === 'number' || Object.prototype.toString.call(input) === '[object Number]';
-    }
-
-    function isDate(input) {
-        return input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';
-    }
-
-    function map(arr, fn) {
-        var res = [], i;
-        for (i = 0; i < arr.length; ++i) {
-            res.push(fn(arr[i], i));
-        }
-        return res;
-    }
-
-    function hasOwnProp(a, b) {
-        return Object.prototype.hasOwnProperty.call(a, b);
-    }
-
-    function extend(a, b) {
-        for (var i in b) {
-            if (hasOwnProp(b, i)) {
-                a[i] = b[i];
-            }
-        }
-
-        if (hasOwnProp(b, 'toString')) {
-            a.toString = b.toString;
-        }
-
-        if (hasOwnProp(b, 'valueOf')) {
-            a.valueOf = b.valueOf;
-        }
-
-        return a;
-    }
-
-    function createUTC (input, format, locale, strict) {
-        return createLocalOrUTC(input, format, locale, strict, true).utc();
-    }
-
-    function defaultParsingFlags() {
-        // We need to deep clone this object.
-        return {
-            empty           : false,
-            unusedTokens    : [],
-            unusedInput     : [],
-            overflow        : -2,
-            charsLeftOver   : 0,
-            nullInput       : false,
-            invalidMonth    : null,
-            invalidFormat   : false,
-            userInvalidated : false,
-            iso             : false,
-            parsedDateParts : [],
-            meridiem        : null,
-            rfc2822         : false,
-            weekdayMismatch : false
-        };
-    }
-
-    function getParsingFlags(m) {
-        if (m._pf == null) {
-            m._pf = defaultParsingFlags();
-        }
-        return m._pf;
-    }
-
-    var some;
-    if (Array.prototype.some) {
-        some = Array.prototype.some;
-    } else {
-        some = function (fun) {
-            var t = Object(this);
-            var len = t.length >>> 0;
-
-            for (var i = 0; i < len; i++) {
-                if (i in t && fun.call(this, t[i], i, t)) {
-                    return true;
-                }
-            }
-
-            return false;
-        };
-    }
-
-    function isValid(m) {
-        if (m._isValid == null) {
-            var flags = getParsingFlags(m);
-            var parsedParts = some.call(flags.parsedDateParts, function (i) {
-                return i != null;
-            });
-            var isNowValid = !isNaN(m._d.getTime()) &&
-                flags.overflow < 0 &&
-                !flags.empty &&
-                !flags.invalidMonth &&
-                !flags.invalidWeekday &&
-                !flags.weekdayMismatch &&
-                !flags.nullInput &&
-                !flags.invalidFormat &&
-                !flags.userInvalidated &&
-                (!flags.meridiem || (flags.meridiem && parsedParts));
-
-            if (m._strict) {
-                isNowValid = isNowValid &&
-                    flags.charsLeftOver === 0 &&
-                    flags.unusedTokens.length === 0 &&
-                    flags.bigHour === undefined;
-            }
-
-            if (Object.isFrozen == null || !Object.isFrozen(m)) {
-                m._isValid = isNowValid;
-            }
-            else {
-                return isNowValid;
-            }
-        }
-        return m._isValid;
-    }
-
-    function createInvalid (flags) {
-        var m = createUTC(NaN);
-        if (flags != null) {
-            extend(getParsingFlags(m), flags);
-        }
-        else {
-            getParsingFlags(m).userInvalidated = true;
-        }
-
-        return m;
-    }
-
-    // Plugins that add properties should also add the key here (null value),
-    // so we can properly clone ourselves.
-    var momentProperties = hooks.momentProperties = [];
-
-    function copyConfig(to, from) {
-        var i, prop, val;
-
-        if (!isUndefined(from._isAMomentObject)) {
-            to._isAMomentObject = from._isAMomentObject;
-        }
-        if (!isUndefined(from._i)) {
-            to._i = from._i;
-        }
-        if (!isUndefined(from._f)) {
-            to._f = from._f;
-        }
-        if (!isUndefined(from._l)) {
-            to._l = from._l;
-        }
-        if (!isUndefined(from._strict)) {
-            to._strict = from._strict;
-        }
-        if (!isUndefined(from._tzm)) {
-            to._tzm = from._tzm;
-        }
-        if (!isUndefined(from._isUTC)) {
-            to._isUTC = from._isUTC;
-        }
-        if (!isUndefined(from._offset)) {
-            to._offset = from._offset;
-        }
-        if (!isUndefined(from._pf)) {
-            to._pf = getParsingFlags(from);
-        }
-        if (!isUndefined(from._locale)) {
-            to._locale = from._locale;
-        }
-
-        if (momentProperties.length > 0) {
-            for (i = 0; i < momentProperties.length; i++) {
-                prop = momentProperties[i];
-                val = from[prop];
-                if (!isUndefined(val)) {
-                    to[prop] = val;
-                }
-            }
-        }
-
-        return to;
-    }
-
-    var updateInProgress = false;
-
-    // Moment prototype object
-    function Moment(config) {
-        copyConfig(this, config);
-        this._d = new Date(config._d != null ? config._d.getTime() : NaN);
-        if (!this.isValid()) {
-            this._d = new Date(NaN);
-        }
-        // Prevent infinite loop in case updateOffset creates new moment
-        // objects.
-        if (updateInProgress === false) {
-            updateInProgress = true;
-            hooks.updateOffset(this);
-            updateInProgress = false;
-        }
-    }
-
-    function isMoment (obj) {
-        return obj instanceof Moment || (obj != null && obj._isAMomentObject != null);
-    }
-
-    function absFloor (number) {
-        if (number < 0) {
-            // -0 -> 0
-            return Math.ceil(number) || 0;
-        } else {
-            return Math.floor(number);
-        }
-    }
-
-    function toInt(argumentForCoercion) {
-        var coercedNumber = +argumentForCoercion,
-            value = 0;
-
-        if (coercedNumber !== 0 && isFinite(coercedNumber)) {
-            value = absFloor(coercedNumber);
-        }
-
-        return value;
-    }
-
-    // compare two arrays, return the number of differences
-    function compareArrays(array1, array2, dontConvert) {
-        var len = Math.min(array1.length, array2.length),
-            lengthDiff = Math.abs(array1.length - array2.length),
-            diffs = 0,
-            i;
-        for (i = 0; i < len; i++) {
-            if ((dontConvert && array1[i] !== array2[i]) ||
-                (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) {
-                diffs++;
-            }
-        }
-        return diffs + lengthDiff;
-    }
-
-    function warn(msg) {
-        if (hooks.suppressDeprecationWarnings === false &&
-                (typeof console !==  'undefined') && console.warn) {
-            console.warn('Deprecation warning: ' + msg);
-        }
-    }
-
-    function deprecate(msg, fn) {
-        var firstTime = true;
-
-        return extend(function () {
-            if (hooks.deprecationHandler != null) {
-                hooks.deprecationHandler(null, msg);
-            }
-            if (firstTime) {
-                var args = [];
-                var arg;
-                for (var i = 0; i < arguments.length; i++) {
-                    arg = '';
-                    if (typeof arguments[i] === 'object') {
-                        arg += '\n[' + i + '] ';
-                        for (var key in arguments[0]) {
-                            arg += key + ': ' + arguments[0][key] + ', ';
-                        }
-                        arg = arg.slice(0, -2); // Remove trailing comma and space
-                    } else {
-                        arg = arguments[i];
-                    }
-                    args.push(arg);
-                }
-                warn(msg + '\nArguments: ' + Array.prototype.slice.call(args).join('') + '\n' + (new Error()).stack);
-                firstTime = false;
-            }
-            return fn.apply(this, arguments);
-        }, fn);
-    }
-
-    var deprecations = {};
-
-    function deprecateSimple(name, msg) {
-        if (hooks.deprecationHandler != null) {
-            hooks.deprecationHandler(name, msg);
-        }
-        if (!deprecations[name]) {
-            warn(msg);
-            deprecations[name] = true;
-        }
-    }
-
-    hooks.suppressDeprecationWarnings = false;
-    hooks.deprecationHandler = null;
-
-    function isFunction(input) {
-        return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]';
-    }
-
-    function set (config) {
-        var prop, i;
-        for (i in config) {
-            prop = config[i];
-            if (isFunction(prop)) {
-                this[i] = prop;
-            } else {
-                this['_' + i] = prop;
-            }
-        }
-        this._config = config;
-        // Lenient ordinal parsing accepts just a number in addition to
-        // number + (possibly) stuff coming from _dayOfMonthOrdinalParse.
-        // TODO: Remove "ordinalParse" fallback in next major release.
-        this._dayOfMonthOrdinalParseLenient = new RegExp(
-            (this._dayOfMonthOrdinalParse.source || this._ordinalParse.source) +
-                '|' + (/\d{1,2}/).source);
-    }
-
-    function mergeConfigs(parentConfig, childConfig) {
-        var res = extend({}, parentConfig), prop;
-        for (prop in childConfig) {
-            if (hasOwnProp(childConfig, prop)) {
-                if (isObject(parentConfig[prop]) && isObject(childConfig[prop])) {
-                    res[prop] = {};
-                    extend(res[prop], parentConfig[prop]);
-                    extend(res[prop], childConfig[prop]);
-                } else if (childConfig[prop] != null) {
-                    res[prop] = childConfig[prop];
-                } else {
-                    delete res[prop];
-                }
-            }
-        }
-        for (prop in parentConfig) {
-            if (hasOwnProp(parentConfig, prop) &&
-                    !hasOwnProp(childConfig, prop) &&
-                    isObject(parentConfig[prop])) {
-                // make sure changes to properties don't modify parent config
-                res[prop] = extend({}, res[prop]);
-            }
-        }
-        return res;
-    }
-
-    function Locale(config) {
-        if (config != null) {
-            this.set(config);
-        }
-    }
-
-    var keys;
-
-    if (Object.keys) {
-        keys = Object.keys;
-    } else {
-        keys = function (obj) {
-            var i, res = [];
-            for (i in obj) {
-                if (hasOwnProp(obj, i)) {
-                    res.push(i);
-                }
-            }
-            return res;
-        };
-    }
-
-    var defaultCalendar = {
-        sameDay : '[Today at] LT',
-        nextDay : '[Tomorrow at] LT',
-        nextWeek : 'dddd [at] LT',
-        lastDay : '[Yesterday at] LT',
-        lastWeek : '[Last] dddd [at] LT',
-        sameElse : 'L'
-    };
-
-    function calendar (key, mom, now) {
-        var output = this._calendar[key] || this._calendar['sameElse'];
-        return isFunction(output) ? output.call(mom, now) : output;
-    }
-
-    var defaultLongDateFormat = {
-        LTS  : 'h:mm:ss A',
-        LT   : 'h:mm A',
-        L    : 'MM/DD/YYYY',
-        LL   : 'MMMM D, YYYY',
-        LLL  : 'MMMM D, YYYY h:mm A',
-        LLLL : 'dddd, MMMM D, YYYY h:mm A'
-    };
-
-    function longDateFormat (key) {
-        var format = this._longDateFormat[key],
-            formatUpper = this._longDateFormat[key.toUpperCase()];
-
-        if (format || !formatUpper) {
-            return format;
-        }
-
-        this._longDateFormat[key] = formatUpper.replace(/MMMM|MM|DD|dddd/g, function (val) {
-            return val.slice(1);
-        });
-
-        return this._longDateFormat[key];
-    }
-
-    var defaultInvalidDate = 'Invalid date';
-
-    function invalidDate () {
-        return this._invalidDate;
-    }
-
-    var defaultOrdinal = '%d';
-    var defaultDayOfMonthOrdinalParse = /\d{1,2}/;
-
-    function ordinal (number) {
-        return this._ordinal.replace('%d', number);
-    }
-
-    var defaultRelativeTime = {
-        future : 'in %s',
-        past   : '%s ago',
-        s  : 'a few seconds',
-        ss : '%d seconds',
-        m  : 'a minute',
-        mm : '%d minutes',
-        h  : 'an hour',
-        hh : '%d hours',
-        d  : 'a day',
-        dd : '%d days',
-        M  : 'a month',
-        MM : '%d months',
-        y  : 'a year',
-        yy : '%d years'
-    };
-
-    function relativeTime (number, withoutSuffix, string, isFuture) {
-        var output = this._relativeTime[string];
-        return (isFunction(output)) ?
-            output(number, withoutSuffix, string, isFuture) :
-            output.replace(/%d/i, number);
-    }
-
-    function pastFuture (diff, output) {
-        var format = this._relativeTime[diff > 0 ? 'future' : 'past'];
-        return isFunction(format) ? format(output) : format.replace(/%s/i, output);
-    }
-
-    var aliases = {};
-
-    function addUnitAlias (unit, shorthand) {
-        var lowerCase = unit.toLowerCase();
-        aliases[lowerCase] = aliases[lowerCase + 's'] = aliases[shorthand] = unit;
-    }
-
-    function normalizeUnits(units) {
-        return typeof units === 'string' ? aliases[units] || aliases[units.toLowerCase()] : undefined;
-    }
-
-    function normalizeObjectUnits(inputObject) {
-        var normalizedInput = {},
-            normalizedProp,
-            prop;
-
-        for (prop in inputObject) {
-            if (hasOwnProp(inputObject, prop)) {
-                normalizedProp = normalizeUnits(prop);
-                if (normalizedProp) {
-                    normalizedInput[normalizedProp] = inputObject[prop];
-                }
-            }
-        }
-
-        return normalizedInput;
-    }
-
-    var priorities = {};
-
-    function addUnitPriority(unit, priority) {
-        priorities[unit] = priority;
-    }
-
-    function getPrioritizedUnits(unitsObj) {
-        var units = [];
-        for (var u in unitsObj) {
-            units.push({unit: u, priority: priorities[u]});
-        }
-        units.sort(function (a, b) {
-            return a.priority - b.priority;
-        });
-        return units;
-    }
-
-    function zeroFill(number, targetLength, forceSign) {
-        var absNumber = '' + Math.abs(number),
-            zerosToFill = targetLength - absNumber.length,
-            sign = number >= 0;
-        return (sign ? (forceSign ? '+' : '') : '-') +
-            Math.pow(10, Math.max(0, zerosToFill)).toString().substr(1) + absNumber;
-    }
-
-    var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g;
-
-    var localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g;
-
-    var formatFunctions = {};
-
-    var formatTokenFunctions = {};
-
-    // token:    'M'
-    // padded:   ['MM', 2]
-    // ordinal:  'Mo'
-    // callback: function () { this.month() + 1 }
-    function addFormatToken (token, padded, ordinal, callback) {
-        var func = callback;
-        if (typeof callback === 'string') {
-            func = function () {
-                return this[callback]();
-            };
-        }
-        if (token) {
-            formatTokenFunctions[token] = func;
-        }
-        if (padded) {
-            formatTokenFunctions[padded[0]] = function () {
-                return zeroFill(func.apply(this, arguments), padded[1], padded[2]);
-            };
-        }
-        if (ordinal) {
-            formatTokenFunctions[ordinal] = function () {
-                return this.localeData().ordinal(func.apply(this, arguments), token);
-            };
-        }
-    }
-
-    function removeFormattingTokens(input) {
-        if (input.match(/\[[\s\S]/)) {
-            return input.replace(/^\[|\]$/g, '');
-        }
-        return input.replace(/\\/g, '');
-    }
-
-    function makeFormatFunction(format) {
-        var array = format.match(formattingTokens), i, length;
-
-        for (i = 0, length = array.length; i < length; i++) {
-            if (formatTokenFunctions[array[i]]) {
-                array[i] = formatTokenFunctions[array[i]];
-            } else {
-                array[i] = removeFormattingTokens(array[i]);
-            }
-        }
-
-        return function (mom) {
-            var output = '', i;
-            for (i = 0; i < length; i++) {
-                output += isFunction(array[i]) ? array[i].call(mom, format) : array[i];
-            }
-            return output;
-        };
-    }
-
-    // format date using native date object
-    function formatMoment(m, format) {
-        if (!m.isValid()) {
-            return m.localeData().invalidDate();
-        }
-
-        format = expandFormat(format, m.localeData());
-        formatFunctions[format] = formatFunctions[format] || makeFormatFunction(format);
-
-        return formatFunctions[format](m);
-    }
-
-    function expandFormat(format, locale) {
-        var i = 5;
-
-        function replaceLongDateFormatTokens(input) {
-            return locale.longDateFormat(input) || input;
-        }
-
-        localFormattingTokens.lastIndex = 0;
-        while (i >= 0 && localFormattingTokens.test(format)) {
-            format = format.replace(localFormattingTokens, replaceLongDateFormatTokens);
-            localFormattingTokens.lastIndex = 0;
-            i -= 1;
-        }
-
-        return format;
-    }
-
-    var match1         = /\d/;            //       0 - 9
-    var match2         = /\d\d/;          //      00 - 99
-    var match3         = /\d{3}/;         //     000 - 999
-    var match4         = /\d{4}/;         //    0000 - 9999
-    var match6         = /[+-]?\d{6}/;    // -999999 - 999999
-    var match1to2      = /\d\d?/;         //       0 - 99
-    var match3to4      = /\d\d\d\d?/;     //     999 - 9999
-    var match5to6      = /\d\d\d\d\d\d?/; //   99999 - 999999
-    var match1to3      = /\d{1,3}/;       //       0 - 999
-    var match1to4      = /\d{1,4}/;       //       0 - 9999
-    var match1to6      = /[+-]?\d{1,6}/;  // -999999 - 999999
-
-    var matchUnsigned  = /\d+/;           //       0 - inf
-    var matchSigned    = /[+-]?\d+/;      //    -inf - inf
-
-    var matchOffset    = /Z|[+-]\d\d:?\d\d/gi; // +00:00 -00:00 +0000 -0000 or Z
-    var matchShortOffset = /Z|[+-]\d\d(?::?\d\d)?/gi; // +00 -00 +00:00 -00:00 +0000 -0000 or Z
-
-    var matchTimestamp = /[+-]?\d+(\.\d{1,3})?/; // 123456789 123456789.123
-
-    // any word (or two) characters or numbers including two/three word month in arabic.
-    // includes scottish gaelic two word and hyphenated months
-    var matchWord = /[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i;
-
-    var regexes = {};
-
-    function addRegexToken (token, regex, strictRegex) {
-        regexes[token] = isFunction(regex) ? regex : function (isStrict, localeData) {
-            return (isStrict && strictRegex) ? strictRegex : regex;
-        };
-    }
-
-    function getParseRegexForToken (token, config) {
-        if (!hasOwnProp(regexes, token)) {
-            return new RegExp(unescapeFormat(token));
-        }
-
-        return regexes[token](config._strict, config._locale);
-    }
-
-    // Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript
-    function unescapeFormat(s) {
-        return regexEscape(s.replace('\\', '').replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (matched, p1, p2, p3, p4) {
-            return p1 || p2 || p3 || p4;
-        }));
-    }
-
-    function regexEscape(s) {
-        return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
-    }
-
-    var tokens = {};
-
-    function addParseToken (token, callback) {
-        var i, func = callback;
-        if (typeof token === 'string') {
-            token = [token];
-        }
-        if (isNumber(callback)) {
-            func = function (input, array) {
-                array[callback] = toInt(input);
-            };
-        }
-        for (i = 0; i < token.length; i++) {
-            tokens[token[i]] = func;
-        }
-    }
-
-    function addWeekParseToken (token, callback) {
-        addParseToken(token, function (input, array, config, token) {
-            config._w = config._w || {};
-            callback(input, config._w, config, token);
-        });
-    }
-
-    function addTimeToArrayFromToken(token, input, config) {
-        if (input != null && hasOwnProp(tokens, token)) {
-            tokens[token](input, config._a, config, token);
-        }
-    }
-
-    var YEAR = 0;
-    var MONTH = 1;
-    var DATE = 2;
-    var HOUR = 3;
-    var MINUTE = 4;
-    var SECOND = 5;
-    var MILLISECOND = 6;
-    var WEEK = 7;
-    var WEEKDAY = 8;
-
-    // FORMATTING
-
-    addFormatToken('Y', 0, 0, function () {
-        var y = this.year();
-        return y <= 9999 ? '' + y : '+' + y;
-    });
-
-    addFormatToken(0, ['YY', 2], 0, function () {
-        return this.year() % 100;
-    });
-
-    addFormatToken(0, ['YYYY',   4],       0, 'year');
-    addFormatToken(0, ['YYYYY',  5],       0, 'year');
-    addFormatToken(0, ['YYYYYY', 6, true], 0, 'year');
-
-    // ALIASES
-
-    addUnitAlias('year', 'y');
-
-    // PRIORITIES
-
-    addUnitPriority('year', 1);
-
-    // PARSING
-
-    addRegexToken('Y',      matchSigned);
-    addRegexToken('YY',     match1to2, match2);
-    addRegexToken('YYYY',   match1to4, match4);
-    addRegexToken('YYYYY',  match1to6, match6);
-    addRegexToken('YYYYYY', match1to6, match6);
-
-    addParseToken(['YYYYY', 'YYYYYY'], YEAR);
-    addParseToken('YYYY', function (input, array) {
-        array[YEAR] = input.length === 2 ? hooks.parseTwoDigitYear(input) : toInt(input);
-    });
-    addParseToken('YY', function (input, array) {
-        array[YEAR] = hooks.parseTwoDigitYear(input);
-    });
-    addParseToken('Y', function (input, array) {
-        array[YEAR] = parseInt(input, 10);
-    });
-
-    // HELPERS
-
-    function daysInYear(year) {
-        return isLeapYear(year) ? 366 : 365;
-    }
-
-    function isLeapYear(year) {
-        return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
-    }
-
-    // HOOKS
-
-    hooks.parseTwoDigitYear = function (input) {
-        return toInt(input) + (toInt(input) > 68 ? 1900 : 2000);
-    };
-
-    // MOMENTS
-
-    var getSetYear = makeGetSet('FullYear', true);
-
-    function getIsLeapYear () {
-        return isLeapYear(this.year());
-    }
-
-    function makeGetSet (unit, keepTime) {
-        return function (value) {
-            if (value != null) {
-                set$1(this, unit, value);
-                hooks.updateOffset(this, keepTime);
-                return this;
-            } else {
-                return get(this, unit);
-            }
-        };
-    }
-
-    function get (mom, unit) {
-        return mom.isValid() ?
-            mom._d['get' + (mom._isUTC ? 'UTC' : '') + unit]() : NaN;
-    }
-
-    function set$1 (mom, unit, value) {
-        if (mom.isValid() && !isNaN(value)) {
-            if (unit === 'FullYear' && isLeapYear(mom.year()) && mom.month() === 1 && mom.date() === 29) {
-                mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value, mom.month(), daysInMonth(value, mom.month()));
-            }
-            else {
-                mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value);
-            }
-        }
-    }
-
-    // MOMENTS
-
-    function stringGet (units) {
-        units = normalizeUnits(units);
-        if (isFunction(this[units])) {
-            return this[units]();
-        }
-        return this;
-    }
-
-
-    function stringSet (units, value) {
-        if (typeof units === 'object') {
-            units = normalizeObjectUnits(units);
-            var prioritized = getPrioritizedUnits(units);
-            for (var i = 0; i < prioritized.length; i++) {
-                this[prioritized[i].unit](units[prioritized[i].unit]);
-            }
-        } else {
-            units = normalizeUnits(units);
-            if (isFunction(this[units])) {
-                return this[units](value);
-            }
-        }
-        return this;
-    }
-
-    function mod(n, x) {
-        return ((n % x) + x) % x;
-    }
-
-    var indexOf;
-
-    if (Array.prototype.indexOf) {
-        indexOf = Array.prototype.indexOf;
-    } else {
-        indexOf = function (o) {
-            // I know
-            var i;
-            for (i = 0; i < this.length; ++i) {
-                if (this[i] === o) {
-                    return i;
-                }
-            }
-            return -1;
-        };
-    }
-
-    function daysInMonth(year, month) {
-        if (isNaN(year) || isNaN(month)) {
-            return NaN;
-        }
-        var modMonth = mod(month, 12);
-        year += (month - modMonth) / 12;
-        return modMonth === 1 ? (isLeapYear(year) ? 29 : 28) : (31 - modMonth % 7 % 2);
-    }
-
-    // FORMATTING
-
-    addFormatToken('M', ['MM', 2], 'Mo', function () {
-        return this.month() + 1;
-    });
-
-    addFormatToken('MMM', 0, 0, function (format) {
-        return this.localeData().monthsShort(this, format);
-    });
-
-    addFormatToken('MMMM', 0, 0, function (format) {
-        return this.localeData().months(this, format);
-    });
-
-    // ALIASES
-
-    addUnitAlias('month', 'M');
-
-    // PRIORITY
-
-    addUnitPriority('month', 8);
-
-    // PARSING
-
-    addRegexToken('M',    match1to2);
-    addRegexToken('MM',   match1to2, match2);
-    addRegexToken('MMM',  function (isStrict, locale) {
-        return locale.monthsShortRegex(isStrict);
-    });
-    addRegexToken('MMMM', function (isStrict, locale) {
-        return locale.monthsRegex(isStrict);
-    });
-
-    addParseToken(['M', 'MM'], function (input, array) {
-        array[MONTH] = toInt(input) - 1;
-    });
-
-    addParseToken(['MMM', 'MMMM'], function (input, array, config, token) {
-        var month = config._locale.monthsParse(input, token, config._strict);
-        // if we didn't find a month name, mark the date as invalid.
-        if (month != null) {
-            array[MONTH] = month;
-        } else {
-            getParsingFlags(config).invalidMonth = input;
-        }
-    });
-
-    // LOCALES
-
-    var MONTHS_IN_FORMAT = /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/;
-    var defaultLocaleMonths = 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_');
-    function localeMonths (m, format) {
-        if (!m) {
-            return isArray(this._months) ? this._months :
-                this._months['standalone'];
-        }
-        return isArray(this._months) ? this._months[m.month()] :
-            this._months[(this._months.isFormat || MONTHS_IN_FORMAT).test(format) ? 'format' : 'standalone'][m.month()];
-    }
-
-    var defaultLocaleMonthsShort = 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_');
-    function localeMonthsShort (m, format) {
-        if (!m) {
-            return isArray(this._monthsShort) ? this._monthsShort :
-                this._monthsShort['standalone'];
-        }
-        return isArray(this._monthsShort) ? this._monthsShort[m.month()] :
-            this._monthsShort[MONTHS_IN_FORMAT.test(format) ? 'format' : 'standalone'][m.month()];
-    }
-
-    function handleStrictParse(monthName, format, strict) {
-        var i, ii, mom, llc = monthName.toLocaleLowerCase();
-        if (!this._monthsParse) {
-            // this is not used
-            this._monthsParse = [];
-            this._longMonthsParse = [];
-            this._shortMonthsParse = [];
-            for (i = 0; i < 12; ++i) {
-                mom = createUTC([2000, i]);
-                this._shortMonthsParse[i] = this.monthsShort(mom, '').toLocaleLowerCase();
-                this._longMonthsParse[i] = this.months(mom, '').toLocaleLowerCase();
-            }
-        }
-
-        if (strict) {
-            if (format === 'MMM') {
-                ii = indexOf.call(this._shortMonthsParse, llc);
-                return ii !== -1 ? ii : null;
-            } else {
-                ii = indexOf.call(this._longMonthsParse, llc);
-                return ii !== -1 ? ii : null;
-            }
-        } else {
-            if (format === 'MMM') {
-                ii = indexOf.call(this._shortMonthsParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._longMonthsParse, llc);
-                return ii !== -1 ? ii : null;
-            } else {
-                ii = indexOf.call(this._longMonthsParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._shortMonthsParse, llc);
-                return ii !== -1 ? ii : null;
-            }
-        }
-    }
-
-    function localeMonthsParse (monthName, format, strict) {
-        var i, mom, regex;
-
-        if (this._monthsParseExact) {
-            return handleStrictParse.call(this, monthName, format, strict);
-        }
-
-        if (!this._monthsParse) {
-            this._monthsParse = [];
-            this._longMonthsParse = [];
-            this._shortMonthsParse = [];
-        }
-
-        // TODO: add sorting
-        // Sorting makes sure if one month (or abbr) is a prefix of another
-        // see sorting in computeMonthsParse
-        for (i = 0; i < 12; i++) {
-            // make the regex if we don't have it already
-            mom = createUTC([2000, i]);
-            if (strict && !this._longMonthsParse[i]) {
-                this._longMonthsParse[i] = new RegExp('^' + this.months(mom, '').replace('.', '') + '$', 'i');
-                this._shortMonthsParse[i] = new RegExp('^' + this.monthsShort(mom, '').replace('.', '') + '$', 'i');
-            }
-            if (!strict && !this._monthsParse[i]) {
-                regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, '');
-                this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i');
-            }
-            // test the regex
-            if (strict && format === 'MMMM' && this._longMonthsParse[i].test(monthName)) {
-                return i;
-            } else if (strict && format === 'MMM' && this._shortMonthsParse[i].test(monthName)) {
-                return i;
-            } else if (!strict && this._monthsParse[i].test(monthName)) {
-                return i;
-            }
-        }
-    }
-
-    // MOMENTS
-
-    function setMonth (mom, value) {
-        var dayOfMonth;
-
-        if (!mom.isValid()) {
-            // No op
-            return mom;
-        }
-
-        if (typeof value === 'string') {
-            if (/^\d+$/.test(value)) {
-                value = toInt(value);
-            } else {
-                value = mom.localeData().monthsParse(value);
-                // TODO: Another silent failure?
-                if (!isNumber(value)) {
-                    return mom;
-                }
-            }
-        }
-
-        dayOfMonth = Math.min(mom.date(), daysInMonth(mom.year(), value));
-        mom._d['set' + (mom._isUTC ? 'UTC' : '') + 'Month'](value, dayOfMonth);
-        return mom;
-    }
-
-    function getSetMonth (value) {
-        if (value != null) {
-            setMonth(this, value);
-            hooks.updateOffset(this, true);
-            return this;
-        } else {
-            return get(this, 'Month');
-        }
-    }
-
-    function getDaysInMonth () {
-        return daysInMonth(this.year(), this.month());
-    }
-
-    var defaultMonthsShortRegex = matchWord;
-    function monthsShortRegex (isStrict) {
-        if (this._monthsParseExact) {
-            if (!hasOwnProp(this, '_monthsRegex')) {
-                computeMonthsParse.call(this);
-            }
-            if (isStrict) {
-                return this._monthsShortStrictRegex;
-            } else {
-                return this._monthsShortRegex;
-            }
-        } else {
-            if (!hasOwnProp(this, '_monthsShortRegex')) {
-                this._monthsShortRegex = defaultMonthsShortRegex;
-            }
-            return this._monthsShortStrictRegex && isStrict ?
-                this._monthsShortStrictRegex : this._monthsShortRegex;
-        }
-    }
-
-    var defaultMonthsRegex = matchWord;
-    function monthsRegex (isStrict) {
-        if (this._monthsParseExact) {
-            if (!hasOwnProp(this, '_monthsRegex')) {
-                computeMonthsParse.call(this);
-            }
-            if (isStrict) {
-                return this._monthsStrictRegex;
-            } else {
-                return this._monthsRegex;
-            }
-        } else {
-            if (!hasOwnProp(this, '_monthsRegex')) {
-                this._monthsRegex = defaultMonthsRegex;
-            }
-            return this._monthsStrictRegex && isStrict ?
-                this._monthsStrictRegex : this._monthsRegex;
-        }
-    }
-
-    function computeMonthsParse () {
-        function cmpLenRev(a, b) {
-            return b.length - a.length;
-        }
-
-        var shortPieces = [], longPieces = [], mixedPieces = [],
-            i, mom;
-        for (i = 0; i < 12; i++) {
-            // make the regex if we don't have it already
-            mom = createUTC([2000, i]);
-            shortPieces.push(this.monthsShort(mom, ''));
-            longPieces.push(this.months(mom, ''));
-            mixedPieces.push(this.months(mom, ''));
-            mixedPieces.push(this.monthsShort(mom, ''));
-        }
-        // Sorting makes sure if one month (or abbr) is a prefix of another it
-        // will match the longer piece.
-        shortPieces.sort(cmpLenRev);
-        longPieces.sort(cmpLenRev);
-        mixedPieces.sort(cmpLenRev);
-        for (i = 0; i < 12; i++) {
-            shortPieces[i] = regexEscape(shortPieces[i]);
-            longPieces[i] = regexEscape(longPieces[i]);
-        }
-        for (i = 0; i < 24; i++) {
-            mixedPieces[i] = regexEscape(mixedPieces[i]);
-        }
-
-        this._monthsRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
-        this._monthsShortRegex = this._monthsRegex;
-        this._monthsStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');
-        this._monthsShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');
-    }
-
-    function createDate (y, m, d, h, M, s, ms) {
-        // can't just apply() to create a date:
-        // https://stackoverflow.com/q/181348
-        var date;
-        // the date constructor remaps years 0-99 to 1900-1999
-        if (y < 100 && y >= 0) {
-            // preserve leap years using a full 400 year cycle, then reset
-            date = new Date(y + 400, m, d, h, M, s, ms);
-            if (isFinite(date.getFullYear())) {
-                date.setFullYear(y);
-            }
-        } else {
-            date = new Date(y, m, d, h, M, s, ms);
-        }
-
-        return date;
-    }
-
-    function createUTCDate (y) {
-        var date;
-        // the Date.UTC function remaps years 0-99 to 1900-1999
-        if (y < 100 && y >= 0) {
-            var args = Array.prototype.slice.call(arguments);
-            // preserve leap years using a full 400 year cycle, then reset
-            args[0] = y + 400;
-            date = new Date(Date.UTC.apply(null, args));
-            if (isFinite(date.getUTCFullYear())) {
-                date.setUTCFullYear(y);
-            }
-        } else {
-            date = new Date(Date.UTC.apply(null, arguments));
-        }
-
-        return date;
-    }
-
-    // start-of-first-week - start-of-year
-    function firstWeekOffset(year, dow, doy) {
-        var // first-week day -- which january is always in the first week (4 for iso, 1 for other)
-            fwd = 7 + dow - doy,
-            // first-week day local weekday -- which local weekday is fwd
-            fwdlw = (7 + createUTCDate(year, 0, fwd).getUTCDay() - dow) % 7;
-
-        return -fwdlw + fwd - 1;
-    }
-
-    // https://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
-    function dayOfYearFromWeeks(year, week, weekday, dow, doy) {
-        var localWeekday = (7 + weekday - dow) % 7,
-            weekOffset = firstWeekOffset(year, dow, doy),
-            dayOfYear = 1 + 7 * (week - 1) + localWeekday + weekOffset,
-            resYear, resDayOfYear;
-
-        if (dayOfYear <= 0) {
-            resYear = year - 1;
-            resDayOfYear = daysInYear(resYear) + dayOfYear;
-        } else if (dayOfYear > daysInYear(year)) {
-            resYear = year + 1;
-            resDayOfYear = dayOfYear - daysInYear(year);
-        } else {
-            resYear = year;
-            resDayOfYear = dayOfYear;
-        }
-
-        return {
-            year: resYear,
-            dayOfYear: resDayOfYear
-        };
-    }
-
-    function weekOfYear(mom, dow, doy) {
-        var weekOffset = firstWeekOffset(mom.year(), dow, doy),
-            week = Math.floor((mom.dayOfYear() - weekOffset - 1) / 7) + 1,
-            resWeek, resYear;
-
-        if (week < 1) {
-            resYear = mom.year() - 1;
-            resWeek = week + weeksInYear(resYear, dow, doy);
-        } else if (week > weeksInYear(mom.year(), dow, doy)) {
-            resWeek = week - weeksInYear(mom.year(), dow, doy);
-            resYear = mom.year() + 1;
-        } else {
-            resYear = mom.year();
-            resWeek = week;
-        }
-
-        return {
-            week: resWeek,
-            year: resYear
-        };
-    }
-
-    function weeksInYear(year, dow, doy) {
-        var weekOffset = firstWeekOffset(year, dow, doy),
-            weekOffsetNext = firstWeekOffset(year + 1, dow, doy);
-        return (daysInYear(year) - weekOffset + weekOffsetNext) / 7;
-    }
-
-    // FORMATTING
-
-    addFormatToken('w', ['ww', 2], 'wo', 'week');
-    addFormatToken('W', ['WW', 2], 'Wo', 'isoWeek');
-
-    // ALIASES
-
-    addUnitAlias('week', 'w');
-    addUnitAlias('isoWeek', 'W');
-
-    // PRIORITIES
-
-    addUnitPriority('week', 5);
-    addUnitPriority('isoWeek', 5);
-
-    // PARSING
-
-    addRegexToken('w',  match1to2);
-    addRegexToken('ww', match1to2, match2);
-    addRegexToken('W',  match1to2);
-    addRegexToken('WW', match1to2, match2);
-
-    addWeekParseToken(['w', 'ww', 'W', 'WW'], function (input, week, config, token) {
-        week[token.substr(0, 1)] = toInt(input);
-    });
-
-    // HELPERS
-
-    // LOCALES
-
-    function localeWeek (mom) {
-        return weekOfYear(mom, this._week.dow, this._week.doy).week;
-    }
-
-    var defaultLocaleWeek = {
-        dow : 0, // Sunday is the first day of the week.
-        doy : 6  // The week that contains Jan 6th is the first week of the year.
-    };
-
-    function localeFirstDayOfWeek () {
-        return this._week.dow;
-    }
-
-    function localeFirstDayOfYear () {
-        return this._week.doy;
-    }
-
-    // MOMENTS
-
-    function getSetWeek (input) {
-        var week = this.localeData().week(this);
-        return input == null ? week : this.add((input - week) * 7, 'd');
-    }
-
-    function getSetISOWeek (input) {
-        var week = weekOfYear(this, 1, 4).week;
-        return input == null ? week : this.add((input - week) * 7, 'd');
-    }
-
-    // FORMATTING
-
-    addFormatToken('d', 0, 'do', 'day');
-
-    addFormatToken('dd', 0, 0, function (format) {
-        return this.localeData().weekdaysMin(this, format);
-    });
-
-    addFormatToken('ddd', 0, 0, function (format) {
-        return this.localeData().weekdaysShort(this, format);
-    });
-
-    addFormatToken('dddd', 0, 0, function (format) {
-        return this.localeData().weekdays(this, format);
-    });
-
-    addFormatToken('e', 0, 0, 'weekday');
-    addFormatToken('E', 0, 0, 'isoWeekday');
-
-    // ALIASES
-
-    addUnitAlias('day', 'd');
-    addUnitAlias('weekday', 'e');
-    addUnitAlias('isoWeekday', 'E');
-
-    // PRIORITY
-    addUnitPriority('day', 11);
-    addUnitPriority('weekday', 11);
-    addUnitPriority('isoWeekday', 11);
-
-    // PARSING
-
-    addRegexToken('d',    match1to2);
-    addRegexToken('e',    match1to2);
-    addRegexToken('E',    match1to2);
-    addRegexToken('dd',   function (isStrict, locale) {
-        return locale.weekdaysMinRegex(isStrict);
-    });
-    addRegexToken('ddd',   function (isStrict, locale) {
-        return locale.weekdaysShortRegex(isStrict);
-    });
-    addRegexToken('dddd',   function (isStrict, locale) {
-        return locale.weekdaysRegex(isStrict);
-    });
-
-    addWeekParseToken(['dd', 'ddd', 'dddd'], function (input, week, config, token) {
-        var weekday = config._locale.weekdaysParse(input, token, config._strict);
-        // if we didn't get a weekday name, mark the date as invalid
-        if (weekday != null) {
-            week.d = weekday;
-        } else {
-            getParsingFlags(config).invalidWeekday = input;
-        }
-    });
-
-    addWeekParseToken(['d', 'e', 'E'], function (input, week, config, token) {
-        week[token] = toInt(input);
-    });
-
-    // HELPERS
-
-    function parseWeekday(input, locale) {
-        if (typeof input !== 'string') {
-            return input;
-        }
-
-        if (!isNaN(input)) {
-            return parseInt(input, 10);
-        }
-
-        input = locale.weekdaysParse(input);
-        if (typeof input === 'number') {
-            return input;
-        }
-
-        return null;
-    }
-
-    function parseIsoWeekday(input, locale) {
-        if (typeof input === 'string') {
-            return locale.weekdaysParse(input) % 7 || 7;
-        }
-        return isNaN(input) ? null : input;
-    }
-
-    // LOCALES
-    function shiftWeekdays (ws, n) {
-        return ws.slice(n, 7).concat(ws.slice(0, n));
-    }
-
-    var defaultLocaleWeekdays = 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_');
-    function localeWeekdays (m, format) {
-        var weekdays = isArray(this._weekdays) ? this._weekdays :
-            this._weekdays[(m && m !== true && this._weekdays.isFormat.test(format)) ? 'format' : 'standalone'];
-        return (m === true) ? shiftWeekdays(weekdays, this._week.dow)
-            : (m) ? weekdays[m.day()] : weekdays;
-    }
-
-    var defaultLocaleWeekdaysShort = 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_');
-    function localeWeekdaysShort (m) {
-        return (m === true) ? shiftWeekdays(this._weekdaysShort, this._week.dow)
-            : (m) ? this._weekdaysShort[m.day()] : this._weekdaysShort;
-    }
-
-    var defaultLocaleWeekdaysMin = 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_');
-    function localeWeekdaysMin (m) {
-        return (m === true) ? shiftWeekdays(this._weekdaysMin, this._week.dow)
-            : (m) ? this._weekdaysMin[m.day()] : this._weekdaysMin;
-    }
-
-    function handleStrictParse$1(weekdayName, format, strict) {
-        var i, ii, mom, llc = weekdayName.toLocaleLowerCase();
-        if (!this._weekdaysParse) {
-            this._weekdaysParse = [];
-            this._shortWeekdaysParse = [];
-            this._minWeekdaysParse = [];
-
-            for (i = 0; i < 7; ++i) {
-                mom = createUTC([2000, 1]).day(i);
-                this._minWeekdaysParse[i] = this.weekdaysMin(mom, '').toLocaleLowerCase();
-                this._shortWeekdaysParse[i] = this.weekdaysShort(mom, '').toLocaleLowerCase();
-                this._weekdaysParse[i] = this.weekdays(mom, '').toLocaleLowerCase();
-            }
-        }
-
-        if (strict) {
-            if (format === 'dddd') {
-                ii = indexOf.call(this._weekdaysParse, llc);
-                return ii !== -1 ? ii : null;
-            } else if (format === 'ddd') {
-                ii = indexOf.call(this._shortWeekdaysParse, llc);
-                return ii !== -1 ? ii : null;
-            } else {
-                ii = indexOf.call(this._minWeekdaysParse, llc);
-                return ii !== -1 ? ii : null;
-            }
-        } else {
-            if (format === 'dddd') {
-                ii = indexOf.call(this._weekdaysParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._shortWeekdaysParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._minWeekdaysParse, llc);
-                return ii !== -1 ? ii : null;
-            } else if (format === 'ddd') {
-                ii = indexOf.call(this._shortWeekdaysParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._weekdaysParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._minWeekdaysParse, llc);
-                return ii !== -1 ? ii : null;
-            } else {
-                ii = indexOf.call(this._minWeekdaysParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._weekdaysParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._shortWeekdaysParse, llc);
-                return ii !== -1 ? ii : null;
-            }
-        }
-    }
-
-    function localeWeekdaysParse (weekdayName, format, strict) {
-        var i, mom, regex;
-
-        if (this._weekdaysParseExact) {
-            return handleStrictParse$1.call(this, weekdayName, format, strict);
-        }
-
-        if (!this._weekdaysParse) {
-            this._weekdaysParse = [];
-            this._minWeekdaysParse = [];
-            this._shortWeekdaysParse = [];
-            this._fullWeekdaysParse = [];
-        }
-
-        for (i = 0; i < 7; i++) {
-            // make the regex if we don't have it already
-
-            mom = createUTC([2000, 1]).day(i);
-            if (strict && !this._fullWeekdaysParse[i]) {
-                this._fullWeekdaysParse[i] = new RegExp('^' + this.weekdays(mom, '').replace('.', '\\.?') + '$', 'i');
-                this._shortWeekdaysParse[i] = new RegExp('^' + this.weekdaysShort(mom, '').replace('.', '\\.?') + '$', 'i');
-                this._minWeekdaysParse[i] = new RegExp('^' + this.weekdaysMin(mom, '').replace('.', '\\.?') + '$', 'i');
-            }
-            if (!this._weekdaysParse[i]) {
-                regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, '');
-                this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i');
-            }
-            // test the regex
-            if (strict && format === 'dddd' && this._fullWeekdaysParse[i].test(weekdayName)) {
-                return i;
-            } else if (strict && format === 'ddd' && this._shortWeekdaysParse[i].test(weekdayName)) {
-                return i;
-            } else if (strict && format === 'dd' && this._minWeekdaysParse[i].test(weekdayName)) {
-                return i;
-            } else if (!strict && this._weekdaysParse[i].test(weekdayName)) {
-                return i;
-            }
-        }
-    }
-
-    // MOMENTS
-
-    function getSetDayOfWeek (input) {
-        if (!this.isValid()) {
-            return input != null ? this : NaN;
-        }
-        var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay();
-        if (input != null) {
-            input = parseWeekday(input, this.localeData());
-            return this.add(input - day, 'd');
-        } else {
-            return day;
-        }
-    }
-
-    function getSetLocaleDayOfWeek (input) {
-        if (!this.isValid()) {
-            return input != null ? this : NaN;
-        }
-        var weekday = (this.day() + 7 - this.localeData()._week.dow) % 7;
-        return input == null ? weekday : this.add(input - weekday, 'd');
-    }
-
-    function getSetISODayOfWeek (input) {
-        if (!this.isValid()) {
-            return input != null ? this : NaN;
-        }
-
-        // behaves the same as moment#day except
-        // as a getter, returns 7 instead of 0 (1-7 range instead of 0-6)
-        // as a setter, sunday should belong to the previous week.
-
-        if (input != null) {
-            var weekday = parseIsoWeekday(input, this.localeData());
-            return this.day(this.day() % 7 ? weekday : weekday - 7);
-        } else {
-            return this.day() || 7;
-        }
-    }
-
-    var defaultWeekdaysRegex = matchWord;
-    function weekdaysRegex (isStrict) {
-        if (this._weekdaysParseExact) {
-            if (!hasOwnProp(this, '_weekdaysRegex')) {
-                computeWeekdaysParse.call(this);
-            }
-            if (isStrict) {
-                return this._weekdaysStrictRegex;
-            } else {
-                return this._weekdaysRegex;
-            }
-        } else {
-            if (!hasOwnProp(this, '_weekdaysRegex')) {
-                this._weekdaysRegex = defaultWeekdaysRegex;
-            }
-            return this._weekdaysStrictRegex && isStrict ?
-                this._weekdaysStrictRegex : this._weekdaysRegex;
-        }
-    }
-
-    var defaultWeekdaysShortRegex = matchWord;
-    function weekdaysShortRegex (isStrict) {
-        if (this._weekdaysParseExact) {
-            if (!hasOwnProp(this, '_weekdaysRegex')) {
-                computeWeekdaysParse.call(this);
-            }
-            if (isStrict) {
-                return this._weekdaysShortStrictRegex;
-            } else {
-                return this._weekdaysShortRegex;
-            }
-        } else {
-            if (!hasOwnProp(this, '_weekdaysShortRegex')) {
-                this._weekdaysShortRegex = defaultWeekdaysShortRegex;
-            }
-            return this._weekdaysShortStrictRegex && isStrict ?
-                this._weekdaysShortStrictRegex : this._weekdaysShortRegex;
-        }
-    }
-
-    var defaultWeekdaysMinRegex = matchWord;
-    function weekdaysMinRegex (isStrict) {
-        if (this._weekdaysParseExact) {
-            if (!hasOwnProp(this, '_weekdaysRegex')) {
-                computeWeekdaysParse.call(this);
-            }
-            if (isStrict) {
-                return this._weekdaysMinStrictRegex;
-            } else {
-                return this._weekdaysMinRegex;
-            }
-        } else {
-            if (!hasOwnProp(this, '_weekdaysMinRegex')) {
-                this._weekdaysMinRegex = defaultWeekdaysMinRegex;
-            }
-            return this._weekdaysMinStrictRegex && isStrict ?
-                this._weekdaysMinStrictRegex : this._weekdaysMinRegex;
-        }
-    }
-
-
-    function computeWeekdaysParse () {
-        function cmpLenRev(a, b) {
-            return b.length - a.length;
-        }
-
-        var minPieces = [], shortPieces = [], longPieces = [], mixedPieces = [],
-            i, mom, minp, shortp, longp;
-        for (i = 0; i < 7; i++) {
-            // make the regex if we don't have it already
-            mom = createUTC([2000, 1]).day(i);
-            minp = this.weekdaysMin(mom, '');
-            shortp = this.weekdaysShort(mom, '');
-            longp = this.weekdays(mom, '');
-            minPieces.push(minp);
-            shortPieces.push(shortp);
-            longPieces.push(longp);
-            mixedPieces.push(minp);
-            mixedPieces.push(shortp);
-            mixedPieces.push(longp);
-        }
-        // Sorting makes sure if one weekday (or abbr) is a prefix of another it
-        // will match the longer piece.
-        minPieces.sort(cmpLenRev);
-        shortPieces.sort(cmpLenRev);
-        longPieces.sort(cmpLenRev);
-        mixedPieces.sort(cmpLenRev);
-        for (i = 0; i < 7; i++) {
-            shortPieces[i] = regexEscape(shortPieces[i]);
-            longPieces[i] = regexEscape(longPieces[i]);
-            mixedPieces[i] = regexEscape(mixedPieces[i]);
-        }
-
-        this._weekdaysRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
-        this._weekdaysShortRegex = this._weekdaysRegex;
-        this._weekdaysMinRegex = this._weekdaysRegex;
-
-        this._weekdaysStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');
-        this._weekdaysShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');
-        this._weekdaysMinStrictRegex = new RegExp('^(' + minPieces.join('|') + ')', 'i');
-    }
-
-    // FORMATTING
-
-    function hFormat() {
-        return this.hours() % 12 || 12;
-    }
-
-    function kFormat() {
-        return this.hours() || 24;
-    }
-
-    addFormatToken('H', ['HH', 2], 0, 'hour');
-    addFormatToken('h', ['hh', 2], 0, hFormat);
-    addFormatToken('k', ['kk', 2], 0, kFormat);
-
-    addFormatToken('hmm', 0, 0, function () {
-        return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2);
-    });
-
-    addFormatToken('hmmss', 0, 0, function () {
-        return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2) +
-            zeroFill(this.seconds(), 2);
-    });
-
-    addFormatToken('Hmm', 0, 0, function () {
-        return '' + this.hours() + zeroFill(this.minutes(), 2);
-    });
-
-    addFormatToken('Hmmss', 0, 0, function () {
-        return '' + this.hours() + zeroFill(this.minutes(), 2) +
-            zeroFill(this.seconds(), 2);
-    });
-
-    function meridiem (token, lowercase) {
-        addFormatToken(token, 0, 0, function () {
-            return this.localeData().meridiem(this.hours(), this.minutes(), lowercase);
-        });
-    }
-
-    meridiem('a', true);
-    meridiem('A', false);
-
-    // ALIASES
-
-    addUnitAlias('hour', 'h');
-
-    // PRIORITY
-    addUnitPriority('hour', 13);
-
-    // PARSING
-
-    function matchMeridiem (isStrict, locale) {
-        return locale._meridiemParse;
-    }
-
-    addRegexToken('a',  matchMeridiem);
-    addRegexToken('A',  matchMeridiem);
-    addRegexToken('H',  match1to2);
-    addRegexToken('h',  match1to2);
-    addRegexToken('k',  match1to2);
-    addRegexToken('HH', match1to2, match2);
-    addRegexToken('hh', match1to2, match2);
-    addRegexToken('kk', match1to2, match2);
-
-    addRegexToken('hmm', match3to4);
-    addRegexToken('hmmss', match5to6);
-    addRegexToken('Hmm', match3to4);
-    addRegexToken('Hmmss', match5to6);
-
-    addParseToken(['H', 'HH'], HOUR);
-    addParseToken(['k', 'kk'], function (input, array, config) {
-        var kInput = toInt(input);
-        array[HOUR] = kInput === 24 ? 0 : kInput;
-    });
-    addParseToken(['a', 'A'], function (input, array, config) {
-        config._isPm = config._locale.isPM(input);
-        config._meridiem = input;
-    });
-    addParseToken(['h', 'hh'], function (input, array, config) {
-        array[HOUR] = toInt(input);
-        getParsingFlags(config).bigHour = true;
-    });
-    addParseToken('hmm', function (input, array, config) {
-        var pos = input.length - 2;
-        array[HOUR] = toInt(input.substr(0, pos));
-        array[MINUTE] = toInt(input.substr(pos));
-        getParsingFlags(config).bigHour = true;
-    });
-    addParseToken('hmmss', function (input, array, config) {
-        var pos1 = input.length - 4;
-        var pos2 = input.length - 2;
-        array[HOUR] = toInt(input.substr(0, pos1));
-        array[MINUTE] = toInt(input.substr(pos1, 2));
-        array[SECOND] = toInt(input.substr(pos2));
-        getParsingFlags(config).bigHour = true;
-    });
-    addParseToken('Hmm', function (input, array, config) {
-        var pos = input.length - 2;
-        array[HOUR] = toInt(input.substr(0, pos));
-        array[MINUTE] = toInt(input.substr(pos));
-    });
-    addParseToken('Hmmss', function (input, array, config) {
-        var pos1 = input.length - 4;
-        var pos2 = input.length - 2;
-        array[HOUR] = toInt(input.substr(0, pos1));
-        array[MINUTE] = toInt(input.substr(pos1, 2));
-        array[SECOND] = toInt(input.substr(pos2));
-    });
-
-    // LOCALES
-
-    function localeIsPM (input) {
-        // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays
-        // Using charAt should be more compatible.
-        return ((input + '').toLowerCase().charAt(0) === 'p');
-    }
-
-    var defaultLocaleMeridiemParse = /[ap]\.?m?\.?/i;
-    function localeMeridiem (hours, minutes, isLower) {
-        if (hours > 11) {
-            return isLower ? 'pm' : 'PM';
-        } else {
-            return isLower ? 'am' : 'AM';
-        }
-    }
-
-
-    // MOMENTS
-
-    // Setting the hour should keep the time, because the user explicitly
-    // specified which hour they want. So trying to maintain the same hour (in
-    // a new timezone) makes sense. Adding/subtracting hours does not follow
-    // this rule.
-    var getSetHour = makeGetSet('Hours', true);
-
-    var baseConfig = {
-        calendar: defaultCalendar,
-        longDateFormat: defaultLongDateFormat,
-        invalidDate: defaultInvalidDate,
-        ordinal: defaultOrdinal,
-        dayOfMonthOrdinalParse: defaultDayOfMonthOrdinalParse,
-        relativeTime: defaultRelativeTime,
-
-        months: defaultLocaleMonths,
-        monthsShort: defaultLocaleMonthsShort,
-
-        week: defaultLocaleWeek,
-
-        weekdays: defaultLocaleWeekdays,
-        weekdaysMin: defaultLocaleWeekdaysMin,
-        weekdaysShort: defaultLocaleWeekdaysShort,
-
-        meridiemParse: defaultLocaleMeridiemParse
-    };
-
-    // internal storage for locale config files
-    var locales = {};
-    var localeFamilies = {};
-    var globalLocale;
-
-    function normalizeLocale(key) {
-        return key ? key.toLowerCase().replace('_', '-') : key;
-    }
-
-    // pick the locale from the array
-    // try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each
-    // substring from most specific to least, but move to the next array item if it's a more specific variant than the current root
-    function chooseLocale(names) {
-        var i = 0, j, next, locale, split;
-
-        while (i < names.length) {
-            split = normalizeLocale(names[i]).split('-');
-            j = split.length;
-            next = normalizeLocale(names[i + 1]);
-            next = next ? next.split('-') : null;
-            while (j > 0) {
-                locale = loadLocale(split.slice(0, j).join('-'));
-                if (locale) {
-                    return locale;
-                }
-                if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) {
-                    //the next array item is better than a shallower substring of this one
-                    break;
-                }
-                j--;
-            }
-            i++;
-        }
-        return globalLocale;
-    }
-
-    function loadLocale(name) {
-        var oldLocale = null;
-        // TODO: Find a better way to register and load all the locales in Node
-        if (!locales[name] && (typeof module !== 'undefined') &&
-                module && module.exports) {
-            try {
-                oldLocale = globalLocale._abbr;
-                var aliasedRequire = require;
-                aliasedRequire('./locale/' + name);
-                getSetGlobalLocale(oldLocale);
-            } catch (e) {}
-        }
-        return locales[name];
-    }
-
-    // This function will load locale and then set the global locale.  If
-    // no arguments are passed in, it will simply return the current global
-    // locale key.
-    function getSetGlobalLocale (key, values) {
-        var data;
-        if (key) {
-            if (isUndefined(values)) {
-                data = getLocale(key);
-            }
-            else {
-                data = defineLocale(key, values);
-            }
-
-            if (data) {
-                // moment.duration._locale = moment._locale = data;
-                globalLocale = data;
-            }
-            else {
-                if ((typeof console !==  'undefined') && console.warn) {
-                    //warn user if arguments are passed but the locale could not be set
-                    console.warn('Locale ' + key +  ' not found. Did you forget to load it?');
-                }
-            }
-        }
-
-        return globalLocale._abbr;
-    }
-
-    function defineLocale (name, config) {
-        if (config !== null) {
-            var locale, parentConfig = baseConfig;
-            config.abbr = name;
-            if (locales[name] != null) {
-                deprecateSimple('defineLocaleOverride',
-                        'use moment.updateLocale(localeName, config) to change ' +
-                        'an existing locale. moment.defineLocale(localeName, ' +
-                        'config) should only be used for creating a new locale ' +
-                        'See http://momentjs.com/guides/#/warnings/define-locale/ for more info.');
-                parentConfig = locales[name]._config;
-            } else if (config.parentLocale != null) {
-                if (locales[config.parentLocale] != null) {
-                    parentConfig = locales[config.parentLocale]._config;
-                } else {
-                    locale = loadLocale(config.parentLocale);
-                    if (locale != null) {
-                        parentConfig = locale._config;
-                    } else {
-                        if (!localeFamilies[config.parentLocale]) {
-                            localeFamilies[config.parentLocale] = [];
-                        }
-                        localeFamilies[config.parentLocale].push({
-                            name: name,
-                            config: config
-                        });
-                        return null;
-                    }
-                }
-            }
-            locales[name] = new Locale(mergeConfigs(parentConfig, config));
-
-            if (localeFamilies[name]) {
-                localeFamilies[name].forEach(function (x) {
-                    defineLocale(x.name, x.config);
-                });
-            }
-
-            // backwards compat for now: also set the locale
-            // make sure we set the locale AFTER all child locales have been
-            // created, so we won't end up with the child locale set.
-            getSetGlobalLocale(name);
-
-
-            return locales[name];
-        } else {
-            // useful for testing
-            delete locales[name];
-            return null;
-        }
-    }
-
-    function updateLocale(name, config) {
-        if (config != null) {
-            var locale, tmpLocale, parentConfig = baseConfig;
-            // MERGE
-            tmpLocale = loadLocale(name);
-            if (tmpLocale != null) {
-                parentConfig = tmpLocale._config;
-            }
-            config = mergeConfigs(parentConfig, config);
-            locale = new Locale(config);
-            locale.parentLocale = locales[name];
-            locales[name] = locale;
-
-            // backwards compat for now: also set the locale
-            getSetGlobalLocale(name);
-        } else {
-            // pass null for config to unupdate, useful for tests
-            if (locales[name] != null) {
-                if (locales[name].parentLocale != null) {
-                    locales[name] = locales[name].parentLocale;
-                } else if (locales[name] != null) {
-                    delete locales[name];
-                }
-            }
-        }
-        return locales[name];
-    }
-
-    // returns locale data
-    function getLocale (key) {
-        var locale;
-
-        if (key && key._locale && key._locale._abbr) {
-            key = key._locale._abbr;
-        }
-
-        if (!key) {
-            return globalLocale;
-        }
-
-        if (!isArray(key)) {
-            //short-circuit everything else
-            locale = loadLocale(key);
-            if (locale) {
-                return locale;
-            }
-            key = [key];
-        }
-
-        return chooseLocale(key);
-    }
-
-    function listLocales() {
-        return keys(locales);
-    }
-
-    function checkOverflow (m) {
-        var overflow;
-        var a = m._a;
-
-        if (a && getParsingFlags(m).overflow === -2) {
-            overflow =
-                a[MONTH]       < 0 || a[MONTH]       > 11  ? MONTH :
-                a[DATE]        < 1 || a[DATE]        > daysInMonth(a[YEAR], a[MONTH]) ? DATE :
-                a[HOUR]        < 0 || a[HOUR]        > 24 || (a[HOUR] === 24 && (a[MINUTE] !== 0 || a[SECOND] !== 0 || a[MILLISECOND] !== 0)) ? HOUR :
-                a[MINUTE]      < 0 || a[MINUTE]      > 59  ? MINUTE :
-                a[SECOND]      < 0 || a[SECOND]      > 59  ? SECOND :
-                a[MILLISECOND] < 0 || a[MILLISECOND] > 999 ? MILLISECOND :
-                -1;
-
-            if (getParsingFlags(m)._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) {
-                overflow = DATE;
-            }
-            if (getParsingFlags(m)._overflowWeeks && overflow === -1) {
-                overflow = WEEK;
-            }
-            if (getParsingFlags(m)._overflowWeekday && overflow === -1) {
-                overflow = WEEKDAY;
-            }
-
-            getParsingFlags(m).overflow = overflow;
-        }
-
-        return m;
-    }
-
-    // Pick the first defined of two or three arguments.
-    function defaults(a, b, c) {
-        if (a != null) {
-            return a;
-        }
-        if (b != null) {
-            return b;
-        }
-        return c;
-    }
-
-    function currentDateArray(config) {
-        // hooks is actually the exported moment object
-        var nowValue = new Date(hooks.now());
-        if (config._useUTC) {
-            return [nowValue.getUTCFullYear(), nowValue.getUTCMonth(), nowValue.getUTCDate()];
-        }
-        return [nowValue.getFullYear(), nowValue.getMonth(), nowValue.getDate()];
-    }
-
-    // convert an array to a date.
-    // the array should mirror the parameters below
-    // note: all values past the year are optional and will default to the lowest possible value.
-    // [year, month, day , hour, minute, second, millisecond]
-    function configFromArray (config) {
-        var i, date, input = [], currentDate, expectedWeekday, yearToUse;
-
-        if (config._d) {
-            return;
-        }
-
-        currentDate = currentDateArray(config);
-
-        //compute day of the year from weeks and weekdays
-        if (config._w && config._a[DATE] == null && config._a[MONTH] == null) {
-            dayOfYearFromWeekInfo(config);
-        }
-
-        //if the day of the year is set, figure out what it is
-        if (config._dayOfYear != null) {
-            yearToUse = defaults(config._a[YEAR], currentDate[YEAR]);
-
-            if (config._dayOfYear > daysInYear(yearToUse) || config._dayOfYear === 0) {
-                getParsingFlags(config)._overflowDayOfYear = true;
-            }
-
-            date = createUTCDate(yearToUse, 0, config._dayOfYear);
-            config._a[MONTH] = date.getUTCMonth();
-            config._a[DATE] = date.getUTCDate();
-        }
-
-        // Default to current date.
-        // * if no year, month, day of month are given, default to today
-        // * if day of month is given, default month and year
-        // * if month is given, default only year
-        // * if year is given, don't default anything
-        for (i = 0; i < 3 && config._a[i] == null; ++i) {
-            config._a[i] = input[i] = currentDate[i];
-        }
-
-        // Zero out whatever was not defaulted, including time
-        for (; i < 7; i++) {
-            config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i];
-        }
-
-        // Check for 24:00:00.000
-        if (config._a[HOUR] === 24 &&
-                config._a[MINUTE] === 0 &&
-                config._a[SECOND] === 0 &&
-                config._a[MILLISECOND] === 0) {
-            config._nextDay = true;
-            config._a[HOUR] = 0;
-        }
-
-        config._d = (config._useUTC ? createUTCDate : createDate).apply(null, input);
-        expectedWeekday = config._useUTC ? config._d.getUTCDay() : config._d.getDay();
-
-        // Apply timezone offset from input. The actual utcOffset can be changed
-        // with parseZone.
-        if (config._tzm != null) {
-            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
-        }
-
-        if (config._nextDay) {
-            config._a[HOUR] = 24;
-        }
-
-        // check for mismatching day of week
-        if (config._w && typeof config._w.d !== 'undefined' && config._w.d !== expectedWeekday) {
-            getParsingFlags(config).weekdayMismatch = true;
-        }
-    }
-
-    function dayOfYearFromWeekInfo(config) {
-        var w, weekYear, week, weekday, dow, doy, temp, weekdayOverflow;
-
-        w = config._w;
-        if (w.GG != null || w.W != null || w.E != null) {
-            dow = 1;
-            doy = 4;
-
-            // TODO: We need to take the current isoWeekYear, but that depends on
-            // how we interpret now (local, utc, fixed offset). So create
-            // a now version of current config (take local/utc/offset flags, and
-            // create now).
-            weekYear = defaults(w.GG, config._a[YEAR], weekOfYear(createLocal(), 1, 4).year);
-            week = defaults(w.W, 1);
-            weekday = defaults(w.E, 1);
-            if (weekday < 1 || weekday > 7) {
-                weekdayOverflow = true;
-            }
-        } else {
-            dow = config._locale._week.dow;
-            doy = config._locale._week.doy;
-
-            var curWeek = weekOfYear(createLocal(), dow, doy);
-
-            weekYear = defaults(w.gg, config._a[YEAR], curWeek.year);
-
-            // Default to current week.
-            week = defaults(w.w, curWeek.week);
-
-            if (w.d != null) {
-                // weekday -- low day numbers are considered next week
-                weekday = w.d;
-                if (weekday < 0 || weekday > 6) {
-                    weekdayOverflow = true;
-                }
-            } else if (w.e != null) {
-                // local weekday -- counting starts from beginning of week
-                weekday = w.e + dow;
-                if (w.e < 0 || w.e > 6) {
-                    weekdayOverflow = true;
-                }
-            } else {
-                // default to beginning of week
-                weekday = dow;
-            }
-        }
-        if (week < 1 || week > weeksInYear(weekYear, dow, doy)) {
-            getParsingFlags(config)._overflowWeeks = true;
-        } else if (weekdayOverflow != null) {
-            getParsingFlags(config)._overflowWeekday = true;
-        } else {
-            temp = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy);
-            config._a[YEAR] = temp.year;
-            config._dayOfYear = temp.dayOfYear;
-        }
-    }
-
-    // iso 8601 regex
-    // 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00)
-    var extendedIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
-    var basicIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
-
-    var tzRegex = /Z|[+-]\d\d(?::?\d\d)?/;
-
-    var isoDates = [
-        ['YYYYYY-MM-DD', /[+-]\d{6}-\d\d-\d\d/],
-        ['YYYY-MM-DD', /\d{4}-\d\d-\d\d/],
-        ['GGGG-[W]WW-E', /\d{4}-W\d\d-\d/],
-        ['GGGG-[W]WW', /\d{4}-W\d\d/, false],
-        ['YYYY-DDD', /\d{4}-\d{3}/],
-        ['YYYY-MM', /\d{4}-\d\d/, false],
-        ['YYYYYYMMDD', /[+-]\d{10}/],
-        ['YYYYMMDD', /\d{8}/],
-        // YYYYMM is NOT allowed by the standard
-        ['GGGG[W]WWE', /\d{4}W\d{3}/],
-        ['GGGG[W]WW', /\d{4}W\d{2}/, false],
-        ['YYYYDDD', /\d{7}/]
-    ];
-
-    // iso time formats and regexes
-    var isoTimes = [
-        ['HH:mm:ss.SSSS', /\d\d:\d\d:\d\d\.\d+/],
-        ['HH:mm:ss,SSSS', /\d\d:\d\d:\d\d,\d+/],
-        ['HH:mm:ss', /\d\d:\d\d:\d\d/],
-        ['HH:mm', /\d\d:\d\d/],
-        ['HHmmss.SSSS', /\d\d\d\d\d\d\.\d+/],
-        ['HHmmss,SSSS', /\d\d\d\d\d\d,\d+/],
-        ['HHmmss', /\d\d\d\d\d\d/],
-        ['HHmm', /\d\d\d\d/],
-        ['HH', /\d\d/]
-    ];
-
-    var aspNetJsonRegex = /^\/?Date\((\-?\d+)/i;
-
-    // date from iso format
-    function configFromISO(config) {
-        var i, l,
-            string = config._i,
-            match = extendedIsoRegex.exec(string) || basicIsoRegex.exec(string),
-            allowTime, dateFormat, timeFormat, tzFormat;
-
-        if (match) {
-            getParsingFlags(config).iso = true;
-
-            for (i = 0, l = isoDates.length; i < l; i++) {
-                if (isoDates[i][1].exec(match[1])) {
-                    dateFormat = isoDates[i][0];
-                    allowTime = isoDates[i][2] !== false;
-                    break;
-                }
-            }
-            if (dateFormat == null) {
-                config._isValid = false;
-                return;
-            }
-            if (match[3]) {
-                for (i = 0, l = isoTimes.length; i < l; i++) {
-                    if (isoTimes[i][1].exec(match[3])) {
-                        // match[2] should be 'T' or space
-                        timeFormat = (match[2] || ' ') + isoTimes[i][0];
-                        break;
-                    }
-                }
-                if (timeFormat == null) {
-                    config._isValid = false;
-                    return;
-                }
-            }
-            if (!allowTime && timeFormat != null) {
-                config._isValid = false;
-                return;
-            }
-            if (match[4]) {
-                if (tzRegex.exec(match[4])) {
-                    tzFormat = 'Z';
-                } else {
-                    config._isValid = false;
-                    return;
-                }
-            }
-            config._f = dateFormat + (timeFormat || '') + (tzFormat || '');
-            configFromStringAndFormat(config);
-        } else {
-            config._isValid = false;
-        }
-    }
-
-    // RFC 2822 regex: For details see https://tools.ietf.org/html/rfc2822#section-3.3
-    var rfc2822 = /^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/;
-
-    function extractFromRFC2822Strings(yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr) {
-        var result = [
-            untruncateYear(yearStr),
-            defaultLocaleMonthsShort.indexOf(monthStr),
-            parseInt(dayStr, 10),
-            parseInt(hourStr, 10),
-            parseInt(minuteStr, 10)
-        ];
-
-        if (secondStr) {
-            result.push(parseInt(secondStr, 10));
-        }
-
-        return result;
-    }
-
-    function untruncateYear(yearStr) {
-        var year = parseInt(yearStr, 10);
-        if (year <= 49) {
-            return 2000 + year;
-        } else if (year <= 999) {
-            return 1900 + year;
-        }
-        return year;
-    }
-
-    function preprocessRFC2822(s) {
-        // Remove comments and folding whitespace and replace multiple-spaces with a single space
-        return s.replace(/\([^)]*\)|[\n\t]/g, ' ').replace(/(\s\s+)/g, ' ').replace(/^\s\s*/, '').replace(/\s\s*$/, '');
-    }
-
-    function checkWeekday(weekdayStr, parsedInput, config) {
-        if (weekdayStr) {
-            // TODO: Replace the vanilla JS Date object with an indepentent day-of-week check.
-            var weekdayProvided = defaultLocaleWeekdaysShort.indexOf(weekdayStr),
-                weekdayActual = new Date(parsedInput[0], parsedInput[1], parsedInput[2]).getDay();
-            if (weekdayProvided !== weekdayActual) {
-                getParsingFlags(config).weekdayMismatch = true;
-                config._isValid = false;
-                return false;
-            }
-        }
-        return true;
-    }
-
-    var obsOffsets = {
-        UT: 0,
-        GMT: 0,
-        EDT: -4 * 60,
-        EST: -5 * 60,
-        CDT: -5 * 60,
-        CST: -6 * 60,
-        MDT: -6 * 60,
-        MST: -7 * 60,
-        PDT: -7 * 60,
-        PST: -8 * 60
-    };
-
-    function calculateOffset(obsOffset, militaryOffset, numOffset) {
-        if (obsOffset) {
-            return obsOffsets[obsOffset];
-        } else if (militaryOffset) {
-            // the only allowed military tz is Z
-            return 0;
-        } else {
-            var hm = parseInt(numOffset, 10);
-            var m = hm % 100, h = (hm - m) / 100;
-            return h * 60 + m;
-        }
-    }
-
-    // date and time from ref 2822 format
-    function configFromRFC2822(config) {
-        var match = rfc2822.exec(preprocessRFC2822(config._i));
-        if (match) {
-            var parsedArray = extractFromRFC2822Strings(match[4], match[3], match[2], match[5], match[6], match[7]);
-            if (!checkWeekday(match[1], parsedArray, config)) {
-                return;
-            }
-
-            config._a = parsedArray;
-            config._tzm = calculateOffset(match[8], match[9], match[10]);
-
-            config._d = createUTCDate.apply(null, config._a);
-            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
-
-            getParsingFlags(config).rfc2822 = true;
-        } else {
-            config._isValid = false;
-        }
-    }
-
-    // date from iso format or fallback
-    function configFromString(config) {
-        var matched = aspNetJsonRegex.exec(config._i);
-
-        if (matched !== null) {
-            config._d = new Date(+matched[1]);
-            return;
-        }
-
-        configFromISO(config);
-        if (config._isValid === false) {
-            delete config._isValid;
-        } else {
-            return;
-        }
-
-        configFromRFC2822(config);
-        if (config._isValid === false) {
-            delete config._isValid;
-        } else {
-            return;
-        }
-
-        // Final attempt, use Input Fallback
-        hooks.createFromInputFallback(config);
-    }
-
-    hooks.createFromInputFallback = deprecate(
-        'value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), ' +
-        'which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are ' +
-        'discouraged and will be removed in an upcoming major release. Please refer to ' +
-        'http://momentjs.com/guides/#/warnings/js-date/ for more info.',
-        function (config) {
-            config._d = new Date(config._i + (config._useUTC ? ' UTC' : ''));
-        }
-    );
-
-    // constant that refers to the ISO standard
-    hooks.ISO_8601 = function () {};
-
-    // constant that refers to the RFC 2822 form
-    hooks.RFC_2822 = function () {};
-
-    // date from string and format string
-    function configFromStringAndFormat(config) {
-        // TODO: Move this to another part of the creation flow to prevent circular deps
-        if (config._f === hooks.ISO_8601) {
-            configFromISO(config);
-            return;
-        }
-        if (config._f === hooks.RFC_2822) {
-            configFromRFC2822(config);
-            return;
-        }
-        config._a = [];
-        getParsingFlags(config).empty = true;
-
-        // This array is used to make a Date, either with `new Date` or `Date.UTC`
-        var string = '' + config._i,
-            i, parsedInput, tokens, token, skipped,
-            stringLength = string.length,
-            totalParsedInputLength = 0;
-
-        tokens = expandFormat(config._f, config._locale).match(formattingTokens) || [];
-
-        for (i = 0; i < tokens.length; i++) {
-            token = tokens[i];
-            parsedInput = (string.match(getParseRegexForToken(token, config)) || [])[0];
-            // console.log('token', token, 'parsedInput', parsedInput,
-            //         'regex', getParseRegexForToken(token, config));
-            if (parsedInput) {
-                skipped = string.substr(0, string.indexOf(parsedInput));
-                if (skipped.length > 0) {
-                    getParsingFlags(config).unusedInput.push(skipped);
-                }
-                string = string.slice(string.indexOf(parsedInput) + parsedInput.length);
-                totalParsedInputLength += parsedInput.length;
-            }
-            // don't parse if it's not a known token
-            if (formatTokenFunctions[token]) {
-                if (parsedInput) {
-                    getParsingFlags(config).empty = false;
-                }
-                else {
-                    getParsingFlags(config).unusedTokens.push(token);
-                }
-                addTimeToArrayFromToken(token, parsedInput, config);
-            }
-            else if (config._strict && !parsedInput) {
-                getParsingFlags(config).unusedTokens.push(token);
-            }
-        }
-
-        // add remaining unparsed input length to the string
-        getParsingFlags(config).charsLeftOver = stringLength - totalParsedInputLength;
-        if (string.length > 0) {
-            getParsingFlags(config).unusedInput.push(string);
-        }
-
-        // clear _12h flag if hour is <= 12
-        if (config._a[HOUR] <= 12 &&
-            getParsingFlags(config).bigHour === true &&
-            config._a[HOUR] > 0) {
-            getParsingFlags(config).bigHour = undefined;
-        }
-
-        getParsingFlags(config).parsedDateParts = config._a.slice(0);
-        getParsingFlags(config).meridiem = config._meridiem;
-        // handle meridiem
-        config._a[HOUR] = meridiemFixWrap(config._locale, config._a[HOUR], config._meridiem);
-
-        configFromArray(config);
-        checkOverflow(config);
-    }
-
-
-    function meridiemFixWrap (locale, hour, meridiem) {
-        var isPm;
-
-        if (meridiem == null) {
-            // nothing to do
-            return hour;
-        }
-        if (locale.meridiemHour != null) {
-            return locale.meridiemHour(hour, meridiem);
-        } else if (locale.isPM != null) {
-            // Fallback
-            isPm = locale.isPM(meridiem);
-            if (isPm && hour < 12) {
-                hour += 12;
-            }
-            if (!isPm && hour === 12) {
-                hour = 0;
-            }
-            return hour;
-        } else {
-            // this is not supposed to happen
-            return hour;
-        }
-    }
-
-    // date from string and array of format strings
-    function configFromStringAndArray(config) {
-        var tempConfig,
-            bestMoment,
-
-            scoreToBeat,
-            i,
-            currentScore;
-
-        if (config._f.length === 0) {
-            getParsingFlags(config).invalidFormat = true;
-            config._d = new Date(NaN);
-            return;
-        }
-
-        for (i = 0; i < config._f.length; i++) {
-            currentScore = 0;
-            tempConfig = copyConfig({}, config);
-            if (config._useUTC != null) {
-                tempConfig._useUTC = config._useUTC;
-            }
-            tempConfig._f = config._f[i];
-            configFromStringAndFormat(tempConfig);
-
-            if (!isValid(tempConfig)) {
-                continue;
-            }
-
-            // if there is any input that was not parsed add a penalty for that format
-            currentScore += getParsingFlags(tempConfig).charsLeftOver;
-
-            //or tokens
-            currentScore += getParsingFlags(tempConfig).unusedTokens.length * 10;
-
-            getParsingFlags(tempConfig).score = currentScore;
-
-            if (scoreToBeat == null || currentScore < scoreToBeat) {
-                scoreToBeat = currentScore;
-                bestMoment = tempConfig;
-            }
-        }
-
-        extend(config, bestMoment || tempConfig);
-    }
-
-    function configFromObject(config) {
-        if (config._d) {
-            return;
-        }
-
-        var i = normalizeObjectUnits(config._i);
-        config._a = map([i.year, i.month, i.day || i.date, i.hour, i.minute, i.second, i.millisecond], function (obj) {
-            return obj && parseInt(obj, 10);
-        });
-
-        configFromArray(config);
-    }
-
-    function createFromConfig (config) {
-        var res = new Moment(checkOverflow(prepareConfig(config)));
-        if (res._nextDay) {
-            // Adding is smart enough around DST
-            res.add(1, 'd');
-            res._nextDay = undefined;
-        }
-
-        return res;
-    }
-
-    function prepareConfig (config) {
-        var input = config._i,
-            format = config._f;
-
-        config._locale = config._locale || getLocale(config._l);
-
-        if (input === null || (format === undefined && input === '')) {
-            return createInvalid({nullInput: true});
-        }
-
-        if (typeof input === 'string') {
-            config._i = input = config._locale.preparse(input);
-        }
-
-        if (isMoment(input)) {
-            return new Moment(checkOverflow(input));
-        } else if (isDate(input)) {
-            config._d = input;
-        } else if (isArray(format)) {
-            configFromStringAndArray(config);
-        } else if (format) {
-            configFromStringAndFormat(config);
-        }  else {
-            configFromInput(config);
-        }
-
-        if (!isValid(config)) {
-            config._d = null;
-        }
-
-        return config;
-    }
-
-    function configFromInput(config) {
-        var input = config._i;
-        if (isUndefined(input)) {
-            config._d = new Date(hooks.now());
-        } else if (isDate(input)) {
-            config._d = new Date(input.valueOf());
-        } else if (typeof input === 'string') {
-            configFromString(config);
-        } else if (isArray(input)) {
-            config._a = map(input.slice(0), function (obj) {
-                return parseInt(obj, 10);
-            });
-            configFromArray(config);
-        } else if (isObject(input)) {
-            configFromObject(config);
-        } else if (isNumber(input)) {
-            // from milliseconds
-            config._d = new Date(input);
-        } else {
-            hooks.createFromInputFallback(config);
-        }
-    }
-
-    function createLocalOrUTC (input, format, locale, strict, isUTC) {
-        var c = {};
-
-        if (locale === true || locale === false) {
-            strict = locale;
-            locale = undefined;
-        }
-
-        if ((isObject(input) && isObjectEmpty(input)) ||
-                (isArray(input) && input.length === 0)) {
-            input = undefined;
-        }
-        // object construction must be done this way.
-        // https://github.com/moment/moment/issues/1423
-        c._isAMomentObject = true;
-        c._useUTC = c._isUTC = isUTC;
-        c._l = locale;
-        c._i = input;
-        c._f = format;
-        c._strict = strict;
-
-        return createFromConfig(c);
-    }
-
-    function createLocal (input, format, locale, strict) {
-        return createLocalOrUTC(input, format, locale, strict, false);
-    }
-
-    var prototypeMin = deprecate(
-        'moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/',
-        function () {
-            var other = createLocal.apply(null, arguments);
-            if (this.isValid() && other.isValid()) {
-                return other < this ? this : other;
-            } else {
-                return createInvalid();
-            }
-        }
-    );
-
-    var prototypeMax = deprecate(
-        'moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/',
-        function () {
-            var other = createLocal.apply(null, arguments);
-            if (this.isValid() && other.isValid()) {
-                return other > this ? this : other;
-            } else {
-                return createInvalid();
-            }
-        }
-    );
-
-    // Pick a moment m from moments so that m[fn](other) is true for all
-    // other. This relies on the function fn to be transitive.
-    //
-    // moments should either be an array of moment objects or an array, whose
-    // first element is an array of moment objects.
-    function pickBy(fn, moments) {
-        var res, i;
-        if (moments.length === 1 && isArray(moments[0])) {
-            moments = moments[0];
-        }
-        if (!moments.length) {
-            return createLocal();
-        }
-        res = moments[0];
-        for (i = 1; i < moments.length; ++i) {
-            if (!moments[i].isValid() || moments[i][fn](res)) {
-                res = moments[i];
-            }
-        }
-        return res;
-    }
-
-    // TODO: Use [].sort instead?
-    function min () {
-        var args = [].slice.call(arguments, 0);
-
-        return pickBy('isBefore', args);
-    }
-
-    function max () {
-        var args = [].slice.call(arguments, 0);
-
-        return pickBy('isAfter', args);
-    }
-
-    var now = function () {
-        return Date.now ? Date.now() : +(new Date());
-    };
-
-    var ordering = ['year', 'quarter', 'month', 'week', 'day', 'hour', 'minute', 'second', 'millisecond'];
-
-    function isDurationValid(m) {
-        for (var key in m) {
-            if (!(indexOf.call(ordering, key) !== -1 && (m[key] == null || !isNaN(m[key])))) {
-                return false;
-            }
-        }
-
-        var unitHasDecimal = false;
-        for (var i = 0; i < ordering.length; ++i) {
-            if (m[ordering[i]]) {
-                if (unitHasDecimal) {
-                    return false; // only allow non-integers for smallest unit
-                }
-                if (parseFloat(m[ordering[i]]) !== toInt(m[ordering[i]])) {
-                    unitHasDecimal = true;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    function isValid$1() {
-        return this._isValid;
-    }
-
-    function createInvalid$1() {
-        return createDuration(NaN);
-    }
-
-    function Duration (duration) {
-        var normalizedInput = normalizeObjectUnits(duration),
-            years = normalizedInput.year || 0,
-            quarters = normalizedInput.quarter || 0,
-            months = normalizedInput.month || 0,
-            weeks = normalizedInput.week || normalizedInput.isoWeek || 0,
-            days = normalizedInput.day || 0,
-            hours = normalizedInput.hour || 0,
-            minutes = normalizedInput.minute || 0,
-            seconds = normalizedInput.second || 0,
-            milliseconds = normalizedInput.millisecond || 0;
-
-        this._isValid = isDurationValid(normalizedInput);
-
-        // representation for dateAddRemove
-        this._milliseconds = +milliseconds +
-            seconds * 1e3 + // 1000
-            minutes * 6e4 + // 1000 * 60
-            hours * 1000 * 60 * 60; //using 1000 * 60 * 60 instead of 36e5 to avoid floating point rounding errors https://github.com/moment/moment/issues/2978
-        // Because of dateAddRemove treats 24 hours as different from a
-        // day when working around DST, we need to store them separately
-        this._days = +days +
-            weeks * 7;
-        // It is impossible to translate months into days without knowing
-        // which months you are are talking about, so we have to store
-        // it separately.
-        this._months = +months +
-            quarters * 3 +
-            years * 12;
-
-        this._data = {};
-
-        this._locale = getLocale();
-
-        this._bubble();
-    }
-
-    function isDuration (obj) {
-        return obj instanceof Duration;
-    }
-
-    function absRound (number) {
-        if (number < 0) {
-            return Math.round(-1 * number) * -1;
-        } else {
-            return Math.round(number);
-        }
-    }
-
-    // FORMATTING
-
-    function offset (token, separator) {
-        addFormatToken(token, 0, 0, function () {
-            var offset = this.utcOffset();
-            var sign = '+';
-            if (offset < 0) {
-                offset = -offset;
-                sign = '-';
-            }
-            return sign + zeroFill(~~(offset / 60), 2) + separator + zeroFill(~~(offset) % 60, 2);
-        });
-    }
-
-    offset('Z', ':');
-    offset('ZZ', '');
-
-    // PARSING
-
-    addRegexToken('Z',  matchShortOffset);
-    addRegexToken('ZZ', matchShortOffset);
-    addParseToken(['Z', 'ZZ'], function (input, array, config) {
-        config._useUTC = true;
-        config._tzm = offsetFromString(matchShortOffset, input);
-    });
-
-    // HELPERS
-
-    // timezone chunker
-    // '+10:00' > ['10',  '00']
-    // '-1530'  > ['-15', '30']
-    var chunkOffset = /([\+\-]|\d\d)/gi;
-
-    function offsetFromString(matcher, string) {
-        var matches = (string || '').match(matcher);
-
-        if (matches === null) {
-            return null;
-        }
-
-        var chunk   = matches[matches.length - 1] || [];
-        var parts   = (chunk + '').match(chunkOffset) || ['-', 0, 0];
-        var minutes = +(parts[1] * 60) + toInt(parts[2]);
-
-        return minutes === 0 ?
-          0 :
-          parts[0] === '+' ? minutes : -minutes;
-    }
-
-    // Return a moment from input, that is local/utc/zone equivalent to model.
-    function cloneWithOffset(input, model) {
-        var res, diff;
-        if (model._isUTC) {
-            res = model.clone();
-            diff = (isMoment(input) || isDate(input) ? input.valueOf() : createLocal(input).valueOf()) - res.valueOf();
-            // Use low-level api, because this fn is low-level api.
-            res._d.setTime(res._d.valueOf() + diff);
-            hooks.updateOffset(res, false);
-            return res;
-        } else {
-            return createLocal(input).local();
-        }
-    }
-
-    function getDateOffset (m) {
-        // On Firefox.24 Date#getTimezoneOffset returns a floating point.
-        // https://github.com/moment/moment/pull/1871
-        return -Math.round(m._d.getTimezoneOffset() / 15) * 15;
-    }
-
-    // HOOKS
-
-    // This function will be called whenever a moment is mutated.
-    // It is intended to keep the offset in sync with the timezone.
-    hooks.updateOffset = function () {};
-
-    // MOMENTS
-
-    // keepLocalTime = true means only change the timezone, without
-    // affecting the local hour. So 5:31:26 +0300 --[utcOffset(2, true)]-->
-    // 5:31:26 +0200 It is possible that 5:31:26 doesn't exist with offset
-    // +0200, so we adjust the time as needed, to be valid.
-    //
-    // Keeping the time actually adds/subtracts (one hour)
-    // from the actual represented time. That is why we call updateOffset
-    // a second time. In case it wants us to change the offset again
-    // _changeInProgress == true case, then we have to adjust, because
-    // there is no such time in the given timezone.
-    function getSetOffset (input, keepLocalTime, keepMinutes) {
-        var offset = this._offset || 0,
-            localAdjust;
-        if (!this.isValid()) {
-            return input != null ? this : NaN;
-        }
-        if (input != null) {
-            if (typeof input === 'string') {
-                input = offsetFromString(matchShortOffset, input);
-                if (input === null) {
-                    return this;
-                }
-            } else if (Math.abs(input) < 16 && !keepMinutes) {
-                input = input * 60;
-            }
-            if (!this._isUTC && keepLocalTime) {
-                localAdjust = getDateOffset(this);
-            }
-            this._offset = input;
-            this._isUTC = true;
-            if (localAdjust != null) {
-                this.add(localAdjust, 'm');
-            }
-            if (offset !== input) {
-                if (!keepLocalTime || this._changeInProgress) {
-                    addSubtract(this, createDuration(input - offset, 'm'), 1, false);
-                } else if (!this._changeInProgress) {
-                    this._changeInProgress = true;
-                    hooks.updateOffset(this, true);
-                    this._changeInProgress = null;
-                }
-            }
-            return this;
-        } else {
-            return this._isUTC ? offset : getDateOffset(this);
-        }
-    }
-
-    function getSetZone (input, keepLocalTime) {
-        if (input != null) {
-            if (typeof input !== 'string') {
-                input = -input;
-            }
-
-            this.utcOffset(input, keepLocalTime);
-
-            return this;
-        } else {
-            return -this.utcOffset();
-        }
-    }
-
-    function setOffsetToUTC (keepLocalTime) {
-        return this.utcOffset(0, keepLocalTime);
-    }
-
-    function setOffsetToLocal (keepLocalTime) {
-        if (this._isUTC) {
-            this.utcOffset(0, keepLocalTime);
-            this._isUTC = false;
-
-            if (keepLocalTime) {
-                this.subtract(getDateOffset(this), 'm');
-            }
-        }
-        return this;
-    }
-
-    function setOffsetToParsedOffset () {
-        if (this._tzm != null) {
-            this.utcOffset(this._tzm, false, true);
-        } else if (typeof this._i === 'string') {
-            var tZone = offsetFromString(matchOffset, this._i);
-            if (tZone != null) {
-                this.utcOffset(tZone);
-            }
-            else {
-                this.utcOffset(0, true);
-            }
-        }
-        return this;
-    }
-
-    function hasAlignedHourOffset (input) {
-        if (!this.isValid()) {
-            return false;
-        }
-        input = input ? createLocal(input).utcOffset() : 0;
-
-        return (this.utcOffset() - input) % 60 === 0;
-    }
-
-    function isDaylightSavingTime () {
-        return (
-            this.utcOffset() > this.clone().month(0).utcOffset() ||
-            this.utcOffset() > this.clone().month(5).utcOffset()
-        );
-    }
-
-    function isDaylightSavingTimeShifted () {
-        if (!isUndefined(this._isDSTShifted)) {
-            return this._isDSTShifted;
-        }
-
-        var c = {};
-
-        copyConfig(c, this);
-        c = prepareConfig(c);
-
-        if (c._a) {
-            var other = c._isUTC ? createUTC(c._a) : createLocal(c._a);
-            this._isDSTShifted = this.isValid() &&
-                compareArrays(c._a, other.toArray()) > 0;
-        } else {
-            this._isDSTShifted = false;
-        }
-
-        return this._isDSTShifted;
-    }
-
-    function isLocal () {
-        return this.isValid() ? !this._isUTC : false;
-    }
-
-    function isUtcOffset () {
-        return this.isValid() ? this._isUTC : false;
-    }
-
-    function isUtc () {
-        return this.isValid() ? this._isUTC && this._offset === 0 : false;
-    }
-
-    // ASP.NET json date format regex
-    var aspNetRegex = /^(\-|\+)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/;
-
-    // from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html
-    // somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere
-    // and further modified to allow for strings containing both week and day
-    var isoRegex = /^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;
-
-    function createDuration (input, key) {
-        var duration = input,
-            // matching against regexp is expensive, do it on demand
-            match = null,
-            sign,
-            ret,
-            diffRes;
-
-        if (isDuration(input)) {
-            duration = {
-                ms : input._milliseconds,
-                d  : input._days,
-                M  : input._months
-            };
-        } else if (isNumber(input)) {
-            duration = {};
-            if (key) {
-                duration[key] = input;
-            } else {
-                duration.milliseconds = input;
-            }
-        } else if (!!(match = aspNetRegex.exec(input))) {
-            sign = (match[1] === '-') ? -1 : 1;
-            duration = {
-                y  : 0,
-                d  : toInt(match[DATE])                         * sign,
-                h  : toInt(match[HOUR])                         * sign,
-                m  : toInt(match[MINUTE])                       * sign,
-                s  : toInt(match[SECOND])                       * sign,
-                ms : toInt(absRound(match[MILLISECOND] * 1000)) * sign // the millisecond decimal point is included in the match
-            };
-        } else if (!!(match = isoRegex.exec(input))) {
-            sign = (match[1] === '-') ? -1 : 1;
-            duration = {
-                y : parseIso(match[2], sign),
-                M : parseIso(match[3], sign),
-                w : parseIso(match[4], sign),
-                d : parseIso(match[5], sign),
-                h : parseIso(match[6], sign),
-                m : parseIso(match[7], sign),
-                s : parseIso(match[8], sign)
-            };
-        } else if (duration == null) {// checks for null or undefined
-            duration = {};
-        } else if (typeof duration === 'object' && ('from' in duration || 'to' in duration)) {
-            diffRes = momentsDifference(createLocal(duration.from), createLocal(duration.to));
-
-            duration = {};
-            duration.ms = diffRes.milliseconds;
-            duration.M = diffRes.months;
-        }
-
-        ret = new Duration(duration);
-
-        if (isDuration(input) && hasOwnProp(input, '_locale')) {
-            ret._locale = input._locale;
-        }
-
-        return ret;
-    }
-
-    createDuration.fn = Duration.prototype;
-    createDuration.invalid = createInvalid$1;
-
-    function parseIso (inp, sign) {
-        // We'd normally use ~~inp for this, but unfortunately it also
-        // converts floats to ints.
-        // inp may be undefined, so careful calling replace on it.
-        var res = inp && parseFloat(inp.replace(',', '.'));
-        // apply sign while we're at it
-        return (isNaN(res) ? 0 : res) * sign;
-    }
-
-    function positiveMomentsDifference(base, other) {
-        var res = {};
-
-        res.months = other.month() - base.month() +
-            (other.year() - base.year()) * 12;
-        if (base.clone().add(res.months, 'M').isAfter(other)) {
-            --res.months;
-        }
-
-        res.milliseconds = +other - +(base.clone().add(res.months, 'M'));
-
-        return res;
-    }
-
-    function momentsDifference(base, other) {
-        var res;
-        if (!(base.isValid() && other.isValid())) {
-            return {milliseconds: 0, months: 0};
-        }
-
-        other = cloneWithOffset(other, base);
-        if (base.isBefore(other)) {
-            res = positiveMomentsDifference(base, other);
-        } else {
-            res = positiveMomentsDifference(other, base);
-            res.milliseconds = -res.milliseconds;
-            res.months = -res.months;
-        }
-
-        return res;
-    }
-
-    // TODO: remove 'name' arg after deprecation is removed
-    function createAdder(direction, name) {
-        return function (val, period) {
-            var dur, tmp;
-            //invert the arguments, but complain about it
-            if (period !== null && !isNaN(+period)) {
-                deprecateSimple(name, 'moment().' + name  + '(period, number) is deprecated. Please use moment().' + name + '(number, period). ' +
-                'See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info.');
-                tmp = val; val = period; period = tmp;
-            }
-
-            val = typeof val === 'string' ? +val : val;
-            dur = createDuration(val, period);
-            addSubtract(this, dur, direction);
-            return this;
-        };
-    }
-
-    function addSubtract (mom, duration, isAdding, updateOffset) {
-        var milliseconds = duration._milliseconds,
-            days = absRound(duration._days),
-            months = absRound(duration._months);
-
-        if (!mom.isValid()) {
-            // No op
-            return;
-        }
-
-        updateOffset = updateOffset == null ? true : updateOffset;
-
-        if (months) {
-            setMonth(mom, get(mom, 'Month') + months * isAdding);
-        }
-        if (days) {
-            set$1(mom, 'Date', get(mom, 'Date') + days * isAdding);
-        }
-        if (milliseconds) {
-            mom._d.setTime(mom._d.valueOf() + milliseconds * isAdding);
-        }
-        if (updateOffset) {
-            hooks.updateOffset(mom, days || months);
-        }
-    }
-
-    var add      = createAdder(1, 'add');
-    var subtract = createAdder(-1, 'subtract');
-
-    function getCalendarFormat(myMoment, now) {
-        var diff = myMoment.diff(now, 'days', true);
-        return diff < -6 ? 'sameElse' :
-                diff < -1 ? 'lastWeek' :
-                diff < 0 ? 'lastDay' :
-                diff < 1 ? 'sameDay' :
-                diff < 2 ? 'nextDay' :
-                diff < 7 ? 'nextWeek' : 'sameElse';
-    }
-
-    function calendar$1 (time, formats) {
-        // We want to compare the start of today, vs this.
-        // Getting start-of-today depends on whether we're local/utc/offset or not.
-        var now = time || createLocal(),
-            sod = cloneWithOffset(now, this).startOf('day'),
-            format = hooks.calendarFormat(this, sod) || 'sameElse';
-
-        var output = formats && (isFunction(formats[format]) ? formats[format].call(this, now) : formats[format]);
-
-        return this.format(output || this.localeData().calendar(format, this, createLocal(now)));
-    }
-
-    function clone () {
-        return new Moment(this);
-    }
-
-    function isAfter (input, units) {
-        var localInput = isMoment(input) ? input : createLocal(input);
-        if (!(this.isValid() && localInput.isValid())) {
-            return false;
-        }
-        units = normalizeUnits(units) || 'millisecond';
-        if (units === 'millisecond') {
-            return this.valueOf() > localInput.valueOf();
-        } else {
-            return localInput.valueOf() < this.clone().startOf(units).valueOf();
-        }
-    }
-
-    function isBefore (input, units) {
-        var localInput = isMoment(input) ? input : createLocal(input);
-        if (!(this.isValid() && localInput.isValid())) {
-            return false;
-        }
-        units = normalizeUnits(units) || 'millisecond';
-        if (units === 'millisecond') {
-            return this.valueOf() < localInput.valueOf();
-        } else {
-            return this.clone().endOf(units).valueOf() < localInput.valueOf();
-        }
-    }
-
-    function isBetween (from, to, units, inclusivity) {
-        var localFrom = isMoment(from) ? from : createLocal(from),
-            localTo = isMoment(to) ? to : createLocal(to);
-        if (!(this.isValid() && localFrom.isValid() && localTo.isValid())) {
-            return false;
-        }
-        inclusivity = inclusivity || '()';
-        return (inclusivity[0] === '(' ? this.isAfter(localFrom, units) : !this.isBefore(localFrom, units)) &&
-            (inclusivity[1] === ')' ? this.isBefore(localTo, units) : !this.isAfter(localTo, units));
-    }
-
-    function isSame (input, units) {
-        var localInput = isMoment(input) ? input : createLocal(input),
-            inputMs;
-        if (!(this.isValid() && localInput.isValid())) {
-            return false;
-        }
-        units = normalizeUnits(units) || 'millisecond';
-        if (units === 'millisecond') {
-            return this.valueOf() === localInput.valueOf();
-        } else {
-            inputMs = localInput.valueOf();
-            return this.clone().startOf(units).valueOf() <= inputMs && inputMs <= this.clone().endOf(units).valueOf();
-        }
-    }
-
-    function isSameOrAfter (input, units) {
-        return this.isSame(input, units) || this.isAfter(input, units);
-    }
-
-    function isSameOrBefore (input, units) {
-        return this.isSame(input, units) || this.isBefore(input, units);
-    }
-
-    function diff (input, units, asFloat) {
-        var that,
-            zoneDelta,
-            output;
-
-        if (!this.isValid()) {
-            return NaN;
-        }
-
-        that = cloneWithOffset(input, this);
-
-        if (!that.isValid()) {
-            return NaN;
-        }
-
-        zoneDelta = (that.utcOffset() - this.utcOffset()) * 6e4;
-
-        units = normalizeUnits(units);
-
-        switch (units) {
-            case 'year': output = monthDiff(this, that) / 12; break;
-            case 'month': output = monthDiff(this, that); break;
-            case 'quarter': output = monthDiff(this, that) / 3; break;
-            case 'second': output = (this - that) / 1e3; break; // 1000
-            case 'minute': output = (this - that) / 6e4; break; // 1000 * 60
-            case 'hour': output = (this - that) / 36e5; break; // 1000 * 60 * 60
-            case 'day': output = (this - that - zoneDelta) / 864e5; break; // 1000 * 60 * 60 * 24, negate dst
-            case 'week': output = (this - that - zoneDelta) / 6048e5; break; // 1000 * 60 * 60 * 24 * 7, negate dst
-            default: output = this - that;
-        }
-
-        return asFloat ? output : absFloor(output);
-    }
-
-    function monthDiff (a, b) {
-        // difference in months
-        var wholeMonthDiff = ((b.year() - a.year()) * 12) + (b.month() - a.month()),
-            // b is in (anchor - 1 month, anchor + 1 month)
-            anchor = a.clone().add(wholeMonthDiff, 'months'),
-            anchor2, adjust;
-
-        if (b - anchor < 0) {
-            anchor2 = a.clone().add(wholeMonthDiff - 1, 'months');
-            // linear across the month
-            adjust = (b - anchor) / (anchor - anchor2);
-        } else {
-            anchor2 = a.clone().add(wholeMonthDiff + 1, 'months');
-            // linear across the month
-            adjust = (b - anchor) / (anchor2 - anchor);
-        }
-
-        //check for negative zero, return zero if negative zero
-        return -(wholeMonthDiff + adjust) || 0;
-    }
-
-    hooks.defaultFormat = 'YYYY-MM-DDTHH:mm:ssZ';
-    hooks.defaultFormatUtc = 'YYYY-MM-DDTHH:mm:ss[Z]';
-
-    function toString () {
-        return this.clone().locale('en').format('ddd MMM DD YYYY HH:mm:ss [GMT]ZZ');
-    }
-
-    function toISOString(keepOffset) {
-        if (!this.isValid()) {
-            return null;
-        }
-        var utc = keepOffset !== true;
-        var m = utc ? this.clone().utc() : this;
-        if (m.year() < 0 || m.year() > 9999) {
-            return formatMoment(m, utc ? 'YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYYYY-MM-DD[T]HH:mm:ss.SSSZ');
-        }
-        if (isFunction(Date.prototype.toISOString)) {
-            // native implementation is ~50x faster, use it when we can
-            if (utc) {
-                return this.toDate().toISOString();
-            } else {
-                return new Date(this.valueOf() + this.utcOffset() * 60 * 1000).toISOString().replace('Z', formatMoment(m, 'Z'));
-            }
-        }
-        return formatMoment(m, utc ? 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYY-MM-DD[T]HH:mm:ss.SSSZ');
-    }
-
-    /**
-     * Return a human readable representation of a moment that can
-     * also be evaluated to get a new moment which is the same
-     *
-     * @link https://nodejs.org/dist/latest/docs/api/util.html#util_custom_inspect_function_on_objects
-     */
-    function inspect () {
-        if (!this.isValid()) {
-            return 'moment.invalid(/* ' + this._i + ' */)';
-        }
-        var func = 'moment';
-        var zone = '';
-        if (!this.isLocal()) {
-            func = this.utcOffset() === 0 ? 'moment.utc' : 'moment.parseZone';
-            zone = 'Z';
-        }
-        var prefix = '[' + func + '("]';
-        var year = (0 <= this.year() && this.year() <= 9999) ? 'YYYY' : 'YYYYYY';
-        var datetime = '-MM-DD[T]HH:mm:ss.SSS';
-        var suffix = zone + '[")]';
-
-        return this.format(prefix + year + datetime + suffix);
-    }
-
-    function format (inputString) {
-        if (!inputString) {
-            inputString = this.isUtc() ? hooks.defaultFormatUtc : hooks.defaultFormat;
-        }
-        var output = formatMoment(this, inputString);
-        return this.localeData().postformat(output);
-    }
-
-    function from (time, withoutSuffix) {
-        if (this.isValid() &&
-                ((isMoment(time) && time.isValid()) ||
-                 createLocal(time).isValid())) {
-            return createDuration({to: this, from: time}).locale(this.locale()).humanize(!withoutSuffix);
-        } else {
-            return this.localeData().invalidDate();
-        }
-    }
-
-    function fromNow (withoutSuffix) {
-        return this.from(createLocal(), withoutSuffix);
-    }
-
-    function to (time, withoutSuffix) {
-        if (this.isValid() &&
-                ((isMoment(time) && time.isValid()) ||
-                 createLocal(time).isValid())) {
-            return createDuration({from: this, to: time}).locale(this.locale()).humanize(!withoutSuffix);
-        } else {
-            return this.localeData().invalidDate();
-        }
-    }
-
-    function toNow (withoutSuffix) {
-        return this.to(createLocal(), withoutSuffix);
-    }
-
-    // If passed a locale key, it will set the locale for this
-    // instance.  Otherwise, it will return the locale configuration
-    // variables for this instance.
-    function locale (key) {
-        var newLocaleData;
-
-        if (key === undefined) {
-            return this._locale._abbr;
-        } else {
-            newLocaleData = getLocale(key);
-            if (newLocaleData != null) {
-                this._locale = newLocaleData;
-            }
-            return this;
-        }
-    }
-
-    var lang = deprecate(
-        'moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.',
-        function (key) {
-            if (key === undefined) {
-                return this.localeData();
-            } else {
-                return this.locale(key);
-            }
-        }
-    );
-
-    function localeData () {
-        return this._locale;
-    }
-
-    var MS_PER_SECOND = 1000;
-    var MS_PER_MINUTE = 60 * MS_PER_SECOND;
-    var MS_PER_HOUR = 60 * MS_PER_MINUTE;
-    var MS_PER_400_YEARS = (365 * 400 + 97) * 24 * MS_PER_HOUR;
-
-    // actual modulo - handles negative numbers (for dates before 1970):
-    function mod$1(dividend, divisor) {
-        return (dividend % divisor + divisor) % divisor;
-    }
-
-    function localStartOfDate(y, m, d) {
-        // the date constructor remaps years 0-99 to 1900-1999
-        if (y < 100 && y >= 0) {
-            // preserve leap years using a full 400 year cycle, then reset
-            return new Date(y + 400, m, d) - MS_PER_400_YEARS;
-        } else {
-            return new Date(y, m, d).valueOf();
-        }
-    }
-
-    function utcStartOfDate(y, m, d) {
-        // Date.UTC remaps years 0-99 to 1900-1999
-        if (y < 100 && y >= 0) {
-            // preserve leap years using a full 400 year cycle, then reset
-            return Date.UTC(y + 400, m, d) - MS_PER_400_YEARS;
-        } else {
-            return Date.UTC(y, m, d);
-        }
-    }
-
-    function startOf (units) {
-        var time;
-        units = normalizeUnits(units);
-        if (units === undefined || units === 'millisecond' || !this.isValid()) {
-            return this;
-        }
-
-        var startOfDate = this._isUTC ? utcStartOfDate : localStartOfDate;
-
-        switch (units) {
-            case 'year':
-                time = startOfDate(this.year(), 0, 1);
-                break;
-            case 'quarter':
-                time = startOfDate(this.year(), this.month() - this.month() % 3, 1);
-                break;
-            case 'month':
-                time = startOfDate(this.year(), this.month(), 1);
-                break;
-            case 'week':
-                time = startOfDate(this.year(), this.month(), this.date() - this.weekday());
-                break;
-            case 'isoWeek':
-                time = startOfDate(this.year(), this.month(), this.date() - (this.isoWeekday() - 1));
-                break;
-            case 'day':
-            case 'date':
-                time = startOfDate(this.year(), this.month(), this.date());
-                break;
-            case 'hour':
-                time = this._d.valueOf();
-                time -= mod$1(time + (this._isUTC ? 0 : this.utcOffset() * MS_PER_MINUTE), MS_PER_HOUR);
-                break;
-            case 'minute':
-                time = this._d.valueOf();
-                time -= mod$1(time, MS_PER_MINUTE);
-                break;
-            case 'second':
-                time = this._d.valueOf();
-                time -= mod$1(time, MS_PER_SECOND);
-                break;
-        }
-
-        this._d.setTime(time);
-        hooks.updateOffset(this, true);
-        return this;
-    }
-
-    function endOf (units) {
-        var time;
-        units = normalizeUnits(units);
-        if (units === undefined || units === 'millisecond' || !this.isValid()) {
-            return this;
-        }
-
-        var startOfDate = this._isUTC ? utcStartOfDate : localStartOfDate;
-
-        switch (units) {
-            case 'year':
-                time = startOfDate(this.year() + 1, 0, 1) - 1;
-                break;
-            case 'quarter':
-                time = startOfDate(this.year(), this.month() - this.month() % 3 + 3, 1) - 1;
-                break;
-            case 'month':
-                time = startOfDate(this.year(), this.month() + 1, 1) - 1;
-                break;
-            case 'week':
-                time = startOfDate(this.year(), this.month(), this.date() - this.weekday() + 7) - 1;
-                break;
-            case 'isoWeek':
-                time = startOfDate(this.year(), this.month(), this.date() - (this.isoWeekday() - 1) + 7) - 1;
-                break;
-            case 'day':
-            case 'date':
-                time = startOfDate(this.year(), this.month(), this.date() + 1) - 1;
-                break;
-            case 'hour':
-                time = this._d.valueOf();
-                time += MS_PER_HOUR - mod$1(time + (this._isUTC ? 0 : this.utcOffset() * MS_PER_MINUTE), MS_PER_HOUR) - 1;
-                break;
-            case 'minute':
-                time = this._d.valueOf();
-                time += MS_PER_MINUTE - mod$1(time, MS_PER_MINUTE) - 1;
-                break;
-            case 'second':
-                time = this._d.valueOf();
-                time += MS_PER_SECOND - mod$1(time, MS_PER_SECOND) - 1;
-                break;
-        }
-
-        this._d.setTime(time);
-        hooks.updateOffset(this, true);
-        return this;
-    }
-
-    function valueOf () {
-        return this._d.valueOf() - ((this._offset || 0) * 60000);
-    }
-
-    function unix () {
-        return Math.floor(this.valueOf() / 1000);
-    }
-
-    function toDate () {
-        return new Date(this.valueOf());
-    }
-
-    function toArray () {
-        var m = this;
-        return [m.year(), m.month(), m.date(), m.hour(), m.minute(), m.second(), m.millisecond()];
-    }
-
-    function toObject () {
-        var m = this;
-        return {
-            years: m.year(),
-            months: m.month(),
-            date: m.date(),
-            hours: m.hours(),
-            minutes: m.minutes(),
-            seconds: m.seconds(),
-            milliseconds: m.milliseconds()
-        };
-    }
-
-    function toJSON () {
-        // new Date(NaN).toJSON() === null
-        return this.isValid() ? this.toISOString() : null;
-    }
-
-    function isValid$2 () {
-        return isValid(this);
-    }
-
-    function parsingFlags () {
-        return extend({}, getParsingFlags(this));
-    }
-
-    function invalidAt () {
-        return getParsingFlags(this).overflow;
-    }
-
-    function creationData() {
-        return {
-            input: this._i,
-            format: this._f,
-            locale: this._locale,
-            isUTC: this._isUTC,
-            strict: this._strict
-        };
-    }
-
-    // FORMATTING
-
-    addFormatToken(0, ['gg', 2], 0, function () {
-        return this.weekYear() % 100;
-    });
-
-    addFormatToken(0, ['GG', 2], 0, function () {
-        return this.isoWeekYear() % 100;
-    });
-
-    function addWeekYearFormatToken (token, getter) {
-        addFormatToken(0, [token, token.length], 0, getter);
-    }
-
-    addWeekYearFormatToken('gggg',     'weekYear');
-    addWeekYearFormatToken('ggggg',    'weekYear');
-    addWeekYearFormatToken('GGGG',  'isoWeekYear');
-    addWeekYearFormatToken('GGGGG', 'isoWeekYear');
-
-    // ALIASES
-
-    addUnitAlias('weekYear', 'gg');
-    addUnitAlias('isoWeekYear', 'GG');
-
-    // PRIORITY
-
-    addUnitPriority('weekYear', 1);
-    addUnitPriority('isoWeekYear', 1);
-
-
-    // PARSING
-
-    addRegexToken('G',      matchSigned);
-    addRegexToken('g',      matchSigned);
-    addRegexToken('GG',     match1to2, match2);
-    addRegexToken('gg',     match1to2, match2);
-    addRegexToken('GGGG',   match1to4, match4);
-    addRegexToken('gggg',   match1to4, match4);
-    addRegexToken('GGGGG',  match1to6, match6);
-    addRegexToken('ggggg',  match1to6, match6);
-
-    addWeekParseToken(['gggg', 'ggggg', 'GGGG', 'GGGGG'], function (input, week, config, token) {
-        week[token.substr(0, 2)] = toInt(input);
-    });
-
-    addWeekParseToken(['gg', 'GG'], function (input, week, config, token) {
-        week[token] = hooks.parseTwoDigitYear(input);
-    });
-
-    // MOMENTS
+	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+		typeof define === 'function' && define.amd ? define(factory) :
+			global.moment = factory()
+}(this, (function () {
+	'use strict';
+
+	var hookCallback;
+
+	function hooks() {
+		return hookCallback.apply(null, arguments);
+	}
+
+	// This is done to register the method called with moment()
+	// without creating circular dependencies.
+	function setHookCallback(callback) {
+		hookCallback = callback;
+	}
+
+	function isArray(input) {
+		return input instanceof Array || Object.prototype.toString.call(input) === '[object Array]';
+	}
+
+	function isObject(input) {
+		// IE8 will treat undefined and null as object if it wasn't for
+		// input != null
+		return input != null && Object.prototype.toString.call(input) === '[object Object]';
+	}
+
+	function isObjectEmpty(obj) {
+		if (Object.getOwnPropertyNames) {
+			return (Object.getOwnPropertyNames(obj).length === 0);
+		} else {
+			var k;
+			for (k in obj) {
+				if (obj.hasOwnProperty(k)) {
+					return false;
+				}
+			}
+			return true;
+		}
+	}
+
+	function isUndefined(input) {
+		return input === void 0;
+	}
+
+	function isNumber(input) {
+		return typeof input === 'number' || Object.prototype.toString.call(input) === '[object Number]';
+	}
+
+	function isDate(input) {
+		return input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';
+	}
+
+	function map(arr, fn) {
+		var res = [], i;
+		for (i = 0; i < arr.length; ++i) {
+			res.push(fn(arr[i], i));
+		}
+		return res;
+	}
+
+	function hasOwnProp(a, b) {
+		return Object.prototype.hasOwnProperty.call(a, b);
+	}
+
+	function extend(a, b) {
+		for (var i in b) {
+			if (hasOwnProp(b, i)) {
+				a[i] = b[i];
+			}
+		}
+
+		if (hasOwnProp(b, 'toString')) {
+			a.toString = b.toString;
+		}
+
+		if (hasOwnProp(b, 'valueOf')) {
+			a.valueOf = b.valueOf;
+		}
+
+		return a;
+	}
+
+	function createUTC(input, format, locale, strict) {
+		return createLocalOrUTC(input, format, locale, strict, true).utc();
+	}
+
+	function defaultParsingFlags() {
+		// We need to deep clone this object.
+		return {
+			empty: false,
+			unusedTokens: [],
+			unusedInput: [],
+			overflow: -2,
+			charsLeftOver: 0,
+			nullInput: false,
+			invalidMonth: null,
+			invalidFormat: false,
+			userInvalidated: false,
+			iso: false,
+			parsedDateParts: [],
+			meridiem: null,
+			rfc2822: false,
+			weekdayMismatch: false
+		};
+	}
+
+	function getParsingFlags(m) {
+		if (m._pf == null) {
+			m._pf = defaultParsingFlags();
+		}
+		return m._pf;
+	}
+
+	var some;
+	if (Array.prototype.some) {
+		some = Array.prototype.some;
+	} else {
+		some = function (fun) {
+			var t = Object(this);
+			var len = t.length >>> 0;
+
+			for (var i = 0; i < len; i++) {
+				if (i in t && fun.call(this, t[i], i, t)) {
+					return true;
+				}
+			}
+
+			return false;
+		};
+	}
+
+	function isValid(m) {
+		if (m._isValid == null) {
+			var flags = getParsingFlags(m);
+			var parsedParts = some.call(flags.parsedDateParts, function (i) {
+				return i != null;
+			});
+			var isNowValid = !isNaN(m._d.getTime()) &&
+				flags.overflow < 0 &&
+				!flags.empty &&
+				!flags.invalidMonth &&
+				!flags.invalidWeekday &&
+				!flags.weekdayMismatch &&
+				!flags.nullInput &&
+				!flags.invalidFormat &&
+				!flags.userInvalidated &&
+				(!flags.meridiem || (flags.meridiem && parsedParts));
+
+			if (m._strict) {
+				isNowValid = isNowValid &&
+					flags.charsLeftOver === 0 &&
+					flags.unusedTokens.length === 0 &&
+					flags.bigHour === undefined;
+			}
+
+			if (Object.isFrozen == null || !Object.isFrozen(m)) {
+				m._isValid = isNowValid;
+			} else {
+				return isNowValid;
+			}
+		}
+		return m._isValid;
+	}
+
+	function createInvalid(flags) {
+		var m = createUTC(NaN);
+		if (flags != null) {
+			extend(getParsingFlags(m), flags);
+		} else {
+			getParsingFlags(m).userInvalidated = true;
+		}
+
+		return m;
+	}
+
+	// Plugins that add properties should also add the key here (null value),
+	// so we can properly clone ourselves.
+	var momentProperties = hooks.momentProperties = [];
+
+	function copyConfig(to, from) {
+		var i, prop, val;
+
+		if (!isUndefined(from._isAMomentObject)) {
+			to._isAMomentObject = from._isAMomentObject;
+		}
+		if (!isUndefined(from._i)) {
+			to._i = from._i;
+		}
+		if (!isUndefined(from._f)) {
+			to._f = from._f;
+		}
+		if (!isUndefined(from._l)) {
+			to._l = from._l;
+		}
+		if (!isUndefined(from._strict)) {
+			to._strict = from._strict;
+		}
+		if (!isUndefined(from._tzm)) {
+			to._tzm = from._tzm;
+		}
+		if (!isUndefined(from._isUTC)) {
+			to._isUTC = from._isUTC;
+		}
+		if (!isUndefined(from._offset)) {
+			to._offset = from._offset;
+		}
+		if (!isUndefined(from._pf)) {
+			to._pf = getParsingFlags(from);
+		}
+		if (!isUndefined(from._locale)) {
+			to._locale = from._locale;
+		}
+
+		if (momentProperties.length > 0) {
+			for (i = 0; i < momentProperties.length; i++) {
+				prop = momentProperties[i];
+				val = from[prop];
+				if (!isUndefined(val)) {
+					to[prop] = val;
+				}
+			}
+		}
+
+		return to;
+	}
+
+	var updateInProgress = false;
+
+	// Moment prototype object
+	function Moment(config) {
+		copyConfig(this, config);
+		this._d = new Date(config._d != null ? config._d.getTime() : NaN);
+		if (!this.isValid()) {
+			this._d = new Date(NaN);
+		}
+		// Prevent infinite loop in case updateOffset creates new moment
+		// objects.
+		if (updateInProgress === false) {
+			updateInProgress = true;
+			hooks.updateOffset(this);
+			updateInProgress = false;
+		}
+	}
+
+	function isMoment(obj) {
+		return obj instanceof Moment || (obj != null && obj._isAMomentObject != null);
+	}
+
+	function absFloor(number) {
+		if (number < 0) {
+			// -0 -> 0
+			return Math.ceil(number) || 0;
+		} else {
+			return Math.floor(number);
+		}
+	}
+
+	function toInt(argumentForCoercion) {
+		var coercedNumber = +argumentForCoercion,
+			value = 0;
+
+		if (coercedNumber !== 0 && isFinite(coercedNumber)) {
+			value = absFloor(coercedNumber);
+		}
+
+		return value;
+	}
+
+	// compare two arrays, return the number of differences
+	function compareArrays(array1, array2, dontConvert) {
+		var len = Math.min(array1.length, array2.length),
+			lengthDiff = Math.abs(array1.length - array2.length),
+			diffs = 0,
+			i;
+		for (i = 0; i < len; i++) {
+			if ((dontConvert && array1[i] !== array2[i]) ||
+				(!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) {
+				diffs++;
+			}
+		}
+		return diffs + lengthDiff;
+	}
+
+	function warn(msg) {
+		if (hooks.suppressDeprecationWarnings === false &&
+			(typeof console !== 'undefined') && console.warn) {
+			console.warn('Deprecation warning: ' + msg);
+		}
+	}
+
+	function deprecate(msg, fn) {
+		var firstTime = true;
+
+		return extend(function () {
+			if (hooks.deprecationHandler != null) {
+				hooks.deprecationHandler(null, msg);
+			}
+			if (firstTime) {
+				var args = [];
+				var arg;
+				for (var i = 0; i < arguments.length; i++) {
+					arg = '';
+					if (typeof arguments[i] === 'object') {
+						arg += '\n[' + i + '] ';
+						for (var key in arguments[0]) {
+							arg += key + ': ' + arguments[0][key] + ', ';
+						}
+						arg = arg.slice(0, -2); // Remove trailing comma and space
+					} else {
+						arg = arguments[i];
+					}
+					args.push(arg);
+				}
+				warn(msg + '\nArguments: ' + Array.prototype.slice.call(args).join('') + '\n' + (new Error()).stack);
+				firstTime = false;
+			}
+			return fn.apply(this, arguments);
+		}, fn);
+	}
+
+	var deprecations = {};
+
+	function deprecateSimple(name, msg) {
+		if (hooks.deprecationHandler != null) {
+			hooks.deprecationHandler(name, msg);
+		}
+		if (!deprecations[name]) {
+			warn(msg);
+			deprecations[name] = true;
+		}
+	}
+
+	hooks.suppressDeprecationWarnings = false;
+	hooks.deprecationHandler = null;
+
+	function isFunction(input) {
+		return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]';
+	}
+
+	function set(config) {
+		var prop, i;
+		for (i in config) {
+			prop = config[i];
+			if (isFunction(prop)) {
+				this[i] = prop;
+			} else {
+				this['_' + i] = prop;
+			}
+		}
+		this._config = config;
+		// Lenient ordinal parsing accepts just a number in addition to
+		// number + (possibly) stuff coming from _dayOfMonthOrdinalParse.
+		// TODO: Remove "ordinalParse" fallback in next major release.
+		this._dayOfMonthOrdinalParseLenient = new RegExp(
+			(this._dayOfMonthOrdinalParse.source || this._ordinalParse.source) +
+			'|' + (/\d{1,2}/).source);
+	}
+
+	function mergeConfigs(parentConfig, childConfig) {
+		var res = extend({}, parentConfig), prop;
+		for (prop in childConfig) {
+			if (hasOwnProp(childConfig, prop)) {
+				if (isObject(parentConfig[prop]) && isObject(childConfig[prop])) {
+					res[prop] = {};
+					extend(res[prop], parentConfig[prop]);
+					extend(res[prop], childConfig[prop]);
+				} else if (childConfig[prop] != null) {
+					res[prop] = childConfig[prop];
+				} else {
+					delete res[prop];
+				}
+			}
+		}
+		for (prop in parentConfig) {
+			if (hasOwnProp(parentConfig, prop) &&
+				!hasOwnProp(childConfig, prop) &&
+				isObject(parentConfig[prop])) {
+				// make sure changes to properties don't modify parent config
+				res[prop] = extend({}, res[prop]);
+			}
+		}
+		return res;
+	}
+
+	function Locale(config) {
+		if (config != null) {
+			this.set(config);
+		}
+	}
+
+	var keys;
+
+	if (Object.keys) {
+		keys = Object.keys;
+	} else {
+		keys = function (obj) {
+			var i, res = [];
+			for (i in obj) {
+				if (hasOwnProp(obj, i)) {
+					res.push(i);
+				}
+			}
+			return res;
+		};
+	}
+
+	var defaultCalendar = {
+		sameDay: '[Today at] LT',
+		nextDay: '[Tomorrow at] LT',
+		nextWeek: 'dddd [at] LT',
+		lastDay: '[Yesterday at] LT',
+		lastWeek: '[Last] dddd [at] LT',
+		sameElse: 'L'
+	};
+
+	function calendar(key, mom, now) {
+		var output = this._calendar[key] || this._calendar['sameElse'];
+		return isFunction(output) ? output.call(mom, now) : output;
+	}
+
+	var defaultLongDateFormat = {
+		LTS: 'h:mm:ss A',
+		LT: 'h:mm A',
+		L: 'MM/DD/YYYY',
+		LL: 'MMMM D, YYYY',
+		LLL: 'MMMM D, YYYY h:mm A',
+		LLLL: 'dddd, MMMM D, YYYY h:mm A'
+	};
+
+	function longDateFormat(key) {
+		var format = this._longDateFormat[key],
+			formatUpper = this._longDateFormat[key.toUpperCase()];
+
+		if (format || !formatUpper) {
+			return format;
+		}
+
+		this._longDateFormat[key] = formatUpper.replace(/MMMM|MM|DD|dddd/g, function (val) {
+			return val.slice(1);
+		});
+
+		return this._longDateFormat[key];
+	}
+
+	var defaultInvalidDate = 'Invalid date';
+
+	function invalidDate() {
+		return this._invalidDate;
+	}
+
+	var defaultOrdinal = '%d';
+	var defaultDayOfMonthOrdinalParse = /\d{1,2}/;
+
+	function ordinal(number) {
+		return this._ordinal.replace('%d', number);
+	}
+
+	var defaultRelativeTime = {
+		future: 'in %s',
+		past: '%s ago',
+		s: 'a few seconds',
+		ss: '%d seconds',
+		m: 'a minute',
+		mm: '%d minutes',
+		h: 'an hour',
+		hh: '%d hours',
+		d: 'a day',
+		dd: '%d days',
+		M: 'a month',
+		MM: '%d months',
+		y: 'a year',
+		yy: '%d years'
+	};
+
+	function relativeTime(number, withoutSuffix, string, isFuture) {
+		var output = this._relativeTime[string];
+		return (isFunction(output)) ?
+			output(number, withoutSuffix, string, isFuture) :
+			output.replace(/%d/i, number);
+	}
+
+	function pastFuture(diff, output) {
+		var format = this._relativeTime[diff > 0 ? 'future' : 'past'];
+		return isFunction(format) ? format(output) : format.replace(/%s/i, output);
+	}
+
+	var aliases = {};
+
+	function addUnitAlias(unit, shorthand) {
+		var lowerCase = unit.toLowerCase();
+		aliases[lowerCase] = aliases[lowerCase + 's'] = aliases[shorthand] = unit;
+	}
+
+	function normalizeUnits(units) {
+		return typeof units === 'string' ? aliases[units] || aliases[units.toLowerCase()] : undefined;
+	}
+
+	function normalizeObjectUnits(inputObject) {
+		var normalizedInput = {},
+			normalizedProp,
+			prop;
+
+		for (prop in inputObject) {
+			if (hasOwnProp(inputObject, prop)) {
+				normalizedProp = normalizeUnits(prop);
+				if (normalizedProp) {
+					normalizedInput[normalizedProp] = inputObject[prop];
+				}
+			}
+		}
+
+		return normalizedInput;
+	}
+
+	var priorities = {};
+
+	function addUnitPriority(unit, priority) {
+		priorities[unit] = priority;
+	}
+
+	function getPrioritizedUnits(unitsObj) {
+		var units = [];
+		for (var u in unitsObj) {
+			units.push({unit: u, priority: priorities[u]});
+		}
+		units.sort(function (a, b) {
+			return a.priority - b.priority;
+		});
+		return units;
+	}
+
+	function zeroFill(number, targetLength, forceSign) {
+		var absNumber = '' + Math.abs(number),
+			zerosToFill = targetLength - absNumber.length,
+			sign = number >= 0;
+		return (sign ? (forceSign ? '+' : '') : '-') +
+			Math.pow(10, Math.max(0, zerosToFill)).toString().substr(1) + absNumber;
+	}
+
+	var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g;
+
+	var localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g;
+
+	var formatFunctions = {};
+
+	var formatTokenFunctions = {};
+
+	// token:    'M'
+	// padded:   ['MM', 2]
+	// ordinal:  'Mo'
+	// callback: function () { this.month() + 1 }
+	function addFormatToken(token, padded, ordinal, callback) {
+		var func = callback;
+		if (typeof callback === 'string') {
+			func = function () {
+				return this[callback]();
+			};
+		}
+		if (token) {
+			formatTokenFunctions[token] = func;
+		}
+		if (padded) {
+			formatTokenFunctions[padded[0]] = function () {
+				return zeroFill(func.apply(this, arguments), padded[1], padded[2]);
+			};
+		}
+		if (ordinal) {
+			formatTokenFunctions[ordinal] = function () {
+				return this.localeData().ordinal(func.apply(this, arguments), token);
+			};
+		}
+	}
+
+	function removeFormattingTokens(input) {
+		if (input.match(/\[[\s\S]/)) {
+			return input.replace(/^\[|\]$/g, '');
+		}
+		return input.replace(/\\/g, '');
+	}
+
+	function makeFormatFunction(format) {
+		var array = format.match(formattingTokens), i, length;
+
+		for (i = 0, length = array.length; i < length; i++) {
+			if (formatTokenFunctions[array[i]]) {
+				array[i] = formatTokenFunctions[array[i]];
+			} else {
+				array[i] = removeFormattingTokens(array[i]);
+			}
+		}
+
+		return function (mom) {
+			var output = '', i;
+			for (i = 0; i < length; i++) {
+				output += isFunction(array[i]) ? array[i].call(mom, format) : array[i];
+			}
+			return output;
+		};
+	}
+
+	// format date using native date object
+	function formatMoment(m, format) {
+		if (!m.isValid()) {
+			return m.localeData().invalidDate();
+		}
+
+		format = expandFormat(format, m.localeData());
+		formatFunctions[format] = formatFunctions[format] || makeFormatFunction(format);
+
+		return formatFunctions[format](m);
+	}
+
+	function expandFormat(format, locale) {
+		var i = 5;
+
+		function replaceLongDateFormatTokens(input) {
+			return locale.longDateFormat(input) || input;
+		}
+
+		localFormattingTokens.lastIndex = 0;
+		while (i >= 0 && localFormattingTokens.test(format)) {
+			format = format.replace(localFormattingTokens, replaceLongDateFormatTokens);
+			localFormattingTokens.lastIndex = 0;
+			i -= 1;
+		}
+
+		return format;
+	}
+
+	var match1 = /\d/;            //       0 - 9
+	var match2 = /\d\d/;          //      00 - 99
+	var match3 = /\d{3}/;         //     000 - 999
+	var match4 = /\d{4}/;         //    0000 - 9999
+	var match6 = /[+-]?\d{6}/;    // -999999 - 999999
+	var match1to2 = /\d\d?/;         //       0 - 99
+	var match3to4 = /\d\d\d\d?/;     //     999 - 9999
+	var match5to6 = /\d\d\d\d\d\d?/; //   99999 - 999999
+	var match1to3 = /\d{1,3}/;       //       0 - 999
+	var match1to4 = /\d{1,4}/;       //       0 - 9999
+	var match1to6 = /[+-]?\d{1,6}/;  // -999999 - 999999
+
+	var matchUnsigned = /\d+/;           //       0 - inf
+	var matchSigned = /[+-]?\d+/;      //    -inf - inf
+
+	var matchOffset = /Z|[+-]\d\d:?\d\d/gi; // +00:00 -00:00 +0000 -0000 or Z
+	var matchShortOffset = /Z|[+-]\d\d(?::?\d\d)?/gi; // +00 -00 +00:00 -00:00 +0000 -0000 or Z
+
+	var matchTimestamp = /[+-]?\d+(\.\d{1,3})?/; // 123456789 123456789.123
+
+	// any word (or two) characters or numbers including two/three word month in arabic.
+	// includes scottish gaelic two word and hyphenated months
+	var matchWord = /[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i;
+
+	var regexes = {};
+
+	function addRegexToken(token, regex, strictRegex) {
+		regexes[token] = isFunction(regex) ? regex : function (isStrict, localeData) {
+			return (isStrict && strictRegex) ? strictRegex : regex;
+		};
+	}
+
+	function getParseRegexForToken(token, config) {
+		if (!hasOwnProp(regexes, token)) {
+			return new RegExp(unescapeFormat(token));
+		}
+
+		return regexes[token](config._strict, config._locale);
+	}
+
+	// Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript
+	function unescapeFormat(s) {
+		return regexEscape(s.replace('\\', '').replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (matched, p1, p2, p3, p4) {
+			return p1 || p2 || p3 || p4;
+		}));
+	}
+
+	function regexEscape(s) {
+		return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+	}
+
+	var tokens = {};
+
+	function addParseToken(token, callback) {
+		var i, func = callback;
+		if (typeof token === 'string') {
+			token = [token];
+		}
+		if (isNumber(callback)) {
+			func = function (input, array) {
+				array[callback] = toInt(input);
+			};
+		}
+		for (i = 0; i < token.length; i++) {
+			tokens[token[i]] = func;
+		}
+	}
+
+	function addWeekParseToken(token, callback) {
+		addParseToken(token, function (input, array, config, token) {
+			config._w = config._w || {};
+			callback(input, config._w, config, token);
+		});
+	}
+
+	function addTimeToArrayFromToken(token, input, config) {
+		if (input != null && hasOwnProp(tokens, token)) {
+			tokens[token](input, config._a, config, token);
+		}
+	}
+
+	var YEAR = 0;
+	var MONTH = 1;
+	var DATE = 2;
+	var HOUR = 3;
+	var MINUTE = 4;
+	var SECOND = 5;
+	var MILLISECOND = 6;
+	var WEEK = 7;
+	var WEEKDAY = 8;
+
+	// FORMATTING
+
+	addFormatToken('Y', 0, 0, function () {
+		var y = this.year();
+		return y <= 9999 ? '' + y : '+' + y;
+	});
+
+	addFormatToken(0, ['YY', 2], 0, function () {
+		return this.year() % 100;
+	});
+
+	addFormatToken(0, ['YYYY', 4], 0, 'year');
+	addFormatToken(0, ['YYYYY', 5], 0, 'year');
+	addFormatToken(0, ['YYYYYY', 6, true], 0, 'year');
+
+	// ALIASES
+
+	addUnitAlias('year', 'y');
+
+	// PRIORITIES
+
+	addUnitPriority('year', 1);
+
+	// PARSING
+
+	addRegexToken('Y', matchSigned);
+	addRegexToken('YY', match1to2, match2);
+	addRegexToken('YYYY', match1to4, match4);
+	addRegexToken('YYYYY', match1to6, match6);
+	addRegexToken('YYYYYY', match1to6, match6);
+
+	addParseToken(['YYYYY', 'YYYYYY'], YEAR);
+	addParseToken('YYYY', function (input, array) {
+		array[YEAR] = input.length === 2 ? hooks.parseTwoDigitYear(input) : toInt(input);
+	});
+	addParseToken('YY', function (input, array) {
+		array[YEAR] = hooks.parseTwoDigitYear(input);
+	});
+	addParseToken('Y', function (input, array) {
+		array[YEAR] = parseInt(input, 10);
+	});
+
+	// HELPERS
+
+	function daysInYear(year) {
+		return isLeapYear(year) ? 366 : 365;
+	}
+
+	function isLeapYear(year) {
+		return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
+	}
+
+	// HOOKS
+
+	hooks.parseTwoDigitYear = function (input) {
+		return toInt(input) + (toInt(input) > 68 ? 1900 : 2000);
+	};
+
+	// MOMENTS
+
+	var getSetYear = makeGetSet('FullYear', true);
+
+	function getIsLeapYear() {
+		return isLeapYear(this.year());
+	}
+
+	function makeGetSet(unit, keepTime) {
+		return function (value) {
+			if (value != null) {
+				set$1(this, unit, value);
+				hooks.updateOffset(this, keepTime);
+				return this;
+			} else {
+				return get(this, unit);
+			}
+		};
+	}
+
+	function get(mom, unit) {
+		return mom.isValid() ?
+			mom._d['get' + (mom._isUTC ? 'UTC' : '') + unit]() : NaN;
+	}
+
+	function set$1(mom, unit, value) {
+		if (mom.isValid() && !isNaN(value)) {
+			if (unit === 'FullYear' && isLeapYear(mom.year()) && mom.month() === 1 && mom.date() === 29) {
+				mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value, mom.month(), daysInMonth(value, mom.month()));
+			} else {
+				mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value);
+			}
+		}
+	}
+
+	// MOMENTS
+
+	function stringGet(units) {
+		units = normalizeUnits(units);
+		if (isFunction(this[units])) {
+			return this[units]();
+		}
+		return this;
+	}
+
+
+	function stringSet(units, value) {
+		if (typeof units === 'object') {
+			units = normalizeObjectUnits(units);
+			var prioritized = getPrioritizedUnits(units);
+			for (var i = 0; i < prioritized.length; i++) {
+				this[prioritized[i].unit](units[prioritized[i].unit]);
+			}
+		} else {
+			units = normalizeUnits(units);
+			if (isFunction(this[units])) {
+				return this[units](value);
+			}
+		}
+		return this;
+	}
+
+	function mod(n, x) {
+		return ((n % x) + x) % x;
+	}
+
+	var indexOf;
+
+	if (Array.prototype.indexOf) {
+		indexOf = Array.prototype.indexOf;
+	} else {
+		indexOf = function (o) {
+			// I know
+			var i;
+			for (i = 0; i < this.length; ++i) {
+				if (this[i] === o) {
+					return i;
+				}
+			}
+			return -1;
+		};
+	}
+
+	function daysInMonth(year, month) {
+		if (isNaN(year) || isNaN(month)) {
+			return NaN;
+		}
+		var modMonth = mod(month, 12);
+		year += (month - modMonth) / 12;
+		return modMonth === 1 ? (isLeapYear(year) ? 29 : 28) : (31 - modMonth % 7 % 2);
+	}
+
+	// FORMATTING
+
+	addFormatToken('M', ['MM', 2], 'Mo', function () {
+		return this.month() + 1;
+	});
+
+	addFormatToken('MMM', 0, 0, function (format) {
+		return this.localeData().monthsShort(this, format);
+	});
+
+	addFormatToken('MMMM', 0, 0, function (format) {
+		return this.localeData().months(this, format);
+	});
+
+	// ALIASES
+
+	addUnitAlias('month', 'M');
+
+	// PRIORITY
+
+	addUnitPriority('month', 8);
+
+	// PARSING
+
+	addRegexToken('M', match1to2);
+	addRegexToken('MM', match1to2, match2);
+	addRegexToken('MMM', function (isStrict, locale) {
+		return locale.monthsShortRegex(isStrict);
+	});
+	addRegexToken('MMMM', function (isStrict, locale) {
+		return locale.monthsRegex(isStrict);
+	});
+
+	addParseToken(['M', 'MM'], function (input, array) {
+		array[MONTH] = toInt(input) - 1;
+	});
+
+	addParseToken(['MMM', 'MMMM'], function (input, array, config, token) {
+		var month = config._locale.monthsParse(input, token, config._strict);
+		// if we didn't find a month name, mark the date as invalid.
+		if (month != null) {
+			array[MONTH] = month;
+		} else {
+			getParsingFlags(config).invalidMonth = input;
+		}
+	});
+
+	// LOCALES
+
+	var MONTHS_IN_FORMAT = /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/;
+	var defaultLocaleMonths = 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_');
+
+	function localeMonths(m, format) {
+		if (!m) {
+			return isArray(this._months) ? this._months :
+				this._months['standalone'];
+		}
+		return isArray(this._months) ? this._months[m.month()] :
+			this._months[(this._months.isFormat || MONTHS_IN_FORMAT).test(format) ? 'format' : 'standalone'][m.month()];
+	}
+
+	var defaultLocaleMonthsShort = 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_');
+
+	function localeMonthsShort(m, format) {
+		if (!m) {
+			return isArray(this._monthsShort) ? this._monthsShort :
+				this._monthsShort['standalone'];
+		}
+		return isArray(this._monthsShort) ? this._monthsShort[m.month()] :
+			this._monthsShort[MONTHS_IN_FORMAT.test(format) ? 'format' : 'standalone'][m.month()];
+	}
+
+	function handleStrictParse(monthName, format, strict) {
+		var i, ii, mom, llc = monthName.toLocaleLowerCase();
+		if (!this._monthsParse) {
+			// this is not used
+			this._monthsParse = [];
+			this._longMonthsParse = [];
+			this._shortMonthsParse = [];
+			for (i = 0; i < 12; ++i) {
+				mom = createUTC([2000, i]);
+				this._shortMonthsParse[i] = this.monthsShort(mom, '').toLocaleLowerCase();
+				this._longMonthsParse[i] = this.months(mom, '').toLocaleLowerCase();
+			}
+		}
+
+		if (strict) {
+			if (format === 'MMM') {
+				ii = indexOf.call(this._shortMonthsParse, llc);
+				return ii !== -1 ? ii : null;
+			} else {
+				ii = indexOf.call(this._longMonthsParse, llc);
+				return ii !== -1 ? ii : null;
+			}
+		} else {
+			if (format === 'MMM') {
+				ii = indexOf.call(this._shortMonthsParse, llc);
+				if (ii !== -1) {
+					return ii;
+				}
+				ii = indexOf.call(this._longMonthsParse, llc);
+				return ii !== -1 ? ii : null;
+			} else {
+				ii = indexOf.call(this._longMonthsParse, llc);
+				if (ii !== -1) {
+					return ii;
+				}
+				ii = indexOf.call(this._shortMonthsParse, llc);
+				return ii !== -1 ? ii : null;
+			}
+		}
+	}
+
+	function localeMonthsParse(monthName, format, strict) {
+		var i, mom, regex;
+
+		if (this._monthsParseExact) {
+			return handleStrictParse.call(this, monthName, format, strict);
+		}
+
+		if (!this._monthsParse) {
+			this._monthsParse = [];
+			this._longMonthsParse = [];
+			this._shortMonthsParse = [];
+		}
+
+		// TODO: add sorting
+		// Sorting makes sure if one month (or abbr) is a prefix of another
+		// see sorting in computeMonthsParse
+		for (i = 0; i < 12; i++) {
+			// make the regex if we don't have it already
+			mom = createUTC([2000, i]);
+			if (strict && !this._longMonthsParse[i]) {
+				this._longMonthsParse[i] = new RegExp('^' + this.months(mom, '').replace('.', '') + '$', 'i');
+				this._shortMonthsParse[i] = new RegExp('^' + this.monthsShort(mom, '').replace('.', '') + '$', 'i');
+			}
+			if (!strict && !this._monthsParse[i]) {
+				regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, '');
+				this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i');
+			}
+			// test the regex
+			if (strict && format === 'MMMM' && this._longMonthsParse[i].test(monthName)) {
+				return i;
+			} else if (strict && format === 'MMM' && this._shortMonthsParse[i].test(monthName)) {
+				return i;
+			} else if (!strict && this._monthsParse[i].test(monthName)) {
+				return i;
+			}
+		}
+	}
+
+	// MOMENTS
+
+	function setMonth(mom, value) {
+		var dayOfMonth;
+
+		if (!mom.isValid()) {
+			// No op
+			return mom;
+		}
+
+		if (typeof value === 'string') {
+			if (/^\d+$/.test(value)) {
+				value = toInt(value);
+			} else {
+				value = mom.localeData().monthsParse(value);
+				// TODO: Another silent failure?
+				if (!isNumber(value)) {
+					return mom;
+				}
+			}
+		}
+
+		dayOfMonth = Math.min(mom.date(), daysInMonth(mom.year(), value));
+		mom._d['set' + (mom._isUTC ? 'UTC' : '') + 'Month'](value, dayOfMonth);
+		return mom;
+	}
+
+	function getSetMonth(value) {
+		if (value != null) {
+			setMonth(this, value);
+			hooks.updateOffset(this, true);
+			return this;
+		} else {
+			return get(this, 'Month');
+		}
+	}
+
+	function getDaysInMonth() {
+		return daysInMonth(this.year(), this.month());
+	}
+
+	var defaultMonthsShortRegex = matchWord;
+
+	function monthsShortRegex(isStrict) {
+		if (this._monthsParseExact) {
+			if (!hasOwnProp(this, '_monthsRegex')) {
+				computeMonthsParse.call(this);
+			}
+			if (isStrict) {
+				return this._monthsShortStrictRegex;
+			} else {
+				return this._monthsShortRegex;
+			}
+		} else {
+			if (!hasOwnProp(this, '_monthsShortRegex')) {
+				this._monthsShortRegex = defaultMonthsShortRegex;
+			}
+			return this._monthsShortStrictRegex && isStrict ?
+				this._monthsShortStrictRegex : this._monthsShortRegex;
+		}
+	}
+
+	var defaultMonthsRegex = matchWord;
+
+	function monthsRegex(isStrict) {
+		if (this._monthsParseExact) {
+			if (!hasOwnProp(this, '_monthsRegex')) {
+				computeMonthsParse.call(this);
+			}
+			if (isStrict) {
+				return this._monthsStrictRegex;
+			} else {
+				return this._monthsRegex;
+			}
+		} else {
+			if (!hasOwnProp(this, '_monthsRegex')) {
+				this._monthsRegex = defaultMonthsRegex;
+			}
+			return this._monthsStrictRegex && isStrict ?
+				this._monthsStrictRegex : this._monthsRegex;
+		}
+	}
+
+	function computeMonthsParse() {
+		function cmpLenRev(a, b) {
+			return b.length - a.length;
+		}
+
+		var shortPieces = [], longPieces = [], mixedPieces = [],
+			i, mom;
+		for (i = 0; i < 12; i++) {
+			// make the regex if we don't have it already
+			mom = createUTC([2000, i]);
+			shortPieces.push(this.monthsShort(mom, ''));
+			longPieces.push(this.months(mom, ''));
+			mixedPieces.push(this.months(mom, ''));
+			mixedPieces.push(this.monthsShort(mom, ''));
+		}
+		// Sorting makes sure if one month (or abbr) is a prefix of another it
+		// will match the longer piece.
+		shortPieces.sort(cmpLenRev);
+		longPieces.sort(cmpLenRev);
+		mixedPieces.sort(cmpLenRev);
+		for (i = 0; i < 12; i++) {
+			shortPieces[i] = regexEscape(shortPieces[i]);
+			longPieces[i] = regexEscape(longPieces[i]);
+		}
+		for (i = 0; i < 24; i++) {
+			mixedPieces[i] = regexEscape(mixedPieces[i]);
+		}
+
+		this._monthsRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
+		this._monthsShortRegex = this._monthsRegex;
+		this._monthsStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');
+		this._monthsShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');
+	}
+
+	function createDate(y, m, d, h, M, s, ms) {
+		// can't just apply() to create a date:
+		// https://stackoverflow.com/q/181348
+		var date;
+		// the date constructor remaps years 0-99 to 1900-1999
+		if (y < 100 && y >= 0) {
+			// preserve leap years using a full 400 year cycle, then reset
+			date = new Date(y + 400, m, d, h, M, s, ms);
+			if (isFinite(date.getFullYear())) {
+				date.setFullYear(y);
+			}
+		} else {
+			date = new Date(y, m, d, h, M, s, ms);
+		}
+
+		return date;
+	}
+
+	function createUTCDate(y) {
+		var date;
+		// the Date.UTC function remaps years 0-99 to 1900-1999
+		if (y < 100 && y >= 0) {
+			var args = Array.prototype.slice.call(arguments);
+			// preserve leap years using a full 400 year cycle, then reset
+			args[0] = y + 400;
+			date = new Date(Date.UTC.apply(null, args));
+			if (isFinite(date.getUTCFullYear())) {
+				date.setUTCFullYear(y);
+			}
+		} else {
+			date = new Date(Date.UTC.apply(null, arguments));
+		}
+
+		return date;
+	}
+
+	// start-of-first-week - start-of-year
+	function firstWeekOffset(year, dow, doy) {
+		var // first-week day -- which january is always in the first week (4 for iso, 1 for other)
+			fwd = 7 + dow - doy,
+			// first-week day local weekday -- which local weekday is fwd
+			fwdlw = (7 + createUTCDate(year, 0, fwd).getUTCDay() - dow) % 7;
+
+		return -fwdlw + fwd - 1;
+	}
+
+	// https://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
+	function dayOfYearFromWeeks(year, week, weekday, dow, doy) {
+		var localWeekday = (7 + weekday - dow) % 7,
+			weekOffset = firstWeekOffset(year, dow, doy),
+			dayOfYear = 1 + 7 * (week - 1) + localWeekday + weekOffset,
+			resYear, resDayOfYear;
+
+		if (dayOfYear <= 0) {
+			resYear = year - 1;
+			resDayOfYear = daysInYear(resYear) + dayOfYear;
+		} else if (dayOfYear > daysInYear(year)) {
+			resYear = year + 1;
+			resDayOfYear = dayOfYear - daysInYear(year);
+		} else {
+			resYear = year;
+			resDayOfYear = dayOfYear;
+		}
+
+		return {
+			year: resYear,
+			dayOfYear: resDayOfYear
+		};
+	}
+
+	function weekOfYear(mom, dow, doy) {
+		var weekOffset = firstWeekOffset(mom.year(), dow, doy),
+			week = Math.floor((mom.dayOfYear() - weekOffset - 1) / 7) + 1,
+			resWeek, resYear;
+
+		if (week < 1) {
+			resYear = mom.year() - 1;
+			resWeek = week + weeksInYear(resYear, dow, doy);
+		} else if (week > weeksInYear(mom.year(), dow, doy)) {
+			resWeek = week - weeksInYear(mom.year(), dow, doy);
+			resYear = mom.year() + 1;
+		} else {
+			resYear = mom.year();
+			resWeek = week;
+		}
+
+		return {
+			week: resWeek,
+			year: resYear
+		};
+	}
+
+	function weeksInYear(year, dow, doy) {
+		var weekOffset = firstWeekOffset(year, dow, doy),
+			weekOffsetNext = firstWeekOffset(year + 1, dow, doy);
+		return (daysInYear(year) - weekOffset + weekOffsetNext) / 7;
+	}
+
+	// FORMATTING
+
+	addFormatToken('w', ['ww', 2], 'wo', 'week');
+	addFormatToken('W', ['WW', 2], 'Wo', 'isoWeek');
+
+	// ALIASES
+
+	addUnitAlias('week', 'w');
+	addUnitAlias('isoWeek', 'W');
+
+	// PRIORITIES
+
+	addUnitPriority('week', 5);
+	addUnitPriority('isoWeek', 5);
+
+	// PARSING
+
+	addRegexToken('w', match1to2);
+	addRegexToken('ww', match1to2, match2);
+	addRegexToken('W', match1to2);
+	addRegexToken('WW', match1to2, match2);
+
+	addWeekParseToken(['w', 'ww', 'W', 'WW'], function (input, week, config, token) {
+		week[token.substr(0, 1)] = toInt(input);
+	});
+
+	// HELPERS
+
+	// LOCALES
+
+	function localeWeek(mom) {
+		return weekOfYear(mom, this._week.dow, this._week.doy).week;
+	}
+
+	var defaultLocaleWeek = {
+		dow: 0, // Sunday is the first day of the week.
+		doy: 6  // The week that contains Jan 6th is the first week of the year.
+	};
+
+	function localeFirstDayOfWeek() {
+		return this._week.dow;
+	}
+
+	function localeFirstDayOfYear() {
+		return this._week.doy;
+	}
+
+	// MOMENTS
+
+	function getSetWeek(input) {
+		var week = this.localeData().week(this);
+		return input == null ? week : this.add((input - week) * 7, 'd');
+	}
+
+	function getSetISOWeek(input) {
+		var week = weekOfYear(this, 1, 4).week;
+		return input == null ? week : this.add((input - week) * 7, 'd');
+	}
+
+	// FORMATTING
+
+	addFormatToken('d', 0, 'do', 'day');
+
+	addFormatToken('dd', 0, 0, function (format) {
+		return this.localeData().weekdaysMin(this, format);
+	});
+
+	addFormatToken('ddd', 0, 0, function (format) {
+		return this.localeData().weekdaysShort(this, format);
+	});
+
+	addFormatToken('dddd', 0, 0, function (format) {
+		return this.localeData().weekdays(this, format);
+	});
+
+	addFormatToken('e', 0, 0, 'weekday');
+	addFormatToken('E', 0, 0, 'isoWeekday');
+
+	// ALIASES
+
+	addUnitAlias('day', 'd');
+	addUnitAlias('weekday', 'e');
+	addUnitAlias('isoWeekday', 'E');
+
+	// PRIORITY
+	addUnitPriority('day', 11);
+	addUnitPriority('weekday', 11);
+	addUnitPriority('isoWeekday', 11);
+
+	// PARSING
+
+	addRegexToken('d', match1to2);
+	addRegexToken('e', match1to2);
+	addRegexToken('E', match1to2);
+	addRegexToken('dd', function (isStrict, locale) {
+		return locale.weekdaysMinRegex(isStrict);
+	});
+	addRegexToken('ddd', function (isStrict, locale) {
+		return locale.weekdaysShortRegex(isStrict);
+	});
+	addRegexToken('dddd', function (isStrict, locale) {
+		return locale.weekdaysRegex(isStrict);
+	});
+
+	addWeekParseToken(['dd', 'ddd', 'dddd'], function (input, week, config, token) {
+		var weekday = config._locale.weekdaysParse(input, token, config._strict);
+		// if we didn't get a weekday name, mark the date as invalid
+		if (weekday != null) {
+			week.d = weekday;
+		} else {
+			getParsingFlags(config).invalidWeekday = input;
+		}
+	});
+
+	addWeekParseToken(['d', 'e', 'E'], function (input, week, config, token) {
+		week[token] = toInt(input);
+	});
+
+	// HELPERS
+
+	function parseWeekday(input, locale) {
+		if (typeof input !== 'string') {
+			return input;
+		}
+
+		if (!isNaN(input)) {
+			return parseInt(input, 10);
+		}
+
+		input = locale.weekdaysParse(input);
+		if (typeof input === 'number') {
+			return input;
+		}
+
+		return null;
+	}
+
+	function parseIsoWeekday(input, locale) {
+		if (typeof input === 'string') {
+			return locale.weekdaysParse(input) % 7 || 7;
+		}
+		return isNaN(input) ? null : input;
+	}
+
+	// LOCALES
+	function shiftWeekdays(ws, n) {
+		return ws.slice(n, 7).concat(ws.slice(0, n));
+	}
+
+	var defaultLocaleWeekdays = 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_');
+
+	function localeWeekdays(m, format) {
+		var weekdays = isArray(this._weekdays) ? this._weekdays :
+			this._weekdays[(m && m !== true && this._weekdays.isFormat.test(format)) ? 'format' : 'standalone'];
+		return (m === true) ? shiftWeekdays(weekdays, this._week.dow)
+			: (m) ? weekdays[m.day()] : weekdays;
+	}
+
+	var defaultLocaleWeekdaysShort = 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_');
+
+	function localeWeekdaysShort(m) {
+		return (m === true) ? shiftWeekdays(this._weekdaysShort, this._week.dow)
+			: (m) ? this._weekdaysShort[m.day()] : this._weekdaysShort;
+	}
+
+	var defaultLocaleWeekdaysMin = 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_');
+
+	function localeWeekdaysMin(m) {
+		return (m === true) ? shiftWeekdays(this._weekdaysMin, this._week.dow)
+			: (m) ? this._weekdaysMin[m.day()] : this._weekdaysMin;
+	}
+
+	function handleStrictParse$1(weekdayName, format, strict) {
+		var i, ii, mom, llc = weekdayName.toLocaleLowerCase();
+		if (!this._weekdaysParse) {
+			this._weekdaysParse = [];
+			this._shortWeekdaysParse = [];
+			this._minWeekdaysParse = [];
+
+			for (i = 0; i < 7; ++i) {
+				mom = createUTC([2000, 1]).day(i);
+				this._minWeekdaysParse[i] = this.weekdaysMin(mom, '').toLocaleLowerCase();
+				this._shortWeekdaysParse[i] = this.weekdaysShort(mom, '').toLocaleLowerCase();
+				this._weekdaysParse[i] = this.weekdays(mom, '').toLocaleLowerCase();
+			}
+		}
+
+		if (strict) {
+			if (format === 'dddd') {
+				ii = indexOf.call(this._weekdaysParse, llc);
+				return ii !== -1 ? ii : null;
+			} else if (format === 'ddd') {
+				ii = indexOf.call(this._shortWeekdaysParse, llc);
+				return ii !== -1 ? ii : null;
+			} else {
+				ii = indexOf.call(this._minWeekdaysParse, llc);
+				return ii !== -1 ? ii : null;
+			}
+		} else {
+			if (format === 'dddd') {
+				ii = indexOf.call(this._weekdaysParse, llc);
+				if (ii !== -1) {
+					return ii;
+				}
+				ii = indexOf.call(this._shortWeekdaysParse, llc);
+				if (ii !== -1) {
+					return ii;
+				}
+				ii = indexOf.call(this._minWeekdaysParse, llc);
+				return ii !== -1 ? ii : null;
+			} else if (format === 'ddd') {
+				ii = indexOf.call(this._shortWeekdaysParse, llc);
+				if (ii !== -1) {
+					return ii;
+				}
+				ii = indexOf.call(this._weekdaysParse, llc);
+				if (ii !== -1) {
+					return ii;
+				}
+				ii = indexOf.call(this._minWeekdaysParse, llc);
+				return ii !== -1 ? ii : null;
+			} else {
+				ii = indexOf.call(this._minWeekdaysParse, llc);
+				if (ii !== -1) {
+					return ii;
+				}
+				ii = indexOf.call(this._weekdaysParse, llc);
+				if (ii !== -1) {
+					return ii;
+				}
+				ii = indexOf.call(this._shortWeekdaysParse, llc);
+				return ii !== -1 ? ii : null;
+			}
+		}
+	}
+
+	function localeWeekdaysParse(weekdayName, format, strict) {
+		var i, mom, regex;
+
+		if (this._weekdaysParseExact) {
+			return handleStrictParse$1.call(this, weekdayName, format, strict);
+		}
+
+		if (!this._weekdaysParse) {
+			this._weekdaysParse = [];
+			this._minWeekdaysParse = [];
+			this._shortWeekdaysParse = [];
+			this._fullWeekdaysParse = [];
+		}
+
+		for (i = 0; i < 7; i++) {
+			// make the regex if we don't have it already
+
+			mom = createUTC([2000, 1]).day(i);
+			if (strict && !this._fullWeekdaysParse[i]) {
+				this._fullWeekdaysParse[i] = new RegExp('^' + this.weekdays(mom, '').replace('.', '\\.?') + '$', 'i');
+				this._shortWeekdaysParse[i] = new RegExp('^' + this.weekdaysShort(mom, '').replace('.', '\\.?') + '$', 'i');
+				this._minWeekdaysParse[i] = new RegExp('^' + this.weekdaysMin(mom, '').replace('.', '\\.?') + '$', 'i');
+			}
+			if (!this._weekdaysParse[i]) {
+				regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, '');
+				this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i');
+			}
+			// test the regex
+			if (strict && format === 'dddd' && this._fullWeekdaysParse[i].test(weekdayName)) {
+				return i;
+			} else if (strict && format === 'ddd' && this._shortWeekdaysParse[i].test(weekdayName)) {
+				return i;
+			} else if (strict && format === 'dd' && this._minWeekdaysParse[i].test(weekdayName)) {
+				return i;
+			} else if (!strict && this._weekdaysParse[i].test(weekdayName)) {
+				return i;
+			}
+		}
+	}
+
+	// MOMENTS
+
+	function getSetDayOfWeek(input) {
+		if (!this.isValid()) {
+			return input != null ? this : NaN;
+		}
+		var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay();
+		if (input != null) {
+			input = parseWeekday(input, this.localeData());
+			return this.add(input - day, 'd');
+		} else {
+			return day;
+		}
+	}
+
+	function getSetLocaleDayOfWeek(input) {
+		if (!this.isValid()) {
+			return input != null ? this : NaN;
+		}
+		var weekday = (this.day() + 7 - this.localeData()._week.dow) % 7;
+		return input == null ? weekday : this.add(input - weekday, 'd');
+	}
+
+	function getSetISODayOfWeek(input) {
+		if (!this.isValid()) {
+			return input != null ? this : NaN;
+		}
+
+		// behaves the same as moment#day except
+		// as a getter, returns 7 instead of 0 (1-7 range instead of 0-6)
+		// as a setter, sunday should belong to the previous week.
+
+		if (input != null) {
+			var weekday = parseIsoWeekday(input, this.localeData());
+			return this.day(this.day() % 7 ? weekday : weekday - 7);
+		} else {
+			return this.day() || 7;
+		}
+	}
+
+	var defaultWeekdaysRegex = matchWord;
+
+	function weekdaysRegex(isStrict) {
+		if (this._weekdaysParseExact) {
+			if (!hasOwnProp(this, '_weekdaysRegex')) {
+				computeWeekdaysParse.call(this);
+			}
+			if (isStrict) {
+				return this._weekdaysStrictRegex;
+			} else {
+				return this._weekdaysRegex;
+			}
+		} else {
+			if (!hasOwnProp(this, '_weekdaysRegex')) {
+				this._weekdaysRegex = defaultWeekdaysRegex;
+			}
+			return this._weekdaysStrictRegex && isStrict ?
+				this._weekdaysStrictRegex : this._weekdaysRegex;
+		}
+	}
+
+	var defaultWeekdaysShortRegex = matchWord;
+
+	function weekdaysShortRegex(isStrict) {
+		if (this._weekdaysParseExact) {
+			if (!hasOwnProp(this, '_weekdaysRegex')) {
+				computeWeekdaysParse.call(this);
+			}
+			if (isStrict) {
+				return this._weekdaysShortStrictRegex;
+			} else {
+				return this._weekdaysShortRegex;
+			}
+		} else {
+			if (!hasOwnProp(this, '_weekdaysShortRegex')) {
+				this._weekdaysShortRegex = defaultWeekdaysShortRegex;
+			}
+			return this._weekdaysShortStrictRegex && isStrict ?
+				this._weekdaysShortStrictRegex : this._weekdaysShortRegex;
+		}
+	}
+
+	var defaultWeekdaysMinRegex = matchWord;
+
+	function weekdaysMinRegex(isStrict) {
+		if (this._weekdaysParseExact) {
+			if (!hasOwnProp(this, '_weekdaysRegex')) {
+				computeWeekdaysParse.call(this);
+			}
+			if (isStrict) {
+				return this._weekdaysMinStrictRegex;
+			} else {
+				return this._weekdaysMinRegex;
+			}
+		} else {
+			if (!hasOwnProp(this, '_weekdaysMinRegex')) {
+				this._weekdaysMinRegex = defaultWeekdaysMinRegex;
+			}
+			return this._weekdaysMinStrictRegex && isStrict ?
+				this._weekdaysMinStrictRegex : this._weekdaysMinRegex;
+		}
+	}
+
+
+	function computeWeekdaysParse() {
+		function cmpLenRev(a, b) {
+			return b.length - a.length;
+		}
+
+		var minPieces = [], shortPieces = [], longPieces = [], mixedPieces = [],
+			i, mom, minp, shortp, longp;
+		for (i = 0; i < 7; i++) {
+			// make the regex if we don't have it already
+			mom = createUTC([2000, 1]).day(i);
+			minp = this.weekdaysMin(mom, '');
+			shortp = this.weekdaysShort(mom, '');
+			longp = this.weekdays(mom, '');
+			minPieces.push(minp);
+			shortPieces.push(shortp);
+			longPieces.push(longp);
+			mixedPieces.push(minp);
+			mixedPieces.push(shortp);
+			mixedPieces.push(longp);
+		}
+		// Sorting makes sure if one weekday (or abbr) is a prefix of another it
+		// will match the longer piece.
+		minPieces.sort(cmpLenRev);
+		shortPieces.sort(cmpLenRev);
+		longPieces.sort(cmpLenRev);
+		mixedPieces.sort(cmpLenRev);
+		for (i = 0; i < 7; i++) {
+			shortPieces[i] = regexEscape(shortPieces[i]);
+			longPieces[i] = regexEscape(longPieces[i]);
+			mixedPieces[i] = regexEscape(mixedPieces[i]);
+		}
+
+		this._weekdaysRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
+		this._weekdaysShortRegex = this._weekdaysRegex;
+		this._weekdaysMinRegex = this._weekdaysRegex;
+
+		this._weekdaysStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');
+		this._weekdaysShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');
+		this._weekdaysMinStrictRegex = new RegExp('^(' + minPieces.join('|') + ')', 'i');
+	}
+
+	// FORMATTING
+
+	function hFormat() {
+		return this.hours() % 12 || 12;
+	}
+
+	function kFormat() {
+		return this.hours() || 24;
+	}
+
+	addFormatToken('H', ['HH', 2], 0, 'hour');
+	addFormatToken('h', ['hh', 2], 0, hFormat);
+	addFormatToken('k', ['kk', 2], 0, kFormat);
+
+	addFormatToken('hmm', 0, 0, function () {
+		return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2);
+	});
+
+	addFormatToken('hmmss', 0, 0, function () {
+		return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2) +
+			zeroFill(this.seconds(), 2);
+	});
+
+	addFormatToken('Hmm', 0, 0, function () {
+		return '' + this.hours() + zeroFill(this.minutes(), 2);
+	});
+
+	addFormatToken('Hmmss', 0, 0, function () {
+		return '' + this.hours() + zeroFill(this.minutes(), 2) +
+			zeroFill(this.seconds(), 2);
+	});
+
+	function meridiem(token, lowercase) {
+		addFormatToken(token, 0, 0, function () {
+			return this.localeData().meridiem(this.hours(), this.minutes(), lowercase);
+		});
+	}
+
+	meridiem('a', true);
+	meridiem('A', false);
+
+	// ALIASES
+
+	addUnitAlias('hour', 'h');
+
+	// PRIORITY
+	addUnitPriority('hour', 13);
+
+	// PARSING
+
+	function matchMeridiem(isStrict, locale) {
+		return locale._meridiemParse;
+	}
+
+	addRegexToken('a', matchMeridiem);
+	addRegexToken('A', matchMeridiem);
+	addRegexToken('H', match1to2);
+	addRegexToken('h', match1to2);
+	addRegexToken('k', match1to2);
+	addRegexToken('HH', match1to2, match2);
+	addRegexToken('hh', match1to2, match2);
+	addRegexToken('kk', match1to2, match2);
+
+	addRegexToken('hmm', match3to4);
+	addRegexToken('hmmss', match5to6);
+	addRegexToken('Hmm', match3to4);
+	addRegexToken('Hmmss', match5to6);
+
+	addParseToken(['H', 'HH'], HOUR);
+	addParseToken(['k', 'kk'], function (input, array, config) {
+		var kInput = toInt(input);
+		array[HOUR] = kInput === 24 ? 0 : kInput;
+	});
+	addParseToken(['a', 'A'], function (input, array, config) {
+		config._isPm = config._locale.isPM(input);
+		config._meridiem = input;
+	});
+	addParseToken(['h', 'hh'], function (input, array, config) {
+		array[HOUR] = toInt(input);
+		getParsingFlags(config).bigHour = true;
+	});
+	addParseToken('hmm', function (input, array, config) {
+		var pos = input.length - 2;
+		array[HOUR] = toInt(input.substr(0, pos));
+		array[MINUTE] = toInt(input.substr(pos));
+		getParsingFlags(config).bigHour = true;
+	});
+	addParseToken('hmmss', function (input, array, config) {
+		var pos1 = input.length - 4;
+		var pos2 = input.length - 2;
+		array[HOUR] = toInt(input.substr(0, pos1));
+		array[MINUTE] = toInt(input.substr(pos1, 2));
+		array[SECOND] = toInt(input.substr(pos2));
+		getParsingFlags(config).bigHour = true;
+	});
+	addParseToken('Hmm', function (input, array, config) {
+		var pos = input.length - 2;
+		array[HOUR] = toInt(input.substr(0, pos));
+		array[MINUTE] = toInt(input.substr(pos));
+	});
+	addParseToken('Hmmss', function (input, array, config) {
+		var pos1 = input.length - 4;
+		var pos2 = input.length - 2;
+		array[HOUR] = toInt(input.substr(0, pos1));
+		array[MINUTE] = toInt(input.substr(pos1, 2));
+		array[SECOND] = toInt(input.substr(pos2));
+	});
+
+	// LOCALES
+
+	function localeIsPM(input) {
+		// IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays
+		// Using charAt should be more compatible.
+		return ((input + '').toLowerCase().charAt(0) === 'p');
+	}
+
+	var defaultLocaleMeridiemParse = /[ap]\.?m?\.?/i;
+
+	function localeMeridiem(hours, minutes, isLower) {
+		if (hours > 11) {
+			return isLower ? 'pm' : 'PM';
+		} else {
+			return isLower ? 'am' : 'AM';
+		}
+	}
+
+
+	// MOMENTS
+
+	// Setting the hour should keep the time, because the user explicitly
+	// specified which hour they want. So trying to maintain the same hour (in
+	// a new timezone) makes sense. Adding/subtracting hours does not follow
+	// this rule.
+	var getSetHour = makeGetSet('Hours', true);
+
+	var baseConfig = {
+		calendar: defaultCalendar,
+		longDateFormat: defaultLongDateFormat,
+		invalidDate: defaultInvalidDate,
+		ordinal: defaultOrdinal,
+		dayOfMonthOrdinalParse: defaultDayOfMonthOrdinalParse,
+		relativeTime: defaultRelativeTime,
+
+		months: defaultLocaleMonths,
+		monthsShort: defaultLocaleMonthsShort,
+
+		week: defaultLocaleWeek,
+
+		weekdays: defaultLocaleWeekdays,
+		weekdaysMin: defaultLocaleWeekdaysMin,
+		weekdaysShort: defaultLocaleWeekdaysShort,
+
+		meridiemParse: defaultLocaleMeridiemParse
+	};
+
+	// internal storage for locale config files
+	var locales = {};
+	var localeFamilies = {};
+	var globalLocale;
+
+	function normalizeLocale(key) {
+		return key ? key.toLowerCase().replace('_', '-') : key;
+	}
+
+	// pick the locale from the array
+	// try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each
+	// substring from most specific to least, but move to the next array item if it's a more specific variant than the current root
+	function chooseLocale(names) {
+		var i = 0, j, next, locale, split;
+
+		while (i < names.length) {
+			split = normalizeLocale(names[i]).split('-');
+			j = split.length;
+			next = normalizeLocale(names[i + 1]);
+			next = next ? next.split('-') : null;
+			while (j > 0) {
+				locale = loadLocale(split.slice(0, j).join('-'));
+				if (locale) {
+					return locale;
+				}
+				if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) {
+					//the next array item is better than a shallower substring of this one
+					break;
+				}
+				j--;
+			}
+			i++;
+		}
+		return globalLocale;
+	}
+
+	function loadLocale(name) {
+		var oldLocale = null;
+		// TODO: Find a better way to register and load all the locales in Node
+		if (!locales[name] && (typeof module !== 'undefined') &&
+			module && module.exports) {
+			try {
+				oldLocale = globalLocale._abbr;
+				var aliasedRequire = require;
+				aliasedRequire('./locale/' + name);
+				getSetGlobalLocale(oldLocale);
+			} catch (e) {
+			}
+		}
+		return locales[name];
+	}
+
+	// This function will load locale and then set the global locale.  If
+	// no arguments are passed in, it will simply return the current global
+	// locale key.
+	function getSetGlobalLocale(key, values) {
+		var data;
+		if (key) {
+			if (isUndefined(values)) {
+				data = getLocale(key);
+			} else {
+				data = defineLocale(key, values);
+			}
+
+			if (data) {
+				// moment.duration._locale = moment._locale = data;
+				globalLocale = data;
+			} else {
+				if ((typeof console !== 'undefined') && console.warn) {
+					//warn user if arguments are passed but the locale could not be set
+					console.warn('Locale ' + key + ' not found. Did you forget to load it?');
+				}
+			}
+		}
+
+		return globalLocale._abbr;
+	}
+
+	function defineLocale(name, config) {
+		if (config !== null) {
+			var locale, parentConfig = baseConfig;
+			config.abbr = name;
+			if (locales[name] != null) {
+				deprecateSimple('defineLocaleOverride',
+					'use moment.updateLocale(localeName, config) to change ' +
+					'an existing locale. moment.defineLocale(localeName, ' +
+					'config) should only be used for creating a new locale ' +
+					'See http://momentjs.com/guides/#/warnings/define-locale/ for more info.');
+				parentConfig = locales[name]._config;
+			} else if (config.parentLocale != null) {
+				if (locales[config.parentLocale] != null) {
+					parentConfig = locales[config.parentLocale]._config;
+				} else {
+					locale = loadLocale(config.parentLocale);
+					if (locale != null) {
+						parentConfig = locale._config;
+					} else {
+						if (!localeFamilies[config.parentLocale]) {
+							localeFamilies[config.parentLocale] = [];
+						}
+						localeFamilies[config.parentLocale].push({
+							name: name,
+							config: config
+						});
+						return null;
+					}
+				}
+			}
+			locales[name] = new Locale(mergeConfigs(parentConfig, config));
+
+			if (localeFamilies[name]) {
+				localeFamilies[name].forEach(function (x) {
+					defineLocale(x.name, x.config);
+				});
+			}
+
+			// backwards compat for now: also set the locale
+			// make sure we set the locale AFTER all child locales have been
+			// created, so we won't end up with the child locale set.
+			getSetGlobalLocale(name);
+
+
+			return locales[name];
+		} else {
+			// useful for testing
+			delete locales[name];
+			return null;
+		}
+	}
+
+	function updateLocale(name, config) {
+		if (config != null) {
+			var locale, tmpLocale, parentConfig = baseConfig;
+			// MERGE
+			tmpLocale = loadLocale(name);
+			if (tmpLocale != null) {
+				parentConfig = tmpLocale._config;
+			}
+			config = mergeConfigs(parentConfig, config);
+			locale = new Locale(config);
+			locale.parentLocale = locales[name];
+			locales[name] = locale;
+
+			// backwards compat for now: also set the locale
+			getSetGlobalLocale(name);
+		} else {
+			// pass null for config to unupdate, useful for tests
+			if (locales[name] != null) {
+				if (locales[name].parentLocale != null) {
+					locales[name] = locales[name].parentLocale;
+				} else if (locales[name] != null) {
+					delete locales[name];
+				}
+			}
+		}
+		return locales[name];
+	}
+
+	// returns locale data
+	function getLocale(key) {
+		var locale;
+
+		if (key && key._locale && key._locale._abbr) {
+			key = key._locale._abbr;
+		}
+
+		if (!key) {
+			return globalLocale;
+		}
+
+		if (!isArray(key)) {
+			//short-circuit everything else
+			locale = loadLocale(key);
+			if (locale) {
+				return locale;
+			}
+			key = [key];
+		}
+
+		return chooseLocale(key);
+	}
+
+	function listLocales() {
+		return keys(locales);
+	}
+
+	function checkOverflow(m) {
+		var overflow;
+		var a = m._a;
+
+		if (a && getParsingFlags(m).overflow === -2) {
+			overflow =
+				a[MONTH] < 0 || a[MONTH] > 11 ? MONTH :
+					a[DATE] < 1 || a[DATE] > daysInMonth(a[YEAR], a[MONTH]) ? DATE :
+						a[HOUR] < 0 || a[HOUR] > 24 || (a[HOUR] === 24 && (a[MINUTE] !== 0 || a[SECOND] !== 0 || a[MILLISECOND] !== 0)) ? HOUR :
+							a[MINUTE] < 0 || a[MINUTE] > 59 ? MINUTE :
+								a[SECOND] < 0 || a[SECOND] > 59 ? SECOND :
+									a[MILLISECOND] < 0 || a[MILLISECOND] > 999 ? MILLISECOND :
+										-1;
+
+			if (getParsingFlags(m)._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) {
+				overflow = DATE;
+			}
+			if (getParsingFlags(m)._overflowWeeks && overflow === -1) {
+				overflow = WEEK;
+			}
+			if (getParsingFlags(m)._overflowWeekday && overflow === -1) {
+				overflow = WEEKDAY;
+			}
+
+			getParsingFlags(m).overflow = overflow;
+		}
+
+		return m;
+	}
+
+	// Pick the first defined of two or three arguments.
+	function defaults(a, b, c) {
+		if (a != null) {
+			return a;
+		}
+		if (b != null) {
+			return b;
+		}
+		return c;
+	}
+
+	function currentDateArray(config) {
+		// hooks is actually the exported moment object
+		var nowValue = new Date(hooks.now());
+		if (config._useUTC) {
+			return [nowValue.getUTCFullYear(), nowValue.getUTCMonth(), nowValue.getUTCDate()];
+		}
+		return [nowValue.getFullYear(), nowValue.getMonth(), nowValue.getDate()];
+	}
+
+	// convert an array to a date.
+	// the array should mirror the parameters below
+	// note: all values past the year are optional and will default to the lowest possible value.
+	// [year, month, day , hour, minute, second, millisecond]
+	function configFromArray(config) {
+		var i, date, input = [], currentDate, expectedWeekday, yearToUse;
+
+		if (config._d) {
+			return;
+		}
+
+		currentDate = currentDateArray(config);
+
+		//compute day of the year from weeks and weekdays
+		if (config._w && config._a[DATE] == null && config._a[MONTH] == null) {
+			dayOfYearFromWeekInfo(config);
+		}
+
+		//if the day of the year is set, figure out what it is
+		if (config._dayOfYear != null) {
+			yearToUse = defaults(config._a[YEAR], currentDate[YEAR]);
+
+			if (config._dayOfYear > daysInYear(yearToUse) || config._dayOfYear === 0) {
+				getParsingFlags(config)._overflowDayOfYear = true;
+			}
+
+			date = createUTCDate(yearToUse, 0, config._dayOfYear);
+			config._a[MONTH] = date.getUTCMonth();
+			config._a[DATE] = date.getUTCDate();
+		}
+
+		// Default to current date.
+		// * if no year, month, day of month are given, default to today
+		// * if day of month is given, default month and year
+		// * if month is given, default only year
+		// * if year is given, don't default anything
+		for (i = 0; i < 3 && config._a[i] == null; ++i) {
+			config._a[i] = input[i] = currentDate[i];
+		}
+
+		// Zero out whatever was not defaulted, including time
+		for (; i < 7; i++) {
+			config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i];
+		}
+
+		// Check for 24:00:00.000
+		if (config._a[HOUR] === 24 &&
+			config._a[MINUTE] === 0 &&
+			config._a[SECOND] === 0 &&
+			config._a[MILLISECOND] === 0) {
+			config._nextDay = true;
+			config._a[HOUR] = 0;
+		}
+
+		config._d = (config._useUTC ? createUTCDate : createDate).apply(null, input);
+		expectedWeekday = config._useUTC ? config._d.getUTCDay() : config._d.getDay();
+
+		// Apply timezone offset from input. The actual utcOffset can be changed
+		// with parseZone.
+		if (config._tzm != null) {
+			config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
+		}
+
+		if (config._nextDay) {
+			config._a[HOUR] = 24;
+		}
+
+		// check for mismatching day of week
+		if (config._w && typeof config._w.d !== 'undefined' && config._w.d !== expectedWeekday) {
+			getParsingFlags(config).weekdayMismatch = true;
+		}
+	}
+
+	function dayOfYearFromWeekInfo(config) {
+		var w, weekYear, week, weekday, dow, doy, temp, weekdayOverflow;
+
+		w = config._w;
+		if (w.GG != null || w.W != null || w.E != null) {
+			dow = 1;
+			doy = 4;
+
+			// TODO: We need to take the current isoWeekYear, but that depends on
+			// how we interpret now (local, utc, fixed offset). So create
+			// a now version of current config (take local/utc/offset flags, and
+			// create now).
+			weekYear = defaults(w.GG, config._a[YEAR], weekOfYear(createLocal(), 1, 4).year);
+			week = defaults(w.W, 1);
+			weekday = defaults(w.E, 1);
+			if (weekday < 1 || weekday > 7) {
+				weekdayOverflow = true;
+			}
+		} else {
+			dow = config._locale._week.dow;
+			doy = config._locale._week.doy;
+
+			var curWeek = weekOfYear(createLocal(), dow, doy);
+
+			weekYear = defaults(w.gg, config._a[YEAR], curWeek.year);
+
+			// Default to current week.
+			week = defaults(w.w, curWeek.week);
+
+			if (w.d != null) {
+				// weekday -- low day numbers are considered next week
+				weekday = w.d;
+				if (weekday < 0 || weekday > 6) {
+					weekdayOverflow = true;
+				}
+			} else if (w.e != null) {
+				// local weekday -- counting starts from beginning of week
+				weekday = w.e + dow;
+				if (w.e < 0 || w.e > 6) {
+					weekdayOverflow = true;
+				}
+			} else {
+				// default to beginning of week
+				weekday = dow;
+			}
+		}
+		if (week < 1 || week > weeksInYear(weekYear, dow, doy)) {
+			getParsingFlags(config)._overflowWeeks = true;
+		} else if (weekdayOverflow != null) {
+			getParsingFlags(config)._overflowWeekday = true;
+		} else {
+			temp = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy);
+			config._a[YEAR] = temp.year;
+			config._dayOfYear = temp.dayOfYear;
+		}
+	}
+
+	// iso 8601 regex
+	// 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00)
+	var extendedIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
+	var basicIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
+
+	var tzRegex = /Z|[+-]\d\d(?::?\d\d)?/;
+
+	var isoDates = [
+		['YYYYYY-MM-DD', /[+-]\d{6}-\d\d-\d\d/],
+		['YYYY-MM-DD', /\d{4}-\d\d-\d\d/],
+		['GGGG-[W]WW-E', /\d{4}-W\d\d-\d/],
+		['GGGG-[W]WW', /\d{4}-W\d\d/, false],
+		['YYYY-DDD', /\d{4}-\d{3}/],
+		['YYYY-MM', /\d{4}-\d\d/, false],
+		['YYYYYYMMDD', /[+-]\d{10}/],
+		['YYYYMMDD', /\d{8}/],
+		// YYYYMM is NOT allowed by the standard
+		['GGGG[W]WWE', /\d{4}W\d{3}/],
+		['GGGG[W]WW', /\d{4}W\d{2}/, false],
+		['YYYYDDD', /\d{7}/]
+	];
+
+	// iso time formats and regexes
+	var isoTimes = [
+		['HH:mm:ss.SSSS', /\d\d:\d\d:\d\d\.\d+/],
+		['HH:mm:ss,SSSS', /\d\d:\d\d:\d\d,\d+/],
+		['HH:mm:ss', /\d\d:\d\d:\d\d/],
+		['HH:mm', /\d\d:\d\d/],
+		['HHmmss.SSSS', /\d\d\d\d\d\d\.\d+/],
+		['HHmmss,SSSS', /\d\d\d\d\d\d,\d+/],
+		['HHmmss', /\d\d\d\d\d\d/],
+		['HHmm', /\d\d\d\d/],
+		['HH', /\d\d/]
+	];
+
+	var aspNetJsonRegex = /^\/?Date\((\-?\d+)/i;
+
+	// date from iso format
+	function configFromISO(config) {
+		var i, l,
+			string = config._i,
+			match = extendedIsoRegex.exec(string) || basicIsoRegex.exec(string),
+			allowTime, dateFormat, timeFormat, tzFormat;
+
+		if (match) {
+			getParsingFlags(config).iso = true;
+
+			for (i = 0, l = isoDates.length; i < l; i++) {
+				if (isoDates[i][1].exec(match[1])) {
+					dateFormat = isoDates[i][0];
+					allowTime = isoDates[i][2] !== false;
+					break;
+				}
+			}
+			if (dateFormat == null) {
+				config._isValid = false;
+				return;
+			}
+			if (match[3]) {
+				for (i = 0, l = isoTimes.length; i < l; i++) {
+					if (isoTimes[i][1].exec(match[3])) {
+						// match[2] should be 'T' or space
+						timeFormat = (match[2] || ' ') + isoTimes[i][0];
+						break;
+					}
+				}
+				if (timeFormat == null) {
+					config._isValid = false;
+					return;
+				}
+			}
+			if (!allowTime && timeFormat != null) {
+				config._isValid = false;
+				return;
+			}
+			if (match[4]) {
+				if (tzRegex.exec(match[4])) {
+					tzFormat = 'Z';
+				} else {
+					config._isValid = false;
+					return;
+				}
+			}
+			config._f = dateFormat + (timeFormat || '') + (tzFormat || '');
+			configFromStringAndFormat(config);
+		} else {
+			config._isValid = false;
+		}
+	}
+
+	// RFC 2822 regex: For details see https://tools.ietf.org/html/rfc2822#section-3.3
+	var rfc2822 = /^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/;
+
+	function extractFromRFC2822Strings(yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr) {
+		var result = [
+			untruncateYear(yearStr),
+			defaultLocaleMonthsShort.indexOf(monthStr),
+			parseInt(dayStr, 10),
+			parseInt(hourStr, 10),
+			parseInt(minuteStr, 10)
+		];
+
+		if (secondStr) {
+			result.push(parseInt(secondStr, 10));
+		}
+
+		return result;
+	}
+
+	function untruncateYear(yearStr) {
+		var year = parseInt(yearStr, 10);
+		if (year <= 49) {
+			return 2000 + year;
+		} else if (year <= 999) {
+			return 1900 + year;
+		}
+		return year;
+	}
+
+	function preprocessRFC2822(s) {
+		// Remove comments and folding whitespace and replace multiple-spaces with a single space
+		return s.replace(/\([^)]*\)|[\n\t]/g, ' ').replace(/(\s\s+)/g, ' ').replace(/^\s\s*/, '').replace(/\s\s*$/, '');
+	}
+
+	function checkWeekday(weekdayStr, parsedInput, config) {
+		if (weekdayStr) {
+			// TODO: Replace the vanilla JS Date object with an indepentent day-of-week check.
+			var weekdayProvided = defaultLocaleWeekdaysShort.indexOf(weekdayStr),
+				weekdayActual = new Date(parsedInput[0], parsedInput[1], parsedInput[2]).getDay();
+			if (weekdayProvided !== weekdayActual) {
+				getParsingFlags(config).weekdayMismatch = true;
+				config._isValid = false;
+				return false;
+			}
+		}
+		return true;
+	}
+
+	var obsOffsets = {
+		UT: 0,
+		GMT: 0,
+		EDT: -4 * 60,
+		EST: -5 * 60,
+		CDT: -5 * 60,
+		CST: -6 * 60,
+		MDT: -6 * 60,
+		MST: -7 * 60,
+		PDT: -7 * 60,
+		PST: -8 * 60
+	};
+
+	function calculateOffset(obsOffset, militaryOffset, numOffset) {
+		if (obsOffset) {
+			return obsOffsets[obsOffset];
+		} else if (militaryOffset) {
+			// the only allowed military tz is Z
+			return 0;
+		} else {
+			var hm = parseInt(numOffset, 10);
+			var m = hm % 100, h = (hm - m) / 100;
+			return h * 60 + m;
+		}
+	}
+
+	// date and time from ref 2822 format
+	function configFromRFC2822(config) {
+		var match = rfc2822.exec(preprocessRFC2822(config._i));
+		if (match) {
+			var parsedArray = extractFromRFC2822Strings(match[4], match[3], match[2], match[5], match[6], match[7]);
+			if (!checkWeekday(match[1], parsedArray, config)) {
+				return;
+			}
+
+			config._a = parsedArray;
+			config._tzm = calculateOffset(match[8], match[9], match[10]);
+
+			config._d = createUTCDate.apply(null, config._a);
+			config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
+
+			getParsingFlags(config).rfc2822 = true;
+		} else {
+			config._isValid = false;
+		}
+	}
+
+	// date from iso format or fallback
+	function configFromString(config) {
+		var matched = aspNetJsonRegex.exec(config._i);
+
+		if (matched !== null) {
+			config._d = new Date(+matched[1]);
+			return;
+		}
+
+		configFromISO(config);
+		if (config._isValid === false) {
+			delete config._isValid;
+		} else {
+			return;
+		}
+
+		configFromRFC2822(config);
+		if (config._isValid === false) {
+			delete config._isValid;
+		} else {
+			return;
+		}
+
+		// Final attempt, use Input Fallback
+		hooks.createFromInputFallback(config);
+	}
+
+	hooks.createFromInputFallback = deprecate(
+		'value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), ' +
+		'which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are ' +
+		'discouraged and will be removed in an upcoming major release. Please refer to ' +
+		'http://momentjs.com/guides/#/warnings/js-date/ for more info.',
+		function (config) {
+			config._d = new Date(config._i + (config._useUTC ? ' UTC' : ''));
+		}
+	);
+
+	// constant that refers to the ISO standard
+	hooks.ISO_8601 = function () {
+	};
+
+	// constant that refers to the RFC 2822 form
+	hooks.RFC_2822 = function () {
+	};
+
+	// date from string and format string
+	function configFromStringAndFormat(config) {
+		// TODO: Move this to another part of the creation flow to prevent circular deps
+		if (config._f === hooks.ISO_8601) {
+			configFromISO(config);
+			return;
+		}
+		if (config._f === hooks.RFC_2822) {
+			configFromRFC2822(config);
+			return;
+		}
+		config._a = [];
+		getParsingFlags(config).empty = true;
+
+		// This array is used to make a Date, either with `new Date` or `Date.UTC`
+		var string = '' + config._i,
+			i, parsedInput, tokens, token, skipped,
+			stringLength = string.length,
+			totalParsedInputLength = 0;
+
+		tokens = expandFormat(config._f, config._locale).match(formattingTokens) || [];
+
+		for (i = 0; i < tokens.length; i++) {
+			token = tokens[i];
+			parsedInput = (string.match(getParseRegexForToken(token, config)) || [])[0];
+			// console.log('token', token, 'parsedInput', parsedInput,
+			//         'regex', getParseRegexForToken(token, config));
+			if (parsedInput) {
+				skipped = string.substr(0, string.indexOf(parsedInput));
+				if (skipped.length > 0) {
+					getParsingFlags(config).unusedInput.push(skipped);
+				}
+				string = string.slice(string.indexOf(parsedInput) + parsedInput.length);
+				totalParsedInputLength += parsedInput.length;
+			}
+			// don't parse if it's not a known token
+			if (formatTokenFunctions[token]) {
+				if (parsedInput) {
+					getParsingFlags(config).empty = false;
+				} else {
+					getParsingFlags(config).unusedTokens.push(token);
+				}
+				addTimeToArrayFromToken(token, parsedInput, config);
+			} else if (config._strict && !parsedInput) {
+				getParsingFlags(config).unusedTokens.push(token);
+			}
+		}
+
+		// add remaining unparsed input length to the string
+		getParsingFlags(config).charsLeftOver = stringLength - totalParsedInputLength;
+		if (string.length > 0) {
+			getParsingFlags(config).unusedInput.push(string);
+		}
+
+		// clear _12h flag if hour is <= 12
+		if (config._a[HOUR] <= 12 &&
+			getParsingFlags(config).bigHour === true &&
+			config._a[HOUR] > 0) {
+			getParsingFlags(config).bigHour = undefined;
+		}
+
+		getParsingFlags(config).parsedDateParts = config._a.slice(0);
+		getParsingFlags(config).meridiem = config._meridiem;
+		// handle meridiem
+		config._a[HOUR] = meridiemFixWrap(config._locale, config._a[HOUR], config._meridiem);
+
+		configFromArray(config);
+		checkOverflow(config);
+	}
+
+
+	function meridiemFixWrap(locale, hour, meridiem) {
+		var isPm;
+
+		if (meridiem == null) {
+			// nothing to do
+			return hour;
+		}
+		if (locale.meridiemHour != null) {
+			return locale.meridiemHour(hour, meridiem);
+		} else if (locale.isPM != null) {
+			// Fallback
+			isPm = locale.isPM(meridiem);
+			if (isPm && hour < 12) {
+				hour += 12;
+			}
+			if (!isPm && hour === 12) {
+				hour = 0;
+			}
+			return hour;
+		} else {
+			// this is not supposed to happen
+			return hour;
+		}
+	}
+
+	// date from string and array of format strings
+	function configFromStringAndArray(config) {
+		var tempConfig,
+			bestMoment,
+
+			scoreToBeat,
+			i,
+			currentScore;
+
+		if (config._f.length === 0) {
+			getParsingFlags(config).invalidFormat = true;
+			config._d = new Date(NaN);
+			return;
+		}
+
+		for (i = 0; i < config._f.length; i++) {
+			currentScore = 0;
+			tempConfig = copyConfig({}, config);
+			if (config._useUTC != null) {
+				tempConfig._useUTC = config._useUTC;
+			}
+			tempConfig._f = config._f[i];
+			configFromStringAndFormat(tempConfig);
+
+			if (!isValid(tempConfig)) {
+				continue;
+			}
+
+			// if there is any input that was not parsed add a penalty for that format
+			currentScore += getParsingFlags(tempConfig).charsLeftOver;
+
+			//or tokens
+			currentScore += getParsingFlags(tempConfig).unusedTokens.length * 10;
+
+			getParsingFlags(tempConfig).score = currentScore;
+
+			if (scoreToBeat == null || currentScore < scoreToBeat) {
+				scoreToBeat = currentScore;
+				bestMoment = tempConfig;
+			}
+		}
+
+		extend(config, bestMoment || tempConfig);
+	}
+
+	function configFromObject(config) {
+		if (config._d) {
+			return;
+		}
+
+		var i = normalizeObjectUnits(config._i);
+		config._a = map([i.year, i.month, i.day || i.date, i.hour, i.minute, i.second, i.millisecond], function (obj) {
+			return obj && parseInt(obj, 10);
+		});
+
+		configFromArray(config);
+	}
+
+	function createFromConfig(config) {
+		var res = new Moment(checkOverflow(prepareConfig(config)));
+		if (res._nextDay) {
+			// Adding is smart enough around DST
+			res.add(1, 'd');
+			res._nextDay = undefined;
+		}
+
+		return res;
+	}
+
+	function prepareConfig(config) {
+		var input = config._i,
+			format = config._f;
+
+		config._locale = config._locale || getLocale(config._l);
+
+		if (input === null || (format === undefined && input === '')) {
+			return createInvalid({nullInput: true});
+		}
+
+		if (typeof input === 'string') {
+			config._i = input = config._locale.preparse(input);
+		}
+
+		if (isMoment(input)) {
+			return new Moment(checkOverflow(input));
+		} else if (isDate(input)) {
+			config._d = input;
+		} else if (isArray(format)) {
+			configFromStringAndArray(config);
+		} else if (format) {
+			configFromStringAndFormat(config);
+		} else {
+			configFromInput(config);
+		}
+
+		if (!isValid(config)) {
+			config._d = null;
+		}
+
+		return config;
+	}
+
+	function configFromInput(config) {
+		var input = config._i;
+		if (isUndefined(input)) {
+			config._d = new Date(hooks.now());
+		} else if (isDate(input)) {
+			config._d = new Date(input.valueOf());
+		} else if (typeof input === 'string') {
+			configFromString(config);
+		} else if (isArray(input)) {
+			config._a = map(input.slice(0), function (obj) {
+				return parseInt(obj, 10);
+			});
+			configFromArray(config);
+		} else if (isObject(input)) {
+			configFromObject(config);
+		} else if (isNumber(input)) {
+			// from milliseconds
+			config._d = new Date(input);
+		} else {
+			hooks.createFromInputFallback(config);
+		}
+	}
+
+	function createLocalOrUTC(input, format, locale, strict, isUTC) {
+		var c = {};
+
+		if (locale === true || locale === false) {
+			strict = locale;
+			locale = undefined;
+		}
+
+		if ((isObject(input) && isObjectEmpty(input)) ||
+			(isArray(input) && input.length === 0)) {
+			input = undefined;
+		}
+		// object construction must be done this way.
+		// https://github.com/moment/moment/issues/1423
+		c._isAMomentObject = true;
+		c._useUTC = c._isUTC = isUTC;
+		c._l = locale;
+		c._i = input;
+		c._f = format;
+		c._strict = strict;
+
+		return createFromConfig(c);
+	}
+
+	function createLocal(input, format, locale, strict) {
+		return createLocalOrUTC(input, format, locale, strict, false);
+	}
+
+	var prototypeMin = deprecate(
+		'moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/',
+		function () {
+			var other = createLocal.apply(null, arguments);
+			if (this.isValid() && other.isValid()) {
+				return other < this ? this : other;
+			} else {
+				return createInvalid();
+			}
+		}
+	);
+
+	var prototypeMax = deprecate(
+		'moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/',
+		function () {
+			var other = createLocal.apply(null, arguments);
+			if (this.isValid() && other.isValid()) {
+				return other > this ? this : other;
+			} else {
+				return createInvalid();
+			}
+		}
+	);
+
+	// Pick a moment m from moments so that m[fn](other) is true for all
+	// other. This relies on the function fn to be transitive.
+	//
+	// moments should either be an array of moment objects or an array, whose
+	// first element is an array of moment objects.
+	function pickBy(fn, moments) {
+		var res, i;
+		if (moments.length === 1 && isArray(moments[0])) {
+			moments = moments[0];
+		}
+		if (!moments.length) {
+			return createLocal();
+		}
+		res = moments[0];
+		for (i = 1; i < moments.length; ++i) {
+			if (!moments[i].isValid() || moments[i][fn](res)) {
+				res = moments[i];
+			}
+		}
+		return res;
+	}
+
+	// TODO: Use [].sort instead?
+	function min() {
+		var args = [].slice.call(arguments, 0);
+
+		return pickBy('isBefore', args);
+	}
+
+	function max() {
+		var args = [].slice.call(arguments, 0);
+
+		return pickBy('isAfter', args);
+	}
+
+	var now = function () {
+		return Date.now ? Date.now() : +(new Date());
+	};
+
+	var ordering = ['year', 'quarter', 'month', 'week', 'day', 'hour', 'minute', 'second', 'millisecond'];
+
+	function isDurationValid(m) {
+		for (var key in m) {
+			if (!(indexOf.call(ordering, key) !== -1 && (m[key] == null || !isNaN(m[key])))) {
+				return false;
+			}
+		}
+
+		var unitHasDecimal = false;
+		for (var i = 0; i < ordering.length; ++i) {
+			if (m[ordering[i]]) {
+				if (unitHasDecimal) {
+					return false; // only allow non-integers for smallest unit
+				}
+				if (parseFloat(m[ordering[i]]) !== toInt(m[ordering[i]])) {
+					unitHasDecimal = true;
+				}
+			}
+		}
+
+		return true;
+	}
+
+	function isValid$1() {
+		return this._isValid;
+	}
+
+	function createInvalid$1() {
+		return createDuration(NaN);
+	}
+
+	function Duration(duration) {
+		var normalizedInput = normalizeObjectUnits(duration),
+			years = normalizedInput.year || 0,
+			quarters = normalizedInput.quarter || 0,
+			months = normalizedInput.month || 0,
+			weeks = normalizedInput.week || normalizedInput.isoWeek || 0,
+			days = normalizedInput.day || 0,
+			hours = normalizedInput.hour || 0,
+			minutes = normalizedInput.minute || 0,
+			seconds = normalizedInput.second || 0,
+			milliseconds = normalizedInput.millisecond || 0;
+
+		this._isValid = isDurationValid(normalizedInput);
+
+		// representation for dateAddRemove
+		this._milliseconds = +milliseconds +
+			seconds * 1e3 + // 1000
+			minutes * 6e4 + // 1000 * 60
+			hours * 1000 * 60 * 60; //using 1000 * 60 * 60 instead of 36e5 to avoid floating point rounding errors https://github.com/moment/moment/issues/2978
+		// Because of dateAddRemove treats 24 hours as different from a
+		// day when working around DST, we need to store them separately
+		this._days = +days +
+			weeks * 7;
+		// It is impossible to translate months into days without knowing
+		// which months you are are talking about, so we have to store
+		// it separately.
+		this._months = +months +
+			quarters * 3 +
+			years * 12;
+
+		this._data = {};
+
+		this._locale = getLocale();
+
+		this._bubble();
+	}
+
+	function isDuration(obj) {
+		return obj instanceof Duration;
+	}
+
+	function absRound(number) {
+		if (number < 0) {
+			return Math.round(-1 * number) * -1;
+		} else {
+			return Math.round(number);
+		}
+	}
+
+	// FORMATTING
+
+	function offset(token, separator) {
+		addFormatToken(token, 0, 0, function () {
+			var offset = this.utcOffset();
+			var sign = '+';
+			if (offset < 0) {
+				offset = -offset;
+				sign = '-';
+			}
+			return sign + zeroFill(~~(offset / 60), 2) + separator + zeroFill(~~(offset) % 60, 2);
+		});
+	}
+
+	offset('Z', ':');
+	offset('ZZ', '');
+
+	// PARSING
+
+	addRegexToken('Z', matchShortOffset);
+	addRegexToken('ZZ', matchShortOffset);
+	addParseToken(['Z', 'ZZ'], function (input, array, config) {
+		config._useUTC = true;
+		config._tzm = offsetFromString(matchShortOffset, input);
+	});
+
+	// HELPERS
+
+	// timezone chunker
+	// '+10:00' > ['10',  '00']
+	// '-1530'  > ['-15', '30']
+	var chunkOffset = /([\+\-]|\d\d)/gi;
+
+	function offsetFromString(matcher, string) {
+		var matches = (string || '').match(matcher);
+
+		if (matches === null) {
+			return null;
+		}
+
+		var chunk = matches[matches.length - 1] || [];
+		var parts = (chunk + '').match(chunkOffset) || ['-', 0, 0];
+		var minutes = +(parts[1] * 60) + toInt(parts[2]);
+
+		return minutes === 0 ?
+			0 :
+			parts[0] === '+' ? minutes : -minutes;
+	}
+
+	// Return a moment from input, that is local/utc/zone equivalent to model.
+	function cloneWithOffset(input, model) {
+		var res, diff;
+		if (model._isUTC) {
+			res = model.clone();
+			diff = (isMoment(input) || isDate(input) ? input.valueOf() : createLocal(input).valueOf()) - res.valueOf();
+			// Use low-level api, because this fn is low-level api.
+			res._d.setTime(res._d.valueOf() + diff);
+			hooks.updateOffset(res, false);
+			return res;
+		} else {
+			return createLocal(input).local();
+		}
+	}
+
+	function getDateOffset(m) {
+		// On Firefox.24 Date#getTimezoneOffset returns a floating point.
+		// https://github.com/moment/moment/pull/1871
+		return -Math.round(m._d.getTimezoneOffset() / 15) * 15;
+	}
+
+	// HOOKS
+
+	// This function will be called whenever a moment is mutated.
+	// It is intended to keep the offset in sync with the timezone.
+	hooks.updateOffset = function () {
+	};
+
+	// MOMENTS
+
+	// keepLocalTime = true means only change the timezone, without
+	// affecting the local hour. So 5:31:26 +0300 --[utcOffset(2, true)]-->
+	// 5:31:26 +0200 It is possible that 5:31:26 doesn't exist with offset
+	// +0200, so we adjust the time as needed, to be valid.
+	//
+	// Keeping the time actually adds/subtracts (one hour)
+	// from the actual represented time. That is why we call updateOffset
+	// a second time. In case it wants us to change the offset again
+	// _changeInProgress == true case, then we have to adjust, because
+	// there is no such time in the given timezone.
+	function getSetOffset(input, keepLocalTime, keepMinutes) {
+		var offset = this._offset || 0,
+			localAdjust;
+		if (!this.isValid()) {
+			return input != null ? this : NaN;
+		}
+		if (input != null) {
+			if (typeof input === 'string') {
+				input = offsetFromString(matchShortOffset, input);
+				if (input === null) {
+					return this;
+				}
+			} else if (Math.abs(input) < 16 && !keepMinutes) {
+				input = input * 60;
+			}
+			if (!this._isUTC && keepLocalTime) {
+				localAdjust = getDateOffset(this);
+			}
+			this._offset = input;
+			this._isUTC = true;
+			if (localAdjust != null) {
+				this.add(localAdjust, 'm');
+			}
+			if (offset !== input) {
+				if (!keepLocalTime || this._changeInProgress) {
+					addSubtract(this, createDuration(input - offset, 'm'), 1, false);
+				} else if (!this._changeInProgress) {
+					this._changeInProgress = true;
+					hooks.updateOffset(this, true);
+					this._changeInProgress = null;
+				}
+			}
+			return this;
+		} else {
+			return this._isUTC ? offset : getDateOffset(this);
+		}
+	}
+
+	function getSetZone(input, keepLocalTime) {
+		if (input != null) {
+			if (typeof input !== 'string') {
+				input = -input;
+			}
+
+			this.utcOffset(input, keepLocalTime);
+
+			return this;
+		} else {
+			return -this.utcOffset();
+		}
+	}
+
+	function setOffsetToUTC(keepLocalTime) {
+		return this.utcOffset(0, keepLocalTime);
+	}
+
+	function setOffsetToLocal(keepLocalTime) {
+		if (this._isUTC) {
+			this.utcOffset(0, keepLocalTime);
+			this._isUTC = false;
+
+			if (keepLocalTime) {
+				this.subtract(getDateOffset(this), 'm');
+			}
+		}
+		return this;
+	}
+
+	function setOffsetToParsedOffset() {
+		if (this._tzm != null) {
+			this.utcOffset(this._tzm, false, true);
+		} else if (typeof this._i === 'string') {
+			var tZone = offsetFromString(matchOffset, this._i);
+			if (tZone != null) {
+				this.utcOffset(tZone);
+			} else {
+				this.utcOffset(0, true);
+			}
+		}
+		return this;
+	}
+
+	function hasAlignedHourOffset(input) {
+		if (!this.isValid()) {
+			return false;
+		}
+		input = input ? createLocal(input).utcOffset() : 0;
+
+		return (this.utcOffset() - input) % 60 === 0;
+	}
+
+	function isDaylightSavingTime() {
+		return (
+			this.utcOffset() > this.clone().month(0).utcOffset() ||
+			this.utcOffset() > this.clone().month(5).utcOffset()
+		);
+	}
+
+	function isDaylightSavingTimeShifted() {
+		if (!isUndefined(this._isDSTShifted)) {
+			return this._isDSTShifted;
+		}
+
+		var c = {};
+
+		copyConfig(c, this);
+		c = prepareConfig(c);
+
+		if (c._a) {
+			var other = c._isUTC ? createUTC(c._a) : createLocal(c._a);
+			this._isDSTShifted = this.isValid() &&
+				compareArrays(c._a, other.toArray()) > 0;
+		} else {
+			this._isDSTShifted = false;
+		}
+
+		return this._isDSTShifted;
+	}
+
+	function isLocal() {
+		return this.isValid() ? !this._isUTC : false;
+	}
+
+	function isUtcOffset() {
+		return this.isValid() ? this._isUTC : false;
+	}
+
+	function isUtc() {
+		return this.isValid() ? this._isUTC && this._offset === 0 : false;
+	}
+
+	// ASP.NET json date format regex
+	var aspNetRegex = /^(\-|\+)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/;
+
+	// from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html
+	// somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere
+	// and further modified to allow for strings containing both week and day
+	var isoRegex = /^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;
+
+	function createDuration(input, key) {
+		var duration = input,
+			// matching against regexp is expensive, do it on demand
+			match = null,
+			sign,
+			ret,
+			diffRes;
+
+		if (isDuration(input)) {
+			duration = {
+				ms: input._milliseconds,
+				d: input._days,
+				M: input._months
+			};
+		} else if (isNumber(input)) {
+			duration = {};
+			if (key) {
+				duration[key] = input;
+			} else {
+				duration.milliseconds = input;
+			}
+		} else if (!!(match = aspNetRegex.exec(input))) {
+			sign = (match[1] === '-') ? -1 : 1;
+			duration = {
+				y: 0,
+				d: toInt(match[DATE]) * sign,
+				h: toInt(match[HOUR]) * sign,
+				m: toInt(match[MINUTE]) * sign,
+				s: toInt(match[SECOND]) * sign,
+				ms: toInt(absRound(match[MILLISECOND] * 1000)) * sign // the millisecond decimal point is included in the match
+			};
+		} else if (!!(match = isoRegex.exec(input))) {
+			sign = (match[1] === '-') ? -1 : 1;
+			duration = {
+				y: parseIso(match[2], sign),
+				M: parseIso(match[3], sign),
+				w: parseIso(match[4], sign),
+				d: parseIso(match[5], sign),
+				h: parseIso(match[6], sign),
+				m: parseIso(match[7], sign),
+				s: parseIso(match[8], sign)
+			};
+		} else if (duration == null) {// checks for null or undefined
+			duration = {};
+		} else if (typeof duration === 'object' && ('from' in duration || 'to' in duration)) {
+			diffRes = momentsDifference(createLocal(duration.from), createLocal(duration.to));
+
+			duration = {};
+			duration.ms = diffRes.milliseconds;
+			duration.M = diffRes.months;
+		}
+
+		ret = new Duration(duration);
+
+		if (isDuration(input) && hasOwnProp(input, '_locale')) {
+			ret._locale = input._locale;
+		}
+
+		return ret;
+	}
+
+	createDuration.fn = Duration.prototype;
+	createDuration.invalid = createInvalid$1;
+
+	function parseIso(inp, sign) {
+		// We'd normally use ~~inp for this, but unfortunately it also
+		// converts floats to ints.
+		// inp may be undefined, so careful calling replace on it.
+		var res = inp && parseFloat(inp.replace(',', '.'));
+		// apply sign while we're at it
+		return (isNaN(res) ? 0 : res) * sign;
+	}
+
+	function positiveMomentsDifference(base, other) {
+		var res = {};
+
+		res.months = other.month() - base.month() +
+			(other.year() - base.year()) * 12;
+		if (base.clone().add(res.months, 'M').isAfter(other)) {
+			--res.months;
+		}
+
+		res.milliseconds = +other - +(base.clone().add(res.months, 'M'));
+
+		return res;
+	}
+
+	function momentsDifference(base, other) {
+		var res;
+		if (!(base.isValid() && other.isValid())) {
+			return {milliseconds: 0, months: 0};
+		}
+
+		other = cloneWithOffset(other, base);
+		if (base.isBefore(other)) {
+			res = positiveMomentsDifference(base, other);
+		} else {
+			res = positiveMomentsDifference(other, base);
+			res.milliseconds = -res.milliseconds;
+			res.months = -res.months;
+		}
+
+		return res;
+	}
+
+	// TODO: remove 'name' arg after deprecation is removed
+	function createAdder(direction, name) {
+		return function (val, period) {
+			var dur, tmp;
+			//invert the arguments, but complain about it
+			if (period !== null && !isNaN(+period)) {
+				deprecateSimple(name, 'moment().' + name + '(period, number) is deprecated. Please use moment().' + name + '(number, period). ' +
+					'See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info.');
+				tmp = val;
+				val = period;
+				period = tmp;
+			}
+
+			val = typeof val === 'string' ? +val : val;
+			dur = createDuration(val, period);
+			addSubtract(this, dur, direction);
+			return this;
+		};
+	}
+
+	function addSubtract(mom, duration, isAdding, updateOffset) {
+		var milliseconds = duration._milliseconds,
+			days = absRound(duration._days),
+			months = absRound(duration._months);
+
+		if (!mom.isValid()) {
+			// No op
+			return;
+		}
+
+		updateOffset = updateOffset == null ? true : updateOffset;
+
+		if (months) {
+			setMonth(mom, get(mom, 'Month') + months * isAdding);
+		}
+		if (days) {
+			set$1(mom, 'Date', get(mom, 'Date') + days * isAdding);
+		}
+		if (milliseconds) {
+			mom._d.setTime(mom._d.valueOf() + milliseconds * isAdding);
+		}
+		if (updateOffset) {
+			hooks.updateOffset(mom, days || months);
+		}
+	}
+
+	var add = createAdder(1, 'add');
+	var subtract = createAdder(-1, 'subtract');
+
+	function getCalendarFormat(myMoment, now) {
+		var diff = myMoment.diff(now, 'days', true);
+		return diff < -6 ? 'sameElse' :
+			diff < -1 ? 'lastWeek' :
+				diff < 0 ? 'lastDay' :
+					diff < 1 ? 'sameDay' :
+						diff < 2 ? 'nextDay' :
+							diff < 7 ? 'nextWeek' : 'sameElse';
+	}
+
+	function calendar$1(time, formats) {
+		// We want to compare the start of today, vs this.
+		// Getting start-of-today depends on whether we're local/utc/offset or not.
+		var now = time || createLocal(),
+			sod = cloneWithOffset(now, this).startOf('day'),
+			format = hooks.calendarFormat(this, sod) || 'sameElse';
+
+		var output = formats && (isFunction(formats[format]) ? formats[format].call(this, now) : formats[format]);
+
+		return this.format(output || this.localeData().calendar(format, this, createLocal(now)));
+	}
+
+	function clone() {
+		return new Moment(this);
+	}
+
+	function isAfter(input, units) {
+		var localInput = isMoment(input) ? input : createLocal(input);
+		if (!(this.isValid() && localInput.isValid())) {
+			return false;
+		}
+		units = normalizeUnits(units) || 'millisecond';
+		if (units === 'millisecond') {
+			return this.valueOf() > localInput.valueOf();
+		} else {
+			return localInput.valueOf() < this.clone().startOf(units).valueOf();
+		}
+	}
+
+	function isBefore(input, units) {
+		var localInput = isMoment(input) ? input : createLocal(input);
+		if (!(this.isValid() && localInput.isValid())) {
+			return false;
+		}
+		units = normalizeUnits(units) || 'millisecond';
+		if (units === 'millisecond') {
+			return this.valueOf() < localInput.valueOf();
+		} else {
+			return this.clone().endOf(units).valueOf() < localInput.valueOf();
+		}
+	}
+
+	function isBetween(from, to, units, inclusivity) {
+		var localFrom = isMoment(from) ? from : createLocal(from),
+			localTo = isMoment(to) ? to : createLocal(to);
+		if (!(this.isValid() && localFrom.isValid() && localTo.isValid())) {
+			return false;
+		}
+		inclusivity = inclusivity || '()';
+		return (inclusivity[0] === '(' ? this.isAfter(localFrom, units) : !this.isBefore(localFrom, units)) &&
+			(inclusivity[1] === ')' ? this.isBefore(localTo, units) : !this.isAfter(localTo, units));
+	}
+
+	function isSame(input, units) {
+		var localInput = isMoment(input) ? input : createLocal(input),
+			inputMs;
+		if (!(this.isValid() && localInput.isValid())) {
+			return false;
+		}
+		units = normalizeUnits(units) || 'millisecond';
+		if (units === 'millisecond') {
+			return this.valueOf() === localInput.valueOf();
+		} else {
+			inputMs = localInput.valueOf();
+			return this.clone().startOf(units).valueOf() <= inputMs && inputMs <= this.clone().endOf(units).valueOf();
+		}
+	}
+
+	function isSameOrAfter(input, units) {
+		return this.isSame(input, units) || this.isAfter(input, units);
+	}
+
+	function isSameOrBefore(input, units) {
+		return this.isSame(input, units) || this.isBefore(input, units);
+	}
+
+	function diff(input, units, asFloat) {
+		var that,
+			zoneDelta,
+			output;
+
+		if (!this.isValid()) {
+			return NaN;
+		}
+
+		that = cloneWithOffset(input, this);
+
+		if (!that.isValid()) {
+			return NaN;
+		}
+
+		zoneDelta = (that.utcOffset() - this.utcOffset()) * 6e4;
+
+		units = normalizeUnits(units);
+
+		switch (units) {
+			case 'year':
+				output = monthDiff(this, that) / 12;
+				break;
+			case 'month':
+				output = monthDiff(this, that);
+				break;
+			case 'quarter':
+				output = monthDiff(this, that) / 3;
+				break;
+			case 'second':
+				output = (this - that) / 1e3;
+				break; // 1000
+			case 'minute':
+				output = (this - that) / 6e4;
+				break; // 1000 * 60
+			case 'hour':
+				output = (this - that) / 36e5;
+				break; // 1000 * 60 * 60
+			case 'day':
+				output = (this - that - zoneDelta) / 864e5;
+				break; // 1000 * 60 * 60 * 24, negate dst
+			case 'week':
+				output = (this - that - zoneDelta) / 6048e5;
+				break; // 1000 * 60 * 60 * 24 * 7, negate dst
+			default:
+				output = this - that;
+		}
+
+		return asFloat ? output : absFloor(output);
+	}
+
+	function monthDiff(a, b) {
+		// difference in months
+		var wholeMonthDiff = ((b.year() - a.year()) * 12) + (b.month() - a.month()),
+			// b is in (anchor - 1 month, anchor + 1 month)
+			anchor = a.clone().add(wholeMonthDiff, 'months'),
+			anchor2, adjust;
+
+		if (b - anchor < 0) {
+			anchor2 = a.clone().add(wholeMonthDiff - 1, 'months');
+			// linear across the month
+			adjust = (b - anchor) / (anchor - anchor2);
+		} else {
+			anchor2 = a.clone().add(wholeMonthDiff + 1, 'months');
+			// linear across the month
+			adjust = (b - anchor) / (anchor2 - anchor);
+		}
+
+		//check for negative zero, return zero if negative zero
+		return -(wholeMonthDiff + adjust) || 0;
+	}
+
+	hooks.defaultFormat = 'YYYY-MM-DDTHH:mm:ssZ';
+	hooks.defaultFormatUtc = 'YYYY-MM-DDTHH:mm:ss[Z]';
+
+	function toString() {
+		return this.clone().locale('en').format('ddd MMM DD YYYY HH:mm:ss [GMT]ZZ');
+	}
+
+	function toISOString(keepOffset) {
+		if (!this.isValid()) {
+			return null;
+		}
+		var utc = keepOffset !== true;
+		var m = utc ? this.clone().utc() : this;
+		if (m.year() < 0 || m.year() > 9999) {
+			return formatMoment(m, utc ? 'YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYYYY-MM-DD[T]HH:mm:ss.SSSZ');
+		}
+		if (isFunction(Date.prototype.toISOString)) {
+			// native implementation is ~50x faster, use it when we can
+			if (utc) {
+				return this.toDate().toISOString();
+			} else {
+				return new Date(this.valueOf() + this.utcOffset() * 60 * 1000).toISOString().replace('Z', formatMoment(m, 'Z'));
+			}
+		}
+		return formatMoment(m, utc ? 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYY-MM-DD[T]HH:mm:ss.SSSZ');
+	}
+
+	/**
+	 * Return a human readable representation of a moment that can
+	 * also be evaluated to get a new moment which is the same
+	 *
+	 * @link https://nodejs.org/dist/latest/docs/api/util.html#util_custom_inspect_function_on_objects
+	 */
+	function inspect() {
+		if (!this.isValid()) {
+			return 'moment.invalid(/* ' + this._i + ' */)';
+		}
+		var func = 'moment';
+		var zone = '';
+		if (!this.isLocal()) {
+			func = this.utcOffset() === 0 ? 'moment.utc' : 'moment.parseZone';
+			zone = 'Z';
+		}
+		var prefix = '[' + func + '("]';
+		var year = (0 <= this.year() && this.year() <= 9999) ? 'YYYY' : 'YYYYYY';
+		var datetime = '-MM-DD[T]HH:mm:ss.SSS';
+		var suffix = zone + '[")]';
+
+		return this.format(prefix + year + datetime + suffix);
+	}
+
+	function format(inputString) {
+		if (!inputString) {
+			inputString = this.isUtc() ? hooks.defaultFormatUtc : hooks.defaultFormat;
+		}
+		var output = formatMoment(this, inputString);
+		return this.localeData().postformat(output);
+	}
+
+	function from(time, withoutSuffix) {
+		if (this.isValid() &&
+			((isMoment(time) && time.isValid()) ||
+				createLocal(time).isValid())) {
+			return createDuration({to: this, from: time}).locale(this.locale()).humanize(!withoutSuffix);
+		} else {
+			return this.localeData().invalidDate();
+		}
+	}
+
+	function fromNow(withoutSuffix) {
+		return this.from(createLocal(), withoutSuffix);
+	}
+
+	function to(time, withoutSuffix) {
+		if (this.isValid() &&
+			((isMoment(time) && time.isValid()) ||
+				createLocal(time).isValid())) {
+			return createDuration({from: this, to: time}).locale(this.locale()).humanize(!withoutSuffix);
+		} else {
+			return this.localeData().invalidDate();
+		}
+	}
+
+	function toNow(withoutSuffix) {
+		return this.to(createLocal(), withoutSuffix);
+	}
+
+	// If passed a locale key, it will set the locale for this
+	// instance.  Otherwise, it will return the locale configuration
+	// variables for this instance.
+	function locale(key) {
+		var newLocaleData;
+
+		if (key === undefined) {
+			return this._locale._abbr;
+		} else {
+			newLocaleData = getLocale(key);
+			if (newLocaleData != null) {
+				this._locale = newLocaleData;
+			}
+			return this;
+		}
+	}
+
+	var lang = deprecate(
+		'moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.',
+		function (key) {
+			if (key === undefined) {
+				return this.localeData();
+			} else {
+				return this.locale(key);
+			}
+		}
+	);
+
+	function localeData() {
+		return this._locale;
+	}
+
+	var MS_PER_SECOND = 1000;
+	var MS_PER_MINUTE = 60 * MS_PER_SECOND;
+	var MS_PER_HOUR = 60 * MS_PER_MINUTE;
+	var MS_PER_400_YEARS = (365 * 400 + 97) * 24 * MS_PER_HOUR;
+
+	// actual modulo - handles negative numbers (for dates before 1970):
+	function mod$1(dividend, divisor) {
+		return (dividend % divisor + divisor) % divisor;
+	}
+
+	function localStartOfDate(y, m, d) {
+		// the date constructor remaps years 0-99 to 1900-1999
+		if (y < 100 && y >= 0) {
+			// preserve leap years using a full 400 year cycle, then reset
+			return new Date(y + 400, m, d) - MS_PER_400_YEARS;
+		} else {
+			return new Date(y, m, d).valueOf();
+		}
+	}
+
+	function utcStartOfDate(y, m, d) {
+		// Date.UTC remaps years 0-99 to 1900-1999
+		if (y < 100 && y >= 0) {
+			// preserve leap years using a full 400 year cycle, then reset
+			return Date.UTC(y + 400, m, d) - MS_PER_400_YEARS;
+		} else {
+			return Date.UTC(y, m, d);
+		}
+	}
+
+	function startOf(units) {
+		var time;
+		units = normalizeUnits(units);
+		if (units === undefined || units === 'millisecond' || !this.isValid()) {
+			return this;
+		}
+
+		var startOfDate = this._isUTC ? utcStartOfDate : localStartOfDate;
+
+		switch (units) {
+			case 'year':
+				time = startOfDate(this.year(), 0, 1);
+				break;
+			case 'quarter':
+				time = startOfDate(this.year(), this.month() - this.month() % 3, 1);
+				break;
+			case 'month':
+				time = startOfDate(this.year(), this.month(), 1);
+				break;
+			case 'week':
+				time = startOfDate(this.year(), this.month(), this.date() - this.weekday());
+				break;
+			case 'isoWeek':
+				time = startOfDate(this.year(), this.month(), this.date() - (this.isoWeekday() - 1));
+				break;
+			case 'day':
+			case 'date':
+				time = startOfDate(this.year(), this.month(), this.date());
+				break;
+			case 'hour':
+				time = this._d.valueOf();
+				time -= mod$1(time + (this._isUTC ? 0 : this.utcOffset() * MS_PER_MINUTE), MS_PER_HOUR);
+				break;
+			case 'minute':
+				time = this._d.valueOf();
+				time -= mod$1(time, MS_PER_MINUTE);
+				break;
+			case 'second':
+				time = this._d.valueOf();
+				time -= mod$1(time, MS_PER_SECOND);
+				break;
+		}
+
+		this._d.setTime(time);
+		hooks.updateOffset(this, true);
+		return this;
+	}
+
+	function endOf(units) {
+		var time;
+		units = normalizeUnits(units);
+		if (units === undefined || units === 'millisecond' || !this.isValid()) {
+			return this;
+		}
+
+		var startOfDate = this._isUTC ? utcStartOfDate : localStartOfDate;
+
+		switch (units) {
+			case 'year':
+				time = startOfDate(this.year() + 1, 0, 1) - 1;
+				break;
+			case 'quarter':
+				time = startOfDate(this.year(), this.month() - this.month() % 3 + 3, 1) - 1;
+				break;
+			case 'month':
+				time = startOfDate(this.year(), this.month() + 1, 1) - 1;
+				break;
+			case 'week':
+				time = startOfDate(this.year(), this.month(), this.date() - this.weekday() + 7) - 1;
+				break;
+			case 'isoWeek':
+				time = startOfDate(this.year(), this.month(), this.date() - (this.isoWeekday() - 1) + 7) - 1;
+				break;
+			case 'day':
+			case 'date':
+				time = startOfDate(this.year(), this.month(), this.date() + 1) - 1;
+				break;
+			case 'hour':
+				time = this._d.valueOf();
+				time += MS_PER_HOUR - mod$1(time + (this._isUTC ? 0 : this.utcOffset() * MS_PER_MINUTE), MS_PER_HOUR) - 1;
+				break;
+			case 'minute':
+				time = this._d.valueOf();
+				time += MS_PER_MINUTE - mod$1(time, MS_PER_MINUTE) - 1;
+				break;
+			case 'second':
+				time = this._d.valueOf();
+				time += MS_PER_SECOND - mod$1(time, MS_PER_SECOND) - 1;
+				break;
+		}
+
+		this._d.setTime(time);
+		hooks.updateOffset(this, true);
+		return this;
+	}
+
+	function valueOf() {
+		return this._d.valueOf() - ((this._offset || 0) * 60000);
+	}
+
+	function unix() {
+		return Math.floor(this.valueOf() / 1000);
+	}
+
+	function toDate() {
+		return new Date(this.valueOf());
+	}
+
+	function toArray() {
+		var m = this;
+		return [m.year(), m.month(), m.date(), m.hour(), m.minute(), m.second(), m.millisecond()];
+	}
+
+	function toObject() {
+		var m = this;
+		return {
+			years: m.year(),
+			months: m.month(),
+			date: m.date(),
+			hours: m.hours(),
+			minutes: m.minutes(),
+			seconds: m.seconds(),
+			milliseconds: m.milliseconds()
+		};
+	}
+
+	function toJSON() {
+		// new Date(NaN).toJSON() === null
+		return this.isValid() ? this.toISOString() : null;
+	}
+
+	function isValid$2() {
+		return isValid(this);
+	}
+
+	function parsingFlags() {
+		return extend({}, getParsingFlags(this));
+	}
+
+	function invalidAt() {
+		return getParsingFlags(this).overflow;
+	}
+
+	function creationData() {
+		return {
+			input: this._i,
+			format: this._f,
+			locale: this._locale,
+			isUTC: this._isUTC,
+			strict: this._strict
+		};
+	}
+
+	// FORMATTING
+
+	addFormatToken(0, ['gg', 2], 0, function () {
+		return this.weekYear() % 100;
+	});
+
+	addFormatToken(0, ['GG', 2], 0, function () {
+		return this.isoWeekYear() % 100;
+	});
+
+	function addWeekYearFormatToken(token, getter) {
+		addFormatToken(0, [token, token.length], 0, getter);
+	}
+
+	addWeekYearFormatToken('gggg', 'weekYear');
+	addWeekYearFormatToken('ggggg', 'weekYear');
+	addWeekYearFormatToken('GGGG', 'isoWeekYear');
+	addWeekYearFormatToken('GGGGG', 'isoWeekYear');
+
+	// ALIASES
+
+	addUnitAlias('weekYear', 'gg');
+	addUnitAlias('isoWeekYear', 'GG');
+
+	// PRIORITY
+
+	addUnitPriority('weekYear', 1);
+	addUnitPriority('isoWeekYear', 1);
+
+
+	// PARSING
+
+	addRegexToken('G', matchSigned);
+	addRegexToken('g', matchSigned);
+	addRegexToken('GG', match1to2, match2);
+	addRegexToken('gg', match1to2, match2);
+	addRegexToken('GGGG', match1to4, match4);
+	addRegexToken('gggg', match1to4, match4);
+	addRegexToken('GGGGG', match1to6, match6);
+	addRegexToken('ggggg', match1to6, match6);
+
+	addWeekParseToken(['gggg', 'ggggg', 'GGGG', 'GGGGG'], function (input, week, config, token) {
+		week[token.substr(0, 2)] = toInt(input);
+	});
+
+	addWeekParseToken(['gg', 'GG'], function (input, week, config, token) {
+		week[token] = hooks.parseTwoDigitYear(input);
+	});
+
+	// MOMENTS
 
-    function getSetWeekYear (input) {
-        return getSetWeekYearHelper.call(this,
-                input,
-                this.week(),
-                this.weekday(),
-                this.localeData()._week.dow,
-                this.localeData()._week.doy);
-    }
+	function getSetWeekYear(input) {
+		return getSetWeekYearHelper.call(this,
+			input,
+			this.week(),
+			this.weekday(),
+			this.localeData()._week.dow,
+			this.localeData()._week.doy);
+	}
 
-    function getSetISOWeekYear (input) {
-        return getSetWeekYearHelper.call(this,
-                input, this.isoWeek(), this.isoWeekday(), 1, 4);
-    }
+	function getSetISOWeekYear(input) {
+		return getSetWeekYearHelper.call(this,
+			input, this.isoWeek(), this.isoWeekday(), 1, 4);
+	}
 
-    function getISOWeeksInYear () {
-        return weeksInYear(this.year(), 1, 4);
-    }
+	function getISOWeeksInYear() {
+		return weeksInYear(this.year(), 1, 4);
+	}
 
-    function getWeeksInYear () {
-        var weekInfo = this.localeData()._week;
-        return weeksInYear(this.year(), weekInfo.dow, weekInfo.doy);
-    }
+	function getWeeksInYear() {
+		var weekInfo = this.localeData()._week;
+		return weeksInYear(this.year(), weekInfo.dow, weekInfo.doy);
+	}
 
-    function getSetWeekYearHelper(input, week, weekday, dow, doy) {
-        var weeksTarget;
-        if (input == null) {
-            return weekOfYear(this, dow, doy).year;
-        } else {
-            weeksTarget = weeksInYear(input, dow, doy);
-            if (week > weeksTarget) {
-                week = weeksTarget;
-            }
-            return setWeekAll.call(this, input, week, weekday, dow, doy);
-        }
-    }
+	function getSetWeekYearHelper(input, week, weekday, dow, doy) {
+		var weeksTarget;
+		if (input == null) {
+			return weekOfYear(this, dow, doy).year;
+		} else {
+			weeksTarget = weeksInYear(input, dow, doy);
+			if (week > weeksTarget) {
+				week = weeksTarget;
+			}
+			return setWeekAll.call(this, input, week, weekday, dow, doy);
+		}
+	}
 
-    function setWeekAll(weekYear, week, weekday, dow, doy) {
-        var dayOfYearData = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy),
-            date = createUTCDate(dayOfYearData.year, 0, dayOfYearData.dayOfYear);
+	function setWeekAll(weekYear, week, weekday, dow, doy) {
+		var dayOfYearData = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy),
+			date = createUTCDate(dayOfYearData.year, 0, dayOfYearData.dayOfYear);
 
-        this.year(date.getUTCFullYear());
-        this.month(date.getUTCMonth());
-        this.date(date.getUTCDate());
-        return this;
-    }
+		this.year(date.getUTCFullYear());
+		this.month(date.getUTCMonth());
+		this.date(date.getUTCDate());
+		return this;
+	}
 
-    // FORMATTING
+	// FORMATTING
 
-    addFormatToken('Q', 0, 'Qo', 'quarter');
+	addFormatToken('Q', 0, 'Qo', 'quarter');
 
-    // ALIASES
+	// ALIASES
 
-    addUnitAlias('quarter', 'Q');
+	addUnitAlias('quarter', 'Q');
 
-    // PRIORITY
+	// PRIORITY
 
-    addUnitPriority('quarter', 7);
+	addUnitPriority('quarter', 7);
 
-    // PARSING
+	// PARSING
 
-    addRegexToken('Q', match1);
-    addParseToken('Q', function (input, array) {
-        array[MONTH] = (toInt(input) - 1) * 3;
-    });
+	addRegexToken('Q', match1);
+	addParseToken('Q', function (input, array) {
+		array[MONTH] = (toInt(input) - 1) * 3;
+	});
 
-    // MOMENTS
+	// MOMENTS
 
-    function getSetQuarter (input) {
-        return input == null ? Math.ceil((this.month() + 1) / 3) : this.month((input - 1) * 3 + this.month() % 3);
-    }
+	function getSetQuarter(input) {
+		return input == null ? Math.ceil((this.month() + 1) / 3) : this.month((input - 1) * 3 + this.month() % 3);
+	}
 
-    // FORMATTING
+	// FORMATTING
 
-    addFormatToken('D', ['DD', 2], 'Do', 'date');
+	addFormatToken('D', ['DD', 2], 'Do', 'date');
 
-    // ALIASES
+	// ALIASES
 
-    addUnitAlias('date', 'D');
+	addUnitAlias('date', 'D');
 
-    // PRIORITY
-    addUnitPriority('date', 9);
+	// PRIORITY
+	addUnitPriority('date', 9);
 
-    // PARSING
+	// PARSING
 
-    addRegexToken('D',  match1to2);
-    addRegexToken('DD', match1to2, match2);
-    addRegexToken('Do', function (isStrict, locale) {
-        // TODO: Remove "ordinalParse" fallback in next major release.
-        return isStrict ?
-          (locale._dayOfMonthOrdinalParse || locale._ordinalParse) :
-          locale._dayOfMonthOrdinalParseLenient;
-    });
+	addRegexToken('D', match1to2);
+	addRegexToken('DD', match1to2, match2);
+	addRegexToken('Do', function (isStrict, locale) {
+		// TODO: Remove "ordinalParse" fallback in next major release.
+		return isStrict ?
+			(locale._dayOfMonthOrdinalParse || locale._ordinalParse) :
+			locale._dayOfMonthOrdinalParseLenient;
+	});
 
-    addParseToken(['D', 'DD'], DATE);
-    addParseToken('Do', function (input, array) {
-        array[DATE] = toInt(input.match(match1to2)[0]);
-    });
+	addParseToken(['D', 'DD'], DATE);
+	addParseToken('Do', function (input, array) {
+		array[DATE] = toInt(input.match(match1to2)[0]);
+	});
 
-    // MOMENTS
+	// MOMENTS
 
-    var getSetDayOfMonth = makeGetSet('Date', true);
+	var getSetDayOfMonth = makeGetSet('Date', true);
 
-    // FORMATTING
+	// FORMATTING
 
-    addFormatToken('DDD', ['DDDD', 3], 'DDDo', 'dayOfYear');
+	addFormatToken('DDD', ['DDDD', 3], 'DDDo', 'dayOfYear');
 
-    // ALIASES
+	// ALIASES
 
-    addUnitAlias('dayOfYear', 'DDD');
+	addUnitAlias('dayOfYear', 'DDD');
 
-    // PRIORITY
-    addUnitPriority('dayOfYear', 4);
+	// PRIORITY
+	addUnitPriority('dayOfYear', 4);
 
-    // PARSING
+	// PARSING
 
-    addRegexToken('DDD',  match1to3);
-    addRegexToken('DDDD', match3);
-    addParseToken(['DDD', 'DDDD'], function (input, array, config) {
-        config._dayOfYear = toInt(input);
-    });
+	addRegexToken('DDD', match1to3);
+	addRegexToken('DDDD', match3);
+	addParseToken(['DDD', 'DDDD'], function (input, array, config) {
+		config._dayOfYear = toInt(input);
+	});
 
-    // HELPERS
+	// HELPERS
 
-    // MOMENTS
+	// MOMENTS
 
-    function getSetDayOfYear (input) {
-        var dayOfYear = Math.round((this.clone().startOf('day') - this.clone().startOf('year')) / 864e5) + 1;
-        return input == null ? dayOfYear : this.add((input - dayOfYear), 'd');
-    }
+	function getSetDayOfYear(input) {
+		var dayOfYear = Math.round((this.clone().startOf('day') - this.clone().startOf('year')) / 864e5) + 1;
+		return input == null ? dayOfYear : this.add((input - dayOfYear), 'd');
+	}
 
-    // FORMATTING
+	// FORMATTING
 
-    addFormatToken('m', ['mm', 2], 0, 'minute');
+	addFormatToken('m', ['mm', 2], 0, 'minute');
 
-    // ALIASES
+	// ALIASES
 
-    addUnitAlias('minute', 'm');
+	addUnitAlias('minute', 'm');
 
-    // PRIORITY
+	// PRIORITY
 
-    addUnitPriority('minute', 14);
+	addUnitPriority('minute', 14);
 
-    // PARSING
+	// PARSING
 
-    addRegexToken('m',  match1to2);
-    addRegexToken('mm', match1to2, match2);
-    addParseToken(['m', 'mm'], MINUTE);
+	addRegexToken('m', match1to2);
+	addRegexToken('mm', match1to2, match2);
+	addParseToken(['m', 'mm'], MINUTE);
 
-    // MOMENTS
+	// MOMENTS
 
-    var getSetMinute = makeGetSet('Minutes', false);
+	var getSetMinute = makeGetSet('Minutes', false);
 
-    // FORMATTING
+	// FORMATTING
 
-    addFormatToken('s', ['ss', 2], 0, 'second');
+	addFormatToken('s', ['ss', 2], 0, 'second');
 
-    // ALIASES
+	// ALIASES
 
-    addUnitAlias('second', 's');
+	addUnitAlias('second', 's');
 
-    // PRIORITY
+	// PRIORITY
 
-    addUnitPriority('second', 15);
+	addUnitPriority('second', 15);
 
-    // PARSING
+	// PARSING
 
-    addRegexToken('s',  match1to2);
-    addRegexToken('ss', match1to2, match2);
-    addParseToken(['s', 'ss'], SECOND);
+	addRegexToken('s', match1to2);
+	addRegexToken('ss', match1to2, match2);
+	addParseToken(['s', 'ss'], SECOND);
 
-    // MOMENTS
+	// MOMENTS
 
-    var getSetSecond = makeGetSet('Seconds', false);
+	var getSetSecond = makeGetSet('Seconds', false);
 
-    // FORMATTING
+	// FORMATTING
 
-    addFormatToken('S', 0, 0, function () {
-        return ~~(this.millisecond() / 100);
-    });
+	addFormatToken('S', 0, 0, function () {
+		return ~~(this.millisecond() / 100);
+	});
 
-    addFormatToken(0, ['SS', 2], 0, function () {
-        return ~~(this.millisecond() / 10);
-    });
+	addFormatToken(0, ['SS', 2], 0, function () {
+		return ~~(this.millisecond() / 10);
+	});
 
-    addFormatToken(0, ['SSS', 3], 0, 'millisecond');
-    addFormatToken(0, ['SSSS', 4], 0, function () {
-        return this.millisecond() * 10;
-    });
-    addFormatToken(0, ['SSSSS', 5], 0, function () {
-        return this.millisecond() * 100;
-    });
-    addFormatToken(0, ['SSSSSS', 6], 0, function () {
-        return this.millisecond() * 1000;
-    });
-    addFormatToken(0, ['SSSSSSS', 7], 0, function () {
-        return this.millisecond() * 10000;
-    });
-    addFormatToken(0, ['SSSSSSSS', 8], 0, function () {
-        return this.millisecond() * 100000;
-    });
-    addFormatToken(0, ['SSSSSSSSS', 9], 0, function () {
-        return this.millisecond() * 1000000;
-    });
+	addFormatToken(0, ['SSS', 3], 0, 'millisecond');
+	addFormatToken(0, ['SSSS', 4], 0, function () {
+		return this.millisecond() * 10;
+	});
+	addFormatToken(0, ['SSSSS', 5], 0, function () {
+		return this.millisecond() * 100;
+	});
+	addFormatToken(0, ['SSSSSS', 6], 0, function () {
+		return this.millisecond() * 1000;
+	});
+	addFormatToken(0, ['SSSSSSS', 7], 0, function () {
+		return this.millisecond() * 10000;
+	});
+	addFormatToken(0, ['SSSSSSSS', 8], 0, function () {
+		return this.millisecond() * 100000;
+	});
+	addFormatToken(0, ['SSSSSSSSS', 9], 0, function () {
+		return this.millisecond() * 1000000;
+	});
 
 
-    // ALIASES
-
-    addUnitAlias('millisecond', 'ms');
-
-    // PRIORITY
-
-    addUnitPriority('millisecond', 16);
-
-    // PARSING
-
-    addRegexToken('S',    match1to3, match1);
-    addRegexToken('SS',   match1to3, match2);
-    addRegexToken('SSS',  match1to3, match3);
-
-    var token;
-    for (token = 'SSSS'; token.length <= 9; token += 'S') {
-        addRegexToken(token, matchUnsigned);
-    }
-
-    function parseMs(input, array) {
-        array[MILLISECOND] = toInt(('0.' + input) * 1000);
-    }
-
-    for (token = 'S'; token.length <= 9; token += 'S') {
-        addParseToken(token, parseMs);
-    }
-    // MOMENTS
-
-    var getSetMillisecond = makeGetSet('Milliseconds', false);
-
-    // FORMATTING
-
-    addFormatToken('z',  0, 0, 'zoneAbbr');
-    addFormatToken('zz', 0, 0, 'zoneName');
-
-    // MOMENTS
-
-    function getZoneAbbr () {
-        return this._isUTC ? 'UTC' : '';
-    }
-
-    function getZoneName () {
-        return this._isUTC ? 'Coordinated Universal Time' : '';
-    }
-
-    var proto = Moment.prototype;
-
-    proto.add               = add;
-    proto.calendar          = calendar$1;
-    proto.clone             = clone;
-    proto.diff              = diff;
-    proto.endOf             = endOf;
-    proto.format            = format;
-    proto.from              = from;
-    proto.fromNow           = fromNow;
-    proto.to                = to;
-    proto.toNow             = toNow;
-    proto.get               = stringGet;
-    proto.invalidAt         = invalidAt;
-    proto.isAfter           = isAfter;
-    proto.isBefore          = isBefore;
-    proto.isBetween         = isBetween;
-    proto.isSame            = isSame;
-    proto.isSameOrAfter     = isSameOrAfter;
-    proto.isSameOrBefore    = isSameOrBefore;
-    proto.isValid           = isValid$2;
-    proto.lang              = lang;
-    proto.locale            = locale;
-    proto.localeData        = localeData;
-    proto.max               = prototypeMax;
-    proto.min               = prototypeMin;
-    proto.parsingFlags      = parsingFlags;
-    proto.set               = stringSet;
-    proto.startOf           = startOf;
-    proto.subtract          = subtract;
-    proto.toArray           = toArray;
-    proto.toObject          = toObject;
-    proto.toDate            = toDate;
-    proto.toISOString       = toISOString;
-    proto.inspect           = inspect;
-    proto.toJSON            = toJSON;
-    proto.toString          = toString;
-    proto.unix              = unix;
-    proto.valueOf           = valueOf;
-    proto.creationData      = creationData;
-    proto.year       = getSetYear;
-    proto.isLeapYear = getIsLeapYear;
-    proto.weekYear    = getSetWeekYear;
-    proto.isoWeekYear = getSetISOWeekYear;
-    proto.quarter = proto.quarters = getSetQuarter;
-    proto.month       = getSetMonth;
-    proto.daysInMonth = getDaysInMonth;
-    proto.week           = proto.weeks        = getSetWeek;
-    proto.isoWeek        = proto.isoWeeks     = getSetISOWeek;
-    proto.weeksInYear    = getWeeksInYear;
-    proto.isoWeeksInYear = getISOWeeksInYear;
-    proto.date       = getSetDayOfMonth;
-    proto.day        = proto.days             = getSetDayOfWeek;
-    proto.weekday    = getSetLocaleDayOfWeek;
-    proto.isoWeekday = getSetISODayOfWeek;
-    proto.dayOfYear  = getSetDayOfYear;
-    proto.hour = proto.hours = getSetHour;
-    proto.minute = proto.minutes = getSetMinute;
-    proto.second = proto.seconds = getSetSecond;
-    proto.millisecond = proto.milliseconds = getSetMillisecond;
-    proto.utcOffset            = getSetOffset;
-    proto.utc                  = setOffsetToUTC;
-    proto.local                = setOffsetToLocal;
-    proto.parseZone            = setOffsetToParsedOffset;
-    proto.hasAlignedHourOffset = hasAlignedHourOffset;
-    proto.isDST                = isDaylightSavingTime;
-    proto.isLocal              = isLocal;
-    proto.isUtcOffset          = isUtcOffset;
-    proto.isUtc                = isUtc;
-    proto.isUTC                = isUtc;
-    proto.zoneAbbr = getZoneAbbr;
-    proto.zoneName = getZoneName;
-    proto.dates  = deprecate('dates accessor is deprecated. Use date instead.', getSetDayOfMonth);
-    proto.months = deprecate('months accessor is deprecated. Use month instead', getSetMonth);
-    proto.years  = deprecate('years accessor is deprecated. Use year instead', getSetYear);
-    proto.zone   = deprecate('moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/', getSetZone);
-    proto.isDSTShifted = deprecate('isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information', isDaylightSavingTimeShifted);
-
-    function createUnix (input) {
-        return createLocal(input * 1000);
-    }
-
-    function createInZone () {
-        return createLocal.apply(null, arguments).parseZone();
-    }
-
-    function preParsePostFormat (string) {
-        return string;
-    }
-
-    var proto$1 = Locale.prototype;
-
-    proto$1.calendar        = calendar;
-    proto$1.longDateFormat  = longDateFormat;
-    proto$1.invalidDate     = invalidDate;
-    proto$1.ordinal         = ordinal;
-    proto$1.preparse        = preParsePostFormat;
-    proto$1.postformat      = preParsePostFormat;
-    proto$1.relativeTime    = relativeTime;
-    proto$1.pastFuture      = pastFuture;
-    proto$1.set             = set;
-
-    proto$1.months            =        localeMonths;
-    proto$1.monthsShort       =        localeMonthsShort;
-    proto$1.monthsParse       =        localeMonthsParse;
-    proto$1.monthsRegex       = monthsRegex;
-    proto$1.monthsShortRegex  = monthsShortRegex;
-    proto$1.week = localeWeek;
-    proto$1.firstDayOfYear = localeFirstDayOfYear;
-    proto$1.firstDayOfWeek = localeFirstDayOfWeek;
-
-    proto$1.weekdays       =        localeWeekdays;
-    proto$1.weekdaysMin    =        localeWeekdaysMin;
-    proto$1.weekdaysShort  =        localeWeekdaysShort;
-    proto$1.weekdaysParse  =        localeWeekdaysParse;
-
-    proto$1.weekdaysRegex       =        weekdaysRegex;
-    proto$1.weekdaysShortRegex  =        weekdaysShortRegex;
-    proto$1.weekdaysMinRegex    =        weekdaysMinRegex;
-
-    proto$1.isPM = localeIsPM;
-    proto$1.meridiem = localeMeridiem;
-
-    function get$1 (format, index, field, setter) {
-        var locale = getLocale();
-        var utc = createUTC().set(setter, index);
-        return locale[field](utc, format);
-    }
-
-    function listMonthsImpl (format, index, field) {
-        if (isNumber(format)) {
-            index = format;
-            format = undefined;
-        }
-
-        format = format || '';
-
-        if (index != null) {
-            return get$1(format, index, field, 'month');
-        }
-
-        var i;
-        var out = [];
-        for (i = 0; i < 12; i++) {
-            out[i] = get$1(format, i, field, 'month');
-        }
-        return out;
-    }
-
-    // ()
-    // (5)
-    // (fmt, 5)
-    // (fmt)
-    // (true)
-    // (true, 5)
-    // (true, fmt, 5)
-    // (true, fmt)
-    function listWeekdaysImpl (localeSorted, format, index, field) {
-        if (typeof localeSorted === 'boolean') {
-            if (isNumber(format)) {
-                index = format;
-                format = undefined;
-            }
-
-            format = format || '';
-        } else {
-            format = localeSorted;
-            index = format;
-            localeSorted = false;
-
-            if (isNumber(format)) {
-                index = format;
-                format = undefined;
-            }
-
-            format = format || '';
-        }
-
-        var locale = getLocale(),
-            shift = localeSorted ? locale._week.dow : 0;
-
-        if (index != null) {
-            return get$1(format, (index + shift) % 7, field, 'day');
-        }
-
-        var i;
-        var out = [];
-        for (i = 0; i < 7; i++) {
-            out[i] = get$1(format, (i + shift) % 7, field, 'day');
-        }
-        return out;
-    }
-
-    function listMonths (format, index) {
-        return listMonthsImpl(format, index, 'months');
-    }
-
-    function listMonthsShort (format, index) {
-        return listMonthsImpl(format, index, 'monthsShort');
-    }
-
-    function listWeekdays (localeSorted, format, index) {
-        return listWeekdaysImpl(localeSorted, format, index, 'weekdays');
-    }
-
-    function listWeekdaysShort (localeSorted, format, index) {
-        return listWeekdaysImpl(localeSorted, format, index, 'weekdaysShort');
-    }
-
-    function listWeekdaysMin (localeSorted, format, index) {
-        return listWeekdaysImpl(localeSorted, format, index, 'weekdaysMin');
-    }
-
-    getSetGlobalLocale('en', {
-        dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/,
-        ordinal : function (number) {
-            var b = number % 10,
-                output = (toInt(number % 100 / 10) === 1) ? 'th' :
-                (b === 1) ? 'st' :
-                (b === 2) ? 'nd' :
-                (b === 3) ? 'rd' : 'th';
-            return number + output;
-        }
-    });
-
-    // Side effect imports
-
-    hooks.lang = deprecate('moment.lang is deprecated. Use moment.locale instead.', getSetGlobalLocale);
-    hooks.langData = deprecate('moment.langData is deprecated. Use moment.localeData instead.', getLocale);
-
-    var mathAbs = Math.abs;
-
-    function abs () {
-        var data           = this._data;
-
-        this._milliseconds = mathAbs(this._milliseconds);
-        this._days         = mathAbs(this._days);
-        this._months       = mathAbs(this._months);
-
-        data.milliseconds  = mathAbs(data.milliseconds);
-        data.seconds       = mathAbs(data.seconds);
-        data.minutes       = mathAbs(data.minutes);
-        data.hours         = mathAbs(data.hours);
-        data.months        = mathAbs(data.months);
-        data.years         = mathAbs(data.years);
-
-        return this;
-    }
-
-    function addSubtract$1 (duration, input, value, direction) {
-        var other = createDuration(input, value);
-
-        duration._milliseconds += direction * other._milliseconds;
-        duration._days         += direction * other._days;
-        duration._months       += direction * other._months;
-
-        return duration._bubble();
-    }
-
-    // supports only 2.0-style add(1, 's') or add(duration)
-    function add$1 (input, value) {
-        return addSubtract$1(this, input, value, 1);
-    }
-
-    // supports only 2.0-style subtract(1, 's') or subtract(duration)
-    function subtract$1 (input, value) {
-        return addSubtract$1(this, input, value, -1);
-    }
-
-    function absCeil (number) {
-        if (number < 0) {
-            return Math.floor(number);
-        } else {
-            return Math.ceil(number);
-        }
-    }
-
-    function bubble () {
-        var milliseconds = this._milliseconds;
-        var days         = this._days;
-        var months       = this._months;
-        var data         = this._data;
-        var seconds, minutes, hours, years, monthsFromDays;
-
-        // if we have a mix of positive and negative values, bubble down first
-        // check: https://github.com/moment/moment/issues/2166
-        if (!((milliseconds >= 0 && days >= 0 && months >= 0) ||
-                (milliseconds <= 0 && days <= 0 && months <= 0))) {
-            milliseconds += absCeil(monthsToDays(months) + days) * 864e5;
-            days = 0;
-            months = 0;
-        }
-
-        // The following code bubbles up values, see the tests for
-        // examples of what that means.
-        data.milliseconds = milliseconds % 1000;
-
-        seconds           = absFloor(milliseconds / 1000);
-        data.seconds      = seconds % 60;
-
-        minutes           = absFloor(seconds / 60);
-        data.minutes      = minutes % 60;
-
-        hours             = absFloor(minutes / 60);
-        data.hours        = hours % 24;
-
-        days += absFloor(hours / 24);
-
-        // convert days to months
-        monthsFromDays = absFloor(daysToMonths(days));
-        months += monthsFromDays;
-        days -= absCeil(monthsToDays(monthsFromDays));
-
-        // 12 months -> 1 year
-        years = absFloor(months / 12);
-        months %= 12;
-
-        data.days   = days;
-        data.months = months;
-        data.years  = years;
-
-        return this;
-    }
-
-    function daysToMonths (days) {
-        // 400 years have 146097 days (taking into account leap year rules)
-        // 400 years have 12 months === 4800
-        return days * 4800 / 146097;
-    }
-
-    function monthsToDays (months) {
-        // the reverse of daysToMonths
-        return months * 146097 / 4800;
-    }
-
-    function as (units) {
-        if (!this.isValid()) {
-            return NaN;
-        }
-        var days;
-        var months;
-        var milliseconds = this._milliseconds;
-
-        units = normalizeUnits(units);
-
-        if (units === 'month' || units === 'quarter' || units === 'year') {
-            days = this._days + milliseconds / 864e5;
-            months = this._months + daysToMonths(days);
-            switch (units) {
-                case 'month':   return months;
-                case 'quarter': return months / 3;
-                case 'year':    return months / 12;
-            }
-        } else {
-            // handle milliseconds separately because of floating point math errors (issue #1867)
-            days = this._days + Math.round(monthsToDays(this._months));
-            switch (units) {
-                case 'week'   : return days / 7     + milliseconds / 6048e5;
-                case 'day'    : return days         + milliseconds / 864e5;
-                case 'hour'   : return days * 24    + milliseconds / 36e5;
-                case 'minute' : return days * 1440  + milliseconds / 6e4;
-                case 'second' : return days * 86400 + milliseconds / 1000;
-                // Math.floor prevents floating point math errors here
-                case 'millisecond': return Math.floor(days * 864e5) + milliseconds;
-                default: throw new Error('Unknown unit ' + units);
-            }
-        }
-    }
-
-    // TODO: Use this.as('ms')?
-    function valueOf$1 () {
-        if (!this.isValid()) {
-            return NaN;
-        }
-        return (
-            this._milliseconds +
-            this._days * 864e5 +
-            (this._months % 12) * 2592e6 +
-            toInt(this._months / 12) * 31536e6
-        );
-    }
-
-    function makeAs (alias) {
-        return function () {
-            return this.as(alias);
-        };
-    }
-
-    var asMilliseconds = makeAs('ms');
-    var asSeconds      = makeAs('s');
-    var asMinutes      = makeAs('m');
-    var asHours        = makeAs('h');
-    var asDays         = makeAs('d');
-    var asWeeks        = makeAs('w');
-    var asMonths       = makeAs('M');
-    var asQuarters     = makeAs('Q');
-    var asYears        = makeAs('y');
-
-    function clone$1 () {
-        return createDuration(this);
-    }
-
-    function get$2 (units) {
-        units = normalizeUnits(units);
-        return this.isValid() ? this[units + 's']() : NaN;
-    }
-
-    function makeGetter(name) {
-        return function () {
-            return this.isValid() ? this._data[name] : NaN;
-        };
-    }
-
-    var milliseconds = makeGetter('milliseconds');
-    var seconds      = makeGetter('seconds');
-    var minutes      = makeGetter('minutes');
-    var hours        = makeGetter('hours');
-    var days         = makeGetter('days');
-    var months       = makeGetter('months');
-    var years        = makeGetter('years');
-
-    function weeks () {
-        return absFloor(this.days() / 7);
-    }
-
-    var round = Math.round;
-    var thresholds = {
-        ss: 44,         // a few seconds to seconds
-        s : 45,         // seconds to minute
-        m : 45,         // minutes to hour
-        h : 22,         // hours to day
-        d : 26,         // days to month
-        M : 11          // months to year
-    };
-
-    // helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize
-    function substituteTimeAgo(string, number, withoutSuffix, isFuture, locale) {
-        return locale.relativeTime(number || 1, !!withoutSuffix, string, isFuture);
-    }
-
-    function relativeTime$1 (posNegDuration, withoutSuffix, locale) {
-        var duration = createDuration(posNegDuration).abs();
-        var seconds  = round(duration.as('s'));
-        var minutes  = round(duration.as('m'));
-        var hours    = round(duration.as('h'));
-        var days     = round(duration.as('d'));
-        var months   = round(duration.as('M'));
-        var years    = round(duration.as('y'));
-
-        var a = seconds <= thresholds.ss && ['s', seconds]  ||
-                seconds < thresholds.s   && ['ss', seconds] ||
-                minutes <= 1             && ['m']           ||
-                minutes < thresholds.m   && ['mm', minutes] ||
-                hours   <= 1             && ['h']           ||
-                hours   < thresholds.h   && ['hh', hours]   ||
-                days    <= 1             && ['d']           ||
-                days    < thresholds.d   && ['dd', days]    ||
-                months  <= 1             && ['M']           ||
-                months  < thresholds.M   && ['MM', months]  ||
-                years   <= 1             && ['y']           || ['yy', years];
-
-        a[2] = withoutSuffix;
-        a[3] = +posNegDuration > 0;
-        a[4] = locale;
-        return substituteTimeAgo.apply(null, a);
-    }
-
-    // This function allows you to set the rounding function for relative time strings
-    function getSetRelativeTimeRounding (roundingFunction) {
-        if (roundingFunction === undefined) {
-            return round;
-        }
-        if (typeof(roundingFunction) === 'function') {
-            round = roundingFunction;
-            return true;
-        }
-        return false;
-    }
-
-    // This function allows you to set a threshold for relative time strings
-    function getSetRelativeTimeThreshold (threshold, limit) {
-        if (thresholds[threshold] === undefined) {
-            return false;
-        }
-        if (limit === undefined) {
-            return thresholds[threshold];
-        }
-        thresholds[threshold] = limit;
-        if (threshold === 's') {
-            thresholds.ss = limit - 1;
-        }
-        return true;
-    }
-
-    function humanize (withSuffix) {
-        if (!this.isValid()) {
-            return this.localeData().invalidDate();
-        }
-
-        var locale = this.localeData();
-        var output = relativeTime$1(this, !withSuffix, locale);
-
-        if (withSuffix) {
-            output = locale.pastFuture(+this, output);
-        }
-
-        return locale.postformat(output);
-    }
-
-    var abs$1 = Math.abs;
-
-    function sign(x) {
-        return ((x > 0) - (x < 0)) || +x;
-    }
-
-    function toISOString$1() {
-        // for ISO strings we do not use the normal bubbling rules:
-        //  * milliseconds bubble up until they become hours
-        //  * days do not bubble at all
-        //  * months bubble up until they become years
-        // This is because there is no context-free conversion between hours and days
-        // (think of clock changes)
-        // and also not between days and months (28-31 days per month)
-        if (!this.isValid()) {
-            return this.localeData().invalidDate();
-        }
-
-        var seconds = abs$1(this._milliseconds) / 1000;
-        var days         = abs$1(this._days);
-        var months       = abs$1(this._months);
-        var minutes, hours, years;
-
-        // 3600 seconds -> 60 minutes -> 1 hour
-        minutes           = absFloor(seconds / 60);
-        hours             = absFloor(minutes / 60);
-        seconds %= 60;
-        minutes %= 60;
-
-        // 12 months -> 1 year
-        years  = absFloor(months / 12);
-        months %= 12;
-
-
-        // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js
-        var Y = years;
-        var M = months;
-        var D = days;
-        var h = hours;
-        var m = minutes;
-        var s = seconds ? seconds.toFixed(3).replace(/\.?0+$/, '') : '';
-        var total = this.asSeconds();
-
-        if (!total) {
-            // this is the same as C#'s (Noda) and python (isodate)...
-            // but not other JS (goog.date)
-            return 'P0D';
-        }
-
-        var totalSign = total < 0 ? '-' : '';
-        var ymSign = sign(this._months) !== sign(total) ? '-' : '';
-        var daysSign = sign(this._days) !== sign(total) ? '-' : '';
-        var hmsSign = sign(this._milliseconds) !== sign(total) ? '-' : '';
-
-        return totalSign + 'P' +
-            (Y ? ymSign + Y + 'Y' : '') +
-            (M ? ymSign + M + 'M' : '') +
-            (D ? daysSign + D + 'D' : '') +
-            ((h || m || s) ? 'T' : '') +
-            (h ? hmsSign + h + 'H' : '') +
-            (m ? hmsSign + m + 'M' : '') +
-            (s ? hmsSign + s + 'S' : '');
-    }
-
-    var proto$2 = Duration.prototype;
-
-    proto$2.isValid        = isValid$1;
-    proto$2.abs            = abs;
-    proto$2.add            = add$1;
-    proto$2.subtract       = subtract$1;
-    proto$2.as             = as;
-    proto$2.asMilliseconds = asMilliseconds;
-    proto$2.asSeconds      = asSeconds;
-    proto$2.asMinutes      = asMinutes;
-    proto$2.asHours        = asHours;
-    proto$2.asDays         = asDays;
-    proto$2.asWeeks        = asWeeks;
-    proto$2.asMonths       = asMonths;
-    proto$2.asQuarters     = asQuarters;
-    proto$2.asYears        = asYears;
-    proto$2.valueOf        = valueOf$1;
-    proto$2._bubble        = bubble;
-    proto$2.clone          = clone$1;
-    proto$2.get            = get$2;
-    proto$2.milliseconds   = milliseconds;
-    proto$2.seconds        = seconds;
-    proto$2.minutes        = minutes;
-    proto$2.hours          = hours;
-    proto$2.days           = days;
-    proto$2.weeks          = weeks;
-    proto$2.months         = months;
-    proto$2.years          = years;
-    proto$2.humanize       = humanize;
-    proto$2.toISOString    = toISOString$1;
-    proto$2.toString       = toISOString$1;
-    proto$2.toJSON         = toISOString$1;
-    proto$2.locale         = locale;
-    proto$2.localeData     = localeData;
-
-    proto$2.toIsoString = deprecate('toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)', toISOString$1);
-    proto$2.lang = lang;
-
-    // Side effect imports
-
-    // FORMATTING
-
-    addFormatToken('X', 0, 0, 'unix');
-    addFormatToken('x', 0, 0, 'valueOf');
-
-    // PARSING
-
-    addRegexToken('x', matchSigned);
-    addRegexToken('X', matchTimestamp);
-    addParseToken('X', function (input, array, config) {
-        config._d = new Date(parseFloat(input, 10) * 1000);
-    });
-    addParseToken('x', function (input, array, config) {
-        config._d = new Date(toInt(input));
-    });
-
-    // Side effect imports
-
-
-    hooks.version = '2.24.0';
-
-    setHookCallback(createLocal);
-
-    hooks.fn                    = proto;
-    hooks.min                   = min;
-    hooks.max                   = max;
-    hooks.now                   = now;
-    hooks.utc                   = createUTC;
-    hooks.unix                  = createUnix;
-    hooks.months                = listMonths;
-    hooks.isDate                = isDate;
-    hooks.locale                = getSetGlobalLocale;
-    hooks.invalid               = createInvalid;
-    hooks.duration              = createDuration;
-    hooks.isMoment              = isMoment;
-    hooks.weekdays              = listWeekdays;
-    hooks.parseZone             = createInZone;
-    hooks.localeData            = getLocale;
-    hooks.isDuration            = isDuration;
-    hooks.monthsShort           = listMonthsShort;
-    hooks.weekdaysMin           = listWeekdaysMin;
-    hooks.defineLocale          = defineLocale;
-    hooks.updateLocale          = updateLocale;
-    hooks.locales               = listLocales;
-    hooks.weekdaysShort         = listWeekdaysShort;
-    hooks.normalizeUnits        = normalizeUnits;
-    hooks.relativeTimeRounding  = getSetRelativeTimeRounding;
-    hooks.relativeTimeThreshold = getSetRelativeTimeThreshold;
-    hooks.calendarFormat        = getCalendarFormat;
-    hooks.prototype             = proto;
-
-    // currently HTML5 input type only supports 24-hour formats
-    hooks.HTML5_FMT = {
-        DATETIME_LOCAL: 'YYYY-MM-DDTHH:mm',             // <input type="datetime-local" />
-        DATETIME_LOCAL_SECONDS: 'YYYY-MM-DDTHH:mm:ss',  // <input type="datetime-local" step="1" />
-        DATETIME_LOCAL_MS: 'YYYY-MM-DDTHH:mm:ss.SSS',   // <input type="datetime-local" step="0.001" />
-        DATE: 'YYYY-MM-DD',                             // <input type="date" />
-        TIME: 'HH:mm',                                  // <input type="time" />
-        TIME_SECONDS: 'HH:mm:ss',                       // <input type="time" step="1" />
-        TIME_MS: 'HH:mm:ss.SSS',                        // <input type="time" step="0.001" />
-        WEEK: 'GGGG-[W]WW',                             // <input type="week" />
-        MONTH: 'YYYY-MM'                                // <input type="month" />
-    };
-
-    return hooks;
+	// ALIASES
+
+	addUnitAlias('millisecond', 'ms');
+
+	// PRIORITY
+
+	addUnitPriority('millisecond', 16);
+
+	// PARSING
+
+	addRegexToken('S', match1to3, match1);
+	addRegexToken('SS', match1to3, match2);
+	addRegexToken('SSS', match1to3, match3);
+
+	var token;
+	for (token = 'SSSS'; token.length <= 9; token += 'S') {
+		addRegexToken(token, matchUnsigned);
+	}
+
+	function parseMs(input, array) {
+		array[MILLISECOND] = toInt(('0.' + input) * 1000);
+	}
+
+	for (token = 'S'; token.length <= 9; token += 'S') {
+		addParseToken(token, parseMs);
+	}
+	// MOMENTS
+
+	var getSetMillisecond = makeGetSet('Milliseconds', false);
+
+	// FORMATTING
+
+	addFormatToken('z', 0, 0, 'zoneAbbr');
+	addFormatToken('zz', 0, 0, 'zoneName');
+
+	// MOMENTS
+
+	function getZoneAbbr() {
+		return this._isUTC ? 'UTC' : '';
+	}
+
+	function getZoneName() {
+		return this._isUTC ? 'Coordinated Universal Time' : '';
+	}
+
+	var proto = Moment.prototype;
+
+	proto.add = add;
+	proto.calendar = calendar$1;
+	proto.clone = clone;
+	proto.diff = diff;
+	proto.endOf = endOf;
+	proto.format = format;
+	proto.from = from;
+	proto.fromNow = fromNow;
+	proto.to = to;
+	proto.toNow = toNow;
+	proto.get = stringGet;
+	proto.invalidAt = invalidAt;
+	proto.isAfter = isAfter;
+	proto.isBefore = isBefore;
+	proto.isBetween = isBetween;
+	proto.isSame = isSame;
+	proto.isSameOrAfter = isSameOrAfter;
+	proto.isSameOrBefore = isSameOrBefore;
+	proto.isValid = isValid$2;
+	proto.lang = lang;
+	proto.locale = locale;
+	proto.localeData = localeData;
+	proto.max = prototypeMax;
+	proto.min = prototypeMin;
+	proto.parsingFlags = parsingFlags;
+	proto.set = stringSet;
+	proto.startOf = startOf;
+	proto.subtract = subtract;
+	proto.toArray = toArray;
+	proto.toObject = toObject;
+	proto.toDate = toDate;
+	proto.toISOString = toISOString;
+	proto.inspect = inspect;
+	proto.toJSON = toJSON;
+	proto.toString = toString;
+	proto.unix = unix;
+	proto.valueOf = valueOf;
+	proto.creationData = creationData;
+	proto.year = getSetYear;
+	proto.isLeapYear = getIsLeapYear;
+	proto.weekYear = getSetWeekYear;
+	proto.isoWeekYear = getSetISOWeekYear;
+	proto.quarter = proto.quarters = getSetQuarter;
+	proto.month = getSetMonth;
+	proto.daysInMonth = getDaysInMonth;
+	proto.week = proto.weeks = getSetWeek;
+	proto.isoWeek = proto.isoWeeks = getSetISOWeek;
+	proto.weeksInYear = getWeeksInYear;
+	proto.isoWeeksInYear = getISOWeeksInYear;
+	proto.date = getSetDayOfMonth;
+	proto.day = proto.days = getSetDayOfWeek;
+	proto.weekday = getSetLocaleDayOfWeek;
+	proto.isoWeekday = getSetISODayOfWeek;
+	proto.dayOfYear = getSetDayOfYear;
+	proto.hour = proto.hours = getSetHour;
+	proto.minute = proto.minutes = getSetMinute;
+	proto.second = proto.seconds = getSetSecond;
+	proto.millisecond = proto.milliseconds = getSetMillisecond;
+	proto.utcOffset = getSetOffset;
+	proto.utc = setOffsetToUTC;
+	proto.local = setOffsetToLocal;
+	proto.parseZone = setOffsetToParsedOffset;
+	proto.hasAlignedHourOffset = hasAlignedHourOffset;
+	proto.isDST = isDaylightSavingTime;
+	proto.isLocal = isLocal;
+	proto.isUtcOffset = isUtcOffset;
+	proto.isUtc = isUtc;
+	proto.isUTC = isUtc;
+	proto.zoneAbbr = getZoneAbbr;
+	proto.zoneName = getZoneName;
+	proto.dates = deprecate('dates accessor is deprecated. Use date instead.', getSetDayOfMonth);
+	proto.months = deprecate('months accessor is deprecated. Use month instead', getSetMonth);
+	proto.years = deprecate('years accessor is deprecated. Use year instead', getSetYear);
+	proto.zone = deprecate('moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/', getSetZone);
+	proto.isDSTShifted = deprecate('isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information', isDaylightSavingTimeShifted);
+
+	function createUnix(input) {
+		return createLocal(input * 1000);
+	}
+
+	function createInZone() {
+		return createLocal.apply(null, arguments).parseZone();
+	}
+
+	function preParsePostFormat(string) {
+		return string;
+	}
+
+	var proto$1 = Locale.prototype;
+
+	proto$1.calendar = calendar;
+	proto$1.longDateFormat = longDateFormat;
+	proto$1.invalidDate = invalidDate;
+	proto$1.ordinal = ordinal;
+	proto$1.preparse = preParsePostFormat;
+	proto$1.postformat = preParsePostFormat;
+	proto$1.relativeTime = relativeTime;
+	proto$1.pastFuture = pastFuture;
+	proto$1.set = set;
+
+	proto$1.months = localeMonths;
+	proto$1.monthsShort = localeMonthsShort;
+	proto$1.monthsParse = localeMonthsParse;
+	proto$1.monthsRegex = monthsRegex;
+	proto$1.monthsShortRegex = monthsShortRegex;
+	proto$1.week = localeWeek;
+	proto$1.firstDayOfYear = localeFirstDayOfYear;
+	proto$1.firstDayOfWeek = localeFirstDayOfWeek;
+
+	proto$1.weekdays = localeWeekdays;
+	proto$1.weekdaysMin = localeWeekdaysMin;
+	proto$1.weekdaysShort = localeWeekdaysShort;
+	proto$1.weekdaysParse = localeWeekdaysParse;
+
+	proto$1.weekdaysRegex = weekdaysRegex;
+	proto$1.weekdaysShortRegex = weekdaysShortRegex;
+	proto$1.weekdaysMinRegex = weekdaysMinRegex;
+
+	proto$1.isPM = localeIsPM;
+	proto$1.meridiem = localeMeridiem;
+
+	function get$1(format, index, field, setter) {
+		var locale = getLocale();
+		var utc = createUTC().set(setter, index);
+		return locale[field](utc, format);
+	}
+
+	function listMonthsImpl(format, index, field) {
+		if (isNumber(format)) {
+			index = format;
+			format = undefined;
+		}
+
+		format = format || '';
+
+		if (index != null) {
+			return get$1(format, index, field, 'month');
+		}
+
+		var i;
+		var out = [];
+		for (i = 0; i < 12; i++) {
+			out[i] = get$1(format, i, field, 'month');
+		}
+		return out;
+	}
+
+	// ()
+	// (5)
+	// (fmt, 5)
+	// (fmt)
+	// (true)
+	// (true, 5)
+	// (true, fmt, 5)
+	// (true, fmt)
+	function listWeekdaysImpl(localeSorted, format, index, field) {
+		if (typeof localeSorted === 'boolean') {
+			if (isNumber(format)) {
+				index = format;
+				format = undefined;
+			}
+
+			format = format || '';
+		} else {
+			format = localeSorted;
+			index = format;
+			localeSorted = false;
+
+			if (isNumber(format)) {
+				index = format;
+				format = undefined;
+			}
+
+			format = format || '';
+		}
+
+		var locale = getLocale(),
+			shift = localeSorted ? locale._week.dow : 0;
+
+		if (index != null) {
+			return get$1(format, (index + shift) % 7, field, 'day');
+		}
+
+		var i;
+		var out = [];
+		for (i = 0; i < 7; i++) {
+			out[i] = get$1(format, (i + shift) % 7, field, 'day');
+		}
+		return out;
+	}
+
+	function listMonths(format, index) {
+		return listMonthsImpl(format, index, 'months');
+	}
+
+	function listMonthsShort(format, index) {
+		return listMonthsImpl(format, index, 'monthsShort');
+	}
+
+	function listWeekdays(localeSorted, format, index) {
+		return listWeekdaysImpl(localeSorted, format, index, 'weekdays');
+	}
+
+	function listWeekdaysShort(localeSorted, format, index) {
+		return listWeekdaysImpl(localeSorted, format, index, 'weekdaysShort');
+	}
+
+	function listWeekdaysMin(localeSorted, format, index) {
+		return listWeekdaysImpl(localeSorted, format, index, 'weekdaysMin');
+	}
+
+	getSetGlobalLocale('en', {
+		dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/,
+		ordinal: function (number) {
+			var b = number % 10,
+				output = (toInt(number % 100 / 10) === 1) ? 'th' :
+					(b === 1) ? 'st' :
+						(b === 2) ? 'nd' :
+							(b === 3) ? 'rd' : 'th';
+			return number + output;
+		}
+	});
+
+	// Side effect imports
+
+	hooks.lang = deprecate('moment.lang is deprecated. Use moment.locale instead.', getSetGlobalLocale);
+	hooks.langData = deprecate('moment.langData is deprecated. Use moment.localeData instead.', getLocale);
+
+	var mathAbs = Math.abs;
+
+	function abs() {
+		var data = this._data;
+
+		this._milliseconds = mathAbs(this._milliseconds);
+		this._days = mathAbs(this._days);
+		this._months = mathAbs(this._months);
+
+		data.milliseconds = mathAbs(data.milliseconds);
+		data.seconds = mathAbs(data.seconds);
+		data.minutes = mathAbs(data.minutes);
+		data.hours = mathAbs(data.hours);
+		data.months = mathAbs(data.months);
+		data.years = mathAbs(data.years);
+
+		return this;
+	}
+
+	function addSubtract$1(duration, input, value, direction) {
+		var other = createDuration(input, value);
+
+		duration._milliseconds += direction * other._milliseconds;
+		duration._days += direction * other._days;
+		duration._months += direction * other._months;
+
+		return duration._bubble();
+	}
+
+	// supports only 2.0-style add(1, 's') or add(duration)
+	function add$1(input, value) {
+		return addSubtract$1(this, input, value, 1);
+	}
+
+	// supports only 2.0-style subtract(1, 's') or subtract(duration)
+	function subtract$1(input, value) {
+		return addSubtract$1(this, input, value, -1);
+	}
+
+	function absCeil(number) {
+		if (number < 0) {
+			return Math.floor(number);
+		} else {
+			return Math.ceil(number);
+		}
+	}
+
+	function bubble() {
+		var milliseconds = this._milliseconds;
+		var days = this._days;
+		var months = this._months;
+		var data = this._data;
+		var seconds, minutes, hours, years, monthsFromDays;
+
+		// if we have a mix of positive and negative values, bubble down first
+		// check: https://github.com/moment/moment/issues/2166
+		if (!((milliseconds >= 0 && days >= 0 && months >= 0) ||
+			(milliseconds <= 0 && days <= 0 && months <= 0))) {
+			milliseconds += absCeil(monthsToDays(months) + days) * 864e5;
+			days = 0;
+			months = 0;
+		}
+
+		// The following code bubbles up values, see the tests for
+		// examples of what that means.
+		data.milliseconds = milliseconds % 1000;
+
+		seconds = absFloor(milliseconds / 1000);
+		data.seconds = seconds % 60;
+
+		minutes = absFloor(seconds / 60);
+		data.minutes = minutes % 60;
+
+		hours = absFloor(minutes / 60);
+		data.hours = hours % 24;
+
+		days += absFloor(hours / 24);
+
+		// convert days to months
+		monthsFromDays = absFloor(daysToMonths(days));
+		months += monthsFromDays;
+		days -= absCeil(monthsToDays(monthsFromDays));
+
+		// 12 months -> 1 year
+		years = absFloor(months / 12);
+		months %= 12;
+
+		data.days = days;
+		data.months = months;
+		data.years = years;
+
+		return this;
+	}
+
+	function daysToMonths(days) {
+		// 400 years have 146097 days (taking into account leap year rules)
+		// 400 years have 12 months === 4800
+		return days * 4800 / 146097;
+	}
+
+	function monthsToDays(months) {
+		// the reverse of daysToMonths
+		return months * 146097 / 4800;
+	}
+
+	function as(units) {
+		if (!this.isValid()) {
+			return NaN;
+		}
+		var days;
+		var months;
+		var milliseconds = this._milliseconds;
+
+		units = normalizeUnits(units);
+
+		if (units === 'month' || units === 'quarter' || units === 'year') {
+			days = this._days + milliseconds / 864e5;
+			months = this._months + daysToMonths(days);
+			switch (units) {
+				case 'month':
+					return months;
+				case 'quarter':
+					return months / 3;
+				case 'year':
+					return months / 12;
+			}
+		} else {
+			// handle milliseconds separately because of floating point math errors (issue #1867)
+			days = this._days + Math.round(monthsToDays(this._months));
+			switch (units) {
+				case 'week'   :
+					return days / 7 + milliseconds / 6048e5;
+				case 'day'    :
+					return days + milliseconds / 864e5;
+				case 'hour'   :
+					return days * 24 + milliseconds / 36e5;
+				case 'minute' :
+					return days * 1440 + milliseconds / 6e4;
+				case 'second' :
+					return days * 86400 + milliseconds / 1000;
+				// Math.floor prevents floating point math errors here
+				case 'millisecond':
+					return Math.floor(days * 864e5) + milliseconds;
+				default:
+					throw new Error('Unknown unit ' + units);
+			}
+		}
+	}
+
+	// TODO: Use this.as('ms')?
+	function valueOf$1() {
+		if (!this.isValid()) {
+			return NaN;
+		}
+		return (
+			this._milliseconds +
+			this._days * 864e5 +
+			(this._months % 12) * 2592e6 +
+			toInt(this._months / 12) * 31536e6
+		);
+	}
+
+	function makeAs(alias) {
+		return function () {
+			return this.as(alias);
+		};
+	}
+
+	var asMilliseconds = makeAs('ms');
+	var asSeconds = makeAs('s');
+	var asMinutes = makeAs('m');
+	var asHours = makeAs('h');
+	var asDays = makeAs('d');
+	var asWeeks = makeAs('w');
+	var asMonths = makeAs('M');
+	var asQuarters = makeAs('Q');
+	var asYears = makeAs('y');
+
+	function clone$1() {
+		return createDuration(this);
+	}
+
+	function get$2(units) {
+		units = normalizeUnits(units);
+		return this.isValid() ? this[units + 's']() : NaN;
+	}
+
+	function makeGetter(name) {
+		return function () {
+			return this.isValid() ? this._data[name] : NaN;
+		};
+	}
+
+	var milliseconds = makeGetter('milliseconds');
+	var seconds = makeGetter('seconds');
+	var minutes = makeGetter('minutes');
+	var hours = makeGetter('hours');
+	var days = makeGetter('days');
+	var months = makeGetter('months');
+	var years = makeGetter('years');
+
+	function weeks() {
+		return absFloor(this.days() / 7);
+	}
+
+	var round = Math.round;
+	var thresholds = {
+		ss: 44,         // a few seconds to seconds
+		s: 45,         // seconds to minute
+		m: 45,         // minutes to hour
+		h: 22,         // hours to day
+		d: 26,         // days to month
+		M: 11          // months to year
+	};
+
+	// helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize
+	function substituteTimeAgo(string, number, withoutSuffix, isFuture, locale) {
+		return locale.relativeTime(number || 1, !!withoutSuffix, string, isFuture);
+	}
+
+	function relativeTime$1(posNegDuration, withoutSuffix, locale) {
+		var duration = createDuration(posNegDuration).abs();
+		var seconds = round(duration.as('s'));
+		var minutes = round(duration.as('m'));
+		var hours = round(duration.as('h'));
+		var days = round(duration.as('d'));
+		var months = round(duration.as('M'));
+		var years = round(duration.as('y'));
+
+		var a = seconds <= thresholds.ss && ['s', seconds] ||
+			seconds < thresholds.s && ['ss', seconds] ||
+			minutes <= 1 && ['m'] ||
+			minutes < thresholds.m && ['mm', minutes] ||
+			hours <= 1 && ['h'] ||
+			hours < thresholds.h && ['hh', hours] ||
+			days <= 1 && ['d'] ||
+			days < thresholds.d && ['dd', days] ||
+			months <= 1 && ['M'] ||
+			months < thresholds.M && ['MM', months] ||
+			years <= 1 && ['y'] || ['yy', years];
+
+		a[2] = withoutSuffix;
+		a[3] = +posNegDuration > 0;
+		a[4] = locale;
+		return substituteTimeAgo.apply(null, a);
+	}
+
+	// This function allows you to set the rounding function for relative time strings
+	function getSetRelativeTimeRounding(roundingFunction) {
+		if (roundingFunction === undefined) {
+			return round;
+		}
+		if (typeof (roundingFunction) === 'function') {
+			round = roundingFunction;
+			return true;
+		}
+		return false;
+	}
+
+	// This function allows you to set a threshold for relative time strings
+	function getSetRelativeTimeThreshold(threshold, limit) {
+		if (thresholds[threshold] === undefined) {
+			return false;
+		}
+		if (limit === undefined) {
+			return thresholds[threshold];
+		}
+		thresholds[threshold] = limit;
+		if (threshold === 's') {
+			thresholds.ss = limit - 1;
+		}
+		return true;
+	}
+
+	function humanize(withSuffix) {
+		if (!this.isValid()) {
+			return this.localeData().invalidDate();
+		}
+
+		var locale = this.localeData();
+		var output = relativeTime$1(this, !withSuffix, locale);
+
+		if (withSuffix) {
+			output = locale.pastFuture(+this, output);
+		}
+
+		return locale.postformat(output);
+	}
+
+	var abs$1 = Math.abs;
+
+	function sign(x) {
+		return ((x > 0) - (x < 0)) || +x;
+	}
+
+	function toISOString$1() {
+		// for ISO strings we do not use the normal bubbling rules:
+		//  * milliseconds bubble up until they become hours
+		//  * days do not bubble at all
+		//  * months bubble up until they become years
+		// This is because there is no context-free conversion between hours and days
+		// (think of clock changes)
+		// and also not between days and months (28-31 days per month)
+		if (!this.isValid()) {
+			return this.localeData().invalidDate();
+		}
+
+		var seconds = abs$1(this._milliseconds) / 1000;
+		var days = abs$1(this._days);
+		var months = abs$1(this._months);
+		var minutes, hours, years;
+
+		// 3600 seconds -> 60 minutes -> 1 hour
+		minutes = absFloor(seconds / 60);
+		hours = absFloor(minutes / 60);
+		seconds %= 60;
+		minutes %= 60;
+
+		// 12 months -> 1 year
+		years = absFloor(months / 12);
+		months %= 12;
+
+
+		// inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js
+		var Y = years;
+		var M = months;
+		var D = days;
+		var h = hours;
+		var m = minutes;
+		var s = seconds ? seconds.toFixed(3).replace(/\.?0+$/, '') : '';
+		var total = this.asSeconds();
+
+		if (!total) {
+			// this is the same as C#'s (Noda) and python (isodate)...
+			// but not other JS (goog.date)
+			return 'P0D';
+		}
+
+		var totalSign = total < 0 ? '-' : '';
+		var ymSign = sign(this._months) !== sign(total) ? '-' : '';
+		var daysSign = sign(this._days) !== sign(total) ? '-' : '';
+		var hmsSign = sign(this._milliseconds) !== sign(total) ? '-' : '';
+
+		return totalSign + 'P' +
+			(Y ? ymSign + Y + 'Y' : '') +
+			(M ? ymSign + M + 'M' : '') +
+			(D ? daysSign + D + 'D' : '') +
+			((h || m || s) ? 'T' : '') +
+			(h ? hmsSign + h + 'H' : '') +
+			(m ? hmsSign + m + 'M' : '') +
+			(s ? hmsSign + s + 'S' : '');
+	}
+
+	var proto$2 = Duration.prototype;
+
+	proto$2.isValid = isValid$1;
+	proto$2.abs = abs;
+	proto$2.add = add$1;
+	proto$2.subtract = subtract$1;
+	proto$2.as = as;
+	proto$2.asMilliseconds = asMilliseconds;
+	proto$2.asSeconds = asSeconds;
+	proto$2.asMinutes = asMinutes;
+	proto$2.asHours = asHours;
+	proto$2.asDays = asDays;
+	proto$2.asWeeks = asWeeks;
+	proto$2.asMonths = asMonths;
+	proto$2.asQuarters = asQuarters;
+	proto$2.asYears = asYears;
+	proto$2.valueOf = valueOf$1;
+	proto$2._bubble = bubble;
+	proto$2.clone = clone$1;
+	proto$2.get = get$2;
+	proto$2.milliseconds = milliseconds;
+	proto$2.seconds = seconds;
+	proto$2.minutes = minutes;
+	proto$2.hours = hours;
+	proto$2.days = days;
+	proto$2.weeks = weeks;
+	proto$2.months = months;
+	proto$2.years = years;
+	proto$2.humanize = humanize;
+	proto$2.toISOString = toISOString$1;
+	proto$2.toString = toISOString$1;
+	proto$2.toJSON = toISOString$1;
+	proto$2.locale = locale;
+	proto$2.localeData = localeData;
+
+	proto$2.toIsoString = deprecate('toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)', toISOString$1);
+	proto$2.lang = lang;
+
+	// Side effect imports
+
+	// FORMATTING
+
+	addFormatToken('X', 0, 0, 'unix');
+	addFormatToken('x', 0, 0, 'valueOf');
+
+	// PARSING
+
+	addRegexToken('x', matchSigned);
+	addRegexToken('X', matchTimestamp);
+	addParseToken('X', function (input, array, config) {
+		config._d = new Date(parseFloat(input, 10) * 1000);
+	});
+	addParseToken('x', function (input, array, config) {
+		config._d = new Date(toInt(input));
+	});
+
+	// Side effect imports
+
+
+	hooks.version = '2.24.0';
+
+	setHookCallback(createLocal);
+
+	hooks.fn = proto;
+	hooks.min = min;
+	hooks.max = max;
+	hooks.now = now;
+	hooks.utc = createUTC;
+	hooks.unix = createUnix;
+	hooks.months = listMonths;
+	hooks.isDate = isDate;
+	hooks.locale = getSetGlobalLocale;
+	hooks.invalid = createInvalid;
+	hooks.duration = createDuration;
+	hooks.isMoment = isMoment;
+	hooks.weekdays = listWeekdays;
+	hooks.parseZone = createInZone;
+	hooks.localeData = getLocale;
+	hooks.isDuration = isDuration;
+	hooks.monthsShort = listMonthsShort;
+	hooks.weekdaysMin = listWeekdaysMin;
+	hooks.defineLocale = defineLocale;
+	hooks.updateLocale = updateLocale;
+	hooks.locales = listLocales;
+	hooks.weekdaysShort = listWeekdaysShort;
+	hooks.normalizeUnits = normalizeUnits;
+	hooks.relativeTimeRounding = getSetRelativeTimeRounding;
+	hooks.relativeTimeThreshold = getSetRelativeTimeThreshold;
+	hooks.calendarFormat = getCalendarFormat;
+	hooks.prototype = proto;
+
+	// currently HTML5 input type only supports 24-hour formats
+	hooks.HTML5_FMT = {
+		DATETIME_LOCAL: 'YYYY-MM-DDTHH:mm',             // <input type="datetime-local" />
+		DATETIME_LOCAL_SECONDS: 'YYYY-MM-DDTHH:mm:ss',  // <input type="datetime-local" step="1" />
+		DATETIME_LOCAL_MS: 'YYYY-MM-DDTHH:mm:ss.SSS',   // <input type="datetime-local" step="0.001" />
+		DATE: 'YYYY-MM-DD',                             // <input type="date" />
+		TIME: 'HH:mm',                                  // <input type="time" />
+		TIME_SECONDS: 'HH:mm:ss',                       // <input type="time" step="1" />
+		TIME_MS: 'HH:mm:ss.SSS',                        // <input type="time" step="0.001" />
+		WEEK: 'GGGG-[W]WW',                             // <input type="week" />
+		MONTH: 'YYYY-MM'                                // <input type="month" />
+	};
+
+	return hooks;
 
 })));
diff --git a/len-sys/src/main/resources/plugin/tools/tool.js b/len-sys/src/main/resources/plugin/tools/tool.js
index 0debad3..8889092 100644
--- a/len-sys/src/main/resources/plugin/tools/tool.js
+++ b/len-sys/src/main/resources/plugin/tools/tool.js
@@ -2,432 +2,432 @@
 
 var Len = {
 
-    /**
-     * 添加
-     * @param url 必填
-     * @param title
-     * @param id
-     */
-    add: function (url, title, id) {
-        var w = $(window).width() * 0.7,
-            h = $(window).width() * 0.4;
-        this.popup(url, this.isEmpty(title) ? '添加' : title, w, h, id)
-    },
+	/**
+	 * 添加
+	 * @param url 必填
+	 * @param title
+	 * @param id
+	 */
+	add: function (url, title, id) {
+		var w = $(window).width() * 0.7,
+			h = $(window).width() * 0.4;
+		this.popup(url, this.isEmpty(title) ? '添加' : title, w, h, id)
+	},
 
-    /**
-     * 更新
-     * @param url 必填
-     * @param title
-     * @param id
-     */
-    update: function (url, title, id) {
-        this.popup(url, this.isEmpty(title) ? '修改' : title, 700, 450, id)
-    },
+	/**
+	 * 更新
+	 * @param url 必填
+	 * @param title
+	 * @param id
+	 */
+	update: function (url, title, id) {
+		this.popup(url, this.isEmpty(title) ? '修改' : title, 700, 450, id)
+	},
 
-    /**
-     * 详情
-     * @param url 必填
-     * @param title
-     * @param id
-     */
-    detail: function (url, title, id) {
-        this.popup(url + '&detail=true', this.isEmpty(title) ? '详情' : title, 700, 450, id)
-    },
+	/**
+	 * 详情
+	 * @param url 必填
+	 * @param title
+	 * @param id
+	 */
+	detail: function (url, title, id) {
+		this.popup(url + '&detail=true', this.isEmpty(title) ? '详情' : title, 700, 450, id)
+	},
 
-    /**
-     * 根据id删除
-     * @param url 必填
-     * @param id 必填
-     * @param callback 必填
-     * @param tableId 刷新界面的tableid
-     * @param name
-     */
-    delete: function (url, id, callback, tableId, name) {
-        var extendTitle = Len.isEmpty(name) ? '' : '[<label style="color: #00AA91;">' + name + '</label>]';
-        layer.confirm('确定删除' + extendTitle + '?', function () {
-            if (Len.isFunction(callback)) {
-                Len.ajaxPost(url, {id: id}, callback);
-            } else {
-                Len.ajaxPost(url, {id: id}, function (res) {
-                    Len.rbSuccess("删除成功");
-                    if (!Len.isEmpty(tableId)) {
-                        layui.table.reload(tableId);
-                    }
-                });
-            }
-        });
-    },
+	/**
+	 * 根据id删除
+	 * @param url 必填
+	 * @param id 必填
+	 * @param callback 必填
+	 * @param tableId 刷新界面的tableid
+	 * @param name
+	 */
+	delete: function (url, id, callback, tableId, name) {
+		var extendTitle = Len.isEmpty(name) ? '' : '[<label style="color: #00AA91;">' + name + '</label>]';
+		layer.confirm('确定删除' + extendTitle + '?', function () {
+			if (Len.isFunction(callback)) {
+				Len.ajaxPost(url, {id: id}, callback);
+			} else {
+				Len.ajaxPost(url, {id: id}, function (res) {
+					Len.rbSuccess("删除成功");
+					if (!Len.isEmpty(tableId)) {
+						layui.table.reload(tableId);
+					}
+				});
+			}
+		});
+	},
 
-    /**
-     * 中心弹框 成功提示
-     * @param msg
-     * @param isTop 顶层弹框
-     */
-    success: function (msg, isTop) {
-        if (isTop) {
-            window.top.layer.msg(msg, {icon: 6});
-        } else {
-            layer.msg(msg, {icon: 6});
-        }
-    },
+	/**
+	 * 中心弹框 成功提示
+	 * @param msg
+	 * @param isTop 顶层弹框
+	 */
+	success: function (msg, isTop) {
+		if (isTop) {
+			window.top.layer.msg(msg, {icon: 6});
+		} else {
+			layer.msg(msg, {icon: 6});
+		}
+	},
 
-    /**
-     * 中心弹框 错误提示
-     * @param msg
-     * @param isTop 顶层弹框
-     */
-    error: function (msg, isTop) {
-        if (isTop) {
-            window.top.layer.msg(msg, {icon: 5});
-        } else {
-            layer.msg(msg, {icon: 5});
-        }
-    },
+	/**
+	 * 中心弹框 错误提示
+	 * @param msg
+	 * @param isTop 顶层弹框
+	 */
+	error: function (msg, isTop) {
+		if (isTop) {
+			window.top.layer.msg(msg, {icon: 5});
+		} else {
+			layer.msg(msg, {icon: 5});
+		}
+	},
 
-    /**
-     * 中心弹框 警告提示
-     * @param msg
-     * @param isTop 顶层弹框
-     */
-    warn: function (msg, isTop) {
-        if (isTop) {
-            window.top.layer.msg(msg, {icon: 4});
-        } else {
-            layer.msg(msg, {icon: 4});
-        }
-    },
+	/**
+	 * 中心弹框 警告提示
+	 * @param msg
+	 * @param isTop 顶层弹框
+	 */
+	warn: function (msg, isTop) {
+		if (isTop) {
+			window.top.layer.msg(msg, {icon: 4});
+		} else {
+			layer.msg(msg, {icon: 4});
+		}
+	},
 
-    /**
-     * 右下角弹框 成功提示
-     * @param msg
-     * @param isTop 顶层弹框
-     */
-    rbSuccess: function (msg, isTop) {
-        if (isTop) {
-            window.top.layer.msg(msg, {icon: 6, offset: 'rb', area: ['120px', '80px'], anim: 2});
-        } else {
-            layer.msg(msg, {icon: 6, offset: 'rb', area: ['120px', '80px'], anim: 2});
-        }
-    },
+	/**
+	 * 右下角弹框 成功提示
+	 * @param msg
+	 * @param isTop 顶层弹框
+	 */
+	rbSuccess: function (msg, isTop) {
+		if (isTop) {
+			window.top.layer.msg(msg, {icon: 6, offset: 'rb', area: ['120px', '80px'], anim: 2});
+		} else {
+			layer.msg(msg, {icon: 6, offset: 'rb', area: ['120px', '80px'], anim: 2});
+		}
+	},
 
-    /**
-     * 右下角错误提示
-     * @param msg
-     * @param isTop 顶层弹框
-     */
-    rbError: function (msg, isTop) {
-        if (isTop) {
-            window.top.layer.msg(msg, {icon: 5, offset: 'rb', area: ['120px', '80px'], anim: 2});
-        } else {
-            layer.msg(msg, {icon: 5, offset: 'rb', area: ['120px', '80px'], anim: 2});
-        }
-    },
+	/**
+	 * 右下角错误提示
+	 * @param msg
+	 * @param isTop 顶层弹框
+	 */
+	rbError: function (msg, isTop) {
+		if (isTop) {
+			window.top.layer.msg(msg, {icon: 5, offset: 'rb', area: ['120px', '80px'], anim: 2});
+		} else {
+			layer.msg(msg, {icon: 5, offset: 'rb', area: ['120px', '80px'], anim: 2});
+		}
+	},
 
-    /**
-     * 右下角异常提示
-     * @param msg
-     * @param isTop 顶层弹框
-     */
-    rbWarn: function (msg, isTop) {
-        if (isTop) {
-            window.top.layer.msg(msg, {icon: 4, offset: 'rb', area: ['120px', '80px'], anim: 2});
-        } else {
-            layer.msg(msg, {icon: 4, offset: 'rb', area: ['120px', '80px'], anim: 2});
-        }
-    },
+	/**
+	 * 右下角异常提示
+	 * @param msg
+	 * @param isTop 顶层弹框
+	 */
+	rbWarn: function (msg, isTop) {
+		if (isTop) {
+			window.top.layer.msg(msg, {icon: 4, offset: 'rb', area: ['120px', '80px'], anim: 2});
+		} else {
+			layer.msg(msg, {icon: 4, offset: 'rb', area: ['120px', '80px'], anim: 2});
+		}
+	},
 
-    /**
-     * 关闭弹框
-     */
-    close: function () {
-        var index = parent.layer.getFrameIndex(window.name);
-        parent.layer.close(index);
-    },
+	/**
+	 * 关闭弹框
+	 */
+	close: function () {
+		var index = parent.layer.getFrameIndex(window.name);
+		parent.layer.close(index);
+	},
 
-    screen: function () {
-        //获取当前窗口的宽度
-        var width = $(window).width();
-        if (width > 1200) {
-            return 3;   //大屏幕
-        } else if (width > 992) {
-            return 2;   //中屏幕
-        } else if (width > 768) {
-            return 1;   //小屏幕
-        } else {
-            return 0;   //超小屏幕
-        }
-    },
+	screen: function () {
+		//获取当前窗口的宽度
+		var width = $(window).width();
+		if (width > 1200) {
+			return 3;   //大屏幕
+		} else if (width > 992) {
+			return 2;   //中屏幕
+		} else if (width > 768) {
+			return 1;   //小屏幕
+		} else {
+			return 0;   //超小屏幕
+		}
+	},
 
-    /**
-     * 通用弹框
-     * @param url 请求url
-     * @param title 弹框标题
-     * @param w 宽
-     * @param h 高
-     * @param id
-     */
-    popup: function (url, title, w, h, id) {
-        title = Len.isEmpty(title) ? false : title;
-        url = Len.isEmpty(url) ? "error/404" : url;
-        window.top.layer.open({
-            id: id,
-            type: 2,
-            area: this.screen() < 2 ? ['90%', '80%'] : ['700px', '450px'],
-            fix: false,
-            maxmin: true,
-            shadeClose: false,
-            shade: 0.4,
-            title: title,
-            content: url
-        });
-    },
+	/**
+	 * 通用弹框
+	 * @param url 请求url
+	 * @param title 弹框标题
+	 * @param w 宽
+	 * @param h 高
+	 * @param id
+	 */
+	popup: function (url, title, w, h, id) {
+		title = Len.isEmpty(title) ? false : title;
+		url = Len.isEmpty(url) ? "error/404" : url;
+		window.top.layer.open({
+			id: id,
+			type: 2,
+			area: this.screen() < 2 ? ['90%', '80%'] : ['700px', '450px'],
+			fix: false,
+			maxmin: true,
+			shadeClose: false,
+			shade: 0.4,
+			title: title,
+			content: url
+		});
+	},
 
-    /**
-     * 更新
-     * @param url 更新url
-     * @param data 数据
-     * @param tableId 要刷新的表格id
-     */
-    layerAjax: function (url, data, tableId) {
-        $.ajax({
-            url: url,
-            type: 'post',
-            data: data,
-            traditional: true,
-            success: function (d) {
-                parent.layer.close(parent.layer.getFrameIndex(window.name));
-                parent.layui.table.reload(tableId);
-                var msg = d.msg;
-                if (Len.isEmpty(d.msg)) {
-                    msg = "成功";
-                }
-                window.top.layer.msg(msg, {icon: 6, offset: 'rb', area: ['200px', '80px'], anim: 2});
-            }, error: function (e) {
-                layer.alert("error", {icon: 6}, function () {
-                    parent.layer.close(parent.layer.getFrameIndex(window.name));
-                });
-            }
-        });
-    },
+	/**
+	 * 更新
+	 * @param url 更新url
+	 * @param data 数据
+	 * @param tableId 要刷新的表格id
+	 */
+	layerAjax: function (url, data, tableId) {
+		$.ajax({
+			url: url,
+			type: 'post',
+			data: data,
+			traditional: true,
+			success: function (d) {
+				parent.layer.close(parent.layer.getFrameIndex(window.name));
+				parent.layui.table.reload(tableId);
+				var msg = d.msg;
+				if (Len.isEmpty(d.msg)) {
+					msg = "成功";
+				}
+				window.top.layer.msg(msg, {icon: 6, offset: 'rb', area: ['200px', '80px'], anim: 2});
+			}, error: function (e) {
+				layer.alert("error", {icon: 6}, function () {
+					parent.layer.close(parent.layer.getFrameIndex(window.name));
+				});
+			}
+		});
+	},
 
-    eleClick: function (active, ele) {
-        $(ele).on('click', function () {
-            var type = $(this).data('type');
-            active[type] ? active[type].call(this) : '';
-        });
-    },
+	eleClick: function (active, ele) {
+		$(ele).on('click', function () {
+			var type = $(this).data('type');
+			active[type] ? active[type].call(this) : '';
+		});
+	},
 
-    /**
-     * 通用post
-     * @param url
-     * @param data
-     * @param callback 回调
-     */
-    ajaxPost: function (url, data, callback) {
-        $.ajax({
-            url: url,
-            type: "post",
-            data: data,
-            success: function (res) {
-                callback(res);
-            }
-        });
-    },
+	/**
+	 * 通用post
+	 * @param url
+	 * @param data
+	 * @param callback 回调
+	 */
+	ajaxPost: function (url, data, callback) {
+		$.ajax({
+			url: url,
+			type: "post",
+			data: data,
+			success: function (res) {
+				callback(res);
+			}
+		});
+	},
 
-    /**
-     * 回车
-     * @param active
-     */
-    keydown: function (active) {
-        document.onkeydown = function (e) {
-            var theEvent = window.event || e;
-            var code = theEvent.keyCode || theEvent.which;
-            if (code === 13) {
-                active.select();
-            }
-        }
-    },
-    /**
-     * 按钮事件绑定
-     * @param _this 绑定对象
-     * @param active
-     */
-    btnBind: function (_this, active) {
-        //$('.len-form-item .layui-btn,.layui-btn-group .layui-btn,.lenos-search .search-zoom div')
-        _this.on('click', function () {
-            var type = $(this).data('type');
-            active[type] ? active[type].call(this) : '';
-        });
-    },
+	/**
+	 * 回车
+	 * @param active
+	 */
+	keydown: function (active) {
+		document.onkeydown = function (e) {
+			var theEvent = window.event || e;
+			var code = theEvent.keyCode || theEvent.which;
+			if (code === 13) {
+				active.select();
+			}
+		}
+	},
+	/**
+	 * 按钮事件绑定
+	 * @param _this 绑定对象
+	 * @param active
+	 */
+	btnBind: function (_this, active) {
+		//$('.len-form-item .layui-btn,.layui-btn-group .layui-btn,.lenos-search .search-zoom div')
+		_this.on('click', function () {
+			var type = $(this).data('type');
+			active[type] ? active[type].call(this) : '';
+		});
+	},
 
-    /**
-     * 表单绑定 回车搜索和按钮事件
-     * @param _this
-     * @param active
-     */
-    formBind: function (_this, active) {
-        Len.keydown(active);
-        Len.btnBind(_this, active);
-    },
+	/**
+	 * 表单绑定 回车搜索和按钮事件
+	 * @param _this
+	 * @param active
+	 */
+	formBind: function (_this, active) {
+		Len.keydown(active);
+		Len.btnBind(_this, active);
+	},
 
-    /**
-     * 空 返回true
-     * @param value 值
-     * @param allowEmptyString 是否允许空字符串
-     * @returns {boolean|arg is Array<any>}
-     */
-    isEmpty: function (value, allowEmptyString) {
-        return (value == null) || (!allowEmptyString ? value === '' : false) || (Len.isArray(value) && value.length === 0);
-    },
-    /**
-     * array类型 返回true
-     */
-    isArray: ('isArray' in Array) ? Array.isArray : function (value) {
-        return toString.call(value) === '[object Array]';
-    },
-    /**
-     * 时间类型 返回true
-     * @param value
-     * @returns {boolean}
-     */
-    isDate: function (value) {
-        return toString.call(value) === '[object Date]';
-    },
-    /**
-     *
-     * @param value
-     * @returns {boolean}
-     */
-    isMSDate: function (value) {
-        if (!Len.isString(value)) {
-            return false;
-        }
-        return /^\\?\/Date\(([-+])?(\d+)(?:[+-]\d{4})?\)\\?\/$/.test(value);
-    },
-    /**
-     * object对象 返回true
-     */
-    isObject: (toString.call(null) === '[object Object]') ? function (value) {
-        // check ownerDocument here as well to exclude DOM nodes
-        return value !== null && value !== undefined && toString.call(value) === '[object Object]' && value.ownerDocument === undefined;
-    } : function (value) {
-        return toString.call(value) === '[object Object]';
-    },
-    /**
-     * js原始值 返回true
-     * @param value
-     * @returns {boolean}
-     */
-    isPrimitive: function (value) {
-        var type = typeof value;
-        return type === 'string' || type === 'number' || type === 'boolean';
-    },
-    /**
-     * js function 返回true
-     */
-    isFunction: // Safari 3.x and 4.x returns 'function' for typeof <NodeList>, hence we need to fall back to using
-    // Object.prototype.toString (slower)
-        (typeof document !== 'undefined' && typeof document.getElementsByTagName('body') === 'function') ? function (value) {
-            return !!value && toString.call(value) === '[object Function]';
-        } : function (value) {
-            return !!value && typeof value === 'function';
-        },
-    /**
-     * 数字 返回true
-     * @param value
-     * @returns {boolean}
-     */
-    isNumber: function (value) {
-        return typeof value === 'number' && isFinite(value);
-    },
-    /**
-     * 数字或数字字符串返回true
-     * @param value
-     * @returns {boolean}
-     */
-    isNumeric: function (value) {
-        return !isNaN(parseFloat(value)) && isFinite(value);
-    },
-    /**
-     * 字符串类型 返回true
-     * @param value
-     * @returns {boolean}
-     */
-    isString: function (value) {
-        return typeof value === 'string';
-    },
-    /**
-     * boolean类型 返回true
-     * @param value
-     * @returns {boolean}
-     */
-    isBoolean: function (value) {
-        return typeof value === 'boolean';
-    },
-    /**
-     * undefined类型 返回true
-     * @param value
-     * @returns {boolean}
-     */
-    isDefined: function (value) {
-        return typeof value !== 'undefined';
-    },
-    /**
-     * 根据id获取dom
-     * @param id
-     * @returns {HTMLElement}
-     */
-    getElementById: function (id) {
-        return document.getElementById(id);
-    },
-    /**
-     * 判断是否为一行
-     * @param length
-     * @returns {boolean}
-     */
-    onlyOne: function (length) {
-        if (length !== 1) {
-            layer.msg('请选择一行编辑,已选[' + length + ']行', {icon: 5});
-            return false;
-        }
-        return true;
-    },
+	/**
+	 * 空 返回true
+	 * @param value 值
+	 * @param allowEmptyString 是否允许空字符串
+	 * @returns {boolean|arg is Array<any>}
+	 */
+	isEmpty: function (value, allowEmptyString) {
+		return (value == null) || (!allowEmptyString ? value === '' : false) || (Len.isArray(value) && value.length === 0);
+	},
+	/**
+	 * array类型 返回true
+	 */
+	isArray: ('isArray' in Array) ? Array.isArray : function (value) {
+		return toString.call(value) === '[object Array]';
+	},
+	/**
+	 * 时间类型 返回true
+	 * @param value
+	 * @returns {boolean}
+	 */
+	isDate: function (value) {
+		return toString.call(value) === '[object Date]';
+	},
+	/**
+	 *
+	 * @param value
+	 * @returns {boolean}
+	 */
+	isMSDate: function (value) {
+		if (!Len.isString(value)) {
+			return false;
+		}
+		return /^\\?\/Date\(([-+])?(\d+)(?:[+-]\d{4})?\)\\?\/$/.test(value);
+	},
+	/**
+	 * object对象 返回true
+	 */
+	isObject: (toString.call(null) === '[object Object]') ? function (value) {
+		// check ownerDocument here as well to exclude DOM nodes
+		return value !== null && value !== undefined && toString.call(value) === '[object Object]' && value.ownerDocument === undefined;
+	} : function (value) {
+		return toString.call(value) === '[object Object]';
+	},
+	/**
+	 * js原始值 返回true
+	 * @param value
+	 * @returns {boolean}
+	 */
+	isPrimitive: function (value) {
+		var type = typeof value;
+		return type === 'string' || type === 'number' || type === 'boolean';
+	},
+	/**
+	 * js function 返回true
+	 */
+	isFunction: // Safari 3.x and 4.x returns 'function' for typeof <NodeList>, hence we need to fall back to using
+	// Object.prototype.toString (slower)
+		(typeof document !== 'undefined' && typeof document.getElementsByTagName('body') === 'function') ? function (value) {
+			return !!value && toString.call(value) === '[object Function]';
+		} : function (value) {
+			return !!value && typeof value === 'function';
+		},
+	/**
+	 * 数字 返回true
+	 * @param value
+	 * @returns {boolean}
+	 */
+	isNumber: function (value) {
+		return typeof value === 'number' && isFinite(value);
+	},
+	/**
+	 * 数字或数字字符串返回true
+	 * @param value
+	 * @returns {boolean}
+	 */
+	isNumeric: function (value) {
+		return !isNaN(parseFloat(value)) && isFinite(value);
+	},
+	/**
+	 * 字符串类型 返回true
+	 * @param value
+	 * @returns {boolean}
+	 */
+	isString: function (value) {
+		return typeof value === 'string';
+	},
+	/**
+	 * boolean类型 返回true
+	 * @param value
+	 * @returns {boolean}
+	 */
+	isBoolean: function (value) {
+		return typeof value === 'boolean';
+	},
+	/**
+	 * undefined类型 返回true
+	 * @param value
+	 * @returns {boolean}
+	 */
+	isDefined: function (value) {
+		return typeof value !== 'undefined';
+	},
+	/**
+	 * 根据id获取dom
+	 * @param id
+	 * @returns {HTMLElement}
+	 */
+	getElementById: function (id) {
+		return document.getElementById(id);
+	},
+	/**
+	 * 判断是否为一行
+	 * @param length
+	 * @returns {boolean}
+	 */
+	onlyOne: function (length) {
+		if (length !== 1) {
+			layer.msg('请选择一行编辑,已选[' + length + ']行', {icon: 5});
+			return false;
+		}
+		return true;
+	},
 
-    init: function () {
-        /**
-         * 全局业务异常捕获 未知异常捕获
-         */
-        /*layui.jquery.ajaxSetup({
-            beforeSend: function (xhr, options) {
-                var originalSuccess = options.success;
-                options.success = function (data, textStatus, jqXhr) {
-                    if (Len.isBoolean(data.flag) && !data.flag) {
-                        Len.error(data.msg);
-                        return false;
-                    }
-                    originalSuccess.apply(this, arguments)
-                };
-            }
-        });*/
-    },
+	init: function () {
+		/**
+		 * 全局业务异常捕获 未知异常捕获
+		 */
+		/*layui.jquery.ajaxSetup({
+			beforeSend: function (xhr, options) {
+				var originalSuccess = options.success;
+				options.success = function (data, textStatus, jqXhr) {
+					if (Len.isBoolean(data.flag) && !data.flag) {
+						Len.error(data.msg);
+						return false;
+					}
+					originalSuccess.apply(this, arguments)
+				};
+			}
+		});*/
+	},
 
-    /**
-     * 根据路由获取菜单
-     * @param router
-     */
-    getMenu: function (router) {
-        var menuArr = Len.menuArr;
-        for (var i = 0; i < menuArr.length; i++) {
-            var childArr = menuArr[i].children;
-            for (var j = 0; j < childArr.length; j++) {
-                if (childArr[j].router === router) {
-                    return childArr[j];
-                }
-            }
-        }
-        return null;
-    }
+	/**
+	 * 根据路由获取菜单
+	 * @param router
+	 */
+	getMenu: function (router) {
+		var menuArr = Len.menuArr;
+		for (var i = 0; i < menuArr.length; i++) {
+			var childArr = menuArr[i].children;
+			for (var j = 0; j < childArr.length; j++) {
+				if (childArr[j].router === router) {
+					return childArr[j];
+				}
+			}
+		}
+		return null;
+	}
 
 };
 
-Len.init();
\ No newline at end of file
+Len.init();
diff --git a/len-sys/src/main/resources/plugin/tools/update-setting.js b/len-sys/src/main/resources/plugin/tools/update-setting.js
index 7772501..259b222 100644
--- a/len-sys/src/main/resources/plugin/tools/update-setting.js
+++ b/len-sys/src/main/resources/plugin/tools/update-setting.js
@@ -1,7 +1,7 @@
 (function ($) {
-    $.fn.disable = function () {
-        return $(this).find("*").each(function () {
-            $(this).attr("disabled", "disabled");
-        });
-    }
-})(jQuery);
\ No newline at end of file
+	$.fn.disable = function () {
+		return $(this).find("*").each(function () {
+			$(this).attr("disabled", "disabled");
+		});
+	}
+})(jQuery);
diff --git a/len-sys/src/main/resources/plugin/x-admin/css/font.css b/len-sys/src/main/resources/plugin/x-admin/css/font.css
index b83e5b4..ab0c062 100644
--- a/len-sys/src/main/resources/plugin/x-admin/css/font.css
+++ b/len-sys/src/main/resources/plugin/x-admin/css/font.css
@@ -1,16 +1,18 @@
 @font-face {
-  font-family: 'iconfont';
-  src: url('../fonts/iconfont.eot');
-  src: url('../fonts/iconfont.eot?#iefix') format('embedded-opentype'),
-  url('../fonts/iconfont.woff') format('woff'),
-  url('../fonts/iconfont.ttf') format('truetype'),
-  url('../fonts/iconfont.svg#iconfont') format('svg');
+	font-family: 'iconfont';
+	src: url('../fonts/iconfont.eot');
+	src: url('../fonts/iconfont.eot?#iefix') format('embedded-opentype'),
+	url('../fonts/iconfont.woff') format('woff'),
+	url('../fonts/iconfont.ttf') format('truetype'),
+	url('../fonts/iconfont.svg#iconfont') format('svg');
 }
-.iconfont{
-  font-family:"iconfont" !important;
-  font-size:16px;font-style:normal;
-  -webkit-font-smoothing: antialiased;
-  -webkit-text-stroke-width: 0.2px;
-  -moz-osx-font-smoothing: grayscale;
+
+.iconfont {
+	font-family: "iconfont" !important;
+	font-size: 16px;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-webkit-text-stroke-width: 0.2px;
+	-moz-osx-font-smoothing: grayscale;
 }
 
diff --git a/len-sys/src/main/resources/plugin/x-admin/css/xadmin.css b/len-sys/src/main/resources/plugin/x-admin/css/xadmin.css
index 393ba06..fa3e588 100644
--- a/len-sys/src/main/resources/plugin/x-admin/css/xadmin.css
+++ b/len-sys/src/main/resources/plugin/x-admin/css/xadmin.css
@@ -1,169 +1,193 @@
 @charset "utf-8";
 /*@import url(./plugin/layui/css/layui.css);*/
-*{
+* {
 	margin: 0px;
 	padding: 0px;
 	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 	font-size: 12px;
 }
-a{
+
+a {
 	text-decoration: none;
 }
-html{
+
+html {
 	width: 100%;
 	height: 100%;
-	overflow-x:hidden; 
-	overflow-y:auto;
+	overflow-x: hidden;
+	overflow-y: auto;
 }
-body{
+
+body {
 	width: 100%;
 	min-height: 100%;
 }
-.login-bg{
+
+.login-bg {
 	/*background: #eeeeee url() 0 0 no-repeat;*/
-	 background:url(../images/bg.png) no-repeat center;
-    background-size: cover;
-    overflow: hidden;
-}
-.login{
-    margin: 120px auto 0 auto;
-    min-height: 420px;
-    max-width: 420px;
-    padding: 40px;
-    background-color: #ffffff;
-    margin-left: auto;
-    margin-right: auto;
-    border-radius: 4px;
-    /* overflow-x: hidden; */
-    box-sizing: border-box;
-}
-.login a.logo{
-    display: block;
-    height: 58px;
-    width: 167px;
-    margin: 0 auto 30px auto;
-    background-size: 167px 42px;
+	background: url(../images/bg.png) no-repeat center;
+	background-size: cover;
+	overflow: hidden;
+}
+
+.login {
+	margin: 120px auto 0 auto;
+	min-height: 420px;
+	max-width: 420px;
+	padding: 40px;
+	background-color: #ffffff;
+	margin-left: auto;
+	margin-right: auto;
+	border-radius: 4px;
+	/* overflow-x: hidden; */
+	box-sizing: border-box;
+}
+
+.login a.logo {
+	display: block;
+	height: 58px;
+	width: 167px;
+	margin: 0 auto 30px auto;
+	background-size: 167px 42px;
 }
+
 .login .message {
-    margin: 10px 0 0 -58px;
-    padding: 18px 10px 18px 60px;
-    background: #189F92;
-    position: relative;
-    color: #fff;
-    font-size: 16px;
+	margin: 10px 0 0 -58px;
+	padding: 18px 10px 18px 60px;
+	background: #189F92;
+	position: relative;
+	color: #fff;
+	font-size: 16px;
 }
+
 .login #darkbannerwrap {
-    background: url(../images/aiwrap.png);
-    width: 18px;
-    height: 10px;
-    margin: 0 0 20px -58px;
-    position: relative;
+	background: url(../images/aiwrap.png);
+	width: 18px;
+	height: 10px;
+	margin: 0 0 20px -58px;
+	position: relative;
 }
 
 .login input[type=text],
 .login input[type=file],
 .login input[type=password],
 .login input[type=email], select {
-    border: 1px solid #DCDEE0;
-    vertical-align: middle;
-    border-radius: 3px;
-    height: 50px;
-    padding: 0px 16px;
-    font-size: 14px;
-    color: #555555;
-    outline:none;
-    width:100%;
-    box-sizing: border-box;
+	border: 1px solid #DCDEE0;
+	vertical-align: middle;
+	border-radius: 3px;
+	height: 50px;
+	padding: 0px 16px;
+	font-size: 14px;
+	color: #555555;
+	outline: none;
+	width: 100%;
+	box-sizing: border-box;
 }
+
 .login input[type=text]:focus,
 .login input[type=file]:focus,
 .login input[type=password]:focus,
 .login input[type=email]:focus, select:focus {
-    border: 1px solid #27A9E3;
+	border: 1px solid #27A9E3;
 }
+
 .login input[type=submit],
-.login input[type=button]{
-    display: inline-block;
-    vertical-align: middle;
-    padding: 12px 24px;
-    margin: 0px;
-    font-size: 18px;
-    line-height: 24px;
-    text-align: center;
-    white-space: nowrap;
-    vertical-align: middle;
-    cursor: pointer;
-    color: #ffffff;
-    background-color: #189F92;
-    border-radius: 3px;
-    border: none;
-    -webkit-appearance: none;
-    outline:none;
-    width:100%;
+.login input[type=button] {
+	display: inline-block;
+	vertical-align: middle;
+	padding: 12px 24px;
+	margin: 0px;
+	font-size: 18px;
+	line-height: 24px;
+	text-align: center;
+	white-space: nowrap;
+	vertical-align: middle;
+	cursor: pointer;
+	color: #ffffff;
+	background-color: #189F92;
+	border-radius: 3px;
+	border: none;
+	-webkit-appearance: none;
+	outline: none;
+	width: 100%;
 }
+
 .login hr {
-	background: #fff  0 0 no-repeat;
+	background: #fff 0 0 no-repeat;
 }
+
 .login hr.hr15 {
-    height: 15px;
-    border: none;
-    margin: 0px;
-    padding: 0px;
-    width: 100%;
+	height: 15px;
+	border: none;
+	margin: 0px;
+	padding: 0px;
+	width: 100%;
 }
+
 .login hr.hr20 {
-    height: 20px;
-    border: none;
-    margin: 0px;
-    padding: 0px;
-    width: 100%;
+	height: 20px;
+	border: none;
+	margin: 0px;
+	padding: 0px;
+	width: 100%;
 }
-.x-body{
+
+.x-body {
 	padding: 20px;
 }
-.x-nav{
-    padding: 0 20px;
-    position: relative;
-    z-index: 99;
-    border-bottom: 1px solid #e5e5e5;
-    line-height: 39px;
-    height: 39px;
-    overflow: hidden;
-}
-xblock{
-    display: block;
-    margin-bottom: 10px;
-    padding: 5px;
-    line-height: 22px;
-    /* border-left: 5px solid #009688; */
-    border-radius: 0 2px 2px 0;
-    background-color: #f2f2f2;
-}
-.x-right{
-  float: right;
-}
-.x-so{
+
+.x-nav {
+	padding: 0 20px;
+	position: relative;
+	z-index: 99;
+	border-bottom: 1px solid #e5e5e5;
+	line-height: 39px;
+	height: 39px;
+	overflow: hidden;
+}
+
+xblock {
+	display: block;
+	margin-bottom: 10px;
+	padding: 5px;
+	line-height: 22px;
+	/* border-left: 5px solid #009688; */
+	border-radius: 0 2px 2px 0;
+	background-color: #f2f2f2;
+}
+
+.x-right {
+	float: right;
+}
+
+.x-so {
 	text-align: center;
 	margin-bottom: 20px;
 }
-.x-so input.layui-input{
+
+.x-so input.layui-input {
 	width: 190px;
 }
-.x-so .layui-form-label{
+
+.x-so .layui-form-label {
 	display: inline-block;
 }
-.x-so input.layui-input,.x-so input.layui-btn{
+
+.x-so input.layui-input, .x-so input.layui-btn {
 	display: inline-block;
 }
-.x-red{
+
+.x-red {
 	color: red;
 }
-.page{
+
+.page {
 	margin-top: 20px;
 	text-align: center;
 
 }
-.page a{
+
+.page a {
 	display: inline-block;
 	background: #fff 0 0 no-repeat;
 	color: #888;
@@ -172,13 +196,15 @@ xblock{
 	border: 1px solid #E2E2E2;
 
 }
-.page span{
+
+.page span {
 	display: inline-block;
 	padding: 10px;
 	min-width: 15px;
 	border: 1px solid #E2E2E2;
 }
-.page span.current{
+
+.page span.current {
 	display: inline-block;
 	background: #009688 url() 0 0 no-repeat;
 	color: #fff;
@@ -186,12 +212,14 @@ xblock{
 	min-width: 15px;
 	border: 1px solid #009688;
 }
-.page .pagination li{
+
+.page .pagination li {
 	display: inline-block;
 	margin-right: 5px;
 	text-align: center;
 }
-.page .pagination li.active span{
+
+.page .pagination li.active span {
 	background: #009688 url() 0 0 no-repeat;
 	color: #fff;
 	border: 1px solid #009688;
@@ -200,13 +228,14 @@ xblock{
 
 /*登录样式*/
 /*头部*/
-.container{
+.container {
 	width: 100%;
 	height: 45px;
 	background-color: #222;
 	border-bottom: 1px solid rgba(255, 255, 255, 0.2);
 }
-.container .logo a{
+
+.container .logo a {
 	float: left;
 	color: #fff;
 	font-size: 18px;
@@ -214,18 +243,21 @@ xblock{
 	line-height: 45px;
 	width: 200px;
 }
-.container .right{
-	background-color:rgba(0,0,0,0);
+
+.container .right {
+	background-color: rgba(0, 0, 0, 0);
 	float: right;
 
 }
-.container .left_open{
+
+.container .left_open {
 	height: 45px;
 	float: left;
 }
-.container .left_open i{
+
+.container .left_open i {
 	display: block;
-	background: rgba(255,255,255,0.1) url() 0 0 no-repeat;
+	background: rgba(255, 255, 255, 0.1) url() 0 0 no-repeat;
 	color: #fff;
 	width: 32px;
 	height: 32px;
@@ -235,167 +267,201 @@ xblock{
 	margin-top: 7px;
 	cursor: pointer;
 }
-.container .left_open i:hover{
-	background: rgba(255,255,255,0.3) url() 0 0 no-repeat;
+
+.container .left_open i:hover {
+	background: rgba(255, 255, 255, 0.3) url() 0 0 no-repeat;
 }
 
-.container .left{
-	background-color:rgba(0,0,0,0);
+.container .left {
+	background-color: rgba(0, 0, 0, 0);
 	float: left;
 
 }
-.container .layui-nav-item{
+
+.container .layui-nav-item {
 	line-height: 45px;
 }
-.container .layui-nav-more{
+
+.container .layui-nav-more {
 	top: 20px;
 }
-.container .layui-nav-child{
+
+.container .layui-nav-child {
 	top: 50px;
 }
-.container .layui-nav-child i{
+
+.container .layui-nav-child i {
 	margin-right: 10px;
 }
-.layui-nav .layui-nav-item a{
+
+.layui-nav .layui-nav-item a {
 	color: #fff;
 }
-.layui-nav .layui-nav-child a{
+
+.layui-nav .layui-nav-child a {
 	color: #333;
 }
-.left-nav{
+
+.left-nav {
 	position: absolute;
-    top: 46px;
-    bottom: 42px;
-    left: 0;
-    z-index: 2;
-    padding-top: 10px;
+	top: 46px;
+	bottom: 42px;
+	left: 0;
+	z-index: 2;
+	padding-top: 10px;
 	background-color: #EEEEEE;
 	width: 220px;
-    max-width: 220px;
-    overflow: auto;
-    overflow-x:hidden;
-    border-right: 1px solid #e5e5e5;
+	max-width: 220px;
+	overflow: auto;
+	overflow-x: hidden;
+	border-right: 1px solid #e5e5e5;
 
-    /*width: 0px;*/
+	/*width: 0px;*/
 }
-.left-nav #nav li{
+
+.left-nav #nav li {
 	border-bottom: 1px solid #e5e5e5;
 }
-.left-nav #nav li:hover > a{
+
+.left-nav #nav li:hover > a {
 	/*color: blue;*/
 }
-.left-nav #nav .current{
+
+.left-nav #nav .current {
 	background-color: rgba(0, 0, 0, 0.3);
 }
-.left-nav #nav li a{
+
+.left-nav #nav li a {
 	font-size: 14px;
 	padding: 10px 15px 10px 20px;
 	display: block;
 	cursor: pointer;
 }
-.left-nav #nav li a cite{
+
+.left-nav #nav li a cite {
 	font-size: 14px;
 }
 
-.left-nav #nav li .sub-menu{
+.left-nav #nav li .sub-menu {
 	display: none;
 }
-.left-nav #nav li .opened{
+
+.left-nav #nav li .opened {
 	display: block;
 }
-.left-nav #nav li .opened:hover{
+
+.left-nav #nav li .opened:hover {
 	/*background: #fff url() 0 0 no-repeat;*/
 }
-.left-nav #nav li .opened .current{
-	
+
+.left-nav #nav li .opened .current {
+
 }
-.left-nav #nav li .sub-menu li:hover{
+
+.left-nav #nav li .sub-menu li:hover {
 	/*color: blue;*/
-	 /*background: #fff url() 0 0 no-repeat;*/
+	/*background: #fff url() 0 0 no-repeat;*/
 }
-.left-nav #nav li .sub-menu li a{
+
+.left-nav #nav li .sub-menu li a {
 	padding: 12px 15px 12px 30px;
 	font-size: 14px;
 	cursor: pointer;
 }
-.left-nav #nav li .sub-menu li .sub-menu li a{
+
+.left-nav #nav li .sub-menu li .sub-menu li a {
 	padding-left: 45px;
 }
-.left-nav #nav li .sub-menu li a:hover{
+
+.left-nav #nav li .sub-menu li a:hover {
 	color: #148cf1;
 }
-.left-nav #nav li .sub-menu li a i{
+
+.left-nav #nav li .sub-menu li a i {
 	font-size: 12px;
 }
-.left-nav #nav li a i{
+
+.left-nav #nav li a i {
 	padding-right: 10px;
 	line-height: 14px;
 }
-.left-nav #nav li .nav_right{
+
+.left-nav #nav li .nav_right {
 	float: right;
 	font-size: 16px;
 }
+
 .x-slide_left {
-    width: 17px;
-    height: 61px;
-    background: url(../images/icon.png) 0 0 no-repeat;
-    position: absolute;
-    top: 200px;
-    left: 221px;
-    cursor: pointer;
-    z-index: 3;
-}
-.page-content{
+	width: 17px;
+	height: 61px;
+	background: url(../images/icon.png) 0 0 no-repeat;
+	position: absolute;
+	top: 200px;
+	left: 221px;
+	cursor: pointer;
+	z-index: 3;
+}
+
+.page-content {
 	position: absolute;
-    top: 46px;
-    right: 0;
-    bottom: 42px;
-    left: 221px;
-    overflow: hidden;
-    z-index: 1;
-}
-.page-content-bg{
+	top: 46px;
+	right: 0;
+	bottom: 42px;
+	left: 221px;
+	overflow: hidden;
+	z-index: 1;
+}
+
+.page-content-bg {
 	position: absolute;
-    top: 46px;
-    right: 0;
-    bottom: 42px;
-    left: 221px;
-    background: rgba(0,0,0,0.5); url() 0 0 no-repeat;
-    overflow: hidden;
-    z-index: 100;
-    display: none;
+	top: 46px;
+	right: 0;
+	bottom: 42px;
+	left: 221px;
+	background: rgba(0, 0, 0, 0.5);
+url() 0 0 no-repeat;
+	overflow: hidden;
+	z-index: 100;
+	display: none;
 }
 
-.page-content .tab{
+.page-content .tab {
 	height: 100%;
 	width: 100%;
 	background: #EFEEF0 url() 0 0 no-repeat;
 	margin: 0px;
 }
-.page-content .layui-tab-title{
+
+.page-content .layui-tab-title {
 	/*padding-top: 5px;*/
 	height: 35px;
 	background: #EFEEF0 url() 0 0 no-repeat;
 	position: relative;
 	z-index: 100;
 }
-.page-content .layui-tab-title li{
+
+.page-content .layui-tab-title li {
 	line-height: 35px;
 }
-.page-content .layui-tab-title .layui-this:after{
+
+.page-content .layui-tab-title .layui-this:after {
 	height: 36px;
 }
-.page-content .layui-tab-title li .layui-tab-close{
+
+.page-content .layui-tab-title li .layui-tab-close {
 	border-radius: 50%;
 }
-.page-content .layui-tab-title .layui-this{
+
+.page-content .layui-tab-title .layui-this {
 	background: #fff url() 0 0 no-repeat;
 }
-.page-content .layui-tab-bar{
-	height:34px;
+
+.page-content .layui-tab-bar {
+	height: 34px;
 	line-height: 35px;
 }
-.page-content .layui-tab-content{
+
+.page-content .layui-tab-content {
 	position: absolute;
 	top: 36px;
 	bottom: 0px;
@@ -404,26 +470,43 @@ xblock{
 	padding: 0px;
 	overflow: hidden;
 }
-.page-content .layui-tab-content .layui-tab-item{
+
+.page-content .layui-tab-content .layui-tab-item {
 	width: 100%;
 	height: 100%;
-	
+
 }
-.page-content .layui-tab-content .layui-tab-item iframe{
+
+.page-content .layui-tab-content .layui-tab-item iframe {
 	width: 100%;
 	height: 100%;
 
 }
 
-.welcome-footer{padding: 30px 0; line-height: 30px; text-align: center; background-color: #eee; color: #666; font-weight: 300;}
-body .layui-layout-admin .footer-demo{height: auto; padding: 15px 0; line-height: 26px;}
-.welcome-footer a{padding: 0 5px;}
+.welcome-footer {
+	padding: 30px 0;
+	line-height: 30px;
+	text-align: center;
+	background-color: #eee;
+	color: #666;
+	font-weight: 300;
+}
+
+body .layui-layout-admin .footer-demo {
+	height: auto;
+	padding: 15px 0;
+	line-height: 26px;
+}
+
+.welcome-footer a {
+	padding: 0 5px;
+}
 
 table th, table td {
-    word-break: break-all;
+	word-break: break-all;
 }
 
-.footer{
+.footer {
 	position: fixed;
 	bottom: 0px;
 	width: 100%;
@@ -433,35 +516,43 @@ table th, table td {
 	color: #fff;
 	/*padding-left: 10px;*/
 }
-.footer .copyright{
+
+.footer .copyright {
 	margin-left: 10px;
 }
 
 
-@media screen and (max-width: 768px){
-	.fast-add{
+@media screen and (max-width: 768px) {
+	.fast-add {
 		display: none;
 	}
-	.layui-nav .to-index{
+
+	.layui-nav .to-index {
 		display: none;
 	}
-	.container .logo a{
+
+	.container .logo a {
 		width: 140px;
 	}
+
 	.container .left_open {
 		/*float: right;*/
 	}
-	.left-nav{
+
+	.left-nav {
 		left: -221px;
 	}
-	.page-content{
+
+	.page-content {
 		left: 0px;
 	}
-	.page-content .layui-tab-content .layui-tab-item{
-		-webkit-overflow-scrolling: touch; 
-  		overflow-y: scroll;	
+
+	.page-content .layui-tab-content .layui-tab-item {
+		-webkit-overflow-scrolling: touch;
+		overflow-y: scroll;
 	}
-	.x-so input.layui-input{
+
+	.x-so input.layui-input {
 		width: 100%;
 		margin: 10px;
 	}
diff --git a/len-sys/src/main/resources/plugin/x-admin/fonts/iconfont.svg b/len-sys/src/main/resources/plugin/x-admin/fonts/iconfont.svg
index f6f082e..12afb4c 100644
--- a/len-sys/src/main/resources/plugin/x-admin/fonts/iconfont.svg
+++ b/len-sys/src/main/resources/plugin/x-admin/fonts/iconfont.svg
@@ -4,474 +4,768 @@
 2013-9-30: Created.
 -->
 <svg>
-<metadata>
-Created by iconfont
-</metadata>
-<defs>
-
-<font id="iconfont" horiz-adv-x="1024" >
-  <font-face
-    font-family="iconfont"
-    font-weight="500"
-    font-stretch="normal"
-    units-per-em="1024"
-    ascent="896"
-    descent="-128"
-  />
-    <missing-glyph />
-    
-    <glyph glyph-name="x" unicode="x" horiz-adv-x="1001"
-d="M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h912v41q0 16 -0.5 30t-0.5 18q0 13 -5 29t-17 29.5t-31.5 22.5t-49.5 9h-133v-97h-438v97zM955 310v-52q0 -23 0.5 -52t0.5 -58t-10.5 -47.5t-26 -30t-33 -16t-31.5 -4.5q-14 -1 -29.5 -0.5
+	<metadata>
+		Created by iconfont
+	</metadata>
+	<defs>
+
+		<font id="iconfont" horiz-adv-x="1024">
+			<font-face
+				font-family="iconfont"
+				font-weight="500"
+				font-stretch="normal"
+				units-per-em="1024"
+				ascent="896"
+				descent="-128"
+			/>
+			<missing-glyph/>
+
+			<glyph glyph-name="x" unicode="x" horiz-adv-x="1001"
+				   d="M281 543q-27 -1 -53 -1h-83q-18 0 -36.5 -6t-32.5 -18.5t-23 -32t-9 -45.5v-76h912v41q0 16 -0.5 30t-0.5 18q0 13 -5 29t-17 29.5t-31.5 22.5t-49.5 9h-133v-97h-438v97zM955 310v-52q0 -23 0.5 -52t0.5 -58t-10.5 -47.5t-26 -30t-33 -16t-31.5 -4.5q-14 -1 -29.5 -0.5
 t-29.5 0.5h-32l-45 128h-439l-44 -128h-29h-34q-20 0 -45 1q-25 0 -41 9.5t-25.5 23t-13.5 29.5t-4 30v167h911zM163 247q-12 0 -21 -8.5t-9 -21.5t9 -21.5t21 -8.5q13 0 22 8.5t9 21.5t-9 21.5t-22 8.5zM316 123q-8 -26 -14 -48q-5 -19 -10.5 -37t-7.5 -25t-3 -15t1 -14.5
-t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z" />
-    
+t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-5 19 -11 39h-368zM336 498v228q0 11 2.5 23t10 21.5t20.5 15.5t34 6h188q31 0 51.5 -14.5t20.5 -52.5v-227h-327z"/>
 
-    
-    <glyph glyph-name="all" unicode="&#59030;" d="M460.8 409.6 486.4 409.6 486.4 435.2 486.4 652.8C486.4 787.115651 377.51565 896 243.2 896 108.884349 896 0 787.115651 0 652.8 0 518.48435 108.884349 409.6 243.2 409.6L460.8 409.6ZM51.2 652.8C51.2 758.838672 137.161328 844.8 243.2 844.8 349.238671 844.8 435.2 758.838672 435.2 652.8L435.2 435.2 460.8 460.8 243.2 460.8C137.161328 460.8 51.2 546.761329 51.2 652.8ZM460.8 307.2 435.2 332.8 435.2 115.2C435.2 9.161329 349.238671-76.8 243.2-76.8 137.161328-76.8 51.2 9.161329 51.2 115.2 51.2 221.238671 137.161328 307.2 243.2 307.2L460.8 307.2ZM0 115.2C0-19.11565 108.884349-128 243.2-128 377.51565-128 486.4-19.11565 486.4 115.2L486.4 332.8 486.4 358.4 460.8 358.4 243.2 358.4C108.884349 358.4 0 249.51565 0 115.2ZM563.2 460.8 588.8 435.2 588.8 652.8C588.8 758.838672 674.761329 844.8 780.8 844.8 886.838671 844.8 972.8 758.838672 972.8 652.8 972.8 546.761329 886.838671 460.8 780.8 460.8L563.2 460.8ZM1024 652.8C1024 787.115651 915.11565 896 780.8 896 646.48435 896 537.6 787.115651 537.6 652.8L537.6 435.2 537.6 409.6 563.2 409.6 780.8 409.6C915.11565 409.6 1024 518.48435 1024 652.8ZM1024 115.2C1024 249.51565 915.11565 358.4 780.8 358.4L563.2 358.4 537.6 358.4 537.6 332.8 537.6 115.2C537.6-19.11565 646.48435-128 780.8-128 818.513163-128 855.051123-119.390662 888.179087-103.065099 900.861235-96.815296 906.075682-81.467919 899.825882-68.785773 893.576079-56.103625 878.228702-50.889178 865.546554-57.138978 839.420429-70.014014 810.620764-76.8 780.8-76.8 674.761329-76.8 588.8 9.161329 588.8 115.2L588.8 332.8 563.2 307.2 780.8 307.2C886.838671 307.2 972.8 221.238671 972.8 115.2 972.8 96.530451 970.142607 78.244269 964.968006 60.720557 960.963957 47.160894 968.71031 32.92269 982.269973 28.918639 995.829636 24.914588 1010.06784 32.660943 1014.071891 46.220606 1020.63305 68.439878 1024 91.608704 1024 115.2Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="back" unicode="&#59031;" d="M363.840919 423.021263C336.938714 398.641139 337.301807 358.513862 364.730379 334.513862L673.951902 63.94503C682.818816 56.186481 696.296418 57.084988 704.05497 65.951902 711.813519 74.818816 710.915012 88.296418 702.048098 96.05497L392.826577 366.623802C384.59578 373.825747 384.502227 384.164713 392.492414 391.40582L702.325747 672.192277C711.056111 680.104171 711.719614 693.595384 703.807723 702.325748 695.895829 711.056111 682.404617 711.719614 673.674253 703.807722L363.840919 423.021263Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="all" unicode="&#59030;"
+				   d="M460.8 409.6 486.4 409.6 486.4 435.2 486.4 652.8C486.4 787.115651 377.51565 896 243.2 896 108.884349 896 0 787.115651 0 652.8 0 518.48435 108.884349 409.6 243.2 409.6L460.8 409.6ZM51.2 652.8C51.2 758.838672 137.161328 844.8 243.2 844.8 349.238671 844.8 435.2 758.838672 435.2 652.8L435.2 435.2 460.8 460.8 243.2 460.8C137.161328 460.8 51.2 546.761329 51.2 652.8ZM460.8 307.2 435.2 332.8 435.2 115.2C435.2 9.161329 349.238671-76.8 243.2-76.8 137.161328-76.8 51.2 9.161329 51.2 115.2 51.2 221.238671 137.161328 307.2 243.2 307.2L460.8 307.2ZM0 115.2C0-19.11565 108.884349-128 243.2-128 377.51565-128 486.4-19.11565 486.4 115.2L486.4 332.8 486.4 358.4 460.8 358.4 243.2 358.4C108.884349 358.4 0 249.51565 0 115.2ZM563.2 460.8 588.8 435.2 588.8 652.8C588.8 758.838672 674.761329 844.8 780.8 844.8 886.838671 844.8 972.8 758.838672 972.8 652.8 972.8 546.761329 886.838671 460.8 780.8 460.8L563.2 460.8ZM1024 652.8C1024 787.115651 915.11565 896 780.8 896 646.48435 896 537.6 787.115651 537.6 652.8L537.6 435.2 537.6 409.6 563.2 409.6 780.8 409.6C915.11565 409.6 1024 518.48435 1024 652.8ZM1024 115.2C1024 249.51565 915.11565 358.4 780.8 358.4L563.2 358.4 537.6 358.4 537.6 332.8 537.6 115.2C537.6-19.11565 646.48435-128 780.8-128 818.513163-128 855.051123-119.390662 888.179087-103.065099 900.861235-96.815296 906.075682-81.467919 899.825882-68.785773 893.576079-56.103625 878.228702-50.889178 865.546554-57.138978 839.420429-70.014014 810.620764-76.8 780.8-76.8 674.761329-76.8 588.8 9.161329 588.8 115.2L588.8 332.8 563.2 307.2 780.8 307.2C886.838671 307.2 972.8 221.238671 972.8 115.2 972.8 96.530451 970.142607 78.244269 964.968006 60.720557 960.963957 47.160894 968.71031 32.92269 982.269973 28.918639 995.829636 24.914588 1010.06784 32.660943 1014.071891 46.220606 1020.63305 68.439878 1024 91.608704 1024 115.2Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="cart" unicode="&#59032;" d="M235.097303 196.866982C247.384597 160.417152 286.382106 132.376068 324.772759 132.376068L861.658537 132.376068 880.429732 132.376068 885.649214 150.541854 1009.08775 580.154957C1021.388907 622.967661 993.187631 660.786325 949.051586 660.786325L424.585365 660.786325C410.791718 660.786325 399.609756 649.520738 399.609756 635.623932 399.609756 621.727125 410.791718 610.461538 424.585365 610.461538L949.051586 610.461538C959.924 610.461538 964.161052 604.779539 961.106394 594.148171L837.667859 164.535068 861.658537 182.700855 324.772759 182.700855C307.742153 182.700855 287.789837 197.047529 282.395194 213.050549L73.600164 832.433664C69.16437 845.592294 54.980454 852.636656 41.919502 848.167687 28.858551 843.698719 21.86648 829.408727 26.302275 816.250097L235.097303 196.866982ZM399.609756-6.017094C399.609756 49.570129 354.881911 94.632478 299.707317 94.632478 244.532723 94.632478 199.804878 49.570129 199.804878-6.017094 199.804878-61.604318 244.532723-106.666667 299.707317-106.666667 354.881911-106.666667 399.609756-61.604318 399.609756-6.017094ZM249.756098-6.017094C249.756098 21.776518 272.120021 44.307693 299.707317 44.307693 327.294613 44.307693 349.658537 21.776518 349.658537-6.017094 349.658537-33.810705 327.294613-56.341879 299.707317-56.341879 272.120021-56.341879 249.756098-33.810705 249.756098-6.017094ZM924.097562-6.017094C924.097562 49.570129 879.369715 94.632478 824.195121 94.632478 769.020529 94.632478 724.292683 49.570129 724.292683-6.017094 724.292683-61.604318 769.020529-106.666667 824.195121-106.666667 879.369715-106.666667 924.097562-61.604318 924.097562-6.017094ZM774.243902-6.017094C774.243902 21.776518 796.607825 44.307693 824.195121 44.307693 851.782419 44.307693 874.146342 21.776518 874.146342-6.017094 874.146342-33.810705 851.782419-56.341879 824.195121-56.341879 796.607825-56.341879 774.243902-33.810705 774.243902-6.017094Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="category" unicode="&#59033;" d="M134.095238 640C147.560466 640 158.476191 649.551259 158.476191 661.333333 158.476191 673.115408 147.560466 682.666667 134.095238 682.666667L36.571428 682.666667C23.1062 682.666667 12.190476 673.115408 12.190476 661.333333 12.190476 649.551259 23.1062 640 36.571428 640L134.095238 640ZM134.095238 362.666667C147.560466 362.666667 158.476191 372.217926 158.476191 384 158.476191 395.782074 147.560466 405.333333 134.095238 405.333333L36.571428 405.333333C23.1062 405.333333 12.190476 395.782074 12.190476 384 12.190476 372.217926 23.1062 362.666667 36.571428 362.666667L134.095238 362.666667ZM134.095238 85.333333C147.560466 85.333333 158.476191 94.884593 158.476191 106.666667 158.476191 118.44874 147.560466 128 134.095238 128L36.571428 128C23.1062 128 12.190476 118.44874 12.190476 106.666667 12.190476 94.884593 23.1062 85.333333 36.571428 85.333333L134.095238 85.333333ZM987.428572 640C1000.893801 640 1011.809523 649.551259 1011.809523 661.333333 1011.809523 673.115408 1000.893801 682.666667 987.428572 682.666667L280.380951 682.666667C266.915725 682.666667 256 673.115408 256 661.333333 256 649.551259 266.915725 640 280.380951 640L987.428572 640ZM993.52381 362.666667C1006.989037 362.666667 1017.904762 372.217926 1017.904762 384 1017.904762 395.782074 1006.989037 405.333333 993.52381 405.333333L286.47619 405.333333C273.010963 405.333333 262.095238 395.782074 262.095238 384 262.095238 372.217926 273.010963 362.666667 286.47619 362.666667L993.52381 362.666667ZM996.571428 85.333333C1010.036657 85.333333 1020.952382 94.884593 1020.952382 106.666667 1020.952382 118.44874 1010.036657 128 996.571428 128L289.52381 128C276.058581 128 265.142857 118.44874 265.142857 106.666667 265.142857 94.884593 276.058581 85.333333 289.52381 85.333333L996.571428 85.333333Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="back" unicode="&#59031;"
+				   d="M363.840919 423.021263C336.938714 398.641139 337.301807 358.513862 364.730379 334.513862L673.951902 63.94503C682.818816 56.186481 696.296418 57.084988 704.05497 65.951902 711.813519 74.818816 710.915012 88.296418 702.048098 96.05497L392.826577 366.623802C384.59578 373.825747 384.502227 384.164713 392.492414 391.40582L702.325747 672.192277C711.056111 680.104171 711.719614 693.595384 703.807723 702.325748 695.895829 711.056111 682.404617 711.719614 673.674253 703.807722L363.840919 423.021263Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="close" unicode="&#59034;" d="M176.661601 78.827119C168.472798 70.355945 168.701706 56.850364 177.172881 48.661562 185.644056 40.472759 199.149636 40.701668 207.338438 49.172843L826.005105 689.172843C834.193907 697.644017 833.964998 711.149597 825.493824 719.338399 817.02265 727.527202 803.517069 727.298294 795.328267 718.827119L176.661601 78.827119ZM795.328267 49.172843C803.517069 40.701668 817.02265 40.472759 825.493824 48.661562 833.964998 56.850364 834.193907 70.355945 826.005105 78.827119L207.338438 718.827119C199.149636 727.298294 185.644056 727.527202 177.172881 719.338399 168.701706 711.149597 168.472798 697.644017 176.661601 689.172843L795.328267 49.172843Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="comments" unicode="&#59035;" d="M131.253515 106.666667C87.810305 106.666667 52.51282 142.526025 52.51282 186.58237L52.51282 826.666667 26.25641 800 892.853331 800C936.231586 800 971.487179 764.146714 971.487179 720.084297L971.487179 80 997.74359 106.666667 525.128205 106.666667 517.234323 106.666667 510.649171 102.245587 285.912493-48.636066C273.815607-56.757562 270.491629-73.301024 278.488179-85.586923 286.484727-97.872821 302.773675-101.248736 314.87056-93.127241L539.607238 57.754413 525.128205 53.333333 997.74359 53.333333 1024 53.333333 1024 80 1024 720.084297C1024 793.58631 965.24899 853.333333 892.853331 853.333333L26.25641 853.333333 0 853.333333 0 826.666667 0 186.58237C0 113.074285 58.804881 53.333333 131.253515 53.333333L268.117303 53.333333C282.618319 53.333333 294.373713 65.272407 294.373713 80 294.373713 94.727593 282.618319 106.666667 268.117303 106.666667L131.253515 106.666667ZM367.589743 453.333333C367.589743 512.243706 320.568162 560 262.564102 560 204.560043 560 157.538461 512.243706 157.538461 453.333333 157.538461 394.422961 204.560043 346.666667 262.564102 346.666667 320.568162 346.666667 367.589743 394.422961 367.589743 453.333333ZM210.051282 453.333333C210.051282 482.788521 233.562074 506.666667 262.564102 506.666667 291.566133 506.666667 315.076924 482.788521 315.076924 453.333333 315.076924 423.878146 291.566133 400 262.564102 400 233.562074 400 210.051282 423.878146 210.051282 453.333333ZM630.153845 453.333333C630.153845 512.243706 583.132265 560 525.128205 560 467.124145 560 420.102564 512.243706 420.102564 453.333333 420.102564 394.422961 467.124145 346.666667 525.128205 346.666667 583.132265 346.666667 630.153845 394.422961 630.153845 453.333333ZM472.615386 453.333333C472.615386 482.788521 496.126176 506.666667 525.128205 506.666667 554.130236 506.666667 577.641026 482.788521 577.641026 453.333333 577.641026 423.878146 554.130236 400 525.128205 400 496.126176 400 472.615386 423.878146 472.615386 453.333333ZM892.717948 453.333333C892.717948 512.243706 845.696367 560 787.692307 560 729.688247 560 682.666667 512.243706 682.666667 453.333333 682.666667 394.422961 729.688247 346.666667 787.692307 346.666667 845.696367 346.666667 892.717948 394.422961 892.717948 453.333333ZM735.179488 453.333333C735.179488 482.788521 758.690278 506.666667 787.692307 506.666667 816.694338 506.666667 840.205129 482.788521 840.205129 453.333333 840.205129 423.878146 816.694338 400 787.692307 400 758.690278 400 735.179488 423.878146 735.179488 453.333333Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="cart" unicode="&#59032;"
+				   d="M235.097303 196.866982C247.384597 160.417152 286.382106 132.376068 324.772759 132.376068L861.658537 132.376068 880.429732 132.376068 885.649214 150.541854 1009.08775 580.154957C1021.388907 622.967661 993.187631 660.786325 949.051586 660.786325L424.585365 660.786325C410.791718 660.786325 399.609756 649.520738 399.609756 635.623932 399.609756 621.727125 410.791718 610.461538 424.585365 610.461538L949.051586 610.461538C959.924 610.461538 964.161052 604.779539 961.106394 594.148171L837.667859 164.535068 861.658537 182.700855 324.772759 182.700855C307.742153 182.700855 287.789837 197.047529 282.395194 213.050549L73.600164 832.433664C69.16437 845.592294 54.980454 852.636656 41.919502 848.167687 28.858551 843.698719 21.86648 829.408727 26.302275 816.250097L235.097303 196.866982ZM399.609756-6.017094C399.609756 49.570129 354.881911 94.632478 299.707317 94.632478 244.532723 94.632478 199.804878 49.570129 199.804878-6.017094 199.804878-61.604318 244.532723-106.666667 299.707317-106.666667 354.881911-106.666667 399.609756-61.604318 399.609756-6.017094ZM249.756098-6.017094C249.756098 21.776518 272.120021 44.307693 299.707317 44.307693 327.294613 44.307693 349.658537 21.776518 349.658537-6.017094 349.658537-33.810705 327.294613-56.341879 299.707317-56.341879 272.120021-56.341879 249.756098-33.810705 249.756098-6.017094ZM924.097562-6.017094C924.097562 49.570129 879.369715 94.632478 824.195121 94.632478 769.020529 94.632478 724.292683 49.570129 724.292683-6.017094 724.292683-61.604318 769.020529-106.666667 824.195121-106.666667 879.369715-106.666667 924.097562-61.604318 924.097562-6.017094ZM774.243902-6.017094C774.243902 21.776518 796.607825 44.307693 824.195121 44.307693 851.782419 44.307693 874.146342 21.776518 874.146342-6.017094 874.146342-33.810705 851.782419-56.341879 824.195121-56.341879 796.607825-56.341879 774.243902-33.810705 774.243902-6.017094Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="cry" unicode="&#59036;" d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 629.410831-128 740.826187-88.331046 830.768465-16.686662 841.557579-8.092491 843.33693 7.620766 834.742758 18.409879 826.148587 29.198991 810.43533 30.978342 799.646219 22.384173 718.470035-42.277495 618.001779-78.048781 512-78.048781 256.817504-78.048781 49.951219 128.817504 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.663236 904.470807 140.039307 897.177109 128.331757 900.755245 112.928203 912.462793 105.634507 924.170342 98.340809 939.573897 101.918942 946.867595 113.626492 997.013826 194.119204 1024 287.101621 1024 384ZM337.170731 396.487806C371.654852 396.487806 399.609756 424.442709 399.609756 458.926829 399.609756 493.41095 371.654852 521.365854 337.170731 521.365854 302.686611 521.365854 274.731708 493.41095 274.731708 458.926829 274.731708 424.442709 302.686611 396.487806 337.170731 396.487806ZM711.804879 396.487806C746.288998 396.487806 774.243902 424.442709 774.243902 458.926829 774.243902 493.41095 746.288998 521.365854 711.804879 521.365854 677.320757 521.365854 649.365854 493.41095 649.365854 458.926829 649.365854 424.442709 677.320757 396.487806 711.804879 396.487806ZM352.788105 191.215475C396.165222 225.917169 453.151987 246.639629 524.487806 246.639629 595.823622 246.639629 652.810387 225.917169 696.187505 191.215475 722.700531 170.005054 738.882517 148.429073 746.631548 132.931012 752.800254 120.593598 747.799529 105.591424 735.462114 99.422716 723.124702 93.25401 708.122526 98.254735 701.953818 110.592149 701.03616 112.427465 698.492224 116.617476 694.165854 122.385971 686.602473 132.470477 676.927317 142.654852 664.983226 152.210125 630.311565 179.947456 584.273939 196.68841 524.487806 196.68841 464.70167 196.68841 418.664045 179.947456 383.992384 152.210125 372.048292 142.654852 362.373137 132.470477 354.809756 122.385971 350.483386 116.617476 347.93945 112.427465 347.021792 110.592149 340.853084 98.254735 325.850908 93.25401 313.513495 99.422716 301.176081 105.591424 296.175356 120.593598 302.344062 132.931012 310.093092 148.429073 326.275078 170.005054 352.788105 191.215475Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="delete" unicode="&#59037;" d="M972.657609 686.651592C987.158609 686.63161 998.930114 698.428798 998.949999 713.00135 998.969882 727.573903 987.230618 739.40349 972.729617 739.423472L32.457975 740.719194C17.956974 740.739177 6.18547 728.941988 6.165585 714.369436 6.1457 699.796884 17.884965 687.967297 32.385966 687.947314L972.657609 686.651592ZM180.466902-96.356169 180.466902-123.014859 206.993296-122.74074 833.361858-116.267947 859.348284-115.999407 859.348284-89.883377 859.348284 606.602703C859.348284 621.175268 847.59289 632.988668 833.091874 632.988668 818.590859 632.988668 806.835465 621.175268 806.835465 606.602703L806.835465-89.883377 832.82189-63.498805 206.453329-69.971599 232.979723-96.356169 232.979723 613.32995C232.979723 627.902517 221.224329 639.715915 206.723313 639.715915 192.222298 639.715915 180.466902 627.902517 180.466902 613.32995L180.466902-96.356169ZM656.410257 48.920973C656.410257 34.348407 668.165651 22.535008 682.666667 22.535008 697.167682 22.535008 708.923076 34.348407 708.923076 48.920973L708.923076 523.868341C708.923076 538.440909 697.167682 550.254306 682.666667 550.254306 668.165651 550.254306 656.410257 538.440909 656.410257 523.868341L656.410257 48.920973ZM341.333333 48.920973C341.333333 34.348407 353.08873 22.535008 367.589743 22.535008 382.090758 22.535008 393.846155 34.348407 393.846155 48.920973L393.846155 523.868341C393.846155 538.440909 382.090758 550.254306 367.589743 550.254306 353.08873 550.254306 341.333333 538.440909 341.333333 523.868341L341.333333 48.920973ZM498.871795 48.920973C498.871795 34.348407 510.627189 22.535008 525.128205 22.535008 539.62922 22.535008 551.384614 34.348407 551.384614 48.920973L551.384614 523.868341C551.384614 538.440909 539.62922 550.254306 525.128205 550.254306 510.627189 550.254306 498.871795 538.440909 498.871795 523.868341L498.871795 48.920973ZM392.147755 779.278223C392.147755 793.936331 403.758665 805.636493 418.40134 805.636493L622.925796 805.636493C637.408947 805.636493 649.179381 793.8381 649.179381 779.450415L649.179381 724.355125 701.692203 724.355125 701.692203 779.450415C701.692203 823.013393 666.38105 858.408423 622.925796 858.408423L418.40134 858.408423C374.724427 858.408423 339.634933 823.049196 339.634933 779.278223L339.634933 730.689199 392.147755 730.689199 392.147755 779.278223Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="category" unicode="&#59033;"
+				   d="M134.095238 640C147.560466 640 158.476191 649.551259 158.476191 661.333333 158.476191 673.115408 147.560466 682.666667 134.095238 682.666667L36.571428 682.666667C23.1062 682.666667 12.190476 673.115408 12.190476 661.333333 12.190476 649.551259 23.1062 640 36.571428 640L134.095238 640ZM134.095238 362.666667C147.560466 362.666667 158.476191 372.217926 158.476191 384 158.476191 395.782074 147.560466 405.333333 134.095238 405.333333L36.571428 405.333333C23.1062 405.333333 12.190476 395.782074 12.190476 384 12.190476 372.217926 23.1062 362.666667 36.571428 362.666667L134.095238 362.666667ZM134.095238 85.333333C147.560466 85.333333 158.476191 94.884593 158.476191 106.666667 158.476191 118.44874 147.560466 128 134.095238 128L36.571428 128C23.1062 128 12.190476 118.44874 12.190476 106.666667 12.190476 94.884593 23.1062 85.333333 36.571428 85.333333L134.095238 85.333333ZM987.428572 640C1000.893801 640 1011.809523 649.551259 1011.809523 661.333333 1011.809523 673.115408 1000.893801 682.666667 987.428572 682.666667L280.380951 682.666667C266.915725 682.666667 256 673.115408 256 661.333333 256 649.551259 266.915725 640 280.380951 640L987.428572 640ZM993.52381 362.666667C1006.989037 362.666667 1017.904762 372.217926 1017.904762 384 1017.904762 395.782074 1006.989037 405.333333 993.52381 405.333333L286.47619 405.333333C273.010963 405.333333 262.095238 395.782074 262.095238 384 262.095238 372.217926 273.010963 362.666667 286.47619 362.666667L993.52381 362.666667ZM996.571428 85.333333C1010.036657 85.333333 1020.952382 94.884593 1020.952382 106.666667 1020.952382 118.44874 1010.036657 128 996.571428 128L289.52381 128C276.058581 128 265.142857 118.44874 265.142857 106.666667 265.142857 94.884593 276.058581 85.333333 289.52381 85.333333L996.571428 85.333333Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="edit" unicode="&#59038;" d="M34.155089 665.059773 9.17948 665.059773 9.17948 639.796614 9.17948 41.841988C9.17948-27.769568 65.248004-84.289737 134.081773-84.289737L927.938515-84.289737 952.914125-84.289737 952.914125-59.026579 952.914125 424.899439C952.914125 438.851895 941.732164 450.162598 927.938515 450.162598 914.144868 450.162598 902.962906 438.851895 902.962906 424.899439L902.962906-59.026579 927.938515-33.76342 134.081773-33.76342C92.797081-33.76342 59.130699 0.174153 59.130699 41.841988L59.130699 639.796614 34.155089 614.533457 598.93821 614.533457C612.731859 614.533457 623.91382 625.844158 623.91382 639.796614 623.91382 653.749072 612.731859 665.059773 598.93821 665.059773L34.155089 665.059773ZM437.016339 302.496211 431.876019 295.895108 431.668623 287.494786 427.984924 138.290259 427.077935 101.553579 461.312335 113.853545 605.005395 165.480553 611.980762 167.986709 616.479561 173.932757 1003.181673 685.035772 1018.529978 705.321579 998.306108 720.620695 869.49174 818.067219 849.985487 832.823464 834.913446 813.46823 437.016339 302.496211ZM839.575373 777.604982 968.389739 680.158458 963.514174 715.743381 576.81206 204.640367 588.286225 213.092572 444.593165 161.465564 477.920574 137.028849 481.604275 286.233378 476.256559 271.231953 874.153664 782.20397 839.575373 777.604982ZM891.217762 585.494287 920.474916 626.446748 808.309143 708.435734 779.051989 667.483275 891.217762 585.494287Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="email" unicode="&#59039;" d="M972.8-38.274509 998.4-12.54902 127.868001-12.54902C85.502225-12.54902 51.2 21.980294 51.2 64.736983L51.2 784.941177 25.6 759.215686 896.131998 759.215686C938.452011 759.215686 972.8 724.675722 972.8 682.139066L972.8 617.433306C972.8 603.22551 984.26151 591.707817 998.4 591.707817 1012.53849 591.707817 1024 603.22551 1024 617.433306L1024 682.139066C1024 753.083444 966.736828 810.666667 896.131998 810.666667L25.6 810.666667 0 810.666667 0 784.941177 0 64.736983C0-6.415639 57.205646-64 127.868001-64L998.4-64 1024-64 1024-38.274509 1024 438.30151C1024 452.509306 1012.53849 464.026999 998.4 464.026999 984.26151 464.026999 972.8 452.509306 972.8 438.30151L972.8-38.274509ZM512.651558 328.835183C520.64791 323.125502 531.187889 322.509594 539.788919 327.249399L1002.624789 582.306306C1015.021598 589.137867 1019.560139 604.774804 1012.761901 617.232381 1005.963665 629.689959 990.403006 634.250746 978.006197 627.419184L515.170327 372.362278 542.307689 370.776495 194.028065 619.460533C182.502788 627.689991 166.520953 624.972402 158.331639 613.390628 150.142325 601.808854 152.846657 585.748678 164.371935 577.519219L512.651558 328.835183Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="close" unicode="&#59034;"
+				   d="M176.661601 78.827119C168.472798 70.355945 168.701706 56.850364 177.172881 48.661562 185.644056 40.472759 199.149636 40.701668 207.338438 49.172843L826.005105 689.172843C834.193907 697.644017 833.964998 711.149597 825.493824 719.338399 817.02265 727.527202 803.517069 727.298294 795.328267 718.827119L176.661601 78.827119ZM795.328267 49.172843C803.517069 40.701668 817.02265 40.472759 825.493824 48.661562 833.964998 56.850364 834.193907 70.355945 826.005105 78.827119L207.338438 718.827119C199.149636 727.298294 185.644056 727.527202 177.172881 719.338399 168.701706 711.149597 168.472798 697.644017 176.661601 689.172843L795.328267 49.172843Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="favorite" unicode="&#59040;" d="M471.864 811.902c13.811 30.163 21.181 30.093 34.224-0.246l113.657-264.368c5.418-12.603 20.222-18.509 33.066-13.193 12.844 5.316 18.863 19.843 13.445 32.445l-113.657 264.368c-30.206 70.26-94.92 70.878-126.782 1.293l-119.214-260.358c-5.713-12.477-0.036-27.135 12.679-32.741 12.715-5.606 27.654-0.036 33.367 12.441l119.214 260.358zM946.329 487.517c33.504-3.568 35.713-10.467 10.338-32.014l-221.116-187.76c-10.541-8.951-11.691-24.591-2.569-34.934 9.122-10.343 25.062-11.472 35.602-2.521l221.116 187.76c58.765 49.9 39.366 110.483-37.925 118.713l-289.19 30.796c-13.858 1.476-26.312-8.351-27.816-21.95-1.504-13.598 8.511-25.818 22.37-27.294l289.19-30.796zM789.292-62.035c6.895-32.368 0.891-36.562-27.835-19.54l-250.315 148.326c-11.933 7.071-27.448 3.311-34.654-8.398-7.206-11.709-3.374-26.933 8.558-34.003l250.315-148.326c66.525-39.42 119.25-2.596 103.343 72.076l-59.516 279.391c-2.852 13.389-16.226 21.974-29.87 19.175-13.645-2.799-22.394-15.921-19.542-29.31l59.516-279.391zM232.774-79.365c-29.242-16.437-35.162-12.129-27.541 19.938l66.413 279.431c3.166 13.321-5.273 26.638-18.848 29.744-13.575 3.107-27.147-5.174-30.313-18.494l-66.413-279.431c-17.65-74.263 34.334-112.087 101.794-74.168l252.408 141.877c12.096 6.799 16.284 21.932 9.355 33.801-6.929 11.869-22.352 15.979-34.447 9.18l-252.408-141.877zM129.994 382.712c-47.892 42.601-47.892 42.601-87.801 78.102-10.328 9.187-26.29 8.419-35.652-1.715-9.363-10.134-8.58-25.796 1.747-34.983 39.91-35.501 39.91-35.501 87.801-78.102l127.711-113.604c10.328-9.187 26.29-8.419 35.652 1.715 9.363 10.134 8.58 25.796-1.748 34.983-31.928 28.401-31.928 28.401-127.711 113.604zM180.395 501.737c9.971 0.995 20.266 2.053 30.828 3.164 25.45 2.678 51.3 5.546 76.212 8.415 8.72 1.004 16.7 1.936 23.775 2.773 4.251 0.503 7.25 0.862 8.857 1.056 13.835 1.672 23.67 14.032 21.966 27.608-1.704 13.576-14.3 23.226-28.136 21.554-1.549-0.187-4.524-0.543-8.731-1.041-7.023-0.831-14.95-1.757-23.614-2.755-24.756-2.85-50.444-5.701-75.712-8.36-10.473-1.102-20.677-2.15-30.553-3.136-20.542-2.05-39.363-3.801-56.079-5.2-13.889-1.162-24.189-13.152-23.005-26.781 1.184-13.629 13.403-23.735 27.293-22.573 17.016 1.423 36.103 3.199 56.9 5.275z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="form" unicode="&#59042;" d="M835.55027 847.238095C876.805122 847.238095 910.222223 814.558842 910.222223 774.246396L910.222223 61.033572 917.178886 77.94089 755.401109-86.711731 773.333333-79.238095 188.412988-79.238095C147.247907-79.238095 113.777778-46.409011 113.777778-6.094615L113.777778 871.619048 88.888889 847.238095 835.55027 847.238095ZM64 896 64 871.619048 64-6.094615C64-73.325498 119.742117-128 188.412988-128L773.333333-128 783.922411-128 791.265557-120.526364 953.043334 44.126255 960 51.206543 960 61.033572 960 774.246396C960 841.50796 904.277615 896 835.55027 896L88.888889 896 64 896ZM736.080945 188.952382C694.76038 188.952382 661.333333 156.380621 661.333333 115.855814L661.333333-30.47619C661.333333-43.941419 672.476469-54.857143 686.222223-54.857143 699.967977-54.857143 711.11111-43.941419 711.11111-30.47619L711.11111 115.855814C711.11111 129.392139 722.192996 140.190477 736.080945 140.190477L848 140.190477C861.745754 140.190477 872.88889 151.106199 872.88889 164.571428 872.88889 178.036657 861.745754 188.952382 848 188.952382L736.080945 188.952382ZM775.164361 676.571428C788.910114 676.571428 800.05325 687.487153 800.05325 700.952381 800.05325 714.417609 788.910114 725.333333 775.164361 725.333333L263.111111 725.333333C249.365357 725.333333 238.222222 714.417609 238.222222 700.952381 238.222222 687.487153 249.365357 676.571428 263.111111 676.571428L775.164361 676.571428ZM775.164361 530.285715C788.910114 530.285715 800.05325 541.201438 800.05325 554.666667 800.05325 568.131895 788.910114 579.047618 775.164361 579.047618L263.111111 579.047618C249.365357 579.047618 238.222222 568.131895 238.222222 554.666667 238.222222 541.201438 249.365357 530.285715 263.111111 530.285715L775.164361 530.285715ZM775.164361 359.619049C788.910114 359.619049 800.05325 370.534771 800.05325 384 800.05325 397.465229 788.910114 408.380951 775.164361 408.380951L263.111111 408.380951C249.365357 408.380951 238.222222 397.465229 238.222222 384 238.222222 370.534771 249.365357 359.619049 263.111111 359.619049L775.164361 359.619049Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="comments" unicode="&#59035;"
+				   d="M131.253515 106.666667C87.810305 106.666667 52.51282 142.526025 52.51282 186.58237L52.51282 826.666667 26.25641 800 892.853331 800C936.231586 800 971.487179 764.146714 971.487179 720.084297L971.487179 80 997.74359 106.666667 525.128205 106.666667 517.234323 106.666667 510.649171 102.245587 285.912493-48.636066C273.815607-56.757562 270.491629-73.301024 278.488179-85.586923 286.484727-97.872821 302.773675-101.248736 314.87056-93.127241L539.607238 57.754413 525.128205 53.333333 997.74359 53.333333 1024 53.333333 1024 80 1024 720.084297C1024 793.58631 965.24899 853.333333 892.853331 853.333333L26.25641 853.333333 0 853.333333 0 826.666667 0 186.58237C0 113.074285 58.804881 53.333333 131.253515 53.333333L268.117303 53.333333C282.618319 53.333333 294.373713 65.272407 294.373713 80 294.373713 94.727593 282.618319 106.666667 268.117303 106.666667L131.253515 106.666667ZM367.589743 453.333333C367.589743 512.243706 320.568162 560 262.564102 560 204.560043 560 157.538461 512.243706 157.538461 453.333333 157.538461 394.422961 204.560043 346.666667 262.564102 346.666667 320.568162 346.666667 367.589743 394.422961 367.589743 453.333333ZM210.051282 453.333333C210.051282 482.788521 233.562074 506.666667 262.564102 506.666667 291.566133 506.666667 315.076924 482.788521 315.076924 453.333333 315.076924 423.878146 291.566133 400 262.564102 400 233.562074 400 210.051282 423.878146 210.051282 453.333333ZM630.153845 453.333333C630.153845 512.243706 583.132265 560 525.128205 560 467.124145 560 420.102564 512.243706 420.102564 453.333333 420.102564 394.422961 467.124145 346.666667 525.128205 346.666667 583.132265 346.666667 630.153845 394.422961 630.153845 453.333333ZM472.615386 453.333333C472.615386 482.788521 496.126176 506.666667 525.128205 506.666667 554.130236 506.666667 577.641026 482.788521 577.641026 453.333333 577.641026 423.878146 554.130236 400 525.128205 400 496.126176 400 472.615386 423.878146 472.615386 453.333333ZM892.717948 453.333333C892.717948 512.243706 845.696367 560 787.692307 560 729.688247 560 682.666667 512.243706 682.666667 453.333333 682.666667 394.422961 729.688247 346.666667 787.692307 346.666667 845.696367 346.666667 892.717948 394.422961 892.717948 453.333333ZM735.179488 453.333333C735.179488 482.788521 758.690278 506.666667 787.692307 506.666667 816.694338 506.666667 840.205129 482.788521 840.205129 453.333333 840.205129 423.878146 816.694338 400 787.692307 400 758.690278 400 735.179488 423.878146 735.179488 453.333333Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="help" unicode="&#59043;" d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 629.410831-128 740.826187-88.331046 830.768465-16.686662 841.557579-8.092491 843.33693 7.620766 834.742758 18.409879 826.148587 29.198991 810.43533 30.978342 799.646219 22.384173 718.470035-42.277495 618.001779-78.048781 512-78.048781 256.817504-78.048781 49.951219 128.817504 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.663236 904.470807 140.039307 897.177109 128.331757 900.755245 112.928203 912.462793 105.634507 924.170342 98.340809 939.573897 101.918942 946.867595 113.626492 997.013826 194.119204 1024 287.101621 1024 384ZM533.078812 204.581444C551.918022 204.581444 567.190219 189.326048 567.190219 170.488614L567.190219 161.458272C567.190219 142.629323 552.049365 127.365442 533.078812 127.365442L533.078812 127.365442C514.239601 127.365442 498.967405 142.620838 498.967405 161.458272L498.967405 170.488614C498.967405 189.317564 514.108258 204.581444 533.078812 204.581444L533.078812 204.581444ZM374.634146 477.345015C374.634146 477.345015 377.308518 453.789391 403.631972 453.789391 429.955424 453.789391 431.511799 477.345015 431.511799 477.345015 429.767552 553.619347 465.107535 589.837662 537.45591 586.239814 585.612324 580.80307 610.562654 553.619347 612.231066 504.608691 608.894242 482.78176 590.617557 454.558658 558.083539 420.09929 515.008196 376.52538 493.470524 337.50874 493.470524 303.049374L493.470524 267.710532C493.470524 267.710532 496.775846 246.634133 520.582206 246.634133 544.388565 246.634133 547.693888 267.710532 547.693888 267.710532L547.693888 292.255836C547.693888 321.038603 568.321517 355.657875 609.652612 395.71389 652.879629 435.530052 674.341463 471.908271 674.341463 504.608691 670.777131 595.274406 623.530758 642.526114 532.223166 646.203913 427.189099 647.962859 374.634146 591.676561 374.634146 477.345015Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="information" unicode="&#59044;" d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 629.410831-128 740.826187-88.331046 830.768465-16.686662 841.557579-8.092491 843.33693 7.620766 834.742758 18.409879 826.148587 29.198991 810.43533 30.978342 799.646219 22.384173 718.470035-42.277495 618.001779-78.048781 512-78.048781 256.817504-78.048781 49.951219 128.817504 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.663236 904.470807 140.039307 897.177109 128.331757 900.755245 112.928203 912.462793 105.634507 924.170342 98.340809 939.573897 101.918942 946.867595 113.626492 997.013826 194.119204 1024 287.101621 1024 384ZM499.512194 152.97561C499.512194 139.181961 510.694157 128 524.487806 128 538.281453 128 549.463415 139.181961 549.463415 152.97561L549.463415 471.414635C549.463415 485.208282 538.281453 496.390244 524.487806 496.390244 510.694157 496.390244 499.512194 485.208282 499.512194 471.414635L499.512194 152.97561ZM499.512194 577.560975C499.512194 563.767328 510.694157 552.585365 524.487806 552.585365 538.281453 552.585365 549.463415 563.767328 549.463415 577.560975L549.463415 621.268292C549.463415 635.061941 538.281453 646.243902 524.487806 646.243902 510.694157 646.243902 499.512194 635.061941 499.512194 621.268292L499.512194 577.560975Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="cry" unicode="&#59036;"
+				   d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 629.410831-128 740.826187-88.331046 830.768465-16.686662 841.557579-8.092491 843.33693 7.620766 834.742758 18.409879 826.148587 29.198991 810.43533 30.978342 799.646219 22.384173 718.470035-42.277495 618.001779-78.048781 512-78.048781 256.817504-78.048781 49.951219 128.817504 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.663236 904.470807 140.039307 897.177109 128.331757 900.755245 112.928203 912.462793 105.634507 924.170342 98.340809 939.573897 101.918942 946.867595 113.626492 997.013826 194.119204 1024 287.101621 1024 384ZM337.170731 396.487806C371.654852 396.487806 399.609756 424.442709 399.609756 458.926829 399.609756 493.41095 371.654852 521.365854 337.170731 521.365854 302.686611 521.365854 274.731708 493.41095 274.731708 458.926829 274.731708 424.442709 302.686611 396.487806 337.170731 396.487806ZM711.804879 396.487806C746.288998 396.487806 774.243902 424.442709 774.243902 458.926829 774.243902 493.41095 746.288998 521.365854 711.804879 521.365854 677.320757 521.365854 649.365854 493.41095 649.365854 458.926829 649.365854 424.442709 677.320757 396.487806 711.804879 396.487806ZM352.788105 191.215475C396.165222 225.917169 453.151987 246.639629 524.487806 246.639629 595.823622 246.639629 652.810387 225.917169 696.187505 191.215475 722.700531 170.005054 738.882517 148.429073 746.631548 132.931012 752.800254 120.593598 747.799529 105.591424 735.462114 99.422716 723.124702 93.25401 708.122526 98.254735 701.953818 110.592149 701.03616 112.427465 698.492224 116.617476 694.165854 122.385971 686.602473 132.470477 676.927317 142.654852 664.983226 152.210125 630.311565 179.947456 584.273939 196.68841 524.487806 196.68841 464.70167 196.68841 418.664045 179.947456 383.992384 152.210125 372.048292 142.654852 362.373137 132.470477 354.809756 122.385971 350.483386 116.617476 347.93945 112.427465 347.021792 110.592149 340.853084 98.254735 325.850908 93.25401 313.513495 99.422716 301.176081 105.591424 296.175356 120.593598 302.344062 132.931012 310.093092 148.429073 326.275078 170.005054 352.788105 191.215475Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="less" unicode="&#59045;" d="M509.927514 508.840919C517.168621 516.831106 527.507586 516.737553 534.709532 508.506756L805.278364 199.285235C813.036915 190.418321 826.514517 189.519814 835.381431 197.278364 844.248346 205.036915 845.146852 218.514517 837.388303 227.381431L566.819471 536.602955C542.819471 564.031526 502.692194 564.39462 478.31207 537.492414L197.525612 227.659081C189.61372 218.928717 190.277222 205.437504 199.007586 197.525611 207.737949 189.613719 221.229163 190.277222 229.141056 199.007586L509.927514 508.840919Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="moreunfold" unicode="&#59046;" d="M478.31207 251.840919C502.692194 224.938714 542.819471 225.301807 566.819471 252.730379L837.388303 561.951902C845.146852 570.818816 844.248346 584.296418 835.381431 592.05497 826.514517 599.813519 813.036915 598.915012 805.278364 590.048098L534.709532 280.826577C527.507586 272.59578 517.168621 272.502227 509.927514 280.492414L229.141056 590.325747C221.229163 599.056111 207.737949 599.719614 199.007586 591.807723 190.277222 583.895829 189.61372 570.404617 197.525612 561.674253L478.31207 251.840919Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="delete" unicode="&#59037;"
+				   d="M972.657609 686.651592C987.158609 686.63161 998.930114 698.428798 998.949999 713.00135 998.969882 727.573903 987.230618 739.40349 972.729617 739.423472L32.457975 740.719194C17.956974 740.739177 6.18547 728.941988 6.165585 714.369436 6.1457 699.796884 17.884965 687.967297 32.385966 687.947314L972.657609 686.651592ZM180.466902-96.356169 180.466902-123.014859 206.993296-122.74074 833.361858-116.267947 859.348284-115.999407 859.348284-89.883377 859.348284 606.602703C859.348284 621.175268 847.59289 632.988668 833.091874 632.988668 818.590859 632.988668 806.835465 621.175268 806.835465 606.602703L806.835465-89.883377 832.82189-63.498805 206.453329-69.971599 232.979723-96.356169 232.979723 613.32995C232.979723 627.902517 221.224329 639.715915 206.723313 639.715915 192.222298 639.715915 180.466902 627.902517 180.466902 613.32995L180.466902-96.356169ZM656.410257 48.920973C656.410257 34.348407 668.165651 22.535008 682.666667 22.535008 697.167682 22.535008 708.923076 34.348407 708.923076 48.920973L708.923076 523.868341C708.923076 538.440909 697.167682 550.254306 682.666667 550.254306 668.165651 550.254306 656.410257 538.440909 656.410257 523.868341L656.410257 48.920973ZM341.333333 48.920973C341.333333 34.348407 353.08873 22.535008 367.589743 22.535008 382.090758 22.535008 393.846155 34.348407 393.846155 48.920973L393.846155 523.868341C393.846155 538.440909 382.090758 550.254306 367.589743 550.254306 353.08873 550.254306 341.333333 538.440909 341.333333 523.868341L341.333333 48.920973ZM498.871795 48.920973C498.871795 34.348407 510.627189 22.535008 525.128205 22.535008 539.62922 22.535008 551.384614 34.348407 551.384614 48.920973L551.384614 523.868341C551.384614 538.440909 539.62922 550.254306 525.128205 550.254306 510.627189 550.254306 498.871795 538.440909 498.871795 523.868341L498.871795 48.920973ZM392.147755 779.278223C392.147755 793.936331 403.758665 805.636493 418.40134 805.636493L622.925796 805.636493C637.408947 805.636493 649.179381 793.8381 649.179381 779.450415L649.179381 724.355125 701.692203 724.355125 701.692203 779.450415C701.692203 823.013393 666.38105 858.408423 622.925796 858.408423L418.40134 858.408423C374.724427 858.408423 339.634933 823.049196 339.634933 779.278223L339.634933 730.689199 392.147755 730.689199 392.147755 779.278223Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="more" unicode="&#59047;" d="M642.174253 391.40582C650.164439 384.164713 650.070886 373.825747 641.84009 366.623802L332.618569 96.05497C323.751654 88.296418 322.853148 74.818816 330.611697 65.951902 338.370249 57.084988 351.847851 56.186481 360.714765 63.94503L669.936288 334.513862C697.36486 358.513862 697.727953 398.641139 670.825747 423.021263L360.992414 703.807722C352.26205 711.719614 338.770837 711.056111 330.858944 702.325748 322.947053 693.595384 323.610556 680.104171 332.340919 672.192277L642.174253 391.40582Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="pic" unicode="&#59048;" d="M475.224371 320.207494 440.035586 316.135275 667.59114 171.619147 683.870889 161.280194 699.396883 172.75395 1012.285773 403.979757 1024 412.636606 1024 427.354839 1024 687.295869C1024 767.194039 960.311036 832 881.771738 832L28.444444 832 0 832 0 803.096774 0 80.570423C0 0.738618 63.696326-64 142.228263-64L995.555556-64 1024-64 1024-35.096774 1024 225.032258C1024 240.99507 1011.264988 253.935484 995.555556 253.935484 979.846123 253.935484 967.11111 240.99507 967.11111 225.032258L967.11111-35.096774 995.555556-6.193549 142.228263-6.193549C95.11813-6.193549 56.888889 32.661254 56.888889 80.570423L56.888889 803.096774 28.444444 774.193548 881.771738 774.193548C928.874507 774.193548 967.11111 735.286338 967.11111 687.295869L967.11111 427.354839 978.825338 450.72992 665.93645 219.504113 697.742193 220.638918 470.186637 365.155049 450.998204 377.34125 434.997852 361.082829 207.442296 129.857022C196.334049 118.569611 196.334049 100.269099 207.442296 88.981687 218.550543 77.694276 236.56057 77.694276 247.668815 88.981687L475.224371 320.207494ZM341.333333 557.419356C341.333333 613.289193 296.760794 658.580645 241.777777 658.580645 186.794763 658.580645 142.222222 613.289193 142.222222 557.419356 142.222222 501.549517 186.794763 456.258065 241.777777 456.258065 296.760794 456.258065 341.333333 501.549517 341.333333 557.419356ZM199.111111 557.419356C199.111111 581.363571 218.213628 600.774193 241.777777 600.774193 265.341926 600.774193 284.444444 581.363571 284.444444 557.419356 284.444444 533.475138 265.341926 514.064516 241.777777 514.064516 218.213628 514.064516 199.111111 533.475138 199.111111 557.419356Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="edit" unicode="&#59038;"
+				   d="M34.155089 665.059773 9.17948 665.059773 9.17948 639.796614 9.17948 41.841988C9.17948-27.769568 65.248004-84.289737 134.081773-84.289737L927.938515-84.289737 952.914125-84.289737 952.914125-59.026579 952.914125 424.899439C952.914125 438.851895 941.732164 450.162598 927.938515 450.162598 914.144868 450.162598 902.962906 438.851895 902.962906 424.899439L902.962906-59.026579 927.938515-33.76342 134.081773-33.76342C92.797081-33.76342 59.130699 0.174153 59.130699 41.841988L59.130699 639.796614 34.155089 614.533457 598.93821 614.533457C612.731859 614.533457 623.91382 625.844158 623.91382 639.796614 623.91382 653.749072 612.731859 665.059773 598.93821 665.059773L34.155089 665.059773ZM437.016339 302.496211 431.876019 295.895108 431.668623 287.494786 427.984924 138.290259 427.077935 101.553579 461.312335 113.853545 605.005395 165.480553 611.980762 167.986709 616.479561 173.932757 1003.181673 685.035772 1018.529978 705.321579 998.306108 720.620695 869.49174 818.067219 849.985487 832.823464 834.913446 813.46823 437.016339 302.496211ZM839.575373 777.604982 968.389739 680.158458 963.514174 715.743381 576.81206 204.640367 588.286225 213.092572 444.593165 161.465564 477.920574 137.028849 481.604275 286.233378 476.256559 271.231953 874.153664 782.20397 839.575373 777.604982ZM891.217762 585.494287 920.474916 626.446748 808.309143 708.435734 779.051989 667.483275 891.217762 585.494287Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="qrcode" unicode="&#59049;" d="M390.095238 825.756097 365.714285 850.211382 365.714285 507.837397 390.095238 532.292683 48.761905 532.292683 73.142857 507.837397 73.142857 850.211382 48.761905 825.756097 390.095238 825.756097ZM24.380952 874.666667 24.380952 850.211382 24.380952 507.837397 24.380952 483.382114 48.761905 483.382114 390.095238 483.382114 414.47619 483.382114 414.47619 507.837397 414.47619 850.211382 414.47619 874.666667 390.095238 874.666667 48.761905 874.666667 24.380952 874.666667ZM390.095238 238.829269 365.714285 263.284553 365.714285-79.089431 390.095238-54.634146 97.666649-54.634146C84.112298-54.634146 73.142857-43.635025 73.142857-30.035586L73.142857 263.284553 48.761905 238.829269 390.095238 238.829269ZM24.380952 287.739838 24.380952 263.284553 24.380952-30.035586C24.380952-70.651334 57.185576-103.544715 97.666649-103.544715L390.095238-103.544715 414.47619-103.544715 414.47619-79.089431 414.47619 263.284553 414.47619 287.739838 390.095238 287.739838 48.761905 287.739838 24.380952 287.739838ZM926.33335 825.756097C939.887701 825.756097 950.857143 814.756977 950.857143 801.157538L950.857143 507.837397 975.238095 532.292683 633.904762 532.292683 658.285715 507.837397 658.285715 850.211382 633.904762 825.756097 926.33335 825.756097ZM609.52381 874.666667 609.52381 850.211382 609.52381 507.837397 609.52381 483.382114 633.904762 483.382114 975.238095 483.382114 999.619049 483.382114 999.619049 507.837397 999.619049 801.157538C999.619049 841.773285 966.814423 874.666667 926.33335 874.666667L633.904762 874.666667 609.52381 874.666667ZM975.238095 238.829269 950.857143 263.284553 950.857143-79.089431 975.238095-54.634146 633.904762-54.634146 658.285715-79.089431 658.285715 263.284553 633.904762 238.829269 975.238095 238.829269ZM609.52381 287.739838 609.52381 263.284553 609.52381-79.089431 609.52381-103.544715 633.904762-103.544715 975.238095-103.544715 999.619049-103.544715 999.619049-79.089431 999.619049 263.284553 999.619049 287.739838 975.238095 287.739838 633.904762 287.739838 609.52381 287.739838ZM487.619049 507.559642C487.619049 494.053361 498.534771 483.104356 512 483.104356 525.465229 483.104356 536.380951 494.053361 536.380951 507.559642L536.380951 776.845529C536.380951 790.351809 525.465229 801.300813 512 801.300813 498.534771 801.300813 487.619049 790.351809 487.619049 776.845529L487.619049 507.559642ZM585.142857 214.628617C585.142857 228.134897 574.227134 239.0839 560.761905 239.0839 547.296676 239.0839 536.380951 228.134897 536.380951 214.628617L536.380951-79.089431C536.380951-92.595712 547.296676-103.544715 560.761905-103.544715 574.227134-103.544715 585.142857-92.595712 585.142857-79.089431L585.142857 214.628617ZM487.619049 116.552845C487.619049 130.059125 476.703324 141.00813 463.238095 141.00813 449.772866 141.00813 438.857143 130.059125 438.857143 116.552845L438.857143-79.089431C438.857143-92.595712 449.772866-103.544715 463.238095-103.544715 476.703324-103.544715 487.619049-92.595712 487.619049-79.089431L487.619049 116.552845ZM999.619049 361.105692C1013.084275 361.105692 1024 372.054694 1024 385.560975 1024 399.067255 1013.084275 410.01626 999.619049 410.01626L24.380952 410.01626C10.915724 410.01626 0 399.067255 0 385.560975 0 372.054694 10.915724 361.105692 24.380952 361.105692L999.619049 361.105692Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="refresh" unicode="&#59050;" d="M512 896C229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 761.325865-128 973.201958 51.440486 1016.153097 294.235322 1018.151127 305.529818 1019.771663 316.910818 1021.010022 328.364361 1022.492753 342.078084 1012.577574 354.397246 998.863851 355.879979 985.150125 357.362709 972.830963 347.447531 971.348233 333.733807 970.230573 323.396631 968.768273 313.126908 966.965602 302.936738 928.217702 83.902033 736.992706-78.048781 512-78.048781 256.817504-78.048781 49.951219 128.817504 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 698.044361 846.048781 863.703281 735.083433 936.293348 567.2457 941.768939 554.585421 956.470965 548.761079 969.131243 554.236668 981.791522 559.712258 987.615863 574.414283 982.140273 587.074562 901.710383 773.038993 718.143277 896 512 896ZM958.442797 545.753446 983.418406 570.729056 724.292683 570.729056C710.499034 570.729056 699.317073 559.547093 699.317073 545.753446 699.317073 531.959797 710.499034 520.777837 724.292683 520.777837L983.418406 520.777837C997.212055 520.777837 1008.394016 531.959797 1008.394016 545.753446L1008.394016 821.073171C1008.394016 834.866819 997.212055 846.048781 983.418406 846.048781 969.624757 846.048781 958.442797 834.866819 958.442797 821.073171L958.442797 545.753446Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="email" unicode="&#59039;"
+				   d="M972.8-38.274509 998.4-12.54902 127.868001-12.54902C85.502225-12.54902 51.2 21.980294 51.2 64.736983L51.2 784.941177 25.6 759.215686 896.131998 759.215686C938.452011 759.215686 972.8 724.675722 972.8 682.139066L972.8 617.433306C972.8 603.22551 984.26151 591.707817 998.4 591.707817 1012.53849 591.707817 1024 603.22551 1024 617.433306L1024 682.139066C1024 753.083444 966.736828 810.666667 896.131998 810.666667L25.6 810.666667 0 810.666667 0 784.941177 0 64.736983C0-6.415639 57.205646-64 127.868001-64L998.4-64 1024-64 1024-38.274509 1024 438.30151C1024 452.509306 1012.53849 464.026999 998.4 464.026999 984.26151 464.026999 972.8 452.509306 972.8 438.30151L972.8-38.274509ZM512.651558 328.835183C520.64791 323.125502 531.187889 322.509594 539.788919 327.249399L1002.624789 582.306306C1015.021598 589.137867 1019.560139 604.774804 1012.761901 617.232381 1005.963665 629.689959 990.403006 634.250746 978.006197 627.419184L515.170327 372.362278 542.307689 370.776495 194.028065 619.460533C182.502788 627.689991 166.520953 624.972402 158.331639 613.390628 150.142325 601.808854 152.846657 585.748678 164.371935 577.519219L512.651558 328.835183Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="rfq" unicode="&#59051;" d="M797.970974 404.10381 761.457982 404.926466 951.72983 168.907697 970.333549 207.645338 850.968469 207.645338 827.095452 207.645338 827.095452 183.831383 827.095452-80.372094 850.968471-56.55814 683.857357-56.558118 707.73037-80.372073 707.73037 86.325602C707.73037 99.477685 697.042057 110.139556 683.857355 110.139556 670.672651 110.139556 659.984337 99.477685 659.984337 86.325602L659.984337-80.372073 659.984337-104.186022 683.85735-104.186025 850.968465-104.186046 874.841485-104.18605 874.841485-80.372094 874.841485 183.831383 850.968469 160.017431 970.333549 160.017431 1020.166487 160.017431 988.937265 198.755072 798.665419 434.773843 780.898613 456.812307 762.152427 435.596499 552.503424 198.328337C543.785389 188.46179 544.736282 173.413493 554.6273 164.717026 564.518319 156.020561 579.603938 156.969101 588.321973 166.835648L797.970974 404.10381ZM153.857145-32.744186C107.228929-32.744186 69.079365 6.613809 69.079365 55.513474L69.079365 872.186047 45.206349 848.372093 748.087665 848.372093C794.753677 848.372093 833.015872 808.847828 833.015872 759.895934L833.015872 333.407761 880.761905 333.407761 880.761905 759.895934C880.761905 834.786936 821.503465 896 748.087665 896L45.206349 896 21.333333 896 21.333333 872.186047 21.333333 55.513474C21.333333-19.338285 80.493186-80.372094 153.857145-80.372094L687.308156-80.372094 687.308156-32.744186 153.857145-32.744186ZM735.286219 514.976745C748.470923 514.976745 759.159236 525.638613 759.159236 538.790699 759.159236 551.942782 748.470923 562.604651 735.286219 562.604651L189.399822 562.604651C176.215119 562.604651 165.526806 551.942782 165.526806 538.790699 165.526806 525.638613 176.215119 514.976745 189.399822 514.976745L735.286219 514.976745ZM737.956448 657.860465C751.14115 657.860465 761.829463 668.522336 761.829463 681.674419 761.829463 694.826502 751.14115 705.488372 737.956448 705.488372L192.070049 705.488372C178.885347 705.488372 168.197034 694.826502 168.197034 681.674419 168.197034 668.522336 178.885347 657.860465 192.070049 657.860465L737.956448 657.860465Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="search" unicode="&#59052;" d="M1001.526404-95.699618C999.922771-90.822379 999.922771-90.822379 998.661741-88.531443 997.556333-86.547938 996.293839-84.724943 994.702325-82.653549 992.500075-79.787264 989.423708-76.169135 985.358477-71.619563 978.223881-63.634933 967.82403-52.546074 954.04227-38.18551 932.495573-15.733901 910.909628 6.315748 858.479859 59.608002 806.561909 112.380015 784.782022 134.629598 763.425645 156.886537 750.035742 170.841067 739.986204 181.558483 733.331893 189.006633 730.0273 192.705455 727.65239 195.498419 726.365602 197.171678 727.222236 195.561131 727.222236 195.561131 728.57702 191.58121 730.685899 184.086517 730.685899 184.086517 721.610157 166.825982 803.853596 246.08394 851.33145 356.012949 851.33145 473.600226 851.33145 706.88518 665.530044 896 436.332393 896 207.134741 896 21.333333 706.88518 21.333333 473.600226 21.333333 240.315273 207.134741 51.200452 436.332393 51.200452 441.356706 51.200452 446.556279 51.43584 452.347883 51.88233 456.487002 52.201425 460.079727 52.545845 466.651669 53.223196 479.958906 54.594731 484.804847 54.985431 490.397372 54.985442 499.896397 54.985459 514.964663 58.353071 537.39015 64.570334 540.021178 65.299761 542.719546 66.061295 545.476431 66.851597 553.976567 69.288288 562.667765 71.891529 571.097184 74.494202 576.160226 76.057472 580.026436 77.278086 582.233225 77.986769 595.480279 82.240892 602.830912 96.619906 598.651326 110.103196 594.471738 123.586485 580.344653 131.068205 567.097598 126.81408 565.058735 126.159326 561.367413 124.993926 556.494825 123.489461 548.364858 120.979245 539.986116 118.469596 531.839533 116.134255 529.217662 115.382658 526.657771 114.660205 524.170112 113.970524 506.936476 109.192655 493.480702 106.185421 490.397278 106.185414 482.458716 106.185399 476.720548 105.722765 461.583853 104.162671 455.416051 103.526976 452.140828 103.212992 448.548723 102.936068 443.933724 102.580286 439.960704 102.400425 436.332393 102.400425 234.916275 102.400425 71.63625 268.592237 71.63625 473.600226 71.63625 678.608215 234.916275 844.800027 436.332393 844.800027 637.74851 844.800027 801.028533 678.608215 801.028533 473.600226 801.028533 370.224557 759.336083 273.690923 687.025254 204.005013 677.769918 186.436971 677.769918 186.436971 679.976768 178.37293 681.566101 173.694818 681.566101 173.694818 682.808947 171.449702 683.910231 169.488343 685.170219 167.673308 686.754421 165.613308 688.964348 162.739657 692.047349 159.113956 696.115554 154.560425 703.261474 146.562018 713.66454 135.467582 727.438434 121.112866 749.001325 98.640706 770.84669 76.324235 822.916311 23.398054 875.194278-29.7399 896.716879-51.724843 918.057933-73.962174 931.455439-87.922347 941.502012-98.634524 948.144469-106.068378 951.440527-109.757135 953.805218-112.538259 955.077419-114.194061 954.139053-112.441707 954.139053-112.441707 952.75811-108.249822 950.686453-100.172693 950.686453-100.172693 960.850534-82.849743 950.24269-91.977788 948.913429-108.130236 957.881542-118.927251 966.849655-129.724265 982.719104-131.077231 993.326948-121.949188 1003.683753-104.332838 1003.683753-104.332838 1001.526404-95.699618Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="favorite" unicode="&#59040;"
+				   d="M471.864 811.902c13.811 30.163 21.181 30.093 34.224-0.246l113.657-264.368c5.418-12.603 20.222-18.509 33.066-13.193 12.844 5.316 18.863 19.843 13.445 32.445l-113.657 264.368c-30.206 70.26-94.92 70.878-126.782 1.293l-119.214-260.358c-5.713-12.477-0.036-27.135 12.679-32.741 12.715-5.606 27.654-0.036 33.367 12.441l119.214 260.358zM946.329 487.517c33.504-3.568 35.713-10.467 10.338-32.014l-221.116-187.76c-10.541-8.951-11.691-24.591-2.569-34.934 9.122-10.343 25.062-11.472 35.602-2.521l221.116 187.76c58.765 49.9 39.366 110.483-37.925 118.713l-289.19 30.796c-13.858 1.476-26.312-8.351-27.816-21.95-1.504-13.598 8.511-25.818 22.37-27.294l289.19-30.796zM789.292-62.035c6.895-32.368 0.891-36.562-27.835-19.54l-250.315 148.326c-11.933 7.071-27.448 3.311-34.654-8.398-7.206-11.709-3.374-26.933 8.558-34.003l250.315-148.326c66.525-39.42 119.25-2.596 103.343 72.076l-59.516 279.391c-2.852 13.389-16.226 21.974-29.87 19.175-13.645-2.799-22.394-15.921-19.542-29.31l59.516-279.391zM232.774-79.365c-29.242-16.437-35.162-12.129-27.541 19.938l66.413 279.431c3.166 13.321-5.273 26.638-18.848 29.744-13.575 3.107-27.147-5.174-30.313-18.494l-66.413-279.431c-17.65-74.263 34.334-112.087 101.794-74.168l252.408 141.877c12.096 6.799 16.284 21.932 9.355 33.801-6.929 11.869-22.352 15.979-34.447 9.18l-252.408-141.877zM129.994 382.712c-47.892 42.601-47.892 42.601-87.801 78.102-10.328 9.187-26.29 8.419-35.652-1.715-9.363-10.134-8.58-25.796 1.747-34.983 39.91-35.501 39.91-35.501 87.801-78.102l127.711-113.604c10.328-9.187 26.29-8.419 35.652 1.715 9.363 10.134 8.58 25.796-1.748 34.983-31.928 28.401-31.928 28.401-127.711 113.604zM180.395 501.737c9.971 0.995 20.266 2.053 30.828 3.164 25.45 2.678 51.3 5.546 76.212 8.415 8.72 1.004 16.7 1.936 23.775 2.773 4.251 0.503 7.25 0.862 8.857 1.056 13.835 1.672 23.67 14.032 21.966 27.608-1.704 13.576-14.3 23.226-28.136 21.554-1.549-0.187-4.524-0.543-8.731-1.041-7.023-0.831-14.95-1.757-23.614-2.755-24.756-2.85-50.444-5.701-75.712-8.36-10.473-1.102-20.677-2.15-30.553-3.136-20.542-2.05-39.363-3.801-56.079-5.2-13.889-1.162-24.189-13.152-23.005-26.781 1.184-13.629 13.403-23.735 27.293-22.573 17.016 1.423 36.103 3.199 56.9 5.275z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="selected" unicode="&#59053;" d="M464.247574 218.512156C474.214622 209.350991 489.665824 209.798411 499.086059 219.520971L798.905035 528.962102C808.503379 538.868489 808.253662 554.680199 798.347275 564.278544 788.44089 573.87689 772.62918 573.627172 763.030833 563.720785L463.211858 254.279654 498.050342 255.288469 316.608839 422.059538C306.453341 431.393915 290.653676 430.728264 281.319299 420.572766 271.984922 410.417267 272.650573 394.617602 282.806071 385.283225L464.247574 218.512156Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="set" unicode="&#59054;" d="M825.606018 248.461717 819.263571 235.741545 827.207981 223.95529 905.327294 108.058193 908.52362 139.141679 769.540324 3.626127 799.04025 7.115004 671.47766 83.116681 660.919793 89.407046 649.583401 84.661163C641.524386 81.287326 633.321491 78.204958 625.041941 75.439663L611.811631 71.020858 608.915804 57.376038 580.996546-74.176486 604.846304-54.857143 408.272431-54.857141 431.938677-73.378097 397.841517 64.327061 394.800523 76.608452 383.007648 81.191938C375.650317 84.051482 368.359849 87.170722 361.19018 90.526543L349.017562 96.224034 337.701214 88.973216 217.88134 12.200015 248.055031 9.128335 109.071736 144.636279 112.710251 114.231712 190.651237 238.590583 197.546671 249.592606 192.26576 261.454455C188.597667 269.693634 185.255827 278.10566 182.266902 286.622118L177.674889 299.706315 164.082002 302.447895 29.201333 329.652282 48.761905 305.752599 48.761905 497.40253 29.96636 473.669978 171.221091 506.913988 183.450436 509.792139 188.204044 521.421577C191.634415 529.81379 195.421037 538.096149 199.530538 546.196672L205.959792 558.869818 198.101254 570.70989 124.686421 681.320416 121.526273 650.511849 259.687038 787.298784 229.912147 783.764797 352.693357 709.475686 363.287226 703.065837 374.712497 707.838612C381.330477 710.603196 388.053308 713.173769 394.835279 715.53319L407.314641 719.87471 410.490432 732.700371 443.437389 865.758996 419.771153 847.238095 616.327194 847.238095 592.477417 866.557526 621.325088 730.62796 624.105103 717.528597 636.651202 712.847021C646.841886 709.044368 656.865493 704.767605 666.627682 700.056896L678.796045 694.185096 690.225485 701.390303 803.674639 772.909532 773.791902 775.942467 914.162801 641.245167 910.479401 671.93453 834.210227 552.18633 827.217813 541.207727 832.449542 529.289143C836.047972 521.091433 839.325363 512.718893 842.252943 504.24713L846.63933 491.553911 859.712006 488.47766 994.034289 456.869065 975.238095 480.601771 975.238095 288.95184 994.798163 312.85142 852.982818 284.24525 840.250379 281.676937 835.279123 269.677026C832.31875 262.531102 829.086927 255.442899 825.606018 248.461717ZM857.803703 260.34567 862.624587 236.446091 1004.439932 265.05226 1024 268.997805 1024 288.95184 1024 480.601771 1024 499.911373 1005.203806 504.334475 870.881523 535.943072 865.296766 512.210366 888.340587 520.173602C884.98377 529.887479 881.22675 539.485301 877.099219 548.888369L854.774381 539.088755 875.338534 525.991181 951.607706 645.739381 962.34231 662.593495 947.924307 676.428745 807.553406 811.126044 793.797813 824.325656 777.670669 814.158979 664.221513 742.63975 677.223499 722.015027 687.819315 743.973158C676.702449 749.337561 665.295885 754.20439 653.698526 758.531943L645.174865 735.689482 669.02464 740.751004 640.176969 876.68057 636.0769 896 616.327194 896 419.771153 896 400.690923 896 396.104919 877.479099 363.157965 744.420473 386.824198 738.560422 378.813118 761.587654C371.096704 758.903145 363.448934 755.978908 355.916838 752.832462L365.314667 730.335537 377.935979 751.195387 255.154767 825.484498 238.88953 835.325826 225.379878 821.950511 87.219113 685.163575 72.972426 671.058551 84.058966 654.355008 157.473798 543.744482 177.787526 557.227187 156.044514 568.257702C151.336434 558.97728 146.99905 549.490257 143.067323 539.871503L165.635683 530.646541 160.050276 554.379093 18.795545 521.135083 0 516.71159 0 497.40253 0 305.752599 0 285.798133 19.560572 281.852917 154.441241 254.648533 159.261622 278.548213 136.256342 270.47431C139.682853 260.711021 143.513008 251.069818 147.71909 241.622221L169.992425 251.538338 149.333613 264.486093 71.392628 140.127221 60.94464 123.456915 75.031143 109.722652 214.014438-25.785293 227.881289-39.305393 244.18813-28.856971 364.008004 47.91623 350.854609 68.444723 340.519036 46.362903C348.675428 42.545237 356.968563 38.997003 365.342891 35.742189L374.17527 58.467063 350.509022 52.607068 384.606182-85.098091 389.192156-103.619046 408.272431-103.619046 604.846304-103.619049 624.595936-103.619049 628.696062-84.299706 656.615319 47.252817 632.765562 52.314428 640.489184 29.189193C649.912247 32.336412 659.243565 35.842801 668.413638 39.681773L658.998519 62.171469 646.519381 41.226255 774.081971-34.775422 790.172006-44.36185 803.581897-31.286545 942.565193 104.229005 957.136469 118.436719 945.761519 135.312491 867.642208 251.209587 847.425094 237.582438 869.244171 226.703159C873.230259 234.697506 876.932843 242.818202 880.328282 251.014315L857.803703 260.34567ZM731.428572 396.190477C731.428572 510.644915 638.644915 603.428572 524.190477 603.428572 409.736036 603.428572 316.952382 510.644915 316.952382 396.190477 316.952382 281.736036 409.736036 188.952382 524.190477 188.952382 553.504879 188.952382 582.005801 195.057111 608.253005 206.71738 620.558583 212.184111 626.102566 226.591411 620.635836 238.89699 615.169107 251.202566 600.761807 256.746549 588.456228 251.279821 568.411953 242.375189 546.651767 237.714285 524.190477 237.714285 436.666494 237.714285 365.714285 308.666494 365.714285 396.190477 365.714285 483.71446 436.666494 554.666667 524.190477 554.666667 611.71446 554.666667 682.666667 483.71446 682.666667 396.190477 682.666667 384.625745 681.431994 373.2376 679.007782 362.152755 676.130985 348.998426 684.462569 336.002626 697.616898 333.125828 710.77123 330.24903 723.767027 338.580614 726.643825 351.734944 729.815238 366.236418 731.428572 381.117165 731.428572 396.190477Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="form" unicode="&#59042;"
+				   d="M835.55027 847.238095C876.805122 847.238095 910.222223 814.558842 910.222223 774.246396L910.222223 61.033572 917.178886 77.94089 755.401109-86.711731 773.333333-79.238095 188.412988-79.238095C147.247907-79.238095 113.777778-46.409011 113.777778-6.094615L113.777778 871.619048 88.888889 847.238095 835.55027 847.238095ZM64 896 64 871.619048 64-6.094615C64-73.325498 119.742117-128 188.412988-128L773.333333-128 783.922411-128 791.265557-120.526364 953.043334 44.126255 960 51.206543 960 61.033572 960 774.246396C960 841.50796 904.277615 896 835.55027 896L88.888889 896 64 896ZM736.080945 188.952382C694.76038 188.952382 661.333333 156.380621 661.333333 115.855814L661.333333-30.47619C661.333333-43.941419 672.476469-54.857143 686.222223-54.857143 699.967977-54.857143 711.11111-43.941419 711.11111-30.47619L711.11111 115.855814C711.11111 129.392139 722.192996 140.190477 736.080945 140.190477L848 140.190477C861.745754 140.190477 872.88889 151.106199 872.88889 164.571428 872.88889 178.036657 861.745754 188.952382 848 188.952382L736.080945 188.952382ZM775.164361 676.571428C788.910114 676.571428 800.05325 687.487153 800.05325 700.952381 800.05325 714.417609 788.910114 725.333333 775.164361 725.333333L263.111111 725.333333C249.365357 725.333333 238.222222 714.417609 238.222222 700.952381 238.222222 687.487153 249.365357 676.571428 263.111111 676.571428L775.164361 676.571428ZM775.164361 530.285715C788.910114 530.285715 800.05325 541.201438 800.05325 554.666667 800.05325 568.131895 788.910114 579.047618 775.164361 579.047618L263.111111 579.047618C249.365357 579.047618 238.222222 568.131895 238.222222 554.666667 238.222222 541.201438 249.365357 530.285715 263.111111 530.285715L775.164361 530.285715ZM775.164361 359.619049C788.910114 359.619049 800.05325 370.534771 800.05325 384 800.05325 397.465229 788.910114 408.380951 775.164361 408.380951L263.111111 408.380951C249.365357 408.380951 238.222222 397.465229 238.222222 384 238.222222 370.534771 249.365357 359.619049 263.111111 359.619049L775.164361 359.619049Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="smile" unicode="&#59055;" d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 629.410831-128 740.826187-88.331046 830.768465-16.686662 841.557579-8.092491 843.33693 7.620766 834.742758 18.409879 826.148587 29.198991 810.43533 30.978342 799.646219 22.384173 718.470035-42.277495 618.001779-78.048781 512-78.048781 256.817504-78.048781 49.951219 128.817504 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.663236 904.470807 140.039307 897.177109 128.331757 900.755245 112.928203 912.462793 105.634507 924.170342 98.340809 939.573897 101.918942 946.867595 113.626492 997.013826 194.119204 1024 287.101621 1024 384ZM337.170731 396.487806C371.654852 396.487806 399.609756 424.442709 399.609756 458.926829 399.609756 493.41095 371.654852 521.365854 337.170731 521.365854 302.686611 521.365854 274.731708 493.41095 274.731708 458.926829 274.731708 424.442709 302.686611 396.487806 337.170731 396.487806ZM711.804879 396.487806C746.288998 396.487806 774.243902 424.442709 774.243902 458.926829 774.243902 493.41095 746.288998 521.365854 711.804879 521.365854 677.320757 521.365854 649.365854 493.41095 649.365854 458.926829 649.365854 424.442709 677.320757 396.487806 711.804879 396.487806ZM352.788105 127.229033C396.165222 92.527339 453.151987 71.804879 524.487806 71.804879 595.823622 71.804879 652.810387 92.527339 696.187505 127.229033 722.700531 148.439454 738.882517 170.015435 746.631548 185.513495 752.800254 197.850908 747.799529 212.853084 735.462114 219.021792 723.124702 225.190498 708.122526 220.189773 701.953818 207.852358 701.03616 206.017043 698.492224 201.827031 694.165854 196.058537 686.602473 185.974029 676.927317 175.789655 664.983226 166.234383 630.311565 138.497052 584.273939 121.756098 524.487806 121.756098 464.70167 121.756098 418.664045 138.497052 383.992384 166.234383 372.048292 175.789655 362.373137 185.974029 354.809756 196.058537 350.483386 201.827031 347.93945 206.017043 347.021792 207.852358 340.853084 220.189773 325.850908 225.190498 313.513495 219.021792 301.176081 212.853084 296.175356 197.850908 302.344062 185.513495 310.093092 170.015435 326.275078 148.439454 352.788105 127.229033Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="success" unicode="&#59057;" d="M464.247573 218.512156C474.214622 209.350991 489.665824 209.798411 499.086059 219.520971L798.905035 528.962103C808.503379 538.868489 808.253662 554.680198 798.347275 564.278545 788.44089 573.87689 772.62918 573.627172 763.030833 563.720785L463.211857 254.279654 498.050342 255.288469 316.608838 422.059539C306.453342 431.393916 290.653675 430.728265 281.319298 420.572766 271.984922 410.417267 272.650573 394.617602 282.806071 385.283226L464.247573 218.512156ZM1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 629.410831-128 740.826187-88.331046 830.768465-16.686662 841.557579-8.092491 843.33693 7.620766 834.742758 18.409879 826.148587 29.198991 810.43533 30.978342 799.646219 22.384173 718.470035-42.277495 618.001779-78.048781 512-78.048781 256.817504-78.048781 49.951219 128.817504 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.663236 904.470807 140.039307 897.177109 128.331757 900.755245 112.928203 912.462793 105.634507 924.170342 98.340809 939.573897 101.918942 946.867595 113.626492 997.013826 194.119204 1024 287.101621 1024 384Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="help" unicode="&#59043;"
+				   d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 629.410831-128 740.826187-88.331046 830.768465-16.686662 841.557579-8.092491 843.33693 7.620766 834.742758 18.409879 826.148587 29.198991 810.43533 30.978342 799.646219 22.384173 718.470035-42.277495 618.001779-78.048781 512-78.048781 256.817504-78.048781 49.951219 128.817504 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.663236 904.470807 140.039307 897.177109 128.331757 900.755245 112.928203 912.462793 105.634507 924.170342 98.340809 939.573897 101.918942 946.867595 113.626492 997.013826 194.119204 1024 287.101621 1024 384ZM533.078812 204.581444C551.918022 204.581444 567.190219 189.326048 567.190219 170.488614L567.190219 161.458272C567.190219 142.629323 552.049365 127.365442 533.078812 127.365442L533.078812 127.365442C514.239601 127.365442 498.967405 142.620838 498.967405 161.458272L498.967405 170.488614C498.967405 189.317564 514.108258 204.581444 533.078812 204.581444L533.078812 204.581444ZM374.634146 477.345015C374.634146 477.345015 377.308518 453.789391 403.631972 453.789391 429.955424 453.789391 431.511799 477.345015 431.511799 477.345015 429.767552 553.619347 465.107535 589.837662 537.45591 586.239814 585.612324 580.80307 610.562654 553.619347 612.231066 504.608691 608.894242 482.78176 590.617557 454.558658 558.083539 420.09929 515.008196 376.52538 493.470524 337.50874 493.470524 303.049374L493.470524 267.710532C493.470524 267.710532 496.775846 246.634133 520.582206 246.634133 544.388565 246.634133 547.693888 267.710532 547.693888 267.710532L547.693888 292.255836C547.693888 321.038603 568.321517 355.657875 609.652612 395.71389 652.879629 435.530052 674.341463 471.908271 674.341463 504.608691 670.777131 595.274406 623.530758 642.526114 532.223166 646.203913 427.189099 647.962859 374.634146 591.676561 374.634146 477.345015Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="survey" unicode="&#59058;" d="M722.355804 849.454545C761.006291 849.454545 792.380951 818.166023 792.380951 779.627344L792.380951 437.500928 799.081094 453.813218 401.874746 51.22138 418.539682 58.181818 138.070006 58.181818C99.387643 58.181818 68.063492 89.328555 68.063492 127.771428L68.063492 872.727273 44.698413 849.454545 722.355804 849.454545ZM21.333333 896 21.333333 872.727273 21.333333 127.771428C21.333333 63.604277 73.59726 11.636363 138.070006 11.636363L418.539682 11.636363 428.337293 11.636363 435.204619 18.596802 832.410967 421.18864 839.11111 427.979625 839.11111 437.500928 839.11111 779.627344C839.11111 843.859757 786.827324 896 722.355804 896L44.698413 896 21.333333 896ZM775.859347 307.365395 759.337741 290.90909 775.859347 274.452787 869.319663 181.361879 885.841269 164.905574 902.362876 181.361879 972.458114 251.18006 988.979721 267.636363 972.458114 284.092668 878.997796 377.183575 862.47619 393.639878 845.954583 377.183575 775.859347 307.365395ZM845.954583 344.27097 939.414901 251.18006 939.414901 284.092668 869.319663 214.274485 902.362876 214.274485 808.902558 307.365395 808.902558 274.452787 878.997796 344.27097 845.954583 344.27097ZM518.843473 51.365395 513.841133 46.382827 512.453734 39.473248 489.088655-76.890387 482.215251-111.121568 516.58227-104.275332 633.407665-81.002605 640.344663-79.620689 645.347004-74.638121 902.362876 181.361879 918.884482 197.818182 902.362876 214.274485 808.902558 307.365395 792.380951 323.821698 775.859347 307.365395 518.843473 51.365395ZM775.859347 274.452787 869.319663 181.361879 869.319663 214.274485 612.303791-41.725515 624.243127-35.361033 507.41773-58.633758 534.911345-86.018703 558.276425 30.344934 551.886686 18.452787 808.902558 274.452787 775.859347 274.452787ZM426.576706 298.269073C444.201086 298.269073 458.488469 284.053815 458.488469 266.500753L458.488469 258.086116C458.488469 240.540958 444.323959 226.317797 426.576706 226.317797L426.576706 226.317797C408.952326 226.317797 394.664943 240.533054 394.664943 258.086116L394.664943 266.500753C394.664943 284.045911 408.829453 298.269073 426.576706 298.269073L426.576706 298.269073ZM278.349205 552.435127C278.349205 552.435127 280.851125 530.485568 305.477133 530.485568 330.103138 530.485568 331.559155 552.435127 331.559155 552.435127 329.927383 623.508937 362.988497 657.25782 430.67155 653.905282 475.722639 648.839223 499.06407 623.508937 500.624896 577.839917 497.503245 557.501184 480.405116 531.202385 449.969026 499.092521 409.671358 458.489557 389.522524 422.133143 389.522524 390.023279L389.522524 357.093903C389.522524 357.093903 392.614705 337.454532 414.885933 337.454532 437.157161 337.454532 440.249342 357.093903 440.249342 357.093903L440.249342 379.965664C440.249342 406.785969 459.546816 439.044836 498.21271 476.369762 538.652271 513.471183 558.730159 547.369069 558.730159 577.839917 555.395669 662.323878 511.195938 706.353877 425.776235 709.780917 327.515198 711.419936 278.349205 658.971339 278.349205 552.435127Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="training" unicode="&#59059;" d="M887.286976 773.12C927.302833 773.12 959.646052 740.185246 959.646052 699.237312L959.646052 232.448 983.843138 257.024 136.713024 257.024C96.697168 257.024 64.353947 289.958754 64.353947 330.906688L64.353947 797.696 40.156863 773.12 887.286976 773.12ZM15.959779 822.272 15.959779 797.696 15.959779 330.906688C15.959779 262.841265 69.941754 207.872 136.713024 207.872L983.843138 207.872 1008.040222 207.872 1008.040222 232.448 1008.040222 699.237312C1008.040222 767.302736 954.058246 822.272 887.286976 822.272L40.156863 822.272 15.959779 822.272ZM195.578315-68.786556C186.532947-78.777739 187.174803-94.32474 197.011941-103.511755 206.849078-112.698769 222.156373-112.046863 231.201741-102.05568L450.40665 140.070052C459.452017 150.061235 458.810161 165.608237 448.973022 174.795251 439.135885 183.982266 423.828591 183.330357 414.783221 173.339174L195.578315-68.786556ZM798.39181-102.05568C807.437178-112.046863 822.744474-112.698769 832.581611-103.511755 842.418748-94.32474 843.060604-78.777739 834.015236-68.786556L614.81033 173.339174C605.76496 183.330357 590.457666 183.982266 580.620529 174.795251 570.78339 165.608237 570.141534 150.061235 579.186903 140.070052L798.39181-102.05568ZM441.76944 792.384051C441.76944 781.74481 452.602844 773.12 465.966524 773.12 479.330204 773.12 490.163607 781.74481 490.163607 792.384051L490.163607 876.735949C490.163607 887.37519 479.330204 896 465.966524 896 452.602844 896 441.76944 887.37519 441.76944 876.735949L441.76944 792.384051ZM514.796777 588.941242C528.160457 588.941242 538.99386 599.944292 538.99386 613.517242 538.99386 627.090191 528.160457 638.093242 514.796777 638.093242L158.588801 638.093242C145.225121 638.093242 134.391718 627.090191 134.391718 613.517242 134.391718 599.944292 145.225121 588.941242 158.588801 588.941242L514.796777 588.941242ZM514.796777 430.750897C528.160457 430.750897 538.99386 441.753946 538.99386 455.326897 538.99386 468.899846 528.160457 479.902897 514.796777 479.902897L158.588801 479.902897C145.225121 479.902897 134.391718 468.899846 134.391718 455.326897 134.391718 441.753946 145.225121 430.750897 158.588801 430.750897L514.796777 430.750897ZM680.30294 343.608956C728.899441 381.779921 758.198767 439.314078 758.198767 517.741092L758.198767 679.158246C758.198767 692.731196 747.365363 703.734246 734.001683 703.734246 720.638003 703.734246 709.804599 692.731196 709.804599 679.158246L709.804599 517.741092C709.804599 454.928094 687.727774 411.576531 650.697359 382.490349 637.686323 372.270607 623.667934 364.562914 609.678551 359.068813 601.472998 355.846217 595.348683 354.128198 592.405429 353.55024 579.284725 350.973769 570.704734 338.082133 573.241481 324.755964 575.778227 311.429796 588.471098 302.715443 601.591802 305.291915 622.119765 309.322927 651.18515 320.737882 680.30294 343.608956ZM752.643211 663.489664C761.163307 673.946319 759.724115 689.438173 749.428683 698.091691 739.133252 706.745209 723.880252 705.283479 715.360156 694.826826L605.757702 560.312531C597.237604 549.855878 598.676798 534.364023 608.972228 525.710505 619.267661 517.056988 634.520659 518.518716 643.040757 528.975371L752.643211 663.489664ZM752.643211 694.826826C744.123113 705.283479 728.870114 706.745209 718.574682 698.091691 708.279251 689.438173 706.84006 673.946319 715.360156 663.489664L824.962609 528.975371C833.482707 518.518716 848.735706 517.056988 859.031136 525.710505 869.326569 534.364023 870.76576 549.855878 862.245664 560.312531L752.643211 694.826826Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="information" unicode="&#59044;"
+				   d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 629.410831-128 740.826187-88.331046 830.768465-16.686662 841.557579-8.092491 843.33693 7.620766 834.742758 18.409879 826.148587 29.198991 810.43533 30.978342 799.646219 22.384173 718.470035-42.277495 618.001779-78.048781 512-78.048781 256.817504-78.048781 49.951219 128.817504 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.663236 904.470807 140.039307 897.177109 128.331757 900.755245 112.928203 912.462793 105.634507 924.170342 98.340809 939.573897 101.918942 946.867595 113.626492 997.013826 194.119204 1024 287.101621 1024 384ZM499.512194 152.97561C499.512194 139.181961 510.694157 128 524.487806 128 538.281453 128 549.463415 139.181961 549.463415 152.97561L549.463415 471.414635C549.463415 485.208282 538.281453 496.390244 524.487806 496.390244 510.694157 496.390244 499.512194 485.208282 499.512194 471.414635L499.512194 152.97561ZM499.512194 577.560975C499.512194 563.767328 510.694157 552.585365 524.487806 552.585365 538.281453 552.585365 549.463415 563.767328 549.463415 577.560975L549.463415 621.268292C549.463415 635.061941 538.281453 646.243902 524.487806 646.243902 510.694157 646.243902 499.512194 635.061941 499.512194 621.268292L499.512194 577.560975Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="viewgallery" unicode="&#59060;" d="M147.04975 846.048781 348.539994 846.048781C390.229001 846.048781 423.931625 812.54407 423.931625 770.941234L423.931625 546.52218C423.931625 505.022859 390.167209 471.414635 348.539994 471.414635L147.04975 471.414635C105.360742 471.414635 71.65812 504.919345 71.65812 546.52218L71.65812 770.941234C71.65812 812.440555 105.422534 846.048781 147.04975 846.048781ZM21.333333 546.52218C21.333333 477.349489 77.549527 421.463415 147.04975 421.463415L348.539994 421.463415C417.992574 421.463415 474.25641 477.466982 474.25641 546.52218L474.25641 770.941234C474.25641 840.113925 418.040215 896 348.539994 896L147.04975 896C77.597169 896 21.333333 839.996433 21.333333 770.941234L21.333333 546.52218ZM675.460006 846.048781 876.950251 846.048781C918.639258 846.048781 952.341879 812.54407 952.341879 770.941234L952.341879 546.52218C952.341879 505.022859 918.577466 471.414635 876.950251 471.414635L675.460006 471.414635C633.770999 471.414635 600.068375 504.919345 600.068375 546.52218L600.068375 770.941234C600.068375 812.440555 633.832791 846.048781 675.460006 846.048781ZM549.74359 546.52218C549.74359 477.349489 605.959785 421.463415 675.460006 421.463415L876.950251 421.463415C946.402831 421.463415 1002.666667 477.466982 1002.666667 546.52218L1002.666667 770.941234C1002.666667 840.113925 946.450473 896 876.950251 896L675.460006 896C606.007426 896 549.74359 839.996433 549.74359 770.941234L549.74359 546.52218ZM147.04975 296.585365 348.539994 296.585365C390.229001 296.585365 423.931625 263.080655 423.931625 221.47782L423.931625-2.941233C423.931625-44.440555 390.167209-78.048781 348.539994-78.048781L147.04975-78.048781C105.360742-78.048781 71.65812-44.54407 71.65812-2.941233L71.65812 221.47782C71.65812 262.977141 105.422534 296.585365 147.04975 296.585365ZM21.333333-2.941233C21.333333-72.113924 77.549527-128 147.04975-128L348.539994-128C417.992574-128 474.25641-71.996433 474.25641-2.941233L474.25641 221.47782C474.25641 290.650511 418.040215 346.536585 348.539994 346.536585L147.04975 346.536585C77.597169 346.536585 21.333333 290.533018 21.333333 221.47782L21.333333-2.941233ZM874.686701-78.048781 868.289711-78.048781 845.457374-78.048781 776.173041-78.048781 675.395834-78.048781C633.745909-78.048781 600.068375-44.547631 600.068375-2.941233L600.068375 221.47782C600.068375 262.977141 633.832791 296.585365 675.460006 296.585365L876.950251 296.585365C918.642281 296.585365 952.341879 263.11607 952.341879 221.579471L952.341879 26.978142 952.341879-3.065886C952.341879-16.859535 963.607467-28.041495 977.504273-28.041495 991.401079-28.041495 1002.666667-16.859535 1002.666667-3.065886L1002.666667 26.978142 1002.666667 221.579471C1002.666667 290.696734 946.442579 346.536585 876.950251 346.536585L675.460006 346.536585C606.007426 346.536585 549.74359 290.533018 549.74359 221.47782L549.74359-2.941233C549.74359-72.110364 605.927488-128 675.395834-128L776.173041-128 845.457374-128 868.289711-128 874.686701-128 876.37206-128C890.847055-128 902.112642-116.818039 902.112642-103.02439 902.112642-89.230741 890.847055-78.048781 876.950251-78.048781L874.686701-78.048781Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="viewlist" unicode="&#59061;" d="M146.571481 846.048781 347.295185 846.048781C388.825594 846.048781 422.4 812.54407 422.4 770.941234L422.4 546.52218C422.4 505.022859 388.764036 471.414635 347.295185 471.414635L146.571481 471.414635C105.041073 471.414635 71.466667 504.919345 71.466667 546.52218L71.466667 770.941234C71.466667 812.440555 105.10263 846.048781 146.571481 846.048781ZM21.333333 546.52218C21.333333 477.349489 77.335661 421.463415 146.571481 421.463415L347.295185 421.463415C416.483543 421.463415 472.533333 477.466982 472.533333 546.52218L472.533333 770.941234C472.533333 840.113925 416.531006 896 347.295185 896L146.571481 896C77.383122 896 21.333333 839.996433 21.333333 770.941234L21.333333 546.52218ZM146.571481 296.585365 347.295185 296.585365C388.825594 296.585365 422.4 263.080655 422.4 221.47782L422.4-2.941233C422.4-44.440555 388.764036-78.048781 347.295185-78.048781L146.571481-78.048781C105.041073-78.048781 71.466667-44.54407 71.466667-2.941233L71.466667 221.47782C71.466667 262.977141 105.10263 296.585365 146.571481 296.585365ZM21.333333-2.941233C21.333333-72.113924 77.335661-128 146.571481-128L347.295185-128C416.483543-128 472.533333-71.996433 472.533333-2.941233L472.533333 221.47782C472.533333 290.650511 416.531006 346.536585 347.295185 346.536585L146.571481 346.536585C77.383122 346.536585 21.333333 290.533018 21.333333 221.47782L21.333333-2.941233ZM998.933333 746.146342C1012.777271 746.146342 1024 757.328303 1024 771.121951 1024 784.9156 1012.777271 796.097561 998.933333 796.097561L572.8 796.097561C558.956062 796.097561 547.733333 784.9156 547.733333 771.121951 547.733333 757.328303 558.956062 746.146342 572.8 746.146342L998.933333 746.146342ZM998.933333 621.268292C1012.777271 621.268292 1024 632.450255 1024 646.243902 1024 660.037551 1012.777271 671.219511 998.933333 671.219511L572.8 671.219511C558.956062 671.219511 547.733333 660.037551 547.733333 646.243902 547.733333 632.450255 558.956062 621.268292 572.8 621.268292L998.933333 621.268292ZM998.933333 496.390244C1012.777271 496.390244 1024 507.572205 1024 521.365854 1024 535.159503 1012.777271 546.341463 998.933333 546.341463L572.8 546.341463C558.956062 546.341463 547.733333 535.159503 547.733333 521.365854 547.733333 507.572205 558.956062 496.390244 572.8 496.390244L998.933333 496.390244ZM998.933333 221.658537C1012.777271 221.658537 1024 232.840497 1024 246.634146 1024 260.427795 1012.777271 271.609756 998.933333 271.609756L572.8 271.609756C558.956062 271.609756 547.733333 260.427795 547.733333 246.634146 547.733333 232.840497 558.956062 221.658537 572.8 221.658537L998.933333 221.658537ZM998.933333 96.780489C1012.777271 96.780489 1024 107.962449 1024 121.756098 1024 135.549745 1012.777271 146.731708 998.933333 146.731708L572.8 146.731708C558.956062 146.731708 547.733333 135.549745 547.733333 121.756098 547.733333 107.962449 558.956062 96.780489 572.8 96.780489L998.933333 96.780489ZM998.933333-28.097562C1012.777271-28.097562 1024-16.915599 1024-3.121952 1024 10.671697 1012.777271 21.853658 998.933333 21.853658L572.8 21.853658C558.956062 21.853658 547.733333 10.671697 547.733333-3.121952 547.733333-16.915599 558.956062-28.097562 572.8-28.097562L998.933333-28.097562Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="less" unicode="&#59045;"
+				   d="M509.927514 508.840919C517.168621 516.831106 527.507586 516.737553 534.709532 508.506756L805.278364 199.285235C813.036915 190.418321 826.514517 189.519814 835.381431 197.278364 844.248346 205.036915 845.146852 218.514517 837.388303 227.381431L566.819471 536.602955C542.819471 564.031526 502.692194 564.39462 478.31207 537.492414L197.525612 227.659081C189.61372 218.928717 190.277222 205.437504 199.007586 197.525611 207.737949 189.613719 221.229163 190.277222 229.141056 199.007586L509.927514 508.840919Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="warning" unicode="&#59062;" d="M598.272514 737.82091C545.018272 824.005964 451.264177 824.048599 397.724122 737.602659L25.049726 135.881414C-28.93569 48.716393 14.324655-31.325257 116.435565-33.308966L891.057077-33.313666C993.88467-35.315989 1036.926865 27.961741 983.25955 114.810306 980.374633 119.478901 980.374633 119.478901 971.719878 133.484687 967.393745 140.485568 967.393745 140.485568 963.78822 146.320305 956.511588 158.09591 941.113263 161.714133 929.3951 154.40183 917.676937 147.089527 914.076365 131.615721 921.352996 119.840115 924.958522 114.005378 924.958522 114.005378 929.284655 107.004497 937.939409 92.998711 937.939409 92.998711 940.824326 88.330116 972.284602 37.418686 957.441559 15.597451 891.539823 16.877724L116.918309 16.882423C54.037254 18.108704 33.95555 55.264503 67.458075 109.357783L440.132471 711.079029C474.112981 765.944069 522.112175 765.922241 556.029583 711.034491L857.08969 239.16029C864.534622 227.491405 879.98329 224.0968 891.595253 231.578227 903.207217 239.059657 906.585263 254.584051 899.140331 266.252937L598.272514 737.82091ZM474.536585 276.206654C474.536585 262.345389 485.718547 251.108614 499.512194 251.108614 513.305843 251.108614 524.487806 262.345389 524.487806 276.206654L524.487806 596.206654C524.487806 610.067918 513.305843 621.304693 499.512194 621.304693 485.718547 621.304693 474.536585 610.067918 474.536585 596.206654L474.536585 276.206654ZM474.465781 119.263855C474.565553 105.402953 485.828105 94.24775 499.621393 94.348013 513.414679 94.448275 524.515467 105.766033 524.415695 119.626935L523.955031 183.624333C523.855258 197.485233 512.592708 208.640437 498.79942 208.540175 485.006133 208.439913 473.905346 197.122153 474.005118 183.261252L474.465781 119.263855Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="wrong" unicode="&#59063;" d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 629.410831-128 740.826187-88.331046 830.768465-16.686662 841.557579-8.092491 843.33693 7.620766 834.742758 18.409879 826.148587 29.198991 810.43533 30.978342 799.646219 22.384173 718.470035-42.277495 618.001779-78.048781 512-78.048781 256.817504-78.048781 49.951219 128.817504 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.663236 904.470807 140.039307 897.177109 128.331757 900.755245 112.928203 912.462793 105.634507 924.170342 98.340809 939.573897 101.918942 946.867595 113.626492 997.013826 194.119204 1024 287.101621 1024 384ZM331.838918 232.424508C322.174057 222.583006 322.317252 206.769971 332.158756 197.105109 342.000258 187.440247 357.813293 187.583443 367.478155 197.424947L717.473766 553.817293C727.138628 563.658795 726.995433 579.471829 717.153931 589.136691 707.312427 598.801553 691.499394 598.658357 681.834532 588.816853L331.838918 232.424508ZM681.834532 197.424947C691.499394 187.583443 707.312427 187.440247 717.153931 197.105109 726.995433 206.769971 727.138628 222.583006 717.473766 232.424508L367.478155 588.816853C357.813293 598.658357 342.000258 598.801553 332.158756 589.136691 322.317252 579.471829 322.174057 563.658795 331.838918 553.817293L681.834532 197.424947Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="moreunfold" unicode="&#59046;"
+				   d="M478.31207 251.840919C502.692194 224.938714 542.819471 225.301807 566.819471 252.730379L837.388303 561.951902C845.146852 570.818816 844.248346 584.296418 835.381431 592.05497 826.514517 599.813519 813.036915 598.915012 805.278364 590.048098L534.709532 280.826577C527.507586 272.59578 517.168621 272.502227 509.927514 280.492414L229.141056 590.325747C221.229163 599.056111 207.737949 599.719614 199.007586 591.807723 190.277222 583.895829 189.61372 570.404617 197.525612 561.674253L478.31207 251.840919Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="account" unicode="&#59064;" d="M793.6 579.008546C793.6 742.296018 661.792629 874.666667 499.2 874.666667 336.607371 874.666667 204.8 742.296018 204.8 579.008546 204.8 415.721077 336.607371 283.350428 499.2 283.350428 661.792629 283.350428 793.6 415.721077 793.6 579.008546ZM256 579.008546C256 713.898197 364.88435 823.247863 499.2 823.247863 633.51565 823.247863 742.4 713.898197 742.4 579.008546 742.4 444.118897 633.51565 334.769231 499.2 334.769231 364.88435 334.769231 256 444.118897 256 579.008546ZM0-102.290598 0-128 25.6-128 486.4-128 998.4-128 1024-128 1024-102.290598C1024 128.537329 787.090923 334.769231 512 334.769231 495.448045 334.769231 478.989086 334.099108 462.660538 332.767422 448.568439 331.618131 485.255599 319.213724 486.4 305.061404 501.350035 306.280663 496.831226 283.350428 512 283.350428 760.310844 283.350428 972.8 98.376331 972.8-102.290598L998.4-76.581197 486.4-76.581197 25.6-76.581197 51.2-102.290598C51.2 34.242573 137.013906 159.054662 275.263548 228.560915 287.906261 234.917154 293.024384 250.362647 286.695191 263.05939 280.366001 275.756134 264.986234 280.896128 252.34352 274.539889 97.581613 196.731947 0 54.804309 0-102.290598Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="add" unicode="&#59065;" d="M853.333333 362.666667C865.115407 362.666667 874.666667 372.217926 874.666667 384 874.666667 395.782074 865.115407 405.333333 853.333333 405.333333L170.666667 405.333333C158.884592 405.333333 149.333333 395.782074 149.333333 384 149.333333 372.217926 158.884592 362.666667 170.666667 362.666667L853.333333 362.666667ZM490.666667 42.666667C490.666667 30.884593 500.217926 21.333333 512 21.333333 523.782074 21.333333 533.333333 30.884593 533.333333 42.666667L533.333333 725.333333C533.333333 737.115408 523.782074 746.666667 512 746.666667 500.217926 746.666667 490.666667 737.115408 490.666667 725.333333L490.666667 42.666667Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="more" unicode="&#59047;"
+				   d="M642.174253 391.40582C650.164439 384.164713 650.070886 373.825747 641.84009 366.623802L332.618569 96.05497C323.751654 88.296418 322.853148 74.818816 330.611697 65.951902 338.370249 57.084988 351.847851 56.186481 360.714765 63.94503L669.936288 334.513862C697.36486 358.513862 697.727953 398.641139 670.825747 423.021263L360.992414 703.807722C352.26205 711.719614 338.770837 711.056111 330.858944 702.325748 322.947053 693.595384 323.610556 680.104171 332.340919 672.192277L642.174253 391.40582Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="atm" unicode="&#59066;" d="M786.731708 248C807.42218 248 824.195121 292.890916 824.195121 348.266667 824.195121 403.642417 807.42218 448.533333 786.731708 448.533333 766.041235 448.533333 749.268292 403.642417 749.268292 348.266667 749.268292 292.890916 766.041235 248 786.731708 248ZM462.048781 197.866667C482.739253 197.866667 499.512194 237.146219 499.512194 285.6 499.512194 334.053783 482.739253 373.333333 462.048781 373.333333 441.358308 373.333333 424.585365 334.053783 424.585365 285.6 424.585365 237.146219 441.358308 197.866667 462.048781 197.866667ZM0 323.2C0 73.186074 229.933961-128 512-128 794.066039-128 1024 73.186074 1024 323.2 1024 573.213926 794.066039 774.400001 512 774.400001 515.649685 774.400001 516.946722 773.816747 516.866057 773.875947 514.736119 775.439072 512.302005 777.571016 505.789668 783.527388 487.675081 800.095511 476.340222 809.396515 458.812092 820.606339 404.94781 855.054345 334.29571 874.666667 237.268292 874.666667 223.474645 874.666667 212.292683 863.443938 212.292683 849.6 212.292683 835.756062 223.474645 824.533333 237.268292 824.533333 325.013274 824.533333 386.336418 807.510637 431.969129 778.326995 444.078925 770.582377 494.717728 724.266667 512 724.266667 767.886246 724.266667 974.048781 543.879957 974.048781 323.2 974.048781 102.520045 767.886246-77.866667 512-77.866667 256.113754-77.866667 49.951219 102.520045 49.951219 323.2 49.951219 468.970155 140.536466 601.537705 284.745583 672.442882 297.132651 678.533393 302.254953 693.549039 296.186566 705.981267 290.11818 718.413495 275.157079 723.554473 262.770012 717.463962 102.138268 638.484055 0 489.009167 0 323.2Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="clock" unicode="&#59067;" d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 625.316262-128 733.09232-91.060258 821.44823-23.93747 832.170355-15.792017 834.259159-0.496821 826.113707 10.225303 817.968254 20.947428 802.67306 23.036233 791.950935 14.89078 712.006355-45.842033 614.569408-79.238095 512-79.238095 256.160663-79.238095 48.761905 128.160663 48.761905 384 48.761905 639.839337 256.160663 847.238095 512 847.238095 767.839337 847.238095 975.238095 639.839337 975.238095 384 975.238095 289.261734 946.765111 198.842236 894.355733 122.396286 886.741822 111.290398 889.572629 96.115004 900.678517 88.501092 911.784403 80.887181 926.959799 83.717988 934.573709 94.823876 992.505146 179.324474 1024 279.340297 1024 384ZM487.619049 286.47619C487.619049 273.010963 498.534771 262.095238 512 262.095238 525.465229 262.095238 536.380951 273.010963 536.380951 286.47619L536.380951 652.190477C536.380951 665.655703 525.465229 676.571428 512 676.571428 498.534771 676.571428 487.619049 665.655703 487.619049 652.190477L487.619049 286.47619ZM481.586633 424.435921C472.719716 434.569538 457.316742 435.596403 447.183125 426.729489 437.049508 417.862575 436.022643 402.459599 444.889559 392.325982L615.556226 197.278364C624.42314 187.144747 639.826114 186.117882 649.959731 194.984796 660.093348 203.851712 661.120213 219.254686 652.253299 229.388303L481.586633 424.435921Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="pic" unicode="&#59048;"
+				   d="M475.224371 320.207494 440.035586 316.135275 667.59114 171.619147 683.870889 161.280194 699.396883 172.75395 1012.285773 403.979757 1024 412.636606 1024 427.354839 1024 687.295869C1024 767.194039 960.311036 832 881.771738 832L28.444444 832 0 832 0 803.096774 0 80.570423C0 0.738618 63.696326-64 142.228263-64L995.555556-64 1024-64 1024-35.096774 1024 225.032258C1024 240.99507 1011.264988 253.935484 995.555556 253.935484 979.846123 253.935484 967.11111 240.99507 967.11111 225.032258L967.11111-35.096774 995.555556-6.193549 142.228263-6.193549C95.11813-6.193549 56.888889 32.661254 56.888889 80.570423L56.888889 803.096774 28.444444 774.193548 881.771738 774.193548C928.874507 774.193548 967.11111 735.286338 967.11111 687.295869L967.11111 427.354839 978.825338 450.72992 665.93645 219.504113 697.742193 220.638918 470.186637 365.155049 450.998204 377.34125 434.997852 361.082829 207.442296 129.857022C196.334049 118.569611 196.334049 100.269099 207.442296 88.981687 218.550543 77.694276 236.56057 77.694276 247.668815 88.981687L475.224371 320.207494ZM341.333333 557.419356C341.333333 613.289193 296.760794 658.580645 241.777777 658.580645 186.794763 658.580645 142.222222 613.289193 142.222222 557.419356 142.222222 501.549517 186.794763 456.258065 241.777777 456.258065 296.760794 456.258065 341.333333 501.549517 341.333333 557.419356ZM199.111111 557.419356C199.111111 581.363571 218.213628 600.774193 241.777777 600.774193 265.341926 600.774193 284.444444 581.363571 284.444444 557.419356 284.444444 533.475138 265.341926 514.064516 241.777777 514.064516 218.213628 514.064516 199.111111 533.475138 199.111111 557.419356Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="remind" unicode="&#59068;" d="M0 460.690763 0 285.975904C0 250.691957 28.657739 222 63.838605 222L228.9009 222 213.800267 228.264094 469.201726-27.669451C499.273171-57.803546 535.639639-42.646511 535.639639 0.024294L535.639639 746.642371C535.639639 789.160948 499.309939 804.507056 469.201726 774.336117L213.800267 518.402573 228.9009 524.666667 63.838605 524.666667C28.573201 524.666667 0 495.988777 0 460.690763ZM228.9009 482 237.750464 482 244.001534 488.264094 499.402993 744.197638C501.578012 746.37719 503.223142 747.547599 503.936853 747.833559 502.587712 747.293003 500.074389 747.191133 497.235991 748.390108 494.446571 749.568393 492.826063 751.363987 492.299426 752.612451 492.628553 751.832211 492.972973 749.774816 492.972973 746.642371L492.972973 0.024294C492.972973-3.146332 492.625939-5.221845 492.296619-6.001423 492.834735-4.727578 494.485777-2.907403 497.311223-1.729796 500.154871-0.544602 502.647469-0.657431 503.972905-1.192945 503.239477-0.896619 501.582121 0.285361 499.402993 2.469028L244.001534 258.402573 237.750464 264.666667 228.9009 264.666667 63.838605 264.666667C52.233293 264.666667 42.666667 274.244717 42.666667 285.975904L42.666667 460.690763C42.666667 472.459486 52.172352 482 63.838605 482L228.9009 482ZM821.045045 360.333333C821.045045 479.485463 730.531159 576.666667 618.090091 576.666667 606.308015 576.666667 596.756757 567.115407 596.756757 555.333333 596.756757 543.55126 606.308015 534 618.090091 534 706.262724 534 778.378379 456.572256 778.378379 360.333333 778.378379 264.094411 706.262724 186.666667 618.090091 186.666667 606.308015 186.666667 596.756757 177.115407 596.756757 165.333333 596.756757 153.55126 606.308015 144 618.090091 144 730.531159 144 821.045045 241.181203 821.045045 360.333333ZM1002.666667 368.706967C1002.666667 526.122513 905.044211 666.571596 756.28896 730.913547 745.475106 735.590924 732.916983 730.616327 728.239605 719.802474 723.562229 708.988621 728.536826 696.430497 739.350679 691.75312 872.873312 633.999819 960 508.650961 960 368.706967 960 235.822797 881.48423 115.77283 758.227616 54.432247 747.679578 49.18285 743.384179 36.376499 748.633577 25.828461 753.882974 15.280422 766.689325 10.985024 777.237363 16.234419 914.638133 84.614065 1002.666667 219.208966 1002.666667 368.706967Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="calendar" unicode="&#59071;" d="M128.194764-33.441442C85.742288-33.441442 51.2 1.591066 51.2 44.528049L51.2 744.936937 25.6 718.990991 896.131998 718.990991C938.35962 718.990991 972.8 684.005335 972.8 641.256676L972.8 57.36937C972.8 43.039819 984.26151 31.423424 998.4 31.423424 1012.53849 31.423424 1024 43.039819 1024 57.36937L1024 641.256676C1024 712.637922 966.662825 770.882883 896.131998 770.882883L25.6 770.882883C11.46151 770.882883 0 759.266487 0 744.936937L0 44.528049C0-27.060267 57.457637-85.333333 128.194764-85.333333L883.2-85.333333C897.33849-85.333333 908.8-73.716939 908.8-59.387388 908.8-45.057837 897.33849-33.441442 883.2-33.441442L128.194764-33.441442ZM281.6 641.153154C281.6 626.823603 293.06151 615.207206 307.2 615.207206 321.33849 615.207206 332.8 626.823603 332.8 641.153154L332.8 835.747748C332.8 850.077298 321.33849 861.693694 307.2 861.693694 293.06151 861.693694 281.6 850.077298 281.6 835.747748L281.6 641.153154ZM716.8 654.126127C716.8 639.796576 728.26151 628.180179 742.4 628.180179 756.53849 628.180179 768 639.796576 768 654.126127L768 848.720721C768 863.050271 756.53849 874.666667 742.4 874.666667 728.26151 874.666667 716.8 863.050271 716.8 848.720721L716.8 654.126127ZM332.8 485.477478C346.93849 485.477478 358.4 497.093873 358.4 511.423424 358.4 525.752973 346.93849 537.36937 332.8 537.36937L192 537.36937C177.86151 537.36937 166.4 525.752973 166.4 511.423424 166.4 497.093873 177.86151 485.477478 192 485.477478L332.8 485.477478ZM614.4 485.477478C628.53849 485.477478 640 497.093873 640 511.423424 640 525.752973 628.53849 537.36937 614.4 537.36937L473.6 537.36937C459.46151 537.36937 448 525.752973 448 511.423424 448 497.093873 459.46151 485.477478 473.6 485.477478L614.4 485.477478ZM870.4 485.477478C884.53849 485.477478 896 497.093873 896 511.423424 896 525.752973 884.53849 537.36937 870.4 537.36937L729.6 537.36937C715.46151 537.36937 704 525.752973 704 511.423424 704 497.093873 715.46151 485.477478 729.6 485.477478L870.4 485.477478ZM332.8 329.801803C346.93849 329.801803 358.4 341.418197 358.4 355.747748 358.4 370.077297 346.93849 381.693694 332.8 381.693694L192 381.693694C177.86151 381.693694 166.4 370.077297 166.4 355.747748 166.4 341.418197 177.86151 329.801803 192 329.801803L332.8 329.801803ZM614.4 329.801803C628.53849 329.801803 640 341.418197 640 355.747748 640 370.077297 628.53849 381.693694 614.4 381.693694L473.6 381.693694C459.46151 381.693694 448 370.077297 448 355.747748 448 341.418197 459.46151 329.801803 473.6 329.801803L614.4 329.801803ZM870.4 329.801803C884.53849 329.801803 896 341.418197 896 355.747748 896 370.077297 884.53849 381.693694 870.4 381.693694L729.6 381.693694C715.46151 381.693694 704 370.077297 704 355.747748 704 341.418197 715.46151 329.801803 729.6 329.801803L870.4 329.801803ZM332.8 174.126127C346.93849 174.126127 358.4 185.742522 358.4 200.072073 358.4 214.401621 346.93849 226.018018 332.8 226.018018L192 226.018018C177.86151 226.018018 166.4 214.401621 166.4 200.072073 166.4 185.742522 177.86151 174.126127 192 174.126127L332.8 174.126127ZM614.4 174.126127C628.53849 174.126127 640 185.742522 640 200.072073 640 214.401621 628.53849 226.018018 614.4 226.018018L473.6 226.018018C459.46151 226.018018 448 214.401621 448 200.072073 448 185.742522 459.46151 174.126127 473.6 174.126127L614.4 174.126127ZM870.4 174.126127C884.53849 174.126127 896 185.742522 896 200.072073 896 214.401621 884.53849 226.018018 870.4 226.018018L729.6 226.018018C715.46151 226.018018 704 214.401621 704 200.072073 704 185.742522 715.46151 174.126127 729.6 174.126127L870.4 174.126127Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="qrcode" unicode="&#59049;"
+				   d="M390.095238 825.756097 365.714285 850.211382 365.714285 507.837397 390.095238 532.292683 48.761905 532.292683 73.142857 507.837397 73.142857 850.211382 48.761905 825.756097 390.095238 825.756097ZM24.380952 874.666667 24.380952 850.211382 24.380952 507.837397 24.380952 483.382114 48.761905 483.382114 390.095238 483.382114 414.47619 483.382114 414.47619 507.837397 414.47619 850.211382 414.47619 874.666667 390.095238 874.666667 48.761905 874.666667 24.380952 874.666667ZM390.095238 238.829269 365.714285 263.284553 365.714285-79.089431 390.095238-54.634146 97.666649-54.634146C84.112298-54.634146 73.142857-43.635025 73.142857-30.035586L73.142857 263.284553 48.761905 238.829269 390.095238 238.829269ZM24.380952 287.739838 24.380952 263.284553 24.380952-30.035586C24.380952-70.651334 57.185576-103.544715 97.666649-103.544715L390.095238-103.544715 414.47619-103.544715 414.47619-79.089431 414.47619 263.284553 414.47619 287.739838 390.095238 287.739838 48.761905 287.739838 24.380952 287.739838ZM926.33335 825.756097C939.887701 825.756097 950.857143 814.756977 950.857143 801.157538L950.857143 507.837397 975.238095 532.292683 633.904762 532.292683 658.285715 507.837397 658.285715 850.211382 633.904762 825.756097 926.33335 825.756097ZM609.52381 874.666667 609.52381 850.211382 609.52381 507.837397 609.52381 483.382114 633.904762 483.382114 975.238095 483.382114 999.619049 483.382114 999.619049 507.837397 999.619049 801.157538C999.619049 841.773285 966.814423 874.666667 926.33335 874.666667L633.904762 874.666667 609.52381 874.666667ZM975.238095 238.829269 950.857143 263.284553 950.857143-79.089431 975.238095-54.634146 633.904762-54.634146 658.285715-79.089431 658.285715 263.284553 633.904762 238.829269 975.238095 238.829269ZM609.52381 287.739838 609.52381 263.284553 609.52381-79.089431 609.52381-103.544715 633.904762-103.544715 975.238095-103.544715 999.619049-103.544715 999.619049-79.089431 999.619049 263.284553 999.619049 287.739838 975.238095 287.739838 633.904762 287.739838 609.52381 287.739838ZM487.619049 507.559642C487.619049 494.053361 498.534771 483.104356 512 483.104356 525.465229 483.104356 536.380951 494.053361 536.380951 507.559642L536.380951 776.845529C536.380951 790.351809 525.465229 801.300813 512 801.300813 498.534771 801.300813 487.619049 790.351809 487.619049 776.845529L487.619049 507.559642ZM585.142857 214.628617C585.142857 228.134897 574.227134 239.0839 560.761905 239.0839 547.296676 239.0839 536.380951 228.134897 536.380951 214.628617L536.380951-79.089431C536.380951-92.595712 547.296676-103.544715 560.761905-103.544715 574.227134-103.544715 585.142857-92.595712 585.142857-79.089431L585.142857 214.628617ZM487.619049 116.552845C487.619049 130.059125 476.703324 141.00813 463.238095 141.00813 449.772866 141.00813 438.857143 130.059125 438.857143 116.552845L438.857143-79.089431C438.857143-92.595712 449.772866-103.544715 463.238095-103.544715 476.703324-103.544715 487.619049-92.595712 487.619049-79.089431L487.619049 116.552845ZM999.619049 361.105692C1013.084275 361.105692 1024 372.054694 1024 385.560975 1024 399.067255 1013.084275 410.01626 999.619049 410.01626L24.380952 410.01626C10.915724 410.01626 0 399.067255 0 385.560975 0 372.054694 10.915724 361.105692 24.380952 361.105692L999.619049 361.105692Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="attachment" unicode="&#59072;" d="M472.153474 776.771028 92.638513 378.249257C-3.525822 277.268836-2.288327 115.375923 95.536728 15.836811L99.321659 11.985562C197.267042-87.675987 357.082027-88.489975 455.906639 10.088378L955.925037 508.860785C1034.944759 587.683597 1036.587465 716.831798 959.634413 797.38661L941.34458 779.914551 923.054748 762.442492 927.277389 758.022212 945.567221 775.494271 963.857054 792.96633C886.268179 874.186725 760.692811 873.350145 683.951435 791.055095L209.92702 282.726144C171.75695 241.793754 173.954266 177.767398 214.90487 139.580341L226.383979 128.8759C267.274317 90.745043 331.360614 92.965664 369.461105 133.823439L738.140738 529.18394C747.66794 539.400614 747.109013 555.406187 736.892339 564.933391 726.675665 574.460593 710.670091 573.901666 701.142889 563.684992L332.463258 168.324491C313.421342 147.904535 281.346492 146.793129 260.88503 165.873747L249.405922 176.578189C228.898628 195.701551 227.799923 227.7161 246.924868 248.225092L720.949284 756.554043C777.863249 817.586798 869.791012 818.199218 927.277389 758.022212 950.573468 733.635768 987.153133 768.579886 963.857054 792.96633L959.634413 797.38661C936.338334 821.773054 899.758669 786.828935 923.054748 762.442492 980.99271 701.792763 979.749843 604.079622 920.198449 544.676623L420.180051 45.904215C341.242127-32.837003 213.662948-32.187202 135.402204 47.4448L131.617273 51.296051C52.922438 131.369749 51.922852 262.13863 129.272687 343.362287L508.787648 741.884058C518.421419 752.000306 518.030293 768.010859 507.914046 777.64463 497.797798 787.2784 481.787245 786.887276 472.153474 776.771028L472.153474 776.771028Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="discount" unicode="&#59077;" d="M855.903027 334.599537 457.002421-37.283098C427.000478-65.36995 378.630415-65.004819 349.185589-36.452262L87.045522 217.744166C58.072052 245.839652 57.513624 292.117092 85.796115 321.028083L565.999763 811.902924 548.571428 804.571428 877.886948 804.571428C918.232493 804.571428 950.857143 771.868927 950.857143 731.252157L950.857143 414.47619C950.857143 401.010963 961.772866 390.095238 975.238095 390.095238 988.703324 390.095238 999.619049 401.010963 999.619049 414.47619L999.619049 731.252157C999.619049 798.773401 945.189001 853.333333 877.886948 853.333333L548.571428 853.333333C542.012309 853.333333 535.729847 850.69052 531.143093 846.001838L50.939447 355.126999C3.783193 306.922829 4.715564 229.656339 53.100125 182.737975L315.240192-71.458453C363.379925-118.139405 441.35376-118.728006 490.290377-72.915004L889.153871 298.932958C899.002925 308.114925 899.543706 323.542615 890.361739 333.391669 881.179772 343.240723 865.752081 343.781504 855.903027 334.599537L855.903027 334.599537ZM743.619049 487.619049C804.212574 487.619049 853.333333 536.739806 853.333333 597.333333 853.333333 657.92686 804.212574 707.047619 743.619049 707.047619 683.025521 707.047619 633.904762 657.92686 633.904762 597.333333 633.904762 536.739806 683.025521 487.619049 743.619049 487.619049L743.619049 487.619049ZM743.619049 536.380951C709.955977 536.380951 682.666667 563.670263 682.666667 597.333333 682.666667 630.996403 709.955977 658.285714 743.619049 658.285714 777.282118 658.285714 804.571428 630.996403 804.571428 597.333333 804.571428 563.670263 777.282118 536.380951 743.619049 536.380951L743.619049 536.380951Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="refresh" unicode="&#59050;"
+				   d="M512 896C229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 761.325865-128 973.201958 51.440486 1016.153097 294.235322 1018.151127 305.529818 1019.771663 316.910818 1021.010022 328.364361 1022.492753 342.078084 1012.577574 354.397246 998.863851 355.879979 985.150125 357.362709 972.830963 347.447531 971.348233 333.733807 970.230573 323.396631 968.768273 313.126908 966.965602 302.936738 928.217702 83.902033 736.992706-78.048781 512-78.048781 256.817504-78.048781 49.951219 128.817504 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 698.044361 846.048781 863.703281 735.083433 936.293348 567.2457 941.768939 554.585421 956.470965 548.761079 969.131243 554.236668 981.791522 559.712258 987.615863 574.414283 982.140273 587.074562 901.710383 773.038993 718.143277 896 512 896ZM958.442797 545.753446 983.418406 570.729056 724.292683 570.729056C710.499034 570.729056 699.317073 559.547093 699.317073 545.753446 699.317073 531.959797 710.499034 520.777837 724.292683 520.777837L983.418406 520.777837C997.212055 520.777837 1008.394016 531.959797 1008.394016 545.753446L1008.394016 821.073171C1008.394016 834.866819 997.212055 846.048781 983.418406 846.048781 969.624757 846.048781 958.442797 834.866819 958.442797 821.073171L958.442797 545.753446Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="service" unicode="&#59079;" d="M537.676629 323.222984C667.27978 323.222984 772.259879 429.227278 772.259879 559.887668 772.259879 690.548058 667.27978 796.552352 537.676629 796.552352 408.073477 796.552352 303.093381 690.548058 303.093381 559.887668 303.093381 429.227278 408.073477 323.222984 537.676629 323.222984L537.676629 323.222984ZM537.676629 365.695418C431.623156 365.695418 345.565814 452.592345 345.565814 559.887668 345.565814 667.182992 431.623156 754.079918 537.676629 754.079918 643.730103 754.079918 729.787446 667.182992 729.787446 559.887668 729.787446 452.592345 643.730103 365.695418 537.676629 365.695418L537.676629 365.695418ZM1001.664066-128.000004C1001.664066 144.568772 782.755985 365.612541 512.615542 365.612541 242.4751 365.612541 23.567019 144.568772 23.567019-128.000004L66.039452-128.000004C66.039452 121.203706 266.024779 323.140108 512.615542 323.140108 759.206306 323.140108 959.191633 121.203706 959.191633-128.000004L1001.664066-128.000004 1001.664066-128.000004ZM233.809816 323.140108C281.846495 323.140108 320.7039 362.376611 320.7039 410.674759 320.7039 458.972904 281.846495 498.209407 233.809816 498.209407 185.773138 498.209407 146.915732 458.972904 146.915732 410.674759 146.915732 362.376611 185.773138 323.140108 233.809816 323.140108L233.809816 323.140108ZM233.809816 365.612541C209.322817 365.612541 189.388166 385.741678 189.388166 410.674759 189.388166 435.607837 209.322817 455.736974 233.809816 455.736974 258.296816 455.736974 278.231467 435.607837 278.231467 410.674759 278.231467 385.741678 258.296816 365.612541 233.809816 365.612541L233.809816 365.612541ZM830.543236 375.712694C838.435011 378.786592 856.420583 383.749139 869.738118 388.586154 871.10678 389.083035 871.10678 389.083035 872.477119 389.57965 883.299946 393.500215 894.907365 397.647104 906.516385 401.755966 913.482439 404.221512 918.897025 406.125073 921.981649 407.204015L936.206384 412.179557 936.206384 427.249367 936.206384 613.713707 936.206384 626.991352 924.26945 632.805597C922.053561 633.884913 918.144366 635.80435 913.109699 638.302753 904.720115 642.466 896.333421 646.689268 888.525544 650.706884 886.929012 651.529269 886.929012 651.529269 885.338411 652.352304 876.494909 656.933719 869.177034 660.861493 863.892556 663.889351 861.160872 665.45453 859.071734 666.724256 857.78666 667.589638 859.888255 666.174401 860.115079 665.983089 862.214218 661.083781 804.257697 796.352093 670.564953 896 531.990097 896 337.403916 896 179.744666 736.802611 179.744666 540.525212 179.744666 517.409894 181.933686 494.566081 186.246239 472.214878L227.949506 480.261313C224.147939 499.964162 222.2171 520.113706 222.2171 540.525212 222.2171 713.437545 360.953596 853.527567 531.990097 853.527567 652.531844 853.527567 771.567984 764.803961 823.17426 644.356877 827.282349 634.768751 830.445679 632.956251 865.801418 614.640058 867.446153 613.789015 867.446153 613.789015 869.092686 612.940874 877.10527 608.817925 885.669071 604.505469 894.229978 600.257204 899.365609 597.708699 903.366644 595.744168 905.670886 594.621817L893.733951 613.713707 893.733951 427.249367 907.958689 447.294716C904.827575 446.199511 899.364613 444.278941 892.345253 441.794531 880.645251 437.653465 868.943646 433.472926 858.011386 429.51272 856.62458 429.010138 856.62458 429.010138 855.238611 428.506975 841.640096 423.567905 830.384497 419.381635 822.125588 416.164737 817.286018 414.279693 813.48815 412.732937 810.712137 411.50216 808.902954 410.700038 807.434242 409.994724 806.123281 409.265332 804.750891 408.495451 804.750891 408.495451 802.39627 406.780077 797.915841 404.674495 788.070803 396.94891 795.378771 383.232937 802.686739 369.516964 826.258515 374.043767 830.543236 375.712694Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="print" unicode="&#59081;" d="M24.380952 630.113822 902.094615 630.113822C942.428977 630.113822 975.238095 597.096629 975.238095 556.514225L975.238095 116.552845 999.619049 141.00813 853.333333 141.00813 877.714285 116.552845 877.714285 214.373984 877.714285 238.829269 853.333333 238.829269 170.666667 238.829269 146.285714 238.829269 146.285714 214.373984 146.285714 116.552845 170.666667 141.00813 121.955642 141.00813C81.590725 141.00813 48.761905 174.028132 48.761905 214.607725L48.761905 654.569105 24.380952 630.113822 24.380952 630.113822ZM24.380952 679.02439 0 679.02439 0 654.569105 0 214.607725C0 147.045771 54.630068 92.097562 121.955642 92.097562L170.666667 92.097562 195.047619 92.097562 195.047619 116.552845 195.047619 214.373984 170.666667 189.918699 853.333333 189.918699 828.952382 214.373984 828.952382 116.552845 828.952382 92.097562 853.333333 92.097562 999.619049 92.097562 1024 92.097562 1024 116.552845 1024 556.514225C1024 624.07337 969.395277 679.02439 902.094615 679.02439L24.380952 679.02439 24.380952 679.02439ZM755.809523-103.544715 780.190477-79.089431 243.809523-79.089431 268.190477-103.544715 268.190477 119.674797C268.190477 133.181077 257.274752 144.130082 243.809523 144.130082 230.344297 144.130082 219.428572 133.181077 219.428572 119.674797L219.428572-103.544715C219.428572-117.050995 230.344297-128 243.809523-128L780.190477-128C793.655703-128 804.571428-117.050995 804.571428-103.544715L804.571428 119.674797C804.571428 133.181077 793.655703 144.130082 780.190477 144.130082 766.725248 144.130082 755.809523 133.181077 755.809523 119.674797L755.809523-103.544715ZM207.238095 458.926829 524.190477 458.926829 524.190477 507.837397 207.238095 507.837397 207.238095 458.926829 207.238095 458.926829ZM219.428572 654.569105 219.428572 850.211382 195.047619 825.756097 828.952382 825.756097 804.571428 850.211382 804.571428 654.569067 853.333333 654.569067 853.333333 850.211382 853.333333 874.666667 828.952382 874.666667 195.047619 874.666667 170.666667 874.666667 170.666667 850.211382 170.666667 654.569105 219.428572 654.569105 219.428572 654.569105Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="rfq" unicode="&#59051;"
+				   d="M797.970974 404.10381 761.457982 404.926466 951.72983 168.907697 970.333549 207.645338 850.968469 207.645338 827.095452 207.645338 827.095452 183.831383 827.095452-80.372094 850.968471-56.55814 683.857357-56.558118 707.73037-80.372073 707.73037 86.325602C707.73037 99.477685 697.042057 110.139556 683.857355 110.139556 670.672651 110.139556 659.984337 99.477685 659.984337 86.325602L659.984337-80.372073 659.984337-104.186022 683.85735-104.186025 850.968465-104.186046 874.841485-104.18605 874.841485-80.372094 874.841485 183.831383 850.968469 160.017431 970.333549 160.017431 1020.166487 160.017431 988.937265 198.755072 798.665419 434.773843 780.898613 456.812307 762.152427 435.596499 552.503424 198.328337C543.785389 188.46179 544.736282 173.413493 554.6273 164.717026 564.518319 156.020561 579.603938 156.969101 588.321973 166.835648L797.970974 404.10381ZM153.857145-32.744186C107.228929-32.744186 69.079365 6.613809 69.079365 55.513474L69.079365 872.186047 45.206349 848.372093 748.087665 848.372093C794.753677 848.372093 833.015872 808.847828 833.015872 759.895934L833.015872 333.407761 880.761905 333.407761 880.761905 759.895934C880.761905 834.786936 821.503465 896 748.087665 896L45.206349 896 21.333333 896 21.333333 872.186047 21.333333 55.513474C21.333333-19.338285 80.493186-80.372094 153.857145-80.372094L687.308156-80.372094 687.308156-32.744186 153.857145-32.744186ZM735.286219 514.976745C748.470923 514.976745 759.159236 525.638613 759.159236 538.790699 759.159236 551.942782 748.470923 562.604651 735.286219 562.604651L189.399822 562.604651C176.215119 562.604651 165.526806 551.942782 165.526806 538.790699 165.526806 525.638613 176.215119 514.976745 189.399822 514.976745L735.286219 514.976745ZM737.956448 657.860465C751.14115 657.860465 761.829463 668.522336 761.829463 681.674419 761.829463 694.826502 751.14115 705.488372 737.956448 705.488372L192.070049 705.488372C178.885347 705.488372 168.197034 694.826502 168.197034 681.674419 168.197034 668.522336 178.885347 657.860465 192.070049 657.860465L737.956448 657.860465Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="box" unicode="&#59083;" d="M58.18714 634.486153 489.750985 389.933308C497.230148 385.695115 506.385346 385.695115 513.86451 389.933308L945.428356 634.486153C962.456593 644.135488 961.814227 668.883315 944.308329 677.636265L512.744484 893.418187C505.859648 896.860604 497.755846 896.860604 490.871012 893.418187L59.307167 677.636265C41.801269 668.883315 41.158901 644.135488 58.18714 634.486153L58.18714 634.486153ZM82.300665 677.039433 81.180638 633.889321 512.744484 849.671244 490.871012 849.671244 922.434857 633.889321 921.314829 677.039433 489.750985 432.486588 513.86451 432.486588 82.300665 677.039433 82.300665 677.039433ZM477.352463 391.070302 477.352463-78.793958C477.352463-97.514057 497.526411-109.2927 513.828779-100.090807L974.163548 159.745715C981.846246 164.082223 986.597801 172.22048 986.597801 181.042564L986.597801 497.522716C986.597801 511.028996 975.648796 521.978001 962.142515 521.978001 948.636235 521.978001 937.687232 511.028996 937.687232 497.522716L937.687232 181.042564 950.121483 202.339411 489.786716-57.497111 526.263031-78.793958 526.263031 391.070302C526.263031 404.576582 515.314029 415.525585 501.807748 415.525585 488.301468 415.525585 477.352463 404.576582 477.352463 391.070302L477.352463 391.070302ZM514.421935-57.842987 82.858091 201.993534 94.699187 181.042564 94.699187 641.377331C94.699187 654.883612 83.750183 665.832617 70.243903 665.832617 56.737622 665.832617 45.788618 654.883612 45.788618 641.377331L45.788618 181.042564C45.788618 172.465658 50.281834 164.515614 57.629714 160.091593L489.193559-99.74493C500.764461-106.711554 515.792096-102.979049 522.758718-91.408147 529.725342-79.837246 525.992838-64.809611 514.421935-57.842987L514.421935-57.842987ZM172.745454 447.781559 316.60007 361.468791C328.181609 354.519868 343.203518 358.275345 350.152444 369.856885 357.101367 381.438423 353.34589 396.460333 341.76435 403.409259L197.909735 489.722027C186.328194 496.67095 171.306285 492.915473 164.357361 481.333933 157.408437 469.752393 161.163914 454.730483 172.745454 447.781559L172.745454 447.781559Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="process" unicode="&#59086;" d="M965.426743 354.163614C955.038827 556.394249 811.004092 726.530556 615.449711 771.549827 601.95866 774.65565 588.504235 766.236759 585.398411 752.745707 582.292589 739.254655 590.711479 725.80023 604.20253 722.694407 778.021961 682.678816 906.125274 531.360979 915.359418 351.591821 916.0696 337.766112 927.853267 327.133875 941.678976 327.844055 955.504687 328.554236 966.136924 340.337903 965.426743 354.163614L965.426743 354.163614ZM386.693427 765.047806C195.197668 709.223966 61.059829 533.05174 61.059829 330.591454 61.059829 286.486225 67.378292 243.199108 79.687136 201.705457 83.62428 188.433173 97.575277 180.865549 110.847561 184.802692 124.119844 188.739836 131.68747 202.690833 127.750327 215.963117 116.810772 252.840832 111.193162 291.326477 111.193162 330.591454 111.193162 510.619396 230.48234 667.289878 400.724023 716.917841 414.014746 720.792283 421.648149 734.707399 417.773707 747.998121 413.899266 761.288844 399.984149 768.922248 386.693427 765.047806L386.693427 765.047806ZM196.356828 7.892425C280.412745-74.736506 393.28759-121.894018 513.545299-121.894018 643.321289-121.894018 764.304599-66.930765 849.557581 27.536962 858.832625 37.814519 858.019927 53.665035 847.742372 62.940077 837.464815 72.215121 821.6143 71.402426 812.339255 61.124868 736.494948-22.917229 628.982336-71.760685 513.545299-71.760685 406.569346-71.760685 306.273973-29.858699 231.501677 43.644218 221.62909 53.349199 205.758337 53.213329 196.053355 43.340745 186.348373 33.46816 186.484242 17.597406 196.356828 7.892425L196.356828 7.892425ZM498.280341 610.823932C571.138502 610.823932 630.201709 669.88714 630.201709 742.745299 630.201709 815.603459 571.138502 874.666667 498.280341 874.666667 425.422182 874.666667 366.358974 815.603459 366.358974 742.745299 366.358974 669.88714 425.422182 610.823932 498.280341 610.823932L498.280341 610.823932ZM498.280341 660.957265C453.110059 660.957265 416.492307 697.575015 416.492307 742.745299 416.492307 787.915583 453.110059 824.533333 498.280341 824.533333 543.450626 824.533333 580.068375 787.915583 580.068375 742.745299 580.068375 697.575015 543.450626 660.957265 498.280341 660.957265L498.280341 660.957265ZM131.921367-30.304273C204.779527-30.304273 263.842735 28.758935 263.842735 101.617094 263.842735 174.475253 204.779527 233.538462 131.921367 233.538462 59.063208 233.538462 0 174.475253 0 101.617094 0 28.758935 59.063208-30.304273 131.921367-30.304273L131.921367-30.304273ZM131.921367 19.82906C86.751084 19.82906 50.133333 56.44681 50.133333 101.617094 50.133333 146.787377 86.751084 183.405129 131.921367 183.405129 177.091651 183.405129 213.709402 146.787377 213.709402 101.617094 213.709402 56.44681 177.091651 19.82906 131.921367 19.82906L131.921367 19.82906ZM895.169231 0.225641C968.02739 0.225641 1027.090598 59.288849 1027.090598 132.147008 1027.090598 205.005169 968.02739 264.068375 895.169231 264.068375 822.311072 264.068375 763.247863 205.005169 763.247863 132.147008 763.247863 59.288849 822.311072 0.225641 895.169231 0.225641L895.169231 0.225641ZM895.169231 50.358974C849.998946 50.358974 813.381197 86.976725 813.381197 132.147008 813.381197 177.317293 849.998946 213.935042 895.169231 213.935042 940.339516 213.935042 976.957265 177.317293 976.957265 132.147008 976.957265 86.976725 940.339516 50.358974 895.169231 50.358974L895.169231 50.358974Z"  horiz-adv-x="1028" />
+			<glyph glyph-name="search" unicode="&#59052;"
+				   d="M1001.526404-95.699618C999.922771-90.822379 999.922771-90.822379 998.661741-88.531443 997.556333-86.547938 996.293839-84.724943 994.702325-82.653549 992.500075-79.787264 989.423708-76.169135 985.358477-71.619563 978.223881-63.634933 967.82403-52.546074 954.04227-38.18551 932.495573-15.733901 910.909628 6.315748 858.479859 59.608002 806.561909 112.380015 784.782022 134.629598 763.425645 156.886537 750.035742 170.841067 739.986204 181.558483 733.331893 189.006633 730.0273 192.705455 727.65239 195.498419 726.365602 197.171678 727.222236 195.561131 727.222236 195.561131 728.57702 191.58121 730.685899 184.086517 730.685899 184.086517 721.610157 166.825982 803.853596 246.08394 851.33145 356.012949 851.33145 473.600226 851.33145 706.88518 665.530044 896 436.332393 896 207.134741 896 21.333333 706.88518 21.333333 473.600226 21.333333 240.315273 207.134741 51.200452 436.332393 51.200452 441.356706 51.200452 446.556279 51.43584 452.347883 51.88233 456.487002 52.201425 460.079727 52.545845 466.651669 53.223196 479.958906 54.594731 484.804847 54.985431 490.397372 54.985442 499.896397 54.985459 514.964663 58.353071 537.39015 64.570334 540.021178 65.299761 542.719546 66.061295 545.476431 66.851597 553.976567 69.288288 562.667765 71.891529 571.097184 74.494202 576.160226 76.057472 580.026436 77.278086 582.233225 77.986769 595.480279 82.240892 602.830912 96.619906 598.651326 110.103196 594.471738 123.586485 580.344653 131.068205 567.097598 126.81408 565.058735 126.159326 561.367413 124.993926 556.494825 123.489461 548.364858 120.979245 539.986116 118.469596 531.839533 116.134255 529.217662 115.382658 526.657771 114.660205 524.170112 113.970524 506.936476 109.192655 493.480702 106.185421 490.397278 106.185414 482.458716 106.185399 476.720548 105.722765 461.583853 104.162671 455.416051 103.526976 452.140828 103.212992 448.548723 102.936068 443.933724 102.580286 439.960704 102.400425 436.332393 102.400425 234.916275 102.400425 71.63625 268.592237 71.63625 473.600226 71.63625 678.608215 234.916275 844.800027 436.332393 844.800027 637.74851 844.800027 801.028533 678.608215 801.028533 473.600226 801.028533 370.224557 759.336083 273.690923 687.025254 204.005013 677.769918 186.436971 677.769918 186.436971 679.976768 178.37293 681.566101 173.694818 681.566101 173.694818 682.808947 171.449702 683.910231 169.488343 685.170219 167.673308 686.754421 165.613308 688.964348 162.739657 692.047349 159.113956 696.115554 154.560425 703.261474 146.562018 713.66454 135.467582 727.438434 121.112866 749.001325 98.640706 770.84669 76.324235 822.916311 23.398054 875.194278-29.7399 896.716879-51.724843 918.057933-73.962174 931.455439-87.922347 941.502012-98.634524 948.144469-106.068378 951.440527-109.757135 953.805218-112.538259 955.077419-114.194061 954.139053-112.441707 954.139053-112.441707 952.75811-108.249822 950.686453-100.172693 950.686453-100.172693 960.850534-82.849743 950.24269-91.977788 948.913429-108.130236 957.881542-118.927251 966.849655-129.724265 982.719104-131.077231 993.326948-121.949188 1003.683753-104.332838 1003.683753-104.332838 1001.526404-95.699618Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="beauty" unicode="&#59090;" d="M743.619048 384.000002 743.619048-103.619045 767.999999-79.238091 402.436749-79.238091C361.966454-79.238091 329.142858-46.460515 329.142858-6.114008L329.142858 384.000002 304.761906 359.619051 572.952382 359.619051C586.417608 359.619051 597.333333 370.534773 597.333333 384.000002 597.333333 397.465231 586.417608 408.380953 572.952382 408.380953L304.761906 408.380953 280.380953 408.380953 280.380953 384.000002 280.380953-6.114008C280.380953-73.406298 335.051301-127.999996 402.436749-127.999996L767.999999-127.999996 792.38095-127.999996 792.38095-103.619045 792.38095 384.000002C792.38095 397.465231 781.465228 408.380953 767.999999 408.380953 754.53477 408.380953 743.619048 397.465231 743.619048 384.000002L743.619048 384.000002ZM670.476189 505.904763 670.476189 774.095239C669.24573 789.275639 665.564723 807.656675 657.506525 826.550542 641.134018 864.938768 612.120891 888.58573 570.10368 883.642529 565.389728 883.087946 560.65841 882.167046 555.912998 880.899285 526.12375 872.940941 496.579123 851.899039 467.116168 821.874157 454.583228 809.102185 442.894214 795.500978 432.311201 781.900938 425.929992 773.700562 421.280327 767.243813 418.664001 763.376931L414.476191 757.187423 414.476191 749.714286 414.476191 493.424202 463.238095 493.424202 463.238095 749.714286 459.050285 736.051642C461.092638 739.070203 465.120136 744.66298 470.794381 751.95485 480.303791 764.175222 490.805099 776.394427 501.920188 787.721506 525.80899 812.065924 548.994795 828.579025 568.498592 833.789561 571.02992 834.465817 573.465015 834.939783 575.801081 835.214614 592.608825 837.191996 603.871353 828.012544 612.653661 807.420878 615.935464 799.726114 618.404081 791.235777 620.111257 782.711012 621.128998 777.628946 621.64641 773.813835 621.806333 771.978643L621.714284 505.904763 670.476189 505.904763 670.476189 505.904763ZM774.15806 412.245448 688.824727 509.769256C684.195073 515.060287 677.506745 518.09524 670.476189 518.09524L390.095239 518.09524C382.57151 518.09524 375.469202 514.621616 370.85008 508.682745L285.516747 398.968459C277.249896 388.339652 279.164641 373.021694 289.793449 364.754844 300.422256 356.487994 315.740214 358.402737 324.007064 369.031546L409.340397 478.74583 390.095239 469.333335 670.476189 469.333335 652.127654 477.659317 737.460987 380.135509C746.327901 370.001892 761.730875 368.975027 771.864492 377.841941 781.998109 386.708857 783.024974 402.111831 774.15806 412.245448L774.15806 412.245448Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="electrical" unicode="&#59092;" d="M370.99187 125.398374 670.699187 125.398374 645.723578 150.373984 645.723578 50.471546 670.699187 75.447155 370.99187 75.447155 395.967479 50.471546 395.967479 150.373984 370.99187 125.398374 370.99187 125.398374ZM370.99187 175.349594 346.01626 175.349594 346.01626 150.373984 346.01626 50.471546 346.01626 25.495936 370.99187 25.495936 670.699187 25.495936 695.674797 25.495936 695.674797 50.471546 695.674797 150.373984 695.674797 175.349594 670.699187 175.349594 370.99187 175.349594 370.99187 175.349594ZM271.089431 649.886178 271.089431 849.691057 246.113822 824.715447 395.967479 824.715447 370.99187 849.691057 370.99187 649.886178 420.943089 649.886178 420.943089 849.691057 420.943089 874.666667 395.967479 874.666667 246.113822 874.666667 221.138211 874.666667 221.138211 849.691057 221.138211 649.886178 271.089431 649.886178 271.089431 649.886178ZM670.699187 649.886178 670.699187 849.691057 645.723578 824.715447 795.577235 824.715447 770.601626 849.691057 770.601626 649.886178 820.552845 649.886178 820.552845 849.691057 820.552845 874.666667 795.577235 874.666667 645.723578 874.666667 620.747968 874.666667 620.747968 849.691057 620.747968 649.886178 670.699187 649.886178 670.699187 649.886178ZM518.451452 612.422765 920.455262 612.422765 923.213357 612.575522C937.807279 614.197069 941.097152 612.155377 942.987091 604.637148 945.984582 592.713041 943.254669 571.543893 934.89696 544.5113 921.442901 500.99481 893.19792 443.288753 874.363055 413.466882 860.952322 392.233222 840.537295 366.549649 814.418007 337.567452 802.468169 324.307804 789.457762 310.505796 775.552122 296.284098 749.051078 269.180717 720.601165 241.853303 692.145451 215.699977 682.182899 206.543507 672.935959 198.19219 664.645611 190.818112 659.693062 186.412934 656.176173 183.326396 654.335411 181.729961L670.699187 187.837397 520.845527 187.837397 520.845527 137.886178 670.699187 137.886178 680.020811 137.886178 687.062963 143.993617C689.056909 145.722903 692.730099 148.946615 697.843661 153.495012 706.330161 161.043561 715.777427 169.575804 725.947095 178.92263 755.012011 205.635868 784.082726 233.559593 811.267603 261.362347 825.625463 276.046545 839.095669 290.336326 851.523968 304.126878 879.378679 335.034718 901.420233 362.764576 916.596256 386.79328 937.611232 420.066993 967.7329 481.607223 982.619403 529.756881 993.455917 564.807055 997.202187 593.857542 991.43111 616.815046 983.167678 649.687211 956.096139 666.487779 917.697167 662.221226L920.455262 662.373984 518.451452 662.373984 518.451452 612.422765 518.451452 612.422765ZM519.564585 662.373984 117.560772 662.373984 120.318867 662.221226C81.919896 666.487779 54.848356 649.687211 46.584924 616.815046 40.813847 593.857542 44.560117 564.807055 55.396632 529.756881 70.283135 481.607223 100.404802 420.066993 121.419778 386.79328 136.595803 362.764576 158.637355 335.034718 186.492066 304.126878 198.920365 290.336326 212.39057 276.046545 226.748431 261.362347 253.933308 233.559593 283.004023 205.635868 312.068939 178.92263 322.238607 169.575804 331.685873 161.043561 340.172373 153.495012 345.285937 148.946615 348.959125 145.722903 350.953073 143.993617L357.995223 137.886178 367.316847 137.886178 542.146116 137.886178 542.146116 187.837397 367.316847 187.837397 383.680623 181.729961C381.839861 183.326396 378.322972 186.412934 373.370423 190.818112 365.080075 198.19219 355.833135 206.543507 345.870583 215.699977 317.414869 241.853303 288.964958 269.180717 262.463913 296.284098 248.558272 310.505796 235.547866 324.307804 223.598028 337.567452 197.47874 366.549649 177.063713 392.233222 163.65298 413.466882 144.818114 443.288753 116.573134 500.99481 103.119074 544.5113 94.761367 571.543893 92.031452 592.713041 95.028944 604.637148 96.918883 612.155377 100.208756 614.197069 114.802678 612.575522L117.560772 612.422765 519.564585 612.422765 519.564585 662.373984 519.564585 662.373984ZM395.967479 37.98374 395.967479-99.382114C395.967479-113.175763 407.14944-124.357724 420.943089-124.357724 434.736738-124.357724 445.918699-113.175763 445.918699-99.382114L445.918699 37.98374C445.918699 51.777389 434.736738 62.959349 420.943089 62.959349 407.14944 62.959349 395.967479 51.777389 395.967479 37.98374L395.967479 37.98374ZM595.772358 37.98374 595.772358-99.382114C595.772358-113.175763 606.954319-124.357724 620.747968-124.357724 634.541615-124.357724 645.723578-113.175763 645.723578-99.382114L645.723578 37.98374C645.723578 51.777389 634.541615 62.959349 620.747968 62.959349 606.954319 62.959349 595.772358 51.777389 595.772358 37.98374L595.772358 37.98374Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="selected" unicode="&#59053;"
+				   d="M464.247574 218.512156C474.214622 209.350991 489.665824 209.798411 499.086059 219.520971L798.905035 528.962102C808.503379 538.868489 808.253662 554.680199 798.347275 564.278544 788.44089 573.87689 772.62918 573.627172 763.030833 563.720785L463.211858 254.279654 498.050342 255.288469 316.608839 422.059538C306.453341 431.393915 290.653676 430.728264 281.319299 420.572766 271.984922 410.417267 272.650573 394.617602 282.806071 385.283225L464.247574 218.512156Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="home" unicode="&#59095;" d="M888.069936 37.738731C888.32491 39.79126 888.914598 43.905323 889.885241 49.78179 891.526956 59.721075 893.64231 70.832644 896.275784 82.8153 903.790514 117.008341 913.909985 151.171181 926.92488 182.847505 929.368089 188.793909 931.895969 194.603885 934.509141 200.266825 942.165136 216.857939 953.450406 234.829425 968.046999 254.494436 974.458728 263.132529 1017.424626 315.211684 1020.344142 323.970236 1055.52539 429.513973 958.563564 526.475799 830.766591 475.357011 826.82772 473.781461 823.371255 471.19987 820.742542 467.870165L638.92436 237.567134 657.95182 246.787878 367.04273 246.787878C353.654009 246.787878 342.800304 235.934176 342.800304 222.545455 342.800304 209.156734 353.654009 198.303029 367.04273 198.303029L657.95182 198.303029C665.371135 198.303029 672.381947 201.700484 676.979282 207.523774L858.797463 437.826805 848.773414 430.339959C937.426657 465.801257 996.741887 406.486025 974.347376 339.302492 974.866139 340.85878 969.739613 334.144179 962.139777 324.932384 945.255206 304.466519 938.832814 296.48435 929.114997 283.392186 912.696166 261.272192 899.74491 240.647674 890.485409 220.581641 887.579581 214.284489 884.777966 207.845372 882.077913 201.273841 867.889685 166.741803 856.99655 129.96711 848.921077 93.22262 846.097979 80.377141 843.824317 68.434014 842.048554 57.683185 840.96871 51.145583 840.287423 46.392454 839.954918 43.715814 838.304392 30.429218 847.73729 18.32029 861.023886 16.669764 874.31048 15.019238 886.41941 24.452137 888.069936 37.738731L888.069936 37.738731ZM187.673502 43.715814C187.340997 46.392454 186.659709 51.145583 185.579865 57.683185 183.804103 68.434014 181.530441 80.377141 178.707342 93.22262 170.631869 129.96711 159.738735 166.741803 145.550507 201.273841 142.850454 207.845372 140.048839 214.284489 137.143009 220.581641 127.883509 240.647674 114.932254 261.272192 98.513423 283.392186 88.795605 296.48435 82.373214 304.466519 65.488642 324.932384 57.888805 334.144179 52.76228 340.85878 53.281043 339.302492 30.886531 406.486025 90.201763 465.801257 178.855007 430.339959L168.830956 437.826805 275.147743 303.158876C283.443989 292.6503 298.688306 290.856849 309.196885 299.153094 319.705461 307.44934 321.498909 322.693658 313.202666 333.202236L206.885879 467.870165C204.257164 471.19987 200.800701 473.781461 196.861828 475.357011 69.064856 526.475799-27.89697 429.513973 7.284277 323.970236 10.203794 315.211684 53.169693 263.132529 59.581422 254.494436 74.178015 234.829425 85.463284 216.857939 93.11928 200.266825 95.732451 194.603885 98.260331 188.793909 100.703538 182.847505 113.718434 151.171181 123.837904 117.008341 131.352636 82.8153 133.986109 70.832644 136.101464 59.721075 137.743179 49.78179 138.713821 43.905323 139.303509 39.79126 139.558484 37.738731 141.209009 24.452137 153.317939 15.019238 166.604534 16.669764 179.89113 18.32029 189.324028 30.429218 187.673502 43.715814L187.673502 43.715814ZM197.345759-68.363637 197.345759 28.606061 173.103336 4.363637 864.118745 4.363637 839.876321 28.606061 839.876321-68.363695C839.876321-81.752416 850.730024-92.606118 864.118745-92.606118 877.507466-92.606118 888.361168-81.752416 888.361168-68.363695L888.361168 28.606061C888.361168 41.994782 877.507466 52.848484 864.118745 52.848484L173.103336 52.848484C159.714614 52.848484 148.860911 41.994782 148.860911 28.606061L148.860911-68.363637C148.860911-81.752358 159.714614-92.606061 173.103336-92.606061 186.492057-92.606061 197.345759-81.752358 197.345759-68.363637L197.345759-68.363637ZM173.103336 477.09091 173.103336 646.730437C173.103336 686.924404 205.692857 719.515152 245.876149 719.515152L754.875978 719.515152C795.067558 719.515152 827.648791 686.930484 827.648791 646.730437L827.648791 477.09091 876.133638 477.09091 876.133638 646.730437C876.133638 713.706783 821.846143 768 754.875978 768L245.876149 768C178.915006 768 124.618487 713.701438 124.618487 646.730437L124.618487 477.09091 173.103336 477.09091 173.103336 477.09091Z"  horiz-adv-x="1028" />
 
-    
-    <glyph glyph-name="electronics" unicode="&#59098;" d="M66.133333 742.4 864.120998 742.4C902.909732 742.4 934.4 710.868734 934.4 672.035888L934.4 132.266667 957.866667 155.733333 159.879001 155.733333C121.090268 155.733333 89.6 187.264599 89.6 226.097444L89.6 765.866667 66.133333 742.4 66.133333 742.4ZM66.133333 789.333333 42.666667 789.333333 42.666667 765.866667 42.666667 226.097444C42.666667 161.357696 95.156023 108.8 159.879001 108.8L957.866667 108.8 981.333333 108.8 981.333333 132.266667 981.333333 672.035888C981.333333 736.775638 928.843977 789.333333 864.120998 789.333333L66.133333 789.333333 66.133333 789.333333ZM408.297397 129.777306 337.897397-34.489361C332.792092-46.401739 338.310315-60.197297 350.222694-65.302603 362.135072-70.407908 375.93063-64.889685 381.035936-52.977306L451.435936 111.289361C456.541242 123.201739 451.023019 136.997297 439.110639 142.102603 427.198261 147.207908 413.402703 141.689685 408.297397 129.777306L408.297397 129.777306ZM587.343202 47.459526 669.476535-58.140474C677.433378-68.370701 692.176913-70.213643 702.40714-62.256798 712.637367-54.299955 714.480309-39.55642 706.523465-29.326193L624.390131 76.273807C616.433289 86.504034 601.689754 88.346976 591.459526 80.390131 581.229299 72.433289 579.386357 57.689754 587.343202 47.459526L587.343202 47.459526ZM242.133333-78.933333 805.455541-78.933333C818.415825-78.933333 828.922208-68.426948 828.922208-55.466667 828.922208-42.506385 818.415825-32 805.455541-32L242.133333-32C229.173051-32 218.666667-42.506385 218.666667-55.466667 218.666667-68.426948 229.173051-78.933333 242.133333-78.933333L242.133333-78.933333Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="set" unicode="&#59054;"
+				   d="M825.606018 248.461717 819.263571 235.741545 827.207981 223.95529 905.327294 108.058193 908.52362 139.141679 769.540324 3.626127 799.04025 7.115004 671.47766 83.116681 660.919793 89.407046 649.583401 84.661163C641.524386 81.287326 633.321491 78.204958 625.041941 75.439663L611.811631 71.020858 608.915804 57.376038 580.996546-74.176486 604.846304-54.857143 408.272431-54.857141 431.938677-73.378097 397.841517 64.327061 394.800523 76.608452 383.007648 81.191938C375.650317 84.051482 368.359849 87.170722 361.19018 90.526543L349.017562 96.224034 337.701214 88.973216 217.88134 12.200015 248.055031 9.128335 109.071736 144.636279 112.710251 114.231712 190.651237 238.590583 197.546671 249.592606 192.26576 261.454455C188.597667 269.693634 185.255827 278.10566 182.266902 286.622118L177.674889 299.706315 164.082002 302.447895 29.201333 329.652282 48.761905 305.752599 48.761905 497.40253 29.96636 473.669978 171.221091 506.913988 183.450436 509.792139 188.204044 521.421577C191.634415 529.81379 195.421037 538.096149 199.530538 546.196672L205.959792 558.869818 198.101254 570.70989 124.686421 681.320416 121.526273 650.511849 259.687038 787.298784 229.912147 783.764797 352.693357 709.475686 363.287226 703.065837 374.712497 707.838612C381.330477 710.603196 388.053308 713.173769 394.835279 715.53319L407.314641 719.87471 410.490432 732.700371 443.437389 865.758996 419.771153 847.238095 616.327194 847.238095 592.477417 866.557526 621.325088 730.62796 624.105103 717.528597 636.651202 712.847021C646.841886 709.044368 656.865493 704.767605 666.627682 700.056896L678.796045 694.185096 690.225485 701.390303 803.674639 772.909532 773.791902 775.942467 914.162801 641.245167 910.479401 671.93453 834.210227 552.18633 827.217813 541.207727 832.449542 529.289143C836.047972 521.091433 839.325363 512.718893 842.252943 504.24713L846.63933 491.553911 859.712006 488.47766 994.034289 456.869065 975.238095 480.601771 975.238095 288.95184 994.798163 312.85142 852.982818 284.24525 840.250379 281.676937 835.279123 269.677026C832.31875 262.531102 829.086927 255.442899 825.606018 248.461717ZM857.803703 260.34567 862.624587 236.446091 1004.439932 265.05226 1024 268.997805 1024 288.95184 1024 480.601771 1024 499.911373 1005.203806 504.334475 870.881523 535.943072 865.296766 512.210366 888.340587 520.173602C884.98377 529.887479 881.22675 539.485301 877.099219 548.888369L854.774381 539.088755 875.338534 525.991181 951.607706 645.739381 962.34231 662.593495 947.924307 676.428745 807.553406 811.126044 793.797813 824.325656 777.670669 814.158979 664.221513 742.63975 677.223499 722.015027 687.819315 743.973158C676.702449 749.337561 665.295885 754.20439 653.698526 758.531943L645.174865 735.689482 669.02464 740.751004 640.176969 876.68057 636.0769 896 616.327194 896 419.771153 896 400.690923 896 396.104919 877.479099 363.157965 744.420473 386.824198 738.560422 378.813118 761.587654C371.096704 758.903145 363.448934 755.978908 355.916838 752.832462L365.314667 730.335537 377.935979 751.195387 255.154767 825.484498 238.88953 835.325826 225.379878 821.950511 87.219113 685.163575 72.972426 671.058551 84.058966 654.355008 157.473798 543.744482 177.787526 557.227187 156.044514 568.257702C151.336434 558.97728 146.99905 549.490257 143.067323 539.871503L165.635683 530.646541 160.050276 554.379093 18.795545 521.135083 0 516.71159 0 497.40253 0 305.752599 0 285.798133 19.560572 281.852917 154.441241 254.648533 159.261622 278.548213 136.256342 270.47431C139.682853 260.711021 143.513008 251.069818 147.71909 241.622221L169.992425 251.538338 149.333613 264.486093 71.392628 140.127221 60.94464 123.456915 75.031143 109.722652 214.014438-25.785293 227.881289-39.305393 244.18813-28.856971 364.008004 47.91623 350.854609 68.444723 340.519036 46.362903C348.675428 42.545237 356.968563 38.997003 365.342891 35.742189L374.17527 58.467063 350.509022 52.607068 384.606182-85.098091 389.192156-103.619046 408.272431-103.619046 604.846304-103.619049 624.595936-103.619049 628.696062-84.299706 656.615319 47.252817 632.765562 52.314428 640.489184 29.189193C649.912247 32.336412 659.243565 35.842801 668.413638 39.681773L658.998519 62.171469 646.519381 41.226255 774.081971-34.775422 790.172006-44.36185 803.581897-31.286545 942.565193 104.229005 957.136469 118.436719 945.761519 135.312491 867.642208 251.209587 847.425094 237.582438 869.244171 226.703159C873.230259 234.697506 876.932843 242.818202 880.328282 251.014315L857.803703 260.34567ZM731.428572 396.190477C731.428572 510.644915 638.644915 603.428572 524.190477 603.428572 409.736036 603.428572 316.952382 510.644915 316.952382 396.190477 316.952382 281.736036 409.736036 188.952382 524.190477 188.952382 553.504879 188.952382 582.005801 195.057111 608.253005 206.71738 620.558583 212.184111 626.102566 226.591411 620.635836 238.89699 615.169107 251.202566 600.761807 256.746549 588.456228 251.279821 568.411953 242.375189 546.651767 237.714285 524.190477 237.714285 436.666494 237.714285 365.714285 308.666494 365.714285 396.190477 365.714285 483.71446 436.666494 554.666667 524.190477 554.666667 611.71446 554.666667 682.666667 483.71446 682.666667 396.190477 682.666667 384.625745 681.431994 373.2376 679.007782 362.152755 676.130985 348.998426 684.462569 336.002626 697.616898 333.125828 710.77123 330.24903 723.767027 338.580614 726.643825 351.734944 729.815238 366.236418 731.428572 381.117165 731.428572 396.190477Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="gifts" unicode="&#59099;" d="M151.31783 339.68253 151.31783 12.092546C151.31783-24.029577 180.635004-53.418204 216.629434-53.418204L784.642673-53.418204C820.737084-53.418204 849.954278-24.237995 849.954278 11.898268L849.954278 328.930234 806.295364 328.930234 806.295364 11.898268C806.295364-0.113453 796.637303-9.759287 784.642673-9.759287L216.629434-9.759287C204.770979-9.759287 194.976744 0.058818 194.976744 12.092546L194.976744 339.68253 151.31783 339.68253 151.31783 339.68253ZM544.248062-31.255814 544.248062 590.883721 500.589148 590.883721 500.589148-31.255814 544.248062-31.255814 544.248062-31.255814ZM85.829457 569.054263 828.143565 569.054263C864.241261 569.054263 893.519379 539.721495 893.519379 503.514167L893.519379 350.759691 915.348836 372.589148 173.03473 372.589148C136.937034 372.589148 107.658915 401.921916 107.658915 438.129244L107.658915 590.883721 85.829457 569.054263 85.829457 569.054263ZM85.829457 612.713178 64 612.713178 64 590.883721 64 438.129244C64 377.82797 112.806637 328.930234 173.03473 328.930234L915.348836 328.930234 937.178295 328.930234 937.178295 350.759691 937.178295 503.514167C937.178295 563.815441 888.371659 612.713178 828.143565 612.713178L85.829457 612.713178 85.829457 612.713178ZM456.930234 634.542635 587.906976 634.542635 566.077519 656.372094 566.077519 590.883721 587.906976 612.713178 456.930234 612.713178 478.759691 590.883721 478.759691 656.372094 456.930234 634.542635 456.930234 634.542635ZM456.930234 678.20155 435.100774 678.20155 435.100774 656.372094 435.100774 590.883721 435.100774 569.054263 456.930234 569.054263 587.906976 569.054263 609.736433 569.054263 609.736433 590.883721 609.736433 656.372094 609.736433 678.20155 587.906976 678.20155 456.930234 678.20155 456.930234 678.20155ZM551.660693 644.513212C552.55357 645.893111 554.286927 648.539855 556.764205 652.271447 560.914573 658.52327 565.616813 665.497734 570.773873 673.012306 585.499725 694.469978 600.893771 715.920696 616.162106 735.886981 624.310061 746.541999 632.211424 756.491864 639.79069 765.602294 667.823241 799.297985 691.414249 820.093023 697.054263 820.093023 731.078613 820.093023 790.860256 782.336197 821.48217 741.506977 826.567552 734.726467 823.726334 715.724235 811.048563 689.000874 805.881086 678.108392 810.522118 665.089223 821.414601 659.921745 832.307083 654.754268 845.326251 659.3953 850.49373 670.287782 869.606571 710.575579 874.534694 743.535137 856.409301 767.702326 818.268427 818.556826 746.7095 863.751938 697.054263 863.751938 672.038714 863.751938 644.340604 839.336568 606.227876 793.524299 598.243548 783.926974 589.974942 773.514657 581.481306 762.407593 565.71088 741.78473 549.895622 719.747076 534.776514 697.716376 529.487838 690.010018 524.661009 682.850761 520.390835 676.418474 517.815787 672.539603 515.989067 669.7503 515.005973 668.230974 508.456493 658.109052 511.352531 644.59421 521.474453 638.044732 531.596375 631.495253 545.111215 634.39129 551.660693 644.513212L551.660693 644.513212ZM537.988958 668.230974C537.005865 669.7503 535.179145 672.539603 532.604096 676.418474 528.333922 682.850761 523.507093 690.010018 518.218415 697.716376 503.099307 719.747076 487.284049 741.78473 471.513626 762.407593 463.019987 773.514657 454.751383 783.926974 446.767055 793.524299 408.654327 839.336568 380.956218 863.751938 355.940668 863.751938 306.285431 863.751938 234.726504 818.556826 196.585628 767.702326 178.612682 743.738397 183.326064 711.107286 202.033209 671.279172 208.2705 657.999778 216.033171 644.144388 224.982418 629.939234 233.201436 616.893175 241.973779 604.249862 250.747785 592.458338 256.034751 585.353105 260.185632 580.063319 262.642498 577.060484L296.432634 604.706959C294.378822 607.217173 290.636015 611.986918 285.773954 618.521118 277.632915 629.461984 269.490213 641.197815 261.921855 653.211081 253.864791 666.000071 246.954809 678.333518 241.55017 689.840169 229.189078 716.157333 226.494032 734.81534 231.51276 741.506977 262.134675 782.336197 321.916316 820.093023 355.940668 820.093023 361.580681 820.093023 385.171691 799.297985 413.204241 765.602294 420.783505 756.491864 428.68487 746.541999 436.832823 735.886981 452.101161 715.920696 467.495204 694.469978 482.221058 673.012306 487.378116 665.497734 492.080356 658.52327 496.230726 652.271447 498.708002 648.539855 500.441361 645.893111 501.334236 644.513212L537.988958 668.230974 537.988958 668.230974Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="lights" unicode="&#59102;" d="M679.665263-66.872969C675.413163-67.001581 667.598765-67.2272 656.935307-67.517485 639.154961-68.001508 619.950714-68.48557 600.03657-68.937329 574.44019-69.51799 549.558818-70.001798 526.108928-70.356444 483.043249-71.00775 447.182615-71.188531 421.024495-70.792926 406.443524-70.57241 395.149568-70.173867 387.624841-69.604864 384.224145-69.34771 381.80234-69.066908 380.72791-68.855669 381.194349-68.947373 381.890485-69.140388 383.258458-69.740358 390.735245-73.01955 397.00813-78.806517 397.00813-91.317073 397.00813-50.892646 397.00813-50.892646 397.00813 1.896096 397.00813 43.672988 397.00813 43.672988 397.00813 79.321376 397.00813 112.274716 397.00813 112.274716 397.00813 120.642377 397.00813 127.699328 393.959659 134.412267 388.646061 139.056213 387.096252 140.410707 384.043748 143.151629 379.704591 147.16665 372.388975 153.935787 364.215511 161.756847 355.400661 170.516457 330.191165 195.567979 304.977793 223.038982 281.499353 251.993824 238.026531 305.606784 205.693847 357.937331 189.10623 405.947465 181.047142 429.273171 176.910569 451.089355 176.910569 471.154473 176.910569 666.995542 335.671125 825.756097 531.512194 825.756097 727.353265 825.756097 886.113822 666.995542 886.113822 471.154473 886.113822 453.145037 882.465941 433.765495 875.316446 413.16864 857.948181 363.132719 820.944222 308.273549 770.158263 252.142029 744.062129 223.299104 716.032405 195.9968 688.004092 171.147565 678.2009 162.456292 669.109867 154.702249 660.971618 147.995552 656.141248 144.014863 652.740241 141.297105 651.008689 139.951281 645.047855 135.318308 641.560975 128.191945 641.560975 120.642379L641.560975 6.504064 666.01626 30.959349 384.780489 30.959349C371.274208 30.959349 360.325203 20.010347 360.325203 6.504064 360.325203-7.002217 371.274208-17.951219 384.780489-17.951219L666.01626-17.951219C679.522541-17.951219 690.471546-7.002217 690.471546 6.504064L690.471546 120.642379 681.023831 101.333474C683.113419 102.957577 686.877045 105.965105 692.077163 110.2505 700.656395 117.32061 710.193408 125.455044 720.451194 134.54935 749.739953 160.516064 779.027302 189.04336 806.427104 219.327172 861.228109 279.896348 901.60938 339.762458 921.522494 397.129786 930.372414 422.625363 935.02439 447.339215 935.02439 471.154473 935.02439 694.008103 754.365826 874.666667 531.512194 874.666667 308.658563 874.666667 128 694.008103 128 471.154473 128 445.266368 133.140183 418.157167 142.877122 389.975196 161.629467 335.699614 196.757585 278.844649 243.508777 221.188631 268.176678 190.766884 294.548672 162.033515 320.924541 135.822929 330.16457 126.640802 338.75635 118.419462 346.486466 111.26679 351.174748 106.928725 354.570415 103.879667 356.459629 102.228542L348.097562 120.642379C348.097562 112.274716 348.097562 112.274716 348.097562 79.321376 348.097559 43.67299 348.097559 43.67299 348.097559 1.896096 348.097559-50.892646 348.097559-50.892646 348.097562-91.317073 348.097562-104.40506 354.962325-110.738057 363.613472-114.532303 366.137018-115.639087 368.552418-116.308794 371.29242-116.847494 374.652378-117.508083 378.769417-117.985442 383.936862-118.376192 392.646507-119.034797 404.802199-119.46375 420.284879-119.697903 447.038784-120.102517 483.33091-119.919563 526.848544-119.261421 550.431567-118.904762 575.433585-118.418609 601.145837-117.835317 621.138404-117.381779 640.415629-116.895878 658.266276-116.409941 668.981414-116.118251 676.844655-115.891221 681.143991-115.761178 694.644098-115.352838 705.257071-104.077815 704.848732-90.577709 704.440393-77.077602 693.16537-66.464629 679.665263-66.872969L679.665263-66.872969ZM379.715633 343.813193 501.992055 221.53677C511.189239 212.339586 525.97641 211.95072 535.644275 220.651799L657.920698 330.700578C667.959838 339.735804 668.77367 355.198633 659.738445 365.237771 650.703219 375.276911 635.240393 376.090743 625.201252 367.055518L502.92483 257.006739 536.57705 256.121766 414.300627 378.398189C404.750244 387.948572 389.266016 387.948572 379.715633 378.398189 370.16525 368.847806 370.16525 353.363575 379.715633 343.813193L379.715633 343.813193ZM494.829269 226.601626 494.829269 18.731708 543.739838 18.731708 543.739838 226.601626 494.829269 226.601626 494.829269 226.601626Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="smile" unicode="&#59055;"
+				   d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 629.410831-128 740.826187-88.331046 830.768465-16.686662 841.557579-8.092491 843.33693 7.620766 834.742758 18.409879 826.148587 29.198991 810.43533 30.978342 799.646219 22.384173 718.470035-42.277495 618.001779-78.048781 512-78.048781 256.817504-78.048781 49.951219 128.817504 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.663236 904.470807 140.039307 897.177109 128.331757 900.755245 112.928203 912.462793 105.634507 924.170342 98.340809 939.573897 101.918942 946.867595 113.626492 997.013826 194.119204 1024 287.101621 1024 384ZM337.170731 396.487806C371.654852 396.487806 399.609756 424.442709 399.609756 458.926829 399.609756 493.41095 371.654852 521.365854 337.170731 521.365854 302.686611 521.365854 274.731708 493.41095 274.731708 458.926829 274.731708 424.442709 302.686611 396.487806 337.170731 396.487806ZM711.804879 396.487806C746.288998 396.487806 774.243902 424.442709 774.243902 458.926829 774.243902 493.41095 746.288998 521.365854 711.804879 521.365854 677.320757 521.365854 649.365854 493.41095 649.365854 458.926829 649.365854 424.442709 677.320757 396.487806 711.804879 396.487806ZM352.788105 127.229033C396.165222 92.527339 453.151987 71.804879 524.487806 71.804879 595.823622 71.804879 652.810387 92.527339 696.187505 127.229033 722.700531 148.439454 738.882517 170.015435 746.631548 185.513495 752.800254 197.850908 747.799529 212.853084 735.462114 219.021792 723.124702 225.190498 708.122526 220.189773 701.953818 207.852358 701.03616 206.017043 698.492224 201.827031 694.165854 196.058537 686.602473 185.974029 676.927317 175.789655 664.983226 166.234383 630.311565 138.497052 584.273939 121.756098 524.487806 121.756098 464.70167 121.756098 418.664045 138.497052 383.992384 166.234383 372.048292 175.789655 362.373137 185.974029 354.809756 196.058537 350.483386 201.827031 347.93945 206.017043 347.021792 207.852358 340.853084 220.189773 325.850908 225.190498 313.513495 219.021792 301.176081 212.853084 296.175356 197.850908 302.344062 185.513495 310.093092 170.015435 326.275078 148.439454 352.788105 127.229033Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="sports" unicode="&#59104;" d="M89.619174 746.62822 304.171556 543.871917C309.603234 538.738871 316.793295 535.878991 324.266667 535.878991L732.101412 535.878991C748.259686 535.878991 761.358554 548.97786 761.358554 565.136134 761.358554 581.294409 748.259686 594.393278 732.101412 594.393278L324.266667 594.393278 344.361777 586.400352 129.809397 789.156654C118.065494 800.254877 99.548292 799.731451 88.450069 787.987548 77.351846 776.243646 77.875272 757.726444 89.619174 746.62822L89.619174 746.62822ZM102.35341 274.18928 317.324429 57.493892C328.704322 46.022718 347.228772 45.948719 358.699949 57.328612 370.171123 68.708503 370.245122 87.232954 358.865229 98.70413L143.894209 315.399516C132.514317 326.87069 113.989866 326.944691 102.518691 315.564798 91.047516 304.184905 90.973517 285.660454 102.35341 274.18928L102.35341 274.18928ZM186.715947 664.388216 27.864669 86.272811C22.747211 67.648589 36.761689 49.263866 56.076191 49.263866L981.430498 49.263866C997.588772 49.263866 1010.687642 62.362735 1010.687642 78.521009 1010.687642 94.679283 997.588772 107.77815 981.430498 107.77815L56.076191 107.77815 84.287712 70.769205 243.138991 648.884612C247.420192 664.465405 238.260064 680.566734 222.67927 684.847936 207.098477 689.129138 190.997149 679.96901 186.715947 664.388216L186.715947 664.388216ZM42.666667-58.87283 391.314285-58.87283C407.472559-58.87283 420.571428-45.773961 420.571428-29.615686 420.571428-13.457412 407.472559-0.358543 391.314285-0.358543L42.666667-0.358543C26.508393-0.358543 13.409524-13.457412 13.409524-29.615686 13.409524-45.773961 26.508393-58.87283 42.666667-58.87283L42.666667-58.87283Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="toys" unicode="&#59105;" d="M522.666667 52.659049 522.666667 52.659049C640.39033 52.659049 731.078095 120.674871 731.078095 196.434285 731.078095 272.1937 640.39033 340.209523 522.666667 340.209523 404.943004 340.209523 314.255238 272.1937 314.255238 196.434285 314.255238 120.674871 404.943004 52.659049 522.666667 52.659049L522.666667 52.659049ZM522.666667 2.525715 522.666667 2.525715C379.876337 2.525715 264.121905 89.341538 264.121905 196.434285 264.121905 303.527034 379.876337 390.342857 522.666667 390.342857 665.456996 390.342857 781.211428 303.527034 781.211428 196.434285 781.211428 89.341538 665.456996 2.525715 522.666667 2.525715L522.666667 2.525715ZM328.758095 397.594285C378.299616 397.594285 418.460951 437.755622 418.460951 487.297143 418.460951 536.838662 378.299616 577 328.758095 577 279.216576 577 239.055238 536.838662 239.055238 487.297143 239.055238 437.755622 279.216576 397.594285 328.758095 397.594285L328.758095 397.594285ZM328.758095 447.727618C306.90445 447.727618 289.188572 465.443499 289.188572 487.297143 289.188572 509.150788 306.90445 526.866667 328.758095 526.866667 350.61174 526.866667 368.327618 509.150788 368.327618 487.297143 368.327618 465.443499 350.61174 447.727618 328.758095 447.727618L328.758095 447.727618ZM716.575238 397.594285C766.116757 397.594285 806.278095 437.755622 806.278095 487.297143 806.278095 536.838662 766.116757 577 716.575238 577 667.033717 577 626.872382 536.838662 626.872382 487.297143 626.872382 437.755622 667.033717 397.594285 716.575238 397.594285L716.575238 397.594285ZM716.575238 447.727618C694.721594 447.727618 677.005715 465.443499 677.005715 487.297143 677.005715 509.150788 694.721594 526.866667 716.575238 526.866667 738.428883 526.866667 756.144762 509.150788 756.144762 487.297143 756.144762 465.443499 738.428883 447.727618 716.575238 447.727618L716.575238 447.727618ZM932.149018 128.840629C976.421003 197.466199 1000.186667 276.136868 1000.186667 358.024762 1000.186667 604.335046 785.995691 803.226667 522.666667 803.226667 259.337643 803.226667 45.146667 604.335046 45.146667 358.024762 45.146667 111.714477 259.337643-87.177143 522.666667-87.177143 644.527081-87.177143 759.341054-44.422944 847.029762 31.270957 857.509376 40.317079 858.67145 56.145813 849.625327 66.625427 840.579204 77.105039 824.75047 78.267115 814.270857 69.220992 735.681237 1.381532 632.492169-37.04381 522.666667-37.04381 286.229538-37.04381 95.28 140.266477 95.28 358.024762 95.28 575.783046 286.229538 753.093333 522.666667 753.093333 759.103795 753.093333 950.053333 575.783046 950.053333 358.024762 950.053333 285.900273 929.130844 216.641265 890.021425 156.018142 882.516563 144.384928 885.863251 128.870451 897.496465 121.365589 909.129679 113.860727 924.644154 117.207415 932.149018 128.840629L932.149018 128.840629ZM933.297446 554.855409C975.279191 588.776695 1000.186667 639.777434 1000.186667 694.813333 1000.186667 794.143587 919.663586 874.666667 820.333333 874.666667 747.438752 874.666667 682.608077 830.892394 654.660928 764.915167L700.82362 745.361215C720.985726 792.959628 767.747089 824.533333 820.333333 824.533333 891.975712 824.533333 950.053333 766.455711 950.053333 694.813333 950.053333 655.085056 932.114135 618.352617 901.789532 593.85031L933.297446 554.855409 933.297446 554.855409ZM131.926076 593.85031C101.601472 618.352617 83.662274 655.085056 83.662274 694.813333 83.662274 766.455711 141.739897 824.533333 213.382274 824.533333 265.968518 824.533333 312.729882 792.959628 332.891987 745.361215L379.054679 764.915167C351.107531 830.892394 286.276855 874.666667 213.382274 874.666667 114.052021 874.666667 33.528941 794.143587 33.528941 694.813333 33.528941 639.777434 58.436416 588.776695 100.418161 554.855409L131.926076 593.85031 131.926076 593.85031ZM534.522306 203.78777C572.762722 203.78777 603.762705 234.787755 603.762705 273.028171 603.762705 311.268589 572.762722 342.268572 534.522306 342.268572 496.281888 342.268572 465.281905 311.268589 465.281905 273.028171 465.281905 234.787755 496.281888 203.78777 534.522306 203.78777L534.522306 203.78777ZM534.522306 253.921103C523.969764 253.921103 515.415238 262.475629 515.415238 273.028171 515.415238 283.580713 523.969764 292.135238 534.522306 292.135238 545.074848 292.135238 553.629372 283.580713 553.629372 273.028171 553.629372 262.475629 545.074848 253.921103 534.522306 253.921103L534.522306 253.921103Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="success" unicode="&#59057;"
+				   d="M464.247573 218.512156C474.214622 209.350991 489.665824 209.798411 499.086059 219.520971L798.905035 528.962103C808.503379 538.868489 808.253662 554.680198 798.347275 564.278545 788.44089 573.87689 772.62918 573.627172 763.030833 563.720785L463.211857 254.279654 498.050342 255.288469 316.608838 422.059539C306.453342 431.393916 290.653675 430.728265 281.319298 420.572766 271.984922 410.417267 272.650573 394.617602 282.806071 385.283226L464.247573 218.512156ZM1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 629.410831-128 740.826187-88.331046 830.768465-16.686662 841.557579-8.092491 843.33693 7.620766 834.742758 18.409879 826.148587 29.198991 810.43533 30.978342 799.646219 22.384173 718.470035-42.277495 618.001779-78.048781 512-78.048781 256.817504-78.048781 49.951219 128.817504 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.663236 904.470807 140.039307 897.177109 128.331757 900.755245 112.928203 912.462793 105.634507 924.170342 98.340809 939.573897 101.918942 946.867595 113.626492 997.013826 194.119204 1024 287.101621 1024 384Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="auto" unicode="&#59107;" d="M243.809523-24.380951C311.135665-24.380951 365.714285 30.197668 365.714285 97.52381 365.714285 164.84995 311.135665 219.428572 243.809523 219.428572 176.483383 219.428572 121.904762 164.84995 121.904762 97.52381 121.904762 30.197668 176.483383-24.380951 243.809523-24.380951L243.809523-24.380951ZM243.809523 24.380951C203.413839 24.380951 170.666667 57.128126 170.666667 97.52381 170.666667 137.919494 203.413839 170.666667 243.809523 170.666667 284.205207 170.666667 316.952382 137.919494 316.952382 97.52381 316.952382 57.128126 284.205207 24.380951 243.809523 24.380951L243.809523 24.380951ZM804.571428-24.380951C871.89757-24.380951 926.47619 30.197668 926.47619 97.52381 926.47619 164.84995 871.89757 219.428572 804.571428 219.428572 737.245289 219.428572 682.666667 164.84995 682.666667 97.52381 682.666667 30.197668 737.245289-24.380951 804.571428-24.380951L804.571428-24.380951ZM804.571428 24.380951C764.175744 24.380951 731.428572 57.128126 731.428572 97.52381 731.428572 137.919494 764.175744 170.666667 804.571428 170.666667 844.967113 170.666667 877.714285 137.919494 877.714285 97.52381 877.714285 57.128126 844.967113 24.380951 804.571428 24.380951L804.571428 24.380951ZM1011.809523 85.333333 1011.809523 317.105715C1011.809523 384.476928 957.296806 439.177724 890.130281 439.177724L36.489124 439.177724C23.023896 439.177724 12.108172 428.261999 12.108172 414.79677L12.108172 194.677888C12.108172 127.43613 66.730801 72.800412 133.826317 72.800412 147.291545 72.800412 158.207269 83.716137 158.207269 97.181365 158.207269 110.646592 147.291545 121.562317 133.826317 121.562317 93.663873 121.562317 60.870076 154.36397 60.870076 194.677888L60.870076 414.79677 36.489124 390.415819 890.130281 390.415819C930.328683 390.415819 963.047618 357.583996 963.047618 317.105715L963.047618 85.333333C963.047618 71.868105 973.963343 60.952382 987.428572 60.952382 1000.893801 60.952382 1011.809523 71.868105 1011.809523 85.333333L1011.809523 85.333333ZM359.909427 72.800412 694.774837 72.800412C708.240066 72.800412 719.155791 83.716137 719.155791 97.181365 719.155791 110.646592 708.240066 121.562317 694.774837 121.562317L359.909427 121.562317C346.444198 121.562317 335.528474 110.646592 335.528474 97.181365 335.528474 83.716137 346.444198 72.800412 359.909427 72.800412L359.909427 72.800412ZM288.80963 654.417754 268.190477 643.047619 621.924403 643.047619 604.684467 650.188635 836.513681 418.359422 895.999964 422.588535 639.164341 684.668508 632.023326 691.809524 621.924403 691.809524 268.190477 691.809524 254.74595 691.809524 247.571324 680.439389 85.333333 422.588535 142.523915 422.588535 288.80963 654.417754ZM463.238095 667.428572 463.238095 423.314477 512 423.314477 512 667.428572 463.238095 667.428572 463.238095 667.428572Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="jewelry" unicode="&#59108;" d="M793.353159 768.986715C788.757212 775.021607 781.606701 778.564036 774.021014 778.564036L526.327177 778.564036C518.583824 778.564036 483.890627 778.564036 475.060807 778.564036 466.230987 778.564036 482.176626 734.196064 483.890627 726.639456 484.416564 724.320723 503.502676 728.868364 504.788585 726.639456L666.818369 462.119125 665.166215 482.932913 478.578795-5.572521C476.722143-10.433431 475.512321-14.817907 475.060807-19.080171 473.971201-29.365995 476.431723-39.280759 487.711307-45.927533 498.610029-52.349873 508.106155-50.053523 516.598194-44.610133 520.169202-42.32112 523.548263-39.307471 527.069865-35.519855L946.940048 370.925577C956.582134 380.260444 956.831186 395.644307 947.496316 405.286396 938.161447 414.928484 922.777584 415.177534 913.135497 405.842665L492.371361-1.514955C500.172997 6.925291 528.908982-10.008098 523.97964-22.913632L710.56706 465.591804C713.176959 472.424791 712.570104 480.069911 708.914906 486.405589L547.375448 766.407316 526.327179 729.964131 774.021014 729.964131 754.688869 739.541452 959.305532 470.861299C967.436617 460.18445 982.683459 458.120702 993.360308 466.251787 1004.037157 474.382871 1006.100905 489.629713 997.96982 500.306562L793.353159 768.986715ZM773.224427 720.759115 676.300754 494.603876 661.784107 460.731701 698.635935 460.731703 990.787629 460.731706 990.787629 509.331612 698.635935 509.331607 720.971115 475.459435 817.894789 701.614675 773.224427 720.759115 773.224427 720.759115ZM451.432425 766.407316 289.892969 486.405589 284.288295 476.690822 288.044944 466.123104 461.582175-22.049299C457.173579-9.64761 485.619836 7.156649 494.238928-2.385182L48.971945 490.550974 50.918742 460.430581 244.766091 740.432308 224.786859 729.964131 472.480694 729.964131 451.432425 766.407316 451.432425 766.407316ZM493.528963 742.120852 514.553876 778.564036 472.480694 778.564036 224.786859 778.564036 212.054827 778.564036 204.807629 768.095859 10.96028 488.094133 0 472.262618 12.907077 457.973743 458.174059-34.962415C461.700269-38.866131 465.088402-41.968009 468.692781-44.328418 477.198497-49.898577 486.86492-52.259213 497.834403-45.779134 508.86517-39.26285 511.441311-29.577137 510.594149-19.413478 510.236741-15.125527 509.123525-10.690182 507.374761-5.77079L333.83753 482.401613 331.989505 462.119125 493.528963 742.120852 493.528963 742.120852ZM191.682382 701.614675 288.606057 475.459435 310.941236 509.331607 52.478105 509.331607 52.478105 460.731703 310.941236 460.731703 347.793063 460.731703 333.276417 494.603876 236.352743 720.759115 191.682382 701.614675 191.682382 701.614675ZM310.388965 473.43395 966.487683 473.43395C979.908178 473.43395 990.787636 484.31341 990.787636 497.733903 990.787636 511.154396 979.908178 522.033856 966.487683 522.033856L310.388965 522.033856C296.968472 522.033856 286.089012 511.154396 286.089012 497.733903 286.089012 484.31341 296.968472 473.43395 310.388965 473.43395L310.388965 473.43395Z"  horiz-adv-x="1028" />
+			<glyph glyph-name="survey" unicode="&#59058;"
+				   d="M722.355804 849.454545C761.006291 849.454545 792.380951 818.166023 792.380951 779.627344L792.380951 437.500928 799.081094 453.813218 401.874746 51.22138 418.539682 58.181818 138.070006 58.181818C99.387643 58.181818 68.063492 89.328555 68.063492 127.771428L68.063492 872.727273 44.698413 849.454545 722.355804 849.454545ZM21.333333 896 21.333333 872.727273 21.333333 127.771428C21.333333 63.604277 73.59726 11.636363 138.070006 11.636363L418.539682 11.636363 428.337293 11.636363 435.204619 18.596802 832.410967 421.18864 839.11111 427.979625 839.11111 437.500928 839.11111 779.627344C839.11111 843.859757 786.827324 896 722.355804 896L44.698413 896 21.333333 896ZM775.859347 307.365395 759.337741 290.90909 775.859347 274.452787 869.319663 181.361879 885.841269 164.905574 902.362876 181.361879 972.458114 251.18006 988.979721 267.636363 972.458114 284.092668 878.997796 377.183575 862.47619 393.639878 845.954583 377.183575 775.859347 307.365395ZM845.954583 344.27097 939.414901 251.18006 939.414901 284.092668 869.319663 214.274485 902.362876 214.274485 808.902558 307.365395 808.902558 274.452787 878.997796 344.27097 845.954583 344.27097ZM518.843473 51.365395 513.841133 46.382827 512.453734 39.473248 489.088655-76.890387 482.215251-111.121568 516.58227-104.275332 633.407665-81.002605 640.344663-79.620689 645.347004-74.638121 902.362876 181.361879 918.884482 197.818182 902.362876 214.274485 808.902558 307.365395 792.380951 323.821698 775.859347 307.365395 518.843473 51.365395ZM775.859347 274.452787 869.319663 181.361879 869.319663 214.274485 612.303791-41.725515 624.243127-35.361033 507.41773-58.633758 534.911345-86.018703 558.276425 30.344934 551.886686 18.452787 808.902558 274.452787 775.859347 274.452787ZM426.576706 298.269073C444.201086 298.269073 458.488469 284.053815 458.488469 266.500753L458.488469 258.086116C458.488469 240.540958 444.323959 226.317797 426.576706 226.317797L426.576706 226.317797C408.952326 226.317797 394.664943 240.533054 394.664943 258.086116L394.664943 266.500753C394.664943 284.045911 408.829453 298.269073 426.576706 298.269073L426.576706 298.269073ZM278.349205 552.435127C278.349205 552.435127 280.851125 530.485568 305.477133 530.485568 330.103138 530.485568 331.559155 552.435127 331.559155 552.435127 329.927383 623.508937 362.988497 657.25782 430.67155 653.905282 475.722639 648.839223 499.06407 623.508937 500.624896 577.839917 497.503245 557.501184 480.405116 531.202385 449.969026 499.092521 409.671358 458.489557 389.522524 422.133143 389.522524 390.023279L389.522524 357.093903C389.522524 357.093903 392.614705 337.454532 414.885933 337.454532 437.157161 337.454532 440.249342 357.093903 440.249342 357.093903L440.249342 379.965664C440.249342 406.785969 459.546816 439.044836 498.21271 476.369762 538.652271 513.471183 558.730159 547.369069 558.730159 577.839917 555.395669 662.323878 511.195938 706.353877 425.776235 709.780917 327.515198 711.419936 278.349205 658.971339 278.349205 552.435127Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="trade-assurance" unicode="&#59109;" d="M534.374 113.398l0 54.135c23.415 3.419 59.356 14.189 77.924 32.429 18.568 18.193 27.98 43.106 27.98 74.646 0 31.938-8.944 56.64-27.067 74.154-18.123 17.467-46.431 33.108-85.019 46.923-25.475 8.991-42.825 18.146-52.168 27.582-9.296 9.413-14.002 22.033-14.002 37.815 0 16.835 4.472 30.088 13.463 39.664 8.968 9.577 22.782 14.423 41.444 14.423 17.936 0 31.844-6.978 41.725-19.809 9.834-12.784 14.798-30.743 14.798-54.158l65.116 0c0 46.829-11.59 65.795-28.566 87.056-16.905 21.26-28.8 34.7-75.629 39.383l0 60.878-46.829 0 0-60.316c-23.415-3.793-51.255-15.056-69.097-33.787-17.889-18.755-24.281-43.364-24.281-73.85 0-32.101 10.513-57.038 29.104-74.786 18.568-17.748 47.766-33.202 86.353-46.291 23.86-8.429 40.929-17.514 50.599-27.301 9.694-9.787 14.704-22.478 14.704-38.072 0-17.046-5.292-30.322-16.062-39.828-10.771-9.506-26.271-14.26-46.525-14.26-19.013 0-34.63 10.162-46.946 20.862-12.269 10.63-18.38 12.995-18.38 59.824l-65.374 0c0-46.829 7.938-74.388 28.449-94.057 20.535-19.598 54.041-35.988 77.456-39.383l0-53.877 46.829 0zM941.789 717.964l-140.956 42.919c-7.141 2.131-15.852 0.82-21.799-3.582-5.947-4.402-10.513-11.403-10.513-18.825l0-109.955-93.659 0 0 150.697c0 10.724-4.027 20.09-14.447 22.712l-144.094 36.62c-3.746 0.96-6.884 0.96-10.63 0l-143.344-36.62c-10.396-2.622-15.29-11.988-15.29-22.712l0-150.697-93.659 0 0 109.955c0 7.422-3.301 14.423-9.249 18.825-5.971 4.402-13.51 5.69-20.605 3.582l-140.933-42.919c-10.326-3.138-17.116-12.925-16.507-23.719l36.738-649.264c0.539-9.74 7.118-18.123 16.414-21.026l385.99-120.234c2.295-0.702 4.636-1.054 7.001-1.054 2.365 0 4.683 0.351 6.978 1.054l385.967 120.234c9.296 2.903 15.852 11.286 16.39 21.026l2.482 44.23c0.023 0.281 0.164 0.492 0.164 0.773 0 12.925-10.49 23.415-23.415 23.415-12.925 0-23.415-10.49-23.415-23.415l-0.164 0-1.475-26.131-363.512-113.233-363.559 113.233-35.005 614.681 92.886 28.355 0-92.652c0-12.948 10.958-32.546 23.906-32.546l136.039 0c12.925 0 27.372 19.598 27.372 32.546l0 146.716 117.073 30.72 117.073-30.72 0-146.716c0-12.948 16.999-32.546 29.924-32.546l136.062 0c12.948 0 21.331 19.598 21.331 32.546l0 92.652 94.15-28.355-25.639-470.704c0-0.281-0.14-0.492-0.14-0.773 0-12.925 10.49-23.415 23.415-23.415 12.925 0 23.415 10.49 23.415 23.415l0.211 0 27.606 487.188c0.609 10.794-6.228 20.581-16.578 23.719l0 0z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="browse" unicode="&#59110;" d="M1012.444444 395.326985 1010.920636 397.866667C865.193651 615.161905 701.536508 725.333333 524.419049 725.333333 226.48889 725.333333 13.180952 398.501587 11.580952 395.326985 1.549206 375.847618 1.549206 355.2 11.580952 335.644444L13.866667 331.987302C175.568254 116.495238 338.514285 11.733333 512 11.733333 588.393651 11.733333 658.082539 32.736508 719.847618 64.431746 752.101587 80.965079 788.190477 102.298413 809.828572 121.346031 814.349205 125.358731 816.761905 132.317461 816.761905 139.174603 816.761905 153.219049 805.384128 164.571428 791.365079 164.571428 785.777777 164.571428 780.901587 162.387302 776.71111 159.365079 776.71111 159.365079 716.469841 118.628572 682.844444 102.755556 631.11111 78.273015 573.841269 62.552382 512 62.552382 356.114285 62.552382 206.958731 160.025397 56.025397 360.457143 54.323809 364.546031 54.526984 367.796826 56.533333 371.682539 58.260317 374.704762 256.812698 674.539683 524.419049 674.539683 683.174603 674.539683 832.304762 572.419048 967.796826 370.996826 968.380951 369.67619 968.71111 368.558731 968.914285 367.746031L966.679364 364.393651C949.942857 338.996826 879.009523 252.469841 871.314285 244.038095 863.619049 235.606349 860.419049 232.253969 860.419049 223.746031 860.419049 209.701587 871.796826 198.349205 885.815872 198.349205 893.079364 198.349205 898.793651 200.990477 904.177777 206.374603 909.561905 211.733333 990.907936 308.850795 1009.092064 336.431746L1009.879364 337.625397C1022.247618 351.92381 1023.339682 374.120636 1012.444444 395.326985L1012.444444 395.326985ZM393.498413 371.606349C393.498413 309.460318 448.88889 254.958731 512 254.958731 576.203174 254.958731 630.47619 308.393651 630.47619 371.606349 630.47619 434.819049 576.203174 488.203174 512 488.203174 448.88889 488.203174 393.498413 433.726985 393.498413 371.606349L393.498413 371.606349ZM579.682539 371.606349C579.682539 337.142857 547.403174 305.752382 512 305.752382 476.546031 305.752382 444.292064 337.142857 444.292064 371.606349 444.292064 406.044444 476.571428 437.409523 512 437.409523 547.428572 437.409523 579.682539 406.044444 579.682539 371.606349L579.682539 371.606349Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="training" unicode="&#59059;"
+				   d="M887.286976 773.12C927.302833 773.12 959.646052 740.185246 959.646052 699.237312L959.646052 232.448 983.843138 257.024 136.713024 257.024C96.697168 257.024 64.353947 289.958754 64.353947 330.906688L64.353947 797.696 40.156863 773.12 887.286976 773.12ZM15.959779 822.272 15.959779 797.696 15.959779 330.906688C15.959779 262.841265 69.941754 207.872 136.713024 207.872L983.843138 207.872 1008.040222 207.872 1008.040222 232.448 1008.040222 699.237312C1008.040222 767.302736 954.058246 822.272 887.286976 822.272L40.156863 822.272 15.959779 822.272ZM195.578315-68.786556C186.532947-78.777739 187.174803-94.32474 197.011941-103.511755 206.849078-112.698769 222.156373-112.046863 231.201741-102.05568L450.40665 140.070052C459.452017 150.061235 458.810161 165.608237 448.973022 174.795251 439.135885 183.982266 423.828591 183.330357 414.783221 173.339174L195.578315-68.786556ZM798.39181-102.05568C807.437178-112.046863 822.744474-112.698769 832.581611-103.511755 842.418748-94.32474 843.060604-78.777739 834.015236-68.786556L614.81033 173.339174C605.76496 183.330357 590.457666 183.982266 580.620529 174.795251 570.78339 165.608237 570.141534 150.061235 579.186903 140.070052L798.39181-102.05568ZM441.76944 792.384051C441.76944 781.74481 452.602844 773.12 465.966524 773.12 479.330204 773.12 490.163607 781.74481 490.163607 792.384051L490.163607 876.735949C490.163607 887.37519 479.330204 896 465.966524 896 452.602844 896 441.76944 887.37519 441.76944 876.735949L441.76944 792.384051ZM514.796777 588.941242C528.160457 588.941242 538.99386 599.944292 538.99386 613.517242 538.99386 627.090191 528.160457 638.093242 514.796777 638.093242L158.588801 638.093242C145.225121 638.093242 134.391718 627.090191 134.391718 613.517242 134.391718 599.944292 145.225121 588.941242 158.588801 588.941242L514.796777 588.941242ZM514.796777 430.750897C528.160457 430.750897 538.99386 441.753946 538.99386 455.326897 538.99386 468.899846 528.160457 479.902897 514.796777 479.902897L158.588801 479.902897C145.225121 479.902897 134.391718 468.899846 134.391718 455.326897 134.391718 441.753946 145.225121 430.750897 158.588801 430.750897L514.796777 430.750897ZM680.30294 343.608956C728.899441 381.779921 758.198767 439.314078 758.198767 517.741092L758.198767 679.158246C758.198767 692.731196 747.365363 703.734246 734.001683 703.734246 720.638003 703.734246 709.804599 692.731196 709.804599 679.158246L709.804599 517.741092C709.804599 454.928094 687.727774 411.576531 650.697359 382.490349 637.686323 372.270607 623.667934 364.562914 609.678551 359.068813 601.472998 355.846217 595.348683 354.128198 592.405429 353.55024 579.284725 350.973769 570.704734 338.082133 573.241481 324.755964 575.778227 311.429796 588.471098 302.715443 601.591802 305.291915 622.119765 309.322927 651.18515 320.737882 680.30294 343.608956ZM752.643211 663.489664C761.163307 673.946319 759.724115 689.438173 749.428683 698.091691 739.133252 706.745209 723.880252 705.283479 715.360156 694.826826L605.757702 560.312531C597.237604 549.855878 598.676798 534.364023 608.972228 525.710505 619.267661 517.056988 634.520659 518.518716 643.040757 528.975371L752.643211 663.489664ZM752.643211 694.826826C744.123113 705.283479 728.870114 706.745209 718.574682 698.091691 708.279251 689.438173 706.84006 673.946319 715.360156 663.489664L824.962609 528.975371C833.482707 518.518716 848.735706 517.056988 859.031136 525.710505 869.326569 534.364023 870.76576 549.855878 862.245664 560.312531L752.643211 694.826826Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="rfqqm" unicode="&#59111;" d="M647.35 71.318c5.963 21.649 8.967 44.789 8.967 69.419 0 29.401-5.114 57.815-15.342 85.22-10.228 27.405-25.548 48.55-46.027 63.502-20.479 14.953-43.803 22.406-70.107 22.406-12.682 0-24.837-1.835-36.395-5.481-11.558-3.646-22.498-9.127-32.818-16.466-10.32-7.339-19.791-17.246-28.437-29.79-8.646-12.545-15.893-29.63-21.718-51.279-5.825-21.649-8.738-45.752-8.738-72.332 0-29.722 4.747-58.228 14.219-85.541 9.471-27.314 24.332-48.298 44.559-62.929 20.227-14.631 43.711-21.947 70.428-21.947 13.118 0 24.951 1.743 35.386 5.252 10.435 3.509 22.085 9.517 34.927 18.026l33.827-38.964 29.561 37.84-32.015 36.281c8.852 15.801 15.388 31.396 19.723 46.784l0 0zM596.507 100.879c-1.651-8.806-4.61-18.737-8.967-29.79l-26.213 30.226-29.125-37.175 24.86-30.02c-5.963-3.302-11.191-5.55-15.686-6.834-4.495-1.284-9.311-1.903-14.563-1.903-15.365 0-28.896 5.16-40.546 15.457-11.65 10.297-20.067 24.47-25.318 42.541-5.252 18.071-7.774 36.602-7.774 55.567 0 21.213 2.981 41.051 8.967 59.581 3.578 10.756 8.508 20.158 14.792 28.208 6.284 8.05 13.37 14.379 21.282 18.92 7.912 4.541 17.108 6.834 27.543 6.834 15.549 0 29.125-5.091 40.753-15.228 11.627-10.137 20.113-24.263 25.41-42.335 5.298-18.071 7.958-36.579 7.958-55.545 0-13.714-1.124-26.58-3.371-38.505l0 0zM878.266 303.541l-48.389-257.771-0.894 0-48.366 257.771-81.299 0 0-329.208 51.944 0 0 275.246 0.688 0 49.261-275.246 54.879 0 51.279 275.246 0.665 0 0-275.246 51.967 0 0 329.208-81.734 0zM785.133 813.303c-5.733 5.412-19.7 7.912-27.314 5.94-4.334-1.147-333.68-93.912-461.671-384.661-105.585 85.266-220.252 113.956-225.435 115.194-7.866 1.858-16.076-0.482-21.649-6.261-5.619-5.779-7.706-14.127-5.527-21.878 4.724-16.718 115.125-411.355 244.034-557.762 25.25-45.362 56.531-61.209 78.226-61.209l2.27 0c17.819 0 35.271 5.16 52.334 14.333 8.439 3.371 14.425 11.558 14.425 21.213 0 12.682-10.274 22.933-22.933 22.933-4.013 0-4.105 0.252-10.916-3.142-6.811-3.394-14.471-6.031-19.7-6.238-11.283-0.482-18.553 6.995-27.382 14.7-18.828 16.466-35.386 46.004-40.133 59.443-8.095 24.906-15.297 57.448-19.081 99.393-38.895 430.092 329.644 595.785 448.117 638.418-29.148-131.041-83.798-338.381-109.346-399.59-2.821-6.765-14.104-30.455-14.104-36.212 0-12.682 10.251-22.956 22.933-22.956 9.082 0 16.673 3.05 20.502 13.095 62.654 165.258 118.588 423.647 127.601 466.579 1.605 7.706 0.482 23.254-5.252 28.667l0 0zM247.874 119.937c0.298-3.188 0.596-6.33 0.94-9.494-68.41 129.963-125.537 304.509-149.525 382.689 42.656-15.618 113.176-46.99 177.252-101.113-27.772-83.661-37.427-175.096-28.667-272.081l0 0z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="rfqquantity" unicode="&#59112;" d="M933.12 4.64c0 0-53.76 2.24-129.92 24.64 96.32 82.88 156.8 203.84 156.8 340.48 0 248.64-201.6 450.24-448 450.24-246.4 0-448-201.6-448-448 0-125.44 53.76-246.4 145.6-331.52l0 0 0 0c4.48-4.48 11.2-6.72 15.68-6.72 13.44 0 22.4 8.96 22.4 22.4 0 6.72-2.24 11.2-6.72 15.68l0 0c-85.12 78.4-132.16 185.92-132.16 300.16 0 221.76 181.44 403.2 403.2 403.2 221.76 0 403.2-181.44 403.2-403.2 0-132.16-64.96-250.88-163.52-324.8-17.92 6.72-33.6 15.68-51.52 24.64-123.2 67.2-277.76 53.76-344.96-2.24-33.6-29.12-38.08-53.76-33.6-71.68 6.72-29.12 35.84-47.04 60.48-56 40.32-11.2 85.12-17.92 129.92-17.92 91.84 0 179.2 26.88 250.88 73.92 94.08-33.6 143.36-35.84 172.48-38.08 15.68 0 24.64 8.96 24.64 22.4-2.24 13.44-8.96 22.4-26.88 22.4l0 0zM512-31.2c-40.32 0-78.4 6.72-116.48 17.92-15.68 4.48-26.88 13.44-29.12 22.4-2.24 6.72 6.72 17.92 17.92 26.88 24.64 20.16 76.16 35.84 136.64 35.84 49.28 0 105.28-11.2 159.04-40.32 8.96-4.48 17.92-8.96 26.88-13.44-58.24-31.36-125.44-49.28-194.88-49.28l0 0z"  horiz-adv-x="1024" />
+			<glyph glyph-name="viewgallery" unicode="&#59060;"
+				   d="M147.04975 846.048781 348.539994 846.048781C390.229001 846.048781 423.931625 812.54407 423.931625 770.941234L423.931625 546.52218C423.931625 505.022859 390.167209 471.414635 348.539994 471.414635L147.04975 471.414635C105.360742 471.414635 71.65812 504.919345 71.65812 546.52218L71.65812 770.941234C71.65812 812.440555 105.422534 846.048781 147.04975 846.048781ZM21.333333 546.52218C21.333333 477.349489 77.549527 421.463415 147.04975 421.463415L348.539994 421.463415C417.992574 421.463415 474.25641 477.466982 474.25641 546.52218L474.25641 770.941234C474.25641 840.113925 418.040215 896 348.539994 896L147.04975 896C77.597169 896 21.333333 839.996433 21.333333 770.941234L21.333333 546.52218ZM675.460006 846.048781 876.950251 846.048781C918.639258 846.048781 952.341879 812.54407 952.341879 770.941234L952.341879 546.52218C952.341879 505.022859 918.577466 471.414635 876.950251 471.414635L675.460006 471.414635C633.770999 471.414635 600.068375 504.919345 600.068375 546.52218L600.068375 770.941234C600.068375 812.440555 633.832791 846.048781 675.460006 846.048781ZM549.74359 546.52218C549.74359 477.349489 605.959785 421.463415 675.460006 421.463415L876.950251 421.463415C946.402831 421.463415 1002.666667 477.466982 1002.666667 546.52218L1002.666667 770.941234C1002.666667 840.113925 946.450473 896 876.950251 896L675.460006 896C606.007426 896 549.74359 839.996433 549.74359 770.941234L549.74359 546.52218ZM147.04975 296.585365 348.539994 296.585365C390.229001 296.585365 423.931625 263.080655 423.931625 221.47782L423.931625-2.941233C423.931625-44.440555 390.167209-78.048781 348.539994-78.048781L147.04975-78.048781C105.360742-78.048781 71.65812-44.54407 71.65812-2.941233L71.65812 221.47782C71.65812 262.977141 105.422534 296.585365 147.04975 296.585365ZM21.333333-2.941233C21.333333-72.113924 77.549527-128 147.04975-128L348.539994-128C417.992574-128 474.25641-71.996433 474.25641-2.941233L474.25641 221.47782C474.25641 290.650511 418.040215 346.536585 348.539994 346.536585L147.04975 346.536585C77.597169 346.536585 21.333333 290.533018 21.333333 221.47782L21.333333-2.941233ZM874.686701-78.048781 868.289711-78.048781 845.457374-78.048781 776.173041-78.048781 675.395834-78.048781C633.745909-78.048781 600.068375-44.547631 600.068375-2.941233L600.068375 221.47782C600.068375 262.977141 633.832791 296.585365 675.460006 296.585365L876.950251 296.585365C918.642281 296.585365 952.341879 263.11607 952.341879 221.579471L952.341879 26.978142 952.341879-3.065886C952.341879-16.859535 963.607467-28.041495 977.504273-28.041495 991.401079-28.041495 1002.666667-16.859535 1002.666667-3.065886L1002.666667 26.978142 1002.666667 221.579471C1002.666667 290.696734 946.442579 346.536585 876.950251 346.536585L675.460006 346.536585C606.007426 346.536585 549.74359 290.533018 549.74359 221.47782L549.74359-2.941233C549.74359-72.110364 605.927488-128 675.395834-128L776.173041-128 845.457374-128 868.289711-128 874.686701-128 876.37206-128C890.847055-128 902.112642-116.818039 902.112642-103.02439 902.112642-89.230741 890.847055-78.048781 876.950251-78.048781L874.686701-78.048781Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="atmaway" unicode="&#59113;" d="M784.13 256.8l0 0c-20.69 0-37.463 44.891-37.463 100.267 0 55.376 16.773 100.267 37.463 100.267 20.69 0 37.463-44.891 37.463-100.267 0-55.376-16.773-100.267-37.463-100.267l0 0zM506.797 217.867l0 0c-20.69 0-37.463 39.28-37.463 87.733 0 48.454 16.773 87.733 37.463 87.733 20.69 0 37.463-39.28 37.463-87.733 0-48.454-16.773-87.733-37.463-87.733l0 0zM298.176 713.32c-149.272-73.128-245.851-210.105-250.381-363.22-0.112-3.774-0.168-7.555-0.168-11.34 0-13.152 10.662-23.814 23.814-23.814 13.152 0 23.814 10.662 23.814 23.814 0 3.316 0.049 6.627 0.147 9.932 3.983 134.635 89.69 256.193 223.727 321.857 11.811 5.786 16.695 20.051 10.909 31.862-5.786 11.811-20.051 16.695-31.862 10.909l0 0zM495.753-88.469c13.276-0.947 26.637-1.422 40.061-1.422 268.947 0 488.186 191.132 488.186 428.651 0 237.519-219.239 428.651-488.186 428.651 3.48 0 4.717-0.554 4.64-0.498-2.031 1.485-4.352 3.51-10.561 9.169-17.272 15.74-28.08 24.576-44.793 35.226-51.359 32.726-118.725 51.359-211.239 51.359-13.152 0-23.814-10.662-23.814-23.814 0-13.152 10.662-23.814 23.814-23.814 83.664 0 142.135-16.172 185.645-43.897 11.547-7.358 59.83-51.359 76.309-51.359 243.985 0 440.558-171.372 440.558-381.023 0-209.651-196.574-381.023-440.558-381.023-12.294 0-24.526 0.436-36.674 1.302-13.119 0.935-24.512-8.941-25.447-22.06-0.935-13.119 8.941-24.512 22.06-25.447l0 0zM238.14-137.519c131.521 0 238.14 106.619 238.14 238.14 0 131.521-106.619 238.14-238.14 238.14-131.521 0-238.14-106.619-238.14-238.14 0-131.521 106.619-238.14 238.14-238.14l0 0zM238.14-89.891c-105.217 0-190.512 85.295-190.512 190.512 0 105.217 85.295 190.512 190.512 190.512 105.217 0 190.512-85.295 190.512-190.512 0-105.217-85.295-190.512-190.512-190.512l0 0zM214.326 205.402l0-142.884c0-13.152 10.662-23.814 23.814-23.814s23.814 10.662 23.814 23.814l0 142.884c0 13.152-10.662 23.814-23.814 23.814s-23.814-10.662-23.814-23.814l0 0zM303.689 49.623l-66.679 76.205c-8.661 9.898-23.705 10.901-33.603 2.24-9.898-8.661-10.901-23.705-2.24-33.603l66.679-76.205c8.661-9.898 23.705-10.901 33.603-2.24 9.898 8.661 10.901 23.705 2.24 33.603l0 0z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="rfq1" unicode="&#59115;" d="M95.626718 553.988173C226.725812 99.524267 373.457047-54.361353 373.457047-54.361353 354.007987-23.039507 336.150869 26.36963 328.843074 104.645442 317.833444 223.162103 333.638238 324.665647 365.880738 411.399964 243.010105 519.06067 95.626718 553.988173 95.626718 553.988173M154.453485 493.914643C200.141559 475.712474 262.516736 445.407383 320.940715 398.97126 295.910059 321.999454 284.689446 239.465585 287.432249 152.654394 229.430272 272.68627 180.999358 411.936996 154.453485 493.914643M642.80007 680.666453C454.312695 534.47225 369.803151 340.99769 391.669001 105.614071 404.577508-33.521664 446.065058-83.659625 480.570786-84.177502L464.592593-84.196693C662.690323-84.196693 842.6807 541.626596 906.39853 822.065304 854.821926 804.380824 746.413321 761.033007 642.80007 680.666453ZM479.957143-122.538624C448.174914-122.059108 372.143181-99.215068 353.461325 102.065683 298.259684 696.81645 921.148303 867.197156 927.439454 868.865896L957.62963 876.787484 951.05062 846.271147C950.53293 843.87347 898.438257 604.00147 817.05529 367.23674 705.328546 42.241517 592.719644-122.557805 482.393126-122.557805L479.957143-122.538624Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="viewlist" unicode="&#59061;"
+				   d="M146.571481 846.048781 347.295185 846.048781C388.825594 846.048781 422.4 812.54407 422.4 770.941234L422.4 546.52218C422.4 505.022859 388.764036 471.414635 347.295185 471.414635L146.571481 471.414635C105.041073 471.414635 71.466667 504.919345 71.466667 546.52218L71.466667 770.941234C71.466667 812.440555 105.10263 846.048781 146.571481 846.048781ZM21.333333 546.52218C21.333333 477.349489 77.335661 421.463415 146.571481 421.463415L347.295185 421.463415C416.483543 421.463415 472.533333 477.466982 472.533333 546.52218L472.533333 770.941234C472.533333 840.113925 416.531006 896 347.295185 896L146.571481 896C77.383122 896 21.333333 839.996433 21.333333 770.941234L21.333333 546.52218ZM146.571481 296.585365 347.295185 296.585365C388.825594 296.585365 422.4 263.080655 422.4 221.47782L422.4-2.941233C422.4-44.440555 388.764036-78.048781 347.295185-78.048781L146.571481-78.048781C105.041073-78.048781 71.466667-44.54407 71.466667-2.941233L71.466667 221.47782C71.466667 262.977141 105.10263 296.585365 146.571481 296.585365ZM21.333333-2.941233C21.333333-72.113924 77.335661-128 146.571481-128L347.295185-128C416.483543-128 472.533333-71.996433 472.533333-2.941233L472.533333 221.47782C472.533333 290.650511 416.531006 346.536585 347.295185 346.536585L146.571481 346.536585C77.383122 346.536585 21.333333 290.533018 21.333333 221.47782L21.333333-2.941233ZM998.933333 746.146342C1012.777271 746.146342 1024 757.328303 1024 771.121951 1024 784.9156 1012.777271 796.097561 998.933333 796.097561L572.8 796.097561C558.956062 796.097561 547.733333 784.9156 547.733333 771.121951 547.733333 757.328303 558.956062 746.146342 572.8 746.146342L998.933333 746.146342ZM998.933333 621.268292C1012.777271 621.268292 1024 632.450255 1024 646.243902 1024 660.037551 1012.777271 671.219511 998.933333 671.219511L572.8 671.219511C558.956062 671.219511 547.733333 660.037551 547.733333 646.243902 547.733333 632.450255 558.956062 621.268292 572.8 621.268292L998.933333 621.268292ZM998.933333 496.390244C1012.777271 496.390244 1024 507.572205 1024 521.365854 1024 535.159503 1012.777271 546.341463 998.933333 546.341463L572.8 546.341463C558.956062 546.341463 547.733333 535.159503 547.733333 521.365854 547.733333 507.572205 558.956062 496.390244 572.8 496.390244L998.933333 496.390244ZM998.933333 221.658537C1012.777271 221.658537 1024 232.840497 1024 246.634146 1024 260.427795 1012.777271 271.609756 998.933333 271.609756L572.8 271.609756C558.956062 271.609756 547.733333 260.427795 547.733333 246.634146 547.733333 232.840497 558.956062 221.658537 572.8 221.658537L998.933333 221.658537ZM998.933333 96.780489C1012.777271 96.780489 1024 107.962449 1024 121.756098 1024 135.549745 1012.777271 146.731708 998.933333 146.731708L572.8 146.731708C558.956062 146.731708 547.733333 135.549745 547.733333 121.756098 547.733333 107.962449 558.956062 96.780489 572.8 96.780489L998.933333 96.780489ZM998.933333-28.097562C1012.777271-28.097562 1024-16.915599 1024-3.121952 1024 10.671697 1012.777271 21.853658 998.933333 21.853658L572.8 21.853658C558.956062 21.853658 547.733333 10.671697 547.733333-3.121952 547.733333-16.915599 558.956062-28.097562 572.8-28.097562L998.933333-28.097562Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="scanning" unicode="&#59116;" d="M910.390485 476.93824C898.522325 476.93824 888.928939 486.53184 888.928939 498.4L888.928939 756.884053C888.928939 774.63296 874.485205 789.07648 856.736469 789.07648 845.340331 789.07648 612.760491 788.8192 598.960683 788.389973 588.315605 787.7888 578.121429 795.23584 576.297259 806.245973 574.344149 817.942187 582.220672 828.995413 593.895723 830.9696 599.862059 831.97824 854.182528 832 856.736469 832 898.157525 832 931.852245 798.304853 931.852245 756.884053L931.852245 498.4C931.852245 486.53184 922.258859 476.93824 910.390485 476.93824L910.390485 476.93824ZM85.461632 476.93824C73.593387 476.93824 64 486.53184 64 498.4L64 756.884053C64 798.304853 97.694805 832 139.115819 832 141.669717 832 395.990187 831.97824 401.956565 830.9696 413.631659 828.995413 421.508139 817.942187 419.555072 806.245973 417.709355 795.23584 407.686699 787.810133 396.891605 788.389973 383.091755 788.8192 150.511915 789.07648 139.115819 789.07648 121.366912 789.07648 106.923307 774.63296 106.923307 756.884053L106.923307 498.4C106.923307 486.53184 97.329963 476.93824 85.461632 476.93824L85.461632 476.93824ZM856.736469-77.728C854.182528-77.728 599.862059-77.70624 593.895723-76.698027 582.220672-74.72384 574.344149-63.670613 576.297259-51.973973 578.121429-40.964267 588.315605-33.62432 598.960683-34.117973 612.696192-34.5472 845.340331-34.804907 856.736469-34.804907 874.485205-34.804907 888.928939-20.361387 888.928939-2.612907L888.928939 255.871573C888.928939 267.74016 898.522325 277.333333 910.390485 277.333333 922.258859 277.333333 931.852245 267.74016 931.852245 255.871573L931.852245-2.612907C931.852245-44.033707 898.157525-77.728 856.736469-77.728L856.736469-77.728ZM139.115819-77.728C97.694805-77.728 64-44.033707 64-2.612907L64 255.871573C64 267.74016 73.593387 277.333333 85.461632 277.333333 97.329963 277.333333 106.923307 267.74016 106.923307 255.871573L106.923307-2.612907C106.923307-20.361387 121.366912-34.804907 139.115819-34.804907 150.511915-34.804907 383.156139-34.5472 396.891605-34.117973 407.708245-33.64608 417.709355-40.964267 419.555072-51.973973 421.508139-63.670613 413.631659-74.72384 401.956565-76.698027 395.990187-77.70624 141.669717-77.728 139.115819-77.728L139.115819-77.728ZM983.5232 362.409813 42.794965 362.409813C30.926592 362.409813 21.333333 372.003413 21.333333 383.872 21.333333 395.739733 30.926592 405.333333 42.794965 405.333333L983.5232 405.333333C995.391488 405.333333 1004.984832 395.739733 1004.984832 383.872 1004.984832 372.003413 995.391488 362.409813 983.5232 362.409813L983.5232 362.409813Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="compare" unicode="&#59118;" d="M247.1424 101.0176c-1.0752 0-2.176 0.0768-3.2768 0.2304-10.8032 1.3568-19.6096 9.3952-21.9648 20.0448L112.64 613.888c-3.0976 13.952 5.7088 27.7504 19.6608 30.848 13.8752 3.1232 27.7504-5.7088 30.848-19.6608l93.6704-422.3232 218.5472 428.4928c6.5024 12.7232 22.016 17.792 34.7904 11.2896 12.7232-6.5024 17.7664-22.0672 11.2896-34.7904l-251.2384-492.6208C265.7024 106.3936 256.768 101.0176 247.1424 101.0176zM669.184 102.2208c-4.8128 0-9.7024 0.128-14.6176 0.3584-58.4448 3.0976-104.9344 22.912-134.4 57.3696-24.1664 28.2112-34.8416 63.7696-30.848 102.784l0.5888 5.0176c1.9712 14.1568 14.9248 24.0128 29.2096 22.0672 14.1568-1.9712 24.0128-15.0272 22.0672-29.2096l-0.3584-3.1488c-2.5088-24.576 3.9424-46.6432 18.6624-63.8208 20.0704-23.424 53.888-37.0432 97.8432-39.3728 85.9648-4.48 151.8848 41.9584 169.9584 87.9616 18.0736 45.9776-27.6992 74.7776-48.1792 85.0176-10.3424 5.1712-31.4624 10.9056-53.7856 16.9984-65.3312 17.7664-146.6368 39.8848-174.8736 95.0784-12.1088 23.6288-12.8256 49.9968-2.176 78.336 19.0208 50.56 51.1488 86.2464 95.488 106.0096 51.5072 22.9632 119.8848 22.0416 182.8608-2.5344 75.8016-29.568 89.7792-108.3136 86.5792-145.8176-1.2032-14.2336-13.568-24.8064-27.9808-23.6032-14.208 1.2032-24.7296 13.6448-23.6032 27.8528l0 0c0.2304 2.8672 4.5568 70.5792-53.7856 93.3376-50.3552 19.6352-103.7824 20.9664-142.976 3.4816-31.2576-13.9264-54.1696-39.8592-68.1472-76.9792-7.1936-19.072-3.5584-30.0032-0.2048-36.5568 17.792-34.816 92.7488-55.1936 142.3872-68.7104 26.0096-7.0656 48.4352-13.1584 63.36-20.6336 68.1728-34.0992 96.2304-91.648 73.1904-150.2208C851.2256 161.7152 773.4272 102.2208 669.184 102.2208zM1024 681.3952 1024 163.072c0-14.08-11.52-25.6-25.6-25.6s-25.6 11.52-25.6 25.6L972.8 681.3952c0 33.536-28.416 60.928-61.952 60.928L112.128 742.3232C78.592 742.3232 51.2 717.7472 51.2 684.2112l0-597.8624c0-33.536 27.392-60.928 60.928-60.928l742.7584 0c14.08 0 25.6-11.52 25.6-25.6s-11.52-25.6-25.6-25.6L112.128-25.7792c-61.952 0-112.128 50.176-112.128 112.128L0 684.2112c0 61.952 50.176 109.312 112.128 109.312l798.72 0C972.544 793.5232 1024 743.3472 1024 681.3952z"  horiz-adv-x="1024" />
+			<glyph glyph-name="warning" unicode="&#59062;"
+				   d="M598.272514 737.82091C545.018272 824.005964 451.264177 824.048599 397.724122 737.602659L25.049726 135.881414C-28.93569 48.716393 14.324655-31.325257 116.435565-33.308966L891.057077-33.313666C993.88467-35.315989 1036.926865 27.961741 983.25955 114.810306 980.374633 119.478901 980.374633 119.478901 971.719878 133.484687 967.393745 140.485568 967.393745 140.485568 963.78822 146.320305 956.511588 158.09591 941.113263 161.714133 929.3951 154.40183 917.676937 147.089527 914.076365 131.615721 921.352996 119.840115 924.958522 114.005378 924.958522 114.005378 929.284655 107.004497 937.939409 92.998711 937.939409 92.998711 940.824326 88.330116 972.284602 37.418686 957.441559 15.597451 891.539823 16.877724L116.918309 16.882423C54.037254 18.108704 33.95555 55.264503 67.458075 109.357783L440.132471 711.079029C474.112981 765.944069 522.112175 765.922241 556.029583 711.034491L857.08969 239.16029C864.534622 227.491405 879.98329 224.0968 891.595253 231.578227 903.207217 239.059657 906.585263 254.584051 899.140331 266.252937L598.272514 737.82091ZM474.536585 276.206654C474.536585 262.345389 485.718547 251.108614 499.512194 251.108614 513.305843 251.108614 524.487806 262.345389 524.487806 276.206654L524.487806 596.206654C524.487806 610.067918 513.305843 621.304693 499.512194 621.304693 485.718547 621.304693 474.536585 610.067918 474.536585 596.206654L474.536585 276.206654ZM474.465781 119.263855C474.565553 105.402953 485.828105 94.24775 499.621393 94.348013 513.414679 94.448275 524.515467 105.766033 524.415695 119.626935L523.955031 183.624333C523.855258 197.485233 512.592708 208.640437 498.79942 208.540175 485.006133 208.439913 473.905346 197.122153 474.005118 183.261252L474.465781 119.263855Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="filter" unicode="&#59121;" d="M1024 776.448c0-32-12.544-61.952-35.072-84.48L665.6 384.4864 665.6-102.4c0-14.08-11.52-25.6-25.6-25.6s-25.6 11.52-25.6 25.6L614.4 395.4944c0 6.912 2.816 13.824 7.936 18.432L953.088 728.576c12.544 12.544 19.712 29.696 19.712 47.872 0 37.632-30.72 68.352-68.352 68.352 0 0-784.128 0-784.896 0C81.92 844.8 51.2 814.08 51.2 776.448c0-18.176 7.168-35.328 19.968-48.384l305.152-314.88c4.864-4.864 7.68-11.52 7.68-18.432L384 25.6c0-14.336-11.52-25.6-25.6-25.6s-25.6 11.264-25.6 25.6l0 358.4L35.328 691.712C12.544 714.496 0 744.448 0 776.448c0 66.048 53.76 119.552 119.552 119.552 0.768 0 784.896 0 784.896 0C970.496 896 1024 842.496 1024 776.448z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="pin" unicode="&#59122;" d="M51.196068-128c-13.021992 0-26.0184 5.091113-36.021541 15.094254-18.113104 18.164271-20.262117 46.050265-5.091113 66.337966l213.059228 288.325828-166.983379 166.983379C39.862586 425.038104 36.639068 450.51925 48.305135 470.7302c7.982046 12.612656 76.699275 112.82315 229.483822 75.010766 2.532765-0.307002 5.270197-0.537253 8.212297-0.793088 6.267953-0.537253 13.277827-1.17684 20.87612-2.404847 32.33752-5.244614 89.516599 20.722619 139.148552 63.037697 47.559691 40.49865 78.285451 87.751339 78.285451 120.344693 0 7.57271-0.179084 15.631507-0.358169 23.536802-1.279174 30.623426-3.223519 77.697031 31.979351 112.874317 41.649907 41.701074 107.552953 45.05251 153.270633 7.854129 0.921005-0.741921 1.76526-1.535009 2.583932-2.379264l-0.025583 0c24.585725-24.048472 276.608594-275.815506 279.243692-278.476188 21.694792-21.694792 33.642277-50.527374 33.693444-81.176384 0.025583-30.674593-11.896319-59.456009-33.539943-81.099634-35.023785-35.049369-82.353225-33.053857-113.565071-31.723516-7.393626 0.153501-15.478006 0.332585-23.025133 0.332585-30.828094 0-67.69389-21.592458-103.715431-60.760767-50.808793-55.260318-82.09739-126.63823-79.411124-158.617581 1.125673-10.258976 3.223519-28.37208 3.607271-30.930428 36.891379-149.612195-63.114447-217.843339-74.627013-225.109047-20.697036-12.484739-46.357267-9.389137-63.012113 7.240125l-178.393611 178.393611c-10.003141 10.003141-10.003141 26.171901 0 36.175042s26.171901 10.003141 36.175042 0l178.393611-178.393611c7.854129 5.091113 80.101878 54.646315 51.320462 171.76749-0.51167 2.35368-3.044434 23.562386-4.374775 35.970374-4.298025 51.115795 35.586622 136.027367 92.688951 198.118475 32.439854 35.254036 83.27423 77.287695 141.348731 77.287695 7.905296 0 16.399011-0.179084 24.662475-0.358169 32.41427-1.355924 58.048918-0.972172 75.77827 16.782763 11.973069 11.973069 18.548024 27.885994 18.548024 44.847842-0.025583 17.013015-6.677288 33.00269-18.701524 45.05251C952.220677 555.76969 683.849964 823.756651 675.944668 831.354945c-24.278723 19.724864-60.7096 17.882853-83.785899-5.21903-17.908437-17.908437-18.317772-43.491917-17.013015-75.087516 0.204668-8.800717 0.383752-17.243266 0.383752-25.148562 0-48.378362-35.995957-107.936705-96.270638-159.282751-49.478452-42.135993-122.979792-83.811483-180.491457-74.60143-6.293536 1.023339-12.049819 1.509425-17.192099 1.944345-3.325852 0.281418-6.421454 0.562837-9.312387 0.921005-2.456014 0.07675-4.860861 0.537253-7.188958 1.304758-117.760762 29.037251-167.597382-43.44075-172.893163-51.806549l182.742803-182.026466c8.954218-8.954218 10.028724-23.101883 2.481598-33.309692L51.170485-77.114457l238.617125 174.530506c11.435816 8.365798 27.425491 5.80745 35.740123-5.602782s5.80745-27.399908-5.602782-35.714539l-238.821793-174.12117C72.148939-124.699731 61.685295-128 51.196068-128z"  horiz-adv-x="1025" />
+			<glyph glyph-name="wrong" unicode="&#59063;"
+				   d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 629.410831-128 740.826187-88.331046 830.768465-16.686662 841.557579-8.092491 843.33693 7.620766 834.742758 18.409879 826.148587 29.198991 810.43533 30.978342 799.646219 22.384173 718.470035-42.277495 618.001779-78.048781 512-78.048781 256.817504-78.048781 49.951219 128.817504 49.951219 384 49.951219 639.182496 256.817504 846.048781 512 846.048781 767.182496 846.048781 974.048781 639.182496 974.048781 384 974.048781 296.507166 949.714859 212.663236 904.470807 140.039307 897.177109 128.331757 900.755245 112.928203 912.462793 105.634507 924.170342 98.340809 939.573897 101.918942 946.867595 113.626492 997.013826 194.119204 1024 287.101621 1024 384ZM331.838918 232.424508C322.174057 222.583006 322.317252 206.769971 332.158756 197.105109 342.000258 187.440247 357.813293 187.583443 367.478155 197.424947L717.473766 553.817293C727.138628 563.658795 726.995433 579.471829 717.153931 589.136691 707.312427 598.801553 691.499394 598.658357 681.834532 588.816853L331.838918 232.424508ZM681.834532 197.424947C691.499394 187.583443 707.312427 187.440247 717.153931 197.105109 726.995433 206.769971 727.138628 222.583006 717.473766 232.424508L367.478155 588.816853C357.813293 598.658357 342.000258 598.801553 332.158756 589.136691 322.317252 579.471829 322.174057 563.658795 331.838918 553.817293L681.834532 197.424947Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="history" unicode="&#59123;" d="M65.770667 510.229333c-11.776 0-21.333333 9.557333-21.333333 21.333333l0 256c0 11.776 9.557333 21.333333 21.333333 21.333333s21.333333-9.557333 21.333333-21.333333l0-256C87.104 519.786667 77.546667 510.229333 65.770667 510.229333zM300.437333 510.229333l-234.666667 0c-11.776 0-21.333333 9.557333-21.333333 21.333333s9.557333 21.333333 21.333333 21.333333l234.666667 0c11.776 0 21.333333-9.557333 21.333333-21.333333S312.213333 510.229333 300.437333 510.229333zM513.770667 275.562667c-11.776 0-21.333333 9.557333-21.333333 21.333333l0 384c0 11.776 9.557333 21.333333 21.333333 21.333333s21.333333-9.557333 21.333333-21.333333l0-384C535.104 285.12 525.546667 275.562667 513.770667 275.562667zM634.965333 211.114667c-5.952 0-11.861333 2.474667-16.064 7.296l-185.6 212.266667c-7.744 8.874667-6.848 22.336 2.026667 30.101333 8.896 7.744 22.357333 6.826667 30.101333-2.026667l185.6-212.266667c7.744-8.874667 6.848-22.336-2.026667-30.101333C644.949333 212.885333 639.936 211.114667 634.965333 211.114667zM513.770667-87.104c-258.794667 0-469.333333 210.538667-469.333333 469.333333 0 11.776 9.557333 21.333333 21.333333 21.333333s21.333333-9.557333 21.333333-21.333333c0-235.264 191.402667-426.666667 426.666667-426.666667 235.264 0 426.666667 191.402667 426.666667 426.666667 0 235.264-191.402667 426.666667-426.666667 426.666667-173.568 0-328.448-103.68-394.624-264.128-4.458667-10.88-16.896-16.085333-27.861333-11.584-10.88 4.48-16.085333 16.96-11.584 27.861333C152.469333 737.514667 322.858667 851.562667 513.770667 851.562667c258.794667 0 469.333333-210.538667 469.333333-469.333333S772.565333-87.104 513.770667-87.104z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="productfeatures" unicode="&#59124;" d="M302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM458.999525-124.8768c5.888-1.792 12.544-1.28 18.688 2.304C472.055525-125.6448 465.399525-126.6688 458.999525-124.8768zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM477.687525-122.5472c-6.144-3.584-12.8-4.096-18.688-2.304C465.399525-126.6688 472.055525-125.6448 477.687525-122.5472zM857.284325-72.6784c-14.1568 0-25.6 11.4432-25.6 25.6l0 192.1792c0 6.9888 2.8672 13.7216 7.9616 18.56l127.616 121.3696c3.712 3.712 5.888 8.9856 5.888 14.7968 0 11.904-9.7024 21.5808-21.6064 21.5808L641.757925 321.408c-11.904 0-21.6064-9.6768-21.6064-21.5808 0-5.8368 2.2272-11.136 6.4512-15.36l117.7344-121.7792c4.6336-4.7872 7.1936-11.1616 7.1936-17.792l0-141.44c0-14.1568-11.4432-25.6-25.6-25.6s-25.6 11.4432-25.6 25.6l0 131.0976-110.2336 114.0224c-13.5168 13.5168-21.1456 31.8208-21.1456 51.2512 0 40.1152 32.64 72.7808 72.8064 72.7808l309.8112 0c40.1408 0 72.8064-32.64 72.8064-72.7808 0-19.4304-7.5776-37.6832-21.3504-51.456l-120.1152-114.2528 0-181.1968C882.884325-61.2352 871.441125-72.6784 857.284325-72.6784zM920.157925 629.6064c7.9872 5.1968 9.4976 11.8016 10.5472 16.5376 1.024 9.728-3.584 19.968-13.568 25.088l-440.32 220.16c-7.168 3.584-15.36 3.584-22.528 0l-440.32-220.16C-2.414875 660.48 0.145125 636.672 0.145125 634.112l0-469.76c0-8.704 4.608-16.896 12.032-21.504 0 0 430.848-260.352 438.272-263.68 15.104-7.424 24.576-5.376 31.744-1.792l143.36 82.944c12.288 7.168 16.384 22.784 9.216 35.072-6.912 12.288-22.784 16.384-34.816 9.472l-99.072-57.6 0 0.256-10.24-5.632L490.641125 384.256l389.632 221.184L920.157925 629.6064zM440.465125 384.256l0-441.088L50.065125 178.432l0 427.52L440.465125 384.256zM465.553125 427.776 78.225125 647.424l387.328 193.536 387.328-193.536L465.553125 427.776z"  horiz-adv-x="1025" />
+			<glyph glyph-name="account" unicode="&#59064;"
+				   d="M793.6 579.008546C793.6 742.296018 661.792629 874.666667 499.2 874.666667 336.607371 874.666667 204.8 742.296018 204.8 579.008546 204.8 415.721077 336.607371 283.350428 499.2 283.350428 661.792629 283.350428 793.6 415.721077 793.6 579.008546ZM256 579.008546C256 713.898197 364.88435 823.247863 499.2 823.247863 633.51565 823.247863 742.4 713.898197 742.4 579.008546 742.4 444.118897 633.51565 334.769231 499.2 334.769231 364.88435 334.769231 256 444.118897 256 579.008546ZM0-102.290598 0-128 25.6-128 486.4-128 998.4-128 1024-128 1024-102.290598C1024 128.537329 787.090923 334.769231 512 334.769231 495.448045 334.769231 478.989086 334.099108 462.660538 332.767422 448.568439 331.618131 485.255599 319.213724 486.4 305.061404 501.350035 306.280663 496.831226 283.350428 512 283.350428 760.310844 283.350428 972.8 98.376331 972.8-102.290598L998.4-76.581197 486.4-76.581197 25.6-76.581197 51.2-102.290598C51.2 34.242573 137.013906 159.054662 275.263548 228.560915 287.906261 234.917154 293.024384 250.362647 286.695191 263.05939 280.366001 275.756134 264.986234 280.896128 252.34352 274.539889 97.581613 196.731947 0 54.804309 0-102.290598Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="supplierfeatures" unicode="&#59125;" d="M463.027961 339.873032c-153.338036 0-278.088918 124.725448-278.088918 278.063484S309.689925 896 463.027961 896s278.063484-124.750882 278.063484-278.088918S616.365997 339.873032 463.027961 339.873032zM463.027961 845.006011c-125.208683 0-227.069495-101.860812-227.069495-227.069495s101.860812-227.044061 227.069495-227.044061 227.044061 101.860812 227.044061 227.044061C690.097456 743.145199 588.236644 845.006011 463.027961 845.006011zM33.991749-24.002782c-1.831206 0-3.662411 0.203467-5.51905 0.610402-13.759475 3.026576-22.432269 16.658884-19.405693 30.41836 27.13745 122.741642 99.724405 229.282202 204.408325 299.987085 11.673936 7.833491 27.544384 4.781481 35.403308-6.867021 7.884357-11.673936 4.806915-27.518951-6.867021-35.428742-93.79842-63.329194-158.831653-158.780786-183.12056-268.703989C56.245983-15.914957 45.691118-24.002782 33.991749-24.002782zM609.397243-24.028215 34.042615-24.028215c-14.09011 0-25.509711 11.419602-25.509711 25.509711s11.419602 25.509711 25.509711 25.509711l575.329194 0c14.09011 0 25.509711-11.419602 25.509711-25.509711S623.487352-24.028215 609.397243-24.028215zM854.67706-128c-14.064676 0-25.433411 11.368735-25.433411 25.433411l0 190.928618c0 6.943321 2.848542 13.632308 7.909791 18.439223l126.785555 120.579802c3.687845 3.687845 5.849685 8.927127 5.849685 14.700512 0 11.826536-9.639263 21.440366-21.465799 21.440366L640.553171 263.521931c-11.826536 0-21.465799-9.613829-21.465799-21.440366 0-5.798818 2.212707-11.063534 6.40922-15.260047l116.968258-120.986737c4.603447-4.756048 7.146789-11.088967 7.146789-17.676221l0-140.519597c0-14.064676-11.368735-25.433411-25.433411-25.433411s-25.433411 11.368735-25.433411 25.433411l0 130.244499-109.516268 113.280413c-13.428841 13.428841-21.007998 31.61373-21.007998 50.917689 0 39.854155 32.427599 72.307188 72.332621 72.307188l307.795142 0c39.879589 0 72.332621-32.427599 72.332621-72.307188 0-19.303959-7.52829-37.437981-21.211465-51.121156l-119.333565-113.509314 0-180.017684C880.110471-116.605832 868.716303-128 854.67706-128z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="similarproduct" unicode="&#59126;" d="M302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM458.999525-124.8768c5.888-1.792 12.544-1.28 18.688 2.304C472.055525-125.6448 465.399525-126.6688 458.999525-124.8768zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM477.687525-122.5472c-6.144-3.584-12.8-4.096-18.688-2.304C465.399525-126.6688 472.055525-125.6448 477.687525-122.5472zM490.641125-58.112 490.641125 384.256l389.632 221.184 39.8848 24.1664c7.9872 5.1968 9.4976 11.8016 10.5472 16.5376 1.024 9.728-3.584 19.968-13.568 25.088l-440.32 220.16c-7.168 3.584-15.36 3.584-22.528 0l-440.32-220.16C-2.414875 660.48 0.145125 636.672 0.145125 634.112l0-469.76c0-8.704 4.608-16.896 12.032-21.504 0 0 430.848-260.352 438.272-263.68 15.104-7.424 24.576-5.376 31.744-1.792l143.36 82.944c12.288 7.168 16.384 22.784 9.216 35.072-6.912 12.288-22.784 16.384-34.816 9.472l-99.072-57.6 0 0.256L490.641125-58.112M440.465125 384.256l0-441.088L50.065125 178.432l0 427.52L440.465125 384.256zM465.553125 427.776 78.225125 647.424l387.328 193.536 387.328-193.536L465.553125 427.776zM812.945125-21.376l201.984 121.344c5.632 3.584 9.216 9.728 9.216 16.64l0 222.464c0 7.8336-5.888 13.312-12.288 16.384l-5.12 2.56c-0.512 0.256-1.28 0.256-1.792 0.256l1.536 0-196.352 98.048c-5.376 2.56-11.776 2.56-17.152 0l-196.096-98.048c-14.336-5.504-17.92-17.792-17.92-24.704l0-216.96c0-6.912 3.584-13.056 9.472-16.64 0 0 200.1664-120.0896 201.1904-120.3456C789.623525-20.4032 801.553125-29.2352 812.945125-21.376zM782.481125 27.776l-165.12 99.584 0 178.944 165.12-93.44L782.481125 27.776zM801.681125 245.888l-161.024 91.392 161.024 80.384 160.768-80.384L801.681125 245.888zM985.745125 127.36l-164.864-99.328 0 184.832 164.864 93.44L985.745125 127.36z"  horiz-adv-x="1025" />
+			<glyph glyph-name="add" unicode="&#59065;"
+				   d="M853.333333 362.666667C865.115407 362.666667 874.666667 372.217926 874.666667 384 874.666667 395.782074 865.115407 405.333333 853.333333 405.333333L170.666667 405.333333C158.884592 405.333333 149.333333 395.782074 149.333333 384 149.333333 372.217926 158.884592 362.666667 170.666667 362.666667L853.333333 362.666667ZM490.666667 42.666667C490.666667 30.884593 500.217926 21.333333 512 21.333333 523.782074 21.333333 533.333333 30.884593 533.333333 42.666667L533.333333 725.333333C533.333333 737.115408 523.782074 746.666667 512 746.666667 500.217926 746.666667 490.666667 737.115408 490.666667 725.333333L490.666667 42.666667Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="link" unicode="&#59127;" d="M331.502964 564.503436c-11.110365-11.110365-11.110365-29.107109 0-40.191874l321.816594-321.790994c11.110365-11.161565 29.107109-11.110365 40.191874-0.0256 11.110365 11.110365 11.110365 29.081509 0 40.191874L371.720439 564.503436C360.610073 575.588201 342.61333 575.588201 331.502964 564.503436zM96.2141 836.041787 59.990213 799.7923c-79.97415-79.97415-79.99975-209.637745 0-289.611895l126.719604-126.719604c62.668604-62.719804 155.749913-75.878163 231.602476-40.243074 0.281599 0.128 0.537598 0.230399 0.844797 0.332799 0.537598 0.255999 1.177596 0.486398 1.715195 0.742398-0.0512 0.128 0.0512-0.128 0 0 2.713592 1.356796 5.171184 3.07199 7.449577 5.350383 11.238365 11.238365 11.238365 29.491108 0 40.755073-9.036772 9.011172-22.24633 10.598367-33.049497 5.171184-0.0512 0.1536 0.0768-0.1536 0 0-56.575823-25.72792-125.849207-15.180753-172.364261 31.359902L103.433277 546.378692c-59.980613 60.006212-59.980613 157.234709 0 217.215321L132.386787 792.573123c59.980613 59.980613 157.234709 59.955013 217.215321 0l119.474827-119.474827c47.283052-47.257452 57.292621-117.810832 30.131106-174.847454 0 0 0.0256 0.0256 0 0-0.0768-0.204799 0.1024 0.204799 0 0 0.0512-0.0256-0.0256 0.0256 0 0-3.839988-10.239968-2.227193-22.707129 6.015981-30.950303 11.238365-11.238365 29.491108-11.263965 40.755073 0 2.303993 2.303993 4.377586 4.915185 5.759982 7.679976 0.1536-0.0256-0.179199 0.0256 0 0 37.196684 76.313361 24.217524 170.905066-39.167878 234.316068l-126.719604 126.719604C305.851844 915.990337 176.16265 915.990337 96.2141 836.041787zM963.411389-31.155503l-36.249487-36.223887c-79.97415-79.97415-209.637745-79.97415-289.611895 0.0256l-126.719604 126.694004c-62.668604 62.668604-75.878163 155.775513-40.217474 231.602476 0.128 0.281599 0.230399 0.537598 0.332799 0.844797 0.255999 0.537598 0.511998 1.203196 0.742398 1.715195 0.128-0.0512-0.128 0.0512 0 0 1.356796 2.713592 3.07199 5.171184 5.350383 7.449577 11.238365 11.238365 29.491108 11.238365 40.780673 0 8.985572-9.011172 10.572767-22.220731 5.119984-33.049497 0.179199-0.0768-0.128 0.0768 0 0-25.72792-56.601423-15.155153-125.823607 31.385502-172.364261l119.474827-119.449227c60.006212-60.006212 157.234709-60.006212 217.215321 0l28.95351 28.95351c60.006212 60.006212 59.980613 157.234709 0 217.189721l-119.449227 119.474827c-47.283052 47.257452-117.810832 57.292621-174.847454 30.131106-0.0256 0 0.0256 0 0 0-0.204799-0.128 0.230399 0.0768 0 0-0.0256 0 0.0256-0.0256 0 0-10.239968-3.865588-22.707129-2.252793-30.950303 6.015981-11.238365 11.263965-11.238365 29.491108-0.0256 40.755073 2.303993 2.278393 4.889585 4.351986 7.705576 5.734382-0.0256 0.128 0.0256-0.179199 0 0 76.313361 37.222284 170.905066 24.217524 234.290468-39.167878l126.719604-126.719604C1043.359939 178.507842 1043.359939 48.818647 963.411389-31.155503z"  horiz-adv-x="1025" />
 
-    
-    <glyph glyph-name="cut" unicode="&#59128;" d="M995.5584 56.9088 896 56.9088 896 540.4416c0 15.6928-12.7488 28.4416-28.4416 28.4416s-28.4416-12.7488-28.4416-28.4416l0-483.5584L225.1008 56.8832 930.3552 762.112c11.1104 11.1104 11.1104 29.1072 0 40.2176-11.136 11.1104-29.1584 11.1104-40.2432 0L184.8832 97.1008 184.8832 711.1168l469.3248 0c15.7184 0 28.416 12.7488 28.416 28.4416C682.6496 755.2512 669.952 768 654.2336 768L184.8832 768 184.8832 867.5584C184.8832 883.2512 172.16 896 156.4416 896 140.7488 896 128 883.2512 128 867.5584L128 768 28.4416 768C12.7488 768 0 755.2512 0 739.5584c0-15.6928 12.7488-28.4416 28.4416-28.4416L128 711.1168l0-682.6752C128 12.7488 140.7488 0 156.4416 0l682.6496 0 0-99.5584c0-15.6928 12.7488-28.4416 28.4416-28.4416S896-115.2512 896-99.5584L896 0l99.5584 0C1011.2512 0 1024 12.7488 1024 28.4416S1011.2512 56.9088 995.5584 56.9088z"  horiz-adv-x="1024" />
+			<glyph glyph-name="atm" unicode="&#59066;"
+				   d="M786.731708 248C807.42218 248 824.195121 292.890916 824.195121 348.266667 824.195121 403.642417 807.42218 448.533333 786.731708 448.533333 766.041235 448.533333 749.268292 403.642417 749.268292 348.266667 749.268292 292.890916 766.041235 248 786.731708 248ZM462.048781 197.866667C482.739253 197.866667 499.512194 237.146219 499.512194 285.6 499.512194 334.053783 482.739253 373.333333 462.048781 373.333333 441.358308 373.333333 424.585365 334.053783 424.585365 285.6 424.585365 237.146219 441.358308 197.866667 462.048781 197.866667ZM0 323.2C0 73.186074 229.933961-128 512-128 794.066039-128 1024 73.186074 1024 323.2 1024 573.213926 794.066039 774.400001 512 774.400001 515.649685 774.400001 516.946722 773.816747 516.866057 773.875947 514.736119 775.439072 512.302005 777.571016 505.789668 783.527388 487.675081 800.095511 476.340222 809.396515 458.812092 820.606339 404.94781 855.054345 334.29571 874.666667 237.268292 874.666667 223.474645 874.666667 212.292683 863.443938 212.292683 849.6 212.292683 835.756062 223.474645 824.533333 237.268292 824.533333 325.013274 824.533333 386.336418 807.510637 431.969129 778.326995 444.078925 770.582377 494.717728 724.266667 512 724.266667 767.886246 724.266667 974.048781 543.879957 974.048781 323.2 974.048781 102.520045 767.886246-77.866667 512-77.866667 256.113754-77.866667 49.951219 102.520045 49.951219 323.2 49.951219 468.970155 140.536466 601.537705 284.745583 672.442882 297.132651 678.533393 302.254953 693.549039 296.186566 705.981267 290.11818 718.413495 275.157079 723.554473 262.770012 717.463962 102.138268 638.484055 0 489.009167 0 323.2Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="navlist" unicode="&#59130;" d="M284.416 777.984l711.168 0C1011.2768 777.984 1024 790.7072 1024 806.4c0 15.6928-12.7232 28.416-28.416 28.416L284.416 834.816C268.7232 834.816 256 822.0928 256 806.4 256 790.7072 268.7232 777.984 284.416 777.984zM125.184 834.816 28.416 834.816C12.7232 834.816 0 822.0928 0 806.4c0-15.6928 12.7232-28.416 28.416-28.416l96.768 0C140.8768 777.984 153.6 790.7072 153.6 806.4 153.6 822.0928 140.8768 834.816 125.184 834.816zM995.584 553.216 284.416 553.216c-15.6928 0-28.416-12.7232-28.416-28.416 0-15.6928 12.7232-28.416 28.416-28.416l711.168 0c15.6928 0 28.416 12.7232 28.416 28.416C1024 540.4928 1011.2768 553.216 995.584 553.216zM125.184 553.216 28.416 553.216C12.7232 553.216 0 540.4928 0 524.8c0-15.6928 12.7232-28.416 28.416-28.416l96.768 0C140.8768 496.384 153.6 509.1072 153.6 524.8 153.6 540.4928 140.8768 553.216 125.184 553.216zM585.984-9.984 284.416-9.984c-15.6928 0-28.416-12.7232-28.416-28.3904 0-15.6928 12.7232-28.4416 28.416-28.4416l301.568 0c15.6928 0 28.416 12.7488 28.416 28.4416C614.4-22.7072 601.6768-9.984 585.984-9.984zM125.184-9.984 28.416-9.984C12.7232-9.984 0-22.7072 0-38.3744c0-15.6928 12.7232-28.4416 28.416-28.4416l96.768 0c15.6928 0 28.416 12.7488 28.416 28.4416C153.6-22.7072 140.8768-9.984 125.184-9.984zM585.984 271.616 284.416 271.616c-15.6928 0-28.416-12.7232-28.416-28.3904 0-15.6928 12.7232-28.4416 28.416-28.4416l301.568 0c15.6928 0 28.416 12.7488 28.416 28.4416C614.4 258.8928 601.6768 271.616 585.984 271.616zM125.184 271.616 28.416 271.616C12.7232 271.616 0 258.8928 0 243.2256c0-15.6928 12.7232-28.4416 28.416-28.4416l96.768 0c15.6928 0 28.416 12.7488 28.416 28.4416C153.6 258.8928 140.8768 271.616 125.184 271.616zM995.584 166.3744l-122.368 0 0 122.368c0 15.6928-12.7232 28.416-28.3904 28.416-15.6928 0-28.416-12.7232-28.416-28.416l0-122.368L694.016 166.3744c-15.6928 0-28.416-12.7232-28.416-28.416 0-15.6672 12.7232-28.3904 28.416-28.3904l122.3424 0L816.3584-12.8c0-15.6928 12.7232-28.416 28.416-28.416 15.6672 0 28.3904 12.7232 28.3904 28.416l0 122.3424 122.368 0c15.6928 0 28.416 12.7232 28.416 28.3904C1024 153.6512 1011.2768 166.3744 995.584 166.3744z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="imagetext" unicode="&#59131;" d="M608 602.8032c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.336-11.4432 25.9328-25.6 25.9328l-140.8 0c-14.1312 0-25.6-11.6224-25.6-25.9328 0-14.336 11.4688-25.9584 25.6-25.9584L608 602.8032 608 602.8032zM864 602.8032c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.336-11.4432 25.9328-25.6 25.9328l-140.8 0c-14.1568 0-25.6-11.6224-25.6-25.9328 0-14.336 11.4432-25.9584 25.6-25.9584L864 602.8032 864 602.8032zM608 447.1552c14.1568 0 25.6 11.5968 25.6 25.9328s-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1312 0-25.6-11.6224-25.6-25.9584s11.4688-25.9328 25.6-25.9328L608 447.1552 608 447.1552zM864 447.1552c14.1568 0 25.6 11.5968 25.6 25.9328s-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1568 0-25.6-11.6224-25.6-25.9584s11.4432-25.9328 25.6-25.9328L864 447.1552 864 447.1552zM608 291.456c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1312 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4688-25.9584 25.6-25.9584L608 291.456 608 291.456zM864 291.456c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1568 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4432-25.9584 25.6-25.9584L864 291.456 864 291.456zM864 291.456M608 135.7312c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1312 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4688-25.9584 25.6-25.9584L608 135.7312 608 135.7312zM864 135.7312c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1568 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4432-25.9584 25.6-25.9584L864 135.7312 864 135.7312zM864 135.7312M881.7664 832 28.4416 832 0 832l0-28.9024 0-722.5344C0 0.7424 63.6928-64 142.2336-64l853.3248 0L1024-64l0 28.9024L1024 225.024c0 15.9744-12.7232 28.9024-28.4416 28.9024-15.6928 0-28.4416-12.928-28.4416-28.9024l0-231.2192L142.2336-6.1952c-47.104 0-85.3248 38.8608-85.3248 86.784L56.9088 774.1952l824.8832 0c47.104 0 85.3248-38.912 85.3248-86.8864l0.2304-259.9424c0.4608-15.3088 12.8512-27.648 28.2624-27.648s27.8016 12.3392 28.2624 27.648L1024 687.3088C1024 767.2064 960.3328 832 881.7664 832zM142.2336 557.4144c0-55.8848 44.5696-101.1712 99.5584-101.1712 54.9888 0 99.5584 45.312 99.5584 101.1712 0 55.8592-44.5696 101.1712-99.5584 101.1712C186.8032 658.5856 142.2336 613.2992 142.2336 557.4144zM284.4416 557.4144c0-23.9616-19.0976-43.3664-42.6752-43.3664s-42.6752 19.4304-42.6752 43.3664c0 23.936 19.0976 43.3408 42.6752 43.3408S284.4416 581.3504 284.4416 557.4144z"  horiz-adv-x="1024" />
+			<glyph glyph-name="clock" unicode="&#59067;"
+				   d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 625.316262-128 733.09232-91.060258 821.44823-23.93747 832.170355-15.792017 834.259159-0.496821 826.113707 10.225303 817.968254 20.947428 802.67306 23.036233 791.950935 14.89078 712.006355-45.842033 614.569408-79.238095 512-79.238095 256.160663-79.238095 48.761905 128.160663 48.761905 384 48.761905 639.839337 256.160663 847.238095 512 847.238095 767.839337 847.238095 975.238095 639.839337 975.238095 384 975.238095 289.261734 946.765111 198.842236 894.355733 122.396286 886.741822 111.290398 889.572629 96.115004 900.678517 88.501092 911.784403 80.887181 926.959799 83.717988 934.573709 94.823876 992.505146 179.324474 1024 279.340297 1024 384ZM487.619049 286.47619C487.619049 273.010963 498.534771 262.095238 512 262.095238 525.465229 262.095238 536.380951 273.010963 536.380951 286.47619L536.380951 652.190477C536.380951 665.655703 525.465229 676.571428 512 676.571428 498.534771 676.571428 487.619049 665.655703 487.619049 652.190477L487.619049 286.47619ZM481.586633 424.435921C472.719716 434.569538 457.316742 435.596403 447.183125 426.729489 437.049508 417.862575 436.022643 402.459599 444.889559 392.325982L615.556226 197.278364C624.42314 187.144747 639.826114 186.117882 649.959731 194.984796 660.093348 203.851712 661.120213 219.254686 652.253299 229.388303L481.586633 424.435921Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="text" unicode="&#59132;" d="M608 602.8032c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.336-11.4432 25.9328-25.6 25.9328l-140.8 0c-14.1312 0-25.6-11.6224-25.6-25.9328 0-14.336 11.4688-25.9584 25.6-25.9584L608 602.8032 608 602.8032zM864 602.8032c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.336-11.4432 25.9328-25.6 25.9328l-140.8 0c-14.1568 0-25.6-11.6224-25.6-25.9328 0-14.336 11.4432-25.9584 25.6-25.9584L864 602.8032 864 602.8032zM608 447.1552c14.1568 0 25.6 11.5968 25.6 25.9328s-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1312 0-25.6-11.6224-25.6-25.9584s11.4688-25.9328 25.6-25.9328L608 447.1552 608 447.1552zM864 447.1552c14.1568 0 25.6 11.5968 25.6 25.9328s-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1568 0-25.6-11.6224-25.6-25.9584s11.4432-25.9328 25.6-25.9328L864 447.1552 864 447.1552zM608 291.456c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1312 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4688-25.9584 25.6-25.9584L608 291.456 608 291.456zM864 291.456c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1568 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4432-25.9584 25.6-25.9584L864 291.456 864 291.456zM864 291.456M608 135.7312c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1312 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4688-25.9584 25.6-25.9584L608 135.7312 608 135.7312zM864 135.7312c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1568 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4432-25.9584 25.6-25.9584L864 135.7312 864 135.7312zM864 135.7312M352 602.8032c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.336-11.4432 25.9328-25.6 25.9328l-140.8 0c-14.1312 0-25.6-11.6224-25.6-25.9328 0-14.336 11.4688-25.9584 25.6-25.9584L352 602.8032 352 602.8032zM352 447.1552c14.1568 0 25.6 11.5968 25.6 25.9328s-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1312 0-25.6-11.6224-25.6-25.9584s11.4688-25.9328 25.6-25.9328L352 447.1552 352 447.1552zM352 291.456c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1312 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4688-25.9584 25.6-25.9584L352 291.456 352 291.456zM608 291.456M352 135.7312c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1312 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4688-25.9584 25.6-25.9584L352 135.7312 352 135.7312zM608 135.7312M881.7664 832 28.4416 832 0 832l0-28.9024 0-722.5344C0 0.7424 63.6928-64 142.2336-64l853.3248 0L1024-64l0 28.9024L1024 225.024c0 15.9744-12.7232 28.9024-28.4416 28.9024-15.6928 0-28.4416-12.928-28.4416-28.9024l0-231.2192L142.2336-6.1952c-47.104 0-85.3248 38.8608-85.3248 86.784L56.9088 774.1952l824.8832 0c47.104 0 85.3248-38.912 85.3248-86.8864l0.2304-259.9424c0.4608-15.3088 12.8512-27.648 28.2624-27.648s27.8016 12.3392 28.2624 27.648L1024 687.3088C1024 767.2064 960.3328 832 881.7664 832z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="move" unicode="&#59133;" d="M501.0944-125.824c6.9376-2.8928 14.8224-2.8928 21.8112 0 3.4304 1.4336 6.528 3.4816 9.1136 6.0672 0.0256 0 0.0768 0.0256 0.0768 0.0256l158.9248 158.9248c11.1104 11.1104 11.1104 29.1328 0 40.2176-11.0848 11.0848-29.0816 11.0848-40.1664-0.0256l-110.4384-110.4128 0.0256 335.36c0 15.6928-12.7232 28.416-28.416 28.416s-28.416-12.6976-28.416-28.3904l0-335.3856-110.4128 110.4128c-11.1104 11.0848-29.1072 11.0848-40.1408 0-11.1104-11.1104-11.136-29.1072-0.0512-40.192l158.9504-158.9248c0.8192-0.8192 1.8944-1.1776 2.816-1.8688C496.7168-123.1872 498.688-124.8256 501.0944-125.824zM522.9056 893.824c-6.9376 2.8928-14.8224 2.8928-21.7856 0C497.6896 892.416 494.592 890.368 491.9808 887.7824c-0.0256 0-0.0768-0.0512-0.0768-0.0512L332.9792 728.832c-11.1104-11.1104-11.1104-29.1328 0-40.2176 11.0848-11.0848 29.0816-11.0848 40.1664 0.0256l110.4384 110.4128-0.0256-335.36c0-15.6928 12.7232-28.416 28.416-28.416 15.6928 0 28.4416 12.6976 28.4416 28.3904L540.416 799.0528l110.4128-110.4128c11.1104-11.0848 29.1072-11.0848 40.1408 0 11.1104 11.1104 11.1616 29.1072 0.0512 40.192l-158.9504 158.8992c-0.8192 0.8448-1.8944 1.2032-2.816 1.8944C527.2832 891.1872 525.312 892.8256 522.9056 893.824zM1021.824 373.0944c2.8928 6.9376 2.8928 14.8224 0 21.8112-1.408 3.4304-3.456 6.528-6.0416 9.1136 0 0.0256-0.0512 0.0768-0.0512 0.0768l-158.8992 158.9248c-11.1104 11.1104-29.1584 11.1104-40.2432 0-11.0592-11.0848-11.0592-29.0816 0.0512-40.1664l110.3872-110.4384-335.36 0.0256c-15.6928 0-28.3904-12.7232-28.3904-28.416s12.6976-28.416 28.3904-28.416l335.36 0-110.3872-110.4128c-11.1104-11.1104-11.1104-29.1072 0-40.1408 11.1104-11.1104 29.1072-11.136 40.192-0.0512l158.8992 158.9504c0.8448 0.8192 1.2032 1.8944 1.8944 2.816C1019.1872 368.7168 1020.8256 370.688 1021.824 373.0944zM2.176 394.9056c-2.8928-6.9376-2.8928-14.8224 0-21.7856 1.408-3.456 3.456-6.5536 6.0416-9.1392l0.0512-0.0512 158.8992-158.9504c11.1104-11.1104 29.1584-11.1104 40.2432 0 11.0592 11.1104 11.0592 29.1072-0.0512 40.192l-110.3872 110.4384 335.36-0.0512c15.6928 0 28.3904 12.7488 28.3904 28.416 0 15.6928-12.6976 28.4416-28.3904 28.4416l-335.36-0.0256 110.3872 110.4128c11.1104 11.1104 11.1104 29.1072 0 40.1408-11.1104 11.1104-29.1072 11.1616-40.192 0.0512l-158.8992-158.9504c-0.8448-0.8192-1.2032-1.8944-1.8944-2.816C4.8128 399.2832 3.1744 397.312 2.176 394.9056z"  horiz-adv-x="1024" />
+			<glyph glyph-name="remind" unicode="&#59068;"
+				   d="M0 460.690763 0 285.975904C0 250.691957 28.657739 222 63.838605 222L228.9009 222 213.800267 228.264094 469.201726-27.669451C499.273171-57.803546 535.639639-42.646511 535.639639 0.024294L535.639639 746.642371C535.639639 789.160948 499.309939 804.507056 469.201726 774.336117L213.800267 518.402573 228.9009 524.666667 63.838605 524.666667C28.573201 524.666667 0 495.988777 0 460.690763ZM228.9009 482 237.750464 482 244.001534 488.264094 499.402993 744.197638C501.578012 746.37719 503.223142 747.547599 503.936853 747.833559 502.587712 747.293003 500.074389 747.191133 497.235991 748.390108 494.446571 749.568393 492.826063 751.363987 492.299426 752.612451 492.628553 751.832211 492.972973 749.774816 492.972973 746.642371L492.972973 0.024294C492.972973-3.146332 492.625939-5.221845 492.296619-6.001423 492.834735-4.727578 494.485777-2.907403 497.311223-1.729796 500.154871-0.544602 502.647469-0.657431 503.972905-1.192945 503.239477-0.896619 501.582121 0.285361 499.402993 2.469028L244.001534 258.402573 237.750464 264.666667 228.9009 264.666667 63.838605 264.666667C52.233293 264.666667 42.666667 274.244717 42.666667 285.975904L42.666667 460.690763C42.666667 472.459486 52.172352 482 63.838605 482L228.9009 482ZM821.045045 360.333333C821.045045 479.485463 730.531159 576.666667 618.090091 576.666667 606.308015 576.666667 596.756757 567.115407 596.756757 555.333333 596.756757 543.55126 606.308015 534 618.090091 534 706.262724 534 778.378379 456.572256 778.378379 360.333333 778.378379 264.094411 706.262724 186.666667 618.090091 186.666667 606.308015 186.666667 596.756757 177.115407 596.756757 165.333333 596.756757 153.55126 606.308015 144 618.090091 144 730.531159 144 821.045045 241.181203 821.045045 360.333333ZM1002.666667 368.706967C1002.666667 526.122513 905.044211 666.571596 756.28896 730.913547 745.475106 735.590924 732.916983 730.616327 728.239605 719.802474 723.562229 708.988621 728.536826 696.430497 739.350679 691.75312 872.873312 633.999819 960 508.650961 960 368.706967 960 235.822797 881.48423 115.77283 758.227616 54.432247 747.679578 49.18285 743.384179 36.376499 748.633577 25.828461 753.882974 15.280422 766.689325 10.985024 777.237363 16.234419 914.638133 84.614065 1002.666667 219.208966 1002.666667 368.706967Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="subtract" unicode="&#59134;" d="M853.333333 362.666667C865.115407 362.666667 874.666667 372.217925 874.666667 384 874.666667 395.782075 865.115407 405.333333 853.333333 405.333333L170.666667 405.333333C158.884592 405.333333 149.333333 395.782075 149.333333 384 149.333333 372.217925 158.884592 362.666667 170.666667 362.666667L853.333333 362.666667Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="dollar" unicode="&#59138;" d="M818.688 296.48c-16.128 29.952-38.912 55.04-67.072 73.984-29.696 19.968-62.208 34.56-96.768 43.52-54.016 13.568-93.184 15.36-130.56 16.64l0 327.424c27.136-1.024 52.992-4.864 77.056-11.008 29.184-7.424 54.528-19.712 75.52-36.096 20.736-16.384 37.12-37.376 49.152-62.72 11.776-25.344 17.92-57.344 17.92-94.72 0-14.08 11.52-25.6 25.6-25.6s25.6 11.52 25.6 25.6c0 44.8-7.68 83.968-22.784 116.48-15.36 32.768-36.864 59.904-63.744 81.152-26.624 20.992-58.624 36.096-94.72 45.568-28.16 7.168-58.112 11.52-89.6 12.8l0 48.384c0 14.08-11.264 25.6-25.344 25.6-14.336 0-25.6-11.52-25.6-25.6l0-48.384c-26.368-1.28-49.152-4.352-70.144-9.216-133.12-31.232-184.832-127.488-188.672-200.192-2.56-48.384 7.936-164.608 160.768-203.008 38.912-9.728 70.144-13.568 98.048-15.616l0-375.322c-28.416 2.304-55.296 7.168-80.384 14.848-34.816 10.752-65.536 27.136-91.392 48.896-25.344 21.248-45.824 47.872-60.416 79.104-14.848 31.232-22.784 68.352-23.552 110.592-0.512 14.08-12.032 25.6-26.112 24.832-14.08-0.256-25.344-12.032-25.088-26.112 1.024-49.152 10.752-93.44 28.416-131.072 17.92-37.888 42.752-70.4 73.984-96.512 30.976-26.112 67.84-45.824 109.056-58.624 29.952-8.96 61.952-14.848 95.488-17.152l0-68.838c0-14.336 11.264-25.6 25.6-25.6 14.08 0 25.344 11.264 25.344 25.344l0 68.07c31.488 0.512 64 4.096 96.768 9.984 38.912 7.168 74.752 19.968 106.752 37.888 32.512 18.688 60.16 43.52 81.664 74.24 22.272 31.744 33.792 72.192 33.792 120.064 0 44.8-8.448 70.17-24.576 100.378zM473.344 432.672c-24.832 2.048-51.968 5.632-85.504 14.08-106.24 26.624-125.184 96.512-122.112 150.528 1.024 19.968 13.056 121.088 149.248 153.088 17.408 4.096 36.352 6.656 58.368 7.68l0-325.376zM767.488 105.478c-16.896-24.32-38.912-44.288-65.024-59.136-26.88-15.104-57.344-26.112-90.624-32.256-29.696-5.376-59.136-8.448-87.552-9.216l0 374.554c35.328-1.024 69.888-2.816 118.016-15.104 28.672-7.168 55.808-19.456 80.64-36.096 21.504-14.336 38.4-33.28 50.688-56.064 12.288-22.528 18.432-39.706 18.432-75.802 0-37.376-8.192-67.84-24.576-90.88z"  horiz-adv-x="1024" />
+			<glyph glyph-name="calendar" unicode="&#59071;"
+				   d="M128.194764-33.441442C85.742288-33.441442 51.2 1.591066 51.2 44.528049L51.2 744.936937 25.6 718.990991 896.131998 718.990991C938.35962 718.990991 972.8 684.005335 972.8 641.256676L972.8 57.36937C972.8 43.039819 984.26151 31.423424 998.4 31.423424 1012.53849 31.423424 1024 43.039819 1024 57.36937L1024 641.256676C1024 712.637922 966.662825 770.882883 896.131998 770.882883L25.6 770.882883C11.46151 770.882883 0 759.266487 0 744.936937L0 44.528049C0-27.060267 57.457637-85.333333 128.194764-85.333333L883.2-85.333333C897.33849-85.333333 908.8-73.716939 908.8-59.387388 908.8-45.057837 897.33849-33.441442 883.2-33.441442L128.194764-33.441442ZM281.6 641.153154C281.6 626.823603 293.06151 615.207206 307.2 615.207206 321.33849 615.207206 332.8 626.823603 332.8 641.153154L332.8 835.747748C332.8 850.077298 321.33849 861.693694 307.2 861.693694 293.06151 861.693694 281.6 850.077298 281.6 835.747748L281.6 641.153154ZM716.8 654.126127C716.8 639.796576 728.26151 628.180179 742.4 628.180179 756.53849 628.180179 768 639.796576 768 654.126127L768 848.720721C768 863.050271 756.53849 874.666667 742.4 874.666667 728.26151 874.666667 716.8 863.050271 716.8 848.720721L716.8 654.126127ZM332.8 485.477478C346.93849 485.477478 358.4 497.093873 358.4 511.423424 358.4 525.752973 346.93849 537.36937 332.8 537.36937L192 537.36937C177.86151 537.36937 166.4 525.752973 166.4 511.423424 166.4 497.093873 177.86151 485.477478 192 485.477478L332.8 485.477478ZM614.4 485.477478C628.53849 485.477478 640 497.093873 640 511.423424 640 525.752973 628.53849 537.36937 614.4 537.36937L473.6 537.36937C459.46151 537.36937 448 525.752973 448 511.423424 448 497.093873 459.46151 485.477478 473.6 485.477478L614.4 485.477478ZM870.4 485.477478C884.53849 485.477478 896 497.093873 896 511.423424 896 525.752973 884.53849 537.36937 870.4 537.36937L729.6 537.36937C715.46151 537.36937 704 525.752973 704 511.423424 704 497.093873 715.46151 485.477478 729.6 485.477478L870.4 485.477478ZM332.8 329.801803C346.93849 329.801803 358.4 341.418197 358.4 355.747748 358.4 370.077297 346.93849 381.693694 332.8 381.693694L192 381.693694C177.86151 381.693694 166.4 370.077297 166.4 355.747748 166.4 341.418197 177.86151 329.801803 192 329.801803L332.8 329.801803ZM614.4 329.801803C628.53849 329.801803 640 341.418197 640 355.747748 640 370.077297 628.53849 381.693694 614.4 381.693694L473.6 381.693694C459.46151 381.693694 448 370.077297 448 355.747748 448 341.418197 459.46151 329.801803 473.6 329.801803L614.4 329.801803ZM870.4 329.801803C884.53849 329.801803 896 341.418197 896 355.747748 896 370.077297 884.53849 381.693694 870.4 381.693694L729.6 381.693694C715.46151 381.693694 704 370.077297 704 355.747748 704 341.418197 715.46151 329.801803 729.6 329.801803L870.4 329.801803ZM332.8 174.126127C346.93849 174.126127 358.4 185.742522 358.4 200.072073 358.4 214.401621 346.93849 226.018018 332.8 226.018018L192 226.018018C177.86151 226.018018 166.4 214.401621 166.4 200.072073 166.4 185.742522 177.86151 174.126127 192 174.126127L332.8 174.126127ZM614.4 174.126127C628.53849 174.126127 640 185.742522 640 200.072073 640 214.401621 628.53849 226.018018 614.4 226.018018L473.6 226.018018C459.46151 226.018018 448 214.401621 448 200.072073 448 185.742522 459.46151 174.126127 473.6 174.126127L614.4 174.126127ZM870.4 174.126127C884.53849 174.126127 896 185.742522 896 200.072073 896 214.401621 884.53849 226.018018 870.4 226.018018L729.6 226.018018C715.46151 226.018018 704 214.401621 704 200.072073 704 185.742522 715.46151 174.126127 729.6 174.126127L870.4 174.126127Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="raw" unicode="&#59140;" d="M539.151516 425.105692C580.924324 425.105692 614.787878 458.651575 614.787878 500.032521 614.787878 541.413466 580.924324 574.959349 539.151516 574.959349 497.378705 574.959349 463.515151 541.413466 463.515151 500.032521 463.515151 458.651575 497.378705 425.105692 539.151516 425.105692L539.151516 425.105692ZM539.151516 475.056911C525.227245 475.056911 513.939394 486.238871 513.939394 500.032521 513.939394 513.82617 525.227245 525.00813 539.151516 525.00813 553.075785 525.00813 564.363637 513.82617 564.363637 500.032521 564.363637 486.238871 553.075785 475.056911 539.151516 475.056911L539.151516 475.056911ZM435.304267 667.268777C247.753485 630.545261 110.545455 466.914193 110.545455 275.252032 110.545455 54.553658 291.151073-124.357724 513.939394-124.357724 736.727714-124.357724 917.333333 54.553658 917.333333 275.252032 917.333333 456.248009 790.466897 614.548177 614.578714 661.286675L601.514526 613.041069C755.689673 572.072343 866.90909 433.296058 866.90909 275.252032 866.90909 82.140956 708.879174-74.406505 513.939394-74.406505 318.999614-74.406505 160.969697 82.140956 160.969697 275.252032 160.969697 442.948851 281.04344 586.145971 445.081946 618.265649L435.304267 667.268777 435.304267 667.268777ZM362.666667 250.276422C418.363746 250.276422 463.515151 295.004269 463.515151 350.178861 463.515151 405.353455 418.363746 450.081301 362.666667 450.081301 306.969587 450.081301 261.818182 405.353455 261.818182 350.178861 261.818182 295.004269 306.969587 250.276422 362.666667 250.276422L362.666667 250.276422ZM362.666667 300.227642C334.818127 300.227642 312.242423 322.591565 312.242423 350.178861 312.242423 377.766159 334.818127 400.130082 362.666667 400.130082 390.515206 400.130082 413.09091 377.766159 413.09091 350.178861 413.09091 322.591565 390.515206 300.227642 362.666667 300.227642L362.666667 300.227642ZM118.336328 282.173594C133.425252 267.885431 161.465796 247.416053 201.858288 227.194989 268.590074 193.788094 346.276843 173.768557 434.022231 173.76855 514.003603 173.768546 572.571484 186.395546 639.028858 212.095699 648.371872 215.708796 677.180911 227.349506 679.666547 228.331507 693.997408 233.993197 704.553047 237.751541 714.596041 240.630003 734.812975 246.424461 752.32589 248.290967 771.083349 246.14595 784.915759 244.564139 797.423597 254.390018 799.020388 268.092668 800.61718 281.795317 790.698251 294.185822 776.865841 295.767633 751.016318 298.723669 726.88307 296.151571 700.581677 288.613225 688.670974 285.19945 676.714903 280.942481 660.987473 274.72905 658.174426 273.6177 629.605316 262.073935 620.692019 258.627017 559.708732 235.043782 507.184486 223.719765 434.022236 223.71977 354.560674 223.719776 284.56814 241.756542 224.601289 271.776813 203.727373 282.226598 185.640133 293.385054 170.445517 304.477005 161.566625 310.958528 155.775729 315.822603 153.178823 318.281692 143.113425 327.812924 127.15405 327.456439 117.53256 317.485463 107.911071 307.514487 108.27093 291.704826 118.336328 282.173594L118.336328 282.173594ZM465.243565 618.735196 465.243565 750.68968 465.243565 775.669175 440.027522 775.66529 367.813557 775.654164 393.0296 750.678554 393.0296 840.195086 367.817478 815.219476 653.550573 815.219476 628.338451 840.195088 628.338447 748.897745 654.251853 773.86369 589.647977 775.644502 563.734571 776.358808 563.734571 750.678556 563.734571 612.910739 614.158814 612.910739 614.158814 750.678556 588.245408 725.71261 652.849284 723.931798 678.762688 723.217492 678.76269 748.897743 678.762694 840.195085 678.762697 865.170696 653.550573 865.170696 367.817478 865.170696 342.605357 865.170696 342.605357 840.195086 342.605357 750.678554 342.605357 725.69906 367.821399 725.702945 440.035364 725.714071 414.819324 750.689681 414.819322 618.735198 465.243565 618.735196 465.243565 618.735196Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="office" unicode="&#59141;" d="M335.282306 712.495464C399.587328 713.451107 442.778899 696.882717 470.183494 669.370654 479.127332 660.39174 485.691302 650.857363 490.241971 641.442689 492.795622 636.159553 494.049041 632.438701 494.358795 631.074094L493.723712 636.740923 493.723706 196.900196C493.723706 199.018106 495.816045 203.920655 503.591595 207.364367 511.039185 210.662833 515.68422 209.165274 517.176538 207.906613L500.671543 188.33763 521.297207 203.501468C514.140179 213.236369 499.631258 225.714509 476.134074 237.35914 439.577969 255.475456 390.86048 266.105079 328.491925 266.105082 265.860796 266.105082 219.424582 255.71818 186.827162 237.741581 164.977332 225.691987 152.538132 212.281173 147.220271 201.30887L170.257196 190.143742 151.035786 207.052243C152.884078 209.153361 158.307299 211.803366 167.849005 208.050434 177.092077 204.414961 179.2 199.200117 179.2 196.664452L179.2 497.049743 179.2 636.740923 175.817447 624.023021C177.078908 626.226721 180.088681 630.807811 184.828724 636.965629 192.95423 647.521524 202.792594 658.127492 214.297641 668.007961 247.526453 696.544681 287.381649 713.209056 334.514421 712.495571L335.282306 712.495464ZM335.289387 763.689705C274.661039 764.607483 223.081402 743.04085 180.940156 706.850184 156.32698 685.712527 139.975514 664.470237 131.382553 649.458825L128 643.549699 128 636.740923 128 497.049743 128 196.664452C128 159.26105 164.542545 144.888183 189.478606 173.235241L191.776657 175.847642 193.294121 178.978613C194.07832 180.596644 199.156367 186.071334 211.552092 192.907243 236.030601 206.406481 274.024879 214.905082 328.491925 214.905082 383.221547 214.905079 424.163878 205.97191 453.399258 191.483569 469.376966 183.565406 477.614626 176.480753 480.045882 173.17379L481.844905 170.72678 484.166551 168.768644C511.279708 145.9007 544.923706 160.801293 544.923706 196.900196L544.923712 636.740922 544.288627 642.407751C540.427211 659.419023 529.175531 682.697124 506.45814 705.503602 468.987716 743.12097 412.352271 764.846461 334.521502 763.689812L335.289387 763.689705ZM0 506.026694 0 27.856868C0-8.875637 34.793167-23.400433 61.4635 1.248508L63.46242 3.315859C65.301149 5.444836 69.655573 9.862313 76.498228 15.820363 88.306297 26.101907 102.566352 36.46294 119.251411 46.174385 167.295691 74.138291 224.90855 90.950182 292.337329 90.950182 358.378978 90.95018 409.459345 71.669566 448.125308 39.64774 461.506042 28.566274 472.380655 16.734758 480.912593 4.997001 485.832384-1.771373 488.762874-6.741986 489.872527-9.022522 496.058545-21.735902 511.379537-27.027375 524.092917-20.841355 536.806298-14.655337 542.097771 0.665655 535.91175 13.379036 527.471002 30.726293 509.777717 55.067718 480.782336 79.0807 433.134118 118.541323 370.586889 142.15018 292.337329 142.150182 215.474895 142.150185 149.074727 122.774084 93.495781 90.424668 59.761154 70.789615 36.872315 50.859802 24.713677 36.781884L44.088049 20.04887 26.712598 38.849235C28.162783 40.189508 32.877261 41.946118 40.792576 38.641781 49.035365 35.200736 51.2 30.129892 51.2 27.856868L51.2 506.026694C51.2 520.165184 39.73849 531.626694 25.6 531.626694 11.46151 531.626694 0 520.165184 0 506.026694L0 506.026694ZM696.80221 763.689812C618.971441 764.846461 562.335996 743.12097 524.86557 705.503602 502.148181 682.697124 490.896501 659.419023 487.035083 642.407751L486.4 636.740922 486.400004 196.900196C486.400006 160.801293 520.044004 145.9007 547.157161 168.768644L549.478807 170.72678 551.27783 173.17379C553.709086 176.480753 561.946746 183.565406 577.924452 191.483569 607.159834 205.97191 648.102165 214.905079 702.831787 214.905082 757.298833 214.905082 795.293111 206.406481 819.77162 192.907243 832.167345 186.071334 837.245391 180.596644 838.029591 178.978613L839.547055 175.847642 841.845105 173.235241C866.781167 144.888183 903.323712 159.26105 903.323712 196.664452L903.323712 497.049743 903.323712 636.740923 903.323712 643.549699 899.941158 649.458825C891.348196 664.470237 874.996732 685.712527 850.383556 706.850184 808.24231 743.04085 756.662673 764.607483 696.034325 763.689705L696.80221 763.689812ZM696.809291 712.495571C743.942063 713.209056 783.797257 696.544681 817.026071 668.007961 828.531119 658.127492 838.369481 647.521524 846.494989 636.965629 851.235031 630.807811 854.244804 626.226721 855.506263 624.023021L852.123712 636.740923 852.123712 497.049743 852.123712 196.664452C852.123712 199.200117 854.231635 204.414961 863.474707 208.050434 873.016412 211.803366 878.439633 209.153361 880.287925 207.052243L861.066515 190.143742 884.103441 201.30887C878.785579 212.281173 866.346381 225.691987 844.49655 237.741581 811.89913 255.71818 765.462916 266.105082 702.831785 266.105082 640.463232 266.105079 591.745741 255.475456 555.189638 237.35914 531.692454 225.714509 517.183533 213.236369 510.026502 203.501468L530.652166 188.33763 514.147172 207.906613C515.63949 209.165274 520.284527 210.662833 527.732117 207.364367 535.507665 203.920655 537.600004 199.018106 537.600004 196.900196L537.6 636.740923 536.964917 631.074094C537.274671 632.438701 538.52809 636.159553 541.081741 641.442689 545.63241 650.857363 552.196378 660.39174 561.140218 669.370654 588.544813 696.882717 631.736384 713.451107 696.041406 712.495464L696.809291 712.495571ZM972.799998 506.026694 972.799998 27.856868C972.799998 30.129892 974.964631 35.200736 983.207422 38.641781 991.122737 41.946118 995.837214 40.189508 997.287401 38.849235L979.911949 20.04887 999.286321 36.781884C987.127682 50.859802 964.238844 70.789615 930.504218 90.424668 874.925269 122.774084 808.525103 142.150185 731.662669 142.150182 653.132708 142.15018 590.55104 117.262822 543.127755 75.738001 514.370099 50.557195 496.945662 25.102596 488.705389 7.022771 482.841769-5.842485 488.517717-21.025242 501.382974-26.888862 514.248233-32.752482 529.430987-27.076533 535.294607-14.211275 536.420563-11.740836 539.350332-6.450639 544.25735 0.717811 552.731727 13.097653 563.54464 25.561581 576.856734 37.217929 615.190044 70.783375 665.901421 90.95018 731.662669 90.950182 799.091447 90.950182 856.704307 74.138291 904.748587 46.174385 921.433645 36.46294 935.6937 26.101907 947.501771 15.820363 954.344425 9.862313 958.698848 5.444836 960.537577 3.315859L962.536497 1.248508C989.206831-23.400433 1023.999998-8.875637 1023.999998 27.856868L1023.999998 506.026694C1023.999998 520.165184 1012.538487 531.626694 998.399998 531.626694 984.261508 531.626694 972.799998 520.165184 972.799998 506.026694L972.799998 506.026694Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="attachment" unicode="&#59072;"
+				   d="M472.153474 776.771028 92.638513 378.249257C-3.525822 277.268836-2.288327 115.375923 95.536728 15.836811L99.321659 11.985562C197.267042-87.675987 357.082027-88.489975 455.906639 10.088378L955.925037 508.860785C1034.944759 587.683597 1036.587465 716.831798 959.634413 797.38661L941.34458 779.914551 923.054748 762.442492 927.277389 758.022212 945.567221 775.494271 963.857054 792.96633C886.268179 874.186725 760.692811 873.350145 683.951435 791.055095L209.92702 282.726144C171.75695 241.793754 173.954266 177.767398 214.90487 139.580341L226.383979 128.8759C267.274317 90.745043 331.360614 92.965664 369.461105 133.823439L738.140738 529.18394C747.66794 539.400614 747.109013 555.406187 736.892339 564.933391 726.675665 574.460593 710.670091 573.901666 701.142889 563.684992L332.463258 168.324491C313.421342 147.904535 281.346492 146.793129 260.88503 165.873747L249.405922 176.578189C228.898628 195.701551 227.799923 227.7161 246.924868 248.225092L720.949284 756.554043C777.863249 817.586798 869.791012 818.199218 927.277389 758.022212 950.573468 733.635768 987.153133 768.579886 963.857054 792.96633L959.634413 797.38661C936.338334 821.773054 899.758669 786.828935 923.054748 762.442492 980.99271 701.792763 979.749843 604.079622 920.198449 544.676623L420.180051 45.904215C341.242127-32.837003 213.662948-32.187202 135.402204 47.4448L131.617273 51.296051C52.922438 131.369749 51.922852 262.13863 129.272687 343.362287L508.787648 741.884058C518.421419 752.000306 518.030293 768.010859 507.914046 777.64463 497.797798 787.2784 481.787245 786.887276 472.153474 776.771028L472.153474 776.771028Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="agriculture" unicode="&#59143;" d="M693.837946 469.237826C757.656311 533.575377 781.490225 616.460832 737.526153 657.793278 693.562078 699.125726 609.307957 673.043814 545.489591 608.706263 481.671223 544.368715 457.837312 461.48326 501.801385 420.150812 545.765457 378.818364 630.019578 404.900277 693.837946 469.237826L693.837946 469.237826ZM657.808403 503.110692C610.655398 455.574082 554.662603 438.240815 536.594707 455.227191 518.526814 472.213568 534.366127 527.296787 581.519132 574.833399 628.672139 622.37001 684.664934 639.703277 702.732828 622.7169 720.800723 605.730524 704.96141 550.647302 657.808403 503.110692L657.808403 503.110692ZM720.133598 289.588704C783.951964 353.926255 807.785877 436.811708 763.821805 478.144156 719.85773 519.476604 635.60361 493.394692 571.785244 429.057141 507.966876 364.71959 484.132964 281.834138 528.097037 240.50169 572.061109 199.169242 656.31523 225.251153 720.133598 289.588704L720.133598 289.588704ZM684.104055 323.46157C636.951051 275.924958 580.958255 258.591691 562.890359 275.578067 544.822466 292.564446 560.661779 347.647665 607.814784 395.184275 654.967791 442.720887 710.960587 460.054155 729.02848 443.067778 747.096375 426.081402 731.257062 370.99818 684.104055 323.46157L684.104055 323.46157ZM650.472081 7.542067C674.792501 19.561993 698.775307 37.079213 720.133598 58.61126 783.951964 122.948811 807.785877 205.834266 763.821805 247.166711 719.85773 288.499159 635.60361 262.417248 571.785244 198.079697 507.966876 133.742148 484.132964 50.856693 528.097037 9.524245 538.046319 0.170513 553.900559 0.439927 563.508469 10.126003 573.11638 19.812077 572.839644 35.246891 562.890359 44.600625 544.822466 61.587002 560.661779 116.670221 607.814784 164.206833 654.967791 211.743443 710.960587 229.07671 729.02848 212.090334 747.096375 195.103957 731.257062 140.020736 684.104055 92.484126 666.535275 74.772416 647.033545 60.528207 627.799177 51.021971 615.466266 44.926654 610.543968 30.252117 616.804917 18.245474 623.065867 6.238829 638.13917 1.446752 650.472081 7.542067L650.472081 7.542067ZM318.562611 503.110692C271.409605 550.647302 255.570292 605.730524 273.638186 622.7169 291.706081 639.703277 347.698877 622.37001 394.851882 574.833399 442.004887 527.296787 457.844201 472.213568 439.776307 455.227191 421.708412 438.240815 365.715616 455.574082 318.562611 503.110692L318.562611 503.110692ZM282.533069 469.237826C346.351436 404.900277 430.605557 378.818364 474.56963 420.150812 518.533702 461.48326 494.699791 544.368715 430.881423 608.706263 367.063057 673.043814 282.808936 699.125726 238.844863 657.793278 194.88079 616.460832 218.714703 533.575377 282.533069 469.237826L282.533069 469.237826ZM435.158223 730.819048C435.158223 796.902713 463.068177 847.238095 488.185508 847.238095 513.302837 847.238095 541.212791 796.902713 541.212791 730.819048 541.212791 664.735381 513.302837 614.4 488.185508 614.4 463.068177 614.4 435.158223 664.735381 435.158223 730.819048L435.158223 730.819048ZM385.071267 730.819048C385.071267 641.379328 427.068254 565.638095 488.185508 565.638095 549.302761 565.638095 591.299748 641.379328 591.299748 730.819048 591.299748 820.258768 549.302761 896 488.185508 896 427.068254 896 385.071267 820.258768 385.071267 730.819048L385.071267 730.819048ZM344.858263 323.46157C297.705257 370.99818 281.865944 426.081402 299.933839 443.067778 318.001733 460.054155 373.994529 442.720887 421.147534 395.184275 468.30054 347.647665 484.139853 292.564446 466.071959 275.578067 448.004064 258.591691 392.011268 275.924958 344.858263 323.46157L344.858263 323.46157ZM308.828721 289.588704C372.647088 225.251153 456.90121 199.169242 500.865282 240.50169 544.829355 281.834138 520.995443 364.71959 457.177075 429.057141 393.358709 493.394692 309.104588 519.476604 265.140515 478.144156 221.176442 436.811708 245.010355 353.926255 308.828721 289.588704L308.828721 289.588704ZM344.858263 92.484126C297.705257 140.020736 281.865944 195.103957 299.933839 212.090334 318.001733 229.07671 373.994529 211.743443 421.147534 164.206833 468.30054 116.670221 484.139853 61.587002 466.071959 44.600625 448.004064 27.614249 392.011268 44.947516 344.858263 92.484126L344.858263 92.484126ZM308.828721 58.61126C372.647088-5.726289 456.90121-31.808203 500.865282 9.524245 544.829355 50.856693 520.995443 133.742148 457.177075 198.079697 393.358709 262.417248 309.104588 288.499159 265.140515 247.166711 221.176442 205.834266 245.010355 122.948811 308.828721 58.61126L308.828721 58.61126ZM526.376811-97.283714 526.376811 583.660666C526.376811 597.125892 515.164465 608.041617 501.333333 608.041617 487.502202 608.041617 476.289856 597.125892 476.289856 583.660666L476.289856-97.283714C476.289856-110.748943 487.502202-121.664668 501.333333-121.664668 515.164465-121.664668 526.376811-110.748943 526.376811-97.283714L526.376811-97.283714Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="machinery" unicode="&#59145;" d="M1013.342765 124.693549 1017.427407 381.521984 1017.739181 401.125171 998.944783 406.175375 911.908109 429.562812 930.393933 405.311712 930.393933 774.292909 930.393933 799.127884 905.756591 799.389556 551.467575 803.152429 531.226001 803.367413 526.884847 783.43819 455.019706 453.522076 479.340079 473.237709 378.060235 473.237709 360.478925 473.237709 354.595908 456.537916 213.530519 56.103492 201.730419 22.607209 236.994844 22.607204 404.799686 22.607187C418.551407 22.607185 429.699383 33.843959 429.699383 47.705222 429.699386 61.566487 418.551413 72.803264 404.799691 72.803264L236.994848 72.803283 260.459174 39.306995 401.524563 439.741421 378.060235 423.04163 479.340079 423.04163 499.365828 423.04163 503.660454 442.757263 575.525598 772.673376 550.942869 752.959137 905.231885 749.196263 880.594541 774.292909 880.594541 405.311712 880.594541 386.0279 899.080365 381.060614 986.117039 357.673175 967.634413 382.326566 963.549771 125.498131C963.329346 111.638647 974.297201 100.223204 988.047155 100.001026 1001.797111 99.778846 1013.122342 110.834065 1013.342765 124.693549L1013.342765 124.693549ZM488.656535-42.666667C550.539285-42.666667 600.705167 7.89882 600.705167 70.274509 600.705167 132.650199 550.539285 183.215686 488.656535 183.215686 426.773783 183.215686 376.607902 132.650199 376.607902 70.274509 376.607902 7.89882 426.773783-42.666667 488.656535-42.666667L488.656535-42.666667ZM488.656535 7.529412C454.277229 7.529412 426.407294 35.621348 426.407294 70.274509 426.407294 104.927671 454.277229 133.019607 488.656535 133.019607 523.03584 133.019607 550.905775 104.927671 550.905775 70.274509 550.905775 35.621348 523.03584 7.529412 488.656535 7.529412L488.656535 7.529412ZM787.452887-42.666667C849.335637-42.666667 899.501519 7.89882 899.501519 70.274509 899.501519 132.650199 849.335637 183.215686 787.452887 183.215686 725.570138 183.215686 675.404256 132.650199 675.404256 70.274509 675.404256 7.89882 725.570138-42.666667 787.452887-42.666667L787.452887-42.666667ZM787.452887 7.529412C753.073581 7.529412 725.203648 35.621348 725.203648 70.274509 725.203648 104.927671 753.073581 133.019607 787.452887 133.019607 821.832194 133.019607 849.702127 104.927671 849.702127 70.274509 849.702127 35.621348 821.832194 7.529412 787.452887 7.529412L787.452887 7.529412ZM363.387354 787.95634 107.605789 78.238133 135.181 94.411949 30.730849 112.304655C17.173521 114.627076 4.315319 105.431838 2.011251 91.766517-0.292817 78.101197 8.829753 65.14057 22.387081 62.818148L126.837231 44.925442 147.318927 41.416851 154.412442 61.099255 410.194007 770.817463C414.889376 783.845722 408.217698 798.243881 395.292397 802.976651 382.367098 807.709421 368.082722 800.984599 363.387354 787.95634L363.387354 787.95634ZM584.132527 428.947763 824.399761 428.947763 847.616186 428.947763 846.627697 452.3279 836.906871 682.249058 835.987266 704 814.390445 703.7177 626.06217 701.255987 607.834276 701.017724 604.481973 682.956451 562.263838 455.497007 557.336105 428.947763 584.132527 428.947763 584.132527 428.947763ZM584.132527 473.798428 606.001216 447.249184 648.219349 674.70863 626.639153 656.409094 814.967428 658.870806 792.450999 680.339447 802.171825 450.418291 824.399761 473.798428 584.132527 473.798428 584.132527 473.798428ZM282.679221 203.931403 189.300603 231.451499 175.325083 183.272591 268.703701 155.752495 282.679221 203.931403 282.679221 203.931403ZM591.36064 32.627452 714.137312 32.627452 714.137312 82.823529 591.36064 82.823529 591.36064 32.627452 591.36064 32.627452Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="discount" unicode="&#59077;"
+				   d="M855.903027 334.599537 457.002421-37.283098C427.000478-65.36995 378.630415-65.004819 349.185589-36.452262L87.045522 217.744166C58.072052 245.839652 57.513624 292.117092 85.796115 321.028083L565.999763 811.902924 548.571428 804.571428 877.886948 804.571428C918.232493 804.571428 950.857143 771.868927 950.857143 731.252157L950.857143 414.47619C950.857143 401.010963 961.772866 390.095238 975.238095 390.095238 988.703324 390.095238 999.619049 401.010963 999.619049 414.47619L999.619049 731.252157C999.619049 798.773401 945.189001 853.333333 877.886948 853.333333L548.571428 853.333333C542.012309 853.333333 535.729847 850.69052 531.143093 846.001838L50.939447 355.126999C3.783193 306.922829 4.715564 229.656339 53.100125 182.737975L315.240192-71.458453C363.379925-118.139405 441.35376-118.728006 490.290377-72.915004L889.153871 298.932958C899.002925 308.114925 899.543706 323.542615 890.361739 333.391669 881.179772 343.240723 865.752081 343.781504 855.903027 334.599537L855.903027 334.599537ZM743.619049 487.619049C804.212574 487.619049 853.333333 536.739806 853.333333 597.333333 853.333333 657.92686 804.212574 707.047619 743.619049 707.047619 683.025521 707.047619 633.904762 657.92686 633.904762 597.333333 633.904762 536.739806 683.025521 487.619049 743.619049 487.619049L743.619049 487.619049ZM743.619049 536.380951C709.955977 536.380951 682.666667 563.670263 682.666667 597.333333 682.666667 630.996403 709.955977 658.285714 743.619049 658.285714 777.282118 658.285714 804.571428 630.996403 804.571428 597.333333 804.571428 563.670263 777.282118 536.380951 743.619049 536.380951L743.619049 536.380951Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="assessedbadge" unicode="&#59146;" d="M704.533333 554.666667c0-4.266667-2.133333-8.533333-4.266667-12.8l-183.466667-341.333333c-8.533333-17.066667-27.733333-27.733333-49.066667-27.733333-17.066667 0-32 6.4-40.533333 19.2l-100.266667 115.2c-4.266667 4.266667-6.4 10.666667-6.4 17.066667 0 14.933333 12.8 27.733333 27.733333 27.733333 4.266667 0 8.533333-2.133333 12.8-4.266667l91.733333-49.066667 200.533333 273.066667c6.4 6.4 12.8 10.666667 23.466667 10.666667C691.733333 580.266667 704.533333 569.6 704.533333 554.666667zM512.533333 853.333333c21.333333 0 42.666667-8.533333 57.6-23.466667l89.6-89.6 125.866667 0c44.8 0 83.2-36.266667 83.2-83.2l0-125.866667 89.6-89.6c32-32 32-85.333333 0-117.333333l-89.6-89.6 0-125.866667c0-44.8-36.266667-83.2-83.2-83.2l-125.866667 0-89.6-89.6C555.2-76.8 533.866667-85.333333 512.533333-85.333333s-42.666667 8.533333-57.6 23.466667l-89.6 89.6-125.866667 0c-44.8 0-83.2 36.266667-83.2 83.2l0 125.866667-89.6 89.6c-32 32-32 85.333333 0 117.333333l89.6 89.6 0 125.866667C156.266667 704 192.533333 740.266667 239.466667 740.266667l125.866667 0 89.6 89.6C469.866667 844.8 491.2 853.333333 512.533333 853.333333M512.533333 896c-34.133333 0-66.133333-12.8-87.466667-36.266667l-76.8-76.8-108.8 0c-68.266667 0-125.866667-55.466667-125.866667-125.866667l0-108.8-76.8-76.8c-49.066667-49.066667-49.066667-128 0-177.066667l76.8-76.8 0-108.8c0-68.266667 55.466667-125.866667 125.866667-125.866667l108.8 0 76.8-76.8C448.533333-115.2 478.4-128 512.533333-128c34.133333 0 64 12.8 87.466667 36.266667l76.8 76.8 108.8 0c68.266667 0 125.866667 55.466667 125.866667 125.866667l0 108.8 76.8 76.8c49.066667 49.066667 49.066667 128 0 177.066667l-76.8 76.8 0 108.8c0 68.266667-55.466667 125.866667-125.866667 125.866667l-108.8 0-76.8 76.8C578.666667 883.2 546.666667 896 512.533333 896L512.533333 896z"  horiz-adv-x="1026" />
 
-    
-    <glyph glyph-name="gerenzhongxin" unicode="&#59147;" d="M690.366 533.432c0 98.877-79.937 179.049-178.558 179.049-98.599 0-178.515-80.151-178.515-179.049 0-98.834 79.916-178.963 178.515-178.963 98.621 0 178.558 80.151 178.558 178.963M376.141 533.432c0 75.16 60.721 136.073 135.667 136.073 74.989 0 135.667-60.913 135.667-136.073 0-75.117-60.678-136.03-135.667-136.03-74.947 0.021-135.667 60.934-135.667 136.03M197.284 121.076l0-15.548 638.07 0 0 15.548c0 139.784-136.414 285.582-311.026 273.276-10.003-0.704-24.74-9.128-34.658-9.939-8.574-0.746 13.693-8.233 14.396-16.828 9.022 0.789 6.313-13.095 15.505-13.095 150.597 0 263.145-103.078 263.145-224.627l15.441 15.591-285.817 0.043-278.992-1.813 15.527-15.612c0 82.753 75.096 152.708 136.862 191.824 7.252 4.586 8.659 17.66 4.863 22.906-6.846 9.427-19.878 8.702-28.046 6.014-77.293-25.338-165.271-132.575-165.271-227.74M512.32 882.464c-282.767 0-512.021-228.892-512.021-511.211 0-282.468 229.255-511.254 512.021-511.254 117.432 0 228.828 39.606 318.811 111.204 10.792 8.489 12.541 24.229 3.988 34.999-8.617 10.771-24.357 12.541-35.127 3.946-81.174-64.539-181.587-100.242-287.651-100.242-255.211 0-462.028 206.562-462.028 461.367 0 254.763 206.818 461.303 462.028 461.303 255.211 0 462.092-206.562 462.092-461.303 0-87.381-24.335-171.093-69.615-243.651-7.273-11.645-3.668-27.087 8.041-34.359 11.709-7.273 27.108-3.626 34.402 7.977 50.185 80.407 77.143 173.247 77.143 270.055-0.021 282.276-229.297 511.168-512.085 511.168z"  horiz-adv-x="1025" />
+			<glyph glyph-name="service" unicode="&#59079;"
+				   d="M537.676629 323.222984C667.27978 323.222984 772.259879 429.227278 772.259879 559.887668 772.259879 690.548058 667.27978 796.552352 537.676629 796.552352 408.073477 796.552352 303.093381 690.548058 303.093381 559.887668 303.093381 429.227278 408.073477 323.222984 537.676629 323.222984L537.676629 323.222984ZM537.676629 365.695418C431.623156 365.695418 345.565814 452.592345 345.565814 559.887668 345.565814 667.182992 431.623156 754.079918 537.676629 754.079918 643.730103 754.079918 729.787446 667.182992 729.787446 559.887668 729.787446 452.592345 643.730103 365.695418 537.676629 365.695418L537.676629 365.695418ZM1001.664066-128.000004C1001.664066 144.568772 782.755985 365.612541 512.615542 365.612541 242.4751 365.612541 23.567019 144.568772 23.567019-128.000004L66.039452-128.000004C66.039452 121.203706 266.024779 323.140108 512.615542 323.140108 759.206306 323.140108 959.191633 121.203706 959.191633-128.000004L1001.664066-128.000004 1001.664066-128.000004ZM233.809816 323.140108C281.846495 323.140108 320.7039 362.376611 320.7039 410.674759 320.7039 458.972904 281.846495 498.209407 233.809816 498.209407 185.773138 498.209407 146.915732 458.972904 146.915732 410.674759 146.915732 362.376611 185.773138 323.140108 233.809816 323.140108L233.809816 323.140108ZM233.809816 365.612541C209.322817 365.612541 189.388166 385.741678 189.388166 410.674759 189.388166 435.607837 209.322817 455.736974 233.809816 455.736974 258.296816 455.736974 278.231467 435.607837 278.231467 410.674759 278.231467 385.741678 258.296816 365.612541 233.809816 365.612541L233.809816 365.612541ZM830.543236 375.712694C838.435011 378.786592 856.420583 383.749139 869.738118 388.586154 871.10678 389.083035 871.10678 389.083035 872.477119 389.57965 883.299946 393.500215 894.907365 397.647104 906.516385 401.755966 913.482439 404.221512 918.897025 406.125073 921.981649 407.204015L936.206384 412.179557 936.206384 427.249367 936.206384 613.713707 936.206384 626.991352 924.26945 632.805597C922.053561 633.884913 918.144366 635.80435 913.109699 638.302753 904.720115 642.466 896.333421 646.689268 888.525544 650.706884 886.929012 651.529269 886.929012 651.529269 885.338411 652.352304 876.494909 656.933719 869.177034 660.861493 863.892556 663.889351 861.160872 665.45453 859.071734 666.724256 857.78666 667.589638 859.888255 666.174401 860.115079 665.983089 862.214218 661.083781 804.257697 796.352093 670.564953 896 531.990097 896 337.403916 896 179.744666 736.802611 179.744666 540.525212 179.744666 517.409894 181.933686 494.566081 186.246239 472.214878L227.949506 480.261313C224.147939 499.964162 222.2171 520.113706 222.2171 540.525212 222.2171 713.437545 360.953596 853.527567 531.990097 853.527567 652.531844 853.527567 771.567984 764.803961 823.17426 644.356877 827.282349 634.768751 830.445679 632.956251 865.801418 614.640058 867.446153 613.789015 867.446153 613.789015 869.092686 612.940874 877.10527 608.817925 885.669071 604.505469 894.229978 600.257204 899.365609 597.708699 903.366644 595.744168 905.670886 594.621817L893.733951 613.713707 893.733951 427.249367 907.958689 447.294716C904.827575 446.199511 899.364613 444.278941 892.345253 441.794531 880.645251 437.653465 868.943646 433.472926 858.011386 429.51272 856.62458 429.010138 856.62458 429.010138 855.238611 428.506975 841.640096 423.567905 830.384497 419.381635 822.125588 416.164737 817.286018 414.279693 813.48815 412.732937 810.712137 411.50216 808.902954 410.700038 807.434242 409.994724 806.123281 409.265332 804.750891 408.495451 804.750891 408.495451 802.39627 406.780077 797.915841 404.674495 788.070803 396.94891 795.378771 383.232937 802.686739 369.516964 826.258515 374.043767 830.543236 375.712694Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="jifen" unicode="&#59148;" d="M512.469 390.219c289.131 0 507.136 93.333 507.136 217.173s-218.005 217.216-507.136 217.216c-289.131 0-507.136-93.376-507.136-217.216s218.005-217.173 507.136-217.173M512.469 769.781c266.581 0 452.331-85.589 452.331-162.389 0-76.8-185.749-162.368-452.331-162.368-266.603 0-452.352 85.589-452.352 162.368 0.021 76.821 185.771 162.389 452.352 162.389M512.469 160.096c288.341 0 505.749 92.8 505.749 215.829 0 32.491-15.68 62.699-43.328 89.856-0.192 0.171-0.363 0.405-0.512 0.555-0.213 0.171-0.341 0.427-0.533 0.597l-0.128-0.149c-4.459 4.075-10.261 6.699-16.747 6.699-13.824 0-25.024-11.2-25.024-25.003 0-7.339 3.264-13.76 8.277-18.283l-0.085-0.128c16.661-16.747 26.091-37.248 26.091-54.165 0-77.504-186.347-163.797-453.739-163.797-267.392 0-453.739 86.293-453.739 163.797 0 19.285 5.419 35.819 26.709 54.635 0.256 0.213 0.512 0.448 0.768 0.683 0.171 0.149 0.277 0.277 0.448 0.448l-0.107 0.107c4.096 4.416 6.72 10.261 6.72 16.768 0 13.803-11.179 25.003-25.003 25.003-6.912 0-13.141-2.795-17.664-7.339l-0.149 0.171c-28.011-27.285-43.776-57.749-43.776-90.453 0-123.029 217.451-215.829 505.771-215.829M974.635 237.28c-0.171 0.213-0.341 0.427-0.491 0.576l-0.171-0.128c-4.416 4.075-10.261 6.699-16.747 6.699-13.824 0-25.024-11.157-25.024-24.96 0-7.339 3.264-13.781 8.299-18.325l-0.128-0.085c16.683-16.789 26.112-37.291 26.112-54.165 0-77.504-186.347-163.797-453.739-163.797-267.392 0-453.739 86.293-453.739 163.797 0 19.243 5.44 35.797 26.688 54.592 0.277 0.256 0.512 0.448 0.768 0.704 0.171 0.128 0.299 0.299 0.448 0.427l-0.085 0.064c4.075 4.459 6.72 10.283 6.72 16.832 0 13.781-11.2 24.96-24.981 24.96-6.891 0-13.141-2.795-17.685-7.339l-0.128 0.171c-28.011-27.243-43.755-57.707-43.755-90.411 0-123.051 217.429-215.872 505.749-215.872 288.341 0 505.749 92.843 505.749 215.872 0 32.448-15.68 62.699-43.307 89.792-0.192 0.213-0.363 0.384-0.555 0.597z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="operation" unicode="&#59150;" d="M548.906667 423.829333c-3.349333 3.029333-7.296 5.482667-11.584 7.232l-140.117333 87.36 88.597333-139.370667c1.770667-4.266667 4.266667-8.149333 7.296-11.477333l1.109333-1.792 0.32 0.32c7.210667-7.146667 17.130667-11.52 28.074667-11.477333 21.930667 0.064 39.594667 17.941333 39.488 39.829333-0.042667 10.965333-4.501333 20.864-11.712 27.989333l0.256 0.256L548.906667 423.829333zM521.088 699.2l-0.170667 0-12.501333-0.064 0.682667-151.68 0.106667 0c0.554667-13.76 11.861333-24.746667 25.770667-24.746667 14.250667 0 25.813333 11.562667 25.813333 25.792 0 0.533333-0.042667 1.045333-0.085333 1.578667l1.173333 95.488c129.088-17.984 217.344-117.141333 217.898667-251.285333 0.661333-147.136-110.144-256-257.301333-256.618667-147.157333-0.661333-254.656 109.482667-255.296 256.618667-0.341333 74.688 27.797333 141.312 77.077333 189.909333l-0.021333 0.021333c0.789333 0.618667 1.536 1.322667 2.24 2.090667 6.976 7.722667 3.84 20.266667-4.117333 27.456-7.232 6.528-24.277333 5.930667-31.402667 0.128l-0.021333 0.042667c-0.128-0.128-0.256-0.256-0.384-0.384-0.576-0.490667-1.130667-1.002667-1.642667-1.578667-0.042667-0.064-0.085333-0.128-0.128-0.170667-56.618667-55.658667-91.605333-133.184-91.242667-218.837333 0.768-168.426667 137.877333-304.32 306.304-303.573333 168.384 0.789333 304.298667 137.877333 303.552 306.282667C826.624 564.032 689.493333 699.946667 521.088 699.2zM511.978667 884.885333C235.370667 884.885333 11.093333 660.629333 11.093333 384.021333c0-276.778667 224.277333-500.885333 500.885333-500.885333 114.88 0 223.872 38.784 311.914667 108.885333 10.517333 8.362667 12.266667 23.765333 3.904 34.304-8.448 10.538667-23.786667 12.288-34.368 3.882667-79.424-63.296-177.664-98.282667-281.408-98.282667-249.642667 0-451.989333 202.410667-451.989333 452.096 0 249.6 202.325333 451.989333 451.989333 451.989333 249.685333 0 452.032-202.389333 452.032-451.989333 0-85.589333-23.786667-167.637333-68.074667-238.72-7.082667-11.413333-3.584-26.538667 7.850667-33.664 11.434667-7.168 26.474667-3.584 33.6 7.829333 49.152 78.741333 75.498667 169.706667 75.498667 264.554667C1012.906667 660.629333 788.672 884.885333 511.978667 884.885333z"  horiz-adv-x="1024" />
+			<glyph glyph-name="print" unicode="&#59081;"
+				   d="M24.380952 630.113822 902.094615 630.113822C942.428977 630.113822 975.238095 597.096629 975.238095 556.514225L975.238095 116.552845 999.619049 141.00813 853.333333 141.00813 877.714285 116.552845 877.714285 214.373984 877.714285 238.829269 853.333333 238.829269 170.666667 238.829269 146.285714 238.829269 146.285714 214.373984 146.285714 116.552845 170.666667 141.00813 121.955642 141.00813C81.590725 141.00813 48.761905 174.028132 48.761905 214.607725L48.761905 654.569105 24.380952 630.113822 24.380952 630.113822ZM24.380952 679.02439 0 679.02439 0 654.569105 0 214.607725C0 147.045771 54.630068 92.097562 121.955642 92.097562L170.666667 92.097562 195.047619 92.097562 195.047619 116.552845 195.047619 214.373984 170.666667 189.918699 853.333333 189.918699 828.952382 214.373984 828.952382 116.552845 828.952382 92.097562 853.333333 92.097562 999.619049 92.097562 1024 92.097562 1024 116.552845 1024 556.514225C1024 624.07337 969.395277 679.02439 902.094615 679.02439L24.380952 679.02439 24.380952 679.02439ZM755.809523-103.544715 780.190477-79.089431 243.809523-79.089431 268.190477-103.544715 268.190477 119.674797C268.190477 133.181077 257.274752 144.130082 243.809523 144.130082 230.344297 144.130082 219.428572 133.181077 219.428572 119.674797L219.428572-103.544715C219.428572-117.050995 230.344297-128 243.809523-128L780.190477-128C793.655703-128 804.571428-117.050995 804.571428-103.544715L804.571428 119.674797C804.571428 133.181077 793.655703 144.130082 780.190477 144.130082 766.725248 144.130082 755.809523 133.181077 755.809523 119.674797L755.809523-103.544715ZM207.238095 458.926829 524.190477 458.926829 524.190477 507.837397 207.238095 507.837397 207.238095 458.926829 207.238095 458.926829ZM219.428572 654.569105 219.428572 850.211382 195.047619 825.756097 828.952382 825.756097 804.571428 850.211382 804.571428 654.569067 853.333333 654.569067 853.333333 850.211382 853.333333 874.666667 828.952382 874.666667 195.047619 874.666667 170.666667 874.666667 170.666667 850.211382 170.666667 654.569105 219.428572 654.569105 219.428572 654.569105Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="remind1" unicode="&#59155;" d="M538.566466-127.088677C536.442301-127.088677 534.296495-127.023404 532.085637-126.915658 453.644248-122.970174 421.998927-56.558642 416.233425-22.008283 414.28268-10.196423 422.259039 0.96717 434.050197 2.938793 445.754623 5.019952 456.938872-2.999774 458.976262-14.7477 459.474802-17.435546 471.374332-80.44435 534.296495-83.608784 596.069881-87.532361 611.155621-17.196806 611.740847-14.227299 614.038393-2.479817 625.504392 5.258245 637.208818 2.80914 648.95661 0.489687 656.586167-10.932765 654.245257-22.658784 646.962498-59.441417 613.474848-127.088677 538.566466-127.088677L538.566466-127.088677 538.566466-127.088677ZM57.238985 73.833077C57.304035 73.833077 57.412408 72.143111 58.582842 70.907383 60.663619 68.73949 66.819288 66.39858 77.851798 66.39858L950.850912 66.39858C961.710045 66.39858 966.283453 68.674665 967.063743 69.45482L966.110074 72.554425 966.131714 116.251154 967.367175 118.808453C967.540597 123.512631 965.524846 152.361377 900.998697 212.31394 808.577021 298.168097 751.355358 515.957417 751.355358 668.527121 751.355358 791.250196 551.079467 809.283624 549.042032 809.435184L472.724766 809.370357C472.464656 809.283624 272.167125 791.250196 272.167125 668.527121 272.167125 534.814813 227.365126 304.866254 127.704015 212.31394 61.573964 150.887353 57.195664 121.019712 56.935551 116.251154L57.434073 114.820498 57.195664 73.724883C57.217324 73.789709 57.217324 73.833077 57.238985 73.833077L57.238985 73.833077ZM77.851798 23.049233C54.507951 23.049233 36.929651 29.681668 25.63703 42.729706 15.753293 54.174063 13.239004 68.414463 14.084298 77.995393L14.084298 108.990124C11.439979 125.202593 16.07841 167.772233 98.204521 244.067814 178.878427 319.019473 228.817333 522.74186 228.817333 668.527121 228.817333 831.110081 461.085347 851.853262 470.969083 852.654877L480.023302 852.662278 480.023302 877.970885C480.023302 887.439933 487.691443 895.116113 497.162607 895.116113L519.306723 895.116113C528.7725 895.116113 536.446027 887.436396 536.446027 877.974239L536.446027 852.708401 550.819354 852.72015C562.480459 851.853262 794.705104 831.110081 794.705104 668.527121 794.705104 524.454177 849.282468 319.517967 930.498212 244.067814 1011.86574 168.48756 1013.989862 125.267868 1009.481507 107.79776L1009.481507 79.382235C1011.453889 69.389992 1010.478541 55.32306 1001.851903 43.618499 991.751467 29.984788 974.584928 23.049233 950.850912 23.049233L77.851798 23.049233Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="icondownload" unicode="&#59156;" d="M995.84-140l-967.68 0c-15.36 0-28.16 12.8-28.16 28.16l0 0c0 15.36 12.8 28.16 28.16 28.16l967.68 0c15.36 0 28.16-12.8 28.16-28.16l0 0c0-15.36-12.8-28.16-28.16-28.16zM926.72 507.68l0 0c-10.24 10.24-30.72 10.24-40.96 0l-348.16-345.6 0 693.76c0 15.36-10.24 28.16-25.6 28.16s-25.6-12.8-25.6-28.16l0-693.76-348.16 345.6c-10.24 10.24-30.72 10.24-40.96 0-10.24-10.24-10.24-28.16 0-40.96l394.24-394.24c2.56-2.56 2.56-2.56 5.12-2.56 0 0 2.56-2.56 2.56-2.56 7.68-2.56 15.36-2.56 23.04 0 2.56 0 2.56 2.56 2.56 2.56 2.56 0 5.12 2.56 5.12 2.56l394.24 394.24c12.8 12.8 12.8 30.72 2.56 40.96z"  horiz-adv-x="1024" />
+			<glyph glyph-name="box" unicode="&#59083;"
+				   d="M58.18714 634.486153 489.750985 389.933308C497.230148 385.695115 506.385346 385.695115 513.86451 389.933308L945.428356 634.486153C962.456593 644.135488 961.814227 668.883315 944.308329 677.636265L512.744484 893.418187C505.859648 896.860604 497.755846 896.860604 490.871012 893.418187L59.307167 677.636265C41.801269 668.883315 41.158901 644.135488 58.18714 634.486153L58.18714 634.486153ZM82.300665 677.039433 81.180638 633.889321 512.744484 849.671244 490.871012 849.671244 922.434857 633.889321 921.314829 677.039433 489.750985 432.486588 513.86451 432.486588 82.300665 677.039433 82.300665 677.039433ZM477.352463 391.070302 477.352463-78.793958C477.352463-97.514057 497.526411-109.2927 513.828779-100.090807L974.163548 159.745715C981.846246 164.082223 986.597801 172.22048 986.597801 181.042564L986.597801 497.522716C986.597801 511.028996 975.648796 521.978001 962.142515 521.978001 948.636235 521.978001 937.687232 511.028996 937.687232 497.522716L937.687232 181.042564 950.121483 202.339411 489.786716-57.497111 526.263031-78.793958 526.263031 391.070302C526.263031 404.576582 515.314029 415.525585 501.807748 415.525585 488.301468 415.525585 477.352463 404.576582 477.352463 391.070302L477.352463 391.070302ZM514.421935-57.842987 82.858091 201.993534 94.699187 181.042564 94.699187 641.377331C94.699187 654.883612 83.750183 665.832617 70.243903 665.832617 56.737622 665.832617 45.788618 654.883612 45.788618 641.377331L45.788618 181.042564C45.788618 172.465658 50.281834 164.515614 57.629714 160.091593L489.193559-99.74493C500.764461-106.711554 515.792096-102.979049 522.758718-91.408147 529.725342-79.837246 525.992838-64.809611 514.421935-57.842987L514.421935-57.842987ZM172.745454 447.781559 316.60007 361.468791C328.181609 354.519868 343.203518 358.275345 350.152444 369.856885 357.101367 381.438423 353.34589 396.460333 341.76435 403.409259L197.909735 489.722027C186.328194 496.67095 171.306285 492.915473 164.357361 481.333933 157.408437 469.752393 161.163914 454.730483 172.745454 447.781559L172.745454 447.781559Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="map" unicode="&#59157;" d="M451.673935-98.395699C478.883834-129.019147 524.254807-128.808979 551.400292-97.928851 553.755808-95.387908 558.821323-89.796762 565.872444-81.84835 577.572838-68.659017 590.597131-53.62432 604.615947-36.998315 644.662065 10.495494 684.708678 61.282182 722.129538 113.353553 759.658524 165.575381 792.492213 216.290726 819.314991 264.541538 868.685946 353.353683 896 430.456574 896 493.714285 896 715.890551 719.301715 896 501.333333 896 283.364952 896 106.666667 715.890551 106.666667 493.714285 106.666667 430.401284 134.05152 353.19427 183.54613 264.237378 210.371803 216.023471 243.193308 165.348124 280.699364 113.166846 318.155192 61.05545 358.239268 10.22579 398.322835-37.311031 412.354743-53.952073 425.391185-69.00073 437.102468-82.202579 444.160087-90.158466 449.230214-95.754921 451.982775-98.736706L451.673935-98.395699ZM486.822684-65.321348C484.281231-62.568254 479.425084-57.207989 472.585916-49.498359 461.135889-36.591017 448.364015-21.847761 434.602351-5.527215 395.275714 41.111927 355.949587 90.980452 319.289224 141.985137 282.808749 192.739548 250.983685 241.876422 225.158316 288.292478 179.388826 370.554195 154.50505 440.709839 154.50505 493.714285 154.50505 688.960095 309.785362 847.238095 501.333333 847.238095 692.881306 847.238095 848.161617 688.960095 848.161617 493.714285 848.161617 440.753978 823.345286 370.701737 777.693969 288.580749 751.873483 242.132934 720.038415 192.960075 683.537446 142.168738 646.912604 91.205033 607.624538 41.380326 568.335977-5.215038 554.587654-21.520243 541.828177-36.24925 530.389289-49.143797 523.556841-56.845711 518.705521-62.200435 516.166694-64.950526 507.543772-74.748911 495.255793-74.80583 487.131524-65.662353L486.822684-65.321348ZM714.955981 428.971194C723.919106 453.372045 728.565658 479.331002 728.565658 505.904762 728.565658 627.091817 632.184774 725.333333 513.29293 725.333333 394.401086 725.333333 298.020202 627.091817 298.020202 505.904762 298.020202 384.717709 394.401086 286.47619 513.29293 286.47619 549.003859 286.47619 583.510052 295.368053 614.373097 312.125591 626.032316 318.456132 630.449257 333.22218 624.238611 345.106481 618.027966 356.990782 603.541579 361.492994 591.882359 355.162451 567.900883 342.141361 541.111735 335.238095 513.29293 335.238095 420.821495 335.238095 345.858586 411.648164 345.858586 505.904762 345.858586 600.161359 420.821495 676.571428 513.29293 676.571428 605.764365 676.571428 680.727273 600.161359 680.727273 505.904762 680.727273 485.192019 677.117041 465.022684 670.154965 446.069408 665.522846 433.459117 671.796821 419.408892 684.168282 414.687349 696.53974 409.965809 710.323861 416.360905 714.955981 428.971194L714.955981 428.971194Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="bad" unicode="&#59158;" d="M743.328 864.96c71.232 0 127.008-32.96 157.568-93.632 2.784-5.504 3.872-10.944 4.928-16.256 2.24-11.04 5.6-27.776 30.432-57.536 36.32-43.52 29.984-90.08 24.896-127.488-1.312-9.76-2.656-19.456-3.232-29.024-1.856-31.648 3.968-41.184 19.488-66.656 3.136-5.216 6.592-10.848 10.272-17.184 23.68-40.896 22.752-90.912-2.464-133.792-28.96-49.248-82.624-78.624-143.488-78.624-51.552 0-108.256 1.12-141.408 1.952 8.64-50.048 25.44-154.528 25.44-210.656 0-92.64-67.04-125.504-124.448-125.504-63.68 0-113.536 58.688-113.536 133.6 0 57.92 0 65.344-22.976 97.088-60.608 83.776-122.464 142.272-150.304 142.272L117.76 283.52c-49.056 0-88.992 39.392-88.992 87.776L28.768 777.152c0 48.416 39.904 87.808 88.992 87.808l133.888 0c12.896 0 23.392-10.368 23.392-23.104l0-512.224 39.424 0c62.176 0 144.704-101.28 188.416-161.632 31.68-43.744 31.68-63.968 31.68-123.904 0-48.192 29.92-87.424 66.784-87.424 23.296 0 77.632 7.712 77.632 79.328 0 69.824-29.344 228.704-29.664 230.304-1.28 6.848 0.64 13.92 5.28 19.2 4.608 5.28 10.688 8.288 18.464 8 0.864 0 90.72-2.656 168.672-2.656 44.032 0 82.528 20.832 103.008 55.648 16.768 28.48 17.632 61.28 2.304 87.712-3.456 6.016-6.72 11.392-9.792 16.32-16.704 27.456-28.736 47.264-26.048 93.12 0.608 10.752 2.08 21.6 3.552 32.512 4.672 34.368 8.704 64.064-14.624 92.032-32.352 38.784-37.28 63.296-40.192 77.92-0.416 1.984-0.672 3.712-1.408 5.568-15.392 30.624-47.872 67.136-115.168 67.136l-316.704 0c-12.896 0-23.392 10.336-23.392 23.072 0 12.768 10.496 23.104 23.392 23.104L743.328 864.992 743.328 864.96zM117.76 329.632l110.496 0L228.256 818.752 117.76 818.752c-23.232 0-42.176-18.656-42.176-41.632L75.584 371.2C75.552 348.288 94.496 329.632 117.76 329.632L117.76 329.632zM117.76 329.632"  horiz-adv-x="1024" />
+			<glyph glyph-name="process" unicode="&#59086;"
+				   d="M965.426743 354.163614C955.038827 556.394249 811.004092 726.530556 615.449711 771.549827 601.95866 774.65565 588.504235 766.236759 585.398411 752.745707 582.292589 739.254655 590.711479 725.80023 604.20253 722.694407 778.021961 682.678816 906.125274 531.360979 915.359418 351.591821 916.0696 337.766112 927.853267 327.133875 941.678976 327.844055 955.504687 328.554236 966.136924 340.337903 965.426743 354.163614L965.426743 354.163614ZM386.693427 765.047806C195.197668 709.223966 61.059829 533.05174 61.059829 330.591454 61.059829 286.486225 67.378292 243.199108 79.687136 201.705457 83.62428 188.433173 97.575277 180.865549 110.847561 184.802692 124.119844 188.739836 131.68747 202.690833 127.750327 215.963117 116.810772 252.840832 111.193162 291.326477 111.193162 330.591454 111.193162 510.619396 230.48234 667.289878 400.724023 716.917841 414.014746 720.792283 421.648149 734.707399 417.773707 747.998121 413.899266 761.288844 399.984149 768.922248 386.693427 765.047806L386.693427 765.047806ZM196.356828 7.892425C280.412745-74.736506 393.28759-121.894018 513.545299-121.894018 643.321289-121.894018 764.304599-66.930765 849.557581 27.536962 858.832625 37.814519 858.019927 53.665035 847.742372 62.940077 837.464815 72.215121 821.6143 71.402426 812.339255 61.124868 736.494948-22.917229 628.982336-71.760685 513.545299-71.760685 406.569346-71.760685 306.273973-29.858699 231.501677 43.644218 221.62909 53.349199 205.758337 53.213329 196.053355 43.340745 186.348373 33.46816 186.484242 17.597406 196.356828 7.892425L196.356828 7.892425ZM498.280341 610.823932C571.138502 610.823932 630.201709 669.88714 630.201709 742.745299 630.201709 815.603459 571.138502 874.666667 498.280341 874.666667 425.422182 874.666667 366.358974 815.603459 366.358974 742.745299 366.358974 669.88714 425.422182 610.823932 498.280341 610.823932L498.280341 610.823932ZM498.280341 660.957265C453.110059 660.957265 416.492307 697.575015 416.492307 742.745299 416.492307 787.915583 453.110059 824.533333 498.280341 824.533333 543.450626 824.533333 580.068375 787.915583 580.068375 742.745299 580.068375 697.575015 543.450626 660.957265 498.280341 660.957265L498.280341 660.957265ZM131.921367-30.304273C204.779527-30.304273 263.842735 28.758935 263.842735 101.617094 263.842735 174.475253 204.779527 233.538462 131.921367 233.538462 59.063208 233.538462 0 174.475253 0 101.617094 0 28.758935 59.063208-30.304273 131.921367-30.304273L131.921367-30.304273ZM131.921367 19.82906C86.751084 19.82906 50.133333 56.44681 50.133333 101.617094 50.133333 146.787377 86.751084 183.405129 131.921367 183.405129 177.091651 183.405129 213.709402 146.787377 213.709402 101.617094 213.709402 56.44681 177.091651 19.82906 131.921367 19.82906L131.921367 19.82906ZM895.169231 0.225641C968.02739 0.225641 1027.090598 59.288849 1027.090598 132.147008 1027.090598 205.005169 968.02739 264.068375 895.169231 264.068375 822.311072 264.068375 763.247863 205.005169 763.247863 132.147008 763.247863 59.288849 822.311072 0.225641 895.169231 0.225641L895.169231 0.225641ZM895.169231 50.358974C849.998946 50.358974 813.381197 86.976725 813.381197 132.147008 813.381197 177.317293 849.998946 213.935042 895.169231 213.935042 940.339516 213.935042 976.957265 177.317293 976.957265 132.147008 976.957265 86.976725 940.339516 50.358974 895.169231 50.358974L895.169231 50.358974Z"
+				   horiz-adv-x="1028"/>
 
-    
-    <glyph glyph-name="good" unicode="&#59159;" d="M743.328-89.536l-316.704 0c-12.896 0-23.392 10.368-23.392 23.104s10.496 23.072 23.392 23.072l316.704 0c67.296 0 99.808 36.512 115.168 67.136 0.768 1.856 1.024 3.552 1.408 5.568 2.912 14.624 7.84 39.168 40.192 77.92 23.328 27.968 19.328 57.664 14.624 92.032-1.472 10.912-2.944 21.76-3.552 32.512-2.688 45.856 9.344 65.664 26.048 93.12 3.04 4.928 6.304 10.304 9.792 16.32 15.328 26.432 14.464 59.232-2.304 87.712-20.48 34.816-59.008 55.648-103.008 55.648-77.952 0-167.808-2.656-168.672-2.656-7.776-0.288-13.888 2.72-18.464 8-4.64 5.28-6.528 12.352-5.28 19.2 0.32 1.6 29.664 160.48 29.664 230.304 0 71.616-54.336 79.328-77.632 79.328-36.832 0-66.784-39.2-66.784-87.424 0-59.936 0-80.16-31.68-123.904-43.712-60.352-126.24-161.632-188.416-161.632L275.04 445.824l0-512.224c0-12.768-10.496-23.104-23.392-23.104L117.76-89.504c-49.056 0-88.992 39.392-88.992 87.808L28.768 404.192c0 48.384 39.904 87.776 88.992 87.776l196.704 0c27.84 0 89.696 58.496 150.304 142.272 22.976 31.712 22.976 39.168 22.976 97.088 0 74.944 49.856 133.6 113.536 133.6 57.408 0 124.448-32.896 124.448-125.504 0-56.128-16.8-160.576-25.44-210.656 33.184 0.8 89.856 1.952 141.408 1.952 60.864 0 114.56-29.376 143.488-78.624 25.216-42.88 26.144-92.928 2.464-133.792-3.68-6.336-7.104-11.968-10.272-17.184-15.52-25.472-21.344-35.008-19.488-66.656 0.576-9.568 1.952-19.296 3.232-29.024 5.088-37.408 11.424-83.968-24.896-127.488-24.832-29.792-28.192-46.496-30.432-57.536-1.056-5.28-2.176-10.752-4.928-16.256C870.336-56.544 814.56-89.536 743.328-89.536L743.328-89.536zM117.76 445.792c-23.232 0-42.176-18.656-42.176-41.6l0-405.952c0-22.976 18.944-41.632 42.176-41.632l110.496 0L228.256 445.792 117.76 445.792 117.76 445.792zM117.76 445.792"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="skip" unicode="&#59160;" d="M1011.168 408.864c0 10.368-4.512 19.648-11.552 26.208L605.6 775.36c-6.272 5.344-14.272 8.672-23.104 8.672-19.776 0-35.744-15.968-35.744-35.712l0-150.624C245.568 549.056 33.504 327.648 12.832 43.456c0.992-12.064 10.848-21.632 23.136-21.632 4.736 0 9.184 1.44 12.896 3.872 0.064 0.064 0-0.192 0.064-0.192 52.032 36.928 96.992 64.48 132.096 83.008 63.968 35.2 154.464 65.28 258.368 84.544l0 0.16c14.848 0 26.88 12.288 26.88 27.488 0 15.168-12.032 27.488-26.88 27.488-3.456 0-6.752-0.672-9.792-1.888-166.4-32.608-275.936-85.664-361.92-147.2 55.488 204.096 191.808 387.584 512.16 447.936l0 0c14.144 2.304 24.992 14.912 24.992 30.144 0 0.384 0 0.8-0.032 1.184L604.8 578.4 604.8 693.248l331.84-284.544-328.192-280.864-2.432 0 0 138.592-0.064 0c-0.928 16-13.824 28.672-29.568 28.672-16.352 0-29.632-13.664-29.632-30.528 0 0 0 0 0 0 0 0 0 0 0 0l0-56.128 0-75.2 0-64.352c0-19.776 15.936-35.712 35.712-35.712 8.416 0 16 3.168 22.144 8.064L998.72 381.568c0 0.032-0.128 0.064-0.064 0.096C1006.304 388.192 1011.168 397.984 1011.168 408.864z"  horiz-adv-x="1024" />
+			<glyph glyph-name="beauty" unicode="&#59090;"
+				   d="M743.619048 384.000002 743.619048-103.619045 767.999999-79.238091 402.436749-79.238091C361.966454-79.238091 329.142858-46.460515 329.142858-6.114008L329.142858 384.000002 304.761906 359.619051 572.952382 359.619051C586.417608 359.619051 597.333333 370.534773 597.333333 384.000002 597.333333 397.465231 586.417608 408.380953 572.952382 408.380953L304.761906 408.380953 280.380953 408.380953 280.380953 384.000002 280.380953-6.114008C280.380953-73.406298 335.051301-127.999996 402.436749-127.999996L767.999999-127.999996 792.38095-127.999996 792.38095-103.619045 792.38095 384.000002C792.38095 397.465231 781.465228 408.380953 767.999999 408.380953 754.53477 408.380953 743.619048 397.465231 743.619048 384.000002L743.619048 384.000002ZM670.476189 505.904763 670.476189 774.095239C669.24573 789.275639 665.564723 807.656675 657.506525 826.550542 641.134018 864.938768 612.120891 888.58573 570.10368 883.642529 565.389728 883.087946 560.65841 882.167046 555.912998 880.899285 526.12375 872.940941 496.579123 851.899039 467.116168 821.874157 454.583228 809.102185 442.894214 795.500978 432.311201 781.900938 425.929992 773.700562 421.280327 767.243813 418.664001 763.376931L414.476191 757.187423 414.476191 749.714286 414.476191 493.424202 463.238095 493.424202 463.238095 749.714286 459.050285 736.051642C461.092638 739.070203 465.120136 744.66298 470.794381 751.95485 480.303791 764.175222 490.805099 776.394427 501.920188 787.721506 525.80899 812.065924 548.994795 828.579025 568.498592 833.789561 571.02992 834.465817 573.465015 834.939783 575.801081 835.214614 592.608825 837.191996 603.871353 828.012544 612.653661 807.420878 615.935464 799.726114 618.404081 791.235777 620.111257 782.711012 621.128998 777.628946 621.64641 773.813835 621.806333 771.978643L621.714284 505.904763 670.476189 505.904763 670.476189 505.904763ZM774.15806 412.245448 688.824727 509.769256C684.195073 515.060287 677.506745 518.09524 670.476189 518.09524L390.095239 518.09524C382.57151 518.09524 375.469202 514.621616 370.85008 508.682745L285.516747 398.968459C277.249896 388.339652 279.164641 373.021694 289.793449 364.754844 300.422256 356.487994 315.740214 358.402737 324.007064 369.031546L409.340397 478.74583 390.095239 469.333335 670.476189 469.333335 652.127654 477.659317 737.460987 380.135509C746.327901 370.001892 761.730875 368.975027 771.864492 377.841941 781.998109 386.708857 783.024974 402.111831 774.15806 412.245448L774.15806 412.245448Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="iconfontplay2" unicode="&#59161;" d="M512 896C230.4 896 0 665.6 0 384c0-281.6 230.4-512 512-512 117.76 0 227.84 38.4 320 110.08 10.24 7.68 12.8 23.04 5.12 35.84-7.68 10.24-23.04 12.8-35.84 5.12C719.36-43.52 616.96-76.8 512-76.8 256-76.8 51.2 128 51.2 384 51.2 640 256 844.8 512 844.8 768 844.8 972.8 640 972.8 384c0-87.04-25.6-171.52-69.12-243.2-7.68-12.8-2.56-28.16 7.68-33.28 12.8-7.68 28.16-2.56 33.28 7.68 51.2 79.36 76.8 174.08 76.8 271.36C1024 665.6 793.6 896 512 896zM714.24 437.76c-17.92 15.36-245.76 222.72-245.76 222.72-10.24 10.24-25.6 7.68-35.84-2.56-5.12-5.12-7.68-12.8-7.68-17.92 0 0 0 0 0 0 0 0 0-499.2 0-512 0-15.36 10.24-25.6 25.6-25.6 5.12 0 12.8 2.56 15.36 7.68 2.56 2.56 217.6 186.88 240.64 207.36 23.04 20.48 33.28 38.4 33.28 64C742.4 404.48 732.16 422.4 714.24 437.76zM680.96 360.96c-7.68-5.12-204.8-176.64-204.8-176.64l0 399.36c0 0 186.88-166.4 202.24-181.76C696.32 384 698.88 376.32 680.96 360.96z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="iconfontstop" unicode="&#59162;" d="M512 896C230.4 896 0 665.6 0 384c0-281.6 230.4-512 512-512 117.76 0 227.84 38.4 320 110.08 10.24 7.68 12.8 23.04 5.12 35.84-7.68 10.24-23.04 12.8-35.84 5.12C719.36-43.52 616.96-76.8 512-76.8 256-76.8 51.2 128 51.2 384 51.2 640 256 844.8 512 844.8 768 844.8 972.8 640 972.8 384c0-87.04-25.6-171.52-69.12-243.2-7.68-12.8-2.56-28.16 7.68-33.28 12.8-7.68 28.16-2.56 33.28 7.68 51.2 79.36 76.8 174.08 76.8 271.36C1024 665.6 793.6 896 512 896zM686.08 588.8 337.92 588.8c-17.92 0-30.72-12.8-30.72-30.72l0-348.16c0-17.92 12.8-30.72 30.72-30.72l348.16 0c17.92 0 30.72 12.8 30.72 30.72L716.8 558.08C716.8 576 704 588.8 686.08 588.8zM665.6 238.08c0-5.12-2.56-7.68-7.68-7.68L366.08 230.4c-5.12 0-7.68 2.56-7.68 7.68L358.4 529.92c0 5.12 2.56 7.68 7.68 7.68l291.84 0c5.12 0 7.68-2.56 7.68-7.68L665.6 238.08z"  horiz-adv-x="1024" />
+			<glyph glyph-name="electrical" unicode="&#59092;"
+				   d="M370.99187 125.398374 670.699187 125.398374 645.723578 150.373984 645.723578 50.471546 670.699187 75.447155 370.99187 75.447155 395.967479 50.471546 395.967479 150.373984 370.99187 125.398374 370.99187 125.398374ZM370.99187 175.349594 346.01626 175.349594 346.01626 150.373984 346.01626 50.471546 346.01626 25.495936 370.99187 25.495936 670.699187 25.495936 695.674797 25.495936 695.674797 50.471546 695.674797 150.373984 695.674797 175.349594 670.699187 175.349594 370.99187 175.349594 370.99187 175.349594ZM271.089431 649.886178 271.089431 849.691057 246.113822 824.715447 395.967479 824.715447 370.99187 849.691057 370.99187 649.886178 420.943089 649.886178 420.943089 849.691057 420.943089 874.666667 395.967479 874.666667 246.113822 874.666667 221.138211 874.666667 221.138211 849.691057 221.138211 649.886178 271.089431 649.886178 271.089431 649.886178ZM670.699187 649.886178 670.699187 849.691057 645.723578 824.715447 795.577235 824.715447 770.601626 849.691057 770.601626 649.886178 820.552845 649.886178 820.552845 849.691057 820.552845 874.666667 795.577235 874.666667 645.723578 874.666667 620.747968 874.666667 620.747968 849.691057 620.747968 649.886178 670.699187 649.886178 670.699187 649.886178ZM518.451452 612.422765 920.455262 612.422765 923.213357 612.575522C937.807279 614.197069 941.097152 612.155377 942.987091 604.637148 945.984582 592.713041 943.254669 571.543893 934.89696 544.5113 921.442901 500.99481 893.19792 443.288753 874.363055 413.466882 860.952322 392.233222 840.537295 366.549649 814.418007 337.567452 802.468169 324.307804 789.457762 310.505796 775.552122 296.284098 749.051078 269.180717 720.601165 241.853303 692.145451 215.699977 682.182899 206.543507 672.935959 198.19219 664.645611 190.818112 659.693062 186.412934 656.176173 183.326396 654.335411 181.729961L670.699187 187.837397 520.845527 187.837397 520.845527 137.886178 670.699187 137.886178 680.020811 137.886178 687.062963 143.993617C689.056909 145.722903 692.730099 148.946615 697.843661 153.495012 706.330161 161.043561 715.777427 169.575804 725.947095 178.92263 755.012011 205.635868 784.082726 233.559593 811.267603 261.362347 825.625463 276.046545 839.095669 290.336326 851.523968 304.126878 879.378679 335.034718 901.420233 362.764576 916.596256 386.79328 937.611232 420.066993 967.7329 481.607223 982.619403 529.756881 993.455917 564.807055 997.202187 593.857542 991.43111 616.815046 983.167678 649.687211 956.096139 666.487779 917.697167 662.221226L920.455262 662.373984 518.451452 662.373984 518.451452 612.422765 518.451452 612.422765ZM519.564585 662.373984 117.560772 662.373984 120.318867 662.221226C81.919896 666.487779 54.848356 649.687211 46.584924 616.815046 40.813847 593.857542 44.560117 564.807055 55.396632 529.756881 70.283135 481.607223 100.404802 420.066993 121.419778 386.79328 136.595803 362.764576 158.637355 335.034718 186.492066 304.126878 198.920365 290.336326 212.39057 276.046545 226.748431 261.362347 253.933308 233.559593 283.004023 205.635868 312.068939 178.92263 322.238607 169.575804 331.685873 161.043561 340.172373 153.495012 345.285937 148.946615 348.959125 145.722903 350.953073 143.993617L357.995223 137.886178 367.316847 137.886178 542.146116 137.886178 542.146116 187.837397 367.316847 187.837397 383.680623 181.729961C381.839861 183.326396 378.322972 186.412934 373.370423 190.818112 365.080075 198.19219 355.833135 206.543507 345.870583 215.699977 317.414869 241.853303 288.964958 269.180717 262.463913 296.284098 248.558272 310.505796 235.547866 324.307804 223.598028 337.567452 197.47874 366.549649 177.063713 392.233222 163.65298 413.466882 144.818114 443.288753 116.573134 500.99481 103.119074 544.5113 94.761367 571.543893 92.031452 592.713041 95.028944 604.637148 96.918883 612.155377 100.208756 614.197069 114.802678 612.575522L117.560772 612.422765 519.564585 612.422765 519.564585 662.373984 519.564585 662.373984ZM395.967479 37.98374 395.967479-99.382114C395.967479-113.175763 407.14944-124.357724 420.943089-124.357724 434.736738-124.357724 445.918699-113.175763 445.918699-99.382114L445.918699 37.98374C445.918699 51.777389 434.736738 62.959349 420.943089 62.959349 407.14944 62.959349 395.967479 51.777389 395.967479 37.98374L395.967479 37.98374ZM595.772358 37.98374 595.772358-99.382114C595.772358-113.175763 606.954319-124.357724 620.747968-124.357724 634.541615-124.357724 645.723578-113.175763 645.723578-99.382114L645.723578 37.98374C645.723578 51.777389 634.541615 62.959349 620.747968 62.959349 606.954319 62.959349 595.772358 51.777389 595.772358 37.98374L595.772358 37.98374Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="compass" unicode="&#59163;" d="M512-128c-281.6 0-512 230.4-512 512s230.4 512 512 512 512-230.4 512-512-230.4-512-512-512zM512 853.333c-258.133 0-469.333-211.2-469.333-469.333s211.2-469.333 469.333-469.333 469.333 211.2 469.333 469.333-211.2 469.333-469.333 469.333zM266.667 117.333c-6.4 0-10.667 2.133-14.933 6.4-6.4 6.4-8.533 14.933-4.267 23.467l138.667 352c2.133 6.4 6.4 10.667 12.8 12.8l352 138.667c8.533 2.133 17.067 2.133 23.467-4.267s8.533-14.933 4.267-23.467l-138.667-352c-4.267-10.667-17.067-17.067-27.733-12.8-10.667 4.267-17.067 17.067-12.8 27.733l121.6 307.2-296.533-117.333-117.333-296.533 217.6 85.333c10.667 4.267 23.467-2.133 27.733-12.8 4.267-10.667 0-23.467-12.8-27.733l-262.4-104.533c-6.4-2.133-8.533-2.133-10.667-2.133zM475.733 384c0-20.030 16.237-36.267 36.267-36.267s36.267 16.237 36.267 36.267c0 20.030-16.237 36.267-36.267 36.267-20.030 0-36.267-16.237-36.267-36.267z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="security" unicode="&#59164;" d="M516.267-128h-8.533c-253.867 0-458.667 204.8-458.667 458.667v445.867c0 12.8 8.533 21.333 21.333 21.333h106.667c87.467 0 174.933 21.333 253.867 59.733l72.533 36.267c6.4 2.133 12.8 2.133 19.2 0l72.533-36.267c78.933-38.4 166.4-59.733 253.867-59.733h106.667c12.8 0 21.333-8.533 21.333-21.333s-8.533-21.333-21.333-21.333h-106.667c-93.867 0-187.733 21.333-273.067 64l-64 32-61.867-32c-85.333-42.667-179.2-64-273.067-64h-85.333v-424.533c0-230.4 185.6-416 416-416h8.533c228.267 0 416 185.6 416 416v298.667l-405.333-390.4c-8.533-8.533-21.333-8.533-29.867 0l-200.533 200.533c-8.533 8.533-8.533 21.333 0 29.867s21.333 8.533 29.867 0l185.6-185.6 426.667 409.6c6.4 6.4 14.933 8.533 23.467 4.267 8.533-4.267 12.8-10.667 12.8-19.2v-347.733c-0-253.867-204.8-458.667-458.667-458.667z"  horiz-adv-x="1024" />
+			<glyph glyph-name="home" unicode="&#59095;"
+				   d="M888.069936 37.738731C888.32491 39.79126 888.914598 43.905323 889.885241 49.78179 891.526956 59.721075 893.64231 70.832644 896.275784 82.8153 903.790514 117.008341 913.909985 151.171181 926.92488 182.847505 929.368089 188.793909 931.895969 194.603885 934.509141 200.266825 942.165136 216.857939 953.450406 234.829425 968.046999 254.494436 974.458728 263.132529 1017.424626 315.211684 1020.344142 323.970236 1055.52539 429.513973 958.563564 526.475799 830.766591 475.357011 826.82772 473.781461 823.371255 471.19987 820.742542 467.870165L638.92436 237.567134 657.95182 246.787878 367.04273 246.787878C353.654009 246.787878 342.800304 235.934176 342.800304 222.545455 342.800304 209.156734 353.654009 198.303029 367.04273 198.303029L657.95182 198.303029C665.371135 198.303029 672.381947 201.700484 676.979282 207.523774L858.797463 437.826805 848.773414 430.339959C937.426657 465.801257 996.741887 406.486025 974.347376 339.302492 974.866139 340.85878 969.739613 334.144179 962.139777 324.932384 945.255206 304.466519 938.832814 296.48435 929.114997 283.392186 912.696166 261.272192 899.74491 240.647674 890.485409 220.581641 887.579581 214.284489 884.777966 207.845372 882.077913 201.273841 867.889685 166.741803 856.99655 129.96711 848.921077 93.22262 846.097979 80.377141 843.824317 68.434014 842.048554 57.683185 840.96871 51.145583 840.287423 46.392454 839.954918 43.715814 838.304392 30.429218 847.73729 18.32029 861.023886 16.669764 874.31048 15.019238 886.41941 24.452137 888.069936 37.738731L888.069936 37.738731ZM187.673502 43.715814C187.340997 46.392454 186.659709 51.145583 185.579865 57.683185 183.804103 68.434014 181.530441 80.377141 178.707342 93.22262 170.631869 129.96711 159.738735 166.741803 145.550507 201.273841 142.850454 207.845372 140.048839 214.284489 137.143009 220.581641 127.883509 240.647674 114.932254 261.272192 98.513423 283.392186 88.795605 296.48435 82.373214 304.466519 65.488642 324.932384 57.888805 334.144179 52.76228 340.85878 53.281043 339.302492 30.886531 406.486025 90.201763 465.801257 178.855007 430.339959L168.830956 437.826805 275.147743 303.158876C283.443989 292.6503 298.688306 290.856849 309.196885 299.153094 319.705461 307.44934 321.498909 322.693658 313.202666 333.202236L206.885879 467.870165C204.257164 471.19987 200.800701 473.781461 196.861828 475.357011 69.064856 526.475799-27.89697 429.513973 7.284277 323.970236 10.203794 315.211684 53.169693 263.132529 59.581422 254.494436 74.178015 234.829425 85.463284 216.857939 93.11928 200.266825 95.732451 194.603885 98.260331 188.793909 100.703538 182.847505 113.718434 151.171181 123.837904 117.008341 131.352636 82.8153 133.986109 70.832644 136.101464 59.721075 137.743179 49.78179 138.713821 43.905323 139.303509 39.79126 139.558484 37.738731 141.209009 24.452137 153.317939 15.019238 166.604534 16.669764 179.89113 18.32029 189.324028 30.429218 187.673502 43.715814L187.673502 43.715814ZM197.345759-68.363637 197.345759 28.606061 173.103336 4.363637 864.118745 4.363637 839.876321 28.606061 839.876321-68.363695C839.876321-81.752416 850.730024-92.606118 864.118745-92.606118 877.507466-92.606118 888.361168-81.752416 888.361168-68.363695L888.361168 28.606061C888.361168 41.994782 877.507466 52.848484 864.118745 52.848484L173.103336 52.848484C159.714614 52.848484 148.860911 41.994782 148.860911 28.606061L148.860911-68.363637C148.860911-81.752358 159.714614-92.606061 173.103336-92.606061 186.492057-92.606061 197.345759-81.752358 197.345759-68.363637L197.345759-68.363637ZM173.103336 477.09091 173.103336 646.730437C173.103336 686.924404 205.692857 719.515152 245.876149 719.515152L754.875978 719.515152C795.067558 719.515152 827.648791 686.930484 827.648791 646.730437L827.648791 477.09091 876.133638 477.09091 876.133638 646.730437C876.133638 713.706783 821.846143 768 754.875978 768L245.876149 768C178.915006 768 124.618487 713.701438 124.618487 646.730437L124.618487 477.09091 173.103336 477.09091 173.103336 477.09091Z"
+				   horiz-adv-x="1028"/>
 
-    
-    <glyph glyph-name="share" unicode="&#59165;" d="M697.15674 473.043478 847.731148 473.043478C884.876874 473.043478 915.087718 443.040212 915.087718 406.198172L915.087718-16.632955 915.087718-105.739129 937.543859-83.47826 847.939848-83.47826 218.726818-83.47826C181.707983-83.47826 151.578948-53.486546 151.578948-16.632955L151.578948 406.198172C151.578948 423.214204 151.578948 423.214204 151.578948 445.872892 151.578948 453.080344 151.578948 453.080344 151.578948 460.106191 151.578948 487.284387 151.578948 487.284387 151.578948 495.304348L129.122807 473.043478C137.296139 473.043478 137.296139 473.043478 164.865734 473.043478 171.618554 473.043478 171.618554 473.043478 178.53178 473.043478 201.762058 473.043478 201.762058 473.043478 218.906254 473.043478L354.437705 473.043478C366.839887 473.043478 376.893843 483.01001 376.893843 495.304348 376.893843 507.598686 366.839887 517.565219 354.437705 517.565219L218.906254 517.565219C201.762058 517.565219 201.762058 517.565219 178.53178 517.565219 171.618554 517.565219 171.618554 517.565219 164.865734 517.565219 137.296139 517.565219 137.296139 517.565219 129.122807 517.565219 116.720624 517.565219 106.666667 507.598686 106.666667 495.304348 106.666667 487.284387 106.666667 487.284387 106.666667 460.106191 106.666667 453.080344 106.666667 453.080344 106.666667 445.872892 106.666667 423.214204 106.666667 423.214204 106.666667 406.198172L106.666667-16.632955C106.666667-78.033806 156.86164-127.999999 218.726818-127.999999L847.939848-127.999999 937.543859-127.999999C949.946043-127.999999 960-118.033469 960-105.739129L960-16.632955 960 406.198172C960 467.61058 909.69975 517.565219 847.731148 517.565219L697.15674 517.565219C684.754556 517.565219 674.700599 507.598686 674.700599 495.304348 674.700599 483.01001 684.754556 473.043478 697.15674 473.043478L697.15674 473.043478ZM347.996815 613.235064 548.760439 836.672028 515.337485 836.545534 715.839402 616.801317C724.158863 607.683431 738.359462 606.977534 747.557327 615.224653 756.755193 623.47177 757.467283 637.548886 749.147821 646.666769L548.645903 866.410988 531.863345 884.80418 515.22295 866.284494 314.459326 642.847529C306.210339 633.666938 307.030836 619.595623 316.291958 611.418366 325.55308 603.24111 339.747827 604.054473 347.996815 613.235064L347.996815 613.235064ZM511.087716 817.583217 510.666677 113.757106C510.659322 101.46277 520.707315 91.49033 533.109495 91.483039 545.511678 91.475749 555.571595 101.436368 555.57895 113.730704L555.999989 817.556815C556.007345 829.851152 545.959351 839.823591 533.557171 839.830882 521.154989 839.838172 511.095072 829.877554 511.087716 817.583217L511.087716 817.583217Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="store" unicode="&#59170;" d="M957.866667 725.333333c-2.133333 59.733333-51.2 106.666667-110.933333 106.666667 0 0-2.133333 0-2.133333 0 0 0-2.133333 0-2.133333 0L83.2 832C78.933333 832 72.533333 829.866667 68.266667 825.6 66.133333 821.333333 61.866667 817.066667 61.866667 810.666667l0-761.6c0 0 0 0 0 0C64-12.8 113.066667-64 174.933333-64c0 0 2.133333 0 2.133333 0 0 0 2.133333 0 2.133333 0l362.666667 0c25.6 0 29.866667 10.666667 29.866667 21.333333L571.733333 341.333333l172.8 0 0-381.866667c0-6.4 4.266667-12.8 8.533333-17.066667 4.266667-4.266667 8.533333-6.4 14.933333-6.4l168.533333 0c10.666667 0 21.333333 8.533333 21.333333 21.333333 0 0 0 0 0 0 0 0 0 2.133333 0 2.133333L957.866667 723.2C957.866667 723.2 957.866667 723.2 957.866667 725.333333zM915.2 721.066667C915.2 718.933333 917.333333 718.933333 915.2 721.066667l0-134.4C915.2 541.866667 874.666667 512 829.866667 512c-44.8 0-83.2 29.866667-83.2 72.533333 0 0 0 0 0 2.133333l0 0L746.666667 789.333333l-42.666667 0 0-202.666667 0 0c0 0 0 0 0-2.133333-2.133333-44.8-42.666667-72.533333-87.466667-72.533333-44.8 0-83.2 29.866667-83.2 72.533333 0 0 0 0 0 2.133333l0 0L533.333333 789.333333l-42.666667 0 0-202.666667 0 0c0 0 0 0 0-2.133333-2.133333-44.8-42.666667-72.533333-87.466667-72.533333-44.8 0-81.066667 27.733333-83.2 72.533333L320 789.333333l-42.666667 0 0-204.8c-2.133333-44.8-42.666667-72.533333-87.466667-72.533333-46.933333 0-83.2 29.866667-83.2 74.666667L106.666667 789.333333l736 0c0 0 2.133333 0 2.133333 0 2.133333 0 2.133333 0 4.266667 0C883.2 789.333333 915.2 757.333333 915.2 721.066667zM104.533333 49.066667 104.533333 499.2C128 480 157.866667 469.333333 189.866667 469.333333c44.8 0 83.2 19.2 106.666667 51.2 23.466667-32 61.866667-51.2 106.666667-51.2 44.8 0 83.2 19.2 106.666667 51.2 23.466667-32 61.866667-51.2 106.666667-51.2 44.8 0 83.2 19.2 106.666667 51.2 23.466667-32 61.866667-51.2 106.666667-51.2 34.133333 0 64 10.666667 87.466667 29.866667L917.333333-21.333333l-128 0L789.333333 362.666667c0 12.8-8.533333 21.333333-21.333333 21.333333l-213.333333 0c-12.8 0-21.333333-8.533333-21.333333-21.333333 0 0 0 0 0 0 0 0 0 0 0 0L533.333333-21.333333 179.2-21.333333c0 0-2.133333 0-2.133333 0-2.133333 0-2.133333 0-2.133333 0C138.666667-21.333333 104.533333 10.666667 104.533333 49.066667z"  horiz-adv-x="1024" />
+			<glyph glyph-name="electronics" unicode="&#59098;"
+				   d="M66.133333 742.4 864.120998 742.4C902.909732 742.4 934.4 710.868734 934.4 672.035888L934.4 132.266667 957.866667 155.733333 159.879001 155.733333C121.090268 155.733333 89.6 187.264599 89.6 226.097444L89.6 765.866667 66.133333 742.4 66.133333 742.4ZM66.133333 789.333333 42.666667 789.333333 42.666667 765.866667 42.666667 226.097444C42.666667 161.357696 95.156023 108.8 159.879001 108.8L957.866667 108.8 981.333333 108.8 981.333333 132.266667 981.333333 672.035888C981.333333 736.775638 928.843977 789.333333 864.120998 789.333333L66.133333 789.333333 66.133333 789.333333ZM408.297397 129.777306 337.897397-34.489361C332.792092-46.401739 338.310315-60.197297 350.222694-65.302603 362.135072-70.407908 375.93063-64.889685 381.035936-52.977306L451.435936 111.289361C456.541242 123.201739 451.023019 136.997297 439.110639 142.102603 427.198261 147.207908 413.402703 141.689685 408.297397 129.777306L408.297397 129.777306ZM587.343202 47.459526 669.476535-58.140474C677.433378-68.370701 692.176913-70.213643 702.40714-62.256798 712.637367-54.299955 714.480309-39.55642 706.523465-29.326193L624.390131 76.273807C616.433289 86.504034 601.689754 88.346976 591.459526 80.390131 581.229299 72.433289 579.386357 57.689754 587.343202 47.459526L587.343202 47.459526ZM242.133333-78.933333 805.455541-78.933333C818.415825-78.933333 828.922208-68.426948 828.922208-55.466667 828.922208-42.506385 818.415825-32 805.455541-32L242.133333-32C229.173051-32 218.666667-42.506385 218.666667-55.466667 218.666667-68.426948 229.173051-78.933333 242.133333-78.933333L242.133333-78.933333Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="manageorder" unicode="&#59171;" d="M760.832 547.84 201.728 547.84c-12.288 0-23.552-10.24-23.552-23.552s10.24-23.552 23.552-23.552l559.104 0c12.288 0 23.552 10.24 23.552 23.552S773.12 547.84 760.832 547.84zM762.88 695.296 203.776 695.296c-12.288 0-23.552-10.24-23.552-23.552 0-12.288 10.24-23.552 23.552-23.552l559.104 0c12.288 0 23.552 10.24 23.552 23.552C788.48 683.008 775.168 695.296 762.88 695.296zM790.528-21.504l0 27.648c10.24 2.048 29.696 8.192 35.84 15.36 10.24 10.24 12.288 21.504 12.288 35.84s-4.096 27.648-12.288 33.792c-10.24 8.192-23.552 15.36-40.96 23.552-10.24 4.096-21.504 10.24-25.6 12.288-4.096 4.096-6.144 10.24-6.144 17.408 0 8.192 2.048 15.36 6.144 19.456 4.096 4.096 10.24 8.192 19.456 8.192s15.36-4.096 19.456-10.24c4.096-6.144 8.192-15.36 8.192-27.648l29.696 0c0 23.552-6.144 29.696-12.288 43.008-8.192 10.24-12.288 17.408-35.84 19.456l0 29.696-23.552 0 0-29.696c-10.24-2.048-25.6-8.192-31.744-15.36-8.192-10.24-10.24-21.504-10.24-33.792 0-15.36 6.144-27.648 12.288-35.84 10.24-8.192 23.552-15.36 43.008-23.552 10.24-4.096 19.456-8.192 25.6-12.288 4.096-4.096 8.192-10.24 8.192-17.408 0-8.192-2.048-15.36-8.192-19.456-6.144-4.096-12.288-8.192-23.552-8.192-10.24 0-17.408 6.144-23.552 10.24-6.144 6.144-10.24 6.144-10.24 29.696l-29.696 0c0-23.552 4.096-35.84 12.288-45.056 10.24-10.24 25.6-17.408 35.84-19.456l0-27.648L790.528-21.504 790.528-21.504zM984.064 269.312l-68.608 21.504c-4.096 2.048-8.192 0-10.24-2.048-2.048-2.048-6.144-6.144-6.144-10.24l0-51.2-45.056 0 0 72.704c0 6.144-2.048 10.24-8.192 10.24l-63.488 19.456c-2.048 0-4.096 0-6.144 0l-68.608-17.408c-6.144-2.048-8.192-6.144-8.192-10.24l0-72.704-45.056 0 0 51.2c0 4.096-2.048 8.192-4.096 10.24-2.048 2.048-6.144 2.048-10.24 2.048L570.368 271.36c-2.048-2.048-4.096-6.144-4.096-12.288L583.68-53.248c0-4.096 4.096-10.24 8.192-10.24l183.296-57.344c2.048 0 2.048 0 4.096 0 2.048 0 2.048 0 4.096 0l183.296 57.344c4.096 2.048 8.192 6.144 8.192 10.24l2.048 21.504 0 0c0 6.144-6.144 10.24-10.24 10.24-4.096 0-10.24-6.144-10.24-10.24l0 0 0-12.288-177.152-53.248-175.104 53.248-17.408 294.912 45.056 12.288 0-45.056c0-6.144 6.144-15.36 10.24-15.36l66.56 0c6.144 0 12.288 10.24 12.288 15.36l0 70.656 55.296 15.36 55.296-15.36 0-70.656c0-6.144 8.192-15.36 12.288-15.36l68.608 0c6.144 0 10.24 10.24 10.24 15.36l0 45.056 45.056-12.288-10.24-224.256 0 0c0-6.144 6.144-10.24 10.24-10.24 6.144 0 10.24 6.144 10.24 10.24l0 0L993.28 260.096C993.28 264.192 991.232 269.312 984.064 269.312L984.064 269.312 984.064 269.312zM773.12 889.856 54.272 889.856 30.72 889.856l0-23.552 0-836.608c0-76.8 59.392-138.24 136.192-138.24l325.632 0 0 0c12.288 1.024 21.504 11.264 21.504 23.552 0 12.288-9.216 22.528-21.504 23.552l0 0-4.096 0L164.864-61.44c-47.104 0-87.04 40.96-87.04 90.112L77.824 840.704l695.296 0c47.104 0 87.04-40.96 87.04-90.112l0-360.448 0 0c0-13.312 11.264-24.576 24.576-24.576 13.312 0 24.576 11.264 24.576 24.576L909.312 750.592C910.336 827.392 849.92 889.856 773.12 889.856z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="rejectedorder" unicode="&#59172;" d="M796.672-110.592c-108.544 0-196.608 87.04-196.608 196.608S688.128 281.6 796.672 281.6 993.28 194.56 993.28 86.016C991.232-23.552 903.168-110.592 796.672-110.592zM796.672 237.568c-84.992 0-153.6-68.608-153.6-153.6 0-84.992 68.608-153.6 153.6-153.6s153.6 68.608 153.6 153.6C948.224 168.96 880.64 237.568 796.672 237.568zM884.736 60.416c12.288 0 23.552 10.24 23.552 23.552 0 12.288-10.24 23.552-23.552 23.552L709.632 107.52c-12.288 0-23.552-10.24-23.552-23.552 0-12.288 10.24-23.552 23.552-23.552L884.736 60.416 884.736 60.416zM760.832 544.768 201.728 544.768c-12.288 0-23.552-10.24-23.552-23.552s10.24-23.552 23.552-23.552l559.104 0c12.288 0 23.552 10.24 23.552 23.552S773.12 544.768 760.832 544.768zM910.336 747.52C910.336 824.32 847.872 885.76 773.12 885.76L54.272 885.76 30.72 885.76l0-23.552L30.72 25.6c0-76.8 59.392-138.24 136.192-138.24l417.792 0 0 0c13.312 1.024 22.528 11.264 22.528 24.576 0 13.312-10.24 23.552-22.528 24.576l0 0-419.84 0c-47.104 0-87.04 40.96-87.04 90.112L77.824 836.608l695.296 0c47.104 0 87.04-40.96 87.04-90.112l0-406.528 0 0c0 0 0 0 0 0 0-13.312 11.264-24.576 24.576-24.576 13.312 0 24.576 11.264 24.576 24.576 0 0 0 0 0 0l0 0L909.312 747.52zM762.88 691.2 203.776 691.2c-12.288 0-23.552-10.24-23.552-23.552s10.24-23.552 23.552-23.552l559.104 0c12.288 0 23.552 10.24 23.552 23.552C788.48 680.96 778.24 691.2 762.88 691.2z"  horiz-adv-x="1024" />
+			<glyph glyph-name="gifts" unicode="&#59099;"
+				   d="M151.31783 339.68253 151.31783 12.092546C151.31783-24.029577 180.635004-53.418204 216.629434-53.418204L784.642673-53.418204C820.737084-53.418204 849.954278-24.237995 849.954278 11.898268L849.954278 328.930234 806.295364 328.930234 806.295364 11.898268C806.295364-0.113453 796.637303-9.759287 784.642673-9.759287L216.629434-9.759287C204.770979-9.759287 194.976744 0.058818 194.976744 12.092546L194.976744 339.68253 151.31783 339.68253 151.31783 339.68253ZM544.248062-31.255814 544.248062 590.883721 500.589148 590.883721 500.589148-31.255814 544.248062-31.255814 544.248062-31.255814ZM85.829457 569.054263 828.143565 569.054263C864.241261 569.054263 893.519379 539.721495 893.519379 503.514167L893.519379 350.759691 915.348836 372.589148 173.03473 372.589148C136.937034 372.589148 107.658915 401.921916 107.658915 438.129244L107.658915 590.883721 85.829457 569.054263 85.829457 569.054263ZM85.829457 612.713178 64 612.713178 64 590.883721 64 438.129244C64 377.82797 112.806637 328.930234 173.03473 328.930234L915.348836 328.930234 937.178295 328.930234 937.178295 350.759691 937.178295 503.514167C937.178295 563.815441 888.371659 612.713178 828.143565 612.713178L85.829457 612.713178 85.829457 612.713178ZM456.930234 634.542635 587.906976 634.542635 566.077519 656.372094 566.077519 590.883721 587.906976 612.713178 456.930234 612.713178 478.759691 590.883721 478.759691 656.372094 456.930234 634.542635 456.930234 634.542635ZM456.930234 678.20155 435.100774 678.20155 435.100774 656.372094 435.100774 590.883721 435.100774 569.054263 456.930234 569.054263 587.906976 569.054263 609.736433 569.054263 609.736433 590.883721 609.736433 656.372094 609.736433 678.20155 587.906976 678.20155 456.930234 678.20155 456.930234 678.20155ZM551.660693 644.513212C552.55357 645.893111 554.286927 648.539855 556.764205 652.271447 560.914573 658.52327 565.616813 665.497734 570.773873 673.012306 585.499725 694.469978 600.893771 715.920696 616.162106 735.886981 624.310061 746.541999 632.211424 756.491864 639.79069 765.602294 667.823241 799.297985 691.414249 820.093023 697.054263 820.093023 731.078613 820.093023 790.860256 782.336197 821.48217 741.506977 826.567552 734.726467 823.726334 715.724235 811.048563 689.000874 805.881086 678.108392 810.522118 665.089223 821.414601 659.921745 832.307083 654.754268 845.326251 659.3953 850.49373 670.287782 869.606571 710.575579 874.534694 743.535137 856.409301 767.702326 818.268427 818.556826 746.7095 863.751938 697.054263 863.751938 672.038714 863.751938 644.340604 839.336568 606.227876 793.524299 598.243548 783.926974 589.974942 773.514657 581.481306 762.407593 565.71088 741.78473 549.895622 719.747076 534.776514 697.716376 529.487838 690.010018 524.661009 682.850761 520.390835 676.418474 517.815787 672.539603 515.989067 669.7503 515.005973 668.230974 508.456493 658.109052 511.352531 644.59421 521.474453 638.044732 531.596375 631.495253 545.111215 634.39129 551.660693 644.513212L551.660693 644.513212ZM537.988958 668.230974C537.005865 669.7503 535.179145 672.539603 532.604096 676.418474 528.333922 682.850761 523.507093 690.010018 518.218415 697.716376 503.099307 719.747076 487.284049 741.78473 471.513626 762.407593 463.019987 773.514657 454.751383 783.926974 446.767055 793.524299 408.654327 839.336568 380.956218 863.751938 355.940668 863.751938 306.285431 863.751938 234.726504 818.556826 196.585628 767.702326 178.612682 743.738397 183.326064 711.107286 202.033209 671.279172 208.2705 657.999778 216.033171 644.144388 224.982418 629.939234 233.201436 616.893175 241.973779 604.249862 250.747785 592.458338 256.034751 585.353105 260.185632 580.063319 262.642498 577.060484L296.432634 604.706959C294.378822 607.217173 290.636015 611.986918 285.773954 618.521118 277.632915 629.461984 269.490213 641.197815 261.921855 653.211081 253.864791 666.000071 246.954809 678.333518 241.55017 689.840169 229.189078 716.157333 226.494032 734.81534 231.51276 741.506977 262.134675 782.336197 321.916316 820.093023 355.940668 820.093023 361.580681 820.093023 385.171691 799.297985 413.204241 765.602294 420.783505 756.491864 428.68487 746.541999 436.832823 735.886981 452.101161 715.920696 467.495204 694.469978 482.221058 673.012306 487.378116 665.497734 492.080356 658.52327 496.230726 652.271447 498.708002 648.539855 500.441361 645.893111 501.334236 644.513212L537.988958 668.230974 537.988958 668.230974Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="phone" unicode="&#59173;" d="M942.08 157.696c-25.6 23.552-55.296 47.104-76.8 61.44-27.648 19.456-57.344 38.912-84.992 51.2-43.008 21.504-59.392 25.6-70.656 25.6-19.456 0-35.84-10.24-51.2-29.696-8.192-12.288-17.408-29.696-23.552-45.056-4.096-10.24-12.288-27.648-17.408-33.792-8.192 2.048-31.744 12.288-70.656 37.888-35.84 25.6-74.752 57.344-104.448 84.992-29.696 29.696-59.392 68.608-84.992 104.448-25.6 37.888-35.84 61.44-37.888 70.656 6.144 4.096 23.552 12.288 33.792 17.408 15.36 6.144 31.744 12.288 45.056 23.552 21.504 15.36 29.696 31.744 29.696 51.2 0 10.24-2.048 27.648-25.6 70.656-12.288 25.6-31.744 55.296-51.2 84.992-15.36 21.504-38.912 51.2-61.44 76.8-27.648 27.648-47.104 40.96-66.56 40.96-47.104 0-100.352-68.608-114.688-87.04-19.456-25.6-66.56-96.256-66.56-159.744 0-59.392 40.96-138.24 74.752-194.56 45.056-72.704 108.544-153.6 177.152-224.256l21.504-21.504 0 0c70.656-68.608 149.504-132.096 224.256-177.152 23.552-15.36 51.2-29.696 78.848-43.008l0 0c4.096-2.048 6.144-2.048 10.24-2.048 15.36 0 27.648 12.288 27.648 27.648 0 10.24-6.144 21.504-17.408 25.6-21.504 10.24-45.056 23.552-70.656 38.912-70.656 43.008-145.408 102.4-212.992 168.96l-21.504 21.504c-66.56 68.608-125.952 143.36-168.96 212.992-43.008 68.608-66.56 128-66.56 163.84 0 31.744 19.456 78.848 53.248 123.904 15.36 19.456 29.696 37.888 45.056 51.2 15.36 13.312 23.552 17.408 27.648 17.408 10.24-4.096 43.008-31.744 87.04-98.304 17.408-25.6 33.792-51.2 45.056-74.752 15.36-27.648 17.408-40.96 17.408-43.008 0 0-4.096-4.096-10.24-8.192-8.192-4.096-21.504-10.24-31.744-15.36-15.36-6.144-27.648-12.288-40.96-19.456-19.456-12.288-27.648-27.648-27.648-45.056 0-8.192 0-33.792 49.152-104.448 25.6-37.888 59.392-80.896 92.16-112.64l0 0c31.744-31.744 74.752-66.56 112.64-92.16 70.656-47.104 96.256-49.152 104.448-49.152l0 0c17.408 0 31.744 8.192 45.056 27.648 8.192 10.24 12.288 25.6 19.456 40.96 4.096 10.24 10.24 23.552 15.36 31.744 6.144 4.096 10.24 6.144 10.24 6.144 2.048 0 15.36-2.048 43.008-17.408 21.504-12.288 49.152-27.648 74.752-45.056 63.488-45.056 94.208-76.8 98.304-87.04-2.048-4.096-6.144-12.288-17.408-27.648-12.288-15.36-31.744-31.744-51.2-45.056-29.696-21.504-61.44-38.912-87.04-47.104l0 0c-10.24-4.096-17.408-15.36-17.408-25.6 0-15.36 12.288-27.648 27.648-27.648 2.048 0 4.096 0 6.144 2.048l0 0c2.048 0 2.048 0 4.096 2.048l0 0c45.056 15.36 82.944 40.96 102.4 55.296 21.504 15.36 87.04 70.656 87.04 115.712C982.016 110.592 969.728 130.048 942.08 157.696z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="bussinessman" unicode="&#59174;" d="M496.64-60.416l-106.496 100.352L429.056 261.12l130.048 0 29.696-222.208L496.64-60.416zM433.152 60.416l61.44-59.392 55.296 57.344-21.504 161.792-70.656 0L433.152 60.416zM642.048 329.728c92.16 51.2 153.6 147.456 153.6 260.096 0 163.84-132.096 296.96-293.888 296.96s-293.888-132.096-293.888-296.96 132.096-296.96 293.888-296.96c4.096 0 6.144 0 10.24 0l2.048 0c236.544 0 441.344-168.96 458.752-360.448L486.4-67.584 53.248-67.584c10.24 128 94.208 240.64 222.208 307.2 12.288 6.144 17.408 21.504 10.24 33.792s-21.504 17.408-33.792 10.24C96.256 207.872 0 65.536 0-93.184l0-25.6 25.6 0 460.8 0 512 0 25.6 0 0 25.6C1024 103.424 858.112 278.528 642.048 329.728zM256 589.824C256 723.968 364.544 833.536 499.712 833.536s243.712-108.544 243.712-242.688S633.856 347.136 499.712 347.136 256 455.68 256 589.824z"  horiz-adv-x="1024" />
+			<glyph glyph-name="lights" unicode="&#59102;"
+				   d="M679.665263-66.872969C675.413163-67.001581 667.598765-67.2272 656.935307-67.517485 639.154961-68.001508 619.950714-68.48557 600.03657-68.937329 574.44019-69.51799 549.558818-70.001798 526.108928-70.356444 483.043249-71.00775 447.182615-71.188531 421.024495-70.792926 406.443524-70.57241 395.149568-70.173867 387.624841-69.604864 384.224145-69.34771 381.80234-69.066908 380.72791-68.855669 381.194349-68.947373 381.890485-69.140388 383.258458-69.740358 390.735245-73.01955 397.00813-78.806517 397.00813-91.317073 397.00813-50.892646 397.00813-50.892646 397.00813 1.896096 397.00813 43.672988 397.00813 43.672988 397.00813 79.321376 397.00813 112.274716 397.00813 112.274716 397.00813 120.642377 397.00813 127.699328 393.959659 134.412267 388.646061 139.056213 387.096252 140.410707 384.043748 143.151629 379.704591 147.16665 372.388975 153.935787 364.215511 161.756847 355.400661 170.516457 330.191165 195.567979 304.977793 223.038982 281.499353 251.993824 238.026531 305.606784 205.693847 357.937331 189.10623 405.947465 181.047142 429.273171 176.910569 451.089355 176.910569 471.154473 176.910569 666.995542 335.671125 825.756097 531.512194 825.756097 727.353265 825.756097 886.113822 666.995542 886.113822 471.154473 886.113822 453.145037 882.465941 433.765495 875.316446 413.16864 857.948181 363.132719 820.944222 308.273549 770.158263 252.142029 744.062129 223.299104 716.032405 195.9968 688.004092 171.147565 678.2009 162.456292 669.109867 154.702249 660.971618 147.995552 656.141248 144.014863 652.740241 141.297105 651.008689 139.951281 645.047855 135.318308 641.560975 128.191945 641.560975 120.642379L641.560975 6.504064 666.01626 30.959349 384.780489 30.959349C371.274208 30.959349 360.325203 20.010347 360.325203 6.504064 360.325203-7.002217 371.274208-17.951219 384.780489-17.951219L666.01626-17.951219C679.522541-17.951219 690.471546-7.002217 690.471546 6.504064L690.471546 120.642379 681.023831 101.333474C683.113419 102.957577 686.877045 105.965105 692.077163 110.2505 700.656395 117.32061 710.193408 125.455044 720.451194 134.54935 749.739953 160.516064 779.027302 189.04336 806.427104 219.327172 861.228109 279.896348 901.60938 339.762458 921.522494 397.129786 930.372414 422.625363 935.02439 447.339215 935.02439 471.154473 935.02439 694.008103 754.365826 874.666667 531.512194 874.666667 308.658563 874.666667 128 694.008103 128 471.154473 128 445.266368 133.140183 418.157167 142.877122 389.975196 161.629467 335.699614 196.757585 278.844649 243.508777 221.188631 268.176678 190.766884 294.548672 162.033515 320.924541 135.822929 330.16457 126.640802 338.75635 118.419462 346.486466 111.26679 351.174748 106.928725 354.570415 103.879667 356.459629 102.228542L348.097562 120.642379C348.097562 112.274716 348.097562 112.274716 348.097562 79.321376 348.097559 43.67299 348.097559 43.67299 348.097559 1.896096 348.097559-50.892646 348.097559-50.892646 348.097562-91.317073 348.097562-104.40506 354.962325-110.738057 363.613472-114.532303 366.137018-115.639087 368.552418-116.308794 371.29242-116.847494 374.652378-117.508083 378.769417-117.985442 383.936862-118.376192 392.646507-119.034797 404.802199-119.46375 420.284879-119.697903 447.038784-120.102517 483.33091-119.919563 526.848544-119.261421 550.431567-118.904762 575.433585-118.418609 601.145837-117.835317 621.138404-117.381779 640.415629-116.895878 658.266276-116.409941 668.981414-116.118251 676.844655-115.891221 681.143991-115.761178 694.644098-115.352838 705.257071-104.077815 704.848732-90.577709 704.440393-77.077602 693.16537-66.464629 679.665263-66.872969L679.665263-66.872969ZM379.715633 343.813193 501.992055 221.53677C511.189239 212.339586 525.97641 211.95072 535.644275 220.651799L657.920698 330.700578C667.959838 339.735804 668.77367 355.198633 659.738445 365.237771 650.703219 375.276911 635.240393 376.090743 625.201252 367.055518L502.92483 257.006739 536.57705 256.121766 414.300627 378.398189C404.750244 387.948572 389.266016 387.948572 379.715633 378.398189 370.16525 368.847806 370.16525 353.363575 379.715633 343.813193L379.715633 343.813193ZM494.829269 226.601626 494.829269 18.731708 543.739838 18.731708 543.739838 226.601626 494.829269 226.601626 494.829269 226.601626Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="shoes" unicode="&#59176;" d="M1041.842629-87.992148C1041.574671-85.125315 1041.096008-79.625377 1040.476664-71.855506 1039.439588-58.844997 1038.401431-44.287388 1037.432102-28.54711 1034.417649 20.402657 1032.726697 69.575299 1033.041608 115.301548 1033.595712 195.759898 1040.539249 256.167378 1053.710848 283.893783 1054.575258 285.71338 1055.494344 287.557215 1056.468567 289.426708 1069.325504 314.098634 1079.541729 327.317609 1129.130509 386.84043 1199.865997 471.746248 1228.799992 522.091223 1228.8 588.891889 1228.800015 729.568202 1151.172884 886.526058 1054.290068 886.526059 1027.320425 886.52606 1020.494518 878.254206 943.645847 773.439579 865.553546 666.92875 828.143122 618.054231 772.255767 553.380948 759.180938 538.250657 746.130808 523.601597 733.069425 509.418284 622.283628 389.116339 444.325788 253.933906 386.69782 235.822828 359.410447 227.247068 337.251346 220.754068 316.579446 215.13727 305.590316 212.151393 276.836124 204.712722 273.941709 203.937139 269.993324 202.879137 266.423439 201.891745 262.964977 200.896369 240.935593 194.556111 220.249322 186.875748 186.750361 172.350653 136.419494 150.52727 80.689269 114.672632 45.237294 78.749724-5.609663 27.227333-18.137835-28.294405 31.22404-69.446623L34.244045-71.964352 37.812642-73.614961C106.845435-105.545188 458.018816-105.296253 577.50006-75.486451 641.39968-59.543905 663.400584-26.66282 680.645786 47.528699 697.993516 122.161316 707.996403 148.510848 742.255811 187.643118 782.727985 233.871826 818.636375 261.278426 849.143867 274.313882 858.822139 278.44928 866.903613 280.657352 873.361915 281.480428 875.221893 281.717473 876.654451 281.799777 877.656689 281.789046 877.960827 281.781156 877.960827 281.781156 877.820946 281.789181 877.667264 281.801718 877.667264 281.801718 877.40151 281.829279 877.247534 281.846564 877.247534 281.846564 877.065308 281.868979 876.968865 281.881239 876.968865 281.881239 876.865183 281.894976 876.80801 281.902679 876.80801 281.902679 876.780124 281.906496L876.719086 281.914926C892.981158 279.608648 908.102239 290.973642 910.418924 307.309755 912.735608 323.645868 901.370614 338.766948 885.034499 341.083633L884.957614 341.094433C884.85922 341.107988 884.85922 341.107988 884.791631 341.117092 884.66145 341.134344 884.66145 341.134344 884.52341 341.151898 884.235377 341.187382 884.235377 341.187382 883.915494 341.22335 883.228065 341.295206 883.228065 341.295206 882.414625 341.362545 880.60042 341.483971 880.60042 341.483971 878.296463 341.535831 874.567969 341.575754 870.397914 341.336174 865.808159 340.751235 853.838666 339.225784 840.400965 335.55425 825.666742 329.258509 786.424266 312.490711 743.386163 279.64245 697.299825 227.001052 654.603279 178.23159 641.913705 144.804805 622.447107 61.056499 609.737966 6.379807 599.905884-8.314568 563.03614-17.513331 455.550428-44.330324 117.346311-44.570066 62.896093-19.384822L69.484695-23.55316C54.166367-10.782513 58.12056 6.741486 87.764912 36.779625 117.379371 66.787471 166.76305 98.558994 210.519721 117.531814 241.820793 131.103908 260.166646 137.915325 279.490796 143.476992 282.571448 144.36363 285.793469 145.254807 289.406692 146.223002 291.92748 146.898468 320.818563 154.372552 332.246262 157.477591 353.674109 163.299791 376.582413 170.012319 404.612009 178.821343 474.269619 200.713044 659.787564 341.638377 777.021791 468.942646 790.519375 483.599631 803.987213 498.717576 817.464632 514.313751 874.728174 580.579566 912.812252 630.334177 991.832087 738.110077 1020.894784 777.748963 1034.13195 795.357284 1046.128689 809.89531 1052.847462 818.037333 1058.146598 823.83724 1061.926211 827.262036 1062.091387 827.411708 1061.01237 826.775849 1054.290068 826.775849 1106.729395 826.775849 1169.049802 700.767357 1169.049789 588.891894 1169.049784 540.993943 1145.165757 499.435881 1083.22398 425.085407 1030.081779 361.297311 1019.223457 347.247519 1003.481403 317.039171 1002.171738 314.525978 1000.924938 312.024696 999.741002 309.532488 981.526835 271.191406 973.907036 204.900564 973.292815 115.713029 972.967386 68.459638 974.703086 17.985779 977.79487-32.219727 978.787156-48.332805 979.850726-63.246781 980.915377-76.603185 981.557071-84.65346 982.059213-90.423191 982.351718-93.552643 983.887206-109.980605 998.449459-122.05334 1014.87742-120.517852 1031.305382-118.982364 1043.378117-104.420109 1041.842629-87.992148L1041.842629-87.992148Z"  horiz-adv-x="1229" />
 
-    
-    <glyph glyph-name="mobilephone" unicode="&#59178;" d="M849.52381-78.048781 296.519747-78.048781C254.7965-78.048781 220.952381-44.537079 220.952381-3.361596L220.952381 871.02439 195.809524 846.048781 748.813585 846.048781C790.518054 846.048781 824.380951 812.404644 824.380951 771.022703L824.380951 18.900533C824.380951 5.106884 835.637792-6.075076 849.52381-6.075076 863.409826-6.075076 874.666667 5.106884 874.666667 18.900533L874.666667 771.022703C874.666667 839.989784 818.292258 896 748.813585 896L195.809524 896 170.666667 896 170.666667 871.02439 170.666667-3.361596C170.666667-72.160181 227.060385-128 296.519747-128L849.52381-128C863.409826-128 874.666667-116.818039 874.666667-103.02439 874.666667-89.230741 863.409826-78.048781 849.52381-78.048781L849.52381-78.048781ZM325.488889 717.789903C325.488889 730.879395 336.197087 741.498103 349.448428 741.498103L686.773794 741.498103C699.931341 741.498103 710.733333 730.757486 710.733333 717.789903L710.733333 143.348309C710.733333 130.258816 700.025135 119.640109 686.773794 119.640109L349.448428 119.640109C336.290881 119.640109 325.488889 130.380725 325.488889 143.348309L325.488889 717.789903 325.488889 717.789903ZM277.333333 717.789903 277.333333 143.348309C277.333333 103.972503 309.684774 71.804879 349.448428 71.804879L686.773794 71.804879C726.60221 71.804879 758.88889 103.821732 758.88889 143.348309L758.88889 717.789903C758.88889 757.165708 726.537449 789.333333 686.773794 789.333333L349.448428 789.333333C309.620012 789.333333 277.333333 757.31648 277.333333 717.789903L277.333333 717.789903ZM522.666667-53.073171C550.438701-53.073171 572.952382-30.709248 572.952382-3.121952 572.952382 24.465346 550.438701 46.829269 522.666667 46.829269 494.894633 46.829269 472.380951 24.465346 472.380951-3.121952 472.380951-30.709248 494.894633-53.073171 522.666667-53.073171L522.666667-53.073171ZM522.666667-3.121952C522.666667-3.121952 522.666667-3.121952 522.666667-3.121952 522.666667-3.121952 522.666667-3.121952 522.666667-3.121952 522.666667-3.121952 522.666667-3.121952 522.666667-3.121952 522.666667-3.121952 522.666667-3.121952 522.666667-3.121952L522.666667-3.121952Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="sports" unicode="&#59104;"
+				   d="M89.619174 746.62822 304.171556 543.871917C309.603234 538.738871 316.793295 535.878991 324.266667 535.878991L732.101412 535.878991C748.259686 535.878991 761.358554 548.97786 761.358554 565.136134 761.358554 581.294409 748.259686 594.393278 732.101412 594.393278L324.266667 594.393278 344.361777 586.400352 129.809397 789.156654C118.065494 800.254877 99.548292 799.731451 88.450069 787.987548 77.351846 776.243646 77.875272 757.726444 89.619174 746.62822L89.619174 746.62822ZM102.35341 274.18928 317.324429 57.493892C328.704322 46.022718 347.228772 45.948719 358.699949 57.328612 370.171123 68.708503 370.245122 87.232954 358.865229 98.70413L143.894209 315.399516C132.514317 326.87069 113.989866 326.944691 102.518691 315.564798 91.047516 304.184905 90.973517 285.660454 102.35341 274.18928L102.35341 274.18928ZM186.715947 664.388216 27.864669 86.272811C22.747211 67.648589 36.761689 49.263866 56.076191 49.263866L981.430498 49.263866C997.588772 49.263866 1010.687642 62.362735 1010.687642 78.521009 1010.687642 94.679283 997.588772 107.77815 981.430498 107.77815L56.076191 107.77815 84.287712 70.769205 243.138991 648.884612C247.420192 664.465405 238.260064 680.566734 222.67927 684.847936 207.098477 689.129138 190.997149 679.96901 186.715947 664.388216L186.715947 664.388216ZM42.666667-58.87283 391.314285-58.87283C407.472559-58.87283 420.571428-45.773961 420.571428-29.615686 420.571428-13.457412 407.472559-0.358543 391.314285-0.358543L42.666667-0.358543C26.508393-0.358543 13.409524-13.457412 13.409524-29.615686 13.409524-45.773961 26.508393-58.87283 42.666667-58.87283L42.666667-58.87283Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="emailfilling" unicode="&#59181;" d="M1024 652.942v50.601c0 59.106-47.946 107.124-107.090 107.124h-911.577v-750.482c0-59.384 47.946-107.342 107.090-107.342h911.577v644.856l-480.234-263.965c-9.007-4.939-20.043-4.297-28.417 1.652l-364.701 259.139c-12.069 8.575-14.901 25.311-6.325 37.379s25.311 14.901 37.379 6.325l350.35-249.979c0 0 6.715 3.685 10.072 5.528 149.712 82.165 466.313 250.872 481.876 259.164z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="favoritesfilling" unicode="&#59184;" d="M339.651042 554.902345 469.110756 837.171135C491.707678 887.465924 527.371795 887.119914 548.770042 836.39534L679.364582 554.902345M679.452297 555.525577 964.078942 524.640926C1018.894963 518.691921 1029.586705 484.666406 987.95719 448.64071L772.020879 229.261722M771.548333 232.4799 830.440373-49.270172C841.721615-103.241649 812.665359-123.924563 765.538658-95.465092L517.688802 49.127605M517.485225 49.546428 267.723625-93.528794C219.879795-120.935996 191.230298-99.693225 203.733911-46.078609L269.450995 235.711635M270.301116 235.289764 28.962399 448.64071C-12.667117 484.666406-1.975373 518.691921 52.840647 524.640926L338.533536 553.476117 336.275211 542.848343 338.788109 554.562993 679.762863 554.562993 771.253818 232.252529 517.557926 49.268806 270.278963 235.18649 270.301116 235.289764Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="toys" unicode="&#59105;"
+				   d="M522.666667 52.659049 522.666667 52.659049C640.39033 52.659049 731.078095 120.674871 731.078095 196.434285 731.078095 272.1937 640.39033 340.209523 522.666667 340.209523 404.943004 340.209523 314.255238 272.1937 314.255238 196.434285 314.255238 120.674871 404.943004 52.659049 522.666667 52.659049L522.666667 52.659049ZM522.666667 2.525715 522.666667 2.525715C379.876337 2.525715 264.121905 89.341538 264.121905 196.434285 264.121905 303.527034 379.876337 390.342857 522.666667 390.342857 665.456996 390.342857 781.211428 303.527034 781.211428 196.434285 781.211428 89.341538 665.456996 2.525715 522.666667 2.525715L522.666667 2.525715ZM328.758095 397.594285C378.299616 397.594285 418.460951 437.755622 418.460951 487.297143 418.460951 536.838662 378.299616 577 328.758095 577 279.216576 577 239.055238 536.838662 239.055238 487.297143 239.055238 437.755622 279.216576 397.594285 328.758095 397.594285L328.758095 397.594285ZM328.758095 447.727618C306.90445 447.727618 289.188572 465.443499 289.188572 487.297143 289.188572 509.150788 306.90445 526.866667 328.758095 526.866667 350.61174 526.866667 368.327618 509.150788 368.327618 487.297143 368.327618 465.443499 350.61174 447.727618 328.758095 447.727618L328.758095 447.727618ZM716.575238 397.594285C766.116757 397.594285 806.278095 437.755622 806.278095 487.297143 806.278095 536.838662 766.116757 577 716.575238 577 667.033717 577 626.872382 536.838662 626.872382 487.297143 626.872382 437.755622 667.033717 397.594285 716.575238 397.594285L716.575238 397.594285ZM716.575238 447.727618C694.721594 447.727618 677.005715 465.443499 677.005715 487.297143 677.005715 509.150788 694.721594 526.866667 716.575238 526.866667 738.428883 526.866667 756.144762 509.150788 756.144762 487.297143 756.144762 465.443499 738.428883 447.727618 716.575238 447.727618L716.575238 447.727618ZM932.149018 128.840629C976.421003 197.466199 1000.186667 276.136868 1000.186667 358.024762 1000.186667 604.335046 785.995691 803.226667 522.666667 803.226667 259.337643 803.226667 45.146667 604.335046 45.146667 358.024762 45.146667 111.714477 259.337643-87.177143 522.666667-87.177143 644.527081-87.177143 759.341054-44.422944 847.029762 31.270957 857.509376 40.317079 858.67145 56.145813 849.625327 66.625427 840.579204 77.105039 824.75047 78.267115 814.270857 69.220992 735.681237 1.381532 632.492169-37.04381 522.666667-37.04381 286.229538-37.04381 95.28 140.266477 95.28 358.024762 95.28 575.783046 286.229538 753.093333 522.666667 753.093333 759.103795 753.093333 950.053333 575.783046 950.053333 358.024762 950.053333 285.900273 929.130844 216.641265 890.021425 156.018142 882.516563 144.384928 885.863251 128.870451 897.496465 121.365589 909.129679 113.860727 924.644154 117.207415 932.149018 128.840629L932.149018 128.840629ZM933.297446 554.855409C975.279191 588.776695 1000.186667 639.777434 1000.186667 694.813333 1000.186667 794.143587 919.663586 874.666667 820.333333 874.666667 747.438752 874.666667 682.608077 830.892394 654.660928 764.915167L700.82362 745.361215C720.985726 792.959628 767.747089 824.533333 820.333333 824.533333 891.975712 824.533333 950.053333 766.455711 950.053333 694.813333 950.053333 655.085056 932.114135 618.352617 901.789532 593.85031L933.297446 554.855409 933.297446 554.855409ZM131.926076 593.85031C101.601472 618.352617 83.662274 655.085056 83.662274 694.813333 83.662274 766.455711 141.739897 824.533333 213.382274 824.533333 265.968518 824.533333 312.729882 792.959628 332.891987 745.361215L379.054679 764.915167C351.107531 830.892394 286.276855 874.666667 213.382274 874.666667 114.052021 874.666667 33.528941 794.143587 33.528941 694.813333 33.528941 639.777434 58.436416 588.776695 100.418161 554.855409L131.926076 593.85031 131.926076 593.85031ZM534.522306 203.78777C572.762722 203.78777 603.762705 234.787755 603.762705 273.028171 603.762705 311.268589 572.762722 342.268572 534.522306 342.268572 496.281888 342.268572 465.281905 311.268589 465.281905 273.028171 465.281905 234.787755 496.281888 203.78777 534.522306 203.78777L534.522306 203.78777ZM534.522306 253.921103C523.969764 253.921103 515.415238 262.475629 515.415238 273.028171 515.415238 283.580713 523.969764 292.135238 534.522306 292.135238 545.074848 292.135238 553.629372 283.580713 553.629372 273.028171 553.629372 262.475629 545.074848 253.921103 534.522306 253.921103L534.522306 253.921103Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="accountfilling" unicode="&#59186;" d="M621.855287 308.356642C708.573965 355.889429 768 453.116346 768 565.333333 768 724.391341 648.609267 853.333333 501.333333 853.333333 354.057399 853.333333 234.666667 724.391341 234.666667 565.333333 234.666667 452.77667 294.453005 355.300962 381.59961 307.92637 125.9882 243.205617 21.333333 40.64141 21.333333-106.666667L486.175439-106.666667 1002.666667-106.666667C1002.666667 80.540593 839.953126 261.541474 621.855287 308.356642Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="creditlevel" unicode="&#59189;" d="M998.4 526.933l-200.533 275.2c-4.267 6.4-12.8 10.667-19.2 10.667h-535.467c0 0-14.933-2.133-23.467-17.067-25.6-42.667-187.733-283.733-187.733-283.733l-10.667-17.067 448-522.667c4.267-4.267 6.4-6.4 10.667-8.533 6.4-4.267 32-10.667 46.933 0 4.267 2.133 6.4 6.4 10.667 8.533l409.6 420.267c10.667 8.533 10.667 25.6 0 34.133-8.533 10.667-23.467 10.667-32 0l-354.133-364.8 153.6 422.4h251.733c2.133 0 19.2 0 23.467 4.267l2.133 2.133c12.8 6.4 14.933 21.333 6.4 36.267zM782.933 763.733l-96-226.133h-345.6l-85.333 226.133h526.933zM221.867 714.667l72.533-179.2h-192l119.467 179.2zM91.733 488.533h215.467l138.667-416-354.133 416zM503.467 44.8l-147.2 443.733h307.2l-160-443.733zM736 535.467l74.667 166.4 119.467-168.533-194.133-0z"  horiz-adv-x="1024" />
+			<glyph glyph-name="auto" unicode="&#59107;"
+				   d="M243.809523-24.380951C311.135665-24.380951 365.714285 30.197668 365.714285 97.52381 365.714285 164.84995 311.135665 219.428572 243.809523 219.428572 176.483383 219.428572 121.904762 164.84995 121.904762 97.52381 121.904762 30.197668 176.483383-24.380951 243.809523-24.380951L243.809523-24.380951ZM243.809523 24.380951C203.413839 24.380951 170.666667 57.128126 170.666667 97.52381 170.666667 137.919494 203.413839 170.666667 243.809523 170.666667 284.205207 170.666667 316.952382 137.919494 316.952382 97.52381 316.952382 57.128126 284.205207 24.380951 243.809523 24.380951L243.809523 24.380951ZM804.571428-24.380951C871.89757-24.380951 926.47619 30.197668 926.47619 97.52381 926.47619 164.84995 871.89757 219.428572 804.571428 219.428572 737.245289 219.428572 682.666667 164.84995 682.666667 97.52381 682.666667 30.197668 737.245289-24.380951 804.571428-24.380951L804.571428-24.380951ZM804.571428 24.380951C764.175744 24.380951 731.428572 57.128126 731.428572 97.52381 731.428572 137.919494 764.175744 170.666667 804.571428 170.666667 844.967113 170.666667 877.714285 137.919494 877.714285 97.52381 877.714285 57.128126 844.967113 24.380951 804.571428 24.380951L804.571428 24.380951ZM1011.809523 85.333333 1011.809523 317.105715C1011.809523 384.476928 957.296806 439.177724 890.130281 439.177724L36.489124 439.177724C23.023896 439.177724 12.108172 428.261999 12.108172 414.79677L12.108172 194.677888C12.108172 127.43613 66.730801 72.800412 133.826317 72.800412 147.291545 72.800412 158.207269 83.716137 158.207269 97.181365 158.207269 110.646592 147.291545 121.562317 133.826317 121.562317 93.663873 121.562317 60.870076 154.36397 60.870076 194.677888L60.870076 414.79677 36.489124 390.415819 890.130281 390.415819C930.328683 390.415819 963.047618 357.583996 963.047618 317.105715L963.047618 85.333333C963.047618 71.868105 973.963343 60.952382 987.428572 60.952382 1000.893801 60.952382 1011.809523 71.868105 1011.809523 85.333333L1011.809523 85.333333ZM359.909427 72.800412 694.774837 72.800412C708.240066 72.800412 719.155791 83.716137 719.155791 97.181365 719.155791 110.646592 708.240066 121.562317 694.774837 121.562317L359.909427 121.562317C346.444198 121.562317 335.528474 110.646592 335.528474 97.181365 335.528474 83.716137 346.444198 72.800412 359.909427 72.800412L359.909427 72.800412ZM288.80963 654.417754 268.190477 643.047619 621.924403 643.047619 604.684467 650.188635 836.513681 418.359422 895.999964 422.588535 639.164341 684.668508 632.023326 691.809524 621.924403 691.809524 268.190477 691.809524 254.74595 691.809524 247.571324 680.439389 85.333333 422.588535 142.523915 422.588535 288.80963 654.417754ZM463.238095 667.428572 463.238095 423.314477 512 423.314477 512 667.428572 463.238095 667.428572 463.238095 667.428572Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="creditlevelfilling" unicode="&#59190;" d="M1002.667 512l-189.867 264.533-89.6-264.533zM362.667 469.333l149.333-433.067 147.2 433.067zM678.4 512l93.867 298.667h-520.533l96-298.667zM535.467-38.4l2.133-2.133 462.933 509.867h-292.267zM209.067 778.667l-187.733-266.667h279.467zM21.333 469.333l465.067-514.133v8.533l-170.667 505.6z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="exl" unicode="&#59199;" d="M905.185809 717.155842C898.576738 723.314515 891.19337 730.175588 883.21687 737.563873 860.422682 758.677137 837.434925 779.792209 815.697647 799.512105 813.243072 801.738123 813.243072 801.738123 810.786411 803.962919 781.783552 830.218938 757.590948 851.623498 739.713617 866.706388 729.254178 875.530889 721.020606 882.139314 714.970549 886.498273 710.955023 889.391389 707.690543 891.475255 704.47155 893.001286 700.417679 894.92311 696.638044 896.094029 691.307277 895.994072 677.045677 895.726651 665.6 884.230663 665.6 869.817273L665.6 818.647156 665.6 767.477039 665.6 665.136806 665.6 639.551748 691.2 639.551748 896 639.551748 870.4 665.136806 870.4-102.414942 896-76.829884 230.381436-76.829884C187.90385-76.829884 153.6-42.623723 153.6-0.20663L153.6 869.817273 128 844.232214 588.8 844.232214C602.93849 844.232214 614.4 855.687035 614.4 869.817273 614.4 883.94751 602.93849 895.402331 588.8 895.402331L128 895.402331 102.4 895.402331 102.4 869.817273 102.4-0.20663C102.4-70.91021 159.652833-128 230.381436-128L896-128 921.6-128 921.6-102.414942 921.6 665.136806 921.6 690.721865 896 690.721865 691.2 690.721865 716.8 665.136806 716.8 767.477039 716.8 818.647156 716.8 869.817273C716.8 856.186238 705.748075 845.08573 692.267725 844.832959 687.705707 844.747416 685.069822 845.564005 682.52845 846.768796 682.259458 846.896318 683.344977 846.203382 685.029451 844.989748 689.779394 841.567498 697.145822 835.65506 706.686383 827.605804 724.009052 812.990879 747.816448 791.927131 776.413589 766.038406 778.850014 763.831936 778.850014 763.831936 781.285216 761.623486 802.876774 742.035788 825.739479 721.03558 848.413564 700.033563 856.350957 692.6815 863.697005 685.855107 870.269888 679.730157 874.209847 676.058701 877.019309 673.434359 878.499674 672.048591 888.81866 662.389069 905.019017 662.918788 914.684179 673.231753 924.349344 683.544717 923.819315 699.735617 913.500326 709.395139 911.981323 710.817055 909.155025 713.457124 905.185809 717.155842ZM102.4 434.871281 0 434.871281 0-0.074709 512-0.074709 1024-0.074709 1024 434.871281 153.6 434.871281 153.6 435.468951 102.4 435.468951 102.4 434.871281ZM349.4 222.8 229.8 222.8 229.8 133.2 369.6 133.2 369.6 92.8 179.2 92.8 179.2 384 368.2 384 368.2 343.2 229.8 343.2 229.8 262.8 349.4 262.8 349.4 222.8ZM511 278.8 572.2 384 630.6 384 542.6 239.6 632.6 92.8 573.6 92.8 511 199.6 448.2 92.8 389.4 92.8 479.6 239.6 391.4 384 449.8 384 511 278.8ZM720.6 133.2 852.8 133.2 852.8 92.8 670 92.8 670 384 720.6 384 720.6 133.2Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="jewelry" unicode="&#59108;"
+				   d="M793.353159 768.986715C788.757212 775.021607 781.606701 778.564036 774.021014 778.564036L526.327177 778.564036C518.583824 778.564036 483.890627 778.564036 475.060807 778.564036 466.230987 778.564036 482.176626 734.196064 483.890627 726.639456 484.416564 724.320723 503.502676 728.868364 504.788585 726.639456L666.818369 462.119125 665.166215 482.932913 478.578795-5.572521C476.722143-10.433431 475.512321-14.817907 475.060807-19.080171 473.971201-29.365995 476.431723-39.280759 487.711307-45.927533 498.610029-52.349873 508.106155-50.053523 516.598194-44.610133 520.169202-42.32112 523.548263-39.307471 527.069865-35.519855L946.940048 370.925577C956.582134 380.260444 956.831186 395.644307 947.496316 405.286396 938.161447 414.928484 922.777584 415.177534 913.135497 405.842665L492.371361-1.514955C500.172997 6.925291 528.908982-10.008098 523.97964-22.913632L710.56706 465.591804C713.176959 472.424791 712.570104 480.069911 708.914906 486.405589L547.375448 766.407316 526.327179 729.964131 774.021014 729.964131 754.688869 739.541452 959.305532 470.861299C967.436617 460.18445 982.683459 458.120702 993.360308 466.251787 1004.037157 474.382871 1006.100905 489.629713 997.96982 500.306562L793.353159 768.986715ZM773.224427 720.759115 676.300754 494.603876 661.784107 460.731701 698.635935 460.731703 990.787629 460.731706 990.787629 509.331612 698.635935 509.331607 720.971115 475.459435 817.894789 701.614675 773.224427 720.759115 773.224427 720.759115ZM451.432425 766.407316 289.892969 486.405589 284.288295 476.690822 288.044944 466.123104 461.582175-22.049299C457.173579-9.64761 485.619836 7.156649 494.238928-2.385182L48.971945 490.550974 50.918742 460.430581 244.766091 740.432308 224.786859 729.964131 472.480694 729.964131 451.432425 766.407316 451.432425 766.407316ZM493.528963 742.120852 514.553876 778.564036 472.480694 778.564036 224.786859 778.564036 212.054827 778.564036 204.807629 768.095859 10.96028 488.094133 0 472.262618 12.907077 457.973743 458.174059-34.962415C461.700269-38.866131 465.088402-41.968009 468.692781-44.328418 477.198497-49.898577 486.86492-52.259213 497.834403-45.779134 508.86517-39.26285 511.441311-29.577137 510.594149-19.413478 510.236741-15.125527 509.123525-10.690182 507.374761-5.77079L333.83753 482.401613 331.989505 462.119125 493.528963 742.120852 493.528963 742.120852ZM191.682382 701.614675 288.606057 475.459435 310.941236 509.331607 52.478105 509.331607 52.478105 460.731703 310.941236 460.731703 347.793063 460.731703 333.276417 494.603876 236.352743 720.759115 191.682382 701.614675 191.682382 701.614675ZM310.388965 473.43395 966.487683 473.43395C979.908178 473.43395 990.787636 484.31341 990.787636 497.733903 990.787636 511.154396 979.908178 522.033856 966.487683 522.033856L310.388965 522.033856C296.968472 522.033856 286.089012 511.154396 286.089012 497.733903 286.089012 484.31341 296.968472 473.43395 310.388965 473.43395L310.388965 473.43395Z"
+				   horiz-adv-x="1028"/>
 
-    
-    <glyph glyph-name="pdf" unicode="&#59200;" d="M905.185809 717.155842C898.576738 723.314515 891.19337 730.175588 883.21687 737.563873 860.422682 758.677137 837.434925 779.792209 815.697647 799.512105 813.243072 801.738123 813.243072 801.738123 810.786411 803.962919 781.783552 830.218938 757.590948 851.623498 739.713617 866.706388 729.254178 875.530889 721.020606 882.139314 714.970549 886.498273 710.955023 889.391389 707.690543 891.475255 704.47155 893.001286 700.417679 894.92311 696.638044 896.094029 691.307277 895.994072 677.045677 895.726651 665.6 884.230663 665.6 869.817273L665.6 818.647156 665.6 767.477039 665.6 665.136806 665.6 639.551748 691.2 639.551748 896 639.551748 870.4 665.136806 870.4-102.414942 896-76.829884 230.381436-76.829884C187.90385-76.829884 153.6-42.623723 153.6-0.20663L153.6 869.817273 128 844.232214 588.8 844.232214C602.93849 844.232214 614.4 855.687035 614.4 869.817273 614.4 883.94751 602.93849 895.402331 588.8 895.402331L128 895.402331 102.4 895.402331 102.4 869.817273 102.4-0.20663C102.4-70.91021 159.652833-128 230.381436-128L896-128 921.6-128 921.6-102.414942 921.6 665.136806 921.6 690.721865 896 690.721865 691.2 690.721865 716.8 665.136806 716.8 767.477039 716.8 818.647156 716.8 869.817273C716.8 856.186238 705.748075 845.08573 692.267725 844.832959 687.705707 844.747416 685.069822 845.564005 682.52845 846.768796 682.259458 846.896318 683.344977 846.203382 685.029451 844.989748 689.779394 841.567498 697.145822 835.65506 706.686383 827.605804 724.009052 812.990879 747.816448 791.927131 776.413589 766.038406 778.850014 763.831936 778.850014 763.831936 781.285216 761.623486 802.876774 742.035788 825.739479 721.03558 848.413564 700.033563 856.350957 692.6815 863.697005 685.855107 870.269888 679.730157 874.209847 676.058701 877.019309 673.434359 878.499674 672.048591 888.81866 662.389069 905.019017 662.918788 914.684179 673.231753 924.349344 683.544717 923.819315 699.735617 913.500326 709.395139 911.981323 710.817055 909.155025 713.457124 905.185809 717.155842ZM102.4 434.871281 0 434.871281 0-0.074709 512-0.074709 1024-0.074709 1024 434.871281 153.6 434.871281 153.6 435.468951 102.4 435.468951 102.4 434.871281ZM208.2 185 208.2 76.8 157.6 76.8 157.6 368 269 368C301.533495 368 327.366571 359.533419 346.5 342.6 365.633429 325.666581 375.2 303.266805 375.2 275.4 375.2 246.866524 365.833427 224.666746 347.1 208.8 328.366573 192.933254 302.133502 185 268.4 185L208.2 185ZM208.2 225.6 269 225.6C287.00009 225.6 300.733286 229.833291 310.2 238.3 319.666714 246.766709 324.4 258.999921 324.4 275 324.4 290.733412 319.600047 303.299953 310 312.7 300.399951 322.100047 287.200083 326.933331 270.4 327.2L208.2 327.2 208.2 225.6ZM419.4 76.8 419.4 368 505.4 368C531.133461 368 553.966566 362.266724 573.9 350.8 593.833434 339.333276 609.266611 323.066771 620.2 302 631.133389 280.933229 636.6 256.800137 636.6 229.6L636.6 215C636.6 187.399861 631.100055 163.133438 620.1 142.2 609.099945 121.266562 593.433436 105.133391 573.1 93.8 552.766564 82.466609 529.466799 76.8 503.2 76.8L419.4 76.8ZM470 327.2 470 117.2 503 117.2C529.533466 117.2 549.89993 125.499917 564.1 142.1 578.30007 158.700083 585.533331 182.533178 585.8 213.6L585.8 229.8C585.8 261.400158 578.933402 285.53325 565.2 302.2 551.466598 318.86675 531.533463 327.2 505.4 327.2L470 327.2ZM854.8 200.2 737.6 200.2 737.6 76.8 687 76.8 687 368 872 368 872 327.2 737.6 327.2 737.6 240.6 854.8 240.6 854.8 200.2Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="zip" unicode="&#59201;" d="M905.185809 717.155842C898.576738 723.314515 891.19337 730.175588 883.21687 737.563873 860.422682 758.677137 837.434925 779.792209 815.697647 799.512105 813.243072 801.738123 813.243072 801.738123 810.786411 803.962919 781.783552 830.218938 757.590948 851.623498 739.713617 866.706388 729.254178 875.530889 721.020606 882.139314 714.970549 886.498273 710.955023 889.391389 707.690543 891.475255 704.47155 893.001286 700.417679 894.92311 696.638044 896.094029 691.307277 895.994072 677.045677 895.726651 665.6 884.230663 665.6 869.817273L665.6 818.647156 665.6 767.477039 665.6 665.136806 665.6 639.551748 691.2 639.551748 896 639.551748 870.4 665.136806 870.4-102.414942 896-76.829884 230.381436-76.829884C187.90385-76.829884 153.6-42.623723 153.6-0.20663L153.6 869.817273 128 844.232214 588.8 844.232214C602.93849 844.232214 614.4 855.687035 614.4 869.817273 614.4 883.94751 602.93849 895.402331 588.8 895.402331L128 895.402331 102.4 895.402331 102.4 869.817273 102.4-0.20663C102.4-70.91021 159.652833-128 230.381436-128L896-128 921.6-128 921.6-102.414942 921.6 665.136806 921.6 690.721865 896 690.721865 691.2 690.721865 716.8 665.136806 716.8 767.477039 716.8 818.647156 716.8 869.817273C716.8 856.186238 705.748075 845.08573 692.267725 844.832959 687.705707 844.747416 685.069822 845.564005 682.52845 846.768796 682.259458 846.896318 683.344977 846.203382 685.029451 844.989748 689.779394 841.567498 697.145822 835.65506 706.686383 827.605804 724.009052 812.990879 747.816448 791.927131 776.413589 766.038406 778.850014 763.831936 778.850014 763.831936 781.285216 761.623486 802.876774 742.035788 825.739479 721.03558 848.413564 700.033563 856.350957 692.6815 863.697005 685.855107 870.269888 679.730157 874.209847 676.058701 877.019309 673.434359 878.499674 672.048591 888.81866 662.389069 905.019017 662.918788 914.684179 673.231753 924.349344 683.544717 923.819315 699.735617 913.500326 709.395139 911.981323 710.817055 909.155025 713.457124 905.185809 717.155842ZM102.4 434.871281 0 434.871281 0-0.074709 512-0.074709 1024-0.074709 1024 434.871281 153.6 434.871281 153.6 435.468951 102.4 435.468951 102.4 434.871281ZM282 117.2 437.6 117.2 437.6 76.8 220.8 76.8 220.8 109.6 371.4 327.2 221.8 327.2 221.8 368 432.8 368 432.8 336 282 117.2ZM534.4 76.8 484 76.8 484 368 534.4 368 534.4 76.8ZM647.2 185 647.2 76.8 596.6 76.8 596.6 368 708 368C740.533495 368 766.366571 359.533419 785.5 342.6 804.633429 325.666581 814.2 303.266805 814.2 275.4 814.2 246.866524 804.833427 224.666746 786.1 208.8 767.366573 192.933254 741.133502 185 707.4 185L647.2 185ZM647.2 225.6 708 225.6C726.00009 225.6 739.733286 229.833291 749.2 238.3 758.666714 246.766709 763.4 258.999921 763.4 275 763.4 290.733412 758.600047 303.299953 749 312.7 739.399951 322.100047 726.200083 326.933331 709.4 327.2L647.2 327.2 647.2 225.6Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="trade-assurance" unicode="&#59109;"
+				   d="M534.374 113.398l0 54.135c23.415 3.419 59.356 14.189 77.924 32.429 18.568 18.193 27.98 43.106 27.98 74.646 0 31.938-8.944 56.64-27.067 74.154-18.123 17.467-46.431 33.108-85.019 46.923-25.475 8.991-42.825 18.146-52.168 27.582-9.296 9.413-14.002 22.033-14.002 37.815 0 16.835 4.472 30.088 13.463 39.664 8.968 9.577 22.782 14.423 41.444 14.423 17.936 0 31.844-6.978 41.725-19.809 9.834-12.784 14.798-30.743 14.798-54.158l65.116 0c0 46.829-11.59 65.795-28.566 87.056-16.905 21.26-28.8 34.7-75.629 39.383l0 60.878-46.829 0 0-60.316c-23.415-3.793-51.255-15.056-69.097-33.787-17.889-18.755-24.281-43.364-24.281-73.85 0-32.101 10.513-57.038 29.104-74.786 18.568-17.748 47.766-33.202 86.353-46.291 23.86-8.429 40.929-17.514 50.599-27.301 9.694-9.787 14.704-22.478 14.704-38.072 0-17.046-5.292-30.322-16.062-39.828-10.771-9.506-26.271-14.26-46.525-14.26-19.013 0-34.63 10.162-46.946 20.862-12.269 10.63-18.38 12.995-18.38 59.824l-65.374 0c0-46.829 7.938-74.388 28.449-94.057 20.535-19.598 54.041-35.988 77.456-39.383l0-53.877 46.829 0zM941.789 717.964l-140.956 42.919c-7.141 2.131-15.852 0.82-21.799-3.582-5.947-4.402-10.513-11.403-10.513-18.825l0-109.955-93.659 0 0 150.697c0 10.724-4.027 20.09-14.447 22.712l-144.094 36.62c-3.746 0.96-6.884 0.96-10.63 0l-143.344-36.62c-10.396-2.622-15.29-11.988-15.29-22.712l0-150.697-93.659 0 0 109.955c0 7.422-3.301 14.423-9.249 18.825-5.971 4.402-13.51 5.69-20.605 3.582l-140.933-42.919c-10.326-3.138-17.116-12.925-16.507-23.719l36.738-649.264c0.539-9.74 7.118-18.123 16.414-21.026l385.99-120.234c2.295-0.702 4.636-1.054 7.001-1.054 2.365 0 4.683 0.351 6.978 1.054l385.967 120.234c9.296 2.903 15.852 11.286 16.39 21.026l2.482 44.23c0.023 0.281 0.164 0.492 0.164 0.773 0 12.925-10.49 23.415-23.415 23.415-12.925 0-23.415-10.49-23.415-23.415l-0.164 0-1.475-26.131-363.512-113.233-363.559 113.233-35.005 614.681 92.886 28.355 0-92.652c0-12.948 10.958-32.546 23.906-32.546l136.039 0c12.925 0 27.372 19.598 27.372 32.546l0 146.716 117.073 30.72 117.073-30.72 0-146.716c0-12.948 16.999-32.546 29.924-32.546l136.062 0c12.948 0 21.331 19.598 21.331 32.546l0 92.652 94.15-28.355-25.639-470.704c0-0.281-0.14-0.492-0.14-0.773 0-12.925 10.49-23.415 23.415-23.415 12.925 0 23.415 10.49 23.415 23.415l0.211 0 27.606 487.188c0.609 10.794-6.228 20.581-16.578 23.719l0 0z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="sorting" unicode="&#59203;" d="M280.862942 621.429449 457.233498 796.225268C456.884459 795.879345 455.897694 795.182702 453.852297 794.365418 448.964578 792.412422 442.709018 792.147726 436.383616 794.803489 430.07642 797.45161 425.906586 802.073236 423.887388 806.883244 423.062084 808.849229 422.879851 809.947784 422.879851 810.320201L422.879851-60.425024C422.879851-77.127021 436.419497-90.666667 453.121495-90.666667 469.823492-90.666667 483.363138-77.127021 483.363138-60.425024L483.363138 810.320201C483.363138 850.792697 443.329783 867.600977 414.657568 839.184764L238.287012 664.388945C226.424075 652.631927 226.33821 633.484171 238.09523 621.621233 249.852247 609.758295 269.000004 609.672431 280.862942 621.429449L280.862942 621.429449Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="copy" unicode="&#59204;" d="M746.932 197.892M925.731 607.302c-1.261 1.18-3.607 3.272-6.902 6.343-5.486 5.112-11.615 10.758-18.236 16.891-18.921 17.526-38.003 35.028-56.046 51.397-2.038 1.848-2.038 1.835-4.077 3.682-24.075 21.795-44.156 39.556-58.996 52.076-8.682 7.325-15.517 12.807-20.539 16.426-3.333 2.402-6.043 4.13-8.715 5.396-3.365 1.595-6.48 2.566-10.905 2.483C729.478 761.773 720 752.23 720 740.266l0-42.475 0-42.475 0-84.95L720 549l21.205 0L890 549l0-595L358.689-46C323.429-46 295-17.132 295 18.078L295 719l361.205 0c11.736 0 21.25 9.771 21.25 21.5s-9.514 21.5-21.25 21.5l-382.5 0L252 762l0-21.734L252 83l-52.421 0C166.646 83 140 109.072 140 141.322L140 824l566.286 0C739.29 824 766 797.846 766 765.596L766 762l40 0 0 3.596C806 819.404 761.271 863 706.286 863L119.958 863 100 863l0-19.506 0-702.172C100 87.537 144.642 44 199.579 44L252 44l0-25.922C252-40.612 299.979-88 358.689-88l552.515 0L932-88l0 21.237L932 570.365 932 592l0.433 0C932.432 597 930.196 603.122 925.731 607.302zM762 592l0 63.315L762 697.79l0 0.273c14-11.479 30.3-26.369 49.711-43.942 2.022-1.832 2.136-1.832 4.157-3.665 17.923-16.259 36.957-33.492 55.779-50.926 2.878-2.666 5.713-5.531 8.391-7.531L762 591.999zM816.936 460 407.295 460c-10.996 0-19.91-8.727-19.91-19.5 0-10.77 8.914-19.5 19.91-19.5l409.641 0c11 0 19.914 8.73 19.914 19.5C836.85 451.273 827.936 460 816.936 460zM816.936 343 407.295 343c-10.996 0-19.91-8.727-19.91-19.5 0-10.774 8.914-19.5 19.91-19.5l409.641 0c11 0 19.914 8.726 19.914 19.5C836.85 334.273 827.936 343 816.936 343zM816.936 207 407.295 207c-10.996 0-19.91-8.729-19.91-19.503 0-10.769 8.914-19.497 19.91-19.497l409.641 0c11 0 19.914 8.729 19.914 19.497C836.85 198.271 827.936 207 816.936 207z"  horiz-adv-x="1024" />
+			<glyph glyph-name="browse" unicode="&#59110;"
+				   d="M1012.444444 395.326985 1010.920636 397.866667C865.193651 615.161905 701.536508 725.333333 524.419049 725.333333 226.48889 725.333333 13.180952 398.501587 11.580952 395.326985 1.549206 375.847618 1.549206 355.2 11.580952 335.644444L13.866667 331.987302C175.568254 116.495238 338.514285 11.733333 512 11.733333 588.393651 11.733333 658.082539 32.736508 719.847618 64.431746 752.101587 80.965079 788.190477 102.298413 809.828572 121.346031 814.349205 125.358731 816.761905 132.317461 816.761905 139.174603 816.761905 153.219049 805.384128 164.571428 791.365079 164.571428 785.777777 164.571428 780.901587 162.387302 776.71111 159.365079 776.71111 159.365079 716.469841 118.628572 682.844444 102.755556 631.11111 78.273015 573.841269 62.552382 512 62.552382 356.114285 62.552382 206.958731 160.025397 56.025397 360.457143 54.323809 364.546031 54.526984 367.796826 56.533333 371.682539 58.260317 374.704762 256.812698 674.539683 524.419049 674.539683 683.174603 674.539683 832.304762 572.419048 967.796826 370.996826 968.380951 369.67619 968.71111 368.558731 968.914285 367.746031L966.679364 364.393651C949.942857 338.996826 879.009523 252.469841 871.314285 244.038095 863.619049 235.606349 860.419049 232.253969 860.419049 223.746031 860.419049 209.701587 871.796826 198.349205 885.815872 198.349205 893.079364 198.349205 898.793651 200.990477 904.177777 206.374603 909.561905 211.733333 990.907936 308.850795 1009.092064 336.431746L1009.879364 337.625397C1022.247618 351.92381 1023.339682 374.120636 1012.444444 395.326985L1012.444444 395.326985ZM393.498413 371.606349C393.498413 309.460318 448.88889 254.958731 512 254.958731 576.203174 254.958731 630.47619 308.393651 630.47619 371.606349 630.47619 434.819049 576.203174 488.203174 512 488.203174 448.88889 488.203174 393.498413 433.726985 393.498413 371.606349L393.498413 371.606349ZM579.682539 371.606349C579.682539 337.142857 547.403174 305.752382 512 305.752382 476.546031 305.752382 444.292064 337.142857 444.292064 371.606349 444.292064 406.044444 476.571428 437.409523 512 437.409523 547.428572 437.409523 579.682539 406.044444 579.682539 371.606349L579.682539 371.606349Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="save" unicode="&#59207;" d="M665.6 563.2 665.6 768C665.6 782.13849 654.13849 793.6 640 793.6 625.86151 793.6 614.4 782.13849 614.4 768L614.4 563.2C614.4 549.06151 625.86151 537.6 640 537.6 654.13849 537.6 665.6 549.06151 665.6 563.2L665.6 563.2ZM640 844.8 819.2 844.8 793.6 870.4 793.6 511.866455C793.6 469.593301 759.102946 435.2 716.727898 435.2L281.672102 435.2C239.236715 435.2 204.8 469.586562 204.8 511.866455L204.8 870.4C204.8 884.53849 193.33849 896 179.2 896 165.06151 896 153.6 884.53849 153.6 870.4L153.6 511.866455C153.6 441.292866 210.976425 384 281.672102 384L716.727898 384C787.345461 384 844.8 441.281743 844.8 511.866455L844.8 870.4 844.8 896 819.2 896 640 896C625.86151 896 614.4 884.53849 614.4 870.4 614.4 856.26151 625.86151 844.8 640 844.8L640 844.8ZM844.8-76.8 128.081132-76.8C85.544157-76.8 51.2-42.575806 51.2-0.163853L51.2 795.288936 51.2 870.4 25.6 844.8 102.4 844.8 896.233363 844.8C938.580175 844.8 972.8 810.585915 972.8 768.131999L972.8-102.4C972.8-116.53849 984.26151-128 998.4-128 1012.53849-128 1024-116.53849 1024-102.4L1024 768.131999C1024 838.864818 966.85523 896 896.233363 896L102.4 896 25.6 896 0 896 0 870.4 0 795.288936 0-0.163853C0-70.892966 57.307204-128 128.081132-128L844.8-128C858.93849-128 870.4-116.53849 870.4-102.4 870.4-88.26151 858.93849-76.8 844.8-76.8L844.8-76.8Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="inquirytemplate" unicode="&#59209;" d="M393.383795-78.048781 159.97786-78.048781C111.196085-78.048781 71.284553-36.770882 71.284553 14.514131L71.284553 871.02439 46.308943 846.048781 781.65338 846.048781C830.474699 846.048781 870.504064 804.596502 870.504064 753.256711L870.504064 405.866675C870.504064 392.073028 881.686027 380.891066 895.479676 380.891066 909.273323 380.891066 920.455285 392.073028 920.455285 405.866675L920.455285 753.256711C920.455285 831.800933 858.459947 896 781.65338 896L46.308943 896 21.333333 896 21.333333 871.02439 21.333333 14.514131C21.333333-63.988932 83.22553-128 159.97786-128L393.383795-128C407.177444-128 418.359405-116.818039 418.359405-103.02439 418.359405-89.230741 407.177444-78.048781 393.383795-78.048781L393.383795-78.048781ZM197.162104 521.365854 768.260691 521.365854C782.05434 521.365854 793.236301 532.547814 793.236301 546.341463 793.236301 560.135113 782.05434 571.317073 768.260691 571.317073L197.162104 571.317073C183.368455 571.317073 172.186494 560.135113 172.186494 546.341463 172.186494 532.547814 183.368455 521.365854 197.162104 521.365854L197.162104 521.365854ZM199.955658 671.219511 771.054246 671.219511C784.847893 671.219511 796.029856 682.401474 796.029856 696.195122 796.029856 709.98877 784.847893 721.170732 771.054246 721.170732L199.955658 721.170732C186.16201 721.170732 174.980048 709.98877 174.980048 696.195122 174.980048 682.401474 186.16201 671.219511 199.955658 671.219511L199.955658 671.219511ZM970.406505 97.541065 970.406505-103.02439 995.382114-78.048781 565.935198-78.048781C551.735753-78.048781 540.46042-67.003313 540.46042-53.570613L540.46042 292.185154 515.484811 267.209545 944.931725 267.209545C959.111287 267.209545 970.406505 256.155934 970.406505 242.831898L970.406505 211.767945C970.406505 197.974295 981.588465 186.792335 995.382114 186.792335 1009.175763 186.792335 1020.357724 197.974295 1020.357724 211.767945L1020.357724 242.831898C1020.357724 283.987859 986.459738 317.160764 944.931725 317.160764L515.484811 317.160764 490.509199 317.160764 490.509199 292.185154 490.509199-53.570613C490.509199-94.823518 524.376117-128 565.935198-128L995.382114-128 1020.357724-128 1020.357724-103.02439 1020.357724 97.541065C1020.357724 111.334711 1009.175763 122.516674 995.382114 122.516674 981.588465 122.516674 970.406505 111.334711 970.406505 97.541065L970.406505 97.541065ZM613.935418 184.316666 768.879164 74.221005C776.680484 68.677758 786.96339 68.079804 795.354639 72.681449L1001.262532 185.59846C1013.356979 192.230886 1017.784823 207.412017 1011.152397 219.506464 1004.51997 231.600913 989.338839 236.028755 977.244393 229.396329L771.336499 116.479317 797.811974 114.939759 642.868228 225.03542C631.624053 233.024994 616.032021 230.386622 608.042447 219.142447 600.05287 207.898274 602.691245 192.306242 613.935418 184.316666L613.935418 184.316666Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="rfqqm" unicode="&#59111;"
+				   d="M647.35 71.318c5.963 21.649 8.967 44.789 8.967 69.419 0 29.401-5.114 57.815-15.342 85.22-10.228 27.405-25.548 48.55-46.027 63.502-20.479 14.953-43.803 22.406-70.107 22.406-12.682 0-24.837-1.835-36.395-5.481-11.558-3.646-22.498-9.127-32.818-16.466-10.32-7.339-19.791-17.246-28.437-29.79-8.646-12.545-15.893-29.63-21.718-51.279-5.825-21.649-8.738-45.752-8.738-72.332 0-29.722 4.747-58.228 14.219-85.541 9.471-27.314 24.332-48.298 44.559-62.929 20.227-14.631 43.711-21.947 70.428-21.947 13.118 0 24.951 1.743 35.386 5.252 10.435 3.509 22.085 9.517 34.927 18.026l33.827-38.964 29.561 37.84-32.015 36.281c8.852 15.801 15.388 31.396 19.723 46.784l0 0zM596.507 100.879c-1.651-8.806-4.61-18.737-8.967-29.79l-26.213 30.226-29.125-37.175 24.86-30.02c-5.963-3.302-11.191-5.55-15.686-6.834-4.495-1.284-9.311-1.903-14.563-1.903-15.365 0-28.896 5.16-40.546 15.457-11.65 10.297-20.067 24.47-25.318 42.541-5.252 18.071-7.774 36.602-7.774 55.567 0 21.213 2.981 41.051 8.967 59.581 3.578 10.756 8.508 20.158 14.792 28.208 6.284 8.05 13.37 14.379 21.282 18.92 7.912 4.541 17.108 6.834 27.543 6.834 15.549 0 29.125-5.091 40.753-15.228 11.627-10.137 20.113-24.263 25.41-42.335 5.298-18.071 7.958-36.579 7.958-55.545 0-13.714-1.124-26.58-3.371-38.505l0 0zM878.266 303.541l-48.389-257.771-0.894 0-48.366 257.771-81.299 0 0-329.208 51.944 0 0 275.246 0.688 0 49.261-275.246 54.879 0 51.279 275.246 0.665 0 0-275.246 51.967 0 0 329.208-81.734 0zM785.133 813.303c-5.733 5.412-19.7 7.912-27.314 5.94-4.334-1.147-333.68-93.912-461.671-384.661-105.585 85.266-220.252 113.956-225.435 115.194-7.866 1.858-16.076-0.482-21.649-6.261-5.619-5.779-7.706-14.127-5.527-21.878 4.724-16.718 115.125-411.355 244.034-557.762 25.25-45.362 56.531-61.209 78.226-61.209l2.27 0c17.819 0 35.271 5.16 52.334 14.333 8.439 3.371 14.425 11.558 14.425 21.213 0 12.682-10.274 22.933-22.933 22.933-4.013 0-4.105 0.252-10.916-3.142-6.811-3.394-14.471-6.031-19.7-6.238-11.283-0.482-18.553 6.995-27.382 14.7-18.828 16.466-35.386 46.004-40.133 59.443-8.095 24.906-15.297 57.448-19.081 99.393-38.895 430.092 329.644 595.785 448.117 638.418-29.148-131.041-83.798-338.381-109.346-399.59-2.821-6.765-14.104-30.455-14.104-36.212 0-12.682 10.251-22.956 22.933-22.956 9.082 0 16.673 3.05 20.502 13.095 62.654 165.258 118.588 423.647 127.601 466.579 1.605 7.706 0.482 23.254-5.252 28.667l0 0zM247.874 119.937c0.298-3.188 0.596-6.33 0.94-9.494-68.41 129.963-125.537 304.509-149.525 382.689 42.656-15.618 113.176-46.99 177.252-101.113-27.772-83.661-37.427-175.096-28.667-272.081l0 0z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="templatedefault" unicode="&#59210;" d="M468.310626-78.048781 159.97786-78.048781C111.196085-78.048781 71.284553-36.770882 71.284553 14.514131L71.284553 871.02439 46.308943 846.048781 781.65338 846.048781C830.474699 846.048781 870.504064 804.596502 870.504064 753.256711L870.504064 405.866675C870.504064 392.073028 881.686027 380.891066 895.479676 380.891066 909.273323 380.891066 920.455285 392.073028 920.455285 405.866675L920.455285 753.256711C920.455285 831.800933 858.459947 896 781.65338 896L46.308943 896 21.333333 896 21.333333 871.02439 21.333333 14.514131C21.333333-63.988932 83.22553-128 159.97786-128L468.310626-128C482.104273-128 493.286236-116.818039 493.286236-103.02439 493.286236-89.230741 482.104273-78.048781 468.310626-78.048781L468.310626-78.048781ZM197.162104 521.365854 768.260691 521.365854C782.05434 521.365854 793.236301 532.547814 793.236301 546.341463 793.236301 560.135113 782.05434 571.317073 768.260691 571.317073L197.162104 571.317073C183.368455 571.317073 172.186494 560.135113 172.186494 546.341463 172.186494 532.547814 183.368455 521.365854 197.162104 521.365854L197.162104 521.365854ZM199.955658 671.219511 771.054246 671.219511C784.847893 671.219511 796.029856 682.401474 796.029856 696.195122 796.029856 709.98877 784.847893 721.170732 771.054246 721.170732L199.955658 721.170732C186.16201 721.170732 174.980048 709.98877 174.980048 696.195122 174.980048 682.401474 186.16201 671.219511 199.955658 671.219511L199.955658 671.219511ZM770.601626-128C908.53811-128 1020.357724-16.180386 1020.357724 121.756098 1020.357724 259.692582 908.53811 371.512194 770.601626 371.512194 632.665141 371.512194 520.845527 259.692582 520.845527 121.756098 520.845527-16.180386 632.665141-128 770.601626-128L770.601626-128ZM770.601626-78.048781C660.252439-78.048781 570.796749 11.40691 570.796749 121.756098 570.796749 232.105284 660.252439 321.560975 770.601626 321.560975 880.950814 321.560975 970.406505 232.105284 970.406505 121.756098 970.406505 11.40691 880.950814-78.048781 770.601626-78.048781L770.601626-78.048781ZM628.063155 104.095674 698.708245 33.450583C718.235857 13.922972 749.784966 13.89241 769.3688 33.476243L914.030005 178.137449C923.783586 187.891031 923.783586 203.704713 914.030005 213.458295 904.276422 223.211876 888.462741 223.211876 878.709158 213.458295L734.047953 68.79709C733.98662 68.735757 734.064841 68.73568 734.029092 68.771428L663.384 139.416521C653.630417 149.170103 637.816736 149.170103 628.063155 139.416521 618.309572 129.662938 618.309572 113.849257 628.063155 104.095674L628.063155 104.095674Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="libra" unicode="&#59212;" d="M588.1088 405.6576c12.81024-109.23008 105.63072-193.9968 218.30144-193.9968s205.4912 84.76672 218.30144 193.9968c0 0-0.35328 0-0.3584 0 0.52224 4.92032-0.37376 10.04032-2.87744 14.73024l-189.68064 355.2256c-1.65376 6.85568-6.02112 13.02528-12.73344 16.60928-2.29888 1.2288-4.70528 1.9456-7.13728 2.42176-0.2048 0.04608-0.41472 0.0768-0.61952 0.11776-1.17248 0.19968-2.33472 0.3328-3.5072 0.36864-0.3584 0.01536-0.6912 0.11264-1.0496 0.11264l-269.2864 0 0 38.63552c0 17.3312-11.46368 31.38048-25.6 31.38048s-25.6-14.04928-25.6-31.38048l0-38.63552L216.97024 795.24352c-0.35328 0-0.68096-0.09216-1.02912-0.10752-0.31232-0.0256-0.62464-0.06144-0.93696-0.09728-5.10464-0.43008-9.72288-2.46784-13.4656-5.67296-0.04096-0.03584-0.0768-0.06656-0.11776-0.1024-0.9984-0.86528-1.92512-1.792-2.78016-2.816-0.50176-0.57344-0.95744-1.16736-1.40288-1.77664-0.31232-0.45056-0.61952-0.90112-0.90624-1.37216-1.5104-2.3808-2.6112-4.95616-3.27168-7.67488L3.3792 420.38272c-2.24256-4.20352-3.09248-8.74496-2.8928-13.184C0.4608 406.6816 0.3584 406.18496 0.3584 405.6576l-0.35328 0c12.81024-109.23008 105.63072-193.9968 218.30144-193.9968s205.4912 84.76672 218.30144 193.9968c0 0-0.35328 0-0.3584 0 0.52224 4.92032-0.37376 10.04032-2.87744 14.73024L260.54656 744.04352l225.7152 0 0-790.45632L216.97024-46.4128c-13.51168 0-24.46848-11.46368-24.46848-25.6s10.9568-25.6 24.46848-25.6l589.78304 0c13.51168 0 24.46848 11.46368 24.46848 25.6 0 14.14144-10.9568 25.6-24.4736 25.6l-269.2864 0L537.46176 744.04352l226.85184 0-172.8256-323.65568c-2.24256-4.20352-3.0976-8.74496-2.89792-13.184-0.0256-0.52224-0.128-1.01888-0.128-1.54624L588.1088 405.6576zM218.30656 262.8608c-75.19744 0-138.85952 49.22368-160.62464 117.1968l265.5488 0c11.60704 0 21.02272 11.46368 21.02272 25.6 0 14.14144-9.41056 25.6-21.02272 25.6l-256 0 151.1424 283.0592 166.17472-311.1936C371.04128 323.50208 301.7728 262.8608 218.30656 262.8608zM806.41024 262.8608c-75.19744 0-138.85952 49.22368-160.62464 117.1968l267.8016 0c11.68896 0 21.16608 11.46368 21.16608 25.6 0 14.14144-9.47712 25.6-21.16608 25.6l-258.25792 0 151.14752 283.0592 166.1696-311.19872C959.14496 323.50208 889.87648 262.8608 806.41024 262.8608z"  horiz-adv-x="1025" />
+			<glyph glyph-name="rfqquantity" unicode="&#59112;"
+				   d="M933.12 4.64c0 0-53.76 2.24-129.92 24.64 96.32 82.88 156.8 203.84 156.8 340.48 0 248.64-201.6 450.24-448 450.24-246.4 0-448-201.6-448-448 0-125.44 53.76-246.4 145.6-331.52l0 0 0 0c4.48-4.48 11.2-6.72 15.68-6.72 13.44 0 22.4 8.96 22.4 22.4 0 6.72-2.24 11.2-6.72 15.68l0 0c-85.12 78.4-132.16 185.92-132.16 300.16 0 221.76 181.44 403.2 403.2 403.2 221.76 0 403.2-181.44 403.2-403.2 0-132.16-64.96-250.88-163.52-324.8-17.92 6.72-33.6 15.68-51.52 24.64-123.2 67.2-277.76 53.76-344.96-2.24-33.6-29.12-38.08-53.76-33.6-71.68 6.72-29.12 35.84-47.04 60.48-56 40.32-11.2 85.12-17.92 129.92-17.92 91.84 0 179.2 26.88 250.88 73.92 94.08-33.6 143.36-35.84 172.48-38.08 15.68 0 24.64 8.96 24.64 22.4-2.24 13.44-8.96 22.4-26.88 22.4l0 0zM512-31.2c-40.32 0-78.4 6.72-116.48 17.92-15.68 4.48-26.88 13.44-29.12 22.4-2.24 6.72 6.72 17.92 17.92 26.88 24.64 20.16 76.16 35.84 136.64 35.84 49.28 0 105.28-11.2 159.04-40.32 8.96-4.48 17.92-8.96 26.88-13.44-58.24-31.36-125.44-49.28-194.88-49.28l0 0z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="survey1" unicode="&#59214;" d="M731.499531 848.985442C770.629127 848.985442 802.392705 817.381582 802.392705 778.454495L802.392744 449.361689 412.872048 49.737935 423.917326 49.737961 139.970966 49.737961C100.8091 49.737961 69.096657 81.198607 69.096657 120.028925L69.096655 848.985442 45.441945 848.985442 731.499531 848.985442ZM21.787234 896 21.787234 872.492721 21.787234 120.028925C21.787234 55.215071 74.69902 2.723404 139.970966 2.723404L423.917326 2.723404 433.836385 2.723404 440.788839 9.753992 842.918932 416.403306 849.702128 423.262735 849.702128 432.879997 849.702128 778.454495C849.702128 843.334267 796.770234 896 731.499531 896L45.441945 896 21.787234 896ZM778.22803 259.579159 866.898308 170.908881 885.125447 151.422353 982.593479 249.625519 855.512968 377.439622 759.89601 277.174004 778.22803 259.579159ZM917.371009 252.944149 882.031912 217.377659 822.728724 274.569148 856.902924 311.690159 917.371009 252.944149ZM772.341518 291.258056 515.869818 34.786356 510.878071 29.794609 509.49361 22.872299 486.177999-93.705748 479.319149-128 513.613401-121.14115 630.191448-97.825539 637.113758-96.441078 642.105505-91.449331 898.577205 165.022369 915.06383 181.508994 898.577205 197.99562 805.314769 291.258056 788.828143 307.744681 772.341518 291.258056 772.341518 291.258056 772.341518 291.258056ZM788.548057 241.28119 849.238319 181.386373 613.059177-52.099878 537.423434-68.538791 556.253326 9.212311 788.548057 241.28119ZM154.380179 503.829787 695.321949 503.829787C708.387226 503.829787 718.978723 513.584265 718.978723 525.617021 718.978723 537.649777 708.387226 547.404255 695.321949 547.404255L154.380179 547.404255C141.314903 547.404255 130.723404 537.649777 130.723404 525.617021 130.723404 513.584265 141.314903 503.829787 154.380179 503.829787L154.380179 503.829787 154.380179 503.829787ZM154.380179 656.340426 695.321949 656.340426C708.387226 656.340426 718.978723 666.094904 718.978723 678.12766 718.978723 690.160417 708.387226 699.914894 695.321949 699.914894L154.380179 699.914894C141.314903 699.914894 130.723404 690.160417 130.723404 678.12766 130.723404 666.094904 141.314903 656.340426 154.380179 656.340426L154.380179 656.340426 154.380179 656.340426Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="ship" unicode="&#59215;" d="M254.094204 7.284796 105.38434 416.600693 95.298022 390.452809 531.981478 621.136912 511.246884 621.584782 927.896762 377.912437 919.147567 404.936713 823.569182 188.234217C818.814532 177.454116 823.699125 164.86071 834.479226 160.106061 845.259328 155.351409 857.852732 160.236002 862.607381 171.016105L958.185766 387.718598C962.562163 397.641092 958.797909 409.268015 949.436572 414.742874L532.786694 658.415218C526.417653 662.14007 518.576041 662.30945 512.0521 658.863088L75.368645 428.178987C65.95003 423.203471 61.644922 412.042863 65.282327 402.031102L213.992191-7.284796C218.015472-18.35866 230.254127-24.074289 241.327993-20.051006 252.401858-16.027725 258.117485-3.789071 254.094204 7.284796L254.094204 7.284796ZM501.333333 618.666667 501.333333 42.666667C501.333333 30.884593 510.884593 21.333333 522.666667 21.333333 534.44874 21.333333 544 30.884593 544 42.666667L544 618.666667C544 630.448741 534.44874 640 522.666667 640 510.884593 640 501.333333 630.448741 501.333333 618.666667L501.333333 618.666667ZM234.666667 492.178775 234.666667 704 213.30699 682.666683 810.640322 681.929059 789.333333 703.262376 789.333333 469.333333C789.333333 457.55126 798.884593 448 810.666667 448 822.44874 448 832 457.55126 832 469.333333L832 703.262376C832 715.034164 822.464789 724.581156 810.693011 724.595693L213.359677 725.333317C201.567322 725.347879 192 715.792364 192 704L192 492.178775C192 480.396702 201.551259 470.845442 213.333333 470.845442 225.115408 470.845442 234.666667 480.396702 234.666667 492.178775L234.666667 492.178775ZM50.808629 10.909344C59.57446 4.01245 74.359082-5.898603 93.457074-15.777417 125.833244-32.524631 158.87312-42.666667 191.200647-42.666667 194.159993-42.666667 197.125968-42.490381 200.101743-42.143554 215.160419-40.388463 229.750682-34.546782 246.981287-24.516474 253.290676-20.843642 259.67245-16.800755 268.51965-10.963369 270.933897-9.370447 279.678588-3.563123 279.334447-3.791241 283.686688-0.906313 287.021523 1.282671 290.313331 3.406022 349.341858 41.481835 394.110662 53.028668 458.251198 34.198797 499.945909 21.958391 531.81113 10.084154 562.013282-3.523206 564.427757-4.611029 610.274961-26.482718 622.334739-31.069694 643.349741-39.062818 663.178867-42.666667 689.241841-42.666667 716.338238-42.666665 728.977969-38.064819 791.184625-10.613628 871.129935 24.665459 915.734313 29.460894 969.593022-6.038165 979.430453-12.522161 992.661587-9.803663 999.145581 0.033771 1005.629577 9.871204 1002.911078 23.102336 993.073645 29.586332 923.841726 75.218097 865.884521 68.987095 773.958923 28.421225 719.179394 4.247552 707.512794 2.0e-06 689.241837 0 668.334466 0 653.646641 2.669442 637.503006 8.809726 627.363543 12.666304 583.439821 33.620384 579.539729 35.37754 547.579132 49.777156 513.877129 62.335853 470.269737 75.137764 392.284911 98.031934 335.65418 83.425655 267.185634 39.260644 203.418324-1.871874 210.013117 1.967098 195.162376 0.236243 193.807429 0.078323 192.489657 0 191.200647 0 166.730635 0 139.899367 8.23622 113.059968 22.11943 103.454075 27.088267 94.55576 32.421935 86.625828 37.737862 81.957097 40.867603 78.730138 43.230658 77.191371 44.441348 67.931764 51.726741 54.519391 50.126325 47.233998 40.866718 39.948604 31.60711 41.549021 18.194737 50.808629 10.909344L50.808629 10.909344ZM362.666667 710.860413 362.666667 789.333333 341.333333 768 704 768 682.666667 789.333333 682.666667 704C682.666667 692.217925 692.217926 682.666667 704 682.666667 715.782074 682.666667 725.333333 692.217925 725.333333 704L725.333333 789.333333C725.333333 801.115408 715.782074 810.666667 704 810.666667L341.333333 810.666667C329.55126 810.666667 320 801.115408 320 789.333333L320 710.860413C320 699.078338 329.55126 689.52708 341.333333 689.52708 353.115407 689.52708 362.666667 699.078338 362.666667 710.860413L362.666667 710.860413Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="atmaway" unicode="&#59113;"
+				   d="M784.13 256.8l0 0c-20.69 0-37.463 44.891-37.463 100.267 0 55.376 16.773 100.267 37.463 100.267 20.69 0 37.463-44.891 37.463-100.267 0-55.376-16.773-100.267-37.463-100.267l0 0zM506.797 217.867l0 0c-20.69 0-37.463 39.28-37.463 87.733 0 48.454 16.773 87.733 37.463 87.733 20.69 0 37.463-39.28 37.463-87.733 0-48.454-16.773-87.733-37.463-87.733l0 0zM298.176 713.32c-149.272-73.128-245.851-210.105-250.381-363.22-0.112-3.774-0.168-7.555-0.168-11.34 0-13.152 10.662-23.814 23.814-23.814 13.152 0 23.814 10.662 23.814 23.814 0 3.316 0.049 6.627 0.147 9.932 3.983 134.635 89.69 256.193 223.727 321.857 11.811 5.786 16.695 20.051 10.909 31.862-5.786 11.811-20.051 16.695-31.862 10.909l0 0zM495.753-88.469c13.276-0.947 26.637-1.422 40.061-1.422 268.947 0 488.186 191.132 488.186 428.651 0 237.519-219.239 428.651-488.186 428.651 3.48 0 4.717-0.554 4.64-0.498-2.031 1.485-4.352 3.51-10.561 9.169-17.272 15.74-28.08 24.576-44.793 35.226-51.359 32.726-118.725 51.359-211.239 51.359-13.152 0-23.814-10.662-23.814-23.814 0-13.152 10.662-23.814 23.814-23.814 83.664 0 142.135-16.172 185.645-43.897 11.547-7.358 59.83-51.359 76.309-51.359 243.985 0 440.558-171.372 440.558-381.023 0-209.651-196.574-381.023-440.558-381.023-12.294 0-24.526 0.436-36.674 1.302-13.119 0.935-24.512-8.941-25.447-22.06-0.935-13.119 8.941-24.512 22.06-25.447l0 0zM238.14-137.519c131.521 0 238.14 106.619 238.14 238.14 0 131.521-106.619 238.14-238.14 238.14-131.521 0-238.14-106.619-238.14-238.14 0-131.521 106.619-238.14 238.14-238.14l0 0zM238.14-89.891c-105.217 0-190.512 85.295-190.512 190.512 0 105.217 85.295 190.512 190.512 190.512 105.217 0 190.512-85.295 190.512-190.512 0-105.217-85.295-190.512-190.512-190.512l0 0zM214.326 205.402l0-142.884c0-13.152 10.662-23.814 23.814-23.814s23.814 10.662 23.814 23.814l0 142.884c0 13.152-10.662 23.814-23.814 23.814s-23.814-10.662-23.814-23.814l0 0zM303.689 49.623l-66.679 76.205c-8.661 9.898-23.705 10.901-33.603 2.24-9.898-8.661-10.901-23.705-2.24-33.603l66.679-76.205c8.661-9.898 23.705-10.901 33.603-2.24 9.898 8.661 10.901 23.705 2.24 33.603l0 0z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="bussinesscard" unicode="&#59219;" d="M448 490.666667C448 561.359115 390.692448 618.666667 320 618.666667 249.307552 618.666667 192 561.359115 192 490.666667 192 419.974219 249.307552 362.666667 320 362.666667 390.692448 362.666667 448 419.974219 448 490.666667ZM243.2 490.666667C243.2 533.082135 277.584531 567.466667 320 567.466667 362.415469 567.466667 396.8 533.082135 396.8 490.666667 396.8 448.251198 362.415469 413.866667 320 413.866667 277.584531 413.866667 243.2 448.251198 243.2 490.666667ZM130.808907 227.199991 130.808907 200.533325 156.69817 200.533325 328.38486 200.533325 519.147849 200.533325 545.037111 200.533325 545.037111 227.199991C545.037111 326.640457 449.055298 413.866658 337.923008 413.866658 331.301828 413.866658 324.715537 413.586711 318.179253 413.030206 303.929606 411.816979 293.332828 398.93497 294.510686 384.257431 295.688544 369.579895 300.838539 364.531686 315.088186 365.744913 320.205801 366.180631 332.725555 360.533325 337.923008 360.533325 421.801824 360.533325 493.258586 315.21776 493.258586 253.866658L328.38486 253.866658 182.587432 253.866658C182.587432 272.750377 202.863759 307.684713 240.911324 332.72995 252.959405 340.660736 256.484561 357.150086 248.784979 369.559949 241.085397 381.969809 225.076753 385.600819 213.028673 377.670033 160.669895 343.204279 130.808907 291.768454 130.808907 227.199991ZM128.186836 71.619049C85.627327 71.619049 51.233488 105.352853 51.233488 147.186415L51.233488 717.714286 896.718133 717.714286C939.035972 717.714286 973.436282 683.911966 973.436282 642.391369L973.436282 148.945905C973.436282 135.059889 984.905289 123.803049 999.053026 123.803049 1013.200762 123.803049 1024.669769 135.059889 1024.669769 148.945905L1024.669769 642.391369C1024.669769 711.671216 967.344489 768 896.718133 768L25.616744 768 0 768 0 742.857143 0 147.186415C0 77.572885 57.33993 21.333333 128.186836 21.333333L912.213943 21.333333C926.361679 21.333333 937.830686 32.590174 937.830686 46.47619 937.830686 60.362208 926.361679 71.619049 912.213943 71.619049L128.186836 71.619049ZM871.607934 490.666667C885.0793 490.666667 896 500.217926 896 512 896 523.782074 885.0793 533.333333 871.607934 533.333333L579.058733 533.333333C565.587366 533.333333 554.666667 523.782074 554.666667 512 554.666667 500.217926 565.587366 490.666667 579.058733 490.666667L871.607934 490.666667ZM807.058613 384C820.833361 384 832 393.55126 832 405.333333 832 417.115407 820.833361 426.666667 807.058613 426.666667L579.608053 426.666667C565.833306 426.666667 554.666667 417.115407 554.666667 405.333333 554.666667 393.55126 565.833306 384 579.608053 384L807.058613 384Z"  horiz-adv-x="1025" />
 
-    
-    <glyph glyph-name="hot" unicode="&#59222;" d="M890.059904 352.19949C845.890699 458.956706 840.554889 548.495155 857.396326 618.42714 859.144623 625.686731 860.991676 631.977679 862.858846 637.425182 863.763607 640.064841 865.906573 645.659889 866.16406 646.532651L880.890349 696.448108 833.062903 675.930997C832.106692 675.5208 830.618069 674.894716 827.426684 673.550492 824.667648 672.380966 822.310677 671.354022 819.868514 670.244809 813.291441 667.257545 807.049466 664.090938 800.697749 660.412845 784.089623 650.795565 768.486253 638.656896 753.86285 623.033596 727.630498 595.007563 706.526618 557.766355 691.78157 509.713231 675.041103 455.157161 671.516484 411.46006 673.004574 347.939834 673.477918 327.734769 673.463923 322.197583 672.83965 318.324215 673.779618 324.156339 684.455526 333.678199 696.104608 329.195676 693.056849 330.368442 685.695898 339.012828 676.314007 361.368339 660.550914 398.92921 646.834249 460.170272 636.817284 549.350468 625.445924 650.588768 630.103925 734.728052 644.646978 801.338628 647.677924 815.221065 650.899934 827.082435 654.086773 836.904609 655.91465 842.538316 657.254607 846.094657 657.880284 847.554385L678.645286 896 628.243642 880.578031C617.409833 877.263087 599.94569 869.52239 578.105438 855.845223 542.547644 833.577626 507.199569 802.385036 474.400401 760.836776 447.596676 726.883228 423.611383 687.30061 403.118547 641.701619 378.907516 587.829195 363.003277 542.798944 353.158029 503.238462 349.274261 487.632585 346.433259 473.323627 344.1945 458.925156 343.334411 453.39353 342.592734 448.063234 341.804612 441.911844 341.502524 439.553997 340.356619 430.329551 340.073506 428.145504 337.596047 409.033293 335.848224 404.35337 329.235273 398.312868 336.081933 404.566848 343.232634 404.098227 346.608002 402.086756 344.852318 403.133013 341.598345 406.493651 337.991853 411.887149 327.030897 428.279226 317.980358 454.883162 313.690598 489.339595 311.250185 508.941598 310.203772 539.08627 310.370048 576.545325 310.480474 601.422138 311.113088 628.122479 312.099068 654.977888 312.481453 665.393013 312.891081 675.105466 313.30045 683.849175 313.545346 689.079919 313.735044 692.813105 313.84201 694.783403L317.55517 763.179488 271.360516 712.604139C270.467691 711.626645 268.852992 709.837042 266.618705 707.326295 262.927895 703.178805 258.823678 698.493751 254.407949 693.361469 241.78797 678.693606 229.164348 663.340425 217.341267 648.004036 211.724185 640.717803 206.411389 633.591345 201.450577 626.663838 176.017063 591.147305 156.617347 555.402528 138.122768 512.155497 90.841957 401.595812 76.97672 299.648706 99.261816 188.134893 126.80821 50.293739 188.553235-37.644222 278.8297-84.690336 344.19104-118.752337 408.837235-128 507.940695-128 525.713007-128 557.977207-125.567138 590.857378-120.462159 641.152493-112.653331 687.496192-99.789323 726.063273-80.591044 738.155853-74.571488 743.07901-59.888702 737.059454-47.796122 731.039898-35.703543 716.357111-30.780384 704.264531-36.79994 670.855859-53.430419 629.092954-65.022897 583.352478-72.12457 552.984316-76.839535 523.228215-79.083275 507.940695-79.083275 416.16215-79.083275 357.934257-70.753754 301.436271-41.310746 224.830174-1.388723 171.977796 73.88423 147.230072 197.720945 126.99711 298.965952 139.514783 391.004811 183.099329 492.921284 200.282663 533.10215 218.020237 565.784358 241.22153 598.183718 245.831691 604.621559 250.802959 611.289899 256.082244 618.137961 267.31885 632.713596 279.402035 647.409487 291.488864 661.457681 298.732051 669.876243 304.338773 676.176713 307.478705 679.614406L264.997214 697.435142C264.883874 695.347445 264.688038 691.493511 264.43725 686.13688 264.020474 677.234965 263.603959 667.359281 263.215279 656.772625 262.21142 629.430212 261.566827 602.224414 261.453805 576.762458 261.278897 537.358818 262.385015 505.49418 265.148621 483.296209 276.058157 395.668083 322.627019 326.024497 362.226031 362.195618 379.341732 377.829698 384.756649 392.328523 388.584361 421.857186 397.932742 493.974714 407.332926 531.746825 447.736538 621.64966 466.587287 663.594818 488.484326 699.731218 512.795234 730.526996 542.034492 767.565749 573.156162 795.028785 604.068111 814.386984 614.696751 821.043029 624.472062 826.201428 633.124687 830.036563 638.02329 832.207788 641.258688 833.404991 642.556233 833.802016L612.91959 866.825663C608.658554 856.884484 602.686705 838.478616 596.856038 811.772799 581.186705 740.003594 576.231674 650.498985 588.206246 543.890345 607.295279 373.942261 638.819345 298.82557 678.537329 283.542234 701.302332 274.782345 717.731637 289.435669 721.133156 310.5407 722.475759 318.870999 722.489387 324.263403 721.907881 349.085491 720.532565 407.791853 723.691247 446.952173 738.546223 495.36355 751.151827 536.44438 768.544047 567.135763 789.576147 589.605967 809.230566 610.60429 821.725461 617.839716 852.347733 630.976117L842.705318 653.453557 819.246577 660.374464C822.235501 670.505564 813.450321 644.87463 809.839253 629.880119 790.647573 550.189047 796.611315 450.1135 844.8591 333.498332 883.105728 241.056017 874.587669 126.064924 824.002925 61.397129 815.680378 50.757545 817.558709 35.3857 828.198295 27.063153 838.837879 18.740608 854.209724 20.61894 862.532269 31.258524 924.762731 110.814263 934.658528 244.404363 890.059904 352.19949Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="rfq1" unicode="&#59115;"
+				   d="M95.626718 553.988173C226.725812 99.524267 373.457047-54.361353 373.457047-54.361353 354.007987-23.039507 336.150869 26.36963 328.843074 104.645442 317.833444 223.162103 333.638238 324.665647 365.880738 411.399964 243.010105 519.06067 95.626718 553.988173 95.626718 553.988173M154.453485 493.914643C200.141559 475.712474 262.516736 445.407383 320.940715 398.97126 295.910059 321.999454 284.689446 239.465585 287.432249 152.654394 229.430272 272.68627 180.999358 411.936996 154.453485 493.914643M642.80007 680.666453C454.312695 534.47225 369.803151 340.99769 391.669001 105.614071 404.577508-33.521664 446.065058-83.659625 480.570786-84.177502L464.592593-84.196693C662.690323-84.196693 842.6807 541.626596 906.39853 822.065304 854.821926 804.380824 746.413321 761.033007 642.80007 680.666453ZM479.957143-122.538624C448.174914-122.059108 372.143181-99.215068 353.461325 102.065683 298.259684 696.81645 921.148303 867.197156 927.439454 868.865896L957.62963 876.787484 951.05062 846.271147C950.53293 843.87347 898.438257 604.00147 817.05529 367.23674 705.328546 42.241517 592.719644-122.557805 482.393126-122.557805L479.957143-122.538624Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="data" unicode="&#59223;" d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 625.686419-128 733.786972-90.820171 822.292028-23.295213 832.066406-15.83785 833.944717-1.868762 826.487354 7.905617 819.029988 17.679996 805.0609 19.558308 795.286522 12.100943 714.473916-49.555057 615.842022-83.478261 512-83.478261 253.818886-83.478261 44.521739 125.818886 44.521739 384 44.521739 642.181114 253.818886 851.478261 512 851.478261 770.181114 851.478261 979.478261 642.181114 979.478261 384 979.478261 296.952627 955.670714 213.458976 911.318368 140.798694 904.912864 130.304873 908.227102 116.605263 918.720924 110.199761 929.214746 103.794257 942.914355 107.108495 949.319857 117.602317 997.906701 197.199765 1024 288.709606 1024 384ZM368.901888 420.424055 338.700849 417.813865 563.838502 242.092789 581.396516 228.38867 595.091066 245.954153 840.321161 560.501594C847.880329 570.197455 846.148198 584.185421 836.452335 591.744589 826.756474 599.303757 812.768508 597.571625 805.20934 587.875763L559.979243 273.328322 591.231806 277.189685 366.094153 452.910761 349.780358 465.643759 335.893114 450.300567 176.846524 274.579482C168.596353 265.464361 169.297534 251.38701 178.412655 243.136838 187.527777 234.886667 201.605128 235.587849 209.855299 244.70297L368.901888 420.424055Z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="trade" unicode="&#59224;" d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 625.686419-128 733.786972-90.820171 822.292028-23.295213 832.066406-15.83785 833.944717-1.868762 826.487354 7.905617 819.029988 17.679996 805.0609 19.558308 795.286522 12.100943 714.473916-49.555057 615.842022-83.478261 512-83.478261 253.818886-83.478261 44.521739 125.818886 44.521739 384 44.521739 642.181114 253.818886 851.478261 512 851.478261 770.181114 851.478261 979.478261 642.181114 979.478261 384 979.478261 296.952627 955.670714 213.458976 911.318368 140.798694 904.912864 130.304873 908.227102 116.605263 918.720924 110.199761 929.214746 103.794257 942.914355 107.108495 949.319857 117.602317 997.906701 197.199765 1024 288.709606 1024 384ZM551.801933 52.140096C551.801933 52.140096 551.910146 35.022135 529.538995 35.022135 507.167844 35.022135 503.178743 52.140096 503.178743 52.140096L503.178743 129.060386C414.434338 138.625651 357.575004 180.207362 332.599034 253.806763 332.599034 253.806763 321.314219 279.182716 346.988612 288.579433 372.663008 297.976147 386.403381 274.929952 386.403381 274.929952 407.128124 218.866869 446.052855 188.444469 503.178743 183.661837L503.178743 368.589372C441.270221 383.468674 401.083426 402.864614 382.61715 426.777777 364.150874 450.690942 354.917875 477.260723 354.917875 506.487923 354.917875 583.541449 404.33767 630.304265 503.178743 646.777777L503.178743 712.538647C503.178743 712.538647 508.270528 730.183642 526.337227 730.183642 544.403925 730.183642 551.801933 712.538647 551.801933 712.538647L551.801933 646.777777C630.183966 639.869532 681.596497 604.797419 706.041062 541.560386 706.041062 541.560386 706.041062 521.239281 686.661534 515.780798 667.282005 510.322313 651.838163 524.024154 651.838163 524.024154 637.224565 567.333551 603.879488 590.714959 551.801933 594.169082L551.801933 423.589372C661.536781 403.927439 716.403381 354.507642 716.403381 275.328503 716.403381 241.318671 703.915584 209.767053 678.939614 180.672706 653.963644 151.578357 611.584841 134.374423 551.801933 129.060386L551.801933 52.140096ZM503.178743 594.169082C475.811458 592.043467 453.957811 583.673986 437.61715 569.060386 421.276489 554.446786 413.106281 535.980787 413.106281 513.661837 413.106281 469.821037 443.130135 442.188463 503.178743 430.763285L503.178743 594.169082ZM551.801933 183.661837C584.217553 184.990345 609.525271 193.891221 627.725845 210.364734 645.926419 226.838246 655.026571 246.632734 655.026571 269.748791 655.026571 318.903627 620.618701 348.263236 551.801933 357.828503L551.801933 183.661837Z"  horiz-adv-x="1024" />
+			<glyph glyph-name="scanning" unicode="&#59116;"
+				   d="M910.390485 476.93824C898.522325 476.93824 888.928939 486.53184 888.928939 498.4L888.928939 756.884053C888.928939 774.63296 874.485205 789.07648 856.736469 789.07648 845.340331 789.07648 612.760491 788.8192 598.960683 788.389973 588.315605 787.7888 578.121429 795.23584 576.297259 806.245973 574.344149 817.942187 582.220672 828.995413 593.895723 830.9696 599.862059 831.97824 854.182528 832 856.736469 832 898.157525 832 931.852245 798.304853 931.852245 756.884053L931.852245 498.4C931.852245 486.53184 922.258859 476.93824 910.390485 476.93824L910.390485 476.93824ZM85.461632 476.93824C73.593387 476.93824 64 486.53184 64 498.4L64 756.884053C64 798.304853 97.694805 832 139.115819 832 141.669717 832 395.990187 831.97824 401.956565 830.9696 413.631659 828.995413 421.508139 817.942187 419.555072 806.245973 417.709355 795.23584 407.686699 787.810133 396.891605 788.389973 383.091755 788.8192 150.511915 789.07648 139.115819 789.07648 121.366912 789.07648 106.923307 774.63296 106.923307 756.884053L106.923307 498.4C106.923307 486.53184 97.329963 476.93824 85.461632 476.93824L85.461632 476.93824ZM856.736469-77.728C854.182528-77.728 599.862059-77.70624 593.895723-76.698027 582.220672-74.72384 574.344149-63.670613 576.297259-51.973973 578.121429-40.964267 588.315605-33.62432 598.960683-34.117973 612.696192-34.5472 845.340331-34.804907 856.736469-34.804907 874.485205-34.804907 888.928939-20.361387 888.928939-2.612907L888.928939 255.871573C888.928939 267.74016 898.522325 277.333333 910.390485 277.333333 922.258859 277.333333 931.852245 267.74016 931.852245 255.871573L931.852245-2.612907C931.852245-44.033707 898.157525-77.728 856.736469-77.728L856.736469-77.728ZM139.115819-77.728C97.694805-77.728 64-44.033707 64-2.612907L64 255.871573C64 267.74016 73.593387 277.333333 85.461632 277.333333 97.329963 277.333333 106.923307 267.74016 106.923307 255.871573L106.923307-2.612907C106.923307-20.361387 121.366912-34.804907 139.115819-34.804907 150.511915-34.804907 383.156139-34.5472 396.891605-34.117973 407.708245-33.64608 417.709355-40.964267 419.555072-51.973973 421.508139-63.670613 413.631659-74.72384 401.956565-76.698027 395.990187-77.70624 141.669717-77.728 139.115819-77.728L139.115819-77.728ZM983.5232 362.409813 42.794965 362.409813C30.926592 362.409813 21.333333 372.003413 21.333333 383.872 21.333333 395.739733 30.926592 405.333333 42.794965 405.333333L983.5232 405.333333C995.391488 405.333333 1004.984832 395.739733 1004.984832 383.872 1004.984832 372.003413 995.391488 362.409813 983.5232 362.409813L983.5232 362.409813Z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="onepage48" unicode="&#59226;" d="M512 896C229.25 896 0 666.75 0 384c0-155.458333 69.25-294.658333 178.625-388.608333l-55.9375-96.833333 0-0.0625c-1.854167-2.6875-2.879167-6.016667-2.879167-9.470833 0-9.345833 7.4875-16.833333 16.704167-17.025l0.704167 0 374.783333 0c282.754167 0 512 229.25 512 512S794.754167 896 512 896zM297.216667 256.316667c-7.425 0-14.270833 3.904167-17.983333 10.304167-2.75 4.8625-3.520833 10.495833-2.05 15.870833 1.470833 5.3125 4.8625 9.729167 9.6625 12.479167l180.416667 104.191667c9.5375 5.566667 22.85 1.983333 28.2875-7.616667 2.75-4.8 3.520833-10.366667 2.1125-15.679167-1.408333-5.375-4.8625-9.854167-9.6625-12.608333l-180.416667-104.129167C304.45 257.279167 300.866667 256.316667 297.216667 256.316667zM353.408333 158.975c-7.425 0-14.270833 3.904167-17.983333 10.304167-5.695833 9.920833-2.304167 22.720833 7.616667 28.416667l180.479167 104.129167c9.5375 5.633333 22.720833 2.05 28.2875-7.55 2.816667-4.8 3.520833-10.433333 2.1125-15.808333-1.470833-5.3125-4.8625-9.791667-9.729167-12.545833l-180.354167-104.191667C360.641667 159.933333 357.058333 158.975 353.408333 158.975zM877.825 328.704167l-457.920833-264.258333c-3.1375-1.854167-6.720833-2.75-10.304167-2.75-7.425 0-14.270833 3.904167-17.983333 10.304167-2.75 4.8-3.520833 10.433333-2.1125 15.808333 1.408333 5.3125 4.8625 9.791667 9.6625 12.545833l428.545833 247.4875c6.975 4.033333 11.904167 10.433333 13.8875 18.1125 2.1125 7.679167 1.025 15.679167-2.945833 22.591667l-117.954167 204.416667c-5.375 9.216667-15.295833 14.9125-25.920833 14.9125-5.183333 0-10.366667-1.345833-14.85-3.966667L251.329167 356.479167c-9.470833-5.566667-22.85-1.983333-28.2875 7.616667-2.75 4.8-3.520833 10.366667-2.1125 15.679167 1.470833 5.3125 4.929167 9.791667 9.729167 12.545833l181.566667 105.345833c5.25 3.966667 6.85 10.945833 3.583333 16.575-0.833333 1.470833-1.920833 2.6875-3.329167 3.7125l-0.641667 0.383333-117.375 67.775c-4.545833 2.625-9.729167 3.966667-14.9125 3.966667-10.625 0-20.545833-5.695833-25.854167-14.9125l-2.558333-4.35-0.0625 0.0625-84.354167-146.241667c-5.504167-9.470833-18.75-13.054167-28.35-7.55-4.7375 2.75-8.191667 7.233333-9.6625 12.545833-1.408333 5.375-0.641667 11.008333 2.1125 15.808333l104.129167 180.416667c1.5375 2.495833 3.520833 4.670833 6.079167 6.4625 0 0.254167 0.254167 0.5125 0.575 0.833333 9.15 8.704167 21.8875 12.095833 34.175 9.216667 3.583333-0.833333 6.975-1.6625 10.175-3.454167l170.495833-98.433333 0.254167 0.320833 2.816667-1.345833c8-3.775 16.833333-3.904167 24.766667-0.320833l2.945833 1.345833 201.216667 116.158333c3.2 1.854167 6.654167 2.625 9.6 3.329167 3.454167 0.833333 6.4625 1.216667 9.345833 1.216667 9.408333 0 18.433333-3.65 25.345833-10.241667 2.625-2.495833 5.25-4.8625 7.104167-8.0625l151.745833-262.783333c1.983333-3.391667 2.6875-6.975 3.454167-10.175 2.879167-12.225-0.5125-25.025-9.0875-34.1125C883.266667 333.116667 881.025 330.620833 877.825 328.704167z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="signboard" unicode="&#59228;" d="M127.905952 58.592212c-42.886113 0-76.743571 33.857458-76.743571 75.238795V704.141073h844.931667c42.133725 0 76.743571-33.857458 76.743571-75.238795V136.08817c0-13.542983 11.285819-24.828802 25.581191-24.828802s25.58119 11.285819 25.58119 24.828802V628.902278c0 69.219691-57.181484 125.648788-127.905952 125.648787H0V134.583395c0-69.219691 57.181484-125.648788 127.905952-125.648788h783.235855c14.295371 0 25.58119 11.285819 25.581191 24.828802 0 13.542983-11.285819 24.828802-25.581191 24.828803H127.905952zM889.322557 426.509919H134.677443V618.368846h754.645114v-191.858927zM188.096988 479.929464h647.806024V564.949302H188.096988v-85.019838z"  horiz-adv-x="1024" />
+			<glyph glyph-name="compare" unicode="&#59118;"
+				   d="M247.1424 101.0176c-1.0752 0-2.176 0.0768-3.2768 0.2304-10.8032 1.3568-19.6096 9.3952-21.9648 20.0448L112.64 613.888c-3.0976 13.952 5.7088 27.7504 19.6608 30.848 13.8752 3.1232 27.7504-5.7088 30.848-19.6608l93.6704-422.3232 218.5472 428.4928c6.5024 12.7232 22.016 17.792 34.7904 11.2896 12.7232-6.5024 17.7664-22.0672 11.2896-34.7904l-251.2384-492.6208C265.7024 106.3936 256.768 101.0176 247.1424 101.0176zM669.184 102.2208c-4.8128 0-9.7024 0.128-14.6176 0.3584-58.4448 3.0976-104.9344 22.912-134.4 57.3696-24.1664 28.2112-34.8416 63.7696-30.848 102.784l0.5888 5.0176c1.9712 14.1568 14.9248 24.0128 29.2096 22.0672 14.1568-1.9712 24.0128-15.0272 22.0672-29.2096l-0.3584-3.1488c-2.5088-24.576 3.9424-46.6432 18.6624-63.8208 20.0704-23.424 53.888-37.0432 97.8432-39.3728 85.9648-4.48 151.8848 41.9584 169.9584 87.9616 18.0736 45.9776-27.6992 74.7776-48.1792 85.0176-10.3424 5.1712-31.4624 10.9056-53.7856 16.9984-65.3312 17.7664-146.6368 39.8848-174.8736 95.0784-12.1088 23.6288-12.8256 49.9968-2.176 78.336 19.0208 50.56 51.1488 86.2464 95.488 106.0096 51.5072 22.9632 119.8848 22.0416 182.8608-2.5344 75.8016-29.568 89.7792-108.3136 86.5792-145.8176-1.2032-14.2336-13.568-24.8064-27.9808-23.6032-14.208 1.2032-24.7296 13.6448-23.6032 27.8528l0 0c0.2304 2.8672 4.5568 70.5792-53.7856 93.3376-50.3552 19.6352-103.7824 20.9664-142.976 3.4816-31.2576-13.9264-54.1696-39.8592-68.1472-76.9792-7.1936-19.072-3.5584-30.0032-0.2048-36.5568 17.792-34.816 92.7488-55.1936 142.3872-68.7104 26.0096-7.0656 48.4352-13.1584 63.36-20.6336 68.1728-34.0992 96.2304-91.648 73.1904-150.2208C851.2256 161.7152 773.4272 102.2208 669.184 102.2208zM1024 681.3952 1024 163.072c0-14.08-11.52-25.6-25.6-25.6s-25.6 11.52-25.6 25.6L972.8 681.3952c0 33.536-28.416 60.928-61.952 60.928L112.128 742.3232C78.592 742.3232 51.2 717.7472 51.2 684.2112l0-597.8624c0-33.536 27.392-60.928 60.928-60.928l742.7584 0c14.08 0 25.6-11.52 25.6-25.6s-11.52-25.6-25.6-25.6L112.128-25.7792c-61.952 0-112.128 50.176-112.128 112.128L0 684.2112c0 61.952 50.176 109.312 112.128 109.312l798.72 0C972.544 793.5232 1024 743.3472 1024 681.3952z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="shuffling-banner" unicode="&#59230;" d="M127.905952 61.601763c-42.886113 0-76.743571 33.857458-76.743571 75.238795V707.150625h844.931667c42.133725 0 76.743571-33.857458 76.743571-75.238795v-492.814108c0-13.542983 11.285819-24.828802 25.581191-24.828802s25.58119 11.285819 25.58119 24.828802V631.91183c0 69.219691-57.181484 125.648788-127.905952 125.648787H0V137.592946c0-69.219691 57.181484-125.648788 127.905952-125.648787h783.235855c14.295371 0 25.58119 11.285819 25.581191 24.828802 0 13.542983-11.285819 24.828802-25.581191 24.828802H127.905952zM564.290963 213.584129c19.562087 0 34.609846-15.800147 34.609845-34.609845 0-19.562087-15.800147-34.609846-34.609845-34.609846-19.562087 0-34.609846 15.800147-34.609846 34.609846s15.047759 34.609846 34.609846 34.609845zM457.451874 178.221896m-34.609846 0a34.609846 34.609846 0 1 1 69.219691 0 34.609846 34.609846 0 1 1-69.219691 0ZM351.365173 178.221896m-34.609846 0a34.609846 34.609846 0 1 1 69.219691 0 34.609846 34.609846 0 1 1-69.219691 0ZM672.634827 213.584129c19.562087 0 34.609846-15.800147 34.609846-34.609845 0-19.562087-15.800147-34.609846-34.609846-34.609846-19.562087 0-34.609846 15.800147-34.609845 34.609846-0.752388 18.809699 15.047759 34.609846 34.609845 34.609845z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="component" unicode="&#59231;" d="M632.404396 106.807326H330.830769c-16.504029 0-32.257875 6.001465-44.260806 18.004396-12.00293 12.00293-18.754579 27.006593-18.754578 44.260805l0.750183 72.767766c3.000733 13.503297 9.752381 24.756044 19.504762 31.507692 12.753114 9.752381 30.007326 9.752381 48.761904-1.500366l4.501099-2.250549 5.251282-1.500367c15.753846-7.501832 30.757509-6.751648 44.260806-1.500366 6.751648 3.000733 12.753114 6.751648 18.004396 12.00293 5.251282 5.251282 9.002198 11.252747 12.00293 18.004396 3.000733 6.751648 4.501099 13.503297 4.501099 21.755311 0 8.252015-1.500366 15.003663-4.501099 21.755312-3.000733 6.751648-6.751648 12.753114-12.00293 18.004395-6.001465 5.251282-11.252747 9.752381-18.754579 12.002931-13.503297 6.001465-28.50696 6.001465-44.260806-0.750183l-5.251282-2.25055c-5.251282-2.250549-10.502564-5.251282-15.003663-7.501831-6.751648-3.000733-13.503297-4.501099-19.504762-4.501099h-4.501099c-10.502564 0.750183-19.504762 6.751648-25.506227 15.753846-5.251282 7.501832-7.501832 16.504029-8.252014 30.007326v65.265934c0 17.254212 6.751648 32.257875 18.754578 44.260806 12.00293 12.00293 27.756777 18.754579 44.260806 18.754579h57.01392c-3.750916 11.252747-6.001465 24.005861-6.001466 36.758974 0 16.504029 3.000733 32.257875 9.752381 46.511355 6.001465 14.25348 15.003663 27.006593 25.506228 37.509158s23.255678 18.754579 37.509157 25.506227c28.50696 12.753114 63.015385 12.753114 92.272527 0 14.25348-6.001465 27.006593-15.003663 37.509158-25.506227s18.754579-23.255678 25.506227-37.509158c6.001465-14.25348 9.752381-30.007326 9.752381-46.511355 0-12.753114-2.250549-24.756044-6.001465-36.758974h19.504762c17.254212 0 32.257875-6.751648 44.260806-18.754579 12.00293-12.00293 18.004396-27.756777 18.004395-44.260806v-42.010256c26.25641 9.752381 57.013919 9.002198 83.27033-2.25055 14.25348-6.001465 26.25641-14.25348 36.758974-24.756044 10.502564-10.502564 18.754579-23.255678 24.756044-36.758974 6.001465-14.25348 9.002198-29.257143 9.002198-45.010989s-3.000733-31.507692-9.002198-45.761172c-6.001465-13.503297-14.25348-26.25641-24.756044-36.758975-10.502564-10.502564-23.255678-18.754579-36.758974-24.756044-26.25641-11.252747-57.013919-12.00293-83.27033-2.250549v-36.758975c0-17.254212-6.001465-32.257875-18.004395-44.260805-12.753114-11.252747-28.50696-18.004396-45.010989-18.004396zM313.576557 233.588278v-63.765567c0-4.501099 1.500366-8.252015 5.251282-12.002931 3.750916-3.750916 7.501832-5.251282 12.753113-5.251282h300.823444c5.251282 0 8.252015 1.500366 12.00293 5.251282 3.750916 3.750916 5.251282 6.751648 5.251282 12.002931V295.103297l37.509158-32.257876c6.001465-5.251282 13.503297-9.752381 21.755311-12.753113 15.753846-6.751648 35.258608-6.001465 51.762637 0.750183 9.002198 3.750916 16.504029 9.002198 22.505495 15.003663 6.751648 6.751648 12.00293 14.25348 15.753846 22.505494s5.251282 17.254212 5.251282 27.006594c0 9.752381-1.500366 18.754579-5.251282 27.006593-3.750916 9.002198-9.002198 16.504029-15.003663 22.505495-6.751648 6.751648-14.25348 11.252747-22.505495 15.003663-16.504029 6.751648-36.008791 7.501832-51.762637 0.750183-8.252015-3.000733-15.753846-7.501832-21.755311-12.753114l-37.509158-31.507692V466.895238c0 5.251282-1.500366 9.002198-5.251282 12.753114-3.750916 3.750916-6.751648 5.251282-12.00293 5.251282H525.128205l32.257876 37.509157c10.502564 12.753114 15.753846 27.006593 15.753846 44.260806 0 10.502564-2.250549 19.504762-6.001465 28.50696-3.750916 9.002198-9.002198 16.504029-15.753847 23.255677-6.751648 6.751648-14.25348 12.00293-23.255677 15.753847-17.254212 7.501832-38.259341 7.501832-55.513553 0-9.002198-3.750916-16.504029-9.002198-23.255678-15.753847-6.751648-6.751648-12.00293-14.25348-15.753846-23.255677-3.750916-9.002198-6.001465-18.004396-6.001465-28.50696 0-9.002198 1.500366-16.504029 4.501099-24.005861 3.000733-7.501832 6.751648-15.003663 12.00293-21.005128l29.257143-36.758974h-142.534799c-5.251282 0-9.002198-1.500366-12.00293-5.251282-3.750916-3.750916-5.251282-7.501832-5.251282-12.002931v-63.015384c2.250549 1.500366 5.251282 2.250549 7.501831 3.750915 2.250549 0.750183 5.251282 2.250549 9.002198 3.750916 22.505495 10.502564 54.013187 10.502564 78.019048 0 12.00293-5.251282 23.255678-12.753114 32.257875-21.755311 9.002198-9.002198 16.504029-20.254945 21.755312-32.257876 5.251282-12.00293 8.252015-25.506227 8.252014-39.759707s-3.000733-27.756777-8.252014-39.759707c-5.251282-12.00293-12.753114-22.505495-21.755312-31.507692-9.002198-9.002198-20.254945-16.504029-32.257875-21.755311-24.756044-10.502564-53.263004-11.252747-80.269597 1.500366-3.750916 1.500366-8.252015 3.750916-14.25348 6.751648zM1021.749451 382.124542c0 282.068864-228.805861 510.124542-510.124543 510.124542-282.068864 0-510.124542-228.055678-510.124542-510.124542s228.805861-510.124542 510.124542-510.124542c115.528205 0 221.304029 39.759707 307.575092 104.275458 3.750916 3.750916 6.001465 9.002198 6.001465 15.003663 0 12.753114-9.752381 22.505495-22.505494 22.505494-6.751648 0-12.00293-2.250549-16.50403-6.751648-76.518681-56.263736-171.041758-90.021978-273.066666-90.021978-255.062271 0-462.112821 207.050549-462.112821 462.112821S258.063004 841.23663 513.125275 841.23663 975.238095 634.186081 975.238095 379.12381c0-78.019048-18.004396-151.536996-52.51282-216.052748v-0.750183c-0.750183-2.250549-1.500366-4.501099-1.500367-6.751648 0-12.753114 10.502564-22.505495 22.505495-22.505495 9.752381 0 18.004396 6.001465 21.005128 15.003663 35.258608 70.517216 57.013919 150.03663 57.01392 234.057143z"  horiz-adv-x="1024" />
+			<glyph glyph-name="filter" unicode="&#59121;"
+				   d="M1024 776.448c0-32-12.544-61.952-35.072-84.48L665.6 384.4864 665.6-102.4c0-14.08-11.52-25.6-25.6-25.6s-25.6 11.52-25.6 25.6L614.4 395.4944c0 6.912 2.816 13.824 7.936 18.432L953.088 728.576c12.544 12.544 19.712 29.696 19.712 47.872 0 37.632-30.72 68.352-68.352 68.352 0 0-784.128 0-784.896 0C81.92 844.8 51.2 814.08 51.2 776.448c0-18.176 7.168-35.328 19.968-48.384l305.152-314.88c4.864-4.864 7.68-11.52 7.68-18.432L384 25.6c0-14.336-11.52-25.6-25.6-25.6s-25.6 11.264-25.6 25.6l0 358.4L35.328 691.712C12.544 714.496 0 744.448 0 776.448c0 66.048 53.76 119.552 119.552 119.552 0.768 0 784.896 0 784.896 0C970.496 896 1024 842.496 1024 776.448z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="component-filling" unicode="&#59232;" d="M511.249268 385.126926m-510.873074 0a510.873074 510.873074 0 1 1 1021.746148 0 510.873074 510.873074 0 1 1-1021.746148 0ZM632.957265 109.405723H330.941124c-16.528247 0-32.305209 6.010271-44.325752 18.030814-12.020543 12.020543-18.782098 27.046222-18.782098 44.325752l0.751284 72.874542c3.005136 13.523111 9.766691 24.79237 19.533382 31.553925 12.771827 9.766691 30.051357 9.766691 48.833456-1.502568l4.507703-2.253852 5.258988-1.502568c15.776963-7.512839 30.802641-6.761555 44.325752-1.502568 6.761555 3.005136 12.771827 6.761555 18.030814 12.020543 5.258988 5.258988 9.015407 11.269259 12.020543 18.030815 3.005136 6.761555 4.507704 13.523111 4.507704 21.787234 0 8.264123-1.502568 15.025679-4.507704 21.787234-3.005136 6.761555-6.761555 12.771827-12.020543 18.030814-5.258988 5.258988-11.269259 9.015407-18.030814 12.020543-13.523111 6.010271-28.548789 6.010271-44.325752-0.751284l-5.258988-2.253852c-5.258988-2.253852-10.517975-5.258988-15.025678-7.512839-6.761555-3.005136-13.523111-4.507704-19.533383-4.507704h-4.507703c-10.517975 0.751284-19.533382 6.761555-25.543654 15.776963-5.258988 7.512839-7.512839 16.528247-8.264123 30.051357v65.361702c0 17.27953 6.761555 32.305209 18.782098 44.325752 12.020543 12.020543 27.797506 18.782098 44.325752 18.782099h57.097579c-3.75642 11.269259-6.010271 24.041086-6.010271 36.812912 0 16.528247 3.005136 32.305209 9.766691 46.579604 6.010271 14.274395 15.025679 27.046222 25.543653 37.564197s23.289802 18.782098 37.564197 25.543654c28.548789 12.771827 63.10785 12.771827 92.407924 0 14.274395-6.010271 27.046222-15.025679 37.564196-25.543654s18.782098-23.289802 25.543654-37.564197c6.010271-14.274395 9.766691-30.051357 9.766691-46.579604 0-12.771827-2.253852-24.79237-6.010271-36.812912h19.533382c17.27953 0 32.305209-6.761555 44.325752-18.782099 12.020543-12.020543 18.030814-27.797506 18.030814-44.325752v-42.0719c26.294938 9.766691 57.097579 9.015407 83.392517-2.253852 14.274395-6.010271 26.294938-14.274395 36.812913-24.792369 10.517975-10.517975 18.782098-23.289802 24.792369-36.812913 6.010271-14.274395 9.015407-29.300073 9.015408-45.077036s-3.005136-31.553925-9.015408-45.82832c-6.010271-13.523111-14.274395-26.294938-24.792369-36.812913-10.517975-10.517975-23.289802-18.782098-36.812913-24.792369-26.294938-11.269259-57.097579-12.020543-83.392517-2.253852v-36.812913c0-17.27953-6.010271-32.305209-18.030814-44.325752-13.523111-12.020543-29.300073-18.030814-45.82832-18.030814zM313.661594 235.621423v-63.859134c0-4.507704 1.502568-8.264123 5.258987-12.020543 3.75642-3.75642 7.512839-5.258988 12.771827-5.258987h301.264857c5.258988 0 8.264123 1.502568 12.020543 5.258987 3.75642 3.75642 5.258988 6.761555 5.258988 12.020543V297.226706l37.564196-32.305209c6.010271-5.258988 13.523111-9.766691 21.787234-12.771827 15.776963-6.761555 35.310345-6.010271 51.838592 0.751284 9.015407 3.75642 16.528247 9.015407 22.538518 15.025678 6.761555 6.761555 12.020543 14.274395 15.776962 22.538518s5.258988 17.27953 5.258988 27.046222c0 9.766691-1.502568 18.782098-5.258988 27.046222-3.75642 9.015407-9.015407 16.528247-15.025678 22.538518-6.761555 6.761555-14.274395 11.269259-22.538518 15.025678-16.528247 6.761555-36.061629 7.512839-51.838592 0.751284-8.264123-3.005136-15.776963-7.512839-21.787234-12.771827l-37.564196-31.553925V469.270726c0 5.258988-1.502568 9.015407-5.258988 12.771827-3.75642 3.75642-6.761555 5.258988-12.020543 5.258988H525.523663l32.305209 37.564196c10.517975 12.771827 15.776963 27.046222 15.776962 44.325752 0 10.517975-2.253852 19.533382-6.010271 28.54879-3.75642 9.015407-9.015407 16.528247-15.776963 23.289802-6.761555 6.761555-14.274395 12.020543-23.289801 15.776962-17.27953 7.512839-38.315481 7.512839-55.595011 0-9.015407-3.75642-16.528247-9.015407-23.289802-15.776962-6.761555-6.761555-12.020543-14.274395-15.776963-23.289802-3.75642-9.015407-6.010271-18.030814-6.010271-28.54879 0-9.015407 1.502568-16.528247 4.507703-24.041085 3.005136-7.512839 6.761555-15.025679 12.020543-21.035951l29.300073-36.812912h-142.743947c-5.258988 0-9.015407-1.502568-12.020543-5.258988-3.75642-3.75642-5.258988-7.512839-5.258987-12.020543v-63.10785c2.253852 1.502568 5.258988 2.253852 7.512839 3.75642 2.253852 0.751284 5.258988 2.253852 9.015407 3.756419 22.538518 10.517975 54.092443 10.517975 78.133529 0 12.020543-5.258988 23.289802-12.771827 32.305209-21.787234 9.015407-9.015407 16.528247-20.284666 21.787234-32.305209 5.258988-12.020543 8.264123-25.543654 8.264124-39.818048s-3.005136-27.797506-8.264124-39.818049c-5.258988-12.020543-12.771827-22.538518-21.787234-31.553925-9.015407-9.015407-20.284666-16.528247-32.305209-21.787234-24.79237-10.517975-53.341159-11.269259-80.38738 1.502568-3.75642 1.502568-9.015407 3.75642-14.274395 6.761555z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="color" unicode="&#59233;" d="M811.984589 567.447871c-57.139501 0-101.497797-44.358297-101.497798-101.497798s44.358297-101.497797 101.497798-101.497797 101.497797 44.358297 101.497797 101.497797c0.751836 57.139501-44.358297 101.497797-101.497797 101.497798z m0-163.900147c-35.33627 0-62.402349 27.066079-62.40235 62.402349 0 35.33627 27.066079 62.402349 62.40235 62.40235 35.33627 0 62.402349-27.066079 62.402349-62.40235 0-35.33627-26.314244-62.402349-62.402349-62.402349zM211.267995 567.447871c-57.139501 0-101.497797-44.358297-101.497797-101.497798s44.358297-101.497797 101.497797-101.497797 101.497797 44.358297 101.497798 101.497797-44.358297 101.497797-101.497798 101.497798z m0-163.900147c-35.33627 0-62.402349 27.066079-62.402349 62.402349 0 35.33627 27.066079 62.402349 62.402349 62.40235 35.33627 0 62.402349-27.066079 62.40235-62.40235 0-35.33627-27.066079-62.402349-62.40235-62.402349zM750.334075 684.734214c0 57.139501-44.358297 101.497797-101.497798 101.497798s-101.497797-44.358297-101.497797-101.497798 44.358297-101.497797 101.497797-101.497797c56.387665 0 101.497797 44.358297 101.497798 101.497797z m-102.249633-62.402349c-35.33627 0-62.402349 27.066079-62.40235 62.402349 0 35.33627 27.066079 62.402349 62.40235 62.40235s62.402349-27.066079 62.402349-62.40235c0-35.33627-26.314244-62.402349-62.402349-62.402349zM375.168142 786.232012c-57.139501 0-101.497797-44.358297-101.497797-101.497798s44.358297-101.497797 101.497797-101.497797S476.665939 627.594714 476.665939 684.734214s-44.358297 101.497797-101.497797 101.497798z m0-163.900147c-35.33627 0-62.402349 27.066079-62.402349 62.402349 0 35.33627 27.066079 62.402349 62.402349 62.40235 35.33627 0 62.402349-27.066079 62.40235-62.40235 0-35.33627-27.066079-62.402349-62.40235-62.402349zM272.166674-25.750367l62.402349-27.817915c54.883994-22.555066 115.030837-34.584435 177.433187-34.584435 35.33627 0 62.402349 27.066079 62.402349 62.40235 0 15.788546-6.014684 30.073421-15.788546 40.599119-18.044053 18.044053-27.817915 42.10279-27.817915 68.417034 0 57.139501 44.358297 101.497797 101.497797 101.497797h98.490456c139.84141 0 253.368576 113.527166 253.368575 253.368576 0 230.061674-212.017621 417.268722-472.152716 417.268722C251.115279 856.152717 39.849493 644.135095 39.849493 384c0-124.052863 43.606461-231.565345 121.797357-316.522761 3.759178-15.036711-3.007342-25.562408-16.540382-26.314243-9.022026-0.751836-18.795888 8.270191-18.795888 8.27019l-4.511014 3.759178c-4.511013 5.262849-8.270191 9.773862-12.781204 15.036711-67.665198 87.212922-109.016153 196.98091-109.016152 315.770925 0 281.938326 229.309838 511.248164 511.248164 511.248164s511.248164-205.251101 511.248165-457.116005c0-161.64464-131.571219-293.215859-293.215859-293.215859H632.295895c-35.33627 0-62.402349-27.066079-62.402349-62.40235 0-15.788546 6.014684-30.073421 15.788546-40.599119 18.044053-18.044053 27.817915-42.10279 27.817915-68.417034 0-57.139501-44.358297-101.497797-101.497797-101.497797-93.227606 0-180.440529 24.810573-255.624083 68.417034-0.751836 0.751836-17.292217 28.56975 15.788547 33.832599z"  horiz-adv-x="1026" />
+			<glyph glyph-name="pin" unicode="&#59122;"
+				   d="M51.196068-128c-13.021992 0-26.0184 5.091113-36.021541 15.094254-18.113104 18.164271-20.262117 46.050265-5.091113 66.337966l213.059228 288.325828-166.983379 166.983379C39.862586 425.038104 36.639068 450.51925 48.305135 470.7302c7.982046 12.612656 76.699275 112.82315 229.483822 75.010766 2.532765-0.307002 5.270197-0.537253 8.212297-0.793088 6.267953-0.537253 13.277827-1.17684 20.87612-2.404847 32.33752-5.244614 89.516599 20.722619 139.148552 63.037697 47.559691 40.49865 78.285451 87.751339 78.285451 120.344693 0 7.57271-0.179084 15.631507-0.358169 23.536802-1.279174 30.623426-3.223519 77.697031 31.979351 112.874317 41.649907 41.701074 107.552953 45.05251 153.270633 7.854129 0.921005-0.741921 1.76526-1.535009 2.583932-2.379264l-0.025583 0c24.585725-24.048472 276.608594-275.815506 279.243692-278.476188 21.694792-21.694792 33.642277-50.527374 33.693444-81.176384 0.025583-30.674593-11.896319-59.456009-33.539943-81.099634-35.023785-35.049369-82.353225-33.053857-113.565071-31.723516-7.393626 0.153501-15.478006 0.332585-23.025133 0.332585-30.828094 0-67.69389-21.592458-103.715431-60.760767-50.808793-55.260318-82.09739-126.63823-79.411124-158.617581 1.125673-10.258976 3.223519-28.37208 3.607271-30.930428 36.891379-149.612195-63.114447-217.843339-74.627013-225.109047-20.697036-12.484739-46.357267-9.389137-63.012113 7.240125l-178.393611 178.393611c-10.003141 10.003141-10.003141 26.171901 0 36.175042s26.171901 10.003141 36.175042 0l178.393611-178.393611c7.854129 5.091113 80.101878 54.646315 51.320462 171.76749-0.51167 2.35368-3.044434 23.562386-4.374775 35.970374-4.298025 51.115795 35.586622 136.027367 92.688951 198.118475 32.439854 35.254036 83.27423 77.287695 141.348731 77.287695 7.905296 0 16.399011-0.179084 24.662475-0.358169 32.41427-1.355924 58.048918-0.972172 75.77827 16.782763 11.973069 11.973069 18.548024 27.885994 18.548024 44.847842-0.025583 17.013015-6.677288 33.00269-18.701524 45.05251C952.220677 555.76969 683.849964 823.756651 675.944668 831.354945c-24.278723 19.724864-60.7096 17.882853-83.785899-5.21903-17.908437-17.908437-18.317772-43.491917-17.013015-75.087516 0.204668-8.800717 0.383752-17.243266 0.383752-25.148562 0-48.378362-35.995957-107.936705-96.270638-159.282751-49.478452-42.135993-122.979792-83.811483-180.491457-74.60143-6.293536 1.023339-12.049819 1.509425-17.192099 1.944345-3.325852 0.281418-6.421454 0.562837-9.312387 0.921005-2.456014 0.07675-4.860861 0.537253-7.188958 1.304758-117.760762 29.037251-167.597382-43.44075-172.893163-51.806549l182.742803-182.026466c8.954218-8.954218 10.028724-23.101883 2.481598-33.309692L51.170485-77.114457l238.617125 174.530506c11.435816 8.365798 27.425491 5.80745 35.740123-5.602782s5.80745-27.399908-5.602782-35.714539l-238.821793-174.12117C72.148939-124.699731 61.685295-128 51.196068-128z"
+				   horiz-adv-x="1025"/>
 
-    
-    <glyph glyph-name="color-filling" unicode="&#59341;" d="M21.333333 384c0-270.592 219.925333-490.666667 490.304-490.666667 54.784 0 97.344 42.581333 97.344 97.408 0 25.258667-9.365333 48.341333-26.688 65.664-10.090667 10.112-15.125333 23.829333-15.125333 38.976 0 33.92 25.941333 59.882667 59.84 59.882667h94.442667C876.48 155.264 1002.666667 281.536 1002.666667 436.672 1002.666667 678.4 782.762667 874.666667 511.637333 874.666667 241.258667 874.666667 21.333333 654.592 21.333333 384z m202.666667-21.333333a53.333333 53.333333 0 1 1 0 106.666666 53.333333 53.333333 0 0 1 0-106.666666z m0-42.666667a96 96 0 1 0 0 192 96 96 0 0 0 0-192z m149.333333 256a53.333333 53.333333 0 1 1 0 106.666667 53.333333 53.333333 0 0 1 0-106.666667z m0-42.666667a96 96 0 1 0 0 192 96 96 0 0 0 0-192z m277.333334 42.666667a53.333333 53.333333 0 1 1 0 106.666667 53.333333 53.333333 0 0 1 0-106.666667z m0-42.666667a96 96 0 1 0 0 192 96 96 0 0 0 0-192z m149.333333-170.666666a53.333333 53.333333 0 1 1 0 106.666666 53.333333 53.333333 0 0 1 0-106.666666z m0-42.666667a96 96 0 1 0 0 192 96 96 0 0 0 0-192z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="favorites" unicode="&#59342;" d="M840.870698 887.760372c-80.634047 0-153.790512-31.672558-207.967256-83.134512a24.957023 24.957023 0 0 1-9.287442-19.33693 25.099907 25.099907 0 0 1 42.984186-17.598511l0.047628-0.023814c45.246512 43.341395 106.61507 69.989209 174.222884 69.989209 139.240186 0 252.094512-112.87814 252.094511-252.094512 0-67.631628-26.671628-128.952558-69.989209-174.246697l-451.322047-451.750698-451.560186 451.750698a251.165767 251.165767 0 0 0-70.013023 174.246697C50.080744 724.777674 162.958884 837.655814 302.19907 837.655814c66.917209 0 127.690419-26.171535 172.841674-68.72707l150.599442-150.456558a24.909395 24.909395 0 0 1 35.244651 35.244651l-149.14679 149.265861 0.119069 0.095255A301.127442 301.127442 0 0 1 302.19907 887.760372C135.263256 887.760372 0 752.449488 0 585.561302c0-81.443721 32.267907-155.314605 84.658605-209.658046l486.995348-486.828651 487.042977 487.138232A301.103628 301.103628 0 0 1 1143.069767 585.537488C1143.069767 752.473302 1007.782698 887.760372 840.870698 887.760372"  horiz-adv-x="1143" />
+			<glyph glyph-name="history" unicode="&#59123;"
+				   d="M65.770667 510.229333c-11.776 0-21.333333 9.557333-21.333333 21.333333l0 256c0 11.776 9.557333 21.333333 21.333333 21.333333s21.333333-9.557333 21.333333-21.333333l0-256C87.104 519.786667 77.546667 510.229333 65.770667 510.229333zM300.437333 510.229333l-234.666667 0c-11.776 0-21.333333 9.557333-21.333333 21.333333s9.557333 21.333333 21.333333 21.333333l234.666667 0c11.776 0 21.333333-9.557333 21.333333-21.333333S312.213333 510.229333 300.437333 510.229333zM513.770667 275.562667c-11.776 0-21.333333 9.557333-21.333333 21.333333l0 384c0 11.776 9.557333 21.333333 21.333333 21.333333s21.333333-9.557333 21.333333-21.333333l0-384C535.104 285.12 525.546667 275.562667 513.770667 275.562667zM634.965333 211.114667c-5.952 0-11.861333 2.474667-16.064 7.296l-185.6 212.266667c-7.744 8.874667-6.848 22.336 2.026667 30.101333 8.896 7.744 22.357333 6.826667 30.101333-2.026667l185.6-212.266667c7.744-8.874667 6.848-22.336-2.026667-30.101333C644.949333 212.885333 639.936 211.114667 634.965333 211.114667zM513.770667-87.104c-258.794667 0-469.333333 210.538667-469.333333 469.333333 0 11.776 9.557333 21.333333 21.333333 21.333333s21.333333-9.557333 21.333333-21.333333c0-235.264 191.402667-426.666667 426.666667-426.666667 235.264 0 426.666667 191.402667 426.666667 426.666667 0 235.264-191.402667 426.666667-426.666667 426.666667-173.568 0-328.448-103.68-394.624-264.128-4.458667-10.88-16.896-16.085333-27.861333-11.584-10.88 4.48-16.085333 16.96-11.584 27.861333C152.469333 737.514667 322.858667 851.562667 513.770667 851.562667c258.794667 0 469.333333-210.538667 469.333333-469.333333S772.565333-87.104 513.770667-87.104z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="pic-filling" unicode="&#59394;" d="M1024 389.546667v-452.288H120.469333A120.533333 120.533333 0 0 0 0 57.792V810.666667h903.530667A120.597333 120.597333 0 0 0 1024 690.005333v-225.216L691.413333 214.506667l-244.010666 152.533333-257.877334-257.92a30.122667 30.122667 0 0 1 42.602667-42.581333l224 224 237.866667-148.650667L1024 389.546667z m-798.122667 59.712a105.408 105.408 0 1 1 0 210.816 105.408 105.408 0 0 1 0-210.816z m0 60.224a45.184 45.184 0 1 1 0 90.368 45.184 45.184 0 0 1 0-90.368z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="RFQ" unicode="&#59395;" d="M929.375 702.664l-4.875 1.333c-269.75 73.542-555 73.583-825 0l-4.875-1.333C38.917 687.456 0 636.539 0 578.789v-389.583c0-57.75 38.917-108.667 94.625-123.875l4.875-1.333c134.958-36.792 273.708-55.167 412.542-55.167 138.75 0 277.542 18.375 412.417 55.167l4.917 1.333c11.375 3.083 18.083 14.792 15 26.167-3.083 11.333-14.583 17.958-26.167 15l-4.958-1.333c-262.417-71.583-539.917-71.583-802.5 0l-4.875 1.333c-37.208 10.167-63.208 44.167-63.208 82.708V578.789c0 38.542 26 72.542 63.208 82.708l4.875 1.333c262.5 71.583 540.042 71.583 802.542 0l4.875-1.333c37.208-10.125 63.167-44.167 63.167-82.708v-389.583c0-11.792 9.542-21.333 21.333-21.333 11.792 0 21.333 9.542 21.333 21.333V578.789c-0.001 57.75-38.918 108.667-94.626 123.875zM444.797 347.573H553.51c17-78.539 87.01-137.594 170.552-137.594 8.87 0 17.562 0.659 26.073 1.945V283.06a105.63 105.63 0 0 0-26.073-3.258c-57.823 0-104.703 46.883-104.703 104.706 0 57.846 46.88 104.732 104.703 104.732 57.849 0 104.734-46.885 104.734-104.732 0-8.992-1.141-17.708-3.286-26.044h71.135a173.161 173.161 0 0 1 1.948 26.044c0 96.245-78.281 174.526-174.531 174.526-44.833 0-85.766-17.008-116.708-44.898v44.909H374.99v-325.193L290.823 339.82c35.823 19.214 60.188 57.008 60.188 100.505v2.326c0 64.245-52.068 116.331-116.312 116.352l-135.819 0.041V209.99h69.812V326.341h47.255l83.635-116.357h94.354v0.005h50.859V347.573z m0 141.659h139.75c-16.818-22.349-28.396-48.849-32.901-77.664H444.797v77.664z m-163.932-52.357c0-25.703-20.833-46.542-46.542-46.542h-65.63v98.898h65.63c25.708 0 46.542-20.836 46.542-46.539v-5.817zM851.172 156.372V257.417h101.042l-64.297 64.299h-75.073l-75.781 75.789c-7.177 7.177-18.802 7.177-25.979 0s-7.177-18.802 0-25.979l75.786-75.792v-75.06l64.302-64.302z"  horiz-adv-x="1024" />
+			<glyph glyph-name="productfeatures" unicode="&#59124;"
+				   d="M302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM458.999525-124.8768c5.888-1.792 12.544-1.28 18.688 2.304C472.055525-125.6448 465.399525-126.6688 458.999525-124.8768zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM477.687525-122.5472c-6.144-3.584-12.8-4.096-18.688-2.304C465.399525-126.6688 472.055525-125.6448 477.687525-122.5472zM857.284325-72.6784c-14.1568 0-25.6 11.4432-25.6 25.6l0 192.1792c0 6.9888 2.8672 13.7216 7.9616 18.56l127.616 121.3696c3.712 3.712 5.888 8.9856 5.888 14.7968 0 11.904-9.7024 21.5808-21.6064 21.5808L641.757925 321.408c-11.904 0-21.6064-9.6768-21.6064-21.5808 0-5.8368 2.2272-11.136 6.4512-15.36l117.7344-121.7792c4.6336-4.7872 7.1936-11.1616 7.1936-17.792l0-141.44c0-14.1568-11.4432-25.6-25.6-25.6s-25.6 11.4432-25.6 25.6l0 131.0976-110.2336 114.0224c-13.5168 13.5168-21.1456 31.8208-21.1456 51.2512 0 40.1152 32.64 72.7808 72.8064 72.7808l309.8112 0c40.1408 0 72.8064-32.64 72.8064-72.7808 0-19.4304-7.5776-37.6832-21.3504-51.456l-120.1152-114.2528 0-181.1968C882.884325-61.2352 871.441125-72.6784 857.284325-72.6784zM920.157925 629.6064c7.9872 5.1968 9.4976 11.8016 10.5472 16.5376 1.024 9.728-3.584 19.968-13.568 25.088l-440.32 220.16c-7.168 3.584-15.36 3.584-22.528 0l-440.32-220.16C-2.414875 660.48 0.145125 636.672 0.145125 634.112l0-469.76c0-8.704 4.608-16.896 12.032-21.504 0 0 430.848-260.352 438.272-263.68 15.104-7.424 24.576-5.376 31.744-1.792l143.36 82.944c12.288 7.168 16.384 22.784 9.216 35.072-6.912 12.288-22.784 16.384-34.816 9.472l-99.072-57.6 0 0.256-10.24-5.632L490.641125 384.256l389.632 221.184L920.157925 629.6064zM440.465125 384.256l0-441.088L50.065125 178.432l0 427.52L440.465125 384.256zM465.553125 427.776 78.225125 647.424l387.328 193.536 387.328-193.536L465.553125 427.776z"
+				   horiz-adv-x="1025"/>
 
-    
-    <glyph glyph-name="RFQ-filling" unicode="&#59396;" d="M0 180.741V587.259c0 50.375 33.716 94.518 82.316 107.773l5.12 1.396a1613.589 1613.589 0 0 0 849.127 0l5.12-1.396c48.6-13.255 82.316-57.398 82.316-107.773v-406.518c0-50.375-33.716-94.518-82.316-107.773l-5.12-1.396a1613.589 1613.589 0 0 0-849.127 0l-5.12 1.396C33.716 86.223 0 130.366 0 180.741zM745.619 560.597c-45.436 0-86.919-17.237-118.281-45.502v45.511H391.854v-329.558L306.559 338.44c36.304 19.472 61 57.773 61 101.852v2.358c0 65.107-52.769 117.893-117.876 117.914l-137.641 0.042v-353.741h70.748V324.778h47.889l84.759-117.917h95.626l-0.003 0.003h51.541V346.296h110.172c17.229-79.595 88.177-139.44 172.845-139.44 8.986 0 17.793 0.665 26.419 1.971v72.09a107.037 107.037 0 0 0-26.419-3.302c-58.598 0-106.112 47.514-106.112 106.112 0 58.624 47.514 106.138 106.112 106.138 58.624 0 106.138-47.514 106.138-106.138 0-9.114-1.152-17.946-3.328-26.394h72.089a175.938 175.938 0 0 1 1.971 26.394c0.001 97.535-79.334 176.87-176.87 176.87z m-562.829-70.74h66.516c26.049 0 47.166-21.117 47.166-47.165v-5.896c0-26.049-21.117-47.165-47.166-47.165H182.79V489.857z m279.812 0h141.626c-17.044-22.649-28.778-49.504-33.344-78.709H462.602v78.709zM911.668 320.093H835.59l-76.799 76.806c-7.273 7.273-19.055 7.273-26.328 0s-7.273-19.055 0-26.327l76.804-76.81v-76.068l65.163-65.164v102.4h102.4l-65.162 65.163z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="originalimage" unicode="&#59398;" d="M988.362-83.362c-1.581 4.744-1.581 4.744-2.797 6.933-1.095 1.946-2.311 3.649-3.892 5.717-2.189 2.797-5.108 6.325-9.122 10.703-6.933 7.784-17.028 18.609-30.529 32.475-20.92 21.893-41.962 43.3-93.047 95.114-50.476 51.328-71.761 72.978-92.439 94.628-13.014 13.623-22.866 23.961-29.313 31.259-3.162 3.649-5.473 6.325-6.811 7.906 0.851-1.581 0.851-1.581 2.189-5.473 2.068-7.298 2.068-7.298-6.811-24.083 80.154 77.356 126.373 184.269 126.373 298.722 0 226.961-180.742 410.987-403.81 410.987s-403.81-184.026-403.81-410.987 180.742-410.987 403.81-410.987c4.865 0 9.974 0.243 15.569 0.608 4.014 0.365 7.541 0.608 13.866 1.338 12.893 1.338 17.636 1.703 23.11 1.703 9.244 0 23.961 3.284 45.733 9.365 2.554 0.73 5.23 1.46 7.906 2.189 8.271 2.311 16.785 4.865 24.934 7.419 4.987 1.581 8.636 2.676 10.825 3.406 12.893 4.135 20.069 18.123 15.933 31.259-4.014 13.136-17.758 20.434-30.651 16.298-1.946-0.608-5.595-1.824-10.339-3.284-7.906-2.433-16.055-4.865-23.961-7.176-2.554-0.73-4.987-1.46-7.419-2.068-16.785-4.622-29.921-7.541-32.84-7.541-7.784 0-13.258-0.487-28.096-1.946-5.96-0.608-9.244-0.973-12.649-1.216-4.5-0.365-8.392-0.487-11.92-0.487-195.945 0-354.915 161.767-354.915 361.24s158.848 361.24 354.915 361.24 354.915-161.767 354.915-361.24c0-100.588-40.624-194.486-110.926-262.355-9.001-17.15-9.001-17.15-6.811-24.934 1.581-4.5 1.581-4.5 2.797-6.69 1.095-1.946 2.311-3.649 3.892-5.717 2.189-2.797 5.108-6.325 9.122-10.703 6.933-7.784 17.028-18.609 30.529-32.597 20.92-21.893 42.205-43.543 92.925-95.114 50.841-51.693 71.761-73.099 92.56-94.749 13.014-13.623 22.866-23.961 29.313-31.259 3.162-3.649 5.473-6.325 6.69-7.906-0.973 1.703-0.973 1.703-2.311 5.838-2.068 7.906-2.068 7.906 7.906 24.691-10.339-8.879-11.555-24.569-2.919-35.151 8.757-10.46 24.204-11.798 34.543-2.919 9.852 17.028 9.852 17.028 7.784 25.542zM435.677 242.606c127.954 0 231.704 103.75 231.704 231.704s-103.75 231.704-231.704 231.704-231.704-103.75-231.704-231.704c-0.122-127.954 103.628-231.704 231.704-231.704zM435.677 288.946c-102.412 0-185.364 82.951-185.364 185.364s82.951 185.364 185.364 185.364 185.364-82.951 185.364-185.364-83.073-185.364-185.364-185.364z"  horiz-adv-x="1024" />
+			<glyph glyph-name="supplierfeatures" unicode="&#59125;"
+				   d="M463.027961 339.873032c-153.338036 0-278.088918 124.725448-278.088918 278.063484S309.689925 896 463.027961 896s278.063484-124.750882 278.063484-278.088918S616.365997 339.873032 463.027961 339.873032zM463.027961 845.006011c-125.208683 0-227.069495-101.860812-227.069495-227.069495s101.860812-227.044061 227.069495-227.044061 227.044061 101.860812 227.044061 227.044061C690.097456 743.145199 588.236644 845.006011 463.027961 845.006011zM33.991749-24.002782c-1.831206 0-3.662411 0.203467-5.51905 0.610402-13.759475 3.026576-22.432269 16.658884-19.405693 30.41836 27.13745 122.741642 99.724405 229.282202 204.408325 299.987085 11.673936 7.833491 27.544384 4.781481 35.403308-6.867021 7.884357-11.673936 4.806915-27.518951-6.867021-35.428742-93.79842-63.329194-158.831653-158.780786-183.12056-268.703989C56.245983-15.914957 45.691118-24.002782 33.991749-24.002782zM609.397243-24.028215 34.042615-24.028215c-14.09011 0-25.509711 11.419602-25.509711 25.509711s11.419602 25.509711 25.509711 25.509711l575.329194 0c14.09011 0 25.509711-11.419602 25.509711-25.509711S623.487352-24.028215 609.397243-24.028215zM854.67706-128c-14.064676 0-25.433411 11.368735-25.433411 25.433411l0 190.928618c0 6.943321 2.848542 13.632308 7.909791 18.439223l126.785555 120.579802c3.687845 3.687845 5.849685 8.927127 5.849685 14.700512 0 11.826536-9.639263 21.440366-21.465799 21.440366L640.553171 263.521931c-11.826536 0-21.465799-9.613829-21.465799-21.440366 0-5.798818 2.212707-11.063534 6.40922-15.260047l116.968258-120.986737c4.603447-4.756048 7.146789-11.088967 7.146789-17.676221l0-140.519597c0-14.064676-11.368735-25.433411-25.433411-25.433411s-25.433411 11.368735-25.433411 25.433411l0 130.244499-109.516268 113.280413c-13.428841 13.428841-21.007998 31.61373-21.007998 50.917689 0 39.854155 32.427599 72.307188 72.332621 72.307188l307.795142 0c39.879589 0 72.332621-32.427599 72.332621-72.307188 0-19.303959-7.52829-37.437981-21.211465-51.121156l-119.333565-113.509314 0-180.017684C880.110471-116.605832 868.716303-128 854.67706-128z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="logistic" unicode="&#59409;" d="M723.2 896c-83.2 0-151.466667-68.266667-151.466667-151.466667 0-83.2 151.466667-296.533333 151.466667-296.533333S874.666667 659.2 874.666667 744.533333C874.666667 827.733333 806.4 896 723.2 896z m0-192c-36.266667 0-64 27.733333-64 64s27.733333 64 64 64 64-27.733333 64-64-29.866667-64-64-64zM800 576s0-2.133333-2.133333-2.133333c2.133333 0 2.133333 2.133333 2.133333 2.133333zM887.466667 648.533333c-6.4-14.933333-14.933333-29.866667-21.333334-44.8 6.4-8.533333 10.666667-19.2 17.066667-27.733333h-32c-8.533333-14.933333-17.066667-29.866667-25.6-42.666667h78.933333c19.2-46.933333 29.866667-96 34.133334-149.333333h-170.666667c0 19.2-2.133333 36.266667-4.266667 55.466667-2.133333-2.133333-4.266667-4.266667-4.266666-6.4L723.2 384H512v149.333333h108.8c-8.533333 12.8-17.066667 27.733333-25.6 42.666667H512V785.066667c6.4-2.133333 12.8-2.133333 19.2-4.266667 4.266667 23.466667 10.666667 46.933333 21.333333 66.133333-21.333333 2.133333-40.533333 4.266667-61.866666 4.266667C219.733333 851.2 0 631.466667 0 362.666667c0-270.933333 219.733333-490.666667 490.666667-490.666667s490.666667 219.733333 490.666666 490.666667c-2.133333 106.666667-36.266667 204.8-93.866666 285.866666zM386.133333 795.733333c-61.866667-42.666667-113.066667-121.6-142.933333-219.733333H98.133333c59.733333 108.8 164.266667 189.866667 288 219.733333zM76.8 533.333333h155.733333c-10.666667-46.933333-17.066667-96-19.2-149.333333H42.666667c4.266667 53.333333 14.933333 102.4 34.133333 149.333333zM42.666667 341.333333h170.666666c2.133333-53.333333 8.533333-102.4 19.2-149.333333H76.8c-19.2 46.933333-29.866667 96-34.133333 149.333333z m53.333333-192h147.2c29.866667-100.266667 81.066667-179.2 142.933333-221.866666C262.4-42.666667 155.733333 38.4 96 149.333333zM469.333333-61.866667c-76.8 12.8-142.933333 96-181.333333 211.2H469.333333v-211.2zM469.333333 192h-192c-10.666667 46.933333-19.2 96-19.2 149.333333h213.333334v-149.333333z m0 192H256c2.133333 53.333333 8.533333 102.4 19.2 149.333333h192v-149.333333z m0 192h-179.2c38.4 115.2 104.533333 196.266667 179.2 209.066667V576z m42.666667-234.666667h211.2c-2.133333-53.333333-8.533333-102.4-19.2-149.333333h-192v149.333333z m0-192h179.2c-38.4-115.2-104.533333-198.4-179.2-211.2V149.333333z m81.066667-221.866666c61.866667 42.666667 113.066667 121.6 142.933333 221.866666h147.2c-59.733333-110.933333-164.266667-192-290.133333-221.866666zM746.666667 192c10.666667 46.933333 17.066667 96 19.2 149.333333h170.666666c-2.133333-53.333333-12.8-102.4-32-149.333333H746.666667zM753.066667 501.333333s0-2.133333-2.133334-2.133333l2.133334 2.133333z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="Calculator" unicode="&#59410;" d="M864.128 849.450667c38.698667 0 70.272-31.36 70.272-69.738667v-764.522667c0-12.842667 10.496-23.253333 23.466667-23.253333 12.970667 0 23.466667 10.410667 23.466666 23.253333V779.733333C981.333333 843.754667 928.789333 896 864.128 896H42.666667v-907.456C42.666667-75.861333 95.082667-128 159.850667-128H870.186667c12.970667 0 23.466667 10.410667 23.466666 23.253333 0 12.864-10.496 23.296-23.466666 23.296H159.850667A70.08 70.08 0 0 0 89.6-11.456V849.450667h774.528zM197.696 725.333333h628.608v-64H197.696V725.333333zM874.666667 768H149.333333v-149.333333h725.333334V768zM174.08 426.666667h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333333s-11.093333 21.333333-24.746667 21.333333H174.08C160.426667 469.333333 149.333333 459.776 149.333333 448s11.093333-21.333333 24.746667-21.333333zM430.08 426.666667h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333333s-11.093333 21.333333-24.746667 21.333333h-163.84c-13.653333 0-24.746667-9.557333-24.746667-21.333333s11.093333-21.333333 24.746667-21.333333zM174.08 256h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333333s-11.093333 21.333333-24.746667 21.333334H174.08C160.426667 298.666667 149.333333 289.109333 149.333333 277.333333s11.093333-21.333333 24.746667-21.333333zM430.08 256h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333333s-11.093333 21.333333-24.746667 21.333334h-163.84c-13.653333 0-24.746667-9.557333-24.746667-21.333334s11.093333-21.333333 24.746667-21.333333zM174.08 149.333333h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333334s-11.093333 21.333333-24.746667 21.333333H174.08C160.426667 192 149.333333 182.442667 149.333333 170.666667s11.093333-21.333333 24.746667-21.333334zM430.08 149.333333h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333334s-11.093333 21.333333-24.746667 21.333333h-163.84c-13.653333 0-24.746667-9.557333-24.746667-21.333333s11.093333-21.333333 24.746667-21.333334zM174.08 21.333333h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333334s-11.093333 21.333333-24.746667 21.333333H174.08C160.426667 64 149.333333 54.442667 149.333333 42.666667s11.093333-21.333333 24.746667-21.333334zM430.08 21.333333h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333334s-11.093333 21.333333-24.746667 21.333333h-163.84c-13.653333 0-24.746667-9.557333-24.746667-21.333333s11.093333-21.333333 24.746667-21.333334zM686.08 426.666667h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333333s-11.093333 21.333333-24.746667 21.333333h-163.84c-13.653333 0-24.746667-9.557333-24.746667-21.333333s11.093333-21.333333 24.746667-21.333333zM686.08 256h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333333s-11.093333 21.333333-24.746667 21.333334h-163.84c-13.653333 0-24.746667-9.557333-24.746667-21.333334s11.093333-21.333333 24.746667-21.333333zM708.736 143.253333c0 0.106667 118.464 0 118.464 0 0.085333 0 0.064-73.173333 0.064-73.173333 0-0.106667-118.464 0-118.464 0-0.085333 0-0.064 73.173333-0.064 73.173333z m-47.402667 0v-73.173333C661.333333 43.093333 682.581333 21.333333 708.8 21.333333h118.4C853.610667 21.333333 874.666667 43.093333 874.666667 70.08v73.173333C874.666667 170.24 853.418667 192 827.2 192h-118.4C682.389333 192 661.333333 170.24 661.333333 143.253333z"  horiz-adv-x="1024" />
+			<glyph glyph-name="similarproduct" unicode="&#59126;"
+				   d="M302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM458.999525-124.8768c5.888-1.792 12.544-1.28 18.688 2.304C472.055525-125.6448 465.399525-126.6688 458.999525-124.8768zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM302.327525 391.2192l-146.944 88.064c-11.776 7.168-27.136 3.328-34.048-8.448-7.168-11.776-3.328-27.136 8.448-34.304l146.944-88.064c11.776-7.168 27.136-3.328 34.048 8.704C317.943525 368.9728 314.103525 384.3328 302.327525 391.2192zM477.687525-122.5472c-6.144-3.584-12.8-4.096-18.688-2.304C465.399525-126.6688 472.055525-125.6448 477.687525-122.5472zM490.641125-58.112 490.641125 384.256l389.632 221.184 39.8848 24.1664c7.9872 5.1968 9.4976 11.8016 10.5472 16.5376 1.024 9.728-3.584 19.968-13.568 25.088l-440.32 220.16c-7.168 3.584-15.36 3.584-22.528 0l-440.32-220.16C-2.414875 660.48 0.145125 636.672 0.145125 634.112l0-469.76c0-8.704 4.608-16.896 12.032-21.504 0 0 430.848-260.352 438.272-263.68 15.104-7.424 24.576-5.376 31.744-1.792l143.36 82.944c12.288 7.168 16.384 22.784 9.216 35.072-6.912 12.288-22.784 16.384-34.816 9.472l-99.072-57.6 0 0.256L490.641125-58.112M440.465125 384.256l0-441.088L50.065125 178.432l0 427.52L440.465125 384.256zM465.553125 427.776 78.225125 647.424l387.328 193.536 387.328-193.536L465.553125 427.776zM812.945125-21.376l201.984 121.344c5.632 3.584 9.216 9.728 9.216 16.64l0 222.464c0 7.8336-5.888 13.312-12.288 16.384l-5.12 2.56c-0.512 0.256-1.28 0.256-1.792 0.256l1.536 0-196.352 98.048c-5.376 2.56-11.776 2.56-17.152 0l-196.096-98.048c-14.336-5.504-17.92-17.792-17.92-24.704l0-216.96c0-6.912 3.584-13.056 9.472-16.64 0 0 200.1664-120.0896 201.1904-120.3456C789.623525-20.4032 801.553125-29.2352 812.945125-21.376zM782.481125 27.776l-165.12 99.584 0 178.944 165.12-93.44L782.481125 27.776zM801.681125 245.888l-161.024 91.392 161.024 80.384 160.768-80.384L801.681125 245.888zM985.745125 127.36l-164.864-99.328 0 184.832 164.864 93.44L985.745125 127.36z"
+				   horiz-adv-x="1025"/>
 
-    
-    <glyph glyph-name="video" unicode="&#59424;" d="M49.770667 696.896H658.773333c19.925333-5.674667 33.493333-14.336 42.24-25.024 8.448-10.24 11.157333-20.117333 11.157334-25.066667v-214.250666l262.357333 168.682666v-414.826666l-262.357333 168.661333v-148.096a24.896 24.896 0 1 1 49.770666 0v62.442667l262.378667-174.186667V692.394667L761.92 523.733333v123.093334c0 15.488-5.696 36.266667-22.464 56.661333-16 19.477333-39.573333 34.133333-71.104 42.368L665.258667 746.666667H0v-608.96l0.768-3.029334c2.986667-11.669333 9.173333-27.989333 19.690667-44.629333 18.730667-29.653333 44.906667-48.725333 79.146666-49.066667h637.44a24.896 24.896 0 0 1 0 49.770667H99.84c-14.4 0.149333-26.752 9.130667-37.333333 25.877333a120.213333 120.213333 0 0 0-12.757334 27.690667V696.896zM205.909333 571.52a46.506667 46.506667 0 1 0-92.992 0.042667 46.506667 46.506667 0 0 0 92.992-0.021334z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="earth" unicode="&#59432;" d="M996.352 541.696c-88.064 267.776-376.832 412.672-644.096 325.12-267.776-88.064-413.184-376.32-325.12-644.096 88.064-267.776 376.832-412.672 644.096-325.12 109.568 36.352 197.632 107.008 259.584 195.072 2.56 4.608 3.072 10.24 1.024 16.384-4.096 12.288-16.384 18.432-28.672 14.336-6.656-2.048-10.752-6.144-13.312-11.776-55.296-77.312-134.144-139.264-231.424-171.008-155.136-51.2-318.464-15.36-436.224 80.896l23.04 155.648-90.624 84.992h-87.552c-21.504 82.432-19.968 165.888 2.048 243.2l131.584 22.016 41.472 103.936 82.944 41.472 19.456 137.728c8.192 3.072 16.384 6.144 24.576 8.704 93.696 30.72 189.952 30.208 277.504 3.584l-17.92-106.496-157.696-137.728-150.528-258.048 201.728-179.712 186.88 70.144-19.968 138.752 132.096 32.768 81.92-81.92 70.144 29.184c-1.024-9.216-2.048-17.92-4.096-27.136v-0.512c0-2.56 0-4.608 0.512-6.656 4.096-12.288 16.896-17.92 28.672-14.336 9.216 3.072 15.36 11.264 15.36 20.992 12.8 77.824 8.704 159.744-17.408 239.616z m-793.6-378.368l-16.384-109.568c-46.08 46.592-82.944 103.424-107.008 168.448h58.368l65.024-58.88z m85.504 535.552l-77.824-38.912-38.912-96.768-88.064-14.848c39.936 101.888 115.712 189.44 217.6 241.664l-12.8-91.136zM834.56 426.496l-188.928-47.104 20.48-142.336-134.144-50.176-159.232 141.824 130.56 223.744 163.328 142.848 18.944 113.664c122.368-49.152 223.232-149.504 267.264-284.672 16.384-49.664 24.576-100.352 24.064-150.016l-63.488-26.624-78.848 78.848z"  horiz-adv-x="1024" />
+			<glyph glyph-name="link" unicode="&#59127;"
+				   d="M331.502964 564.503436c-11.110365-11.110365-11.110365-29.107109 0-40.191874l321.816594-321.790994c11.110365-11.161565 29.107109-11.110365 40.191874-0.0256 11.110365 11.110365 11.110365 29.081509 0 40.191874L371.720439 564.503436C360.610073 575.588201 342.61333 575.588201 331.502964 564.503436zM96.2141 836.041787 59.990213 799.7923c-79.97415-79.97415-79.99975-209.637745 0-289.611895l126.719604-126.719604c62.668604-62.719804 155.749913-75.878163 231.602476-40.243074 0.281599 0.128 0.537598 0.230399 0.844797 0.332799 0.537598 0.255999 1.177596 0.486398 1.715195 0.742398-0.0512 0.128 0.0512-0.128 0 0 2.713592 1.356796 5.171184 3.07199 7.449577 5.350383 11.238365 11.238365 11.238365 29.491108 0 40.755073-9.036772 9.011172-22.24633 10.598367-33.049497 5.171184-0.0512 0.1536 0.0768-0.1536 0 0-56.575823-25.72792-125.849207-15.180753-172.364261 31.359902L103.433277 546.378692c-59.980613 60.006212-59.980613 157.234709 0 217.215321L132.386787 792.573123c59.980613 59.980613 157.234709 59.955013 217.215321 0l119.474827-119.474827c47.283052-47.257452 57.292621-117.810832 30.131106-174.847454 0 0 0.0256 0.0256 0 0-0.0768-0.204799 0.1024 0.204799 0 0 0.0512-0.0256-0.0256 0.0256 0 0-3.839988-10.239968-2.227193-22.707129 6.015981-30.950303 11.238365-11.238365 29.491108-11.263965 40.755073 0 2.303993 2.303993 4.377586 4.915185 5.759982 7.679976 0.1536-0.0256-0.179199 0.0256 0 0 37.196684 76.313361 24.217524 170.905066-39.167878 234.316068l-126.719604 126.719604C305.851844 915.990337 176.16265 915.990337 96.2141 836.041787zM963.411389-31.155503l-36.249487-36.223887c-79.97415-79.97415-209.637745-79.97415-289.611895 0.0256l-126.719604 126.694004c-62.668604 62.668604-75.878163 155.775513-40.217474 231.602476 0.128 0.281599 0.230399 0.537598 0.332799 0.844797 0.255999 0.537598 0.511998 1.203196 0.742398 1.715195 0.128-0.0512-0.128 0.0512 0 0 1.356796 2.713592 3.07199 5.171184 5.350383 7.449577 11.238365 11.238365 29.491108 11.238365 40.780673 0 8.985572-9.011172 10.572767-22.220731 5.119984-33.049497 0.179199-0.0768-0.128 0.0768 0 0-25.72792-56.601423-15.155153-125.823607 31.385502-172.364261l119.474827-119.449227c60.006212-60.006212 157.234709-60.006212 217.215321 0l28.95351 28.95351c60.006212 60.006212 59.980613 157.234709 0 217.189721l-119.449227 119.474827c-47.283052 47.257452-117.810832 57.292621-174.847454 30.131106-0.0256 0 0.0256 0 0 0-0.204799-0.128 0.230399 0.0768 0 0-0.0256 0 0.0256-0.0256 0 0-10.239968-3.865588-22.707129-2.252793-30.950303 6.015981-11.238365 11.263965-11.238365 29.491108-0.0256 40.755073 2.303993 2.278393 4.889585 4.351986 7.705576 5.734382-0.0256 0.128 0.0256-0.179199 0 0 76.313361 37.222284 170.905066 24.217524 234.290468-39.167878l126.719604-126.719604C1043.359939 178.507842 1043.359939 48.818647 963.411389-31.155503z"
+				   horiz-adv-x="1025"/>
 
-    
-    <glyph glyph-name="task-management" unicode="&#59433;" d="M37.298973 690.102498c6.293019 0 12.587044 2.297707 17.549971 7.001864L218.590269 851.653853c10.246041 9.644932 10.740421 25.8195 1.0532 36.086686-9.666077 10.246041-25.883941 10.761565-36.086686 1.031048L19.771154 734.222096c-10.267186-9.666077-10.740421-25.840645-1.052192-36.129982 5.047504-5.284122 11.834903-7.990623 18.580011-7.990623zM986.425141 690.102498a25.375465 25.375465 0 0 0-17.549971 7.001864L805.131831 851.653853c-10.246041 9.644932-10.739414 25.8195-1.052193 36.086686 9.666077 10.246041 25.883941 10.761565 36.086686 1.031048L1003.95296 734.222096c10.267186-9.666077 10.739414-25.840645 1.052192-36.129982-5.047504-5.284122-11.83591-7.990623-18.580011-7.990623zM514.029876 852.127088c-270.542411 0-489.898918-219.3555-489.898918-489.876767 0-270.672299 219.334356-489.920063 489.898918-489.920063 112.340956 0 218.926568 37.955461 305.040236 106.541309 10.310482 8.1628 12.028224 23.220735 3.779839 33.552362s-23.263025 12.029231-33.573507 3.780846c-77.650816-61.841746-173.773908-96.102954-275.225423-96.102954-244.165097 0-442.083052 197.961251-442.083052 442.1485 0 244.121801 197.89681 442.061908 442.083052 442.061907 244.187249 0 442.105204-197.940106 442.105203-442.061907 0-83.730376-23.284169-163.958812-66.588193-233.490124-6.938431-11.169353-3.523084-25.947375 7.668421-32.929102 11.190498-6.959575 25.905086-3.479788 32.90695 7.647277 47.987036 77.049707 73.827681 166.019902 73.827682 258.771949-0.021145 270.521266-219.3555 489.876767-489.941208 489.876767zM816.4059 385.943284c-0.472228 0-0.966608-0.043296-1.459981-0.043296-0.215473 0-0.429939 0.021145-0.579964 0.021145H530.483351V669.80273c0 0.451084-0.021145 0.902167-0.06444 1.35325 0.043296 0.451084 0.064441 0.945463 0.06444 1.396547 0 14.52026-11.620437 26.269577-25.969526 26.269577-14.370234 0-25.990671-11.749318-25.990671-26.269577 0-0.451084 0.043296-0.923312 0.064441-1.374395-0.043296-0.451084-0.085585-0.902167-0.085585-1.375402v-283.602691c-14.477971 0-26.227288-11.577141-26.24944-25.905085-0.021145-12.973687 9.516051-23.714108 22.038655-25.711764a12.898171 12.898171 0 0 1 4.081904-0.66555h0.085585v-0.128881c0-0.579965 0.064441-1.267666 0.151032-1.782183 1.030041-13.597955 12.200401-24.316224 25.92623-24.316224 14.348083 0 25.947375 11.770462 25.969526 26.227288h283.860453c0.515524 0 0.987752 0 1.39554 0.043296h0.537675c14.52026-0.043296 26.291729 11.577141 26.356169 25.882934-0.022151 14.392385-11.728173 26.056118-26.249439 26.098407z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="trust" unicode="&#59434;" d="M776.682667 802.410667l-151.701334-76.394667 36.693334-72.938667c-1.728-0.64-3.029333-1.728-4.522667-2.816-4.970667-3.882667-20.501333-14.250667-33.450667-16.618666-25.216-3.136-40.832 9.685333-62.592 2.581333-12.309333-3.029333-30.869333-14.250667-51.370666-29.354667-18.773333 10.581333-50.709333 27.2-69.056 29.568-15.573333 1.877333-42.517333-3.029333-49.642667-2.368-11.008 0.874667-25.472 9.28-31.722667 13.589334l39.488 78.336-151.488 76.394666L0 311.466667l151.722667-76.181334 188.181333 373.568c10.368-6.464 32.170667-17.898667 51.2-17.898666 16.170667 0 25.642667 5.013333 43.754667 2.773333 6.464-0.853333 21.589333-7.552 37.76-15.744a1837.546667 1837.546667 0 0 1-85.461334-75.541333c-30.549333-32.746667-31.018667-73.109333-7.552-100.736 27.328-34.005333 59.882667-25.621333 88.277334-13.866667l80.448 41.536c11.669333 6.165333 19.776 10.432 19.882666 10.261333l170.261334-147.178666c5.824-5.184 9.493333-12.074667 10.133333-19.861334 0.64-7.978667-1.728-15.530667-6.912-21.354666-18.346667-21.589333-31.722667-10.133333-31.722667-10.133334l-32.810666 25.237334-26.538667-34.090667s24.768-18.709333 32.597333-25.472c4.736-4.074667 5.184-7.765333 4.757334-10.794667-0.426667-6.037333-4.309333-13.376-10.794667-20.928-9.92-11.648-17.258667-14.890667-22.656-14.890666-4.970667 0-8.192 2.816-9.92 4.309333a7153.130667 7153.130667 0 0 1-38.848 28.48l-25.898667-34.538667 37.973334-28.266666c4.522667-4.309333 4.970667-7.765333 4.757333-11.008-0.64-5.824-4.757333-13.589333-11.221333-21.354667-6.912-7.765333-13.802667-13.162667-20.074667-14.890667-3.648-0.981333-6.656-1.322667-12.074667 2.816l-46.186666 37.546667-27.2-33.450667 44.245333-36.032c5.824-4.757333 6.250667-8.64 5.824-12.074666-0.64-6.037333-4.757333-13.589333-11.434667-21.376a29.184 29.184 0 0 0-19.648-10.133334c-7.765333-0.64-15.317333 1.941333-22.442666 7.765334l-206.4 173.909333c-9.706667 7.125333-23.082667 5.184-30.208-4.309333s-5.184-23.082667 4.309333-30.208l205.525333-173.056a71.594667 71.594667 0 0 1 46.613334-17.258667c26.325333 1.066667 41.6 11.605333 55.253333 25.258667 19.2 19.2 21.589333 47.04 21.589333 48.128 1.301333 0.426667 32.597333 14.890667 45.098667 29.568 18.261333 20.416 21.568 41.728 21.589333 48.341333 15.317333 3.242667 30.656 12.736 44.245334 28.693333 13.162667 15.530667 20.288 32.149333 21.141333 47.701334 0.853333 0.213333 26.88 7.829333 43.584 28.48 7.125333 8.426667 12.074667 18.133333 14.677333 28.693333 0.853333 0.426667 55.68 37.333333 55.68 37.333333l27.2-53.952L1024 311.466667 776.682667 802.410667zM132.501333 293.12l-74.453333 37.546667 208.256 413.909333 74.666667-37.546667L132.501333 293.12z m652.608 7.765333a72.704 72.704 0 0 1-18.56 24.384l-180.842666 156.458667a21.781333 21.781333 0 0 1-23.744 3.029333c-3.242667-1.514667-80.597333-42.069333-107.754667-57.792-14.72-8.448-32.277333-9.770667-42.453333 5.525334-9.770667 14.442667-5.482667 27.989333 4.117333 37.589333 59.562667 56.106667 135.914667 119.509333 155.370667 124.096 20.522667 5.696 32.234667-5.994667 60.202666-2.816 21.632 1.813333 42.944 18.133333 49.856 23.082667l144.149334-286.165334-40.341334-27.392zM683.029333 707.029333l74.453334 37.546667L965.952 330.666667l-74.666667-37.546667-208.256 413.909333z"  horiz-adv-x="1024" />
+			<glyph glyph-name="cut" unicode="&#59128;"
+				   d="M995.5584 56.9088 896 56.9088 896 540.4416c0 15.6928-12.7488 28.4416-28.4416 28.4416s-28.4416-12.7488-28.4416-28.4416l0-483.5584L225.1008 56.8832 930.3552 762.112c11.1104 11.1104 11.1104 29.1072 0 40.2176-11.136 11.1104-29.1584 11.1104-40.2432 0L184.8832 97.1008 184.8832 711.1168l469.3248 0c15.7184 0 28.416 12.7488 28.416 28.4416C682.6496 755.2512 669.952 768 654.2336 768L184.8832 768 184.8832 867.5584C184.8832 883.2512 172.16 896 156.4416 896 140.7488 896 128 883.2512 128 867.5584L128 768 28.4416 768C12.7488 768 0 755.2512 0 739.5584c0-15.6928 12.7488-28.4416 28.4416-28.4416L128 711.1168l0-682.6752C128 12.7488 140.7488 0 156.4416 0l682.6496 0 0-99.5584c0-15.6928 12.7488-28.4416 28.4416-28.4416S896-115.2512 896-99.5584L896 0l99.5584 0C1011.2512 0 1024 12.7488 1024 28.4416S1011.2512 56.9088 995.5584 56.9088z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="password" unicode="&#59435;" d="M136.533568 435.434955V-51.412741A25.599984 25.599984 0 0 1 162.176219-76.799392h691.114234c14.335991 0 25.642651 11.30666 25.642651 25.365317V435.413621a25.599984 25.599984 0 0 1-25.642651 25.365318H162.176219c-14.335991 0-25.642651-11.30666-25.642651-25.365318z m-51.199968 0A76.543952 76.543952 0 0 0 162.176219 512.00024h691.114234a76.799952 76.799952 0 0 0 76.842619-76.565285V-51.412741A76.543952 76.543952 0 0 0 853.290453-127.99936H162.176219A76.799952 76.799952 0 0 0 85.3336-51.434075V435.413621zM290.133472 678.400136c0 91.733276 74.60262 166.399896 166.421229 166.399896H546.133312a166.442563 166.442563 0 0 0 166.421229-166.399896v-91.519943s7.082662-17.557322 27.221317-17.557322c20.159987 0 23.978652 17.535989 23.978651 17.535989V678.400136C763.733176 798.570728 666.239904 896 546.111979 896H456.533368C336.362776 896 238.933504 798.336061 238.933504 678.400136v-191.99988l51.199968 9.813327V678.400136z m0 0c0 91.733276 74.60262 166.399896 166.421229 166.399896H546.133312a166.442563 166.442563 0 0 0 166.421229-166.399896v-91.519943h51.199968V678.400136C763.733176 798.570728 666.239904 896 546.111979 896H456.533368C336.362776 896 238.933504 798.336061 238.933504 678.400136v-191.99988l51.199968 9.813327V678.400136zM495.829343 319.168361v-241.130516a25.599984 25.599984 0 1 1 51.199968 0V319.168361a25.599984 25.599984 0 1 1-51.199968 0z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="column" unicode="&#59449;" d="M307.2-12.8h51.2V780.8h-51.2v-793.6z m332.8 0h51.2V780.8H640v-793.6z m-512.021333 0A76.885333 76.885333 0 0 0 51.2 63.914667V806.4L25.6 780.8h870.528A76.672 76.672 0 0 0 972.8 703.808V49.493333a25.6 25.6 0 1 1 51.2 0V703.786667A127.872 127.872 0 0 1 896.128 832H25.6A25.6 25.6 0 0 1 0 806.4v-742.485333A128.085333 128.085333 0 0 1 127.978667-64H896a25.6 25.6 0 1 1 0 51.2H127.978667z"  horiz-adv-x="1024" />
+			<glyph glyph-name="navlist" unicode="&#59130;"
+				   d="M284.416 777.984l711.168 0C1011.2768 777.984 1024 790.7072 1024 806.4c0 15.6928-12.7232 28.416-28.416 28.416L284.416 834.816C268.7232 834.816 256 822.0928 256 806.4 256 790.7072 268.7232 777.984 284.416 777.984zM125.184 834.816 28.416 834.816C12.7232 834.816 0 822.0928 0 806.4c0-15.6928 12.7232-28.416 28.416-28.416l96.768 0C140.8768 777.984 153.6 790.7072 153.6 806.4 153.6 822.0928 140.8768 834.816 125.184 834.816zM995.584 553.216 284.416 553.216c-15.6928 0-28.416-12.7232-28.416-28.416 0-15.6928 12.7232-28.416 28.416-28.416l711.168 0c15.6928 0 28.416 12.7232 28.416 28.416C1024 540.4928 1011.2768 553.216 995.584 553.216zM125.184 553.216 28.416 553.216C12.7232 553.216 0 540.4928 0 524.8c0-15.6928 12.7232-28.416 28.416-28.416l96.768 0C140.8768 496.384 153.6 509.1072 153.6 524.8 153.6 540.4928 140.8768 553.216 125.184 553.216zM585.984-9.984 284.416-9.984c-15.6928 0-28.416-12.7232-28.416-28.3904 0-15.6928 12.7232-28.4416 28.416-28.4416l301.568 0c15.6928 0 28.416 12.7488 28.416 28.4416C614.4-22.7072 601.6768-9.984 585.984-9.984zM125.184-9.984 28.416-9.984C12.7232-9.984 0-22.7072 0-38.3744c0-15.6928 12.7232-28.4416 28.416-28.4416l96.768 0c15.6928 0 28.416 12.7488 28.416 28.4416C153.6-22.7072 140.8768-9.984 125.184-9.984zM585.984 271.616 284.416 271.616c-15.6928 0-28.416-12.7232-28.416-28.3904 0-15.6928 12.7232-28.4416 28.416-28.4416l301.568 0c15.6928 0 28.416 12.7488 28.416 28.4416C614.4 258.8928 601.6768 271.616 585.984 271.616zM125.184 271.616 28.416 271.616C12.7232 271.616 0 258.8928 0 243.2256c0-15.6928 12.7232-28.4416 28.416-28.4416l96.768 0c15.6928 0 28.416 12.7488 28.416 28.4416C153.6 258.8928 140.8768 271.616 125.184 271.616zM995.584 166.3744l-122.368 0 0 122.368c0 15.6928-12.7232 28.416-28.3904 28.416-15.6928 0-28.416-12.7232-28.416-28.416l0-122.368L694.016 166.3744c-15.6928 0-28.416-12.7232-28.416-28.416 0-15.6672 12.7232-28.3904 28.416-28.3904l122.3424 0L816.3584-12.8c0-15.6928 12.7232-28.416 28.416-28.416 15.6672 0 28.3904 12.7232 28.3904 28.416l0 122.3424 122.368 0c15.6928 0 28.416 12.7232 28.416 28.3904C1024 153.6512 1011.2768 166.3744 995.584 166.3744z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="apparel" unicode="&#59450;" d="M367.701333 480.96l4.074667-18.304-11.392-20.096 217.386667-3.669333a20.757333 20.757333 0 0 1 0.533333 41.536l-210.602667 0.533333z m301.056-11.136l-1.408-7.274667 3.52-6.528 299.242667-556.373333 18.282667 30.613333H35.648l18.090667-30.976 314.176 556.373334 3.946666 6.976-1.770666 7.808-87.978667 387.648-20.245333-25.344h87.978666l-17.493333 9.536c0.768-1.152 2.090667-3.2 4.010667-5.952a483.157333 483.157333 0 0 1 48.917333-60.074667c40.768-42.410667 82.197333-68.48 123.946667-69.184h3.136c42.282667 0.661333 82.944 26.944 121.92 69.589333a446.442667 446.442667 0 0 1 49.834666 66.282667l-17.877333-10.197333h98.304l-20.373333 24.725333-75.413334-387.648zM789.76 874.24H654.4l-6.037333-10.197333a405.504 405.504 0 0 0-44.736-59.392C571.669333 769.706667 539.690667 749.013333 511.701333 748.586667c-29.610667 0.469333-62.72 21.333333-96.512 56.469333a442.218667 442.218667 0 0 0-47.893333 59.669333l-6.122667 9.536h-125.312l5.76-25.344 87.957334-387.669333 2.176 14.805333L17.578667-80.32l-17.493334-30.954667H1023.146667l-16.469334 30.592-299.242666 556.373334 2.090666-13.802667 75.413334 387.648 4.8 24.746667z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="bags" unicode="&#59451;" d="M311.616042 579.050733h389.909252c121.322641 0 219.519954-98.090646 219.519954-219.434621V-55.039802c0-13.418664-10.815998-24.213328-24.362661-24.213328H116.458749a24.405328 24.405328 0 0 0-24.362662 24.213328V359.616112c0 121.109308 98.410646 219.434621 219.519955 219.434621zM43.328098-55.039802A73.173318 73.173318 0 0 1 116.480082-127.999787h780.223838a72.959985 72.959985 0 0 1 73.130651 72.959985V359.637445c0 148.266636-120.042642 268.202611-268.287944 268.202611H311.616042c-148.053302 0-268.287944-120.149308-268.287944-268.202611V-55.039802z m268.20261 512.17056c13.567997 0 24.383995-10.815998 24.383995-24.533328v-72.853318c0-13.65333-10.837331-24.533328-24.383995-24.533329a24.277328 24.277328 0 0 0-24.383994 24.533329v72.853318c0 13.65333 10.815998 24.533328 24.383994 24.533328z m-73.151984-97.386646a73.045318 73.045318 0 0 1 73.151984-73.279985c40.533325 0 73.130651 32.767993 73.130652 73.279985v72.853318a73.045318 73.045318 0 0 1-73.130652 73.279985 73.087985 73.087985 0 0 1-73.151984-73.279985v-72.853318z m438.869242 97.386646c13.567997 0 24.362662-10.815998 24.362661-24.533328v-72.853318c0-13.65333-10.815998-24.533328-24.362661-24.533329a24.277328 24.277328 0 0 0-24.383995 24.533329v72.853318c0 13.65333 10.815998 24.533328 24.383995 24.533328z m-73.151985-97.386646a73.045318 73.045318 0 0 1 73.151985-73.279985c40.533325 0 73.130651 32.767993 73.130651 73.279985v72.853318a73.045318 73.045318 0 0 1-73.130651 73.279985 73.087985 73.087985 0 0 1-73.151985-73.279985v-72.853318z m-268.181278 316.799934c0 94.186647 76.543984 170.666631 170.666631 170.666631 94.165314 0 170.666631-76.543984 170.666632-170.666631v-195.050626h48.746656v195.050626C725.994622 797.610687 627.690643 896 506.581334 896 385.536026 896 287.146714 797.69602 287.146714 676.565379v-195.050626h48.767989v195.050626zM762.666614 42.666844a24.383995 24.383995 0 1 1 0 48.76799H92.096087V42.666844h670.591861z"  horiz-adv-x="1024" />
+			<glyph glyph-name="imagetext" unicode="&#59131;"
+				   d="M608 602.8032c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.336-11.4432 25.9328-25.6 25.9328l-140.8 0c-14.1312 0-25.6-11.6224-25.6-25.9328 0-14.336 11.4688-25.9584 25.6-25.9584L608 602.8032 608 602.8032zM864 602.8032c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.336-11.4432 25.9328-25.6 25.9328l-140.8 0c-14.1568 0-25.6-11.6224-25.6-25.9328 0-14.336 11.4432-25.9584 25.6-25.9584L864 602.8032 864 602.8032zM608 447.1552c14.1568 0 25.6 11.5968 25.6 25.9328s-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1312 0-25.6-11.6224-25.6-25.9584s11.4688-25.9328 25.6-25.9328L608 447.1552 608 447.1552zM864 447.1552c14.1568 0 25.6 11.5968 25.6 25.9328s-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1568 0-25.6-11.6224-25.6-25.9584s11.4432-25.9328 25.6-25.9328L864 447.1552 864 447.1552zM608 291.456c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1312 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4688-25.9584 25.6-25.9584L608 291.456 608 291.456zM864 291.456c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1568 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4432-25.9584 25.6-25.9584L864 291.456 864 291.456zM864 291.456M608 135.7312c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1312 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4688-25.9584 25.6-25.9584L608 135.7312 608 135.7312zM864 135.7312c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1568 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4432-25.9584 25.6-25.9584L864 135.7312 864 135.7312zM864 135.7312M881.7664 832 28.4416 832 0 832l0-28.9024 0-722.5344C0 0.7424 63.6928-64 142.2336-64l853.3248 0L1024-64l0 28.9024L1024 225.024c0 15.9744-12.7232 28.9024-28.4416 28.9024-15.6928 0-28.4416-12.928-28.4416-28.9024l0-231.2192L142.2336-6.1952c-47.104 0-85.3248 38.8608-85.3248 86.784L56.9088 774.1952l824.8832 0c47.104 0 85.3248-38.912 85.3248-86.8864l0.2304-259.9424c0.4608-15.3088 12.8512-27.648 28.2624-27.648s27.8016 12.3392 28.2624 27.648L1024 687.3088C1024 767.2064 960.3328 832 881.7664 832zM142.2336 557.4144c0-55.8848 44.5696-101.1712 99.5584-101.1712 54.9888 0 99.5584 45.312 99.5584 101.1712 0 55.8592-44.5696 101.1712-99.5584 101.1712C186.8032 658.5856 142.2336 613.2992 142.2336 557.4144zM284.4416 557.4144c0-23.9616-19.0976-43.3664-42.6752-43.3664s-42.6752 19.4304-42.6752 43.3664c0 23.936 19.0976 43.3408 42.6752 43.3408S284.4416 581.3504 284.4416 557.4144z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="folder" unicode="&#59452;" d="M1228.544 589.696a153.6256 153.6256 0 0 1-153.6256 153.9072h-460.032l21.4272-8.7808L481.024 887.04 472.064 895.744H0.9472v-863.36c0-85.248 68.6592-154.368 153.2928-154.368h906.4448c16.9472 0 30.72 13.824 30.72 30.8224 0 17.0496-13.7728 30.848-30.72 30.848H154.2144c-50.688 0-91.904 41.4976-91.904 92.672V864.9216l-30.72-30.8224h428.032l-21.4272 8.7552 155.264-152.192 8.9344-8.7552h472.5248a92.1088 92.1088 0 0 0 92.2368-92.2112V46.08c0-17.024 13.7216-30.8224 30.6688-30.8224 16.9728 0 30.72 13.7984 30.72 30.8224V589.696z m-61.3888-172.032l0.2048 61.696H62.4128v-61.696h1104.7424z"  horiz-adv-x="1228" />
 
-    
-    <glyph glyph-name="column1" unicode="&#59453;" d="M127.978667-12.8A76.885333 76.885333 0 0 0 51.2 63.914667V806.4L25.6 780.8h870.528A76.672 76.672 0 0 0 972.8 703.808V49.493333a25.6 25.6 0 1 1 51.2 0V703.786667A127.872 127.872 0 0 1 896.128 832H25.6A25.6 25.6 0 0 1 0 806.4v-742.485333A128.085333 128.085333 0 0 1 127.978667-64H896a25.6 25.6 0 1 1 0 51.2H127.978667z m102.421333 0h51.2V780.8h-51.2v-793.6z m256 0h51.2V780.8h-51.2v-793.6z m256 0h51.2V780.8h-51.2v-793.6z"  horiz-adv-x="1024" />
+			<glyph glyph-name="text" unicode="&#59132;"
+				   d="M608 602.8032c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.336-11.4432 25.9328-25.6 25.9328l-140.8 0c-14.1312 0-25.6-11.6224-25.6-25.9328 0-14.336 11.4688-25.9584 25.6-25.9584L608 602.8032 608 602.8032zM864 602.8032c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.336-11.4432 25.9328-25.6 25.9328l-140.8 0c-14.1568 0-25.6-11.6224-25.6-25.9328 0-14.336 11.4432-25.9584 25.6-25.9584L864 602.8032 864 602.8032zM608 447.1552c14.1568 0 25.6 11.5968 25.6 25.9328s-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1312 0-25.6-11.6224-25.6-25.9584s11.4688-25.9328 25.6-25.9328L608 447.1552 608 447.1552zM864 447.1552c14.1568 0 25.6 11.5968 25.6 25.9328s-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1568 0-25.6-11.6224-25.6-25.9584s11.4432-25.9328 25.6-25.9328L864 447.1552 864 447.1552zM608 291.456c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1312 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4688-25.9584 25.6-25.9584L608 291.456 608 291.456zM864 291.456c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1568 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4432-25.9584 25.6-25.9584L864 291.456 864 291.456zM864 291.456M608 135.7312c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1312 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4688-25.9584 25.6-25.9584L608 135.7312 608 135.7312zM864 135.7312c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1568 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4432-25.9584 25.6-25.9584L864 135.7312 864 135.7312zM864 135.7312M352 602.8032c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.336-11.4432 25.9328-25.6 25.9328l-140.8 0c-14.1312 0-25.6-11.6224-25.6-25.9328 0-14.336 11.4688-25.9584 25.6-25.9584L352 602.8032 352 602.8032zM352 447.1552c14.1568 0 25.6 11.5968 25.6 25.9328s-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1312 0-25.6-11.6224-25.6-25.9584s11.4688-25.9328 25.6-25.9328L352 447.1552 352 447.1552zM352 291.456c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1312 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4688-25.9584 25.6-25.9584L352 291.456 352 291.456zM608 291.456M352 135.7312c14.1568 0 25.6 11.6224 25.6 25.9584 0 14.3616-11.4432 25.9584-25.6 25.9584l-140.8 0c-14.1312 0-25.6-11.5968-25.6-25.9584 0-14.336 11.4688-25.9584 25.6-25.9584L352 135.7312 352 135.7312zM608 135.7312M881.7664 832 28.4416 832 0 832l0-28.9024 0-722.5344C0 0.7424 63.6928-64 142.2336-64l853.3248 0L1024-64l0 28.9024L1024 225.024c0 15.9744-12.7232 28.9024-28.4416 28.9024-15.6928 0-28.4416-12.928-28.4416-28.9024l0-231.2192L142.2336-6.1952c-47.104 0-85.3248 38.8608-85.3248 86.784L56.9088 774.1952l824.8832 0c47.104 0 85.3248-38.912 85.3248-86.8864l0.2304-259.9424c0.4608-15.3088 12.8512-27.648 28.2624-27.648s27.8016 12.3392 28.2624 27.648L1024 687.3088C1024 767.2064 960.3328 832 881.7664 832z"
+				   horiz-adv-x="1024"/>
 
-    
-    <glyph glyph-name="code" unicode="&#59458;" d="M335.168 375.584m-50.528 0a50.528 50.528 0 1 1 101.056 0 50.528 50.528 0 1 1-101.056 0ZM537.248 375.584m-50.528 0a50.528 50.528 0 1 1 101.056 0 50.528 50.528 0 1 1-101.056 0ZM739.36 375.584m-50.528 0a50.528 50.528 0 1 1 101.056 0 50.528 50.528 0 1 1-101.056 0ZM548.192 72.768h-187.776a302.816 302.816 0 1 0 0 605.632h303.168a302.816 302.816 0 0 0 302.816-302.816v-3.712a299.104 299.104 0 0 0-299.104-299.104 25.6 25.6 0 1 1 0-51.2c193.472 0 350.304 156.8 350.304 350.304v3.712C1017.6 571.104 859.104 729.6 663.584 729.6h-303.168C164.896 729.6 6.4 571.104 6.4 375.584s158.496-354.016 354.016-354.016h187.776a25.6 25.6 0 1 1 0 51.2z"  horiz-adv-x="1024" />
 
-    
-    <glyph glyph-name="RFQ-filling1" unicode="&#59459;" d="M0 102.733492V665.266508c0 69.708108 46.655654 130.792476 113.907546 149.13453l7.084973 1.931762a2232.858292 2232.858292 0 0 0 1175.008173 0l7.084973-1.931762c67.251892-18.342054 113.907546-79.426422 113.907546-149.13453v-562.533016c0-69.708108-46.655654-130.792476-113.907546-149.13453l-7.084973-1.931762a2232.858292 2232.858292 0 0 0-1175.008173 0l-7.084973 1.931762C46.655654-28.058984 0 33.025384 0 102.733492z m1031.775481 525.638573c-62.8736 0-120.277103-23.852281-163.67533-62.96493v62.977384H542.241211v-456.037016L424.211373 320.954811c50.236886 26.945038 84.410811 79.945341 84.410811 140.941146v3.262962c0 90.094011-73.020886 163.138422-163.114898 163.167481l-190.465383 0.058119v-489.50106h97.899935V302.049557h66.268021l117.28813-163.171633h132.325708l-0.004151 0.004152h71.3216V331.825816h152.454227c23.841211-110.14227 122.017903-192.954811 239.180108-192.954811 12.434681 0 24.621665 0.920216 36.558184 2.727438v99.756973a148.116065 148.116065 0 0 0-36.558184-4.569254c-81.086962 0-146.836065 65.749103-146.836065 146.836065 0 81.122941 65.749103 146.872043 146.836065 146.872043 81.122941 0 146.872043-65.749103 146.872043-146.872043 0-12.611805-1.594119-24.833384-4.605232-36.523589h99.755589a243.460151 243.460151 0 0 1 2.727438 36.523589c0.001384 134.967351-109.781103 244.749838-244.749838 244.749838z m229.775914-332.805535H1156.275892l-106.273211 106.282897c-10.064259 10.064259-26.368 10.064259-36.432259 0s-10.064259-26.368 0-36.430876l106.280129-106.288432v-105.261665l90.171503-90.172886v141.699459h141.69946l-90.170119 90.171503zM252.941838 530.4832h92.043762c36.046184 0 65.267546-29.221362 65.267546-65.266162v-8.158789c0-36.046184-29.221362-65.266162-65.267546-65.266163H252.941838V530.4832zM640.141146 530.4832h195.979762c-23.585211-31.341319-39.82253-68.502832-46.140886-108.916238H640.141146v108.916238z"  horiz-adv-x="1416" />
+			<glyph glyph-name="move" unicode="&#59133;"
+				   d="M501.0944-125.824c6.9376-2.8928 14.8224-2.8928 21.8112 0 3.4304 1.4336 6.528 3.4816 9.1136 6.0672 0.0256 0 0.0768 0.0256 0.0768 0.0256l158.9248 158.9248c11.1104 11.1104 11.1104 29.1328 0 40.2176-11.0848 11.0848-29.0816 11.0848-40.1664-0.0256l-110.4384-110.4128 0.0256 335.36c0 15.6928-12.7232 28.416-28.416 28.416s-28.416-12.6976-28.416-28.3904l0-335.3856-110.4128 110.4128c-11.1104 11.0848-29.1072 11.0848-40.1408 0-11.1104-11.1104-11.136-29.1072-0.0512-40.192l158.9504-158.9248c0.8192-0.8192 1.8944-1.1776 2.816-1.8688C496.7168-123.1872 498.688-124.8256 501.0944-125.824zM522.9056 893.824c-6.9376 2.8928-14.8224 2.8928-21.7856 0C497.6896 892.416 494.592 890.368 491.9808 887.7824c-0.0256 0-0.0768-0.0512-0.0768-0.0512L332.9792 728.832c-11.1104-11.1104-11.1104-29.1328 0-40.2176 11.0848-11.0848 29.0816-11.0848 40.1664 0.0256l110.4384 110.4128-0.0256-335.36c0-15.6928 12.7232-28.416 28.416-28.416 15.6928 0 28.4416 12.6976 28.4416 28.3904L540.416 799.0528l110.4128-110.4128c11.1104-11.0848 29.1072-11.0848 40.1408 0 11.1104 11.1104 11.1616 29.1072 0.0512 40.192l-158.9504 158.8992c-0.8192 0.8448-1.8944 1.2032-2.816 1.8944C527.2832 891.1872 525.312 892.8256 522.9056 893.824zM1021.824 373.0944c2.8928 6.9376 2.8928 14.8224 0 21.8112-1.408 3.4304-3.456 6.528-6.0416 9.1136 0 0.0256-0.0512 0.0768-0.0512 0.0768l-158.8992 158.9248c-11.1104 11.1104-29.1584 11.1104-40.2432 0-11.0592-11.0848-11.0592-29.0816 0.0512-40.1664l110.3872-110.4384-335.36 0.0256c-15.6928 0-28.3904-12.7232-28.3904-28.416s12.6976-28.416 28.3904-28.416l335.36 0-110.3872-110.4128c-11.1104-11.1104-11.1104-29.1072 0-40.1408 11.1104-11.1104 29.1072-11.136 40.192-0.0512l158.8992 158.9504c0.8448 0.8192 1.2032 1.8944 1.8944 2.816C1019.1872 368.7168 1020.8256 370.688 1021.824 373.0944zM2.176 394.9056c-2.8928-6.9376-2.8928-14.8224 0-21.7856 1.408-3.456 3.456-6.5536 6.0416-9.1392l0.0512-0.0512 158.8992-158.9504c11.1104-11.1104 29.1584-11.1104 40.2432 0 11.0592 11.1104 11.0592 29.1072-0.0512 40.192l-110.3872 110.4384 335.36-0.0512c15.6928 0 28.3904 12.7488 28.3904 28.416 0 15.6928-12.6976 28.4416-28.3904 28.4416l-335.36-0.0256 110.3872 110.4128c11.1104 11.1104 11.1104 29.1072 0 40.1408-11.1104 11.1104-29.1072 11.1616-40.192 0.0512l-158.8992-158.9504c-0.8448-0.8192-1.2032-1.8944-1.8944-2.816C4.8128 399.2832 3.1744 397.312 2.176 394.9056z"
+				   horiz-adv-x="1024"/>
 
-    
 
+			<glyph glyph-name="subtract" unicode="&#59134;"
+				   d="M853.333333 362.666667C865.115407 362.666667 874.666667 372.217925 874.666667 384 874.666667 395.782075 865.115407 405.333333 853.333333 405.333333L170.666667 405.333333C158.884592 405.333333 149.333333 395.782075 149.333333 384 149.333333 372.217925 158.884592 362.666667 170.666667 362.666667L853.333333 362.666667Z"
+				   horiz-adv-x="1024"/>
 
-  </font>
-</defs></svg>
+
+			<glyph glyph-name="dollar" unicode="&#59138;"
+				   d="M818.688 296.48c-16.128 29.952-38.912 55.04-67.072 73.984-29.696 19.968-62.208 34.56-96.768 43.52-54.016 13.568-93.184 15.36-130.56 16.64l0 327.424c27.136-1.024 52.992-4.864 77.056-11.008 29.184-7.424 54.528-19.712 75.52-36.096 20.736-16.384 37.12-37.376 49.152-62.72 11.776-25.344 17.92-57.344 17.92-94.72 0-14.08 11.52-25.6 25.6-25.6s25.6 11.52 25.6 25.6c0 44.8-7.68 83.968-22.784 116.48-15.36 32.768-36.864 59.904-63.744 81.152-26.624 20.992-58.624 36.096-94.72 45.568-28.16 7.168-58.112 11.52-89.6 12.8l0 48.384c0 14.08-11.264 25.6-25.344 25.6-14.336 0-25.6-11.52-25.6-25.6l0-48.384c-26.368-1.28-49.152-4.352-70.144-9.216-133.12-31.232-184.832-127.488-188.672-200.192-2.56-48.384 7.936-164.608 160.768-203.008 38.912-9.728 70.144-13.568 98.048-15.616l0-375.322c-28.416 2.304-55.296 7.168-80.384 14.848-34.816 10.752-65.536 27.136-91.392 48.896-25.344 21.248-45.824 47.872-60.416 79.104-14.848 31.232-22.784 68.352-23.552 110.592-0.512 14.08-12.032 25.6-26.112 24.832-14.08-0.256-25.344-12.032-25.088-26.112 1.024-49.152 10.752-93.44 28.416-131.072 17.92-37.888 42.752-70.4 73.984-96.512 30.976-26.112 67.84-45.824 109.056-58.624 29.952-8.96 61.952-14.848 95.488-17.152l0-68.838c0-14.336 11.264-25.6 25.6-25.6 14.08 0 25.344 11.264 25.344 25.344l0 68.07c31.488 0.512 64 4.096 96.768 9.984 38.912 7.168 74.752 19.968 106.752 37.888 32.512 18.688 60.16 43.52 81.664 74.24 22.272 31.744 33.792 72.192 33.792 120.064 0 44.8-8.448 70.17-24.576 100.378zM473.344 432.672c-24.832 2.048-51.968 5.632-85.504 14.08-106.24 26.624-125.184 96.512-122.112 150.528 1.024 19.968 13.056 121.088 149.248 153.088 17.408 4.096 36.352 6.656 58.368 7.68l0-325.376zM767.488 105.478c-16.896-24.32-38.912-44.288-65.024-59.136-26.88-15.104-57.344-26.112-90.624-32.256-29.696-5.376-59.136-8.448-87.552-9.216l0 374.554c35.328-1.024 69.888-2.816 118.016-15.104 28.672-7.168 55.808-19.456 80.64-36.096 21.504-14.336 38.4-33.28 50.688-56.064 12.288-22.528 18.432-39.706 18.432-75.802 0-37.376-8.192-67.84-24.576-90.88z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="raw" unicode="&#59140;"
+				   d="M539.151516 425.105692C580.924324 425.105692 614.787878 458.651575 614.787878 500.032521 614.787878 541.413466 580.924324 574.959349 539.151516 574.959349 497.378705 574.959349 463.515151 541.413466 463.515151 500.032521 463.515151 458.651575 497.378705 425.105692 539.151516 425.105692L539.151516 425.105692ZM539.151516 475.056911C525.227245 475.056911 513.939394 486.238871 513.939394 500.032521 513.939394 513.82617 525.227245 525.00813 539.151516 525.00813 553.075785 525.00813 564.363637 513.82617 564.363637 500.032521 564.363637 486.238871 553.075785 475.056911 539.151516 475.056911L539.151516 475.056911ZM435.304267 667.268777C247.753485 630.545261 110.545455 466.914193 110.545455 275.252032 110.545455 54.553658 291.151073-124.357724 513.939394-124.357724 736.727714-124.357724 917.333333 54.553658 917.333333 275.252032 917.333333 456.248009 790.466897 614.548177 614.578714 661.286675L601.514526 613.041069C755.689673 572.072343 866.90909 433.296058 866.90909 275.252032 866.90909 82.140956 708.879174-74.406505 513.939394-74.406505 318.999614-74.406505 160.969697 82.140956 160.969697 275.252032 160.969697 442.948851 281.04344 586.145971 445.081946 618.265649L435.304267 667.268777 435.304267 667.268777ZM362.666667 250.276422C418.363746 250.276422 463.515151 295.004269 463.515151 350.178861 463.515151 405.353455 418.363746 450.081301 362.666667 450.081301 306.969587 450.081301 261.818182 405.353455 261.818182 350.178861 261.818182 295.004269 306.969587 250.276422 362.666667 250.276422L362.666667 250.276422ZM362.666667 300.227642C334.818127 300.227642 312.242423 322.591565 312.242423 350.178861 312.242423 377.766159 334.818127 400.130082 362.666667 400.130082 390.515206 400.130082 413.09091 377.766159 413.09091 350.178861 413.09091 322.591565 390.515206 300.227642 362.666667 300.227642L362.666667 300.227642ZM118.336328 282.173594C133.425252 267.885431 161.465796 247.416053 201.858288 227.194989 268.590074 193.788094 346.276843 173.768557 434.022231 173.76855 514.003603 173.768546 572.571484 186.395546 639.028858 212.095699 648.371872 215.708796 677.180911 227.349506 679.666547 228.331507 693.997408 233.993197 704.553047 237.751541 714.596041 240.630003 734.812975 246.424461 752.32589 248.290967 771.083349 246.14595 784.915759 244.564139 797.423597 254.390018 799.020388 268.092668 800.61718 281.795317 790.698251 294.185822 776.865841 295.767633 751.016318 298.723669 726.88307 296.151571 700.581677 288.613225 688.670974 285.19945 676.714903 280.942481 660.987473 274.72905 658.174426 273.6177 629.605316 262.073935 620.692019 258.627017 559.708732 235.043782 507.184486 223.719765 434.022236 223.71977 354.560674 223.719776 284.56814 241.756542 224.601289 271.776813 203.727373 282.226598 185.640133 293.385054 170.445517 304.477005 161.566625 310.958528 155.775729 315.822603 153.178823 318.281692 143.113425 327.812924 127.15405 327.456439 117.53256 317.485463 107.911071 307.514487 108.27093 291.704826 118.336328 282.173594L118.336328 282.173594ZM465.243565 618.735196 465.243565 750.68968 465.243565 775.669175 440.027522 775.66529 367.813557 775.654164 393.0296 750.678554 393.0296 840.195086 367.817478 815.219476 653.550573 815.219476 628.338451 840.195088 628.338447 748.897745 654.251853 773.86369 589.647977 775.644502 563.734571 776.358808 563.734571 750.678556 563.734571 612.910739 614.158814 612.910739 614.158814 750.678556 588.245408 725.71261 652.849284 723.931798 678.762688 723.217492 678.76269 748.897743 678.762694 840.195085 678.762697 865.170696 653.550573 865.170696 367.817478 865.170696 342.605357 865.170696 342.605357 840.195086 342.605357 750.678554 342.605357 725.69906 367.821399 725.702945 440.035364 725.714071 414.819324 750.689681 414.819322 618.735198 465.243565 618.735196 465.243565 618.735196Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="office" unicode="&#59141;"
+				   d="M335.282306 712.495464C399.587328 713.451107 442.778899 696.882717 470.183494 669.370654 479.127332 660.39174 485.691302 650.857363 490.241971 641.442689 492.795622 636.159553 494.049041 632.438701 494.358795 631.074094L493.723712 636.740923 493.723706 196.900196C493.723706 199.018106 495.816045 203.920655 503.591595 207.364367 511.039185 210.662833 515.68422 209.165274 517.176538 207.906613L500.671543 188.33763 521.297207 203.501468C514.140179 213.236369 499.631258 225.714509 476.134074 237.35914 439.577969 255.475456 390.86048 266.105079 328.491925 266.105082 265.860796 266.105082 219.424582 255.71818 186.827162 237.741581 164.977332 225.691987 152.538132 212.281173 147.220271 201.30887L170.257196 190.143742 151.035786 207.052243C152.884078 209.153361 158.307299 211.803366 167.849005 208.050434 177.092077 204.414961 179.2 199.200117 179.2 196.664452L179.2 497.049743 179.2 636.740923 175.817447 624.023021C177.078908 626.226721 180.088681 630.807811 184.828724 636.965629 192.95423 647.521524 202.792594 658.127492 214.297641 668.007961 247.526453 696.544681 287.381649 713.209056 334.514421 712.495571L335.282306 712.495464ZM335.289387 763.689705C274.661039 764.607483 223.081402 743.04085 180.940156 706.850184 156.32698 685.712527 139.975514 664.470237 131.382553 649.458825L128 643.549699 128 636.740923 128 497.049743 128 196.664452C128 159.26105 164.542545 144.888183 189.478606 173.235241L191.776657 175.847642 193.294121 178.978613C194.07832 180.596644 199.156367 186.071334 211.552092 192.907243 236.030601 206.406481 274.024879 214.905082 328.491925 214.905082 383.221547 214.905079 424.163878 205.97191 453.399258 191.483569 469.376966 183.565406 477.614626 176.480753 480.045882 173.17379L481.844905 170.72678 484.166551 168.768644C511.279708 145.9007 544.923706 160.801293 544.923706 196.900196L544.923712 636.740922 544.288627 642.407751C540.427211 659.419023 529.175531 682.697124 506.45814 705.503602 468.987716 743.12097 412.352271 764.846461 334.521502 763.689812L335.289387 763.689705ZM0 506.026694 0 27.856868C0-8.875637 34.793167-23.400433 61.4635 1.248508L63.46242 3.315859C65.301149 5.444836 69.655573 9.862313 76.498228 15.820363 88.306297 26.101907 102.566352 36.46294 119.251411 46.174385 167.295691 74.138291 224.90855 90.950182 292.337329 90.950182 358.378978 90.95018 409.459345 71.669566 448.125308 39.64774 461.506042 28.566274 472.380655 16.734758 480.912593 4.997001 485.832384-1.771373 488.762874-6.741986 489.872527-9.022522 496.058545-21.735902 511.379537-27.027375 524.092917-20.841355 536.806298-14.655337 542.097771 0.665655 535.91175 13.379036 527.471002 30.726293 509.777717 55.067718 480.782336 79.0807 433.134118 118.541323 370.586889 142.15018 292.337329 142.150182 215.474895 142.150185 149.074727 122.774084 93.495781 90.424668 59.761154 70.789615 36.872315 50.859802 24.713677 36.781884L44.088049 20.04887 26.712598 38.849235C28.162783 40.189508 32.877261 41.946118 40.792576 38.641781 49.035365 35.200736 51.2 30.129892 51.2 27.856868L51.2 506.026694C51.2 520.165184 39.73849 531.626694 25.6 531.626694 11.46151 531.626694 0 520.165184 0 506.026694L0 506.026694ZM696.80221 763.689812C618.971441 764.846461 562.335996 743.12097 524.86557 705.503602 502.148181 682.697124 490.896501 659.419023 487.035083 642.407751L486.4 636.740922 486.400004 196.900196C486.400006 160.801293 520.044004 145.9007 547.157161 168.768644L549.478807 170.72678 551.27783 173.17379C553.709086 176.480753 561.946746 183.565406 577.924452 191.483569 607.159834 205.97191 648.102165 214.905079 702.831787 214.905082 757.298833 214.905082 795.293111 206.406481 819.77162 192.907243 832.167345 186.071334 837.245391 180.596644 838.029591 178.978613L839.547055 175.847642 841.845105 173.235241C866.781167 144.888183 903.323712 159.26105 903.323712 196.664452L903.323712 497.049743 903.323712 636.740923 903.323712 643.549699 899.941158 649.458825C891.348196 664.470237 874.996732 685.712527 850.383556 706.850184 808.24231 743.04085 756.662673 764.607483 696.034325 763.689705L696.80221 763.689812ZM696.809291 712.495571C743.942063 713.209056 783.797257 696.544681 817.026071 668.007961 828.531119 658.127492 838.369481 647.521524 846.494989 636.965629 851.235031 630.807811 854.244804 626.226721 855.506263 624.023021L852.123712 636.740923 852.123712 497.049743 852.123712 196.664452C852.123712 199.200117 854.231635 204.414961 863.474707 208.050434 873.016412 211.803366 878.439633 209.153361 880.287925 207.052243L861.066515 190.143742 884.103441 201.30887C878.785579 212.281173 866.346381 225.691987 844.49655 237.741581 811.89913 255.71818 765.462916 266.105082 702.831785 266.105082 640.463232 266.105079 591.745741 255.475456 555.189638 237.35914 531.692454 225.714509 517.183533 213.236369 510.026502 203.501468L530.652166 188.33763 514.147172 207.906613C515.63949 209.165274 520.284527 210.662833 527.732117 207.364367 535.507665 203.920655 537.600004 199.018106 537.600004 196.900196L537.6 636.740923 536.964917 631.074094C537.274671 632.438701 538.52809 636.159553 541.081741 641.442689 545.63241 650.857363 552.196378 660.39174 561.140218 669.370654 588.544813 696.882717 631.736384 713.451107 696.041406 712.495464L696.809291 712.495571ZM972.799998 506.026694 972.799998 27.856868C972.799998 30.129892 974.964631 35.200736 983.207422 38.641781 991.122737 41.946118 995.837214 40.189508 997.287401 38.849235L979.911949 20.04887 999.286321 36.781884C987.127682 50.859802 964.238844 70.789615 930.504218 90.424668 874.925269 122.774084 808.525103 142.150185 731.662669 142.150182 653.132708 142.15018 590.55104 117.262822 543.127755 75.738001 514.370099 50.557195 496.945662 25.102596 488.705389 7.022771 482.841769-5.842485 488.517717-21.025242 501.382974-26.888862 514.248233-32.752482 529.430987-27.076533 535.294607-14.211275 536.420563-11.740836 539.350332-6.450639 544.25735 0.717811 552.731727 13.097653 563.54464 25.561581 576.856734 37.217929 615.190044 70.783375 665.901421 90.95018 731.662669 90.950182 799.091447 90.950182 856.704307 74.138291 904.748587 46.174385 921.433645 36.46294 935.6937 26.101907 947.501771 15.820363 954.344425 9.862313 958.698848 5.444836 960.537577 3.315859L962.536497 1.248508C989.206831-23.400433 1023.999998-8.875637 1023.999998 27.856868L1023.999998 506.026694C1023.999998 520.165184 1012.538487 531.626694 998.399998 531.626694 984.261508 531.626694 972.799998 520.165184 972.799998 506.026694L972.799998 506.026694Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="agriculture" unicode="&#59143;"
+				   d="M693.837946 469.237826C757.656311 533.575377 781.490225 616.460832 737.526153 657.793278 693.562078 699.125726 609.307957 673.043814 545.489591 608.706263 481.671223 544.368715 457.837312 461.48326 501.801385 420.150812 545.765457 378.818364 630.019578 404.900277 693.837946 469.237826L693.837946 469.237826ZM657.808403 503.110692C610.655398 455.574082 554.662603 438.240815 536.594707 455.227191 518.526814 472.213568 534.366127 527.296787 581.519132 574.833399 628.672139 622.37001 684.664934 639.703277 702.732828 622.7169 720.800723 605.730524 704.96141 550.647302 657.808403 503.110692L657.808403 503.110692ZM720.133598 289.588704C783.951964 353.926255 807.785877 436.811708 763.821805 478.144156 719.85773 519.476604 635.60361 493.394692 571.785244 429.057141 507.966876 364.71959 484.132964 281.834138 528.097037 240.50169 572.061109 199.169242 656.31523 225.251153 720.133598 289.588704L720.133598 289.588704ZM684.104055 323.46157C636.951051 275.924958 580.958255 258.591691 562.890359 275.578067 544.822466 292.564446 560.661779 347.647665 607.814784 395.184275 654.967791 442.720887 710.960587 460.054155 729.02848 443.067778 747.096375 426.081402 731.257062 370.99818 684.104055 323.46157L684.104055 323.46157ZM650.472081 7.542067C674.792501 19.561993 698.775307 37.079213 720.133598 58.61126 783.951964 122.948811 807.785877 205.834266 763.821805 247.166711 719.85773 288.499159 635.60361 262.417248 571.785244 198.079697 507.966876 133.742148 484.132964 50.856693 528.097037 9.524245 538.046319 0.170513 553.900559 0.439927 563.508469 10.126003 573.11638 19.812077 572.839644 35.246891 562.890359 44.600625 544.822466 61.587002 560.661779 116.670221 607.814784 164.206833 654.967791 211.743443 710.960587 229.07671 729.02848 212.090334 747.096375 195.103957 731.257062 140.020736 684.104055 92.484126 666.535275 74.772416 647.033545 60.528207 627.799177 51.021971 615.466266 44.926654 610.543968 30.252117 616.804917 18.245474 623.065867 6.238829 638.13917 1.446752 650.472081 7.542067L650.472081 7.542067ZM318.562611 503.110692C271.409605 550.647302 255.570292 605.730524 273.638186 622.7169 291.706081 639.703277 347.698877 622.37001 394.851882 574.833399 442.004887 527.296787 457.844201 472.213568 439.776307 455.227191 421.708412 438.240815 365.715616 455.574082 318.562611 503.110692L318.562611 503.110692ZM282.533069 469.237826C346.351436 404.900277 430.605557 378.818364 474.56963 420.150812 518.533702 461.48326 494.699791 544.368715 430.881423 608.706263 367.063057 673.043814 282.808936 699.125726 238.844863 657.793278 194.88079 616.460832 218.714703 533.575377 282.533069 469.237826L282.533069 469.237826ZM435.158223 730.819048C435.158223 796.902713 463.068177 847.238095 488.185508 847.238095 513.302837 847.238095 541.212791 796.902713 541.212791 730.819048 541.212791 664.735381 513.302837 614.4 488.185508 614.4 463.068177 614.4 435.158223 664.735381 435.158223 730.819048L435.158223 730.819048ZM385.071267 730.819048C385.071267 641.379328 427.068254 565.638095 488.185508 565.638095 549.302761 565.638095 591.299748 641.379328 591.299748 730.819048 591.299748 820.258768 549.302761 896 488.185508 896 427.068254 896 385.071267 820.258768 385.071267 730.819048L385.071267 730.819048ZM344.858263 323.46157C297.705257 370.99818 281.865944 426.081402 299.933839 443.067778 318.001733 460.054155 373.994529 442.720887 421.147534 395.184275 468.30054 347.647665 484.139853 292.564446 466.071959 275.578067 448.004064 258.591691 392.011268 275.924958 344.858263 323.46157L344.858263 323.46157ZM308.828721 289.588704C372.647088 225.251153 456.90121 199.169242 500.865282 240.50169 544.829355 281.834138 520.995443 364.71959 457.177075 429.057141 393.358709 493.394692 309.104588 519.476604 265.140515 478.144156 221.176442 436.811708 245.010355 353.926255 308.828721 289.588704L308.828721 289.588704ZM344.858263 92.484126C297.705257 140.020736 281.865944 195.103957 299.933839 212.090334 318.001733 229.07671 373.994529 211.743443 421.147534 164.206833 468.30054 116.670221 484.139853 61.587002 466.071959 44.600625 448.004064 27.614249 392.011268 44.947516 344.858263 92.484126L344.858263 92.484126ZM308.828721 58.61126C372.647088-5.726289 456.90121-31.808203 500.865282 9.524245 544.829355 50.856693 520.995443 133.742148 457.177075 198.079697 393.358709 262.417248 309.104588 288.499159 265.140515 247.166711 221.176442 205.834266 245.010355 122.948811 308.828721 58.61126L308.828721 58.61126ZM526.376811-97.283714 526.376811 583.660666C526.376811 597.125892 515.164465 608.041617 501.333333 608.041617 487.502202 608.041617 476.289856 597.125892 476.289856 583.660666L476.289856-97.283714C476.289856-110.748943 487.502202-121.664668 501.333333-121.664668 515.164465-121.664668 526.376811-110.748943 526.376811-97.283714L526.376811-97.283714Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="machinery" unicode="&#59145;"
+				   d="M1013.342765 124.693549 1017.427407 381.521984 1017.739181 401.125171 998.944783 406.175375 911.908109 429.562812 930.393933 405.311712 930.393933 774.292909 930.393933 799.127884 905.756591 799.389556 551.467575 803.152429 531.226001 803.367413 526.884847 783.43819 455.019706 453.522076 479.340079 473.237709 378.060235 473.237709 360.478925 473.237709 354.595908 456.537916 213.530519 56.103492 201.730419 22.607209 236.994844 22.607204 404.799686 22.607187C418.551407 22.607185 429.699383 33.843959 429.699383 47.705222 429.699386 61.566487 418.551413 72.803264 404.799691 72.803264L236.994848 72.803283 260.459174 39.306995 401.524563 439.741421 378.060235 423.04163 479.340079 423.04163 499.365828 423.04163 503.660454 442.757263 575.525598 772.673376 550.942869 752.959137 905.231885 749.196263 880.594541 774.292909 880.594541 405.311712 880.594541 386.0279 899.080365 381.060614 986.117039 357.673175 967.634413 382.326566 963.549771 125.498131C963.329346 111.638647 974.297201 100.223204 988.047155 100.001026 1001.797111 99.778846 1013.122342 110.834065 1013.342765 124.693549L1013.342765 124.693549ZM488.656535-42.666667C550.539285-42.666667 600.705167 7.89882 600.705167 70.274509 600.705167 132.650199 550.539285 183.215686 488.656535 183.215686 426.773783 183.215686 376.607902 132.650199 376.607902 70.274509 376.607902 7.89882 426.773783-42.666667 488.656535-42.666667L488.656535-42.666667ZM488.656535 7.529412C454.277229 7.529412 426.407294 35.621348 426.407294 70.274509 426.407294 104.927671 454.277229 133.019607 488.656535 133.019607 523.03584 133.019607 550.905775 104.927671 550.905775 70.274509 550.905775 35.621348 523.03584 7.529412 488.656535 7.529412L488.656535 7.529412ZM787.452887-42.666667C849.335637-42.666667 899.501519 7.89882 899.501519 70.274509 899.501519 132.650199 849.335637 183.215686 787.452887 183.215686 725.570138 183.215686 675.404256 132.650199 675.404256 70.274509 675.404256 7.89882 725.570138-42.666667 787.452887-42.666667L787.452887-42.666667ZM787.452887 7.529412C753.073581 7.529412 725.203648 35.621348 725.203648 70.274509 725.203648 104.927671 753.073581 133.019607 787.452887 133.019607 821.832194 133.019607 849.702127 104.927671 849.702127 70.274509 849.702127 35.621348 821.832194 7.529412 787.452887 7.529412L787.452887 7.529412ZM363.387354 787.95634 107.605789 78.238133 135.181 94.411949 30.730849 112.304655C17.173521 114.627076 4.315319 105.431838 2.011251 91.766517-0.292817 78.101197 8.829753 65.14057 22.387081 62.818148L126.837231 44.925442 147.318927 41.416851 154.412442 61.099255 410.194007 770.817463C414.889376 783.845722 408.217698 798.243881 395.292397 802.976651 382.367098 807.709421 368.082722 800.984599 363.387354 787.95634L363.387354 787.95634ZM584.132527 428.947763 824.399761 428.947763 847.616186 428.947763 846.627697 452.3279 836.906871 682.249058 835.987266 704 814.390445 703.7177 626.06217 701.255987 607.834276 701.017724 604.481973 682.956451 562.263838 455.497007 557.336105 428.947763 584.132527 428.947763 584.132527 428.947763ZM584.132527 473.798428 606.001216 447.249184 648.219349 674.70863 626.639153 656.409094 814.967428 658.870806 792.450999 680.339447 802.171825 450.418291 824.399761 473.798428 584.132527 473.798428 584.132527 473.798428ZM282.679221 203.931403 189.300603 231.451499 175.325083 183.272591 268.703701 155.752495 282.679221 203.931403 282.679221 203.931403ZM591.36064 32.627452 714.137312 32.627452 714.137312 82.823529 591.36064 82.823529 591.36064 32.627452 591.36064 32.627452Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="assessedbadge" unicode="&#59146;"
+				   d="M704.533333 554.666667c0-4.266667-2.133333-8.533333-4.266667-12.8l-183.466667-341.333333c-8.533333-17.066667-27.733333-27.733333-49.066667-27.733333-17.066667 0-32 6.4-40.533333 19.2l-100.266667 115.2c-4.266667 4.266667-6.4 10.666667-6.4 17.066667 0 14.933333 12.8 27.733333 27.733333 27.733333 4.266667 0 8.533333-2.133333 12.8-4.266667l91.733333-49.066667 200.533333 273.066667c6.4 6.4 12.8 10.666667 23.466667 10.666667C691.733333 580.266667 704.533333 569.6 704.533333 554.666667zM512.533333 853.333333c21.333333 0 42.666667-8.533333 57.6-23.466667l89.6-89.6 125.866667 0c44.8 0 83.2-36.266667 83.2-83.2l0-125.866667 89.6-89.6c32-32 32-85.333333 0-117.333333l-89.6-89.6 0-125.866667c0-44.8-36.266667-83.2-83.2-83.2l-125.866667 0-89.6-89.6C555.2-76.8 533.866667-85.333333 512.533333-85.333333s-42.666667 8.533333-57.6 23.466667l-89.6 89.6-125.866667 0c-44.8 0-83.2 36.266667-83.2 83.2l0 125.866667-89.6 89.6c-32 32-32 85.333333 0 117.333333l89.6 89.6 0 125.866667C156.266667 704 192.533333 740.266667 239.466667 740.266667l125.866667 0 89.6 89.6C469.866667 844.8 491.2 853.333333 512.533333 853.333333M512.533333 896c-34.133333 0-66.133333-12.8-87.466667-36.266667l-76.8-76.8-108.8 0c-68.266667 0-125.866667-55.466667-125.866667-125.866667l0-108.8-76.8-76.8c-49.066667-49.066667-49.066667-128 0-177.066667l76.8-76.8 0-108.8c0-68.266667 55.466667-125.866667 125.866667-125.866667l108.8 0 76.8-76.8C448.533333-115.2 478.4-128 512.533333-128c34.133333 0 64 12.8 87.466667 36.266667l76.8 76.8 108.8 0c68.266667 0 125.866667 55.466667 125.866667 125.866667l0 108.8 76.8 76.8c49.066667 49.066667 49.066667 128 0 177.066667l-76.8 76.8 0 108.8c0 68.266667-55.466667 125.866667-125.866667 125.866667l-108.8 0-76.8 76.8C578.666667 883.2 546.666667 896 512.533333 896L512.533333 896z"
+				   horiz-adv-x="1026"/>
+
+
+			<glyph glyph-name="gerenzhongxin" unicode="&#59147;"
+				   d="M690.366 533.432c0 98.877-79.937 179.049-178.558 179.049-98.599 0-178.515-80.151-178.515-179.049 0-98.834 79.916-178.963 178.515-178.963 98.621 0 178.558 80.151 178.558 178.963M376.141 533.432c0 75.16 60.721 136.073 135.667 136.073 74.989 0 135.667-60.913 135.667-136.073 0-75.117-60.678-136.03-135.667-136.03-74.947 0.021-135.667 60.934-135.667 136.03M197.284 121.076l0-15.548 638.07 0 0 15.548c0 139.784-136.414 285.582-311.026 273.276-10.003-0.704-24.74-9.128-34.658-9.939-8.574-0.746 13.693-8.233 14.396-16.828 9.022 0.789 6.313-13.095 15.505-13.095 150.597 0 263.145-103.078 263.145-224.627l15.441 15.591-285.817 0.043-278.992-1.813 15.527-15.612c0 82.753 75.096 152.708 136.862 191.824 7.252 4.586 8.659 17.66 4.863 22.906-6.846 9.427-19.878 8.702-28.046 6.014-77.293-25.338-165.271-132.575-165.271-227.74M512.32 882.464c-282.767 0-512.021-228.892-512.021-511.211 0-282.468 229.255-511.254 512.021-511.254 117.432 0 228.828 39.606 318.811 111.204 10.792 8.489 12.541 24.229 3.988 34.999-8.617 10.771-24.357 12.541-35.127 3.946-81.174-64.539-181.587-100.242-287.651-100.242-255.211 0-462.028 206.562-462.028 461.367 0 254.763 206.818 461.303 462.028 461.303 255.211 0 462.092-206.562 462.092-461.303 0-87.381-24.335-171.093-69.615-243.651-7.273-11.645-3.668-27.087 8.041-34.359 11.709-7.273 27.108-3.626 34.402 7.977 50.185 80.407 77.143 173.247 77.143 270.055-0.021 282.276-229.297 511.168-512.085 511.168z"
+				   horiz-adv-x="1025"/>
+
+
+			<glyph glyph-name="jifen" unicode="&#59148;"
+				   d="M512.469 390.219c289.131 0 507.136 93.333 507.136 217.173s-218.005 217.216-507.136 217.216c-289.131 0-507.136-93.376-507.136-217.216s218.005-217.173 507.136-217.173M512.469 769.781c266.581 0 452.331-85.589 452.331-162.389 0-76.8-185.749-162.368-452.331-162.368-266.603 0-452.352 85.589-452.352 162.368 0.021 76.821 185.771 162.389 452.352 162.389M512.469 160.096c288.341 0 505.749 92.8 505.749 215.829 0 32.491-15.68 62.699-43.328 89.856-0.192 0.171-0.363 0.405-0.512 0.555-0.213 0.171-0.341 0.427-0.533 0.597l-0.128-0.149c-4.459 4.075-10.261 6.699-16.747 6.699-13.824 0-25.024-11.2-25.024-25.003 0-7.339 3.264-13.76 8.277-18.283l-0.085-0.128c16.661-16.747 26.091-37.248 26.091-54.165 0-77.504-186.347-163.797-453.739-163.797-267.392 0-453.739 86.293-453.739 163.797 0 19.285 5.419 35.819 26.709 54.635 0.256 0.213 0.512 0.448 0.768 0.683 0.171 0.149 0.277 0.277 0.448 0.448l-0.107 0.107c4.096 4.416 6.72 10.261 6.72 16.768 0 13.803-11.179 25.003-25.003 25.003-6.912 0-13.141-2.795-17.664-7.339l-0.149 0.171c-28.011-27.285-43.776-57.749-43.776-90.453 0-123.029 217.451-215.829 505.771-215.829M974.635 237.28c-0.171 0.213-0.341 0.427-0.491 0.576l-0.171-0.128c-4.416 4.075-10.261 6.699-16.747 6.699-13.824 0-25.024-11.157-25.024-24.96 0-7.339 3.264-13.781 8.299-18.325l-0.128-0.085c16.683-16.789 26.112-37.291 26.112-54.165 0-77.504-186.347-163.797-453.739-163.797-267.392 0-453.739 86.293-453.739 163.797 0 19.243 5.44 35.797 26.688 54.592 0.277 0.256 0.512 0.448 0.768 0.704 0.171 0.128 0.299 0.299 0.448 0.427l-0.085 0.064c4.075 4.459 6.72 10.283 6.72 16.832 0 13.781-11.2 24.96-24.981 24.96-6.891 0-13.141-2.795-17.685-7.339l-0.128 0.171c-28.011-27.243-43.755-57.707-43.755-90.411 0-123.051 217.429-215.872 505.749-215.872 288.341 0 505.749 92.843 505.749 215.872 0 32.448-15.68 62.699-43.307 89.792-0.192 0.213-0.363 0.384-0.555 0.597z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="operation" unicode="&#59150;"
+				   d="M548.906667 423.829333c-3.349333 3.029333-7.296 5.482667-11.584 7.232l-140.117333 87.36 88.597333-139.370667c1.770667-4.266667 4.266667-8.149333 7.296-11.477333l1.109333-1.792 0.32 0.32c7.210667-7.146667 17.130667-11.52 28.074667-11.477333 21.930667 0.064 39.594667 17.941333 39.488 39.829333-0.042667 10.965333-4.501333 20.864-11.712 27.989333l0.256 0.256L548.906667 423.829333zM521.088 699.2l-0.170667 0-12.501333-0.064 0.682667-151.68 0.106667 0c0.554667-13.76 11.861333-24.746667 25.770667-24.746667 14.250667 0 25.813333 11.562667 25.813333 25.792 0 0.533333-0.042667 1.045333-0.085333 1.578667l1.173333 95.488c129.088-17.984 217.344-117.141333 217.898667-251.285333 0.661333-147.136-110.144-256-257.301333-256.618667-147.157333-0.661333-254.656 109.482667-255.296 256.618667-0.341333 74.688 27.797333 141.312 77.077333 189.909333l-0.021333 0.021333c0.789333 0.618667 1.536 1.322667 2.24 2.090667 6.976 7.722667 3.84 20.266667-4.117333 27.456-7.232 6.528-24.277333 5.930667-31.402667 0.128l-0.021333 0.042667c-0.128-0.128-0.256-0.256-0.384-0.384-0.576-0.490667-1.130667-1.002667-1.642667-1.578667-0.042667-0.064-0.085333-0.128-0.128-0.170667-56.618667-55.658667-91.605333-133.184-91.242667-218.837333 0.768-168.426667 137.877333-304.32 306.304-303.573333 168.384 0.789333 304.298667 137.877333 303.552 306.282667C826.624 564.032 689.493333 699.946667 521.088 699.2zM511.978667 884.885333C235.370667 884.885333 11.093333 660.629333 11.093333 384.021333c0-276.778667 224.277333-500.885333 500.885333-500.885333 114.88 0 223.872 38.784 311.914667 108.885333 10.517333 8.362667 12.266667 23.765333 3.904 34.304-8.448 10.538667-23.786667 12.288-34.368 3.882667-79.424-63.296-177.664-98.282667-281.408-98.282667-249.642667 0-451.989333 202.410667-451.989333 452.096 0 249.6 202.325333 451.989333 451.989333 451.989333 249.685333 0 452.032-202.389333 452.032-451.989333 0-85.589333-23.786667-167.637333-68.074667-238.72-7.082667-11.413333-3.584-26.538667 7.850667-33.664 11.434667-7.168 26.474667-3.584 33.6 7.829333 49.152 78.741333 75.498667 169.706667 75.498667 264.554667C1012.906667 660.629333 788.672 884.885333 511.978667 884.885333z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="remind1" unicode="&#59155;"
+				   d="M538.566466-127.088677C536.442301-127.088677 534.296495-127.023404 532.085637-126.915658 453.644248-122.970174 421.998927-56.558642 416.233425-22.008283 414.28268-10.196423 422.259039 0.96717 434.050197 2.938793 445.754623 5.019952 456.938872-2.999774 458.976262-14.7477 459.474802-17.435546 471.374332-80.44435 534.296495-83.608784 596.069881-87.532361 611.155621-17.196806 611.740847-14.227299 614.038393-2.479817 625.504392 5.258245 637.208818 2.80914 648.95661 0.489687 656.586167-10.932765 654.245257-22.658784 646.962498-59.441417 613.474848-127.088677 538.566466-127.088677L538.566466-127.088677 538.566466-127.088677ZM57.238985 73.833077C57.304035 73.833077 57.412408 72.143111 58.582842 70.907383 60.663619 68.73949 66.819288 66.39858 77.851798 66.39858L950.850912 66.39858C961.710045 66.39858 966.283453 68.674665 967.063743 69.45482L966.110074 72.554425 966.131714 116.251154 967.367175 118.808453C967.540597 123.512631 965.524846 152.361377 900.998697 212.31394 808.577021 298.168097 751.355358 515.957417 751.355358 668.527121 751.355358 791.250196 551.079467 809.283624 549.042032 809.435184L472.724766 809.370357C472.464656 809.283624 272.167125 791.250196 272.167125 668.527121 272.167125 534.814813 227.365126 304.866254 127.704015 212.31394 61.573964 150.887353 57.195664 121.019712 56.935551 116.251154L57.434073 114.820498 57.195664 73.724883C57.217324 73.789709 57.217324 73.833077 57.238985 73.833077L57.238985 73.833077ZM77.851798 23.049233C54.507951 23.049233 36.929651 29.681668 25.63703 42.729706 15.753293 54.174063 13.239004 68.414463 14.084298 77.995393L14.084298 108.990124C11.439979 125.202593 16.07841 167.772233 98.204521 244.067814 178.878427 319.019473 228.817333 522.74186 228.817333 668.527121 228.817333 831.110081 461.085347 851.853262 470.969083 852.654877L480.023302 852.662278 480.023302 877.970885C480.023302 887.439933 487.691443 895.116113 497.162607 895.116113L519.306723 895.116113C528.7725 895.116113 536.446027 887.436396 536.446027 877.974239L536.446027 852.708401 550.819354 852.72015C562.480459 851.853262 794.705104 831.110081 794.705104 668.527121 794.705104 524.454177 849.282468 319.517967 930.498212 244.067814 1011.86574 168.48756 1013.989862 125.267868 1009.481507 107.79776L1009.481507 79.382235C1011.453889 69.389992 1010.478541 55.32306 1001.851903 43.618499 991.751467 29.984788 974.584928 23.049233 950.850912 23.049233L77.851798 23.049233Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="icondownload" unicode="&#59156;"
+				   d="M995.84-140l-967.68 0c-15.36 0-28.16 12.8-28.16 28.16l0 0c0 15.36 12.8 28.16 28.16 28.16l967.68 0c15.36 0 28.16-12.8 28.16-28.16l0 0c0-15.36-12.8-28.16-28.16-28.16zM926.72 507.68l0 0c-10.24 10.24-30.72 10.24-40.96 0l-348.16-345.6 0 693.76c0 15.36-10.24 28.16-25.6 28.16s-25.6-12.8-25.6-28.16l0-693.76-348.16 345.6c-10.24 10.24-30.72 10.24-40.96 0-10.24-10.24-10.24-28.16 0-40.96l394.24-394.24c2.56-2.56 2.56-2.56 5.12-2.56 0 0 2.56-2.56 2.56-2.56 7.68-2.56 15.36-2.56 23.04 0 2.56 0 2.56 2.56 2.56 2.56 2.56 0 5.12 2.56 5.12 2.56l394.24 394.24c12.8 12.8 12.8 30.72 2.56 40.96z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="map" unicode="&#59157;"
+				   d="M451.673935-98.395699C478.883834-129.019147 524.254807-128.808979 551.400292-97.928851 553.755808-95.387908 558.821323-89.796762 565.872444-81.84835 577.572838-68.659017 590.597131-53.62432 604.615947-36.998315 644.662065 10.495494 684.708678 61.282182 722.129538 113.353553 759.658524 165.575381 792.492213 216.290726 819.314991 264.541538 868.685946 353.353683 896 430.456574 896 493.714285 896 715.890551 719.301715 896 501.333333 896 283.364952 896 106.666667 715.890551 106.666667 493.714285 106.666667 430.401284 134.05152 353.19427 183.54613 264.237378 210.371803 216.023471 243.193308 165.348124 280.699364 113.166846 318.155192 61.05545 358.239268 10.22579 398.322835-37.311031 412.354743-53.952073 425.391185-69.00073 437.102468-82.202579 444.160087-90.158466 449.230214-95.754921 451.982775-98.736706L451.673935-98.395699ZM486.822684-65.321348C484.281231-62.568254 479.425084-57.207989 472.585916-49.498359 461.135889-36.591017 448.364015-21.847761 434.602351-5.527215 395.275714 41.111927 355.949587 90.980452 319.289224 141.985137 282.808749 192.739548 250.983685 241.876422 225.158316 288.292478 179.388826 370.554195 154.50505 440.709839 154.50505 493.714285 154.50505 688.960095 309.785362 847.238095 501.333333 847.238095 692.881306 847.238095 848.161617 688.960095 848.161617 493.714285 848.161617 440.753978 823.345286 370.701737 777.693969 288.580749 751.873483 242.132934 720.038415 192.960075 683.537446 142.168738 646.912604 91.205033 607.624538 41.380326 568.335977-5.215038 554.587654-21.520243 541.828177-36.24925 530.389289-49.143797 523.556841-56.845711 518.705521-62.200435 516.166694-64.950526 507.543772-74.748911 495.255793-74.80583 487.131524-65.662353L486.822684-65.321348ZM714.955981 428.971194C723.919106 453.372045 728.565658 479.331002 728.565658 505.904762 728.565658 627.091817 632.184774 725.333333 513.29293 725.333333 394.401086 725.333333 298.020202 627.091817 298.020202 505.904762 298.020202 384.717709 394.401086 286.47619 513.29293 286.47619 549.003859 286.47619 583.510052 295.368053 614.373097 312.125591 626.032316 318.456132 630.449257 333.22218 624.238611 345.106481 618.027966 356.990782 603.541579 361.492994 591.882359 355.162451 567.900883 342.141361 541.111735 335.238095 513.29293 335.238095 420.821495 335.238095 345.858586 411.648164 345.858586 505.904762 345.858586 600.161359 420.821495 676.571428 513.29293 676.571428 605.764365 676.571428 680.727273 600.161359 680.727273 505.904762 680.727273 485.192019 677.117041 465.022684 670.154965 446.069408 665.522846 433.459117 671.796821 419.408892 684.168282 414.687349 696.53974 409.965809 710.323861 416.360905 714.955981 428.971194L714.955981 428.971194Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="bad" unicode="&#59158;"
+				   d="M743.328 864.96c71.232 0 127.008-32.96 157.568-93.632 2.784-5.504 3.872-10.944 4.928-16.256 2.24-11.04 5.6-27.776 30.432-57.536 36.32-43.52 29.984-90.08 24.896-127.488-1.312-9.76-2.656-19.456-3.232-29.024-1.856-31.648 3.968-41.184 19.488-66.656 3.136-5.216 6.592-10.848 10.272-17.184 23.68-40.896 22.752-90.912-2.464-133.792-28.96-49.248-82.624-78.624-143.488-78.624-51.552 0-108.256 1.12-141.408 1.952 8.64-50.048 25.44-154.528 25.44-210.656 0-92.64-67.04-125.504-124.448-125.504-63.68 0-113.536 58.688-113.536 133.6 0 57.92 0 65.344-22.976 97.088-60.608 83.776-122.464 142.272-150.304 142.272L117.76 283.52c-49.056 0-88.992 39.392-88.992 87.776L28.768 777.152c0 48.416 39.904 87.808 88.992 87.808l133.888 0c12.896 0 23.392-10.368 23.392-23.104l0-512.224 39.424 0c62.176 0 144.704-101.28 188.416-161.632 31.68-43.744 31.68-63.968 31.68-123.904 0-48.192 29.92-87.424 66.784-87.424 23.296 0 77.632 7.712 77.632 79.328 0 69.824-29.344 228.704-29.664 230.304-1.28 6.848 0.64 13.92 5.28 19.2 4.608 5.28 10.688 8.288 18.464 8 0.864 0 90.72-2.656 168.672-2.656 44.032 0 82.528 20.832 103.008 55.648 16.768 28.48 17.632 61.28 2.304 87.712-3.456 6.016-6.72 11.392-9.792 16.32-16.704 27.456-28.736 47.264-26.048 93.12 0.608 10.752 2.08 21.6 3.552 32.512 4.672 34.368 8.704 64.064-14.624 92.032-32.352 38.784-37.28 63.296-40.192 77.92-0.416 1.984-0.672 3.712-1.408 5.568-15.392 30.624-47.872 67.136-115.168 67.136l-316.704 0c-12.896 0-23.392 10.336-23.392 23.072 0 12.768 10.496 23.104 23.392 23.104L743.328 864.992 743.328 864.96zM117.76 329.632l110.496 0L228.256 818.752 117.76 818.752c-23.232 0-42.176-18.656-42.176-41.632L75.584 371.2C75.552 348.288 94.496 329.632 117.76 329.632L117.76 329.632zM117.76 329.632"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="good" unicode="&#59159;"
+				   d="M743.328-89.536l-316.704 0c-12.896 0-23.392 10.368-23.392 23.104s10.496 23.072 23.392 23.072l316.704 0c67.296 0 99.808 36.512 115.168 67.136 0.768 1.856 1.024 3.552 1.408 5.568 2.912 14.624 7.84 39.168 40.192 77.92 23.328 27.968 19.328 57.664 14.624 92.032-1.472 10.912-2.944 21.76-3.552 32.512-2.688 45.856 9.344 65.664 26.048 93.12 3.04 4.928 6.304 10.304 9.792 16.32 15.328 26.432 14.464 59.232-2.304 87.712-20.48 34.816-59.008 55.648-103.008 55.648-77.952 0-167.808-2.656-168.672-2.656-7.776-0.288-13.888 2.72-18.464 8-4.64 5.28-6.528 12.352-5.28 19.2 0.32 1.6 29.664 160.48 29.664 230.304 0 71.616-54.336 79.328-77.632 79.328-36.832 0-66.784-39.2-66.784-87.424 0-59.936 0-80.16-31.68-123.904-43.712-60.352-126.24-161.632-188.416-161.632L275.04 445.824l0-512.224c0-12.768-10.496-23.104-23.392-23.104L117.76-89.504c-49.056 0-88.992 39.392-88.992 87.808L28.768 404.192c0 48.384 39.904 87.776 88.992 87.776l196.704 0c27.84 0 89.696 58.496 150.304 142.272 22.976 31.712 22.976 39.168 22.976 97.088 0 74.944 49.856 133.6 113.536 133.6 57.408 0 124.448-32.896 124.448-125.504 0-56.128-16.8-160.576-25.44-210.656 33.184 0.8 89.856 1.952 141.408 1.952 60.864 0 114.56-29.376 143.488-78.624 25.216-42.88 26.144-92.928 2.464-133.792-3.68-6.336-7.104-11.968-10.272-17.184-15.52-25.472-21.344-35.008-19.488-66.656 0.576-9.568 1.952-19.296 3.232-29.024 5.088-37.408 11.424-83.968-24.896-127.488-24.832-29.792-28.192-46.496-30.432-57.536-1.056-5.28-2.176-10.752-4.928-16.256C870.336-56.544 814.56-89.536 743.328-89.536L743.328-89.536zM117.76 445.792c-23.232 0-42.176-18.656-42.176-41.6l0-405.952c0-22.976 18.944-41.632 42.176-41.632l110.496 0L228.256 445.792 117.76 445.792 117.76 445.792zM117.76 445.792"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="skip" unicode="&#59160;"
+				   d="M1011.168 408.864c0 10.368-4.512 19.648-11.552 26.208L605.6 775.36c-6.272 5.344-14.272 8.672-23.104 8.672-19.776 0-35.744-15.968-35.744-35.712l0-150.624C245.568 549.056 33.504 327.648 12.832 43.456c0.992-12.064 10.848-21.632 23.136-21.632 4.736 0 9.184 1.44 12.896 3.872 0.064 0.064 0-0.192 0.064-0.192 52.032 36.928 96.992 64.48 132.096 83.008 63.968 35.2 154.464 65.28 258.368 84.544l0 0.16c14.848 0 26.88 12.288 26.88 27.488 0 15.168-12.032 27.488-26.88 27.488-3.456 0-6.752-0.672-9.792-1.888-166.4-32.608-275.936-85.664-361.92-147.2 55.488 204.096 191.808 387.584 512.16 447.936l0 0c14.144 2.304 24.992 14.912 24.992 30.144 0 0.384 0 0.8-0.032 1.184L604.8 578.4 604.8 693.248l331.84-284.544-328.192-280.864-2.432 0 0 138.592-0.064 0c-0.928 16-13.824 28.672-29.568 28.672-16.352 0-29.632-13.664-29.632-30.528 0 0 0 0 0 0 0 0 0 0 0 0l0-56.128 0-75.2 0-64.352c0-19.776 15.936-35.712 35.712-35.712 8.416 0 16 3.168 22.144 8.064L998.72 381.568c0 0.032-0.128 0.064-0.064 0.096C1006.304 388.192 1011.168 397.984 1011.168 408.864z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="iconfontplay2" unicode="&#59161;"
+				   d="M512 896C230.4 896 0 665.6 0 384c0-281.6 230.4-512 512-512 117.76 0 227.84 38.4 320 110.08 10.24 7.68 12.8 23.04 5.12 35.84-7.68 10.24-23.04 12.8-35.84 5.12C719.36-43.52 616.96-76.8 512-76.8 256-76.8 51.2 128 51.2 384 51.2 640 256 844.8 512 844.8 768 844.8 972.8 640 972.8 384c0-87.04-25.6-171.52-69.12-243.2-7.68-12.8-2.56-28.16 7.68-33.28 12.8-7.68 28.16-2.56 33.28 7.68 51.2 79.36 76.8 174.08 76.8 271.36C1024 665.6 793.6 896 512 896zM714.24 437.76c-17.92 15.36-245.76 222.72-245.76 222.72-10.24 10.24-25.6 7.68-35.84-2.56-5.12-5.12-7.68-12.8-7.68-17.92 0 0 0 0 0 0 0 0 0-499.2 0-512 0-15.36 10.24-25.6 25.6-25.6 5.12 0 12.8 2.56 15.36 7.68 2.56 2.56 217.6 186.88 240.64 207.36 23.04 20.48 33.28 38.4 33.28 64C742.4 404.48 732.16 422.4 714.24 437.76zM680.96 360.96c-7.68-5.12-204.8-176.64-204.8-176.64l0 399.36c0 0 186.88-166.4 202.24-181.76C696.32 384 698.88 376.32 680.96 360.96z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="iconfontstop" unicode="&#59162;"
+				   d="M512 896C230.4 896 0 665.6 0 384c0-281.6 230.4-512 512-512 117.76 0 227.84 38.4 320 110.08 10.24 7.68 12.8 23.04 5.12 35.84-7.68 10.24-23.04 12.8-35.84 5.12C719.36-43.52 616.96-76.8 512-76.8 256-76.8 51.2 128 51.2 384 51.2 640 256 844.8 512 844.8 768 844.8 972.8 640 972.8 384c0-87.04-25.6-171.52-69.12-243.2-7.68-12.8-2.56-28.16 7.68-33.28 12.8-7.68 28.16-2.56 33.28 7.68 51.2 79.36 76.8 174.08 76.8 271.36C1024 665.6 793.6 896 512 896zM686.08 588.8 337.92 588.8c-17.92 0-30.72-12.8-30.72-30.72l0-348.16c0-17.92 12.8-30.72 30.72-30.72l348.16 0c17.92 0 30.72 12.8 30.72 30.72L716.8 558.08C716.8 576 704 588.8 686.08 588.8zM665.6 238.08c0-5.12-2.56-7.68-7.68-7.68L366.08 230.4c-5.12 0-7.68 2.56-7.68 7.68L358.4 529.92c0 5.12 2.56 7.68 7.68 7.68l291.84 0c5.12 0 7.68-2.56 7.68-7.68L665.6 238.08z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="compass" unicode="&#59163;"
+				   d="M512-128c-281.6 0-512 230.4-512 512s230.4 512 512 512 512-230.4 512-512-230.4-512-512-512zM512 853.333c-258.133 0-469.333-211.2-469.333-469.333s211.2-469.333 469.333-469.333 469.333 211.2 469.333 469.333-211.2 469.333-469.333 469.333zM266.667 117.333c-6.4 0-10.667 2.133-14.933 6.4-6.4 6.4-8.533 14.933-4.267 23.467l138.667 352c2.133 6.4 6.4 10.667 12.8 12.8l352 138.667c8.533 2.133 17.067 2.133 23.467-4.267s8.533-14.933 4.267-23.467l-138.667-352c-4.267-10.667-17.067-17.067-27.733-12.8-10.667 4.267-17.067 17.067-12.8 27.733l121.6 307.2-296.533-117.333-117.333-296.533 217.6 85.333c10.667 4.267 23.467-2.133 27.733-12.8 4.267-10.667 0-23.467-12.8-27.733l-262.4-104.533c-6.4-2.133-8.533-2.133-10.667-2.133zM475.733 384c0-20.030 16.237-36.267 36.267-36.267s36.267 16.237 36.267 36.267c0 20.030-16.237 36.267-36.267 36.267-20.030 0-36.267-16.237-36.267-36.267z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="security" unicode="&#59164;"
+				   d="M516.267-128h-8.533c-253.867 0-458.667 204.8-458.667 458.667v445.867c0 12.8 8.533 21.333 21.333 21.333h106.667c87.467 0 174.933 21.333 253.867 59.733l72.533 36.267c6.4 2.133 12.8 2.133 19.2 0l72.533-36.267c78.933-38.4 166.4-59.733 253.867-59.733h106.667c12.8 0 21.333-8.533 21.333-21.333s-8.533-21.333-21.333-21.333h-106.667c-93.867 0-187.733 21.333-273.067 64l-64 32-61.867-32c-85.333-42.667-179.2-64-273.067-64h-85.333v-424.533c0-230.4 185.6-416 416-416h8.533c228.267 0 416 185.6 416 416v298.667l-405.333-390.4c-8.533-8.533-21.333-8.533-29.867 0l-200.533 200.533c-8.533 8.533-8.533 21.333 0 29.867s21.333 8.533 29.867 0l185.6-185.6 426.667 409.6c6.4 6.4 14.933 8.533 23.467 4.267 8.533-4.267 12.8-10.667 12.8-19.2v-347.733c-0-253.867-204.8-458.667-458.667-458.667z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="share" unicode="&#59165;"
+				   d="M697.15674 473.043478 847.731148 473.043478C884.876874 473.043478 915.087718 443.040212 915.087718 406.198172L915.087718-16.632955 915.087718-105.739129 937.543859-83.47826 847.939848-83.47826 218.726818-83.47826C181.707983-83.47826 151.578948-53.486546 151.578948-16.632955L151.578948 406.198172C151.578948 423.214204 151.578948 423.214204 151.578948 445.872892 151.578948 453.080344 151.578948 453.080344 151.578948 460.106191 151.578948 487.284387 151.578948 487.284387 151.578948 495.304348L129.122807 473.043478C137.296139 473.043478 137.296139 473.043478 164.865734 473.043478 171.618554 473.043478 171.618554 473.043478 178.53178 473.043478 201.762058 473.043478 201.762058 473.043478 218.906254 473.043478L354.437705 473.043478C366.839887 473.043478 376.893843 483.01001 376.893843 495.304348 376.893843 507.598686 366.839887 517.565219 354.437705 517.565219L218.906254 517.565219C201.762058 517.565219 201.762058 517.565219 178.53178 517.565219 171.618554 517.565219 171.618554 517.565219 164.865734 517.565219 137.296139 517.565219 137.296139 517.565219 129.122807 517.565219 116.720624 517.565219 106.666667 507.598686 106.666667 495.304348 106.666667 487.284387 106.666667 487.284387 106.666667 460.106191 106.666667 453.080344 106.666667 453.080344 106.666667 445.872892 106.666667 423.214204 106.666667 423.214204 106.666667 406.198172L106.666667-16.632955C106.666667-78.033806 156.86164-127.999999 218.726818-127.999999L847.939848-127.999999 937.543859-127.999999C949.946043-127.999999 960-118.033469 960-105.739129L960-16.632955 960 406.198172C960 467.61058 909.69975 517.565219 847.731148 517.565219L697.15674 517.565219C684.754556 517.565219 674.700599 507.598686 674.700599 495.304348 674.700599 483.01001 684.754556 473.043478 697.15674 473.043478L697.15674 473.043478ZM347.996815 613.235064 548.760439 836.672028 515.337485 836.545534 715.839402 616.801317C724.158863 607.683431 738.359462 606.977534 747.557327 615.224653 756.755193 623.47177 757.467283 637.548886 749.147821 646.666769L548.645903 866.410988 531.863345 884.80418 515.22295 866.284494 314.459326 642.847529C306.210339 633.666938 307.030836 619.595623 316.291958 611.418366 325.55308 603.24111 339.747827 604.054473 347.996815 613.235064L347.996815 613.235064ZM511.087716 817.583217 510.666677 113.757106C510.659322 101.46277 520.707315 91.49033 533.109495 91.483039 545.511678 91.475749 555.571595 101.436368 555.57895 113.730704L555.999989 817.556815C556.007345 829.851152 545.959351 839.823591 533.557171 839.830882 521.154989 839.838172 511.095072 829.877554 511.087716 817.583217L511.087716 817.583217Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="store" unicode="&#59170;"
+				   d="M957.866667 725.333333c-2.133333 59.733333-51.2 106.666667-110.933333 106.666667 0 0-2.133333 0-2.133333 0 0 0-2.133333 0-2.133333 0L83.2 832C78.933333 832 72.533333 829.866667 68.266667 825.6 66.133333 821.333333 61.866667 817.066667 61.866667 810.666667l0-761.6c0 0 0 0 0 0C64-12.8 113.066667-64 174.933333-64c0 0 2.133333 0 2.133333 0 0 0 2.133333 0 2.133333 0l362.666667 0c25.6 0 29.866667 10.666667 29.866667 21.333333L571.733333 341.333333l172.8 0 0-381.866667c0-6.4 4.266667-12.8 8.533333-17.066667 4.266667-4.266667 8.533333-6.4 14.933333-6.4l168.533333 0c10.666667 0 21.333333 8.533333 21.333333 21.333333 0 0 0 0 0 0 0 0 0 2.133333 0 2.133333L957.866667 723.2C957.866667 723.2 957.866667 723.2 957.866667 725.333333zM915.2 721.066667C915.2 718.933333 917.333333 718.933333 915.2 721.066667l0-134.4C915.2 541.866667 874.666667 512 829.866667 512c-44.8 0-83.2 29.866667-83.2 72.533333 0 0 0 0 0 2.133333l0 0L746.666667 789.333333l-42.666667 0 0-202.666667 0 0c0 0 0 0 0-2.133333-2.133333-44.8-42.666667-72.533333-87.466667-72.533333-44.8 0-83.2 29.866667-83.2 72.533333 0 0 0 0 0 2.133333l0 0L533.333333 789.333333l-42.666667 0 0-202.666667 0 0c0 0 0 0 0-2.133333-2.133333-44.8-42.666667-72.533333-87.466667-72.533333-44.8 0-81.066667 27.733333-83.2 72.533333L320 789.333333l-42.666667 0 0-204.8c-2.133333-44.8-42.666667-72.533333-87.466667-72.533333-46.933333 0-83.2 29.866667-83.2 74.666667L106.666667 789.333333l736 0c0 0 2.133333 0 2.133333 0 2.133333 0 2.133333 0 4.266667 0C883.2 789.333333 915.2 757.333333 915.2 721.066667zM104.533333 49.066667 104.533333 499.2C128 480 157.866667 469.333333 189.866667 469.333333c44.8 0 83.2 19.2 106.666667 51.2 23.466667-32 61.866667-51.2 106.666667-51.2 44.8 0 83.2 19.2 106.666667 51.2 23.466667-32 61.866667-51.2 106.666667-51.2 44.8 0 83.2 19.2 106.666667 51.2 23.466667-32 61.866667-51.2 106.666667-51.2 34.133333 0 64 10.666667 87.466667 29.866667L917.333333-21.333333l-128 0L789.333333 362.666667c0 12.8-8.533333 21.333333-21.333333 21.333333l-213.333333 0c-12.8 0-21.333333-8.533333-21.333333-21.333333 0 0 0 0 0 0 0 0 0 0 0 0L533.333333-21.333333 179.2-21.333333c0 0-2.133333 0-2.133333 0-2.133333 0-2.133333 0-2.133333 0C138.666667-21.333333 104.533333 10.666667 104.533333 49.066667z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="manageorder" unicode="&#59171;"
+				   d="M760.832 547.84 201.728 547.84c-12.288 0-23.552-10.24-23.552-23.552s10.24-23.552 23.552-23.552l559.104 0c12.288 0 23.552 10.24 23.552 23.552S773.12 547.84 760.832 547.84zM762.88 695.296 203.776 695.296c-12.288 0-23.552-10.24-23.552-23.552 0-12.288 10.24-23.552 23.552-23.552l559.104 0c12.288 0 23.552 10.24 23.552 23.552C788.48 683.008 775.168 695.296 762.88 695.296zM790.528-21.504l0 27.648c10.24 2.048 29.696 8.192 35.84 15.36 10.24 10.24 12.288 21.504 12.288 35.84s-4.096 27.648-12.288 33.792c-10.24 8.192-23.552 15.36-40.96 23.552-10.24 4.096-21.504 10.24-25.6 12.288-4.096 4.096-6.144 10.24-6.144 17.408 0 8.192 2.048 15.36 6.144 19.456 4.096 4.096 10.24 8.192 19.456 8.192s15.36-4.096 19.456-10.24c4.096-6.144 8.192-15.36 8.192-27.648l29.696 0c0 23.552-6.144 29.696-12.288 43.008-8.192 10.24-12.288 17.408-35.84 19.456l0 29.696-23.552 0 0-29.696c-10.24-2.048-25.6-8.192-31.744-15.36-8.192-10.24-10.24-21.504-10.24-33.792 0-15.36 6.144-27.648 12.288-35.84 10.24-8.192 23.552-15.36 43.008-23.552 10.24-4.096 19.456-8.192 25.6-12.288 4.096-4.096 8.192-10.24 8.192-17.408 0-8.192-2.048-15.36-8.192-19.456-6.144-4.096-12.288-8.192-23.552-8.192-10.24 0-17.408 6.144-23.552 10.24-6.144 6.144-10.24 6.144-10.24 29.696l-29.696 0c0-23.552 4.096-35.84 12.288-45.056 10.24-10.24 25.6-17.408 35.84-19.456l0-27.648L790.528-21.504 790.528-21.504zM984.064 269.312l-68.608 21.504c-4.096 2.048-8.192 0-10.24-2.048-2.048-2.048-6.144-6.144-6.144-10.24l0-51.2-45.056 0 0 72.704c0 6.144-2.048 10.24-8.192 10.24l-63.488 19.456c-2.048 0-4.096 0-6.144 0l-68.608-17.408c-6.144-2.048-8.192-6.144-8.192-10.24l0-72.704-45.056 0 0 51.2c0 4.096-2.048 8.192-4.096 10.24-2.048 2.048-6.144 2.048-10.24 2.048L570.368 271.36c-2.048-2.048-4.096-6.144-4.096-12.288L583.68-53.248c0-4.096 4.096-10.24 8.192-10.24l183.296-57.344c2.048 0 2.048 0 4.096 0 2.048 0 2.048 0 4.096 0l183.296 57.344c4.096 2.048 8.192 6.144 8.192 10.24l2.048 21.504 0 0c0 6.144-6.144 10.24-10.24 10.24-4.096 0-10.24-6.144-10.24-10.24l0 0 0-12.288-177.152-53.248-175.104 53.248-17.408 294.912 45.056 12.288 0-45.056c0-6.144 6.144-15.36 10.24-15.36l66.56 0c6.144 0 12.288 10.24 12.288 15.36l0 70.656 55.296 15.36 55.296-15.36 0-70.656c0-6.144 8.192-15.36 12.288-15.36l68.608 0c6.144 0 10.24 10.24 10.24 15.36l0 45.056 45.056-12.288-10.24-224.256 0 0c0-6.144 6.144-10.24 10.24-10.24 6.144 0 10.24 6.144 10.24 10.24l0 0L993.28 260.096C993.28 264.192 991.232 269.312 984.064 269.312L984.064 269.312 984.064 269.312zM773.12 889.856 54.272 889.856 30.72 889.856l0-23.552 0-836.608c0-76.8 59.392-138.24 136.192-138.24l325.632 0 0 0c12.288 1.024 21.504 11.264 21.504 23.552 0 12.288-9.216 22.528-21.504 23.552l0 0-4.096 0L164.864-61.44c-47.104 0-87.04 40.96-87.04 90.112L77.824 840.704l695.296 0c47.104 0 87.04-40.96 87.04-90.112l0-360.448 0 0c0-13.312 11.264-24.576 24.576-24.576 13.312 0 24.576 11.264 24.576 24.576L909.312 750.592C910.336 827.392 849.92 889.856 773.12 889.856z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="rejectedorder" unicode="&#59172;"
+				   d="M796.672-110.592c-108.544 0-196.608 87.04-196.608 196.608S688.128 281.6 796.672 281.6 993.28 194.56 993.28 86.016C991.232-23.552 903.168-110.592 796.672-110.592zM796.672 237.568c-84.992 0-153.6-68.608-153.6-153.6 0-84.992 68.608-153.6 153.6-153.6s153.6 68.608 153.6 153.6C948.224 168.96 880.64 237.568 796.672 237.568zM884.736 60.416c12.288 0 23.552 10.24 23.552 23.552 0 12.288-10.24 23.552-23.552 23.552L709.632 107.52c-12.288 0-23.552-10.24-23.552-23.552 0-12.288 10.24-23.552 23.552-23.552L884.736 60.416 884.736 60.416zM760.832 544.768 201.728 544.768c-12.288 0-23.552-10.24-23.552-23.552s10.24-23.552 23.552-23.552l559.104 0c12.288 0 23.552 10.24 23.552 23.552S773.12 544.768 760.832 544.768zM910.336 747.52C910.336 824.32 847.872 885.76 773.12 885.76L54.272 885.76 30.72 885.76l0-23.552L30.72 25.6c0-76.8 59.392-138.24 136.192-138.24l417.792 0 0 0c13.312 1.024 22.528 11.264 22.528 24.576 0 13.312-10.24 23.552-22.528 24.576l0 0-419.84 0c-47.104 0-87.04 40.96-87.04 90.112L77.824 836.608l695.296 0c47.104 0 87.04-40.96 87.04-90.112l0-406.528 0 0c0 0 0 0 0 0 0-13.312 11.264-24.576 24.576-24.576 13.312 0 24.576 11.264 24.576 24.576 0 0 0 0 0 0l0 0L909.312 747.52zM762.88 691.2 203.776 691.2c-12.288 0-23.552-10.24-23.552-23.552s10.24-23.552 23.552-23.552l559.104 0c12.288 0 23.552 10.24 23.552 23.552C788.48 680.96 778.24 691.2 762.88 691.2z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="phone" unicode="&#59173;"
+				   d="M942.08 157.696c-25.6 23.552-55.296 47.104-76.8 61.44-27.648 19.456-57.344 38.912-84.992 51.2-43.008 21.504-59.392 25.6-70.656 25.6-19.456 0-35.84-10.24-51.2-29.696-8.192-12.288-17.408-29.696-23.552-45.056-4.096-10.24-12.288-27.648-17.408-33.792-8.192 2.048-31.744 12.288-70.656 37.888-35.84 25.6-74.752 57.344-104.448 84.992-29.696 29.696-59.392 68.608-84.992 104.448-25.6 37.888-35.84 61.44-37.888 70.656 6.144 4.096 23.552 12.288 33.792 17.408 15.36 6.144 31.744 12.288 45.056 23.552 21.504 15.36 29.696 31.744 29.696 51.2 0 10.24-2.048 27.648-25.6 70.656-12.288 25.6-31.744 55.296-51.2 84.992-15.36 21.504-38.912 51.2-61.44 76.8-27.648 27.648-47.104 40.96-66.56 40.96-47.104 0-100.352-68.608-114.688-87.04-19.456-25.6-66.56-96.256-66.56-159.744 0-59.392 40.96-138.24 74.752-194.56 45.056-72.704 108.544-153.6 177.152-224.256l21.504-21.504 0 0c70.656-68.608 149.504-132.096 224.256-177.152 23.552-15.36 51.2-29.696 78.848-43.008l0 0c4.096-2.048 6.144-2.048 10.24-2.048 15.36 0 27.648 12.288 27.648 27.648 0 10.24-6.144 21.504-17.408 25.6-21.504 10.24-45.056 23.552-70.656 38.912-70.656 43.008-145.408 102.4-212.992 168.96l-21.504 21.504c-66.56 68.608-125.952 143.36-168.96 212.992-43.008 68.608-66.56 128-66.56 163.84 0 31.744 19.456 78.848 53.248 123.904 15.36 19.456 29.696 37.888 45.056 51.2 15.36 13.312 23.552 17.408 27.648 17.408 10.24-4.096 43.008-31.744 87.04-98.304 17.408-25.6 33.792-51.2 45.056-74.752 15.36-27.648 17.408-40.96 17.408-43.008 0 0-4.096-4.096-10.24-8.192-8.192-4.096-21.504-10.24-31.744-15.36-15.36-6.144-27.648-12.288-40.96-19.456-19.456-12.288-27.648-27.648-27.648-45.056 0-8.192 0-33.792 49.152-104.448 25.6-37.888 59.392-80.896 92.16-112.64l0 0c31.744-31.744 74.752-66.56 112.64-92.16 70.656-47.104 96.256-49.152 104.448-49.152l0 0c17.408 0 31.744 8.192 45.056 27.648 8.192 10.24 12.288 25.6 19.456 40.96 4.096 10.24 10.24 23.552 15.36 31.744 6.144 4.096 10.24 6.144 10.24 6.144 2.048 0 15.36-2.048 43.008-17.408 21.504-12.288 49.152-27.648 74.752-45.056 63.488-45.056 94.208-76.8 98.304-87.04-2.048-4.096-6.144-12.288-17.408-27.648-12.288-15.36-31.744-31.744-51.2-45.056-29.696-21.504-61.44-38.912-87.04-47.104l0 0c-10.24-4.096-17.408-15.36-17.408-25.6 0-15.36 12.288-27.648 27.648-27.648 2.048 0 4.096 0 6.144 2.048l0 0c2.048 0 2.048 0 4.096 2.048l0 0c45.056 15.36 82.944 40.96 102.4 55.296 21.504 15.36 87.04 70.656 87.04 115.712C982.016 110.592 969.728 130.048 942.08 157.696z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="bussinessman" unicode="&#59174;"
+				   d="M496.64-60.416l-106.496 100.352L429.056 261.12l130.048 0 29.696-222.208L496.64-60.416zM433.152 60.416l61.44-59.392 55.296 57.344-21.504 161.792-70.656 0L433.152 60.416zM642.048 329.728c92.16 51.2 153.6 147.456 153.6 260.096 0 163.84-132.096 296.96-293.888 296.96s-293.888-132.096-293.888-296.96 132.096-296.96 293.888-296.96c4.096 0 6.144 0 10.24 0l2.048 0c236.544 0 441.344-168.96 458.752-360.448L486.4-67.584 53.248-67.584c10.24 128 94.208 240.64 222.208 307.2 12.288 6.144 17.408 21.504 10.24 33.792s-21.504 17.408-33.792 10.24C96.256 207.872 0 65.536 0-93.184l0-25.6 25.6 0 460.8 0 512 0 25.6 0 0 25.6C1024 103.424 858.112 278.528 642.048 329.728zM256 589.824C256 723.968 364.544 833.536 499.712 833.536s243.712-108.544 243.712-242.688S633.856 347.136 499.712 347.136 256 455.68 256 589.824z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="shoes" unicode="&#59176;"
+				   d="M1041.842629-87.992148C1041.574671-85.125315 1041.096008-79.625377 1040.476664-71.855506 1039.439588-58.844997 1038.401431-44.287388 1037.432102-28.54711 1034.417649 20.402657 1032.726697 69.575299 1033.041608 115.301548 1033.595712 195.759898 1040.539249 256.167378 1053.710848 283.893783 1054.575258 285.71338 1055.494344 287.557215 1056.468567 289.426708 1069.325504 314.098634 1079.541729 327.317609 1129.130509 386.84043 1199.865997 471.746248 1228.799992 522.091223 1228.8 588.891889 1228.800015 729.568202 1151.172884 886.526058 1054.290068 886.526059 1027.320425 886.52606 1020.494518 878.254206 943.645847 773.439579 865.553546 666.92875 828.143122 618.054231 772.255767 553.380948 759.180938 538.250657 746.130808 523.601597 733.069425 509.418284 622.283628 389.116339 444.325788 253.933906 386.69782 235.822828 359.410447 227.247068 337.251346 220.754068 316.579446 215.13727 305.590316 212.151393 276.836124 204.712722 273.941709 203.937139 269.993324 202.879137 266.423439 201.891745 262.964977 200.896369 240.935593 194.556111 220.249322 186.875748 186.750361 172.350653 136.419494 150.52727 80.689269 114.672632 45.237294 78.749724-5.609663 27.227333-18.137835-28.294405 31.22404-69.446623L34.244045-71.964352 37.812642-73.614961C106.845435-105.545188 458.018816-105.296253 577.50006-75.486451 641.39968-59.543905 663.400584-26.66282 680.645786 47.528699 697.993516 122.161316 707.996403 148.510848 742.255811 187.643118 782.727985 233.871826 818.636375 261.278426 849.143867 274.313882 858.822139 278.44928 866.903613 280.657352 873.361915 281.480428 875.221893 281.717473 876.654451 281.799777 877.656689 281.789046 877.960827 281.781156 877.960827 281.781156 877.820946 281.789181 877.667264 281.801718 877.667264 281.801718 877.40151 281.829279 877.247534 281.846564 877.247534 281.846564 877.065308 281.868979 876.968865 281.881239 876.968865 281.881239 876.865183 281.894976 876.80801 281.902679 876.80801 281.902679 876.780124 281.906496L876.719086 281.914926C892.981158 279.608648 908.102239 290.973642 910.418924 307.309755 912.735608 323.645868 901.370614 338.766948 885.034499 341.083633L884.957614 341.094433C884.85922 341.107988 884.85922 341.107988 884.791631 341.117092 884.66145 341.134344 884.66145 341.134344 884.52341 341.151898 884.235377 341.187382 884.235377 341.187382 883.915494 341.22335 883.228065 341.295206 883.228065 341.295206 882.414625 341.362545 880.60042 341.483971 880.60042 341.483971 878.296463 341.535831 874.567969 341.575754 870.397914 341.336174 865.808159 340.751235 853.838666 339.225784 840.400965 335.55425 825.666742 329.258509 786.424266 312.490711 743.386163 279.64245 697.299825 227.001052 654.603279 178.23159 641.913705 144.804805 622.447107 61.056499 609.737966 6.379807 599.905884-8.314568 563.03614-17.513331 455.550428-44.330324 117.346311-44.570066 62.896093-19.384822L69.484695-23.55316C54.166367-10.782513 58.12056 6.741486 87.764912 36.779625 117.379371 66.787471 166.76305 98.558994 210.519721 117.531814 241.820793 131.103908 260.166646 137.915325 279.490796 143.476992 282.571448 144.36363 285.793469 145.254807 289.406692 146.223002 291.92748 146.898468 320.818563 154.372552 332.246262 157.477591 353.674109 163.299791 376.582413 170.012319 404.612009 178.821343 474.269619 200.713044 659.787564 341.638377 777.021791 468.942646 790.519375 483.599631 803.987213 498.717576 817.464632 514.313751 874.728174 580.579566 912.812252 630.334177 991.832087 738.110077 1020.894784 777.748963 1034.13195 795.357284 1046.128689 809.89531 1052.847462 818.037333 1058.146598 823.83724 1061.926211 827.262036 1062.091387 827.411708 1061.01237 826.775849 1054.290068 826.775849 1106.729395 826.775849 1169.049802 700.767357 1169.049789 588.891894 1169.049784 540.993943 1145.165757 499.435881 1083.22398 425.085407 1030.081779 361.297311 1019.223457 347.247519 1003.481403 317.039171 1002.171738 314.525978 1000.924938 312.024696 999.741002 309.532488 981.526835 271.191406 973.907036 204.900564 973.292815 115.713029 972.967386 68.459638 974.703086 17.985779 977.79487-32.219727 978.787156-48.332805 979.850726-63.246781 980.915377-76.603185 981.557071-84.65346 982.059213-90.423191 982.351718-93.552643 983.887206-109.980605 998.449459-122.05334 1014.87742-120.517852 1031.305382-118.982364 1043.378117-104.420109 1041.842629-87.992148L1041.842629-87.992148Z"
+				   horiz-adv-x="1229"/>
+
+
+			<glyph glyph-name="mobilephone" unicode="&#59178;"
+				   d="M849.52381-78.048781 296.519747-78.048781C254.7965-78.048781 220.952381-44.537079 220.952381-3.361596L220.952381 871.02439 195.809524 846.048781 748.813585 846.048781C790.518054 846.048781 824.380951 812.404644 824.380951 771.022703L824.380951 18.900533C824.380951 5.106884 835.637792-6.075076 849.52381-6.075076 863.409826-6.075076 874.666667 5.106884 874.666667 18.900533L874.666667 771.022703C874.666667 839.989784 818.292258 896 748.813585 896L195.809524 896 170.666667 896 170.666667 871.02439 170.666667-3.361596C170.666667-72.160181 227.060385-128 296.519747-128L849.52381-128C863.409826-128 874.666667-116.818039 874.666667-103.02439 874.666667-89.230741 863.409826-78.048781 849.52381-78.048781L849.52381-78.048781ZM325.488889 717.789903C325.488889 730.879395 336.197087 741.498103 349.448428 741.498103L686.773794 741.498103C699.931341 741.498103 710.733333 730.757486 710.733333 717.789903L710.733333 143.348309C710.733333 130.258816 700.025135 119.640109 686.773794 119.640109L349.448428 119.640109C336.290881 119.640109 325.488889 130.380725 325.488889 143.348309L325.488889 717.789903 325.488889 717.789903ZM277.333333 717.789903 277.333333 143.348309C277.333333 103.972503 309.684774 71.804879 349.448428 71.804879L686.773794 71.804879C726.60221 71.804879 758.88889 103.821732 758.88889 143.348309L758.88889 717.789903C758.88889 757.165708 726.537449 789.333333 686.773794 789.333333L349.448428 789.333333C309.620012 789.333333 277.333333 757.31648 277.333333 717.789903L277.333333 717.789903ZM522.666667-53.073171C550.438701-53.073171 572.952382-30.709248 572.952382-3.121952 572.952382 24.465346 550.438701 46.829269 522.666667 46.829269 494.894633 46.829269 472.380951 24.465346 472.380951-3.121952 472.380951-30.709248 494.894633-53.073171 522.666667-53.073171L522.666667-53.073171ZM522.666667-3.121952C522.666667-3.121952 522.666667-3.121952 522.666667-3.121952 522.666667-3.121952 522.666667-3.121952 522.666667-3.121952 522.666667-3.121952 522.666667-3.121952 522.666667-3.121952 522.666667-3.121952 522.666667-3.121952 522.666667-3.121952L522.666667-3.121952Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="emailfilling" unicode="&#59181;"
+				   d="M1024 652.942v50.601c0 59.106-47.946 107.124-107.090 107.124h-911.577v-750.482c0-59.384 47.946-107.342 107.090-107.342h911.577v644.856l-480.234-263.965c-9.007-4.939-20.043-4.297-28.417 1.652l-364.701 259.139c-12.069 8.575-14.901 25.311-6.325 37.379s25.311 14.901 37.379 6.325l350.35-249.979c0 0 6.715 3.685 10.072 5.528 149.712 82.165 466.313 250.872 481.876 259.164z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="favoritesfilling" unicode="&#59184;"
+				   d="M339.651042 554.902345 469.110756 837.171135C491.707678 887.465924 527.371795 887.119914 548.770042 836.39534L679.364582 554.902345M679.452297 555.525577 964.078942 524.640926C1018.894963 518.691921 1029.586705 484.666406 987.95719 448.64071L772.020879 229.261722M771.548333 232.4799 830.440373-49.270172C841.721615-103.241649 812.665359-123.924563 765.538658-95.465092L517.688802 49.127605M517.485225 49.546428 267.723625-93.528794C219.879795-120.935996 191.230298-99.693225 203.733911-46.078609L269.450995 235.711635M270.301116 235.289764 28.962399 448.64071C-12.667117 484.666406-1.975373 518.691921 52.840647 524.640926L338.533536 553.476117 336.275211 542.848343 338.788109 554.562993 679.762863 554.562993 771.253818 232.252529 517.557926 49.268806 270.278963 235.18649 270.301116 235.289764Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="accountfilling" unicode="&#59186;"
+				   d="M621.855287 308.356642C708.573965 355.889429 768 453.116346 768 565.333333 768 724.391341 648.609267 853.333333 501.333333 853.333333 354.057399 853.333333 234.666667 724.391341 234.666667 565.333333 234.666667 452.77667 294.453005 355.300962 381.59961 307.92637 125.9882 243.205617 21.333333 40.64141 21.333333-106.666667L486.175439-106.666667 1002.666667-106.666667C1002.666667 80.540593 839.953126 261.541474 621.855287 308.356642Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="creditlevel" unicode="&#59189;"
+				   d="M998.4 526.933l-200.533 275.2c-4.267 6.4-12.8 10.667-19.2 10.667h-535.467c0 0-14.933-2.133-23.467-17.067-25.6-42.667-187.733-283.733-187.733-283.733l-10.667-17.067 448-522.667c4.267-4.267 6.4-6.4 10.667-8.533 6.4-4.267 32-10.667 46.933 0 4.267 2.133 6.4 6.4 10.667 8.533l409.6 420.267c10.667 8.533 10.667 25.6 0 34.133-8.533 10.667-23.467 10.667-32 0l-354.133-364.8 153.6 422.4h251.733c2.133 0 19.2 0 23.467 4.267l2.133 2.133c12.8 6.4 14.933 21.333 6.4 36.267zM782.933 763.733l-96-226.133h-345.6l-85.333 226.133h526.933zM221.867 714.667l72.533-179.2h-192l119.467 179.2zM91.733 488.533h215.467l138.667-416-354.133 416zM503.467 44.8l-147.2 443.733h307.2l-160-443.733zM736 535.467l74.667 166.4 119.467-168.533-194.133-0z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="creditlevelfilling" unicode="&#59190;"
+				   d="M1002.667 512l-189.867 264.533-89.6-264.533zM362.667 469.333l149.333-433.067 147.2 433.067zM678.4 512l93.867 298.667h-520.533l96-298.667zM535.467-38.4l2.133-2.133 462.933 509.867h-292.267zM209.067 778.667l-187.733-266.667h279.467zM21.333 469.333l465.067-514.133v8.533l-170.667 505.6z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="exl" unicode="&#59199;"
+				   d="M905.185809 717.155842C898.576738 723.314515 891.19337 730.175588 883.21687 737.563873 860.422682 758.677137 837.434925 779.792209 815.697647 799.512105 813.243072 801.738123 813.243072 801.738123 810.786411 803.962919 781.783552 830.218938 757.590948 851.623498 739.713617 866.706388 729.254178 875.530889 721.020606 882.139314 714.970549 886.498273 710.955023 889.391389 707.690543 891.475255 704.47155 893.001286 700.417679 894.92311 696.638044 896.094029 691.307277 895.994072 677.045677 895.726651 665.6 884.230663 665.6 869.817273L665.6 818.647156 665.6 767.477039 665.6 665.136806 665.6 639.551748 691.2 639.551748 896 639.551748 870.4 665.136806 870.4-102.414942 896-76.829884 230.381436-76.829884C187.90385-76.829884 153.6-42.623723 153.6-0.20663L153.6 869.817273 128 844.232214 588.8 844.232214C602.93849 844.232214 614.4 855.687035 614.4 869.817273 614.4 883.94751 602.93849 895.402331 588.8 895.402331L128 895.402331 102.4 895.402331 102.4 869.817273 102.4-0.20663C102.4-70.91021 159.652833-128 230.381436-128L896-128 921.6-128 921.6-102.414942 921.6 665.136806 921.6 690.721865 896 690.721865 691.2 690.721865 716.8 665.136806 716.8 767.477039 716.8 818.647156 716.8 869.817273C716.8 856.186238 705.748075 845.08573 692.267725 844.832959 687.705707 844.747416 685.069822 845.564005 682.52845 846.768796 682.259458 846.896318 683.344977 846.203382 685.029451 844.989748 689.779394 841.567498 697.145822 835.65506 706.686383 827.605804 724.009052 812.990879 747.816448 791.927131 776.413589 766.038406 778.850014 763.831936 778.850014 763.831936 781.285216 761.623486 802.876774 742.035788 825.739479 721.03558 848.413564 700.033563 856.350957 692.6815 863.697005 685.855107 870.269888 679.730157 874.209847 676.058701 877.019309 673.434359 878.499674 672.048591 888.81866 662.389069 905.019017 662.918788 914.684179 673.231753 924.349344 683.544717 923.819315 699.735617 913.500326 709.395139 911.981323 710.817055 909.155025 713.457124 905.185809 717.155842ZM102.4 434.871281 0 434.871281 0-0.074709 512-0.074709 1024-0.074709 1024 434.871281 153.6 434.871281 153.6 435.468951 102.4 435.468951 102.4 434.871281ZM349.4 222.8 229.8 222.8 229.8 133.2 369.6 133.2 369.6 92.8 179.2 92.8 179.2 384 368.2 384 368.2 343.2 229.8 343.2 229.8 262.8 349.4 262.8 349.4 222.8ZM511 278.8 572.2 384 630.6 384 542.6 239.6 632.6 92.8 573.6 92.8 511 199.6 448.2 92.8 389.4 92.8 479.6 239.6 391.4 384 449.8 384 511 278.8ZM720.6 133.2 852.8 133.2 852.8 92.8 670 92.8 670 384 720.6 384 720.6 133.2Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="pdf" unicode="&#59200;"
+				   d="M905.185809 717.155842C898.576738 723.314515 891.19337 730.175588 883.21687 737.563873 860.422682 758.677137 837.434925 779.792209 815.697647 799.512105 813.243072 801.738123 813.243072 801.738123 810.786411 803.962919 781.783552 830.218938 757.590948 851.623498 739.713617 866.706388 729.254178 875.530889 721.020606 882.139314 714.970549 886.498273 710.955023 889.391389 707.690543 891.475255 704.47155 893.001286 700.417679 894.92311 696.638044 896.094029 691.307277 895.994072 677.045677 895.726651 665.6 884.230663 665.6 869.817273L665.6 818.647156 665.6 767.477039 665.6 665.136806 665.6 639.551748 691.2 639.551748 896 639.551748 870.4 665.136806 870.4-102.414942 896-76.829884 230.381436-76.829884C187.90385-76.829884 153.6-42.623723 153.6-0.20663L153.6 869.817273 128 844.232214 588.8 844.232214C602.93849 844.232214 614.4 855.687035 614.4 869.817273 614.4 883.94751 602.93849 895.402331 588.8 895.402331L128 895.402331 102.4 895.402331 102.4 869.817273 102.4-0.20663C102.4-70.91021 159.652833-128 230.381436-128L896-128 921.6-128 921.6-102.414942 921.6 665.136806 921.6 690.721865 896 690.721865 691.2 690.721865 716.8 665.136806 716.8 767.477039 716.8 818.647156 716.8 869.817273C716.8 856.186238 705.748075 845.08573 692.267725 844.832959 687.705707 844.747416 685.069822 845.564005 682.52845 846.768796 682.259458 846.896318 683.344977 846.203382 685.029451 844.989748 689.779394 841.567498 697.145822 835.65506 706.686383 827.605804 724.009052 812.990879 747.816448 791.927131 776.413589 766.038406 778.850014 763.831936 778.850014 763.831936 781.285216 761.623486 802.876774 742.035788 825.739479 721.03558 848.413564 700.033563 856.350957 692.6815 863.697005 685.855107 870.269888 679.730157 874.209847 676.058701 877.019309 673.434359 878.499674 672.048591 888.81866 662.389069 905.019017 662.918788 914.684179 673.231753 924.349344 683.544717 923.819315 699.735617 913.500326 709.395139 911.981323 710.817055 909.155025 713.457124 905.185809 717.155842ZM102.4 434.871281 0 434.871281 0-0.074709 512-0.074709 1024-0.074709 1024 434.871281 153.6 434.871281 153.6 435.468951 102.4 435.468951 102.4 434.871281ZM208.2 185 208.2 76.8 157.6 76.8 157.6 368 269 368C301.533495 368 327.366571 359.533419 346.5 342.6 365.633429 325.666581 375.2 303.266805 375.2 275.4 375.2 246.866524 365.833427 224.666746 347.1 208.8 328.366573 192.933254 302.133502 185 268.4 185L208.2 185ZM208.2 225.6 269 225.6C287.00009 225.6 300.733286 229.833291 310.2 238.3 319.666714 246.766709 324.4 258.999921 324.4 275 324.4 290.733412 319.600047 303.299953 310 312.7 300.399951 322.100047 287.200083 326.933331 270.4 327.2L208.2 327.2 208.2 225.6ZM419.4 76.8 419.4 368 505.4 368C531.133461 368 553.966566 362.266724 573.9 350.8 593.833434 339.333276 609.266611 323.066771 620.2 302 631.133389 280.933229 636.6 256.800137 636.6 229.6L636.6 215C636.6 187.399861 631.100055 163.133438 620.1 142.2 609.099945 121.266562 593.433436 105.133391 573.1 93.8 552.766564 82.466609 529.466799 76.8 503.2 76.8L419.4 76.8ZM470 327.2 470 117.2 503 117.2C529.533466 117.2 549.89993 125.499917 564.1 142.1 578.30007 158.700083 585.533331 182.533178 585.8 213.6L585.8 229.8C585.8 261.400158 578.933402 285.53325 565.2 302.2 551.466598 318.86675 531.533463 327.2 505.4 327.2L470 327.2ZM854.8 200.2 737.6 200.2 737.6 76.8 687 76.8 687 368 872 368 872 327.2 737.6 327.2 737.6 240.6 854.8 240.6 854.8 200.2Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="zip" unicode="&#59201;"
+				   d="M905.185809 717.155842C898.576738 723.314515 891.19337 730.175588 883.21687 737.563873 860.422682 758.677137 837.434925 779.792209 815.697647 799.512105 813.243072 801.738123 813.243072 801.738123 810.786411 803.962919 781.783552 830.218938 757.590948 851.623498 739.713617 866.706388 729.254178 875.530889 721.020606 882.139314 714.970549 886.498273 710.955023 889.391389 707.690543 891.475255 704.47155 893.001286 700.417679 894.92311 696.638044 896.094029 691.307277 895.994072 677.045677 895.726651 665.6 884.230663 665.6 869.817273L665.6 818.647156 665.6 767.477039 665.6 665.136806 665.6 639.551748 691.2 639.551748 896 639.551748 870.4 665.136806 870.4-102.414942 896-76.829884 230.381436-76.829884C187.90385-76.829884 153.6-42.623723 153.6-0.20663L153.6 869.817273 128 844.232214 588.8 844.232214C602.93849 844.232214 614.4 855.687035 614.4 869.817273 614.4 883.94751 602.93849 895.402331 588.8 895.402331L128 895.402331 102.4 895.402331 102.4 869.817273 102.4-0.20663C102.4-70.91021 159.652833-128 230.381436-128L896-128 921.6-128 921.6-102.414942 921.6 665.136806 921.6 690.721865 896 690.721865 691.2 690.721865 716.8 665.136806 716.8 767.477039 716.8 818.647156 716.8 869.817273C716.8 856.186238 705.748075 845.08573 692.267725 844.832959 687.705707 844.747416 685.069822 845.564005 682.52845 846.768796 682.259458 846.896318 683.344977 846.203382 685.029451 844.989748 689.779394 841.567498 697.145822 835.65506 706.686383 827.605804 724.009052 812.990879 747.816448 791.927131 776.413589 766.038406 778.850014 763.831936 778.850014 763.831936 781.285216 761.623486 802.876774 742.035788 825.739479 721.03558 848.413564 700.033563 856.350957 692.6815 863.697005 685.855107 870.269888 679.730157 874.209847 676.058701 877.019309 673.434359 878.499674 672.048591 888.81866 662.389069 905.019017 662.918788 914.684179 673.231753 924.349344 683.544717 923.819315 699.735617 913.500326 709.395139 911.981323 710.817055 909.155025 713.457124 905.185809 717.155842ZM102.4 434.871281 0 434.871281 0-0.074709 512-0.074709 1024-0.074709 1024 434.871281 153.6 434.871281 153.6 435.468951 102.4 435.468951 102.4 434.871281ZM282 117.2 437.6 117.2 437.6 76.8 220.8 76.8 220.8 109.6 371.4 327.2 221.8 327.2 221.8 368 432.8 368 432.8 336 282 117.2ZM534.4 76.8 484 76.8 484 368 534.4 368 534.4 76.8ZM647.2 185 647.2 76.8 596.6 76.8 596.6 368 708 368C740.533495 368 766.366571 359.533419 785.5 342.6 804.633429 325.666581 814.2 303.266805 814.2 275.4 814.2 246.866524 804.833427 224.666746 786.1 208.8 767.366573 192.933254 741.133502 185 707.4 185L647.2 185ZM647.2 225.6 708 225.6C726.00009 225.6 739.733286 229.833291 749.2 238.3 758.666714 246.766709 763.4 258.999921 763.4 275 763.4 290.733412 758.600047 303.299953 749 312.7 739.399951 322.100047 726.200083 326.933331 709.4 327.2L647.2 327.2 647.2 225.6Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="sorting" unicode="&#59203;"
+				   d="M280.862942 621.429449 457.233498 796.225268C456.884459 795.879345 455.897694 795.182702 453.852297 794.365418 448.964578 792.412422 442.709018 792.147726 436.383616 794.803489 430.07642 797.45161 425.906586 802.073236 423.887388 806.883244 423.062084 808.849229 422.879851 809.947784 422.879851 810.320201L422.879851-60.425024C422.879851-77.127021 436.419497-90.666667 453.121495-90.666667 469.823492-90.666667 483.363138-77.127021 483.363138-60.425024L483.363138 810.320201C483.363138 850.792697 443.329783 867.600977 414.657568 839.184764L238.287012 664.388945C226.424075 652.631927 226.33821 633.484171 238.09523 621.621233 249.852247 609.758295 269.000004 609.672431 280.862942 621.429449L280.862942 621.429449Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="copy" unicode="&#59204;"
+				   d="M746.932 197.892M925.731 607.302c-1.261 1.18-3.607 3.272-6.902 6.343-5.486 5.112-11.615 10.758-18.236 16.891-18.921 17.526-38.003 35.028-56.046 51.397-2.038 1.848-2.038 1.835-4.077 3.682-24.075 21.795-44.156 39.556-58.996 52.076-8.682 7.325-15.517 12.807-20.539 16.426-3.333 2.402-6.043 4.13-8.715 5.396-3.365 1.595-6.48 2.566-10.905 2.483C729.478 761.773 720 752.23 720 740.266l0-42.475 0-42.475 0-84.95L720 549l21.205 0L890 549l0-595L358.689-46C323.429-46 295-17.132 295 18.078L295 719l361.205 0c11.736 0 21.25 9.771 21.25 21.5s-9.514 21.5-21.25 21.5l-382.5 0L252 762l0-21.734L252 83l-52.421 0C166.646 83 140 109.072 140 141.322L140 824l566.286 0C739.29 824 766 797.846 766 765.596L766 762l40 0 0 3.596C806 819.404 761.271 863 706.286 863L119.958 863 100 863l0-19.506 0-702.172C100 87.537 144.642 44 199.579 44L252 44l0-25.922C252-40.612 299.979-88 358.689-88l552.515 0L932-88l0 21.237L932 570.365 932 592l0.433 0C932.432 597 930.196 603.122 925.731 607.302zM762 592l0 63.315L762 697.79l0 0.273c14-11.479 30.3-26.369 49.711-43.942 2.022-1.832 2.136-1.832 4.157-3.665 17.923-16.259 36.957-33.492 55.779-50.926 2.878-2.666 5.713-5.531 8.391-7.531L762 591.999zM816.936 460 407.295 460c-10.996 0-19.91-8.727-19.91-19.5 0-10.77 8.914-19.5 19.91-19.5l409.641 0c11 0 19.914 8.73 19.914 19.5C836.85 451.273 827.936 460 816.936 460zM816.936 343 407.295 343c-10.996 0-19.91-8.727-19.91-19.5 0-10.774 8.914-19.5 19.91-19.5l409.641 0c11 0 19.914 8.726 19.914 19.5C836.85 334.273 827.936 343 816.936 343zM816.936 207 407.295 207c-10.996 0-19.91-8.729-19.91-19.503 0-10.769 8.914-19.497 19.91-19.497l409.641 0c11 0 19.914 8.729 19.914 19.497C836.85 198.271 827.936 207 816.936 207z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="save" unicode="&#59207;"
+				   d="M665.6 563.2 665.6 768C665.6 782.13849 654.13849 793.6 640 793.6 625.86151 793.6 614.4 782.13849 614.4 768L614.4 563.2C614.4 549.06151 625.86151 537.6 640 537.6 654.13849 537.6 665.6 549.06151 665.6 563.2L665.6 563.2ZM640 844.8 819.2 844.8 793.6 870.4 793.6 511.866455C793.6 469.593301 759.102946 435.2 716.727898 435.2L281.672102 435.2C239.236715 435.2 204.8 469.586562 204.8 511.866455L204.8 870.4C204.8 884.53849 193.33849 896 179.2 896 165.06151 896 153.6 884.53849 153.6 870.4L153.6 511.866455C153.6 441.292866 210.976425 384 281.672102 384L716.727898 384C787.345461 384 844.8 441.281743 844.8 511.866455L844.8 870.4 844.8 896 819.2 896 640 896C625.86151 896 614.4 884.53849 614.4 870.4 614.4 856.26151 625.86151 844.8 640 844.8L640 844.8ZM844.8-76.8 128.081132-76.8C85.544157-76.8 51.2-42.575806 51.2-0.163853L51.2 795.288936 51.2 870.4 25.6 844.8 102.4 844.8 896.233363 844.8C938.580175 844.8 972.8 810.585915 972.8 768.131999L972.8-102.4C972.8-116.53849 984.26151-128 998.4-128 1012.53849-128 1024-116.53849 1024-102.4L1024 768.131999C1024 838.864818 966.85523 896 896.233363 896L102.4 896 25.6 896 0 896 0 870.4 0 795.288936 0-0.163853C0-70.892966 57.307204-128 128.081132-128L844.8-128C858.93849-128 870.4-116.53849 870.4-102.4 870.4-88.26151 858.93849-76.8 844.8-76.8L844.8-76.8Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="inquirytemplate" unicode="&#59209;"
+				   d="M393.383795-78.048781 159.97786-78.048781C111.196085-78.048781 71.284553-36.770882 71.284553 14.514131L71.284553 871.02439 46.308943 846.048781 781.65338 846.048781C830.474699 846.048781 870.504064 804.596502 870.504064 753.256711L870.504064 405.866675C870.504064 392.073028 881.686027 380.891066 895.479676 380.891066 909.273323 380.891066 920.455285 392.073028 920.455285 405.866675L920.455285 753.256711C920.455285 831.800933 858.459947 896 781.65338 896L46.308943 896 21.333333 896 21.333333 871.02439 21.333333 14.514131C21.333333-63.988932 83.22553-128 159.97786-128L393.383795-128C407.177444-128 418.359405-116.818039 418.359405-103.02439 418.359405-89.230741 407.177444-78.048781 393.383795-78.048781L393.383795-78.048781ZM197.162104 521.365854 768.260691 521.365854C782.05434 521.365854 793.236301 532.547814 793.236301 546.341463 793.236301 560.135113 782.05434 571.317073 768.260691 571.317073L197.162104 571.317073C183.368455 571.317073 172.186494 560.135113 172.186494 546.341463 172.186494 532.547814 183.368455 521.365854 197.162104 521.365854L197.162104 521.365854ZM199.955658 671.219511 771.054246 671.219511C784.847893 671.219511 796.029856 682.401474 796.029856 696.195122 796.029856 709.98877 784.847893 721.170732 771.054246 721.170732L199.955658 721.170732C186.16201 721.170732 174.980048 709.98877 174.980048 696.195122 174.980048 682.401474 186.16201 671.219511 199.955658 671.219511L199.955658 671.219511ZM970.406505 97.541065 970.406505-103.02439 995.382114-78.048781 565.935198-78.048781C551.735753-78.048781 540.46042-67.003313 540.46042-53.570613L540.46042 292.185154 515.484811 267.209545 944.931725 267.209545C959.111287 267.209545 970.406505 256.155934 970.406505 242.831898L970.406505 211.767945C970.406505 197.974295 981.588465 186.792335 995.382114 186.792335 1009.175763 186.792335 1020.357724 197.974295 1020.357724 211.767945L1020.357724 242.831898C1020.357724 283.987859 986.459738 317.160764 944.931725 317.160764L515.484811 317.160764 490.509199 317.160764 490.509199 292.185154 490.509199-53.570613C490.509199-94.823518 524.376117-128 565.935198-128L995.382114-128 1020.357724-128 1020.357724-103.02439 1020.357724 97.541065C1020.357724 111.334711 1009.175763 122.516674 995.382114 122.516674 981.588465 122.516674 970.406505 111.334711 970.406505 97.541065L970.406505 97.541065ZM613.935418 184.316666 768.879164 74.221005C776.680484 68.677758 786.96339 68.079804 795.354639 72.681449L1001.262532 185.59846C1013.356979 192.230886 1017.784823 207.412017 1011.152397 219.506464 1004.51997 231.600913 989.338839 236.028755 977.244393 229.396329L771.336499 116.479317 797.811974 114.939759 642.868228 225.03542C631.624053 233.024994 616.032021 230.386622 608.042447 219.142447 600.05287 207.898274 602.691245 192.306242 613.935418 184.316666L613.935418 184.316666Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="templatedefault" unicode="&#59210;"
+				   d="M468.310626-78.048781 159.97786-78.048781C111.196085-78.048781 71.284553-36.770882 71.284553 14.514131L71.284553 871.02439 46.308943 846.048781 781.65338 846.048781C830.474699 846.048781 870.504064 804.596502 870.504064 753.256711L870.504064 405.866675C870.504064 392.073028 881.686027 380.891066 895.479676 380.891066 909.273323 380.891066 920.455285 392.073028 920.455285 405.866675L920.455285 753.256711C920.455285 831.800933 858.459947 896 781.65338 896L46.308943 896 21.333333 896 21.333333 871.02439 21.333333 14.514131C21.333333-63.988932 83.22553-128 159.97786-128L468.310626-128C482.104273-128 493.286236-116.818039 493.286236-103.02439 493.286236-89.230741 482.104273-78.048781 468.310626-78.048781L468.310626-78.048781ZM197.162104 521.365854 768.260691 521.365854C782.05434 521.365854 793.236301 532.547814 793.236301 546.341463 793.236301 560.135113 782.05434 571.317073 768.260691 571.317073L197.162104 571.317073C183.368455 571.317073 172.186494 560.135113 172.186494 546.341463 172.186494 532.547814 183.368455 521.365854 197.162104 521.365854L197.162104 521.365854ZM199.955658 671.219511 771.054246 671.219511C784.847893 671.219511 796.029856 682.401474 796.029856 696.195122 796.029856 709.98877 784.847893 721.170732 771.054246 721.170732L199.955658 721.170732C186.16201 721.170732 174.980048 709.98877 174.980048 696.195122 174.980048 682.401474 186.16201 671.219511 199.955658 671.219511L199.955658 671.219511ZM770.601626-128C908.53811-128 1020.357724-16.180386 1020.357724 121.756098 1020.357724 259.692582 908.53811 371.512194 770.601626 371.512194 632.665141 371.512194 520.845527 259.692582 520.845527 121.756098 520.845527-16.180386 632.665141-128 770.601626-128L770.601626-128ZM770.601626-78.048781C660.252439-78.048781 570.796749 11.40691 570.796749 121.756098 570.796749 232.105284 660.252439 321.560975 770.601626 321.560975 880.950814 321.560975 970.406505 232.105284 970.406505 121.756098 970.406505 11.40691 880.950814-78.048781 770.601626-78.048781L770.601626-78.048781ZM628.063155 104.095674 698.708245 33.450583C718.235857 13.922972 749.784966 13.89241 769.3688 33.476243L914.030005 178.137449C923.783586 187.891031 923.783586 203.704713 914.030005 213.458295 904.276422 223.211876 888.462741 223.211876 878.709158 213.458295L734.047953 68.79709C733.98662 68.735757 734.064841 68.73568 734.029092 68.771428L663.384 139.416521C653.630417 149.170103 637.816736 149.170103 628.063155 139.416521 618.309572 129.662938 618.309572 113.849257 628.063155 104.095674L628.063155 104.095674Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="libra" unicode="&#59212;"
+				   d="M588.1088 405.6576c12.81024-109.23008 105.63072-193.9968 218.30144-193.9968s205.4912 84.76672 218.30144 193.9968c0 0-0.35328 0-0.3584 0 0.52224 4.92032-0.37376 10.04032-2.87744 14.73024l-189.68064 355.2256c-1.65376 6.85568-6.02112 13.02528-12.73344 16.60928-2.29888 1.2288-4.70528 1.9456-7.13728 2.42176-0.2048 0.04608-0.41472 0.0768-0.61952 0.11776-1.17248 0.19968-2.33472 0.3328-3.5072 0.36864-0.3584 0.01536-0.6912 0.11264-1.0496 0.11264l-269.2864 0 0 38.63552c0 17.3312-11.46368 31.38048-25.6 31.38048s-25.6-14.04928-25.6-31.38048l0-38.63552L216.97024 795.24352c-0.35328 0-0.68096-0.09216-1.02912-0.10752-0.31232-0.0256-0.62464-0.06144-0.93696-0.09728-5.10464-0.43008-9.72288-2.46784-13.4656-5.67296-0.04096-0.03584-0.0768-0.06656-0.11776-0.1024-0.9984-0.86528-1.92512-1.792-2.78016-2.816-0.50176-0.57344-0.95744-1.16736-1.40288-1.77664-0.31232-0.45056-0.61952-0.90112-0.90624-1.37216-1.5104-2.3808-2.6112-4.95616-3.27168-7.67488L3.3792 420.38272c-2.24256-4.20352-3.09248-8.74496-2.8928-13.184C0.4608 406.6816 0.3584 406.18496 0.3584 405.6576l-0.35328 0c12.81024-109.23008 105.63072-193.9968 218.30144-193.9968s205.4912 84.76672 218.30144 193.9968c0 0-0.35328 0-0.3584 0 0.52224 4.92032-0.37376 10.04032-2.87744 14.73024L260.54656 744.04352l225.7152 0 0-790.45632L216.97024-46.4128c-13.51168 0-24.46848-11.46368-24.46848-25.6s10.9568-25.6 24.46848-25.6l589.78304 0c13.51168 0 24.46848 11.46368 24.46848 25.6 0 14.14144-10.9568 25.6-24.4736 25.6l-269.2864 0L537.46176 744.04352l226.85184 0-172.8256-323.65568c-2.24256-4.20352-3.0976-8.74496-2.89792-13.184-0.0256-0.52224-0.128-1.01888-0.128-1.54624L588.1088 405.6576zM218.30656 262.8608c-75.19744 0-138.85952 49.22368-160.62464 117.1968l265.5488 0c11.60704 0 21.02272 11.46368 21.02272 25.6 0 14.14144-9.41056 25.6-21.02272 25.6l-256 0 151.1424 283.0592 166.17472-311.1936C371.04128 323.50208 301.7728 262.8608 218.30656 262.8608zM806.41024 262.8608c-75.19744 0-138.85952 49.22368-160.62464 117.1968l267.8016 0c11.68896 0 21.16608 11.46368 21.16608 25.6 0 14.14144-9.47712 25.6-21.16608 25.6l-258.25792 0 151.14752 283.0592 166.1696-311.19872C959.14496 323.50208 889.87648 262.8608 806.41024 262.8608z"
+				   horiz-adv-x="1025"/>
+
+
+			<glyph glyph-name="survey1" unicode="&#59214;"
+				   d="M731.499531 848.985442C770.629127 848.985442 802.392705 817.381582 802.392705 778.454495L802.392744 449.361689 412.872048 49.737935 423.917326 49.737961 139.970966 49.737961C100.8091 49.737961 69.096657 81.198607 69.096657 120.028925L69.096655 848.985442 45.441945 848.985442 731.499531 848.985442ZM21.787234 896 21.787234 872.492721 21.787234 120.028925C21.787234 55.215071 74.69902 2.723404 139.970966 2.723404L423.917326 2.723404 433.836385 2.723404 440.788839 9.753992 842.918932 416.403306 849.702128 423.262735 849.702128 432.879997 849.702128 778.454495C849.702128 843.334267 796.770234 896 731.499531 896L45.441945 896 21.787234 896ZM778.22803 259.579159 866.898308 170.908881 885.125447 151.422353 982.593479 249.625519 855.512968 377.439622 759.89601 277.174004 778.22803 259.579159ZM917.371009 252.944149 882.031912 217.377659 822.728724 274.569148 856.902924 311.690159 917.371009 252.944149ZM772.341518 291.258056 515.869818 34.786356 510.878071 29.794609 509.49361 22.872299 486.177999-93.705748 479.319149-128 513.613401-121.14115 630.191448-97.825539 637.113758-96.441078 642.105505-91.449331 898.577205 165.022369 915.06383 181.508994 898.577205 197.99562 805.314769 291.258056 788.828143 307.744681 772.341518 291.258056 772.341518 291.258056 772.341518 291.258056ZM788.548057 241.28119 849.238319 181.386373 613.059177-52.099878 537.423434-68.538791 556.253326 9.212311 788.548057 241.28119ZM154.380179 503.829787 695.321949 503.829787C708.387226 503.829787 718.978723 513.584265 718.978723 525.617021 718.978723 537.649777 708.387226 547.404255 695.321949 547.404255L154.380179 547.404255C141.314903 547.404255 130.723404 537.649777 130.723404 525.617021 130.723404 513.584265 141.314903 503.829787 154.380179 503.829787L154.380179 503.829787 154.380179 503.829787ZM154.380179 656.340426 695.321949 656.340426C708.387226 656.340426 718.978723 666.094904 718.978723 678.12766 718.978723 690.160417 708.387226 699.914894 695.321949 699.914894L154.380179 699.914894C141.314903 699.914894 130.723404 690.160417 130.723404 678.12766 130.723404 666.094904 141.314903 656.340426 154.380179 656.340426L154.380179 656.340426 154.380179 656.340426Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="ship" unicode="&#59215;"
+				   d="M254.094204 7.284796 105.38434 416.600693 95.298022 390.452809 531.981478 621.136912 511.246884 621.584782 927.896762 377.912437 919.147567 404.936713 823.569182 188.234217C818.814532 177.454116 823.699125 164.86071 834.479226 160.106061 845.259328 155.351409 857.852732 160.236002 862.607381 171.016105L958.185766 387.718598C962.562163 397.641092 958.797909 409.268015 949.436572 414.742874L532.786694 658.415218C526.417653 662.14007 518.576041 662.30945 512.0521 658.863088L75.368645 428.178987C65.95003 423.203471 61.644922 412.042863 65.282327 402.031102L213.992191-7.284796C218.015472-18.35866 230.254127-24.074289 241.327993-20.051006 252.401858-16.027725 258.117485-3.789071 254.094204 7.284796L254.094204 7.284796ZM501.333333 618.666667 501.333333 42.666667C501.333333 30.884593 510.884593 21.333333 522.666667 21.333333 534.44874 21.333333 544 30.884593 544 42.666667L544 618.666667C544 630.448741 534.44874 640 522.666667 640 510.884593 640 501.333333 630.448741 501.333333 618.666667L501.333333 618.666667ZM234.666667 492.178775 234.666667 704 213.30699 682.666683 810.640322 681.929059 789.333333 703.262376 789.333333 469.333333C789.333333 457.55126 798.884593 448 810.666667 448 822.44874 448 832 457.55126 832 469.333333L832 703.262376C832 715.034164 822.464789 724.581156 810.693011 724.595693L213.359677 725.333317C201.567322 725.347879 192 715.792364 192 704L192 492.178775C192 480.396702 201.551259 470.845442 213.333333 470.845442 225.115408 470.845442 234.666667 480.396702 234.666667 492.178775L234.666667 492.178775ZM50.808629 10.909344C59.57446 4.01245 74.359082-5.898603 93.457074-15.777417 125.833244-32.524631 158.87312-42.666667 191.200647-42.666667 194.159993-42.666667 197.125968-42.490381 200.101743-42.143554 215.160419-40.388463 229.750682-34.546782 246.981287-24.516474 253.290676-20.843642 259.67245-16.800755 268.51965-10.963369 270.933897-9.370447 279.678588-3.563123 279.334447-3.791241 283.686688-0.906313 287.021523 1.282671 290.313331 3.406022 349.341858 41.481835 394.110662 53.028668 458.251198 34.198797 499.945909 21.958391 531.81113 10.084154 562.013282-3.523206 564.427757-4.611029 610.274961-26.482718 622.334739-31.069694 643.349741-39.062818 663.178867-42.666667 689.241841-42.666667 716.338238-42.666665 728.977969-38.064819 791.184625-10.613628 871.129935 24.665459 915.734313 29.460894 969.593022-6.038165 979.430453-12.522161 992.661587-9.803663 999.145581 0.033771 1005.629577 9.871204 1002.911078 23.102336 993.073645 29.586332 923.841726 75.218097 865.884521 68.987095 773.958923 28.421225 719.179394 4.247552 707.512794 2.0e-06 689.241837 0 668.334466 0 653.646641 2.669442 637.503006 8.809726 627.363543 12.666304 583.439821 33.620384 579.539729 35.37754 547.579132 49.777156 513.877129 62.335853 470.269737 75.137764 392.284911 98.031934 335.65418 83.425655 267.185634 39.260644 203.418324-1.871874 210.013117 1.967098 195.162376 0.236243 193.807429 0.078323 192.489657 0 191.200647 0 166.730635 0 139.899367 8.23622 113.059968 22.11943 103.454075 27.088267 94.55576 32.421935 86.625828 37.737862 81.957097 40.867603 78.730138 43.230658 77.191371 44.441348 67.931764 51.726741 54.519391 50.126325 47.233998 40.866718 39.948604 31.60711 41.549021 18.194737 50.808629 10.909344L50.808629 10.909344ZM362.666667 710.860413 362.666667 789.333333 341.333333 768 704 768 682.666667 789.333333 682.666667 704C682.666667 692.217925 692.217926 682.666667 704 682.666667 715.782074 682.666667 725.333333 692.217925 725.333333 704L725.333333 789.333333C725.333333 801.115408 715.782074 810.666667 704 810.666667L341.333333 810.666667C329.55126 810.666667 320 801.115408 320 789.333333L320 710.860413C320 699.078338 329.55126 689.52708 341.333333 689.52708 353.115407 689.52708 362.666667 699.078338 362.666667 710.860413L362.666667 710.860413Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="bussinesscard" unicode="&#59219;"
+				   d="M448 490.666667C448 561.359115 390.692448 618.666667 320 618.666667 249.307552 618.666667 192 561.359115 192 490.666667 192 419.974219 249.307552 362.666667 320 362.666667 390.692448 362.666667 448 419.974219 448 490.666667ZM243.2 490.666667C243.2 533.082135 277.584531 567.466667 320 567.466667 362.415469 567.466667 396.8 533.082135 396.8 490.666667 396.8 448.251198 362.415469 413.866667 320 413.866667 277.584531 413.866667 243.2 448.251198 243.2 490.666667ZM130.808907 227.199991 130.808907 200.533325 156.69817 200.533325 328.38486 200.533325 519.147849 200.533325 545.037111 200.533325 545.037111 227.199991C545.037111 326.640457 449.055298 413.866658 337.923008 413.866658 331.301828 413.866658 324.715537 413.586711 318.179253 413.030206 303.929606 411.816979 293.332828 398.93497 294.510686 384.257431 295.688544 369.579895 300.838539 364.531686 315.088186 365.744913 320.205801 366.180631 332.725555 360.533325 337.923008 360.533325 421.801824 360.533325 493.258586 315.21776 493.258586 253.866658L328.38486 253.866658 182.587432 253.866658C182.587432 272.750377 202.863759 307.684713 240.911324 332.72995 252.959405 340.660736 256.484561 357.150086 248.784979 369.559949 241.085397 381.969809 225.076753 385.600819 213.028673 377.670033 160.669895 343.204279 130.808907 291.768454 130.808907 227.199991ZM128.186836 71.619049C85.627327 71.619049 51.233488 105.352853 51.233488 147.186415L51.233488 717.714286 896.718133 717.714286C939.035972 717.714286 973.436282 683.911966 973.436282 642.391369L973.436282 148.945905C973.436282 135.059889 984.905289 123.803049 999.053026 123.803049 1013.200762 123.803049 1024.669769 135.059889 1024.669769 148.945905L1024.669769 642.391369C1024.669769 711.671216 967.344489 768 896.718133 768L25.616744 768 0 768 0 742.857143 0 147.186415C0 77.572885 57.33993 21.333333 128.186836 21.333333L912.213943 21.333333C926.361679 21.333333 937.830686 32.590174 937.830686 46.47619 937.830686 60.362208 926.361679 71.619049 912.213943 71.619049L128.186836 71.619049ZM871.607934 490.666667C885.0793 490.666667 896 500.217926 896 512 896 523.782074 885.0793 533.333333 871.607934 533.333333L579.058733 533.333333C565.587366 533.333333 554.666667 523.782074 554.666667 512 554.666667 500.217926 565.587366 490.666667 579.058733 490.666667L871.607934 490.666667ZM807.058613 384C820.833361 384 832 393.55126 832 405.333333 832 417.115407 820.833361 426.666667 807.058613 426.666667L579.608053 426.666667C565.833306 426.666667 554.666667 417.115407 554.666667 405.333333 554.666667 393.55126 565.833306 384 579.608053 384L807.058613 384Z"
+				   horiz-adv-x="1025"/>
+
+
+			<glyph glyph-name="hot" unicode="&#59222;"
+				   d="M890.059904 352.19949C845.890699 458.956706 840.554889 548.495155 857.396326 618.42714 859.144623 625.686731 860.991676 631.977679 862.858846 637.425182 863.763607 640.064841 865.906573 645.659889 866.16406 646.532651L880.890349 696.448108 833.062903 675.930997C832.106692 675.5208 830.618069 674.894716 827.426684 673.550492 824.667648 672.380966 822.310677 671.354022 819.868514 670.244809 813.291441 667.257545 807.049466 664.090938 800.697749 660.412845 784.089623 650.795565 768.486253 638.656896 753.86285 623.033596 727.630498 595.007563 706.526618 557.766355 691.78157 509.713231 675.041103 455.157161 671.516484 411.46006 673.004574 347.939834 673.477918 327.734769 673.463923 322.197583 672.83965 318.324215 673.779618 324.156339 684.455526 333.678199 696.104608 329.195676 693.056849 330.368442 685.695898 339.012828 676.314007 361.368339 660.550914 398.92921 646.834249 460.170272 636.817284 549.350468 625.445924 650.588768 630.103925 734.728052 644.646978 801.338628 647.677924 815.221065 650.899934 827.082435 654.086773 836.904609 655.91465 842.538316 657.254607 846.094657 657.880284 847.554385L678.645286 896 628.243642 880.578031C617.409833 877.263087 599.94569 869.52239 578.105438 855.845223 542.547644 833.577626 507.199569 802.385036 474.400401 760.836776 447.596676 726.883228 423.611383 687.30061 403.118547 641.701619 378.907516 587.829195 363.003277 542.798944 353.158029 503.238462 349.274261 487.632585 346.433259 473.323627 344.1945 458.925156 343.334411 453.39353 342.592734 448.063234 341.804612 441.911844 341.502524 439.553997 340.356619 430.329551 340.073506 428.145504 337.596047 409.033293 335.848224 404.35337 329.235273 398.312868 336.081933 404.566848 343.232634 404.098227 346.608002 402.086756 344.852318 403.133013 341.598345 406.493651 337.991853 411.887149 327.030897 428.279226 317.980358 454.883162 313.690598 489.339595 311.250185 508.941598 310.203772 539.08627 310.370048 576.545325 310.480474 601.422138 311.113088 628.122479 312.099068 654.977888 312.481453 665.393013 312.891081 675.105466 313.30045 683.849175 313.545346 689.079919 313.735044 692.813105 313.84201 694.783403L317.55517 763.179488 271.360516 712.604139C270.467691 711.626645 268.852992 709.837042 266.618705 707.326295 262.927895 703.178805 258.823678 698.493751 254.407949 693.361469 241.78797 678.693606 229.164348 663.340425 217.341267 648.004036 211.724185 640.717803 206.411389 633.591345 201.450577 626.663838 176.017063 591.147305 156.617347 555.402528 138.122768 512.155497 90.841957 401.595812 76.97672 299.648706 99.261816 188.134893 126.80821 50.293739 188.553235-37.644222 278.8297-84.690336 344.19104-118.752337 408.837235-128 507.940695-128 525.713007-128 557.977207-125.567138 590.857378-120.462159 641.152493-112.653331 687.496192-99.789323 726.063273-80.591044 738.155853-74.571488 743.07901-59.888702 737.059454-47.796122 731.039898-35.703543 716.357111-30.780384 704.264531-36.79994 670.855859-53.430419 629.092954-65.022897 583.352478-72.12457 552.984316-76.839535 523.228215-79.083275 507.940695-79.083275 416.16215-79.083275 357.934257-70.753754 301.436271-41.310746 224.830174-1.388723 171.977796 73.88423 147.230072 197.720945 126.99711 298.965952 139.514783 391.004811 183.099329 492.921284 200.282663 533.10215 218.020237 565.784358 241.22153 598.183718 245.831691 604.621559 250.802959 611.289899 256.082244 618.137961 267.31885 632.713596 279.402035 647.409487 291.488864 661.457681 298.732051 669.876243 304.338773 676.176713 307.478705 679.614406L264.997214 697.435142C264.883874 695.347445 264.688038 691.493511 264.43725 686.13688 264.020474 677.234965 263.603959 667.359281 263.215279 656.772625 262.21142 629.430212 261.566827 602.224414 261.453805 576.762458 261.278897 537.358818 262.385015 505.49418 265.148621 483.296209 276.058157 395.668083 322.627019 326.024497 362.226031 362.195618 379.341732 377.829698 384.756649 392.328523 388.584361 421.857186 397.932742 493.974714 407.332926 531.746825 447.736538 621.64966 466.587287 663.594818 488.484326 699.731218 512.795234 730.526996 542.034492 767.565749 573.156162 795.028785 604.068111 814.386984 614.696751 821.043029 624.472062 826.201428 633.124687 830.036563 638.02329 832.207788 641.258688 833.404991 642.556233 833.802016L612.91959 866.825663C608.658554 856.884484 602.686705 838.478616 596.856038 811.772799 581.186705 740.003594 576.231674 650.498985 588.206246 543.890345 607.295279 373.942261 638.819345 298.82557 678.537329 283.542234 701.302332 274.782345 717.731637 289.435669 721.133156 310.5407 722.475759 318.870999 722.489387 324.263403 721.907881 349.085491 720.532565 407.791853 723.691247 446.952173 738.546223 495.36355 751.151827 536.44438 768.544047 567.135763 789.576147 589.605967 809.230566 610.60429 821.725461 617.839716 852.347733 630.976117L842.705318 653.453557 819.246577 660.374464C822.235501 670.505564 813.450321 644.87463 809.839253 629.880119 790.647573 550.189047 796.611315 450.1135 844.8591 333.498332 883.105728 241.056017 874.587669 126.064924 824.002925 61.397129 815.680378 50.757545 817.558709 35.3857 828.198295 27.063153 838.837879 18.740608 854.209724 20.61894 862.532269 31.258524 924.762731 110.814263 934.658528 244.404363 890.059904 352.19949Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="data" unicode="&#59223;"
+				   d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 625.686419-128 733.786972-90.820171 822.292028-23.295213 832.066406-15.83785 833.944717-1.868762 826.487354 7.905617 819.029988 17.679996 805.0609 19.558308 795.286522 12.100943 714.473916-49.555057 615.842022-83.478261 512-83.478261 253.818886-83.478261 44.521739 125.818886 44.521739 384 44.521739 642.181114 253.818886 851.478261 512 851.478261 770.181114 851.478261 979.478261 642.181114 979.478261 384 979.478261 296.952627 955.670714 213.458976 911.318368 140.798694 904.912864 130.304873 908.227102 116.605263 918.720924 110.199761 929.214746 103.794257 942.914355 107.108495 949.319857 117.602317 997.906701 197.199765 1024 288.709606 1024 384ZM368.901888 420.424055 338.700849 417.813865 563.838502 242.092789 581.396516 228.38867 595.091066 245.954153 840.321161 560.501594C847.880329 570.197455 846.148198 584.185421 836.452335 591.744589 826.756474 599.303757 812.768508 597.571625 805.20934 587.875763L559.979243 273.328322 591.231806 277.189685 366.094153 452.910761 349.780358 465.643759 335.893114 450.300567 176.846524 274.579482C168.596353 265.464361 169.297534 251.38701 178.412655 243.136838 187.527777 234.886667 201.605128 235.587849 209.855299 244.70297L368.901888 420.424055Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="trade" unicode="&#59224;"
+				   d="M1024 384C1024 666.769792 794.769792 896 512 896 229.230208 896 0 666.769792 0 384 0 101.230208 229.230208-128 512-128 625.686419-128 733.786972-90.820171 822.292028-23.295213 832.066406-15.83785 833.944717-1.868762 826.487354 7.905617 819.029988 17.679996 805.0609 19.558308 795.286522 12.100943 714.473916-49.555057 615.842022-83.478261 512-83.478261 253.818886-83.478261 44.521739 125.818886 44.521739 384 44.521739 642.181114 253.818886 851.478261 512 851.478261 770.181114 851.478261 979.478261 642.181114 979.478261 384 979.478261 296.952627 955.670714 213.458976 911.318368 140.798694 904.912864 130.304873 908.227102 116.605263 918.720924 110.199761 929.214746 103.794257 942.914355 107.108495 949.319857 117.602317 997.906701 197.199765 1024 288.709606 1024 384ZM551.801933 52.140096C551.801933 52.140096 551.910146 35.022135 529.538995 35.022135 507.167844 35.022135 503.178743 52.140096 503.178743 52.140096L503.178743 129.060386C414.434338 138.625651 357.575004 180.207362 332.599034 253.806763 332.599034 253.806763 321.314219 279.182716 346.988612 288.579433 372.663008 297.976147 386.403381 274.929952 386.403381 274.929952 407.128124 218.866869 446.052855 188.444469 503.178743 183.661837L503.178743 368.589372C441.270221 383.468674 401.083426 402.864614 382.61715 426.777777 364.150874 450.690942 354.917875 477.260723 354.917875 506.487923 354.917875 583.541449 404.33767 630.304265 503.178743 646.777777L503.178743 712.538647C503.178743 712.538647 508.270528 730.183642 526.337227 730.183642 544.403925 730.183642 551.801933 712.538647 551.801933 712.538647L551.801933 646.777777C630.183966 639.869532 681.596497 604.797419 706.041062 541.560386 706.041062 541.560386 706.041062 521.239281 686.661534 515.780798 667.282005 510.322313 651.838163 524.024154 651.838163 524.024154 637.224565 567.333551 603.879488 590.714959 551.801933 594.169082L551.801933 423.589372C661.536781 403.927439 716.403381 354.507642 716.403381 275.328503 716.403381 241.318671 703.915584 209.767053 678.939614 180.672706 653.963644 151.578357 611.584841 134.374423 551.801933 129.060386L551.801933 52.140096ZM503.178743 594.169082C475.811458 592.043467 453.957811 583.673986 437.61715 569.060386 421.276489 554.446786 413.106281 535.980787 413.106281 513.661837 413.106281 469.821037 443.130135 442.188463 503.178743 430.763285L503.178743 594.169082ZM551.801933 183.661837C584.217553 184.990345 609.525271 193.891221 627.725845 210.364734 645.926419 226.838246 655.026571 246.632734 655.026571 269.748791 655.026571 318.903627 620.618701 348.263236 551.801933 357.828503L551.801933 183.661837Z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="onepage48" unicode="&#59226;"
+				   d="M512 896C229.25 896 0 666.75 0 384c0-155.458333 69.25-294.658333 178.625-388.608333l-55.9375-96.833333 0-0.0625c-1.854167-2.6875-2.879167-6.016667-2.879167-9.470833 0-9.345833 7.4875-16.833333 16.704167-17.025l0.704167 0 374.783333 0c282.754167 0 512 229.25 512 512S794.754167 896 512 896zM297.216667 256.316667c-7.425 0-14.270833 3.904167-17.983333 10.304167-2.75 4.8625-3.520833 10.495833-2.05 15.870833 1.470833 5.3125 4.8625 9.729167 9.6625 12.479167l180.416667 104.191667c9.5375 5.566667 22.85 1.983333 28.2875-7.616667 2.75-4.8 3.520833-10.366667 2.1125-15.679167-1.408333-5.375-4.8625-9.854167-9.6625-12.608333l-180.416667-104.129167C304.45 257.279167 300.866667 256.316667 297.216667 256.316667zM353.408333 158.975c-7.425 0-14.270833 3.904167-17.983333 10.304167-5.695833 9.920833-2.304167 22.720833 7.616667 28.416667l180.479167 104.129167c9.5375 5.633333 22.720833 2.05 28.2875-7.55 2.816667-4.8 3.520833-10.433333 2.1125-15.808333-1.470833-5.3125-4.8625-9.791667-9.729167-12.545833l-180.354167-104.191667C360.641667 159.933333 357.058333 158.975 353.408333 158.975zM877.825 328.704167l-457.920833-264.258333c-3.1375-1.854167-6.720833-2.75-10.304167-2.75-7.425 0-14.270833 3.904167-17.983333 10.304167-2.75 4.8-3.520833 10.433333-2.1125 15.808333 1.408333 5.3125 4.8625 9.791667 9.6625 12.545833l428.545833 247.4875c6.975 4.033333 11.904167 10.433333 13.8875 18.1125 2.1125 7.679167 1.025 15.679167-2.945833 22.591667l-117.954167 204.416667c-5.375 9.216667-15.295833 14.9125-25.920833 14.9125-5.183333 0-10.366667-1.345833-14.85-3.966667L251.329167 356.479167c-9.470833-5.566667-22.85-1.983333-28.2875 7.616667-2.75 4.8-3.520833 10.366667-2.1125 15.679167 1.470833 5.3125 4.929167 9.791667 9.729167 12.545833l181.566667 105.345833c5.25 3.966667 6.85 10.945833 3.583333 16.575-0.833333 1.470833-1.920833 2.6875-3.329167 3.7125l-0.641667 0.383333-117.375 67.775c-4.545833 2.625-9.729167 3.966667-14.9125 3.966667-10.625 0-20.545833-5.695833-25.854167-14.9125l-2.558333-4.35-0.0625 0.0625-84.354167-146.241667c-5.504167-9.470833-18.75-13.054167-28.35-7.55-4.7375 2.75-8.191667 7.233333-9.6625 12.545833-1.408333 5.375-0.641667 11.008333 2.1125 15.808333l104.129167 180.416667c1.5375 2.495833 3.520833 4.670833 6.079167 6.4625 0 0.254167 0.254167 0.5125 0.575 0.833333 9.15 8.704167 21.8875 12.095833 34.175 9.216667 3.583333-0.833333 6.975-1.6625 10.175-3.454167l170.495833-98.433333 0.254167 0.320833 2.816667-1.345833c8-3.775 16.833333-3.904167 24.766667-0.320833l2.945833 1.345833 201.216667 116.158333c3.2 1.854167 6.654167 2.625 9.6 3.329167 3.454167 0.833333 6.4625 1.216667 9.345833 1.216667 9.408333 0 18.433333-3.65 25.345833-10.241667 2.625-2.495833 5.25-4.8625 7.104167-8.0625l151.745833-262.783333c1.983333-3.391667 2.6875-6.975 3.454167-10.175 2.879167-12.225-0.5125-25.025-9.0875-34.1125C883.266667 333.116667 881.025 330.620833 877.825 328.704167z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="signboard" unicode="&#59228;"
+				   d="M127.905952 58.592212c-42.886113 0-76.743571 33.857458-76.743571 75.238795V704.141073h844.931667c42.133725 0 76.743571-33.857458 76.743571-75.238795V136.08817c0-13.542983 11.285819-24.828802 25.581191-24.828802s25.58119 11.285819 25.58119 24.828802V628.902278c0 69.219691-57.181484 125.648788-127.905952 125.648787H0V134.583395c0-69.219691 57.181484-125.648788 127.905952-125.648788h783.235855c14.295371 0 25.58119 11.285819 25.581191 24.828802 0 13.542983-11.285819 24.828802-25.581191 24.828803H127.905952zM889.322557 426.509919H134.677443V618.368846h754.645114v-191.858927zM188.096988 479.929464h647.806024V564.949302H188.096988v-85.019838z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="shuffling-banner" unicode="&#59230;"
+				   d="M127.905952 61.601763c-42.886113 0-76.743571 33.857458-76.743571 75.238795V707.150625h844.931667c42.133725 0 76.743571-33.857458 76.743571-75.238795v-492.814108c0-13.542983 11.285819-24.828802 25.581191-24.828802s25.58119 11.285819 25.58119 24.828802V631.91183c0 69.219691-57.181484 125.648788-127.905952 125.648787H0V137.592946c0-69.219691 57.181484-125.648788 127.905952-125.648787h783.235855c14.295371 0 25.58119 11.285819 25.581191 24.828802 0 13.542983-11.285819 24.828802-25.581191 24.828802H127.905952zM564.290963 213.584129c19.562087 0 34.609846-15.800147 34.609845-34.609845 0-19.562087-15.800147-34.609846-34.609845-34.609846-19.562087 0-34.609846 15.800147-34.609846 34.609846s15.047759 34.609846 34.609846 34.609845zM457.451874 178.221896m-34.609846 0a34.609846 34.609846 0 1 1 69.219691 0 34.609846 34.609846 0 1 1-69.219691 0ZM351.365173 178.221896m-34.609846 0a34.609846 34.609846 0 1 1 69.219691 0 34.609846 34.609846 0 1 1-69.219691 0ZM672.634827 213.584129c19.562087 0 34.609846-15.800147 34.609846-34.609845 0-19.562087-15.800147-34.609846-34.609846-34.609846-19.562087 0-34.609846 15.800147-34.609845 34.609846-0.752388 18.809699 15.047759 34.609846 34.609845 34.609845z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="component" unicode="&#59231;"
+				   d="M632.404396 106.807326H330.830769c-16.504029 0-32.257875 6.001465-44.260806 18.004396-12.00293 12.00293-18.754579 27.006593-18.754578 44.260805l0.750183 72.767766c3.000733 13.503297 9.752381 24.756044 19.504762 31.507692 12.753114 9.752381 30.007326 9.752381 48.761904-1.500366l4.501099-2.250549 5.251282-1.500367c15.753846-7.501832 30.757509-6.751648 44.260806-1.500366 6.751648 3.000733 12.753114 6.751648 18.004396 12.00293 5.251282 5.251282 9.002198 11.252747 12.00293 18.004396 3.000733 6.751648 4.501099 13.503297 4.501099 21.755311 0 8.252015-1.500366 15.003663-4.501099 21.755312-3.000733 6.751648-6.751648 12.753114-12.00293 18.004395-6.001465 5.251282-11.252747 9.752381-18.754579 12.002931-13.503297 6.001465-28.50696 6.001465-44.260806-0.750183l-5.251282-2.25055c-5.251282-2.250549-10.502564-5.251282-15.003663-7.501831-6.751648-3.000733-13.503297-4.501099-19.504762-4.501099h-4.501099c-10.502564 0.750183-19.504762 6.751648-25.506227 15.753846-5.251282 7.501832-7.501832 16.504029-8.252014 30.007326v65.265934c0 17.254212 6.751648 32.257875 18.754578 44.260806 12.00293 12.00293 27.756777 18.754579 44.260806 18.754579h57.01392c-3.750916 11.252747-6.001465 24.005861-6.001466 36.758974 0 16.504029 3.000733 32.257875 9.752381 46.511355 6.001465 14.25348 15.003663 27.006593 25.506228 37.509158s23.255678 18.754579 37.509157 25.506227c28.50696 12.753114 63.015385 12.753114 92.272527 0 14.25348-6.001465 27.006593-15.003663 37.509158-25.506227s18.754579-23.255678 25.506227-37.509158c6.001465-14.25348 9.752381-30.007326 9.752381-46.511355 0-12.753114-2.250549-24.756044-6.001465-36.758974h19.504762c17.254212 0 32.257875-6.751648 44.260806-18.754579 12.00293-12.00293 18.004396-27.756777 18.004395-44.260806v-42.010256c26.25641 9.752381 57.013919 9.002198 83.27033-2.25055 14.25348-6.001465 26.25641-14.25348 36.758974-24.756044 10.502564-10.502564 18.754579-23.255678 24.756044-36.758974 6.001465-14.25348 9.002198-29.257143 9.002198-45.010989s-3.000733-31.507692-9.002198-45.761172c-6.001465-13.503297-14.25348-26.25641-24.756044-36.758975-10.502564-10.502564-23.255678-18.754579-36.758974-24.756044-26.25641-11.252747-57.013919-12.00293-83.27033-2.250549v-36.758975c0-17.254212-6.001465-32.257875-18.004395-44.260805-12.753114-11.252747-28.50696-18.004396-45.010989-18.004396zM313.576557 233.588278v-63.765567c0-4.501099 1.500366-8.252015 5.251282-12.002931 3.750916-3.750916 7.501832-5.251282 12.753113-5.251282h300.823444c5.251282 0 8.252015 1.500366 12.00293 5.251282 3.750916 3.750916 5.251282 6.751648 5.251282 12.002931V295.103297l37.509158-32.257876c6.001465-5.251282 13.503297-9.752381 21.755311-12.753113 15.753846-6.751648 35.258608-6.001465 51.762637 0.750183 9.002198 3.750916 16.504029 9.002198 22.505495 15.003663 6.751648 6.751648 12.00293 14.25348 15.753846 22.505494s5.251282 17.254212 5.251282 27.006594c0 9.752381-1.500366 18.754579-5.251282 27.006593-3.750916 9.002198-9.002198 16.504029-15.003663 22.505495-6.751648 6.751648-14.25348 11.252747-22.505495 15.003663-16.504029 6.751648-36.008791 7.501832-51.762637 0.750183-8.252015-3.000733-15.753846-7.501832-21.755311-12.753114l-37.509158-31.507692V466.895238c0 5.251282-1.500366 9.002198-5.251282 12.753114-3.750916 3.750916-6.751648 5.251282-12.00293 5.251282H525.128205l32.257876 37.509157c10.502564 12.753114 15.753846 27.006593 15.753846 44.260806 0 10.502564-2.250549 19.504762-6.001465 28.50696-3.750916 9.002198-9.002198 16.504029-15.753847 23.255677-6.751648 6.751648-14.25348 12.00293-23.255677 15.753847-17.254212 7.501832-38.259341 7.501832-55.513553 0-9.002198-3.750916-16.504029-9.002198-23.255678-15.753847-6.751648-6.751648-12.00293-14.25348-15.753846-23.255677-3.750916-9.002198-6.001465-18.004396-6.001465-28.50696 0-9.002198 1.500366-16.504029 4.501099-24.005861 3.000733-7.501832 6.751648-15.003663 12.00293-21.005128l29.257143-36.758974h-142.534799c-5.251282 0-9.002198-1.500366-12.00293-5.251282-3.750916-3.750916-5.251282-7.501832-5.251282-12.002931v-63.015384c2.250549 1.500366 5.251282 2.250549 7.501831 3.750915 2.250549 0.750183 5.251282 2.250549 9.002198 3.750916 22.505495 10.502564 54.013187 10.502564 78.019048 0 12.00293-5.251282 23.255678-12.753114 32.257875-21.755311 9.002198-9.002198 16.504029-20.254945 21.755312-32.257876 5.251282-12.00293 8.252015-25.506227 8.252014-39.759707s-3.000733-27.756777-8.252014-39.759707c-5.251282-12.00293-12.753114-22.505495-21.755312-31.507692-9.002198-9.002198-20.254945-16.504029-32.257875-21.755311-24.756044-10.502564-53.263004-11.252747-80.269597 1.500366-3.750916 1.500366-8.252015 3.750916-14.25348 6.751648zM1021.749451 382.124542c0 282.068864-228.805861 510.124542-510.124543 510.124542-282.068864 0-510.124542-228.055678-510.124542-510.124542s228.805861-510.124542 510.124542-510.124542c115.528205 0 221.304029 39.759707 307.575092 104.275458 3.750916 3.750916 6.001465 9.002198 6.001465 15.003663 0 12.753114-9.752381 22.505495-22.505494 22.505494-6.751648 0-12.00293-2.250549-16.50403-6.751648-76.518681-56.263736-171.041758-90.021978-273.066666-90.021978-255.062271 0-462.112821 207.050549-462.112821 462.112821S258.063004 841.23663 513.125275 841.23663 975.238095 634.186081 975.238095 379.12381c0-78.019048-18.004396-151.536996-52.51282-216.052748v-0.750183c-0.750183-2.250549-1.500366-4.501099-1.500367-6.751648 0-12.753114 10.502564-22.505495 22.505495-22.505495 9.752381 0 18.004396 6.001465 21.005128 15.003663 35.258608 70.517216 57.013919 150.03663 57.01392 234.057143z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="component-filling" unicode="&#59232;"
+				   d="M511.249268 385.126926m-510.873074 0a510.873074 510.873074 0 1 1 1021.746148 0 510.873074 510.873074 0 1 1-1021.746148 0ZM632.957265 109.405723H330.941124c-16.528247 0-32.305209 6.010271-44.325752 18.030814-12.020543 12.020543-18.782098 27.046222-18.782098 44.325752l0.751284 72.874542c3.005136 13.523111 9.766691 24.79237 19.533382 31.553925 12.771827 9.766691 30.051357 9.766691 48.833456-1.502568l4.507703-2.253852 5.258988-1.502568c15.776963-7.512839 30.802641-6.761555 44.325752-1.502568 6.761555 3.005136 12.771827 6.761555 18.030814 12.020543 5.258988 5.258988 9.015407 11.269259 12.020543 18.030815 3.005136 6.761555 4.507704 13.523111 4.507704 21.787234 0 8.264123-1.502568 15.025679-4.507704 21.787234-3.005136 6.761555-6.761555 12.771827-12.020543 18.030814-5.258988 5.258988-11.269259 9.015407-18.030814 12.020543-13.523111 6.010271-28.548789 6.010271-44.325752-0.751284l-5.258988-2.253852c-5.258988-2.253852-10.517975-5.258988-15.025678-7.512839-6.761555-3.005136-13.523111-4.507704-19.533383-4.507704h-4.507703c-10.517975 0.751284-19.533382 6.761555-25.543654 15.776963-5.258988 7.512839-7.512839 16.528247-8.264123 30.051357v65.361702c0 17.27953 6.761555 32.305209 18.782098 44.325752 12.020543 12.020543 27.797506 18.782098 44.325752 18.782099h57.097579c-3.75642 11.269259-6.010271 24.041086-6.010271 36.812912 0 16.528247 3.005136 32.305209 9.766691 46.579604 6.010271 14.274395 15.025679 27.046222 25.543653 37.564197s23.289802 18.782098 37.564197 25.543654c28.548789 12.771827 63.10785 12.771827 92.407924 0 14.274395-6.010271 27.046222-15.025679 37.564196-25.543654s18.782098-23.289802 25.543654-37.564197c6.010271-14.274395 9.766691-30.051357 9.766691-46.579604 0-12.771827-2.253852-24.79237-6.010271-36.812912h19.533382c17.27953 0 32.305209-6.761555 44.325752-18.782099 12.020543-12.020543 18.030814-27.797506 18.030814-44.325752v-42.0719c26.294938 9.766691 57.097579 9.015407 83.392517-2.253852 14.274395-6.010271 26.294938-14.274395 36.812913-24.792369 10.517975-10.517975 18.782098-23.289802 24.792369-36.812913 6.010271-14.274395 9.015407-29.300073 9.015408-45.077036s-3.005136-31.553925-9.015408-45.82832c-6.010271-13.523111-14.274395-26.294938-24.792369-36.812913-10.517975-10.517975-23.289802-18.782098-36.812913-24.792369-26.294938-11.269259-57.097579-12.020543-83.392517-2.253852v-36.812913c0-17.27953-6.010271-32.305209-18.030814-44.325752-13.523111-12.020543-29.300073-18.030814-45.82832-18.030814zM313.661594 235.621423v-63.859134c0-4.507704 1.502568-8.264123 5.258987-12.020543 3.75642-3.75642 7.512839-5.258988 12.771827-5.258987h301.264857c5.258988 0 8.264123 1.502568 12.020543 5.258987 3.75642 3.75642 5.258988 6.761555 5.258988 12.020543V297.226706l37.564196-32.305209c6.010271-5.258988 13.523111-9.766691 21.787234-12.771827 15.776963-6.761555 35.310345-6.010271 51.838592 0.751284 9.015407 3.75642 16.528247 9.015407 22.538518 15.025678 6.761555 6.761555 12.020543 14.274395 15.776962 22.538518s5.258988 17.27953 5.258988 27.046222c0 9.766691-1.502568 18.782098-5.258988 27.046222-3.75642 9.015407-9.015407 16.528247-15.025678 22.538518-6.761555 6.761555-14.274395 11.269259-22.538518 15.025678-16.528247 6.761555-36.061629 7.512839-51.838592 0.751284-8.264123-3.005136-15.776963-7.512839-21.787234-12.771827l-37.564196-31.553925V469.270726c0 5.258988-1.502568 9.015407-5.258988 12.771827-3.75642 3.75642-6.761555 5.258988-12.020543 5.258988H525.523663l32.305209 37.564196c10.517975 12.771827 15.776963 27.046222 15.776962 44.325752 0 10.517975-2.253852 19.533382-6.010271 28.54879-3.75642 9.015407-9.015407 16.528247-15.776963 23.289802-6.761555 6.761555-14.274395 12.020543-23.289801 15.776962-17.27953 7.512839-38.315481 7.512839-55.595011 0-9.015407-3.75642-16.528247-9.015407-23.289802-15.776962-6.761555-6.761555-12.020543-14.274395-15.776963-23.289802-3.75642-9.015407-6.010271-18.030814-6.010271-28.54879 0-9.015407 1.502568-16.528247 4.507703-24.041085 3.005136-7.512839 6.761555-15.025679 12.020543-21.035951l29.300073-36.812912h-142.743947c-5.258988 0-9.015407-1.502568-12.020543-5.258988-3.75642-3.75642-5.258988-7.512839-5.258987-12.020543v-63.10785c2.253852 1.502568 5.258988 2.253852 7.512839 3.75642 2.253852 0.751284 5.258988 2.253852 9.015407 3.756419 22.538518 10.517975 54.092443 10.517975 78.133529 0 12.020543-5.258988 23.289802-12.771827 32.305209-21.787234 9.015407-9.015407 16.528247-20.284666 21.787234-32.305209 5.258988-12.020543 8.264123-25.543654 8.264124-39.818048s-3.005136-27.797506-8.264124-39.818049c-5.258988-12.020543-12.771827-22.538518-21.787234-31.553925-9.015407-9.015407-20.284666-16.528247-32.305209-21.787234-24.79237-10.517975-53.341159-11.269259-80.38738 1.502568-3.75642 1.502568-9.015407 3.75642-14.274395 6.761555z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="color" unicode="&#59233;"
+				   d="M811.984589 567.447871c-57.139501 0-101.497797-44.358297-101.497798-101.497798s44.358297-101.497797 101.497798-101.497797 101.497797 44.358297 101.497797 101.497797c0.751836 57.139501-44.358297 101.497797-101.497797 101.497798z m0-163.900147c-35.33627 0-62.402349 27.066079-62.40235 62.402349 0 35.33627 27.066079 62.402349 62.40235 62.40235 35.33627 0 62.402349-27.066079 62.402349-62.40235 0-35.33627-26.314244-62.402349-62.402349-62.402349zM211.267995 567.447871c-57.139501 0-101.497797-44.358297-101.497797-101.497798s44.358297-101.497797 101.497797-101.497797 101.497797 44.358297 101.497798 101.497797-44.358297 101.497797-101.497798 101.497798z m0-163.900147c-35.33627 0-62.402349 27.066079-62.402349 62.402349 0 35.33627 27.066079 62.402349 62.402349 62.40235 35.33627 0 62.402349-27.066079 62.40235-62.40235 0-35.33627-27.066079-62.402349-62.40235-62.402349zM750.334075 684.734214c0 57.139501-44.358297 101.497797-101.497798 101.497798s-101.497797-44.358297-101.497797-101.497798 44.358297-101.497797 101.497797-101.497797c56.387665 0 101.497797 44.358297 101.497798 101.497797z m-102.249633-62.402349c-35.33627 0-62.402349 27.066079-62.40235 62.402349 0 35.33627 27.066079 62.402349 62.40235 62.40235s62.402349-27.066079 62.402349-62.40235c0-35.33627-26.314244-62.402349-62.402349-62.402349zM375.168142 786.232012c-57.139501 0-101.497797-44.358297-101.497797-101.497798s44.358297-101.497797 101.497797-101.497797S476.665939 627.594714 476.665939 684.734214s-44.358297 101.497797-101.497797 101.497798z m0-163.900147c-35.33627 0-62.402349 27.066079-62.402349 62.402349 0 35.33627 27.066079 62.402349 62.402349 62.40235 35.33627 0 62.402349-27.066079 62.40235-62.40235 0-35.33627-27.066079-62.402349-62.40235-62.402349zM272.166674-25.750367l62.402349-27.817915c54.883994-22.555066 115.030837-34.584435 177.433187-34.584435 35.33627 0 62.402349 27.066079 62.402349 62.40235 0 15.788546-6.014684 30.073421-15.788546 40.599119-18.044053 18.044053-27.817915 42.10279-27.817915 68.417034 0 57.139501 44.358297 101.497797 101.497797 101.497797h98.490456c139.84141 0 253.368576 113.527166 253.368575 253.368576 0 230.061674-212.017621 417.268722-472.152716 417.268722C251.115279 856.152717 39.849493 644.135095 39.849493 384c0-124.052863 43.606461-231.565345 121.797357-316.522761 3.759178-15.036711-3.007342-25.562408-16.540382-26.314243-9.022026-0.751836-18.795888 8.270191-18.795888 8.27019l-4.511014 3.759178c-4.511013 5.262849-8.270191 9.773862-12.781204 15.036711-67.665198 87.212922-109.016153 196.98091-109.016152 315.770925 0 281.938326 229.309838 511.248164 511.248164 511.248164s511.248164-205.251101 511.248165-457.116005c0-161.64464-131.571219-293.215859-293.215859-293.215859H632.295895c-35.33627 0-62.402349-27.066079-62.402349-62.40235 0-15.788546 6.014684-30.073421 15.788546-40.599119 18.044053-18.044053 27.817915-42.10279 27.817915-68.417034 0-57.139501-44.358297-101.497797-101.497797-101.497797-93.227606 0-180.440529 24.810573-255.624083 68.417034-0.751836 0.751836-17.292217 28.56975 15.788547 33.832599z"
+				   horiz-adv-x="1026"/>
+
+
+			<glyph glyph-name="color-filling" unicode="&#59341;"
+				   d="M21.333333 384c0-270.592 219.925333-490.666667 490.304-490.666667 54.784 0 97.344 42.581333 97.344 97.408 0 25.258667-9.365333 48.341333-26.688 65.664-10.090667 10.112-15.125333 23.829333-15.125333 38.976 0 33.92 25.941333 59.882667 59.84 59.882667h94.442667C876.48 155.264 1002.666667 281.536 1002.666667 436.672 1002.666667 678.4 782.762667 874.666667 511.637333 874.666667 241.258667 874.666667 21.333333 654.592 21.333333 384z m202.666667-21.333333a53.333333 53.333333 0 1 1 0 106.666666 53.333333 53.333333 0 0 1 0-106.666666z m0-42.666667a96 96 0 1 0 0 192 96 96 0 0 0 0-192z m149.333333 256a53.333333 53.333333 0 1 1 0 106.666667 53.333333 53.333333 0 0 1 0-106.666667z m0-42.666667a96 96 0 1 0 0 192 96 96 0 0 0 0-192z m277.333334 42.666667a53.333333 53.333333 0 1 1 0 106.666667 53.333333 53.333333 0 0 1 0-106.666667z m0-42.666667a96 96 0 1 0 0 192 96 96 0 0 0 0-192z m149.333333-170.666666a53.333333 53.333333 0 1 1 0 106.666666 53.333333 53.333333 0 0 1 0-106.666666z m0-42.666667a96 96 0 1 0 0 192 96 96 0 0 0 0-192z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="favorites" unicode="&#59342;"
+				   d="M840.870698 887.760372c-80.634047 0-153.790512-31.672558-207.967256-83.134512a24.957023 24.957023 0 0 1-9.287442-19.33693 25.099907 25.099907 0 0 1 42.984186-17.598511l0.047628-0.023814c45.246512 43.341395 106.61507 69.989209 174.222884 69.989209 139.240186 0 252.094512-112.87814 252.094511-252.094512 0-67.631628-26.671628-128.952558-69.989209-174.246697l-451.322047-451.750698-451.560186 451.750698a251.165767 251.165767 0 0 0-70.013023 174.246697C50.080744 724.777674 162.958884 837.655814 302.19907 837.655814c66.917209 0 127.690419-26.171535 172.841674-68.72707l150.599442-150.456558a24.909395 24.909395 0 0 1 35.244651 35.244651l-149.14679 149.265861 0.119069 0.095255A301.127442 301.127442 0 0 1 302.19907 887.760372C135.263256 887.760372 0 752.449488 0 585.561302c0-81.443721 32.267907-155.314605 84.658605-209.658046l486.995348-486.828651 487.042977 487.138232A301.103628 301.103628 0 0 1 1143.069767 585.537488C1143.069767 752.473302 1007.782698 887.760372 840.870698 887.760372"
+				   horiz-adv-x="1143"/>
+
+
+			<glyph glyph-name="pic-filling" unicode="&#59394;"
+				   d="M1024 389.546667v-452.288H120.469333A120.533333 120.533333 0 0 0 0 57.792V810.666667h903.530667A120.597333 120.597333 0 0 0 1024 690.005333v-225.216L691.413333 214.506667l-244.010666 152.533333-257.877334-257.92a30.122667 30.122667 0 0 1 42.602667-42.581333l224 224 237.866667-148.650667L1024 389.546667z m-798.122667 59.712a105.408 105.408 0 1 1 0 210.816 105.408 105.408 0 0 1 0-210.816z m0 60.224a45.184 45.184 0 1 1 0 90.368 45.184 45.184 0 0 1 0-90.368z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="RFQ" unicode="&#59395;"
+				   d="M929.375 702.664l-4.875 1.333c-269.75 73.542-555 73.583-825 0l-4.875-1.333C38.917 687.456 0 636.539 0 578.789v-389.583c0-57.75 38.917-108.667 94.625-123.875l4.875-1.333c134.958-36.792 273.708-55.167 412.542-55.167 138.75 0 277.542 18.375 412.417 55.167l4.917 1.333c11.375 3.083 18.083 14.792 15 26.167-3.083 11.333-14.583 17.958-26.167 15l-4.958-1.333c-262.417-71.583-539.917-71.583-802.5 0l-4.875 1.333c-37.208 10.167-63.208 44.167-63.208 82.708V578.789c0 38.542 26 72.542 63.208 82.708l4.875 1.333c262.5 71.583 540.042 71.583 802.542 0l4.875-1.333c37.208-10.125 63.167-44.167 63.167-82.708v-389.583c0-11.792 9.542-21.333 21.333-21.333 11.792 0 21.333 9.542 21.333 21.333V578.789c-0.001 57.75-38.918 108.667-94.626 123.875zM444.797 347.573H553.51c17-78.539 87.01-137.594 170.552-137.594 8.87 0 17.562 0.659 26.073 1.945V283.06a105.63 105.63 0 0 0-26.073-3.258c-57.823 0-104.703 46.883-104.703 104.706 0 57.846 46.88 104.732 104.703 104.732 57.849 0 104.734-46.885 104.734-104.732 0-8.992-1.141-17.708-3.286-26.044h71.135a173.161 173.161 0 0 1 1.948 26.044c0 96.245-78.281 174.526-174.531 174.526-44.833 0-85.766-17.008-116.708-44.898v44.909H374.99v-325.193L290.823 339.82c35.823 19.214 60.188 57.008 60.188 100.505v2.326c0 64.245-52.068 116.331-116.312 116.352l-135.819 0.041V209.99h69.812V326.341h47.255l83.635-116.357h94.354v0.005h50.859V347.573z m0 141.659h139.75c-16.818-22.349-28.396-48.849-32.901-77.664H444.797v77.664z m-163.932-52.357c0-25.703-20.833-46.542-46.542-46.542h-65.63v98.898h65.63c25.708 0 46.542-20.836 46.542-46.539v-5.817zM851.172 156.372V257.417h101.042l-64.297 64.299h-75.073l-75.781 75.789c-7.177 7.177-18.802 7.177-25.979 0s-7.177-18.802 0-25.979l75.786-75.792v-75.06l64.302-64.302z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="RFQ-filling" unicode="&#59396;"
+				   d="M0 180.741V587.259c0 50.375 33.716 94.518 82.316 107.773l5.12 1.396a1613.589 1613.589 0 0 0 849.127 0l5.12-1.396c48.6-13.255 82.316-57.398 82.316-107.773v-406.518c0-50.375-33.716-94.518-82.316-107.773l-5.12-1.396a1613.589 1613.589 0 0 0-849.127 0l-5.12 1.396C33.716 86.223 0 130.366 0 180.741zM745.619 560.597c-45.436 0-86.919-17.237-118.281-45.502v45.511H391.854v-329.558L306.559 338.44c36.304 19.472 61 57.773 61 101.852v2.358c0 65.107-52.769 117.893-117.876 117.914l-137.641 0.042v-353.741h70.748V324.778h47.889l84.759-117.917h95.626l-0.003 0.003h51.541V346.296h110.172c17.229-79.595 88.177-139.44 172.845-139.44 8.986 0 17.793 0.665 26.419 1.971v72.09a107.037 107.037 0 0 0-26.419-3.302c-58.598 0-106.112 47.514-106.112 106.112 0 58.624 47.514 106.138 106.112 106.138 58.624 0 106.138-47.514 106.138-106.138 0-9.114-1.152-17.946-3.328-26.394h72.089a175.938 175.938 0 0 1 1.971 26.394c0.001 97.535-79.334 176.87-176.87 176.87z m-562.829-70.74h66.516c26.049 0 47.166-21.117 47.166-47.165v-5.896c0-26.049-21.117-47.165-47.166-47.165H182.79V489.857z m279.812 0h141.626c-17.044-22.649-28.778-49.504-33.344-78.709H462.602v78.709zM911.668 320.093H835.59l-76.799 76.806c-7.273 7.273-19.055 7.273-26.328 0s-7.273-19.055 0-26.327l76.804-76.81v-76.068l65.163-65.164v102.4h102.4l-65.162 65.163z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="originalimage" unicode="&#59398;"
+				   d="M988.362-83.362c-1.581 4.744-1.581 4.744-2.797 6.933-1.095 1.946-2.311 3.649-3.892 5.717-2.189 2.797-5.108 6.325-9.122 10.703-6.933 7.784-17.028 18.609-30.529 32.475-20.92 21.893-41.962 43.3-93.047 95.114-50.476 51.328-71.761 72.978-92.439 94.628-13.014 13.623-22.866 23.961-29.313 31.259-3.162 3.649-5.473 6.325-6.811 7.906 0.851-1.581 0.851-1.581 2.189-5.473 2.068-7.298 2.068-7.298-6.811-24.083 80.154 77.356 126.373 184.269 126.373 298.722 0 226.961-180.742 410.987-403.81 410.987s-403.81-184.026-403.81-410.987 180.742-410.987 403.81-410.987c4.865 0 9.974 0.243 15.569 0.608 4.014 0.365 7.541 0.608 13.866 1.338 12.893 1.338 17.636 1.703 23.11 1.703 9.244 0 23.961 3.284 45.733 9.365 2.554 0.73 5.23 1.46 7.906 2.189 8.271 2.311 16.785 4.865 24.934 7.419 4.987 1.581 8.636 2.676 10.825 3.406 12.893 4.135 20.069 18.123 15.933 31.259-4.014 13.136-17.758 20.434-30.651 16.298-1.946-0.608-5.595-1.824-10.339-3.284-7.906-2.433-16.055-4.865-23.961-7.176-2.554-0.73-4.987-1.46-7.419-2.068-16.785-4.622-29.921-7.541-32.84-7.541-7.784 0-13.258-0.487-28.096-1.946-5.96-0.608-9.244-0.973-12.649-1.216-4.5-0.365-8.392-0.487-11.92-0.487-195.945 0-354.915 161.767-354.915 361.24s158.848 361.24 354.915 361.24 354.915-161.767 354.915-361.24c0-100.588-40.624-194.486-110.926-262.355-9.001-17.15-9.001-17.15-6.811-24.934 1.581-4.5 1.581-4.5 2.797-6.69 1.095-1.946 2.311-3.649 3.892-5.717 2.189-2.797 5.108-6.325 9.122-10.703 6.933-7.784 17.028-18.609 30.529-32.597 20.92-21.893 42.205-43.543 92.925-95.114 50.841-51.693 71.761-73.099 92.56-94.749 13.014-13.623 22.866-23.961 29.313-31.259 3.162-3.649 5.473-6.325 6.69-7.906-0.973 1.703-0.973 1.703-2.311 5.838-2.068 7.906-2.068 7.906 7.906 24.691-10.339-8.879-11.555-24.569-2.919-35.151 8.757-10.46 24.204-11.798 34.543-2.919 9.852 17.028 9.852 17.028 7.784 25.542zM435.677 242.606c127.954 0 231.704 103.75 231.704 231.704s-103.75 231.704-231.704 231.704-231.704-103.75-231.704-231.704c-0.122-127.954 103.628-231.704 231.704-231.704zM435.677 288.946c-102.412 0-185.364 82.951-185.364 185.364s82.951 185.364 185.364 185.364 185.364-82.951 185.364-185.364-83.073-185.364-185.364-185.364z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="logistic" unicode="&#59409;"
+				   d="M723.2 896c-83.2 0-151.466667-68.266667-151.466667-151.466667 0-83.2 151.466667-296.533333 151.466667-296.533333S874.666667 659.2 874.666667 744.533333C874.666667 827.733333 806.4 896 723.2 896z m0-192c-36.266667 0-64 27.733333-64 64s27.733333 64 64 64 64-27.733333 64-64-29.866667-64-64-64zM800 576s0-2.133333-2.133333-2.133333c2.133333 0 2.133333 2.133333 2.133333 2.133333zM887.466667 648.533333c-6.4-14.933333-14.933333-29.866667-21.333334-44.8 6.4-8.533333 10.666667-19.2 17.066667-27.733333h-32c-8.533333-14.933333-17.066667-29.866667-25.6-42.666667h78.933333c19.2-46.933333 29.866667-96 34.133334-149.333333h-170.666667c0 19.2-2.133333 36.266667-4.266667 55.466667-2.133333-2.133333-4.266667-4.266667-4.266666-6.4L723.2 384H512v149.333333h108.8c-8.533333 12.8-17.066667 27.733333-25.6 42.666667H512V785.066667c6.4-2.133333 12.8-2.133333 19.2-4.266667 4.266667 23.466667 10.666667 46.933333 21.333333 66.133333-21.333333 2.133333-40.533333 4.266667-61.866666 4.266667C219.733333 851.2 0 631.466667 0 362.666667c0-270.933333 219.733333-490.666667 490.666667-490.666667s490.666667 219.733333 490.666666 490.666667c-2.133333 106.666667-36.266667 204.8-93.866666 285.866666zM386.133333 795.733333c-61.866667-42.666667-113.066667-121.6-142.933333-219.733333H98.133333c59.733333 108.8 164.266667 189.866667 288 219.733333zM76.8 533.333333h155.733333c-10.666667-46.933333-17.066667-96-19.2-149.333333H42.666667c4.266667 53.333333 14.933333 102.4 34.133333 149.333333zM42.666667 341.333333h170.666666c2.133333-53.333333 8.533333-102.4 19.2-149.333333H76.8c-19.2 46.933333-29.866667 96-34.133333 149.333333z m53.333333-192h147.2c29.866667-100.266667 81.066667-179.2 142.933333-221.866666C262.4-42.666667 155.733333 38.4 96 149.333333zM469.333333-61.866667c-76.8 12.8-142.933333 96-181.333333 211.2H469.333333v-211.2zM469.333333 192h-192c-10.666667 46.933333-19.2 96-19.2 149.333333h213.333334v-149.333333z m0 192H256c2.133333 53.333333 8.533333 102.4 19.2 149.333333h192v-149.333333z m0 192h-179.2c38.4 115.2 104.533333 196.266667 179.2 209.066667V576z m42.666667-234.666667h211.2c-2.133333-53.333333-8.533333-102.4-19.2-149.333333h-192v149.333333z m0-192h179.2c-38.4-115.2-104.533333-198.4-179.2-211.2V149.333333z m81.066667-221.866666c61.866667 42.666667 113.066667 121.6 142.933333 221.866666h147.2c-59.733333-110.933333-164.266667-192-290.133333-221.866666zM746.666667 192c10.666667 46.933333 17.066667 96 19.2 149.333333h170.666666c-2.133333-53.333333-12.8-102.4-32-149.333333H746.666667zM753.066667 501.333333s0-2.133333-2.133334-2.133333l2.133334 2.133333z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="Calculator" unicode="&#59410;"
+				   d="M864.128 849.450667c38.698667 0 70.272-31.36 70.272-69.738667v-764.522667c0-12.842667 10.496-23.253333 23.466667-23.253333 12.970667 0 23.466667 10.410667 23.466666 23.253333V779.733333C981.333333 843.754667 928.789333 896 864.128 896H42.666667v-907.456C42.666667-75.861333 95.082667-128 159.850667-128H870.186667c12.970667 0 23.466667 10.410667 23.466666 23.253333 0 12.864-10.496 23.296-23.466666 23.296H159.850667A70.08 70.08 0 0 0 89.6-11.456V849.450667h774.528zM197.696 725.333333h628.608v-64H197.696V725.333333zM874.666667 768H149.333333v-149.333333h725.333334V768zM174.08 426.666667h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333333s-11.093333 21.333333-24.746667 21.333333H174.08C160.426667 469.333333 149.333333 459.776 149.333333 448s11.093333-21.333333 24.746667-21.333333zM430.08 426.666667h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333333s-11.093333 21.333333-24.746667 21.333333h-163.84c-13.653333 0-24.746667-9.557333-24.746667-21.333333s11.093333-21.333333 24.746667-21.333333zM174.08 256h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333333s-11.093333 21.333333-24.746667 21.333334H174.08C160.426667 298.666667 149.333333 289.109333 149.333333 277.333333s11.093333-21.333333 24.746667-21.333333zM430.08 256h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333333s-11.093333 21.333333-24.746667 21.333334h-163.84c-13.653333 0-24.746667-9.557333-24.746667-21.333334s11.093333-21.333333 24.746667-21.333333zM174.08 149.333333h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333334s-11.093333 21.333333-24.746667 21.333333H174.08C160.426667 192 149.333333 182.442667 149.333333 170.666667s11.093333-21.333333 24.746667-21.333334zM430.08 149.333333h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333334s-11.093333 21.333333-24.746667 21.333333h-163.84c-13.653333 0-24.746667-9.557333-24.746667-21.333333s11.093333-21.333333 24.746667-21.333334zM174.08 21.333333h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333334s-11.093333 21.333333-24.746667 21.333333H174.08C160.426667 64 149.333333 54.442667 149.333333 42.666667s11.093333-21.333333 24.746667-21.333334zM430.08 21.333333h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333334s-11.093333 21.333333-24.746667 21.333333h-163.84c-13.653333 0-24.746667-9.557333-24.746667-21.333333s11.093333-21.333333 24.746667-21.333334zM686.08 426.666667h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333333s-11.093333 21.333333-24.746667 21.333333h-163.84c-13.653333 0-24.746667-9.557333-24.746667-21.333333s11.093333-21.333333 24.746667-21.333333zM686.08 256h163.84c13.653333 0 24.746667 9.557333 24.746667 21.333333s-11.093333 21.333333-24.746667 21.333334h-163.84c-13.653333 0-24.746667-9.557333-24.746667-21.333334s11.093333-21.333333 24.746667-21.333333zM708.736 143.253333c0 0.106667 118.464 0 118.464 0 0.085333 0 0.064-73.173333 0.064-73.173333 0-0.106667-118.464 0-118.464 0-0.085333 0-0.064 73.173333-0.064 73.173333z m-47.402667 0v-73.173333C661.333333 43.093333 682.581333 21.333333 708.8 21.333333h118.4C853.610667 21.333333 874.666667 43.093333 874.666667 70.08v73.173333C874.666667 170.24 853.418667 192 827.2 192h-118.4C682.389333 192 661.333333 170.24 661.333333 143.253333z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="video" unicode="&#59424;"
+				   d="M49.770667 696.896H658.773333c19.925333-5.674667 33.493333-14.336 42.24-25.024 8.448-10.24 11.157333-20.117333 11.157334-25.066667v-214.250666l262.357333 168.682666v-414.826666l-262.357333 168.661333v-148.096a24.896 24.896 0 1 1 49.770666 0v62.442667l262.378667-174.186667V692.394667L761.92 523.733333v123.093334c0 15.488-5.696 36.266667-22.464 56.661333-16 19.477333-39.573333 34.133333-71.104 42.368L665.258667 746.666667H0v-608.96l0.768-3.029334c2.986667-11.669333 9.173333-27.989333 19.690667-44.629333 18.730667-29.653333 44.906667-48.725333 79.146666-49.066667h637.44a24.896 24.896 0 0 1 0 49.770667H99.84c-14.4 0.149333-26.752 9.130667-37.333333 25.877333a120.213333 120.213333 0 0 0-12.757334 27.690667V696.896zM205.909333 571.52a46.506667 46.506667 0 1 0-92.992 0.042667 46.506667 46.506667 0 0 0 92.992-0.021334z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="earth" unicode="&#59432;"
+				   d="M996.352 541.696c-88.064 267.776-376.832 412.672-644.096 325.12-267.776-88.064-413.184-376.32-325.12-644.096 88.064-267.776 376.832-412.672 644.096-325.12 109.568 36.352 197.632 107.008 259.584 195.072 2.56 4.608 3.072 10.24 1.024 16.384-4.096 12.288-16.384 18.432-28.672 14.336-6.656-2.048-10.752-6.144-13.312-11.776-55.296-77.312-134.144-139.264-231.424-171.008-155.136-51.2-318.464-15.36-436.224 80.896l23.04 155.648-90.624 84.992h-87.552c-21.504 82.432-19.968 165.888 2.048 243.2l131.584 22.016 41.472 103.936 82.944 41.472 19.456 137.728c8.192 3.072 16.384 6.144 24.576 8.704 93.696 30.72 189.952 30.208 277.504 3.584l-17.92-106.496-157.696-137.728-150.528-258.048 201.728-179.712 186.88 70.144-19.968 138.752 132.096 32.768 81.92-81.92 70.144 29.184c-1.024-9.216-2.048-17.92-4.096-27.136v-0.512c0-2.56 0-4.608 0.512-6.656 4.096-12.288 16.896-17.92 28.672-14.336 9.216 3.072 15.36 11.264 15.36 20.992 12.8 77.824 8.704 159.744-17.408 239.616z m-793.6-378.368l-16.384-109.568c-46.08 46.592-82.944 103.424-107.008 168.448h58.368l65.024-58.88z m85.504 535.552l-77.824-38.912-38.912-96.768-88.064-14.848c39.936 101.888 115.712 189.44 217.6 241.664l-12.8-91.136zM834.56 426.496l-188.928-47.104 20.48-142.336-134.144-50.176-159.232 141.824 130.56 223.744 163.328 142.848 18.944 113.664c122.368-49.152 223.232-149.504 267.264-284.672 16.384-49.664 24.576-100.352 24.064-150.016l-63.488-26.624-78.848 78.848z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="task-management" unicode="&#59433;"
+				   d="M37.298973 690.102498c6.293019 0 12.587044 2.297707 17.549971 7.001864L218.590269 851.653853c10.246041 9.644932 10.740421 25.8195 1.0532 36.086686-9.666077 10.246041-25.883941 10.761565-36.086686 1.031048L19.771154 734.222096c-10.267186-9.666077-10.740421-25.840645-1.052192-36.129982 5.047504-5.284122 11.834903-7.990623 18.580011-7.990623zM986.425141 690.102498a25.375465 25.375465 0 0 0-17.549971 7.001864L805.131831 851.653853c-10.246041 9.644932-10.739414 25.8195-1.052193 36.086686 9.666077 10.246041 25.883941 10.761565 36.086686 1.031048L1003.95296 734.222096c10.267186-9.666077 10.739414-25.840645 1.052192-36.129982-5.047504-5.284122-11.83591-7.990623-18.580011-7.990623zM514.029876 852.127088c-270.542411 0-489.898918-219.3555-489.898918-489.876767 0-270.672299 219.334356-489.920063 489.898918-489.920063 112.340956 0 218.926568 37.955461 305.040236 106.541309 10.310482 8.1628 12.028224 23.220735 3.779839 33.552362s-23.263025 12.029231-33.573507 3.780846c-77.650816-61.841746-173.773908-96.102954-275.225423-96.102954-244.165097 0-442.083052 197.961251-442.083052 442.1485 0 244.121801 197.89681 442.061908 442.083052 442.061907 244.187249 0 442.105204-197.940106 442.105203-442.061907 0-83.730376-23.284169-163.958812-66.588193-233.490124-6.938431-11.169353-3.523084-25.947375 7.668421-32.929102 11.190498-6.959575 25.905086-3.479788 32.90695 7.647277 47.987036 77.049707 73.827681 166.019902 73.827682 258.771949-0.021145 270.521266-219.3555 489.876767-489.941208 489.876767zM816.4059 385.943284c-0.472228 0-0.966608-0.043296-1.459981-0.043296-0.215473 0-0.429939 0.021145-0.579964 0.021145H530.483351V669.80273c0 0.451084-0.021145 0.902167-0.06444 1.35325 0.043296 0.451084 0.064441 0.945463 0.06444 1.396547 0 14.52026-11.620437 26.269577-25.969526 26.269577-14.370234 0-25.990671-11.749318-25.990671-26.269577 0-0.451084 0.043296-0.923312 0.064441-1.374395-0.043296-0.451084-0.085585-0.902167-0.085585-1.375402v-283.602691c-14.477971 0-26.227288-11.577141-26.24944-25.905085-0.021145-12.973687 9.516051-23.714108 22.038655-25.711764a12.898171 12.898171 0 0 1 4.081904-0.66555h0.085585v-0.128881c0-0.579965 0.064441-1.267666 0.151032-1.782183 1.030041-13.597955 12.200401-24.316224 25.92623-24.316224 14.348083 0 25.947375 11.770462 25.969526 26.227288h283.860453c0.515524 0 0.987752 0 1.39554 0.043296h0.537675c14.52026-0.043296 26.291729 11.577141 26.356169 25.882934-0.022151 14.392385-11.728173 26.056118-26.249439 26.098407z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="trust" unicode="&#59434;"
+				   d="M776.682667 802.410667l-151.701334-76.394667 36.693334-72.938667c-1.728-0.64-3.029333-1.728-4.522667-2.816-4.970667-3.882667-20.501333-14.250667-33.450667-16.618666-25.216-3.136-40.832 9.685333-62.592 2.581333-12.309333-3.029333-30.869333-14.250667-51.370666-29.354667-18.773333 10.581333-50.709333 27.2-69.056 29.568-15.573333 1.877333-42.517333-3.029333-49.642667-2.368-11.008 0.874667-25.472 9.28-31.722667 13.589334l39.488 78.336-151.488 76.394666L0 311.466667l151.722667-76.181334 188.181333 373.568c10.368-6.464 32.170667-17.898667 51.2-17.898666 16.170667 0 25.642667 5.013333 43.754667 2.773333 6.464-0.853333 21.589333-7.552 37.76-15.744a1837.546667 1837.546667 0 0 1-85.461334-75.541333c-30.549333-32.746667-31.018667-73.109333-7.552-100.736 27.328-34.005333 59.882667-25.621333 88.277334-13.866667l80.448 41.536c11.669333 6.165333 19.776 10.432 19.882666 10.261333l170.261334-147.178666c5.824-5.184 9.493333-12.074667 10.133333-19.861334 0.64-7.978667-1.728-15.530667-6.912-21.354666-18.346667-21.589333-31.722667-10.133333-31.722667-10.133334l-32.810666 25.237334-26.538667-34.090667s24.768-18.709333 32.597333-25.472c4.736-4.074667 5.184-7.765333 4.757334-10.794667-0.426667-6.037333-4.309333-13.376-10.794667-20.928-9.92-11.648-17.258667-14.890667-22.656-14.890666-4.970667 0-8.192 2.816-9.92 4.309333a7153.130667 7153.130667 0 0 1-38.848 28.48l-25.898667-34.538667 37.973334-28.266666c4.522667-4.309333 4.970667-7.765333 4.757333-11.008-0.64-5.824-4.757333-13.589333-11.221333-21.354667-6.912-7.765333-13.802667-13.162667-20.074667-14.890667-3.648-0.981333-6.656-1.322667-12.074667 2.816l-46.186666 37.546667-27.2-33.450667 44.245333-36.032c5.824-4.757333 6.250667-8.64 5.824-12.074666-0.64-6.037333-4.757333-13.589333-11.434667-21.376a29.184 29.184 0 0 0-19.648-10.133334c-7.765333-0.64-15.317333 1.941333-22.442666 7.765334l-206.4 173.909333c-9.706667 7.125333-23.082667 5.184-30.208-4.309333s-5.184-23.082667 4.309333-30.208l205.525333-173.056a71.594667 71.594667 0 0 1 46.613334-17.258667c26.325333 1.066667 41.6 11.605333 55.253333 25.258667 19.2 19.2 21.589333 47.04 21.589333 48.128 1.301333 0.426667 32.597333 14.890667 45.098667 29.568 18.261333 20.416 21.568 41.728 21.589333 48.341333 15.317333 3.242667 30.656 12.736 44.245334 28.693333 13.162667 15.530667 20.288 32.149333 21.141333 47.701334 0.853333 0.213333 26.88 7.829333 43.584 28.48 7.125333 8.426667 12.074667 18.133333 14.677333 28.693333 0.853333 0.426667 55.68 37.333333 55.68 37.333333l27.2-53.952L1024 311.466667 776.682667 802.410667zM132.501333 293.12l-74.453333 37.546667 208.256 413.909333 74.666667-37.546667L132.501333 293.12z m652.608 7.765333a72.704 72.704 0 0 1-18.56 24.384l-180.842666 156.458667a21.781333 21.781333 0 0 1-23.744 3.029333c-3.242667-1.514667-80.597333-42.069333-107.754667-57.792-14.72-8.448-32.277333-9.770667-42.453333 5.525334-9.770667 14.442667-5.482667 27.989333 4.117333 37.589333 59.562667 56.106667 135.914667 119.509333 155.370667 124.096 20.522667 5.696 32.234667-5.994667 60.202666-2.816 21.632 1.813333 42.944 18.133333 49.856 23.082667l144.149334-286.165334-40.341334-27.392zM683.029333 707.029333l74.453334 37.546667L965.952 330.666667l-74.666667-37.546667-208.256 413.909333z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="password" unicode="&#59435;"
+				   d="M136.533568 435.434955V-51.412741A25.599984 25.599984 0 0 1 162.176219-76.799392h691.114234c14.335991 0 25.642651 11.30666 25.642651 25.365317V435.413621a25.599984 25.599984 0 0 1-25.642651 25.365318H162.176219c-14.335991 0-25.642651-11.30666-25.642651-25.365318z m-51.199968 0A76.543952 76.543952 0 0 0 162.176219 512.00024h691.114234a76.799952 76.799952 0 0 0 76.842619-76.565285V-51.412741A76.543952 76.543952 0 0 0 853.290453-127.99936H162.176219A76.799952 76.799952 0 0 0 85.3336-51.434075V435.413621zM290.133472 678.400136c0 91.733276 74.60262 166.399896 166.421229 166.399896H546.133312a166.442563 166.442563 0 0 0 166.421229-166.399896v-91.519943s7.082662-17.557322 27.221317-17.557322c20.159987 0 23.978652 17.535989 23.978651 17.535989V678.400136C763.733176 798.570728 666.239904 896 546.111979 896H456.533368C336.362776 896 238.933504 798.336061 238.933504 678.400136v-191.99988l51.199968 9.813327V678.400136z m0 0c0 91.733276 74.60262 166.399896 166.421229 166.399896H546.133312a166.442563 166.442563 0 0 0 166.421229-166.399896v-91.519943h51.199968V678.400136C763.733176 798.570728 666.239904 896 546.111979 896H456.533368C336.362776 896 238.933504 798.336061 238.933504 678.400136v-191.99988l51.199968 9.813327V678.400136zM495.829343 319.168361v-241.130516a25.599984 25.599984 0 1 1 51.199968 0V319.168361a25.599984 25.599984 0 1 1-51.199968 0z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="column" unicode="&#59449;"
+				   d="M307.2-12.8h51.2V780.8h-51.2v-793.6z m332.8 0h51.2V780.8H640v-793.6z m-512.021333 0A76.885333 76.885333 0 0 0 51.2 63.914667V806.4L25.6 780.8h870.528A76.672 76.672 0 0 0 972.8 703.808V49.493333a25.6 25.6 0 1 1 51.2 0V703.786667A127.872 127.872 0 0 1 896.128 832H25.6A25.6 25.6 0 0 1 0 806.4v-742.485333A128.085333 128.085333 0 0 1 127.978667-64H896a25.6 25.6 0 1 1 0 51.2H127.978667z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="apparel" unicode="&#59450;"
+				   d="M367.701333 480.96l4.074667-18.304-11.392-20.096 217.386667-3.669333a20.757333 20.757333 0 0 1 0.533333 41.536l-210.602667 0.533333z m301.056-11.136l-1.408-7.274667 3.52-6.528 299.242667-556.373333 18.282667 30.613333H35.648l18.090667-30.976 314.176 556.373334 3.946666 6.976-1.770666 7.808-87.978667 387.648-20.245333-25.344h87.978666l-17.493333 9.536c0.768-1.152 2.090667-3.2 4.010667-5.952a483.157333 483.157333 0 0 1 48.917333-60.074667c40.768-42.410667 82.197333-68.48 123.946667-69.184h3.136c42.282667 0.661333 82.944 26.944 121.92 69.589333a446.442667 446.442667 0 0 1 49.834666 66.282667l-17.877333-10.197333h98.304l-20.373333 24.725333-75.413334-387.648zM789.76 874.24H654.4l-6.037333-10.197333a405.504 405.504 0 0 0-44.736-59.392C571.669333 769.706667 539.690667 749.013333 511.701333 748.586667c-29.610667 0.469333-62.72 21.333333-96.512 56.469333a442.218667 442.218667 0 0 0-47.893333 59.669333l-6.122667 9.536h-125.312l5.76-25.344 87.957334-387.669333 2.176 14.805333L17.578667-80.32l-17.493334-30.954667H1023.146667l-16.469334 30.592-299.242666 556.373334 2.090666-13.802667 75.413334 387.648 4.8 24.746667z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="bags" unicode="&#59451;"
+				   d="M311.616042 579.050733h389.909252c121.322641 0 219.519954-98.090646 219.519954-219.434621V-55.039802c0-13.418664-10.815998-24.213328-24.362661-24.213328H116.458749a24.405328 24.405328 0 0 0-24.362662 24.213328V359.616112c0 121.109308 98.410646 219.434621 219.519955 219.434621zM43.328098-55.039802A73.173318 73.173318 0 0 1 116.480082-127.999787h780.223838a72.959985 72.959985 0 0 1 73.130651 72.959985V359.637445c0 148.266636-120.042642 268.202611-268.287944 268.202611H311.616042c-148.053302 0-268.287944-120.149308-268.287944-268.202611V-55.039802z m268.20261 512.17056c13.567997 0 24.383995-10.815998 24.383995-24.533328v-72.853318c0-13.65333-10.837331-24.533328-24.383995-24.533329a24.277328 24.277328 0 0 0-24.383994 24.533329v72.853318c0 13.65333 10.815998 24.533328 24.383994 24.533328z m-73.151984-97.386646a73.045318 73.045318 0 0 1 73.151984-73.279985c40.533325 0 73.130651 32.767993 73.130652 73.279985v72.853318a73.045318 73.045318 0 0 1-73.130652 73.279985 73.087985 73.087985 0 0 1-73.151984-73.279985v-72.853318z m438.869242 97.386646c13.567997 0 24.362662-10.815998 24.362661-24.533328v-72.853318c0-13.65333-10.815998-24.533328-24.362661-24.533329a24.277328 24.277328 0 0 0-24.383995 24.533329v72.853318c0 13.65333 10.815998 24.533328 24.383995 24.533328z m-73.151985-97.386646a73.045318 73.045318 0 0 1 73.151985-73.279985c40.533325 0 73.130651 32.767993 73.130651 73.279985v72.853318a73.045318 73.045318 0 0 1-73.130651 73.279985 73.087985 73.087985 0 0 1-73.151985-73.279985v-72.853318z m-268.181278 316.799934c0 94.186647 76.543984 170.666631 170.666631 170.666631 94.165314 0 170.666631-76.543984 170.666632-170.666631v-195.050626h48.746656v195.050626C725.994622 797.610687 627.690643 896 506.581334 896 385.536026 896 287.146714 797.69602 287.146714 676.565379v-195.050626h48.767989v195.050626zM762.666614 42.666844a24.383995 24.383995 0 1 1 0 48.76799H92.096087V42.666844h670.591861z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="folder" unicode="&#59452;"
+				   d="M1228.544 589.696a153.6256 153.6256 0 0 1-153.6256 153.9072h-460.032l21.4272-8.7808L481.024 887.04 472.064 895.744H0.9472v-863.36c0-85.248 68.6592-154.368 153.2928-154.368h906.4448c16.9472 0 30.72 13.824 30.72 30.8224 0 17.0496-13.7728 30.848-30.72 30.848H154.2144c-50.688 0-91.904 41.4976-91.904 92.672V864.9216l-30.72-30.8224h428.032l-21.4272 8.7552 155.264-152.192 8.9344-8.7552h472.5248a92.1088 92.1088 0 0 0 92.2368-92.2112V46.08c0-17.024 13.7216-30.8224 30.6688-30.8224 16.9728 0 30.72 13.7984 30.72 30.8224V589.696z m-61.3888-172.032l0.2048 61.696H62.4128v-61.696h1104.7424z"
+				   horiz-adv-x="1228"/>
+
+
+			<glyph glyph-name="column1" unicode="&#59453;"
+				   d="M127.978667-12.8A76.885333 76.885333 0 0 0 51.2 63.914667V806.4L25.6 780.8h870.528A76.672 76.672 0 0 0 972.8 703.808V49.493333a25.6 25.6 0 1 1 51.2 0V703.786667A127.872 127.872 0 0 1 896.128 832H25.6A25.6 25.6 0 0 1 0 806.4v-742.485333A128.085333 128.085333 0 0 1 127.978667-64H896a25.6 25.6 0 1 1 0 51.2H127.978667z m102.421333 0h51.2V780.8h-51.2v-793.6z m256 0h51.2V780.8h-51.2v-793.6z m256 0h51.2V780.8h-51.2v-793.6z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="code" unicode="&#59458;"
+				   d="M335.168 375.584m-50.528 0a50.528 50.528 0 1 1 101.056 0 50.528 50.528 0 1 1-101.056 0ZM537.248 375.584m-50.528 0a50.528 50.528 0 1 1 101.056 0 50.528 50.528 0 1 1-101.056 0ZM739.36 375.584m-50.528 0a50.528 50.528 0 1 1 101.056 0 50.528 50.528 0 1 1-101.056 0ZM548.192 72.768h-187.776a302.816 302.816 0 1 0 0 605.632h303.168a302.816 302.816 0 0 0 302.816-302.816v-3.712a299.104 299.104 0 0 0-299.104-299.104 25.6 25.6 0 1 1 0-51.2c193.472 0 350.304 156.8 350.304 350.304v3.712C1017.6 571.104 859.104 729.6 663.584 729.6h-303.168C164.896 729.6 6.4 571.104 6.4 375.584s158.496-354.016 354.016-354.016h187.776a25.6 25.6 0 1 1 0 51.2z"
+				   horiz-adv-x="1024"/>
+
+
+			<glyph glyph-name="RFQ-filling1" unicode="&#59459;"
+				   d="M0 102.733492V665.266508c0 69.708108 46.655654 130.792476 113.907546 149.13453l7.084973 1.931762a2232.858292 2232.858292 0 0 0 1175.008173 0l7.084973-1.931762c67.251892-18.342054 113.907546-79.426422 113.907546-149.13453v-562.533016c0-69.708108-46.655654-130.792476-113.907546-149.13453l-7.084973-1.931762a2232.858292 2232.858292 0 0 0-1175.008173 0l-7.084973 1.931762C46.655654-28.058984 0 33.025384 0 102.733492z m1031.775481 525.638573c-62.8736 0-120.277103-23.852281-163.67533-62.96493v62.977384H542.241211v-456.037016L424.211373 320.954811c50.236886 26.945038 84.410811 79.945341 84.410811 140.941146v3.262962c0 90.094011-73.020886 163.138422-163.114898 163.167481l-190.465383 0.058119v-489.50106h97.899935V302.049557h66.268021l117.28813-163.171633h132.325708l-0.004151 0.004152h71.3216V331.825816h152.454227c23.841211-110.14227 122.017903-192.954811 239.180108-192.954811 12.434681 0 24.621665 0.920216 36.558184 2.727438v99.756973a148.116065 148.116065 0 0 0-36.558184-4.569254c-81.086962 0-146.836065 65.749103-146.836065 146.836065 0 81.122941 65.749103 146.872043 146.836065 146.872043 81.122941 0 146.872043-65.749103 146.872043-146.872043 0-12.611805-1.594119-24.833384-4.605232-36.523589h99.755589a243.460151 243.460151 0 0 1 2.727438 36.523589c0.001384 134.967351-109.781103 244.749838-244.749838 244.749838z m229.775914-332.805535H1156.275892l-106.273211 106.282897c-10.064259 10.064259-26.368 10.064259-36.432259 0s-10.064259-26.368 0-36.430876l106.280129-106.288432v-105.261665l90.171503-90.172886v141.699459h141.69946l-90.170119 90.171503zM252.941838 530.4832h92.043762c36.046184 0 65.267546-29.221362 65.267546-65.266162v-8.158789c0-36.046184-29.221362-65.266162-65.267546-65.266163H252.941838V530.4832zM640.141146 530.4832h195.979762c-23.585211-31.341319-39.82253-68.502832-46.140886-108.916238H640.141146v108.916238z"
+				   horiz-adv-x="1416"/>
+
+
+		</font>
+	</defs>
+</svg>
diff --git a/len-sys/src/main/resources/plugin/x-admin/js/xadmin.js b/len-sys/src/main/resources/plugin/x-admin/js/xadmin.js
index ea0c87a..a0ba70e 100644
--- a/len-sys/src/main/resources/plugin/x-admin/js/xadmin.js
+++ b/len-sys/src/main/resources/plugin/x-admin/js/xadmin.js
@@ -1,132 +1,132 @@
 $(function () {
-    //加载弹出层
-    layui.use(['form', 'element'],
-        function () {
-            layer = layui.layer;
-            element = layui.element;
-        });
-
-    //触发事件
-    var tab = {
-        tabAdd: function (title, url, id) {
-            //新增一个Tab项
-            element.tabAdd('xbs_tab', {
-                title: title
-                ,
-                content: '<iframe tab-id="' + id + '" frameborder="0" src="' + url + '" scrolling="yes" class="x-iframe"></iframe>'
-                ,
-                id: id
-            })
-        }
-        , tabDelete: function (othis) {
-            //删除指定Tab项
-            element.tabDelete('xbs_tab', '44'); //删除：“商品管理”
-
-
-            othis.addClass('layui-btn-disabled');
-        }
-        , tabChange: function (id) {
-            //切换到指定Tab项
-            element.tabChange('xbs_tab', id); //切换到：用户管理
-        }
-    };
-
-
-    tableCheck = {
-        init: function () {
-            $(".layui-form-checkbox").click(function (event) {
-                if ($(this).hasClass('layui-form-checked')) {
-                    $(this).removeClass('layui-form-checked');
-                    if ($(this).hasClass('header')) {
-                        $(".layui-form-checkbox").removeClass('layui-form-checked');
-                    }
-                } else {
-                    $(this).addClass('layui-form-checked');
-                    if ($(this).hasClass('header')) {
-                        $(".layui-form-checkbox").addClass('layui-form-checked');
-                    }
-                }
-
-            });
-        },
-        getData: function () {
-            var obj = $(".layui-form-checked").not('.header');
-            var arr = [];
-            obj.each(function (index, el) {
-                arr.push(obj.eq(index).attr('data-id'));
-            });
-            return arr;
-        }
-    }
-
-    //开启表格多选
-    tableCheck.init();
-
-
-    $('.container .left_open i').click(function (event) {
-        if ($('.left-nav').css('left') == '0px') {
-            $('.left-nav').animate({left: '-221px'}, 100);
-            $('.page-content').animate({left: '0px'}, 100);
-            $('.page-content-bg').hide();
-        } else {
-            $('.left-nav').animate({left: '0px'}, 100);
-            $('.page-content').animate({left: '221px'}, 100);
-            if ($(window).width() < 768) {
-                $('.page-content-bg').show();
-            }
-        }
-
-    });
-
-    $('.page-content-bg').click(function (event) {
-        $('.left-nav').animate({left: '-221px'}, 100);
-        $('.page-content').animate({left: '0px'}, 100);
-        $(this).hide();
-    });
-
-    $('.layui-tab-close').click(function (event) {
-        $('.layui-tab-title li').eq(0).find('i').remove();
-    });
-
-    //左侧菜单效果
-    // $('#content').bind("click",function(event){
-    $('.left-nav #nav li').click(function (event) {
-
-        if ($(this).children('.sub-menu').length) {
-            if ($(this).hasClass('open')) {
-                $(this).removeClass('open');
-                $(this).find('.nav_right').html('&#xe697;');
-                $(this).children('.sub-menu').stop().slideUp();
-                $(this).siblings().children('.sub-menu').slideUp();
-            } else {
-                $(this).addClass('open');
-                $(this).children('a').find('.nav_right').html('&#xe6a6;');
-                $(this).children('.sub-menu').stop().slideDown();
-                $(this).siblings().children('.sub-menu').stop().slideUp();
-                $(this).siblings().find('.nav_right').html('&#xe697;');
-                $(this).siblings().removeClass('open');
-            }
-        } else {
-
-            var url = $(this).children('a').attr('_href');
-            var title = $(this).find('cite').html();
-            var index = $('.left-nav #nav li').index($(this));
-
-            for (var i = 0; i < $('.x-iframe').length; i++) {
-                if ($('.x-iframe').eq(i).attr('tab-id') == index + 1) {
-                    tab.tabChange(index + 1);
-                    event.stopPropagation();
-                    return;
-                }
-            }
-
-            tab.tabAdd(title, url, index + 1);
-            tab.tabChange(index + 1);
-        }
-
-        event.stopPropagation();
-
-    })
+	//加载弹出层
+	layui.use(['form', 'element'],
+		function () {
+			layer = layui.layer;
+			element = layui.element;
+		});
+
+	//触发事件
+	var tab = {
+		tabAdd: function (title, url, id) {
+			//新增一个Tab项
+			element.tabAdd('xbs_tab', {
+				title: title
+				,
+				content: '<iframe tab-id="' + id + '" frameborder="0" src="' + url + '" scrolling="yes" class="x-iframe"></iframe>'
+				,
+				id: id
+			})
+		}
+		, tabDelete: function (othis) {
+			//删除指定Tab项
+			element.tabDelete('xbs_tab', '44'); //删除：“商品管理”
+
+
+			othis.addClass('layui-btn-disabled');
+		}
+		, tabChange: function (id) {
+			//切换到指定Tab项
+			element.tabChange('xbs_tab', id); //切换到：用户管理
+		}
+	};
+
+
+	tableCheck = {
+		init: function () {
+			$(".layui-form-checkbox").click(function (event) {
+				if ($(this).hasClass('layui-form-checked')) {
+					$(this).removeClass('layui-form-checked');
+					if ($(this).hasClass('header')) {
+						$(".layui-form-checkbox").removeClass('layui-form-checked');
+					}
+				} else {
+					$(this).addClass('layui-form-checked');
+					if ($(this).hasClass('header')) {
+						$(".layui-form-checkbox").addClass('layui-form-checked');
+					}
+				}
+
+			});
+		},
+		getData: function () {
+			var obj = $(".layui-form-checked").not('.header');
+			var arr = [];
+			obj.each(function (index, el) {
+				arr.push(obj.eq(index).attr('data-id'));
+			});
+			return arr;
+		}
+	}
+
+	//开启表格多选
+	tableCheck.init();
+
+
+	$('.container .left_open i').click(function (event) {
+		if ($('.left-nav').css('left') == '0px') {
+			$('.left-nav').animate({left: '-221px'}, 100);
+			$('.page-content').animate({left: '0px'}, 100);
+			$('.page-content-bg').hide();
+		} else {
+			$('.left-nav').animate({left: '0px'}, 100);
+			$('.page-content').animate({left: '221px'}, 100);
+			if ($(window).width() < 768) {
+				$('.page-content-bg').show();
+			}
+		}
+
+	});
+
+	$('.page-content-bg').click(function (event) {
+		$('.left-nav').animate({left: '-221px'}, 100);
+		$('.page-content').animate({left: '0px'}, 100);
+		$(this).hide();
+	});
+
+	$('.layui-tab-close').click(function (event) {
+		$('.layui-tab-title li').eq(0).find('i').remove();
+	});
+
+	//左侧菜单效果
+	// $('#content').bind("click",function(event){
+	$('.left-nav #nav li').click(function (event) {
+
+		if ($(this).children('.sub-menu').length) {
+			if ($(this).hasClass('open')) {
+				$(this).removeClass('open');
+				$(this).find('.nav_right').html('&#xe697;');
+				$(this).children('.sub-menu').stop().slideUp();
+				$(this).siblings().children('.sub-menu').slideUp();
+			} else {
+				$(this).addClass('open');
+				$(this).children('a').find('.nav_right').html('&#xe6a6;');
+				$(this).children('.sub-menu').stop().slideDown();
+				$(this).siblings().children('.sub-menu').stop().slideUp();
+				$(this).siblings().find('.nav_right').html('&#xe697;');
+				$(this).siblings().removeClass('open');
+			}
+		} else {
+
+			var url = $(this).children('a').attr('_href');
+			var title = $(this).find('cite').html();
+			var index = $('.left-nav #nav li').index($(this));
+
+			for (var i = 0; i < $('.x-iframe').length; i++) {
+				if ($('.x-iframe').eq(i).attr('tab-id') == index + 1) {
+					tab.tabChange(index + 1);
+					event.stopPropagation();
+					return;
+				}
+			}
+
+			tab.tabAdd(title, url, index + 1);
+			tab.tabChange(index + 1);
+		}
+
+		event.stopPropagation();
+
+	})
 
 });
 
diff --git a/len-sys/src/main/resources/plugin/ztree/css/awesomeStyle/awesome.css b/len-sys/src/main/resources/plugin/ztree/css/awesomeStyle/awesome.css
index c1fcf3a..7f4af89 100644
--- a/len-sys/src/main/resources/plugin/ztree/css/awesomeStyle/awesome.css
+++ b/len-sys/src/main/resources/plugin/ztree/css/awesomeStyle/awesome.css
@@ -12,375 +12,440 @@ website:    http://code.google.com/p/jquerytree/
 /* Imports  -------------------------*/
 /* End of Imports  ------------------*/
 .ztree * {
-  padding: 0;
-  margin: 0;
-  font-size: 12px;
-  font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif;
-  background-color: #af0000;
+	padding: 0;
+	margin: 0;
+	font-size: 12px;
+	font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif;
+	background-color: #af0000;
 }
+
 .ztree {
-  margin: 0;
-  padding: 5px;
-  color: #ffffff;
-  background-color: #af0000;
+	margin: 0;
+	padding: 5px;
+	color: #ffffff;
+	background-color: #af0000;
 }
+
 .ztree li {
-  padding: 0;
-  margin: 0;
-  list-style: none;
-  line-height: 17px;
-  text-align: left;
-  white-space: nowrap;
-  outline: 0;
+	padding: 0;
+	margin: 0;
+	list-style: none;
+	line-height: 17px;
+	text-align: left;
+	white-space: nowrap;
+	outline: 0;
 }
+
 .ztree li ul {
-  margin: 0px;
-  padding: 0 0 0 18px;
+	margin: 0px;
+	padding: 0 0 0 18px;
 }
+
 .ztree li a {
-  padding-right: 3px;
-  margin: 0;
-  cursor: pointer;
-  height: 17px;
-  color: #ffffff;
-  background-color: transparent;
-  text-decoration: none;
-  vertical-align: top;
-  display: inline-block;
+	padding-right: 3px;
+	margin: 0;
+	cursor: pointer;
+	height: 17px;
+	color: #ffffff;
+	background-color: transparent;
+	text-decoration: none;
+	vertical-align: top;
+	display: inline-block;
 }
+
 .ztree li a input.rename {
-  height: 14px;
-  width: 80px;
-  padding: 0;
-  margin: 0;
-  color: #af0000;
-  background-color: #ffffff;
-  font-size: 12px;
-  border: 1px #585956 solid;
-  *border: 0px;
+	height: 14px;
+	width: 80px;
+	padding: 0;
+	margin: 0;
+	color: #af0000;
+	background-color: #ffffff;
+	font-size: 12px;
+	border: 1px #585956 solid;
+	*border: 0px;
 }
+
 .ztree li a:hover {
-  text-decoration: underline;
+	text-decoration: underline;
 }
+
 .ztree li a.curSelectedNode {
-  padding-top: 0px;
-  background-color: #af4040;
-  color: #ffff00;
-  height: 17px;
-  opacity: 0.8;
+	padding-top: 0px;
+	background-color: #af4040;
+	color: #ffff00;
+	height: 17px;
+	opacity: 0.8;
 }
+
 .ztree li a.curSelectedNode_Edit {
-  padding-top: 0px;
-  background-color: transparent;
-  color: #ffff00;
-  height: 17px;
-  border: 1px #666 solid;
-  opacity: 0.8;
+	padding-top: 0px;
+	background-color: transparent;
+	color: #ffff00;
+	height: 17px;
+	border: 1px #666 solid;
+	opacity: 0.8;
 }
+
 .ztree li a.tmpTargetNode_inner {
-  padding-top: 0px;
-  background-color: #aaa;
-  color: #ffff00;
-  height: 17px;
-  border: 1px #666 solid;
-  opacity: 0.8;
-  filter: alpha(opacity=80);
+	padding-top: 0px;
+	background-color: #aaa;
+	color: #ffff00;
+	height: 17px;
+	border: 1px #666 solid;
+	opacity: 0.8;
+	filter: alpha(opacity=80);
 }
+
 .ztree li span {
-  line-height: 17px;
-  margin-right: 2px;
-  background-color: transparent;
+	line-height: 17px;
+	margin-right: 2px;
+	background-color: transparent;
 }
+
 .ztree li span.button {
-  line-height: 0;
-  margin: 0;
-  padding: 0;
-  width: 15px;
-  height: 17px;
-  display: inline-block;
-  vertical-align: top;
-  border: 0px solid;
-  cursor: pointer;
-  outline: none;
-  background-color: transparent;
-  background-repeat: no-repeat;
-  background-attachment: scroll;
+	line-height: 0;
+	margin: 0;
+	padding: 0;
+	width: 15px;
+	height: 17px;
+	display: inline-block;
+	vertical-align: top;
+	border: 0px solid;
+	cursor: pointer;
+	outline: none;
+	background-color: transparent;
+	background-repeat: no-repeat;
+	background-attachment: scroll;
 }
+
 .ztree li span.button::before {
-  color: #ffffff;
-  font-family: FontAwesome;
-  padding-top: 10px;
+	color: #ffffff;
+	font-family: FontAwesome;
+	padding-top: 10px;
 }
+
 .ztree li span.button.chk {
-  margin: 0px;
-  cursor: auto;
-  width: 12px;
-  display: inline-block;
-  padding-top: 10px;
-  padding-left: 2px;
+	margin: 0px;
+	cursor: auto;
+	width: 12px;
+	display: inline-block;
+	padding-top: 10px;
+	padding-left: 2px;
 }
+
 .ztree li span.button.chk.checkbox_false_full::before {
-  content: "\f096";
+	content: "\f096";
 }
+
 .ztree li span.button.chk.checkbox_false_full_focus::before {
-  content: "\f096";
-  color: #ffff00;
+	content: "\f096";
+	color: #ffff00;
 }
+
 .ztree li span.button.chk.checkbox_false_part::before {
-  content: "\f096";
-  color: #aaaaaa;
+	content: "\f096";
+	color: #aaaaaa;
 }
+
 .ztree li span.button.chk.checkbox_false_part_focus::before {
-  content: "\f096";
-  color: #cad96c;
+	content: "\f096";
+	color: #cad96c;
 }
+
 .ztree li span.button.chk.checkbox_false_disable::before {
-  content: "\f096";
-  color: #808080;
+	content: "\f096";
+	color: #808080;
 }
+
 .ztree li span.button.chk.checkbox_true_full::before {
-  content: "\f046";
+	content: "\f046";
 }
+
 .ztree li span.button.chk.checkbox_true_full_focus::before {
-  content: "\f046";
+	content: "\f046";
 }
+
 .ztree li span.button.chk.checkbox_true_part::before {
-  content: "\f14a";
+	content: "\f14a";
 }
+
 .ztree li span.button.chk.checkbox_true_part_focus::before {
-  content: "\f14a";
-  color: #ffff00;
+	content: "\f14a";
+	color: #ffff00;
 }
+
 .ztree li span.button.chk.checkbox_true_full_focus::before {
-  content: "\f046";
-  color: #ffff00;
+	content: "\f046";
+	color: #ffff00;
 }
+
 .ztree li span.button.chk.checkbox_true_part::before {
-  content: "\f046";
-  color: #aaaaaa;
+	content: "\f046";
+	color: #aaaaaa;
 }
+
 .ztree li span.button.chk.checkbox_true_part_focus::before {
-  content: "\f046";
-  color: #cad96c;
+	content: "\f046";
+	color: #cad96c;
 }
+
 .ztree li span.button.chk.checkbox_true_disable::before {
-  content: "\f046";
-  color: #808080;
+	content: "\f046";
+	color: #808080;
 }
+
 .ztree li span.button.chk.radio_false_full::before {
-  content: "\f10c";
+	content: "\f10c";
 }
+
 .ztree li span.button.chk.radio_false_full_focus::before {
-  content: "\f10c";
-  color: #ffff00;
+	content: "\f10c";
+	color: #ffff00;
 }
+
 .ztree li span.button.chk.radio_false_part::before {
-  content: "\f10c";
-  color: #aaaaaa;
+	content: "\f10c";
+	color: #aaaaaa;
 }
+
 .ztree li span.button.chk.radio_false_part_focus::before {
-  content: "\f10c";
-  color: #ffff00;
+	content: "\f10c";
+	color: #ffff00;
 }
+
 .ztree li span.button.chk.radio_false_disable::before {
-  content: "\f1db";
-  color: #808080;
+	content: "\f1db";
+	color: #808080;
 }
+
 .ztree li span.button.chk.radio_true_full::before {
-  content: "\f192";
+	content: "\f192";
 }
+
 .ztree li span.button.chk.radio_true_full_focus::before {
-  content: "\f192";
-  color: #ffff00;
+	content: "\f192";
+	color: #ffff00;
 }
+
 .ztree li span.button.chk.radio_true_part::before {
-  content: "\f192";
-  color: #aaaaaa;
+	content: "\f192";
+	color: #aaaaaa;
 }
+
 .ztree li span.button.chk.radio_true_part_focus::before {
-  content: "\f192";
-  color: #aaaaaa;
+	content: "\f192";
+	color: #aaaaaa;
 }
+
 .ztree li span.button.chk.radio_true_disable::before {
-  content: "\f1db";
-  color: #808080;
+	content: "\f1db";
+	color: #808080;
 }
+
 .ztree li span.button.switch {
-  width: 15px;
-  height: 17px;
+	width: 15px;
+	height: 17px;
 }
+
 .ztree li span.button.root_open::before {
-  content: "\f078";
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
+	content: "\f078";
+	padding-top: 10px;
+	padding-left: 2px;
+	display: inline-block;
 }
+
 .ztree li span.button.root_close::before {
-  content: "\f115";
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
+	content: "\f115";
+	padding-top: 10px;
+	padding-left: 2px;
+	display: inline-block;
 }
+
 .ztree li span.button.roots_open::before {
-  content: "\f078";
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
+	content: "\f078";
+	padding-top: 10px;
+	padding-left: 2px;
+	display: inline-block;
 }
+
 .ztree li span.button.roots_close::before {
-  content: "\f054";
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
+	content: "\f054";
+	padding-top: 10px;
+	padding-left: 2px;
+	display: inline-block;
 }
+
 .ztree li span.button.center_open::before {
-  content: "\f078";
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
+	content: "\f078";
+	padding-top: 10px;
+	padding-left: 2px;
+	display: inline-block;
 }
+
 .ztree li span.button.center_close::before {
-  content: "\f054";
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
+	content: "\f054";
+	padding-top: 10px;
+	padding-left: 2px;
+	display: inline-block;
 }
+
 .ztree li span.button.bottom_open::before {
-  content: "\f078";
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
+	content: "\f078";
+	padding-top: 10px;
+	padding-left: 2px;
+	display: inline-block;
 }
+
 .ztree li span.button.bottom_close::before {
-  content: "\f054";
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
+	content: "\f054";
+	padding-top: 10px;
+	padding-left: 2px;
+	display: inline-block;
 }
+
 .ztree li span.button.root_docu {
-  background: none;
+	background: none;
 }
+
 .ztree li span.button.roots_docu::before {
-  content: "\f022";
-  padding-left: 2px;
-  display: inline-block;
-  color: #ffffff;
+	content: "\f022";
+	padding-left: 2px;
+	display: inline-block;
+	color: #ffffff;
 }
+
 .ztree li span.button.center_docu::before {
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
-  color: #ffffff;
+	padding-top: 10px;
+	padding-left: 2px;
+	display: inline-block;
+	color: #ffffff;
 }
+
 .ztree li span.button.bottom_docu::before {
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
-  color: #ffffff;
+	padding-top: 10px;
+	padding-left: 2px;
+	display: inline-block;
+	color: #ffffff;
 }
+
 .ztree li span.button.noline_docu {
-  background: none;
+	background: none;
 }
+
 .ztree li span.button.ico_open::before {
-  content: "\f115";
-  font-family: FontAwesome;
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
-  color: #ffffff;
+	content: "\f115";
+	font-family: FontAwesome;
+	padding-top: 10px;
+	padding-left: 2px;
+	display: inline-block;
+	color: #ffffff;
 }
+
 .ztree li span.button.ico_close::before {
-  content: "\f114";
-  font-family: FontAwesome;
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
-  color: #ffffff;
+	content: "\f114";
+	font-family: FontAwesome;
+	padding-top: 10px;
+	padding-left: 2px;
+	display: inline-block;
+	color: #ffffff;
 }
+
 .ztree li span.button.ico_docu::before {
-  content: "\f022";
-  font-family: FontAwesome;
-  padding-top: 10px;
-  padding-left: 2px;
-  display: inline-block;
-  color: #ffffff;
+	content: "\f022";
+	font-family: FontAwesome;
+	padding-top: 10px;
+	padding-left: 2px;
+	display: inline-block;
+	color: #ffffff;
 }
+
 .ztree li span.button.edit {
-  margin-left: 4px;
-  margin-right: -1px;
-  vertical-align: top;
-  *vertical-align: middle;
-  padding-top: 10px;
+	margin-left: 4px;
+	margin-right: -1px;
+	vertical-align: top;
+	*vertical-align: middle;
+	padding-top: 10px;
 }
+
 .ztree li span.button.edit::before {
-  content: "\f044";
-  font-family: FontAwesome;
+	content: "\f044";
+	font-family: FontAwesome;
 }
+
 .ztree li span.button.remove {
-  margin-left: 4px;
-  margin-right: -1px;
-  vertical-align: top;
-  *vertical-align: middle;
-  padding-top: 10px;
+	margin-left: 4px;
+	margin-right: -1px;
+	vertical-align: top;
+	*vertical-align: middle;
+	padding-top: 10px;
 }
+
 .ztree li span.button.remove::before {
-  content: "\f1f8";
-  font-family: FontAwesome;
+	content: "\f1f8";
+	font-family: FontAwesome;
 }
+
 .ztree li span.button.add {
-  margin-left: 4px;
-  margin-right: -1px;
-  vertical-align: top;
-  *vertical-align: middle;
-  padding-top: 10px;
+	margin-left: 4px;
+	margin-right: -1px;
+	vertical-align: top;
+	*vertical-align: middle;
+	padding-top: 10px;
 }
+
 .ztree li span.button.add::before {
-  content: "\f067";
-  font-family: FontAwesome;
+	content: "\f067";
+	font-family: FontAwesome;
 }
+
 .ztree li span.button.ico_loading {
-  margin-right: 2px;
-  background: url(./img/loading.gif) no-repeat scroll 0 0 transparent;
-  vertical-align: top;
-  *vertical-align: middle;
+	margin-right: 2px;
+	background: url(./img/loading.gif) no-repeat scroll 0 0 transparent;
+	vertical-align: top;
+	*vertical-align: middle;
 }
+
 ul.tmpTargetzTree {
-  background-color: #FFE6B0;
-  opacity: 0.8;
-  filter: alpha(opacity=80);
+	background-color: #FFE6B0;
+	opacity: 0.8;
+	filter: alpha(opacity=80);
 }
+
 span.tmpzTreeMove_arrow {
-  width: 16px;
-  height: 17px;
-  display: inline-block;
-  padding: 0;
-  margin: 2px 0 0 1px;
-  border: 0 none;
-  position: absolute;
-  background-color: transparent;
-  background-attachment: scroll;
+	width: 16px;
+	height: 17px;
+	display: inline-block;
+	padding: 0;
+	margin: 2px 0 0 1px;
+	border: 0 none;
+	position: absolute;
+	background-color: transparent;
+	background-attachment: scroll;
 }
+
 span.tmpzTreeMove_arrow::before {
-  content: "\f04b";
-  font-family: FontAwesome;
-  color: #ffff00;
+	content: "\f04b";
+	font-family: FontAwesome;
+	color: #ffff00;
 }
+
 ul.ztree.zTreeDragUL {
-  margin: 0;
-  padding: 0;
-  position: absolute;
-  width: auto;
-  height: auto;
-  overflow: hidden;
-  background-color: #cfcfcf;
-  border: 1px #ffff00 dotted;
-  opacity: 0.8;
-  filter: alpha(opacity=80);
+	margin: 0;
+	padding: 0;
+	position: absolute;
+	width: auto;
+	height: auto;
+	overflow: hidden;
+	background-color: #cfcfcf;
+	border: 1px #ffff00 dotted;
+	opacity: 0.8;
+	filter: alpha(opacity=80);
 }
+
 .ztreeMask {
-  z-index: 10000;
-  background-color: #cfcfcf;
-  opacity: 0.0;
-  filter: alpha(opacity=0);
-  position: absolute;
+	z-index: 10000;
+	background-color: #cfcfcf;
+	opacity: 0.0;
+	filter: alpha(opacity=0);
+	position: absolute;
 }
diff --git a/len-sys/src/main/resources/plugin/ztree/css/awesomeStyle/awesome.less b/len-sys/src/main/resources/plugin/ztree/css/awesomeStyle/awesome.less
index b282d81..e856ccc 100644
--- a/len-sys/src/main/resources/plugin/ztree/css/awesomeStyle/awesome.less
+++ b/len-sys/src/main/resources/plugin/ztree/css/awesomeStyle/awesome.less
@@ -10,7 +10,7 @@ website:    http://code.google.com/p/jquerytree/
 
 /* Definitions ----------------------*/
 @font-size: 12px;
-// Regular icon and text color is white, which suits any medium -> dark background 
+// Regular icon and text color is white, which suits any medium -> dark background
 @color-normal: white;
 // Background color
 @color-bg: #af0000;
@@ -34,113 +34,464 @@ website:    http://code.google.com/p/jquerytree/
 @import "fa.less";
 /* End of Imports  ------------------*/
 
-.ztree * {padding:0; margin:0; font-size:@font-size; font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif; background-color: @color-bg;}
+.ztree * {
+	padding: 0;
+	margin: 0;
+	font-size: @font-size;
+	font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif;
+	background-color: @color-bg;
+}
+
 .ztree {
-    margin:0; padding:5px; color:@color-normal; background-color: @color-bg;
-    li {
-        padding:0; margin:0; list-style:none; line-height:17px; text-align:left; white-space:nowrap; outline:0;
-        ul { 
-            margin: 0px; padding:0 0 0 18px;
-        }
-        ul.line { }
-        a {padding-right:3px; margin:0; cursor:pointer; height:@h; color:@color-normal; background-color: transparent; 
-            text-decoration:none; vertical-align:top; display: inline-block;
-            input.rename {height:14px; width:80px; padding:0; margin:0;
-                          color: @color-bg; background-color: @color-normal;
-                        font-size:@font-size; border:1px #585956 solid; *border:0px}
-        }
-        a:hover {text-decoration:underline}
-        a.curSelectedNode {padding-top:0px; background-color:#af4040; color:@color-highlight; height:@h; opacity:0.8;}
-        a.curSelectedNode_Edit {padding-top:0px; background-color:transparent; color:@color-highlight; height:@h; border:1px #666 solid; opacity:0.8;}
-        a.tmpTargetNode_inner {padding-top:0px; background-color:#aaa; color:@color-highlight; height:@h; border:1px #666 solid;
-          opacity:0.8; filter:alpha(opacity=80)}
-        a.tmpTargetNode_prev {}
-        a.tmpTargetNode_next {}
-        span {line-height:@h; margin-right:2px; background-color:transparent;}
-        span.button {line-height:0; margin:0; padding: 0; width:@w; height:@h; display: inline-block; vertical-align:top;
-          border:0px solid; cursor: pointer;outline:none;
-          background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
- 
-            &::before{color: @color-normal; font-family: FontAwesome; padding-top:@pad-top;}
-            &.chk { margin:0px; cursor: auto; width: 12px;
-                display: inline-block;padding-top:@pad-top;padding-left:@pad-left;
-                
-                &.checkbox_false_full::before {content: @fa-square-o;}
-                &.checkbox_false_full_focus::before {content: @fa-square-o; color:@color-highlight;}
-                &.checkbox_false_part::before {content: @fa-square-o;color: @color-partial;}
-                &.checkbox_false_part_focus::before {content: @fa-square-o; color:@color-partfocus;}
-                &.checkbox_false_disable::before {content: @fa-square-o; color:@color-disabled;}
-                &.checkbox_true_full::before {content: @fa-check-square-o;}
-                &.checkbox_true_full_focus::before {content: @fa-check-square-o;}
-                &.checkbox_true_part::before {content: @fa-check-square;}
-                &.checkbox_true_part_focus::before {content: @fa-check-square; color: @color-highlight}
-                &.checkbox_true_full_focus::before {content: @fa-check-square-o; color: @color-highlight}
-                &.checkbox_true_part::before {content: @fa-check-square-o;color: @color-partial}
-                &.checkbox_true_part_focus::before {content: @fa-check-square-o;color: @color-partfocus;}
-                &.checkbox_true_disable::before {content: @fa-check-square-o;color: @color-disabled}
-                 
-                &.radio_false_full::before {content: @fa-circle-o;}
-                &.radio_false_full_focus::before {content: @fa-circle-o;color: @color-highlight}
-                &.radio_false_part::before {content: @fa-circle-o;color: @color-partial}
-                &.radio_false_part_focus::before {content: @fa-circle-o;color: @color-highlight}
-                &.radio_false_disable::before {content: @fa-circle-thin;color: @color-disabled}
-                &.radio_true_full::before {content: @fa-dot-circle-o;}
-                &.radio_true_full_focus::before {content: @fa-dot-circle-o;color: @color-highlight}
-                &.radio_true_part::before {content: @fa-dot-circle-o;color: @color-partial}
-                &.radio_true_part_focus::before {content: @fa-dot-circle-o;color: @color-partial;}
-                &.radio_true_disable::before {content: @fa-circle-thin;color: @color-disabled}
-                
-            }
-            &.switch  {width:@w; height:@h}
-            &.root_open::before{content: @fa-chevron-down;padding-top:@pad-top;padding-left:@pad-left;display: inline-block;}
-            &.root_close::before{content: @fa-folder-open-o;padding-top:@pad-top;padding-left:@pad-left;display: inline-block;}
-            &.roots_open::before{content: @fa-chevron-down;padding-top:@pad-top;padding-left:@pad-left;display: inline-block;}
-            &.roots_close::before{content: @fa-chevron-right;padding-top:@pad-top;padding-left:@pad-left;display: inline-block;}
-            &.center_open::before{content: @fa-chevron-down;padding-top:@pad-top;padding-left:@pad-left;display: inline-block;}
-            &.center_close::before{content: @fa-chevron-right;padding-top:@pad-top;padding-left:@pad-left;display: inline-block;}
-            &.bottom_open::before{content: @fa-chevron-down;padding-top:@pad-top;padding-left:@pad-left;display: inline-block;}
-            &.bottom_close::before{content: @fa-chevron-right;padding-top:@pad-top;padding-left:@pad-left;display: inline-block;}  
-            &.noline_open{}
-            &.noline_close{}
-            &.root_docu{ background:none;}
-            &.roots_docu::before{content: @fa-list-alt;padding-left:@pad-left;display: inline-block;color:@color-normal;}
-            &.center_docu::before{padding-top:@pad-top;padding-left:@pad-left;display: inline-block;color:@color-normal;}
-            &.bottom_docu::before{padding-top:@pad-top;padding-left:@pad-left;display: inline-block;color:@color-normal;}
-            &.noline_docu{ background:none;}
-    
-            &.ico_open::before {content: @fa-folder-open-o;font-family: FontAwesome;padding-top:@pad-top;padding-left:@pad-left;display: inline-block;color:@color-normal;}
-            &.ico_close::before {content: @fa-folder-o;font-family: FontAwesome;padding-top:@pad-top;padding-left:@pad-left;display: inline-block;color:@color-normal;}
-            &.ico_docu::before{content: @fa-list-alt;font-family: FontAwesome;padding-top:@pad-top;padding-left:@pad-left;display: inline-block;color:@color-normal;}
-            
-            &.edit {margin-left:4px; margin-right: -1px;  vertical-align:top; *vertical-align:middle;padding-top:@pad-top;}
-            &.edit::before{content: @fa-pencil-square-o;font-family: FontAwesome;}
-    
-            &.remove {margin-left:4px; margin-right: -1px;  vertical-align:top; *vertical-align:middle;padding-top:@pad-top;}
-            &.remove::before{content: @fa-trash;font-family: FontAwesome;}
-
-    
-            &.add {margin-left:4px; margin-right: -1px; vertical-align:top; *vertical-align:middle;padding-top:@pad-top;}
-            &.add::before{content: @fa-plus;font-family: FontAwesome;}
-
-            &.ico_loading{margin-right:2px; background:url(./img/loading.gif) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
-        }
-
-    }
+	margin: 0;
+	padding: 5px;
+	color: @color-normal;
+	background-color: @color-bg;
+
+	li {
+		padding: 0;
+		margin: 0;
+		list-style: none;
+		line-height: 17px;
+		text-align: left;
+		white-space: nowrap;
+		outline: 0;
+
+		ul {
+			margin: 0px;
+			padding: 0 0 0 18px;
+		}
+
+		ul.line {
+		}
+
+		a {
+			padding-right: 3px;
+			margin: 0;
+			cursor: pointer;
+			height: @h;
+			color: @color-normal;
+			background-color: transparent;
+			text-decoration: none;
+			vertical-align: top;
+			display: inline-block;
+
+			input.rename {
+				height: 14px;
+				width: 80px;
+				padding: 0;
+				margin: 0;
+				color: @color-bg;
+				background-color: @color-normal;
+				font-size: @font-size;
+				border: 1px #585956 solid;
+				*border: 0px
+			}
+		}
+
+		a:hover {
+			text-decoration: underline
+		}
+
+		a.curSelectedNode {
+			padding-top: 0px;
+			background-color: #af4040;
+			color: @color-highlight;
+			height: @h;
+			opacity: 0.8;
+		}
+
+		a.curSelectedNode_Edit {
+			padding-top: 0px;
+			background-color: transparent;
+			color: @color-highlight;
+			height: @h;
+			border: 1px #666 solid;
+			opacity: 0.8;
+		}
+
+		a.tmpTargetNode_inner {
+			padding-top: 0px;
+			background-color: #aaa;
+			color: @color-highlight;
+			height: @h;
+			border: 1px #666 solid;
+			opacity: 0.8;
+			filter: alpha(opacity=80)
+		}
+
+		a.tmpTargetNode_prev {
+		}
+
+		a.tmpTargetNode_next {
+		}
+
+		span {
+			line-height: @h;
+			margin-right: 2px;
+			background-color: transparent;
+		}
+
+		span.button {
+			line-height: 0;
+			margin: 0;
+			padding: 0;
+			width: @w;
+			height: @h;
+			display: inline-block;
+			vertical-align: top;
+			border: 0px solid;
+			cursor: pointer;
+			outline: none;
+			background-color: transparent;
+			background-repeat: no-repeat;
+			background-attachment: scroll;
+
+			&::before {
+				color: @color-normal;
+				font-family: FontAwesome;
+				padding-top: @pad-top;
+			}
+
+			&.chk {
+				margin: 0px;
+				cursor: auto;
+				width: 12px;
+				display: inline-block;
+				padding-top: @pad-top;
+				padding-left: @pad-left;
+
+				&.checkbox_false_full::before {
+					content: @fa-square-o;
+				}
+
+				&.checkbox_false_full_focus::before {
+					content: @fa-square-o;
+					color: @color-highlight;
+				}
+
+				&.checkbox_false_part::before {
+					content: @fa-square-o;
+					color: @color-partial;
+				}
+
+				&.checkbox_false_part_focus::before {
+					content: @fa-square-o;
+					color: @color-partfocus;
+				}
+
+				&.checkbox_false_disable::before {
+					content: @fa-square-o;
+					color: @color-disabled;
+				}
+
+				&.checkbox_true_full::before {
+					content: @fa-check-square-o;
+				}
+
+				&.checkbox_true_full_focus::before {
+					content: @fa-check-square-o;
+				}
+
+				&.checkbox_true_part::before {
+					content: @fa-check-square;
+				}
+
+				&.checkbox_true_part_focus::before {
+					content: @fa-check-square;
+					color: @color-highlight
+				}
+
+				&.checkbox_true_full_focus::before {
+					content: @fa-check-square-o;
+					color: @color-highlight
+				}
+
+				&.checkbox_true_part::before {
+					content: @fa-check-square-o;
+					color: @color-partial
+				}
+
+				&.checkbox_true_part_focus::before {
+					content: @fa-check-square-o;
+					color: @color-partfocus;
+				}
+
+				&.checkbox_true_disable::before {
+					content: @fa-check-square-o;
+					color: @color-disabled
+				}
+
+				&.radio_false_full::before {
+					content: @fa-circle-o;
+				}
+
+				&.radio_false_full_focus::before {
+					content: @fa-circle-o;
+					color: @color-highlight
+				}
+
+				&.radio_false_part::before {
+					content: @fa-circle-o;
+					color: @color-partial
+				}
+
+				&.radio_false_part_focus::before {
+					content: @fa-circle-o;
+					color: @color-highlight
+				}
+
+				&.radio_false_disable::before {
+					content: @fa-circle-thin;
+					color: @color-disabled
+				}
+
+				&.radio_true_full::before {
+					content: @fa-dot-circle-o;
+				}
+
+				&.radio_true_full_focus::before {
+					content: @fa-dot-circle-o;
+					color: @color-highlight
+				}
+
+				&.radio_true_part::before {
+					content: @fa-dot-circle-o;
+					color: @color-partial
+				}
+
+				&.radio_true_part_focus::before {
+					content: @fa-dot-circle-o;
+					color: @color-partial;
+				}
+
+				&.radio_true_disable::before {
+					content: @fa-circle-thin;
+					color: @color-disabled
+				}
+
+			}
+
+			&.switch {
+				width: @w;
+				height: @h
+			}
+
+			&.root_open::before {
+				content: @fa-chevron-down;
+				padding-top: @pad-top;
+				padding-left: @pad-left;
+				display: inline-block;
+			}
+
+			&.root_close::before {
+				content: @fa-folder-open-o;
+				padding-top: @pad-top;
+				padding-left: @pad-left;
+				display: inline-block;
+			}
+
+			&.roots_open::before {
+				content: @fa-chevron-down;
+				padding-top: @pad-top;
+				padding-left: @pad-left;
+				display: inline-block;
+			}
+
+			&.roots_close::before {
+				content: @fa-chevron-right;
+				padding-top: @pad-top;
+				padding-left: @pad-left;
+				display: inline-block;
+			}
+
+			&.center_open::before {
+				content: @fa-chevron-down;
+				padding-top: @pad-top;
+				padding-left: @pad-left;
+				display: inline-block;
+			}
+
+			&.center_close::before {
+				content: @fa-chevron-right;
+				padding-top: @pad-top;
+				padding-left: @pad-left;
+				display: inline-block;
+			}
+
+			&.bottom_open::before {
+				content: @fa-chevron-down;
+				padding-top: @pad-top;
+				padding-left: @pad-left;
+				display: inline-block;
+			}
+
+			&.bottom_close::before {
+				content: @fa-chevron-right;
+				padding-top: @pad-top;
+				padding-left: @pad-left;
+				display: inline-block;
+			}
+
+			&.noline_open {
+			}
+
+			&.noline_close {
+			}
+
+			&.root_docu {
+				background: none;
+			}
+
+			&.roots_docu::before {
+				content: @fa-list-alt;
+				padding-left: @pad-left;
+				display: inline-block;
+				color: @color-normal;
+			}
+
+			&.center_docu::before {
+				padding-top: @pad-top;
+				padding-left: @pad-left;
+				display: inline-block;
+				color: @color-normal;
+			}
+
+			&.bottom_docu::before {
+				padding-top: @pad-top;
+				padding-left: @pad-left;
+				display: inline-block;
+				color: @color-normal;
+			}
+
+			&.noline_docu {
+				background: none;
+			}
+
+			&.ico_open::before {
+				content: @fa-folder-open-o;
+				font-family: FontAwesome;
+				padding-top: @pad-top;
+				padding-left: @pad-left;
+				display: inline-block;
+				color: @color-normal;
+			}
+
+			&.ico_close::before {
+				content: @fa-folder-o;
+				font-family: FontAwesome;
+				padding-top: @pad-top;
+				padding-left: @pad-left;
+				display: inline-block;
+				color: @color-normal;
+			}
+
+			&.ico_docu::before {
+				content: @fa-list-alt;
+				font-family: FontAwesome;
+				padding-top: @pad-top;
+				padding-left: @pad-left;
+				display: inline-block;
+				color: @color-normal;
+			}
+
+			&.edit {
+				margin-left: 4px;
+				margin-right: -1px;
+				vertical-align: top;
+				*vertical-align: middle;
+				padding-top: @pad-top;
+			}
+
+			&.edit::before {
+				content: @fa-pencil-square-o;
+				font-family: FontAwesome;
+			}
+
+			&.remove {
+				margin-left: 4px;
+				margin-right: -1px;
+				vertical-align: top;
+				*vertical-align: middle;
+				padding-top: @pad-top;
+			}
+
+			&.remove::before {
+				content: @fa-trash;
+				font-family: FontAwesome;
+			}
+
+
+			&.add {
+				margin-left: 4px;
+				margin-right: -1px;
+				vertical-align: top;
+				*vertical-align: middle;
+				padding-top: @pad-top;
+			}
+
+			&.add::before {
+				content: @fa-plus;
+				font-family: FontAwesome;
+			}
+
+			&.ico_loading {
+				margin-right: 2px;
+				background: url(./img/loading.gif) no-repeat scroll 0 0 transparent;
+				vertical-align: top;
+				*vertical-align: middle
+			}
+		}
+
+	}
 }
 
 
-ul.tmpTargetzTree {background-color:#FFE6B0; opacity:0.8; filter:alpha(opacity=80)}
+ul.tmpTargetzTree {
+	background-color: #FFE6B0;
+	opacity: 0.8;
+	filter: alpha(opacity=80)
+}
+
+// this is the arrow that moves
+span.tmpzTreeMove_arrow {
+	width: 16px;
+	height: @h;
+	display: inline-block;
+	padding: 0;
+	margin: 2px 0 0 1px;
+	border: 0 none;
+	position: absolute;
+	background-color: transparent;
+	background-attachment: scroll;
+}
+
+span.tmpzTreeMove_arrow::before {
+	content: @fa-play;
+	font-family: FontAwesome;
+	color: @color-highlight;
+}
 
-// this is the arrow that moves 
-span.tmpzTreeMove_arrow{width:16px; height:@h; display: inline-block; 
-                                padding:0; margin:2px 0 0 1px; border:0 none; position:absolute;
-                                background-color:transparent;  background-attachment: scroll;
-                                 }
-span.tmpzTreeMove_arrow::before{content: @fa-play;font-family: FontAwesome;color: @color-highlight;
-                                 }
 // outline
 
-ul.ztree.zTreeDragUL {margin:0; padding:0; position:absolute; width:auto; height:auto;overflow:hidden; 
-             background-color:#cfcfcf; border:1px @color-highlight dotted; opacity:0.8; filter:alpha(opacity=80)}
-.ztreeMask {z-index:10000; background-color:#cfcfcf; opacity:0.0; filter:alpha(opacity=0); position:absolute}
+ul.ztree.zTreeDragUL {
+	margin: 0;
+	padding: 0;
+	position: absolute;
+	width: auto;
+	height: auto;
+	overflow: hidden;
+	background-color: #cfcfcf;
+	border: 1px @color-highlight dotted;
+	opacity: 0.8;
+	filter: alpha(opacity=80)
+}
+
+.ztreeMask {
+	z-index: 10000;
+	background-color: #cfcfcf;
+	opacity: 0.0;
+	filter: alpha(opacity=0);
+	position: absolute
+}
 
diff --git a/len-sys/src/main/resources/plugin/ztree/css/metroStyle/metroStyle.css b/len-sys/src/main/resources/plugin/ztree/css/metroStyle/metroStyle.css
index af81f42..d2dbac8 100644
--- a/len-sys/src/main/resources/plugin/ztree/css/metroStyle/metroStyle.css
+++ b/len-sys/src/main/resources/plugin/ztree/css/metroStyle/metroStyle.css
@@ -8,89 +8,376 @@ website:    http://code.google.com/p/jquerytree/
 
 -------------------------------------*/
 
-.ztree * {padding:0; margin:0; font-size:12px; font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif}
-.ztree {margin:0; padding:5px; color:#333}
-.ztree li{padding:0; margin:0; list-style:none; line-height:17px; text-align:left; white-space:nowrap; outline:0}
-.ztree li ul{ margin:0; padding:0 0 0 18px}
-.ztree li ul.line{ background:url(./img/line_conn.png) 0 0 repeat-y;}
-
-.ztree li a {padding-right:3px; margin:0; cursor:pointer; height:21px; color:#333; background-color: transparent; text-decoration:none; vertical-align:top; display: inline-block}
-.ztree li a:hover {text-decoration:underline}
-.ztree li a.curSelectedNode {padding-top:0px; background-color:#e5e5e5; color:black; height:21px; opacity:0.8;}
-.ztree li a.curSelectedNode_Edit {padding-top:0px; background-color:#e5e5e5; color:black; height:21px; border:1px #666 solid; opacity:0.8;}
-.ztree li a.tmpTargetNode_inner {padding-top:0px; background-color:#aaa; color:white; height:21px; border:1px #666 solid;
-  opacity:0.8; filter:alpha(opacity=80)}
-.ztree li a.tmpTargetNode_prev {}
-.ztree li a.tmpTargetNode_next {}
-.ztree li a input.rename {height:14px; width:80px; padding:0; margin:0;
-  font-size:12px; border:1px #585956 solid; *border:0px}
-.ztree li span {line-height:21px; margin-right:2px}
-.ztree li span.button {line-height:0; margin:0; padding: 0; width:21px; height:21px; display: inline-block; vertical-align:middle;
-  border:0 none; cursor: pointer;outline:none;
-  background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
-  background-image:url("./img/metro.png"); *background-image:url("./img/metro.gif")}
-
-.ztree li span.button.chk {width:13px; height:13px; margin:0 2px; cursor: auto}
-.ztree li span.button.chk.checkbox_false_full {background-position: -5px -5px;}
-.ztree li span.button.chk.checkbox_false_full_focus {background-position: -5px -26px;}
-.ztree li span.button.chk.checkbox_false_part {background-position: -5px -48px;}
-.ztree li span.button.chk.checkbox_false_part_focus {background-position: -5px -68px;}
-.ztree li span.button.chk.checkbox_false_disable {background-position: -5px -89px;}
-.ztree li span.button.chk.checkbox_true_full {background-position: -26px -5px;}
-.ztree li span.button.chk.checkbox_true_full_focus {background-position: -26px -26px;}
-.ztree li span.button.chk.checkbox_true_part {background-position: -26px -48px;}
-.ztree li span.button.chk.checkbox_true_part_focus {background-position: -26px -68px;}
-.ztree li span.button.chk.checkbox_true_disable {background-position: -26px -89px;}
-.ztree li span.button.chk.radio_false_full {background-position: -47px -5px;}
-.ztree li span.button.chk.radio_false_full_focus {background-position: -47px -26px;}
-.ztree li span.button.chk.radio_false_part {background-position: -47px -47px;}
-.ztree li span.button.chk.radio_false_part_focus {background-position: -47px -68px;}
-.ztree li span.button.chk.radio_false_disable {background-position: -47px -89px;}
-.ztree li span.button.chk.radio_true_full {background-position: -68px -5px;}
-.ztree li span.button.chk.radio_true_full_focus {background-position: -68px -26px;}
-.ztree li span.button.chk.radio_true_part {background-position: -68px -47px;}
-.ztree li span.button.chk.radio_true_part_focus {background-position: -68px -68px;}
-.ztree li span.button.chk.radio_true_disable {background-position: -68px -89px;}
-
-.ztree li span.button.switch {width:21px; height:21px}
-.ztree li span.button.root_open{background-position:-105px -63px}
-.ztree li span.button.root_close{background-position:-126px -63px}
-.ztree li span.button.roots_open{background-position: -105px 0;}
-.ztree li span.button.roots_close{background-position: -126px 0;}
-.ztree li span.button.center_open{background-position: -105px -21px;}
-.ztree li span.button.center_close{background-position: -126px -21px;}
-.ztree li span.button.bottom_open{background-position: -105px -42px;}
-.ztree li span.button.bottom_close{background-position: -126px -42px;}
-.ztree li span.button.noline_open{background-position: -105px -84px;}
-.ztree li span.button.noline_close{background-position: -126px -84px;}
-.ztree li span.button.root_docu{ background:none;}
-.ztree li span.button.roots_docu{background-position: -84px 0;}
-.ztree li span.button.center_docu{background-position: -84px -21px;}
-.ztree li span.button.bottom_docu{background-position: -84px -42px;}
-.ztree li span.button.noline_docu{ background:none;}
-
-.ztree li span.button.ico_open{margin-right:2px; background-position: -147px -21px; vertical-align:top; *vertical-align:middle}
-.ztree li span.button.ico_close{margin-right:2px; margin-right:2px; background-position: -147px 0; vertical-align:top; *vertical-align:middle}
-.ztree li span.button.ico_docu{margin-right:2px; background-position: -147px -42px; vertical-align:top; *vertical-align:middle}
-.ztree li span.button.edit {margin-left:2px; margin-right: -1px; background-position: -189px -21px; vertical-align:top; *vertical-align:middle}
+.ztree * {
+	padding: 0;
+	margin: 0;
+	font-size: 12px;
+	font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif
+}
+
+.ztree {
+	margin: 0;
+	padding: 5px;
+	color: #333
+}
+
+.ztree li {
+	padding: 0;
+	margin: 0;
+	list-style: none;
+	line-height: 17px;
+	text-align: left;
+	white-space: nowrap;
+	outline: 0
+}
+
+.ztree li ul {
+	margin: 0;
+	padding: 0 0 0 18px
+}
+
+.ztree li ul.line {
+	background: url(./img/line_conn.png) 0 0 repeat-y;
+}
+
+.ztree li a {
+	padding-right: 3px;
+	margin: 0;
+	cursor: pointer;
+	height: 21px;
+	color: #333;
+	background-color: transparent;
+	text-decoration: none;
+	vertical-align: top;
+	display: inline-block
+}
+
+.ztree li a:hover {
+	text-decoration: underline
+}
+
+.ztree li a.curSelectedNode {
+	padding-top: 0px;
+	background-color: #e5e5e5;
+	color: black;
+	height: 21px;
+	opacity: 0.8;
+}
+
+.ztree li a.curSelectedNode_Edit {
+	padding-top: 0px;
+	background-color: #e5e5e5;
+	color: black;
+	height: 21px;
+	border: 1px #666 solid;
+	opacity: 0.8;
+}
+
+.ztree li a.tmpTargetNode_inner {
+	padding-top: 0px;
+	background-color: #aaa;
+	color: white;
+	height: 21px;
+	border: 1px #666 solid;
+	opacity: 0.8;
+	filter: alpha(opacity=80)
+}
+
+.ztree li a.tmpTargetNode_prev {
+}
+
+.ztree li a.tmpTargetNode_next {
+}
+
+.ztree li a input.rename {
+	height: 14px;
+	width: 80px;
+	padding: 0;
+	margin: 0;
+	font-size: 12px;
+	border: 1px #585956 solid;
+	*border: 0px
+}
+
+.ztree li span {
+	line-height: 21px;
+	margin-right: 2px
+}
+
+.ztree li span.button {
+	line-height: 0;
+	margin: 0;
+	padding: 0;
+	width: 21px;
+	height: 21px;
+	display: inline-block;
+	vertical-align: middle;
+	border: 0 none;
+	cursor: pointer;
+	outline: none;
+	background-color: transparent;
+	background-repeat: no-repeat;
+	background-attachment: scroll;
+	background-image: url("./img/metro.png");
+	*background-image: url("./img/metro.gif")
+}
+
+.ztree li span.button.chk {
+	width: 13px;
+	height: 13px;
+	margin: 0 2px;
+	cursor: auto
+}
+
+.ztree li span.button.chk.checkbox_false_full {
+	background-position: -5px -5px;
+}
+
+.ztree li span.button.chk.checkbox_false_full_focus {
+	background-position: -5px -26px;
+}
+
+.ztree li span.button.chk.checkbox_false_part {
+	background-position: -5px -48px;
+}
+
+.ztree li span.button.chk.checkbox_false_part_focus {
+	background-position: -5px -68px;
+}
+
+.ztree li span.button.chk.checkbox_false_disable {
+	background-position: -5px -89px;
+}
+
+.ztree li span.button.chk.checkbox_true_full {
+	background-position: -26px -5px;
+}
+
+.ztree li span.button.chk.checkbox_true_full_focus {
+	background-position: -26px -26px;
+}
+
+.ztree li span.button.chk.checkbox_true_part {
+	background-position: -26px -48px;
+}
+
+.ztree li span.button.chk.checkbox_true_part_focus {
+	background-position: -26px -68px;
+}
+
+.ztree li span.button.chk.checkbox_true_disable {
+	background-position: -26px -89px;
+}
+
+.ztree li span.button.chk.radio_false_full {
+	background-position: -47px -5px;
+}
+
+.ztree li span.button.chk.radio_false_full_focus {
+	background-position: -47px -26px;
+}
+
+.ztree li span.button.chk.radio_false_part {
+	background-position: -47px -47px;
+}
+
+.ztree li span.button.chk.radio_false_part_focus {
+	background-position: -47px -68px;
+}
+
+.ztree li span.button.chk.radio_false_disable {
+	background-position: -47px -89px;
+}
+
+.ztree li span.button.chk.radio_true_full {
+	background-position: -68px -5px;
+}
+
+.ztree li span.button.chk.radio_true_full_focus {
+	background-position: -68px -26px;
+}
+
+.ztree li span.button.chk.radio_true_part {
+	background-position: -68px -47px;
+}
+
+.ztree li span.button.chk.radio_true_part_focus {
+	background-position: -68px -68px;
+}
+
+.ztree li span.button.chk.radio_true_disable {
+	background-position: -68px -89px;
+}
+
+.ztree li span.button.switch {
+	width: 21px;
+	height: 21px
+}
+
+.ztree li span.button.root_open {
+	background-position: -105px -63px
+}
+
+.ztree li span.button.root_close {
+	background-position: -126px -63px
+}
+
+.ztree li span.button.roots_open {
+	background-position: -105px 0;
+}
+
+.ztree li span.button.roots_close {
+	background-position: -126px 0;
+}
+
+.ztree li span.button.center_open {
+	background-position: -105px -21px;
+}
+
+.ztree li span.button.center_close {
+	background-position: -126px -21px;
+}
+
+.ztree li span.button.bottom_open {
+	background-position: -105px -42px;
+}
+
+.ztree li span.button.bottom_close {
+	background-position: -126px -42px;
+}
+
+.ztree li span.button.noline_open {
+	background-position: -105px -84px;
+}
+
+.ztree li span.button.noline_close {
+	background-position: -126px -84px;
+}
+
+.ztree li span.button.root_docu {
+	background: none;
+}
+
+.ztree li span.button.roots_docu {
+	background-position: -84px 0;
+}
+
+.ztree li span.button.center_docu {
+	background-position: -84px -21px;
+}
+
+.ztree li span.button.bottom_docu {
+	background-position: -84px -42px;
+}
+
+.ztree li span.button.noline_docu {
+	background: none;
+}
+
+.ztree li span.button.ico_open {
+	margin-right: 2px;
+	background-position: -147px -21px;
+	vertical-align: top;
+	*vertical-align: middle
+}
+
+.ztree li span.button.ico_close {
+	margin-right: 2px;
+	margin-right: 2px;
+	background-position: -147px 0;
+	vertical-align: top;
+	*vertical-align: middle
+}
+
+.ztree li span.button.ico_docu {
+	margin-right: 2px;
+	background-position: -147px -42px;
+	vertical-align: top;
+	*vertical-align: middle
+}
+
+.ztree li span.button.edit {
+	margin-left: 2px;
+	margin-right: -1px;
+	background-position: -189px -21px;
+	vertical-align: top;
+	*vertical-align: middle
+}
+
 .ztree li span.button.edit:hover {
-  background-position: -168px -21px;
+	background-position: -168px -21px;
+}
+
+.ztree li span.button.remove {
+	margin-left: 2px;
+	margin-right: -1px;
+	background-position: -189px -42px;
+	vertical-align: top;
+	*vertical-align: middle
 }
-.ztree li span.button.remove {margin-left:2px; margin-right: -1px; background-position: -189px -42px; vertical-align:top; *vertical-align:middle}
+
 .ztree li span.button.remove:hover {
-  background-position: -168px -42px;
+	background-position: -168px -42px;
+}
+
+.ztree li span.button.add {
+	margin-left: 2px;
+	margin-right: -1px;
+	background-position: -189px 0;
+	vertical-align: top;
+	*vertical-align: middle
 }
-.ztree li span.button.add {margin-left:2px; margin-right: -1px; background-position: -189px 0; vertical-align:top; *vertical-align:middle}
+
 .ztree li span.button.add:hover {
-  background-position: -168px 0;
+	background-position: -168px 0;
 }
-.ztree li span.button.ico_loading{margin-right:2px; background:url(./img/loading.gif) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
 
-ul.tmpTargetzTree {background-color:#FFE6B0; opacity:0.8; filter:alpha(opacity=80)}
+.ztree li span.button.ico_loading {
+	margin-right: 2px;
+	background: url(./img/loading.gif) no-repeat scroll 0 0 transparent;
+	vertical-align: top;
+	*vertical-align: middle
+}
+
+ul.tmpTargetzTree {
+	background-color: #FFE6B0;
+	opacity: 0.8;
+	filter: alpha(opacity=80)
+}
 
-span.tmpzTreeMove_arrow {width:16px; height:21px; display: inline-block; padding:0; margin:2px 0 0 1px; border:0 none; position:absolute;
-    background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
-    background-position:-168px -84px; background-image:url("./img/metro.png"); *background-image:url("./img/metro.gif")}
+span.tmpzTreeMove_arrow {
+	width: 16px;
+	height: 21px;
+	display: inline-block;
+	padding: 0;
+	margin: 2px 0 0 1px;
+	border: 0 none;
+	position: absolute;
+	background-color: transparent;
+	background-repeat: no-repeat;
+	background-attachment: scroll;
+	background-position: -168px -84px;
+	background-image: url("./img/metro.png");
+	*background-image: url("./img/metro.gif")
+}
 
-ul.ztree.zTreeDragUL {margin:0; padding:0; position:absolute; width:auto; height:auto;overflow:hidden; background-color:#cfcfcf; border:1px #00B83F dotted; opacity:0.8; filter:alpha(opacity=80)}
-.ztreeMask {z-index:10000; background-color:#cfcfcf; opacity:0.0; filter:alpha(opacity=0); position:absolute}
+ul.ztree.zTreeDragUL {
+	margin: 0;
+	padding: 0;
+	position: absolute;
+	width: auto;
+	height: auto;
+	overflow: hidden;
+	background-color: #cfcfcf;
+	border: 1px #00B83F dotted;
+	opacity: 0.8;
+	filter: alpha(opacity=80)
+}
+
+.ztreeMask {
+	z-index: 10000;
+	background-color: #cfcfcf;
+	opacity: 0.0;
+	filter: alpha(opacity=0);
+	position: absolute
+}
diff --git a/len-sys/src/main/resources/plugin/ztree/css/zTreeStyle/zTreeStyle.css b/len-sys/src/main/resources/plugin/ztree/css/zTreeStyle/zTreeStyle.css
index 4a1705b..bad105e 100644
--- a/len-sys/src/main/resources/plugin/ztree/css/zTreeStyle/zTreeStyle.css
+++ b/len-sys/src/main/resources/plugin/ztree/css/zTreeStyle/zTreeStyle.css
@@ -8,84 +8,356 @@ website:	http://code.google.com/p/jquerytree/
 
 -------------------------------------*/
 
-.ztree * {padding:0; margin:0; font-size:12px; font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif}
-.ztree {margin:0; padding:5px; color:#333}
-.ztree li{padding:0; margin:0; list-style:none; line-height:14px; text-align:left; white-space:nowrap; outline:0}
-.ztree li ul{ margin:0; padding:0 0 0 18px}
-.ztree li ul.line{ background:url(./img/line_conn.gif) 0 0 repeat-y;}
-
-.ztree li a {padding:1px 3px 0 0; margin:0; cursor:pointer; height:17px; color:#333; background-color: transparent;
-	text-decoration:none; vertical-align:top; display: inline-block}
-.ztree li a:hover {text-decoration:underline}
-.ztree li a.curSelectedNode {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;}
-.ztree li a.curSelectedNode_Edit {padding-top:0px; background-color:#FFE6B0; color:black; height:16px; border:1px #FFB951 solid; opacity:0.8;}
-.ztree li a.tmpTargetNode_inner {padding-top:0px; background-color:#316AC5; color:white; height:16px; border:1px #316AC5 solid;
-	opacity:0.8; filter:alpha(opacity=80)}
-.ztree li a.tmpTargetNode_prev {}
-.ztree li a.tmpTargetNode_next {}
-.ztree li a input.rename {height:14px; width:80px; padding:0; margin:0;
-	font-size:12px; border:1px #7EC4CC solid; *border:0px}
-.ztree li span {line-height:16px; margin-right:2px}
-.ztree li span.button {line-height:0; margin:0; width:16px; height:16px; display: inline-block; vertical-align:middle;
-	border:0 none; cursor: pointer;outline:none;
-	background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
-	background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")}
-
-.ztree li span.button.chk {width:13px; height:13px; margin:0 3px 0 0; cursor: auto}
-.ztree li span.button.chk.checkbox_false_full {background-position:0 0}
-.ztree li span.button.chk.checkbox_false_full_focus {background-position:0 -14px}
-.ztree li span.button.chk.checkbox_false_part {background-position:0 -28px}
-.ztree li span.button.chk.checkbox_false_part_focus {background-position:0 -42px}
-.ztree li span.button.chk.checkbox_false_disable {background-position:0 -56px}
-.ztree li span.button.chk.checkbox_true_full {background-position:-14px 0}
-.ztree li span.button.chk.checkbox_true_full_focus {background-position:-14px -14px}
-.ztree li span.button.chk.checkbox_true_part {background-position:-14px -28px}
-.ztree li span.button.chk.checkbox_true_part_focus {background-position:-14px -42px}
-.ztree li span.button.chk.checkbox_true_disable {background-position:-14px -56px}
-.ztree li span.button.chk.radio_false_full {background-position:-28px 0}
-.ztree li span.button.chk.radio_false_full_focus {background-position:-28px -14px}
-.ztree li span.button.chk.radio_false_part {background-position:-28px -28px}
-.ztree li span.button.chk.radio_false_part_focus {background-position:-28px -42px}
-.ztree li span.button.chk.radio_false_disable {background-position:-28px -56px}
-.ztree li span.button.chk.radio_true_full {background-position:-42px 0}
-.ztree li span.button.chk.radio_true_full_focus {background-position:-42px -14px}
-.ztree li span.button.chk.radio_true_part {background-position:-42px -28px}
-.ztree li span.button.chk.radio_true_part_focus {background-position:-42px -42px}
-.ztree li span.button.chk.radio_true_disable {background-position:-42px -56px}
-
-.ztree li span.button.switch {width:18px; height:18px}
-.ztree li span.button.root_open{background-position:-92px -54px}
-.ztree li span.button.root_close{background-position:-74px -54px}
-.ztree li span.button.roots_open{background-position:-92px 0}
-.ztree li span.button.roots_close{background-position:-74px 0}
-.ztree li span.button.center_open{background-position:-92px -18px}
-.ztree li span.button.center_close{background-position:-74px -18px}
-.ztree li span.button.bottom_open{background-position:-92px -36px}
-.ztree li span.button.bottom_close{background-position:-74px -36px}
-.ztree li span.button.noline_open{background-position:-92px -72px}
-.ztree li span.button.noline_close{background-position:-74px -72px}
-.ztree li span.button.root_docu{ background:none;}
-.ztree li span.button.roots_docu{background-position:-56px 0}
-.ztree li span.button.center_docu{background-position:-56px -18px}
-.ztree li span.button.bottom_docu{background-position:-56px -36px}
-.ztree li span.button.noline_docu{ background:none;}
-
-.ztree li span.button.ico_open{margin-right:2px; background-position:-110px -16px; vertical-align:top; *vertical-align:middle}
-.ztree li span.button.ico_close{margin-right:2px; background-position:-110px 0; vertical-align:top; *vertical-align:middle}
-.ztree li span.button.ico_docu{margin-right:2px; background-position:-110px -32px; vertical-align:top; *vertical-align:middle}
-.ztree li span.button.edit {margin-right:2px; background-position:-110px -48px; vertical-align:top; *vertical-align:middle}
-.ztree li span.button.remove {margin-right:2px; background-position:-110px -64px; vertical-align:top; *vertical-align:middle}
-
-.ztree li span.button.ico_loading{margin-right:2px; background:url(./img/loading.gif) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
-
-ul.tmpTargetzTree {background-color:#FFE6B0; opacity:0.8; filter:alpha(opacity=80)}
-
-span.tmpzTreeMove_arrow {width:16px; height:16px; display: inline-block; padding:0; margin:2px 0 0 1px; border:0 none; position:absolute;
-	background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
-	background-position:-110px -80px; background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")}
-
-ul.ztree.zTreeDragUL {margin:0; padding:0; position:absolute; width:auto; height:auto;overflow:hidden; background-color:#cfcfcf; border:1px #00B83F dotted; opacity:0.8; filter:alpha(opacity=80)}
-.zTreeMask {z-index:10000; background-color:#cfcfcf; opacity:0.0; filter:alpha(opacity=0); position:absolute}
+.ztree * {
+	padding: 0;
+	margin: 0;
+	font-size: 12px;
+	font-family: Verdana, Arial, Helvetica, AppleGothic, sans-serif
+}
+
+.ztree {
+	margin: 0;
+	padding: 5px;
+	color: #333
+}
+
+.ztree li {
+	padding: 0;
+	margin: 0;
+	list-style: none;
+	line-height: 14px;
+	text-align: left;
+	white-space: nowrap;
+	outline: 0
+}
+
+.ztree li ul {
+	margin: 0;
+	padding: 0 0 0 18px
+}
+
+.ztree li ul.line {
+	background: url(./img/line_conn.gif) 0 0 repeat-y;
+}
+
+.ztree li a {
+	padding: 1px 3px 0 0;
+	margin: 0;
+	cursor: pointer;
+	height: 17px;
+	color: #333;
+	background-color: transparent;
+	text-decoration: none;
+	vertical-align: top;
+	display: inline-block
+}
+
+.ztree li a:hover {
+	text-decoration: underline
+}
+
+.ztree li a.curSelectedNode {
+	padding-top: 0px;
+	background-color: #FFE6B0;
+	color: black;
+	height: 16px;
+	border: 1px #FFB951 solid;
+	opacity: 0.8;
+}
+
+.ztree li a.curSelectedNode_Edit {
+	padding-top: 0px;
+	background-color: #FFE6B0;
+	color: black;
+	height: 16px;
+	border: 1px #FFB951 solid;
+	opacity: 0.8;
+}
+
+.ztree li a.tmpTargetNode_inner {
+	padding-top: 0px;
+	background-color: #316AC5;
+	color: white;
+	height: 16px;
+	border: 1px #316AC5 solid;
+	opacity: 0.8;
+	filter: alpha(opacity=80)
+}
+
+.ztree li a.tmpTargetNode_prev {
+}
+
+.ztree li a.tmpTargetNode_next {
+}
+
+.ztree li a input.rename {
+	height: 14px;
+	width: 80px;
+	padding: 0;
+	margin: 0;
+	font-size: 12px;
+	border: 1px #7EC4CC solid;
+	*border: 0px
+}
+
+.ztree li span {
+	line-height: 16px;
+	margin-right: 2px
+}
+
+.ztree li span.button {
+	line-height: 0;
+	margin: 0;
+	width: 16px;
+	height: 16px;
+	display: inline-block;
+	vertical-align: middle;
+	border: 0 none;
+	cursor: pointer;
+	outline: none;
+	background-color: transparent;
+	background-repeat: no-repeat;
+	background-attachment: scroll;
+	background-image: url("./img/zTreeStandard.png");
+	*background-image: url("./img/zTreeStandard.gif")
+}
+
+.ztree li span.button.chk {
+	width: 13px;
+	height: 13px;
+	margin: 0 3px 0 0;
+	cursor: auto
+}
+
+.ztree li span.button.chk.checkbox_false_full {
+	background-position: 0 0
+}
+
+.ztree li span.button.chk.checkbox_false_full_focus {
+	background-position: 0 -14px
+}
+
+.ztree li span.button.chk.checkbox_false_part {
+	background-position: 0 -28px
+}
+
+.ztree li span.button.chk.checkbox_false_part_focus {
+	background-position: 0 -42px
+}
+
+.ztree li span.button.chk.checkbox_false_disable {
+	background-position: 0 -56px
+}
+
+.ztree li span.button.chk.checkbox_true_full {
+	background-position: -14px 0
+}
+
+.ztree li span.button.chk.checkbox_true_full_focus {
+	background-position: -14px -14px
+}
+
+.ztree li span.button.chk.checkbox_true_part {
+	background-position: -14px -28px
+}
+
+.ztree li span.button.chk.checkbox_true_part_focus {
+	background-position: -14px -42px
+}
+
+.ztree li span.button.chk.checkbox_true_disable {
+	background-position: -14px -56px
+}
+
+.ztree li span.button.chk.radio_false_full {
+	background-position: -28px 0
+}
+
+.ztree li span.button.chk.radio_false_full_focus {
+	background-position: -28px -14px
+}
+
+.ztree li span.button.chk.radio_false_part {
+	background-position: -28px -28px
+}
+
+.ztree li span.button.chk.radio_false_part_focus {
+	background-position: -28px -42px
+}
+
+.ztree li span.button.chk.radio_false_disable {
+	background-position: -28px -56px
+}
+
+.ztree li span.button.chk.radio_true_full {
+	background-position: -42px 0
+}
+
+.ztree li span.button.chk.radio_true_full_focus {
+	background-position: -42px -14px
+}
+
+.ztree li span.button.chk.radio_true_part {
+	background-position: -42px -28px
+}
+
+.ztree li span.button.chk.radio_true_part_focus {
+	background-position: -42px -42px
+}
+
+.ztree li span.button.chk.radio_true_disable {
+	background-position: -42px -56px
+}
+
+.ztree li span.button.switch {
+	width: 18px;
+	height: 18px
+}
+
+.ztree li span.button.root_open {
+	background-position: -92px -54px
+}
+
+.ztree li span.button.root_close {
+	background-position: -74px -54px
+}
+
+.ztree li span.button.roots_open {
+	background-position: -92px 0
+}
+
+.ztree li span.button.roots_close {
+	background-position: -74px 0
+}
+
+.ztree li span.button.center_open {
+	background-position: -92px -18px
+}
+
+.ztree li span.button.center_close {
+	background-position: -74px -18px
+}
+
+.ztree li span.button.bottom_open {
+	background-position: -92px -36px
+}
+
+.ztree li span.button.bottom_close {
+	background-position: -74px -36px
+}
+
+.ztree li span.button.noline_open {
+	background-position: -92px -72px
+}
+
+.ztree li span.button.noline_close {
+	background-position: -74px -72px
+}
+
+.ztree li span.button.root_docu {
+	background: none;
+}
+
+.ztree li span.button.roots_docu {
+	background-position: -56px 0
+}
+
+.ztree li span.button.center_docu {
+	background-position: -56px -18px
+}
+
+.ztree li span.button.bottom_docu {
+	background-position: -56px -36px
+}
+
+.ztree li span.button.noline_docu {
+	background: none;
+}
+
+.ztree li span.button.ico_open {
+	margin-right: 2px;
+	background-position: -110px -16px;
+	vertical-align: top;
+	*vertical-align: middle
+}
+
+.ztree li span.button.ico_close {
+	margin-right: 2px;
+	background-position: -110px 0;
+	vertical-align: top;
+	*vertical-align: middle
+}
+
+.ztree li span.button.ico_docu {
+	margin-right: 2px;
+	background-position: -110px -32px;
+	vertical-align: top;
+	*vertical-align: middle
+}
+
+.ztree li span.button.edit {
+	margin-right: 2px;
+	background-position: -110px -48px;
+	vertical-align: top;
+	*vertical-align: middle
+}
+
+.ztree li span.button.remove {
+	margin-right: 2px;
+	background-position: -110px -64px;
+	vertical-align: top;
+	*vertical-align: middle
+}
+
+.ztree li span.button.ico_loading {
+	margin-right: 2px;
+	background: url(./img/loading.gif) no-repeat scroll 0 0 transparent;
+	vertical-align: top;
+	*vertical-align: middle
+}
+
+ul.tmpTargetzTree {
+	background-color: #FFE6B0;
+	opacity: 0.8;
+	filter: alpha(opacity=80)
+}
+
+span.tmpzTreeMove_arrow {
+	width: 16px;
+	height: 16px;
+	display: inline-block;
+	padding: 0;
+	margin: 2px 0 0 1px;
+	border: 0 none;
+	position: absolute;
+	background-color: transparent;
+	background-repeat: no-repeat;
+	background-attachment: scroll;
+	background-position: -110px -80px;
+	background-image: url("./img/zTreeStandard.png");
+	*background-image: url("./img/zTreeStandard.gif")
+}
+
+ul.ztree.zTreeDragUL {
+	margin: 0;
+	padding: 0;
+	position: absolute;
+	width: auto;
+	height: auto;
+	overflow: hidden;
+	background-color: #cfcfcf;
+	border: 1px #00B83F dotted;
+	opacity: 0.8;
+	filter: alpha(opacity=80)
+}
+
+.zTreeMask {
+	z-index: 10000;
+	background-color: #cfcfcf;
+	opacity: 0.0;
+	filter: alpha(opacity=0);
+	position: absolute
+}
 
 /* level style*/
 /*.ztree li span.button.level0 {
@@ -94,4 +366,4 @@ ul.ztree.zTreeDragUL {margin:0; padding:0; position:absolute; width:auto; height
 .ztree li ul.level0 {
 	padding:0;
 	background:none;
-}*/
\ No newline at end of file
+}*/
diff --git a/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.all.js b/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.all.js
index dd79fcf..86f9e0a 100644
--- a/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.all.js
+++ b/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.all.js
@@ -1,1938 +1,1937 @@
+/*
+ * JQuery zTree core v3.5.30
+ * http://treejs.cn/
+ *
+ * Copyright (c) 2010 Hunter.z
+ *
+ * Licensed same as jquery - MIT License
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * email: hunter.z@263.net
+ * Date: 2017-11-11
+ */
+(function ($) {
+	var settings = {}, roots = {}, caches = {},
+		//default consts of core
+		_consts = {
+			className: {
+				BUTTON: "button",
+				LEVEL: "level",
+				ICO_LOADING: "ico_loading",
+				SWITCH: "switch",
+				NAME: 'node_name'
+			},
+			event: {
+				NODECREATED: "ztree_nodeCreated",
+				CLICK: "ztree_click",
+				EXPAND: "ztree_expand",
+				COLLAPSE: "ztree_collapse",
+				ASYNC_SUCCESS: "ztree_async_success",
+				ASYNC_ERROR: "ztree_async_error",
+				REMOVE: "ztree_remove",
+				SELECTED: "ztree_selected",
+				UNSELECTED: "ztree_unselected"
+			},
+			id: {
+				A: "_a",
+				ICON: "_ico",
+				SPAN: "_span",
+				SWITCH: "_switch",
+				UL: "_ul"
+			},
+			line: {
+				ROOT: "root",
+				ROOTS: "roots",
+				CENTER: "center",
+				BOTTOM: "bottom",
+				NOLINE: "noline",
+				LINE: "line"
+			},
+			folder: {
+				OPEN: "open",
+				CLOSE: "close",
+				DOCU: "docu"
+			},
+			node: {
+				CURSELECTED: "curSelectedNode"
+			}
+		},
+		//default setting of core
+		_setting = {
+			treeId: "",
+			treeObj: null,
+			view: {
+				addDiyDom: null,
+				autoCancelSelected: true,
+				dblClickExpand: true,
+				expandSpeed: "fast",
+				fontCss: {},
+				nameIsHTML: false,
+				selectedMulti: true,
+				showIcon: true,
+				showLine: true,
+				showTitle: true,
+				txtSelectedEnable: false
+			},
+			data: {
+				key: {
+					children: "children",
+					name: "name",
+					title: "",
+					url: "url",
+					icon: "icon"
+				},
+				simpleData: {
+					enable: false,
+					idKey: "id",
+					pIdKey: "pId",
+					rootPId: null
+				},
+				keep: {
+					parent: false,
+					leaf: false
+				}
+			},
+			async: {
+				enable: false,
+				contentType: "application/x-www-form-urlencoded",
+				type: "post",
+				dataType: "text",
+				url: "",
+				autoParam: [],
+				otherParam: [],
+				dataFilter: null
+			},
+			callback: {
+				beforeAsync: null,
+				beforeClick: null,
+				beforeDblClick: null,
+				beforeRightClick: null,
+				beforeMouseDown: null,
+				beforeMouseUp: null,
+				beforeExpand: null,
+				beforeCollapse: null,
+				beforeRemove: null,
+
+				onAsyncError: null,
+				onAsyncSuccess: null,
+				onNodeCreated: null,
+				onClick: null,
+				onDblClick: null,
+				onRightClick: null,
+				onMouseDown: null,
+				onMouseUp: null,
+				onExpand: null,
+				onCollapse: null,
+				onRemove: null
+			}
+		},
+		//default root of core
+		//zTree use root to save full data
+		_initRoot = function (setting) {
+			var r = data.getRoot(setting);
+			if (!r) {
+				r = {};
+				data.setRoot(setting, r);
+			}
+			r[setting.data.key.children] = [];
+			r.expandTriggerFlag = false;
+			r.curSelectedList = [];
+			r.noSelection = true;
+			r.createdNodes = [];
+			r.zId = 0;
+			r._ver = (new Date()).getTime();
+		},
+		//default cache of core
+		_initCache = function (setting) {
+			var c = data.getCache(setting);
+			if (!c) {
+				c = {};
+				data.setCache(setting, c);
+			}
+			c.nodes = [];
+			c.doms = [];
+		},
+		//default bindEvent of core
+		_bindEvent = function (setting) {
+			var o = setting.treeObj,
+				c = consts.event;
+			o.bind(c.NODECREATED, function (event, treeId, node) {
+				tools.apply(setting.callback.onNodeCreated, [event, treeId, node]);
+			});
+
+			o.bind(c.CLICK, function (event, srcEvent, treeId, node, clickFlag) {
+				tools.apply(setting.callback.onClick, [srcEvent, treeId, node, clickFlag]);
+			});
+
+			o.bind(c.EXPAND, function (event, treeId, node) {
+				tools.apply(setting.callback.onExpand, [event, treeId, node]);
+			});
+
+			o.bind(c.COLLAPSE, function (event, treeId, node) {
+				tools.apply(setting.callback.onCollapse, [event, treeId, node]);
+			});
+
+			o.bind(c.ASYNC_SUCCESS, function (event, treeId, node, msg) {
+				tools.apply(setting.callback.onAsyncSuccess, [event, treeId, node, msg]);
+			});
+
+			o.bind(c.ASYNC_ERROR, function (event, treeId, node, XMLHttpRequest, textStatus, errorThrown) {
+				tools.apply(setting.callback.onAsyncError, [event, treeId, node, XMLHttpRequest, textStatus, errorThrown]);
+			});
+
+			o.bind(c.REMOVE, function (event, treeId, treeNode) {
+				tools.apply(setting.callback.onRemove, [event, treeId, treeNode]);
+			});
+
+			o.bind(c.SELECTED, function (event, treeId, node) {
+				tools.apply(setting.callback.onSelected, [treeId, node]);
+			});
+			o.bind(c.UNSELECTED, function (event, treeId, node) {
+				tools.apply(setting.callback.onUnSelected, [treeId, node]);
+			});
+		},
+		_unbindEvent = function (setting) {
+			var o = setting.treeObj,
+				c = consts.event;
+			o.unbind(c.NODECREATED)
+				.unbind(c.CLICK)
+				.unbind(c.EXPAND)
+				.unbind(c.COLLAPSE)
+				.unbind(c.ASYNC_SUCCESS)
+				.unbind(c.ASYNC_ERROR)
+				.unbind(c.REMOVE)
+				.unbind(c.SELECTED)
+				.unbind(c.UNSELECTED);
+		},
+		//default event proxy of core
+		_eventProxy = function (event) {
+			var target = event.target,
+				setting = data.getSetting(event.data.treeId),
+				tId = "", node = null,
+				nodeEventType = "", treeEventType = "",
+				nodeEventCallback = null, treeEventCallback = null,
+				tmp = null;
+
+			if (tools.eqs(event.type, "mousedown")) {
+				treeEventType = "mousedown";
+			} else if (tools.eqs(event.type, "mouseup")) {
+				treeEventType = "mouseup";
+			} else if (tools.eqs(event.type, "contextmenu")) {
+				treeEventType = "contextmenu";
+			} else if (tools.eqs(event.type, "click")) {
+				if (tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.SWITCH) !== null) {
+					tId = tools.getNodeMainDom(target).id;
+					nodeEventType = "switchNode";
+				} else {
+					tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+					if (tmp) {
+						tId = tools.getNodeMainDom(tmp).id;
+						nodeEventType = "clickNode";
+					}
+				}
+			} else if (tools.eqs(event.type, "dblclick")) {
+				treeEventType = "dblclick";
+				tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+				if (tmp) {
+					tId = tools.getNodeMainDom(tmp).id;
+					nodeEventType = "switchNode";
+				}
+			}
+			if (treeEventType.length > 0 && tId.length == 0) {
+				tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+				if (tmp) {
+					tId = tools.getNodeMainDom(tmp).id;
+				}
+			}
+			// event to node
+			if (tId.length > 0) {
+				node = data.getNodeCache(setting, tId);
+				switch (nodeEventType) {
+					case "switchNode" :
+						if (!node.isParent) {
+							nodeEventType = "";
+						} else if (tools.eqs(event.type, "click")
+							|| (tools.eqs(event.type, "dblclick") && tools.apply(setting.view.dblClickExpand, [setting.treeId, node], setting.view.dblClickExpand))) {
+							nodeEventCallback = handler.onSwitchNode;
+						} else {
+							nodeEventType = "";
+						}
+						break;
+					case "clickNode" :
+						nodeEventCallback = handler.onClickNode;
+						break;
+				}
+			}
+			// event to zTree
+			switch (treeEventType) {
+				case "mousedown" :
+					treeEventCallback = handler.onZTreeMousedown;
+					break;
+				case "mouseup" :
+					treeEventCallback = handler.onZTreeMouseup;
+					break;
+				case "dblclick" :
+					treeEventCallback = handler.onZTreeDblclick;
+					break;
+				case "contextmenu" :
+					treeEventCallback = handler.onZTreeContextmenu;
+					break;
+			}
+			var proxyResult = {
+				stop: false,
+				node: node,
+				nodeEventType: nodeEventType,
+				nodeEventCallback: nodeEventCallback,
+				treeEventType: treeEventType,
+				treeEventCallback: treeEventCallback
+			};
+			return proxyResult
+		},
+		//default init node of core
+		_initNode = function (setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+			if (!n) return;
+			var r = data.getRoot(setting),
+				childKey = setting.data.key.children;
+			n.level = level;
+			n.tId = setting.treeId + "_" + (++r.zId);
+			n.parentTId = parentNode ? parentNode.tId : null;
+			n.open = (typeof n.open == "string") ? tools.eqs(n.open, "true") : !!n.open;
+			if (n[childKey] && n[childKey].length > 0) {
+				n.isParent = true;
+				n.zAsync = true;
+			} else {
+				n.isParent = (typeof n.isParent == "string") ? tools.eqs(n.isParent, "true") : !!n.isParent;
+				n.open = (n.isParent && !setting.async.enable) ? n.open : false;
+				n.zAsync = !n.isParent;
+			}
+			n.isFirstNode = isFirstNode;
+			n.isLastNode = isLastNode;
+			n.getParentNode = function () {
+				return data.getNodeCache(setting, n.parentTId);
+			};
+			n.getPreNode = function () {
+				return data.getPreNode(setting, n);
+			};
+			n.getNextNode = function () {
+				return data.getNextNode(setting, n);
+			};
+			n.getIndex = function () {
+				return data.getNodeIndex(setting, n);
+			};
+			n.getPath = function () {
+				return data.getNodePath(setting, n);
+			};
+			n.isAjaxing = false;
+			data.fixPIdKeyValue(setting, n);
+		},
+		_init = {
+			bind: [_bindEvent],
+			unbind: [_unbindEvent],
+			caches: [_initCache],
+			nodes: [_initNode],
+			proxys: [_eventProxy],
+			roots: [_initRoot],
+			beforeA: [],
+			afterA: [],
+			innerBeforeA: [],
+			innerAfterA: [],
+			zTreeTools: []
+		},
+		//method of operate data
+		data = {
+			addNodeCache: function (setting, node) {
+				data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = node;
+			},
+			getNodeCacheId: function (tId) {
+				return tId.substring(tId.lastIndexOf("_") + 1);
+			},
+			addAfterA: function (afterA) {
+				_init.afterA.push(afterA);
+			},
+			addBeforeA: function (beforeA) {
+				_init.beforeA.push(beforeA);
+			},
+			addInnerAfterA: function (innerAfterA) {
+				_init.innerAfterA.push(innerAfterA);
+			},
+			addInnerBeforeA: function (innerBeforeA) {
+				_init.innerBeforeA.push(innerBeforeA);
+			},
+			addInitBind: function (bindEvent) {
+				_init.bind.push(bindEvent);
+			},
+			addInitUnBind: function (unbindEvent) {
+				_init.unbind.push(unbindEvent);
+			},
+			addInitCache: function (initCache) {
+				_init.caches.push(initCache);
+			},
+			addInitNode: function (initNode) {
+				_init.nodes.push(initNode);
+			},
+			addInitProxy: function (initProxy, isFirst) {
+				if (!!isFirst) {
+					_init.proxys.splice(0, 0, initProxy);
+				} else {
+					_init.proxys.push(initProxy);
+				}
+			},
+			addInitRoot: function (initRoot) {
+				_init.roots.push(initRoot);
+			},
+			addNodesData: function (setting, parentNode, index, nodes) {
+				var childKey = setting.data.key.children, params;
+				if (!parentNode[childKey]) {
+					parentNode[childKey] = [];
+					index = -1;
+				} else if (index >= parentNode[childKey].length) {
+					index = -1;
+				}
+
+				if (parentNode[childKey].length > 0 && index === 0) {
+					parentNode[childKey][0].isFirstNode = false;
+					view.setNodeLineIcos(setting, parentNode[childKey][0]);
+				} else if (parentNode[childKey].length > 0 && index < 0) {
+					parentNode[childKey][parentNode[childKey].length - 1].isLastNode = false;
+					view.setNodeLineIcos(setting, parentNode[childKey][parentNode[childKey].length - 1]);
+				}
+				parentNode.isParent = true;
+
+				if (index < 0) {
+					parentNode[childKey] = parentNode[childKey].concat(nodes);
+				} else {
+					params = [index, 0].concat(nodes);
+					parentNode[childKey].splice.apply(parentNode[childKey], params);
+				}
+			},
+			addSelectedNode: function (setting, node) {
+				var root = data.getRoot(setting);
+				if (!data.isSelectedNode(setting, node)) {
+					root.curSelectedList.push(node);
+				}
+			},
+			addCreatedNode: function (setting, node) {
+				if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
+					var root = data.getRoot(setting);
+					root.createdNodes.push(node);
+				}
+			},
+			addZTreeTools: function (zTreeTools) {
+				_init.zTreeTools.push(zTreeTools);
+			},
+			exSetting: function (s) {
+				$.extend(true, _setting, s);
+			},
+			fixPIdKeyValue: function (setting, node) {
+				if (setting.data.simpleData.enable) {
+					node[setting.data.simpleData.pIdKey] = node.parentTId ? node.getParentNode()[setting.data.simpleData.idKey] : setting.data.simpleData.rootPId;
+				}
+			},
+			getAfterA: function (setting, node, array) {
+				for (var i = 0, j = _init.afterA.length; i < j; i++) {
+					_init.afterA[i].apply(this, arguments);
+				}
+			},
+			getBeforeA: function (setting, node, array) {
+				for (var i = 0, j = _init.beforeA.length; i < j; i++) {
+					_init.beforeA[i].apply(this, arguments);
+				}
+			},
+			getInnerAfterA: function (setting, node, array) {
+				for (var i = 0, j = _init.innerAfterA.length; i < j; i++) {
+					_init.innerAfterA[i].apply(this, arguments);
+				}
+			},
+			getInnerBeforeA: function (setting, node, array) {
+				for (var i = 0, j = _init.innerBeforeA.length; i < j; i++) {
+					_init.innerBeforeA[i].apply(this, arguments);
+				}
+			},
+			getCache: function (setting) {
+				return caches[setting.treeId];
+			},
+			getNodeIndex: function (setting, node) {
+				if (!node) return null;
+				var childKey = setting.data.key.children,
+					p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
+				for (var i = 0, l = p[childKey].length - 1; i <= l; i++) {
+					if (p[childKey][i] === node) {
+						return i;
+					}
+				}
+				return -1;
+			},
+			getNextNode: function (setting, node) {
+				if (!node) return null;
+				var childKey = setting.data.key.children,
+					p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
+				for (var i = 0, l = p[childKey].length - 1; i <= l; i++) {
+					if (p[childKey][i] === node) {
+						return (i == l ? null : p[childKey][i + 1]);
+					}
+				}
+				return null;
+			},
+			getNodeByParam: function (setting, nodes, key, value) {
+				if (!nodes || !key) return null;
+				var childKey = setting.data.key.children;
+				for (var i = 0, l = nodes.length; i < l; i++) {
+					if (nodes[i][key] == value) {
+						return nodes[i];
+					}
+					var tmp = data.getNodeByParam(setting, nodes[i][childKey], key, value);
+					if (tmp) return tmp;
+				}
+				return null;
+			},
+			getNodeCache: function (setting, tId) {
+				if (!tId) return null;
+				var n = caches[setting.treeId].nodes[data.getNodeCacheId(tId)];
+				return n ? n : null;
+			},
+			getNodeName: function (setting, node) {
+				var nameKey = setting.data.key.name;
+				return "" + node[nameKey];
+			},
+			getNodePath: function (setting, node) {
+				if (!node) return null;
+
+				var path;
+				if (node.parentTId) {
+					path = node.getParentNode().getPath();
+				} else {
+					path = [];
+				}
+
+				if (path) {
+					path.push(node);
+				}
+
+				return path;
+			},
+			getNodeTitle: function (setting, node) {
+				var t = setting.data.key.title === "" ? setting.data.key.name : setting.data.key.title;
+				return "" + node[t];
+			},
+			getNodes: function (setting) {
+				return data.getRoot(setting)[setting.data.key.children];
+			},
+			getNodesByParam: function (setting, nodes, key, value) {
+				if (!nodes || !key) return [];
+				var childKey = setting.data.key.children,
+					result = [];
+				for (var i = 0, l = nodes.length; i < l; i++) {
+					if (nodes[i][key] == value) {
+						result.push(nodes[i]);
+					}
+					result = result.concat(data.getNodesByParam(setting, nodes[i][childKey], key, value));
+				}
+				return result;
+			},
+			getNodesByParamFuzzy: function (setting, nodes, key, value) {
+				if (!nodes || !key) return [];
+				var childKey = setting.data.key.children,
+					result = [];
+				value = value.toLowerCase();
+				for (var i = 0, l = nodes.length; i < l; i++) {
+					if (typeof nodes[i][key] == "string" && nodes[i][key].toLowerCase().indexOf(value) > -1) {
+						result.push(nodes[i]);
+					}
+					result = result.concat(data.getNodesByParamFuzzy(setting, nodes[i][childKey], key, value));
+				}
+				return result;
+			},
+			getNodesByFilter: function (setting, nodes, filter, isSingle, invokeParam) {
+				if (!nodes) return (isSingle ? null : []);
+				var childKey = setting.data.key.children,
+					result = isSingle ? null : [];
+				for (var i = 0, l = nodes.length; i < l; i++) {
+					if (tools.apply(filter, [nodes[i], invokeParam], false)) {
+						if (isSingle) {
+							return nodes[i];
+						}
+						result.push(nodes[i]);
+					}
+					var tmpResult = data.getNodesByFilter(setting, nodes[i][childKey], filter, isSingle, invokeParam);
+					if (isSingle && !!tmpResult) {
+						return tmpResult;
+					}
+					result = isSingle ? tmpResult : result.concat(tmpResult);
+				}
+				return result;
+			},
+			getPreNode: function (setting, node) {
+				if (!node) return null;
+				var childKey = setting.data.key.children,
+					p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
+				for (var i = 0, l = p[childKey].length; i < l; i++) {
+					if (p[childKey][i] === node) {
+						return (i == 0 ? null : p[childKey][i - 1]);
+					}
+				}
+				return null;
+			},
+			getRoot: function (setting) {
+				return setting ? roots[setting.treeId] : null;
+			},
+			getRoots: function () {
+				return roots;
+			},
+			getSetting: function (treeId) {
+				return settings[treeId];
+			},
+			getSettings: function () {
+				return settings;
+			},
+			getZTreeTools: function (treeId) {
+				var r = this.getRoot(this.getSetting(treeId));
+				return r ? r.treeTools : null;
+			},
+			initCache: function (setting) {
+				for (var i = 0, j = _init.caches.length; i < j; i++) {
+					_init.caches[i].apply(this, arguments);
+				}
+			},
+			initNode: function (setting, level, node, parentNode, preNode, nextNode) {
+				for (var i = 0, j = _init.nodes.length; i < j; i++) {
+					_init.nodes[i].apply(this, arguments);
+				}
+			},
+			initRoot: function (setting) {
+				for (var i = 0, j = _init.roots.length; i < j; i++) {
+					_init.roots[i].apply(this, arguments);
+				}
+			},
+			isSelectedNode: function (setting, node) {
+				var root = data.getRoot(setting);
+				for (var i = 0, j = root.curSelectedList.length; i < j; i++) {
+					if (node === root.curSelectedList[i]) return true;
+				}
+				return false;
+			},
+			removeNodeCache: function (setting, node) {
+				var childKey = setting.data.key.children;
+				if (node[childKey]) {
+					for (var i = 0, l = node[childKey].length; i < l; i++) {
+						data.removeNodeCache(setting, node[childKey][i]);
+					}
+				}
+				data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = null;
+			},
+			removeSelectedNode: function (setting, node) {
+				var root = data.getRoot(setting);
+				for (var i = 0, j = root.curSelectedList.length; i < j; i++) {
+					if (node === root.curSelectedList[i] || !data.getNodeCache(setting, root.curSelectedList[i].tId)) {
+						root.curSelectedList.splice(i, 1);
+						setting.treeObj.trigger(consts.event.UNSELECTED, [setting.treeId, node]);
+						i--;
+						j--;
+					}
+				}
+			},
+			setCache: function (setting, cache) {
+				caches[setting.treeId] = cache;
+			},
+			setRoot: function (setting, root) {
+				roots[setting.treeId] = root;
+			},
+			setZTreeTools: function (setting, zTreeTools) {
+				for (var i = 0, j = _init.zTreeTools.length; i < j; i++) {
+					_init.zTreeTools[i].apply(this, arguments);
+				}
+			},
+			transformToArrayFormat: function (setting, nodes) {
+				if (!nodes) return [];
+				var childKey = setting.data.key.children,
+					r = [];
+				if (tools.isArray(nodes)) {
+					for (var i = 0, l = nodes.length; i < l; i++) {
+						r.push(nodes[i]);
+						if (nodes[i][childKey])
+							r = r.concat(data.transformToArrayFormat(setting, nodes[i][childKey]));
+					}
+				} else {
+					r.push(nodes);
+					if (nodes[childKey])
+						r = r.concat(data.transformToArrayFormat(setting, nodes[childKey]));
+				}
+				return r;
+			},
+			transformTozTreeFormat: function (setting, sNodes) {
+				var i, l,
+					key = setting.data.simpleData.idKey,
+					parentKey = setting.data.simpleData.pIdKey,
+					childKey = setting.data.key.children;
+				if (!key || key == "" || !sNodes) return [];
+
+				if (tools.isArray(sNodes)) {
+					var r = [];
+					var tmpMap = {};
+					for (i = 0, l = sNodes.length; i < l; i++) {
+						tmpMap[sNodes[i][key]] = sNodes[i];
+					}
+					for (i = 0, l = sNodes.length; i < l; i++) {
+						if (tmpMap[sNodes[i][parentKey]] && sNodes[i][key] != sNodes[i][parentKey]) {
+							if (!tmpMap[sNodes[i][parentKey]][childKey])
+								tmpMap[sNodes[i][parentKey]][childKey] = [];
+							tmpMap[sNodes[i][parentKey]][childKey].push(sNodes[i]);
+						} else {
+							r.push(sNodes[i]);
+						}
+					}
+					return r;
+				} else {
+					return [sNodes];
+				}
+			}
+		},
+		//method of event proxy
+		event = {
+			bindEvent: function (setting) {
+				for (var i = 0, j = _init.bind.length; i < j; i++) {
+					_init.bind[i].apply(this, arguments);
+				}
+			},
+			unbindEvent: function (setting) {
+				for (var i = 0, j = _init.unbind.length; i < j; i++) {
+					_init.unbind[i].apply(this, arguments);
+				}
+			},
+			bindTree: function (setting) {
+				var eventParam = {
+						treeId: setting.treeId
+					},
+					o = setting.treeObj;
+				if (!setting.view.txtSelectedEnable) {
+					// for can't select text
+					o.bind('selectstart', handler.onSelectStart).css({
+						"-moz-user-select": "-moz-none"
+					});
+				}
+				o.bind('click', eventParam, event.proxy);
+				o.bind('dblclick', eventParam, event.proxy);
+				o.bind('mouseover', eventParam, event.proxy);
+				o.bind('mouseout', eventParam, event.proxy);
+				o.bind('mousedown', eventParam, event.proxy);
+				o.bind('mouseup', eventParam, event.proxy);
+				o.bind('contextmenu', eventParam, event.proxy);
+			},
+			unbindTree: function (setting) {
+				var o = setting.treeObj;
+				o.unbind('selectstart', handler.onSelectStart)
+					.unbind('click', event.proxy)
+					.unbind('dblclick', event.proxy)
+					.unbind('mouseover', event.proxy)
+					.unbind('mouseout', event.proxy)
+					.unbind('mousedown', event.proxy)
+					.unbind('mouseup', event.proxy)
+					.unbind('contextmenu', event.proxy);
+			},
+			doProxy: function (e) {
+				var results = [];
+				for (var i = 0, j = _init.proxys.length; i < j; i++) {
+					var proxyResult = _init.proxys[i].apply(this, arguments);
+					results.push(proxyResult);
+					if (proxyResult.stop) {
+						break;
+					}
+				}
+				return results;
+			},
+			proxy: function (e) {
+				var setting = data.getSetting(e.data.treeId);
+				if (!tools.uCanDo(setting, e)) return true;
+				var results = event.doProxy(e),
+					r = true, x = false;
+				for (var i = 0, l = results.length; i < l; i++) {
+					var proxyResult = results[i];
+					if (proxyResult.nodeEventCallback) {
+						x = true;
+						r = proxyResult.nodeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
+					}
+					if (proxyResult.treeEventCallback) {
+						x = true;
+						r = proxyResult.treeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
+					}
+				}
+				return r;
+			}
+		},
+		//method of event handler
+		handler = {
+			onSwitchNode: function (event, node) {
+				var setting = data.getSetting(event.data.treeId);
+				if (node.open) {
+					if (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false) return true;
+					data.getRoot(setting).expandTriggerFlag = true;
+					view.switchNode(setting, node);
+				} else {
+					if (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false) return true;
+					data.getRoot(setting).expandTriggerFlag = true;
+					view.switchNode(setting, node);
+				}
+				return true;
+			},
+			onClickNode: function (event, node) {
+				var setting = data.getSetting(event.data.treeId),
+					clickFlag = ((setting.view.autoCancelSelected && (event.ctrlKey || event.metaKey)) && data.isSelectedNode(setting, node)) ? 0 : (setting.view.autoCancelSelected && (event.ctrlKey || event.metaKey) && setting.view.selectedMulti) ? 2 : 1;
+				if (tools.apply(setting.callback.beforeClick, [setting.treeId, node, clickFlag], true) == false) return true;
+				if (clickFlag === 0) {
+					view.cancelPreSelectedNode(setting, node);
+				} else {
+					view.selectNode(setting, node, clickFlag === 2);
+				}
+				setting.treeObj.trigger(consts.event.CLICK, [event, setting.treeId, node, clickFlag]);
+				return true;
+			},
+			onZTreeMousedown: function (event, node) {
+				var setting = data.getSetting(event.data.treeId);
+				if (tools.apply(setting.callback.beforeMouseDown, [setting.treeId, node], true)) {
+					tools.apply(setting.callback.onMouseDown, [event, setting.treeId, node]);
+				}
+				return true;
+			},
+			onZTreeMouseup: function (event, node) {
+				var setting = data.getSetting(event.data.treeId);
+				if (tools.apply(setting.callback.beforeMouseUp, [setting.treeId, node], true)) {
+					tools.apply(setting.callback.onMouseUp, [event, setting.treeId, node]);
+				}
+				return true;
+			},
+			onZTreeDblclick: function (event, node) {
+				var setting = data.getSetting(event.data.treeId);
+				if (tools.apply(setting.callback.beforeDblClick, [setting.treeId, node], true)) {
+					tools.apply(setting.callback.onDblClick, [event, setting.treeId, node]);
+				}
+				return true;
+			},
+			onZTreeContextmenu: function (event, node) {
+				var setting = data.getSetting(event.data.treeId);
+				if (tools.apply(setting.callback.beforeRightClick, [setting.treeId, node], true)) {
+					tools.apply(setting.callback.onRightClick, [event, setting.treeId, node]);
+				}
+				return (typeof setting.callback.onRightClick) != "function";
+			},
+			onSelectStart: function (e) {
+				var n = e.originalEvent.srcElement.nodeName.toLowerCase();
+				return (n === "input" || n === "textarea");
+			}
+		},
+		//method of tools for zTree
+		tools = {
+			apply: function (fun, param, defaultValue) {
+				if ((typeof fun) == "function") {
+					return fun.apply(zt, param ? param : []);
+				}
+				return defaultValue;
+			},
+			canAsync: function (setting, node) {
+				var childKey = setting.data.key.children;
+				return (setting.async.enable && node && node.isParent && !(node.zAsync || (node[childKey] && node[childKey].length > 0)));
+			},
+			clone: function (obj) {
+				if (obj === null) return null;
+				var o = tools.isArray(obj) ? [] : {};
+				for (var i in obj) {
+					o[i] = (obj[i] instanceof Date) ? new Date(obj[i].getTime()) : (typeof obj[i] === "object" ? tools.clone(obj[i]) : obj[i]);
+				}
+				return o;
+			},
+			eqs: function (str1, str2) {
+				return str1.toLowerCase() === str2.toLowerCase();
+			},
+			isArray: function (arr) {
+				return Object.prototype.toString.apply(arr) === "[object Array]";
+			},
+			isElement: function (o) {
+				return (
+					typeof HTMLElement === "object" ? o instanceof HTMLElement : //DOM2
+						o && typeof o === "object" && o !== null && o.nodeType === 1 && typeof o.nodeName === "string"
+				);
+			},
+			$: function (node, exp, setting) {
+				if (!!exp && typeof exp != "string") {
+					setting = exp;
+					exp = "";
+				}
+				if (typeof node == "string") {
+					return $(node, setting ? setting.treeObj.get(0).ownerDocument : null);
+				} else {
+					return $("#" + node.tId + exp, setting ? setting.treeObj : null);
+				}
+			},
+			getMDom: function (setting, curDom, targetExpr) {
+				if (!curDom) return null;
+				while (curDom && curDom.id !== setting.treeId) {
+					for (var i = 0, l = targetExpr.length; curDom.tagName && i < l; i++) {
+						if (tools.eqs(curDom.tagName, targetExpr[i].tagName) && curDom.getAttribute(targetExpr[i].attrName) !== null) {
+							return curDom;
+						}
+					}
+					curDom = curDom.parentNode;
+				}
+				return null;
+			},
+			getNodeMainDom: function (target) {
+				return ($(target).parent("li").get(0) || $(target).parentsUntil("li").parent().get(0));
+			},
+			isChildOrSelf: function (dom, parentId) {
+				return ($(dom).closest("#" + parentId).length > 0);
+			},
+			uCanDo: function (setting, e) {
+				return true;
+			}
+		},
+		//method of operate ztree dom
+		view = {
+			addNodes: function (setting, parentNode, index, newNodes, isSilent) {
+				if (setting.data.keep.leaf && parentNode && !parentNode.isParent) {
+					return;
+				}
+				if (!tools.isArray(newNodes)) {
+					newNodes = [newNodes];
+				}
+				if (setting.data.simpleData.enable) {
+					newNodes = data.transformTozTreeFormat(setting, newNodes);
+				}
+				if (parentNode) {
+					var target_switchObj = $$(parentNode, consts.id.SWITCH, setting),
+						target_icoObj = $$(parentNode, consts.id.ICON, setting),
+						target_ulObj = $$(parentNode, consts.id.UL, setting);
+
+					if (!parentNode.open) {
+						view.replaceSwitchClass(parentNode, target_switchObj, consts.folder.CLOSE);
+						view.replaceIcoClass(parentNode, target_icoObj, consts.folder.CLOSE);
+						parentNode.open = false;
+						target_ulObj.css({
+							"display": "none"
+						});
+					}
+
+					data.addNodesData(setting, parentNode, index, newNodes);
+					view.createNodes(setting, parentNode.level + 1, newNodes, parentNode, index);
+					if (!isSilent) {
+						view.expandCollapseParentNode(setting, parentNode, true);
+					}
+				} else {
+					data.addNodesData(setting, data.getRoot(setting), index, newNodes);
+					view.createNodes(setting, 0, newNodes, null, index);
+				}
+			},
+			appendNodes: function (setting, level, nodes, parentNode, index, initFlag, openFlag) {
+				if (!nodes) return [];
+				var html = [],
+					childKey = setting.data.key.children;
+
+				var tmpPNode = (parentNode) ? parentNode : data.getRoot(setting),
+					tmpPChild = tmpPNode[childKey],
+					isFirstNode, isLastNode;
+
+				if (!tmpPChild || index >= tmpPChild.length - nodes.length) {
+					index = -1;
+				}
+
+				for (var i = 0, l = nodes.length; i < l; i++) {
+					var node = nodes[i];
+					if (initFlag) {
+						isFirstNode = ((index === 0 || tmpPChild.length == nodes.length) && (i == 0));
+						isLastNode = (index < 0 && i == (nodes.length - 1));
+						data.initNode(setting, level, node, parentNode, isFirstNode, isLastNode, openFlag);
+						data.addNodeCache(setting, node);
+					}
+
+					var childHtml = [];
+					if (node[childKey] && node[childKey].length > 0) {
+						//make child html first, because checkType
+						childHtml = view.appendNodes(setting, level + 1, node[childKey], node, -1, initFlag, openFlag && node.open);
+					}
+					if (openFlag) {
+
+						view.makeDOMNodeMainBefore(html, setting, node);
+						view.makeDOMNodeLine(html, setting, node);
+						data.getBeforeA(setting, node, html);
+						view.makeDOMNodeNameBefore(html, setting, node);
+						data.getInnerBeforeA(setting, node, html);
+						view.makeDOMNodeIcon(html, setting, node);
+						data.getInnerAfterA(setting, node, html);
+						view.makeDOMNodeNameAfter(html, setting, node);
+						data.getAfterA(setting, node, html);
+						if (node.isParent && node.open) {
+							view.makeUlHtml(setting, node, html, childHtml.join(''));
+						}
+						view.makeDOMNodeMainAfter(html, setting, node);
+						data.addCreatedNode(setting, node);
+					}
+				}
+				return html;
+			},
+			appendParentULDom: function (setting, node) {
+				var html = [],
+					nObj = $$(node, setting);
+				if (!nObj.get(0) && !!node.parentTId) {
+					view.appendParentULDom(setting, node.getParentNode());
+					nObj = $$(node, setting);
+				}
+				var ulObj = $$(node, consts.id.UL, setting);
+				if (ulObj.get(0)) {
+					ulObj.remove();
+				}
+				var childKey = setting.data.key.children,
+					childHtml = view.appendNodes(setting, node.level + 1, node[childKey], node, -1, false, true);
+				view.makeUlHtml(setting, node, html, childHtml.join(''));
+				nObj.append(html.join(''));
+			},
+			asyncNode: function (setting, node, isSilent, callback) {
+				var i, l;
+				if (node && !node.isParent) {
+					tools.apply(callback);
+					return false;
+				} else if (node && node.isAjaxing) {
+					return false;
+				} else if (tools.apply(setting.callback.beforeAsync, [setting.treeId, node], true) == false) {
+					tools.apply(callback);
+					return false;
+				}
+				if (node) {
+					node.isAjaxing = true;
+					var icoObj = $$(node, consts.id.ICON, setting);
+					icoObj.attr({"style": "", "class": consts.className.BUTTON + " " + consts.className.ICO_LOADING});
+				}
+
+				var tmpParam = {};
+				for (i = 0, l = setting.async.autoParam.length; node && i < l; i++) {
+					var pKey = setting.async.autoParam[i].split("="), spKey = pKey;
+					if (pKey.length > 1) {
+						spKey = pKey[1];
+						pKey = pKey[0];
+					}
+					tmpParam[spKey] = node[pKey];
+				}
+				if (tools.isArray(setting.async.otherParam)) {
+					for (i = 0, l = setting.async.otherParam.length; i < l; i += 2) {
+						tmpParam[setting.async.otherParam[i]] = setting.async.otherParam[i + 1];
+					}
+				} else {
+					for (var p in setting.async.otherParam) {
+						tmpParam[p] = setting.async.otherParam[p];
+					}
+				}
+
+				var _tmpV = data.getRoot(setting)._ver;
+				$.ajax({
+					contentType: setting.async.contentType,
+					cache: false,
+					type: setting.async.type,
+					url: tools.apply(setting.async.url, [setting.treeId, node], setting.async.url),
+					data: setting.async.contentType.indexOf('application/json') > -1 ? JSON.stringify(tmpParam) : tmpParam,
+					dataType: setting.async.dataType,
+					success: function (msg) {
+						if (_tmpV != data.getRoot(setting)._ver) {
+							return;
+						}
+						var newNodes = [];
+						try {
+							if (!msg || msg.length == 0) {
+								newNodes = [];
+							} else if (typeof msg == "string") {
+								newNodes = eval("(" + msg + ")");
+							} else {
+								newNodes = msg;
+							}
+						} catch (err) {
+							newNodes = msg;
+						}
+
+						if (node) {
+							node.isAjaxing = null;
+							node.zAsync = true;
+						}
+						view.setNodeLineIcos(setting, node);
+						if (newNodes && newNodes !== "") {
+							newNodes = tools.apply(setting.async.dataFilter, [setting.treeId, node, newNodes], newNodes);
+							view.addNodes(setting, node, -1, !!newNodes ? tools.clone(newNodes) : [], !!isSilent);
+						} else {
+							view.addNodes(setting, node, -1, [], !!isSilent);
+						}
+						setting.treeObj.trigger(consts.event.ASYNC_SUCCESS, [setting.treeId, node, msg]);
+						tools.apply(callback);
+					},
+					error: function (XMLHttpRequest, textStatus, errorThrown) {
+						if (_tmpV != data.getRoot(setting)._ver) {
+							return;
+						}
+						if (node) node.isAjaxing = null;
+						view.setNodeLineIcos(setting, node);
+						setting.treeObj.trigger(consts.event.ASYNC_ERROR, [setting.treeId, node, XMLHttpRequest, textStatus, errorThrown]);
+					}
+				});
+				return true;
+			},
+			cancelPreSelectedNode: function (setting, node, excludeNode) {
+				var list = data.getRoot(setting).curSelectedList,
+					i, n;
+				for (i = list.length - 1; i >= 0; i--) {
+					n = list[i];
+					if (node === n || (!node && (!excludeNode || excludeNode !== n))) {
+						$$(n, consts.id.A, setting).removeClass(consts.node.CURSELECTED);
+						if (node) {
+							data.removeSelectedNode(setting, node);
+							break;
+						} else {
+							list.splice(i, 1);
+							setting.treeObj.trigger(consts.event.UNSELECTED, [setting.treeId, n]);
+						}
+					}
+				}
+			},
+			createNodeCallback: function (setting) {
+				if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
+					var root = data.getRoot(setting);
+					while (root.createdNodes.length > 0) {
+						var node = root.createdNodes.shift();
+						tools.apply(setting.view.addDiyDom, [setting.treeId, node]);
+						if (!!setting.callback.onNodeCreated) {
+							setting.treeObj.trigger(consts.event.NODECREATED, [setting.treeId, node]);
+						}
+					}
+				}
+			},
+			createNodes: function (setting, level, nodes, parentNode, index) {
+				if (!nodes || nodes.length == 0) return;
+				var root = data.getRoot(setting),
+					childKey = setting.data.key.children,
+					openFlag = !parentNode || parentNode.open || !!$$(parentNode[childKey][0], setting).get(0);
+				root.createdNodes = [];
+				var zTreeHtml = view.appendNodes(setting, level, nodes, parentNode, index, true, openFlag),
+					parentObj, nextObj;
+
+				if (!parentNode) {
+					parentObj = setting.treeObj;
+					//setting.treeObj.append(zTreeHtml.join(''));
+				} else {
+					var ulObj = $$(parentNode, consts.id.UL, setting);
+					if (ulObj.get(0)) {
+						parentObj = ulObj;
+						//ulObj.append(zTreeHtml.join(''));
+					}
+				}
+				if (parentObj) {
+					if (index >= 0) {
+						nextObj = parentObj.children()[index];
+					}
+					if (index >= 0 && nextObj) {
+						$(nextObj).before(zTreeHtml.join(''));
+					} else {
+						parentObj.append(zTreeHtml.join(''));
+					}
+				}
+
+				view.createNodeCallback(setting);
+			},
+			destroy: function (setting) {
+				if (!setting) return;
+				data.initCache(setting);
+				data.initRoot(setting);
+				event.unbindTree(setting);
+				event.unbindEvent(setting);
+				setting.treeObj.empty();
+				delete settings[setting.treeId];
+			},
+			expandCollapseNode: function (setting, node, expandFlag, animateFlag, callback) {
+				var root = data.getRoot(setting),
+					childKey = setting.data.key.children;
+				var tmpCb, _callback;
+				if (!node) {
+					tools.apply(callback, []);
+					return;
+				}
+				if (root.expandTriggerFlag) {
+					_callback = callback;
+					tmpCb = function () {
+						if (_callback) _callback();
+						if (node.open) {
+							setting.treeObj.trigger(consts.event.EXPAND, [setting.treeId, node]);
+						} else {
+							setting.treeObj.trigger(consts.event.COLLAPSE, [setting.treeId, node]);
+						}
+					};
+					callback = tmpCb;
+					root.expandTriggerFlag = false;
+				}
+				if (!node.open && node.isParent && ((!$$(node, consts.id.UL, setting).get(0)) || (node[childKey] && node[childKey].length > 0 && !$$(node[childKey][0], setting).get(0)))) {
+					view.appendParentULDom(setting, node);
+					view.createNodeCallback(setting);
+				}
+				if (node.open == expandFlag) {
+					tools.apply(callback, []);
+					return;
+				}
+				var ulObj = $$(node, consts.id.UL, setting),
+					switchObj = $$(node, consts.id.SWITCH, setting),
+					icoObj = $$(node, consts.id.ICON, setting);
+
+				if (node.isParent) {
+					node.open = !node.open;
+					if (node.iconOpen && node.iconClose) {
+						icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
+					}
+
+					if (node.open) {
+						view.replaceSwitchClass(node, switchObj, consts.folder.OPEN);
+						view.replaceIcoClass(node, icoObj, consts.folder.OPEN);
+						if (animateFlag == false || setting.view.expandSpeed == "") {
+							ulObj.show();
+							tools.apply(callback, []);
+						} else {
+							if (node[childKey] && node[childKey].length > 0) {
+								ulObj.slideDown(setting.view.expandSpeed, callback);
+							} else {
+								ulObj.show();
+								tools.apply(callback, []);
+							}
+						}
+					} else {
+						view.replaceSwitchClass(node, switchObj, consts.folder.CLOSE);
+						view.replaceIcoClass(node, icoObj, consts.folder.CLOSE);
+						if (animateFlag == false || setting.view.expandSpeed == "" || !(node[childKey] && node[childKey].length > 0)) {
+							ulObj.hide();
+							tools.apply(callback, []);
+						} else {
+							ulObj.slideUp(setting.view.expandSpeed, callback);
+						}
+					}
+				} else {
+					tools.apply(callback, []);
+				}
+			},
+			expandCollapseParentNode: function (setting, node, expandFlag, animateFlag, callback) {
+				if (!node) return;
+				if (!node.parentTId) {
+					view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback);
+					return;
+				} else {
+					view.expandCollapseNode(setting, node, expandFlag, animateFlag);
+				}
+				if (node.parentTId) {
+					view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, animateFlag, callback);
+				}
+			},
+			expandCollapseSonNode: function (setting, node, expandFlag, animateFlag, callback) {
+				var root = data.getRoot(setting),
+					childKey = setting.data.key.children,
+					treeNodes = (node) ? node[childKey] : root[childKey],
+					selfAnimateSign = (node) ? false : animateFlag,
+					expandTriggerFlag = data.getRoot(setting).expandTriggerFlag;
+				data.getRoot(setting).expandTriggerFlag = false;
+				if (treeNodes) {
+					for (var i = 0, l = treeNodes.length; i < l; i++) {
+						if (treeNodes[i]) view.expandCollapseSonNode(setting, treeNodes[i], expandFlag, selfAnimateSign);
+					}
+				}
+				data.getRoot(setting).expandTriggerFlag = expandTriggerFlag;
+				view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback);
+			},
+			isSelectedNode: function (setting, node) {
+				if (!node) {
+					return false;
+				}
+				var list = data.getRoot(setting).curSelectedList,
+					i;
+				for (i = list.length - 1; i >= 0; i--) {
+					if (node === list[i]) {
+						return true;
+					}
+				}
+				return false;
+			},
+			makeDOMNodeIcon: function (html, setting, node) {
+				var nameStr = data.getNodeName(setting, node),
+					name = setting.view.nameIsHTML ? nameStr : nameStr.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+				html.push("<span id='", node.tId, consts.id.ICON,
+					"' title='' treeNode", consts.id.ICON, " class='", view.makeNodeIcoClass(setting, node),
+					"' style='", view.makeNodeIcoStyle(setting, node), "'></span><span id='", node.tId, consts.id.SPAN,
+					"' class='", consts.className.NAME,
+					"'>", name, "</span>");
+			},
+			makeDOMNodeLine: function (html, setting, node) {
+				html.push("<span id='", node.tId, consts.id.SWITCH, "' title='' class='", view.makeNodeLineClass(setting, node), "' treeNode", consts.id.SWITCH, "></span>");
+			},
+			makeDOMNodeMainAfter: function (html, setting, node) {
+				html.push("</li>");
+			},
+			makeDOMNodeMainBefore: function (html, setting, node) {
+				html.push("<li id='", node.tId, "' class='", consts.className.LEVEL, node.level, "' tabindex='0' hidefocus='true' treenode>");
+			},
+			makeDOMNodeNameAfter: function (html, setting, node) {
+				html.push("</a>");
+			},
+			makeDOMNodeNameBefore: function (html, setting, node) {
+				var title = data.getNodeTitle(setting, node),
+					url = view.makeNodeUrl(setting, node),
+					fontcss = view.makeNodeFontCss(setting, node),
+					fontStyle = [];
+				for (var f in fontcss) {
+					fontStyle.push(f, ":", fontcss[f], ";");
+				}
+				html.push("<a id='", node.tId, consts.id.A, "' class='", consts.className.LEVEL, node.level, "' treeNode", consts.id.A, " onclick=\"", (node.click || ''),
+					"\" ", ((url != null && url.length > 0) ? "href='" + url + "'" : ""), " target='", view.makeNodeTarget(node), "' style='", fontStyle.join(''),
+					"'");
+				if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle) && title) {
+					html.push("title='", title.replace(/'/g, "&#39;").replace(/</g, '&lt;').replace(/>/g, '&gt;'), "'");
+				}
+				html.push(">");
+			},
+			makeNodeFontCss: function (setting, node) {
+				var fontCss = tools.apply(setting.view.fontCss, [setting.treeId, node], setting.view.fontCss);
+				return (fontCss && ((typeof fontCss) != "function")) ? fontCss : {};
+			},
+			makeNodeIcoClass: function (setting, node) {
+				var icoCss = ["ico"];
+				if (!node.isAjaxing) {
+					icoCss[0] = (node.iconSkin ? node.iconSkin + "_" : "") + icoCss[0];
+					if (node.isParent) {
+						icoCss.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
+					} else {
+						icoCss.push(consts.folder.DOCU);
+					}
+				}
+				return consts.className.BUTTON + " " + icoCss.join('_');
+			},
+			makeNodeIcoStyle: function (setting, node) {
+				var icoStyle = [];
+				if (!node.isAjaxing) {
+					var icon = (node.isParent && node.iconOpen && node.iconClose) ? (node.open ? node.iconOpen : node.iconClose) : node[setting.data.key.icon];
+					if (icon) icoStyle.push("background:url(", icon, ") 0 0 no-repeat;");
+					if (setting.view.showIcon == false || !tools.apply(setting.view.showIcon, [setting.treeId, node], true)) {
+						icoStyle.push("width:0px;height:0px;");
+					}
+				}
+				return icoStyle.join('');
+			},
+			makeNodeLineClass: function (setting, node) {
+				var lineClass = [];
+				if (setting.view.showLine) {
+					if (node.level == 0 && node.isFirstNode && node.isLastNode) {
+						lineClass.push(consts.line.ROOT);
+					} else if (node.level == 0 && node.isFirstNode) {
+						lineClass.push(consts.line.ROOTS);
+					} else if (node.isLastNode) {
+						lineClass.push(consts.line.BOTTOM);
+					} else {
+						lineClass.push(consts.line.CENTER);
+					}
+				} else {
+					lineClass.push(consts.line.NOLINE);
+				}
+				if (node.isParent) {
+					lineClass.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
+				} else {
+					lineClass.push(consts.folder.DOCU);
+				}
+				return view.makeNodeLineClassEx(node) + lineClass.join('_');
+			},
+			makeNodeLineClassEx: function (node) {
+				return consts.className.BUTTON + " " + consts.className.LEVEL + node.level + " " + consts.className.SWITCH + " ";
+			},
+			makeNodeTarget: function (node) {
+				return (node.target || "_blank");
+			},
+			makeNodeUrl: function (setting, node) {
+				var urlKey = setting.data.key.url;
+				return node[urlKey] ? node[urlKey] : null;
+			},
+			makeUlHtml: function (setting, node, html, content) {
+				html.push("<ul id='", node.tId, consts.id.UL, "' class='", consts.className.LEVEL, node.level, " ", view.makeUlLineClass(setting, node), "' style='display:", (node.open ? "block" : "none"), "'>");
+				html.push(content);
+				html.push("</ul>");
+			},
+			makeUlLineClass: function (setting, node) {
+				return ((setting.view.showLine && !node.isLastNode) ? consts.line.LINE : "");
+			},
+			removeChildNodes: function (setting, node) {
+				if (!node) return;
+				var childKey = setting.data.key.children,
+					nodes = node[childKey];
+				if (!nodes) return;
+
+				for (var i = 0, l = nodes.length; i < l; i++) {
+					data.removeNodeCache(setting, nodes[i]);
+				}
+				data.removeSelectedNode(setting);
+				delete node[childKey];
+
+				if (!setting.data.keep.parent) {
+					node.isParent = false;
+					node.open = false;
+					var tmp_switchObj = $$(node, consts.id.SWITCH, setting),
+						tmp_icoObj = $$(node, consts.id.ICON, setting);
+					view.replaceSwitchClass(node, tmp_switchObj, consts.folder.DOCU);
+					view.replaceIcoClass(node, tmp_icoObj, consts.folder.DOCU);
+					$$(node, consts.id.UL, setting).remove();
+				} else {
+					$$(node, consts.id.UL, setting).empty();
+				}
+			},
+			scrollIntoView: function (setting, dom) {
+				if (!dom) {
+					return;
+				}
+				// support IE 7
+				if (typeof Element === 'undefined') {
+					var contRect = setting.treeObj.get(0).getBoundingClientRect(),
+						findMeRect = dom.getBoundingClientRect();
+					if (findMeRect.top < contRect.top || findMeRect.bottom > contRect.bottom
+						|| findMeRect.right > contRect.right || findMeRect.left < contRect.left) {
+						dom.scrollIntoView();
+					}
+					return;
+				}
+				// code src: http://jsfiddle.net/08u6cxwj/
+				if (!Element.prototype.scrollIntoViewIfNeeded) {
+					Element.prototype.scrollIntoViewIfNeeded = function (centerIfNeeded) {
+						function withinBounds(value, min, max, extent) {
+							if (false === centerIfNeeded || max <= value + extent && value <= min + extent) {
+								return Math.min(max, Math.max(min, value));
+							} else {
+								return (min + max) / 2;
+							}
+						}
+
+						function makeArea(left, top, width, height) {
+							return {
+								"left": left, "top": top, "width": width, "height": height
+								, "right": left + width, "bottom": top + height
+								, "translate": function (x, y) {
+									return makeArea(x + left, y + top, width, height);
+								}
+								, "relativeFromTo": function (lhs, rhs) {
+									var newLeft = left, newTop = top;
+									lhs = lhs.offsetParent;
+									rhs = rhs.offsetParent;
+									if (lhs === rhs) {
+										return area;
+									}
+									for (; lhs; lhs = lhs.offsetParent) {
+										newLeft += lhs.offsetLeft + lhs.clientLeft;
+										newTop += lhs.offsetTop + lhs.clientTop;
+									}
+									for (; rhs; rhs = rhs.offsetParent) {
+										newLeft -= rhs.offsetLeft + rhs.clientLeft;
+										newTop -= rhs.offsetTop + rhs.clientTop;
+									}
+									return makeArea(newLeft, newTop, width, height);
+								}
+							};
+						}
+
+						var parent, elem = this, area = makeArea(
+							this.offsetLeft, this.offsetTop,
+							this.offsetWidth, this.offsetHeight);
+						while (tools.isElement(parent = elem.parentNode)) {
+							var clientLeft = parent.offsetLeft + parent.clientLeft;
+							var clientTop = parent.offsetTop + parent.clientTop;
+
+							// Make area relative to parent's client area.
+							area = area.relativeFromTo(elem, parent).translate(-clientLeft, -clientTop);
+
+							parent.scrollLeft = withinBounds(
+								parent.scrollLeft,
+								area.right - parent.clientWidth, area.left,
+								parent.clientWidth);
+
+							parent.scrollTop = withinBounds(
+								parent.scrollTop,
+								area.bottom - parent.clientHeight, area.top,
+								parent.clientHeight);
+
+							// Determine actual scroll amount by reading back scroll properties.
+							area = area.translate(clientLeft - parent.scrollLeft,
+								clientTop - parent.scrollTop);
+							elem = parent;
+						}
+					};
+				}
+				dom.scrollIntoViewIfNeeded();
+			},
+			setFirstNode: function (setting, parentNode) {
+				var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
+				if (childLength > 0) {
+					parentNode[childKey][0].isFirstNode = true;
+				}
+			},
+			setLastNode: function (setting, parentNode) {
+				var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
+				if (childLength > 0) {
+					parentNode[childKey][childLength - 1].isLastNode = true;
+				}
+			},
+			removeNode: function (setting, node) {
+				var root = data.getRoot(setting),
+					childKey = setting.data.key.children,
+					parentNode = (node.parentTId) ? node.getParentNode() : root;
+
+				node.isFirstNode = false;
+				node.isLastNode = false;
+				node.getPreNode = function () {
+					return null;
+				};
+				node.getNextNode = function () {
+					return null;
+				};
+
+				if (!data.getNodeCache(setting, node.tId)) {
+					return;
+				}
+
+				$$(node, setting).remove();
+				data.removeNodeCache(setting, node);
+				data.removeSelectedNode(setting, node);
+
+				for (var i = 0, l = parentNode[childKey].length; i < l; i++) {
+					if (parentNode[childKey][i].tId == node.tId) {
+						parentNode[childKey].splice(i, 1);
+						break;
+					}
+				}
+				view.setFirstNode(setting, parentNode);
+				view.setLastNode(setting, parentNode);
+
+				var tmp_ulObj, tmp_switchObj, tmp_icoObj,
+					childLength = parentNode[childKey].length;
+
+				//repair nodes old parent
+				if (!setting.data.keep.parent && childLength == 0) {
+					//old parentNode has no child nodes
+					parentNode.isParent = false;
+					parentNode.open = false;
+					tmp_ulObj = $$(parentNode, consts.id.UL, setting);
+					tmp_switchObj = $$(parentNode, consts.id.SWITCH, setting);
+					tmp_icoObj = $$(parentNode, consts.id.ICON, setting);
+					view.replaceSwitchClass(parentNode, tmp_switchObj, consts.folder.DOCU);
+					view.replaceIcoClass(parentNode, tmp_icoObj, consts.folder.DOCU);
+					tmp_ulObj.css("display", "none");
+
+				} else if (setting.view.showLine && childLength > 0) {
+					//old parentNode has child nodes
+					var newLast = parentNode[childKey][childLength - 1];
+					tmp_ulObj = $$(newLast, consts.id.UL, setting);
+					tmp_switchObj = $$(newLast, consts.id.SWITCH, setting);
+					tmp_icoObj = $$(newLast, consts.id.ICON, setting);
+					if (parentNode == root) {
+						if (parentNode[childKey].length == 1) {
+							//node was root, and ztree has only one root after move node
+							view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.ROOT);
+						} else {
+							var tmp_first_switchObj = $$(parentNode[childKey][0], consts.id.SWITCH, setting);
+							view.replaceSwitchClass(parentNode[childKey][0], tmp_first_switchObj, consts.line.ROOTS);
+							view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
+						}
+					} else {
+						view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
+					}
+					tmp_ulObj.removeClass(consts.line.LINE);
+				}
+			},
+			replaceIcoClass: function (node, obj, newName) {
+				if (!obj || node.isAjaxing) return;
+				var tmpName = obj.attr("class");
+				if (tmpName == undefined) return;
+				var tmpList = tmpName.split("_");
+				switch (newName) {
+					case consts.folder.OPEN:
+					case consts.folder.CLOSE:
+					case consts.folder.DOCU:
+						tmpList[tmpList.length - 1] = newName;
+						break;
+				}
+				obj.attr("class", tmpList.join("_"));
+			},
+			replaceSwitchClass: function (node, obj, newName) {
+				if (!obj) return;
+				var tmpName = obj.attr("class");
+				if (tmpName == undefined) return;
+				var tmpList = tmpName.split("_");
+				switch (newName) {
+					case consts.line.ROOT:
+					case consts.line.ROOTS:
+					case consts.line.CENTER:
+					case consts.line.BOTTOM:
+					case consts.line.NOLINE:
+						tmpList[0] = view.makeNodeLineClassEx(node) + newName;
+						break;
+					case consts.folder.OPEN:
+					case consts.folder.CLOSE:
+					case consts.folder.DOCU:
+						tmpList[1] = newName;
+						break;
+				}
+				obj.attr("class", tmpList.join("_"));
+				if (newName !== consts.folder.DOCU) {
+					obj.removeAttr("disabled");
+				} else {
+					obj.attr("disabled", "disabled");
+				}
+			},
+			selectNode: function (setting, node, addFlag) {
+				if (!addFlag) {
+					view.cancelPreSelectedNode(setting, null, node);
+				}
+				$$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED);
+				data.addSelectedNode(setting, node);
+				setting.treeObj.trigger(consts.event.SELECTED, [setting.treeId, node]);
+			},
+			setNodeFontCss: function (setting, treeNode) {
+				var aObj = $$(treeNode, consts.id.A, setting),
+					fontCss = view.makeNodeFontCss(setting, treeNode);
+				if (fontCss) {
+					aObj.css(fontCss);
+				}
+			},
+			setNodeLineIcos: function (setting, node) {
+				if (!node) return;
+				var switchObj = $$(node, consts.id.SWITCH, setting),
+					ulObj = $$(node, consts.id.UL, setting),
+					icoObj = $$(node, consts.id.ICON, setting),
+					ulLine = view.makeUlLineClass(setting, node);
+				if (ulLine.length == 0) {
+					ulObj.removeClass(consts.line.LINE);
+				} else {
+					ulObj.addClass(ulLine);
+				}
+				switchObj.attr("class", view.makeNodeLineClass(setting, node));
+				if (node.isParent) {
+					switchObj.removeAttr("disabled");
+				} else {
+					switchObj.attr("disabled", "disabled");
+				}
+				icoObj.removeAttr("style");
+				icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
+				icoObj.attr("class", view.makeNodeIcoClass(setting, node));
+			},
+			setNodeName: function (setting, node) {
+				var title = data.getNodeTitle(setting, node),
+					nObj = $$(node, consts.id.SPAN, setting);
+				nObj.empty();
+				if (setting.view.nameIsHTML) {
+					nObj.html(data.getNodeName(setting, node));
+				} else {
+					nObj.text(data.getNodeName(setting, node));
+				}
+				if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle)) {
+					var aObj = $$(node, consts.id.A, setting);
+					aObj.attr("title", !title ? "" : title);
+				}
+			},
+			setNodeTarget: function (setting, node) {
+				var aObj = $$(node, consts.id.A, setting);
+				aObj.attr("target", view.makeNodeTarget(node));
+			},
+			setNodeUrl: function (setting, node) {
+				var aObj = $$(node, consts.id.A, setting),
+					url = view.makeNodeUrl(setting, node);
+				if (url == null || url.length == 0) {
+					aObj.removeAttr("href");
+				} else {
+					aObj.attr("href", url);
+				}
+			},
+			switchNode: function (setting, node) {
+				if (node.open || !tools.canAsync(setting, node)) {
+					view.expandCollapseNode(setting, node, !node.open);
+				} else if (setting.async.enable) {
+					if (!view.asyncNode(setting, node)) {
+						view.expandCollapseNode(setting, node, !node.open);
+						return;
+					}
+				} else if (node) {
+					view.expandCollapseNode(setting, node, !node.open);
+				}
+			}
+		};
+	// zTree defind
+	$.fn.zTree = {
+		consts: _consts,
+		_z: {
+			tools: tools,
+			view: view,
+			event: event,
+			data: data
+		},
+		getZTreeObj: function (treeId) {
+			var o = data.getZTreeTools(treeId);
+			return o ? o : null;
+		},
+		destroy: function (treeId) {
+			if (!!treeId && treeId.length > 0) {
+				view.destroy(data.getSetting(treeId));
+			} else {
+				for (var s in settings) {
+					view.destroy(settings[s]);
+				}
+			}
+		},
+		init: function (obj, zSetting, zNodes) {
+			var setting = tools.clone(_setting);
+			$.extend(true, setting, zSetting);
+			setting.treeId = obj.attr("id");
+			setting.treeObj = obj;
+			setting.treeObj.empty();
+			settings[setting.treeId] = setting;
+			//For some older browser,(e.g., ie6)
+			if (typeof document.body.style.maxHeight === "undefined") {
+				setting.view.expandSpeed = "";
+			}
+			data.initRoot(setting);
+			var root = data.getRoot(setting),
+				childKey = setting.data.key.children;
+			zNodes = zNodes ? tools.clone(tools.isArray(zNodes) ? zNodes : [zNodes]) : [];
+			if (setting.data.simpleData.enable) {
+				root[childKey] = data.transformTozTreeFormat(setting, zNodes);
+			} else {
+				root[childKey] = zNodes;
+			}
+
+			data.initCache(setting);
+			event.unbindTree(setting);
+			event.bindTree(setting);
+			event.unbindEvent(setting);
+			event.bindEvent(setting);
+
+			var zTreeTools = {
+				setting: setting,
+				addNodes: function (parentNode, index, newNodes, isSilent) {
+					if (!parentNode) parentNode = null;
+					if (parentNode && !parentNode.isParent && setting.data.keep.leaf) return null;
+
+					var i = parseInt(index, 10);
+					if (isNaN(i)) {
+						isSilent = !!newNodes;
+						newNodes = index;
+						index = -1;
+					} else {
+						index = i;
+					}
+					if (!newNodes) return null;
+
+
+					var xNewNodes = tools.clone(tools.isArray(newNodes) ? newNodes : [newNodes]);
+
+					function addCallback() {
+						view.addNodes(setting, parentNode, index, xNewNodes, (isSilent == true));
+					}
+
+					if (tools.canAsync(setting, parentNode)) {
+						view.asyncNode(setting, parentNode, isSilent, addCallback);
+					} else {
+						addCallback();
+					}
+					return xNewNodes;
+				},
+				cancelSelectedNode: function (node) {
+					view.cancelPreSelectedNode(setting, node);
+				},
+				destroy: function () {
+					view.destroy(setting);
+				},
+				expandAll: function (expandFlag) {
+					expandFlag = !!expandFlag;
+					view.expandCollapseSonNode(setting, null, expandFlag, true);
+					return expandFlag;
+				},
+				expandNode: function (node, expandFlag, sonSign, focus, callbackFlag) {
+					if (!node || !node.isParent) return null;
+					if (expandFlag !== true && expandFlag !== false) {
+						expandFlag = !node.open;
+					}
+					callbackFlag = !!callbackFlag;
+
+					if (callbackFlag && expandFlag && (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false)) {
+						return null;
+					} else if (callbackFlag && !expandFlag && (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false)) {
+						return null;
+					}
+					if (expandFlag && node.parentTId) {
+						view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, false);
+					}
+					if (expandFlag === node.open && !sonSign) {
+						return null;
+					}
+
+					data.getRoot(setting).expandTriggerFlag = callbackFlag;
+					if (!tools.canAsync(setting, node) && sonSign) {
+						view.expandCollapseSonNode(setting, node, expandFlag, true, showNodeFocus);
+					} else {
+						node.open = !expandFlag;
+						view.switchNode(this.setting, node);
+						showNodeFocus();
+					}
+					return expandFlag;
+
+					function showNodeFocus() {
+						var a = $$(node, setting).get(0);
+						if (a && focus !== false) {
+							view.scrollIntoView(setting, a);
+						}
+					}
+				},
+				getNodes: function () {
+					return data.getNodes(setting);
+				},
+				getNodeByParam: function (key, value, parentNode) {
+					if (!key) return null;
+					return data.getNodeByParam(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), key, value);
+				},
+				getNodeByTId: function (tId) {
+					return data.getNodeCache(setting, tId);
+				},
+				getNodesByParam: function (key, value, parentNode) {
+					if (!key) return null;
+					return data.getNodesByParam(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), key, value);
+				},
+				getNodesByParamFuzzy: function (key, value, parentNode) {
+					if (!key) return null;
+					return data.getNodesByParamFuzzy(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), key, value);
+				},
+				getNodesByFilter: function (filter, isSingle, parentNode, invokeParam) {
+					isSingle = !!isSingle;
+					if (!filter || (typeof filter != "function")) return (isSingle ? null : []);
+					return data.getNodesByFilter(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), filter, isSingle, invokeParam);
+				},
+				getNodeIndex: function (node) {
+					if (!node) return null;
+					var childKey = setting.data.key.children,
+						parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
+					for (var i = 0, l = parentNode[childKey].length; i < l; i++) {
+						if (parentNode[childKey][i] == node) return i;
+					}
+					return -1;
+				},
+				getSelectedNodes: function () {
+					var r = [], list = data.getRoot(setting).curSelectedList;
+					for (var i = 0, l = list.length; i < l; i++) {
+						r.push(list[i]);
+					}
+					return r;
+				},
+				isSelectedNode: function (node) {
+					return data.isSelectedNode(setting, node);
+				},
+				reAsyncChildNodesPromise: function (parentNode, reloadType, isSilent) {
+					var promise = new Promise(function (resolve, reject) {
+						try {
+							zTreeTools.reAsyncChildNodes(parentNode, reloadType, isSilent, function () {
+								resolve(parentNode);
+							});
+						} catch (e) {
+							reject(e);
+						}
+					});
+					return promise;
+				},
+				reAsyncChildNodes: function (parentNode, reloadType, isSilent, callback) {
+					if (!this.setting.async.enable) return;
+					var isRoot = !parentNode;
+					if (isRoot) {
+						parentNode = data.getRoot(setting);
+					}
+					if (reloadType == "refresh") {
+						var childKey = this.setting.data.key.children;
+						for (var i = 0, l = parentNode[childKey] ? parentNode[childKey].length : 0; i < l; i++) {
+							data.removeNodeCache(setting, parentNode[childKey][i]);
+						}
+						data.removeSelectedNode(setting);
+						parentNode[childKey] = [];
+						if (isRoot) {
+							this.setting.treeObj.empty();
+						} else {
+							var ulObj = $$(parentNode, consts.id.UL, setting);
+							ulObj.empty();
+						}
+					}
+					view.asyncNode(this.setting, isRoot ? null : parentNode, !!isSilent, callback);
+				},
+				refresh: function () {
+					this.setting.treeObj.empty();
+					var root = data.getRoot(setting),
+						nodes = root[setting.data.key.children]
+					data.initRoot(setting);
+					root[setting.data.key.children] = nodes
+					data.initCache(setting);
+					view.createNodes(setting, 0, root[setting.data.key.children], null, -1);
+				},
+				removeChildNodes: function (node) {
+					if (!node) return null;
+					var childKey = setting.data.key.children,
+						nodes = node[childKey];
+					view.removeChildNodes(setting, node);
+					return nodes ? nodes : null;
+				},
+				removeNode: function (node, callbackFlag) {
+					if (!node) return;
+					callbackFlag = !!callbackFlag;
+					if (callbackFlag && tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return;
+					view.removeNode(setting, node);
+					if (callbackFlag) {
+						this.setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
+					}
+				},
+				selectNode: function (node, addFlag, isSilent) {
+					if (!node) return;
+					if (tools.uCanDo(setting)) {
+						addFlag = setting.view.selectedMulti && addFlag;
+						if (node.parentTId) {
+							view.expandCollapseParentNode(setting, node.getParentNode(), true, false, showNodeFocus);
+						} else if (!isSilent) {
+							try {
+								$$(node, setting).focus().blur();
+							} catch (e) {
+							}
+						}
+						view.selectNode(setting, node, addFlag);
+					}
 
-/*
- * JQuery zTree core v3.5.30
- * http://treejs.cn/
- *
- * Copyright (c) 2010 Hunter.z
- *
- * Licensed same as jquery - MIT License
- * http://www.opensource.org/licenses/mit-license.php
- *
- * email: hunter.z@263.net
- * Date: 2017-11-11
- */
-(function ($) {
-    var settings = {}, roots = {}, caches = {},
-        //default consts of core
-        _consts = {
-            className: {
-                BUTTON: "button",
-                LEVEL: "level",
-                ICO_LOADING: "ico_loading",
-                SWITCH: "switch",
-                NAME: 'node_name'
-            },
-            event: {
-                NODECREATED: "ztree_nodeCreated",
-                CLICK: "ztree_click",
-                EXPAND: "ztree_expand",
-                COLLAPSE: "ztree_collapse",
-                ASYNC_SUCCESS: "ztree_async_success",
-                ASYNC_ERROR: "ztree_async_error",
-                REMOVE: "ztree_remove",
-                SELECTED: "ztree_selected",
-                UNSELECTED: "ztree_unselected"
-            },
-            id: {
-                A: "_a",
-                ICON: "_ico",
-                SPAN: "_span",
-                SWITCH: "_switch",
-                UL: "_ul"
-            },
-            line: {
-                ROOT: "root",
-                ROOTS: "roots",
-                CENTER: "center",
-                BOTTOM: "bottom",
-                NOLINE: "noline",
-                LINE: "line"
-            },
-            folder: {
-                OPEN: "open",
-                CLOSE: "close",
-                DOCU: "docu"
-            },
-            node: {
-                CURSELECTED: "curSelectedNode"
-            }
-        },
-        //default setting of core
-        _setting = {
-            treeId: "",
-            treeObj: null,
-            view: {
-                addDiyDom: null,
-                autoCancelSelected: true,
-                dblClickExpand: true,
-                expandSpeed: "fast",
-                fontCss: {},
-                nameIsHTML: false,
-                selectedMulti: true,
-                showIcon: true,
-                showLine: true,
-                showTitle: true,
-                txtSelectedEnable: false
-            },
-            data: {
-                key: {
-                    children: "children",
-                    name: "name",
-                    title: "",
-                    url: "url",
-                    icon: "icon"
-                },
-                simpleData: {
-                    enable: false,
-                    idKey: "id",
-                    pIdKey: "pId",
-                    rootPId: null
-                },
-                keep: {
-                    parent: false,
-                    leaf: false
-                }
-            },
-            async: {
-                enable: false,
-                contentType: "application/x-www-form-urlencoded",
-                type: "post",
-                dataType: "text",
-                url: "",
-                autoParam: [],
-                otherParam: [],
-                dataFilter: null
-            },
-            callback: {
-                beforeAsync: null,
-                beforeClick: null,
-                beforeDblClick: null,
-                beforeRightClick: null,
-                beforeMouseDown: null,
-                beforeMouseUp: null,
-                beforeExpand: null,
-                beforeCollapse: null,
-                beforeRemove: null,
-
-                onAsyncError: null,
-                onAsyncSuccess: null,
-                onNodeCreated: null,
-                onClick: null,
-                onDblClick: null,
-                onRightClick: null,
-                onMouseDown: null,
-                onMouseUp: null,
-                onExpand: null,
-                onCollapse: null,
-                onRemove: null
-            }
-        },
-        //default root of core
-        //zTree use root to save full data
-        _initRoot = function (setting) {
-            var r = data.getRoot(setting);
-            if (!r) {
-                r = {};
-                data.setRoot(setting, r);
-            }
-            r[setting.data.key.children] = [];
-            r.expandTriggerFlag = false;
-            r.curSelectedList = [];
-            r.noSelection = true;
-            r.createdNodes = [];
-            r.zId = 0;
-            r._ver = (new Date()).getTime();
-        },
-        //default cache of core
-        _initCache = function (setting) {
-            var c = data.getCache(setting);
-            if (!c) {
-                c = {};
-                data.setCache(setting, c);
-            }
-            c.nodes = [];
-            c.doms = [];
-        },
-        //default bindEvent of core
-        _bindEvent = function (setting) {
-            var o = setting.treeObj,
-                c = consts.event;
-            o.bind(c.NODECREATED, function (event, treeId, node) {
-                tools.apply(setting.callback.onNodeCreated, [event, treeId, node]);
-            });
-
-            o.bind(c.CLICK, function (event, srcEvent, treeId, node, clickFlag) {
-                tools.apply(setting.callback.onClick, [srcEvent, treeId, node, clickFlag]);
-            });
-
-            o.bind(c.EXPAND, function (event, treeId, node) {
-                tools.apply(setting.callback.onExpand, [event, treeId, node]);
-            });
-
-            o.bind(c.COLLAPSE, function (event, treeId, node) {
-                tools.apply(setting.callback.onCollapse, [event, treeId, node]);
-            });
-
-            o.bind(c.ASYNC_SUCCESS, function (event, treeId, node, msg) {
-                tools.apply(setting.callback.onAsyncSuccess, [event, treeId, node, msg]);
-            });
-
-            o.bind(c.ASYNC_ERROR, function (event, treeId, node, XMLHttpRequest, textStatus, errorThrown) {
-                tools.apply(setting.callback.onAsyncError, [event, treeId, node, XMLHttpRequest, textStatus, errorThrown]);
-            });
-
-            o.bind(c.REMOVE, function (event, treeId, treeNode) {
-                tools.apply(setting.callback.onRemove, [event, treeId, treeNode]);
-            });
-
-            o.bind(c.SELECTED, function (event, treeId, node) {
-                tools.apply(setting.callback.onSelected, [treeId, node]);
-            });
-            o.bind(c.UNSELECTED, function (event, treeId, node) {
-                tools.apply(setting.callback.onUnSelected, [treeId, node]);
-            });
-        },
-        _unbindEvent = function (setting) {
-            var o = setting.treeObj,
-                c = consts.event;
-            o.unbind(c.NODECREATED)
-                .unbind(c.CLICK)
-                .unbind(c.EXPAND)
-                .unbind(c.COLLAPSE)
-                .unbind(c.ASYNC_SUCCESS)
-                .unbind(c.ASYNC_ERROR)
-                .unbind(c.REMOVE)
-                .unbind(c.SELECTED)
-                .unbind(c.UNSELECTED);
-        },
-        //default event proxy of core
-        _eventProxy = function (event) {
-            var target = event.target,
-                setting = data.getSetting(event.data.treeId),
-                tId = "", node = null,
-                nodeEventType = "", treeEventType = "",
-                nodeEventCallback = null, treeEventCallback = null,
-                tmp = null;
-
-            if (tools.eqs(event.type, "mousedown")) {
-                treeEventType = "mousedown";
-            } else if (tools.eqs(event.type, "mouseup")) {
-                treeEventType = "mouseup";
-            } else if (tools.eqs(event.type, "contextmenu")) {
-                treeEventType = "contextmenu";
-            } else if (tools.eqs(event.type, "click")) {
-                if (tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.SWITCH) !== null) {
-                    tId = tools.getNodeMainDom(target).id;
-                    nodeEventType = "switchNode";
-                } else {
-                    tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
-                    if (tmp) {
-                        tId = tools.getNodeMainDom(tmp).id;
-                        nodeEventType = "clickNode";
-                    }
-                }
-            } else if (tools.eqs(event.type, "dblclick")) {
-                treeEventType = "dblclick";
-                tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
-                if (tmp) {
-                    tId = tools.getNodeMainDom(tmp).id;
-                    nodeEventType = "switchNode";
-                }
-            }
-            if (treeEventType.length > 0 && tId.length == 0) {
-                tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
-                if (tmp) {
-                    tId = tools.getNodeMainDom(tmp).id;
-                }
-            }
-            // event to node
-            if (tId.length > 0) {
-                node = data.getNodeCache(setting, tId);
-                switch (nodeEventType) {
-                    case "switchNode" :
-                        if (!node.isParent) {
-                            nodeEventType = "";
-                        } else if (tools.eqs(event.type, "click")
-                            || (tools.eqs(event.type, "dblclick") && tools.apply(setting.view.dblClickExpand, [setting.treeId, node], setting.view.dblClickExpand))) {
-                            nodeEventCallback = handler.onSwitchNode;
-                        } else {
-                            nodeEventType = "";
-                        }
-                        break;
-                    case "clickNode" :
-                        nodeEventCallback = handler.onClickNode;
-                        break;
-                }
-            }
-            // event to zTree
-            switch (treeEventType) {
-                case "mousedown" :
-                    treeEventCallback = handler.onZTreeMousedown;
-                    break;
-                case "mouseup" :
-                    treeEventCallback = handler.onZTreeMouseup;
-                    break;
-                case "dblclick" :
-                    treeEventCallback = handler.onZTreeDblclick;
-                    break;
-                case "contextmenu" :
-                    treeEventCallback = handler.onZTreeContextmenu;
-                    break;
-            }
-            var proxyResult = {
-                stop: false,
-                node: node,
-                nodeEventType: nodeEventType,
-                nodeEventCallback: nodeEventCallback,
-                treeEventType: treeEventType,
-                treeEventCallback: treeEventCallback
-            };
-            return proxyResult
-        },
-        //default init node of core
-        _initNode = function (setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
-            if (!n) return;
-            var r = data.getRoot(setting),
-                childKey = setting.data.key.children;
-            n.level = level;
-            n.tId = setting.treeId + "_" + (++r.zId);
-            n.parentTId = parentNode ? parentNode.tId : null;
-            n.open = (typeof n.open == "string") ? tools.eqs(n.open, "true") : !!n.open;
-            if (n[childKey] && n[childKey].length > 0) {
-                n.isParent = true;
-                n.zAsync = true;
-            } else {
-                n.isParent = (typeof n.isParent == "string") ? tools.eqs(n.isParent, "true") : !!n.isParent;
-                n.open = (n.isParent && !setting.async.enable) ? n.open : false;
-                n.zAsync = !n.isParent;
-            }
-            n.isFirstNode = isFirstNode;
-            n.isLastNode = isLastNode;
-            n.getParentNode = function () {
-                return data.getNodeCache(setting, n.parentTId);
-            };
-            n.getPreNode = function () {
-                return data.getPreNode(setting, n);
-            };
-            n.getNextNode = function () {
-                return data.getNextNode(setting, n);
-            };
-            n.getIndex = function () {
-                return data.getNodeIndex(setting, n);
-            };
-            n.getPath = function () {
-                return data.getNodePath(setting, n);
-            };
-            n.isAjaxing = false;
-            data.fixPIdKeyValue(setting, n);
-        },
-        _init = {
-            bind: [_bindEvent],
-            unbind: [_unbindEvent],
-            caches: [_initCache],
-            nodes: [_initNode],
-            proxys: [_eventProxy],
-            roots: [_initRoot],
-            beforeA: [],
-            afterA: [],
-            innerBeforeA: [],
-            innerAfterA: [],
-            zTreeTools: []
-        },
-        //method of operate data
-        data = {
-            addNodeCache: function (setting, node) {
-                data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = node;
-            },
-            getNodeCacheId: function (tId) {
-                return tId.substring(tId.lastIndexOf("_") + 1);
-            },
-            addAfterA: function (afterA) {
-                _init.afterA.push(afterA);
-            },
-            addBeforeA: function (beforeA) {
-                _init.beforeA.push(beforeA);
-            },
-            addInnerAfterA: function (innerAfterA) {
-                _init.innerAfterA.push(innerAfterA);
-            },
-            addInnerBeforeA: function (innerBeforeA) {
-                _init.innerBeforeA.push(innerBeforeA);
-            },
-            addInitBind: function (bindEvent) {
-                _init.bind.push(bindEvent);
-            },
-            addInitUnBind: function (unbindEvent) {
-                _init.unbind.push(unbindEvent);
-            },
-            addInitCache: function (initCache) {
-                _init.caches.push(initCache);
-            },
-            addInitNode: function (initNode) {
-                _init.nodes.push(initNode);
-            },
-            addInitProxy: function (initProxy, isFirst) {
-                if (!!isFirst) {
-                    _init.proxys.splice(0, 0, initProxy);
-                } else {
-                    _init.proxys.push(initProxy);
-                }
-            },
-            addInitRoot: function (initRoot) {
-                _init.roots.push(initRoot);
-            },
-            addNodesData: function (setting, parentNode, index, nodes) {
-                var childKey = setting.data.key.children, params;
-                if (!parentNode[childKey]) {
-                    parentNode[childKey] = [];
-                    index = -1;
-                } else if (index >= parentNode[childKey].length) {
-                    index = -1;
-                }
-
-                if (parentNode[childKey].length > 0 && index === 0) {
-                    parentNode[childKey][0].isFirstNode = false;
-                    view.setNodeLineIcos(setting, parentNode[childKey][0]);
-                } else if (parentNode[childKey].length > 0 && index < 0) {
-                    parentNode[childKey][parentNode[childKey].length - 1].isLastNode = false;
-                    view.setNodeLineIcos(setting, parentNode[childKey][parentNode[childKey].length - 1]);
-                }
-                parentNode.isParent = true;
-
-                if (index < 0) {
-                    parentNode[childKey] = parentNode[childKey].concat(nodes);
-                } else {
-                    params = [index, 0].concat(nodes);
-                    parentNode[childKey].splice.apply(parentNode[childKey], params);
-                }
-            },
-            addSelectedNode: function (setting, node) {
-                var root = data.getRoot(setting);
-                if (!data.isSelectedNode(setting, node)) {
-                    root.curSelectedList.push(node);
-                }
-            },
-            addCreatedNode: function (setting, node) {
-                if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
-                    var root = data.getRoot(setting);
-                    root.createdNodes.push(node);
-                }
-            },
-            addZTreeTools: function (zTreeTools) {
-                _init.zTreeTools.push(zTreeTools);
-            },
-            exSetting: function (s) {
-                $.extend(true, _setting, s);
-            },
-            fixPIdKeyValue: function (setting, node) {
-                if (setting.data.simpleData.enable) {
-                    node[setting.data.simpleData.pIdKey] = node.parentTId ? node.getParentNode()[setting.data.simpleData.idKey] : setting.data.simpleData.rootPId;
-                }
-            },
-            getAfterA: function (setting, node, array) {
-                for (var i = 0, j = _init.afterA.length; i < j; i++) {
-                    _init.afterA[i].apply(this, arguments);
-                }
-            },
-            getBeforeA: function (setting, node, array) {
-                for (var i = 0, j = _init.beforeA.length; i < j; i++) {
-                    _init.beforeA[i].apply(this, arguments);
-                }
-            },
-            getInnerAfterA: function (setting, node, array) {
-                for (var i = 0, j = _init.innerAfterA.length; i < j; i++) {
-                    _init.innerAfterA[i].apply(this, arguments);
-                }
-            },
-            getInnerBeforeA: function (setting, node, array) {
-                for (var i = 0, j = _init.innerBeforeA.length; i < j; i++) {
-                    _init.innerBeforeA[i].apply(this, arguments);
-                }
-            },
-            getCache: function (setting) {
-                return caches[setting.treeId];
-            },
-            getNodeIndex: function (setting, node) {
-                if (!node) return null;
-                var childKey = setting.data.key.children,
-                    p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
-                for (var i = 0, l = p[childKey].length - 1; i <= l; i++) {
-                    if (p[childKey][i] === node) {
-                        return i;
-                    }
-                }
-                return -1;
-            },
-            getNextNode: function (setting, node) {
-                if (!node) return null;
-                var childKey = setting.data.key.children,
-                    p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
-                for (var i = 0, l = p[childKey].length - 1; i <= l; i++) {
-                    if (p[childKey][i] === node) {
-                        return (i == l ? null : p[childKey][i + 1]);
-                    }
-                }
-                return null;
-            },
-            getNodeByParam: function (setting, nodes, key, value) {
-                if (!nodes || !key) return null;
-                var childKey = setting.data.key.children;
-                for (var i = 0, l = nodes.length; i < l; i++) {
-                    if (nodes[i][key] == value) {
-                        return nodes[i];
-                    }
-                    var tmp = data.getNodeByParam(setting, nodes[i][childKey], key, value);
-                    if (tmp) return tmp;
-                }
-                return null;
-            },
-            getNodeCache: function (setting, tId) {
-                if (!tId) return null;
-                var n = caches[setting.treeId].nodes[data.getNodeCacheId(tId)];
-                return n ? n : null;
-            },
-            getNodeName: function (setting, node) {
-                var nameKey = setting.data.key.name;
-                return "" + node[nameKey];
-            },
-            getNodePath: function (setting, node) {
-                if (!node) return null;
-
-                var path;
-                if (node.parentTId) {
-                    path = node.getParentNode().getPath();
-                } else {
-                    path = [];
-                }
-
-                if (path) {
-                    path.push(node);
-                }
-
-                return path;
-            },
-            getNodeTitle: function (setting, node) {
-                var t = setting.data.key.title === "" ? setting.data.key.name : setting.data.key.title;
-                return "" + node[t];
-            },
-            getNodes: function (setting) {
-                return data.getRoot(setting)[setting.data.key.children];
-            },
-            getNodesByParam: function (setting, nodes, key, value) {
-                if (!nodes || !key) return [];
-                var childKey = setting.data.key.children,
-                    result = [];
-                for (var i = 0, l = nodes.length; i < l; i++) {
-                    if (nodes[i][key] == value) {
-                        result.push(nodes[i]);
-                    }
-                    result = result.concat(data.getNodesByParam(setting, nodes[i][childKey], key, value));
-                }
-                return result;
-            },
-            getNodesByParamFuzzy: function (setting, nodes, key, value) {
-                if (!nodes || !key) return [];
-                var childKey = setting.data.key.children,
-                    result = [];
-                value = value.toLowerCase();
-                for (var i = 0, l = nodes.length; i < l; i++) {
-                    if (typeof nodes[i][key] == "string" && nodes[i][key].toLowerCase().indexOf(value) > -1) {
-                        result.push(nodes[i]);
-                    }
-                    result = result.concat(data.getNodesByParamFuzzy(setting, nodes[i][childKey], key, value));
-                }
-                return result;
-            },
-            getNodesByFilter: function (setting, nodes, filter, isSingle, invokeParam) {
-                if (!nodes) return (isSingle ? null : []);
-                var childKey = setting.data.key.children,
-                    result = isSingle ? null : [];
-                for (var i = 0, l = nodes.length; i < l; i++) {
-                    if (tools.apply(filter, [nodes[i], invokeParam], false)) {
-                        if (isSingle) {
-                            return nodes[i];
-                        }
-                        result.push(nodes[i]);
-                    }
-                    var tmpResult = data.getNodesByFilter(setting, nodes[i][childKey], filter, isSingle, invokeParam);
-                    if (isSingle && !!tmpResult) {
-                        return tmpResult;
-                    }
-                    result = isSingle ? tmpResult : result.concat(tmpResult);
-                }
-                return result;
-            },
-            getPreNode: function (setting, node) {
-                if (!node) return null;
-                var childKey = setting.data.key.children,
-                    p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
-                for (var i = 0, l = p[childKey].length; i < l; i++) {
-                    if (p[childKey][i] === node) {
-                        return (i == 0 ? null : p[childKey][i - 1]);
-                    }
-                }
-                return null;
-            },
-            getRoot: function (setting) {
-                return setting ? roots[setting.treeId] : null;
-            },
-            getRoots: function () {
-                return roots;
-            },
-            getSetting: function (treeId) {
-                return settings[treeId];
-            },
-            getSettings: function () {
-                return settings;
-            },
-            getZTreeTools: function (treeId) {
-                var r = this.getRoot(this.getSetting(treeId));
-                return r ? r.treeTools : null;
-            },
-            initCache: function (setting) {
-                for (var i = 0, j = _init.caches.length; i < j; i++) {
-                    _init.caches[i].apply(this, arguments);
-                }
-            },
-            initNode: function (setting, level, node, parentNode, preNode, nextNode) {
-                for (var i = 0, j = _init.nodes.length; i < j; i++) {
-                    _init.nodes[i].apply(this, arguments);
-                }
-            },
-            initRoot: function (setting) {
-                for (var i = 0, j = _init.roots.length; i < j; i++) {
-                    _init.roots[i].apply(this, arguments);
-                }
-            },
-            isSelectedNode: function (setting, node) {
-                var root = data.getRoot(setting);
-                for (var i = 0, j = root.curSelectedList.length; i < j; i++) {
-                    if (node === root.curSelectedList[i]) return true;
-                }
-                return false;
-            },
-            removeNodeCache: function (setting, node) {
-                var childKey = setting.data.key.children;
-                if (node[childKey]) {
-                    for (var i = 0, l = node[childKey].length; i < l; i++) {
-                        data.removeNodeCache(setting, node[childKey][i]);
-                    }
-                }
-                data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = null;
-            },
-            removeSelectedNode: function (setting, node) {
-                var root = data.getRoot(setting);
-                for (var i = 0, j = root.curSelectedList.length; i < j; i++) {
-                    if (node === root.curSelectedList[i] || !data.getNodeCache(setting, root.curSelectedList[i].tId)) {
-                        root.curSelectedList.splice(i, 1);
-                        setting.treeObj.trigger(consts.event.UNSELECTED, [setting.treeId, node]);
-                        i--;
-                        j--;
-                    }
-                }
-            },
-            setCache: function (setting, cache) {
-                caches[setting.treeId] = cache;
-            },
-            setRoot: function (setting, root) {
-                roots[setting.treeId] = root;
-            },
-            setZTreeTools: function (setting, zTreeTools) {
-                for (var i = 0, j = _init.zTreeTools.length; i < j; i++) {
-                    _init.zTreeTools[i].apply(this, arguments);
-                }
-            },
-            transformToArrayFormat: function (setting, nodes) {
-                if (!nodes) return [];
-                var childKey = setting.data.key.children,
-                    r = [];
-                if (tools.isArray(nodes)) {
-                    for (var i = 0, l = nodes.length; i < l; i++) {
-                        r.push(nodes[i]);
-                        if (nodes[i][childKey])
-                            r = r.concat(data.transformToArrayFormat(setting, nodes[i][childKey]));
-                    }
-                } else {
-                    r.push(nodes);
-                    if (nodes[childKey])
-                        r = r.concat(data.transformToArrayFormat(setting, nodes[childKey]));
-                }
-                return r;
-            },
-            transformTozTreeFormat: function (setting, sNodes) {
-                var i, l,
-                    key = setting.data.simpleData.idKey,
-                    parentKey = setting.data.simpleData.pIdKey,
-                    childKey = setting.data.key.children;
-                if (!key || key == "" || !sNodes) return [];
-
-                if (tools.isArray(sNodes)) {
-                    var r = [];
-                    var tmpMap = {};
-                    for (i = 0, l = sNodes.length; i < l; i++) {
-                        tmpMap[sNodes[i][key]] = sNodes[i];
-                    }
-                    for (i = 0, l = sNodes.length; i < l; i++) {
-                        if (tmpMap[sNodes[i][parentKey]] && sNodes[i][key] != sNodes[i][parentKey]) {
-                            if (!tmpMap[sNodes[i][parentKey]][childKey])
-                                tmpMap[sNodes[i][parentKey]][childKey] = [];
-                            tmpMap[sNodes[i][parentKey]][childKey].push(sNodes[i]);
-                        } else {
-                            r.push(sNodes[i]);
-                        }
-                    }
-                    return r;
-                } else {
-                    return [sNodes];
-                }
-            }
-        },
-        //method of event proxy
-        event = {
-            bindEvent: function (setting) {
-                for (var i = 0, j = _init.bind.length; i < j; i++) {
-                    _init.bind[i].apply(this, arguments);
-                }
-            },
-            unbindEvent: function (setting) {
-                for (var i = 0, j = _init.unbind.length; i < j; i++) {
-                    _init.unbind[i].apply(this, arguments);
-                }
-            },
-            bindTree: function (setting) {
-                var eventParam = {
-                        treeId: setting.treeId
-                    },
-                    o = setting.treeObj;
-                if (!setting.view.txtSelectedEnable) {
-                    // for can't select text
-                    o.bind('selectstart', handler.onSelectStart).css({
-                        "-moz-user-select": "-moz-none"
-                    });
-                }
-                o.bind('click', eventParam, event.proxy);
-                o.bind('dblclick', eventParam, event.proxy);
-                o.bind('mouseover', eventParam, event.proxy);
-                o.bind('mouseout', eventParam, event.proxy);
-                o.bind('mousedown', eventParam, event.proxy);
-                o.bind('mouseup', eventParam, event.proxy);
-                o.bind('contextmenu', eventParam, event.proxy);
-            },
-            unbindTree: function (setting) {
-                var o = setting.treeObj;
-                o.unbind('selectstart', handler.onSelectStart)
-                    .unbind('click', event.proxy)
-                    .unbind('dblclick', event.proxy)
-                    .unbind('mouseover', event.proxy)
-                    .unbind('mouseout', event.proxy)
-                    .unbind('mousedown', event.proxy)
-                    .unbind('mouseup', event.proxy)
-                    .unbind('contextmenu', event.proxy);
-            },
-            doProxy: function (e) {
-                var results = [];
-                for (var i = 0, j = _init.proxys.length; i < j; i++) {
-                    var proxyResult = _init.proxys[i].apply(this, arguments);
-                    results.push(proxyResult);
-                    if (proxyResult.stop) {
-                        break;
-                    }
-                }
-                return results;
-            },
-            proxy: function (e) {
-                var setting = data.getSetting(e.data.treeId);
-                if (!tools.uCanDo(setting, e)) return true;
-                var results = event.doProxy(e),
-                    r = true, x = false;
-                for (var i = 0, l = results.length; i < l; i++) {
-                    var proxyResult = results[i];
-                    if (proxyResult.nodeEventCallback) {
-                        x = true;
-                        r = proxyResult.nodeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
-                    }
-                    if (proxyResult.treeEventCallback) {
-                        x = true;
-                        r = proxyResult.treeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
-                    }
-                }
-                return r;
-            }
-        },
-        //method of event handler
-        handler = {
-            onSwitchNode: function (event, node) {
-                var setting = data.getSetting(event.data.treeId);
-                if (node.open) {
-                    if (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false) return true;
-                    data.getRoot(setting).expandTriggerFlag = true;
-                    view.switchNode(setting, node);
-                } else {
-                    if (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false) return true;
-                    data.getRoot(setting).expandTriggerFlag = true;
-                    view.switchNode(setting, node);
-                }
-                return true;
-            },
-            onClickNode: function (event, node) {
-                var setting = data.getSetting(event.data.treeId),
-                    clickFlag = ( (setting.view.autoCancelSelected && (event.ctrlKey || event.metaKey)) && data.isSelectedNode(setting, node)) ? 0 : (setting.view.autoCancelSelected && (event.ctrlKey || event.metaKey) && setting.view.selectedMulti) ? 2 : 1;
-                if (tools.apply(setting.callback.beforeClick, [setting.treeId, node, clickFlag], true) == false) return true;
-                if (clickFlag === 0) {
-                    view.cancelPreSelectedNode(setting, node);
-                } else {
-                    view.selectNode(setting, node, clickFlag === 2);
-                }
-                setting.treeObj.trigger(consts.event.CLICK, [event, setting.treeId, node, clickFlag]);
-                return true;
-            },
-            onZTreeMousedown: function (event, node) {
-                var setting = data.getSetting(event.data.treeId);
-                if (tools.apply(setting.callback.beforeMouseDown, [setting.treeId, node], true)) {
-                    tools.apply(setting.callback.onMouseDown, [event, setting.treeId, node]);
-                }
-                return true;
-            },
-            onZTreeMouseup: function (event, node) {
-                var setting = data.getSetting(event.data.treeId);
-                if (tools.apply(setting.callback.beforeMouseUp, [setting.treeId, node], true)) {
-                    tools.apply(setting.callback.onMouseUp, [event, setting.treeId, node]);
-                }
-                return true;
-            },
-            onZTreeDblclick: function (event, node) {
-                var setting = data.getSetting(event.data.treeId);
-                if (tools.apply(setting.callback.beforeDblClick, [setting.treeId, node], true)) {
-                    tools.apply(setting.callback.onDblClick, [event, setting.treeId, node]);
-                }
-                return true;
-            },
-            onZTreeContextmenu: function (event, node) {
-                var setting = data.getSetting(event.data.treeId);
-                if (tools.apply(setting.callback.beforeRightClick, [setting.treeId, node], true)) {
-                    tools.apply(setting.callback.onRightClick, [event, setting.treeId, node]);
-                }
-                return (typeof setting.callback.onRightClick) != "function";
-            },
-            onSelectStart: function (e) {
-                var n = e.originalEvent.srcElement.nodeName.toLowerCase();
-                return (n === "input" || n === "textarea" );
-            }
-        },
-        //method of tools for zTree
-        tools = {
-            apply: function (fun, param, defaultValue) {
-                if ((typeof fun) == "function") {
-                    return fun.apply(zt, param ? param : []);
-                }
-                return defaultValue;
-            },
-            canAsync: function (setting, node) {
-                var childKey = setting.data.key.children;
-                return (setting.async.enable && node && node.isParent && !(node.zAsync || (node[childKey] && node[childKey].length > 0)));
-            },
-            clone: function (obj) {
-                if (obj === null) return null;
-                var o = tools.isArray(obj) ? [] : {};
-                for (var i in obj) {
-                    o[i] = (obj[i] instanceof Date) ? new Date(obj[i].getTime()) : (typeof obj[i] === "object" ? tools.clone(obj[i]) : obj[i]);
-                }
-                return o;
-            },
-            eqs: function (str1, str2) {
-                return str1.toLowerCase() === str2.toLowerCase();
-            },
-            isArray: function (arr) {
-                return Object.prototype.toString.apply(arr) === "[object Array]";
-            },
-            isElement: function (o) {
-                return (
-                    typeof HTMLElement === "object" ? o instanceof HTMLElement : //DOM2
-                        o && typeof o === "object" && o !== null && o.nodeType === 1 && typeof o.nodeName === "string"
-                );
-            },
-            $: function (node, exp, setting) {
-                if (!!exp && typeof exp != "string") {
-                    setting = exp;
-                    exp = "";
-                }
-                if (typeof node == "string") {
-                    return $(node, setting ? setting.treeObj.get(0).ownerDocument : null);
-                } else {
-                    return $("#" + node.tId + exp, setting ? setting.treeObj : null);
-                }
-            },
-            getMDom: function (setting, curDom, targetExpr) {
-                if (!curDom) return null;
-                while (curDom && curDom.id !== setting.treeId) {
-                    for (var i = 0, l = targetExpr.length; curDom.tagName && i < l; i++) {
-                        if (tools.eqs(curDom.tagName, targetExpr[i].tagName) && curDom.getAttribute(targetExpr[i].attrName) !== null) {
-                            return curDom;
-                        }
-                    }
-                    curDom = curDom.parentNode;
-                }
-                return null;
-            },
-            getNodeMainDom: function (target) {
-                return ($(target).parent("li").get(0) || $(target).parentsUntil("li").parent().get(0));
-            },
-            isChildOrSelf: function (dom, parentId) {
-                return ( $(dom).closest("#" + parentId).length > 0 );
-            },
-            uCanDo: function (setting, e) {
-                return true;
-            }
-        },
-        //method of operate ztree dom
-        view = {
-            addNodes: function (setting, parentNode, index, newNodes, isSilent) {
-                if (setting.data.keep.leaf && parentNode && !parentNode.isParent) {
-                    return;
-                }
-                if (!tools.isArray(newNodes)) {
-                    newNodes = [newNodes];
-                }
-                if (setting.data.simpleData.enable) {
-                    newNodes = data.transformTozTreeFormat(setting, newNodes);
-                }
-                if (parentNode) {
-                    var target_switchObj = $$(parentNode, consts.id.SWITCH, setting),
-                        target_icoObj = $$(parentNode, consts.id.ICON, setting),
-                        target_ulObj = $$(parentNode, consts.id.UL, setting);
-
-                    if (!parentNode.open) {
-                        view.replaceSwitchClass(parentNode, target_switchObj, consts.folder.CLOSE);
-                        view.replaceIcoClass(parentNode, target_icoObj, consts.folder.CLOSE);
-                        parentNode.open = false;
-                        target_ulObj.css({
-                            "display": "none"
-                        });
-                    }
-
-                    data.addNodesData(setting, parentNode, index, newNodes);
-                    view.createNodes(setting, parentNode.level + 1, newNodes, parentNode, index);
-                    if (!isSilent) {
-                        view.expandCollapseParentNode(setting, parentNode, true);
-                    }
-                } else {
-                    data.addNodesData(setting, data.getRoot(setting), index, newNodes);
-                    view.createNodes(setting, 0, newNodes, null, index);
-                }
-            },
-            appendNodes: function (setting, level, nodes, parentNode, index, initFlag, openFlag) {
-                if (!nodes) return [];
-                var html = [],
-                    childKey = setting.data.key.children;
-
-                var tmpPNode = (parentNode) ? parentNode : data.getRoot(setting),
-                    tmpPChild = tmpPNode[childKey],
-                    isFirstNode, isLastNode;
-
-                if (!tmpPChild || index >= tmpPChild.length - nodes.length) {
-                    index = -1;
-                }
-
-                for (var i = 0, l = nodes.length; i < l; i++) {
-                    var node = nodes[i];
-                    if (initFlag) {
-                        isFirstNode = ((index === 0 || tmpPChild.length == nodes.length) && (i == 0));
-                        isLastNode = (index < 0 && i == (nodes.length - 1));
-                        data.initNode(setting, level, node, parentNode, isFirstNode, isLastNode, openFlag);
-                        data.addNodeCache(setting, node);
-                    }
-
-                    var childHtml = [];
-                    if (node[childKey] && node[childKey].length > 0) {
-                        //make child html first, because checkType
-                        childHtml = view.appendNodes(setting, level + 1, node[childKey], node, -1, initFlag, openFlag && node.open);
-                    }
-                    if (openFlag) {
-
-                        view.makeDOMNodeMainBefore(html, setting, node);
-                        view.makeDOMNodeLine(html, setting, node);
-                        data.getBeforeA(setting, node, html);
-                        view.makeDOMNodeNameBefore(html, setting, node);
-                        data.getInnerBeforeA(setting, node, html);
-                        view.makeDOMNodeIcon(html, setting, node);
-                        data.getInnerAfterA(setting, node, html);
-                        view.makeDOMNodeNameAfter(html, setting, node);
-                        data.getAfterA(setting, node, html);
-                        if (node.isParent && node.open) {
-                            view.makeUlHtml(setting, node, html, childHtml.join(''));
-                        }
-                        view.makeDOMNodeMainAfter(html, setting, node);
-                        data.addCreatedNode(setting, node);
-                    }
-                }
-                return html;
-            },
-            appendParentULDom: function (setting, node) {
-                var html = [],
-                    nObj = $$(node, setting);
-                if (!nObj.get(0) && !!node.parentTId) {
-                    view.appendParentULDom(setting, node.getParentNode());
-                    nObj = $$(node, setting);
-                }
-                var ulObj = $$(node, consts.id.UL, setting);
-                if (ulObj.get(0)) {
-                    ulObj.remove();
-                }
-                var childKey = setting.data.key.children,
-                    childHtml = view.appendNodes(setting, node.level + 1, node[childKey], node, -1, false, true);
-                view.makeUlHtml(setting, node, html, childHtml.join(''));
-                nObj.append(html.join(''));
-            },
-            asyncNode: function (setting, node, isSilent, callback) {
-                var i, l;
-                if (node && !node.isParent) {
-                    tools.apply(callback);
-                    return false;
-                } else if (node && node.isAjaxing) {
-                    return false;
-                } else if (tools.apply(setting.callback.beforeAsync, [setting.treeId, node], true) == false) {
-                    tools.apply(callback);
-                    return false;
-                }
-                if (node) {
-                    node.isAjaxing = true;
-                    var icoObj = $$(node, consts.id.ICON, setting);
-                    icoObj.attr({"style": "", "class": consts.className.BUTTON + " " + consts.className.ICO_LOADING});
-                }
-
-                var tmpParam = {};
-                for (i = 0, l = setting.async.autoParam.length; node && i < l; i++) {
-                    var pKey = setting.async.autoParam[i].split("="), spKey = pKey;
-                    if (pKey.length > 1) {
-                        spKey = pKey[1];
-                        pKey = pKey[0];
-                    }
-                    tmpParam[spKey] = node[pKey];
-                }
-                if (tools.isArray(setting.async.otherParam)) {
-                    for (i = 0, l = setting.async.otherParam.length; i < l; i += 2) {
-                        tmpParam[setting.async.otherParam[i]] = setting.async.otherParam[i + 1];
-                    }
-                } else {
-                    for (var p in setting.async.otherParam) {
-                        tmpParam[p] = setting.async.otherParam[p];
-                    }
-                }
-
-                var _tmpV = data.getRoot(setting)._ver;
-                $.ajax({
-                    contentType: setting.async.contentType,
-                    cache: false,
-                    type: setting.async.type,
-                    url: tools.apply(setting.async.url, [setting.treeId, node], setting.async.url),
-                    data: setting.async.contentType.indexOf('application/json') > -1 ? JSON.stringify(tmpParam) : tmpParam,
-                    dataType: setting.async.dataType,
-                    success: function (msg) {
-                        if (_tmpV != data.getRoot(setting)._ver) {
-                            return;
-                        }
-                        var newNodes = [];
-                        try {
-                            if (!msg || msg.length == 0) {
-                                newNodes = [];
-                            } else if (typeof msg == "string") {
-                                newNodes = eval("(" + msg + ")");
-                            } else {
-                                newNodes = msg;
-                            }
-                        } catch (err) {
-                            newNodes = msg;
-                        }
-
-                        if (node) {
-                            node.isAjaxing = null;
-                            node.zAsync = true;
-                        }
-                        view.setNodeLineIcos(setting, node);
-                        if (newNodes && newNodes !== "") {
-                            newNodes = tools.apply(setting.async.dataFilter, [setting.treeId, node, newNodes], newNodes);
-                            view.addNodes(setting, node, -1, !!newNodes ? tools.clone(newNodes) : [], !!isSilent);
-                        } else {
-                            view.addNodes(setting, node, -1, [], !!isSilent);
-                        }
-                        setting.treeObj.trigger(consts.event.ASYNC_SUCCESS, [setting.treeId, node, msg]);
-                        tools.apply(callback);
-                    },
-                    error: function (XMLHttpRequest, textStatus, errorThrown) {
-                        if (_tmpV != data.getRoot(setting)._ver) {
-                            return;
-                        }
-                        if (node) node.isAjaxing = null;
-                        view.setNodeLineIcos(setting, node);
-                        setting.treeObj.trigger(consts.event.ASYNC_ERROR, [setting.treeId, node, XMLHttpRequest, textStatus, errorThrown]);
-                    }
-                });
-                return true;
-            },
-            cancelPreSelectedNode: function (setting, node, excludeNode) {
-                var list = data.getRoot(setting).curSelectedList,
-                    i, n;
-                for (i = list.length - 1; i >= 0; i--) {
-                    n = list[i];
-                    if (node === n || (!node && (!excludeNode || excludeNode !== n))) {
-                        $$(n, consts.id.A, setting).removeClass(consts.node.CURSELECTED);
-                        if (node) {
-                            data.removeSelectedNode(setting, node);
-                            break;
-                        } else {
-                            list.splice(i, 1);
-                            setting.treeObj.trigger(consts.event.UNSELECTED, [setting.treeId, n]);
-                        }
-                    }
-                }
-            },
-            createNodeCallback: function (setting) {
-                if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
-                    var root = data.getRoot(setting);
-                    while (root.createdNodes.length > 0) {
-                        var node = root.createdNodes.shift();
-                        tools.apply(setting.view.addDiyDom, [setting.treeId, node]);
-                        if (!!setting.callback.onNodeCreated) {
-                            setting.treeObj.trigger(consts.event.NODECREATED, [setting.treeId, node]);
-                        }
-                    }
-                }
-            },
-            createNodes: function (setting, level, nodes, parentNode, index) {
-                if (!nodes || nodes.length == 0) return;
-                var root = data.getRoot(setting),
-                    childKey = setting.data.key.children,
-                    openFlag = !parentNode || parentNode.open || !!$$(parentNode[childKey][0], setting).get(0);
-                root.createdNodes = [];
-                var zTreeHtml = view.appendNodes(setting, level, nodes, parentNode, index, true, openFlag),
-                    parentObj, nextObj;
-
-                if (!parentNode) {
-                    parentObj = setting.treeObj;
-                    //setting.treeObj.append(zTreeHtml.join(''));
-                } else {
-                    var ulObj = $$(parentNode, consts.id.UL, setting);
-                    if (ulObj.get(0)) {
-                        parentObj = ulObj;
-                        //ulObj.append(zTreeHtml.join(''));
-                    }
-                }
-                if (parentObj) {
-                    if (index >= 0) {
-                        nextObj = parentObj.children()[index];
-                    }
-                    if (index >= 0 && nextObj) {
-                        $(nextObj).before(zTreeHtml.join(''));
-                    } else {
-                        parentObj.append(zTreeHtml.join(''));
-                    }
-                }
-
-                view.createNodeCallback(setting);
-            },
-            destroy: function (setting) {
-                if (!setting) return;
-                data.initCache(setting);
-                data.initRoot(setting);
-                event.unbindTree(setting);
-                event.unbindEvent(setting);
-                setting.treeObj.empty();
-                delete settings[setting.treeId];
-            },
-            expandCollapseNode: function (setting, node, expandFlag, animateFlag, callback) {
-                var root = data.getRoot(setting),
-                    childKey = setting.data.key.children;
-                var tmpCb, _callback;
-                if (!node) {
-                    tools.apply(callback, []);
-                    return;
-                }
-                if (root.expandTriggerFlag) {
-                    _callback = callback;
-                    tmpCb = function () {
-                        if (_callback) _callback();
-                        if (node.open) {
-                            setting.treeObj.trigger(consts.event.EXPAND, [setting.treeId, node]);
-                        } else {
-                            setting.treeObj.trigger(consts.event.COLLAPSE, [setting.treeId, node]);
-                        }
-                    };
-                    callback = tmpCb;
-                    root.expandTriggerFlag = false;
-                }
-                if (!node.open && node.isParent && ((!$$(node, consts.id.UL, setting).get(0)) || (node[childKey] && node[childKey].length > 0 && !$$(node[childKey][0], setting).get(0)))) {
-                    view.appendParentULDom(setting, node);
-                    view.createNodeCallback(setting);
-                }
-                if (node.open == expandFlag) {
-                    tools.apply(callback, []);
-                    return;
-                }
-                var ulObj = $$(node, consts.id.UL, setting),
-                    switchObj = $$(node, consts.id.SWITCH, setting),
-                    icoObj = $$(node, consts.id.ICON, setting);
-
-                if (node.isParent) {
-                    node.open = !node.open;
-                    if (node.iconOpen && node.iconClose) {
-                        icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
-                    }
-
-                    if (node.open) {
-                        view.replaceSwitchClass(node, switchObj, consts.folder.OPEN);
-                        view.replaceIcoClass(node, icoObj, consts.folder.OPEN);
-                        if (animateFlag == false || setting.view.expandSpeed == "") {
-                            ulObj.show();
-                            tools.apply(callback, []);
-                        } else {
-                            if (node[childKey] && node[childKey].length > 0) {
-                                ulObj.slideDown(setting.view.expandSpeed, callback);
-                            } else {
-                                ulObj.show();
-                                tools.apply(callback, []);
-                            }
-                        }
-                    } else {
-                        view.replaceSwitchClass(node, switchObj, consts.folder.CLOSE);
-                        view.replaceIcoClass(node, icoObj, consts.folder.CLOSE);
-                        if (animateFlag == false || setting.view.expandSpeed == "" || !(node[childKey] && node[childKey].length > 0)) {
-                            ulObj.hide();
-                            tools.apply(callback, []);
-                        } else {
-                            ulObj.slideUp(setting.view.expandSpeed, callback);
-                        }
-                    }
-                } else {
-                    tools.apply(callback, []);
-                }
-            },
-            expandCollapseParentNode: function (setting, node, expandFlag, animateFlag, callback) {
-                if (!node) return;
-                if (!node.parentTId) {
-                    view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback);
-                    return;
-                } else {
-                    view.expandCollapseNode(setting, node, expandFlag, animateFlag);
-                }
-                if (node.parentTId) {
-                    view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, animateFlag, callback);
-                }
-            },
-            expandCollapseSonNode: function (setting, node, expandFlag, animateFlag, callback) {
-                var root = data.getRoot(setting),
-                    childKey = setting.data.key.children,
-                    treeNodes = (node) ? node[childKey] : root[childKey],
-                    selfAnimateSign = (node) ? false : animateFlag,
-                    expandTriggerFlag = data.getRoot(setting).expandTriggerFlag;
-                data.getRoot(setting).expandTriggerFlag = false;
-                if (treeNodes) {
-                    for (var i = 0, l = treeNodes.length; i < l; i++) {
-                        if (treeNodes[i]) view.expandCollapseSonNode(setting, treeNodes[i], expandFlag, selfAnimateSign);
-                    }
-                }
-                data.getRoot(setting).expandTriggerFlag = expandTriggerFlag;
-                view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback);
-            },
-            isSelectedNode: function (setting, node) {
-                if (!node) {
-                    return false;
-                }
-                var list = data.getRoot(setting).curSelectedList,
-                    i;
-                for (i = list.length - 1; i >= 0; i--) {
-                    if (node === list[i]) {
-                        return true;
-                    }
-                }
-                return false;
-            },
-            makeDOMNodeIcon: function (html, setting, node) {
-                var nameStr = data.getNodeName(setting, node),
-                    name = setting.view.nameIsHTML ? nameStr : nameStr.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-                html.push("<span id='", node.tId, consts.id.ICON,
-                    "' title='' treeNode", consts.id.ICON, " class='", view.makeNodeIcoClass(setting, node),
-                    "' style='", view.makeNodeIcoStyle(setting, node), "'></span><span id='", node.tId, consts.id.SPAN,
-                    "' class='", consts.className.NAME,
-                    "'>", name, "</span>");
-            },
-            makeDOMNodeLine: function (html, setting, node) {
-                html.push("<span id='", node.tId, consts.id.SWITCH, "' title='' class='", view.makeNodeLineClass(setting, node), "' treeNode", consts.id.SWITCH, "></span>");
-            },
-            makeDOMNodeMainAfter: function (html, setting, node) {
-                html.push("</li>");
-            },
-            makeDOMNodeMainBefore: function (html, setting, node) {
-                html.push("<li id='", node.tId, "' class='", consts.className.LEVEL, node.level, "' tabindex='0' hidefocus='true' treenode>");
-            },
-            makeDOMNodeNameAfter: function (html, setting, node) {
-                html.push("</a>");
-            },
-            makeDOMNodeNameBefore: function (html, setting, node) {
-                var title = data.getNodeTitle(setting, node),
-                    url = view.makeNodeUrl(setting, node),
-                    fontcss = view.makeNodeFontCss(setting, node),
-                    fontStyle = [];
-                for (var f in fontcss) {
-                    fontStyle.push(f, ":", fontcss[f], ";");
-                }
-                html.push("<a id='", node.tId, consts.id.A, "' class='", consts.className.LEVEL, node.level, "' treeNode", consts.id.A, " onclick=\"", (node.click || ''),
-                    "\" ", ((url != null && url.length > 0) ? "href='" + url + "'" : ""), " target='", view.makeNodeTarget(node), "' style='", fontStyle.join(''),
-                    "'");
-                if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle) && title) {
-                    html.push("title='", title.replace(/'/g, "&#39;").replace(/</g, '&lt;').replace(/>/g, '&gt;'), "'");
-                }
-                html.push(">");
-            },
-            makeNodeFontCss: function (setting, node) {
-                var fontCss = tools.apply(setting.view.fontCss, [setting.treeId, node], setting.view.fontCss);
-                return (fontCss && ((typeof fontCss) != "function")) ? fontCss : {};
-            },
-            makeNodeIcoClass: function (setting, node) {
-                var icoCss = ["ico"];
-                if (!node.isAjaxing) {
-                    icoCss[0] = (node.iconSkin ? node.iconSkin + "_" : "") + icoCss[0];
-                    if (node.isParent) {
-                        icoCss.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
-                    } else {
-                        icoCss.push(consts.folder.DOCU);
-                    }
-                }
-                return consts.className.BUTTON + " " + icoCss.join('_');
-            },
-            makeNodeIcoStyle: function (setting, node) {
-                var icoStyle = [];
-                if (!node.isAjaxing) {
-                    var icon = (node.isParent && node.iconOpen && node.iconClose) ? (node.open ? node.iconOpen : node.iconClose) : node[setting.data.key.icon];
-                    if (icon) icoStyle.push("background:url(", icon, ") 0 0 no-repeat;");
-                    if (setting.view.showIcon == false || !tools.apply(setting.view.showIcon, [setting.treeId, node], true)) {
-                        icoStyle.push("width:0px;height:0px;");
-                    }
-                }
-                return icoStyle.join('');
-            },
-            makeNodeLineClass: function (setting, node) {
-                var lineClass = [];
-                if (setting.view.showLine) {
-                    if (node.level == 0 && node.isFirstNode && node.isLastNode) {
-                        lineClass.push(consts.line.ROOT);
-                    } else if (node.level == 0 && node.isFirstNode) {
-                        lineClass.push(consts.line.ROOTS);
-                    } else if (node.isLastNode) {
-                        lineClass.push(consts.line.BOTTOM);
-                    } else {
-                        lineClass.push(consts.line.CENTER);
-                    }
-                } else {
-                    lineClass.push(consts.line.NOLINE);
-                }
-                if (node.isParent) {
-                    lineClass.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
-                } else {
-                    lineClass.push(consts.folder.DOCU);
-                }
-                return view.makeNodeLineClassEx(node) + lineClass.join('_');
-            },
-            makeNodeLineClassEx: function (node) {
-                return consts.className.BUTTON + " " + consts.className.LEVEL + node.level + " " + consts.className.SWITCH + " ";
-            },
-            makeNodeTarget: function (node) {
-                return (node.target || "_blank");
-            },
-            makeNodeUrl: function (setting, node) {
-                var urlKey = setting.data.key.url;
-                return node[urlKey] ? node[urlKey] : null;
-            },
-            makeUlHtml: function (setting, node, html, content) {
-                html.push("<ul id='", node.tId, consts.id.UL, "' class='", consts.className.LEVEL, node.level, " ", view.makeUlLineClass(setting, node), "' style='display:", (node.open ? "block" : "none"), "'>");
-                html.push(content);
-                html.push("</ul>");
-            },
-            makeUlLineClass: function (setting, node) {
-                return ((setting.view.showLine && !node.isLastNode) ? consts.line.LINE : "");
-            },
-            removeChildNodes: function (setting, node) {
-                if (!node) return;
-                var childKey = setting.data.key.children,
-                    nodes = node[childKey];
-                if (!nodes) return;
-
-                for (var i = 0, l = nodes.length; i < l; i++) {
-                    data.removeNodeCache(setting, nodes[i]);
-                }
-                data.removeSelectedNode(setting);
-                delete node[childKey];
-
-                if (!setting.data.keep.parent) {
-                    node.isParent = false;
-                    node.open = false;
-                    var tmp_switchObj = $$(node, consts.id.SWITCH, setting),
-                        tmp_icoObj = $$(node, consts.id.ICON, setting);
-                    view.replaceSwitchClass(node, tmp_switchObj, consts.folder.DOCU);
-                    view.replaceIcoClass(node, tmp_icoObj, consts.folder.DOCU);
-                    $$(node, consts.id.UL, setting).remove();
-                } else {
-                    $$(node, consts.id.UL, setting).empty();
-                }
-            },
-            scrollIntoView: function (setting, dom) {
-                if (!dom) {
-                    return;
-                }
-                // support IE 7
-                if (typeof Element === 'undefined') {
-                  var contRect = setting.treeObj.get(0).getBoundingClientRect(),
-                    findMeRect = dom.getBoundingClientRect();
-                  if (findMeRect.top < contRect.top || findMeRect.bottom > contRect.bottom
-                    || findMeRect.right > contRect.right || findMeRect.left < contRect.left) {
-                    dom.scrollIntoView();
-                  }
-                  return;
-                }
-                // code src: http://jsfiddle.net/08u6cxwj/
-                if (!Element.prototype.scrollIntoViewIfNeeded) {
-                    Element.prototype.scrollIntoViewIfNeeded = function (centerIfNeeded) {
-                        function withinBounds(value, min, max, extent) {
-                            if (false === centerIfNeeded || max <= value + extent && value <= min + extent) {
-                                return Math.min(max, Math.max(min, value));
-                            } else {
-                                return (min + max) / 2;
-                            }
-                        }
-
-                        function makeArea(left, top, width, height) {
-                            return {
-                                "left": left, "top": top, "width": width, "height": height
-                                , "right": left + width, "bottom": top + height
-                                , "translate": function (x, y) {
-                                    return makeArea(x + left, y + top, width, height);
-                                }
-                                , "relativeFromTo": function (lhs, rhs) {
-                                    var newLeft = left, newTop = top;
-                                    lhs = lhs.offsetParent;
-                                    rhs = rhs.offsetParent;
-                                    if (lhs === rhs) {
-                                        return area;
-                                    }
-                                    for (; lhs; lhs = lhs.offsetParent) {
-                                        newLeft += lhs.offsetLeft + lhs.clientLeft;
-                                        newTop += lhs.offsetTop + lhs.clientTop;
-                                    }
-                                    for (; rhs; rhs = rhs.offsetParent) {
-                                        newLeft -= rhs.offsetLeft + rhs.clientLeft;
-                                        newTop -= rhs.offsetTop + rhs.clientTop;
-                                    }
-                                    return makeArea(newLeft, newTop, width, height);
-                                }
-                            };
-                        }
-
-                        var parent, elem = this, area = makeArea(
-                            this.offsetLeft, this.offsetTop,
-                            this.offsetWidth, this.offsetHeight);
-                        while (tools.isElement(parent = elem.parentNode)) {
-                            var clientLeft = parent.offsetLeft + parent.clientLeft;
-                            var clientTop = parent.offsetTop + parent.clientTop;
-
-                            // Make area relative to parent's client area.
-                            area = area.relativeFromTo(elem, parent).translate(-clientLeft, -clientTop);
-
-                            parent.scrollLeft = withinBounds(
-                                parent.scrollLeft,
-                                area.right - parent.clientWidth, area.left,
-                                parent.clientWidth);
-
-                            parent.scrollTop = withinBounds(
-                                parent.scrollTop,
-                                area.bottom - parent.clientHeight, area.top,
-                                parent.clientHeight);
-
-                            // Determine actual scroll amount by reading back scroll properties.
-                            area = area.translate(clientLeft - parent.scrollLeft,
-                                clientTop - parent.scrollTop);
-                            elem = parent;
-                        }
-                    };
-                }
-                dom.scrollIntoViewIfNeeded();
-            },
-            setFirstNode: function (setting, parentNode) {
-                var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
-                if (childLength > 0) {
-                    parentNode[childKey][0].isFirstNode = true;
-                }
-            },
-            setLastNode: function (setting, parentNode) {
-                var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
-                if (childLength > 0) {
-                    parentNode[childKey][childLength - 1].isLastNode = true;
-                }
-            },
-            removeNode: function (setting, node) {
-                var root = data.getRoot(setting),
-                    childKey = setting.data.key.children,
-                    parentNode = (node.parentTId) ? node.getParentNode() : root;
-
-                node.isFirstNode = false;
-                node.isLastNode = false;
-                node.getPreNode = function () {
-                    return null;
-                };
-                node.getNextNode = function () {
-                    return null;
-                };
-
-                if (!data.getNodeCache(setting, node.tId)) {
-                    return;
-                }
-
-                $$(node, setting).remove();
-                data.removeNodeCache(setting, node);
-                data.removeSelectedNode(setting, node);
-
-                for (var i = 0, l = parentNode[childKey].length; i < l; i++) {
-                    if (parentNode[childKey][i].tId == node.tId) {
-                        parentNode[childKey].splice(i, 1);
-                        break;
-                    }
-                }
-                view.setFirstNode(setting, parentNode);
-                view.setLastNode(setting, parentNode);
-
-                var tmp_ulObj, tmp_switchObj, tmp_icoObj,
-                    childLength = parentNode[childKey].length;
-
-                //repair nodes old parent
-                if (!setting.data.keep.parent && childLength == 0) {
-                    //old parentNode has no child nodes
-                    parentNode.isParent = false;
-                    parentNode.open = false;
-                    tmp_ulObj = $$(parentNode, consts.id.UL, setting);
-                    tmp_switchObj = $$(parentNode, consts.id.SWITCH, setting);
-                    tmp_icoObj = $$(parentNode, consts.id.ICON, setting);
-                    view.replaceSwitchClass(parentNode, tmp_switchObj, consts.folder.DOCU);
-                    view.replaceIcoClass(parentNode, tmp_icoObj, consts.folder.DOCU);
-                    tmp_ulObj.css("display", "none");
-
-                } else if (setting.view.showLine && childLength > 0) {
-                    //old parentNode has child nodes
-                    var newLast = parentNode[childKey][childLength - 1];
-                    tmp_ulObj = $$(newLast, consts.id.UL, setting);
-                    tmp_switchObj = $$(newLast, consts.id.SWITCH, setting);
-                    tmp_icoObj = $$(newLast, consts.id.ICON, setting);
-                    if (parentNode == root) {
-                        if (parentNode[childKey].length == 1) {
-                            //node was root, and ztree has only one root after move node
-                            view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.ROOT);
-                        } else {
-                            var tmp_first_switchObj = $$(parentNode[childKey][0], consts.id.SWITCH, setting);
-                            view.replaceSwitchClass(parentNode[childKey][0], tmp_first_switchObj, consts.line.ROOTS);
-                            view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
-                        }
-                    } else {
-                        view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
-                    }
-                    tmp_ulObj.removeClass(consts.line.LINE);
-                }
-            },
-            replaceIcoClass: function (node, obj, newName) {
-                if (!obj || node.isAjaxing) return;
-                var tmpName = obj.attr("class");
-                if (tmpName == undefined) return;
-                var tmpList = tmpName.split("_");
-                switch (newName) {
-                    case consts.folder.OPEN:
-                    case consts.folder.CLOSE:
-                    case consts.folder.DOCU:
-                        tmpList[tmpList.length - 1] = newName;
-                        break;
-                }
-                obj.attr("class", tmpList.join("_"));
-            },
-            replaceSwitchClass: function (node, obj, newName) {
-                if (!obj) return;
-                var tmpName = obj.attr("class");
-                if (tmpName == undefined) return;
-                var tmpList = tmpName.split("_");
-                switch (newName) {
-                    case consts.line.ROOT:
-                    case consts.line.ROOTS:
-                    case consts.line.CENTER:
-                    case consts.line.BOTTOM:
-                    case consts.line.NOLINE:
-                        tmpList[0] = view.makeNodeLineClassEx(node) + newName;
-                        break;
-                    case consts.folder.OPEN:
-                    case consts.folder.CLOSE:
-                    case consts.folder.DOCU:
-                        tmpList[1] = newName;
-                        break;
-                }
-                obj.attr("class", tmpList.join("_"));
-                if (newName !== consts.folder.DOCU) {
-                    obj.removeAttr("disabled");
-                } else {
-                    obj.attr("disabled", "disabled");
-                }
-            },
-            selectNode: function (setting, node, addFlag) {
-                if (!addFlag) {
-                    view.cancelPreSelectedNode(setting, null, node);
-                }
-                $$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED);
-                data.addSelectedNode(setting, node);
-                setting.treeObj.trigger(consts.event.SELECTED, [setting.treeId, node]);
-            },
-            setNodeFontCss: function (setting, treeNode) {
-                var aObj = $$(treeNode, consts.id.A, setting),
-                    fontCss = view.makeNodeFontCss(setting, treeNode);
-                if (fontCss) {
-                    aObj.css(fontCss);
-                }
-            },
-            setNodeLineIcos: function (setting, node) {
-                if (!node) return;
-                var switchObj = $$(node, consts.id.SWITCH, setting),
-                    ulObj = $$(node, consts.id.UL, setting),
-                    icoObj = $$(node, consts.id.ICON, setting),
-                    ulLine = view.makeUlLineClass(setting, node);
-                if (ulLine.length == 0) {
-                    ulObj.removeClass(consts.line.LINE);
-                } else {
-                    ulObj.addClass(ulLine);
-                }
-                switchObj.attr("class", view.makeNodeLineClass(setting, node));
-                if (node.isParent) {
-                    switchObj.removeAttr("disabled");
-                } else {
-                    switchObj.attr("disabled", "disabled");
-                }
-                icoObj.removeAttr("style");
-                icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
-                icoObj.attr("class", view.makeNodeIcoClass(setting, node));
-            },
-            setNodeName: function (setting, node) {
-                var title = data.getNodeTitle(setting, node),
-                    nObj = $$(node, consts.id.SPAN, setting);
-                nObj.empty();
-                if (setting.view.nameIsHTML) {
-                    nObj.html(data.getNodeName(setting, node));
-                } else {
-                    nObj.text(data.getNodeName(setting, node));
-                }
-                if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle)) {
-                    var aObj = $$(node, consts.id.A, setting);
-                    aObj.attr("title", !title ? "" : title);
-                }
-            },
-            setNodeTarget: function (setting, node) {
-                var aObj = $$(node, consts.id.A, setting);
-                aObj.attr("target", view.makeNodeTarget(node));
-            },
-            setNodeUrl: function (setting, node) {
-                var aObj = $$(node, consts.id.A, setting),
-                    url = view.makeNodeUrl(setting, node);
-                if (url == null || url.length == 0) {
-                    aObj.removeAttr("href");
-                } else {
-                    aObj.attr("href", url);
-                }
-            },
-            switchNode: function (setting, node) {
-                if (node.open || !tools.canAsync(setting, node)) {
-                    view.expandCollapseNode(setting, node, !node.open);
-                } else if (setting.async.enable) {
-                    if (!view.asyncNode(setting, node)) {
-                        view.expandCollapseNode(setting, node, !node.open);
-                        return;
-                    }
-                } else if (node) {
-                    view.expandCollapseNode(setting, node, !node.open);
-                }
-            }
-        };
-    // zTree defind
-    $.fn.zTree = {
-        consts: _consts,
-        _z: {
-            tools: tools,
-            view: view,
-            event: event,
-            data: data
-        },
-        getZTreeObj: function (treeId) {
-            var o = data.getZTreeTools(treeId);
-            return o ? o : null;
-        },
-        destroy: function (treeId) {
-            if (!!treeId && treeId.length > 0) {
-                view.destroy(data.getSetting(treeId));
-            } else {
-                for (var s in settings) {
-                    view.destroy(settings[s]);
-                }
-            }
-        },
-        init: function (obj, zSetting, zNodes) {
-            var setting = tools.clone(_setting);
-            $.extend(true, setting, zSetting);
-            setting.treeId = obj.attr("id");
-            setting.treeObj = obj;
-            setting.treeObj.empty();
-            settings[setting.treeId] = setting;
-            //For some older browser,(e.g., ie6)
-            if (typeof document.body.style.maxHeight === "undefined") {
-                setting.view.expandSpeed = "";
-            }
-            data.initRoot(setting);
-            var root = data.getRoot(setting),
-                childKey = setting.data.key.children;
-            zNodes = zNodes ? tools.clone(tools.isArray(zNodes) ? zNodes : [zNodes]) : [];
-            if (setting.data.simpleData.enable) {
-                root[childKey] = data.transformTozTreeFormat(setting, zNodes);
-            } else {
-                root[childKey] = zNodes;
-            }
-
-            data.initCache(setting);
-            event.unbindTree(setting);
-            event.bindTree(setting);
-            event.unbindEvent(setting);
-            event.bindEvent(setting);
-
-            var zTreeTools = {
-                setting: setting,
-                addNodes: function (parentNode, index, newNodes, isSilent) {
-                    if (!parentNode) parentNode = null;
-                    if (parentNode && !parentNode.isParent && setting.data.keep.leaf) return null;
-
-                    var i = parseInt(index, 10);
-                    if (isNaN(i)) {
-                        isSilent = !!newNodes;
-                        newNodes = index;
-                        index = -1;
-                    } else {
-                        index = i;
-                    }
-                    if (!newNodes) return null;
-
-
-                    var xNewNodes = tools.clone(tools.isArray(newNodes) ? newNodes : [newNodes]);
-
-                    function addCallback() {
-                        view.addNodes(setting, parentNode, index, xNewNodes, (isSilent == true));
-                    }
-
-                    if (tools.canAsync(setting, parentNode)) {
-                        view.asyncNode(setting, parentNode, isSilent, addCallback);
-                    } else {
-                        addCallback();
-                    }
-                    return xNewNodes;
-                },
-                cancelSelectedNode: function (node) {
-                    view.cancelPreSelectedNode(setting, node);
-                },
-                destroy: function () {
-                    view.destroy(setting);
-                },
-                expandAll: function (expandFlag) {
-                    expandFlag = !!expandFlag;
-                    view.expandCollapseSonNode(setting, null, expandFlag, true);
-                    return expandFlag;
-                },
-                expandNode: function (node, expandFlag, sonSign, focus, callbackFlag) {
-                    if (!node || !node.isParent) return null;
-                    if (expandFlag !== true && expandFlag !== false) {
-                        expandFlag = !node.open;
-                    }
-                    callbackFlag = !!callbackFlag;
-
-                    if (callbackFlag && expandFlag && (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false)) {
-                        return null;
-                    } else if (callbackFlag && !expandFlag && (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false)) {
-                        return null;
-                    }
-                    if (expandFlag && node.parentTId) {
-                        view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, false);
-                    }
-                    if (expandFlag === node.open && !sonSign) {
-                        return null;
-                    }
-
-                    data.getRoot(setting).expandTriggerFlag = callbackFlag;
-                    if (!tools.canAsync(setting, node) && sonSign) {
-                        view.expandCollapseSonNode(setting, node, expandFlag, true, showNodeFocus);
-                    } else {
-                        node.open = !expandFlag;
-                        view.switchNode(this.setting, node);
-                        showNodeFocus();
-                    }
-                    return expandFlag;
-
-                    function showNodeFocus() {
-                        var a = $$(node, setting).get(0);
-                        if (a && focus !== false) {
-                            view.scrollIntoView(setting, a);
-                        }
-                    }
-                },
-                getNodes: function () {
-                    return data.getNodes(setting);
-                },
-                getNodeByParam: function (key, value, parentNode) {
-                    if (!key) return null;
-                    return data.getNodeByParam(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), key, value);
-                },
-                getNodeByTId: function (tId) {
-                    return data.getNodeCache(setting, tId);
-                },
-                getNodesByParam: function (key, value, parentNode) {
-                    if (!key) return null;
-                    return data.getNodesByParam(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), key, value);
-                },
-                getNodesByParamFuzzy: function (key, value, parentNode) {
-                    if (!key) return null;
-                    return data.getNodesByParamFuzzy(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), key, value);
-                },
-                getNodesByFilter: function (filter, isSingle, parentNode, invokeParam) {
-                    isSingle = !!isSingle;
-                    if (!filter || (typeof filter != "function")) return (isSingle ? null : []);
-                    return data.getNodesByFilter(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), filter, isSingle, invokeParam);
-                },
-                getNodeIndex: function (node) {
-                    if (!node) return null;
-                    var childKey = setting.data.key.children,
-                        parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
-                    for (var i = 0, l = parentNode[childKey].length; i < l; i++) {
-                        if (parentNode[childKey][i] == node) return i;
-                    }
-                    return -1;
-                },
-                getSelectedNodes: function () {
-                    var r = [], list = data.getRoot(setting).curSelectedList;
-                    for (var i = 0, l = list.length; i < l; i++) {
-                        r.push(list[i]);
-                    }
-                    return r;
-                },
-                isSelectedNode: function (node) {
-                    return data.isSelectedNode(setting, node);
-                },
-                reAsyncChildNodesPromise: function (parentNode, reloadType, isSilent) {
-                    var promise = new Promise(function(resolve, reject) {
-                        try {
-                            zTreeTools.reAsyncChildNodes(parentNode, reloadType, isSilent, function() {
-                                resolve(parentNode);
-                            });
-                        } catch(e) {
-                            reject(e);
-                        }
-                    });
-                    return promise;
-                },
-                reAsyncChildNodes: function (parentNode, reloadType, isSilent, callback) {
-                    if (!this.setting.async.enable) return;
-                    var isRoot = !parentNode;
-                    if (isRoot) {
-                        parentNode = data.getRoot(setting);
-                    }
-                    if (reloadType == "refresh") {
-                        var childKey = this.setting.data.key.children;
-                        for (var i = 0, l = parentNode[childKey] ? parentNode[childKey].length : 0; i < l; i++) {
-                            data.removeNodeCache(setting, parentNode[childKey][i]);
-                        }
-                        data.removeSelectedNode(setting);
-                        parentNode[childKey] = [];
-                        if (isRoot) {
-                            this.setting.treeObj.empty();
-                        } else {
-                            var ulObj = $$(parentNode, consts.id.UL, setting);
-                            ulObj.empty();
-                        }
-                    }
-                    view.asyncNode(this.setting, isRoot ? null : parentNode, !!isSilent, callback);
-                },
-                refresh: function () {
-                    this.setting.treeObj.empty();
-                    var root = data.getRoot(setting),
-                        nodes = root[setting.data.key.children]
-                    data.initRoot(setting);
-                    root[setting.data.key.children] = nodes
-                    data.initCache(setting);
-                    view.createNodes(setting, 0, root[setting.data.key.children], null, -1);
-                },
-                removeChildNodes: function (node) {
-                    if (!node) return null;
-                    var childKey = setting.data.key.children,
-                        nodes = node[childKey];
-                    view.removeChildNodes(setting, node);
-                    return nodes ? nodes : null;
-                },
-                removeNode: function (node, callbackFlag) {
-                    if (!node) return;
-                    callbackFlag = !!callbackFlag;
-                    if (callbackFlag && tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return;
-                    view.removeNode(setting, node);
-                    if (callbackFlag) {
-                        this.setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
-                    }
-                },
-                selectNode: function (node, addFlag, isSilent) {
-                    if (!node) return;
-                    if (tools.uCanDo(setting)) {
-                        addFlag = setting.view.selectedMulti && addFlag;
-                        if (node.parentTId) {
-                            view.expandCollapseParentNode(setting, node.getParentNode(), true, false, showNodeFocus);
-                        } else if (!isSilent) {
-                            try {
-                                $$(node, setting).focus().blur();
-                            } catch (e) {
-                            }
-                        }
-                        view.selectNode(setting, node, addFlag);
-                    }
-
-                    function showNodeFocus() {
-                        if (isSilent) {
-                            return;
-                        }
-                        var a = $$(node, setting).get(0);
-                        view.scrollIntoView(setting, a);
-                    }
-                },
-                transformTozTreeNodes: function (simpleNodes) {
-                    return data.transformTozTreeFormat(setting, simpleNodes);
-                },
-                transformToArray: function (nodes) {
-                    return data.transformToArrayFormat(setting, nodes);
-                },
-                updateNode: function (node, checkTypeFlag) {
-                    if (!node) return;
-                    var nObj = $$(node, setting);
-                    if (nObj.get(0) && tools.uCanDo(setting)) {
-                        view.setNodeName(setting, node);
-                        view.setNodeTarget(setting, node);
-                        view.setNodeUrl(setting, node);
-                        view.setNodeLineIcos(setting, node);
-                        view.setNodeFontCss(setting, node);
-                    }
-                }
-            }
-            root.treeTools = zTreeTools;
-            data.setZTreeTools(setting, zTreeTools);
-
-            if (root[childKey] && root[childKey].length > 0) {
-                view.createNodes(setting, 0, root[childKey], null, -1);
-            } else if (setting.async.enable && setting.async.url && setting.async.url !== '') {
-                view.asyncNode(setting);
-            }
-            return zTreeTools;
-        }
-    };
-
-    var zt = $.fn.zTree,
-        $$ = tools.$,
-        consts = zt.consts;
+					function showNodeFocus() {
+						if (isSilent) {
+							return;
+						}
+						var a = $$(node, setting).get(0);
+						view.scrollIntoView(setting, a);
+					}
+				},
+				transformTozTreeNodes: function (simpleNodes) {
+					return data.transformTozTreeFormat(setting, simpleNodes);
+				},
+				transformToArray: function (nodes) {
+					return data.transformToArrayFormat(setting, nodes);
+				},
+				updateNode: function (node, checkTypeFlag) {
+					if (!node) return;
+					var nObj = $$(node, setting);
+					if (nObj.get(0) && tools.uCanDo(setting)) {
+						view.setNodeName(setting, node);
+						view.setNodeTarget(setting, node);
+						view.setNodeUrl(setting, node);
+						view.setNodeLineIcos(setting, node);
+						view.setNodeFontCss(setting, node);
+					}
+				}
+			}
+			root.treeTools = zTreeTools;
+			data.setZTreeTools(setting, zTreeTools);
+
+			if (root[childKey] && root[childKey].length > 0) {
+				view.createNodes(setting, 0, root[childKey], null, -1);
+			} else if (setting.async.enable && setting.async.url && setting.async.url !== '') {
+				view.asyncNode(setting);
+			}
+			return zTreeTools;
+		}
+	};
+
+	var zt = $.fn.zTree,
+		$$ = tools.$,
+		consts = zt.consts;
 })(jQuery);
 /*
  * JQuery zTree excheck v3.5.30
@@ -1946,584 +1945,588 @@
  * email: hunter.z@263.net
  * Date: 2017-11-11
  */
-(function($){
+(function ($) {
 	//default consts of excheck
 	var _consts = {
-		event: {
-			CHECK: "ztree_check"
+			event: {
+				CHECK: "ztree_check"
+			},
+			id: {
+				CHECK: "_check"
+			},
+			checkbox: {
+				STYLE: "checkbox",
+				DEFAULT: "chk",
+				DISABLED: "disable",
+				FALSE: "false",
+				TRUE: "true",
+				FULL: "full",
+				PART: "part",
+				FOCUS: "focus"
+			},
+			radio: {
+				STYLE: "radio",
+				TYPE_ALL: "all",
+				TYPE_LEVEL: "level"
+			}
 		},
-		id: {
-			CHECK: "_check"
+		//default setting of excheck
+		_setting = {
+			check: {
+				enable: false,
+				autoCheckTrigger: false,
+				chkStyle: _consts.checkbox.STYLE,
+				nocheckInherit: false,
+				chkDisabledInherit: false,
+				radioType: _consts.radio.TYPE_LEVEL,
+				chkboxType: {
+					"Y": "ps",
+					"N": "ps"
+				}
+			},
+			data: {
+				key: {
+					checked: "checked"
+				}
+			},
+			callback: {
+				beforeCheck: null,
+				onCheck: null
+			}
 		},
-		checkbox: {
-			STYLE: "checkbox",
-			DEFAULT: "chk",
-			DISABLED: "disable",
-			FALSE: "false",
-			TRUE: "true",
-			FULL: "full",
-			PART: "part",
-			FOCUS: "focus"
+		//default root of excheck
+		_initRoot = function (setting) {
+			var r = data.getRoot(setting);
+			r.radioCheckedList = [];
 		},
-		radio: {
-			STYLE: "radio",
-			TYPE_ALL: "all",
-			TYPE_LEVEL: "level"
-		}
-	},
-	//default setting of excheck
-	_setting = {
-		check: {
-			enable: false,
-			autoCheckTrigger: false,
-			chkStyle: _consts.checkbox.STYLE,
-			nocheckInherit: false,
-			chkDisabledInherit: false,
-			radioType: _consts.radio.TYPE_LEVEL,
-			chkboxType: {
-				"Y": "ps",
-				"N": "ps"
-			}
+		//default cache of excheck
+		_initCache = function (treeId) {
 		},
-		data: {
-			key: {
-				checked: "checked"
-			}
+		//default bind event of excheck
+		_bindEvent = function (setting) {
+			var o = setting.treeObj,
+				c = consts.event;
+			o.bind(c.CHECK, function (event, srcEvent, treeId, node) {
+				event.srcEvent = srcEvent;
+				tools.apply(setting.callback.onCheck, [event, treeId, node]);
+			});
 		},
-		callback: {
-			beforeCheck:null,
-			onCheck:null
-		}
-	},
-	//default root of excheck
-	_initRoot = function (setting) {
-		var r = data.getRoot(setting);
-		r.radioCheckedList = [];
-	},
-	//default cache of excheck
-	_initCache = function(treeId) {},
-	//default bind event of excheck
-	_bindEvent = function(setting) {
-		var o = setting.treeObj,
-		c = consts.event;
-		o.bind(c.CHECK, function (event, srcEvent, treeId, node) {
-			event.srcEvent = srcEvent;
-			tools.apply(setting.callback.onCheck, [event, treeId, node]);
-		});
-	},
-	_unbindEvent = function(setting) {
-		var o = setting.treeObj,
-		c = consts.event;
-		o.unbind(c.CHECK);
-	},
-	//default event proxy of excheck
-	_eventProxy = function(e) {
-		var target = e.target,
-		setting = data.getSetting(e.data.treeId),
-		tId = "", node = null,
-		nodeEventType = "", treeEventType = "",
-		nodeEventCallback = null, treeEventCallback = null;
-
-		if (tools.eqs(e.type, "mouseover")) {
-			if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.CHECK) !== null) {
-				tId = tools.getNodeMainDom(target).id;
-				nodeEventType = "mouseoverCheck";
-			}
-		} else if (tools.eqs(e.type, "mouseout")) {
-			if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.CHECK) !== null) {
-				tId = tools.getNodeMainDom(target).id;
-				nodeEventType = "mouseoutCheck";
+		_unbindEvent = function (setting) {
+			var o = setting.treeObj,
+				c = consts.event;
+			o.unbind(c.CHECK);
+		},
+		//default event proxy of excheck
+		_eventProxy = function (e) {
+			var target = e.target,
+				setting = data.getSetting(e.data.treeId),
+				tId = "", node = null,
+				nodeEventType = "", treeEventType = "",
+				nodeEventCallback = null, treeEventCallback = null;
+
+			if (tools.eqs(e.type, "mouseover")) {
+				if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.CHECK) !== null) {
+					tId = tools.getNodeMainDom(target).id;
+					nodeEventType = "mouseoverCheck";
+				}
+			} else if (tools.eqs(e.type, "mouseout")) {
+				if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.CHECK) !== null) {
+					tId = tools.getNodeMainDom(target).id;
+					nodeEventType = "mouseoutCheck";
+				}
+			} else if (tools.eqs(e.type, "click")) {
+				if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.CHECK) !== null) {
+					tId = tools.getNodeMainDom(target).id;
+					nodeEventType = "checkNode";
+				}
 			}
-		} else if (tools.eqs(e.type, "click")) {
-			if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.CHECK) !== null) {
-				tId = tools.getNodeMainDom(target).id;
-				nodeEventType = "checkNode";
+			if (tId.length > 0) {
+				node = data.getNodeCache(setting, tId);
+				switch (nodeEventType) {
+					case "checkNode" :
+						nodeEventCallback = _handler.onCheckNode;
+						break;
+					case "mouseoverCheck" :
+						nodeEventCallback = _handler.onMouseoverCheck;
+						break;
+					case "mouseoutCheck" :
+						nodeEventCallback = _handler.onMouseoutCheck;
+						break;
+				}
 			}
-		}
-		if (tId.length>0) {
-			node = data.getNodeCache(setting, tId);
-			switch (nodeEventType) {
-				case "checkNode" :
-					nodeEventCallback = _handler.onCheckNode;
-					break;
-				case "mouseoverCheck" :
-					nodeEventCallback = _handler.onMouseoverCheck;
-					break;
-				case "mouseoutCheck" :
-					nodeEventCallback = _handler.onMouseoutCheck;
-					break;
+			var proxyResult = {
+				stop: nodeEventType === "checkNode",
+				node: node,
+				nodeEventType: nodeEventType,
+				nodeEventCallback: nodeEventCallback,
+				treeEventType: treeEventType,
+				treeEventCallback: treeEventCallback
+			};
+			return proxyResult
+		},
+		//default init node of excheck
+		_initNode = function (setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+			if (!n) return;
+			var checkedKey = setting.data.key.checked;
+			if (typeof n[checkedKey] == "string") n[checkedKey] = tools.eqs(n[checkedKey], "true");
+			n[checkedKey] = !!n[checkedKey];
+			n.checkedOld = n[checkedKey];
+			if (typeof n.nocheck == "string") n.nocheck = tools.eqs(n.nocheck, "true");
+			n.nocheck = !!n.nocheck || (setting.check.nocheckInherit && parentNode && !!parentNode.nocheck);
+			if (typeof n.chkDisabled == "string") n.chkDisabled = tools.eqs(n.chkDisabled, "true");
+			n.chkDisabled = !!n.chkDisabled || (setting.check.chkDisabledInherit && parentNode && !!parentNode.chkDisabled);
+			if (typeof n.halfCheck == "string") n.halfCheck = tools.eqs(n.halfCheck, "true");
+			n.halfCheck = !!n.halfCheck;
+			n.check_Child_State = -1;
+			n.check_Focus = false;
+			n.getCheckStatus = function () {
+				return data.getCheckStatus(setting, n);
+			};
+
+			if (setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL && n[checkedKey]) {
+				var r = data.getRoot(setting);
+				r.radioCheckedList.push(n);
 			}
-		}
-		var proxyResult = {
-			stop: nodeEventType === "checkNode",
-			node: node,
-			nodeEventType: nodeEventType,
-			nodeEventCallback: nodeEventCallback,
-			treeEventType: treeEventType,
-			treeEventCallback: treeEventCallback
-		};
-		return proxyResult
-	},
-	//default init node of excheck
-	_initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
-		if (!n) return;
-		var checkedKey = setting.data.key.checked;
-		if (typeof n[checkedKey] == "string") n[checkedKey] = tools.eqs(n[checkedKey], "true");
-		n[checkedKey] = !!n[checkedKey];
-		n.checkedOld = n[checkedKey];
-		if (typeof n.nocheck == "string") n.nocheck = tools.eqs(n.nocheck, "true");
-		n.nocheck = !!n.nocheck || (setting.check.nocheckInherit && parentNode && !!parentNode.nocheck);
-		if (typeof n.chkDisabled == "string") n.chkDisabled = tools.eqs(n.chkDisabled, "true");
-		n.chkDisabled = !!n.chkDisabled || (setting.check.chkDisabledInherit && parentNode && !!parentNode.chkDisabled);
-		if (typeof n.halfCheck == "string") n.halfCheck = tools.eqs(n.halfCheck, "true");
-		n.halfCheck = !!n.halfCheck;
-		n.check_Child_State = -1;
-		n.check_Focus = false;
-		n.getCheckStatus = function() {return data.getCheckStatus(setting, n);};
-
-		if (setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL && n[checkedKey] ) {
-			var r = data.getRoot(setting);
-			r.radioCheckedList.push(n);
-		}
-	},
-	//add dom for check
-	_beforeA = function(setting, node, html) {
-		var checkedKey = setting.data.key.checked;
-		if (setting.check.enable) {
-			data.makeChkFlag(setting, node);
-			html.push("<span ID='", node.tId, consts.id.CHECK, "' class='", view.makeChkClass(setting, node), "' treeNode", consts.id.CHECK, (node.nocheck === true?" style='display:none;'":""),"></span>");
-		}
-	},
-	//update zTreeObj, add method of check
-	_zTreeTools = function(setting, zTreeTools) {
-		zTreeTools.checkNode = function(node, checked, checkTypeFlag, callbackFlag) {
-			var checkedKey = this.setting.data.key.checked;
-			if (node.chkDisabled === true) return;
-			if (checked !== true && checked !== false) {
-				checked = !node[checkedKey];
+		},
+		//add dom for check
+		_beforeA = function (setting, node, html) {
+			var checkedKey = setting.data.key.checked;
+			if (setting.check.enable) {
+				data.makeChkFlag(setting, node);
+				html.push("<span ID='", node.tId, consts.id.CHECK, "' class='", view.makeChkClass(setting, node), "' treeNode", consts.id.CHECK, (node.nocheck === true ? " style='display:none;'" : ""), "></span>");
 			}
-			callbackFlag = !!callbackFlag;
+		},
+		//update zTreeObj, add method of check
+		_zTreeTools = function (setting, zTreeTools) {
+			zTreeTools.checkNode = function (node, checked, checkTypeFlag, callbackFlag) {
+				var checkedKey = this.setting.data.key.checked;
+				if (node.chkDisabled === true) return;
+				if (checked !== true && checked !== false) {
+					checked = !node[checkedKey];
+				}
+				callbackFlag = !!callbackFlag;
 
-			if (node[checkedKey] === checked && !checkTypeFlag) {
-				return;
-			} else if (callbackFlag && tools.apply(this.setting.callback.beforeCheck, [this.setting.treeId, node], true) == false) {
-				return;
-			}
-			if (tools.uCanDo(this.setting) && this.setting.check.enable && node.nocheck !== true) {
-				node[checkedKey] = checked;
-				var checkObj = $$(node, consts.id.CHECK, this.setting);
-				if (checkTypeFlag || this.setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(this.setting, node);
-				view.setChkClass(this.setting, checkObj, node);
-				view.repairParentChkClassWithSelf(this.setting, node);
-				if (callbackFlag) {
-					this.setting.treeObj.trigger(consts.event.CHECK, [null, this.setting.treeId, node]);
+				if (node[checkedKey] === checked && !checkTypeFlag) {
+					return;
+				} else if (callbackFlag && tools.apply(this.setting.callback.beforeCheck, [this.setting.treeId, node], true) == false) {
+					return;
+				}
+				if (tools.uCanDo(this.setting) && this.setting.check.enable && node.nocheck !== true) {
+					node[checkedKey] = checked;
+					var checkObj = $$(node, consts.id.CHECK, this.setting);
+					if (checkTypeFlag || this.setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(this.setting, node);
+					view.setChkClass(this.setting, checkObj, node);
+					view.repairParentChkClassWithSelf(this.setting, node);
+					if (callbackFlag) {
+						this.setting.treeObj.trigger(consts.event.CHECK, [null, this.setting.treeId, node]);
+					}
 				}
 			}
-		}
-
-		zTreeTools.checkAllNodes = function(checked) {
-			view.repairAllChk(this.setting, !!checked);
-		}
 
-		zTreeTools.getCheckedNodes = function(checked) {
-			var childKey = this.setting.data.key.children;
-			checked = (checked !== false);
-			return data.getTreeCheckedNodes(this.setting, data.getRoot(this.setting)[childKey], checked);
-		}
+			zTreeTools.checkAllNodes = function (checked) {
+				view.repairAllChk(this.setting, !!checked);
+			}
 
-		zTreeTools.getChangeCheckedNodes = function() {
-			var childKey = this.setting.data.key.children;
-			return data.getTreeChangeCheckedNodes(this.setting, data.getRoot(this.setting)[childKey]);
-		}
+			zTreeTools.getCheckedNodes = function (checked) {
+				var childKey = this.setting.data.key.children;
+				checked = (checked !== false);
+				return data.getTreeCheckedNodes(this.setting, data.getRoot(this.setting)[childKey], checked);
+			}
 
-		zTreeTools.setChkDisabled = function(node, disabled, inheritParent, inheritChildren) {
-			disabled = !!disabled;
-			inheritParent = !!inheritParent;
-			inheritChildren = !!inheritChildren;
-			view.repairSonChkDisabled(this.setting, node, disabled, inheritChildren);
-			view.repairParentChkDisabled(this.setting, node.getParentNode(), disabled, inheritParent);
-		}
+			zTreeTools.getChangeCheckedNodes = function () {
+				var childKey = this.setting.data.key.children;
+				return data.getTreeChangeCheckedNodes(this.setting, data.getRoot(this.setting)[childKey]);
+			}
 
-		var _updateNode = zTreeTools.updateNode;
-		zTreeTools.updateNode = function(node, checkTypeFlag) {
-			if (_updateNode) _updateNode.apply(zTreeTools, arguments);
-			if (!node || !this.setting.check.enable) return;
-			var nObj = $$(node, this.setting);
-			if (nObj.get(0) && tools.uCanDo(this.setting)) {
-				var checkObj = $$(node, consts.id.CHECK, this.setting);
-				if (checkTypeFlag == true || this.setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(this.setting, node);
-				view.setChkClass(this.setting, checkObj, node);
-				view.repairParentChkClassWithSelf(this.setting, node);
+			zTreeTools.setChkDisabled = function (node, disabled, inheritParent, inheritChildren) {
+				disabled = !!disabled;
+				inheritParent = !!inheritParent;
+				inheritChildren = !!inheritChildren;
+				view.repairSonChkDisabled(this.setting, node, disabled, inheritChildren);
+				view.repairParentChkDisabled(this.setting, node.getParentNode(), disabled, inheritParent);
 			}
-		}
-	},
-	//method of operate data
-	_data = {
-		getRadioCheckedList: function(setting) {
-			var checkedList = data.getRoot(setting).radioCheckedList;
-			for (var i=0, j=checkedList.length; i<j; i++) {
-				if(!data.getNodeCache(setting, checkedList[i].tId)) {
-					checkedList.splice(i, 1);
-					i--; j--;
+
+			var _updateNode = zTreeTools.updateNode;
+			zTreeTools.updateNode = function (node, checkTypeFlag) {
+				if (_updateNode) _updateNode.apply(zTreeTools, arguments);
+				if (!node || !this.setting.check.enable) return;
+				var nObj = $$(node, this.setting);
+				if (nObj.get(0) && tools.uCanDo(this.setting)) {
+					var checkObj = $$(node, consts.id.CHECK, this.setting);
+					if (checkTypeFlag == true || this.setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(this.setting, node);
+					view.setChkClass(this.setting, checkObj, node);
+					view.repairParentChkClassWithSelf(this.setting, node);
 				}
 			}
-			return checkedList;
-		},
-		getCheckStatus: function(setting, node) {
-			if (!setting.check.enable || node.nocheck || node.chkDisabled) return null;
-			var checkedKey = setting.data.key.checked,
-			r = {
-				checked: node[checkedKey],
-				half: node.halfCheck ? node.halfCheck : (setting.check.chkStyle == consts.radio.STYLE ? (node.check_Child_State === 2) : (node[checkedKey] ? (node.check_Child_State > -1 && node.check_Child_State < 2) : (node.check_Child_State > 0)))
-			};
-			return r;
 		},
-		getTreeCheckedNodes: function(setting, nodes, checked, results) {
-			if (!nodes) return [];
-			var childKey = setting.data.key.children,
-			checkedKey = setting.data.key.checked,
-			onlyOne = (checked && setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL);
-			results = !results ? [] : results;
-			for (var i = 0, l = nodes.length; i < l; i++) {
-				if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] == checked) {
-					results.push(nodes[i]);
-					if(onlyOne) {
+		//method of operate data
+		_data = {
+			getRadioCheckedList: function (setting) {
+				var checkedList = data.getRoot(setting).radioCheckedList;
+				for (var i = 0, j = checkedList.length; i < j; i++) {
+					if (!data.getNodeCache(setting, checkedList[i].tId)) {
+						checkedList.splice(i, 1);
+						i--;
+						j--;
+					}
+				}
+				return checkedList;
+			},
+			getCheckStatus: function (setting, node) {
+				if (!setting.check.enable || node.nocheck || node.chkDisabled) return null;
+				var checkedKey = setting.data.key.checked,
+					r = {
+						checked: node[checkedKey],
+						half: node.halfCheck ? node.halfCheck : (setting.check.chkStyle == consts.radio.STYLE ? (node.check_Child_State === 2) : (node[checkedKey] ? (node.check_Child_State > -1 && node.check_Child_State < 2) : (node.check_Child_State > 0)))
+					};
+				return r;
+			},
+			getTreeCheckedNodes: function (setting, nodes, checked, results) {
+				if (!nodes) return [];
+				var childKey = setting.data.key.children,
+					checkedKey = setting.data.key.checked,
+					onlyOne = (checked && setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL);
+				results = !results ? [] : results;
+				for (var i = 0, l = nodes.length; i < l; i++) {
+					if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] == checked) {
+						results.push(nodes[i]);
+						if (onlyOne) {
+							break;
+						}
+					}
+					data.getTreeCheckedNodes(setting, nodes[i][childKey], checked, results);
+					if (onlyOne && results.length > 0) {
 						break;
 					}
 				}
-				data.getTreeCheckedNodes(setting, nodes[i][childKey], checked, results);
-				if(onlyOne && results.length > 0) {
-					break;
+				return results;
+			},
+			getTreeChangeCheckedNodes: function (setting, nodes, results) {
+				if (!nodes) return [];
+				var childKey = setting.data.key.children,
+					checkedKey = setting.data.key.checked;
+				results = !results ? [] : results;
+				for (var i = 0, l = nodes.length; i < l; i++) {
+					if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] != nodes[i].checkedOld) {
+						results.push(nodes[i]);
+					}
+					data.getTreeChangeCheckedNodes(setting, nodes[i][childKey], results);
 				}
-			}
-			return results;
-		},
-		getTreeChangeCheckedNodes: function(setting, nodes, results) {
-			if (!nodes) return [];
-			var childKey = setting.data.key.children,
-			checkedKey = setting.data.key.checked;
-			results = !results ? [] : results;
-			for (var i = 0, l = nodes.length; i < l; i++) {
-				if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] != nodes[i].checkedOld) {
-					results.push(nodes[i]);
-				}
-				data.getTreeChangeCheckedNodes(setting, nodes[i][childKey], results);
-			}
-			return results;
-		},
-		makeChkFlag: function(setting, node) {
-			if (!node) return;
-			var childKey = setting.data.key.children,
-			checkedKey = setting.data.key.checked,
-			chkFlag = -1;
-			if (node[childKey]) {
-				for (var i = 0, l = node[childKey].length; i < l; i++) {
-					var cNode = node[childKey][i];
-					var tmp = -1;
-					if (setting.check.chkStyle == consts.radio.STYLE) {
-						if (cNode.nocheck === true || cNode.chkDisabled === true) {
-							tmp = cNode.check_Child_State;
-						} else if (cNode.halfCheck === true) {
-							tmp = 2;
-						} else if (cNode[checkedKey]) {
-							tmp = 2;
-						} else {
-							tmp = cNode.check_Child_State > 0 ? 2:0;
-						}
-						if (tmp == 2) {
-							chkFlag = 2; break;
-						} else if (tmp == 0){
-							chkFlag = 0;
-						}
-					} else if (setting.check.chkStyle == consts.checkbox.STYLE) {
-						if (cNode.nocheck === true || cNode.chkDisabled === true) {
-							tmp = cNode.check_Child_State;
-						} else if (cNode.halfCheck === true) {
-							tmp = 1;
-						} else if (cNode[checkedKey] ) {
-							tmp = (cNode.check_Child_State === -1 || cNode.check_Child_State === 2) ? 2 : 1;
-						} else {
-							tmp = (cNode.check_Child_State > 0) ? 1 : 0;
-						}
-						if (tmp === 1) {
-							chkFlag = 1; break;
-						} else if (tmp === 2 && chkFlag > -1 && i > 0 && tmp !== chkFlag) {
-							chkFlag = 1; break;
-						} else if (chkFlag === 2 && tmp > -1 && tmp < 2) {
-							chkFlag = 1; break;
-						} else if (tmp > -1) {
-							chkFlag = tmp;
+				return results;
+			},
+			makeChkFlag: function (setting, node) {
+				if (!node) return;
+				var childKey = setting.data.key.children,
+					checkedKey = setting.data.key.checked,
+					chkFlag = -1;
+				if (node[childKey]) {
+					for (var i = 0, l = node[childKey].length; i < l; i++) {
+						var cNode = node[childKey][i];
+						var tmp = -1;
+						if (setting.check.chkStyle == consts.radio.STYLE) {
+							if (cNode.nocheck === true || cNode.chkDisabled === true) {
+								tmp = cNode.check_Child_State;
+							} else if (cNode.halfCheck === true) {
+								tmp = 2;
+							} else if (cNode[checkedKey]) {
+								tmp = 2;
+							} else {
+								tmp = cNode.check_Child_State > 0 ? 2 : 0;
+							}
+							if (tmp == 2) {
+								chkFlag = 2;
+								break;
+							} else if (tmp == 0) {
+								chkFlag = 0;
+							}
+						} else if (setting.check.chkStyle == consts.checkbox.STYLE) {
+							if (cNode.nocheck === true || cNode.chkDisabled === true) {
+								tmp = cNode.check_Child_State;
+							} else if (cNode.halfCheck === true) {
+								tmp = 1;
+							} else if (cNode[checkedKey]) {
+								tmp = (cNode.check_Child_State === -1 || cNode.check_Child_State === 2) ? 2 : 1;
+							} else {
+								tmp = (cNode.check_Child_State > 0) ? 1 : 0;
+							}
+							if (tmp === 1) {
+								chkFlag = 1;
+								break;
+							} else if (tmp === 2 && chkFlag > -1 && i > 0 && tmp !== chkFlag) {
+								chkFlag = 1;
+								break;
+							} else if (chkFlag === 2 && tmp > -1 && tmp < 2) {
+								chkFlag = 1;
+								break;
+							} else if (tmp > -1) {
+								chkFlag = tmp;
+							}
 						}
 					}
 				}
+				node.check_Child_State = chkFlag;
 			}
-			node.check_Child_State = chkFlag;
-		}
-	},
-	//method of event proxy
-	_event = {
-
-	},
-	//method of event handler
-	_handler = {
-		onCheckNode: function (event, node) {
-			if (node.chkDisabled === true) return false;
-			var setting = data.getSetting(event.data.treeId),
-			checkedKey = setting.data.key.checked;
-			if (tools.apply(setting.callback.beforeCheck, [setting.treeId, node], true) == false) return true;
-			node[checkedKey] = !node[checkedKey];
-			view.checkNodeRelation(setting, node);
-			var checkObj = $$(node, consts.id.CHECK, setting);
-			view.setChkClass(setting, checkObj, node);
-			view.repairParentChkClassWithSelf(setting, node);
-			setting.treeObj.trigger(consts.event.CHECK, [event, setting.treeId, node]);
-			return true;
 		},
-		onMouseoverCheck: function(event, node) {
-			if (node.chkDisabled === true) return false;
-			var setting = data.getSetting(event.data.treeId),
-			checkObj = $$(node, consts.id.CHECK, setting);
-			node.check_Focus = true;
-			view.setChkClass(setting, checkObj, node);
-			return true;
+		//method of event proxy
+		_event = {},
+		//method of event handler
+		_handler = {
+			onCheckNode: function (event, node) {
+				if (node.chkDisabled === true) return false;
+				var setting = data.getSetting(event.data.treeId),
+					checkedKey = setting.data.key.checked;
+				if (tools.apply(setting.callback.beforeCheck, [setting.treeId, node], true) == false) return true;
+				node[checkedKey] = !node[checkedKey];
+				view.checkNodeRelation(setting, node);
+				var checkObj = $$(node, consts.id.CHECK, setting);
+				view.setChkClass(setting, checkObj, node);
+				view.repairParentChkClassWithSelf(setting, node);
+				setting.treeObj.trigger(consts.event.CHECK, [event, setting.treeId, node]);
+				return true;
+			},
+			onMouseoverCheck: function (event, node) {
+				if (node.chkDisabled === true) return false;
+				var setting = data.getSetting(event.data.treeId),
+					checkObj = $$(node, consts.id.CHECK, setting);
+				node.check_Focus = true;
+				view.setChkClass(setting, checkObj, node);
+				return true;
+			},
+			onMouseoutCheck: function (event, node) {
+				if (node.chkDisabled === true) return false;
+				var setting = data.getSetting(event.data.treeId),
+					checkObj = $$(node, consts.id.CHECK, setting);
+				node.check_Focus = false;
+				view.setChkClass(setting, checkObj, node);
+				return true;
+			}
 		},
-		onMouseoutCheck: function(event, node) {
-			if (node.chkDisabled === true) return false;
-			var setting = data.getSetting(event.data.treeId),
-			checkObj = $$(node, consts.id.CHECK, setting);
-			node.check_Focus = false;
-			view.setChkClass(setting, checkObj, node);
-			return true;
-		}
-	},
-	//method of tools for zTree
-	_tools = {
-
-	},
-	//method of operate ztree dom
-	_view = {
-		checkNodeRelation: function(setting, node) {
-			var pNode, i, l,
-			childKey = setting.data.key.children,
-			checkedKey = setting.data.key.checked,
-			r = consts.radio;
-			if (setting.check.chkStyle == r.STYLE) {
-				var checkedList = data.getRadioCheckedList(setting);
-				if (node[checkedKey]) {
-					if (setting.check.radioType == r.TYPE_ALL) {
-						for (i = checkedList.length-1; i >= 0; i--) {
-							pNode = checkedList[i];
-							if (pNode[checkedKey] && pNode != node) {
-								pNode[checkedKey] = false;
-								checkedList.splice(i, 1);
-
-								view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
-								if (pNode.parentTId != node.parentTId) {
-									view.repairParentChkClassWithSelf(setting, pNode);
+		//method of tools for zTree
+		_tools = {},
+		//method of operate ztree dom
+		_view = {
+			checkNodeRelation: function (setting, node) {
+				var pNode, i, l,
+					childKey = setting.data.key.children,
+					checkedKey = setting.data.key.checked,
+					r = consts.radio;
+				if (setting.check.chkStyle == r.STYLE) {
+					var checkedList = data.getRadioCheckedList(setting);
+					if (node[checkedKey]) {
+						if (setting.check.radioType == r.TYPE_ALL) {
+							for (i = checkedList.length - 1; i >= 0; i--) {
+								pNode = checkedList[i];
+								if (pNode[checkedKey] && pNode != node) {
+									pNode[checkedKey] = false;
+									checkedList.splice(i, 1);
+
+									view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
+									if (pNode.parentTId != node.parentTId) {
+										view.repairParentChkClassWithSelf(setting, pNode);
+									}
+								}
+							}
+							checkedList.push(node);
+						} else {
+							var parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
+							for (i = 0, l = parentNode[childKey].length; i < l; i++) {
+								pNode = parentNode[childKey][i];
+								if (pNode[checkedKey] && pNode != node) {
+									pNode[checkedKey] = false;
+									view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
 								}
 							}
 						}
-						checkedList.push(node);
-					} else {
-						var parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
-						for (i = 0, l = parentNode[childKey].length; i < l; i++) {
-							pNode = parentNode[childKey][i];
-							if (pNode[checkedKey] && pNode != node) {
-								pNode[checkedKey] = false;
-								view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
+					} else if (setting.check.radioType == r.TYPE_ALL) {
+						for (i = 0, l = checkedList.length; i < l; i++) {
+							if (node == checkedList[i]) {
+								checkedList.splice(i, 1);
+								break;
 							}
 						}
 					}
-				} else if (setting.check.radioType == r.TYPE_ALL) {
-					for (i = 0, l = checkedList.length; i < l; i++) {
-						if (node == checkedList[i]) {
-							checkedList.splice(i, 1);
-							break;
-						}
+
+				} else {
+					if (node[checkedKey] && (!node[childKey] || node[childKey].length == 0 || setting.check.chkboxType.Y.indexOf("s") > -1)) {
+						view.setSonNodeCheckBox(setting, node, true);
+					}
+					if (!node[checkedKey] && (!node[childKey] || node[childKey].length == 0 || setting.check.chkboxType.N.indexOf("s") > -1)) {
+						view.setSonNodeCheckBox(setting, node, false);
+					}
+					if (node[checkedKey] && setting.check.chkboxType.Y.indexOf("p") > -1) {
+						view.setParentNodeCheckBox(setting, node, true);
+					}
+					if (!node[checkedKey] && setting.check.chkboxType.N.indexOf("p") > -1) {
+						view.setParentNodeCheckBox(setting, node, false);
 					}
 				}
-
-			} else {
-				if (node[checkedKey] && (!node[childKey] || node[childKey].length==0 || setting.check.chkboxType.Y.indexOf("s") > -1)) {
-					view.setSonNodeCheckBox(setting, node, true);
+			},
+			makeChkClass: function (setting, node) {
+				var checkedKey = setting.data.key.checked,
+					c = consts.checkbox, r = consts.radio,
+					fullStyle = "";
+				if (node.chkDisabled === true) {
+					fullStyle = c.DISABLED;
+				} else if (node.halfCheck) {
+					fullStyle = c.PART;
+				} else if (setting.check.chkStyle == r.STYLE) {
+					fullStyle = (node.check_Child_State < 1) ? c.FULL : c.PART;
+				} else {
+					fullStyle = node[checkedKey] ? ((node.check_Child_State === 2 || node.check_Child_State === -1) ? c.FULL : c.PART) : ((node.check_Child_State < 1) ? c.FULL : c.PART);
 				}
-				if (!node[checkedKey] && (!node[childKey] || node[childKey].length==0 || setting.check.chkboxType.N.indexOf("s") > -1)) {
-					view.setSonNodeCheckBox(setting, node, false);
+				var chkName = setting.check.chkStyle + "_" + (node[checkedKey] ? c.TRUE : c.FALSE) + "_" + fullStyle;
+				chkName = (node.check_Focus && node.chkDisabled !== true) ? chkName + "_" + c.FOCUS : chkName;
+				return consts.className.BUTTON + " " + c.DEFAULT + " " + chkName;
+			},
+			repairAllChk: function (setting, checked) {
+				if (setting.check.enable && setting.check.chkStyle === consts.checkbox.STYLE) {
+					var checkedKey = setting.data.key.checked,
+						childKey = setting.data.key.children,
+						root = data.getRoot(setting);
+					for (var i = 0, l = root[childKey].length; i < l; i++) {
+						var node = root[childKey][i];
+						if (node.nocheck !== true && node.chkDisabled !== true) {
+							node[checkedKey] = checked;
+						}
+						view.setSonNodeCheckBox(setting, node, checked);
+					}
 				}
-				if (node[checkedKey] && setting.check.chkboxType.Y.indexOf("p") > -1) {
-					view.setParentNodeCheckBox(setting, node, true);
+			},
+			repairChkClass: function (setting, node) {
+				if (!node) return;
+				data.makeChkFlag(setting, node);
+				if (node.nocheck !== true) {
+					var checkObj = $$(node, consts.id.CHECK, setting);
+					view.setChkClass(setting, checkObj, node);
 				}
-				if (!node[checkedKey] && setting.check.chkboxType.N.indexOf("p") > -1) {
-					view.setParentNodeCheckBox(setting, node, false);
+			},
+			repairParentChkClass: function (setting, node) {
+				if (!node || !node.parentTId) return;
+				var pNode = node.getParentNode();
+				view.repairChkClass(setting, pNode);
+				view.repairParentChkClass(setting, pNode);
+			},
+			repairParentChkClassWithSelf: function (setting, node) {
+				if (!node) return;
+				var childKey = setting.data.key.children;
+				if (node[childKey] && node[childKey].length > 0) {
+					view.repairParentChkClass(setting, node[childKey][0]);
+				} else {
+					view.repairParentChkClass(setting, node);
 				}
-			}
-		},
-		makeChkClass: function(setting, node) {
-			var checkedKey = setting.data.key.checked,
-			c = consts.checkbox, r = consts.radio,
-			fullStyle = "";
-			if (node.chkDisabled === true) {
-				fullStyle = c.DISABLED;
-			} else if (node.halfCheck) {
-				fullStyle = c.PART;
-			} else if (setting.check.chkStyle == r.STYLE) {
-				fullStyle = (node.check_Child_State < 1)? c.FULL:c.PART;
-			} else {
-				fullStyle = node[checkedKey] ? ((node.check_Child_State === 2 || node.check_Child_State === -1) ? c.FULL:c.PART) : ((node.check_Child_State < 1)? c.FULL:c.PART);
-			}
-			var chkName = setting.check.chkStyle + "_" + (node[checkedKey] ? c.TRUE : c.FALSE) + "_" + fullStyle;
-			chkName = (node.check_Focus && node.chkDisabled !== true) ? chkName + "_" + c.FOCUS : chkName;
-			return consts.className.BUTTON + " " + c.DEFAULT + " " + chkName;
-		},
-		repairAllChk: function(setting, checked) {
-			if (setting.check.enable && setting.check.chkStyle === consts.checkbox.STYLE) {
-				var checkedKey = setting.data.key.checked,
-				childKey = setting.data.key.children,
-				root = data.getRoot(setting);
-				for (var i = 0, l = root[childKey].length; i<l ; i++) {
-					var node = root[childKey][i];
-					if (node.nocheck !== true && node.chkDisabled !== true) {
-						node[checkedKey] = checked;
+			},
+			repairSonChkDisabled: function (setting, node, chkDisabled, inherit) {
+				if (!node) return;
+				var childKey = setting.data.key.children;
+				if (node.chkDisabled != chkDisabled) {
+					node.chkDisabled = chkDisabled;
+				}
+				view.repairChkClass(setting, node);
+				if (node[childKey] && inherit) {
+					for (var i = 0, l = node[childKey].length; i < l; i++) {
+						var sNode = node[childKey][i];
+						view.repairSonChkDisabled(setting, sNode, chkDisabled, inherit);
 					}
-					view.setSonNodeCheckBox(setting, node, checked);
 				}
-			}
-		},
-		repairChkClass: function(setting, node) {
-			if (!node) return;
-			data.makeChkFlag(setting, node);
-			if (node.nocheck !== true) {
-				var checkObj = $$(node, consts.id.CHECK, setting);
-				view.setChkClass(setting, checkObj, node);
-			}
-		},
-		repairParentChkClass: function(setting, node) {
-			if (!node || !node.parentTId) return;
-			var pNode = node.getParentNode();
-			view.repairChkClass(setting, pNode);
-			view.repairParentChkClass(setting, pNode);
-		},
-		repairParentChkClassWithSelf: function(setting, node) {
-			if (!node) return;
-			var childKey = setting.data.key.children;
-			if (node[childKey] && node[childKey].length > 0) {
-				view.repairParentChkClass(setting, node[childKey][0]);
-			} else {
-				view.repairParentChkClass(setting, node);
-			}
-		},
-		repairSonChkDisabled: function(setting, node, chkDisabled, inherit) {
-			if (!node) return;
-			var childKey = setting.data.key.children;
-			if (node.chkDisabled != chkDisabled) {
-				node.chkDisabled = chkDisabled;
-			}
-			view.repairChkClass(setting, node);
-			if (node[childKey] && inherit) {
-				for (var i = 0, l = node[childKey].length; i < l; i++) {
-					var sNode = node[childKey][i];
-					view.repairSonChkDisabled(setting, sNode, chkDisabled, inherit);
+			},
+			repairParentChkDisabled: function (setting, node, chkDisabled, inherit) {
+				if (!node) return;
+				if (node.chkDisabled != chkDisabled && inherit) {
+					node.chkDisabled = chkDisabled;
 				}
-			}
-		},
-		repairParentChkDisabled: function(setting, node, chkDisabled, inherit) {
-			if (!node) return;
-			if (node.chkDisabled != chkDisabled && inherit) {
-				node.chkDisabled = chkDisabled;
-			}
-			view.repairChkClass(setting, node);
-			view.repairParentChkDisabled(setting, node.getParentNode(), chkDisabled, inherit);
-		},
-		setChkClass: function(setting, obj, node) {
-			if (!obj) return;
-			if (node.nocheck === true) {
-				obj.hide();
-			} else {
-				obj.show();
-			}
-            obj.attr('class', view.makeChkClass(setting, node));
-		},
-		setParentNodeCheckBox: function(setting, node, value, srcNode) {
-			var childKey = setting.data.key.children,
-			checkedKey = setting.data.key.checked,
-			checkObj = $$(node, consts.id.CHECK, setting);
-			if (!srcNode) srcNode = node;
-			data.makeChkFlag(setting, node);
-			if (node.nocheck !== true && node.chkDisabled !== true) {
-				node[checkedKey] = value;
-				view.setChkClass(setting, checkObj, node);
-				if (setting.check.autoCheckTrigger && node != srcNode) {
-					setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+				view.repairChkClass(setting, node);
+				view.repairParentChkDisabled(setting, node.getParentNode(), chkDisabled, inherit);
+			},
+			setChkClass: function (setting, obj, node) {
+				if (!obj) return;
+				if (node.nocheck === true) {
+					obj.hide();
+				} else {
+					obj.show();
 				}
-			}
-			if (node.parentTId) {
-				var pSign = true;
-				if (!value) {
-					var pNodes = node.getParentNode()[childKey];
-					for (var i = 0, l = pNodes.length; i < l; i++) {
-						if ((pNodes[i].nocheck !== true && pNodes[i].chkDisabled !== true && pNodes[i][checkedKey])
-						|| ((pNodes[i].nocheck === true || pNodes[i].chkDisabled === true) && pNodes[i].check_Child_State > 0)) {
-							pSign = false;
-							break;
-						}
+				obj.attr('class', view.makeChkClass(setting, node));
+			},
+			setParentNodeCheckBox: function (setting, node, value, srcNode) {
+				var childKey = setting.data.key.children,
+					checkedKey = setting.data.key.checked,
+					checkObj = $$(node, consts.id.CHECK, setting);
+				if (!srcNode) srcNode = node;
+				data.makeChkFlag(setting, node);
+				if (node.nocheck !== true && node.chkDisabled !== true) {
+					node[checkedKey] = value;
+					view.setChkClass(setting, checkObj, node);
+					if (setting.check.autoCheckTrigger && node != srcNode) {
+						setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
 					}
 				}
-				if (pSign) {
-					view.setParentNodeCheckBox(setting, node.getParentNode(), value, srcNode);
+				if (node.parentTId) {
+					var pSign = true;
+					if (!value) {
+						var pNodes = node.getParentNode()[childKey];
+						for (var i = 0, l = pNodes.length; i < l; i++) {
+							if ((pNodes[i].nocheck !== true && pNodes[i].chkDisabled !== true && pNodes[i][checkedKey])
+								|| ((pNodes[i].nocheck === true || pNodes[i].chkDisabled === true) && pNodes[i].check_Child_State > 0)) {
+								pSign = false;
+								break;
+							}
+						}
+					}
+					if (pSign) {
+						view.setParentNodeCheckBox(setting, node.getParentNode(), value, srcNode);
+					}
 				}
-			}
-		},
-		setSonNodeCheckBox: function(setting, node, value, srcNode) {
-			if (!node) return;
-			var childKey = setting.data.key.children,
-			checkedKey = setting.data.key.checked,
-			checkObj = $$(node, consts.id.CHECK, setting);
-			if (!srcNode) srcNode = node;
-
-			var hasDisable = false;
-			if (node[childKey]) {
-				for (var i = 0, l = node[childKey].length; i < l; i++) {
-					var sNode = node[childKey][i];
-					view.setSonNodeCheckBox(setting, sNode, value, srcNode);
-					if (sNode.chkDisabled === true) hasDisable = true;
+			},
+			setSonNodeCheckBox: function (setting, node, value, srcNode) {
+				if (!node) return;
+				var childKey = setting.data.key.children,
+					checkedKey = setting.data.key.checked,
+					checkObj = $$(node, consts.id.CHECK, setting);
+				if (!srcNode) srcNode = node;
+
+				var hasDisable = false;
+				if (node[childKey]) {
+					for (var i = 0, l = node[childKey].length; i < l; i++) {
+						var sNode = node[childKey][i];
+						view.setSonNodeCheckBox(setting, sNode, value, srcNode);
+						if (sNode.chkDisabled === true) hasDisable = true;
+					}
 				}
-			}
 
-			if (node != data.getRoot(setting) && node.chkDisabled !== true) {
-				if (hasDisable && node.nocheck !== true) {
-					data.makeChkFlag(setting, node);
-				}
-				if (node.nocheck !== true && node.chkDisabled !== true) {
-					node[checkedKey] = value;
-					if (!hasDisable) node.check_Child_State = (node[childKey] && node[childKey].length > 0) ? (value ? 2 : 0) : -1;
-				} else {
-					node.check_Child_State = -1;
-				}
-				view.setChkClass(setting, checkObj, node);
-				if (setting.check.autoCheckTrigger && node != srcNode && node.nocheck !== true && node.chkDisabled !== true) {
-					setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+				if (node != data.getRoot(setting) && node.chkDisabled !== true) {
+					if (hasDisable && node.nocheck !== true) {
+						data.makeChkFlag(setting, node);
+					}
+					if (node.nocheck !== true && node.chkDisabled !== true) {
+						node[checkedKey] = value;
+						if (!hasDisable) node.check_Child_State = (node[childKey] && node[childKey].length > 0) ? (value ? 2 : 0) : -1;
+					} else {
+						node.check_Child_State = -1;
+					}
+					view.setChkClass(setting, checkObj, node);
+					if (setting.check.autoCheckTrigger && node != srcNode && node.nocheck !== true && node.chkDisabled !== true) {
+						setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+					}
 				}
-			}
 
-		}
-	},
+			}
+		},
 
-	_z = {
-		tools: _tools,
-		view: _view,
-		event: _event,
-		data: _data
-	};
+		_z = {
+			tools: _tools,
+			view: _view,
+			event: _event,
+			data: _data
+		};
 	$.extend(true, $.fn.zTree.consts, _consts);
 	$.extend(true, $.fn.zTree._z, _z);
 
 	var zt = $.fn.zTree,
-	tools = zt._z.tools,
-	consts = zt.consts,
-	view = zt._z.view,
-	data = zt._z.data,
-	event = zt._z.event,
-	$$ = tools.$;
+		tools = zt._z.tools,
+		consts = zt.consts,
+		view = zt._z.view,
+		data = zt._z.data,
+		event = zt._z.event,
+		$$ = tools.$;
 
 	data.exSetting(_setting);
 	data.addInitBind(_bindEvent);
@@ -2536,13 +2539,13 @@
 	data.addZTreeTools(_zTreeTools);
 
 	var _createNodes = view.createNodes;
-	view.createNodes = function(setting, level, nodes, parentNode, index) {
+	view.createNodes = function (setting, level, nodes, parentNode, index) {
 		if (_createNodes) _createNodes.apply(view, arguments);
 		if (!nodes) return;
 		view.repairParentChkClassWithSelf(setting, parentNode);
 	}
 	var _removeNode = view.removeNode;
-	view.removeNode = function(setting, node) {
+	view.removeNode = function (setting, node) {
 		var parentNode = node.getParentNode();
 		if (_removeNode) _removeNode.apply(view, arguments);
 		if (!node || !parentNode) return;
@@ -2551,7 +2554,7 @@
 	}
 
 	var _appendNodes = view.appendNodes;
-	view.appendNodes = function(setting, level, nodes, parentNode, index, initFlag, openFlag) {
+	view.appendNodes = function (setting, level, nodes, parentNode, index, initFlag, openFlag) {
 		var html = "";
 		if (_appendNodes) {
 			html = _appendNodes.apply(view, arguments);
@@ -2574,1115 +2577,1122 @@
  * email: hunter.z@263.net
  * Date: 2017-11-11
  */
-(function($){
+(function ($) {
 	//default consts of exedit
 	var _consts = {
-		event: {
-			DRAG: "ztree_drag",
-			DROP: "ztree_drop",
-			RENAME: "ztree_rename",
-			DRAGMOVE:"ztree_dragmove"
+			event: {
+				DRAG: "ztree_drag",
+				DROP: "ztree_drop",
+				RENAME: "ztree_rename",
+				DRAGMOVE: "ztree_dragmove"
+			},
+			id: {
+				EDIT: "_edit",
+				INPUT: "_input",
+				REMOVE: "_remove"
+			},
+			move: {
+				TYPE_INNER: "inner",
+				TYPE_PREV: "prev",
+				TYPE_NEXT: "next"
+			},
+			node: {
+				CURSELECTED_EDIT: "curSelectedNode_Edit",
+				TMPTARGET_TREE: "tmpTargetzTree",
+				TMPTARGET_NODE: "tmpTargetNode"
+			}
 		},
-		id: {
-			EDIT: "_edit",
-			INPUT: "_input",
-			REMOVE: "_remove"
+		//default setting of exedit
+		_setting = {
+			edit: {
+				enable: false,
+				editNameSelectAll: false,
+				showRemoveBtn: true,
+				showRenameBtn: true,
+				removeTitle: "remove",
+				renameTitle: "rename",
+				drag: {
+					autoExpandTrigger: false,
+					isCopy: true,
+					isMove: true,
+					prev: true,
+					next: true,
+					inner: true,
+					minMoveSize: 5,
+					borderMax: 10,
+					borderMin: -5,
+					maxShowNodeNum: 5,
+					autoOpenTime: 500
+				}
+			},
+			view: {
+				addHoverDom: null,
+				removeHoverDom: null
+			},
+			callback: {
+				beforeDrag: null,
+				beforeDragOpen: null,
+				beforeDrop: null,
+				beforeEditName: null,
+				beforeRename: null,
+				onDrag: null,
+				onDragMove: null,
+				onDrop: null,
+				onRename: null
+			}
 		},
-		move: {
-			TYPE_INNER: "inner",
-			TYPE_PREV: "prev",
-			TYPE_NEXT: "next"
+		//default root of exedit
+		_initRoot = function (setting) {
+			var r = data.getRoot(setting), rs = data.getRoots();
+			r.curEditNode = null;
+			r.curEditInput = null;
+			r.curHoverNode = null;
+			r.dragFlag = 0;
+			r.dragNodeShowBefore = [];
+			r.dragMaskList = new Array();
+			rs.showHoverDom = true;
 		},
-		node: {
-			CURSELECTED_EDIT: "curSelectedNode_Edit",
-			TMPTARGET_TREE: "tmpTargetzTree",
-			TMPTARGET_NODE: "tmpTargetNode"
-		}
-	},
-	//default setting of exedit
-	_setting = {
-		edit: {
-			enable: false,
-			editNameSelectAll: false,
-			showRemoveBtn: true,
-			showRenameBtn: true,
-			removeTitle: "remove",
-			renameTitle: "rename",
-			drag: {
-				autoExpandTrigger: false,
-				isCopy: true,
-				isMove: true,
-				prev: true,
-				next: true,
-				inner: true,
-				minMoveSize: 5,
-				borderMax: 10,
-				borderMin: -5,
-				maxShowNodeNum: 5,
-				autoOpenTime: 500
-			}
+		//default cache of exedit
+		_initCache = function (treeId) {
+		},
+		//default bind event of exedit
+		_bindEvent = function (setting) {
+			var o = setting.treeObj;
+			var c = consts.event;
+			o.bind(c.RENAME, function (event, treeId, treeNode, isCancel) {
+				tools.apply(setting.callback.onRename, [event, treeId, treeNode, isCancel]);
+			});
+
+			o.bind(c.DRAG, function (event, srcEvent, treeId, treeNodes) {
+				tools.apply(setting.callback.onDrag, [srcEvent, treeId, treeNodes]);
+			});
+
+			o.bind(c.DRAGMOVE, function (event, srcEvent, treeId, treeNodes) {
+				tools.apply(setting.callback.onDragMove, [srcEvent, treeId, treeNodes]);
+			});
+
+			o.bind(c.DROP, function (event, srcEvent, treeId, treeNodes, targetNode, moveType, isCopy) {
+				tools.apply(setting.callback.onDrop, [srcEvent, treeId, treeNodes, targetNode, moveType, isCopy]);
+			});
 		},
-		view: {
-			addHoverDom: null,
-			removeHoverDom: null
+		_unbindEvent = function (setting) {
+			var o = setting.treeObj;
+			var c = consts.event;
+			o.unbind(c.RENAME);
+			o.unbind(c.DRAG);
+			o.unbind(c.DRAGMOVE);
+			o.unbind(c.DROP);
 		},
-		callback: {
-			beforeDrag:null,
-			beforeDragOpen:null,
-			beforeDrop:null,
-			beforeEditName:null,
-			beforeRename:null,
-			onDrag:null,
-			onDragMove:null,
-			onDrop:null,
-			onRename:null
-		}
-	},
-	//default root of exedit
-	_initRoot = function (setting) {
-		var r = data.getRoot(setting), rs = data.getRoots();
-		r.curEditNode = null;
-		r.curEditInput = null;
-		r.curHoverNode = null;
-		r.dragFlag = 0;
-		r.dragNodeShowBefore = [];
-		r.dragMaskList = new Array();
-		rs.showHoverDom = true;
-	},
-	//default cache of exedit
-	_initCache = function(treeId) {},
-	//default bind event of exedit
-	_bindEvent = function(setting) {
-		var o = setting.treeObj;
-		var c = consts.event;
-		o.bind(c.RENAME, function (event, treeId, treeNode, isCancel) {
-			tools.apply(setting.callback.onRename, [event, treeId, treeNode, isCancel]);
-		});
-
-		o.bind(c.DRAG, function (event, srcEvent, treeId, treeNodes) {
-			tools.apply(setting.callback.onDrag, [srcEvent, treeId, treeNodes]);
-		});
-
-		o.bind(c.DRAGMOVE,function(event, srcEvent, treeId, treeNodes){
-			tools.apply(setting.callback.onDragMove,[srcEvent, treeId, treeNodes]);
-		});
-
-		o.bind(c.DROP, function (event, srcEvent, treeId, treeNodes, targetNode, moveType, isCopy) {
-			tools.apply(setting.callback.onDrop, [srcEvent, treeId, treeNodes, targetNode, moveType, isCopy]);
-		});
-	},
-	_unbindEvent = function(setting) {
-		var o = setting.treeObj;
-		var c = consts.event;
-		o.unbind(c.RENAME);
-		o.unbind(c.DRAG);
-		o.unbind(c.DRAGMOVE);
-		o.unbind(c.DROP);
-	},
-	//default event proxy of exedit
-	_eventProxy = function(e) {
-		var target = e.target,
-		setting = data.getSetting(e.data.treeId),
-		relatedTarget = e.relatedTarget,
-		tId = "", node = null,
-		nodeEventType = "", treeEventType = "",
-		nodeEventCallback = null, treeEventCallback = null,
-		tmp = null;
-
-		if (tools.eqs(e.type, "mouseover")) {
-			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
-			if (tmp) {
-				tId = tools.getNodeMainDom(tmp).id;
-				nodeEventType = "hoverOverNode";
-			}
-		} else if (tools.eqs(e.type, "mouseout")) {
-			tmp = tools.getMDom(setting, relatedTarget, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
-			if (!tmp) {
-				tId = "remove";
-				nodeEventType = "hoverOutNode";
-			}
-		} else if (tools.eqs(e.type, "mousedown")) {
-			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
-			if (tmp) {
-				tId = tools.getNodeMainDom(tmp).id;
-				nodeEventType = "mousedownNode";
-			}
-		}
-		if (tId.length>0) {
-			node = data.getNodeCache(setting, tId);
-			switch (nodeEventType) {
-				case "mousedownNode" :
-					nodeEventCallback = _handler.onMousedownNode;
-					break;
-				case "hoverOverNode" :
-					nodeEventCallback = _handler.onHoverOverNode;
-					break;
-				case "hoverOutNode" :
-					nodeEventCallback = _handler.onHoverOutNode;
-					break;
+		//default event proxy of exedit
+		_eventProxy = function (e) {
+			var target = e.target,
+				setting = data.getSetting(e.data.treeId),
+				relatedTarget = e.relatedTarget,
+				tId = "", node = null,
+				nodeEventType = "", treeEventType = "",
+				nodeEventCallback = null, treeEventCallback = null,
+				tmp = null;
+
+			if (tools.eqs(e.type, "mouseover")) {
+				tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+				if (tmp) {
+					tId = tools.getNodeMainDom(tmp).id;
+					nodeEventType = "hoverOverNode";
+				}
+			} else if (tools.eqs(e.type, "mouseout")) {
+				tmp = tools.getMDom(setting, relatedTarget, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+				if (!tmp) {
+					tId = "remove";
+					nodeEventType = "hoverOutNode";
+				}
+			} else if (tools.eqs(e.type, "mousedown")) {
+				tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+				if (tmp) {
+					tId = tools.getNodeMainDom(tmp).id;
+					nodeEventType = "mousedownNode";
+				}
 			}
-		}
-		var proxyResult = {
-			stop: false,
-			node: node,
-			nodeEventType: nodeEventType,
-			nodeEventCallback: nodeEventCallback,
-			treeEventType: treeEventType,
-			treeEventCallback: treeEventCallback
-		};
-		return proxyResult
-	},
-	//default init node of exedit
-	_initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
-		if (!n) return;
-		n.isHover = false;
-		n.editNameFlag = false;
-	},
-	//update zTreeObj, add method of edit
-	_zTreeTools = function(setting, zTreeTools) {
-		zTreeTools.cancelEditName = function(newName) {
-			var root = data.getRoot(this.setting);
-			if (!root.curEditNode) return;
-			view.cancelCurEditNode(this.setting, newName?newName:null, true);
-		}
-		zTreeTools.copyNode = function(targetNode, node, moveType, isSilent) {
-			if (!node) return null;
-			if (targetNode && !targetNode.isParent && this.setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) return null;
-			var _this = this,
-				newNode = tools.clone(node);
-			if (!targetNode) {
-				targetNode = null;
-				moveType = consts.move.TYPE_INNER;
+			if (tId.length > 0) {
+				node = data.getNodeCache(setting, tId);
+				switch (nodeEventType) {
+					case "mousedownNode" :
+						nodeEventCallback = _handler.onMousedownNode;
+						break;
+					case "hoverOverNode" :
+						nodeEventCallback = _handler.onHoverOverNode;
+						break;
+					case "hoverOutNode" :
+						nodeEventCallback = _handler.onHoverOutNode;
+						break;
+				}
 			}
-			if (moveType == consts.move.TYPE_INNER) {
-				function copyCallback() {
-					view.addNodes(_this.setting, targetNode, -1, [newNode], isSilent);
+			var proxyResult = {
+				stop: false,
+				node: node,
+				nodeEventType: nodeEventType,
+				nodeEventCallback: nodeEventCallback,
+				treeEventType: treeEventType,
+				treeEventCallback: treeEventCallback
+			};
+			return proxyResult
+		},
+		//default init node of exedit
+		_initNode = function (setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+			if (!n) return;
+			n.isHover = false;
+			n.editNameFlag = false;
+		},
+		//update zTreeObj, add method of edit
+		_zTreeTools = function (setting, zTreeTools) {
+			zTreeTools.cancelEditName = function (newName) {
+				var root = data.getRoot(this.setting);
+				if (!root.curEditNode) return;
+				view.cancelCurEditNode(this.setting, newName ? newName : null, true);
+			}
+			zTreeTools.copyNode = function (targetNode, node, moveType, isSilent) {
+				if (!node) return null;
+				if (targetNode && !targetNode.isParent && this.setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) return null;
+				var _this = this,
+					newNode = tools.clone(node);
+				if (!targetNode) {
+					targetNode = null;
+					moveType = consts.move.TYPE_INNER;
 				}
+				if (moveType == consts.move.TYPE_INNER) {
+					function copyCallback() {
+						view.addNodes(_this.setting, targetNode, -1, [newNode], isSilent);
+					}
 
-				if (tools.canAsync(this.setting, targetNode)) {
-					view.asyncNode(this.setting, targetNode, isSilent, copyCallback);
+					if (tools.canAsync(this.setting, targetNode)) {
+						view.asyncNode(this.setting, targetNode, isSilent, copyCallback);
+					} else {
+						copyCallback();
+					}
 				} else {
-					copyCallback();
+					view.addNodes(this.setting, targetNode.parentNode, -1, [newNode], isSilent);
+					view.moveNode(this.setting, targetNode, newNode, moveType, false, isSilent);
 				}
-			} else {
-				view.addNodes(this.setting, targetNode.parentNode, -1, [newNode], isSilent);
-				view.moveNode(this.setting, targetNode, newNode, moveType, false, isSilent);
-			}
-			return newNode;
-		}
-		zTreeTools.editName = function(node) {
-			if (!node || !node.tId || node !== data.getNodeCache(this.setting, node.tId)) return;
-			if (node.parentTId) view.expandCollapseParentNode(this.setting, node.getParentNode(), true);
-			view.editNode(this.setting, node)
-		}
-		zTreeTools.moveNode = function(targetNode, node, moveType, isSilent) {
-			if (!node) return node;
-			if (targetNode && !targetNode.isParent && this.setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) {
-				return null;
-			} else if (targetNode && ((node.parentTId == targetNode.tId && moveType == consts.move.TYPE_INNER) || $$(node, this.setting).find("#" + targetNode.tId).length > 0)) {
-				return null;
-			} else if (!targetNode) {
-				targetNode = null;
-			}
-			var _this = this;
-			function moveCallback() {
-				view.moveNode(_this.setting, targetNode, node, moveType, false, isSilent);
-			}
-			if (tools.canAsync(this.setting, targetNode) && moveType === consts.move.TYPE_INNER) {
-				view.asyncNode(this.setting, targetNode, isSilent, moveCallback);
-			} else {
-				moveCallback();
-			}
-			return node;
-		}
-		zTreeTools.setEditable = function(editable) {
-			this.setting.edit.enable = editable;
-			return this.refresh();
-		}
-	},
-	//method of operate data
-	_data = {
-		setSonNodeLevel: function(setting, parentNode, node) {
-			if (!node) return;
-			var childKey = setting.data.key.children;
-			node.level = (parentNode)? parentNode.level + 1 : 0;
-			if (!node[childKey]) return;
-			for (var i = 0, l = node[childKey].length; i < l; i++) {
-				if (node[childKey][i]) data.setSonNodeLevel(setting, node, node[childKey][i]);
+				return newNode;
+			}
+			zTreeTools.editName = function (node) {
+				if (!node || !node.tId || node !== data.getNodeCache(this.setting, node.tId)) return;
+				if (node.parentTId) view.expandCollapseParentNode(this.setting, node.getParentNode(), true);
+				view.editNode(this.setting, node)
+			}
+			zTreeTools.moveNode = function (targetNode, node, moveType, isSilent) {
+				if (!node) return node;
+				if (targetNode && !targetNode.isParent && this.setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) {
+					return null;
+				} else if (targetNode && ((node.parentTId == targetNode.tId && moveType == consts.move.TYPE_INNER) || $$(node, this.setting).find("#" + targetNode.tId).length > 0)) {
+					return null;
+				} else if (!targetNode) {
+					targetNode = null;
+				}
+				var _this = this;
+
+				function moveCallback() {
+					view.moveNode(_this.setting, targetNode, node, moveType, false, isSilent);
+				}
+
+				if (tools.canAsync(this.setting, targetNode) && moveType === consts.move.TYPE_INNER) {
+					view.asyncNode(this.setting, targetNode, isSilent, moveCallback);
+				} else {
+					moveCallback();
+				}
+				return node;
 			}
-		}
-	},
-	//method of event proxy
-	_event = {
-
-	},
-	//method of event handler
-	_handler = {
-		onHoverOverNode: function(event, node) {
-			var setting = data.getSetting(event.data.treeId),
-			root = data.getRoot(setting);
-			if (root.curHoverNode != node) {
-				_handler.onHoverOutNode(event);
+			zTreeTools.setEditable = function (editable) {
+				this.setting.edit.enable = editable;
+				return this.refresh();
 			}
-			root.curHoverNode = node;
-			view.addHoverDom(setting, node);
 		},
-		onHoverOutNode: function(event, node) {
-			var setting = data.getSetting(event.data.treeId),
-			root = data.getRoot(setting);
-			if (root.curHoverNode && !data.isSelectedNode(setting, root.curHoverNode)) {
-				view.removeTreeDom(setting, root.curHoverNode);
-				root.curHoverNode = null;
+		//method of operate data
+		_data = {
+			setSonNodeLevel: function (setting, parentNode, node) {
+				if (!node) return;
+				var childKey = setting.data.key.children;
+				node.level = (parentNode) ? parentNode.level + 1 : 0;
+				if (!node[childKey]) return;
+				for (var i = 0, l = node[childKey].length; i < l; i++) {
+					if (node[childKey][i]) data.setSonNodeLevel(setting, node, node[childKey][i]);
+				}
 			}
 		},
-		onMousedownNode: function(eventMouseDown, _node) {
-			var i,l,
-			setting = data.getSetting(eventMouseDown.data.treeId),
-			root = data.getRoot(setting), roots = data.getRoots();
-			//right click can't drag & drop
-			if (eventMouseDown.button == 2 || !setting.edit.enable || (!setting.edit.drag.isCopy && !setting.edit.drag.isMove)) return true;
-
-			//input of edit node name can't drag & drop
-			var target = eventMouseDown.target,
-			_nodes = data.getRoot(setting).curSelectedList,
-			nodes = [];
-			if (!data.isSelectedNode(setting, _node)) {
-				nodes = [_node];
-			} else {
-				for (i=0, l=_nodes.length; i<l; i++) {
-					if (_nodes[i].editNameFlag && tools.eqs(target.tagName, "input") && target.getAttribute("treeNode"+consts.id.INPUT) !== null) {
-						return true;
-					}
-					nodes.push(_nodes[i]);
-					if (nodes[0].parentTId !== _nodes[i].parentTId) {
-						nodes = [_node];
-						break;
+		//method of event proxy
+		_event = {},
+		//method of event handler
+		_handler = {
+			onHoverOverNode: function (event, node) {
+				var setting = data.getSetting(event.data.treeId),
+					root = data.getRoot(setting);
+				if (root.curHoverNode != node) {
+					_handler.onHoverOutNode(event);
+				}
+				root.curHoverNode = node;
+				view.addHoverDom(setting, node);
+			},
+			onHoverOutNode: function (event, node) {
+				var setting = data.getSetting(event.data.treeId),
+					root = data.getRoot(setting);
+				if (root.curHoverNode && !data.isSelectedNode(setting, root.curHoverNode)) {
+					view.removeTreeDom(setting, root.curHoverNode);
+					root.curHoverNode = null;
+				}
+			},
+			onMousedownNode: function (eventMouseDown, _node) {
+				var i, l,
+					setting = data.getSetting(eventMouseDown.data.treeId),
+					root = data.getRoot(setting), roots = data.getRoots();
+				//right click can't drag & drop
+				if (eventMouseDown.button == 2 || !setting.edit.enable || (!setting.edit.drag.isCopy && !setting.edit.drag.isMove)) return true;
+
+				//input of edit node name can't drag & drop
+				var target = eventMouseDown.target,
+					_nodes = data.getRoot(setting).curSelectedList,
+					nodes = [];
+				if (!data.isSelectedNode(setting, _node)) {
+					nodes = [_node];
+				} else {
+					for (i = 0, l = _nodes.length; i < l; i++) {
+						if (_nodes[i].editNameFlag && tools.eqs(target.tagName, "input") && target.getAttribute("treeNode" + consts.id.INPUT) !== null) {
+							return true;
+						}
+						nodes.push(_nodes[i]);
+						if (nodes[0].parentTId !== _nodes[i].parentTId) {
+							nodes = [_node];
+							break;
+						}
 					}
 				}
-			}
 
-			view.editNodeBlur = true;
-			view.cancelCurEditNode(setting);
-
-			var doc = $(setting.treeObj.get(0).ownerDocument),
-			body = $(setting.treeObj.get(0).ownerDocument.body), curNode, tmpArrow, tmpTarget,
-			isOtherTree = false,
-			targetSetting = setting,
-			sourceSetting = setting,
-			preNode, nextNode,
-			preTmpTargetNodeId = null,
-			preTmpMoveType = null,
-			tmpTargetNodeId = null,
-			moveType = consts.move.TYPE_INNER,
-			mouseDownX = eventMouseDown.clientX,
-			mouseDownY = eventMouseDown.clientY,
-			startTime = (new Date()).getTime();
-
-			if (tools.uCanDo(setting)) {
-				doc.bind("mousemove", _docMouseMove);
-			}
-			function _docMouseMove(event) {
-				//avoid start drag after click node
-				if (root.dragFlag == 0 && Math.abs(mouseDownX - event.clientX) < setting.edit.drag.minMoveSize
-					&& Math.abs(mouseDownY - event.clientY) < setting.edit.drag.minMoveSize) {
-					return true;
+				view.editNodeBlur = true;
+				view.cancelCurEditNode(setting);
+
+				var doc = $(setting.treeObj.get(0).ownerDocument),
+					body = $(setting.treeObj.get(0).ownerDocument.body), curNode, tmpArrow, tmpTarget,
+					isOtherTree = false,
+					targetSetting = setting,
+					sourceSetting = setting,
+					preNode, nextNode,
+					preTmpTargetNodeId = null,
+					preTmpMoveType = null,
+					tmpTargetNodeId = null,
+					moveType = consts.move.TYPE_INNER,
+					mouseDownX = eventMouseDown.clientX,
+					mouseDownY = eventMouseDown.clientY,
+					startTime = (new Date()).getTime();
+
+				if (tools.uCanDo(setting)) {
+					doc.bind("mousemove", _docMouseMove);
 				}
-				var i, l, tmpNode, tmpDom, tmpNodes,
-				childKey = setting.data.key.children;
-				body.css("cursor", "pointer");
 
-				if (root.dragFlag == 0) {
-					if (tools.apply(setting.callback.beforeDrag, [setting.treeId, nodes], true) == false) {
-						_docMouseUp(event);
+				function _docMouseMove(event) {
+					//avoid start drag after click node
+					if (root.dragFlag == 0 && Math.abs(mouseDownX - event.clientX) < setting.edit.drag.minMoveSize
+						&& Math.abs(mouseDownY - event.clientY) < setting.edit.drag.minMoveSize) {
 						return true;
 					}
-
-					for (i=0, l=nodes.length; i<l; i++) {
-						if (i==0) {
-							root.dragNodeShowBefore = [];
+					var i, l, tmpNode, tmpDom, tmpNodes,
+						childKey = setting.data.key.children;
+					body.css("cursor", "pointer");
+
+					if (root.dragFlag == 0) {
+						if (tools.apply(setting.callback.beforeDrag, [setting.treeId, nodes], true) == false) {
+							_docMouseUp(event);
+							return true;
 						}
-						tmpNode = nodes[i];
-						if (tmpNode.isParent && tmpNode.open) {
-							view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
-							root.dragNodeShowBefore[tmpNode.tId] = true;
-						} else {
-							root.dragNodeShowBefore[tmpNode.tId] = false;
-						}
-					}
-
-					root.dragFlag = 1;
-					roots.showHoverDom = false;
-					tools.showIfameMask(setting, true);
 
-					//sort
-					var isOrder = true, lastIndex = -1;
-					if (nodes.length>1) {
-						var pNodes = nodes[0].parentTId ? nodes[0].getParentNode()[childKey] : data.getNodes(setting);
-						tmpNodes = [];
-						for (i=0, l=pNodes.length; i<l; i++) {
-							if (root.dragNodeShowBefore[pNodes[i].tId] !== undefined) {
-								if (isOrder && lastIndex > -1 && (lastIndex+1) !== i) {
-									isOrder = false;
-								}
-								tmpNodes.push(pNodes[i]);
-								lastIndex = i;
+						for (i = 0, l = nodes.length; i < l; i++) {
+							if (i == 0) {
+								root.dragNodeShowBefore = [];
 							}
-							if (nodes.length === tmpNodes.length) {
-								nodes = tmpNodes;
-								break;
+							tmpNode = nodes[i];
+							if (tmpNode.isParent && tmpNode.open) {
+								view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
+								root.dragNodeShowBefore[tmpNode.tId] = true;
+							} else {
+								root.dragNodeShowBefore[tmpNode.tId] = false;
 							}
 						}
-					}
-					if (isOrder) {
-						preNode = nodes[0].getPreNode();
-						nextNode = nodes[nodes.length-1].getNextNode();
-					}
 
-					//set node in selected
-					curNode = $$("<ul class='zTreeDragUL'></ul>", setting);
-					for (i=0, l=nodes.length; i<l; i++) {
-						tmpNode = nodes[i];
-						tmpNode.editNameFlag = false;
-						view.selectNode(setting, tmpNode, i>0);
-						view.removeTreeDom(setting, tmpNode);
-
-						if (i > setting.edit.drag.maxShowNodeNum-1) {
-							continue;
+						root.dragFlag = 1;
+						roots.showHoverDom = false;
+						tools.showIfameMask(setting, true);
+
+						//sort
+						var isOrder = true, lastIndex = -1;
+						if (nodes.length > 1) {
+							var pNodes = nodes[0].parentTId ? nodes[0].getParentNode()[childKey] : data.getNodes(setting);
+							tmpNodes = [];
+							for (i = 0, l = pNodes.length; i < l; i++) {
+								if (root.dragNodeShowBefore[pNodes[i].tId] !== undefined) {
+									if (isOrder && lastIndex > -1 && (lastIndex + 1) !== i) {
+										isOrder = false;
+									}
+									tmpNodes.push(pNodes[i]);
+									lastIndex = i;
+								}
+								if (nodes.length === tmpNodes.length) {
+									nodes = tmpNodes;
+									break;
+								}
+							}
 						}
-
-						tmpDom = $$("<li id='"+ tmpNode.tId +"_tmp'></li>", setting);
-						tmpDom.append($$(tmpNode, consts.id.A, setting).clone());
-						tmpDom.css("padding", "0");
-						tmpDom.children("#" + tmpNode.tId + consts.id.A).removeClass(consts.node.CURSELECTED);
-						curNode.append(tmpDom);
-						if (i == setting.edit.drag.maxShowNodeNum-1) {
-							tmpDom = $$("<li id='"+ tmpNode.tId +"_moretmp'><a>  ...  </a></li>", setting);
-							curNode.append(tmpDom);
+						if (isOrder) {
+							preNode = nodes[0].getPreNode();
+							nextNode = nodes[nodes.length - 1].getNextNode();
 						}
-					}
-					curNode.attr("id", nodes[0].tId + consts.id.UL + "_tmp");
-					curNode.addClass(setting.treeObj.attr("class"));
-					curNode.appendTo(body);
 
-					tmpArrow = $$("<span class='tmpzTreeMove_arrow'></span>", setting);
-					tmpArrow.attr("id", "zTreeMove_arrow_tmp");
-					tmpArrow.appendTo(body);
+						//set node in selected
+						curNode = $$("<ul class='zTreeDragUL'></ul>", setting);
+						for (i = 0, l = nodes.length; i < l; i++) {
+							tmpNode = nodes[i];
+							tmpNode.editNameFlag = false;
+							view.selectNode(setting, tmpNode, i > 0);
+							view.removeTreeDom(setting, tmpNode);
 
-					setting.treeObj.trigger(consts.event.DRAG, [event, setting.treeId, nodes]);
-				}
+							if (i > setting.edit.drag.maxShowNodeNum - 1) {
+								continue;
+							}
 
-				if (root.dragFlag == 1) {
-					if (tmpTarget && tmpArrow.attr("id") == event.target.id && tmpTargetNodeId && (event.clientX + doc.scrollLeft()+2) > ($("#" + tmpTargetNodeId + consts.id.A, tmpTarget).offset().left)) {
-						var xT = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget);
-						event.target = (xT.length > 0) ? xT.get(0) : event.target;
-					} else if (tmpTarget) {
-						tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
-						if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
-							.removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
-					}
-					tmpTarget = null;
-					tmpTargetNodeId = null;
-
-					//judge drag & drop in multi ztree
-					isOtherTree = false;
-					targetSetting = setting;
-					var settings = data.getSettings();
-					for (var s in settings) {
-						if (settings[s].treeId && settings[s].edit.enable && settings[s].treeId != setting.treeId
-							&& (event.target.id == settings[s].treeId || $(event.target).parents("#" + settings[s].treeId).length>0)) {
-							isOtherTree = true;
-							targetSetting = settings[s];
+							tmpDom = $$("<li id='" + tmpNode.tId + "_tmp'></li>", setting);
+							tmpDom.append($$(tmpNode, consts.id.A, setting).clone());
+							tmpDom.css("padding", "0");
+							tmpDom.children("#" + tmpNode.tId + consts.id.A).removeClass(consts.node.CURSELECTED);
+							curNode.append(tmpDom);
+							if (i == setting.edit.drag.maxShowNodeNum - 1) {
+								tmpDom = $$("<li id='" + tmpNode.tId + "_moretmp'><a>  ...  </a></li>", setting);
+								curNode.append(tmpDom);
+							}
 						}
-					}
+						curNode.attr("id", nodes[0].tId + consts.id.UL + "_tmp");
+						curNode.addClass(setting.treeObj.attr("class"));
+						curNode.appendTo(body);
 
-					var docScrollTop = doc.scrollTop(),
-					docScrollLeft = doc.scrollLeft(),
-					treeOffset = targetSetting.treeObj.offset(),
-					scrollHeight = targetSetting.treeObj.get(0).scrollHeight,
-					scrollWidth = targetSetting.treeObj.get(0).scrollWidth,
-					dTop = (event.clientY + docScrollTop - treeOffset.top),
-					dBottom = (targetSetting.treeObj.height() + treeOffset.top - event.clientY - docScrollTop),
-					dLeft = (event.clientX + docScrollLeft - treeOffset.left),
-					dRight = (targetSetting.treeObj.width() + treeOffset.left - event.clientX - docScrollLeft),
-					isTop = (dTop < setting.edit.drag.borderMax && dTop > setting.edit.drag.borderMin),
-					isBottom = (dBottom < setting.edit.drag.borderMax && dBottom > setting.edit.drag.borderMin),
-					isLeft = (dLeft < setting.edit.drag.borderMax && dLeft > setting.edit.drag.borderMin),
-					isRight = (dRight < setting.edit.drag.borderMax && dRight > setting.edit.drag.borderMin),
-					isTreeInner = dTop > setting.edit.drag.borderMin && dBottom > setting.edit.drag.borderMin && dLeft > setting.edit.drag.borderMin && dRight > setting.edit.drag.borderMin,
-					isTreeTop = (isTop && targetSetting.treeObj.scrollTop() <= 0),
-					isTreeBottom = (isBottom && (targetSetting.treeObj.scrollTop() + targetSetting.treeObj.height()+10) >= scrollHeight),
-					isTreeLeft = (isLeft && targetSetting.treeObj.scrollLeft() <= 0),
-					isTreeRight = (isRight && (targetSetting.treeObj.scrollLeft() + targetSetting.treeObj.width()+10) >= scrollWidth);
-
-					if (event.target && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
-						//get node <li> dom
-						var targetObj = event.target;
-						while (targetObj && targetObj.tagName && !tools.eqs(targetObj.tagName, "li") && targetObj.id != targetSetting.treeId) {
-							targetObj = targetObj.parentNode;
-						}
+						tmpArrow = $$("<span class='tmpzTreeMove_arrow'></span>", setting);
+						tmpArrow.attr("id", "zTreeMove_arrow_tmp");
+						tmpArrow.appendTo(body);
 
-						var canMove = true;
-						//don't move to self or children of self
-						for (i=0, l=nodes.length; i<l; i++) {
-							tmpNode = nodes[i];
-							if (targetObj.id === tmpNode.tId) {
-								canMove = false;
-								break;
-							} else if ($$(tmpNode, setting).find("#" + targetObj.id).length > 0) {
-								canMove = false;
-								break;
-							}
-						}
-						if (canMove && event.target && tools.isChildOrSelf(event.target, targetObj.id + consts.id.A)) {
-							tmpTarget = $(targetObj);
-							tmpTargetNodeId = targetObj.id;
-						}
+						setting.treeObj.trigger(consts.event.DRAG, [event, setting.treeId, nodes]);
 					}
 
-					//the mouse must be in zTree
-					tmpNode = nodes[0];
-					if (isTreeInner && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
-						//judge mouse move in root of ztree
-						if (!tmpTarget && (event.target.id == targetSetting.treeId || isTreeTop || isTreeBottom || isTreeLeft || isTreeRight) && (isOtherTree || (!isOtherTree && tmpNode.parentTId))) {
-							tmpTarget = targetSetting.treeObj;
-						}
-						//auto scroll top
-						if (isTop) {
-							targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop()-10);
-						} else if (isBottom)  {
-							targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop()+10);
-						}
-						if (isLeft) {
-							targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft()-10);
-						} else if (isRight) {
-							targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft()+10);
+					if (root.dragFlag == 1) {
+						if (tmpTarget && tmpArrow.attr("id") == event.target.id && tmpTargetNodeId && (event.clientX + doc.scrollLeft() + 2) > ($("#" + tmpTargetNodeId + consts.id.A, tmpTarget).offset().left)) {
+							var xT = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget);
+							event.target = (xT.length > 0) ? xT.get(0) : event.target;
+						} else if (tmpTarget) {
+							tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
+							if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
+								.removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
 						}
-						//auto scroll left
-						if (tmpTarget && tmpTarget != targetSetting.treeObj && tmpTarget.offset().left < targetSetting.treeObj.offset().left) {
-							targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft()+ tmpTarget.offset().left - targetSetting.treeObj.offset().left);
+						tmpTarget = null;
+						tmpTargetNodeId = null;
+
+						//judge drag & drop in multi ztree
+						isOtherTree = false;
+						targetSetting = setting;
+						var settings = data.getSettings();
+						for (var s in settings) {
+							if (settings[s].treeId && settings[s].edit.enable && settings[s].treeId != setting.treeId
+								&& (event.target.id == settings[s].treeId || $(event.target).parents("#" + settings[s].treeId).length > 0)) {
+								isOtherTree = true;
+								targetSetting = settings[s];
+							}
 						}
-					}
 
-					curNode.css({
-						"top": (event.clientY + docScrollTop + 3) + "px",
-						"left": (event.clientX + docScrollLeft + 3) + "px"
-					});
+						var docScrollTop = doc.scrollTop(),
+							docScrollLeft = doc.scrollLeft(),
+							treeOffset = targetSetting.treeObj.offset(),
+							scrollHeight = targetSetting.treeObj.get(0).scrollHeight,
+							scrollWidth = targetSetting.treeObj.get(0).scrollWidth,
+							dTop = (event.clientY + docScrollTop - treeOffset.top),
+							dBottom = (targetSetting.treeObj.height() + treeOffset.top - event.clientY - docScrollTop),
+							dLeft = (event.clientX + docScrollLeft - treeOffset.left),
+							dRight = (targetSetting.treeObj.width() + treeOffset.left - event.clientX - docScrollLeft),
+							isTop = (dTop < setting.edit.drag.borderMax && dTop > setting.edit.drag.borderMin),
+							isBottom = (dBottom < setting.edit.drag.borderMax && dBottom > setting.edit.drag.borderMin),
+							isLeft = (dLeft < setting.edit.drag.borderMax && dLeft > setting.edit.drag.borderMin),
+							isRight = (dRight < setting.edit.drag.borderMax && dRight > setting.edit.drag.borderMin),
+							isTreeInner = dTop > setting.edit.drag.borderMin && dBottom > setting.edit.drag.borderMin && dLeft > setting.edit.drag.borderMin && dRight > setting.edit.drag.borderMin,
+							isTreeTop = (isTop && targetSetting.treeObj.scrollTop() <= 0),
+							isTreeBottom = (isBottom && (targetSetting.treeObj.scrollTop() + targetSetting.treeObj.height() + 10) >= scrollHeight),
+							isTreeLeft = (isLeft && targetSetting.treeObj.scrollLeft() <= 0),
+							isTreeRight = (isRight && (targetSetting.treeObj.scrollLeft() + targetSetting.treeObj.width() + 10) >= scrollWidth);
+
+						if (event.target && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
+							//get node <li> dom
+							var targetObj = event.target;
+							while (targetObj && targetObj.tagName && !tools.eqs(targetObj.tagName, "li") && targetObj.id != targetSetting.treeId) {
+								targetObj = targetObj.parentNode;
+							}
 
-					var dX = 0;
-					var dY = 0;
-					if (tmpTarget && tmpTarget.attr("id")!=targetSetting.treeId) {
-						var tmpTargetNode = tmpTargetNodeId == null ? null: data.getNodeCache(targetSetting, tmpTargetNodeId),
-							isCopy = ((event.ctrlKey || event.metaKey) && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy),
-							isPrev = !!(preNode && tmpTargetNodeId === preNode.tId),
-							isNext = !!(nextNode && tmpTargetNodeId === nextNode.tId),
-							isInner = (tmpNode.parentTId && tmpNode.parentTId == tmpTargetNodeId),
-							canPrev = (isCopy || !isNext) && tools.apply(targetSetting.edit.drag.prev, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.prev),
-							canNext = (isCopy || !isPrev) && tools.apply(targetSetting.edit.drag.next, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.next),
-							canInner = (isCopy || !isInner) && !(targetSetting.data.keep.leaf && !tmpTargetNode.isParent) && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.inner);
-
-						function clearMove() {
-							tmpTarget = null;
-							tmpTargetNodeId = "";
-							moveType = consts.move.TYPE_INNER;
-							tmpArrow.css({
-								"display":"none"
-							});
-							if (window.zTreeMoveTimer) {
-								clearTimeout(window.zTreeMoveTimer);
-								window.zTreeMoveTargetNodeTId = null
+							var canMove = true;
+							//don't move to self or children of self
+							for (i = 0, l = nodes.length; i < l; i++) {
+								tmpNode = nodes[i];
+								if (targetObj.id === tmpNode.tId) {
+									canMove = false;
+									break;
+								} else if ($$(tmpNode, setting).find("#" + targetObj.id).length > 0) {
+									canMove = false;
+									break;
+								}
+							}
+							if (canMove && event.target && tools.isChildOrSelf(event.target, targetObj.id + consts.id.A)) {
+								tmpTarget = $(targetObj);
+								tmpTargetNodeId = targetObj.id;
 							}
 						}
-						if (!canPrev && !canNext && !canInner) {
-							clearMove();
-						} else {
-							var tmpTargetA = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget),
-								tmpNextA = tmpTargetNode.isLastNode ? null : $("#" + tmpTargetNode.getNextNode().tId + consts.id.A, tmpTarget.next()),
-								tmpTop = tmpTargetA.offset().top,
-								tmpLeft = tmpTargetA.offset().left,
-								prevPercent = canPrev ? (canInner ? 0.25 : (canNext ? 0.5 : 1) ) : -1,
-								nextPercent = canNext ? (canInner ? 0.75 : (canPrev ? 0.5 : 0) ) : -1,
-								dY_percent = (event.clientY + docScrollTop - tmpTop)/tmpTargetA.height();
-
-							if ((prevPercent==1 || dY_percent<=prevPercent && dY_percent>=-.2) && canPrev) {
-								dX = 1 - tmpArrow.width();
-								dY = tmpTop - tmpArrow.height()/2;
-								moveType = consts.move.TYPE_PREV;
-							} else if ((nextPercent==0 || dY_percent>=nextPercent && dY_percent<=1.2) && canNext) {
-								dX = 1 - tmpArrow.width();
-								dY = (tmpNextA == null || (tmpTargetNode.isParent && tmpTargetNode.open)) ? (tmpTop + tmpTargetA.height() - tmpArrow.height()/2) : (tmpNextA.offset().top - tmpArrow.height()/2);
-								moveType = consts.move.TYPE_NEXT;
-							} else if (canInner) {
-								dX = 5 - tmpArrow.width();
-								dY = tmpTop;
-								moveType = consts.move.TYPE_INNER;
-							} else {
-								clearMove();
+
+						//the mouse must be in zTree
+						tmpNode = nodes[0];
+						if (isTreeInner && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
+							//judge mouse move in root of ztree
+							if (!tmpTarget && (event.target.id == targetSetting.treeId || isTreeTop || isTreeBottom || isTreeLeft || isTreeRight) && (isOtherTree || (!isOtherTree && tmpNode.parentTId))) {
+								tmpTarget = targetSetting.treeObj;
 							}
+							//auto scroll top
+							if (isTop) {
+								targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop() - 10);
+							} else if (isBottom) {
+								targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop() + 10);
+							}
+							if (isLeft) {
+								targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft() - 10);
+							} else if (isRight) {
+								targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft() + 10);
+							}
+							//auto scroll left
+							if (tmpTarget && tmpTarget != targetSetting.treeObj && tmpTarget.offset().left < targetSetting.treeObj.offset().left) {
+								targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft() + tmpTarget.offset().left - targetSetting.treeObj.offset().left);
+							}
+						}
 
-							if (tmpTarget) {
+						curNode.css({
+							"top": (event.clientY + docScrollTop + 3) + "px",
+							"left": (event.clientX + docScrollLeft + 3) + "px"
+						});
+
+						var dX = 0;
+						var dY = 0;
+						if (tmpTarget && tmpTarget.attr("id") != targetSetting.treeId) {
+							var tmpTargetNode = tmpTargetNodeId == null ? null : data.getNodeCache(targetSetting, tmpTargetNodeId),
+								isCopy = ((event.ctrlKey || event.metaKey) && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy),
+								isPrev = !!(preNode && tmpTargetNodeId === preNode.tId),
+								isNext = !!(nextNode && tmpTargetNodeId === nextNode.tId),
+								isInner = (tmpNode.parentTId && tmpNode.parentTId == tmpTargetNodeId),
+								canPrev = (isCopy || !isNext) && tools.apply(targetSetting.edit.drag.prev, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.prev),
+								canNext = (isCopy || !isPrev) && tools.apply(targetSetting.edit.drag.next, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.next),
+								canInner = (isCopy || !isInner) && !(targetSetting.data.keep.leaf && !tmpTargetNode.isParent) && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.inner);
+
+							function clearMove() {
+								tmpTarget = null;
+								tmpTargetNodeId = "";
+								moveType = consts.move.TYPE_INNER;
 								tmpArrow.css({
-									"display":"block",
-									"top": dY + "px",
-									"left": (tmpLeft + dX) + "px"
+									"display": "none"
 								});
-								tmpTargetA.addClass(consts.node.TMPTARGET_NODE + "_" + moveType);
+								if (window.zTreeMoveTimer) {
+									clearTimeout(window.zTreeMoveTimer);
+									window.zTreeMoveTargetNodeTId = null
+								}
+							}
 
-								if (preTmpTargetNodeId != tmpTargetNodeId || preTmpMoveType != moveType) {
-									startTime = (new Date()).getTime();
+							if (!canPrev && !canNext && !canInner) {
+								clearMove();
+							} else {
+								var tmpTargetA = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget),
+									tmpNextA = tmpTargetNode.isLastNode ? null : $("#" + tmpTargetNode.getNextNode().tId + consts.id.A, tmpTarget.next()),
+									tmpTop = tmpTargetA.offset().top,
+									tmpLeft = tmpTargetA.offset().left,
+									prevPercent = canPrev ? (canInner ? 0.25 : (canNext ? 0.5 : 1)) : -1,
+									nextPercent = canNext ? (canInner ? 0.75 : (canPrev ? 0.5 : 0)) : -1,
+									dY_percent = (event.clientY + docScrollTop - tmpTop) / tmpTargetA.height();
+
+								if ((prevPercent == 1 || dY_percent <= prevPercent && dY_percent >= -.2) && canPrev) {
+									dX = 1 - tmpArrow.width();
+									dY = tmpTop - tmpArrow.height() / 2;
+									moveType = consts.move.TYPE_PREV;
+								} else if ((nextPercent == 0 || dY_percent >= nextPercent && dY_percent <= 1.2) && canNext) {
+									dX = 1 - tmpArrow.width();
+									dY = (tmpNextA == null || (tmpTargetNode.isParent && tmpTargetNode.open)) ? (tmpTop + tmpTargetA.height() - tmpArrow.height() / 2) : (tmpNextA.offset().top - tmpArrow.height() / 2);
+									moveType = consts.move.TYPE_NEXT;
+								} else if (canInner) {
+									dX = 5 - tmpArrow.width();
+									dY = tmpTop;
+									moveType = consts.move.TYPE_INNER;
+								} else {
+									clearMove();
 								}
-								if (tmpTargetNode && tmpTargetNode.isParent && moveType == consts.move.TYPE_INNER) {
-									var startTimer = true;
-									if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId !== tmpTargetNode.tId) {
-										clearTimeout(window.zTreeMoveTimer);
-										window.zTreeMoveTargetNodeTId = null;
-									} else if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId === tmpTargetNode.tId) {
-										startTimer = false;
+
+								if (tmpTarget) {
+									tmpArrow.css({
+										"display": "block",
+										"top": dY + "px",
+										"left": (tmpLeft + dX) + "px"
+									});
+									tmpTargetA.addClass(consts.node.TMPTARGET_NODE + "_" + moveType);
+
+									if (preTmpTargetNodeId != tmpTargetNodeId || preTmpMoveType != moveType) {
+										startTime = (new Date()).getTime();
 									}
-									if (startTimer) {
-										window.zTreeMoveTimer = setTimeout(function() {
-											if (moveType != consts.move.TYPE_INNER) return;
-											if (tmpTargetNode && tmpTargetNode.isParent && !tmpTargetNode.open && (new Date()).getTime() - startTime > targetSetting.edit.drag.autoOpenTime
-												&& tools.apply(targetSetting.callback.beforeDragOpen, [targetSetting.treeId, tmpTargetNode], true)) {
-												view.switchNode(targetSetting, tmpTargetNode);
-												if (targetSetting.edit.drag.autoExpandTrigger) {
-													targetSetting.treeObj.trigger(consts.event.EXPAND, [targetSetting.treeId, tmpTargetNode]);
+									if (tmpTargetNode && tmpTargetNode.isParent && moveType == consts.move.TYPE_INNER) {
+										var startTimer = true;
+										if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId !== tmpTargetNode.tId) {
+											clearTimeout(window.zTreeMoveTimer);
+											window.zTreeMoveTargetNodeTId = null;
+										} else if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId === tmpTargetNode.tId) {
+											startTimer = false;
+										}
+										if (startTimer) {
+											window.zTreeMoveTimer = setTimeout(function () {
+												if (moveType != consts.move.TYPE_INNER) return;
+												if (tmpTargetNode && tmpTargetNode.isParent && !tmpTargetNode.open && (new Date()).getTime() - startTime > targetSetting.edit.drag.autoOpenTime
+													&& tools.apply(targetSetting.callback.beforeDragOpen, [targetSetting.treeId, tmpTargetNode], true)) {
+													view.switchNode(targetSetting, tmpTargetNode);
+													if (targetSetting.edit.drag.autoExpandTrigger) {
+														targetSetting.treeObj.trigger(consts.event.EXPAND, [targetSetting.treeId, tmpTargetNode]);
+													}
 												}
-											}
-										}, targetSetting.edit.drag.autoOpenTime+50);
-										window.zTreeMoveTargetNodeTId = tmpTargetNode.tId;
+											}, targetSetting.edit.drag.autoOpenTime + 50);
+											window.zTreeMoveTargetNodeTId = tmpTargetNode.tId;
+										}
 									}
 								}
 							}
-						}
-					} else {
-						moveType = consts.move.TYPE_INNER;
-						if (tmpTarget && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, null], !!targetSetting.edit.drag.inner)) {
-							tmpTarget.addClass(consts.node.TMPTARGET_TREE);
 						} else {
-							tmpTarget = null;
-						}
-						tmpArrow.css({
-							"display":"none"
-						});
-						if (window.zTreeMoveTimer) {
-							clearTimeout(window.zTreeMoveTimer);
-							window.zTreeMoveTargetNodeTId = null;
+							moveType = consts.move.TYPE_INNER;
+							if (tmpTarget && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, null], !!targetSetting.edit.drag.inner)) {
+								tmpTarget.addClass(consts.node.TMPTARGET_TREE);
+							} else {
+								tmpTarget = null;
+							}
+							tmpArrow.css({
+								"display": "none"
+							});
+							if (window.zTreeMoveTimer) {
+								clearTimeout(window.zTreeMoveTimer);
+								window.zTreeMoveTargetNodeTId = null;
+							}
 						}
-					}
-					preTmpTargetNodeId = tmpTargetNodeId;
-					preTmpMoveType = moveType;
+						preTmpTargetNodeId = tmpTargetNodeId;
+						preTmpMoveType = moveType;
 
-					setting.treeObj.trigger(consts.event.DRAGMOVE, [event, setting.treeId, nodes]);
+						setting.treeObj.trigger(consts.event.DRAGMOVE, [event, setting.treeId, nodes]);
+					}
+					return false;
 				}
-				return false;
-			}
 
-			doc.bind("mouseup", _docMouseUp);
-			function _docMouseUp(event) {
-				if (window.zTreeMoveTimer) {
-					clearTimeout(window.zTreeMoveTimer);
-					window.zTreeMoveTargetNodeTId = null;
-				}
-				preTmpTargetNodeId = null;
-				preTmpMoveType = null;
-				doc.unbind("mousemove", _docMouseMove);
-				doc.unbind("mouseup", _docMouseUp);
-				doc.unbind("selectstart", _docSelect);
-				body.css("cursor", "");
-				if (tmpTarget) {
-					tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
-					if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
+				doc.bind("mouseup", _docMouseUp);
+
+				function _docMouseUp(event) {
+					if (window.zTreeMoveTimer) {
+						clearTimeout(window.zTreeMoveTimer);
+						window.zTreeMoveTargetNodeTId = null;
+					}
+					preTmpTargetNodeId = null;
+					preTmpMoveType = null;
+					doc.unbind("mousemove", _docMouseMove);
+					doc.unbind("mouseup", _docMouseUp);
+					doc.unbind("selectstart", _docSelect);
+					body.css("cursor", "");
+					if (tmpTarget) {
+						tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
+						if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
 							.removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
-				}
-				tools.showIfameMask(setting, false);
+					}
+					tools.showIfameMask(setting, false);
 
-				roots.showHoverDom = true;
-				if (root.dragFlag == 0) return;
-				root.dragFlag = 0;
+					roots.showHoverDom = true;
+					if (root.dragFlag == 0) return;
+					root.dragFlag = 0;
 
-				var i, l, tmpNode;
-				for (i=0, l=nodes.length; i<l; i++) {
-					tmpNode = nodes[i];
-					if (tmpNode.isParent && root.dragNodeShowBefore[tmpNode.tId] && !tmpNode.open) {
-						view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
-						delete root.dragNodeShowBefore[tmpNode.tId];
+					var i, l, tmpNode;
+					for (i = 0, l = nodes.length; i < l; i++) {
+						tmpNode = nodes[i];
+						if (tmpNode.isParent && root.dragNodeShowBefore[tmpNode.tId] && !tmpNode.open) {
+							view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
+							delete root.dragNodeShowBefore[tmpNode.tId];
+						}
 					}
-				}
 
-				if (curNode) curNode.remove();
-				if (tmpArrow) tmpArrow.remove();
+					if (curNode) curNode.remove();
+					if (tmpArrow) tmpArrow.remove();
 
-				var isCopy = ((event.ctrlKey || event.metaKey) && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy);
-				if (!isCopy && tmpTarget && tmpTargetNodeId && nodes[0].parentTId && tmpTargetNodeId==nodes[0].parentTId && moveType == consts.move.TYPE_INNER) {
-					tmpTarget = null;
-				}
-				if (tmpTarget) {
-					var dragTargetNode = tmpTargetNodeId == null ? null: data.getNodeCache(targetSetting, tmpTargetNodeId);
-					if (tools.apply(setting.callback.beforeDrop, [targetSetting.treeId, nodes, dragTargetNode, moveType, isCopy], true) == false) {
-						view.selectNodes(sourceSetting, nodes);
-						return;
+					var isCopy = ((event.ctrlKey || event.metaKey) && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy);
+					if (!isCopy && tmpTarget && tmpTargetNodeId && nodes[0].parentTId && tmpTargetNodeId == nodes[0].parentTId && moveType == consts.move.TYPE_INNER) {
+						tmpTarget = null;
 					}
-					var newNodes = isCopy ? tools.clone(nodes) : nodes;
+					if (tmpTarget) {
+						var dragTargetNode = tmpTargetNodeId == null ? null : data.getNodeCache(targetSetting, tmpTargetNodeId);
+						if (tools.apply(setting.callback.beforeDrop, [targetSetting.treeId, nodes, dragTargetNode, moveType, isCopy], true) == false) {
+							view.selectNodes(sourceSetting, nodes);
+							return;
+						}
+						var newNodes = isCopy ? tools.clone(nodes) : nodes;
 
-					function dropCallback() {
-						if (isOtherTree) {
-							if (!isCopy) {
-								for(var i=0, l=nodes.length; i<l; i++) {
-									view.removeNode(setting, nodes[i]);
+						function dropCallback() {
+							if (isOtherTree) {
+								if (!isCopy) {
+									for (var i = 0, l = nodes.length; i < l; i++) {
+										view.removeNode(setting, nodes[i]);
+									}
+								}
+								if (moveType == consts.move.TYPE_INNER) {
+									view.addNodes(targetSetting, dragTargetNode, -1, newNodes);
+								} else {
+									view.addNodes(targetSetting, dragTargetNode.getParentNode(), moveType == consts.move.TYPE_PREV ? dragTargetNode.getIndex() : dragTargetNode.getIndex() + 1, newNodes);
 								}
-							}
-							if (moveType == consts.move.TYPE_INNER) {
-								view.addNodes(targetSetting, dragTargetNode, -1, newNodes);
-							} else {
-								view.addNodes(targetSetting, dragTargetNode.getParentNode(), moveType == consts.move.TYPE_PREV ? dragTargetNode.getIndex() : dragTargetNode.getIndex()+1, newNodes);
-							}
-						} else {
-							if (isCopy && moveType == consts.move.TYPE_INNER) {
-								view.addNodes(targetSetting, dragTargetNode, -1, newNodes);
-							} else if (isCopy) {
-								view.addNodes(targetSetting, dragTargetNode.getParentNode(), moveType == consts.move.TYPE_PREV ? dragTargetNode.getIndex() : dragTargetNode.getIndex()+1, newNodes);
 							} else {
-								if (moveType != consts.move.TYPE_NEXT) {
-									for (i=0, l=newNodes.length; i<l; i++) {
-										view.moveNode(targetSetting, dragTargetNode, newNodes[i], moveType, false);
-									}
+								if (isCopy && moveType == consts.move.TYPE_INNER) {
+									view.addNodes(targetSetting, dragTargetNode, -1, newNodes);
+								} else if (isCopy) {
+									view.addNodes(targetSetting, dragTargetNode.getParentNode(), moveType == consts.move.TYPE_PREV ? dragTargetNode.getIndex() : dragTargetNode.getIndex() + 1, newNodes);
 								} else {
-									for (i=-1, l=newNodes.length-1; i<l; l--) {
-										view.moveNode(targetSetting, dragTargetNode, newNodes[l], moveType, false);
+									if (moveType != consts.move.TYPE_NEXT) {
+										for (i = 0, l = newNodes.length; i < l; i++) {
+											view.moveNode(targetSetting, dragTargetNode, newNodes[i], moveType, false);
+										}
+									} else {
+										for (i = -1, l = newNodes.length - 1; i < l; l--) {
+											view.moveNode(targetSetting, dragTargetNode, newNodes[l], moveType, false);
+										}
 									}
 								}
 							}
-						}
-						view.selectNodes(targetSetting, newNodes);
+							view.selectNodes(targetSetting, newNodes);
 
-						var a = $$(newNodes[0], setting).get(0);
-						view.scrollIntoView(setting, a);
+							var a = $$(newNodes[0], setting).get(0);
+							view.scrollIntoView(setting, a);
 
-						setting.treeObj.trigger(consts.event.DROP, [event, targetSetting.treeId, newNodes, dragTargetNode, moveType, isCopy]);
-					}
+							setting.treeObj.trigger(consts.event.DROP, [event, targetSetting.treeId, newNodes, dragTargetNode, moveType, isCopy]);
+						}
+
+						if (moveType == consts.move.TYPE_INNER && tools.canAsync(targetSetting, dragTargetNode)) {
+							view.asyncNode(targetSetting, dragTargetNode, false, dropCallback);
+						} else {
+							dropCallback();
+						}
 
-					if (moveType == consts.move.TYPE_INNER && tools.canAsync(targetSetting, dragTargetNode)) {
-						view.asyncNode(targetSetting, dragTargetNode, false, dropCallback);
 					} else {
-						dropCallback();
+						view.selectNodes(sourceSetting, nodes);
+						setting.treeObj.trigger(consts.event.DROP, [event, setting.treeId, nodes, null, null, null]);
 					}
-
-				} else {
-					view.selectNodes(sourceSetting, nodes);
-					setting.treeObj.trigger(consts.event.DROP, [event, setting.treeId, nodes, null, null, null]);
 				}
-			}
 
-			doc.bind("selectstart", _docSelect);
-			function _docSelect() {
-				return false;
-			}
+				doc.bind("selectstart", _docSelect);
 
-			//Avoid FireFox's Bug
-			//If zTree Div CSS set 'overflow', so drag node outside of zTree, and event.target is error.
-			if(eventMouseDown.preventDefault) {
-				eventMouseDown.preventDefault();
-			}
-			return true;
-		}
-	},
-	//method of tools for zTree
-	_tools = {
-		getAbs: function (obj) {
-			var oRect = obj.getBoundingClientRect(),
-			scrollTop = document.body.scrollTop+document.documentElement.scrollTop,
-			scrollLeft = document.body.scrollLeft+document.documentElement.scrollLeft;
-			return [oRect.left+scrollLeft,oRect.top+scrollTop];
-		},
-		inputFocus: function(inputObj) {
-			if (inputObj.get(0)) {
-				inputObj.focus();
-				tools.setCursorPosition(inputObj.get(0), inputObj.val().length);
-			}
-		},
-		inputSelect: function(inputObj) {
-			if (inputObj.get(0)) {
-				inputObj.focus();
-				inputObj.select();
+				function _docSelect() {
+					return false;
+				}
+
+				//Avoid FireFox's Bug
+				//If zTree Div CSS set 'overflow', so drag node outside of zTree, and event.target is error.
+				if (eventMouseDown.preventDefault) {
+					eventMouseDown.preventDefault();
+				}
+				return true;
 			}
 		},
-		setCursorPosition: function(obj, pos){
-			if(obj.setSelectionRange) {
-				obj.focus();
-				obj.setSelectionRange(pos,pos);
-			} else if (obj.createTextRange) {
-				var range = obj.createTextRange();
-				range.collapse(true);
-				range.moveEnd('character', pos);
-				range.moveStart('character', pos);
-				range.select();
+		//method of tools for zTree
+		_tools = {
+			getAbs: function (obj) {
+				var oRect = obj.getBoundingClientRect(),
+					scrollTop = document.body.scrollTop + document.documentElement.scrollTop,
+					scrollLeft = document.body.scrollLeft + document.documentElement.scrollLeft;
+				return [oRect.left + scrollLeft, oRect.top + scrollTop];
+			},
+			inputFocus: function (inputObj) {
+				if (inputObj.get(0)) {
+					inputObj.focus();
+					tools.setCursorPosition(inputObj.get(0), inputObj.val().length);
+				}
+			},
+			inputSelect: function (inputObj) {
+				if (inputObj.get(0)) {
+					inputObj.focus();
+					inputObj.select();
+				}
+			},
+			setCursorPosition: function (obj, pos) {
+				if (obj.setSelectionRange) {
+					obj.focus();
+					obj.setSelectionRange(pos, pos);
+				} else if (obj.createTextRange) {
+					var range = obj.createTextRange();
+					range.collapse(true);
+					range.moveEnd('character', pos);
+					range.moveStart('character', pos);
+					range.select();
+				}
+			},
+			showIfameMask: function (setting, showSign) {
+				var root = data.getRoot(setting);
+				//clear full mask
+				while (root.dragMaskList.length > 0) {
+					root.dragMaskList[0].remove();
+					root.dragMaskList.shift();
+				}
+				if (showSign) {
+					//show mask
+					var iframeList = $$("iframe", setting);
+					for (var i = 0, l = iframeList.length; i < l; i++) {
+						var obj = iframeList.get(i),
+							r = tools.getAbs(obj),
+							dragMask = $$("<div id='zTreeMask_" + i + "' class='zTreeMask' style='top:" + r[1] + "px; left:" + r[0] + "px; width:" + obj.offsetWidth + "px; height:" + obj.offsetHeight + "px;'></div>", setting);
+						dragMask.appendTo($$("body", setting));
+						root.dragMaskList.push(dragMask);
+					}
+				}
 			}
 		},
-		showIfameMask: function(setting, showSign) {
-			var root = data.getRoot(setting);
-			//clear full mask
-			while (root.dragMaskList.length > 0) {
-				root.dragMaskList[0].remove();
-				root.dragMaskList.shift();
-			}
-			if (showSign) {
-				//show mask
-				var iframeList = $$("iframe", setting);
-				for (var i = 0, l = iframeList.length; i < l; i++) {
-					var obj = iframeList.get(i),
-					r = tools.getAbs(obj),
-					dragMask = $$("<div id='zTreeMask_" + i + "' class='zTreeMask' style='top:" + r[1] + "px; left:" + r[0] + "px; width:" + obj.offsetWidth + "px; height:" + obj.offsetHeight + "px;'></div>", setting);
-					dragMask.appendTo($$("body", setting));
-					root.dragMaskList.push(dragMask);
+		//method of operate ztree dom
+		_view = {
+			addEditBtn: function (setting, node) {
+				if (node.editNameFlag || $$(node, consts.id.EDIT, setting).length > 0) {
+					return;
 				}
-			}
-		}
-	},
-	//method of operate ztree dom
-	_view = {
-		addEditBtn: function(setting, node) {
-			if (node.editNameFlag || $$(node, consts.id.EDIT, setting).length > 0) {
-				return;
-			}
-			if (!tools.apply(setting.edit.showRenameBtn, [setting.treeId, node], setting.edit.showRenameBtn)) {
-				return;
-			}
-			var aObj = $$(node, consts.id.A, setting),
-			editStr = "<span class='" + consts.className.BUTTON + " edit' id='" + node.tId + consts.id.EDIT + "' title='"+tools.apply(setting.edit.renameTitle, [setting.treeId, node], setting.edit.renameTitle)+"' treeNode"+consts.id.EDIT+" style='display:none;'></span>";
-			aObj.append(editStr);
-
-			$$(node, consts.id.EDIT, setting).bind('click',
-				function() {
-					if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeEditName, [setting.treeId, node], true) == false) return false;
-					view.editNode(setting, node);
-					return false;
+				if (!tools.apply(setting.edit.showRenameBtn, [setting.treeId, node], setting.edit.showRenameBtn)) {
+					return;
 				}
+				var aObj = $$(node, consts.id.A, setting),
+					editStr = "<span class='" + consts.className.BUTTON + " edit' id='" + node.tId + consts.id.EDIT + "' title='" + tools.apply(setting.edit.renameTitle, [setting.treeId, node], setting.edit.renameTitle) + "' treeNode" + consts.id.EDIT + " style='display:none;'></span>";
+				aObj.append(editStr);
+
+				$$(node, consts.id.EDIT, setting).bind('click',
+					function () {
+						if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeEditName, [setting.treeId, node], true) == false) return false;
+						view.editNode(setting, node);
+						return false;
+					}
 				).show();
-		},
-		addRemoveBtn: function(setting, node) {
-			if (node.editNameFlag || $$(node, consts.id.REMOVE, setting).length > 0) {
-				return;
-			}
-			if (!tools.apply(setting.edit.showRemoveBtn, [setting.treeId, node], setting.edit.showRemoveBtn)) {
-				return;
-			}
-			var aObj = $$(node, consts.id.A, setting),
-			removeStr = "<span class='" + consts.className.BUTTON + " remove' id='" + node.tId + consts.id.REMOVE + "' title='"+tools.apply(setting.edit.removeTitle, [setting.treeId, node], setting.edit.removeTitle)+"' treeNode"+consts.id.REMOVE+" style='display:none;'></span>";
-			aObj.append(removeStr);
-
-			$$(node, consts.id.REMOVE, setting).bind('click',
-				function() {
-					if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return false;
-					view.removeNode(setting, node);
-					setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
-					return false;
+			},
+			addRemoveBtn: function (setting, node) {
+				if (node.editNameFlag || $$(node, consts.id.REMOVE, setting).length > 0) {
+					return;
 				}
-				).bind('mousedown',
-				function(eventMouseDown) {
-					return true;
+				if (!tools.apply(setting.edit.showRemoveBtn, [setting.treeId, node], setting.edit.showRemoveBtn)) {
+					return;
 				}
+				var aObj = $$(node, consts.id.A, setting),
+					removeStr = "<span class='" + consts.className.BUTTON + " remove' id='" + node.tId + consts.id.REMOVE + "' title='" + tools.apply(setting.edit.removeTitle, [setting.treeId, node], setting.edit.removeTitle) + "' treeNode" + consts.id.REMOVE + " style='display:none;'></span>";
+				aObj.append(removeStr);
+
+				$$(node, consts.id.REMOVE, setting).bind('click',
+					function () {
+						if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return false;
+						view.removeNode(setting, node);
+						setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
+						return false;
+					}
+				).bind('mousedown',
+					function (eventMouseDown) {
+						return true;
+					}
 				).show();
-		},
-		addHoverDom: function(setting, node) {
-			if (data.getRoots().showHoverDom) {
-				node.isHover = true;
-				if (setting.edit.enable) {
-					view.addEditBtn(setting, node);
-					view.addRemoveBtn(setting, node);
-				}
-				tools.apply(setting.view.addHoverDom, [setting.treeId, node]);
-			}
-		},
-		cancelCurEditNode: function (setting, forceName, isCancel) {
-			var root = data.getRoot(setting),
-			nameKey = setting.data.key.name,
-			node = root.curEditNode;
-
-			if (node) {
-				var inputObj = root.curEditInput,
-				newName = forceName ? forceName:(isCancel ? node[nameKey]: inputObj.val());
-				if (tools.apply(setting.callback.beforeRename, [setting.treeId, node, newName, isCancel], true) === false) {
-					return false;
+			},
+			addHoverDom: function (setting, node) {
+				if (data.getRoots().showHoverDom) {
+					node.isHover = true;
+					if (setting.edit.enable) {
+						view.addEditBtn(setting, node);
+						view.addRemoveBtn(setting, node);
+					}
+					tools.apply(setting.view.addHoverDom, [setting.treeId, node]);
+				}
+			},
+			cancelCurEditNode: function (setting, forceName, isCancel) {
+				var root = data.getRoot(setting),
+					nameKey = setting.data.key.name,
+					node = root.curEditNode;
+
+				if (node) {
+					var inputObj = root.curEditInput,
+						newName = forceName ? forceName : (isCancel ? node[nameKey] : inputObj.val());
+					if (tools.apply(setting.callback.beforeRename, [setting.treeId, node, newName, isCancel], true) === false) {
+						return false;
+					}
+					node[nameKey] = newName;
+					var aObj = $$(node, consts.id.A, setting);
+					aObj.removeClass(consts.node.CURSELECTED_EDIT);
+					inputObj.unbind();
+					view.setNodeName(setting, node);
+					node.editNameFlag = false;
+					root.curEditNode = null;
+					root.curEditInput = null;
+					view.selectNode(setting, node, false);
+					setting.treeObj.trigger(consts.event.RENAME, [setting.treeId, node, isCancel]);
+				}
+				root.noSelection = true;
+				return true;
+			},
+			editNode: function (setting, node) {
+				var root = data.getRoot(setting);
+				view.editNodeBlur = false;
+				if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
+					setTimeout(function () {
+						tools.inputFocus(root.curEditInput);
+					}, 0);
+					return;
 				}
-                node[nameKey] = newName;
-                var aObj = $$(node, consts.id.A, setting);
-				aObj.removeClass(consts.node.CURSELECTED_EDIT);
-				inputObj.unbind();
-				view.setNodeName(setting, node);
-				node.editNameFlag = false;
-				root.curEditNode = null;
-				root.curEditInput = null;
+				var nameKey = setting.data.key.name;
+				node.editNameFlag = true;
+				view.removeTreeDom(setting, node);
+				view.cancelCurEditNode(setting);
 				view.selectNode(setting, node, false);
-                setting.treeObj.trigger(consts.event.RENAME, [setting.treeId, node, isCancel]);
-			}
-			root.noSelection = true;
-			return true;
-		},
-		editNode: function(setting, node) {
-			var root = data.getRoot(setting);
-			view.editNodeBlur = false;
-			if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
-				setTimeout(function() {tools.inputFocus(root.curEditInput);}, 0);
-				return;
-			}
-			var nameKey = setting.data.key.name;
-			node.editNameFlag = true;
-			view.removeTreeDom(setting, node);
-			view.cancelCurEditNode(setting);
-			view.selectNode(setting, node, false);
-			$$(node, consts.id.SPAN, setting).html("<input type=text class='rename' id='" + node.tId + consts.id.INPUT + "' treeNode" + consts.id.INPUT + " >");
-			var inputObj = $$(node, consts.id.INPUT, setting);
-			inputObj.attr("value", node[nameKey]);
-			if (setting.edit.editNameSelectAll) {
-				tools.inputSelect(inputObj);
-			} else {
-				tools.inputFocus(inputObj);
-			}
-
-			inputObj.bind('blur', function(event) {
-				if (!view.editNodeBlur) {
-					view.cancelCurEditNode(setting);
+				$$(node, consts.id.SPAN, setting).html("<input type=text class='rename' id='" + node.tId + consts.id.INPUT + "' treeNode" + consts.id.INPUT + " >");
+				var inputObj = $$(node, consts.id.INPUT, setting);
+				inputObj.attr("value", node[nameKey]);
+				if (setting.edit.editNameSelectAll) {
+					tools.inputSelect(inputObj);
+				} else {
+					tools.inputFocus(inputObj);
 				}
-			}).bind('keydown', function(event) {
-				if (event.keyCode=="13") {
-					view.editNodeBlur = true;
-					view.cancelCurEditNode(setting);
-				} else if (event.keyCode=="27") {
-					view.cancelCurEditNode(setting, null, true);
+
+				inputObj.bind('blur', function (event) {
+					if (!view.editNodeBlur) {
+						view.cancelCurEditNode(setting);
+					}
+				}).bind('keydown', function (event) {
+					if (event.keyCode == "13") {
+						view.editNodeBlur = true;
+						view.cancelCurEditNode(setting);
+					} else if (event.keyCode == "27") {
+						view.cancelCurEditNode(setting, null, true);
+					}
+				}).bind('click', function (event) {
+					return false;
+				}).bind('dblclick', function (event) {
+					return false;
+				});
+
+				$$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED_EDIT);
+				root.curEditInput = inputObj;
+				root.noSelection = false;
+				root.curEditNode = node;
+			},
+			moveNode: function (setting, targetNode, node, moveType, animateFlag, isSilent) {
+				var root = data.getRoot(setting),
+					childKey = setting.data.key.children;
+				if (targetNode == node) return;
+				if (setting.data.keep.leaf && targetNode && !targetNode.isParent && moveType == consts.move.TYPE_INNER) return;
+				var oldParentNode = (node.parentTId ? node.getParentNode() : root),
+					targetNodeIsRoot = (targetNode === null || targetNode == root);
+				if (targetNodeIsRoot && targetNode === null) targetNode = root;
+				if (targetNodeIsRoot) moveType = consts.move.TYPE_INNER;
+				var targetParentNode = (targetNode.parentTId ? targetNode.getParentNode() : root);
+
+				if (moveType != consts.move.TYPE_PREV && moveType != consts.move.TYPE_NEXT) {
+					moveType = consts.move.TYPE_INNER;
 				}
-			}).bind('click', function(event) {
-				return false;
-			}).bind('dblclick', function(event) {
-				return false;
-			});
 
-			$$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED_EDIT);
-			root.curEditInput = inputObj;
-			root.noSelection = false;
-			root.curEditNode = node;
-		},
-		moveNode: function(setting, targetNode, node, moveType, animateFlag, isSilent) {
-			var root = data.getRoot(setting),
-			childKey = setting.data.key.children;
-			if (targetNode == node) return;
-			if (setting.data.keep.leaf && targetNode && !targetNode.isParent && moveType == consts.move.TYPE_INNER) return;
-			var oldParentNode = (node.parentTId ? node.getParentNode(): root),
-			targetNodeIsRoot = (targetNode === null || targetNode == root);
-			if (targetNodeIsRoot && targetNode === null) targetNode = root;
-			if (targetNodeIsRoot) moveType = consts.move.TYPE_INNER;
-			var targetParentNode = (targetNode.parentTId ? targetNode.getParentNode() : root);
-
-			if (moveType != consts.move.TYPE_PREV && moveType != consts.move.TYPE_NEXT) {
-				moveType = consts.move.TYPE_INNER;
-			}
+				if (moveType == consts.move.TYPE_INNER) {
+					if (targetNodeIsRoot) {
+						//parentTId of root node is null
+						node.parentTId = null;
+					} else {
+						if (!targetNode.isParent) {
+							targetNode.isParent = true;
+							targetNode.open = !!targetNode.open;
+							view.setNodeLineIcos(setting, targetNode);
+						}
+						node.parentTId = targetNode.tId;
+					}
+				}
 
-			if (moveType == consts.move.TYPE_INNER) {
+				//move node Dom
+				var targetObj, target_ulObj;
 				if (targetNodeIsRoot) {
-					//parentTId of root node is null
-					node.parentTId = null;
+					targetObj = setting.treeObj;
+					target_ulObj = targetObj;
 				} else {
-					if (!targetNode.isParent) {
-						targetNode.isParent = true;
-						targetNode.open = !!targetNode.open;
-						view.setNodeLineIcos(setting, targetNode);
+					if (!isSilent && moveType == consts.move.TYPE_INNER) {
+						view.expandCollapseNode(setting, targetNode, true, false);
+					} else if (!isSilent) {
+						view.expandCollapseNode(setting, targetNode.getParentNode(), true, false);
 					}
-					node.parentTId = targetNode.tId;
+					targetObj = $$(targetNode, setting);
+					target_ulObj = $$(targetNode, consts.id.UL, setting);
+					if (!!targetObj.get(0) && !target_ulObj.get(0)) {
+						var ulstr = [];
+						view.makeUlHtml(setting, targetNode, ulstr, '');
+						targetObj.append(ulstr.join(''));
+					}
+					target_ulObj = $$(targetNode, consts.id.UL, setting);
+				}
+				var nodeDom = $$(node, setting);
+				if (!nodeDom.get(0)) {
+					nodeDom = view.appendNodes(setting, node.level, [node], null, -1, false, true).join('');
+				} else if (!targetObj.get(0)) {
+					nodeDom.remove();
+				}
+				if (target_ulObj.get(0) && moveType == consts.move.TYPE_INNER) {
+					target_ulObj.append(nodeDom);
+				} else if (targetObj.get(0) && moveType == consts.move.TYPE_PREV) {
+					targetObj.before(nodeDom);
+				} else if (targetObj.get(0) && moveType == consts.move.TYPE_NEXT) {
+					targetObj.after(nodeDom);
 				}
-			}
-
-			//move node Dom
-			var targetObj, target_ulObj;
-			if (targetNodeIsRoot) {
-				targetObj = setting.treeObj;
-				target_ulObj = targetObj;
-			} else {
-				if (!isSilent && moveType == consts.move.TYPE_INNER) {
-					view.expandCollapseNode(setting, targetNode, true, false);
-				} else if (!isSilent) {
-					view.expandCollapseNode(setting, targetNode.getParentNode(), true, false);
-				}
-				targetObj = $$(targetNode, setting);
-				target_ulObj = $$(targetNode, consts.id.UL, setting);
-				if (!!targetObj.get(0) && !target_ulObj.get(0)) {
-					var ulstr = [];
-					view.makeUlHtml(setting, targetNode, ulstr, '');
-					targetObj.append(ulstr.join(''));
-				}
-				target_ulObj = $$(targetNode, consts.id.UL, setting);
-			}
-			var nodeDom = $$(node, setting);
-			if (!nodeDom.get(0)) {
-				nodeDom = view.appendNodes(setting, node.level, [node], null, -1, false, true).join('');
-			} else if (!targetObj.get(0)) {
-				nodeDom.remove();
-			}
-			if (target_ulObj.get(0) && moveType == consts.move.TYPE_INNER) {
-				target_ulObj.append(nodeDom);
-			} else if (targetObj.get(0) && moveType == consts.move.TYPE_PREV) {
-				targetObj.before(nodeDom);
-			} else if (targetObj.get(0) && moveType == consts.move.TYPE_NEXT) {
-				targetObj.after(nodeDom);
-			}
 
-			//repair the data after move
-			var i,l,
-			tmpSrcIndex = -1,
-			tmpTargetIndex = 0,
-			oldNeighbor = null,
-			newNeighbor = null,
-			oldLevel = node.level;
-			if (node.isFirstNode) {
-				tmpSrcIndex = 0;
-				if (oldParentNode[childKey].length > 1 ) {
-					oldNeighbor = oldParentNode[childKey][1];
-					oldNeighbor.isFirstNode = true;
-				}
-			} else if (node.isLastNode) {
-				tmpSrcIndex = oldParentNode[childKey].length -1;
-				oldNeighbor = oldParentNode[childKey][tmpSrcIndex - 1];
-				oldNeighbor.isLastNode = true;
-			} else {
-				for (i = 0, l = oldParentNode[childKey].length; i < l; i++) {
-					if (oldParentNode[childKey][i].tId == node.tId) {
-						tmpSrcIndex = i;
-						break;
+				//repair the data after move
+				var i, l,
+					tmpSrcIndex = -1,
+					tmpTargetIndex = 0,
+					oldNeighbor = null,
+					newNeighbor = null,
+					oldLevel = node.level;
+				if (node.isFirstNode) {
+					tmpSrcIndex = 0;
+					if (oldParentNode[childKey].length > 1) {
+						oldNeighbor = oldParentNode[childKey][1];
+						oldNeighbor.isFirstNode = true;
+					}
+				} else if (node.isLastNode) {
+					tmpSrcIndex = oldParentNode[childKey].length - 1;
+					oldNeighbor = oldParentNode[childKey][tmpSrcIndex - 1];
+					oldNeighbor.isLastNode = true;
+				} else {
+					for (i = 0, l = oldParentNode[childKey].length; i < l; i++) {
+						if (oldParentNode[childKey][i].tId == node.tId) {
+							tmpSrcIndex = i;
+							break;
+						}
 					}
 				}
-			}
-			if (tmpSrcIndex >= 0) {
-				oldParentNode[childKey].splice(tmpSrcIndex, 1);
-			}
-			if (moveType != consts.move.TYPE_INNER) {
-				for (i = 0, l = targetParentNode[childKey].length; i < l; i++) {
-					if (targetParentNode[childKey][i].tId == targetNode.tId) tmpTargetIndex = i;
+				if (tmpSrcIndex >= 0) {
+					oldParentNode[childKey].splice(tmpSrcIndex, 1);
 				}
-			}
-			if (moveType == consts.move.TYPE_INNER) {
-				if (!targetNode[childKey]) targetNode[childKey] = new Array();
-				if (targetNode[childKey].length > 0) {
-					newNeighbor = targetNode[childKey][targetNode[childKey].length - 1];
-					newNeighbor.isLastNode = false;
+				if (moveType != consts.move.TYPE_INNER) {
+					for (i = 0, l = targetParentNode[childKey].length; i < l; i++) {
+						if (targetParentNode[childKey][i].tId == targetNode.tId) tmpTargetIndex = i;
+					}
 				}
-				targetNode[childKey].splice(targetNode[childKey].length, 0, node);
-				node.isLastNode = true;
-				node.isFirstNode = (targetNode[childKey].length == 1);
-			} else if (targetNode.isFirstNode && moveType == consts.move.TYPE_PREV) {
-				targetParentNode[childKey].splice(tmpTargetIndex, 0, node);
-				newNeighbor = targetNode;
-				newNeighbor.isFirstNode = false;
-				node.parentTId = targetNode.parentTId;
-				node.isFirstNode = true;
-				node.isLastNode = false;
+				if (moveType == consts.move.TYPE_INNER) {
+					if (!targetNode[childKey]) targetNode[childKey] = new Array();
+					if (targetNode[childKey].length > 0) {
+						newNeighbor = targetNode[childKey][targetNode[childKey].length - 1];
+						newNeighbor.isLastNode = false;
+					}
+					targetNode[childKey].splice(targetNode[childKey].length, 0, node);
+					node.isLastNode = true;
+					node.isFirstNode = (targetNode[childKey].length == 1);
+				} else if (targetNode.isFirstNode && moveType == consts.move.TYPE_PREV) {
+					targetParentNode[childKey].splice(tmpTargetIndex, 0, node);
+					newNeighbor = targetNode;
+					newNeighbor.isFirstNode = false;
+					node.parentTId = targetNode.parentTId;
+					node.isFirstNode = true;
+					node.isLastNode = false;
 
-			} else if (targetNode.isLastNode && moveType == consts.move.TYPE_NEXT) {
-				targetParentNode[childKey].splice(tmpTargetIndex + 1, 0, node);
-				newNeighbor = targetNode;
-				newNeighbor.isLastNode = false;
-				node.parentTId = targetNode.parentTId;
-				node.isFirstNode = false;
-				node.isLastNode = true;
+				} else if (targetNode.isLastNode && moveType == consts.move.TYPE_NEXT) {
+					targetParentNode[childKey].splice(tmpTargetIndex + 1, 0, node);
+					newNeighbor = targetNode;
+					newNeighbor.isLastNode = false;
+					node.parentTId = targetNode.parentTId;
+					node.isFirstNode = false;
+					node.isLastNode = true;
 
-			} else {
-				if (moveType == consts.move.TYPE_PREV) {
-					targetParentNode[childKey].splice(tmpTargetIndex, 0, node);
 				} else {
-					targetParentNode[childKey].splice(tmpTargetIndex + 1, 0, node);
+					if (moveType == consts.move.TYPE_PREV) {
+						targetParentNode[childKey].splice(tmpTargetIndex, 0, node);
+					} else {
+						targetParentNode[childKey].splice(tmpTargetIndex + 1, 0, node);
+					}
+					node.parentTId = targetNode.parentTId;
+					node.isFirstNode = false;
+					node.isLastNode = false;
+				}
+				data.fixPIdKeyValue(setting, node);
+				data.setSonNodeLevel(setting, node.getParentNode(), node);
+
+				//repair node what been moved
+				view.setNodeLineIcos(setting, node);
+				view.repairNodeLevelClass(setting, node, oldLevel)
+
+				//repair node's old parentNode dom
+				if (!setting.data.keep.parent && oldParentNode[childKey].length < 1) {
+					//old parentNode has no child nodes
+					oldParentNode.isParent = false;
+					oldParentNode.open = false;
+					var tmp_ulObj = $$(oldParentNode, consts.id.UL, setting),
+						tmp_switchObj = $$(oldParentNode, consts.id.SWITCH, setting),
+						tmp_icoObj = $$(oldParentNode, consts.id.ICON, setting);
+					view.replaceSwitchClass(oldParentNode, tmp_switchObj, consts.folder.DOCU);
+					view.replaceIcoClass(oldParentNode, tmp_icoObj, consts.folder.DOCU);
+					tmp_ulObj.css("display", "none");
+
+				} else if (oldNeighbor) {
+					//old neigbor node
+					view.setNodeLineIcos(setting, oldNeighbor);
 				}
-				node.parentTId = targetNode.parentTId;
-				node.isFirstNode = false;
-				node.isLastNode = false;
-			}
-			data.fixPIdKeyValue(setting, node);
-			data.setSonNodeLevel(setting, node.getParentNode(), node);
-
-			//repair node what been moved
-			view.setNodeLineIcos(setting, node);
-			view.repairNodeLevelClass(setting, node, oldLevel)
-
-			//repair node's old parentNode dom
-			if (!setting.data.keep.parent && oldParentNode[childKey].length < 1) {
-				//old parentNode has no child nodes
-				oldParentNode.isParent = false;
-				oldParentNode.open = false;
-				var tmp_ulObj = $$(oldParentNode, consts.id.UL, setting),
-				tmp_switchObj = $$(oldParentNode, consts.id.SWITCH, setting),
-				tmp_icoObj = $$(oldParentNode, consts.id.ICON, setting);
-				view.replaceSwitchClass(oldParentNode, tmp_switchObj, consts.folder.DOCU);
-				view.replaceIcoClass(oldParentNode, tmp_icoObj, consts.folder.DOCU);
-				tmp_ulObj.css("display", "none");
-
-			} else if (oldNeighbor) {
-				//old neigbor node
-				view.setNodeLineIcos(setting, oldNeighbor);
-			}
 
-			//new neigbor node
-			if (newNeighbor) {
-				view.setNodeLineIcos(setting, newNeighbor);
-			}
+				//new neigbor node
+				if (newNeighbor) {
+					view.setNodeLineIcos(setting, newNeighbor);
+				}
 
-			//repair checkbox / radio
-			if (!!setting.check && setting.check.enable && view.repairChkClass) {
-				view.repairChkClass(setting, oldParentNode);
-				view.repairParentChkClassWithSelf(setting, oldParentNode);
-				if (oldParentNode != node.parent)
-					view.repairParentChkClassWithSelf(setting, node);
-			}
+				//repair checkbox / radio
+				if (!!setting.check && setting.check.enable && view.repairChkClass) {
+					view.repairChkClass(setting, oldParentNode);
+					view.repairParentChkClassWithSelf(setting, oldParentNode);
+					if (oldParentNode != node.parent)
+						view.repairParentChkClassWithSelf(setting, node);
+				}
 
-			//expand parents after move
-			if (!isSilent) {
-				view.expandCollapseParentNode(setting, node.getParentNode(), true, animateFlag);
+				//expand parents after move
+				if (!isSilent) {
+					view.expandCollapseParentNode(setting, node.getParentNode(), true, animateFlag);
+				}
+			},
+			removeEditBtn: function (setting, node) {
+				$$(node, consts.id.EDIT, setting).unbind().remove();
+			},
+			removeRemoveBtn: function (setting, node) {
+				$$(node, consts.id.REMOVE, setting).unbind().remove();
+			},
+			removeTreeDom: function (setting, node) {
+				node.isHover = false;
+				view.removeEditBtn(setting, node);
+				view.removeRemoveBtn(setting, node);
+				tools.apply(setting.view.removeHoverDom, [setting.treeId, node]);
+			},
+			repairNodeLevelClass: function (setting, node, oldLevel) {
+				if (oldLevel === node.level) return;
+				var liObj = $$(node, setting),
+					aObj = $$(node, consts.id.A, setting),
+					ulObj = $$(node, consts.id.UL, setting),
+					oldClass = consts.className.LEVEL + oldLevel,
+					newClass = consts.className.LEVEL + node.level;
+				liObj.removeClass(oldClass);
+				liObj.addClass(newClass);
+				aObj.removeClass(oldClass);
+				aObj.addClass(newClass);
+				ulObj.removeClass(oldClass);
+				ulObj.addClass(newClass);
+			},
+			selectNodes: function (setting, nodes) {
+				for (var i = 0, l = nodes.length; i < l; i++) {
+					view.selectNode(setting, nodes[i], i > 0);
+				}
 			}
 		},
-		removeEditBtn: function(setting, node) {
-			$$(node, consts.id.EDIT, setting).unbind().remove();
-		},
-		removeRemoveBtn: function(setting, node) {
-			$$(node, consts.id.REMOVE, setting).unbind().remove();
-		},
-		removeTreeDom: function(setting, node) {
-			node.isHover = false;
-			view.removeEditBtn(setting, node);
-			view.removeRemoveBtn(setting, node);
-			tools.apply(setting.view.removeHoverDom, [setting.treeId, node]);
-		},
-		repairNodeLevelClass: function(setting, node, oldLevel) {
-			if (oldLevel === node.level) return;
-			var liObj = $$(node, setting),
-			aObj = $$(node, consts.id.A, setting),
-			ulObj = $$(node, consts.id.UL, setting),
-			oldClass = consts.className.LEVEL + oldLevel,
-			newClass = consts.className.LEVEL + node.level;
-			liObj.removeClass(oldClass);
-			liObj.addClass(newClass);
-			aObj.removeClass(oldClass);
-			aObj.addClass(newClass);
-			ulObj.removeClass(oldClass);
-			ulObj.addClass(newClass);
-		},
-		selectNodes : function(setting, nodes) {
-			for (var i=0, l=nodes.length; i<l; i++) {
-				view.selectNode(setting, nodes[i], i>0);
-			}
-		}
-	},
 
-	_z = {
-		tools: _tools,
-		view: _view,
-		event: _event,
-		data: _data
-	};
+		_z = {
+			tools: _tools,
+			view: _view,
+			event: _event,
+			data: _data
+		};
 	$.extend(true, $.fn.zTree.consts, _consts);
 	$.extend(true, $.fn.zTree._z, _z);
 
 	var zt = $.fn.zTree,
-	tools = zt._z.tools,
-	consts = zt.consts,
-	view = zt._z.view,
-	data = zt._z.data,
-	event = zt._z.event,
-	$$ = tools.$;
+		tools = zt._z.tools,
+		consts = zt.consts,
+		view = zt._z.view,
+		data = zt._z.data,
+		event = zt._z.event,
+		$$ = tools.$;
 
 	data.exSetting(_setting);
 	data.addInitBind(_bindEvent);
@@ -3696,7 +3706,7 @@
 	var _cancelPreSelectedNode = view.cancelPreSelectedNode;
 	view.cancelPreSelectedNode = function (setting, node) {
 		var list = data.getRoot(setting).curSelectedList;
-		for (var i=0, j=list.length; i<j; i++) {
+		for (var i = 0, j = list.length; i < j; i++) {
 			if (!node || node === list[i]) {
 				view.removeTreeDom(setting, list[i]);
 				if (node) break;
@@ -3706,7 +3716,7 @@
 	}
 
 	var _createNodes = view.createNodes;
-	view.createNodes = function(setting, level, nodes, parentNode, index) {
+	view.createNodes = function (setting, level, nodes, parentNode, index) {
 		if (_createNodes) {
 			_createNodes.apply(view, arguments);
 		}
@@ -3717,12 +3727,12 @@
 	}
 
 	var _makeNodeUrl = view.makeNodeUrl;
-	view.makeNodeUrl = function(setting, node) {
+	view.makeNodeUrl = function (setting, node) {
 		return setting.edit.enable ? null : (_makeNodeUrl.apply(view, arguments));
 	}
 
 	var _removeNode = view.removeNode;
-	view.removeNode = function(setting, node) {
+	view.removeNode = function (setting, node) {
 		var root = data.getRoot(setting);
 		if (root.curEditNode === node) root.curEditNode = null;
 		if (_removeNode) {
@@ -3731,7 +3741,7 @@
 	}
 
 	var _selectNode = view.selectNode;
-	view.selectNode = function(setting, node, addFlag) {
+	view.selectNode = function (setting, node, addFlag) {
 		var root = data.getRoot(setting);
 		if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
 			return false;
@@ -3742,7 +3752,7 @@
 	}
 
 	var _uCanDo = tools.uCanDo;
-	tools.uCanDo = function(setting, e) {
+	tools.uCanDo = function (setting, e) {
 		var root = data.getRoot(setting);
 		if (e && (tools.eqs(e.type, "mouseover") || tools.eqs(e.type, "mouseout") || tools.eqs(e.type, "mousedown") || tools.eqs(e.type, "mouseup"))) {
 			return true;
diff --git a/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.core.js b/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.core.js
index 276d164..6941545 100644
--- a/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.core.js
+++ b/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.core.js
@@ -11,1925 +11,1925 @@
  * Date: 2017-11-11
  */
 (function ($) {
-    var settings = {}, roots = {}, caches = {},
-        //default consts of core
-        _consts = {
-            className: {
-                BUTTON: "button",
-                LEVEL: "level",
-                ICO_LOADING: "ico_loading",
-                SWITCH: "switch",
-                NAME: 'node_name'
-            },
-            event: {
-                NODECREATED: "ztree_nodeCreated",
-                CLICK: "ztree_click",
-                EXPAND: "ztree_expand",
-                COLLAPSE: "ztree_collapse",
-                ASYNC_SUCCESS: "ztree_async_success",
-                ASYNC_ERROR: "ztree_async_error",
-                REMOVE: "ztree_remove",
-                SELECTED: "ztree_selected",
-                UNSELECTED: "ztree_unselected"
-            },
-            id: {
-                A: "_a",
-                ICON: "_ico",
-                SPAN: "_span",
-                SWITCH: "_switch",
-                UL: "_ul"
-            },
-            line: {
-                ROOT: "root",
-                ROOTS: "roots",
-                CENTER: "center",
-                BOTTOM: "bottom",
-                NOLINE: "noline",
-                LINE: "line"
-            },
-            folder: {
-                OPEN: "open",
-                CLOSE: "close",
-                DOCU: "docu"
-            },
-            node: {
-                CURSELECTED: "curSelectedNode"
-            }
-        },
-        //default setting of core
-        _setting = {
-            treeId: "",
-            treeObj: null,
-            view: {
-                addDiyDom: null,
-                autoCancelSelected: true,
-                dblClickExpand: true,
-                expandSpeed: "fast",
-                fontCss: {},
-                nameIsHTML: false,
-                selectedMulti: true,
-                showIcon: true,
-                showLine: true,
-                showTitle: true,
-                txtSelectedEnable: false
-            },
-            data: {
-                key: {
-                    children: "children",
-                    name: "name",
-                    title: "",
-                    url: "url",
-                    icon: "icon"
-                },
-                simpleData: {
-                    enable: false,
-                    idKey: "id",
-                    pIdKey: "pId",
-                    rootPId: null
-                },
-                keep: {
-                    parent: false,
-                    leaf: false
-                }
-            },
-            async: {
-                enable: false,
-                contentType: "application/x-www-form-urlencoded",
-                type: "post",
-                dataType: "text",
-                url: "",
-                autoParam: [],
-                otherParam: [],
-                dataFilter: null
-            },
-            callback: {
-                beforeAsync: null,
-                beforeClick: null,
-                beforeDblClick: null,
-                beforeRightClick: null,
-                beforeMouseDown: null,
-                beforeMouseUp: null,
-                beforeExpand: null,
-                beforeCollapse: null,
-                beforeRemove: null,
+	var settings = {}, roots = {}, caches = {},
+		//default consts of core
+		_consts = {
+			className: {
+				BUTTON: "button",
+				LEVEL: "level",
+				ICO_LOADING: "ico_loading",
+				SWITCH: "switch",
+				NAME: 'node_name'
+			},
+			event: {
+				NODECREATED: "ztree_nodeCreated",
+				CLICK: "ztree_click",
+				EXPAND: "ztree_expand",
+				COLLAPSE: "ztree_collapse",
+				ASYNC_SUCCESS: "ztree_async_success",
+				ASYNC_ERROR: "ztree_async_error",
+				REMOVE: "ztree_remove",
+				SELECTED: "ztree_selected",
+				UNSELECTED: "ztree_unselected"
+			},
+			id: {
+				A: "_a",
+				ICON: "_ico",
+				SPAN: "_span",
+				SWITCH: "_switch",
+				UL: "_ul"
+			},
+			line: {
+				ROOT: "root",
+				ROOTS: "roots",
+				CENTER: "center",
+				BOTTOM: "bottom",
+				NOLINE: "noline",
+				LINE: "line"
+			},
+			folder: {
+				OPEN: "open",
+				CLOSE: "close",
+				DOCU: "docu"
+			},
+			node: {
+				CURSELECTED: "curSelectedNode"
+			}
+		},
+		//default setting of core
+		_setting = {
+			treeId: "",
+			treeObj: null,
+			view: {
+				addDiyDom: null,
+				autoCancelSelected: true,
+				dblClickExpand: true,
+				expandSpeed: "fast",
+				fontCss: {},
+				nameIsHTML: false,
+				selectedMulti: true,
+				showIcon: true,
+				showLine: true,
+				showTitle: true,
+				txtSelectedEnable: false
+			},
+			data: {
+				key: {
+					children: "children",
+					name: "name",
+					title: "",
+					url: "url",
+					icon: "icon"
+				},
+				simpleData: {
+					enable: false,
+					idKey: "id",
+					pIdKey: "pId",
+					rootPId: null
+				},
+				keep: {
+					parent: false,
+					leaf: false
+				}
+			},
+			async: {
+				enable: false,
+				contentType: "application/x-www-form-urlencoded",
+				type: "post",
+				dataType: "text",
+				url: "",
+				autoParam: [],
+				otherParam: [],
+				dataFilter: null
+			},
+			callback: {
+				beforeAsync: null,
+				beforeClick: null,
+				beforeDblClick: null,
+				beforeRightClick: null,
+				beforeMouseDown: null,
+				beforeMouseUp: null,
+				beforeExpand: null,
+				beforeCollapse: null,
+				beforeRemove: null,
 
-                onAsyncError: null,
-                onAsyncSuccess: null,
-                onNodeCreated: null,
-                onClick: null,
-                onDblClick: null,
-                onRightClick: null,
-                onMouseDown: null,
-                onMouseUp: null,
-                onExpand: null,
-                onCollapse: null,
-                onRemove: null
-            }
-        },
-        //default root of core
-        //zTree use root to save full data
-        _initRoot = function (setting) {
-            var r = data.getRoot(setting);
-            if (!r) {
-                r = {};
-                data.setRoot(setting, r);
-            }
-            r[setting.data.key.children] = [];
-            r.expandTriggerFlag = false;
-            r.curSelectedList = [];
-            r.noSelection = true;
-            r.createdNodes = [];
-            r.zId = 0;
-            r._ver = (new Date()).getTime();
-        },
-        //default cache of core
-        _initCache = function (setting) {
-            var c = data.getCache(setting);
-            if (!c) {
-                c = {};
-                data.setCache(setting, c);
-            }
-            c.nodes = [];
-            c.doms = [];
-        },
-        //default bindEvent of core
-        _bindEvent = function (setting) {
-            var o = setting.treeObj,
-                c = consts.event;
-            o.bind(c.NODECREATED, function (event, treeId, node) {
-                tools.apply(setting.callback.onNodeCreated, [event, treeId, node]);
-            });
+				onAsyncError: null,
+				onAsyncSuccess: null,
+				onNodeCreated: null,
+				onClick: null,
+				onDblClick: null,
+				onRightClick: null,
+				onMouseDown: null,
+				onMouseUp: null,
+				onExpand: null,
+				onCollapse: null,
+				onRemove: null
+			}
+		},
+		//default root of core
+		//zTree use root to save full data
+		_initRoot = function (setting) {
+			var r = data.getRoot(setting);
+			if (!r) {
+				r = {};
+				data.setRoot(setting, r);
+			}
+			r[setting.data.key.children] = [];
+			r.expandTriggerFlag = false;
+			r.curSelectedList = [];
+			r.noSelection = true;
+			r.createdNodes = [];
+			r.zId = 0;
+			r._ver = (new Date()).getTime();
+		},
+		//default cache of core
+		_initCache = function (setting) {
+			var c = data.getCache(setting);
+			if (!c) {
+				c = {};
+				data.setCache(setting, c);
+			}
+			c.nodes = [];
+			c.doms = [];
+		},
+		//default bindEvent of core
+		_bindEvent = function (setting) {
+			var o = setting.treeObj,
+				c = consts.event;
+			o.bind(c.NODECREATED, function (event, treeId, node) {
+				tools.apply(setting.callback.onNodeCreated, [event, treeId, node]);
+			});
 
-            o.bind(c.CLICK, function (event, srcEvent, treeId, node, clickFlag) {
-                tools.apply(setting.callback.onClick, [srcEvent, treeId, node, clickFlag]);
-            });
+			o.bind(c.CLICK, function (event, srcEvent, treeId, node, clickFlag) {
+				tools.apply(setting.callback.onClick, [srcEvent, treeId, node, clickFlag]);
+			});
 
-            o.bind(c.EXPAND, function (event, treeId, node) {
-                tools.apply(setting.callback.onExpand, [event, treeId, node]);
-            });
+			o.bind(c.EXPAND, function (event, treeId, node) {
+				tools.apply(setting.callback.onExpand, [event, treeId, node]);
+			});
 
-            o.bind(c.COLLAPSE, function (event, treeId, node) {
-                tools.apply(setting.callback.onCollapse, [event, treeId, node]);
-            });
+			o.bind(c.COLLAPSE, function (event, treeId, node) {
+				tools.apply(setting.callback.onCollapse, [event, treeId, node]);
+			});
 
-            o.bind(c.ASYNC_SUCCESS, function (event, treeId, node, msg) {
-                tools.apply(setting.callback.onAsyncSuccess, [event, treeId, node, msg]);
-            });
+			o.bind(c.ASYNC_SUCCESS, function (event, treeId, node, msg) {
+				tools.apply(setting.callback.onAsyncSuccess, [event, treeId, node, msg]);
+			});
 
-            o.bind(c.ASYNC_ERROR, function (event, treeId, node, XMLHttpRequest, textStatus, errorThrown) {
-                tools.apply(setting.callback.onAsyncError, [event, treeId, node, XMLHttpRequest, textStatus, errorThrown]);
-            });
+			o.bind(c.ASYNC_ERROR, function (event, treeId, node, XMLHttpRequest, textStatus, errorThrown) {
+				tools.apply(setting.callback.onAsyncError, [event, treeId, node, XMLHttpRequest, textStatus, errorThrown]);
+			});
 
-            o.bind(c.REMOVE, function (event, treeId, treeNode) {
-                tools.apply(setting.callback.onRemove, [event, treeId, treeNode]);
-            });
+			o.bind(c.REMOVE, function (event, treeId, treeNode) {
+				tools.apply(setting.callback.onRemove, [event, treeId, treeNode]);
+			});
 
-            o.bind(c.SELECTED, function (event, treeId, node) {
-                tools.apply(setting.callback.onSelected, [treeId, node]);
-            });
-            o.bind(c.UNSELECTED, function (event, treeId, node) {
-                tools.apply(setting.callback.onUnSelected, [treeId, node]);
-            });
-        },
-        _unbindEvent = function (setting) {
-            var o = setting.treeObj,
-                c = consts.event;
-            o.unbind(c.NODECREATED)
-                .unbind(c.CLICK)
-                .unbind(c.EXPAND)
-                .unbind(c.COLLAPSE)
-                .unbind(c.ASYNC_SUCCESS)
-                .unbind(c.ASYNC_ERROR)
-                .unbind(c.REMOVE)
-                .unbind(c.SELECTED)
-                .unbind(c.UNSELECTED);
-        },
-        //default event proxy of core
-        _eventProxy = function (event) {
-            var target = event.target,
-                setting = data.getSetting(event.data.treeId),
-                tId = "", node = null,
-                nodeEventType = "", treeEventType = "",
-                nodeEventCallback = null, treeEventCallback = null,
-                tmp = null;
+			o.bind(c.SELECTED, function (event, treeId, node) {
+				tools.apply(setting.callback.onSelected, [treeId, node]);
+			});
+			o.bind(c.UNSELECTED, function (event, treeId, node) {
+				tools.apply(setting.callback.onUnSelected, [treeId, node]);
+			});
+		},
+		_unbindEvent = function (setting) {
+			var o = setting.treeObj,
+				c = consts.event;
+			o.unbind(c.NODECREATED)
+				.unbind(c.CLICK)
+				.unbind(c.EXPAND)
+				.unbind(c.COLLAPSE)
+				.unbind(c.ASYNC_SUCCESS)
+				.unbind(c.ASYNC_ERROR)
+				.unbind(c.REMOVE)
+				.unbind(c.SELECTED)
+				.unbind(c.UNSELECTED);
+		},
+		//default event proxy of core
+		_eventProxy = function (event) {
+			var target = event.target,
+				setting = data.getSetting(event.data.treeId),
+				tId = "", node = null,
+				nodeEventType = "", treeEventType = "",
+				nodeEventCallback = null, treeEventCallback = null,
+				tmp = null;
 
-            if (tools.eqs(event.type, "mousedown")) {
-                treeEventType = "mousedown";
-            } else if (tools.eqs(event.type, "mouseup")) {
-                treeEventType = "mouseup";
-            } else if (tools.eqs(event.type, "contextmenu")) {
-                treeEventType = "contextmenu";
-            } else if (tools.eqs(event.type, "click")) {
-                if (tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.SWITCH) !== null) {
-                    tId = tools.getNodeMainDom(target).id;
-                    nodeEventType = "switchNode";
-                } else {
-                    tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
-                    if (tmp) {
-                        tId = tools.getNodeMainDom(tmp).id;
-                        nodeEventType = "clickNode";
-                    }
-                }
-            } else if (tools.eqs(event.type, "dblclick")) {
-                treeEventType = "dblclick";
-                tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
-                if (tmp) {
-                    tId = tools.getNodeMainDom(tmp).id;
-                    nodeEventType = "switchNode";
-                }
-            }
-            if (treeEventType.length > 0 && tId.length == 0) {
-                tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
-                if (tmp) {
-                    tId = tools.getNodeMainDom(tmp).id;
-                }
-            }
-            // event to node
-            if (tId.length > 0) {
-                node = data.getNodeCache(setting, tId);
-                switch (nodeEventType) {
-                    case "switchNode" :
-                        if (!node.isParent) {
-                            nodeEventType = "";
-                        } else if (tools.eqs(event.type, "click")
-                            || (tools.eqs(event.type, "dblclick") && tools.apply(setting.view.dblClickExpand, [setting.treeId, node], setting.view.dblClickExpand))) {
-                            nodeEventCallback = handler.onSwitchNode;
-                        } else {
-                            nodeEventType = "";
-                        }
-                        break;
-                    case "clickNode" :
-                        nodeEventCallback = handler.onClickNode;
-                        break;
-                }
-            }
-            // event to zTree
-            switch (treeEventType) {
-                case "mousedown" :
-                    treeEventCallback = handler.onZTreeMousedown;
-                    break;
-                case "mouseup" :
-                    treeEventCallback = handler.onZTreeMouseup;
-                    break;
-                case "dblclick" :
-                    treeEventCallback = handler.onZTreeDblclick;
-                    break;
-                case "contextmenu" :
-                    treeEventCallback = handler.onZTreeContextmenu;
-                    break;
-            }
-            var proxyResult = {
-                stop: false,
-                node: node,
-                nodeEventType: nodeEventType,
-                nodeEventCallback: nodeEventCallback,
-                treeEventType: treeEventType,
-                treeEventCallback: treeEventCallback
-            };
-            return proxyResult
-        },
-        //default init node of core
-        _initNode = function (setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
-            if (!n) return;
-            var r = data.getRoot(setting),
-                childKey = setting.data.key.children;
-            n.level = level;
-            n.tId = setting.treeId + "_" + (++r.zId);
-            n.parentTId = parentNode ? parentNode.tId : null;
-            n.open = (typeof n.open == "string") ? tools.eqs(n.open, "true") : !!n.open;
-            if (n[childKey] && n[childKey].length > 0) {
-                n.isParent = true;
-                n.zAsync = true;
-            } else {
-                n.isParent = (typeof n.isParent == "string") ? tools.eqs(n.isParent, "true") : !!n.isParent;
-                n.open = (n.isParent && !setting.async.enable) ? n.open : false;
-                n.zAsync = !n.isParent;
-            }
-            n.isFirstNode = isFirstNode;
-            n.isLastNode = isLastNode;
-            n.getParentNode = function () {
-                return data.getNodeCache(setting, n.parentTId);
-            };
-            n.getPreNode = function () {
-                return data.getPreNode(setting, n);
-            };
-            n.getNextNode = function () {
-                return data.getNextNode(setting, n);
-            };
-            n.getIndex = function () {
-                return data.getNodeIndex(setting, n);
-            };
-            n.getPath = function () {
-                return data.getNodePath(setting, n);
-            };
-            n.isAjaxing = false;
-            data.fixPIdKeyValue(setting, n);
-        },
-        _init = {
-            bind: [_bindEvent],
-            unbind: [_unbindEvent],
-            caches: [_initCache],
-            nodes: [_initNode],
-            proxys: [_eventProxy],
-            roots: [_initRoot],
-            beforeA: [],
-            afterA: [],
-            innerBeforeA: [],
-            innerAfterA: [],
-            zTreeTools: []
-        },
-        //method of operate data
-        data = {
-            addNodeCache: function (setting, node) {
-                data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = node;
-            },
-            getNodeCacheId: function (tId) {
-                return tId.substring(tId.lastIndexOf("_") + 1);
-            },
-            addAfterA: function (afterA) {
-                _init.afterA.push(afterA);
-            },
-            addBeforeA: function (beforeA) {
-                _init.beforeA.push(beforeA);
-            },
-            addInnerAfterA: function (innerAfterA) {
-                _init.innerAfterA.push(innerAfterA);
-            },
-            addInnerBeforeA: function (innerBeforeA) {
-                _init.innerBeforeA.push(innerBeforeA);
-            },
-            addInitBind: function (bindEvent) {
-                _init.bind.push(bindEvent);
-            },
-            addInitUnBind: function (unbindEvent) {
-                _init.unbind.push(unbindEvent);
-            },
-            addInitCache: function (initCache) {
-                _init.caches.push(initCache);
-            },
-            addInitNode: function (initNode) {
-                _init.nodes.push(initNode);
-            },
-            addInitProxy: function (initProxy, isFirst) {
-                if (!!isFirst) {
-                    _init.proxys.splice(0, 0, initProxy);
-                } else {
-                    _init.proxys.push(initProxy);
-                }
-            },
-            addInitRoot: function (initRoot) {
-                _init.roots.push(initRoot);
-            },
-            addNodesData: function (setting, parentNode, index, nodes) {
-                var childKey = setting.data.key.children, params;
-                if (!parentNode[childKey]) {
-                    parentNode[childKey] = [];
-                    index = -1;
-                } else if (index >= parentNode[childKey].length) {
-                    index = -1;
-                }
+			if (tools.eqs(event.type, "mousedown")) {
+				treeEventType = "mousedown";
+			} else if (tools.eqs(event.type, "mouseup")) {
+				treeEventType = "mouseup";
+			} else if (tools.eqs(event.type, "contextmenu")) {
+				treeEventType = "contextmenu";
+			} else if (tools.eqs(event.type, "click")) {
+				if (tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.SWITCH) !== null) {
+					tId = tools.getNodeMainDom(target).id;
+					nodeEventType = "switchNode";
+				} else {
+					tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+					if (tmp) {
+						tId = tools.getNodeMainDom(tmp).id;
+						nodeEventType = "clickNode";
+					}
+				}
+			} else if (tools.eqs(event.type, "dblclick")) {
+				treeEventType = "dblclick";
+				tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+				if (tmp) {
+					tId = tools.getNodeMainDom(tmp).id;
+					nodeEventType = "switchNode";
+				}
+			}
+			if (treeEventType.length > 0 && tId.length == 0) {
+				tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+				if (tmp) {
+					tId = tools.getNodeMainDom(tmp).id;
+				}
+			}
+			// event to node
+			if (tId.length > 0) {
+				node = data.getNodeCache(setting, tId);
+				switch (nodeEventType) {
+					case "switchNode" :
+						if (!node.isParent) {
+							nodeEventType = "";
+						} else if (tools.eqs(event.type, "click")
+							|| (tools.eqs(event.type, "dblclick") && tools.apply(setting.view.dblClickExpand, [setting.treeId, node], setting.view.dblClickExpand))) {
+							nodeEventCallback = handler.onSwitchNode;
+						} else {
+							nodeEventType = "";
+						}
+						break;
+					case "clickNode" :
+						nodeEventCallback = handler.onClickNode;
+						break;
+				}
+			}
+			// event to zTree
+			switch (treeEventType) {
+				case "mousedown" :
+					treeEventCallback = handler.onZTreeMousedown;
+					break;
+				case "mouseup" :
+					treeEventCallback = handler.onZTreeMouseup;
+					break;
+				case "dblclick" :
+					treeEventCallback = handler.onZTreeDblclick;
+					break;
+				case "contextmenu" :
+					treeEventCallback = handler.onZTreeContextmenu;
+					break;
+			}
+			var proxyResult = {
+				stop: false,
+				node: node,
+				nodeEventType: nodeEventType,
+				nodeEventCallback: nodeEventCallback,
+				treeEventType: treeEventType,
+				treeEventCallback: treeEventCallback
+			};
+			return proxyResult
+		},
+		//default init node of core
+		_initNode = function (setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+			if (!n) return;
+			var r = data.getRoot(setting),
+				childKey = setting.data.key.children;
+			n.level = level;
+			n.tId = setting.treeId + "_" + (++r.zId);
+			n.parentTId = parentNode ? parentNode.tId : null;
+			n.open = (typeof n.open == "string") ? tools.eqs(n.open, "true") : !!n.open;
+			if (n[childKey] && n[childKey].length > 0) {
+				n.isParent = true;
+				n.zAsync = true;
+			} else {
+				n.isParent = (typeof n.isParent == "string") ? tools.eqs(n.isParent, "true") : !!n.isParent;
+				n.open = (n.isParent && !setting.async.enable) ? n.open : false;
+				n.zAsync = !n.isParent;
+			}
+			n.isFirstNode = isFirstNode;
+			n.isLastNode = isLastNode;
+			n.getParentNode = function () {
+				return data.getNodeCache(setting, n.parentTId);
+			};
+			n.getPreNode = function () {
+				return data.getPreNode(setting, n);
+			};
+			n.getNextNode = function () {
+				return data.getNextNode(setting, n);
+			};
+			n.getIndex = function () {
+				return data.getNodeIndex(setting, n);
+			};
+			n.getPath = function () {
+				return data.getNodePath(setting, n);
+			};
+			n.isAjaxing = false;
+			data.fixPIdKeyValue(setting, n);
+		},
+		_init = {
+			bind: [_bindEvent],
+			unbind: [_unbindEvent],
+			caches: [_initCache],
+			nodes: [_initNode],
+			proxys: [_eventProxy],
+			roots: [_initRoot],
+			beforeA: [],
+			afterA: [],
+			innerBeforeA: [],
+			innerAfterA: [],
+			zTreeTools: []
+		},
+		//method of operate data
+		data = {
+			addNodeCache: function (setting, node) {
+				data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = node;
+			},
+			getNodeCacheId: function (tId) {
+				return tId.substring(tId.lastIndexOf("_") + 1);
+			},
+			addAfterA: function (afterA) {
+				_init.afterA.push(afterA);
+			},
+			addBeforeA: function (beforeA) {
+				_init.beforeA.push(beforeA);
+			},
+			addInnerAfterA: function (innerAfterA) {
+				_init.innerAfterA.push(innerAfterA);
+			},
+			addInnerBeforeA: function (innerBeforeA) {
+				_init.innerBeforeA.push(innerBeforeA);
+			},
+			addInitBind: function (bindEvent) {
+				_init.bind.push(bindEvent);
+			},
+			addInitUnBind: function (unbindEvent) {
+				_init.unbind.push(unbindEvent);
+			},
+			addInitCache: function (initCache) {
+				_init.caches.push(initCache);
+			},
+			addInitNode: function (initNode) {
+				_init.nodes.push(initNode);
+			},
+			addInitProxy: function (initProxy, isFirst) {
+				if (!!isFirst) {
+					_init.proxys.splice(0, 0, initProxy);
+				} else {
+					_init.proxys.push(initProxy);
+				}
+			},
+			addInitRoot: function (initRoot) {
+				_init.roots.push(initRoot);
+			},
+			addNodesData: function (setting, parentNode, index, nodes) {
+				var childKey = setting.data.key.children, params;
+				if (!parentNode[childKey]) {
+					parentNode[childKey] = [];
+					index = -1;
+				} else if (index >= parentNode[childKey].length) {
+					index = -1;
+				}
 
-                if (parentNode[childKey].length > 0 && index === 0) {
-                    parentNode[childKey][0].isFirstNode = false;
-                    view.setNodeLineIcos(setting, parentNode[childKey][0]);
-                } else if (parentNode[childKey].length > 0 && index < 0) {
-                    parentNode[childKey][parentNode[childKey].length - 1].isLastNode = false;
-                    view.setNodeLineIcos(setting, parentNode[childKey][parentNode[childKey].length - 1]);
-                }
-                parentNode.isParent = true;
+				if (parentNode[childKey].length > 0 && index === 0) {
+					parentNode[childKey][0].isFirstNode = false;
+					view.setNodeLineIcos(setting, parentNode[childKey][0]);
+				} else if (parentNode[childKey].length > 0 && index < 0) {
+					parentNode[childKey][parentNode[childKey].length - 1].isLastNode = false;
+					view.setNodeLineIcos(setting, parentNode[childKey][parentNode[childKey].length - 1]);
+				}
+				parentNode.isParent = true;
 
-                if (index < 0) {
-                    parentNode[childKey] = parentNode[childKey].concat(nodes);
-                } else {
-                    params = [index, 0].concat(nodes);
-                    parentNode[childKey].splice.apply(parentNode[childKey], params);
-                }
-            },
-            addSelectedNode: function (setting, node) {
-                var root = data.getRoot(setting);
-                if (!data.isSelectedNode(setting, node)) {
-                    root.curSelectedList.push(node);
-                }
-            },
-            addCreatedNode: function (setting, node) {
-                if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
-                    var root = data.getRoot(setting);
-                    root.createdNodes.push(node);
-                }
-            },
-            addZTreeTools: function (zTreeTools) {
-                _init.zTreeTools.push(zTreeTools);
-            },
-            exSetting: function (s) {
-                $.extend(true, _setting, s);
-            },
-            fixPIdKeyValue: function (setting, node) {
-                if (setting.data.simpleData.enable) {
-                    node[setting.data.simpleData.pIdKey] = node.parentTId ? node.getParentNode()[setting.data.simpleData.idKey] : setting.data.simpleData.rootPId;
-                }
-            },
-            getAfterA: function (setting, node, array) {
-                for (var i = 0, j = _init.afterA.length; i < j; i++) {
-                    _init.afterA[i].apply(this, arguments);
-                }
-            },
-            getBeforeA: function (setting, node, array) {
-                for (var i = 0, j = _init.beforeA.length; i < j; i++) {
-                    _init.beforeA[i].apply(this, arguments);
-                }
-            },
-            getInnerAfterA: function (setting, node, array) {
-                for (var i = 0, j = _init.innerAfterA.length; i < j; i++) {
-                    _init.innerAfterA[i].apply(this, arguments);
-                }
-            },
-            getInnerBeforeA: function (setting, node, array) {
-                for (var i = 0, j = _init.innerBeforeA.length; i < j; i++) {
-                    _init.innerBeforeA[i].apply(this, arguments);
-                }
-            },
-            getCache: function (setting) {
-                return caches[setting.treeId];
-            },
-            getNodeIndex: function (setting, node) {
-                if (!node) return null;
-                var childKey = setting.data.key.children,
-                    p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
-                for (var i = 0, l = p[childKey].length - 1; i <= l; i++) {
-                    if (p[childKey][i] === node) {
-                        return i;
-                    }
-                }
-                return -1;
-            },
-            getNextNode: function (setting, node) {
-                if (!node) return null;
-                var childKey = setting.data.key.children,
-                    p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
-                for (var i = 0, l = p[childKey].length - 1; i <= l; i++) {
-                    if (p[childKey][i] === node) {
-                        return (i == l ? null : p[childKey][i + 1]);
-                    }
-                }
-                return null;
-            },
-            getNodeByParam: function (setting, nodes, key, value) {
-                if (!nodes || !key) return null;
-                var childKey = setting.data.key.children;
-                for (var i = 0, l = nodes.length; i < l; i++) {
-                    if (nodes[i][key] == value) {
-                        return nodes[i];
-                    }
-                    var tmp = data.getNodeByParam(setting, nodes[i][childKey], key, value);
-                    if (tmp) return tmp;
-                }
-                return null;
-            },
-            getNodeCache: function (setting, tId) {
-                if (!tId) return null;
-                var n = caches[setting.treeId].nodes[data.getNodeCacheId(tId)];
-                return n ? n : null;
-            },
-            getNodeName: function (setting, node) {
-                var nameKey = setting.data.key.name;
-                return "" + node[nameKey];
-            },
-            getNodePath: function (setting, node) {
-                if (!node) return null;
+				if (index < 0) {
+					parentNode[childKey] = parentNode[childKey].concat(nodes);
+				} else {
+					params = [index, 0].concat(nodes);
+					parentNode[childKey].splice.apply(parentNode[childKey], params);
+				}
+			},
+			addSelectedNode: function (setting, node) {
+				var root = data.getRoot(setting);
+				if (!data.isSelectedNode(setting, node)) {
+					root.curSelectedList.push(node);
+				}
+			},
+			addCreatedNode: function (setting, node) {
+				if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
+					var root = data.getRoot(setting);
+					root.createdNodes.push(node);
+				}
+			},
+			addZTreeTools: function (zTreeTools) {
+				_init.zTreeTools.push(zTreeTools);
+			},
+			exSetting: function (s) {
+				$.extend(true, _setting, s);
+			},
+			fixPIdKeyValue: function (setting, node) {
+				if (setting.data.simpleData.enable) {
+					node[setting.data.simpleData.pIdKey] = node.parentTId ? node.getParentNode()[setting.data.simpleData.idKey] : setting.data.simpleData.rootPId;
+				}
+			},
+			getAfterA: function (setting, node, array) {
+				for (var i = 0, j = _init.afterA.length; i < j; i++) {
+					_init.afterA[i].apply(this, arguments);
+				}
+			},
+			getBeforeA: function (setting, node, array) {
+				for (var i = 0, j = _init.beforeA.length; i < j; i++) {
+					_init.beforeA[i].apply(this, arguments);
+				}
+			},
+			getInnerAfterA: function (setting, node, array) {
+				for (var i = 0, j = _init.innerAfterA.length; i < j; i++) {
+					_init.innerAfterA[i].apply(this, arguments);
+				}
+			},
+			getInnerBeforeA: function (setting, node, array) {
+				for (var i = 0, j = _init.innerBeforeA.length; i < j; i++) {
+					_init.innerBeforeA[i].apply(this, arguments);
+				}
+			},
+			getCache: function (setting) {
+				return caches[setting.treeId];
+			},
+			getNodeIndex: function (setting, node) {
+				if (!node) return null;
+				var childKey = setting.data.key.children,
+					p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
+				for (var i = 0, l = p[childKey].length - 1; i <= l; i++) {
+					if (p[childKey][i] === node) {
+						return i;
+					}
+				}
+				return -1;
+			},
+			getNextNode: function (setting, node) {
+				if (!node) return null;
+				var childKey = setting.data.key.children,
+					p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
+				for (var i = 0, l = p[childKey].length - 1; i <= l; i++) {
+					if (p[childKey][i] === node) {
+						return (i == l ? null : p[childKey][i + 1]);
+					}
+				}
+				return null;
+			},
+			getNodeByParam: function (setting, nodes, key, value) {
+				if (!nodes || !key) return null;
+				var childKey = setting.data.key.children;
+				for (var i = 0, l = nodes.length; i < l; i++) {
+					if (nodes[i][key] == value) {
+						return nodes[i];
+					}
+					var tmp = data.getNodeByParam(setting, nodes[i][childKey], key, value);
+					if (tmp) return tmp;
+				}
+				return null;
+			},
+			getNodeCache: function (setting, tId) {
+				if (!tId) return null;
+				var n = caches[setting.treeId].nodes[data.getNodeCacheId(tId)];
+				return n ? n : null;
+			},
+			getNodeName: function (setting, node) {
+				var nameKey = setting.data.key.name;
+				return "" + node[nameKey];
+			},
+			getNodePath: function (setting, node) {
+				if (!node) return null;
 
-                var path;
-                if (node.parentTId) {
-                    path = node.getParentNode().getPath();
-                } else {
-                    path = [];
-                }
+				var path;
+				if (node.parentTId) {
+					path = node.getParentNode().getPath();
+				} else {
+					path = [];
+				}
 
-                if (path) {
-                    path.push(node);
-                }
+				if (path) {
+					path.push(node);
+				}
 
-                return path;
-            },
-            getNodeTitle: function (setting, node) {
-                var t = setting.data.key.title === "" ? setting.data.key.name : setting.data.key.title;
-                return "" + node[t];
-            },
-            getNodes: function (setting) {
-                return data.getRoot(setting)[setting.data.key.children];
-            },
-            getNodesByParam: function (setting, nodes, key, value) {
-                if (!nodes || !key) return [];
-                var childKey = setting.data.key.children,
-                    result = [];
-                for (var i = 0, l = nodes.length; i < l; i++) {
-                    if (nodes[i][key] == value) {
-                        result.push(nodes[i]);
-                    }
-                    result = result.concat(data.getNodesByParam(setting, nodes[i][childKey], key, value));
-                }
-                return result;
-            },
-            getNodesByParamFuzzy: function (setting, nodes, key, value) {
-                if (!nodes || !key) return [];
-                var childKey = setting.data.key.children,
-                    result = [];
-                value = value.toLowerCase();
-                for (var i = 0, l = nodes.length; i < l; i++) {
-                    if (typeof nodes[i][key] == "string" && nodes[i][key].toLowerCase().indexOf(value) > -1) {
-                        result.push(nodes[i]);
-                    }
-                    result = result.concat(data.getNodesByParamFuzzy(setting, nodes[i][childKey], key, value));
-                }
-                return result;
-            },
-            getNodesByFilter: function (setting, nodes, filter, isSingle, invokeParam) {
-                if (!nodes) return (isSingle ? null : []);
-                var childKey = setting.data.key.children,
-                    result = isSingle ? null : [];
-                for (var i = 0, l = nodes.length; i < l; i++) {
-                    if (tools.apply(filter, [nodes[i], invokeParam], false)) {
-                        if (isSingle) {
-                            return nodes[i];
-                        }
-                        result.push(nodes[i]);
-                    }
-                    var tmpResult = data.getNodesByFilter(setting, nodes[i][childKey], filter, isSingle, invokeParam);
-                    if (isSingle && !!tmpResult) {
-                        return tmpResult;
-                    }
-                    result = isSingle ? tmpResult : result.concat(tmpResult);
-                }
-                return result;
-            },
-            getPreNode: function (setting, node) {
-                if (!node) return null;
-                var childKey = setting.data.key.children,
-                    p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
-                for (var i = 0, l = p[childKey].length; i < l; i++) {
-                    if (p[childKey][i] === node) {
-                        return (i == 0 ? null : p[childKey][i - 1]);
-                    }
-                }
-                return null;
-            },
-            getRoot: function (setting) {
-                return setting ? roots[setting.treeId] : null;
-            },
-            getRoots: function () {
-                return roots;
-            },
-            getSetting: function (treeId) {
-                return settings[treeId];
-            },
-            getSettings: function () {
-                return settings;
-            },
-            getZTreeTools: function (treeId) {
-                var r = this.getRoot(this.getSetting(treeId));
-                return r ? r.treeTools : null;
-            },
-            initCache: function (setting) {
-                for (var i = 0, j = _init.caches.length; i < j; i++) {
-                    _init.caches[i].apply(this, arguments);
-                }
-            },
-            initNode: function (setting, level, node, parentNode, preNode, nextNode) {
-                for (var i = 0, j = _init.nodes.length; i < j; i++) {
-                    _init.nodes[i].apply(this, arguments);
-                }
-            },
-            initRoot: function (setting) {
-                for (var i = 0, j = _init.roots.length; i < j; i++) {
-                    _init.roots[i].apply(this, arguments);
-                }
-            },
-            isSelectedNode: function (setting, node) {
-                var root = data.getRoot(setting);
-                for (var i = 0, j = root.curSelectedList.length; i < j; i++) {
-                    if (node === root.curSelectedList[i]) return true;
-                }
-                return false;
-            },
-            removeNodeCache: function (setting, node) {
-                var childKey = setting.data.key.children;
-                if (node[childKey]) {
-                    for (var i = 0, l = node[childKey].length; i < l; i++) {
-                        data.removeNodeCache(setting, node[childKey][i]);
-                    }
-                }
-                data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = null;
-            },
-            removeSelectedNode: function (setting, node) {
-                var root = data.getRoot(setting);
-                for (var i = 0, j = root.curSelectedList.length; i < j; i++) {
-                    if (node === root.curSelectedList[i] || !data.getNodeCache(setting, root.curSelectedList[i].tId)) {
-                        root.curSelectedList.splice(i, 1);
-                        setting.treeObj.trigger(consts.event.UNSELECTED, [setting.treeId, node]);
-                        i--;
-                        j--;
-                    }
-                }
-            },
-            setCache: function (setting, cache) {
-                caches[setting.treeId] = cache;
-            },
-            setRoot: function (setting, root) {
-                roots[setting.treeId] = root;
-            },
-            setZTreeTools: function (setting, zTreeTools) {
-                for (var i = 0, j = _init.zTreeTools.length; i < j; i++) {
-                    _init.zTreeTools[i].apply(this, arguments);
-                }
-            },
-            transformToArrayFormat: function (setting, nodes) {
-                if (!nodes) return [];
-                var childKey = setting.data.key.children,
-                    r = [];
-                if (tools.isArray(nodes)) {
-                    for (var i = 0, l = nodes.length; i < l; i++) {
-                        r.push(nodes[i]);
-                        if (nodes[i][childKey])
-                            r = r.concat(data.transformToArrayFormat(setting, nodes[i][childKey]));
-                    }
-                } else {
-                    r.push(nodes);
-                    if (nodes[childKey])
-                        r = r.concat(data.transformToArrayFormat(setting, nodes[childKey]));
-                }
-                return r;
-            },
-            transformTozTreeFormat: function (setting, sNodes) {
-                var i, l,
-                    key = setting.data.simpleData.idKey,
-                    parentKey = setting.data.simpleData.pIdKey,
-                    childKey = setting.data.key.children;
-                if (!key || key == "" || !sNodes) return [];
+				return path;
+			},
+			getNodeTitle: function (setting, node) {
+				var t = setting.data.key.title === "" ? setting.data.key.name : setting.data.key.title;
+				return "" + node[t];
+			},
+			getNodes: function (setting) {
+				return data.getRoot(setting)[setting.data.key.children];
+			},
+			getNodesByParam: function (setting, nodes, key, value) {
+				if (!nodes || !key) return [];
+				var childKey = setting.data.key.children,
+					result = [];
+				for (var i = 0, l = nodes.length; i < l; i++) {
+					if (nodes[i][key] == value) {
+						result.push(nodes[i]);
+					}
+					result = result.concat(data.getNodesByParam(setting, nodes[i][childKey], key, value));
+				}
+				return result;
+			},
+			getNodesByParamFuzzy: function (setting, nodes, key, value) {
+				if (!nodes || !key) return [];
+				var childKey = setting.data.key.children,
+					result = [];
+				value = value.toLowerCase();
+				for (var i = 0, l = nodes.length; i < l; i++) {
+					if (typeof nodes[i][key] == "string" && nodes[i][key].toLowerCase().indexOf(value) > -1) {
+						result.push(nodes[i]);
+					}
+					result = result.concat(data.getNodesByParamFuzzy(setting, nodes[i][childKey], key, value));
+				}
+				return result;
+			},
+			getNodesByFilter: function (setting, nodes, filter, isSingle, invokeParam) {
+				if (!nodes) return (isSingle ? null : []);
+				var childKey = setting.data.key.children,
+					result = isSingle ? null : [];
+				for (var i = 0, l = nodes.length; i < l; i++) {
+					if (tools.apply(filter, [nodes[i], invokeParam], false)) {
+						if (isSingle) {
+							return nodes[i];
+						}
+						result.push(nodes[i]);
+					}
+					var tmpResult = data.getNodesByFilter(setting, nodes[i][childKey], filter, isSingle, invokeParam);
+					if (isSingle && !!tmpResult) {
+						return tmpResult;
+					}
+					result = isSingle ? tmpResult : result.concat(tmpResult);
+				}
+				return result;
+			},
+			getPreNode: function (setting, node) {
+				if (!node) return null;
+				var childKey = setting.data.key.children,
+					p = node.parentTId ? node.getParentNode() : data.getRoot(setting);
+				for (var i = 0, l = p[childKey].length; i < l; i++) {
+					if (p[childKey][i] === node) {
+						return (i == 0 ? null : p[childKey][i - 1]);
+					}
+				}
+				return null;
+			},
+			getRoot: function (setting) {
+				return setting ? roots[setting.treeId] : null;
+			},
+			getRoots: function () {
+				return roots;
+			},
+			getSetting: function (treeId) {
+				return settings[treeId];
+			},
+			getSettings: function () {
+				return settings;
+			},
+			getZTreeTools: function (treeId) {
+				var r = this.getRoot(this.getSetting(treeId));
+				return r ? r.treeTools : null;
+			},
+			initCache: function (setting) {
+				for (var i = 0, j = _init.caches.length; i < j; i++) {
+					_init.caches[i].apply(this, arguments);
+				}
+			},
+			initNode: function (setting, level, node, parentNode, preNode, nextNode) {
+				for (var i = 0, j = _init.nodes.length; i < j; i++) {
+					_init.nodes[i].apply(this, arguments);
+				}
+			},
+			initRoot: function (setting) {
+				for (var i = 0, j = _init.roots.length; i < j; i++) {
+					_init.roots[i].apply(this, arguments);
+				}
+			},
+			isSelectedNode: function (setting, node) {
+				var root = data.getRoot(setting);
+				for (var i = 0, j = root.curSelectedList.length; i < j; i++) {
+					if (node === root.curSelectedList[i]) return true;
+				}
+				return false;
+			},
+			removeNodeCache: function (setting, node) {
+				var childKey = setting.data.key.children;
+				if (node[childKey]) {
+					for (var i = 0, l = node[childKey].length; i < l; i++) {
+						data.removeNodeCache(setting, node[childKey][i]);
+					}
+				}
+				data.getCache(setting).nodes[data.getNodeCacheId(node.tId)] = null;
+			},
+			removeSelectedNode: function (setting, node) {
+				var root = data.getRoot(setting);
+				for (var i = 0, j = root.curSelectedList.length; i < j; i++) {
+					if (node === root.curSelectedList[i] || !data.getNodeCache(setting, root.curSelectedList[i].tId)) {
+						root.curSelectedList.splice(i, 1);
+						setting.treeObj.trigger(consts.event.UNSELECTED, [setting.treeId, node]);
+						i--;
+						j--;
+					}
+				}
+			},
+			setCache: function (setting, cache) {
+				caches[setting.treeId] = cache;
+			},
+			setRoot: function (setting, root) {
+				roots[setting.treeId] = root;
+			},
+			setZTreeTools: function (setting, zTreeTools) {
+				for (var i = 0, j = _init.zTreeTools.length; i < j; i++) {
+					_init.zTreeTools[i].apply(this, arguments);
+				}
+			},
+			transformToArrayFormat: function (setting, nodes) {
+				if (!nodes) return [];
+				var childKey = setting.data.key.children,
+					r = [];
+				if (tools.isArray(nodes)) {
+					for (var i = 0, l = nodes.length; i < l; i++) {
+						r.push(nodes[i]);
+						if (nodes[i][childKey])
+							r = r.concat(data.transformToArrayFormat(setting, nodes[i][childKey]));
+					}
+				} else {
+					r.push(nodes);
+					if (nodes[childKey])
+						r = r.concat(data.transformToArrayFormat(setting, nodes[childKey]));
+				}
+				return r;
+			},
+			transformTozTreeFormat: function (setting, sNodes) {
+				var i, l,
+					key = setting.data.simpleData.idKey,
+					parentKey = setting.data.simpleData.pIdKey,
+					childKey = setting.data.key.children;
+				if (!key || key == "" || !sNodes) return [];
 
-                if (tools.isArray(sNodes)) {
-                    var r = [];
-                    var tmpMap = {};
-                    for (i = 0, l = sNodes.length; i < l; i++) {
-                        tmpMap[sNodes[i][key]] = sNodes[i];
-                    }
-                    for (i = 0, l = sNodes.length; i < l; i++) {
-                        if (tmpMap[sNodes[i][parentKey]] && sNodes[i][key] != sNodes[i][parentKey]) {
-                            if (!tmpMap[sNodes[i][parentKey]][childKey])
-                                tmpMap[sNodes[i][parentKey]][childKey] = [];
-                            tmpMap[sNodes[i][parentKey]][childKey].push(sNodes[i]);
-                        } else {
-                            r.push(sNodes[i]);
-                        }
-                    }
-                    return r;
-                } else {
-                    return [sNodes];
-                }
-            }
-        },
-        //method of event proxy
-        event = {
-            bindEvent: function (setting) {
-                for (var i = 0, j = _init.bind.length; i < j; i++) {
-                    _init.bind[i].apply(this, arguments);
-                }
-            },
-            unbindEvent: function (setting) {
-                for (var i = 0, j = _init.unbind.length; i < j; i++) {
-                    _init.unbind[i].apply(this, arguments);
-                }
-            },
-            bindTree: function (setting) {
-                var eventParam = {
-                        treeId: setting.treeId
-                    },
-                    o = setting.treeObj;
-                if (!setting.view.txtSelectedEnable) {
-                    // for can't select text
-                    o.bind('selectstart', handler.onSelectStart).css({
-                        "-moz-user-select": "-moz-none"
-                    });
-                }
-                o.bind('click', eventParam, event.proxy);
-                o.bind('dblclick', eventParam, event.proxy);
-                o.bind('mouseover', eventParam, event.proxy);
-                o.bind('mouseout', eventParam, event.proxy);
-                o.bind('mousedown', eventParam, event.proxy);
-                o.bind('mouseup', eventParam, event.proxy);
-                o.bind('contextmenu', eventParam, event.proxy);
-            },
-            unbindTree: function (setting) {
-                var o = setting.treeObj;
-                o.unbind('selectstart', handler.onSelectStart)
-                    .unbind('click', event.proxy)
-                    .unbind('dblclick', event.proxy)
-                    .unbind('mouseover', event.proxy)
-                    .unbind('mouseout', event.proxy)
-                    .unbind('mousedown', event.proxy)
-                    .unbind('mouseup', event.proxy)
-                    .unbind('contextmenu', event.proxy);
-            },
-            doProxy: function (e) {
-                var results = [];
-                for (var i = 0, j = _init.proxys.length; i < j; i++) {
-                    var proxyResult = _init.proxys[i].apply(this, arguments);
-                    results.push(proxyResult);
-                    if (proxyResult.stop) {
-                        break;
-                    }
-                }
-                return results;
-            },
-            proxy: function (e) {
-                var setting = data.getSetting(e.data.treeId);
-                if (!tools.uCanDo(setting, e)) return true;
-                var results = event.doProxy(e),
-                    r = true, x = false;
-                for (var i = 0, l = results.length; i < l; i++) {
-                    var proxyResult = results[i];
-                    if (proxyResult.nodeEventCallback) {
-                        x = true;
-                        r = proxyResult.nodeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
-                    }
-                    if (proxyResult.treeEventCallback) {
-                        x = true;
-                        r = proxyResult.treeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
-                    }
-                }
-                return r;
-            }
-        },
-        //method of event handler
-        handler = {
-            onSwitchNode: function (event, node) {
-                var setting = data.getSetting(event.data.treeId);
-                if (node.open) {
-                    if (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false) return true;
-                    data.getRoot(setting).expandTriggerFlag = true;
-                    view.switchNode(setting, node);
-                } else {
-                    if (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false) return true;
-                    data.getRoot(setting).expandTriggerFlag = true;
-                    view.switchNode(setting, node);
-                }
-                return true;
-            },
-            onClickNode: function (event, node) {
-                var setting = data.getSetting(event.data.treeId),
-                    clickFlag = ( (setting.view.autoCancelSelected && (event.ctrlKey || event.metaKey)) && data.isSelectedNode(setting, node)) ? 0 : (setting.view.autoCancelSelected && (event.ctrlKey || event.metaKey) && setting.view.selectedMulti) ? 2 : 1;
-                if (tools.apply(setting.callback.beforeClick, [setting.treeId, node, clickFlag], true) == false) return true;
-                if (clickFlag === 0) {
-                    view.cancelPreSelectedNode(setting, node);
-                } else {
-                    view.selectNode(setting, node, clickFlag === 2);
-                }
-                setting.treeObj.trigger(consts.event.CLICK, [event, setting.treeId, node, clickFlag]);
-                return true;
-            },
-            onZTreeMousedown: function (event, node) {
-                var setting = data.getSetting(event.data.treeId);
-                if (tools.apply(setting.callback.beforeMouseDown, [setting.treeId, node], true)) {
-                    tools.apply(setting.callback.onMouseDown, [event, setting.treeId, node]);
-                }
-                return true;
-            },
-            onZTreeMouseup: function (event, node) {
-                var setting = data.getSetting(event.data.treeId);
-                if (tools.apply(setting.callback.beforeMouseUp, [setting.treeId, node], true)) {
-                    tools.apply(setting.callback.onMouseUp, [event, setting.treeId, node]);
-                }
-                return true;
-            },
-            onZTreeDblclick: function (event, node) {
-                var setting = data.getSetting(event.data.treeId);
-                if (tools.apply(setting.callback.beforeDblClick, [setting.treeId, node], true)) {
-                    tools.apply(setting.callback.onDblClick, [event, setting.treeId, node]);
-                }
-                return true;
-            },
-            onZTreeContextmenu: function (event, node) {
-                var setting = data.getSetting(event.data.treeId);
-                if (tools.apply(setting.callback.beforeRightClick, [setting.treeId, node], true)) {
-                    tools.apply(setting.callback.onRightClick, [event, setting.treeId, node]);
-                }
-                return (typeof setting.callback.onRightClick) != "function";
-            },
-            onSelectStart: function (e) {
-                var n = e.originalEvent.srcElement.nodeName.toLowerCase();
-                return (n === "input" || n === "textarea" );
-            }
-        },
-        //method of tools for zTree
-        tools = {
-            apply: function (fun, param, defaultValue) {
-                if ((typeof fun) == "function") {
-                    return fun.apply(zt, param ? param : []);
-                }
-                return defaultValue;
-            },
-            canAsync: function (setting, node) {
-                var childKey = setting.data.key.children;
-                return (setting.async.enable && node && node.isParent && !(node.zAsync || (node[childKey] && node[childKey].length > 0)));
-            },
-            clone: function (obj) {
-                if (obj === null) return null;
-                var o = tools.isArray(obj) ? [] : {};
-                for (var i in obj) {
-                    o[i] = (obj[i] instanceof Date) ? new Date(obj[i].getTime()) : (typeof obj[i] === "object" ? tools.clone(obj[i]) : obj[i]);
-                }
-                return o;
-            },
-            eqs: function (str1, str2) {
-                return str1.toLowerCase() === str2.toLowerCase();
-            },
-            isArray: function (arr) {
-                return Object.prototype.toString.apply(arr) === "[object Array]";
-            },
-            isElement: function (o) {
-                return (
-                    typeof HTMLElement === "object" ? o instanceof HTMLElement : //DOM2
-                        o && typeof o === "object" && o !== null && o.nodeType === 1 && typeof o.nodeName === "string"
-                );
-            },
-            $: function (node, exp, setting) {
-                if (!!exp && typeof exp != "string") {
-                    setting = exp;
-                    exp = "";
-                }
-                if (typeof node == "string") {
-                    return $(node, setting ? setting.treeObj.get(0).ownerDocument : null);
-                } else {
-                    return $("#" + node.tId + exp, setting ? setting.treeObj : null);
-                }
-            },
-            getMDom: function (setting, curDom, targetExpr) {
-                if (!curDom) return null;
-                while (curDom && curDom.id !== setting.treeId) {
-                    for (var i = 0, l = targetExpr.length; curDom.tagName && i < l; i++) {
-                        if (tools.eqs(curDom.tagName, targetExpr[i].tagName) && curDom.getAttribute(targetExpr[i].attrName) !== null) {
-                            return curDom;
-                        }
-                    }
-                    curDom = curDom.parentNode;
-                }
-                return null;
-            },
-            getNodeMainDom: function (target) {
-                return ($(target).parent("li").get(0) || $(target).parentsUntil("li").parent().get(0));
-            },
-            isChildOrSelf: function (dom, parentId) {
-                return ( $(dom).closest("#" + parentId).length > 0 );
-            },
-            uCanDo: function (setting, e) {
-                return true;
-            }
-        },
-        //method of operate ztree dom
-        view = {
-            addNodes: function (setting, parentNode, index, newNodes, isSilent) {
-                if (setting.data.keep.leaf && parentNode && !parentNode.isParent) {
-                    return;
-                }
-                if (!tools.isArray(newNodes)) {
-                    newNodes = [newNodes];
-                }
-                if (setting.data.simpleData.enable) {
-                    newNodes = data.transformTozTreeFormat(setting, newNodes);
-                }
-                if (parentNode) {
-                    var target_switchObj = $$(parentNode, consts.id.SWITCH, setting),
-                        target_icoObj = $$(parentNode, consts.id.ICON, setting),
-                        target_ulObj = $$(parentNode, consts.id.UL, setting);
+				if (tools.isArray(sNodes)) {
+					var r = [];
+					var tmpMap = {};
+					for (i = 0, l = sNodes.length; i < l; i++) {
+						tmpMap[sNodes[i][key]] = sNodes[i];
+					}
+					for (i = 0, l = sNodes.length; i < l; i++) {
+						if (tmpMap[sNodes[i][parentKey]] && sNodes[i][key] != sNodes[i][parentKey]) {
+							if (!tmpMap[sNodes[i][parentKey]][childKey])
+								tmpMap[sNodes[i][parentKey]][childKey] = [];
+							tmpMap[sNodes[i][parentKey]][childKey].push(sNodes[i]);
+						} else {
+							r.push(sNodes[i]);
+						}
+					}
+					return r;
+				} else {
+					return [sNodes];
+				}
+			}
+		},
+		//method of event proxy
+		event = {
+			bindEvent: function (setting) {
+				for (var i = 0, j = _init.bind.length; i < j; i++) {
+					_init.bind[i].apply(this, arguments);
+				}
+			},
+			unbindEvent: function (setting) {
+				for (var i = 0, j = _init.unbind.length; i < j; i++) {
+					_init.unbind[i].apply(this, arguments);
+				}
+			},
+			bindTree: function (setting) {
+				var eventParam = {
+						treeId: setting.treeId
+					},
+					o = setting.treeObj;
+				if (!setting.view.txtSelectedEnable) {
+					// for can't select text
+					o.bind('selectstart', handler.onSelectStart).css({
+						"-moz-user-select": "-moz-none"
+					});
+				}
+				o.bind('click', eventParam, event.proxy);
+				o.bind('dblclick', eventParam, event.proxy);
+				o.bind('mouseover', eventParam, event.proxy);
+				o.bind('mouseout', eventParam, event.proxy);
+				o.bind('mousedown', eventParam, event.proxy);
+				o.bind('mouseup', eventParam, event.proxy);
+				o.bind('contextmenu', eventParam, event.proxy);
+			},
+			unbindTree: function (setting) {
+				var o = setting.treeObj;
+				o.unbind('selectstart', handler.onSelectStart)
+					.unbind('click', event.proxy)
+					.unbind('dblclick', event.proxy)
+					.unbind('mouseover', event.proxy)
+					.unbind('mouseout', event.proxy)
+					.unbind('mousedown', event.proxy)
+					.unbind('mouseup', event.proxy)
+					.unbind('contextmenu', event.proxy);
+			},
+			doProxy: function (e) {
+				var results = [];
+				for (var i = 0, j = _init.proxys.length; i < j; i++) {
+					var proxyResult = _init.proxys[i].apply(this, arguments);
+					results.push(proxyResult);
+					if (proxyResult.stop) {
+						break;
+					}
+				}
+				return results;
+			},
+			proxy: function (e) {
+				var setting = data.getSetting(e.data.treeId);
+				if (!tools.uCanDo(setting, e)) return true;
+				var results = event.doProxy(e),
+					r = true, x = false;
+				for (var i = 0, l = results.length; i < l; i++) {
+					var proxyResult = results[i];
+					if (proxyResult.nodeEventCallback) {
+						x = true;
+						r = proxyResult.nodeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
+					}
+					if (proxyResult.treeEventCallback) {
+						x = true;
+						r = proxyResult.treeEventCallback.apply(proxyResult, [e, proxyResult.node]) && r;
+					}
+				}
+				return r;
+			}
+		},
+		//method of event handler
+		handler = {
+			onSwitchNode: function (event, node) {
+				var setting = data.getSetting(event.data.treeId);
+				if (node.open) {
+					if (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false) return true;
+					data.getRoot(setting).expandTriggerFlag = true;
+					view.switchNode(setting, node);
+				} else {
+					if (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false) return true;
+					data.getRoot(setting).expandTriggerFlag = true;
+					view.switchNode(setting, node);
+				}
+				return true;
+			},
+			onClickNode: function (event, node) {
+				var setting = data.getSetting(event.data.treeId),
+					clickFlag = ((setting.view.autoCancelSelected && (event.ctrlKey || event.metaKey)) && data.isSelectedNode(setting, node)) ? 0 : (setting.view.autoCancelSelected && (event.ctrlKey || event.metaKey) && setting.view.selectedMulti) ? 2 : 1;
+				if (tools.apply(setting.callback.beforeClick, [setting.treeId, node, clickFlag], true) == false) return true;
+				if (clickFlag === 0) {
+					view.cancelPreSelectedNode(setting, node);
+				} else {
+					view.selectNode(setting, node, clickFlag === 2);
+				}
+				setting.treeObj.trigger(consts.event.CLICK, [event, setting.treeId, node, clickFlag]);
+				return true;
+			},
+			onZTreeMousedown: function (event, node) {
+				var setting = data.getSetting(event.data.treeId);
+				if (tools.apply(setting.callback.beforeMouseDown, [setting.treeId, node], true)) {
+					tools.apply(setting.callback.onMouseDown, [event, setting.treeId, node]);
+				}
+				return true;
+			},
+			onZTreeMouseup: function (event, node) {
+				var setting = data.getSetting(event.data.treeId);
+				if (tools.apply(setting.callback.beforeMouseUp, [setting.treeId, node], true)) {
+					tools.apply(setting.callback.onMouseUp, [event, setting.treeId, node]);
+				}
+				return true;
+			},
+			onZTreeDblclick: function (event, node) {
+				var setting = data.getSetting(event.data.treeId);
+				if (tools.apply(setting.callback.beforeDblClick, [setting.treeId, node], true)) {
+					tools.apply(setting.callback.onDblClick, [event, setting.treeId, node]);
+				}
+				return true;
+			},
+			onZTreeContextmenu: function (event, node) {
+				var setting = data.getSetting(event.data.treeId);
+				if (tools.apply(setting.callback.beforeRightClick, [setting.treeId, node], true)) {
+					tools.apply(setting.callback.onRightClick, [event, setting.treeId, node]);
+				}
+				return (typeof setting.callback.onRightClick) != "function";
+			},
+			onSelectStart: function (e) {
+				var n = e.originalEvent.srcElement.nodeName.toLowerCase();
+				return (n === "input" || n === "textarea");
+			}
+		},
+		//method of tools for zTree
+		tools = {
+			apply: function (fun, param, defaultValue) {
+				if ((typeof fun) == "function") {
+					return fun.apply(zt, param ? param : []);
+				}
+				return defaultValue;
+			},
+			canAsync: function (setting, node) {
+				var childKey = setting.data.key.children;
+				return (setting.async.enable && node && node.isParent && !(node.zAsync || (node[childKey] && node[childKey].length > 0)));
+			},
+			clone: function (obj) {
+				if (obj === null) return null;
+				var o = tools.isArray(obj) ? [] : {};
+				for (var i in obj) {
+					o[i] = (obj[i] instanceof Date) ? new Date(obj[i].getTime()) : (typeof obj[i] === "object" ? tools.clone(obj[i]) : obj[i]);
+				}
+				return o;
+			},
+			eqs: function (str1, str2) {
+				return str1.toLowerCase() === str2.toLowerCase();
+			},
+			isArray: function (arr) {
+				return Object.prototype.toString.apply(arr) === "[object Array]";
+			},
+			isElement: function (o) {
+				return (
+					typeof HTMLElement === "object" ? o instanceof HTMLElement : //DOM2
+						o && typeof o === "object" && o !== null && o.nodeType === 1 && typeof o.nodeName === "string"
+				);
+			},
+			$: function (node, exp, setting) {
+				if (!!exp && typeof exp != "string") {
+					setting = exp;
+					exp = "";
+				}
+				if (typeof node == "string") {
+					return $(node, setting ? setting.treeObj.get(0).ownerDocument : null);
+				} else {
+					return $("#" + node.tId + exp, setting ? setting.treeObj : null);
+				}
+			},
+			getMDom: function (setting, curDom, targetExpr) {
+				if (!curDom) return null;
+				while (curDom && curDom.id !== setting.treeId) {
+					for (var i = 0, l = targetExpr.length; curDom.tagName && i < l; i++) {
+						if (tools.eqs(curDom.tagName, targetExpr[i].tagName) && curDom.getAttribute(targetExpr[i].attrName) !== null) {
+							return curDom;
+						}
+					}
+					curDom = curDom.parentNode;
+				}
+				return null;
+			},
+			getNodeMainDom: function (target) {
+				return ($(target).parent("li").get(0) || $(target).parentsUntil("li").parent().get(0));
+			},
+			isChildOrSelf: function (dom, parentId) {
+				return ($(dom).closest("#" + parentId).length > 0);
+			},
+			uCanDo: function (setting, e) {
+				return true;
+			}
+		},
+		//method of operate ztree dom
+		view = {
+			addNodes: function (setting, parentNode, index, newNodes, isSilent) {
+				if (setting.data.keep.leaf && parentNode && !parentNode.isParent) {
+					return;
+				}
+				if (!tools.isArray(newNodes)) {
+					newNodes = [newNodes];
+				}
+				if (setting.data.simpleData.enable) {
+					newNodes = data.transformTozTreeFormat(setting, newNodes);
+				}
+				if (parentNode) {
+					var target_switchObj = $$(parentNode, consts.id.SWITCH, setting),
+						target_icoObj = $$(parentNode, consts.id.ICON, setting),
+						target_ulObj = $$(parentNode, consts.id.UL, setting);
 
-                    if (!parentNode.open) {
-                        view.replaceSwitchClass(parentNode, target_switchObj, consts.folder.CLOSE);
-                        view.replaceIcoClass(parentNode, target_icoObj, consts.folder.CLOSE);
-                        parentNode.open = false;
-                        target_ulObj.css({
-                            "display": "none"
-                        });
-                    }
+					if (!parentNode.open) {
+						view.replaceSwitchClass(parentNode, target_switchObj, consts.folder.CLOSE);
+						view.replaceIcoClass(parentNode, target_icoObj, consts.folder.CLOSE);
+						parentNode.open = false;
+						target_ulObj.css({
+							"display": "none"
+						});
+					}
 
-                    data.addNodesData(setting, parentNode, index, newNodes);
-                    view.createNodes(setting, parentNode.level + 1, newNodes, parentNode, index);
-                    if (!isSilent) {
-                        view.expandCollapseParentNode(setting, parentNode, true);
-                    }
-                } else {
-                    data.addNodesData(setting, data.getRoot(setting), index, newNodes);
-                    view.createNodes(setting, 0, newNodes, null, index);
-                }
-            },
-            appendNodes: function (setting, level, nodes, parentNode, index, initFlag, openFlag) {
-                if (!nodes) return [];
-                var html = [],
-                    childKey = setting.data.key.children;
+					data.addNodesData(setting, parentNode, index, newNodes);
+					view.createNodes(setting, parentNode.level + 1, newNodes, parentNode, index);
+					if (!isSilent) {
+						view.expandCollapseParentNode(setting, parentNode, true);
+					}
+				} else {
+					data.addNodesData(setting, data.getRoot(setting), index, newNodes);
+					view.createNodes(setting, 0, newNodes, null, index);
+				}
+			},
+			appendNodes: function (setting, level, nodes, parentNode, index, initFlag, openFlag) {
+				if (!nodes) return [];
+				var html = [],
+					childKey = setting.data.key.children;
 
-                var tmpPNode = (parentNode) ? parentNode : data.getRoot(setting),
-                    tmpPChild = tmpPNode[childKey],
-                    isFirstNode, isLastNode;
+				var tmpPNode = (parentNode) ? parentNode : data.getRoot(setting),
+					tmpPChild = tmpPNode[childKey],
+					isFirstNode, isLastNode;
 
-                if (!tmpPChild || index >= tmpPChild.length - nodes.length) {
-                    index = -1;
-                }
+				if (!tmpPChild || index >= tmpPChild.length - nodes.length) {
+					index = -1;
+				}
 
-                for (var i = 0, l = nodes.length; i < l; i++) {
-                    var node = nodes[i];
-                    if (initFlag) {
-                        isFirstNode = ((index === 0 || tmpPChild.length == nodes.length) && (i == 0));
-                        isLastNode = (index < 0 && i == (nodes.length - 1));
-                        data.initNode(setting, level, node, parentNode, isFirstNode, isLastNode, openFlag);
-                        data.addNodeCache(setting, node);
-                    }
+				for (var i = 0, l = nodes.length; i < l; i++) {
+					var node = nodes[i];
+					if (initFlag) {
+						isFirstNode = ((index === 0 || tmpPChild.length == nodes.length) && (i == 0));
+						isLastNode = (index < 0 && i == (nodes.length - 1));
+						data.initNode(setting, level, node, parentNode, isFirstNode, isLastNode, openFlag);
+						data.addNodeCache(setting, node);
+					}
 
-                    var childHtml = [];
-                    if (node[childKey] && node[childKey].length > 0) {
-                        //make child html first, because checkType
-                        childHtml = view.appendNodes(setting, level + 1, node[childKey], node, -1, initFlag, openFlag && node.open);
-                    }
-                    if (openFlag) {
+					var childHtml = [];
+					if (node[childKey] && node[childKey].length > 0) {
+						//make child html first, because checkType
+						childHtml = view.appendNodes(setting, level + 1, node[childKey], node, -1, initFlag, openFlag && node.open);
+					}
+					if (openFlag) {
 
-                        view.makeDOMNodeMainBefore(html, setting, node);
-                        view.makeDOMNodeLine(html, setting, node);
-                        data.getBeforeA(setting, node, html);
-                        view.makeDOMNodeNameBefore(html, setting, node);
-                        data.getInnerBeforeA(setting, node, html);
-                        view.makeDOMNodeIcon(html, setting, node);
-                        data.getInnerAfterA(setting, node, html);
-                        view.makeDOMNodeNameAfter(html, setting, node);
-                        data.getAfterA(setting, node, html);
-                        if (node.isParent && node.open) {
-                            view.makeUlHtml(setting, node, html, childHtml.join(''));
-                        }
-                        view.makeDOMNodeMainAfter(html, setting, node);
-                        data.addCreatedNode(setting, node);
-                    }
-                }
-                return html;
-            },
-            appendParentULDom: function (setting, node) {
-                var html = [],
-                    nObj = $$(node, setting);
-                if (!nObj.get(0) && !!node.parentTId) {
-                    view.appendParentULDom(setting, node.getParentNode());
-                    nObj = $$(node, setting);
-                }
-                var ulObj = $$(node, consts.id.UL, setting);
-                if (ulObj.get(0)) {
-                    ulObj.remove();
-                }
-                var childKey = setting.data.key.children,
-                    childHtml = view.appendNodes(setting, node.level + 1, node[childKey], node, -1, false, true);
-                view.makeUlHtml(setting, node, html, childHtml.join(''));
-                nObj.append(html.join(''));
-            },
-            asyncNode: function (setting, node, isSilent, callback) {
-                var i, l;
-                if (node && !node.isParent) {
-                    tools.apply(callback);
-                    return false;
-                } else if (node && node.isAjaxing) {
-                    return false;
-                } else if (tools.apply(setting.callback.beforeAsync, [setting.treeId, node], true) == false) {
-                    tools.apply(callback);
-                    return false;
-                }
-                if (node) {
-                    node.isAjaxing = true;
-                    var icoObj = $$(node, consts.id.ICON, setting);
-                    icoObj.attr({"style": "", "class": consts.className.BUTTON + " " + consts.className.ICO_LOADING});
-                }
+						view.makeDOMNodeMainBefore(html, setting, node);
+						view.makeDOMNodeLine(html, setting, node);
+						data.getBeforeA(setting, node, html);
+						view.makeDOMNodeNameBefore(html, setting, node);
+						data.getInnerBeforeA(setting, node, html);
+						view.makeDOMNodeIcon(html, setting, node);
+						data.getInnerAfterA(setting, node, html);
+						view.makeDOMNodeNameAfter(html, setting, node);
+						data.getAfterA(setting, node, html);
+						if (node.isParent && node.open) {
+							view.makeUlHtml(setting, node, html, childHtml.join(''));
+						}
+						view.makeDOMNodeMainAfter(html, setting, node);
+						data.addCreatedNode(setting, node);
+					}
+				}
+				return html;
+			},
+			appendParentULDom: function (setting, node) {
+				var html = [],
+					nObj = $$(node, setting);
+				if (!nObj.get(0) && !!node.parentTId) {
+					view.appendParentULDom(setting, node.getParentNode());
+					nObj = $$(node, setting);
+				}
+				var ulObj = $$(node, consts.id.UL, setting);
+				if (ulObj.get(0)) {
+					ulObj.remove();
+				}
+				var childKey = setting.data.key.children,
+					childHtml = view.appendNodes(setting, node.level + 1, node[childKey], node, -1, false, true);
+				view.makeUlHtml(setting, node, html, childHtml.join(''));
+				nObj.append(html.join(''));
+			},
+			asyncNode: function (setting, node, isSilent, callback) {
+				var i, l;
+				if (node && !node.isParent) {
+					tools.apply(callback);
+					return false;
+				} else if (node && node.isAjaxing) {
+					return false;
+				} else if (tools.apply(setting.callback.beforeAsync, [setting.treeId, node], true) == false) {
+					tools.apply(callback);
+					return false;
+				}
+				if (node) {
+					node.isAjaxing = true;
+					var icoObj = $$(node, consts.id.ICON, setting);
+					icoObj.attr({"style": "", "class": consts.className.BUTTON + " " + consts.className.ICO_LOADING});
+				}
 
-                var tmpParam = {};
-                for (i = 0, l = setting.async.autoParam.length; node && i < l; i++) {
-                    var pKey = setting.async.autoParam[i].split("="), spKey = pKey;
-                    if (pKey.length > 1) {
-                        spKey = pKey[1];
-                        pKey = pKey[0];
-                    }
-                    tmpParam[spKey] = node[pKey];
-                }
-                if (tools.isArray(setting.async.otherParam)) {
-                    for (i = 0, l = setting.async.otherParam.length; i < l; i += 2) {
-                        tmpParam[setting.async.otherParam[i]] = setting.async.otherParam[i + 1];
-                    }
-                } else {
-                    for (var p in setting.async.otherParam) {
-                        tmpParam[p] = setting.async.otherParam[p];
-                    }
-                }
+				var tmpParam = {};
+				for (i = 0, l = setting.async.autoParam.length; node && i < l; i++) {
+					var pKey = setting.async.autoParam[i].split("="), spKey = pKey;
+					if (pKey.length > 1) {
+						spKey = pKey[1];
+						pKey = pKey[0];
+					}
+					tmpParam[spKey] = node[pKey];
+				}
+				if (tools.isArray(setting.async.otherParam)) {
+					for (i = 0, l = setting.async.otherParam.length; i < l; i += 2) {
+						tmpParam[setting.async.otherParam[i]] = setting.async.otherParam[i + 1];
+					}
+				} else {
+					for (var p in setting.async.otherParam) {
+						tmpParam[p] = setting.async.otherParam[p];
+					}
+				}
 
-                var _tmpV = data.getRoot(setting)._ver;
-                $.ajax({
-                    contentType: setting.async.contentType,
-                    cache: false,
-                    type: setting.async.type,
-                    url: tools.apply(setting.async.url, [setting.treeId, node], setting.async.url),
-                    data: setting.async.contentType.indexOf('application/json') > -1 ? JSON.stringify(tmpParam) : tmpParam,
-                    dataType: setting.async.dataType,
-                    success: function (msg) {
-                        if (_tmpV != data.getRoot(setting)._ver) {
-                            return;
-                        }
-                        var newNodes = [];
-                        try {
-                            if (!msg || msg.length == 0) {
-                                newNodes = [];
-                            } else if (typeof msg == "string") {
-                                newNodes = eval("(" + msg + ")");
-                            } else {
-                                newNodes = msg;
-                            }
-                        } catch (err) {
-                            newNodes = msg;
-                        }
+				var _tmpV = data.getRoot(setting)._ver;
+				$.ajax({
+					contentType: setting.async.contentType,
+					cache: false,
+					type: setting.async.type,
+					url: tools.apply(setting.async.url, [setting.treeId, node], setting.async.url),
+					data: setting.async.contentType.indexOf('application/json') > -1 ? JSON.stringify(tmpParam) : tmpParam,
+					dataType: setting.async.dataType,
+					success: function (msg) {
+						if (_tmpV != data.getRoot(setting)._ver) {
+							return;
+						}
+						var newNodes = [];
+						try {
+							if (!msg || msg.length == 0) {
+								newNodes = [];
+							} else if (typeof msg == "string") {
+								newNodes = eval("(" + msg + ")");
+							} else {
+								newNodes = msg;
+							}
+						} catch (err) {
+							newNodes = msg;
+						}
 
-                        if (node) {
-                            node.isAjaxing = null;
-                            node.zAsync = true;
-                        }
-                        view.setNodeLineIcos(setting, node);
-                        if (newNodes && newNodes !== "") {
-                            newNodes = tools.apply(setting.async.dataFilter, [setting.treeId, node, newNodes], newNodes);
-                            view.addNodes(setting, node, -1, !!newNodes ? tools.clone(newNodes) : [], !!isSilent);
-                        } else {
-                            view.addNodes(setting, node, -1, [], !!isSilent);
-                        }
-                        setting.treeObj.trigger(consts.event.ASYNC_SUCCESS, [setting.treeId, node, msg]);
-                        tools.apply(callback);
-                    },
-                    error: function (XMLHttpRequest, textStatus, errorThrown) {
-                        if (_tmpV != data.getRoot(setting)._ver) {
-                            return;
-                        }
-                        if (node) node.isAjaxing = null;
-                        view.setNodeLineIcos(setting, node);
-                        setting.treeObj.trigger(consts.event.ASYNC_ERROR, [setting.treeId, node, XMLHttpRequest, textStatus, errorThrown]);
-                    }
-                });
-                return true;
-            },
-            cancelPreSelectedNode: function (setting, node, excludeNode) {
-                var list = data.getRoot(setting).curSelectedList,
-                    i, n;
-                for (i = list.length - 1; i >= 0; i--) {
-                    n = list[i];
-                    if (node === n || (!node && (!excludeNode || excludeNode !== n))) {
-                        $$(n, consts.id.A, setting).removeClass(consts.node.CURSELECTED);
-                        if (node) {
-                            data.removeSelectedNode(setting, node);
-                            break;
-                        } else {
-                            list.splice(i, 1);
-                            setting.treeObj.trigger(consts.event.UNSELECTED, [setting.treeId, n]);
-                        }
-                    }
-                }
-            },
-            createNodeCallback: function (setting) {
-                if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
-                    var root = data.getRoot(setting);
-                    while (root.createdNodes.length > 0) {
-                        var node = root.createdNodes.shift();
-                        tools.apply(setting.view.addDiyDom, [setting.treeId, node]);
-                        if (!!setting.callback.onNodeCreated) {
-                            setting.treeObj.trigger(consts.event.NODECREATED, [setting.treeId, node]);
-                        }
-                    }
-                }
-            },
-            createNodes: function (setting, level, nodes, parentNode, index) {
-                if (!nodes || nodes.length == 0) return;
-                var root = data.getRoot(setting),
-                    childKey = setting.data.key.children,
-                    openFlag = !parentNode || parentNode.open || !!$$(parentNode[childKey][0], setting).get(0);
-                root.createdNodes = [];
-                var zTreeHtml = view.appendNodes(setting, level, nodes, parentNode, index, true, openFlag),
-                    parentObj, nextObj;
+						if (node) {
+							node.isAjaxing = null;
+							node.zAsync = true;
+						}
+						view.setNodeLineIcos(setting, node);
+						if (newNodes && newNodes !== "") {
+							newNodes = tools.apply(setting.async.dataFilter, [setting.treeId, node, newNodes], newNodes);
+							view.addNodes(setting, node, -1, !!newNodes ? tools.clone(newNodes) : [], !!isSilent);
+						} else {
+							view.addNodes(setting, node, -1, [], !!isSilent);
+						}
+						setting.treeObj.trigger(consts.event.ASYNC_SUCCESS, [setting.treeId, node, msg]);
+						tools.apply(callback);
+					},
+					error: function (XMLHttpRequest, textStatus, errorThrown) {
+						if (_tmpV != data.getRoot(setting)._ver) {
+							return;
+						}
+						if (node) node.isAjaxing = null;
+						view.setNodeLineIcos(setting, node);
+						setting.treeObj.trigger(consts.event.ASYNC_ERROR, [setting.treeId, node, XMLHttpRequest, textStatus, errorThrown]);
+					}
+				});
+				return true;
+			},
+			cancelPreSelectedNode: function (setting, node, excludeNode) {
+				var list = data.getRoot(setting).curSelectedList,
+					i, n;
+				for (i = list.length - 1; i >= 0; i--) {
+					n = list[i];
+					if (node === n || (!node && (!excludeNode || excludeNode !== n))) {
+						$$(n, consts.id.A, setting).removeClass(consts.node.CURSELECTED);
+						if (node) {
+							data.removeSelectedNode(setting, node);
+							break;
+						} else {
+							list.splice(i, 1);
+							setting.treeObj.trigger(consts.event.UNSELECTED, [setting.treeId, n]);
+						}
+					}
+				}
+			},
+			createNodeCallback: function (setting) {
+				if (!!setting.callback.onNodeCreated || !!setting.view.addDiyDom) {
+					var root = data.getRoot(setting);
+					while (root.createdNodes.length > 0) {
+						var node = root.createdNodes.shift();
+						tools.apply(setting.view.addDiyDom, [setting.treeId, node]);
+						if (!!setting.callback.onNodeCreated) {
+							setting.treeObj.trigger(consts.event.NODECREATED, [setting.treeId, node]);
+						}
+					}
+				}
+			},
+			createNodes: function (setting, level, nodes, parentNode, index) {
+				if (!nodes || nodes.length == 0) return;
+				var root = data.getRoot(setting),
+					childKey = setting.data.key.children,
+					openFlag = !parentNode || parentNode.open || !!$$(parentNode[childKey][0], setting).get(0);
+				root.createdNodes = [];
+				var zTreeHtml = view.appendNodes(setting, level, nodes, parentNode, index, true, openFlag),
+					parentObj, nextObj;
 
-                if (!parentNode) {
-                    parentObj = setting.treeObj;
-                    //setting.treeObj.append(zTreeHtml.join(''));
-                } else {
-                    var ulObj = $$(parentNode, consts.id.UL, setting);
-                    if (ulObj.get(0)) {
-                        parentObj = ulObj;
-                        //ulObj.append(zTreeHtml.join(''));
-                    }
-                }
-                if (parentObj) {
-                    if (index >= 0) {
-                        nextObj = parentObj.children()[index];
-                    }
-                    if (index >= 0 && nextObj) {
-                        $(nextObj).before(zTreeHtml.join(''));
-                    } else {
-                        parentObj.append(zTreeHtml.join(''));
-                    }
-                }
+				if (!parentNode) {
+					parentObj = setting.treeObj;
+					//setting.treeObj.append(zTreeHtml.join(''));
+				} else {
+					var ulObj = $$(parentNode, consts.id.UL, setting);
+					if (ulObj.get(0)) {
+						parentObj = ulObj;
+						//ulObj.append(zTreeHtml.join(''));
+					}
+				}
+				if (parentObj) {
+					if (index >= 0) {
+						nextObj = parentObj.children()[index];
+					}
+					if (index >= 0 && nextObj) {
+						$(nextObj).before(zTreeHtml.join(''));
+					} else {
+						parentObj.append(zTreeHtml.join(''));
+					}
+				}
 
-                view.createNodeCallback(setting);
-            },
-            destroy: function (setting) {
-                if (!setting) return;
-                data.initCache(setting);
-                data.initRoot(setting);
-                event.unbindTree(setting);
-                event.unbindEvent(setting);
-                setting.treeObj.empty();
-                delete settings[setting.treeId];
-            },
-            expandCollapseNode: function (setting, node, expandFlag, animateFlag, callback) {
-                var root = data.getRoot(setting),
-                    childKey = setting.data.key.children;
-                var tmpCb, _callback;
-                if (!node) {
-                    tools.apply(callback, []);
-                    return;
-                }
-                if (root.expandTriggerFlag) {
-                    _callback = callback;
-                    tmpCb = function () {
-                        if (_callback) _callback();
-                        if (node.open) {
-                            setting.treeObj.trigger(consts.event.EXPAND, [setting.treeId, node]);
-                        } else {
-                            setting.treeObj.trigger(consts.event.COLLAPSE, [setting.treeId, node]);
-                        }
-                    };
-                    callback = tmpCb;
-                    root.expandTriggerFlag = false;
-                }
-                if (!node.open && node.isParent && ((!$$(node, consts.id.UL, setting).get(0)) || (node[childKey] && node[childKey].length > 0 && !$$(node[childKey][0], setting).get(0)))) {
-                    view.appendParentULDom(setting, node);
-                    view.createNodeCallback(setting);
-                }
-                if (node.open == expandFlag) {
-                    tools.apply(callback, []);
-                    return;
-                }
-                var ulObj = $$(node, consts.id.UL, setting),
-                    switchObj = $$(node, consts.id.SWITCH, setting),
-                    icoObj = $$(node, consts.id.ICON, setting);
+				view.createNodeCallback(setting);
+			},
+			destroy: function (setting) {
+				if (!setting) return;
+				data.initCache(setting);
+				data.initRoot(setting);
+				event.unbindTree(setting);
+				event.unbindEvent(setting);
+				setting.treeObj.empty();
+				delete settings[setting.treeId];
+			},
+			expandCollapseNode: function (setting, node, expandFlag, animateFlag, callback) {
+				var root = data.getRoot(setting),
+					childKey = setting.data.key.children;
+				var tmpCb, _callback;
+				if (!node) {
+					tools.apply(callback, []);
+					return;
+				}
+				if (root.expandTriggerFlag) {
+					_callback = callback;
+					tmpCb = function () {
+						if (_callback) _callback();
+						if (node.open) {
+							setting.treeObj.trigger(consts.event.EXPAND, [setting.treeId, node]);
+						} else {
+							setting.treeObj.trigger(consts.event.COLLAPSE, [setting.treeId, node]);
+						}
+					};
+					callback = tmpCb;
+					root.expandTriggerFlag = false;
+				}
+				if (!node.open && node.isParent && ((!$$(node, consts.id.UL, setting).get(0)) || (node[childKey] && node[childKey].length > 0 && !$$(node[childKey][0], setting).get(0)))) {
+					view.appendParentULDom(setting, node);
+					view.createNodeCallback(setting);
+				}
+				if (node.open == expandFlag) {
+					tools.apply(callback, []);
+					return;
+				}
+				var ulObj = $$(node, consts.id.UL, setting),
+					switchObj = $$(node, consts.id.SWITCH, setting),
+					icoObj = $$(node, consts.id.ICON, setting);
 
-                if (node.isParent) {
-                    node.open = !node.open;
-                    if (node.iconOpen && node.iconClose) {
-                        icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
-                    }
+				if (node.isParent) {
+					node.open = !node.open;
+					if (node.iconOpen && node.iconClose) {
+						icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
+					}
 
-                    if (node.open) {
-                        view.replaceSwitchClass(node, switchObj, consts.folder.OPEN);
-                        view.replaceIcoClass(node, icoObj, consts.folder.OPEN);
-                        if (animateFlag == false || setting.view.expandSpeed == "") {
-                            ulObj.show();
-                            tools.apply(callback, []);
-                        } else {
-                            if (node[childKey] && node[childKey].length > 0) {
-                                ulObj.slideDown(setting.view.expandSpeed, callback);
-                            } else {
-                                ulObj.show();
-                                tools.apply(callback, []);
-                            }
-                        }
-                    } else {
-                        view.replaceSwitchClass(node, switchObj, consts.folder.CLOSE);
-                        view.replaceIcoClass(node, icoObj, consts.folder.CLOSE);
-                        if (animateFlag == false || setting.view.expandSpeed == "" || !(node[childKey] && node[childKey].length > 0)) {
-                            ulObj.hide();
-                            tools.apply(callback, []);
-                        } else {
-                            ulObj.slideUp(setting.view.expandSpeed, callback);
-                        }
-                    }
-                } else {
-                    tools.apply(callback, []);
-                }
-            },
-            expandCollapseParentNode: function (setting, node, expandFlag, animateFlag, callback) {
-                if (!node) return;
-                if (!node.parentTId) {
-                    view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback);
-                    return;
-                } else {
-                    view.expandCollapseNode(setting, node, expandFlag, animateFlag);
-                }
-                if (node.parentTId) {
-                    view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, animateFlag, callback);
-                }
-            },
-            expandCollapseSonNode: function (setting, node, expandFlag, animateFlag, callback) {
-                var root = data.getRoot(setting),
-                    childKey = setting.data.key.children,
-                    treeNodes = (node) ? node[childKey] : root[childKey],
-                    selfAnimateSign = (node) ? false : animateFlag,
-                    expandTriggerFlag = data.getRoot(setting).expandTriggerFlag;
-                data.getRoot(setting).expandTriggerFlag = false;
-                if (treeNodes) {
-                    for (var i = 0, l = treeNodes.length; i < l; i++) {
-                        if (treeNodes[i]) view.expandCollapseSonNode(setting, treeNodes[i], expandFlag, selfAnimateSign);
-                    }
-                }
-                data.getRoot(setting).expandTriggerFlag = expandTriggerFlag;
-                view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback);
-            },
-            isSelectedNode: function (setting, node) {
-                if (!node) {
-                    return false;
-                }
-                var list = data.getRoot(setting).curSelectedList,
-                    i;
-                for (i = list.length - 1; i >= 0; i--) {
-                    if (node === list[i]) {
-                        return true;
-                    }
-                }
-                return false;
-            },
-            makeDOMNodeIcon: function (html, setting, node) {
-                var nameStr = data.getNodeName(setting, node),
-                    name = setting.view.nameIsHTML ? nameStr : nameStr.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-                html.push("<span id='", node.tId, consts.id.ICON,
-                    "' title='' treeNode", consts.id.ICON, " class='", view.makeNodeIcoClass(setting, node),
-                    "' style='", view.makeNodeIcoStyle(setting, node), "'></span><span id='", node.tId, consts.id.SPAN,
-                    "' class='", consts.className.NAME,
-                    "'>", name, "</span>");
-            },
-            makeDOMNodeLine: function (html, setting, node) {
-                html.push("<span id='", node.tId, consts.id.SWITCH, "' title='' class='", view.makeNodeLineClass(setting, node), "' treeNode", consts.id.SWITCH, "></span>");
-            },
-            makeDOMNodeMainAfter: function (html, setting, node) {
-                html.push("</li>");
-            },
-            makeDOMNodeMainBefore: function (html, setting, node) {
-                html.push("<li id='", node.tId, "' class='", consts.className.LEVEL, node.level, "' tabindex='0' hidefocus='true' treenode>");
-            },
-            makeDOMNodeNameAfter: function (html, setting, node) {
-                html.push("</a>");
-            },
-            makeDOMNodeNameBefore: function (html, setting, node) {
-                var title = data.getNodeTitle(setting, node),
-                    url = view.makeNodeUrl(setting, node),
-                    fontcss = view.makeNodeFontCss(setting, node),
-                    fontStyle = [];
-                for (var f in fontcss) {
-                    fontStyle.push(f, ":", fontcss[f], ";");
-                }
-                html.push("<a id='", node.tId, consts.id.A, "' class='", consts.className.LEVEL, node.level, "' treeNode", consts.id.A, " onclick=\"", (node.click || ''),
-                    "\" ", ((url != null && url.length > 0) ? "href='" + url + "'" : ""), " target='", view.makeNodeTarget(node), "' style='", fontStyle.join(''),
-                    "'");
-                if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle) && title) {
-                    html.push("title='", title.replace(/'/g, "&#39;").replace(/</g, '&lt;').replace(/>/g, '&gt;'), "'");
-                }
-                html.push(">");
-            },
-            makeNodeFontCss: function (setting, node) {
-                var fontCss = tools.apply(setting.view.fontCss, [setting.treeId, node], setting.view.fontCss);
-                return (fontCss && ((typeof fontCss) != "function")) ? fontCss : {};
-            },
-            makeNodeIcoClass: function (setting, node) {
-                var icoCss = ["ico"];
-                if (!node.isAjaxing) {
-                    icoCss[0] = (node.iconSkin ? node.iconSkin + "_" : "") + icoCss[0];
-                    if (node.isParent) {
-                        icoCss.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
-                    } else {
-                        icoCss.push(consts.folder.DOCU);
-                    }
-                }
-                return consts.className.BUTTON + " " + icoCss.join('_');
-            },
-            makeNodeIcoStyle: function (setting, node) {
-                var icoStyle = [];
-                if (!node.isAjaxing) {
-                    var icon = (node.isParent && node.iconOpen && node.iconClose) ? (node.open ? node.iconOpen : node.iconClose) : node[setting.data.key.icon];
-                    if (icon) icoStyle.push("background:url(", icon, ") 0 0 no-repeat;");
-                    if (setting.view.showIcon == false || !tools.apply(setting.view.showIcon, [setting.treeId, node], true)) {
-                        icoStyle.push("width:0px;height:0px;");
-                    }
-                }
-                return icoStyle.join('');
-            },
-            makeNodeLineClass: function (setting, node) {
-                var lineClass = [];
-                if (setting.view.showLine) {
-                    if (node.level == 0 && node.isFirstNode && node.isLastNode) {
-                        lineClass.push(consts.line.ROOT);
-                    } else if (node.level == 0 && node.isFirstNode) {
-                        lineClass.push(consts.line.ROOTS);
-                    } else if (node.isLastNode) {
-                        lineClass.push(consts.line.BOTTOM);
-                    } else {
-                        lineClass.push(consts.line.CENTER);
-                    }
-                } else {
-                    lineClass.push(consts.line.NOLINE);
-                }
-                if (node.isParent) {
-                    lineClass.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
-                } else {
-                    lineClass.push(consts.folder.DOCU);
-                }
-                return view.makeNodeLineClassEx(node) + lineClass.join('_');
-            },
-            makeNodeLineClassEx: function (node) {
-                return consts.className.BUTTON + " " + consts.className.LEVEL + node.level + " " + consts.className.SWITCH + " ";
-            },
-            makeNodeTarget: function (node) {
-                return (node.target || "_blank");
-            },
-            makeNodeUrl: function (setting, node) {
-                var urlKey = setting.data.key.url;
-                return node[urlKey] ? node[urlKey] : null;
-            },
-            makeUlHtml: function (setting, node, html, content) {
-                html.push("<ul id='", node.tId, consts.id.UL, "' class='", consts.className.LEVEL, node.level, " ", view.makeUlLineClass(setting, node), "' style='display:", (node.open ? "block" : "none"), "'>");
-                html.push(content);
-                html.push("</ul>");
-            },
-            makeUlLineClass: function (setting, node) {
-                return ((setting.view.showLine && !node.isLastNode) ? consts.line.LINE : "");
-            },
-            removeChildNodes: function (setting, node) {
-                if (!node) return;
-                var childKey = setting.data.key.children,
-                    nodes = node[childKey];
-                if (!nodes) return;
+					if (node.open) {
+						view.replaceSwitchClass(node, switchObj, consts.folder.OPEN);
+						view.replaceIcoClass(node, icoObj, consts.folder.OPEN);
+						if (animateFlag == false || setting.view.expandSpeed == "") {
+							ulObj.show();
+							tools.apply(callback, []);
+						} else {
+							if (node[childKey] && node[childKey].length > 0) {
+								ulObj.slideDown(setting.view.expandSpeed, callback);
+							} else {
+								ulObj.show();
+								tools.apply(callback, []);
+							}
+						}
+					} else {
+						view.replaceSwitchClass(node, switchObj, consts.folder.CLOSE);
+						view.replaceIcoClass(node, icoObj, consts.folder.CLOSE);
+						if (animateFlag == false || setting.view.expandSpeed == "" || !(node[childKey] && node[childKey].length > 0)) {
+							ulObj.hide();
+							tools.apply(callback, []);
+						} else {
+							ulObj.slideUp(setting.view.expandSpeed, callback);
+						}
+					}
+				} else {
+					tools.apply(callback, []);
+				}
+			},
+			expandCollapseParentNode: function (setting, node, expandFlag, animateFlag, callback) {
+				if (!node) return;
+				if (!node.parentTId) {
+					view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback);
+					return;
+				} else {
+					view.expandCollapseNode(setting, node, expandFlag, animateFlag);
+				}
+				if (node.parentTId) {
+					view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, animateFlag, callback);
+				}
+			},
+			expandCollapseSonNode: function (setting, node, expandFlag, animateFlag, callback) {
+				var root = data.getRoot(setting),
+					childKey = setting.data.key.children,
+					treeNodes = (node) ? node[childKey] : root[childKey],
+					selfAnimateSign = (node) ? false : animateFlag,
+					expandTriggerFlag = data.getRoot(setting).expandTriggerFlag;
+				data.getRoot(setting).expandTriggerFlag = false;
+				if (treeNodes) {
+					for (var i = 0, l = treeNodes.length; i < l; i++) {
+						if (treeNodes[i]) view.expandCollapseSonNode(setting, treeNodes[i], expandFlag, selfAnimateSign);
+					}
+				}
+				data.getRoot(setting).expandTriggerFlag = expandTriggerFlag;
+				view.expandCollapseNode(setting, node, expandFlag, animateFlag, callback);
+			},
+			isSelectedNode: function (setting, node) {
+				if (!node) {
+					return false;
+				}
+				var list = data.getRoot(setting).curSelectedList,
+					i;
+				for (i = list.length - 1; i >= 0; i--) {
+					if (node === list[i]) {
+						return true;
+					}
+				}
+				return false;
+			},
+			makeDOMNodeIcon: function (html, setting, node) {
+				var nameStr = data.getNodeName(setting, node),
+					name = setting.view.nameIsHTML ? nameStr : nameStr.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+				html.push("<span id='", node.tId, consts.id.ICON,
+					"' title='' treeNode", consts.id.ICON, " class='", view.makeNodeIcoClass(setting, node),
+					"' style='", view.makeNodeIcoStyle(setting, node), "'></span><span id='", node.tId, consts.id.SPAN,
+					"' class='", consts.className.NAME,
+					"'>", name, "</span>");
+			},
+			makeDOMNodeLine: function (html, setting, node) {
+				html.push("<span id='", node.tId, consts.id.SWITCH, "' title='' class='", view.makeNodeLineClass(setting, node), "' treeNode", consts.id.SWITCH, "></span>");
+			},
+			makeDOMNodeMainAfter: function (html, setting, node) {
+				html.push("</li>");
+			},
+			makeDOMNodeMainBefore: function (html, setting, node) {
+				html.push("<li id='", node.tId, "' class='", consts.className.LEVEL, node.level, "' tabindex='0' hidefocus='true' treenode>");
+			},
+			makeDOMNodeNameAfter: function (html, setting, node) {
+				html.push("</a>");
+			},
+			makeDOMNodeNameBefore: function (html, setting, node) {
+				var title = data.getNodeTitle(setting, node),
+					url = view.makeNodeUrl(setting, node),
+					fontcss = view.makeNodeFontCss(setting, node),
+					fontStyle = [];
+				for (var f in fontcss) {
+					fontStyle.push(f, ":", fontcss[f], ";");
+				}
+				html.push("<a id='", node.tId, consts.id.A, "' class='", consts.className.LEVEL, node.level, "' treeNode", consts.id.A, " onclick=\"", (node.click || ''),
+					"\" ", ((url != null && url.length > 0) ? "href='" + url + "'" : ""), " target='", view.makeNodeTarget(node), "' style='", fontStyle.join(''),
+					"'");
+				if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle) && title) {
+					html.push("title='", title.replace(/'/g, "&#39;").replace(/</g, '&lt;').replace(/>/g, '&gt;'), "'");
+				}
+				html.push(">");
+			},
+			makeNodeFontCss: function (setting, node) {
+				var fontCss = tools.apply(setting.view.fontCss, [setting.treeId, node], setting.view.fontCss);
+				return (fontCss && ((typeof fontCss) != "function")) ? fontCss : {};
+			},
+			makeNodeIcoClass: function (setting, node) {
+				var icoCss = ["ico"];
+				if (!node.isAjaxing) {
+					icoCss[0] = (node.iconSkin ? node.iconSkin + "_" : "") + icoCss[0];
+					if (node.isParent) {
+						icoCss.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
+					} else {
+						icoCss.push(consts.folder.DOCU);
+					}
+				}
+				return consts.className.BUTTON + " " + icoCss.join('_');
+			},
+			makeNodeIcoStyle: function (setting, node) {
+				var icoStyle = [];
+				if (!node.isAjaxing) {
+					var icon = (node.isParent && node.iconOpen && node.iconClose) ? (node.open ? node.iconOpen : node.iconClose) : node[setting.data.key.icon];
+					if (icon) icoStyle.push("background:url(", icon, ") 0 0 no-repeat;");
+					if (setting.view.showIcon == false || !tools.apply(setting.view.showIcon, [setting.treeId, node], true)) {
+						icoStyle.push("width:0px;height:0px;");
+					}
+				}
+				return icoStyle.join('');
+			},
+			makeNodeLineClass: function (setting, node) {
+				var lineClass = [];
+				if (setting.view.showLine) {
+					if (node.level == 0 && node.isFirstNode && node.isLastNode) {
+						lineClass.push(consts.line.ROOT);
+					} else if (node.level == 0 && node.isFirstNode) {
+						lineClass.push(consts.line.ROOTS);
+					} else if (node.isLastNode) {
+						lineClass.push(consts.line.BOTTOM);
+					} else {
+						lineClass.push(consts.line.CENTER);
+					}
+				} else {
+					lineClass.push(consts.line.NOLINE);
+				}
+				if (node.isParent) {
+					lineClass.push(node.open ? consts.folder.OPEN : consts.folder.CLOSE);
+				} else {
+					lineClass.push(consts.folder.DOCU);
+				}
+				return view.makeNodeLineClassEx(node) + lineClass.join('_');
+			},
+			makeNodeLineClassEx: function (node) {
+				return consts.className.BUTTON + " " + consts.className.LEVEL + node.level + " " + consts.className.SWITCH + " ";
+			},
+			makeNodeTarget: function (node) {
+				return (node.target || "_blank");
+			},
+			makeNodeUrl: function (setting, node) {
+				var urlKey = setting.data.key.url;
+				return node[urlKey] ? node[urlKey] : null;
+			},
+			makeUlHtml: function (setting, node, html, content) {
+				html.push("<ul id='", node.tId, consts.id.UL, "' class='", consts.className.LEVEL, node.level, " ", view.makeUlLineClass(setting, node), "' style='display:", (node.open ? "block" : "none"), "'>");
+				html.push(content);
+				html.push("</ul>");
+			},
+			makeUlLineClass: function (setting, node) {
+				return ((setting.view.showLine && !node.isLastNode) ? consts.line.LINE : "");
+			},
+			removeChildNodes: function (setting, node) {
+				if (!node) return;
+				var childKey = setting.data.key.children,
+					nodes = node[childKey];
+				if (!nodes) return;
 
-                for (var i = 0, l = nodes.length; i < l; i++) {
-                    data.removeNodeCache(setting, nodes[i]);
-                }
-                data.removeSelectedNode(setting);
-                delete node[childKey];
+				for (var i = 0, l = nodes.length; i < l; i++) {
+					data.removeNodeCache(setting, nodes[i]);
+				}
+				data.removeSelectedNode(setting);
+				delete node[childKey];
 
-                if (!setting.data.keep.parent) {
-                    node.isParent = false;
-                    node.open = false;
-                    var tmp_switchObj = $$(node, consts.id.SWITCH, setting),
-                        tmp_icoObj = $$(node, consts.id.ICON, setting);
-                    view.replaceSwitchClass(node, tmp_switchObj, consts.folder.DOCU);
-                    view.replaceIcoClass(node, tmp_icoObj, consts.folder.DOCU);
-                    $$(node, consts.id.UL, setting).remove();
-                } else {
-                    $$(node, consts.id.UL, setting).empty();
-                }
-            },
-            scrollIntoView: function (setting, dom) {
-                if (!dom) {
-                    return;
-                }
-                // support IE 7
-                if (typeof Element === 'undefined') {
-                  var contRect = setting.treeObj.get(0).getBoundingClientRect(),
-                    findMeRect = dom.getBoundingClientRect();
-                  if (findMeRect.top < contRect.top || findMeRect.bottom > contRect.bottom
-                    || findMeRect.right > contRect.right || findMeRect.left < contRect.left) {
-                    dom.scrollIntoView();
-                  }
-                  return;
-                }
-                // code src: http://jsfiddle.net/08u6cxwj/
-                if (!Element.prototype.scrollIntoViewIfNeeded) {
-                    Element.prototype.scrollIntoViewIfNeeded = function (centerIfNeeded) {
-                        function withinBounds(value, min, max, extent) {
-                            if (false === centerIfNeeded || max <= value + extent && value <= min + extent) {
-                                return Math.min(max, Math.max(min, value));
-                            } else {
-                                return (min + max) / 2;
-                            }
-                        }
+				if (!setting.data.keep.parent) {
+					node.isParent = false;
+					node.open = false;
+					var tmp_switchObj = $$(node, consts.id.SWITCH, setting),
+						tmp_icoObj = $$(node, consts.id.ICON, setting);
+					view.replaceSwitchClass(node, tmp_switchObj, consts.folder.DOCU);
+					view.replaceIcoClass(node, tmp_icoObj, consts.folder.DOCU);
+					$$(node, consts.id.UL, setting).remove();
+				} else {
+					$$(node, consts.id.UL, setting).empty();
+				}
+			},
+			scrollIntoView: function (setting, dom) {
+				if (!dom) {
+					return;
+				}
+				// support IE 7
+				if (typeof Element === 'undefined') {
+					var contRect = setting.treeObj.get(0).getBoundingClientRect(),
+						findMeRect = dom.getBoundingClientRect();
+					if (findMeRect.top < contRect.top || findMeRect.bottom > contRect.bottom
+						|| findMeRect.right > contRect.right || findMeRect.left < contRect.left) {
+						dom.scrollIntoView();
+					}
+					return;
+				}
+				// code src: http://jsfiddle.net/08u6cxwj/
+				if (!Element.prototype.scrollIntoViewIfNeeded) {
+					Element.prototype.scrollIntoViewIfNeeded = function (centerIfNeeded) {
+						function withinBounds(value, min, max, extent) {
+							if (false === centerIfNeeded || max <= value + extent && value <= min + extent) {
+								return Math.min(max, Math.max(min, value));
+							} else {
+								return (min + max) / 2;
+							}
+						}
 
-                        function makeArea(left, top, width, height) {
-                            return {
-                                "left": left, "top": top, "width": width, "height": height
-                                , "right": left + width, "bottom": top + height
-                                , "translate": function (x, y) {
-                                    return makeArea(x + left, y + top, width, height);
-                                }
-                                , "relativeFromTo": function (lhs, rhs) {
-                                    var newLeft = left, newTop = top;
-                                    lhs = lhs.offsetParent;
-                                    rhs = rhs.offsetParent;
-                                    if (lhs === rhs) {
-                                        return area;
-                                    }
-                                    for (; lhs; lhs = lhs.offsetParent) {
-                                        newLeft += lhs.offsetLeft + lhs.clientLeft;
-                                        newTop += lhs.offsetTop + lhs.clientTop;
-                                    }
-                                    for (; rhs; rhs = rhs.offsetParent) {
-                                        newLeft -= rhs.offsetLeft + rhs.clientLeft;
-                                        newTop -= rhs.offsetTop + rhs.clientTop;
-                                    }
-                                    return makeArea(newLeft, newTop, width, height);
-                                }
-                            };
-                        }
+						function makeArea(left, top, width, height) {
+							return {
+								"left": left, "top": top, "width": width, "height": height
+								, "right": left + width, "bottom": top + height
+								, "translate": function (x, y) {
+									return makeArea(x + left, y + top, width, height);
+								}
+								, "relativeFromTo": function (lhs, rhs) {
+									var newLeft = left, newTop = top;
+									lhs = lhs.offsetParent;
+									rhs = rhs.offsetParent;
+									if (lhs === rhs) {
+										return area;
+									}
+									for (; lhs; lhs = lhs.offsetParent) {
+										newLeft += lhs.offsetLeft + lhs.clientLeft;
+										newTop += lhs.offsetTop + lhs.clientTop;
+									}
+									for (; rhs; rhs = rhs.offsetParent) {
+										newLeft -= rhs.offsetLeft + rhs.clientLeft;
+										newTop -= rhs.offsetTop + rhs.clientTop;
+									}
+									return makeArea(newLeft, newTop, width, height);
+								}
+							};
+						}
 
-                        var parent, elem = this, area = makeArea(
-                            this.offsetLeft, this.offsetTop,
-                            this.offsetWidth, this.offsetHeight);
-                        while (tools.isElement(parent = elem.parentNode)) {
-                            var clientLeft = parent.offsetLeft + parent.clientLeft;
-                            var clientTop = parent.offsetTop + parent.clientTop;
+						var parent, elem = this, area = makeArea(
+							this.offsetLeft, this.offsetTop,
+							this.offsetWidth, this.offsetHeight);
+						while (tools.isElement(parent = elem.parentNode)) {
+							var clientLeft = parent.offsetLeft + parent.clientLeft;
+							var clientTop = parent.offsetTop + parent.clientTop;
 
-                            // Make area relative to parent's client area.
-                            area = area.relativeFromTo(elem, parent).translate(-clientLeft, -clientTop);
+							// Make area relative to parent's client area.
+							area = area.relativeFromTo(elem, parent).translate(-clientLeft, -clientTop);
 
-                            parent.scrollLeft = withinBounds(
-                                parent.scrollLeft,
-                                area.right - parent.clientWidth, area.left,
-                                parent.clientWidth);
+							parent.scrollLeft = withinBounds(
+								parent.scrollLeft,
+								area.right - parent.clientWidth, area.left,
+								parent.clientWidth);
 
-                            parent.scrollTop = withinBounds(
-                                parent.scrollTop,
-                                area.bottom - parent.clientHeight, area.top,
-                                parent.clientHeight);
+							parent.scrollTop = withinBounds(
+								parent.scrollTop,
+								area.bottom - parent.clientHeight, area.top,
+								parent.clientHeight);
 
-                            // Determine actual scroll amount by reading back scroll properties.
-                            area = area.translate(clientLeft - parent.scrollLeft,
-                                clientTop - parent.scrollTop);
-                            elem = parent;
-                        }
-                    };
-                }
-                dom.scrollIntoViewIfNeeded();
-            },
-            setFirstNode: function (setting, parentNode) {
-                var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
-                if (childLength > 0) {
-                    parentNode[childKey][0].isFirstNode = true;
-                }
-            },
-            setLastNode: function (setting, parentNode) {
-                var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
-                if (childLength > 0) {
-                    parentNode[childKey][childLength - 1].isLastNode = true;
-                }
-            },
-            removeNode: function (setting, node) {
-                var root = data.getRoot(setting),
-                    childKey = setting.data.key.children,
-                    parentNode = (node.parentTId) ? node.getParentNode() : root;
+							// Determine actual scroll amount by reading back scroll properties.
+							area = area.translate(clientLeft - parent.scrollLeft,
+								clientTop - parent.scrollTop);
+							elem = parent;
+						}
+					};
+				}
+				dom.scrollIntoViewIfNeeded();
+			},
+			setFirstNode: function (setting, parentNode) {
+				var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
+				if (childLength > 0) {
+					parentNode[childKey][0].isFirstNode = true;
+				}
+			},
+			setLastNode: function (setting, parentNode) {
+				var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
+				if (childLength > 0) {
+					parentNode[childKey][childLength - 1].isLastNode = true;
+				}
+			},
+			removeNode: function (setting, node) {
+				var root = data.getRoot(setting),
+					childKey = setting.data.key.children,
+					parentNode = (node.parentTId) ? node.getParentNode() : root;
 
-                node.isFirstNode = false;
-                node.isLastNode = false;
-                node.getPreNode = function () {
-                    return null;
-                };
-                node.getNextNode = function () {
-                    return null;
-                };
+				node.isFirstNode = false;
+				node.isLastNode = false;
+				node.getPreNode = function () {
+					return null;
+				};
+				node.getNextNode = function () {
+					return null;
+				};
 
-                if (!data.getNodeCache(setting, node.tId)) {
-                    return;
-                }
+				if (!data.getNodeCache(setting, node.tId)) {
+					return;
+				}
 
-                $$(node, setting).remove();
-                data.removeNodeCache(setting, node);
-                data.removeSelectedNode(setting, node);
+				$$(node, setting).remove();
+				data.removeNodeCache(setting, node);
+				data.removeSelectedNode(setting, node);
 
-                for (var i = 0, l = parentNode[childKey].length; i < l; i++) {
-                    if (parentNode[childKey][i].tId == node.tId) {
-                        parentNode[childKey].splice(i, 1);
-                        break;
-                    }
-                }
-                view.setFirstNode(setting, parentNode);
-                view.setLastNode(setting, parentNode);
+				for (var i = 0, l = parentNode[childKey].length; i < l; i++) {
+					if (parentNode[childKey][i].tId == node.tId) {
+						parentNode[childKey].splice(i, 1);
+						break;
+					}
+				}
+				view.setFirstNode(setting, parentNode);
+				view.setLastNode(setting, parentNode);
 
-                var tmp_ulObj, tmp_switchObj, tmp_icoObj,
-                    childLength = parentNode[childKey].length;
+				var tmp_ulObj, tmp_switchObj, tmp_icoObj,
+					childLength = parentNode[childKey].length;
 
-                //repair nodes old parent
-                if (!setting.data.keep.parent && childLength == 0) {
-                    //old parentNode has no child nodes
-                    parentNode.isParent = false;
-                    parentNode.open = false;
-                    tmp_ulObj = $$(parentNode, consts.id.UL, setting);
-                    tmp_switchObj = $$(parentNode, consts.id.SWITCH, setting);
-                    tmp_icoObj = $$(parentNode, consts.id.ICON, setting);
-                    view.replaceSwitchClass(parentNode, tmp_switchObj, consts.folder.DOCU);
-                    view.replaceIcoClass(parentNode, tmp_icoObj, consts.folder.DOCU);
-                    tmp_ulObj.css("display", "none");
+				//repair nodes old parent
+				if (!setting.data.keep.parent && childLength == 0) {
+					//old parentNode has no child nodes
+					parentNode.isParent = false;
+					parentNode.open = false;
+					tmp_ulObj = $$(parentNode, consts.id.UL, setting);
+					tmp_switchObj = $$(parentNode, consts.id.SWITCH, setting);
+					tmp_icoObj = $$(parentNode, consts.id.ICON, setting);
+					view.replaceSwitchClass(parentNode, tmp_switchObj, consts.folder.DOCU);
+					view.replaceIcoClass(parentNode, tmp_icoObj, consts.folder.DOCU);
+					tmp_ulObj.css("display", "none");
 
-                } else if (setting.view.showLine && childLength > 0) {
-                    //old parentNode has child nodes
-                    var newLast = parentNode[childKey][childLength - 1];
-                    tmp_ulObj = $$(newLast, consts.id.UL, setting);
-                    tmp_switchObj = $$(newLast, consts.id.SWITCH, setting);
-                    tmp_icoObj = $$(newLast, consts.id.ICON, setting);
-                    if (parentNode == root) {
-                        if (parentNode[childKey].length == 1) {
-                            //node was root, and ztree has only one root after move node
-                            view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.ROOT);
-                        } else {
-                            var tmp_first_switchObj = $$(parentNode[childKey][0], consts.id.SWITCH, setting);
-                            view.replaceSwitchClass(parentNode[childKey][0], tmp_first_switchObj, consts.line.ROOTS);
-                            view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
-                        }
-                    } else {
-                        view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
-                    }
-                    tmp_ulObj.removeClass(consts.line.LINE);
-                }
-            },
-            replaceIcoClass: function (node, obj, newName) {
-                if (!obj || node.isAjaxing) return;
-                var tmpName = obj.attr("class");
-                if (tmpName == undefined) return;
-                var tmpList = tmpName.split("_");
-                switch (newName) {
-                    case consts.folder.OPEN:
-                    case consts.folder.CLOSE:
-                    case consts.folder.DOCU:
-                        tmpList[tmpList.length - 1] = newName;
-                        break;
-                }
-                obj.attr("class", tmpList.join("_"));
-            },
-            replaceSwitchClass: function (node, obj, newName) {
-                if (!obj) return;
-                var tmpName = obj.attr("class");
-                if (tmpName == undefined) return;
-                var tmpList = tmpName.split("_");
-                switch (newName) {
-                    case consts.line.ROOT:
-                    case consts.line.ROOTS:
-                    case consts.line.CENTER:
-                    case consts.line.BOTTOM:
-                    case consts.line.NOLINE:
-                        tmpList[0] = view.makeNodeLineClassEx(node) + newName;
-                        break;
-                    case consts.folder.OPEN:
-                    case consts.folder.CLOSE:
-                    case consts.folder.DOCU:
-                        tmpList[1] = newName;
-                        break;
-                }
-                obj.attr("class", tmpList.join("_"));
-                if (newName !== consts.folder.DOCU) {
-                    obj.removeAttr("disabled");
-                } else {
-                    obj.attr("disabled", "disabled");
-                }
-            },
-            selectNode: function (setting, node, addFlag) {
-                if (!addFlag) {
-                    view.cancelPreSelectedNode(setting, null, node);
-                }
-                $$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED);
-                data.addSelectedNode(setting, node);
-                setting.treeObj.trigger(consts.event.SELECTED, [setting.treeId, node]);
-            },
-            setNodeFontCss: function (setting, treeNode) {
-                var aObj = $$(treeNode, consts.id.A, setting),
-                    fontCss = view.makeNodeFontCss(setting, treeNode);
-                if (fontCss) {
-                    aObj.css(fontCss);
-                }
-            },
-            setNodeLineIcos: function (setting, node) {
-                if (!node) return;
-                var switchObj = $$(node, consts.id.SWITCH, setting),
-                    ulObj = $$(node, consts.id.UL, setting),
-                    icoObj = $$(node, consts.id.ICON, setting),
-                    ulLine = view.makeUlLineClass(setting, node);
-                if (ulLine.length == 0) {
-                    ulObj.removeClass(consts.line.LINE);
-                } else {
-                    ulObj.addClass(ulLine);
-                }
-                switchObj.attr("class", view.makeNodeLineClass(setting, node));
-                if (node.isParent) {
-                    switchObj.removeAttr("disabled");
-                } else {
-                    switchObj.attr("disabled", "disabled");
-                }
-                icoObj.removeAttr("style");
-                icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
-                icoObj.attr("class", view.makeNodeIcoClass(setting, node));
-            },
-            setNodeName: function (setting, node) {
-                var title = data.getNodeTitle(setting, node),
-                    nObj = $$(node, consts.id.SPAN, setting);
-                nObj.empty();
-                if (setting.view.nameIsHTML) {
-                    nObj.html(data.getNodeName(setting, node));
-                } else {
-                    nObj.text(data.getNodeName(setting, node));
-                }
-                if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle)) {
-                    var aObj = $$(node, consts.id.A, setting);
-                    aObj.attr("title", !title ? "" : title);
-                }
-            },
-            setNodeTarget: function (setting, node) {
-                var aObj = $$(node, consts.id.A, setting);
-                aObj.attr("target", view.makeNodeTarget(node));
-            },
-            setNodeUrl: function (setting, node) {
-                var aObj = $$(node, consts.id.A, setting),
-                    url = view.makeNodeUrl(setting, node);
-                if (url == null || url.length == 0) {
-                    aObj.removeAttr("href");
-                } else {
-                    aObj.attr("href", url);
-                }
-            },
-            switchNode: function (setting, node) {
-                if (node.open || !tools.canAsync(setting, node)) {
-                    view.expandCollapseNode(setting, node, !node.open);
-                } else if (setting.async.enable) {
-                    if (!view.asyncNode(setting, node)) {
-                        view.expandCollapseNode(setting, node, !node.open);
-                        return;
-                    }
-                } else if (node) {
-                    view.expandCollapseNode(setting, node, !node.open);
-                }
-            }
-        };
-    // zTree defind
-    $.fn.zTree = {
-        consts: _consts,
-        _z: {
-            tools: tools,
-            view: view,
-            event: event,
-            data: data
-        },
-        getZTreeObj: function (treeId) {
-            var o = data.getZTreeTools(treeId);
-            return o ? o : null;
-        },
-        destroy: function (treeId) {
-            if (!!treeId && treeId.length > 0) {
-                view.destroy(data.getSetting(treeId));
-            } else {
-                for (var s in settings) {
-                    view.destroy(settings[s]);
-                }
-            }
-        },
-        init: function (obj, zSetting, zNodes) {
-            var setting = tools.clone(_setting);
-            $.extend(true, setting, zSetting);
-            setting.treeId = obj.attr("id");
-            setting.treeObj = obj;
-            setting.treeObj.empty();
-            settings[setting.treeId] = setting;
-            //For some older browser,(e.g., ie6)
-            if (typeof document.body.style.maxHeight === "undefined") {
-                setting.view.expandSpeed = "";
-            }
-            data.initRoot(setting);
-            var root = data.getRoot(setting),
-                childKey = setting.data.key.children;
-            zNodes = zNodes ? tools.clone(tools.isArray(zNodes) ? zNodes : [zNodes]) : [];
-            if (setting.data.simpleData.enable) {
-                root[childKey] = data.transformTozTreeFormat(setting, zNodes);
-            } else {
-                root[childKey] = zNodes;
-            }
+				} else if (setting.view.showLine && childLength > 0) {
+					//old parentNode has child nodes
+					var newLast = parentNode[childKey][childLength - 1];
+					tmp_ulObj = $$(newLast, consts.id.UL, setting);
+					tmp_switchObj = $$(newLast, consts.id.SWITCH, setting);
+					tmp_icoObj = $$(newLast, consts.id.ICON, setting);
+					if (parentNode == root) {
+						if (parentNode[childKey].length == 1) {
+							//node was root, and ztree has only one root after move node
+							view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.ROOT);
+						} else {
+							var tmp_first_switchObj = $$(parentNode[childKey][0], consts.id.SWITCH, setting);
+							view.replaceSwitchClass(parentNode[childKey][0], tmp_first_switchObj, consts.line.ROOTS);
+							view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
+						}
+					} else {
+						view.replaceSwitchClass(newLast, tmp_switchObj, consts.line.BOTTOM);
+					}
+					tmp_ulObj.removeClass(consts.line.LINE);
+				}
+			},
+			replaceIcoClass: function (node, obj, newName) {
+				if (!obj || node.isAjaxing) return;
+				var tmpName = obj.attr("class");
+				if (tmpName == undefined) return;
+				var tmpList = tmpName.split("_");
+				switch (newName) {
+					case consts.folder.OPEN:
+					case consts.folder.CLOSE:
+					case consts.folder.DOCU:
+						tmpList[tmpList.length - 1] = newName;
+						break;
+				}
+				obj.attr("class", tmpList.join("_"));
+			},
+			replaceSwitchClass: function (node, obj, newName) {
+				if (!obj) return;
+				var tmpName = obj.attr("class");
+				if (tmpName == undefined) return;
+				var tmpList = tmpName.split("_");
+				switch (newName) {
+					case consts.line.ROOT:
+					case consts.line.ROOTS:
+					case consts.line.CENTER:
+					case consts.line.BOTTOM:
+					case consts.line.NOLINE:
+						tmpList[0] = view.makeNodeLineClassEx(node) + newName;
+						break;
+					case consts.folder.OPEN:
+					case consts.folder.CLOSE:
+					case consts.folder.DOCU:
+						tmpList[1] = newName;
+						break;
+				}
+				obj.attr("class", tmpList.join("_"));
+				if (newName !== consts.folder.DOCU) {
+					obj.removeAttr("disabled");
+				} else {
+					obj.attr("disabled", "disabled");
+				}
+			},
+			selectNode: function (setting, node, addFlag) {
+				if (!addFlag) {
+					view.cancelPreSelectedNode(setting, null, node);
+				}
+				$$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED);
+				data.addSelectedNode(setting, node);
+				setting.treeObj.trigger(consts.event.SELECTED, [setting.treeId, node]);
+			},
+			setNodeFontCss: function (setting, treeNode) {
+				var aObj = $$(treeNode, consts.id.A, setting),
+					fontCss = view.makeNodeFontCss(setting, treeNode);
+				if (fontCss) {
+					aObj.css(fontCss);
+				}
+			},
+			setNodeLineIcos: function (setting, node) {
+				if (!node) return;
+				var switchObj = $$(node, consts.id.SWITCH, setting),
+					ulObj = $$(node, consts.id.UL, setting),
+					icoObj = $$(node, consts.id.ICON, setting),
+					ulLine = view.makeUlLineClass(setting, node);
+				if (ulLine.length == 0) {
+					ulObj.removeClass(consts.line.LINE);
+				} else {
+					ulObj.addClass(ulLine);
+				}
+				switchObj.attr("class", view.makeNodeLineClass(setting, node));
+				if (node.isParent) {
+					switchObj.removeAttr("disabled");
+				} else {
+					switchObj.attr("disabled", "disabled");
+				}
+				icoObj.removeAttr("style");
+				icoObj.attr("style", view.makeNodeIcoStyle(setting, node));
+				icoObj.attr("class", view.makeNodeIcoClass(setting, node));
+			},
+			setNodeName: function (setting, node) {
+				var title = data.getNodeTitle(setting, node),
+					nObj = $$(node, consts.id.SPAN, setting);
+				nObj.empty();
+				if (setting.view.nameIsHTML) {
+					nObj.html(data.getNodeName(setting, node));
+				} else {
+					nObj.text(data.getNodeName(setting, node));
+				}
+				if (tools.apply(setting.view.showTitle, [setting.treeId, node], setting.view.showTitle)) {
+					var aObj = $$(node, consts.id.A, setting);
+					aObj.attr("title", !title ? "" : title);
+				}
+			},
+			setNodeTarget: function (setting, node) {
+				var aObj = $$(node, consts.id.A, setting);
+				aObj.attr("target", view.makeNodeTarget(node));
+			},
+			setNodeUrl: function (setting, node) {
+				var aObj = $$(node, consts.id.A, setting),
+					url = view.makeNodeUrl(setting, node);
+				if (url == null || url.length == 0) {
+					aObj.removeAttr("href");
+				} else {
+					aObj.attr("href", url);
+				}
+			},
+			switchNode: function (setting, node) {
+				if (node.open || !tools.canAsync(setting, node)) {
+					view.expandCollapseNode(setting, node, !node.open);
+				} else if (setting.async.enable) {
+					if (!view.asyncNode(setting, node)) {
+						view.expandCollapseNode(setting, node, !node.open);
+						return;
+					}
+				} else if (node) {
+					view.expandCollapseNode(setting, node, !node.open);
+				}
+			}
+		};
+	// zTree defind
+	$.fn.zTree = {
+		consts: _consts,
+		_z: {
+			tools: tools,
+			view: view,
+			event: event,
+			data: data
+		},
+		getZTreeObj: function (treeId) {
+			var o = data.getZTreeTools(treeId);
+			return o ? o : null;
+		},
+		destroy: function (treeId) {
+			if (!!treeId && treeId.length > 0) {
+				view.destroy(data.getSetting(treeId));
+			} else {
+				for (var s in settings) {
+					view.destroy(settings[s]);
+				}
+			}
+		},
+		init: function (obj, zSetting, zNodes) {
+			var setting = tools.clone(_setting);
+			$.extend(true, setting, zSetting);
+			setting.treeId = obj.attr("id");
+			setting.treeObj = obj;
+			setting.treeObj.empty();
+			settings[setting.treeId] = setting;
+			//For some older browser,(e.g., ie6)
+			if (typeof document.body.style.maxHeight === "undefined") {
+				setting.view.expandSpeed = "";
+			}
+			data.initRoot(setting);
+			var root = data.getRoot(setting),
+				childKey = setting.data.key.children;
+			zNodes = zNodes ? tools.clone(tools.isArray(zNodes) ? zNodes : [zNodes]) : [];
+			if (setting.data.simpleData.enable) {
+				root[childKey] = data.transformTozTreeFormat(setting, zNodes);
+			} else {
+				root[childKey] = zNodes;
+			}
 
-            data.initCache(setting);
-            event.unbindTree(setting);
-            event.bindTree(setting);
-            event.unbindEvent(setting);
-            event.bindEvent(setting);
+			data.initCache(setting);
+			event.unbindTree(setting);
+			event.bindTree(setting);
+			event.unbindEvent(setting);
+			event.bindEvent(setting);
 
-            var zTreeTools = {
-                setting: setting,
-                addNodes: function (parentNode, index, newNodes, isSilent) {
-                    if (!parentNode) parentNode = null;
-                    if (parentNode && !parentNode.isParent && setting.data.keep.leaf) return null;
+			var zTreeTools = {
+				setting: setting,
+				addNodes: function (parentNode, index, newNodes, isSilent) {
+					if (!parentNode) parentNode = null;
+					if (parentNode && !parentNode.isParent && setting.data.keep.leaf) return null;
 
-                    var i = parseInt(index, 10);
-                    if (isNaN(i)) {
-                        isSilent = !!newNodes;
-                        newNodes = index;
-                        index = -1;
-                    } else {
-                        index = i;
-                    }
-                    if (!newNodes) return null;
+					var i = parseInt(index, 10);
+					if (isNaN(i)) {
+						isSilent = !!newNodes;
+						newNodes = index;
+						index = -1;
+					} else {
+						index = i;
+					}
+					if (!newNodes) return null;
 
 
-                    var xNewNodes = tools.clone(tools.isArray(newNodes) ? newNodes : [newNodes]);
+					var xNewNodes = tools.clone(tools.isArray(newNodes) ? newNodes : [newNodes]);
 
-                    function addCallback() {
-                        view.addNodes(setting, parentNode, index, xNewNodes, (isSilent == true));
-                    }
+					function addCallback() {
+						view.addNodes(setting, parentNode, index, xNewNodes, (isSilent == true));
+					}
 
-                    if (tools.canAsync(setting, parentNode)) {
-                        view.asyncNode(setting, parentNode, isSilent, addCallback);
-                    } else {
-                        addCallback();
-                    }
-                    return xNewNodes;
-                },
-                cancelSelectedNode: function (node) {
-                    view.cancelPreSelectedNode(setting, node);
-                },
-                destroy: function () {
-                    view.destroy(setting);
-                },
-                expandAll: function (expandFlag) {
-                    expandFlag = !!expandFlag;
-                    view.expandCollapseSonNode(setting, null, expandFlag, true);
-                    return expandFlag;
-                },
-                expandNode: function (node, expandFlag, sonSign, focus, callbackFlag) {
-                    if (!node || !node.isParent) return null;
-                    if (expandFlag !== true && expandFlag !== false) {
-                        expandFlag = !node.open;
-                    }
-                    callbackFlag = !!callbackFlag;
+					if (tools.canAsync(setting, parentNode)) {
+						view.asyncNode(setting, parentNode, isSilent, addCallback);
+					} else {
+						addCallback();
+					}
+					return xNewNodes;
+				},
+				cancelSelectedNode: function (node) {
+					view.cancelPreSelectedNode(setting, node);
+				},
+				destroy: function () {
+					view.destroy(setting);
+				},
+				expandAll: function (expandFlag) {
+					expandFlag = !!expandFlag;
+					view.expandCollapseSonNode(setting, null, expandFlag, true);
+					return expandFlag;
+				},
+				expandNode: function (node, expandFlag, sonSign, focus, callbackFlag) {
+					if (!node || !node.isParent) return null;
+					if (expandFlag !== true && expandFlag !== false) {
+						expandFlag = !node.open;
+					}
+					callbackFlag = !!callbackFlag;
 
-                    if (callbackFlag && expandFlag && (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false)) {
-                        return null;
-                    } else if (callbackFlag && !expandFlag && (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false)) {
-                        return null;
-                    }
-                    if (expandFlag && node.parentTId) {
-                        view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, false);
-                    }
-                    if (expandFlag === node.open && !sonSign) {
-                        return null;
-                    }
+					if (callbackFlag && expandFlag && (tools.apply(setting.callback.beforeExpand, [setting.treeId, node], true) == false)) {
+						return null;
+					} else if (callbackFlag && !expandFlag && (tools.apply(setting.callback.beforeCollapse, [setting.treeId, node], true) == false)) {
+						return null;
+					}
+					if (expandFlag && node.parentTId) {
+						view.expandCollapseParentNode(setting, node.getParentNode(), expandFlag, false);
+					}
+					if (expandFlag === node.open && !sonSign) {
+						return null;
+					}
 
-                    data.getRoot(setting).expandTriggerFlag = callbackFlag;
-                    if (!tools.canAsync(setting, node) && sonSign) {
-                        view.expandCollapseSonNode(setting, node, expandFlag, true, showNodeFocus);
-                    } else {
-                        node.open = !expandFlag;
-                        view.switchNode(this.setting, node);
-                        showNodeFocus();
-                    }
-                    return expandFlag;
+					data.getRoot(setting).expandTriggerFlag = callbackFlag;
+					if (!tools.canAsync(setting, node) && sonSign) {
+						view.expandCollapseSonNode(setting, node, expandFlag, true, showNodeFocus);
+					} else {
+						node.open = !expandFlag;
+						view.switchNode(this.setting, node);
+						showNodeFocus();
+					}
+					return expandFlag;
 
-                    function showNodeFocus() {
-                        var a = $$(node, setting).get(0);
-                        if (a && focus !== false) {
-                            view.scrollIntoView(setting, a);
-                        }
-                    }
-                },
-                getNodes: function () {
-                    return data.getNodes(setting);
-                },
-                getNodeByParam: function (key, value, parentNode) {
-                    if (!key) return null;
-                    return data.getNodeByParam(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), key, value);
-                },
-                getNodeByTId: function (tId) {
-                    return data.getNodeCache(setting, tId);
-                },
-                getNodesByParam: function (key, value, parentNode) {
-                    if (!key) return null;
-                    return data.getNodesByParam(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), key, value);
-                },
-                getNodesByParamFuzzy: function (key, value, parentNode) {
-                    if (!key) return null;
-                    return data.getNodesByParamFuzzy(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), key, value);
-                },
-                getNodesByFilter: function (filter, isSingle, parentNode, invokeParam) {
-                    isSingle = !!isSingle;
-                    if (!filter || (typeof filter != "function")) return (isSingle ? null : []);
-                    return data.getNodesByFilter(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), filter, isSingle, invokeParam);
-                },
-                getNodeIndex: function (node) {
-                    if (!node) return null;
-                    var childKey = setting.data.key.children,
-                        parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
-                    for (var i = 0, l = parentNode[childKey].length; i < l; i++) {
-                        if (parentNode[childKey][i] == node) return i;
-                    }
-                    return -1;
-                },
-                getSelectedNodes: function () {
-                    var r = [], list = data.getRoot(setting).curSelectedList;
-                    for (var i = 0, l = list.length; i < l; i++) {
-                        r.push(list[i]);
-                    }
-                    return r;
-                },
-                isSelectedNode: function (node) {
-                    return data.isSelectedNode(setting, node);
-                },
-                reAsyncChildNodesPromise: function (parentNode, reloadType, isSilent) {
-                    var promise = new Promise(function(resolve, reject) {
-                        try {
-                            zTreeTools.reAsyncChildNodes(parentNode, reloadType, isSilent, function() {
-                                resolve(parentNode);
-                            });
-                        } catch(e) {
-                            reject(e);
-                        }
-                    });
-                    return promise;
-                },
-                reAsyncChildNodes: function (parentNode, reloadType, isSilent, callback) {
-                    if (!this.setting.async.enable) return;
-                    var isRoot = !parentNode;
-                    if (isRoot) {
-                        parentNode = data.getRoot(setting);
-                    }
-                    if (reloadType == "refresh") {
-                        var childKey = this.setting.data.key.children;
-                        for (var i = 0, l = parentNode[childKey] ? parentNode[childKey].length : 0; i < l; i++) {
-                            data.removeNodeCache(setting, parentNode[childKey][i]);
-                        }
-                        data.removeSelectedNode(setting);
-                        parentNode[childKey] = [];
-                        if (isRoot) {
-                            this.setting.treeObj.empty();
-                        } else {
-                            var ulObj = $$(parentNode, consts.id.UL, setting);
-                            ulObj.empty();
-                        }
-                    }
-                    view.asyncNode(this.setting, isRoot ? null : parentNode, !!isSilent, callback);
-                },
-                refresh: function () {
-                    this.setting.treeObj.empty();
-                    var root = data.getRoot(setting),
-                        nodes = root[setting.data.key.children]
-                    data.initRoot(setting);
-                    root[setting.data.key.children] = nodes
-                    data.initCache(setting);
-                    view.createNodes(setting, 0, root[setting.data.key.children], null, -1);
-                },
-                removeChildNodes: function (node) {
-                    if (!node) return null;
-                    var childKey = setting.data.key.children,
-                        nodes = node[childKey];
-                    view.removeChildNodes(setting, node);
-                    return nodes ? nodes : null;
-                },
-                removeNode: function (node, callbackFlag) {
-                    if (!node) return;
-                    callbackFlag = !!callbackFlag;
-                    if (callbackFlag && tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return;
-                    view.removeNode(setting, node);
-                    if (callbackFlag) {
-                        this.setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
-                    }
-                },
-                selectNode: function (node, addFlag, isSilent) {
-                    if (!node) return;
-                    if (tools.uCanDo(setting)) {
-                        addFlag = setting.view.selectedMulti && addFlag;
-                        if (node.parentTId) {
-                            view.expandCollapseParentNode(setting, node.getParentNode(), true, false, showNodeFocus);
-                        } else if (!isSilent) {
-                            try {
-                                $$(node, setting).focus().blur();
-                            } catch (e) {
-                            }
-                        }
-                        view.selectNode(setting, node, addFlag);
-                    }
+					function showNodeFocus() {
+						var a = $$(node, setting).get(0);
+						if (a && focus !== false) {
+							view.scrollIntoView(setting, a);
+						}
+					}
+				},
+				getNodes: function () {
+					return data.getNodes(setting);
+				},
+				getNodeByParam: function (key, value, parentNode) {
+					if (!key) return null;
+					return data.getNodeByParam(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), key, value);
+				},
+				getNodeByTId: function (tId) {
+					return data.getNodeCache(setting, tId);
+				},
+				getNodesByParam: function (key, value, parentNode) {
+					if (!key) return null;
+					return data.getNodesByParam(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), key, value);
+				},
+				getNodesByParamFuzzy: function (key, value, parentNode) {
+					if (!key) return null;
+					return data.getNodesByParamFuzzy(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), key, value);
+				},
+				getNodesByFilter: function (filter, isSingle, parentNode, invokeParam) {
+					isSingle = !!isSingle;
+					if (!filter || (typeof filter != "function")) return (isSingle ? null : []);
+					return data.getNodesByFilter(setting, parentNode ? parentNode[setting.data.key.children] : data.getNodes(setting), filter, isSingle, invokeParam);
+				},
+				getNodeIndex: function (node) {
+					if (!node) return null;
+					var childKey = setting.data.key.children,
+						parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
+					for (var i = 0, l = parentNode[childKey].length; i < l; i++) {
+						if (parentNode[childKey][i] == node) return i;
+					}
+					return -1;
+				},
+				getSelectedNodes: function () {
+					var r = [], list = data.getRoot(setting).curSelectedList;
+					for (var i = 0, l = list.length; i < l; i++) {
+						r.push(list[i]);
+					}
+					return r;
+				},
+				isSelectedNode: function (node) {
+					return data.isSelectedNode(setting, node);
+				},
+				reAsyncChildNodesPromise: function (parentNode, reloadType, isSilent) {
+					var promise = new Promise(function (resolve, reject) {
+						try {
+							zTreeTools.reAsyncChildNodes(parentNode, reloadType, isSilent, function () {
+								resolve(parentNode);
+							});
+						} catch (e) {
+							reject(e);
+						}
+					});
+					return promise;
+				},
+				reAsyncChildNodes: function (parentNode, reloadType, isSilent, callback) {
+					if (!this.setting.async.enable) return;
+					var isRoot = !parentNode;
+					if (isRoot) {
+						parentNode = data.getRoot(setting);
+					}
+					if (reloadType == "refresh") {
+						var childKey = this.setting.data.key.children;
+						for (var i = 0, l = parentNode[childKey] ? parentNode[childKey].length : 0; i < l; i++) {
+							data.removeNodeCache(setting, parentNode[childKey][i]);
+						}
+						data.removeSelectedNode(setting);
+						parentNode[childKey] = [];
+						if (isRoot) {
+							this.setting.treeObj.empty();
+						} else {
+							var ulObj = $$(parentNode, consts.id.UL, setting);
+							ulObj.empty();
+						}
+					}
+					view.asyncNode(this.setting, isRoot ? null : parentNode, !!isSilent, callback);
+				},
+				refresh: function () {
+					this.setting.treeObj.empty();
+					var root = data.getRoot(setting),
+						nodes = root[setting.data.key.children]
+					data.initRoot(setting);
+					root[setting.data.key.children] = nodes
+					data.initCache(setting);
+					view.createNodes(setting, 0, root[setting.data.key.children], null, -1);
+				},
+				removeChildNodes: function (node) {
+					if (!node) return null;
+					var childKey = setting.data.key.children,
+						nodes = node[childKey];
+					view.removeChildNodes(setting, node);
+					return nodes ? nodes : null;
+				},
+				removeNode: function (node, callbackFlag) {
+					if (!node) return;
+					callbackFlag = !!callbackFlag;
+					if (callbackFlag && tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return;
+					view.removeNode(setting, node);
+					if (callbackFlag) {
+						this.setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
+					}
+				},
+				selectNode: function (node, addFlag, isSilent) {
+					if (!node) return;
+					if (tools.uCanDo(setting)) {
+						addFlag = setting.view.selectedMulti && addFlag;
+						if (node.parentTId) {
+							view.expandCollapseParentNode(setting, node.getParentNode(), true, false, showNodeFocus);
+						} else if (!isSilent) {
+							try {
+								$$(node, setting).focus().blur();
+							} catch (e) {
+							}
+						}
+						view.selectNode(setting, node, addFlag);
+					}
 
-                    function showNodeFocus() {
-                        if (isSilent) {
-                            return;
-                        }
-                        var a = $$(node, setting).get(0);
-                        view.scrollIntoView(setting, a);
-                    }
-                },
-                transformTozTreeNodes: function (simpleNodes) {
-                    return data.transformTozTreeFormat(setting, simpleNodes);
-                },
-                transformToArray: function (nodes) {
-                    return data.transformToArrayFormat(setting, nodes);
-                },
-                updateNode: function (node, checkTypeFlag) {
-                    if (!node) return;
-                    var nObj = $$(node, setting);
-                    if (nObj.get(0) && tools.uCanDo(setting)) {
-                        view.setNodeName(setting, node);
-                        view.setNodeTarget(setting, node);
-                        view.setNodeUrl(setting, node);
-                        view.setNodeLineIcos(setting, node);
-                        view.setNodeFontCss(setting, node);
-                    }
-                }
-            }
-            root.treeTools = zTreeTools;
-            data.setZTreeTools(setting, zTreeTools);
+					function showNodeFocus() {
+						if (isSilent) {
+							return;
+						}
+						var a = $$(node, setting).get(0);
+						view.scrollIntoView(setting, a);
+					}
+				},
+				transformTozTreeNodes: function (simpleNodes) {
+					return data.transformTozTreeFormat(setting, simpleNodes);
+				},
+				transformToArray: function (nodes) {
+					return data.transformToArrayFormat(setting, nodes);
+				},
+				updateNode: function (node, checkTypeFlag) {
+					if (!node) return;
+					var nObj = $$(node, setting);
+					if (nObj.get(0) && tools.uCanDo(setting)) {
+						view.setNodeName(setting, node);
+						view.setNodeTarget(setting, node);
+						view.setNodeUrl(setting, node);
+						view.setNodeLineIcos(setting, node);
+						view.setNodeFontCss(setting, node);
+					}
+				}
+			}
+			root.treeTools = zTreeTools;
+			data.setZTreeTools(setting, zTreeTools);
 
-            if (root[childKey] && root[childKey].length > 0) {
-                view.createNodes(setting, 0, root[childKey], null, -1);
-            } else if (setting.async.enable && setting.async.url && setting.async.url !== '') {
-                view.asyncNode(setting);
-            }
-            return zTreeTools;
-        }
-    };
+			if (root[childKey] && root[childKey].length > 0) {
+				view.createNodes(setting, 0, root[childKey], null, -1);
+			} else if (setting.async.enable && setting.async.url && setting.async.url !== '') {
+				view.asyncNode(setting);
+			}
+			return zTreeTools;
+		}
+	};
 
-    var zt = $.fn.zTree,
-        $$ = tools.$,
-        consts = zt.consts;
-})(jQuery);
\ No newline at end of file
+	var zt = $.fn.zTree,
+		$$ = tools.$,
+		consts = zt.consts;
+})(jQuery);
diff --git a/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.excheck.js b/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.excheck.js
index af91a7e..41cf0bc 100644
--- a/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.excheck.js
+++ b/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.excheck.js
@@ -10,584 +10,588 @@
  * email: hunter.z@263.net
  * Date: 2017-11-11
  */
-(function($){
+(function ($) {
 	//default consts of excheck
 	var _consts = {
-		event: {
-			CHECK: "ztree_check"
+			event: {
+				CHECK: "ztree_check"
+			},
+			id: {
+				CHECK: "_check"
+			},
+			checkbox: {
+				STYLE: "checkbox",
+				DEFAULT: "chk",
+				DISABLED: "disable",
+				FALSE: "false",
+				TRUE: "true",
+				FULL: "full",
+				PART: "part",
+				FOCUS: "focus"
+			},
+			radio: {
+				STYLE: "radio",
+				TYPE_ALL: "all",
+				TYPE_LEVEL: "level"
+			}
+		},
+		//default setting of excheck
+		_setting = {
+			check: {
+				enable: false,
+				autoCheckTrigger: false,
+				chkStyle: _consts.checkbox.STYLE,
+				nocheckInherit: false,
+				chkDisabledInherit: false,
+				radioType: _consts.radio.TYPE_LEVEL,
+				chkboxType: {
+					"Y": "ps",
+					"N": "ps"
+				}
+			},
+			data: {
+				key: {
+					checked: "checked"
+				}
+			},
+			callback: {
+				beforeCheck: null,
+				onCheck: null
+			}
 		},
-		id: {
-			CHECK: "_check"
+		//default root of excheck
+		_initRoot = function (setting) {
+			var r = data.getRoot(setting);
+			r.radioCheckedList = [];
 		},
-		checkbox: {
-			STYLE: "checkbox",
-			DEFAULT: "chk",
-			DISABLED: "disable",
-			FALSE: "false",
-			TRUE: "true",
-			FULL: "full",
-			PART: "part",
-			FOCUS: "focus"
+		//default cache of excheck
+		_initCache = function (treeId) {
 		},
-		radio: {
-			STYLE: "radio",
-			TYPE_ALL: "all",
-			TYPE_LEVEL: "level"
-		}
-	},
-	//default setting of excheck
-	_setting = {
-		check: {
-			enable: false,
-			autoCheckTrigger: false,
-			chkStyle: _consts.checkbox.STYLE,
-			nocheckInherit: false,
-			chkDisabledInherit: false,
-			radioType: _consts.radio.TYPE_LEVEL,
-			chkboxType: {
-				"Y": "ps",
-				"N": "ps"
-			}
+		//default bind event of excheck
+		_bindEvent = function (setting) {
+			var o = setting.treeObj,
+				c = consts.event;
+			o.bind(c.CHECK, function (event, srcEvent, treeId, node) {
+				event.srcEvent = srcEvent;
+				tools.apply(setting.callback.onCheck, [event, treeId, node]);
+			});
 		},
-		data: {
-			key: {
-				checked: "checked"
-			}
+		_unbindEvent = function (setting) {
+			var o = setting.treeObj,
+				c = consts.event;
+			o.unbind(c.CHECK);
 		},
-		callback: {
-			beforeCheck:null,
-			onCheck:null
-		}
-	},
-	//default root of excheck
-	_initRoot = function (setting) {
-		var r = data.getRoot(setting);
-		r.radioCheckedList = [];
-	},
-	//default cache of excheck
-	_initCache = function(treeId) {},
-	//default bind event of excheck
-	_bindEvent = function(setting) {
-		var o = setting.treeObj,
-		c = consts.event;
-		o.bind(c.CHECK, function (event, srcEvent, treeId, node) {
-			event.srcEvent = srcEvent;
-			tools.apply(setting.callback.onCheck, [event, treeId, node]);
-		});
-	},
-	_unbindEvent = function(setting) {
-		var o = setting.treeObj,
-		c = consts.event;
-		o.unbind(c.CHECK);
-	},
-	//default event proxy of excheck
-	_eventProxy = function(e) {
-		var target = e.target,
-		setting = data.getSetting(e.data.treeId),
-		tId = "", node = null,
-		nodeEventType = "", treeEventType = "",
-		nodeEventCallback = null, treeEventCallback = null;
+		//default event proxy of excheck
+		_eventProxy = function (e) {
+			var target = e.target,
+				setting = data.getSetting(e.data.treeId),
+				tId = "", node = null,
+				nodeEventType = "", treeEventType = "",
+				nodeEventCallback = null, treeEventCallback = null;
 
-		if (tools.eqs(e.type, "mouseover")) {
-			if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.CHECK) !== null) {
-				tId = tools.getNodeMainDom(target).id;
-				nodeEventType = "mouseoverCheck";
-			}
-		} else if (tools.eqs(e.type, "mouseout")) {
-			if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.CHECK) !== null) {
-				tId = tools.getNodeMainDom(target).id;
-				nodeEventType = "mouseoutCheck";
-			}
-		} else if (tools.eqs(e.type, "click")) {
-			if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode"+ consts.id.CHECK) !== null) {
-				tId = tools.getNodeMainDom(target).id;
-				nodeEventType = "checkNode";
+			if (tools.eqs(e.type, "mouseover")) {
+				if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.CHECK) !== null) {
+					tId = tools.getNodeMainDom(target).id;
+					nodeEventType = "mouseoverCheck";
+				}
+			} else if (tools.eqs(e.type, "mouseout")) {
+				if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.CHECK) !== null) {
+					tId = tools.getNodeMainDom(target).id;
+					nodeEventType = "mouseoutCheck";
+				}
+			} else if (tools.eqs(e.type, "click")) {
+				if (setting.check.enable && tools.eqs(target.tagName, "span") && target.getAttribute("treeNode" + consts.id.CHECK) !== null) {
+					tId = tools.getNodeMainDom(target).id;
+					nodeEventType = "checkNode";
+				}
 			}
-		}
-		if (tId.length>0) {
-			node = data.getNodeCache(setting, tId);
-			switch (nodeEventType) {
-				case "checkNode" :
-					nodeEventCallback = _handler.onCheckNode;
-					break;
-				case "mouseoverCheck" :
-					nodeEventCallback = _handler.onMouseoverCheck;
-					break;
-				case "mouseoutCheck" :
-					nodeEventCallback = _handler.onMouseoutCheck;
-					break;
+			if (tId.length > 0) {
+				node = data.getNodeCache(setting, tId);
+				switch (nodeEventType) {
+					case "checkNode" :
+						nodeEventCallback = _handler.onCheckNode;
+						break;
+					case "mouseoverCheck" :
+						nodeEventCallback = _handler.onMouseoverCheck;
+						break;
+					case "mouseoutCheck" :
+						nodeEventCallback = _handler.onMouseoutCheck;
+						break;
+				}
 			}
-		}
-		var proxyResult = {
-			stop: nodeEventType === "checkNode",
-			node: node,
-			nodeEventType: nodeEventType,
-			nodeEventCallback: nodeEventCallback,
-			treeEventType: treeEventType,
-			treeEventCallback: treeEventCallback
-		};
-		return proxyResult
-	},
-	//default init node of excheck
-	_initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
-		if (!n) return;
-		var checkedKey = setting.data.key.checked;
-		if (typeof n[checkedKey] == "string") n[checkedKey] = tools.eqs(n[checkedKey], "true");
-		n[checkedKey] = !!n[checkedKey];
-		n.checkedOld = n[checkedKey];
-		if (typeof n.nocheck == "string") n.nocheck = tools.eqs(n.nocheck, "true");
-		n.nocheck = !!n.nocheck || (setting.check.nocheckInherit && parentNode && !!parentNode.nocheck);
-		if (typeof n.chkDisabled == "string") n.chkDisabled = tools.eqs(n.chkDisabled, "true");
-		n.chkDisabled = !!n.chkDisabled || (setting.check.chkDisabledInherit && parentNode && !!parentNode.chkDisabled);
-		if (typeof n.halfCheck == "string") n.halfCheck = tools.eqs(n.halfCheck, "true");
-		n.halfCheck = !!n.halfCheck;
-		n.check_Child_State = -1;
-		n.check_Focus = false;
-		n.getCheckStatus = function() {return data.getCheckStatus(setting, n);};
+			var proxyResult = {
+				stop: nodeEventType === "checkNode",
+				node: node,
+				nodeEventType: nodeEventType,
+				nodeEventCallback: nodeEventCallback,
+				treeEventType: treeEventType,
+				treeEventCallback: treeEventCallback
+			};
+			return proxyResult
+		},
+		//default init node of excheck
+		_initNode = function (setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+			if (!n) return;
+			var checkedKey = setting.data.key.checked;
+			if (typeof n[checkedKey] == "string") n[checkedKey] = tools.eqs(n[checkedKey], "true");
+			n[checkedKey] = !!n[checkedKey];
+			n.checkedOld = n[checkedKey];
+			if (typeof n.nocheck == "string") n.nocheck = tools.eqs(n.nocheck, "true");
+			n.nocheck = !!n.nocheck || (setting.check.nocheckInherit && parentNode && !!parentNode.nocheck);
+			if (typeof n.chkDisabled == "string") n.chkDisabled = tools.eqs(n.chkDisabled, "true");
+			n.chkDisabled = !!n.chkDisabled || (setting.check.chkDisabledInherit && parentNode && !!parentNode.chkDisabled);
+			if (typeof n.halfCheck == "string") n.halfCheck = tools.eqs(n.halfCheck, "true");
+			n.halfCheck = !!n.halfCheck;
+			n.check_Child_State = -1;
+			n.check_Focus = false;
+			n.getCheckStatus = function () {
+				return data.getCheckStatus(setting, n);
+			};
 
-		if (setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL && n[checkedKey] ) {
-			var r = data.getRoot(setting);
-			r.radioCheckedList.push(n);
-		}
-	},
-	//add dom for check
-	_beforeA = function(setting, node, html) {
-		var checkedKey = setting.data.key.checked;
-		if (setting.check.enable) {
-			data.makeChkFlag(setting, node);
-			html.push("<span ID='", node.tId, consts.id.CHECK, "' class='", view.makeChkClass(setting, node), "' treeNode", consts.id.CHECK, (node.nocheck === true?" style='display:none;'":""),"></span>");
-		}
-	},
-	//update zTreeObj, add method of check
-	_zTreeTools = function(setting, zTreeTools) {
-		zTreeTools.checkNode = function(node, checked, checkTypeFlag, callbackFlag) {
-			var checkedKey = this.setting.data.key.checked;
-			if (node.chkDisabled === true) return;
-			if (checked !== true && checked !== false) {
-				checked = !node[checkedKey];
+			if (setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL && n[checkedKey]) {
+				var r = data.getRoot(setting);
+				r.radioCheckedList.push(n);
 			}
-			callbackFlag = !!callbackFlag;
-
-			if (node[checkedKey] === checked && !checkTypeFlag) {
-				return;
-			} else if (callbackFlag && tools.apply(this.setting.callback.beforeCheck, [this.setting.treeId, node], true) == false) {
-				return;
+		},
+		//add dom for check
+		_beforeA = function (setting, node, html) {
+			var checkedKey = setting.data.key.checked;
+			if (setting.check.enable) {
+				data.makeChkFlag(setting, node);
+				html.push("<span ID='", node.tId, consts.id.CHECK, "' class='", view.makeChkClass(setting, node), "' treeNode", consts.id.CHECK, (node.nocheck === true ? " style='display:none;'" : ""), "></span>");
 			}
-			if (tools.uCanDo(this.setting) && this.setting.check.enable && node.nocheck !== true) {
-				node[checkedKey] = checked;
-				var checkObj = $$(node, consts.id.CHECK, this.setting);
-				if (checkTypeFlag || this.setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(this.setting, node);
-				view.setChkClass(this.setting, checkObj, node);
-				view.repairParentChkClassWithSelf(this.setting, node);
-				if (callbackFlag) {
-					this.setting.treeObj.trigger(consts.event.CHECK, [null, this.setting.treeId, node]);
+		},
+		//update zTreeObj, add method of check
+		_zTreeTools = function (setting, zTreeTools) {
+			zTreeTools.checkNode = function (node, checked, checkTypeFlag, callbackFlag) {
+				var checkedKey = this.setting.data.key.checked;
+				if (node.chkDisabled === true) return;
+				if (checked !== true && checked !== false) {
+					checked = !node[checkedKey];
 				}
-			}
-		}
+				callbackFlag = !!callbackFlag;
 
-		zTreeTools.checkAllNodes = function(checked) {
-			view.repairAllChk(this.setting, !!checked);
-		}
+				if (node[checkedKey] === checked && !checkTypeFlag) {
+					return;
+				} else if (callbackFlag && tools.apply(this.setting.callback.beforeCheck, [this.setting.treeId, node], true) == false) {
+					return;
+				}
+				if (tools.uCanDo(this.setting) && this.setting.check.enable && node.nocheck !== true) {
+					node[checkedKey] = checked;
+					var checkObj = $$(node, consts.id.CHECK, this.setting);
+					if (checkTypeFlag || this.setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(this.setting, node);
+					view.setChkClass(this.setting, checkObj, node);
+					view.repairParentChkClassWithSelf(this.setting, node);
+					if (callbackFlag) {
+						this.setting.treeObj.trigger(consts.event.CHECK, [null, this.setting.treeId, node]);
+					}
+				}
+			}
 
-		zTreeTools.getCheckedNodes = function(checked) {
-			var childKey = this.setting.data.key.children;
-			checked = (checked !== false);
-			return data.getTreeCheckedNodes(this.setting, data.getRoot(this.setting)[childKey], checked);
-		}
+			zTreeTools.checkAllNodes = function (checked) {
+				view.repairAllChk(this.setting, !!checked);
+			}
 
-		zTreeTools.getChangeCheckedNodes = function() {
-			var childKey = this.setting.data.key.children;
-			return data.getTreeChangeCheckedNodes(this.setting, data.getRoot(this.setting)[childKey]);
-		}
+			zTreeTools.getCheckedNodes = function (checked) {
+				var childKey = this.setting.data.key.children;
+				checked = (checked !== false);
+				return data.getTreeCheckedNodes(this.setting, data.getRoot(this.setting)[childKey], checked);
+			}
 
-		zTreeTools.setChkDisabled = function(node, disabled, inheritParent, inheritChildren) {
-			disabled = !!disabled;
-			inheritParent = !!inheritParent;
-			inheritChildren = !!inheritChildren;
-			view.repairSonChkDisabled(this.setting, node, disabled, inheritChildren);
-			view.repairParentChkDisabled(this.setting, node.getParentNode(), disabled, inheritParent);
-		}
+			zTreeTools.getChangeCheckedNodes = function () {
+				var childKey = this.setting.data.key.children;
+				return data.getTreeChangeCheckedNodes(this.setting, data.getRoot(this.setting)[childKey]);
+			}
 
-		var _updateNode = zTreeTools.updateNode;
-		zTreeTools.updateNode = function(node, checkTypeFlag) {
-			if (_updateNode) _updateNode.apply(zTreeTools, arguments);
-			if (!node || !this.setting.check.enable) return;
-			var nObj = $$(node, this.setting);
-			if (nObj.get(0) && tools.uCanDo(this.setting)) {
-				var checkObj = $$(node, consts.id.CHECK, this.setting);
-				if (checkTypeFlag == true || this.setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(this.setting, node);
-				view.setChkClass(this.setting, checkObj, node);
-				view.repairParentChkClassWithSelf(this.setting, node);
+			zTreeTools.setChkDisabled = function (node, disabled, inheritParent, inheritChildren) {
+				disabled = !!disabled;
+				inheritParent = !!inheritParent;
+				inheritChildren = !!inheritChildren;
+				view.repairSonChkDisabled(this.setting, node, disabled, inheritChildren);
+				view.repairParentChkDisabled(this.setting, node.getParentNode(), disabled, inheritParent);
 			}
-		}
-	},
-	//method of operate data
-	_data = {
-		getRadioCheckedList: function(setting) {
-			var checkedList = data.getRoot(setting).radioCheckedList;
-			for (var i=0, j=checkedList.length; i<j; i++) {
-				if(!data.getNodeCache(setting, checkedList[i].tId)) {
-					checkedList.splice(i, 1);
-					i--; j--;
+
+			var _updateNode = zTreeTools.updateNode;
+			zTreeTools.updateNode = function (node, checkTypeFlag) {
+				if (_updateNode) _updateNode.apply(zTreeTools, arguments);
+				if (!node || !this.setting.check.enable) return;
+				var nObj = $$(node, this.setting);
+				if (nObj.get(0) && tools.uCanDo(this.setting)) {
+					var checkObj = $$(node, consts.id.CHECK, this.setting);
+					if (checkTypeFlag == true || this.setting.check.chkStyle === consts.radio.STYLE) view.checkNodeRelation(this.setting, node);
+					view.setChkClass(this.setting, checkObj, node);
+					view.repairParentChkClassWithSelf(this.setting, node);
 				}
 			}
-			return checkedList;
-		},
-		getCheckStatus: function(setting, node) {
-			if (!setting.check.enable || node.nocheck || node.chkDisabled) return null;
-			var checkedKey = setting.data.key.checked,
-			r = {
-				checked: node[checkedKey],
-				half: node.halfCheck ? node.halfCheck : (setting.check.chkStyle == consts.radio.STYLE ? (node.check_Child_State === 2) : (node[checkedKey] ? (node.check_Child_State > -1 && node.check_Child_State < 2) : (node.check_Child_State > 0)))
-			};
-			return r;
 		},
-		getTreeCheckedNodes: function(setting, nodes, checked, results) {
-			if (!nodes) return [];
-			var childKey = setting.data.key.children,
-			checkedKey = setting.data.key.checked,
-			onlyOne = (checked && setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL);
-			results = !results ? [] : results;
-			for (var i = 0, l = nodes.length; i < l; i++) {
-				if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] == checked) {
-					results.push(nodes[i]);
-					if(onlyOne) {
-						break;
+		//method of operate data
+		_data = {
+			getRadioCheckedList: function (setting) {
+				var checkedList = data.getRoot(setting).radioCheckedList;
+				for (var i = 0, j = checkedList.length; i < j; i++) {
+					if (!data.getNodeCache(setting, checkedList[i].tId)) {
+						checkedList.splice(i, 1);
+						i--;
+						j--;
 					}
 				}
-				data.getTreeCheckedNodes(setting, nodes[i][childKey], checked, results);
-				if(onlyOne && results.length > 0) {
-					break;
+				return checkedList;
+			},
+			getCheckStatus: function (setting, node) {
+				if (!setting.check.enable || node.nocheck || node.chkDisabled) return null;
+				var checkedKey = setting.data.key.checked,
+					r = {
+						checked: node[checkedKey],
+						half: node.halfCheck ? node.halfCheck : (setting.check.chkStyle == consts.radio.STYLE ? (node.check_Child_State === 2) : (node[checkedKey] ? (node.check_Child_State > -1 && node.check_Child_State < 2) : (node.check_Child_State > 0)))
+					};
+				return r;
+			},
+			getTreeCheckedNodes: function (setting, nodes, checked, results) {
+				if (!nodes) return [];
+				var childKey = setting.data.key.children,
+					checkedKey = setting.data.key.checked,
+					onlyOne = (checked && setting.check.chkStyle == consts.radio.STYLE && setting.check.radioType == consts.radio.TYPE_ALL);
+				results = !results ? [] : results;
+				for (var i = 0, l = nodes.length; i < l; i++) {
+					if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] == checked) {
+						results.push(nodes[i]);
+						if (onlyOne) {
+							break;
+						}
+					}
+					data.getTreeCheckedNodes(setting, nodes[i][childKey], checked, results);
+					if (onlyOne && results.length > 0) {
+						break;
+					}
 				}
-			}
-			return results;
-		},
-		getTreeChangeCheckedNodes: function(setting, nodes, results) {
-			if (!nodes) return [];
-			var childKey = setting.data.key.children,
-			checkedKey = setting.data.key.checked;
-			results = !results ? [] : results;
-			for (var i = 0, l = nodes.length; i < l; i++) {
-				if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] != nodes[i].checkedOld) {
-					results.push(nodes[i]);
+				return results;
+			},
+			getTreeChangeCheckedNodes: function (setting, nodes, results) {
+				if (!nodes) return [];
+				var childKey = setting.data.key.children,
+					checkedKey = setting.data.key.checked;
+				results = !results ? [] : results;
+				for (var i = 0, l = nodes.length; i < l; i++) {
+					if (nodes[i].nocheck !== true && nodes[i].chkDisabled !== true && nodes[i][checkedKey] != nodes[i].checkedOld) {
+						results.push(nodes[i]);
+					}
+					data.getTreeChangeCheckedNodes(setting, nodes[i][childKey], results);
 				}
-				data.getTreeChangeCheckedNodes(setting, nodes[i][childKey], results);
-			}
-			return results;
-		},
-		makeChkFlag: function(setting, node) {
-			if (!node) return;
-			var childKey = setting.data.key.children,
-			checkedKey = setting.data.key.checked,
-			chkFlag = -1;
-			if (node[childKey]) {
-				for (var i = 0, l = node[childKey].length; i < l; i++) {
-					var cNode = node[childKey][i];
-					var tmp = -1;
-					if (setting.check.chkStyle == consts.radio.STYLE) {
-						if (cNode.nocheck === true || cNode.chkDisabled === true) {
-							tmp = cNode.check_Child_State;
-						} else if (cNode.halfCheck === true) {
-							tmp = 2;
-						} else if (cNode[checkedKey]) {
-							tmp = 2;
-						} else {
-							tmp = cNode.check_Child_State > 0 ? 2:0;
-						}
-						if (tmp == 2) {
-							chkFlag = 2; break;
-						} else if (tmp == 0){
-							chkFlag = 0;
-						}
-					} else if (setting.check.chkStyle == consts.checkbox.STYLE) {
-						if (cNode.nocheck === true || cNode.chkDisabled === true) {
-							tmp = cNode.check_Child_State;
-						} else if (cNode.halfCheck === true) {
-							tmp = 1;
-						} else if (cNode[checkedKey] ) {
-							tmp = (cNode.check_Child_State === -1 || cNode.check_Child_State === 2) ? 2 : 1;
-						} else {
-							tmp = (cNode.check_Child_State > 0) ? 1 : 0;
-						}
-						if (tmp === 1) {
-							chkFlag = 1; break;
-						} else if (tmp === 2 && chkFlag > -1 && i > 0 && tmp !== chkFlag) {
-							chkFlag = 1; break;
-						} else if (chkFlag === 2 && tmp > -1 && tmp < 2) {
-							chkFlag = 1; break;
-						} else if (tmp > -1) {
-							chkFlag = tmp;
+				return results;
+			},
+			makeChkFlag: function (setting, node) {
+				if (!node) return;
+				var childKey = setting.data.key.children,
+					checkedKey = setting.data.key.checked,
+					chkFlag = -1;
+				if (node[childKey]) {
+					for (var i = 0, l = node[childKey].length; i < l; i++) {
+						var cNode = node[childKey][i];
+						var tmp = -1;
+						if (setting.check.chkStyle == consts.radio.STYLE) {
+							if (cNode.nocheck === true || cNode.chkDisabled === true) {
+								tmp = cNode.check_Child_State;
+							} else if (cNode.halfCheck === true) {
+								tmp = 2;
+							} else if (cNode[checkedKey]) {
+								tmp = 2;
+							} else {
+								tmp = cNode.check_Child_State > 0 ? 2 : 0;
+							}
+							if (tmp == 2) {
+								chkFlag = 2;
+								break;
+							} else if (tmp == 0) {
+								chkFlag = 0;
+							}
+						} else if (setting.check.chkStyle == consts.checkbox.STYLE) {
+							if (cNode.nocheck === true || cNode.chkDisabled === true) {
+								tmp = cNode.check_Child_State;
+							} else if (cNode.halfCheck === true) {
+								tmp = 1;
+							} else if (cNode[checkedKey]) {
+								tmp = (cNode.check_Child_State === -1 || cNode.check_Child_State === 2) ? 2 : 1;
+							} else {
+								tmp = (cNode.check_Child_State > 0) ? 1 : 0;
+							}
+							if (tmp === 1) {
+								chkFlag = 1;
+								break;
+							} else if (tmp === 2 && chkFlag > -1 && i > 0 && tmp !== chkFlag) {
+								chkFlag = 1;
+								break;
+							} else if (chkFlag === 2 && tmp > -1 && tmp < 2) {
+								chkFlag = 1;
+								break;
+							} else if (tmp > -1) {
+								chkFlag = tmp;
+							}
 						}
 					}
 				}
+				node.check_Child_State = chkFlag;
 			}
-			node.check_Child_State = chkFlag;
-		}
-	},
-	//method of event proxy
-	_event = {
-
-	},
-	//method of event handler
-	_handler = {
-		onCheckNode: function (event, node) {
-			if (node.chkDisabled === true) return false;
-			var setting = data.getSetting(event.data.treeId),
-			checkedKey = setting.data.key.checked;
-			if (tools.apply(setting.callback.beforeCheck, [setting.treeId, node], true) == false) return true;
-			node[checkedKey] = !node[checkedKey];
-			view.checkNodeRelation(setting, node);
-			var checkObj = $$(node, consts.id.CHECK, setting);
-			view.setChkClass(setting, checkObj, node);
-			view.repairParentChkClassWithSelf(setting, node);
-			setting.treeObj.trigger(consts.event.CHECK, [event, setting.treeId, node]);
-			return true;
 		},
-		onMouseoverCheck: function(event, node) {
-			if (node.chkDisabled === true) return false;
-			var setting = data.getSetting(event.data.treeId),
-			checkObj = $$(node, consts.id.CHECK, setting);
-			node.check_Focus = true;
-			view.setChkClass(setting, checkObj, node);
-			return true;
+		//method of event proxy
+		_event = {},
+		//method of event handler
+		_handler = {
+			onCheckNode: function (event, node) {
+				if (node.chkDisabled === true) return false;
+				var setting = data.getSetting(event.data.treeId),
+					checkedKey = setting.data.key.checked;
+				if (tools.apply(setting.callback.beforeCheck, [setting.treeId, node], true) == false) return true;
+				node[checkedKey] = !node[checkedKey];
+				view.checkNodeRelation(setting, node);
+				var checkObj = $$(node, consts.id.CHECK, setting);
+				view.setChkClass(setting, checkObj, node);
+				view.repairParentChkClassWithSelf(setting, node);
+				setting.treeObj.trigger(consts.event.CHECK, [event, setting.treeId, node]);
+				return true;
+			},
+			onMouseoverCheck: function (event, node) {
+				if (node.chkDisabled === true) return false;
+				var setting = data.getSetting(event.data.treeId),
+					checkObj = $$(node, consts.id.CHECK, setting);
+				node.check_Focus = true;
+				view.setChkClass(setting, checkObj, node);
+				return true;
+			},
+			onMouseoutCheck: function (event, node) {
+				if (node.chkDisabled === true) return false;
+				var setting = data.getSetting(event.data.treeId),
+					checkObj = $$(node, consts.id.CHECK, setting);
+				node.check_Focus = false;
+				view.setChkClass(setting, checkObj, node);
+				return true;
+			}
 		},
-		onMouseoutCheck: function(event, node) {
-			if (node.chkDisabled === true) return false;
-			var setting = data.getSetting(event.data.treeId),
-			checkObj = $$(node, consts.id.CHECK, setting);
-			node.check_Focus = false;
-			view.setChkClass(setting, checkObj, node);
-			return true;
-		}
-	},
-	//method of tools for zTree
-	_tools = {
-
-	},
-	//method of operate ztree dom
-	_view = {
-		checkNodeRelation: function(setting, node) {
-			var pNode, i, l,
-			childKey = setting.data.key.children,
-			checkedKey = setting.data.key.checked,
-			r = consts.radio;
-			if (setting.check.chkStyle == r.STYLE) {
-				var checkedList = data.getRadioCheckedList(setting);
-				if (node[checkedKey]) {
-					if (setting.check.radioType == r.TYPE_ALL) {
-						for (i = checkedList.length-1; i >= 0; i--) {
-							pNode = checkedList[i];
-							if (pNode[checkedKey] && pNode != node) {
-								pNode[checkedKey] = false;
-								checkedList.splice(i, 1);
+		//method of tools for zTree
+		_tools = {},
+		//method of operate ztree dom
+		_view = {
+			checkNodeRelation: function (setting, node) {
+				var pNode, i, l,
+					childKey = setting.data.key.children,
+					checkedKey = setting.data.key.checked,
+					r = consts.radio;
+				if (setting.check.chkStyle == r.STYLE) {
+					var checkedList = data.getRadioCheckedList(setting);
+					if (node[checkedKey]) {
+						if (setting.check.radioType == r.TYPE_ALL) {
+							for (i = checkedList.length - 1; i >= 0; i--) {
+								pNode = checkedList[i];
+								if (pNode[checkedKey] && pNode != node) {
+									pNode[checkedKey] = false;
+									checkedList.splice(i, 1);
 
-								view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
-								if (pNode.parentTId != node.parentTId) {
-									view.repairParentChkClassWithSelf(setting, pNode);
+									view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
+									if (pNode.parentTId != node.parentTId) {
+										view.repairParentChkClassWithSelf(setting, pNode);
+									}
+								}
+							}
+							checkedList.push(node);
+						} else {
+							var parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
+							for (i = 0, l = parentNode[childKey].length; i < l; i++) {
+								pNode = parentNode[childKey][i];
+								if (pNode[checkedKey] && pNode != node) {
+									pNode[checkedKey] = false;
+									view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
 								}
 							}
 						}
-						checkedList.push(node);
-					} else {
-						var parentNode = (node.parentTId) ? node.getParentNode() : data.getRoot(setting);
-						for (i = 0, l = parentNode[childKey].length; i < l; i++) {
-							pNode = parentNode[childKey][i];
-							if (pNode[checkedKey] && pNode != node) {
-								pNode[checkedKey] = false;
-								view.setChkClass(setting, $$(pNode, consts.id.CHECK, setting), pNode);
+					} else if (setting.check.radioType == r.TYPE_ALL) {
+						for (i = 0, l = checkedList.length; i < l; i++) {
+							if (node == checkedList[i]) {
+								checkedList.splice(i, 1);
+								break;
 							}
 						}
 					}
-				} else if (setting.check.radioType == r.TYPE_ALL) {
-					for (i = 0, l = checkedList.length; i < l; i++) {
-						if (node == checkedList[i]) {
-							checkedList.splice(i, 1);
-							break;
-						}
+
+				} else {
+					if (node[checkedKey] && (!node[childKey] || node[childKey].length == 0 || setting.check.chkboxType.Y.indexOf("s") > -1)) {
+						view.setSonNodeCheckBox(setting, node, true);
+					}
+					if (!node[checkedKey] && (!node[childKey] || node[childKey].length == 0 || setting.check.chkboxType.N.indexOf("s") > -1)) {
+						view.setSonNodeCheckBox(setting, node, false);
+					}
+					if (node[checkedKey] && setting.check.chkboxType.Y.indexOf("p") > -1) {
+						view.setParentNodeCheckBox(setting, node, true);
+					}
+					if (!node[checkedKey] && setting.check.chkboxType.N.indexOf("p") > -1) {
+						view.setParentNodeCheckBox(setting, node, false);
 					}
 				}
-
-			} else {
-				if (node[checkedKey] && (!node[childKey] || node[childKey].length==0 || setting.check.chkboxType.Y.indexOf("s") > -1)) {
-					view.setSonNodeCheckBox(setting, node, true);
+			},
+			makeChkClass: function (setting, node) {
+				var checkedKey = setting.data.key.checked,
+					c = consts.checkbox, r = consts.radio,
+					fullStyle = "";
+				if (node.chkDisabled === true) {
+					fullStyle = c.DISABLED;
+				} else if (node.halfCheck) {
+					fullStyle = c.PART;
+				} else if (setting.check.chkStyle == r.STYLE) {
+					fullStyle = (node.check_Child_State < 1) ? c.FULL : c.PART;
+				} else {
+					fullStyle = node[checkedKey] ? ((node.check_Child_State === 2 || node.check_Child_State === -1) ? c.FULL : c.PART) : ((node.check_Child_State < 1) ? c.FULL : c.PART);
+				}
+				var chkName = setting.check.chkStyle + "_" + (node[checkedKey] ? c.TRUE : c.FALSE) + "_" + fullStyle;
+				chkName = (node.check_Focus && node.chkDisabled !== true) ? chkName + "_" + c.FOCUS : chkName;
+				return consts.className.BUTTON + " " + c.DEFAULT + " " + chkName;
+			},
+			repairAllChk: function (setting, checked) {
+				if (setting.check.enable && setting.check.chkStyle === consts.checkbox.STYLE) {
+					var checkedKey = setting.data.key.checked,
+						childKey = setting.data.key.children,
+						root = data.getRoot(setting);
+					for (var i = 0, l = root[childKey].length; i < l; i++) {
+						var node = root[childKey][i];
+						if (node.nocheck !== true && node.chkDisabled !== true) {
+							node[checkedKey] = checked;
+						}
+						view.setSonNodeCheckBox(setting, node, checked);
+					}
 				}
-				if (!node[checkedKey] && (!node[childKey] || node[childKey].length==0 || setting.check.chkboxType.N.indexOf("s") > -1)) {
-					view.setSonNodeCheckBox(setting, node, false);
+			},
+			repairChkClass: function (setting, node) {
+				if (!node) return;
+				data.makeChkFlag(setting, node);
+				if (node.nocheck !== true) {
+					var checkObj = $$(node, consts.id.CHECK, setting);
+					view.setChkClass(setting, checkObj, node);
 				}
-				if (node[checkedKey] && setting.check.chkboxType.Y.indexOf("p") > -1) {
-					view.setParentNodeCheckBox(setting, node, true);
+			},
+			repairParentChkClass: function (setting, node) {
+				if (!node || !node.parentTId) return;
+				var pNode = node.getParentNode();
+				view.repairChkClass(setting, pNode);
+				view.repairParentChkClass(setting, pNode);
+			},
+			repairParentChkClassWithSelf: function (setting, node) {
+				if (!node) return;
+				var childKey = setting.data.key.children;
+				if (node[childKey] && node[childKey].length > 0) {
+					view.repairParentChkClass(setting, node[childKey][0]);
+				} else {
+					view.repairParentChkClass(setting, node);
 				}
-				if (!node[checkedKey] && setting.check.chkboxType.N.indexOf("p") > -1) {
-					view.setParentNodeCheckBox(setting, node, false);
+			},
+			repairSonChkDisabled: function (setting, node, chkDisabled, inherit) {
+				if (!node) return;
+				var childKey = setting.data.key.children;
+				if (node.chkDisabled != chkDisabled) {
+					node.chkDisabled = chkDisabled;
 				}
-			}
-		},
-		makeChkClass: function(setting, node) {
-			var checkedKey = setting.data.key.checked,
-			c = consts.checkbox, r = consts.radio,
-			fullStyle = "";
-			if (node.chkDisabled === true) {
-				fullStyle = c.DISABLED;
-			} else if (node.halfCheck) {
-				fullStyle = c.PART;
-			} else if (setting.check.chkStyle == r.STYLE) {
-				fullStyle = (node.check_Child_State < 1)? c.FULL:c.PART;
-			} else {
-				fullStyle = node[checkedKey] ? ((node.check_Child_State === 2 || node.check_Child_State === -1) ? c.FULL:c.PART) : ((node.check_Child_State < 1)? c.FULL:c.PART);
-			}
-			var chkName = setting.check.chkStyle + "_" + (node[checkedKey] ? c.TRUE : c.FALSE) + "_" + fullStyle;
-			chkName = (node.check_Focus && node.chkDisabled !== true) ? chkName + "_" + c.FOCUS : chkName;
-			return consts.className.BUTTON + " " + c.DEFAULT + " " + chkName;
-		},
-		repairAllChk: function(setting, checked) {
-			if (setting.check.enable && setting.check.chkStyle === consts.checkbox.STYLE) {
-				var checkedKey = setting.data.key.checked,
-				childKey = setting.data.key.children,
-				root = data.getRoot(setting);
-				for (var i = 0, l = root[childKey].length; i<l ; i++) {
-					var node = root[childKey][i];
-					if (node.nocheck !== true && node.chkDisabled !== true) {
-						node[checkedKey] = checked;
+				view.repairChkClass(setting, node);
+				if (node[childKey] && inherit) {
+					for (var i = 0, l = node[childKey].length; i < l; i++) {
+						var sNode = node[childKey][i];
+						view.repairSonChkDisabled(setting, sNode, chkDisabled, inherit);
 					}
-					view.setSonNodeCheckBox(setting, node, checked);
 				}
-			}
-		},
-		repairChkClass: function(setting, node) {
-			if (!node) return;
-			data.makeChkFlag(setting, node);
-			if (node.nocheck !== true) {
-				var checkObj = $$(node, consts.id.CHECK, setting);
-				view.setChkClass(setting, checkObj, node);
-			}
-		},
-		repairParentChkClass: function(setting, node) {
-			if (!node || !node.parentTId) return;
-			var pNode = node.getParentNode();
-			view.repairChkClass(setting, pNode);
-			view.repairParentChkClass(setting, pNode);
-		},
-		repairParentChkClassWithSelf: function(setting, node) {
-			if (!node) return;
-			var childKey = setting.data.key.children;
-			if (node[childKey] && node[childKey].length > 0) {
-				view.repairParentChkClass(setting, node[childKey][0]);
-			} else {
-				view.repairParentChkClass(setting, node);
-			}
-		},
-		repairSonChkDisabled: function(setting, node, chkDisabled, inherit) {
-			if (!node) return;
-			var childKey = setting.data.key.children;
-			if (node.chkDisabled != chkDisabled) {
-				node.chkDisabled = chkDisabled;
-			}
-			view.repairChkClass(setting, node);
-			if (node[childKey] && inherit) {
-				for (var i = 0, l = node[childKey].length; i < l; i++) {
-					var sNode = node[childKey][i];
-					view.repairSonChkDisabled(setting, sNode, chkDisabled, inherit);
+			},
+			repairParentChkDisabled: function (setting, node, chkDisabled, inherit) {
+				if (!node) return;
+				if (node.chkDisabled != chkDisabled && inherit) {
+					node.chkDisabled = chkDisabled;
 				}
-			}
-		},
-		repairParentChkDisabled: function(setting, node, chkDisabled, inherit) {
-			if (!node) return;
-			if (node.chkDisabled != chkDisabled && inherit) {
-				node.chkDisabled = chkDisabled;
-			}
-			view.repairChkClass(setting, node);
-			view.repairParentChkDisabled(setting, node.getParentNode(), chkDisabled, inherit);
-		},
-		setChkClass: function(setting, obj, node) {
-			if (!obj) return;
-			if (node.nocheck === true) {
-				obj.hide();
-			} else {
-				obj.show();
-			}
-            obj.attr('class', view.makeChkClass(setting, node));
-		},
-		setParentNodeCheckBox: function(setting, node, value, srcNode) {
-			var childKey = setting.data.key.children,
-			checkedKey = setting.data.key.checked,
-			checkObj = $$(node, consts.id.CHECK, setting);
-			if (!srcNode) srcNode = node;
-			data.makeChkFlag(setting, node);
-			if (node.nocheck !== true && node.chkDisabled !== true) {
-				node[checkedKey] = value;
-				view.setChkClass(setting, checkObj, node);
-				if (setting.check.autoCheckTrigger && node != srcNode) {
-					setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+				view.repairChkClass(setting, node);
+				view.repairParentChkDisabled(setting, node.getParentNode(), chkDisabled, inherit);
+			},
+			setChkClass: function (setting, obj, node) {
+				if (!obj) return;
+				if (node.nocheck === true) {
+					obj.hide();
+				} else {
+					obj.show();
 				}
-			}
-			if (node.parentTId) {
-				var pSign = true;
-				if (!value) {
-					var pNodes = node.getParentNode()[childKey];
-					for (var i = 0, l = pNodes.length; i < l; i++) {
-						if ((pNodes[i].nocheck !== true && pNodes[i].chkDisabled !== true && pNodes[i][checkedKey])
-						|| ((pNodes[i].nocheck === true || pNodes[i].chkDisabled === true) && pNodes[i].check_Child_State > 0)) {
-							pSign = false;
-							break;
-						}
+				obj.attr('class', view.makeChkClass(setting, node));
+			},
+			setParentNodeCheckBox: function (setting, node, value, srcNode) {
+				var childKey = setting.data.key.children,
+					checkedKey = setting.data.key.checked,
+					checkObj = $$(node, consts.id.CHECK, setting);
+				if (!srcNode) srcNode = node;
+				data.makeChkFlag(setting, node);
+				if (node.nocheck !== true && node.chkDisabled !== true) {
+					node[checkedKey] = value;
+					view.setChkClass(setting, checkObj, node);
+					if (setting.check.autoCheckTrigger && node != srcNode) {
+						setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
 					}
 				}
-				if (pSign) {
-					view.setParentNodeCheckBox(setting, node.getParentNode(), value, srcNode);
+				if (node.parentTId) {
+					var pSign = true;
+					if (!value) {
+						var pNodes = node.getParentNode()[childKey];
+						for (var i = 0, l = pNodes.length; i < l; i++) {
+							if ((pNodes[i].nocheck !== true && pNodes[i].chkDisabled !== true && pNodes[i][checkedKey])
+								|| ((pNodes[i].nocheck === true || pNodes[i].chkDisabled === true) && pNodes[i].check_Child_State > 0)) {
+								pSign = false;
+								break;
+							}
+						}
+					}
+					if (pSign) {
+						view.setParentNodeCheckBox(setting, node.getParentNode(), value, srcNode);
+					}
 				}
-			}
-		},
-		setSonNodeCheckBox: function(setting, node, value, srcNode) {
-			if (!node) return;
-			var childKey = setting.data.key.children,
-			checkedKey = setting.data.key.checked,
-			checkObj = $$(node, consts.id.CHECK, setting);
-			if (!srcNode) srcNode = node;
+			},
+			setSonNodeCheckBox: function (setting, node, value, srcNode) {
+				if (!node) return;
+				var childKey = setting.data.key.children,
+					checkedKey = setting.data.key.checked,
+					checkObj = $$(node, consts.id.CHECK, setting);
+				if (!srcNode) srcNode = node;
 
-			var hasDisable = false;
-			if (node[childKey]) {
-				for (var i = 0, l = node[childKey].length; i < l; i++) {
-					var sNode = node[childKey][i];
-					view.setSonNodeCheckBox(setting, sNode, value, srcNode);
-					if (sNode.chkDisabled === true) hasDisable = true;
+				var hasDisable = false;
+				if (node[childKey]) {
+					for (var i = 0, l = node[childKey].length; i < l; i++) {
+						var sNode = node[childKey][i];
+						view.setSonNodeCheckBox(setting, sNode, value, srcNode);
+						if (sNode.chkDisabled === true) hasDisable = true;
+					}
 				}
-			}
 
-			if (node != data.getRoot(setting) && node.chkDisabled !== true) {
-				if (hasDisable && node.nocheck !== true) {
-					data.makeChkFlag(setting, node);
-				}
-				if (node.nocheck !== true && node.chkDisabled !== true) {
-					node[checkedKey] = value;
-					if (!hasDisable) node.check_Child_State = (node[childKey] && node[childKey].length > 0) ? (value ? 2 : 0) : -1;
-				} else {
-					node.check_Child_State = -1;
-				}
-				view.setChkClass(setting, checkObj, node);
-				if (setting.check.autoCheckTrigger && node != srcNode && node.nocheck !== true && node.chkDisabled !== true) {
-					setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+				if (node != data.getRoot(setting) && node.chkDisabled !== true) {
+					if (hasDisable && node.nocheck !== true) {
+						data.makeChkFlag(setting, node);
+					}
+					if (node.nocheck !== true && node.chkDisabled !== true) {
+						node[checkedKey] = value;
+						if (!hasDisable) node.check_Child_State = (node[childKey] && node[childKey].length > 0) ? (value ? 2 : 0) : -1;
+					} else {
+						node.check_Child_State = -1;
+					}
+					view.setChkClass(setting, checkObj, node);
+					if (setting.check.autoCheckTrigger && node != srcNode && node.nocheck !== true && node.chkDisabled !== true) {
+						setting.treeObj.trigger(consts.event.CHECK, [null, setting.treeId, node]);
+					}
 				}
-			}
 
-		}
-	},
+			}
+		},
 
-	_z = {
-		tools: _tools,
-		view: _view,
-		event: _event,
-		data: _data
-	};
+		_z = {
+			tools: _tools,
+			view: _view,
+			event: _event,
+			data: _data
+		};
 	$.extend(true, $.fn.zTree.consts, _consts);
 	$.extend(true, $.fn.zTree._z, _z);
 
 	var zt = $.fn.zTree,
-	tools = zt._z.tools,
-	consts = zt.consts,
-	view = zt._z.view,
-	data = zt._z.data,
-	event = zt._z.event,
-	$$ = tools.$;
+		tools = zt._z.tools,
+		consts = zt.consts,
+		view = zt._z.view,
+		data = zt._z.data,
+		event = zt._z.event,
+		$$ = tools.$;
 
 	data.exSetting(_setting);
 	data.addInitBind(_bindEvent);
@@ -600,13 +604,13 @@
 	data.addZTreeTools(_zTreeTools);
 
 	var _createNodes = view.createNodes;
-	view.createNodes = function(setting, level, nodes, parentNode, index) {
+	view.createNodes = function (setting, level, nodes, parentNode, index) {
 		if (_createNodes) _createNodes.apply(view, arguments);
 		if (!nodes) return;
 		view.repairParentChkClassWithSelf(setting, parentNode);
 	}
 	var _removeNode = view.removeNode;
-	view.removeNode = function(setting, node) {
+	view.removeNode = function (setting, node) {
 		var parentNode = node.getParentNode();
 		if (_removeNode) _removeNode.apply(view, arguments);
 		if (!node || !parentNode) return;
@@ -615,7 +619,7 @@
 	}
 
 	var _appendNodes = view.appendNodes;
-	view.appendNodes = function(setting, level, nodes, parentNode, index, initFlag, openFlag) {
+	view.appendNodes = function (setting, level, nodes, parentNode, index, initFlag, openFlag) {
 		var html = "";
 		if (_appendNodes) {
 			html = _appendNodes.apply(view, arguments);
@@ -625,4 +629,4 @@
 		}
 		return html;
 	}
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.exedit.js b/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.exedit.js
index c55b6e8..0ed6a41 100644
--- a/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.exedit.js
+++ b/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.exedit.js
@@ -10,1115 +10,1122 @@
  * email: hunter.z@263.net
  * Date: 2017-11-11
  */
-(function($){
+(function ($) {
 	//default consts of exedit
 	var _consts = {
-		event: {
-			DRAG: "ztree_drag",
-			DROP: "ztree_drop",
-			RENAME: "ztree_rename",
-			DRAGMOVE:"ztree_dragmove"
+			event: {
+				DRAG: "ztree_drag",
+				DROP: "ztree_drop",
+				RENAME: "ztree_rename",
+				DRAGMOVE: "ztree_dragmove"
+			},
+			id: {
+				EDIT: "_edit",
+				INPUT: "_input",
+				REMOVE: "_remove"
+			},
+			move: {
+				TYPE_INNER: "inner",
+				TYPE_PREV: "prev",
+				TYPE_NEXT: "next"
+			},
+			node: {
+				CURSELECTED_EDIT: "curSelectedNode_Edit",
+				TMPTARGET_TREE: "tmpTargetzTree",
+				TMPTARGET_NODE: "tmpTargetNode"
+			}
 		},
-		id: {
-			EDIT: "_edit",
-			INPUT: "_input",
-			REMOVE: "_remove"
+		//default setting of exedit
+		_setting = {
+			edit: {
+				enable: false,
+				editNameSelectAll: false,
+				showRemoveBtn: true,
+				showRenameBtn: true,
+				removeTitle: "remove",
+				renameTitle: "rename",
+				drag: {
+					autoExpandTrigger: false,
+					isCopy: true,
+					isMove: true,
+					prev: true,
+					next: true,
+					inner: true,
+					minMoveSize: 5,
+					borderMax: 10,
+					borderMin: -5,
+					maxShowNodeNum: 5,
+					autoOpenTime: 500
+				}
+			},
+			view: {
+				addHoverDom: null,
+				removeHoverDom: null
+			},
+			callback: {
+				beforeDrag: null,
+				beforeDragOpen: null,
+				beforeDrop: null,
+				beforeEditName: null,
+				beforeRename: null,
+				onDrag: null,
+				onDragMove: null,
+				onDrop: null,
+				onRename: null
+			}
 		},
-		move: {
-			TYPE_INNER: "inner",
-			TYPE_PREV: "prev",
-			TYPE_NEXT: "next"
+		//default root of exedit
+		_initRoot = function (setting) {
+			var r = data.getRoot(setting), rs = data.getRoots();
+			r.curEditNode = null;
+			r.curEditInput = null;
+			r.curHoverNode = null;
+			r.dragFlag = 0;
+			r.dragNodeShowBefore = [];
+			r.dragMaskList = new Array();
+			rs.showHoverDom = true;
 		},
-		node: {
-			CURSELECTED_EDIT: "curSelectedNode_Edit",
-			TMPTARGET_TREE: "tmpTargetzTree",
-			TMPTARGET_NODE: "tmpTargetNode"
-		}
-	},
-	//default setting of exedit
-	_setting = {
-		edit: {
-			enable: false,
-			editNameSelectAll: false,
-			showRemoveBtn: true,
-			showRenameBtn: true,
-			removeTitle: "remove",
-			renameTitle: "rename",
-			drag: {
-				autoExpandTrigger: false,
-				isCopy: true,
-				isMove: true,
-				prev: true,
-				next: true,
-				inner: true,
-				minMoveSize: 5,
-				borderMax: 10,
-				borderMin: -5,
-				maxShowNodeNum: 5,
-				autoOpenTime: 500
-			}
+		//default cache of exedit
+		_initCache = function (treeId) {
 		},
-		view: {
-			addHoverDom: null,
-			removeHoverDom: null
+		//default bind event of exedit
+		_bindEvent = function (setting) {
+			var o = setting.treeObj;
+			var c = consts.event;
+			o.bind(c.RENAME, function (event, treeId, treeNode, isCancel) {
+				tools.apply(setting.callback.onRename, [event, treeId, treeNode, isCancel]);
+			});
+
+			o.bind(c.DRAG, function (event, srcEvent, treeId, treeNodes) {
+				tools.apply(setting.callback.onDrag, [srcEvent, treeId, treeNodes]);
+			});
+
+			o.bind(c.DRAGMOVE, function (event, srcEvent, treeId, treeNodes) {
+				tools.apply(setting.callback.onDragMove, [srcEvent, treeId, treeNodes]);
+			});
+
+			o.bind(c.DROP, function (event, srcEvent, treeId, treeNodes, targetNode, moveType, isCopy) {
+				tools.apply(setting.callback.onDrop, [srcEvent, treeId, treeNodes, targetNode, moveType, isCopy]);
+			});
 		},
-		callback: {
-			beforeDrag:null,
-			beforeDragOpen:null,
-			beforeDrop:null,
-			beforeEditName:null,
-			beforeRename:null,
-			onDrag:null,
-			onDragMove:null,
-			onDrop:null,
-			onRename:null
-		}
-	},
-	//default root of exedit
-	_initRoot = function (setting) {
-		var r = data.getRoot(setting), rs = data.getRoots();
-		r.curEditNode = null;
-		r.curEditInput = null;
-		r.curHoverNode = null;
-		r.dragFlag = 0;
-		r.dragNodeShowBefore = [];
-		r.dragMaskList = new Array();
-		rs.showHoverDom = true;
-	},
-	//default cache of exedit
-	_initCache = function(treeId) {},
-	//default bind event of exedit
-	_bindEvent = function(setting) {
-		var o = setting.treeObj;
-		var c = consts.event;
-		o.bind(c.RENAME, function (event, treeId, treeNode, isCancel) {
-			tools.apply(setting.callback.onRename, [event, treeId, treeNode, isCancel]);
-		});
-
-		o.bind(c.DRAG, function (event, srcEvent, treeId, treeNodes) {
-			tools.apply(setting.callback.onDrag, [srcEvent, treeId, treeNodes]);
-		});
-
-		o.bind(c.DRAGMOVE,function(event, srcEvent, treeId, treeNodes){
-			tools.apply(setting.callback.onDragMove,[srcEvent, treeId, treeNodes]);
-		});
-
-		o.bind(c.DROP, function (event, srcEvent, treeId, treeNodes, targetNode, moveType, isCopy) {
-			tools.apply(setting.callback.onDrop, [srcEvent, treeId, treeNodes, targetNode, moveType, isCopy]);
-		});
-	},
-	_unbindEvent = function(setting) {
-		var o = setting.treeObj;
-		var c = consts.event;
-		o.unbind(c.RENAME);
-		o.unbind(c.DRAG);
-		o.unbind(c.DRAGMOVE);
-		o.unbind(c.DROP);
-	},
-	//default event proxy of exedit
-	_eventProxy = function(e) {
-		var target = e.target,
-		setting = data.getSetting(e.data.treeId),
-		relatedTarget = e.relatedTarget,
-		tId = "", node = null,
-		nodeEventType = "", treeEventType = "",
-		nodeEventCallback = null, treeEventCallback = null,
-		tmp = null;
-
-		if (tools.eqs(e.type, "mouseover")) {
-			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
-			if (tmp) {
-				tId = tools.getNodeMainDom(tmp).id;
-				nodeEventType = "hoverOverNode";
-			}
-		} else if (tools.eqs(e.type, "mouseout")) {
-			tmp = tools.getMDom(setting, relatedTarget, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
-			if (!tmp) {
-				tId = "remove";
-				nodeEventType = "hoverOutNode";
-			}
-		} else if (tools.eqs(e.type, "mousedown")) {
-			tmp = tools.getMDom(setting, target, [{tagName:"a", attrName:"treeNode"+consts.id.A}]);
-			if (tmp) {
-				tId = tools.getNodeMainDom(tmp).id;
-				nodeEventType = "mousedownNode";
+		_unbindEvent = function (setting) {
+			var o = setting.treeObj;
+			var c = consts.event;
+			o.unbind(c.RENAME);
+			o.unbind(c.DRAG);
+			o.unbind(c.DRAGMOVE);
+			o.unbind(c.DROP);
+		},
+		//default event proxy of exedit
+		_eventProxy = function (e) {
+			var target = e.target,
+				setting = data.getSetting(e.data.treeId),
+				relatedTarget = e.relatedTarget,
+				tId = "", node = null,
+				nodeEventType = "", treeEventType = "",
+				nodeEventCallback = null, treeEventCallback = null,
+				tmp = null;
+
+			if (tools.eqs(e.type, "mouseover")) {
+				tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+				if (tmp) {
+					tId = tools.getNodeMainDom(tmp).id;
+					nodeEventType = "hoverOverNode";
+				}
+			} else if (tools.eqs(e.type, "mouseout")) {
+				tmp = tools.getMDom(setting, relatedTarget, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+				if (!tmp) {
+					tId = "remove";
+					nodeEventType = "hoverOutNode";
+				}
+			} else if (tools.eqs(e.type, "mousedown")) {
+				tmp = tools.getMDom(setting, target, [{tagName: "a", attrName: "treeNode" + consts.id.A}]);
+				if (tmp) {
+					tId = tools.getNodeMainDom(tmp).id;
+					nodeEventType = "mousedownNode";
+				}
 			}
-		}
-		if (tId.length>0) {
-			node = data.getNodeCache(setting, tId);
-			switch (nodeEventType) {
-				case "mousedownNode" :
-					nodeEventCallback = _handler.onMousedownNode;
-					break;
-				case "hoverOverNode" :
-					nodeEventCallback = _handler.onHoverOverNode;
-					break;
-				case "hoverOutNode" :
-					nodeEventCallback = _handler.onHoverOutNode;
-					break;
+			if (tId.length > 0) {
+				node = data.getNodeCache(setting, tId);
+				switch (nodeEventType) {
+					case "mousedownNode" :
+						nodeEventCallback = _handler.onMousedownNode;
+						break;
+					case "hoverOverNode" :
+						nodeEventCallback = _handler.onHoverOverNode;
+						break;
+					case "hoverOutNode" :
+						nodeEventCallback = _handler.onHoverOutNode;
+						break;
+				}
 			}
-		}
-		var proxyResult = {
-			stop: false,
-			node: node,
-			nodeEventType: nodeEventType,
-			nodeEventCallback: nodeEventCallback,
-			treeEventType: treeEventType,
-			treeEventCallback: treeEventCallback
-		};
-		return proxyResult
-	},
-	//default init node of exedit
-	_initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
-		if (!n) return;
-		n.isHover = false;
-		n.editNameFlag = false;
-	},
-	//update zTreeObj, add method of edit
-	_zTreeTools = function(setting, zTreeTools) {
-		zTreeTools.cancelEditName = function(newName) {
-			var root = data.getRoot(this.setting);
-			if (!root.curEditNode) return;
-			view.cancelCurEditNode(this.setting, newName?newName:null, true);
-		}
-		zTreeTools.copyNode = function(targetNode, node, moveType, isSilent) {
-			if (!node) return null;
-			if (targetNode && !targetNode.isParent && this.setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) return null;
-			var _this = this,
-				newNode = tools.clone(node);
-			if (!targetNode) {
-				targetNode = null;
-				moveType = consts.move.TYPE_INNER;
+			var proxyResult = {
+				stop: false,
+				node: node,
+				nodeEventType: nodeEventType,
+				nodeEventCallback: nodeEventCallback,
+				treeEventType: treeEventType,
+				treeEventCallback: treeEventCallback
+			};
+			return proxyResult
+		},
+		//default init node of exedit
+		_initNode = function (setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+			if (!n) return;
+			n.isHover = false;
+			n.editNameFlag = false;
+		},
+		//update zTreeObj, add method of edit
+		_zTreeTools = function (setting, zTreeTools) {
+			zTreeTools.cancelEditName = function (newName) {
+				var root = data.getRoot(this.setting);
+				if (!root.curEditNode) return;
+				view.cancelCurEditNode(this.setting, newName ? newName : null, true);
 			}
-			if (moveType == consts.move.TYPE_INNER) {
-				function copyCallback() {
-					view.addNodes(_this.setting, targetNode, -1, [newNode], isSilent);
+			zTreeTools.copyNode = function (targetNode, node, moveType, isSilent) {
+				if (!node) return null;
+				if (targetNode && !targetNode.isParent && this.setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) return null;
+				var _this = this,
+					newNode = tools.clone(node);
+				if (!targetNode) {
+					targetNode = null;
+					moveType = consts.move.TYPE_INNER;
 				}
+				if (moveType == consts.move.TYPE_INNER) {
+					function copyCallback() {
+						view.addNodes(_this.setting, targetNode, -1, [newNode], isSilent);
+					}
 
-				if (tools.canAsync(this.setting, targetNode)) {
-					view.asyncNode(this.setting, targetNode, isSilent, copyCallback);
+					if (tools.canAsync(this.setting, targetNode)) {
+						view.asyncNode(this.setting, targetNode, isSilent, copyCallback);
+					} else {
+						copyCallback();
+					}
 				} else {
-					copyCallback();
+					view.addNodes(this.setting, targetNode.parentNode, -1, [newNode], isSilent);
+					view.moveNode(this.setting, targetNode, newNode, moveType, false, isSilent);
 				}
-			} else {
-				view.addNodes(this.setting, targetNode.parentNode, -1, [newNode], isSilent);
-				view.moveNode(this.setting, targetNode, newNode, moveType, false, isSilent);
-			}
-			return newNode;
-		}
-		zTreeTools.editName = function(node) {
-			if (!node || !node.tId || node !== data.getNodeCache(this.setting, node.tId)) return;
-			if (node.parentTId) view.expandCollapseParentNode(this.setting, node.getParentNode(), true);
-			view.editNode(this.setting, node)
-		}
-		zTreeTools.moveNode = function(targetNode, node, moveType, isSilent) {
-			if (!node) return node;
-			if (targetNode && !targetNode.isParent && this.setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) {
-				return null;
-			} else if (targetNode && ((node.parentTId == targetNode.tId && moveType == consts.move.TYPE_INNER) || $$(node, this.setting).find("#" + targetNode.tId).length > 0)) {
-				return null;
-			} else if (!targetNode) {
-				targetNode = null;
-			}
-			var _this = this;
-			function moveCallback() {
-				view.moveNode(_this.setting, targetNode, node, moveType, false, isSilent);
+				return newNode;
 			}
-			if (tools.canAsync(this.setting, targetNode) && moveType === consts.move.TYPE_INNER) {
-				view.asyncNode(this.setting, targetNode, isSilent, moveCallback);
-			} else {
-				moveCallback();
+			zTreeTools.editName = function (node) {
+				if (!node || !node.tId || node !== data.getNodeCache(this.setting, node.tId)) return;
+				if (node.parentTId) view.expandCollapseParentNode(this.setting, node.getParentNode(), true);
+				view.editNode(this.setting, node)
 			}
-			return node;
-		}
-		zTreeTools.setEditable = function(editable) {
-			this.setting.edit.enable = editable;
-			return this.refresh();
-		}
-	},
-	//method of operate data
-	_data = {
-		setSonNodeLevel: function(setting, parentNode, node) {
-			if (!node) return;
-			var childKey = setting.data.key.children;
-			node.level = (parentNode)? parentNode.level + 1 : 0;
-			if (!node[childKey]) return;
-			for (var i = 0, l = node[childKey].length; i < l; i++) {
-				if (node[childKey][i]) data.setSonNodeLevel(setting, node, node[childKey][i]);
+			zTreeTools.moveNode = function (targetNode, node, moveType, isSilent) {
+				if (!node) return node;
+				if (targetNode && !targetNode.isParent && this.setting.data.keep.leaf && moveType === consts.move.TYPE_INNER) {
+					return null;
+				} else if (targetNode && ((node.parentTId == targetNode.tId && moveType == consts.move.TYPE_INNER) || $$(node, this.setting).find("#" + targetNode.tId).length > 0)) {
+					return null;
+				} else if (!targetNode) {
+					targetNode = null;
+				}
+				var _this = this;
+
+				function moveCallback() {
+					view.moveNode(_this.setting, targetNode, node, moveType, false, isSilent);
+				}
+
+				if (tools.canAsync(this.setting, targetNode) && moveType === consts.move.TYPE_INNER) {
+					view.asyncNode(this.setting, targetNode, isSilent, moveCallback);
+				} else {
+					moveCallback();
+				}
+				return node;
 			}
-		}
-	},
-	//method of event proxy
-	_event = {
-
-	},
-	//method of event handler
-	_handler = {
-		onHoverOverNode: function(event, node) {
-			var setting = data.getSetting(event.data.treeId),
-			root = data.getRoot(setting);
-			if (root.curHoverNode != node) {
-				_handler.onHoverOutNode(event);
+			zTreeTools.setEditable = function (editable) {
+				this.setting.edit.enable = editable;
+				return this.refresh();
 			}
-			root.curHoverNode = node;
-			view.addHoverDom(setting, node);
 		},
-		onHoverOutNode: function(event, node) {
-			var setting = data.getSetting(event.data.treeId),
-			root = data.getRoot(setting);
-			if (root.curHoverNode && !data.isSelectedNode(setting, root.curHoverNode)) {
-				view.removeTreeDom(setting, root.curHoverNode);
-				root.curHoverNode = null;
+		//method of operate data
+		_data = {
+			setSonNodeLevel: function (setting, parentNode, node) {
+				if (!node) return;
+				var childKey = setting.data.key.children;
+				node.level = (parentNode) ? parentNode.level + 1 : 0;
+				if (!node[childKey]) return;
+				for (var i = 0, l = node[childKey].length; i < l; i++) {
+					if (node[childKey][i]) data.setSonNodeLevel(setting, node, node[childKey][i]);
+				}
 			}
 		},
-		onMousedownNode: function(eventMouseDown, _node) {
-			var i,l,
-			setting = data.getSetting(eventMouseDown.data.treeId),
-			root = data.getRoot(setting), roots = data.getRoots();
-			//right click can't drag & drop
-			if (eventMouseDown.button == 2 || !setting.edit.enable || (!setting.edit.drag.isCopy && !setting.edit.drag.isMove)) return true;
-
-			//input of edit node name can't drag & drop
-			var target = eventMouseDown.target,
-			_nodes = data.getRoot(setting).curSelectedList,
-			nodes = [];
-			if (!data.isSelectedNode(setting, _node)) {
-				nodes = [_node];
-			} else {
-				for (i=0, l=_nodes.length; i<l; i++) {
-					if (_nodes[i].editNameFlag && tools.eqs(target.tagName, "input") && target.getAttribute("treeNode"+consts.id.INPUT) !== null) {
-						return true;
-					}
-					nodes.push(_nodes[i]);
-					if (nodes[0].parentTId !== _nodes[i].parentTId) {
-						nodes = [_node];
-						break;
+		//method of event proxy
+		_event = {},
+		//method of event handler
+		_handler = {
+			onHoverOverNode: function (event, node) {
+				var setting = data.getSetting(event.data.treeId),
+					root = data.getRoot(setting);
+				if (root.curHoverNode != node) {
+					_handler.onHoverOutNode(event);
+				}
+				root.curHoverNode = node;
+				view.addHoverDom(setting, node);
+			},
+			onHoverOutNode: function (event, node) {
+				var setting = data.getSetting(event.data.treeId),
+					root = data.getRoot(setting);
+				if (root.curHoverNode && !data.isSelectedNode(setting, root.curHoverNode)) {
+					view.removeTreeDom(setting, root.curHoverNode);
+					root.curHoverNode = null;
+				}
+			},
+			onMousedownNode: function (eventMouseDown, _node) {
+				var i, l,
+					setting = data.getSetting(eventMouseDown.data.treeId),
+					root = data.getRoot(setting), roots = data.getRoots();
+				//right click can't drag & drop
+				if (eventMouseDown.button == 2 || !setting.edit.enable || (!setting.edit.drag.isCopy && !setting.edit.drag.isMove)) return true;
+
+				//input of edit node name can't drag & drop
+				var target = eventMouseDown.target,
+					_nodes = data.getRoot(setting).curSelectedList,
+					nodes = [];
+				if (!data.isSelectedNode(setting, _node)) {
+					nodes = [_node];
+				} else {
+					for (i = 0, l = _nodes.length; i < l; i++) {
+						if (_nodes[i].editNameFlag && tools.eqs(target.tagName, "input") && target.getAttribute("treeNode" + consts.id.INPUT) !== null) {
+							return true;
+						}
+						nodes.push(_nodes[i]);
+						if (nodes[0].parentTId !== _nodes[i].parentTId) {
+							nodes = [_node];
+							break;
+						}
 					}
 				}
-			}
 
-			view.editNodeBlur = true;
-			view.cancelCurEditNode(setting);
-
-			var doc = $(setting.treeObj.get(0).ownerDocument),
-			body = $(setting.treeObj.get(0).ownerDocument.body), curNode, tmpArrow, tmpTarget,
-			isOtherTree = false,
-			targetSetting = setting,
-			sourceSetting = setting,
-			preNode, nextNode,
-			preTmpTargetNodeId = null,
-			preTmpMoveType = null,
-			tmpTargetNodeId = null,
-			moveType = consts.move.TYPE_INNER,
-			mouseDownX = eventMouseDown.clientX,
-			mouseDownY = eventMouseDown.clientY,
-			startTime = (new Date()).getTime();
-
-			if (tools.uCanDo(setting)) {
-				doc.bind("mousemove", _docMouseMove);
-			}
-			function _docMouseMove(event) {
-				//avoid start drag after click node
-				if (root.dragFlag == 0 && Math.abs(mouseDownX - event.clientX) < setting.edit.drag.minMoveSize
-					&& Math.abs(mouseDownY - event.clientY) < setting.edit.drag.minMoveSize) {
-					return true;
+				view.editNodeBlur = true;
+				view.cancelCurEditNode(setting);
+
+				var doc = $(setting.treeObj.get(0).ownerDocument),
+					body = $(setting.treeObj.get(0).ownerDocument.body), curNode, tmpArrow, tmpTarget,
+					isOtherTree = false,
+					targetSetting = setting,
+					sourceSetting = setting,
+					preNode, nextNode,
+					preTmpTargetNodeId = null,
+					preTmpMoveType = null,
+					tmpTargetNodeId = null,
+					moveType = consts.move.TYPE_INNER,
+					mouseDownX = eventMouseDown.clientX,
+					mouseDownY = eventMouseDown.clientY,
+					startTime = (new Date()).getTime();
+
+				if (tools.uCanDo(setting)) {
+					doc.bind("mousemove", _docMouseMove);
 				}
-				var i, l, tmpNode, tmpDom, tmpNodes,
-				childKey = setting.data.key.children;
-				body.css("cursor", "pointer");
 
-				if (root.dragFlag == 0) {
-					if (tools.apply(setting.callback.beforeDrag, [setting.treeId, nodes], true) == false) {
-						_docMouseUp(event);
+				function _docMouseMove(event) {
+					//avoid start drag after click node
+					if (root.dragFlag == 0 && Math.abs(mouseDownX - event.clientX) < setting.edit.drag.minMoveSize
+						&& Math.abs(mouseDownY - event.clientY) < setting.edit.drag.minMoveSize) {
 						return true;
 					}
-
-					for (i=0, l=nodes.length; i<l; i++) {
-						if (i==0) {
-							root.dragNodeShowBefore = [];
+					var i, l, tmpNode, tmpDom, tmpNodes,
+						childKey = setting.data.key.children;
+					body.css("cursor", "pointer");
+
+					if (root.dragFlag == 0) {
+						if (tools.apply(setting.callback.beforeDrag, [setting.treeId, nodes], true) == false) {
+							_docMouseUp(event);
+							return true;
 						}
-						tmpNode = nodes[i];
-						if (tmpNode.isParent && tmpNode.open) {
-							view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
-							root.dragNodeShowBefore[tmpNode.tId] = true;
-						} else {
-							root.dragNodeShowBefore[tmpNode.tId] = false;
+
+						for (i = 0, l = nodes.length; i < l; i++) {
+							if (i == 0) {
+								root.dragNodeShowBefore = [];
+							}
+							tmpNode = nodes[i];
+							if (tmpNode.isParent && tmpNode.open) {
+								view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
+								root.dragNodeShowBefore[tmpNode.tId] = true;
+							} else {
+								root.dragNodeShowBefore[tmpNode.tId] = false;
+							}
 						}
-					}
 
-					root.dragFlag = 1;
-					roots.showHoverDom = false;
-					tools.showIfameMask(setting, true);
-
-					//sort
-					var isOrder = true, lastIndex = -1;
-					if (nodes.length>1) {
-						var pNodes = nodes[0].parentTId ? nodes[0].getParentNode()[childKey] : data.getNodes(setting);
-						tmpNodes = [];
-						for (i=0, l=pNodes.length; i<l; i++) {
-							if (root.dragNodeShowBefore[pNodes[i].tId] !== undefined) {
-								if (isOrder && lastIndex > -1 && (lastIndex+1) !== i) {
-									isOrder = false;
+						root.dragFlag = 1;
+						roots.showHoverDom = false;
+						tools.showIfameMask(setting, true);
+
+						//sort
+						var isOrder = true, lastIndex = -1;
+						if (nodes.length > 1) {
+							var pNodes = nodes[0].parentTId ? nodes[0].getParentNode()[childKey] : data.getNodes(setting);
+							tmpNodes = [];
+							for (i = 0, l = pNodes.length; i < l; i++) {
+								if (root.dragNodeShowBefore[pNodes[i].tId] !== undefined) {
+									if (isOrder && lastIndex > -1 && (lastIndex + 1) !== i) {
+										isOrder = false;
+									}
+									tmpNodes.push(pNodes[i]);
+									lastIndex = i;
+								}
+								if (nodes.length === tmpNodes.length) {
+									nodes = tmpNodes;
+									break;
 								}
-								tmpNodes.push(pNodes[i]);
-								lastIndex = i;
-							}
-							if (nodes.length === tmpNodes.length) {
-								nodes = tmpNodes;
-								break;
 							}
 						}
-					}
-					if (isOrder) {
-						preNode = nodes[0].getPreNode();
-						nextNode = nodes[nodes.length-1].getNextNode();
-					}
+						if (isOrder) {
+							preNode = nodes[0].getPreNode();
+							nextNode = nodes[nodes.length - 1].getNextNode();
+						}
 
-					//set node in selected
-					curNode = $$("<ul class='zTreeDragUL'></ul>", setting);
-					for (i=0, l=nodes.length; i<l; i++) {
-						tmpNode = nodes[i];
-						tmpNode.editNameFlag = false;
-						view.selectNode(setting, tmpNode, i>0);
-						view.removeTreeDom(setting, tmpNode);
+						//set node in selected
+						curNode = $$("<ul class='zTreeDragUL'></ul>", setting);
+						for (i = 0, l = nodes.length; i < l; i++) {
+							tmpNode = nodes[i];
+							tmpNode.editNameFlag = false;
+							view.selectNode(setting, tmpNode, i > 0);
+							view.removeTreeDom(setting, tmpNode);
 
-						if (i > setting.edit.drag.maxShowNodeNum-1) {
-							continue;
-						}
+							if (i > setting.edit.drag.maxShowNodeNum - 1) {
+								continue;
+							}
 
-						tmpDom = $$("<li id='"+ tmpNode.tId +"_tmp'></li>", setting);
-						tmpDom.append($$(tmpNode, consts.id.A, setting).clone());
-						tmpDom.css("padding", "0");
-						tmpDom.children("#" + tmpNode.tId + consts.id.A).removeClass(consts.node.CURSELECTED);
-						curNode.append(tmpDom);
-						if (i == setting.edit.drag.maxShowNodeNum-1) {
-							tmpDom = $$("<li id='"+ tmpNode.tId +"_moretmp'><a>  ...  </a></li>", setting);
+							tmpDom = $$("<li id='" + tmpNode.tId + "_tmp'></li>", setting);
+							tmpDom.append($$(tmpNode, consts.id.A, setting).clone());
+							tmpDom.css("padding", "0");
+							tmpDom.children("#" + tmpNode.tId + consts.id.A).removeClass(consts.node.CURSELECTED);
 							curNode.append(tmpDom);
+							if (i == setting.edit.drag.maxShowNodeNum - 1) {
+								tmpDom = $$("<li id='" + tmpNode.tId + "_moretmp'><a>  ...  </a></li>", setting);
+								curNode.append(tmpDom);
+							}
 						}
-					}
-					curNode.attr("id", nodes[0].tId + consts.id.UL + "_tmp");
-					curNode.addClass(setting.treeObj.attr("class"));
-					curNode.appendTo(body);
-
-					tmpArrow = $$("<span class='tmpzTreeMove_arrow'></span>", setting);
-					tmpArrow.attr("id", "zTreeMove_arrow_tmp");
-					tmpArrow.appendTo(body);
+						curNode.attr("id", nodes[0].tId + consts.id.UL + "_tmp");
+						curNode.addClass(setting.treeObj.attr("class"));
+						curNode.appendTo(body);
 
-					setting.treeObj.trigger(consts.event.DRAG, [event, setting.treeId, nodes]);
-				}
+						tmpArrow = $$("<span class='tmpzTreeMove_arrow'></span>", setting);
+						tmpArrow.attr("id", "zTreeMove_arrow_tmp");
+						tmpArrow.appendTo(body);
 
-				if (root.dragFlag == 1) {
-					if (tmpTarget && tmpArrow.attr("id") == event.target.id && tmpTargetNodeId && (event.clientX + doc.scrollLeft()+2) > ($("#" + tmpTargetNodeId + consts.id.A, tmpTarget).offset().left)) {
-						var xT = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget);
-						event.target = (xT.length > 0) ? xT.get(0) : event.target;
-					} else if (tmpTarget) {
-						tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
-						if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
-							.removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
-					}
-					tmpTarget = null;
-					tmpTargetNodeId = null;
-
-					//judge drag & drop in multi ztree
-					isOtherTree = false;
-					targetSetting = setting;
-					var settings = data.getSettings();
-					for (var s in settings) {
-						if (settings[s].treeId && settings[s].edit.enable && settings[s].treeId != setting.treeId
-							&& (event.target.id == settings[s].treeId || $(event.target).parents("#" + settings[s].treeId).length>0)) {
-							isOtherTree = true;
-							targetSetting = settings[s];
-						}
+						setting.treeObj.trigger(consts.event.DRAG, [event, setting.treeId, nodes]);
 					}
 
-					var docScrollTop = doc.scrollTop(),
-					docScrollLeft = doc.scrollLeft(),
-					treeOffset = targetSetting.treeObj.offset(),
-					scrollHeight = targetSetting.treeObj.get(0).scrollHeight,
-					scrollWidth = targetSetting.treeObj.get(0).scrollWidth,
-					dTop = (event.clientY + docScrollTop - treeOffset.top),
-					dBottom = (targetSetting.treeObj.height() + treeOffset.top - event.clientY - docScrollTop),
-					dLeft = (event.clientX + docScrollLeft - treeOffset.left),
-					dRight = (targetSetting.treeObj.width() + treeOffset.left - event.clientX - docScrollLeft),
-					isTop = (dTop < setting.edit.drag.borderMax && dTop > setting.edit.drag.borderMin),
-					isBottom = (dBottom < setting.edit.drag.borderMax && dBottom > setting.edit.drag.borderMin),
-					isLeft = (dLeft < setting.edit.drag.borderMax && dLeft > setting.edit.drag.borderMin),
-					isRight = (dRight < setting.edit.drag.borderMax && dRight > setting.edit.drag.borderMin),
-					isTreeInner = dTop > setting.edit.drag.borderMin && dBottom > setting.edit.drag.borderMin && dLeft > setting.edit.drag.borderMin && dRight > setting.edit.drag.borderMin,
-					isTreeTop = (isTop && targetSetting.treeObj.scrollTop() <= 0),
-					isTreeBottom = (isBottom && (targetSetting.treeObj.scrollTop() + targetSetting.treeObj.height()+10) >= scrollHeight),
-					isTreeLeft = (isLeft && targetSetting.treeObj.scrollLeft() <= 0),
-					isTreeRight = (isRight && (targetSetting.treeObj.scrollLeft() + targetSetting.treeObj.width()+10) >= scrollWidth);
-
-					if (event.target && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
-						//get node <li> dom
-						var targetObj = event.target;
-						while (targetObj && targetObj.tagName && !tools.eqs(targetObj.tagName, "li") && targetObj.id != targetSetting.treeId) {
-							targetObj = targetObj.parentNode;
+					if (root.dragFlag == 1) {
+						if (tmpTarget && tmpArrow.attr("id") == event.target.id && tmpTargetNodeId && (event.clientX + doc.scrollLeft() + 2) > ($("#" + tmpTargetNodeId + consts.id.A, tmpTarget).offset().left)) {
+							var xT = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget);
+							event.target = (xT.length > 0) ? xT.get(0) : event.target;
+						} else if (tmpTarget) {
+							tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
+							if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
+								.removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
 						}
-
-						var canMove = true;
-						//don't move to self or children of self
-						for (i=0, l=nodes.length; i<l; i++) {
-							tmpNode = nodes[i];
-							if (targetObj.id === tmpNode.tId) {
-								canMove = false;
-								break;
-							} else if ($$(tmpNode, setting).find("#" + targetObj.id).length > 0) {
-								canMove = false;
-								break;
+						tmpTarget = null;
+						tmpTargetNodeId = null;
+
+						//judge drag & drop in multi ztree
+						isOtherTree = false;
+						targetSetting = setting;
+						var settings = data.getSettings();
+						for (var s in settings) {
+							if (settings[s].treeId && settings[s].edit.enable && settings[s].treeId != setting.treeId
+								&& (event.target.id == settings[s].treeId || $(event.target).parents("#" + settings[s].treeId).length > 0)) {
+								isOtherTree = true;
+								targetSetting = settings[s];
 							}
 						}
-						if (canMove && event.target && tools.isChildOrSelf(event.target, targetObj.id + consts.id.A)) {
-							tmpTarget = $(targetObj);
-							tmpTargetNodeId = targetObj.id;
-						}
-					}
 
-					//the mouse must be in zTree
-					tmpNode = nodes[0];
-					if (isTreeInner && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
-						//judge mouse move in root of ztree
-						if (!tmpTarget && (event.target.id == targetSetting.treeId || isTreeTop || isTreeBottom || isTreeLeft || isTreeRight) && (isOtherTree || (!isOtherTree && tmpNode.parentTId))) {
-							tmpTarget = targetSetting.treeObj;
-						}
-						//auto scroll top
-						if (isTop) {
-							targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop()-10);
-						} else if (isBottom)  {
-							targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop()+10);
-						}
-						if (isLeft) {
-							targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft()-10);
-						} else if (isRight) {
-							targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft()+10);
-						}
-						//auto scroll left
-						if (tmpTarget && tmpTarget != targetSetting.treeObj && tmpTarget.offset().left < targetSetting.treeObj.offset().left) {
-							targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft()+ tmpTarget.offset().left - targetSetting.treeObj.offset().left);
-						}
-					}
+						var docScrollTop = doc.scrollTop(),
+							docScrollLeft = doc.scrollLeft(),
+							treeOffset = targetSetting.treeObj.offset(),
+							scrollHeight = targetSetting.treeObj.get(0).scrollHeight,
+							scrollWidth = targetSetting.treeObj.get(0).scrollWidth,
+							dTop = (event.clientY + docScrollTop - treeOffset.top),
+							dBottom = (targetSetting.treeObj.height() + treeOffset.top - event.clientY - docScrollTop),
+							dLeft = (event.clientX + docScrollLeft - treeOffset.left),
+							dRight = (targetSetting.treeObj.width() + treeOffset.left - event.clientX - docScrollLeft),
+							isTop = (dTop < setting.edit.drag.borderMax && dTop > setting.edit.drag.borderMin),
+							isBottom = (dBottom < setting.edit.drag.borderMax && dBottom > setting.edit.drag.borderMin),
+							isLeft = (dLeft < setting.edit.drag.borderMax && dLeft > setting.edit.drag.borderMin),
+							isRight = (dRight < setting.edit.drag.borderMax && dRight > setting.edit.drag.borderMin),
+							isTreeInner = dTop > setting.edit.drag.borderMin && dBottom > setting.edit.drag.borderMin && dLeft > setting.edit.drag.borderMin && dRight > setting.edit.drag.borderMin,
+							isTreeTop = (isTop && targetSetting.treeObj.scrollTop() <= 0),
+							isTreeBottom = (isBottom && (targetSetting.treeObj.scrollTop() + targetSetting.treeObj.height() + 10) >= scrollHeight),
+							isTreeLeft = (isLeft && targetSetting.treeObj.scrollLeft() <= 0),
+							isTreeRight = (isRight && (targetSetting.treeObj.scrollLeft() + targetSetting.treeObj.width() + 10) >= scrollWidth);
+
+						if (event.target && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
+							//get node <li> dom
+							var targetObj = event.target;
+							while (targetObj && targetObj.tagName && !tools.eqs(targetObj.tagName, "li") && targetObj.id != targetSetting.treeId) {
+								targetObj = targetObj.parentNode;
+							}
 
-					curNode.css({
-						"top": (event.clientY + docScrollTop + 3) + "px",
-						"left": (event.clientX + docScrollLeft + 3) + "px"
-					});
-
-					var dX = 0;
-					var dY = 0;
-					if (tmpTarget && tmpTarget.attr("id")!=targetSetting.treeId) {
-						var tmpTargetNode = tmpTargetNodeId == null ? null: data.getNodeCache(targetSetting, tmpTargetNodeId),
-							isCopy = ((event.ctrlKey || event.metaKey) && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy),
-							isPrev = !!(preNode && tmpTargetNodeId === preNode.tId),
-							isNext = !!(nextNode && tmpTargetNodeId === nextNode.tId),
-							isInner = (tmpNode.parentTId && tmpNode.parentTId == tmpTargetNodeId),
-							canPrev = (isCopy || !isNext) && tools.apply(targetSetting.edit.drag.prev, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.prev),
-							canNext = (isCopy || !isPrev) && tools.apply(targetSetting.edit.drag.next, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.next),
-							canInner = (isCopy || !isInner) && !(targetSetting.data.keep.leaf && !tmpTargetNode.isParent) && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.inner);
-
-						function clearMove() {
-							tmpTarget = null;
-							tmpTargetNodeId = "";
-							moveType = consts.move.TYPE_INNER;
-							tmpArrow.css({
-								"display":"none"
-							});
-							if (window.zTreeMoveTimer) {
-								clearTimeout(window.zTreeMoveTimer);
-								window.zTreeMoveTargetNodeTId = null
+							var canMove = true;
+							//don't move to self or children of self
+							for (i = 0, l = nodes.length; i < l; i++) {
+								tmpNode = nodes[i];
+								if (targetObj.id === tmpNode.tId) {
+									canMove = false;
+									break;
+								} else if ($$(tmpNode, setting).find("#" + targetObj.id).length > 0) {
+									canMove = false;
+									break;
+								}
+							}
+							if (canMove && event.target && tools.isChildOrSelf(event.target, targetObj.id + consts.id.A)) {
+								tmpTarget = $(targetObj);
+								tmpTargetNodeId = targetObj.id;
 							}
 						}
-						if (!canPrev && !canNext && !canInner) {
-							clearMove();
-						} else {
-							var tmpTargetA = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget),
-								tmpNextA = tmpTargetNode.isLastNode ? null : $("#" + tmpTargetNode.getNextNode().tId + consts.id.A, tmpTarget.next()),
-								tmpTop = tmpTargetA.offset().top,
-								tmpLeft = tmpTargetA.offset().left,
-								prevPercent = canPrev ? (canInner ? 0.25 : (canNext ? 0.5 : 1) ) : -1,
-								nextPercent = canNext ? (canInner ? 0.75 : (canPrev ? 0.5 : 0) ) : -1,
-								dY_percent = (event.clientY + docScrollTop - tmpTop)/tmpTargetA.height();
-
-							if ((prevPercent==1 || dY_percent<=prevPercent && dY_percent>=-.2) && canPrev) {
-								dX = 1 - tmpArrow.width();
-								dY = tmpTop - tmpArrow.height()/2;
-								moveType = consts.move.TYPE_PREV;
-							} else if ((nextPercent==0 || dY_percent>=nextPercent && dY_percent<=1.2) && canNext) {
-								dX = 1 - tmpArrow.width();
-								dY = (tmpNextA == null || (tmpTargetNode.isParent && tmpTargetNode.open)) ? (tmpTop + tmpTargetA.height() - tmpArrow.height()/2) : (tmpNextA.offset().top - tmpArrow.height()/2);
-								moveType = consts.move.TYPE_NEXT;
-							} else if (canInner) {
-								dX = 5 - tmpArrow.width();
-								dY = tmpTop;
-								moveType = consts.move.TYPE_INNER;
-							} else {
-								clearMove();
+
+						//the mouse must be in zTree
+						tmpNode = nodes[0];
+						if (isTreeInner && tools.isChildOrSelf(event.target, targetSetting.treeId)) {
+							//judge mouse move in root of ztree
+							if (!tmpTarget && (event.target.id == targetSetting.treeId || isTreeTop || isTreeBottom || isTreeLeft || isTreeRight) && (isOtherTree || (!isOtherTree && tmpNode.parentTId))) {
+								tmpTarget = targetSetting.treeObj;
 							}
+							//auto scroll top
+							if (isTop) {
+								targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop() - 10);
+							} else if (isBottom) {
+								targetSetting.treeObj.scrollTop(targetSetting.treeObj.scrollTop() + 10);
+							}
+							if (isLeft) {
+								targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft() - 10);
+							} else if (isRight) {
+								targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft() + 10);
+							}
+							//auto scroll left
+							if (tmpTarget && tmpTarget != targetSetting.treeObj && tmpTarget.offset().left < targetSetting.treeObj.offset().left) {
+								targetSetting.treeObj.scrollLeft(targetSetting.treeObj.scrollLeft() + tmpTarget.offset().left - targetSetting.treeObj.offset().left);
+							}
+						}
 
-							if (tmpTarget) {
+						curNode.css({
+							"top": (event.clientY + docScrollTop + 3) + "px",
+							"left": (event.clientX + docScrollLeft + 3) + "px"
+						});
+
+						var dX = 0;
+						var dY = 0;
+						if (tmpTarget && tmpTarget.attr("id") != targetSetting.treeId) {
+							var tmpTargetNode = tmpTargetNodeId == null ? null : data.getNodeCache(targetSetting, tmpTargetNodeId),
+								isCopy = ((event.ctrlKey || event.metaKey) && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy),
+								isPrev = !!(preNode && tmpTargetNodeId === preNode.tId),
+								isNext = !!(nextNode && tmpTargetNodeId === nextNode.tId),
+								isInner = (tmpNode.parentTId && tmpNode.parentTId == tmpTargetNodeId),
+								canPrev = (isCopy || !isNext) && tools.apply(targetSetting.edit.drag.prev, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.prev),
+								canNext = (isCopy || !isPrev) && tools.apply(targetSetting.edit.drag.next, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.next),
+								canInner = (isCopy || !isInner) && !(targetSetting.data.keep.leaf && !tmpTargetNode.isParent) && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, tmpTargetNode], !!targetSetting.edit.drag.inner);
+
+							function clearMove() {
+								tmpTarget = null;
+								tmpTargetNodeId = "";
+								moveType = consts.move.TYPE_INNER;
 								tmpArrow.css({
-									"display":"block",
-									"top": dY + "px",
-									"left": (tmpLeft + dX) + "px"
+									"display": "none"
 								});
-								tmpTargetA.addClass(consts.node.TMPTARGET_NODE + "_" + moveType);
+								if (window.zTreeMoveTimer) {
+									clearTimeout(window.zTreeMoveTimer);
+									window.zTreeMoveTargetNodeTId = null
+								}
+							}
 
-								if (preTmpTargetNodeId != tmpTargetNodeId || preTmpMoveType != moveType) {
-									startTime = (new Date()).getTime();
+							if (!canPrev && !canNext && !canInner) {
+								clearMove();
+							} else {
+								var tmpTargetA = $("#" + tmpTargetNodeId + consts.id.A, tmpTarget),
+									tmpNextA = tmpTargetNode.isLastNode ? null : $("#" + tmpTargetNode.getNextNode().tId + consts.id.A, tmpTarget.next()),
+									tmpTop = tmpTargetA.offset().top,
+									tmpLeft = tmpTargetA.offset().left,
+									prevPercent = canPrev ? (canInner ? 0.25 : (canNext ? 0.5 : 1)) : -1,
+									nextPercent = canNext ? (canInner ? 0.75 : (canPrev ? 0.5 : 0)) : -1,
+									dY_percent = (event.clientY + docScrollTop - tmpTop) / tmpTargetA.height();
+
+								if ((prevPercent == 1 || dY_percent <= prevPercent && dY_percent >= -.2) && canPrev) {
+									dX = 1 - tmpArrow.width();
+									dY = tmpTop - tmpArrow.height() / 2;
+									moveType = consts.move.TYPE_PREV;
+								} else if ((nextPercent == 0 || dY_percent >= nextPercent && dY_percent <= 1.2) && canNext) {
+									dX = 1 - tmpArrow.width();
+									dY = (tmpNextA == null || (tmpTargetNode.isParent && tmpTargetNode.open)) ? (tmpTop + tmpTargetA.height() - tmpArrow.height() / 2) : (tmpNextA.offset().top - tmpArrow.height() / 2);
+									moveType = consts.move.TYPE_NEXT;
+								} else if (canInner) {
+									dX = 5 - tmpArrow.width();
+									dY = tmpTop;
+									moveType = consts.move.TYPE_INNER;
+								} else {
+									clearMove();
 								}
-								if (tmpTargetNode && tmpTargetNode.isParent && moveType == consts.move.TYPE_INNER) {
-									var startTimer = true;
-									if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId !== tmpTargetNode.tId) {
-										clearTimeout(window.zTreeMoveTimer);
-										window.zTreeMoveTargetNodeTId = null;
-									} else if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId === tmpTargetNode.tId) {
-										startTimer = false;
+
+								if (tmpTarget) {
+									tmpArrow.css({
+										"display": "block",
+										"top": dY + "px",
+										"left": (tmpLeft + dX) + "px"
+									});
+									tmpTargetA.addClass(consts.node.TMPTARGET_NODE + "_" + moveType);
+
+									if (preTmpTargetNodeId != tmpTargetNodeId || preTmpMoveType != moveType) {
+										startTime = (new Date()).getTime();
 									}
-									if (startTimer) {
-										window.zTreeMoveTimer = setTimeout(function() {
-											if (moveType != consts.move.TYPE_INNER) return;
-											if (tmpTargetNode && tmpTargetNode.isParent && !tmpTargetNode.open && (new Date()).getTime() - startTime > targetSetting.edit.drag.autoOpenTime
-												&& tools.apply(targetSetting.callback.beforeDragOpen, [targetSetting.treeId, tmpTargetNode], true)) {
-												view.switchNode(targetSetting, tmpTargetNode);
-												if (targetSetting.edit.drag.autoExpandTrigger) {
-													targetSetting.treeObj.trigger(consts.event.EXPAND, [targetSetting.treeId, tmpTargetNode]);
+									if (tmpTargetNode && tmpTargetNode.isParent && moveType == consts.move.TYPE_INNER) {
+										var startTimer = true;
+										if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId !== tmpTargetNode.tId) {
+											clearTimeout(window.zTreeMoveTimer);
+											window.zTreeMoveTargetNodeTId = null;
+										} else if (window.zTreeMoveTimer && window.zTreeMoveTargetNodeTId === tmpTargetNode.tId) {
+											startTimer = false;
+										}
+										if (startTimer) {
+											window.zTreeMoveTimer = setTimeout(function () {
+												if (moveType != consts.move.TYPE_INNER) return;
+												if (tmpTargetNode && tmpTargetNode.isParent && !tmpTargetNode.open && (new Date()).getTime() - startTime > targetSetting.edit.drag.autoOpenTime
+													&& tools.apply(targetSetting.callback.beforeDragOpen, [targetSetting.treeId, tmpTargetNode], true)) {
+													view.switchNode(targetSetting, tmpTargetNode);
+													if (targetSetting.edit.drag.autoExpandTrigger) {
+														targetSetting.treeObj.trigger(consts.event.EXPAND, [targetSetting.treeId, tmpTargetNode]);
+													}
 												}
-											}
-										}, targetSetting.edit.drag.autoOpenTime+50);
-										window.zTreeMoveTargetNodeTId = tmpTargetNode.tId;
+											}, targetSetting.edit.drag.autoOpenTime + 50);
+											window.zTreeMoveTargetNodeTId = tmpTargetNode.tId;
+										}
 									}
 								}
 							}
-						}
-					} else {
-						moveType = consts.move.TYPE_INNER;
-						if (tmpTarget && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, null], !!targetSetting.edit.drag.inner)) {
-							tmpTarget.addClass(consts.node.TMPTARGET_TREE);
 						} else {
-							tmpTarget = null;
-						}
-						tmpArrow.css({
-							"display":"none"
-						});
-						if (window.zTreeMoveTimer) {
-							clearTimeout(window.zTreeMoveTimer);
-							window.zTreeMoveTargetNodeTId = null;
+							moveType = consts.move.TYPE_INNER;
+							if (tmpTarget && tools.apply(targetSetting.edit.drag.inner, [targetSetting.treeId, nodes, null], !!targetSetting.edit.drag.inner)) {
+								tmpTarget.addClass(consts.node.TMPTARGET_TREE);
+							} else {
+								tmpTarget = null;
+							}
+							tmpArrow.css({
+								"display": "none"
+							});
+							if (window.zTreeMoveTimer) {
+								clearTimeout(window.zTreeMoveTimer);
+								window.zTreeMoveTargetNodeTId = null;
+							}
 						}
-					}
-					preTmpTargetNodeId = tmpTargetNodeId;
-					preTmpMoveType = moveType;
+						preTmpTargetNodeId = tmpTargetNodeId;
+						preTmpMoveType = moveType;
 
-					setting.treeObj.trigger(consts.event.DRAGMOVE, [event, setting.treeId, nodes]);
+						setting.treeObj.trigger(consts.event.DRAGMOVE, [event, setting.treeId, nodes]);
+					}
+					return false;
 				}
-				return false;
-			}
 
-			doc.bind("mouseup", _docMouseUp);
-			function _docMouseUp(event) {
-				if (window.zTreeMoveTimer) {
-					clearTimeout(window.zTreeMoveTimer);
-					window.zTreeMoveTargetNodeTId = null;
-				}
-				preTmpTargetNodeId = null;
-				preTmpMoveType = null;
-				doc.unbind("mousemove", _docMouseMove);
-				doc.unbind("mouseup", _docMouseUp);
-				doc.unbind("selectstart", _docSelect);
-				body.css("cursor", "");
-				if (tmpTarget) {
-					tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
-					if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
+				doc.bind("mouseup", _docMouseUp);
+
+				function _docMouseUp(event) {
+					if (window.zTreeMoveTimer) {
+						clearTimeout(window.zTreeMoveTimer);
+						window.zTreeMoveTargetNodeTId = null;
+					}
+					preTmpTargetNodeId = null;
+					preTmpMoveType = null;
+					doc.unbind("mousemove", _docMouseMove);
+					doc.unbind("mouseup", _docMouseUp);
+					doc.unbind("selectstart", _docSelect);
+					body.css("cursor", "");
+					if (tmpTarget) {
+						tmpTarget.removeClass(consts.node.TMPTARGET_TREE);
+						if (tmpTargetNodeId) $("#" + tmpTargetNodeId + consts.id.A, tmpTarget).removeClass(consts.node.TMPTARGET_NODE + "_" + consts.move.TYPE_PREV)
 							.removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_NEXT).removeClass(consts.node.TMPTARGET_NODE + "_" + _consts.move.TYPE_INNER);
-				}
-				tools.showIfameMask(setting, false);
-
-				roots.showHoverDom = true;
-				if (root.dragFlag == 0) return;
-				root.dragFlag = 0;
-
-				var i, l, tmpNode;
-				for (i=0, l=nodes.length; i<l; i++) {
-					tmpNode = nodes[i];
-					if (tmpNode.isParent && root.dragNodeShowBefore[tmpNode.tId] && !tmpNode.open) {
-						view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
-						delete root.dragNodeShowBefore[tmpNode.tId];
 					}
-				}
+					tools.showIfameMask(setting, false);
 
-				if (curNode) curNode.remove();
-				if (tmpArrow) tmpArrow.remove();
+					roots.showHoverDom = true;
+					if (root.dragFlag == 0) return;
+					root.dragFlag = 0;
 
-				var isCopy = ((event.ctrlKey || event.metaKey) && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy);
-				if (!isCopy && tmpTarget && tmpTargetNodeId && nodes[0].parentTId && tmpTargetNodeId==nodes[0].parentTId && moveType == consts.move.TYPE_INNER) {
-					tmpTarget = null;
-				}
-				if (tmpTarget) {
-					var dragTargetNode = tmpTargetNodeId == null ? null: data.getNodeCache(targetSetting, tmpTargetNodeId);
-					if (tools.apply(setting.callback.beforeDrop, [targetSetting.treeId, nodes, dragTargetNode, moveType, isCopy], true) == false) {
-						view.selectNodes(sourceSetting, nodes);
-						return;
+					var i, l, tmpNode;
+					for (i = 0, l = nodes.length; i < l; i++) {
+						tmpNode = nodes[i];
+						if (tmpNode.isParent && root.dragNodeShowBefore[tmpNode.tId] && !tmpNode.open) {
+							view.expandCollapseNode(setting, tmpNode, !tmpNode.open);
+							delete root.dragNodeShowBefore[tmpNode.tId];
+						}
 					}
-					var newNodes = isCopy ? tools.clone(nodes) : nodes;
 
-					function dropCallback() {
-						if (isOtherTree) {
-							if (!isCopy) {
-								for(var i=0, l=nodes.length; i<l; i++) {
-									view.removeNode(setting, nodes[i]);
+					if (curNode) curNode.remove();
+					if (tmpArrow) tmpArrow.remove();
+
+					var isCopy = ((event.ctrlKey || event.metaKey) && setting.edit.drag.isMove && setting.edit.drag.isCopy) || (!setting.edit.drag.isMove && setting.edit.drag.isCopy);
+					if (!isCopy && tmpTarget && tmpTargetNodeId && nodes[0].parentTId && tmpTargetNodeId == nodes[0].parentTId && moveType == consts.move.TYPE_INNER) {
+						tmpTarget = null;
+					}
+					if (tmpTarget) {
+						var dragTargetNode = tmpTargetNodeId == null ? null : data.getNodeCache(targetSetting, tmpTargetNodeId);
+						if (tools.apply(setting.callback.beforeDrop, [targetSetting.treeId, nodes, dragTargetNode, moveType, isCopy], true) == false) {
+							view.selectNodes(sourceSetting, nodes);
+							return;
+						}
+						var newNodes = isCopy ? tools.clone(nodes) : nodes;
+
+						function dropCallback() {
+							if (isOtherTree) {
+								if (!isCopy) {
+									for (var i = 0, l = nodes.length; i < l; i++) {
+										view.removeNode(setting, nodes[i]);
+									}
+								}
+								if (moveType == consts.move.TYPE_INNER) {
+									view.addNodes(targetSetting, dragTargetNode, -1, newNodes);
+								} else {
+									view.addNodes(targetSetting, dragTargetNode.getParentNode(), moveType == consts.move.TYPE_PREV ? dragTargetNode.getIndex() : dragTargetNode.getIndex() + 1, newNodes);
 								}
-							}
-							if (moveType == consts.move.TYPE_INNER) {
-								view.addNodes(targetSetting, dragTargetNode, -1, newNodes);
-							} else {
-								view.addNodes(targetSetting, dragTargetNode.getParentNode(), moveType == consts.move.TYPE_PREV ? dragTargetNode.getIndex() : dragTargetNode.getIndex()+1, newNodes);
-							}
-						} else {
-							if (isCopy && moveType == consts.move.TYPE_INNER) {
-								view.addNodes(targetSetting, dragTargetNode, -1, newNodes);
-							} else if (isCopy) {
-								view.addNodes(targetSetting, dragTargetNode.getParentNode(), moveType == consts.move.TYPE_PREV ? dragTargetNode.getIndex() : dragTargetNode.getIndex()+1, newNodes);
 							} else {
-								if (moveType != consts.move.TYPE_NEXT) {
-									for (i=0, l=newNodes.length; i<l; i++) {
-										view.moveNode(targetSetting, dragTargetNode, newNodes[i], moveType, false);
-									}
+								if (isCopy && moveType == consts.move.TYPE_INNER) {
+									view.addNodes(targetSetting, dragTargetNode, -1, newNodes);
+								} else if (isCopy) {
+									view.addNodes(targetSetting, dragTargetNode.getParentNode(), moveType == consts.move.TYPE_PREV ? dragTargetNode.getIndex() : dragTargetNode.getIndex() + 1, newNodes);
 								} else {
-									for (i=-1, l=newNodes.length-1; i<l; l--) {
-										view.moveNode(targetSetting, dragTargetNode, newNodes[l], moveType, false);
+									if (moveType != consts.move.TYPE_NEXT) {
+										for (i = 0, l = newNodes.length; i < l; i++) {
+											view.moveNode(targetSetting, dragTargetNode, newNodes[i], moveType, false);
+										}
+									} else {
+										for (i = -1, l = newNodes.length - 1; i < l; l--) {
+											view.moveNode(targetSetting, dragTargetNode, newNodes[l], moveType, false);
+										}
 									}
 								}
 							}
-						}
-						view.selectNodes(targetSetting, newNodes);
+							view.selectNodes(targetSetting, newNodes);
 
-						var a = $$(newNodes[0], setting).get(0);
-						view.scrollIntoView(setting, a);
+							var a = $$(newNodes[0], setting).get(0);
+							view.scrollIntoView(setting, a);
 
-						setting.treeObj.trigger(consts.event.DROP, [event, targetSetting.treeId, newNodes, dragTargetNode, moveType, isCopy]);
-					}
+							setting.treeObj.trigger(consts.event.DROP, [event, targetSetting.treeId, newNodes, dragTargetNode, moveType, isCopy]);
+						}
+
+						if (moveType == consts.move.TYPE_INNER && tools.canAsync(targetSetting, dragTargetNode)) {
+							view.asyncNode(targetSetting, dragTargetNode, false, dropCallback);
+						} else {
+							dropCallback();
+						}
 
-					if (moveType == consts.move.TYPE_INNER && tools.canAsync(targetSetting, dragTargetNode)) {
-						view.asyncNode(targetSetting, dragTargetNode, false, dropCallback);
 					} else {
-						dropCallback();
+						view.selectNodes(sourceSetting, nodes);
+						setting.treeObj.trigger(consts.event.DROP, [event, setting.treeId, nodes, null, null, null]);
 					}
-
-				} else {
-					view.selectNodes(sourceSetting, nodes);
-					setting.treeObj.trigger(consts.event.DROP, [event, setting.treeId, nodes, null, null, null]);
 				}
-			}
 
-			doc.bind("selectstart", _docSelect);
-			function _docSelect() {
-				return false;
-			}
+				doc.bind("selectstart", _docSelect);
 
-			//Avoid FireFox's Bug
-			//If zTree Div CSS set 'overflow', so drag node outside of zTree, and event.target is error.
-			if(eventMouseDown.preventDefault) {
-				eventMouseDown.preventDefault();
-			}
-			return true;
-		}
-	},
-	//method of tools for zTree
-	_tools = {
-		getAbs: function (obj) {
-			var oRect = obj.getBoundingClientRect(),
-			scrollTop = document.body.scrollTop+document.documentElement.scrollTop,
-			scrollLeft = document.body.scrollLeft+document.documentElement.scrollLeft;
-			return [oRect.left+scrollLeft,oRect.top+scrollTop];
-		},
-		inputFocus: function(inputObj) {
-			if (inputObj.get(0)) {
-				inputObj.focus();
-				tools.setCursorPosition(inputObj.get(0), inputObj.val().length);
-			}
-		},
-		inputSelect: function(inputObj) {
-			if (inputObj.get(0)) {
-				inputObj.focus();
-				inputObj.select();
+				function _docSelect() {
+					return false;
+				}
+
+				//Avoid FireFox's Bug
+				//If zTree Div CSS set 'overflow', so drag node outside of zTree, and event.target is error.
+				if (eventMouseDown.preventDefault) {
+					eventMouseDown.preventDefault();
+				}
+				return true;
 			}
 		},
-		setCursorPosition: function(obj, pos){
-			if(obj.setSelectionRange) {
-				obj.focus();
-				obj.setSelectionRange(pos,pos);
-			} else if (obj.createTextRange) {
-				var range = obj.createTextRange();
-				range.collapse(true);
-				range.moveEnd('character', pos);
-				range.moveStart('character', pos);
-				range.select();
+		//method of tools for zTree
+		_tools = {
+			getAbs: function (obj) {
+				var oRect = obj.getBoundingClientRect(),
+					scrollTop = document.body.scrollTop + document.documentElement.scrollTop,
+					scrollLeft = document.body.scrollLeft + document.documentElement.scrollLeft;
+				return [oRect.left + scrollLeft, oRect.top + scrollTop];
+			},
+			inputFocus: function (inputObj) {
+				if (inputObj.get(0)) {
+					inputObj.focus();
+					tools.setCursorPosition(inputObj.get(0), inputObj.val().length);
+				}
+			},
+			inputSelect: function (inputObj) {
+				if (inputObj.get(0)) {
+					inputObj.focus();
+					inputObj.select();
+				}
+			},
+			setCursorPosition: function (obj, pos) {
+				if (obj.setSelectionRange) {
+					obj.focus();
+					obj.setSelectionRange(pos, pos);
+				} else if (obj.createTextRange) {
+					var range = obj.createTextRange();
+					range.collapse(true);
+					range.moveEnd('character', pos);
+					range.moveStart('character', pos);
+					range.select();
+				}
+			},
+			showIfameMask: function (setting, showSign) {
+				var root = data.getRoot(setting);
+				//clear full mask
+				while (root.dragMaskList.length > 0) {
+					root.dragMaskList[0].remove();
+					root.dragMaskList.shift();
+				}
+				if (showSign) {
+					//show mask
+					var iframeList = $$("iframe", setting);
+					for (var i = 0, l = iframeList.length; i < l; i++) {
+						var obj = iframeList.get(i),
+							r = tools.getAbs(obj),
+							dragMask = $$("<div id='zTreeMask_" + i + "' class='zTreeMask' style='top:" + r[1] + "px; left:" + r[0] + "px; width:" + obj.offsetWidth + "px; height:" + obj.offsetHeight + "px;'></div>", setting);
+						dragMask.appendTo($$("body", setting));
+						root.dragMaskList.push(dragMask);
+					}
+				}
 			}
 		},
-		showIfameMask: function(setting, showSign) {
-			var root = data.getRoot(setting);
-			//clear full mask
-			while (root.dragMaskList.length > 0) {
-				root.dragMaskList[0].remove();
-				root.dragMaskList.shift();
-			}
-			if (showSign) {
-				//show mask
-				var iframeList = $$("iframe", setting);
-				for (var i = 0, l = iframeList.length; i < l; i++) {
-					var obj = iframeList.get(i),
-					r = tools.getAbs(obj),
-					dragMask = $$("<div id='zTreeMask_" + i + "' class='zTreeMask' style='top:" + r[1] + "px; left:" + r[0] + "px; width:" + obj.offsetWidth + "px; height:" + obj.offsetHeight + "px;'></div>", setting);
-					dragMask.appendTo($$("body", setting));
-					root.dragMaskList.push(dragMask);
+		//method of operate ztree dom
+		_view = {
+			addEditBtn: function (setting, node) {
+				if (node.editNameFlag || $$(node, consts.id.EDIT, setting).length > 0) {
+					return;
 				}
-			}
-		}
-	},
-	//method of operate ztree dom
-	_view = {
-		addEditBtn: function(setting, node) {
-			if (node.editNameFlag || $$(node, consts.id.EDIT, setting).length > 0) {
-				return;
-			}
-			if (!tools.apply(setting.edit.showRenameBtn, [setting.treeId, node], setting.edit.showRenameBtn)) {
-				return;
-			}
-			var aObj = $$(node, consts.id.A, setting),
-			editStr = "<span class='" + consts.className.BUTTON + " edit' id='" + node.tId + consts.id.EDIT + "' title='"+tools.apply(setting.edit.renameTitle, [setting.treeId, node], setting.edit.renameTitle)+"' treeNode"+consts.id.EDIT+" style='display:none;'></span>";
-			aObj.append(editStr);
-
-			$$(node, consts.id.EDIT, setting).bind('click',
-				function() {
-					if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeEditName, [setting.treeId, node], true) == false) return false;
-					view.editNode(setting, node);
-					return false;
+				if (!tools.apply(setting.edit.showRenameBtn, [setting.treeId, node], setting.edit.showRenameBtn)) {
+					return;
 				}
+				var aObj = $$(node, consts.id.A, setting),
+					editStr = "<span class='" + consts.className.BUTTON + " edit' id='" + node.tId + consts.id.EDIT + "' title='" + tools.apply(setting.edit.renameTitle, [setting.treeId, node], setting.edit.renameTitle) + "' treeNode" + consts.id.EDIT + " style='display:none;'></span>";
+				aObj.append(editStr);
+
+				$$(node, consts.id.EDIT, setting).bind('click',
+					function () {
+						if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeEditName, [setting.treeId, node], true) == false) return false;
+						view.editNode(setting, node);
+						return false;
+					}
 				).show();
-		},
-		addRemoveBtn: function(setting, node) {
-			if (node.editNameFlag || $$(node, consts.id.REMOVE, setting).length > 0) {
-				return;
-			}
-			if (!tools.apply(setting.edit.showRemoveBtn, [setting.treeId, node], setting.edit.showRemoveBtn)) {
-				return;
-			}
-			var aObj = $$(node, consts.id.A, setting),
-			removeStr = "<span class='" + consts.className.BUTTON + " remove' id='" + node.tId + consts.id.REMOVE + "' title='"+tools.apply(setting.edit.removeTitle, [setting.treeId, node], setting.edit.removeTitle)+"' treeNode"+consts.id.REMOVE+" style='display:none;'></span>";
-			aObj.append(removeStr);
-
-			$$(node, consts.id.REMOVE, setting).bind('click',
-				function() {
-					if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return false;
-					view.removeNode(setting, node);
-					setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
-					return false;
+			},
+			addRemoveBtn: function (setting, node) {
+				if (node.editNameFlag || $$(node, consts.id.REMOVE, setting).length > 0) {
+					return;
 				}
-				).bind('mousedown',
-				function(eventMouseDown) {
-					return true;
+				if (!tools.apply(setting.edit.showRemoveBtn, [setting.treeId, node], setting.edit.showRemoveBtn)) {
+					return;
 				}
+				var aObj = $$(node, consts.id.A, setting),
+					removeStr = "<span class='" + consts.className.BUTTON + " remove' id='" + node.tId + consts.id.REMOVE + "' title='" + tools.apply(setting.edit.removeTitle, [setting.treeId, node], setting.edit.removeTitle) + "' treeNode" + consts.id.REMOVE + " style='display:none;'></span>";
+				aObj.append(removeStr);
+
+				$$(node, consts.id.REMOVE, setting).bind('click',
+					function () {
+						if (!tools.uCanDo(setting) || tools.apply(setting.callback.beforeRemove, [setting.treeId, node], true) == false) return false;
+						view.removeNode(setting, node);
+						setting.treeObj.trigger(consts.event.REMOVE, [setting.treeId, node]);
+						return false;
+					}
+				).bind('mousedown',
+					function (eventMouseDown) {
+						return true;
+					}
 				).show();
-		},
-		addHoverDom: function(setting, node) {
-			if (data.getRoots().showHoverDom) {
-				node.isHover = true;
-				if (setting.edit.enable) {
-					view.addEditBtn(setting, node);
-					view.addRemoveBtn(setting, node);
+			},
+			addHoverDom: function (setting, node) {
+				if (data.getRoots().showHoverDom) {
+					node.isHover = true;
+					if (setting.edit.enable) {
+						view.addEditBtn(setting, node);
+						view.addRemoveBtn(setting, node);
+					}
+					tools.apply(setting.view.addHoverDom, [setting.treeId, node]);
 				}
-				tools.apply(setting.view.addHoverDom, [setting.treeId, node]);
-			}
-		},
-		cancelCurEditNode: function (setting, forceName, isCancel) {
-			var root = data.getRoot(setting),
-			nameKey = setting.data.key.name,
-			node = root.curEditNode;
-
-			if (node) {
-				var inputObj = root.curEditInput,
-				newName = forceName ? forceName:(isCancel ? node[nameKey]: inputObj.val());
-				if (tools.apply(setting.callback.beforeRename, [setting.treeId, node, newName, isCancel], true) === false) {
-					return false;
+			},
+			cancelCurEditNode: function (setting, forceName, isCancel) {
+				var root = data.getRoot(setting),
+					nameKey = setting.data.key.name,
+					node = root.curEditNode;
+
+				if (node) {
+					var inputObj = root.curEditInput,
+						newName = forceName ? forceName : (isCancel ? node[nameKey] : inputObj.val());
+					if (tools.apply(setting.callback.beforeRename, [setting.treeId, node, newName, isCancel], true) === false) {
+						return false;
+					}
+					node[nameKey] = newName;
+					var aObj = $$(node, consts.id.A, setting);
+					aObj.removeClass(consts.node.CURSELECTED_EDIT);
+					inputObj.unbind();
+					view.setNodeName(setting, node);
+					node.editNameFlag = false;
+					root.curEditNode = null;
+					root.curEditInput = null;
+					view.selectNode(setting, node, false);
+					setting.treeObj.trigger(consts.event.RENAME, [setting.treeId, node, isCancel]);
+				}
+				root.noSelection = true;
+				return true;
+			},
+			editNode: function (setting, node) {
+				var root = data.getRoot(setting);
+				view.editNodeBlur = false;
+				if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
+					setTimeout(function () {
+						tools.inputFocus(root.curEditInput);
+					}, 0);
+					return;
 				}
-                node[nameKey] = newName;
-                var aObj = $$(node, consts.id.A, setting);
-				aObj.removeClass(consts.node.CURSELECTED_EDIT);
-				inputObj.unbind();
-				view.setNodeName(setting, node);
-				node.editNameFlag = false;
-				root.curEditNode = null;
-				root.curEditInput = null;
+				var nameKey = setting.data.key.name;
+				node.editNameFlag = true;
+				view.removeTreeDom(setting, node);
+				view.cancelCurEditNode(setting);
 				view.selectNode(setting, node, false);
-                setting.treeObj.trigger(consts.event.RENAME, [setting.treeId, node, isCancel]);
-			}
-			root.noSelection = true;
-			return true;
-		},
-		editNode: function(setting, node) {
-			var root = data.getRoot(setting);
-			view.editNodeBlur = false;
-			if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
-				setTimeout(function() {tools.inputFocus(root.curEditInput);}, 0);
-				return;
-			}
-			var nameKey = setting.data.key.name;
-			node.editNameFlag = true;
-			view.removeTreeDom(setting, node);
-			view.cancelCurEditNode(setting);
-			view.selectNode(setting, node, false);
-			$$(node, consts.id.SPAN, setting).html("<input type=text class='rename' id='" + node.tId + consts.id.INPUT + "' treeNode" + consts.id.INPUT + " >");
-			var inputObj = $$(node, consts.id.INPUT, setting);
-			inputObj.attr("value", node[nameKey]);
-			if (setting.edit.editNameSelectAll) {
-				tools.inputSelect(inputObj);
-			} else {
-				tools.inputFocus(inputObj);
-			}
-
-			inputObj.bind('blur', function(event) {
-				if (!view.editNodeBlur) {
-					view.cancelCurEditNode(setting);
+				$$(node, consts.id.SPAN, setting).html("<input type=text class='rename' id='" + node.tId + consts.id.INPUT + "' treeNode" + consts.id.INPUT + " >");
+				var inputObj = $$(node, consts.id.INPUT, setting);
+				inputObj.attr("value", node[nameKey]);
+				if (setting.edit.editNameSelectAll) {
+					tools.inputSelect(inputObj);
+				} else {
+					tools.inputFocus(inputObj);
 				}
-			}).bind('keydown', function(event) {
-				if (event.keyCode=="13") {
-					view.editNodeBlur = true;
-					view.cancelCurEditNode(setting);
-				} else if (event.keyCode=="27") {
-					view.cancelCurEditNode(setting, null, true);
+
+				inputObj.bind('blur', function (event) {
+					if (!view.editNodeBlur) {
+						view.cancelCurEditNode(setting);
+					}
+				}).bind('keydown', function (event) {
+					if (event.keyCode == "13") {
+						view.editNodeBlur = true;
+						view.cancelCurEditNode(setting);
+					} else if (event.keyCode == "27") {
+						view.cancelCurEditNode(setting, null, true);
+					}
+				}).bind('click', function (event) {
+					return false;
+				}).bind('dblclick', function (event) {
+					return false;
+				});
+
+				$$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED_EDIT);
+				root.curEditInput = inputObj;
+				root.noSelection = false;
+				root.curEditNode = node;
+			},
+			moveNode: function (setting, targetNode, node, moveType, animateFlag, isSilent) {
+				var root = data.getRoot(setting),
+					childKey = setting.data.key.children;
+				if (targetNode == node) return;
+				if (setting.data.keep.leaf && targetNode && !targetNode.isParent && moveType == consts.move.TYPE_INNER) return;
+				var oldParentNode = (node.parentTId ? node.getParentNode() : root),
+					targetNodeIsRoot = (targetNode === null || targetNode == root);
+				if (targetNodeIsRoot && targetNode === null) targetNode = root;
+				if (targetNodeIsRoot) moveType = consts.move.TYPE_INNER;
+				var targetParentNode = (targetNode.parentTId ? targetNode.getParentNode() : root);
+
+				if (moveType != consts.move.TYPE_PREV && moveType != consts.move.TYPE_NEXT) {
+					moveType = consts.move.TYPE_INNER;
 				}
-			}).bind('click', function(event) {
-				return false;
-			}).bind('dblclick', function(event) {
-				return false;
-			});
 
-			$$(node, consts.id.A, setting).addClass(consts.node.CURSELECTED_EDIT);
-			root.curEditInput = inputObj;
-			root.noSelection = false;
-			root.curEditNode = node;
-		},
-		moveNode: function(setting, targetNode, node, moveType, animateFlag, isSilent) {
-			var root = data.getRoot(setting),
-			childKey = setting.data.key.children;
-			if (targetNode == node) return;
-			if (setting.data.keep.leaf && targetNode && !targetNode.isParent && moveType == consts.move.TYPE_INNER) return;
-			var oldParentNode = (node.parentTId ? node.getParentNode(): root),
-			targetNodeIsRoot = (targetNode === null || targetNode == root);
-			if (targetNodeIsRoot && targetNode === null) targetNode = root;
-			if (targetNodeIsRoot) moveType = consts.move.TYPE_INNER;
-			var targetParentNode = (targetNode.parentTId ? targetNode.getParentNode() : root);
-
-			if (moveType != consts.move.TYPE_PREV && moveType != consts.move.TYPE_NEXT) {
-				moveType = consts.move.TYPE_INNER;
-			}
+				if (moveType == consts.move.TYPE_INNER) {
+					if (targetNodeIsRoot) {
+						//parentTId of root node is null
+						node.parentTId = null;
+					} else {
+						if (!targetNode.isParent) {
+							targetNode.isParent = true;
+							targetNode.open = !!targetNode.open;
+							view.setNodeLineIcos(setting, targetNode);
+						}
+						node.parentTId = targetNode.tId;
+					}
+				}
 
-			if (moveType == consts.move.TYPE_INNER) {
+				//move node Dom
+				var targetObj, target_ulObj;
 				if (targetNodeIsRoot) {
-					//parentTId of root node is null
-					node.parentTId = null;
+					targetObj = setting.treeObj;
+					target_ulObj = targetObj;
 				} else {
-					if (!targetNode.isParent) {
-						targetNode.isParent = true;
-						targetNode.open = !!targetNode.open;
-						view.setNodeLineIcos(setting, targetNode);
+					if (!isSilent && moveType == consts.move.TYPE_INNER) {
+						view.expandCollapseNode(setting, targetNode, true, false);
+					} else if (!isSilent) {
+						view.expandCollapseNode(setting, targetNode.getParentNode(), true, false);
+					}
+					targetObj = $$(targetNode, setting);
+					target_ulObj = $$(targetNode, consts.id.UL, setting);
+					if (!!targetObj.get(0) && !target_ulObj.get(0)) {
+						var ulstr = [];
+						view.makeUlHtml(setting, targetNode, ulstr, '');
+						targetObj.append(ulstr.join(''));
 					}
-					node.parentTId = targetNode.tId;
+					target_ulObj = $$(targetNode, consts.id.UL, setting);
 				}
-			}
-
-			//move node Dom
-			var targetObj, target_ulObj;
-			if (targetNodeIsRoot) {
-				targetObj = setting.treeObj;
-				target_ulObj = targetObj;
-			} else {
-				if (!isSilent && moveType == consts.move.TYPE_INNER) {
-					view.expandCollapseNode(setting, targetNode, true, false);
-				} else if (!isSilent) {
-					view.expandCollapseNode(setting, targetNode.getParentNode(), true, false);
+				var nodeDom = $$(node, setting);
+				if (!nodeDom.get(0)) {
+					nodeDom = view.appendNodes(setting, node.level, [node], null, -1, false, true).join('');
+				} else if (!targetObj.get(0)) {
+					nodeDom.remove();
 				}
-				targetObj = $$(targetNode, setting);
-				target_ulObj = $$(targetNode, consts.id.UL, setting);
-				if (!!targetObj.get(0) && !target_ulObj.get(0)) {
-					var ulstr = [];
-					view.makeUlHtml(setting, targetNode, ulstr, '');
-					targetObj.append(ulstr.join(''));
+				if (target_ulObj.get(0) && moveType == consts.move.TYPE_INNER) {
+					target_ulObj.append(nodeDom);
+				} else if (targetObj.get(0) && moveType == consts.move.TYPE_PREV) {
+					targetObj.before(nodeDom);
+				} else if (targetObj.get(0) && moveType == consts.move.TYPE_NEXT) {
+					targetObj.after(nodeDom);
 				}
-				target_ulObj = $$(targetNode, consts.id.UL, setting);
-			}
-			var nodeDom = $$(node, setting);
-			if (!nodeDom.get(0)) {
-				nodeDom = view.appendNodes(setting, node.level, [node], null, -1, false, true).join('');
-			} else if (!targetObj.get(0)) {
-				nodeDom.remove();
-			}
-			if (target_ulObj.get(0) && moveType == consts.move.TYPE_INNER) {
-				target_ulObj.append(nodeDom);
-			} else if (targetObj.get(0) && moveType == consts.move.TYPE_PREV) {
-				targetObj.before(nodeDom);
-			} else if (targetObj.get(0) && moveType == consts.move.TYPE_NEXT) {
-				targetObj.after(nodeDom);
-			}
 
-			//repair the data after move
-			var i,l,
-			tmpSrcIndex = -1,
-			tmpTargetIndex = 0,
-			oldNeighbor = null,
-			newNeighbor = null,
-			oldLevel = node.level;
-			if (node.isFirstNode) {
-				tmpSrcIndex = 0;
-				if (oldParentNode[childKey].length > 1 ) {
-					oldNeighbor = oldParentNode[childKey][1];
-					oldNeighbor.isFirstNode = true;
-				}
-			} else if (node.isLastNode) {
-				tmpSrcIndex = oldParentNode[childKey].length -1;
-				oldNeighbor = oldParentNode[childKey][tmpSrcIndex - 1];
-				oldNeighbor.isLastNode = true;
-			} else {
-				for (i = 0, l = oldParentNode[childKey].length; i < l; i++) {
-					if (oldParentNode[childKey][i].tId == node.tId) {
-						tmpSrcIndex = i;
-						break;
+				//repair the data after move
+				var i, l,
+					tmpSrcIndex = -1,
+					tmpTargetIndex = 0,
+					oldNeighbor = null,
+					newNeighbor = null,
+					oldLevel = node.level;
+				if (node.isFirstNode) {
+					tmpSrcIndex = 0;
+					if (oldParentNode[childKey].length > 1) {
+						oldNeighbor = oldParentNode[childKey][1];
+						oldNeighbor.isFirstNode = true;
+					}
+				} else if (node.isLastNode) {
+					tmpSrcIndex = oldParentNode[childKey].length - 1;
+					oldNeighbor = oldParentNode[childKey][tmpSrcIndex - 1];
+					oldNeighbor.isLastNode = true;
+				} else {
+					for (i = 0, l = oldParentNode[childKey].length; i < l; i++) {
+						if (oldParentNode[childKey][i].tId == node.tId) {
+							tmpSrcIndex = i;
+							break;
+						}
 					}
 				}
-			}
-			if (tmpSrcIndex >= 0) {
-				oldParentNode[childKey].splice(tmpSrcIndex, 1);
-			}
-			if (moveType != consts.move.TYPE_INNER) {
-				for (i = 0, l = targetParentNode[childKey].length; i < l; i++) {
-					if (targetParentNode[childKey][i].tId == targetNode.tId) tmpTargetIndex = i;
+				if (tmpSrcIndex >= 0) {
+					oldParentNode[childKey].splice(tmpSrcIndex, 1);
 				}
-			}
-			if (moveType == consts.move.TYPE_INNER) {
-				if (!targetNode[childKey]) targetNode[childKey] = new Array();
-				if (targetNode[childKey].length > 0) {
-					newNeighbor = targetNode[childKey][targetNode[childKey].length - 1];
-					newNeighbor.isLastNode = false;
+				if (moveType != consts.move.TYPE_INNER) {
+					for (i = 0, l = targetParentNode[childKey].length; i < l; i++) {
+						if (targetParentNode[childKey][i].tId == targetNode.tId) tmpTargetIndex = i;
+					}
 				}
-				targetNode[childKey].splice(targetNode[childKey].length, 0, node);
-				node.isLastNode = true;
-				node.isFirstNode = (targetNode[childKey].length == 1);
-			} else if (targetNode.isFirstNode && moveType == consts.move.TYPE_PREV) {
-				targetParentNode[childKey].splice(tmpTargetIndex, 0, node);
-				newNeighbor = targetNode;
-				newNeighbor.isFirstNode = false;
-				node.parentTId = targetNode.parentTId;
-				node.isFirstNode = true;
-				node.isLastNode = false;
-
-			} else if (targetNode.isLastNode && moveType == consts.move.TYPE_NEXT) {
-				targetParentNode[childKey].splice(tmpTargetIndex + 1, 0, node);
-				newNeighbor = targetNode;
-				newNeighbor.isLastNode = false;
-				node.parentTId = targetNode.parentTId;
-				node.isFirstNode = false;
-				node.isLastNode = true;
-
-			} else {
-				if (moveType == consts.move.TYPE_PREV) {
+				if (moveType == consts.move.TYPE_INNER) {
+					if (!targetNode[childKey]) targetNode[childKey] = new Array();
+					if (targetNode[childKey].length > 0) {
+						newNeighbor = targetNode[childKey][targetNode[childKey].length - 1];
+						newNeighbor.isLastNode = false;
+					}
+					targetNode[childKey].splice(targetNode[childKey].length, 0, node);
+					node.isLastNode = true;
+					node.isFirstNode = (targetNode[childKey].length == 1);
+				} else if (targetNode.isFirstNode && moveType == consts.move.TYPE_PREV) {
 					targetParentNode[childKey].splice(tmpTargetIndex, 0, node);
-				} else {
+					newNeighbor = targetNode;
+					newNeighbor.isFirstNode = false;
+					node.parentTId = targetNode.parentTId;
+					node.isFirstNode = true;
+					node.isLastNode = false;
+
+				} else if (targetNode.isLastNode && moveType == consts.move.TYPE_NEXT) {
 					targetParentNode[childKey].splice(tmpTargetIndex + 1, 0, node);
+					newNeighbor = targetNode;
+					newNeighbor.isLastNode = false;
+					node.parentTId = targetNode.parentTId;
+					node.isFirstNode = false;
+					node.isLastNode = true;
+
+				} else {
+					if (moveType == consts.move.TYPE_PREV) {
+						targetParentNode[childKey].splice(tmpTargetIndex, 0, node);
+					} else {
+						targetParentNode[childKey].splice(tmpTargetIndex + 1, 0, node);
+					}
+					node.parentTId = targetNode.parentTId;
+					node.isFirstNode = false;
+					node.isLastNode = false;
+				}
+				data.fixPIdKeyValue(setting, node);
+				data.setSonNodeLevel(setting, node.getParentNode(), node);
+
+				//repair node what been moved
+				view.setNodeLineIcos(setting, node);
+				view.repairNodeLevelClass(setting, node, oldLevel)
+
+				//repair node's old parentNode dom
+				if (!setting.data.keep.parent && oldParentNode[childKey].length < 1) {
+					//old parentNode has no child nodes
+					oldParentNode.isParent = false;
+					oldParentNode.open = false;
+					var tmp_ulObj = $$(oldParentNode, consts.id.UL, setting),
+						tmp_switchObj = $$(oldParentNode, consts.id.SWITCH, setting),
+						tmp_icoObj = $$(oldParentNode, consts.id.ICON, setting);
+					view.replaceSwitchClass(oldParentNode, tmp_switchObj, consts.folder.DOCU);
+					view.replaceIcoClass(oldParentNode, tmp_icoObj, consts.folder.DOCU);
+					tmp_ulObj.css("display", "none");
+
+				} else if (oldNeighbor) {
+					//old neigbor node
+					view.setNodeLineIcos(setting, oldNeighbor);
 				}
-				node.parentTId = targetNode.parentTId;
-				node.isFirstNode = false;
-				node.isLastNode = false;
-			}
-			data.fixPIdKeyValue(setting, node);
-			data.setSonNodeLevel(setting, node.getParentNode(), node);
-
-			//repair node what been moved
-			view.setNodeLineIcos(setting, node);
-			view.repairNodeLevelClass(setting, node, oldLevel)
-
-			//repair node's old parentNode dom
-			if (!setting.data.keep.parent && oldParentNode[childKey].length < 1) {
-				//old parentNode has no child nodes
-				oldParentNode.isParent = false;
-				oldParentNode.open = false;
-				var tmp_ulObj = $$(oldParentNode, consts.id.UL, setting),
-				tmp_switchObj = $$(oldParentNode, consts.id.SWITCH, setting),
-				tmp_icoObj = $$(oldParentNode, consts.id.ICON, setting);
-				view.replaceSwitchClass(oldParentNode, tmp_switchObj, consts.folder.DOCU);
-				view.replaceIcoClass(oldParentNode, tmp_icoObj, consts.folder.DOCU);
-				tmp_ulObj.css("display", "none");
-
-			} else if (oldNeighbor) {
-				//old neigbor node
-				view.setNodeLineIcos(setting, oldNeighbor);
-			}
 
-			//new neigbor node
-			if (newNeighbor) {
-				view.setNodeLineIcos(setting, newNeighbor);
-			}
+				//new neigbor node
+				if (newNeighbor) {
+					view.setNodeLineIcos(setting, newNeighbor);
+				}
 
-			//repair checkbox / radio
-			if (!!setting.check && setting.check.enable && view.repairChkClass) {
-				view.repairChkClass(setting, oldParentNode);
-				view.repairParentChkClassWithSelf(setting, oldParentNode);
-				if (oldParentNode != node.parent)
-					view.repairParentChkClassWithSelf(setting, node);
-			}
+				//repair checkbox / radio
+				if (!!setting.check && setting.check.enable && view.repairChkClass) {
+					view.repairChkClass(setting, oldParentNode);
+					view.repairParentChkClassWithSelf(setting, oldParentNode);
+					if (oldParentNode != node.parent)
+						view.repairParentChkClassWithSelf(setting, node);
+				}
 
-			//expand parents after move
-			if (!isSilent) {
-				view.expandCollapseParentNode(setting, node.getParentNode(), true, animateFlag);
+				//expand parents after move
+				if (!isSilent) {
+					view.expandCollapseParentNode(setting, node.getParentNode(), true, animateFlag);
+				}
+			},
+			removeEditBtn: function (setting, node) {
+				$$(node, consts.id.EDIT, setting).unbind().remove();
+			},
+			removeRemoveBtn: function (setting, node) {
+				$$(node, consts.id.REMOVE, setting).unbind().remove();
+			},
+			removeTreeDom: function (setting, node) {
+				node.isHover = false;
+				view.removeEditBtn(setting, node);
+				view.removeRemoveBtn(setting, node);
+				tools.apply(setting.view.removeHoverDom, [setting.treeId, node]);
+			},
+			repairNodeLevelClass: function (setting, node, oldLevel) {
+				if (oldLevel === node.level) return;
+				var liObj = $$(node, setting),
+					aObj = $$(node, consts.id.A, setting),
+					ulObj = $$(node, consts.id.UL, setting),
+					oldClass = consts.className.LEVEL + oldLevel,
+					newClass = consts.className.LEVEL + node.level;
+				liObj.removeClass(oldClass);
+				liObj.addClass(newClass);
+				aObj.removeClass(oldClass);
+				aObj.addClass(newClass);
+				ulObj.removeClass(oldClass);
+				ulObj.addClass(newClass);
+			},
+			selectNodes: function (setting, nodes) {
+				for (var i = 0, l = nodes.length; i < l; i++) {
+					view.selectNode(setting, nodes[i], i > 0);
+				}
 			}
 		},
-		removeEditBtn: function(setting, node) {
-			$$(node, consts.id.EDIT, setting).unbind().remove();
-		},
-		removeRemoveBtn: function(setting, node) {
-			$$(node, consts.id.REMOVE, setting).unbind().remove();
-		},
-		removeTreeDom: function(setting, node) {
-			node.isHover = false;
-			view.removeEditBtn(setting, node);
-			view.removeRemoveBtn(setting, node);
-			tools.apply(setting.view.removeHoverDom, [setting.treeId, node]);
-		},
-		repairNodeLevelClass: function(setting, node, oldLevel) {
-			if (oldLevel === node.level) return;
-			var liObj = $$(node, setting),
-			aObj = $$(node, consts.id.A, setting),
-			ulObj = $$(node, consts.id.UL, setting),
-			oldClass = consts.className.LEVEL + oldLevel,
-			newClass = consts.className.LEVEL + node.level;
-			liObj.removeClass(oldClass);
-			liObj.addClass(newClass);
-			aObj.removeClass(oldClass);
-			aObj.addClass(newClass);
-			ulObj.removeClass(oldClass);
-			ulObj.addClass(newClass);
-		},
-		selectNodes : function(setting, nodes) {
-			for (var i=0, l=nodes.length; i<l; i++) {
-				view.selectNode(setting, nodes[i], i>0);
-			}
-		}
-	},
-
-	_z = {
-		tools: _tools,
-		view: _view,
-		event: _event,
-		data: _data
-	};
+
+		_z = {
+			tools: _tools,
+			view: _view,
+			event: _event,
+			data: _data
+		};
 	$.extend(true, $.fn.zTree.consts, _consts);
 	$.extend(true, $.fn.zTree._z, _z);
 
 	var zt = $.fn.zTree,
-	tools = zt._z.tools,
-	consts = zt.consts,
-	view = zt._z.view,
-	data = zt._z.data,
-	event = zt._z.event,
-	$$ = tools.$;
+		tools = zt._z.tools,
+		consts = zt.consts,
+		view = zt._z.view,
+		data = zt._z.data,
+		event = zt._z.event,
+		$$ = tools.$;
 
 	data.exSetting(_setting);
 	data.addInitBind(_bindEvent);
@@ -1132,7 +1139,7 @@
 	var _cancelPreSelectedNode = view.cancelPreSelectedNode;
 	view.cancelPreSelectedNode = function (setting, node) {
 		var list = data.getRoot(setting).curSelectedList;
-		for (var i=0, j=list.length; i<j; i++) {
+		for (var i = 0, j = list.length; i < j; i++) {
 			if (!node || node === list[i]) {
 				view.removeTreeDom(setting, list[i]);
 				if (node) break;
@@ -1142,7 +1149,7 @@
 	}
 
 	var _createNodes = view.createNodes;
-	view.createNodes = function(setting, level, nodes, parentNode, index) {
+	view.createNodes = function (setting, level, nodes, parentNode, index) {
 		if (_createNodes) {
 			_createNodes.apply(view, arguments);
 		}
@@ -1153,12 +1160,12 @@
 	}
 
 	var _makeNodeUrl = view.makeNodeUrl;
-	view.makeNodeUrl = function(setting, node) {
+	view.makeNodeUrl = function (setting, node) {
 		return setting.edit.enable ? null : (_makeNodeUrl.apply(view, arguments));
 	}
 
 	var _removeNode = view.removeNode;
-	view.removeNode = function(setting, node) {
+	view.removeNode = function (setting, node) {
 		var root = data.getRoot(setting);
 		if (root.curEditNode === node) root.curEditNode = null;
 		if (_removeNode) {
@@ -1167,7 +1174,7 @@
 	}
 
 	var _selectNode = view.selectNode;
-	view.selectNode = function(setting, node, addFlag) {
+	view.selectNode = function (setting, node, addFlag) {
 		var root = data.getRoot(setting);
 		if (data.isSelectedNode(setting, node) && root.curEditNode == node && node.editNameFlag) {
 			return false;
@@ -1178,7 +1185,7 @@
 	}
 
 	var _uCanDo = tools.uCanDo;
-	tools.uCanDo = function(setting, e) {
+	tools.uCanDo = function (setting, e) {
 		var root = data.getRoot(setting);
 		if (e && (tools.eqs(e.type, "mouseover") || tools.eqs(e.type, "mouseout") || tools.eqs(e.type, "mousedown") || tools.eqs(e.type, "mouseup"))) {
 			return true;
@@ -1189,4 +1196,4 @@
 		}
 		return (!root.curEditNode) && (_uCanDo ? _uCanDo.apply(view, arguments) : true);
 	}
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.exhide.js b/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.exhide.js
index 6dddbb3..a8dcad3 100644
--- a/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.exhide.js
+++ b/len-sys/src/main/resources/plugin/ztree/js/jquery.ztree.exhide.js
@@ -10,271 +10,272 @@
  * email: hunter.z@263.net
  * Date: 2017-11-11
  */
-(function($){
+(function ($) {
 	//default init node of exLib
-	var _initNode = function(setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
-		if (typeof n.isHidden == "string") n.isHidden = tools.eqs(n.isHidden, "true");
-		n.isHidden = !!n.isHidden;
-		data.initHideForExCheck(setting, n);
-	},
-	//add dom for check
-	_beforeA = function(setting, node, html) {},
-	//update zTreeObj, add method of exLib
-	_zTreeTools = function(setting, zTreeTools) {
-		zTreeTools.showNodes = function(nodes, options) {
-			view.showNodes(setting, nodes, options);
-		}
-		zTreeTools.showNode = function(node, options) {
-			if (!node) {
-				return;
+	var _initNode = function (setting, level, n, parentNode, isFirstNode, isLastNode, openFlag) {
+			if (typeof n.isHidden == "string") n.isHidden = tools.eqs(n.isHidden, "true");
+			n.isHidden = !!n.isHidden;
+			data.initHideForExCheck(setting, n);
+		},
+		//add dom for check
+		_beforeA = function (setting, node, html) {
+		},
+		//update zTreeObj, add method of exLib
+		_zTreeTools = function (setting, zTreeTools) {
+			zTreeTools.showNodes = function (nodes, options) {
+				view.showNodes(setting, nodes, options);
 			}
-			view.showNodes(setting, [node], options);
-		}
-		zTreeTools.hideNodes = function(nodes, options) {
-			view.hideNodes(setting, nodes, options);
-		}
-		zTreeTools.hideNode = function(node, options) {
-			if (!node) {
-				return;
+			zTreeTools.showNode = function (node, options) {
+				if (!node) {
+					return;
+				}
+				view.showNodes(setting, [node], options);
 			}
-			view.hideNodes(setting, [node], options);
-		}
-
-		var _checkNode = zTreeTools.checkNode;
-		if (_checkNode) {
-			zTreeTools.checkNode = function(node, checked, checkTypeFlag, callbackFlag) {
-				if (!!node && !!node.isHidden) {
+			zTreeTools.hideNodes = function (nodes, options) {
+				view.hideNodes(setting, nodes, options);
+			}
+			zTreeTools.hideNode = function (node, options) {
+				if (!node) {
 					return;
 				}
-				_checkNode.apply(zTreeTools, arguments);
+				view.hideNodes(setting, [node], options);
 			}
-		}
-	},
-	//method of operate data
-	_data = {
-		initHideForExCheck: function(setting, n) {
-			if (n.isHidden && setting.check && setting.check.enable) {
-				if(typeof n._nocheck == "undefined") {
-					n._nocheck = !!n.nocheck
-					n.nocheck = true;
+
+			var _checkNode = zTreeTools.checkNode;
+			if (_checkNode) {
+				zTreeTools.checkNode = function (node, checked, checkTypeFlag, callbackFlag) {
+					if (!!node && !!node.isHidden) {
+						return;
+					}
+					_checkNode.apply(zTreeTools, arguments);
 				}
-				n.check_Child_State = -1;
-				if (view.repairParentChkClassWithSelf) {
-					view.repairParentChkClassWithSelf(setting, n);
+			}
+		},
+		//method of operate data
+		_data = {
+			initHideForExCheck: function (setting, n) {
+				if (n.isHidden && setting.check && setting.check.enable) {
+					if (typeof n._nocheck == "undefined") {
+						n._nocheck = !!n.nocheck
+						n.nocheck = true;
+					}
+					n.check_Child_State = -1;
+					if (view.repairParentChkClassWithSelf) {
+						view.repairParentChkClassWithSelf(setting, n);
+					}
+				}
+			},
+			initShowForExCheck: function (setting, n) {
+				if (!n.isHidden && setting.check && setting.check.enable) {
+					if (typeof n._nocheck != "undefined") {
+						n.nocheck = n._nocheck;
+						delete n._nocheck;
+					}
+					if (view.setChkClass) {
+						var checkObj = $$(n, consts.id.CHECK, setting);
+						view.setChkClass(setting, checkObj, n);
+					}
+					if (view.repairParentChkClassWithSelf) {
+						view.repairParentChkClassWithSelf(setting, n);
+					}
 				}
 			}
 		},
-		initShowForExCheck: function(setting, n) {
-			if (!n.isHidden && setting.check && setting.check.enable) {
-				if(typeof n._nocheck != "undefined") {
-					n.nocheck = n._nocheck;
-					delete n._nocheck;
+		//method of operate ztree dom
+		_view = {
+			clearOldFirstNode: function (setting, node) {
+				var n = node.getNextNode();
+				while (!!n) {
+					if (n.isFirstNode) {
+						n.isFirstNode = false;
+						view.setNodeLineIcos(setting, n);
+						break;
+					}
+					if (n.isLastNode) {
+						break;
+					}
+					n = n.getNextNode();
 				}
-				if (view.setChkClass) {
-					var checkObj = $$(n, consts.id.CHECK, setting);
-					view.setChkClass(setting, checkObj, n);
+			},
+			clearOldLastNode: function (setting, node, openFlag) {
+				var n = node.getPreNode();
+				while (!!n) {
+					if (n.isLastNode) {
+						n.isLastNode = false;
+						if (openFlag) {
+							view.setNodeLineIcos(setting, n);
+						}
+						break;
+					}
+					if (n.isFirstNode) {
+						break;
+					}
+					n = n.getPreNode();
 				}
-				if (view.repairParentChkClassWithSelf) {
-					view.repairParentChkClassWithSelf(setting, n);
+			},
+			makeDOMNodeMainBefore: function (html, setting, node) {
+				html.push("<li ", (node.isHidden ? "style='display:none;' " : ""), "id='", node.tId, "' class='", consts.className.LEVEL, node.level, "' tabindex='0' hidefocus='true' treenode>");
+			},
+			showNode: function (setting, node, options) {
+				node.isHidden = false;
+				data.initShowForExCheck(setting, node);
+				$$(node, setting).show();
+			},
+			showNodes: function (setting, nodes, options) {
+				if (!nodes || nodes.length == 0) {
+					return;
 				}
-			}
-		}
-	},
-	//method of operate ztree dom
-	_view = {
-		clearOldFirstNode: function(setting, node) {
-			var n = node.getNextNode();
-			while(!!n){
-				if (n.isFirstNode) {
-					n.isFirstNode = false;
-					view.setNodeLineIcos(setting, n);
-					break;
+				var pList = {}, i, j;
+				for (i = 0, j = nodes.length; i < j; i++) {
+					var n = nodes[i];
+					if (!pList[n.parentTId]) {
+						var pn = n.getParentNode();
+						pList[n.parentTId] = (pn === null) ? data.getRoot(setting) : n.getParentNode();
+					}
+					view.showNode(setting, n, options);
 				}
-				if (n.isLastNode) {
-					break;
+				for (var tId in pList) {
+					var children = pList[tId][setting.data.key.children];
+					view.setFirstNodeForShow(setting, children);
+					view.setLastNodeForShow(setting, children);
 				}
-				n = n.getNextNode();
-			}
-		},
-        clearOldLastNode: function(setting, node, openFlag) {
-            var n = node.getPreNode();
-            while(!!n){
-                if (n.isLastNode) {
-                    n.isLastNode = false;
-                    if (openFlag) {
-                        view.setNodeLineIcos(setting, n);
-                    }
-                    break;
-                }
-                if (n.isFirstNode) {
-                    break;
-                }
-                n = n.getPreNode();
-            }
-        },
-		makeDOMNodeMainBefore: function(html, setting, node) {
-			html.push("<li ", (node.isHidden ? "style='display:none;' " : ""), "id='", node.tId, "' class='", consts.className.LEVEL, node.level,"' tabindex='0' hidefocus='true' treenode>");
-		},
-		showNode: function(setting, node, options) {
-			node.isHidden = false;
-			data.initShowForExCheck(setting, node);
-			$$(node, setting).show();
-		},
-		showNodes: function(setting, nodes, options) {
-			if (!nodes || nodes.length == 0) {
-				return;
-			}
-			var pList = {}, i, j;
-			for (i=0, j=nodes.length; i<j; i++) {
-				var n = nodes[i];
-				if (!pList[n.parentTId]) {
-					var pn = n.getParentNode();
-					pList[n.parentTId] = (pn === null) ? data.getRoot(setting) : n.getParentNode();
+			},
+			hideNode: function (setting, node, options) {
+				node.isHidden = true;
+				node.isFirstNode = false;
+				node.isLastNode = false;
+				data.initHideForExCheck(setting, node);
+				view.cancelPreSelectedNode(setting, node);
+				$$(node, setting).hide();
+			},
+			hideNodes: function (setting, nodes, options) {
+				if (!nodes || nodes.length == 0) {
+					return;
 				}
-				view.showNode(setting, n, options);
-			}
-			for (var tId in pList) {
-				var children = pList[tId][setting.data.key.children];
-				view.setFirstNodeForShow(setting, children);
-				view.setLastNodeForShow(setting, children);
-			}
-		},
-		hideNode: function(setting, node, options) {
-			node.isHidden = true;
-			node.isFirstNode = false;
-			node.isLastNode = false;
-			data.initHideForExCheck(setting, node);
-			view.cancelPreSelectedNode(setting, node);
-			$$(node, setting).hide();
-		},
-		hideNodes: function(setting, nodes, options) {
-			if (!nodes || nodes.length == 0) {
-				return;
-			}
-			var pList = {}, i, j;
-			for (i=0, j=nodes.length; i<j; i++) {
-				var n = nodes[i];
-				if ((n.isFirstNode || n.isLastNode) && !pList[n.parentTId]) {
-					var pn = n.getParentNode();
-					pList[n.parentTId] = (pn === null) ? data.getRoot(setting) : n.getParentNode();
+				var pList = {}, i, j;
+				for (i = 0, j = nodes.length; i < j; i++) {
+					var n = nodes[i];
+					if ((n.isFirstNode || n.isLastNode) && !pList[n.parentTId]) {
+						var pn = n.getParentNode();
+						pList[n.parentTId] = (pn === null) ? data.getRoot(setting) : n.getParentNode();
+					}
+					view.hideNode(setting, n, options);
 				}
-				view.hideNode(setting, n, options);
-			}
-			for (var tId in pList) {
-				var children = pList[tId][setting.data.key.children];
-				view.setFirstNodeForHide(setting, children);
-				view.setLastNodeForHide(setting, children);
-			}
-		},
-		setFirstNode: function(setting, parentNode) {
-			var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
-			if (childLength > 0 && !parentNode[childKey][0].isHidden) {
-				parentNode[childKey][0].isFirstNode = true;
-			} else if (childLength > 0) {
-				view.setFirstNodeForHide(setting, parentNode[childKey]);
-			}
-		},
-		setLastNode: function(setting, parentNode) {
-			var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
-			if (childLength > 0 && !parentNode[childKey][0].isHidden) {
-				parentNode[childKey][childLength - 1].isLastNode = true;
-			} else if (childLength > 0) {
-				view.setLastNodeForHide(setting, parentNode[childKey]);
-			}
-		},
-		setFirstNodeForHide: function(setting, nodes) {
-			var n,i,j;
-			for (i=0, j=nodes.length; i<j; i++) {
-				n = nodes[i];
-				if (n.isFirstNode) {
-					break;
+				for (var tId in pList) {
+					var children = pList[tId][setting.data.key.children];
+					view.setFirstNodeForHide(setting, children);
+					view.setLastNodeForHide(setting, children);
 				}
-				if (!n.isHidden && !n.isFirstNode) {
-					n.isFirstNode = true;
-					view.setNodeLineIcos(setting, n);
-					break;
-				} else {
-					n = null;
+			},
+			setFirstNode: function (setting, parentNode) {
+				var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
+				if (childLength > 0 && !parentNode[childKey][0].isHidden) {
+					parentNode[childKey][0].isFirstNode = true;
+				} else if (childLength > 0) {
+					view.setFirstNodeForHide(setting, parentNode[childKey]);
 				}
-			}
-			return n;
-		},
-		setFirstNodeForShow: function(setting, nodes) {
-			var n,i,j, first, old;
-			for(i=0, j=nodes.length; i<j; i++) {
-				n = nodes[i];
-				if (!first && !n.isHidden && n.isFirstNode) {
-					first = n;
-					break;
-				} else if (!first && !n.isHidden && !n.isFirstNode) {
-					n.isFirstNode = true;
-					first = n;
-					view.setNodeLineIcos(setting, n);
-				} else if (first && n.isFirstNode) {
-					n.isFirstNode = false;
-					old = n;
-					view.setNodeLineIcos(setting, n);
-					break;
-				} else {
-					n = null;
+			},
+			setLastNode: function (setting, parentNode) {
+				var childKey = setting.data.key.children, childLength = parentNode[childKey].length;
+				if (childLength > 0 && !parentNode[childKey][0].isHidden) {
+					parentNode[childKey][childLength - 1].isLastNode = true;
+				} else if (childLength > 0) {
+					view.setLastNodeForHide(setting, parentNode[childKey]);
 				}
-			}
-			return {"new":first, "old":old};
-		},
-		setLastNodeForHide: function(setting, nodes) {
-			var n,i;
-			for (i=nodes.length-1; i>=0; i--) {
-				n = nodes[i];
-				if (n.isLastNode) {
-					break;
+			},
+			setFirstNodeForHide: function (setting, nodes) {
+				var n, i, j;
+				for (i = 0, j = nodes.length; i < j; i++) {
+					n = nodes[i];
+					if (n.isFirstNode) {
+						break;
+					}
+					if (!n.isHidden && !n.isFirstNode) {
+						n.isFirstNode = true;
+						view.setNodeLineIcos(setting, n);
+						break;
+					} else {
+						n = null;
+					}
 				}
-				if (!n.isHidden && !n.isLastNode) {
-					n.isLastNode = true;
-					view.setNodeLineIcos(setting, n);
-					break;
-				} else {
-					n = null;
+				return n;
+			},
+			setFirstNodeForShow: function (setting, nodes) {
+				var n, i, j, first, old;
+				for (i = 0, j = nodes.length; i < j; i++) {
+					n = nodes[i];
+					if (!first && !n.isHidden && n.isFirstNode) {
+						first = n;
+						break;
+					} else if (!first && !n.isHidden && !n.isFirstNode) {
+						n.isFirstNode = true;
+						first = n;
+						view.setNodeLineIcos(setting, n);
+					} else if (first && n.isFirstNode) {
+						n.isFirstNode = false;
+						old = n;
+						view.setNodeLineIcos(setting, n);
+						break;
+					} else {
+						n = null;
+					}
 				}
-			}
-			return n;
-		},
-		setLastNodeForShow: function(setting, nodes) {
-			var n,i,j, last, old;
-			for (i=nodes.length-1; i>=0; i--) {
-				n = nodes[i];
-				if (!last && !n.isHidden && n.isLastNode) {
-					last = n;
-					break;
-				} else if (!last && !n.isHidden && !n.isLastNode) {
-					n.isLastNode = true;
-					last = n;
-					view.setNodeLineIcos(setting, n);
-				} else if (last && n.isLastNode) {
-					n.isLastNode = false;
-					old = n;
-					view.setNodeLineIcos(setting, n);
-					break;
-				} else {
-					n = null;
+				return {"new": first, "old": old};
+			},
+			setLastNodeForHide: function (setting, nodes) {
+				var n, i;
+				for (i = nodes.length - 1; i >= 0; i--) {
+					n = nodes[i];
+					if (n.isLastNode) {
+						break;
+					}
+					if (!n.isHidden && !n.isLastNode) {
+						n.isLastNode = true;
+						view.setNodeLineIcos(setting, n);
+						break;
+					} else {
+						n = null;
+					}
+				}
+				return n;
+			},
+			setLastNodeForShow: function (setting, nodes) {
+				var n, i, j, last, old;
+				for (i = nodes.length - 1; i >= 0; i--) {
+					n = nodes[i];
+					if (!last && !n.isHidden && n.isLastNode) {
+						last = n;
+						break;
+					} else if (!last && !n.isHidden && !n.isLastNode) {
+						n.isLastNode = true;
+						last = n;
+						view.setNodeLineIcos(setting, n);
+					} else if (last && n.isLastNode) {
+						n.isLastNode = false;
+						old = n;
+						view.setNodeLineIcos(setting, n);
+						break;
+					} else {
+						n = null;
+					}
 				}
+				return {"new": last, "old": old};
 			}
-			return {"new":last, "old":old};
-		}
-	},
+		},
 
-	_z = {
-		view: _view,
-		data: _data
-	};
+		_z = {
+			view: _view,
+			data: _data
+		};
 	$.extend(true, $.fn.zTree._z, _z);
 
 	var zt = $.fn.zTree,
-	tools = zt._z.tools,
-	consts = zt.consts,
-	view = zt._z.view,
-	data = zt._z.data,
-	event = zt._z.event,
-	$$ = tools.$;
+		tools = zt._z.tools,
+		consts = zt.consts,
+		view = zt._z.view,
+		data = zt._z.data,
+		event = zt._z.event,
+		$$ = tools.$;
 
 	data.addInitNode(_initNode);
 	data.addBeforeA(_beforeA);
@@ -282,26 +283,26 @@
 
 //	Override method in core
 	var _dInitNode = data.initNode;
-    data.initNode = function(setting, level, node, parentNode, isFirstNode, isLastNode, openFlag) {
-        var tmpPNode = (parentNode) ? parentNode: data.getRoot(setting),
-            children = tmpPNode[setting.data.key.children];
-        data.tmpHideFirstNode = view.setFirstNodeForHide(setting, children);
-        data.tmpHideLastNode = view.setLastNodeForHide(setting, children);
-        if (openFlag) {
-            view.setNodeLineIcos(setting, data.tmpHideFirstNode);
-            view.setNodeLineIcos(setting, data.tmpHideLastNode);
-        }
-        isFirstNode = (data.tmpHideFirstNode === node);
-        isLastNode = (data.tmpHideLastNode === node);
-        if (_dInitNode) _dInitNode.apply(data, arguments);
-        if (openFlag && isLastNode) {
-            view.clearOldLastNode(setting, node, openFlag);
-        }
-    };
+	data.initNode = function (setting, level, node, parentNode, isFirstNode, isLastNode, openFlag) {
+		var tmpPNode = (parentNode) ? parentNode : data.getRoot(setting),
+			children = tmpPNode[setting.data.key.children];
+		data.tmpHideFirstNode = view.setFirstNodeForHide(setting, children);
+		data.tmpHideLastNode = view.setLastNodeForHide(setting, children);
+		if (openFlag) {
+			view.setNodeLineIcos(setting, data.tmpHideFirstNode);
+			view.setNodeLineIcos(setting, data.tmpHideLastNode);
+		}
+		isFirstNode = (data.tmpHideFirstNode === node);
+		isLastNode = (data.tmpHideLastNode === node);
+		if (_dInitNode) _dInitNode.apply(data, arguments);
+		if (openFlag && isLastNode) {
+			view.clearOldLastNode(setting, node, openFlag);
+		}
+	};
 
 	var _makeChkFlag = data.makeChkFlag;
 	if (!!_makeChkFlag) {
-		data.makeChkFlag = function(setting, node) {
+		data.makeChkFlag = function (setting, node) {
 			if (!!node && !!node.isHidden) {
 				return;
 			}
@@ -311,7 +312,7 @@
 
 	var _getTreeCheckedNodes = data.getTreeCheckedNodes;
 	if (!!_getTreeCheckedNodes) {
-		data.getTreeCheckedNodes = function(setting, nodes, checked, results) {
+		data.getTreeCheckedNodes = function (setting, nodes, checked, results) {
 			if (!!nodes && nodes.length > 0) {
 				var p = nodes[0].getParentNode();
 				if (!!p && !!p.isHidden) {
@@ -324,7 +325,7 @@
 
 	var _getTreeChangeCheckedNodes = data.getTreeChangeCheckedNodes;
 	if (!!_getTreeChangeCheckedNodes) {
-		data.getTreeChangeCheckedNodes = function(setting, nodes, results) {
+		data.getTreeChangeCheckedNodes = function (setting, nodes, results) {
 			if (!!nodes && nodes.length > 0) {
 				var p = nodes[0].getParentNode();
 				if (!!p && !!p.isHidden) {
@@ -337,7 +338,7 @@
 
 	var _expandCollapseSonNode = view.expandCollapseSonNode;
 	if (!!_expandCollapseSonNode) {
-		view.expandCollapseSonNode = function(setting, node, expandFlag, animateFlag, callback) {
+		view.expandCollapseSonNode = function (setting, node, expandFlag, animateFlag, callback) {
 			if (!!node && !!node.isHidden) {
 				return;
 			}
@@ -347,7 +348,7 @@
 
 	var _setSonNodeCheckBox = view.setSonNodeCheckBox;
 	if (!!_setSonNodeCheckBox) {
-		view.setSonNodeCheckBox = function(setting, node, value, srcNode) {
+		view.setSonNodeCheckBox = function (setting, node, value, srcNode) {
 			if (!!node && !!node.isHidden) {
 				return;
 			}
@@ -357,11 +358,11 @@
 
 	var _repairParentChkClassWithSelf = view.repairParentChkClassWithSelf;
 	if (!!_repairParentChkClassWithSelf) {
-		view.repairParentChkClassWithSelf = function(setting, node) {
+		view.repairParentChkClassWithSelf = function (setting, node) {
 			if (!!node && !!node.isHidden) {
 				return;
 			}
 			_repairParentChkClassWithSelf.apply(view, arguments);
 		}
 	}
-})(jQuery);
\ No newline at end of file
+})(jQuery);
diff --git a/len-sys/src/test/java/com/len/AppTest.java b/len-sys/src/test/java/com/len/AppTest.java
index bfff2c5..2d2effe 100644
--- a/len-sys/src/test/java/com/len/AppTest.java
+++ b/len-sys/src/test/java/com/len/AppTest.java
@@ -7,32 +7,28 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
+public class AppTest
+	extends TestCase {
+	/**
+	 * Create the test case
+	 *
+	 * @param testName name of the test case
+	 */
+	public AppTest(String testName) {
+		super(testName);
+	}
 
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
+	/**
+	 * @return the suite of tests being tested
+	 */
+	public static Test suite() {
+		return new TestSuite(AppTest.class);
+	}
 
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
+	/**
+	 * Rigourous Test :-)
+	 */
+	public void testApp() {
+		assertTrue(true);
+	}
 }
diff --git a/len-web/pom.xml b/len-web/pom.xml
index f1802c5..efd78c2 100644
--- a/len-web/pom.xml
+++ b/len-web/pom.xml
@@ -1,76 +1,76 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <artifactId>lenosp</artifactId>
-    <groupId>com.len</groupId>
-    <version>lenosp-2.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>len-web</artifactId>
-  <name>len-web</name>
-  <url>http://maven.apache.org</url>
-  <packaging>jar</packaging>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<artifactId>lenosp</artifactId>
+		<groupId>com.len</groupId>
+		<version>lenosp-2.0-SNAPSHOT</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>len-web</artifactId>
+	<name>len-web</name>
+	<url>http://maven.apache.org</url>
+	<packaging>jar</packaging>
 
 
-  <dependencies>
+	<dependencies>
 
-    <!--生成代码插件-->
-    <dependency>
-      <groupId>org.mybatis.generator</groupId>
-      <artifactId>mybatis-generator-core</artifactId>
-      <version>1.3.5</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-    </dependency>
+		<!--生成代码插件-->
+		<dependency>
+			<groupId>org.mybatis.generator</groupId>
+			<artifactId>mybatis-generator-core</artifactId>
+			<version>1.3.5</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
 
-    <dependency>
-      <groupId>com.len</groupId>
-      <artifactId>len-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.len</groupId>
-      <artifactId>len-sys</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.len</groupId>
-      <artifactId>len-activiti</artifactId>
-    </dependency>
+		<dependency>
+			<groupId>com.len</groupId>
+			<artifactId>len-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.len</groupId>
+			<artifactId>len-sys</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.len</groupId>
+			<artifactId>len-activiti</artifactId>
+		</dependency>
 
-    <dependency>
-      <groupId>com.len</groupId>
-      <artifactId>len-blog</artifactId>
-      <version>lenosp-2.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <finalName>len-web</finalName>
+		<dependency>
+			<groupId>com.len</groupId>
+			<artifactId>len-blog</artifactId>
+			<version>lenosp-2.0-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<finalName>len-web</finalName>
 
-      <plugins>
-        <plugin>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-maven-plugin</artifactId>
-          <configuration>
-            <fork>true</fork>
-            <mainClass>com.len.LenApplication</mainClass>
-            <layout>ZIP</layout>
-          </configuration>
-          <executions>
-            <execution>
-              <goals>
-                <goal>repackage</goal>
-              </goals>
-            </execution>
-          </executions>
-  </plugin>
-        <!--<plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>2.6</version>
-        </plugin>-->
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<fork>true</fork>
+					<mainClass>com.len.LenApplication</mainClass>
+					<layout>ZIP</layout>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>repackage</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<!--<plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-war-plugin</artifactId>
+			<version>2.6</version>
+			</plugin>-->
 
-      </plugins>
-  </build>
+		</plugins>
+	</build>
 </project>
diff --git a/len-web/src/main/java/com/len/LenApplication.java b/len-web/src/main/java/com/len/LenApplication.java
index 5a04b1f..1110630 100644
--- a/len-web/src/main/java/com/len/LenApplication.java
+++ b/len-web/src/main/java/com/len/LenApplication.java
@@ -16,16 +16,16 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 @ComponentScan({"com.len", "org.activiti"})
 @MapperScan(basePackages = {"com.len.mapper"})
 @EnableAutoConfiguration(exclude = {
-        RedisAutoConfiguration.class,
-        org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class,
-        org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration.class
+	RedisAutoConfiguration.class,
+	org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class,
+	org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration.class
 })
 public class LenApplication {
 
-    public static void main(String[] args) {
-        SpringApplication.run(LenApplication.class, args);
-        System.out.println("Server start succ");
-    }
+	public static void main(String[] args) {
+		SpringApplication.run(LenApplication.class, args);
+		System.out.println("Server start succ");
+	}
 
 
 }
diff --git a/len-web/src/main/java/com/len/config/BeanFactoryImpl.java b/len-web/src/main/java/com/len/config/BeanFactoryImpl.java
index ef65131..d778905 100644
--- a/len-web/src/main/java/com/len/config/BeanFactoryImpl.java
+++ b/len-web/src/main/java/com/len/config/BeanFactoryImpl.java
@@ -3,17 +3,15 @@ package com.len.config;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.ResolvableType;
 
 
 @Configuration
 public class BeanFactoryImpl implements BeanFactoryAware {
 
 
-  @Override
-  public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
-    System.out.println("BeanFactoryAware------->"+beanFactory);
-  }
+	@Override
+	public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+		System.out.println("BeanFactoryAware------->" + beanFactory);
+	}
 }
diff --git a/len-web/src/main/java/com/len/config/BeanName.java b/len-web/src/main/java/com/len/config/BeanName.java
index c443841..c610d9d 100644
--- a/len-web/src/main/java/com/len/config/BeanName.java
+++ b/len-web/src/main/java/com/len/config/BeanName.java
@@ -7,8 +7,8 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class BeanName implements BeanNameAware {
 
-  @Override
-  public void setBeanName(String name) {
-    System.out.println("BeanNameAware-------->:"+name);
-  }
+	@Override
+	public void setBeanName(String name) {
+		System.out.println("BeanNameAware-------->:" + name);
+	}
 }
diff --git a/len-web/src/main/java/com/len/config/FreeMarkerConfig.java b/len-web/src/main/java/com/len/config/FreeMarkerConfig.java
index 15c3e3a..4592549 100644
--- a/len-web/src/main/java/com/len/config/FreeMarkerConfig.java
+++ b/len-web/src/main/java/com/len/config/FreeMarkerConfig.java
@@ -15,56 +15,56 @@ import java.util.Properties;
  * freemarker 配置类
  */
 @Configuration
-public class FreeMarkerConfig{
+public class FreeMarkerConfig {
 
 
-  @Bean
-  public ViewResolver viewResolverFtl() {
-    FreeMarkerViewResolver resolver = new FreeMarkerViewResolver();
-    resolver.setCache(false);
-    resolver.setViewClass(org.springframework.web.servlet.view.freemarker.FreeMarkerView.class);
-    resolver.setRequestContextAttribute("re");
-    resolver.setExposeRequestAttributes(true);
-    resolver.setExposeSessionAttributes(true);
-    resolver.setSuffix(".ftl");
-    resolver.setContentType("text/html;charset=UTF-8");
-    resolver.setOrder(0);
-    return resolver;
-  }
+	@Bean
+	public ViewResolver viewResolverFtl() {
+		FreeMarkerViewResolver resolver = new FreeMarkerViewResolver();
+		resolver.setCache(false);
+		resolver.setViewClass(org.springframework.web.servlet.view.freemarker.FreeMarkerView.class);
+		resolver.setRequestContextAttribute("re");
+		resolver.setExposeRequestAttributes(true);
+		resolver.setExposeSessionAttributes(true);
+		resolver.setSuffix(".ftl");
+		resolver.setContentType("text/html;charset=UTF-8");
+		resolver.setOrder(0);
+		return resolver;
+	}
 
-  @Bean
-  public ViewResolver viewResolverHtml() {
-    FreeMarkerViewResolver resolver = new FreeMarkerViewResolver();
-    resolver.setCache(false);
-    resolver.setViewClass(org.springframework.web.servlet.view.freemarker.FreeMarkerView.class);
-    resolver.setRequestContextAttribute("re");
-    resolver.setExposeRequestAttributes(true);
-    resolver.setExposeSessionAttributes(true);
-    resolver.setOrder(1);
-    resolver.setSuffix(".html");
-    resolver.setContentType("text/html;charset=UTF-8");
-    return resolver;
-  }
+	@Bean
+	public ViewResolver viewResolverHtml() {
+		FreeMarkerViewResolver resolver = new FreeMarkerViewResolver();
+		resolver.setCache(false);
+		resolver.setViewClass(org.springframework.web.servlet.view.freemarker.FreeMarkerView.class);
+		resolver.setRequestContextAttribute("re");
+		resolver.setExposeRequestAttributes(true);
+		resolver.setExposeSessionAttributes(true);
+		resolver.setOrder(1);
+		resolver.setSuffix(".html");
+		resolver.setContentType("text/html;charset=UTF-8");
+		return resolver;
+	}
 
 
-  @Bean
-  public FreeMarkerConfigurer freemarkerConfig() throws IOException, TemplateException {
-    FreeMarkerConfigurationFactory factory = new FreeMarkerConfigurationFactory();
-    factory.setTemplateLoaderPath("classpath:/ftl/");
-    factory.setDefaultEncoding("UTF-8");
-    factory.setPreferFileSystemAccess(false);
-    FreeMarkerConfigurer result = new FreeMarkerConfigurer();
-    freemarker.template.Configuration configuration = factory.createConfiguration();
-    configuration.setClassicCompatible(true);
-    result.setConfiguration(configuration);
-    Properties settings = new Properties();
-    settings.put("template_update_delay", "0");
-    settings.put("default_encoding", "UTF-8");
-    settings.put("number_format", "0.######");
-    settings.put("classic_compatible", true);
-    settings.put("template_exception_handler", "ignore");
-    result.setFreemarkerSettings(settings);
-    return result;
-  }
+	@Bean
+	public FreeMarkerConfigurer freemarkerConfig() throws IOException, TemplateException {
+		FreeMarkerConfigurationFactory factory = new FreeMarkerConfigurationFactory();
+		factory.setTemplateLoaderPath("classpath:/ftl/");
+		factory.setDefaultEncoding("UTF-8");
+		factory.setPreferFileSystemAccess(false);
+		FreeMarkerConfigurer result = new FreeMarkerConfigurer();
+		freemarker.template.Configuration configuration = factory.createConfiguration();
+		configuration.setClassicCompatible(true);
+		result.setConfiguration(configuration);
+		Properties settings = new Properties();
+		settings.put("template_update_delay", "0");
+		settings.put("default_encoding", "UTF-8");
+		settings.put("number_format", "0.######");
+		settings.put("classic_compatible", true);
+		settings.put("template_exception_handler", "ignore");
+		result.setFreemarkerSettings(settings);
+		return result;
+	}
 
-}
\ No newline at end of file
+}
diff --git a/len-web/src/main/java/com/len/config/FreemarkerShiroConfig.java b/len-web/src/main/java/com/len/config/FreemarkerShiroConfig.java
index 1ee3da6..58e526f 100644
--- a/len-web/src/main/java/com/len/config/FreemarkerShiroConfig.java
+++ b/len-web/src/main/java/com/len/config/FreemarkerShiroConfig.java
@@ -10,12 +10,12 @@ import org.springframework.stereotype.Component;
 @Component
 public class FreemarkerShiroConfig implements InitializingBean {
 
-    @Autowired
-    private freemarker.template.Configuration configuration;
+	@Autowired
+	private freemarker.template.Configuration configuration;
 
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        configuration.setSharedVariable("shiro", new ShiroTags());
-        configuration.setSharedVariable("lenInclude", new LenInclude());
-    }
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		configuration.setSharedVariable("shiro", new ShiroTags());
+		configuration.setSharedVariable("lenInclude", new LenInclude());
+	}
 }
diff --git a/len-web/src/main/java/com/len/config/LenFilter.java b/len-web/src/main/java/com/len/config/LenFilter.java
index f3dc985..a16c9e8 100644
--- a/len-web/src/main/java/com/len/config/LenFilter.java
+++ b/len-web/src/main/java/com/len/config/LenFilter.java
@@ -13,50 +13,49 @@ import java.util.Locale;
 @Component
 public class LenFilter implements Filter {
 
-    @Autowired
-    SysUserService sysUserService;
-
-    /**
-     * 支持语言 扩展语言可直接在此添加
-     */
-    private static Locale[] supportLocales = {
-            Locale.SIMPLIFIED_CHINESE,
-            Locale.US
-    };
-
-    @Override
-    public void init(FilterConfig filterConfig) throws ServletException {
-        System.out.println("FirstFilter init");
-    }
-
-    @Override
-    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
-            throws IOException, ServletException {
-        HttpServletRequest request = (HttpServletRequest) servletRequest;
-        Locale locale = request.getLocale();
-        LocalLocale.setLocale(getLocale(locale));
-        filterChain.doFilter(servletRequest, servletResponse);
-    }
-
-    /**
-     * 获取支持语言
-     *
-     * @param locale
-     * @return
-     */
-    private Locale getLocale(Locale locale) {
-        String reqLanguage = locale.getLanguage();
-        for (Locale support : supportLocales) {
-            if (reqLanguage.equals(support.getLanguage())) {
-                return support;
-            }
-        }
-        return Locale.US;
-    }
-
-
-    @Override
-    public void destroy() {
-        System.out.println("FirstFilter destroy");
-    }
-}
\ No newline at end of file
+	/**
+	 * 支持语言 扩展语言可直接在此添加
+	 */
+	private static Locale[] supportLocales = {
+		Locale.SIMPLIFIED_CHINESE,
+		Locale.US
+	};
+	@Autowired
+	SysUserService sysUserService;
+
+	@Override
+	public void init(FilterConfig filterConfig) throws ServletException {
+		System.out.println("FirstFilter init");
+	}
+
+	@Override
+	public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain)
+		throws IOException, ServletException {
+		HttpServletRequest request = (HttpServletRequest) servletRequest;
+		Locale locale = request.getLocale();
+		LocalLocale.setLocale(getLocale(locale));
+		filterChain.doFilter(servletRequest, servletResponse);
+	}
+
+	/**
+	 * 获取支持语言
+	 *
+	 * @param locale
+	 * @return
+	 */
+	private Locale getLocale(Locale locale) {
+		String reqLanguage = locale.getLanguage();
+		for (Locale support : supportLocales) {
+			if (reqLanguage.equals(support.getLanguage())) {
+				return support;
+			}
+		}
+		return Locale.US;
+	}
+
+
+	@Override
+	public void destroy() {
+		System.out.println("FirstFilter destroy");
+	}
+}
diff --git a/len-web/src/main/java/com/len/config/LogConfig.java b/len-web/src/main/java/com/len/config/LogConfig.java
index 411ec6a..2c1e58f 100644
--- a/len-web/src/main/java/com/len/config/LogConfig.java
+++ b/len-web/src/main/java/com/len/config/LogConfig.java
@@ -8,9 +8,9 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class LogConfig {
 
-  @Bean(name = "logAspect")
-  public LogAspect getLogAspect(){
-    return new LogAspect();
-  }
+	@Bean(name = "logAspect")
+	public LogAspect getLogAspect() {
+		return new LogAspect();
+	}
 
 }
diff --git a/len-web/src/main/java/com/len/config/MyBatisPlusConfig.java b/len-web/src/main/java/com/len/config/MyBatisPlusConfig.java
index 42c5f92..5202efa 100644
--- a/len-web/src/main/java/com/len/config/MyBatisPlusConfig.java
+++ b/len-web/src/main/java/com/len/config/MyBatisPlusConfig.java
@@ -4,29 +4,28 @@ import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
 import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 //@Configuration
 public class MyBatisPlusConfig {
 
-    /*
-     * 分页插件，自动识别数据库类型
-     * 多租户，请参考官网【插件扩展】
-     */
-    @Bean
-    public PaginationInterceptor paginationInterceptor() {
-        return new PaginationInterceptor();
-    }
+	/*
+	 * 分页插件，自动识别数据库类型
+	 * 多租户，请参考官网【插件扩展】
+	 */
+	@Bean
+	public PaginationInterceptor paginationInterceptor() {
+		return new PaginationInterceptor();
+	}
 
 
-    @Bean
-    ConfigurationCustomizer mybatisConfigurationCustomizer() {
-        return new ConfigurationCustomizer() {
-            @Override
-            public void customize(MybatisConfiguration configuration) {
-                configuration.addInterceptor(new com.github.pagehelper.PageInterceptor());
-            }
-        };
-    }
+	@Bean
+	ConfigurationCustomizer mybatisConfigurationCustomizer() {
+		return new ConfigurationCustomizer() {
+			@Override
+			public void customize(MybatisConfiguration configuration) {
+				configuration.addInterceptor(new com.github.pagehelper.PageInterceptor());
+			}
+		};
+	}
 
-}
\ No newline at end of file
+}
diff --git a/len-web/src/main/java/com/len/config/MyModularRealmAuthenticator.java b/len-web/src/main/java/com/len/config/MyModularRealmAuthenticator.java
index f040c59..79dc212 100644
--- a/len-web/src/main/java/com/len/config/MyModularRealmAuthenticator.java
+++ b/len-web/src/main/java/com/len/config/MyModularRealmAuthenticator.java
@@ -18,33 +18,33 @@ import java.util.Collection;
 public class MyModularRealmAuthenticator extends ModularRealmAuthenticator {
 
 
-    @Override
-    protected AuthenticationInfo doAuthenticate(AuthenticationToken authenticationToken) throws AuthenticationException {
-        assertRealmsConfigured();
-        LoginType type;
-        AuthenticationToken token;
-        if (authenticationToken instanceof JwtToken) {
-            JwtToken token1 = (JwtToken) authenticationToken;
-            token = token1;
-            type = token1.getType();
-        } else {
-            CustomUsernamePasswordToken token1 = (CustomUsernamePasswordToken) authenticationToken;
-            token = token1;
-            type = token1.getType();
-        }
-        if (type==null) {
-            throw new RuntimeException("登录认证授权类型不能为空");
-        }
-        Collection<Realm> realms = getRealms();
-        Collection<Realm> realmsList = new ArrayList<>();
-        for (Realm realm : realms) {
-            if (realm.getName().contains(type.toString())) {
-                realmsList.add(realm);
-            }
-        }
-        return realmsList.size() == 1 ? doSingleRealmAuthentication(realmsList.iterator().next(), token)
-                : doMultiRealmAuthentication(realmsList, token);
-    }
+	@Override
+	protected AuthenticationInfo doAuthenticate(AuthenticationToken authenticationToken) throws AuthenticationException {
+		assertRealmsConfigured();
+		LoginType type;
+		AuthenticationToken token;
+		if (authenticationToken instanceof JwtToken) {
+			JwtToken token1 = (JwtToken) authenticationToken;
+			token = token1;
+			type = token1.getType();
+		} else {
+			CustomUsernamePasswordToken token1 = (CustomUsernamePasswordToken) authenticationToken;
+			token = token1;
+			type = token1.getType();
+		}
+		if (type == null) {
+			throw new RuntimeException("登录认证授权类型不能为空");
+		}
+		Collection<Realm> realms = getRealms();
+		Collection<Realm> realmsList = new ArrayList<>();
+		for (Realm realm : realms) {
+			if (realm.getName().contains(type.toString())) {
+				realmsList.add(realm);
+			}
+		}
+		return realmsList.size() == 1 ? doSingleRealmAuthentication(realmsList.iterator().next(), token)
+			: doMultiRealmAuthentication(realmsList, token);
+	}
 
 
 }
diff --git a/len-web/src/main/java/com/len/config/PageHelperConfig.java b/len-web/src/main/java/com/len/config/PageHelperConfig.java
index f9c6631..531f559 100644
--- a/len-web/src/main/java/com/len/config/PageHelperConfig.java
+++ b/len-web/src/main/java/com/len/config/PageHelperConfig.java
@@ -7,7 +7,7 @@ package com.len.config;
 public class PageHelperConfig {
 
 
-    //@Bean
+	//@Bean
   /*public PageHelper getPageHelper(){
     PageHelper pageHelper=new PageHelper();
     Properties properties=new Properties();
diff --git a/len-web/src/main/java/com/len/config/ShiroConfig.java b/len-web/src/main/java/com/len/config/ShiroConfig.java
index a43b357..f313b11 100644
--- a/len-web/src/main/java/com/len/config/ShiroConfig.java
+++ b/len-web/src/main/java/com/len/config/ShiroConfig.java
@@ -1,9 +1,14 @@
 package com.len.config;
 
-import java.util.*;
-
-import javax.servlet.Filter;
-
+import com.len.cache.CacheManagerFactory;
+import com.len.cache.impl.config.LenProp;
+import com.len.core.BlogRealm;
+import com.len.core.MyBasicHttpAuthenticationFilter;
+import com.len.core.filter.PermissionFilter;
+import com.len.core.filter.VerfityCodeFilter;
+import com.len.core.shiro.LoginRealm;
+import com.len.core.shiro.RetryLimitCredentialsMatcher;
+import com.len.menu.LoginType;
 import org.apache.shiro.authc.pam.AtLeastOneSuccessfulStrategy;
 import org.apache.shiro.mgt.SecurityManager;
 import org.apache.shiro.realm.Realm;
@@ -22,15 +27,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.filter.DelegatingFilterProxy;
 
-import com.len.cache.CacheManagerFactory;
-import com.len.cache.impl.config.LenProp;
-import com.len.core.BlogRealm;
-import com.len.core.MyBasicHttpAuthenticationFilter;
-import com.len.core.filter.PermissionFilter;
-import com.len.core.filter.VerfityCodeFilter;
-import com.len.core.shiro.LoginRealm;
-import com.len.core.shiro.RetryLimitCredentialsMatcher;
-import com.len.menu.LoginType;
+import javax.servlet.Filter;
+import java.util.*;
 
 /**
  * 添加redis缓存，支持集群 默认redis缓存，如果单机配置可放开下面 ehcache
@@ -38,172 +36,172 @@ import com.len.menu.LoginType;
 @Configuration
 public class ShiroConfig {
 
-    private static String sessionCache;
-
-    static {
-        sessionCache = LenProp.getSessionCache();
-    }
-
-    public RetryLimitCredentialsMatcher getRetryLimitCredentialsMatcher() {
-        RetryLimitCredentialsMatcher rm = new RetryLimitCredentialsMatcher(CacheManagerFactory.getCacheManager());
-        rm.setHashAlgorithmName("md5");
-        rm.setHashIterations(4);
-        return rm;
-
-    }
-
-    @Bean(name = "userLoginRealm")
-    public LoginRealm getLoginRealm() {
-        LoginRealm realm = new LoginRealm();
-        realm.setCredentialsMatcher(getRetryLimitCredentialsMatcher());
-        return realm;
-    }
-
-    @Bean(name = "blogLoginRealm")
-    public BlogRealm blogLoginRealm() {
-        return new BlogRealm();
-    }
-
-    @Bean
-    public static LifecycleBeanPostProcessor getLifecycleBeanPostProcessor() {
-        return new LifecycleBeanPostProcessor();
-    }
-
-    @Bean
-    public AtLeastOneSuccessfulStrategy getAtLeastOneSuccessfulStrategy() {
-        return new AtLeastOneSuccessfulStrategy();
-    }
-
-    @Bean
-    public MyModularRealmAuthenticator getMyModularRealmAuthenticator() {
-        MyModularRealmAuthenticator authenticator = new MyModularRealmAuthenticator();
-        authenticator.setAuthenticationStrategy(getAtLeastOneSuccessfulStrategy());
-        return authenticator;
-    }
-
-    private static RedisSessionDAO redisSessionDAO() {
-        RedisSessionDAO redisSessionDAO = new RedisSessionDAO();
-        redisSessionDAO.setRedisManager(CacheManagerFactory.getRedisManager());
-        return redisSessionDAO;
-    }
-
-    public static DefaultWebSessionManager getDefaultWebSessionManager() {
-        DefaultWebSessionManager defaultWebSessionManager = new DefaultWebSessionManager();
-        defaultWebSessionManager.setSessionIdCookieEnabled(true);
-        defaultWebSessionManager.setGlobalSessionTimeout(21600000);
-        // defaultWebSessionManager.setGlobalSessionTimeout(10000L);
-        defaultWebSessionManager.setDeleteInvalidSessions(true);
-        defaultWebSessionManager.setSessionValidationSchedulerEnabled(true);
-        defaultWebSessionManager.setSessionIdUrlRewritingEnabled(false);
-        defaultWebSessionManager.setSessionDAO(sessionDao());
-        return defaultWebSessionManager;
-    }
-
-    /**
-     * session 储存对象
-     * 
-     * @return
-     */
-    private static SessionDAO sessionDao() {
-        SessionDAO sessionDAO;
-        switch (sessionCache) {
-            case "redis":
-                sessionDAO = redisSessionDAO();
-                break;
-            default:
-                sessionDAO = new MemorySessionDAO();
-        }
-        return sessionDAO;
-    }
-
-    @Bean(name = "securityManager")
-    public SecurityManager getSecurityManager(@Qualifier("userLoginRealm") LoginRealm loginRealm,
-        @Qualifier("blogLoginRealm") BlogRealm blogLoginRealm) {
-        DefaultWebSecurityManager dwm = new DefaultWebSecurityManager();
-        List<Realm> loginRealms = new ArrayList<>();
-        dwm.setAuthenticator(getMyModularRealmAuthenticator());
-        loginRealm.setName(LoginType.SYS.toString());
-        blogLoginRealm.setName(LoginType.BLOG.toString());
-        loginRealms.add(loginRealm);
-        loginRealms.add(blogLoginRealm);
-        dwm.setRealms(loginRealms);
-        dwm.setCacheManager(CacheManagerFactory.getCacheManager());
-        dwm.setSessionManager(getDefaultWebSessionManager());
-        return dwm;
-    }
-
-    @Bean
-    public PermissionFilter getPermissionFilter() {
-        return new PermissionFilter();
-    }
-
-    @Bean
-    public MyBasicHttpAuthenticationFilter getAuthenticationFilter() {
-        return new MyBasicHttpAuthenticationFilter();
-    }
-
-    @Bean
-    public VerfityCodeFilter getVerfityCodeFilter() {
-        VerfityCodeFilter vf = new VerfityCodeFilter();
-        vf.setFailureKeyAttribute("shiroLoginFailure");
-        vf.setJcaptchaParam("code");
-        vf.setVerfitiCode(true);
-        return vf;
-    }
-
-    @Bean(name = "shiroFilter")
-    public ShiroFilterFactoryBean
-        getShiroFilterFactoryBean(@Qualifier("securityManager") SecurityManager securityManager) {
-        ShiroFilterFactoryBean sfb = new ShiroFilterFactoryBean();
-        sfb.setSecurityManager(securityManager);
-        sfb.setLoginUrl("/login");
-        sfb.setUnauthorizedUrl("/goLogin");
-        Map<String, Filter> filters = new HashMap<>();
-        filters.put("per", getPermissionFilter());
-        filters.put("verCode", getVerfityCodeFilter());
-        filters.put("jwt", getAuthenticationFilter());
-        sfb.setFilters(filters);
-        Map<String, String> filterMap = new LinkedHashMap<>();
-        filterMap.put("/login", "verCode,anon");
-        filterMap.put("/blogLogin", "verCode,anon");
-        filterMap.put("/getCode", "anon");
-        filterMap.put("/oauth", "anon");
-        filterMap.put("/actuator/**", "anon");
-        filterMap.put("/eureka/**", "anon");
-        filterMap.put("/img/**", "anon");
-        filterMap.put("/logout", "logout");
-        filterMap.put("/plugin/**", "anon");
-        filterMap.put("/user/**", "per");
-        filterMap.put("/blog-admin/**", "jwt");
-        filterMap.put("/blog/**", "anon");
-        filterMap.put("/**", "authc");
-        sfb.setFilterChainDefinitionMap(filterMap);
-        return sfb;
-    }
-
-    @Bean
-    public DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator() {
-        DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator = new DefaultAdvisorAutoProxyCreator();
-        advisorAutoProxyCreator.setProxyTargetClass(true);
-        return advisorAutoProxyCreator;
-    }
-
-    @Bean
-    public AuthorizationAttributeSourceAdvisor
-        getAuthorizationAttributeSourceAdvisor(@Qualifier("securityManager") SecurityManager securityManager) {
-        AuthorizationAttributeSourceAdvisor as = new AuthorizationAttributeSourceAdvisor();
-        as.setSecurityManager(securityManager);
-        return as;
-    }
-
-    @Bean
-    public FilterRegistrationBean delegatingFilterProxy() {
-        FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
-        DelegatingFilterProxy proxy = new DelegatingFilterProxy();
-        proxy.setTargetFilterLifecycle(true);
-        proxy.setTargetBeanName("shiroFilter");
-        filterRegistrationBean.setFilter(proxy);
-        return filterRegistrationBean;
-    }
+	private static String sessionCache;
+
+	static {
+		sessionCache = LenProp.getSessionCache();
+	}
+
+	@Bean
+	public static LifecycleBeanPostProcessor getLifecycleBeanPostProcessor() {
+		return new LifecycleBeanPostProcessor();
+	}
+
+	private static RedisSessionDAO redisSessionDAO() {
+		RedisSessionDAO redisSessionDAO = new RedisSessionDAO();
+		redisSessionDAO.setRedisManager(CacheManagerFactory.getRedisManager());
+		return redisSessionDAO;
+	}
+
+	public static DefaultWebSessionManager getDefaultWebSessionManager() {
+		DefaultWebSessionManager defaultWebSessionManager = new DefaultWebSessionManager();
+		defaultWebSessionManager.setSessionIdCookieEnabled(true);
+		defaultWebSessionManager.setGlobalSessionTimeout(21600000);
+		// defaultWebSessionManager.setGlobalSessionTimeout(10000L);
+		defaultWebSessionManager.setDeleteInvalidSessions(true);
+		defaultWebSessionManager.setSessionValidationSchedulerEnabled(true);
+		defaultWebSessionManager.setSessionIdUrlRewritingEnabled(false);
+		defaultWebSessionManager.setSessionDAO(sessionDao());
+		return defaultWebSessionManager;
+	}
+
+	/**
+	 * session 储存对象
+	 *
+	 * @return
+	 */
+	private static SessionDAO sessionDao() {
+		SessionDAO sessionDAO;
+		switch (sessionCache) {
+			case "redis":
+				sessionDAO = redisSessionDAO();
+				break;
+			default:
+				sessionDAO = new MemorySessionDAO();
+		}
+		return sessionDAO;
+	}
+
+	public RetryLimitCredentialsMatcher getRetryLimitCredentialsMatcher() {
+		RetryLimitCredentialsMatcher rm = new RetryLimitCredentialsMatcher(CacheManagerFactory.getCacheManager());
+		rm.setHashAlgorithmName("md5");
+		rm.setHashIterations(4);
+		return rm;
+
+	}
+
+	@Bean(name = "userLoginRealm")
+	public LoginRealm getLoginRealm() {
+		LoginRealm realm = new LoginRealm();
+		realm.setCredentialsMatcher(getRetryLimitCredentialsMatcher());
+		return realm;
+	}
+
+	@Bean(name = "blogLoginRealm")
+	public BlogRealm blogLoginRealm() {
+		return new BlogRealm();
+	}
+
+	@Bean
+	public AtLeastOneSuccessfulStrategy getAtLeastOneSuccessfulStrategy() {
+		return new AtLeastOneSuccessfulStrategy();
+	}
+
+	@Bean
+	public MyModularRealmAuthenticator getMyModularRealmAuthenticator() {
+		MyModularRealmAuthenticator authenticator = new MyModularRealmAuthenticator();
+		authenticator.setAuthenticationStrategy(getAtLeastOneSuccessfulStrategy());
+		return authenticator;
+	}
+
+	@Bean(name = "securityManager")
+	public SecurityManager getSecurityManager(@Qualifier("userLoginRealm") LoginRealm loginRealm,
+											  @Qualifier("blogLoginRealm") BlogRealm blogLoginRealm) {
+		DefaultWebSecurityManager dwm = new DefaultWebSecurityManager();
+		List<Realm> loginRealms = new ArrayList<>();
+		dwm.setAuthenticator(getMyModularRealmAuthenticator());
+		loginRealm.setName(LoginType.SYS.toString());
+		blogLoginRealm.setName(LoginType.BLOG.toString());
+		loginRealms.add(loginRealm);
+		loginRealms.add(blogLoginRealm);
+		dwm.setRealms(loginRealms);
+		dwm.setCacheManager(CacheManagerFactory.getCacheManager());
+		dwm.setSessionManager(getDefaultWebSessionManager());
+		return dwm;
+	}
+
+	@Bean
+	public PermissionFilter getPermissionFilter() {
+		return new PermissionFilter();
+	}
+
+	@Bean
+	public MyBasicHttpAuthenticationFilter getAuthenticationFilter() {
+		return new MyBasicHttpAuthenticationFilter();
+	}
+
+	@Bean
+	public VerfityCodeFilter getVerfityCodeFilter() {
+		VerfityCodeFilter vf = new VerfityCodeFilter();
+		vf.setFailureKeyAttribute("shiroLoginFailure");
+		vf.setJcaptchaParam("code");
+		vf.setVerfitiCode(true);
+		return vf;
+	}
+
+	@Bean(name = "shiroFilter")
+	public ShiroFilterFactoryBean
+	getShiroFilterFactoryBean(@Qualifier("securityManager") SecurityManager securityManager) {
+		ShiroFilterFactoryBean sfb = new ShiroFilterFactoryBean();
+		sfb.setSecurityManager(securityManager);
+		sfb.setLoginUrl("/login");
+		sfb.setUnauthorizedUrl("/goLogin");
+		Map<String, Filter> filters = new HashMap<>();
+		filters.put("per", getPermissionFilter());
+		filters.put("verCode", getVerfityCodeFilter());
+		filters.put("jwt", getAuthenticationFilter());
+		sfb.setFilters(filters);
+		Map<String, String> filterMap = new LinkedHashMap<>();
+		filterMap.put("/login", "verCode,anon");
+		filterMap.put("/blogLogin", "verCode,anon");
+		filterMap.put("/getCode", "anon");
+		filterMap.put("/oauth", "anon");
+		filterMap.put("/actuator/**", "anon");
+		filterMap.put("/eureka/**", "anon");
+		filterMap.put("/img/**", "anon");
+		filterMap.put("/logout", "logout");
+		filterMap.put("/plugin/**", "anon");
+		filterMap.put("/user/**", "per");
+		filterMap.put("/blog-admin/**", "jwt");
+		filterMap.put("/blog/**", "anon");
+		filterMap.put("/**", "authc");
+		sfb.setFilterChainDefinitionMap(filterMap);
+		return sfb;
+	}
+
+	@Bean
+	public DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator() {
+		DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator = new DefaultAdvisorAutoProxyCreator();
+		advisorAutoProxyCreator.setProxyTargetClass(true);
+		return advisorAutoProxyCreator;
+	}
+
+	@Bean
+	public AuthorizationAttributeSourceAdvisor
+	getAuthorizationAttributeSourceAdvisor(@Qualifier("securityManager") SecurityManager securityManager) {
+		AuthorizationAttributeSourceAdvisor as = new AuthorizationAttributeSourceAdvisor();
+		as.setSecurityManager(securityManager);
+		return as;
+	}
+
+	@Bean
+	public FilterRegistrationBean delegatingFilterProxy() {
+		FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
+		DelegatingFilterProxy proxy = new DelegatingFilterProxy();
+		proxy.setTargetFilterLifecycle(true);
+		proxy.setTargetBeanName("shiroFilter");
+		filterRegistrationBean.setFilter(proxy);
+		return filterRegistrationBean;
+	}
 
 }
diff --git a/len-web/src/main/java/com/len/config/ShiroSessionManager.java b/len-web/src/main/java/com/len/config/ShiroSessionManager.java
index 841fbe4..fe06e60 100644
--- a/len-web/src/main/java/com/len/config/ShiroSessionManager.java
+++ b/len-web/src/main/java/com/len/config/ShiroSessionManager.java
@@ -11,24 +11,24 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.Serializable;
 
 public class ShiroSessionManager extends DefaultWebSessionManager {
-    private static final String REFERENCED_SESSION_ID_SOURCE = "Stateless request";
+	private static final String REFERENCED_SESSION_ID_SOURCE = "Stateless request";
 
-    public ShiroSessionManager() {
-        super();
-    }
+	public ShiroSessionManager() {
+		super();
+	}
 
-    @Override
-    protected Serializable getSessionId(ServletRequest request, ServletResponse response) {
-        HttpServletRequest httpRequest = WebUtils.toHttp(request);
+	@Override
+	protected Serializable getSessionId(ServletRequest request, ServletResponse response) {
+		HttpServletRequest httpRequest = WebUtils.toHttp(request);
 
-        String sessionId = httpRequest.getHeader("Authorization");
-        if (!StringUtils.isEmpty(sessionId)) {
-            request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID_SOURCE, REFERENCED_SESSION_ID_SOURCE);
-            request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID, sessionId);
-            request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID_IS_VALID, true);
-            return sessionId;
-        } else {
-            return super.getSessionId(request, response);
-        }
-    }
+		String sessionId = httpRequest.getHeader("Authorization");
+		if (!StringUtils.isEmpty(sessionId)) {
+			request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID_SOURCE, REFERENCED_SESSION_ID_SOURCE);
+			request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID, sessionId);
+			request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID_IS_VALID, true);
+			return sessionId;
+		} else {
+			return super.getSessionId(request, response);
+		}
+	}
 }
diff --git a/len-web/src/main/java/com/len/config/SocketConfig.java b/len-web/src/main/java/com/len/config/SocketConfig.java
index c8172d8..2a98ba7 100644
--- a/len-web/src/main/java/com/len/config/SocketConfig.java
+++ b/len-web/src/main/java/com/len/config/SocketConfig.java
@@ -6,8 +6,8 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 @Configuration
 public class SocketConfig {
-    @Bean
-    public ServerEndpointExporter serverEndpointExporter() {
-        return new ServerEndpointExporter();
-    }
+	@Bean
+	public ServerEndpointExporter serverEndpointExporter() {
+		return new ServerEndpointExporter();
+	}
 }
diff --git a/len-web/src/main/java/com/len/config/SwaggerConfig.java b/len-web/src/main/java/com/len/config/SwaggerConfig.java
index 0133ea7..9dfb3d5 100644
--- a/len-web/src/main/java/com/len/config/SwaggerConfig.java
+++ b/len-web/src/main/java/com/len/config/SwaggerConfig.java
@@ -15,24 +15,24 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
 @Configuration
 @EnableSwagger2
 public class SwaggerConfig {
-    @Bean
-    public Docket createRestApi() {
-        return new Docket(DocumentationType.SWAGGER_2)
-                .apiInfo(apiInfo())
-                .select()
-                .apis(RequestHandlerSelectors.basePackage("com.len.controller"))
-                .paths(PathSelectors.any())
-                .build();
-    }
+	@Bean
+	public Docket createRestApi() {
+		return new Docket(DocumentationType.SWAGGER_2)
+			.apiInfo(apiInfo())
+			.select()
+			.apis(RequestHandlerSelectors.basePackage("com.len.controller"))
+			.paths(PathSelectors.any())
+			.build();
+	}
 
-    private ApiInfo apiInfo() {
-        return new ApiInfoBuilder()
-                .title("Swagger接口列表")
-                .description("接口")
-                .termsOfServiceUrl("http://localhost:8081/swagger-ui.html")
-                .contact(new Contact("zxm", "http://www.lenosp.xyz", ""))
-                .version("1.1.0")
-                .build();
-    }
+	private ApiInfo apiInfo() {
+		return new ApiInfoBuilder()
+			.title("Swagger接口列表")
+			.description("接口")
+			.termsOfServiceUrl("http://localhost:8081/swagger-ui.html")
+			.contact(new Contact("zxm", "http://www.lenosp.xyz", ""))
+			.version("1.1.0")
+			.build();
+	}
 
 }
diff --git a/len-web/src/main/java/com/len/config/TransactionalConfig.java b/len-web/src/main/java/com/len/config/TransactionalConfig.java
index f4a7e20..74bb8bc 100644
--- a/len-web/src/main/java/com/len/config/TransactionalConfig.java
+++ b/len-web/src/main/java/com/len/config/TransactionalConfig.java
@@ -15,41 +15,41 @@ import java.util.Properties;
 @Configuration
 public class TransactionalConfig {
 
-    private static final String PROPAGATION_REQUIRED = "PROPAGATION_REQUIRED,-Throwable";
-    private static final String PROPAGATION_REQUIRED_READ = "PROPAGATION_REQUIRED,-Throwable,readOnly";
-    private static final String[] REQUIRED_RULE_TRANSACTION = {"insert*", "add*", "update*", "del*", "create*", "save*"};
-    private static final String[] READ_RULE_TRANSACTION = {"select*", "get*", "count*", "find*"};
-
-    /**
-     * aop 自动注入 无需手动
-     *
-     * @return
-     */
-    @Bean("lenTransaction")
-    public TransactionInterceptor lenTransaction() {
-        PlatformTransactionManager platformTransactionManager = SpringUtil.getBean(PlatformTransactionManager.class);
-        TransactionInterceptor interceptor = new TransactionInterceptor();
-        Properties properties = new Properties();
-        for (String s : REQUIRED_RULE_TRANSACTION) {
-            //PROPAGATION_REQUIRED 级别事务
-            properties.setProperty(s, PROPAGATION_REQUIRED);
-        }
-        for (String s : READ_RULE_TRANSACTION) {
-            properties.setProperty(s, PROPAGATION_REQUIRED_READ);
-        }
-        interceptor.setTransactionManager(platformTransactionManager);
-        interceptor.setTransactionAttributes(properties);
-        return interceptor;
-    }
-
-    @Bean
-    public BeanNameAutoProxyCreator getBeanNameAutoProxyCreator() {
-        BeanNameAutoProxyCreator proxyCreator = new BeanNameAutoProxyCreator();
-        proxyCreator.setProxyTargetClass(true);
-        proxyCreator.setBeanNames("*ServiceImpl", "*Controller");
-        proxyCreator.setInterceptorNames("lenTransaction");
-        return proxyCreator;
-    }
+	private static final String PROPAGATION_REQUIRED = "PROPAGATION_REQUIRED,-Throwable";
+	private static final String PROPAGATION_REQUIRED_READ = "PROPAGATION_REQUIRED,-Throwable,readOnly";
+	private static final String[] REQUIRED_RULE_TRANSACTION = {"insert*", "add*", "update*", "del*", "create*", "save*"};
+	private static final String[] READ_RULE_TRANSACTION = {"select*", "get*", "count*", "find*"};
+
+	/**
+	 * aop 自动注入 无需手动
+	 *
+	 * @return
+	 */
+	@Bean("lenTransaction")
+	public TransactionInterceptor lenTransaction() {
+		PlatformTransactionManager platformTransactionManager = SpringUtil.getBean(PlatformTransactionManager.class);
+		TransactionInterceptor interceptor = new TransactionInterceptor();
+		Properties properties = new Properties();
+		for (String s : REQUIRED_RULE_TRANSACTION) {
+			//PROPAGATION_REQUIRED 级别事务
+			properties.setProperty(s, PROPAGATION_REQUIRED);
+		}
+		for (String s : READ_RULE_TRANSACTION) {
+			properties.setProperty(s, PROPAGATION_REQUIRED_READ);
+		}
+		interceptor.setTransactionManager(platformTransactionManager);
+		interceptor.setTransactionAttributes(properties);
+		return interceptor;
+	}
+
+	@Bean
+	public BeanNameAutoProxyCreator getBeanNameAutoProxyCreator() {
+		BeanNameAutoProxyCreator proxyCreator = new BeanNameAutoProxyCreator();
+		proxyCreator.setProxyTargetClass(true);
+		proxyCreator.setBeanNames("*ServiceImpl", "*Controller");
+		proxyCreator.setInterceptorNames("lenTransaction");
+		return proxyCreator;
+	}
 
 
 }
diff --git a/len-web/src/main/java/com/len/config/WebMvcConfig.java b/len-web/src/main/java/com/len/config/WebMvcConfig.java
index a532930..cbe16b0 100644
--- a/len-web/src/main/java/com/len/config/WebMvcConfig.java
+++ b/len-web/src/main/java/com/len/config/WebMvcConfig.java
@@ -22,54 +22,54 @@ import java.util.Locale;
 @Configuration
 public class WebMvcConfig extends WebMvcConfigurationSupport {
 
-    @Value("${lenosp.imagePath}")
-    private String imagePath;
-    @Value("${lenosp.uploadPath}")
-    private String filePath;
+	@Value("${lenosp.imagePath}")
+	private String imagePath;
+	@Value("${lenosp.uploadPath}")
+	private String filePath;
 
-    @Bean
-    public HttpMessageConverter<String> responseBodyConverter() {
-        StringHttpMessageConverter converter = new StringHttpMessageConverter(Charset.forName("UTF-8"));
-        return converter;
-    }
+	@Bean
+	public HttpMessageConverter<String> responseBodyConverter() {
+		StringHttpMessageConverter converter = new StringHttpMessageConverter(Charset.forName("UTF-8"));
+		return converter;
+	}
 
 
-    @Override
-    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-        super.configureMessageConverters(converters);
-        converters.add(responseBodyConverter());
-    }
+	@Override
+	public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+		super.configureMessageConverters(converters);
+		converters.add(responseBodyConverter());
+	}
 
 
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("/**").addResourceLocations("classpath:/META-INF/resources/").setCachePeriod(0);
-        registry.addResourceHandler("/plugin/**", "/static/**")
-                .addResourceLocations("classpath:/plugin/", "classpath:/static/");
-        registry.addResourceHandler("/ftl/**").addResourceLocations("classpath:/ftl/", "classpath:/freemarker/");
-        registry.addResourceHandler("/images/**").addResourceLocations("file:" + imagePath, "classpath:/plugin/lenos/img/");
-        registry.addResourceHandler("/img/**").addResourceLocations("file:" + imagePath);
-        registry.addResourceHandler("/file/**").addResourceLocations("file:" + imagePath);
-        super.addResourceHandlers(registry);
-    }
+	@Override
+	public void addResourceHandlers(ResourceHandlerRegistry registry) {
+		registry.addResourceHandler("/**").addResourceLocations("classpath:/META-INF/resources/").setCachePeriod(0);
+		registry.addResourceHandler("/plugin/**", "/static/**")
+			.addResourceLocations("classpath:/plugin/", "classpath:/static/");
+		registry.addResourceHandler("/ftl/**").addResourceLocations("classpath:/ftl/", "classpath:/freemarker/");
+		registry.addResourceHandler("/images/**").addResourceLocations("file:" + imagePath, "classpath:/plugin/lenos/img/");
+		registry.addResourceHandler("/img/**").addResourceLocations("file:" + imagePath);
+		registry.addResourceHandler("/file/**").addResourceLocations("file:" + imagePath);
+		super.addResourceHandlers(registry);
+	}
 
-    /*保留国际化*/
-    @Bean
-    public LocaleChangeInterceptor interceptor() {
-        LocaleChangeInterceptor interceptor = new LocaleChangeInterceptor();
-        interceptor.setParamName("lang");
-        return interceptor;
-    }
+	/*保留国际化*/
+	@Bean
+	public LocaleChangeInterceptor interceptor() {
+		LocaleChangeInterceptor interceptor = new LocaleChangeInterceptor();
+		interceptor.setParamName("lang");
+		return interceptor;
+	}
 
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(interceptor());
-    }
+	@Override
+	public void addInterceptors(InterceptorRegistry registry) {
+		registry.addInterceptor(interceptor());
+	}
 
-    @Bean
-    public LocaleResolver resolver() {
-        SessionLocaleResolver resolver = new SessionLocaleResolver();
-        resolver.setDefaultLocale(Locale.US);
-        return resolver;
-    }
+	@Bean
+	public LocaleResolver resolver() {
+		SessionLocaleResolver resolver = new SessionLocaleResolver();
+		resolver.setDefaultLocale(Locale.US);
+		return resolver;
+	}
 }
diff --git a/len-web/src/main/java/com/len/config/ZBeanFactory.java b/len-web/src/main/java/com/len/config/ZBeanFactory.java
index c84ab1a..4298fcf 100644
--- a/len-web/src/main/java/com/len/config/ZBeanFactory.java
+++ b/len-web/src/main/java/com/len/config/ZBeanFactory.java
@@ -1,14 +1,10 @@
 package com.len.config;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.context.annotation.Configuration;
 
 /**
- *
  * ApplicationContext会自动检查是否在定义文件中有实现了BeanPostProcessor接口的类，
  * 如果有的话，Spring容器会在每个Bean(其他的Bean)被初始化之前和初始化之后，
  * 分别调用实现了BeanPostProcessor接口的类的postProcessAfterInitialization()方法
@@ -18,16 +14,16 @@ import org.springframework.context.annotation.Configuration;
 @Slf4j
 public class ZBeanFactory implements BeanPostProcessor {
 
-    @Override
-    public Object postProcessBeforeInitialization(Object bean, String beanName)
-            throws BeansException {
-        log.info("对象---" + beanName + "---初始化开始");
-        return bean;
-    }
+	@Override
+	public Object postProcessBeforeInitialization(Object bean, String beanName)
+		throws BeansException {
+		log.info("对象---" + beanName + "---初始化开始");
+		return bean;
+	}
 
-    @Override
-    public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-        log.info("对象---" + beanName + "---初始化成功");
-        return bean;
-    }
+	@Override
+	public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+		log.info("对象---" + beanName + "---初始化成功");
+		return bean;
+	}
 }
diff --git a/len-web/src/main/java/test/ActivitiDemo.java b/len-web/src/main/java/test/ActivitiDemo.java
index e6d6323..d4185ed 100644
--- a/len-web/src/main/java/test/ActivitiDemo.java
+++ b/len-web/src/main/java/test/ActivitiDemo.java
@@ -1,20 +1,8 @@
 package test;
 
 import com.len.LenApplication;
-
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import org.activiti.bpmn.model.BpmnModel;
-import org.activiti.engine.ActivitiException;
-import org.activiti.engine.HistoryService;
-import org.activiti.engine.ProcessEngineConfiguration;
-import org.activiti.engine.RepositoryService;
-import org.activiti.engine.RuntimeService;
-import org.activiti.engine.TaskService;
+import org.activiti.engine.*;
 import org.activiti.engine.history.HistoricTaskInstance;
 import org.activiti.engine.impl.RepositoryServiceImpl;
 import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
@@ -35,6 +23,13 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * 本demo 根据官网doc教程 address：http://www.mossle.com/docs/activiti/index.html
  */
@@ -43,226 +38,231 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @WebAppConfiguration
 public class ActivitiDemo {
 
-  @Autowired
-  RuntimeService runtimeService;
-
-  @Autowired
-  RepositoryService repositoryService;
-
-  @Autowired
-  TaskService taskService;
-
-  @Autowired
-  HistoryService historyService;
-
-
-  /**
-   * 发布流程
-   */
-  @Test
-  public void test(){
-    repositoryService.createDeployment()
-        .name("demo.bar")
-        .addClasspathResource("bpmn/demo.xml")
-
-        .deploy();
-    System.out.println(repositoryService.createDeploymentQuery().count());
+	@Autowired
+	RuntimeService runtimeService;
+
+	@Autowired
+	RepositoryService repositoryService;
+
+	@Autowired
+	TaskService taskService;
+
+	@Autowired
+	HistoryService historyService;
+	@Autowired
+	ProcessEngineFactoryBean processEngine;
+	@Autowired
+	ProcessEngineConfiguration processEngineConfiguration;
+
+	/**
+	 * 发布流程
+	 */
+	@Test
+	public void test() {
+		repositoryService.createDeployment()
+			.name("demo.bar")
+			.addClasspathResource("bpmn/demo.xml")
+
+			.deploy();
+		System.out.println(repositoryService.createDeploymentQuery().count());
     /*long count = runtimeService.createProcessInstanceQuery()
         .count();
     System.out.println(count);*/
-  }
-
-  /**
-   * 启动一个流程
-   */
-  @Test
-  public void startUp(){
-    Map<String, Object> variables = new HashMap<String, Object>();
-    variables.put("employeeName", "张三");//张三
-    variables.put("numberOfDays", new Integer(4));//请假四天
-    variables.put("vacationMotivation", "太累了");//原因
-    ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("vacationRequest", variables);
-    System.out.println( runtimeService.createProcessInstanceQuery().count());
-  }
-
-  /**
-   * 完成流程
-   */
-  @Test
-  public void complete(){
-    List<Task> taskList=taskService.createTaskQuery().taskCandidateGroup("management").list();
-    for(Task task:taskList){
-      System.out.println(task.getId());
-      System.out.println(task.getName());
-      System.out.println(task.getAssignee());
-    }
-    Task task=taskList.get(0);
-    Map<String, Object> taskVariables = new HashMap<String, Object>();
-    taskVariables.put("vacationApproved", "false");
-    taskVariables.put("managerMotivation", "我们时间很紧！");
-    taskService.complete(task.getId(), taskVariables);
-  }
-
-  /**
-   * 激活、挂起
-   */
-  @Test
-  public void gq(){
-    repositoryService.suspendProcessDefinitionByKey("vacationRequest");
-    try {
-      runtimeService.startProcessInstanceByKey("vacationRequest");
-    } catch (ActivitiException e) {
-      e.printStackTrace();
-    }
-  }
-
-  /**---------请假流程------------*/
-  /**
-   * 发布流程
-   */
-  @Test
-  public void leaveStart(){
-    //InputStream in = this.getClass().getClassLoader().getResourceAsStream("bpmn/leave.zip");
-   // ZipInputStream zipInputStream = new ZipInputStream(in);
-    //使用deploy方法发布流程
-    Deployment deployment=repositoryService.createDeployment()
-        ///.addZipInputStream(zipInputStream)
-        .addClasspathResource("bpmn/leave.bpmn")
-        .addClasspathResource("bpmn/leave.png")
-        .name("请假流程")
-        .deploy();
-    System.out.println("流程id:"+deployment.getId());
-    System.out.println("流程名称:"+deployment.getName());
-  }
-
-  /**
-   * 获取流程详细信息
-   */
-  @Test
-  public void queryProcdef(){
-    //创建查询对象
-    ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery();
-    //添加查询条件
-    query.processDefinitionKey("process");//通过key获取
+	}
+
+	/**
+	 * 启动一个流程
+	 */
+	@Test
+	public void startUp() {
+		Map<String, Object> variables = new HashMap<String, Object>();
+		variables.put("employeeName", "张三");//张三
+		variables.put("numberOfDays", new Integer(4));//请假四天
+		variables.put("vacationMotivation", "太累了");//原因
+		ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("vacationRequest", variables);
+		System.out.println(runtimeService.createProcessInstanceQuery().count());
+	}
+
+	/**---------请假流程------------*/
+
+	/**
+	 * 完成流程
+	 */
+	@Test
+	public void complete() {
+		List<Task> taskList = taskService.createTaskQuery().taskCandidateGroup("management").list();
+		for (Task task : taskList) {
+			System.out.println(task.getId());
+			System.out.println(task.getName());
+			System.out.println(task.getAssignee());
+		}
+		Task task = taskList.get(0);
+		Map<String, Object> taskVariables = new HashMap<String, Object>();
+		taskVariables.put("vacationApproved", "false");
+		taskVariables.put("managerMotivation", "我们时间很紧！");
+		taskService.complete(task.getId(), taskVariables);
+	}
+
+	/**
+	 * 激活、挂起
+	 */
+	@Test
+	public void gq() {
+		repositoryService.suspendProcessDefinitionByKey("vacationRequest");
+		try {
+			runtimeService.startProcessInstanceByKey("vacationRequest");
+		} catch (ActivitiException e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 发布流程
+	 */
+	@Test
+	public void leaveStart() {
+		//InputStream in = this.getClass().getClassLoader().getResourceAsStream("bpmn/leave.zip");
+		// ZipInputStream zipInputStream = new ZipInputStream(in);
+		//使用deploy方法发布流程
+		Deployment deployment = repositoryService.createDeployment()
+			///.addZipInputStream(zipInputStream)
+			.addClasspathResource("bpmn/leave.bpmn")
+			.addClasspathResource("bpmn/leave.png")
+			.name("请假流程")
+			.deploy();
+		System.out.println("流程id:" + deployment.getId());
+		System.out.println("流程名称:" + deployment.getName());
+	}
+
+	/**
+	 * 获取流程详细信息
+	 */
+	@Test
+	public void queryProcdef() {
+		//创建查询对象
+		ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery();
+		//添加查询条件
+		query.processDefinitionKey("process");//通过key获取
 //     .processDefinitionName("Myleave");//通过name获取
-    // .orderByProcessDefinitionId()//根据ID排序
-    //执行查询获取流程定义明细
-    List<ProcessDefinition> pds = query.list();
-    for (ProcessDefinition pd : pds) {
-      System.out.println("ID:"+pd.getId()+"\nNAME:"+pd.getName()+"\nKEY:"+pd.getKey()+"\nVERSION:"+pd.getVersion()+""
-          + "\nRESOURCE_NAME:"+pd.getResourceName()+",DGRM_RESOURCE_NAME:"+pd.getDiagramResourceName());
-    }
-  }
-
-  /**
-   * 发布流程 根据流程定义表的key 也就是 xml中的 id
-   *
-   * 绑定 userid 并且获取流程定义id 插入到请假表中
-   */
-  @Test
-  public void startFlow(){
-    Map<String, Object> variables=new HashMap<>();
-    variables.put("userId","2211fec3e17c11e795ed201a068c6482");
-    variables.put("userRole","0ea934e5e55411e7b983201a068c6482");
-    variables.put("hrRole","2619a672e53811e7b983201a068c6482");
-    variables.put("msg","请假一天");
-    ProcessInstance processInstance=runtimeService.startProcessInstanceByKey("process",variables);
-    //System.out.println("id:"+processInstance.getId()+",activitiId:"+processInstance.getActivityId());
-    System.out.println("流程实例id:"+processInstance.getId());
-    System.out.println("流程定义id:"+processInstance.getProcessDefinitionId());
-
-  }
-
-  @Test
-  public void queryTask(){
-    List<Task> taskList=taskService.createTaskQuery().taskAssignee("张三")
-        .list();
-    for(Task task:taskList){
-      System.out.println("ID:"+task.getId()+"\n姓名:"+task.getName()+"\n接收人:"+task.getAssignee()+"\n开始时间:"+task.getCreateTime());
-    }
-
-  }
-
-  /**
-   * 完成审批
-   */
-  @Test
-  public void startTask(){
-    //taskId 就是查询任务中的 ID
-    String taskId = "30002";
-    //完成请假申请任务
-    taskService.complete(taskId );
-  }
-
-  @Test
-  public void queryTaskBoss(){
-    List<Task> taskList=taskService.createTaskQuery().taskAssignee("老板")
-        .list();
-    for(Task task:taskList){
-      System.out.println("ID:"+task.getId()+",姓名:"+task.getName()+",接收人:"+task.getAssignee()+",开始时间:"+task.getCreateTime());
-    }
-
-  }
-  /**
-   * 完成审批
-   */
-  @Test
-  public void startTaskBoss(){
-    //taskId 就是查询任务中的 ID
-    String taskId = "82502";
-    //完成请假申请任务
-    taskService.complete(taskId );
-  }
-
-  @Test
-  public void isRun(){
-    ProcessInstance instance= runtimeService.createProcessInstanceQuery()
-        .processInstanceId("25001").singleResult();
-    if(instance!=null){
-      System.out.println("流程正在执行");
-    }else{
-      System.out.println("流程执行完毕");
-
-    }
-  }
-
-  @Test
-  public void history(){
-   List<HistoricTaskInstance> instances= historyService.createHistoricTaskInstanceQuery()//创建历史实例查询
-        .processInstanceId("25001") //流程实例id
-        .finished().list();//已经完成流程实例
-    for(HistoricTaskInstance hTask:instances){
-      System.out.println("历史id:"+hTask.getId());
-      System.out.println("流程实例id:"+hTask.getProcessInstanceId());
-      System.out.println("任务名称:"+hTask.getName());
-      System.out.println("办理人:"+hTask.getAssignee());
-    }
-  }
-
-  @Test
-  public void getDay(){
-
-    Map<String,Object> map =taskService.getVariables("80008");
-    System.out.println(map.get("userId"));
-    System.out.println(map.get("msg"));
-  }
-
-  @Test
-  public void getTask(){
-    List<Task> taskList=taskService
-        .createTaskQuery().taskCandidateUser("acfc0e9232f54732a5d9ffe9071bf572").list();//.taskAssignee("王五").list();
-
-    for(Task task:taskList){
-      System.out.println("任务id:"+task.getId());
-      System.out.println("任务名称:"+task.getName());
-      System.out.println("创建时间:"+task.getCreateTime());
-      System.out.println("委派人:"+task.getAssignee());
-      System.out.println("流程实例id:"+task.getProcessInstanceId());
-    }
-  }
-
-  @Test
-  public void getMsg(){
+		// .orderByProcessDefinitionId()//根据ID排序
+		//执行查询获取流程定义明细
+		List<ProcessDefinition> pds = query.list();
+		for (ProcessDefinition pd : pds) {
+			System.out.println("ID:" + pd.getId() + "\nNAME:" + pd.getName() + "\nKEY:" + pd.getKey() + "\nVERSION:" + pd.getVersion() + ""
+				+ "\nRESOURCE_NAME:" + pd.getResourceName() + ",DGRM_RESOURCE_NAME:" + pd.getDiagramResourceName());
+		}
+	}
+
+	/**
+	 * 发布流程 根据流程定义表的key 也就是 xml中的 id
+	 * <p>
+	 * 绑定 userid 并且获取流程定义id 插入到请假表中
+	 */
+	@Test
+	public void startFlow() {
+		Map<String, Object> variables = new HashMap<>();
+		variables.put("userId", "2211fec3e17c11e795ed201a068c6482");
+		variables.put("userRole", "0ea934e5e55411e7b983201a068c6482");
+		variables.put("hrRole", "2619a672e53811e7b983201a068c6482");
+		variables.put("msg", "请假一天");
+		ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("process", variables);
+		//System.out.println("id:"+processInstance.getId()+",activitiId:"+processInstance.getActivityId());
+		System.out.println("流程实例id:" + processInstance.getId());
+		System.out.println("流程定义id:" + processInstance.getProcessDefinitionId());
+
+	}
+
+	@Test
+	public void queryTask() {
+		List<Task> taskList = taskService.createTaskQuery().taskAssignee("张三")
+			.list();
+		for (Task task : taskList) {
+			System.out.println("ID:" + task.getId() + "\n姓名:" + task.getName() + "\n接收人:" + task.getAssignee() + "\n开始时间:" + task.getCreateTime());
+		}
+
+	}
+
+	/**
+	 * 完成审批
+	 */
+	@Test
+	public void startTask() {
+		//taskId 就是查询任务中的 ID
+		String taskId = "30002";
+		//完成请假申请任务
+		taskService.complete(taskId);
+	}
+
+	@Test
+	public void queryTaskBoss() {
+		List<Task> taskList = taskService.createTaskQuery().taskAssignee("老板")
+			.list();
+		for (Task task : taskList) {
+			System.out.println("ID:" + task.getId() + ",姓名:" + task.getName() + ",接收人:" + task.getAssignee() + ",开始时间:" + task.getCreateTime());
+		}
+
+	}
+
+	/**
+	 * 完成审批
+	 */
+	@Test
+	public void startTaskBoss() {
+		//taskId 就是查询任务中的 ID
+		String taskId = "82502";
+		//完成请假申请任务
+		taskService.complete(taskId);
+	}
+
+	@Test
+	public void isRun() {
+		ProcessInstance instance = runtimeService.createProcessInstanceQuery()
+			.processInstanceId("25001").singleResult();
+		if (instance != null) {
+			System.out.println("流程正在执行");
+		} else {
+			System.out.println("流程执行完毕");
+
+		}
+	}
+
+	@Test
+	public void history() {
+		List<HistoricTaskInstance> instances = historyService.createHistoricTaskInstanceQuery()//创建历史实例查询
+			.processInstanceId("25001") //流程实例id
+			.finished().list();//已经完成流程实例
+		for (HistoricTaskInstance hTask : instances) {
+			System.out.println("历史id:" + hTask.getId());
+			System.out.println("流程实例id:" + hTask.getProcessInstanceId());
+			System.out.println("任务名称:" + hTask.getName());
+			System.out.println("办理人:" + hTask.getAssignee());
+		}
+	}
+
+	@Test
+	public void getDay() {
+
+		Map<String, Object> map = taskService.getVariables("80008");
+		System.out.println(map.get("userId"));
+		System.out.println(map.get("msg"));
+	}
+
+	@Test
+	public void getTask() {
+		List<Task> taskList = taskService
+			.createTaskQuery().taskCandidateUser("acfc0e9232f54732a5d9ffe9071bf572").list();//.taskAssignee("王五").list();
+
+		for (Task task : taskList) {
+			System.out.println("任务id:" + task.getId());
+			System.out.println("任务名称:" + task.getName());
+			System.out.println("创建时间:" + task.getCreateTime());
+			System.out.println("委派人:" + task.getAssignee());
+			System.out.println("流程实例id:" + task.getProcessInstanceId());
+		}
+	}
+
+	@Test
+	public void getMsg() {
    /* Map<String,Object> map =taskService.getVariables("70002");
     System.out.println(map.get("mesage"));*/
     /*List<Task> taskList=taskService.createTaskQuery()
@@ -286,79 +286,72 @@ public class ActivitiDemo {
         .unfinished()//未完成的活动(任务)
         .singleResult();
     System.out.println(hai);*/
-   String deploymentId="90004";
-
-    ProcessDefinition processDefinition=repositoryService
-        .createProcessDefinitionQuery().deploymentId(deploymentId).singleResult();
-    ProcessDefinitionEntity processDefinitionEntity=(ProcessDefinitionEntity)((RepositoryServiceImpl) repositoryService)
-        .getDeployedProcessDefinition(processDefinition.getId());
-    List<ActivityImpl> activityList=processDefinitionEntity.getActivities();
-
-
-
-
-    for(ActivityImpl activiti:activityList) {
-      System.out.println("节点ID:"+activiti.getId());
-      System.out.println("节点名称:"+activiti.getProperty("name"));
-    }
-}
-
-  /**
-   * 根据 流程部署id和资源文件名获取图片
-   * @throws Exception
-   */
-  @Test
-  public void imageById()throws Exception{
-    InputStream inputStream=repositoryService.getResourceAsStream("12501","bpmn/leave.png");
-    FileOutputStream outputStream=new FileOutputStream("F:/a.png");
-    byte[] b=new byte[1024];
-    int red=inputStream.read(b);
-    while(red!=-1){
-      outputStream.write(b,0,red);
-      red=inputStream.read(b);
-    }
-    outputStream.write(b);
-    inputStream.close();
-    outputStream.close();
-  }
-
-  @Test
-  public void del(){
-   repositoryService.deleteDeployment("137534", true); // 默认是false true就是级联删除
-    System.out.println("刪除流程定义");
-  }
-  @Autowired
-  ProcessEngineFactoryBean processEngine;
-
-  @Autowired
-  ProcessEngineConfiguration processEngineConfiguration;
-  @Test
-  public void image() throws Exception {
-    String processInstanceId="147540";
-    ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
-    BpmnModel bpmnModel = repositoryService.getBpmnModel(processInstance.getProcessDefinitionId());
-    List<String> activeActivityIds = runtimeService.getActiveActivityIds(processInstanceId);
-    processEngineConfiguration = processEngine.getProcessEngineConfiguration();
-    Context.setProcessEngineConfiguration((ProcessEngineConfigurationImpl) processEngineConfiguration);
-    ProcessDiagramGenerator diagramGenerator = processEngineConfiguration.getProcessDiagramGenerator();
-    List<String> activeIds = this.runtimeService.getActiveActivityIds(processInstance.getId());
-
-    InputStream imageStream=diagramGenerator.generateDiagram(
-        bpmnModel, "png",
-        activeIds, Collections.<String>emptyList(),
-        processEngine.getProcessEngineConfiguration().getActivityFontName(),
-        processEngine.getProcessEngineConfiguration().getLabelFontName(),
-        "宋体",
-        null, 1.0);
-    byte[] b = new byte[1024];
-    int len;
-    FileOutputStream outputStream=new FileOutputStream("F:/1.png");
-    while ((len = imageStream.read(b, 0, 1024)) != -1) {
-      outputStream.write(b,0,len);
-    }
-  }
-
-
+		String deploymentId = "90004";
+
+		ProcessDefinition processDefinition = repositoryService
+			.createProcessDefinitionQuery().deploymentId(deploymentId).singleResult();
+		ProcessDefinitionEntity processDefinitionEntity = (ProcessDefinitionEntity) ((RepositoryServiceImpl) repositoryService)
+			.getDeployedProcessDefinition(processDefinition.getId());
+		List<ActivityImpl> activityList = processDefinitionEntity.getActivities();
+
+
+		for (ActivityImpl activiti : activityList) {
+			System.out.println("节点ID:" + activiti.getId());
+			System.out.println("节点名称:" + activiti.getProperty("name"));
+		}
+	}
+
+	/**
+	 * 根据 流程部署id和资源文件名获取图片
+	 *
+	 * @throws Exception
+	 */
+	@Test
+	public void imageById() throws Exception {
+		InputStream inputStream = repositoryService.getResourceAsStream("12501", "bpmn/leave.png");
+		FileOutputStream outputStream = new FileOutputStream("F:/a.png");
+		byte[] b = new byte[1024];
+		int red = inputStream.read(b);
+		while (red != -1) {
+			outputStream.write(b, 0, red);
+			red = inputStream.read(b);
+		}
+		outputStream.write(b);
+		inputStream.close();
+		outputStream.close();
+	}
+
+	@Test
+	public void del() {
+		repositoryService.deleteDeployment("137534", true); // 默认是false true就是级联删除
+		System.out.println("刪除流程定义");
+	}
+
+	@Test
+	public void image() throws Exception {
+		String processInstanceId = "147540";
+		ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+		BpmnModel bpmnModel = repositoryService.getBpmnModel(processInstance.getProcessDefinitionId());
+		List<String> activeActivityIds = runtimeService.getActiveActivityIds(processInstanceId);
+		processEngineConfiguration = processEngine.getProcessEngineConfiguration();
+		Context.setProcessEngineConfiguration((ProcessEngineConfigurationImpl) processEngineConfiguration);
+		ProcessDiagramGenerator diagramGenerator = processEngineConfiguration.getProcessDiagramGenerator();
+		List<String> activeIds = this.runtimeService.getActiveActivityIds(processInstance.getId());
+
+		InputStream imageStream = diagramGenerator.generateDiagram(
+			bpmnModel, "png",
+			activeIds, Collections.<String>emptyList(),
+			processEngine.getProcessEngineConfiguration().getActivityFontName(),
+			processEngine.getProcessEngineConfiguration().getLabelFontName(),
+			"宋体",
+			null, 1.0);
+		byte[] b = new byte[1024];
+		int len;
+		FileOutputStream outputStream = new FileOutputStream("F:/1.png");
+		while ((len = imageStream.read(b, 0, 1024)) != -1) {
+			outputStream.write(b, 0, len);
+		}
+	}
 
 
 }
diff --git a/len-web/src/main/java/test/ActivitiGateWay.java b/len-web/src/main/java/test/ActivitiGateWay.java
index 9fa6048..ff2cc88 100644
--- a/len-web/src/main/java/test/ActivitiGateWay.java
+++ b/len-web/src/main/java/test/ActivitiGateWay.java
@@ -1,9 +1,6 @@
 package test;
 
 import com.len.LenApplication;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.util.List;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.RuntimeService;
@@ -21,8 +18,11 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.util.List;
+
 /**
- *
  * 本demo 根据官网doc教程 address：http://www.mossle.com/docs/activiti/index.html
  * 网关
  */
@@ -31,146 +31,148 @@ import org.springframework.test.context.web.WebAppConfiguration;
 @WebAppConfiguration
 public class ActivitiGateWay {
 
-  @Autowired
-  RuntimeService runtimeService;
-
-  @Autowired
-  RepositoryService repositoryService;
-
-  @Autowired
-  TaskService taskService;
-
-  @Autowired
-  HistoryService historyService;
-
-
-  /**---------请假流程------------*/
-  /**
-   * 发布流程
-   */
-  @Test
-  public void leaveStart(){
-    //使用deploy方法发布流程
-    Deployment deployment=repositoryService.createDeployment()
-        .addClasspathResource("bpmn/leave2.bpmn")
-        .addClasspathResource("bpmn/leave2.png")
-        .name("请假流程2")
-        .deploy();
-    System.out.println("流程id:"+deployment.getId());
-    System.out.println("流程名称:"+deployment.getName());
-  }
-
-  /**
-   * 获取流程详细信息
-   */
-  @Test
-  public void queryProcdef(){
-    //创建查询对象
-    ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery();
-    //添加查询条件
-    query.processDefinitionKey("studentLeaveProcess2");//通过key获取
-    //执行查询获取流程定义明细
-    List<ProcessDefinition> pds = query.list();
-    for (ProcessDefinition pd : pds) {
-      System.out.println("ID:"+pd.getId()+"\nNAME:"+pd.getName()+"\nKEY:"+pd.getKey()+"\nVERSION:"+pd.getVersion()+""
-          + "\nRESOURCE_NAME:"+pd.getResourceName()+",DGRM_RESOURCE_NAME:"+pd.getDiagramResourceName());
-    }
-  }
-
-  /**
-   * 发布流程 根据流程定义表的key 也就是 xml中的 id
-   */
-  @Test
-  public void startFlow(){
-    ProcessInstance processInstance=runtimeService.startProcessInstanceByKey("studentLeaveProcess2");
-    System.out.println("流程实例id:"+processInstance.getId());
-    System.out.println("流程定义id:"+processInstance.getProcessDefinitionId());
-
-  }
-
-  @Test
-  public void queryTask(){
-    List<Task> taskList=taskService.createTaskQuery().taskAssignee("张三")
-        .list();
-    for(Task task:taskList){
-      System.out.println("ID:"+task.getId()+"\n姓名:"+task.getName()+"\n接收人:"+task.getAssignee()+"\n开始时间:"+task.getCreateTime());
-    }
-
-  }
-
-  /**
-   * 完成审批
-   */
-  @Test
-  public void startTask(){
-    //taskId 就是查询任务中的 ID
-    String taskId = "30002";
-    //完成请假申请任务
-    taskService.complete(taskId );
-  }
-
-  @Test
-  public void queryTaskBoss(){
-    List<Task> taskList=taskService.createTaskQuery().taskAssignee("老板")
-        .list();
-    for(Task task:taskList){
-      System.out.println("ID:"+task.getId()+",姓名:"+task.getName()+",接收人:"+task.getAssignee()+",开始时间:"+task.getCreateTime());
-    }
-
-  }
-  /**
-   * 完成审批
-   */
-  @Test
-  public void startTaskBoss(){
-    //taskId 就是查询任务中的 ID
-    String taskId = "22502";
-    //完成请假申请任务
-    taskService.complete(taskId );
-  }
-
-  @Test
-  public void isRun(){
-    ProcessInstance instance= runtimeService.createProcessInstanceQuery()
-        .processInstanceId("25001").singleResult();
-    if(instance!=null){
-      System.out.println("流程正在执行");
-    }else{
-      System.out.println("流程执行完毕");
-
-    }
-  }
-
-  @Test
-  public void history(){
-   List<HistoricTaskInstance> instances= historyService.createHistoricTaskInstanceQuery()//创建历史实例查询
-        .processInstanceId("25001") //流程实例id
-        .finished().list();//已经完成流程实例
-    for(HistoricTaskInstance hTask:instances){
-      System.out.println("历史id:"+hTask.getId());
-      System.out.println("流程实例id:"+hTask.getProcessInstanceId());
-      System.out.println("任务名称:"+hTask.getName());
-      System.out.println("办理人:"+hTask.getAssignee());
-    }
-  }
-
-  /**
-   * 根据 流程部署id和资源文件名获取图片
-   * @throws Exception
-   */
-  @Test
-  public void imageById()throws Exception{
-    InputStream inputStream=repositoryService.getResourceAsStream("12501","bpmn/leave2.png");
-    FileOutputStream outputStream=new FileOutputStream("F:/a.png");
-    byte[] b=new byte[1024];
-    int red=inputStream.read(b);
-    while(red!=-1){
-      outputStream.write(b,0,red);
-      red=inputStream.read(b);
-    }
-    outputStream.write(b);
-    inputStream.close();
-    outputStream.close();
-  }
+	@Autowired
+	RuntimeService runtimeService;
+
+	@Autowired
+	RepositoryService repositoryService;
+
+	@Autowired
+	TaskService taskService;
+
+	@Autowired
+	HistoryService historyService;
+
+
+	/**---------请假流程------------*/
+	/**
+	 * 发布流程
+	 */
+	@Test
+	public void leaveStart() {
+		//使用deploy方法发布流程
+		Deployment deployment = repositoryService.createDeployment()
+			.addClasspathResource("bpmn/leave2.bpmn")
+			.addClasspathResource("bpmn/leave2.png")
+			.name("请假流程2")
+			.deploy();
+		System.out.println("流程id:" + deployment.getId());
+		System.out.println("流程名称:" + deployment.getName());
+	}
+
+	/**
+	 * 获取流程详细信息
+	 */
+	@Test
+	public void queryProcdef() {
+		//创建查询对象
+		ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery();
+		//添加查询条件
+		query.processDefinitionKey("studentLeaveProcess2");//通过key获取
+		//执行查询获取流程定义明细
+		List<ProcessDefinition> pds = query.list();
+		for (ProcessDefinition pd : pds) {
+			System.out.println("ID:" + pd.getId() + "\nNAME:" + pd.getName() + "\nKEY:" + pd.getKey() + "\nVERSION:" + pd.getVersion() + ""
+				+ "\nRESOURCE_NAME:" + pd.getResourceName() + ",DGRM_RESOURCE_NAME:" + pd.getDiagramResourceName());
+		}
+	}
+
+	/**
+	 * 发布流程 根据流程定义表的key 也就是 xml中的 id
+	 */
+	@Test
+	public void startFlow() {
+		ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("studentLeaveProcess2");
+		System.out.println("流程实例id:" + processInstance.getId());
+		System.out.println("流程定义id:" + processInstance.getProcessDefinitionId());
+
+	}
+
+	@Test
+	public void queryTask() {
+		List<Task> taskList = taskService.createTaskQuery().taskAssignee("张三")
+			.list();
+		for (Task task : taskList) {
+			System.out.println("ID:" + task.getId() + "\n姓名:" + task.getName() + "\n接收人:" + task.getAssignee() + "\n开始时间:" + task.getCreateTime());
+		}
+
+	}
+
+	/**
+	 * 完成审批
+	 */
+	@Test
+	public void startTask() {
+		//taskId 就是查询任务中的 ID
+		String taskId = "30002";
+		//完成请假申请任务
+		taskService.complete(taskId);
+	}
+
+	@Test
+	public void queryTaskBoss() {
+		List<Task> taskList = taskService.createTaskQuery().taskAssignee("老板")
+			.list();
+		for (Task task : taskList) {
+			System.out.println("ID:" + task.getId() + ",姓名:" + task.getName() + ",接收人:" + task.getAssignee() + ",开始时间:" + task.getCreateTime());
+		}
+
+	}
+
+	/**
+	 * 完成审批
+	 */
+	@Test
+	public void startTaskBoss() {
+		//taskId 就是查询任务中的 ID
+		String taskId = "22502";
+		//完成请假申请任务
+		taskService.complete(taskId);
+	}
+
+	@Test
+	public void isRun() {
+		ProcessInstance instance = runtimeService.createProcessInstanceQuery()
+			.processInstanceId("25001").singleResult();
+		if (instance != null) {
+			System.out.println("流程正在执行");
+		} else {
+			System.out.println("流程执行完毕");
+
+		}
+	}
+
+	@Test
+	public void history() {
+		List<HistoricTaskInstance> instances = historyService.createHistoricTaskInstanceQuery()//创建历史实例查询
+			.processInstanceId("25001") //流程实例id
+			.finished().list();//已经完成流程实例
+		for (HistoricTaskInstance hTask : instances) {
+			System.out.println("历史id:" + hTask.getId());
+			System.out.println("流程实例id:" + hTask.getProcessInstanceId());
+			System.out.println("任务名称:" + hTask.getName());
+			System.out.println("办理人:" + hTask.getAssignee());
+		}
+	}
+
+	/**
+	 * 根据 流程部署id和资源文件名获取图片
+	 *
+	 * @throws Exception
+	 */
+	@Test
+	public void imageById() throws Exception {
+		InputStream inputStream = repositoryService.getResourceAsStream("12501", "bpmn/leave2.png");
+		FileOutputStream outputStream = new FileOutputStream("F:/a.png");
+		byte[] b = new byte[1024];
+		int red = inputStream.read(b);
+		while (red != -1) {
+			outputStream.write(b, 0, red);
+			red = inputStream.read(b);
+		}
+		outputStream.write(b);
+		inputStream.close();
+		outputStream.close();
+	}
 
 }
diff --git a/len-web/src/main/java/test/ActivitiVariable.java b/len-web/src/main/java/test/ActivitiVariable.java
index 0a94d25..5bd3d9c 100644
--- a/len-web/src/main/java/test/ActivitiVariable.java
+++ b/len-web/src/main/java/test/ActivitiVariable.java
@@ -1,10 +1,6 @@
 package test;
 
 import com.len.LenApplication;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import org.activiti.engine.HistoryService;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.RuntimeService;
@@ -21,108 +17,112 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = LenApplication.class)
 @WebAppConfiguration
 public class ActivitiVariable {
 
-  @Autowired
-  RuntimeService runtimeService;
-
-  @Autowired
-  RepositoryService repositoryService;
-
-  @Autowired
-  TaskService taskService;
-
-  @Autowired
-  HistoryService historyService;
-
-  /**
-   * 发布流程
-   */
-  @Test
-  public void leaveStart(){
-    //使用deploy方法发布流程
-    Deployment deployment=repositoryService.createDeployment()
-        .addClasspathResource("bpmn/leave.bpmn")
-        .addClasspathResource("bpmn/leave.png")
-        .name("请假流程")
-        .deploy();
-    System.out.println("流程id:"+deployment.getId());
-    System.out.println("流程名称:"+deployment.getName());
-  }
-
-  /**
-   * 获取流程详细信息
-   */
-  @Test
-  public void queryProcdef(){
-    //创建查询对象
-    ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery();
-    //添加查询条件
-    query.processDefinitionKey("studentLeaveProcess");//通过key获取
-    List<ProcessDefinition> pds = query.list();
-    for (ProcessDefinition pd : pds) {
-      System.out.println("ID:"+pd.getId()+"\nNAME:"+pd.getName()+"\nKEY:"+pd.getKey()+"\nVERSION:"+pd.getVersion()+""
-          + "\nRESOURCE_NAME:"+pd.getResourceName()+",DGRM_RESOURCE_NAME:"+pd.getDiagramResourceName());
-    }
-  }
-
-  /**
-   * 发布流程
-   */
-  @Test
-  public void startFlow(){
-    ProcessInstance processInstance=runtimeService.startProcessInstanceByKey("studentLeaveProcess");
-    System.out.println("流程实例id:"+processInstance.getId());
-    System.out.println("流程定义id:"+processInstance.getProcessDefinitionId());
-
-  }
-
-  @Test
-  public void queryTask(){
-    List<Task> taskList=taskService.createTaskQuery().taskAssignee("李四")
-        .list();
-    for(Task task:taskList){
-      System.out.println("ID:"+task.getId()+"\n姓名:"+task.getName()+"\n接收人:"+task.getAssignee()+"\n开始时间:"+task.getCreateTime());
-    }
-
-  }
-
-  /**
-   * 完成审批
-   */
-  @Test
-  public void startTask(){
-    //taskId 就是查询任务中的 ID
-    String taskId = "55002";
-    //完成请假申请任务
-    taskService.complete(taskId );
-  }
-
-  @Test
-  public void setMsg(){
-    Map<String,Object> objectMap=new HashMap<>();
-    objectMap.put("day",5);
-    objectMap.put("date",new Date());
-    objectMap.put("reason","测试请假");
-    taskService.setVariables("47504",objectMap);
-  }
-
-  /**
-   * 运行时设置任务变量 taseService.setVariables
-   * 也可以设置流程变量  runtimeService.setVariables 效果一样
-   * 流程启动设置流程变量
-   *
-   */
-  @Test
-  public void getMsg(){
-    Map<String,Object> objectMap=taskService.getVariables("55002");
-    //runtimeService.setVariables();
-    System.out.println(objectMap.get("day"));
-    System.out.println(objectMap.get("date"));
-    System.out.println(objectMap.get("reason"));
-  }
+	@Autowired
+	RuntimeService runtimeService;
+
+	@Autowired
+	RepositoryService repositoryService;
+
+	@Autowired
+	TaskService taskService;
+
+	@Autowired
+	HistoryService historyService;
+
+	/**
+	 * 发布流程
+	 */
+	@Test
+	public void leaveStart() {
+		//使用deploy方法发布流程
+		Deployment deployment = repositoryService.createDeployment()
+			.addClasspathResource("bpmn/leave.bpmn")
+			.addClasspathResource("bpmn/leave.png")
+			.name("请假流程")
+			.deploy();
+		System.out.println("流程id:" + deployment.getId());
+		System.out.println("流程名称:" + deployment.getName());
+	}
+
+	/**
+	 * 获取流程详细信息
+	 */
+	@Test
+	public void queryProcdef() {
+		//创建查询对象
+		ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery();
+		//添加查询条件
+		query.processDefinitionKey("studentLeaveProcess");//通过key获取
+		List<ProcessDefinition> pds = query.list();
+		for (ProcessDefinition pd : pds) {
+			System.out.println("ID:" + pd.getId() + "\nNAME:" + pd.getName() + "\nKEY:" + pd.getKey() + "\nVERSION:" + pd.getVersion() + ""
+				+ "\nRESOURCE_NAME:" + pd.getResourceName() + ",DGRM_RESOURCE_NAME:" + pd.getDiagramResourceName());
+		}
+	}
+
+	/**
+	 * 发布流程
+	 */
+	@Test
+	public void startFlow() {
+		ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("studentLeaveProcess");
+		System.out.println("流程实例id:" + processInstance.getId());
+		System.out.println("流程定义id:" + processInstance.getProcessDefinitionId());
+
+	}
+
+	@Test
+	public void queryTask() {
+		List<Task> taskList = taskService.createTaskQuery().taskAssignee("李四")
+			.list();
+		for (Task task : taskList) {
+			System.out.println("ID:" + task.getId() + "\n姓名:" + task.getName() + "\n接收人:" + task.getAssignee() + "\n开始时间:" + task.getCreateTime());
+		}
+
+	}
+
+	/**
+	 * 完成审批
+	 */
+	@Test
+	public void startTask() {
+		//taskId 就是查询任务中的 ID
+		String taskId = "55002";
+		//完成请假申请任务
+		taskService.complete(taskId);
+	}
+
+	@Test
+	public void setMsg() {
+		Map<String, Object> objectMap = new HashMap<>();
+		objectMap.put("day", 5);
+		objectMap.put("date", new Date());
+		objectMap.put("reason", "测试请假");
+		taskService.setVariables("47504", objectMap);
+	}
+
+	/**
+	 * 运行时设置任务变量 taseService.setVariables
+	 * 也可以设置流程变量  runtimeService.setVariables 效果一样
+	 * 流程启动设置流程变量
+	 */
+	@Test
+	public void getMsg() {
+		Map<String, Object> objectMap = taskService.getVariables("55002");
+		//runtimeService.setVariables();
+		System.out.println(objectMap.get("day"));
+		System.out.println(objectMap.get("date"));
+		System.out.println(objectMap.get("reason"));
+	}
 }
diff --git a/len-web/src/main/java/test/BlogTest.java b/len-web/src/main/java/test/BlogTest.java
index ff59eea..ee651d1 100644
--- a/len-web/src/main/java/test/BlogTest.java
+++ b/len-web/src/main/java/test/BlogTest.java
@@ -24,26 +24,26 @@ import java.util.UUID;
 @WebAppConfiguration
 public class BlogTest {
 
-    @Autowired
-    private BlogTagService blogLabelService;
+	@Autowired
+	private BlogTagService blogLabelService;
 
-    @Autowired
-    private BlogCategoryService categoryService;
+	@Autowired
+	private BlogCategoryService categoryService;
 
-    @Autowired
-    private ArticleCategoryService articleCategoryService;
+	@Autowired
+	private ArticleCategoryService articleCategoryService;
 
-    @Autowired
-    private SysUserService sysUserService;
+	@Autowired
+	private SysUserService sysUserService;
 
-    @Autowired
-    private BlogTagService tagService;
+	@Autowired
+	private BlogTagService tagService;
 
-    /**
-     * 新建标签数据
-     */
-    @Test
-    public void insertTestData() {
+	/**
+	 * 新建标签数据
+	 */
+	@Test
+	public void insertTestData() {
        /* String label[]={"java","spring","spring boot","linux","spring cloud",
                 "vue","mybatis","git","sql","quartz","centos7","oauth2.0"
         ,"spring security","redis","shiro"};
@@ -59,25 +59,25 @@ public class BlogTest {
        /* boolean isOk = blogLabelService.insertList(blogLabels) > 0;
         System.out.println("录入数据："+isOk);*/
 
-    }
+	}
 
-    @Test
-    public void insertCategory() {
-        String[] cate = {"Java", "Linux", "架构", "其他"};
-        List<BlogCategory> categories = new ArrayList<>();
-        int i = 0;
-        for (String aCate : cate) {
-            BlogCategory category = new BlogCategory();
-            category.setId(UUID.randomUUID().toString().replace("-", ""));
-            category.setSequence((byte) ++i);
-            category.setName(aCate);
-            category.setCode(aCate);
-            category.setCreateDate(new Date());
-            category.setCreateBy("zxm");
-            category.setParentId("0");
-            categories.add(category);
+	@Test
+	public void insertCategory() {
+		String[] cate = {"Java", "Linux", "架构", "其他"};
+		List<BlogCategory> categories = new ArrayList<>();
+		int i = 0;
+		for (String aCate : cate) {
+			BlogCategory category = new BlogCategory();
+			category.setId(UUID.randomUUID().toString().replace("-", ""));
+			category.setSequence((byte) ++i);
+			category.setName(aCate);
+			category.setCode(aCate);
+			category.setCreateDate(new Date());
+			category.setCreateBy("zxm");
+			category.setParentId("0");
+			categories.add(category);
 
-        }
-        categoryService.saveBatch(categories);
-    }
+		}
+		categoryService.saveBatch(categories);
+	}
 }
diff --git a/len-web/src/main/java/test/BootTest.java b/len-web/src/main/java/test/BootTest.java
index 3d1ef4e..6a1d90f 100644
--- a/len-web/src/main/java/test/BootTest.java
+++ b/len-web/src/main/java/test/BootTest.java
@@ -1,39 +1,38 @@
 package test;
 
+import com.len.LenApplication;
+import com.len.entity.SysUser;
+import com.len.redis.RedisService;
+import com.len.service.SysUserService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.len.LenApplication;
-import com.len.entity.SysUser;
-import com.len.redis.RedisService;
-import com.len.service.SysUserService;
-
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = LenApplication.class,webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(classes = LenApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class BootTest {
 
-    @Autowired
-    SysUserService userService;
+	@Autowired
+	SysUserService userService;
 
-    @Autowired
-    RedisService redisService;
+	@Autowired
+	RedisService redisService;
 
-    @Test
-    public void testStartJob() throws Exception {
-        //12
-        SysUser user = userService.getById("2211fec3e17c11e795ed201a068c6482");
-        System.out.println(user.getUsername());
-    }
+	@Test
+	public void testStartJob() throws Exception {
+		//12
+		SysUser user = userService.getById("2211fec3e17c11e795ed201a068c6482");
+		System.out.println(user.getUsername());
+	}
 
-    @Test
-    public void redisTest() throws InterruptedException {
-        SysUser user=new SysUser();
-        userService.add(user,null);
+	@Test
+	public void redisTest() throws InterruptedException {
+		SysUser user = new SysUser();
+		userService.add(user, null);
 
-    }
+	}
 
-}
\ No newline at end of file
+}
diff --git a/len-web/src/main/java/test/MybatisApp.java b/len-web/src/main/java/test/MybatisApp.java
index 9aa1169..839ee0b 100644
--- a/len-web/src/main/java/test/MybatisApp.java
+++ b/len-web/src/main/java/test/MybatisApp.java
@@ -5,9 +5,9 @@ import org.mybatis.generator.api.ShellRunner;
 
 public class MybatisApp {
 
-  public static void main(String[] args) {
-    args = new String[] { "-configfile", "len-web\\src\\main\\resources\\auto-config\\mybatis-config.xml", "-overwrite" };
-    ShellRunner.main(args);
-  }
+	public static void main(String[] args) {
+		args = new String[]{"-configfile", "len-web\\src\\main\\resources\\auto-config\\mybatis-config.xml", "-overwrite"};
+		ShellRunner.main(args);
+	}
 
 }
diff --git "a/len-web/src/main/len-web\350\257\264\346\230\216.md" "b/len-web/src/main/len-web\350\257\264\346\230\216.md"
index d2abc8b..2cb4519 100644
--- "a/len-web/src/main/len-web\350\257\264\346\230\216.md"
+++ "b/len-web/src/main/len-web\350\257\264\346\230\216.md"
@@ -1,75 +1,76 @@
+# len-webĿ¼�ṹ
 
-# len-webĿ¼�ṹ
-1. Ŀ¼�ṹ
+1. Ŀ¼�ṹ
 
  ```
-   ����src
-   ��  ����main
-   ��      ����java
-   ��      ��  ����com
-   ��      ��  ��  ����len
-   ��      ��  ��      ��  LenApplication.java   ������
-   ��      ��  ��      ��
-   ��      ��  ��      ����config
-   ��      ��  ��              BeanFactoryImpl.java   ��������
-   ��      ��  ��              BeanName.java
-   ��      ��  ��              DruidConfig.java       ����Դ
-   ��      ��  ��              FreeMarkerConfig.java  freemarker����������������
-   ��      ��  ��              FreemarkerShiroConfig.java
-   ��      ��  ��              LenFilter.java
-   ��      ��  ��              LogConfig.java
-   ��      ��  ��              MyBatisPlusConfig.java
-   ��      ��  ��              MyModularRealmAuthenticator.java
-   ��      ��  ��              PageHelperConfig.java
-   ��      ��  ��              ShiroConfig.java
-   ��      ��  ��              ShiroSessionManager.java
-   ��      ��  ��              SocketConfig.java
-   ��      ��  ��              SwaggerConfig.java
-   ��      ��  ��              TransactionalConfig.java
-   ��      ��  ��              WebMvcConfig.java
-   ��      ��  ��              ZBeanFactory.java
-   ��      ��  ��
-   ��      ��  ����test     ���԰����Զ���
-   ��      ��
-   ��      ����resources
-   ��          ��
-   ��          ����auto-config
-   ��          ��      mybatis-config.xml
-   ��          ��
-   ��          ����ehcache
-   ��                  ehcache.xml
-   ��
+   ����src
+   ��  ����main
+   ��      ����java
+   ��      ��  ����com
+   ��      ��  ��  ����len
+   ��      ��  ��      ��  LenApplication.java   ������
+   ��      ��  ��      ��
+   ��      ��  ��      ����config
+   ��      ��  ��              BeanFactoryImpl.java   ��������
+   ��      ��  ��              BeanName.java
+   ��      ��  ��              DruidConfig.java       ����Դ
+   ��      ��  ��              FreeMarkerConfig.java  freemarker����������������
+   ��      ��  ��              FreemarkerShiroConfig.java
+   ��      ��  ��              LenFilter.java
+   ��      ��  ��              LogConfig.java
+   ��      ��  ��              MyBatisPlusConfig.java
+   ��      ��  ��              MyModularRealmAuthenticator.java
+   ��      ��  ��              PageHelperConfig.java
+   ��      ��  ��              ShiroConfig.java
+   ��      ��  ��              ShiroSessionManager.java
+   ��      ��  ��              SocketConfig.java
+   ��      ��  ��              SwaggerConfig.java
+   ��      ��  ��              TransactionalConfig.java
+   ��      ��  ��              WebMvcConfig.java
+   ��      ��  ��              ZBeanFactory.java
+   ��      ��  ��
+   ��      ��  ����test     ���԰����Զ���
+   ��      ��
+   ��      ����resources
+   ��          ��
+   ��          ����auto-config
+   ��          ��      mybatis-config.xml
+   ��          ��
+   ��          ����ehcache
+   ��                  ehcache.xml
+   ��
  ```
 
-## �Ż�sql
-1. ִ��PMD������
+## �Ż�sql
 
-2. ##### ʹ��expl ain�鿴�Լ���д��Sqlִ�������
+1. ִ��PMD������
 
-3. ##### д��Sql����������������ƥ��ԭ��ʹ��������
+2. ##### ʹ��expl ain�鿴�Լ���д��Sqlִ�������
 
-4. ##### ��ѯSQL������Ҫʹ��select *�����Ǿ����ֶ�
+3. ##### д��Sql����������������ƥ��ԭ��ʹ��������
 
-5. ##### where��ʹ��Ĭ��ֵ����null
+4. ##### ��ѯSQL������Ҫʹ��select *�����Ǿ����ֶ�
 
-6. ##### ���Ⱦ�������ģ����ѯ���������ʹ�ã�������ȫģ����ѯ��ҲӦ����������ģ����ѯ�� ��`like ����%��`���ǻ�ʹ�������ģ�
+5. ##### where��ʹ��Ĭ��ֵ����null
 
-7. ##### ������where�Ӿ���ʹ��!=��<>������
+6. ##### ���Ⱦ�������ģ����ѯ���������ʹ�ã�������ȫģ����ѯ��ҲӦ����������ģ����ѯ�� ��`like ����%��`���ǻ�ʹ�������ģ�
 
-   ʹ��`!=`��`<>`�ܿ��ܻ�������ʧЧ
+7. ##### ������where�Ӿ���ʹ��!=��<>������
 
-   Ӧ����������`where`�Ӿ���ʹ��`!=`��`<>`���������������潫����ʹ������������ȫ��ɨ��
+   ʹ��`!=`��`<>`�ܿ��ܻ�������ʧЧ
 
-8. ##### ������where�Ӿ���ʹ�� or ����������    ʹ��union all  ����
+   Ӧ����������`where`�Ӿ���ʹ��`!=`��`<>`���������������潫����ʹ������������ȫ��ɨ��
+
+8. ##### ������where�Ӿ���ʹ�� or ���������� ʹ��union all ����
 
    ```
    SELECT?*?FROM?a WHERE?id=1?UNION?ALL SELECT?*?FROM? a  WHERE?salary=5000 
    ```
 
-   ԭ��
+   ԭ��
 
-   - ʹ��`or`���ܻ�ʹ����ʧЧ���Ӷ�ȫ��ɨ�裻
+	- ʹ��`or`���ܻ�ʹ����ʧЧ���Ӷ�ȫ��ɨ�裻
 
-   - ����`or`û��������`salary`�������������������`id`�������������ߵ�`salary`��ѯ����ʱ��������ȫ��ɨ�裻
+	- ����`or`û��������`salary`�������������������`id`�������������ߵ�`salary`��ѯ����ʱ��������ȫ��ɨ�裻
 
-     ##### 
\ No newline at end of file
+	  #####     
\ No newline at end of file
diff --git a/len-web/src/main/resources/application-mysql-dev.yml b/len-web/src/main/resources/application-mysql-dev.yml
index 2885b1d..b811f50 100644
--- a/len-web/src/main/resources/application-mysql-dev.yml
+++ b/len-web/src/main/resources/application-mysql-dev.yml
@@ -4,32 +4,32 @@ spring:
   main:
     allow-bean-definition-overriding: true
   devtools:
-      restart:
-        enabled: true
+    restart:
+      enabled: true
   datasource:
     druid:
-        url: jdbc:mysql://localhost:3306/lenos?useUnicode=true&characterEncoding=UTF-8
-        username: root
-        password: 123456
-        driver-class-name: com.mysql.jdbc.Driver
-#   redis:
-#     host: 127.0.0.1
-#     port: 6379
-#     timeout: 3000
-#     maxRetryCount: 10
-#     second: 300
-#   session:
-#     store-type: redis
-#   data:
-#     redis:
-#       repositories:
-#         enabled: false
+      url: jdbc:mysql://localhost:3306/lenos?useUnicode=true&characterEncoding=UTF-8
+      username: root
+      password: 123456
+      driver-class-name: com.mysql.jdbc.Driver
+  #   redis:
+  #     host: 127.0.0.1
+  #     port: 6379
+  #     timeout: 3000
+  #     maxRetryCount: 10
+  #     second: 300
+  #   session:
+  #     store-type: redis
+  #   data:
+  #     redis:
+  #       repositories:
+  #         enabled: false
   http:
-      encoding:
-        force: true
-#        需要启动admin模块 来监听
+    encoding:
+      force: true
+  #        需要启动admin模块 来监听
 
-#国际化 多语言配置文件放在 resources/i18n 文件夹下
+  #国际化 多语言配置文件放在 resources/i18n 文件夹下
   messages:
     basename: i18n.message
     encoding: UTF-8
@@ -40,8 +40,8 @@ spring:
       exposure:
         include: "*"
   endpoint:
-      health:
-          show-details: ALWAYS
+    health:
+      show-details: ALWAYS
 eureka:
   client:
     fetch-registry: false
@@ -52,17 +52,17 @@ eureka:
 #     port: 6379
 
 mybatis:
-    type-aliases-package: com.len.entity
-    mapper-locations: classpath*:mapper/*.xml
-    check-config-location: true
+  type-aliases-package: com.len.entity
+  mapper-locations: classpath*:mapper/*.xml
+  check-config-location: true
 
 
 # PageHelperConfig
 pagehelper:
-    helperDialect: mysql
-    reasonable: true
-    supportMethodsArguments: true
-    params: count=countSql
+  helperDialect: mysql
+  reasonable: true
+  supportMethodsArguments: true
+  params: count=countSql
 
 #文件储存路径配置
 lenosp:
diff --git a/len-web/src/main/resources/application-oracle-dev.yml b/len-web/src/main/resources/application-oracle-dev.yml
index debeb4b..c3493ba 100644
--- a/len-web/src/main/resources/application-oracle-dev.yml
+++ b/len-web/src/main/resources/application-oracle-dev.yml
@@ -2,30 +2,30 @@ server:
   port: 8081
 spring:
   datasource:
-        url: jdbc:oracle:thin:@localhost:1521:orcl
-        username: LEN
-        password: 111111
-        # 使用druid数据源
-        type: com.alibaba.druid.pool.DruidDataSource
-#        由于 maven没有 oracle驱动 所以 驱动放在了 db文件夹下面，支持oracle 11g 以及更高版本 如果对配置有疑问
-#        可以加群 137738503 群里有配置好的源码
-        driver-class-name: oracle.jdbc.driver.OracleDriver
-        filters: stat
-        maxActive: 20
-        initialSize: 1
-        maxWait: 60000
-        minIdle: 1
-        timeBetweenEvictionRunsMillis: 60000
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: select 'x'
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        poolPreparedStatements: true
-        maxOpenPreparedStatements: 20
+    url: jdbc:oracle:thin:@localhost:1521:orcl
+    username: LEN
+    password: 111111
+    # 使用druid数据源
+    type: com.alibaba.druid.pool.DruidDataSource
+    #        由于 maven没有 oracle驱动 所以 驱动放在了 db文件夹下面，支持oracle 11g 以及更高版本 如果对配置有疑问
+    #        可以加群 137738503 群里有配置好的源码
+    driver-class-name: oracle.jdbc.driver.OracleDriver
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 60000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: select 'x'
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
   http:
-      encoding:
-        force: true
+    encoding:
+      force: true
   boot:
     admin:
       client:
@@ -33,23 +33,23 @@ spring:
       url: http://localhost:8082
 
 mybatis:
-    type-aliases-package: com.len.entity
-    mapper-locations: classpath*:mapper/*.xml
-    check-config-location: true
+  type-aliases-package: com.len.entity
+  mapper-locations: classpath*:mapper/*.xml
+  check-config-location: true
 
 mapper:
-    mappers:
-        - com.len.base.BaseMapper
-    not-empty: false
-    identity: oracle
+  mappers:
+    - com.len.base.BaseMapper
+  not-empty: false
+  identity: oracle
 
 
 # PageHelperConfig 可以替代此方案
 pagehelper:
-    helperDialect: oracle
-    reasonable: true
-    supportMethodsArguments: true
-    params: count=countSql
+  helperDialect: oracle
+  reasonable: true
+  supportMethodsArguments: true
+  params: count=countSql
 
 lenosp:
   uploadPath: ./file/
diff --git a/len-web/src/main/resources/application-prod.yml b/len-web/src/main/resources/application-prod.yml
index 06078f6..c07f075 100644
--- a/len-web/src/main/resources/application-prod.yml
+++ b/len-web/src/main/resources/application-prod.yml
@@ -2,60 +2,60 @@ server:
   port: 8088
 spring:
   datasource:
-        url: jdbc:mysql://localhost:3306/lenos?useUnicode=true&characterEncoding=UTF-8
-        username: root
-#        password: 123456
-#        password: 1234
-        password: root
-        # 使用druid数据源
-        type: com.alibaba.druid.pool.DruidDataSource
-        driver-class-name: com.mysql.jdbc.Driver
-        filters: stat
-        maxActive: 20
-        initialSize: 1
-        maxWait: 60000
-        minIdle: 1
-        timeBetweenEvictionRunsMillis: 60000
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: select 'x'
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        poolPreparedStatements: true
-        maxOpenPreparedStatements: 20
+    url: jdbc:mysql://localhost:3306/lenos?useUnicode=true&characterEncoding=UTF-8
+    username: root
+    #        password: 123456
+    #        password: 1234
+    password: root
+    # 使用druid数据源
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: com.mysql.jdbc.Driver
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 60000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: select 'x'
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
   http:
-      encoding:
-        force: true
+    encoding:
+      force: true
   boot:
     admin:
       client:
         prefer-ip: true
       url: http://localhost:8082
   redis:
-      host: 127.0.0.1
-      port: 6379
+    host: 127.0.0.1
+    port: 6379
 
 mybatis:
-    type-aliases-package: com.len.entity
-    mapper-locations: classpath*:mapper/*.xml
-    check-config-location: true
+  type-aliases-package: com.len.entity
+  mapper-locations: classpath*:mapper/*.xml
+  check-config-location: true
 
 mapper:
-    mappers:
-        - com.len.base.BaseMapper
-    not-empty: false
-    identity: MYSQL
+  mappers:
+    - com.len.base.BaseMapper
+  not-empty: false
+  identity: MYSQL
 
 
 # PageHelperConfig 可以替代此方案
 pagehelper:
-    helperDialect: mysql
-    reasonable: true
-    supportMethodsArguments: true
-    params: count=countSql
+  helperDialect: mysql
+  reasonable: true
+  supportMethodsArguments: true
+  params: count=countSql
 logging:
   level:
-      com.len.mapper: debug
+    com.len.mapper: debug
   config: classpath:log4j2.yml
 
 filePath: ./file/
diff --git a/len-web/src/main/resources/application-sqlserver-dev.yml b/len-web/src/main/resources/application-sqlserver-dev.yml
index 9cf10f6..92deb54 100644
--- a/len-web/src/main/resources/application-sqlserver-dev.yml
+++ b/len-web/src/main/resources/application-sqlserver-dev.yml
@@ -2,28 +2,28 @@ server:
   port: 8081
 spring:
   datasource:
-        url: jdbc:sqlserver://localhost:1433;DatabaseName=lenos
-        username: sa
-        password: 123
-        # 使用druid数据源
-        type: com.alibaba.druid.pool.DruidDataSource
-        driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-        filters: stat
-        maxActive: 20
-        initialSize: 1
-        maxWait: 60000
-        minIdle: 1
-        timeBetweenEvictionRunsMillis: 60000
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: select 'x'
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        poolPreparedStatements: true
-        maxOpenPreparedStatements: 20
+    url: jdbc:sqlserver://localhost:1433;DatabaseName=lenos
+    username: sa
+    password: 123
+    # 使用druid数据源
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 60000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: select 'x'
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
   http:
-      encoding:
-        force: true
+    encoding:
+      force: true
   boot:
     admin:
       client:
@@ -31,23 +31,23 @@ spring:
       url: http://localhost:8082
 
 mybatis:
-    type-aliases-package: com.len.entity
-    mapper-locations: classpath*:mapper/*.xml
-    check-config-location: true
+  type-aliases-package: com.len.entity
+  mapper-locations: classpath*:mapper/*.xml
+  check-config-location: true
 
 mapper:
-    mappers:
-        - com.len.base.BaseMapper
-    not-empty: false
-    identity: sqlserver
+  mappers:
+    - com.len.base.BaseMapper
+  not-empty: false
+  identity: sqlserver
 
 
 # PageHelperConfig 可以替代此方案
 pagehelper:
-    helperDialect: sqlserver
-    reasonable: true
-    supportMethodsArguments: true
-    params: count=countSql
+  helperDialect: sqlserver
+  reasonable: true
+  supportMethodsArguments: true
+  params: count=countSql
 
 lenosp:
   uploadPath: ./file/
diff --git a/len-web/src/main/resources/application-test.yml b/len-web/src/main/resources/application-test.yml
index 10443f4..69dfff3 100644
--- a/len-web/src/main/resources/application-test.yml
+++ b/len-web/src/main/resources/application-test.yml
@@ -2,30 +2,30 @@ server:
   port: 8089
 spring:
   datasource:
-        url: jdbc:mysql://localhost:3306/lenos?useUnicode=true&characterEncoding=UTF-8
-        username: root
-#        password: 123456
-#        password: 1234
-        password: root
-        # 使用druid数据源
-        type: com.alibaba.druid.pool.DruidDataSource
-        driver-class-name: com.mysql.jdbc.Driver
-        filters: stat
-        maxActive: 20
-        initialSize: 1
-        maxWait: 60000
-        minIdle: 1
-        timeBetweenEvictionRunsMillis: 60000
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: select 'x'
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        poolPreparedStatements: true
-        maxOpenPreparedStatements: 20
+    url: jdbc:mysql://localhost:3306/lenos?useUnicode=true&characterEncoding=UTF-8
+    username: root
+    #        password: 123456
+    #        password: 1234
+    password: root
+    # 使用druid数据源
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: com.mysql.jdbc.Driver
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 60000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: select 'x'
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
   http:
-      encoding:
-        force: true
+    encoding:
+      force: true
   boot:
     admin:
       client:
@@ -33,26 +33,26 @@ spring:
       url: http://localhost:8082
 
 mybatis:
-    type-aliases-package: com.len.entity
-    mapper-locations: classpath*:mapper/*.xml
-    check-config-location: true
+  type-aliases-package: com.len.entity
+  mapper-locations: classpath*:mapper/*.xml
+  check-config-location: true
 
 mapper:
-    mappers:
-        - com.len.base.BaseMapper
-    not-empty: false
-    identity: MYSQL
+  mappers:
+    - com.len.base.BaseMapper
+  not-empty: false
+  identity: MYSQL
 
 
 # PageHelperConfig 可以替代此方案
 pagehelper:
-    helperDialect: mysql
-    reasonable: true
-    supportMethodsArguments: true
-    params: count=countSql
+  helperDialect: mysql
+  reasonable: true
+  supportMethodsArguments: true
+  params: count=countSql
 logging:
   level:
-      com.len.mapper: debug
+    com.len.mapper: debug
   config: classpath:log4j2.yml
 
 filePath: ./file/
diff --git a/len-web/src/main/resources/auto-config/mybatis-config.xml b/len-web/src/main/resources/auto-config/mybatis-config.xml
index fc7fd10..8a01bff 100644
--- a/len-web/src/main/resources/auto-config/mybatis-config.xml
+++ b/len-web/src/main/resources/auto-config/mybatis-config.xml
@@ -1,56 +1,56 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
-        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd" >
+	"http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd" >
 <generatorConfiguration>
-  <context id="Mysql" targetRuntime="MyBatis3Simple" defaultModelType="flat">
-    <property name="beginningDelimiter" value="`"/>
-    <property name="endingDelimiter" value="`"/>
-    <!-- RowBounds pagination -->
-    <!--  <plugin type="org.mybatis.generator.plugins.RowBoundsPlugin" />
-      <plugin type="org.mybatis.generator.plugins.CaseInsensitiveLikePlugin" />
-      <plugin type="org.mybatis.generator.plugins.SerializablePlugin" />-->
+	<context id="Mysql" targetRuntime="MyBatis3Simple" defaultModelType="flat">
+		<property name="beginningDelimiter" value="`"/>
+		<property name="endingDelimiter" value="`"/>
+		<!-- RowBounds pagination -->
+		<!--  <plugin type="org.mybatis.generator.plugins.RowBoundsPlugin" />
+		  <plugin type="org.mybatis.generator.plugins.CaseInsensitiveLikePlugin" />
+		  <plugin type="org.mybatis.generator.plugins.SerializablePlugin" />-->
 
-    <plugin type="tk.mybatis.mapper.generator.MapperPlugin">
-      <property name="mappers" value="tk.mybatis.mapper.common.Mapper"/>
-      <property name="caseSensitive" value="true"/>
-    </plugin>
+		<plugin type="tk.mybatis.mapper.generator.MapperPlugin">
+			<property name="mappers" value="tk.mybatis.mapper.common.Mapper"/>
+			<property name="caseSensitive" value="true"/>
+		</plugin>
 
-    <commentGenerator>
-      <property name="suppressDate" value="true" />
-      <property name="suppressAllComments" value="true" />
-    </commentGenerator>
+		<commentGenerator>
+			<property name="suppressDate" value="true"/>
+			<property name="suppressAllComments" value="true"/>
+		</commentGenerator>
 
-    <!-- jdbc连接 -->
-    <jdbcConnection driverClass="com.mysql.jdbc.Driver"
-                    connectionURL="jdbc:mysql://localhost:3306/lenos" userId="root"
-                    password="123456" />
-    <!--mode-->
-    <javaModelGenerator targetPackage="com.len.entity"
-                        targetProject="len-blog/src/main/java">
-      <property name="enableSubPackages" value="true"/>
+		<!-- jdbc连接 -->
+		<jdbcConnection driverClass="com.mysql.jdbc.Driver"
+						connectionURL="jdbc:mysql://localhost:3306/lenos" userId="root"
+						password="123456"/>
+		<!--mode-->
+		<javaModelGenerator targetPackage="com.len.entity"
+							targetProject="len-blog/src/main/java">
+			<property name="enableSubPackages" value="true"/>
 
-      <property name="trimStrings" value="true" />
-    </javaModelGenerator>
-    <!--生成映射文件存放位置-->
-    <sqlMapGenerator targetPackage="com.len.mapper" targetProject="len-blog/src/main/java" >
-      <property name="enableSubPackages" value="true"/>
-    </sqlMapGenerator>
-    <!--生成Dao类存放位置-->
-    <javaClientGenerator targetPackage="com.len.mapper"
-                         targetProject="len-blog/src/main/java" type="XMLMAPPER" >
-      <property name="enableSubPackages" value="true"/>
-    </javaClientGenerator>
-    <!--生成table 先建表 后生成 勿随意覆盖本身table 避免功能缺失  测试 自己找其他表测试 by zxm-->
-    <table tableName="blog_article_tag" domainObjectName="ArticleTag">
-      <generatedKey column="id" sqlStatement="JDBC"/>
-    </table>
-    <!-- enableCountByExample="false"
-     enableUpdateByExample="false"
-     enableDeleteByExample="false"
-     enableSelectByExample="false"
-      selectByExampleQueryId="false"-->
-    <!-- />-->
+			<property name="trimStrings" value="true"/>
+		</javaModelGenerator>
+		<!--生成映射文件存放位置-->
+		<sqlMapGenerator targetPackage="com.len.mapper" targetProject="len-blog/src/main/java">
+			<property name="enableSubPackages" value="true"/>
+		</sqlMapGenerator>
+		<!--生成Dao类存放位置-->
+		<javaClientGenerator targetPackage="com.len.mapper"
+							 targetProject="len-blog/src/main/java" type="XMLMAPPER">
+			<property name="enableSubPackages" value="true"/>
+		</javaClientGenerator>
+		<!--生成table 先建表 后生成 勿随意覆盖本身table 避免功能缺失  测试 自己找其他表测试 by zxm-->
+		<table tableName="blog_article_tag" domainObjectName="ArticleTag">
+			<generatedKey column="id" sqlStatement="JDBC"/>
+		</table>
+		<!-- enableCountByExample="false"
+		 enableUpdateByExample="false"
+		 enableDeleteByExample="false"
+		 enableSelectByExample="false"
+		  selectByExampleQueryId="false"-->
+		<!-- />-->
 
 
-  </context>
-</generatorConfiguration>
\ No newline at end of file
+	</context>
+</generatorConfiguration>
diff --git a/len-web/src/main/resources/ehcache/ehcache.xml b/len-web/src/main/resources/ehcache/ehcache.xml
index 4ab47f7..464987c 100644
--- a/len-web/src/main/resources/ehcache/ehcache.xml
+++ b/len-web/src/main/resources/ehcache/ehcache.xml
@@ -1,24 +1,24 @@
 <ehcache>
 
-  <diskStore path="java.io.tmpdir"/>
+	<diskStore path="java.io.tmpdir"/>
 
-<defaultCache
-    maxElementsInMemory="10000"
-    eternal="false"
-    overflowToDisk="true"
-    timeToIdleSeconds="60"
-    timeToLiveSeconds="0"
-    diskPersistent="false"
-    diskExpiryThreadIntervalSeconds="120"/>
+	<defaultCache
+		maxElementsInMemory="10000"
+		eternal="false"
+		overflowToDisk="true"
+		timeToIdleSeconds="60"
+		timeToLiveSeconds="0"
+		diskPersistent="false"
+		diskExpiryThreadIntervalSeconds="120"/>
 
-  <!-- 登录记录缓存 锁定10分钟 -->
-  <cache name="loginRetryCache"
-    maxEntriesLocalHeap="2000"
-    eternal="false"
-    timeToIdleSeconds="60"
-    timeToLiveSeconds="0"
-    overflowToDisk="false"
-    statistics="true">
-  </cache>
+	<!-- 登录记录缓存 锁定10分钟 -->
+	<cache name="loginRetryCache"
+		   maxEntriesLocalHeap="2000"
+		   eternal="false"
+		   timeToIdleSeconds="60"
+		   timeToLiveSeconds="0"
+		   overflowToDisk="false"
+		   statistics="true">
+	</cache>
 
-</ehcache>
\ No newline at end of file
+</ehcache>
diff --git a/len-web/src/main/resources/len.properties b/len-web/src/main/resources/len.properties
index c9c73ef..a2af03a 100644
--- a/len-web/src/main/resources/len.properties
+++ b/len-web/src/main/resources/len.properties
@@ -1,13 +1,9 @@
 #redis config
-
-
 #\u7F13\u5B58 ehcache redis
 cache=ehcache
 #session \u7F13\u5B58 memory redis
 sessionCache=memory
-
 # \u542F\u7528redis\u7F13\u5B58 \u9700\u8981\u5F00\u542F\u4E00\u4E0B\u4E24\u4E2A\u914D\u7F6E
 #redis.host=localhost
-
 #redis.port=6379
 
diff --git a/len-web/src/main/resources/log4j.properties b/len-web/src/main/resources/log4j.properties
index a124087..23a8c45 100644
--- a/len-web/src/main/resources/log4j.properties
+++ b/len-web/src/main/resources/log4j.properties
@@ -1,2 +1,2 @@
-log4j.rootLogger = debug
+log4j.rootLogger=debug
 log4j.appender.appenderNam=org.apache.log4j.DailyRollingFileAppender
\ No newline at end of file
diff --git a/len-web/src/main/resources/quartz.properties b/len-web/src/main/resources/quartz.properties
index 15b39b5..36e72e6 100644
--- a/len-web/src/main/resources/quartz.properties
+++ b/len-web/src/main/resources/quartz.properties
@@ -2,18 +2,14 @@
 # to create a Quartz Scheduler Instance, if a different
 # properties file is not explicitly specified.
 #
-
-org.quartz.scheduler.instanceName: DefaultQuartzScheduler
-org.quartz.scheduler.rmi.export: false
-org.quartz.scheduler.rmi.proxy: false
-org.quartz.scheduler.wrapJobExecutionInUserTransaction: false
-
-org.quartz.threadPool.class: org.quartz.simpl.SimpleThreadPool
-org.quartz.threadPool.threadCount: 20
-org.quartz.threadPool.threadPriority: 5
-org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread: true
-
-org.quartz.jobStore.misfireThreshold: 60000
-
-org.quartz.jobStore.class: org.quartz.simpl.RAMJobStore
+org.quartz.scheduler.instanceName:DefaultQuartzScheduler
+org.quartz.scheduler.rmi.export:false
+org.quartz.scheduler.rmi.proxy:false
+org.quartz.scheduler.wrapJobExecutionInUserTransaction:false
+org.quartz.threadPool.class:org.quartz.simpl.SimpleThreadPool
+org.quartz.threadPool.threadCount:20
+org.quartz.threadPool.threadPriority:5
+org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread:true
+org.quartz.jobStore.misfireThreshold:60000
+org.quartz.jobStore.class:org.quartz.simpl.RAMJobStore
 
diff --git a/pom.xml b/pom.xml
index cf62c60..84ff4ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,458 +1,454 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.len</groupId>
-  <artifactId>lenosp</artifactId>
-  <packaging>pom</packaging>
-  <version>lenosp-2.0-SNAPSHOT</version>
-  <parent>
-    <groupId>org.springframework.boot</groupId>
-    <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.1.12.RELEASE</version>
-    <relativePath />
-  </parent>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>1.8</java.version>
-  </properties>
-
-  <repositories>
-    <repository>
-      <id>aliyun</id>
-      <url>https://maven.aliyun.com/repository/public</url>
-    </repository>
-  </repositories>
-
-  <modules>
-    <module>len-core</module>
-    <module>len-sys</module>
-    <module>len-web</module>
-    <module>len-activiti</module>
-    <module>len-blog</module>
-  </modules>
-
-  <dependencies>
-
-
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-configuration-processor</artifactId>
-      <optional>true</optional>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-web</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-test</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-    </dependency>
-
-    <!--<dependency>
-      <groupId>org.mybatis.spring.boot</groupId>
-      <artifactId>mybatis-spring-boot-starter</artifactId>
-      <version>1.3.1</version>
-    </dependency>-->
-
-    <dependency>
-      <groupId>com.baomidou</groupId>
-      <artifactId>mybatis-plus-boot-starter</artifactId>
-      <version>3.2.0</version>
-    </dependency>
-
-    <!--<dependency>
-      <groupId>tk.mybatis</groupId>
-      <artifactId>mapper-spring-boot-starter</artifactId>
-      <version>2.0.4</version>
-    </dependency>
-
-    <dependency>
-      <groupId>tk.mybatis</groupId>
-      <artifactId>mapper</artifactId>
-      <version>4.0.4</version>
-    </dependency>-->
-
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-cache</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-jdbc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-aop</artifactId>
-    </dependency>
-    <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-freemarker -->
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-freemarker</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-data-redis</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-actuator</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-websocket</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-actuator</artifactId>
-    </dependency>
-
-
-    <!--Mysql数据库驱动-->
-    <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-      <version>5.1.6</version>
-    </dependency>
-
-    <!-- https://mvnrepository.com/artifact/com.microsoft.sqlserver/sqljdbc4 -->
-    <!--<dependency>
-      <groupId>com.microsoft.sqlserver</groupId>
-      <artifactId>sqljdbc4</artifactId>
-      <version>4.0</version>
-      <scope>compile</scope>
-    </dependency>-->
-
-
-
-    <dependency>
-      <groupId>com.alibaba</groupId>
-      <artifactId>druid-spring-boot-starter</artifactId>
-      <version>1.2.6</version>
-    </dependency>
-
-    <!--mybatis spring整合包-->
-   <!-- <dependency>
-      <groupId>org.mybatis</groupId>
-      <artifactId>mybatis-spring</artifactId>
-      <version>1.3.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.mybatis.generator</groupId>
-      <artifactId>mybatis-generator-core</artifactId>
-      <version>1.3.2</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>-->
-    <dependency>
-      <groupId>com.github.pagehelper</groupId>
-      <artifactId>pagehelper-spring-boot-starter</artifactId>
-      <version>1.2.5</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.mybatis</groupId>
-          <artifactId>mybatis</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.mybatis</groupId>
-          <artifactId>mybatis-spring</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <!-- https://mvnrepository.com/artifact/com.github.pagehelper/pagehelper -->
-    <!--<dependency>
-      <groupId>com.github.pagehelper</groupId>
-      <artifactId>pagehelper</artifactId>
-      <version>5.1.2</version>
-    </dependency>
-    <dependency>
-      <groupId>com.github.pagehelper</groupId>
-      <artifactId>pagehelper-spring-boot-autoconfigure</artifactId>
-      <version>1.2.5</version>
-    </dependency>
-    <dependency>
-      <groupId>com.github.pagehelper</groupId>
-      <artifactId>pagehelper-spring-boot-starter</artifactId>
-      <version>1.2.5</version>
-    </dependency>
-
-  <!-  <dependency>
-      <groupId>org.mybatis</groupId>
-      <artifactId>mybatis</artifactId>
-      <version>3.4.1</version>
-    </dependency>-->
-    <!-- https://mvnrepository.com/artifact/org.mybatis/mybatis -->
-    <dependency>
-      <groupId>org.mybatis</groupId>
-      <artifactId>mybatis</artifactId>
-      <version>3.5.3</version>
-    </dependency>
-
-
-    <!--shiro依赖-->
-    <dependency>
-      <artifactId>ehcache-core</artifactId>
-      <groupId>net.sf.ehcache</groupId>
-      <version>2.5.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.shiro</groupId>
-      <artifactId>shiro-ehcache</artifactId>
-      <version>1.5.2</version>
-    </dependency>
-
-    <!-- https://mvnrepository.com/artifact/org.apache.shiro/shiro-aspectj -->
-    <dependency>
-      <groupId>org.apache.shiro</groupId>
-      <artifactId>shiro-aspectj</artifactId>
-      <version>1.5.2</version>
-    </dependency>
-
-
-    <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.7.25</version>
-    </dependency>
-
-
-    <dependency>
-      <groupId>org.apache.shiro</groupId>
-      <artifactId>shiro-core</artifactId>
-      <version>1.5.2</version>
-    </dependency>
-
-    <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
-    <dependency>
-      <groupId>org.projectlombok</groupId>
-      <artifactId>lombok</artifactId>
-      <version>1.16.10</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.shiro</groupId>
-      <artifactId>shiro-web</artifactId>
-      <version>1.3.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.shiro</groupId>
-      <artifactId>shiro-spring</artifactId>
-      <version>1.5.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>net.mingsoft</groupId>
-      <artifactId>shiro-freemarker-tags</artifactId>
-      <version>0.1</version>
-    </dependency>
-
-    <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-      <version>3.7</version>
-    </dependency>
-
-
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.5</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-      <version>1.3.2</version>
-    </dependency>
-
-    <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
-    <dependency>
-      <groupId>com.alibaba</groupId>
-      <artifactId>fastjson</artifactId>
-      <version>1.2.41</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-joda</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.module</groupId>
-      <artifactId>jackson-module-parameter-names</artifactId>
-    </dependency>
-
-    <!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger2 -->
-    <dependency>
-      <groupId>io.springfox</groupId>
-      <artifactId>springfox-swagger2</artifactId>
-      <version>2.7.0</version>
-    </dependency>
-
-
-    <!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger-ui -->
-    <dependency>
-      <groupId>io.springfox</groupId>
-      <artifactId>springfox-swagger-ui</artifactId>
-      <version>2.7.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context-support</artifactId>
-    </dependency>
-
-    <!-- https://mvnrepository.com/artifact/org.quartz-scheduler/quartz -->
-    <dependency>
-      <groupId>org.quartz-scheduler</groupId>
-      <artifactId>quartz</artifactId>
-      <version>2.3.0</version>
-    </dependency>
-    <dependency>
-      <groupId>cn.hutool</groupId>
-      <artifactId>hutool-core</artifactId>
-      <version>4.0.12</version>
-    </dependency>
-    <dependency>
-      <groupId>cn.hutool</groupId>
-      <artifactId>hutool-http</artifactId>
-      <version>4.0.12</version>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate.validator</groupId>
-      <artifactId>hibernate-validator</artifactId>
-      <version>6.0.10.Final</version>
-    </dependency>
-    <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-      <version>2.0.1.Final</version>
-    </dependency>
-
-    <!-- https://mvnrepository.com/artifact/com.auth0/java-jwt -->
-    <dependency>
-      <groupId>com.auth0</groupId>
-      <artifactId>java-jwt</artifactId>
-      <version>3.4.0</version>
-    </dependency>
-
-
-
-
-
-    <dependency>
-      <groupId>org.apache.shiro</groupId>
-      <artifactId>shiro-quartz</artifactId>
-      <version>1.3.2</version>
-      <!-- 解决 shiro和quartz 冲突-->
-      <exclusions>
-        <exclusion>
-          <groupId>org.opensymphony.quartz</groupId>
-          <artifactId>quartz</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework.session</groupId>
-      <artifactId>spring-session-data-redis</artifactId>
-      <version>2.1.9.RELEASE</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.crazycake</groupId>
-      <artifactId>shiro-redis</artifactId>
-      <version>3.2.3</version>
-    </dependency>
-
-
-
-  </dependencies>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>com.len</groupId>
-        <artifactId>len-core</artifactId>
-        <version>lenosp-2.0-SNAPSHOT</version>
-      </dependency>
-
-      <dependency>
-        <groupId>com.len</groupId>
-        <artifactId>len-web</artifactId>
-        <version>lenosp-2.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>com.len</groupId>
-        <artifactId>len-sys</artifactId>
-        <version>lenosp-2.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>com.len</groupId>
-        <artifactId>len-activiti</artifactId>
-        <version>lenosp-2.0-SNAPSHOT</version>
-      </dependency>
-      <dependency>
-        <groupId>com.len</groupId>
-        <artifactId>len-blog</artifactId>
-        <version>lenosp-2.0-SNAPSHOT</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <build>
-    <finalName>lenosp</finalName>
-    <plugins>
-      <!-- jdk编译插件 -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>${java.version}</source>
-          <target>${java.version}</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.mybatis.generator</groupId>
-        <artifactId>mybatis-generator-maven-plugin</artifactId>
-        <version>1.3.6</version>
-        <configuration>
-          <configurationFile><!--${basedir}-->len-web/src/main/resources/auto-config/mybatis-config.xml</configurationFile>
-          <overwrite>true</overwrite>
-          <verbose>true</verbose>
-        </configuration>
-
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.0.0</version>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
\ No newline at end of file
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.len</groupId>
+	<artifactId>lenosp</artifactId>
+	<packaging>pom</packaging>
+	<version>lenosp-2.0-SNAPSHOT</version>
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.1.12.RELEASE</version>
+		<relativePath/>
+	</parent>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<java.version>1.8</java.version>
+	</properties>
+
+	<repositories>
+		<repository>
+			<id>aliyun</id>
+			<url>https://maven.aliyun.com/repository/public</url>
+		</repository>
+	</repositories>
+
+	<modules>
+		<module>len-core</module>
+		<module>len-sys</module>
+		<module>len-web</module>
+		<module>len-activiti</module>
+		<module>len-blog</module>
+	</modules>
+
+	<dependencies>
+
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+		</dependency>
+
+		<!--<dependency>
+		  <groupId>org.mybatis.spring.boot</groupId>
+		  <artifactId>mybatis-spring-boot-starter</artifactId>
+		  <version>1.3.1</version>
+		</dependency>-->
+
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-boot-starter</artifactId>
+			<version>3.2.0</version>
+		</dependency>
+
+		<!--<dependency>
+		  <groupId>tk.mybatis</groupId>
+		  <artifactId>mapper-spring-boot-starter</artifactId>
+		  <version>2.0.4</version>
+		</dependency>
+
+		<dependency>
+		  <groupId>tk.mybatis</groupId>
+		  <artifactId>mapper</artifactId>
+		  <version>4.0.4</version>
+		</dependency>-->
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-cache</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jdbc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-aop</artifactId>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-freemarker -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-freemarker</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-logging</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-websocket</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-actuator</artifactId>
+		</dependency>
+
+
+		<!--Mysql数据库驱动-->
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+			<version>5.1.6</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.microsoft.sqlserver/sqljdbc4 -->
+		<!--<dependency>
+		  <groupId>com.microsoft.sqlserver</groupId>
+		  <artifactId>sqljdbc4</artifactId>
+		  <version>4.0</version>
+		  <scope>compile</scope>
+		</dependency>-->
+
+
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>druid-spring-boot-starter</artifactId>
+			<version>1.2.6</version>
+		</dependency>
+
+		<!--mybatis spring整合包-->
+		<!-- <dependency>
+		   <groupId>org.mybatis</groupId>
+		   <artifactId>mybatis-spring</artifactId>
+		   <version>1.3.0</version>
+		 </dependency>
+
+		 <dependency>
+		   <groupId>org.mybatis.generator</groupId>
+		   <artifactId>mybatis-generator-core</artifactId>
+		   <version>1.3.2</version>
+		   <scope>compile</scope>
+		   <optional>true</optional>
+		 </dependency>-->
+		<dependency>
+			<groupId>com.github.pagehelper</groupId>
+			<artifactId>pagehelper-spring-boot-starter</artifactId>
+			<version>1.2.5</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.mybatis</groupId>
+					<artifactId>mybatis</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.mybatis</groupId>
+					<artifactId>mybatis-spring</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.github.pagehelper/pagehelper -->
+		<!--<dependency>
+		  <groupId>com.github.pagehelper</groupId>
+		  <artifactId>pagehelper</artifactId>
+		  <version>5.1.2</version>
+		</dependency>
+		<dependency>
+		  <groupId>com.github.pagehelper</groupId>
+		  <artifactId>pagehelper-spring-boot-autoconfigure</artifactId>
+		  <version>1.2.5</version>
+		</dependency>
+		<dependency>
+		  <groupId>com.github.pagehelper</groupId>
+		  <artifactId>pagehelper-spring-boot-starter</artifactId>
+		  <version>1.2.5</version>
+		</dependency>
+
+	  <!-  <dependency>
+		  <groupId>org.mybatis</groupId>
+		  <artifactId>mybatis</artifactId>
+		  <version>3.4.1</version>
+		</dependency>-->
+		<!-- https://mvnrepository.com/artifact/org.mybatis/mybatis -->
+		<dependency>
+			<groupId>org.mybatis</groupId>
+			<artifactId>mybatis</artifactId>
+			<version>3.5.3</version>
+		</dependency>
+
+
+		<!--shiro依赖-->
+		<dependency>
+			<artifactId>ehcache-core</artifactId>
+			<groupId>net.sf.ehcache</groupId>
+			<version>2.5.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-ehcache</artifactId>
+			<version>1.5.2</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.apache.shiro/shiro-aspectj -->
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-aspectj</artifactId>
+			<version>1.5.2</version>
+		</dependency>
+
+
+		<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.25</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-core</artifactId>
+			<version>1.5.2</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<version>1.16.10</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-web</artifactId>
+			<version>1.3.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-spring</artifactId>
+			<version>1.5.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>net.mingsoft</groupId>
+			<artifactId>shiro-freemarker-tags</artifactId>
+			<version>0.1</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.7</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.5</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-fileupload</groupId>
+			<artifactId>commons-fileupload</artifactId>
+			<version>1.3.2</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+			<version>1.2.41</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-joda</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.module</groupId>
+			<artifactId>jackson-module-parameter-names</artifactId>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger2 -->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>2.7.0</version>
+		</dependency>
+
+
+		<!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger-ui -->
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+			<version>2.7.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context-support</artifactId>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.quartz-scheduler/quartz -->
+		<dependency>
+			<groupId>org.quartz-scheduler</groupId>
+			<artifactId>quartz</artifactId>
+			<version>2.3.0</version>
+		</dependency>
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-core</artifactId>
+			<version>4.0.12</version>
+		</dependency>
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-http</artifactId>
+			<version>4.0.12</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate.validator</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>6.0.10.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>2.0.1.Final</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.auth0/java-jwt -->
+		<dependency>
+			<groupId>com.auth0</groupId>
+			<artifactId>java-jwt</artifactId>
+			<version>3.4.0</version>
+		</dependency>
+
+
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-quartz</artifactId>
+			<version>1.3.2</version>
+			<!-- 解决 shiro和quartz 冲突-->
+			<exclusions>
+				<exclusion>
+					<groupId>org.opensymphony.quartz</groupId>
+					<artifactId>quartz</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.session</groupId>
+			<artifactId>spring-session-data-redis</artifactId>
+			<version>2.1.9.RELEASE</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.crazycake</groupId>
+			<artifactId>shiro-redis</artifactId>
+			<version>3.2.3</version>
+		</dependency>
+
+
+	</dependencies>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>com.len</groupId>
+				<artifactId>len-core</artifactId>
+				<version>lenosp-2.0-SNAPSHOT</version>
+			</dependency>
+
+			<dependency>
+				<groupId>com.len</groupId>
+				<artifactId>len-web</artifactId>
+				<version>lenosp-2.0-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>com.len</groupId>
+				<artifactId>len-sys</artifactId>
+				<version>lenosp-2.0-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>com.len</groupId>
+				<artifactId>len-activiti</artifactId>
+				<version>lenosp-2.0-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>com.len</groupId>
+				<artifactId>len-blog</artifactId>
+				<version>lenosp-2.0-SNAPSHOT</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<build>
+		<finalName>lenosp</finalName>
+		<plugins>
+			<!-- jdk编译插件 -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>${java.version}</source>
+					<target>${java.version}</target>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.mybatis.generator</groupId>
+				<artifactId>mybatis-generator-maven-plugin</artifactId>
+				<version>1.3.6</version>
+				<configuration>
+					<configurationFile><!--${basedir}-->len-web/src/main/resources/auto-config/mybatis-config.xml
+					</configurationFile>
+					<overwrite>true</overwrite>
+					<verbose>true</verbose>
+				</configuration>
+
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.0.0</version>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
-- 
Gitee